From allisson at fedoraproject.org Sun Mar 1 00:00:57 2009 From: allisson at fedoraproject.org (Allisson Azevedo) Date: Sun, 1 Mar 2009 00:00:57 +0000 (UTC) Subject: rpms/perl-AnyEvent-XMPP/F-10 import.log, NONE, 1.1 perl-AnyEvent-XMPP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301000057.923E270115@cvs1.fedora.phx.redhat.com> Author: allisson Update of /cvs/pkgs/rpms/perl-AnyEvent-XMPP/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32286/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-AnyEvent-XMPP.spec Log Message: First import --- NEW FILE import.log --- perl-AnyEvent-XMPP-0_4-1_fc10:F-10:perl-AnyEvent-XMPP-0.4-1.fc10.src.rpm:1235865393 --- NEW FILE perl-AnyEvent-XMPP.spec --- Name: perl-AnyEvent-XMPP Version: 0.4 Release: 1%{?dist} Summary: Implementation of the XMPP Protocol License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/AnyEvent-XMPP/ Source0: http://www.cpan.org/authors/id/E/EL/ELMEX/AnyEvent-XMPP-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(AnyEvent) BuildRequires: perl(AnyEvent::Handle) BuildRequires: perl(AnyEvent::Socket) BuildRequires: perl(Authen::SASL) BuildRequires: perl(Digest::SHA1) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Net::LibIDN) BuildRequires: perl(Object::Event) BuildRequires: perl(XML::Parser::Expat) BuildRequires: perl(XML::Writer) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description AnyEvent::XMPP - An implementation of the XMPP Protocol. %prep %setup -q -n AnyEvent-XMPP-%{version} # Filter requires cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ sed -e '/perl(AnyEvent::XMPP::Client)/d' |\ sed -e '/perl(AnyEvent::XMPP::Connection)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::Exception)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::IQ)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::IQAuth)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::MUC)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::Message)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::Parser)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::Presence)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::Register)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::SASL)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::Stanza)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::Stream)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::DataForm)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::Disco::Info)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::Disco::Items)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::MUC::Message)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::MUC::Room)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::MUC::RoomInfo)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::MUC::User)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::OOB)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::RegisterForm)/d' |\ sed -e '/perl(AnyEvent::XMPP::Extendable)/d' |\ sed -e '/perl(AnyEvent::XMPP::IM::Account)/d' |\ sed -e '/perl(AnyEvent::XMPP::IM::Connection)/d' |\ sed -e '/perl(AnyEvent::XMPP::IM::Contact)/d' |\ sed -e '/perl(AnyEvent::XMPP::IM::Delayed)/d' |\ sed -e '/perl(AnyEvent::XMPP::IM::Message)/d' |\ sed -e '/perl(AnyEvent::XMPP::IM::Presence)/d' |\ sed -e '/perl(AnyEvent::XMPP::IM::Roster)/d' |\ sed -e '/perl(AnyEvent::XMPP::Namespaces)/d' |\ sed -e '/perl(AnyEvent::XMPP::Node)/d' |\ sed -e '/perl(AnyEvent::XMPP::Parser)/d' |\ sed -e '/perl(AnyEvent::XMPP::SimpleConnection)/d' |\ sed -e '/perl(AnyEvent::XMPP::Util)/d' |\ sed -e '/perl(AnyEvent::XMPP::Writer)/d' EOF %define __perl_requires %{_builddir}/AnyEvent-XMPP-%{version}/%{name}-req chmod +x %{__perl_requires} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes CONTRIBUTORS README TODO %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Fri Feb 27 2009 Allisson Azevedo 0.4-1 - Initial rpm release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent-XMPP/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2009 23:47:23 -0000 1.1 +++ .cvsignore 1 Mar 2009 00:00:27 -0000 1.2 @@ -0,0 +1 @@ +AnyEvent-XMPP-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent-XMPP/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2009 23:47:23 -0000 1.1 +++ sources 1 Mar 2009 00:00:27 -0000 1.2 @@ -0,0 +1 @@ +6c25cb47a603f48b81b76f5a20394fcd AnyEvent-XMPP-0.4.tar.gz From allisson at fedoraproject.org Sun Mar 1 00:03:32 2009 From: allisson at fedoraproject.org (Allisson Azevedo) Date: Sun, 1 Mar 2009 00:03:32 +0000 (UTC) Subject: rpms/perl-AnyEvent-XMPP/F-9 import.log, NONE, 1.1 perl-AnyEvent-XMPP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301000332.7429070116@cvs1.fedora.phx.redhat.com> Author: allisson Update of /cvs/pkgs/rpms/perl-AnyEvent-XMPP/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv364/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-AnyEvent-XMPP.spec Log Message: First import --- NEW FILE import.log --- perl-AnyEvent-XMPP-0_4-1_fc10:F-9:perl-AnyEvent-XMPP-0.4-1.fc10.src.rpm:1235865727 --- NEW FILE perl-AnyEvent-XMPP.spec --- Name: perl-AnyEvent-XMPP Version: 0.4 Release: 1%{?dist} Summary: Implementation of the XMPP Protocol License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/AnyEvent-XMPP/ Source0: http://www.cpan.org/authors/id/E/EL/ELMEX/AnyEvent-XMPP-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(AnyEvent) BuildRequires: perl(AnyEvent::Handle) BuildRequires: perl(AnyEvent::Socket) BuildRequires: perl(Authen::SASL) BuildRequires: perl(Digest::SHA1) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Net::LibIDN) BuildRequires: perl(Object::Event) BuildRequires: perl(XML::Parser::Expat) BuildRequires: perl(XML::Writer) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description AnyEvent::XMPP - An implementation of the XMPP Protocol. %prep %setup -q -n AnyEvent-XMPP-%{version} # Filter requires cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ sed -e '/perl(AnyEvent::XMPP::Client)/d' |\ sed -e '/perl(AnyEvent::XMPP::Connection)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::Exception)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::IQ)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::IQAuth)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::MUC)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::Message)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::Parser)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::Presence)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::Register)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::SASL)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::Stanza)/d' |\ sed -e '/perl(AnyEvent::XMPP::Error::Stream)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::DataForm)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::Disco::Info)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::Disco::Items)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::MUC::Message)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::MUC::Room)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::MUC::RoomInfo)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::MUC::User)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::OOB)/d' |\ sed -e '/perl(AnyEvent::XMPP::Ext::RegisterForm)/d' |\ sed -e '/perl(AnyEvent::XMPP::Extendable)/d' |\ sed -e '/perl(AnyEvent::XMPP::IM::Account)/d' |\ sed -e '/perl(AnyEvent::XMPP::IM::Connection)/d' |\ sed -e '/perl(AnyEvent::XMPP::IM::Contact)/d' |\ sed -e '/perl(AnyEvent::XMPP::IM::Delayed)/d' |\ sed -e '/perl(AnyEvent::XMPP::IM::Message)/d' |\ sed -e '/perl(AnyEvent::XMPP::IM::Presence)/d' |\ sed -e '/perl(AnyEvent::XMPP::IM::Roster)/d' |\ sed -e '/perl(AnyEvent::XMPP::Namespaces)/d' |\ sed -e '/perl(AnyEvent::XMPP::Node)/d' |\ sed -e '/perl(AnyEvent::XMPP::Parser)/d' |\ sed -e '/perl(AnyEvent::XMPP::SimpleConnection)/d' |\ sed -e '/perl(AnyEvent::XMPP::Util)/d' |\ sed -e '/perl(AnyEvent::XMPP::Writer)/d' EOF %define __perl_requires %{_builddir}/AnyEvent-XMPP-%{version}/%{name}-req chmod +x %{__perl_requires} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes CONTRIBUTORS README TODO %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Fri Feb 27 2009 Allisson Azevedo 0.4-1 - Initial rpm release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent-XMPP/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2009 23:47:23 -0000 1.1 +++ .cvsignore 1 Mar 2009 00:03:02 -0000 1.2 @@ -0,0 +1 @@ +AnyEvent-XMPP-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent-XMPP/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2009 23:47:23 -0000 1.1 +++ sources 1 Mar 2009 00:03:02 -0000 1.2 @@ -0,0 +1 @@ +6c25cb47a603f48b81b76f5a20394fcd AnyEvent-XMPP-0.4.tar.gz From pkgdb at fedoraproject.org Sun Mar 1 00:05:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:05:00 +0000 Subject: [pkgdb] sugar-stopwatch was added for fab Message-ID: <20090301000525.200292084BA@bastion.fedora.phx.redhat.com> kevin has added Package sugar-stopwatch with summary Simple stopwatch for Sugar kevin has approved Package sugar-stopwatch kevin has added a Fedora devel branch for sugar-stopwatch with an owner of fab kevin has approved sugar-stopwatch in Fedora devel kevin has approved Package sugar-stopwatch kevin has set commit to Approved for provenpackager on sugar-stopwatch (Fedora devel) kevin has set build to Approved for provenpackager on sugar-stopwatch (Fedora devel) kevin has set checkout to Approved for provenpackager on sugar-stopwatch (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-stopwatch From pkgdb at fedoraproject.org Sun Mar 1 00:05:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:05:28 +0000 Subject: [pkgdb] sugar-stopwatch (Fedora, 10) updated by kevin Message-ID: <20090301000528.6DF812084D2@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for sugar-stopwatch kevin has set commit to Approved for provenpackager on sugar-stopwatch (Fedora 10) kevin has set build to Approved for provenpackager on sugar-stopwatch (Fedora 10) kevin has set checkout to Approved for provenpackager on sugar-stopwatch (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-stopwatch From kevin at fedoraproject.org Sun Mar 1 00:05:19 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:05:19 +0000 (UTC) Subject: rpms/sugar-stopwatch - New directory Message-ID: <20090301000519.23CAF70115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/sugar-stopwatch In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNi1388/rpms/sugar-stopwatch Log Message: Directory /cvs/pkgs/rpms/sugar-stopwatch added to the repository From kevin at fedoraproject.org Sun Mar 1 00:05:19 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:05:19 +0000 (UTC) Subject: rpms/sugar-stopwatch/devel - New directory Message-ID: <20090301000519.611C370115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/sugar-stopwatch/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNi1388/rpms/sugar-stopwatch/devel Log Message: Directory /cvs/pkgs/rpms/sugar-stopwatch/devel added to the repository From kevin at fedoraproject.org Sun Mar 1 00:05:35 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:05:35 +0000 (UTC) Subject: rpms/sugar-stopwatch Makefile,NONE,1.1 Message-ID: <20090301000535.84EA570115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/sugar-stopwatch In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNi1388/rpms/sugar-stopwatch Added Files: Makefile Log Message: Setup of module sugar-stopwatch --- NEW FILE Makefile --- # Top level Makefile for module sugar-stopwatch all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sun Mar 1 00:05:36 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:05:36 +0000 (UTC) Subject: rpms/sugar-stopwatch/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090301000536.34D7B70115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/sugar-stopwatch/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNi1388/rpms/sugar-stopwatch/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module sugar-stopwatch --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: sugar-stopwatch # $Id: Makefile,v 1.1 2009/03/01 00:05:35 kevin Exp $ NAME := sugar-stopwatch SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sun Mar 1 00:07:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:07:30 +0000 Subject: [pkgdb] uml_utilities was added for pwouters Message-ID: <20090301000752.A59212084BA@bastion.fedora.phx.redhat.com> kevin has added Package uml_utilities with summary Utilities for user-mode linux kernel kevin has approved Package uml_utilities kevin has added a Fedora devel branch for uml_utilities with an owner of pwouters kevin has approved uml_utilities in Fedora devel kevin has approved Package uml_utilities kevin has set commit to Approved for provenpackager on uml_utilities (Fedora devel) kevin has set build to Approved for provenpackager on uml_utilities (Fedora devel) kevin has set checkout to Approved for provenpackager on uml_utilities (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From pkgdb at fedoraproject.org Sun Mar 1 00:07:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:07:33 +0000 Subject: [pkgdb] uml_utilities (Fedora, 9) updated by kevin Message-ID: <20090301000757.9B0492084D2@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for uml_utilities kevin has set commit to Approved for provenpackager on uml_utilities (Fedora 9) kevin has set build to Approved for provenpackager on uml_utilities (Fedora 9) kevin has set checkout to Approved for provenpackager on uml_utilities (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From pkgdb at fedoraproject.org Sun Mar 1 00:07:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:07:33 +0000 Subject: [pkgdb] uml_utilities (Fedora EPEL, 5) updated by kevin Message-ID: <20090301000758.03A1D208519@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for uml_utilities kevin has set commit to Approved for provenpackager on uml_utilities (Fedora EPEL 5) kevin has set build to Approved for provenpackager on uml_utilities (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on uml_utilities (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From pkgdb at fedoraproject.org Sun Mar 1 00:07:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:07:33 +0000 Subject: [pkgdb] uml_utilities (Fedora, 10) updated by kevin Message-ID: <20090301000758.3CDA320851D@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for uml_utilities kevin has set commit to Approved for provenpackager on uml_utilities (Fedora 10) kevin has set build to Approved for provenpackager on uml_utilities (Fedora 10) kevin has set checkout to Approved for provenpackager on uml_utilities (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From kevin at fedoraproject.org Sun Mar 1 00:07:48 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:07:48 +0000 (UTC) Subject: rpms/uml_utilities - New directory Message-ID: <20090301000748.221C270115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/uml_utilities In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFF1728/rpms/uml_utilities Log Message: Directory /cvs/pkgs/rpms/uml_utilities added to the repository From kevin at fedoraproject.org Sun Mar 1 00:07:48 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:07:48 +0000 (UTC) Subject: rpms/uml_utilities/devel - New directory Message-ID: <20090301000748.5806770115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/uml_utilities/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFF1728/rpms/uml_utilities/devel Log Message: Directory /cvs/pkgs/rpms/uml_utilities/devel added to the repository From kevin at fedoraproject.org Sun Mar 1 00:08:04 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:08:04 +0000 (UTC) Subject: rpms/uml_utilities/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090301000804.3BD5A70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/uml_utilities/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFF1728/rpms/uml_utilities/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module uml_utilities --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: uml_utilities # $Id: Makefile,v 1.1 2009/03/01 00:08:04 kevin Exp $ NAME := uml_utilities SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Sun Mar 1 00:08:03 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:08:03 +0000 (UTC) Subject: rpms/uml_utilities Makefile,NONE,1.1 Message-ID: <20090301000803.E1F8570115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/uml_utilities In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFF1728/rpms/uml_utilities Added Files: Makefile Log Message: Setup of module uml_utilities --- NEW FILE Makefile --- # Top level Makefile for module uml_utilities all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From pkgdb at fedoraproject.org Sun Mar 1 00:09:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:09:37 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Singleton was added for iarnell Message-ID: <20090301000938.F14AF2084BA@bastion.fedora.phx.redhat.com> kevin has added Package perl-Catalyst-Plugin-Singleton with summary Singleton to context kevin has approved Package perl-Catalyst-Plugin-Singleton kevin has added a Fedora devel branch for perl-Catalyst-Plugin-Singleton with an owner of iarnell kevin has approved perl-Catalyst-Plugin-Singleton in Fedora devel kevin has approved Package perl-Catalyst-Plugin-Singleton kevin has set commit to Approved for provenpackager on perl-Catalyst-Plugin-Singleton (Fedora devel) kevin has set build to Approved for provenpackager on perl-Catalyst-Plugin-Singleton (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Catalyst-Plugin-Singleton (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Singleton From pkgdb at fedoraproject.org Sun Mar 1 00:09:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:09:41 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Singleton (Fedora, 9) updated by kevin Message-ID: <20090301000942.0034D2084D5@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-Catalyst-Plugin-Singleton kevin has set commit to Approved for provenpackager on perl-Catalyst-Plugin-Singleton (Fedora 9) kevin has set build to Approved for provenpackager on perl-Catalyst-Plugin-Singleton (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-Catalyst-Plugin-Singleton (Fedora 9) kevin approved watchbugzilla on perl-Catalyst-Plugin-Singleton (Fedora 9) for perl-sig kevin approved watchcommits on perl-Catalyst-Plugin-Singleton (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Singleton From pkgdb at fedoraproject.org Sun Mar 1 00:09:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:09:41 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Singleton (Fedora, devel) updated by kevin Message-ID: <20090301000942.2AAA120851A@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Catalyst-Plugin-Singleton (Fedora devel) for perl-sig kevin approved watchcommits on perl-Catalyst-Plugin-Singleton (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Singleton From kevin at fedoraproject.org Sun Mar 1 00:09:34 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:09:34 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Singleton - New directory Message-ID: <20090301000934.2542770115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsie2132/rpms/perl-Catalyst-Plugin-Singleton Log Message: Directory /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton added to the repository From kevin at fedoraproject.org Sun Mar 1 00:09:34 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:09:34 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Singleton/devel - New directory Message-ID: <20090301000934.9557B70138@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsie2132/rpms/perl-Catalyst-Plugin-Singleton/devel Log Message: Directory /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton/devel added to the repository From pkgdb at fedoraproject.org Sun Mar 1 00:09:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:09:41 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Singleton (Fedora, 10) updated by kevin Message-ID: <20090301000942.56E7B20851E@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Catalyst-Plugin-Singleton kevin has set commit to Approved for provenpackager on perl-Catalyst-Plugin-Singleton (Fedora 10) kevin has set build to Approved for provenpackager on perl-Catalyst-Plugin-Singleton (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Catalyst-Plugin-Singleton (Fedora 10) kevin approved watchbugzilla on perl-Catalyst-Plugin-Singleton (Fedora 10) for perl-sig kevin approved watchcommits on perl-Catalyst-Plugin-Singleton (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Singleton From kevin at fedoraproject.org Sun Mar 1 00:09:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:09:52 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Singleton Makefile,NONE,1.1 Message-ID: <20090301000952.D47C970115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsie2132/rpms/perl-Catalyst-Plugin-Singleton Added Files: Makefile Log Message: Setup of module perl-Catalyst-Plugin-Singleton --- NEW FILE Makefile --- # Top level Makefile for module perl-Catalyst-Plugin-Singleton all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sun Mar 1 00:09:53 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:09:53 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Singleton/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090301000953.2849C70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsie2132/rpms/perl-Catalyst-Plugin-Singleton/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Catalyst-Plugin-Singleton --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Catalyst-Plugin-Singleton # $Id: Makefile,v 1.1 2009/03/01 00:09:53 kevin Exp $ NAME := perl-Catalyst-Plugin-Singleton SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sun Mar 1 00:10:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:10:41 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Unicode was added for iarnell Message-ID: <20090301001041.BE59C2084D1@bastion.fedora.phx.redhat.com> kevin has added Package perl-Catalyst-Plugin-Unicode with summary Unicode aware Catalyst kevin has approved Package perl-Catalyst-Plugin-Unicode kevin has added a Fedora devel branch for perl-Catalyst-Plugin-Unicode with an owner of iarnell kevin has approved perl-Catalyst-Plugin-Unicode in Fedora devel kevin has approved Package perl-Catalyst-Plugin-Unicode kevin has set commit to Approved for provenpackager on perl-Catalyst-Plugin-Unicode (Fedora devel) kevin has set build to Approved for provenpackager on perl-Catalyst-Plugin-Unicode (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Catalyst-Plugin-Unicode (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Unicode From pkgdb at fedoraproject.org Sun Mar 1 00:10:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:10:22 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Unicode (Fedora, 9) updated by kevin Message-ID: <20090301001045.2AE4A208515@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-Catalyst-Plugin-Unicode kevin has set commit to Approved for provenpackager on perl-Catalyst-Plugin-Unicode (Fedora 9) kevin has set build to Approved for provenpackager on perl-Catalyst-Plugin-Unicode (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-Catalyst-Plugin-Unicode (Fedora 9) kevin approved watchbugzilla on perl-Catalyst-Plugin-Unicode (Fedora 9) for perl-sig kevin approved watchcommits on perl-Catalyst-Plugin-Unicode (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Unicode From pkgdb at fedoraproject.org Sun Mar 1 00:10:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:10:22 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Unicode (Fedora, 10) updated by kevin Message-ID: <20090301001045.91A5820851B@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Catalyst-Plugin-Unicode kevin has set commit to Approved for provenpackager on perl-Catalyst-Plugin-Unicode (Fedora 10) kevin has set build to Approved for provenpackager on perl-Catalyst-Plugin-Unicode (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Catalyst-Plugin-Unicode (Fedora 10) kevin approved watchbugzilla on perl-Catalyst-Plugin-Unicode (Fedora 10) for perl-sig kevin approved watchcommits on perl-Catalyst-Plugin-Unicode (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Unicode From pkgdb at fedoraproject.org Sun Mar 1 00:10:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:10:22 +0000 Subject: [pkgdb] perl-Catalyst-Plugin-Unicode (Fedora, devel) updated by kevin Message-ID: <20090301001045.BF57620851F@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Catalyst-Plugin-Unicode (Fedora devel) for perl-sig kevin approved watchcommits on perl-Catalyst-Plugin-Unicode (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Unicode From kevin at fedoraproject.org Sun Mar 1 00:10:34 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:10:34 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Unicode - New directory Message-ID: <20090301001034.235FC70115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswC2336/rpms/perl-Catalyst-Plugin-Unicode Log Message: Directory /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode added to the repository From kevin at fedoraproject.org Sun Mar 1 00:10:50 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:10:50 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Unicode/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090301001050.EA6E870116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswC2336/rpms/perl-Catalyst-Plugin-Unicode/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Catalyst-Plugin-Unicode --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Catalyst-Plugin-Unicode # $Id: Makefile,v 1.1 2009/03/01 00:10:50 kevin Exp $ NAME := perl-Catalyst-Plugin-Unicode SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Sun Mar 1 00:10:34 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:10:34 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Unicode/devel - New directory Message-ID: <20090301001034.599CD70131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswC2336/rpms/perl-Catalyst-Plugin-Unicode/devel Log Message: Directory /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel added to the repository From kevin at fedoraproject.org Sun Mar 1 00:10:50 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:10:50 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Unicode Makefile,NONE,1.1 Message-ID: <20090301001050.A978770115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswC2336/rpms/perl-Catalyst-Plugin-Unicode Added Files: Makefile Log Message: Setup of module perl-Catalyst-Plugin-Unicode --- NEW FILE Makefile --- # Top level Makefile for module perl-Catalyst-Plugin-Unicode all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From pkgdb at fedoraproject.org Sun Mar 1 00:11:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:11:39 +0000 Subject: [pkgdb] perl-Algorithm-Merge was added for iarnell Message-ID: <20090301001141.023992084D2@bastion.fedora.phx.redhat.com> kevin has added Package perl-Algorithm-Merge with summary Three-way merge and diff kevin has approved Package perl-Algorithm-Merge kevin has added a Fedora devel branch for perl-Algorithm-Merge with an owner of iarnell kevin has approved perl-Algorithm-Merge in Fedora devel kevin has approved Package perl-Algorithm-Merge kevin has set commit to Approved for provenpackager on perl-Algorithm-Merge (Fedora devel) kevin has set build to Approved for provenpackager on perl-Algorithm-Merge (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Algorithm-Merge (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Algorithm-Merge From pkgdb at fedoraproject.org Sun Mar 1 00:11:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:11:42 +0000 Subject: [pkgdb] perl-Algorithm-Merge (Fedora, 9) updated by kevin Message-ID: <20090301001144.55A1820820B@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-Algorithm-Merge kevin has set commit to Approved for provenpackager on perl-Algorithm-Merge (Fedora 9) kevin has set build to Approved for provenpackager on perl-Algorithm-Merge (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-Algorithm-Merge (Fedora 9) kevin approved watchbugzilla on perl-Algorithm-Merge (Fedora 9) for perl-sig kevin approved watchcommits on perl-Algorithm-Merge (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Algorithm-Merge From pkgdb at fedoraproject.org Sun Mar 1 00:11:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:11:42 +0000 Subject: [pkgdb] perl-Algorithm-Merge (Fedora, 10) updated by kevin Message-ID: <20090301001144.86A82208515@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Algorithm-Merge kevin has set commit to Approved for provenpackager on perl-Algorithm-Merge (Fedora 10) kevin has set build to Approved for provenpackager on perl-Algorithm-Merge (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Algorithm-Merge (Fedora 10) kevin approved watchbugzilla on perl-Algorithm-Merge (Fedora 10) for perl-sig kevin approved watchcommits on perl-Algorithm-Merge (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Algorithm-Merge From pkgdb at fedoraproject.org Sun Mar 1 00:11:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:11:42 +0000 Subject: [pkgdb] perl-Algorithm-Merge (Fedora, devel) updated by kevin Message-ID: <20090301001144.B9DA120851D@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Algorithm-Merge (Fedora devel) for perl-sig kevin approved watchcommits on perl-Algorithm-Merge (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Algorithm-Merge From kevin at fedoraproject.org Sun Mar 1 00:12:45 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:12:45 +0000 (UTC) Subject: rpms/perl-Algorithm-Merge - New directory Message-ID: <20090301001245.25CB470115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Algorithm-Merge In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGZ2724/rpms/perl-Algorithm-Merge Log Message: Directory /cvs/pkgs/rpms/perl-Algorithm-Merge added to the repository From kevin at fedoraproject.org Sun Mar 1 00:12:45 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:12:45 +0000 (UTC) Subject: rpms/perl-Algorithm-Merge/devel - New directory Message-ID: <20090301001245.6891A70131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Algorithm-Merge/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGZ2724/rpms/perl-Algorithm-Merge/devel Log Message: Directory /cvs/pkgs/rpms/perl-Algorithm-Merge/devel added to the repository From kevin at fedoraproject.org Sun Mar 1 00:13:02 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:13:02 +0000 (UTC) Subject: rpms/perl-Algorithm-Merge Makefile,NONE,1.1 Message-ID: <20090301001302.04E0370115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Algorithm-Merge In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGZ2724/rpms/perl-Algorithm-Merge Added Files: Makefile Log Message: Setup of module perl-Algorithm-Merge --- NEW FILE Makefile --- # Top level Makefile for module perl-Algorithm-Merge all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sun Mar 1 00:13:02 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:13:02 +0000 (UTC) Subject: rpms/perl-Algorithm-Merge/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090301001302.7934770131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Algorithm-Merge/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGZ2724/rpms/perl-Algorithm-Merge/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Algorithm-Merge --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Algorithm-Merge # $Id: Makefile,v 1.1 2009/03/01 00:13:02 kevin Exp $ NAME := perl-Algorithm-Merge SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sun Mar 1 00:13:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:13:16 +0000 Subject: [pkgdb] perl-HTML-SimpleParse was added for iarnell Message-ID: <20090301001340.095892084D0@bastion.fedora.phx.redhat.com> kevin has added Package perl-HTML-SimpleParse with summary Bare-bones HTML parser kevin has approved Package perl-HTML-SimpleParse kevin has added a Fedora devel branch for perl-HTML-SimpleParse with an owner of iarnell kevin has approved perl-HTML-SimpleParse in Fedora devel kevin has approved Package perl-HTML-SimpleParse kevin has set commit to Approved for provenpackager on perl-HTML-SimpleParse (Fedora devel) kevin has set build to Approved for provenpackager on perl-HTML-SimpleParse (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-HTML-SimpleParse (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-SimpleParse From pkgdb at fedoraproject.org Sun Mar 1 00:13:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:13:42 +0000 Subject: [pkgdb] perl-HTML-SimpleParse (Fedora, 9) updated by kevin Message-ID: <20090301001343.2987F2084D5@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-HTML-SimpleParse kevin has set commit to Approved for provenpackager on perl-HTML-SimpleParse (Fedora 9) kevin has set build to Approved for provenpackager on perl-HTML-SimpleParse (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-HTML-SimpleParse (Fedora 9) kevin approved watchbugzilla on perl-HTML-SimpleParse (Fedora 9) for perl-sig kevin approved watchcommits on perl-HTML-SimpleParse (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-SimpleParse From pkgdb at fedoraproject.org Sun Mar 1 00:13:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:13:43 +0000 Subject: [pkgdb] perl-HTML-SimpleParse (Fedora, devel) updated by kevin Message-ID: <20090301001343.4D4CB20851A@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-HTML-SimpleParse (Fedora devel) for perl-sig kevin approved watchcommits on perl-HTML-SimpleParse (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-SimpleParse From kevin at fedoraproject.org Sun Mar 1 00:13:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:13:37 +0000 (UTC) Subject: rpms/perl-HTML-SimpleParse - New directory Message-ID: <20090301001337.2B3FF70115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-SimpleParse In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsha2930/rpms/perl-HTML-SimpleParse Log Message: Directory /cvs/pkgs/rpms/perl-HTML-SimpleParse added to the repository From kevin at fedoraproject.org Sun Mar 1 00:13:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:13:37 +0000 (UTC) Subject: rpms/perl-HTML-SimpleParse/devel - New directory Message-ID: <20090301001337.6FB9870131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-SimpleParse/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsha2930/rpms/perl-HTML-SimpleParse/devel Log Message: Directory /cvs/pkgs/rpms/perl-HTML-SimpleParse/devel added to the repository From pkgdb at fedoraproject.org Sun Mar 1 00:13:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:13:43 +0000 Subject: [pkgdb] perl-HTML-SimpleParse (Fedora, 10) updated by kevin Message-ID: <20090301001344.04A6F20851F@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-HTML-SimpleParse kevin has set commit to Approved for provenpackager on perl-HTML-SimpleParse (Fedora 10) kevin has set build to Approved for provenpackager on perl-HTML-SimpleParse (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-HTML-SimpleParse (Fedora 10) kevin approved watchbugzilla on perl-HTML-SimpleParse (Fedora 10) for perl-sig kevin approved watchcommits on perl-HTML-SimpleParse (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-SimpleParse From kevin at fedoraproject.org Sun Mar 1 00:13:53 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:13:53 +0000 (UTC) Subject: rpms/perl-HTML-SimpleParse/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090301001353.CD4DE70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-SimpleParse/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsha2930/rpms/perl-HTML-SimpleParse/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTML-SimpleParse --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-HTML-SimpleParse # $Id: Makefile,v 1.1 2009/03/01 00:13:53 kevin Exp $ NAME := perl-HTML-SimpleParse SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Sun Mar 1 00:13:53 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:13:53 +0000 (UTC) Subject: rpms/perl-HTML-SimpleParse Makefile,NONE,1.1 Message-ID: <20090301001353.7EE4C70115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-SimpleParse In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsha2930/rpms/perl-HTML-SimpleParse Added Files: Makefile Log Message: Setup of module perl-HTML-SimpleParse --- NEW FILE Makefile --- # Top level Makefile for module perl-HTML-SimpleParse all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From pkgdb at fedoraproject.org Sun Mar 1 00:17:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:17:47 +0000 Subject: [pkgdb] perl-Data-FormValidator was added for iarnell Message-ID: <20090301001812.8740D2084D0@bastion.fedora.phx.redhat.com> kevin has added Package perl-Data-FormValidator with summary Validates user input based on input profile kevin has approved Package perl-Data-FormValidator kevin has added a Fedora devel branch for perl-Data-FormValidator with an owner of iarnell kevin has approved perl-Data-FormValidator in Fedora devel kevin has approved Package perl-Data-FormValidator kevin has set commit to Approved for provenpackager on perl-Data-FormValidator (Fedora devel) kevin has set build to Approved for provenpackager on perl-Data-FormValidator (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Data-FormValidator (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-FormValidator From pkgdb at fedoraproject.org Sun Mar 1 00:17:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:17:50 +0000 Subject: [pkgdb] perl-Data-FormValidator (Fedora, 9) updated by kevin Message-ID: <20090301001813.3F8BE2084D2@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-Data-FormValidator kevin has set commit to Approved for provenpackager on perl-Data-FormValidator (Fedora 9) kevin has set build to Approved for provenpackager on perl-Data-FormValidator (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-Data-FormValidator (Fedora 9) kevin approved watchbugzilla on perl-Data-FormValidator (Fedora 9) for perl-sig kevin approved watchcommits on perl-Data-FormValidator (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-FormValidator From pkgdb at fedoraproject.org Sun Mar 1 00:17:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:17:50 +0000 Subject: [pkgdb] perl-Data-FormValidator (Fedora, 10) updated by kevin Message-ID: <20090301001815.5AE2A208519@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Data-FormValidator kevin has set commit to Approved for provenpackager on perl-Data-FormValidator (Fedora 10) kevin has set build to Approved for provenpackager on perl-Data-FormValidator (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Data-FormValidator (Fedora 10) kevin approved watchbugzilla on perl-Data-FormValidator (Fedora 10) for perl-sig kevin approved watchcommits on perl-Data-FormValidator (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-FormValidator From pkgdb at fedoraproject.org Sun Mar 1 00:17:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:17:50 +0000 Subject: [pkgdb] perl-Data-FormValidator (Fedora, devel) updated by kevin Message-ID: <20090301001816.6349420851D@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Data-FormValidator (Fedora devel) for perl-sig kevin approved watchcommits on perl-Data-FormValidator (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-FormValidator From kevin at fedoraproject.org Sun Mar 1 00:18:02 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:18:02 +0000 (UTC) Subject: rpms/perl-Data-FormValidator - New directory Message-ID: <20090301001802.2600970116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Data-FormValidator In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslA3495/rpms/perl-Data-FormValidator Log Message: Directory /cvs/pkgs/rpms/perl-Data-FormValidator added to the repository From kevin at fedoraproject.org Sun Mar 1 00:18:02 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:18:02 +0000 (UTC) Subject: rpms/perl-Data-FormValidator/devel - New directory Message-ID: <20090301001802.5C6DD70131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Data-FormValidator/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslA3495/rpms/perl-Data-FormValidator/devel Log Message: Directory /cvs/pkgs/rpms/perl-Data-FormValidator/devel added to the repository From kevin at fedoraproject.org Sun Mar 1 00:18:18 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:18:18 +0000 (UTC) Subject: rpms/perl-Data-FormValidator Makefile,NONE,1.1 Message-ID: <20090301001818.3D5EF70115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Data-FormValidator In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslA3495/rpms/perl-Data-FormValidator Added Files: Makefile Log Message: Setup of module perl-Data-FormValidator --- NEW FILE Makefile --- # Top level Makefile for module perl-Data-FormValidator all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sun Mar 1 00:18:18 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:18:18 +0000 (UTC) Subject: rpms/perl-Data-FormValidator/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090301001818.81B9170115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Data-FormValidator/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslA3495/rpms/perl-Data-FormValidator/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Data-FormValidator --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Data-FormValidator # $Id: Makefile,v 1.1 2009/03/01 00:18:18 kevin Exp $ NAME := perl-Data-FormValidator SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sun Mar 1 00:19:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:19:14 +0000 Subject: [pkgdb] kde-plasma-networkmanagement was added for mathstuf Message-ID: <20090301001938.445A42084D0@bastion.fedora.phx.redhat.com> kevin has added Package kde-plasma-networkmanagement with summary NetworkManager KDE 4 integration kevin has approved Package kde-plasma-networkmanagement kevin has added a Fedora devel branch for kde-plasma-networkmanagement with an owner of mathstuf kevin has approved kde-plasma-networkmanagement in Fedora devel kevin has approved Package kde-plasma-networkmanagement kevin has set commit to Approved for provenpackager on kde-plasma-networkmanagement (Fedora devel) kevin has set build to Approved for provenpackager on kde-plasma-networkmanagement (Fedora devel) kevin has set checkout to Approved for provenpackager on kde-plasma-networkmanagement (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:19:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:19:19 +0000 Subject: [pkgdb] kde-plasma-networkmanagement (Fedora, devel) updated by kevin Message-ID: <20090301001943.E8628208519@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on kde-plasma-networkmanagement (Fedora devel) for rdieter kevin approved watchcommits on kde-plasma-networkmanagement (Fedora devel) for rdieter kevin approved commit on kde-plasma-networkmanagement (Fedora devel) for rdieter kevin approved build on kde-plasma-networkmanagement (Fedora devel) for rdieter kevin approved approveacls on kde-plasma-networkmanagement (Fedora devel) for rdieter To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:19:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:19:19 +0000 Subject: [pkgdb] kde-plasma-networkmanagement (Fedora, 9) updated by kevin Message-ID: <20090301001945.2AD2820851D@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for kde-plasma-networkmanagement kevin has set commit to Approved for provenpackager on kde-plasma-networkmanagement (Fedora 9) kevin has set build to Approved for provenpackager on kde-plasma-networkmanagement (Fedora 9) kevin has set checkout to Approved for provenpackager on kde-plasma-networkmanagement (Fedora 9) kevin approved watchbugzilla on kde-plasma-networkmanagement (Fedora 9) for rdieter kevin approved watchcommits on kde-plasma-networkmanagement (Fedora 9) for rdieter kevin approved commit on kde-plasma-networkmanagement (Fedora 9) for rdieter kevin approved build on kde-plasma-networkmanagement (Fedora 9) for rdieter kevin approved approveacls on kde-plasma-networkmanagement (Fedora 9) for rdieter To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:19:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:19:19 +0000 Subject: [pkgdb] kde-plasma-networkmanagement (Fedora, 10) updated by kevin Message-ID: <20090301001946.9AB17208520@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for kde-plasma-networkmanagement kevin has set commit to Approved for provenpackager on kde-plasma-networkmanagement (Fedora 10) kevin has set build to Approved for provenpackager on kde-plasma-networkmanagement (Fedora 10) kevin has set checkout to Approved for provenpackager on kde-plasma-networkmanagement (Fedora 10) kevin approved watchbugzilla on kde-plasma-networkmanagement (Fedora 10) for rdieter kevin approved watchcommits on kde-plasma-networkmanagement (Fedora 10) for rdieter kevin approved commit on kde-plasma-networkmanagement (Fedora 10) for rdieter kevin approved build on kde-plasma-networkmanagement (Fedora 10) for rdieter kevin approved approveacls on kde-plasma-networkmanagement (Fedora 10) for rdieter To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From kevin at fedoraproject.org Sun Mar 1 00:19:33 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:19:33 +0000 (UTC) Subject: rpms/kde-plasma-networkmanagement/devel - New directory Message-ID: <20090301001933.8079470131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBE3726/rpms/kde-plasma-networkmanagement/devel Log Message: Directory /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel added to the repository From kevin at fedoraproject.org Sun Mar 1 00:19:33 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:19:33 +0000 (UTC) Subject: rpms/kde-plasma-networkmanagement - New directory Message-ID: <20090301001933.330A570115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBE3726/rpms/kde-plasma-networkmanagement Log Message: Directory /cvs/pkgs/rpms/kde-plasma-networkmanagement added to the repository From kevin at fedoraproject.org Sun Mar 1 00:19:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:19:52 +0000 (UTC) Subject: rpms/kde-plasma-networkmanagement/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090301001952.68BBA70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBE3726/rpms/kde-plasma-networkmanagement/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kde-plasma-networkmanagement --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: kde-plasma-networkmanagement # $Id: Makefile,v 1.1 2009/03/01 00:19:52 kevin Exp $ NAME := kde-plasma-networkmanagement SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Sun Mar 1 00:19:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:19:52 +0000 (UTC) Subject: rpms/kde-plasma-networkmanagement Makefile,NONE,1.1 Message-ID: <20090301001952.1345670115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBE3726/rpms/kde-plasma-networkmanagement Added Files: Makefile Log Message: Setup of module kde-plasma-networkmanagement --- NEW FILE Makefile --- # Top level Makefile for module kde-plasma-networkmanagement all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From pkgdb at fedoraproject.org Sun Mar 1 00:20:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:20:39 +0000 Subject: [pkgdb] perl-DateTime-Format-ISO8601 was added for cweyl Message-ID: <20090301002043.68345208524@bastion.fedora.phx.redhat.com> kevin has added Package perl-DateTime-Format-ISO8601 with summary Parses ISO8601 formats kevin has approved Package perl-DateTime-Format-ISO8601 kevin has added a Fedora devel branch for perl-DateTime-Format-ISO8601 with an owner of cweyl kevin has approved perl-DateTime-Format-ISO8601 in Fedora devel kevin has approved Package perl-DateTime-Format-ISO8601 kevin has set commit to Approved for provenpackager on perl-DateTime-Format-ISO8601 (Fedora devel) kevin has set build to Approved for provenpackager on perl-DateTime-Format-ISO8601 (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-DateTime-Format-ISO8601 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-ISO8601 From pkgdb at fedoraproject.org Sun Mar 1 00:20:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:20:22 +0000 Subject: [pkgdb] perl-DateTime-Format-ISO8601 (Fedora, 9) updated by kevin Message-ID: <20090301002045.DA992208480@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-DateTime-Format-ISO8601 kevin has set commit to Approved for provenpackager on perl-DateTime-Format-ISO8601 (Fedora 9) kevin has set build to Approved for provenpackager on perl-DateTime-Format-ISO8601 (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-DateTime-Format-ISO8601 (Fedora 9) kevin approved watchbugzilla on perl-DateTime-Format-ISO8601 (Fedora 9) for perl-sig kevin approved watchcommits on perl-DateTime-Format-ISO8601 (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-ISO8601 From pkgdb at fedoraproject.org Sun Mar 1 00:20:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:20:22 +0000 Subject: [pkgdb] perl-DateTime-Format-ISO8601 (Fedora, devel) updated by kevin Message-ID: <20090301002054.BAF5420851E@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-DateTime-Format-ISO8601 (Fedora devel) for perl-sig kevin approved watchcommits on perl-DateTime-Format-ISO8601 (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-ISO8601 From pkgdb at fedoraproject.org Sun Mar 1 00:20:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:20:22 +0000 Subject: [pkgdb] perl-DateTime-Format-ISO8601 (Fedora, 10) updated by kevin Message-ID: <20090301002051.4898C2084D2@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-DateTime-Format-ISO8601 kevin has set commit to Approved for provenpackager on perl-DateTime-Format-ISO8601 (Fedora 10) kevin has set build to Approved for provenpackager on perl-DateTime-Format-ISO8601 (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-DateTime-Format-ISO8601 (Fedora 10) kevin approved watchbugzilla on perl-DateTime-Format-ISO8601 (Fedora 10) for perl-sig kevin approved watchcommits on perl-DateTime-Format-ISO8601 (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-ISO8601 From kevin at fedoraproject.org Sun Mar 1 00:20:42 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:20:42 +0000 (UTC) Subject: rpms/perl-DateTime-Format-ISO8601 - New directory Message-ID: <20090301002042.2F5ED70115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-DateTime-Format-ISO8601 In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdH3931/rpms/perl-DateTime-Format-ISO8601 Log Message: Directory /cvs/pkgs/rpms/perl-DateTime-Format-ISO8601 added to the repository From kevin at fedoraproject.org Sun Mar 1 00:20:42 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:20:42 +0000 (UTC) Subject: rpms/perl-DateTime-Format-ISO8601/devel - New directory Message-ID: <20090301002042.7037070116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-DateTime-Format-ISO8601/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdH3931/rpms/perl-DateTime-Format-ISO8601/devel Log Message: Directory /cvs/pkgs/rpms/perl-DateTime-Format-ISO8601/devel added to the repository From kevin at fedoraproject.org Sun Mar 1 00:21:01 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:21:01 +0000 (UTC) Subject: rpms/perl-DateTime-Format-ISO8601 Makefile,NONE,1.1 Message-ID: <20090301002101.C9DD170115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-DateTime-Format-ISO8601 In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdH3931/rpms/perl-DateTime-Format-ISO8601 Added Files: Makefile Log Message: Setup of module perl-DateTime-Format-ISO8601 --- NEW FILE Makefile --- # Top level Makefile for module perl-DateTime-Format-ISO8601 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sun Mar 1 00:21:02 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:21:02 +0000 (UTC) Subject: rpms/perl-DateTime-Format-ISO8601/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090301002102.33F5370115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-DateTime-Format-ISO8601/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdH3931/rpms/perl-DateTime-Format-ISO8601/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-DateTime-Format-ISO8601 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-DateTime-Format-ISO8601 # $Id: Makefile,v 1.1 2009/03/01 00:21:01 kevin Exp $ NAME := perl-DateTime-Format-ISO8601 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sun Mar 1 00:21:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:21:50 +0000 Subject: [pkgdb] perl-HTML-FormFu-Model-DBIC was added for cweyl Message-ID: <20090301002150.9F1FF2084BA@bastion.fedora.phx.redhat.com> kevin has added Package perl-HTML-FormFu-Model-DBIC with summary Integrate HTML::FormFu with DBIx::Class kevin has approved Package perl-HTML-FormFu-Model-DBIC kevin has added a Fedora devel branch for perl-HTML-FormFu-Model-DBIC with an owner of cweyl kevin has approved perl-HTML-FormFu-Model-DBIC in Fedora devel kevin has approved Package perl-HTML-FormFu-Model-DBIC kevin has set commit to Approved for provenpackager on perl-HTML-FormFu-Model-DBIC (Fedora devel) kevin has set build to Approved for provenpackager on perl-HTML-FormFu-Model-DBIC (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-HTML-FormFu-Model-DBIC (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-FormFu-Model-DBIC From pkgdb at fedoraproject.org Sun Mar 1 00:21:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:21:54 +0000 Subject: [pkgdb] perl-HTML-FormFu-Model-DBIC (Fedora, 9) updated by kevin Message-ID: <20090301002154.3FADF2084D2@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-HTML-FormFu-Model-DBIC kevin has set commit to Approved for provenpackager on perl-HTML-FormFu-Model-DBIC (Fedora 9) kevin has set build to Approved for provenpackager on perl-HTML-FormFu-Model-DBIC (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-HTML-FormFu-Model-DBIC (Fedora 9) kevin approved watchbugzilla on perl-HTML-FormFu-Model-DBIC (Fedora 9) for perl-sig kevin approved watchcommits on perl-HTML-FormFu-Model-DBIC (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-FormFu-Model-DBIC From pkgdb at fedoraproject.org Sun Mar 1 00:21:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:21:54 +0000 Subject: [pkgdb] perl-HTML-FormFu-Model-DBIC (Fedora, 10) updated by kevin Message-ID: <20090301002154.640FC20851A@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-HTML-FormFu-Model-DBIC kevin has set commit to Approved for provenpackager on perl-HTML-FormFu-Model-DBIC (Fedora 10) kevin has set build to Approved for provenpackager on perl-HTML-FormFu-Model-DBIC (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-HTML-FormFu-Model-DBIC (Fedora 10) kevin approved watchbugzilla on perl-HTML-FormFu-Model-DBIC (Fedora 10) for perl-sig kevin approved watchcommits on perl-HTML-FormFu-Model-DBIC (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-FormFu-Model-DBIC From pkgdb at fedoraproject.org Sun Mar 1 00:21:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:21:54 +0000 Subject: [pkgdb] perl-HTML-FormFu-Model-DBIC (Fedora, devel) updated by kevin Message-ID: <20090301002154.7C48220851E@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-HTML-FormFu-Model-DBIC (Fedora devel) for perl-sig kevin approved watchcommits on perl-HTML-FormFu-Model-DBIC (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-FormFu-Model-DBIC From kevin at fedoraproject.org Sun Mar 1 00:21:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:21:55 +0000 (UTC) Subject: rpms/perl-HTML-FormFu-Model-DBIC - New directory Message-ID: <20090301002155.39DC170115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-FormFu-Model-DBIC In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNj4176/rpms/perl-HTML-FormFu-Model-DBIC Log Message: Directory /cvs/pkgs/rpms/perl-HTML-FormFu-Model-DBIC added to the repository From kevin at fedoraproject.org Sun Mar 1 00:21:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:21:55 +0000 (UTC) Subject: rpms/perl-HTML-FormFu-Model-DBIC/devel - New directory Message-ID: <20090301002155.8D14170115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-FormFu-Model-DBIC/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNj4176/rpms/perl-HTML-FormFu-Model-DBIC/devel Log Message: Directory /cvs/pkgs/rpms/perl-HTML-FormFu-Model-DBIC/devel added to the repository From kevin at fedoraproject.org Sun Mar 1 00:22:13 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:22:13 +0000 (UTC) Subject: rpms/perl-HTML-FormFu-Model-DBIC/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090301002213.3147270131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-FormFu-Model-DBIC/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNj4176/rpms/perl-HTML-FormFu-Model-DBIC/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTML-FormFu-Model-DBIC --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-HTML-FormFu-Model-DBIC # $Id: Makefile,v 1.1 2009/03/01 00:22:13 kevin Exp $ NAME := perl-HTML-FormFu-Model-DBIC SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Sun Mar 1 00:22:12 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:22:12 +0000 (UTC) Subject: rpms/perl-HTML-FormFu-Model-DBIC Makefile,NONE,1.1 Message-ID: <20090301002212.DBB2170115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-FormFu-Model-DBIC In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNj4176/rpms/perl-HTML-FormFu-Model-DBIC Added Files: Makefile Log Message: Setup of module perl-HTML-FormFu-Model-DBIC --- NEW FILE Makefile --- # Top level Makefile for module perl-HTML-FormFu-Model-DBIC all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From pkgdb at fedoraproject.org Sun Mar 1 00:24:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:24:02 +0000 Subject: [pkgdb] perl-HTML-LinkList was added for cweyl Message-ID: <20090301002402.69A1B2084BA@bastion.fedora.phx.redhat.com> kevin has added Package perl-HTML-LinkList with summary Create a 'smart' list of HTML links kevin has approved Package perl-HTML-LinkList kevin has added a Fedora devel branch for perl-HTML-LinkList with an owner of cweyl kevin has approved perl-HTML-LinkList in Fedora devel kevin has approved Package perl-HTML-LinkList kevin has set commit to Approved for provenpackager on perl-HTML-LinkList (Fedora devel) kevin has set build to Approved for provenpackager on perl-HTML-LinkList (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-HTML-LinkList (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-LinkList From pkgdb at fedoraproject.org Sun Mar 1 00:23:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:23:42 +0000 Subject: [pkgdb] perl-HTML-LinkList (Fedora, 9) updated by kevin Message-ID: <20090301002406.D90DE2084D2@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-HTML-LinkList kevin has set commit to Approved for provenpackager on perl-HTML-LinkList (Fedora 9) kevin has set build to Approved for provenpackager on perl-HTML-LinkList (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-HTML-LinkList (Fedora 9) kevin approved watchbugzilla on perl-HTML-LinkList (Fedora 9) for perl-sig kevin approved watchcommits on perl-HTML-LinkList (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-LinkList From pkgdb at fedoraproject.org Sun Mar 1 00:23:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:23:42 +0000 Subject: [pkgdb] perl-HTML-LinkList (Fedora, devel) updated by kevin Message-ID: <20090301002407.AE95220851A@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-HTML-LinkList (Fedora devel) for perl-sig kevin approved watchcommits on perl-HTML-LinkList (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-LinkList From pkgdb at fedoraproject.org Sun Mar 1 00:23:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:23:42 +0000 Subject: [pkgdb] perl-HTML-LinkList (Fedora, 10) updated by kevin Message-ID: <20090301002408.2BF1320851E@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-HTML-LinkList kevin has set commit to Approved for provenpackager on perl-HTML-LinkList (Fedora 10) kevin has set build to Approved for provenpackager on perl-HTML-LinkList (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-HTML-LinkList (Fedora 10) kevin approved watchbugzilla on perl-HTML-LinkList (Fedora 10) for perl-sig kevin approved watchcommits on perl-HTML-LinkList (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-LinkList From kevin at fedoraproject.org Sun Mar 1 00:23:58 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:23:58 +0000 (UTC) Subject: rpms/perl-HTML-LinkList - New directory Message-ID: <20090301002358.2421270115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-LinkList In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPo4487/rpms/perl-HTML-LinkList Log Message: Directory /cvs/pkgs/rpms/perl-HTML-LinkList added to the repository From kevin at fedoraproject.org Sun Mar 1 00:23:58 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:23:58 +0000 (UTC) Subject: rpms/perl-HTML-LinkList/devel - New directory Message-ID: <20090301002358.61F7770115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-LinkList/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPo4487/rpms/perl-HTML-LinkList/devel Log Message: Directory /cvs/pkgs/rpms/perl-HTML-LinkList/devel added to the repository From kevin at fedoraproject.org Sun Mar 1 00:24:17 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:24:17 +0000 (UTC) Subject: rpms/perl-HTML-LinkList Makefile,NONE,1.1 Message-ID: <20090301002417.ABED670115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-LinkList In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPo4487/rpms/perl-HTML-LinkList Added Files: Makefile Log Message: Setup of module perl-HTML-LinkList --- NEW FILE Makefile --- # Top level Makefile for module perl-HTML-LinkList all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sun Mar 1 00:24:17 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:24:17 +0000 (UTC) Subject: rpms/perl-HTML-LinkList/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090301002417.ED4E970115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-LinkList/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPo4487/rpms/perl-HTML-LinkList/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTML-LinkList --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-HTML-LinkList # $Id: Makefile,v 1.1 2009/03/01 00:24:17 kevin Exp $ NAME := perl-HTML-LinkList SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sun Mar 1 00:24:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:24:57 +0000 Subject: [pkgdb] perl-Task-Catalyst was added for cweyl Message-ID: <20090301002457.6293A2084D0@bastion.fedora.phx.redhat.com> kevin has added Package perl-Task-Catalyst with summary All you need to start with Catalyst kevin has approved Package perl-Task-Catalyst kevin has added a Fedora devel branch for perl-Task-Catalyst with an owner of cweyl kevin has approved perl-Task-Catalyst in Fedora devel kevin has approved Package perl-Task-Catalyst kevin has set commit to Approved for provenpackager on perl-Task-Catalyst (Fedora devel) kevin has set build to Approved for provenpackager on perl-Task-Catalyst (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Task-Catalyst (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Task-Catalyst From pkgdb at fedoraproject.org Sun Mar 1 00:24:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:24:38 +0000 Subject: [pkgdb] perl-Task-Catalyst (Fedora, 9) updated by kevin Message-ID: <20090301002500.B6C77208515@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-Task-Catalyst kevin has set commit to Approved for provenpackager on perl-Task-Catalyst (Fedora 9) kevin has set build to Approved for provenpackager on perl-Task-Catalyst (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-Task-Catalyst (Fedora 9) kevin approved watchbugzilla on perl-Task-Catalyst (Fedora 9) for perl-sig kevin approved watchcommits on perl-Task-Catalyst (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Task-Catalyst From pkgdb at fedoraproject.org Sun Mar 1 00:24:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:24:38 +0000 Subject: [pkgdb] perl-Task-Catalyst (Fedora, devel) updated by kevin Message-ID: <20090301002502.3EED120851E@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Task-Catalyst (Fedora devel) for perl-sig kevin approved watchcommits on perl-Task-Catalyst (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Task-Catalyst From pkgdb at fedoraproject.org Sun Mar 1 00:24:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:24:38 +0000 Subject: [pkgdb] perl-Task-Catalyst (Fedora, 10) updated by kevin Message-ID: <20090301002503.B711E208521@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Task-Catalyst kevin has set commit to Approved for provenpackager on perl-Task-Catalyst (Fedora 10) kevin has set build to Approved for provenpackager on perl-Task-Catalyst (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Task-Catalyst (Fedora 10) kevin approved watchbugzilla on perl-Task-Catalyst (Fedora 10) for perl-sig kevin approved watchcommits on perl-Task-Catalyst (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Task-Catalyst From kevin at fedoraproject.org Sun Mar 1 00:24:50 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:24:50 +0000 (UTC) Subject: rpms/perl-Task-Catalyst - New directory Message-ID: <20090301002450.22FB370115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Task-Catalyst In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfw4694/rpms/perl-Task-Catalyst Log Message: Directory /cvs/pkgs/rpms/perl-Task-Catalyst added to the repository From kevin at fedoraproject.org Sun Mar 1 00:24:50 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:24:50 +0000 (UTC) Subject: rpms/perl-Task-Catalyst/devel - New directory Message-ID: <20090301002450.5B34570116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Task-Catalyst/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfw4694/rpms/perl-Task-Catalyst/devel Log Message: Directory /cvs/pkgs/rpms/perl-Task-Catalyst/devel added to the repository From kevin at fedoraproject.org Sun Mar 1 00:25:05 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:25:05 +0000 (UTC) Subject: rpms/perl-Task-Catalyst/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090301002505.D960670131@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Task-Catalyst/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfw4694/rpms/perl-Task-Catalyst/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Task-Catalyst --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Task-Catalyst # $Id: Makefile,v 1.1 2009/03/01 00:25:05 kevin Exp $ NAME := perl-Task-Catalyst SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Sun Mar 1 00:25:05 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:25:05 +0000 (UTC) Subject: rpms/perl-Task-Catalyst Makefile,NONE,1.1 Message-ID: <20090301002505.9FA0470115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Task-Catalyst In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfw4694/rpms/perl-Task-Catalyst Added Files: Makefile Log Message: Setup of module perl-Task-Catalyst --- NEW FILE Makefile --- # Top level Makefile for module perl-Task-Catalyst all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From pkgdb at fedoraproject.org Sun Mar 1 00:27:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:27:51 +0000 Subject: [pkgdb] kde-plasma-networkmanagement: kkofler has requested watchbugzilla Message-ID: <20090301002816.072082084D1@bastion.fedora.phx.redhat.com> kkofler has requested the watchbugzilla acl on kde-plasma-networkmanagement (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:27:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:27:59 +0000 Subject: [pkgdb] anki was added for chkr Message-ID: <20090301002823.03E6720851B@bastion.fedora.phx.redhat.com> kevin has added Package anki with summary Flashcard program for using space repetition learning kevin has approved Package anki kevin has added a Fedora devel branch for anki with an owner of chkr kevin has approved anki in Fedora devel kevin has approved Package anki kevin has set commit to Approved for provenpackager on anki (Fedora devel) kevin has set build to Approved for provenpackager on anki (Fedora devel) kevin has set checkout to Approved for provenpackager on anki (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anki From pkgdb at fedoraproject.org Sun Mar 1 00:28:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:28:22 +0000 Subject: [pkgdb] kde-plasma-networkmanagement: kkofler has requested watchcommits Message-ID: <20090301002823.0B7AA20851D@bastion.fedora.phx.redhat.com> kkofler has requested the watchcommits acl on kde-plasma-networkmanagement (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:28:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:28:26 +0000 Subject: [pkgdb] anki (Fedora, 9) updated by kevin Message-ID: <20090301002826.5562D208525@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for anki kevin has set commit to Approved for provenpackager on anki (Fedora 9) kevin has set build to Approved for provenpackager on anki (Fedora 9) kevin has set checkout to Approved for provenpackager on anki (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anki From pkgdb at fedoraproject.org Sun Mar 1 00:28:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:28:04 +0000 Subject: [pkgdb] kde-plasma-networkmanagement: kkofler has requested commit Message-ID: <20090301002826.558E6208526@bastion.fedora.phx.redhat.com> kkofler has requested the commit acl on kde-plasma-networkmanagement (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:28:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:28:26 +0000 Subject: [pkgdb] anki (Fedora, 10) updated by kevin Message-ID: <20090301002826.72B2D208529@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for anki kevin has set commit to Approved for provenpackager on anki (Fedora 10) kevin has set build to Approved for provenpackager on anki (Fedora 10) kevin has set checkout to Approved for provenpackager on anki (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anki From pkgdb at fedoraproject.org Sun Mar 1 00:28:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:28:30 +0000 Subject: [pkgdb] kde-plasma-networkmanagement: kkofler has requested approveacls Message-ID: <20090301002831.12A4820852C@bastion.fedora.phx.redhat.com> kkofler has requested the approveacls acl on kde-plasma-networkmanagement (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:28:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:28:11 +0000 Subject: [pkgdb] kde-plasma-networkmanagement: kkofler has requested watchbugzilla Message-ID: <20090301002835.21E0C208530@bastion.fedora.phx.redhat.com> kkofler has requested the watchbugzilla acl on kde-plasma-networkmanagement (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:28:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:28:37 +0000 Subject: [pkgdb] kde-plasma-networkmanagement: kkofler has requested watchcommits Message-ID: <20090301002838.2D3E7208534@bastion.fedora.phx.redhat.com> kkofler has requested the watchcommits acl on kde-plasma-networkmanagement (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From kevin at fedoraproject.org Sun Mar 1 00:28:17 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:28:17 +0000 (UTC) Subject: rpms/anki - New directory Message-ID: <20090301002817.2705F70115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/anki In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnj5091/rpms/anki Log Message: Directory /cvs/pkgs/rpms/anki added to the repository From kevin at fedoraproject.org Sun Mar 1 00:28:17 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:28:17 +0000 (UTC) Subject: rpms/anki/devel - New directory Message-ID: <20090301002817.60D7970115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/anki/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnj5091/rpms/anki/devel Log Message: Directory /cvs/pkgs/rpms/anki/devel added to the repository From pkgdb at fedoraproject.org Sun Mar 1 00:28:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:28:18 +0000 Subject: [pkgdb] kde-plasma-networkmanagement: kkofler has requested commit Message-ID: <20090301002840.67D9E208539@bastion.fedora.phx.redhat.com> kkofler has requested the commit acl on kde-plasma-networkmanagement (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:28:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:28:46 +0000 Subject: [pkgdb] kde-plasma-networkmanagement: kkofler has requested approveacls Message-ID: <20090301002848.4BD7820853D@bastion.fedora.phx.redhat.com> kkofler has requested the approveacls acl on kde-plasma-networkmanagement (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From kevin at fedoraproject.org Sun Mar 1 00:28:33 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:28:33 +0000 (UTC) Subject: rpms/anki Makefile,NONE,1.1 Message-ID: <20090301002833.5F59870115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/anki In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnj5091/rpms/anki Added Files: Makefile Log Message: Setup of module anki --- NEW FILE Makefile --- # Top level Makefile for module anki all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sun Mar 1 00:28:34 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:28:34 +0000 (UTC) Subject: rpms/anki/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090301002834.01A2D70115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/anki/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnj5091/rpms/anki/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module anki --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: anki # $Id: Makefile,v 1.1 2009/03/01 00:28:33 kevin Exp $ NAME := anki SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sun Mar 1 00:28:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:28:29 +0000 Subject: [pkgdb] kde-plasma-networkmanagement: kkofler has requested watchbugzilla Message-ID: <20090301002853.5695E20851D@bastion.fedora.phx.redhat.com> kkofler has requested the watchbugzilla acl on kde-plasma-networkmanagement (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:28:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:28:57 +0000 Subject: [pkgdb] kde-plasma-networkmanagement: kkofler has requested watchcommits Message-ID: <20090301002857.DCBBA208545@bastion.fedora.phx.redhat.com> kkofler has requested the watchcommits acl on kde-plasma-networkmanagement (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:28:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:28:39 +0000 Subject: [pkgdb] kde-plasma-networkmanagement: kkofler has requested commit Message-ID: <20090301002903.38AD0208520@bastion.fedora.phx.redhat.com> kkofler has requested the commit acl on kde-plasma-networkmanagement (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:29:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:29:05 +0000 Subject: [pkgdb] kde-plasma-networkmanagement: kkofler has requested approveacls Message-ID: <20090301002907.26217208544@bastion.fedora.phx.redhat.com> kkofler has requested the approveacls acl on kde-plasma-networkmanagement (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:29:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:29:49 +0000 Subject: [pkgdb] bashdb was added for roma Message-ID: <20090301002949.8329A20852B@bastion.fedora.phx.redhat.com> kevin has added Package bashdb with summary BASH debugger, the BASH symbolic debugger kevin has approved Package bashdb kevin has added a Fedora devel branch for bashdb with an owner of roma kevin has approved bashdb in Fedora devel kevin has approved Package bashdb kevin has set commit to Approved for provenpackager on bashdb (Fedora devel) kevin has set build to Approved for provenpackager on bashdb (Fedora devel) kevin has set checkout to Approved for provenpackager on bashdb (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bashdb From pkgdb at fedoraproject.org Sun Mar 1 00:29:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:29:33 +0000 Subject: [pkgdb] bashdb (Fedora, 9) updated by kevin Message-ID: <20090301002955.A3FB020852D@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for bashdb kevin has set commit to Approved for provenpackager on bashdb (Fedora 9) kevin has set build to Approved for provenpackager on bashdb (Fedora 9) kevin has set checkout to Approved for provenpackager on bashdb (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bashdb From kevin at fedoraproject.org Sun Mar 1 00:29:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:29:47 +0000 (UTC) Subject: rpms/bashdb - New directory Message-ID: <20090301002947.2851270115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/bashdb In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNu5319/rpms/bashdb Log Message: Directory /cvs/pkgs/rpms/bashdb added to the repository From pkgdb at fedoraproject.org Sun Mar 1 00:29:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:29:33 +0000 Subject: [pkgdb] bashdb (Fedora, 10) updated by kevin Message-ID: <20090301002958.542E2208537@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for bashdb kevin has set commit to Approved for provenpackager on bashdb (Fedora 10) kevin has set build to Approved for provenpackager on bashdb (Fedora 10) kevin has set checkout to Approved for provenpackager on bashdb (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bashdb From kevin at fedoraproject.org Sun Mar 1 00:29:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:29:47 +0000 (UTC) Subject: rpms/bashdb/devel - New directory Message-ID: <20090301002947.62E2E70115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/bashdb/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNu5319/rpms/bashdb/devel Log Message: Directory /cvs/pkgs/rpms/bashdb/devel added to the repository From kevin at fedoraproject.org Sun Mar 1 00:30:05 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:30:05 +0000 (UTC) Subject: rpms/bashdb Makefile,NONE,1.1 Message-ID: <20090301003005.6E76270115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/bashdb In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNu5319/rpms/bashdb Added Files: Makefile Log Message: Setup of module bashdb --- NEW FILE Makefile --- # Top level Makefile for module bashdb all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sun Mar 1 00:30:06 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 1 Mar 2009 00:30:06 +0000 (UTC) Subject: rpms/bashdb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090301003006.0ECC270115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/bashdb/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNu5319/rpms/bashdb/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bashdb --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: bashdb # $Id: Makefile,v 1.1 2009/03/01 00:30:05 kevin Exp $ NAME := bashdb SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sun Mar 1 00:30:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:30:50 +0000 Subject: [pkgdb] zeroinstall-injector (Fedora EPEL, 5) updated by kevin Message-ID: <20090301003050.55391208521@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for zeroinstall-injector kevin has set commit to Approved for provenpackager on zeroinstall-injector (Fedora EPEL 5) kevin has set build to Approved for provenpackager on zeroinstall-injector (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on zeroinstall-injector (Fedora EPEL 5) kevin changed owner of zeroinstall-injector in Fedora EPEL 5 to salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/zeroinstall-injector From pkgdb at fedoraproject.org Sun Mar 1 00:32:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:32:31 +0000 Subject: [pkgdb] kde-plasma-networkmanagement had acl change status Message-ID: <20090301003255.39FC62084D2@bastion.fedora.phx.redhat.com> mathstuf has set the watchbugzilla acl on kde-plasma-networkmanagement (Fedora devel) to Approved for kkofler To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:32:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:32:55 +0000 Subject: [pkgdb] kde-plasma-networkmanagement had acl change status Message-ID: <20090301003255.B894220851A@bastion.fedora.phx.redhat.com> mathstuf has set the watchcommits acl on kde-plasma-networkmanagement (Fedora devel) to Approved for kkofler To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:32:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:32:56 +0000 Subject: [pkgdb] kde-plasma-networkmanagement had acl change status Message-ID: <20090301003256.6882F20851F@bastion.fedora.phx.redhat.com> mathstuf has set the commit acl on kde-plasma-networkmanagement (Fedora devel) to Approved for kkofler To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:32:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:32:37 +0000 Subject: [pkgdb] kde-plasma-networkmanagement had acl change status Message-ID: <20090301003300.E3406208525@bastion.fedora.phx.redhat.com> mathstuf has set the approveacls acl on kde-plasma-networkmanagement (Fedora devel) to Approved for kkofler To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:32:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:32:43 +0000 Subject: [pkgdb] kde-plasma-networkmanagement had acl change status Message-ID: <20090301003309.DA25A20852D@bastion.fedora.phx.redhat.com> mathstuf has set the watchbugzilla acl on kde-plasma-networkmanagement (Fedora 10) to Approved for kkofler To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:33:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:33:07 +0000 Subject: [pkgdb] kde-plasma-networkmanagement had acl change status Message-ID: <20090301003310.06EB820852E@bastion.fedora.phx.redhat.com> mathstuf has set the commit acl on kde-plasma-networkmanagement (Fedora 10) to Approved for kkofler To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:33:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:33:07 +0000 Subject: [pkgdb] kde-plasma-networkmanagement had acl change status Message-ID: <20090301003310.D7827208532@bastion.fedora.phx.redhat.com> mathstuf has set the watchcommits acl on kde-plasma-networkmanagement (Fedora 10) to Approved for kkofler To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:32:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:32:48 +0000 Subject: [pkgdb] kde-plasma-networkmanagement had acl change status Message-ID: <20090301003310.D8F5D208533@bastion.fedora.phx.redhat.com> mathstuf has set the approveacls acl on kde-plasma-networkmanagement (Fedora 10) to Approved for kkofler To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:32:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:32:49 +0000 Subject: [pkgdb] kde-plasma-networkmanagement had acl change status Message-ID: <20090301003314.3BE04208537@bastion.fedora.phx.redhat.com> mathstuf has set the watchbugzilla acl on kde-plasma-networkmanagement (Fedora 9) to Approved for kkofler To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:33:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:33:14 +0000 Subject: [pkgdb] kde-plasma-networkmanagement had acl change status Message-ID: <20090301003316.7533420853C@bastion.fedora.phx.redhat.com> mathstuf has set the commit acl on kde-plasma-networkmanagement (Fedora 9) to Approved for kkofler To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:32:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:32:55 +0000 Subject: [pkgdb] kde-plasma-networkmanagement had acl change status Message-ID: <20090301003318.6E99B208545@bastion.fedora.phx.redhat.com> mathstuf has set the approveacls acl on kde-plasma-networkmanagement (Fedora 9) to Approved for kkofler To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From pkgdb at fedoraproject.org Sun Mar 1 00:33:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 00:33:16 +0000 Subject: [pkgdb] kde-plasma-networkmanagement had acl change status Message-ID: <20090301003318.2009E208542@bastion.fedora.phx.redhat.com> mathstuf has set the watchcommits acl on kde-plasma-networkmanagement (Fedora 9) to Approved for kkofler To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-networkmanagement From cwickert at fedoraproject.org Sun Mar 1 01:40:34 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Sun, 1 Mar 2009 01:40:34 +0000 (UTC) Subject: rpms/thunar-volman/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 thunar-volman.spec, 1.6, 1.7 Message-ID: <20090301014034.BF7CE70115@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/thunar-volman/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14417 Modified Files: .cvsignore sources thunar-volman.spec Log Message: * Sat Feb 28 2009 Christoph Wickert - 0.3.80-1 - Update to 0.3.80 - Add Category X-XfceSettingsDialog Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/thunar-volman/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Dec 2007 20:35:35 -0000 1.3 +++ .cvsignore 1 Mar 2009 01:40:02 -0000 1.4 @@ -1 +1 @@ -thunar-volman-0.2.0.tar.bz2 +thunar-volman-0.3.80.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/thunar-volman/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Dec 2007 20:35:35 -0000 1.3 +++ sources 1 Mar 2009 01:40:02 -0000 1.4 @@ -1 +1 @@ -e4587967fe3b3858d93735fee3edb2fc thunar-volman-0.2.0.tar.bz2 +4fd81b62690797317ca649ab20609dae thunar-volman-0.3.80.tar.bz2 Index: thunar-volman.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunar-volman/devel/thunar-volman.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- thunar-volman.spec 25 Feb 2009 20:31:52 -0000 1.6 +++ thunar-volman.spec 1 Mar 2009 01:40:02 -0000 1.7 @@ -1,8 +1,8 @@ -%define thunarver 0.9.0 +%define thunarver 1.0.0 Name: thunar-volman -Version: 0.2.0 -Release: 3%{?dist} +Version: 0.3.80 +Release: 1%{?dist} Summary: Automatic management of removable drives and media for the Thunar file manager Group: User Interface/Desktops @@ -42,8 +42,7 @@ %find_lang %{name} desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --remove-category=DesktopSettings \ - --add-category=HardwareSettings \ + --add-category=X-XfceSettingsDialog \ --add-only-show-in=XFCE \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}-settings.desktop @@ -73,20 +72,24 @@ %changelog +* Sat Feb 28 2009 Christoph Wickert - 0.3.80-1 +- Update to 0.3.80 +- Add Category X-XfceSettingsDialog + * Wed Feb 25 2009 Fedora Release Engineering - 0.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Mon Feb 18 2008 Fedora Release Engineering - 0.2.0-2 - Autorebuild for GCC 4.3 -* Mon Dec 03 2007 Christoph Wickert - 0.2.0-1 +* Mon Dec 03 2007 Christoph Wickert - 0.2.0-1 - Update to 0.2.0 and Thunar 0.9.0 -* Tue Aug 21 2007 Christoph Wickert - 0.1.2-2 +* Tue Aug 21 2007 Christoph Wickert - 0.1.2-2 - Rebuild for BuildID feature -* Sun Jan 21 2007 Christoph Wickert - 0.1.2-1 +* Sun Jan 21 2007 Christoph Wickert - 0.1.2-1 - Update to 0.1.2. -* Wed Jan 17 2007 Christoph Wickert - 0.1.0-1 +* Wed Jan 17 2007 Christoph Wickert - 0.1.0-1 - Initial packaging. From roma at fedoraproject.org Sun Mar 1 01:53:18 2009 From: roma at fedoraproject.org (Paulo Roma Cavalcanti) Date: Sun, 1 Mar 2009 01:53:18 +0000 (UTC) Subject: rpms/pydb/F-9 import.log, NONE, 1.1 pydb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301015319.04FAB70115@cvs1.fedora.phx.redhat.com> Author: roma Update of /cvs/pkgs/rpms/pydb/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16332/F-9 Modified Files: .cvsignore sources Added Files: import.log pydb.spec Log Message: Initial version. --- NEW FILE import.log --- pydb-1_25-4_fc10:F-9:pydb-1.25-4.fc10.src.rpm:1235872311 --- NEW FILE pydb.spec --- %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: Extended Python Debugger Name: pydb Version: 1.25 Release: 4%{?dist} License: GPLv2+ Group: Development/Debuggers Url: http://bashdb.sourceforge.net/pydb Source: http://downloads.sourceforge.net/bashdb/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildArch: noarch %description Extended Python Debugger is a more complete debugger for Python than the stock pdb.py debugger. It supports a "restart" command, non-interactive POSIX-like line tracing, command options, disassembly of instructions, and stack traces that give better information for exec statements. Stepping/nexting skips over method/function "defs". It tries to follow gdb's command set, unless there is a good reason not to. %package -n emacs-pydb Summary: Pydb support for Emacs Group: Development/Debuggers BuildRequires: emacs emacs-common emacs-el >= 21 Requires: pydb = %{version}-%{release} Requires: emacs >= 21 %description -n emacs-pydb Pydb support for Emacs. %prep %setup -q %{_bindir}/iconv -f iso8859-1 -t utf8 ChangeLog -o ChangeLog.txt mv ChangeLog.txt ChangeLog %build %configure --with-site-packages=%{python_sitelib} make %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} ln -sf ../..%{python_sitelib}/%{name}/%{name}.py %{buildroot}%{_bindir}/%{name} %check make check %clean rm -rf %{buildroot} %files -n emacs-pydb %defattr(-,root,root,-) %{_datadir}/emacs/site-lisp/pydb.el* %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README THANKS NEWS TODO %{_bindir}/%{name} %{python_sitelib}/%{name} %{_mandir}/man1/%{name}.1* %changelog * Sun Feb 25 2009 Paulo Roma 1.25-4 - Included missing doc files. - Using relative symbolic link %%{_bindir}/%%{name}. - Converted Changelog to UTF8. - Added make check. - Removed BR fonconfig. * Sun Feb 08 2009 Paulo Roma 1.25-3 - Updated to 1.25 * Mon Jun 02 2008 Paulo Roma 1.23-3 - Updated to 1.23 * Fri Nov 16 2007 Paulo Roma 1.22-3 - Included BR emacs. - Installing in %%python_sitelib * Sun Jul 22 2007 Paulo Roma 1.22-2 - Updated to 1.22 - Using noarch architecture and emacs-pydb. * Fri Feb 16 2007 Paulo Roma 1.21-1 - Updated to 1.21 * Sat Dec 09 2006 Paulo Roma 1.19-1 - Rewriten spec file for Fedora 6. * Sat Nov 18 2006 Vitaly Lipatov 1.19-alt0.1 - new version 1.19 (with rpmrb script) * Sun Jul 30 2006 Vitaly Lipatov 1.17-alt0.1 - initial build for ALT Linux Sisyphus Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pydb/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2009 23:39:19 -0000 1.1 +++ .cvsignore 1 Mar 2009 01:52:48 -0000 1.2 @@ -0,0 +1 @@ +pydb-1.25.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pydb/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2009 23:39:19 -0000 1.1 +++ sources 1 Mar 2009 01:52:48 -0000 1.2 @@ -0,0 +1 @@ +a4b3005f92521461eb55663a1b8d1642 pydb-1.25.tar.bz2 From roma at fedoraproject.org Sun Mar 1 02:03:02 2009 From: roma at fedoraproject.org (Paulo Roma Cavalcanti) Date: Sun, 1 Mar 2009 02:03:02 +0000 (UTC) Subject: rpms/pydb/F-10 import.log, NONE, 1.1 pydb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301020302.4AA0470115@cvs1.fedora.phx.redhat.com> Author: roma Update of /cvs/pkgs/rpms/pydb/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17603/F-10 Modified Files: .cvsignore sources Added Files: import.log pydb.spec Log Message: Initial version. --- NEW FILE import.log --- pydb-1_25-4_fc10:F-10:pydb-1.25-4.fc10.src.rpm:1235872768 --- NEW FILE pydb.spec --- %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: Extended Python Debugger Name: pydb Version: 1.25 Release: 4%{?dist} License: GPLv2+ Group: Development/Debuggers Url: http://bashdb.sourceforge.net/pydb Source: http://downloads.sourceforge.net/bashdb/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildArch: noarch %description Extended Python Debugger is a more complete debugger for Python than the stock pdb.py debugger. It supports a "restart" command, non-interactive POSIX-like line tracing, command options, disassembly of instructions, and stack traces that give better information for exec statements. Stepping/nexting skips over method/function "defs". It tries to follow gdb's command set, unless there is a good reason not to. %package -n emacs-pydb Summary: Pydb support for Emacs Group: Development/Debuggers BuildRequires: emacs emacs-common emacs-el >= 21 Requires: pydb = %{version}-%{release} Requires: emacs >= 21 %description -n emacs-pydb Pydb support for Emacs. %prep %setup -q %{_bindir}/iconv -f iso8859-1 -t utf8 ChangeLog -o ChangeLog.txt mv ChangeLog.txt ChangeLog %build %configure --with-site-packages=%{python_sitelib} make %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} ln -sf ../..%{python_sitelib}/%{name}/%{name}.py %{buildroot}%{_bindir}/%{name} %check make check %clean rm -rf %{buildroot} %files -n emacs-pydb %defattr(-,root,root,-) %{_datadir}/emacs/site-lisp/pydb.el* %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README THANKS NEWS TODO %{_bindir}/%{name} %{python_sitelib}/%{name} %{_mandir}/man1/%{name}.1* %changelog * Sun Feb 25 2009 Paulo Roma 1.25-4 - Included missing doc files. - Using relative symbolic link %%{_bindir}/%%{name}. - Converted Changelog to UTF8. - Added make check. - Removed BR fonconfig. * Sun Feb 08 2009 Paulo Roma 1.25-3 - Updated to 1.25 * Mon Jun 02 2008 Paulo Roma 1.23-3 - Updated to 1.23 * Fri Nov 16 2007 Paulo Roma 1.22-3 - Included BR emacs. - Installing in %%python_sitelib * Sun Jul 22 2007 Paulo Roma 1.22-2 - Updated to 1.22 - Using noarch architecture and emacs-pydb. * Fri Feb 16 2007 Paulo Roma 1.21-1 - Updated to 1.21 * Sat Dec 09 2006 Paulo Roma 1.19-1 - Rewriten spec file for Fedora 6. * Sat Nov 18 2006 Vitaly Lipatov 1.19-alt0.1 - new version 1.19 (with rpmrb script) * Sun Jul 30 2006 Vitaly Lipatov 1.17-alt0.1 - initial build for ALT Linux Sisyphus Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pydb/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2009 23:39:19 -0000 1.1 +++ .cvsignore 1 Mar 2009 02:02:31 -0000 1.2 @@ -0,0 +1 @@ +pydb-1.25.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pydb/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2009 23:39:19 -0000 1.1 +++ sources 1 Mar 2009 02:02:31 -0000 1.2 @@ -0,0 +1 @@ +a4b3005f92521461eb55663a1b8d1642 pydb-1.25.tar.bz2 From cweyl at fedoraproject.org Sun Mar 1 02:05:46 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 1 Mar 2009 02:05:46 +0000 (UTC) Subject: rpms/perl-Task-Catalyst/devel import.log, NONE, 1.1 perl-Task-Catalyst.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301020546.47CBD70115@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Task-Catalyst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18057/devel Modified Files: .cvsignore sources Added Files: import.log perl-Task-Catalyst.spec Log Message: initial import --- NEW FILE import.log --- perl-Task-Catalyst-3_0000-1_fc10:HEAD:perl-Task-Catalyst-3.0000-1.fc10.src.rpm:1235873105 --- NEW FILE perl-Task-Catalyst.spec --- Name: perl-Task-Catalyst Version: 3.0000 Release: 1%{?dist} # lib/Task/Catalyst.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: All you need to start with Catalyst Source: http://search.cpan.org/CPAN/authors/id/M/MR/MRAMBERG/Task-Catalyst-%{version}.tar.gz Url: http://search.cpan.org/dist/Task-Catalyst BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) => 6.42 # tests for Task::Catalyst itself BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) # This macro allows us to easily define identical Requires and BR %global req_both() %{expand:\ Requires: %*\ BuildRequires: %*\ } # core %req_both perl(Catalyst) => 5.7007 %req_both perl(Catalyst::Devel) => 1.02 # feature: Apache/mod_perl Support %req_both perl(Catalyst::Engine::Apache) => 1.09 # feature: FastCGI Support %req_both perl(FCGI::ProcManager) # feature: PAR Support %req_both perl(PAR) # feature: Log4perl Support %req_both perl(Params::Validate) %req_both perl(Catalyst::Log::Log4perl) => 0.1 # feature: HTML::FormFu Support %req_both perl(Catalyst::Controller::HTML::FormFu) => 0.03 # feature: FormBuilder Support %req_both perl(Catalyst::Controller::FormBuilder) => 0.03 # feature: Stacktrace Advanced Debugging Support %req_both perl(Catalyst::Plugin::StackTrace) => 0.02 # feature: Session Support %req_both perl(Catalyst::Plugin::Session) => 0.05 %req_both perl(Catalyst::Plugin::Session::Store::File) => 0.07 %req_both perl(Catalyst::Plugin::Session::State::Cookie) => 0.02 %req_both perl(Catalyst::Plugin::Session::State::URI) => 0.02 # feature: Authentication/Authorization Support %req_both perl(Catalyst::Plugin::Authentication) => 0.05 %req_both perl(Catalyst::Authentication::Store::DBIx::Class) => 0.04 %req_both perl(Catalyst::Plugin::Authorization::ACL) => 0.06 %req_both perl(Catalyst::Plugin::Authorization::Roles) => 0.03 # feature: I18N Support %req_both perl(Catalyst::Plugin::I18N) => 0.05 # feature: DBIx::Class Support %req_both perl(Catalyst::Model::DBIC::Schema) => 0.08 # feature: Template::Toolkit Support %req_both perl(Catalyst::View::TT) => 0.22 # feature: Test::WWW::Mechanize Support %req_both perl(Test::WWW::Mechanize::Catalyst) => 0.35 # feature: SQLite Support %req_both perl(DBD::SQLite) %description This package ensures everything you need to write serious Catalyst applications is installed. Install this if you're interested in developing Catalyst apps. %prep %setup -q -n Task-Catalyst-%{version} %build PERL_AUTOINSTALL='--skipdeps' %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check TEST_POD=1 make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri Feb 27 2009 Chris Weyl 3.0000-1 - implement the req_both macro and pull in the deps we require from Makefile.PL * Thu Feb 26 2009 Chris Weyl 3.0000-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Task-Catalyst/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:25:05 -0000 1.1 +++ .cvsignore 1 Mar 2009 02:05:15 -0000 1.2 @@ -0,0 +1 @@ +Task-Catalyst-3.0000.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Task-Catalyst/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:25:05 -0000 1.1 +++ sources 1 Mar 2009 02:05:15 -0000 1.2 @@ -0,0 +1 @@ +7a1dbc782dd2cc4e23c3ee0fde6e555f Task-Catalyst-3.0000.tar.gz From cweyl at fedoraproject.org Sun Mar 1 02:06:32 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 1 Mar 2009 02:06:32 +0000 (UTC) Subject: rpms/perl-Task-Catalyst/F-10 import.log, NONE, 1.1 perl-Task-Catalyst.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301020632.A9F7A70115@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Task-Catalyst/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18322/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-Task-Catalyst.spec Log Message: initial import --- NEW FILE import.log --- perl-Task-Catalyst-3_0000-1_fc10:F-10:perl-Task-Catalyst-3.0000-1.fc10.src.rpm:1235873153 --- NEW FILE perl-Task-Catalyst.spec --- Name: perl-Task-Catalyst Version: 3.0000 Release: 1%{?dist} # lib/Task/Catalyst.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: All you need to start with Catalyst Source: http://search.cpan.org/CPAN/authors/id/M/MR/MRAMBERG/Task-Catalyst-%{version}.tar.gz Url: http://search.cpan.org/dist/Task-Catalyst BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) => 6.42 # tests for Task::Catalyst itself BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) # This macro allows us to easily define identical Requires and BR %global req_both() %{expand:\ Requires: %*\ BuildRequires: %*\ } # core %req_both perl(Catalyst) => 5.7007 %req_both perl(Catalyst::Devel) => 1.02 # feature: Apache/mod_perl Support %req_both perl(Catalyst::Engine::Apache) => 1.09 # feature: FastCGI Support %req_both perl(FCGI::ProcManager) # feature: PAR Support %req_both perl(PAR) # feature: Log4perl Support %req_both perl(Params::Validate) %req_both perl(Catalyst::Log::Log4perl) => 0.1 # feature: HTML::FormFu Support %req_both perl(Catalyst::Controller::HTML::FormFu) => 0.03 # feature: FormBuilder Support %req_both perl(Catalyst::Controller::FormBuilder) => 0.03 # feature: Stacktrace Advanced Debugging Support %req_both perl(Catalyst::Plugin::StackTrace) => 0.02 # feature: Session Support %req_both perl(Catalyst::Plugin::Session) => 0.05 %req_both perl(Catalyst::Plugin::Session::Store::File) => 0.07 %req_both perl(Catalyst::Plugin::Session::State::Cookie) => 0.02 %req_both perl(Catalyst::Plugin::Session::State::URI) => 0.02 # feature: Authentication/Authorization Support %req_both perl(Catalyst::Plugin::Authentication) => 0.05 %req_both perl(Catalyst::Authentication::Store::DBIx::Class) => 0.04 %req_both perl(Catalyst::Plugin::Authorization::ACL) => 0.06 %req_both perl(Catalyst::Plugin::Authorization::Roles) => 0.03 # feature: I18N Support %req_both perl(Catalyst::Plugin::I18N) => 0.05 # feature: DBIx::Class Support %req_both perl(Catalyst::Model::DBIC::Schema) => 0.08 # feature: Template::Toolkit Support %req_both perl(Catalyst::View::TT) => 0.22 # feature: Test::WWW::Mechanize Support %req_both perl(Test::WWW::Mechanize::Catalyst) => 0.35 # feature: SQLite Support %req_both perl(DBD::SQLite) %description This package ensures everything you need to write serious Catalyst applications is installed. Install this if you're interested in developing Catalyst apps. %prep %setup -q -n Task-Catalyst-%{version} %build PERL_AUTOINSTALL='--skipdeps' %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check TEST_POD=1 make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri Feb 27 2009 Chris Weyl 3.0000-1 - implement the req_both macro and pull in the deps we require from Makefile.PL * Thu Feb 26 2009 Chris Weyl 3.0000-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Task-Catalyst/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:25:05 -0000 1.1 +++ .cvsignore 1 Mar 2009 02:06:02 -0000 1.2 @@ -0,0 +1 @@ +Task-Catalyst-3.0000.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Task-Catalyst/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:25:05 -0000 1.1 +++ sources 1 Mar 2009 02:06:02 -0000 1.2 @@ -0,0 +1 @@ +7a1dbc782dd2cc4e23c3ee0fde6e555f Task-Catalyst-3.0000.tar.gz From cweyl at fedoraproject.org Sun Mar 1 02:07:19 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 1 Mar 2009 02:07:19 +0000 (UTC) Subject: rpms/perl-Task-Catalyst/F-9 import.log, NONE, 1.1 perl-Task-Catalyst.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301020719.5C10270115@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Task-Catalyst/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18562/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-Task-Catalyst.spec Log Message: initial import --- NEW FILE import.log --- perl-Task-Catalyst-3_0000-1_fc10:F-9:perl-Task-Catalyst-3.0000-1.fc10.src.rpm:1235873200 --- NEW FILE perl-Task-Catalyst.spec --- Name: perl-Task-Catalyst Version: 3.0000 Release: 1%{?dist} # lib/Task/Catalyst.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: All you need to start with Catalyst Source: http://search.cpan.org/CPAN/authors/id/M/MR/MRAMBERG/Task-Catalyst-%{version}.tar.gz Url: http://search.cpan.org/dist/Task-Catalyst BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) => 6.42 # tests for Task::Catalyst itself BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) # This macro allows us to easily define identical Requires and BR %global req_both() %{expand:\ Requires: %*\ BuildRequires: %*\ } # core %req_both perl(Catalyst) => 5.7007 %req_both perl(Catalyst::Devel) => 1.02 # feature: Apache/mod_perl Support %req_both perl(Catalyst::Engine::Apache) => 1.09 # feature: FastCGI Support %req_both perl(FCGI::ProcManager) # feature: PAR Support %req_both perl(PAR) # feature: Log4perl Support %req_both perl(Params::Validate) %req_both perl(Catalyst::Log::Log4perl) => 0.1 # feature: HTML::FormFu Support %req_both perl(Catalyst::Controller::HTML::FormFu) => 0.03 # feature: FormBuilder Support %req_both perl(Catalyst::Controller::FormBuilder) => 0.03 # feature: Stacktrace Advanced Debugging Support %req_both perl(Catalyst::Plugin::StackTrace) => 0.02 # feature: Session Support %req_both perl(Catalyst::Plugin::Session) => 0.05 %req_both perl(Catalyst::Plugin::Session::Store::File) => 0.07 %req_both perl(Catalyst::Plugin::Session::State::Cookie) => 0.02 %req_both perl(Catalyst::Plugin::Session::State::URI) => 0.02 # feature: Authentication/Authorization Support %req_both perl(Catalyst::Plugin::Authentication) => 0.05 %req_both perl(Catalyst::Authentication::Store::DBIx::Class) => 0.04 %req_both perl(Catalyst::Plugin::Authorization::ACL) => 0.06 %req_both perl(Catalyst::Plugin::Authorization::Roles) => 0.03 # feature: I18N Support %req_both perl(Catalyst::Plugin::I18N) => 0.05 # feature: DBIx::Class Support %req_both perl(Catalyst::Model::DBIC::Schema) => 0.08 # feature: Template::Toolkit Support %req_both perl(Catalyst::View::TT) => 0.22 # feature: Test::WWW::Mechanize Support %req_both perl(Test::WWW::Mechanize::Catalyst) => 0.35 # feature: SQLite Support %req_both perl(DBD::SQLite) %description This package ensures everything you need to write serious Catalyst applications is installed. Install this if you're interested in developing Catalyst apps. %prep %setup -q -n Task-Catalyst-%{version} %build PERL_AUTOINSTALL='--skipdeps' %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check TEST_POD=1 make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri Feb 27 2009 Chris Weyl 3.0000-1 - implement the req_both macro and pull in the deps we require from Makefile.PL * Thu Feb 26 2009 Chris Weyl 3.0000-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Task-Catalyst/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:25:05 -0000 1.1 +++ .cvsignore 1 Mar 2009 02:06:49 -0000 1.2 @@ -0,0 +1 @@ +Task-Catalyst-3.0000.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Task-Catalyst/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:25:05 -0000 1.1 +++ sources 1 Mar 2009 02:06:49 -0000 1.2 @@ -0,0 +1 @@ +7a1dbc782dd2cc4e23c3ee0fde6e555f Task-Catalyst-3.0000.tar.gz From cweyl at fedoraproject.org Sun Mar 1 02:09:45 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 1 Mar 2009 02:09:45 +0000 (UTC) Subject: rpms/perl-HTML-FormFu-Model-DBIC/devel import.log, NONE, 1.1 perl-HTML-FormFu-Model-DBIC.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301020945.AE7A870115@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-HTML-FormFu-Model-DBIC/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19606/devel Modified Files: .cvsignore sources Added Files: import.log perl-HTML-FormFu-Model-DBIC.spec Log Message: initial import --- NEW FILE import.log --- perl-HTML-FormFu-Model-DBIC-0_03007-1_fc10:HEAD:perl-HTML-FormFu-Model-DBIC-0.03007-1.fc10.src.rpm:1235873346 --- NEW FILE perl-HTML-FormFu-Model-DBIC.spec --- Name: perl-HTML-FormFu-Model-DBIC Version: 0.03007 Release: 1%{?dist} # lib/HTML/FormFu/Model/DBIC.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Integrate HTML::FormFu with DBIx::Class Source: http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/HTML-FormFu-Model-DBIC-%{version}.tar.gz Url: http://search.cpan.org/dist/HTML-FormFu-Model-DBIC BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(DateTime::Format::MySQL) BuildRequires: perl(DBD::SQLite) BuildRequires: perl(DBIx::Class) >= 0.08002 BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 BuildRequires: perl(HTML::FormFu) >= 0.03007 BuildRequires: perl(Task::Weaken) BuildRequires: perl(Test::MockObject) BuildRequires: perl(Test::More) # "use base" Requires: perl(HTML::FormFu::Model) Requires: perl(DBIx::Class) %description Integrate your HTML::FormFu forms with a DBIx::Class model. %prep %setup -q -n HTML-FormFu-Model-DBIC-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri Feb 27 2009 Chris Weyl 0.03007-1 - touch up for submission * Fri Feb 27 2009 Chris Weyl 0.03007-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-FormFu-Model-DBIC/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:22:12 -0000 1.1 +++ .cvsignore 1 Mar 2009 02:09:14 -0000 1.2 @@ -0,0 +1 @@ +HTML-FormFu-Model-DBIC-0.03007.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-FormFu-Model-DBIC/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:22:13 -0000 1.1 +++ sources 1 Mar 2009 02:09:15 -0000 1.2 @@ -0,0 +1 @@ +caca3a81477206d8233ed39b46b4d8ce HTML-FormFu-Model-DBIC-0.03007.tar.gz From cweyl at fedoraproject.org Sun Mar 1 02:10:31 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 1 Mar 2009 02:10:31 +0000 (UTC) Subject: rpms/perl-HTML-FormFu-Model-DBIC/F-10 import.log, NONE, 1.1 perl-HTML-FormFu-Model-DBIC.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301021031.99E5270115@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-HTML-FormFu-Model-DBIC/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19995/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-HTML-FormFu-Model-DBIC.spec Log Message: initial import --- NEW FILE import.log --- perl-HTML-FormFu-Model-DBIC-0_03007-1_fc10:F-10:perl-HTML-FormFu-Model-DBIC-0.03007-1.fc10.src.rpm:1235873392 --- NEW FILE perl-HTML-FormFu-Model-DBIC.spec --- Name: perl-HTML-FormFu-Model-DBIC Version: 0.03007 Release: 1%{?dist} # lib/HTML/FormFu/Model/DBIC.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Integrate HTML::FormFu with DBIx::Class Source: http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/HTML-FormFu-Model-DBIC-%{version}.tar.gz Url: http://search.cpan.org/dist/HTML-FormFu-Model-DBIC BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(DateTime::Format::MySQL) BuildRequires: perl(DBD::SQLite) BuildRequires: perl(DBIx::Class) >= 0.08002 BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 BuildRequires: perl(HTML::FormFu) >= 0.03007 BuildRequires: perl(Task::Weaken) BuildRequires: perl(Test::MockObject) BuildRequires: perl(Test::More) # "use base" Requires: perl(HTML::FormFu::Model) Requires: perl(DBIx::Class) %description Integrate your HTML::FormFu forms with a DBIx::Class model. %prep %setup -q -n HTML-FormFu-Model-DBIC-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri Feb 27 2009 Chris Weyl 0.03007-1 - touch up for submission * Fri Feb 27 2009 Chris Weyl 0.03007-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-FormFu-Model-DBIC/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:22:12 -0000 1.1 +++ .cvsignore 1 Mar 2009 02:10:01 -0000 1.2 @@ -0,0 +1 @@ +HTML-FormFu-Model-DBIC-0.03007.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-FormFu-Model-DBIC/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:22:13 -0000 1.1 +++ sources 1 Mar 2009 02:10:01 -0000 1.2 @@ -0,0 +1 @@ +caca3a81477206d8233ed39b46b4d8ce HTML-FormFu-Model-DBIC-0.03007.tar.gz From roma at fedoraproject.org Sun Mar 1 02:11:01 2009 From: roma at fedoraproject.org (Paulo Roma Cavalcanti) Date: Sun, 1 Mar 2009 02:11:01 +0000 (UTC) Subject: rpms/pydb/devel import.log, NONE, 1.1 pydb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301021101.112AD70115@cvs1.fedora.phx.redhat.com> Author: roma Update of /cvs/pkgs/rpms/pydb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20047/devel Modified Files: .cvsignore sources Added Files: import.log pydb.spec Log Message: Initial devel (F11) version. --- NEW FILE import.log --- pydb-1_25-4_fc10:HEAD:pydb-1.25-4.fc10.src.rpm:1235873370 --- NEW FILE pydb.spec --- %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: Extended Python Debugger Name: pydb Version: 1.25 Release: 4%{?dist} License: GPLv2+ Group: Development/Debuggers Url: http://bashdb.sourceforge.net/pydb Source: http://downloads.sourceforge.net/bashdb/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildArch: noarch %description Extended Python Debugger is a more complete debugger for Python than the stock pdb.py debugger. It supports a "restart" command, non-interactive POSIX-like line tracing, command options, disassembly of instructions, and stack traces that give better information for exec statements. Stepping/nexting skips over method/function "defs". It tries to follow gdb's command set, unless there is a good reason not to. %package -n emacs-pydb Summary: Pydb support for Emacs Group: Development/Debuggers BuildRequires: emacs emacs-common emacs-el >= 21 Requires: pydb = %{version}-%{release} Requires: emacs >= 21 %description -n emacs-pydb Pydb support for Emacs. %prep %setup -q %{_bindir}/iconv -f iso8859-1 -t utf8 ChangeLog -o ChangeLog.txt mv ChangeLog.txt ChangeLog %build %configure --with-site-packages=%{python_sitelib} make %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} ln -sf ../..%{python_sitelib}/%{name}/%{name}.py %{buildroot}%{_bindir}/%{name} %check make check %clean rm -rf %{buildroot} %files -n emacs-pydb %defattr(-,root,root,-) %{_datadir}/emacs/site-lisp/pydb.el* %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README THANKS NEWS TODO %{_bindir}/%{name} %{python_sitelib}/%{name} %{_mandir}/man1/%{name}.1* %changelog * Sun Feb 25 2009 Paulo Roma 1.25-4 - Included missing doc files. - Using relative symbolic link %%{_bindir}/%%{name}. - Converted Changelog to UTF8. - Added make check. - Removed BR fonconfig. * Sun Feb 08 2009 Paulo Roma 1.25-3 - Updated to 1.25 * Mon Jun 02 2008 Paulo Roma 1.23-3 - Updated to 1.23 * Fri Nov 16 2007 Paulo Roma 1.22-3 - Included BR emacs. - Installing in %%python_sitelib * Sun Jul 22 2007 Paulo Roma 1.22-2 - Updated to 1.22 - Using noarch architecture and emacs-pydb. * Fri Feb 16 2007 Paulo Roma 1.21-1 - Updated to 1.21 * Sat Dec 09 2006 Paulo Roma 1.19-1 - Rewriten spec file for Fedora 6. * Sat Nov 18 2006 Vitaly Lipatov 1.19-alt0.1 - new version 1.19 (with rpmrb script) * Sun Jul 30 2006 Vitaly Lipatov 1.17-alt0.1 - initial build for ALT Linux Sisyphus Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pydb/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2009 23:39:19 -0000 1.1 +++ .cvsignore 1 Mar 2009 02:10:30 -0000 1.2 @@ -0,0 +1 @@ +pydb-1.25.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pydb/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2009 23:39:19 -0000 1.1 +++ sources 1 Mar 2009 02:10:30 -0000 1.2 @@ -0,0 +1 @@ +a4b3005f92521461eb55663a1b8d1642 pydb-1.25.tar.bz2 From cweyl at fedoraproject.org Sun Mar 1 02:11:24 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 1 Mar 2009 02:11:24 +0000 (UTC) Subject: rpms/perl-HTML-FormFu-Model-DBIC/F-9 import.log, NONE, 1.1 perl-HTML-FormFu-Model-DBIC.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301021124.96FB170115@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-HTML-FormFu-Model-DBIC/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20304/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-HTML-FormFu-Model-DBIC.spec Log Message: initial import --- NEW FILE import.log --- perl-HTML-FormFu-Model-DBIC-0_03007-1_fc10:F-9:perl-HTML-FormFu-Model-DBIC-0.03007-1.fc10.src.rpm:1235873443 --- NEW FILE perl-HTML-FormFu-Model-DBIC.spec --- Name: perl-HTML-FormFu-Model-DBIC Version: 0.03007 Release: 1%{?dist} # lib/HTML/FormFu/Model/DBIC.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Integrate HTML::FormFu with DBIx::Class Source: http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/HTML-FormFu-Model-DBIC-%{version}.tar.gz Url: http://search.cpan.org/dist/HTML-FormFu-Model-DBIC BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(DateTime::Format::MySQL) BuildRequires: perl(DBD::SQLite) BuildRequires: perl(DBIx::Class) >= 0.08002 BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 BuildRequires: perl(HTML::FormFu) >= 0.03007 BuildRequires: perl(Task::Weaken) BuildRequires: perl(Test::MockObject) BuildRequires: perl(Test::More) # "use base" Requires: perl(HTML::FormFu::Model) Requires: perl(DBIx::Class) %description Integrate your HTML::FormFu forms with a DBIx::Class model. %prep %setup -q -n HTML-FormFu-Model-DBIC-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri Feb 27 2009 Chris Weyl 0.03007-1 - touch up for submission * Fri Feb 27 2009 Chris Weyl 0.03007-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-FormFu-Model-DBIC/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:22:12 -0000 1.1 +++ .cvsignore 1 Mar 2009 02:10:54 -0000 1.2 @@ -0,0 +1 @@ +HTML-FormFu-Model-DBIC-0.03007.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-FormFu-Model-DBIC/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:22:13 -0000 1.1 +++ sources 1 Mar 2009 02:10:54 -0000 1.2 @@ -0,0 +1 @@ +caca3a81477206d8233ed39b46b4d8ce HTML-FormFu-Model-DBIC-0.03007.tar.gz From cweyl at fedoraproject.org Sun Mar 1 02:13:37 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 1 Mar 2009 02:13:37 +0000 (UTC) Subject: rpms/perl-HTML-LinkList/devel import.log, NONE, 1.1 perl-HTML-LinkList.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301021337.76E1B70115@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-HTML-LinkList/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20878/devel Modified Files: .cvsignore sources Added Files: import.log perl-HTML-LinkList.spec Log Message: initial import --- NEW FILE import.log --- perl-HTML-LinkList-0_1503-1_fc10:HEAD:perl-HTML-LinkList-0.1503-1.fc10.src.rpm:1235873574 --- NEW FILE perl-HTML-LinkList.spec --- Name: perl-HTML-LinkList Version: 0.1503 Release: 1%{?dist} # lib/HTML/LinkList.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Create a 'smart' list of HTML links Source: http://search.cpan.org/CPAN/authors/id/R/RU/RUBYKAT/HTML-LinkList-%{version}.tar.gz Url: http://search.cpan.org/dist/HTML-LinkList BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Module::Build::Compat) BuildRequires: perl(strict) BuildRequires: perl(Test::Distribution) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) %description This module contains a number of functions for taking sets of URLs and labels and creating suitably formatted HTML. These links are "smart" because, if given the url of the current page, if any of the links in the list equal it, that item in the list will be formatted as a special label, not as a link; this is a Good Thing, since the user would be confused by clicking on a link back to the current page. While many website systems have plugins for "smart" navbars, they are specialized for that system only, and can't be reused elsewhere, forcing people to reinvent the wheel. I hereby present one wheel, free to be reused by anybody; just the simple functions, a backend, which can be plugged into whatever system you want.The default format for the HTML is to make an unordered list, but there are many options, enabling one to have a flatter layout with any separators you desire, or a more complicated list with differing formats for different levels. %prep %setup -q -n HTML-LinkList-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README Changes %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri Feb 27 2009 Chris Weyl 0.1503-1 - submission * Fri Feb 27 2009 Chris Weyl 0.1503-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-LinkList/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:24:17 -0000 1.1 +++ .cvsignore 1 Mar 2009 02:13:06 -0000 1.2 @@ -0,0 +1 @@ +HTML-LinkList-0.1503.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-LinkList/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:24:17 -0000 1.1 +++ sources 1 Mar 2009 02:13:06 -0000 1.2 @@ -0,0 +1 @@ +57e79ea9a15e57864042d3645651530c HTML-LinkList-0.1503.tar.gz From cweyl at fedoraproject.org Sun Mar 1 02:14:24 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 1 Mar 2009 02:14:24 +0000 (UTC) Subject: rpms/perl-HTML-LinkList/F-10 import.log, NONE, 1.1 perl-HTML-LinkList.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301021424.2EB0F70115@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-HTML-LinkList/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21151/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-HTML-LinkList.spec Log Message: initial import --- NEW FILE import.log --- perl-HTML-LinkList-0_1503-1_fc10:F-10:perl-HTML-LinkList-0.1503-1.fc10.src.rpm:1235873625 --- NEW FILE perl-HTML-LinkList.spec --- Name: perl-HTML-LinkList Version: 0.1503 Release: 1%{?dist} # lib/HTML/LinkList.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Create a 'smart' list of HTML links Source: http://search.cpan.org/CPAN/authors/id/R/RU/RUBYKAT/HTML-LinkList-%{version}.tar.gz Url: http://search.cpan.org/dist/HTML-LinkList BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Module::Build::Compat) BuildRequires: perl(strict) BuildRequires: perl(Test::Distribution) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) %description This module contains a number of functions for taking sets of URLs and labels and creating suitably formatted HTML. These links are "smart" because, if given the url of the current page, if any of the links in the list equal it, that item in the list will be formatted as a special label, not as a link; this is a Good Thing, since the user would be confused by clicking on a link back to the current page. While many website systems have plugins for "smart" navbars, they are specialized for that system only, and can't be reused elsewhere, forcing people to reinvent the wheel. I hereby present one wheel, free to be reused by anybody; just the simple functions, a backend, which can be plugged into whatever system you want.The default format for the HTML is to make an unordered list, but there are many options, enabling one to have a flatter layout with any separators you desire, or a more complicated list with differing formats for different levels. %prep %setup -q -n HTML-LinkList-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README Changes %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri Feb 27 2009 Chris Weyl 0.1503-1 - submission * Fri Feb 27 2009 Chris Weyl 0.1503-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-LinkList/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:24:17 -0000 1.1 +++ .cvsignore 1 Mar 2009 02:13:53 -0000 1.2 @@ -0,0 +1 @@ +HTML-LinkList-0.1503.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-LinkList/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:24:17 -0000 1.1 +++ sources 1 Mar 2009 02:13:53 -0000 1.2 @@ -0,0 +1 @@ +57e79ea9a15e57864042d3645651530c HTML-LinkList-0.1503.tar.gz From cweyl at fedoraproject.org Sun Mar 1 02:15:10 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 1 Mar 2009 02:15:10 +0000 (UTC) Subject: rpms/perl-HTML-LinkList/F-9 import.log, NONE, 1.1 perl-HTML-LinkList.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301021510.2319970115@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-HTML-LinkList/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21433/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-HTML-LinkList.spec Log Message: initial import --- NEW FILE import.log --- perl-HTML-LinkList-0_1503-1_fc10:F-9:perl-HTML-LinkList-0.1503-1.fc10.src.rpm:1235873671 --- NEW FILE perl-HTML-LinkList.spec --- Name: perl-HTML-LinkList Version: 0.1503 Release: 1%{?dist} # lib/HTML/LinkList.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Create a 'smart' list of HTML links Source: http://search.cpan.org/CPAN/authors/id/R/RU/RUBYKAT/HTML-LinkList-%{version}.tar.gz Url: http://search.cpan.org/dist/HTML-LinkList BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Module::Build::Compat) BuildRequires: perl(strict) BuildRequires: perl(Test::Distribution) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) %description This module contains a number of functions for taking sets of URLs and labels and creating suitably formatted HTML. These links are "smart" because, if given the url of the current page, if any of the links in the list equal it, that item in the list will be formatted as a special label, not as a link; this is a Good Thing, since the user would be confused by clicking on a link back to the current page. While many website systems have plugins for "smart" navbars, they are specialized for that system only, and can't be reused elsewhere, forcing people to reinvent the wheel. I hereby present one wheel, free to be reused by anybody; just the simple functions, a backend, which can be plugged into whatever system you want.The default format for the HTML is to make an unordered list, but there are many options, enabling one to have a flatter layout with any separators you desire, or a more complicated list with differing formats for different levels. %prep %setup -q -n HTML-LinkList-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README Changes %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Fri Feb 27 2009 Chris Weyl 0.1503-1 - submission * Fri Feb 27 2009 Chris Weyl 0.1503-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-LinkList/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:24:17 -0000 1.1 +++ .cvsignore 1 Mar 2009 02:14:39 -0000 1.2 @@ -0,0 +1 @@ +HTML-LinkList-0.1503.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-LinkList/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:24:17 -0000 1.1 +++ sources 1 Mar 2009 02:14:39 -0000 1.2 @@ -0,0 +1 @@ +57e79ea9a15e57864042d3645651530c HTML-LinkList-0.1503.tar.gz From mycae at fedoraproject.org Sun Mar 1 02:41:12 2009 From: mycae at fedoraproject.org (Daniel Haley) Date: Sun, 1 Mar 2009 02:41:12 +0000 (UTC) Subject: rpms/flexdock/devel flexdock-build.patch, NONE, 1.1 flexdock-generate-tarball.sh, NONE, 1.1 flexdock-jni.patch, NONE, 1.1 flexdock-nojmf.patch, NONE, 1.1 flexdock-skinlfPainter-path.patch, NONE, 1.1 flexdock-skinlfTitlebarui-path.patch, NONE, 1.1 flexdock.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301024112.69B6770115@cvs1.fedora.phx.redhat.com> Author: mycae Update of /cvs/pkgs/rpms/flexdock/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24169/devel Modified Files: .cvsignore sources Added Files: flexdock-build.patch flexdock-generate-tarball.sh flexdock-jni.patch flexdock-nojmf.patch flexdock-skinlfPainter-path.patch flexdock-skinlfTitlebarui-path.patch flexdock.spec import.log Log Message: flexdock-build.patch: --- NEW FILE flexdock-build.patch --- --- build.xml 2008-12-10 20:54:53.000000000 +1100 +++ build.xml.new 2008-12-10 20:55:13.000000000 +1100 @@ -118,7 +118,8 @@ - + + @@ -135,7 +136,7 @@ + description="Compile java sources for the framework, and tests"> @@ -145,8 +146,6 @@ - - @@ -291,12 +290,15 @@ - - + + + + + @@ -414,60 +416,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -555,9 +503,7 @@ - - @@ -567,12 +513,6 @@ jarname="${build.dir}/${dist.jar.name}" sjarname="${bin.dir.webstart}/${dist.jar.name}"/> - - workingcopy.properties #remove *dll find ./ -name \*.dll -exec rm {} \; #remove .so files find ./ -name \*.so -exec rm {} \; #JAR "dependency" handling #========== #delete and symlink any jar files we know about #rm commands commented out, as we delete these #at repackage time # Apache commons Logging component # http://commons.apache.org/logging/ #rm -f lib/commons-logging-1.1.jar #remove jmf, as it is only used in a demo, #which is unused after patching #rm -rf lib/jmf #" Looks" project # https://looks.dev.java.net/ #rm -f lib/looks-2.1.1.jar #skinlf "Skin look and Feel" project # https://skinlf.dev.java.net/ #rm -f lib/skinlf.jar build-jar-repository -s -p lib commons-logging skinlf jgoodies-looks.jar pushd lib ln -s jgoodies-looks.jar looks-2.2.1.jar ln -s commons-logging.jar commons-logging-1.1.jar popd JAR_files="" for j in $(find -name \*.jar); do if [ ! -L $j ] ; then JAR_files="$JAR_files $j" fi done if [ ! -z "$JAR_files" ] ; then echo "These JAR files should be deleted and symlinked to system JAR files: $JAR_files" exit 1 fi #========= #Endline convert Doc files for i in "README-RELEASE LICENSE.txt README release-notes.txt" ; do %{__sed} -i 's/\r//' $i done %build export CLASSPATH=$(build-classpath jgoodies-looks skinlf) ant -v -Dbuild.sysclasspath=first build.with.native jar ant -v -Dbuild.sysclasspath=first compile.native %install rm -rf %{buildroot} #Create dirs needed. mkdir -p %{buildroot}/%{_libdir}/%{name} #flexdock has funny arch flags, such as "libRubberBand-linux-x86.so" on i386 SOFILE=`find ./ -name libRubberBand*so` install -pm755 $SOFILE %{buildroot}/%{_libdir}/%{name}/libRubberBand-0.so #install jar file into lib dir as it is a JNI requiring jar install -pm644 build/%{name}-%{version}.jar %{buildroot}/%{_libdir}/%{name}/%{name}-%{version}.jar %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE.txt README README-RELEASE release-notes.txt %{_libdir}/%{name} %changelog * Tue Feb 24 2009 0.5.1-11 - Created clean tarball to remove jmf * Thu Feb 19 2009 0.5.1-10 - Applied patch from Dominik 'Rathann' Mierzejewski - Added BuildRequires for apache-regexp (needed for F9) - Removed overly complex java detection * Thu Jan 21 2009 0.5.1-9 - Alter the way I handle stripping of the SOFILE - Alphabetically sort build and buildrequires - Add full stop & de-indent description - Use build-jar-repository - Change sdk.home from OR to case statment * Tue Jan 20 2009 0.5.1-8 - Set defattr - Fix arch (again) - Change install dir from %%libdir to %%libdir/%%name - Update patch0 to match changed so dir + make dynamic * Sat Dec 20 2008 0.5.1-7 - Re-enable system skinlf link & jar check. * Thu Dec 04 2008 0.5.1-6 - Use ant to build jar, rather than straight from bash. - Fix build patch to correct native .so building - Thanks goes to akurtakov for assitance. - Fixed dos->unix line ending for doc files - Added dos2unix buildrequires - Fix arch flag - Added libX11 dep for native so - Added symlink for so * Sun Nov 23 2008 0.5.1-5 - Fix documentation - Change group - Fix version numbering - Link in skinlf to proposed package * Sun Nov 16 2008 0.5.1-4 - Update package revision number - Fix Top level dir of jar file * Sat Nov 01 2008 0.5.1-3 - Add patch to remove non-free components from flexdock (thanks to Sylvestre Ledru from Scilab) - Correct deps to include jgoodies & skinlf * Sun Oct 26 2008 0.5.1-2 - Fix % { _libs } to % { _libdir } - Added Jar file creation during build - Add jar file dependency check - Cleanup filelist to just .so and .jar - Add JNI path patch * Tue Sep 30 2008 0.5.1-1 - Create spec file --- NEW FILE import.log --- flexdock-0_5_1-11_fc10:HEAD:flexdock-0.5.1-11.fc10.src.rpm:1235875216 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flexdock/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Feb 2009 00:14:31 -0000 1.1 +++ .cvsignore 1 Mar 2009 02:40:41 -0000 1.2 @@ -0,0 +1 @@ +flexdock-0.5.1-clean.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flexdock/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Feb 2009 00:14:31 -0000 1.1 +++ sources 1 Mar 2009 02:40:41 -0000 1.2 @@ -0,0 +1 @@ +81736faeb864e7d30bb4a4120a86ee45 flexdock-0.5.1-clean.tar.gz From mycae at fedoraproject.org Sun Mar 1 02:52:25 2009 From: mycae at fedoraproject.org (Daniel Haley) Date: Sun, 1 Mar 2009 02:52:25 +0000 (UTC) Subject: rpms/flexdock/F-9 flexdock-build.patch, NONE, 1.1 flexdock-generate-tarball.sh, NONE, 1.1 flexdock-jni.patch, NONE, 1.1 flexdock-nojmf.patch, NONE, 1.1 flexdock-skinlfPainter-path.patch, NONE, 1.1 flexdock-skinlfTitlebarui-path.patch, NONE, 1.1 flexdock.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301025225.E6D4470115@cvs1.fedora.phx.redhat.com> Author: mycae Update of /cvs/pkgs/rpms/flexdock/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26067/F-9 Modified Files: .cvsignore sources Added Files: flexdock-build.patch flexdock-generate-tarball.sh flexdock-jni.patch flexdock-nojmf.patch flexdock-skinlfPainter-path.patch flexdock-skinlfTitlebarui-path.patch flexdock.spec import.log Log Message: flexdock-build.patch: --- NEW FILE flexdock-build.patch --- --- build.xml 2008-12-10 20:54:53.000000000 +1100 +++ build.xml.new 2008-12-10 20:55:13.000000000 +1100 @@ -118,7 +118,8 @@ - + + @@ -135,7 +136,7 @@ + description="Compile java sources for the framework, and tests"> @@ -145,8 +146,6 @@ - - @@ -291,12 +290,15 @@ - - + + + + + @@ -414,60 +416,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -555,9 +503,7 @@ - - @@ -567,12 +513,6 @@ jarname="${build.dir}/${dist.jar.name}" sjarname="${bin.dir.webstart}/${dist.jar.name}"/> - - workingcopy.properties #remove *dll find ./ -name \*.dll -exec rm {} \; #remove .so files find ./ -name \*.so -exec rm {} \; #JAR "dependency" handling #========== #delete and symlink any jar files we know about #rm commands commented out, as we delete these #at repackage time # Apache commons Logging component # http://commons.apache.org/logging/ #rm -f lib/commons-logging-1.1.jar #remove jmf, as it is only used in a demo, #which is unused after patching #rm -rf lib/jmf #" Looks" project # https://looks.dev.java.net/ #rm -f lib/looks-2.1.1.jar #skinlf "Skin look and Feel" project # https://skinlf.dev.java.net/ #rm -f lib/skinlf.jar build-jar-repository -s -p lib commons-logging skinlf jgoodies-looks.jar pushd lib ln -s jgoodies-looks.jar looks-2.2.1.jar ln -s commons-logging.jar commons-logging-1.1.jar popd JAR_files="" for j in $(find -name \*.jar); do if [ ! -L $j ] ; then JAR_files="$JAR_files $j" fi done if [ ! -z "$JAR_files" ] ; then echo "These JAR files should be deleted and symlinked to system JAR files: $JAR_files" exit 1 fi #========= #Endline convert Doc files for i in "README-RELEASE LICENSE.txt README release-notes.txt" ; do %{__sed} -i 's/\r//' $i done %build export CLASSPATH=$(build-classpath jgoodies-looks skinlf) ant -v -Dbuild.sysclasspath=first build.with.native jar ant -v -Dbuild.sysclasspath=first compile.native %install rm -rf %{buildroot} #Create dirs needed. mkdir -p %{buildroot}/%{_libdir}/%{name} #flexdock has funny arch flags, such as "libRubberBand-linux-x86.so" on i386 SOFILE=`find ./ -name libRubberBand*so` install -pm755 $SOFILE %{buildroot}/%{_libdir}/%{name}/libRubberBand-0.so #install jar file into lib dir as it is a JNI requiring jar install -pm644 build/%{name}-%{version}.jar %{buildroot}/%{_libdir}/%{name}/%{name}-%{version}.jar %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE.txt README README-RELEASE release-notes.txt %{_libdir}/%{name} %changelog * Tue Feb 24 2009 0.5.1-11 - Created clean tarball to remove jmf * Thu Feb 19 2009 0.5.1-10 - Applied patch from Dominik 'Rathann' Mierzejewski - Added BuildRequires for apache-regexp (needed for F9) - Removed overly complex java detection * Thu Jan 21 2009 0.5.1-9 - Alter the way I handle stripping of the SOFILE - Alphabetically sort build and buildrequires - Add full stop & de-indent description - Use build-jar-repository - Change sdk.home from OR to case statment * Tue Jan 20 2009 0.5.1-8 - Set defattr - Fix arch (again) - Change install dir from %%libdir to %%libdir/%%name - Update patch0 to match changed so dir + make dynamic * Sat Dec 20 2008 0.5.1-7 - Re-enable system skinlf link & jar check. * Thu Dec 04 2008 0.5.1-6 - Use ant to build jar, rather than straight from bash. - Fix build patch to correct native .so building - Thanks goes to akurtakov for assitance. - Fixed dos->unix line ending for doc files - Added dos2unix buildrequires - Fix arch flag - Added libX11 dep for native so - Added symlink for so * Sun Nov 23 2008 0.5.1-5 - Fix documentation - Change group - Fix version numbering - Link in skinlf to proposed package * Sun Nov 16 2008 0.5.1-4 - Update package revision number - Fix Top level dir of jar file * Sat Nov 01 2008 0.5.1-3 - Add patch to remove non-free components from flexdock (thanks to Sylvestre Ledru from Scilab) - Correct deps to include jgoodies & skinlf * Sun Oct 26 2008 0.5.1-2 - Fix % { _libs } to % { _libdir } - Added Jar file creation during build - Add jar file dependency check - Cleanup filelist to just .so and .jar - Add JNI path patch * Tue Sep 30 2008 0.5.1-1 - Create spec file --- NEW FILE import.log --- flexdock-0_5_1-11_fc10:F-9:flexdock-0.5.1-11.fc10.src.rpm:1235875915 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flexdock/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Feb 2009 00:14:31 -0000 1.1 +++ .cvsignore 1 Mar 2009 02:51:54 -0000 1.2 @@ -0,0 +1 @@ +flexdock-0.5.1-clean.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flexdock/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Feb 2009 00:14:31 -0000 1.1 +++ sources 1 Mar 2009 02:51:54 -0000 1.2 @@ -0,0 +1 @@ +81736faeb864e7d30bb4a4120a86ee45 flexdock-0.5.1-clean.tar.gz From cebbert at fedoraproject.org Sun Mar 1 02:53:09 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Sun, 1 Mar 2009 02:53:09 +0000 (UTC) Subject: rpms/kernel/F-10 patch-2.6.29-rc6-git5.bz2.sign, NONE, 1.1 .cvsignore, 1.992, 1.993 config-generic, 1.216, 1.217 drm-modesetting-radeon.patch, 1.72, 1.73 drm-nouveau.patch, 1.9, 1.10 kernel.spec, 1.1279, 1.1280 linux-2.6-hdpvr.patch, 1.3, 1.4 linux-2.6.29-lirc.patch, 1.2, 1.3 sources, 1.953, 1.954 upstream, 1.864, 1.865 patch-2.6.29-rc6-git4.bz2.sign, 1.1, NONE Message-ID: <20090301025309.695A870115@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26013 Modified Files: .cvsignore config-generic drm-modesetting-radeon.patch drm-nouveau.patch kernel.spec linux-2.6-hdpvr.patch linux-2.6.29-lirc.patch sources upstream Added Files: patch-2.6.29-rc6-git5.bz2.sign Removed Files: patch-2.6.29-rc6-git4.bz2.sign Log Message: Linux 2.6.29-rc6-git5 Disable CONFIG_NET_NS because of bug #486889 in rawhide. Copy lirc and hdpvr updates from rawhide. --- NEW FILE patch-2.6.29-rc6-git5.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBJqSe7yGugalF9Dw4RAgvEAJ9pzINSGn0TRDCnN6a5Wf7VfF0C2QCeJZ+Q 2aJRzE3u1fzcyoKdOMTrlVQ= =Qb5L -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v retrieving revision 1.992 retrieving revision 1.993 diff -u -r1.992 -r1.993 --- .cvsignore 27 Feb 2009 06:10:12 -0000 1.992 +++ .cvsignore 1 Mar 2009 02:52:35 -0000 1.993 @@ -6,4 +6,4 @@ kernel-2.6.28 linux-2.6.28.tar.bz2 patch-2.6.29-rc6.bz2 -patch-2.6.29-rc6-git4.bz2 +patch-2.6.29-rc6-git5.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v retrieving revision 1.216 retrieving revision 1.217 diff -u -r1.216 -r1.217 --- config-generic 25 Feb 2009 15:33:30 -0000 1.216 +++ config-generic 1 Mar 2009 02:52:36 -0000 1.217 @@ -47,7 +47,7 @@ CONFIG_PID_NS=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y -CONFIG_NET_NS=y +# CONFIG_NET_NS is not set CONFIG_POSIX_MQUEUE=y # CONFIG_PREEMPT_NONE is not set @@ -2040,6 +2040,7 @@ CONFIG_W1_MASTER_DS1WM=m CONFIG_W1_SLAVE_THERM=m CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2431=m CONFIG_W1_SLAVE_DS2433=m CONFIG_W1_SLAVE_DS2433_CRC=y CONFIG_W1_SLAVE_DS2760=m drm-modesetting-radeon.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.72 -r 1.73 drm-modesetting-radeon.patch Index: drm-modesetting-radeon.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-modesetting-radeon.patch,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- drm-modesetting-radeon.patch 23 Feb 2009 16:22:24 -0000 1.72 +++ drm-modesetting-radeon.patch 1 Mar 2009 02:52:36 -0000 1.73 @@ -1,22 +1,98 @@ -commit 465937aec83364d3cf516bc8b6c2ca7f785892d9 +commit 1f756299d935d5a0a4beb82ddeaf0e4b2935861a +Author: Dave Airlie +Date: Fri Feb 27 15:37:14 2009 +1000 + + radeon: disable kms by default for r600 + +commit e92784bff2fee17c8e47f11753343d99500784a6 +Author: Dave Airlie +Date: Fri Feb 27 11:51:22 2009 +1000 + + radeon: fixup proc hacks + +commit 8e01de63b0dc4be70fbf8ce33b958d3d4c5d5748 +Author: Dave Airlie +Date: Fri Feb 27 11:51:08 2009 +1000 + + radeon: fixup module load + +commit 998fa33e12ba50b16e44ad1add5b82ec11aaacfc +Author: Dave Airlie +Date: Fri Feb 27 11:50:50 2009 +1000 + + radeon: fix up ring read/write for new drm-next code + +commit 84044ac6eb43ebb861b661aad772be350362dfbe +Author: Dave Airlie +Date: Fri Feb 27 11:50:24 2009 +1000 + + ati_pcigart: update pcigart for changes in drm-next + +commit c44d3fa4e174f3aa95ad575e802dd2d01d0615d6 +Author: Dave Airlie +Date: Thu Feb 26 22:27:21 2009 +1000 + + radeon: fixup writeback/ring ptrs for Kms + +commit 31585bd60335dbc5e6814135add77b2228bdf419 +Author: Dave Airlie +Date: Thu Feb 26 22:00:59 2009 +1000 + + radeon: fixup after rebase so it builds + + lots more to do + +commit a9c8c80c07d3e08681cfae325e62be775eb621e2 +Author: Dave Airlie +Date: Thu Feb 26 12:03:55 2009 +1000 + + drm/radeno: add support for r100 cp type 3 packets + +commit 1111b2c28fde03d81663af3a6efa9b362c80189d +Author: Dave Airlie +Date: Wed Feb 25 16:07:15 2009 +1000 + + radeon: fixup cs buffer re-use code to not block straight away + +commit 6934826040173ca3022503534b867ba0d0bc7fe3 +Author: Dave Airlie +Date: Wed Feb 25 16:06:30 2009 +1000 + + radeon: port CS mutex over from drm.git + + Totally missed this before - really helps stability + +commit ae76231f773dfc8cfdf86ddfc9c34de604e07968 +Author: Dave Airlie +Date: Wed Feb 25 13:03:47 2009 +1000 + + radeon: fix IB dump end + +commit 7ce70adf16692a8b8d34f8ee5018a0b26f99a176 +Author: Thomas Hellstrom +Date: Tue Feb 24 20:26:53 2009 +1000 + + drm/ttm: work around some x86 pat oddities by using mixedmap instead of pfnmap + +commit bc61dd6a56ae8678dd0a68074fce63a9b58f6039 Author: Dave Airlie Date: Sun Feb 22 08:22:14 2009 +1000 radeon: add module IDs -commit dd6dc3d83534ae6ae908629cfe0d1a784e073102 +commit 2cb426ab76242230ee66c62ca56346f20dda7322 Author: Dave Airlie Date: Sun Feb 22 08:19:33 2009 +1000 radeon: fixup for new APIs -commit a93e118253bdf74092233dbc21d3e257688f39c8 +commit a9156df0c323939c6a61fcf4894dc160e71b7178 Author: Dave Airlie Date: Sun Feb 22 08:11:33 2009 +1000 drm: fix parmeter passed to fb_release -commit 2b6628ce5e481e1ff5a30d8957d7b32fd5b4d1e1 +commit 0260fc0c5544220072074582c40e3807380a40d2 Author: Dave Airlie Date: Wed Feb 18 17:36:33 2009 +1000 @@ -24,13 +100,13 @@ this adds basic IB dumping and cleans up some code around it. -commit cb1fedbb2df6da2f104a026c7846dfc91564e2f7 +commit 693ea916ff5f7e94cb766ff3326256304a10c282 Author: Dave Airlie Date: Wed Feb 18 11:12:19 2009 +1000 radeon: fix packet2 parsing + enhance debug -commit c3e00f3af01659590ef278d822ef0a727faf4f71 +commit d70737eeb6002581984d34073bcfce246914ee49 Author: Dave Airlie Date: Wed Feb 18 11:11:39 2009 +1000 @@ -41,37 +117,37 @@ It also doesn't or in the table values but sets them -commit c4c20e2f1e60bb507e1b2c5f1e9d2c26497df171 +commit 5efc94678c2535fa8640d6ff13a382b2de593175 Author: Dave Airlie Date: Tue Feb 17 20:57:34 2009 +1000 radeon/i2c: i2c adapter id is gone -commit c15cf36a1ecd6ddc99c453d4fbf0b88a812c8f72 +commit 06f9316ec64614270971e9f383da9841097c6897 Author: Dave Airlie Date: Thu Jan 22 17:15:56 2009 +1000 drm: fix radeon Kconfig -commit 36e00f39abecac799b7d53122e35ec1098245c45 +commit 6185b5baf2dea5433b9bea369e0303641c12a397 Author: Dave Airlie Date: Sun Jan 11 19:50:23 2009 +1000 radeon: add missing Kconfig text -commit d7d278645bf22fa609a3442bd105539e67977f39 +commit 5da904a88e52d5fa0ed88f0711e5901e150185f4 Author: Dave Airlie Date: Sun Jan 11 19:47:39 2009 +1000 drm: fix merge issue that messes up irq -commit cad74b7853b75c0e10b2958d933518921e194265 +commit c8f0b003060f81347b5efd95f6b9ea61896e823c Author: Dave Airlie Date: Sat Jan 10 12:40:42 2009 +1000 radeon: add getparam to get pci device from userspace -commit 97859845b7216b86003a1bb0533d1f5cf43a0c04 +commit 0dd95dc27b9e1b4734a07ffdb3edef67069f9743 Author: Dave Airlie Date: Thu Dec 18 23:01:12 2008 +1000 @@ -80,49 +156,49 @@ This should make AGP no corrupt itself to all buggery (cherry picked from commit 55c0a3f1d3693cb5c3b65f37d4bb6e8a3c025460) -commit 5b1ded493702a6807d0e6718fe17a78b573cdd36 +commit e08687047ae2904ad9a7f18d5c4a0ccae29727d3 Author: Dave Airlie Date: Tue Dec 2 16:38:04 2008 +1000 drop old CS -commit 5a569665167ed400fbef07ff5ce6fb106a2d3576 +commit 00a936a692a1ff6bf365f0af46afc9e828fb989f Author: Dave Airlie Date: Mon Dec 1 15:09:27 2008 +1000 radeon: update with latest CS bits -commit 19518b82b4fc4fb0b2093efb29658e36169b7c0a +commit 95af07dde6539c225de4209c05db273e880ea576 Author: Dave Airlie Date: Wed Dec 17 06:56:36 2008 +1000 fixups post rebase -commit 2d40852fce298ef27f2983a5d3aa0259ab3c0022 +commit 8a5f2de67ec28fcc7405ce21e2a7ef096e272144 Author: Dave Airlie Date: Thu Dec 11 01:35:09 2008 +1000 [...3731 lines suppressed...] } break; case RADEON_SETPARAM_PCIGART_LOCATION: @@ -35091,7 +35060,7 @@ dev_priv->gart_info.table_size = sp->value; if (dev_priv->gart_info.table_size < RADEON_PCIGART_TABLE_SIZE) dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE; -@@ -3127,6 +3153,14 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil +@@ -3137,6 +3163,14 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil case RADEON_SETPARAM_VBLANK_CRTC: return radeon_vblank_crtc_set(dev, sp->value); break; @@ -35106,7 +35075,7 @@ default: DRM_DEBUG("Invalid parameter %d\n", sp->param); return -EINVAL; -@@ -3215,7 +3249,19 @@ struct drm_ioctl_desc radeon_ioctls[] = { +@@ -3226,7 +3260,19 @@ struct drm_ioctl_desc radeon_ioctls[] = { DRM_IOCTL_DEF(DRM_RADEON_IRQ_WAIT, radeon_irq_wait, DRM_AUTH), DRM_IOCTL_DEF(DRM_RADEON_SETPARAM, radeon_cp_setparam, DRM_AUTH), DRM_IOCTL_DEF(DRM_RADEON_SURF_ALLOC, radeon_surface_alloc, DRM_AUTH), @@ -35140,7 +35109,7 @@ /** diff --git a/include/drm/drmP.h b/include/drm/drmP.h -index e5f4ae9..c963f25 100644 +index ccbcd13..99e348d 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -147,9 +147,23 @@ struct drm_device; @@ -35167,7 +35136,7 @@ /*@}*/ -@@ -652,6 +666,8 @@ struct drm_master { +@@ -665,6 +679,8 @@ struct drm_master { void *driver_priv; /**< Private structure for driver to use */ }; @@ -35176,7 +35145,7 @@ /** * DRM driver structure. This structure represent the common code for * a family of cards. There will one drm_device for each card present -@@ -770,6 +786,8 @@ struct drm_driver { +@@ -784,6 +800,8 @@ struct drm_driver { /* Driver private ops for this object */ struct vm_operations_struct *gem_vm_ops; @@ -35185,7 +35154,7 @@ int major; int minor; -@@ -845,7 +863,10 @@ struct drm_device { +@@ -906,7 +924,10 @@ struct drm_device { /*@{ */ struct list_head maplist; /**< Linked list of regions */ int map_count; /**< Number of mappable regions */ @@ -35197,7 +35166,7 @@ /** \name Context handle management */ /*@{ */ -@@ -856,6 +877,7 @@ struct drm_device { +@@ -917,6 +938,7 @@ struct drm_device { struct idr ctx_idr; struct list_head vmalist; /**< List of vmas (for debugging) */ @@ -35205,7 +35174,7 @@ /*@} */ -@@ -927,7 +949,6 @@ struct drm_device { +@@ -988,7 +1010,6 @@ struct drm_device { int num_crtcs; /**< Number of CRTCs on this device */ void *dev_private; /**< device private data */ void *mm_private; @@ -35213,7 +35182,7 @@ struct drm_sigdata sigdata; /**< For block_all_signals */ sigset_t sigmask; -@@ -937,6 +958,9 @@ struct drm_device { +@@ -998,6 +1019,9 @@ struct drm_device { struct drm_minor *control; /**< Control node for card */ struct drm_minor *primary; /**< render type primary screen head */ @@ -35223,7 +35192,7 @@ /** \name Drawable information */ /*@{ */ spinlock_t drw_lock; -@@ -959,8 +983,28 @@ struct drm_device { +@@ -1020,8 +1044,28 @@ struct drm_device { uint32_t invalidate_domains; /* domains pending invalidation */ uint32_t flush_domains; /* domains pending flush */ /*@} */ @@ -35252,7 +35221,7 @@ static inline int drm_dev_to_irq(struct drm_device *dev) { -@@ -1070,6 +1114,17 @@ extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev, +@@ -1131,6 +1175,17 @@ extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev, uint32_t type); extern int drm_unbind_agp(DRM_AGP_MEM * handle); @@ -35270,7 +35239,7 @@ /* Misc. IOCTL support (drm_ioctl.h) */ extern int drm_irq_by_busid(struct drm_device *dev, void *data, struct drm_file *file_priv); -@@ -1240,6 +1295,7 @@ extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size +@@ -1301,6 +1356,7 @@ extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size extern int drm_agp_free_memory(DRM_AGP_MEM * handle); extern int drm_agp_bind_memory(DRM_AGP_MEM * handle, off_t start); extern int drm_agp_unbind_memory(DRM_AGP_MEM * handle); @@ -35278,7 +35247,7 @@ extern void drm_agp_chipset_flush(struct drm_device *dev); /* Stub support (drm_stub.h) */ -@@ -1281,6 +1337,8 @@ extern int drm_ati_pcigart_init(struct drm_device *dev, +@@ -1368,6 +1424,8 @@ extern int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info * gart_info); extern int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info * gart_info); @@ -35287,7 +35256,7 @@ extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size, size_t align, dma_addr_t maxaddr); -@@ -1438,6 +1496,39 @@ extern void drm_free(void *pt, size_t size, int area); +@@ -1525,6 +1583,39 @@ extern void drm_free(void *pt, size_t size, int area); extern void *drm_calloc(size_t nmemb, size_t size, int area); #endif @@ -35328,10 +35297,10 @@ #endif /* __KERNEL__ */ diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h -index 0b0d236..cb3952c 100644 +index c7d4b2e..3091fc3 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h -@@ -121,4 +121,6 @@ static inline void drm_connector_helper_add(struct drm_connector *connector, +@@ -122,4 +122,6 @@ static inline void drm_connector_helper_add(struct drm_connector *connector, } extern int drm_helper_resume_force_mode(struct drm_device *dev); @@ -36290,10 +36259,10 @@ * on the security mechanisms provided by hardware. */ diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h -index 73ff51f..1f67a11 100644 +index 937a275..f716e0a 100644 --- a/include/drm/radeon_drm.h +++ b/include/drm/radeon_drm.h -@@ -453,6 +453,15 @@ typedef struct { +@@ -455,6 +455,15 @@ typedef struct { int pfCurrentPage; /* which buffer is being displayed? */ int crtc2_base; /* CRTC2 frame offset */ int tiling_enabled; /* set by drm, read by 2d + 3d clients */ @@ -36309,7 +36278,7 @@ } drm_radeon_sarea_t; /* WARNING: If you change any of these defines, make sure to change the -@@ -493,6 +502,18 @@ typedef struct { +@@ -495,6 +504,18 @@ typedef struct { #define DRM_RADEON_SURF_ALLOC 0x1a #define DRM_RADEON_SURF_FREE 0x1b @@ -36328,7 +36297,7 @@ #define DRM_IOCTL_RADEON_CP_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t) #define DRM_IOCTL_RADEON_CP_START DRM_IO( DRM_COMMAND_BASE + DRM_RADEON_CP_START) #define DRM_IOCTL_RADEON_CP_STOP DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_STOP, drm_radeon_cp_stop_t) -@@ -521,6 +542,18 @@ typedef struct { +@@ -523,6 +544,18 @@ typedef struct { #define DRM_IOCTL_RADEON_SURF_ALLOC DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_ALLOC, drm_radeon_surface_alloc_t) #define DRM_IOCTL_RADEON_SURF_FREE DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_FREE, drm_radeon_surface_free_t) @@ -36347,7 +36316,7 @@ typedef struct drm_radeon_init { enum { RADEON_INIT_CP = 0x01, -@@ -677,6 +710,8 @@ typedef struct drm_radeon_indirect { +@@ -680,6 +713,8 @@ typedef struct drm_radeon_indirect { #define RADEON_PARAM_VBLANK_CRTC 13 /* VBLANK CRTC */ #define RADEON_PARAM_FB_LOCATION 14 /* FB location */ #define RADEON_PARAM_NUM_GB_PIPES 15 /* num GB pipes */ @@ -36356,7 +36325,7 @@ typedef struct drm_radeon_getparam { int param; -@@ -731,6 +766,7 @@ typedef struct drm_radeon_setparam { +@@ -734,6 +769,7 @@ typedef struct drm_radeon_setparam { #define RADEON_SETPARAM_NEW_MEMMAP 4 /* Use new memory map */ #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5 /* PCI GART Table Size */ #define RADEON_SETPARAM_VBLANK_CRTC 6 /* VBLANK CRTC */ @@ -36364,7 +36333,7 @@ /* 1.14: Clients can allocate/free a surface */ typedef struct drm_radeon_surface_alloc { -@@ -746,4 +782,106 @@ typedef struct drm_radeon_surface_free { +@@ -749,4 +785,106 @@ typedef struct drm_radeon_surface_free { #define DRM_RADEON_VBLANK_CRTC1 1 #define DRM_RADEON_VBLANK_CRTC2 2 drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-nouveau.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- drm-nouveau.patch 11 Feb 2009 04:51:28 -0000 1.9 +++ drm-nouveau.patch 1 Mar 2009 02:52:37 -0000 1.10 @@ -23,28 +23,26 @@ +obj-$(CONFIG_DRM_NOUVEAU) += nouveau/ diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c -index 9ed8259..ed46425 100644 +index 445c762..a528dc9 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c -@@ -49,8 +49,8 @@ unsigned long drm_get_resource_len(struct drm_device *dev, unsigned int resource +@@ -51,7 +51,7 @@ resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resour EXPORT_SYMBOL(drm_get_resource_len); -static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, -- drm_local_map_t *map) +struct drm_map_list *drm_find_matching_map(struct drm_device *dev, -+ drm_local_map_t *map) + struct drm_local_map *map) { struct drm_map_list *entry; - list_for_each_entry(entry, &dev->maplist, head) { -@@ -63,6 +63,7 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, +@@ -83,6 +83,7 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, return NULL; } +EXPORT_SYMBOL(drm_find_matching_map); static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash, - unsigned long user_token, int hashed_handle) + unsigned long user_token, int hashed_handle, int shm) diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile new file mode 100644 index 0000000..557f04e Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v retrieving revision 1.1279 retrieving revision 1.1280 diff -u -r1.1279 -r1.1280 --- kernel.spec 27 Feb 2009 06:10:12 -0000 1.1279 +++ kernel.spec 1 Mar 2009 02:52:38 -0000 1.1280 @@ -57,7 +57,7 @@ # The rc snapshot level %define rcrev 6 # The git snapshot level -%define gitrev 4 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -636,6 +636,7 @@ Patch1550: linux-2.6-cdrom-door-status.patch # nouveau + drm fixes +Patch1811: drm-next.patch Patch1812: drm-modesetting-radeon.patch Patch1814: drm-nouveau.patch Patch1816: drm-no-gem-on-i8xx.patch @@ -1168,6 +1169,7 @@ ApplyPatch linux-2.6-net-tulip-interrupt.patch # Nouveau DRM + drm fixes +ApplyPatch drm-next.patch ApplyPatch drm-modesetting-radeon.patch ApplyPatch drm-nouveau.patch ApplyPatch drm-no-gem-on-i8xx.patch @@ -1765,6 +1767,11 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Sat Feb 28 2009 Chuck Ebbert 2.6.29-0.50.rc6.git5 +- Linux 2.6.29-rc6-git5 +- Disable CONFIG_NET_NS because of bug #486889 in rawhide. +- Copy lirc and hdpvr updates from rawhide. + * Fri Feb 27 2009 Chuck Ebbert 2.6.29-0.49.rc6.git4 - Linux 2.6.29-rc6-git4 linux-2.6-hdpvr.patch: Index: linux-2.6-hdpvr.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-hdpvr.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-hdpvr.patch 29 Jan 2009 21:14:11 -0000 1.3 +++ linux-2.6-hdpvr.patch 1 Mar 2009 02:52:38 -0000 1.4 @@ -1,3 +1,24 @@ +Video capture driver for the Hauppauge HD PVR + +upstream: http://hg.jannau.net/hdpvr/ +product info: http://hauppauge.com/site/products/data_hdpvr.html + +Signed-off-by: Jarod Wilson + +--- + drivers/media/video/Kconfig | 2 + + drivers/media/video/Makefile | 2 + + drivers/media/video/hdpvr/Kconfig | 10 + + drivers/media/video/hdpvr/Makefile | 7 + + drivers/media/video/hdpvr/hdpvr-control.c | 212 +++++ + drivers/media/video/hdpvr/hdpvr-core.c | 461 +++++++++++ + drivers/media/video/hdpvr/hdpvr-i2c.c | 145 ++++ + drivers/media/video/hdpvr/hdpvr-video.c | 1258 +++++++++++++++++++++++++++++ + drivers/media/video/hdpvr/hdpvr.h | 326 ++++++++ + drivers/media/video/v4l2-common.c | 3 + + include/linux/i2c-id.h | 1 + + 11 files changed, 2427 insertions(+), 0 deletions(-) + diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 19cf3b8..4f29e1a 100644 --- a/drivers/media/video/Kconfig @@ -12,18 +33,18 @@ source "drivers/media/video/usbvision/Kconfig" diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile -index 72f6d03..35ff442 100644 +index 72f6d03..e7e4508 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile -@@ -122,6 +122,8 @@ obj-$(CONFIG_USB_PWC) += pwc/ - obj-$(CONFIG_USB_ZC0301) += zc0301/ - obj-$(CONFIG_USB_GSPCA) += gspca/ +@@ -128,6 +128,8 @@ obj-$(CONFIG_USB_VICAM) += usbvideo/ + obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/ + obj-$(CONFIG_USB_S2255) += s2255drv.o -+obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/ ++obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/ + - obj-$(CONFIG_USB_IBMCAM) += usbvideo/ - obj-$(CONFIG_USB_KONICAWC) += usbvideo/ - obj-$(CONFIG_USB_VICAM) += usbvideo/ + obj-$(CONFIG_VIDEO_IVTV) += ivtv/ + obj-$(CONFIG_VIDEO_CX18) += cx18/ + diff --git a/drivers/media/video/hdpvr/Kconfig b/drivers/media/video/hdpvr/Kconfig new file mode 100644 index 0000000..de247f3 @@ -273,10 +294,10 @@ +} diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c new file mode 100644 -index 0000000..19e5282 +index 0000000..394309a --- /dev/null +++ b/drivers/media/video/hdpvr/hdpvr-core.c -@@ -0,0 +1,455 @@ +@@ -0,0 +1,461 @@ +/* + * Hauppage HD PVR USB driver + * @@ -336,6 +357,8 @@ +/* table of devices that work with this driver */ +static struct usb_device_id hdpvr_table [] = { + { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID) }, ++ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID1) }, ++ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID2) }, + { } /* Terminating entry */ +}; +MODULE_DEVICE_TABLE(usb, hdpvr_table); @@ -452,6 +475,10 @@ + dev->flags &= ~HDPVR_FLAG_AC3_CAP; + } else if (buf[1] == HDPVR_FIRMWARE_VERSION_AC3) { + dev->flags |= HDPVR_FLAG_AC3_CAP; ++ } else if (buf[1] > HDPVR_FIRMWARE_VERSION_AC3) { ++ hdpvr_print("untested firmware version 0x%x, the driver might " ++ "not work", buf[1]); ++ dev->flags |= HDPVR_FLAG_AC3_CAP; + } else { + hdpvr_err("unknown firmware version 0x%x", buf[1]); + ret = -EINVAL; @@ -885,7 +912,7 @@ +} diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c new file mode 100644 -index 0000000..0297f91 +index 0000000..33788d0 --- /dev/null +++ b/drivers/media/video/hdpvr/hdpvr-video.c @@ -0,0 +1,1258 @@ @@ -1253,7 +1280,7 @@ + return retval; +} + -+#if 0 ++ +static void hdpvr_draw_down(struct hdpvr_device *dev) +{ + hdpvr_trace("status = %d", dev->status); @@ -1279,7 +1306,6 @@ + + return 0; +} -+#endif + +static int hdpvr_release(struct file *file) +{ @@ -1456,8 +1482,7 @@ +} + + -+static long hdpvr_ioctl(struct file *filp, unsigned int cmd, -+ unsigned long arg) ++static long hdpvr_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ + struct hdpvr_fh *fh = (struct hdpvr_fh *)filp->private_data; + struct hdpvr_device *dev = fh->dev; @@ -1501,10 +1526,9 @@ + .owner = THIS_MODULE, + .open = hdpvr_open, + .release = hdpvr_release, -+/* .flush = hdpvr_flush, */ + .read = hdpvr_read, + .poll = hdpvr_poll, -+ .ioctl = hdpvr_ioctl, ++ .unlocked_ioctl = hdpvr_ioctl, +}; + +/*=======================================================================*/ @@ -1515,8 +1539,11 @@ +static int vidioc_querycap(struct file *file, void *priv, + struct v4l2_capability *cap) +{ ++ struct hdpvr_device *dev = video_drvdata(file); ++ + strcpy(cap->driver, "hdpvr"); + strcpy(cap->card, "Haupauge HD PVR"); ++ usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); + cap->version = HDPVR_VERSION; + cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | + V4L2_CAP_AUDIO | @@ -2149,10 +2176,10 @@ +} diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h new file mode 100644 -index 0000000..ffe3a36 +index 0000000..1514742 --- /dev/null +++ b/drivers/media/video/hdpvr/hdpvr.h -@@ -0,0 +1,324 @@ +@@ -0,0 +1,326 @@ +/* + * Hauppage HD PVR USB driver + * @@ -2180,6 +2207,8 @@ +/* Define these values to match your devices */ +#define HD_PVR_VENDOR_ID 0x2040 +#define HD_PVR_PRODUCT_ID 0x4900 ++#define HD_PVR_PRODUCT_ID1 0x4901 ++#define HD_PVR_PRODUCT_ID2 0x4902 + +#define UNSET (-1U) + linux-2.6.29-lirc.patch: Index: linux-2.6.29-lirc.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6.29-lirc.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.29-lirc.patch 30 Jan 2009 21:21:41 -0000 1.2 +++ linux-2.6.29-lirc.patch 1 Mar 2009 02:52:38 -0000 1.3 @@ -1,30 +1,55 @@ +Linux Infrared Remote Control drivers (http://www.lirc.org/) + +Signed-off-by: Jarod Wilson + +--- + MAINTAINERS | 9 + drivers/input/Kconfig | 2 + drivers/input/Makefile | 2 + drivers/input/lirc/Kconfig | 118 +++ drivers/input/lirc/Makefile | 21 + drivers/input/lirc/lirc.h | 100 +++ drivers/input/lirc/lirc_bt829.c | 381 +++++++++ - drivers/input/lirc/lirc_dev.c | 754 ++++++++++++++++++ - drivers/input/lirc/lirc_dev.h | 178 +++++ - drivers/input/lirc/lirc_i2c.c | 649 ++++++++++++++++ - drivers/input/lirc/lirc_igorplugusb.c | 554 +++++++++++++ - drivers/input/lirc/lirc_imon.c | 1369 ++++++++++++++++++++++++++++++++ - drivers/input/lirc/lirc_it87.c | 984 +++++++++++++++++++++++ + drivers/input/lirc/lirc_dev.c | 853 +++++++++++++++++++ + drivers/input/lirc/lirc_dev.h | 180 ++++ + drivers/input/lirc/lirc_i2c.c | 649 +++++++++++++++ + drivers/input/lirc/lirc_igorplugusb.c | 555 +++++++++++++ + drivers/input/lirc/lirc_imon.c | 1459 +++++++++++++++++++++++++++++++++ + drivers/input/lirc/lirc_it87.c | 984 ++++++++++++++++++++++ drivers/input/lirc/lirc_it87.h | 116 +++ - drivers/input/lirc/lirc_ite8709.c | 539 +++++++++++++ - drivers/input/lirc/lirc_mceusb.c | 784 +++++++++++++++++++ - drivers/input/lirc/lirc_mceusb2.c | 1119 ++++++++++++++++++++++++++ - drivers/input/lirc/lirc_parallel.c | 709 +++++++++++++++++ + drivers/input/lirc/lirc_ite8709.c | 539 ++++++++++++ + drivers/input/lirc/lirc_mceusb.c | 747 +++++++++++++++++ + drivers/input/lirc/lirc_mceusb2.c | 1097 +++++++++++++++++++++++++ + drivers/input/lirc/lirc_parallel.c | 709 ++++++++++++++++ drivers/input/lirc/lirc_parallel.h | 26 + - drivers/input/lirc/lirc_sasem.c | 933 ++++++++++++++++++++++ - drivers/input/lirc/lirc_serial.c | 1321 +++++++++++++++++++++++++++++++ - drivers/input/lirc/lirc_sir.c | 1294 ++++++++++++++++++++++++++++++ - drivers/input/lirc/lirc_streamzap.c | 772 ++++++++++++++++++ - drivers/input/lirc/lirc_ttusbir.c | 396 ++++++++++ - drivers/input/lirc/lirc_zilog.c | 1382 +++++++++++++++++++++++++++++++++ - - 24 files changed, 14503 insertions(+), 0 deletions(-) + drivers/input/lirc/lirc_sasem.c | 933 +++++++++++++++++++++ + drivers/input/lirc/lirc_serial.c | 1321 +++++++++++++++++++++++++++++ + drivers/input/lirc/lirc_sir.c | 1294 +++++++++++++++++++++++++++++ + drivers/input/lirc/lirc_streamzap.c | 773 +++++++++++++++++ + drivers/input/lirc/lirc_ttusbir.c | 398 +++++++++ + drivers/input/lirc/lirc_zilog.c | 1382 +++++++++++++++++++++++++++++++ + 25 files changed, 14648 insertions(+), 0 deletions(-) +diff --git a/MAINTAINERS b/MAINTAINERS +index 59fd2d1..ad1b16c 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -2749,6 +2749,15 @@ W: http://www.pasemi.com/ + L: linuxppc-dev at ozlabs.org + S: Supported + ++LINUX INFRARED REMOTE CONTROL DRIVERS (LIRC) ++P: Jarod Wilson ++M: jarod at redhat.com ++P: Christoph Bartelmus ++M: lirc at bartelmus.de ++W: http://www.lirc.org/ ++L: lirc-list at lists.sourceforge.net ++S: Maintained ++ + LINUX SECURITY MODULE (LSM) FRAMEWORK + P: Chris Wright + M: chrisw at sous-sol.org diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 5f9d860..2ba0904 100644 --- a/drivers/input/Kconfig @@ -39,7 +64,7 @@ endif diff --git a/drivers/input/Makefile b/drivers/input/Makefile -index 98c4f9a..6a1049b 100644 +index 4c9c745..99e2b5e 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC) += misc/ @@ -201,7 +226,7 @@ +obj-$(CONFIG_LIRC_ZILOG) += lirc_zilog.o diff --git a/drivers/input/lirc/lirc.h b/drivers/input/lirc/lirc.h new file mode 100644 -index 0000000..b6d124e +index 0000000..599b21c --- /dev/null +++ b/drivers/input/lirc/lirc.h @@ -0,0 +1,100 @@ @@ -270,27 +295,27 @@ + +/*** IOCTL commands for lirc driver ***/ + -+#define LIRC_GET_FEATURES _IOR('i', 0x00000000, __u32) ++#define LIRC_GET_FEATURES _IOR('i', 0x00000000, unsigned long) + -+#define LIRC_GET_SEND_MODE _IOR('i', 0x00000001, __u32) -+#define LIRC_GET_REC_MODE _IOR('i', 0x00000002, __u32) -+#define LIRC_GET_SEND_CARRIER _IOR('i', 0x00000003, __u32) -+#define LIRC_GET_REC_CARRIER _IOR('i', 0x00000004, __u32) -+#define LIRC_GET_SEND_DUTY_CYCLE _IOR('i', 0x00000005, __u32) -+#define LIRC_GET_REC_DUTY_CYCLE _IOR('i', 0x00000006, __u32) -+#define LIRC_GET_REC_RESOLUTION _IOR('i', 0x00000007, __u32) ++#define LIRC_GET_SEND_MODE _IOR('i', 0x00000001, unsigned long) ++#define LIRC_GET_REC_MODE _IOR('i', 0x00000002, unsigned long) ++#define LIRC_GET_SEND_CARRIER _IOR('i', 0x00000003, unsigned int) ++#define LIRC_GET_REC_CARRIER _IOR('i', 0x00000004, unsigned int) ++#define LIRC_GET_SEND_DUTY_CYCLE _IOR('i', 0x00000005, unsigned int) ++#define LIRC_GET_REC_DUTY_CYCLE _IOR('i', 0x00000006, unsigned int) ++#define LIRC_GET_REC_RESOLUTION _IOR('i', 0x00000007, unsigned int) + +/* code length in bits, currently only for LIRC_MODE_LIRCCODE */ -+#define LIRC_GET_LENGTH _IOR('i', 0x0000000f, __u32) ++#define LIRC_GET_LENGTH _IOR('i', 0x0000000f, unsigned long) + -+#define LIRC_SET_SEND_MODE _IOW('i', 0x00000011, __u32) -+#define LIRC_SET_REC_MODE _IOW('i', 0x00000012, __u32) ++#define LIRC_SET_SEND_MODE _IOW('i', 0x00000011, unsigned long) ++#define LIRC_SET_REC_MODE _IOW('i', 0x00000012, unsigned long) +/* Note: these can reset the according pulse_width */ -+#define LIRC_SET_SEND_CARRIER _IOW('i', 0x00000013, __u32) -+#define LIRC_SET_REC_CARRIER _IOW('i', 0x00000014, __u32) -+#define LIRC_SET_SEND_DUTY_CYCLE _IOW('i', 0x00000015, __u32) -+#define LIRC_SET_REC_DUTY_CYCLE _IOW('i', 0x00000016, __u32) -+#define LIRC_SET_TRANSMITTER_MASK _IOW('i', 0x00000017, __u32) ++#define LIRC_SET_SEND_CARRIER _IOW('i', 0x00000013, unsigned int) ++#define LIRC_SET_REC_CARRIER _IOW('i', 0x00000014, unsigned int) ++#define LIRC_SET_SEND_DUTY_CYCLE _IOW('i', 0x00000015, unsigned int) ++#define LIRC_SET_REC_DUTY_CYCLE _IOW('i', 0x00000016, unsigned int) ++#define LIRC_SET_TRANSMITTER_MASK _IOW('i', 0x00000017, unsigned int) + +/* + * to set a range use @@ -299,15 +324,15 @@ + * LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER with the upper bound + */ + -+#define LIRC_SET_REC_DUTY_CYCLE_RANGE _IOW('i', 0x0000001e, __u32) -+#define LIRC_SET_REC_CARRIER_RANGE _IOW('i', 0x0000001f, __u32) ++#define LIRC_SET_REC_DUTY_CYCLE_RANGE _IOW('i', 0x0000001e, unsigned int) ++#define LIRC_SET_REC_CARRIER_RANGE _IOW('i', 0x0000001f, unsigned int) + +#define LIRC_NOTIFY_DECODE _IO('i', 0x00000020) + +#endif diff --git a/drivers/input/lirc/lirc_bt829.c b/drivers/input/lirc/lirc_bt829.c new file mode 100644 -index 0000000..581f6e2 +index 0000000..7981849 --- /dev/null +++ b/drivers/input/lirc/lirc_bt829.c @@ -0,0 +1,381 @@ @@ -690,14 +715,14 @@ +MODULE_DESCRIPTION("IR remote driver for bt829 based TV cards"); +MODULE_LICENSE("GPL"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Debug enabled or not"); diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c new file mode 100644 -index 0000000..e7b52c4 +index 0000000..dddd999 --- /dev/null +++ b/drivers/input/lirc/lirc_dev.c -@@ -0,0 +1,754 @@ +@@ -0,0 +1,853 @@ +/* + * LIRC base driver + * @@ -735,6 +760,10 @@ +#include +#include +#include ++#include ++#ifdef CONFIG_COMPAT ++#include ++#endif + +#include "lirc.h" +#include "lirc_dev.h" @@ -861,6 +890,9 @@ + .write = lirc_dev_fop_write, + .poll = lirc_dev_fop_poll, + .ioctl = lirc_dev_fop_ioctl, ++#ifdef CONFIG_COMPAT ++ .compat_ioctl = lirc_dev_fop_compat_ioctl, ++#endif + .open = lirc_dev_fop_open, + .release = lirc_dev_fop_close, + .owner = THIS_MODULE, @@ -1000,9 +1032,8 @@ + d->name[sizeof(d->name)-1] = '\0'; + + bytes_in_key = BITS_TO_LONGS(d->code_length); -+ -+ chunk_size = d->chunk_size ? d->chunk_size : bytes_in_key; + buffer_size = d->buffer_size ? d->buffer_size : BUFLEN / bytes_in_key; ++ chunk_size = d->chunk_size ? d->chunk_size : bytes_in_key; + + if (d->rbuf) { + ir->buf = d->rbuf; @@ -1277,8 +1308,7 @@ + */ + break; + case LIRC_GET_LENGTH: -+ result = put_user((unsigned long)ir->d.code_length, -+ (unsigned long *)arg); ++ result = put_user(ir->d.code_length, (unsigned long *)arg); + break; + default: + result = -EINVAL; @@ -1291,6 +1321,100 @@ +} +EXPORT_SYMBOL(lirc_dev_fop_ioctl); + ++#ifdef CONFIG_COMPAT ++#define LIRC_GET_FEATURES_COMPAT32 _IOR('i', 0x00000000, __u32) ++ ++#define LIRC_GET_SEND_MODE_COMPAT32 _IOR('i', 0x00000001, __u32) ++#define LIRC_GET_REC_MODE_COMPAT32 _IOR('i', 0x00000002, __u32) ++ ++#define LIRC_GET_LENGTH_COMPAT32 _IOR('i', 0x0000000f, __u32) ++ ++#define LIRC_SET_SEND_MODE_COMPAT32 _IOW('i', 0x00000011, __u32) ++#define LIRC_SET_REC_MODE_COMPAT32 _IOW('i', 0x00000012, __u32) ++ ++long lirc_dev_fop_compat_ioctl(struct file *file, ++ unsigned int cmd32, ++ unsigned long arg) ++{ ++ mm_segment_t old_fs; ++ int ret; ++ unsigned long val; ++ unsigned int cmd; ++ ++ switch (cmd32) { ++ case LIRC_GET_FEATURES_COMPAT32: ++ case LIRC_GET_SEND_MODE_COMPAT32: ++ case LIRC_GET_REC_MODE_COMPAT32: ++ case LIRC_GET_LENGTH_COMPAT32: ++ case LIRC_SET_SEND_MODE_COMPAT32: ++ case LIRC_SET_REC_MODE_COMPAT32: ++ /* ++ * These commands expect (unsigned long *) arg ++ * but the 32-bit app supplied (__u32 *). ++ * Conversion is required. ++ */ ++ if (get_user(val, (__u32 *)compat_ptr(arg))) ++ return -EFAULT; ++ lock_kernel(); ++ /* ++ * tell lirc_dev_fop_ioctl that it's safe to use the pointer ++ * to val which is in kernel address space and not in ++ * user address space. ++ */ ++ old_fs = get_fs(); ++ set_fs(KERNEL_DS); ++ ++ cmd = _IOC(_IOC_DIR(cmd32), _IOC_TYPE(cmd32), _IOC_NR(cmd32), ++ (_IOC_TYPECHECK(unsigned long))); ++ ret = lirc_dev_fop_ioctl(file->f_path.dentry->d_inode, file, ++ cmd, (unsigned long)(&val)); ++ ++ set_fs(old_fs); ++ unlock_kernel(); ++ switch (cmd) { ++ case LIRC_GET_FEATURES: ++ case LIRC_GET_SEND_MODE: ++ case LIRC_GET_REC_MODE: ++ case LIRC_GET_LENGTH: ++ if (!ret && put_user(val, (__u32 *)compat_ptr(arg))) ++ return -EFAULT; ++ break; ++ } ++ return ret; ++ ++ case LIRC_GET_SEND_CARRIER: ++ case LIRC_GET_REC_CARRIER: ++ case LIRC_GET_SEND_DUTY_CYCLE: ++ case LIRC_GET_REC_DUTY_CYCLE: ++ case LIRC_GET_REC_RESOLUTION: ++ case LIRC_SET_SEND_CARRIER: ++ case LIRC_SET_REC_CARRIER: ++ case LIRC_SET_SEND_DUTY_CYCLE: ++ case LIRC_SET_REC_DUTY_CYCLE: ++ case LIRC_SET_TRANSMITTER_MASK: ++ case LIRC_SET_REC_DUTY_CYCLE_RANGE: ++ case LIRC_SET_REC_CARRIER_RANGE: ++ /* ++ * These commands expect (unsigned int *)arg ++ * so no problems here. Just handle the locking. ++ */ ++ lock_kernel(); ++ cmd = cmd32; ++ ret = lirc_dev_fop_ioctl(file->f_path.dentry->d_inode, ++ file, cmd, arg); ++ unlock_kernel(); ++ return ret; ++ default: ++ /* unknown */ ++ printk(KERN_ERR "lirc_dev: %s(%s:%d): Unknown cmd %08x\n", ++ __func__, current->comm, current->pid, cmd32); ++ return -ENOIOCTLCMD; ++ } ++} ++EXPORT_SYMBOL(lirc_dev_fop_compat_ioctl); ++#endif ++ ++ +ssize_t lirc_dev_fop_read(struct file *file, + char *buffer, + size_t length, @@ -1450,14 +1574,14 @@ +MODULE_AUTHOR("Artur Lipowski"); +MODULE_LICENSE("GPL"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); diff --git a/drivers/input/lirc/lirc_dev.h b/drivers/input/lirc/lirc_dev.h new file mode 100644 -index 0000000..bf05a7c +index 0000000..b12d519 --- /dev/null +++ b/drivers/input/lirc/lirc_dev.h -@@ -0,0 +1,178 @@ +@@ -0,0 +1,180 @@ +/* + * LIRC base driver + * @@ -1544,12 +1668,12 @@ +struct lirc_driver { + char name[40]; + int minor; -+ int code_length; ++ unsigned long code_length; ++ unsigned int buffer_size; /* in chunks holding one code each */ + int sample_rate; + unsigned long features; + + unsigned int chunk_size; -+ unsigned int buffer_size; /* in chunks */ + + void *data; + int (*add_to_buf) (void *data, struct lirc_buffer *buf); @@ -1634,11 +1758,13 @@ + loff_t *ppos); +ssize_t lirc_dev_fop_write(struct file *file, const char *buffer, size_t length, + loff_t *ppos); ++long lirc_dev_fop_compat_ioctl(struct file *file, unsigned int cmd32, ++ unsigned long arg); + +#endif diff --git a/drivers/input/lirc/lirc_i2c.c b/drivers/input/lirc/lirc_i2c.c new file mode 100644 -index 0000000..01a4ced +index 0000000..dedf415 --- /dev/null +++ b/drivers/input/lirc/lirc_i2c.c @@ -0,0 +1,649 @@ @@ -2283,20 +2409,20 @@ + "Ulrich Mueller, Stefan Jahn, Jerome Brock"); +MODULE_LICENSE("GPL"); + -+module_param(minor, int, 0444); ++module_param(minor, int, S_IRUGO); +MODULE_PARM_DESC(minor, "Preferred minor device number"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); + +module_init(lirc_i2c_init); +module_exit(lirc_i2c_exit); diff --git a/drivers/input/lirc/lirc_igorplugusb.c b/drivers/input/lirc/lirc_igorplugusb.c new file mode 100644 -index 0000000..7dd8844 +index 0000000..51ccd1c --- /dev/null +++ b/drivers/input/lirc/lirc_igorplugusb.c -@@ -0,0 +1,554 @@ +@@ -0,0 +1,555 @@ +/* + * lirc_igorplugusb - USB remote support for LIRC + * @@ -2725,7 +2851,7 @@ + driver->set_use_dec = &set_use_dec; + driver->sample_rate = sample_rate; /* per second */ + driver->add_to_buf = &usb_remote_poll; -+ driver->dev = &dev->dev; ++ driver->dev = &intf->dev; + driver->owner = THIS_MODULE; + + init_waitqueue_head(&ir->wait_out); @@ -2760,10 +2886,11 @@ + + if (dev->descriptor.iManufacturer + && usb_string(dev, dev->descriptor.iManufacturer, buf, 63) > 0) -+ strncpy(name, buf, 128); ++ strlcpy(name, buf, sizeof(name)); + if (dev->descriptor.iProduct + && usb_string(dev, dev->descriptor.iProduct, buf, 63) > 0) -+ snprintf(name, 128, "%s %s", name, buf); ++ snprintf(name + strlen(name), sizeof(name) - strlen(name), ++ " %s", buf); + printk(DRIVER_NAME "[%d]: %s on usb%d:%d\n", devnum, name, + dev->bus->busnum, devnum); + @@ -2848,15 +2975,15 @@ +MODULE_LICENSE("GPL"); +MODULE_DEVICE_TABLE(usb, usb_remote_id_table); + -+module_param(sample_rate, int, 0644); ++module_param(sample_rate, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(sample_rate, "Sampling rate in Hz (default: 100)"); + diff --git a/drivers/input/lirc/lirc_imon.c b/drivers/input/lirc/lirc_imon.c new file mode 100644 -index 0000000..a0d052a +index 0000000..5655a0d --- /dev/null +++ b/drivers/input/lirc/lirc_imon.c -@@ -0,0 +1,1369 @@ +@@ -0,0 +1,1459 @@ +/* + * lirc_imon.c: LIRC/VFD/LCD driver for Ahanix/Soundgraph IMON IR/VFD/LCD + * including the iMON PAD model @@ -2885,6 +3012,7 @@ +#include +#include +#include ++#include + +#include "lirc.h" +#include "lirc_dev.h" @@ -2912,7 +3040,7 @@ +static void usb_rx_callback(struct urb *urb); +static void usb_tx_callback(struct urb *urb); + -+/* Display file_operations function prototypes */ ++/* display file_operations function prototypes */ +static int display_open(struct inode *inode, struct file *file); +static int display_close(struct inode *inode, struct file *file); + @@ -2937,14 +3065,14 @@ +struct imon_context { + struct usb_device *usbdev; + int display_supported; /* not all controllers do */ -+ int display_isopen; /* Display port has been opened */ ++ int display_isopen; /* display port has been opened */ + int ir_isopen; /* IR port open */ + int ir_isassociating; /* IR port open for association */ + int dev_present; /* USB device presence */ + struct mutex lock; /* to lock this object */ + wait_queue_head_t remove_ok; /* For unexpected USB disconnects */ + -+ int display_proto_6p; /* Display requires 6th packet */ ++ int display_proto_6p; /* display requires 6th packet */ + int ir_onboard_decode; /* IR signals decoded onboard */ + + struct lirc_driver *driver; @@ -2970,7 +3098,7 @@ + } tx; +}; + -+/* Display file operations. Nb: lcd_write will be subbed in as needed later */ ++/* display file operations. Nb: lcd_write will be subbed in as needed later */ +static struct file_operations display_fops = { + .owner = THIS_MODULE, + .open = &display_open, @@ -2995,7 +3123,7 @@ + { USB_DEVICE(0x04e8, 0xff30) }, + /* iMON USB Control Board (IR & VFD) */ + { USB_DEVICE(0x15c2, 0xffda) }, -+ /* iMON USB Control Board (IR & LCD) *and* iMon Knob (IR only) */ ++ /* iMON USB Control Board (IR & LCD) *and* iMON Knob (IR only) */ + { USB_DEVICE(0x15c2, 0xffdc) }, + /* iMON USB Control Board (IR & LCD) */ + { USB_DEVICE(0x15c2, 0x0034) }, @@ -3033,7 +3161,7 @@ +static unsigned char display_packet6[] = { + 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF }; + -+/* newer iMon models use control endpoints */ ++/* newer iMON models use control endpoints */ +static struct usb_device_id ctl_ep_device_list[] = { + { USB_DEVICE(0x15c2, 0x0034) }, + { USB_DEVICE(0x15c2, 0x0036) }, @@ -3046,7 +3174,7 @@ + {} +}; + -+/* iMon LCD models user a different write op */ ++/* iMON LCD models user a different write op */ +static struct usb_device_id lcd_device_list[] = { + { USB_DEVICE(0x15c2, 0xffdc) }, + { USB_DEVICE(0x15c2, 0x0034) }, @@ -3055,7 +3183,7 @@ + {} +}; + -+/* iMon devices with front panel buttons need a larger buffer */ ++/* iMON devices with front panel buttons need a larger buffer */ +static struct usb_device_id large_buffer_list[] = { + { USB_DEVICE(0x15c2, 0x0038) }, + { USB_DEVICE(0x15c2, 0x0045) }, @@ -3075,7 +3203,7 @@ + {} +}; + -+/* Some iMon devices have no lcd/vfd, don't set one up */ ++/* Some iMON devices have no lcd/vfd, don't set one up */ +static struct usb_device_id ir_only_list[] = { + { USB_DEVICE(0x0aa8, 0x8001) }, + { USB_DEVICE(0x04e8, 0xff30) }, @@ -3117,9 +3245,9 @@ +MODULE_VERSION(MOD_VERSION); +MODULE_LICENSE("GPL"); +MODULE_DEVICE_TABLE(usb, imon_usb_id_table); -+module_param(debug, int, 0); ++module_param(debug, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes(default: no)"); -+module_param(display_type, int, 0); ++module_param(display_type, int, S_IRUGO); +MODULE_PARM_DESC(display_type, "Type of attached display. 0=autodetect, " + "1=vfd, 2=lcd, 3=none (default: autodetect)"); + @@ -3152,7 +3280,7 @@ +} + +/** -+ * Called when the Display device (e.g. /dev/lcd0) ++ * Called when the display device (e.g. /dev/lcd0) + * is opened by the application. + */ +static int display_open(struct inode *inode, struct file *file) @@ -3185,15 +3313,15 @@ + mutex_lock(&context->lock); + + if (!context->display_supported) { -+ err("%s: Display not supported by device", __func__); ++ err("%s: display not supported by device", __func__); + retval = -ENODEV; + } else if (context->display_isopen) { -+ err("%s: Display port is already open", __func__); ++ err("%s: display port is already open", __func__); + retval = -EBUSY; + } else { + context->display_isopen = 1; + file->private_data = context; -+ printk(KERN_INFO "Display port opened\n"); ++ printk(KERN_INFO "display port opened\n"); + } + + mutex_unlock(&context->lock); @@ -3204,7 +3332,7 @@ +} + +/** -+ * Called when the Display device (e.g. /dev/lcd0) ++ * Called when the display device (e.g. /dev/lcd0) + * is closed by the application. + */ +static int display_close(struct inode *inode, struct file *file) @@ -3222,14 +3350,14 @@ + mutex_lock(&context->lock); + + if (!context->display_supported) { -+ err("%s: Display not supported by device", __func__); ++ err("%s: display not supported by device", __func__); + retval = -ENODEV; + } else if (!context->display_isopen) { -+ err("%s: Display is not open", __func__); ++ err("%s: display is not open", __func__); + retval = -EIO; + } else { + context->display_isopen = 0; -+ printk(KERN_INFO "Display port closed\n"); ++ printk(KERN_INFO "display port closed\n"); + if (!context->dev_present && !context->ir_isopen) { + /* + * Device disconnected before close and IR port is not @@ -3247,7 +3375,7 @@ +} + +/** -+ * Sends a packet to the Display. ++ * Sends a packet to the display. + */ +static int send_packet(struct imon_context *context) +{ @@ -3698,18 +3826,113 @@ + return; +} + ++static inline int tv2int(const struct timeval *a, const struct timeval *b) ++{ ++ int usecs = 0; ++ int sec = 0; ++ ++ if (b->tv_usec > a->tv_usec) { ++ usecs = 1000000; ++ sec--; ++ } ++ ++ usecs += a->tv_usec - b->tv_usec; ++ ++ sec += a->tv_sec - b->tv_sec; ++ sec *= 1000; ++ usecs /= 1000; ++ sec += usecs; ++ ++ if (sec < 0) ++ sec = 1000; ++ ++ return sec; ++} ++ ++/** ++ * The directional pad is overly sensitive in keyboard mode, so we do some ++ * interesting contortions to make it less touchy. ++ */ ++#define IMON_PAD_TIMEOUT 1000 /* in msecs */ ++#define IMON_PAD_THRESHOLD 80 /* 160x160 square */ ++static int stabilize(int a, int b) ++{ ++ struct timeval ct; ++ static struct timeval prev_time = {0, 0}; ++ static struct timeval hit_time = {0, 0}; ++ static int x, y, prev_result, hits; ++ int result = 0; ++ int msec, msec_hit; ++ ++ do_gettimeofday(&ct); ++ msec = tv2int(&ct, &prev_time); ++ msec_hit = tv2int(&ct, &hit_time); ++ ++ if (msec > 100) { ++ x = 0; ++ y = 0; ++ hits = 0; ++ } ++ ++ x += a; ++ y += b; ++ ++ prev_time = ct; ++ ++ if (abs(x) > IMON_PAD_THRESHOLD || abs(y) > IMON_PAD_THRESHOLD) { ++ if (abs(y) > abs(x)) ++ result = (y > 0) ? 0x7F : 0x80; ++ else ++ result = (x > 0) ? 0x7F00 : 0x8000; ++ ++ x = 0; ++ y = 0; ++ ++ if (result == prev_result) { ++ hits++; ++ ++ if (hits > 3) { ++ switch (result) { ++ case 0x7F: ++ y = 17 * IMON_PAD_THRESHOLD / 30; ++ break; ++ case 0x80: ++ y -= 17 * IMON_PAD_THRESHOLD / 30; ++ break; ++ case 0x7F00: ++ x = 17 * IMON_PAD_THRESHOLD / 30; ++ break; ++ case 0x8000: ++ x -= 17 * IMON_PAD_THRESHOLD / 30; ++ break; ++ } ++ } ++ ++ if (hits == 2 && msec_hit < IMON_PAD_TIMEOUT) { ++ result = 0; ++ hits = 1; ++ } ++ } else { ++ prev_result = result; ++ hits = 1; ++ hit_time = ct; ++ } ++ } ++ ++ return result; ++} ++ +/** + * Process the incoming packet + */ +static void incoming_packet(struct imon_context *context, -+ struct urb *urb) ++ struct urb *urb) +{ + int len = urb->actual_length; + unsigned char *buf = urb->transfer_buffer; + int octet, bit; + unsigned char mask; -+ int chunk_num; -+ int i; ++ int i, chunk_num, dir; + + /* + * we need to add some special handling for @@ -3731,17 +3954,11 @@ + * try to ignore when they get too close + */ + if ((buf[1] == 0) && ((buf[2] != 0) || (buf[3] != 0))) { -+ int y = (int)(char)buf[2]; -+ int x = (int)(char)buf[3]; -+ if (abs(abs(x) - abs(y)) < 3) { ++ dir = stabilize((int)(char)buf[2], (int)(char)buf[3]); ++ if (!dir) + return; -+ } else if (abs(y) > abs(x)) { -+ buf[2] = 0x00; -+ buf[3] = (y > 0) ? 0x7f : 0x80; -+ } else { -+ buf[3] = 0x00; -+ buf[2] = (x > 0) ? 0x7f : 0x80; -+ } ++ buf[2] = dir & 0xFF; ++ buf[3] = (dir >> 8) & 0xFF; + } + } + @@ -3930,7 +4147,7 @@ + /* + * Scan the endpoint list and set: + * first input endpoint = IR endpoint -+ * first output endpoint = Display endpoint ++ * first output endpoint = display endpoint + */ + for (i = 0; i < num_endpts && !(ir_ep_found && display_ep_found); ++i) { + struct usb_endpoint_descriptor *ep; @@ -3963,7 +4180,7 @@ + + /* + * If we didn't find a display endpoint, this is probably one of the -+ * newer iMon devices that use control urb instead of interrupt ++ * newer iMON devices that use control urb instead of interrupt + */ + if (!display_ep_found) { + if (usb_match_id(interface, ctl_ep_device_list)) { @@ -3977,7 +4194,7 @@ + } + + /* -+ * Some iMon receivers have no display. Unfortunately, it seems ++ * Some iMON receivers have no display. Unfortunately, it seems + * that SoundGraph recycles device IDs between devices both with + * and without... :\ + */ @@ -4006,7 +4223,7 @@ + ir_onboard_decode); + } + -+ /* Determine if Display requires 6 packets */ ++ /* Determine if display requires 6 packets */ + if (display_ep_found) { + if (usb_match_id(interface, display_proto_6p_list)) + display_proto_6p = 1; @@ -4020,13 +4237,13 @@ + + context = kzalloc(sizeof(struct imon_context), GFP_KERNEL); + if (!context) { -+ err("%s: kmalloc failed for context", __func__); ++ err("%s: kzalloc failed for context", __func__); + alloc_status = 1; + goto alloc_status_switch; + } + driver = kzalloc(sizeof(struct lirc_driver), GFP_KERNEL); + if (!driver) { -+ err("%s: kmalloc failed for lirc_driver", __func__); ++ err("%s: kzalloc failed for lirc_driver", __func__); + alloc_status = 2; + goto alloc_status_switch; + } @@ -4050,7 +4267,7 @@ + if (display_ep_found) { + tx_urb = usb_alloc_urb(0, GFP_KERNEL); + if (!tx_urb) { -+ err("%s: usb_alloc_urb failed for Display urb", ++ err("%s: usb_alloc_urb failed for display urb", + __func__); + alloc_status = 6; + goto alloc_status_switch; @@ -4071,7 +4288,7 @@ + driver->rbuf = rbuf; + driver->set_use_inc = ir_open; + driver->set_use_dec = ir_close; -+ driver->dev = &usbdev->dev; ++ driver->dev = &interface->dev; + driver->owner = THIS_MODULE; + + mutex_lock(&context->lock); @@ -4115,11 +4332,11 @@ + + if (display_ep_found && context->display_supported) { + if (debug) -+ printk(KERN_INFO "Registering Display with sysfs\n"); ++ printk(KERN_INFO "Registering display with sysfs\n"); + if (usb_register_dev(interface, &imon_class)) { + /* Not a fatal error, so ignore */ + printk(KERN_INFO "%s: could not get a minor number for " -+ "Display\n", __func__); ++ "display\n", __func__); + } + } + @@ -4228,7 +4445,7 @@ +module_exit(imon_exit); diff --git a/drivers/input/lirc/lirc_it87.c b/drivers/input/lirc/lirc_it87.c new file mode 100644 -index 0000000..3a3484c +index 0000000..232ba97 --- /dev/null +++ b/drivers/input/lirc/lirc_it87.c @@ -0,0 +1,984 @@ @@ -5181,24 +5398,24 @@ +MODULE_AUTHOR("Hans-Gunter Lutke Uphues"); +MODULE_LICENSE("GPL"); + -+module_param(io, int, 0444); ++module_param(io, int, S_IRUGO); +MODULE_PARM_DESC(io, "I/O base address (default: 0x310)"); + -+module_param(irq, int, 0444); ++module_param(irq, int, S_IRUGO); +#ifdef LIRC_IT87_DIGIMATRIX +MODULE_PARM_DESC(irq, "Interrupt (1,3-12) (default: 9)"); +#else +MODULE_PARM_DESC(irq, "Interrupt (1,3-12) (default: 7)"); +#endif + -+module_param(it87_enable_demodulator, bool, 0444); ++module_param(it87_enable_demodulator, bool, S_IRUGO); +MODULE_PARM_DESC(it87_enable_demodulator, + "Receiver demodulator enable/disable (1/0), default: 0"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); + -+module_param(digimatrix, bool, 0644); ++module_param(digimatrix, bool, S_IRUGO | S_IWUSR); +#ifdef LIRC_IT87_DIGIMATRIX +MODULE_PARM_DESC(digimatrix, + "Asus Digimatrix it87 compat. enable/disable (1/0), default: 1"); @@ -5208,7 +5425,7 @@ +#endif + + -+module_param(it87_freq, int, 0444); ++module_param(it87_freq, int, S_IRUGO); +#ifdef LIRC_IT87_DIGIMATRIX +MODULE_PARM_DESC(it87_freq, + "Carrier demodulator frequency (kHz), (default: 36)"); @@ -5340,7 +5557,7 @@ +/********************************* ITE IT87xx ************************/ diff --git a/drivers/input/lirc/lirc_ite8709.c b/drivers/input/lirc/lirc_ite8709.c new file mode 100644 -index 0000000..6a544ec +index 0000000..3d53181 --- /dev/null +++ b/drivers/input/lirc/lirc_ite8709.c @@ -0,0 +1,539 @@ @@ -5881,14 +6098,14 @@ +MODULE_AUTHOR("Gr??gory Lardi??re"); +MODULE_LICENSE("GPL"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); diff --git a/drivers/input/lirc/lirc_mceusb.c b/drivers/input/lirc/lirc_mceusb.c new file mode 100644 -index 0000000..16f9757 +index 0000000..2e94699 --- /dev/null +++ b/drivers/input/lirc/lirc_mceusb.c -@@ -0,0 +1,784 @@ +@@ -0,0 +1,747 @@ +/* + * USB Microsoft IR Transceiver driver - 0.2 + * @@ -5980,15 +6197,9 @@ + struct urb *write_urb; /* the urb used to send data */ + __u8 bulk_out_endpointAddr; /* the address of bulk out endpoint */ + -+ atomic_t write_busy; /* true iff write urb is busy */ -+ struct completion write_finished; /* wait for the write to finish */ -+ + wait_queue_head_t wait_q; /* for timeouts */ -+ int open_count; /* number of times this port has been opened */ + struct mutex lock; /* locks this structure */ + -+ int present; /* if the device is not disconnected */ -+ + struct lirc_driver *driver; + + int lircdata[256]; /* place to store data until lirc processes it */ @@ -6037,21 +6248,6 @@ + .id_table = mceusb_table, +}; + -+ -+static void usb_mceusb_debug_data(const char *function, int size, -+ const unsigned char *data) -+{ -+ int i; -+ if (!debug) -+ return; -+ -+ printk(KERN_DEBUG __FILE__": %s - length = %d, data = ", -+ function, size); -+ for (i = 0; i < size; ++i) -+ printk(KERN_DEBUG "%.2x ", data[i]); -+ printk(KERN_DEBUG "\n"); -+} -+ +static void mceusb_delete(struct mceusb_device *dev) +{ + dprintk("%s", __func__); @@ -6193,8 +6389,6 @@ + /* handle signals and USB disconnects */ + if (signal_pending(current)) + return dev->lirccnt ? dev->lirccnt : -EINTR; -+ if (!dev->udev) -+ return -ENODEV; + + bulkidx = 0; + @@ -6375,12 +6569,6 @@ + + mutex_lock(&dev->lock); + -+ /* verify device still present */ -+ if (dev->udev == NULL) { -+ mutex_unlock(&dev->lock); -+ return -ENODEV; -+ } -+ + if (!dev->lirccnt) { + int res; + dev->lircidx = 0; @@ -6561,7 +6749,7 @@ + driver->set_use_dec = &set_use_dec; + driver->sample_rate = 80; /* sample at 100hz (10ms) */ + driver->add_to_buf = &mceusb_add_to_buf; -+ driver->dev = &udev->dev; ++ driver->dev = &interface->dev; + driver->owner = THIS_MODULE; + if (lirc_register_driver(driver) < 0) { + kfree(driver); @@ -6623,14 +6811,6 @@ + /* unhook lirc things */ + lirc_unregister_driver(minor); + kfree(dev->driver); -+ /* terminate an ongoing write */ -+ if (atomic_read(&dev->write_busy)) { -+ usb_kill_urb(dev->write_urb); -+ wait_for_completion(&dev->write_finished); -+ } -+ -+ /* prevent device read, write and ioctl */ -+ dev->present = 0; + + mutex_unlock(&dev->lock); + mceusb_delete(dev); @@ -6671,14 +6851,14 @@ +MODULE_LICENSE("GPL"); +MODULE_DEVICE_TABLE(usb, mceusb_table); + -+module_param(debug, int, 0644); ++module_param(debug, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Debug enabled or not"); diff --git a/drivers/input/lirc/lirc_mceusb2.c b/drivers/input/lirc/lirc_mceusb2.c new file mode 100644 -index 0000000..8bc9263 +index 0000000..089ee21 --- /dev/null +++ b/drivers/input/lirc/lirc_mceusb2.c -@@ -0,0 +1,1119 @@ +@@ -0,0 +1,1097 @@ +/* + * LIRC driver for Philips eHome USB Infrared Transceiver + * and the Microsoft MCE 2005 Remote Control @@ -6733,7 +6913,7 @@ + "MCE 2005 Remote Control driver for LIRC" +#define DRIVER_NAME "lirc_mceusb2" + -+#define USB_BUFLEN 16 /* USB reception buffer length */ ++#define USB_BUFLEN 32 /* USB reception buffer length */ +#define LIRCBUF_SIZE 256 /* LIRC work buffer length */ + +/* MCE constants */ @@ -6794,8 +6974,6 @@ +#define VENDOR_COMPRO 0x185b + +static struct usb_device_id mceusb_dev_table[] = { -+ /* Philips eHome Infrared Transceiver */ -+ { USB_DEVICE(VENDOR_PHILIPS, 0x0815) }, + /* Philips Infrared Transceiver - Sahara branded */ + { USB_DEVICE(VENDOR_PHILIPS, 0x0608) }, + /* Philips Infrared Transceiver - HP branded */ @@ -6806,6 +6984,8 @@ + { USB_DEVICE(VENDOR_PHILIPS, 0x060f) }, + /* Philips Infrared Transceiver - Spinel plus */ + { USB_DEVICE(VENDOR_PHILIPS, 0x0613) }, ++ /* Philips eHome Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_PHILIPS, 0x0815) }, + /* SMK/Toshiba G83C0004D410 */ + { USB_DEVICE(VENDOR_SMK, 0x031d) }, + /* SMK eHome Infrared Transceiver (Sony VAIO) */ @@ -7145,26 +7325,8 @@ + case 0: + for (i = 0; i < buf_len; i++) { + /* decode mce packets of the form (84),AA,BB,CC,DD */ -+ switch (ir->buf_in[i]) { -+ ++ if (ir->buf_in[i] >= 0x80 && ir->buf_in[i] <= 0x9e) { + /* data headers */ -+ case 0x90: /* used Pinnacle Remote Kit */ -+ case 0x8F: -+ case 0x8E: -+ case 0x8D: -+ case 0x8C: -+ case 0x8B: -+ case 0x8A: -+ case 0x89: -+ case 0x88: -+ case 0x87: -+ case 0x86: -+ case 0x85: -+ case 0x84: -+ case 0x83: -+ case 0x82: -+ case 0x81: -+ case 0x80: + /* decode packet data */ + packet_len = ir->buf_in[i] & + MCE_PACKET_LENGTH_MASK; @@ -7190,10 +7352,8 @@ + } + + i += packet_len; -+ break; -+ ++ } else if (ir->buf_in[i] == MCE_CONTROL_HEADER) { + /* status header (0x9F) */ -+ case MCE_CONTROL_HEADER: + /* + * A transmission containing one or + * more consecutive ir commands always @@ -7215,9 +7375,6 @@ + + /* end decode loop */ + i = buf_len; -+ break; -+ default: -+ break; + } + } + @@ -7596,7 +7753,7 @@ + driver->set_use_dec = &set_use_dec; + driver->code_length = sizeof(int) * 8; + driver->fops = &lirc_fops; -+ driver->dev = &dev->dev; ++ driver->dev = &intf->dev; + driver->owner = THIS_MODULE; + + mutex_init(&ir->lock); @@ -7648,10 +7805,11 @@ + + if (dev->descriptor.iManufacturer + && usb_string(dev, dev->descriptor.iManufacturer, buf, 63) > 0) -+ strncpy(name, buf, 128); ++ strlcpy(name, buf, sizeof(name)); + if (dev->descriptor.iProduct + && usb_string(dev, dev->descriptor.iProduct, buf, 63) > 0) -+ snprintf(name, 128, "%s %s", name, buf); ++ snprintf(name + strlen(name), sizeof(name) - strlen(name), ++ " %s", buf); + printk(DRIVER_NAME "[%d]: %s on usb%d:%d\n", devnum, name, + dev->bus->busnum, devnum); + @@ -7796,11 +7954,11 @@ +MODULE_LICENSE("GPL"); +MODULE_DEVICE_TABLE(usb, mceusb_dev_table); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Debug enabled or not"); diff --git a/drivers/input/lirc/lirc_parallel.c b/drivers/input/lirc/lirc_parallel.c new file mode 100644 -index 0000000..b66c57f +index 0000000..07d0d02 --- /dev/null +++ b/drivers/input/lirc/lirc_parallel.c @@ -0,0 +1,709 @@ @@ -8499,19 +8657,19 @@ +MODULE_AUTHOR("Christoph Bartelmus"); +MODULE_LICENSE("GPL"); + -+module_param(io, int, 0444); ++module_param(io, int, S_IRUGO); +MODULE_PARM_DESC(io, "I/O address base (0x3bc, 0x378 or 0x278)"); + -+module_param(irq, int, 0444); ++module_param(irq, int, S_IRUGO); +MODULE_PARM_DESC(irq, "Interrupt (7 or 5)"); + -+module_param(tx_mask, int, 0444); ++module_param(tx_mask, int, S_IRUGO); +MODULE_PARM_DESC(tx_maxk, "Transmitter mask (default: 0x01)"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); + -+module_param(check_pselecd, bool, 0644); ++module_param(check_pselecd, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Check for printer (default: 0)"); diff --git a/drivers/input/lirc/lirc_parallel.h b/drivers/input/lirc/lirc_parallel.h new file mode 100644 @@ -8547,7 +8705,7 @@ +#endif diff --git a/drivers/input/lirc/lirc_sasem.c b/drivers/input/lirc/lirc_sasem.c new file mode 100644 -index 0000000..e26cda2 +index 0000000..3b79372 --- /dev/null +++ b/drivers/input/lirc/lirc_sasem.c @@ -0,0 +1,933 @@ @@ -8715,7 +8873,7 @@ +MODULE_AUTHOR(MOD_AUTHOR); +MODULE_DESCRIPTION(MOD_DESC); +MODULE_LICENSE("GPL"); -+module_param(debug, int, 0); ++module_param(debug, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes (default: no)"); + +static void delete_context(struct sasem_context *context) @@ -9299,13 +9457,13 @@ + + context = kzalloc(sizeof(struct sasem_context), GFP_KERNEL); + if (!context) { -+ err("%s: kmalloc failed for context", __func__); ++ err("%s: kzalloc failed for context", __func__); + alloc_status = 1; + goto alloc_status_switch; + } + driver = kzalloc(sizeof(struct lirc_driver), GFP_KERNEL); + if (!driver) { -+ err("%s: kmalloc failed for lirc_driver", __func__); ++ err("%s: kzalloc failed for lirc_driver", __func__); + alloc_status = 2; + goto alloc_status_switch; + } @@ -9347,7 +9505,7 @@ + driver->rbuf = rbuf; + driver->set_use_inc = ir_open; + driver->set_use_dec = ir_close; -+ driver->dev = &dev->dev; ++ driver->dev = &interface->dev; + driver->owner = THIS_MODULE; + + mutex_lock(&context->lock); @@ -9486,7 +9644,7 @@ +module_exit(sasem_exit); diff --git a/drivers/input/lirc/lirc_serial.c b/drivers/input/lirc/lirc_serial.c new file mode 100644 -index 0000000..643c762 +index 0000000..692634f --- /dev/null +++ b/drivers/input/lirc/lirc_serial.c @@ -0,0 +1,1321 @@ @@ -10371,7 +10529,7 @@ + /* If pin is high, then this must be an active low receiver. */ + if (sense == -1) { + /* wait 1/2 sec for the power supply */ -+ msleep(HZ/2); ++ msleep(jiffies_to_msecs(HZ/2)); + + /* + * probe 9 times every 0.04s, collect "votes" for @@ -10384,7 +10542,7 @@ + nlow++; + else + nhigh++; -+ msleep(HZ/25); ++ msleep(jiffies_to_msecs(HZ/25)); + } + sense = (nlow >= nhigh ? 1 : 0); + printk(KERN_INFO LIRC_DRIVER_NAME ": auto-detected active " @@ -10769,16 +10927,16 @@ + "Christoph Bartelmus, Andrei Tanas"); +MODULE_LICENSE("GPL"); + -+module_param(type, int, 0444); ++module_param(type, int, S_IRUGO); +MODULE_PARM_DESC(type, "Hardware type (0 = home-brew, 1 = IRdeo," + " 2 = IRdeo Remote, 3 = AnimaX, 4 = IgorPlug," + " 5 = NSLU2 RX:CTS2/TX:GreenLED)"); + -+module_param(io, int, 0444); ++module_param(io, int, S_IRUGO); +MODULE_PARM_DESC(io, "I/O address base (0x3f8 or 0x2f8)"); + +/* some architectures (e.g. intel xscale) have memory mapped registers */ -+module_param(iommap, bool, 0444); ++module_param(iommap, bool, S_IRUGO); +MODULE_PARM_DESC(iommap, "physical base for memory mapped I/O" + " (0 = no memory mapped io)"); + @@ -10787,33 +10945,33 @@ + * on 32bit word boundaries. + * See linux-kernel/serial/8250.c serial_in()/out() + */ -+module_param(ioshift, int, 0444); ++module_param(ioshift, int, S_IRUGO); +MODULE_PARM_DESC(ioshift, "shift I/O register offset (0 = no shift)"); + -+module_param(irq, int, 0444); ++module_param(irq, int, S_IRUGO); +MODULE_PARM_DESC(irq, "Interrupt (4 or 3)"); + -+module_param(share_irq, bool, 0444); ++module_param(share_irq, bool, S_IRUGO); +MODULE_PARM_DESC(share_irq, "Share interrupts (0 = off, 1 = on)"); + -+module_param(sense, bool, 0444); ++module_param(sense, bool, S_IRUGO); +MODULE_PARM_DESC(sense, "Override autodetection of IR receiver circuit" + " (0 = active high, 1 = active low )"); + +#ifdef CONFIG_LIRC_SERIAL_TRANSMITTER -+module_param(txsense, bool, 0444); ++module_param(txsense, bool, S_IRUGO); +MODULE_PARM_DESC(txsense, "Sense of transmitter circuit" + " (0 = active high, 1 = active low )"); +#endif + -+module_param(softcarrier, bool, 0444); ++module_param(softcarrier, bool, S_IRUGO); +MODULE_PARM_DESC(softcarrier, "Software carrier (0 = off, 1 = on, default on)"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); diff --git a/drivers/input/lirc/lirc_sir.c b/drivers/input/lirc/lirc_sir.c new file mode 100644 -index 0000000..093cfd2 +index 0000000..306c77a --- /dev/null +++ b/drivers/input/lirc/lirc_sir.c @@ -0,0 +1,1294 @@ @@ -12096,27 +12254,27 @@ +MODULE_LICENSE("GPL"); + +#ifdef LIRC_ON_SA1100 -+module_param(irq, int, 0444); ++module_param(irq, int, S_IRUGO); +MODULE_PARM_DESC(irq, "Interrupt (16)"); +#else -+module_param(io, int, 0444); ++module_param(io, int, S_IRUGO); +MODULE_PARM_DESC(io, "I/O address base (0x3f8 or 0x2f8)"); + -+module_param(irq, int, 0444); ++module_param(irq, int, S_IRUGO); +MODULE_PARM_DESC(irq, "Interrupt (4 or 3)"); + -+module_param(threshold, int, 0444); ++module_param(threshold, int, S_IRUGO); +MODULE_PARM_DESC(threshold, "space detection threshold (3)"); +#endif + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); diff --git a/drivers/input/lirc/lirc_streamzap.c b/drivers/input/lirc/lirc_streamzap.c new file mode 100644 -index 0000000..cb05b58 +index 0000000..f91c1e3 --- /dev/null +++ b/drivers/input/lirc/lirc_streamzap.c -@@ -0,0 +1,772 @@ +@@ -0,0 +1,773 @@ +/* + * Streamzap Remote Control driver + * @@ -12333,7 +12491,7 @@ + (unsigned char *) &data); + } + if (sz->timer_running) { -+ sz->delay_timer.expires += timer_inc; ++ sz->delay_timer.expires = jiffies + timer_inc; + add_timer(&sz->delay_timer); + } + } else { @@ -12641,7 +12799,7 @@ + sz->driver.set_use_inc = &streamzap_use_inc; + sz->driver.set_use_dec = &streamzap_use_dec; + sz->driver.fops = &streamzap_fops; -+ sz->driver.dev = &udev->dev; ++ sz->driver.dev = &interface->dev; + sz->driver.owner = THIS_MODULE; + + sz->idle = 1; @@ -12664,11 +12822,12 @@ + + if (udev->descriptor.iManufacturer + && usb_string(udev, udev->descriptor.iManufacturer, buf, 63) > 0) -+ strncpy(name, buf, 128); ++ strlcpy(name, buf, sizeof(name)); + + if (udev->descriptor.iProduct + && usb_string(udev, udev->descriptor.iProduct, buf, 63) > 0) -+ snprintf(name, 128, "%s %s", name, buf); ++ snprintf(name + strlen(name), sizeof(name) - strlen(name), ++ " %s", buf); + + printk(KERN_INFO DRIVER_NAME "[%d]: %s on usb%d:%d attached\n", + sz->driver.minor, name, @@ -12761,7 +12920,7 @@ + + switch (cmd) { + case LIRC_GET_REC_RESOLUTION: -+ result = put_user(STREAMZAP_RESOLUTION, (unsigned long *) arg); ++ result = put_user(STREAMZAP_RESOLUTION, (unsigned int *) arg); + if (result) + return result; + break; @@ -12887,14 +13046,14 @@ +MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_LICENSE("GPL"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); diff --git a/drivers/input/lirc/lirc_ttusbir.c b/drivers/input/lirc/lirc_ttusbir.c new file mode 100644 -index 0000000..8e65ee7 +index 0000000..4d18084 --- /dev/null +++ b/drivers/input/lirc/lirc_ttusbir.c -@@ -0,0 +1,396 @@ +@@ -0,0 +1,398 @@ +/* + * lirc_ttusbir.c + * @@ -12957,7 +13116,7 @@ +static void set_use_dec(void *data); + +static int num_urbs = 2; -+module_param(num_urbs, int, 0444); ++module_param(num_urbs, int, S_IRUGO); +MODULE_PARM_DESC(num_urbs, + "Number of URBs in queue. Try to increase to 4 in case " + "of problems (default: 2; minimum: 2)"); @@ -13204,6 +13363,8 @@ + ttusbir->driver.rbuf = &ttusbir->rbuf; + ttusbir->driver.set_use_inc = set_use_inc; + ttusbir->driver.set_use_dec = set_use_dec; ++ ttusbir->driver.fops = NULL; ++ ttusbir->driver.dev = &intf->dev; + ttusbir->driver.owner = THIS_MODULE; + ttusbir->driver.features = LIRC_CAN_REC_MODE2; + ttusbir->minor = lirc_register_driver(&ttusbir->driver); Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v retrieving revision 1.953 retrieving revision 1.954 diff -u -r1.953 -r1.954 --- sources 27 Feb 2009 06:10:12 -0000 1.953 +++ sources 1 Mar 2009 02:52:38 -0000 1.954 @@ -1,3 +1,3 @@ d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2 26f67d99666834cc579094619821d3c8 patch-2.6.29-rc6.bz2 -c9a437c9aecae85e0e11338f175d4818 patch-2.6.29-rc6-git4.bz2 +c9924c779a427f2b57cd201fbef62cee patch-2.6.29-rc6-git5.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v retrieving revision 1.864 retrieving revision 1.865 diff -u -r1.864 -r1.865 --- upstream 27 Feb 2009 06:10:12 -0000 1.864 +++ upstream 1 Mar 2009 02:52:38 -0000 1.865 @@ -1,3 +1,3 @@ linux-2.6.28.tar.bz2 patch-2.6.29-rc6.bz2 -patch-2.6.29-rc6-git4.bz2 +patch-2.6.29-rc6-git5.bz2 --- patch-2.6.29-rc6-git4.bz2.sign DELETED --- From mycae at fedoraproject.org Sun Mar 1 02:55:11 2009 From: mycae at fedoraproject.org (Daniel Haley) Date: Sun, 1 Mar 2009 02:55:11 +0000 (UTC) Subject: rpms/flexdock/F-10 flexdock-build.patch, NONE, 1.1 flexdock-generate-tarball.sh, NONE, 1.1 flexdock-jni.patch, NONE, 1.1 flexdock-nojmf.patch, NONE, 1.1 flexdock-skinlfPainter-path.patch, NONE, 1.1 flexdock-skinlfTitlebarui-path.patch, NONE, 1.1 flexdock.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301025511.6743470115@cvs1.fedora.phx.redhat.com> Author: mycae Update of /cvs/pkgs/rpms/flexdock/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26905/F-10 Modified Files: .cvsignore sources Added Files: flexdock-build.patch flexdock-generate-tarball.sh flexdock-jni.patch flexdock-nojmf.patch flexdock-skinlfPainter-path.patch flexdock-skinlfTitlebarui-path.patch flexdock.spec import.log Log Message: flexdock-build.patch: --- NEW FILE flexdock-build.patch --- --- build.xml 2008-12-10 20:54:53.000000000 +1100 +++ build.xml.new 2008-12-10 20:55:13.000000000 +1100 @@ -118,7 +118,8 @@ - + + @@ -135,7 +136,7 @@ + description="Compile java sources for the framework, and tests"> @@ -145,8 +146,6 @@ - - @@ -291,12 +290,15 @@ - - + + + + + @@ -414,60 +416,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -555,9 +503,7 @@ - - @@ -567,12 +513,6 @@ jarname="${build.dir}/${dist.jar.name}" sjarname="${bin.dir.webstart}/${dist.jar.name}"/> - - workingcopy.properties #remove *dll find ./ -name \*.dll -exec rm {} \; #remove .so files find ./ -name \*.so -exec rm {} \; #JAR "dependency" handling #========== #delete and symlink any jar files we know about #rm commands commented out, as we delete these #at repackage time # Apache commons Logging component # http://commons.apache.org/logging/ #rm -f lib/commons-logging-1.1.jar #remove jmf, as it is only used in a demo, #which is unused after patching #rm -rf lib/jmf #" Looks" project # https://looks.dev.java.net/ #rm -f lib/looks-2.1.1.jar #skinlf "Skin look and Feel" project # https://skinlf.dev.java.net/ #rm -f lib/skinlf.jar build-jar-repository -s -p lib commons-logging skinlf jgoodies-looks.jar pushd lib ln -s jgoodies-looks.jar looks-2.2.1.jar ln -s commons-logging.jar commons-logging-1.1.jar popd JAR_files="" for j in $(find -name \*.jar); do if [ ! -L $j ] ; then JAR_files="$JAR_files $j" fi done if [ ! -z "$JAR_files" ] ; then echo "These JAR files should be deleted and symlinked to system JAR files: $JAR_files" exit 1 fi #========= #Endline convert Doc files for i in "README-RELEASE LICENSE.txt README release-notes.txt" ; do %{__sed} -i 's/\r//' $i done %build export CLASSPATH=$(build-classpath jgoodies-looks skinlf) ant -v -Dbuild.sysclasspath=first build.with.native jar ant -v -Dbuild.sysclasspath=first compile.native %install rm -rf %{buildroot} #Create dirs needed. mkdir -p %{buildroot}/%{_libdir}/%{name} #flexdock has funny arch flags, such as "libRubberBand-linux-x86.so" on i386 SOFILE=`find ./ -name libRubberBand*so` install -pm755 $SOFILE %{buildroot}/%{_libdir}/%{name}/libRubberBand-0.so #install jar file into lib dir as it is a JNI requiring jar install -pm644 build/%{name}-%{version}.jar %{buildroot}/%{_libdir}/%{name}/%{name}-%{version}.jar %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE.txt README README-RELEASE release-notes.txt %{_libdir}/%{name} %changelog * Tue Feb 24 2009 0.5.1-11 - Created clean tarball to remove jmf * Thu Feb 19 2009 0.5.1-10 - Applied patch from Dominik 'Rathann' Mierzejewski - Added BuildRequires for apache-regexp (needed for F9) - Removed overly complex java detection * Thu Jan 21 2009 0.5.1-9 - Alter the way I handle stripping of the SOFILE - Alphabetically sort build and buildrequires - Add full stop & de-indent description - Use build-jar-repository - Change sdk.home from OR to case statment * Tue Jan 20 2009 0.5.1-8 - Set defattr - Fix arch (again) - Change install dir from %%libdir to %%libdir/%%name - Update patch0 to match changed so dir + make dynamic * Sat Dec 20 2008 0.5.1-7 - Re-enable system skinlf link & jar check. * Thu Dec 04 2008 0.5.1-6 - Use ant to build jar, rather than straight from bash. - Fix build patch to correct native .so building - Thanks goes to akurtakov for assitance. - Fixed dos->unix line ending for doc files - Added dos2unix buildrequires - Fix arch flag - Added libX11 dep for native so - Added symlink for so * Sun Nov 23 2008 0.5.1-5 - Fix documentation - Change group - Fix version numbering - Link in skinlf to proposed package * Sun Nov 16 2008 0.5.1-4 - Update package revision number - Fix Top level dir of jar file * Sat Nov 01 2008 0.5.1-3 - Add patch to remove non-free components from flexdock (thanks to Sylvestre Ledru from Scilab) - Correct deps to include jgoodies & skinlf * Sun Oct 26 2008 0.5.1-2 - Fix % { _libs } to % { _libdir } - Added Jar file creation during build - Add jar file dependency check - Cleanup filelist to just .so and .jar - Add JNI path patch * Tue Sep 30 2008 0.5.1-1 - Create spec file --- NEW FILE import.log --- flexdock-0_5_1-11_fc10:F-10:flexdock-0.5.1-11.fc10.src.rpm:1235876080 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flexdock/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Feb 2009 00:14:31 -0000 1.1 +++ .cvsignore 1 Mar 2009 02:54:40 -0000 1.2 @@ -0,0 +1 @@ +flexdock-0.5.1-clean.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flexdock/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Feb 2009 00:14:31 -0000 1.1 +++ sources 1 Mar 2009 02:54:40 -0000 1.2 @@ -0,0 +1 @@ +81736faeb864e7d30bb4a4120a86ee45 flexdock-0.5.1-clean.tar.gz From roma at fedoraproject.org Sun Mar 1 03:21:13 2009 From: roma at fedoraproject.org (Paulo Roma Cavalcanti) Date: Sun, 1 Mar 2009 03:21:13 +0000 (UTC) Subject: rpms/bashdb/F-9 bashdb.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301032113.B71B570115@cvs1.fedora.phx.redhat.com> Author: roma Update of /cvs/pkgs/rpms/bashdb/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31322/F-9 Modified Files: .cvsignore sources Added Files: bashdb.spec import.log Log Message: Initial F9 version. --- NEW FILE bashdb.spec --- Name: bashdb Summary: BASH debugger, the BASH symbolic debugger Version: 4.0_0.2 Release: 1%{?dist} License: GPLv2+ Group: Development/Debuggers Url: http://bashdb.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-4.0-0.2.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bash Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Requires: bash BuildArch: noarch %description The Bash Debugger Project is a source-code debugger for bash, which follows the gdb command syntax. The purpose of the BASH debugger is to check what is going on ???inside??? a bash script, while it executes: * Start a script, specifying conditions that might affect its behavior. * Stop a script at certain conditions (break points). * Examine the state of a script. * Experiment, by changing variable values on the fly. The 4.0 series is a complete rewrite of the previous series. Bashdb can be used with ddd: ddd --debugger %{_bindir}/%{name} . %package -n emacs-bashdb Summary: Bashdb support for Emacs Group: Development/Debuggers BuildRequires: emacs emacs-common emacs-el >= 21 Requires: bashdb = %{version}-%{release} Requires: emacs >= 21 %description -n emacs-bashdb Bashdb support for Emacs. %prep %setup -q -n %{name}-4.0-0.2 %build %configure make %install rm -rf %{buildroot} make install INSTALL="install -p" DESTDIR=%{buildroot} rm -f "%{buildroot}%{_infodir}/dir" %check make check %post /sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || : %postun if [ "$1" = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || : fi %clean rm -rf %{buildroot} %files -n emacs-bashdb %defattr(-,root,root,-) %{_datadir}/emacs/site-lisp/%{name}.* %files %defattr(-,root,root,-) %doc doc/*.html AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO %{_bindir}/%{name} %{_datadir}/%{name} %{_mandir}/man1/%{name}.1* %{_infodir}/%{name}.info* %changelog * Wed Feb 25 2009 Paulo Roma 4.0_0.2-1 - Completely rewritten for Fedora. * Tue Nov 18 2008 Manfred Tremmel - update to 4.0-0.2 --- NEW FILE import.log --- bashdb-4_0_0_2-1_fc10:F-9:bashdb-4.0_0.2-1.fc10.src.rpm:1235877585 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bashdb/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:30:05 -0000 1.1 +++ .cvsignore 1 Mar 2009 03:20:42 -0000 1.2 @@ -0,0 +1 @@ +bashdb-4.0-0.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bashdb/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:30:05 -0000 1.1 +++ sources 1 Mar 2009 03:20:42 -0000 1.2 @@ -0,0 +1 @@ +8512c748e576a8f52489cbd034edecc0 bashdb-4.0-0.2.tar.bz2 From mathstuf at fedoraproject.org Sun Mar 1 03:21:41 2009 From: mathstuf at fedoraproject.org (Ben Boeckel) Date: Sun, 1 Mar 2009 03:21:41 +0000 (UTC) Subject: rpms/kde-plasma-networkmanagement/devel kde-plasma-networkmanagement.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301032141.9F95370115@cvs1.fedora.phx.redhat.com> Author: mathstuf Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31474 Modified Files: .cvsignore sources Added Files: kde-plasma-networkmanagement.spec Log Message: Initial commit --- NEW FILE kde-plasma-networkmanagement.spec --- Name: kde-plasma-networkmanagement Version: 0.1 Release: 0.6.20090217svn%{?dist} Summary: NetworkManager KDE 4 integration Group: User Interface/Desktops License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and LGPLv2 URL: http://websvn.kde.org/trunk/playground/base/plasma/applets/networkmanager/ # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: # svn export -r 929313 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1 # tar -c kde-plasma-networkmanagement-0.1 | bzip2 --best -c > kde-plasma-networkmanagement-0.1.tar.bz2 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdebase-workspace-devel >= 4.1.96 BuildRequires: NetworkManager-glib-devel >= 0.7.0 BuildRequires: PolicyKit-devel Obsoletes: kde-plasma-networkmanager < %{version}-%{release} Provides: kde-plasma-networkmanager = %{version}-%{release} %description A Plasma applet to control your wired and wireless network(s) in KDE 4 using the default NetworkManager service. %package devel Summary: Files needed to develop programs which use the Network Manager plasmoid Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: kdebase-workspace-devel Requires: NetworkManager-glib-devel Obsoletes: kde-plasma-networkmanager-devel < %{version}-%{release} Provides: kde-plasma-networkmanager-devel = %{version}-%{release} %description devel %{summary}. %package openvpn Summary: Libraries for the Network Manager plasmoid to use OpenVPN Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} Requires: NetworkManager-openvpn Obsoletes: kde-plasma-networkmanager-openvpn < %{version}-%{release} Provides: kde-plasma-networkmanager-openvpn = %{version}-%{release} %description openvpn %{summary}. %package vpnc Summary: Libraries for the Network Manager plasmoid to use vpnc Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} Requires: NetworkManager-vpnc Obsoletes: kde-plasma-networkmanager-vpnc < %{version}-%{release} Provides: kde-plasma-networkmanager-vpnc = %{version}-%{release} %description vpnc %{summary}. %prep %setup -q %build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. -DDBUS_SYSTEM_POLICY_DIR=%{_sysconfdir}/dbus-1/system.d popd make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 %install rm -rf %{buildroot} make install/fast -C %{_target_platform} DESTDIR=%{buildroot} PREFIX=%{_prefix} %clean rm -rf %{buildroot} %post /sbin/ldconfig xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : %postun /sbin/ldconfig xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : %files %defattr(-,root,root,-) %doc TODO DESIGN %{_sysconfdir}/dbus-1/system.d/NetworkManager-kde4.conf %{_kde4_libdir}/kde4/kcm_networkmanagement.so %{_kde4_libdir}/kde4/kded_knetworkmanager.so %{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so %{_kde4_libdir}/libknmdbus.so.4 %{_kde4_libdir}/libknmdbus.so.4.2.0 %{_kde4_libdir}/libknmstorage.so.4 %{_kde4_libdir}/libknmstorage.so.4.2.0 %{_kde4_libdir}/libknmui.so.4 %{_kde4_libdir}/libknmui.so.4.2.0 %{_kde4_libexecdir}/networkmanagement_configshell %{_kde4_iconsdir}/oxygen/32x32/actions/accesspoint.png %{_kde4_appsdir}/desktoptheme/default/networkmanagement/networkmanagement-wireless.svgz %{_kde4_appsdir}/desktoptheme/default/networkmanagement/networkmanagement.svg %{_kde4_appsdir}/networkmanagement/ %{_kde4_datadir}/kde4/services/kcm_networkmanagement.desktop %{_kde4_datadir}/kde4/services/kded/knetworkmanager.desktop %{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.desktop %{_kde4_datadir}/kde4/servicetypes/networkmanagement_vpnuiplugin.desktop %files devel %defattr(-,root,root,-) %{_kde4_libdir}/libknmdbus.so %{_kde4_libdir}/libknmstorage.so %{_kde4_libdir}/libknmui.so %files openvpn %defattr(-,root,root,-) %{_kde4_libdir}/kde4/networkmanagement_openvpnui.so %{_kde4_datadir}/kde4/services/networkmanagement_openvpnui.desktop %files vpnc %defattr(-,root,root,-) %{_kde4_libdir}/kde4/networkmanagement_vpncui.so %{_kde4_datadir}/kde4/services/networkmanagement_vpncui.desktop %changelog * Tue Feb 24 2009 Ben Boeckel 0.1-0.6.20090217svn - Moved P/O to correct places * Sat Feb 21 2009 Ben Boeckel 0.1-0.5.20090217svn - Fixed Provides to have a version - Fixed Obsoletes/Provides for subpackages - Fixed licensing * Fri Feb 20 2009 Ben Boeckel 0.1-0.4.20090217svn - Fixed Obsoletes/Provides - Fixed URL * Sat Feb 7 2009 Ben Boeckel 0.1-0.3.20090207svn - Add changelog - Added tarball creation - Changed name to kde-plasma-networkmanagement * Tue Jan 13 2009 Rex Dieter 0.1-0.2.20090111svn - General cleanup * Sun Jan 11 2009 Ben Boeckel 0.1-0.1.20090111svn - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:19:52 -0000 1.1 +++ .cvsignore 1 Mar 2009 03:21:11 -0000 1.2 @@ -0,0 +1 @@ +kde-plasma-networkmanagement-0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:19:52 -0000 1.1 +++ sources 1 Mar 2009 03:21:11 -0000 1.2 @@ -0,0 +1 @@ +13c29035a9584ada3dac8c4692f8d2ec kde-plasma-networkmanagement-0.1.tar.bz2 From itamarjp at fedoraproject.org Sun Mar 1 03:29:49 2009 From: itamarjp at fedoraproject.org (Itamar Reis Peixoto) Date: Sun, 1 Mar 2009 03:29:49 +0000 (UTC) Subject: rpms/bugzilla/devel import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 bugzilla.spec, 1.22, 1.23 sources, 1.8, 1.9 Message-ID: <20090301032949.8EEEB70115@cvs1.fedora.phx.redhat.com> Author: itamarjp Update of /cvs/pkgs/rpms/bugzilla/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32745/devel Modified Files: .cvsignore bugzilla.spec sources Added Files: import.log Log Message: new version 3.0.8 --- NEW FILE import.log --- bugzilla-3_0_8-1_fc11:HEAD:bugzilla-3.0.8-1.fc11.src.rpm:1235878106 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 9 May 2008 13:49:51 -0000 1.8 +++ .cvsignore 1 Mar 2009 03:29:19 -0000 1.9 @@ -1 +1 @@ -bugzilla-3.0.4.tar.gz +bugzilla-3.0.8.tar.gz Index: bugzilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/devel/bugzilla.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- bugzilla.spec 24 Feb 2009 06:02:08 -0000 1.22 +++ bugzilla.spec 1 Mar 2009 03:29:19 -0000 1.23 @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.0.4 +Version: 3.0.8 Group: Applications/Publishing -Release: 4%{?dist} +Release: 1%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -14,7 +14,7 @@ Patch0: bugzilla-rw-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: smtpdaemon, webserver, patchutils, mod_perl, perl-SOAP-Lite, which +Requires: webserver, patchutils, mod_perl, perl-SOAP-Lite, which %package doc Summary: Bugzilla documentation @@ -128,12 +128,20 @@ %dir %{_sysconfdir}/bugzilla %files doc +%defattr(-,root,root,-) %{bzinstallprefix}/bugzilla/docs %files contrib +%defattr(-,root,root,-) %{bzinstallprefix}/bugzilla/contrib %changelog +* Sat Feb 28 2009 Itamar Reis Peixoto 3.0.8-1 +- Upgrade to 3.0.8, fix #466077 #438080 +- fix macro in changelog rpmlint warning +- fix files-attr-not-set rpmlint warning for doc and contrib sub-packages + + * Mon Feb 23 2009 Fedora Release Engineering - 3.0.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -208,7 +216,7 @@ * Mon Jun 26 2006 John Berninger - 2.22-5 - License is MPL, not GPL -- Clean up %doc specs +- Clean up %%doc specs * Sun Jun 25 2006 John Benringer - 2.22-4 - Remove localconfig file per upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 9 May 2008 13:49:51 -0000 1.8 +++ sources 1 Mar 2009 03:29:19 -0000 1.9 @@ -1 +1 @@ -f55a3f3cde9cf1bf56492d18c8f7afe4 bugzilla-3.0.4.tar.gz +fff5060b85bc50a40ea5f5de0f7b17b0 bugzilla-3.0.8.tar.gz From roma at fedoraproject.org Sun Mar 1 03:30:42 2009 From: roma at fedoraproject.org (Paulo Roma Cavalcanti) Date: Sun, 1 Mar 2009 03:30:42 +0000 (UTC) Subject: rpms/bashdb/F-10 bashdb.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301033042.5A01370115@cvs1.fedora.phx.redhat.com> Author: roma Update of /cvs/pkgs/rpms/bashdb/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv529/F-10 Modified Files: .cvsignore sources Added Files: bashdb.spec import.log Log Message: Initial F10 version. --- NEW FILE bashdb.spec --- Name: bashdb Summary: BASH debugger, the BASH symbolic debugger Version: 4.0_0.2 Release: 1%{?dist} License: GPLv2+ Group: Development/Debuggers Url: http://bashdb.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-4.0-0.2.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bash Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Requires: bash BuildArch: noarch %description The Bash Debugger Project is a source-code debugger for bash, which follows the gdb command syntax. The purpose of the BASH debugger is to check what is going on ???inside??? a bash script, while it executes: * Start a script, specifying conditions that might affect its behavior. * Stop a script at certain conditions (break points). * Examine the state of a script. * Experiment, by changing variable values on the fly. The 4.0 series is a complete rewrite of the previous series. Bashdb can be used with ddd: ddd --debugger %{_bindir}/%{name} . %package -n emacs-bashdb Summary: Bashdb support for Emacs Group: Development/Debuggers BuildRequires: emacs emacs-common emacs-el >= 21 Requires: bashdb = %{version}-%{release} Requires: emacs >= 21 %description -n emacs-bashdb Bashdb support for Emacs. %prep %setup -q -n %{name}-4.0-0.2 %build %configure make %install rm -rf %{buildroot} make install INSTALL="install -p" DESTDIR=%{buildroot} rm -f "%{buildroot}%{_infodir}/dir" %check make check %post /sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || : %postun if [ "$1" = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || : fi %clean rm -rf %{buildroot} %files -n emacs-bashdb %defattr(-,root,root,-) %{_datadir}/emacs/site-lisp/%{name}.* %files %defattr(-,root,root,-) %doc doc/*.html AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO %{_bindir}/%{name} %{_datadir}/%{name} %{_mandir}/man1/%{name}.1* %{_infodir}/%{name}.info* %changelog * Wed Feb 25 2009 Paulo Roma 4.0_0.2-1 - Completely rewritten for Fedora. * Tue Nov 18 2008 Manfred Tremmel - update to 4.0-0.2 --- NEW FILE import.log --- bashdb-4_0_0_2-1_fc10:F-10:bashdb-4.0_0.2-1.fc10.src.rpm:1235878165 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bashdb/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:30:05 -0000 1.1 +++ .cvsignore 1 Mar 2009 03:30:11 -0000 1.2 @@ -0,0 +1 @@ +bashdb-4.0-0.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bashdb/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:30:05 -0000 1.1 +++ sources 1 Mar 2009 03:30:11 -0000 1.2 @@ -0,0 +1 @@ +8512c748e576a8f52489cbd034edecc0 bashdb-4.0-0.2.tar.bz2 From itamarjp at fedoraproject.org Sun Mar 1 03:32:12 2009 From: itamarjp at fedoraproject.org (Itamar Reis Peixoto) Date: Sun, 1 Mar 2009 03:32:12 +0000 (UTC) Subject: rpms/bugzilla/F-10 import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 bugzilla.spec, 1.20, 1.21 sources, 1.8, 1.9 Message-ID: <20090301033212.B0A2B70115@cvs1.fedora.phx.redhat.com> Author: itamarjp Update of /cvs/pkgs/rpms/bugzilla/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1050/F-10 Modified Files: .cvsignore bugzilla.spec sources Added Files: import.log Log Message: new version 3.0.8 --- NEW FILE import.log --- bugzilla-3_0_8-1_fc11:F-10:bugzilla-3.0.8-1.fc11.src.rpm:1235878257 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-10/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 9 May 2008 13:49:51 -0000 1.8 +++ .cvsignore 1 Mar 2009 03:31:42 -0000 1.9 @@ -1 +1 @@ -bugzilla-3.0.4.tar.gz +bugzilla-3.0.8.tar.gz Index: bugzilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-10/bugzilla.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- bugzilla.spec 14 Jul 2008 21:30:14 -0000 1.20 +++ bugzilla.spec 1 Mar 2009 03:31:42 -0000 1.21 @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.0.4 +Version: 3.0.8 Group: Applications/Publishing -Release: 2%{?dist} +Release: 1%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -14,7 +14,7 @@ Patch0: bugzilla-rw-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: smtpdaemon, webserver, patchutils, mod_perl, perl-SOAP-Lite, perl-Email-Simple, perl-Email-MIME-Modifier, perl-Template-Toolkit, perl-MIME-tools, perl-Email-MIME-Attachment-Stripper, perl-Email-Send, perl-Email-Reply, perl-Email-MIME, perl-Email-Address, which +Requires: webserver, patchutils, mod_perl, perl-SOAP-Lite, which %package doc Summary: Bugzilla documentation @@ -128,12 +128,28 @@ %dir %{_sysconfdir}/bugzilla %files doc +%defattr(-,root,root,-) %{bzinstallprefix}/bugzilla/docs %files contrib +%defattr(-,root,root,-) %{bzinstallprefix}/bugzilla/contrib %changelog +* Sat Feb 28 2009 Itamar Reis Peixoto 3.0.8-1 +- Upgrade to 3.0.8, fix #466077 #438080 +- fix macro in changelog rpmlint warning +- fix files-attr-not-set rpmlint warning for doc and contrib sub-packages + + +* Mon Feb 23 2009 Fedora Release Engineering - 3.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 2 2009 Stepan Kasal - 3.0.4-3 +- do not require perl-Email-Simple, it is (no longer) in use +- remove several explicit perl-* requires; the automatic dependencies + do handle them + * Mon Jul 14 2008 Tom "spot" Callaway - 3.0.4-2 - fix license tag @@ -200,7 +216,7 @@ * Mon Jun 26 2006 John Berninger - 2.22-5 - License is MPL, not GPL -- Clean up %doc specs +- Clean up %%doc specs * Sun Jun 25 2006 John Benringer - 2.22-4 - Remove localconfig file per upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-10/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 9 May 2008 13:49:51 -0000 1.8 +++ sources 1 Mar 2009 03:31:42 -0000 1.9 @@ -1 +1 @@ -f55a3f3cde9cf1bf56492d18c8f7afe4 bugzilla-3.0.4.tar.gz +fff5060b85bc50a40ea5f5de0f7b17b0 bugzilla-3.0.8.tar.gz From itamarjp at fedoraproject.org Sun Mar 1 03:34:19 2009 From: itamarjp at fedoraproject.org (Itamar Reis Peixoto) Date: Sun, 1 Mar 2009 03:34:19 +0000 (UTC) Subject: rpms/bugzilla/F-9 import.log, NONE, 1.1 .cvsignore, 1.7, 1.8 bugzilla.spec, 1.18, 1.19 sources, 1.7, 1.8 Message-ID: <20090301033419.4E73370115@cvs1.fedora.phx.redhat.com> Author: itamarjp Update of /cvs/pkgs/rpms/bugzilla/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1463/F-9 Modified Files: .cvsignore bugzilla.spec sources Added Files: import.log Log Message: new version 3.0.8 --- NEW FILE import.log --- bugzilla-3_0_8-1_fc11:F-9:bugzilla-3.0.8-1.fc11.src.rpm:1235878378 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 9 May 2008 13:49:12 -0000 1.7 +++ .cvsignore 1 Mar 2009 03:33:48 -0000 1.8 @@ -1 +1 @@ -bugzilla-3.0.4.tar.gz +bugzilla-3.0.8.tar.gz Index: bugzilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-9/bugzilla.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- bugzilla.spec 9 May 2008 13:49:12 -0000 1.18 +++ bugzilla.spec 1 Mar 2009 03:33:48 -0000 1.19 @@ -4,17 +4,17 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.0.4 +Version: 3.0.8 Group: Applications/Publishing Release: 1%{?dist} -License: MPL +License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf Source2: README.fedora.bugzilla Patch0: bugzilla-rw-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: smtpdaemon, webserver, patchutils, mod_perl, perl-SOAP-Lite, perl-Email-Simple, perl-Email-MIME-Modifier, perl-Template-Toolkit, perl-MIME-tools, perl-Email-MIME-Attachment-Stripper, perl-Email-Send, perl-Email-Reply, perl-Email-MIME, perl-Email-Address, which +Requires: webserver, patchutils, mod_perl, perl-SOAP-Lite, which %package doc Summary: Bugzilla documentation @@ -128,15 +128,37 @@ %dir %{_sysconfdir}/bugzilla %files doc +%defattr(-,root,root,-) %{bzinstallprefix}/bugzilla/docs %files contrib +%defattr(-,root,root,-) %{bzinstallprefix}/bugzilla/contrib %changelog +* Sat Feb 28 2009 Itamar Reis Peixoto 3.0.8-1 +- Upgrade to 3.0.8, fix #466077 #438080 +- fix macro in changelog rpmlint warning +- fix files-attr-not-set rpmlint warning for doc and contrib sub-packages + + +* Mon Feb 23 2009 Fedora Release Engineering - 3.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 2 2009 Stepan Kasal - 3.0.4-3 +- do not require perl-Email-Simple, it is (no longer) in use +- remove several explicit perl-* requires; the automatic dependencies + do handle them + +* Mon Jul 14 2008 Tom "spot" Callaway - 3.0.4-2 +- fix license tag + * Fri May 9 2008 John Berninger - 3.0.4-1 - Update to upstream 3.0.4 to fix multiple security vulns -- Change perms on /etc/bugzilla for bz 427981 +- Change perms on /etc/bugzilla for bz 427981 + +* Sun May 4 2008 John Berninger - 3.0.3-0 +- Update to upstream 3.0.3 - bz 444669 * Fri Dec 28 2007 John Berninger - 3.0.2-6 - Add cron.daily, cron.whine to payload list @@ -194,7 +216,7 @@ * Mon Jun 26 2006 John Berninger - 2.22-5 - License is MPL, not GPL -- Clean up %doc specs +- Clean up %%doc specs * Sun Jun 25 2006 John Benringer - 2.22-4 - Remove localconfig file per upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-9/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 9 May 2008 13:49:12 -0000 1.7 +++ sources 1 Mar 2009 03:33:48 -0000 1.8 @@ -1 +1 @@ -f55a3f3cde9cf1bf56492d18c8f7afe4 bugzilla-3.0.4.tar.gz +fff5060b85bc50a40ea5f5de0f7b17b0 bugzilla-3.0.8.tar.gz From cwickert at fedoraproject.org Sun Mar 1 03:55:56 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Sun, 1 Mar 2009 03:55:56 +0000 (UTC) Subject: rpms/xfce4-notes-plugin/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xfce4-notes-plugin.spec, 1.17, 1.18 Message-ID: <20090301035556.B2A8970115@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-notes-plugin/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4683 Modified Files: .cvsignore sources xfce4-notes-plugin.spec Log Message: * Sun Mar 01 2009 Christoph Wickert - 1.6.4-1 - Update to 1.6.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-notes-plugin/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 27 Nov 2008 22:33:36 -0000 1.9 +++ .cvsignore 1 Mar 2009 03:55:24 -0000 1.10 @@ -1 +1 @@ -xfce4-notes-plugin-1.6.3.tar.bz2 +xfce4-notes-plugin-1.6.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-notes-plugin/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 27 Nov 2008 22:33:36 -0000 1.9 +++ sources 1 Mar 2009 03:55:24 -0000 1.10 @@ -1 +1 @@ -8a54229eca70f2e2b349401284f920ca xfce4-notes-plugin-1.6.3.tar.bz2 +88132a8224880f01f02450020c73f9c3 xfce4-notes-plugin-1.6.4.tar.bz2 Index: xfce4-notes-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-notes-plugin/devel/xfce4-notes-plugin.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xfce4-notes-plugin.spec 26 Feb 2009 08:59:46 -0000 1.17 +++ xfce4-notes-plugin.spec 1 Mar 2009 03:55:24 -0000 1.18 @@ -1,6 +1,6 @@ Name: xfce4-notes-plugin -Version: 1.6.3 -Release: 3%{?dist} +Version: 1.6.4 +Release: 1%{?dist} Summary: Notes plugin for the Xfce panel Group: User Interface/Desktops @@ -65,6 +65,9 @@ %changelog +* Sun Mar 01 2009 Christoph Wickert - 1.6.4-1 +- Update to 1.6.4 + * Thu Feb 26 2009 Fedora Release Engineering - 1.6.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From cebbert at fedoraproject.org Sun Mar 1 04:01:31 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Sun, 1 Mar 2009 04:01:31 +0000 (UTC) Subject: rpms/kernel/F-10 drm-next.patch,1.12,1.13 Message-ID: <20090301040131.990F770115@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5383 Added Files: drm-next.patch Log Message: add drm-next drm-next.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.12 -r 1.13 drm-next.patch Index: drm-next.patch =================================================================== RCS file: drm-next.patch diff -N drm-next.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ drm-next.patch 1 Mar 2009 04:01:30 -0000 1.13 @@ -0,0 +1,31664 @@ +commit afdecdb151030e719a95896b610fdbde0ad4ca9f +Author: Dave Airlie +Date: Thu Feb 26 10:15:24 2009 +1000 + + drm/r600: fix rptr address along lines of previous fixes to radeon. + + Signed-off-by: Dave Airlie + +commit cc35bf2855020c4067e298cbd50fa5494b82ab7f +Author: Dave Airlie +Date: Thu Feb 26 10:14:40 2009 +1000 + + drm/r600: fixup r600 gart table accessor like ati_pcigart.c + + This attempts to fixup the r600 GART accessors so they work on other arches. + + Signed-off-by: Dave Airlie + +commit 0101c60cfa2d6bd9e86524f267f8ba092bc7b0ae +Author: Dave Airlie +Date: Thu Feb 26 10:13:47 2009 +1000 + + drm/ati_pcigart: use memset_io to reset the memory + + Also don't setup pci_gart if we aren't going to need it. + + Signed-off-by: Dave Airlie + +commit c455abd7d1f5ed1815d692f37b317f8eab358ced +Author: Dave Airlie +Date: Thu Feb 26 10:12:10 2009 +1000 + + drm: add DRM_READ/WRITE64 wrappers around readq/writeq. + + The readq/writeq stuff is from Dave Miller, and he + warns users to be careful about using these. Plans are only + r600 to use it so far. + + Signed-off-by: Dave Airlie + +commit 89de134be815fe9e30ca42aeac8a4ef5c8db8d30 +Author: Alex Deucher +Date: Wed Feb 25 17:02:19 2009 -0500 + + radeon: add RS600 pci ids + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit 8dba4f2bd6d91a38a732dc3417187b75a6607e62 +Author: Alex Deucher +Date: Wed Feb 25 16:57:49 2009 -0500 + + radeon: add support for rs600 GPUs + + RS600s are an AMD IGP for Intel CPUs, that look like RS690s from + a lot of perspectives but look like r600s from a memory controller + point of view. + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit e482e2e2c5dab12db6f1aa032c30993ca36d77b9 +Author: Alex Deucher +Date: Wed Feb 25 15:55:01 2009 -0500 + + radeon: fix r600 AGP support + + This fixes the ioremap issues with r600 AGP. + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit dbcce50efba41272d795b64edd06b1261dbdc5b8 +Author: Alex Deucher +Date: Tue Feb 24 17:13:42 2009 -0500 + + radeon: add R6xx/R7xx pci ids + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit 69184db08c49fd54d4e3a197dae64581c35a144f +Author: Alex Deucher +Date: Tue Feb 24 16:22:29 2009 -0500 + + drm/radeon: add initial support for R6xx/R7xx GPUs + + This adds support for 2D/Xv acceleration in the X.org 2D driver, + to the drm. It doesn't yet provide any 3D support hooks. + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit b95ec10efe0bb8a106c6ab4edc019033c5081d3d +Author: Alex Deucher +Date: Tue Feb 24 14:28:34 2009 -0500 + + drm/radeon: add r6xx/r7xx microcode + + This uses the same microcode system as the current radeon code. + + It should be converted to the new microcode loader I suppose, + though really I need a lot more proof of the worth of me maintaining + firmware blobs externally. + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit 1e7e66e6dce44a77d4042b80de23c8ba4346c459 +Author: Alex Deucher +Date: Tue Feb 24 14:02:13 2009 -0500 + + drm/radeon: prep for r6xx/r7xx support + + - add r6xx/r7xx regs and macros + - add r6xx/r7xx chip families + - fix register access for regs with offsets >= 0x10000 + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit 9cb39ece1f32fe75e7c34b193022650108d4bf0f +Author: Owain G. Ainsworth +Date: Fri Feb 20 08:30:19 2009 +0000 + + i915/drm: Remove two redundant agp_chipset_flushes + + agp_chipset_flush() is for flushing the intel GMCH write cache via the + IFP, these two uses are for when we're getting the object into the cpu + READ domain, and thus should not be needed. This confused me when I was + getting my head around the code. + + With thanks to airlied for helping me check my mental picture of how the + flushes and clflushes are supposed to be used. + + Signed-off-by: Owain G. Ainsworth + Signed-off-by: Eric Anholt + Signed-off-by: Dave Airlie + +commit 5e60aaba5c9d226ec49f4c1030fc871bcea86048 +Author: Chris Wilson +Date: Wed Feb 11 14:26:38 2009 +0000 + + drm/i915: Display fence register state in debugfs i915_gem_fence_regs node. + + Signed-off-by: Chris Wilson + Signed-off-by: Eric Anholt + Signed-off-by: Dave Airlie + +commit 475f933c677b8c59f34744aed2fc3bdcbec24c6e +Author: Eric Anholt +Date: Tue Feb 17 23:53:41 2009 -0800 + + drm/i915: Add information on pinning and fencing to the i915 list debug. + + This was inspired by a patch by Chris Wilson, though none of it applied in any + way due to the debugfs work and I decided to change the formatting of the + new information anyway. + + Signed-off-by: Eric Anholt + Signed-off-by: Dave Airlie + +commit b4212836fef1ef28c6070f43d70fc73f9f5687f6 +Author: Ben Gamari +Date: Tue Feb 17 20:08:51 2009 -0500 + + drm/i915: Consolidate gem object list dumping + + Here we eliminate a few functions in favor of using a single function + to dump from all of the object lists. + + Signed-Off-By: Ben Gamari + Signed-off-by: Eric Anholt + Signed-off-by: Dave Airlie + +commit a584bb1ed4de35a9206a8ed42fc7de18b3d46b5a +Author: Ben Gamari +Date: Tue Feb 17 20:08:49 2009 -0500 + + drm: Convert proc files to seq_file and introduce debugfs + + The old mechanism to formatting proc files is extremely ugly. The + seq_file API was designed specifically for cases like this and greatly + simplifies the process. + + Also, most of the files in /proc really don't belong there. This patch + introduces the infrastructure for putting these into debugfs and exposes + all of the proc files in debugfs as well. + + This contains the i915 hooks rewrite as well, to make bisectability better. + + Signed-off-by: Ben Gamari [...31271 lines suppressed...] + +diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h +index 5ded1ac..33ae98c 100644 +--- a/include/drm/drm_crtc.h ++++ b/include/drm/drm_crtc.h +@@ -550,7 +550,7 @@ struct drm_mode_config { + int min_width, min_height; + int max_width, max_height; + struct drm_mode_config_funcs *funcs; +- unsigned long fb_base; ++ resource_size_t fb_base; + + /* pointers to standard properties */ + struct list_head property_blob_list; +diff --git a/include/drm/drm_os_linux.h b/include/drm/drm_os_linux.h +index 8dbd257..013551d 100644 +--- a/include/drm/drm_os_linux.h ++++ b/include/drm/drm_os_linux.h +@@ -6,6 +6,19 @@ + #include /* For task queue support */ + #include + ++#ifndef readq ++static u64 readq(void __iomem *reg) ++{ ++ return ((u64) readl(reg)) | (((u64) readl(reg + 4UL)) << 32); ++} ++ ++static void writeq(u64 val, void __iomem *reg) ++{ ++ writel(val & 0xffffffff, reg); ++ writel(val >> 32, reg + 0x4UL); ++} ++#endif ++ + /** Current process ID */ + #define DRM_CURRENTPID task_pid_nr(current) + #define DRM_SUSER(p) capable(CAP_SYS_ADMIN) +@@ -23,6 +36,12 @@ + /** Write a dword into a MMIO region */ + #define DRM_WRITE32(map, offset, val) writel(val, ((void __iomem *)(map)->handle) + (offset)) + /** Read memory barrier */ ++ ++/** Read a qword from a MMIO region - be careful using these unless you really understand them */ ++#define DRM_READ64(map, offset) readq(((void __iomem *)(map)->handle) + (offset)) ++/** Write a qword into a MMIO region */ ++#define DRM_WRITE64(map, offset, val) writeq(val, ((void __iomem *)(map)->handle) + (offset)) ++ + #define DRM_READMEMORYBARRIER() rmb() + /** Write memory barrier */ + #define DRM_WRITEMEMORYBARRIER() wmb() +diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h +index 5165f24..c2fd3c5 100644 +--- a/include/drm/drm_pciids.h ++++ b/include/drm/drm_pciids.h +@@ -239,10 +239,121 @@ + {0x1002, 0x7835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x791e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ + {0x1002, 0x791f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ ++ {0x1002, 0x793f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS600|RADEON_IS_IGP|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x7941, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS600|RADEON_IS_IGP|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x7942, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS600|RADEON_IS_IGP|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x796c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ + {0x1002, 0x796d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ + {0x1002, 0x796e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ + {0x1002, 0x796f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ ++ {0x1002, 0x9400, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9401, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9402, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9403, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9405, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x940A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x940B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x940F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9440, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9441, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9442, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9444, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x944A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x944B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x944C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x944E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9450, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9456, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x945A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x945B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x946A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x946B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x947A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x947B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9480, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9487, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9488, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9489, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x948F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9490, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9491, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9498, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x949C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x949E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x949F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94CC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94CD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9500, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9501, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9504, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9505, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9506, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9507, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9508, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9509, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x950F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9511, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9515, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9517, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9519, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9540, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9541, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9542, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x954E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x954F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9552, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9553, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9555, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9580, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9581, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9583, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9586, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9587, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9588, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9589, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x958A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x958B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x958C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x958D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x958E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x958F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9590, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9591, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9593, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9595, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9596, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9597, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9598, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9599, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x959B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95C0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95C5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95C6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95C7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95C9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95C2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95C4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95CC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95CD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95CE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95CF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9610, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x9611, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x9612, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x9613, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x9614, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0, 0, 0} + + #define r128_PCI_IDS \ +diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h +index 73ff51f..937a275 100644 +--- a/include/drm/radeon_drm.h ++++ b/include/drm/radeon_drm.h +@@ -304,6 +304,8 @@ typedef union { + + #define RADEON_SCRATCH_REG_OFFSET 32 + ++#define R600_SCRATCH_REG_OFFSET 256 ++ + #define RADEON_NR_SAREA_CLIPRECTS 12 + + /* There are 2 heaps (local/GART). Each region within a heap is a +@@ -526,7 +528,8 @@ typedef struct drm_radeon_init { + RADEON_INIT_CP = 0x01, + RADEON_CLEANUP_CP = 0x02, + RADEON_INIT_R200_CP = 0x03, +- RADEON_INIT_R300_CP = 0x04 ++ RADEON_INIT_R300_CP = 0x04, ++ RADEON_INIT_R600_CP = 0x05 + } func; + unsigned long sarea_priv_offset; + int is_pci; From cebbert at fedoraproject.org Sun Mar 1 04:28:57 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Sun, 1 Mar 2009 04:28:57 +0000 (UTC) Subject: rpms/kernel/F-10 linux-2.6-hotfixes.patch,1.3,1.4 Message-ID: <20090301042857.5419B70115@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8698 Modified Files: linux-2.6-hotfixes.patch Log Message: add hotfixes from rawhide linux-2.6-hotfixes.patch: Index: linux-2.6-hotfixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-hotfixes.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-hotfixes.patch 15 Feb 2008 20:40:46 -0000 1.3 +++ linux-2.6-hotfixes.patch 1 Mar 2009 04:28:55 -0000 1.4 @@ -0,0 +1,60 @@ +Ingo Molnar (1): + x86: i915 needs pgprot_writecombine() and is_io_mapping_possible() + + + arch/x86/mm/iomap_32.c | 15 ++++----------- + arch/x86/mm/pat.c | 2 ++ + 2 files changed, 6 insertions(+), 11 deletions(-) + +diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c +index 6c2b1af..04102d4 100644 +--- a/arch/x86/mm/iomap_32.c ++++ b/arch/x86/mm/iomap_32.c +@@ -20,23 +20,16 @@ + #include + #include + +-#ifdef CONFIG_X86_PAE +-int +-is_io_mapping_possible(resource_size_t base, unsigned long size) +-{ +- return 1; +-} +-#else +-int +-is_io_mapping_possible(resource_size_t base, unsigned long size) ++int is_io_mapping_possible(resource_size_t base, unsigned long size) + { ++#ifndef CONFIG_X86_PAE + /* There is no way to map greater than 1 << 32 address without PAE */ + if (base + size > 0x100000000ULL) + return 0; +- ++#endif + return 1; + } +-#endif ++EXPORT_SYMBOL_GPL(is_io_mapping_possible); + + /* Map 'pfn' using fixed map 'type' and protections 'prot' + */ +diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c +index aebbf67..e0ab173 100644 +--- a/arch/x86/mm/pat.c ++++ b/arch/x86/mm/pat.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -868,6 +869,7 @@ pgprot_t pgprot_writecombine(pgprot_t prot) + else + return pgprot_noncached(prot); + } ++EXPORT_SYMBOL_GPL(pgprot_writecombine); + + #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_X86_PAT) + From iarnell at fedoraproject.org Sun Mar 1 04:39:08 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 04:39:08 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Email/F-10 perl-Catalyst-Plugin-Email.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301043908.303A270115@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Email/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9750/F-10 Modified Files: .cvsignore sources Added Files: perl-Catalyst-Plugin-Email.spec Log Message: initial import --- NEW FILE perl-Catalyst-Plugin-Email.spec --- Name: perl-Catalyst-Plugin-Email Version: 0.08 Release: 1%{?dist} Summary: Send emails with Catalyst License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Email/ Source0: http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-Email-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Catalyst) >= 2.99 BuildRequires: perl(Email::MIME) BuildRequires: perl(Email::MIME::Creator) BuildRequires: perl(Email::Send) BuildRequires: perl(Email::Simple::Creator) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Send emails with Catalyst and Email::Send and Email::MIME::Creator. %prep %setup -q -n Catalyst-Plugin-Email-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Thu Feb 26 2009 Iain Arnell 0.08-1 - Specfile autogenerated by cpanspec 1.77. - cleanup BR/R Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Email/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2009 23:48:45 -0000 1.1 +++ .cvsignore 1 Mar 2009 04:38:37 -0000 1.2 @@ -0,0 +1 @@ +Catalyst-Plugin-Email-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Email/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2009 23:48:45 -0000 1.1 +++ sources 1 Mar 2009 04:38:37 -0000 1.2 @@ -0,0 +1 @@ +173e2b91b21e55da9671220734869c6d Catalyst-Plugin-Email-0.08.tar.gz From iarnell at fedoraproject.org Sun Mar 1 04:39:08 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 04:39:08 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Email/F-9 perl-Catalyst-Plugin-Email.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301043908.B69A570115@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Email/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9750/F-9 Modified Files: .cvsignore sources Added Files: perl-Catalyst-Plugin-Email.spec Log Message: initial import --- NEW FILE perl-Catalyst-Plugin-Email.spec --- Name: perl-Catalyst-Plugin-Email Version: 0.08 Release: 1%{?dist} Summary: Send emails with Catalyst License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Email/ Source0: http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-Email-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Catalyst) >= 2.99 BuildRequires: perl(Email::MIME) BuildRequires: perl(Email::MIME::Creator) BuildRequires: perl(Email::Send) BuildRequires: perl(Email::Simple::Creator) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Send emails with Catalyst and Email::Send and Email::MIME::Creator. %prep %setup -q -n Catalyst-Plugin-Email-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Thu Feb 26 2009 Iain Arnell 0.08-1 - Specfile autogenerated by cpanspec 1.77. - cleanup BR/R Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Email/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2009 23:48:45 -0000 1.1 +++ .cvsignore 1 Mar 2009 04:38:38 -0000 1.2 @@ -0,0 +1 @@ +Catalyst-Plugin-Email-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Email/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2009 23:48:45 -0000 1.1 +++ sources 1 Mar 2009 04:38:38 -0000 1.2 @@ -0,0 +1 @@ +173e2b91b21e55da9671220734869c6d Catalyst-Plugin-Email-0.08.tar.gz From iarnell at fedoraproject.org Sun Mar 1 04:39:08 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 04:39:08 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Email/devel perl-Catalyst-Plugin-Email.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301043908.F138F70115@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Email/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9750/devel Modified Files: .cvsignore sources Added Files: perl-Catalyst-Plugin-Email.spec Log Message: initial import --- NEW FILE perl-Catalyst-Plugin-Email.spec --- Name: perl-Catalyst-Plugin-Email Version: 0.08 Release: 1%{?dist} Summary: Send emails with Catalyst License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Email/ Source0: http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-Email-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Catalyst) >= 2.99 BuildRequires: perl(Email::MIME) BuildRequires: perl(Email::MIME::Creator) BuildRequires: perl(Email::Send) BuildRequires: perl(Email::Simple::Creator) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Send emails with Catalyst and Email::Send and Email::MIME::Creator. %prep %setup -q -n Catalyst-Plugin-Email-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Thu Feb 26 2009 Iain Arnell 0.08-1 - Specfile autogenerated by cpanspec 1.77. - cleanup BR/R Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Email/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2009 23:48:45 -0000 1.1 +++ .cvsignore 1 Mar 2009 04:38:38 -0000 1.2 @@ -0,0 +1 @@ +Catalyst-Plugin-Email-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Email/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2009 23:48:45 -0000 1.1 +++ sources 1 Mar 2009 04:38:38 -0000 1.2 @@ -0,0 +1 @@ +173e2b91b21e55da9671220734869c6d Catalyst-Plugin-Email-0.08.tar.gz From iarnell at fedoraproject.org Sun Mar 1 04:44:04 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 04:44:04 +0000 (UTC) Subject: rpms/perl-Algorithm-Merge/F-10 perl-Algorithm-Merge.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301044404.EFB8870116@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Algorithm-Merge/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10493/F-10 Modified Files: .cvsignore sources Added Files: perl-Algorithm-Merge.spec Log Message: initial import --- NEW FILE perl-Algorithm-Merge.spec --- Name: perl-Algorithm-Merge Version: 0.08 Release: 1%{?dist} Summary: Three-way merge and diff License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Algorithm-Merge/ Source0: http://www.cpan.org/authors/id/J/JS/JSMITH/Algorithm-Merge-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Algorithm::Diff) >= 1 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module complements Algorithm::Diff by providing three-way merge and diff functions. %prep %setup -q -n Algorithm-Merge-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 28 2009 Iain Arnell 0.08-1 - Specfile autogenerated by cpanspec 1.77. - remove unnecessary requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Algorithm-Merge/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:13:02 -0000 1.1 +++ .cvsignore 1 Mar 2009 04:43:34 -0000 1.2 @@ -0,0 +1 @@ +Algorithm-Merge-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Algorithm-Merge/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:13:02 -0000 1.1 +++ sources 1 Mar 2009 04:43:34 -0000 1.2 @@ -0,0 +1 @@ +eadf67581b25d00ca30d7ec6488c9db0 Algorithm-Merge-0.08.tar.gz From iarnell at fedoraproject.org Sun Mar 1 04:44:05 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 04:44:05 +0000 (UTC) Subject: rpms/perl-Algorithm-Merge/devel perl-Algorithm-Merge.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301044405.7C10070116@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Algorithm-Merge/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10493/devel Modified Files: .cvsignore sources Added Files: perl-Algorithm-Merge.spec Log Message: initial import --- NEW FILE perl-Algorithm-Merge.spec --- Name: perl-Algorithm-Merge Version: 0.08 Release: 1%{?dist} Summary: Three-way merge and diff License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Algorithm-Merge/ Source0: http://www.cpan.org/authors/id/J/JS/JSMITH/Algorithm-Merge-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Algorithm::Diff) >= 1 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module complements Algorithm::Diff by providing three-way merge and diff functions. %prep %setup -q -n Algorithm-Merge-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 28 2009 Iain Arnell 0.08-1 - Specfile autogenerated by cpanspec 1.77. - remove unnecessary requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Algorithm-Merge/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:13:02 -0000 1.1 +++ .cvsignore 1 Mar 2009 04:43:35 -0000 1.2 @@ -0,0 +1 @@ +Algorithm-Merge-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Algorithm-Merge/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:13:02 -0000 1.1 +++ sources 1 Mar 2009 04:43:35 -0000 1.2 @@ -0,0 +1 @@ +eadf67581b25d00ca30d7ec6488c9db0 Algorithm-Merge-0.08.tar.gz From iarnell at fedoraproject.org Sun Mar 1 04:44:05 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 04:44:05 +0000 (UTC) Subject: rpms/perl-Algorithm-Merge/F-9 perl-Algorithm-Merge.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301044405.40EC770131@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Algorithm-Merge/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10493/F-9 Modified Files: .cvsignore sources Added Files: perl-Algorithm-Merge.spec Log Message: initial import --- NEW FILE perl-Algorithm-Merge.spec --- Name: perl-Algorithm-Merge Version: 0.08 Release: 1%{?dist} Summary: Three-way merge and diff License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Algorithm-Merge/ Source0: http://www.cpan.org/authors/id/J/JS/JSMITH/Algorithm-Merge-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Algorithm::Diff) >= 1 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module complements Algorithm::Diff by providing three-way merge and diff functions. %prep %setup -q -n Algorithm-Merge-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 28 2009 Iain Arnell 0.08-1 - Specfile autogenerated by cpanspec 1.77. - remove unnecessary requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Algorithm-Merge/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:13:02 -0000 1.1 +++ .cvsignore 1 Mar 2009 04:43:34 -0000 1.2 @@ -0,0 +1 @@ +Algorithm-Merge-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Algorithm-Merge/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:13:02 -0000 1.1 +++ sources 1 Mar 2009 04:43:35 -0000 1.2 @@ -0,0 +1 @@ +eadf67581b25d00ca30d7ec6488c9db0 Algorithm-Merge-0.08.tar.gz From iarnell at fedoraproject.org Sun Mar 1 04:50:44 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 04:50:44 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Unicode/devel perl-Catalyst-Plugin-Unicode.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301045044.D97EC70116@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12050/devel Modified Files: .cvsignore sources Added Files: perl-Catalyst-Plugin-Unicode.spec Log Message: initial import --- NEW FILE perl-Catalyst-Plugin-Unicode.spec --- Name: perl-Catalyst-Plugin-Unicode Version: 0.8 Release: 1%{?dist} Summary: Unicode aware Catalyst License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Unicode/ Source0: http://www.cpan.org/authors/id/J/JR/JROCKWAY/Catalyst-Plugin-Unicode-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Catalyst::Runtime) >= 5.70 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(IO::Scalar) BuildRequires: perl(ok) BuildRequires: perl(Test::More) BuildRequires: perl(Test::WWW::Mechanize::Catalyst) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description On request, decodes all params from UTF-8 octets into a sequence of logical characters. On response, encodes body into UTF-8 octets. %prep %setup -q -n Catalyst-Plugin-Unicode-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check TEST_POD=1 make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 28 2009 Iain Arnell 0.8-1 - Specfile autogenerated by cpanspec 1.77. - enable pod tests Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:10:50 -0000 1.1 +++ .cvsignore 1 Mar 2009 04:50:43 -0000 1.2 @@ -0,0 +1 @@ +Catalyst-Plugin-Unicode-0.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:10:50 -0000 1.1 +++ sources 1 Mar 2009 04:50:43 -0000 1.2 @@ -0,0 +1 @@ +b6e7afe2b01b363e37789573adf80f13 Catalyst-Plugin-Unicode-0.8.tar.gz From iarnell at fedoraproject.org Sun Mar 1 04:50:44 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 04:50:44 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Unicode/F-9 perl-Catalyst-Plugin-Unicode.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301045044.CD3E070115@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12050/F-9 Modified Files: .cvsignore sources Added Files: perl-Catalyst-Plugin-Unicode.spec Log Message: initial import --- NEW FILE perl-Catalyst-Plugin-Unicode.spec --- Name: perl-Catalyst-Plugin-Unicode Version: 0.8 Release: 1%{?dist} Summary: Unicode aware Catalyst License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Unicode/ Source0: http://www.cpan.org/authors/id/J/JR/JROCKWAY/Catalyst-Plugin-Unicode-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Catalyst::Runtime) >= 5.70 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(IO::Scalar) BuildRequires: perl(ok) BuildRequires: perl(Test::More) BuildRequires: perl(Test::WWW::Mechanize::Catalyst) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description On request, decodes all params from UTF-8 octets into a sequence of logical characters. On response, encodes body into UTF-8 octets. %prep %setup -q -n Catalyst-Plugin-Unicode-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check TEST_POD=1 make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 28 2009 Iain Arnell 0.8-1 - Specfile autogenerated by cpanspec 1.77. - enable pod tests Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:10:50 -0000 1.1 +++ .cvsignore 1 Mar 2009 04:50:41 -0000 1.2 @@ -0,0 +1 @@ +Catalyst-Plugin-Unicode-0.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:10:50 -0000 1.1 +++ sources 1 Mar 2009 04:50:42 -0000 1.2 @@ -0,0 +1 @@ +b6e7afe2b01b363e37789573adf80f13 Catalyst-Plugin-Unicode-0.8.tar.gz From iarnell at fedoraproject.org Sun Mar 1 04:51:12 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 04:51:12 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Unicode/F-10 perl-Catalyst-Plugin-Unicode.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301045112.0626C70115@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12050/F-10 Modified Files: .cvsignore sources Added Files: perl-Catalyst-Plugin-Unicode.spec Log Message: initial import --- NEW FILE perl-Catalyst-Plugin-Unicode.spec --- Name: perl-Catalyst-Plugin-Unicode Version: 0.8 Release: 1%{?dist} Summary: Unicode aware Catalyst License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Unicode/ Source0: http://www.cpan.org/authors/id/J/JR/JROCKWAY/Catalyst-Plugin-Unicode-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Catalyst::Runtime) >= 5.70 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(IO::Scalar) BuildRequires: perl(ok) BuildRequires: perl(Test::More) BuildRequires: perl(Test::WWW::Mechanize::Catalyst) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description On request, decodes all params from UTF-8 octets into a sequence of logical characters. On response, encodes body into UTF-8 octets. %prep %setup -q -n Catalyst-Plugin-Unicode-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check TEST_POD=1 make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 28 2009 Iain Arnell 0.8-1 - Specfile autogenerated by cpanspec 1.77. - enable pod tests Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:10:50 -0000 1.1 +++ .cvsignore 1 Mar 2009 04:50:40 -0000 1.2 @@ -0,0 +1 @@ +Catalyst-Plugin-Unicode-0.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:10:50 -0000 1.1 +++ sources 1 Mar 2009 04:50:41 -0000 1.2 @@ -0,0 +1 @@ +b6e7afe2b01b363e37789573adf80f13 Catalyst-Plugin-Unicode-0.8.tar.gz From dcantrel at fedoraproject.org Sun Mar 1 04:52:35 2009 From: dcantrel at fedoraproject.org (David Cantrell) Date: Sun, 1 Mar 2009 04:52:35 +0000 (UTC) Subject: rpms/pyparted/devel .cvsignore, 1.24, 1.25 pyparted.spec, 1.52, 1.53 sources, 1.29, 1.30 Message-ID: <20090301045235.7433A70115@cvs1.fedora.phx.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/pyparted/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12278 Modified Files: .cvsignore pyparted.spec sources Log Message: * Sat Feb 28 2009 David Cantrell - 2.0.4-1 - Upgrade to pyparted-2.0.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pyparted/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 28 Feb 2009 00:57:27 -0000 1.24 +++ .cvsignore 1 Mar 2009 04:52:04 -0000 1.25 @@ -1 +1 @@ -pyparted-2.0.3.tar.gz +pyparted-2.0.4.tar.gz Index: pyparted.spec =================================================================== RCS file: /cvs/pkgs/rpms/pyparted/devel/pyparted.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- pyparted.spec 28 Feb 2009 00:57:27 -0000 1.52 +++ pyparted.spec 1 Mar 2009 04:52:04 -0000 1.53 @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted -Version: 2.0.3 +Version: 2.0.4 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -41,6 +41,9 @@ %{python_sitearch}/parted %changelog +* Sat Feb 28 2009 David Cantrell - 2.0.4-1 +- Upgrade to pyparted-2.0.4 + * Fri Feb 27 2009 David Cantrell - 2.0.3-1 - Upgrade to pyparted-2.0.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pyparted/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 28 Feb 2009 00:57:27 -0000 1.29 +++ sources 1 Mar 2009 04:52:04 -0000 1.30 @@ -1 +1 @@ -9f228054536a659535ce9b7ef186f522 pyparted-2.0.3.tar.gz +be612c7e1e6559814afead6b0b42d7c3 pyparted-2.0.4.tar.gz From iarnell at fedoraproject.org Sun Mar 1 04:55:54 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 04:55:54 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Singleton/F-9 perl-Catalyst-Plugin-Singleton.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301045554.71CB870116@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13132/F-9 Modified Files: .cvsignore sources Added Files: perl-Catalyst-Plugin-Singleton.spec Log Message: initial import --- NEW FILE perl-Catalyst-Plugin-Singleton.spec --- Name: perl-Catalyst-Plugin-Singleton Version: 0.02 Release: 1%{?dist} Summary: Singleton to context License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Singleton/ Source0: http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-Singleton-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Singleton accessors to context. %prep %setup -q -n Catalyst-Plugin-Singleton-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check TEST_POD=1 ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 28 2009 Iain Arnell 0.02-1 - Specfile autogenerated by cpanspec 1.77. - enable pod tests Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:09:52 -0000 1.1 +++ .cvsignore 1 Mar 2009 04:55:24 -0000 1.2 @@ -0,0 +1 @@ +Catalyst-Plugin-Singleton-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:09:53 -0000 1.1 +++ sources 1 Mar 2009 04:55:24 -0000 1.2 @@ -0,0 +1 @@ +2b52d9aa50e49a761a3a3c9e51720478 Catalyst-Plugin-Singleton-0.02.tar.gz From iarnell at fedoraproject.org Sun Mar 1 04:55:54 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 04:55:54 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Singleton/F-10 perl-Catalyst-Plugin-Singleton.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301045554.4B0A270115@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13132/F-10 Modified Files: .cvsignore sources Added Files: perl-Catalyst-Plugin-Singleton.spec Log Message: initial import --- NEW FILE perl-Catalyst-Plugin-Singleton.spec --- Name: perl-Catalyst-Plugin-Singleton Version: 0.02 Release: 1%{?dist} Summary: Singleton to context License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Singleton/ Source0: http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-Singleton-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Singleton accessors to context. %prep %setup -q -n Catalyst-Plugin-Singleton-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check TEST_POD=1 ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 28 2009 Iain Arnell 0.02-1 - Specfile autogenerated by cpanspec 1.77. - enable pod tests Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:09:52 -0000 1.1 +++ .cvsignore 1 Mar 2009 04:55:23 -0000 1.2 @@ -0,0 +1 @@ +Catalyst-Plugin-Singleton-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:09:53 -0000 1.1 +++ sources 1 Mar 2009 04:55:23 -0000 1.2 @@ -0,0 +1 @@ +2b52d9aa50e49a761a3a3c9e51720478 Catalyst-Plugin-Singleton-0.02.tar.gz From iarnell at fedoraproject.org Sun Mar 1 04:55:54 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 04:55:54 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Singleton/devel perl-Catalyst-Plugin-Singleton.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301045554.C716C70131@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13132/devel Modified Files: .cvsignore sources Added Files: perl-Catalyst-Plugin-Singleton.spec Log Message: initial import --- NEW FILE perl-Catalyst-Plugin-Singleton.spec --- Name: perl-Catalyst-Plugin-Singleton Version: 0.02 Release: 1%{?dist} Summary: Singleton to context License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Singleton/ Source0: http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-Singleton-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Singleton accessors to context. %prep %setup -q -n Catalyst-Plugin-Singleton-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check TEST_POD=1 ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 28 2009 Iain Arnell 0.02-1 - Specfile autogenerated by cpanspec 1.77. - enable pod tests Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:09:52 -0000 1.1 +++ .cvsignore 1 Mar 2009 04:55:24 -0000 1.2 @@ -0,0 +1 @@ +Catalyst-Plugin-Singleton-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:09:53 -0000 1.1 +++ sources 1 Mar 2009 04:55:24 -0000 1.2 @@ -0,0 +1 @@ +2b52d9aa50e49a761a3a3c9e51720478 Catalyst-Plugin-Singleton-0.02.tar.gz From iarnell at fedoraproject.org Sun Mar 1 05:01:02 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 05:01:02 +0000 (UTC) Subject: rpms/perl-HTML-SimpleParse/F-10 perl-HTML-SimpleParse.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301050102.69A7D70115@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-HTML-SimpleParse/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13998/F-10 Modified Files: .cvsignore sources Added Files: perl-HTML-SimpleParse.spec Log Message: initial import --- NEW FILE perl-HTML-SimpleParse.spec --- Name: perl-HTML-SimpleParse Version: 0.12 Release: 1%{?dist} Summary: Bare-bones HTML parser License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTML-SimpleParse/ Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/HTML-SimpleParse-%{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 This module is a simple HTML parser. It is similar in concept to HTML::Parser, but it differs from HTML::TreeBuilder in a couple of important ways. %prep %setup -q -n HTML-SimpleParse-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 28 2009 Iain Arnell 0.12-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-SimpleParse/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:13:53 -0000 1.1 +++ .cvsignore 1 Mar 2009 05:00:31 -0000 1.2 @@ -0,0 +1 @@ +HTML-SimpleParse-0.12.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-SimpleParse/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:13:53 -0000 1.1 +++ sources 1 Mar 2009 05:00:32 -0000 1.2 @@ -0,0 +1 @@ +f557818d78932654f9ca8dfeae2566b1 HTML-SimpleParse-0.12.tar.gz From iarnell at fedoraproject.org Sun Mar 1 05:01:02 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 05:01:02 +0000 (UTC) Subject: rpms/perl-HTML-SimpleParse/F-9 perl-HTML-SimpleParse.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301050102.DF7AD70115@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-HTML-SimpleParse/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13998/F-9 Modified Files: .cvsignore sources Added Files: perl-HTML-SimpleParse.spec Log Message: initial import --- NEW FILE perl-HTML-SimpleParse.spec --- Name: perl-HTML-SimpleParse Version: 0.12 Release: 1%{?dist} Summary: Bare-bones HTML parser License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTML-SimpleParse/ Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/HTML-SimpleParse-%{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 This module is a simple HTML parser. It is similar in concept to HTML::Parser, but it differs from HTML::TreeBuilder in a couple of important ways. %prep %setup -q -n HTML-SimpleParse-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 28 2009 Iain Arnell 0.12-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-SimpleParse/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:13:53 -0000 1.1 +++ .cvsignore 1 Mar 2009 05:00:32 -0000 1.2 @@ -0,0 +1 @@ +HTML-SimpleParse-0.12.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-SimpleParse/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:13:53 -0000 1.1 +++ sources 1 Mar 2009 05:00:32 -0000 1.2 @@ -0,0 +1 @@ +f557818d78932654f9ca8dfeae2566b1 HTML-SimpleParse-0.12.tar.gz From iarnell at fedoraproject.org Sun Mar 1 05:01:03 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 05:01:03 +0000 (UTC) Subject: rpms/perl-HTML-SimpleParse/devel perl-HTML-SimpleParse.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301050103.245AC70115@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-HTML-SimpleParse/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13998/devel Modified Files: .cvsignore sources Added Files: perl-HTML-SimpleParse.spec Log Message: initial import --- NEW FILE perl-HTML-SimpleParse.spec --- Name: perl-HTML-SimpleParse Version: 0.12 Release: 1%{?dist} Summary: Bare-bones HTML parser License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTML-SimpleParse/ Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/HTML-SimpleParse-%{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 This module is a simple HTML parser. It is similar in concept to HTML::Parser, but it differs from HTML::TreeBuilder in a couple of important ways. %prep %setup -q -n HTML-SimpleParse-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 28 2009 Iain Arnell 0.12-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-SimpleParse/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:13:53 -0000 1.1 +++ .cvsignore 1 Mar 2009 05:00:32 -0000 1.2 @@ -0,0 +1 @@ +HTML-SimpleParse-0.12.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-SimpleParse/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:13:53 -0000 1.1 +++ sources 1 Mar 2009 05:00:32 -0000 1.2 @@ -0,0 +1 @@ +f557818d78932654f9ca8dfeae2566b1 HTML-SimpleParse-0.12.tar.gz From corsepiu at fedoraproject.org Sun Mar 1 05:04:41 2009 From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=) Date: Sun, 1 Mar 2009 05:04:41 +0000 (UTC) Subject: rpms/yap/devel Yap-5.1.1-config.sub.patch, NONE, 1.1 yap.spec, 1.22, 1.23 Message-ID: <20090301050442.16A0270115@cvs1.fedora.phx.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/yap/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14857 Modified Files: yap.spec Added Files: Yap-5.1.1-config.sub.patch Log Message: * Sun Mar 01 2009 Ralf Cors??pius - 5.1.1-13 - Add Yap-5.1.1-config.sub.patch: Upgrade outdated config.sub to fix rebuild breakdown on ppc64. Yap-5.1.1-config.sub.patch: --- NEW FILE Yap-5.1.1-config.sub.patch --- diff -Naur Yap-5.1.1.orig/config.sub Yap-5.1.1/config.sub --- Yap-5.1.1.orig/config.sub 2001-06-11 17:12:07.000000000 +0200 +++ Yap-5.1.1/config.sub 2009-03-01 05:26:18.000000000 +0100 @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2001-05-30' +timestamp='2009-02-03' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,15 +22,17 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Please send patches to . + +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -69,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -82,11 +85,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -98,7 +101,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -117,7 +120,10 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -143,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -157,9 +163,21 @@ os=-vxworks basic_machine=$1 ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -176,6 +194,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -215,26 +237,60 @@ case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. - tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ - | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \ - | pyramid | mn10200 | mn10300 | tron | a29k \ - | 580 | i960 | h8300 \ - | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ - | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ - | hppa64 \ - | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ - | alphaev6[78] \ - | we32k | ns16k | clipper | i370 | sh | sh[34] \ - | powerpc | powerpcle \ - | 1750a | dsp16xx | pdp10 | pdp11 \ - | mips16 | mips64 | mipsel | mips64el \ - | mips64orion | mips64orionel | mipstx39 | mipstx39el \ - | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ - | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \ - | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \ - | v850 | c4x \ - | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ - | pj | pjl | h8500 | z8k) + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | mt \ + | msp430 \ + | nios | nios2 \ + | ns16k | ns32k \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -244,6 +300,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -257,31 +316,73 @@ exit 1 ;; # Recognize the basic CPU types with company name. - # FIXME: clean up the formatting here. - vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ - | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ - | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ - | xmp-* | ymp-* \ - | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ - | hppa2.0n-* | hppa64-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ - | alphaev6[78]-* \ - | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ - | clipper-* | orion-* \ - | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \ - | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ - | mips16-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ - | mipstx39-* | mipstx39el-* | mcore-* \ - | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ - | [cjt]90-* \ - | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ - | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \ - | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*) + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -299,6 +400,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -313,6 +417,12 @@ basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -336,6 +446,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -344,6 +458,22 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -364,30 +494,45 @@ basic_machine=c38-convex os=-bsd ;; - cray | ymp) - basic_machine=ymp-cray + cray | j90) + basic_machine=j90-cray os=-unicos ;; - cray2) - basic_machine=cray2-cray - os=-unicos + craynv) + basic_machine=craynv-cray + os=-unicosmp ;; - [cjt]90) - basic_machine=${basic_machine}-cray - os=-unicos + cr16) + basic_machine=cr16-unknown + os=-elf ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -396,6 +541,14 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -546,6 +699,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -561,6 +722,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -568,32 +733,27 @@ basic_machine=m68k-atari os=-mint ;; - mipsel*-linux*) - basic_machine=mipsel-unknown - os=-linux-gnu - ;; - mips*-linux*) - basic_machine=mips-unknown - os=-linux-gnu - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; msdos) basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -669,6 +829,13 @@ basic_machine=hppa1.1-oki os=-proelf ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -685,48 +852,78 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | k6 | nexgen) + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; - pentiumpro | p6 | 6x86 | athlon) + pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-*) + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ps2) basic_machine=i386-ibm ;; @@ -734,6 +931,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -744,10 +945,30 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd os=-udi ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -755,7 +976,13 @@ basic_machine=sh-hitachi os=-hms ;; - sparclite-wrs) + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -822,22 +1049,46 @@ os=-dynix ;; t3e) - basic_machine=t3e-cray + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; tx39el) basic_machine=mipstx39el-unknown ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -859,8 +1110,8 @@ os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -881,21 +1132,25 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt - ;; - xmp) - basic_machine=xmp-cray - os=-unicos + xbox) + basic_machine=i686-pc + os=-mingw32 ;; - xps | xps100) + xps | xps100) basic_machine=xps100-honeywell ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -912,16 +1167,12 @@ op60c) basic_machine=hppa1.1-oki ;; - mips) - if [ x$os = x-linux-gnu ]; then - basic_machine=mips-unknown - else - basic_machine=mips-mips - fi - ;; romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -938,13 +1189,13 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -959,10 +1210,6 @@ pmac | pmac-mpw) basic_machine=powerpc-apple ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; @@ -1014,19 +1261,28 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1038,16 +1294,21 @@ ;; esac ;; + -nto-qnx*) + ;; -nto*) - os=-nto-qnx + os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1060,6 +1321,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1078,14 +1342,23 @@ -acis*) os=-aos ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; + -nova*) + os=-rtmk-nova + ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 ;; -nsk*) os=-nsk @@ -1097,6 +1370,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1124,8 +1400,20 @@ -xenix) os=-xenix ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos ;; -none) ;; @@ -1149,6 +1437,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1158,10 +1452,14 @@ arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; - pdp11-*) + pdp11-*) os=-none ;; *-dec | vax-*) @@ -1182,12 +1480,18 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; mips*-*) os=-elf ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -1197,9 +1501,15 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1251,19 +1561,19 @@ *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) @@ -1332,10 +1642,16 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; - -vxsim* | -vxworks*) + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) @@ -1350,13 +1666,16 @@ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; + -vos*) + vendor=stratus + ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) Index: yap.spec =================================================================== RCS file: /cvs/pkgs/rpms/yap/devel/yap.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- yap.spec 25 Feb 2009 18:07:10 -0000 1.22 +++ yap.spec 1 Mar 2009 05:04:11 -0000 1.23 @@ -1,6 +1,6 @@ Name: yap Version: 5.1.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: High-performance Prolog Compiler @@ -13,6 +13,8 @@ Source4: chr_translate.pl Patch1: Yap-noni386.patch Patch2: Yap-creat.patch +# config.sub in the tarball is too old for ppc64 +Patch3: Yap-5.1.1-config.sub.patch URL: http://www.ncc.up.pt/~vsc/Yap BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel, gmp-devel, texinfo @@ -49,6 +51,7 @@ %setup -q -n Yap-%{version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} LGPL/chr @@ -137,6 +140,10 @@ %changelog +* Sun Mar 01 2009 Ralf Cors??pius - 5.1.1-13 +- Add Yap-5.1.1-config.sub.patch: + Upgrade outdated config.sub to fix rebuild breakdown on ppc64. + * Wed Feb 25 2009 Fedora Release Engineering - 5.1.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From iarnell at fedoraproject.org Sun Mar 1 05:05:49 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 05:05:49 +0000 (UTC) Subject: rpms/perl-Data-FormValidator/F-9 perl-Data-FormValidator.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301050549.9A12370115@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Data-FormValidator/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14986/F-9 Modified Files: .cvsignore sources Added Files: perl-Data-FormValidator.spec Log Message: initial import --- NEW FILE perl-Data-FormValidator.spec --- Name: perl-Data-FormValidator Version: 4.63 Release: 1%{?dist} Summary: Validates user input (usually from an HTML form) based on input profile License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Data-FormValidator/ Source0: http://www.cpan.org/authors/id/M/MA/MARKSTOS/Data-FormValidator-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 0:5.008 BuildRequires: perl(Date::Calc) >= 5 BuildRequires: perl(Email::Valid) BuildRequires: perl(File::MMagic) >= 1.17 BuildRequires: perl(Image::Size) BuildRequires: perl(MIME::Types) >= 1.005 BuildRequires: perl(Module::Build) BuildRequires: perl(Perl6::Junction) >= 1.1 BuildRequires: perl(Regexp::Common) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # not detected by rpm Requires: perl(Date::Calc) >= 5 Requires: perl(Email::Valid) Requires: perl(File::MMagic) >= 1.17 Requires: perl(Image::Size) Requires: perl(Regexp::Common) %description Data::FormValidator's main aim is to make input validation expressible in a simple format. %prep %setup -q -n Data-FormValidator-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README RELEASE_NOTES %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 28 2009 Iain Arnell 4.63-1 - Specfile autogenerated by cpanspec 1.77. - remove unnecessary requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-FormValidator/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:18:18 -0000 1.1 +++ .cvsignore 1 Mar 2009 05:05:18 -0000 1.2 @@ -0,0 +1 @@ +Data-FormValidator-4.63.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-FormValidator/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:18:18 -0000 1.1 +++ sources 1 Mar 2009 05:05:19 -0000 1.2 @@ -0,0 +1 @@ +98b0fc28dee2a64524c21cebb07d860e Data-FormValidator-4.63.tar.gz From iarnell at fedoraproject.org Sun Mar 1 05:05:50 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 05:05:50 +0000 (UTC) Subject: rpms/perl-Data-FormValidator/devel perl-Data-FormValidator.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301050550.1EA2E70115@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Data-FormValidator/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14986/devel Modified Files: .cvsignore sources Added Files: perl-Data-FormValidator.spec Log Message: initial import --- NEW FILE perl-Data-FormValidator.spec --- Name: perl-Data-FormValidator Version: 4.63 Release: 1%{?dist} Summary: Validates user input (usually from an HTML form) based on input profile License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Data-FormValidator/ Source0: http://www.cpan.org/authors/id/M/MA/MARKSTOS/Data-FormValidator-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 0:5.008 BuildRequires: perl(Date::Calc) >= 5 BuildRequires: perl(Email::Valid) BuildRequires: perl(File::MMagic) >= 1.17 BuildRequires: perl(Image::Size) BuildRequires: perl(MIME::Types) >= 1.005 BuildRequires: perl(Module::Build) BuildRequires: perl(Perl6::Junction) >= 1.1 BuildRequires: perl(Regexp::Common) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # not detected by rpm Requires: perl(Date::Calc) >= 5 Requires: perl(Email::Valid) Requires: perl(File::MMagic) >= 1.17 Requires: perl(Image::Size) Requires: perl(Regexp::Common) %description Data::FormValidator's main aim is to make input validation expressible in a simple format. %prep %setup -q -n Data-FormValidator-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README RELEASE_NOTES %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 28 2009 Iain Arnell 4.63-1 - Specfile autogenerated by cpanspec 1.77. - remove unnecessary requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-FormValidator/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:18:18 -0000 1.1 +++ .cvsignore 1 Mar 2009 05:05:19 -0000 1.2 @@ -0,0 +1 @@ +Data-FormValidator-4.63.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-FormValidator/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:18:18 -0000 1.1 +++ sources 1 Mar 2009 05:05:19 -0000 1.2 @@ -0,0 +1 @@ +98b0fc28dee2a64524c21cebb07d860e Data-FormValidator-4.63.tar.gz From iarnell at fedoraproject.org Sun Mar 1 05:05:48 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Sun, 1 Mar 2009 05:05:48 +0000 (UTC) Subject: rpms/perl-Data-FormValidator/F-10 perl-Data-FormValidator.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301050548.C205870115@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-Data-FormValidator/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14986/F-10 Modified Files: .cvsignore sources Added Files: perl-Data-FormValidator.spec Log Message: initial import --- NEW FILE perl-Data-FormValidator.spec --- Name: perl-Data-FormValidator Version: 4.63 Release: 1%{?dist} Summary: Validates user input (usually from an HTML form) based on input profile License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Data-FormValidator/ Source0: http://www.cpan.org/authors/id/M/MA/MARKSTOS/Data-FormValidator-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 0:5.008 BuildRequires: perl(Date::Calc) >= 5 BuildRequires: perl(Email::Valid) BuildRequires: perl(File::MMagic) >= 1.17 BuildRequires: perl(Image::Size) BuildRequires: perl(MIME::Types) >= 1.005 BuildRequires: perl(Module::Build) BuildRequires: perl(Perl6::Junction) >= 1.1 BuildRequires: perl(Regexp::Common) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # not detected by rpm Requires: perl(Date::Calc) >= 5 Requires: perl(Email::Valid) Requires: perl(File::MMagic) >= 1.17 Requires: perl(Image::Size) Requires: perl(Regexp::Common) %description Data::FormValidator's main aim is to make input validation expressible in a simple format. %prep %setup -q -n Data-FormValidator-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README RELEASE_NOTES %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 28 2009 Iain Arnell 4.63-1 - Specfile autogenerated by cpanspec 1.77. - remove unnecessary requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-FormValidator/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:18:18 -0000 1.1 +++ .cvsignore 1 Mar 2009 05:05:18 -0000 1.2 @@ -0,0 +1 @@ +Data-FormValidator-4.63.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-FormValidator/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:18:18 -0000 1.1 +++ sources 1 Mar 2009 05:05:18 -0000 1.2 @@ -0,0 +1 @@ +98b0fc28dee2a64524c21cebb07d860e Data-FormValidator-4.63.tar.gz From corsepiu at fedoraproject.org Sun Mar 1 05:50:08 2009 From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=) Date: Sun, 1 Mar 2009 05:50:08 +0000 (UTC) Subject: rpms/yap/F-10 Yap-5.1.1-config.sub.patch, NONE, 1.1 yap.spec, 1.21, 1.22 Message-ID: <20090301055008.7046770115@cvs1.fedora.phx.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/yap/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21843 Modified Files: yap.spec Added Files: Yap-5.1.1-config.sub.patch Log Message: * Sun Mar 01 2009 Ralf Cors??pius - 5.1.1-13 - Add Yap-5.1.1-config.sub.patch: Upgrade outdated config.sub to fix rebuild breakdown on ppc64. Yap-5.1.1-config.sub.patch: --- NEW FILE Yap-5.1.1-config.sub.patch --- diff -Naur Yap-5.1.1.orig/config.sub Yap-5.1.1/config.sub --- Yap-5.1.1.orig/config.sub 2001-06-11 17:12:07.000000000 +0200 +++ Yap-5.1.1/config.sub 2009-03-01 05:26:18.000000000 +0100 @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2001-05-30' +timestamp='2009-02-03' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,15 +22,17 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Please send patches to . + +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -69,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -82,11 +85,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -98,7 +101,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -117,7 +120,10 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -143,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -157,9 +163,21 @@ os=-vxworks basic_machine=$1 ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -176,6 +194,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -215,26 +237,60 @@ case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. - tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ - | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \ - | pyramid | mn10200 | mn10300 | tron | a29k \ - | 580 | i960 | h8300 \ - | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ - | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ - | hppa64 \ - | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ - | alphaev6[78] \ - | we32k | ns16k | clipper | i370 | sh | sh[34] \ - | powerpc | powerpcle \ - | 1750a | dsp16xx | pdp10 | pdp11 \ - | mips16 | mips64 | mipsel | mips64el \ - | mips64orion | mips64orionel | mipstx39 | mipstx39el \ - | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ - | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \ - | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \ - | v850 | c4x \ - | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ - | pj | pjl | h8500 | z8k) + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | mt \ + | msp430 \ + | nios | nios2 \ + | ns16k | ns32k \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -244,6 +300,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -257,31 +316,73 @@ exit 1 ;; # Recognize the basic CPU types with company name. - # FIXME: clean up the formatting here. - vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ - | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ - | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ - | xmp-* | ymp-* \ - | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ - | hppa2.0n-* | hppa64-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ - | alphaev6[78]-* \ - | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ - | clipper-* | orion-* \ - | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \ - | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ - | mips16-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ - | mipstx39-* | mipstx39el-* | mcore-* \ - | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ - | [cjt]90-* \ - | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ - | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \ - | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*) + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -299,6 +400,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -313,6 +417,12 @@ basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -336,6 +446,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -344,6 +458,22 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -364,30 +494,45 @@ basic_machine=c38-convex os=-bsd ;; - cray | ymp) - basic_machine=ymp-cray + cray | j90) + basic_machine=j90-cray os=-unicos ;; - cray2) - basic_machine=cray2-cray - os=-unicos + craynv) + basic_machine=craynv-cray + os=-unicosmp ;; - [cjt]90) - basic_machine=${basic_machine}-cray - os=-unicos + cr16) + basic_machine=cr16-unknown + os=-elf ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -396,6 +541,14 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -546,6 +699,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -561,6 +722,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -568,32 +733,27 @@ basic_machine=m68k-atari os=-mint ;; - mipsel*-linux*) - basic_machine=mipsel-unknown - os=-linux-gnu - ;; - mips*-linux*) - basic_machine=mips-unknown - os=-linux-gnu - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; msdos) basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -669,6 +829,13 @@ basic_machine=hppa1.1-oki os=-proelf ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -685,48 +852,78 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | k6 | nexgen) + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; - pentiumpro | p6 | 6x86 | athlon) + pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-*) + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ps2) basic_machine=i386-ibm ;; @@ -734,6 +931,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -744,10 +945,30 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd os=-udi ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -755,7 +976,13 @@ basic_machine=sh-hitachi os=-hms ;; - sparclite-wrs) + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -822,22 +1049,46 @@ os=-dynix ;; t3e) - basic_machine=t3e-cray + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; tx39el) basic_machine=mipstx39el-unknown ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -859,8 +1110,8 @@ os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -881,21 +1132,25 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt - ;; - xmp) - basic_machine=xmp-cray - os=-unicos + xbox) + basic_machine=i686-pc + os=-mingw32 ;; - xps | xps100) + xps | xps100) basic_machine=xps100-honeywell ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -912,16 +1167,12 @@ op60c) basic_machine=hppa1.1-oki ;; - mips) - if [ x$os = x-linux-gnu ]; then - basic_machine=mips-unknown - else - basic_machine=mips-mips - fi - ;; romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -938,13 +1189,13 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -959,10 +1210,6 @@ pmac | pmac-mpw) basic_machine=powerpc-apple ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; @@ -1014,19 +1261,28 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1038,16 +1294,21 @@ ;; esac ;; + -nto-qnx*) + ;; -nto*) - os=-nto-qnx + os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1060,6 +1321,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1078,14 +1342,23 @@ -acis*) os=-aos ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; + -nova*) + os=-rtmk-nova + ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 ;; -nsk*) os=-nsk @@ -1097,6 +1370,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1124,8 +1400,20 @@ -xenix) os=-xenix ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos ;; -none) ;; @@ -1149,6 +1437,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1158,10 +1452,14 @@ arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; - pdp11-*) + pdp11-*) os=-none ;; *-dec | vax-*) @@ -1182,12 +1480,18 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; mips*-*) os=-elf ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -1197,9 +1501,15 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1251,19 +1561,19 @@ *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) @@ -1332,10 +1642,16 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; - -vxsim* | -vxworks*) + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) @@ -1350,13 +1666,16 @@ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; + -vos*) + vendor=stratus + ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) Index: yap.spec =================================================================== RCS file: /cvs/pkgs/rpms/yap/F-10/yap.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- yap.spec 11 Jul 2008 20:47:46 -0000 1.21 +++ yap.spec 1 Mar 2009 05:49:36 -0000 1.22 @@ -1,6 +1,6 @@ Name: yap Version: 5.1.1 -Release: 11%{?dist} +Release: 13%{?dist} Summary: High-performance Prolog Compiler @@ -13,6 +13,8 @@ Source4: chr_translate.pl Patch1: Yap-noni386.patch Patch2: Yap-creat.patch +# config.sub in the tarball is too old for ppc64 +Patch3: Yap-5.1.1-config.sub.patch URL: http://www.ncc.up.pt/~vsc/Yap BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel, gmp-devel, texinfo @@ -49,6 +51,7 @@ %setup -q -n Yap-%{version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} LGPL/chr @@ -137,6 +140,10 @@ %changelog +* Sun Mar 01 2009 Ralf Cors??pius - 5.1.1-13 +- Add Yap-5.1.1-config.sub.patch: + Upgrade outdated config.sub to fix rebuild breakdown on ppc64. + * Fri Jul 11 2008 Tom "spot" Callaway - 5.1.1-11 - fix license tag From wart at fedoraproject.org Sun Mar 1 05:50:35 2009 From: wart at fedoraproject.org (Michael Thomas) Date: Sun, 1 Mar 2009 05:50:35 +0000 (UTC) Subject: rpms/tklib/devel tklib.spec, 1.7, 1.8 tklib-0.4.1-makecheck.patch, 1.1, NONE Message-ID: <20090301055035.BC14B70115@cvs1.fedora.phx.redhat.com> Author: wart Update of /cvs/pkgs/rpms/tklib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21943 Modified Files: tklib.spec Removed Files: tklib-0.4.1-makecheck.patch Log Message: Remove patch that was accepted upstream. Index: tklib.spec =================================================================== RCS file: /cvs/pkgs/rpms/tklib/devel/tklib.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- tklib.spec 25 Feb 2009 21:00:58 -0000 1.7 +++ tklib.spec 1 Mar 2009 05:50:05 -0000 1.8 @@ -4,11 +4,10 @@ Summary: Collection of widgets and other packages for Tk Name: tklib Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} License: TCL Group: Development/Libraries Source: http://downloads.sourceforge.net/tcllib/tklib-0.5.tar.gz -Patch0: tklib-0.4.1-makecheck.patch URL: http://tcllib.sourceforge.net/ BuildArch: noarch Requires: tcl(abi) = 8.5 tk tcllib @@ -22,7 +21,6 @@ %prep %setup -q -%patch0 -p1 # Remove some execute permission bits on files that aren't executable # to suppress some rpmlint warnings. chmod a-x modules/plotchart/*.tcl @@ -59,6 +57,9 @@ %{_mandir}/*/* %changelog +* Sat Feb 28 2009 Wart 0.5-3 +- Remove patch that was accepted upstream + * Wed Feb 25 2009 Fedora Release Engineering - 0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- tklib-0.4.1-makecheck.patch DELETED --- From corsepiu at fedoraproject.org Sun Mar 1 05:56:17 2009 From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=) Date: Sun, 1 Mar 2009 05:56:17 +0000 (UTC) Subject: rpms/perl-Class-MethodMaker/devel .cvsignore, 1.9, 1.10 perl-Class-MethodMaker.spec, 1.18, 1.19 sources, 1.9, 1.10 Message-ID: <20090301055617.C4D4170115@cvs1.fedora.phx.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-MethodMaker/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23083 Modified Files: .cvsignore perl-Class-MethodMaker.spec sources Log Message: * Sun Mar 01 2009 Ralf Cors??pius - 2.15-1 - Upstream update. - Build in subdir to work-around rpm breaking the testsuite. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Dec 2008 08:02:23 -0000 1.9 +++ .cvsignore 1 Mar 2009 05:55:47 -0000 1.10 @@ -1 +1 @@ -Class-MethodMaker-2.13.tar.gz +Class-MethodMaker-2.15.tar.gz Index: perl-Class-MethodMaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/devel/perl-Class-MethodMaker.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-Class-MethodMaker.spec 26 Feb 2009 13:09:08 -0000 1.18 +++ perl-Class-MethodMaker.spec 1 Mar 2009 05:55:47 -0000 1.19 @@ -1,6 +1,6 @@ Name: perl-Class-MethodMaker -Version: 2.13 -Release: 2%{?dist} +Version: 2.15 +Release: 1%{?dist} Summary: Perl module for creating generic object-oriented methods Group: Development/Libraries @@ -12,6 +12,8 @@ BuildRequires: perl(ExtUtils::MakeMaker) # Required by the tests BuildRequires: perl(IPC::Run) +# BR: to force deterministic build +BuildRequires: perl(Module::Signature) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -21,22 +23,29 @@ methods for your objects that perform standard tasks. %prep -%setup -q -n Class-MethodMaker-%{version} +%setup -q -T -c +%setup -q -T -D -a0 %build +cd Class-MethodMaker-%{version} %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} +cd .. %install rm -rf $RPM_BUILD_ROOT +cd Class-MethodMaker-%{version} make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +cd .. find $RPM_BUILD_ROOT -type f -a \( -name .packlist \ -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check +cd Class-MethodMaker-%{version} make test +cd .. %clean rm -rf $RPM_BUILD_ROOT @@ -44,12 +53,16 @@ %files %defattr(-,root,root,-) -%doc Changes README TODO +%doc Class-MethodMaker-%{version}/Changes Class-MethodMaker-%{version}/README Class-MethodMaker-%{version}/TODO %{perl_vendorarch}/Class/ %{perl_vendorarch}/auto/* %{_mandir}/man3/*.3* %changelog +* Sun Mar 01 2009 Ralf Cors??pius - 2.15-1 +- Upstream update. +- Build in subdir to work-around rpm breaking the testsuite. + * Thu Feb 26 2009 Fedora Release Engineering - 2.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Dec 2008 08:02:23 -0000 1.9 +++ sources 1 Mar 2009 05:55:47 -0000 1.10 @@ -1 +1 @@ -4e0e542fc50ebcf6098b23754003168b Class-MethodMaker-2.13.tar.gz +7af92ddaee49815ade7c5886b74d5e64 Class-MethodMaker-2.15.tar.gz From pgordon at fedoraproject.org Sun Mar 1 05:56:25 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Sun, 1 Mar 2009 05:56:25 +0000 (UTC) Subject: rpms/tango-icon-theme/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tango-icon-theme.spec, 1.7, 1.8 Message-ID: <20090301055625.C114C70115@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/tango-icon-theme/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23133 Modified Files: .cvsignore sources tango-icon-theme.spec Log Message: Update to 0.8.90; License change: from CC-BY-SA to Public Domain. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tango-icon-theme/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Sep 2007 22:21:33 -0000 1.4 +++ .cvsignore 1 Mar 2009 05:55:55 -0000 1.5 @@ -1 +1 @@ -tango-icon-theme-0.8.1.tar.gz +tango-icon-theme-0.8.90.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tango-icon-theme/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Sep 2007 22:21:33 -0000 1.4 +++ sources 1 Mar 2009 05:55:55 -0000 1.5 @@ -1 +1 @@ -32d5258f448b5982af9cfa4364f31d41 tango-icon-theme-0.8.1.tar.gz +0795895d2f20eddcbd2bffe94ed431a6 tango-icon-theme-0.8.90.tar.gz Index: tango-icon-theme.spec =================================================================== RCS file: /cvs/pkgs/rpms/tango-icon-theme/devel/tango-icon-theme.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- tango-icon-theme.spec 25 Feb 2009 18:25:55 -0000 1.7 +++ tango-icon-theme.spec 1 Mar 2009 05:55:55 -0000 1.8 @@ -1,11 +1,11 @@ Name: tango-icon-theme -Version: 0.8.1 -Release: 3%{?dist} +Version: 0.8.90 +Release: 1%{?dist} Summary: Icons from Tango Project Summary(pl): Ikony Projektu Tango Summary(es): Iconos del Proyecto Tango -License: CC-BY-SA +License: Public Domain Group: User Interface/Desktops URL: http://tango.freedesktop.org/Tango_Desktop_Project @@ -14,8 +14,9 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: icon-naming-utils >= 0.8.2 +BuildRequires: icon-naming-utils >= 0.8.90 BuildRequires: ImageMagick-devel >= 5.5.7 +BuildRequires: intltool BuildRequires: librsvg2-devel >= 2.12.3 BuildRequires: pkgconfig >= 0.19 @@ -64,6 +65,10 @@ %changelog +* Sat Feb 28 2009 Peter Gordon - 0.8.90-1 +- Update to new upstream release (0.8.90) +- License change: from CC-BY-SA to Public Domain + * Wed Feb 25 2009 Fedora Release Engineering - 0.8.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From wart at fedoraproject.org Sun Mar 1 05:56:55 2009 From: wart at fedoraproject.org (Michael Thomas) Date: Sun, 1 Mar 2009 05:56:55 +0000 (UTC) Subject: rpms/compat-guichan06/devel Makefile,1.1,NONE sources,1.1,NONE Message-ID: <20090301055655.C5F9B70115@cvs1.fedora.phx.redhat.com> Author: wart Update of /cvs/pkgs/rpms/compat-guichan06/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23495 Removed Files: Makefile sources Log Message: compat package no longer needed by any existing Fedora packages. --- Makefile DELETED --- --- sources DELETED --- From wart at fedoraproject.org Sun Mar 1 05:58:42 2009 From: wart at fedoraproject.org (Michael Thomas) Date: Sun, 1 Mar 2009 05:58:42 +0000 (UTC) Subject: rpms/compat-guichan06/devel dead.package,NONE,1.1 Message-ID: <20090301055842.5FB9E70115@cvs1.fedora.phx.redhat.com> Author: wart Update of /cvs/pkgs/rpms/compat-guichan06/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23824 Added Files: dead.package Log Message: compat package no longer needed by any existing Fedora packages; replaced by guichan-0.7.* --- NEW FILE dead.package --- compat package no longer needed by any existing Fedora packages; replaced by guichan-0.7.* From corsepiu at fedoraproject.org Sun Mar 1 05:58:57 2009 From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=) Date: Sun, 1 Mar 2009 05:58:57 +0000 (UTC) Subject: rpms/perl-Class-MethodMaker/F-10 .cvsignore, 1.9, 1.10 perl-Class-MethodMaker.spec, 1.17, 1.18 sources, 1.9, 1.10 Message-ID: <20090301055857.30DC470115@cvs1.fedora.phx.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-MethodMaker/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23750 Modified Files: .cvsignore perl-Class-MethodMaker.spec sources Log Message: * Sun Mar 01 2009 Ralf Cors??pius - 2.15-1 - Upstream update. - Build in subdir to work-around rpm breaking the testsuite. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/F-10/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Dec 2008 08:02:23 -0000 1.9 +++ .cvsignore 1 Mar 2009 05:58:26 -0000 1.10 @@ -1 +1 @@ -Class-MethodMaker-2.13.tar.gz +Class-MethodMaker-2.15.tar.gz Index: perl-Class-MethodMaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/F-10/perl-Class-MethodMaker.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-Class-MethodMaker.spec 20 Dec 2008 08:02:24 -0000 1.17 +++ perl-Class-MethodMaker.spec 1 Mar 2009 05:58:26 -0000 1.18 @@ -1,5 +1,5 @@ Name: perl-Class-MethodMaker -Version: 2.13 +Version: 2.15 Release: 1%{?dist} Summary: Perl module for creating generic object-oriented methods @@ -12,6 +12,8 @@ BuildRequires: perl(ExtUtils::MakeMaker) # Required by the tests BuildRequires: perl(IPC::Run) +# BR: to force deterministic build +BuildRequires: perl(Module::Signature) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -21,22 +23,29 @@ methods for your objects that perform standard tasks. %prep -%setup -q -n Class-MethodMaker-%{version} +%setup -q -T -c +%setup -q -T -D -a0 %build +cd Class-MethodMaker-%{version} %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} +cd .. %install rm -rf $RPM_BUILD_ROOT +cd Class-MethodMaker-%{version} make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +cd .. find $RPM_BUILD_ROOT -type f -a \( -name .packlist \ -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check +cd Class-MethodMaker-%{version} make test +cd .. %clean rm -rf $RPM_BUILD_ROOT @@ -44,12 +53,16 @@ %files %defattr(-,root,root,-) -%doc Changes README TODO +%doc Class-MethodMaker-%{version}/Changes Class-MethodMaker-%{version}/README Class-MethodMaker-%{version}/TODO %{perl_vendorarch}/Class/ %{perl_vendorarch}/auto/* %{_mandir}/man3/*.3* %changelog +* Sun Mar 01 2009 Ralf Cors??pius - 2.15-1 +- Upstream update. +- Build in subdir to work-around rpm breaking the testsuite. + * Sat Dec 20 2008 Ralf Cors??pius - 2.13-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/F-10/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Dec 2008 08:02:24 -0000 1.9 +++ sources 1 Mar 2009 05:58:26 -0000 1.10 @@ -1 +1 @@ -4e0e542fc50ebcf6098b23754003168b Class-MethodMaker-2.13.tar.gz +7af92ddaee49815ade7c5886b74d5e64 Class-MethodMaker-2.15.tar.gz From corsepiu at fedoraproject.org Sun Mar 1 06:00:40 2009 From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=) Date: Sun, 1 Mar 2009 06:00:40 +0000 (UTC) Subject: rpms/perl-Class-MethodMaker/F-9 .cvsignore, 1.9, 1.10 perl-Class-MethodMaker.spec, 1.17, 1.18 sources, 1.9, 1.10 Message-ID: <20090301060040.5629670115@cvs1.fedora.phx.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-MethodMaker/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24080 Modified Files: .cvsignore perl-Class-MethodMaker.spec sources Log Message: * Sun Mar 01 2009 Ralf Cors??pius - 2.15-1 - Upstream update. - Build in subdir to work-around rpm breaking the testsuite. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Dec 2008 08:02:24 -0000 1.9 +++ .cvsignore 1 Mar 2009 06:00:09 -0000 1.10 @@ -1 +1 @@ -Class-MethodMaker-2.13.tar.gz +Class-MethodMaker-2.15.tar.gz Index: perl-Class-MethodMaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/F-9/perl-Class-MethodMaker.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-Class-MethodMaker.spec 20 Dec 2008 08:02:24 -0000 1.17 +++ perl-Class-MethodMaker.spec 1 Mar 2009 06:00:09 -0000 1.18 @@ -1,5 +1,5 @@ Name: perl-Class-MethodMaker -Version: 2.13 +Version: 2.15 Release: 1%{?dist} Summary: Perl module for creating generic object-oriented methods @@ -12,6 +12,8 @@ BuildRequires: perl(ExtUtils::MakeMaker) # Required by the tests BuildRequires: perl(IPC::Run) +# BR: to force deterministic build +BuildRequires: perl(Module::Signature) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -21,22 +23,29 @@ methods for your objects that perform standard tasks. %prep -%setup -q -n Class-MethodMaker-%{version} +%setup -q -T -c +%setup -q -T -D -a0 %build +cd Class-MethodMaker-%{version} %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} +cd .. %install rm -rf $RPM_BUILD_ROOT +cd Class-MethodMaker-%{version} make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +cd .. find $RPM_BUILD_ROOT -type f -a \( -name .packlist \ -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check +cd Class-MethodMaker-%{version} make test +cd .. %clean rm -rf $RPM_BUILD_ROOT @@ -44,12 +53,16 @@ %files %defattr(-,root,root,-) -%doc Changes README TODO +%doc Class-MethodMaker-%{version}/Changes Class-MethodMaker-%{version}/README Class-MethodMaker-%{version}/TODO %{perl_vendorarch}/Class/ %{perl_vendorarch}/auto/* %{_mandir}/man3/*.3* %changelog +* Sun Mar 01 2009 Ralf Cors??pius - 2.15-1 +- Upstream update. +- Build in subdir to work-around rpm breaking the testsuite. + * Sat Dec 20 2008 Ralf Cors??pius - 2.13-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Dec 2008 08:02:24 -0000 1.9 +++ sources 1 Mar 2009 06:00:09 -0000 1.10 @@ -1 +1 @@ -4e0e542fc50ebcf6098b23754003168b Class-MethodMaker-2.13.tar.gz +7af92ddaee49815ade7c5886b74d5e64 Class-MethodMaker-2.15.tar.gz From jjames at fedoraproject.org Sun Mar 1 06:20:11 2009 From: jjames at fedoraproject.org (Jerry James) Date: Sun, 1 Mar 2009 06:20:11 +0000 (UTC) Subject: rpms/jsr-305/F-10 .cvsignore, 1.3, 1.4 jsr-305.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20090301062011.0FEA970115@cvs1.fedora.phx.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/jsr-305/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26821/F-10 Modified Files: .cvsignore jsr-305.spec sources Log Message: * Sat Feb 28 2009 Jerry James - 0-0.2.20090203svn - Update to 03 Feb 2009 snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jsr-305/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Sep 2008 02:59:29 -0000 1.3 +++ .cvsignore 1 Mar 2009 06:19:39 -0000 1.4 @@ -1 +1 @@ -jsr-305-0.1.20080824.tar.bz2 +jsr-305-0.2.20090203.tar.bz2 Index: jsr-305.spec =================================================================== RCS file: /cvs/pkgs/rpms/jsr-305/F-10/jsr-305.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jsr-305.spec 24 Nov 2008 16:27:02 -0000 1.3 +++ jsr-305.spec 1 Mar 2009 06:19:40 -0000 1.4 @@ -2,22 +2,18 @@ Name: jsr-305 Version: 0 -Release: 0.1.20080824svn%{?dist}.1 +Release: 0.2.20090203svn%{?dist} Summary: Correctness annotations for Java code Group: Development/Libraries/Java -# The license was determined by examining the web page -# http://code.google.com/p/jsr-305/, most recently viewed on 4 Aug 2008. -# Upstream has promised to add a license file sometime in the future; see -# http://groups.google.com/group/jsr-305/msg/e6d62dc6cd7fe361 License: BSD URL: http://jsr-305.googlecode.com/ # There has been no official release yet. This is a snapshot of the Subversion -# repository as of 24 Aug 2008. Use the following commands to generate the +# repository as of 03 Feb 2009. Use the following commands to generate the # tarball: -# svn export -r 45 http://jsr-305.googlecode.com/svn/trunk jsr-305 -# tar -cjvf jsr-305-0.1.20080824.tar.bz2 jsr-305 -Source0: jsr-305-0.1.20080824.tar.bz2 +# svn export -r 48 http://jsr-305.googlecode.com/svn/trunk jsr-305 +# tar -cjvf jsr-305-0.2.20090203.tar.bz2 jsr-305 +Source0: jsr-305-0.2.20090203.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel >= 1.5, jpackage-utils, maven2 @@ -105,6 +101,7 @@ %files %defattr(-,root,root,-) +%doc ri/LICENSE sampleUses %{_datadir}/maven2/poms/JPP.jsr-305.pom %{_javadir}/* %{_mavendepmapfragdir}/jsr-305 @@ -117,6 +114,9 @@ %{_javadocdir}/* %changelog +* Sat Feb 28 2009 Jerry James - 0-0.2.20090203svn +- Update to 03 Feb 2009 snapshot + * Mon Nov 24 2008 Jerry James - 0-0.1.20080824svn.1 - Cleaned up summary Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jsr-305/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Sep 2008 02:59:29 -0000 1.3 +++ sources 1 Mar 2009 06:19:40 -0000 1.4 @@ -1 +1 @@ -30d1df258c43a8be057ba25c7fe3e68d jsr-305-0.1.20080824.tar.bz2 +544493c294140d81f3249c9277bf8bd2 jsr-305-0.2.20090203.tar.bz2 From jjames at fedoraproject.org Sun Mar 1 06:20:11 2009 From: jjames at fedoraproject.org (Jerry James) Date: Sun, 1 Mar 2009 06:20:11 +0000 (UTC) Subject: rpms/jsr-305/devel .cvsignore, 1.3, 1.4 jsr-305.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <20090301062011.534A570115@cvs1.fedora.phx.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/jsr-305/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26821/devel Modified Files: .cvsignore jsr-305.spec sources Log Message: * Sat Feb 28 2009 Jerry James - 0-0.2.20090203svn - Update to 03 Feb 2009 snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jsr-305/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Sep 2008 02:59:29 -0000 1.3 +++ .cvsignore 1 Mar 2009 06:19:40 -0000 1.4 @@ -1 +1 @@ -jsr-305-0.1.20080824.tar.bz2 +jsr-305-0.2.20090203.tar.bz2 Index: jsr-305.spec =================================================================== RCS file: /cvs/pkgs/rpms/jsr-305/devel/jsr-305.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jsr-305.spec 25 Feb 2009 09:50:42 -0000 1.4 +++ jsr-305.spec 1 Mar 2009 06:19:40 -0000 1.5 @@ -2,22 +2,18 @@ Name: jsr-305 Version: 0 -Release: 0.2.20080824svn%{?dist}.1 +Release: 0.2.20090203svn%{?dist} Summary: Correctness annotations for Java code Group: Development/Libraries/Java -# The license was determined by examining the web page -# http://code.google.com/p/jsr-305/, most recently viewed on 4 Aug 2008. -# Upstream has promised to add a license file sometime in the future; see -# http://groups.google.com/group/jsr-305/msg/e6d62dc6cd7fe361 License: BSD URL: http://jsr-305.googlecode.com/ # There has been no official release yet. This is a snapshot of the Subversion -# repository as of 24 Aug 2008. Use the following commands to generate the +# repository as of 03 Feb 2009. Use the following commands to generate the # tarball: -# svn export -r 45 http://jsr-305.googlecode.com/svn/trunk jsr-305 -# tar -cjvf jsr-305-0.1.20080824.tar.bz2 jsr-305 -Source0: jsr-305-0.1.20080824.tar.bz2 +# svn export -r 48 http://jsr-305.googlecode.com/svn/trunk jsr-305 +# tar -cjvf jsr-305-0.2.20090203.tar.bz2 jsr-305 +Source0: jsr-305-0.2.20090203.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel >= 1.5, jpackage-utils, maven2 @@ -105,6 +101,7 @@ %files %defattr(-,root,root,-) +%doc ri/LICENSE sampleUses %{_datadir}/maven2/poms/JPP.jsr-305.pom %{_javadir}/* %{_mavendepmapfragdir}/jsr-305 @@ -117,6 +114,9 @@ %{_javadocdir}/* %changelog +* Sat Feb 28 2009 Jerry James - 0-0.2.20090203svn +- Update to 03 Feb 2009 snapshot + * Wed Feb 25 2009 Fedora Release Engineering - 0-0.2.20080824svn.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jsr-305/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Sep 2008 02:59:29 -0000 1.3 +++ sources 1 Mar 2009 06:19:41 -0000 1.4 @@ -1 +1 @@ -30d1df258c43a8be057ba25c7fe3e68d jsr-305-0.1.20080824.tar.bz2 +544493c294140d81f3249c9277bf8bd2 jsr-305-0.2.20090203.tar.bz2 From corsepiu at fedoraproject.org Sun Mar 1 06:24:39 2009 From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=) Date: Sun, 1 Mar 2009 06:24:39 +0000 (UTC) Subject: rpms/perl-File-Find-Rule-Perl import.log,1.2,NONE Message-ID: <20090301062439.4948E70115@cvs1.fedora.phx.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-File-Find-Rule-Perl In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28183 Removed Files: import.log Log Message: Remove. --- import.log DELETED --- From athimm at fedoraproject.org Sun Mar 1 06:52:48 2009 From: athimm at fedoraproject.org (Axel Thimm) Date: Sun, 1 Mar 2009 06:52:48 +0000 (UTC) Subject: rpms/nx/F-10 .cvsignore, 1.15, 1.16 nx.spec, 1.26, 1.27 sources, 1.16, 1.17 Message-ID: <20090301065248.BC4E170115@cvs1.fedora.phx.redhat.com> Author: athimm Update of /cvs/extras/rpms/nx/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv468/F-10 Modified Files: .cvsignore nx.spec sources Log Message: Update to 3.3.0. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nx/F-10/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 26 Aug 2008 17:21:07 -0000 1.15 +++ .cvsignore 1 Mar 2009 06:52:17 -0000 1.16 @@ -1,11 +1,11 @@ docs.tar.bz2 -nxauth-3.2.0-1.tar.gz -nxcompext-3.2.0-1.tar.gz nxfind-provides.sh -nxproxy-3.2.0-1.tar.gz -nxscripts-3.2.0-1.tar.gz -nxssh-3.2.0-1.tar.gz -nx-X11-3.2.0-2.tar.gz -nxcomp-3.2.0-7.tar.gz -nxcompshad-3.2.0-3.tar.gz -nxagent-3.2.0-10.tar.gz +nxagent-3.3.0-10.tar.gz +nxauth-3.3.0-1.tar.gz +nxcomp-3.3.0-3.tar.gz +nxcompext-3.3.0-3.tar.gz +nxcompshad-3.3.0-3.tar.gz +nxproxy-3.3.0-2.tar.gz +nxscripts-3.3.0-1.tar.gz +nxssh-3.3.0-1.tar.gz +nx-X11-3.3.0-5.tar.gz Index: nx.spec =================================================================== RCS file: /cvs/extras/rpms/nx/F-10/nx.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- nx.spec 26 Aug 2008 23:31:06 -0000 1.26 +++ nx.spec 1 Mar 2009 06:52:17 -0000 1.27 @@ -7,21 +7,21 @@ Summary: Proxy system for X11 Name: nx -Version: 3.2.0 -Release: 31%{?dist} +Version: 3.3.0 +Release: 33%{?dist} # MIT on the X11 bits License: GPLv2 and MIT Group: Applications/Internet URL: http://www.nomachine.com # Compression Libraries and Proxy Sources -Source0: http://64.34.161.181/download/%{version}/sources/nxproxy-%{version}-1.tar.gz -Source1: http://64.34.161.181/download/%{version}/sources/nxcomp-%{version}-7.tar.gz -Source2: http://64.34.161.181/download/%{version}/sources/nxcompext-%{version}-1.tar.gz +Source0: http://64.34.161.181/download/%{version}/sources/nxproxy-%{version}-2.tar.gz +Source1: http://64.34.161.181/download/%{version}/sources/nxcomp-%{version}-3.tar.gz +Source2: http://64.34.161.181/download/%{version}/sources/nxcompext-%{version}-3.tar.gz Source3: http://64.34.161.181/download/%{version}/sources/nxssh-%{version}-1.tar.gz # Shadowing Libraries Source4: http://64.34.161.181/download/%{version}/sources/nxcompshad-%{version}-3.tar.gz # X11 Support Programs and Libraries -Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-2.tar.gz +Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-5.tar.gz Source6: http://64.34.161.181/download/%{version}/sources/nxauth-%{version}-1.tar.gz # X11 Agent Sources Source7: http://64.34.161.181/download/%{version}/sources/nxagent-%{version}-10.tar.gz @@ -168,6 +168,12 @@ %{_pkglibexecdir} %changelog +* Sat Feb 14 2009 Axel Thimm - 3.3.0-33 +- Update to 3.3.0. + +* Sat Jan 17 2009 Tomas Mraz - 3.2.0-32 +- rebuild with new openssl + * Tue Aug 26 2008 TOm "spot" Callaway - 3.2.0-31 - fix license tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/nx/F-10/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 26 Aug 2008 17:21:07 -0000 1.16 +++ sources 1 Mar 2009 06:52:17 -0000 1.17 @@ -1,11 +1,11 @@ 0511072ee377316879bb91a75153ed47 docs.tar.bz2 -18519f2bcf30b10b766a60926fbe1017 nxauth-3.2.0-1.tar.gz -cd1296ebd24b1d7c4f82537a395ad6e8 nxcompext-3.2.0-1.tar.gz 477190c6f366dfe2f5ce76978e52238a nxfind-provides.sh -ac31e8f2f112e3720f3c00cec67c0734 nxproxy-3.2.0-1.tar.gz -bb0b1e65e6504ab053fe63367bc2497d nxscripts-3.2.0-1.tar.gz -6d4955376ea1dfcb6971b2b46d31ece1 nxssh-3.2.0-1.tar.gz -0a969199c77a604a488794c56176000f nx-X11-3.2.0-2.tar.gz -5ea64a557c770d9f5cc4b9a7a9d1343c nxcomp-3.2.0-7.tar.gz -6edfa4f65f579306f05af2451249c2bf nxcompshad-3.2.0-3.tar.gz -9123c0bbd184cdeb343c7c6f1e267161 nxagent-3.2.0-10.tar.gz +7abd7812428aebcc48b996bcb5f1970b nxagent-3.3.0-10.tar.gz +6d59de2cbf61430ac513ddfa6b05bc76 nxauth-3.3.0-1.tar.gz +2327cca8e6116fd6a96345566336d81d nxcomp-3.3.0-3.tar.gz +f138420fc7a005495675146a1e1539f2 nxcompext-3.3.0-3.tar.gz +02f051366c4aae96bfefda60d701d8b4 nxcompshad-3.3.0-3.tar.gz +047206e5a811b915aac4ae09bddef207 nxproxy-3.3.0-2.tar.gz +4a36b323efbb731f8672758438a8a5c6 nxscripts-3.3.0-1.tar.gz +e9bb4c1cd61c42db9626894845fcf3f7 nxssh-3.3.0-1.tar.gz +6dae2fddc8081d30530f68e806105fd7 nx-X11-3.3.0-5.tar.gz From athimm at fedoraproject.org Sun Mar 1 06:52:49 2009 From: athimm at fedoraproject.org (Axel Thimm) Date: Sun, 1 Mar 2009 06:52:49 +0000 (UTC) Subject: rpms/nx/F-9 .cvsignore, 1.15, 1.16 nx.spec, 1.24, 1.25 sources, 1.16, 1.17 Message-ID: <20090301065249.15C2570115@cvs1.fedora.phx.redhat.com> Author: athimm Update of /cvs/extras/rpms/nx/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv468/F-9 Modified Files: .cvsignore nx.spec sources Log Message: Update to 3.3.0. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nx/F-9/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 26 Aug 2008 17:21:07 -0000 1.15 +++ .cvsignore 1 Mar 2009 06:52:18 -0000 1.16 @@ -1,11 +1,11 @@ docs.tar.bz2 -nxauth-3.2.0-1.tar.gz -nxcompext-3.2.0-1.tar.gz nxfind-provides.sh -nxproxy-3.2.0-1.tar.gz -nxscripts-3.2.0-1.tar.gz -nxssh-3.2.0-1.tar.gz -nx-X11-3.2.0-2.tar.gz -nxcomp-3.2.0-7.tar.gz -nxcompshad-3.2.0-3.tar.gz -nxagent-3.2.0-10.tar.gz +nxagent-3.3.0-10.tar.gz +nxauth-3.3.0-1.tar.gz +nxcomp-3.3.0-3.tar.gz +nxcompext-3.3.0-3.tar.gz +nxcompshad-3.3.0-3.tar.gz +nxproxy-3.3.0-2.tar.gz +nxscripts-3.3.0-1.tar.gz +nxssh-3.3.0-1.tar.gz +nx-X11-3.3.0-5.tar.gz Index: nx.spec =================================================================== RCS file: /cvs/extras/rpms/nx/F-9/nx.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- nx.spec 26 Aug 2008 17:21:07 -0000 1.24 +++ nx.spec 1 Mar 2009 06:52:18 -0000 1.25 @@ -7,20 +7,21 @@ Summary: Proxy system for X11 Name: nx -Version: 3.2.0 -Release: 30%{?dist} -License: GPL, MIT/X11 for X11 bits +Version: 3.3.0 +Release: 33%{?dist} +# MIT on the X11 bits +License: GPLv2 and MIT Group: Applications/Internet URL: http://www.nomachine.com # Compression Libraries and Proxy Sources -Source0: http://64.34.161.181/download/%{version}/sources/nxproxy-%{version}-1.tar.gz -Source1: http://64.34.161.181/download/%{version}/sources/nxcomp-%{version}-7.tar.gz -Source2: http://64.34.161.181/download/%{version}/sources/nxcompext-%{version}-1.tar.gz +Source0: http://64.34.161.181/download/%{version}/sources/nxproxy-%{version}-2.tar.gz +Source1: http://64.34.161.181/download/%{version}/sources/nxcomp-%{version}-3.tar.gz +Source2: http://64.34.161.181/download/%{version}/sources/nxcompext-%{version}-3.tar.gz Source3: http://64.34.161.181/download/%{version}/sources/nxssh-%{version}-1.tar.gz # Shadowing Libraries Source4: http://64.34.161.181/download/%{version}/sources/nxcompshad-%{version}-3.tar.gz # X11 Support Programs and Libraries -Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-2.tar.gz +Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-5.tar.gz Source6: http://64.34.161.181/download/%{version}/sources/nxauth-%{version}-1.tar.gz # X11 Agent Sources Source7: http://64.34.161.181/download/%{version}/sources/nxagent-%{version}-10.tar.gz @@ -167,6 +168,15 @@ %{_pkglibexecdir} %changelog +* Sat Feb 14 2009 Axel Thimm - 3.3.0-33 +- Update to 3.3.0. + +* Sat Jan 17 2009 Tomas Mraz - 3.2.0-32 +- rebuild with new openssl + +* Tue Aug 26 2008 TOm "spot" Callaway - 3.2.0-31 +- fix license tag + * Mon Aug 25 2008 Axel Thimm - 3.2.0-30 - Update nxagent to fix some keyboard mapping on 64 bits and broken repaint on ADSL type lines. Index: sources =================================================================== RCS file: /cvs/extras/rpms/nx/F-9/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 26 Aug 2008 17:21:07 -0000 1.16 +++ sources 1 Mar 2009 06:52:18 -0000 1.17 @@ -1,11 +1,11 @@ 0511072ee377316879bb91a75153ed47 docs.tar.bz2 -18519f2bcf30b10b766a60926fbe1017 nxauth-3.2.0-1.tar.gz -cd1296ebd24b1d7c4f82537a395ad6e8 nxcompext-3.2.0-1.tar.gz 477190c6f366dfe2f5ce76978e52238a nxfind-provides.sh -ac31e8f2f112e3720f3c00cec67c0734 nxproxy-3.2.0-1.tar.gz -bb0b1e65e6504ab053fe63367bc2497d nxscripts-3.2.0-1.tar.gz -6d4955376ea1dfcb6971b2b46d31ece1 nxssh-3.2.0-1.tar.gz -0a969199c77a604a488794c56176000f nx-X11-3.2.0-2.tar.gz -5ea64a557c770d9f5cc4b9a7a9d1343c nxcomp-3.2.0-7.tar.gz -6edfa4f65f579306f05af2451249c2bf nxcompshad-3.2.0-3.tar.gz -9123c0bbd184cdeb343c7c6f1e267161 nxagent-3.2.0-10.tar.gz +7abd7812428aebcc48b996bcb5f1970b nxagent-3.3.0-10.tar.gz +6d59de2cbf61430ac513ddfa6b05bc76 nxauth-3.3.0-1.tar.gz +2327cca8e6116fd6a96345566336d81d nxcomp-3.3.0-3.tar.gz +f138420fc7a005495675146a1e1539f2 nxcompext-3.3.0-3.tar.gz +02f051366c4aae96bfefda60d701d8b4 nxcompshad-3.3.0-3.tar.gz +047206e5a811b915aac4ae09bddef207 nxproxy-3.3.0-2.tar.gz +4a36b323efbb731f8672758438a8a5c6 nxscripts-3.3.0-1.tar.gz +e9bb4c1cd61c42db9626894845fcf3f7 nxssh-3.3.0-1.tar.gz +6dae2fddc8081d30530f68e806105fd7 nx-X11-3.3.0-5.tar.gz From mschwendt at fedoraproject.org Sun Mar 1 08:03:32 2009 From: mschwendt at fedoraproject.org (Michael Schwendt) Date: Sun, 1 Mar 2009 08:03:32 +0000 (UTC) Subject: rpms/audacity/devel audacity-1.3.7-audiodevdefaults.patch, NONE, 1.1 audacity-1.3.7-vamp-1.3.patch, NONE, 1.1 audacity.spec, 1.72, 1.73 Message-ID: <20090301080333.42AC470115@cvs1.fedora.phx.redhat.com> Author: mschwendt Update of /cvs/pkgs/rpms/audacity/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13293 Modified Files: audacity.spec Added Files: audacity-1.3.7-audiodevdefaults.patch audacity-1.3.7-vamp-1.3.patch Log Message: * Sun Mar 1 2009 Michael Schwendt - 1.3.7-0.5.beta - show default device names in Audio I/O preferences audacity-1.3.7-audiodevdefaults.patch: --- NEW FILE audacity-1.3.7-audiodevdefaults.patch --- diff -Nur audacity-src-1.3.7-orig/src/AudioIO.cpp audacity-src-1.3.7/src/AudioIO.cpp --- audacity-src-1.3.7-orig/src/AudioIO.cpp 2009-01-27 21:50:59.000000000 +0100 +++ audacity-src-1.3.7/src/AudioIO.cpp 2009-03-01 08:48:20.000000000 +0100 @@ -1898,6 +1898,11 @@ // device, so we just use the first one available if (recDeviceNum < 0) recDeviceNum = 0; + const PaDeviceInfo* info = Pa_GetDeviceInfo(recDeviceNum); + if (info && (info->maxInputChannels > 0)) + { + gPrefs->Write(wxT("/AudioIO/RecordingDevice"), DeviceName(info)); + } return recDeviceNum; } @@ -1937,6 +1942,11 @@ // device, so we just use the first one available if (DeviceNum < 0) DeviceNum = 0; + const PaDeviceInfo* info = Pa_GetDeviceInfo(DeviceNum); + if (info && (info->maxInputChannels > 0)) + { + gPrefs->Write(wxT("/AudioIO/PlaybackDevice"), DeviceName(info)); + } return DeviceNum; } audacity-1.3.7-vamp-1.3.patch: --- NEW FILE audacity-1.3.7-vamp-1.3.patch --- diff -Nur audacity-src-1.3.7-orig/configure audacity-src-1.3.7/configure --- audacity-src-1.3.7-orig/configure 2009-01-27 21:50:59.000000000 +0100 +++ audacity-src-1.3.7/configure 2009-02-28 16:06:02.000000000 +0100 @@ -7774,12 +7774,12 @@ pkg_cv_VAMP_CFLAGS="$VAMP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 2.0") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 1.1.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 1.1.0") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_VAMP_CFLAGS=`$PKG_CONFIG --cflags "vamp-hostsdk >= 2.0" 2>/dev/null` + pkg_cv_VAMP_CFLAGS=`$PKG_CONFIG --cflags "vamp-hostsdk >= 1.1.0" 2>/dev/null` else pkg_failed=yes fi @@ -7790,12 +7790,12 @@ pkg_cv_VAMP_LIBS="$VAMP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 2.0") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 1.1.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 1.1.0") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_VAMP_LIBS=`$PKG_CONFIG --libs "vamp-hostsdk >= 2.0" 2>/dev/null` + pkg_cv_VAMP_LIBS=`$PKG_CONFIG --libs "vamp-hostsdk >= 1.1.0" 2>/dev/null` else pkg_failed=yes fi @@ -7813,9 +7813,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VAMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vamp-hostsdk >= 2.0" 2>&1` + VAMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vamp-hostsdk >= 1.1.0" 2>&1` else - VAMP_PKG_ERRORS=`$PKG_CONFIG --print-errors "vamp-hostsdk >= 2.0" 2>&1` + VAMP_PKG_ERRORS=`$PKG_CONFIG --print-errors "vamp-hostsdk >= 1.1.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$VAMP_PKG_ERRORS" >&5 diff -Nur audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.cpp audacity-src-1.3.7/src/effects/vamp/VampEffect.cpp --- audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.cpp 2009-01-27 21:50:58.000000000 +0100 +++ audacity-src-1.3.7/src/effects/vamp/VampEffect.cpp 2009-02-28 15:45:52.000000000 +0100 @@ -13,9 +13,9 @@ #include "VampEffect.h" -#include -#include -#include +#include +#include +#include #include #include @@ -311,20 +311,12 @@ Vamp::RealTime ftime0 = fli->timestamp; double ltime0 = ftime0.sec + (double(ftime0.nsec) / 1000000000.0); - Vamp::RealTime ftime1 = ftime0; - if (fli->hasDuration) ftime1 = ftime0 + fli->duration; - double ltime1 = ftime1.sec + (double(ftime1.nsec) / 1000000000.0); - wxString label = LAT1CTOWX(fli->label.c_str()); if (label == wxString()) { - if (fli->values.empty()) { label = wxString::Format(LAT1CTOWX("%.3f"), ltime0); - } else { - label = wxString::Format(LAT1CTOWX("%.3f"), *fli->values.begin()); - } } - ltrack->AddLabel(ltime0, ltime1, label); + ltrack->AddLabel(ltime0, ltime0, label); } } diff -Nur audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.h audacity-src-1.3.7/src/effects/vamp/VampEffect.h --- audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.h 2009-01-27 21:50:58.000000000 +0100 +++ audacity-src-1.3.7/src/effects/vamp/VampEffect.h 2009-02-28 15:45:52.000000000 +0100 @@ -22,7 +22,7 @@ #include -#include +#include void LoadVampPlugins(); Index: audacity.spec =================================================================== RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- audacity.spec 28 Feb 2009 17:52:55 -0000 1.72 +++ audacity.spec 1 Mar 2009 08:03:00 -0000 1.73 @@ -5,7 +5,7 @@ Name: audacity Version: 1.3.7 -Release: 0.4.beta%{?dist} +Release: 0.5.beta%{?dist} Summary: Multitrack audio editor Group: Applications/Multimedia License: GPLv2 @@ -20,6 +20,8 @@ Patch3: audacity-1.3.6-flac-import.patch Patch4: audacity-1.3.7-portaudio-non-mmap-alsa.patch Patch5: audacity-1.3.7-repeat.patch +Patch6: audacity-1.3.7-vamp-1.3.patch +Patch7: audacity-1.3.7-audiodevdefaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -66,6 +68,10 @@ %patch3 -p1 -b .dumb-flac-import %patch4 -p1 -b .pa-non-mmap-alsa %patch5 -p1 -b .repeat +%if 0%{?fedora} < 11 +%patch6 -p1 -b .vamp-1.3 +%endif +%patch7 -p1 -b .audiodevdefaults # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0". for i in locale/*.po src/export/ExportMP3.cpp @@ -137,10 +143,14 @@ %changelog +* Sun Mar 1 2009 Michael Schwendt - 1.3.7-0.5.beta +- show default device names in Audio I/O preferences + * Sat Feb 28 2009 Kevin Kofler - 1.3.7-0.4.beta - remove no longer needed default hostapi hunk of the non-mmap-alsa patch * Sat Feb 28 2009 Michael Schwendt - 1.3.7-0.3.beta +- F-10 only: patch to build with older Vamp API 1.3 - upgrade to 1.3.7-beta pkg from test branch in Fedora cvs * Mon Feb 23 2009 Fedora Release Engineering - 1.3.5-0.13.beta From cweyl at fedoraproject.org Sun Mar 1 08:19:09 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 1 Mar 2009 08:19:09 +0000 (UTC) Subject: rpms/perl-DateTime-Format-ISO8601/devel import.log, NONE, 1.1 perl-DateTime-Format-ISO8601.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301081910.2035470115@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DateTime-Format-ISO8601/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15399/devel Modified Files: .cvsignore sources Added Files: import.log perl-DateTime-Format-ISO8601.spec Log Message: initial import --- NEW FILE import.log --- perl-DateTime-Format-ISO8601-0_06-1_fc10:HEAD:perl-DateTime-Format-ISO8601-0.06-1.fc10.src.rpm:1235895507 --- NEW FILE perl-DateTime-Format-ISO8601.spec --- Name: perl-DateTime-Format-ISO8601 Version: 0.06 Release: 1%{?dist} # LICENSE, lib/DateTime/Format/ISO8601.pod -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Parses ISO8601 formats Source: http://search.cpan.org/CPAN/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-%{version}.tar.gz Url: http://search.cpan.org/dist/DateTime-Format-ISO8601 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(DateTime) >= 0.18 BuildRequires: perl(DateTime::Format::Builder) >= 0.77 BuildRequires: perl(Module::Build::Compat) BuildRequires: perl(Test::More) %description Parses almost all ISO8601 date and time formats. ISO8601 time-intervals will be supported in a later release. %prep %setup -q -n DateTime-Format-ISO8601-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README Changes LICENSE Todo %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Feb 05 2009 Chris Weyl 0.06-1 - update for submission * Thu Feb 05 2009 Chris Weyl 0.06-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-ISO8601/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:21:01 -0000 1.1 +++ .cvsignore 1 Mar 2009 08:18:38 -0000 1.2 @@ -0,0 +1 @@ +DateTime-Format-ISO8601-0.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-ISO8601/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:21:02 -0000 1.1 +++ sources 1 Mar 2009 08:18:38 -0000 1.2 @@ -0,0 +1 @@ +4e0faf82577b4d7a9b116fc5a6825728 DateTime-Format-ISO8601-0.06.tar.gz From cweyl at fedoraproject.org Sun Mar 1 08:19:58 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 1 Mar 2009 08:19:58 +0000 (UTC) Subject: rpms/perl-DateTime-Format-ISO8601/F-10 import.log, NONE, 1.1 perl-DateTime-Format-ISO8601.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301081958.60D1D70115@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DateTime-Format-ISO8601/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15673/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-DateTime-Format-ISO8601.spec Log Message: initial import --- NEW FILE import.log --- perl-DateTime-Format-ISO8601-0_06-1_fc10:F-10:perl-DateTime-Format-ISO8601-0.06-1.fc10.src.rpm:1235895557 --- NEW FILE perl-DateTime-Format-ISO8601.spec --- Name: perl-DateTime-Format-ISO8601 Version: 0.06 Release: 1%{?dist} # LICENSE, lib/DateTime/Format/ISO8601.pod -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Parses ISO8601 formats Source: http://search.cpan.org/CPAN/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-%{version}.tar.gz Url: http://search.cpan.org/dist/DateTime-Format-ISO8601 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(DateTime) >= 0.18 BuildRequires: perl(DateTime::Format::Builder) >= 0.77 BuildRequires: perl(Module::Build::Compat) BuildRequires: perl(Test::More) %description Parses almost all ISO8601 date and time formats. ISO8601 time-intervals will be supported in a later release. %prep %setup -q -n DateTime-Format-ISO8601-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README Changes LICENSE Todo %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Feb 05 2009 Chris Weyl 0.06-1 - update for submission * Thu Feb 05 2009 Chris Weyl 0.06-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-ISO8601/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:21:01 -0000 1.1 +++ .cvsignore 1 Mar 2009 08:19:27 -0000 1.2 @@ -0,0 +1 @@ +DateTime-Format-ISO8601-0.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-ISO8601/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:21:02 -0000 1.1 +++ sources 1 Mar 2009 08:19:28 -0000 1.2 @@ -0,0 +1 @@ +4e0faf82577b4d7a9b116fc5a6825728 DateTime-Format-ISO8601-0.06.tar.gz From cweyl at fedoraproject.org Sun Mar 1 08:20:46 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 1 Mar 2009 08:20:46 +0000 (UTC) Subject: rpms/perl-DateTime-Format-ISO8601/F-9 import.log, NONE, 1.1 perl-DateTime-Format-ISO8601.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301082046.09E6070115@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-DateTime-Format-ISO8601/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15954/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-DateTime-Format-ISO8601.spec Log Message: initial import --- NEW FILE import.log --- perl-DateTime-Format-ISO8601-0_06-1_fc10:F-9:perl-DateTime-Format-ISO8601-0.06-1.fc10.src.rpm:1235895605 --- NEW FILE perl-DateTime-Format-ISO8601.spec --- Name: perl-DateTime-Format-ISO8601 Version: 0.06 Release: 1%{?dist} # LICENSE, lib/DateTime/Format/ISO8601.pod -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Parses ISO8601 formats Source: http://search.cpan.org/CPAN/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-%{version}.tar.gz Url: http://search.cpan.org/dist/DateTime-Format-ISO8601 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(DateTime) >= 0.18 BuildRequires: perl(DateTime::Format::Builder) >= 0.77 BuildRequires: perl(Module::Build::Compat) BuildRequires: perl(Test::More) %description Parses almost all ISO8601 date and time formats. ISO8601 time-intervals will be supported in a later release. %prep %setup -q -n DateTime-Format-ISO8601-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README Changes LICENSE Todo %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Feb 05 2009 Chris Weyl 0.06-1 - update for submission * Thu Feb 05 2009 Chris Weyl 0.06-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-ISO8601/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:21:01 -0000 1.1 +++ .cvsignore 1 Mar 2009 08:20:15 -0000 1.2 @@ -0,0 +1 @@ +DateTime-Format-ISO8601-0.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime-Format-ISO8601/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:21:02 -0000 1.1 +++ sources 1 Mar 2009 08:20:15 -0000 1.2 @@ -0,0 +1 @@ +4e0faf82577b4d7a9b116fc5a6825728 DateTime-Format-ISO8601-0.06.tar.gz From cweyl at fedoraproject.org Sun Mar 1 09:11:57 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 1 Mar 2009 09:11:57 +0000 (UTC) Subject: rpms/fcgi/devel fcgi.spec,1.8,1.9 Message-ID: <20090301091157.BEDD470115@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/fcgi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24160 Modified Files: fcgi.spec Log Message: * Sun Mar 01 2009 Chris Weyl - 2.4.0-9 - Stripping bad provides of private Perl extension libs Index: fcgi.spec =================================================================== RCS file: /cvs/extras/rpms/fcgi/devel/fcgi.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fcgi.spec 24 Feb 2009 16:19:07 -0000 1.8 +++ fcgi.spec 1 Mar 2009 09:11:25 -0000 1.9 @@ -1,6 +1,6 @@ Name: fcgi Version: 2.4.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: FastCGI development kit Group: Development/Languages @@ -18,6 +18,11 @@ # for -perl BuildRequires: perl(ExtUtils::MakeMaker) +# don't "provide" private Perl libs +%global _use_internal_dependency_generator 0 +%global provfind /bin/sh -c "grep -v '%perl_vendorarch.*\\.so$' | %__find_provides" +%global __find_provides %provfind + %description FastCGI is a language independent, scalable, open extension to CGI that provides high performance without the limitations of server specific APIs. @@ -138,6 +143,9 @@ %changelog +* Sun Mar 01 2009 Chris Weyl - 2.4.0-9 +- Stripping bad provides of private Perl extension libs + * Tue Feb 24 2009 Fedora Release Engineering - 2.4.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rathann at fedoraproject.org Sun Mar 1 09:37:05 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Sun, 1 Mar 2009 09:37:05 +0000 (UTC) Subject: rpms/mkvtoolnix/devel mkvtoolnix-compile.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 mkvtoolnix.spec, 1.25, 1.26 sources, 1.10, 1.11 Message-ID: <20090301093705.A507970115@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/mkvtoolnix/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28345 Modified Files: .cvsignore mkvtoolnix.spec sources Added Files: mkvtoolnix-compile.patch Log Message: * Sun Mar 01 2009 Dominik Mierzejewski 2.5.2-1 - updated to 2.5.2 - fix compilation - include translated messages mkvtoolnix-compile.patch: --- NEW FILE mkvtoolnix-compile.patch --- diff -up mkvtoolnix-2.5.2/src/tools/diracparser.cpp.compile mkvtoolnix-2.5.2/src/tools/diracparser.cpp --- mkvtoolnix-2.5.2/src/tools/diracparser.cpp.compile 2009-03-01 10:17:27.000000000 +0100 +++ mkvtoolnix-2.5.2/src/tools/diracparser.cpp 2009-03-01 10:16:58.000000000 +0100 @@ -6,6 +6,7 @@ #include "common.h" #include "mm_io.h" #include "dirac_common.h" +#include "translation.h" static bool g_opt_checksum = false; static bool g_opt_sequence_headers = false; diff -up mkvtoolnix-2.5.2/src/tools/ebml_validator.cpp.compile mkvtoolnix-2.5.2/src/tools/ebml_validator.cpp --- mkvtoolnix-2.5.2/src/tools/ebml_validator.cpp.compile 2009-02-28 15:11:55.000000000 +0100 +++ mkvtoolnix-2.5.2/src/tools/ebml_validator.cpp 2009-03-01 10:18:48.000000000 +0100 @@ -15,6 +15,7 @@ #include "mm_io.h" #include "element_info.h" +#include "translation.h" static int64_t g_start = 0; static int64_t g_end = std::numeric_limits::max(); diff -up mkvtoolnix-2.5.2/src/tools/Makefile.compile mkvtoolnix-2.5.2/src/tools/Makefile --- mkvtoolnix-2.5.2/src/tools/Makefile.compile 2009-03-01 10:12:15.000000000 +0100 +++ mkvtoolnix-2.5.2/src/tools/Makefile 2009-03-01 10:19:19.000000000 +0100 @@ -10,26 +10,26 @@ vc1parser_OBJECTS = $(patsubst %.cpp,%.o vc1parser_DEPENDENCIES = $(DEP_COMMON) vc1parser_LDADD = -lmtxcommon $(MAGIC_LIBS) -lmatroska -lebml \ -lz $(COMPRESSION_LIBRARIES) -lexpat $(ICONV_LIBS) \ - $(LIBINTL_LIBS) $(LIBRPCRT) + $(LIBINTL_LIBS) $(LIBRPCRT) $(BOOST_REGEX_LIB) diracparser_SOURCES = src/tools/diracparser.cpp diracparser_OBJECTS = $(patsubst %.cpp,%.o,$(diracparser_SOURCES)) diracparser_DEPENDENCIES = $(DEP_COMMON) diracparser_LDADD = -lmtxcommon $(MAGIC_LIBS) -lmatroska -lebml \ -lz $(COMPRESSION_LIBRARIES) -lexpat $(ICONV_LIBS) \ - $(LIBINTL_LIBS) $(LIBRPCRT) + $(LIBINTL_LIBS) $(LIBRPCRT) $(BOOST_REGEX_LIB) base64tool_SOURCES = src/tools/base64tool.cpp base64tool_OBJECTS = $(patsubst %.cpp,%.o,$(base64tool_SOURCES)) base64tool_DEPENDENCIES += $(DEP_COMMON) -base64tool_LDADD = -lmtxcommon $(MAGIC_LIBS) -lexpat $(ICONV_LIBS) $(LIBINTL_LIBS) $(LIBRPCRT) +base64tool_LDADD = -lmtxcommon $(MAGIC_LIBS) -lexpat $(ICONV_LIBS) $(LIBINTL_LIBS) $(LIBRPCRT) $(BOOST_REGEX_LIB) ebml_validator_SOURCES = src/tools/ebml_validator.cpp src/tools/element_info.cpp ebml_validator_OBJECTS = $(patsubst %.cpp,%.o,$(ebml_validator_SOURCES)) ebml_validator_DEPENDENCIES = $(DEP_COMMON) ebml_validator_LDADD = -lmtxcommon $(MAGIC_LIBS) -lmatroska -lebml \ -lz $(COMPRESSION_LIBRARIES) -lexpat $(ICONV_LIBS) \ - $(LIBINTL_LIBS) $(LIBRPCRT) + $(LIBINTL_LIBS) $(LIBRPCRT) $(BOOST_REGEX_LIB) base64tool: src/tools/base64tool$(EXEEXT) diff -up mkvtoolnix-2.5.2/src/tools/vc1parser.cpp.compile mkvtoolnix-2.5.2/src/tools/vc1parser.cpp --- mkvtoolnix-2.5.2/src/tools/vc1parser.cpp.compile 2009-02-28 15:11:55.000000000 +0100 +++ mkvtoolnix-2.5.2/src/tools/vc1parser.cpp 2009-03-01 10:17:56.000000000 +0100 @@ -6,6 +6,7 @@ #include "common.h" #include "mm_io.h" #include "vc1_common.h" +#include "translation.h" static bool g_opt_checksum = false; static bool g_opt_entrypoints = false; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 27 Feb 2009 02:09:12 -0000 1.10 +++ .cvsignore 1 Mar 2009 09:36:35 -0000 1.11 @@ -1 +1 @@ -mkvtoolnix-2.5.1.tar.bz2 +mkvtoolnix-2.5.2.tar.bz2 Index: mkvtoolnix.spec =================================================================== RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- mkvtoolnix.spec 28 Feb 2009 18:04:54 -0000 1.25 +++ mkvtoolnix.spec 1 Mar 2009 09:36:35 -0000 1.26 @@ -1,12 +1,15 @@ Summary: Matroska container manipulation utilities Name: mkvtoolnix -Version: 2.5.1 +Version: 2.5.2 Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2 Source1: mmg.desktop Source2: mkvinfo.desktop +# https://www.bunkus.org/bugzilla/show_bug.cgi?id=348 +Patch0: %{name}-compile.patch +# https://www.bunkus.org/bugzilla/show_bug.cgi?id=347 Patch4: %{name}-ppc64.patch URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -14,7 +17,7 @@ BuildRequires: desktop-file-utils BuildRequires: file-devel BuildRequires: flac-devel >= 1.1.1 -BuildRequires: gettext-devel +BuildRequires: gettext BuildRequires: libmatroska-devel >= 0.8.1 BuildRequires: libvorbis-devel BuildRequires: pcre-devel @@ -39,6 +42,7 @@ %prep %setup -q +%patch0 -p1 -b .compile %patch4 -p1 -b .ppc64 sed -i -e 's/"-O3"/""/' configure* for file in AUTHORS ChangeLog ; do @@ -70,6 +74,8 @@ install -Dpm 644 src/info/matroska.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mkvinfo.xpm +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -85,7 +91,7 @@ %posttrans gui gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || : -%files +%files -f %{name}.lang %defattr(644,root,root,0755) %doc AUTHORS COPYING README ChangeLog TODO %attr(755,root,root) %{_bindir}/base64tool @@ -112,6 +118,11 @@ %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm %changelog +* Sun Mar 01 2009 Dominik Mierzejewski 2.5.2-1 +- updated to 2.5.2 +- fix compilation +- include translated messages + * Fri Feb 27 2009 Dominik Mierzejewski 2.5.1-1 - updated to 2.5.1 - dropped obsolete patches Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 27 Feb 2009 02:09:12 -0000 1.10 +++ sources 1 Mar 2009 09:36:35 -0000 1.11 @@ -1 +1 @@ -22f6572eb34b6e7cfda9e621f0936b10 mkvtoolnix-2.5.1.tar.bz2 +85ae3a5e447f0cdc41d9bc3b5c9b1358 mkvtoolnix-2.5.2.tar.bz2 From terjeros at fedoraproject.org Sun Mar 1 09:53:15 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Sun, 1 Mar 2009 09:53:15 +0000 (UTC) Subject: rpms/lshw/devel .cvsignore, 1.4, 1.5 lshw.spec, 1.11, 1.12 sources, 1.4, 1.5 lshw-B.02.13-gcc43.patch, 1.1, NONE Message-ID: <20090301095316.1FCE670115@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/lshw/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31427 Modified Files: .cvsignore lshw.spec sources Removed Files: lshw-B.02.13-gcc43.patch Log Message: * Sun Mar 1 2009 Terje Rosten - B.02.14-1 - B.02.14 - Drop gcc43 patch now upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lshw/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Aug 2008 18:15:31 -0000 1.4 +++ .cvsignore 1 Mar 2009 09:52:42 -0000 1.5 @@ -1 +1 @@ -lshw-B.02.13.tar.gz +lshw-B.02.14.tar.gz Index: lshw.spec =================================================================== RCS file: /cvs/extras/rpms/lshw/devel/lshw.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- lshw.spec 25 Feb 2009 21:11:58 -0000 1.11 +++ lshw.spec 1 Mar 2009 09:52:43 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Hardware lister Name: lshw -Version: B.02.13 -Release: 4%{?dist} +Version: B.02.14 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://ezix.org/project/wiki/HardwareLiSter @@ -9,7 +9,6 @@ Source1: lshw.desktop Source2: lshw.consolehelper Source3: lshw.pam -Patch0: lshw-B.02.13-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -36,7 +35,6 @@ %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %{__sed} -i 's|-g -Wall -g|%{optflags}|' src/Makefile %{__sed} -i 's|-g -Wall -Os|%{optflags}|' src/core/Makefile @@ -108,8 +106,12 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Sun Mar 1 2009 Terje Rosten - B.02.14-1 +- B.02.14 +- Drop gcc43 patch now upstream + * Wed Feb 25 2009 Fedora Release Engineering - B.02.13-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Wed Aug 13 2008 Terje Rosten - B.02.13-3 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/lshw/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Aug 2008 18:15:32 -0000 1.4 +++ sources 1 Mar 2009 09:52:43 -0000 1.5 @@ -1 +1 @@ -e94c728ed037ca706436b5ef71aa392d lshw-B.02.13.tar.gz +8bed55768c5cb2ceff062b882a687e9b lshw-B.02.14.tar.gz --- lshw-B.02.13-gcc43.patch DELETED --- From drago01 at fedoraproject.org Sun Mar 1 10:25:45 2009 From: drago01 at fedoraproject.org (Adel Gadllah) Date: Sun, 1 Mar 2009 10:25:45 +0000 (UTC) Subject: rpms/pinot/devel pinot-0.90-gcc44.patch, NONE, 1.1 pinot-0.90-gmime24.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 pinot.spec, 1.39, 1.40 sources, 1.13, 1.14 pinot-0.89-gmime24.patch, 1.1, NONE Message-ID: <20090301102546.1431570115@cvs1.fedora.phx.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/pinot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5624 Modified Files: .cvsignore pinot.spec sources Added Files: pinot-0.90-gcc44.patch pinot-0.90-gmime24.patch Removed Files: pinot-0.89-gmime24.patch Log Message: 0.90, fix build with gcc-4.4 pinot-0.90-gcc44.patch: --- NEW FILE pinot-0.90-gcc44.patch --- diff -upNr pinot-0.90.orign/Tokenize/filters/HtmlFilter.cc pinot-0.90/Tokenize/filters/HtmlFilter.cc --- pinot-0.90.orign/Tokenize/filters/HtmlFilter.cc 2008-12-07 06:52:05.000000000 +0100 +++ pinot-0.90/Tokenize/filters/HtmlFilter.cc 2009-03-01 11:11:16.000000000 +0100 @@ -143,7 +143,9 @@ static string findCharset(const char *pC } // Is a charset specified ? - char *pCharset = strstr(pContent, "charset="); + char *tmp; + strcpy(tmp, pContent); + char *pCharset = strstr(tmp, "charset="); if (pCharset != NULL) { char *pEndOfCharset = strpbrk(pCharset, "\t\r\n \""); diff -upNr pinot-0.90.orign/Utils/DocumentInfo.h pinot-0.90/Utils/DocumentInfo.h --- pinot-0.90.orign/Utils/DocumentInfo.h 2008-10-26 13:00:43.000000000 +0100 +++ pinot-0.90/Utils/DocumentInfo.h 2009-03-01 11:04:57.000000000 +0100 @@ -21,6 +21,7 @@ #include #include +#include #include #include pinot-0.90-gmime24.patch: --- NEW FILE pinot-0.90-gmime24.patch --- diff -upNr pinot-0.90.orign/configure.in pinot-0.90/configure.in --- pinot-0.90.orign/configure.in 2009-01-24 11:40:17.000000000 +0100 +++ pinot-0.90/configure.in 2009-03-01 10:58:42.000000000 +0100 @@ -388,7 +388,7 @@ HTTP_CFLAGS="$NEON_CFLAGS $CURL_CFLAGS $ HTTP_LIBS="$NEON_LIBS $CURL_LIBS $SSL_LIBS" AC_SUBST(HTTP_CFLAGS) AC_SUBST(HTTP_LIBS) -PKG_CHECK_MODULES(GMIME, gmime-2.0 >= 2.0 ) +PKG_CHECK_MODULES(GMIME, gmime-2.4 >= 2.4 ) AC_SUBST(GMIME_CFLAGS) AC_SUBST(GMIME_LIBS) PKG_CHECK_MODULES(XML, libxml++-2.6 >= 2.12 ) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pinot/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 21 Sep 2008 10:26:59 -0000 1.13 +++ .cvsignore 1 Mar 2009 10:25:13 -0000 1.14 @@ -1 +1 @@ -pinot-0.89.tar.gz +pinot-0.90.tar.gz Index: pinot.spec =================================================================== RCS file: /cvs/pkgs/rpms/pinot/devel/pinot.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- pinot.spec 27 Feb 2009 00:34:01 -0000 1.39 +++ pinot.spec 1 Mar 2009 10:25:13 -0000 1.40 @@ -1,6 +1,6 @@ Name: pinot -Version: 0.89 -Release: 5%{?dist} +Version: 0.90 +Release: 1%{?dist} Summary: Personal search and metasearch for the Desktop Group: User Interface/Desktops @@ -8,7 +8,8 @@ URL: http://pinot.berlios.de/ Source0: http://download2.berlios.de/pinot/%{name}-%{version}.tar.gz Patch0: fix_lang_detect.patch -Patch1: pinot-0.89-gmime24.patch +Patch1: pinot-0.90-gmime24.patch +Patch2: pinot-0.90-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sqlite-devel >= 3.3.1 @@ -56,6 +57,7 @@ %setup -q %patch0 -p1 -b .lang_detect %patch1 -p1 -b .gmime24 +%patch2 -p1 -b .gcc44 %build autoreconf --force --install @@ -72,6 +74,11 @@ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applications/pinot.desktop +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/pinot-prefs.desktop + %find_lang %{name} %clean @@ -96,11 +103,13 @@ %{_bindir}/pinot-index %{_bindir}/pinot-search %{_bindir}/pinot-label +%{_bindir}/pinot-prefs %{_datadir}/pinot/ %{_libdir}/pinot/ %{_datadir}/dbus-1/services/de.berlios.Pinot.service %{_sysconfdir}/xdg/autostart/*.desktop %{_datadir}/applications/fedora-pinot.desktop +%{_datadir}/applications/pinot-prefs.desktop %{_mandir}/man1/pinot.* %{_mandir}/man1/pinot-dbus-daemon.* %{_mandir}/man1/pinot-index.* @@ -121,6 +130,10 @@ %changelog +* Sun Mar 01 2009 Adel Gadllah 0.90-1 +- Update to 0.90 +- Fix build against gcc-4.4 + * Thu Feb 26 2009 Fedora Release Engineering - 0.89-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pinot/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 21 Sep 2008 10:26:59 -0000 1.13 +++ sources 1 Mar 2009 10:25:13 -0000 1.14 @@ -1 +1 @@ -eaec47484a82b0a003191e8c64271d03 pinot-0.89.tar.gz +5c106f781e82ecf18fb9d8b0cae65c71 pinot-0.90.tar.gz --- pinot-0.89-gmime24.patch DELETED --- From drago01 at fedoraproject.org Sun Mar 1 10:28:00 2009 From: drago01 at fedoraproject.org (Adel Gadllah) Date: Sun, 1 Mar 2009 10:28:00 +0000 (UTC) Subject: rpms/pinot/F-10 .cvsignore, 1.13, 1.14 pinot.spec, 1.35, 1.36 sources, 1.13, 1.14 Message-ID: <20090301102801.01E0E70115@cvs1.fedora.phx.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/pinot/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6373 Modified Files: .cvsignore pinot.spec sources Log Message: update to 0.90 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pinot/F-10/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 21 Sep 2008 10:26:59 -0000 1.13 +++ .cvsignore 1 Mar 2009 10:27:53 -0000 1.14 @@ -1 +1 @@ -pinot-0.89.tar.gz +pinot-0.90.tar.gz Index: pinot.spec =================================================================== RCS file: /cvs/pkgs/rpms/pinot/F-10/pinot.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- pinot.spec 21 Sep 2008 10:26:59 -0000 1.35 +++ pinot.spec 1 Mar 2009 10:27:56 -0000 1.36 @@ -1,5 +1,5 @@ Name: pinot -Version: 0.89 +Version: 0.90 Release: 1%{?dist} Summary: Personal search and metasearch for the Desktop @@ -68,6 +68,11 @@ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applications/pinot.desktop +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/pinot-prefs.desktop + %find_lang %{name} %clean @@ -92,11 +97,13 @@ %{_bindir}/pinot-index %{_bindir}/pinot-search %{_bindir}/pinot-label +%{_bindir}/pinot-prefs %{_datadir}/pinot/ %{_libdir}/pinot/ %{_datadir}/dbus-1/services/de.berlios.Pinot.service %{_sysconfdir}/xdg/autostart/*.desktop %{_datadir}/applications/fedora-pinot.desktop +%{_datadir}/applications/pinot-prefs.desktop %{_mandir}/man1/pinot.* %{_mandir}/man1/pinot-dbus-daemon.* %{_mandir}/man1/pinot-index.* @@ -117,6 +124,9 @@ %changelog +* Sun Mar 01 2009 Adel Gadllah 0.90-1 +- Update to 0.90 + * Sun Sep 21 2008 Adel Gadllah 0.89-1 - Update to 0.89 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pinot/F-10/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 21 Sep 2008 10:26:59 -0000 1.13 +++ sources 1 Mar 2009 10:27:56 -0000 1.14 @@ -1 +1 @@ -eaec47484a82b0a003191e8c64271d03 pinot-0.89.tar.gz +5c106f781e82ecf18fb9d8b0cae65c71 pinot-0.90.tar.gz From drago01 at fedoraproject.org Sun Mar 1 10:28:39 2009 From: drago01 at fedoraproject.org (Adel Gadllah) Date: Sun, 1 Mar 2009 10:28:39 +0000 (UTC) Subject: rpms/pinot/F-9 .cvsignore, 1.12, 1.13 pinot.spec, 1.33, 1.34 sources, 1.12, 1.13 Message-ID: <20090301102839.9DA6A70116@cvs1.fedora.phx.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/pinot/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6416 Modified Files: .cvsignore pinot.spec sources Log Message: update to 0.90 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pinot/F-9/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 4 Oct 2008 09:44:02 -0000 1.12 +++ .cvsignore 1 Mar 2009 10:28:09 -0000 1.13 @@ -1 +1 @@ -pinot-0.89.tar.gz +pinot-0.90.tar.gz Index: pinot.spec =================================================================== RCS file: /cvs/pkgs/rpms/pinot/F-9/pinot.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- pinot.spec 4 Oct 2008 09:44:02 -0000 1.33 +++ pinot.spec 1 Mar 2009 10:28:09 -0000 1.34 @@ -1,5 +1,5 @@ Name: pinot -Version: 0.89 +Version: 0.90 Release: 1%{?dist} Summary: Personal search and metasearch for the Desktop @@ -8,7 +8,6 @@ URL: http://pinot.berlios.de/ Source0: http://download2.berlios.de/pinot/%{name}-%{version}.tar.gz Patch0: fix_lang_detect.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sqlite-devel >= 3.3.1 @@ -55,7 +54,6 @@ %setup -q %patch0 -p1 -b .lang_detect - %build %configure make %{?_smp_mflags} @@ -70,6 +68,11 @@ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applications/pinot.desktop +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/pinot-prefs.desktop + %find_lang %{name} %clean @@ -94,11 +97,13 @@ %{_bindir}/pinot-index %{_bindir}/pinot-search %{_bindir}/pinot-label +%{_bindir}/pinot-prefs %{_datadir}/pinot/ %{_libdir}/pinot/ %{_datadir}/dbus-1/services/de.berlios.Pinot.service %{_sysconfdir}/xdg/autostart/*.desktop %{_datadir}/applications/fedora-pinot.desktop +%{_datadir}/applications/pinot-prefs.desktop %{_mandir}/man1/pinot.* %{_mandir}/man1/pinot-dbus-daemon.* %{_mandir}/man1/pinot-index.* @@ -117,11 +122,21 @@ %{_libdir}/deskbar-applet/handlers/pinot-* %{_libdir}/deskbar-applet/modules-2.20-compatible/pinot-* + %changelog -* Sat Oct 04 2008 Adel Gadllah 0.89-1 +* Sun Mar 01 2009 Adel Gadllah 0.90-1 +- Update to 0.90 + +* Sun Sep 21 2008 Adel Gadllah 0.89-1 - Update to 0.89 -* Tue Jul 22 2008 Adel Gadllah 0.87-1 +* Sat Aug 30 2008 Adel Gadllah 0.88-2 +- Fix build + +* Sat Aug 30 2008 Adel Gadllah 0.88-1 +- Update to 0.88 + +* Sun Jul 20 2008 Adel Gadllah 0.87-1 - Update to 0.87 * Sun Jun 22 2008 Adel Gadllah 0.86-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pinot/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 4 Oct 2008 09:44:02 -0000 1.12 +++ sources 1 Mar 2009 10:28:09 -0000 1.13 @@ -1 +1 @@ -eaec47484a82b0a003191e8c64271d03 pinot-0.89.tar.gz +5c106f781e82ecf18fb9d8b0cae65c71 pinot-0.90.tar.gz From jonquark at fedoraproject.org Sun Mar 1 10:35:04 2009 From: jonquark at fedoraproject.org (Jon Levell) Date: Sun, 1 Mar 2009 10:35:04 +0000 (UTC) Subject: rpms/diffuse/F-9 diffuse-0.2.15-desktop.patch, NONE, 1.1 diffuse.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301103504.2405C70115@cvs1.fedora.phx.redhat.com> Author: jonquark Update of /cvs/pkgs/rpms/diffuse/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8182/F-9 Modified Files: .cvsignore sources Added Files: diffuse-0.2.15-desktop.patch diffuse.spec import.log Log Message: Initial imort for F9 diffuse-0.2.15-desktop.patch: --- NEW FILE diffuse-0.2.15-desktop.patch --- diff -uNr diffuse-0.2.15/src/usr/share/applications/diffuse.desktop diffuse-0.2.15p/src/usr/share/applications/diffuse.desktop --- diffuse-0.2.15/src/usr/share/applications/diffuse.desktop 2008-12-02 13:04:30.000000000 +0000 +++ diffuse-0.2.15p/src/usr/share/applications/diffuse.desktop 2009-01-21 23:03:42.000000000 +0000 @@ -5,5 +5,5 @@ Icon=diffuse Terminal=false Type=Application -MimeType=text/plain;text/x-csrc;text/x-chdr -Categories=Development;GTK;TextEditor;TextTools +MimeType=text/plain;text/x-csrc;text/x-chdr; +Categories=Development;GTK;TextEditor;TextTools; --- NEW FILE diffuse.spec --- Name: diffuse Version: 0.2.15 Release: 4%{?dist} Summary: Graphical tool for comparing and merging text files Group: Development/Tools License: GPLv2+ URL: http://%{name}.sourceforge.net/ Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 Patch0: diffuse-0.2.15-desktop.patch BuildRequires: desktop-file-utils, scrollkeeper Requires: python >= 2.4, pygtk2 >= 2.10 Requires(post): scrollkeeper Requires(postun): scrollkeeper BuildArch: noarch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description Diffuse is a graphical tool for merging and comparing text files. Diffuse is able to compare an arbitrary number of files side-by-side and gives users the ability to manually adjust line matching and directly edit files. Diffuse can also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK repositories for comparison and merging. %prep %setup -q %patch0 -p1 %build %install rm -rf %{buildroot} mkdir %{buildroot} cp -a src/* %{buildroot}/ desktop-file-validate %{buildroot}/%{_datadir}/applications/diffuse.desktop %clean rm -rf %{buildroot} %post scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : update-desktop-database &> /dev/null || : %postun scrollkeeper-update -q || : update-desktop-database &> /dev/null || : %files %defattr(-,root,root,-) %{_bindir}/diffuse %{_datadir}/diffuse/ %{_datadir}/applications/diffuse.desktop %{_datadir}/gnome/help/diffuse/C/diffuse.xml %{_datadir}/omf/diffuse/diffuse-C.omf %{_datadir}/pixmaps/diffuse.png %config(noreplace) %{_sysconfdir}/diffuserc %{_mandir}/man*/* %dir %{_datadir}/gnome/help/diffuse %dir %{_datadir}/gnome/help/diffuse/C %dir %{_datadir}/omf/diffuse %doc AUTHORS ChangeLog COPYING README TODO %changelog * Wed Feb 11 2009 Jon Levell - 0.2.15-4 - Validate the .desktop file - Use the prescribed forms for scrollkeeper/update-desktop-database - Clean up the unowned directories * Sat Jan 24 2009 Jon Levell - 0.2.15-3 - Fix typos in formatting of changelog - Fix buildroot in line with packaging guidelines - Updated defattr with default directory permissions * Wed Jan 21 2009 Jon Levell - 0.2.15-2 - Use macros in file paths - patch .desktop file to add trailing semi-colons - updated URL/source/group * Tue Jan 20 2009 Jon Levell - 0.2.15-1 - clean buildroot on install - conditional use scrollkeeper/update-desktop-database - updated release/license as per Fedora guidelines - first version submitted to Fedora * Sun Apr 27 2008 Derrick Moser - created initial diffuse package --- NEW FILE import.log --- diffuse-0_2_15-4_fc10:F-9:diffuse-0.2.15-4.fc10.src.rpm:1235903214 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/diffuse/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Feb 2009 00:12:58 -0000 1.1 +++ .cvsignore 1 Mar 2009 10:34:33 -0000 1.2 @@ -0,0 +1 @@ +diffuse-0.2.15.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/diffuse/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Feb 2009 00:12:58 -0000 1.1 +++ sources 1 Mar 2009 10:34:33 -0000 1.2 @@ -0,0 +1 @@ +0fd7aa7d3ed7271770d36bfac8b1ba42 diffuse-0.2.15.tar.bz2 From caolanm at fedoraproject.org Sun Mar 1 10:36:30 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sun, 1 Mar 2009 10:36:30 +0000 (UTC) Subject: rpms/protobuf/devel protobuf-2.0.2-includes.patch, NONE, 1.1 protobuf.spec, 1.4, 1.5 Message-ID: <20090301103630.78C9B70115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/protobuf/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8629 Modified Files: protobuf.spec Added Files: protobuf-2.0.2-includes.patch Log Message: add stdio.h for sprintf, perror, etc protobuf-2.0.2-includes.patch: --- NEW FILE protobuf-2.0.2-includes.patch --- diff -ru protobuf-2.0.2.orig/src/google/protobuf/compiler/command_line_interface.cc protobuf-2.0.2/src/google/protobuf/compiler/command_line_interface.cc --- protobuf-2.0.2.orig/src/google/protobuf/compiler/command_line_interface.cc 2009-03-01 10:14:52.000000000 +0000 +++ protobuf-2.0.2/src/google/protobuf/compiler/command_line_interface.cc 2009-03-01 10:27:11.000000000 +0000 @@ -44,6 +44,7 @@ #include #include #include +#include #include #include diff -ru protobuf-2.0.2.orig/src/google/protobuf/stubs/strutil.cc protobuf-2.0.2/src/google/protobuf/stubs/strutil.cc --- protobuf-2.0.2.orig/src/google/protobuf/stubs/strutil.cc 2009-03-01 10:14:52.000000000 +0000 +++ protobuf-2.0.2/src/google/protobuf/stubs/strutil.cc 2009-03-01 10:15:40.000000000 +0000 @@ -35,6 +35,7 @@ #include // FLT_DIG and DBL_DIG #include #include +#include #ifdef _WIN32 // MSVC has only _snprintf, not snprintf. diff -ru protobuf-2.0.2.orig/src/google/protobuf/text_format.cc protobuf-2.0.2/src/google/protobuf/text_format.cc --- protobuf-2.0.2.orig/src/google/protobuf/text_format.cc 2009-03-01 10:14:52.000000000 +0000 +++ protobuf-2.0.2/src/google/protobuf/text_format.cc 2009-03-01 10:23:07.000000000 +0000 @@ -36,6 +36,7 @@ #include #include #include +#include #include Index: protobuf.spec =================================================================== RCS file: /cvs/pkgs/rpms/protobuf/devel/protobuf.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- protobuf.spec 27 Feb 2009 02:33:23 -0000 1.4 +++ protobuf.spec 1 Mar 2009 10:36:00 -0000 1.5 @@ -13,7 +13,7 @@ Summary: Protocol Buffers - Google's data interchange format Name: protobuf Version: 2.0.2 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD Group: Development/Libraries Source: http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -23,6 +23,7 @@ Patch1: protobuf-fedora-gtest.patch Patch2: protobuf-java-notests.patch Patch3: protobuf-gcc-4.3.0.patch +Patch4: protobuf-2.0.2-includes.patch URL: http://code.google.com/p/protobuf/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: automake autoconf libtool pkgconfig @@ -143,6 +144,7 @@ rm -rf java/src/test %endif %patch3 -p0 +%patch4 -p1 %build ./autogen.sh @@ -266,6 +268,9 @@ %endif %changelog +* Sun Mar 01 2009 Caol??n McNamra - 2.0.2-8 +- add stdio.h for sprintf, perror, etc. + * Thu Feb 26 2009 Fedora Release Engineering - 2.0.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From lkundrak at fedoraproject.org Sun Mar 1 10:45:11 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Mar 2009 10:45:11 +0000 (UTC) Subject: rpms/ETL/F-10 ETL-0.04.12-build.patch, NONE, 1.1 ETL.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301104511.3CF9670115@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/ETL/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10144/F-10 Modified Files: .cvsignore sources Added Files: ETL-0.04.12-build.patch ETL.spec Log Message: Import ETL ETL-0.04.12-build.patch: --- NEW FILE ETL-0.04.12-build.patch --- Upstream review: http://patches.synfig.org/r/12/ * Replace autoconf-generated etl_profile.h with custom one - Do not use the HAVE_* autoconf macros so that we don't conflict - Include only necessary defines * Abort if mandatory checks don't pass * Do not redefine v*printf Lubomir Rintel diff -urp ETL-0.04.12.orig/configure.ac ETL-0.04.12/configure.ac --- ETL-0.04.12.orig/configure.ac 2008-10-17 17:21:58.000000000 +0200 +++ ETL-0.04.12/configure.ac 2009-01-09 16:00:42.000000000 +0100 @@ -6,7 +6,7 @@ AC_INIT([Extended Template Library],[0.0 AC_REVISION AC_CONFIG_AUX_DIR(config) -AC_CONFIG_HEADERS([ETL/etl_profile_.h]) +AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -44,27 +44,14 @@ AC_WIN32_QUIRKS # -- H E A D E R S -------------------------------------------- AH_TOP([ -// We want to be autoconf/autoheader friendly, so -// if the developer has already included an -// autoheader-generated configuration script, -// we can assume that the user knew what they -// were doing and let them use their own config.h. -//#ifndef PACKAGE_TARNAME +// This is not used anywhere ]) -AH_BOTTOM([ -//#endif // ifndef PACKAGE_TARNAME -]) - - # -- T Y P E S & S T R U C T S -------------------------------- # -- F U N C T I O N S ---------------------------------------- ETL_DEPS -AC_CHECK_FUNCS([fork]) -AC_CHECK_FUNCS([kill]) -AC_CHECK_FUNCS([pipe]) # -- O U T P U T ---------------------------------------------- diff -urp ETL-0.04.12.orig/ETL/clock ETL-0.04.12/ETL/clock --- ETL-0.04.12.orig/ETL/clock 2007-10-30 11:53:52.000000000 +0100 +++ ETL-0.04.12/ETL/clock 2009-01-09 16:00:42.000000000 +0100 @@ -29,7 +29,7 @@ #include "etl_config.h" -#ifdef HAVE_GETTIMEOFDAY +#ifdef ETL_HAS_GETTIMEOFDAY #include "_clock_gettimeofday.h" #ifndef ETL_CLOCK_DEFAULT_DESC_CLASS #define ETL_CLOCK_DEFAULT_DESC_CLASS _ETL::clock_desc_gettimeofday diff -urp ETL-0.04.12.orig/ETL/Makefile.am ETL-0.04.12/ETL/Makefile.am --- ETL-0.04.12.orig/ETL/Makefile.am 2008-02-23 12:09:53.000000000 +0100 +++ ETL-0.04.12/ETL/Makefile.am 2009-01-09 16:00:42.000000000 +0100 @@ -2,14 +2,11 @@ MAINTAINERCLEANFILES=Makefile.in -CLEANFILES=$(top_builddir)/ETL/etl_profile.h +DISTCLEANFILES=$(top_builddir)/ETL/etl_profile.h etldir = $(includedir)/ETL etl_HEADERS= value _value.h rect _rect.h misc _misc.h ref_count _ref_count.h angle fastangle handle ipc thread fixed random clock hermite calculus stringf trivial spline _stringf.h _bspline.h _calculus.h _mutex_null.h _hermite.h _curve_func.h _clock_base.h _clock_system.h _clock_gettimeofday.h _random.h _angle.h _fastangle.h _curve.h _handle.h _thread.h _mutex_pthreads.h _mutex_win32.h _condition.h _rwlock.h smach _smach.h _trivial.h _fixed.h etl_config.h $(top_builddir)/ETL/etl_profile.h _fastangle_tables.h bezier _bezier.h _bezier_angle.h _status.h status pen _pen.h boxblur _boxblur.h gaussian _gaussian.h surface _surface.h smart_ptr _smart_ptr.h _clock_win32hpcount.h mutex _mutex_pthreads_simple.h -$(top_builddir)/ETL/etl_profile.h:$(top_builddir)/ETL/etl_profile_.h - sed "s/PACKAGE/ETL/g;" < $(top_builddir)/ETL/etl_profile_.h > $(top_builddir)/ETL/etl_profile.h - # FIXME: figure out why this is in SVN, but isn't installed EXTRA_DIST=_bit_rotate.h diff -urp ETL-0.04.12.orig/ETL/mutex ETL-0.04.12/ETL/mutex --- ETL-0.04.12.orig/ETL/mutex 2008-02-23 12:09:53.000000000 +0100 +++ ETL-0.04.12/ETL/mutex 2009-01-09 16:00:42.000000000 +0100 @@ -29,7 +29,7 @@ #include "etl_config.h" -#ifdef HAVE_LIBPTHREAD +#ifdef ETL_HAS_LIBPTHREAD # include "_mutex_pthreads_simple.h" #else #ifdef _WIN32 diff -urp ETL-0.04.12.orig/ETL/_mutex_pthreads.h ETL-0.04.12/ETL/_mutex_pthreads.h --- ETL-0.04.12.orig/ETL/_mutex_pthreads.h 2007-03-16 01:37:48.000000000 +0100 +++ ETL-0.04.12/ETL/_mutex_pthreads.h 2009-01-09 16:00:42.000000000 +0100 @@ -33,7 +33,7 @@ #include -#ifdef HAVE_SCHED_H +#ifdef ETL_HAS_SCHED_H # include #endif diff -urp ETL-0.04.12.orig/ETL/_stringf.h ETL-0.04.12/ETL/_stringf.h --- ETL-0.04.12.orig/ETL/_stringf.h 2008-01-25 13:23:29.000000000 +0100 +++ ETL-0.04.12/ETL/_stringf.h 2009-01-09 16:00:42.000000000 +0100 @@ -48,6 +48,13 @@ #define POPEN_BINARY_WRITE_TYPE "w" #endif +#ifdef ETL_HAS__VSNPRINTF +#ifndef ETL_HAS_VSNPRINTF +#define vnsprintf _vnsprintf +#define ETL_HAS_VSNPRINTF 1 +#endif +#endif + /* === T Y P E D E F S ===================================================== */ _ETL_BEGIN_CDECLS @@ -58,24 +65,39 @@ _ETL_BEGIN_CDECLS #define ETL_NO_THROW throw() #endif -#ifdef HAVE_VASPRINTF // This is the preferred method +#ifdef __GLIBC__ +// We prefer prototypes from GLIBC, since defining them ourselves +// works around its security mechanisms +#define _GNU_SOURCE +#include +#endif + +#ifdef ETL_HAS_VASPRINTF // This is the preferred method +#ifndef __GLIBC__ extern int vasprintf(char **,const char *,va_list)ETL_NO_THROW; +#endif #else -# ifdef HAVE_VSNPRINTF // This is the secondary method +# ifdef ETL_HAS_VSNPRINTF // This is the secondary method +#ifndef __GLIBC__ extern int vsnprintf(char *,size_t,const char*,va_list)ETL_NO_THROW; +#endif # endif #endif -#ifdef HAVE_VSSCANF +#ifdef ETL_HAS_VSSCANF +#ifndef __GLIBC__ extern int vsscanf(const char *,const char *,va_list)ETL_NO_THROW; +#endif #else #define ETL_NO_VSTRSCANF -#ifdef HAVE_SSCANF +#ifdef ETL_HAS_SSCANF +#ifndef __GLIBC__ extern int sscanf(const char *buf, const char *format, ...)ETL_NO_THROW; #endif #endif +#endif #include @@ -88,7 +110,7 @@ _ETL_BEGIN_NAMESPACE inline std::string vstrprintf(const char *format, va_list args) { -#ifdef HAVE_VASPRINTF // This is the preferred method (and safest) +#ifdef ETL_HAS_VASPRINTF // This is the preferred method (and safest) char *buffer; std::string ret; vasprintf(&buffer,format,args); @@ -96,7 +118,7 @@ vstrprintf(const char *format, va_list a free(buffer); return ret; #else -#ifdef HAVE_VSNPRINTF // This is the secondary method (Safe, but bulky) +#ifdef ETL_HAS_VSNPRINTF // This is the secondary method (Safe, but bulky) #warning etl::vstrprintf() has a maximum size of ETL_STRPRINTF_MAX_LENGTH in this configuration. #ifdef ETL_THREAD_SAFE char buffer[ETL_STRPRINTF_MAX_LENGTH]; @@ -145,7 +167,7 @@ strscanf(const std::string &data, const } #else -#if defined (HAVE_SSCANF) && defined (__GNUC__) +#if defined (ETL_HAS_SSCANF) && defined (__GNUC__) #define strscanf(data,format,...) sscanf(data.c_str(),format,__VA_ARGS__) #endif #endif diff -urp ETL-0.04.12.orig/ETL/_thread.h ETL-0.04.12/ETL/_thread.h --- ETL-0.04.12.orig/ETL/_thread.h 2007-03-16 01:37:48.000000000 +0100 +++ ETL-0.04.12/ETL/_thread.h 2009-01-09 16:00:42.000000000 +0100 @@ -31,21 +31,21 @@ #define __USE_GNU -#ifdef HAVE_PTHREAD_H +#ifdef ETL_HAS_PTHREAD_H # include #endif -#ifdef HAVE_SCHED_H +#ifdef ETL_HAS_SCHED_H # include #endif -#ifdef HAVE_CREATETHREAD +#ifdef ETL_HAS_CREATETHREAD # include #endif /* === M A C R O S ========================================================= */ -#if ( defined (HAVE_PTHREAD_CREATE) || defined (HAVE_CLONE) || defined (HAVE_CREATETHREAD) ) && !defined (NO_THREADS) +#if ( defined (ETL_HAS_PTHREAD_CREATE) || defined (ETL_HAS_CLONE) || defined (ETL_HAS_CREATETHREAD) ) && !defined (NO_THREADS) # define CALLISTO_THREADS #endif @@ -53,7 +53,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -#if defined(CALLISTO_THREADS) && defined(HAVE_PTHREAD_CREATE) +#if defined(CALLISTO_THREADS) && defined(ETL_HAS_PTHREAD_CREATE) static inline void Yield(void) { sched_yield(); @@ -68,7 +68,7 @@ inline void Yield(void) { } #ifdef CALLISTO_THREADS -#ifdef HAVE_PTHREAD_CREATE +#ifdef ETL_HAS_PTHREAD_CREATE class Thread { @@ -207,7 +207,7 @@ public: } }; -#ifdef HAVE_PTHREAD_RW_LOCK_INIT +#ifdef ETL_HAS_PTHREAD_RW_LOCK_INIT class ReadWriteLock { pthread_rwlock_t rwlock; @@ -290,8 +290,8 @@ public: }; */ -#else // if defined HAVE_PTHREAD -#ifdef HAVE_CREATETHREAD +#else // if defined ETL_HAS_PTHREAD +#ifdef ETL_HAS_CREATETHREAD #ifdef THREAD_ENTRYPOINT @@ -448,8 +448,8 @@ public: }; -#endif // if defined HAVE_CREATETHREAD -#endif // if defined HAVE_PTHREAD_CREATE +#endif // if defined ETL_HAS_CREATETHREAD +#endif // if defined ETL_HAS_PTHREAD_CREATE #endif // if defined CALLISTO_THREADS diff -urp ETL-0.04.12.orig/m4/ETL.m4 ETL-0.04.12/m4/ETL.m4 --- ETL-0.04.12.orig/m4/ETL.m4 2007-11-07 12:05:28.000000000 +0100 +++ ETL-0.04.12/m4/ETL.m4 2009-01-09 16:00:42.000000000 +0100 @@ -3,43 +3,71 @@ # $Id: ETL.m4 1115 2007-11-07 11:05:28Z pabs $ # # By Robert B. Quattlebaum Jr. +# Errors are Lubomir Rintel's fault # +AC_DEFUN([ETL_PROFILE], [ + etl_profile=$1 + echo "/* Configuration profile of ETL */" >$etl_profile +]) + +AC_DEFUN([ETL_CHECK_HEADER], [ + etl_header_name=AS_TR_CPP($1) + AC_CHECK_HEADER($1, + [echo "#define ETL_HAS_$etl_header_name 1" >> $etl_profile], + [echo "/* #undef ETL_HAS_$etl_header_name */" >> $etl_profile]) +]) + +AC_DEFUN([ETL_CHECK_FUNC], [ + etl_func_name=AS_TR_CPP($1) + AC_CHECK_FUNC($1, + [echo "#define ETL_HAS_$etl_func_name 1" >> $etl_profile], + [echo "/* #undef ETL_HAS_$etl_func_name */" >> $etl_profile]) +]) + +AC_DEFUN([ETL_CHECK_LIB], [ + etl_lib_name=AS_TR_CPP($1) + AC_CHECK_LIB($1, $2, + [echo "#define ETL_HAS_LIB$etl_lib_name 1" >> $etl_profile + LIBS="$LIBS -l$1"], + [echo "/* #undef ETL_HAS_LIB$etl_lib_name */" >> $etl_profile]) +]) + AC_DEFUN([ETL_DEPS], [ - AC_C_BIGENDIAN - - AC_CHECK_LIB(user32, main) - AC_CHECK_LIB(kernel32, main) - AC_CHECK_LIB(pthread, main) - - AC_HEADER_STDC - - AC_CHECK_HEADERS(pthread.h) - AC_CHECK_HEADERS(sched.h) - AC_CHECK_HEADERS(sys/times.h) - AC_CHECK_HEADERS(sys/time.h) - AC_CHECK_HEADERS(unistd.h) - AC_CHECK_HEADERS(windows.h) - AC_CHECK_FUNCS([pthread_create]) - AC_CHECK_FUNCS([pthread_rwlock_init]) - AC_CHECK_FUNCS([pthread_yield]) - AC_CHECK_FUNCS([sched_yield]) - AC_CHECK_FUNCS([CreateThread]) - AC_CHECK_FUNCS([__clone]) - AC_CHECK_FUNCS([QueryPerformanceCounter]) - - AC_CHECK_FUNCS([gettimeofday]) - AC_CHECK_FUNCS([sscanf]) - AC_CHECK_FUNCS([vsscanf]) - AC_CHECK_FUNCS([vsprintf]) - AC_CHECK_FUNCS([vasprintf]) - AC_CHECK_FUNCS([vsnprintf],[],[ - AC_CHECK_FUNC([_vsnprintf],[ - AC_DEFINE(vsnprintf,_vsnprintf,[define if the vsnprintf function is mangled]) - AC_DEFINE(HAVE_VSNPRINTF,1) - ]) - ]) + ETL_PROFILE(ETL/etl_profile.h) + + # Common mandatory + AC_CHECK_HEADERS(sys/time.h, [], + AC_MSG_ERROR([sys/time.h is needed])) + AC_CHECK_HEADERS(unistd.h, [], + AC_MSG_ERROR([unistd.h is needed])) + + # Mandatory on Windows + if echo $host |grep -q win; then + AC_CHECK_LIB(user32, main, + AC_MSG_ERROR([user32 is needed])) + AC_CHECK_LIB(kernel32, main, + AC_MSG_ERROR([kernel32 is needed])) + AC_CHECK_HEADERS(windows.h, + AC_MSG_ERROR([windows.h is needed])) + AC_CHECK_FUNCS([QueryPerformanceCounter], + AC_MSG_ERROR([QueryPerformanceCounter is needed])) + fi + + # Optional + ETL_CHECK_HEADER(sched.h) + ETL_CHECK_HEADER(pthread.h) + ETL_CHECK_LIB(pthread, main) + ETL_CHECK_FUNC([pthread_create]) + ETL_CHECK_FUNC([pthread_rwlock_init]) + ETL_CHECK_FUNC([CreateThread]) + ETL_CHECK_FUNC([gettimeofday]) + ETL_CHECK_FUNC([sscanf]) + ETL_CHECK_FUNC([vsscanf]) + ETL_CHECK_FUNC([vasprintf]) + ETL_CHECK_FUNC([vsnprintf]) + ETL_CHECK_FUNC([_vsnprintf]) ]) AC_DEFUN([USING_ETL], diff -urp ETL-0.04.12.orig/Makefile.am ETL-0.04.12/Makefile.am --- ETL-0.04.12.orig/Makefile.am 2008-02-03 02:38:12.000000000 +0100 +++ ETL-0.04.12/Makefile.am 2009-01-09 16:00:42.000000000 +0100 @@ -1,6 +1,6 @@ # $Id: Makefile.am 1558 2008-02-03 01:38:12Z pabs $ -MAINTAINERCLEANFILES=COPYING INSTALL config/config.guess config/config.sub config/ltmain.sh config/install-sh config/mkinstalldirs config/aclocal.m4 config/missing config/texinfo.tex config/depcomp aclocal.m4 config.h.in configure stamp-h.in Makefile.in config.log config.status .doc_stamp .DS_Store include/etl_profile.h.in doxygen.cfg +MAINTAINERCLEANFILES=COPYING INSTALL config/config.guess config/config.sub config/ltmain.sh config/install-sh config/mkinstalldirs config/aclocal.m4 config/missing config/texinfo.tex config/depcomp aclocal.m4 config.h.in configure stamp-h.in Makefile.in config.log config.status .doc_stamp .DS_Store doxygen.cfg SUBDIRS=ETL test @@ -14,7 +14,7 @@ aclocaldir = $(prefix)/share/aclocal ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST=COPYING m4/subs.m4 config/depcomp m4/cxx_macros.m4 ETL.pbproj/project.pbxproj ETL.pbproj/etl_profile.h ETL.pbproj/frameworkfix.cpp ETL-config.in m4/ETL.m4 doxygen.cfg.in doxygen.cfg ETL.pc.in +EXTRA_DIST=COPYING m4/subs.m4 config/depcomp m4/cxx_macros.m4 ETL.pbproj/project.pbxproj ETL.pbproj/frameworkfix.cpp ETL-config.in m4/ETL.m4 doxygen.cfg.in doxygen.cfg ETL.pc.in CVS=cvs SVN=svn --- NEW FILE ETL.spec --- %define debug_package %{nil} Name: ETL Version: 0.04.12 Release: 1%{?dist} Summary: Extended Template Library Group: Development/Libraries License: GPLv2+ URL: http://synfig.org Source0: http://downloads.sourceforge.net/synfig/ETL-%{version}.tar.gz Patch0: ETL-0.04.12-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: doxygen Buildrequires: autoconf automake Requires: pkgconfig %description Voria ETL is a multi-platform class and template library designed to add new datatypes and functions which combine well with the existing types and functions from the C++ Standard Template Library (STL). %package devel Summary: Development files for %{name} Group: Development/Libraries %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q %patch0 -p1 -b .build autoreconf %build %configure make %{?_smp_mflags} all docs %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" touch -r ChangeLog $RPM_BUILD_ROOT%{_bindir}/ETL-config touch -r ChangeLog $RPM_BUILD_ROOT%{_includedir}/ETL/etl_profile.h %clean rm -rf $RPM_BUILD_ROOT %check make check %files devel %defattr(-,root,root,-) %doc README COPYING AUTHORS NEWS %{_includedir}/ETL/ %{_bindir}/ETL-config %{_libdir}/pkgconfig/ETL.pc %changelog * Fri Jan 9 2009 Lubomir Rintel 0.04.12-1 - New upstream release - Run regression tests - Build documentation - Fix BRs * Tue May 6 2008 Marc Wiriadisastra - 0.4.11-4 - Removed some requires and buildrequires to clean stuff up. * Thu May 1 2008 Marc Wiriadisastra - 0.4.11-3 - Added the lines for timestamp consistency * Fri Mar 7 2008 Marc Wiriadisastra - 0.4.11-2 - Added patch to clean up etl-profile_.in - renamed package to ETL as requested by ralf * Thu Mar 6 2008 Marc Wiriadisastra - 0.4.11-1 - Removed patches - New version * Sun Feb 3 2008 Marc Wiriadisastra - 0.04-10-3 - Added backported patch adding * Thu Jan 24 2008 Marc Wiriadisastra - 0.04-10-2 - Included Ralfs patch for ETL-config * Sat Jan 12 2008 Marc Wiriadisastra - 0.04.10-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ETL/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Feb 2009 00:27:13 -0000 1.1 +++ .cvsignore 1 Mar 2009 10:44:40 -0000 1.2 @@ -0,0 +1 @@ +ETL-0.04.12.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ETL/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Feb 2009 00:27:13 -0000 1.1 +++ sources 1 Mar 2009 10:44:40 -0000 1.2 @@ -0,0 +1 @@ +4cd7fb673fa5c77cfa1986aeecdb3ffe ETL-0.04.12.tar.gz From lkundrak at fedoraproject.org Sun Mar 1 10:45:10 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Mar 2009 10:45:10 +0000 (UTC) Subject: rpms/ETL/EL-5 ETL-0.04.12-build.patch, NONE, 1.1 ETL.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301104510.D211D70115@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/ETL/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10144/EL-5 Modified Files: .cvsignore sources Added Files: ETL-0.04.12-build.patch ETL.spec Log Message: Import ETL ETL-0.04.12-build.patch: --- NEW FILE ETL-0.04.12-build.patch --- Upstream review: http://patches.synfig.org/r/12/ * Replace autoconf-generated etl_profile.h with custom one - Do not use the HAVE_* autoconf macros so that we don't conflict - Include only necessary defines * Abort if mandatory checks don't pass * Do not redefine v*printf Lubomir Rintel diff -urp ETL-0.04.12.orig/configure.ac ETL-0.04.12/configure.ac --- ETL-0.04.12.orig/configure.ac 2008-10-17 17:21:58.000000000 +0200 +++ ETL-0.04.12/configure.ac 2009-01-09 16:00:42.000000000 +0100 @@ -6,7 +6,7 @@ AC_INIT([Extended Template Library],[0.0 AC_REVISION AC_CONFIG_AUX_DIR(config) -AC_CONFIG_HEADERS([ETL/etl_profile_.h]) +AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -44,27 +44,14 @@ AC_WIN32_QUIRKS # -- H E A D E R S -------------------------------------------- AH_TOP([ -// We want to be autoconf/autoheader friendly, so -// if the developer has already included an -// autoheader-generated configuration script, -// we can assume that the user knew what they -// were doing and let them use their own config.h. -//#ifndef PACKAGE_TARNAME +// This is not used anywhere ]) -AH_BOTTOM([ -//#endif // ifndef PACKAGE_TARNAME -]) - - # -- T Y P E S & S T R U C T S -------------------------------- # -- F U N C T I O N S ---------------------------------------- ETL_DEPS -AC_CHECK_FUNCS([fork]) -AC_CHECK_FUNCS([kill]) -AC_CHECK_FUNCS([pipe]) # -- O U T P U T ---------------------------------------------- diff -urp ETL-0.04.12.orig/ETL/clock ETL-0.04.12/ETL/clock --- ETL-0.04.12.orig/ETL/clock 2007-10-30 11:53:52.000000000 +0100 +++ ETL-0.04.12/ETL/clock 2009-01-09 16:00:42.000000000 +0100 @@ -29,7 +29,7 @@ #include "etl_config.h" -#ifdef HAVE_GETTIMEOFDAY +#ifdef ETL_HAS_GETTIMEOFDAY #include "_clock_gettimeofday.h" #ifndef ETL_CLOCK_DEFAULT_DESC_CLASS #define ETL_CLOCK_DEFAULT_DESC_CLASS _ETL::clock_desc_gettimeofday diff -urp ETL-0.04.12.orig/ETL/Makefile.am ETL-0.04.12/ETL/Makefile.am --- ETL-0.04.12.orig/ETL/Makefile.am 2008-02-23 12:09:53.000000000 +0100 +++ ETL-0.04.12/ETL/Makefile.am 2009-01-09 16:00:42.000000000 +0100 @@ -2,14 +2,11 @@ MAINTAINERCLEANFILES=Makefile.in -CLEANFILES=$(top_builddir)/ETL/etl_profile.h +DISTCLEANFILES=$(top_builddir)/ETL/etl_profile.h etldir = $(includedir)/ETL etl_HEADERS= value _value.h rect _rect.h misc _misc.h ref_count _ref_count.h angle fastangle handle ipc thread fixed random clock hermite calculus stringf trivial spline _stringf.h _bspline.h _calculus.h _mutex_null.h _hermite.h _curve_func.h _clock_base.h _clock_system.h _clock_gettimeofday.h _random.h _angle.h _fastangle.h _curve.h _handle.h _thread.h _mutex_pthreads.h _mutex_win32.h _condition.h _rwlock.h smach _smach.h _trivial.h _fixed.h etl_config.h $(top_builddir)/ETL/etl_profile.h _fastangle_tables.h bezier _bezier.h _bezier_angle.h _status.h status pen _pen.h boxblur _boxblur.h gaussian _gaussian.h surface _surface.h smart_ptr _smart_ptr.h _clock_win32hpcount.h mutex _mutex_pthreads_simple.h -$(top_builddir)/ETL/etl_profile.h:$(top_builddir)/ETL/etl_profile_.h - sed "s/PACKAGE/ETL/g;" < $(top_builddir)/ETL/etl_profile_.h > $(top_builddir)/ETL/etl_profile.h - # FIXME: figure out why this is in SVN, but isn't installed EXTRA_DIST=_bit_rotate.h diff -urp ETL-0.04.12.orig/ETL/mutex ETL-0.04.12/ETL/mutex --- ETL-0.04.12.orig/ETL/mutex 2008-02-23 12:09:53.000000000 +0100 +++ ETL-0.04.12/ETL/mutex 2009-01-09 16:00:42.000000000 +0100 @@ -29,7 +29,7 @@ #include "etl_config.h" -#ifdef HAVE_LIBPTHREAD +#ifdef ETL_HAS_LIBPTHREAD # include "_mutex_pthreads_simple.h" #else #ifdef _WIN32 diff -urp ETL-0.04.12.orig/ETL/_mutex_pthreads.h ETL-0.04.12/ETL/_mutex_pthreads.h --- ETL-0.04.12.orig/ETL/_mutex_pthreads.h 2007-03-16 01:37:48.000000000 +0100 +++ ETL-0.04.12/ETL/_mutex_pthreads.h 2009-01-09 16:00:42.000000000 +0100 @@ -33,7 +33,7 @@ #include -#ifdef HAVE_SCHED_H +#ifdef ETL_HAS_SCHED_H # include #endif diff -urp ETL-0.04.12.orig/ETL/_stringf.h ETL-0.04.12/ETL/_stringf.h --- ETL-0.04.12.orig/ETL/_stringf.h 2008-01-25 13:23:29.000000000 +0100 +++ ETL-0.04.12/ETL/_stringf.h 2009-01-09 16:00:42.000000000 +0100 @@ -48,6 +48,13 @@ #define POPEN_BINARY_WRITE_TYPE "w" #endif +#ifdef ETL_HAS__VSNPRINTF +#ifndef ETL_HAS_VSNPRINTF +#define vnsprintf _vnsprintf +#define ETL_HAS_VSNPRINTF 1 +#endif +#endif + /* === T Y P E D E F S ===================================================== */ _ETL_BEGIN_CDECLS @@ -58,24 +65,39 @@ _ETL_BEGIN_CDECLS #define ETL_NO_THROW throw() #endif -#ifdef HAVE_VASPRINTF // This is the preferred method +#ifdef __GLIBC__ +// We prefer prototypes from GLIBC, since defining them ourselves +// works around its security mechanisms +#define _GNU_SOURCE +#include +#endif + +#ifdef ETL_HAS_VASPRINTF // This is the preferred method +#ifndef __GLIBC__ extern int vasprintf(char **,const char *,va_list)ETL_NO_THROW; +#endif #else -# ifdef HAVE_VSNPRINTF // This is the secondary method +# ifdef ETL_HAS_VSNPRINTF // This is the secondary method +#ifndef __GLIBC__ extern int vsnprintf(char *,size_t,const char*,va_list)ETL_NO_THROW; +#endif # endif #endif -#ifdef HAVE_VSSCANF +#ifdef ETL_HAS_VSSCANF +#ifndef __GLIBC__ extern int vsscanf(const char *,const char *,va_list)ETL_NO_THROW; +#endif #else #define ETL_NO_VSTRSCANF -#ifdef HAVE_SSCANF +#ifdef ETL_HAS_SSCANF +#ifndef __GLIBC__ extern int sscanf(const char *buf, const char *format, ...)ETL_NO_THROW; #endif #endif +#endif #include @@ -88,7 +110,7 @@ _ETL_BEGIN_NAMESPACE inline std::string vstrprintf(const char *format, va_list args) { -#ifdef HAVE_VASPRINTF // This is the preferred method (and safest) +#ifdef ETL_HAS_VASPRINTF // This is the preferred method (and safest) char *buffer; std::string ret; vasprintf(&buffer,format,args); @@ -96,7 +118,7 @@ vstrprintf(const char *format, va_list a free(buffer); return ret; #else -#ifdef HAVE_VSNPRINTF // This is the secondary method (Safe, but bulky) +#ifdef ETL_HAS_VSNPRINTF // This is the secondary method (Safe, but bulky) #warning etl::vstrprintf() has a maximum size of ETL_STRPRINTF_MAX_LENGTH in this configuration. #ifdef ETL_THREAD_SAFE char buffer[ETL_STRPRINTF_MAX_LENGTH]; @@ -145,7 +167,7 @@ strscanf(const std::string &data, const } #else -#if defined (HAVE_SSCANF) && defined (__GNUC__) +#if defined (ETL_HAS_SSCANF) && defined (__GNUC__) #define strscanf(data,format,...) sscanf(data.c_str(),format,__VA_ARGS__) #endif #endif diff -urp ETL-0.04.12.orig/ETL/_thread.h ETL-0.04.12/ETL/_thread.h --- ETL-0.04.12.orig/ETL/_thread.h 2007-03-16 01:37:48.000000000 +0100 +++ ETL-0.04.12/ETL/_thread.h 2009-01-09 16:00:42.000000000 +0100 @@ -31,21 +31,21 @@ #define __USE_GNU -#ifdef HAVE_PTHREAD_H +#ifdef ETL_HAS_PTHREAD_H # include #endif -#ifdef HAVE_SCHED_H +#ifdef ETL_HAS_SCHED_H # include #endif -#ifdef HAVE_CREATETHREAD +#ifdef ETL_HAS_CREATETHREAD # include #endif /* === M A C R O S ========================================================= */ -#if ( defined (HAVE_PTHREAD_CREATE) || defined (HAVE_CLONE) || defined (HAVE_CREATETHREAD) ) && !defined (NO_THREADS) +#if ( defined (ETL_HAS_PTHREAD_CREATE) || defined (ETL_HAS_CLONE) || defined (ETL_HAS_CREATETHREAD) ) && !defined (NO_THREADS) # define CALLISTO_THREADS #endif @@ -53,7 +53,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -#if defined(CALLISTO_THREADS) && defined(HAVE_PTHREAD_CREATE) +#if defined(CALLISTO_THREADS) && defined(ETL_HAS_PTHREAD_CREATE) static inline void Yield(void) { sched_yield(); @@ -68,7 +68,7 @@ inline void Yield(void) { } #ifdef CALLISTO_THREADS -#ifdef HAVE_PTHREAD_CREATE +#ifdef ETL_HAS_PTHREAD_CREATE class Thread { @@ -207,7 +207,7 @@ public: } }; -#ifdef HAVE_PTHREAD_RW_LOCK_INIT +#ifdef ETL_HAS_PTHREAD_RW_LOCK_INIT class ReadWriteLock { pthread_rwlock_t rwlock; @@ -290,8 +290,8 @@ public: }; */ -#else // if defined HAVE_PTHREAD -#ifdef HAVE_CREATETHREAD +#else // if defined ETL_HAS_PTHREAD +#ifdef ETL_HAS_CREATETHREAD #ifdef THREAD_ENTRYPOINT @@ -448,8 +448,8 @@ public: }; -#endif // if defined HAVE_CREATETHREAD -#endif // if defined HAVE_PTHREAD_CREATE +#endif // if defined ETL_HAS_CREATETHREAD +#endif // if defined ETL_HAS_PTHREAD_CREATE #endif // if defined CALLISTO_THREADS diff -urp ETL-0.04.12.orig/m4/ETL.m4 ETL-0.04.12/m4/ETL.m4 --- ETL-0.04.12.orig/m4/ETL.m4 2007-11-07 12:05:28.000000000 +0100 +++ ETL-0.04.12/m4/ETL.m4 2009-01-09 16:00:42.000000000 +0100 @@ -3,43 +3,71 @@ # $Id: ETL.m4 1115 2007-11-07 11:05:28Z pabs $ # # By Robert B. Quattlebaum Jr. +# Errors are Lubomir Rintel's fault # +AC_DEFUN([ETL_PROFILE], [ + etl_profile=$1 + echo "/* Configuration profile of ETL */" >$etl_profile +]) + +AC_DEFUN([ETL_CHECK_HEADER], [ + etl_header_name=AS_TR_CPP($1) + AC_CHECK_HEADER($1, + [echo "#define ETL_HAS_$etl_header_name 1" >> $etl_profile], + [echo "/* #undef ETL_HAS_$etl_header_name */" >> $etl_profile]) +]) + +AC_DEFUN([ETL_CHECK_FUNC], [ + etl_func_name=AS_TR_CPP($1) + AC_CHECK_FUNC($1, + [echo "#define ETL_HAS_$etl_func_name 1" >> $etl_profile], + [echo "/* #undef ETL_HAS_$etl_func_name */" >> $etl_profile]) +]) + +AC_DEFUN([ETL_CHECK_LIB], [ + etl_lib_name=AS_TR_CPP($1) + AC_CHECK_LIB($1, $2, + [echo "#define ETL_HAS_LIB$etl_lib_name 1" >> $etl_profile + LIBS="$LIBS -l$1"], + [echo "/* #undef ETL_HAS_LIB$etl_lib_name */" >> $etl_profile]) +]) + AC_DEFUN([ETL_DEPS], [ - AC_C_BIGENDIAN - - AC_CHECK_LIB(user32, main) - AC_CHECK_LIB(kernel32, main) - AC_CHECK_LIB(pthread, main) - - AC_HEADER_STDC - - AC_CHECK_HEADERS(pthread.h) - AC_CHECK_HEADERS(sched.h) - AC_CHECK_HEADERS(sys/times.h) - AC_CHECK_HEADERS(sys/time.h) - AC_CHECK_HEADERS(unistd.h) - AC_CHECK_HEADERS(windows.h) - AC_CHECK_FUNCS([pthread_create]) - AC_CHECK_FUNCS([pthread_rwlock_init]) - AC_CHECK_FUNCS([pthread_yield]) - AC_CHECK_FUNCS([sched_yield]) - AC_CHECK_FUNCS([CreateThread]) - AC_CHECK_FUNCS([__clone]) - AC_CHECK_FUNCS([QueryPerformanceCounter]) - - AC_CHECK_FUNCS([gettimeofday]) - AC_CHECK_FUNCS([sscanf]) - AC_CHECK_FUNCS([vsscanf]) - AC_CHECK_FUNCS([vsprintf]) - AC_CHECK_FUNCS([vasprintf]) - AC_CHECK_FUNCS([vsnprintf],[],[ - AC_CHECK_FUNC([_vsnprintf],[ - AC_DEFINE(vsnprintf,_vsnprintf,[define if the vsnprintf function is mangled]) - AC_DEFINE(HAVE_VSNPRINTF,1) - ]) - ]) + ETL_PROFILE(ETL/etl_profile.h) + + # Common mandatory + AC_CHECK_HEADERS(sys/time.h, [], + AC_MSG_ERROR([sys/time.h is needed])) + AC_CHECK_HEADERS(unistd.h, [], + AC_MSG_ERROR([unistd.h is needed])) + + # Mandatory on Windows + if echo $host |grep -q win; then + AC_CHECK_LIB(user32, main, + AC_MSG_ERROR([user32 is needed])) + AC_CHECK_LIB(kernel32, main, + AC_MSG_ERROR([kernel32 is needed])) + AC_CHECK_HEADERS(windows.h, + AC_MSG_ERROR([windows.h is needed])) + AC_CHECK_FUNCS([QueryPerformanceCounter], + AC_MSG_ERROR([QueryPerformanceCounter is needed])) + fi + + # Optional + ETL_CHECK_HEADER(sched.h) + ETL_CHECK_HEADER(pthread.h) + ETL_CHECK_LIB(pthread, main) + ETL_CHECK_FUNC([pthread_create]) + ETL_CHECK_FUNC([pthread_rwlock_init]) + ETL_CHECK_FUNC([CreateThread]) + ETL_CHECK_FUNC([gettimeofday]) + ETL_CHECK_FUNC([sscanf]) + ETL_CHECK_FUNC([vsscanf]) + ETL_CHECK_FUNC([vasprintf]) + ETL_CHECK_FUNC([vsnprintf]) + ETL_CHECK_FUNC([_vsnprintf]) ]) AC_DEFUN([USING_ETL], diff -urp ETL-0.04.12.orig/Makefile.am ETL-0.04.12/Makefile.am --- ETL-0.04.12.orig/Makefile.am 2008-02-03 02:38:12.000000000 +0100 +++ ETL-0.04.12/Makefile.am 2009-01-09 16:00:42.000000000 +0100 @@ -1,6 +1,6 @@ # $Id: Makefile.am 1558 2008-02-03 01:38:12Z pabs $ -MAINTAINERCLEANFILES=COPYING INSTALL config/config.guess config/config.sub config/ltmain.sh config/install-sh config/mkinstalldirs config/aclocal.m4 config/missing config/texinfo.tex config/depcomp aclocal.m4 config.h.in configure stamp-h.in Makefile.in config.log config.status .doc_stamp .DS_Store include/etl_profile.h.in doxygen.cfg +MAINTAINERCLEANFILES=COPYING INSTALL config/config.guess config/config.sub config/ltmain.sh config/install-sh config/mkinstalldirs config/aclocal.m4 config/missing config/texinfo.tex config/depcomp aclocal.m4 config.h.in configure stamp-h.in Makefile.in config.log config.status .doc_stamp .DS_Store doxygen.cfg SUBDIRS=ETL test @@ -14,7 +14,7 @@ aclocaldir = $(prefix)/share/aclocal ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST=COPYING m4/subs.m4 config/depcomp m4/cxx_macros.m4 ETL.pbproj/project.pbxproj ETL.pbproj/etl_profile.h ETL.pbproj/frameworkfix.cpp ETL-config.in m4/ETL.m4 doxygen.cfg.in doxygen.cfg ETL.pc.in +EXTRA_DIST=COPYING m4/subs.m4 config/depcomp m4/cxx_macros.m4 ETL.pbproj/project.pbxproj ETL.pbproj/frameworkfix.cpp ETL-config.in m4/ETL.m4 doxygen.cfg.in doxygen.cfg ETL.pc.in CVS=cvs SVN=svn --- NEW FILE ETL.spec --- %define debug_package %{nil} Name: ETL Version: 0.04.12 Release: 1%{?dist} Summary: Extended Template Library Group: Development/Libraries License: GPLv2+ URL: http://synfig.org Source0: http://downloads.sourceforge.net/synfig/ETL-%{version}.tar.gz Patch0: ETL-0.04.12-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: doxygen Buildrequires: autoconf automake Requires: pkgconfig %description Voria ETL is a multi-platform class and template library designed to add new datatypes and functions which combine well with the existing types and functions from the C++ Standard Template Library (STL). %package devel Summary: Development files for %{name} Group: Development/Libraries %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q %patch0 -p1 -b .build autoreconf %build %configure make %{?_smp_mflags} all docs %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" touch -r ChangeLog $RPM_BUILD_ROOT%{_bindir}/ETL-config touch -r ChangeLog $RPM_BUILD_ROOT%{_includedir}/ETL/etl_profile.h %clean rm -rf $RPM_BUILD_ROOT %check make check %files devel %defattr(-,root,root,-) %doc README COPYING AUTHORS NEWS %{_includedir}/ETL/ %{_bindir}/ETL-config %{_libdir}/pkgconfig/ETL.pc %changelog * Fri Jan 9 2009 Lubomir Rintel 0.04.12-1 - New upstream release - Run regression tests - Build documentation - Fix BRs * Tue May 6 2008 Marc Wiriadisastra - 0.4.11-4 - Removed some requires and buildrequires to clean stuff up. * Thu May 1 2008 Marc Wiriadisastra - 0.4.11-3 - Added the lines for timestamp consistency * Fri Mar 7 2008 Marc Wiriadisastra - 0.4.11-2 - Added patch to clean up etl-profile_.in - renamed package to ETL as requested by ralf * Thu Mar 6 2008 Marc Wiriadisastra - 0.4.11-1 - Removed patches - New version * Sun Feb 3 2008 Marc Wiriadisastra - 0.04-10-3 - Added backported patch adding * Thu Jan 24 2008 Marc Wiriadisastra - 0.04-10-2 - Included Ralfs patch for ETL-config * Sat Jan 12 2008 Marc Wiriadisastra - 0.04.10-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ETL/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Feb 2009 00:27:13 -0000 1.1 +++ .cvsignore 1 Mar 2009 10:44:40 -0000 1.2 @@ -0,0 +1 @@ +ETL-0.04.12.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ETL/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Feb 2009 00:27:13 -0000 1.1 +++ sources 1 Mar 2009 10:44:40 -0000 1.2 @@ -0,0 +1 @@ +4cd7fb673fa5c77cfa1986aeecdb3ffe ETL-0.04.12.tar.gz From lkundrak at fedoraproject.org Sun Mar 1 10:45:11 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Mar 2009 10:45:11 +0000 (UTC) Subject: rpms/ETL/devel ETL-0.04.12-build.patch, NONE, 1.1 ETL.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301104511.9CB8E70115@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/ETL/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10144/devel Modified Files: .cvsignore sources Added Files: ETL-0.04.12-build.patch ETL.spec Log Message: Import ETL ETL-0.04.12-build.patch: --- NEW FILE ETL-0.04.12-build.patch --- Upstream review: http://patches.synfig.org/r/12/ * Replace autoconf-generated etl_profile.h with custom one - Do not use the HAVE_* autoconf macros so that we don't conflict - Include only necessary defines * Abort if mandatory checks don't pass * Do not redefine v*printf Lubomir Rintel diff -urp ETL-0.04.12.orig/configure.ac ETL-0.04.12/configure.ac --- ETL-0.04.12.orig/configure.ac 2008-10-17 17:21:58.000000000 +0200 +++ ETL-0.04.12/configure.ac 2009-01-09 16:00:42.000000000 +0100 @@ -6,7 +6,7 @@ AC_INIT([Extended Template Library],[0.0 AC_REVISION AC_CONFIG_AUX_DIR(config) -AC_CONFIG_HEADERS([ETL/etl_profile_.h]) +AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -44,27 +44,14 @@ AC_WIN32_QUIRKS # -- H E A D E R S -------------------------------------------- AH_TOP([ -// We want to be autoconf/autoheader friendly, so -// if the developer has already included an -// autoheader-generated configuration script, -// we can assume that the user knew what they -// were doing and let them use their own config.h. -//#ifndef PACKAGE_TARNAME +// This is not used anywhere ]) -AH_BOTTOM([ -//#endif // ifndef PACKAGE_TARNAME -]) - - # -- T Y P E S & S T R U C T S -------------------------------- # -- F U N C T I O N S ---------------------------------------- ETL_DEPS -AC_CHECK_FUNCS([fork]) -AC_CHECK_FUNCS([kill]) -AC_CHECK_FUNCS([pipe]) # -- O U T P U T ---------------------------------------------- diff -urp ETL-0.04.12.orig/ETL/clock ETL-0.04.12/ETL/clock --- ETL-0.04.12.orig/ETL/clock 2007-10-30 11:53:52.000000000 +0100 +++ ETL-0.04.12/ETL/clock 2009-01-09 16:00:42.000000000 +0100 @@ -29,7 +29,7 @@ #include "etl_config.h" -#ifdef HAVE_GETTIMEOFDAY +#ifdef ETL_HAS_GETTIMEOFDAY #include "_clock_gettimeofday.h" #ifndef ETL_CLOCK_DEFAULT_DESC_CLASS #define ETL_CLOCK_DEFAULT_DESC_CLASS _ETL::clock_desc_gettimeofday diff -urp ETL-0.04.12.orig/ETL/Makefile.am ETL-0.04.12/ETL/Makefile.am --- ETL-0.04.12.orig/ETL/Makefile.am 2008-02-23 12:09:53.000000000 +0100 +++ ETL-0.04.12/ETL/Makefile.am 2009-01-09 16:00:42.000000000 +0100 @@ -2,14 +2,11 @@ MAINTAINERCLEANFILES=Makefile.in -CLEANFILES=$(top_builddir)/ETL/etl_profile.h +DISTCLEANFILES=$(top_builddir)/ETL/etl_profile.h etldir = $(includedir)/ETL etl_HEADERS= value _value.h rect _rect.h misc _misc.h ref_count _ref_count.h angle fastangle handle ipc thread fixed random clock hermite calculus stringf trivial spline _stringf.h _bspline.h _calculus.h _mutex_null.h _hermite.h _curve_func.h _clock_base.h _clock_system.h _clock_gettimeofday.h _random.h _angle.h _fastangle.h _curve.h _handle.h _thread.h _mutex_pthreads.h _mutex_win32.h _condition.h _rwlock.h smach _smach.h _trivial.h _fixed.h etl_config.h $(top_builddir)/ETL/etl_profile.h _fastangle_tables.h bezier _bezier.h _bezier_angle.h _status.h status pen _pen.h boxblur _boxblur.h gaussian _gaussian.h surface _surface.h smart_ptr _smart_ptr.h _clock_win32hpcount.h mutex _mutex_pthreads_simple.h -$(top_builddir)/ETL/etl_profile.h:$(top_builddir)/ETL/etl_profile_.h - sed "s/PACKAGE/ETL/g;" < $(top_builddir)/ETL/etl_profile_.h > $(top_builddir)/ETL/etl_profile.h - # FIXME: figure out why this is in SVN, but isn't installed EXTRA_DIST=_bit_rotate.h diff -urp ETL-0.04.12.orig/ETL/mutex ETL-0.04.12/ETL/mutex --- ETL-0.04.12.orig/ETL/mutex 2008-02-23 12:09:53.000000000 +0100 +++ ETL-0.04.12/ETL/mutex 2009-01-09 16:00:42.000000000 +0100 @@ -29,7 +29,7 @@ #include "etl_config.h" -#ifdef HAVE_LIBPTHREAD +#ifdef ETL_HAS_LIBPTHREAD # include "_mutex_pthreads_simple.h" #else #ifdef _WIN32 diff -urp ETL-0.04.12.orig/ETL/_mutex_pthreads.h ETL-0.04.12/ETL/_mutex_pthreads.h --- ETL-0.04.12.orig/ETL/_mutex_pthreads.h 2007-03-16 01:37:48.000000000 +0100 +++ ETL-0.04.12/ETL/_mutex_pthreads.h 2009-01-09 16:00:42.000000000 +0100 @@ -33,7 +33,7 @@ #include -#ifdef HAVE_SCHED_H +#ifdef ETL_HAS_SCHED_H # include #endif diff -urp ETL-0.04.12.orig/ETL/_stringf.h ETL-0.04.12/ETL/_stringf.h --- ETL-0.04.12.orig/ETL/_stringf.h 2008-01-25 13:23:29.000000000 +0100 +++ ETL-0.04.12/ETL/_stringf.h 2009-01-09 16:00:42.000000000 +0100 @@ -48,6 +48,13 @@ #define POPEN_BINARY_WRITE_TYPE "w" #endif +#ifdef ETL_HAS__VSNPRINTF +#ifndef ETL_HAS_VSNPRINTF +#define vnsprintf _vnsprintf +#define ETL_HAS_VSNPRINTF 1 +#endif +#endif + /* === T Y P E D E F S ===================================================== */ _ETL_BEGIN_CDECLS @@ -58,24 +65,39 @@ _ETL_BEGIN_CDECLS #define ETL_NO_THROW throw() #endif -#ifdef HAVE_VASPRINTF // This is the preferred method +#ifdef __GLIBC__ +// We prefer prototypes from GLIBC, since defining them ourselves +// works around its security mechanisms +#define _GNU_SOURCE +#include +#endif + +#ifdef ETL_HAS_VASPRINTF // This is the preferred method +#ifndef __GLIBC__ extern int vasprintf(char **,const char *,va_list)ETL_NO_THROW; +#endif #else -# ifdef HAVE_VSNPRINTF // This is the secondary method +# ifdef ETL_HAS_VSNPRINTF // This is the secondary method +#ifndef __GLIBC__ extern int vsnprintf(char *,size_t,const char*,va_list)ETL_NO_THROW; +#endif # endif #endif -#ifdef HAVE_VSSCANF +#ifdef ETL_HAS_VSSCANF +#ifndef __GLIBC__ extern int vsscanf(const char *,const char *,va_list)ETL_NO_THROW; +#endif #else #define ETL_NO_VSTRSCANF -#ifdef HAVE_SSCANF +#ifdef ETL_HAS_SSCANF +#ifndef __GLIBC__ extern int sscanf(const char *buf, const char *format, ...)ETL_NO_THROW; #endif #endif +#endif #include @@ -88,7 +110,7 @@ _ETL_BEGIN_NAMESPACE inline std::string vstrprintf(const char *format, va_list args) { -#ifdef HAVE_VASPRINTF // This is the preferred method (and safest) +#ifdef ETL_HAS_VASPRINTF // This is the preferred method (and safest) char *buffer; std::string ret; vasprintf(&buffer,format,args); @@ -96,7 +118,7 @@ vstrprintf(const char *format, va_list a free(buffer); return ret; #else -#ifdef HAVE_VSNPRINTF // This is the secondary method (Safe, but bulky) +#ifdef ETL_HAS_VSNPRINTF // This is the secondary method (Safe, but bulky) #warning etl::vstrprintf() has a maximum size of ETL_STRPRINTF_MAX_LENGTH in this configuration. #ifdef ETL_THREAD_SAFE char buffer[ETL_STRPRINTF_MAX_LENGTH]; @@ -145,7 +167,7 @@ strscanf(const std::string &data, const } #else -#if defined (HAVE_SSCANF) && defined (__GNUC__) +#if defined (ETL_HAS_SSCANF) && defined (__GNUC__) #define strscanf(data,format,...) sscanf(data.c_str(),format,__VA_ARGS__) #endif #endif diff -urp ETL-0.04.12.orig/ETL/_thread.h ETL-0.04.12/ETL/_thread.h --- ETL-0.04.12.orig/ETL/_thread.h 2007-03-16 01:37:48.000000000 +0100 +++ ETL-0.04.12/ETL/_thread.h 2009-01-09 16:00:42.000000000 +0100 @@ -31,21 +31,21 @@ #define __USE_GNU -#ifdef HAVE_PTHREAD_H +#ifdef ETL_HAS_PTHREAD_H # include #endif -#ifdef HAVE_SCHED_H +#ifdef ETL_HAS_SCHED_H # include #endif -#ifdef HAVE_CREATETHREAD +#ifdef ETL_HAS_CREATETHREAD # include #endif /* === M A C R O S ========================================================= */ -#if ( defined (HAVE_PTHREAD_CREATE) || defined (HAVE_CLONE) || defined (HAVE_CREATETHREAD) ) && !defined (NO_THREADS) +#if ( defined (ETL_HAS_PTHREAD_CREATE) || defined (ETL_HAS_CLONE) || defined (ETL_HAS_CREATETHREAD) ) && !defined (NO_THREADS) # define CALLISTO_THREADS #endif @@ -53,7 +53,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -#if defined(CALLISTO_THREADS) && defined(HAVE_PTHREAD_CREATE) +#if defined(CALLISTO_THREADS) && defined(ETL_HAS_PTHREAD_CREATE) static inline void Yield(void) { sched_yield(); @@ -68,7 +68,7 @@ inline void Yield(void) { } #ifdef CALLISTO_THREADS -#ifdef HAVE_PTHREAD_CREATE +#ifdef ETL_HAS_PTHREAD_CREATE class Thread { @@ -207,7 +207,7 @@ public: } }; -#ifdef HAVE_PTHREAD_RW_LOCK_INIT +#ifdef ETL_HAS_PTHREAD_RW_LOCK_INIT class ReadWriteLock { pthread_rwlock_t rwlock; @@ -290,8 +290,8 @@ public: }; */ -#else // if defined HAVE_PTHREAD -#ifdef HAVE_CREATETHREAD +#else // if defined ETL_HAS_PTHREAD +#ifdef ETL_HAS_CREATETHREAD #ifdef THREAD_ENTRYPOINT @@ -448,8 +448,8 @@ public: }; -#endif // if defined HAVE_CREATETHREAD -#endif // if defined HAVE_PTHREAD_CREATE +#endif // if defined ETL_HAS_CREATETHREAD +#endif // if defined ETL_HAS_PTHREAD_CREATE #endif // if defined CALLISTO_THREADS diff -urp ETL-0.04.12.orig/m4/ETL.m4 ETL-0.04.12/m4/ETL.m4 --- ETL-0.04.12.orig/m4/ETL.m4 2007-11-07 12:05:28.000000000 +0100 +++ ETL-0.04.12/m4/ETL.m4 2009-01-09 16:00:42.000000000 +0100 @@ -3,43 +3,71 @@ # $Id: ETL.m4 1115 2007-11-07 11:05:28Z pabs $ # # By Robert B. Quattlebaum Jr. +# Errors are Lubomir Rintel's fault # +AC_DEFUN([ETL_PROFILE], [ + etl_profile=$1 + echo "/* Configuration profile of ETL */" >$etl_profile +]) + +AC_DEFUN([ETL_CHECK_HEADER], [ + etl_header_name=AS_TR_CPP($1) + AC_CHECK_HEADER($1, + [echo "#define ETL_HAS_$etl_header_name 1" >> $etl_profile], + [echo "/* #undef ETL_HAS_$etl_header_name */" >> $etl_profile]) +]) + +AC_DEFUN([ETL_CHECK_FUNC], [ + etl_func_name=AS_TR_CPP($1) + AC_CHECK_FUNC($1, + [echo "#define ETL_HAS_$etl_func_name 1" >> $etl_profile], + [echo "/* #undef ETL_HAS_$etl_func_name */" >> $etl_profile]) +]) + +AC_DEFUN([ETL_CHECK_LIB], [ + etl_lib_name=AS_TR_CPP($1) + AC_CHECK_LIB($1, $2, + [echo "#define ETL_HAS_LIB$etl_lib_name 1" >> $etl_profile + LIBS="$LIBS -l$1"], + [echo "/* #undef ETL_HAS_LIB$etl_lib_name */" >> $etl_profile]) +]) + AC_DEFUN([ETL_DEPS], [ - AC_C_BIGENDIAN - - AC_CHECK_LIB(user32, main) - AC_CHECK_LIB(kernel32, main) - AC_CHECK_LIB(pthread, main) - - AC_HEADER_STDC - - AC_CHECK_HEADERS(pthread.h) - AC_CHECK_HEADERS(sched.h) - AC_CHECK_HEADERS(sys/times.h) - AC_CHECK_HEADERS(sys/time.h) - AC_CHECK_HEADERS(unistd.h) - AC_CHECK_HEADERS(windows.h) - AC_CHECK_FUNCS([pthread_create]) - AC_CHECK_FUNCS([pthread_rwlock_init]) - AC_CHECK_FUNCS([pthread_yield]) - AC_CHECK_FUNCS([sched_yield]) - AC_CHECK_FUNCS([CreateThread]) - AC_CHECK_FUNCS([__clone]) - AC_CHECK_FUNCS([QueryPerformanceCounter]) - - AC_CHECK_FUNCS([gettimeofday]) - AC_CHECK_FUNCS([sscanf]) - AC_CHECK_FUNCS([vsscanf]) - AC_CHECK_FUNCS([vsprintf]) - AC_CHECK_FUNCS([vasprintf]) - AC_CHECK_FUNCS([vsnprintf],[],[ - AC_CHECK_FUNC([_vsnprintf],[ - AC_DEFINE(vsnprintf,_vsnprintf,[define if the vsnprintf function is mangled]) - AC_DEFINE(HAVE_VSNPRINTF,1) - ]) - ]) + ETL_PROFILE(ETL/etl_profile.h) + + # Common mandatory + AC_CHECK_HEADERS(sys/time.h, [], + AC_MSG_ERROR([sys/time.h is needed])) + AC_CHECK_HEADERS(unistd.h, [], + AC_MSG_ERROR([unistd.h is needed])) + + # Mandatory on Windows + if echo $host |grep -q win; then + AC_CHECK_LIB(user32, main, + AC_MSG_ERROR([user32 is needed])) + AC_CHECK_LIB(kernel32, main, + AC_MSG_ERROR([kernel32 is needed])) + AC_CHECK_HEADERS(windows.h, + AC_MSG_ERROR([windows.h is needed])) + AC_CHECK_FUNCS([QueryPerformanceCounter], + AC_MSG_ERROR([QueryPerformanceCounter is needed])) + fi + + # Optional + ETL_CHECK_HEADER(sched.h) + ETL_CHECK_HEADER(pthread.h) + ETL_CHECK_LIB(pthread, main) + ETL_CHECK_FUNC([pthread_create]) + ETL_CHECK_FUNC([pthread_rwlock_init]) + ETL_CHECK_FUNC([CreateThread]) + ETL_CHECK_FUNC([gettimeofday]) + ETL_CHECK_FUNC([sscanf]) + ETL_CHECK_FUNC([vsscanf]) + ETL_CHECK_FUNC([vasprintf]) + ETL_CHECK_FUNC([vsnprintf]) + ETL_CHECK_FUNC([_vsnprintf]) ]) AC_DEFUN([USING_ETL], diff -urp ETL-0.04.12.orig/Makefile.am ETL-0.04.12/Makefile.am --- ETL-0.04.12.orig/Makefile.am 2008-02-03 02:38:12.000000000 +0100 +++ ETL-0.04.12/Makefile.am 2009-01-09 16:00:42.000000000 +0100 @@ -1,6 +1,6 @@ # $Id: Makefile.am 1558 2008-02-03 01:38:12Z pabs $ -MAINTAINERCLEANFILES=COPYING INSTALL config/config.guess config/config.sub config/ltmain.sh config/install-sh config/mkinstalldirs config/aclocal.m4 config/missing config/texinfo.tex config/depcomp aclocal.m4 config.h.in configure stamp-h.in Makefile.in config.log config.status .doc_stamp .DS_Store include/etl_profile.h.in doxygen.cfg +MAINTAINERCLEANFILES=COPYING INSTALL config/config.guess config/config.sub config/ltmain.sh config/install-sh config/mkinstalldirs config/aclocal.m4 config/missing config/texinfo.tex config/depcomp aclocal.m4 config.h.in configure stamp-h.in Makefile.in config.log config.status .doc_stamp .DS_Store doxygen.cfg SUBDIRS=ETL test @@ -14,7 +14,7 @@ aclocaldir = $(prefix)/share/aclocal ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST=COPYING m4/subs.m4 config/depcomp m4/cxx_macros.m4 ETL.pbproj/project.pbxproj ETL.pbproj/etl_profile.h ETL.pbproj/frameworkfix.cpp ETL-config.in m4/ETL.m4 doxygen.cfg.in doxygen.cfg ETL.pc.in +EXTRA_DIST=COPYING m4/subs.m4 config/depcomp m4/cxx_macros.m4 ETL.pbproj/project.pbxproj ETL.pbproj/frameworkfix.cpp ETL-config.in m4/ETL.m4 doxygen.cfg.in doxygen.cfg ETL.pc.in CVS=cvs SVN=svn --- NEW FILE ETL.spec --- %define debug_package %{nil} Name: ETL Version: 0.04.12 Release: 1%{?dist} Summary: Extended Template Library Group: Development/Libraries License: GPLv2+ URL: http://synfig.org Source0: http://downloads.sourceforge.net/synfig/ETL-%{version}.tar.gz Patch0: ETL-0.04.12-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: doxygen Buildrequires: autoconf automake Requires: pkgconfig %description Voria ETL is a multi-platform class and template library designed to add new datatypes and functions which combine well with the existing types and functions from the C++ Standard Template Library (STL). %package devel Summary: Development files for %{name} Group: Development/Libraries %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q %patch0 -p1 -b .build autoreconf %build %configure make %{?_smp_mflags} all docs %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" touch -r ChangeLog $RPM_BUILD_ROOT%{_bindir}/ETL-config touch -r ChangeLog $RPM_BUILD_ROOT%{_includedir}/ETL/etl_profile.h %clean rm -rf $RPM_BUILD_ROOT %check make check %files devel %defattr(-,root,root,-) %doc README COPYING AUTHORS NEWS %{_includedir}/ETL/ %{_bindir}/ETL-config %{_libdir}/pkgconfig/ETL.pc %changelog * Fri Jan 9 2009 Lubomir Rintel 0.04.12-1 - New upstream release - Run regression tests - Build documentation - Fix BRs * Tue May 6 2008 Marc Wiriadisastra - 0.4.11-4 - Removed some requires and buildrequires to clean stuff up. * Thu May 1 2008 Marc Wiriadisastra - 0.4.11-3 - Added the lines for timestamp consistency * Fri Mar 7 2008 Marc Wiriadisastra - 0.4.11-2 - Added patch to clean up etl-profile_.in - renamed package to ETL as requested by ralf * Thu Mar 6 2008 Marc Wiriadisastra - 0.4.11-1 - Removed patches - New version * Sun Feb 3 2008 Marc Wiriadisastra - 0.04-10-3 - Added backported patch adding * Thu Jan 24 2008 Marc Wiriadisastra - 0.04-10-2 - Included Ralfs patch for ETL-config * Sat Jan 12 2008 Marc Wiriadisastra - 0.04.10-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ETL/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Feb 2009 00:27:13 -0000 1.1 +++ .cvsignore 1 Mar 2009 10:44:41 -0000 1.2 @@ -0,0 +1 @@ +ETL-0.04.12.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ETL/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Feb 2009 00:27:13 -0000 1.1 +++ sources 1 Mar 2009 10:44:41 -0000 1.2 @@ -0,0 +1 @@ +4cd7fb673fa5c77cfa1986aeecdb3ffe ETL-0.04.12.tar.gz From terjeros at fedoraproject.org Sun Mar 1 10:48:45 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Sun, 1 Mar 2009 10:48:45 +0000 (UTC) Subject: rpms/lshw/F-9 .cvsignore, 1.4, 1.5 lshw.spec, 1.8, 1.9 sources, 1.4, 1.5 lshw-B.02.13-gcc43.patch, 1.1, NONE Message-ID: <20090301104845.4399470116@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/lshw/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11039/F-9 Modified Files: .cvsignore lshw.spec sources Removed Files: lshw-B.02.13-gcc43.patch Log Message: Sync with rawhide. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lshw/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Aug 2008 20:01:53 -0000 1.4 +++ .cvsignore 1 Mar 2009 10:48:14 -0000 1.5 @@ -1 +1 @@ -lshw-B.02.13.tar.gz +lshw-B.02.14.tar.gz Index: lshw.spec =================================================================== RCS file: /cvs/extras/rpms/lshw/F-9/lshw.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- lshw.spec 13 Aug 2008 20:06:01 -0000 1.8 +++ lshw.spec 1 Mar 2009 10:48:14 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Hardware lister Name: lshw -Version: B.02.13 -Release: 3%{?dist} +Version: B.02.14 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://ezix.org/project/wiki/HardwareLiSter @@ -9,7 +9,6 @@ Source1: lshw.desktop Source2: lshw.consolehelper Source3: lshw.pam -Patch0: lshw-B.02.13-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -36,7 +35,6 @@ %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %{__sed} -i 's|-g -Wall -g|%{optflags}|' src/Makefile %{__sed} -i 's|-g -Wall -Os|%{optflags}|' src/core/Makefile @@ -108,6 +106,13 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Sun Mar 1 2009 Terje Rosten - B.02.14-1 +- B.02.14 +- Drop gcc43 patch now upstream + +* Wed Feb 25 2009 Fedora Release Engineering - B.02.13-4 +- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Aug 13 2008 Terje Rosten - B.02.13-3 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/lshw/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Aug 2008 20:01:53 -0000 1.4 +++ sources 1 Mar 2009 10:48:14 -0000 1.5 @@ -1 +1 @@ -e94c728ed037ca706436b5ef71aa392d lshw-B.02.13.tar.gz +8bed55768c5cb2ceff062b882a687e9b lshw-B.02.14.tar.gz --- lshw-B.02.13-gcc43.patch DELETED --- From terjeros at fedoraproject.org Sun Mar 1 10:48:44 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Sun, 1 Mar 2009 10:48:44 +0000 (UTC) Subject: rpms/lshw/F-10 .cvsignore, 1.4, 1.5 lshw.spec, 1.10, 1.11 sources, 1.4, 1.5 lshw-B.02.13-gcc43.patch, 1.1, NONE Message-ID: <20090301104844.D192070115@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/lshw/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11039/F-10 Modified Files: .cvsignore lshw.spec sources Removed Files: lshw-B.02.13-gcc43.patch Log Message: Sync with rawhide. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lshw/F-10/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Aug 2008 18:15:31 -0000 1.4 +++ .cvsignore 1 Mar 2009 10:48:14 -0000 1.5 @@ -1 +1 @@ -lshw-B.02.13.tar.gz +lshw-B.02.14.tar.gz Index: lshw.spec =================================================================== RCS file: /cvs/extras/rpms/lshw/F-10/lshw.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- lshw.spec 13 Aug 2008 20:06:02 -0000 1.10 +++ lshw.spec 1 Mar 2009 10:48:14 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Hardware lister Name: lshw -Version: B.02.13 -Release: 3%{?dist} +Version: B.02.14 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://ezix.org/project/wiki/HardwareLiSter @@ -9,7 +9,6 @@ Source1: lshw.desktop Source2: lshw.consolehelper Source3: lshw.pam -Patch0: lshw-B.02.13-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -36,7 +35,6 @@ %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %{__sed} -i 's|-g -Wall -g|%{optflags}|' src/Makefile %{__sed} -i 's|-g -Wall -Os|%{optflags}|' src/core/Makefile @@ -108,6 +106,13 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Sun Mar 1 2009 Terje Rosten - B.02.14-1 +- B.02.14 +- Drop gcc43 patch now upstream + +* Wed Feb 25 2009 Fedora Release Engineering - B.02.13-4 +- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Aug 13 2008 Terje Rosten - B.02.13-3 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/lshw/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Aug 2008 18:15:32 -0000 1.4 +++ sources 1 Mar 2009 10:48:14 -0000 1.5 @@ -1 +1 @@ -e94c728ed037ca706436b5ef71aa392d lshw-B.02.13.tar.gz +8bed55768c5cb2ceff062b882a687e9b lshw-B.02.14.tar.gz --- lshw-B.02.13-gcc43.patch DELETED --- From caolanm at fedoraproject.org Sun Mar 1 10:49:06 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sun, 1 Mar 2009 10:49:06 +0000 (UTC) Subject: rpms/ularn/devel ularn-build.patch,1.1,1.2 ularn.spec,1.11,1.12 Message-ID: <20090301104906.CFC2C70115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/ularn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11200 Modified Files: ularn-build.patch ularn.spec Log Message: . config.h.SH -> . ./config.h.SH for new bash ularn-build.patch: Index: ularn-build.patch =================================================================== RCS file: /cvs/pkgs/rpms/ularn/devel/ularn-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ularn-build.patch 17 Mar 2006 18:12:24 -0000 1.1 +++ ularn-build.patch 1 Mar 2009 10:48:36 -0000 1.2 @@ -128,6 +128,15 @@ diff -Naur Ularn/Makefile.u.SH Ularn.new/Makefile.u.SH --- Ularn/Makefile.u.SH 2001-11-16 10:18:27.000000000 -0800 +++ Ularn.new/Makefile.u.SH 2006-02-25 17:20:26.000000000 -0800 +@@ -6,7 +6,7 @@ + ln ../../../config.sh . || \ + (echo "Can't find config.sh."; exit 1) + fi +- . config.sh ++ . ./config.sh + ;; + esac + : This forces SH files to create target in same directory as SH file. @@ -97,12 +97,12 @@ ########################################################################## Index: ularn.spec =================================================================== RCS file: /cvs/pkgs/rpms/ularn/devel/ularn.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ularn.spec 25 Feb 2009 22:44:29 -0000 1.11 +++ ularn.spec 1 Mar 2009 10:48:36 -0000 1.12 @@ -1,6 +1,6 @@ Name: ularn Version: 1.5p4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Simple roguelike game Group: Amusements/Games @@ -47,7 +47,7 @@ # Keep track of where we are. Some of the configuration scripts change # the current working directory. builddir=`pwd` -. config.h.SH +. ./config.h.SH ${builddir}/Makefile.u.SH cd ${builddir} mv Makefile.u Makefile @@ -93,6 +93,9 @@ %changelog +* Sun Mar 01 2009 Caol??n McNamara - 1.5p4-14 +- . config.h.SH -> . ./config.h.SH for new bash + * Wed Feb 25 2009 Fedora Release Engineering - 1.5p4-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From lkundrak at fedoraproject.org Sun Mar 1 11:12:03 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Mar 2009 11:12:03 +0000 (UTC) Subject: rpms/kBuild/devel kBuild.spec,1.4,1.5 Message-ID: <20090301111203.35D4470115@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/kBuild/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15842 Modified Files: kBuild.spec Log Message: * Sun Mar 1 2009 Lubomir Rintel - 0.1.5-3 - Fix up BRs Index: kBuild.spec =================================================================== RCS file: /cvs/pkgs/rpms/kBuild/devel/kBuild.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kBuild.spec 25 Feb 2009 10:04:21 -0000 1.4 +++ kBuild.spec 1 Mar 2009 11:11:30 -0000 1.5 @@ -1,6 +1,6 @@ Name: kBuild Version: 0.1.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A cross-platform build enviroment Group: Development/Tools @@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: byacc libacl-devel flex -BuildRequires: autoconf automake gettext-devel +BuildRequires: autoconf automake gettext-devel cvs %description @@ -73,6 +73,9 @@ %changelog +* Sun Mar 1 2009 Lubomir Rintel - 0.1.5-3 +- Fix up BRs + * Wed Feb 25 2009 Fedora Release Engineering - 0.1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From hedayat at fedoraproject.org Sun Mar 1 11:18:43 2009 From: hedayat at fedoraproject.org (Hedayat Vatankhah) Date: Sun, 1 Mar 2009 11:18:43 +0000 (UTC) Subject: rpms/rcsslogplayer/devel rcsslogplayer.spec,1.7,1.8 Message-ID: <20090301111843.9552670115@cvs1.fedora.phx.redhat.com> Author: hedayat Update of /cvs/pkgs/rpms/rcsslogplayer/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17086 Modified Files: rcsslogplayer.spec Log Message: Added patch for gcc4.4 Index: rcsslogplayer.spec =================================================================== RCS file: /cvs/pkgs/rpms/rcsslogplayer/devel/rcsslogplayer.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rcsslogplayer.spec 25 Feb 2009 19:00:24 -0000 1.7 +++ rcsslogplayer.spec 1 Mar 2009 11:18:12 -0000 1.8 @@ -1,6 +1,6 @@ Name: rcsslogplayer Version: 13.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: RoboCup Soccer Simulator LogPlayer Group: Applications/System @@ -11,6 +11,7 @@ Source0: http://downloads.sourceforge.net/sserver/%{name}-%{version}.tar.gz # Source 1 is created by me. Source1: %{name}.desktop +Patch0: %{name}-13.1.0-gcc4_4fix.patch Requires: rcssmonitor @@ -37,6 +38,7 @@ %prep %setup -q +%patch0 -p1 -b .gcc4_4fix sed -i.lib \ -e 's|\$ac_boost_path/lib|\$libdir|' \ -e 's|$ac_boost_path_tmp/lib|\$libdir|' \ @@ -83,6 +85,9 @@ %{_libdir}/*.so %changelog +* Sun Mar 01 2009 Hedayat Vatankhah 13.1.0-4 +- Added patch for gcc4.4 compatibility + * Wed Feb 25 2009 Fedora Release Engineering - 13.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From hedayat at fedoraproject.org Sun Mar 1 11:20:47 2009 From: hedayat at fedoraproject.org (Hedayat Vatankhah) Date: Sun, 1 Mar 2009 11:20:47 +0000 (UTC) Subject: rpms/rcsslogplayer/devel rcsslogplayer-13.1.0-gcc4_4fix.patch, NONE, 1.1 Message-ID: <20090301112047.1BC4070115@cvs1.fedora.phx.redhat.com> Author: hedayat Update of /cvs/pkgs/rpms/rcsslogplayer/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17685 Added Files: rcsslogplayer-13.1.0-gcc4_4fix.patch Log Message: Added patch for gcc4.4 rcsslogplayer-13.1.0-gcc4_4fix.patch: --- NEW FILE rcsslogplayer-13.1.0-gcc4_4fix.patch --- diff -up rcsslogplayer-13.1.0/qt4/disp_holder.cpp.gcc4_4fix rcsslogplayer-13.1.0/qt4/disp_holder.cpp --- rcsslogplayer-13.1.0/qt4/disp_holder.cpp.gcc4_4fix 2009-03-01 13:59:32.000000000 +0330 +++ rcsslogplayer-13.1.0/qt4/disp_holder.cpp 2009-03-01 14:31:53.000000000 +0330 @@ -42,6 +42,7 @@ #include #include #include +#include #ifdef HAVE_NETINET_IN_H #include diff -up rcsslogplayer-13.1.0/qt4/monitor_server.cpp.gcc4_4fix rcsslogplayer-13.1.0/qt4/monitor_server.cpp --- rcsslogplayer-13.1.0/qt4/monitor_server.cpp.gcc4_4fix 2008-11-03 09:42:59.000000000 +0330 +++ rcsslogplayer-13.1.0/qt4/monitor_server.cpp 2009-03-01 14:11:35.000000000 +0330 @@ -48,6 +48,7 @@ #include #include #include +#include #ifdef HAVE_NETINET_IN_H #include diff -up rcsslogplayer-13.1.0/qt4/team_graphic.cpp.gcc4_4fix rcsslogplayer-13.1.0/qt4/team_graphic.cpp --- rcsslogplayer-13.1.0/qt4/team_graphic.cpp.gcc4_4fix 2009-03-01 14:11:47.000000000 +0330 +++ rcsslogplayer-13.1.0/qt4/team_graphic.cpp 2009-03-01 14:11:56.000000000 +0330 @@ -40,6 +40,7 @@ #include #include #include +#include const int TeamGraphic::MAX_WIDTH = 256; const int TeamGraphic::MAX_HEIGHT = 64; diff -up rcsslogplayer-13.1.0/rcsslogplayer/parser.cpp.gcc4_4fix rcsslogplayer-13.1.0/rcsslogplayer/parser.cpp --- rcsslogplayer-13.1.0/rcsslogplayer/parser.cpp.gcc4_4fix 2008-12-04 11:01:33.000000000 +0330 +++ rcsslogplayer-13.1.0/rcsslogplayer/parser.cpp 2009-03-01 14:25:25.000000000 +0330 @@ -45,6 +45,7 @@ #include #include #include +#include #ifdef HAVE_NETINET_IN_H #include From than at fedoraproject.org Sun Mar 1 11:22:21 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 1 Mar 2009 11:22:21 +0000 (UTC) Subject: rpms/kdelibs/devel kdelibs.spec,1.448,1.449 sources,1.85,1.86 Message-ID: <20090301112221.E845970115@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17863 Modified Files: kdelibs.spec sources Log Message: respin Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.448 retrieving revision 1.449 diff -u -r1.448 -r1.449 --- kdelibs.spec 27 Feb 2009 15:41:57 -0000 1.448 +++ kdelibs.spec 1 Mar 2009 11:21:50 -0000 1.449 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -401,6 +401,9 @@ %changelog +* Sun Mar 01 2009 Than Ngo - 4.2.1-2 +- respin + * Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdelibs/devel/sources,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- sources 27 Feb 2009 12:21:02 -0000 1.85 +++ sources 1 Mar 2009 11:21:51 -0000 1.86 @@ -1 +1 @@ -3ccc094df33db9d61f5ad065b9b857ac kdelibs-4.2.1.tar.bz2 +fa4206dd747890c4e4283c8adb831e6c kdelibs-4.2.1.tar.bz2 From jonquark at fedoraproject.org Sun Mar 1 11:22:42 2009 From: jonquark at fedoraproject.org (Jon Levell) Date: Sun, 1 Mar 2009 11:22:42 +0000 (UTC) Subject: rpms/diffuse/EL-5 diffuse-0.2.15-desktop.patch, NONE, 1.1 diffuse.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301112242.1101E70115@cvs1.fedora.phx.redhat.com> Author: jonquark Update of /cvs/pkgs/rpms/diffuse/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17931/EL-5 Modified Files: .cvsignore sources Added Files: diffuse-0.2.15-desktop.patch diffuse.spec import.log Log Message: Initial import for RHEL5 diffuse-0.2.15-desktop.patch: --- NEW FILE diffuse-0.2.15-desktop.patch --- diff -uNr diffuse-0.2.15/src/usr/share/applications/diffuse.desktop diffuse-0.2.15p/src/usr/share/applications/diffuse.desktop --- diffuse-0.2.15/src/usr/share/applications/diffuse.desktop 2008-12-02 13:04:30.000000000 +0000 +++ diffuse-0.2.15p/src/usr/share/applications/diffuse.desktop 2009-01-21 23:03:42.000000000 +0000 @@ -5,5 +5,5 @@ Icon=diffuse Terminal=false Type=Application -MimeType=text/plain;text/x-csrc;text/x-chdr -Categories=Development;GTK;TextEditor;TextTools +MimeType=text/plain;text/x-csrc;text/x-chdr; +Categories=Development;GTK;TextEditor;TextTools; --- NEW FILE diffuse.spec --- Name: diffuse Version: 0.2.15 Release: 4%{?dist} Summary: Graphical tool for comparing and merging text files Group: Development/Tools License: GPLv2+ URL: http://%{name}.sourceforge.net/ Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 Patch0: diffuse-0.2.15-desktop.patch BuildRequires: desktop-file-utils, scrollkeeper Requires: python >= 2.4, pygtk2 >= 2.10 Requires(post): scrollkeeper Requires(postun): scrollkeeper BuildArch: noarch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description Diffuse is a graphical tool for merging and comparing text files. Diffuse is able to compare an arbitrary number of files side-by-side and gives users the ability to manually adjust line matching and directly edit files. Diffuse can also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK repositories for comparison and merging. %prep %setup -q %patch0 -p1 %build %install rm -rf %{buildroot} mkdir %{buildroot} cp -a src/* %{buildroot}/ desktop-file-validate %{buildroot}/%{_datadir}/applications/diffuse.desktop %clean rm -rf %{buildroot} %post scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : update-desktop-database &> /dev/null || : %postun scrollkeeper-update -q || : update-desktop-database &> /dev/null || : %files %defattr(-,root,root,-) %{_bindir}/diffuse %{_datadir}/diffuse/ %{_datadir}/applications/diffuse.desktop %{_datadir}/gnome/help/diffuse/C/diffuse.xml %{_datadir}/omf/diffuse/diffuse-C.omf %{_datadir}/pixmaps/diffuse.png %config(noreplace) %{_sysconfdir}/diffuserc %{_mandir}/man*/* %dir %{_datadir}/gnome/help/diffuse %dir %{_datadir}/gnome/help/diffuse/C %dir %{_datadir}/omf/diffuse %doc AUTHORS ChangeLog COPYING README TODO %changelog * Wed Feb 11 2009 Jon Levell - 0.2.15-4 - Validate the .desktop file - Use the prescribed forms for scrollkeeper/update-desktop-database - Clean up the unowned directories * Sat Jan 24 2009 Jon Levell - 0.2.15-3 - Fix typos in formatting of changelog - Fix buildroot in line with packaging guidelines - Updated defattr with default directory permissions * Wed Jan 21 2009 Jon Levell - 0.2.15-2 - Use macros in file paths - patch .desktop file to add trailing semi-colons - updated URL/source/group * Tue Jan 20 2009 Jon Levell - 0.2.15-1 - clean buildroot on install - conditional use scrollkeeper/update-desktop-database - updated release/license as per Fedora guidelines - first version submitted to Fedora * Sun Apr 27 2008 Derrick Moser - created initial diffuse package --- NEW FILE import.log --- diffuse-0_2_15-4_fc10:EL-5:diffuse-0.2.15-4.fc10.src.rpm:1235906426 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/diffuse/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Feb 2009 00:12:58 -0000 1.1 +++ .cvsignore 1 Mar 2009 11:22:10 -0000 1.2 @@ -0,0 +1 @@ +diffuse-0.2.15.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/diffuse/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Feb 2009 00:12:58 -0000 1.1 +++ sources 1 Mar 2009 11:22:11 -0000 1.2 @@ -0,0 +1 @@ +0fd7aa7d3ed7271770d36bfac8b1ba42 diffuse-0.2.15.tar.bz2 From terjeros at fedoraproject.org Sun Mar 1 11:27:54 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Sun, 1 Mar 2009 11:27:54 +0000 (UTC) Subject: rpms/eterm/devel eterm.spec,1.12,1.13 Message-ID: <20090301112754.9555770115@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/eterm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30225 Modified Files: eterm.spec Log Message: * Sun Mar 1 2009 Terje R??sten - 0.9.5-4 - Add more fonts to req. Index: eterm.spec =================================================================== RCS file: /cvs/extras/rpms/eterm/devel/eterm.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- eterm.spec 24 Feb 2009 15:29:47 -0000 1.12 +++ eterm.spec 1 Mar 2009 11:27:23 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Enlightened terminal emulator Name: eterm Version: 0.9.5 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: User Interface/Desktops Source0: http://www.eterm.org/download/Eterm-%{version}.tar.gz @@ -12,6 +12,7 @@ Patch3: Eterm-0.9.5-drop-kde-cut-paste.patch URL: http://www.eterm.org/ Requires: imlib2 bitmap-fonts +Requires: xorg-x11-fonts-ISO8859-1-75dpi xorg-x11-fonts-ISO8859-1-100dpi BuildRequires: imlib2-devel libast-devel libXmu-devel BuildRequires: pcre-devel desktop-file-utils gawk BuildRequires: autoconf automake libtool @@ -100,6 +101,9 @@ %{_datadir}/pixmaps/%{name}.png %changelog +* Sun Mar 1 2009 Terje R??sten - 0.9.5-4 +- Add more fonts to req. + * Tue Feb 24 2009 Fedora Release Engineering - 0.9.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From cdamian at fedoraproject.org Sun Mar 1 11:28:10 2009 From: cdamian at fedoraproject.org (Christof Damian) Date: Sun, 1 Mar 2009 11:28:10 +0000 (UTC) Subject: rpms/mediawiki-wikicalendar/devel import.log, NONE, 1.1 mediawiki-wikicalendar.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301112810.5296670115@cvs1.fedora.phx.redhat.com> Author: cdamian Update of /cvs/pkgs/rpms/mediawiki-wikicalendar/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30969/devel Modified Files: .cvsignore sources Added Files: import.log mediawiki-wikicalendar.spec Log Message: initial import --- NEW FILE import.log --- mediawiki-wikicalendar-1_15-1_fc10:HEAD:mediawiki-wikicalendar-1.15-1.fc10.src.rpm:1235906798 --- NEW FILE mediawiki-wikicalendar.spec --- Name: mediawiki-wikicalendar Version: 1.15 Release: 1%{?dist} Summary: Simple calendar extension for mediawiki Group: Applications/Internet License: GPLv2 URL: http://code.google.com/p/wikicalendar/ Source0: http://wikicalendar.googlecode.com/files/wikicalendar-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: mediawiki %description The extension adds an tag to the mediawiki syntax which can show calendars in different formats. The idea was to keep the calendar as simple as possible and leave all the editing and page creation to mediawiki. It doesn't require any new database tables or files. %prep %setup -q -n wikicalendar-%{version} %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/calendar install -cpm 644 calendar/*.php $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/calendar/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_datadir}/mediawiki/extensions/calendar %doc ChangeLog README LICENSE %changelog * Fri Feb 27 2009 Christof Damian 1.15-1 - updated to version 1.15 * Mon Feb 23 2009 Christof Damian 1.14-1 - initial spec file Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mediawiki-wikicalendar/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2009 23:46:16 -0000 1.1 +++ .cvsignore 1 Mar 2009 11:27:39 -0000 1.2 @@ -0,0 +1 @@ +wikicalendar-1.15.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mediawiki-wikicalendar/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2009 23:46:16 -0000 1.1 +++ sources 1 Mar 2009 11:27:39 -0000 1.2 @@ -0,0 +1 @@ +f99d5fa46be90862952e8f914e217f4d wikicalendar-1.15.tar.gz From cdamian at fedoraproject.org Sun Mar 1 11:30:22 2009 From: cdamian at fedoraproject.org (Christof Damian) Date: Sun, 1 Mar 2009 11:30:22 +0000 (UTC) Subject: rpms/mediawiki-wikicalendar/F-10 import.log, NONE, 1.1 mediawiki-wikicalendar.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301113022.D5FAE70115@cvs1.fedora.phx.redhat.com> Author: cdamian Update of /cvs/pkgs/rpms/mediawiki-wikicalendar/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7729/F-10 Modified Files: .cvsignore sources Added Files: import.log mediawiki-wikicalendar.spec Log Message: initial import --- NEW FILE import.log --- mediawiki-wikicalendar-1_15-1_fc10:F-10:mediawiki-wikicalendar-1.15-1.fc10.src.rpm:1235906940 --- NEW FILE mediawiki-wikicalendar.spec --- Name: mediawiki-wikicalendar Version: 1.15 Release: 1%{?dist} Summary: Simple calendar extension for mediawiki Group: Applications/Internet License: GPLv2 URL: http://code.google.com/p/wikicalendar/ Source0: http://wikicalendar.googlecode.com/files/wikicalendar-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: mediawiki %description The extension adds an tag to the mediawiki syntax which can show calendars in different formats. The idea was to keep the calendar as simple as possible and leave all the editing and page creation to mediawiki. It doesn't require any new database tables or files. %prep %setup -q -n wikicalendar-%{version} %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/calendar install -cpm 644 calendar/*.php $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/calendar/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_datadir}/mediawiki/extensions/calendar %doc ChangeLog README LICENSE %changelog * Fri Feb 27 2009 Christof Damian 1.15-1 - updated to version 1.15 * Mon Feb 23 2009 Christof Damian 1.14-1 - initial spec file Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mediawiki-wikicalendar/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2009 23:46:16 -0000 1.1 +++ .cvsignore 1 Mar 2009 11:29:52 -0000 1.2 @@ -0,0 +1 @@ +wikicalendar-1.15.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mediawiki-wikicalendar/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2009 23:46:16 -0000 1.1 +++ sources 1 Mar 2009 11:29:52 -0000 1.2 @@ -0,0 +1 @@ +f99d5fa46be90862952e8f914e217f4d wikicalendar-1.15.tar.gz From cdamian at fedoraproject.org Sun Mar 1 11:32:55 2009 From: cdamian at fedoraproject.org (Christof Damian) Date: Sun, 1 Mar 2009 11:32:55 +0000 (UTC) Subject: rpms/mediawiki-wikicalendar/EL-5 import.log, NONE, 1.1 mediawiki-wikicalendar.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301113255.C2CFE70115@cvs1.fedora.phx.redhat.com> Author: cdamian Update of /cvs/pkgs/rpms/mediawiki-wikicalendar/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19285/EL-5 Modified Files: .cvsignore sources Added Files: import.log mediawiki-wikicalendar.spec Log Message: initial import --- NEW FILE import.log --- mediawiki-wikicalendar-1_15-1_fc10:EL-5:mediawiki-wikicalendar-1.15-1.fc10.src.rpm:1235907097 --- NEW FILE mediawiki-wikicalendar.spec --- Name: mediawiki-wikicalendar Version: 1.15 Release: 1%{?dist} Summary: Simple calendar extension for mediawiki Group: Applications/Internet License: GPLv2 URL: http://code.google.com/p/wikicalendar/ Source0: http://wikicalendar.googlecode.com/files/wikicalendar-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: mediawiki %description The extension adds an tag to the mediawiki syntax which can show calendars in different formats. The idea was to keep the calendar as simple as possible and leave all the editing and page creation to mediawiki. It doesn't require any new database tables or files. %prep %setup -q -n wikicalendar-%{version} %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/calendar install -cpm 644 calendar/*.php $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/calendar/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_datadir}/mediawiki/extensions/calendar %doc ChangeLog README LICENSE %changelog * Fri Feb 27 2009 Christof Damian 1.15-1 - updated to version 1.15 * Mon Feb 23 2009 Christof Damian 1.14-1 - initial spec file Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mediawiki-wikicalendar/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2009 23:46:16 -0000 1.1 +++ .cvsignore 1 Mar 2009 11:32:23 -0000 1.2 @@ -0,0 +1 @@ +wikicalendar-1.15.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mediawiki-wikicalendar/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2009 23:46:16 -0000 1.1 +++ sources 1 Mar 2009 11:32:24 -0000 1.2 @@ -0,0 +1 @@ +f99d5fa46be90862952e8f914e217f4d wikicalendar-1.15.tar.gz From mbooth at fedoraproject.org Sun Mar 1 11:33:17 2009 From: mbooth at fedoraproject.org (Mat Booth) Date: Sun, 1 Mar 2009 11:33:17 +0000 (UTC) Subject: rpms/eclipse-emf/devel .cvsignore, 1.4, 1.5 eclipse-emf.spec, 1.11, 1.12 get-emf.sh, 1.1, 1.2 sources, 1.5, 1.6 Message-ID: <20090301113317.3290070115@cvs1.fedora.phx.redhat.com> Author: mbooth Update of /cvs/pkgs/rpms/eclipse-emf/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19355 Modified Files: .cvsignore eclipse-emf.spec get-emf.sh sources Log Message: * Sat Feb 28 2009 Mat Booth 2.4.2-1 - Update for Ganymede SR2. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Feb 2009 14:52:10 -0000 1.4 +++ .cvsignore 1 Mar 2009 11:32:46 -0000 1.5 @@ -1 +1 @@ -emf-2.4.1.tar.gz +emf-2.4.2.tar.gz Index: eclipse-emf.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/eclipse-emf.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- eclipse-emf.spec 24 Feb 2009 13:43:46 -0000 1.11 +++ eclipse-emf.spec 1 Mar 2009 11:32:46 -0000 1.12 @@ -2,8 +2,8 @@ %define eclipse_dropin %{_datadir}/eclipse/dropins/emf Name: eclipse-emf -Version: 2.4.1 -Release: 5%{?dist} +Version: 2.4.2 +Release: 1%{?dist} Summary: Eclipse Modeling Framework (EMF) Eclipse plugin Group: System Environment/Libraries License: EPL @@ -37,11 +37,11 @@ BuildRequires: java-devel >= 1:1.6.0 BuildRequires: java-javadoc BuildRequires: jpackage-utils -BuildRequires: eclipse-pde >= 1:3.4.1 +BuildRequires: eclipse-pde >= 1:3.4.2 BuildRequires: dos2unix Requires: java Requires: jpackage-utils -Requires: eclipse-platform >= 1:3.4.1 +Requires: eclipse-platform >= 1:3.4.2 # the standalone package was deprecated and removed in EMF 2.3 (see eclipse.org bug #191837) Obsoletes: %{name}-standalone < %{version} @@ -63,6 +63,7 @@ %description sdk Documentation and source for the Eclipse Modeling Framework (EMF). +#TODO: obselete sdo when galileo arrives %package sdo Summary: Service Data Objects (SDO) Eclipse plugin Group: System Environment/Libraries @@ -73,6 +74,7 @@ which includes an architecture and API. It simplifies the J2EE data programming model and abstracts data in a service oriented architecture. +#TODO: obselete sdo-sdk when galileo arrives %package sdo-sdk Summary: Eclipse SDO SDK Group: System Environment/Libraries @@ -148,7 +150,7 @@ # build all features # we use forceContextQualifier because the docs plugins use custom build scripts and don't work otherwise %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.all \ - -a "-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v200808251517" + -a "-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v200902171115" %install rm -rf %{buildroot} @@ -304,6 +306,9 @@ %{eclipse_dropin}/eclipse/plugins/org.eclipse.xsd.example_* %changelog +* Sat Feb 28 2009 Mat Booth 2.4.2-1 +- Update for Ganymede SR2. + * Tue Feb 24 2009 Fedora Release Engineering - 2.4.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: get-emf.sh =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/get-emf.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- get-emf.sh 6 Feb 2009 14:54:12 -0000 1.1 +++ get-emf.sh 1 Mar 2009 11:32:46 -0000 1.2 @@ -1,7 +1,7 @@ #!/bin/bash NAME="emf" -VERSION=2.4.1 -TAG="R200808251517" +VERSION=2.4.2 +TAG="R200902171115" echo "Exporting from CVS..." mkdir $NAME-$VERSION @@ -9,7 +9,7 @@ MAPFILE=$NAME.map TEMPMAPFILE=temp.map -wget "http://download.eclipse.org/modeling/$NAME/$NAME/downloads/drops/$VERSION/$TAG/directory.txt" -O $MAPFILE +wget "http://download.eclipse.org/modeling/emf/emf/downloads/drops/$VERSION/$TAG/directory.txt" -O $MAPFILE dos2unix $MAPFILE grep ^[a-z] $MAPFILE > $TEMPMAPFILE @@ -22,14 +22,14 @@ split($1, version, "="); split(version[1], directory, "@"); cvsdir=split($2, dirName, ":"); - printf("%s %s %s%s %s %s %s %s %s %s %s\n", "cvs", "-d", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[2], directory[2]) | "/bin/bash"; + printf("cvs -d %s%s %s %s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[2], directory[2]) | "/bin/bash"; } else { split($1, version, "="); total=split($4, directory, "/"); cvsdir=split($2, dirName, ":"); - printf("%s %s %s%s %s %s %s %s %s %s %s\n", "cvs", "-d", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[total], $4) | "/bin/bash"; + printf("cvs -d %s%s %s %s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[total], $4) | "/bin/bash"; } }' $TEMPMAPFILE Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-emf/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Feb 2009 14:52:10 -0000 1.5 +++ sources 1 Mar 2009 11:32:46 -0000 1.6 @@ -1 +1 @@ -a5ecc9810d4b59dfbd518476fa60c886 emf-2.4.1.tar.gz +558e4476348a3ddf7942c91bebc048ce emf-2.4.2.tar.gz From lkundrak at fedoraproject.org Sun Mar 1 11:33:54 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Mar 2009 11:33:54 +0000 (UTC) Subject: rpms/nightview/devel nightview-0.3.2-gcc44.patch, 1.1, 1.2 nightview.spec, 1.5, 1.6 Message-ID: <20090301113354.2E52670115@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/nightview/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20097 Modified Files: nightview-0.3.2-gcc44.patch nightview.spec Log Message: * Sun Mar 1 2009 Lubomir Rintel (Fedora Astronomy) - 0.3.2-5 - Update the gcc44 fix nightview-0.3.2-gcc44.patch: Index: nightview-0.3.2-gcc44.patch =================================================================== RCS file: /cvs/pkgs/rpms/nightview/devel/nightview-0.3.2-gcc44.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nightview-0.3.2-gcc44.patch 22 Feb 2009 12:51:19 -0000 1.1 +++ nightview-0.3.2-gcc44.patch 1 Mar 2009 11:33:53 -0000 1.2 @@ -1,12 +1,25 @@ The STL headers in gcc-4.4 have been cleaned up, so that the headers don't drag in unnecessary dependencies which aren't requested by the standard. +strstr() returns const char pointer, which differs from non-const one. This fixes build for gcc-4.4 Lubomir Rintel +diff -up nightview-0.3.2/httpdaemon/httpprotocol.cpp.gcc44 nightview-0.3.2/httpdaemon/httpprotocol.cpp +--- nightview-0.3.2/httpdaemon/httpprotocol.cpp.gcc44 2009-03-01 12:24:35.000000000 +0100 ++++ nightview-0.3.2/httpdaemon/httpprotocol.cpp 2009-03-01 12:24:44.000000000 +0100 +@@ -51,7 +51,7 @@ void HttpProtocol::Init(const string& in + if( version == "" ) + version = "HTTP/0.9"; + +- char *b = strstr(version.c_str(),"/"); ++ const char *b = strstr(version.c_str(),"/"); + nversion = strtod(b+1,NULL); + + if( method == "HEAD" ) { diff -up nightview-0.3.2/shell/night_batch.cpp.gcc44 nightview-0.3.2/shell/night_batch.cpp ---- nightview-0.3.2/shell/night_batch.cpp.gcc44 2009-02-03 21:09:52.000000000 +0100 -+++ nightview-0.3.2/shell/night_batch.cpp 2009-02-03 21:09:46.000000000 +0100 +--- nightview-0.3.2/shell/night_batch.cpp.gcc44 2008-10-29 23:05:23.000000000 +0100 ++++ nightview-0.3.2/shell/night_batch.cpp 2009-03-01 12:19:14.000000000 +0100 @@ -16,6 +16,7 @@ #include #include Index: nightview.spec =================================================================== RCS file: /cvs/pkgs/rpms/nightview/devel/nightview.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nightview.spec 26 Feb 2009 05:42:44 -0000 1.5 +++ nightview.spec 1 Mar 2009 11:33:53 -0000 1.6 @@ -1,6 +1,6 @@ Name: nightview Version: 0.3.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A general astronomical software package to control of a CCD camera Group: Amusements/Graphics @@ -13,7 +13,7 @@ Patch0: nightview-0.3.2-fitslib.patch Patch1: nightview-0.3.2-initscript.patch Patch2: nightview-0.3.1-doc.patch -# Sent upstream by mail, accepted +# Sent upstream by mail, first hunk already accepted Patch3: nightview-0.3.2-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -245,6 +245,9 @@ %changelog +* Sun Mar 1 2009 Lubomir Rintel (Fedora Astronomy) - 0.3.2-5 +- Update the gcc44 fix + * Wed Feb 25 2009 Fedora Release Engineering - 0.3.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From atorkhov at fedoraproject.org Sun Mar 1 11:39:43 2009 From: atorkhov at fedoraproject.org (Alexey Torkhov) Date: Sun, 1 Mar 2009 11:39:43 +0000 (UTC) Subject: rpms/atlascpp/devel atlascpp.spec,1.8,1.9 Message-ID: <20090301113943.935E570115@cvs1.fedora.phx.redhat.com> Author: atorkhov Update of /cvs/pkgs/rpms/atlascpp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21075 Modified Files: atlascpp.spec Log Message: Moving skstream dependency to -devel subpackage. Index: atlascpp.spec =================================================================== RCS file: /cvs/pkgs/rpms/atlascpp/devel/atlascpp.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- atlascpp.spec 28 Feb 2009 09:14:27 -0000 1.8 +++ atlascpp.spec 1 Mar 2009 11:39:11 -0000 1.9 @@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen zlib-devel bzip2-devel -Requires: skstream # Provide the other name that this package is commonly known by Provides: Atlas-C++ @@ -28,6 +27,8 @@ Summary: Development files for Atlas-C++ Group: Development/Libraries Requires: pkgconfig %{name} = %{version}-%{release} +# Atlas-C++ includes simple tutorial that uses skstream +Requires: skstream-devel %description devel From terjeros at fedoraproject.org Sun Mar 1 11:39:50 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Sun, 1 Mar 2009 11:39:50 +0000 (UTC) Subject: rpms/teamgit/devel teamgit-0.0.9-desktop.patch, NONE, 1.1 teamgit.spec, 1.5, 1.6 Message-ID: <20090301113950.B237D70115@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/teamgit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21115 Modified Files: teamgit.spec Added Files: teamgit-0.0.9-desktop.patch Log Message: * Sun Mar 1 2009 Terje Rosten - 0.0.9-3.20090205 - Fix desktop file (bz #487868) teamgit-0.0.9-desktop.patch: --- NEW FILE teamgit-0.0.9-desktop.patch --- diff --git a/teamgit.desktop b/teamgit.desktop index dc2aeeb..57b7a93 100644 --- a/teamgit.desktop +++ b/teamgit.desktop @@ -8,4 +8,4 @@ Icon=teamgit_icon StartupNotify=true Terminal=false Type=Application -Categories=Development; +Categories=Development;Qt;RevisionControl; Index: teamgit.spec =================================================================== RCS file: /cvs/extras/rpms/teamgit/devel/teamgit.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- teamgit.spec 25 Feb 2009 19:27:52 -0000 1.5 +++ teamgit.spec 1 Mar 2009 11:39:20 -0000 1.6 @@ -4,7 +4,7 @@ Summary: Visual tool for Git Name: teamgit Version: 0.0.9 -Release: 2.%{date}%{?dist} +Release: 3.%{date}%{?dist} Epoch: 1 License: GPLv2 Group: Development/Tools @@ -15,6 +15,8 @@ # $ cd mainline # $ git-archive --format=tar --prefix=%{name}-%{version}/ %{gitver} | bzip2 > %{name}-%{version}-%{date}.tar.bz2 Source0: %{name}-%{version}-%{date}.tar.bz2 +# Patch sent upstream by mail +Patch0: teamgit-0.0.9-desktop.patch BuildRequires: qt4-devel desktop-file-utils Requires: git BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -24,6 +26,7 @@ %prep %setup -q +%patch0 -p1 %build qmake-qt4 ./teamgit.pro @@ -49,6 +52,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sun Mar 1 2009 Terje Rosten - 0.0.9-3.20090205 +- Fix desktop file (bz #487868) + * Wed Feb 25 2009 Fedora Release Engineering - 1:0.0.9-2.20090205 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From terjeros at fedoraproject.org Sun Mar 1 11:44:36 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Sun, 1 Mar 2009 11:44:36 +0000 (UTC) Subject: rpms/eterm/F-10 eterm.spec,1.11,1.12 Message-ID: <20090301114436.2C82370115@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/eterm/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21943/F-10 Modified Files: eterm.spec Log Message: Sync with rawhide. Index: eterm.spec =================================================================== RCS file: /cvs/extras/rpms/eterm/F-10/eterm.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- eterm.spec 11 Nov 2008 18:03:58 -0000 1.11 +++ eterm.spec 1 Mar 2009 11:44:05 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Enlightened terminal emulator Name: eterm Version: 0.9.5 -Release: 2%{?dist} +Release: 4%{?dist} License: BSD Group: User Interface/Desktops Source0: http://www.eterm.org/download/Eterm-%{version}.tar.gz @@ -12,6 +12,7 @@ Patch3: Eterm-0.9.5-drop-kde-cut-paste.patch URL: http://www.eterm.org/ Requires: imlib2 bitmap-fonts +Requires: xorg-x11-fonts-ISO8859-1-75dpi xorg-x11-fonts-ISO8859-1-100dpi BuildRequires: imlib2-devel libast-devel libXmu-devel BuildRequires: pcre-devel desktop-file-utils gawk BuildRequires: autoconf automake libtool @@ -100,6 +101,12 @@ %{_datadir}/pixmaps/%{name}.png %changelog +* Sun Mar 1 2009 Terje R??sten - 0.9.5-4 +- Add more fonts to req. + +* Tue Feb 24 2009 Fedora Release Engineering - 0.9.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Nov 10 2008 Terje R??sten - 0.9.5-2 - Add patch to remove KDE cut-paste patch From terjeros at fedoraproject.org Sun Mar 1 11:44:36 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Sun, 1 Mar 2009 11:44:36 +0000 (UTC) Subject: rpms/eterm/F-9 eterm.spec,1.11,1.12 Message-ID: <20090301114436.7426670116@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/eterm/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21943/F-9 Modified Files: eterm.spec Log Message: Sync with rawhide. Index: eterm.spec =================================================================== RCS file: /cvs/extras/rpms/eterm/F-9/eterm.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- eterm.spec 11 Nov 2008 18:03:59 -0000 1.11 +++ eterm.spec 1 Mar 2009 11:44:06 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Enlightened terminal emulator Name: eterm Version: 0.9.5 -Release: 2%{?dist} +Release: 4%{?dist} License: BSD Group: User Interface/Desktops Source0: http://www.eterm.org/download/Eterm-%{version}.tar.gz @@ -12,6 +12,7 @@ Patch3: Eterm-0.9.5-drop-kde-cut-paste.patch URL: http://www.eterm.org/ Requires: imlib2 bitmap-fonts +Requires: xorg-x11-fonts-ISO8859-1-75dpi xorg-x11-fonts-ISO8859-1-100dpi BuildRequires: imlib2-devel libast-devel libXmu-devel BuildRequires: pcre-devel desktop-file-utils gawk BuildRequires: autoconf automake libtool @@ -100,6 +101,12 @@ %{_datadir}/pixmaps/%{name}.png %changelog +* Sun Mar 1 2009 Terje R??sten - 0.9.5-4 +- Add more fonts to req. + +* Tue Feb 24 2009 Fedora Release Engineering - 0.9.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Nov 10 2008 Terje R??sten - 0.9.5-2 - Add patch to remove KDE cut-paste patch From atorkhov at fedoraproject.org Sun Mar 1 11:48:54 2009 From: atorkhov at fedoraproject.org (Alexey Torkhov) Date: Sun, 1 Mar 2009 11:48:54 +0000 (UTC) Subject: rpms/eris/devel eris.spec,1.16,1.17 Message-ID: <20090301114854.D817F70115@cvs1.fedora.phx.redhat.com> Author: atorkhov Update of /cvs/pkgs/rpms/eris/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22930 Modified Files: eris.spec Log Message: Adding mercator dep to -devel subpackage. Fixing changelog entry. Index: eris.spec =================================================================== RCS file: /cvs/pkgs/rpms/eris/devel/eris.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- eris.spec 27 Feb 2009 23:05:04 -0000 1.16 +++ eris.spec 1 Mar 2009 11:48:23 -0000 1.17 @@ -24,8 +24,8 @@ %package devel Summary: Development files for Eris -Group: Development/Libraries -Requires: pkgconfig %{name} = %{version}-%{release} atlascpp-devel skstream-devel wfmath-devel libsigc++20-devel +Group: Development/Libraries +Requires: pkgconfig %{name} = %{version}-%{release} atlascpp-devel skstream-devel wfmath-devel mercator-devel libsigc++20-devel %description devel @@ -58,7 +58,7 @@ %check # Don't run the tests. They seem to hang sometimes. This will # be reenabled once upstream has a fix. -#make check +#make %{?_smp_mflags} check %clean @@ -84,7 +84,7 @@ %changelog -* Fri Feb 27 2009 Alexey Torkhov - 1.3.14 +* Fri Feb 27 2009 Alexey Torkhov - 1.3.14-1 - Update to 1.3.14 * Tue Feb 24 2009 Fedora Release Engineering - 1.3.13-3 From ensc at fedoraproject.org Sun Mar 1 11:53:57 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sun, 1 Mar 2009 11:53:57 +0000 (UTC) Subject: rpms/dietlibc/devel dietlibc-0.31-no-stack-protector.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 dietlibc-0.28-setpriority.patch, 1.3, 1.4 dietlibc-0.29-scall.patch, 1.5, 1.6 dietlibc-0.30-longdouble.patch, 1.3, 1.4 dietlibc-0.31-defpath.patch, 1.3, 1.4 dietlibc-0.31-implicitfunc.patch, 1.6, 1.7 dietlibc-0.31-lcctime.patch, 1.3, 1.4 dietlibc-0.31-noreturn.patch, 1.3, 1.4 dietlibc-0.31-pagesize.patch, 1.11, 1.12 dietlibc-0.31-printFG.patch, 1.7, 1.8 dietlibc-0.31-stacksmash-dyn.patch, 1.3, 1.4 dietlibc-0.31-stacksmash.patch, 1.3, 1.4 dietlibc-0.31-testsuite.patch, 1.6, 1.7 dietlibc-0.31.20080212-teststdout.patch, 1.3, 1.4 dietlibc.spec, 1.60, 1.61 sources, 1.12, 1.13 Message-ID: <20090301115357.4D53070115@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/dietlibc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32275 Modified Files: .cvsignore dietlibc-0.28-setpriority.patch dietlibc-0.29-scall.patch dietlibc-0.30-longdouble.patch dietlibc-0.31-defpath.patch dietlibc-0.31-implicitfunc.patch dietlibc-0.31-lcctime.patch dietlibc-0.31-noreturn.patch dietlibc-0.31-pagesize.patch dietlibc-0.31-printFG.patch dietlibc-0.31-stacksmash-dyn.patch dietlibc-0.31-stacksmash.patch dietlibc-0.31-testsuite.patch dietlibc-0.31.20080212-teststdout.patch dietlibc.spec sources Added Files: dietlibc-0.31-no-stack-protector.patch Log Message: updated dietlibc-0.31-no-stack-protector.patch: --- NEW FILE dietlibc-0.31-no-stack-protector.patch --- >From 3bbcb9a3a908d1aceb9f69118c1ed17a8d6d1871 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 28 Feb 2009 13:32:45 +0100 Subject: [PATCH] build some files without stack-protector --- Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 0cd0105..46ef360 100644 --- a/Makefile +++ b/Makefile @@ -128,6 +128,8 @@ LIBPTHREAD_OBJS=$(patsubst libpthread/%.c,$(OBJDIR)/%.o,$(shell ./threadsafe.sh) LIBGMON_OBJS=$(OBJDIR)/__mcount.o $(OBJDIR)/monitor.o $(OBJDIR)/profil.o +NO_STACK_PROTECTOR=stackgap.o __get_elf_aux_value.o + include $(ARCH)/Makefile.add LIBMATHOBJ=$(patsubst %,$(OBJDIR)/%,$(LIBMATH)) @@ -177,6 +179,8 @@ $(OBJDIR)/stack_smash_handler2.o: XCFLAGS:=-fno-omit-frame-pointer $(OBJDIR)/%.o: %.c $(CROSS)$(CC) $(INC) $(CFLAGS) $(XCFLAGS) -c $< -o $@ -D__dietlibc__ $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@ + +$(addprefix $(OBJDIR)/,$(NO_STACK_PROTECTOR)): XCFLAGS+=-fno-stack-protector endif ifeq ($(shell $(CC) -v 2>&1 | grep "gcc version"),gcc version 4.0.0) -- 1.6.0.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Oct 2008 17:06:02 -0000 1.6 +++ .cvsignore 1 Mar 2009 11:53:24 -0000 1.7 @@ -1 +1 @@ -dietlibc-0.31.20081017.tar.bz2 +dietlibc-0.31.20090228.tar.bz2 dietlibc-0.28-setpriority.patch: Index: dietlibc-0.28-setpriority.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.28-setpriority.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dietlibc-0.28-setpriority.patch 18 Oct 2008 17:04:19 -0000 1.3 +++ dietlibc-0.28-setpriority.patch 1 Mar 2009 11:53:24 -0000 1.4 @@ -1,4 +1,4 @@ -From 395ad1b292568821a8f6ad4398be2c9746a0133b Mon Sep 17 00:00:00 2001 +From 5ba671b7b8446645f31fcf7928908950573c53f5 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 19 Apr 2008 17:49:05 +0200 Subject: [PATCH] Return new nice value for nice(2) @@ -29,5 +29,5 @@ } #endif -- -1.5.5.1 +1.6.0.6 dietlibc-0.29-scall.patch: Index: dietlibc-0.29-scall.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.29-scall.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dietlibc-0.29-scall.patch 18 Oct 2008 17:04:19 -0000 1.5 +++ dietlibc-0.29-scall.patch 1 Mar 2009 11:53:24 -0000 1.6 @@ -1,4 +1,4 @@ -From 0ae5eb83091eee9cdef27eaadb5e2e8f58fa0ee9 Mon Sep 17 00:00:00 2001 +From 5dc478088a3358ba32ae2b4c104735eb966b62d1 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 19 Apr 2008 17:50:24 +0200 Subject: [PATCH] Sanity checks for syscall availability @@ -10,7 +10,7 @@ 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/libcompat/syscall.S b/libcompat/syscall.S -index c9f72bb..6e964b3 100644 +index c9f72bb..4188167 100644 --- a/libcompat/syscall.S +++ b/libcompat/syscall.S @@ -130,6 +130,12 @@ syscall: @@ -20,13 +20,13 @@ - /* arch not implemented yet */ +#include + .section .comment -+#if (__WORDSIZE == 64) ++#if (__WORDSIZE == 64) + .quad __syscall_2_not_implemented_for_this_arch -+#else ++#else + .long __syscall_2_not_implemented_for_this_arch +#endif #endif .size syscall, . - syscall -- -1.5.5.1 +1.6.0.6 dietlibc-0.30-longdouble.patch: Index: dietlibc-0.30-longdouble.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.30-longdouble.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dietlibc-0.30-longdouble.patch 18 Oct 2008 17:04:19 -0000 1.3 +++ dietlibc-0.30-longdouble.patch 1 Mar 2009 11:53:24 -0000 1.4 @@ -1,4 +1,4 @@ -From 75feb30ea22b815f828c7854352007616c4393f0 Mon Sep 17 00:00:00 2001 +From e4be3aa68fdfb87c35378adc3b947e805b923fcf Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 19 Apr 2008 17:54:03 +0200 Subject: [PATCH] Workaround PPC build issues @@ -47,5 +47,5 @@ static const double coeff[] = { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10 }; int signgam; -- -1.5.5.1 +1.6.0.6 dietlibc-0.31-defpath.patch: Index: dietlibc-0.31-defpath.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-defpath.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dietlibc-0.31-defpath.patch 18 Oct 2008 17:04:19 -0000 1.3 +++ dietlibc-0.31-defpath.patch 1 Mar 2009 11:53:24 -0000 1.4 @@ -1,4 +1,4 @@ -From 2a265ce59a6e0187ca4b96feb86196d7816d271f Mon Sep 17 00:00:00 2001 +From 4fee9a2dc10208f639590cabc07e7f3b91cf0d17 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 19 Apr 2008 18:00:19 +0200 Subject: [PATCH] Security fix for proper $PATH @@ -22,5 +22,5 @@ #define _PATH_DEVNULL "/dev/null" -- -1.5.5.1 +1.6.0.6 dietlibc-0.31-implicitfunc.patch: Index: dietlibc-0.31-implicitfunc.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-implicitfunc.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dietlibc-0.31-implicitfunc.patch 18 Oct 2008 17:04:19 -0000 1.6 +++ dietlibc-0.31-implicitfunc.patch 1 Mar 2009 11:53:24 -0000 1.7 @@ -1,4 +1,4 @@ -From e1f4f15e4be4283a6ac6eee1e9393a5e09369d23 Mon Sep 17 00:00:00 2001 +From 50c65fce74b343c43161d8194d36aa52ebed51ec Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 19 Apr 2008 17:43:08 +0200 Subject: [PATCH] Fixes for -Werror-no-implicit-functions @@ -46,5 +46,5 @@ #include #include -- -1.5.5.1 +1.6.0.6 dietlibc-0.31-lcctime.patch: Index: dietlibc-0.31-lcctime.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-lcctime.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dietlibc-0.31-lcctime.patch 18 Oct 2008 17:04:19 -0000 1.3 +++ dietlibc-0.31-lcctime.patch 1 Mar 2009 11:53:24 -0000 1.4 @@ -1,4 +1,4 @@ -From 28fbb9c7844032fecb53ebdcc18190bf08e9b604 Mon Sep 17 00:00:00 2001 +From 7e9b745e0cca4916c29b40fac68cb98d91904b09 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 19 Apr 2008 17:42:20 +0200 Subject: [PATCH] Fixes/enhancements in str?time() functions @@ -24,7 +24,7 @@ _strf: p += strftime (p, (size_t)(dst+max-p), src, tm); break; case 'a': src = sweekdays [tm->tm_wday]; goto _str; diff --git a/libugly/strptime.c b/libugly/strptime.c -index 6ac5340..32dc2a7 100644 +index 9d7f530..d19f309 100644 --- a/libugly/strptime.c +++ b/libugly/strptime.c @@ -119,10 +119,11 @@ char* strptime(const char* s,const char* format, struct tm* tm) { @@ -42,5 +42,5 @@ case 'y': i=getint(&s,2); -- -1.5.5.1 +1.6.0.6 dietlibc-0.31-noreturn.patch: Index: dietlibc-0.31-noreturn.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-noreturn.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dietlibc-0.31-noreturn.patch 18 Oct 2008 17:04:19 -0000 1.3 +++ dietlibc-0.31-noreturn.patch 1 Mar 2009 11:53:24 -0000 1.4 @@ -1,4 +1,4 @@ -From d17d4d4c6dbdb1e608208860cec304bab8044885 Mon Sep 17 00:00:00 2001 +From c895c51d84b36cf649764193f33f296728b27bdc Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 19 Apr 2008 17:43:42 +0200 Subject: [PATCH] __noreturn__ annotation for abort(3) @@ -27,5 +27,5 @@ extern int rand(void) __THROW; extern int rand_r(unsigned int *seed) __THROW; -- -1.5.5.1 +1.6.0.6 dietlibc-0.31-pagesize.patch: Index: dietlibc-0.31-pagesize.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-pagesize.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dietlibc-0.31-pagesize.patch 18 Oct 2008 17:02:52 -0000 1.11 +++ dietlibc-0.31-pagesize.patch 1 Mar 2009 11:53:24 -0000 1.12 @@ -1,4 +1,4 @@ -From 6160ca8256603d1f1a929f01238bf43866552dee Mon Sep 17 00:00:00 2001 +From 2f762bc732fef1c0e91b7e920c025783d204100e Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 19 Apr 2008 17:35:14 +0200 Subject: [PATCH] Support for dynamic PAGE_SIZE @@ -65,43 +65,44 @@ auxilary elf-info table. Now, this is not available anymore and I use a type derived from __WORD_SIZE. --- - alpha/start.S | 9 ++++ - arm/start.S | 13 ++++++- - dietdirent.h | 6 ++- - dietelfinfo.h | 20 ++++++++++ - dietfeatures.h | 14 +++++++ - dietpagesize.h | 31 +++++++++++++++ - dynlinker/ldso_start.S | 9 ++++ - i386/start.S | 7 +++ - ia64/start.S | 10 +++++ - include/sys/shm.h | 9 ---- - lib/alloc.c | 9 ++-- - lib/closedir.c | 4 +- - lib/mmap64.c | 6 ++- - lib/opendir.c | 4 +- - lib/readdir.c | 2 +- - lib/readdir64.c | 6 +- - libcruft/__get_elf_aux_value.c | 14 +++++++ - libcruft/getpagesize.c | 20 +++++++--- - libcruft/sysconf.c | 17 ++++++-- - mips/start.S | 9 ++++ - parisc/start.S | 10 +++++ - ppc/start.S | 9 ++++ - ppc64/start.S | 9 ++++ - s390/start.S | 11 +++++ - s390x/start.S | 11 +++++ - sparc/shmat.c | 8 +-- - sparc/start.S | 11 +++++ - sparc64/start.S | 11 +++++ - syscalls.s/environ.S | 20 ++++++++++ - test/Makefile | 2 +- - test/runtests.sh | 2 +- - test/sysconf.c | 80 ++++++++++++++++++++++++++++++++++++++++ - x86_64/start.S | 16 ++++++++ - 33 files changed, 378 insertions(+), 41 deletions(-) + alpha/start.S | 9 +++++ + arm/start.S | 13 +++++++- + dietdirent.h | 6 +++- + dietelfinfo.h | 20 +++++++++++ + dietfeatures.h | 14 ++++++++ + dietpagesize.h | 31 +++++++++++++++++ + dynlinker/ldso_start.S | 9 +++++ + i386/start.S | 7 ++++ + ia64/start.S | 10 ++++++ + include/sys/shm.h | 9 ----- + lib/__get_elf_aux_value.c | 14 ++++++++ + lib/alloc.c | 9 +++-- + lib/closedir.c | 4 ++- + lib/mmap64.c | 6 ++- + lib/opendir.c | 4 ++- + lib/readdir.c | 2 +- + lib/readdir64.c | 6 ++-- + lib/stackgap.c | 20 +++++++++++- + libcruft/getpagesize.c | 28 +++++++-------- + libcruft/sysconf.c | 17 +++++++--- + mips/start.S | 9 +++++ + parisc/start.S | 10 ++++++ + ppc/start.S | 9 +++++ + ppc64/start.S | 9 +++++ + s390/start.S | 11 ++++++ + s390x/start.S | 11 ++++++ + sparc/shmat.c | 8 ++--- + sparc/start.S | 11 ++++++ + sparc64/start.S | 11 ++++++ + syscalls.s/environ.S | 16 +++++++++ + test/Makefile | 2 +- + test/runtests.sh | 2 +- + test/sysconf.c | 80 +++++++++++++++++++++++++++++++++++++++++++++ + x86_64/start.S | 16 +++++++++ + 34 files changed, 392 insertions(+), 51 deletions(-) create mode 100644 dietelfinfo.h create mode 100644 dietpagesize.h - create mode 100644 libcruft/__get_elf_aux_value.c + create mode 100644 lib/__get_elf_aux_value.c create mode 100644 test/sysconf.c diff --git a/alpha/start.S b/alpha/start.S @@ -197,12 +198,12 @@ + __attribute__((__visibility__("hidden"),__const__)) __pure; +#endif diff --git a/dietfeatures.h b/dietfeatures.h -index 5ad8f38..2993b9e 100644 +index 7ba02ec..ab892d6 100644 --- a/dietfeatures.h +++ b/dietfeatures.h -@@ -126,6 +126,16 @@ - /* #define WANT_SSP_XOR */ - +@@ -119,6 +119,16 @@ + #define WANT_SSP + #endif +/* Some platforms like x86_64, ppc* or mips do not have a fixed PAGE_SIZE. + * Select WANT_DYN_PAGESIZE to detect the current PAGE_SIZE at runtime. Else, @@ -217,7 +218,7 @@ /* stop uncommenting here ;-) */ -@@ -157,4 +167,8 @@ +@@ -150,4 +160,8 @@ #endif #endif @@ -264,14 +265,14 @@ + +#endif /* H_DIETLIBC_DIETPAGESIZE_H */ diff --git a/dynlinker/ldso_start.S b/dynlinker/ldso_start.S -index ca278d7..7234f69 100644 +index ca278d7..da36845 100644 --- a/dynlinker/ldso_start.S +++ b/dynlinker/ldso_start.S @@ -86,6 +86,15 @@ __environ: .long 0 #endif -+/* __elfinfo must follow __environ immediately */ ++/* __elfinfo must follow __environ immediately */ +.global __elfinfo +__elfinfo: +#if __WORDSIZE == 64 @@ -284,7 +285,7 @@ fini_entry: .long 0 diff --git a/i386/start.S b/i386/start.S -index 94a4f73..0c2c71d 100644 +index 94a4f73..9ad41ff 100644 --- a/i386/start.S +++ b/i386/start.S @@ -25,6 +25,13 @@ _start: @@ -295,14 +296,14 @@ +1: add $4, %eax /* increment envp */ + cmpl $0, -4(%eax) /* load envp[-1] */ + jne 1b /* ... until envp[-1]==NULL */ -+ PUT_VAR %eax, __elfinfo, %ecx ++ PUT_VAR %eax, __elfinfo, %ecx +#endif + #ifdef PROFILING pushl $_etext pushl $.text diff --git a/ia64/start.S b/ia64/start.S -index 50fd015..5389a4f 100644 +index 50fd015..c917721 100644 --- a/ia64/start.S +++ b/ia64/start.S @@ -40,6 +40,16 @@ _start: @@ -312,10 +313,10 @@ +#ifdef WANT_ELFINFO +# warning "MAKE ME IE64 CODE!" +1: ld8 r9 = [out2], 8 /* load *envp and increment it */ -+ orr r9 = r9, r9 /* test for NULL */ ++ orr r9 = r9, r9 /* test for NULL */ + bne 1b + -+ adds r14 = 8, r14 /* __elfinfo = environ + 8 */ ++ adds r14 = 8, r14 /* __elfinfo = environ + 8 */ + st8 [r14] = out2 /* store envp in __elfinfo */ +#endif + @@ -342,6 +343,26 @@ extern int shmget(key_t key, int size, int shmflg) __THROW; extern void *shmat(int shmid, const void *shmaddr, int shmflg) __THROW; extern int shmdt (const void *shmaddr) __THROW; +diff --git a/lib/__get_elf_aux_value.c b/lib/__get_elf_aux_value.c +new file mode 100644 +index 0000000..6ddddb4 +--- /dev/null ++++ b/lib/__get_elf_aux_value.c +@@ -0,0 +1,14 @@ ++#include ++#include "../dietelfinfo.h" ++ ++__diet_elf_addr_t *__get_elf_aux_value(unsigned int tag) ++{ ++ extern __diet_elf_addr_t const * const __elfinfo; ++ __diet_elf_addr_t *aux_ptr; ++ ++ for (aux_ptr = __elfinfo; aux_ptr[0]!=AT_NULL; aux_ptr += 2) ++ if (aux_ptr[0]==tag) ++ return aux_ptr+1; ++ ++ return NULL; ++} diff --git a/lib/alloc.c b/lib/alloc.c index 9690565..3f0cedb 100644 --- a/lib/alloc.c @@ -418,7 +439,7 @@ void*mmap64(void*addr,size_t len,int prot,int flags,int fd,off64_t offset) diff --git a/lib/opendir.c b/lib/opendir.c -index 2530d1a..0b49638 100644 +index 2530d1a..847685e 100644 --- a/lib/opendir.c +++ b/lib/opendir.c @@ -5,6 +5,8 @@ @@ -435,7 +456,7 @@ if (fcntl (fd, F_SETFD, FD_CLOEXEC) < 0) goto lose; - t = (DIR *) mmap (NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, -+ t = (DIR *) mmap (NULL, __DIET_PAGE_SIZE, PROT_READ | PROT_WRITE, ++ t = (DIR *) mmap (NULL, __DIET_PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); if (t == MAP_FAILED) lose: @@ -483,33 +504,96 @@ if (res<=0) { if (errno==ENOSYS) { trygetdents64=0; -diff --git a/libcruft/__get_elf_aux_value.c b/libcruft/__get_elf_aux_value.c -new file mode 100644 -index 0000000..6ddddb4 ---- /dev/null -+++ b/libcruft/__get_elf_aux_value.c -@@ -0,0 +1,14 @@ -+#include -+#include "../dietelfinfo.h" -+ -+__diet_elf_addr_t *__get_elf_aux_value(unsigned int tag) -+{ -+ extern __diet_elf_addr_t const * const __elfinfo; -+ __diet_elf_addr_t *aux_ptr; -+ -+ for (aux_ptr = __elfinfo; aux_ptr[0]!=AT_NULL; aux_ptr += 2) -+ if (aux_ptr[0]==tag) -+ return aux_ptr+1; -+ -+ return NULL; -+} +diff --git a/lib/stackgap.c b/lib/stackgap.c +index 0149bbe..49ad489 100644 +--- a/lib/stackgap.c ++++ b/lib/stackgap.c +@@ -6,6 +6,7 @@ + #include + #include + #include "dietfeatures.h" ++#include "dietelfinfo.h" + + extern int main(int argc,char* argv[],char* envp[]); + +@@ -30,6 +31,7 @@ static void findtlsdata(long* auxvec) { + Elf32_Phdr* x=0; + #endif + size_t i,n; ++#ifndef WANT_ELFINFO + while (*auxvec) { + if (auxvec[0]==3) { + x=(void*)auxvec[1]; +@@ -37,6 +39,10 @@ static void findtlsdata(long* auxvec) { + } + auxvec+=2; + } /* if we don't find the entry, the kernel let us down */ ++#else ++ (void)auxvec; ++ x = __get_elf_aux_value(AT_PHDR); ++#endif + if (!x) return; /* a kernel this old does not support thread local storage anyway */ + n=x->p_memsz/sizeof(*x); + for (i=1; i #include #include +-/* for environ: */ +-#include -#ifndef PAGE_SIZE -#define PAGE_SIZE 4096 @@ -519,14 +603,21 @@ -size_t __libc_getpagesize(void); size_t __libc_getpagesize(void) { -- return PAGE_SIZE; +- long* x=(long*)environ; +- int fd; +- while (*x) ++x; ++x; /* skip envp to get to auxvec */ +- while (*x) { +- if (*x==6) +- return x[1]; +- x+=2; +#ifdef WANT_DYN_PAGESIZE + static size_t pgsz; + + if (__unlikely(pgsz==0)) { + __diet_elf_addr_t *v = __get_elf_aux_value(AT_PAGESZ); + pgsz = *v; /* causes segfault when 'v==NULL' */ -+ } + } +- return PAGE_SIZE; + + return pgsz; +#else @@ -579,7 +670,7 @@ case _SC_ARG_MAX: return ARG_MAX; diff --git a/mips/start.S b/mips/start.S -index 57144b3..4c659a6 100644 +index 57144b3..3cf3433 100644 --- a/mips/start.S +++ b/mips/start.S @@ -47,6 +47,15 @@ __start: @@ -589,9 +680,9 @@ +#ifdef WANT_ELFINFO +# warning "MAKE ME MIPS CODE!" +1: addu $a2, $a2, 4 /* increment envp */ -+ lw $4, -4($a2) /* load envp[-1]; TODO: is $4 a proper ++ lw $4, -4($a2) /* load envp[-1]; TODO: is $4 a proper + temporary register? */ -+ bnz 1b /* ... until envp[-1]==NULL ++ bnz 1b /* ... until envp[-1]==NULL + TODO: use proper 'bnz' operation */ + sw $a2, __elfinfo +#endif @@ -599,7 +690,7 @@ la $25, exit move $4,$2 diff --git a/parisc/start.S b/parisc/start.S -index 69d9cce..b5d8793 100644 +index 69d9cce..894255c 100644 --- a/parisc/start.S +++ b/parisc/start.S @@ -34,6 +34,16 @@ _start: @@ -611,16 +702,16 @@ +1: add %r20, %r19, %r19 ; envp += 4 + ldw -4(0,%r19), %r21 ; load envp[-4] into %r21 + comibf =,0, 0,%21,1b ; compare %21 with 0 without nullification -+ ++ + ldil LP%__elfinfo, %r19 + ldo RP%__elfinfo(%r19), %r19 -+#endif ++#endif + /* Expand the stack to store the 5th through 7th args */ ldo 64(%sp), %sp diff --git a/ppc/start.S b/ppc/start.S -index 771f1ad..eb62efb 100644 +index 771f1ad..3b5cab1 100644 --- a/ppc/start.S +++ b/ppc/start.S @@ -31,6 +31,15 @@ _start: @@ -632,7 +723,7 @@ + addi 5, 5, 4 + cmpwi 15,0 + bne 1b -+ ++ + stw 5,__elfinfo at l(14) +#endif + @@ -660,7 +751,7 @@ /* #warning dynamic */ mr 6,7 diff --git a/s390/start.S b/s390/start.S -index c0f971f..1d9106a 100644 +index c0f971f..585faf7 100644 --- a/s390/start.S +++ b/s390/start.S @@ -30,6 +30,17 @@ _start: @@ -673,7 +764,7 @@ + l %r12, -4(0,%r4) # load envp[-1] into %r12 + or %r12, %r12 # test %r12 for NULL + brc 1, 1b -+ ++ + ahi %r1, 4 + st %r4,0(%r1) +#endif @@ -682,7 +773,7 @@ l %r1,0(%r13) basr %r14,%r1 diff --git a/s390x/start.S b/s390x/start.S -index 25895a6..51d4604 100644 +index 25895a6..15ad1f9 100644 --- a/s390x/start.S +++ b/s390x/start.S @@ -26,6 +26,17 @@ _start: @@ -698,7 +789,7 @@ + + aghi %r13, 8 + stg %r4,0(%r13) -+#endif ++#endif + /* call main or _dyn_start */ #ifdef WANT_DYNAMIC @@ -773,7 +864,7 @@ address of the shared library termination function, which will be registered with atexit(). If we are statically linked, this will diff --git a/syscalls.s/environ.S b/syscalls.s/environ.S -index a4dd95e..78a17de 100644 +index a4dd95e..294f2d4 100644 --- a/syscalls.s/environ.S +++ b/syscalls.s/environ.S @@ -1,6 +1,7 @@ @@ -784,17 +875,13 @@ .type environ,object .weak environ -@@ -15,3 +16,22 @@ environ: +@@ -15,3 +16,18 @@ environ: #endif .size environ,.-environ .size __environ,.-__environ + -+/* __elfinfo will be a copy of __environ after startup. Later, it will be -+ updated by __get_elf_aux_value() to point to the terminating NULL of the -+ environment. -+ -+ Startup code assumes that __elfinfo is located immediately after -+ __environ. */ ++/* __elfinfo will be initialized in start.S to point to the ++ terminating NULL of the environment. */ + +#ifdef WANT_ELFINFO +.type __elfinfo,object @@ -919,7 +1006,7 @@ + return err; +} diff --git a/x86_64/start.S b/x86_64/start.S -index adc461a..3915e33 100644 +index adc461a..8b4f3c9 100644 --- a/x86_64/start.S +++ b/x86_64/start.S @@ -12,12 +12,28 @@ _start: @@ -933,7 +1020,7 @@ +#else + leaq environ(%rip), %rax +#endif -+ movq %rdx, (%rax) /* environ */ ++ movq %rdx, (%rax) /* environ */ + +1: add $8, %rdx /* increment envp */ + cmpq $0, -8(%rdx) /* load envp[-1] */ @@ -952,5 +1039,5 @@ #ifdef PROFILING pushq %rdi /* save reg args */ -- -1.5.5.1 +1.6.0.6 dietlibc-0.31-printFG.patch: Index: dietlibc-0.31-printFG.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-printFG.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dietlibc-0.31-printFG.patch 18 Oct 2008 17:04:19 -0000 1.7 +++ dietlibc-0.31-printFG.patch 1 Mar 2009 11:53:24 -0000 1.8 @@ -1,4 +1,4 @@ -From cd0eb2c9f17cbc1b70c7c60aa5b046cd2cc041c9 Mon Sep 17 00:00:00 2001 +From a38148e35b746f3325d39aca189a38e808c5585e Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 19 Apr 2008 17:39:23 +0200 Subject: [PATCH] Fixes/enhancements for INF/NAN handling in printf() @@ -271,5 +271,5 @@ return EXIT_SUCCESS; } -- -1.5.5.1 +1.6.0.6 dietlibc-0.31-stacksmash-dyn.patch: Index: dietlibc-0.31-stacksmash-dyn.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-stacksmash-dyn.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dietlibc-0.31-stacksmash-dyn.patch 18 Oct 2008 17:04:19 -0000 1.3 +++ dietlibc-0.31-stacksmash-dyn.patch 1 Mar 2009 11:53:24 -0000 1.4 @@ -1,4 +1,4 @@ -From 9ae9c692418d33761d6affa5bbf1784c157955cb Mon Sep 17 00:00:00 2001 +From 62f02d841ea2fb19e365af01892e793ed923ce06 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 19 Apr 2008 17:57:09 +0200 Subject: [PATCH] __stack_chk_fail_local function @@ -22,5 +22,5 @@ /* earlier versions of ProPolice actually gave the address and function * name as arguments to the handler, so it could print some useful -- -1.5.5.1 +1.6.0.6 dietlibc-0.31-stacksmash.patch: Index: dietlibc-0.31-stacksmash.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-stacksmash.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dietlibc-0.31-stacksmash.patch 18 Oct 2008 17:04:19 -0000 1.3 +++ dietlibc-0.31-stacksmash.patch 1 Mar 2009 11:53:24 -0000 1.4 @@ -1,4 +1,4 @@ -From 25487e3bafa653890f2fb36f5615a420cd0c46b8 Mon Sep 17 00:00:00 2001 +From f8b1f860c0038613c31b800ff0466fc1c4e25823 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 19 Apr 2008 17:56:07 +0200 Subject: [PATCH] Enhanced __stack_chk_fail @@ -50,5 +50,5 @@ + *(char *)0 = 0; } -- -1.5.5.1 +1.6.0.6 dietlibc-0.31-testsuite.patch: Index: dietlibc-0.31-testsuite.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-testsuite.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dietlibc-0.31-testsuite.patch 18 Oct 2008 17:04:19 -0000 1.6 +++ dietlibc-0.31-testsuite.patch 1 Mar 2009 11:53:24 -0000 1.7 @@ -1,4 +1,4 @@ -From 103eca647519cfafcc7a125bd21b0413b3e81f5a Mon Sep 17 00:00:00 2001 +From 02a0efbc861696460826282e5d0c1e706644991a Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 19 Apr 2008 17:41:23 +0200 Subject: [PATCH] Several testsuite fixes/enhancments @@ -457,5 +457,5 @@ printf ("not all of `%s' read\n", day_tests[i].input); result = 1; -- -1.5.5.1 +1.6.0.6 dietlibc-0.31.20080212-teststdout.patch: Index: dietlibc-0.31.20080212-teststdout.patch =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31.20080212-teststdout.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dietlibc-0.31.20080212-teststdout.patch 18 Oct 2008 17:04:19 -0000 1.3 +++ dietlibc-0.31.20080212-teststdout.patch 1 Mar 2009 11:53:24 -0000 1.4 @@ -1,4 +1,4 @@ -From c86767c4a29b74a1e9bafb5e62048304afc475a2 Mon Sep 17 00:00:00 2001 +From fd63f368885bbb3e637866a2651348cfce7f69d2 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 19 Apr 2008 17:45:11 +0200 Subject: [PATCH] Use stdout instead of stderr in testsuite @@ -63,5 +63,5 @@ _exit(23); } -- -1.5.5.1 +1.6.0.6 Index: dietlibc.spec =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- dietlibc.spec 24 Feb 2009 11:46:39 -0000 1.60 +++ dietlibc.spec 1 Mar 2009 11:53:24 -0000 1.61 @@ -4,10 +4,10 @@ ## --with dynamic ... enable dynamic lib support -%global snapshot 20081017 +%global snapshot 20090228 %global pkglibdir %_prefix/lib/dietlibc -%ifarch %ix86 x86_64 +%ifarch %ix86 x86_64 ppc ppc64 %bcond_without ssp %else %bcond_with ssp @@ -54,6 +54,7 @@ Patch47: dietlibc-0.31-lcctime.patch Patch48: dietlibc-0.31-implicitfunc.patch Patch49: dietlibc-0.31-noreturn.patch +Patch50: dietlibc-0.31-no-stack-protector.patch BuildRoot: %_tmppath/%name-%version-%release-buildroot %{?with_dynamic:Requires: dietlibc-lib = %version-%release} %{!?with_dynamic:Obsoletes: dietlibc-lib < %version-%release} @@ -109,7 +110,7 @@ %patch47 -p1 -b .lcctime %patch48 -p1 -b .implicitfunc %patch49 -p1 -b .noreturn - +%patch50 -p1 -b .no-stack-protector %if %{without ssp} %patch20 -p1 -b .nostackprotector @@ -197,6 +198,11 @@ %changelog +* Sun Mar 1 2009 Enrico Scholz - 0.31-7.20090228 +- updated to 20090228 +- updated patches +- enabled SSP for ppc + ppc64 + * Tue Feb 24 2009 Fedora Release Engineering - 0.31-7.20081017 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 18 Oct 2008 17:06:02 -0000 1.12 +++ sources 1 Mar 2009 11:53:24 -0000 1.13 @@ -1 +1 @@ -103646fc6bfdfa0865cd18d7d4ec3d28 dietlibc-0.31.20081017.tar.bz2 +e627aa62e21a812add91bd7a2b7d9e05 dietlibc-0.31.20090228.tar.bz2 From ensc at fedoraproject.org Sun Mar 1 12:01:00 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sun, 1 Mar 2009 12:01:00 +0000 (UTC) Subject: rpms/dietlibc/devel dietlibc.spec,1.61,1.62 Message-ID: <20090301120100.B95D970115@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/dietlibc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9850 Modified Files: dietlibc.spec Log Message: updated Index: dietlibc.spec =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- dietlibc.spec 1 Mar 2009 11:53:24 -0000 1.61 +++ dietlibc.spec 1 Mar 2009 12:00:59 -0000 1.62 @@ -7,7 +7,7 @@ %global snapshot 20090228 %global pkglibdir %_prefix/lib/dietlibc -%ifarch %ix86 x86_64 ppc ppc64 +%ifarch %ix86 x86_64 %bcond_without ssp %else %bcond_with ssp @@ -201,7 +201,6 @@ * Sun Mar 1 2009 Enrico Scholz - 0.31-7.20090228 - updated to 20090228 - updated patches -- enabled SSP for ppc + ppc64 * Tue Feb 24 2009 Fedora Release Engineering - 0.31-7.20081017 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From atorkhov at fedoraproject.org Sun Mar 1 12:04:04 2009 From: atorkhov at fedoraproject.org (Alexey Torkhov) Date: Sun, 1 Mar 2009 12:04:04 +0000 (UTC) Subject: rpms/eris/devel eris-1.3.14-gcc44.patch, 1.1, 1.2 eris.spec, 1.17, 1.18 Message-ID: <20090301120404.E388370115@cvs1.fedora.phx.redhat.com> Author: atorkhov Update of /cvs/pkgs/rpms/eris/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10627 Modified Files: eris-1.3.14-gcc44.patch eris.spec Log Message: * Sun Mar 01 2009 Alexey Torkhov - 1.3.14-2 - Adding mercator dep to -devel subpackage - Reenabling the tests eris-1.3.14-gcc44.patch: Index: eris-1.3.14-gcc44.patch =================================================================== RCS file: /cvs/pkgs/rpms/eris/devel/eris-1.3.14-gcc44.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eris-1.3.14-gcc44.patch 27 Feb 2009 23:05:04 -0000 1.1 +++ eris-1.3.14-gcc44.patch 1 Mar 2009 12:03:33 -0000 1.2 @@ -7,3 +7,41 @@ #include #ifdef HAVE_CONFIG_H +diff --git a/test/stubServer.cpp b/test/stubServer.cpp +index 233b8ba..32e9ba6 100644 +--- a/test/stubServer.cpp ++++ b/test/stubServer.cpp +@@ -17,6 +17,7 @@ + #include + + #include ++#include + #include + + using Atlas::Objects::Root; +diff --git a/test/clientConnection.cpp b/test/clientConnection.cpp +index c08a1b1..7801ee7 100644 +--- a/test/clientConnection.cpp ++++ b/test/clientConnection.cpp +@@ -17,6 +17,8 @@ + #include + #include + ++#include ++ + using Atlas::Objects::Root; + using Atlas::Objects::smart_dynamic_cast; + using namespace Atlas::Objects::Operation; +diff --git a/test/commander.cpp b/test/commander.cpp +index c19f505..3fedb6f 100644 +--- a/test/commander.cpp ++++ b/test/commander.cpp +@@ -14,6 +14,8 @@ + #include + #include + ++#include ++ + using Atlas::Objects::Root; + using Atlas::Objects::smart_dynamic_cast; + using namespace Atlas::Objects::Operation; Index: eris.spec =================================================================== RCS file: /cvs/pkgs/rpms/eris/devel/eris.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- eris.spec 1 Mar 2009 11:48:23 -0000 1.17 +++ eris.spec 1 Mar 2009 12:03:34 -0000 1.18 @@ -1,6 +1,6 @@ Name: eris Version: 1.3.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Client-side session layer for Atlas-C++ Group: Development/Libraries @@ -56,9 +56,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}-1.3.la %check -# Don't run the tests. They seem to hang sometimes. This will -# be reenabled once upstream has a fix. -#make %{?_smp_mflags} check +# They seem to hang sometimes. +make %{?_smp_mflags} check %clean @@ -84,6 +83,10 @@ %changelog +* Sun Mar 01 2009 Alexey Torkhov - 1.3.14-2 +- Adding mercator dep to -devel subpackage +- Reenabling the tests + * Fri Feb 27 2009 Alexey Torkhov - 1.3.14-1 - Update to 1.3.14 From ensc at fedoraproject.org Sun Mar 1 12:10:15 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sun, 1 Mar 2009 12:10:15 +0000 (UTC) Subject: rpms/dhcp-forwarder/devel dhcp-forwarder.upstart,NONE,1.1 Message-ID: <20090301121015.19C7E70115@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/dhcp-forwarder/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12202 Added Files: dhcp-forwarder.upstart Log Message: updated --- NEW FILE dhcp-forwarder.upstart --- ### Uncomment the 'start' lines below #start on starting\ local #start on starting local stop on runlevel 0 stop on runlevel 1 stop on runlevel 6 respawn exec /usr/sbin/dhcp-fwd -n -c /etc/dhcp-fwd.conf From ensc at fedoraproject.org Sun Mar 1 12:10:39 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sun, 1 Mar 2009 12:10:39 +0000 (UTC) Subject: rpms/dhcp-forwarder/devel dhcp-forwarder.spec,1.23,1.24 Message-ID: <20090301121039.7311270115@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/dhcp-forwarder/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12064 Modified Files: dhcp-forwarder.spec Log Message: updated Index: dhcp-forwarder.spec =================================================================== RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- dhcp-forwarder.spec 24 Feb 2009 11:40:07 -0000 1.23 +++ dhcp-forwarder.spec 1 Mar 2009 12:09:39 -0000 1.24 @@ -22,7 +22,7 @@ Summary: DHCP relay agent Name: dhcp-forwarder Version: 0.8 -Release: %release_func 2 +Release: %release_func 3 License: GPLv3 Group: System Environment/Daemons URL: http://www.tu-chemnitz.de/~ensc/dhcp-fwd @@ -32,13 +32,13 @@ Requires: init(dhcp-forwarder) BuildRequires: which BuildRequires: fedora-usermgmt-devel -Provides: user(%username) -Provides: group(%username) +Provides: user(%username) = 11 +Provides: group(%username) = 11 %{?FE_USERADD_REQ} %{?with_dietlibc:BuildRequires: dietlibc} -%package sysv +%package sysvinit Summary: SysV initscripts for dhcp-forwarder Group: System Environment/Base Provides: init(dhcp-forwarder) = sysv @@ -47,7 +47,20 @@ Requires(postun): %name initscripts Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig +Provides: %name-sysv = %version-%release +Obsoletes: %name-sysv < %version-%release +BuildArch: noarch +%package upstart +Summary: upstart initscripts for dhcp-forwarder +Group: System Environment/Base +Source10: dhcp-forwarder.upstart +Provides: init(dhcp-forwarder) = upstart +Requires: %name = %version-%release +# implicates a conflict with upstart 0.5+ +Requires(pre): /etc/event.d +Requires: upstart +BuildArch: noarch %package minit Summary: minit initscripts for dhcp-forwarder @@ -56,7 +69,7 @@ Requires: %name = %version-%release Requires(pre): minit-setup Requires(postun): minit-setup - +BuildArch: noarch %description @@ -71,7 +84,7 @@ * Has a small memory footprint when using dietlibc -%description sysv +%description sysvinit dhcp-fwd forwards DHCP messages between subnets with different sublayer broadcast domains. @@ -79,6 +92,14 @@ with the SysV initconcept. +%description upstart +dhcp-fwd forwards DHCP messages between subnets with different sublayer +broadcast domains. + +This package provides the scripts which can be used to start dhcp-forwarder +with the upstart initconcept. + + %description minit dhcp-fwd forwards DHCP messages between subnets with different sublayer broadcast domains. @@ -104,17 +125,16 @@ rm -rf $RPM_BUILD_ROOT %__make DESTDIR=$RPM_BUILD_ROOT install install-contrib -%__install -d -m700 $RPM_BUILD_ROOT%homedir +%__install -d -m 0700 $RPM_BUILD_ROOT%homedir +%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/event.d/dhcp-forwarder %{!?with_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir} - %check %__make check - %clean rm -rf $RPM_BUILD_ROOT @@ -130,16 +150,16 @@ %__fe_groupdel %username &>/dev/null || : -%post sysv +%post sysvinit /sbin/chkconfig --add %service -%preun sysv +%preun sysvinit if test "$1" = "0"; then %_initrddir/%service stop >/dev/null /sbin/chkconfig --del %service fi -%postun sysv +%postun sysvinit test "$1" = "0" || %_initrddir/%service condrestart &>/dev/null @@ -156,12 +176,16 @@ %homedir -%files sysv +%files sysvinit %defattr(-,root,root,-) %config %_initrddir/* %config(noreplace) %_sysconfdir/sysconfig/* +%files upstart +%defattr(-,root,root,-) +%config(noreplace) /etc/event.d/* + %if 0%{?with_minit:1} %files minit @@ -175,6 +199,11 @@ %changelog +* Sun Mar 1 2009 Enrico Scholz - 0.8-3 +- added -upstart subpackage +- renamed -sysv subpackage to -sysvinit to make -upstart win the + default dependency resolving + * Tue Feb 24 2009 Fedora Release Engineering - 0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jonquark at fedoraproject.org Sun Mar 1 12:18:51 2009 From: jonquark at fedoraproject.org (Jon Levell) Date: Sun, 1 Mar 2009 12:18:51 +0000 (UTC) Subject: rpms/diffuse/EL-5 diffuse-0.2.15-desktopEL5.patch, NONE, 1.1 diffuseEL5.spec, NONE, 1.1 import.log, 1.1, 1.2 diffuse-0.2.15-desktop.patch, 1.1, NONE diffuse.spec, 1.1, NONE Message-ID: <20090301121851.8602170115@cvs1.fedora.phx.redhat.com> Author: jonquark Update of /cvs/pkgs/rpms/diffuse/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13695/EL-5 Modified Files: import.log Added Files: diffuse-0.2.15-desktopEL5.patch diffuseEL5.spec Removed Files: diffuse-0.2.15-desktop.patch diffuse.spec Log Message: Fix .desktop file for RHEL-5 diffuse-0.2.15-desktopEL5.patch: --- NEW FILE diffuse-0.2.15-desktopEL5.patch --- --- diffuse-0.2.15/src/usr/share/applications/diffuse.desktop 2008-12-02 13:04:30.000000000 +0000 +++ diffuse-0.2.15pEL5/src/usr/share/applications/diffuse.desktop 2009-03-01 11:58:12.000000000 +0000 @@ -5,5 +5,6 @@ Icon=diffuse Terminal=false Type=Application -MimeType=text/plain;text/x-csrc;text/x-chdr -Categories=Development;GTK;TextEditor;TextTools +MimeType=text/plain;text/x-csrc;text/x-chdr; +Categories=Development;GTK;TextEditor;TextTools; +Encoding=UTF-8 --- NEW FILE diffuseEL5.spec --- Name: diffuse Version: 0.2.15 Release: 5%{?dist} Summary: Graphical tool for comparing and merging text files Group: Development/Tools License: GPLv2+ URL: http://%{name}.sourceforge.net/ Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 Patch0: diffuse-0.2.15-desktopEL5.patch BuildRequires: desktop-file-utils, scrollkeeper Requires: python >= 2.4, pygtk2 >= 2.10 Requires(post): scrollkeeper Requires(postun): scrollkeeper BuildArch: noarch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description Diffuse is a graphical tool for merging and comparing text files. Diffuse is able to compare an arbitrary number of files side-by-side and gives users the ability to manually adjust line matching and directly edit files. Diffuse can also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK repositories for comparison and merging. %prep %setup -q %patch0 -p1 %build %install rm -rf %{buildroot} mkdir %{buildroot} cp -a src/* %{buildroot}/ desktop-file-validate %{buildroot}/%{_datadir}/applications/diffuse.desktop %clean rm -rf %{buildroot} %post scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : update-desktop-database &> /dev/null || : %postun scrollkeeper-update -q || : update-desktop-database &> /dev/null || : %files %defattr(-,root,root,-) %{_bindir}/diffuse %{_datadir}/diffuse/ %{_datadir}/applications/diffuse.desktop %{_datadir}/gnome/help/diffuse/C/diffuse.xml %{_datadir}/omf/diffuse/diffuse-C.omf %{_datadir}/pixmaps/diffuse.png %config(noreplace) %{_sysconfdir}/diffuserc %{_mandir}/man*/* %dir %{_datadir}/gnome/help/diffuse %dir %{_datadir}/gnome/help/diffuse/C %dir %{_datadir}/omf/diffuse %doc AUTHORS ChangeLog COPYING README TODO %changelog * Sun Mar 01 2009 Jon Levell - 0.2.15-5 - Add encoding to to .desktop (only for RHEL5) * Wed Feb 11 2009 Jon Levell - 0.2.15-4 - Validate the .desktop file - Use the prescribed forms for scrollkeeper/update-desktop-database - Clean up the unowned directories * Sat Jan 24 2009 Jon Levell - 0.2.15-3 - Fix typos in formatting of changelog - Fix buildroot in line with packaging guidelines - Updated defattr with default directory permissions * Wed Jan 21 2009 Jon Levell - 0.2.15-2 - Use macros in file paths - patch .desktop file to add trailing semi-colons - updated URL/source/group * Tue Jan 20 2009 Jon Levell - 0.2.15-1 - clean buildroot on install - conditional use scrollkeeper/update-desktop-database - updated release/license as per Fedora guidelines - first version submitted to Fedora * Sun Apr 27 2008 Derrick Moser - created initial diffuse package Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/diffuse/EL-5/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Mar 2009 11:22:11 -0000 1.1 +++ import.log 1 Mar 2009 12:18:20 -0000 1.2 @@ -1 +1,2 @@ diffuse-0_2_15-4_fc10:EL-5:diffuse-0.2.15-4.fc10.src.rpm:1235906426 +diffuse-0_2_15-5_fc10:EL-5:diffuse-0.2.15-5.fc10.src.rpm:1235909848 --- diffuse-0.2.15-desktop.patch DELETED --- --- diffuse.spec DELETED --- From mjakubicek at fedoraproject.org Sun Mar 1 12:19:01 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Sun, 1 Mar 2009 12:19:01 +0000 (UTC) Subject: rpms/weka/devel import.log, NONE, 1.1 weka.desktop, NONE, 1.1 weka.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301121901.04F9670115@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/weka/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13715/devel Modified Files: .cvsignore sources Added Files: import.log weka.desktop weka.spec Log Message: - Initial commit --- NEW FILE import.log --- weka-3_6_0-3_fc10:HEAD:weka-3.6.0-3.fc10.src.rpm:1235909856 --- NEW FILE weka.desktop --- [Desktop Entry] Name=Weka GenericName=Waikato Environment for Knowledge Analysis GenericName[de]=Waikato - System f??r Wissensanalyse GenericName[cs]=Waikato - syst??m pro anal??zu znalost?? Comment=Start Weka Comment[de]=Weka starten Comment[cs]=Spustit Weku Exec=weka Terminal=false Type=Application Icon=weka Categories=Education;Science;ArtificialIntelligence; --- NEW FILE weka.spec --- %global _version 3-6-0 # whether to run jUnit tests, caution: takes horribly long # currently disabled as the tests fail, filed in upstream's bugtracker: # https://sourceforge.net/tracker2/?func=detail&aid=2648813&group_id=5091&atid=105091 # %%global _with_tests 1 Name: weka Version: 3.6.0 Release: 3%{?dist} Summary: Waikato Environment for Knowledge Analysis Group: Applications/Engineering License: GPLv2+ URL: http://www.cs.waikato.ac.nz/ml/%{name}/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{_version}.zip # wrapper script: Source1: weka.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils BuildRequires: ant BuildRequires: desktop-file-utils BuildRequires: ImageMagick BuildRequires: junit Requires: java >= 1:1.6.0 Requires: jpackage-utils %description Weka is a collection of machine learning algorithms for data mining tasks. The algorithms can either be applied directly to a dataset or called from your own Java code. Weka contains tools for data pre-processing, classification, regression, clustering, association rules, and visualization. It is also well-suited for developing new machine learning schemes. %package javadoc Summary: Javadocs for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{_version} # unzip the sources jar unzip %{name}-src.jar # remove prebuilt jars find -name '*.jar' -o -name '*.class' -delete # we won't run JUnit tests and 128m for making javadocs was not enough:( sed -i -e 's/name="lib" value="lib"/name="lib" value="src"/' -e 's/maxmemory="128m"/maxmemory="256m"/' build.xml %build ant compile %if %{?_with_tests:1}%{!?_with_tests:0} %check CLASSPATH=/usr/share/java/junit.jar ant run_tests %endif %install rm -rf $RPM_BUILD_ROOT # jar ant exejar mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p dist/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # javadoc ant docs mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # wrapper script mkdir -p $RPM_BUILD_ROOT%{_bindir} cat > $RPM_BUILD_ROOT%{_bindir}/%{name} <<-EOF #!/bin/bash . /usr/share/java-utils/java-functions MAIN_CLASS="weka.gui.GUIChooser" set_classpath "weka.jar" run "$@" EOF chmod a+x $RPM_BUILD_ROOT%{_bindir}/%{name} # desktop file and icon desktop-file-install \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} # convert icon to png convert %{name}.ico %{name}.png install -Dp %{name}.png ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/32x32/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,-) %{_javadir}/%{name}.jar %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %doc documentation.html %doc documentation.css %doc WekaManual.pdf %doc COPYING %doc README %doc changelogs %doc data %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog * Sat Feb 28 2009 Milos Jakubicek - 3.6.0-3 - Fixed desktop file name - Added optional running junit tests into %%check, added BR:junit - Fixed changelog entry * Wed Feb 25 2009 Milos Jakubicek - 3.6.0-2 - Running gtk-update-icon-cache - Converting icon to png, added BR:ImageMagick, changed icon path in desktop file "weka" only - java/java-devel R: and BR: made versioned to >= 1:1.6.0 - removed vendor tag in desktop-file-install according to the guidelines for new packages. * Wed Jan 14 2009 Milos Jakubicek - 3.6.0-1 - Initial release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/weka/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2009 23:41:59 -0000 1.1 +++ .cvsignore 1 Mar 2009 12:18:30 -0000 1.2 @@ -0,0 +1 @@ +weka-3-6-0.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/weka/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2009 23:41:59 -0000 1.1 +++ sources 1 Mar 2009 12:18:30 -0000 1.2 @@ -0,0 +1 @@ +a782afc9b2a84ed34db4e631545955f5 weka-3-6-0.zip From rathann at fedoraproject.org Sun Mar 1 12:19:03 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Sun, 1 Mar 2009 12:19:03 +0000 (UTC) Subject: rpms/openbabel/devel .cvsignore, 1.12, 1.13 openbabel-gcc43.patch, 1.16, 1.17 openbabel-rpm.patch, 1.3, 1.4 openbabel.spec, 1.45, 1.46 sources, 1.12, 1.13 Message-ID: <20090301121903.B18B970115@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13774 Modified Files: .cvsignore openbabel-gcc43.patch openbabel-rpm.patch openbabel.spec sources Log Message: * Sun Mar 01 2009 Dominik Mierzejewski 2.2.1-0.1.b3 - update to 2.2.1 beta3 - drop some obsolete workarounds Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 6 Jul 2008 14:57:34 -0000 1.12 +++ .cvsignore 1 Mar 2009 12:18:32 -0000 1.13 @@ -1 +1 @@ -openbabel-2.2.0.tar.gz +openbabel-2.2.1b3-20090215-r2890.tar.gz openbabel-gcc43.patch: Index: openbabel-gcc43.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-gcc43.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- openbabel-gcc43.patch 2 Jul 2008 18:49:45 -0000 1.16 +++ openbabel-gcc43.patch 1 Mar 2009 12:18:32 -0000 1.17 @@ -1,63 +1,64 @@ -diff -up openbabel-2.2.0b7/src/zipstreamimpl.h.gcc43 openbabel-2.2.0b7/src/zipstreamimpl.h ---- openbabel-2.2.0b7/src/zipstreamimpl.h.gcc43 2008-06-21 15:58:02.000000000 +0200 -+++ openbabel-2.2.0b7/src/zipstreamimpl.h 2008-07-02 20:16:21.000000000 +0200 -@@ -31,6 +31,8 @@ Altered by: Geoffrey Hutchison 2005 for - minor namespace modifications, VC++ compatibility - */ - -+#include -+ - //***************************************************************************** - // template class basic_zip_streambuf - //***************************************************************************** -diff -up openbabel-2.2.0b7/src/residue.cpp.gcc43 openbabel-2.2.0b7/src/residue.cpp ---- openbabel-2.2.0b7/src/residue.cpp.gcc43 2008-06-21 15:58:02.000000000 +0200 -+++ openbabel-2.2.0b7/src/residue.cpp 2008-07-02 20:16:21.000000000 +0200 -@@ -26,6 +26,8 @@ obtained in part or whole from RasMol2 b - // File Includes - /////////////////////////////////////////////////////////////////////////////// - -+#include -+ +diff -up openbabel-2.2.1b3-20090215-r2890/include/openbabel/data.h.gcc43 openbabel-2.2.1b3-20090215-r2890/include/openbabel/data.h +--- openbabel-2.2.1b3-20090215-r2890/include/openbabel/data.h.gcc43 2008-12-01 18:42:20.000000000 +0100 ++++ openbabel-2.2.1b3-20090215-r2890/include/openbabel/data.h 2009-03-01 10:54:43.000000000 +0100 +@@ -23,7 +23,7 @@ GNU General Public License for more deta #include - #include -diff -up openbabel-2.2.0b7/src/obconversion.cpp.gcc43 openbabel-2.2.0b7/src/obconversion.cpp ---- openbabel-2.2.0b7/src/obconversion.cpp.gcc43 2008-06-21 15:58:02.000000000 +0200 -+++ openbabel-2.2.0b7/src/obconversion.cpp 2008-07-02 20:17:00.000000000 +0200 -@@ -37,6 +37,7 @@ GNU General Public License for more deta + #include +- ++#include + #include + #include #include +diff -up openbabel-2.2.1b3-20090215-r2890/include/openbabel/obconversion.h.gcc43 openbabel-2.2.1b3-20090215-r2890/include/openbabel/obconversion.h +--- openbabel-2.2.1b3-20090215-r2890/include/openbabel/obconversion.h.gcc43 2008-12-01 18:42:19.000000000 +0100 ++++ openbabel-2.2.1b3-20090215-r2890/include/openbabel/obconversion.h 2009-03-01 10:54:43.000000000 +0100 +@@ -28,6 +28,7 @@ GNU General Public License for more deta + #include + #include #include - #include -+#include ++#include - #include + #include + #include +diff -up openbabel-2.2.1b3-20090215-r2890/include/openbabel/obmolecformat.h.gcc43 openbabel-2.2.1b3-20090215-r2890/include/openbabel/obmolecformat.h +--- openbabel-2.2.1b3-20090215-r2890/include/openbabel/obmolecformat.h.gcc43 2008-12-01 18:42:20.000000000 +0100 ++++ openbabel-2.2.1b3-20090215-r2890/include/openbabel/obmolecformat.h 2009-03-01 10:54:43.000000000 +0100 +@@ -23,6 +23,8 @@ GNU General Public License for more deta + #include + #endif -diff -up openbabel-2.2.0b7/src/formats/rxnformat.cpp.gcc43 openbabel-2.2.0b7/src/formats/rxnformat.cpp ---- openbabel-2.2.0b7/src/formats/rxnformat.cpp.gcc43 2008-06-21 15:58:01.000000000 +0200 -+++ openbabel-2.2.0b7/src/formats/rxnformat.cpp 2008-07-02 20:16:21.000000000 +0200 -@@ -16,6 +16,7 @@ GNU General Public License for more deta - #include "openbabel/babelconfig.h" - #include - #include +#include - #include "openbabel/mol.h" - #include "openbabel/obconversion.h" - #include "openbabel/reaction.h" -diff -up openbabel-2.2.0b7/src/formats/fchkformat.cpp.gcc43 openbabel-2.2.0b7/src/formats/fchkformat.cpp ---- openbabel-2.2.0b7/src/formats/fchkformat.cpp.gcc43 2008-06-13 22:48:02.000000000 +0200 -+++ openbabel-2.2.0b7/src/formats/fchkformat.cpp 2008-07-02 20:16:21.000000000 +0200 -@@ -12,6 +12,7 @@ GNU General Public License for more deta ++ + #include + #include + #include +diff -up openbabel-2.2.1b3-20090215-r2890/include/openbabel/xml.h.gcc43 openbabel-2.2.1b3-20090215-r2890/include/openbabel/xml.h +--- openbabel-2.2.1b3-20090215-r2890/include/openbabel/xml.h.gcc43 2008-12-01 18:42:19.000000000 +0100 ++++ openbabel-2.2.1b3-20090215-r2890/include/openbabel/xml.h 2009-03-01 10:54:43.000000000 +0100 +@@ -13,6 +13,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICU + GNU General Public License for more details. ***********************************************************************/ - #include +#include ++ + #include + #include + #include +diff -up openbabel-2.2.1b3-20090215-r2890/src/dlhandler_unix.cpp.gcc43 openbabel-2.2.1b3-20090215-r2890/src/dlhandler_unix.cpp +--- openbabel-2.2.1b3-20090215-r2890/src/dlhandler_unix.cpp.gcc43 2009-01-16 16:43:58.000000000 +0100 ++++ openbabel-2.2.1b3-20090215-r2890/src/dlhandler_unix.cpp 2009-03-01 10:59:50.000000000 +0100 +@@ -27,6 +27,7 @@ GNU General Public License for more deta + #include + #include + #include ++#include - // No diagnoalization yet. Perhaps for 2.2 -GRH - // #include -diff -up openbabel-2.2.0b7/src/fingerprint.cpp.gcc43 openbabel-2.2.0b7/src/fingerprint.cpp ---- openbabel-2.2.0b7/src/fingerprint.cpp.gcc43 2008-06-26 20:55:14.000000000 +0200 -+++ openbabel-2.2.0b7/src/fingerprint.cpp 2008-07-02 20:16:21.000000000 +0200 + using namespace std; + +diff -up openbabel-2.2.1b3-20090215-r2890/src/fingerprint.cpp.gcc43 openbabel-2.2.1b3-20090215-r2890/src/fingerprint.cpp +--- openbabel-2.2.1b3-20090215-r2890/src/fingerprint.cpp.gcc43 2008-12-01 18:42:02.000000000 +0100 ++++ openbabel-2.2.1b3-20090215-r2890/src/fingerprint.cpp 2009-03-01 10:54:43.000000000 +0100 @@ -21,7 +21,7 @@ GNU General Public License for more deta #include #include @@ -67,56 +68,66 @@ #include #include -diff -up openbabel-2.2.0b7/include/openbabel/xml.h.gcc43 openbabel-2.2.0b7/include/openbabel/xml.h ---- openbabel-2.2.0b7/include/openbabel/xml.h.gcc43 2008-06-21 15:58:05.000000000 +0200 -+++ openbabel-2.2.0b7/include/openbabel/xml.h 2008-07-02 20:16:21.000000000 +0200 -@@ -13,6 +13,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICU - GNU General Public License for more details. +diff -up openbabel-2.2.1b3-20090215-r2890/src/formats/fchkformat.cpp.gcc43 openbabel-2.2.1b3-20090215-r2890/src/formats/fchkformat.cpp +--- openbabel-2.2.1b3-20090215-r2890/src/formats/fchkformat.cpp.gcc43 2009-02-10 23:40:18.000000000 +0100 ++++ openbabel-2.2.1b3-20090215-r2890/src/formats/fchkformat.cpp 2009-03-01 10:54:43.000000000 +0100 +@@ -12,6 +12,7 @@ GNU General Public License for more deta ***********************************************************************/ + #include +#include -+ - #include - #include - #include -diff -up openbabel-2.2.0b7/include/openbabel/obconversion.h.gcc43 openbabel-2.2.0b7/include/openbabel/obconversion.h ---- openbabel-2.2.0b7/include/openbabel/obconversion.h.gcc43 2008-06-21 15:58:05.000000000 +0200 -+++ openbabel-2.2.0b7/include/openbabel/obconversion.h 2008-07-02 20:16:21.000000000 +0200 -@@ -28,6 +28,7 @@ GNU General Public License for more deta + + // No diagnoalization yet. Perhaps for 2.2 -GRH + // #include +diff -up openbabel-2.2.1b3-20090215-r2890/src/formats/rxnformat.cpp.gcc43 openbabel-2.2.1b3-20090215-r2890/src/formats/rxnformat.cpp +--- openbabel-2.2.1b3-20090215-r2890/src/formats/rxnformat.cpp.gcc43 2009-01-14 23:52:20.000000000 +0100 ++++ openbabel-2.2.1b3-20090215-r2890/src/formats/rxnformat.cpp 2009-03-01 10:54:43.000000000 +0100 +@@ -16,6 +16,7 @@ GNU General Public License for more deta + #include "openbabel/babelconfig.h" #include - #include + #include ++#include + #include "openbabel/mol.h" + #include "openbabel/obconversion.h" + #include "openbabel/reaction.h" +diff -up openbabel-2.2.1b3-20090215-r2890/src/obconversion.cpp.gcc43 openbabel-2.2.1b3-20090215-r2890/src/obconversion.cpp +--- openbabel-2.2.1b3-20090215-r2890/src/obconversion.cpp.gcc43 2009-01-28 21:38:24.000000000 +0100 ++++ openbabel-2.2.1b3-20090215-r2890/src/obconversion.cpp 2009-03-01 10:54:43.000000000 +0100 +@@ -38,6 +38,7 @@ GNU General Public License for more deta #include -+#include + #include + #include ++#include - #include - #include -diff -up openbabel-2.2.0b7/include/openbabel/data.h.gcc43 openbabel-2.2.0b7/include/openbabel/data.h ---- openbabel-2.2.0b7/include/openbabel/data.h.gcc43 2008-06-21 15:58:05.000000000 +0200 -+++ openbabel-2.2.0b7/include/openbabel/data.h 2008-07-02 20:16:21.000000000 +0200 -@@ -23,7 +23,7 @@ GNU General Public License for more deta - #include + #include - #include -- -+#include - #include - #include - #include -diff -up openbabel-2.2.0b7/include/openbabel/obmolecformat.h.gcc43 openbabel-2.2.0b7/include/openbabel/obmolecformat.h ---- openbabel-2.2.0b7/include/openbabel/obmolecformat.h.gcc43 2008-06-21 15:58:05.000000000 +0200 -+++ openbabel-2.2.0b7/include/openbabel/obmolecformat.h 2008-07-02 20:16:21.000000000 +0200 -@@ -23,6 +23,8 @@ GNU General Public License for more deta - #include - #endif +diff -up openbabel-2.2.1b3-20090215-r2890/src/residue.cpp.gcc43 openbabel-2.2.1b3-20090215-r2890/src/residue.cpp +--- openbabel-2.2.1b3-20090215-r2890/src/residue.cpp.gcc43 2008-12-01 18:42:02.000000000 +0100 ++++ openbabel-2.2.1b3-20090215-r2890/src/residue.cpp 2009-03-01 10:54:43.000000000 +0100 +@@ -26,6 +26,8 @@ obtained in part or whole from RasMol2 b + // File Includes + /////////////////////////////////////////////////////////////////////////////// -+#include ++#include + - #include #include - #include -diff -up openbabel-2.2.0b7/tools/babel.cpp.gcc43 openbabel-2.2.0b7/tools/babel.cpp ---- openbabel-2.2.0b7/tools/babel.cpp.gcc43 2008-06-21 15:58:03.000000000 +0200 -+++ openbabel-2.2.0b7/tools/babel.cpp 2008-07-02 20:16:21.000000000 +0200 + + #include +diff -up openbabel-2.2.1b3-20090215-r2890/src/zipstreamimpl.h.gcc43 openbabel-2.2.1b3-20090215-r2890/src/zipstreamimpl.h +--- openbabel-2.2.1b3-20090215-r2890/src/zipstreamimpl.h.gcc43 2008-12-01 18:42:02.000000000 +0100 ++++ openbabel-2.2.1b3-20090215-r2890/src/zipstreamimpl.h 2009-03-01 10:54:43.000000000 +0100 +@@ -31,6 +31,8 @@ Altered by: Geoffrey Hutchison 2005 for + minor namespace modifications, VC++ compatibility + */ + ++#include ++ + //***************************************************************************** + // template class basic_zip_streambuf + //***************************************************************************** +diff -up openbabel-2.2.1b3-20090215-r2890/tools/babel.cpp.gcc43 openbabel-2.2.1b3-20090215-r2890/tools/babel.cpp +--- openbabel-2.2.1b3-20090215-r2890/tools/babel.cpp.gcc43 2008-12-01 18:42:04.000000000 +0100 ++++ openbabel-2.2.1b3-20090215-r2890/tools/babel.cpp 2009-03-01 10:54:43.000000000 +0100 @@ -42,6 +42,7 @@ extern "C" int strncasecmp(const char *s #include #include openbabel-rpm.patch: Index: openbabel-rpm.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-rpm.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- openbabel-rpm.patch 6 Jul 2008 14:57:34 -0000 1.3 +++ openbabel-rpm.patch 1 Mar 2009 12:18:33 -0000 1.4 @@ -1,20 +1,7 @@ -diff -up openbabel-2.2.0/scripts/Makefile.am.r openbabel-2.2.0/scripts/Makefile.am ---- openbabel-2.2.0/scripts/Makefile.am.r 2008-07-03 20:25:54.000000000 +0200 -+++ openbabel-2.2.0/scripts/Makefile.am 2008-07-06 15:59:23.000000000 +0200 -@@ -63,8 +63,8 @@ ruby/openbabel_ruby.cpp: openbabel-ruby. - $(SWIG) -small -O -ruby -naturalvar -autorename -c++ -o $@ \ - -templatereduce -I$(top_srcdir)/include -I$(top_builddir)/include $<; - (cd ruby; ruby extconf.rb \ -- --with-openbabel-include=$(includedir)/openbabel-2.0 \ -- --with-openbabel-lib=$(libdir) ) -+ --with-openbabel-include=../../include/openbabel \ -+ --with-openbabel-lib=../../src/.libs ) - sed -e 's/rb_define_module(\"Openbabel\")/rb_define_module(\"OpenBabel\")/' -e 's/void Init_OpenBabel/void Init_openbabel/' ruby/openbabel_ruby.new - mv ruby/openbabel_ruby.new ruby/openbabel_ruby.cpp - endif # BUILD_RUBY -diff -up openbabel-2.2.0/scripts/perl/Makefile.PL.r openbabel-2.2.0/scripts/perl/Makefile.PL ---- openbabel-2.2.0/scripts/perl/Makefile.PL.r 2008-07-06 16:16:45.000000000 +0200 -+++ openbabel-2.2.0/scripts/perl/Makefile.PL 2008-07-06 16:48:59.000000000 +0200 +diff -up openbabel-2.2.1b3-20090215-r2890/scripts/Makefile.am.r openbabel-2.2.1b3-20090215-r2890/scripts/Makefile.am +diff -up openbabel-2.2.1b3-20090215-r2890/scripts/perl/Makefile.PL.r openbabel-2.2.1b3-20090215-r2890/scripts/perl/Makefile.PL +--- openbabel-2.2.1b3-20090215-r2890/scripts/perl/Makefile.PL.r 2008-12-01 18:41:42.000000000 +0100 ++++ openbabel-2.2.1b3-20090215-r2890/scripts/perl/Makefile.PL 2009-03-01 10:43:01.000000000 +0100 @@ -3,8 +3,8 @@ use ExtUtils::MakeMaker; use lib 'inc'; use Devel::CheckLib; Index: openbabel.spec =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- openbabel.spec 26 Feb 2009 08:21:12 -0000 1.45 +++ openbabel.spec 1 Mar 2009 12:18:33 -0000 1.46 @@ -4,12 +4,12 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]') -%define beta_ver %{nil} -%define beta_str %{nil} +%define beta_ver b3 +%define beta_str b3-20090215-r2890 Name: openbabel -Version: 2.2.0 -Release: 3%{?dist} +Version: 2.2.1 +Release: 0.1.%{beta_ver}%{?dist} Summary: Chemistry software file format converter License: GPLv2 Group: Applications/File @@ -89,16 +89,13 @@ Ruby wrapper for the Open Babel library. %prep -%setup -q -n %{name}-%{version}%{beta_ver} +%setup -q -n %{name}-%{version}%{beta_str} %patch -p1 -b .gcc43 %patch1 -p1 -b .r %patch2 -p1 -b .chk chmod 644 src/formats/{mmcif,fchk}format.cpp %build -# don't reference m4 include directory which isn't shipped in the tarball -# there's also a typo ("autconf" instead of "autoconf") -sed -i -e 's/ACLOCAL_AMFLAGS=/#ACLOCAL_AMFLAGS=/g' Makefile.am autoreconf --force --install %configure --enable-shared=yes --enable-static=no --disable-inchi --enable-maintainer-mode %{__make} %{?_smp_mflags} @@ -113,6 +110,7 @@ popd pushd scripts/ruby +ruby extconf.rb --with-openbabel-include=../../include --with-openbabel-lib=../../src/.libs %{__make} %{?_smp_mflags} popd @@ -140,9 +138,6 @@ %{__make} install DESTDIR=$RPM_BUILD_ROOT popd -# work around testsuite crash -%{__rm} src/formats/.libs/*.soT - %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -188,6 +183,10 @@ %{ruby_sitearch}/openbabel.so %changelog +* Sun Mar 01 2009 Dominik Mierzejewski 2.2.1-0.1.b3 +- update to 2.2.1 beta3 +- drop some obsolete workarounds + * Thu Feb 26 2009 Fedora Release Engineering - 2.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 6 Jul 2008 14:57:34 -0000 1.12 +++ sources 1 Mar 2009 12:18:33 -0000 1.13 @@ -1 +1 @@ -643a18c7ba09254d36e93afd6277346f openbabel-2.2.0.tar.gz +b71b29d0e42dbcd779bded9f583a172f openbabel-2.2.1b3-20090215-r2890.tar.gz From ensc at fedoraproject.org Sun Mar 1 12:26:51 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sun, 1 Mar 2009 12:26:51 +0000 (UTC) Subject: rpms/dietlibc/devel dietlibc.spec,1.62,1.63 Message-ID: <20090301122651.6542B70115@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/dietlibc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15293 Modified Files: dietlibc.spec Log Message: updated Index: dietlibc.spec =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- dietlibc.spec 1 Mar 2009 12:00:59 -0000 1.62 +++ dietlibc.spec 1 Mar 2009 12:26:20 -0000 1.63 @@ -28,7 +28,7 @@ Summary: Small libc implementation Name: dietlibc Version: 0.31 -Release: %release_func 7%{?snapshot:.%snapshot} +Release: %release_func 8%{?snapshot:.%snapshot} License: GPLv2 Group: Development/Libraries URL: http://www.fefe.de/dietlibc/ @@ -66,7 +66,7 @@ Summary: dietlibc development files Group: Development/Libraries Requires: %name = %version-%release - +BuildArch: noarch %package lib Summary: Dynamic libraries for dietlibc From mjakubicek at fedoraproject.org Sun Mar 1 12:36:44 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Sun, 1 Mar 2009 12:36:44 +0000 (UTC) Subject: rpms/weka/F-10 weka.desktop, NONE, 1.1 weka.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090301123644.A12BC70115@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/weka/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17786/F-10 Modified Files: sources Added Files: weka.desktop weka.spec Log Message: - Initial commit into F-10/F-9 branches --- NEW FILE weka.desktop --- [Desktop Entry] Name=Weka GenericName=Waikato Environment for Knowledge Analysis GenericName[de]=Waikato - System f??r Wissensanalyse GenericName[cs]=Waikato - syst??m pro anal??zu znalost?? Comment=Start Weka Comment[de]=Weka starten Comment[cs]=Spustit Weku Exec=weka Terminal=false Type=Application Icon=weka Categories=Education;Science;ArtificialIntelligence; --- NEW FILE weka.spec --- %global _version 3-6-0 # whether to run jUnit tests, caution: takes horribly long # currently disabled as the tests fail, filed in upstream's bugtracker: # https://sourceforge.net/tracker2/?func=detail&aid=2648813&group_id=5091&atid=105091 # %%global _with_tests 1 Name: weka Version: 3.6.0 Release: 3%{?dist} Summary: Waikato Environment for Knowledge Analysis Group: Applications/Engineering License: GPLv2+ URL: http://www.cs.waikato.ac.nz/ml/%{name}/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{_version}.zip # wrapper script: Source1: weka.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils BuildRequires: ant BuildRequires: desktop-file-utils BuildRequires: ImageMagick BuildRequires: junit Requires: java >= 1:1.6.0 Requires: jpackage-utils %description Weka is a collection of machine learning algorithms for data mining tasks. The algorithms can either be applied directly to a dataset or called from your own Java code. Weka contains tools for data pre-processing, classification, regression, clustering, association rules, and visualization. It is also well-suited for developing new machine learning schemes. %package javadoc Summary: Javadocs for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{_version} # unzip the sources jar unzip %{name}-src.jar # remove prebuilt jars find -name '*.jar' -o -name '*.class' -delete # we won't run JUnit tests and 128m for making javadocs was not enough:( sed -i -e 's/name="lib" value="lib"/name="lib" value="src"/' -e 's/maxmemory="128m"/maxmemory="256m"/' build.xml %build ant compile %if %{?_with_tests:1}%{!?_with_tests:0} %check CLASSPATH=/usr/share/java/junit.jar ant run_tests %endif %install rm -rf $RPM_BUILD_ROOT # jar ant exejar mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p dist/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # javadoc ant docs mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # wrapper script mkdir -p $RPM_BUILD_ROOT%{_bindir} cat > $RPM_BUILD_ROOT%{_bindir}/%{name} <<-EOF #!/bin/bash . /usr/share/java-utils/java-functions MAIN_CLASS="weka.gui.GUIChooser" set_classpath "weka.jar" run "$@" EOF chmod a+x $RPM_BUILD_ROOT%{_bindir}/%{name} # desktop file and icon desktop-file-install \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} # convert icon to png convert %{name}.ico %{name}.png install -Dp %{name}.png ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/32x32/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,-) %{_javadir}/%{name}.jar %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %doc documentation.html %doc documentation.css %doc WekaManual.pdf %doc COPYING %doc README %doc changelogs %doc data %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog * Sat Feb 28 2009 Milos Jakubicek - 3.6.0-3 - Fixed desktop file name - Added optional running junit tests into %%check, added BR:junit - Fixed changelog entry * Wed Feb 25 2009 Milos Jakubicek - 3.6.0-2 - Running gtk-update-icon-cache - Converting icon to png, added BR:ImageMagick, changed icon path in desktop file "weka" only - java/java-devel R: and BR: made versioned to >= 1:1.6.0 - removed vendor tag in desktop-file-install according to the guidelines for new packages. * Wed Jan 14 2009 Milos Jakubicek - 3.6.0-1 - Initial release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/weka/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2009 23:41:59 -0000 1.1 +++ sources 1 Mar 2009 12:36:12 -0000 1.2 @@ -0,0 +1 @@ +a782afc9b2a84ed34db4e631545955f5 weka-3-6-0.zip From mjakubicek at fedoraproject.org Sun Mar 1 12:36:44 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Sun, 1 Mar 2009 12:36:44 +0000 (UTC) Subject: rpms/weka/F-9 weka.desktop, NONE, 1.1 weka.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090301123644.CBB4270116@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/weka/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17786/F-9 Modified Files: sources Added Files: weka.desktop weka.spec Log Message: - Initial commit into F-10/F-9 branches --- NEW FILE weka.desktop --- [Desktop Entry] Name=Weka GenericName=Waikato Environment for Knowledge Analysis GenericName[de]=Waikato - System f??r Wissensanalyse GenericName[cs]=Waikato - syst??m pro anal??zu znalost?? Comment=Start Weka Comment[de]=Weka starten Comment[cs]=Spustit Weku Exec=weka Terminal=false Type=Application Icon=weka Categories=Education;Science;ArtificialIntelligence; --- NEW FILE weka.spec --- %global _version 3-6-0 # whether to run jUnit tests, caution: takes horribly long # currently disabled as the tests fail, filed in upstream's bugtracker: # https://sourceforge.net/tracker2/?func=detail&aid=2648813&group_id=5091&atid=105091 # %%global _with_tests 1 Name: weka Version: 3.6.0 Release: 3%{?dist} Summary: Waikato Environment for Knowledge Analysis Group: Applications/Engineering License: GPLv2+ URL: http://www.cs.waikato.ac.nz/ml/%{name}/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{_version}.zip # wrapper script: Source1: weka.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils BuildRequires: ant BuildRequires: desktop-file-utils BuildRequires: ImageMagick BuildRequires: junit Requires: java >= 1:1.6.0 Requires: jpackage-utils %description Weka is a collection of machine learning algorithms for data mining tasks. The algorithms can either be applied directly to a dataset or called from your own Java code. Weka contains tools for data pre-processing, classification, regression, clustering, association rules, and visualization. It is also well-suited for developing new machine learning schemes. %package javadoc Summary: Javadocs for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{_version} # unzip the sources jar unzip %{name}-src.jar # remove prebuilt jars find -name '*.jar' -o -name '*.class' -delete # we won't run JUnit tests and 128m for making javadocs was not enough:( sed -i -e 's/name="lib" value="lib"/name="lib" value="src"/' -e 's/maxmemory="128m"/maxmemory="256m"/' build.xml %build ant compile %if %{?_with_tests:1}%{!?_with_tests:0} %check CLASSPATH=/usr/share/java/junit.jar ant run_tests %endif %install rm -rf $RPM_BUILD_ROOT # jar ant exejar mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p dist/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # javadoc ant docs mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # wrapper script mkdir -p $RPM_BUILD_ROOT%{_bindir} cat > $RPM_BUILD_ROOT%{_bindir}/%{name} <<-EOF #!/bin/bash . /usr/share/java-utils/java-functions MAIN_CLASS="weka.gui.GUIChooser" set_classpath "weka.jar" run "$@" EOF chmod a+x $RPM_BUILD_ROOT%{_bindir}/%{name} # desktop file and icon desktop-file-install \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} # convert icon to png convert %{name}.ico %{name}.png install -Dp %{name}.png ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/32x32/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,-) %{_javadir}/%{name}.jar %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %doc documentation.html %doc documentation.css %doc WekaManual.pdf %doc COPYING %doc README %doc changelogs %doc data %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog * Sat Feb 28 2009 Milos Jakubicek - 3.6.0-3 - Fixed desktop file name - Added optional running junit tests into %%check, added BR:junit - Fixed changelog entry * Wed Feb 25 2009 Milos Jakubicek - 3.6.0-2 - Running gtk-update-icon-cache - Converting icon to png, added BR:ImageMagick, changed icon path in desktop file "weka" only - java/java-devel R: and BR: made versioned to >= 1:1.6.0 - removed vendor tag in desktop-file-install according to the guidelines for new packages. * Wed Jan 14 2009 Milos Jakubicek - 3.6.0-1 - Initial release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/weka/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2009 23:41:59 -0000 1.1 +++ sources 1 Mar 2009 12:36:14 -0000 1.2 @@ -0,0 +1 @@ +a782afc9b2a84ed34db4e631545955f5 weka-3-6-0.zip From timlau at fedoraproject.org Sun Mar 1 12:39:23 2009 From: timlau at fedoraproject.org (Tim Lauridsen) Date: Sun, 1 Mar 2009 12:39:23 +0000 (UTC) Subject: rpms/yum-utils/devel .cvsignore, 1.26, 1.27 sources, 1.28, 1.29 yum-utils.spec, 1.54, 1.55 Message-ID: <20090301123923.35DBF70115@cvs1.fedora.phx.redhat.com> Author: timlau Update of /cvs/pkgs/rpms/yum-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18477 Modified Files: .cvsignore sources yum-utils.spec Log Message: Release 1.1.20 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/yum-utils/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 18 Dec 2008 12:21:16 -0000 1.26 +++ .cvsignore 1 Mar 2009 12:38:52 -0000 1.27 @@ -1 +1 @@ -yum-utils-1.1.19.tar.gz +yum-utils-1.1.20.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/yum-utils/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 18 Dec 2008 12:21:16 -0000 1.28 +++ sources 1 Mar 2009 12:38:52 -0000 1.29 @@ -1 +1 @@ -ebd74b37c9d87ebcce43670f94ceedf4 yum-utils-1.1.19.tar.gz +cb98191c2545b72edecf26ba46ded94a yum-utils-1.1.20.tar.gz Index: yum-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- yum-utils.spec 25 Feb 2009 18:26:28 -0000 1.54 +++ yum-utils.spec 1 Mar 2009 12:38:52 -0000 1.55 @@ -1,15 +1,14 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.1.19 -Release: 3%{?dist} +Version: 1.1.20 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz URL: http://yum.baseurl.org/download/yum-utils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python >= 2.4 , yum >= 3.2.20 -BuildRequires: python +Requires: python >= 2.4 , yum >= 3.2.22 %description yum-utils is a collection of utilities and examples for the yum package @@ -22,6 +21,9 @@ %package -n yum-updateonboot Summary: Run yum update on system boot Group: System Environment/Base +Provides: yum-updateonboot +Obsoletes: yum-updateonboot < 1.1.20-0 +Conflicts: yum-updateonboot < 1.1.20-0 Requires: python, yum >= 2.4 Requires(pre): chkconfig Requires(post): chkconfig @@ -31,276 +33,326 @@ off for an extended amount of time to become secure immediately, instead of waiting until the next early morning cron job. -%package -n yum-changelog +%package -n yum-plugin-changelog Summary: Yum plugin for viewing package changelogs before/after updating Group: System Environment/Base -Requires: yum >= 3.0 +Provides: yum-changelog +Obsoletes: yum-changelog < 1.1.20-0 +Conflicts: yum-changelog < 1.1.20-0 +Requires: yum >= 3.2.19 Requires: python-dateutil -%description -n yum-changelog +%description -n yum-plugin-changelog This plugin adds a command line option to allow viewing package changelog deltas before or after updating packages. -%package -n yum-fastestmirror +%package -n yum-plugin-fastestmirror Summary: Yum plugin which chooses fastest repository from a mirrorlist Group: System Environment/Base +Provides: yum-fastestmirror +Obsoletes: yum-fastestmirror < 1.1.20-0 +Conflicts: yum-fastestmirror < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-fastestmirror +%description -n yum-plugin-fastestmirror This plugin sorts each repository's mirrorlist by connection speed prior to downloading packages. -%package -n yum-fedorakmod -Summary: Yum plugin to handle fedora kernel modules. -Group: System Environment/Base -Requires: yum >= 3.0 - -%description -n yum-fedorakmod -Plugin for Yum to handle installation of kmod-foo type of kernel modules, -when new kernel versions are installed. -kmod-foo kernel modules is described by the Fedora Extras packaging standards. - -%package -n yum-protectbase +%package -n yum-plugin-protectbase Summary: Yum plugin to protect packages from certain repositories. Group: System Environment/Base +Provides: yum-protectbase +Obsoletes: yum-protectbase < 1.1.20-0 +Conflicts: yum-protectbase < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-protectbase +%description -n yum-plugin-protectbase This plugin allows certain repositories to be protected. Packages in the protected repositories can't be overridden by packages in non-protected repositories even if the non-protected repo has a later version. -%package -n yum-versionlock +%package -n yum-plugin-versionlock Summary: Yum plugin to lock specified packages from being updated Group: System Environment/Base +Provides: yum-versionlock +Obsoletes: yum-versionlock < 1.1.20-0 +Conflicts: yum-versionlock < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-versionlock +%description -n yum-plugin-versionlock This plugin takes a set of name/versions for packages and excludes all other versions of those packages (including optionally following obsoletes). This allows you to protect packages from being updated by newer versions, for example. -%package -n yum-tsflags +%package -n yum-plugin-tsflags Summary: Yum plugin to add tsflags by a commandline option Group: System Environment/Base +Provides: yum-tsflags +Obsoletes: yum-tsflags < 1.1.20-0 +Conflicts: yum-tsflags < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-tsflags +%description -n yum-plugin-tsflags This plugin allows you to specify optional transaction flags on the yum command line -%package -n yum-kernel-module -Summary: Yum plugin to handle kernel-module-foo type of kernel module -Group: System Environment/Base -Requires: yum >= 3.0 - -%description -n yum-kernel-module -This plugin handle installation of kernel-module-foo type of kernel modules when new version of -kernels are installed. - - -%package -n yum-downloadonly +%package -n yum-plugin-downloadonly Summary: Yum plugin to add downloadonly command option Group: System Environment/Base +Provides: yum-downloadonly +Obsoletes: yum-downloadonly < 1.1.20-0 +Conflicts: yum-downloadonly < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-downloadonly +%description -n yum-plugin-downloadonly This plugin adds a --downloadonly flag to yum so that yum will only download the packages and not install/update them. -%package -n yum-allowdowngrade +%package -n yum-plugin-allowdowngrade Summary: Yum plugin to enable manual downgrading of packages Group: System Environment/Base +Provides: yum-allowdowngrade +Obsoletes: yum-allowdowngrade < 1.1.20-0 +Conflicts: yum-allowdowngrade < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-allowdowngrade +%description -n yum-plugin-allowdowngrade This plugin adds a --allow-downgrade flag to yum to make it possible to manually downgrade packages to specific versions. -%package -n yum-skip-broken -Summary: Yum plugin to handle skiping packages with dependency problems -Group: System Environment/Base -Requires: yum >= 3.0 - -%description -n yum-skip-broken -This plugin adds a --skip-broken to yum to make it possible to -check packages for dependency problems and skip the one with problems. - -%package -n yum-priorities +%package -n yum-plugin-priorities Summary: plugin to give priorities to packages from different repos Group: System Environment/Base +Provides: yum-priorities +Obsoletes: yum-priorities < 1.1.20-0 +Conflicts: yum-priorities < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-priorities +%description -n yum-plugin-priorities This plugin allows repositories to have different priorities. Packages in a repository with a lower priority can't be overridden by packages from a repository with a higher priority even if repo has a later version. -%package -n yum-refresh-updatesd +%package -n yum-plugin-refresh-updatesd Summary: Tell yum-updatesd to check for updates when yum exits Group: System Environment/Base +Provides: yum-refresh-updatesd +Obsoletes: yum-refresh-updatesd < 1.1.20-0 +Conflicts: yum-refresh-updatesd < 1.1.20-0 Requires: yum >= 3.0 Requires: yum-updatesd -%description -n yum-refresh-updatesd +%description -n yum-plugin-refresh-updatesd yum-refresh-updatesd tells yum-updatesd to check for updates when yum exits. This way, if you run 'yum update' and install all available updates, puplet will almost instantly update itself to reflect this. -%package -n yum-merge-conf +%package -n yum-plugin-merge-conf Summary: Yum plugin to merge configuration changes when installing packages Group: System Environment/Base +Provides: yum-merge-conf +Obsoletes: yum-merge-conf < 1.1.20-0 +Conflicts: yum-merge-conf < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-merge-conf +%description -n yum-plugin-merge-conf This yum plugin adds the "--merge-conf" command line option. With this option, Yum will ask you what to do with config files which have changed on updating a package. -%package -n yum-security +%package -n yum-plugin-security Summary: Yum plugin to enable security filters Group: System Environment/Base +Provides: yum-security +Obsoletes: yum-security < 1.1.20-0 +Conflicts: yum-security < 1.1.20-0 Requires: yum >= 3.2.18 -%description -n yum-security +%description -n yum-plugin-security This plugin adds the options --security, --cve, --bz and --advisory flags to yum and the list-security and info-security commands. The options make it possible to limit list/upgrade of packages to specific security relevant ones. The commands give you the security information. -%package -n yum-protect-packages +%package -n yum-plugin-protect-packages Summary: Yum plugin to prevents Yum from removing itself and other protected packages Group: System Environment/Base +Provides: yum-protect-packages +Obsoletes: yum-protect-packages < 1.1.20-0 +Conflicts: yum-protect-packages < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-protect-packages +%description -n yum-plugin-protect-packages this plugin prevents Yum from removing itself and other protected packages. By default, yum is the only package protected, but by extension this automatically protects everything on which yum depends (rpm, python, glibc, and so on).Therefore, the plugin functions well even without compiling careful lists of all important packages. -%package -n yum-basearchonly +%package -n yum-plugin-basearchonly Summary: Yum plugin to let Yum install only basearch packages. Group: System Environment/Base +Provides: yum-basearchonly +Obsoletes: yum-basearchonly < 1.1.20-0 +Conflicts: yum-basearchonly < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-basearchonly +%description -n yum-plugin-basearchonly this plugin makes Yum only install basearch packages on multiarch systems. If you type 'yum install foo' on a x68_64 system, only 'foo-x.y.x86_46.rpm' is installed. If you want to install the foo-x.y.i386.rpm, you have to type 'yum install foo.i386'. The plugin only works with 'yum install'. -%package -n yum-upgrade-helper +%package -n yum-plugin-upgrade-helper Summary: Yum plugin to help upgrades to the next distribution version Group: System Environment/Base +Provides: yum-upgrade-helper +Obsoletes: yum-upgrade-helper < 1.1.20-0 +Conflicts: yum-upgrade-helper < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-upgrade-helper +%description -n yum-plugin-upgrade-helper this plugin allows yum to erase specific packages on install/update based on an additional metadata file in repositories. It is used to simplify distribution upgrade hangups. -%package -n yum-aliases +%package -n yum-plugin-aliases Summary: Yum plugin to enable aliases filters Group: System Environment/Base +Provides: yum-aliases +Obsoletes: yum-aliases < 1.1.20-0 +Conflicts: yum-aliases < 1.1.20-0 Requires: yum >= 3.0.5 -%description -n yum-aliases +%description -n yum-plugin-aliases This plugin adds the command alias, and parses the aliases config. file to enable aliases. -%package -n yum-list-data +%package -n yum-plugin-list-data Summary: Yum plugin to list aggregate package data Group: System Environment/Base +Provides: yum-list-data +Obsoletes: yum-list-data < 1.1.20-0 +Conflicts: yum-list-data < 1.1.20-0 Requires: yum >= 3.0.5 -%description -n yum-list-data +%description -n yum-plugin-list-data This plugin adds the commands list- vendors, groups, packagers, licenses, arches, committers, buildhosts, baseurls, package-sizes, archive-sizes and installed-sizes. -%package -n yum-filter-data +%package -n yum-plugin-filter-data Summary: Yum plugin to list filter based on package data Group: System Environment/Base +Provides: yum-filter-data +Obsoletes: yum-filter-data < 1.1.20-0 +Conflicts: yum-filter-data < 1.1.20-0 Requires: yum >= 3.2.17 -%description -n yum-filter-data +%description -n yum-plugin-filter-data This plugin adds the options --filter- vendors, groups, packagers, licenses, arches, committers, buildhosts, baseurls, package-sizes, archive-sizes and installed-sizes. Note that each package must match at least one pattern/range in each category, if any were specified. -%package -n yum-tmprepo +%package -n yum-plugin-tmprepo Summary: Yum plugin to add temporary repositories Group: System Environment/Base +Provides: yum-tmprepo +Obsoletes: yum-tmprepo < 1.1.20-0 +Conflicts: yum-tmprepo < 1.1.20-0 Requires: yum >= 3.2.11 Requires: createrepo -%description -n yum-tmprepo +%description -n yum-plugin-tmprepo This plugin adds the option --tmprepo which takes a url to a .repo file downloads it and enables it for a single run. This plugin tries to ensure that temporary repositories are safe to use, by default, by not allowing gpg checking to be disabled. -%package -n yum-verify +%package -n yum-plugin-verify Summary: Yum plugin to add verify command, and options Group: System Environment/Base +Provides: yum-verify +Obsoletes: yum-verify < 1.1.20-0 +Conflicts: yum-verify < 1.1.20-0 Requires: yum >= 3.2.12 -%description -n yum-verify +%description -n yum-plugin-verify This plugin adds the commands verify, verify-all and verify-rpm. There are also a couple of options. This command works like rpm -V, to verify your installation. -%package -n yum-keys +%package -n yum-plugin-keys Summary: Yum plugin to deal with signing keys Group: System Environment/Base +Provides: yum-keys +Obsoletes: yum-keys < 1.1.20-0 +Conflicts: yum-keys < 1.1.20-0 Requires: yum >= 3.2.19 -%description -n yum-keys +%description -n yum-plugin-keys This plugin adds the commands keys, keys-info, keys-data and keys-remove. They allow you to query and remove signing keys. -%package -n yum-remove-with-leaves +%package -n yum-plugin-remove-with-leaves Summary: Yum plugin to remove dependencies which are no longer used because of a removal Group: System Environment/Base +Provides: yum-remove-with-leaves +Obsoletes: yum-remove-with-leaves < 1.1.20-0 +Conflicts: yum-remove-with-leaves < 1.1.20-0 Requires: yum >= 3.2.19 -%description -n yum-remove-with-leaves +%description -n yum-plugin-remove-with-leaves This plugin removes any unused dependencies that were brought in by an install but would not normally be removed. It helps to keep a system clean of unused libraries and packages. -%package -n yum-post-transaction-actions +%package -n yum-plugin-post-transaction-actions Summary: Yum plugin to run arbitrary commands when certain pkgs are acted on Group: System Environment/Base +Provides: yum-post-transaction-actions +Obsoletes: yum-post-transaction-actions < 1.1.20-0 +Conflicts: yum-post-transaction-actions < 1.1.20-0 Requires: yum >= 3.2.19 -%description -n yum-post-transaction-actions +%description -n yum-plugin-post-transaction-actions This plugin allows the user to run arbitrary actions immediately following a transaction when specified packages are changed. %package -n yum-NetworkManager-dispatcher -Summary: Yum plugin to deal with changing networks with NetworkManager +Summary: NetworkManager script which tells yum to check it's cache on network change Group: System Environment/Base Requires: yum >= 3.2.17 %description -n yum-NetworkManager-dispatcher -This plugin forces yum to check it's cache if/when a new network connection -happens in NetworkManager. Note that currently there is no checking of -previous data, so if your WiFi keeps going up and down (or you suspend/resume -a lot) yum will recheck it's cached data a lot. +This NetworkManager "dispatch script" forces yum to check its cache if/when a +new network connection happens in NetworkManager. Note that currently there is +no checking of previous data, so if your WiFi keeps going up and down (or you +suspend/resume a lot) yum will recheck its cached data a lot. -%package -n yum-rpm-warm-cache +%package -n yum-plugin-rpm-warm-cache Summary: Yum plugin to access the rpmdb files early to warm up access to the db Group: System Environment/Base +Provides: yum-rpm-warm-cache +Obsoletes: yum-rpm-warm-cache < 1.1.20-0 +Conflicts: yum-rpm-warm-cache < 1.1.20-0 Requires: yum >= 3.2.19 -%description -n yum-rpm-warm-cache +%description -n yum-plugin-rpm-warm-cache This plugin reads the rpmdb files into the system cache before accessing the rpmdb directly. In some cases this should speed up access to rpmdb information +%package -n yum-plugin-auto-update-debuginfo +Summary: Yum plugin to enable automatic updates to installed debuginfo packages +Group: System Environment/Base +Requires: yum >= 3.2.19 + +%description -n yum-plugin-auto-update-debuginfo +This plugin looks to see if any debuginfo packages are installed, and if there +are it enables all debuginfo repositories that are "children" of enabled +repositories. + %prep %setup -q @@ -313,11 +365,9 @@ plugins="\ changelog \ fastestmirror \ - fedorakmod \ protectbase \ versionlock \ tsflags \ - kernel-module \ downloadonly \ allowdowngrade \ priorities \ @@ -336,6 +386,7 @@ remove-with-leaves \ post-transaction-actions \ rpm-warm-cache \ + auto-update-debuginfo \ " mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ @@ -402,29 +453,24 @@ %config(noreplace) %{_sysconfdir}/sysconfig/yum-updateonboot %{_initrddir}/yum-updateonboot -%files -n yum-changelog +%files -n yum-plugin-changelog %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/changelog.conf /usr/lib/yum-plugins/changelog.* %{_mandir}/man1/yum-changelog.1.* %{_mandir}/man5/yum-changelog.conf.5.* -%files -n yum-fastestmirror +%files -n yum-plugin-fastestmirror %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fastestmirror.conf /usr/lib/yum-plugins/fastestmirror*.* -%files -n yum-fedorakmod -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fedorakmod.conf -/usr/lib/yum-plugins/fedorakmod.* - -%files -n yum-protectbase +%files -n yum-plugin-protectbase %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protectbase.conf /usr/lib/yum-plugins/protectbase.* -%files -n yum-versionlock +%files -n yum-plugin-versionlock %defattr(-, root, root) %doc plugins/versionlock/README %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.conf @@ -433,93 +479,88 @@ %{_mandir}/man1/yum-versionlock.1.* %{_mandir}/man5/yum-versionlock.conf.5.* -%files -n yum-tsflags +%files -n yum-plugin-tsflags %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tsflags.conf /usr/lib/yum-plugins/tsflags.* -%files -n yum-kernel-module -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/kernel-module.conf -/usr/lib/yum-plugins/kernel-module.* - -%files -n yum-downloadonly +%files -n yum-plugin-downloadonly %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/downloadonly.conf /usr/lib/yum-plugins/downloadonly.* -%files -n yum-allowdowngrade +%files -n yum-plugin-allowdowngrade %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/allowdowngrade.conf /usr/lib/yum-plugins/allowdowngrade.* -%files -n yum-priorities +%files -n yum-plugin-priorities %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/priorities.conf /usr/lib/yum-plugins/priorities.* -%files -n yum-refresh-updatesd +%files -n yum-plugin-refresh-updatesd %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-updatesd.conf /usr/lib/yum-plugins/refresh-updatesd.* -%files -n yum-merge-conf +%files -n yum-plugin-merge-conf %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/merge-conf.conf /usr/lib/yum-plugins/merge-conf.* -%files -n yum-security +%files -n yum-plugin-security %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/security.conf /usr/lib/yum-plugins/security.* %{_mandir}/man8/yum-security.8.* -%files -n yum-protect-packages +%files -n yum-plugin-protect-packages %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protect-packages.conf /usr/lib/yum-plugins/protect-packages.* -%files -n yum-basearchonly +%files -n yum-plugin-basearchonly %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/basearchonly.conf /usr/lib/yum-plugins/basearchonly.* -%files -n yum-upgrade-helper +%files -n yum-plugin-upgrade-helper %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/upgrade-helper.conf /usr/lib/yum-plugins/upgrade-helper.* -%files -n yum-aliases +%files -n yum-plugin-aliases %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/aliases.conf %config(noreplace) %{_sysconfdir}/yum/aliases.conf /usr/lib/yum-plugins/aliases.* %{_mandir}/man1/yum-aliases.1.* -%files -n yum-list-data +%files -n yum-plugin-list-data %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/list-data.conf /usr/lib/yum-plugins/list-data.* %{_mandir}/man1/yum-list-data.1.* -%files -n yum-filter-data +%files -n yum-plugin-filter-data %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/filter-data.conf /usr/lib/yum-plugins/filter-data.* %{_mandir}/man1/yum-filter-data.1.* -%files -n yum-tmprepo +%files -n yum-plugin-tmprepo %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tmprepo.conf /usr/lib/yum-plugins/tmprepo.* -%files -n yum-verify +%files -n yum-plugin-verify %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/verify.conf /usr/lib/yum-plugins/verify.* %{_mandir}/man1/yum-verify.1.* -%files -n yum-keys +%files -n yum-plugin-keys %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/keys.conf /usr/lib/yum-plugins/keys.* @@ -528,12 +569,12 @@ %defattr(-, root, root) /etc/NetworkManager/dispatcher.d/* -%files -n yum-remove-with-leaves +%files -n yum-plugin-remove-with-leaves %defattr(-, root, root) /usr/lib/yum-plugins/remove-with-leaves.* %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/remove-with-leaves.conf -%files -n yum-post-transaction-actions +%files -n yum-plugin-post-transaction-actions %defattr(-, root, root) /usr/lib/yum-plugins/post-transaction-actions.* %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/post-transaction-actions.conf @@ -541,18 +582,28 @@ # Default *.action file dropping dir. %dir %{_sysconfdir}/yum/post-actions -%files -n yum-rpm-warm-cache +%files -n yum-plugin-rpm-warm-cache %defattr(-, root, root) /usr/lib/yum-plugins/rpm-warm-cache.* %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/rpm-warm-cache.conf +%files -n yum-plugin-auto-update-debuginfo +%defattr(-, root, root) +/usr/lib/yum-plugins/auto-update-debuginfo.* +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/auto-update-debuginfo.conf + %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 1.1.19-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Sun Mar 1 2009 Tim Lauridsen +- mark as 1.1.20 +- rename plugins from yum-name to yum-plugin-name + +* Wed Feb 25 2009 Tim Lauridsen +- Remove yum-kernel-module & yum-fedorakmod plugins (no obsoleting yet) +- Remove yum-skip-broken plugin leftovers -* Sat Feb 21 2009 Panu Matilainen -- add missing build dependency on python +* Tue Feb 3 2009 James Antill +- add auto-update-debuginfo plugin * Wed Dec 17 2008 Tim Lauridsen - mark as 1.1.19 From ensc at fedoraproject.org Sun Mar 1 12:43:05 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sun, 1 Mar 2009 12:43:05 +0000 (UTC) Subject: rpms/dietlibc/devel dietlibc.spec,1.63,1.64 Message-ID: <20090301124305.A9BBD70115@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/dietlibc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19234 Modified Files: dietlibc.spec Log Message: updated Index: dietlibc.spec =================================================================== RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- dietlibc.spec 1 Mar 2009 12:26:20 -0000 1.63 +++ dietlibc.spec 1 Mar 2009 12:42:34 -0000 1.64 @@ -66,6 +66,14 @@ Summary: dietlibc development files Group: Development/Libraries Requires: %name = %version-%release +Requires: %name-header = %version-%release + +%package header +Summary: dietlibc header files +Group: Development/Libraries +Requires: %name = %version-%release +Requires(pre): %name-devel = %version-%release +Requires: %name-devel = %version-%release BuildArch: noarch %package lib @@ -84,7 +92,14 @@ used to create small statically linked binaries for Linux on alpha, arm, hppa, ia64, i386, mips, s390, sparc, sparc64, ppc and x86_64. -This package contains the header and object files for dietlibc. +This package contains the object files for dietlibc. + +%description header +The diet libc is a libc that is optimized for small size. It can be +used to create small statically linked binaries for Linux on alpha, +arm, hppa, ia64, i386, mips, s390, sparc, sparc64, ppc and x86_64. + +This package contains the header files for dietlibc. %description lib The diet libc is a libc that is optimized for small size. It can be @@ -181,9 +196,15 @@ %_bindir/* +%files header +%defattr(-,root,root,-) +%pkglibdir/include + + %files devel %defattr(-,root,root,-) %pkglibdir +%exclude %pkglibdir/include %{?with_dynamic:%exclude %pkglibdir/*/*.so} @@ -198,6 +219,9 @@ %changelog +* Sun Mar 1 2009 Enrico Scholz - 0.31-8.20090228 +- splitted a noarch -header subpackage out of -devel + * Sun Mar 1 2009 Enrico Scholz - 0.31-7.20090228 - updated to 20090228 - updated patches From lkundrak at fedoraproject.org Sun Mar 1 12:47:50 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Mar 2009 12:47:50 +0000 (UTC) Subject: rpms/sunbird/devel sunbird-0.9-gcc44.patch, NONE, 1.1 sunbird.spec, 1.20, 1.21 Message-ID: <20090301124750.ADD9B70115@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/sunbird/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20175 Modified Files: sunbird.spec Added Files: sunbird-0.9-gcc44.patch Log Message: * Sun Mar 1 2009 Lubomir Rintel 0.9-6 - Fix build with GCC 4.4 sunbird-0.9-gcc44.patch: --- NEW FILE sunbird-0.9-gcc44.patch --- Fix build with GCC 4.4. Lubomir Rintel diff -up mozilla/toolkit/xre/nsAppRunner.cpp.gcc44 mozilla/toolkit/xre/nsAppRunner.cpp --- mozilla/toolkit/xre/nsAppRunner.cpp.gcc44 2009-03-01 13:35:21.000000000 +0100 +++ mozilla/toolkit/xre/nsAppRunner.cpp 2009-03-01 13:35:44.000000000 +0100 @@ -1370,7 +1370,7 @@ XRE_GetBinaryPath(const char* argv0, nsI if (NS_FAILED(rv)) return rv; -#elif +#else #error Oops, you need platform-specific code here #endif Index: sunbird.spec =================================================================== RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sunbird.spec 26 Feb 2009 04:06:04 -0000 1.20 +++ sunbird.spec 1 Mar 2009 12:47:20 -0000 1.21 @@ -15,7 +15,7 @@ Name: sunbird Version: 0.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Calendar application built upon Mozilla toolkit Group: Applications/Productivity @@ -34,6 +34,7 @@ # build patches Patch2: sunbird-0.7-path.patch Patch3: sunbird-0.7-uilocale.patch +Patch4: sunbird-0.9-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -96,6 +97,7 @@ %patch0 -p1 -b .libical %patch2 -p1 -b .path %patch3 -p1 -b .uilocale +%patch4 -p1 -b .gcc44 # Fix source perms to avoid errors in the debuginfo RPM (bug 357661) find . -type f \( -name "*.cpp" -o -name "*.h" \) -exec chmod -x '{}' \; @@ -301,6 +303,9 @@ %changelog +* Sun Mar 1 2009 Lubomir Rintel 0.9-6 +- Fix build with GCC 4.4 + * Wed Feb 25 2009 Fedora Release Engineering - 0.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From timlau at fedoraproject.org Sun Mar 1 12:51:10 2009 From: timlau at fedoraproject.org (Tim Lauridsen) Date: Sun, 1 Mar 2009 12:51:10 +0000 (UTC) Subject: rpms/yum-utils/F-10 sources,1.28,1.29 yum-utils.spec,1.51,1.52 Message-ID: <20090301125110.DA81970115@cvs1.fedora.phx.redhat.com> Author: timlau Update of /cvs/pkgs/rpms/yum-utils/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20819 Modified Files: sources yum-utils.spec Log Message: Release 1.1.20 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/yum-utils/F-10/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 18 Dec 2008 12:30:34 -0000 1.28 +++ sources 1 Mar 2009 12:50:40 -0000 1.29 @@ -1 +1 @@ -ebd74b37c9d87ebcce43670f94ceedf4 yum-utils-1.1.19.tar.gz +cb98191c2545b72edecf26ba46ded94a yum-utils-1.1.20.tar.gz Index: yum-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/yum-utils/F-10/yum-utils.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- yum-utils.spec 18 Dec 2008 12:30:34 -0000 1.51 +++ yum-utils.spec 1 Mar 2009 12:50:40 -0000 1.52 @@ -1,6 +1,6 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.1.19 +Version: 1.1.20 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools @@ -8,7 +8,7 @@ URL: http://yum.baseurl.org/download/yum-utils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python >= 2.4 , yum >= 3.2.20 +Requires: python >= 2.4 , yum >= 3.2.22 %description yum-utils is a collection of utilities and examples for the yum package @@ -21,6 +21,9 @@ %package -n yum-updateonboot Summary: Run yum update on system boot Group: System Environment/Base +Provides: yum-updateonboot +Obsoletes: yum-updateonboot < 1.1.20-0 +Conflicts: yum-updateonboot < 1.1.20-0 Requires: python, yum >= 2.4 Requires(pre): chkconfig Requires(post): chkconfig @@ -30,276 +33,326 @@ off for an extended amount of time to become secure immediately, instead of waiting until the next early morning cron job. -%package -n yum-changelog +%package -n yum-plugin-changelog Summary: Yum plugin for viewing package changelogs before/after updating Group: System Environment/Base -Requires: yum >= 3.0 +Provides: yum-changelog +Obsoletes: yum-changelog < 1.1.20-0 +Conflicts: yum-changelog < 1.1.20-0 +Requires: yum >= 3.2.19 Requires: python-dateutil -%description -n yum-changelog +%description -n yum-plugin-changelog This plugin adds a command line option to allow viewing package changelog deltas before or after updating packages. -%package -n yum-fastestmirror +%package -n yum-plugin-fastestmirror Summary: Yum plugin which chooses fastest repository from a mirrorlist Group: System Environment/Base +Provides: yum-fastestmirror +Obsoletes: yum-fastestmirror < 1.1.20-0 +Conflicts: yum-fastestmirror < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-fastestmirror +%description -n yum-plugin-fastestmirror This plugin sorts each repository's mirrorlist by connection speed prior to downloading packages. -%package -n yum-fedorakmod -Summary: Yum plugin to handle fedora kernel modules. -Group: System Environment/Base -Requires: yum >= 3.0 - -%description -n yum-fedorakmod -Plugin for Yum to handle installation of kmod-foo type of kernel modules, -when new kernel versions are installed. -kmod-foo kernel modules is described by the Fedora Extras packaging standards. - -%package -n yum-protectbase +%package -n yum-plugin-protectbase Summary: Yum plugin to protect packages from certain repositories. Group: System Environment/Base +Provides: yum-protectbase +Obsoletes: yum-protectbase < 1.1.20-0 +Conflicts: yum-protectbase < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-protectbase +%description -n yum-plugin-protectbase This plugin allows certain repositories to be protected. Packages in the protected repositories can't be overridden by packages in non-protected repositories even if the non-protected repo has a later version. -%package -n yum-versionlock +%package -n yum-plugin-versionlock Summary: Yum plugin to lock specified packages from being updated Group: System Environment/Base +Provides: yum-versionlock +Obsoletes: yum-versionlock < 1.1.20-0 +Conflicts: yum-versionlock < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-versionlock +%description -n yum-plugin-versionlock This plugin takes a set of name/versions for packages and excludes all other versions of those packages (including optionally following obsoletes). This allows you to protect packages from being updated by newer versions, for example. -%package -n yum-tsflags +%package -n yum-plugin-tsflags Summary: Yum plugin to add tsflags by a commandline option Group: System Environment/Base +Provides: yum-tsflags +Obsoletes: yum-tsflags < 1.1.20-0 +Conflicts: yum-tsflags < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-tsflags +%description -n yum-plugin-tsflags This plugin allows you to specify optional transaction flags on the yum command line -%package -n yum-kernel-module -Summary: Yum plugin to handle kernel-module-foo type of kernel module -Group: System Environment/Base -Requires: yum >= 3.0 - -%description -n yum-kernel-module -This plugin handle installation of kernel-module-foo type of kernel modules when new version of -kernels are installed. - - -%package -n yum-downloadonly +%package -n yum-plugin-downloadonly Summary: Yum plugin to add downloadonly command option Group: System Environment/Base +Provides: yum-downloadonly +Obsoletes: yum-downloadonly < 1.1.20-0 +Conflicts: yum-downloadonly < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-downloadonly +%description -n yum-plugin-downloadonly This plugin adds a --downloadonly flag to yum so that yum will only download the packages and not install/update them. -%package -n yum-allowdowngrade +%package -n yum-plugin-allowdowngrade Summary: Yum plugin to enable manual downgrading of packages Group: System Environment/Base +Provides: yum-allowdowngrade +Obsoletes: yum-allowdowngrade < 1.1.20-0 +Conflicts: yum-allowdowngrade < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-allowdowngrade +%description -n yum-plugin-allowdowngrade This plugin adds a --allow-downgrade flag to yum to make it possible to manually downgrade packages to specific versions. -%package -n yum-skip-broken -Summary: Yum plugin to handle skiping packages with dependency problems -Group: System Environment/Base -Requires: yum >= 3.0 - -%description -n yum-skip-broken -This plugin adds a --skip-broken to yum to make it possible to -check packages for dependency problems and skip the one with problems. - -%package -n yum-priorities +%package -n yum-plugin-priorities Summary: plugin to give priorities to packages from different repos Group: System Environment/Base +Provides: yum-priorities +Obsoletes: yum-priorities < 1.1.20-0 +Conflicts: yum-priorities < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-priorities +%description -n yum-plugin-priorities This plugin allows repositories to have different priorities. Packages in a repository with a lower priority can't be overridden by packages from a repository with a higher priority even if repo has a later version. -%package -n yum-refresh-updatesd +%package -n yum-plugin-refresh-updatesd Summary: Tell yum-updatesd to check for updates when yum exits Group: System Environment/Base +Provides: yum-refresh-updatesd +Obsoletes: yum-refresh-updatesd < 1.1.20-0 +Conflicts: yum-refresh-updatesd < 1.1.20-0 Requires: yum >= 3.0 Requires: yum-updatesd -%description -n yum-refresh-updatesd +%description -n yum-plugin-refresh-updatesd yum-refresh-updatesd tells yum-updatesd to check for updates when yum exits. This way, if you run 'yum update' and install all available updates, puplet will almost instantly update itself to reflect this. -%package -n yum-merge-conf +%package -n yum-plugin-merge-conf Summary: Yum plugin to merge configuration changes when installing packages Group: System Environment/Base +Provides: yum-merge-conf +Obsoletes: yum-merge-conf < 1.1.20-0 +Conflicts: yum-merge-conf < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-merge-conf +%description -n yum-plugin-merge-conf This yum plugin adds the "--merge-conf" command line option. With this option, Yum will ask you what to do with config files which have changed on updating a package. -%package -n yum-security +%package -n yum-plugin-security Summary: Yum plugin to enable security filters Group: System Environment/Base +Provides: yum-security +Obsoletes: yum-security < 1.1.20-0 +Conflicts: yum-security < 1.1.20-0 Requires: yum >= 3.2.18 -%description -n yum-security +%description -n yum-plugin-security This plugin adds the options --security, --cve, --bz and --advisory flags to yum and the list-security and info-security commands. The options make it possible to limit list/upgrade of packages to specific security relevant ones. The commands give you the security information. -%package -n yum-protect-packages +%package -n yum-plugin-protect-packages Summary: Yum plugin to prevents Yum from removing itself and other protected packages Group: System Environment/Base +Provides: yum-protect-packages +Obsoletes: yum-protect-packages < 1.1.20-0 +Conflicts: yum-protect-packages < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-protect-packages +%description -n yum-plugin-protect-packages this plugin prevents Yum from removing itself and other protected packages. By default, yum is the only package protected, but by extension this automatically protects everything on which yum depends (rpm, python, glibc, and so on).Therefore, the plugin functions well even without compiling careful lists of all important packages. -%package -n yum-basearchonly +%package -n yum-plugin-basearchonly Summary: Yum plugin to let Yum install only basearch packages. Group: System Environment/Base +Provides: yum-basearchonly +Obsoletes: yum-basearchonly < 1.1.20-0 +Conflicts: yum-basearchonly < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-basearchonly +%description -n yum-plugin-basearchonly this plugin makes Yum only install basearch packages on multiarch systems. If you type 'yum install foo' on a x68_64 system, only 'foo-x.y.x86_46.rpm' is installed. If you want to install the foo-x.y.i386.rpm, you have to type 'yum install foo.i386'. The plugin only works with 'yum install'. -%package -n yum-upgrade-helper +%package -n yum-plugin-upgrade-helper Summary: Yum plugin to help upgrades to the next distribution version Group: System Environment/Base +Provides: yum-upgrade-helper +Obsoletes: yum-upgrade-helper < 1.1.20-0 +Conflicts: yum-upgrade-helper < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-upgrade-helper +%description -n yum-plugin-upgrade-helper this plugin allows yum to erase specific packages on install/update based on an additional metadata file in repositories. It is used to simplify distribution upgrade hangups. -%package -n yum-aliases +%package -n yum-plugin-aliases Summary: Yum plugin to enable aliases filters Group: System Environment/Base +Provides: yum-aliases +Obsoletes: yum-aliases < 1.1.20-0 +Conflicts: yum-aliases < 1.1.20-0 Requires: yum >= 3.0.5 -%description -n yum-aliases +%description -n yum-plugin-aliases This plugin adds the command alias, and parses the aliases config. file to enable aliases. -%package -n yum-list-data +%package -n yum-plugin-list-data Summary: Yum plugin to list aggregate package data Group: System Environment/Base +Provides: yum-list-data +Obsoletes: yum-list-data < 1.1.20-0 +Conflicts: yum-list-data < 1.1.20-0 Requires: yum >= 3.0.5 -%description -n yum-list-data +%description -n yum-plugin-list-data This plugin adds the commands list- vendors, groups, packagers, licenses, arches, committers, buildhosts, baseurls, package-sizes, archive-sizes and installed-sizes. -%package -n yum-filter-data +%package -n yum-plugin-filter-data Summary: Yum plugin to list filter based on package data Group: System Environment/Base +Provides: yum-filter-data +Obsoletes: yum-filter-data < 1.1.20-0 +Conflicts: yum-filter-data < 1.1.20-0 Requires: yum >= 3.2.17 -%description -n yum-filter-data +%description -n yum-plugin-filter-data This plugin adds the options --filter- vendors, groups, packagers, licenses, arches, committers, buildhosts, baseurls, package-sizes, archive-sizes and installed-sizes. Note that each package must match at least one pattern/range in each category, if any were specified. -%package -n yum-tmprepo +%package -n yum-plugin-tmprepo Summary: Yum plugin to add temporary repositories Group: System Environment/Base +Provides: yum-tmprepo +Obsoletes: yum-tmprepo < 1.1.20-0 +Conflicts: yum-tmprepo < 1.1.20-0 Requires: yum >= 3.2.11 Requires: createrepo -%description -n yum-tmprepo +%description -n yum-plugin-tmprepo This plugin adds the option --tmprepo which takes a url to a .repo file downloads it and enables it for a single run. This plugin tries to ensure that temporary repositories are safe to use, by default, by not allowing gpg checking to be disabled. -%package -n yum-verify +%package -n yum-plugin-verify Summary: Yum plugin to add verify command, and options Group: System Environment/Base +Provides: yum-verify +Obsoletes: yum-verify < 1.1.20-0 +Conflicts: yum-verify < 1.1.20-0 Requires: yum >= 3.2.12 -%description -n yum-verify +%description -n yum-plugin-verify This plugin adds the commands verify, verify-all and verify-rpm. There are also a couple of options. This command works like rpm -V, to verify your installation. -%package -n yum-keys +%package -n yum-plugin-keys Summary: Yum plugin to deal with signing keys Group: System Environment/Base +Provides: yum-keys +Obsoletes: yum-keys < 1.1.20-0 +Conflicts: yum-keys < 1.1.20-0 Requires: yum >= 3.2.19 -%description -n yum-keys +%description -n yum-plugin-keys This plugin adds the commands keys, keys-info, keys-data and keys-remove. They allow you to query and remove signing keys. -%package -n yum-remove-with-leaves +%package -n yum-plugin-remove-with-leaves Summary: Yum plugin to remove dependencies which are no longer used because of a removal Group: System Environment/Base +Provides: yum-remove-with-leaves +Obsoletes: yum-remove-with-leaves < 1.1.20-0 +Conflicts: yum-remove-with-leaves < 1.1.20-0 Requires: yum >= 3.2.19 -%description -n yum-remove-with-leaves +%description -n yum-plugin-remove-with-leaves This plugin removes any unused dependencies that were brought in by an install but would not normally be removed. It helps to keep a system clean of unused libraries and packages. -%package -n yum-post-transaction-actions +%package -n yum-plugin-post-transaction-actions Summary: Yum plugin to run arbitrary commands when certain pkgs are acted on Group: System Environment/Base +Provides: yum-post-transaction-actions +Obsoletes: yum-post-transaction-actions < 1.1.20-0 +Conflicts: yum-post-transaction-actions < 1.1.20-0 Requires: yum >= 3.2.19 -%description -n yum-post-transaction-actions +%description -n yum-plugin-post-transaction-actions This plugin allows the user to run arbitrary actions immediately following a transaction when specified packages are changed. %package -n yum-NetworkManager-dispatcher -Summary: Yum plugin to deal with changing networks with NetworkManager +Summary: NetworkManager script which tells yum to check it's cache on network change Group: System Environment/Base Requires: yum >= 3.2.17 %description -n yum-NetworkManager-dispatcher -This plugin forces yum to check it's cache if/when a new network connection -happens in NetworkManager. Note that currently there is no checking of -previous data, so if your WiFi keeps going up and down (or you suspend/resume -a lot) yum will recheck it's cached data a lot. +This NetworkManager "dispatch script" forces yum to check its cache if/when a +new network connection happens in NetworkManager. Note that currently there is +no checking of previous data, so if your WiFi keeps going up and down (or you +suspend/resume a lot) yum will recheck its cached data a lot. -%package -n yum-rpm-warm-cache +%package -n yum-plugin-rpm-warm-cache Summary: Yum plugin to access the rpmdb files early to warm up access to the db Group: System Environment/Base +Provides: yum-rpm-warm-cache +Obsoletes: yum-rpm-warm-cache < 1.1.20-0 +Conflicts: yum-rpm-warm-cache < 1.1.20-0 Requires: yum >= 3.2.19 -%description -n yum-rpm-warm-cache +%description -n yum-plugin-rpm-warm-cache This plugin reads the rpmdb files into the system cache before accessing the rpmdb directly. In some cases this should speed up access to rpmdb information +%package -n yum-plugin-auto-update-debuginfo +Summary: Yum plugin to enable automatic updates to installed debuginfo packages +Group: System Environment/Base +Requires: yum >= 3.2.19 + +%description -n yum-plugin-auto-update-debuginfo +This plugin looks to see if any debuginfo packages are installed, and if there +are it enables all debuginfo repositories that are "children" of enabled +repositories. + %prep %setup -q @@ -312,11 +365,9 @@ plugins="\ changelog \ fastestmirror \ - fedorakmod \ protectbase \ versionlock \ tsflags \ - kernel-module \ downloadonly \ allowdowngrade \ priorities \ @@ -335,6 +386,7 @@ remove-with-leaves \ post-transaction-actions \ rpm-warm-cache \ + auto-update-debuginfo \ " mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ @@ -401,29 +453,24 @@ %config(noreplace) %{_sysconfdir}/sysconfig/yum-updateonboot %{_initrddir}/yum-updateonboot -%files -n yum-changelog +%files -n yum-plugin-changelog %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/changelog.conf /usr/lib/yum-plugins/changelog.* %{_mandir}/man1/yum-changelog.1.* %{_mandir}/man5/yum-changelog.conf.5.* -%files -n yum-fastestmirror +%files -n yum-plugin-fastestmirror %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fastestmirror.conf /usr/lib/yum-plugins/fastestmirror*.* -%files -n yum-fedorakmod -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fedorakmod.conf -/usr/lib/yum-plugins/fedorakmod.* - -%files -n yum-protectbase +%files -n yum-plugin-protectbase %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protectbase.conf /usr/lib/yum-plugins/protectbase.* -%files -n yum-versionlock +%files -n yum-plugin-versionlock %defattr(-, root, root) %doc plugins/versionlock/README %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.conf @@ -432,93 +479,88 @@ %{_mandir}/man1/yum-versionlock.1.* %{_mandir}/man5/yum-versionlock.conf.5.* -%files -n yum-tsflags +%files -n yum-plugin-tsflags %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tsflags.conf /usr/lib/yum-plugins/tsflags.* -%files -n yum-kernel-module -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/kernel-module.conf -/usr/lib/yum-plugins/kernel-module.* - -%files -n yum-downloadonly +%files -n yum-plugin-downloadonly %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/downloadonly.conf /usr/lib/yum-plugins/downloadonly.* -%files -n yum-allowdowngrade +%files -n yum-plugin-allowdowngrade %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/allowdowngrade.conf /usr/lib/yum-plugins/allowdowngrade.* -%files -n yum-priorities +%files -n yum-plugin-priorities %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/priorities.conf /usr/lib/yum-plugins/priorities.* -%files -n yum-refresh-updatesd +%files -n yum-plugin-refresh-updatesd %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-updatesd.conf /usr/lib/yum-plugins/refresh-updatesd.* -%files -n yum-merge-conf +%files -n yum-plugin-merge-conf %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/merge-conf.conf /usr/lib/yum-plugins/merge-conf.* -%files -n yum-security +%files -n yum-plugin-security %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/security.conf /usr/lib/yum-plugins/security.* %{_mandir}/man8/yum-security.8.* -%files -n yum-protect-packages +%files -n yum-plugin-protect-packages %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protect-packages.conf /usr/lib/yum-plugins/protect-packages.* -%files -n yum-basearchonly +%files -n yum-plugin-basearchonly %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/basearchonly.conf /usr/lib/yum-plugins/basearchonly.* -%files -n yum-upgrade-helper +%files -n yum-plugin-upgrade-helper %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/upgrade-helper.conf /usr/lib/yum-plugins/upgrade-helper.* -%files -n yum-aliases +%files -n yum-plugin-aliases %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/aliases.conf %config(noreplace) %{_sysconfdir}/yum/aliases.conf /usr/lib/yum-plugins/aliases.* %{_mandir}/man1/yum-aliases.1.* -%files -n yum-list-data +%files -n yum-plugin-list-data %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/list-data.conf /usr/lib/yum-plugins/list-data.* %{_mandir}/man1/yum-list-data.1.* -%files -n yum-filter-data +%files -n yum-plugin-filter-data %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/filter-data.conf /usr/lib/yum-plugins/filter-data.* %{_mandir}/man1/yum-filter-data.1.* -%files -n yum-tmprepo +%files -n yum-plugin-tmprepo %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tmprepo.conf /usr/lib/yum-plugins/tmprepo.* -%files -n yum-verify +%files -n yum-plugin-verify %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/verify.conf /usr/lib/yum-plugins/verify.* %{_mandir}/man1/yum-verify.1.* -%files -n yum-keys +%files -n yum-plugin-keys %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/keys.conf /usr/lib/yum-plugins/keys.* @@ -527,12 +569,12 @@ %defattr(-, root, root) /etc/NetworkManager/dispatcher.d/* -%files -n yum-remove-with-leaves +%files -n yum-plugin-remove-with-leaves %defattr(-, root, root) /usr/lib/yum-plugins/remove-with-leaves.* %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/remove-with-leaves.conf -%files -n yum-post-transaction-actions +%files -n yum-plugin-post-transaction-actions %defattr(-, root, root) /usr/lib/yum-plugins/post-transaction-actions.* %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/post-transaction-actions.conf @@ -540,13 +582,29 @@ # Default *.action file dropping dir. %dir %{_sysconfdir}/yum/post-actions -%files -n yum-rpm-warm-cache +%files -n yum-plugin-rpm-warm-cache %defattr(-, root, root) /usr/lib/yum-plugins/rpm-warm-cache.* %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/rpm-warm-cache.conf +%files -n yum-plugin-auto-update-debuginfo +%defattr(-, root, root) +/usr/lib/yum-plugins/auto-update-debuginfo.* +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/auto-update-debuginfo.conf + %changelog +* Sun Mar 1 2009 Tim Lauridsen +- mark as 1.1.20 +- rename plugins from yum-name to yum-plugin-name + +* Wed Feb 25 2009 Tim Lauridsen +- Remove yum-kernel-module & yum-fedorakmod plugins (no obsoleting yet) +- Remove yum-skip-broken plugin leftovers + +* Tue Feb 3 2009 James Antill +- add auto-update-debuginfo plugin + * Wed Dec 17 2008 Tim Lauridsen - mark as 1.1.19 From timlau at fedoraproject.org Sun Mar 1 13:00:57 2009 From: timlau at fedoraproject.org (Tim Lauridsen) Date: Sun, 1 Mar 2009 13:00:57 +0000 (UTC) Subject: rpms/yum-utils/F-9 sources,1.27,1.28 yum-utils.spec,1.46,1.47 Message-ID: <20090301130057.78F0270115@cvs1.fedora.phx.redhat.com> Author: timlau Update of /cvs/pkgs/rpms/yum-utils/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22822 Modified Files: sources yum-utils.spec Log Message: Release 1.1.20 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/yum-utils/F-9/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 18 Dec 2008 12:41:52 -0000 1.27 +++ sources 1 Mar 2009 13:00:26 -0000 1.28 @@ -1 +1 @@ -ebd74b37c9d87ebcce43670f94ceedf4 yum-utils-1.1.19.tar.gz +cb98191c2545b72edecf26ba46ded94a yum-utils-1.1.20.tar.gz Index: yum-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/yum-utils/F-9/yum-utils.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- yum-utils.spec 18 Dec 2008 12:41:52 -0000 1.46 +++ yum-utils.spec 1 Mar 2009 13:00:26 -0000 1.47 @@ -1,6 +1,6 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.1.19 +Version: 1.1.20 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools @@ -8,7 +8,7 @@ URL: http://yum.baseurl.org/download/yum-utils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python >= 2.4 , yum >= 3.2.20 +Requires: python >= 2.4 , yum >= 3.2.22 %description yum-utils is a collection of utilities and examples for the yum package @@ -21,6 +21,9 @@ %package -n yum-updateonboot Summary: Run yum update on system boot Group: System Environment/Base +Provides: yum-updateonboot +Obsoletes: yum-updateonboot < 1.1.20-0 +Conflicts: yum-updateonboot < 1.1.20-0 Requires: python, yum >= 2.4 Requires(pre): chkconfig Requires(post): chkconfig @@ -30,276 +33,326 @@ off for an extended amount of time to become secure immediately, instead of waiting until the next early morning cron job. -%package -n yum-changelog +%package -n yum-plugin-changelog Summary: Yum plugin for viewing package changelogs before/after updating Group: System Environment/Base -Requires: yum >= 3.0 +Provides: yum-changelog +Obsoletes: yum-changelog < 1.1.20-0 +Conflicts: yum-changelog < 1.1.20-0 +Requires: yum >= 3.2.19 Requires: python-dateutil -%description -n yum-changelog +%description -n yum-plugin-changelog This plugin adds a command line option to allow viewing package changelog deltas before or after updating packages. -%package -n yum-fastestmirror +%package -n yum-plugin-fastestmirror Summary: Yum plugin which chooses fastest repository from a mirrorlist Group: System Environment/Base +Provides: yum-fastestmirror +Obsoletes: yum-fastestmirror < 1.1.20-0 +Conflicts: yum-fastestmirror < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-fastestmirror +%description -n yum-plugin-fastestmirror This plugin sorts each repository's mirrorlist by connection speed prior to downloading packages. -%package -n yum-fedorakmod -Summary: Yum plugin to handle fedora kernel modules. -Group: System Environment/Base -Requires: yum >= 3.0 - -%description -n yum-fedorakmod -Plugin for Yum to handle installation of kmod-foo type of kernel modules, -when new kernel versions are installed. -kmod-foo kernel modules is described by the Fedora Extras packaging standards. - -%package -n yum-protectbase +%package -n yum-plugin-protectbase Summary: Yum plugin to protect packages from certain repositories. Group: System Environment/Base +Provides: yum-protectbase +Obsoletes: yum-protectbase < 1.1.20-0 +Conflicts: yum-protectbase < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-protectbase +%description -n yum-plugin-protectbase This plugin allows certain repositories to be protected. Packages in the protected repositories can't be overridden by packages in non-protected repositories even if the non-protected repo has a later version. -%package -n yum-versionlock +%package -n yum-plugin-versionlock Summary: Yum plugin to lock specified packages from being updated Group: System Environment/Base +Provides: yum-versionlock +Obsoletes: yum-versionlock < 1.1.20-0 +Conflicts: yum-versionlock < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-versionlock +%description -n yum-plugin-versionlock This plugin takes a set of name/versions for packages and excludes all other versions of those packages (including optionally following obsoletes). This allows you to protect packages from being updated by newer versions, for example. -%package -n yum-tsflags +%package -n yum-plugin-tsflags Summary: Yum plugin to add tsflags by a commandline option Group: System Environment/Base +Provides: yum-tsflags +Obsoletes: yum-tsflags < 1.1.20-0 +Conflicts: yum-tsflags < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-tsflags +%description -n yum-plugin-tsflags This plugin allows you to specify optional transaction flags on the yum command line -%package -n yum-kernel-module -Summary: Yum plugin to handle kernel-module-foo type of kernel module -Group: System Environment/Base -Requires: yum >= 3.0 - -%description -n yum-kernel-module -This plugin handle installation of kernel-module-foo type of kernel modules when new version of -kernels are installed. - - -%package -n yum-downloadonly +%package -n yum-plugin-downloadonly Summary: Yum plugin to add downloadonly command option Group: System Environment/Base +Provides: yum-downloadonly +Obsoletes: yum-downloadonly < 1.1.20-0 +Conflicts: yum-downloadonly < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-downloadonly +%description -n yum-plugin-downloadonly This plugin adds a --downloadonly flag to yum so that yum will only download the packages and not install/update them. -%package -n yum-allowdowngrade +%package -n yum-plugin-allowdowngrade Summary: Yum plugin to enable manual downgrading of packages Group: System Environment/Base +Provides: yum-allowdowngrade +Obsoletes: yum-allowdowngrade < 1.1.20-0 +Conflicts: yum-allowdowngrade < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-allowdowngrade +%description -n yum-plugin-allowdowngrade This plugin adds a --allow-downgrade flag to yum to make it possible to manually downgrade packages to specific versions. -%package -n yum-skip-broken -Summary: Yum plugin to handle skiping packages with dependency problems -Group: System Environment/Base -Requires: yum >= 3.0 - -%description -n yum-skip-broken -This plugin adds a --skip-broken to yum to make it possible to -check packages for dependency problems and skip the one with problems. - -%package -n yum-priorities +%package -n yum-plugin-priorities Summary: plugin to give priorities to packages from different repos Group: System Environment/Base +Provides: yum-priorities +Obsoletes: yum-priorities < 1.1.20-0 +Conflicts: yum-priorities < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-priorities +%description -n yum-plugin-priorities This plugin allows repositories to have different priorities. Packages in a repository with a lower priority can't be overridden by packages from a repository with a higher priority even if repo has a later version. -%package -n yum-refresh-updatesd +%package -n yum-plugin-refresh-updatesd Summary: Tell yum-updatesd to check for updates when yum exits Group: System Environment/Base +Provides: yum-refresh-updatesd +Obsoletes: yum-refresh-updatesd < 1.1.20-0 +Conflicts: yum-refresh-updatesd < 1.1.20-0 Requires: yum >= 3.0 Requires: yum-updatesd -%description -n yum-refresh-updatesd +%description -n yum-plugin-refresh-updatesd yum-refresh-updatesd tells yum-updatesd to check for updates when yum exits. This way, if you run 'yum update' and install all available updates, puplet will almost instantly update itself to reflect this. -%package -n yum-merge-conf +%package -n yum-plugin-merge-conf Summary: Yum plugin to merge configuration changes when installing packages Group: System Environment/Base +Provides: yum-merge-conf +Obsoletes: yum-merge-conf < 1.1.20-0 +Conflicts: yum-merge-conf < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-merge-conf +%description -n yum-plugin-merge-conf This yum plugin adds the "--merge-conf" command line option. With this option, Yum will ask you what to do with config files which have changed on updating a package. -%package -n yum-security +%package -n yum-plugin-security Summary: Yum plugin to enable security filters Group: System Environment/Base +Provides: yum-security +Obsoletes: yum-security < 1.1.20-0 +Conflicts: yum-security < 1.1.20-0 Requires: yum >= 3.2.18 -%description -n yum-security +%description -n yum-plugin-security This plugin adds the options --security, --cve, --bz and --advisory flags to yum and the list-security and info-security commands. The options make it possible to limit list/upgrade of packages to specific security relevant ones. The commands give you the security information. -%package -n yum-protect-packages +%package -n yum-plugin-protect-packages Summary: Yum plugin to prevents Yum from removing itself and other protected packages Group: System Environment/Base +Provides: yum-protect-packages +Obsoletes: yum-protect-packages < 1.1.20-0 +Conflicts: yum-protect-packages < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-protect-packages +%description -n yum-plugin-protect-packages this plugin prevents Yum from removing itself and other protected packages. By default, yum is the only package protected, but by extension this automatically protects everything on which yum depends (rpm, python, glibc, and so on).Therefore, the plugin functions well even without compiling careful lists of all important packages. -%package -n yum-basearchonly +%package -n yum-plugin-basearchonly Summary: Yum plugin to let Yum install only basearch packages. Group: System Environment/Base +Provides: yum-basearchonly +Obsoletes: yum-basearchonly < 1.1.20-0 +Conflicts: yum-basearchonly < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-basearchonly +%description -n yum-plugin-basearchonly this plugin makes Yum only install basearch packages on multiarch systems. If you type 'yum install foo' on a x68_64 system, only 'foo-x.y.x86_46.rpm' is installed. If you want to install the foo-x.y.i386.rpm, you have to type 'yum install foo.i386'. The plugin only works with 'yum install'. -%package -n yum-upgrade-helper +%package -n yum-plugin-upgrade-helper Summary: Yum plugin to help upgrades to the next distribution version Group: System Environment/Base +Provides: yum-upgrade-helper +Obsoletes: yum-upgrade-helper < 1.1.20-0 +Conflicts: yum-upgrade-helper < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-upgrade-helper +%description -n yum-plugin-upgrade-helper this plugin allows yum to erase specific packages on install/update based on an additional metadata file in repositories. It is used to simplify distribution upgrade hangups. -%package -n yum-aliases +%package -n yum-plugin-aliases Summary: Yum plugin to enable aliases filters Group: System Environment/Base +Provides: yum-aliases +Obsoletes: yum-aliases < 1.1.20-0 +Conflicts: yum-aliases < 1.1.20-0 Requires: yum >= 3.0.5 -%description -n yum-aliases +%description -n yum-plugin-aliases This plugin adds the command alias, and parses the aliases config. file to enable aliases. -%package -n yum-list-data +%package -n yum-plugin-list-data Summary: Yum plugin to list aggregate package data Group: System Environment/Base +Provides: yum-list-data +Obsoletes: yum-list-data < 1.1.20-0 +Conflicts: yum-list-data < 1.1.20-0 Requires: yum >= 3.0.5 -%description -n yum-list-data +%description -n yum-plugin-list-data This plugin adds the commands list- vendors, groups, packagers, licenses, arches, committers, buildhosts, baseurls, package-sizes, archive-sizes and installed-sizes. -%package -n yum-filter-data +%package -n yum-plugin-filter-data Summary: Yum plugin to list filter based on package data Group: System Environment/Base +Provides: yum-filter-data +Obsoletes: yum-filter-data < 1.1.20-0 +Conflicts: yum-filter-data < 1.1.20-0 Requires: yum >= 3.2.17 -%description -n yum-filter-data +%description -n yum-plugin-filter-data This plugin adds the options --filter- vendors, groups, packagers, licenses, arches, committers, buildhosts, baseurls, package-sizes, archive-sizes and installed-sizes. Note that each package must match at least one pattern/range in each category, if any were specified. -%package -n yum-tmprepo +%package -n yum-plugin-tmprepo Summary: Yum plugin to add temporary repositories Group: System Environment/Base +Provides: yum-tmprepo +Obsoletes: yum-tmprepo < 1.1.20-0 +Conflicts: yum-tmprepo < 1.1.20-0 Requires: yum >= 3.2.11 Requires: createrepo -%description -n yum-tmprepo +%description -n yum-plugin-tmprepo This plugin adds the option --tmprepo which takes a url to a .repo file downloads it and enables it for a single run. This plugin tries to ensure that temporary repositories are safe to use, by default, by not allowing gpg checking to be disabled. -%package -n yum-verify +%package -n yum-plugin-verify Summary: Yum plugin to add verify command, and options Group: System Environment/Base +Provides: yum-verify +Obsoletes: yum-verify < 1.1.20-0 +Conflicts: yum-verify < 1.1.20-0 Requires: yum >= 3.2.12 -%description -n yum-verify +%description -n yum-plugin-verify This plugin adds the commands verify, verify-all and verify-rpm. There are also a couple of options. This command works like rpm -V, to verify your installation. -%package -n yum-keys +%package -n yum-plugin-keys Summary: Yum plugin to deal with signing keys Group: System Environment/Base +Provides: yum-keys +Obsoletes: yum-keys < 1.1.20-0 +Conflicts: yum-keys < 1.1.20-0 Requires: yum >= 3.2.19 -%description -n yum-keys +%description -n yum-plugin-keys This plugin adds the commands keys, keys-info, keys-data and keys-remove. They allow you to query and remove signing keys. -%package -n yum-remove-with-leaves +%package -n yum-plugin-remove-with-leaves Summary: Yum plugin to remove dependencies which are no longer used because of a removal Group: System Environment/Base +Provides: yum-remove-with-leaves +Obsoletes: yum-remove-with-leaves < 1.1.20-0 +Conflicts: yum-remove-with-leaves < 1.1.20-0 Requires: yum >= 3.2.19 -%description -n yum-remove-with-leaves +%description -n yum-plugin-remove-with-leaves This plugin removes any unused dependencies that were brought in by an install but would not normally be removed. It helps to keep a system clean of unused libraries and packages. -%package -n yum-post-transaction-actions +%package -n yum-plugin-post-transaction-actions Summary: Yum plugin to run arbitrary commands when certain pkgs are acted on Group: System Environment/Base +Provides: yum-post-transaction-actions +Obsoletes: yum-post-transaction-actions < 1.1.20-0 +Conflicts: yum-post-transaction-actions < 1.1.20-0 Requires: yum >= 3.2.19 -%description -n yum-post-transaction-actions +%description -n yum-plugin-post-transaction-actions This plugin allows the user to run arbitrary actions immediately following a transaction when specified packages are changed. %package -n yum-NetworkManager-dispatcher -Summary: Yum plugin to deal with changing networks with NetworkManager +Summary: NetworkManager script which tells yum to check it's cache on network change Group: System Environment/Base Requires: yum >= 3.2.17 %description -n yum-NetworkManager-dispatcher -This plugin forces yum to check it's cache if/when a new network connection -happens in NetworkManager. Note that currently there is no checking of -previous data, so if your WiFi keeps going up and down (or you suspend/resume -a lot) yum will recheck it's cached data a lot. +This NetworkManager "dispatch script" forces yum to check its cache if/when a +new network connection happens in NetworkManager. Note that currently there is +no checking of previous data, so if your WiFi keeps going up and down (or you +suspend/resume a lot) yum will recheck its cached data a lot. -%package -n yum-rpm-warm-cache +%package -n yum-plugin-rpm-warm-cache Summary: Yum plugin to access the rpmdb files early to warm up access to the db Group: System Environment/Base +Provides: yum-rpm-warm-cache +Obsoletes: yum-rpm-warm-cache < 1.1.20-0 +Conflicts: yum-rpm-warm-cache < 1.1.20-0 Requires: yum >= 3.2.19 -%description -n yum-rpm-warm-cache +%description -n yum-plugin-rpm-warm-cache This plugin reads the rpmdb files into the system cache before accessing the rpmdb directly. In some cases this should speed up access to rpmdb information +%package -n yum-plugin-auto-update-debuginfo +Summary: Yum plugin to enable automatic updates to installed debuginfo packages +Group: System Environment/Base +Requires: yum >= 3.2.19 + +%description -n yum-plugin-auto-update-debuginfo +This plugin looks to see if any debuginfo packages are installed, and if there +are it enables all debuginfo repositories that are "children" of enabled +repositories. + %prep %setup -q @@ -312,11 +365,9 @@ plugins="\ changelog \ fastestmirror \ - fedorakmod \ protectbase \ versionlock \ tsflags \ - kernel-module \ downloadonly \ allowdowngrade \ priorities \ @@ -335,6 +386,7 @@ remove-with-leaves \ post-transaction-actions \ rpm-warm-cache \ + auto-update-debuginfo \ " mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ @@ -401,29 +453,24 @@ %config(noreplace) %{_sysconfdir}/sysconfig/yum-updateonboot %{_initrddir}/yum-updateonboot -%files -n yum-changelog +%files -n yum-plugin-changelog %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/changelog.conf /usr/lib/yum-plugins/changelog.* %{_mandir}/man1/yum-changelog.1.* %{_mandir}/man5/yum-changelog.conf.5.* -%files -n yum-fastestmirror +%files -n yum-plugin-fastestmirror %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fastestmirror.conf /usr/lib/yum-plugins/fastestmirror*.* -%files -n yum-fedorakmod -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fedorakmod.conf -/usr/lib/yum-plugins/fedorakmod.* - -%files -n yum-protectbase +%files -n yum-plugin-protectbase %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protectbase.conf /usr/lib/yum-plugins/protectbase.* -%files -n yum-versionlock +%files -n yum-plugin-versionlock %defattr(-, root, root) %doc plugins/versionlock/README %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.conf @@ -432,93 +479,88 @@ %{_mandir}/man1/yum-versionlock.1.* %{_mandir}/man5/yum-versionlock.conf.5.* -%files -n yum-tsflags +%files -n yum-plugin-tsflags %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tsflags.conf /usr/lib/yum-plugins/tsflags.* -%files -n yum-kernel-module -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/kernel-module.conf -/usr/lib/yum-plugins/kernel-module.* - -%files -n yum-downloadonly +%files -n yum-plugin-downloadonly %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/downloadonly.conf /usr/lib/yum-plugins/downloadonly.* -%files -n yum-allowdowngrade +%files -n yum-plugin-allowdowngrade %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/allowdowngrade.conf /usr/lib/yum-plugins/allowdowngrade.* -%files -n yum-priorities +%files -n yum-plugin-priorities %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/priorities.conf /usr/lib/yum-plugins/priorities.* -%files -n yum-refresh-updatesd +%files -n yum-plugin-refresh-updatesd %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-updatesd.conf /usr/lib/yum-plugins/refresh-updatesd.* -%files -n yum-merge-conf +%files -n yum-plugin-merge-conf %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/merge-conf.conf /usr/lib/yum-plugins/merge-conf.* -%files -n yum-security +%files -n yum-plugin-security %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/security.conf /usr/lib/yum-plugins/security.* %{_mandir}/man8/yum-security.8.* -%files -n yum-protect-packages +%files -n yum-plugin-protect-packages %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protect-packages.conf /usr/lib/yum-plugins/protect-packages.* -%files -n yum-basearchonly +%files -n yum-plugin-basearchonly %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/basearchonly.conf /usr/lib/yum-plugins/basearchonly.* -%files -n yum-upgrade-helper +%files -n yum-plugin-upgrade-helper %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/upgrade-helper.conf /usr/lib/yum-plugins/upgrade-helper.* -%files -n yum-aliases +%files -n yum-plugin-aliases %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/aliases.conf %config(noreplace) %{_sysconfdir}/yum/aliases.conf /usr/lib/yum-plugins/aliases.* %{_mandir}/man1/yum-aliases.1.* -%files -n yum-list-data +%files -n yum-plugin-list-data %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/list-data.conf /usr/lib/yum-plugins/list-data.* %{_mandir}/man1/yum-list-data.1.* -%files -n yum-filter-data +%files -n yum-plugin-filter-data %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/filter-data.conf /usr/lib/yum-plugins/filter-data.* %{_mandir}/man1/yum-filter-data.1.* -%files -n yum-tmprepo +%files -n yum-plugin-tmprepo %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tmprepo.conf /usr/lib/yum-plugins/tmprepo.* -%files -n yum-verify +%files -n yum-plugin-verify %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/verify.conf /usr/lib/yum-plugins/verify.* %{_mandir}/man1/yum-verify.1.* -%files -n yum-keys +%files -n yum-plugin-keys %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/keys.conf /usr/lib/yum-plugins/keys.* @@ -527,12 +569,12 @@ %defattr(-, root, root) /etc/NetworkManager/dispatcher.d/* -%files -n yum-remove-with-leaves +%files -n yum-plugin-remove-with-leaves %defattr(-, root, root) /usr/lib/yum-plugins/remove-with-leaves.* %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/remove-with-leaves.conf -%files -n yum-post-transaction-actions +%files -n yum-plugin-post-transaction-actions %defattr(-, root, root) /usr/lib/yum-plugins/post-transaction-actions.* %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/post-transaction-actions.conf @@ -540,13 +582,29 @@ # Default *.action file dropping dir. %dir %{_sysconfdir}/yum/post-actions -%files -n yum-rpm-warm-cache +%files -n yum-plugin-rpm-warm-cache %defattr(-, root, root) /usr/lib/yum-plugins/rpm-warm-cache.* %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/rpm-warm-cache.conf +%files -n yum-plugin-auto-update-debuginfo +%defattr(-, root, root) +/usr/lib/yum-plugins/auto-update-debuginfo.* +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/auto-update-debuginfo.conf + %changelog +* Sun Mar 1 2009 Tim Lauridsen +- mark as 1.1.20 +- rename plugins from yum-name to yum-plugin-name + +* Wed Feb 25 2009 Tim Lauridsen +- Remove yum-kernel-module & yum-fedorakmod plugins (no obsoleting yet) +- Remove yum-skip-broken plugin leftovers + +* Tue Feb 3 2009 James Antill +- add auto-update-debuginfo plugin + * Wed Dec 17 2008 Tim Lauridsen - mark as 1.1.19 From hedayat at fedoraproject.org Sun Mar 1 13:04:43 2009 From: hedayat at fedoraproject.org (Hedayat Vatankhah) Date: Sun, 1 Mar 2009 13:04:43 +0000 (UTC) Subject: rpms/rcssserver/devel rcssserver-13.1.0-gcc4_4fix.patch, NONE, 1.1 rcssserver.spec, 1.8, 1.9 Message-ID: <20090301130443.29E2E70115@cvs1.fedora.phx.redhat.com> Author: hedayat Update of /cvs/pkgs/rpms/rcssserver/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23341 Modified Files: rcssserver.spec Added Files: rcssserver-13.1.0-gcc4_4fix.patch Log Message: Added patch for gcc4.4 compatibility rcssserver-13.1.0-gcc4_4fix.patch: --- NEW FILE rcssserver-13.1.0-gcc4_4fix.patch --- diff -up rcssserver-13.1.0/src/coach_lang_tok.lpp.gcc4_4fix rcssserver-13.1.0/src/coach_lang_tok.lpp --- rcssserver-13.1.0/src/coach_lang_tok.lpp.gcc4_4fix 2009-03-01 15:38:01.000000000 +0330 +++ rcssserver-13.1.0/src/coach_lang_tok.lpp 2009-03-01 15:38:32.000000000 +0330 @@ -28,6 +28,7 @@ #include "coach_lang_tok.h" #include "coach_lang_parser.h" #include "types.h" +#include %} diff -up rcssserver-13.1.0/src/player_command_tok.lpp.gcc4_4fix rcssserver-13.1.0/src/player_command_tok.lpp --- rcssserver-13.1.0/src/player_command_tok.lpp.gcc4_4fix 2009-03-01 15:57:39.000000000 +0330 +++ rcssserver-13.1.0/src/player_command_tok.lpp 2009-03-01 16:09:53.000000000 +0330 @@ -27,6 +27,7 @@ #include "player_command_tok.h" #include "player_command_parser.h" +#include %} Index: rcssserver.spec =================================================================== RCS file: /cvs/pkgs/rpms/rcssserver/devel/rcssserver.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rcssserver.spec 25 Feb 2009 19:02:28 -0000 1.8 +++ rcssserver.spec 1 Mar 2009 13:04:12 -0000 1.9 @@ -1,6 +1,6 @@ Name: rcssserver Version: 13.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Robocup 2D Soccer Simulation Server Group: Applications/System @@ -10,6 +10,7 @@ Source0: http://downloads.sourceforge.net/sserver/%{name}-%{version}.tar.gz # Source 1 is created by me. Source1: %{name}.desktop +Patch0: %{name}-13.1.0-gcc4_4fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake libtool boost-devel zlib-devel @@ -52,6 +53,7 @@ %prep %setup -q +%patch0 -p1 -b .gcc4_4fix sed -i.lib \ -e 's|\$ac_boost_path/lib|\$libdir|' \ -e 's|$ac_boost_path_tmp/lib|\$libdir|' \ @@ -98,6 +100,9 @@ %{_datadir}/applications/* %changelog +* Sun Mar 01 2009 Hedayat Vatankhah 13.1.0-3 +- Added a patch for gcc 4.4 compatibility. + * Wed Feb 25 2009 Fedora Release Engineering - 13.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From bochecha at fedoraproject.org Sun Mar 1 13:12:36 2009 From: bochecha at fedoraproject.org (Mathieu Bridon) Date: Sun, 1 Mar 2009 13:12:36 +0000 (UTC) Subject: rpms/wastesedge/F-9 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wastesedge.spec, 1.3, 1.4 Message-ID: <20090301131236.F3EF970115@cvs1.fedora.phx.redhat.com> Author: bochecha Update of /cvs/pkgs/rpms/wastesedge/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25020 Modified Files: .cvsignore sources wastesedge.spec Log Message: Fix RHBZ#477481 Remove illegal font file in SRPM too. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wastesedge/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Jun 2008 21:39:32 -0000 1.2 +++ .cvsignore 1 Mar 2009 13:12:06 -0000 1.3 @@ -1 +1 @@ -wastesedge-src-0.3.4.tar.gz +wastesedge-src-0.3.4-modified.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wastesedge/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Jun 2008 21:39:32 -0000 1.2 +++ sources 1 Mar 2009 13:12:06 -0000 1.3 @@ -1 +1 @@ -a4beb3d2c8ae8f52a91b54966371e973 wastesedge-src-0.3.4.tar.gz +fceb6c6f3a345e2a3dc1b0ea3998b436 wastesedge-src-0.3.4-modified.tar.gz Index: wastesedge.spec =================================================================== RCS file: /cvs/pkgs/rpms/wastesedge/F-9/wastesedge.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wastesedge.spec 13 Feb 2009 23:10:18 -0000 1.3 +++ wastesedge.spec 1 Mar 2009 13:12:06 -0000 1.4 @@ -1,12 +1,19 @@ Name: wastesedge Version: 0.3.4 -Release: 0.11%{?dist} +Release: 0.12%{?dist} Summary: Official game package for Adonthell Group: Amusements/Games License: GPL+ URL: http://adonthell.linuxgames.com/ -Source0: http://savannah.nongnu.org/download/adonthell/%{name}-src-%{version}.tar.gz +## Due to legal issues (RHBZ#477481), upstream sources need to be modified +# Here is how are obtained the sources used in this package: +# $ wget http://savannah.nongnu.org/download/adonthell/%{name}-src-%{version}.tar.gz +# $ tar xzvf %{name}-src-%{version}.tar.gz +# $ rm %{name}-%{version}/gfx/window/font/avatar.ttf +# $ sed -i 's|avatar.ttf||g' %{name}-%{version}/gfx/window/font/Makefile.in +# $ tar czvf %{name}-src-%{version}-modified.tar.gz %{name}-%{version}/ +Source0: %{name}-src-%{version}-modified.tar.gz Source1: %{name}.desktop Patch0: %{name}-more.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,9 +42,6 @@ sed -i 's|datadir = @gamedatadir@|datadir = ${prefix}/share|' po/Makefile.in.in # patch configure to not use "more" any more %patch0 -p0 -# remove ttf font while its license is unknown -rm gfx/window/font/avatar.ttf -sed -i 's|avatar.ttf||g' gfx/window/font/Makefile.in %build @@ -90,9 +94,12 @@ %changelog +* Sun Mar 01 2009 Mathieu Bridon - 0.3.4-0.12 +- deleted the unproperly licensed font in SRPM too - RHBZ#477481 + * Fri Feb 13 2009 Mathieu Bridon - 0.3.4-0.11 - added missing Requires: on hicolor-icon-theme -- deleted the unproperly licensed font - RHBZ#4774 +- deleted the unproperly licensed font - RHBZ#477481 * Sat Jun 28 2008 Mathieu Bridon 0.3.4-0.9 - patched configure script so that it doesn't use "more" any more. From lkundrak at fedoraproject.org Sun Mar 1 13:16:04 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Mar 2009 13:16:04 +0000 (UTC) Subject: rpms/grub2/devel grub2.spec,1.5,1.6 Message-ID: <20090301131604.7C26C70115@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/grub2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25677 Modified Files: grub2.spec Log Message: * Sun Mar 01 2009 Lubomir Rintel - 1.98-0.4.20080827svn - Add missing BR Index: grub2.spec =================================================================== RCS file: /cvs/pkgs/rpms/grub2/devel/grub2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- grub2.spec 25 Feb 2009 01:17:01 -0000 1.5 +++ grub2.spec 1 Mar 2009 13:15:33 -0000 1.6 @@ -38,7 +38,7 @@ Name: grub2 Version: 1.98 -Release: 0.4.20080827svn%{?dist} +Release: 0.5.20080827svn%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base @@ -67,7 +67,7 @@ BuildRequires: flex bison ruby binutils BuildRequires: ncurses-devel lzo-devel -BuildRequires: /usr/lib/crt1.o +BuildRequires: /usr/lib/crt1.o glibc-static # grubby Requires(pre): mkinitrd @@ -226,6 +226,9 @@ %changelog +* Sun Mar 01 2009 Lubomir Rintel - 1.98-0.4.20080827svn +- Add missing BR + * Tue Feb 24 2009 Fedora Release Engineering - 1.98-0.4.20080827svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pghmcfc at fedoraproject.org Sun Mar 1 13:21:48 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Sun, 1 Mar 2009 13:21:48 +0000 (UTC) Subject: rpms/bittorrent/devel bittorrent.desktop, 1.3, 1.4 bittorrent.spec, 1.47, 1.48 Message-ID: <20090301132148.0B88070115@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/bittorrent/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26788 Modified Files: bittorrent.desktop bittorrent.spec Log Message: Add additional categories FileTransfer and P2P in desktop entry (#487789) Index: bittorrent.desktop =================================================================== RCS file: /cvs/pkgs/rpms/bittorrent/devel/bittorrent.desktop,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bittorrent.desktop 18 Jan 2007 16:36:52 -0000 1.3 +++ bittorrent.desktop 1 Mar 2009 13:21:17 -0000 1.4 @@ -3,9 +3,9 @@ Name=BitTorrent File Transfer Comment=Distributed download of files from the Internet Exec=bittorrent -Icon=bittorrent.png +Icon=bittorrent Terminal=false Type=Application StartupNotify=true -Categories=Network; +Categories=Network;FileTransfer;P2P; MimeType=application/x-bittorrent; Index: bittorrent.spec =================================================================== RCS file: /cvs/pkgs/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- bittorrent.spec 27 Feb 2009 17:05:53 -0000 1.47 +++ bittorrent.spec 1 Mar 2009 13:21:17 -0000 1.48 @@ -240,6 +240,7 @@ * Tue Feb 24 2009 Paul Howarth 4.4.0-10 - Fix syntax issues causing failure to build for Fedora 11 - Update format strings to enable re-ordering of parameters in translations +- Add additional categories FileTransfer and P2P in desktop entry (#487789) * Mon Feb 23 2009 Fedora Release Engineering - 4.4.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From robert at fedoraproject.org Sun Mar 1 13:23:00 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 1 Mar 2009 13:23:00 +0000 (UTC) Subject: rpms/phpMyAdmin/F-9 .cvsignore, 1.33, 1.34 phpMyAdmin.spec, 1.37, 1.38 sources, 1.33, 1.34 Message-ID: <20090301132300.C5CC470116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26951/F-9 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 3.1.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 19 Jan 2009 23:02:24 -0000 1.33 +++ .cvsignore 1 Mar 2009 13:22:30 -0000 1.34 @@ -1 +1 @@ -phpMyAdmin-3.1.2-all-languages.tar.bz2 +phpMyAdmin-3.1.3-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/phpMyAdmin.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- phpMyAdmin.spec 19 Jan 2009 23:02:24 -0000 1.37 +++ phpMyAdmin.spec 1 Mar 2009 13:22:30 -0000 1.38 @@ -1,5 +1,5 @@ Name: phpMyAdmin -Version: 3.1.2 +Version: 3.1.3 Release: 1%{?dist} Summary: Web based MySQL browser written in php @@ -54,6 +54,12 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Sun Mar 01 2009 Robert Scheck 3.1.3-1 +- Upstream released 3.1.3 + +* Mon Feb 23 2009 Robert Scheck 3.1.2-2 +- Rebuilt against rpm 4.6 + * Tue Jan 20 2009 Robert Scheck 3.1.2-1 - Upstream released 3.1.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 19 Jan 2009 23:02:24 -0000 1.33 +++ sources 1 Mar 2009 13:22:30 -0000 1.34 @@ -1 +1 @@ -cb6a6db5d684f94e71f864071b5b0d7a phpMyAdmin-3.1.2-all-languages.tar.bz2 +33d703d268ca10e1443896475b09b433 phpMyAdmin-3.1.3-all-languages.tar.bz2 From robert at fedoraproject.org Sun Mar 1 13:23:01 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 1 Mar 2009 13:23:01 +0000 (UTC) Subject: rpms/phpMyAdmin/devel .cvsignore, 1.33, 1.34 phpMyAdmin.spec, 1.38, 1.39 sources, 1.33, 1.34 Message-ID: <20090301132301.7EDD770115@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26951/devel Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 3.1.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 19 Jan 2009 23:02:25 -0000 1.33 +++ .cvsignore 1 Mar 2009 13:22:30 -0000 1.34 @@ -1 +1 @@ -phpMyAdmin-3.1.2-all-languages.tar.bz2 +phpMyAdmin-3.1.3-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- phpMyAdmin.spec 23 Feb 2009 21:02:16 -0000 1.38 +++ phpMyAdmin.spec 1 Mar 2009 13:22:30 -0000 1.39 @@ -1,6 +1,6 @@ Name: phpMyAdmin -Version: 3.1.2 -Release: 2%{?dist} +Version: 3.1.3 +Release: 1%{?dist} Summary: Web based MySQL browser written in php Group: Applications/Internet @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Sun Mar 01 2009 Robert Scheck 3.1.3-1 +- Upstream released 3.1.3 + * Mon Feb 23 2009 Robert Scheck 3.1.2-2 - Rebuilt against rpm 4.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 19 Jan 2009 23:02:25 -0000 1.33 +++ sources 1 Mar 2009 13:22:31 -0000 1.34 @@ -1 +1 @@ -cb6a6db5d684f94e71f864071b5b0d7a phpMyAdmin-3.1.2-all-languages.tar.bz2 +33d703d268ca10e1443896475b09b433 phpMyAdmin-3.1.3-all-languages.tar.bz2 From robert at fedoraproject.org Sun Mar 1 13:23:00 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 1 Mar 2009 13:23:00 +0000 (UTC) Subject: rpms/phpMyAdmin/F-10 .cvsignore, 1.33, 1.34 phpMyAdmin.spec, 1.37, 1.38 sources, 1.33, 1.34 Message-ID: <20090301132300.76D5270115@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26951/F-10 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 3.1.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 19 Jan 2009 23:02:24 -0000 1.33 +++ .cvsignore 1 Mar 2009 13:22:30 -0000 1.34 @@ -1 +1 @@ -phpMyAdmin-3.1.2-all-languages.tar.bz2 +phpMyAdmin-3.1.3-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/phpMyAdmin.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- phpMyAdmin.spec 19 Jan 2009 23:02:24 -0000 1.37 +++ phpMyAdmin.spec 1 Mar 2009 13:22:30 -0000 1.38 @@ -1,5 +1,5 @@ Name: phpMyAdmin -Version: 3.1.2 +Version: 3.1.3 Release: 1%{?dist} Summary: Web based MySQL browser written in php @@ -54,6 +54,12 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Sun Mar 01 2009 Robert Scheck 3.1.3-1 +- Upstream released 3.1.3 + +* Mon Feb 23 2009 Robert Scheck 3.1.2-2 +- Rebuilt against rpm 4.6 + * Tue Jan 20 2009 Robert Scheck 3.1.2-1 - Upstream released 3.1.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 19 Jan 2009 23:02:24 -0000 1.33 +++ sources 1 Mar 2009 13:22:30 -0000 1.34 @@ -1 +1 @@ -cb6a6db5d684f94e71f864071b5b0d7a phpMyAdmin-3.1.2-all-languages.tar.bz2 +33d703d268ca10e1443896475b09b433 phpMyAdmin-3.1.3-all-languages.tar.bz2 From bochecha at fedoraproject.org Sun Mar 1 13:23:23 2009 From: bochecha at fedoraproject.org (Mathieu Bridon) Date: Sun, 1 Mar 2009 13:23:23 +0000 (UTC) Subject: rpms/wastesedge/F-10 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wastesedge.spec, 1.3, 1.4 Message-ID: <20090301132323.47E4F70115@cvs1.fedora.phx.redhat.com> Author: bochecha Update of /cvs/pkgs/rpms/wastesedge/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27101 Modified Files: .cvsignore sources wastesedge.spec Log Message: Fix RHBZ#477481 Remove illegal font file from SRPM. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wastesedge/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Jun 2008 21:35:40 -0000 1.2 +++ .cvsignore 1 Mar 2009 13:22:52 -0000 1.3 @@ -1 +1 @@ -wastesedge-src-0.3.4.tar.gz +wastesedge-src-0.3.4-modified.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wastesedge/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Jun 2008 21:35:40 -0000 1.2 +++ sources 1 Mar 2009 13:22:52 -0000 1.3 @@ -1 +1 @@ -a4beb3d2c8ae8f52a91b54966371e973 wastesedge-src-0.3.4.tar.gz +fceb6c6f3a345e2a3dc1b0ea3998b436 wastesedge-src-0.3.4-modified.tar.gz Index: wastesedge.spec =================================================================== RCS file: /cvs/pkgs/rpms/wastesedge/F-10/wastesedge.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wastesedge.spec 13 Feb 2009 22:50:16 -0000 1.3 +++ wastesedge.spec 1 Mar 2009 13:22:53 -0000 1.4 @@ -1,12 +1,19 @@ Name: wastesedge Version: 0.3.4 -Release: 0.11%{?dist} +Release: 0.12%{?dist} Summary: Official game package for Adonthell Group: Amusements/Games License: GPL+ URL: http://adonthell.linuxgames.com/ -Source0: http://savannah.nongnu.org/download/adonthell/%{name}-src-%{version}.tar.gz +## Due to legal issues (RHBZ#477481), upstream sources need to be modified +# Here is how are obtained the sources used in this package: +# $ wget http://savannah.nongnu.org/download/adonthell/%{name}-src-%{version}.tar.gz +# $ tar xzvf %{name}-src-%{version}.tar.gz +# $ rm %{name}-%{version}/gfx/window/font/avatar.ttf +# $ sed -i 's|avatar.ttf||g' %{name}-%{version}/gfx/window/font/Makefile.in +# $ tar czvf %{name}-src-%{version}-modified.tar.gz %{name}-%{version}/ +Source0: %{name}-src-%{version}-modified.tar.gz Source1: %{name}.desktop Patch0: %{name}-more.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,9 +42,6 @@ sed -i 's|datadir = @gamedatadir@|datadir = ${prefix}/share|' po/Makefile.in.in # patch configure to not use "more" any more %patch0 -p0 -# remove ttf font while its license is unknown -rm gfx/window/font/avatar.ttf -sed -i 's|avatar.ttf||g' gfx/window/font/Makefile.in %build @@ -90,9 +94,12 @@ %changelog +* Sun Mar 01 2009 Mathieu Bridon - 0.3.4-0.12 +- deleted the unproperly licensed font in SRPM too - RHBZ#477481 + * Fri Feb 13 2009 Mathieu Bridon - 0.3.4-0.11 - added missing Requires: on hicolor-icon-theme -- deleted the unproperly licensed font - RHBZ#4774 +- deleted the unproperly licensed font - RHBZ#477481 * Sat Jun 28 2008 Mathieu Bridon 0.3.4-0.9 - patched configure script so that it doesn't use "more" any more. From rathann at fedoraproject.org Sun Mar 1 13:25:15 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Sun, 1 Mar 2009 13:25:15 +0000 (UTC) Subject: rpms/openbabel/devel openbabel-check.patch,1.2,1.3 Message-ID: <20090301132516.045A270115@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27709 Modified Files: openbabel-check.patch Log Message: - debug test failure openbabel-check.patch: Index: openbabel-check.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-check.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openbabel-check.patch 6 Jul 2008 20:57:15 -0000 1.2 +++ openbabel-check.patch 1 Mar 2009 13:24:45 -0000 1.3 @@ -1,32 +1,9 @@ -diff -up openbabel-2.2.0/test/wrapper.sh.chk openbabel-2.2.0/test/wrapper.sh ---- openbabel-2.2.0/test/wrapper.sh.chk 2008-07-04 02:28:17.000000000 +0200 -+++ openbabel-2.2.0/test/wrapper.sh 2008-07-06 22:54:23.000000000 +0200 -@@ -16,11 +16,11 @@ TESTS="${TESTS} logp_psa math" - TESTS="${TESTS} mol phmodel residue rings" - TESTS="${TESTS} smarts smilesmatch unitcell" - TESTS="${TESTS} cml.sh test-set.sh" --if [ "x${srcdir}" != "x" ]; then -- TESTS="${TESTS} ${srcdir}/inchi.pl ${srcdir}/inchi2.pl" --else -- TESTS="${TESTS} inchi.pl inchi2.pl" --fi -+#if [ "x${srcdir}" != "x" ]; then -+# TESTS="${TESTS} ${srcdir}/inchi.pl ${srcdir}/inchi2.pl" -+#else -+# TESTS="${TESTS} inchi.pl inchi2.pl" -+#fi - PROVE=prove +diff -up openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh.chk openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh +--- openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh.chk 2009-01-12 20:10:33.000000000 +0100 ++++ openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh 2009-03-01 14:23:16.000000000 +0100 +@@ -45,4 +45,4 @@ if [ -d ../src/formats/.libs ]; then + fi + fi - echo "top srcdir: .${topsrcdir}." -diff -up openbabel-2.2.0/test/bond.cpp.chk openbabel-2.2.0/test/bond.cpp ---- openbabel-2.2.0/test/bond.cpp.chk 2008-06-13 22:48:05.000000000 +0200 -+++ openbabel-2.2.0/test/bond.cpp 2008-07-06 21:45:44.000000000 +0200 -@@ -58,7 +58,7 @@ int main(int argc,char *argv[]) - - bond1.SetBegin(&begin1); - bond1.SetEnd(&end1); -- cout << "ok 4\n"; -+ cout << "ok 3\n"; - - return(0); - } +-${PROVE} "$@" ${TESTS} ++${PROVE} "$@" --debug ${TESTS} From bochecha at fedoraproject.org Sun Mar 1 13:39:36 2009 From: bochecha at fedoraproject.org (Mathieu Bridon) Date: Sun, 1 Mar 2009 13:39:36 +0000 (UTC) Subject: rpms/wastesedge/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wastesedge.spec, 1.5, 1.6 Message-ID: <20090301133936.7ADEF70115@cvs1.fedora.phx.redhat.com> Author: bochecha Update of /cvs/pkgs/rpms/wastesedge/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30448 Modified Files: .cvsignore sources wastesedge.spec Log Message: Fix RHBZ#477481 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wastesedge/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Jun 2008 21:35:40 -0000 1.2 +++ .cvsignore 1 Mar 2009 13:39:05 -0000 1.3 @@ -1 +1 @@ -wastesedge-src-0.3.4.tar.gz +wastesedge-src-0.3.4-modified.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wastesedge/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Jun 2008 21:35:40 -0000 1.2 +++ sources 1 Mar 2009 13:39:05 -0000 1.3 @@ -1 +1 @@ -a4beb3d2c8ae8f52a91b54966371e973 wastesedge-src-0.3.4.tar.gz +fceb6c6f3a345e2a3dc1b0ea3998b436 wastesedge-src-0.3.4-modified.tar.gz Index: wastesedge.spec =================================================================== RCS file: /cvs/pkgs/rpms/wastesedge/devel/wastesedge.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wastesedge.spec 25 Feb 2009 18:07:30 -0000 1.5 +++ wastesedge.spec 1 Mar 2009 13:39:05 -0000 1.6 @@ -1,12 +1,19 @@ Name: wastesedge Version: 0.3.4 -Release: 0.12%{?dist} +Release: 0.13%{?dist} Summary: Official game package for Adonthell Group: Amusements/Games License: GPL+ URL: http://adonthell.linuxgames.com/ -Source0: http://savannah.nongnu.org/download/adonthell/%{name}-src-%{version}.tar.gz +## Due to legal issues (RHBZ#477481), upstream sources need to be modified +# Here is how are obtained the sources used in this package: +# $ wget http://savannah.nongnu.org/download/adonthell/%{name}-src-%{version}.tar.gz +# $ tar xzvf %{name}-src-%{version}.tar.gz +# $ rm %{name}-%{version}/gfx/window/font/avatar.ttf +# $ sed -i 's|avatar.ttf||g' %{name}-%{version}/gfx/window/font/Makefile.in +# $ tar czvf %{name}-src-%{version}-modified.tar.gz %{name}-%{version}/ +Source0: %{name}-src-%{version}-modified.tar.gz Source1: %{name}.desktop Patch0: %{name}-more.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,9 +42,6 @@ sed -i 's|datadir = @gamedatadir@|datadir = ${prefix}/share|' po/Makefile.in.in # patch configure to not use "more" any more %patch0 -p0 -# remove ttf font while its license is unknown -rm gfx/window/font/avatar.ttf -sed -i 's|avatar.ttf||g' gfx/window/font/Makefile.in %build @@ -90,12 +94,15 @@ %changelog +* Sun Mar 01 2009 Mathieu Bridon - 0.3.4-0.13 +- deleted the unproperly licensed font in SRPM too - RHBZ#477481 + * Wed Feb 25 2009 Fedora Release Engineering - 0.3.4-0.12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Fri Feb 13 2009 Mathieu Bridon - 0.3.4-0.11 - added missing Requires: on hicolor-icon-theme -- deleted the unproperly licensed font - RHBZ#4774 +- deleted the unproperly licensed font - RHBZ#477481 * Mon Dec 01 2008 Ignacio Vazquez-Abrams - 0.3.4-0.10 - Rebuild for Python 2.6 From ensc at fedoraproject.org Sun Mar 1 13:39:40 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sun, 1 Mar 2009 13:39:40 +0000 (UTC) Subject: rpms/dhcp-forwarder/devel dhcp-forwarder.spec,1.24,1.25 Message-ID: <20090301133940.5EF1B70115@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/dhcp-forwarder/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30603 Modified Files: dhcp-forwarder.spec Log Message: updated Index: dhcp-forwarder.spec =================================================================== RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- dhcp-forwarder.spec 1 Mar 2009 12:09:39 -0000 1.24 +++ dhcp-forwarder.spec 1 Mar 2009 13:39:09 -0000 1.25 @@ -22,14 +22,14 @@ Summary: DHCP relay agent Name: dhcp-forwarder Version: 0.8 -Release: %release_func 3 +Release: %release_func 4 License: GPLv3 Group: System Environment/Daemons URL: http://www.tu-chemnitz.de/~ensc/dhcp-fwd Source0: http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2 Source1: http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2.asc BuildRoot: %_tmppath/%name-%version-%release-root -Requires: init(dhcp-forwarder) +Requires: init(%name) BuildRequires: which BuildRequires: fedora-usermgmt-devel Provides: user(%username) = 11 @@ -41,7 +41,7 @@ %package sysvinit Summary: SysV initscripts for dhcp-forwarder Group: System Environment/Base -Provides: init(dhcp-forwarder) = sysv +Provides: init(%name) = sysv Requires: %name = %version-%release Requires(preun): %name initscripts Requires(postun): %name initscripts @@ -55,17 +55,18 @@ Summary: upstart initscripts for dhcp-forwarder Group: System Environment/Base Source10: dhcp-forwarder.upstart -Provides: init(dhcp-forwarder) = upstart +Provides: init(%name) = upstart Requires: %name = %version-%release # implicates a conflict with upstart 0.5+ Requires(pre): /etc/event.d -Requires: upstart +Requires(post): /usr/bin/killall +Requires(postun): /sbin/initctl BuildArch: noarch %package minit Summary: minit initscripts for dhcp-forwarder Group: System Environment/Base -Provides: init(dhcp-forwarder) = minit +Provides: init(%name) = minit Requires: %name = %version-%release Requires(pre): minit-setup Requires(postun): minit-setup @@ -163,6 +164,13 @@ test "$1" = "0" || %_initrddir/%service condrestart &>/dev/null +%post upstart +/usr/bin/killall -u %username dhcp-fwd 2>/dev/null || : + +%preun upstart +test "$1" != "0" || /sbin/initctl -q stop dhcp-forwarder || : + + %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README THANKS @@ -186,6 +194,7 @@ %defattr(-,root,root,-) %config(noreplace) /etc/event.d/* + %if 0%{?with_minit:1} %files minit @@ -199,6 +208,9 @@ %changelog +* Sun Mar 1 2009 Enrico Scholz - 0.8-4 +- added upstart %%scriplets + * Sun Mar 1 2009 Enrico Scholz - 0.8-3 - added -upstart subpackage - renamed -sysv subpackage to -sysvinit to make -upstart win the From dodji at fedoraproject.org Sun Mar 1 13:45:53 2009 From: dodji at fedoraproject.org (Dodji Seketeli) Date: Sun, 1 Mar 2009 13:45:53 +0000 (UTC) Subject: rpms/nemiver/devel .cvsignore, 1.12, 1.13 nemiver.spec, 1.20, 1.21 sources, 1.12, 1.13 Message-ID: <20090301134553.316EB70115@cvs1.fedora.phx.redhat.com> Author: dodji Update of /cvs/pkgs/rpms/nemiver/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31756 Modified Files: .cvsignore nemiver.spec sources Log Message: * Sun Mar 01 2009 Dodji Seketeli - 0.6.5-1 - Update to new upstream release (0.6.5) - Drop include-stdint.patch as pushed upstream - BuildRequire intltool Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 17 Jan 2009 22:01:29 -0000 1.12 +++ .cvsignore 1 Mar 2009 13:45:21 -0000 1.13 @@ -1 +1 @@ -nemiver-0.6.4.tar.bz2 +nemiver-0.6.5.tar.bz2 Index: nemiver.spec =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/devel/nemiver.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- nemiver.spec 24 Feb 2009 08:36:07 -0000 1.20 +++ nemiver.spec 1 Mar 2009 13:45:21 -0000 1.21 @@ -1,6 +1,6 @@ Name: nemiver -Version: 0.6.4 -Release: 2%{?dist} +Version: 0.6.5 +Release: 1%{?dist} Summary: A GNOME C/C++ Debugger Group: Development/Debuggers @@ -8,7 +8,6 @@ URL: http://home.gna.org/nemiver/ Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.6/%{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-include-stdint.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,6 +33,7 @@ BuildRequires: perl(XML::Parser) BuildRequires: sqlite-devel >= 3.0 BuildRequires: vte-devel >= 0.12.0 +BuildRequires: intltool Requires(pre): GConf2 @@ -76,7 +76,6 @@ %prep %setup -q -%patch0 -p1 -b .include-stdint.patch %build @@ -158,6 +157,11 @@ %changelog +* Sun Mar 01 2009 Dodji Seketeli - 0.6.5-1 +- Update to new upstream release (0.6.5) +- Drop include-stdint.patch as pushed upstream +- BuildRequire intltool + * Tue Feb 24 2009 Dodji Seketeli - 0.6.4-2 - Rebuild against ghex 2.2.4. This should fix #571099 - Patch Nemiver to make it compile with gcc 4.3.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 17 Jan 2009 22:01:29 -0000 1.12 +++ sources 1 Mar 2009 13:45:22 -0000 1.13 @@ -1 +1 @@ -67087d15289ca6149aa71ed60b603661 nemiver-0.6.4.tar.bz2 +8986dd9eec47604826a8556d37e51746 nemiver-0.6.5.tar.bz2 From atorkhov at fedoraproject.org Sun Mar 1 13:46:42 2009 From: atorkhov at fedoraproject.org (Alexey Torkhov) Date: Sun, 1 Mar 2009 13:46:42 +0000 (UTC) Subject: rpms/atlascpp/devel atlascpp.spec,1.9,1.10 Message-ID: <20090301134642.B447070115@cvs1.fedora.phx.redhat.com> Author: atorkhov Update of /cvs/pkgs/rpms/atlascpp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31998 Modified Files: atlascpp.spec Log Message: * Sun Mar 01 2009 Alexey Torkhov - 0.6.1-6 - Moving skstream dependency to -devel subpackage - Actually perform the tests Index: atlascpp.spec =================================================================== RCS file: /cvs/pkgs/rpms/atlascpp/devel/atlascpp.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- atlascpp.spec 1 Mar 2009 11:39:11 -0000 1.9 +++ atlascpp.spec 1 Mar 2009 13:46:12 -0000 1.10 @@ -1,6 +1,6 @@ Name: atlascpp Version: 0.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: WorldForge message protocol library Group: Development/Libraries @@ -62,7 +62,9 @@ install -p -m 0644 doc/man/man3/Atlas*.3 $RPM_BUILD_ROOT%{_mandir}/man3/ %check -make check +# Run tests in debug mode so asserts won't be skipped +sed -i -e 's/-DNDEBUG/-DDEBUG/' tests/Makefile +make %{?_smp_mflags} check %clean @@ -89,6 +91,10 @@ %{_mandir}/man3/Atlas* %changelog +* Sun Mar 01 2009 Alexey Torkhov - 0.6.1-6 +- Moving skstream dependency to -devel subpackage +- Actually perform the tests + * Sat Feb 28 2009 Alexey Torkhov - 0.6.1-5 - Rebuilt for skstream update From atorkhov at fedoraproject.org Sun Mar 1 13:47:59 2009 From: atorkhov at fedoraproject.org (Alexey Torkhov) Date: Sun, 1 Mar 2009 13:47:59 +0000 (UTC) Subject: rpms/mercator/devel mercator.spec,1.8,1.9 Message-ID: <20090301134759.9EC5070115@cvs1.fedora.phx.redhat.com> Author: atorkhov Update of /cvs/pkgs/rpms/mercator/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32298 Modified Files: mercator.spec Log Message: * Sun Mar 01 2009 Alexey Torkhov - 0.2.7-2 - Actually perform the tests Index: mercator.spec =================================================================== RCS file: /cvs/pkgs/rpms/mercator/devel/mercator.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mercator.spec 27 Feb 2009 21:47:27 -0000 1.8 +++ mercator.spec 1 Mar 2009 13:47:29 -0000 1.9 @@ -1,6 +1,6 @@ Name: mercator Version: 0.2.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Terrain library for WorldForge client/server Group: Development/Libraries @@ -52,6 +52,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}-0.2.la %check +# Run tests in debug mode so asserts won't be skipped +sed -i -e 's/-DNDEBUG/-DDEBUG/' tests/Makefile make %{?_smp_mflags} check %clean @@ -77,6 +79,9 @@ %changelog +* Sun Mar 01 2009 Alexey Torkhov - 0.2.7-2 +- Actually perform the tests + * Fri Feb 27 2009 Alexey Torkhov - 0.2.7-1 - Update to 0.2.7 From atorkhov at fedoraproject.org Sun Mar 1 13:49:46 2009 From: atorkhov at fedoraproject.org (Alexey Torkhov) Date: Sun, 1 Mar 2009 13:49:46 +0000 (UTC) Subject: rpms/skstream/devel skstream.spec,1.8,1.9 Message-ID: <20090301134946.7EC9470115@cvs1.fedora.phx.redhat.com> Author: atorkhov Update of /cvs/pkgs/rpms/skstream/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32636 Modified Files: skstream.spec Log Message: "Perform" the tests. They're failing anyway though. Index: skstream.spec =================================================================== RCS file: /cvs/pkgs/rpms/skstream/devel/skstream.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- skstream.spec 27 Feb 2009 23:15:08 -0000 1.8 +++ skstream.spec 1 Mar 2009 13:49:16 -0000 1.9 @@ -63,7 +63,9 @@ # network services being enabled, or being run as root, in order to # pass. %check -make check || : +# Run tests in debug mode so asserts won't be skipped +sed -i -e 's/-DNDEBUG/-DDEBUG/' test/Makefile +make %{?_smp_mflags} check || : %post -p /sbin/ldconfig From lkundrak at fedoraproject.org Sun Mar 1 13:50:18 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Mar 2009 13:50:18 +0000 (UTC) Subject: rpms/starlab/devel starlab-4.4.3-gcc44.patch, NONE, 1.1 starlab.spec, 1.2, 1.3 Message-ID: <20090301135018.E0B5470115@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/starlab/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv453 Modified Files: starlab.spec Added Files: starlab-4.4.3-gcc44.patch Log Message: * Sun Mar 1 2009 Lubomir Rintel (Fedora Astronomy) - 4.4.3-5 - Fix build with GCC 4.4 starlab-4.4.3-gcc44.patch: --- NEW FILE starlab-4.4.3-gcc44.patch --- Fix build with GCC 4.4 Lubomir Rintel diff -up starlab-4.4.3/src/std/pgetopt.C.gcc44 starlab-4.4.3/src/std/pgetopt.C --- starlab-4.4.3/src/std/pgetopt.C.gcc44 2009-03-01 14:34:04.000000000 +0100 +++ starlab-4.4.3/src/std/pgetopt.C 2009-03-01 14:42:08.000000000 +0100 @@ -108,7 +108,7 @@ local inline char *get_version(const cha if (!cvs_id) return NULL; - char *start = strstr(cvs_id, "Revision:"); + const char *start = strstr(cvs_id, "Revision:"); if (!start) return NULL; start += 9; @@ -116,7 +116,7 @@ local inline char *get_version(const cha if (start - cvs_id > strlen(cvs_id)) return NULL; - char *end = start; + const char *end = start; while (*end > ' ') end++; if (*end == ' ') { Index: starlab.spec =================================================================== RCS file: /cvs/pkgs/rpms/starlab/devel/starlab.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- starlab.spec 26 Feb 2009 03:03:30 -0000 1.2 +++ starlab.spec 1 Mar 2009 13:49:48 -0000 1.3 @@ -1,6 +1,6 @@ Name: starlab Version: 4.4.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Software Environment for Collisional Stellar Dynamics Group: Applications/Multimedia @@ -12,6 +12,7 @@ Patch2: starlab-4.4.3-buildcwd.patch Patch3: starlab-4.4.3-autoconf263.patch Patch4: starlab-4.4.3-tstarplot.patch +Patch5: starlab-4.4.3-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -288,6 +289,9 @@ %changelog +* Sun Mar 1 2009 Lubomir Rintel (Fedora Astronomy) - 4.4.3-5 +- Fix build with GCC 4.4 + * Wed Feb 25 2009 Fedora Release Engineering - 4.4.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From atorkhov at fedoraproject.org Sun Mar 1 13:52:09 2009 From: atorkhov at fedoraproject.org (Alexey Torkhov) Date: Sun, 1 Mar 2009 13:52:09 +0000 (UTC) Subject: rpms/eris/devel eris.spec,1.18,1.19 Message-ID: <20090301135209.C904D70115@cvs1.fedora.phx.redhat.com> Author: atorkhov Update of /cvs/pkgs/rpms/eris/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv919 Modified Files: eris.spec Log Message: Actually perform the tests. Index: eris.spec =================================================================== RCS file: /cvs/pkgs/rpms/eris/devel/eris.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- eris.spec 1 Mar 2009 12:03:34 -0000 1.18 +++ eris.spec 1 Mar 2009 13:51:39 -0000 1.19 @@ -55,8 +55,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}-1.3.la -%check # They seem to hang sometimes. +%check +# Run tests in debug mode so asserts won't be skipped +sed -i -e 's/-DNDEBUG/-DDEBUG/' test/Makefile make %{?_smp_mflags} check From dodji at fedoraproject.org Sun Mar 1 13:52:24 2009 From: dodji at fedoraproject.org (Dodji Seketeli) Date: Sun, 1 Mar 2009 13:52:24 +0000 (UTC) Subject: rpms/nemiver/F-10 nemiver.spec,1.20,1.21 Message-ID: <20090301135224.93F8970115@cvs1.fedora.phx.redhat.com> Author: dodji Update of /cvs/pkgs/rpms/nemiver/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv630 Modified Files: nemiver.spec Log Message: * Sun Mar 01 2009 Dodji Seketeli - 0.6.5-1 - Update to new upstream release (0.6.5) - BuildRequires intltool - Update link to project page Index: nemiver.spec =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/F-10/nemiver.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- nemiver.spec 24 Feb 2009 21:25:54 -0000 1.20 +++ nemiver.spec 1 Mar 2009 13:51:54 -0000 1.21 @@ -1,11 +1,11 @@ Name: nemiver -Version: 0.6.4 -Release: 2%{?dist} +Version: 0.6.5 +Release: 1%{?dist} Summary: A GNOME C/C++ Debugger Group: Development/Debuggers License: GPLv2+ -URL: http://home.gna.org/nemiver/ +URL: http://projects.gnome.org/nemiver Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.6/%{name}-%{version}.tar.bz2 @@ -33,6 +33,7 @@ BuildRequires: perl(XML::Parser) BuildRequires: sqlite-devel >= 3.0 BuildRequires: vte-devel >= 0.12.0 +BuildRequires: intltool Requires(pre): GConf2 @@ -156,6 +157,11 @@ %changelog +* Sun Mar 01 2009 Dodji Seketeli - 0.6.5-1 +- Update to new upstream release (0.6.5) +- BuildRequires intltool +- Update link to project page + * Fri Feb 20 2009 Dodji Seketeli - 0.6.4-2 - Build against ghex 2.24 to fix crash #571099 From rathann at fedoraproject.org Sun Mar 1 13:53:22 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Sun, 1 Mar 2009 13:53:22 +0000 (UTC) Subject: rpms/openbabel/devel openbabel-check.patch,1.3,1.4 Message-ID: <20090301135322.4F35270115@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1254 Modified Files: openbabel-check.patch Log Message: - debug test failure, try 2 openbabel-check.patch: Index: openbabel-check.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-check.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- openbabel-check.patch 1 Mar 2009 13:24:45 -0000 1.3 +++ openbabel-check.patch 1 Mar 2009 13:53:21 -0000 1.4 @@ -6,4 +6,4 @@ fi -${PROVE} "$@" ${TESTS} -+${PROVE} "$@" --debug ${TESTS} ++${PROVE} --debug "$@" ${TESTS} From lkundrak at fedoraproject.org Sun Mar 1 13:57:16 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Mar 2009 13:57:16 +0000 (UTC) Subject: rpms/starlab/devel starlab.spec,1.3,1.4 Message-ID: <20090301135716.C565F70115@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/starlab/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1854 Modified Files: starlab.spec Log Message: Apply the patch, you fool! Index: starlab.spec =================================================================== RCS file: /cvs/pkgs/rpms/starlab/devel/starlab.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- starlab.spec 1 Mar 2009 13:49:48 -0000 1.3 +++ starlab.spec 1 Mar 2009 13:56:46 -0000 1.4 @@ -62,6 +62,7 @@ %patch2 -p1 -b .buildcwd %patch3 -p1 -b .autoconf263 %patch4 -p1 -b .tstarplot +%patch5 -p1 -b .gcc44 # This was removed due to being duplicate, but references were not fixed ln -s constants.h include/star/starlab_constants.h From dodji at fedoraproject.org Sun Mar 1 14:00:50 2009 From: dodji at fedoraproject.org (Dodji Seketeli) Date: Sun, 1 Mar 2009 14:00:50 +0000 (UTC) Subject: rpms/nemiver/F-9 nemiver.spec,1.14,1.15 Message-ID: <20090301140050.26F3870115@cvs1.fedora.phx.redhat.com> Author: dodji Update of /cvs/pkgs/rpms/nemiver/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2748 Modified Files: nemiver.spec Log Message: * Sun Mar 01 2009 Dodji Seketeli - 0.6.5-1 - Update to new upstream release (0.6.5) - BuildRequire intltool Index: nemiver.spec =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/F-9/nemiver.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- nemiver.spec 25 Feb 2009 00:50:10 -0000 1.14 +++ nemiver.spec 1 Mar 2009 14:00:19 -0000 1.15 @@ -1,5 +1,5 @@ Name: nemiver -Version: 0.6.4 +Version: 0.6.5 Release: 1%{?dist} Summary: A GNOME C/C++ Debugger @@ -29,6 +29,7 @@ BuildRequires: perl(XML::Parser) BuildRequires: sqlite-devel >= 3.0 BuildRequires: vte-devel >= 0.12.0 +BuildRequires: intltool Requires(pre): GConf2 @@ -150,6 +151,10 @@ %changelog +* Sun Mar 01 2009 Dodji Seketeli - 0.6.5-1 +- Update to new upstream release (0.6.5) +- BuildRequire intltool + * Wed Feb 25 2009 Dodji Seketeli - 0.6.4-1 - Update to upstream 0.6.4 relase - Build against the new ghex 2.22.0-2 that fixes a random crash at startup From lkundrak at fedoraproject.org Sun Mar 1 14:19:13 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Mar 2009 14:19:13 +0000 (UTC) Subject: rpms/supertux/devel supertux-0.3.1-gcc44.patch, NONE, 1.1 supertux.spec, 1.23, 1.24 Message-ID: <20090301141913.8DADA70115@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/supertux/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6152 Modified Files: supertux.spec Added Files: supertux-0.3.1-gcc44.patch Log Message: * Sun Mar 01 2009 Lubomir Rintel - 0.3.1-7 - Fix build with GCC 4.4 supertux-0.3.1-gcc44.patch: --- NEW FILE supertux-0.3.1-gcc44.patch --- Fix build with GCC 4.4 Lubomir Rintel diff -up supertux-0.3.1/src/lisp/lisp.cpp.gcc44 supertux-0.3.1/src/lisp/lisp.cpp --- supertux-0.3.1/src/lisp/lisp.cpp.gcc44 2009-03-01 15:13:40.000000000 +0100 +++ supertux-0.3.1/src/lisp/lisp.cpp 2009-03-01 15:13:53.000000000 +0100 @@ -19,6 +19,7 @@ #include +#include #include "lisp.hpp" namespace lisp diff -up supertux-0.3.1/src/random_generator.cpp.gcc44 supertux-0.3.1/src/random_generator.cpp --- supertux-0.3.1/src/random_generator.cpp.gcc44 2009-03-01 15:14:05.000000000 +0100 +++ supertux-0.3.1/src/random_generator.cpp 2009-03-01 15:14:18.000000000 +0100 @@ -39,6 +39,7 @@ #include #include #include +#include #include "random_generator.hpp" RandomGenerator systemRandom; // global random number generator Index: supertux.spec =================================================================== RCS file: /cvs/pkgs/rpms/supertux/devel/supertux.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- supertux.spec 26 Feb 2009 04:10:50 -0000 1.23 +++ supertux.spec 1 Mar 2009 14:18:41 -0000 1.24 @@ -6,7 +6,7 @@ Name: supertux Version: 0.3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Jump'n run like game Group: Amusements/Games License: GPLv2+ @@ -16,6 +16,7 @@ Patch0: supertux-0.3.1-gcc43.patch Patch1: supertux-0.3.1-comments.patch Patch2: supertux-0.3.1-cons_disable.patch +Patch3: supertux-0.3.1-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.4 BuildRequires: SDL_image-devel @@ -45,6 +46,7 @@ %patch0 -p1 -b .gcc43 %patch1 -p1 -b .comments %patch2 -p1 -b .cons_disable +%patch3 -p1 -b .gcc44 # We want to just call this release "supertux", not "supertux2". find . -depth -name 'supertux2*' \ @@ -89,6 +91,9 @@ %{_datadir}/pixmaps/* %changelog +* Sun Mar 01 2009 Lubomir Rintel - 0.3.1-7 +- Fix build with GCC 4.4 + * Wed Feb 25 2009 Fedora Release Engineering - 0.3.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ensc at fedoraproject.org Sun Mar 1 14:19:14 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sun, 1 Mar 2009 14:19:14 +0000 (UTC) Subject: rpms/gif2png/devel gif2png.spec,1.7,1.8 Message-ID: <20090301141914.B85FB70115@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6189 Modified Files: gif2png.spec Log Message: updated Index: gif2png.spec =================================================================== RCS file: /cvs/extras/rpms/gif2png/devel/gif2png.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gif2png.spec 24 Feb 2009 21:24:46 -0000 1.7 +++ gif2png.spec 1 Mar 2009 14:18:44 -0000 1.8 @@ -3,7 +3,7 @@ Summary: A GIF to PNG converter Name: gif2png Version: 2.5.1 -Release: %release_func 5 +Release: %release_func 6 License: BSD Group: Applications/Multimedia URL: http://www.catb.org/~esr/gif2png/ @@ -17,6 +17,7 @@ Group: Applications/Multimedia Requires: gif2png = %version-%release Requires: python +BuildArch: noarch %description @@ -74,6 +75,9 @@ %changelog +* Sun Mar 1 2009 Enrico Scholz - 2.5.1-6 +- made web2png noarch + * Tue Feb 24 2009 Fedora Release Engineering - 2.5.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From dodji at fedoraproject.org Sun Mar 1 14:29:58 2009 From: dodji at fedoraproject.org (Dodji Seketeli) Date: Sun, 1 Mar 2009 14:29:58 +0000 (UTC) Subject: rpms/nemiver/F-10 .cvsignore,1.12,1.13 sources,1.12,1.13 Message-ID: <20090301142958.6215470115@cvs1.fedora.phx.redhat.com> Author: dodji Update of /cvs/pkgs/rpms/nemiver/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8022 Modified Files: .cvsignore sources Log Message: * Sun Mar 01 2009 Dodji Seketeli - 0.6.5-1 - Update to new upstream release (0.6.5) - BuildRequires intltool - Update link to project page Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/F-10/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 19 Jan 2009 05:43:21 -0000 1.12 +++ .cvsignore 1 Mar 2009 14:29:27 -0000 1.13 @@ -1 +1 @@ -nemiver-0.6.4.tar.bz2 +nemiver-0.6.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/F-10/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 19 Jan 2009 05:43:21 -0000 1.12 +++ sources 1 Mar 2009 14:29:27 -0000 1.13 @@ -1 +1 @@ -67087d15289ca6149aa71ed60b603661 nemiver-0.6.4.tar.bz2 +8986dd9eec47604826a8556d37e51746 nemiver-0.6.5.tar.bz2 From lkundrak at fedoraproject.org Sun Mar 1 14:32:03 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Mar 2009 14:32:03 +0000 (UTC) Subject: rpms/celestia/devel celestia-1.5.0-gcc44.patch, NONE, 1.1 celestia.spec, 1.25, 1.26 Message-ID: <20090301143203.D42C270115@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/celestia/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8396 Modified Files: celestia.spec Added Files: celestia-1.5.0-gcc44.patch Log Message: * Sun Mar 1 2009 Lubomir Rintel - 1.5.0-3 - Fix build with GCC 4.4 celestia-1.5.0-gcc44.patch: --- NEW FILE celestia-1.5.0-gcc44.patch --- Fix build with GCC 4.4 Lubomir Rintel (Fedora Astronomy) diff -up celestia-1.5.0/src/celengine/overlay.h.gcc44 celestia-1.5.0/src/celengine/overlay.h --- celestia-1.5.0/src/celengine/overlay.h.gcc44 2009-03-01 15:23:44.000000000 +0100 +++ celestia-1.5.0/src/celengine/overlay.h 2009-03-01 15:23:50.000000000 +0100 @@ -12,6 +12,7 @@ #include #include +#include #include diff -up celestia-1.5.0/src/celengine/star.cpp.gcc44 celestia-1.5.0/src/celengine/star.cpp --- celestia-1.5.0/src/celengine/star.cpp.gcc44 2009-03-01 15:26:57.000000000 +0100 +++ celestia-1.5.0/src/celengine/star.cpp 2009-03-01 15:27:22.000000000 +0100 @@ -9,6 +9,7 @@ #include #include +#include #include #include "celestia.h" #include "astro.h" Index: celestia.spec =================================================================== RCS file: /cvs/pkgs/rpms/celestia/devel/celestia.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- celestia.spec 24 Feb 2009 06:57:56 -0000 1.25 +++ celestia.spec 1 Mar 2009 14:31:33 -0000 1.26 @@ -1,12 +1,13 @@ Name: celestia Version: 1.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OpenGL real-time visual space simulation Group: Applications/Emulators License: GPLv2+ Source0: http://dl.sf.net/celestia/celestia-%{version}.tar.gz Source3: celestia.desktop Patch0: celestia-1.5.0-gcc43.patch +Patch1: celestia-1.5.0-gcc44.patch URL: http://www.shatters.net/celestia/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,6 +43,7 @@ %prep %setup -q %patch0 -p1 -b .gcc43 +%patch1 -p1 -b .gcc44 # Make sure we compile with the right CFLAGS/CXXFLAGS (from Hans de Goede). sed -i 's/CFLAGS="\$CFLAGS \$CELESTIAFLAGS \$CELESTIA_CFLAGS"/CFLAGS="\$CFLAGS \$CELESTIAFLAGS"/' configure @@ -127,6 +129,9 @@ %changelog +* Sun Mar 1 2009 Lubomir Rintel - 1.5.0-3 +- Fix build with GCC 4.4 + * Mon Feb 23 2009 Fedora Release Engineering - 1.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From gemi at fedoraproject.org Sun Mar 1 14:41:05 2009 From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=) Date: Sun, 1 Mar 2009 14:41:05 +0000 (UTC) Subject: rpms/sweep/devel sweep-0.9.3-multithread.patch, NONE, 1.1 sweep.spec, 1.8, 1.9 Message-ID: <20090301144105.6740870115@cvs1.fedora.phx.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/sweep/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10600 Modified Files: sweep.spec Added Files: sweep-0.9.3-multithread.patch Log Message: fix for crash while saving sweep-0.9.3-multithread.patch: --- NEW FILE sweep-0.9.3-multithread.patch --- diff -up sweep-0.9.3/src/main.c.multithread sweep-0.9.3/src/main.c --- sweep-0.9.3/src/main.c.multithread 2009-03-01 15:34:00.000000000 +0100 +++ sweep-0.9.3/src/main.c 2009-03-01 15:34:22.000000000 +0100 @@ -138,6 +138,7 @@ main (int argc, char *argv[]) #endif #endif + XInitThreads(); gtk_init (&argc, &argv); #ifdef HAVE_PUTENV Index: sweep.spec =================================================================== RCS file: /cvs/pkgs/rpms/sweep/devel/sweep.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sweep.spec 28 Feb 2009 14:08:45 -0000 1.8 +++ sweep.spec 1 Mar 2009 14:40:34 -0000 1.9 @@ -1,12 +1,13 @@ Name: sweep Version: 0.9.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An audio editor and live playback tool Group: Applications/Multimedia License: GPLv2+ URL: http://www.metadecks.org/software/sweep/index.html Source: http://puzzle.dl.sourceforge.net/sourceforge/sweep/sweep-%{version}.tar.gz +Patch0: sweep-0.9.3-multithread.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: libogg-devel @@ -40,6 +41,7 @@ %prep %setup -q +%patch0 -p1 -b .multithread # fix for wrongly set plugin dir on 64-bit sed -i 's/sweep_plugin_dir=.*/sweep_plugin_dir="$PACKAGE_PLUGIN_DIR"/' configure @@ -119,6 +121,9 @@ %changelog +* Sun Mar 1 2009 Gerard Milmeister - 0.9.3-4 +- fix for crash while saving + * Sat Feb 28 2009 Gerard Milmeister - 0.9.3-3 - fix for plugins on 64-bit platforms - really enable alsa From gemi at fedoraproject.org Sun Mar 1 14:45:32 2009 From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=) Date: Sun, 1 Mar 2009 14:45:32 +0000 (UTC) Subject: rpms/sweep/F-10 sweep-0.9.3-multithread.patch, NONE, 1.1 sweep.spec, 1.7, 1.8 Message-ID: <20090301144532.9CE8170115@cvs1.fedora.phx.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/sweep/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11570/F-10 Modified Files: sweep.spec Added Files: sweep-0.9.3-multithread.patch Log Message: fix for crash while saving sweep-0.9.3-multithread.patch: --- NEW FILE sweep-0.9.3-multithread.patch --- diff -up sweep-0.9.3/src/main.c.multithread sweep-0.9.3/src/main.c --- sweep-0.9.3/src/main.c.multithread 2009-03-01 15:34:00.000000000 +0100 +++ sweep-0.9.3/src/main.c 2009-03-01 15:34:22.000000000 +0100 @@ -138,6 +138,7 @@ main (int argc, char *argv[]) #endif #endif + XInitThreads(); gtk_init (&argc, &argv); #ifdef HAVE_PUTENV Index: sweep.spec =================================================================== RCS file: /cvs/pkgs/rpms/sweep/F-10/sweep.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sweep.spec 28 Feb 2009 14:08:45 -0000 1.7 +++ sweep.spec 1 Mar 2009 14:45:02 -0000 1.8 @@ -1,12 +1,13 @@ Name: sweep Version: 0.9.3 -Release: 2%{?dist} +Release: 4%{?dist} Summary: An audio editor and live playback tool Group: Applications/Multimedia License: GPLv2+ URL: http://www.metadecks.org/software/sweep/index.html Source: http://puzzle.dl.sourceforge.net/sourceforge/sweep/sweep-%{version}.tar.gz +Patch0: sweep-0.9.3-multithread.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: libogg-devel @@ -40,6 +41,7 @@ %prep %setup -q +%patch0 -p1 -b .multithread # fix for wrongly set plugin dir on 64-bit sed -i 's/sweep_plugin_dir=.*/sweep_plugin_dir="$PACKAGE_PLUGIN_DIR"/' configure @@ -119,7 +121,10 @@ %changelog -* Sat Feb 28 2009 Gerard Milmeister - 0.9.3-2 +* Sun Mar 1 2009 Gerard Milmeister - 0.9.3-4 +- fix for crash while saving + +* Sat Feb 28 2009 Gerard Milmeister - 0.9.3-3 - fix for plugins on 64-bit platforms - really enable alsa From gemi at fedoraproject.org Sun Mar 1 14:45:32 2009 From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=) Date: Sun, 1 Mar 2009 14:45:32 +0000 (UTC) Subject: rpms/sweep/F-9 sweep-0.9.3-multithread.patch, NONE, 1.1 sweep.spec, 1.6, 1.7 Message-ID: <20090301144532.C077570115@cvs1.fedora.phx.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/sweep/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11570/F-9 Modified Files: sweep.spec Added Files: sweep-0.9.3-multithread.patch Log Message: fix for crash while saving sweep-0.9.3-multithread.patch: --- NEW FILE sweep-0.9.3-multithread.patch --- diff -up sweep-0.9.3/src/main.c.multithread sweep-0.9.3/src/main.c --- sweep-0.9.3/src/main.c.multithread 2009-03-01 15:34:00.000000000 +0100 +++ sweep-0.9.3/src/main.c 2009-03-01 15:34:22.000000000 +0100 @@ -138,6 +138,7 @@ main (int argc, char *argv[]) #endif #endif + XInitThreads(); gtk_init (&argc, &argv); #ifdef HAVE_PUTENV Index: sweep.spec =================================================================== RCS file: /cvs/pkgs/rpms/sweep/F-9/sweep.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sweep.spec 15 Apr 2008 19:53:32 -0000 1.6 +++ sweep.spec 1 Mar 2009 14:45:02 -0000 1.7 @@ -1,12 +1,13 @@ Name: sweep Version: 0.9.3 -Release: 1%{?dist} +Release: 4%{?dist} Summary: An audio editor and live playback tool Group: Applications/Multimedia License: GPLv2+ URL: http://www.metadecks.org/software/sweep/index.html Source: http://puzzle.dl.sourceforge.net/sourceforge/sweep/sweep-%{version}.tar.gz +Patch0: sweep-0.9.3-multithread.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: libogg-devel @@ -40,10 +41,13 @@ %prep %setup -q +%patch0 -p1 -b .multithread +# fix for wrongly set plugin dir on 64-bit +sed -i 's/sweep_plugin_dir=.*/sweep_plugin_dir="$PACKAGE_PLUGIN_DIR"/' configure %build -%configure --enable-alsa --disable-rpath +%configure --disable-rpath make %{?_smp_mflags} @@ -117,6 +121,16 @@ %changelog +* Sun Mar 1 2009 Gerard Milmeister - 0.9.3-4 +- fix for crash while saving + +* Sat Feb 28 2009 Gerard Milmeister - 0.9.3-3 +- fix for plugins on 64-bit platforms +- really enable alsa + +* Wed Feb 25 2009 Fedora Release Engineering - 0.9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Apr 14 2008 Gerard Milmeister - 0.9.3-1 - new release 0.9.3 From bochecha at fedoraproject.org Sun Mar 1 14:46:33 2009 From: bochecha at fedoraproject.org (Mathieu Bridon) Date: Sun, 1 Mar 2009 14:46:33 +0000 (UTC) Subject: rpms/adonthell/devel adonthell-gcc44.patch, NONE, 1.1 adonthell.spec, 1.3, 1.4 Message-ID: <20090301144633.CF84470115@cvs1.fedora.phx.redhat.com> Author: bochecha Update of /cvs/pkgs/rpms/adonthell/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11374 Modified Files: adonthell.spec Added Files: adonthell-gcc44.patch Log Message: Fixed building with GCC 4.4 adonthell-gcc44.patch: --- NEW FILE adonthell-gcc44.patch --- diff -C 3 -r1.36 -r1.37 *** src/dialog.cc 13 Oct 2007 19:47:25 -0000 1.36 --- src/dialog.cc 1 Mar 2009 12:26:14 -0000 1.37 *************** *** 265,271 **** { u_int32 begin, end, len; PyObject *result; ! char *tmp, *start, *mid, *str = NULL; character *the_player = data::the_player; string newstr (s); --- 265,272 ---- { u_int32 begin, end, len; PyObject *result; ! const char *start; ! char *tmp, *mid, *str = NULL; character *the_player = data::the_player; string newstr (s); *************** *** 318,324 **** // Error! cout << "\n*** Error, unknown macro " << start << flush; ! start[0] = ' '; } // execute python functions --- 319,325 ---- // Error! cout << "\n*** Error, unknown macro " << start << flush; ! newstr[newstr.length () - strlen (start)] = ' '; } // execute python functions Index: adonthell.spec =================================================================== RCS file: /cvs/pkgs/rpms/adonthell/devel/adonthell.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- adonthell.spec 24 Feb 2009 00:11:36 -0000 1.3 +++ adonthell.spec 1 Mar 2009 14:46:03 -0000 1.4 @@ -2,13 +2,16 @@ Name: adonthell Version: 0.3.5 -Release: 0.5%{?dist} +Release: 0.6%{?dist} Summary: A 2D graphical RPG game Group: Amusements/Games License: GPLv2+ URL: http://adonthell.linuxgames.com/ Source0: http://download.savannah.gnu.org/releases/adonthell/adonthell-0.3.5.tar.gz +## Submitted upstream, will be in next release +# https://savannah.nongnu.org/bugs/index.php?25737 +Patch0: %{name}-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel @@ -49,6 +52,8 @@ sed -i 's|myconfig.gamedir + "/locale"|"%{_datadir}/locale"|' src/nls.cc # remove hardcoded CFLAGS sed -i 's|^CFLAGS|^#CFLAGS|g' configure +# build with GCC 4.4 +%patch0 -p0 %build @@ -77,6 +82,9 @@ %changelog +* Sun Mar 01 2009 Mathieu Bridon - 0.3.5-0.6 +- Fixed building with GCC 4.4 + * Mon Feb 23 2009 Fedora Release Engineering - 0.3.5-0.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From devrim at fedoraproject.org Sun Mar 1 14:58:25 2009 From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=) Date: Sun, 1 Mar 2009 14:58:25 +0000 (UTC) Subject: rpms/postgresql-pgpool-II/EL-5 .cvsignore, 1.7, 1.8 postgresql-pgpool-II.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <20090301145825.C3F4470116@cvs1.fedora.phx.redhat.com> Author: devrim Update of /cvs/extras/rpms/postgresql-pgpool-II/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13393/EL-5 Modified Files: .cvsignore postgresql-pgpool-II.spec sources Log Message: Update to 2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 12 Aug 2008 05:34:20 -0000 1.7 +++ .cvsignore 1 Mar 2009 14:57:55 -0000 1.8 @@ -1 +1 @@ -pgpool-II-2.1.tar.gz +pgpool-II-2.2.tar.gz Index: postgresql-pgpool-II.spec =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-5/postgresql-pgpool-II.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- postgresql-pgpool-II.spec 12 Aug 2008 05:34:20 -0000 1.12 +++ postgresql-pgpool-II.spec 1 Mar 2009 14:57:55 -0000 1.13 @@ -2,12 +2,12 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} -Version: 2.1 +Version: 2.2 Release: 1%{?dist} License: BSD Group: Applications/Databases -URL: http://pgpool.projects.PostgreSQL.org/pgpool-II/en -Source0: http://pgfoundry.org/frs/download.php/1843/%{short_name}-%{version}.tar.gz +URL: http://pgpool.projects.PostgreSQL.org +Source0: http://pgfoundry.org/frs/download.php/2108/%{short_name}-%{version}.tar.gz Source1: pgpool.init Source2: pgpool.sysconfig Patch1: pgpool.conf.sample.patch @@ -102,6 +102,10 @@ %{_libdir}/libpcp.so %changelog +* Sun Mar 1 2009 Devrim Gunduz 2.2-1 +- Update to 2.2 +- Fix URL + * Tue Aug 12 2008 Devrim Gunduz 2.1-1 - Update to 2.1 Gold - Set group of sample config files to root, not apache. Fixes RH #442372. Index: sources =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Aug 2008 05:34:20 -0000 1.8 +++ sources 1 Mar 2009 14:57:55 -0000 1.9 @@ -1 +1 @@ -cf02f9358f46849bd526798868e13162 pgpool-II-2.1.tar.gz +3dc286e2217478acbc05f127e74bd300 pgpool-II-2.2.tar.gz From devrim at fedoraproject.org Sun Mar 1 14:58:25 2009 From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=) Date: Sun, 1 Mar 2009 14:58:25 +0000 (UTC) Subject: rpms/postgresql-pgpool-II/EL-4 .cvsignore, 1.7, 1.8 postgresql-pgpool-II.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <20090301145825.C1BC070115@cvs1.fedora.phx.redhat.com> Author: devrim Update of /cvs/extras/rpms/postgresql-pgpool-II/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13393/EL-4 Modified Files: .cvsignore postgresql-pgpool-II.spec sources Log Message: Update to 2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 12 Aug 2008 05:34:20 -0000 1.7 +++ .cvsignore 1 Mar 2009 14:57:54 -0000 1.8 @@ -1 +1 @@ -pgpool-II-2.1.tar.gz +pgpool-II-2.2.tar.gz Index: postgresql-pgpool-II.spec =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/postgresql-pgpool-II.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- postgresql-pgpool-II.spec 12 Aug 2008 05:34:20 -0000 1.12 +++ postgresql-pgpool-II.spec 1 Mar 2009 14:57:54 -0000 1.13 @@ -2,12 +2,12 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} -Version: 2.1 +Version: 2.2 Release: 1%{?dist} License: BSD Group: Applications/Databases -URL: http://pgpool.projects.PostgreSQL.org/pgpool-II/en -Source0: http://pgfoundry.org/frs/download.php/1843/%{short_name}-%{version}.tar.gz +URL: http://pgpool.projects.PostgreSQL.org +Source0: http://pgfoundry.org/frs/download.php/2108/%{short_name}-%{version}.tar.gz Source1: pgpool.init Source2: pgpool.sysconfig Patch1: pgpool.conf.sample.patch @@ -102,6 +102,10 @@ %{_libdir}/libpcp.so %changelog +* Sun Mar 1 2009 Devrim Gunduz 2.2-1 +- Update to 2.2 +- Fix URL + * Tue Aug 12 2008 Devrim Gunduz 2.1-1 - Update to 2.1 Gold - Set group of sample config files to root, not apache. Fixes RH #442372. Index: sources =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Aug 2008 05:34:20 -0000 1.8 +++ sources 1 Mar 2009 14:57:55 -0000 1.9 @@ -1 +1 @@ -cf02f9358f46849bd526798868e13162 pgpool-II-2.1.tar.gz +3dc286e2217478acbc05f127e74bd300 pgpool-II-2.2.tar.gz From devrim at fedoraproject.org Sun Mar 1 14:58:26 2009 From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=) Date: Sun, 1 Mar 2009 14:58:26 +0000 (UTC) Subject: rpms/postgresql-pgpool-II/F-9 .cvsignore, 1.9, 1.10 postgresql-pgpool-II.spec, 1.23, 1.24 sources, 1.9, 1.10 Message-ID: <20090301145826.DEFDB70115@cvs1.fedora.phx.redhat.com> Author: devrim Update of /cvs/extras/rpms/postgresql-pgpool-II/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13393/F-9 Modified Files: .cvsignore postgresql-pgpool-II.spec sources Log Message: Update to 2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 12 Aug 2008 05:06:59 -0000 1.9 +++ .cvsignore 1 Mar 2009 14:57:56 -0000 1.10 @@ -1 +1 @@ -pgpool-II-2.1.tar.gz +pgpool-II-2.2.tar.gz Index: postgresql-pgpool-II.spec =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-9/postgresql-pgpool-II.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- postgresql-pgpool-II.spec 12 Aug 2008 05:34:21 -0000 1.23 +++ postgresql-pgpool-II.spec 1 Mar 2009 14:57:56 -0000 1.24 @@ -2,12 +2,12 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} -Version: 2.1 +Version: 2.2 Release: 1%{?dist} License: BSD Group: Applications/Databases -URL: http://pgpool.projects.PostgreSQL.org/pgpool-II/en -Source0: http://pgfoundry.org/frs/download.php/1843/%{short_name}-%{version}.tar.gz +URL: http://pgpool.projects.PostgreSQL.org +Source0: http://pgfoundry.org/frs/download.php/2108/%{short_name}-%{version}.tar.gz Source1: pgpool.init Source2: pgpool.sysconfig Patch1: pgpool.conf.sample.patch @@ -102,6 +102,10 @@ %{_libdir}/libpcp.so %changelog +* Sun Mar 1 2009 Devrim Gunduz 2.2-1 +- Update to 2.2 +- Fix URL + * Tue Aug 12 2008 Devrim Gunduz 2.1-1 - Update to 2.1 Gold - Set group of sample config files to root, not apache. Fixes RH #442372. Index: sources =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 12 Aug 2008 05:06:59 -0000 1.9 +++ sources 1 Mar 2009 14:57:56 -0000 1.10 @@ -1 +1 @@ -cf02f9358f46849bd526798868e13162 pgpool-II-2.1.tar.gz +3dc286e2217478acbc05f127e74bd300 pgpool-II-2.2.tar.gz From devrim at fedoraproject.org Sun Mar 1 14:58:26 2009 From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=) Date: Sun, 1 Mar 2009 14:58:26 +0000 (UTC) Subject: rpms/postgresql-pgpool-II/F-10 .cvsignore, 1.9, 1.10 postgresql-pgpool-II.spec, 1.23, 1.24 sources, 1.9, 1.10 Message-ID: <20090301145826.7E96770115@cvs1.fedora.phx.redhat.com> Author: devrim Update of /cvs/extras/rpms/postgresql-pgpool-II/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13393/F-10 Modified Files: .cvsignore postgresql-pgpool-II.spec sources Log Message: Update to 2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-10/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 12 Aug 2008 05:06:59 -0000 1.9 +++ .cvsignore 1 Mar 2009 14:57:55 -0000 1.10 @@ -1 +1 @@ -pgpool-II-2.1.tar.gz +pgpool-II-2.2.tar.gz Index: postgresql-pgpool-II.spec =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-10/postgresql-pgpool-II.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- postgresql-pgpool-II.spec 12 Aug 2008 05:34:21 -0000 1.23 +++ postgresql-pgpool-II.spec 1 Mar 2009 14:57:56 -0000 1.24 @@ -2,12 +2,12 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} -Version: 2.1 +Version: 2.2 Release: 1%{?dist} License: BSD Group: Applications/Databases -URL: http://pgpool.projects.PostgreSQL.org/pgpool-II/en -Source0: http://pgfoundry.org/frs/download.php/1843/%{short_name}-%{version}.tar.gz +URL: http://pgpool.projects.PostgreSQL.org +Source0: http://pgfoundry.org/frs/download.php/2108/%{short_name}-%{version}.tar.gz Source1: pgpool.init Source2: pgpool.sysconfig Patch1: pgpool.conf.sample.patch @@ -102,6 +102,10 @@ %{_libdir}/libpcp.so %changelog +* Sun Mar 1 2009 Devrim Gunduz 2.2-1 +- Update to 2.2 +- Fix URL + * Tue Aug 12 2008 Devrim Gunduz 2.1-1 - Update to 2.1 Gold - Set group of sample config files to root, not apache. Fixes RH #442372. Index: sources =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-10/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 12 Aug 2008 05:06:59 -0000 1.9 +++ sources 1 Mar 2009 14:57:56 -0000 1.10 @@ -1 +1 @@ -cf02f9358f46849bd526798868e13162 pgpool-II-2.1.tar.gz +3dc286e2217478acbc05f127e74bd300 pgpool-II-2.2.tar.gz From devrim at fedoraproject.org Sun Mar 1 14:58:27 2009 From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=) Date: Sun, 1 Mar 2009 14:58:27 +0000 (UTC) Subject: rpms/postgresql-pgpool-II/devel .cvsignore, 1.9, 1.10 postgresql-pgpool-II.spec, 1.25, 1.26 sources, 1.9, 1.10 Message-ID: <20090301145827.7DC3970115@cvs1.fedora.phx.redhat.com> Author: devrim Update of /cvs/extras/rpms/postgresql-pgpool-II/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13393/devel Modified Files: .cvsignore postgresql-pgpool-II.spec sources Log Message: Update to 2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 12 Aug 2008 05:06:59 -0000 1.9 +++ .cvsignore 1 Mar 2009 14:57:56 -0000 1.10 @@ -1 +1 @@ -pgpool-II-2.1.tar.gz +pgpool-II-2.2.tar.gz Index: postgresql-pgpool-II.spec =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/postgresql-pgpool-II.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- postgresql-pgpool-II.spec 27 Feb 2009 01:50:05 -0000 1.25 +++ postgresql-pgpool-II.spec 1 Mar 2009 14:57:57 -0000 1.26 @@ -2,12 +2,12 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} -Version: 2.1 -Release: 3%{?dist} +Version: 2.2 +Release: 1%{?dist} License: BSD Group: Applications/Databases -URL: http://pgpool.projects.PostgreSQL.org/pgpool-II/en -Source0: http://pgfoundry.org/frs/download.php/1843/%{short_name}-%{version}.tar.gz +URL: http://pgpool.projects.PostgreSQL.org +Source0: http://pgfoundry.org/frs/download.php/2108/%{short_name}-%{version}.tar.gz Source1: pgpool.init Source2: pgpool.sysconfig Patch1: pgpool.conf.sample.patch @@ -103,6 +103,10 @@ %{_libdir}/libpcp.so %changelog +* Sun Mar 1 2009 Devrim Gunduz 2.2-1 +- Update to 2.2 +- Update URL + * Thu Feb 26 2009 Fedora Release Engineering - 2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 12 Aug 2008 05:06:59 -0000 1.9 +++ sources 1 Mar 2009 14:57:57 -0000 1.10 @@ -1 +1 @@ -cf02f9358f46849bd526798868e13162 pgpool-II-2.1.tar.gz +3dc286e2217478acbc05f127e74bd300 pgpool-II-2.2.tar.gz From robert at fedoraproject.org Sun Mar 1 15:04:16 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 1 Mar 2009 15:04:16 +0000 (UTC) Subject: rpms/xboard/devel xboard.spec,1.11,1.12 Message-ID: <20090301150416.EE42170115@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/xboard/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14723 Modified Files: xboard.spec Log Message: Solve the ppc64-redhat-linux-gnu configure target error Index: xboard.spec =================================================================== RCS file: /cvs/pkgs/rpms/xboard/devel/xboard.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xboard.spec 26 Feb 2009 07:53:14 -0000 1.11 +++ xboard.spec 1 Mar 2009 15:03:46 -0000 1.12 @@ -1,7 +1,7 @@ Summary: An X Window System graphical chessboard Name: xboard Version: 4.2.7 -Release: 18%{?dist} +Release: 19%{?dist} Group: Amusements/Games URL: http://www.tim-mann.org/xboard.html Source: ftp://ftp.gnu.org/pub/gnu/xboard/xboard-%{version}.tar.gz @@ -19,6 +19,7 @@ BuildRequires: xorg-x11-xbitmaps, libICE-devel, libXmu-devel, libSM-devel BuildRequires: libXaw-devel, libXt-devel, xorg-x11-proto-devel BuildRequires: libXpm-devel, libXext-devel +BuildRequires: automake %description Xboard is an X Window System based graphical chessboard which can be @@ -32,6 +33,9 @@ %patch1 -p1 -b .rh1 %patch2 -p1 -b .nostrip +# Needed for ppc64, automake can't be run here +cp -f %{_datadir}/automake-*/config.* . + %build %configure make %{?_smp_mflags} default info @@ -82,6 +86,9 @@ %{_datadir}/applications/* %changelog +* Sun Mar 01 2009 Robert Scheck 4.2.7-19 +- Solve the ppc64-redhat-linux-gnu configure target error + * Thu Feb 26 2009 Fedora Release Engineering - 4.2.7-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From dodji at fedoraproject.org Sun Mar 1 15:04:53 2009 From: dodji at fedoraproject.org (Dodji Seketeli) Date: Sun, 1 Mar 2009 15:04:53 +0000 (UTC) Subject: rpms/nemiver/F-9 .cvsignore,1.8,1.9 sources,1.8,1.9 Message-ID: <20090301150453.631BA70115@cvs1.fedora.phx.redhat.com> Author: dodji Update of /cvs/pkgs/rpms/nemiver/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14801 Modified Files: .cvsignore sources Log Message: * Sun Mar 01 2009 Dodji Seketeli - 0.6.5-1 - Update to new upstream release (0.6.5) - BuildRequire intltool Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 25 Feb 2009 00:52:01 -0000 1.8 +++ .cvsignore 1 Mar 2009 15:04:22 -0000 1.9 @@ -1,2 +1 @@ -nemiver-0.5.4.tar.bz2 -nemiver-0.6.4.tar.bz2 +nemiver-0.6.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nemiver/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 25 Feb 2009 00:52:01 -0000 1.8 +++ sources 1 Mar 2009 15:04:23 -0000 1.9 @@ -1,2 +1 @@ -5fa4df82e74810053c91fac121617190 nemiver-0.5.4.tar.bz2 -67087d15289ca6149aa71ed60b603661 nemiver-0.6.4.tar.bz2 +8986dd9eec47604826a8556d37e51746 nemiver-0.6.5.tar.bz2 From scop at fedoraproject.org Sun Mar 1 15:12:03 2009 From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=) Date: Sun, 1 Mar 2009 15:12:03 +0000 (UTC) Subject: rpms/vdr/devel .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 vdr.spec, 1.39, 1.40 Message-ID: <20090301151203.F05BE70115@cvs1.fedora.phx.redhat.com> Author: scop Update of /cvs/pkgs/rpms/vdr/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16590 Modified Files: .cvsignore sources vdr.spec Log Message: * Sat Feb 28 2009 Ville Skytt?? - 1.6.0-19 - Update liemikuutio patch to 1.24 to fix some issues with gcc 4.4. - Apply Rolf Ahrenberg's patch to include audio and subtitles shortcut buttons in DVB setup menu. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vdr/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 2 Feb 2009 17:29:32 -0000 1.17 +++ .cvsignore 1 Mar 2009 15:11:33 -0000 1.18 @@ -1,9 +1,10 @@ vdr_1.4.5-2.ds.diff.gz vdr-1.6.0.tar.bz2 -vdr-1.6.0-liemikuutio-1.21.diff.gz MainMenuHooks-v1_0.patch timercmd-0.1_1.6.0.diff vdr-1.6.0-1.diff vdr-1.6.0-2.diff vdr-timer-info-0.5-1.5.15.diff vdr-1.6.0-2-ttxtsubs.patch +vdr-1.6.0-liemikuutio-1.24.diff.gz +vdr-1.6.0-subtitles-button.patch.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vdr/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 2 Feb 2009 17:29:32 -0000 1.17 +++ sources 1 Mar 2009 15:11:33 -0000 1.18 @@ -6,4 +6,5 @@ 875b66a90d1c6f2e25aa1221b319136b vdr-1.6.0-2.diff 92ee6cdf60b795d9fbcf4fdcafe401b4 vdr-timer-info-0.5-1.5.15.diff ded3dacb4be2958c03a50e3064164eb8 vdr-1.6.0-2-ttxtsubs.patch -12dd9e8f637c56864dbdeb7380674d20 vdr-1.6.0-liemikuutio-1.21.diff.gz +a77e4db7aa22f11cfc397a2070b187db vdr-1.6.0-liemikuutio-1.24.diff.gz +bd3221bb080788a87b4560eb0f323f2b vdr-1.6.0-subtitles-button.patch.gz Index: vdr.spec =================================================================== RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- vdr.spec 25 Feb 2009 23:54:45 -0000 1.39 +++ vdr.spec 1 Mar 2009 15:11:33 -0000 1.40 @@ -24,7 +24,7 @@ Name: vdr Version: 1.6.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Video Disk Recorder Group: Applications/Multimedia @@ -53,7 +53,7 @@ Patch0: %{name}-channel+epg.patch # TODO Patch1: http://zap.tartarus.org/~ds/debian/dists/stable/main/source/vdr_1.4.5-2.ds.diff.gz -Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.21.diff.gz +Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.24.diff.gz Patch3: %{name}-1.6.0-scriptnames.patch Patch4: %{name}-1.6.0-paths.patch Patch5: %{name}-1.5.18-use-pkgconfig.patch @@ -79,6 +79,7 @@ Patch18: ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.6.0-1.diff Patch19: ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.6.0-2.diff Patch20: %{name}-1.6.0-remove-dvb-abi-check.patch +Patch21: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-subtitles-button.patch.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel @@ -195,6 +196,7 @@ %patch18 -p1 %patch19 -p1 %patch20 -p0 +%patch21 -p1 for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 README.timer-info ; do iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f @@ -517,6 +519,11 @@ %endif # plugins %changelog +* Sat Feb 28 2009 Ville Skytt?? - 1.6.0-19 +- Update liemikuutio patch to 1.24 to fix some issues with gcc 4.4. +- Apply Rolf Ahrenberg's patch to include audio and subtitles shortcut + buttons in DVB setup menu. + * Wed Feb 25 2009 Fedora Release Engineering - 1.6.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rathann at fedoraproject.org Sun Mar 1 15:20:25 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Sun, 1 Mar 2009 15:20:25 +0000 (UTC) Subject: rpms/openbabel/devel openbabel-check.patch,1.4,1.5 Message-ID: <20090301152025.5DD1170115@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18008 Modified Files: openbabel-check.patch Log Message: - debug test failure, try 3 openbabel-check.patch: Index: openbabel-check.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-check.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- openbabel-check.patch 1 Mar 2009 13:53:21 -0000 1.4 +++ openbabel-check.patch 1 Mar 2009 15:20:24 -0000 1.5 @@ -1,9 +1,11 @@ diff -up openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh.chk openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh --- openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh.chk 2009-01-12 20:10:33.000000000 +0100 -+++ openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh 2009-03-01 14:23:16.000000000 +0100 -@@ -45,4 +45,4 @@ if [ -d ../src/formats/.libs ]; then ++++ openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh 2009-03-01 16:19:28.000000000 +0100 +@@ -44,5 +44,5 @@ if [ -d ../src/formats/.libs ]; then + export TESTDATADIR fi fi - +- -${PROVE} "$@" ${TESTS} ++set -x +${PROVE} --debug "$@" ${TESTS} From robert at fedoraproject.org Sun Mar 1 15:22:17 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 1 Mar 2009 15:22:17 +0000 (UTC) Subject: rpms/fftw2/devel fftw2.spec,1.9,1.10 Message-ID: <20090301152217.8B66B70115@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/fftw2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18196 Modified Files: fftw2.spec Log Message: Removed the shipping and owning of %{_infodir}/dir file Index: fftw2.spec =================================================================== RCS file: /cvs/pkgs/rpms/fftw2/devel/fftw2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fftw2.spec 24 Feb 2009 16:55:58 -0000 1.9 +++ fftw2.spec 1 Mar 2009 15:21:47 -0000 1.10 @@ -1,6 +1,6 @@ Name: fftw2 Version: 2.1.5 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Fast Fourier Transform library %define real_name fftw @@ -83,6 +83,7 @@ popd rm -f doc/Makefile* find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' +rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir @@ -115,6 +116,9 @@ %changelog +* Sun Mar 01 2009 Robert Scheck - 2.1.5-18 +- Removed the shipping and owning of %%{_infodir}/dir file + * Tue Feb 24 2009 Fedora Release Engineering - 2.1.5-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From gemi at fedoraproject.org Sun Mar 1 15:22:58 2009 From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=) Date: Sun, 1 Mar 2009 15:22:58 +0000 (UTC) Subject: rpms/erlang/devel .cvsignore, 1.12, 1.13 erlang.spec, 1.37, 1.38 sources, 1.12, 1.13 Message-ID: <20090301152258.2241570115@cvs1.fedora.phx.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/erlang/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18338 Modified Files: .cvsignore erlang.spec sources Log Message: new release R12B-5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/erlang/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 25 Oct 2008 21:49:08 -0000 1.12 +++ .cvsignore 1 Mar 2009 15:22:27 -0000 1.13 @@ -1,3 +1,3 @@ -otp_src_R12B-4.tar.gz -otp_doc_html_R12B-4.tar.gz -otp_doc_man_R12B-4.tar.gz +otp_src_R12B-5.tar.gz +otp_doc_html_R12B-5.tar.gz +otp_doc_man_R12B-5.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/pkgs/rpms/erlang/devel/erlang.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- erlang.spec 24 Feb 2009 15:21:23 -0000 1.37 +++ erlang.spec 1 Mar 2009 15:22:27 -0000 1.38 @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.5%{?dist} +Release: %{rel}.6%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -92,7 +92,7 @@ # make links to binaries mkdir -p $RPM_BUILD_ROOT/%{_bindir} cd $RPM_BUILD_ROOT/%{_bindir} -for file in erl erlc +for file in erl erlc escript dialyzer do ln -sf ../%{_lib}/erlang/bin/$file . done @@ -123,6 +123,10 @@ %changelog +* Sun Mar 1 2009 Gerard Milmeister - R12B-5.6 +- new release R12B-5 +- link escript and dialyzer to %{_bindir} + * Tue Feb 24 2009 Fedora Release Engineering - R12B-5.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -135,7 +139,7 @@ * Sat Oct 25 2008 Gerard Milmeister - R12B-4.1 - new release R12B-4 -* Fri Sep 5 2008 Gerard Milmeister - R12B-3.3%{?dist} +* Fri Sep 5 2008 Gerard Milmeister - R12B-3.3 - fixed sslrpath patch * Thu Jul 17 2008 Tom "spot" Callaway - R12B-3.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/erlang/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 25 Oct 2008 21:49:08 -0000 1.12 +++ sources 1 Mar 2009 15:22:27 -0000 1.13 @@ -1,3 +1,3 @@ -ae81edda4a17506af7a9d73abca033b2 otp_src_R12B-4.tar.gz -f633cd418d8260af7a11c998aa88072b otp_doc_html_R12B-4.tar.gz -ef8f96d1721a2345cc87b208cde3de06 otp_doc_man_R12B-4.tar.gz +3751ea3fea669d2b25c67eeb883734bb otp_src_R12B-5.tar.gz +fb0c5454bbd865e881b6712295f6d41f otp_doc_html_R12B-5.tar.gz +6231cb172847040395cc34b20781aa3b otp_doc_man_R12B-5.tar.gz From gemi at fedoraproject.org Sun Mar 1 15:26:11 2009 From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=) Date: Sun, 1 Mar 2009 15:26:11 +0000 (UTC) Subject: rpms/erlang/F-10 .cvsignore, 1.12, 1.13 erlang.spec, 1.35, 1.36 sources, 1.12, 1.13 Message-ID: <20090301152611.6210370115@cvs1.fedora.phx.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/erlang/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18937/F-10 Modified Files: .cvsignore erlang.spec sources Log Message: new release R12B-5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/erlang/F-10/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 25 Oct 2008 21:49:08 -0000 1.12 +++ .cvsignore 1 Mar 2009 15:25:40 -0000 1.13 @@ -1,3 +1,3 @@ -otp_src_R12B-4.tar.gz -otp_doc_html_R12B-4.tar.gz -otp_doc_man_R12B-4.tar.gz +otp_src_R12B-5.tar.gz +otp_doc_html_R12B-5.tar.gz +otp_doc_man_R12B-5.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/pkgs/rpms/erlang/F-10/erlang.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- erlang.spec 15 Feb 2009 02:43:00 -0000 1.35 +++ erlang.spec 1 Mar 2009 15:25:40 -0000 1.36 @@ -1,9 +1,9 @@ %define ver R12B -%define rel 4 +%define rel 5 Name: erlang Version: %{ver} -Release: %{rel}.4%{?dist} +Release: %{rel}.6%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -92,7 +92,7 @@ # make links to binaries mkdir -p $RPM_BUILD_ROOT/%{_bindir} cd $RPM_BUILD_ROOT/%{_bindir} -for file in erl erlc +for file in erl erlc escript dialyzer do ln -sf ../%{_lib}/erlang/bin/$file . done @@ -123,7 +123,14 @@ %changelog -* Sat Feb 14 2009 Dennis Gilmore - R12B-4.4 +* Sun Mar 1 2009 Gerard Milmeister - R12B-5.6 +- new release R12B-5 +- link escript and dialyzer to %{_bindir} + +* Tue Feb 24 2009 Fedora Release Engineering - R12B-5.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Feb 14 2009 Dennis Gilmore - R12B-4.5 - fix sparc arches to compile * Sat Oct 25 2008 Gerard Milmeister - R12B-4.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/erlang/F-10/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 25 Oct 2008 21:49:08 -0000 1.12 +++ sources 1 Mar 2009 15:25:40 -0000 1.13 @@ -1,3 +1,3 @@ -ae81edda4a17506af7a9d73abca033b2 otp_src_R12B-4.tar.gz -f633cd418d8260af7a11c998aa88072b otp_doc_html_R12B-4.tar.gz -ef8f96d1721a2345cc87b208cde3de06 otp_doc_man_R12B-4.tar.gz +3751ea3fea669d2b25c67eeb883734bb otp_src_R12B-5.tar.gz +fb0c5454bbd865e881b6712295f6d41f otp_doc_html_R12B-5.tar.gz +6231cb172847040395cc34b20781aa3b otp_doc_man_R12B-5.tar.gz From gemi at fedoraproject.org Sun Mar 1 15:26:11 2009 From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=) Date: Sun, 1 Mar 2009 15:26:11 +0000 (UTC) Subject: rpms/erlang/F-9 .cvsignore, 1.11, 1.12 erlang.spec, 1.29, 1.30 otp-sslrpath.patch, 1.1, 1.2 sources, 1.11, 1.12 Message-ID: <20090301152611.C471A70116@cvs1.fedora.phx.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/erlang/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18937/F-9 Modified Files: .cvsignore erlang.spec otp-sslrpath.patch sources Log Message: new release R12B-5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/erlang/F-9/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 25 Oct 2008 21:28:09 -0000 1.11 +++ .cvsignore 1 Mar 2009 15:25:41 -0000 1.12 @@ -1,3 +1,3 @@ -otp_src_R12B-4.tar.gz -otp_doc_html_R12B-4.tar.gz -otp_doc_man_R12B-4.tar.gz +otp_src_R12B-5.tar.gz +otp_doc_html_R12B-5.tar.gz +otp_doc_man_R12B-5.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/pkgs/rpms/erlang/F-9/erlang.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- erlang.spec 15 Feb 2009 02:39:03 -0000 1.29 +++ erlang.spec 1 Mar 2009 15:25:41 -0000 1.30 @@ -1,14 +1,17 @@ +%define ver R12B +%define rel 5 + Name: erlang -Version: R12B -Release: 4.2%{?dist} +Version: %{ver} +Release: %{rel}.6%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages -License: Erlang Public License +License: ERPL URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R12B-4.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R12B-4.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R12B-4.tar.gz +Source: http://www.erlang.org/download/otp_src_%{ver}-%{rel}.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch @@ -43,15 +46,22 @@ %prep -%setup -q -n otp_src_R12B-4 +%setup -q -n otp_src_%{ver}-%{rel} %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath -%patch3 -p1 -b .sslrpath +#%patch3 -p1 -b .sslrpath # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile +# fix for newer glibc version +sed -i 's|__GLIBC_MINOR__ <= 7|__GLIBC_MINOR__ <= 8|' erts/emulator/hipe/hipe_x86_signal.c +# use gcc -shared instead of ld +sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in +sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in + + %build %ifarch sparcv9 sparc64 @@ -82,7 +92,7 @@ # make links to binaries mkdir -p $RPM_BUILD_ROOT/%{_bindir} cd $RPM_BUILD_ROOT/%{_bindir} -for file in erl erlc +for file in erl erlc escript dialyzer do ln -sf ../%{_lib}/erlang/bin/$file . done @@ -113,7 +123,14 @@ %changelog -* Sat Feb 14 2009 Dennis Gilmore - R12B-4.2 +* Sun Mar 1 2009 Gerard Milmeister - R12B-5.6 +- new release R12B-5 +- link escript and dialyzer to %{_bindir} + +* Tue Feb 24 2009 Fedora Release Engineering - R12B-5.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Feb 14 2009 Dennis Gilmore - R12B-4.5 - fix sparc arches to compile * Sat Oct 25 2008 Gerard Milmeister - R12B-4.1 otp-sslrpath.patch: Index: otp-sslrpath.patch =================================================================== RCS file: /cvs/pkgs/rpms/erlang/F-9/otp-sslrpath.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- otp-sslrpath.patch 17 Feb 2006 23:32:19 -0000 1.1 +++ otp-sslrpath.patch 1 Mar 2009 15:25:41 -0000 1.2 @@ -1,7 +1,8 @@ ---- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath 2005-12-29 00:49:17.000000000 +0100 -+++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in 2005-12-29 00:50:15.000000000 +0100 -@@ -95,7 +95,7 @@ - endif +diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in +--- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath 2008-10-26 00:00:37.000000000 +0200 ++++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-26 00:01:09.000000000 +0200 +@@ -102,7 +102,7 @@ else + SSL_MAKEFILE = endif -CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ @@ -9,3 +10,15 @@ ifeq ($(findstring @,$(CC_R_FLAG)),@) # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; # we try our best here instead... +@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar + CC_R_FLAG = + else + ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, +-CC_R_FLAG = -Wl,-rpath, ++CC_R_FLAG = + else # Default: -Wl,-R +-CC_R_FLAG = -Wl,-R ++CC_R_FLAG = + endif + endif + endif Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/erlang/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 25 Oct 2008 21:28:09 -0000 1.11 +++ sources 1 Mar 2009 15:25:41 -0000 1.12 @@ -1,3 +1,3 @@ -ae81edda4a17506af7a9d73abca033b2 otp_src_R12B-4.tar.gz -f633cd418d8260af7a11c998aa88072b otp_doc_html_R12B-4.tar.gz -ef8f96d1721a2345cc87b208cde3de06 otp_doc_man_R12B-4.tar.gz +3751ea3fea669d2b25c67eeb883734bb otp_src_R12B-5.tar.gz +fb0c5454bbd865e881b6712295f6d41f otp_doc_html_R12B-5.tar.gz +6231cb172847040395cc34b20781aa3b otp_doc_man_R12B-5.tar.gz From rathann at fedoraproject.org Sun Mar 1 15:38:52 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Sun, 1 Mar 2009 15:38:52 +0000 (UTC) Subject: rpms/openbabel/devel openbabel-check.patch,1.5,1.6 Message-ID: <20090301153852.7651D70115@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21112 Modified Files: openbabel-check.patch Log Message: - debug test failure, try 4 openbabel-check.patch: Index: openbabel-check.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-check.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- openbabel-check.patch 1 Mar 2009 15:20:24 -0000 1.5 +++ openbabel-check.patch 1 Mar 2009 15:38:21 -0000 1.6 @@ -8,4 +8,4 @@ - -${PROVE} "$@" ${TESTS} +set -x -+${PROVE} --debug "$@" ${TESTS} ++${PROVE} --help "$@" ${TESTS} From karsten at fedoraproject.org Sun Mar 1 15:49:07 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Sun, 1 Mar 2009 15:49:07 +0000 (UTC) Subject: rpms/pl/devel pl-5.6.57-jpl-configure-s390x.patch, NONE, 1.1 pl.spec, 1.55, 1.56 Message-ID: <20090301154907.55E8570115@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/pl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23556 Modified Files: pl.spec Added Files: pl-5.6.57-jpl-configure-s390x.patch Log Message: - fix java LIBDIRS for mainframe, similar to alpha pl-5.6.57-jpl-configure-s390x.patch: --- NEW FILE pl-5.6.57-jpl-configure-s390x.patch --- diff -up pl-5.7.6/packages/jpl/configure.s390x pl-5.7.6/packages/jpl/configure --- pl-5.7.6/packages/jpl/configure.s390x 2009-03-01 16:42:25.000000000 +0100 +++ pl-5.7.6/packages/jpl/configure 2009-03-01 16:43:13.000000000 +0100 @@ -4632,6 +4632,14 @@ case "$host_cpu" in _JNI_LIBDIRS="lib/ppc64" _JNI_LIBSUBDIR="server" ;; + s390) + _JNI_LIBDIRS="lib/s390" + _JNI_LIBSUBDIR="server" + ;; + s390x) + _JNI_LIBDIRS="lib/s390x" + _JNI_LIBSUBDIR="server" + ;; *) _JNI_LIBDIRS="" esac Index: pl.spec =================================================================== RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- pl.spec 25 Feb 2009 12:10:14 -0000 1.55 +++ pl.spec 1 Mar 2009 15:48:36 -0000 1.56 @@ -3,7 +3,7 @@ Name: pl Version: 5.7.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -17,6 +17,7 @@ Patch1: %{name}-5.6.57-jpl-configure.patch Patch2: %{name}-5.6.57-jpl-configure-alpha.patch Patch3: %{name}-5.6.60-jni.patch +Patch4: %{name}-5.6.57-jpl-configure-s390x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gmp-devel @@ -103,6 +104,7 @@ %patch1 -p1 -b .libjvm %patch2 -p1 -b .libjvm-alpha %patch3 -p1 -b .jni +%patch4 -p1 -b .libjvm-s390X ( mkdir doc-install cd doc-install @@ -230,6 +232,9 @@ %changelog +* Sun Mar 01 2009 Karsten Hopp 5.7.6-3 +- fix java LIBDIRS for mainframe, similar to alpha + * Wed Feb 25 2009 Mary Ellen Foster - 5.7.6-2 - Unify all changes: - Fix java LIBDIRS on alpha (Oliver Falk) From mtasaka at fedoraproject.org Sun Mar 1 15:51:12 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 1 Mar 2009 15:51:12 +0000 (UTC) Subject: rpms/jd/F-10 .cvsignore, 1.348, 1.349 jd.spec, 1.404, 1.405 sources, 1.349, 1.350 Message-ID: <20090301155112.11DE870115@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23965/F-10 Modified Files: .cvsignore jd.spec sources Log Message: * Mon Mar 2 2009 Mamoru Tasaka - 2.3.0-0.2.rc090302 - 2.3.0 rc 090302 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v retrieving revision 1.348 retrieving revision 1.349 diff -u -r1.348 -r1.349 --- .cvsignore 26 Feb 2009 05:35:55 -0000 1.348 +++ .cvsignore 1 Mar 2009 15:50:41 -0000 1.349 @@ -1 +1 @@ -jd-2.3.0-svn2679_trunk.tgz +jd-2.3.0-rc090302.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v retrieving revision 1.404 retrieving revision 1.405 diff -u -r1.404 -r1.405 --- jd.spec 26 Feb 2009 05:35:55 -0000 1.404 +++ jd.spec 1 Mar 2009 15:50:41 -0000 1.405 @@ -10,10 +10,10 @@ # Defined by upsteam # %define main_ver 2.3.0 -%define strtag svn2679_trunk -%define repoid 37528 +%define strtag rc090302 +%define repoid 37954 # Define this if this is pre-version -%define pre_release 1 +%define pre_release 2 ########################################## ########################################## @@ -138,8 +138,8 @@ %{icondir}/%{name}.png %changelog -* Thu Feb 26 2009 Mamoru Tasaka -- rev 2679 +* Mon Mar 2 2009 Mamoru Tasaka - 2.3.0-0.2.rc090302 +- 2.3.0 rc 090302 * Tue Feb 24 2009 Mamoru Tasaka - F-11: Mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-10/sources,v retrieving revision 1.349 retrieving revision 1.350 diff -u -r1.349 -r1.350 --- sources 26 Feb 2009 05:35:55 -0000 1.349 +++ sources 1 Mar 2009 15:50:41 -0000 1.350 @@ -1 +1 @@ -43a43c460065cdfbb17c321b9a98961e jd-2.3.0-svn2679_trunk.tgz +03ce3b20598a08d6e6b4a7213e86318e jd-2.3.0-rc090302.tgz From mtasaka at fedoraproject.org Sun Mar 1 15:51:13 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 1 Mar 2009 15:51:13 +0000 (UTC) Subject: rpms/jd/F-9 .cvsignore, 1.348, 1.349 jd.spec, 1.395, 1.396 sources, 1.349, 1.350 Message-ID: <20090301155113.3B6C670115@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23965/F-9 Modified Files: .cvsignore jd.spec sources Log Message: * Mon Mar 2 2009 Mamoru Tasaka - 2.3.0-0.2.rc090302 - 2.3.0 rc 090302 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.348 retrieving revision 1.349 diff -u -r1.348 -r1.349 --- .cvsignore 26 Feb 2009 05:35:56 -0000 1.348 +++ .cvsignore 1 Mar 2009 15:50:41 -0000 1.349 @@ -1 +1 @@ -jd-2.3.0-svn2679_trunk.tgz +jd-2.3.0-rc090302.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.395 retrieving revision 1.396 diff -u -r1.395 -r1.396 --- jd.spec 26 Feb 2009 05:35:56 -0000 1.395 +++ jd.spec 1 Mar 2009 15:50:42 -0000 1.396 @@ -10,10 +10,10 @@ # Defined by upsteam # %define main_ver 2.3.0 -%define strtag svn2679_trunk -%define repoid 37528 +%define strtag rc090302 +%define repoid 37954 # Define this if this is pre-version -%define pre_release 1 +%define pre_release 2 ########################################## ########################################## @@ -138,8 +138,8 @@ %{icondir}/%{name}.png %changelog -* Thu Feb 26 2009 Mamoru Tasaka -- rev 2679 +* Mon Mar 2 2009 Mamoru Tasaka - 2.3.0-0.2.rc090302 +- 2.3.0 rc 090302 * Tue Feb 24 2009 Mamoru Tasaka - F-11: Mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.349 retrieving revision 1.350 diff -u -r1.349 -r1.350 --- sources 26 Feb 2009 05:35:56 -0000 1.349 +++ sources 1 Mar 2009 15:50:42 -0000 1.350 @@ -1 +1 @@ -43a43c460065cdfbb17c321b9a98961e jd-2.3.0-svn2679_trunk.tgz +03ce3b20598a08d6e6b4a7213e86318e jd-2.3.0-rc090302.tgz From mtasaka at fedoraproject.org Sun Mar 1 15:51:13 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 1 Mar 2009 15:51:13 +0000 (UTC) Subject: rpms/jd/devel .cvsignore, 1.340, 1.341 jd.spec, 1.399, 1.400 sources, 1.341, 1.342 Message-ID: <20090301155113.B9E5A70115@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23965/devel Modified Files: .cvsignore jd.spec sources Log Message: * Mon Mar 2 2009 Mamoru Tasaka - 2.3.0-0.2.rc090302 - 2.3.0 rc 090302 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.340 retrieving revision 1.341 diff -u -r1.340 -r1.341 --- .cvsignore 25 Feb 2009 19:07:37 -0000 1.340 +++ .cvsignore 1 Mar 2009 15:50:43 -0000 1.341 @@ -1 +1 @@ -jd-2.3.0-svn2679_trunk.tgz +jd-2.3.0-rc090302.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.399 retrieving revision 1.400 diff -u -r1.399 -r1.400 --- jd.spec 25 Feb 2009 19:07:37 -0000 1.399 +++ jd.spec 1 Mar 2009 15:50:43 -0000 1.400 @@ -10,10 +10,10 @@ # Defined by upsteam # %define main_ver 2.3.0 -%define strtag svn2679_trunk -%define repoid 37528 +%define strtag rc090302 +%define repoid 37954 # Define this if this is pre-version -%define pre_release 1 +%define pre_release 2 ########################################## ########################################## @@ -138,8 +138,8 @@ %{icondir}/%{name}.png %changelog -* Thu Feb 26 2009 Mamoru Tasaka -- rev 2679 +* Mon Mar 2 2009 Mamoru Tasaka - 2.3.0-0.2.rc090302 +- 2.3.0 rc 090302 * Tue Feb 24 2009 Mamoru Tasaka - F-11: Mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.341 retrieving revision 1.342 diff -u -r1.341 -r1.342 --- sources 25 Feb 2009 19:07:37 -0000 1.341 +++ sources 1 Mar 2009 15:50:43 -0000 1.342 @@ -1 +1 @@ -43a43c460065cdfbb17c321b9a98961e jd-2.3.0-svn2679_trunk.tgz +03ce3b20598a08d6e6b4a7213e86318e jd-2.3.0-rc090302.tgz From mtasaka at fedoraproject.org Sun Mar 1 15:54:37 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 1 Mar 2009 15:54:37 +0000 (UTC) Subject: rpms/jd/F-10 jd.spec,1.405,1.406 Message-ID: <20090301155437.4FEF370115@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24884/F-10 Modified Files: jd.spec Log Message: fix tagging Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v retrieving revision 1.405 retrieving revision 1.406 diff -u -r1.405 -r1.406 --- jd.spec 1 Mar 2009 15:50:41 -0000 1.405 +++ jd.spec 1 Mar 2009 15:54:06 -0000 1.406 @@ -13,13 +13,13 @@ %define strtag rc090302 %define repoid 37954 # Define this if this is pre-version -%define pre_release 2 +%define pre_release 1 ########################################## ########################################## # Defined by vendor # -%define vendor_rel 1 +%define vendor_rel 2 %define extra_rel %{nil} # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary From mtasaka at fedoraproject.org Sun Mar 1 15:54:37 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 1 Mar 2009 15:54:37 +0000 (UTC) Subject: rpms/jd/F-9 jd.spec,1.396,1.397 Message-ID: <20090301155437.83D9D70115@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24884/F-9 Modified Files: jd.spec Log Message: fix tagging Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.396 retrieving revision 1.397 diff -u -r1.396 -r1.397 --- jd.spec 1 Mar 2009 15:50:42 -0000 1.396 +++ jd.spec 1 Mar 2009 15:54:07 -0000 1.397 @@ -13,13 +13,13 @@ %define strtag rc090302 %define repoid 37954 # Define this if this is pre-version -%define pre_release 2 +%define pre_release 1 ########################################## ########################################## # Defined by vendor # -%define vendor_rel 1 +%define vendor_rel 2 %define extra_rel %{nil} # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary From mtasaka at fedoraproject.org Sun Mar 1 15:54:38 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 1 Mar 2009 15:54:38 +0000 (UTC) Subject: rpms/jd/devel jd.spec,1.400,1.401 Message-ID: <20090301155438.34D1A70115@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24884/devel Modified Files: jd.spec Log Message: fix tagging Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.400 retrieving revision 1.401 diff -u -r1.400 -r1.401 --- jd.spec 1 Mar 2009 15:50:43 -0000 1.400 +++ jd.spec 1 Mar 2009 15:54:07 -0000 1.401 @@ -13,13 +13,13 @@ %define strtag rc090302 %define repoid 37954 # Define this if this is pre-version -%define pre_release 2 +%define pre_release 1 ########################################## ########################################## # Defined by vendor # -%define vendor_rel 1 +%define vendor_rel 2 %define extra_rel %{nil} # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary From rathann at fedoraproject.org Sun Mar 1 15:55:35 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Sun, 1 Mar 2009 15:55:35 +0000 (UTC) Subject: rpms/openbabel/devel openbabel-check.patch,1.6,1.7 Message-ID: <20090301155535.7FA0770115@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25374 Modified Files: openbabel-check.patch Log Message: - debug test failure, try 5 openbabel-check.patch: Index: openbabel-check.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-check.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- openbabel-check.patch 1 Mar 2009 15:38:21 -0000 1.6 +++ openbabel-check.patch 1 Mar 2009 15:55:34 -0000 1.7 @@ -1,11 +1,9 @@ diff -up openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh.chk openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh --- openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh.chk 2009-01-12 20:10:33.000000000 +0100 +++ openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh 2009-03-01 16:19:28.000000000 +0100 -@@ -44,5 +44,5 @@ if [ -d ../src/formats/.libs ]; then - export TESTDATADIR +@@ -45,4 +45,4 @@ if [ -d ../src/formats/.libs ]; then fi fi -- + -${PROVE} "$@" ${TESTS} -+set -x -+${PROVE} --help "$@" ${TESTS} ++${PROVE} --verbose --failures -t -w "$@" ${TESTS} From ensc at fedoraproject.org Sun Mar 1 16:29:15 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sun, 1 Mar 2009 16:29:15 +0000 (UTC) Subject: rpms/hunt/devel hunt-1.5-datatypes.patch, NONE, 1.1 hunt.spec, 1.13, 1.14 Message-ID: <20090301162915.9DC5470115@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/hunt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31329 Modified Files: hunt.spec Added Files: hunt-1.5-datatypes.patch Log Message: updated hunt-1.5-datatypes.patch: --- NEW FILE hunt-1.5-datatypes.patch --- Index: hunt-1.5/c/list.c =================================================================== --- hunt-1.5.orig/c/list.c +++ hunt-1.5/c/list.c @@ -239,7 +239,7 @@ void *list_at(struct list *l, int nr) return retval; } -static inline int __func_remove(int nr, void *p, void *m) +static inline int __func_remove(long nr, void *p, void *m) { if (p == m) return 1; @@ -247,16 +247,16 @@ static inline int __func_remove(int nr, return 0; } -static inline int __func_remove_at(int nr, void *p, void *m) +static inline int __func_remove_at(long nr, void *p, void *m) { - if (nr == (int) m) + if (nr == (long) m) return 1; else return 0; } static inline void *__list_remove(struct list *l, - int (*func)(int nr, void *, void *m), void *m) + int (*func)(long nr, void *, void *m), void *m) { void *retval; void **p; @@ -292,13 +292,13 @@ void *list_remove(struct list *l, void * return __list_remove(l, __func_remove, m); } -void *list_remove_at(struct list *l, int nr) +void *list_remove_at(struct list *l, long nr) { return __list_remove(l, __func_remove_at, (void *) nr); } void *list_remove_func(struct list *l, - int (*func)(int nr, void *, void *m), void *m) + int (*func)(long nr, void *, void *m), void *m) { return __list_remove(l, func, m); } Index: hunt-1.5/c/list.h =================================================================== --- hunt-1.5.orig/c/list.h +++ hunt-1.5/c/list.h @@ -79,8 +79,8 @@ void *list_consume_rel(struct list *l, c void *list_peek(struct list *l); void *list_at(struct list *l, int nr); void *list_remove(struct list *l, void *m); -void *list_remove_at(struct list *l, int nr); -void *list_remove_func(struct list *l, int (*func)(int nr, void *, void *m), void *m); +void *list_remove_at(struct list *l, long nr); +void *list_remove_func(struct list *l, int (*func)(long nr, void *, void *m), void *m); int list_count(struct list *l); void list_lock(struct list *l); Index: hunt-1.5/hunt.h =================================================================== --- hunt-1.5.orig/hunt.h +++ hunt-1.5/hunt.h @@ -374,7 +374,7 @@ void print_new_conn_ind(int add_new); #define MODE_BOTH 2 int sdb_to_int(char c); char int_to_sdb(int i); -char *sdbmode_to_char(int mode); +char *sdbmode_to_char(long mode); /* * util Index: hunt-1.5/menu.c =================================================================== --- hunt-1.5.orig/menu.c +++ hunt-1.5/menu.c @@ -519,7 +519,7 @@ int menu(char *head, char *str_menu, cha printf("\n"); if (verbose) { set_tty_color_bg(COLOR_BLACK, COLOR_WHITE); - printf("%*s", strlen(head) + 9, " "); + printf("%*s", (int)(strlen(head) + 9), " "); printf("droppkt %u, other proto pkt %u", pkts_dropped, pkts_unhandled); set_tty_color_bg(COLOR_WHITE, COLOR_BLACK); @@ -618,7 +618,7 @@ int sdb_to_int(char mode) return retval; } -char *sdbmode_to_char(int mode) +char *sdbmode_to_char(long mode) { char *str_mode; Index: hunt-1.5/resolv.c =================================================================== --- hunt-1.5.orig/resolv.c +++ hunt-1.5/resolv.c @@ -43,7 +43,7 @@ struct slave { #define MAX_SLAVES 5 #define SLAVE_MAX_IDLE (1 * 60) -static int fd_req = -1; /* pipe to resolver daemon */ +static long fd_req = -1; /* pipe to resolver daemon */ static pid_t pid_req = 0; /* pid of resolver daemon */ static pid_t pid_parent = 0; @@ -128,7 +128,7 @@ static void *update_thr(void *arg) { struct timeval timeout; fd_set rdset; - int fd = (int) arg; + int fd = (long) arg; struct res r; char buf[256]; int update_thr_run; Index: hunt-1.5/rstd.c =================================================================== --- hunt-1.5.orig/rstd.c +++ hunt-1.5/rstd.c @@ -23,7 +23,7 @@ struct rst_db_item { unsigned int dst_mask; unsigned int src_ports[MAX_PORTS + 1]; unsigned int dst_ports[MAX_PORTS + 1]; - int rst_mode; + long rst_mode; int rst_only_syn; struct rst_db_item *next; }; @@ -97,7 +97,7 @@ static void *rst_daemon_thr(void *arg) struct user_conn_info uci; struct packet *p; struct timespec ts; - int rst_mode; + long rst_mode; pthread_sigmask(SIG_BLOCK, &intr_mask, NULL); setpriority(PRIO_PROCESS, getpid(), 0); @@ -137,7 +137,7 @@ static void *rst_daemon_thr(void *arg) } else ci = pci; packet_free(p); - rst_mode = (int) p->p_arg[MODULE_RSTD]; + rst_mode = (long) p->p_arg[MODULE_RSTD]; ts.tv_sec = 0; ts.tv_nsec = 100000000; switch (rst_mode) { Index: hunt.spec =================================================================== RCS file: /cvs/extras/rpms/hunt/devel/hunt.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- hunt.spec 25 Feb 2009 05:53:41 -0000 1.13 +++ hunt.spec 1 Mar 2009 16:28:43 -0000 1.14 @@ -3,7 +3,7 @@ Summary: Tool for demonstrating well known weaknesses in the TCP/IP protocol suite Name: hunt Version: 1.5 -Release: %release_func 9 +Release: %release_func 10 License: GPLv2 Group: Applications/Internet Source: http://lin.fsid.cvut.cz/~kra/hunt/%name-%version.tgz @@ -12,6 +12,7 @@ Patch2: hunt-1.5-signness.patch Patch3: hunt-1.5-listlen.patch Patch4: hunt-1.5-badcmp.patch +Patch5: hunt-1.5-datatypes.patch URL: http://lin.fsid.cvut.cz/~kra/index.html BuildRoot: %_tmppath/%name-%version-%release-root @@ -38,10 +39,12 @@ %patch2 -p1 -b .signness %patch3 -p1 -b .listlen %patch4 -p1 -b .badcmp +%patch5 -p1 -b .datatypes %build -make %{?_smp_mflags} all CFLAGS="$RPM_OPT_FLAGS -D_REENTRANT" +make clean +make %{?_smp_mflags} hunt CC='%__cc' CFLAGS="$RPM_OPT_FLAGS -D_REENTRANT" %install @@ -69,6 +72,9 @@ %changelog +* Sun Mar 1 2009 Enrico Scholz - 1.5-10 +- do not build the static binary + * Tue Feb 24 2009 Fedora Release Engineering - 1.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From robert at fedoraproject.org Sun Mar 1 16:30:21 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 1 Mar 2009 16:30:21 +0000 (UTC) Subject: rpms/xlhtml/devel xlhtml.spec,1.13,1.14 Message-ID: <20090301163021.F22D870115@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/xlhtml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31623 Modified Files: xlhtml.spec Log Message: Solve the x86_64-redhat-linux-gnu configure target error Index: xlhtml.spec =================================================================== RCS file: /cvs/pkgs/rpms/xlhtml/devel/xlhtml.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xlhtml.spec 26 Feb 2009 09:49:30 -0000 1.13 +++ xlhtml.spec 1 Mar 2009 16:29:51 -0000 1.14 @@ -1,7 +1,7 @@ Name: xlhtml Summary: Excel 95/97 and PowerPoint to HTML converter Version: 0.5 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: Applications/Text @@ -22,6 +22,7 @@ %setup -q %build +rm -f config.{guess,sub} aclocal autoconf automake -a @@ -45,6 +46,9 @@ %{_mandir}/man1/* %changelog +* Sun Mar 01 2009 Robert Scheck 0.5-10 +- Solve the x86_64-redhat-linux-gnu configure target error + * Thu Feb 26 2009 Fedora Release Engineering - 0.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rathann at fedoraproject.org Sun Mar 1 16:31:26 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Sun, 1 Mar 2009 16:31:26 +0000 (UTC) Subject: rpms/openbabel/devel openbabel-check.patch,1.7,1.8 Message-ID: <20090301163126.DC3D870115@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32014 Modified Files: openbabel-check.patch Log Message: - debug test failure, try 6 openbabel-check.patch: Index: openbabel-check.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-check.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- openbabel-check.patch 1 Mar 2009 15:55:34 -0000 1.7 +++ openbabel-check.patch 1 Mar 2009 16:31:26 -0000 1.8 @@ -6,4 +6,4 @@ fi -${PROVE} "$@" ${TESTS} -+${PROVE} --verbose --failures -t -w "$@" ${TESTS} ++${PROVE} --verbose "$@" ${TESTS} From ensc at fedoraproject.org Sun Mar 1 16:49:42 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sun, 1 Mar 2009 16:49:42 +0000 (UTC) Subject: rpms/ip-sentinel/devel ip-sentinel.upstart, NONE, 1.1 ip-sentinel.spec, 1.16, 1.17 Message-ID: <20090301164942.D7CD270115@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/ip-sentinel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3286 Modified Files: ip-sentinel.spec Added Files: ip-sentinel.upstart Log Message: updated --- NEW FILE ip-sentinel.upstart --- # NOTE: you will have to create an 'ips.cfg' file in ~ip-sentinel/ # before service can be enabled ### Uncomment the 'start' lines below #start on starting\ local #start on starting local stop on runlevel 0 stop on runlevel 1 stop on runlevel 6 respawn exec /usr/sbin/ip-sentinel -u ip-sentinel -g ip-sentinel -n eth0 Index: ip-sentinel.spec =================================================================== RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ip-sentinel.spec 25 Feb 2009 07:37:30 -0000 1.16 +++ ip-sentinel.spec 1 Mar 2009 16:49:11 -0000 1.17 @@ -41,7 +41,7 @@ Summary: Tool to prevent unauthorized usage of IP addresses Name: ip-sentinel Version: 0.12 -Release: %release_func 13 +Release: %release_func 14 License: GPLv2 Group: System Environment/Daemons URL: http://www.nongnu.org/ip-sentinel/ @@ -50,35 +50,48 @@ Patch0: ip-sentinel-0.12-pidfile.patch BuildRoot: %_tmppath/%name-%version-%release-buildroot Requires: init(ip-sentinel) -Provides: user(%username) -Provides: group(%username) +Provides: user(%username) = 1 +Provides: group(%username) = 1 BuildRequires: which BuildRequires: fedora-usermgmt-devel %{?FE_USERADD_REQ} %{?with_dietlibc:BuildRequires: dietlibc} - -%package sysv +%package sysvinit Summary: SysV initscripts for ip-sentinel Group: System Environment/Base -Provides: init(ip-sentinel) +Provides: init(ip-sentinel) = sysv Requires(preun): %name = %version-%release Requires(postun): %name = %version-%release Requires(preun): initscripts Requires(postun): initscripts Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig +Provides: %name-sysv = %version-%release +Obsoletes: %name-sysv < %version-%release +BuildArch: noarch +%package upstart +Summary: upstart initscripts for ip-sentinel +Group: System Environment/Base +Source10: ip-sentinel.upstart +Provides: init(%name) = upstart +Requires: %name = %version-%release +# implicates a conflict with upstart 0.5+ +Requires(pre): /etc/event.d +Requires(post): /usr/bin/killall +Requires(postun): /sbin/initctl +BuildArch: noarch %package minit Summary: minit initscripts for ip-sentinel Group: System Environment/Base -Provides: init(ip-sentinel) +Provides: init(%name) = minit Requires: %name = %version-%release Requires(pre): minit-setup Requires(postun): minit-setup - +BuildArch: noarch %description @@ -89,7 +102,7 @@ invalid MAC, rendering the IP unreachable. -%description sysv +%description sysvinit IP Sentinel is a tool that tries to prevent unauthorized usage of IP addresses. @@ -97,6 +110,14 @@ with a SysV initconcept. +%description upstart +IP Sentinel is a tool that tries to prevent unauthorized usage of IP +addresses. + +This package provides the scripts which can be used to start ip-sentinel +with the upstart initconcept. + + %description minit IP Sentinel is a tool that tries to prevent unauthorized usage of IP addresses. @@ -122,6 +143,7 @@ %__make DESTDIR=$RPM_BUILD_ROOT install install-contrib %__install -m750 -d $RPM_BUILD_ROOT%homedir +%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/event.d/ip-sentinel %{!?with_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir} @@ -145,19 +167,26 @@ %__fe_groupdel %username &>/dev/null || : -%post sysv +%post sysvinit /sbin/chkconfig --add %service -%preun sysv +%preun sysvinit if test "$1" = "0"; then %_initrddir/%service stop >/dev/null /sbin/chkconfig --del %service fi -%postun sysv +%postun sysvinit test "$1" = 0 || %_initrddir/%service condrestart &>/dev/null +%post upstart +/usr/bin/killall -u %username ip-sentinel 2>/dev/null || : + +%preun upstart +test "$1" != "0" || /sbin/initctl -q stop ip-sentinel || : + + %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README THANKS @@ -166,12 +195,17 @@ %attr(-,root,%username) %homedir -%files sysv +%files sysvinit %defattr(-,root,root,-) %config %_initrddir/* %config(noreplace) %_sysconfdir/sysconfig/* +%files upstart +%defattr(-,root,root,-) +%config(noreplace) /etc/event.d/* + + %if 0%{?with_minit:1} %files minit @@ -185,6 +219,11 @@ %changelog +* Sun Mar 1 2009 Enrico Scholz - 0.12-14 +- added -upstart subpackage +- renamed -sysv subpackage to -sysvinit to let -upstart win the + default dependency resolving + * Tue Feb 24 2009 Fedora Release Engineering - 0.12-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From robert at fedoraproject.org Sun Mar 1 16:57:18 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 1 Mar 2009 16:57:18 +0000 (UTC) Subject: rpms/maildrop/devel maildrop.spec,1.3,1.4 Message-ID: <20090301165718.1476C70115@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/maildrop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4500 Modified Files: maildrop.spec Log Message: Rebuilt against libtool 2.2 to avoid libtool errors Index: maildrop.spec =================================================================== RCS file: /cvs/pkgs/rpms/maildrop/devel/maildrop.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- maildrop.spec 25 Feb 2009 22:55:02 -0000 1.3 +++ maildrop.spec 1 Mar 2009 16:56:47 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Mail delivery agent with filtering abilities Name: maildrop Version: 2.0.4 -Release: 8%{?dist} +Release: 9%{?dist} # Exception is explicit permission to link to OpenSSL License: GPLv2 with exceptions Group: System Environment/Daemons @@ -49,6 +49,7 @@ find . -name Makefile.am -exec touch {} \; %build +libtoolize autoreconf %configure --disable-shared \ --enable-use-flock=1 --with-locking-method=fcntl \ @@ -85,6 +86,9 @@ %{_mandir}/man8/*.8* %changelog +* Sun Mar 01 2009 Robert Scheck - 2.0.4-9 +- Rebuilt against libtool 2.2 to avoid libtool errors + * Wed Feb 25 2009 Fedora Release Engineering - 2.0.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From than at fedoraproject.org Sun Mar 1 17:14:23 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 1 Mar 2009 17:14:23 +0000 (UTC) Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.2.1-redhat-startkde.patch, NONE, 1.1 kdebase-workspace.spec, 1.194, 1.195 solid-bluetoothTrunkTo42.diff, 1.1, 1.2 kdebase-workspace-4.1.82-redhat-startkde.patch, 1.1, NONE Message-ID: <20090301171423.92A3B70115@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7091 Modified Files: kdebase-workspace.spec solid-bluetoothTrunkTo42.diff Added Files: kdebase-workspace-4.2.1-redhat-startkde.patch Removed Files: kdebase-workspace-4.1.82-redhat-startkde.patch Log Message: adapt patches for 4.2.1 kdebase-workspace-4.2.1-redhat-startkde.patch: --- NEW FILE kdebase-workspace-4.2.1-redhat-startkde.patch --- diff -up kdebase-workspace-4.2.1/startkde.cmake.redhat-startkde kdebase-workspace-4.2.1/startkde.cmake --- kdebase-workspace-4.2.1/startkde.cmake.redhat-startkde 2009-02-27 13:42:15.000000000 +0100 +++ kdebase-workspace-4.2.1/startkde.cmake 2009-03-01 12:40:54.000000000 +0100 @@ -19,33 +19,17 @@ elif test $kcheckrunning_result -eq 2 ; exit 1 fi -# Set the background to plain grey. +# Set the background to the Red Hat default # The standard X background is nasty, causing moire effects and exploding # people's heads. We use colours from the standard KDE palette for those with # palettised displays. if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then - xsetroot -solid "#000000" + xsetroot -solid "#103D77" fi # we have to unset this for Darwin since it will screw up KDE's dynamic-loading unset DYLD_FORCE_FLAT_NAMESPACE -# in case we have been started with full pathname spec without being in PATH -bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` -if [ -n "$bindir" ]; then - qbindir=`$bindir/kde4-config --qt-binaries` - if [ -n "$qbindir" ]; then - case $PATH in - $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; - *) PATH=$qbindir:$PATH; export PATH;; - esac - fi - case $PATH in - $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; - *) PATH=$bindir:$PATH; export PATH;; - esac -fi - # Boot sequence: # # kdeinit is used to fork off processes which improves memory usage @@ -83,6 +67,13 @@ kcmrandrrc [Screen3] kcmfonts General forceFontDPI 0 kdeglobals Locale Language '' # trigger requesting languages from KLocale EOF +# read the default KSplash theme to use out of kde-settings +if [ -e /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc ] + then eval `grep '^Theme=' /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc` + if [ -n "$Theme" ] + then sed -i -e "s/Default/$Theme/g" $kdehome/share/config/startupconfigkeys + fi +fi kstartupconfig4 returncode=$? if test $returncode -ne 0; then @@ -203,8 +194,9 @@ fi # better use the Autostart folder. libpath=`kde4-config --path lib | tr : '\n'` +envpath=/etc/kde/env/ -for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do +for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` $envpath ; do for file in "$prefix"*.sh; do test -r "$file" && . "$file" done @@ -417,7 +409,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n echo 'startkde: Running shutdown scripts...' 1>&2 # Run scripts found in $KDEDIRS/shutdown -for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do +shutdownpath=/etc/kde/shutdown/ +for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do test -x "$prefix$file" && "$prefix$file" done Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- kdebase-workspace.spec 27 Feb 2009 15:24:06 -0000 1.194 +++ kdebase-workspace.spec 1 Mar 2009 17:13:52 -0000 1.195 @@ -15,7 +15,7 @@ URL: http://www.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: kdebase-workspace-4.1.82-redhat-startkde.patch +Patch1: kdebase-workspace-4.2.1-redhat-startkde.patch Patch2: kdebase-workspace-4.1.72-plasma-konsole.patch Patch3: kdebase-workspace-4.2.0-show-systemsettings.patch Patch4: kdebase-workspace-4.0.72-ck-shutdown.patch solid-bluetoothTrunkTo42.diff: Index: solid-bluetoothTrunkTo42.diff =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/solid-bluetoothTrunkTo42.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- solid-bluetoothTrunkTo42.diff 29 Jan 2009 18:30:21 -0000 1.1 +++ solid-bluetoothTrunkTo42.diff 1 Mar 2009 17:13:52 -0000 1.2 @@ -1,15 +1,3 @@ -Index: solid_bluez.desktop -=================================================================== ---- solid_bluez.desktop (.../branches/KDE/4.2/kdebase/workspace/solid/bluez) (revision 912529) -+++ solid/bluez/solid_bluez.desktop (.../trunk/KDE/kdebase/workspace/solid/bluez) (revision 912529) -@@ -7,7 +7,6 @@ - Name=BlueZ - Name[hi]=?????????????????? - Name[kn]=????????????????????? --Name[mai]=??????????????? - Name[ne]=????????????Z - Name[sr]=???????? - Name[x-test]=xxBlueZxx Index: bluez-bluetoothinterface.cpp =================================================================== --- bluez-bluetoothinterface.cpp (.../branches/KDE/4.2/kdebase/workspace/solid/bluez) (revision 912529) --- kdebase-workspace-4.1.82-redhat-startkde.patch DELETED --- From rathann at fedoraproject.org Sun Mar 1 17:16:52 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Sun, 1 Mar 2009 17:16:52 +0000 (UTC) Subject: rpms/openbabel/devel openbabel-check.patch,1.8,1.9 Message-ID: <20090301171652.577C870115@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8378 Modified Files: openbabel-check.patch Log Message: - debug test failure, try 7 openbabel-check.patch: Index: openbabel-check.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-check.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- openbabel-check.patch 1 Mar 2009 16:31:26 -0000 1.8 +++ openbabel-check.patch 1 Mar 2009 17:16:51 -0000 1.9 @@ -7,3 +7,15 @@ -${PROVE} "$@" ${TESTS} +${PROVE} --verbose "$@" ${TESTS} +diff -up openbabel-2.2.0/test/bond.cpp.chk openbabel-2.2.0/test/bond.cpp +--- openbabel-2.2.0/test/bond.cpp.chk 2008-06-13 22:48:05.000000000 +0200 ++++ openbabel-2.2.0/test/bond.cpp 2008-07-06 21:45:44.000000000 +0200 +@@ -58,7 +58,7 @@ int main(int argc,char *argv[]) + + bond1.SetBegin(&begin1); + bond1.SetEnd(&end1); +- cout << "ok 4\n"; ++ cout << "ok 3\n"; + + return(0); + } From caolanm at fedoraproject.org Sun Mar 1 17:27:35 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sun, 1 Mar 2009 17:27:35 +0000 (UTC) Subject: rpms/moe/devel moe-1.0-includes.patch,NONE,1.1 moe.spec,1.2,1.3 Message-ID: <20090301172735.CACC270115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/moe/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10162 Modified Files: moe.spec Added Files: moe-1.0-includes.patch Log Message: include stdio.h for snprintf moe-1.0-includes.patch: --- NEW FILE moe-1.0-includes.patch --- diff -ru moe-1.0.orig/menu_help.cc moe-1.0/menu_help.cc --- moe-1.0.orig/menu_help.cc 2009-03-01 17:15:21.000000000 +0000 +++ moe-1.0/menu_help.cc 2009-03-01 17:20:00.000000000 +0000 @@ -17,6 +17,7 @@ #include #include +#include #include "buffer.h" #include "menu.h" diff -ru moe-1.0.orig/menu_opts.cc moe-1.0/menu_opts.cc --- moe-1.0.orig/menu_opts.cc 2009-03-01 17:15:21.000000000 +0000 +++ moe-1.0/menu_opts.cc 2009-03-01 17:15:55.000000000 +0000 @@ -18,6 +18,7 @@ #include #include #include +#include #include "buffer.h" #include "block.h" diff -ru moe-1.0.orig/window.cc moe-1.0/window.cc --- moe-1.0.orig/window.cc 2009-03-01 17:15:21.000000000 +0000 +++ moe-1.0/window.cc 2009-03-01 17:22:43.000000000 +0000 @@ -19,6 +19,7 @@ #include #include #include +#include #include "buffer.h" #include "buffer_handle.h" Index: moe.spec =================================================================== RCS file: /cvs/pkgs/rpms/moe/devel/moe.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- moe.spec 26 Feb 2009 02:18:21 -0000 1.2 +++ moe.spec 1 Mar 2009 17:27:05 -0000 1.3 @@ -1,12 +1,13 @@ Name: moe Version: 1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A powerful clean text editor Group: Applications/Editors License: GPLv3+ URL: http://www.gnu.org/software/moe/moe.html Source0: http://ftp.gnu.org/gnu/moe/%{name}-%{version}.tar.bz2 +Patch0: moe-1.0-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -24,6 +25,7 @@ %prep %setup -q +%patch0 -p1 -b .includes %build @@ -59,6 +61,9 @@ %{_mandir}/man1/%{name}* %changelog +* Sun Mar 01 2009 Caol??n McNamara - 1.0-4 +- include stdio.h for snprintf + * Wed Feb 25 2009 Fedora Release Engineering - 1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From cwickert at fedoraproject.org Sun Mar 1 17:28:12 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Sun, 1 Mar 2009 17:28:12 +0000 (UTC) Subject: rpms/galculator/devel .cvsignore, 1.6, 1.7 galculator.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <20090301172812.0153870115@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/galculator/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10352 Modified Files: .cvsignore galculator.spec sources Log Message: * Sun Mar 1 2009 Christoph Wickert - 1.3.4-1 - Update to 1.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/galculator/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 4 Jun 2008 17:18:12 -0000 1.6 +++ .cvsignore 1 Mar 2009 17:27:41 -0000 1.7 @@ -1 +1 @@ -galculator-1.3.1.tar.bz2 +galculator-1.3.4.tar.bz2 Index: galculator.spec =================================================================== RCS file: /cvs/pkgs/rpms/galculator/devel/galculator.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- galculator.spec 24 Feb 2009 19:20:03 -0000 1.16 +++ galculator.spec 1 Mar 2009 17:27:41 -0000 1.17 @@ -1,6 +1,6 @@ Name: galculator -Version: 1.3.1 -Release: 2%{?dist} +Version: 1.3.4 +Release: 1%{?dist} Summary: GTK 2 based scientific calculator Group: Applications/Engineering @@ -36,7 +36,7 @@ desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ + --add-category "Calculator;GTK;" \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop @@ -50,11 +50,14 @@ %attr(0755,root,root) %{_bindir}/galculator %{_datadir}/applications/fedora-galculator.desktop %{_datadir}/galculator/ -%{_datadir}/pixmaps/galculator/ +%{_datadir}/pixmaps/galculator.* %{_mandir}/man1/%{name}.1* %changelog +* Sun Mar 1 2009 Christoph Wickert - 1.3.4-1 +- Update to 1.3.4 + * Tue Feb 24 2009 Fedora Release Engineering - 1.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/galculator/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 4 Jun 2008 17:18:12 -0000 1.6 +++ sources 1 Mar 2009 17:27:41 -0000 1.7 @@ -1 +1 @@ -683a4f0c2cb3d1f56b4c5610fc495c5f galculator-1.3.1.tar.bz2 +d30e6fbf5947bb1c873bc9d5a21046f1 galculator-1.3.4.tar.bz2 From caolanm at fedoraproject.org Sun Mar 1 17:36:27 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sun, 1 Mar 2009 17:36:27 +0000 (UTC) Subject: rpms/blackbox/devel blackbox.spec,1.23,1.24 Message-ID: <20090301173627.3452170115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/blackbox/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11899 Modified Files: blackbox.spec Log Message: give libtool a kicking Index: blackbox.spec =================================================================== RCS file: /cvs/pkgs/rpms/blackbox/devel/blackbox.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- blackbox.spec 24 Feb 2009 04:55:50 -0000 1.23 +++ blackbox.spec 1 Mar 2009 17:35:56 -0000 1.24 @@ -1,7 +1,7 @@ Summary: Very small and fast Window Manager Name: blackbox Version: 0.70.1 -Release: 12 +Release: 13 License: MIT Group: User Interface/Desktops URL: http://blackboxwm.sourceforge.net/ @@ -38,7 +38,7 @@ %setup -q %patch0 -p1 -b .gcc43 # Required to cleanly get rid of the useless rpath -autoreconf +autoreconf -i -f %build @@ -94,6 +94,9 @@ %changelog +* Sun Mar 01 2009 Caol??n McNamara - 0.70.1-13 +- make build + * Mon Feb 23 2009 Fedora Release Engineering - 0.70.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From atorkhov at fedoraproject.org Sun Mar 1 17:40:25 2009 From: atorkhov at fedoraproject.org (Alexey Torkhov) Date: Sun, 1 Mar 2009 17:40:25 +0000 (UTC) Subject: rpms/ember/devel ember.spec,1.13,1.14 Message-ID: <20090301174025.9C14270115@cvs1.fedora.phx.redhat.com> Author: atorkhov Update of /cvs/pkgs/rpms/ember/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12856 Modified Files: ember.spec Log Message: * Sun Mar 01 2009 Alexey Torkhov - 0.5.5-4 - Adding unowned directory Index: ember.spec =================================================================== RCS file: /cvs/pkgs/rpms/ember/devel/ember.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ember.spec 28 Feb 2009 08:47:04 -0000 1.13 +++ ember.spec 1 Mar 2009 17:39:55 -0000 1.14 @@ -1,6 +1,6 @@ Name: ember Version: 0.5.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: 3D client for WorldForge Group: Amusements/Games @@ -73,10 +73,7 @@ %{_datadir}/%{name}/jesus # datadir/%{name}/media is owned by ember-media # datadir/%{name}/media/shared is owned by ember-media -# datadir/%{name}/media/shared/gui is owned by ember-media -%{_datadir}/%{name}/media/shared/gui/*.xsd -# datadir/%{name}/media/shared/gui/cegui is owned by ember-media -%{_datadir}/%{name}/media/shared/gui/cegui/datafiles +%{_datadir}/%{name}/media/shared/gui %{_datadir}/%{name}/media/shared/entityrecipes %{_datadir}/%{name}/media/shared/modeldefinitions %{_datadir}/%{name}/media/shared/scripting @@ -90,6 +87,9 @@ %changelog +* Sun Mar 01 2009 Alexey Torkhov - 0.5.5-4 +- Adding unowned directory + * Sat Feb 28 2009 Alexey Torkhov - 0.5.5-3 - Fixing build with recent compilers From than at fedoraproject.org Sun Mar 1 17:46:12 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 1 Mar 2009 17:46:12 +0000 (UTC) Subject: rpms/kdebase/devel kdebase-4.2.1-home-icon.patch, NONE, 1.1 kdebase.spec, 1.364, 1.365 kdebase-4.2.0-home-icon.patch, 1.2, NONE Message-ID: <20090301174612.E6D5770115@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13911 Modified Files: kdebase.spec Added Files: kdebase-4.2.1-home-icon.patch Removed Files: kdebase-4.2.0-home-icon.patch Log Message: adapt home-icon patch kdebase-4.2.1-home-icon.patch: --- NEW FILE kdebase-4.2.1-home-icon.patch --- diff -up kdebase-4.2.1/apps/konqueror/Home.desktop.home-icon kdebase-4.2.1/apps/konqueror/Home.desktop --- kdebase-4.2.1/apps/konqueror/Home.desktop.home-icon 2009-02-26 15:16:30.000000000 +0100 +++ kdebase-4.2.1/apps/konqueror/Home.desktop 2009-03-01 18:43:05.000000000 +0100 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=kfmclient openProfile filemanagement +Exec=dolphin Icon=user-home Terminal=false @@ -170,4 +170,3 @@ GenericName[zh_CN]=???????????? GenericName[zh_TW]=???????????? Categories=Qt;KDE;Core; OnlyShowIn=KDE; -NoDisplay=true Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.364 retrieving revision 1.365 diff -u -r1.364 -r1.365 --- kdebase.spec 27 Feb 2009 11:36:04 -0000 1.364 +++ kdebase.spec 1 Mar 2009 17:45:42 -0000 1.365 @@ -24,11 +24,9 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# fedora specific nsplugins paths Patch0: kdebase-4.1.80-nsplugins-paths.patch -# Konsole patches Patch1: kdebase-4.1.70-konsole-session.patch -patch2: kdebase-4.2.0-home-icon.patch +patch2: kdebase-4.2.1-home-icon.patch ## upstream patches --- kdebase-4.2.0-home-icon.patch DELETED --- From rathann at fedoraproject.org Sun Mar 1 17:46:42 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Sun, 1 Mar 2009 17:46:42 +0000 (UTC) Subject: rpms/openbabel/devel openbabel-check.patch,1.9,1.10 Message-ID: <20090301174642.C814B70116@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14240 Modified Files: openbabel-check.patch Log Message: - debug test failure, try 8 openbabel-check.patch: Index: openbabel-check.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-check.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- openbabel-check.patch 1 Mar 2009 17:16:51 -0000 1.9 +++ openbabel-check.patch 1 Mar 2009 17:46:41 -0000 1.10 @@ -1,6 +1,23 @@ diff -up openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh.chk openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh --- openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh.chk 2009-01-12 20:10:33.000000000 +0100 +++ openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh 2009-03-01 16:19:28.000000000 +0100 +@@ -16,11 +16,11 @@ TESTS="${TESTS} logp_psa math" + TESTS="${TESTS} mol phmodel residue rings" + TESTS="${TESTS} smarts smilesmatch unitcell" + TESTS="${TESTS} cml.sh test-set.sh" +-if [ "x${srcdir}" != "x" ]; then +- TESTS="${TESTS} ${srcdir}/inchi.pl ${srcdir}/inchi2.pl" +-else +- TESTS="${TESTS} inchi.pl inchi2.pl" +-fi ++#if [ "x${srcdir}" != "x" ]; then ++# TESTS="${TESTS} ${srcdir}/inchi.pl ${srcdir}/inchi2.pl" ++#else ++# TESTS="${TESTS} inchi.pl inchi2.pl" ++#fi + PROVE=prove + + echo "top srcdir: .${topsrcdir}." @@ -45,4 +45,4 @@ if [ -d ../src/formats/.libs ]; then fi fi From caolanm at fedoraproject.org Sun Mar 1 17:46:41 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sun, 1 Mar 2009 17:46:41 +0000 (UTC) Subject: rpms/libmp4v2/devel libmp4v2-1.5.0.1-consts.patch, NONE, 1.1 libmp4v2.spec, 1.5, 1.6 Message-ID: <20090301174641.3AE3670116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/libmp4v2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14101 Modified Files: libmp4v2.spec Added Files: libmp4v2-1.5.0.1-consts.patch Log Message: constify rets of strchr(const char*) libmp4v2-1.5.0.1-consts.patch: --- NEW FILE libmp4v2-1.5.0.1-consts.patch --- diff -ru libmp4v2-1.5.0.1.orig/rtphint.cpp libmp4v2-1.5.0.1/rtphint.cpp --- libmp4v2-1.5.0.1.orig/rtphint.cpp 2009-03-01 17:39:24.000000000 +0000 +++ libmp4v2-1.5.0.1/rtphint.cpp 2009-03-01 17:39:58.000000000 +0000 @@ -314,7 +314,7 @@ char **ppEncodingParams) { const char* pRtpMap; - char* pSlash; + const char* pSlash; u_int32_t length; InitPayload(); Index: libmp4v2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libmp4v2/devel/libmp4v2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libmp4v2.spec 25 Feb 2009 16:22:49 -0000 1.5 +++ libmp4v2.spec 1 Mar 2009 17:46:10 -0000 1.6 @@ -8,6 +8,7 @@ Source0: http://resare.com/libmp4v2/dist/libmp4v2-%{version}.tar.bz2 # Only here to be in the source package, "just in case, and FYI" Source1: http://resare.com/libmp4v2/mklibmp4v2/mklibmp4v2-r51.tar.bz2 +Patch0: libmp4v2-1.5.0.1-consts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description @@ -28,6 +29,7 @@ %prep %setup -q +%patch0 -p1 -b .consts %build @@ -68,6 +70,9 @@ %changelog +* Sun Mar 01 2009 Caol??n McNamara - 1.5.0.1-8 +- constify rets of strchr(const char*) + * Wed Feb 25 2009 Fedora Release Engineering - 1.5.0.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Sun Mar 1 17:54:18 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sun, 1 Mar 2009 17:54:18 +0000 (UTC) Subject: rpms/libmp4v2/devel libmp4v2.spec,1.6,1.7 Message-ID: <20090301175418.A61CC70115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/libmp4v2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16185 Modified Files: libmp4v2.spec Log Message: constify rets of strchr(const char*) Index: libmp4v2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libmp4v2/devel/libmp4v2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libmp4v2.spec 1 Mar 2009 17:46:10 -0000 1.6 +++ libmp4v2.spec 1 Mar 2009 17:53:48 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 1.5.0.1 -Release: 7%{?dist} +Release: 8%{?dist} License: MPLv1.1 Group: System Environment/Libraries URL: http://resare.com/libmp4v2/ From cwickert at fedoraproject.org Sun Mar 1 17:54:23 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Sun, 1 Mar 2009 17:54:23 +0000 (UTC) Subject: rpms/emelfm2/devel emelfm2-0.5.1-Makefile.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 emelfm2.spec, 1.32, 1.33 sources, 1.18, 1.19 Message-ID: <20090301175423.C226170115@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/emelfm2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16222 Modified Files: .cvsignore emelfm2.spec sources Added Files: emelfm2-0.5.1-Makefile.patch Log Message: * Wed Feb 25 2009 Christoph Wickert - 0.5.1-1 - Update 0.5.1 emelfm2-0.5.1-Makefile.patch: --- NEW FILE emelfm2-0.5.1-Makefile.patch --- --- Makefile 2009-02-25 22:55:46.000000000 +0100 +++ Makefile.fixed 2009-03-01 18:42:25.000000000 +0100 @@ -48,7 +48,9 @@ COPYRIGHT=2003-$(shell date +"%04Y"), tooar ifeq ($(DOCS_VERSION), 1) -DOC_DIR=$(DOC_DIR)-$(VERSION) +# cannot use just +=, that inserts a space +TMP:=$(DOC_DIR)-$(VERSION) +DOC_DIR:=$(TMP) endif # object directories that have to be created Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/emelfm2/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 5 Nov 2008 23:52:44 -0000 1.18 +++ .cvsignore 1 Mar 2009 17:53:53 -0000 1.19 @@ -1 +1 @@ -emelfm2-0.5.0.tar.bz2 +emelfm2-0.5.1.tar.bz2 Index: emelfm2.spec =================================================================== RCS file: /cvs/pkgs/rpms/emelfm2/devel/emelfm2.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- emelfm2.spec 24 Feb 2009 14:53:30 -0000 1.32 +++ emelfm2.spec 1 Mar 2009 17:53:53 -0000 1.33 @@ -5,14 +5,15 @@ # rpmbuild -ba emelfm2.spec --with hal Name: emelfm2 -Version: 0.5.0 -Release: 2%{?dist} -Summary: A file manager that implements the popular two-pane design +Version: 0.5.1 +Release: 1%{?dist} +Summary: File manager that implements the popular two-pane design Group: Applications/File License: GPLv3+ URL: http://emelfm2.net/ Source0: http://emelfm2.net/rel/%{name}-%{version}.tar.bz2 +Patch0: emelfm2-0.5.1-Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6.0, libacl-devel, gettext, desktop-file-utils @@ -30,7 +31,8 @@ %prep -%setup -qn emelfm2-0.5 +%setup -q +%patch0 -p0 -b .docdir # fix for x86_64 libs sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)!' Makefile @@ -64,8 +66,6 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category System \ - --add-category Utility \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop @@ -88,18 +88,21 @@ %changelog +* Wed Feb 25 2009 Christoph Wickert - 0.5.1-1 +- Update 0.5.1 + * Tue Feb 24 2009 Fedora Release Engineering - 0.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Thu Oct 30 2008 Christoph Wickert - 0.5.0-1 +* Thu Oct 30 2008 Christoph Wickert - 0.5.0-1 - Update 0.5.0 -* Tue Jul 08 2008 Christoph Wickert - 0.4.1-1 +* Tue Jul 08 2008 Christoph Wickert - 0.4.1-1 - Update 0.4.1 - Revove hal_flags.patch (fixed upstream) - Remove HAL support until it really works. To enable rebuild "--with hal" -* Wed Apr 02 2008 Christoph Wickert - 0.4.0-1 +* Wed Apr 02 2008 Christoph Wickert - 0.4.0-1 - Update 0.4.0 - Enable HAL support, but dont install hal by default - Add emelfm2-0.4-hal_flags.patch (Thanks to Uwe Helm) @@ -108,44 +111,44 @@ * Mon Feb 18 2008 Fedora Release Engineering - 0.3.6-2 - Autorebuild for GCC 4.3 -* Sun Dec 02 2007 Christoph Wickert - 0.3.6-1 +* Sun Dec 02 2007 Christoph Wickert - 0.3.6-1 - Update 0.3.6 with upstream's e2-0.3.6-07-12-01.patch - Enable the ACL plugin -* Tue Aug 21 2007 Christoph Wickert - 0.3.5-2 +* Tue Aug 21 2007 Christoph Wickert - 0.3.5-2 - Rebuild to fix SELinux issues on PPC32 and to include BuildID feature -* Sun Jul 29 2007 Christoph Wickert - 0.3.5-1 +* Sun Jul 29 2007 Christoph Wickert - 0.3.5-1 - Update 0.3.5. -* Sat Jun 09 2007 Christoph Wickert - 0.3.4-1 +* Sat Jun 09 2007 Christoph Wickert - 0.3.4-1 - Update 0.3.4. - Enable support for inotify -* Wed Mar 21 2007 Christoph Wickert - 0.3.3-1 +* Wed Mar 21 2007 Christoph Wickert - 0.3.3-1 - Update 0.3.3. -* Sat Feb 24 2007 Christoph Wickert - 0.3.2-2 +* Sat Feb 24 2007 Christoph Wickert - 0.3.2-2 - Include upstream's e2-0.3.2-07-02-01.patch fixing some bugs. -* Fri Jan 19 2007 Christoph Wickert - 0.3.2-1 +* Fri Jan 19 2007 Christoph Wickert - 0.3.2-1 - Update 0.3.2. - Remove Category "Application" from emelfm2.desktop. -* Sat Dec 16 2006 Christoph Wickert - 0.3.1-1 +* Sat Dec 16 2006 Christoph Wickert - 0.3.1-1 - Update 0.3.1. - Remove Category "X-Fedora" from emelfm2.desktop. -* Mon Aug 28 2006 Christoph Wickert - 0.3.0-1 +* Mon Aug 28 2006 Christoph Wickert - 0.3.0-1 - Update 0.3. -* Mon Aug 28 2006 Christoph Wickert - 0.2.0-1 +* Mon Aug 28 2006 Christoph Wickert - 0.2.0-1 - Update 0.2.0. -* Fri Aug 11 2006 Christoph Wickert - 0.1.8-2 +* Fri Aug 11 2006 Christoph Wickert - 0.1.8-2 - Include upstream's e2-0.1.8-06-08-09.patch to fix two serious bugs. -* Sun Aug 06 2006 Christoph Wickert - 0.1.8-1 +* Sun Aug 06 2006 Christoph Wickert - 0.1.8-1 - Update to 0.1.8. * Thu Apr 23 2006 Christoph Wickert - 0.1.7-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/emelfm2/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 5 Nov 2008 23:52:44 -0000 1.18 +++ sources 1 Mar 2009 17:53:53 -0000 1.19 @@ -1 +1 @@ -26ce3efa9739c601bee082f642c66ac1 emelfm2-0.5.0.tar.bz2 +f97784e465b0c29685e057052ca39a18 emelfm2-0.5.1.tar.bz2 From robert at fedoraproject.org Sun Mar 1 18:16:13 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 1 Mar 2009 18:16:13 +0000 (UTC) Subject: rpms/amavisd-new/devel amavisd-conf.patch, 1.5, 1.6 amavisd-new.spec, 1.23, 1.24 Message-ID: <20090301181613.9F7B370115@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/amavisd-new/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20154 Modified Files: amavisd-conf.patch amavisd-new.spec Log Message: Re-diffed amavisd-new configuration patch for no fuzz amavisd-conf.patch: Index: amavisd-conf.patch =================================================================== RCS file: /cvs/pkgs/rpms/amavisd-new/devel/amavisd-conf.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- amavisd-conf.patch 23 Jun 2007 01:26:06 -0000 1.5 +++ amavisd-conf.patch 1 Mar 2009 18:16:12 -0000 1.6 @@ -1,9 +1,9 @@ ---- amavisd-new-2.5.1/amavisd.conf.orig 2007-05-31 07:09:55.000000000 -0500 -+++ amavisd-new-2.5.1/amavisd.conf 2007-06-22 16:35:04.000000000 -0500 -@@ -15,23 +15,23 @@ +--- amavisd-new-2.6.2/amavisd.conf 2008-12-15 01:50:03.000000000 +0100 ++++ amavisd-new-2.6.2/amavisd.conf.conf 2009-03-01 19:11:48.000000000 +0100 +@@ -15,15 +15,15 @@ # $bypass_decode_parts = 1; # controls running of decoders&dearchivers - $max_servers = 2; # num of pre-forked children (2..15 is common), -m + $max_servers = 2; # num of pre-forked children (2..30 is common), -m -$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u -$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g +$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u @@ -18,8 +18,9 @@ -$QUARANTINEDIR = '/var/virusmails'; # -Q +$QUARANTINEDIR = undef; # -Q # $quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine - - # $daemon_chroot_dir = $MYHOME; # chroot directory or undef, -R + # $release_format = 'resend'; # 'attach', 'plain', 'resend' + # $report_format = 'arf'; # 'attach', 'plain', 'resend', 'arf' +@@ -32,8 +32,8 @@ # $db_home = "$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D # $helpers_home = "$MYHOME/var"; # working directory for SpamAssassin, -S @@ -30,7 +31,7 @@ #NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually $log_level = 0; # verbosity 0..5, -d -@@ -110,11 +110,11 @@ +@@ -116,11 +116,11 @@ # $timestamp_fmt_mysql = 1; # if using MySQL *and* msgs.time_iso is TIMESTAMP; # defaults to 0, which is good for non-MySQL or if msgs.time_iso is CHAR(16) @@ -46,7 +47,7 @@ $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef @addr_extension_virus_maps = ('virus'); -@@ -148,10 +148,10 @@ +@@ -154,10 +154,10 @@ # $notify_method = 'smtp:[127.0.0.1]:10025'; # $forward_method = 'smtp:[127.0.0.1]:10025'; # set to undef with milter! @@ -58,21 +59,21 @@ +$final_banned_destiny = D_BOUNCE; +$final_spam_destiny = D_DISCARD; +$final_bad_header_destiny = D_BOUNCE; + # $bad_header_quarantine_method = undef; - # $os_fingerprint_method = 'p0f:127.0.0.1:2345'; # to query p0f-analyzer.pl - -@@ -353,10 +353,10 @@ + # $os_fingerprint_method = 'p0f:*:2345'; # to query p0f-analyzer.pl +@@ -360,10 +360,10 @@ # ['Sophos SAVI', \&sophos_savi ], # ### http://www.clamav.net/ -# ['ClamAV-clamd', -# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"], -# qr/\bOK$/, qr/\bFOUND$/, --# qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], +-# qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], +['ClamAV-clamd', + \&ask_daemon, ["CONTSCAN {}\n", "/var/spool/amavisd/clamd.sock"], + qr/\bOK$/, qr/\bFOUND$/, -+ qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], ++ qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], # # NOTE: run clamd under the same user as amavisd, or run it under its own # # uid such as clamav, add user clamav to the amavis group, and then add # # AllowSupplementaryGroups to clamd.conf; Index: amavisd-new.spec =================================================================== RCS file: /cvs/pkgs/rpms/amavisd-new/devel/amavisd-new.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- amavisd-new.spec 24 Feb 2009 00:56:26 -0000 1.23 +++ amavisd-new.spec 1 Mar 2009 18:16:12 -0000 1.24 @@ -3,7 +3,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavisd-new Version: 2.6.2 -Release: 2%{?prerelease:.%{prerelease}}%{?dist} +Release: 3%{?prerelease:.%{prerelease}}%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL Group: Applications/System @@ -174,6 +174,9 @@ %ghost /var/spool/amavisd/clamd.sock %changelog +* Sun Mar 01 2009 Robert Scheck 2.6.2-3 +- Re-diffed amavisd-new configuration patch for no fuzz + * Mon Feb 23 2009 Fedora Release Engineering - 2.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From itamarjp at fedoraproject.org Sun Mar 1 18:17:13 2009 From: itamarjp at fedoraproject.org (Itamar Reis Peixoto) Date: Sun, 1 Mar 2009 18:17:13 +0000 (UTC) Subject: rpms/gftp/devel import.log, NONE, 1.1 .cvsignore, 1.9, 1.10 gftp-stropts.patch, 1.1, 1.2 gftp.spec, 1.34, 1.35 sources, 1.9, 1.10 gftp-2.0.18-bookmarks-cleanups.patch, 1.1, NONE gftp-2.0.18-thread-initialization.patch, 1.1, NONE gftp-2.0.18-user-dirs.patch, 1.1, NONE Message-ID: <20090301181713.F169D70115@cvs1.fedora.phx.redhat.com> Author: itamarjp Update of /cvs/pkgs/rpms/gftp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20253/devel Modified Files: .cvsignore gftp-stropts.patch gftp.spec sources Added Files: import.log Removed Files: gftp-2.0.18-bookmarks-cleanups.patch gftp-2.0.18-thread-initialization.patch gftp-2.0.18-user-dirs.patch Log Message: upgrade to 2.0.19 --- NEW FILE import.log --- gftp-2_0_19-1_fc11:HEAD:gftp-2.0.19-1.fc11.src.rpm:1235931310 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gftp/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 11 Feb 2005 04:26:45 -0000 1.9 +++ .cvsignore 1 Mar 2009 18:16:43 -0000 1.10 @@ -1,2 +1 @@ -gftp-2.0.17.tar.bz2 -gftp-2.0.18.tar.bz2 +gftp-2.0.19.tar.bz2 gftp-stropts.patch: Index: gftp-stropts.patch =================================================================== RCS file: /cvs/pkgs/rpms/gftp/devel/gftp-stropts.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gftp-stropts.patch 2 Apr 2008 20:30:42 -0000 1.1 +++ gftp-stropts.patch 1 Mar 2009 18:16:43 -0000 1.2 @@ -1,14 +1,12 @@ -diff -up gftp-2.0.18/lib/pty.c.stropts gftp-2.0.18/lib/pty.c ---- gftp-2.0.18/lib/pty.c.stropts 2008-04-02 16:22:00.000000000 -0400 -+++ gftp-2.0.18/lib/pty.c 2008-04-02 16:22:45.000000000 -0400 -@@ -61,10 +61,6 @@ _gftp_ptys_open (int fdm, int fds, char +diff -ruNp gftp-2.0.19.old/lib/pty.c gftp-2.0.19.new/lib/pty.c +--- gftp-2.0.19.old/lib/pty.c 2007-03-12 22:56:43.000000000 -0300 ++++ gftp-2.0.19.new/lib/pty.c 2009-03-01 10:54:39.000000000 -0300 +@@ -61,7 +61,7 @@ _gftp_ptys_open (int fdm, int fds, char #elif HAVE_GRANTPT --#ifndef __FreeBSD__ --#include --#endif -- - char * - gftp_get_pty_impl (void) - { +-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)) ++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)|| defined(__linux__)) + #include + #endif + Index: gftp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gftp/devel/gftp.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- gftp.spec 24 Feb 2009 21:08:30 -0000 1.34 +++ gftp.spec 1 Mar 2009 18:16:43 -0000 1.35 @@ -1,17 +1,14 @@ Summary: A multi-threaded FTP client for the X Window System Name: gftp -Version: 2.0.18 -Release: 6%{?dist} +Version: 2.0.19 +Release: 1%{?dist} Epoch: 2 License: GPLv2+ Group: Applications/Internet Url: http://gftp.seul.org/ Source0: http://gftp.seul.org/%{name}-%{version}.tar.bz2 Source1: gftp-text-disabled.sh -Patch0: gftp-2.0.18-thread-initialization.patch -Patch1: gftp-2.0.18-user-dirs.patch -Patch2: gftp-stropts.patch -Patch3: gftp-2.0.18-bookmarks-cleanups.patch +Patch0: gftp-stropts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.2.0 BuildRequires: readline-devel @@ -31,26 +28,17 @@ %prep %setup -q -%patch0 -p1 -b .thread-initialization -%patch1 -p1 -b .user-dirs -%patch2 -p1 -b .stropts -%patch3 -p1 -b .fixbookmarks +%patch0 -p1 -b .stropts %build +%configure -%ifarch alpha -MIEEE_FLAG="-mieee" -%endif -CFLAGS="$RPM_OPT_FLAGS $MIEEE_FLAG" %configure -make +make CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT -DESTDIR=$RPM_BUILD_ROOT make install - -# Get rid of bogus 'br' translation (pt_BR is included) -rm -rf $RPM_BUILD_ROOT%{_prefix}/share/locale/br +make install DESTDIR=$RPM_BUILD_ROOT # desktop-file-install is picky about this sed -i -e "s#Icon=gftp.png#Icon=/usr/share/pixmaps/gftp.png#" \ @@ -82,6 +70,10 @@ %{_mandir}/man1/gftp.1.gz %changelog +* Sun Mar 01 2009 Itamar Reis Peixoto - 2:2.0.19-1 +- upgrade to 2.0.19 +- spec cleanup + * Tue Feb 24 2009 Fedora Release Engineering - 2:2.0.18-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gftp/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 11 Feb 2005 04:26:45 -0000 1.9 +++ sources 1 Mar 2009 18:16:43 -0000 1.10 @@ -1 +1 @@ -44b19442d06f6dc68c7211d66029d826 gftp-2.0.18.tar.bz2 +5183cb4955d94be0e03c892585547c64 gftp-2.0.19.tar.bz2 --- gftp-2.0.18-bookmarks-cleanups.patch DELETED --- --- gftp-2.0.18-thread-initialization.patch DELETED --- --- gftp-2.0.18-user-dirs.patch DELETED --- From robert at fedoraproject.org Sun Mar 1 18:30:52 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 1 Mar 2009 18:30:52 +0000 (UTC) Subject: rpms/libnids/devel libnids-1.23-elif.patch, NONE, 1.1 libnids.spec, 1.8, 1.9 Message-ID: <20090301183053.3E0D770115@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/libnids/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23524 Modified Files: libnids.spec Added Files: libnids-1.23-elif.patch Log Message: Added patch to correct the wrong elif preprocessor statement libnids-1.23-elif.patch: --- NEW FILE libnids-1.23-elif.patch --- Patch by Robert Scheck for libnids >= 1.23, that corrects the preprocessor conditional from empty (wrong) elif to else. --- libnids-1.23/src/killtcp.c 2006-05-08 22:05:51.000000000 +0200 +++ libnids-1.23/src/killtcp.c.elif 2009-03-01 19:25:13.000000000 +0100 @@ -118,6 +118,6 @@ if (initialized) abort(); } -#elif +#else #error Something wrong with LIBNET_VER #endif Index: libnids.spec =================================================================== RCS file: /cvs/pkgs/rpms/libnids/devel/libnids.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libnids.spec 23 Feb 2009 21:00:14 -0000 1.8 +++ libnids.spec 1 Mar 2009 18:30:52 -0000 1.9 @@ -1,11 +1,12 @@ Summary: Implementation of an E-component of Network Intrusion Detection System Name: libnids Version: 1.23 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://libnids.sourceforge.net/ Source: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz +Patch0: libnids-1.23-elif.patch BuildRequires: libnet-devel, glib2-devel, %{_includedir}/pcap.h, pkgconfig BuildRequires: libtool, automake BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,6 +31,7 @@ %prep %setup -q +%patch0 -p1 -b .elif libtoolize --force # Needed for ppc64, automake can't be run here @@ -63,6 +65,9 @@ %{_mandir}/man3/libnids.3* %changelog +* Sun Mar 01 2009 Robert Scheck 1.23-3 +- Added patch to correct the wrong elif preprocessor statement + * Mon Feb 23 2009 Robert Scheck 1.23-2 - Rebuilt against gcc 4.4 and rpm 4.6 From robert at fedoraproject.org Sun Mar 1 18:38:53 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 1 Mar 2009 18:38:53 +0000 (UTC) Subject: rpms/amavisd-new/devel amavisd-conf.patch, 1.6, 1.7 amavisd-new.spec, 1.24, 1.25 amavisd-db.patch, 1.2, NONE Message-ID: <20090301183853.E0ABC70115@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/amavisd-new/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24839 Modified Files: amavisd-conf.patch amavisd-new.spec Removed Files: amavisd-db.patch Log Message: Add the forgotten overlefts... amavisd-conf.patch: Index: amavisd-conf.patch =================================================================== RCS file: /cvs/pkgs/rpms/amavisd-new/devel/amavisd-conf.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- amavisd-conf.patch 1 Mar 2009 18:16:12 -0000 1.6 +++ amavisd-conf.patch 1 Mar 2009 18:38:53 -0000 1.7 @@ -1,6 +1,6 @@ --- amavisd-new-2.6.2/amavisd.conf 2008-12-15 01:50:03.000000000 +0100 +++ amavisd-new-2.6.2/amavisd.conf.conf 2009-03-01 19:11:48.000000000 +0100 -@@ -15,15 +15,15 @@ +@@ -15,25 +15,25 @@ # $bypass_decode_parts = 1; # controls running of decoders&dearchivers $max_servers = 2; # num of pre-forked children (2..30 is common), -m @@ -20,9 +20,11 @@ # $quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine # $release_format = 'resend'; # 'attach', 'plain', 'resend' # $report_format = 'arf'; # 'attach', 'plain', 'resend', 'arf' -@@ -32,8 +32,8 @@ - # $db_home = "$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D + # $daemon_chroot_dir = $MYHOME; # chroot directory or undef, -R + +-# $db_home = "$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D ++$db_home = "$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D # $helpers_home = "$MYHOME/var"; # working directory for SpamAssassin, -S -# $lock_file = "$MYHOME/var/amavisd.lock"; # -L -# $pid_file = "$MYHOME/var/amavisd.pid"; # -P Index: amavisd-new.spec =================================================================== RCS file: /cvs/pkgs/rpms/amavisd-new/devel/amavisd-new.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- amavisd-new.spec 1 Mar 2009 18:16:12 -0000 1.24 +++ amavisd-new.spec 1 Mar 2009 18:38:53 -0000 1.25 @@ -18,7 +18,6 @@ Patch0: amavisd-conf.patch Patch1: amavisd-init.patch Patch2: amavisd-condrestart.patch -Patch3: amavisd-db.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root/ Requires: /usr/sbin/clamd, /etc/clamd.d Requires: /usr/sbin/tmpwatch, /etc/cron.daily @@ -92,7 +91,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p0 -%patch3 -p0 install -m644 %{SOURCE4} %{SOURCE5} README_FILES/ sed -i -e 's,/var/amavis/amavisd.sock\>,/var/spool/amavisd/amavisd.sock,' \ --- amavisd-db.patch DELETED --- From hedayat at fedoraproject.org Sun Mar 1 18:39:01 2009 From: hedayat at fedoraproject.org (Hedayat Vatankhah) Date: Sun, 1 Mar 2009 18:39:01 +0000 (UTC) Subject: rpms/rcssserver3d/devel rcssserver3d-0.6-gcc4_4fix.patch, NONE, 1.1 rcssserver3d.spec, 1.9, 1.10 Message-ID: <20090301183901.7475B70115@cvs1.fedora.phx.redhat.com> Author: hedayat Update of /cvs/pkgs/rpms/rcssserver3d/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24755 Modified Files: rcssserver3d.spec Added Files: rcssserver3d-0.6-gcc4_4fix.patch Log Message: Added patch for gcc4.4 compatibility rcssserver3d-0.6-gcc4_4fix.patch: --- NEW FILE rcssserver3d-0.6-gcc4_4fix.patch --- diff -up rcssserver3d-0.6/utility/rcssnet/socketstreambuf.hpp.gcc4_4fix rcssserver3d-0.6/utility/rcssnet/socketstreambuf.hpp --- rcssserver3d-0.6/utility/rcssnet/socketstreambuf.hpp.gcc4_4fix 2009-03-01 16:38:31.000000000 +0330 +++ rcssserver3d-0.6/utility/rcssnet/socketstreambuf.hpp 2009-03-01 16:38:43.000000000 +0330 @@ -25,6 +25,7 @@ //g++ 2.95.6 doesn't have the streambuf header, so iostream is used instead //#include #include +#include #include "socket.hpp" Index: rcssserver3d.spec =================================================================== RCS file: /cvs/pkgs/rpms/rcssserver3d/devel/rcssserver3d.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rcssserver3d.spec 25 Feb 2009 19:13:32 -0000 1.9 +++ rcssserver3d.spec 1 Mar 2009 18:38:30 -0000 1.10 @@ -1,6 +1,6 @@ Name: rcssserver3d Version: 0.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Robocup 3D Soccer Simulation Server Group: Applications/System @@ -15,6 +15,7 @@ Patch0: %{name}-0.6-libnamefix.patch Patch1: %{name}-0.6-odefix.patch Patch2: %{name}-0.6-boost.patch +Patch3: %{name}-0.6-gcc4_4fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake autoconf gcc-c++ boost-devel slang-devel @@ -85,6 +86,7 @@ %patch0 -p1 -b .libnamefix %patch1 -p1 -b .odefix %patch2 -p1 -b .boost +%patch3 -p1 -b .gcc4_4fix autoreconf --install chmod a-x app/simspark/rsg/agent/nao/* find -name "*.cpp" -exec chmod a-x {} \; @@ -171,6 +173,9 @@ %endif %changelog +* Sun Mar 01 2009 Hedayat Vatankhah 0.6-10 +- Added patch for gcc 4.4 compatibility + * Wed Feb 25 2009 Fedora Release Engineering - 0.6-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ndim at fedoraproject.org Sun Mar 1 18:43:24 2009 From: ndim at fedoraproject.org (Hans Ulrich Niedermann) Date: Sun, 1 Mar 2009 18:43:24 +0000 (UTC) Subject: rpms/nted/devel nted-1.5.0-disable-translated-docs.patch, NONE, 1.1 nted.spec, 1.14, 1.15 Message-ID: <20090301184324.233DC70115@cvs1.fedora.phx.redhat.com> Author: ndim Update of /cvs/pkgs/rpms/nted/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25403 Modified Files: nted.spec Added Files: nted-1.5.0-disable-translated-docs.patch Log Message: * Sat Feb 28 2009 Hans Ulrich Niedermann - 1.5.0-4 - Add (disabled) workaround for broken po2xml (would remove translated docs) nted-1.5.0-disable-translated-docs.patch: --- NEW FILE nted-1.5.0-disable-translated-docs.patch --- --- nted-1.5.0/doc/Makefile.in.orig 2009-02-28 11:42:49.000000000 +0100 +++ nted-1.5.0/doc/Makefile.in 2009-02-28 11:43:11.000000000 +0100 @@ -208,7 +208,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = templates docimages en de it +SUBDIRS = templates docimages en all: all-recursive .SUFFIXES: Index: nted.spec =================================================================== RCS file: /cvs/pkgs/rpms/nted/devel/nted.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- nted.spec 26 Feb 2009 13:49:08 -0000 1.14 +++ nted.spec 1 Mar 2009 18:42:53 -0000 1.15 @@ -4,9 +4,13 @@ # ntedfont is a special purpose symbol font, and thus needs # no fontconfig magic. +# Whether to work around broken po2xml/qt +#global broken_po2xml 1 +%global broken_po2xml 0 + Name: nted Version: 1.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Musical score editor Summary(de): Partitureditor @@ -18,6 +22,9 @@ Source0: http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted-%{version}.tar.gz Source1: nted.desktop #Source2: %{name}-%{family}-fontconfig.conf +%if %{broken_po2xml} +Patch10: nted-1.5.0-disable-translated-docs.patch +%endif BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: gtk2-devel alsa-lib-devel @@ -65,6 +72,9 @@ %prep %setup -q +%if %{broken_po2xml} +%patch10 -p1 -b .disable-translated-docs +%endif # Upstream mistakenly ships a header file with its x bit set. test -x dynarray.h # make sure we notice when upstream fixes that chmod -x dynarray.h @@ -120,6 +130,9 @@ %changelog +* Sat Feb 28 2009 Hans Ulrich Niedermann - 1.5.0-4 +- Add (disabled) workaround for broken po2xml (would remove translated docs) + * Thu Feb 26 2009 Hans Ulrich Niedermann - 1.5.0-3 - noarch subpackage for doc - use versioned requirements for subpackages From jspaleta at fedoraproject.org Sun Mar 1 19:03:05 2009 From: jspaleta at fedoraproject.org (Jef Spaleta) Date: Sun, 1 Mar 2009 19:03:05 +0000 (UTC) Subject: rpms/ScientificPython/devel .cvsignore, 1.3, 1.4 ScientificPython.spec, 1.14, 1.15 sources, 1.3, 1.4 Message-ID: <20090301190305.98BF770115@cvs1.fedora.phx.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/ScientificPython/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28901 Modified Files: .cvsignore ScientificPython.spec sources Log Message: * Sun Mar 1 2009 Jef Spaleta - 2.8-1 - Latest upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ScientificPython/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Jul 2008 17:30:35 -0000 1.3 +++ .cvsignore 1 Mar 2009 19:02:34 -0000 1.4 @@ -1 +1 @@ -ScientificPython-2.6.1.tar.gz +ScientificPython-2.8.tar.gz Index: ScientificPython.spec =================================================================== RCS file: /cvs/pkgs/rpms/ScientificPython/devel/ScientificPython.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ScientificPython.spec 23 Feb 2009 23:29:55 -0000 1.14 +++ ScientificPython.spec 1 Mar 2009 19:02:34 -0000 1.15 @@ -2,14 +2,14 @@ %define pyver %(python -c 'import sys ; print sys.version[:3]') Name: ScientificPython -Version: 2.6.1 -Release: 6%{?dist} +Version: 2.8 +Release: 1%{?dist} Summary: A collection of Python modules that are useful for scientific computing Group: Development/Languages License: CeCILL URL: http://dirac.cnrs-orleans.fr/ScientificPython/ -Source0: http://sourcesup.cru.fr/frs/download.php/1034/ScientificPython-2.6.1.tar.gz +Source0: http://sourcesup.cru.fr/frs/download.php/1034/ScientificPython-%{version}.tar.gz Patch0: ScientificPython-2.6.1-netcdf-64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,7 @@ %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +export PYTHONPATH="$PYTHONPATH:$RPM_BUILD_ROOT/%{python_sitearch}/" export PYINCLUDE="$RPM_BUILD_ROOT/%{_includedir}/python%{pyver}/" #cp -R %{_includedir}/python%{pyver}/* $PYINCLUDE cd Src/MPI/ @@ -112,7 +113,7 @@ %files %defattr(-,root,root,-) -%doc LICENSE README Doc/CHANGELOG README.MPI README.BSP README.BSPlib Src/MPI/impipython.sh +%doc LICENSE README Doc/CHANGELOG README.MPI README.BSP Src/MPI/impipython.sh %dir %{python_sitearch}/Scientific/ %{python_sitearch}/Scientific/*.py* %{python_sitearch}/Scientific/Functions @@ -123,13 +124,16 @@ %{python_sitearch}/Scientific/Signals %{python_sitearch}/Scientific/Statistics %{python_sitearch}/Scientific/Threading -%{python_sitearch}/Scientific/use_numeric +#%{python_sitearch}/Scientific/use_numeric %{python_sitearch}/Scientific/Visualization %{python_sitearch}/Scientific/MPI %{python_sitearch}/Scientific/BSP +%{python_sitearch}/Scientific/Clustering +%{python_sitearch}/Scientific/DistributedComputing %{python_sitearch}/*.egg-info %{_bindir}/bsp_virtual %{_bindir}/mpipython +%{_bindir}/task_manager %files devel %defattr(-,root,root,-) @@ -150,6 +154,9 @@ %doc Doc/Reference Examples Doc/BSP_Tutorial.pdf %changelog +* Sun Mar 1 2009 Jef Spaleta - 2.8-1 +- Latest upstream release + * Mon Feb 23 2009 Fedora Release Engineering - 2.6.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ScientificPython/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Jul 2008 17:30:35 -0000 1.3 +++ sources 1 Mar 2009 19:02:34 -0000 1.4 @@ -1 +1 @@ -1b93026dd02529607131e5b0b83aeec4 ScientificPython-2.6.1.tar.gz +82d8592635d6ae8608b3073dacf9e694 ScientificPython-2.8.tar.gz From caolanm at fedoraproject.org Sun Mar 1 19:49:28 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sun, 1 Mar 2009 19:49:28 +0000 (UTC) Subject: rpms/torcs/devel torcs-1.3.0-consts.patch, NONE, 1.1 torcs.spec, 1.22, 1.23 Message-ID: <20090301194928.A954770115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/torcs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5036 Modified Files: torcs.spec Added Files: torcs-1.3.0-consts.patch Log Message: constify ret of strchr(const *char) torcs-1.3.0-consts.patch: --- NEW FILE torcs-1.3.0-consts.patch --- diff -ru torcs-1.3.0.orig/src/modules/graphic/ssggraph/grtexture.cpp torcs-1.3.0/src/modules/graphic/ssggraph/grtexture.cpp --- torcs-1.3.0.orig/src/modules/graphic/ssggraph/grtexture.cpp 2009-03-01 17:47:41.000000000 +0000 +++ torcs-1.3.0/src/modules/graphic/ssggraph/grtexture.cpp 2009-03-01 17:49:30.000000000 +0000 @@ -48,13 +48,13 @@ if (mipmap == TRUE) { // Check the shadow. - s = strrchr(tfname, '/'); - if (s == NULL) { - s = (char *) tfname; + const char *s2 = strrchr(tfname, '/'); + if (s2 == NULL) { + s2 = tfname; } else { - s++; + s2++; } - if (strstr(s, "shadow") != NULL) { + if (strstr(s2, "shadow") != NULL) { mipmap = FALSE; } } diff -ru torcs-1.3.0.orig/src/tools/trackgen/objects.cpp torcs-1.3.0/src/tools/trackgen/objects.cpp --- torcs-1.3.0.orig/src/tools/trackgen/objects.cpp 2009-03-01 17:47:41.000000000 +0000 +++ torcs-1.3.0/src/tools/trackgen/objects.cpp 2009-03-01 17:58:46.000000000 +0000 @@ -273,7 +273,7 @@ if ((tfname != NULL) && (tfname[0] != 0)) { if (writeTextureWithoutPath) { - char *s = strrchr (tfname, '\\'); + const char *s = strrchr (tfname, '\\'); if (s == NULL) { s = strrchr (tfname, '/'); Index: torcs.spec =================================================================== RCS file: /cvs/pkgs/rpms/torcs/devel/torcs.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- torcs.spec 25 Feb 2009 21:23:24 -0000 1.22 +++ torcs.spec 1 Mar 2009 19:48:56 -0000 1.23 @@ -1,7 +1,7 @@ Summary: The Open Racing Car Simulator Name: torcs Version: 1.3.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: Amusements/Games URL: http://torcs.org/ @@ -12,6 +12,7 @@ Source4: http://downloads.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz Patch0: torcs-1.2.4-freealutfix.patch Patch1: torcs-1.3.0-gcc43.patch +Patch2: torcs-1.3.0-consts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: torcs-data, torcs-data-tracks-road, torcs-data-cars-extra Requires: opengl-games-utils @@ -46,6 +47,7 @@ %{__mv} %{name}-%{version}/src/drivers/* src/drivers/ %patch0 -p1 -b .freealutfix %patch1 -p1 -b .gcc43 +%patch2 -p1 -b .consts %build @@ -161,6 +163,9 @@ %changelog +* Sun Mar 01 2009 Caol??n McNamara - 1.3.0-10 +- constify ret of strchr(const *char) + * Wed Feb 25 2009 Fedora Release Engineering - 1.3.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From gemi at fedoraproject.org Sun Mar 1 20:02:40 2009 From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=) Date: Sun, 1 Mar 2009 20:02:40 +0000 (UTC) Subject: rpms/clisp/devel clisp.spec,1.38,1.39 Message-ID: <20090301200240.B67CD70115@cvs1.fedora.phx.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/clisp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7844 Modified Files: clisp.spec Log Message: Index: clisp.spec =================================================================== RCS file: /cvs/pkgs/rpms/clisp/devel/clisp.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- clisp.spec 24 Feb 2009 07:53:03 -0000 1.38 +++ clisp.spec 1 Mar 2009 20:02:09 -0000 1.39 @@ -7,6 +7,7 @@ License: GPLv2 URL: http://clisp.cons.org Source: http://download.sourceforge.net/clisp/clisp-%{version}.tar.bz2 +Patch0: clisp-2.47-cpp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: imake BuildRequires: libsigsegv-devel @@ -70,6 +71,7 @@ %prep %setup -q +%patch0 -p1 -b .cpp sed -i 's|http://www.lisp.org/HyperSpec/|http://www.lispworks.com/documentation/HyperSpec/|g' \ doc/* src/*.d src/*.lisp From s4504kr at fedoraproject.org Sun Mar 1 20:02:51 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Sun, 1 Mar 2009 20:02:51 +0000 (UTC) Subject: rpms/subcommander/devel subcommander.desktop, 1.1, 1.2 subcommander.spec, 1.22, 1.23 submerge.desktop, 1.1, 1.2 Message-ID: <20090301200251.ACB6570115@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/subcommander/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7905 Modified Files: subcommander.desktop subcommander.spec submerge.desktop Log Message: fix desktop file Index: subcommander.desktop =================================================================== RCS file: /cvs/extras/rpms/subcommander/devel/subcommander.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- subcommander.desktop 20 Jun 2007 15:06:35 -0000 1.1 +++ subcommander.desktop 1 Mar 2009 20:02:21 -0000 1.2 @@ -3,9 +3,9 @@ Name=Subcommander Comment=Graphical Subversion Client Exec=subcommander -Icon=subcommander.png +Icon=subcommander Terminal=false StartupNotify=true Type=Application -Categories=Development; +Categories=Development;Qt;RevisionControl; Version=1.0 \ No newline at end of file Index: subcommander.spec =================================================================== RCS file: /cvs/extras/rpms/subcommander/devel/subcommander.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- subcommander.spec 26 Feb 2009 03:28:15 -0000 1.22 +++ subcommander.spec 1 Mar 2009 20:02:21 -0000 1.23 @@ -2,7 +2,7 @@ Name: subcommander Version: 1.9.94 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Graphical UI for subversion Group: Development/Tools @@ -85,6 +85,9 @@ %doc README CHANGES COPYING %changelog +* Sun Mar 1 2009 Jochen Schmitt 1.9.94-6 +- Fix desktop file (BZ #487869) + * Wed Feb 25 2009 Fedora Release Engineering - 1.9.94-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: submerge.desktop =================================================================== RCS file: /cvs/extras/rpms/subcommander/devel/submerge.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- submerge.desktop 20 Jun 2007 15:06:35 -0000 1.1 +++ submerge.desktop 1 Mar 2009 20:02:21 -0000 1.2 @@ -3,10 +3,10 @@ Name=Submerge Comment=Graphical Subversion Diff Tool Exec=submerge -Icon=subcommander.png +Icon=subcommander Terminal=false StartupNotify=true Type=Application -Categories=Development; +Categories=Development;Qt;RevisionControl; Version=1.0 From gemi at fedoraproject.org Sun Mar 1 20:06:12 2009 From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=) Date: Sun, 1 Mar 2009 20:06:12 +0000 (UTC) Subject: rpms/clisp/devel clisp-2.47-cpp.patch, NONE, 1.1 clisp.spec, 1.39, 1.40 Message-ID: <20090301200612.618F770115@cvs1.fedora.phx.redhat.com> Author: gemi Update of /cvs/pkgs/rpms/clisp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8764 Modified Files: clisp.spec Added Files: clisp-2.47-cpp.patch Log Message: clisp-2.47-cpp.patch: --- NEW FILE clisp-2.47-cpp.patch --- diff -up clisp-2.47/modules/libsvm/svm.cpp clisp-2.47/modules/libsvm/svm diff -up clisp-2.47/src/time.d.cpp clisp-2.47/src/time.d --- clisp-2.47/src/time.d.cpp 2009-03-01 20:14:24.000000000 +0100 +++ clisp-2.47/src/time.d 2009-03-01 20:14:46.000000000 +0100 @@ -302,7 +302,7 @@ global object internal_time_to_I (const #ifdef TIME_WIN32 return L2_to_I(tp->dwHighDateTime,tp->dwLowDateTime); #endif -#elif TIME_METHOD = 1 +#elif TIME_METHOD == 1 return UL_to_I(*tp); #else #error internal_time_to_I: invalid TIME_METHOD Index: clisp.spec =================================================================== RCS file: /cvs/pkgs/rpms/clisp/devel/clisp.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- clisp.spec 1 Mar 2009 20:02:09 -0000 1.39 +++ clisp.spec 1 Mar 2009 20:06:11 -0000 1.40 @@ -1,7 +1,7 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.47 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: GPLv2 From robert at fedoraproject.org Sun Mar 1 20:14:44 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 1 Mar 2009 20:14:44 +0000 (UTC) Subject: rpms/psi/devel psi.spec,1.25,1.26 Message-ID: <20090301201444.66DD470115@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/psi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10491 Modified Files: psi.spec Log Message: Added missing build requirement to glib2-devel Index: psi.spec =================================================================== RCS file: /cvs/pkgs/rpms/psi/devel/psi.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- psi.spec 27 Feb 2009 02:43:43 -0000 1.25 +++ psi.spec 1 Mar 2009 20:14:13 -0000 1.26 @@ -1,6 +1,6 @@ Name: psi Version: 0.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Jabber client based on Qt License: GPLv2+ Group: Applications/Internet @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel, zlib-devel, desktop-file-utils -BuildRequires: qca2-devel +BuildRequires: qca2-devel, glib2-devel BuildRequires: aspell-devel, libXScrnSaver-devel Requires(hint): sox @@ -141,6 +141,9 @@ %changelog +* Sun Mar 01 2009 Robert Scheck 0.12-3 +- Added missing build requirement to glib2-devel + * Thu Feb 26 2009 Fedora Release Engineering - 0.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From chkr at fedoraproject.org Sun Mar 1 20:15:16 2009 From: chkr at fedoraproject.org (Christian Krause) Date: Sun, 1 Mar 2009 20:15:16 +0000 (UTC) Subject: rpms/anki/devel anki-0.9.9.6-noupdate.patch, NONE, 1.1 anki-0.9.9.6-unihaninstall.patch, NONE, 1.1 anki.spec, NONE, 1.1 generate-anki-tarball.sh, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301201516.D584F70115@cvs1.fedora.phx.redhat.com> Author: chkr Update of /cvs/pkgs/rpms/anki/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10169/devel Modified Files: .cvsignore sources Added Files: anki-0.9.9.6-noupdate.patch anki-0.9.9.6-unihaninstall.patch anki.spec generate-anki-tarball.sh import.log Log Message: - initial import of anki 0.9.9.6 anki-0.9.9.6-noupdate.patch: --- NEW FILE anki-0.9.9.6-noupdate.patch --- diff -uNr anki-0.9.9.6.old/ankiqt/config.py anki-0.9.9.6/ankiqt/config.py --- anki-0.9.9.6.old/ankiqt/config.py 2009-01-21 14:53:21.000000000 +0100 +++ anki-0.9.9.6/ankiqt/config.py 2009-02-11 23:18:16.000000000 +0100 @@ -44,7 +44,7 @@ 'iconSize': 32, 'syncOnLoad': False, 'syncOnClose': False, - 'checkForUpdates': True, + 'checkForUpdates': False, 'interfaceLang': "", 'syncUsername': "", 'syncPassword': "", anki-0.9.9.6-unihaninstall.patch: --- NEW FILE anki-0.9.9.6-unihaninstall.patch --- diff -uNr anki-0.9.9.6.old/libanki/setup.py anki-0.9.9.6/libanki/setup.py --- anki-0.9.9.6.old/libanki/setup.py 2009-01-21 14:51:33.000000000 +0100 +++ anki-0.9.9.6/libanki/setup.py 2009-02-13 22:14:15.000000000 +0100 @@ -25,8 +25,8 @@ url='http://ichi2.net/anki/index.html', license='GPLv3', packages=["anki", "anki.features", "anki.features.chinese", "anki.importing"], - package_data={'anki': - ['samples/*','locale/*/*/*']}, + package_data={'anki': ['samples/*','locale/*/*/*'], + 'anki.features.chinese': ['unihan.db']}, include_package_data=True, zip_safe=False, install_requires=[ --- NEW FILE anki.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: anki Version: 0.9.9.6 Release: 3%{?dist} Summary: Flashcard program for using space repetition learning Group: Amusements/Games # the file anki-%{version}/libanki/anki/features/chinese/unihan.db # was created out of Unihan.txt from www.unicode.org (MIT license) License: GPLv3+ and MIT URL: http://www.ichi2.net/anki Source0: %{name}-%{version}-nosamples.tgz # anki contains a sample with an unclear license # this script to remove all samples since they are not installed anyway # Download the upstream tarball and invoke this script while in the # tarball's directory: # ./generate-anki-tarball.sh 0.9.9.6 # upstream tarball: http://ichi2.net/anki/download/%{name}-%{version}.tgz Source1: generate-anki-tarball.sh # Config change: don't check for new updates. Patch0: anki-0.9.9.6-noupdate.patch # install issue tracked upstream: # http://code.google.com/p/anki/issues/detail?id=561 Patch1: anki-0.9.9.6-unihaninstall.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, python-setuptools, python-sqlalchemy BuildRequires: PyQt4-devel BuildRequires: desktop-file-utils Requires: qt4, PyQt4 Requires: python-sqlalchemy, python-simplejson, python-sqlite2 Requires: numpy Requires: pygame BuildArch: noarch %description Anki is a program designed to help you remember facts (such as words and phrases in a foreign language) as easily, quickly and efficiently as possible. Anki is based on a theory called spaced repetition. %prep %setup -q %patch0 -p1 -b .noupdate %patch1 -p1 -b .unihaninstall %build pushd libanki %{__python} setup.py build popd %{__python} setup.py build %install rm -rf %{buildroot} pushd libanki %{__python} setup.py install -O1 --skip-build --root %{buildroot} popd %{__python} setup.py install -O1 --skip-build --root %{buildroot} install -d %{buildroot}%{_datadir}/applications desktop-file-install \ --remove-category=KDE \ --dir %{buildroot}%{_datadir}/applications \ %{name}.desktop install -d %{buildroot}%{_datadir}/pixmaps install -m 644 icons/anki.png %{buildroot}%{_datadir}/pixmaps/ %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc COPYING ChangeLog CREDITS README* # libankiqt %dir %{python_sitelib}/ankiqt %{python_sitelib}/ankiqt/*.py* %{python_sitelib}/ankiqt/ui %{python_sitelib}/ankiqt/forms # libanki %dir %{python_sitelib}/anki %{python_sitelib}/anki/*.py* %{python_sitelib}/anki/importing %{python_sitelib}/anki/features # locale %dir %{python_sitelib}/ankiqt/locale/ %dir %{python_sitelib}/anki/locale/ %lang(cs) %{python_sitelib}/*/locale/cs_*/ %lang(de) %{python_sitelib}/*/locale/de_*/ %lang(es) %{python_sitelib}/*/locale/es_*/ %lang(fi) %{python_sitelib}/*/locale/fi_*/ %lang(fr) %{python_sitelib}/*/locale/fr_*/ %lang(it) %{python_sitelib}/*/locale/it_*/ %lang(ja) %{python_sitelib}/*/locale/ja_*/ %lang(ko) %{python_sitelib}/*/locale/ko_*/ %lang(pl) %{python_sitelib}/*/locale/pl_*/ %lang(zh) %{python_sitelib}/anki/locale/zh_*/ %{python_sitelib}/*egg-info %{_bindir}/anki %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog * Fri Feb 27 2009 Christian Krause - 0.9.9.6-3 - proper packaging of locale files * Fri Feb 13 2009 Christian Krause - 0.9.9.6-2 - Fixed license field - Install unihan.db * Wed Feb 11 2009 Christian Krause - 0.9.9.6-1 - First spec file for anki. --- NEW FILE generate-anki-tarball.sh --- #!/bin/sh VERSION=$1 tar -xzvf anki-$VERSION.tgz rm -rf anki-$VERSION/libanki/samples tar -czvf anki-$VERSION-nosamples.tgz anki-$VERSION --- NEW FILE import.log --- anki-0_9_9_6-3_fc10:HEAD:anki-0.9.9.6-3.fc10.src.rpm:1235938285 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anki/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:28:33 -0000 1.1 +++ .cvsignore 1 Mar 2009 20:14:46 -0000 1.2 @@ -0,0 +1 @@ +anki-0.9.9.6-nosamples.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anki/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:28:33 -0000 1.1 +++ sources 1 Mar 2009 20:14:46 -0000 1.2 @@ -0,0 +1 @@ +0f029c744c849a5e2ca7f95df119c59f anki-0.9.9.6-nosamples.tgz From pkgdb at fedoraproject.org Sun Mar 1 20:18:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 20:18:44 +0000 Subject: [pkgdb] dates ownership updated Message-ID: <20090301201906.90A49208480@bastion.fedora.phx.redhat.com> Package dates in Fedora devel is now owned by denis To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dates From pkgdb at fedoraproject.org Sun Mar 1 20:19:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 20:19:12 +0000 Subject: [pkgdb] dates ownership updated Message-ID: <20090301201912.6009C2084D1@bastion.fedora.phx.redhat.com> Package dates in Fedora 9 is now owned by denis To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dates From pkgdb at fedoraproject.org Sun Mar 1 20:19:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 20:19:18 +0000 Subject: [pkgdb] dates ownership updated Message-ID: <20090301201918.8A252208201@bastion.fedora.phx.redhat.com> Package dates in Fedora 10 is now owned by denis To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dates From cwickert at fedoraproject.org Sun Mar 1 20:20:36 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Sun, 1 Mar 2009 20:20:36 +0000 (UTC) Subject: rpms/emelfm2/devel emelfm2.spec,1.33,1.34 Message-ID: <20090301202036.5198D70115@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/emelfm2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11703 Modified Files: emelfm2.spec Log Message: fix x86_64 build error Index: emelfm2.spec =================================================================== RCS file: /cvs/pkgs/rpms/emelfm2/devel/emelfm2.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- emelfm2.spec 1 Mar 2009 17:53:53 -0000 1.33 +++ emelfm2.spec 1 Mar 2009 20:20:05 -0000 1.34 @@ -34,9 +34,6 @@ %setup -q %patch0 -p0 -b .docdir -# fix for x86_64 libs -sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)!' Makefile - # fix broken icon in emelfm2.desktop sed -i 's!Icon=emelfm2!Icon=%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop @@ -46,6 +43,7 @@ OPTIMIZE="${RPM_OPT_FLAGS}" \ CFLAGS="${RPM_OPT_FLAGS}" \ PREFIX="%{_prefix}" \ + PLUGINS_DIR="%{_libdir}/%{name}/plugins" DOCS_VERSION=1 \ WITH_TRANSPARENCY=1 \ WITH_KERNELFAM=1 \ @@ -59,8 +57,10 @@ %install rm -rf $RPM_BUILD_ROOT -make install DOCS_VERSION=1 PREFIX=$RPM_BUILD_ROOT%{_prefix} -make install_i18n DOCS_VERSION=1 PREFIX=$RPM_BUILD_ROOT%{_prefix} +make install install_i18n \ + DOCS_VERSION=1 \ + PREFIX=$RPM_BUILD_ROOT%{_prefix} \ + PLUGINS_DIR="$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins" %find_lang %{name} From chkr at fedoraproject.org Sun Mar 1 20:28:25 2009 From: chkr at fedoraproject.org (Christian Krause) Date: Sun, 1 Mar 2009 20:28:25 +0000 (UTC) Subject: rpms/anki/devel anki.spec,1.1,1.2 Message-ID: <20090301202825.7F22870115@cvs1.fedora.phx.redhat.com> Author: chkr Update of /cvs/pkgs/rpms/anki/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13768 Modified Files: anki.spec Log Message: change email address Index: anki.spec =================================================================== RCS file: /cvs/pkgs/rpms/anki/devel/anki.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- anki.spec 1 Mar 2009 20:14:46 -0000 1.1 +++ anki.spec 1 Mar 2009 20:27:55 -0000 1.2 @@ -107,12 +107,12 @@ %{_datadir}/pixmaps/%{name}.png %changelog -* Fri Feb 27 2009 Christian Krause - 0.9.9.6-3 -- proper packaging of locale files +* Fri Feb 27 2009 Christian Krause - 0.9.9.6-3 +- Proper packaging of locale files -* Fri Feb 13 2009 Christian Krause - 0.9.9.6-2 +* Fri Feb 13 2009 Christian Krause - 0.9.9.6-2 - Fixed license field - Install unihan.db -* Wed Feb 11 2009 Christian Krause - 0.9.9.6-1 -- First spec file for anki. +* Wed Feb 11 2009 Christian Krause - 0.9.9.6-1 +- First spec file for anki From chkr at fedoraproject.org Sun Mar 1 20:36:32 2009 From: chkr at fedoraproject.org (Christian Krause) Date: Sun, 1 Mar 2009 20:36:32 +0000 (UTC) Subject: rpms/anki/devel anki.spec,1.2,1.3 Message-ID: <20090301203632.4ED4770115@cvs1.fedora.phx.redhat.com> Author: chkr Update of /cvs/pkgs/rpms/anki/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15238 Modified Files: anki.spec Log Message: bump version Index: anki.spec =================================================================== RCS file: /cvs/pkgs/rpms/anki/devel/anki.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- anki.spec 1 Mar 2009 20:27:55 -0000 1.2 +++ anki.spec 1 Mar 2009 20:36:01 -0000 1.3 @@ -2,7 +2,7 @@ Name: anki Version: 0.9.9.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Flashcard program for using space repetition learning Group: Amusements/Games @@ -107,6 +107,9 @@ %{_datadir}/pixmaps/%{name}.png %changelog +* Sun Mar 01 2009 Christian Krause - 0.9.9.6-4 +- Bump release + * Fri Feb 27 2009 Christian Krause - 0.9.9.6-3 - Proper packaging of locale files From ausil at fedoraproject.org Sun Mar 1 20:49:11 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Sun, 1 Mar 2009 20:49:11 +0000 (UTC) Subject: rpms/mock/devel 0001-default-build-arch-to-i586-for-rawhide-to-match-fedo.patch, NONE, 1.1 mock.spec, 1.72, 1.73 Message-ID: <20090301204911.DACEF70115@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/mock/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17137 Modified Files: mock.spec Added Files: 0001-default-build-arch-to-i586-for-rawhide-to-match-fedo.patch Log Message: default rawhide i386 builds to build i586 0001-default-build-arch-to-i586-for-rawhide-to-match-fedo.patch: --- NEW FILE 0001-default-build-arch-to-i586-for-rawhide-to-match-fedo.patch --- >From b081dc27156a125a123fdefe901588cde728f68d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 1 Mar 2009 14:42:04 -0600 Subject: [PATCH] default build arch to i586 for rawhide to match fedora --- etc/mock/fedora-rawhide-i386.cfg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/mock/fedora-rawhide-i386.cfg b/etc/mock/fedora-rawhide-i386.cfg index 8924ab6..c686718 100644 --- a/etc/mock/fedora-rawhide-i386.cfg +++ b/etc/mock/fedora-rawhide-i386.cfg @@ -1,7 +1,7 @@ config_opts['root'] = 'fedora-rawhide-i386' -config_opts['target_arch'] = 'i386' +config_opts['target_arch'] = 'i586' config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc10' # only useful for --resultdir variable subst +config_opts['dist'] = 'fc11' # only useful for --resultdir variable subst config_opts['yum.conf'] = """ [main] -- 1.6.1.3 Index: mock.spec =================================================================== RCS file: /cvs/pkgs/rpms/mock/devel/mock.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- mock.spec 26 Feb 2009 01:50:24 -0000 1.72 +++ mock.spec 1 Mar 2009 20:48:41 -0000 1.73 @@ -11,10 +11,11 @@ Summary: Builds packages inside chroots Name: mock Version: %{release_version} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Development/Tools Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz +Patch0: 0001-default-build-arch-to-i586-for-rawhide-to-match-fedo.patch URL: http://fedoraproject.org/wiki/Projects/Mock BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -27,6 +28,7 @@ %prep %setup -q +%patch0 -p1 %if "%{?dist}" == ".fc8" pushd etc/mock sed -i -e 's/^#exclude=/exclude=/' -e '/^# The above is not/d' \ @@ -97,6 +99,9 @@ %attr(02775, root, mock) %dir /var/cache/mock %changelog +* Wed Feb 29 2009 Dennis Gilmore - 0.9.14-3 +- add patch defaulting i386 to build i586 on rawhide + * Wed Feb 25 2009 Fedora Release Engineering - 0.9.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rdieter at fedoraproject.org Sun Mar 1 20:52:50 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sun, 1 Mar 2009 20:52:50 +0000 (UTC) Subject: rpms/qt/devel qt.spec,1.240,1.241 Message-ID: <20090301205250.77A4D70115@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17958 Modified Files: qt.spec Log Message: try to workaround snapshot "can't find libQtXml.so.4" in docs generation Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.240 retrieving revision 1.241 diff -u -r1.240 -r1.241 --- qt.spec 27 Feb 2009 20:23:43 -0000 1.240 +++ qt.spec 1 Mar 2009 20:52:19 -0000 1.241 @@ -5,7 +5,7 @@ # configure options # -no-pch disables precompiled headers, make ccache-friendly -%define no_pch -no-pch +#define no_pch -no-pch Summary: Qt toolkit %if 0%{?fedora} > 8 @@ -370,6 +370,11 @@ %build +# workaround snapshot "can't find libQtXml.so.4" in docs generation +#if 0%{?snap:1} +export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" +#endif + # build shared, threaded (default) libraries ./configure -v \ -confirm-license \ From pkgdb at fedoraproject.org Sun Mar 1 20:58:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 20:58:51 +0000 Subject: [pkgdb] reinteract had acl change status Message-ID: <20090301205851.B4BF42084BA@bastion.fedora.phx.redhat.com> otaylor has set the watchbugzilla acl on reinteract (Fedora devel) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/reinteract From pkgdb at fedoraproject.org Sun Mar 1 20:58:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 20:58:33 +0000 Subject: [pkgdb] reinteract had acl change status Message-ID: <20090301205855.8D3912084D1@bastion.fedora.phx.redhat.com> otaylor has set the watchcommits acl on reinteract (Fedora devel) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/reinteract From pkgdb at fedoraproject.org Sun Mar 1 20:59:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 20:59:00 +0000 Subject: [pkgdb] reinteract had acl change status Message-ID: <20090301205900.73C2720851E@bastion.fedora.phx.redhat.com> otaylor has set the watchbugzilla acl on reinteract (Fedora 9) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/reinteract From pkgdb at fedoraproject.org Sun Mar 1 20:58:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 20:58:34 +0000 Subject: [pkgdb] reinteract had acl change status Message-ID: <20090301205855.D1F4820851A@bastion.fedora.phx.redhat.com> otaylor has set the commit acl on reinteract (Fedora devel) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/reinteract From pkgdb at fedoraproject.org Sun Mar 1 20:58:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 20:58:41 +0000 Subject: [pkgdb] reinteract had acl change status Message-ID: <20090301205903.D0CC72084BA@bastion.fedora.phx.redhat.com> otaylor has set the watchcommits acl on reinteract (Fedora 9) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/reinteract From pkgdb at fedoraproject.org Sun Mar 1 20:58:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 20:58:37 +0000 Subject: [pkgdb] reinteract had acl change status Message-ID: <20090301205904.34FF0208525@bastion.fedora.phx.redhat.com> otaylor has set the commit acl on reinteract (Fedora 9) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/reinteract From pkgdb at fedoraproject.org Sun Mar 1 20:59:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 20:59:09 +0000 Subject: [pkgdb] reinteract had acl change status Message-ID: <20090301205909.292A9208528@bastion.fedora.phx.redhat.com> otaylor has set the watchbugzilla acl on reinteract (Fedora 10) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/reinteract From pkgdb at fedoraproject.org Sun Mar 1 20:59:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 20:59:10 +0000 Subject: [pkgdb] reinteract had acl change status Message-ID: <20090301205910.1C3E820852B@bastion.fedora.phx.redhat.com> otaylor has set the watchcommits acl on reinteract (Fedora 10) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/reinteract From pkgdb at fedoraproject.org Sun Mar 1 20:58:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 20:58:52 +0000 Subject: [pkgdb] reinteract had acl change status Message-ID: <20090301205914.0C80D20852E@bastion.fedora.phx.redhat.com> otaylor has set the commit acl on reinteract (Fedora 10) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/reinteract From pkgdb at fedoraproject.org Sun Mar 1 20:58:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 20:58:56 +0000 Subject: [pkgdb] reinteract had acl change status Message-ID: <20090301205923.9F2A42084D1@bastion.fedora.phx.redhat.com> otaylor has set the approveacls acl on reinteract (Fedora 10) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/reinteract From pkgdb at fedoraproject.org Sun Mar 1 20:59:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 20:59:26 +0000 Subject: [pkgdb] reinteract had acl change status Message-ID: <20090301205927.37C3220851A@bastion.fedora.phx.redhat.com> otaylor has set the approveacls acl on reinteract (Fedora 9) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/reinteract From pkgdb at fedoraproject.org Sun Mar 1 20:59:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Mar 2009 20:59:36 +0000 Subject: [pkgdb] reinteract had acl change status Message-ID: <20090301205936.5248720851E@bastion.fedora.phx.redhat.com> otaylor has set the approveacls acl on reinteract (Fedora devel) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/reinteract From than at fedoraproject.org Sun Mar 1 21:07:29 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 1 Mar 2009 21:07:29 +0000 (UTC) Subject: rpms/kdegraphics/devel .cvsignore,1.56,1.57 sources,1.63,1.64 Message-ID: <20090301210729.2CA7870115@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdegraphics/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21323 Modified Files: .cvsignore sources Log Message: 4.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/devel/.cvsignore,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- .cvsignore 27 Feb 2009 12:17:29 -0000 1.56 +++ .cvsignore 1 Mar 2009 21:06:58 -0000 1.57 @@ -4,3 +4,4 @@ kdegraphics-4.1.96.tar.bz2 kdegraphics-4.2.0.tar.bz2 kdelibs-4.2.1.tar.bz2 +kdegraphics-4.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/devel/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 27 Feb 2009 12:17:29 -0000 1.63 +++ sources 1 Mar 2009 21:06:58 -0000 1.64 @@ -1 +1 @@ -3ccc094df33db9d61f5ad065b9b857ac kdelibs-4.2.1.tar.bz2 +9cc2bc859e678aa6178a5c6cf87eb0ab kdegraphics-4.2.1.tar.bz2 From chkr at fedoraproject.org Sun Mar 1 21:22:27 2009 From: chkr at fedoraproject.org (Christian Krause) Date: Sun, 1 Mar 2009 21:22:27 +0000 (UTC) Subject: rpms/anki/F-10 anki-0.9.9.6-noupdate.patch, NONE, 1.1 anki-0.9.9.6-unihaninstall.patch, NONE, 1.1 anki.spec, NONE, 1.1 generate-anki-tarball.sh, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301212228.06E8B70115@cvs1.fedora.phx.redhat.com> Author: chkr Update of /cvs/pkgs/rpms/anki/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23694/F-10 Modified Files: .cvsignore sources Added Files: anki-0.9.9.6-noupdate.patch anki-0.9.9.6-unihaninstall.patch anki.spec generate-anki-tarball.sh import.log Log Message: - initial import of anki 0.9.9.6 anki-0.9.9.6-noupdate.patch: --- NEW FILE anki-0.9.9.6-noupdate.patch --- diff -uNr anki-0.9.9.6.old/ankiqt/config.py anki-0.9.9.6/ankiqt/config.py --- anki-0.9.9.6.old/ankiqt/config.py 2009-01-21 14:53:21.000000000 +0100 +++ anki-0.9.9.6/ankiqt/config.py 2009-02-11 23:18:16.000000000 +0100 @@ -44,7 +44,7 @@ 'iconSize': 32, 'syncOnLoad': False, 'syncOnClose': False, - 'checkForUpdates': True, + 'checkForUpdates': False, 'interfaceLang': "", 'syncUsername': "", 'syncPassword': "", anki-0.9.9.6-unihaninstall.patch: --- NEW FILE anki-0.9.9.6-unihaninstall.patch --- diff -uNr anki-0.9.9.6.old/libanki/setup.py anki-0.9.9.6/libanki/setup.py --- anki-0.9.9.6.old/libanki/setup.py 2009-01-21 14:51:33.000000000 +0100 +++ anki-0.9.9.6/libanki/setup.py 2009-02-13 22:14:15.000000000 +0100 @@ -25,8 +25,8 @@ url='http://ichi2.net/anki/index.html', license='GPLv3', packages=["anki", "anki.features", "anki.features.chinese", "anki.importing"], - package_data={'anki': - ['samples/*','locale/*/*/*']}, + package_data={'anki': ['samples/*','locale/*/*/*'], + 'anki.features.chinese': ['unihan.db']}, include_package_data=True, zip_safe=False, install_requires=[ --- NEW FILE anki.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: anki Version: 0.9.9.6 Release: 3%{?dist} Summary: Flashcard program for using space repetition learning Group: Amusements/Games # the file anki-%{version}/libanki/anki/features/chinese/unihan.db # was created out of Unihan.txt from www.unicode.org (MIT license) License: GPLv3+ and MIT URL: http://www.ichi2.net/anki Source0: %{name}-%{version}-nosamples.tgz # anki contains a sample with an unclear license # this script to remove all samples since they are not installed anyway # Download the upstream tarball and invoke this script while in the # tarball's directory: # ./generate-anki-tarball.sh 0.9.9.6 # upstream tarball: http://ichi2.net/anki/download/%{name}-%{version}.tgz Source1: generate-anki-tarball.sh # Config change: don't check for new updates. Patch0: anki-0.9.9.6-noupdate.patch # install issue tracked upstream: # http://code.google.com/p/anki/issues/detail?id=561 Patch1: anki-0.9.9.6-unihaninstall.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, python-setuptools, python-sqlalchemy BuildRequires: PyQt4-devel BuildRequires: desktop-file-utils Requires: qt4, PyQt4 Requires: python-sqlalchemy, python-simplejson, python-sqlite2 Requires: numpy Requires: pygame BuildArch: noarch %description Anki is a program designed to help you remember facts (such as words and phrases in a foreign language) as easily, quickly and efficiently as possible. Anki is based on a theory called spaced repetition. %prep %setup -q %patch0 -p1 -b .noupdate %patch1 -p1 -b .unihaninstall %build pushd libanki %{__python} setup.py build popd %{__python} setup.py build %install rm -rf %{buildroot} pushd libanki %{__python} setup.py install -O1 --skip-build --root %{buildroot} popd %{__python} setup.py install -O1 --skip-build --root %{buildroot} install -d %{buildroot}%{_datadir}/applications desktop-file-install \ --remove-category=KDE \ --dir %{buildroot}%{_datadir}/applications \ %{name}.desktop install -d %{buildroot}%{_datadir}/pixmaps install -m 644 icons/anki.png %{buildroot}%{_datadir}/pixmaps/ %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc COPYING ChangeLog CREDITS README* # libankiqt %dir %{python_sitelib}/ankiqt %{python_sitelib}/ankiqt/*.py* %{python_sitelib}/ankiqt/ui %{python_sitelib}/ankiqt/forms # libanki %dir %{python_sitelib}/anki %{python_sitelib}/anki/*.py* %{python_sitelib}/anki/importing %{python_sitelib}/anki/features # locale %dir %{python_sitelib}/ankiqt/locale/ %dir %{python_sitelib}/anki/locale/ %lang(cs) %{python_sitelib}/*/locale/cs_*/ %lang(de) %{python_sitelib}/*/locale/de_*/ %lang(es) %{python_sitelib}/*/locale/es_*/ %lang(fi) %{python_sitelib}/*/locale/fi_*/ %lang(fr) %{python_sitelib}/*/locale/fr_*/ %lang(it) %{python_sitelib}/*/locale/it_*/ %lang(ja) %{python_sitelib}/*/locale/ja_*/ %lang(ko) %{python_sitelib}/*/locale/ko_*/ %lang(pl) %{python_sitelib}/*/locale/pl_*/ %lang(zh) %{python_sitelib}/anki/locale/zh_*/ %{python_sitelib}/*egg-info %{_bindir}/anki %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog * Fri Feb 27 2009 Christian Krause - 0.9.9.6-3 - proper packaging of locale files * Fri Feb 13 2009 Christian Krause - 0.9.9.6-2 - Fixed license field - Install unihan.db * Wed Feb 11 2009 Christian Krause - 0.9.9.6-1 - First spec file for anki. --- NEW FILE generate-anki-tarball.sh --- #!/bin/sh VERSION=$1 tar -xzvf anki-$VERSION.tgz rm -rf anki-$VERSION/libanki/samples tar -czvf anki-$VERSION-nosamples.tgz anki-$VERSION --- NEW FILE import.log --- anki-0_9_9_6-3_fc10:F-10:anki-0.9.9.6-3.fc10.src.rpm:1235942369 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anki/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:28:33 -0000 1.1 +++ .cvsignore 1 Mar 2009 21:21:56 -0000 1.2 @@ -0,0 +1 @@ +anki-0.9.9.6-nosamples.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anki/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:28:33 -0000 1.1 +++ sources 1 Mar 2009 21:21:56 -0000 1.2 @@ -0,0 +1 @@ +0f029c744c849a5e2ca7f95df119c59f anki-0.9.9.6-nosamples.tgz From pwouters at fedoraproject.org Sun Mar 1 21:26:12 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Sun, 1 Mar 2009 21:26:12 +0000 (UTC) Subject: rpms/uml_utilities/devel import.log, NONE, 1.1 uml_utilities.spec, NONE, 1.1 uml_utilities_20070815-install.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301212612.76E6770116@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/uml_utilities/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24526/devel Modified Files: .cvsignore sources Added Files: import.log uml_utilities.spec uml_utilities_20070815-install.patch Log Message: Initial import of uml_utilities --- NEW FILE import.log --- uml_utilities-20070815-4_fc10:HEAD:uml_utilities-20070815-4.fc10.src.rpm:1235942650 --- NEW FILE uml_utilities.spec --- Name: uml_utilities Version: 20070815 Release: 4%{?dist} License: GPL+ URL: http://user-mode-linux.sourceforge.net/index.html Source0: http://user-mode-linux.sourceforge.net/%{name}_%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fuse-devel, readline-devel Group: Applications/Internet Summary: Utilities for user-mode linux kernel # installation problem was reported upstream: # http://sourceforge.net/mailarchive/message.php?msg_name=47E16C87.8080705%40plauener.de Patch0: uml_utilities_20070815-install.patch %description This package contains the utilities for user-mode linux for networking, COW, etc. %prep %setup -q -n tools-%{version} %patch0 -p1 -b .install %build %{__make} CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT # Makefiles do hardcoded stripping, breaking debug package for mfile in */Makefile; do sed -i "s/install -s/install /" $mfile; done make install LIB_DIR=%{_libdir}/uml DESTDIR=$RPM_BUILD_ROOT # we need port-helper in the path mylib=`echo %{_libdir} | sed "s/\/usr//"` ln -s ..$mylib/uml/port-helper $RPM_BUILD_ROOT%{_bindir}/port-helper %files %defattr(-,root,root,-) %doc COPYING Changelog %attr(755,root,root) %dir %{_libdir}/uml %attr(4755,root,root) %{_bindir}/uml_net %{_bindir}/jailtest %{_bindir}/tunctl %{_bindir}/uml_mconsole %{_bindir}/uml_moo %{_bindir}/uml_switch %{_bindir}/uml_mkcow %{_bindir}/uml_watchdog %{_bindir}/port-helper %{_libdir}/uml/port-helper #%attr(755,root,root) %{_libdir}/uml/functions #%attr(755,root,root) %{_bindir}/mkrootfs #paul these were missing %{_bindir}/uml_mount %{_sbindir}/jail_uml %{_bindir}/humfsify %clean rm -rf ${RPM_BUILD_ROOT} %changelog * Fri Feb 27 2009 Christian Krause - 20070815-4 - use regular version tag - fixed license tag - updated Source0 URL - removed unneeded BuildRequirement * Sun Feb 15 2009 Christian Krause - 20070815-3 - fix install parameter - set LIB_DIR to fix installation on ppc64 - set CFLAGS to honor RPM_OPT_FLAGS * Sun Nov 2 2008 Paul Wouters - 20070815-2 - Added -q to setup * Sat Nov 1 2008 Paul Wouters - 20070815-1 - Was pointed to newer version of source at obscured location - Hack out hardcoded stripping of binaries - -D_FILE_OFFSET_BITS=64 no longer needed * Tue Oct 28 2008 Paul Wouters - 20060622-2 - Added a link to port-helper, so it is in the path * Fri Oct 24 2008 Paul Wouters - 20060622-1 - Initial package based on spec file in the sourcecode uml_utilities_20070815-install.patch: --- NEW FILE uml_utilities_20070815-install.patch --- diff -uNr tools-20070815.orig/humfsify/Makefile tools-20070815/humfsify/Makefile --- tools-20070815.orig/humfsify/Makefile 2006-05-25 20:37:01.000000000 +0200 +++ tools-20070815/humfsify/Makefile 2008-03-19 20:29:50.000000000 +0100 @@ -4,7 +4,7 @@ install: install -d $(DESTDIR)$(BIN_DIR) - install -o 0755 $(BIN) $(DESTDIR)$(BIN_DIR) + install -m 0755 $(BIN) $(DESTDIR)$(BIN_DIR) clean: rm -f *~ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uml_utilities/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:08:04 -0000 1.1 +++ .cvsignore 1 Mar 2009 21:26:11 -0000 1.2 @@ -0,0 +1 @@ +uml_utilities_20070815.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/uml_utilities/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:08:04 -0000 1.1 +++ sources 1 Mar 2009 21:26:11 -0000 1.2 @@ -0,0 +1 @@ +b0468ac8b79cef53f36f5f9517907462 uml_utilities_20070815.tar.bz2 From than at fedoraproject.org Sun Mar 1 21:28:54 2009 From: than at fedoraproject.org (Than Ngo) Date: Sun, 1 Mar 2009 21:28:54 +0000 (UTC) Subject: rpms/kde-l10n/devel kde-l10n.spec,1.73,1.74 Message-ID: <20090301212854.55E0970115@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kde-l10n/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25884 Modified Files: kde-l10n.spec Log Message: 4.2.1 Index: kde-l10n.spec =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- kde-l10n.spec 27 Feb 2009 13:52:52 -0000 1.73 +++ kde-l10n.spec 1 Mar 2009 21:28:23 -0000 1.74 @@ -62,7 +62,7 @@ Source50: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2 #Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2 Source52: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2 -SOurce53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-he-4.2.0.tar.bz2 +Source53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-he-%{version}.tar.bz2 Source1000: subdirs-kde-l10n From guthrie at fedoraproject.org Sun Mar 1 21:35:09 2009 From: guthrie at fedoraproject.org (John T. Guthrie III) Date: Sun, 1 Mar 2009 21:35:09 +0000 (UTC) Subject: rpms/simplyhtml/devel gpl.txt, NONE, 1.1 import.log, NONE, 1.1 readme.txt, NONE, 1.1 simplyhtml-ExampleFileFilter.patch, NONE, 1.1 simplyhtml-build_xml.patch, NONE, 1.1 simplyhtml.sh, NONE, 1.1 simplyhtml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090301213509.3C7C870115@cvs1.fedora.phx.redhat.com> Author: guthrie Update of /cvs/extras/rpms/simplyhtml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27257/devel Modified Files: .cvsignore sources Added Files: gpl.txt import.log readme.txt simplyhtml-ExampleFileFilter.patch simplyhtml-build_xml.patch simplyhtml.sh simplyhtml.spec Log Message: Initial import of simplyhtml into the devel tree. --- NEW FILE gpl.txt --- 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. Copyright (C) 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. , 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. --- NEW FILE import.log --- simplyhtml-0_12_5-5_fc10:HEAD:simplyhtml-0.12.5-5.fc10.src.rpm:1235943175 --- NEW FILE readme.txt --- SimplyHTML readme file stage 11, April 27, 2003 Copyright (c) 2002, 2003 Ulrich Hilger http://www.lightdev.com (see 'License' below) This file contains ------------------ About SimplyHTML Contents Installation Requirements Usage License About SimplyHTML ---------------- SimplyHTML is an application for text processing. It stores documents as HTML files in combination with Cascading Style Sheets (CSS). SimplyHTML is not intended to be used as an editor for web pages. The application combines text processing features as known from popular word processors with a simple and generic way of storing textual information and styles. Installation ------------ Once downloaded 1. create an arbitrary folder such as 'c:\Programs\SimplyHTML' 2. extract contents of the downloaded zip file into that folder Contents of the downloaded zip file can be restored by using one of the many applications capable to extract ZIP files. If you do not have such an application, you can use application Extractor available free at http://www.calcom.de/eng/product/xtract.htm Contents -------- The distribution package comes as a single compressed zip file. It contains SimplyHTML.jar........the executable file for the latest stage of SimplyHTML Help.pdf..............tutorial as PDF file readme.txt............this file gpl.txt...............the file containing the license agreement valid for all parts of the distribution package jhall.jar.............JavaHelp runtime extension source................source code directory doc...................directory with API documentation files Please refer to 'License' below for terms and conditions of using above parts. Requirements ------------ To compile and run the sources, a Java 2 Standard Edition 1.4 (J2SE) or higher Software Development Kit (SDK) is required. To only run the executable JAR file or the classes of SimplyHTML, a Java Runtime Environment (JRE) is required. J2SE and/or JRE can be obtained at http://java.sun.com/j2se/1.4 Usage ----- The javadoc API documents can be read with any web browser. To read the javadoc API documents, open file 'index.htm' in the doc directory from out of your browser. The source files can be viewed with any text editor. Please refer to the documentation of the J2SE SDK about how to compile source files to classes and how to run classes. To run the executable JAR file, use the following command on the command line prompt of your system (replace \ by / and omit .exe on Unix or Linux systems) [JRE]\bin\javaw.exe -jar [AppDir]\SimplyHTML.jar [AppDir] in above command means the directory, you have installed SimplyHTML on your computer. [JRE] means the directory, the Java Runtime Environment (JRE) is stored on your computer. NOTE: All paths should not contain blanks. A path such as C:\Program Files\SimplyHTML as the will only work if it is put in quotes, such as in "C:\Program Files\SimplyHTML\SimplyHTML.jar" License ------- This distribution of SimplyHTML is published under the terms and conditions of the GNU General Public License. To read the license, please open file 'gpl.txt' which is part of this package too. simplyhtml-ExampleFileFilter.patch: --- NEW FILE simplyhtml-ExampleFileFilter.patch --- --- simplyhtml-0.12.5/src/com/lightdev/app/shtm/DocumentPane.java.orig 2008-12-22 14:45:50.000000000 -0500 +++ simplyhtml-0.12.5/src/com/lightdev/app/shtm/DocumentPane.java 2009-02-11 20:03:39.000000000 -0500 @@ -28,7 +28,6 @@ import javax.swing.text.*; import javax.swing.text.html.*; -import com.sun.demo.ExampleFileFilter; import java.util.*; import java.util.prefs.*; @@ -498,10 +497,6 @@ File.separator); try { if(srcDir.exists()) { - ExampleFileFilter filter = new ExampleFileFilter(); - filter.addExtension("gif"); - filter.addExtension("jpg"); - filter.addExtension("jpeg"); File[] imgFiles = srcDir.listFiles(); for(int i = 0; i < imgFiles.length; i++) { Util.copyFile(imgFiles[i], new File(destDir.getAbsolutePath() + --- simplyhtml-0.12.5/src/com/lightdev/app/shtm/ImageDialog.java.orig 2008-12-22 14:45:50.000000000 -0500 +++ simplyhtml-0.12.5/src/com/lightdev/app/shtm/ImageDialog.java 2009-02-11 20:03:16.000000000 -0500 @@ -39,6 +39,8 @@ import java.awt.event.ActionListener; import java.awt.event.ActionEvent; import javax.swing.JFileChooser; +import javax.swing.filechooser.FileFilter; +import javax.swing.filechooser.FileNameExtensionFilter; @@ -49,7 +51,6 @@ -import com.sun.demo.ExampleFileFilter; import java.io.File; import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionEvent; @@ -499,12 +500,9 @@ try { JFileChooser chooser = new JFileChooser(); chooser.setMultiSelectionEnabled(true); - ExampleFileFilter filter = new ExampleFileFilter(); - filter.addExtension("gif"); - filter.addExtension("jpg"); - filter.addExtension("jpeg"); - filter.setDescription(Util.getResourceString( - "imageFileDesc")); + String extensionList[] = {"gif", "jpg", "jpeg"}; + FileFilter filter = new FileNameExtensionFilter( + Util.getResourceString("imageFileDesc"), extensionList); chooser.setFileFilter(filter); if(chooser.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) { File[] sFiles = chooser.getSelectedFiles(); --- simplyhtml-0.12.5/src/com/lightdev/app/shtm/SHTMLEditorKitActions.java.orig 2008-12-22 14:45:51.000000000 -0500 +++ simplyhtml-0.12.5/src/com/lightdev/app/shtm/SHTMLEditorKitActions.java 2009-02-11 20:02:56.000000000 -0500 @@ -44,7 +44,8 @@ import com.lightdev.app.shtm.SHTMLPanelImpl.FontFamilyPicker; import com.lightdev.app.shtm.SHTMLPanelImpl.FontSizePicker; import com.sun.demo.ElementTreePanel; -import com.sun.demo.ExampleFileFilter; +import javax.swing.filechooser.FileFilter; +import javax.swing.filechooser.FileNameExtensionFilter; import de.calcom.cclib.text.FindReplaceDialog; import de.calcom.cclib.text.FindReplaceEvent; @@ -2575,10 +2576,9 @@ public void actionPerformed(ActionEvent ae) { Preferences prefs = Preferences.userNodeForPackage( this.panel.getClass() ); JFileChooser chooser = new JFileChooser(); // create a file chooser - ExampleFileFilter filter = new ExampleFileFilter(); // create a filter - filter.addExtension("htm"); - filter.addExtension("html"); - filter.setDescription(Util.getResourceString("htmlFileDesc")); + String extensionList[] = { "htm", "html" }; + FileFilter filter = new FileNameExtensionFilter( + Util.getResourceString("htmlFileDesc"), extensionList); // create a filter chooser.setFileFilter(filter); // apply the file filter String lastFileName = prefs.get(SHTMLPanelImpl.FILE_LAST_OPEN, ""); if(lastFileName.length() > 0) { @@ -2802,10 +2802,9 @@ boolean canSave = true; Preferences prefs = Preferences.userNodeForPackage( this.panel.getClass() ); JFileChooser chooser = new JFileChooser(); - ExampleFileFilter filter = new ExampleFileFilter(); - filter.addExtension("htm"); - filter.addExtension("html"); - filter.setDescription(Util.getResourceString("htmlFileDesc")); + String extensionList[] = { "htm", "html" }; + FileFilter filter = new FileNameExtensionFilter( + Util.getResourceString("htmlFileDesc"), extensionList); chooser.setFileFilter(filter); String lastSaveFileName = prefs.get(SHTMLPanelImpl.FILE_LAST_SAVE, ""); if(lastSaveFileName.length() > 0) { simplyhtml-build_xml.patch: --- NEW FILE simplyhtml-build_xml.patch --- *** src/build.xml.orig 2007-01-14 06:25:49.000000000 -0500 --- src/build.xml 2008-09-02 23:15:07.000000000 -0400 *************** *** 9,14 **** --- 9,15 ---- + *************** *** 16,22 **** ! --- 17,23 ---- ! --- NEW FILE simplyhtml.sh --- #!/bin/sh exec java -cp \ `build-classpath gnu-regexp javahelp2 simplyhtml simplyhtml-help` \ com.lightdev.app.shtm.App --- NEW FILE simplyhtml.spec --- %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: simplyhtml Version: 0.12.5 Release: 5%{?dist} Epoch: 0 Summary: Application and a java component for rich text processing # All files are GPL except for src/com/sun/demo/ElementTreePanel.java which has # a BSD license. License: GPLv2+ and BSD Group: Development/Java URL: http://simplyhtml.sourceforge.net/ Source0: http://downloads.sourceforge.net/simplyhtml/SimplyHTML_src_%(echo %{version} | sed -e 's/\./_/g').tar.gz # cvs -z3 -d:pserver:guest at simplyhtml.cvs.sourceforge.net:/cvsroot/simplyhtml export -r shtml_0_12_5 shtml/gpl.txt # mv shtml/gpl.txt . Source1: gpl.txt # cvs -z3 -d:pserver:guest at simplyhtml.cvs.sourceforge.net:/cvsroot/simplyhtml export -r shtml_0_12_5 shtml/readme.txt # mv shtml/readme.txt . Source2: readme.txt Source3: simplyhtml.sh Patch0: simplyhtml-build_xml.patch Patch1: simplyhtml-ExampleFileFilter.patch Requires: gnu-regexp Requires: javahelp2 Requires: java Requires: jpackage-utils BuildRequires: ant BuildRequires: gnu-regexp BuildRequires: javahelp2 BuildRequires: java-devel BuildRequires: jpackage-utils %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif # We need this to get a version of ElementTreePanel with an acceptable license BuildRequires: java-1.6.0-openjdk-demo BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description SimplyHTML is an application and a java component for rich text processing. It stores documents as HTML files in combination with Cascading Style Sheets (CSS). SimplyHTML is not intended to be used as an editor for web pages. %package javadoc Summary: Javadoc documentation for %{name} Group: Development/Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc Javadoc documentation for %{name}. %prep %setup -q -c %{name}-%{version} # In the 0.12.5 version of the source tarball, we simply get the com and de # directories spewed out into the current directory, without so much as even # an all encompassing name-version directory. Hence, we need the -c flag for # the setup macro above. But it gets even better. It turns out that the # build.xml file still references directories like ../bin and ../lib even # though those directories are now outside of the source tree. So now we have # to manually create a src directory and move everything from the source tarball # into that directory first. mkdir lib src mv build.xml com de MANIFEST.MF src # We need to remove the carriage returns *before* applying patch 0 %{__perl} -pi -e 's/\r$//' src/build.xml %patch0 -p0 -b .build_xml %{_bindir}/find . -name '*.jar' | %{_bindir}/xargs -t %{__rm} %{__cp} %{SOURCE1} %{SOURCE2} . %patch1 -p1 -b .ExampleFileFilter rm src/com/sun/demo/ExampleFileFilter.java # Now bring in a version of ElementTreePanel that doesn't have a "No nukes" # clause in its license pushd src/com/sun/demo mv ElementTreePanel.java ElementTreePanel.java.BadLicense unzip %{_libdir}/jvm/java-1.6.0-openjdk-1.6.0.0/demo/jfc/Notepad/src.zip \ ElementTreePanel.java sed -i -e '33 i\ /* for use in SimplyHTML */\ package com.sun.demo;' ElementTreePanel.java popd %{_bindir}/find . -type f -name '*.htm' | \ %{_bindir}/xargs -t %{__perl} -pi -e 's/\r$//g' %{__perl} -pi -e 's/^Class-Path:.*\n//;' \ -e 's/^Created-By:.*\n//;' \ src/MANIFEST.MF #We don't need these with Patch 0 #cd lib #%{__ln_s} $(build-classpath gnu-regexp) gnu-regexp-1.1.4.jar #%{__ln_s} $(build-classpath javahelp2) jhall.jar #cd .. %build export CLASSPATH= export OPT_JAR_LIST=: cd src ant ant javadoc cd .. %install %{__rm} -rf %{buildroot} %{__mkdir_p} %{buildroot}%{_javadir} %{__mkdir_p} %{buildroot}%{_bindir} %{__cp} -a dist/lib/SimplyHTML.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar %{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar %{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/SimplyHTML-%{version}.jar %{__ln_s} SimplyHTML-%{version}.jar %{buildroot}%{_javadir}/SimplyHTML.jar %{__cp} -a dist/lib/SimplyHTMLHelp.jar %{buildroot}%{_javadir}/%{name}-help-%{version}.jar %{__ln_s} %{name}-help-%{version}.jar %{buildroot}%{_javadir}/%{name}-help.jar %{__ln_s} %{name}-help-%{version}.jar %{buildroot}%{_javadir}/SimplyHTMLHelp-%{version}.jar %{__ln_s} SimplyHTMLHelp-%{version}.jar %{buildroot}%{_javadir}/SimplyHTMLHelp.jar %{__cp} %{SOURCE3} %{buildroot}%{_bindir} %{__ln_s} %(basename %{SOURCE3}) %{buildroot}%{_bindir}/%(basename %{SOURCE3} .sh) %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} %{__cp} -a dist/api/* %{buildroot}%{_javadocdir}/%{name}-%{version} %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %clean %{__rm} -rf %{buildroot} %post %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] ; then %{_bindir}/rebuild-gcj-db fi %endif %postun %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] ; then %{_bindir}/rebuild-gcj-db fi %endif %files %defattr(0644,root,root,0755) #%doc doc/* %doc gpl.txt readme.txt %{_bindir}/simplyhtml %attr(0755,root,root) %{_bindir}/simplyhtml.sh %{_javadir}/*.jar %if %{with_gcj} %attr(-,root,root) %{_libdir}/gcj/%{name} %endif %files javadoc %defattr(0644,root,root,0755) %doc %{_javadocdir}/%{name}-%{version} %doc %{_javadocdir}/%{name} %changelog * Wed Feb 25 2009 John Guthrie 0:0.12.5-5 - Fixed the perms on the simplyhtml.sh source file. Allowing the %%attr to take care of the perms. * Thu Feb 12 2009 John Guthrie 0:0.12.5-4 - Replaced the version of ElementTreePanel.java that came with the source code with a version that has an acceptable license. Added java-1.6.0-openjdk-demo as a BuildRequire as a result. - Updated the license tag. * Mon Feb 9 2009 John Guthrie 0:0.12.5-3 - So it turns out that the source tarball doesn't come with the javadoc documentation because the javadoc documentation can be generated using the build.xml file. Therefore, I added a command to do this as well as uncommenting all of the javadoc-related portions of the Spec file. - Removed dependecy on ExampleFileFilter. * Sat Feb 7 2009 John Guthrie 0:0.12.5-2 - Added simplyhtml.sh script to run the .jar file with the correct CLASSPATH. * Fri Feb 6 2009 John Guthrie 0:0.12.5-1 - Upgraded to 0.12.5. This included making changes for new source code tree structure. - Added -c flag to %%setup. - Changed %%patch in %%prep to %%patch0. - Replaced tabs with spaces to make rpmlint happy. * Mon Sep 15 2008 John Guthrie 0:0.12.3-2 - Added several Requires and BuildRequires lines as required by Packaging/Java guidelines. - Changed source to version that is downloadable from the simplyhtml web page as opposed to just a tag from the simplyhtml CVS. - Added gpl.txt and readme.txt to documentation. - Stripped carriage returns from build.xml. - Changed the package group for the javadoc subpackage. * Tue Sep 2 2008 John Guthrie 0:0.12.3-1 - Re-built RPM for Fedora 9 - Removed symlinks to .jar files from lib * Sun Aug 10 2008 David Walluck 0:0.12.3-0.0.1mdv2009.0 + Revision: 270182 - 0.12.3 * Sat Dec 29 2007 David Walluck 0:0.12.2-0.0.3mdv2008.1 + Revision: 139131 - fix jar symlinks * Sat Dec 29 2007 David Walluck 0:0.12.2-0.0.2mdv2008.1 + Revision: 139120 - add Requires - import simplyhtml Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/simplyhtml/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Feb 2009 00:23:20 -0000 1.1 +++ .cvsignore 1 Mar 2009 21:34:38 -0000 1.2 @@ -0,0 +1 @@ +SimplyHTML_src_0_12_5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/simplyhtml/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Feb 2009 00:23:20 -0000 1.1 +++ sources 1 Mar 2009 21:34:38 -0000 1.2 @@ -0,0 +1 @@ +79520ab2b1b6f884e922637c92921884 SimplyHTML_src_0_12_5.tar.gz From pwouters at fedoraproject.org Sun Mar 1 21:36:17 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Sun, 1 Mar 2009 21:36:17 +0000 (UTC) Subject: rpms/uml_utilities/F-10 uml_utilities.spec, NONE, 1.1 uml_utilities_20070815-install.patch, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090301213617.517AF70115@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/uml_utilities/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27616 Modified Files: sources Added Files: uml_utilities.spec uml_utilities_20070815-install.patch Log Message: Initial import for f-10 of uml_utilities --- NEW FILE uml_utilities.spec --- Name: uml_utilities Version: 20070815 Release: 4%{?dist} License: GPL+ URL: http://user-mode-linux.sourceforge.net/index.html Source0: http://user-mode-linux.sourceforge.net/%{name}_%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fuse-devel, readline-devel Group: Applications/Internet Summary: Utilities for user-mode linux kernel # installation problem was reported upstream: # http://sourceforge.net/mailarchive/message.php?msg_name=47E16C87.8080705%40plauener.de Patch0: uml_utilities_20070815-install.patch %description This package contains the utilities for user-mode linux for networking, COW, etc. %prep %setup -q -n tools-%{version} %patch0 -p1 -b .install %build %{__make} CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT # Makefiles do hardcoded stripping, breaking debug package for mfile in */Makefile; do sed -i "s/install -s/install /" $mfile; done make install LIB_DIR=%{_libdir}/uml DESTDIR=$RPM_BUILD_ROOT # we need port-helper in the path mylib=`echo %{_libdir} | sed "s/\/usr//"` ln -s ..$mylib/uml/port-helper $RPM_BUILD_ROOT%{_bindir}/port-helper %files %defattr(-,root,root,-) %doc COPYING Changelog %attr(755,root,root) %dir %{_libdir}/uml %attr(4755,root,root) %{_bindir}/uml_net %{_bindir}/jailtest %{_bindir}/tunctl %{_bindir}/uml_mconsole %{_bindir}/uml_moo %{_bindir}/uml_switch %{_bindir}/uml_mkcow %{_bindir}/uml_watchdog %{_bindir}/port-helper %{_libdir}/uml/port-helper #%attr(755,root,root) %{_libdir}/uml/functions #%attr(755,root,root) %{_bindir}/mkrootfs #paul these were missing %{_bindir}/uml_mount %{_sbindir}/jail_uml %{_bindir}/humfsify %clean rm -rf ${RPM_BUILD_ROOT} %changelog * Fri Feb 27 2009 Christian Krause - 20070815-4 - use regular version tag - fixed license tag - updated Source0 URL - removed unneeded BuildRequirement * Sun Feb 15 2009 Christian Krause - 20070815-3 - fix install parameter - set LIB_DIR to fix installation on ppc64 - set CFLAGS to honor RPM_OPT_FLAGS * Sun Nov 2 2008 Paul Wouters - 20070815-2 - Added -q to setup * Sat Nov 1 2008 Paul Wouters - 20070815-1 - Was pointed to newer version of source at obscured location - Hack out hardcoded stripping of binaries - -D_FILE_OFFSET_BITS=64 no longer needed * Tue Oct 28 2008 Paul Wouters - 20060622-2 - Added a link to port-helper, so it is in the path * Fri Oct 24 2008 Paul Wouters - 20060622-1 - Initial package based on spec file in the sourcecode uml_utilities_20070815-install.patch: --- NEW FILE uml_utilities_20070815-install.patch --- diff -uNr tools-20070815.orig/humfsify/Makefile tools-20070815/humfsify/Makefile --- tools-20070815.orig/humfsify/Makefile 2006-05-25 20:37:01.000000000 +0200 +++ tools-20070815/humfsify/Makefile 2008-03-19 20:29:50.000000000 +0100 @@ -4,7 +4,7 @@ install: install -d $(DESTDIR)$(BIN_DIR) - install -o 0755 $(BIN) $(DESTDIR)$(BIN_DIR) + install -m 0755 $(BIN) $(DESTDIR)$(BIN_DIR) clean: rm -f *~ Index: sources =================================================================== RCS file: /cvs/extras/rpms/uml_utilities/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:08:04 -0000 1.1 +++ sources 1 Mar 2009 21:35:47 -0000 1.2 @@ -0,0 +1 @@ +b0468ac8b79cef53f36f5f9517907462 uml_utilities_20070815.tar.bz2 From mbooth at fedoraproject.org Sun Mar 1 21:44:04 2009 From: mbooth at fedoraproject.org (Mat Booth) Date: Sun, 1 Mar 2009 21:44:04 +0000 (UTC) Subject: rpms/eclipse-epic/devel eclipse-epic.spec, 1.8, 1.9 get-epic.sh, 1.5, 1.6 Message-ID: <20090301214405.05F0270115@cvs1.fedora.phx.redhat.com> Author: mbooth Update of /cvs/pkgs/rpms/eclipse-epic/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29005 Modified Files: eclipse-epic.spec get-epic.sh Log Message: * Sun Mar 1 2009 Mat Booth 0.6.31-1 - Updated to verion 0.6.31. - New feature: Show @_ in variables view. - Fix Perl internal variables not appearing (#2431258). - Fix NPE in Perl expression view (#2241882). - Fix content assist and typed lexicals (#2502366). - Fix editor fails to highlight grep + regexp (#2537700). - Fix content-type does not enable to run/debug perl scripts (#2433437). - Fix debugger crash (#2501676). - Fix epic_breakpoints raises exception in Template::Toolkit (#2513003). - Fix content assist and "use base" (#2502358). - Fix cygwin drive prefix processing (#2490403). Index: eclipse-epic.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-epic/devel/eclipse-epic.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- eclipse-epic.spec 24 Feb 2009 13:44:46 -0000 1.8 +++ eclipse-epic.spec 1 Mar 2009 21:43:34 -0000 1.9 @@ -2,8 +2,8 @@ %define gcj_support 1 Name: eclipse-epic -Version: 0.6.27 -Release: 2%{?dist} +Version: 0.6.31 +Release: 1%{?dist} Summary: Perl Eclipse plugin Group: Development/Tools License: CPL @@ -143,6 +143,19 @@ %endif %changelog +* Sun Mar 1 2009 Mat Booth 0.6.31-1 +- Updated to verion 0.6.31. +- New feature: Show @_ in variables view. +- Fix Perl internal variables not appearing (#2431258). +- Fix NPE in Perl expression view (#2241882). +- Fix content assist and typed lexicals (#2502366). +- Fix editor fails to highlight grep + regexp (#2537700). +- Fix content-type does not enable to run/debug perl scripts (#2433437). +- Fix debugger crash (#2501676). +- Fix epic_breakpoints raises exception in Template::Toolkit (#2513003). +- Fix content assist and "use base" (#2502358). +- Fix cygwin drive prefix processing (#2490403). + * Tue Feb 24 2009 Fedora Release Engineering - 0.6.27-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: get-epic.sh =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-epic/devel/get-epic.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- get-epic.sh 15 Nov 2008 19:24:28 -0000 1.5 +++ get-epic.sh 1 Mar 2009 21:43:34 -0000 1.6 @@ -1,7 +1,7 @@ #!/bin/sh NAME="epic" -VERSION=0.6.27 -TAG="testing_0_6_27" +VERSION=0.6.31 +TAG="testing_0_6_31" echo "Exporting from CVS..." mkdir $NAME-$VERSION From pwouters at fedoraproject.org Sun Mar 1 21:47:52 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Sun, 1 Mar 2009 21:47:52 +0000 (UTC) Subject: rpms/uml_utilities/F-9 uml_utilities.spec, NONE, 1.1 uml_utilities_20070815-install.patch, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090301214752.A935170115@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/uml_utilities/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29748 Modified Files: sources Added Files: uml_utilities.spec uml_utilities_20070815-install.patch Log Message: initial release of uml_utilities for F-9 --- NEW FILE uml_utilities.spec --- Name: uml_utilities Version: 20070815 Release: 4%{?dist} License: GPL+ URL: http://user-mode-linux.sourceforge.net/index.html Source0: http://user-mode-linux.sourceforge.net/%{name}_%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fuse-devel, readline-devel Group: Applications/Internet Summary: Utilities for user-mode linux kernel # installation problem was reported upstream: # http://sourceforge.net/mailarchive/message.php?msg_name=47E16C87.8080705%40plauener.de Patch0: uml_utilities_20070815-install.patch %description This package contains the utilities for user-mode linux for networking, COW, etc. %prep %setup -q -n tools-%{version} %patch0 -p1 -b .install %build %{__make} CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT # Makefiles do hardcoded stripping, breaking debug package for mfile in */Makefile; do sed -i "s/install -s/install /" $mfile; done make install LIB_DIR=%{_libdir}/uml DESTDIR=$RPM_BUILD_ROOT # we need port-helper in the path mylib=`echo %{_libdir} | sed "s/\/usr//"` ln -s ..$mylib/uml/port-helper $RPM_BUILD_ROOT%{_bindir}/port-helper %files %defattr(-,root,root,-) %doc COPYING Changelog %attr(755,root,root) %dir %{_libdir}/uml %attr(4755,root,root) %{_bindir}/uml_net %{_bindir}/jailtest %{_bindir}/tunctl %{_bindir}/uml_mconsole %{_bindir}/uml_moo %{_bindir}/uml_switch %{_bindir}/uml_mkcow %{_bindir}/uml_watchdog %{_bindir}/port-helper %{_libdir}/uml/port-helper #%attr(755,root,root) %{_libdir}/uml/functions #%attr(755,root,root) %{_bindir}/mkrootfs #paul these were missing %{_bindir}/uml_mount %{_sbindir}/jail_uml %{_bindir}/humfsify %clean rm -rf ${RPM_BUILD_ROOT} %changelog * Fri Feb 27 2009 Christian Krause - 20070815-4 - use regular version tag - fixed license tag - updated Source0 URL - removed unneeded BuildRequirement * Sun Feb 15 2009 Christian Krause - 20070815-3 - fix install parameter - set LIB_DIR to fix installation on ppc64 - set CFLAGS to honor RPM_OPT_FLAGS * Sun Nov 2 2008 Paul Wouters - 20070815-2 - Added -q to setup * Sat Nov 1 2008 Paul Wouters - 20070815-1 - Was pointed to newer version of source at obscured location - Hack out hardcoded stripping of binaries - -D_FILE_OFFSET_BITS=64 no longer needed * Tue Oct 28 2008 Paul Wouters - 20060622-2 - Added a link to port-helper, so it is in the path * Fri Oct 24 2008 Paul Wouters - 20060622-1 - Initial package based on spec file in the sourcecode uml_utilities_20070815-install.patch: --- NEW FILE uml_utilities_20070815-install.patch --- diff -uNr tools-20070815.orig/humfsify/Makefile tools-20070815/humfsify/Makefile --- tools-20070815.orig/humfsify/Makefile 2006-05-25 20:37:01.000000000 +0200 +++ tools-20070815/humfsify/Makefile 2008-03-19 20:29:50.000000000 +0100 @@ -4,7 +4,7 @@ install: install -d $(DESTDIR)$(BIN_DIR) - install -o 0755 $(BIN) $(DESTDIR)$(BIN_DIR) + install -m 0755 $(BIN) $(DESTDIR)$(BIN_DIR) clean: rm -f *~ Index: sources =================================================================== RCS file: /cvs/extras/rpms/uml_utilities/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:08:04 -0000 1.1 +++ sources 1 Mar 2009 21:47:22 -0000 1.2 @@ -0,0 +1 @@ +b0468ac8b79cef53f36f5f9517907462 uml_utilities_20070815.tar.bz2 From mbooth at fedoraproject.org Sun Mar 1 21:48:08 2009 From: mbooth at fedoraproject.org (Mat Booth) Date: Sun, 1 Mar 2009 21:48:08 +0000 (UTC) Subject: rpms/eclipse-epic/devel .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <20090301214808.C204D70115@cvs1.fedora.phx.redhat.com> Author: mbooth Update of /cvs/pkgs/rpms/eclipse-epic/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29804 Modified Files: .cvsignore sources Log Message: * Sun Mar 1 2009 Mat Booth 0.6.31-1 - Updated to verion 0.6.31. - New feature: Show @_ in variables view. - Fix Perl internal variables not appearing (#2431258). - Fix NPE in Perl expression view (#2241882). - Fix content assist and typed lexicals (#2502366). - Fix editor fails to highlight grep + regexp (#2537700). - Fix content-type does not enable to run/debug perl scripts (#2433437). - Fix debugger crash (#2501676). - Fix epic_breakpoints raises exception in Template::Toolkit (#2513003). - Fix content assist and "use base" (#2502358). - Fix cygwin drive prefix processing (#2490403). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-epic/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 15 Nov 2008 19:24:28 -0000 1.6 +++ .cvsignore 1 Mar 2009 21:47:38 -0000 1.7 @@ -1 +1 @@ -epic-0.6.27.tar.gz +epic-0.6.31.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-epic/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 15 Nov 2008 19:24:28 -0000 1.6 +++ sources 1 Mar 2009 21:47:38 -0000 1.7 @@ -1 +1 @@ -7870c1939d84119fbe16b3f39fffbcd6 epic-0.6.27.tar.gz +cc59d94e2b591fd6c14337dd7fb0d02b epic-0.6.31.tar.gz From salimma at fedoraproject.org Sun Mar 1 21:52:59 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Sun, 1 Mar 2009 21:52:59 +0000 (UTC) Subject: rpms/zeroinstall-injector/EL-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 zeroinstall-injector.spec, 1.4, 1.5 zeroinstall-x86_64-arch.patch, 1.1, NONE Message-ID: <20090301215259.19FFF70115@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/zeroinstall-injector/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30838/EL-5 Modified Files: .cvsignore sources zeroinstall-injector.spec Removed Files: zeroinstall-x86_64-arch.patch Log Message: zeroinstall-injector 0.38 for RHEL-5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/zeroinstall-injector/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Nov 2006 00:00:32 -0000 1.3 +++ .cvsignore 1 Mar 2009 21:52:27 -0000 1.4 @@ -1 +1 @@ -zeroinstall-injector-0.24.tar.gz.gpg +zeroinstall-injector-0.38.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/zeroinstall-injector/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Nov 2006 00:00:32 -0000 1.3 +++ sources 1 Mar 2009 21:52:28 -0000 1.4 @@ -1 +1 @@ -d543beb1742374b1d2d983f0d05388fc zeroinstall-injector-0.24.tar.gz.gpg +e341afd77ac603a2306baf2b8513f195 zeroinstall-injector-0.38.tar.bz2 Index: zeroinstall-injector.spec =================================================================== RCS file: /cvs/pkgs/rpms/zeroinstall-injector/EL-5/zeroinstall-injector.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- zeroinstall-injector.spec 11 Nov 2006 17:46:19 -0000 1.4 +++ zeroinstall-injector.spec 1 Mar 2009 21:52:28 -0000 1.5 @@ -1,63 +1,125 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%define cache_dir /var/cache/0install.net + Name: zeroinstall-injector -Version: 0.24 +Version: 0.38 Release: 2%{?dist} Summary: The Zero Install Injector (0launch) Group: Applications/System -License: LGPL +License: LGPLv2 URL: http://0install.net -Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg -Patch0: zeroinstall-x86_64-arch.patch +Source0: http://dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python gnupg -Requires: PyXML pygtk2 gnupg +BuildRequires: python-devel desktop-file-utils +Requires: PyXML pygtk2 gnupg pygtk2-libglade sudo xdg-utils +Requires(pre): shadow-utils %description -A running process is created by combining many different libraries (and other -components). In the Zero Install world, we have all versions of each library -available at all times. The problem then is how to choose which versions to -use. - -The injector solves this problem by selecting components to meet a program's -requirements, according to a policy you give it. The injector finds out which -versions are available, and downloads and runs the ones you choose. +The Zero Install Injector makes it easy for users to install software without +needing root privileges. It takes the URL of a program and runs it +(downloading it first if necessary). Any dependencies of the program are +fetched in the same way. The user controls which version of the program and +its dependencies to use. + +Zero Install is a decentralised installation system (there is no central +repository; all packages are identified by URLs), loosly-coupled (if different +programs require different versions of a library then both versions are +installed in parallel, without conflicts), and has an emphasis on security +(all package descriptions are GPG-signed, and contain cryptographic hashes of +the contents of each version). Each version of each program is stored in its +own sub-directory within the Zero Install cache (nothing is installed to +directories outside of the cache, such as /usr/bin) and no code from the +package is run during install or uninstall. The system can automatically check +for updates when software is run. %prep -gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf - -%setup -q -T -D -%patch0 -p1 -b .arch +%setup -q %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT +mv "$RPM_BUILD_ROOT/usr/man" "$RPM_BUILD_ROOT/%{_datadir}/man" +mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations" + +for i in add manage; do + desktop-file-install \ +%if 0%{!?fedora:1} + --vendor="" \ +%endif + --remove-category="Application" \ + --delete-original \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-$i.desktop +done %clean rm -rf $RPM_BUILD_ROOT +%pre +# Add the "zeroinst" user. +# This is not used by default, but is required if you want to +# set up sharing of downloads later. +getent group zeroinst >/dev/null || groupadd -r zeroinst +getent passwd zeroinst >/dev/null || \ +useradd -r -g zeroinst -d %{cache_dir} -s /sbin/nologin \ + -c "Zero Install shared cache" zeroinst +exit 0 + %files %defattr(-,root,root,-) %doc COPYING README %{_bindir}/0* -%dir %{python_sitelib}/zeroinstall/ -%dir %{python_sitelib}/zeroinstall/0launch-gui/ -%dir %{python_sitelib}/zeroinstall/injector/ -%dir %{python_sitelib}/zeroinstall/zerostore/ -%{python_sitelib}/zeroinstall/*.py* -%{python_sitelib}/zeroinstall/0launch-gui/0launch-gui -%{python_sitelib}/zeroinstall/0launch-gui/README -%{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml -%{python_sitelib}/zeroinstall/*/*.py* +%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/zeroinstall.menu +%{_datadir}/applications/*.desktop +%{_datadir}/desktop-directories/zeroinstall.directory +%{_datadir}/pixmaps/zeroinstall-zero2desktop.png +%{python_sitelib}/zeroinstall/ +%if 0%{?fedora} >= 9 +%{python_sitelib}/*.egg-info +%endif %{_mandir}/man1/0* - +%dir %{cache_dir} +%attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Sat Feb 28 2009 Michel Salim - 0.38-2 +- Workaround for RHEL's desktop-file-utils +- Add missing dependency on xdg-utils + +* Fri Feb 27 2009 Michel Salim - 0.38-1 +- Update to 0.38 +- Upgrades now preserve the existing menu, if modified + +* Sun Aug 3 2008 Michel Alexandre Salim - 0.34-1 +- Update to 0.34 + +* Sat Apr 5 2008 Michel Salim - 0.32-1 +- Update to 0.32 +- Package .egg-info file on Fedora >= 9 + +* Fri Jan 18 2008 Michel Salim - 0.31-1 +- Update to 0.31 + +* Sat Sep 8 2007 Michel Salim 0.30-2 +- Update scriptlet that creates zeroinst user + +* Wed Sep 5 2007 Michel Salim 0.30-1 +- Update to 0.30 +- License is now versioned +- Incorporate changes from Thomas Leonard: + * create zeroinst user + * create shared cache + +* Mon Dec 18 2006 Michel Salim 0.24-3 +- Rebuild for development branch + * Sat Nov 11 2006 Michel Salim 0.24-2 - Allow installation of ix86 binaries on x86_64 --- zeroinstall-x86_64-arch.patch DELETED --- From mbooth at fedoraproject.org Sun Mar 1 21:55:48 2009 From: mbooth at fedoraproject.org (Mat Booth) Date: Sun, 1 Mar 2009 21:55:48 +0000 (UTC) Subject: rpms/eclipse-epic/F-10 .cvsignore, 1.6, 1.7 eclipse-epic.spec, 1.7, 1.8 get-epic.sh, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <20090301215548.6C4EC70115@cvs1.fedora.phx.redhat.com> Author: mbooth Update of /cvs/pkgs/rpms/eclipse-epic/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31552 Modified Files: .cvsignore eclipse-epic.spec get-epic.sh sources Log Message: * Sun Mar 1 2009 Mat Booth 0.6.31-1 - Updated to verion 0.6.31. - New feature: Show @_ in variables view. - Fix Perl internal variables not appearing (#2431258). - Fix NPE in Perl expression view (#2241882). - Fix content assist and typed lexicals (#2502366). - Fix editor fails to highlight grep + regexp (#2537700). - Fix content-type does not enable to run/debug perl scripts (#2433437). - Fix debugger crash (#2501676). - Fix epic_breakpoints raises exception in Template::Toolkit (#2513003). - Fix content assist and "use base" (#2502358). - Fix cygwin drive prefix processing (#2490403). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-epic/F-10/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 15 Nov 2008 19:24:26 -0000 1.6 +++ .cvsignore 1 Mar 2009 21:55:46 -0000 1.7 @@ -1 +1 @@ -epic-0.6.27.tar.gz +epic-0.6.31.tar.gz Index: eclipse-epic.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-epic/F-10/eclipse-epic.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- eclipse-epic.spec 15 Nov 2008 19:24:26 -0000 1.7 +++ eclipse-epic.spec 1 Mar 2009 21:55:47 -0000 1.8 @@ -2,7 +2,7 @@ %define gcj_support 1 Name: eclipse-epic -Version: 0.6.27 +Version: 0.6.31 Release: 1%{?dist} Summary: Perl Eclipse plugin Group: Development/Tools @@ -143,6 +143,19 @@ %endif %changelog +* Sun Mar 1 2009 Mat Booth 0.6.31-1 +- Updated to verion 0.6.31. +- New feature: Show @_ in variables view. +- Fix Perl internal variables not appearing (#2431258). +- Fix NPE in Perl expression view (#2241882). +- Fix content assist and typed lexicals (#2502366). +- Fix editor fails to highlight grep + regexp (#2537700). +- Fix content-type does not enable to run/debug perl scripts (#2433437). +- Fix debugger crash (#2501676). +- Fix epic_breakpoints raises exception in Template::Toolkit (#2513003). +- Fix content assist and "use base" (#2502358). +- Fix cygwin drive prefix processing (#2490403). + * Sat Nov 15 2008 Mat Booth 0.6.27-1 - Updated to verion 0.6.27. - Add perl-Module-Starter dependency. Index: get-epic.sh =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-epic/F-10/get-epic.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- get-epic.sh 15 Nov 2008 19:24:26 -0000 1.5 +++ get-epic.sh 1 Mar 2009 21:55:47 -0000 1.6 @@ -1,7 +1,7 @@ #!/bin/sh NAME="epic" -VERSION=0.6.27 -TAG="testing_0_6_27" +VERSION=0.6.31 +TAG="testing_0_6_31" echo "Exporting from CVS..." mkdir $NAME-$VERSION Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-epic/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 15 Nov 2008 19:24:26 -0000 1.6 +++ sources 1 Mar 2009 21:55:47 -0000 1.7 @@ -1 +1 @@ -7870c1939d84119fbe16b3f39fffbcd6 epic-0.6.27.tar.gz +cc59d94e2b591fd6c14337dd7fb0d02b epic-0.6.31.tar.gz From chkr at fedoraproject.org Sun Mar 1 21:56:04 2009 From: chkr at fedoraproject.org (Christian Krause) Date: Sun, 1 Mar 2009 21:56:04 +0000 (UTC) Subject: rpms/anki/F-10 anki.spec,1.1,1.2 Message-ID: <20090301215604.922EC70115@cvs1.fedora.phx.redhat.com> Author: chkr Update of /cvs/pkgs/rpms/anki/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31500 Modified Files: anki.spec Log Message: change email address and bump release Index: anki.spec =================================================================== RCS file: /cvs/pkgs/rpms/anki/F-10/anki.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- anki.spec 1 Mar 2009 21:21:56 -0000 1.1 +++ anki.spec 1 Mar 2009 21:55:33 -0000 1.2 @@ -2,7 +2,7 @@ Name: anki Version: 0.9.9.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Flashcard program for using space repetition learning Group: Amusements/Games @@ -107,12 +107,15 @@ %{_datadir}/pixmaps/%{name}.png %changelog -* Fri Feb 27 2009 Christian Krause - 0.9.9.6-3 -- proper packaging of locale files +* Sun Mar 01 2009 Christian Krause - 0.9.9.6-4 +- Bump release -* Fri Feb 13 2009 Christian Krause - 0.9.9.6-2 +* Fri Feb 27 2009 Christian Krause - 0.9.9.6-3 +- Proper packaging of locale files + +* Fri Feb 13 2009 Christian Krause - 0.9.9.6-2 - Fixed license field - Install unihan.db -* Wed Feb 11 2009 Christian Krause - 0.9.9.6-1 -- First spec file for anki. +* Wed Feb 11 2009 Christian Krause - 0.9.9.6-1 +- First spec file for anki From pwouters at fedoraproject.org Sun Mar 1 21:56:28 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Sun, 1 Mar 2009 21:56:28 +0000 (UTC) Subject: rpms/uml_utilities/EL-5 uml_utilities.spec, NONE, 1.1 uml_utilities_20070815-install.patch, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090301215628.86BEC70115@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/uml_utilities/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31611 Modified Files: sources Added Files: uml_utilities.spec uml_utilities_20070815-install.patch Log Message: Initial build for uml_utilities for EL-5 --- NEW FILE uml_utilities.spec --- Name: uml_utilities Version: 20070815 Release: 4%{?dist} License: GPL+ URL: http://user-mode-linux.sourceforge.net/index.html Source0: http://user-mode-linux.sourceforge.net/%{name}_%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fuse-devel, readline-devel Group: Applications/Internet Summary: Utilities for user-mode linux kernel # installation problem was reported upstream: # http://sourceforge.net/mailarchive/message.php?msg_name=47E16C87.8080705%40plauener.de Patch0: uml_utilities_20070815-install.patch %description This package contains the utilities for user-mode linux for networking, COW, etc. %prep %setup -q -n tools-%{version} %patch0 -p1 -b .install %build %{__make} CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT # Makefiles do hardcoded stripping, breaking debug package for mfile in */Makefile; do sed -i "s/install -s/install /" $mfile; done make install LIB_DIR=%{_libdir}/uml DESTDIR=$RPM_BUILD_ROOT # we need port-helper in the path mylib=`echo %{_libdir} | sed "s/\/usr//"` ln -s ..$mylib/uml/port-helper $RPM_BUILD_ROOT%{_bindir}/port-helper %files %defattr(-,root,root,-) %doc COPYING Changelog %attr(755,root,root) %dir %{_libdir}/uml %attr(4755,root,root) %{_bindir}/uml_net %{_bindir}/jailtest %{_bindir}/tunctl %{_bindir}/uml_mconsole %{_bindir}/uml_moo %{_bindir}/uml_switch %{_bindir}/uml_mkcow %{_bindir}/uml_watchdog %{_bindir}/port-helper %{_libdir}/uml/port-helper #%attr(755,root,root) %{_libdir}/uml/functions #%attr(755,root,root) %{_bindir}/mkrootfs #paul these were missing %{_bindir}/uml_mount %{_sbindir}/jail_uml %{_bindir}/humfsify %clean rm -rf ${RPM_BUILD_ROOT} %changelog * Fri Feb 27 2009 Christian Krause - 20070815-4 - use regular version tag - fixed license tag - updated Source0 URL - removed unneeded BuildRequirement * Sun Feb 15 2009 Christian Krause - 20070815-3 - fix install parameter - set LIB_DIR to fix installation on ppc64 - set CFLAGS to honor RPM_OPT_FLAGS * Sun Nov 2 2008 Paul Wouters - 20070815-2 - Added -q to setup * Sat Nov 1 2008 Paul Wouters - 20070815-1 - Was pointed to newer version of source at obscured location - Hack out hardcoded stripping of binaries - -D_FILE_OFFSET_BITS=64 no longer needed * Tue Oct 28 2008 Paul Wouters - 20060622-2 - Added a link to port-helper, so it is in the path * Fri Oct 24 2008 Paul Wouters - 20060622-1 - Initial package based on spec file in the sourcecode uml_utilities_20070815-install.patch: --- NEW FILE uml_utilities_20070815-install.patch --- diff -uNr tools-20070815.orig/humfsify/Makefile tools-20070815/humfsify/Makefile --- tools-20070815.orig/humfsify/Makefile 2006-05-25 20:37:01.000000000 +0200 +++ tools-20070815/humfsify/Makefile 2008-03-19 20:29:50.000000000 +0100 @@ -4,7 +4,7 @@ install: install -d $(DESTDIR)$(BIN_DIR) - install -o 0755 $(BIN) $(DESTDIR)$(BIN_DIR) + install -m 0755 $(BIN) $(DESTDIR)$(BIN_DIR) clean: rm -f *~ Index: sources =================================================================== RCS file: /cvs/extras/rpms/uml_utilities/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:08:04 -0000 1.1 +++ sources 1 Mar 2009 21:55:58 -0000 1.2 @@ -0,0 +1 @@ +b0468ac8b79cef53f36f5f9517907462 uml_utilities_20070815.tar.bz2 From whot at fedoraproject.org Sun Mar 1 23:09:49 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Sun, 1 Mar 2009 23:09:49 +0000 (UTC) Subject: rpms/libX11/F-10 .cvsignore, 1.12, 1.13 libX11.spec, 1.52, 1.53 sources, 1.11, 1.12 Message-ID: <20090301230950.83DA970115@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/libX11/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13231 Modified Files: .cvsignore libX11.spec sources Log Message: * Mon Mar 02 2009 Peter Hutterer 1.1.5-1 - libX11 1.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libX11/F-10/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 6 Mar 2008 21:27:06 -0000 1.12 +++ .cvsignore 1 Mar 2009 23:09:17 -0000 1.13 @@ -1 +1 @@ -libX11-1.1.4.tar.bz2 +libX11-1.1.5.tar.bz2 Index: libX11.spec =================================================================== RCS file: /cvs/pkgs/rpms/libX11/F-10/libX11.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- libX11.spec 20 Nov 2008 16:53:33 -0000 1.52 +++ libX11.spec 1 Mar 2009 23:09:18 -0000 1.53 @@ -1,7 +1,7 @@ Summary: X.Org X11 libX11 runtime library Name: libX11 -Version: 1.1.4 -Release: 6%{?dist} +Version: 1.1.5 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -122,6 +122,9 @@ %{_mandir}/man3/*.3* %changelog +* Mon Mar 02 2009 Peter Hutterer 1.1.5-1 +- libX11 1.1.5 + * Tue Nov 18 2008 Peter Hutterer 1.1.4-6 - libX11-1.1.4-XF86Suspend.patch: add XF86Suspend and XF86Hibernate keysyms. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libX11/F-10/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 6 Mar 2008 21:27:06 -0000 1.11 +++ sources 1 Mar 2009 23:09:18 -0000 1.12 @@ -1 +1 @@ -1469a5a8aa8d288dce6f4c45d2f68dc3 libX11-1.1.4.tar.bz2 +d1512d65dadd4f48c779d4749e7753a8 libX11-1.1.5.tar.bz2 From caolanm at fedoraproject.org Sun Mar 1 23:18:48 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sun, 1 Mar 2009 23:18:48 +0000 (UTC) Subject: rpms/hugin/devel hugin-0.7.0-includes.patch, NONE, 1.1 hugin.spec, 1.18, 1.19 Message-ID: <20090301231848.B5F8070115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hugin/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14959 Modified Files: hugin.spec Added Files: hugin-0.7.0-includes.patch Log Message: include stdio.h for snprintf and cstdio for std::sprintf, etc. hugin-0.7.0-includes.patch: --- NEW FILE hugin-0.7.0-includes.patch --- diff -ru hugin-0.7.0.orig/src/hugin_base/appbase/ProgressDisplayOld.cpp hugin-0.7.0/src/hugin_base/appbase/ProgressDisplayOld.cpp --- hugin-0.7.0.orig/src/hugin_base/appbase/ProgressDisplayOld.cpp 2009-03-01 20:59:17.000000000 +0000 +++ hugin-0.7.0/src/hugin_base/appbase/ProgressDisplayOld.cpp 2009-03-01 20:59:47.000000000 +0000 @@ -22,6 +22,7 @@ */ #include "ProgressDisplayOld.h" +#include #ifdef WIN32 #define snprintf _snprintf diff -ru hugin-0.7.0.orig/src/hugin_base/hugin_utils/utils.cpp hugin-0.7.0/src/hugin_base/hugin_utils/utils.cpp --- hugin-0.7.0.orig/src/hugin_base/hugin_utils/utils.cpp 2009-03-01 20:59:17.000000000 +0000 +++ hugin-0.7.0/src/hugin_base/hugin_utils/utils.cpp 2009-03-01 22:03:41.000000000 +0000 @@ -31,6 +31,7 @@ #endif #include #include +#include namespace hugin_utils { diff -ru hugin-0.7.0.orig/src/hugin_base/panodata/PTScriptParsing.cpp hugin-0.7.0/src/hugin_base/panodata/PTScriptParsing.cpp --- hugin-0.7.0.orig/src/hugin_base/panodata/PTScriptParsing.cpp 2009-03-01 20:59:17.000000000 +0000 +++ hugin-0.7.0/src/hugin_base/panodata/PTScriptParsing.cpp 2009-03-01 22:58:55.000000000 +0000 @@ -25,6 +25,7 @@ #include "PTScriptParsing.h" #include +#include namespace HuginBase { Index: hugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/hugin/devel/hugin.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- hugin.spec 25 Feb 2009 04:20:09 -0000 1.18 +++ hugin.spec 1 Mar 2009 23:18:18 -0000 1.19 @@ -1,7 +1,7 @@ Summary: Panoramic photo stitcher, similar to PTGui for Windows Name: hugin Version: 0.7.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Applications/Multimedia Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.gz @@ -12,6 +12,7 @@ BuildRequires: libpano13-devel zlib-devel libtiff-devel libjpeg-devel BuildRequires: libpng-devel gettext-devel wxGTK-devel >= 2.6.0 boost-devel BuildRequires: cmake desktop-file-utils OpenEXR-devel exiv2-devel +Patch1: hugin-0.7.0-includes.patch %description hugin can be used to stitch multiple images together. The resulting image can @@ -31,6 +32,7 @@ %prep %setup -q +%patch1 -p1 -b .includes # replace autopano-sift default with info message sed -i 's/"autopano-sift-c"/"autopano-noop.sh"/' \ src/hugin1/hugin/config_defaults.h @@ -107,6 +109,9 @@ %{_mandir}/man1/* %changelog +* Sun Mar 01 2009 Caol??n McNamara - 0.7.0-5 +- include stdio.h for snprintf and cstdio for std::sprintf + * Tue Feb 24 2009 Fedora Release Engineering - 0.7.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From whot at fedoraproject.org Sun Mar 1 23:23:29 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Sun, 1 Mar 2009 23:23:29 +0000 (UTC) Subject: rpms/xkeyboard-config/F-10 xkeyboard-config-1.4-ara.patch, NONE, 1.1 xkeyboard-config.spec, 1.27, 1.28 Message-ID: <20090301232329.9D2A670115@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/xkeyboard-config/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15801 Modified Files: xkeyboard-config.spec Added Files: xkeyboard-config-1.4-ara.patch Log Message: * Mon Mar 02 2009 Peter Hutterer - 1.4-7 - xkeyboard-config-1.4-ara.patch: restore ara presentation forms (#466627). xkeyboard-config-1.4-ara.patch: --- NEW FILE xkeyboard-config-1.4-ara.patch --- >From c3b2fd97444f47e726b7916dd1a3ce04ada2d88d Mon Sep 17 00:00:00 2001 From: Sergey V. Udaltsov Date: Fri, 12 Dec 2008 12:01:40 +0000 Subject: [PATCH] restore presentation forms, b.fd.o#18833 --- symbols/ara | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/symbols/ara b/symbols/ara index a42fc69..9fa40e9 100644 --- a/symbols/ara +++ b/symbols/ara @@ -31,7 +31,7 @@ xkb_symbols "basic" { key { [ Arabic_sad, Arabic_fathatan ] }; key { [ Arabic_theh, Arabic_damma ] }; key { [ Arabic_qaf, Arabic_dammatan ] }; - key { [ Arabic_feh, VoidSymbol ] }; + key { [ Arabic_feh, 0x100fef9 ] }; key { [ Arabic_ghain, Arabic_hamzaunderalef ] }; key { [ Arabic_ain, grave ] }; key { [ Arabic_ha, division ] }; @@ -44,7 +44,7 @@ xkb_symbols "basic" { key { [ Arabic_seen, Arabic_kasratan ] }; key { [ Arabic_yeh, bracketright ] }; key { [ Arabic_beh, bracketleft ] }; - key { [ Arabic_lam, VoidSymbol ] }; + key { [ Arabic_lam, 0x100fef7 ] }; key { [ Arabic_alef, Arabic_hamzaonalef ] }; key { [ Arabic_teh, Arabic_tatweel ] }; key { [ Arabic_noon, Arabic_comma ] }; @@ -57,7 +57,7 @@ xkb_symbols "basic" { key { [ Arabic_hamza, Arabic_sukun ] }; key { [Arabic_hamzaonwaw, braceright ] }; key { [ Arabic_ra, braceleft ] }; - key { [ VoidSymbol, VoidSymbol ] }; + key { [ 0x100fefb, 0x100fef5 ] }; key { [Arabic_alefmaksura, Arabic_maddaonalef ] }; key { [Arabic_tehmarbuta, apostrophe ] }; key { [ Arabic_waw, comma ] }; -- 1.6.0.6 Index: xkeyboard-config.spec =================================================================== RCS file: /cvs/pkgs/rpms/xkeyboard-config/F-10/xkeyboard-config.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- xkeyboard-config.spec 4 Jan 2009 23:15:24 -0000 1.27 +++ xkeyboard-config.spec 1 Mar 2009 23:22:59 -0000 1.28 @@ -4,7 +4,7 @@ Summary: xkeyboard-config alternative xkb data files Name: xkeyboard-config Version: 1.4 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org @@ -21,6 +21,9 @@ Patch5: xkeyboard-config-1.4-jp-tilde.patch # RH 470153, FDO Bug 18712 (fixed), taken from git Patch6: xkeyboard-config-1.4-abnt2.patch +# RH 466627, FDO bug 18333 (fixed), taken from git +Patch7: xkeyboard-config-1.4-ara.patch + BuildArch: noarch @@ -56,6 +59,7 @@ %patch4 -p1 -b .battery %patch5 -p1 -b .jp-tilde %patch6 -p1 -b .abnt2 +%patch7 -p1 -b .ara %build %configure \ @@ -95,6 +99,9 @@ %{_datadir}/X11/xkb/rules/xorg.xml %changelog +* Mon Mar 02 2009 Peter Hutterer - 1.4-7 +- xkeyboard-config-1.4-ara.patch: restore ara presentation forms (#466627). + * Mon Jan 05 2009 Peter Hutterer - 1.4-6 - xkeyboard-config-1.4-abnt2.patch: fix , and . mixup in abnt2 (#470153) From cweyl at fedoraproject.org Sun Mar 1 23:39:03 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 1 Mar 2009 23:39:03 +0000 (UTC) Subject: rpms/perl-JSON/devel .cvsignore, 1.9, 1.10 perl-JSON.spec, 1.12, 1.13 sources, 1.9, 1.10 Message-ID: <20090301233903.D706970115@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-JSON/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18781 Modified Files: .cvsignore perl-JSON.spec sources Log Message: * Sun Mar 01 2009 Chris Weyl 2.14-1 - update to 2.14 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-JSON/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 13 Oct 2008 04:26:45 -0000 1.9 +++ .cvsignore 1 Mar 2009 23:38:33 -0000 1.10 @@ -1 +1 @@ -JSON-2.12.tar.gz +JSON-2.14.tar.gz Index: perl-JSON.spec =================================================================== RCS file: /cvs/extras/rpms/perl-JSON/devel/perl-JSON.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-JSON.spec 26 Feb 2009 20:29:10 -0000 1.12 +++ perl-JSON.spec 1 Mar 2009 23:38:33 -0000 1.13 @@ -1,6 +1,6 @@ Name: perl-JSON -Version: 2.12 -Release: 3%{?dist} +Version: 2.14 +Release: 1%{?dist} Summary: Parse and convert to JSON (JavaScript Object Notation) License: GPL+ or Artistic Group: Development/Libraries @@ -78,6 +78,9 @@ %{_mandir}/man3/* %changelog +* Sun Mar 01 2009 Chris Weyl 2.14-1 +- update to 2.14 + * Thu Feb 26 2009 Fedora Release Engineering - 2.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-JSON/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 13 Oct 2008 04:26:45 -0000 1.9 +++ sources 1 Mar 2009 23:38:33 -0000 1.10 @@ -1 +1 @@ -5719ba98f607003295d99952c2ac2ea7 JSON-2.12.tar.gz +340d2e9eb18406e18c88475d7aa25edc JSON-2.14.tar.gz From whot at fedoraproject.org Sun Mar 1 23:42:43 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Sun, 1 Mar 2009 23:42:43 +0000 (UTC) Subject: rpms/xkeyboard-config/F-10 xkeyboard-config.spec,1.28,1.29 Message-ID: <20090301234243.755FF70115@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/xkeyboard-config/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19409 Modified Files: xkeyboard-config.spec Log Message: * Mon Mar 02 2009 Peter Hutterer - fix wrong FDO bug reference for xkeyboard-config-1.4-ara.patch. Index: xkeyboard-config.spec =================================================================== RCS file: /cvs/pkgs/rpms/xkeyboard-config/F-10/xkeyboard-config.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- xkeyboard-config.spec 1 Mar 2009 23:22:59 -0000 1.28 +++ xkeyboard-config.spec 1 Mar 2009 23:42:12 -0000 1.29 @@ -21,7 +21,7 @@ Patch5: xkeyboard-config-1.4-jp-tilde.patch # RH 470153, FDO Bug 18712 (fixed), taken from git Patch6: xkeyboard-config-1.4-abnt2.patch -# RH 466627, FDO bug 18333 (fixed), taken from git +# RH 466627, FDO bug 18833 (fixed), taken from git Patch7: xkeyboard-config-1.4-ara.patch @@ -99,6 +99,9 @@ %{_datadir}/X11/xkb/rules/xorg.xml %changelog +* Mon Mar 02 2009 Peter Hutterer +- fix wrong FDO bug reference for xkeyboard-config-1.4-ara.patch. + * Mon Mar 02 2009 Peter Hutterer - 1.4-7 - xkeyboard-config-1.4-ara.patch: restore ara presentation forms (#466627). From dchen at fedoraproject.org Sun Mar 1 23:59:00 2009 From: dchen at fedoraproject.org (Ding-Yi Chen) Date: Sun, 1 Mar 2009 23:59:00 +0000 (UTC) Subject: rpms/man-pages-es/devel import.log, NONE, 1.1 man-pages-es.spec, 1.21, 1.22 Message-ID: <20090301235900.2C36670115@cvs1.fedora.phx.redhat.com> Author: dchen Update of /cvs/pkgs/rpms/man-pages-es/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22547/devel Modified Files: man-pages-es.spec Added Files: import.log Log Message: Fixed Bug #487941 --- NEW FILE import.log --- man-pages-es-1_55-7_fc10:HEAD:man-pages-es-1.55-7.fc10.src.rpm:1235951844 Index: man-pages-es.spec =================================================================== RCS file: /cvs/pkgs/rpms/man-pages-es/devel/man-pages-es.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- man-pages-es.spec 25 Feb 2009 23:09:51 -0000 1.21 +++ man-pages-es.spec 1 Mar 2009 23:58:29 -0000 1.22 @@ -1,7 +1,7 @@ Summary: Spanish man pages from the Linux Documentation Project Name: man-pages-es Version: 1.55 -Release: 6%{?dist} +Release: 7%{?dist} # These man pages come under various copyrights. # All are freely distributable when the nroff source is included. License: IEEE @@ -98,6 +98,9 @@ #[Bug 427684] man-pages fileconflict #- Fix the conflict with vipw.8 (in shadow-utils) rm $RPM_BUILD_ROOT%{_mandir}/es/man8/vipw.8 +#[Bug 487941]File conflict between man-pages-es-extra and shadow-utils +rm $RPM_BUILD_ROOT%{_mandir}/es/man8/vigr.8 + %clean rm -fr $RPM_BUILD_ROOT @@ -1703,12 +1706,16 @@ %{_mandir}/es/man8/umount.8.gz %{_mandir}/es/man8/update.8.gz %{_mandir}/es/man8/vidmode.8.gz -%{_mandir}/es/man8/vigr.8.gz +#%{_mandir}/es/man8/vigr.8.gz %{_mandir}/es/man8/vmstat.8.gz %changelog +* Mon Mar 03 2009 Ding-Yi Chen - 1.55-7 +- #[Bug 487941]File conflict between man-pages-es-extra and shadow-utils + Removed es/man8/vigr.8.gz + * Wed Feb 25 2009 Fedora Release Engineering - 1.55-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From dchen at fedoraproject.org Mon Mar 2 00:00:23 2009 From: dchen at fedoraproject.org (Ding-Yi Chen) Date: Mon, 2 Mar 2009 00:00:23 +0000 (UTC) Subject: rpms/man-pages-es/F-10 import.log, NONE, 1.1 man-pages-es.spec, 1.20, 1.21 Message-ID: <20090302000023.9DEC870115@cvs1.fedora.phx.redhat.com> Author: dchen Update of /cvs/pkgs/rpms/man-pages-es/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22946/F-10 Modified Files: man-pages-es.spec Added Files: import.log Log Message: Fixed Bug #487941 --- NEW FILE import.log --- man-pages-es-1_55-7_fc10:F-10:man-pages-es-1.55-7.fc10.src.rpm:1235951957 Index: man-pages-es.spec =================================================================== RCS file: /cvs/pkgs/rpms/man-pages-es/F-10/man-pages-es.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- man-pages-es.spec 8 Jan 2008 00:03:13 -0000 1.20 +++ man-pages-es.spec 1 Mar 2009 23:59:53 -0000 1.21 @@ -1,7 +1,7 @@ Summary: Spanish man pages from the Linux Documentation Project Name: man-pages-es Version: 1.55 -Release: 5%{?dist} +Release: 7%{?dist} # These man pages come under various copyrights. # All are freely distributable when the nroff source is included. License: IEEE @@ -98,6 +98,9 @@ #[Bug 427684] man-pages fileconflict #- Fix the conflict with vipw.8 (in shadow-utils) rm $RPM_BUILD_ROOT%{_mandir}/es/man8/vipw.8 +#[Bug 487941]File conflict between man-pages-es-extra and shadow-utils +rm $RPM_BUILD_ROOT%{_mandir}/es/man8/vigr.8 + %clean rm -fr $RPM_BUILD_ROOT @@ -1703,12 +1706,19 @@ %{_mandir}/es/man8/umount.8.gz %{_mandir}/es/man8/update.8.gz %{_mandir}/es/man8/vidmode.8.gz -%{_mandir}/es/man8/vigr.8.gz +#%{_mandir}/es/man8/vigr.8.gz %{_mandir}/es/man8/vmstat.8.gz %changelog +* Mon Mar 03 2009 Ding-Yi Chen - 1.55-7 +- #[Bug 487941]File conflict between man-pages-es-extra and shadow-utils + Removed es/man8/vigr.8.gz + +* Wed Feb 25 2009 Fedora Release Engineering - 1.55-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Jan 08 2008 Ding-Yi Chen - 1.55-5 - Bug 427684: man-pages fileconflict - Fix the conflict with vipw.8 (in shadow-utils) From pwouters at fedoraproject.org Mon Mar 2 00:05:27 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Mon, 2 Mar 2009 00:05:27 +0000 (UTC) Subject: rpms/dnssec-conf/devel dnssec-conf.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <20090302000527.EACD670115@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/dnssec-conf/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24552 Modified Files: dnssec-conf.spec sources Log Message: * Sun Mar 01 2009 Paul Wouters - 1.16-1 - Upgraded to 1.16. This adds the production key for .gov See http://dotgov.gov/dnssecinfo.aspx Index: dnssec-conf.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/devel/dnssec-conf.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dnssec-conf.spec 24 Feb 2009 12:14:10 -0000 1.4 +++ dnssec-conf.spec 2 Mar 2009 00:04:57 -0000 1.5 @@ -1,7 +1,7 @@ -Summary: DNSSEC and DLV configuration tool (and TLD repository until the root is signed) +Summary: DNSSEC and DLV configuration and priming tool Name: dnssec-conf -Version: 1.15 -Release: 2 +Version: 1.16 +Release: 1 License: GPLv2+ Url: http://www.xelerance.com/software/dnssec-conf/ Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz @@ -51,6 +51,10 @@ %{_mandir}/*/* %changelog +* Sun Mar 01 2009 Paul Wouters - 1.16-1 +- Upgraded to 1.16. This adds the production key for .gov + See http://dotgov.gov/dnssecinfo.aspx + * Tue Feb 24 2009 Fedora Release Engineering - 1.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Feb 2009 20:54:43 -0000 1.3 +++ sources 2 Mar 2009 00:04:57 -0000 1.4 @@ -1 +1 @@ -5f892b24abc5e8c10325f9aef2680087 dnssec-conf-1.15.tar.gz +62890fd2bc3e23e198c7eae432f55b17 dnssec-conf-1.16.tar.gz From jkratoch at fedoraproject.org Mon Mar 2 00:12:07 2009 From: jkratoch at fedoraproject.org (Jan Kratochvil) Date: Mon, 2 Mar 2009 00:12:07 +0000 (UTC) Subject: rpms/gdb/devel gdb-archer.patch, NONE, 1.1 .cvsignore, 1.30, 1.31 gdb-6.3-gstack-20050411.patch, 1.3, 1.4 gdb-6.3-ia64-gcore-speedup-20050714.patch, 1.3, 1.4 gdb-6.3-large-core-20051206.patch, 1.7, 1.8 gdb-6.3-pie-20050110.patch, 1.12, 1.13 gdb-6.3-readnever-20050907.patch, 1.3, 1.4 gdb-6.3-security-errata-20050610.patch, 1.6, 1.7 gdb-6.3-test-self-20050110.patch, 1.1, 1.2 gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch, 1.8, 1.9 gdb-6.6-buildid-locate.patch, 1.16, 1.17 gdb-6.6-step-thread-exit.patch, 1.3, 1.4 gdb-6.8-inlining-addon.patch, 1.3, 1.4 gdb-6.8-inlining.patch, 1.7, 1.8 gdb.spec, 1.323, 1.324 sources, 1.29, 1.30 gdb-6.6-buildid-readnever-silent.patch, 1.2, NONE gdb-6.8-bz377541-vla.patch, 1.5, NONE Message-ID: <20090302001207.0A46270115@cvs1.fedora.phx.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25900 Modified Files: .cvsignore gdb-6.3-gstack-20050411.patch gdb-6.3-ia64-gcore-speedup-20050714.patch gdb-6.3-large-core-20051206.patch gdb-6.3-pie-20050110.patch gdb-6.3-readnever-20050907.patch gdb-6.3-security-errata-20050610.patch gdb-6.3-test-self-20050110.patch gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch gdb-6.6-buildid-locate.patch gdb-6.6-step-thread-exit.patch gdb-6.8-inlining-addon.patch gdb-6.8-inlining.patch gdb.spec sources Added Files: gdb-archer.patch Removed Files: gdb-6.6-buildid-readnever-silent.patch gdb-6.8-bz377541-vla.patch Log Message: Backup of a draft Archer port - before importing archer-keiths-expr-cumulative. gdb-archer.patch: --- NEW FILE gdb-archer.patch --- diff --git a/gdb/Makefile.in b/gdb/Makefile.in index af3f534..716884d 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -167,11 +167,16 @@ INTL_CFLAGS = @INCINTL@ # Where is the ICONV library? This can be empty if libc has iconv. LIBICONV = @LIBICONV@ +LIBICONV_INCLUDE = @LIBICONV_INCLUDE@ +LIBICONV_LIBDIR = @LIBICONV_LIBDIR@ # Did the user give us a --with-sysroot option? TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@ +# Did the user give us a --with-gdb-datadir option? +GDB_DATADIR_PATH = @GDB_DATADIR_PATH@ + # Helper code from gnulib. LIBGNU = gnulib/libgnu.a INCGNU = -I$(srcdir)/gnulib -Ignulib @@ -270,12 +275,34 @@ SUBDIR_TUI_CFLAGS= \ # SUBDIR_PYTHON_OBS = \ python.o \ + python-block.o \ + python-breakpoint.o \ python-cmd.o \ + python-frame.o \ + python-function.o \ + python-hooks.o \ + python-membuf.o \ + python-objfile.o \ + python-param.o \ + python-symbol.o \ + python-symtab.o \ + python-type.o \ python-utils.o \ python-value.o SUBDIR_PYTHON_SRCS = \ python/python.c \ + python/python-block.c \ + python/python-breakpoint.c \ python/python-cmd.c \ + python/python-frame.c \ + python/python-function.c \ + python/python-hooks.c \ + python/python-membuf.c \ + python/python-objfile.c \ + python/python-param.c \ + python/python-symbol.c \ + python/python-symtab.c \ + python/python-type.c \ python/python-utils.c \ python/python-value.c SUBDIR_PYTHON_DEPS = @@ -389,7 +416,8 @@ INTERNAL_CFLAGS_BASE = \ $(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \ $(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \ $(BFD_CFLAGS) $(INCLUDE_CFLAGS) $(LIBDECNUMBER_CFLAGS) \ - $(INTL_CFLAGS) $(INCGNU) $(ENABLE_CFLAGS) $(INTERNAL_CPPFLAGS) + $(INTL_CFLAGS) $(INCGNU) $(ENABLE_CFLAGS) $(INTERNAL_CPPFLAGS) \ + $(LIBICONV_INCLUDE) INTERNAL_WARN_CFLAGS = $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS) INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS) @@ -401,7 +429,7 @@ LDFLAGS = @LDFLAGS@ # I think it's perfectly reasonable for a user to set -pg in CFLAGS # and have it work; that's why CFLAGS is here. # PROFILE_CFLAGS is _not_ included, however, because we use monstartup. -INTERNAL_LDFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(MH_LDFLAGS) $(LDFLAGS) $(CONFIG_LDFLAGS) +INTERNAL_LDFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(MH_LDFLAGS) $(LDFLAGS) $(CONFIG_LDFLAGS) $(LIBICONV_LIBDIR) # If your system is missing alloca(), or, more likely, it's there but # it doesn't work, then refer to libiberty. @@ -662,6 +690,7 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \ valarith.c valops.c valprint.c value.c varobj.c vec.c \ wrapper.c \ xml-tdesc.c xml-support.c \ + xml-syscall.c \ inferior.c LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c @@ -732,7 +761,8 @@ config/sparc/nm-sol2.h config/nm-linux.h config/mips/nm-irix5.h \ config/rs6000/nm-rs6000.h top.h bsd-kvm.h gdb-stabs.h reggroups.h \ annotate.h sim-regno.h dictionary.h dfp.h main.h frame-unwind.h \ remote-fileio.h i386-linux-tdep.h vax-tdep.h objc-lang.h \ -sentinel-frame.h bcache.h symfile.h windows-tdep.h linux-tdep.h +sentinel-frame.h bcache.h symfile.h windows-tdep.h linux-tdep.h xml-syscall.h \ +python/python.h python/python-internal.h # Header files that already have srcdir in them, or which are in objdir. @@ -811,10 +841,16 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \ trad-frame.o \ tramp-frame.o \ solib.o solib-null.o \ - prologue-value.o memory-map.o xml-support.o \ + prologue-value.o memory-map.o xml-support.o xml-syscall.o \ target-descriptions.o target-memory.o xml-tdesc.o xml-builtin.o \ inferior.o osdata.o +# Definitions for the syscall's XML files and dir +XML_SYSCALLS_DIR = syscalls/ +XML_SYSCALLS_FILES = gdb-syscalls.dtd \ + ppc-linux.xml ppc64-linux.xml \ + i386-linux.xml amd64-linux.xml + TSOBS = inflow.o SUBDIRS = @subdirs@ @@ -848,11 +884,38 @@ generated_files = config.h observer.h observer.inc ada-lex.c \ $(COMPILE) $< $(POSTCOMPILE) -all: gdb$(EXEEXT) $(CONFIG_ALL) +all: gdb$(EXEEXT) $(CONFIG_ALL) .gdbinit xml-syscall-copy @$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do .PHONY: all-tui all-tui: $(TUI)$(EXEEXT) +xml-syscall-copy: + if [ "`cd $(srcdir) && pwd`" != "`pwd`" ] ; then \ + mkdir -p ./$(XML_SYSCALLS_DIR) ; \ + list='$(XML_SYSCALLS_FILES)' ; \ + for file in $$list ; do \ + f=$(srcdir)/$(XML_SYSCALLS_DIR)/$$file ; \ + if test -f $$f ; then \ + $(INSTALL_DATA) $$f \ + ./$(XML_SYSCALLS_DIR) ; \ + fi ; \ + done ; \ + fi ; + +# This target is responsible for properly installing the syscalls' +# XML files in the system. +xml-syscall-install: + $(SHELL) $(srcdir)/../mkinstalldirs \ + $(DESTDIR)$(GDB_DATADIR_PATH)/$(XML_SYSCALLS_DIR) ; \ + list='$(XML_SYSCALLS_FILES)' ; \ + for file in $$list ; do \ + f=$(srcdir)/$(XML_SYSCALLS_DIR)/$$file ; \ + if test -f $$f ; then \ + $(INSTALL_DATA) $$f \ + $(DESTDIR)$(GDB_DATADIR_PATH)/$(XML_SYSCALLS_DIR) ; \ + fi ; \ + done ; + installcheck: # The check target can not use subdir_do, because subdir_do does not @@ -906,8 +969,11 @@ gdb.z:gdb.1 # source file and doesn't care about rebuilding or just wants to save the # time it takes for make to check that all is up to date. # install-only is intended to address that need. -install: all install-only -install-only: $(CONFIG_INSTALL) +install: all install-only + +# The "install-only" target also installs the syscalls' XML files in +# the system. +install-only: $(CONFIG_INSTALL) xml-syscall-install transformed_name=`t='$(program_transform_name)'; \ echo gdb | sed -e "$$t"` ; \ if test "x$$transformed_name" = x; then \ @@ -1200,6 +1266,12 @@ stamp-h: config.in config.status CONFIG_LINKS= \ $(SHELL) config.status +.gdbinit: gdbinit.in config.status + CONFIG_FILES=".gdbinit:gdbinit.in" \ + CONFIG_COMMANDS= \ + CONFIG_HEADERS= \ + $(SHELL) config.status + config.status: configure configure.tgt configure.host $(SHELL) config.status --recheck @@ -1843,10 +1915,54 @@ python.o: $(srcdir)/python/python.c $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python.c $(POSTCOMPILE) +python-block.o: $(srcdir)/python/python-block.c + $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-block.c + $(POSTCOMPILE) + +python-breakpoint.o: $(srcdir)/python/python-breakpoint.c + $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-breakpoint.c + $(POSTCOMPILE) + python-cmd.o: $(srcdir)/python/python-cmd.c $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-cmd.c $(POSTCOMPILE) +python-frame.o: $(srcdir)/python/python-frame.c + $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-frame.c + $(POSTCOMPILE) + +python-function.o: $(srcdir)/python/python-function.c [...35180 lines suppressed...] +static struct syscalls_info * +syscall_parse_xml (const char *document, xml_fetch_another fetcher, + void *fetcher_baton) +{ + struct cleanup *result_cleanup; + struct gdb_xml_parser *parser; + struct syscall_parsing_data data; + char *expanded_text; + int i; + + parser = gdb_xml_create_parser_and_cleanup (_("syscalls info"), + syselements, &data); + + memset (&data, 0, sizeof (struct syscall_parsing_data)); + data.sysinfo = allocate_syscalls_info (); + result_cleanup = make_cleanup_free_syscalls_info (data.sysinfo); + + if (gdb_xml_parse (parser, document) == 0) + { + /* Parsed successfully. */ + discard_cleanups (result_cleanup); + return data.sysinfo; + } + else + { + warning (_("Could not load XML syscalls info; ignoring")); + do_cleanups (result_cleanup); + return NULL; + } +} + +const struct syscalls_info * +xml_init_syscalls_info (const char *filename) +{ + char *full_file; + char *dirname; + struct syscalls_info *sysinfo; + struct cleanup *back_to; + + full_file = fetch_xml_from_file (filename, gdb_datadir); + if (full_file == NULL) + { + warning (_("Could not open \"%s\""), filename); + return NULL; + } + + back_to = make_cleanup (xfree, full_file); + + dirname = ldirname (filename); + if (dirname != NULL) + make_cleanup (xfree, dirname); + + sysinfo = syscall_parse_xml (full_file, fetch_xml_from_file, dirname); + do_cleanups (back_to); + + return sysinfo; +} + +int +xml_get_syscall_number (const struct syscalls_info *sysinfo, + const char *syscall_name) +{ + struct syscall_desc *sysdesc; + int i; + + if (sysinfo == NULL + || syscall_name == NULL) + return UNKNOWN_SYSCALL; + + for (i = 0; + VEC_iterate(syscall_desc_p, sysinfo->syscalls, i, sysdesc); + i++) + if (strcmp (sysdesc->name, syscall_name) == 0) + return sysdesc->number; + + return UNKNOWN_SYSCALL; +} + +const char * +xml_get_syscall_name (const struct syscalls_info *sysinfo, + int syscall_number) +{ + struct syscall_desc *sysdesc; + int i; + + if (sysinfo == NULL + || syscall_number < 0) + return NULL; + + for (i = 0; + VEC_iterate(syscall_desc_p, sysinfo->syscalls, i, sysdesc); + i++) + if (sysdesc->number == syscall_number) + return sysdesc->name; + + return NULL; +} + +int +xml_number_of_syscalls (const struct syscalls_info *sysinfo) +{ + return (sysinfo == NULL ? 0 : VEC_length(syscall_desc_p, + sysinfo->syscalls)); +} + +const char ** +xml_list_of_syscalls (const struct syscalls_info *sysinfo) +{ + struct syscall_desc *sysdesc; + const char **names = NULL; + int nsyscalls; + int i; + + if (sysinfo == NULL) + return NULL; + + nsyscalls = VEC_length (syscall_desc_p, sysinfo->syscalls); + names = xmalloc ((nsyscalls + 1) * sizeof (char *)); + + for (i = 0; + VEC_iterate (syscall_desc_p, sysinfo->syscalls, i, sysdesc); + i++) + names[i] = sysdesc->name; + + names[i] = NULL; + + return names; +} + +#endif /* HAVE_LIBEXPAT */ diff --git a/gdb/xml-syscall.h b/gdb/xml-syscall.h new file mode 100644 index 0000000..ff11f20 --- /dev/null +++ b/gdb/xml-syscall.h @@ -0,0 +1,64 @@ +/* Functions that provide the mechanism to parse a syscall XML file + and get its values. + + Copyright (C) 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, + 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008 + Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef XML_SYSCALL_H +#define XML_SYSCALL_H 1 + +/* Structure that stores information about the system's + syscalls. */ + +struct syscalls_info; + + +/* Function responsible for initializing the information + about the syscalls. It reads the XML file and fills the + struct syscalls_info with the values. + + Returns the struct syscalls_info if the file is valid, NULL otherwise. */ + +const struct syscalls_info *xml_init_syscalls_info (const char *); + +/* Function that retrieves the syscall number corresponding to the given + name. + + Returns the syscall number if found, or otherwise. */ + +int xml_get_syscall_number (const struct syscalls_info *, const char *); + +/* Function that retrieves the syscall name corresponding to the given + number. + + Returns the syscall name if found, NULL otherwise. */ +const char *xml_get_syscall_name (const struct syscalls_info *, int); + +/* Function that returns the number of syscalls defined in the system. + + Returns the number of syscalls, or zero otherwise. */ +int xml_number_of_syscalls (const struct syscalls_info *); + +/* Function used to retrieve the list of syscalls in the system. This list + is returned as an array of strings. + + Returns the list of syscalls in the system, or NULL otherwise. */ +const char **xml_list_of_syscalls (const struct syscalls_info *sysinfo); + +#endif /* XML_SYSCALL_H */ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 11 Feb 2009 00:43:22 -0000 1.30 +++ .cvsignore 2 Mar 2009 00:11:34 -0000 1.31 @@ -1 +1 @@ -gdb-6.8.50.20090210.tar.bz2 +gdb-6.8.50.20090228.tar.bz2 gdb-6.3-gstack-20050411.patch: Index: gdb-6.3-gstack-20050411.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-gstack-20050411.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.3-gstack-20050411.patch 14 Dec 2008 14:05:14 -0000 1.3 +++ gdb-6.3-gstack-20050411.patch 2 Mar 2009 00:11:34 -0000 1.4 @@ -4,20 +4,20 @@ to install and uninstall. * gstack.sh, gstack.1: New files. -Index: gdb-6.8.50.20081128/gdb/Makefile.in +Index: gdb-6.8.50.20090226/gdb/Makefile.in =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/Makefile.in 2008-12-01 16:11:48.000000000 +0100 -+++ gdb-6.8.50.20081128/gdb/Makefile.in 2008-12-01 16:14:11.000000000 +0100 -@@ -902,7 +902,7 @@ gdb.z:gdb.1 - # time it takes for make to check that all is up to date. - # install-only is intended to address that need. - install: all install-only --install-only: $(CONFIG_INSTALL) -+install-only: install-gstack $(CONFIG_INSTALL) +--- gdb-6.8.50.20090226.orig/gdb/Makefile.in 2009-02-26 22:09:59.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/Makefile.in 2009-02-26 22:10:22.000000000 +0100 +@@ -973,7 +973,7 @@ install: all install-only + + # The "install-only" target also installs the syscalls' XML files in + # the system. +-install-only: $(CONFIG_INSTALL) xml-syscall-install ++install-only: install-gstack $(CONFIG_INSTALL) xml-syscall-install transformed_name=`t='$(program_transform_name)'; \ echo gdb | sed -e "$$t"` ; \ if test "x$$transformed_name" = x; then \ -@@ -934,9 +934,26 @@ install-tui: +@@ -1005,9 +1005,26 @@ install-tui: $(DESTDIR)$(man1dir) ; \ $(INSTALL_DATA) $(srcdir)/gdb.1 \ $(DESTDIR)$(man1dir)/$$transformed_name.1 @@ -45,7 +45,7 @@ transformed_name=`t='$(program_transform_name)'; \ echo gdb | sed -e $$t` ; \ if test "x$$transformed_name" = x; then \ -@@ -958,6 +975,17 @@ uninstall-tui: +@@ -1029,6 +1046,17 @@ uninstall-tui: fi ; \ rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \ $(DESTDIR)$(man1dir)/$$transformed_name.1 @@ -63,10 +63,10 @@ # The C++ name parser can be built standalone for testing. test-cp-name-parser.o: cp-name-parser.c -Index: gdb-6.8.50.20081128/gdb/gstack.sh +Index: gdb-6.8.50.20090226/gdb/gstack.sh =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20081128/gdb/gstack.sh 2008-12-01 16:13:16.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/gstack.sh 2009-02-26 22:10:05.000000000 +0100 @@ -0,0 +1,45 @@ +#!/bin/sh + gdb-6.3-ia64-gcore-speedup-20050714.patch: Index: gdb-6.3-ia64-gcore-speedup-20050714.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-ia64-gcore-speedup-20050714.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.3-ia64-gcore-speedup-20050714.patch 14 Dec 2008 14:05:14 -0000 1.3 +++ gdb-6.3-ia64-gcore-speedup-20050714.patch 2 Mar 2009 00:11:34 -0000 1.4 @@ -7,22 +7,11 @@ (ia64_rse_skip_regs): Ditto. (ia64_linux_check_stack_region): New function. -Index: gdb-6.8.50.20081209/gdb/linux-nat.c +Index: gdb-6.8.50.20090226/gdb/linux-nat.c =================================================================== ---- gdb-6.8.50.20081209.orig/gdb/linux-nat.c 2008-12-10 01:25:43.000000000 +0100 -+++ gdb-6.8.50.20081209/gdb/linux-nat.c 2008-12-10 01:27:09.000000000 +0100 -@@ -3246,7 +3246,9 @@ linux_nat_xfer_partial (struct target_op - do_cleanups (old_chain); - return xfer; - } -- -+#ifdef NATIVE_XFER_UNWIND_TABLE -+extern int ia64_linux_check_stack_region(struct lwp_info *lwp, void *range); -+#endif - static int - linux_nat_thread_alive (ptid_t ptid) - { -@@ -4148,15 +4150,34 @@ linux_xfer_partial (struct target_ops *o +--- gdb-6.8.50.20090226.orig/gdb/linux-nat.c 2009-02-27 07:51:44.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/linux-nat.c 2009-02-28 07:19:05.000000000 +0100 +@@ -4386,15 +4386,38 @@ linux_xfer_partial (struct target_ops *o return linux_nat_xfer_osdata (ops, object, annex, readbuf, writebuf, offset, len); @@ -43,6 +32,10 @@ + /* FIXME: For ia64, we cannot currently use + linux_proc_xfer_partial for accessing rse register storage. + Revert when Bugzilla 147436 is fixed. */ ++#ifdef NATIVE_XFER_UNWIND_TABLE ++ extern int ia64_linux_check_stack_region (struct lwp_info *lwp, ++ void *range); ++#endif + if (iterate_over_lwps (ia64_linux_check_stack_region, &range) != NULL) + { /* This region contains ia64 rse registers, we have to re-read. */ + int xxfer; @@ -62,11 +55,11 @@ return super_xfer_partial (ops, object, annex, readbuf, writebuf, offset, len); -Index: gdb-6.8.50.20081209/gdb/ia64-linux-nat.c +Index: gdb-6.8.50.20090226/gdb/ia64-linux-nat.c =================================================================== ---- gdb-6.8.50.20081209.orig/gdb/ia64-linux-nat.c 2008-08-15 10:08:27.000000000 +0200 -+++ gdb-6.8.50.20081209/gdb/ia64-linux-nat.c 2008-12-10 01:25:53.000000000 +0100 -@@ -807,6 +807,64 @@ ia64_linux_xfer_partial (struct target_o +--- gdb-6.8.50.20090226.orig/gdb/ia64-linux-nat.c 2009-02-23 01:03:49.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/ia64-linux-nat.c 2009-02-28 07:18:10.000000000 +0100 +@@ -809,6 +809,64 @@ ia64_linux_xfer_partial (struct target_o void _initialize_ia64_linux_nat (void); gdb-6.3-large-core-20051206.patch: Index: gdb-6.3-large-core-20051206.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-large-core-20051206.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gdb-6.3-large-core-20051206.patch 11 Feb 2009 00:04:47 -0000 1.7 +++ gdb-6.3-large-core-20051206.patch 2 Mar 2009 00:11:34 -0000 1.8 @@ -25,10 +25,10 @@ Port to GDB-6.7. -Index: gdb-6.8.50.20090209/gdb/symfile-mem.c +Index: gdb-6.8.50.20090226/gdb/symfile-mem.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/symfile-mem.c 2009-01-03 06:57:53.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/symfile-mem.c 2009-02-09 15:49:25.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/symfile-mem.c 2009-02-21 17:14:49.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/symfile-mem.c 2009-02-28 07:22:09.000000000 +0100 @@ -56,6 +56,14 @@ #include "elf/common.h" @@ -53,10 +53,10 @@ if (nbfd == NULL) error (_("Failed to read a valid object file image from memory.")); -Index: gdb-6.8.50.20090209/gdb/target.c +Index: gdb-6.8.50.20090226/gdb/target.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/target.c 2009-02-06 23:21:26.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/target.c 2009-02-09 15:50:39.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/target.c 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/target.c 2009-02-28 07:22:09.000000000 +0100 @@ -57,7 +57,7 @@ static int nosymbol (char *, CORE_ADDR * static void tcomplain (void) ATTR_NORETURN; @@ -66,7 +66,7 @@ static int return_zero (void); -@@ -294,7 +294,7 @@ target_create_inferior (char *exec_file, +@@ -286,7 +286,7 @@ target_create_inferior (char *exec_file, } @@ -75,7 +75,7 @@ nomemory (CORE_ADDR memaddr, char *myaddr, int len, int write, struct target_ops *t) { -@@ -522,7 +522,7 @@ update_current_target (void) +@@ -507,7 +507,7 @@ update_current_target (void) (void (*) (struct regcache *)) noprocess); de_fault (deprecated_xfer_memory, @@ -84,7 +84,7 @@ nomemory); de_fault (to_files_info, (void (*) (struct target_ops *)) -@@ -1252,7 +1252,7 @@ target_xfer_partial (struct target_ops * +@@ -1237,7 +1237,7 @@ target_xfer_partial (struct target_ops * it makes no progress, and then return how much was transferred). */ int @@ -93,7 +93,7 @@ { if (target_read (¤t_target, TARGET_OBJECT_MEMORY, NULL, myaddr, memaddr, len) == len) -@@ -1262,7 +1262,7 @@ target_read_memory (CORE_ADDR memaddr, g +@@ -1247,7 +1247,7 @@ target_read_memory (CORE_ADDR memaddr, g } int @@ -102,7 +102,7 @@ { if (target_write (¤t_target, TARGET_OBJECT_MEMORY, NULL, myaddr, memaddr, len) == len) -@@ -2723,8 +2723,8 @@ debug_to_prepare_to_store (struct regcac +@@ -2777,8 +2777,8 @@ debug_to_prepare_to_store (struct regcac fprintf_unfiltered (gdb_stdlog, "target_prepare_to_store ()\n"); } @@ -113,7 +113,7 @@ int write, struct mem_attrib *attrib, struct target_ops *target) { -@@ -2734,8 +2734,8 @@ deprecated_debug_xfer_memory (CORE_ADDR +@@ -2788,8 +2788,8 @@ deprecated_debug_xfer_memory (CORE_ADDR attrib, target); fprintf_unfiltered (gdb_stdlog, @@ -124,11 +124,11 @@ retval); if (retval > 0) -Index: gdb-6.8.50.20090209/gdb/target.h +Index: gdb-6.8.50.20090226/gdb/target.h =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/target.h 2009-02-06 23:59:01.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/target.h 2009-02-09 15:49:25.000000000 +0100 -@@ -360,10 +360,10 @@ struct target_ops +--- gdb-6.8.50.20090226.orig/gdb/target.h 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/target.h 2009-02-28 07:22:09.000000000 +0100 +@@ -376,10 +376,10 @@ struct target_ops NOTE: cagney/2004-10-01: This has been entirely superseeded by to_xfer_partial and inferior inheritance. */ @@ -143,7 +143,7 @@ void (*to_files_info) (struct target_ops *); int (*to_insert_breakpoint) (struct bp_target_info *); -@@ -663,13 +663,14 @@ extern DCACHE *target_dcache; +@@ -679,13 +679,14 @@ extern DCACHE *target_dcache; extern int target_read_string (CORE_ADDR, char **, int, int *); @@ -162,10 +162,10 @@ /* Fetches the target's memory map. If one is found it is sorted and returned, after some consistency checking. Otherwise, NULL -Index: gdb-6.8.50.20090209/gdb/dcache.c +Index: gdb-6.8.50.20090226/gdb/dcache.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/dcache.c 2009-01-03 06:57:51.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/dcache.c 2009-02-09 15:49:25.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/dcache.c 2009-01-03 06:57:51.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/dcache.c 2009-02-28 07:22:09.000000000 +0100 @@ -524,9 +524,9 @@ dcache_free (DCACHE *dcache) This routine is indended to be called by remote_xfer_ functions. */ @@ -178,10 +178,10 @@ { int i; int (*xfunc) (DCACHE *dcache, CORE_ADDR addr, gdb_byte *ptr); -Index: gdb-6.8.50.20090209/gdb/dcache.h +Index: gdb-6.8.50.20090226/gdb/dcache.h =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/dcache.h 2009-01-03 06:57:51.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/dcache.h 2009-02-09 15:49:25.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/dcache.h 2009-01-03 06:57:51.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/dcache.h 2009-02-28 07:22:09.000000000 +0100 @@ -35,7 +35,7 @@ void dcache_free (DCACHE *); /* Simple to call from _xfer_memory */ @@ -192,11 +192,11 @@ + LONGEST len, int should_write); #endif /* DCACHE_H */ -Index: gdb-6.8.50.20090209/gdb/exec.c +Index: gdb-6.8.50.20090226/gdb/exec.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/exec.c 2009-01-08 17:32:29.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/exec.c 2009-02-09 15:49:25.000000000 +0100 -@@ -466,8 +466,8 @@ map_vmap (bfd *abfd, bfd *arch) +--- gdb-6.8.50.20090226.orig/gdb/exec.c 2009-02-22 20:35:47.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/exec.c 2009-02-28 07:22:09.000000000 +0100 +@@ -464,8 +464,8 @@ map_vmap (bfd *abfd, bfd *arch) The same routine is used to handle both core and exec files; we just tail-call it with more arguments to select between them. */ @@ -207,12 +207,12 @@ struct mem_attrib *attrib, struct target_ops *target) { int res; -Index: gdb-6.8.50.20090209/gdb/linux-nat.c +Index: gdb-6.8.50.20090226/gdb/linux-nat.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/linux-nat.c 2009-02-09 15:48:46.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/linux-nat.c 2009-02-09 15:49:25.000000000 +0100 -@@ -4283,7 +4283,7 @@ linux_xfer_partial (struct target_ops *o - Revert when Bugzilla 147436 is fixed. */ +--- gdb-6.8.50.20090226.orig/gdb/linux-nat.c 2009-02-28 07:22:02.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/linux-nat.c 2009-02-28 07:22:32.000000000 +0100 +@@ -4407,7 +4407,7 @@ linux_xfer_partial (struct target_ops *o + #endif if (iterate_over_lwps (ia64_linux_check_stack_region, &range) != NULL) { /* This region contains ia64 rse registers, we have to re-read. */ - int xxfer; @@ -220,10 +220,10 @@ /* Re-read register stack area. */ xxfer = super_xfer_partial (ops, object, annex, -Index: gdb-6.8.50.20090209/gdb/remote.c +Index: gdb-6.8.50.20090226/gdb/remote.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/remote.c 2009-02-06 23:59:00.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/remote.c 2009-02-09 15:49:25.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/remote.c 2009-02-25 03:14:22.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/remote.c 2009-02-28 07:22:09.000000000 +0100 @@ -25,6 +25,7 @@ #include "gdb_string.h" #include @@ -232,7 +232,7 @@ #include "inferior.h" #include "bfd.h" #include "symfile.h" -@@ -5688,12 +5689,19 @@ handle_notification (char *buf, size_t l +@@ -5683,12 +5684,19 @@ handle_notification (char *buf, size_t l if SHOULD_WRITE is nonzero. Returns length of data written or read; 0 for error. TARGET is unused. */ @@ -254,7 +254,7 @@ set_general_thread (inferior_ptid); -@@ -5702,7 +5710,7 @@ remote_xfer_memory (CORE_ADDR mem_addr, +@@ -5697,7 +5705,7 @@ remote_xfer_memory (CORE_ADDR mem_addr, else res = remote_read_bytes (mem_addr, buffer, mem_len); @@ -263,11 +263,11 @@ } /* Sends a packet with content determined by the printf format string -Index: gdb-6.8.50.20090209/gdb/remote-sim.c +Index: gdb-6.8.50.20090226/gdb/remote-sim.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/remote-sim.c 2009-02-06 23:21:26.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/remote-sim.c 2009-02-09 15:49:25.000000000 +0100 -@@ -757,11 +757,14 @@ gdbsim_prepare_to_store (struct regcache +--- gdb-6.8.50.20090226.orig/gdb/remote-sim.c 2009-02-23 19:31:23.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/remote-sim.c 2009-02-28 07:22:09.000000000 +0100 +@@ -754,11 +754,14 @@ gdbsim_prepare_to_store (struct regcache Returns the number of bytes transferred. */ @@ -284,7 +284,7 @@ /* If no program is running yet, then ignore the simulator for memory. Pass the request down to the next target, hopefully an exec file. */ -@@ -777,22 +780,22 @@ gdbsim_xfer_inferior_memory (CORE_ADDR m +@@ -774,22 +777,22 @@ gdbsim_xfer_inferior_memory (CORE_ADDR m printf_filtered ("gdbsim_xfer_inferior_memory: myaddr 0x"); gdb_print_host_address (myaddr, gdb_stdout); printf_filtered (", memaddr 0x%s, len %d, write %d\n", gdb-6.3-pie-20050110.patch: Index: gdb-6.3-pie-20050110.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-pie-20050110.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gdb-6.3-pie-20050110.patch 11 Feb 2009 00:04:47 -0000 1.12 +++ gdb-6.3-pie-20050110.patch 2 Mar 2009 00:11:34 -0000 1.13 @@ -26,10 +26,10 @@ Fix scan_dyntag() for binaries provided by valgrind (BZ 460319). -Index: gdb-6.8.50.20090209/gdb/amd64-tdep.c +Index: gdb-6.8.50.20090226/gdb/amd64-tdep.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/amd64-tdep.c 2009-02-09 16:02:28.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/amd64-tdep.c 2009-02-09 16:21:55.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/amd64-tdep.c 2009-02-28 07:31:48.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/amd64-tdep.c 2009-02-28 07:38:59.000000000 +0100 @@ -36,6 +36,7 @@ #include "regcache.h" #include "regset.h" @@ -38,7 +38,7 @@ #include "gdb_assert.h" -@@ -1597,16 +1598,28 @@ amd64_analyze_stack_align (CORE_ADDR pc, +@@ -1586,16 +1587,28 @@ amd64_analyze_stack_align (CORE_ADDR pc, Any function that doesn't start with this sequence will be assumed to have no prologue and thus no valid frame pointer in %rbp. */ @@ -71,7 +71,7 @@ pc = amd64_analyze_stack_align (pc, current_pc, cache); -@@ -1621,18 +1634,57 @@ amd64_analyze_prologue (CORE_ADDR pc, CO +@@ -1610,18 +1623,57 @@ amd64_analyze_prologue (CORE_ADDR pc, CO /* If that's all, return now. */ if (current_pc <= pc + 1) @@ -132,13 +132,13 @@ return pc; } -Index: gdb-6.8.50.20090209/gdb/auxv.c +Index: gdb-6.8.50.20090226/gdb/auxv.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/auxv.c 2009-01-03 06:57:50.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/auxv.c 2009-02-09 16:21:55.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/auxv.c 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/auxv.c 2009-02-28 07:40:35.000000000 +0100 @@ -81,7 +81,7 @@ procfs_xfer_auxv (struct target_ops *ops Return 1 if an entry was read into *TYPEP and *VALP. */ - int + static int default_auxv_parse (struct target_ops *ops, gdb_byte **readptr, - gdb_byte *endptr, CORE_ADDR *typep, CORE_ADDR *valp) + gdb_byte *endptr, ULONGEST *typep, CORE_ADDR *valp) @@ -215,7 +215,7 @@ switch (flavor) { case dec: -@@ -253,7 +255,7 @@ fprint_target_auxv (struct ui_file *file +@@ -254,7 +256,7 @@ fprint_target_auxv (struct ui_file *file break; } ++ents; @@ -224,10 +224,10 @@ break; } -Index: gdb-6.8.50.20090209/gdb/auxv.h +Index: gdb-6.8.50.20090226/gdb/auxv.h =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/auxv.h 2009-01-03 06:57:50.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/auxv.h 2009-02-09 16:21:55.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/auxv.h 2009-01-03 06:57:50.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/auxv.h 2009-02-28 07:38:59.000000000 +0100 @@ -36,14 +36,14 @@ struct target_ops; /* Forward declarati Return 1 if an entry was read into *TYPEP and *VALP. */ extern int target_auxv_parse (struct target_ops *ops, @@ -245,11 +245,11 @@ /* Print the contents of the target's AUXV on the specified file. */ extern int fprint_target_auxv (struct ui_file *file, struct target_ops *ops); -Index: gdb-6.8.50.20090209/gdb/breakpoint.c +Index: gdb-6.8.50.20090226/gdb/breakpoint.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/breakpoint.c 2009-02-09 16:12:23.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/breakpoint.c 2009-02-09 16:21:55.000000000 +0100 -@@ -3894,7 +3894,8 @@ describe_other_breakpoints (CORE_ADDR pc +--- gdb-6.8.50.20090226.orig/gdb/breakpoint.c 2009-02-28 07:38:47.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/breakpoint.c 2009-02-28 07:38:59.000000000 +0100 +@@ -3920,7 +3920,8 @@ describe_other_breakpoints (CORE_ADDR pc printf_filtered (" (thread %d)", b->thread); printf_filtered ("%s%s ", ((b->enable_state == bp_disabled || @@ -259,7 +259,7 @@ ? " (disabled)" : b->enable_state == bp_permanent ? " (permanent)" -@@ -4725,6 +4726,61 @@ create_catchpoint (int tempflag, char *c +@@ -5008,6 +5009,61 @@ create_catchpoint (int tempflag, char *c return b; } @@ -321,11 +321,11 @@ static void create_fork_vfork_event_catchpoint (int tempflag, char *cond_string, struct breakpoint_ops *ops) -Index: gdb-6.8.50.20090209/gdb/breakpoint.h +Index: gdb-6.8.50.20090226/gdb/breakpoint.h =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/breakpoint.h 2009-01-30 19:28:00.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/breakpoint.h 2009-02-09 16:21:55.000000000 +0100 -@@ -126,6 +126,7 @@ enum enable_state +--- gdb-6.8.50.20090226.orig/gdb/breakpoint.h 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/breakpoint.h 2009-02-28 07:38:59.000000000 +0100 +@@ -127,6 +127,7 @@ enum enable_state automatically enabled and reset when the call "lands" (either completes, or stops at another eventpoint). */ @@ -333,7 +333,7 @@ bp_permanent /* There is a breakpoint instruction hard-wired into the target's code. Don't try to write another breakpoint instruction on top of it, or restore -@@ -819,6 +820,10 @@ extern void remove_thread_event_breakpoi +@@ -847,6 +848,10 @@ extern void remove_thread_event_breakpoi extern void disable_breakpoints_in_shlibs (void); @@ -344,11 +344,11 @@ /* This function returns TRUE if ep is a catchpoint. */ extern int ep_is_catchpoint (struct breakpoint *); -Index: gdb-6.8.50.20090209/gdb/dwarf2read.c +Index: gdb-6.8.50.20090226/gdb/dwarf2read.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/dwarf2read.c 2009-02-09 16:12:23.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/dwarf2read.c 2009-02-09 16:21:55.000000000 +0100 -@@ -1296,7 +1296,7 @@ dwarf2_build_psymtabs (struct objfile *o +--- gdb-6.8.50.20090226.orig/gdb/dwarf2read.c 2009-02-28 07:38:48.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/dwarf2read.c 2009-02-28 07:38:59.000000000 +0100 +@@ -1421,7 +1421,7 @@ dwarf2_build_psymtabs (struct objfile *o else dwarf2_per_objfile->loc_buffer = NULL; @@ -357,10 +357,10 @@ || (objfile->global_psymbols.size == 0 && objfile->static_psymbols.size == 0)) { -Index: gdb-6.8.50.20090209/gdb/elfread.c +Index: gdb-6.8.50.20090226/gdb/elfread.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/elfread.c 2009-01-03 06:57:51.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/elfread.c 2009-02-09 16:21:55.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/elfread.c 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/elfread.c 2009-02-28 07:38:59.000000000 +0100 @@ -680,7 +680,7 @@ elf_symfile_read (struct objfile *objfil /* If we are reinitializing, or if we have never loaded syms yet, set table to empty. MAINLINE is cleared so that *_read_psymtab @@ -370,11 +370,11 @@ { init_psymbol_list (objfile, 0); mainline = 0; -Index: gdb-6.8.50.20090209/gdb/infrun.c +Index: gdb-6.8.50.20090226/gdb/infrun.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/infrun.c 2009-02-09 16:12:23.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/infrun.c 2009-02-09 16:21:55.000000000 +0100 -@@ -3278,6 +3278,11 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME ( +--- gdb-6.8.50.20090226.orig/gdb/infrun.c 2009-02-28 07:37:54.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/infrun.c 2009-02-28 07:38:59.000000000 +0100 +@@ -3328,6 +3328,11 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME ( #endif target_terminal_inferior (); @@ -386,10 +386,10 @@ /* If requested, stop when the dynamic linker notifies gdb of events. This allows the user to get control and place breakpoints in initializer routines for -Index: gdb-6.8.50.20090209/gdb/objfiles.c +Index: gdb-6.8.50.20090226/gdb/objfiles.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/objfiles.c 2009-01-15 17:35:22.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/objfiles.c 2009-02-09 16:21:55.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/objfiles.c 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/objfiles.c 2009-02-28 07:38:59.000000000 +0100 @@ -51,6 +51,9 @@ #include "arch-utils.h" #include "exec.h" @@ -421,7 +421,7 @@ } /* Create the terminating entry of OBJFILE's minimal symbol table. -@@ -458,6 +458,9 @@ free_objfile (struct objfile *objfile) +@@ -443,6 +458,9 @@ free_objfile (struct objfile *objfile) if (objfile == rt_common_objfile) rt_common_objfile = NULL; @@ -431,10 +431,10 @@ /* Before the symbol table code was redone to make it easier to selectively load and remove information particular to a specific linkage unit, gdb used to do these things whenever the monolithic -Index: gdb-6.8.50.20090209/gdb/solib-svr4.c +Index: gdb-6.8.50.20090226/gdb/solib-svr4.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/solib-svr4.c 2009-02-09 16:02:35.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/solib-svr4.c 2009-02-09 16:21:55.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/solib-svr4.c 2009-02-28 07:31:58.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/solib-svr4.c 2009-02-28 07:38:59.000000000 +0100 @@ -45,6 +45,7 @@ #include "exec.h" #include "auxv.h" @@ -1116,11 +1116,11 @@ + add_info ("linkmap", info_linkmap_command, + "Display the inferior's linkmap."); } -Index: gdb-6.8.50.20090209/gdb/solib.c +Index: gdb-6.8.50.20090226/gdb/solib.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/solib.c 2009-01-15 17:35:22.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/solib.c 2009-02-09 16:26:02.000000000 +0100 -@@ -80,6 +80,8 @@ set_solib_ops (struct gdbarch *gdbarch, +--- gdb-6.8.50.20090226.orig/gdb/solib.c 2009-02-21 17:14:49.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/solib.c 2009-02-28 07:38:59.000000000 +0100 +@@ -81,6 +81,8 @@ set_solib_ops (struct gdbarch *gdbarch, /* external data declarations */ @@ -1129,7 +1129,7 @@ /* FIXME: gdbarch needs to control this variable, or else every configuration needs to call set_solib_ops. */ struct target_so_ops *current_target_so_ops; -@@ -103,6 +105,8 @@ The search path for loading non-absolute +@@ -104,6 +106,8 @@ The search path for loading non-absolute value); } @@ -1138,7 +1138,7 @@ /* GLOBAL FUNCTION -@@ -425,10 +429,23 @@ free_so (struct so_list *so) +@@ -426,10 +430,23 @@ free_so (struct so_list *so) if (so->abfd) { @@ -1166,7 +1166,7 @@ } if (bfd_filename) -@@ -459,15 +461,40 @@ symbol_add_stub (void *arg) +@@ -460,15 +477,40 @@ symbol_add_stub (void *arg) /* Have we already loaded this shared object? */ ALL_OBJFILES (so->objfile) { @@ -1210,7 +1210,7 @@ free_section_addr_info (sap); return (1); -@@ -599,6 +626,10 @@ update_solib_list (int from_tty, struct +@@ -600,6 +642,10 @@ update_solib_list (int from_tty, struct } else { @@ -1221,7 +1221,7 @@ if (! strcmp (gdb->so_original_name, i->so_original_name)) break; } -@@ -653,28 +684,7 @@ update_solib_list (int from_tty, struct +@@ -654,28 +700,7 @@ update_solib_list (int from_tty, struct /* Fill in the rest of each of the `struct so_list' nodes. */ for (i = inferior; i; i = i->next) { @@ -1251,7 +1251,7 @@ /* Notify any observer that the shared object has been loaded now that we've added it to GDB's tables. */ -@@ -770,6 +780,41 @@ solib_add (char *pattern, int from_tty, +@@ -771,6 +796,41 @@ solib_add (char *pattern, int from_tty, } } @@ -1293,7 +1293,7 @@ /* -@@ -1087,4 +1132,12 @@ This takes precedence over the environme +@@ -1089,4 +1149,12 @@ This takes precedence over the environme reload_shared_libraries, show_solib_search_path, &setlist, &showlist); @@ -1306,10 +1306,10 @@ + NULL, NULL, + &setdebuglist, &showdebuglist); } -Index: gdb-6.8.50.20090209/gdb/solist.h +Index: gdb-6.8.50.20090226/gdb/solist.h =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/solist.h 2009-02-04 09:42:11.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/solist.h 2009-02-09 16:21:55.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/solist.h 2009-02-04 09:42:11.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/solist.h 2009-02-28 07:38:59.000000000 +0100 @@ -61,6 +61,8 @@ struct so_list bfd *abfd; char symbols_loaded; /* flag: symbols read in yet? */ @@ -1330,10 +1330,10 @@ +extern int debug_solib; + #endif -Index: gdb-6.8.50.20090209/gdb/symfile-mem.c +Index: gdb-6.8.50.20090226/gdb/symfile-mem.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/symfile-mem.c 2009-02-09 15:49:25.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/symfile-mem.c 2009-02-09 16:21:55.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/symfile-mem.c 2009-02-28 07:22:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/symfile-mem.c 2009-02-28 07:38:59.000000000 +0100 @@ -116,7 +116,7 @@ symbol_file_add_from_memory (struct bfd } @@ -1343,10 +1343,10 @@ /* This might change our ideas about frames already looked at. */ reinit_frame_cache (); -Index: gdb-6.8.50.20090209/gdb/symfile.c +Index: gdb-6.8.50.20090226/gdb/symfile.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/symfile.c 2009-02-09 16:03:45.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/symfile.c 2009-02-09 16:21:55.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/symfile.c 2009-02-28 07:31:58.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/symfile.c 2009-02-28 07:39:59.000000000 +0100 @@ -47,6 +47,7 @@ #include "readline/readline.h" #include "gdb_assert.h" @@ -1397,16 +1397,16 @@ /* We're done reading the symbol file; finish off complaints. */ clear_complaints (&symfile_complaints, 0, verbo); -@@ -970,7 +975,7 @@ symbol_file_add_with_addrs_or_offsets (b +@@ -980,7 +985,7 @@ symbol_file_add_with_addrs_or_offsets (b + /* Give user a chance to burp if we'd be interactively wiping out any existing symbols. */ - if ((have_full_symbols () || have_partial_symbols ()) -- && mainline -+ && (mainline == 1) +- if (mainline ++ if (mainline == 1 && from_tty - && !query ("Load new symbol table from \"%s\"? ", name)) - error (_("Not confirmed.")); -@@ -1161,6 +1166,10 @@ symbol_file_clear (int from_tty) + && (have_full_symbols () || have_partial_symbols ()) + && !query (_("Load new symbol table from \"%s\"? "), name)) +@@ -1175,6 +1180,10 @@ symbol_file_clear (int from_tty) symfile_objfile->name) : !query (_("Discard symbol table? ")))) error (_("Not confirmed.")); @@ -1417,7 +1417,7 @@ free_all_objfiles (); /* solib descriptors may have handles to objfiles. Since their -@@ -3260,6 +3269,8 @@ reread_symbols (void) +@@ -3275,6 +3284,8 @@ reread_symbols (void) /* Discard cleanups as symbol reading was successful. */ discard_cleanups (old_cleanups); @@ -1426,7 +1426,7 @@ /* If the mtime has changed between the time we set new_modtime and now, we *want* this to be out of date, so don't call stat again now. */ -@@ -3629,6 +3640,7 @@ clear_symtab_users (void) +@@ -3644,6 +3655,7 @@ clear_symtab_users (void) breakpoint_re_set (); set_default_breakpoint (0, 0, 0, 0); clear_pc_function_cache (); @@ -1434,12 +1434,12 @@ observer_notify_new_objfile (NULL); /* Clear globals which might have pointed into a removed objfile. -Index: gdb-6.8.50.20090209/gdb/varobj.c +Index: gdb-6.8.50.20090226/gdb/varobj.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/varobj.c 2009-02-05 18:28:21.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/varobj.c 2009-02-09 16:21:55.000000000 +0100 -@@ -1123,6 +1123,62 @@ install_new_value (struct varobj *var, s - return changed; +--- gdb-6.8.50.20090226.orig/gdb/varobj.c 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/varobj.c 2009-02-28 07:41:30.000000000 +0100 +@@ -1505,6 +1505,61 @@ varobj_set_visualizer (struct varobj *va + #endif } +void @@ -1497,26 +1497,25 @@ + rootcount, mycount); +} + -+ /* Update the values for a variable and its children. This is a two-pronged attack. First, re-parse the value for the root's expression to see if it's changed. Then go all the way -Index: gdb-6.8.50.20090209/gdb/varobj.h +Index: gdb-6.8.50.20090226/gdb/varobj.h =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/varobj.h 2009-01-03 06:57:54.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/varobj.h 2009-02-09 16:21:55.000000000 +0100 -@@ -141,4 +141,6 @@ extern int varobj_editable_p (struct var - - extern int varobj_floating_p (struct varobj *var); +--- gdb-6.8.50.20090226.orig/gdb/varobj.h 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/varobj.h 2009-02-28 07:39:19.000000000 +0100 +@@ -163,4 +163,6 @@ varobj_clear_type_visualizers (); + extern void + varobj_set_visualizer (struct varobj *var, const char *visualizer); +extern void varobj_refresh(void); + #endif /* VAROBJ_H */ -Index: gdb-6.8.50.20090209/gdb/target.h +Index: gdb-6.8.50.20090226/gdb/target.h =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/target.h 2009-02-09 16:02:42.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/target.h 2009-02-09 16:21:55.000000000 +0100 -@@ -524,7 +524,7 @@ struct target_ops +--- gdb-6.8.50.20090226.orig/gdb/target.h 2009-02-28 07:32:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/target.h 2009-02-28 07:38:59.000000000 +0100 +@@ -542,7 +542,7 @@ struct target_ops Return -1 if there is insufficient buffer for a whole entry. Return 1 if an entry was read into *TYPEP and *VALP. */ int (*to_auxv_parse) (struct target_ops *ops, gdb_byte **readptr, gdb-6.3-readnever-20050907.patch: Index: gdb-6.3-readnever-20050907.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-readnever-20050907.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.3-readnever-20050907.patch 14 Dec 2008 14:05:15 -0000 1.3 +++ gdb-6.3-readnever-20050907.patch 2 Mar 2009 00:11:35 -0000 1.4 @@ -11,11 +11,11 @@ * gdb.texinfo (File Options): Document --readnever. -Index: gdb-6.8.50.20081128/gdb/doc/gdb.texinfo +Index: gdb-6.8.50.20090226/gdb/doc/gdb.texinfo =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/doc/gdb.texinfo 2008-11-27 10:23:01.000000000 +0100 -+++ gdb-6.8.50.20081128/gdb/doc/gdb.texinfo 2008-12-02 19:07:35.000000000 +0100 -@@ -994,6 +994,12 @@ Read each symbol file's entire symbol ta +--- gdb-6.8.50.20090226.orig/gdb/doc/gdb.texinfo 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/doc/gdb.texinfo 2009-02-28 07:19:50.000000000 +0100 +@@ -988,6 +988,12 @@ Read each symbol file's entire symbol ta the default, which is to read it incrementally as it is needed. This makes startup slower, but makes future operations faster. @@ -28,11 +28,11 @@ @end table @node Mode Options -Index: gdb-6.8.50.20081128/gdb/main.c +Index: gdb-6.8.50.20090226/gdb/main.c =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/main.c 2008-12-02 18:07:21.000000000 +0100 -+++ gdb-6.8.50.20081128/gdb/main.c 2008-12-02 19:07:35.000000000 +0100 -@@ -295,6 +295,7 @@ captured_main (void *data) +--- gdb-6.8.50.20090226.orig/gdb/main.c 2009-02-28 07:15:57.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/main.c 2009-02-28 07:20:20.000000000 +0100 +@@ -427,6 +427,7 @@ captured_main (void *data) {"xdb", no_argument, &xdb_commands, 1}, {"dbx", no_argument, &dbx_commands, 1}, {"readnow", no_argument, &readnow_symbol_files, 1}, @@ -40,18 +40,18 @@ {"r", no_argument, &readnow_symbol_files, 1}, {"quiet", no_argument, &quiet, 1}, {"q", no_argument, &quiet, 1}, -@@ -895,6 +896,7 @@ Options:\n\n\ - fputs_unfiltered (_(" file.\n\ +@@ -1070,6 +1071,7 @@ Options:\n\n\ + fputs_unfiltered (_("\ --quiet Do not print version number on startup.\n\ --readnow Fully read symbol files on first access.\n\ + --readnever Do not read symbol files.\n\ "), stream); fputs_unfiltered (_("\ --se=FILE Use FILE as symbol file and executable file.\n\ -Index: gdb-6.8.50.20081128/gdb/symfile.c +Index: gdb-6.8.50.20090226/gdb/symfile.c =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/symfile.c 2008-12-01 16:34:36.000000000 +0100 -+++ gdb-6.8.50.20081128/gdb/symfile.c 2008-12-02 19:07:35.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/symfile.c 2009-02-27 07:51:56.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/symfile.c 2009-02-28 07:19:50.000000000 +0100 @@ -77,6 +77,7 @@ static void clear_symtab_users_cleanup ( /* Global variables owned by this file */ @@ -60,32 +60,32 @@ /* External variables and functions referenced. */ -Index: gdb-6.8.50.20081128/gdb/dwarf2read.c +Index: gdb-6.8.50.20090226/gdb/dwarf2read.c =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/dwarf2read.c 2008-11-15 19:49:50.000000000 +0100 -+++ gdb-6.8.50.20081128/gdb/dwarf2read.c 2008-12-02 19:08:53.000000000 +0100 -@@ -46,6 +46,7 @@ - #include "command.h" +--- gdb-6.8.50.20090226.orig/gdb/dwarf2read.c 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/dwarf2read.c 2009-02-28 07:21:27.000000000 +0100 +@@ -48,6 +48,7 @@ #include "gdbcmd.h" #include "addrmap.h" + #include "f-lang.h" +#include "top.h" #include #include "gdb_string.h" -@@ -1122,7 +1123,8 @@ dwarf2_has_info (struct objfile *objfile - dwarf_loc_section = 0; +@@ -1169,7 +1170,8 @@ dwarf2_has_info (struct objfile *objfile + dwarf_aranges_section = 0; - bfd_map_over_sections (objfile->obfd, dwarf2_locate_sections, NULL); + bfd_map_over_sections (objfile->obfd, dwarf2_locate_sections, &update_sizes); - return (dwarf_info_section != NULL && dwarf_abbrev_section != NULL); + return !readnever_symbol_files + && dwarf_info_section != NULL && dwarf_abbrev_section != NULL; } /* When loading sections, we can either look for ".", or for -Index: gdb-6.8.50.20081128/gdb/top.h +Index: gdb-6.8.50.20090226/gdb/top.h =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/top.h 2008-01-01 23:53:13.000000000 +0100 -+++ gdb-6.8.50.20081128/gdb/top.h 2008-12-02 19:07:35.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/top.h 2009-01-03 06:57:53.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/top.h 2009-02-28 07:19:50.000000000 +0100 @@ -59,6 +59,7 @@ extern void set_prompt (char *); /* From random places. */ gdb-6.3-security-errata-20050610.patch: Index: gdb-6.3-security-errata-20050610.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-security-errata-20050610.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gdb-6.3-security-errata-20050610.patch 11 Feb 2009 00:04:47 -0000 1.6 +++ gdb-6.3-security-errata-20050610.patch 2 Mar 2009 00:11:35 -0000 1.7 @@ -19,10 +19,10 @@ (source_command): Update documentation. Check permissions if FROM_TTY is -1. -Index: gdb-6.8.50.20090209/gdb/cli/cli-cmds.c +Index: gdb-6.8.50.20090226/gdb/cli/cli-cmds.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/cli/cli-cmds.c 2009-01-14 21:40:07.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/cli/cli-cmds.c 2009-02-09 15:45:39.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/cli/cli-cmds.c 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/cli/cli-cmds.c 2009-02-28 07:17:49.000000000 +0100 @@ -36,6 +36,7 @@ #include "objfiles.h" #include "source.h" @@ -31,7 +31,7 @@ #include "ui-out.h" -@@ -462,7 +463,7 @@ source_script (char *file, int from_tty) +@@ -466,7 +467,7 @@ source_script (char *file, int from_tty) if (fd == -1) { @@ -40,7 +40,7 @@ perror_with_name (file); else { -@@ -471,9 +472,33 @@ source_script (char *file, int from_tty) +@@ -475,6 +476,29 @@ source_script (char *file, int from_tty) } } @@ -67,17 +67,21 @@ + } +#endif + - stream = fdopen (fd, FOPEN_RT); - script_from_file (stream, file); + is_python = source_python; + if (strlen (file) > 3 && !strcmp (&file[strlen (file) - 3], ".py")) + is_python = 1; +@@ -486,6 +510,7 @@ source_script (char *file, int from_tty) + else + script_from_file (stream, file); + /* FILE gets freed by do_cleanups (old_cleanups). */ do_cleanups (old_cleanups); } -Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.base/gdbinit.exp +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.base/gdbinit.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.base/gdbinit.exp 2009-02-09 15:45:39.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.base/gdbinit.exp 2009-02-28 07:15:57.000000000 +0100 @@ -0,0 +1,98 @@ +# Copyright 2005 +# Free Software Foundation, Inc. @@ -177,17 +181,17 @@ +} + +remote_exec build "rm .gdbinit" -Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.base/gdbinit.sample +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.base/gdbinit.sample =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.base/gdbinit.sample 2009-02-09 15:45:39.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.base/gdbinit.sample 2009-02-28 07:15:57.000000000 +0100 @@ -0,0 +1 @@ +echo "\nin gdbinit" -Index: gdb-6.8.50.20090209/gdb/main.c +Index: gdb-6.8.50.20090226/gdb/main.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/main.c 2009-01-28 16:01:00.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/main.c 2009-02-09 15:46:33.000000000 +0100 -@@ -783,7 +783,7 @@ Excess command line arguments ignored. ( +--- gdb-6.8.50.20090226.orig/gdb/main.c 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/main.c 2009-02-28 07:15:57.000000000 +0100 +@@ -855,7 +855,7 @@ Excess command line arguments ignored. ( debugging or what directory you are in. */ if (home_gdbinit && !inhibit_gdbinit) @@ -196,7 +200,7 @@ /* Now perform all the actions indicated by the arguments. */ if (cdarg != NULL) -@@ -852,7 +852,7 @@ Can't attach to process and specify a co +@@ -924,7 +924,7 @@ Can't attach to process and specify a co /* Read the .gdbinit file in the current directory, *if* it isn't the same as the $HOME/.gdbinit file (it should exist, also). */ if (local_gdbinit && !inhibit_gdbinit) gdb-6.3-test-self-20050110.patch: Index: gdb-6.3-test-self-20050110.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-test-self-20050110.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.3-test-self-20050110.patch 11 Jan 2005 01:07:18 -0000 1.1 +++ gdb-6.3-test-self-20050110.patch 2 Mar 2009 00:11:35 -0000 1.2 @@ -6,9 +6,11 @@ * gdb.gdb/xfullpath.exp: Ditto. * gdb.gdb/observer.exp: Ditto. ---- gdb-6.3/gdb/testsuite/gdb.gdb/complaints.exp.fix Mon Jan 10 19:21:20 2005 -+++ gdb-6.3/gdb/testsuite/gdb.gdb/complaints.exp Mon Jan 10 19:24:38 2005 -@@ -304,13 +304,13 @@ proc find_gdb { arg } { +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/complaints.exp +=================================================================== +--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.gdb/complaints.exp 2009-01-03 06:58:04.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/complaints.exp 2009-02-26 22:10:48.000000000 +0100 +@@ -302,13 +302,13 @@ proc find_gdb { arg } { set GDB_FULLPATH [find_gdb $GDB] # Remove any old copy lying around. @@ -25,15 +27,17 @@ if {$setup_result <0} then { return -1 } -@@ -321,4 +321,4 @@ test_short_complaints +@@ -319,4 +319,4 @@ test_short_complaints test_empty_complaints gdb_exit; -catch "remote_file host delete $file"; +#catch "remote_file host delete $file"; ---- gdb-6.3/gdb/testsuite/gdb.gdb/observer.exp.fix Mon Jan 10 19:21:27 2005 -+++ gdb-6.3/gdb/testsuite/gdb.gdb/observer.exp Mon Jan 10 19:24:38 2005 -@@ -259,13 +259,13 @@ proc find_gdb { arg } { +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/observer.exp +=================================================================== +--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.gdb/observer.exp 2009-02-17 20:52:27.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/observer.exp 2009-02-26 22:11:40.000000000 +0100 +@@ -258,13 +258,13 @@ proc find_gdb { arg } { set GDB_FULLPATH [find_gdb $GDB] # Remove any old copy lying around. @@ -42,18 +46,20 @@ gdb_start -set file [remote_download host $GDB_FULLPATH x$tool] --set result [test_observer_normal_stop $file]; +-set result [test_observer $file]; +#set file [remote_download host $GDB_FULLPATH x$tool] -+set result [test_observer_normal_stop $GDB_FULLPATH]; ++set result [test_observer $GDB_FULLPATH]; gdb_exit; -catch "remote_file host delete $file"; +#catch "remote_file host delete $file"; if {$result <0} then { warning "Couldn't test self" ---- gdb-6.3/gdb/testsuite/gdb.gdb/selftest.exp.fix Mon Jan 10 19:21:33 2005 -+++ gdb-6.3/gdb/testsuite/gdb.gdb/selftest.exp Mon Jan 10 19:24:38 2005 -@@ -512,13 +512,13 @@ proc find_gdb { arg } { +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/selftest.exp +=================================================================== +--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.gdb/selftest.exp 2009-02-26 22:09:59.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/selftest.exp 2009-02-26 22:10:48.000000000 +0100 +@@ -551,13 +551,13 @@ proc find_gdb { arg } { set GDB_FULLPATH [find_gdb $GDB] # Remove any old copy lying around. @@ -71,9 +77,11 @@ if {$result <0} then { warning "Couldn't test self" ---- gdb-6.3/gdb/testsuite/gdb.gdb/xfullpath.exp.fix Mon Jan 10 19:21:40 2005 -+++ gdb-6.3/gdb/testsuite/gdb.gdb/xfullpath.exp Mon Jan 10 19:24:38 2005 -@@ -181,13 +181,13 @@ proc find_gdb { arg } { +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/xfullpath.exp +=================================================================== +--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.gdb/xfullpath.exp 2009-01-03 06:58:04.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/xfullpath.exp 2009-02-26 22:10:48.000000000 +0100 +@@ -179,13 +179,13 @@ proc find_gdb { arg } { set GDB_FULLPATH [find_gdb $GDB] # Remove any old copy lying around. gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch: Index: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch 11 Feb 2009 00:04:47 -0000 1.8 +++ gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch 2 Mar 2009 00:11:35 -0000 1.9 @@ -30,22 +30,20 @@ <81a2> DW_AT_name : (indirect string, offset: 0x280e): __errno_location <81a8> DW_AT_MIPS_linkage_name: (indirect string, offset: 0x2808): *__GI___errno_location -Index: gdb-6.8.50.20090209/gdb/dwarf2read.c +Index: gdb-6.8.50.20090226/gdb/dwarf2read.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/dwarf2read.c 2009-02-09 15:50:59.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/dwarf2read.c 2009-02-09 15:51:57.000000000 +0100 -@@ -6031,8 +6031,8 @@ read_partial_die (struct partial_die_inf +--- gdb-6.8.50.20090226.orig/gdb/dwarf2read.c 2009-02-28 07:22:44.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/dwarf2read.c 2009-02-28 07:31:33.000000000 +0100 +@@ -6376,6 +6376,8 @@ read_partial_die (struct partial_die_inf + switch (attr.name) { case DW_AT_name: - -- /* Prefer DW_AT_MIPS_linkage_name over DW_AT_name. */ -- if (part_die->name == NULL) + /* Prefer DW_AT_MIPS_linkage_name over DW_AT_name for non-C. */ -+ if (cu->language == language_c || part_die->name == NULL) - part_die->name = DW_STRING (&attr); - break; - case DW_AT_comp_dir: -@@ -6040,7 +6040,9 @@ read_partial_die (struct partial_die_inf ++if (cu->language == language_c || part_die->name == NULL) + switch (part_die->tag) + { + case DW_TAG_compile_unit: +@@ -6399,7 +6401,9 @@ read_partial_die (struct partial_die_inf part_die->dirname = DW_STRING (&attr); break; case DW_AT_MIPS_linkage_name: @@ -56,7 +54,7 @@ break; case DW_AT_low_pc: has_low_pc_attr = 1; -@@ -8278,9 +8280,13 @@ dwarf2_linkage_name (struct die_info *di +@@ -8650,9 +8654,13 @@ dwarf2_linkage_name (struct die_info *di { struct attribute *attr; @@ -70,13 +68,13 @@ + if (attr && DW_STRING (attr)) + return DW_STRING (attr); + } - attr = dwarf2_attr (die, DW_AT_name, cu); - if (attr && DW_STRING (attr)) - return DW_STRING (attr); -Index: gdb-6.8.50.20090209/gdb/gdbtypes.c + return dwarf2_name (die, cu); + } + +Index: gdb-6.8.50.20090226/gdb/gdbtypes.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/gdbtypes.c 2009-02-09 15:38:54.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/gdbtypes.c 2009-02-09 15:56:14.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/gdbtypes.c 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/gdbtypes.c 2009-02-28 07:22:55.000000000 +0100 @@ -3643,6 +3643,8 @@ gdbtypes_post_init (struct gdbarch *gdba init_type (TYPE_CODE_INT, gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT, @@ -99,11 +97,11 @@ builtin_type->nodebug_data_symbol = init_type (TYPE_CODE_INT, gdbarch_int_bit (gdbarch) / HOST_CHAR_BIT, 0, -Index: gdb-6.8.50.20090209/gdb/gdbtypes.h +Index: gdb-6.8.50.20090226/gdb/gdbtypes.h =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/gdbtypes.h 2009-02-09 15:38:54.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/gdbtypes.h 2009-02-09 15:51:57.000000000 +0100 -@@ -1050,6 +1050,7 @@ struct builtin_type +--- gdb-6.8.50.20090226.orig/gdb/gdbtypes.h 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/gdbtypes.h 2009-02-28 07:22:55.000000000 +0100 +@@ -1053,6 +1053,7 @@ struct builtin_type /* Types used for symbols with no debug information. */ struct type *nodebug_text_symbol; @@ -111,7 +109,7 @@ struct type *nodebug_data_symbol; struct type *nodebug_unknown_symbol; struct type *nodebug_tls_symbol; -@@ -1062,6 +1063,7 @@ struct builtin_type +@@ -1065,6 +1066,7 @@ struct builtin_type struct type *builtin_char; struct type *builtin_short; struct type *builtin_int; @@ -119,11 +117,11 @@ struct type *builtin_long; struct type *builtin_signed_char; struct type *builtin_unsigned_char; -Index: gdb-6.8.50.20090209/gdb/parse.c +Index: gdb-6.8.50.20090226/gdb/parse.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/parse.c 2009-01-03 06:57:52.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/parse.c 2009-02-09 15:51:57.000000000 +0100 -@@ -449,7 +449,12 @@ write_exp_msymbol (struct minimal_symbol +--- gdb-6.8.50.20090226.orig/gdb/parse.c 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/parse.c 2009-02-28 07:22:55.000000000 +0100 +@@ -508,7 +508,12 @@ write_exp_msymbol (struct minimal_symbol case mst_text: case mst_file_text: case mst_solib_trampoline: @@ -137,11 +135,11 @@ break; case mst_data: -Index: gdb-6.8.50.20090209/gdb/target.c +Index: gdb-6.8.50.20090226/gdb/target.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/target.c 2009-02-09 15:50:39.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/target.c 2009-02-09 15:51:57.000000000 +0100 -@@ -842,6 +842,25 @@ pop_all_targets (int quitting) +--- gdb-6.8.50.20090226.orig/gdb/target.c 2009-02-28 07:22:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/target.c 2009-02-28 07:22:55.000000000 +0100 +@@ -827,6 +827,25 @@ pop_all_targets (int quitting) pop_all_targets_above (dummy_stratum, quitting); } @@ -167,7 +165,7 @@ /* Using the objfile specified in OBJFILE, find the address for the current thread's thread-local storage with offset OFFSET. */ CORE_ADDR -@@ -932,7 +951,28 @@ target_translate_tls_address (struct obj +@@ -917,7 +936,28 @@ target_translate_tls_address (struct obj /* It wouldn't be wrong here to try a gdbarch method, too; finding TLS is an ABI-specific thing. But we don't do that yet. */ else @@ -197,10 +195,10 @@ return addr; } -Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.dwarf2/dw2-errno.c +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.dwarf2/dw2-errno.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.dwarf2/dw2-errno.c 2009-02-09 15:51:57.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.dwarf2/dw2-errno.c 2009-02-28 07:22:55.000000000 +0100 @@ -0,0 +1,28 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -230,10 +228,10 @@ + + return 0; /* breakpoint */ +} -Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.dwarf2/dw2-errno.exp +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.dwarf2/dw2-errno.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.dwarf2/dw2-errno.exp 2009-02-09 15:51:57.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.dwarf2/dw2-errno.exp 2009-02-28 07:22:55.000000000 +0100 @@ -0,0 +1,67 @@ +# Copyright 2007 Free Software Foundation, Inc. + gdb-6.6-buildid-locate.patch: Index: gdb-6.6-buildid-locate.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gdb-6.6-buildid-locate.patch 14 Dec 2008 14:05:16 -0000 1.16 +++ gdb-6.6-buildid-locate.patch 2 Mar 2009 00:11:35 -0000 1.17 @@ -47,11 +47,11 @@ Fix found by Denys Vlasenko . Fixes Red Hat Bug 459414. -Index: gdb-6.8.50.20081128/gdb/Makefile.in +Index: gdb-6.8.50.20090226/gdb/Makefile.in =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/Makefile.in 2008-12-04 10:33:25.000000000 +0100 -+++ gdb-6.8.50.20081128/gdb/Makefile.in 2008-12-04 10:34:31.000000000 +0100 -@@ -363,7 +363,7 @@ CONFIG_UNINSTALL = @CONFIG_UNINSTALL@ +--- gdb-6.8.50.20090226.orig/gdb/Makefile.in 2009-02-28 07:31:50.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/Makefile.in 2009-02-28 07:31:58.000000000 +0100 +@@ -392,7 +392,7 @@ CONFIG_UNINSTALL = @CONFIG_UNINSTALL@ # your system doesn't have fcntl.h in /usr/include (which is where it # should be according to Posix). DEFS = @DEFS@ @@ -60,7 +60,7 @@ # MH_CFLAGS, if defined, has host-dependent CFLAGS from the config directory. GLOBAL_CFLAGS = $(MH_CFLAGS) -@@ -415,7 +415,7 @@ INSTALLED_LIBS=-lbfd -lreadline -lopcode +@@ -445,7 +445,7 @@ INSTALLED_LIBS=-lbfd -lreadline -lopcode CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \ $(XM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \ $(LIBICONV) $(LIBEXPAT) \ @@ -69,10 +69,10 @@ CDEPS = $(XM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \ $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) -Index: gdb-6.8.50.20081128/gdb/corelow.c +Index: gdb-6.8.50.20090226/gdb/corelow.c =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/corelow.c 2008-11-09 12:27:17.000000000 +0100 -+++ gdb-6.8.50.20081128/gdb/corelow.c 2008-12-04 10:34:31.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/corelow.c 2009-02-23 01:03:48.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/corelow.c 2009-02-28 07:32:23.000000000 +0100 @@ -45,6 +45,10 @@ #include "exceptions.h" #include "solib.h" @@ -84,7 +84,7 @@ #ifndef O_LARGEFILE -@@ -262,6 +266,56 @@ add_to_thread_list (bfd *abfd, asection +@@ -267,6 +271,56 @@ add_to_thread_list (bfd *abfd, asection inferior_ptid = ptid; /* Yes, make it current */ } @@ -141,7 +141,7 @@ /* This routine opens and sets up the core file bfd. */ static void -@@ -358,6 +412,12 @@ core_open (char *filename, int from_tty) +@@ -363,6 +417,12 @@ core_open (char *filename, int from_tty) push_target (&core_ops); discard_cleanups (old_chain); @@ -154,10 +154,10 @@ add_inferior_silent (corelow_pid); /* Do this before acknowledging the inferior, so if -@@ -737,4 +797,11 @@ _initialize_corelow (void) +@@ -751,4 +811,11 @@ _initialize_corelow (void) + init_core_ops (); - if (!coreops_suppress_target) - add_target (&core_ops); + add_target (&core_ops); + + add_setshow_boolean_cmd ("build-id-core-loads", class_files, + &build_id_core_loads, _("\ @@ -166,11 +166,11 @@ + NULL, NULL, NULL, + &setlist, &showlist); } -Index: gdb-6.8.50.20081128/gdb/doc/gdb.texinfo +Index: gdb-6.8.50.20090226/gdb/doc/gdb.texinfo =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/doc/gdb.texinfo 2008-12-04 10:34:04.000000000 +0100 -+++ gdb-6.8.50.20081128/gdb/doc/gdb.texinfo 2008-12-04 10:34:31.000000000 +0100 -@@ -13138,6 +13138,27 @@ information files. +--- gdb-6.8.50.20090226.orig/gdb/doc/gdb.texinfo 2009-02-28 07:31:50.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/doc/gdb.texinfo 2009-02-28 07:31:58.000000000 +0100 +@@ -13294,6 +13294,27 @@ information files. @end table @@ -198,10 +198,10 @@ @cindex @code{.gnu_debuglink} sections @cindex debug link sections A debug link is a special section of the executable file named -Index: gdb-6.8.50.20081128/gdb/event-top.c +Index: gdb-6.8.50.20090226/gdb/event-top.c =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/event-top.c 2008-09-08 23:46:21.000000000 +0200 -+++ gdb-6.8.50.20081128/gdb/event-top.c 2008-12-04 10:34:31.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/event-top.c 2009-01-09 12:00:00.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/event-top.c 2009-02-28 07:31:58.000000000 +0100 @@ -33,6 +33,7 @@ #include "cli/cli-script.h" /* for reset_command_nest_depth */ #include "main.h" @@ -228,11 +228,11 @@ /* Each interpreter has its own rules on displaying the command prompt. */ if (!current_interp_display_prompt_p ()) -Index: gdb-6.8.50.20081128/gdb/solib-svr4.c +Index: gdb-6.8.50.20090226/gdb/solib-svr4.c =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/solib-svr4.c 2008-12-04 01:34:17.000000000 +0100 -+++ gdb-6.8.50.20081128/gdb/solib-svr4.c 2008-12-04 10:34:31.000000000 +0100 -@@ -999,9 +999,33 @@ svr4_current_sos (void) +--- gdb-6.8.50.20090226.orig/gdb/solib-svr4.c 2009-02-27 00:04:34.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/solib-svr4.c 2009-02-28 07:31:58.000000000 +0100 +@@ -1000,9 +1000,33 @@ svr4_current_sos (void) safe_strerror (errcode)); else { @@ -269,10 +269,10 @@ } xfree (buffer); -Index: gdb-6.8.50.20081128/gdb/symfile.c +Index: gdb-6.8.50.20090226/gdb/symfile.c =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/symfile.c 2008-12-04 10:26:12.000000000 +0100 -+++ gdb-6.8.50.20081128/gdb/symfile.c 2008-12-04 10:36:18.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/symfile.c 2009-02-28 07:22:43.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/symfile.c 2009-02-28 07:31:58.000000000 +0100 @@ -54,6 +54,8 @@ #include "elf-bfd.h" #include "solib.h" @@ -290,7 +290,7 @@ int (*deprecated_ui_load_progress_hook) (const char *section, unsigned long num); -@@ -1168,16 +1171,65 @@ symbol_file_clear (int from_tty) +@@ -1185,16 +1188,65 @@ symbol_file_clear (int from_tty) printf_unfiltered (_("No symbol file now.\n")); } @@ -358,7 +358,7 @@ { struct build_id *retval; -@@ -1193,6 +1245,348 @@ build_id_bfd_get (bfd *abfd) +@@ -1210,6 +1262,348 @@ build_id_bfd_get (bfd *abfd) return retval; } @@ -707,7 +707,7 @@ /* Return if FILENAME has NT_GNU_BUILD_ID matching the CHECK value. */ static int -@@ -1210,7 +1604,7 @@ build_id_verify (const char *filename, s +@@ -1227,7 +1621,7 @@ build_id_verify (const char *filename, s if (abfd == NULL) return 0; @@ -716,7 +716,7 @@ if (found == NULL) warning (_("File \"%s\" has no build-id, file skipped"), filename); -@@ -1229,8 +1623,9 @@ build_id_verify (const char *filename, s +@@ -1246,8 +1640,9 @@ build_id_verify (const char *filename, s return retval; } @@ -728,7 +728,7 @@ { char *link, *s, *retval = NULL; gdb_byte *data = build_id->data; -@@ -1238,7 +1633,9 @@ build_id_to_debug_filename (struct build +@@ -1255,7 +1650,9 @@ build_id_to_debug_filename (struct build /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */ link = xmalloc (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1 @@ -739,7 +739,7 @@ s = link + sprintf (link, "%s/.build-id/", debug_file_directory); if (size > 0) { -@@ -1249,12 +1646,14 @@ build_id_to_debug_filename (struct build +@@ -1266,12 +1663,14 @@ build_id_to_debug_filename (struct build *s++ = '/'; while (size-- > 0) s += sprintf (s, "%02x", (unsigned) *data++); @@ -756,7 +756,7 @@ if (retval != NULL && !build_id_verify (retval, build_id)) { -@@ -1262,9 +1661,424 @@ build_id_to_debug_filename (struct build +@@ -1279,9 +1678,424 @@ build_id_to_debug_filename (struct build retval = NULL; } @@ -1181,7 +1181,7 @@ static char * get_debug_link_info (struct objfile *objfile, unsigned long *crc32_out) { -@@ -1347,32 +2161,36 @@ static char * +@@ -1364,32 +2178,36 @@ static char * find_separate_debug_file (struct objfile *objfile) { asection *sect; @@ -1226,7 +1226,7 @@ } basename = get_debug_link_info (objfile, &crc32); -@@ -1380,7 +2198,7 @@ find_separate_debug_file (struct objfile +@@ -1397,7 +2215,7 @@ find_separate_debug_file (struct objfile if (basename == NULL) /* There's no separate debug info, hence there's no way we could load it => no warning. */ @@ -1235,7 +1235,7 @@ dir = xstrdup (objfile->name); -@@ -1396,23 +2214,19 @@ find_separate_debug_file (struct objfile +@@ -1413,23 +2231,19 @@ find_separate_debug_file (struct objfile gdb_assert (i >= 0 && IS_DIR_SEPARATOR (dir[i])); dir[i+1] = '\0'; @@ -1266,7 +1266,7 @@ /* Then try in the subdirectory named DEBUG_SUBDIRECTORY. */ strcpy (debugfile, dir); -@@ -1421,11 +2235,7 @@ find_separate_debug_file (struct objfile +@@ -1438,11 +2252,7 @@ find_separate_debug_file (struct objfile strcat (debugfile, basename); if (separate_debug_file_exists (debugfile, crc32, objfile->name)) @@ -1279,7 +1279,7 @@ /* Then try in the global debugfile directory. */ strcpy (debugfile, debug_file_directory); -@@ -1434,11 +2244,7 @@ find_separate_debug_file (struct objfile +@@ -1451,11 +2261,7 @@ find_separate_debug_file (struct objfile strcat (debugfile, basename); if (separate_debug_file_exists (debugfile, crc32, objfile->name)) @@ -1292,7 +1292,7 @@ /* If the file is in the sysroot, try using its base path in the global debugfile directory. */ -@@ -1453,20 +2259,18 @@ find_separate_debug_file (struct objfile +@@ -1470,20 +2276,18 @@ find_separate_debug_file (struct objfile strcat (debugfile, basename); if (separate_debug_file_exists (debugfile, crc32, objfile->name)) @@ -1321,7 +1321,7 @@ } -@@ -4196,4 +5000,16 @@ Show printing of symbol loading messages +@@ -4215,4 +5019,16 @@ Show printing of symbol loading messages NULL, NULL, &setprintlist, &showprintlist); @@ -1338,11 +1338,11 @@ + + observer_attach_executable_changed (debug_print_executable_changed); } -Index: gdb-6.8.50.20081128/gdb/symfile.h +Index: gdb-6.8.50.20090226/gdb/symfile.h =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/symfile.h 2008-09-05 13:37:17.000000000 +0200 -+++ gdb-6.8.50.20081128/gdb/symfile.h 2008-12-04 10:34:31.000000000 +0100 -@@ -365,6 +365,14 @@ extern int symfile_map_offsets_to_segmen +--- gdb-6.8.50.20090226.orig/gdb/symfile.h 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/symfile.h 2009-02-28 07:31:58.000000000 +0100 +@@ -372,6 +372,14 @@ extern int symfile_map_offsets_to_segmen struct symfile_segment_data *get_symfile_segment_data (bfd *abfd); void free_symfile_segment_data (struct symfile_segment_data *data); @@ -1357,11 +1357,11 @@ /* From dwarf2read.c */ extern int dwarf2_has_info (struct objfile *); -Index: gdb-6.8.50.20081128/gdb/testsuite/lib/gdb.exp +Index: gdb-6.8.50.20090226/gdb/testsuite/lib/gdb.exp =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/testsuite/lib/gdb.exp 2008-12-04 01:33:56.000000000 +0100 -+++ gdb-6.8.50.20081128/gdb/testsuite/lib/gdb.exp 2008-12-04 10:34:31.000000000 +0100 -@@ -1227,6 +1227,16 @@ proc default_gdb_start { } { +--- gdb-6.8.50.20090226.orig/gdb/testsuite/lib/gdb.exp 2009-02-27 00:04:34.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/lib/gdb.exp 2009-02-28 07:31:58.000000000 +0100 +@@ -1230,6 +1230,16 @@ proc default_gdb_start { } { warning "Couldn't set the width to 0." } } @@ -1378,10 +1378,10 @@ return 0; } -Index: gdb-6.8.50.20081128/gdb/tui/tui-interp.c +Index: gdb-6.8.50.20090226/gdb/tui/tui-interp.c =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/tui/tui-interp.c 2008-03-14 20:55:51.000000000 +0100 -+++ gdb-6.8.50.20081128/gdb/tui/tui-interp.c 2008-12-04 10:34:31.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/tui/tui-interp.c 2009-02-21 17:14:50.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/tui/tui-interp.c 2009-02-28 07:31:58.000000000 +0100 @@ -30,6 +30,7 @@ #include "tui/tui.h" #include "tui/tui-io.h" gdb-6.6-step-thread-exit.patch: Index: gdb-6.6-step-thread-exit.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-step-thread-exit.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.6-step-thread-exit.patch 14 Dec 2008 14:05:16 -0000 1.3 +++ gdb-6.6-step-thread-exit.patch 2 Mar 2009 00:11:35 -0000 1.4 @@ -1,13 +1,13 @@ -Index: gdb-6.8.50.20081128/gdb/linux-nat.c +Index: gdb-6.8.50.20090226/gdb/linux-nat.c =================================================================== ---- gdb-6.8.50.20081128.orig/gdb/linux-nat.c 2008-12-04 01:44:26.000000000 +0100 -+++ gdb-6.8.50.20081128/gdb/linux-nat.c 2008-12-04 10:21:32.000000000 +0100 -@@ -1661,15 +1661,17 @@ resume_set_callback (struct lwp_info *lp - } +--- gdb-6.8.50.20090226.orig/gdb/linux-nat.c 2009-02-27 00:04:35.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/linux-nat.c 2009-02-27 07:51:44.000000000 +0100 +@@ -1790,15 +1790,17 @@ resume_set_callback (struct lwp_info *lp static void --linux_nat_resume (ptid_t ptid, int step, enum target_signal signo) -+linux_nat_resume (ptid_t ptid, int step_int, enum target_signal signo) + linux_nat_resume (struct target_ops *ops, +- ptid_t ptid, int step, enum target_signal signo) ++ ptid_t ptid, int step_int, enum target_signal signo) { struct lwp_info *lp; int resume_all; @@ -22,7 +22,7 @@ target_pid_to_str (ptid), signo ? strsignal (signo) : "0", target_pid_to_str (inferior_ptid)); -@@ -2586,6 +2588,9 @@ linux_nat_filter_event (int lwpid, int s +@@ -2740,6 +2742,9 @@ linux_nat_filter_event (int lwpid, int s /* Check if the thread has exited. */ if ((WIFEXITED (status) || WIFSIGNALED (status)) && num_lwps > 1) { @@ -32,7 +32,7 @@ /* If this is the main thread, we must stop all threads and verify if they are still alive. This is because in the nptl thread model, there is no signal issued for exiting LWPs -@@ -2609,6 +2614,26 @@ linux_nat_filter_event (int lwpid, int s +@@ -2763,6 +2768,26 @@ linux_nat_filter_event (int lwpid, int s exit_lwp (lp); gdb-6.8-inlining-addon.patch: Index: gdb-6.8-inlining-addon.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-inlining-addon.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.8-inlining-addon.patch 11 Feb 2009 00:04:48 -0000 1.3 +++ gdb-6.8-inlining-addon.patch 2 Mar 2009 00:11:35 -0000 1.4 @@ -5,10 +5,10 @@ resume() -> target_resume() move of clear_inline_frame_state() is for: gdb.mi/mi-nsmoribund.exp -Index: gdb-6.8.50.20081214/gdb/testsuite/gdb.opt/inline-bt.c +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.c =================================================================== ---- gdb-6.8.50.20081214.orig/gdb/testsuite/gdb.opt/inline-bt.c 2009-02-09 13:28:48.000000000 +0100 -+++ gdb-6.8.50.20081214/gdb/testsuite/gdb.opt/inline-bt.c 2009-02-09 13:28:49.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/inline-bt.c 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.c 2009-02-28 07:37:54.000000000 +0100 @@ -13,10 +13,16 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -28,10 +28,10 @@ inline int func1(void) { -Index: gdb-6.8.50.20081214/gdb/testsuite/gdb.opt/inline-bt.exp +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.exp =================================================================== ---- gdb-6.8.50.20081214.orig/gdb/testsuite/gdb.opt/inline-bt.exp 2009-02-09 13:28:48.000000000 +0100 -+++ gdb-6.8.50.20081214/gdb/testsuite/gdb.opt/inline-bt.exp 2009-02-09 13:28:49.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/inline-bt.exp 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.exp 2009-02-28 07:37:54.000000000 +0100 @@ -41,18 +41,19 @@ if { [skip_inline_frame_tests] } { return } @@ -60,10 +60,10 @@ gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (3)" gdb_test "backtrace" "#0 bar.*#1 .*func1.*#2 .*func2.*#3 .*main.*" \ -Index: gdb-6.8.50.20081214/gdb/testsuite/gdb.opt/inline-cmds.c +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.c =================================================================== ---- gdb-6.8.50.20081214.orig/gdb/testsuite/gdb.opt/inline-cmds.c 2009-02-09 13:28:48.000000000 +0100 -+++ gdb-6.8.50.20081214/gdb/testsuite/gdb.opt/inline-cmds.c 2009-02-09 13:28:49.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/inline-cmds.c 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.c 2009-02-28 07:37:54.000000000 +0100 @@ -13,13 +13,19 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -86,10 +86,10 @@ inline int func1(void) { bar (); -Index: gdb-6.8.50.20081214/gdb/testsuite/gdb.opt/inline-cmds.exp +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.exp =================================================================== ---- gdb-6.8.50.20081214.orig/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-02-09 13:28:48.000000000 +0100 -+++ gdb-6.8.50.20081214/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-02-09 13:30:16.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-02-28 07:37:54.000000000 +0100 @@ -45,28 +45,28 @@ if { [skip_inline_frame_tests] } { # First, check that the things we expected to be inlined really were, @@ -180,10 +180,10 @@ +gdb_test "info frame" "inlined into frame.*" "outer_inline2 inlined" +gdb_test "fini" "" "up from outer_inline2" +gdb_test "info frame" " in main \[^\n\]*\n source language.*" "main not inlined" -Index: gdb-6.8.50.20081214/gdb/testsuite/gdb.opt/inline-locals.c +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.c =================================================================== ---- gdb-6.8.50.20081214.orig/gdb/testsuite/gdb.opt/inline-locals.c 2009-02-09 13:28:48.000000000 +0100 -+++ gdb-6.8.50.20081214/gdb/testsuite/gdb.opt/inline-locals.c 2009-02-09 13:28:49.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/inline-locals.c 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.c 2009-02-28 07:37:54.000000000 +0100 @@ -13,11 +13,16 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -203,10 +203,10 @@ inline int func1(int arg1) { -Index: gdb-6.8.50.20081214/gdb/testsuite/gdb.opt/inline-locals.exp +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.exp =================================================================== ---- gdb-6.8.50.20081214.orig/gdb/testsuite/gdb.opt/inline-locals.exp 2009-02-09 13:28:48.000000000 +0100 -+++ gdb-6.8.50.20081214/gdb/testsuite/gdb.opt/inline-locals.exp 2009-02-09 13:28:49.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/inline-locals.exp 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.exp 2009-02-28 07:37:54.000000000 +0100 @@ -43,8 +43,8 @@ if { [skip_inline_var_tests] } { set no_frames [skip_inline_frame_tests] @@ -236,10 +236,10 @@ + setup_kfail *-*-* "gcc/debug.optimization" +} gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local (3)" -Index: gdb-6.8.50.20081214/gdb/frame.c +Index: gdb-6.8.50.20090226/gdb/frame.c =================================================================== ---- gdb-6.8.50.20081214.orig/gdb/frame.c 2009-02-09 13:28:48.000000000 +0100 -+++ gdb-6.8.50.20081214/gdb/frame.c 2009-02-09 13:30:16.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/frame.c 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/frame.c 2009-02-28 07:37:54.000000000 +0100 @@ -269,7 +269,7 @@ fprint_frame (struct ui_file *file, stru static struct frame_info * skip_inlined_frames (struct frame_info *frame) @@ -249,7 +249,7 @@ frame = get_prev_frame (frame); return frame; -@@ -1697,6 +1697,7 @@ get_frame_address_in_block (struct frame +@@ -1670,6 +1670,7 @@ get_frame_address_in_block (struct frame { /* A draft address. */ CORE_ADDR pc = get_frame_pc (this_frame); @@ -257,7 +257,7 @@ struct frame_info *next_frame = this_frame->next; -@@ -1739,6 +1740,9 @@ get_frame_address_in_block (struct frame +@@ -1712,6 +1713,9 @@ get_frame_address_in_block (struct frame while in an inlined function, then the code address of the "calling" normal function should not be adjusted either. */ @@ -267,7 +267,7 @@ while (get_frame_type (next_frame) == INLINE_FRAME) next_frame = next_frame->next; -@@ -1770,7 +1774,7 @@ find_frame_sal (struct frame_info *frame +@@ -1743,7 +1747,7 @@ find_frame_sal (struct frame_info *frame sym = inline_skipped_symbol (inferior_ptid); init_sal (sal); @@ -276,10 +276,10 @@ { sal->symtab = SYMBOL_SYMTAB (sym); sal->line = SYMBOL_LINE (sym); -Index: gdb-6.8.50.20081214/gdb/breakpoint.c +Index: gdb-6.8.50.20090226/gdb/breakpoint.c =================================================================== ---- gdb-6.8.50.20081214.orig/gdb/breakpoint.c 2009-02-09 13:28:48.000000000 +0100 -+++ gdb-6.8.50.20081214/gdb/breakpoint.c 2009-02-09 13:30:16.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/breakpoint.c 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/breakpoint.c 2009-02-28 07:37:54.000000000 +0100 @@ -57,6 +57,7 @@ #include "top.h" #include "wrapper.h" @@ -288,7 +288,7 @@ #include "mi/mi-common.h" -@@ -2833,10 +2834,24 @@ bpstat_check_breakpoint_conditions (bpst +@@ -2902,10 +2903,24 @@ bpstat_check_breakpoint_conditions (bpst const struct bp_location *bl = bs->breakpoint_at; struct breakpoint *b = bl->owner; @@ -317,7 +317,7 @@ { int value_is_zero = 0; -@@ -2975,6 +2990,12 @@ bpstat_stop_status (CORE_ADDR bp_addr, p +@@ -3044,6 +3059,12 @@ bpstat_stop_status (CORE_ADDR bp_addr, p bs->print = 0; } bs->commands = copy_command_lines (bs->commands); @@ -330,7 +330,7 @@ } /* Print nothing for this entry if we dont stop or if we dont print. */ -@@ -4826,9 +4847,9 @@ set_momentary_breakpoint (struct symtab_ +@@ -5168,9 +5189,9 @@ set_momentary_breakpoint (struct symtab_ { struct breakpoint *b; @@ -343,10 +343,10 @@ b = set_raw_breakpoint (sal, type); b->enable_state = bp_enabled; -Index: gdb-6.8.50.20081214/gdb/inline-frame.c +Index: gdb-6.8.50.20090226/gdb/inline-frame.c =================================================================== ---- gdb-6.8.50.20081214.orig/gdb/inline-frame.c 2009-02-09 13:28:48.000000000 +0100 -+++ gdb-6.8.50.20081214/gdb/inline-frame.c 2009-02-09 13:30:16.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/inline-frame.c 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/inline-frame.c 2009-02-28 07:37:54.000000000 +0100 @@ -183,6 +183,12 @@ inline_frame_sniffer (const struct frame if (frame_block == NULL) return 0; @@ -423,10 +423,10 @@ /* Return the number of hidden functions inlined into the current frame. */ -Index: gdb-6.8.50.20081214/gdb/testsuite/gdb.opt/inline-markers.c +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-markers.c =================================================================== ---- gdb-6.8.50.20081214.orig/gdb/testsuite/gdb.opt/inline-markers.c 2009-02-09 13:28:48.000000000 +0100 -+++ gdb-6.8.50.20081214/gdb/testsuite/gdb.opt/inline-markers.c 2009-02-09 13:28:49.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/inline-markers.c 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-markers.c 2009-02-28 07:37:54.000000000 +0100 @@ -15,11 +15,6 @@ extern int x, y; @@ -439,10 +439,10 @@ void marker(void) { x += y; /* set breakpoint 2 here */ -Index: gdb-6.8.50.20081214/gdb/gdbthread.h +Index: gdb-6.8.50.20090226/gdb/gdbthread.h =================================================================== ---- gdb-6.8.50.20081214.orig/gdb/gdbthread.h 2009-02-09 13:28:48.000000000 +0100 -+++ gdb-6.8.50.20081214/gdb/gdbthread.h 2009-02-09 13:30:16.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/gdbthread.h 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/gdbthread.h 2009-02-28 07:37:54.000000000 +0100 @@ -180,6 +180,12 @@ struct thread_info /* Private data used by the target vector implementation. */ @@ -456,11 +456,11 @@ }; /* Create an empty thread list, or empty the existing one. */ -Index: gdb-6.8.50.20081214/gdb/infcmd.c +Index: gdb-6.8.50.20090226/gdb/infcmd.c =================================================================== ---- gdb-6.8.50.20081214.orig/gdb/infcmd.c 2009-02-09 13:28:48.000000000 +0100 -+++ gdb-6.8.50.20081214/gdb/infcmd.c 2009-02-09 13:30:16.000000000 +0100 -@@ -1373,11 +1373,11 @@ finish_command_continuation (void *arg) +--- gdb-6.8.50.20090226.orig/gdb/infcmd.c 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/infcmd.c 2009-02-28 07:37:54.000000000 +0100 +@@ -1391,11 +1391,11 @@ finish_command_continuation (void *arg) struct type *value_type; value_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (a->function)); @@ -474,7 +474,7 @@ print_return_value (SYMBOL_TYPE (a->function), value_type); } -@@ -1481,6 +1481,16 @@ finish_forward (struct symbol *function, +@@ -1499,6 +1499,16 @@ finish_forward (struct symbol *function, old_chain = make_cleanup_delete_breakpoint (breakpoint); @@ -491,7 +491,7 @@ tp->proceed_to_finish = 1; /* We want stop_registers, please... */ make_cleanup_restore_integer (&suppress_stop_observer); suppress_stop_observer = 1; -@@ -1504,7 +1514,9 @@ finish_forward (struct symbol *function, +@@ -1522,7 +1532,9 @@ finish_forward (struct symbol *function, static void finish_command (char *arg, int from_tty) { @@ -502,7 +502,7 @@ struct symbol *function; int async_exec = 0; -@@ -1535,46 +1547,63 @@ finish_command (char *arg, int from_tty) +@@ -1553,46 +1565,63 @@ finish_command (char *arg, int from_tty) if (!target_has_execution) error (_("The program is not running.")); @@ -584,7 +584,7 @@ /* Print info on the selected frame, including level number but not source. */ -@@ -1588,10 +1617,14 @@ finish_command (char *arg, int from_tty) +@@ -1606,10 +1635,14 @@ finish_command (char *arg, int from_tty) print_stack_frame (get_selected_frame (NULL), 1, LOCATION); } @@ -600,11 +600,11 @@ } -Index: gdb-6.8.50.20081214/gdb/infrun.c +Index: gdb-6.8.50.20090226/gdb/infrun.c =================================================================== ---- gdb-6.8.50.20081214.orig/gdb/infrun.c 2009-02-09 13:29:51.000000000 +0100 -+++ gdb-6.8.50.20081214/gdb/infrun.c 2009-02-09 13:30:16.000000000 +0100 -@@ -1147,8 +1150,6 @@ a command like `return' or `jump' to con +--- gdb-6.8.50.20090226.orig/gdb/infrun.c 2009-02-28 07:37:36.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/infrun.c 2009-02-28 07:37:54.000000000 +0100 +@@ -1152,8 +1152,6 @@ a command like `return' or `jump' to con step = 0; } @@ -613,7 +613,7 @@ if (debug_displaced && use_displaced_stepping (gdbarch) && tp->trap_expected) -@@ -1201,6 +1201,8 @@ clear_proceed_status_thread (struct thre +@@ -1205,6 +1203,8 @@ clear_proceed_status_thread (struct thre /* Discard any remaining commands or status from previous stop. */ bpstat_clear (&tp->stop_bpstat); @@ -622,8 +622,10 @@ } static int ---- ./gdb/target.c 2009-02-10 23:45:59.000000000 +0100 -+++ ./gdb/target.c 2009-02-10 23:43:29.000000000 +0100 +Index: gdb-6.8.50.20090226/gdb/target.c +=================================================================== +--- gdb-6.8.50.20090226.orig/gdb/target.c 2009-02-28 07:31:48.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/target.c 2009-02-28 07:38:36.000000000 +0100 @@ -41,6 +41,7 @@ #include "target-descriptions.h" #include "gdbthread.h" @@ -632,18 +634,18 @@ static void target_info (char *, int); -@@ -1938,6 +1939,7 @@ target_pid_to_str (ptid_t ptid) - void - target_resume (ptid_t ptid, int step, enum target_signal signal) +@@ -1925,6 +1926,7 @@ target_resume (ptid_t ptid, int step, en { + struct target_ops *t; + + clear_inline_frame_state (ptid); dcache_invalidate (target_dcache); - (*current_target.to_resume) (ptid, step, signal); - set_executing (ptid, 1); -Index: gdb-6.8.50.20081214/gdb/inline-frame.h + + for (t = current_target.beneath; t != NULL; t = t->beneath) +Index: gdb-6.8.50.20090226/gdb/inline-frame.h =================================================================== ---- gdb-6.8.50.20081214.orig/gdb/inline-frame.h 2009-02-09 13:28:48.000000000 +0100 -+++ gdb-6.8.50.20081214/gdb/inline-frame.h 2009-02-09 13:30:16.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/inline-frame.h 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/inline-frame.h 2009-02-28 07:37:54.000000000 +0100 @@ -43,6 +43,10 @@ void clear_inline_frame_state (ptid_t pt void step_into_inline_frame (ptid_t ptid); @@ -655,9 +657,11 @@ /* Return the number of hidden functions inlined into the current frame. */ ---- gdb-6.8.50.20090209/gdb/infcall.c 2009-02-10 00:16:10.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/infcall.c-removed 2009-02-10 00:15:58.000000000 +0100 -@@ -841,8 +841,15 @@ When the function is done executing, GDB +Index: gdb-6.8.50.20090226/gdb/infcall.c +=================================================================== +--- gdb-6.8.50.20090226.orig/gdb/infcall.c 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/infcall.c 2009-02-28 07:37:54.000000000 +0100 +@@ -898,8 +898,15 @@ The program being debugged exited while if (unwind_on_signal_p) { gdb-6.8-inlining.patch: Index: gdb-6.8-inlining.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-inlining.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gdb-6.8-inlining.patch 11 Feb 2009 00:04:48 -0000 1.7 +++ gdb-6.8-inlining.patch 2 Mar 2009 00:11:35 -0000 1.8 @@ -5,10 +5,10 @@ Removed dwarf_expr_frame_base NULL check duplicity with *-vla.patch. -Index: gdb-6.8.50.20090209/gdb/NEWS +Index: gdb-6.8.50.20090226/gdb/NEWS =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/NEWS 2009-02-07 16:00:57.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/NEWS 2009-02-09 16:06:54.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/NEWS 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/NEWS 2009-02-28 07:34:29.000000000 +0100 @@ -1,6 +1,11 @@ What has changed in GDB? (Organized release by release) @@ -20,11 +20,11 @@ + *** Changes since GDB 6.8 - * GDB now supports automatic retrieval of shared library files from -Index: gdb-6.8.50.20090209/gdb/block.c + * GDB now has support for multi-byte and wide character sets on the +Index: gdb-6.8.50.20090226/gdb/block.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/block.c 2009-01-03 06:57:50.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/block.c 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/block.c 2009-01-03 06:57:50.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/block.c 2009-02-28 07:34:09.000000000 +0100 @@ -47,8 +47,16 @@ contained_in (const struct block *a, con { if (!a || !b) @@ -67,10 +67,10 @@ /* Return the blockvector immediately containing the innermost lexical block containing the specified pc value and section, or 0 if there is none. PBLOCK is a pointer to the block. If PBLOCK is NULL, we -Index: gdb-6.8.50.20090209/gdb/block.h +Index: gdb-6.8.50.20090226/gdb/block.h =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/block.h 2009-01-03 06:57:50.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/block.h 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/block.h 2009-01-03 06:57:50.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/block.h 2009-02-28 07:34:09.000000000 +0100 @@ -65,7 +65,7 @@ struct block CORE_ADDR endaddr; @@ -89,10 +89,10 @@ extern int contained_in (const struct block *, const struct block *); extern struct blockvector *blockvector_for_pc (CORE_ADDR, struct block **); -Index: gdb-6.8.50.20090209/gdb/blockframe.c +Index: gdb-6.8.50.20090226/gdb/blockframe.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/blockframe.c 2009-01-03 06:57:50.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/blockframe.c 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/blockframe.c 2009-01-03 06:57:50.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/blockframe.c 2009-02-28 07:34:09.000000000 +0100 @@ -36,6 +36,7 @@ #include "command.h" #include "gdbcmd.h" @@ -161,11 +161,11 @@ return frame; frame = get_prev_frame (frame); -Index: gdb-6.8.50.20090209/gdb/breakpoint.c +Index: gdb-6.8.50.20090226/gdb/breakpoint.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/breakpoint.c 2009-02-09 16:04:10.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/breakpoint.c 2009-02-09 16:06:00.000000000 +0100 -@@ -2615,19 +2615,21 @@ watchpoint_check (void *p) +--- gdb-6.8.50.20090226.orig/gdb/breakpoint.c 2009-02-28 07:33:47.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/breakpoint.c 2009-02-28 07:34:09.000000000 +0100 +@@ -2641,19 +2641,21 @@ watchpoint_check (void *p) within_current_scope = 1; else { @@ -195,7 +195,7 @@ /* in_function_epilogue_p() returns a non-zero value if we're still in the function but the stack frame has already been invalidated. -@@ -2639,10 +2641,9 @@ watchpoint_check (void *p) +@@ -2665,10 +2667,9 @@ watchpoint_check (void *p) that the watchpoint frame couldn't be found by frame_find_by_id() because the current PC is currently in an epilogue. Calling gdbarch_in_function_epilogue_p() also when fr == NULL fixes that. */ @@ -208,7 +208,7 @@ /* If we end up stopping, the current frame will get selected in normal_stop. So this call to select_frame won't affect the user. */ -@@ -2876,7 +2877,7 @@ bpstat_check_breakpoint_conditions (bpst +@@ -2902,7 +2903,7 @@ bpstat_check_breakpoint_conditions (bpst struct breakpoint *b = bl->owner; if (frame_id_p (b->frame_id) @@ -217,7 +217,7 @@ bs->stop = 0; else if (bs->stop) { -@@ -2891,8 +2892,12 @@ bpstat_check_breakpoint_conditions (bpst +@@ -2917,8 +2918,12 @@ bpstat_check_breakpoint_conditions (bpst if (bl->cond && bl->owner->disposition != disp_del_at_next_stop) { @@ -232,7 +232,7 @@ select_frame (get_current_frame ()); value_is_zero = catch_errors (breakpoint_cond_eval, (bl->cond), -@@ -4862,6 +4867,11 @@ set_momentary_breakpoint (struct symtab_ +@@ -5162,6 +5167,11 @@ set_momentary_breakpoint (struct symtab_ enum bptype type) { struct breakpoint *b; @@ -244,7 +244,7 @@ b = set_raw_breakpoint (sal, type); b->enable_state = bp_enabled; b->disposition = disp_donttouch; -@@ -5872,7 +5882,6 @@ watch_command_1 (char *arg, int accessfl +@@ -6175,7 +6185,6 @@ watch_command_1 (char *arg, int accessfl struct block *exp_valid_block; struct value *val, *mark, *val_chain; struct frame_info *frame; @@ -252,7 +252,7 @@ char *exp_start = NULL; char *exp_end = NULL; char *tok, *id_tok_start, *end_tok; -@@ -6033,34 +6042,34 @@ watch_command_1 (char *arg, int accessfl +@@ -6336,34 +6345,34 @@ watch_command_1 (char *arg, int accessfl bp_type = bp_watchpoint; frame = block_innermost_frame (exp_valid_block); @@ -305,7 +305,7 @@ } /* Now set up the breakpoint. */ -@@ -6241,7 +6250,6 @@ until_break_command (char *arg, int from +@@ -6544,7 +6553,6 @@ until_break_command (char *arg, int from struct symtabs_and_lines sals; struct symtab_and_line sal; struct frame_info *frame = get_selected_frame (NULL); @@ -313,7 +313,7 @@ struct breakpoint *breakpoint; struct breakpoint *breakpoint2 = NULL; struct cleanup *old_chain; -@@ -6274,20 +6282,22 @@ until_break_command (char *arg, int from +@@ -6577,20 +6585,22 @@ until_break_command (char *arg, int from we don't specify a frame at which we need to stop. */ breakpoint = set_momentary_breakpoint (sal, null_frame_id, bp_until); else @@ -342,10 +342,10 @@ bp_until); make_cleanup_delete_breakpoint (breakpoint2); } -Index: gdb-6.8.50.20090209/gdb/buildsym.c +Index: gdb-6.8.50.20090226/gdb/buildsym.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/buildsym.c 2009-01-03 06:57:50.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/buildsym.c 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/buildsym.c 2009-01-03 06:57:50.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/buildsym.c 2009-02-28 07:34:09.000000000 +0100 @@ -1159,6 +1159,12 @@ end_symtab (CORE_ADDR end_addr, struct o struct symbol *sym; struct dict_iterator iter; @@ -359,10 +359,10 @@ for (sym = dict_iterator_first (BLOCK_DICT (block), &iter); sym != NULL; sym = dict_iterator_next (&iter)) -Index: gdb-6.8.50.20090209/gdb/doc/gdb.texinfo +Index: gdb-6.8.50.20090226/gdb/doc/gdb.texinfo =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/doc/gdb.texinfo 2009-02-09 16:04:10.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/doc/gdb.texinfo 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/doc/gdb.texinfo 2009-02-28 07:33:47.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/doc/gdb.texinfo 2009-02-28 07:34:09.000000000 +0100 @@ -137,6 +137,7 @@ software in general. We will miss him. * Stack:: Examining the stack * Source:: Examining source files @@ -371,7 +371,7 @@ * Macros:: Preprocessor Macros * Tracepoints:: Debugging remote targets non-intrusively * Overlays:: Debugging programs that use overlays -@@ -1812,7 +1813,7 @@ To request debugging information, specif +@@ -1824,7 +1825,7 @@ To request debugging information, specif the compiler. Programs that are to be shipped to your customers are compiled with @@ -380,7 +380,7 @@ compilers are unable to handle the @samp{-g} and @samp{-O} options together. Using those compilers, you cannot generate optimized executables containing debugging information. -@@ -1821,22 +1822,7 @@ executables containing debugging informa +@@ -1833,22 +1834,7 @@ executables containing debugging informa without @samp{-O}, making it possible to debug optimized code. We recommend that you @emph{always} use @samp{-g} whenever you compile a program. You may think your program is correct, but there is no sense @@ -404,7 +404,7 @@ Older versions of the @sc{gnu} C compiler permitted a variant option @w{@samp{-gg}} for debugging information. @value{GDBN} no longer supports this -@@ -8297,6 +8283,107 @@ $1 = 1 +@@ -8393,6 +8379,107 @@ $1 = 1 $2 = (void *) 0x8049560 @end smallexample @@ -512,10 +512,10 @@ @node Macros @chapter C Preprocessor Macros -Index: gdb-6.8.50.20090209/gdb/dwarf2loc.c +Index: gdb-6.8.50.20090226/gdb/dwarf2loc.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/dwarf2loc.c 2009-02-09 15:38:54.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/dwarf2loc.c 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/dwarf2loc.c 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/dwarf2loc.c 2009-02-28 07:34:09.000000000 +0100 @@ -31,6 +31,7 @@ #include "regcache.h" #include "objfiles.h" @@ -536,19 +536,19 @@ /* If we found a frame-relative symbol then it was certainly within some function associated with a frame. If we can't find the frame, -Index: gdb-6.8.50.20090209/gdb/dwarf2read.c +Index: gdb-6.8.50.20090226/gdb/dwarf2read.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/dwarf2read.c 2009-02-09 16:03:46.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/dwarf2read.c 2009-02-09 16:06:00.000000000 +0100 -@@ -46,6 +46,7 @@ - #include "hashtab.h" - #include "command.h" - #include "gdbcmd.h" -+#include "block.h" +--- gdb-6.8.50.20090226.orig/gdb/dwarf2read.c 2009-02-28 07:33:47.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/dwarf2read.c 2009-02-28 07:36:45.000000000 +0100 +@@ -49,6 +49,7 @@ #include "addrmap.h" + #include "f-lang.h" #include "top.h" ++#include "block.h" -@@ -2788,12 +2789,8 @@ process_die (struct die_info *die, struc + #include + #include "gdb_string.h" +@@ -2947,12 +2948,8 @@ process_die (struct die_info *die, struc read_file_scope (die, cu); break; case DW_TAG_subprogram: @@ -562,15 +562,11 @@ break; case DW_TAG_lexical_block: case DW_TAG_try_block: -@@ -3056,10 +3053,25 @@ read_func_scope (struct die_info *die, s - CORE_ADDR lowpc; - CORE_ADDR highpc; - struct die_info *child_die; -- struct attribute *attr; -+ struct attribute *attr, *call_line, *call_file; - char *name; +@@ -3233,6 +3230,22 @@ read_func_scope (struct die_info *die, s CORE_ADDR baseaddr; struct block *block; + unsigned die_children; ++ struct attribute *call_line, *call_file; + int inlined_func = (die->tag == DW_TAG_inlined_subroutine); + + if (inlined_func) @@ -589,7 +585,7 @@ baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); -@@ -6949,6 +6961,9 @@ die_specification (struct die_info *die, +@@ -7310,6 +7323,9 @@ die_specification (struct die_info *die, *spec_cu); if (spec_attr == NULL) @@ -599,7 +595,7 @@ return NULL; else return follow_die_ref (die, spec_attr, spec_cu); -@@ -7632,6 +7647,7 @@ new_symbol (struct die_info *die, struct +@@ -7993,6 +8009,7 @@ new_symbol (struct die_info *die, struct struct attribute *attr = NULL; struct attribute *attr2 = NULL; CORE_ADDR baseaddr; @@ -607,7 +603,7 @@ baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); -@@ -7661,13 +7677,17 @@ new_symbol (struct die_info *die, struct +@@ -8022,13 +8039,17 @@ new_symbol (struct die_info *die, struct SYMBOL_TYPE (sym) = type; else SYMBOL_TYPE (sym) = die_type (die, cu); @@ -627,7 +623,7 @@ if (attr) { int file_index = DW_UNSND (attr); -@@ -7714,6 +7734,14 @@ new_symbol (struct die_info *die, struct +@@ -8075,6 +8096,14 @@ new_symbol (struct die_info *die, struct add_symbol_to_list (sym, cu->list_in_scope); } break; @@ -642,7 +638,7 @@ case DW_TAG_variable: /* Compilation with minimal debug info may result in variables with missing type entries. Change the misleading `void' type -@@ -7761,7 +7789,14 @@ new_symbol (struct die_info *die, struct +@@ -8130,7 +8159,14 @@ new_symbol (struct die_info *die, struct } break; case DW_TAG_formal_parameter: @@ -658,10 +654,10 @@ attr = dwarf2_attr (die, DW_AT_location, cu); if (attr) { -Index: gdb-6.8.50.20090209/gdb/frame-unwind.c +Index: gdb-6.8.50.20090226/gdb/frame-unwind.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/frame-unwind.c 2009-01-03 06:57:51.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/frame-unwind.c 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/frame-unwind.c 2009-01-03 06:57:51.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/frame-unwind.c 2009-02-28 07:34:09.000000000 +0100 @@ -21,6 +21,7 @@ #include "frame.h" #include "frame-unwind.h" @@ -682,10 +678,10 @@ return table; } -Index: gdb-6.8.50.20090209/gdb/frame.c +Index: gdb-6.8.50.20090226/gdb/frame.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/frame.c 2009-02-09 15:48:46.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/frame.c 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/frame.c 2009-02-28 07:22:02.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/frame.c 2009-02-28 07:34:09.000000000 +0100 @@ -41,8 +41,14 @@ #include "objfiles.h" #include "exceptions.h" @@ -1042,10 +1038,10 @@ } /* Per "frame.h", return the ``address'' of the frame. Code should -Index: gdb-6.8.50.20090209/gdb/frame.h +Index: gdb-6.8.50.20090226/gdb/frame.h =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/frame.h 2009-02-05 18:28:20.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/frame.h 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/frame.h 2009-02-05 18:28:20.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/frame.h 2009-02-28 07:34:09.000000000 +0100 @@ -34,6 +34,9 @@ frame_unwind_WHAT...(): Unwind THIS frame's WHAT from the NEXT frame. @@ -1107,10 +1103,10 @@ extern struct frame_id frame_unwind_id (struct frame_info *next_frame); /* Assuming that a frame is `normal', return its base-address, or 0 if -Index: gdb-6.8.50.20090209/gdb/gdbthread.h +Index: gdb-6.8.50.20090226/gdb/gdbthread.h =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/gdbthread.h 2009-01-18 18:42:16.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/gdbthread.h 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/gdbthread.h 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/gdbthread.h 2009-02-28 07:34:09.000000000 +0100 @@ -83,6 +83,13 @@ struct thread_info This is how we know when we step into a subroutine call, and how to set the frame for the breakpoint used to step out. */ @@ -1125,11 +1121,11 @@ int current_line; struct symtab *current_symtab; -Index: gdb-6.8.50.20090209/gdb/infcall.c +Index: gdb-6.8.50.20090226/gdb/infcall.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/infcall.c 2009-01-19 20:05:00.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/infcall.c 2009-02-09 16:08:45.000000000 +0100 -@@ -841,15 +841,8 @@ When the function is done executing, GDB +--- gdb-6.8.50.20090226.orig/gdb/infcall.c 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/infcall.c 2009-02-28 07:34:09.000000000 +0100 +@@ -898,15 +898,8 @@ The program being debugged exited while if (unwind_on_signal_p) { @@ -1147,10 +1143,10 @@ /* FIXME: Insert a bunch of wrap_here; name can be very long if it's a C++ name with arguments and stuff. */ -Index: gdb-6.8.50.20090209/gdb/infcmd.c +Index: gdb-6.8.50.20090226/gdb/infcmd.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/infcmd.c 2009-01-26 00:35:51.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/infcmd.c 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/infcmd.c 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/infcmd.c 2009-02-28 07:34:09.000000000 +0100 @@ -52,6 +52,7 @@ #include "cli/cli-decode.h" #include "gdbthread.h" @@ -1159,7 +1155,7 @@ /* Functions exported for general use, in inferior.h: */ -@@ -739,6 +740,17 @@ Can't resume all threads and specify pro +@@ -744,6 +745,17 @@ Can't resume all threads and specify pro continue_1 (all_threads); } @@ -1177,7 +1173,7 @@ /* Step until outside of current statement. */ static void -@@ -916,6 +928,20 @@ step_once (int skip_subroutines, int sin +@@ -921,6 +933,20 @@ step_once (int skip_subroutines, int sin THREAD is set. */ struct thread_info *tp = inferior_thread (); clear_proceed_status (); @@ -1198,7 +1194,7 @@ frame = get_current_frame (); tp->step_frame_id = get_frame_id (frame); -@@ -1168,6 +1194,7 @@ until_next_command (int from_tty) +@@ -1173,6 +1199,7 @@ until_next_command (int from_tty) clear_proceed_status (); frame = get_current_frame (); @@ -1206,7 +1202,7 @@ /* Step until either exited from this function or greater than the current line (if in symbolic section) or pc (if -@@ -1195,7 +1222,6 @@ until_next_command (int from_tty) +@@ -1200,7 +1227,6 @@ until_next_command (int from_tty) } tp->step_over_calls = STEP_OVER_ALL; @@ -1214,7 +1210,7 @@ tp->step_multi = 0; /* Only one call to proceed */ -@@ -1528,6 +1554,37 @@ finish_command (char *arg, int from_tty) +@@ -1533,6 +1559,37 @@ finish_command (char *arg, int from_tty) clear_proceed_status (); @@ -1252,10 +1248,10 @@ /* Find the function we will return from. */ function = find_pc_function (get_frame_pc (get_selected_frame (NULL))); -Index: gdb-6.8.50.20090209/gdb/inferior.h +Index: gdb-6.8.50.20090226/gdb/inferior.h =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/inferior.h 2009-02-09 15:39:01.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/inferior.h 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/inferior.h 2009-02-27 00:04:34.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/inferior.h 2009-02-28 07:34:09.000000000 +0100 @@ -259,6 +259,9 @@ extern void error_is_running (void); /* Calls error_is_running if the current thread is running. */ extern void ensure_not_running (void); @@ -1266,10 +1262,10 @@ /* From infcmd.c */ extern void tty_command (char *, int); -Index: gdb-6.8.50.20090209/gdb/infrun.c +Index: gdb-6.8.50.20090226/gdb/infrun.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/infrun.c 2009-02-09 16:02:31.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/infrun.c 2009-02-09 16:09:19.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/infrun.c 2009-02-28 07:31:50.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/infrun.c 2009-02-28 07:37:36.000000000 +0100 @@ -48,6 +48,7 @@ #include "gdb_assert.h" #include "mi/mi-common.h" @@ -1287,7 +1283,7 @@ /* Command list pointer for the "stop" placeholder. */ -@@ -1146,6 +1147,8 @@ a command like `return' or `jump' to con +@@ -1151,6 +1152,8 @@ a command like `return' or `jump' to con step = 0; } @@ -1296,7 +1292,7 @@ if (debug_displaced && use_displaced_stepping (gdbarch) && tp->trap_expected) -@@ -1187,6 +1190,7 @@ clear_proceed_status_thread (struct thre +@@ -1192,6 +1195,7 @@ clear_proceed_status_thread (struct thre tp->step_range_start = 0; tp->step_range_end = 0; tp->step_frame_id = null_frame_id; @@ -1304,7 +1300,7 @@ tp->step_over_calls = STEP_OVER_UNDEBUGGABLE; tp->stop_requested = 0; -@@ -1531,6 +1535,9 @@ init_wait_for_inferior (void) +@@ -1536,6 +1540,9 @@ init_wait_for_inferior (void) init_infwait_state (); displaced_step_clear (); @@ -1314,7 +1310,7 @@ } -@@ -1586,7 +1593,7 @@ struct execution_control_state +@@ -1591,7 +1598,7 @@ struct execution_control_state int wait_some_more; }; @@ -1323,7 +1319,7 @@ void handle_inferior_event (struct execution_control_state *ecs); -@@ -1944,10 +1951,21 @@ fetch_inferior_event (void *client_data) +@@ -1949,10 +1956,21 @@ fetch_inferior_event (void *client_data) display_gdb_prompt (0); } @@ -1346,7 +1342,7 @@ init_execution_control_state (struct execution_control_state *ecs) { ecs->random_signal = 0; -@@ -1958,16 +1976,10 @@ init_execution_control_state (struct exe +@@ -1963,16 +1981,10 @@ init_execution_control_state (struct exe void init_thread_stepping_state (struct thread_info *tss) { @@ -1363,8 +1359,8 @@ } /* Return the cached copy of the last pid/waitstatus returned by -@@ -2137,6 +2149,22 @@ ensure_not_running (void) - error_is_running (); +@@ -2186,6 +2198,22 @@ deal_with_syscall_event (struct executio + } } +static int @@ -1386,7 +1382,7 @@ /* Given an execution control state that has been freshly filled in by an event from the inferior, figure out what it means and take appropriate action. */ -@@ -2828,6 +2856,12 @@ targets should add new threads to the th +@@ -2880,6 +2908,12 @@ targets should add new threads to the th ecs->random_signal = 0; stopped_by_random_signal = 0; @@ -1399,7 +1395,7 @@ if (ecs->event_thread->stop_signal == TARGET_SIGNAL_TRAP && ecs->event_thread->trap_expected && gdbarch_single_step_through_delay_p (current_gdbarch) -@@ -3060,8 +3094,8 @@ process_event_stop_test: +@@ -3112,8 +3146,8 @@ process_event_stop_test: && ecs->event_thread->stop_signal != TARGET_SIGNAL_0 && (ecs->event_thread->step_range_start <= stop_pc && stop_pc < ecs->event_thread->step_range_end) @@ -1410,7 +1406,7 @@ && ecs->event_thread->step_resume_breakpoint == NULL) { /* The inferior is about to take a signal that will take it -@@ -3447,10 +3481,10 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME ( +@@ -3499,10 +3533,10 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME ( NOTE: frame_id_eq will never report two invalid frame IDs as being equal, so to get into this block, both the current and previous frame must have valid frame IDs. */ @@ -1424,7 +1420,7 @@ || execution_direction == EXEC_REVERSE)) { CORE_ADDR real_stop_pc; -@@ -3693,6 +3727,82 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME ( +@@ -3745,6 +3779,82 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME ( return; } @@ -1507,7 +1503,7 @@ if ((stop_pc == stop_pc_sal.pc) && (ecs->event_thread->current_line != stop_pc_sal.line || ecs->event_thread->current_symtab != stop_pc_sal.symtab)) -@@ -3718,9 +3828,7 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME ( +@@ -3770,9 +3880,7 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME ( ecs->event_thread->step_range_start = stop_pc_sal.pc; ecs->event_thread->step_range_end = stop_pc_sal.end; @@ -1518,7 +1514,7 @@ if (debug_infrun) fprintf_unfiltered (gdb_stdlog, "infrun: keep going\n"); -@@ -4987,6 +5095,7 @@ struct inferior_status +@@ -5024,6 +5132,7 @@ struct inferior_status CORE_ADDR step_range_start; CORE_ADDR step_range_end; struct frame_id step_frame_id; @@ -1526,7 +1522,7 @@ enum step_over_calls_kind step_over_calls; CORE_ADDR step_resume_break_address; int stop_after_trap; -@@ -5016,6 +5125,7 @@ save_inferior_status (void) +@@ -5053,6 +5162,7 @@ save_inferior_status (void) inf_status->step_range_start = tp->step_range_start; inf_status->step_range_end = tp->step_range_end; inf_status->step_frame_id = tp->step_frame_id; @@ -1534,7 +1530,7 @@ inf_status->step_over_calls = tp->step_over_calls; inf_status->stop_after_trap = stop_after_trap; inf_status->stop_soon = inf->stop_soon; -@@ -5069,6 +5179,7 @@ restore_inferior_status (struct inferior +@@ -5106,6 +5216,7 @@ restore_inferior_status (struct inferior tp->step_range_start = inf_status->step_range_start; tp->step_range_end = inf_status->step_range_end; tp->step_frame_id = inf_status->step_frame_id; @@ -1542,10 +1538,10 @@ tp->step_over_calls = inf_status->step_over_calls; stop_after_trap = inf_status->stop_after_trap; inf->stop_soon = inf_status->stop_soon; -Index: gdb-6.8.50.20090209/gdb/inline-frame.c +Index: gdb-6.8.50.20090226/gdb/inline-frame.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090209/gdb/inline-frame.c 2009-02-09 16:06:00.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/inline-frame.c 2009-02-28 07:34:09.000000000 +0100 @@ -0,0 +1,382 @@ +/* Inline frame unwinder for GDB. + @@ -1929,10 +1925,10 @@ + + return inline_count; +} -Index: gdb-6.8.50.20090209/gdb/inline-frame.h +Index: gdb-6.8.50.20090226/gdb/inline-frame.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090209/gdb/inline-frame.h 2009-02-09 16:06:00.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/inline-frame.h 2009-02-28 07:34:09.000000000 +0100 @@ -0,0 +1,62 @@ +/* Definitions for inline frame support. + @@ -1996,10 +1992,10 @@ +int frame_inlined_callees (struct frame_info *this_frame); + +#endif /* !defined (INLINE_FRAME_H) */ -Index: gdb-6.8.50.20090209/gdb/minsyms.c +Index: gdb-6.8.50.20090226/gdb/minsyms.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/minsyms.c 2009-02-09 16:02:28.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/minsyms.c 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/minsyms.c 2009-02-28 07:31:49.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/minsyms.c 2009-02-28 07:34:09.000000000 +0100 @@ -767,7 +767,7 @@ prim_record_minimal_symbol_and_info (con if (msym_bunch_index == BUNCH_SIZE) @@ -2009,10 +2005,10 @@ msym_bunch_index = 0; new->next = msym_bunch; msym_bunch = new; -Index: gdb-6.8.50.20090209/gdb/s390-tdep.c +Index: gdb-6.8.50.20090226/gdb/s390-tdep.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/s390-tdep.c 2009-01-03 06:57:53.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/s390-tdep.c 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/s390-tdep.c 2009-02-22 02:02:19.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/s390-tdep.c 2009-02-28 07:34:09.000000000 +0100 @@ -1182,6 +1182,7 @@ s390_prologue_frame_unwind_cache (struct CORE_ADDR prev_sp; int frame_pointer; @@ -2046,10 +2042,10 @@ || get_frame_type (get_next_frame (this_frame)) != NORMAL_FRAME)) { /* See the comment in s390_in_function_epilogue_p on why this is -Index: gdb-6.8.50.20090209/gdb/stack.c +Index: gdb-6.8.50.20090226/gdb/stack.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/stack.c 2009-01-26 20:09:58.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/stack.c 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/stack.c 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/stack.c 2009-02-28 07:35:20.000000000 +0100 @@ -45,6 +45,7 @@ #include "valprint.h" #include "gdbthread.h" @@ -2089,7 +2085,7 @@ /* Show or print a stack frame FRAME briefly. The output is format according to PRINT_LEVEL and PRINT_WHAT printing the frame's relative level, function name, argument list, and file name and -@@ -537,7 +562,7 @@ print_frame_info (struct frame_info *fra +@@ -538,7 +563,7 @@ print_frame_info (struct frame_info *fra { int done = 0; int mid_statement = ((print_what == SRC_LINE) @@ -2098,16 +2094,16 @@ if (annotation_level) done = identify_source_line (sal.symtab, sal.line, mid_statement, -@@ -594,7 +619,7 @@ print_frame (struct frame_info *frame, i - stb = ui_out_stream_new (uiout); - old_chain = make_cleanup_ui_out_stream_delete (stb); +@@ -591,7 +616,7 @@ find_frame_funname (struct frame_info *f + *funname = NULL; + *funlang = language_unknown; - func = find_pc_function (get_frame_address_in_block (frame)); + func = get_frame_function (frame); if (func) { /* In certain pathological cases, the symtabs give the wrong -@@ -615,8 +640,13 @@ print_frame (struct frame_info *frame, i +@@ -612,8 +637,13 @@ find_frame_funname (struct frame_info *f changed (and we'll create a find_pc_minimal_function or some such). */ @@ -2123,7 +2119,7 @@ if (msymbol != NULL && (SYMBOL_VALUE_ADDRESS (msymbol) -@@ -673,7 +703,7 @@ print_frame (struct frame_info *frame, i +@@ -687,7 +717,7 @@ print_frame (struct frame_info *frame, i } get_user_print_options (&opts); if (opts.addressprint) @@ -2132,7 +2128,7 @@ || print_what == LOC_AND_ADDRESS) { annotate_frame_address (); -@@ -853,8 +883,16 @@ parse_frame_specification_1 (const char +@@ -867,8 +897,16 @@ parse_frame_specification_1 (const char { if (frame_id_eq (id, get_frame_id (fid))) { @@ -2151,7 +2147,7 @@ return fid; } } -@@ -988,8 +1026,10 @@ frame_info (char *addr_exp, int from_tty +@@ -1002,8 +1040,10 @@ frame_info (char *addr_exp, int from_tty printf_filtered (_(" Outermost frame: %s\n"), frame_stop_reason_string (reason)); } @@ -2164,7 +2160,7 @@ { printf_filtered (" called by frame at "); fputs_filtered (paddress (get_frame_base (calling_frame_info)), -@@ -1449,7 +1489,9 @@ print_frame_local_vars (struct frame_inf +@@ -1465,7 +1505,9 @@ print_frame_local_vars (struct frame_inf if (print_block_frame_locals (block, frame, num_tabs, stream)) values_printed = 1; /* After handling the function's top-level block, stop. Don't @@ -2175,7 +2171,7 @@ if (BLOCK_FUNCTION (block)) break; block = BLOCK_SUPERBLOCK (block); -@@ -1520,7 +1562,9 @@ print_frame_label_vars (struct frame_inf +@@ -1536,7 +1578,9 @@ print_frame_label_vars (struct frame_inf return; /* After handling the function's top-level block, stop. Don't @@ -2186,7 +2182,7 @@ if (BLOCK_FUNCTION (block)) break; block = BLOCK_SUPERBLOCK (block); -@@ -1790,6 +1834,9 @@ return_command (char *retval_exp, int fr +@@ -1874,6 +1918,9 @@ return_command (char *retval_exp, int fr thisframe = get_selected_frame ("No selected frame."); thisfun = get_frame_function (thisframe); @@ -2196,11 +2192,11 @@ /* Compute the return value. If the computation triggers an error, let it bail. If the return type can't be handled, set RETURN_VALUE to NULL, and QUERY_PREFIX to an informational -Index: gdb-6.8.50.20090209/gdb/symtab.c +Index: gdb-6.8.50.20090226/gdb/symtab.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/symtab.c 2009-02-09 16:02:29.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/symtab.c 2009-02-09 16:06:00.000000000 +0100 -@@ -1373,10 +1373,13 @@ lookup_symbol_aux_local (const char *nam +--- gdb-6.8.50.20090226.orig/gdb/symtab.c 2009-02-28 07:31:49.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/symtab.c 2009-02-28 07:34:09.000000000 +0100 +@@ -1408,10 +1408,13 @@ lookup_symbol_aux_local (const char *nam sym = lookup_symbol_aux_block (name, linkage_name, block, domain); if (sym != NULL) return sym; @@ -2215,7 +2211,7 @@ return NULL; } -@@ -2609,6 +2612,7 @@ find_function_start_sal (struct symbol * +@@ -2668,6 +2671,7 @@ find_function_start_sal (struct symbol * CORE_ADDR pc; struct symtab_and_line sal; @@ -2223,7 +2219,7 @@ pc = BLOCK_START (block); fixup_symbol_section (sym, objfile); -@@ -2647,6 +2651,25 @@ find_function_start_sal (struct symbol * +@@ -2706,6 +2710,25 @@ find_function_start_sal (struct symbol * sal.pc = pc; @@ -2249,7 +2245,7 @@ return sal; } -@@ -3669,6 +3692,24 @@ add_macro_name (const char *name, const +@@ -3728,6 +3751,24 @@ add_macro_name (const char *name, const datum->text, datum->word); } @@ -2274,7 +2270,7 @@ char ** default_make_symbol_completion_list (char *text, char *word) { -@@ -3681,9 +3722,9 @@ default_make_symbol_completion_list (cha +@@ -3740,9 +3781,9 @@ default_make_symbol_completion_list (cha struct partial_symtab *ps; struct minimal_symbol *msymbol; struct objfile *objfile; @@ -2286,7 +2282,7 @@ struct partial_symbol **psym; /* The symbol we are completing on. Points in same buffer as text. */ char *sym_text; -@@ -3793,41 +3834,43 @@ default_make_symbol_completion_list (cha +@@ -3852,41 +3893,43 @@ default_make_symbol_completion_list (cha } /* Search upwards from currently selected frame (so that we can @@ -2361,7 +2357,7 @@ /* Go through the symtabs and check the externs and statics for symbols which match. */ -@@ -3846,9 +3889,6 @@ default_make_symbol_completion_list (cha +@@ -3905,9 +3948,6 @@ default_make_symbol_completion_list (cha { QUIT; b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK); @@ -2371,7 +2367,7 @@ ALL_BLOCK_SYMBOLS (b, iter, sym) { COMPLETION_LIST_ADD_SYMBOL (sym, sym_text, sym_text_len, text, word); -@@ -4315,6 +4355,25 @@ skip_prologue_using_sal (CORE_ADDR func_ +@@ -4374,6 +4414,25 @@ skip_prologue_using_sal (CORE_ADDR func_ line mark the prologue -> body transition. */ if (sal.line >= prologue_sal.line) break; @@ -2397,11 +2393,11 @@ /* The case in which compiler's optimizer/scheduler has moved instructions into the prologue. We look ahead in the function looking for address ranges whose -Index: gdb-6.8.50.20090209/gdb/symtab.h +Index: gdb-6.8.50.20090226/gdb/symtab.h =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/symtab.h 2009-02-06 22:33:58.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/symtab.h 2009-02-09 16:06:00.000000000 +0100 -@@ -556,9 +556,18 @@ struct symbol +--- gdb-6.8.50.20090226.orig/gdb/symtab.h 2009-02-27 00:04:32.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/symtab.h 2009-02-28 07:34:09.000000000 +0100 +@@ -559,9 +559,18 @@ struct symbol unsigned is_argument : 1; @@ -2423,7 +2419,7 @@ unsigned short line; -@@ -589,6 +598,7 @@ struct symbol +@@ -592,6 +601,7 @@ struct symbol #define SYMBOL_DOMAIN(symbol) (symbol)->domain #define SYMBOL_CLASS(symbol) (symbol)->aclass #define SYMBOL_IS_ARGUMENT(symbol) (symbol)->is_argument @@ -2431,10 +2427,10 @@ #define SYMBOL_TYPE(symbol) (symbol)->type #define SYMBOL_LINE(symbol) (symbol)->line #define SYMBOL_SYMTAB(symbol) (symbol)->symtab -Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.base/break.exp +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.base/break.exp =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/testsuite/gdb.base/break.exp 2009-01-19 20:05:01.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.base/break.exp 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.base/break.exp 2009-01-19 20:05:01.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.base/break.exp 2009-02-28 07:34:09.000000000 +0100 @@ -880,6 +880,13 @@ gdb_expect { # marker4() is defined at line 46 when compiled with -DPROTOTYPES pass "run until breakpoint set at small function, optimized file (line bp_location14)" @@ -2449,10 +2445,10 @@ -re ".*$gdb_prompt " { fail "run until breakpoint set at small function, optimized file" } -Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.cp/annota2.exp +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.cp/annota2.exp =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/testsuite/gdb.cp/annota2.exp 2009-01-03 06:58:04.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.cp/annota2.exp 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.cp/annota2.exp 2009-01-03 06:58:04.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.cp/annota2.exp 2009-02-28 07:34:09.000000000 +0100 @@ -119,10 +119,11 @@ gdb_expect { # continue until exit # this will test: @@ -2466,10 +2462,10 @@ { pass "continue until exit" } -re ".*$gdb_prompt$" { fail "continue to exit" } timeout { fail "continue to exit (timeout)" } -Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/inline-bt.c +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/inline-bt.c 2009-02-09 16:06:00.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.c 2009-02-28 07:34:09.000000000 +0100 @@ -0,0 +1,47 @@ +/* Copyright (C) 2008 Free Software Foundation, Inc. + @@ -2518,10 +2514,10 @@ + + return 0; +} -Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/inline-bt.exp +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/inline-bt.exp 2009-02-09 16:06:00.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.exp 2009-02-28 07:34:09.000000000 +0100 @@ -0,0 +1,63 @@ +# Copyright 2008 Free Software Foundation, Inc. + @@ -2586,10 +2582,10 @@ +gdb_test "info frame" ".*inlined into frame.*" "func1 inlined (3)" +gdb_test "up" "#2 .*func2.*" "up from func1 (3)" +gdb_test "info frame" ".*inlined into frame.*" "func2 inlined (3)" -Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/inline-cmds.c +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/inline-cmds.c 2009-02-09 16:06:00.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.c 2009-02-28 07:34:09.000000000 +0100 @@ -0,0 +1,85 @@ +/* Copyright (C) 2008 Free Software Foundation, Inc. + @@ -2676,10 +2672,10 @@ + + return 0; +} -Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/inline-cmds.exp +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-02-09 16:06:00.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-02-28 07:34:09.000000000 +0100 @@ -0,0 +1,279 @@ +# Copyright 2008 Free Software Foundation, Inc. + @@ -2960,10 +2956,10 @@ +gdb_test "info frame" ".*inlined into frame.*" "outer_inline2 inlined" +gdb_test "up" "#4 main.*" "up from outer_inline2" +gdb_test "info frame" ".*\n caller of frame.*" "main not inlined" -Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/inline-locals.c +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/inline-locals.c 2009-02-09 16:06:00.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.c 2009-02-28 07:34:09.000000000 +0100 @@ -0,0 +1,52 @@ +/* Copyright (C) 2008 Free Software Foundation, Inc. + @@ -3017,10 +3013,10 @@ + + return 0; +} -Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/inline-locals.exp +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/inline-locals.exp 2009-02-09 16:06:00.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.exp 2009-02-28 07:34:09.000000000 +0100 @@ -0,0 +1,118 @@ +# Copyright 2008 Free Software Foundation, Inc. + @@ -3140,10 +3136,10 @@ +} + +gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local (3)" -Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/inline-markers.c +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-markers.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/inline-markers.c 2009-02-09 16:06:00.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-markers.c 2009-02-28 07:34:09.000000000 +0100 @@ -0,0 +1,36 @@ +/* Copyright (C) 2008 Free Software Foundation, Inc. + @@ -3181,11 +3177,11 @@ +{ + inlined_fn (); /* inlined */ +} -Index: gdb-6.8.50.20090209/gdb/testsuite/lib/gdb.exp +Index: gdb-6.8.50.20090226/gdb/testsuite/lib/gdb.exp =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/testsuite/lib/gdb.exp 2009-02-09 16:02:35.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/testsuite/lib/gdb.exp 2009-02-09 16:06:00.000000000 +0100 -@@ -1471,6 +1471,37 @@ proc skip_hp_tests {} { +--- gdb-6.8.50.20090226.orig/gdb/testsuite/lib/gdb.exp 2009-02-28 07:31:58.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/testsuite/lib/gdb.exp 2009-02-28 07:34:09.000000000 +0100 +@@ -1474,6 +1474,37 @@ proc skip_hp_tests {} { return $skip_hp } @@ -3223,11 +3219,11 @@ set compiler_info "unknown" set gcc_compiled 0 set hp_cc_compiler 0 -Index: gdb-6.8.50.20090209/gdb/valops.c +Index: gdb-6.8.50.20090226/gdb/valops.c =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/valops.c 2009-02-09 15:40:36.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/valops.c 2009-02-09 16:06:00.000000000 +0100 -@@ -1074,7 +1074,7 @@ value_of_variable (struct symbol *var, s +--- gdb-6.8.50.20090226.orig/gdb/valops.c 2009-02-27 07:51:56.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/valops.c 2009-02-28 07:34:09.000000000 +0100 +@@ -1072,7 +1072,7 @@ value_of_variable (struct symbol *var, s frame = block_innermost_frame (b); if (!frame) { @@ -3236,11 +3232,11 @@ && SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b))) error (_("No frame is currently executing in block %s."), SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b))); -Index: gdb-6.8.50.20090209/gdb/Makefile.in +Index: gdb-6.8.50.20090226/gdb/Makefile.in =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/Makefile.in 2009-02-09 16:02:35.000000000 +0100 -+++ gdb-6.8.50.20090209/gdb/Makefile.in 2009-02-09 16:06:00.000000000 +0100 -@@ -634,6 +634,7 @@ SFILES = ada-exp.y ada-lang.c ada-typepr +--- gdb-6.8.50.20090226.orig/gdb/Makefile.in 2009-02-28 07:31:58.000000000 +0100 ++++ gdb-6.8.50.20090226/gdb/Makefile.in 2009-02-28 07:34:09.000000000 +0100 +@@ -663,6 +663,7 @@ SFILES = ada-exp.y ada-lang.c ada-typepr inf-loop.c \ infcall.c \ infcmd.c inflow.c infrun.c \ @@ -3248,7 +3244,7 @@ interps.c \ jv-exp.y jv-lang.c jv-valprint.c jv-typeprint.c \ language.c linespec.c \ -@@ -804,6 +805,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $ +@@ -835,6 +836,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $ user-regs.o \ frame.o frame-unwind.o doublest.o \ frame-base.o \ @@ -3256,10 +3252,10 @@ gnu-v2-abi.o gnu-v3-abi.o cp-abi.o cp-support.o \ cp-namespace.o \ reggroups.o regset.o \ -Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/Makefile.in +Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/Makefile.in =================================================================== ---- gdb-6.8.50.20090209.orig/gdb/testsuite/gdb.opt/Makefile.in 2008-04-18 01:06:54.000000000 +0200 -+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.opt/Makefile.in 2009-02-09 16:06:00.000000000 +0100 +--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/Makefile.in 2008-04-18 01:06:54.000000000 +0200 ++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/Makefile.in 2009-02-28 07:34:09.000000000 +0100 @@ -1,7 +1,7 @@ VPATH = @srcdir@ srcdir = @srcdir@ Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.323 retrieving revision 1.324 diff -u -r1.323 -r1.324 --- gdb.spec 24 Feb 2009 19:59:51 -0000 1.323 +++ gdb.spec 2 Mar 2009 00:11:35 -0000 1.324 @@ -9,11 +9,11 @@ # Set version to contents of gdb/version.in. # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch). -Version: 6.8.50.20090210 +Version: 6.8.50.20090228 # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 2%{?_with_upstream:.upstream}%{?dist} +Release: 1%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -305,16 +305,9 @@ # - It requires recent glibc to work in this case properly. Patch298: gdb-6.6-threads-static-test.patch -# Fix false `(no debugging symbols found)' on `-readnever' runs. -Patch301: gdb-6.6-buildid-readnever-silent.patch - # Fix #include on kernel-headers-2.6.25-0.40.rc1.git2.fc9.x86_64. Patch304: gdb-6.7-kernel-headers-compat.patch -# Fix/implement the Fortran dynamic arrays support (BZ 377541). -# Fix the variable-length-arrays support (BZ 468266, feature BZ 377541). -Patch305: gdb-6.8-bz377541-vla.patch - # Test GCORE for shmid 0 shared memory mappings. Patch309: gdb-6.3-mapping-zero-inode-test.patch @@ -374,11 +367,16 @@ # Fix resolving of variables at locations lists in prelinked libs (BZ 466901). Patch348: gdb-6.8-bz466901-backtrace-full-prelinked.patch +# The merged branch `archer' of: http://sourceware.org/gdb/wiki/ProjectArcher +Patch349: gdb-archer.patch + BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel Requires: readline BuildRequires: readline-devel Requires: rpm-libs BuildRequires: rpm-devel +Requires: python-libs +BuildRequires: python-devel %if 0%{?_with_testsuite:1} BuildRequires: sharutils dejagnu @@ -451,7 +449,7 @@ %if 0%{!?_with_upstream:1} ###patch232 -p1 -%patch305 -p1 +%patch349 -p1 %patch1 -p1 %patch3 -p1 %patch4 -p1 @@ -536,7 +534,6 @@ %patch294 -p1 %patch296 -p1 %patch298 -p1 -%patch301 -p1 %patch304 -p1 %patch309 -p1 %patch311 -p1 @@ -609,6 +606,7 @@ --sysconfdir=%{_sysconfdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ + --with-gdb-datadir=%{_datadir}/%{name} \ --enable-gdb-build-warnings=,-Wno-unused \ %ifnarch %{ix86} alpha ia64 ppc s390 s390x x86_64 ppc64 sparcv9 sparc64 --disable-werror \ @@ -625,6 +623,7 @@ --with-system-readline \ --with-expat \ --enable-tui \ + --with-python \ %ifarch ia64 --with-libunwind \ %else @@ -807,6 +806,7 @@ %{_bindir}/pstack %{_mandir}/*/gstack.1* %{_mandir}/*/pstack.1* +%{_datadir}/%{name} %endif # 0%{!?_with_upstream:1} %{_infodir}/annotate.info* %{_infodir}/gdb.info* @@ -822,6 +822,19 @@ %endif %changelog +* Sat Feb 28 2009 Jan Kratochvil - 6.8.50.20090228-1 +- Include the Archer Project: http://sourceware.org/gdb/wiki/ProjectArcher + * [python] Python scripting support: http://sourceware.org/gdb/wiki/PythonGdb + * [catch-syscall] Trap and display syscalls. + * [delayed-symfile] Improve startup performance by lazily read psymtabs. + * [exception-rewind] Fix fatal C++ exceptions in an inferior function call. + * [vla] C variable length arrays / DW_FORM_block / Fortran dynamic arrays. + * [misc] Fix debuginfoless `return' (BZ 365111), fix command-line macros for + expected GCC (BZ 479914), new testcase for valgrind (for BZ 483262), + implement `info common' for Fortran, fix Fortran logical-kind=8 (BZ 465310), + fix static variable in C++ constructors (BZ 445912) +- Upgrade to the FSF GDB gdb-6.8.50 snapshot. + * Tue Feb 24 2009 Fedora Release Engineering - 6.8.50.20090210-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 11 Feb 2009 00:43:22 -0000 1.29 +++ sources 2 Mar 2009 00:11:35 -0000 1.30 @@ -1 +1 @@ -d51b480bb110d873ef24aa4e4f939be1 gdb-6.8.50.20090210.tar.bz2 +4cde9c3dd1df54ec819af6407ec9d61b gdb-6.8.50.20090228.tar.bz2 --- gdb-6.6-buildid-readnever-silent.patch DELETED --- --- gdb-6.8-bz377541-vla.patch DELETED --- From wtogami at fedoraproject.org Mon Mar 2 01:43:23 2009 From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=) Date: Mon, 2 Mar 2009 01:43:23 +0000 (UTC) Subject: rpms/wraplinux/devel wraplinux.spec,1.1,1.2 Message-ID: <20090302014323.57FE670115@cvs1.fedora.phx.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/wraplinux/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10865 Modified Files: wraplinux.spec Log Message: build on 32bit Index: wraplinux.spec =================================================================== RCS file: /cvs/pkgs/rpms/wraplinux/devel/wraplinux.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wraplinux.spec 19 Feb 2009 03:11:14 -0000 1.1 +++ wraplinux.spec 2 Mar 2009 01:42:53 -0000 1.2 @@ -1,13 +1,13 @@ Summary: Utility to wrap a Linux kernel and initrd into an ELF or NBI file Name: wraplinux Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.kernel.org/pub/linux/utils/boot/wraplinux/ Source: http://www.kernel.org/pub/linux/utils/boot/wraplinux/wraplinux-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: i386 x86_64 +ExclusiveArch: %{ix86} x86_64 BuildRequires: /usr/include/gnu/stubs-32.h %description @@ -35,6 +35,9 @@ %{_mandir}/man1/wraplinux.1* %changelog +* Sun Mar 01 2009 Warren Togami - 1.6-2 +- build on 32bit + * Thu Aug 14 2008 Warren Togami - 1.6-1 - /usr/bin/wraplinux is no longer marked execstack - GPLv2 From pwouters at fedoraproject.org Mon Mar 2 01:44:36 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Mon, 2 Mar 2009 01:44:36 +0000 (UTC) Subject: rpms/dnssec-conf/F-10 dnssec-conf.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <20090302014436.1781C70115@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/dnssec-conf/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11173 Modified Files: dnssec-conf.spec sources Log Message: * Sun Mar 01 2009 Paul Wouters - 1.16-1 - Upgraded to 1.16. This adds the production key for .gov See http://dotgov.gov/dnssecinfo.aspx Index: dnssec-conf.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/F-10/dnssec-conf.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dnssec-conf.spec 9 Feb 2009 21:37:28 -0000 1.4 +++ dnssec-conf.spec 2 Mar 2009 01:44:05 -0000 1.5 @@ -1,6 +1,6 @@ Summary: DNSSEC and DLV configuration and priming tool Name: dnssec-conf -Version: 1.15 +Version: 1.16 Release: 1%{?dist} License: GPLv2+ Url: http://www.xelerance.com/software/dnssec-conf/ @@ -51,6 +51,10 @@ %{_mandir}/*/* %changelog +* Sun Mar 01 2009 Paul Wouters - 1.16-1 +- Upgraded to 1.16. This adds the production key for .gov + See http://dotgov.gov/dnssecinfo.aspx + * Mon Feb 9 2009 Paul Wouters - 1.15-1 - Upgraded to new upstream. Added INSTALL to doc section Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Feb 2009 21:37:28 -0000 1.3 +++ sources 2 Mar 2009 01:44:05 -0000 1.4 @@ -1 +1 @@ -5f892b24abc5e8c10325f9aef2680087 dnssec-conf-1.15.tar.gz +62890fd2bc3e23e198c7eae432f55b17 dnssec-conf-1.16.tar.gz From jspaleta at fedoraproject.org Mon Mar 2 01:46:20 2009 From: jspaleta at fedoraproject.org (Jef Spaleta) Date: Mon, 2 Mar 2009 01:46:20 +0000 (UTC) Subject: rpms/ScientificPython/devel ScientificPython.spec,1.15,1.16 Message-ID: <20090302014620.E18B170115@cvs1.fedora.phx.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/ScientificPython/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11616 Modified Files: ScientificPython.spec Log Message: * Sun Mar 1 2009 Jef Spaleta - 2.8-2 - Fixed BuildRequires to reference numpy instead of numeric Index: ScientificPython.spec =================================================================== RCS file: /cvs/pkgs/rpms/ScientificPython/devel/ScientificPython.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ScientificPython.spec 1 Mar 2009 19:02:34 -0000 1.15 +++ ScientificPython.spec 2 Mar 2009 01:45:50 -0000 1.16 @@ -3,7 +3,7 @@ Name: ScientificPython Version: 2.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of Python modules that are useful for scientific computing Group: Development/Languages @@ -16,8 +16,8 @@ BuildRequires: python-devel BuildRequires: netcdf-devel BuildRequires: openmpi-devel -BuildRequires: python-numeric -Requires: python-numeric +BuildRequires: numpy +Requires: numpy %package devel Summary: The development files for ScientificPython @@ -80,9 +80,10 @@ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT export PYTHONPATH="$PYTHONPATH:$RPM_BUILD_ROOT/%{python_sitearch}/" export PYINCLUDE="$RPM_BUILD_ROOT/%{_includedir}/python%{pyver}/" +export NUMPYINCLUDE="$RPM_BUILD_ROOT/%{python_sitearch}//numpy/core/include/" #cp -R %{_includedir}/python%{pyver}/* $PYINCLUDE cd Src/MPI/ -cat compile.py|sed -e 's/-I/-I$PYINCLUDE -I/' > compile-new.py +cat compile.py|sed -e 's/-I/-I$PYINCLUDE -I$NUMPYINCLUDE -I/' > compile-new.py %{__python} compile-new.py mv mpipython $RPM_BUILD_ROOT/%{_bindir}/ @@ -154,6 +155,9 @@ %doc Doc/Reference Examples Doc/BSP_Tutorial.pdf %changelog +* Sun Mar 1 2009 Jef Spaleta - 2.8-2 +- Fixed BuildRequires to reference numpy instead of numeric + * Sun Mar 1 2009 Jef Spaleta - 2.8-1 - Latest upstream release From pwouters at fedoraproject.org Mon Mar 2 01:56:23 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Mon, 2 Mar 2009 01:56:23 +0000 (UTC) Subject: rpms/dnssec-conf/F-9 dnssec-conf.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <20090302015623.8179E70115@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/dnssec-conf/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5507 Modified Files: dnssec-conf.spec sources Log Message: * Sun Mar 01 2009 Paul Wouters - 1.16-1 - Upgraded to 1.16. This adds the production key for .gov See http://dotgov.gov/dnssecinfo.aspx Index: dnssec-conf.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/F-9/dnssec-conf.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dnssec-conf.spec 9 Feb 2009 21:41:03 -0000 1.2 +++ dnssec-conf.spec 2 Mar 2009 01:55:53 -0000 1.3 @@ -1,6 +1,6 @@ Summary: DNSSEC and DLV configuration and priming tool Name: dnssec-conf -Version: 1.15 +Version: 1.16 Release: 1%{?dist} License: GPLv2+ Url: http://www.xelerance.com/software/dnssec-conf/ @@ -52,6 +52,10 @@ %{_mandir}/*/* %changelog +* Sun Mar 01 2009 Paul Wouters - 1.16-1 +- Upgraded to 1.16. This adds the production key for .gov + See http://dotgov.gov/dnssecinfo.aspx + * Mon Feb 9 2009 Paul Wouters - 1.15-1 - Upgraded to new upstream. Added INSTALL to doc section Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Feb 2009 21:41:03 -0000 1.3 +++ sources 2 Mar 2009 01:55:53 -0000 1.4 @@ -1 +1 @@ -5f892b24abc5e8c10325f9aef2680087 dnssec-conf-1.15.tar.gz +62890fd2bc3e23e198c7eae432f55b17 dnssec-conf-1.16.tar.gz From pwouters at fedoraproject.org Mon Mar 2 01:57:55 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Mon, 2 Mar 2009 01:57:55 +0000 (UTC) Subject: rpms/dnssec-conf/EL-5 dnssec-conf.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <20090302015755.777F570115@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/dnssec-conf/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6736 Modified Files: dnssec-conf.spec sources Log Message: * Sun Mar 01 2009 Paul Wouters - 1.16-1 - Upgraded to 1.16. This adds the production key for .gov See http://dotgov.gov/dnssecinfo.aspx Index: dnssec-conf.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/EL-5/dnssec-conf.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dnssec-conf.spec 9 Feb 2009 21:43:59 -0000 1.2 +++ dnssec-conf.spec 2 Mar 2009 01:57:25 -0000 1.3 @@ -1,6 +1,6 @@ Summary: DNSSEC and DLV configuration and priming tool Name: dnssec-conf -Version: 1.15 +Version: 1.16 Release: 1%{?dist} License: GPLv2+ Url: http://www.xelerance.com/software/dnssec-conf/ @@ -51,6 +51,10 @@ %{_mandir}/*/* %changelog +* Sun Mar 01 2009 Paul Wouters - 1.16-1 +- Upgraded to 1.16. This adds the production key for .gov + See http://dotgov.gov/dnssecinfo.aspx + * Mon Feb 9 2009 Paul Wouters - 1.15-1 - Upgraded to new upstream. Added INSTALL to doc section Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Feb 2009 21:43:59 -0000 1.3 +++ sources 2 Mar 2009 01:57:25 -0000 1.4 @@ -1 +1 @@ -5f892b24abc5e8c10325f9aef2680087 dnssec-conf-1.15.tar.gz +62890fd2bc3e23e198c7eae432f55b17 dnssec-conf-1.16.tar.gz From pwouters at fedoraproject.org Mon Mar 2 02:09:34 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Mon, 2 Mar 2009 02:09:34 +0000 (UTC) Subject: rpms/dnssec-conf/F-9 dnssec-conf.spec,1.3,1.4 Message-ID: <20090302020934.6EDAB70115@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/dnssec-conf/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9675 Modified Files: dnssec-conf.spec Log Message: * Sun Mar 01 2009 Paul Wouters - 1.16-2 - Fixed mangled line in spec file Index: dnssec-conf.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/F-9/dnssec-conf.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dnssec-conf.spec 2 Mar 2009 01:55:53 -0000 1.3 +++ dnssec-conf.spec 2 Mar 2009 02:09:03 -0000 1.4 @@ -1,7 +1,7 @@ Summary: DNSSEC and DLV configuration and priming tool Name: dnssec-conf Version: 1.16 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Url: http://www.xelerance.com/software/dnssec-conf/ Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz @@ -47,11 +47,13 @@ %attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/harvest %attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/dlv %{_bindir}/dnskey-pull -%{_sbindir -}/dnssec-configure +%{_sbindir}/dnssec-configure %{_mandir}/*/* %changelog +* Sun Mar 01 2009 Paul Wouters - 1.16-2 +- Fixed mangled line in spec file + * Sun Mar 01 2009 Paul Wouters - 1.16-1 - Upgraded to 1.16. This adds the production key for .gov See http://dotgov.gov/dnssecinfo.aspx From jspaleta at fedoraproject.org Mon Mar 2 02:11:01 2009 From: jspaleta at fedoraproject.org (Jef Spaleta) Date: Mon, 2 Mar 2009 02:11:01 +0000 (UTC) Subject: rpms/scipy/devel stsci_image_syntax.patch, NONE, 1.1 scipy.spec, 1.18, 1.19 Message-ID: <20090302021101.67E9070115@cvs1.fedora.phx.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/scipy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10101 Modified Files: scipy.spec Added Files: stsci_image_syntax.patch Log Message: * Sun Mar 1 2009 Jef Spaleta - 0.7.0-2 - Patch for stsci image function syntax fix. stsci_image_syntax.patch: --- NEW FILE stsci_image_syntax.patch --- --- scipy/stsci/image/lib/_image.py 2008-11-24 10:52:40.000000000 +0100 +++ scipy/stsci/image/lib/_image.py 2009-02-26 16:43:44.000000000 +0100 @@ -1,5 +1,5 @@ import numpy as np -import scipy.stsci.convolve +import scipy.stsci.convolve as convolve import scipy.stsci.convolve._correlate as _correlate def _translate(a, dx, dy, output=None, mode="nearest", cval=0.0): @@ -55,4 +55,4 @@ if output is not None: output._copyFrom(np.rot90(output, -rotation%4)) else: - return np.rot90(d, -rotation % 4).astype(a.type()) + return np.rot90(d, -rotation % 4).astype(a.dtype) Index: scipy.spec =================================================================== RCS file: /cvs/pkgs/rpms/scipy/devel/scipy.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- scipy.spec 26 Feb 2009 23:56:30 -0000 1.18 +++ scipy.spec 2 Mar 2009 02:10:30 -0000 1.19 @@ -2,7 +2,7 @@ Summary: Scipy: Scientific Tools for Python Name: scipy Version: 0.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Libraries License: BSD and LGPLv2+ @@ -12,6 +12,7 @@ # These should be removed as soon as upstream pushes a release with this fixed Source1: stsci_image_setup.py Source2: stsci_convolve_setup.py +Patch0: stsci_image_syntax.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,6 +37,7 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p0 cat > site.cfg << EOF [amd] library_dirs = %{_libdir} @@ -73,6 +75,9 @@ %changelog +* Sun Mar 1 2009 Jef Spaleta - 0.7.0-2 +- Patch for stsci image function syntax fix. + * Thu Feb 26 2009 Jef Spaleta - 0.7.0-1 - Update to final 0.7 release From jspaleta at fedoraproject.org Mon Mar 2 02:11:21 2009 From: jspaleta at fedoraproject.org (Jef Spaleta) Date: Mon, 2 Mar 2009 02:11:21 +0000 (UTC) Subject: rpms/ScientificPython/devel ScientificPython.spec,1.16,1.17 Message-ID: <20090302021121.ECD2770115@cvs1.fedora.phx.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/ScientificPython/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10201 Modified Files: ScientificPython.spec Log Message: * Sun Mar 1 2009 Jef Spaleta - 2.8-3 - Fixed lib64 build issue Index: ScientificPython.spec =================================================================== RCS file: /cvs/pkgs/rpms/ScientificPython/devel/ScientificPython.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ScientificPython.spec 2 Mar 2009 01:45:50 -0000 1.16 +++ ScientificPython.spec 2 Mar 2009 02:10:51 -0000 1.17 @@ -3,14 +3,14 @@ Name: ScientificPython Version: 2.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A collection of Python modules that are useful for scientific computing Group: Development/Languages License: CeCILL URL: http://dirac.cnrs-orleans.fr/ScientificPython/ Source0: http://sourcesup.cru.fr/frs/download.php/1034/ScientificPython-%{version}.tar.gz -Patch0: ScientificPython-2.6.1-netcdf-64.patch +Patch0: ScientificPython-arch-lib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel @@ -68,9 +68,7 @@ %prep %setup -q -%ifarch x86_64 -%patch0 -p 1 -b .netcdf-64 -%endif +%patch0 -p 1 %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build @@ -155,6 +153,9 @@ %doc Doc/Reference Examples Doc/BSP_Tutorial.pdf %changelog +* Sun Mar 1 2009 Jef Spaleta - 2.8-3 +- Fixed lib64 build issue + * Sun Mar 1 2009 Jef Spaleta - 2.8-2 - Fixed BuildRequires to reference numpy instead of numeric From jspaleta at fedoraproject.org Mon Mar 2 02:17:09 2009 From: jspaleta at fedoraproject.org (Jef Spaleta) Date: Mon, 2 Mar 2009 02:17:09 +0000 (UTC) Subject: rpms/ScientificPython/devel ScientificPython-arch-lib.patch, NONE, 1.1 Message-ID: <20090302021709.72C7070115@cvs1.fedora.phx.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/ScientificPython/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11744 Added Files: ScientificPython-arch-lib.patch Log Message: add patch file ScientificPython-arch-lib.patch: --- NEW FILE ScientificPython-arch-lib.patch --- --- ScientificPython-2.8/setup.py.old 2009-03-01 17:00:41.000000000 -0900 +++ ScientificPython-2.8/setup.py 2009-03-01 17:07:16.000000000 -0900 @@ -45,6 +45,9 @@ "Lib/site-packages/numpy/core/include")] else: arrayobject_h_include = [os.path.join(sys.prefix, + "lib64/python%s.%s/site-packages/numpy/core/include" + % sys.version_info [:2]), + os.path.join(sys.prefix, "lib/python%s.%s/site-packages/numpy/core/include" % sys.version_info [:2])] @@ -78,9 +81,10 @@ if netcdf_prefix is None: for netcdf_prefix in ['/usr/local', '/usr', '/sw']: netcdf_include = os.path.join(netcdf_prefix, 'include') - netcdf_lib = os.path.join(netcdf_prefix, 'lib') - if os.path.exists(os.path.join(netcdf_include, 'netcdf.h')): - break + for arch_lib in ['lib64', 'lib']: + netcdf_lib = os.path.join(netcdf_prefix, arch_lib) + if os.path.exists(os.path.join(netcdf_include, 'netcdf.h')): + break else: netcdf_prefix = None From petersen at fedoraproject.org Mon Mar 2 02:24:04 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 2 Mar 2009 02:24:04 +0000 (UTC) Subject: rpms/cpphs/devel cpphs.spec,1.2,1.3 Message-ID: <20090302022404.8A77970115@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/extras/rpms/cpphs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13150 Modified Files: cpphs.spec Log Message: update to cabal2spec-0.12: - add devel subpackage - use global - update archs Index: cpphs.spec =================================================================== RCS file: /cvs/extras/rpms/cpphs/devel/cpphs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cpphs.spec 24 Feb 2009 09:28:20 -0000 1.2 +++ cpphs.spec 2 Mar 2009 02:23:34 -0000 1.3 @@ -1,26 +1,29 @@ -%define ghc_version 6.10.1 +%global ghc_version 6.10.1 -%define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version} -%define pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version} +%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version} +%global pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version} -%bcond_without prof %bcond_without doc +%bcond_without prof # ghc does not emit debug information -%define debug_package %{nil} +%global debug_package %{nil} Name: cpphs Version: 1.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C pre-processor for Haskell Group: Development/Languages License: GPL+ and LGPLv2+ URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# ghc has only been bootstrapped on the following archs: -ExclusiveArch: i386 x86_64 ppc +# fedora ghc archs: +ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc = %{ghc_version} +%if %{with doc} +BuildRequires: ghc-doc = %{ghc_version} +%endif %if %{with prof} BuildRequires: ghc-prof = %{ghc_version} %endif @@ -36,23 +39,24 @@ an option to turn off macro-expansion. -%package -n ghc-%{name} -Summary: Libraries for %{name} +%package -n ghc-%{name}-devel +Summary: Haskell library for %{name} Group: Development/Libraries License: LGPLv2+ -Provides: ghc-%{name}-devel = %{version}-%{release} Requires: ghc = %{ghc_version} Requires(post): ghc = %{ghc_version} Requires(preun): ghc = %{ghc_version} -%description -n ghc-%{name} +%description -n ghc-%{name}-devel Haskell %{name} library for ghc. + %if %{with doc} %package -n ghc-%{name}-doc Summary: Documentation for %{name} Group: Development/Libraries Requires: ghc-doc = %{ghc_version} +Requires(post): ghc-doc = %{ghc_version} Requires(postun): ghc-doc = %{ghc_version} %description -n ghc-%{name}-doc @@ -60,12 +64,13 @@ library. %endif + %if %{with prof} %package -n ghc-%{name}-prof Summary: Profiling libraries for %{name} Group: Development/Libraries License: LGPLv2+ -Requires: ghc-%{name} = %{version}-%{release} +Requires: ghc-%{name}-devel = %{version}-%{release} Requires: ghc-prof = %{ghc_version} %description -n ghc-%{name}-prof @@ -97,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT -%post -n ghc-%{name} +%post -n ghc-%{name}-devel %ghc_register_pkg @@ -107,7 +112,7 @@ %endif -%preun -n ghc-%{name} +%preun -n ghc-%{name}-devel if [ "$1" -eq 0 ] ; then %ghc_unregister_pkg fi @@ -127,7 +132,7 @@ %{_bindir}/%{name} -%files -n ghc-%{name} -f ghc-%{name}.files +%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %defattr(-,root,root,-) %doc LICENCE-LGPL @@ -146,6 +151,12 @@ %changelog +* Mon Mar 2 2009 Jens Petersen - 1.6-6 +- update to cabal2spec-0.12: + - add devel subpackage + - use global + - update archs + * Tue Feb 24 2009 Fedora Release Engineering - 1.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jspaleta at fedoraproject.org Mon Mar 2 02:31:44 2009 From: jspaleta at fedoraproject.org (Jef Spaleta) Date: Mon, 2 Mar 2009 02:31:44 +0000 (UTC) Subject: rpms/scipy/F-10 stsci_image_syntax.patch, NONE, 1.1 scipy.spec, 1.15, 1.16 Message-ID: <20090302023144.1ADD770115@cvs1.fedora.phx.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/scipy/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14416 Modified Files: scipy.spec Added Files: stsci_image_syntax.patch Log Message: * Sun Mar 1 2009 Jef Spaleta - 0.7.0-2 - Patch for stsci image function syntax fix. stsci_image_syntax.patch: --- NEW FILE stsci_image_syntax.patch --- --- scipy/stsci/image/lib/_image.py 2008-11-24 10:52:40.000000000 +0100 +++ scipy/stsci/image/lib/_image.py 2009-02-26 16:43:44.000000000 +0100 @@ -1,5 +1,5 @@ import numpy as np -import scipy.stsci.convolve +import scipy.stsci.convolve as convolve import scipy.stsci.convolve._correlate as _correlate def _translate(a, dx, dy, output=None, mode="nearest", cval=0.0): @@ -55,4 +55,4 @@ if output is not None: output._copyFrom(np.rot90(output, -rotation%4)) else: - return np.rot90(d, -rotation % 4).astype(a.type()) + return np.rot90(d, -rotation % 4).astype(a.dtype) Index: scipy.spec =================================================================== RCS file: /cvs/pkgs/rpms/scipy/F-10/scipy.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- scipy.spec 27 Feb 2009 19:12:42 -0000 1.15 +++ scipy.spec 2 Mar 2009 02:31:13 -0000 1.16 @@ -2,7 +2,7 @@ Summary: Scipy: Scientific Tools for Python Name: scipy Version: 0.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Libraries License: BSD and LGPLv2+ @@ -12,6 +12,7 @@ # These should be removed as soon as upstream pushes a release with this fixed Source1: stsci_image_setup.py Source2: stsci_convolve_setup.py +Patch0: stsci_image_syntax.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,6 +37,7 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p0 cat > site.cfg << EOF [amd] library_dirs = %{_libdir} @@ -73,6 +75,9 @@ %changelog +* Sun Mar 1 2009 Jef Spaleta - 0.7.0-2 +- Patch for stsci image function syntax fix. + * Thu Feb 26 2009 Jef Spaleta - 0.7.0-1 - Update to final 0.7 release From pkgdb at fedoraproject.org Mon Mar 2 02:38:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 02:38:32 +0000 Subject: [pkgdb] mknbi ownership updated Message-ID: <20090302023856.A4E3F2084D0@bastion.fedora.phx.redhat.com> Package mknbi in Fedora devel was orphaned by wtogami To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mknbi From pkgdb at fedoraproject.org Mon Mar 2 02:38:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 02:38:40 +0000 Subject: [pkgdb] mknbi ownership updated Message-ID: <20090302023909.21B302084D2@bastion.fedora.phx.redhat.com> Package mknbi in Fedora 8 was orphaned by wtogami To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mknbi From pkgdb at fedoraproject.org Mon Mar 2 02:39:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 02:39:12 +0000 Subject: [pkgdb] mknbi ownership updated Message-ID: <20090302023914.282A720851E@bastion.fedora.phx.redhat.com> Package mknbi in Fedora 7 was orphaned by wtogami To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mknbi From pkgdb at fedoraproject.org Mon Mar 2 02:38:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 02:38:57 +0000 Subject: [pkgdb] mknbi ownership updated Message-ID: <20090302023920.D76542084D0@bastion.fedora.phx.redhat.com> Package mknbi in Fedora 9 was orphaned by wtogami To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mknbi From pkgdb at fedoraproject.org Mon Mar 2 02:39:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 02:39:20 +0000 Subject: [pkgdb] mknbi ownership updated Message-ID: <20090302023921.066D0208525@bastion.fedora.phx.redhat.com> Package mknbi in Fedora 10 was orphaned by wtogami To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mknbi From wtogami at fedoraproject.org Mon Mar 2 02:45:54 2009 From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=) Date: Mon, 2 Mar 2009 02:45:54 +0000 (UTC) Subject: rpms/mknbi/F-10 dead.package,1.2,1.3 Message-ID: <20090302024554.96A5470115@cvs1.fedora.phx.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/mknbi/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17361/F-10 Added Files: dead.package Log Message: This is dead package for a while now. Index: dead.package =================================================================== RCS file: dead.package diff -N dead.package From wtogami at fedoraproject.org Mon Mar 2 02:45:55 2009 From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=) Date: Mon, 2 Mar 2009 02:45:55 +0000 (UTC) Subject: rpms/mknbi/devel dead.package,1.2,1.3 Message-ID: <20090302024555.0F21B70115@cvs1.fedora.phx.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/mknbi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17361/devel Added Files: dead.package Log Message: This is dead package for a while now. Index: dead.package =================================================================== RCS file: dead.package diff -N dead.package From wtogami at fedoraproject.org Mon Mar 2 02:50:26 2009 From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=) Date: Mon, 2 Mar 2009 02:50:26 +0000 (UTC) Subject: rpms/nspluginwrapper/devel nspluginwrapper.spec,1.75,1.76 Message-ID: <20090302025026.D848A70115@cvs1.fedora.phx.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/nspluginwrapper/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18438 Modified Files: nspluginwrapper.spec Log Message: Fix x86 32bit build Index: nspluginwrapper.spec =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- nspluginwrapper.spec 26 Feb 2009 06:08:14 -0000 1.75 +++ nspluginwrapper.spec 2 Mar 2009 02:49:56 -0000 1.76 @@ -65,7 +65,7 @@ Summary: A compatibility layer for Netscape 4 plugins Name: nspluginwrapper Version: 1.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Source0: %{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2 Source1: %{plugin_config_name}.tar.gz Source2: plugin-config.sh.in @@ -86,7 +86,7 @@ BuildRequires: pkgconfig gtk2-devel glib2-devel nspr-devel BuildRequires: libX11-devel libXt-devel cairo-devel pango-devel libcurl-devel BuildRequires: gecko-devel -ExclusiveArch: i386 x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ppc %description nspluginwrapper makes it possible to use Netscape 4 compatible plugins @@ -236,6 +236,9 @@ %changelog +* Sun Mar 01 209 Warren Togami - 1.3.0-4 +- Fix x86 32bit build + * Wed Feb 25 2009 Fedora Release Engineering - 1.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From wtogami at fedoraproject.org Mon Mar 2 02:52:09 2009 From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=) Date: Mon, 2 Mar 2009 02:52:09 +0000 (UTC) Subject: rpms/nspluginwrapper/devel nspluginwrapper.spec,1.76,1.77 Message-ID: <20090302025209.2029670115@cvs1.fedora.phx.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/nspluginwrapper/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18893 Modified Files: nspluginwrapper.spec Log Message: fix date Index: nspluginwrapper.spec =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- nspluginwrapper.spec 2 Mar 2009 02:49:56 -0000 1.76 +++ nspluginwrapper.spec 2 Mar 2009 02:51:38 -0000 1.77 @@ -236,7 +236,7 @@ %changelog -* Sun Mar 01 209 Warren Togami - 1.3.0-4 +* Sun Mar 01 2009 Warren Togami - 1.3.0-4 - Fix x86 32bit build * Wed Feb 25 2009 Fedora Release Engineering - 1.3.0-3 From rdieter at fedoraproject.org Mon Mar 2 02:52:54 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 2 Mar 2009 02:52:54 +0000 (UTC) Subject: rpms/factory/devel factory.spec,1.30,1.31 Message-ID: <20090302025254.9725370115@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/factory/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19089 Modified Files: factory.spec Log Message: * Sun Mar 01 2009 Rex Dieter - 3.1.0-3 - s/i386/%ix86/ Index: factory.spec =================================================================== RCS file: /cvs/pkgs/rpms/factory/devel/factory.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- factory.spec 25 Feb 2009 17:37:07 -0000 1.30 +++ factory.spec 2 Mar 2009 02:52:24 -0000 1.31 @@ -3,12 +3,12 @@ # experimental, off, for now -- Rex #define _with_NTL --with-NTL -%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparcv9 sparc64 +%define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64 Summary: C++ class library for multivariate polynomial data Name: factory Version: 3.1.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Factory/ @@ -85,6 +85,9 @@ %changelog +* Sun Mar 01 2009 Rex Dieter - 3.1.0-3 +- s/i386/%%ix86/ + * Tue Feb 24 2009 Fedora Release Engineering - 3.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rdieter at fedoraproject.org Mon Mar 2 02:55:05 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 2 Mar 2009 02:55:05 +0000 (UTC) Subject: rpms/ntl/devel ntl.spec,1.14,1.15 Message-ID: <20090302025505.9A65470115@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/ntl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19833 Modified Files: ntl.spec Log Message: * Sun Mar 01 2009 Rex Dieter 5.4.2-6 - s/i386/%ix86/ Index: ntl.spec =================================================================== RCS file: /cvs/pkgs/rpms/ntl/devel/ntl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ntl.spec 26 Feb 2009 06:18:16 -0000 1.14 +++ ntl.spec 2 Mar 2009 02:54:34 -0000 1.15 @@ -1,10 +1,10 @@ -%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparcv9 sparc64 +%define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64 Summary: High-performance algorithms for vectors, matrices, and polynomials Name: ntl Version: 5.4.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: http://shoup.net/ntl/ @@ -127,6 +127,9 @@ %changelog +* Sun Mar 01 2009 Rex Dieter 5.4.2-6 +- s/i386/%%ix86/ + * Wed Feb 25 2009 Fedora Release Engineering - 5.4.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jspaleta at fedoraproject.org Mon Mar 2 03:00:58 2009 From: jspaleta at fedoraproject.org (Jef Spaleta) Date: Mon, 2 Mar 2009 03:00:58 +0000 (UTC) Subject: rpms/ScientificPython/devel ScientificPython-mpi-compile.patch, NONE, 1.1 ScientificPython.spec, 1.17, 1.18 Message-ID: <20090302030058.C151070115@cvs1.fedora.phx.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/ScientificPython/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21282 Modified Files: ScientificPython.spec Added Files: ScientificPython-mpi-compile.patch Log Message: * Sun Mar 1 2009 Jef Spaleta - 2.8-4 - Fix MPI compile script ScientificPython-mpi-compile.patch: --- NEW FILE ScientificPython-mpi-compile.patch --- --- ScientificPython-2.8/Src/MPI/compile.py.old 2009-03-01 17:31:49.000000000 -0900 +++ ScientificPython-2.8/Src/MPI/compile.py 2009-03-01 17:57:54.000000000 -0900 @@ -8,17 +8,19 @@ from Scientific import N cfgDict = distutils.sysconfig.get_config_vars() - # Name of the MPI compilation script. mpicompiler = 'mpicc' sources='mpipython.c Scientific_mpi.c' extra_compile_args = "" if N.package == "NumPy": + arrayobject_h_include64 = os.path.join(sys.prefix, + "lib64/python%s.%s/site-packages/numpy/core/include" + % sys.version_info [:2]) arrayobject_h_include = os.path.join(sys.prefix, "lib/python%s.%s/site-packages/numpy/core/include" % sys.version_info [:2]) - extra_compile_args = "-DNUMPY=1 -I"+arrayobject_h_include + extra_compile_args = "-DNUMPY=1 -I"+arrayobject_h_include+" -I"+arrayobject_h_include64+" -I../../Include" linkforshared = cfgDict['LINKFORSHARED'] if sys.platform == 'darwin': Index: ScientificPython.spec =================================================================== RCS file: /cvs/pkgs/rpms/ScientificPython/devel/ScientificPython.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ScientificPython.spec 2 Mar 2009 02:10:51 -0000 1.17 +++ ScientificPython.spec 2 Mar 2009 03:00:28 -0000 1.18 @@ -3,7 +3,7 @@ Name: ScientificPython Version: 2.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A collection of Python modules that are useful for scientific computing Group: Development/Languages @@ -11,6 +11,7 @@ URL: http://dirac.cnrs-orleans.fr/ScientificPython/ Source0: http://sourcesup.cru.fr/frs/download.php/1034/ScientificPython-%{version}.tar.gz Patch0: ScientificPython-arch-lib.patch +Patch1: ScientificPython-mpi-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel @@ -69,6 +70,7 @@ %prep %setup -q %patch0 -p 1 +%patch1 -p 1 %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build @@ -77,12 +79,12 @@ rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT export PYTHONPATH="$PYTHONPATH:$RPM_BUILD_ROOT/%{python_sitearch}/" -export PYINCLUDE="$RPM_BUILD_ROOT/%{_includedir}/python%{pyver}/" -export NUMPYINCLUDE="$RPM_BUILD_ROOT/%{python_sitearch}//numpy/core/include/" +#export PYINCLUDE="$RPM_BUILD_ROOT/%{_includedir}/python%{pyver}/" +#export NUMPYINCLUDE="$RPM_BUILD_ROOT/%{python_sitearch}//numpy/core/include/" #cp -R %{_includedir}/python%{pyver}/* $PYINCLUDE cd Src/MPI/ -cat compile.py|sed -e 's/-I/-I$PYINCLUDE -I$NUMPYINCLUDE -I/' > compile-new.py -%{__python} compile-new.py +#cat compile.py|sed -e 's/-I/-I$PYINCLUDE -I$NUMPYINCLUDE -I/' > compile-new.py +%{__python} compile.py mv mpipython $RPM_BUILD_ROOT/%{_bindir}/ cat < impipython.sh @@ -153,6 +155,9 @@ %doc Doc/Reference Examples Doc/BSP_Tutorial.pdf %changelog +* Sun Mar 1 2009 Jef Spaleta - 2.8-4 +- Fix MPI compile script + * Sun Mar 1 2009 Jef Spaleta - 2.8-3 - Fixed lib64 build issue From jspaleta at fedoraproject.org Mon Mar 2 03:15:58 2009 From: jspaleta at fedoraproject.org (Jef Spaleta) Date: Mon, 2 Mar 2009 03:15:58 +0000 (UTC) Subject: rpms/g3data/devel .cvsignore, 1.2, 1.3 g3data.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <20090302031558.7A08E70115@cvs1.fedora.phx.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/g3data/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24788 Modified Files: .cvsignore g3data.spec sources Log Message: * Sun Mar 01 2009 Jef Spaleta - 1.5.3-1 - Update to latest release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/g3data/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Mar 2007 19:45:20 -0000 1.2 +++ .cvsignore 2 Mar 2009 03:15:28 -0000 1.3 @@ -1 +1 @@ -g3data-1.5.1.tar.gz +g3data-1.5.3.tar.gz Index: g3data.spec =================================================================== RCS file: /cvs/pkgs/rpms/g3data/devel/g3data.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- g3data.spec 24 Feb 2009 19:11:24 -0000 1.6 +++ g3data.spec 2 Mar 2009 03:15:28 -0000 1.7 @@ -1,6 +1,6 @@ Name: g3data -Version: 1.5.1 -Release: 9%{?dist} +Version: 1.5.3 +Release: 1%{?dist} Summary: Program for extracting the data from scanned graphs Group: Applications/Engineering @@ -68,6 +68,9 @@ %doc README.TEST test1.png test1.values test2.png test2.values gpl.txt %changelog +* Sun Mar 01 2009 Jef Spaleta - 1.5.3-1 +- Update to latest release + * Tue Feb 24 2009 Fedora Release Engineering - 1.5.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/g3data/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Mar 2007 19:45:20 -0000 1.2 +++ sources 2 Mar 2009 03:15:28 -0000 1.3 @@ -1 +1 @@ -2609086a76589ddd7c607920a20645ac g3data-1.5.1.tar.gz +21c37526dff8601d699fa511c9d5bc36 g3data-1.5.3.tar.gz From dchen at fedoraproject.org Mon Mar 2 03:49:11 2009 From: dchen at fedoraproject.org (Ding-Yi Chen) Date: Mon, 2 Mar 2009 03:49:11 +0000 (UTC) Subject: rpms/ibus-chewing/devel .cvsignore, 1.7, 1.8 ibus-chewing.spec, 1.8, 1.9 import.log, 1.2, 1.3 sources, 1.7, 1.8 Message-ID: <20090302034911.BCD3870115@cvs1.fedora.phx.redhat.com> Author: dchen Update of /cvs/pkgs/rpms/ibus-chewing/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31769/devel Modified Files: .cvsignore ibus-chewing.spec import.log sources Log Message: Fix rpm install issues. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 27 Feb 2009 07:57:56 -0000 1.7 +++ .cvsignore 2 Mar 2009 03:48:41 -0000 1.8 @@ -1 +1 @@ -ibus-chewing-1.0.1.20090227-Source.tar.gz +ibus-chewing-1.0.2.20090302-Source.tar.gz Index: ibus-chewing.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/ibus-chewing.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ibus-chewing.spec 27 Feb 2009 07:57:56 -0000 1.8 +++ ibus-chewing.spec 2 Mar 2009 03:48:41 -0000 1.9 @@ -1,5 +1,5 @@ Name: ibus-chewing -Version: 1.0.1.20090227 +Version: 1.0.2.20090302 Release: 1%{?dist} Summary: The Chewing engine for IBus input platform License: GPLv2+ @@ -19,7 +19,7 @@ BuildRequires: GConf2-devel Requires: ibus >= 1.1 Requires: libchewing >= 0.3.2-4 -Requires: gconf2 +Requires: GConf2 Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 @@ -42,20 +42,19 @@ %pre if [ "$1" -gt 1 ] ; then -export GCONF_CONFIG_SOURCE=gconftool-2 --get-default-source +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schema >/dev/null || : fi %post -export GCONF_CONFIG_SOURCE=gconftool-2 --get-default-source +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schema > /dev/null || : -%find_lang %{name} %preun if [ "$1" -eq 0 ] ; then -export GCONF_CONFIG_SOURCE=gconftool-2 --get-default-source +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schema > /dev/null || : fi @@ -72,6 +71,10 @@ %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schema %changelog +* Mon Mar 02 2009 Ding-Yi Chen - 1.0.2.20090302-1 +- Required gconf2 -> GConf2. +- Fix RPM install issues. + * Fri Feb 27 2009 Ding-Yi Chen - 1.0.1.20090227-1 - Setting shows/hides KBType, selKeys, and various settings. - Add gconf schema. @@ -79,11 +82,29 @@ - Move some function to cmake_modules. - Fix Google code issue 281 +* Tue Feb 24 2009 Fedora Release Engineering - 0.1.1.20081023-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Feb 18 2009 Ding-Yi Chen - 1.0.0.20090220-1 - First working version for IBus C * Wed Jan 28 2009 Ding-Yi Chen - 1.0.0.20090128-1 - Fix the binding with libchewing 0.3.2. +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.1.1.20081023-2 +- Rebuild for Python 2.6 + +* Thu Oct 23 2008 Huang Peng - 0.1.1.20080923-1 +- Update to 0.1.1.20080923. + +* Wed Sep 17 2008 Huang Peng - 0.1.1.20080917-1 +- Update to 0.1.1.20080917. + +* Tue Sep 16 2008 Huang Peng - 0.1.1.20080916-1 +- Update to 0.1.1.20080916. + +* Mon Sep 09 2008 Huang Peng - 0.1.1.20080901-1 +- Update to 0.1.1.20080901. + * Fri Aug 15 2008 Huang Peng - 0.1.1.20081023-1 - The first version. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 27 Feb 2009 07:57:56 -0000 1.2 +++ import.log 2 Mar 2009 03:48:41 -0000 1.3 @@ -1,2 +1,3 @@ ibus-chewing-0_1_1_20080823-1_fc9:HEAD:ibus-chewing-0.1.1.20080823-1.fc9.src.rpm:1219617084 ibus-chewing-1_0_1_20090227-1_fc10:HEAD:ibus-chewing-1.0.1.20090227-1.fc10.src.rpm:1235721440 +ibus-chewing-1_0_2_20090302-1_fc10:HEAD:ibus-chewing-1.0.2.20090302-1.fc10.src.rpm:1235965687 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 27 Feb 2009 07:57:56 -0000 1.7 +++ sources 2 Mar 2009 03:48:41 -0000 1.8 @@ -1 +1 @@ -d3cfd66afea9b16f7d4810ece97ca3fb ibus-chewing-1.0.1.20090227-Source.tar.gz +40885ad9997236d4d4a601b44cfd33e9 ibus-chewing-1.0.2.20090302-Source.tar.gz From dchen at fedoraproject.org Mon Mar 2 03:50:25 2009 From: dchen at fedoraproject.org (Ding-Yi Chen) Date: Mon, 2 Mar 2009 03:50:25 +0000 (UTC) Subject: rpms/ibus-chewing/F-10 .cvsignore, 1.7, 1.8 ibus-chewing.spec, 1.6, 1.7 import.log, 1.2, 1.3 sources, 1.7, 1.8 Message-ID: <20090302035025.F2B4570115@cvs1.fedora.phx.redhat.com> Author: dchen Update of /cvs/pkgs/rpms/ibus-chewing/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32153/F-10 Modified Files: .cvsignore ibus-chewing.spec import.log sources Log Message: Fix rpm install issues. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 27 Feb 2009 08:02:38 -0000 1.7 +++ .cvsignore 2 Mar 2009 03:49:55 -0000 1.8 @@ -1 +1 @@ -ibus-chewing-1.0.1.20090227-Source.tar.gz +ibus-chewing-1.0.2.20090302-Source.tar.gz Index: ibus-chewing.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/ibus-chewing.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ibus-chewing.spec 27 Feb 2009 08:02:38 -0000 1.6 +++ ibus-chewing.spec 2 Mar 2009 03:49:55 -0000 1.7 @@ -1,5 +1,5 @@ Name: ibus-chewing -Version: 1.0.1.20090227 +Version: 1.0.2.20090302 Release: 1%{?dist} Summary: The Chewing engine for IBus input platform License: GPLv2+ @@ -19,7 +19,7 @@ BuildRequires: GConf2-devel Requires: ibus >= 1.1 Requires: libchewing >= 0.3.2-4 -Requires: gconf2 +Requires: GConf2 Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 @@ -42,20 +42,19 @@ %pre if [ "$1" -gt 1 ] ; then -export GCONF_CONFIG_SOURCE=gconftool-2 --get-default-source +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schema >/dev/null || : fi %post -export GCONF_CONFIG_SOURCE=gconftool-2 --get-default-source +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schema > /dev/null || : -%find_lang %{name} %preun if [ "$1" -eq 0 ] ; then -export GCONF_CONFIG_SOURCE=gconftool-2 --get-default-source +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schema > /dev/null || : fi @@ -72,6 +71,10 @@ %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schema %changelog +* Mon Mar 02 2009 Ding-Yi Chen - 1.0.2.20090302-1 +- Required gconf2 -> GConf2. +- Fix RPM install issues. + * Fri Feb 27 2009 Ding-Yi Chen - 1.0.1.20090227-1 - Setting shows/hides KBType, selKeys, and various settings. - Add gconf schema. @@ -79,11 +82,29 @@ - Move some function to cmake_modules. - Fix Google code issue 281 +* Tue Feb 24 2009 Fedora Release Engineering - 0.1.1.20081023-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Feb 18 2009 Ding-Yi Chen - 1.0.0.20090220-1 - First working version for IBus C * Wed Jan 28 2009 Ding-Yi Chen - 1.0.0.20090128-1 - Fix the binding with libchewing 0.3.2. +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.1.1.20081023-2 +- Rebuild for Python 2.6 + +* Thu Oct 23 2008 Huang Peng - 0.1.1.20080923-1 +- Update to 0.1.1.20080923. + +* Wed Sep 17 2008 Huang Peng - 0.1.1.20080917-1 +- Update to 0.1.1.20080917. + +* Tue Sep 16 2008 Huang Peng - 0.1.1.20080916-1 +- Update to 0.1.1.20080916. + +* Mon Sep 09 2008 Huang Peng - 0.1.1.20080901-1 +- Update to 0.1.1.20080901. + * Fri Aug 15 2008 Huang Peng - 0.1.1.20081023-1 - The first version. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 27 Feb 2009 08:02:38 -0000 1.2 +++ import.log 2 Mar 2009 03:49:55 -0000 1.3 @@ -1,2 +1,3 @@ ibus-chewing-0_1_1_20080823-1_fc9:HEAD:ibus-chewing-0.1.1.20080823-1.fc9.src.rpm:1219617084 ibus-chewing-1_0_1_20090227-1_fc10:F-10:ibus-chewing-1.0.1.20090227-1.fc10.src.rpm:1235721693 +ibus-chewing-1_0_2_20090302-1_fc10:F-10:ibus-chewing-1.0.2.20090302-1.fc10.src.rpm:1235965759 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 27 Feb 2009 08:02:38 -0000 1.7 +++ sources 2 Mar 2009 03:49:55 -0000 1.8 @@ -1 +1 @@ -d3cfd66afea9b16f7d4810ece97ca3fb ibus-chewing-1.0.1.20090227-Source.tar.gz +40885ad9997236d4d4a601b44cfd33e9 ibus-chewing-1.0.2.20090302-Source.tar.gz From whot at fedoraproject.org Mon Mar 2 05:36:56 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Mon, 2 Mar 2009 05:36:56 +0000 (UTC) Subject: rpms/linuxwacom/devel linuxwacom-0.8.2.2-HAL.patch, NONE, 1.1 linuxwacom-0.8.2.2-export-module.patch, NONE, 1.1 linuxwacom-0.8.2.2-wcmMaxX.patch, NONE, 1.1 linuxwacom.spec, 1.73, 1.74 Message-ID: <20090302053656.3D0C770115@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/linuxwacom/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21907 Modified Files: linuxwacom.spec Added Files: linuxwacom-0.8.2.2-HAL.patch linuxwacom-0.8.2.2-export-module.patch linuxwacom-0.8.2.2-wcmMaxX.patch Log Message: * Mon Mar 02 2009 Peter Hutterer 0.8.2.2-6 - linuxwacom-0.8.2.2-export-module.patch: _X_EXPORT the module data - linuxwacom-0.8.2.2-wcmMaxX.patch: don't overwrite maxX with 0 - linuxwacom-0.8.2.2-HAL.patch: when coming from HAL linuxwacom-0.8.2.2-HAL.patch: --- NEW FILE linuxwacom-0.8.2.2-HAL.patch --- >From 2d8d337da1215c0b384b73a6966dc21404cac728 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Sat, 28 Feb 2009 00:31:34 +1000 Subject: [PATCH] If no type is given, check if we're coming from HAL and init all devices. On uninit check which device is being deleted. If it's the stylus, we need to remove all other devices too. I feel dirty now. --- src/xdrv/wcmConfig.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 125 insertions(+), 4 deletions(-) diff --git a/src/xdrv/wcmConfig.c b/src/xdrv/wcmConfig.c index b0b310c..50cc79f 100644 --- a/src/xdrv/wcmConfig.c +++ b/src/xdrv/wcmConfig.c @@ -365,13 +365,47 @@ static const char *default_options[] = static void xf86WcmUninit(InputDriverPtr drv, LocalDevicePtr local, int flags) { WacomDevicePtr priv = (WacomDevicePtr) local->private; - + WacomCommonPtr common = priv->common; + WacomDevicePtr dev = common->wcmDevices; + WacomDevicePtr *prev = &common->wcmDevices; + DBG(1, priv->debugLevel, ErrorF("xf86WcmUninit\n")); #ifndef WCM_XORG_XSERVER_1_4 gWacomModule.DevProc(local->dev, DEVICE_OFF); #endif + /* XXX: if we get a read error + HAL removal, it's always the first + * device (the stylus). Removal in CloseDownDevices hits all others + * before the stylus. So we simply check if there's any left to clean + * and do so. + * + * I hate myself. + */ + if (IsStylus(priv)) + { + WacomDevicePtr next; + + while(dev) + { + next = dev->next; + if (dev != priv) + DeleteInputDeviceRequest(dev->local->dev); + dev = next; + } + } + + while(dev) + { + if (dev == priv) + { + *prev = dev->next; + break; + } + prev = &dev->next; + dev = dev->next; + } + /* free pressure curve */ if (priv->pPressCurve) xfree(priv->pPressCurve); @@ -423,7 +457,87 @@ static Bool xf86WcmMatchDevice(LocalDevicePtr pMatch, LocalDevicePtr pLocal) return 0; } -/* xf86WcmInit - called when the module subsection is found in XF86Config */ +/* Duplicate xf86 options and convert them to InputOption */ +static InputOption *WcmOptionDupConvert(pointer original) +{ + InputOption *iopts = NULL, *new; + InputInfoRec dummy; + + memset(&dummy, 0, sizeof(dummy)); + xf86CollectInputOptions(&dummy, NULL, original); + + while(dummy.options) + { + new = xcalloc(1, sizeof(InputOption)); + + new->key = xf86OptionName(dummy.options); + new->value = xf86OptionValue(dummy.options); + new->next = iopts; + iopts = new; + dummy.options = xf86NextOption(dummy.options); + } + return iopts; +} +static void WcmFreeInputOpts(InputOption* opts) +{ + InputOption *tmp = opts; + while(opts) + { + tmp = opts->next; + xfree(opts->key); + xfree(opts->value); + xfree(opts); + opts = tmp; + } +} +static void WcmReplaceType(InputOption *opts, char *type) +{ + while(opts) + { + if (xf86NameCmp(opts->key, "type") == 0) + { + xfree(opts->value); + opts->value = strdup(type); + } else if (xf86NameCmp(opts->key, "name") == 0) + { + char *tmp = opts->value; + opts->value = xcalloc(strlen(tmp) + strlen(type) + 1, 1); + strcpy(opts->value, tmp); + strcat(opts->value, type); + xfree(tmp); + } + + opts = opts->next; + } +} + +static void WcmInitOthers(pointer options) +{ + DeviceIntPtr dev; /* dummy */ + InputOption *input_options = NULL; + +#if 0 /* This breaks on my box */ + input_options = WcmOptionDupConvert(options); + WcmReplaceType(input_options, " touch"); + NewInputDeviceRequest(input_options, &dev); + WcmFreeInputOpts(input_options); +#endif + + input_options = WcmOptionDupConvert(options); + WcmReplaceType(input_options, " eraser"); + NewInputDeviceRequest(input_options, &dev); + WcmFreeInputOpts(input_options); + + input_options = WcmOptionDupConvert(options); + WcmReplaceType(input_options, " cursor"); + NewInputDeviceRequest(input_options, &dev); + WcmFreeInputOpts(input_options); + + input_options = WcmOptionDupConvert(options); + WcmReplaceType(input_options, " pad"); + NewInputDeviceRequest(input_options, &dev); + WcmFreeInputOpts(input_options); +} static LocalDevicePtr xf86WcmInit(InputDriverPtr drv, IDevPtr dev, int flags) { @@ -451,9 +565,16 @@ static LocalDevicePtr xf86WcmInit(InputDriverPtr drv, IDevPtr dev, int flags) */ xf86CollectInputOptions(fakeLocal, default_options, NULL); - /* Type is mandatory */ - s = xf86FindOptionValue(fakeLocal->options, "Type"); + /* no type was specified - did it come from hal? + * If so, claim we're a stylus and init the other devices. */ + if (!xf86FindOption(fakeLocal->options, "Type") && + !strcmp(xf86CheckStrOption(fakeLocal->options, "_source", ""), "server/hal")) + { + fakeLocal->options = xf86AddNewOption(fakeLocal->options, "Type", "stylus"); + WcmInitOthers(fakeLocal->options); + } + s = xf86FindOptionValue(fakeLocal->options, "Type"); if (s && (xf86NameCmp(s, "stylus") == 0)) local = xf86WcmAllocateStylus(); else if (s && (xf86NameCmp(s, "touch") == 0)) -- 1.6.0.5 linuxwacom-0.8.2.2-export-module.patch: --- NEW FILE linuxwacom-0.8.2.2-export-module.patch --- >From 7e183aad99bde7c2a2c96cfd0406c676f620b368 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 27 Feb 2009 23:13:14 +1000 Subject: [PATCH] _X_EXPORT the module data. --- src/xdrv/wcmConfig.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/xdrv/wcmConfig.c b/src/xdrv/wcmConfig.c index 9950932..d2d675c 100644 --- a/src/xdrv/wcmConfig.c +++ b/src/xdrv/wcmConfig.c @@ -1088,7 +1088,7 @@ static XF86ModuleVersionInfo xf86WcmVersionRec = {0, 0, 0, 0} /* signature, to be patched into the file by a tool */ }; -XF86ModuleData wacomModuleData = +_X_EXPORT XF86ModuleData wacomModuleData = { &xf86WcmVersionRec, xf86WcmPlug, -- 1.6.0.5 linuxwacom-0.8.2.2-wcmMaxX.patch: --- NEW FILE linuxwacom-0.8.2.2-wcmMaxX.patch --- >From 988744b8ccb22d49c6971e15eac7ce414a037664 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Sat, 28 Feb 2009 01:57:10 +1000 Subject: [PATCH] Don't assign priv->wcmMaxX/Y back into common->wcmMaxX/Y. Otherwise we overwrite the settings read from the tablet with a nice 0, which is rather pointless, isn't it? Signed-off-by: Peter Hutterer --- src/xdrv/wcmConfig.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xdrv/wcmConfig.c b/src/xdrv/wcmConfig.c index 1f03d34..9950932 100644 --- a/src/xdrv/wcmConfig.c +++ b/src/xdrv/wcmConfig.c @@ -872,7 +872,7 @@ xf86Msg(X_CONFIG, "%s (%s) is not a pad \n", local->name, dev->identifier); common->wcmThreshold); priv->wcmMaxX = xf86SetIntOption(local->options, "MaxX", - priv->wcmMaxX); + common->wcmMaxX); if (priv->wcmMaxX != 0) xf86Msg(X_CONFIG, "%s: max x = %d\n", dev->identifier, priv->wcmMaxX); @@ -881,7 +881,7 @@ xf86Msg(X_CONFIG, "%s (%s) is not a pad \n", local->name, dev->identifier); if (!IsTouch(priv)) common->wcmMaxX = priv->wcmMaxX; priv->wcmMaxY = xf86SetIntOption(local->options, "MaxY", - priv->wcmMaxY); + common->wcmMaxY); if (priv->wcmMaxY != 0) xf86Msg(X_CONFIG, "%s: max y = %d\n", dev->identifier, priv->wcmMaxY); -- 1.6.0.5 Index: linuxwacom.spec =================================================================== RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- linuxwacom.spec 25 Feb 2009 20:36:06 -0000 1.73 +++ linuxwacom.spec 2 Mar 2009 05:36:25 -0000 1.74 @@ -3,7 +3,7 @@ # Upstream's versioning is goofy. Note the mapping from tarname to version. Name: linuxwacom Version: 0.8.2.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Wacom Drivers from Linux Wacom Project Group: User Interface/X Hardware Support @@ -16,6 +16,9 @@ Patch2: linuxwacom-0.7.9.7-fix_build.patch Patch3: linuxwacom-0.8.2.1-fix_build.patch Patch4: linuxwacom-0.8.2.2-fix-mapping.patch +Patch5: linuxwacom-0.8.2.2-export-module.patch +Patch6: linuxwacom-0.8.2.2-HAL.patch +Patch7: linuxwacom-0.8.2.2-wcmMaxX.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildRequires: libX11-devel libXi-devel ncurses-devel @@ -46,6 +49,9 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build @@ -107,6 +113,11 @@ %{_libdir}/libwacomcfg*.so %changelog +* Mon Mar 02 2009 Peter Hutterer 0.8.2.2-6 +- linuxwacom-0.8.2.2-export-module.patch: _X_EXPORT the module data +- linuxwacom-0.8.2.2-wcmMaxX.patch: don't overwrite maxX with 0 +- linuxwacom-0.8.2.2-HAL.patch: when coming from HAL + * Wed Feb 25 2009 Fedora Release Engineering - 0.8.2.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From tagoh at fedoraproject.org Mon Mar 2 05:48:46 2009 From: tagoh at fedoraproject.org (Akira TAGOH) Date: Mon, 2 Mar 2009 05:48:46 +0000 (UTC) Subject: rpms/libgxim/devel libgxim-fix-x-event.patch, NONE, 1.1 libgxim.spec, 1.7, 1.8 Message-ID: <20090302054846.3735870115@cvs1.fedora.phx.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/libgxim/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25056 Modified Files: libgxim.spec Added Files: libgxim-fix-x-event.patch Log Message: * Mon Mar 2 2009 Akira TAGOH - 0.3.2-3 - Backport a patch to fix the unknown event issue. libgxim-fix-x-event.patch: --- NEW FILE libgxim-fix-x-event.patch --- 2009-03-02 Akira TAGOH * libgxim/gximmisc.c (g_xim_xevent_translate_event_type): Fix dealing with the event type to avoid the unknown event. (Issue#5) Index: libgxim/gximmisc.c =================================================================== --- libgxim/gximmisc.c (??????????????? 199) +++ libgxim/gximmisc.c (??????????????? 200) @@ -125,7 +125,7 @@ static GdkEventType g_xim_xevent_translate_event_type(gint type) { - switch (type) { + switch (type & 0x7f) { case KeyPress: return GDK_KEY_PRESS; case KeyRelease: Index: libgxim.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgxim/devel/libgxim.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libgxim.spec 25 Feb 2009 15:36:20 -0000 1.7 +++ libgxim.spec 2 Mar 2009 05:48:14 -0000 1.8 @@ -1,12 +1,13 @@ Name: libgxim Version: 0.3.2 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://code.google.com/p/libgxim/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: intltool gettext ruby BuildRequires: dbus-devel > 0.23, dbus-glib-devel >= 0.74, glib2-devel >= 2.16, gtk2-devel Source0: http://libgxim.googlecode.com/files/%{name}-%{version}.tar.bz2 +Patch0: libgxim-fix-x-event.patch Summary: GObject-based XIM protocol library Group: System Environment/Libraries @@ -38,6 +39,7 @@ %prep %setup -q +%patch0 -p0 -b .xevent %build @@ -77,6 +79,9 @@ %{_datadir}/gtk-doc/html/libgxim %changelog +* Mon Mar 2 2009 Akira TAGOH - 0.3.2-3 +- Backport a patch to fix the unknown event issue. + * Wed Feb 25 2009 Fedora Release Engineering - 0.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From bskeggs at fedoraproject.org Mon Mar 2 06:06:07 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Mon, 2 Mar 2009 06:06:07 +0000 (UTC) Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.12, 1.13 nouveau-fedora.patch, 1.2, 1.3 sources, 1.13, 1.14 xorg-x11-drv-nouveau.spec, 1.18, 1.19 Message-ID: <20090302060607.8BD9C70115@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29830 Modified Files: .cvsignore nouveau-fedora.patch sources xorg-x11-drv-nouveau.spec Log Message: * Mon Mar 02 2009 Ben Skeggs 0.0.12-7.20090302gite6c3b98 - upstream update, fixes Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 24 Feb 2009 00:32:57 -0000 1.12 +++ .cvsignore 2 Mar 2009 06:05:37 -0000 1.13 @@ -1 +1 @@ -xf86-video-nouveau-0.0.12-20090224gitd91fc78.tar.bz2 +xf86-video-nouveau-0.0.12-20090302gite6c3b98.tar.bz2 nouveau-fedora.patch: Index: nouveau-fedora.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fedora.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nouveau-fedora.patch 24 Feb 2009 00:05:28 -0000 1.2 +++ nouveau-fedora.patch 2 Mar 2009 06:05:37 -0000 1.3 @@ -24,7 +24,7 @@ ErrorF("failed to add fb\n"); return FALSE; diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c -index b656ca7..f236c57 100644 +index 93fc3c5..6854b68 100644 --- a/src/nouveau_exa.c +++ b/src/nouveau_exa.c @@ -265,7 +265,8 @@ nouveau_exa_wait_marker(ScreenPtr pScreen, int marker) @@ -85,7 +85,7 @@ return false; return true; -@@ -604,6 +617,12 @@ nouveau_exa_init(ScreenPtr pScreen) +@@ -608,6 +621,12 @@ nouveau_exa_init(ScreenPtr pScreen) exa->maxY = 2048; } @@ -407,7 +407,7 @@ /* back/depth buffers will likely be allocated on a per-drawable * basis, but these may be useful if we want to support shared back diff --git a/src/nv_driver.c b/src/nv_driver.c -index 97a5aa8..d977c06 100644 +index 97a5aa8..1e6f0e1 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -1583,6 +1583,8 @@ NVMapMemSW(ScrnInfoPtr pScrn) @@ -488,7 +488,7 @@ } if (!pNv->NoAccel) { -@@ -2295,6 +2320,14 @@ NVSaveScreen(ScreenPtr pScreen, int mode) +@@ -2295,6 +2320,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode) bool on = xf86IsUnblank(mode); int i; @@ -496,18 +496,19 @@ + * This happens to one of the few, if not the only place. + * When we move to driver allocated pixmaps, we can move this. + */ -+ if (mode == SCREEN_SAVER_FORCER && pNv->Architecture == NV_ARCH_50 && -+ !pNv->screen_damage && !nv50_shadow_damage_create(pScrn)) ++ if (mode == SCREEN_SAVER_FORCER && pNv->Architecture == NV_ARCH_50 && ++ !pNv->NoAccel && !pNv->screen_damage && ++ !nv50_shadow_damage_create(pScrn)) + return FALSE; + if (!pNv->randr12_enable) return vgaHWSaveScreen(pScreen, mode); diff --git a/src/nv_proto.h b/src/nv_proto.h -index cc0d2cc..f73770d 100644 +index baa531d..8451283 100644 --- a/src/nv_proto.h +++ b/src/nv_proto.h -@@ -276,6 +276,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool); +@@ -278,6 +278,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool); int nv50_xv_port_attribute_set(ScrnInfoPtr, Atom, INT32, pointer); int nv50_xv_port_attribute_get(ScrnInfoPtr, Atom, INT32 *, pointer); @@ -519,10 +520,10 @@ #ifndef exaMoveInPixmap extern void exaMoveInPixmap(PixmapPtr pPixmap); diff --git a/src/nv_type.h b/src/nv_type.h -index 5daef61..defb42b 100644 +index d363984..79df562 100644 --- a/src/nv_type.h +++ b/src/nv_type.h -@@ -249,12 +249,15 @@ typedef struct _NVRec { +@@ -268,12 +268,15 @@ typedef struct _NVRec { /* Various pinned memory regions */ struct nouveau_bo * FB; void * FBMap; Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 24 Feb 2009 00:32:57 -0000 1.13 +++ sources 2 Mar 2009 06:05:37 -0000 1.14 @@ -1 +1 @@ -51cf0eff74ac9d851a6aa15b8082b531 xf86-video-nouveau-0.0.12-20090224gitd91fc78.tar.bz2 +4c235d75393cac02d46caa984eeb22bf xf86-video-nouveau-0.0.12-20090302gite6c3b98.tar.bz2 Index: xorg-x11-drv-nouveau.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xorg-x11-drv-nouveau.spec 27 Feb 2009 20:19:07 -0000 1.18 +++ xorg-x11-drv-nouveau.spec 2 Mar 2009 06:05:37 -0000 1.19 @@ -7,8 +7,8 @@ # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2 -%define gitdate 20090224 -%define git_version d91fc78 +%define gitdate 20090302 +%define git_version e6c3b98 %define snapshot %{gitdate}git%{git_version} @@ -19,7 +19,7 @@ # need to set an epoch to get version number in sync with upstream Epoch: 1 Version: %{nouveau_version} -Release: 6.%{snapshot}%{?dist} +Release: 7.%{snapshot}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -75,11 +75,14 @@ %{_mandir}/man4/nouveau.4* %changelog +* Mon Mar 02 2009 Ben Skeggs 0.0.12-7.20090302gite6c3b98 +- upstream update, fixes + * Fri Feb 27 2009 Adam Jackson 0.0.12-6.20090224gitd91fc78 - nouveau-eedid.patch: Do EEDID. * Tue Feb 24 2009 Ben Skeggs 0.0.12-5.20090224gitd91fc78 -- improve edescription of package +- improve description of package * Tue Feb 24 2009 Ben Skeggs 0.0.12-4.20090224gitd91fc78 - new upstream snapshot From veillard at fedoraproject.org Mon Mar 2 06:08:03 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Mon, 2 Mar 2009 06:08:03 +0000 (UTC) Subject: rpms/libvirt/devel libvirt.spec,1.112,1.113 Message-ID: <20090302060803.8111C70115@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30312 Modified Files: libvirt.spec Log Message: Handle the i386->i586 arch change, Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- libvirt.spec 25 Feb 2009 19:46:28 -0000 1.112 +++ libvirt.spec 2 Mar 2009 06:07:33 -0000 1.113 @@ -14,7 +14,7 @@ %define with_network 0%{!?_without_network:1} # Xen is available only on i386 x86_64 ia64 -%ifnarch i386 i686 x86_64 ia64 +%ifnarch i386 i586 i686 x86_64 ia64 %define with_xen 0 %endif @@ -47,7 +47,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.0 -Release: 5%{?dist}%{?extra_release} +Release: 6%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -477,7 +477,10 @@ %endif %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 0.6.0-5 +* Mon Mar 2 2009 Daniel Veillard - 0.6.0-6.fc11 +- make sure Xen is handled in i586 new default 32bits x86 packages + +* Wed Feb 25 2009 Fedora Release Engineering - 0.6.0-5.fc11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Wed Feb 18 2009 Daniel P. Berrange - 0.6.0-4.fc11 From bskeggs at fedoraproject.org Mon Mar 2 06:13:20 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Mon, 2 Mar 2009 06:13:20 +0000 (UTC) Subject: rpms/kernel/devel drm-nouveau.patch, 1.12, 1.13 kernel.spec, 1.1356, 1.1357 Message-ID: <20090302061320.ECEDA70115@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32307 Modified Files: drm-nouveau.patch kernel.spec Log Message: * Mon Mar 02 2009 Ben Skeggs - nouveau fixes for recent drm-next changes, and various kms issues drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- drm-nouveau.patch 27 Feb 2009 07:03:54 -0000 1.12 +++ drm-nouveau.patch 2 Mar 2009 06:13:20 -0000 1.13 @@ -22,15 +22,71 @@ + userspaces with this enabled will cause pain. + diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile -index 9aba961..954fd51 100644 +index 03ceb3e..3df55d7 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile -@@ -26,4 +26,5 @@ obj-$(CONFIG_DRM_I915) += i915/ +@@ -27,4 +27,5 @@ obj-$(CONFIG_DRM_I915) += i915/ obj-$(CONFIG_DRM_SIS) += sis/ obj-$(CONFIG_DRM_SAVAGE)+= savage/ obj-$(CONFIG_DRM_VIA) +=via/ +obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/ +diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c +index 325b4aa..25cf6a7 100644 +--- a/drivers/gpu/drm/drm_bufs.c ++++ b/drivers/gpu/drm/drm_bufs.c +@@ -51,38 +51,23 @@ resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resour + + EXPORT_SYMBOL(drm_get_resource_len); + +-static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, +- struct drm_local_map *map) ++struct drm_map_list *drm_find_matching_map(struct drm_device *dev, ++ struct drm_local_map *map) + { + struct drm_map_list *entry; + list_for_each_entry(entry, &dev->maplist, head) { +- /* +- * Because the kernel-userspace ABI is fixed at a 32-bit offset +- * while PCI resources may live above that, we ignore the map +- * offset for maps of type _DRM_FRAMEBUFFER or _DRM_REGISTERS. +- * It is assumed that each driver will have only one resource of +- * each type. +- */ + if (!entry->map || + map->type != entry->map->type || + entry->master != dev->primary->master) + continue; +- switch (map->type) { +- case _DRM_SHM: +- if (map->flags != _DRM_CONTAINS_LOCK) +- break; +- case _DRM_REGISTERS: +- case _DRM_FRAME_BUFFER: +- return entry; +- default: /* Make gcc happy */ +- ; +- } ++ + if (entry->map->offset == map->offset) + return entry; + } + + return NULL; + } ++EXPORT_SYMBOL(drm_find_matching_map); + + static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash, + unsigned long user_token, int hashed_handle, int shm) +@@ -349,7 +334,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, + /* We do it here so that dev->struct_mutex protects the increment */ + user_token = (map->type == _DRM_SHM) ? (unsigned long)map->handle : + map->offset; +- ret = drm_map_handle(dev, &list->hash, user_token, 0, ++ ret = drm_map_handle(dev, &list->hash, user_token, 1, + (map->type == _DRM_SHM)); + if (ret) { + if (map->type == _DRM_REGISTERS) diff --git a/drivers/gpu/drm/drm_fence.c b/drivers/gpu/drm/drm_fence.c index f1c386c..fd62fd9 100644 --- a/drivers/gpu/drm/drm_fence.c @@ -44,6 +100,55 @@ if (mask & ~fence->type) { DRM_ERROR("Wait trying to extend fence type" +diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c +index 7e277c7..e5efd4a 100644 +--- a/drivers/gpu/drm/drm_stub.c ++++ b/drivers/gpu/drm/drm_stub.c +@@ -414,14 +414,14 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, + if (dev->driver->load) { + ret = dev->driver->load(dev, ent->driver_data); + if (ret) +- goto err_g3; ++ goto err_g4; + } + + /* setup the grouping for the legacy output */ + if (drm_core_check_feature(dev, DRIVER_MODESET)) { + ret = drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group); + if (ret) +- goto err_g3; ++ goto err_g4; + } + + list_add_tail(&dev->driver_item, &driver->device_list); +@@ -432,8 +432,11 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, + + return 0; + +-err_g3: ++err_g4: + drm_put_minor(&dev->primary); ++err_g3: ++ if (drm_core_check_feature(dev, DRIVER_MODESET)) ++ drm_put_minor(&dev->control); + err_g2: + pci_disable_device(pdev); + err_g1: +@@ -515,11 +518,11 @@ void drm_put_dev(struct drm_device *dev) + dev->agp = NULL; + } + +- drm_ht_remove(&dev->map_hash); +- drm_ctxbitmap_cleanup(dev); +- + list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) + drm_rmmap(dev, r_list->map); ++ drm_ht_remove(&dev->map_hash); ++ ++ drm_ctxbitmap_cleanup(dev); + + if (drm_core_check_feature(dev, DRIVER_MODESET)) + drm_put_minor(&dev->control); diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile new file mode 100644 index 0000000..d2cbeb3 @@ -2214,10 +2319,10 @@ +#endif diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c new file mode 100644 -index 0000000..4cb35f3 +index 0000000..f5adfef --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c -@@ -0,0 +1,139 @@ +@@ -0,0 +1,160 @@ +/* + * Copyright 2005 Stephane Marchesin. + * All Rights Reserved. @@ -2251,9 +2356,12 @@ +int nouveau_mm_enabled = 0; +module_param_named(mm_enabled, nouveau_mm_enabled, int, 0400); + -+int nouveau_modeset = 0; /* kms */ ++int nouveau_modeset = -1; /* kms */ +module_param_named(modeset, nouveau_modeset, int, 0400); + ++int nouveau_fbpercrtc = 0; ++module_param_named(fbpercrtc, nouveau_fbpercrtc, int, 0400); ++ +static struct pci_device_id pciidlist[] = { + { + PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID), @@ -2270,6 +2378,22 @@ + +MODULE_DEVICE_TABLE(pci, pciidlist); + ++static struct drm_driver driver; ++ ++static int __devinit ++nouveau_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ++{ ++ return drm_get_dev(pdev, ent, &driver); ++} ++ ++static void ++nouveau_pci_remove(struct pci_dev *pdev) ++{ ++ struct drm_device *dev = pci_get_drvdata(pdev); ++ ++ drm_put_dev(dev); ++} ++ +extern struct drm_ioctl_desc nouveau_ioctls[]; +extern int nouveau_max_ioctl; + @@ -2305,6 +2429,8 @@ + .pci_driver = { + .name = DRIVER_NAME, + .id_table = pciidlist, ++ .probe = nouveau_pci_probe, ++ .remove = nouveau_pci_remove, + }, + + .gem_init_object = nouveau_gem_object_new, @@ -2359,10 +2485,10 @@ +MODULE_LICENSE("GPL and additional rights"); diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h new file mode 100644 -index 0000000..cd618e6 +index 0000000..adb7fdb --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h -@@ -0,0 +1,736 @@ +@@ -0,0 +1,737 @@ +/* + * Copyright 2005 Stephane Marchesin. + * All Rights Reserved. @@ -2419,6 +2545,7 @@ + + struct drm_gem_object *gem; + struct drm_buffer_object *bo; ++ bool mappable; +}; + +static inline struct nouveau_gem_object * @@ -2434,7 +2561,7 @@ + uint64_t size; + struct drm_file *file_priv; /* NULL: free, -1: heap, other: real files */ + int flags; -+ drm_local_map_t *map; ++ struct drm_local_map *map; + drm_handle_t map_handle; + + struct drm_buffer_object *bo; @@ -2490,9 +2617,9 @@ + /* owner of this fifo */ + struct drm_file *file_priv; + /* mapping of the fifo itself */ -+ drm_local_map_t *map; ++ struct drm_local_map *map; + /* mapping of the regs controling the fifo */ -+ drm_local_map_t *regs; ++ struct drm_local_map *regs; + + /* Fencing */ + uint32_t next_sequence; @@ -2511,7 +2638,7 @@ + /* Notifier memory */ + struct mem_block *notifier_block; + struct mem_block *notifier_heap; -+ drm_local_map_t *notifier_map; ++ struct drm_local_map *notifier_map; + + /* PFIFO context */ + struct nouveau_gpuobj_ref *ramfc; @@ -2638,10 +2765,10 @@ + int chipset; + int flags; + -+ drm_local_map_t *mmio; -+ drm_local_map_t *fb; -+ drm_local_map_t *ramin_map; -+ drm_local_map_t *ramin; ++ struct drm_local_map *mmio; ++ struct drm_local_map *fb; ++ struct drm_local_map *ramin_map; ++ struct drm_local_map *ramin; + + int fifo_alloc_count; + struct nouveau_channel *fifos[NOUVEAU_MAX_CHANNEL_NR]; @@ -3201,10 +3328,10 @@ +#endif /* __NOUVEAU_FB_H__ */ diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c new file mode 100644 -index 0000000..c2ceef7 +index 0000000..4da3d40 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c -@@ -0,0 +1,932 @@ +@@ -0,0 +1,933 @@ +/* + * Copyright ?? 2007 David Airlie + * @@ -3253,6 +3380,8 @@ +#include "nouveau_fb.h" +#include "nouveau_fbcon.h" + ++extern int nouveau_fbpercrtc; ++ +static int nouveau_fbcon_setcolreg(unsigned regno, unsigned red, unsigned green, + unsigned blue, unsigned transp, + struct fb_info *info) @@ -3662,13 +3791,12 @@ + ngem = gem->driver_private; + + ret = nouveau_gem_pin(gem, NOUVEAU_GEM_DOMAIN_VRAM); ++ mutex_lock(&dev->struct_mutex); + if (ret) { + DRM_ERROR("failed to pin fb: %d\n", ret); + goto out_unref; + } + -+ mutex_lock(&dev->struct_mutex); -+ + fb = nouveau_framebuffer_create(dev, gem, &mode_cmd); + if (!fb) { + ret = -ENOMEM; @@ -4103,7 +4231,7 @@ + + /* mode a first */ + /* search for an fb */ -+ if (0 /*nouveau_fbpercrtc == 1*/) { ++ if (nouveau_fbpercrtc) { + ret = nouveau_fbcon_multi_fb_probe(dev); + } else { + ret = nouveau_fbcon_single_fb_probe(dev); @@ -5005,10 +5133,10 @@ +int nouveau_max_ioctl = DRM_ARRAY_SIZE(nouveau_ioctls); diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c new file mode 100644 -index 0000000..1ab0884 +index 0000000..7abee4c --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c -@@ -0,0 +1,702 @@ +@@ -0,0 +1,714 @@ +/* + * Copyright (C) 2008 Ben Skeggs. + * All Rights Reserved. @@ -5104,6 +5232,7 @@ + if (!gem) + return -ENOMEM; + ngem = gem->driver_private; ++ ngem->mappable = true; + + ret = drm_buffer_object_create(dev, size, drm_bo_type_device, flags, + 0, align, 0, &ngem->bo); @@ -5114,8 +5243,13 @@ + int class = chan ? chan->id : 0; + + flags = 0; -+ if (domain & NOUVEAU_GEM_DOMAIN_VRAM) -+ flags |= DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0; ++ if (domain & NOUVEAU_GEM_DOMAIN_VRAM) { ++ flags |= DRM_BO_FLAG_MEM_VRAM; ++ if (flags & NOUVEAU_GEM_DOMAIN_NOMAP) { ++ flags |= DRM_BO_FLAG_MEM_PRIV0; ++ ngem->mappable = false; ++ } ++ } + if (domain & NOUVEAU_GEM_DOMAIN_GART) + flags |= DRM_BO_FLAG_MEM_TT; + @@ -5219,7 +5353,7 @@ + if (write_domains) { + if ((valid_domains & NOUVEAU_GEM_DOMAIN_VRAM) && + (write_domains & NOUVEAU_GEM_DOMAIN_VRAM)) -+ flags = (DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0); ++ flags = DRM_BO_FLAG_MEM_VRAM; + else + if ((valid_domains & NOUVEAU_GEM_DOMAIN_GART) && + (write_domains & NOUVEAU_GEM_DOMAIN_GART)) @@ -5231,7 +5365,7 @@ + (read_domains & NOUVEAU_GEM_DOMAIN_VRAM) && + (bo->mem.mem_type == DRM_BO_MEM_VRAM || + bo->mem.mem_type == DRM_BO_MEM_PRIV0)) -+ flags = (DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0); ++ flags = DRM_BO_FLAG_MEM_VRAM; + else + if ((valid_domains & NOUVEAU_GEM_DOMAIN_GART) && + (read_domains & NOUVEAU_GEM_DOMAIN_GART) && @@ -5240,11 +5374,14 @@ + else + if ((valid_domains & NOUVEAU_GEM_DOMAIN_VRAM) && + (read_domains & NOUVEAU_GEM_DOMAIN_VRAM)) -+ flags = (DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0); ++ flags = DRM_BO_FLAG_MEM_VRAM; + else + flags = DRM_BO_FLAG_MEM_TT; + } + ++ if ((flags & (DRM_BO_FLAG_MEM_VRAM)) && !ngem->mappable) ++ flags |= DRM_BO_FLAG_MEM_PRIV0; ++ + if (read_domains) + flags |= DRM_BO_FLAG_READ; + @@ -5603,6 +5740,9 @@ + return -EINVAL; + ngem = gem->driver_private; + ++ if (!ngem->mappable) ++ return -EINVAL; ++ + if (ngem->bo->mem.mem_type == DRM_BO_MEM_LOCAL) { + ret = drm_bo_do_validate(ngem->bo, DRM_BO_FLAG_MEM_TT, + DRM_BO_MASK_MEMTYPE, @@ -6405,10 +6545,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c new file mode 100644 -index 0000000..5b4a646 +index 0000000..ca2b935 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c -@@ -0,0 +1,1063 @@ +@@ -0,0 +1,1066 @@ +/* + * Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. + * Copyright 2005 Stephane Marchesin @@ -6720,7 +6860,7 @@ + if (flags & 0x80000000) { + while (size) { + struct nouveau_gpuobj *pt = pgt[virt / (512*1024*1024)]; -+ int pte = ((virt % (512*1024*1024)) / psz) * 2; ++ int pte = ((u32)(virt % (512*1024*1024)) / psz) * 2; + + INSTANCE_WR(pt, pte++, 0x00000000); + INSTANCE_WR(pt, pte++, 0x00000000); @@ -6731,7 +6871,7 @@ + } else { + while (size) { + struct nouveau_gpuobj *pt = pgt[virt / (512*1024*1024)]; -+ int pte = ((virt % (512*1024*1024)) / psz) * 2; ++ int pte = ((u32)(virt % (512*1024*1024)) / psz) * 2; + + INSTANCE_WR(pt, pte++, phys | pfl); + INSTANCE_WR(pt, pte++, flags); @@ -7179,8 +7319,11 @@ + if (!block) + return NULL; + -+ if (flags & (NOUVEAU_MEM_FB | NOUVEAU_MEM_FB_ACCEPTABLE)) ++ if (flags & (NOUVEAU_MEM_FB | NOUVEAU_MEM_FB_ACCEPTABLE)) { + memtype |= DRM_BO_FLAG_MEM_VRAM; ++ if (!(flags & NOUVEAU_MEM_MAPPED)) ++ memtype |= DRM_BO_FLAG_MEM_PRIV0; ++ } + if (flags & NOUVEAU_MEM_AGP) + memtype |= DRM_BO_FLAG_MEM_TT; + if (flags & NOUVEAU_MEM_NOVM) @@ -10099,7 +10242,7 @@ +} diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c new file mode 100644 -index 0000000..ead4c55 +index 0000000..19c8861 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -0,0 +1,935 @@ @@ -10561,7 +10704,7 @@ + ret); + return -EINVAL; + } -+ DRM_DEBUG("regs mapped ok at 0x%lx\n", dev_priv->mmio->offset); ++ DRM_DEBUG("regs mapped ok at 0x%lx\n", (unsigned long)dev_priv->mmio->offset); + +#if defined(__powerpc__) + /* Put the card in BE mode if it's not */ @@ -16853,10 +16996,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_connector.c b/drivers/gpu/drm/nouveau/nv50_connector.c new file mode 100644 -index 0000000..1458d0e +index 0000000..6e7d5fe --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_connector.c -@@ -0,0 +1,625 @@ +@@ -0,0 +1,593 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -16997,42 +17140,27 @@ + return NULL; +} + -+static int nv50_connector_hpd_detect(struct nouveau_connector *connector) ++static bool nv50_connector_hpd_detect(struct nouveau_connector *connector) +{ + struct drm_nouveau_private *dev_priv = connector->base.dev->dev_private; -+ bool present = 0; -+ uint32_t reg = 0; -+ -+ /* No i2c port, no idea what to do for hotplug. */ -+ if (connector->i2c_chan->index == 15) { -+ DRM_ERROR("You have a non-LVDS SOR with no i2c port, " -+ "please report\n"); -+ return -EINVAL; -+ } -+ -+ if (connector->i2c_chan->index > 3) { -+ DRM_ERROR("You have an unusual configuration, index is %d\n", -+ connector->i2c_chan->index); -+ DRM_ERROR("Please report.\n"); -+ return -EINVAL; -+ } ++ uint32_t bus = connector->bus, reg; ++ bool present = false; + -+ /* Check hotplug pins. */ + reg = nv_rd32(NV50_PCONNECTOR_HOTPLUG_STATE); -+ if (reg & (NV50_PCONNECTOR_HOTPLUG_STATE_PIN_CONNECTED_I2C0 << -+ (4 * connector->i2c_chan->index))) -+ present = 1; ++ if (reg & (NV50_PCONNECTOR_HOTPLUG_STATE_PIN_CONNECTED_I2C0 << (4 * bus))) ++ present = true; + -+ DRM_DEBUG("hpd_detect: bus=%d present=%d\n", connector->bus, present); ++ DRM_DEBUG("hpd_detect: bus=%d reg=0x%08x present=%d\n", ++ connector->bus, reg, present); + return present; +} + -+static int nv50_connector_i2c_detect(struct nouveau_connector *connector) ++static bool nv50_connector_i2c_detect(struct nouveau_connector *connector) +{ + /* kindly borrrowed from the intel driver, hope it works. */ + uint8_t out_buf[] = { 0x0, 0x0}; + uint8_t buf[2]; -+ int ret; ++ bool ret; + struct i2c_msg msgs[] = { + { + .addr = 0x50, @@ -17049,7 +17177,7 @@ + }; + + if (!connector->i2c_chan) -+ return -EINVAL; ++ return false; + + ret = (i2c_transfer(&connector->i2c_chan->adapter, msgs, 2) == 2); + @@ -17112,24 +17240,15 @@ + struct nouveau_connector *connector = to_nouveau_connector(drm_connector); + struct nouveau_encoder *encoder = NULL; + struct drm_encoder_helper_funcs *helper = NULL; -+ int ret; ++ bool hpd, i2c; + + if (drm_connector->connector_type == DRM_MODE_CONNECTOR_LVDS) { -+ struct drm_connector_helper_funcs *helper_funcs = -+ drm_connector->helper_private; -+ -+ /* Always report LVDS as connected, as long as we know the -+ * panel's native mode. -+ */ -+ nv50_connector_set_digital(connector, true); -+ if (!connector->native_mode) -+ helper_funcs->get_modes(drm_connector); -+ + if (!connector->native_mode) { + DRM_ERROR("No native mode for LVDS.\n"); + return connector_status_disconnected; + } + ++ nv50_connector_set_digital(connector, true); + return connector_status_connected; + } + @@ -17143,11 +17262,18 @@ + return connector_status_connected; + } + -+ ret = nv50_connector_hpd_detect(connector); -+ if (ret < 0) -+ ret = nv50_connector_i2c_detect(connector); ++ /* It's not certain if we can trust the hotplug pins just yet, ++ * at least, we haven't found a reliable way of determining which ++ * pin is wired to which connector. We'll do both hpd and single-byte ++ * i2c detect, and report if they differ for reference, and then ++ * trust i2c detect. ++ */ ++ hpd = nv50_connector_hpd_detect(connector); ++ i2c = nv50_connector_i2c_detect(connector); ++ if (hpd != i2c) ++ DRM_INFO("i2c and hpd detect differ: %d vs %d\n", i2c, hpd); + -+ if (ret == 1) { ++ if (i2c) { + nv50_connector_set_digital(connector, true); + return connector_status_connected; + } @@ -17267,11 +17393,6 @@ + return drm_mode_duplicate(dev, mode); + } + -+ if (connector->base.connector_type == DRM_MODE_CONNECTOR_LVDS) { -+ mode = nv50_connector_lvds_native_mode(dev); -+ return mode; -+ } -+ + return NULL; +} + @@ -17356,22 +17477,11 @@ +} + +static struct drm_encoder * -+nv50_connector_best_encoder(struct drm_connector *connector) ++nv50_connector_best_encoder(struct drm_connector *drm_connector) +{ -+ int enc_id = connector->encoder_ids[0]; -+ struct drm_mode_object *obj; -+ struct drm_encoder *encoder; -+ -+ /* pick the encoder ids */ -+ if (enc_id) { -+ obj = drm_mode_object_find(connector->dev, enc_id, DRM_MODE_OBJECT_ENCODER); -+ if (!obj) -+ return NULL; -+ encoder = obj_to_encoder(obj); -+ return encoder; -+ } ++ struct nouveau_connector *connector = to_nouveau_connector(drm_connector); + -+ return NULL; ++ return &connector->to_encoder(connector, connector->digital)->base; +} + +static const struct drm_connector_helper_funcs nv50_connector_helper_funcs = { @@ -17414,6 +17524,7 @@ + DRM_INFO("Detected a DVI-I connector\n"); + break; + case DRM_MODE_CONNECTOR_LVDS: ++ connector->native_mode = nv50_connector_lvds_native_mode(dev); + DRM_INFO("Detected a LVDS connector\n"); + break; + case DRM_MODE_CONNECTOR_SVIDEO: @@ -17484,10 +17595,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c new file mode 100644 -index 0000000..48aa0ca +index 0000000..95376f9 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c -@@ -0,0 +1,726 @@ +@@ -0,0 +1,728 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -17542,7 +17653,6 @@ + + OUT_MODE(NV50_CRTC0_CLUT_MODE + offset, + NV50_CRTC0_CLUT_MODE_BLANK); -+ OUT_MODE(NV50_CRTC0_CLUT_OFFSET + offset, 0); + if (dev_priv->chipset != 0x50) + OUT_MODE(NV84_CRTC0_BLANK_UNK1 + offset, + NV84_CRTC0_BLANK_UNK1_BLANK); @@ -17552,9 +17662,6 @@ + OUT_MODE(NV84_CRTC0_BLANK_UNK2 + offset, + NV84_CRTC0_BLANK_UNK2_BLANK); + } else { -+ struct nouveau_framebuffer *fb = to_nouveau_framebuffer(crtc->base.fb); -+ uint32_t v_lut = crtc->lut->bo->offset - dev_priv->vm_vram_base; -+ + crtc->cursor->set_offset(crtc); + + if (dev_priv->chipset != 0x50) @@ -17566,9 +17673,6 @@ + else + crtc->cursor->hide(crtc); + -+ OUT_MODE(NV50_CRTC0_CLUT_MODE + offset, fb->base.depth == 8 ? -+ NV50_CRTC0_CLUT_MODE_OFF : NV50_CRTC0_CLUT_MODE_ON); -+ OUT_MODE(NV50_CRTC0_CLUT_OFFSET + offset, v_lut >> 8); + if (dev_priv->chipset != 0x50) + OUT_MODE(NV84_CRTC0_BLANK_UNK1 + offset, + NV84_CRTC0_BLANK_UNK1_UNBLANK); @@ -17637,6 +17741,9 @@ + + DRM_DEBUG("\n"); + ++ if (!connector->digital) ++ scaling_mode = DRM_MODE_SCALE_NON_GPU; ++ + switch (scaling_mode) { + case DRM_MODE_SCALE_NO_SCALE: + case DRM_MODE_SCALE_NON_GPU: @@ -17846,6 +17953,7 @@ +static void nv50_crtc_destroy(struct drm_crtc *drm_crtc) +{ + struct nouveau_crtc *crtc = to_nouveau_crtc(drm_crtc); ++ struct drm_device *dev = drm_crtc->dev; + + DRM_DEBUG("\n"); + @@ -17857,7 +17965,7 @@ + nv50_lut_destroy(crtc); + nv50_cursor_destroy(crtc); + -+ kfree(crtc->mode); ++ drm_mode_destroy(dev, crtc->mode); + kfree(crtc); +} + @@ -17980,10 +18088,10 @@ + hsync_start_to_end = mode->htotal - mode->hsync_start; + vsync_start_to_end = mode->vtotal - mode->vsync_start; + /* I can't give this a proper name, anyone else can? */ -+ hunk1 = mode->htotal - mode->hsync_start + mode->hdisplay + 1; -+ vunk1 = mode->vtotal - mode->vsync_start + mode->vdisplay + 1; ++ hunk1 = mode->htotal - mode->hsync_start + mode->hdisplay; ++ vunk1 = mode->vtotal - mode->vsync_start + mode->vdisplay; + /* Another strange value, this time only for interlaced modes. */ -+ vunk2a = 2*mode->vtotal - mode->vsync_start + mode->vdisplay + 1; ++ vunk2a = 2*mode->vtotal - mode->vsync_start + mode->vdisplay; + vunk2b = mode->vtotal - mode->vsync_start + mode->vtotal; + + if (mode->flags & DRM_MODE_FLAG_INTERLACE) { @@ -18132,6 +18240,7 @@ + struct nouveau_framebuffer *fb = to_nouveau_framebuffer(drm_fb); + struct nouveau_gem_object *ngem = nouveau_gem_object(fb->gem); + uint32_t v_vram = ngem->bo->offset - dev_priv->vm_vram_base; ++ uint32_t v_lut = crtc->lut->bo->offset - dev_priv->vm_vram_base; + uint32_t offset = crtc->index * 0x400; + + OUT_MODE(NV50_CRTC0_FB_OFFSET + offset, v_vram >> 8); @@ -18162,6 +18271,10 @@ + NV50_CRTC_COLOR_CTRL_MODE_COLOR); + OUT_MODE(NV50_CRTC0_FB_POS + offset, (y << 16) | x); + ++ OUT_MODE(NV50_CRTC0_CLUT_MODE + offset, fb->base.depth == 8 ? ++ NV50_CRTC0_CLUT_MODE_OFF : NV50_CRTC0_CLUT_MODE_ON); ++ OUT_MODE(NV50_CRTC0_CLUT_OFFSET + offset, v_lut >> 8); ++ + OUT_MODE(NV50_UPDATE_DISPLAY, 0); + return 0; +} @@ -18188,7 +18301,7 @@ + if (!crtc) + return -ENOMEM; + -+ crtc->mode = kzalloc(sizeof(*crtc->mode), GFP_KERNEL); ++ crtc->mode = drm_mode_create(dev); + if (!crtc->mode) { + kfree(crtc); + return -ENOMEM; @@ -18760,10 +18873,10 @@ + diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c new file mode 100644 -index 0000000..0008fca +index 0000000..0fbcf67 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_display.c -@@ -0,0 +1,437 @@ +@@ -0,0 +1,439 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -18908,13 +19021,15 @@ + OUT_MODE(NV50_CRTC0_DISPLAY_START, 0); + OUT_MODE(NV50_CRTC0_UNK82C, 0); + ++ OUT_MODE(NV50_UPDATE_DISPLAY, 0); ++ + /* enable clock change interrupts. */ +// nv_wr32(NV50_PDISPLAY_SUPERVISOR_INTR, nv_rd32(NV50_PDISPLAY_SUPERVISOR_INTR) | 0x70); + + /* enable hotplug interrupts */ ++ nv_wr32(NV50_PCONNECTOR_HOTPLUG_CTRL, 0x7FFF7FFF); +// nv_wr32(NV50_PCONNECTOR_HOTPLUG_INTR, 0x7FFF7FFF); + -+ OUT_MODE(NV50_UPDATE_DISPLAY, 0); + + return 0; +} @@ -42441,10 +42556,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c new file mode 100644 -index 0000000..179ca1a +index 0000000..fd29ffc --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_sor.c -@@ -0,0 +1,272 @@ +@@ -0,0 +1,275 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -42584,8 +42699,11 @@ + + if ((connector->scaling_mode != DRM_MODE_SCALE_NON_GPU && + connector->scaling_mode != DRM_MODE_SCALE_NO_SCALE) && -+ connector->native_mode) ++ connector->native_mode) { ++ int id = adjusted_mode->base.id; + *adjusted_mode = *connector->native_mode; ++ adjusted_mode->base.id = id; ++ } + + return true; +} @@ -42727,10 +42845,10 @@ unifdef-y += via_drm.h +unifdef-y += nouveau_drm.h diff --git a/include/drm/drmP.h b/include/drm/drmP.h -index c963f25..7c6d668 100644 +index 99e348d..e57c98f 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h -@@ -1206,6 +1206,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data); +@@ -1267,6 +1267,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data); extern int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv); /* Buffer management support (drm_bufs.h) */ @@ -42738,7 +42856,7 @@ + drm_local_map_t *map); extern int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc * request); extern int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc * request); - extern int drm_addmap(struct drm_device *dev, unsigned int offset, + extern int drm_addmap(struct drm_device *dev, resource_size_t offset, diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h new file mode 100644 index 0000000..4147f35 @@ -43044,42 +43162,3 @@ +#define DRM_NOUVEAU_GEM_TILE 0x48 + +#endif /* __NOUVEAU_DRM_H__ */ -diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c -index 445c762..a528dc9 100644 ---- a/drivers/gpu/drm/drm_bufs.c -+++ b/drivers/gpu/drm/drm_bufs.c -@@ -51,7 +51,7 @@ resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resour - - EXPORT_SYMBOL(drm_get_resource_len); - --static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, -+struct drm_map_list *drm_find_matching_map(struct drm_device *dev, - struct drm_local_map *map) - { - struct drm_map_list *entry; -@@ -83,6 +83,7 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, - - return NULL; - } -+EXPORT_SYMBOL(drm_find_matching_map); - - static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash, - unsigned long user_token, int hashed_handle, int shm) -diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c -index 7c41600..82b0731 100644 ---- a/drivers/gpu/drm/drm_stub.c -+++ b/drivers/gpu/drm/drm_stub.c -@@ -501,11 +501,10 @@ void drm_put_dev(struct drm_device *dev) - dev->agp = NULL; - } - -- drm_ht_remove(&dev->map_hash); -- drm_ctxbitmap_cleanup(dev); -- - list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) - drm_rmmap(dev, r_list->map); -+ drm_ht_remove(&dev->map_hash); -+ drm_ctxbitmap_cleanup(dev); - - if (drm_core_check_feature(dev, DRIVER_MODESET)) - drm_put_minor(&dev->control); Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1356 retrieving revision 1.1357 diff -u -r1.1356 -r1.1357 --- kernel.spec 28 Feb 2009 15:35:26 -0000 1.1356 +++ kernel.spec 2 Mar 2009 06:13:20 -0000 1.1357 @@ -649,7 +649,6 @@ #Patch1815: drm-intel-next.patch Patch1816: drm-no-gem-on-i8xx.patch Patch1818: drm-i915-resume-force-mode.patch -Patch1819: drm-maybe-fix-nouveau.patch # kludge to make ich9 e1000 work Patch2000: linux-2.6-e1000-ich9.patch @@ -1185,7 +1184,6 @@ #ApplyPatch drm-intel-next.patch ApplyPatch drm-no-gem-on-i8xx.patch ApplyPatch drm-i915-resume-force-mode.patch -ApplyPatch drm-maybe-fix-nouveau.patch # linux1394 git patches ApplyPatch linux-2.6-firewire-git-update.patch @@ -1792,6 +1790,9 @@ # and build. %changelog +* Mon Mar 02 2009 Ben Skeggs +- nouveau fixes for recent drm-next changes, and various kms issues + * Sat Feb 28 2009 Chuck Ebbert 2.6.29-0.176.rc6.git5 - Linux 2.6.29-rc6-git5 - Removed parts of v4l-fixes patch that were merged upstream. From whot at fedoraproject.org Mon Mar 2 06:48:36 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Mon, 2 Mar 2009 06:48:36 +0000 (UTC) Subject: rpms/xorg-x11-drv-evdev/devel .cvsignore, 1.28, 1.29 sources, 1.28, 1.29 xorg-x11-drv-evdev.spec, 1.45, 1.46 Message-ID: <20090302064836.C012D70115@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6280 Modified Files: .cvsignore sources xorg-x11-drv-evdev.spec Log Message: * Mon Mar 02 2009 Peter Hutterer 2.1.99.1-1 - evdev 2.2 snapshot 1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 25 Feb 2009 23:28:25 -0000 1.28 +++ .cvsignore 2 Mar 2009 06:48:06 -0000 1.29 @@ -1 +1 @@ -xf86-input-evdev-20090226.tar.bz2 +xf86-input-evdev-2.1.99.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 25 Feb 2009 23:28:25 -0000 1.28 +++ sources 2 Mar 2009 06:48:06 -0000 1.29 @@ -1 +1 @@ -ba6c19f21e2721a1f76a0b811d6c11fe xf86-input-evdev-20090226.tar.bz2 +88fa959dcb3b5dcc8be6547c1d5b691a xf86-input-evdev-2.1.99.1.tar.bz2 Index: xorg-x11-drv-evdev.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- xorg-x11-drv-evdev.spec 25 Feb 2009 23:28:25 -0000 1.45 +++ xorg-x11-drv-evdev.spec 2 Mar 2009 06:48:06 -0000 1.46 @@ -6,16 +6,16 @@ Summary: Xorg X11 evdev input driver Name: xorg-x11-drv-evdev -Version: 2.1.99 -Release: 1.%{gitdate}%{?dist} +Version: 2.1.99.1 +Release: 1%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 -Source0: %{tarball}-%{gitdate}.tar.bz2 -Source1: make-git-snapshot.sh +Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 +#Source0: %{tarball}-%{gitdate}.tar.bz2 +#Source1: make-git-snapshot.sh ExcludeArch: s390 s390x @@ -30,8 +30,8 @@ X.Org X11 evdev input driver. %prep -%setup -q -n %{tarball}-%{gitdate} -#%setup -q -n %{tarball}-%{version} +#%setup -q -n %{tarball}-%{gitdate} +%setup -q -n %{tarball}-%{version} # apply patches @@ -72,6 +72,9 @@ %changelog +* Mon Mar 02 2009 Peter Hutterer 2.1.99.1-1 +- evdev 2.2 snapshot 1 + * Thu Feb 26 2009 Peter Hutterer 2.1.99.2.20090226 - Update to today's git master. From mclasen at fedoraproject.org Mon Mar 2 06:54:13 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Mar 2009 06:54:13 +0000 (UTC) Subject: rpms/glib2/devel .cvsignore, 1.105, 1.106 glib2.spec, 1.198, 1.199 sources, 1.107, 1.108 Message-ID: <20090302065413.F392170115@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/glib2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7325 Modified Files: .cvsignore glib2.spec sources Log Message: 2.19.10 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glib2/devel/.cvsignore,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- .cvsignore 17 Feb 2009 19:23:23 -0000 1.105 +++ .cvsignore 2 Mar 2009 06:53:43 -0000 1.106 @@ -1 +1 @@ -glib-2.19.8.tar.bz2 +glib-2.19.10.tar.bz2 Index: glib2.spec =================================================================== RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- glib2.spec 24 Feb 2009 22:04:35 -0000 1.198 +++ glib2.spec 2 Mar 2009 06:53:43 -0000 1.199 @@ -2,8 +2,8 @@ Summary: A library of handy utility functions Name: glib2 -Version: 2.19.8 -Release: 2%{?dist} +Version: 2.19.10 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -67,6 +67,7 @@ # FIXME need to make make check work without --enable-debug #make check %endif +make check %install rm -rf $RPM_BUILD_ROOT @@ -130,6 +131,9 @@ %{_libdir}/lib*.a %changelog +* Mon Mar 2 2009 Matthias Clasen - 2.19.10-1 +- Update to 2.19.10 + * Tue Feb 24 2009 Fedora Release Engineering - 2.19.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glib2/devel/sources,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- sources 17 Feb 2009 19:23:23 -0000 1.107 +++ sources 2 Mar 2009 06:53:43 -0000 1.108 @@ -1 +1 @@ -b2898de261b212dcc1244b624ed756a5 glib-2.19.8.tar.bz2 +2cec449d5593835b6080d662a17078ca glib-2.19.10.tar.bz2 From lennart at fedoraproject.org Mon Mar 2 06:56:10 2009 From: lennart at fedoraproject.org (Lennart Poettering) Date: Mon, 2 Mar 2009 06:56:10 +0000 (UTC) Subject: rpms/bluez/devel .cvsignore, 1.26, 1.27 bluez.spec, 1.41, 1.42 sources, 1.26, 1.27 Message-ID: <20090302065610.3812770115@cvs1.fedora.phx.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/bluez/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7856 Modified Files: .cvsignore bluez.spec sources Log Message: Update to 4.32 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 26 Feb 2009 04:35:40 -0000 1.26 +++ .cvsignore 2 Mar 2009 06:55:39 -0000 1.27 @@ -1 +1 @@ -bluez-4.31.tar.gz +bluez-4.32.tar.gz Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- bluez.spec 26 Feb 2009 04:35:40 -0000 1.41 +++ bluez.spec 2 Mar 2009 06:55:39 -0000 1.42 @@ -1,6 +1,6 @@ Summary: Bluetooth utilities Name: bluez -Version: 4.31 +Version: 4.32 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -187,6 +187,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Mon Mar 2 2009 Lennart Poettering - 4.32-1 +- Update to 4.32 + * Thu Feb 26 2009 Lennart Poettering - 4.31-1 - Update to 4.31 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 26 Feb 2009 04:35:40 -0000 1.26 +++ sources 2 Mar 2009 06:55:39 -0000 1.27 @@ -1 +1 @@ -53a3347a1c38971bee4c4016b45bcf6d bluez-4.31.tar.gz +a3c1007cbeca6865cd202ac205769551 bluez-4.32.tar.gz From mclasen at fedoraproject.org Mon Mar 2 07:02:34 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Mar 2009 07:02:34 +0000 (UTC) Subject: rpms/glib2/devel glib2.spec,1.199,1.200 Message-ID: <20090302070235.04AA070115@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/glib2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8964 Modified Files: glib2.spec Log Message: make check doesn't work Index: glib2.spec =================================================================== RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- glib2.spec 2 Mar 2009 06:53:43 -0000 1.199 +++ glib2.spec 2 Mar 2009 07:02:04 -0000 1.200 @@ -61,14 +61,6 @@ %configure --disable-gtk-doc --enable-static make %{?_smp_mflags} -%check -# abicheck scripts don't work on ppc -%ifnarch ppc ppc64 -# FIXME need to make make check work without --enable-debug -#make check -%endif -make check - %install rm -rf $RPM_BUILD_ROOT From tagoh at fedoraproject.org Mon Mar 2 07:33:09 2009 From: tagoh at fedoraproject.org (Akira TAGOH) Date: Mon, 2 Mar 2009 07:33:09 +0000 (UTC) Subject: rpms/libgxim/F-10 libgxim-fix-x-event.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 libgxim.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <20090302073309.7836070115@cvs1.fedora.phx.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/libgxim/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14425 Modified Files: .cvsignore libgxim.spec sources Added Files: libgxim-fix-x-event.patch Log Message: * Mon Mar 2 2009 Akira TAGOH - 0.3.2-3 - Backport a patch to fix the unknown event issue. libgxim-fix-x-event.patch: --- NEW FILE libgxim-fix-x-event.patch --- 2009-03-02 Akira TAGOH * libgxim/gximmisc.c (g_xim_xevent_translate_event_type): Fix dealing with the event type to avoid the unknown event. (Issue#5) Index: libgxim/gximmisc.c =================================================================== --- libgxim/gximmisc.c (??????????????? 199) +++ libgxim/gximmisc.c (??????????????? 200) @@ -125,7 +125,7 @@ static GdkEventType g_xim_xevent_translate_event_type(gint type) { - switch (type) { + switch (type & 0x7f) { case KeyPress: return GDK_KEY_PRESS; case KeyRelease: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgxim/F-10/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 23 Oct 2008 12:54:41 -0000 1.6 +++ .cvsignore 2 Mar 2009 07:32:38 -0000 1.7 @@ -6,3 +6,4 @@ libgxim-0.2.0.tar.bz2 libgxim-0.3.0.tar.bz2 libgxim-0.3.1.tar.bz2 +libgxim-0.3.2.tar.bz2 Index: libgxim.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgxim/F-10/libgxim.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libgxim.spec 23 Oct 2008 12:54:41 -0000 1.5 +++ libgxim.spec 2 Mar 2009 07:32:39 -0000 1.6 @@ -1,12 +1,13 @@ Name: libgxim -Version: 0.3.1 -Release: 1%{?dist} +Version: 0.3.2 +Release: 3%{?dist} License: LGPLv2+ URL: http://code.google.com/p/libgxim/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: intltool gettext ruby BuildRequires: dbus-devel > 0.23, dbus-glib-devel >= 0.74, glib2-devel >= 2.16, gtk2-devel Source0: http://libgxim.googlecode.com/files/%{name}-%{version}.tar.bz2 +Patch0: libgxim-fix-x-event.patch Summary: GObject-based XIM protocol library Group: System Environment/Libraries @@ -38,6 +39,7 @@ %prep %setup -q +%patch0 -p0 -b .xevent %build @@ -77,6 +79,15 @@ %{_datadir}/gtk-doc/html/libgxim %changelog +* Mon Mar 2 2009 Akira TAGOH - 0.3.2-3 +- Backport a patch to fix the unknown event issue. + +* Wed Feb 25 2009 Fedora Release Engineering - 0.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jan 13 2009 Akira TAGOH - 0.3.2-1 +- New upstream release. + * Thu Oct 23 2008 Akira TAGOH - 0.3.1-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgxim/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 23 Oct 2008 12:54:41 -0000 1.6 +++ sources 2 Mar 2009 07:32:39 -0000 1.7 @@ -1 +1 @@ -ba72c71bb34a26a0c4ecd56bf4d71345 libgxim-0.3.1.tar.bz2 +03cb1b6c7f9a7842b416ae20fb10cad0 libgxim-0.3.2.tar.bz2 From laxathom at fedoraproject.org Mon Mar 2 07:53:07 2009 From: laxathom at fedoraproject.org (Xavier LAMIEN) Date: Mon, 2 Mar 2009 07:53:07 +0000 (UTC) Subject: rpms/gnubversion/devel gnubversion.spec,1.4,1.5 Message-ID: <20090302075307.77C6F70115@cvs1.fedora.phx.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gnubversion/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17770 Modified Files: gnubversion.spec Log Message: Add category to desktop-file Index: gnubversion.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnubversion/devel/gnubversion.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnubversion.spec 24 Feb 2009 23:58:00 -0000 1.4 +++ gnubversion.spec 2 Mar 2009 07:52:37 -0000 1.5 @@ -50,6 +50,7 @@ --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ --mode 0644 \ --remove-category=Application \ + --add-category=RevisionControl \ $RPM_BUILD_ROOT%{_datadir}/applications/gvn-checkout.desktop #Remove default installed docs From nphilipp at fedoraproject.org Mon Mar 2 08:15:52 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 2 Mar 2009 08:15:52 +0000 (UTC) Subject: rpms/system-config-samba/devel .cvsignore, 1.63, 1.64 sources, 1.66, 1.67 system-config-samba.spec, 1.70, 1.71 Message-ID: <20090302081552.9DF5970115@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-samba/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22250 Modified Files: .cvsignore sources system-config-samba.spec Log Message: version 1.2.71 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- .cvsignore 23 Feb 2009 14:07:57 -0000 1.63 +++ .cvsignore 2 Mar 2009 08:15:22 -0000 1.64 @@ -1 +1 @@ -system-config-samba-1.2.70.tar.bz2 +system-config-samba-1.2.71.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- sources 23 Feb 2009 14:07:57 -0000 1.66 +++ sources 2 Mar 2009 08:15:22 -0000 1.67 @@ -1 +1 @@ -0e3848f1f77e6d801005beaf166727e1 system-config-samba-1.2.70.tar.bz2 +9e907b0ceb4f777c20302967cd868a14 system-config-samba-1.2.71.tar.bz2 Index: system-config-samba.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- system-config-samba.spec 26 Feb 2009 05:16:48 -0000 1.70 +++ system-config-samba.spec 2 Mar 2009 08:15:22 -0000 1.71 @@ -3,8 +3,8 @@ Summary: Samba server configuration tool Name: system-config-samba -Version: 1.2.70 -Release: 2%{?dist} +Version: 1.2.71 +Release: 1%{?dist} URL: http://fedorahosted.org/%{name} License: GPLv2+ Group: System Environment/Base @@ -20,7 +20,11 @@ Obsoletes: system-config-samba < 1.2.68 Conflicts: system-config-samba < 1.2.68 Requires: dbus-python +%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 +Requires: PolicyKit-authentication-agent +%else Requires: PolicyKit-gnome +%endif Requires: pygtk2 Requires: pygtk2-libglade Requires: python @@ -82,8 +86,8 @@ %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 1.2.70-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Mon Mar 02 2009 Nils Philippsen - 1.2.71-1 +- require PolicyKit-authentication-agent from F-11 on (#487191) * Mon Feb 23 2009 Nils Philippsen - 1.2.70-1 - make parser cope with whitespace-less keywords (#460272) From timlau at fedoraproject.org Mon Mar 2 08:21:53 2009 From: timlau at fedoraproject.org (Tim Lauridsen) Date: Mon, 2 Mar 2009 08:21:53 +0000 (UTC) Subject: rpms/yum-utils/devel yum-utils.spec,1.55,1.56 Message-ID: <20090302082153.C5B4270115@cvs1.fedora.phx.redhat.com> Author: timlau Update of /cvs/pkgs/rpms/yum-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23955 Modified Files: yum-utils.spec Log Message: Release 1.1.20-2 (changed yum require) Index: yum-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- yum-utils.spec 1 Mar 2009 12:38:52 -0000 1.55 +++ yum-utils.spec 2 Mar 2009 08:21:23 -0000 1.56 @@ -1,14 +1,14 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 1.1.20 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Development/Tools Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz URL: http://yum.baseurl.org/download/yum-utils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python >= 2.4 , yum >= 3.2.22 +Requires: python >= 2.4 , yum >= 3.2.21 %description yum-utils is a collection of utilities and examples for the yum package @@ -595,6 +595,9 @@ %changelog * Sun Mar 1 2009 Tim Lauridsen +- set yum require to 3.2.21 (the 3.2.21 in rawhide is patched to yum head, so it matches the need yum 3.2.22 code) + +* Sun Mar 1 2009 Tim Lauridsen - mark as 1.1.20 - rename plugins from yum-name to yum-plugin-name From nphilipp at fedoraproject.org Mon Mar 2 08:29:48 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 2 Mar 2009 08:29:48 +0000 (UTC) Subject: rpms/system-config-services/devel .cvsignore, 1.76, 1.77 sources, 1.89, 1.90 system-config-services.spec, 1.90, 1.91 Message-ID: <20090302082948.9177170115@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-services/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25780 Modified Files: .cvsignore sources system-config-services.spec Log Message: require PolicyKit-authentication-agent from F-11 on (#487200) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- .cvsignore 19 Feb 2009 16:17:23 -0000 1.76 +++ .cvsignore 2 Mar 2009 08:29:18 -0000 1.77 @@ -1 +1 @@ -system-config-services-0.99.31.tar.bz2 +system-config-services-0.99.32.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- sources 19 Feb 2009 16:17:23 -0000 1.89 +++ sources 2 Mar 2009 08:29:18 -0000 1.90 @@ -1 +1 @@ -bd84578910faac71e3a2f32bacc42e9b system-config-services-0.99.31.tar.bz2 +d22c7e2cd234465779e517b0dbb9aa76 system-config-services-0.99.32.tar.bz2 Index: system-config-services.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- system-config-services.spec 26 Feb 2009 05:18:40 -0000 1.90 +++ system-config-services.spec 2 Mar 2009 08:29:18 -0000 1.91 @@ -3,8 +3,8 @@ Summary: Utility to start and stop system services Name: system-config-services -Version: 0.99.31 -Release: 2%{?dist} +Version: 0.99.32 +Release: 1%{?dist} URL: http://fedorahosted.org/%{name} Source0: http://fedorahosted.org/releases/%(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2 License: GPLv2+ @@ -28,7 +28,11 @@ Requires: python-slip >= 0.1.11 Requires: python-slip-dbus >= 0.1.15 Requires: python-slip-gtk +%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 +Requires: PolicyKit-authentication-agent +%else Requires: PolicyKit-gnome +%endif Obsoletes: serviceconf <= 0.8.1 Obsoletes: redhat-config-services <= 0.8.5 Obsoletes: system-config-services < 0.99.29 @@ -89,8 +93,8 @@ %{_mandir}/*/system-config-services.8* %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 0.99.31-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Mon Mar 01 2009 Nils Philippsen - 0.99.32-1 +- require PolicyKit-authentication-agent from F-11 on (#487200) * Thu Feb 19 2009 Nils Philippsen - 0.99.31-1 - don't traceback on chkconfig errors (#467871) From atorkhov at fedoraproject.org Mon Mar 2 08:46:16 2009 From: atorkhov at fedoraproject.org (Alexey Torkhov) Date: Mon, 2 Mar 2009 08:46:16 +0000 (UTC) Subject: rpms/ogre/devel ogre-samples.sh,1.5,1.6 ogre.spec,1.48,1.49 Message-ID: <20090302084616.6813570116@cvs1.fedora.phx.redhat.com> Author: atorkhov Update of /cvs/pkgs/rpms/ogre/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29282 Modified Files: ogre-samples.sh ogre.spec Log Message: * Mon Mar 02 2009 Alexey Torkhov - 1.6.1-4 - Update Ogre-Samples to work properly without CgProgramManager plugin Index: ogre-samples.sh =================================================================== RCS file: /cvs/pkgs/rpms/ogre/devel/ogre-samples.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ogre-samples.sh 9 Nov 2008 12:35:25 -0000 1.5 +++ ogre-samples.sh 2 Mar 2009 08:45:45 -0000 1.6 @@ -1,5 +1,14 @@ #!/bin/sh +checkCg() +{ + if [ ! -f $LIBDIR/OGRE/Plugin_CgProgramManager.so ]; then + sed -i 's|^\(Plugin=Plugin_CgProgramManager.so\)|#\1|' plugins.cfg + else + sed -i 's|^#\(Plugin=Plugin_CgProgramManager.so\)|\1|' plugins.cfg + fi +} + selectPCZ() { sed -i 's|^\(Plugin=Plugin_OctreeSceneManager.so\)|#\1|' plugins.cfg @@ -47,11 +56,13 @@ cp -f $LIBDIR/OGRE/Samples/$i . done +checkCg + set +e if [ "$1" = "-a" ]; then for i in `(cd $LIBDIR/OGRE/Samples/; find -type f -perm +111 | sort)`; do - runSample `echo $i | sed 's|./||'` + runSample `echo $i | sed 's#./##'` done elif [ $# -ge 1 ]; then while [ $# -ge 1 ]; do @@ -66,7 +77,7 @@ echo echo -n "Available samples:" for i in `(cd $LIBDIR/OGRE/Samples/; find -type f -perm +111 | sort)`; do - echo -n " $i" | sed 's|./||' + echo -n " $i" | sed 's#./##' done echo fi Index: ogre.spec =================================================================== RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- ogre.spec 27 Feb 2009 08:47:19 -0000 1.48 +++ ogre.spec 2 Mar 2009 08:45:45 -0000 1.49 @@ -1,6 +1,6 @@ Name: ogre Version: 1.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Object-Oriented Graphics Rendering Engine # CC-BY-SA is for devel docs License: LGPLv2+ and CC-BY-SA @@ -20,7 +20,7 @@ Patch2: ogre-1.4.7-system-tinyxml.patch Patch3: ogre-1.6.1-fix-ppc-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: cegui-devel zziplib-devel freetype-devel gtk2-devel +BuildRequires: cegui-devel zziplib-devel freetype-devel BuildRequires: libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel BuildRequires: ois-devel freeimage-devel #BuildRequires: openexr-devel glew-devel @@ -208,6 +208,9 @@ %changelog +* Mon Mar 02 2009 Alexey Torkhov - 1.6.1-4 +- Update Ogre-Samples to work properly without CgProgramManager plugin + * Fri Feb 27 2009 Alexey Torkhov - 1.6.1-3 - Fixing PPC build From caolanm at fedoraproject.org Mon Mar 2 09:00:21 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 2 Mar 2009 09:00:21 +0000 (UTC) Subject: rpms/openoffice.org/devel .cvsignore, 1.204, 1.205 openoffice.org.spec, 1.1836, 1.1837 sources, 1.344, 1.345 Message-ID: <20090302090021.64C3370115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32553 Modified Files: .cvsignore openoffice.org.spec sources Log Message: Resolves: rhbz#488021 Kannada Translations Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.204 retrieving revision 1.205 diff -u -r1.204 -r1.205 --- .cvsignore 27 Feb 2009 17:09:05 -0000 1.204 +++ .cvsignore 2 Mar 2009 08:59:50 -0000 1.205 @@ -11,3 +11,4 @@ or-IN_DEV300_m40.sdf mr-IN_DEV300_m40.sdf te-IN_DEV300_m40.sdf +kn-IN_DEV300_m40.sdf Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1836 retrieving revision 1.1837 diff -u -r1.1836 -r1.1837 --- openoffice.org.spec 28 Feb 2009 11:12:21 -0000 1.1836 +++ openoffice.org.spec 2 Mar 2009 08:59:50 -0000 1.1837 @@ -1,6 +1,6 @@ %define oootag OOO310 %define ooomilestone 3 -%define rh_rpm_release 2 +%define rh_rpm_release 3 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF %define __jar_repack %{nil} @@ -55,6 +55,7 @@ Source11: http://www.openoffice.org/nonav/issues/showattachment.cgi/60508/or-IN_DEV300_m40.sdf Source12: http://www.openoffice.org/nonav/issues/showattachment.cgi/60507/mr-IN_DEV300_m40.sdf Source13: http://www.openoffice.org/nonav/issues/showattachment.cgi/60513/te-IN_DEV300_m40.sdf +Source14: http://www.openoffice.org/nonav/issues/showattachment.cgi/60506/kn-IN_DEV300_m40.sdf BuildRequires: zip, findutils, autoconf, flex, bison, icu, gcc-c++ BuildRequires: binutils, java-devel, boost-devel, zlib-devel, vigra-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc @@ -1678,6 +1679,9 @@ # i99673 cp %{SOURCE13} . localize -m -x -l te-IN -f te-IN_DEV300_m40.sdf +# i99659 +cp %{SOURCE14} . +localize -m -x -l kn-IN -f kn-IN_DEV300_m40.sdf cd ../.. #build OOo, on failure make a stab at debugging the crash if any, and @@ -4085,6 +4089,9 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog +* Mon Mar 02 2009 Caol??n McNamara - 1:3.1.0-3.3 +- Resolves: rhbz#488021 Kannada Translations + * Sat Feb 28 2009 Caol??n McNamara - 1:3.1.0-3.2 - Resolves: rhbz#487664 Marathi Translations - Resolves: rhbz#487659 Telugu Translations Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.344 retrieving revision 1.345 diff -u -r1.344 -r1.345 --- sources 27 Feb 2009 17:09:05 -0000 1.344 +++ sources 2 Mar 2009 08:59:51 -0000 1.345 @@ -10,4 +10,5 @@ 7d7eb194a61b3b1c59e3c82da889ac27 or-IN_DEV300_m40.sdf b6558e6e74c60dfd9fcd15a722188d45 mr-IN_DEV300_m40.sdf d826ee150349ee5fe4b43cdd7a130084 te-IN_DEV300_m40.sdf +f457cdd91857701b1282bfffb0ec5e8a kn-IN_DEV300_m40.sdf f4d811bf2c10fadf34b68805697e2b72 OOO310_m3.tar.bz2 From petersen at fedoraproject.org Mon Mar 2 09:04:45 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 2 Mar 2009 09:04:45 +0000 (UTC) Subject: rpms/ibus/devel ibus.spec,1.49,1.50 Message-ID: <20090302090445.501D270115@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ibus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv695 Modified Files: ibus.spec Log Message: - drop the superfluous ibus-0.1 engine obsoletes - move glib2 requires to gtk package Index: ibus.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ibus.spec 25 Feb 2009 05:59:33 -0000 1.49 +++ ibus.spec 2 Mar 2009 09:04:14 -0000 1.50 @@ -3,7 +3,7 @@ %define mod_path ibus-1.1 Name: ibus Version: 1.1.0.20090225 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPLv2+ Group: System Environment/Libraries @@ -35,7 +35,6 @@ Requires(postun): desktop-file-utils Requires(postun): %{_sbindir}/alternatives -Requires: glib2 >= %{glib_ver} Requires: pygtk2 Requires: dbus-python >= 0.83.0 Requires: notification-daemon @@ -43,12 +42,7 @@ Requires: iso-codes Requires: im-chooser >= 1.2.5 -Obsoletes: ibus-qt <= 1.1.0 -Obsoletes: ibus-anthy <= 1.1.0 -Obsoletes: ibus-pinyin <= 1.1.0 -Obsoletes: ibus-m17n <= 1.1.0 -Obsoletes: ibus-hangul <= 1.1.0 -Obsoletes: ibus-chewing <= 1.1.0 +Obsoletes: ibus-qt < 1.1.0 %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/ibus.conf @@ -68,6 +62,7 @@ Summary: IBus im module for gtk2 Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +Requires: glib2 >= %{glib_ver} %description gtk This package contains ibus im module for gtk2 @@ -190,6 +185,10 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Mar 2 2009 Jens Petersen - 1.1.0.20090225-2 +- drop the superfluous ibus-0.1 engine obsoletes +- move glib2 requires to gtk package + * Tue Feb 25 2009 Huang Peng - 1.1.0.20090225-1 - Update to ibus-1.1.0.20090225. - Fix problems in %post and %postun scripts. From caolanm at fedoraproject.org Mon Mar 2 09:48:35 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 2 Mar 2009 09:48:35 +0000 (UTC) Subject: rpms/mythes-de/devel mythes-de.spec,1.18,1.19 sources,1.17,1.18 Message-ID: <20090302094835.91F9E70115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/mythes-de/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10158 Modified Files: mythes-de.spec sources Log Message: latest version Index: mythes-de.spec =================================================================== RCS file: /cvs/pkgs/rpms/mythes-de/devel/mythes-de.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mythes-de.spec 26 Feb 2009 03:48:32 -0000 1.18 +++ mythes-de.spec 2 Mar 2009 09:48:05 -0000 1.19 @@ -1,8 +1,8 @@ Name: mythes-de Summary: German thesaurus -%define upstreamid 20090202 +%define upstreamid 20090302 Version: 0.%{upstreamid} -Release: 2%{?dist} +Release: 1%{?dist} Source: http://www.openthesaurus.de/download/thes_de_DE_v2.zip Group: Applications/Text URL: http://www.openthesaurus.de @@ -44,6 +44,9 @@ %{_datadir}/mythes/* %changelog +* Mon Wed 02 2009 Caolan McNamara - 0.20090302-1 +- latest version + * Wed Feb 25 2009 Fedora Release Engineering - 0.20090202-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mythes-de/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 2 Feb 2009 14:01:03 -0000 1.17 +++ sources 2 Mar 2009 09:48:05 -0000 1.18 @@ -1 +1 @@ -f3d22ba4c3ec59e8ec6772f654144d24 thes_de_DE_v2.zip +b628df3e12f3259bfe805ee27bed54f8 thes_de_DE_v2.zip From caolanm at fedoraproject.org Mon Mar 2 09:52:31 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 2 Mar 2009 09:52:31 +0000 (UTC) Subject: rpms/mythes-de/devel mythes-de.spec,1.19,1.20 Message-ID: <20090302095231.C95CE70115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/mythes-de/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10862 Modified Files: mythes-de.spec Log Message: latest version Index: mythes-de.spec =================================================================== RCS file: /cvs/pkgs/rpms/mythes-de/devel/mythes-de.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mythes-de.spec 2 Mar 2009 09:48:05 -0000 1.19 +++ mythes-de.spec 2 Mar 2009 09:52:01 -0000 1.20 @@ -44,7 +44,7 @@ %{_datadir}/mythes/* %changelog -* Mon Wed 02 2009 Caolan McNamara - 0.20090302-1 +* Mon Mar 02 2009 Caolan McNamara - 0.20090302-1 - latest version * Wed Feb 25 2009 Fedora Release Engineering - 0.20090202-2 From adrian at fedoraproject.org Mon Mar 2 09:52:51 2009 From: adrian at fedoraproject.org (Adrian Reber) Date: Mon, 2 Mar 2009 09:52:51 +0000 (UTC) Subject: rpms/kover/devel kover-4-gcc-4.4.patch, NONE, 1.1 kover.spec, 1.25, 1.26 Message-ID: <20090302095251.2425170115@cvs1.fedora.phx.redhat.com> Author: adrian Update of /cvs/extras/rpms/kover/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10933 Modified Files: kover.spec Added Files: kover-4-gcc-4.4.patch Log Message: * Mon Mar 02 2009 Adrian Reber - 4-4 - included patch to build with gcc 4.4 kover-4-gcc-4.4.patch: --- NEW FILE kover-4-gcc-4.4.patch --- diff --git a/src/directory.cc b/src/directory.cc index 3096a4e..51dc52e 100644 --- a/src/directory.cc +++ b/src/directory.cc @@ -9,6 +9,7 @@ #include #include #include +#include directory::directory(string current_dir) { diff --git a/src/inexact_dialog.cc b/src/inexact_dialog.cc index 101e541..1442e65 100644 --- a/src/inexact_dialog.cc +++ b/src/inexact_dialog.cc @@ -20,6 +20,7 @@ #include "inexact_dialog.moc" #include "inexact_dialog.h" +#include #include #include #include Index: kover.spec =================================================================== RCS file: /cvs/extras/rpms/kover/devel/kover.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- kover.spec 25 Feb 2009 11:51:47 -0000 1.25 +++ kover.spec 2 Mar 2009 09:52:20 -0000 1.26 @@ -1,10 +1,11 @@ Name: kover Summary: WYSIWYG CD cover printer with CDDB support Version: 4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/Publishing Source0 http://lisas.de/kover/kover-4.tar.bz2 +Patch0: kover-4-gcc-4.4.patch URL: http://lisas.de/kover/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -18,6 +19,7 @@ %prep %setup -q +%patch0 -p1 %build mkdir -p %{_target_platform} @@ -71,6 +73,9 @@ %attr(755,root,root)%{_bindir}/kover %changelog +* Mon Mar 02 2009 Adrian Reber - 4-4 +- included patch to build with gcc 4.4 + * Wed Feb 25 2009 Fedora Release Engineering - 4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Mon Mar 2 10:07:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 10:07:41 +0000 Subject: [pkgdb] uml_utilities: chkr has requested watchbugzilla Message-ID: <20090302100741.EDC4820820B@bastion.fedora.phx.redhat.com> chkr has requested the watchbugzilla acl on uml_utilities (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From pkgdb at fedoraproject.org Mon Mar 2 10:07:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 10:07:46 +0000 Subject: [pkgdb] uml_utilities: chkr has requested watchcommits Message-ID: <20090302100746.AF0082084D1@bastion.fedora.phx.redhat.com> chkr has requested the watchcommits acl on uml_utilities (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From pkgdb at fedoraproject.org Mon Mar 2 10:07:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 10:07:19 +0000 Subject: [pkgdb] uml_utilities: chkr has requested commit Message-ID: <20090302100749.287CB20851B@bastion.fedora.phx.redhat.com> chkr has requested the commit acl on uml_utilities (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From pkgdb at fedoraproject.org Mon Mar 2 10:07:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 10:07:34 +0000 Subject: [pkgdb] uml_utilities: chkr has requested watchbugzilla Message-ID: <20090302100756.4706320820B@bastion.fedora.phx.redhat.com> chkr has requested the watchbugzilla acl on uml_utilities (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From pkgdb at fedoraproject.org Mon Mar 2 10:07:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 10:07:58 +0000 Subject: [pkgdb] uml_utilities: chkr has requested watchcommits Message-ID: <20090302100759.0E51C208520@bastion.fedora.phx.redhat.com> chkr has requested the watchcommits acl on uml_utilities (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From pkgdb at fedoraproject.org Mon Mar 2 10:08:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 10:08:04 +0000 Subject: [pkgdb] uml_utilities: chkr has requested commit Message-ID: <20090302100804.8A382208525@bastion.fedora.phx.redhat.com> chkr has requested the commit acl on uml_utilities (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From ltinkl at fedoraproject.org Mon Mar 2 10:12:12 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Mar 2009 10:12:12 +0000 (UTC) Subject: rpms/kdelibs/F-9 kdelibs.spec,1.381,1.382 sources,1.70,1.71 Message-ID: <20090302101212.E4C4370116@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdelibs/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14152/F-9 Modified Files: kdelibs.spec sources Log Message: sync with devel/ Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v retrieving revision 1.381 retrieving revision 1.382 diff -u -r1.381 -r1.382 --- kdelibs.spec 27 Feb 2009 16:57:30 -0000 1.381 +++ kdelibs.spec 2 Mar 2009 10:11:42 -0000 1.382 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -401,7 +401,10 @@ %changelog -* Fri Feb 27 2009 Luk???? Tinkl - 4.2.1-1 +* Sun Mar 01 2009 Than Ngo - 4.2.1-2 +- respin + +* Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 * Thu Feb 26 2009 Than Ngo 4.2.0-17 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-9/sources,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- sources 27 Feb 2009 16:57:30 -0000 1.70 +++ sources 2 Mar 2009 10:11:42 -0000 1.71 @@ -1 +1 @@ -3ccc094df33db9d61f5ad065b9b857ac kdelibs-4.2.1.tar.bz2 +fa4206dd747890c4e4283c8adb831e6c kdelibs-4.2.1.tar.bz2 From ltinkl at fedoraproject.org Mon Mar 2 10:12:12 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Mar 2009 10:12:12 +0000 (UTC) Subject: rpms/kdelibs/F-10 kdelibs.spec,1.406,1.407 sources,1.76,1.77 Message-ID: <20090302101212.8DADF70115@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdelibs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14152/F-10 Modified Files: kdelibs.spec sources Log Message: sync with devel/ Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v retrieving revision 1.406 retrieving revision 1.407 diff -u -r1.406 -r1.407 --- kdelibs.spec 27 Feb 2009 16:57:29 -0000 1.406 +++ kdelibs.spec 2 Mar 2009 10:11:41 -0000 1.407 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -401,7 +401,10 @@ %changelog -* Fri Feb 27 2009 Luk???? Tinkl - 4.2.1-1 +* Sun Mar 01 2009 Than Ngo - 4.2.1-2 +- respin + +* Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 * Thu Feb 26 2009 Than Ngo 4.2.0-17 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-10/sources,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- sources 27 Feb 2009 16:57:29 -0000 1.76 +++ sources 2 Mar 2009 10:11:42 -0000 1.77 @@ -1 +1 @@ -3ccc094df33db9d61f5ad065b9b857ac kdelibs-4.2.1.tar.bz2 +fa4206dd747890c4e4283c8adb831e6c kdelibs-4.2.1.tar.bz2 From atorkhov at fedoraproject.org Mon Mar 2 10:12:59 2009 From: atorkhov at fedoraproject.org (Alexey Torkhov) Date: Mon, 2 Mar 2009 10:12:59 +0000 (UTC) Subject: rpms/ember/devel ember-0.5.5-ogre161.patch, NONE, 1.1 ember.spec, 1.14, 1.15 Message-ID: <20090302101259.BF62470115@cvs1.fedora.phx.redhat.com> Author: atorkhov Update of /cvs/pkgs/rpms/ember/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14366 Modified Files: ember.spec Added Files: ember-0.5.5-ogre161.patch Log Message: * Mon Mar 02 2009 Alexey Torkhov - 0.5.5-5 - Update for new OGRE ember-0.5.5-ogre161.patch: --- NEW FILE ember-0.5.5-ogre161.patch --- commit 66fde188a7bd093cf1bbd9ffff6ca609c74482ef Author: Erik Hjortsberg Date: Tue Feb 10 21:38:56 2009 +0100 Use the Ogre memory allocation where required. Also cleaned up some memory leaks in the sound handling code. diff --git a/src/components/ogre/ogreopcode/include/OgreCollisionManager.h b/src/components/ogre/ogreopcode/include/OgreCollisionManager.h index 13d8ccc..de75cbe 100644 --- a/src/components/ogre/ogreopcode/include/OgreCollisionManager.h +++ b/src/components/ogre/ogreopcode/include/OgreCollisionManager.h @@ -11,7 +11,7 @@ /// A lot of the code is based on the Nebula Opcode Collision module, see docs/Nebula_license.txt /// /// OgreOpcode is free software; you can redistribute it and/or -/// modify it under the terms of the GNU Lesser General Public +/// 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. /// @@ -20,7 +20,7 @@ /// 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 +/// You should have received a copy of the GNU Lesser General Public /// License along with OgreOpcode; if not, write to the Free Software /// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA /// diff --git a/src/components/ogre/ogreopcode/include/OgreOpcodeDebugObject.h b/src/components/ogre/ogreopcode/include/OgreOpcodeDebugObject.h index 89bec2d..00de02c 100644 --- a/src/components/ogre/ogreopcode/include/OgreOpcodeDebugObject.h +++ b/src/components/ogre/ogreopcode/include/OgreOpcodeDebugObject.h @@ -10,7 +10,7 @@ /// A lot of the code is based on the Nebula Opcode Collision module, see docs/Nebula_license.txt /// /// OgreOpcode is free software; you can redistribute it and/or -/// modify it under the terms of the GNU Lesser General Public +/// 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. /// @@ -19,7 +19,7 @@ /// 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 +/// You should have received a copy of the GNU Lesser General Public /// License along with OgreOpcode; if not, write to the Free Software /// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA /// @@ -60,7 +60,7 @@ namespace OgreOpcode protected: - std::vector _points; + std::vector > > _points; bool _drawn; }; #endif diff --git a/src/components/ogre/sound/SoundAction.cpp b/src/components/ogre/sound/SoundAction.cpp index bf6edef..0725da5 100644 --- a/src/components/ogre/sound/SoundAction.cpp +++ b/src/components/ogre/sound/SoundAction.cpp @@ -76,12 +76,11 @@ namespace EmberOgre SoundGroup* newGroup = new SoundGroup(); - std::list::const_iterator beg = groupModel->getSamplesBegin(); - std::list::const_iterator end = groupModel->getSamplesEnd(); - for (; beg != end; beg++) + const SoundGroupDefinition::SoundDefinitionStore& soundDefinitions = groupModel->getSoundDefinitions(); + for (SoundGroupDefinition::SoundDefinitionStore::const_iterator I; I != soundDefinitions.end(); I++) { // Register Individual samples - SoundDefinition* thisModel = *beg; + const SoundDefinition& thisModel = *I; newGroup->addSound(thisModel); } diff --git a/src/components/ogre/sound/SoundDefinition.cpp b/src/components/ogre/sound/SoundDefinition.cpp index 5a51b8f..499f0ba 100644 --- a/src/components/ogre/sound/SoundDefinition.cpp +++ b/src/components/ogre/sound/SoundDefinition.cpp @@ -33,17 +33,17 @@ void SoundDefinition::setup(const std::string& filename, SoundGeneral::SoundSamp mVolume = volume; } -const std::string& SoundDefinition::getFilename() +const std::string& SoundDefinition::getFilename() const { return mFilename; } -SoundGeneral::SoundSampleType SoundDefinition::getFormat() +SoundGeneral::SoundSampleType SoundDefinition::getFormat() const { return mSampleType; } -float SoundDefinition::getVolume() +float SoundDefinition::getVolume() const { return mVolume; } diff --git a/src/components/ogre/sound/SoundDefinition.h b/src/components/ogre/sound/SoundDefinition.h index 5c8f86b..95cb5c7 100644 --- a/src/components/ogre/sound/SoundDefinition.h +++ b/src/components/ogre/sound/SoundDefinition.h @@ -44,17 +44,17 @@ public: /** * Return filename */ - const std::string& getFilename(); + const std::string& getFilename() const; /** * Return the format */ - Ember::SoundGeneral::SoundSampleType getFormat(); + Ember::SoundGeneral::SoundSampleType getFormat() const; /** * Return the sound Volume */ - float getVolume(); + float getVolume() const; protected: diff --git a/src/components/ogre/sound/SoundGroup.cpp b/src/components/ogre/sound/SoundGroup.cpp index f594bf6..82642a3 100644 --- a/src/components/ogre/sound/SoundGroup.cpp +++ b/src/components/ogre/sound/SoundGroup.cpp @@ -147,9 +147,9 @@ void SoundGroupBinding::update() // } // } - void SoundGroup::addSound(SoundDefinition* soundDef) + void SoundGroup::addSound(const SoundDefinition& soundDef) { - BaseSoundSample* soundSample = EmberServices::getSingleton().getSoundService()->createOrRetrieveSoundSample(soundDef->getFilename()); + BaseSoundSample* soundSample = EmberServices::getSingleton().getSoundService()->createOrRetrieveSoundSample(soundDef.getFilename()); if (soundSample) { mSamples.push_back(soundSample); diff --git a/src/components/ogre/sound/SoundGroup.h b/src/components/ogre/sound/SoundGroup.h index 1c89a00..9faf4a0 100644 --- a/src/components/ogre/sound/SoundGroup.h +++ b/src/components/ogre/sound/SoundGroup.h @@ -90,7 +90,7 @@ public: * * @param model A sound model containing definitions for the sample. */ - void addSound(SoundDefinition* soundDef); + void addSound(const SoundDefinition& soundDef); /** * Set the group play order. diff --git a/src/components/ogre/sound/SoundGroupDefinition.cpp b/src/components/ogre/sound/SoundGroupDefinition.cpp index 44a9612..27c327f 100644 --- a/src/components/ogre/sound/SoundGroupDefinition.cpp +++ b/src/components/ogre/sound/SoundGroupDefinition.cpp @@ -34,27 +34,26 @@ namespace EmberOgre { SoundGroupDefinition::SoundGroupDefinition() { - mSamples.clear(); +} + +SoundGroupDefinition::~SoundGroupDefinition() +{ +// for (SoundDefinitionStore:: } void SoundGroupDefinition::insertSample(const std::string& name, SoundGeneral::SoundSampleType type, float volume) { - SoundDefinition* newDef = new SoundDefinition(); - newDef->setup(name, type, volume); + SoundDefinition newDef; + newDef.setup(name, type, volume); mSamples.push_back(newDef); S_LOG_INFO("\t-Sample " << name << " created."); } - -std::list::const_iterator SoundGroupDefinition::getSamplesBegin() -{ - return mSamples.begin(); -} -std::list::const_iterator SoundGroupDefinition::getSamplesEnd() +const SoundGroupDefinition::SoundDefinitionStore& SoundGroupDefinition::getSoundDefinitions() const { - return mSamples.end(); + return mSamples; } diff --git a/src/components/ogre/sound/SoundGroupDefinition.h b/src/components/ogre/sound/SoundGroupDefinition.h index 153c0fb..156b501 100644 --- a/src/components/ogre/sound/SoundGroupDefinition.h +++ b/src/components/ogre/sound/SoundGroupDefinition.h @@ -38,26 +38,27 @@ class SoundDefinition; class SoundGroupDefinition { public: - typedef std::map SoundGroupDefinitionStore; + typedef std::list SoundDefinitionStore; SoundGroupDefinition(); + virtual ~SoundGroupDefinition(); + /** * Insert a sound sample into this group definition */ void insertSample(const std::string& name, Ember::SoundGeneral::SoundSampleType type, float volume); /** - * Return an iterator to the first member of the list - */ - std::list::const_iterator getSamplesBegin(); - - /** - * Return an iterator to the last member of the list - */ - std::list::const_iterator getSamplesEnd(); + * @brief Accessor for the sound definitions store. + * @return + */ + const SoundDefinitionStore& getSoundDefinitions() const; private: - std::list mSamples; + /** + * @brief The sounds defined for this group. + */ + SoundDefinitionStore mSamples; }; } commit b094ad29c01175f412018eb5d289233fc3e7c316 Author: Erik Hjortsberg Date: Tue Feb 10 20:54:15 2009 +0100 Use the correct memory allocation as required by Ogre. diff --git a/src/components/ogre/terrain/TerrainPageFoliage.h b/src/components/ogre/terrain/TerrainPageFoliage.h index a81ea70..295789d 100644 --- a/src/components/ogre/terrain/TerrainPageFoliage.h +++ b/src/components/ogre/terrain/TerrainPageFoliage.h @@ -27,6 +27,7 @@ #include #include #include +#include namespace Ogre { @@ -58,10 +59,10 @@ class TerrainLayerDefinition; class TerrainPageFoliage { public: - /** + /** A store of plant positions. We keep this in ogre space for performance reasons. */ - typedef std::vector PlantStore; + typedef std::vector > > PlantStore; typedef std::map PlantBatchColumn; typedef std::map PlantBatchStore; typedef std::map PlantStoreMap; commit 166dc09076d798a380f8ce9fd8943d5edad11a64 Author: Erik Hjortsberg Date: Sat Jan 24 19:18:46 2009 +0100 Use the Ogre memory allocators for the Ogre log manager. diff --git a/src/components/ogre/EmberOgre.cpp b/src/components/ogre/EmberOgre.cpp index 6ef41b4..e8a19f6 100644 --- a/src/components/ogre/EmberOgre.cpp +++ b/src/components/ogre/EmberOgre.cpp @@ -247,7 +247,7 @@ EmberOgre::~EmberOgre() ///Ogre is destroyed already, so we can't deregister this: we'll just destroy it delete mLogObserver; - delete mOgreLogManager; + OGRE_DELETE mOgreLogManager; ///delete this first after Ogre has been shut down, since it then deletes the EmberOgreFileSystemFactory instance, and that can only be done once Ogre is shutdown delete mResourceLoader; @@ -325,7 +325,7 @@ bool EmberOgre::setup() mLogObserver = new OgreLogObserver(); ///if we do this we will override the automatic creation of a LogManager and can thus route all logging from ogre to the ember log - mOgreLogManager = new Ogre::LogManager(); + mOgreLogManager = OGRE_NEW Ogre::LogManager(); Ogre::LogManager::getSingleton().createLog("Ogre", true, false, true); Ogre::LogManager::getSingleton().getDefaultLog()->addListener(mLogObserver); commit 84fe98c193ef8d88972f8bcfa1216140daf0d0a3 Author: Erik Hjortsberg Date: Sat Jan 24 17:49:35 2009 +0100 Correctly use the Ogre memory allocators. diff --git a/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/EmberPagingSceneManagerAdapter.cpp b/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/EmberPagingSceneManagerAdapter.cpp index f711b11..6ae7bbc 100644 --- a/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/EmberPagingSceneManagerAdapter.cpp +++ b/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/EmberPagingSceneManagerAdapter.cpp @@ -28,6 +28,7 @@ #include "OgrePagingLandScapePageManager.h" #include "OgrePagingLandScapePage.h" #include "OgrePagingLandScapeData2DManager.h" +#include "OgreMemoryAllocatorConfig.h" namespace EmberOgre { @@ -105,7 +106,7 @@ namespace EmberOgre { S_LOG_FAILURE("Could not find file "<< filePath); return; } - std::ifstream *filestream = new std::ifstream(); + std::ifstream *filestream = OGRE_NEW_T(std::ifstream, Ogre::MEMCATEGORY_GENERAL)(); filestream->open(filePath.c_str(), std::ios::in); if (filestream->fail()) @@ -116,7 +117,7 @@ namespace EmberOgre { } ///this will envelope the file stream pointer and delete it when it's destroyed itself - Ogre::FileStreamDataStream* stream = new Ogre::FileStreamDataStream(filePath, filestream, theStat.st_size, true); + Ogre::FileStreamDataStream* stream = OGRE_NEW Ogre::FileStreamDataStream(filePath, filestream, theStat.st_size, true); Ogre::DataStreamPtr dataPtr(stream); if (stream->size() == 0) { diff --git a/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeOptions.cpp b/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeOptions.cpp index e06fd6e..ad0e7d7 100644 --- a/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeOptions.cpp +++ b/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeOptions.cpp @@ -238,7 +238,7 @@ namespace Ogre { // Wrap as a stream DataStreamPtr stream( - new FileStreamDataStream(filename, &fs, false)); + OGRE_NEW FileStreamDataStream(filename, &fs, false)); config.load(stream); diff --git a/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeSceneManager.cpp b/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeSceneManager.cpp index a2a9e18..c466c94 100644 --- a/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeSceneManager.cpp +++ b/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeSceneManager.cpp @@ -233,7 +233,7 @@ namespace Ogre if (fs) { // Wrap as a stream - DataStreamPtr myStream (new FileStreamDataStream (filename, &fs, false)); + DataStreamPtr myStream (OGRE_NEW FileStreamDataStream (filename, &fs, false)); setWorldGeometry (myStream); return; } commit 3cfc56eae51e9e7a959e7e82346492d1a68cc07c Author: Erik Hjortsberg Date: Sat Jan 24 17:23:29 2009 +0100 Use the proper Ogre memory allocators. diff --git a/src/components/ogre/EmberOgreFileSystem.cpp b/src/components/ogre/EmberOgreFileSystem.cpp index aaa5b54..3042766 100644 --- a/src/components/ogre/EmberOgreFileSystem.cpp +++ b/src/components/ogre/EmberOgreFileSystem.cpp @@ -369,24 +369,24 @@ namespace EmberOgre { // Use filesystem to determine size // (quicker than streaming to the end and back) struct stat tagStat; - int ret = stat(full_path.c_str(), &tagStat); + int ret = stat(full_path.c_str(), &tagStat); assert(ret == 0 && "Problem getting file size" ); // Always open in binary mode - std::ifstream *origStream = new std::ifstream(); + std::ifstream *origStream = OGRE_NEW_T(std::ifstream, MEMCATEGORY_GENERAL)(); origStream->open(full_path.c_str(), std::ios::in | std::ios::binary); // Should check ensure open succeeded, in case fail for some reason. if (origStream->fail()) { - delete origStream; + OGRE_DELETE_T(origStream, basic_ifstream, MEMCATEGORY_GENERAL); OGRE_EXCEPT(Exception::ERR_FILE_NOT_FOUND, "Cannot open file: " + filename, "FileSystemArchive::open"); } /// Construct return stream, tell it to delete on destroy - FileStreamDataStream* stream = new FileStreamDataStream(filename, + FileStreamDataStream* stream = OGRE_NEW FileStreamDataStream(filename, origStream, tagStat.st_size, true); return DataStreamPtr(stream); } @@ -394,7 +394,7 @@ namespace EmberOgre { StringVectorPtr FileSystemArchive::list(bool recursive, bool dirs) { // directory change requires locking due to saved returns - StringVectorPtr ret(new StringVector()); + StringVectorPtr ret(OGRE_NEW_T(StringVector, MEMCATEGORY_GENERAL)(), SPFM_DELETE_T); findFiles("*", recursive, dirs, ret.getPointer(), 0); @@ -403,7 +403,7 @@ namespace EmberOgre { //----------------------------------------------------------------------- FileInfoListPtr FileSystemArchive::listFileInfo(bool recursive, bool dirs) { - FileInfoListPtr ret(new FileInfoList()); + FileInfoListPtr ret(OGRE_NEW_T(FileInfoList, MEMCATEGORY_GENERAL)(), SPFM_DELETE_T); findFiles("*", recursive, dirs, 0, ret.getPointer()); @@ -413,7 +413,7 @@ namespace EmberOgre { StringVectorPtr FileSystemArchive::find(const String& pattern, bool recursive, bool dirs) { - StringVectorPtr ret(new StringVector()); + StringVectorPtr ret(OGRE_NEW_T(StringVector, MEMCATEGORY_GENERAL)(), SPFM_DELETE_T); findFiles(pattern, recursive, dirs, ret.getPointer(), 0); @@ -424,7 +424,7 @@ namespace EmberOgre { FileInfoListPtr FileSystemArchive::findFileInfo(const String& pattern, bool recursive, bool dirs) { - FileInfoListPtr ret(new FileInfoList()); + FileInfoListPtr ret(OGRE_NEW_T(FileInfoList, MEMCATEGORY_GENERAL)(), SPFM_DELETE_T); findFiles(pattern, recursive, dirs, 0, ret.getPointer()); Index: ember.spec =================================================================== RCS file: /cvs/pkgs/rpms/ember/devel/ember.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ember.spec 1 Mar 2009 17:39:55 -0000 1.14 +++ ember.spec 2 Mar 2009 10:12:29 -0000 1.15 @@ -1,6 +1,6 @@ Name: ember Version: 0.5.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: 3D client for WorldForge Group: Amusements/Games @@ -8,6 +8,7 @@ URL: http://www.worldforge.org/dev/eng/clients/ember Source0: http://downloads.sourceforge.net/worldforge/%{name}-%{version}.tar.bz2 Patch0: ember-0.5.5-gcc44.patch +Patch1: ember-0.5.5-ogre161.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel tinyxml-devel DevIL-devel cegui-devel ogre-devel @@ -25,6 +26,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 # Encoding fix iconv -f iso-8859-1 -t utf-8 AUTHORS > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS @@ -87,6 +89,9 @@ %changelog +* Mon Mar 02 2009 Alexey Torkhov - 0.5.5-5 +- Update for new OGRE + * Sun Mar 01 2009 Alexey Torkhov - 0.5.5-4 - Adding unowned directory From than at fedoraproject.org Mon Mar 2 10:16:18 2009 From: than at fedoraproject.org (Than Ngo) Date: Mon, 2 Mar 2009 10:16:18 +0000 (UTC) Subject: rpms/kdbg/devel kdbg-2.1.0-gcc44.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 kdbg.spec, 1.33, 1.34 sources, 1.12, 1.13 Message-ID: <20090302101618.EE12B70115@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdbg/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14883 Modified Files: .cvsignore kdbg.spec sources Added Files: kdbg-2.1.0-gcc44.patch Log Message: * update to 2.1.1 * fix build problem with gcc-4.4 kdbg-2.1.0-gcc44.patch: --- NEW FILE kdbg-2.1.0-gcc44.patch --- diff -up kdbg-2.1.1/kdbg/gdbdriver.cpp.gcc44 kdbg-2.1.1/kdbg/gdbdriver.cpp --- kdbg-2.1.1/kdbg/gdbdriver.cpp.gcc44 2008-11-17 23:17:55.000000000 +0100 +++ kdbg-2.1.1/kdbg/gdbdriver.cpp 2009-03-02 11:07:26.000000000 +0100 @@ -133,7 +133,7 @@ GdbDriver::GdbDriver() : #ifndef NDEBUG // check command info array - char* perc; + const char* perc; for (int i = 0; i < NUM_CMDS; i++) { // must be indexable by DbgCommand values, i.e. sorted by DbgCommand values assert(i == cmds[i].cmd); @@ -669,7 +669,7 @@ static bool parseErrorMessage(const char // skip warnings while (strncmp(output, "warning:", 8) == 0) { - char* end = strchr(output+8, '\n'); + const char* end = strchr(output+8, '\n'); if (end == 0) output += strlen(output); else @@ -1880,8 +1880,8 @@ bool GdbDriver::parseThreadList(const ch p++; // there follows only whitespace } - char* end; - id = strtol(p, &end, 10); + const char* end; + id = strtol(p,(char**)&end, 10); if (p == end) { // syntax error: no number found; bail out return true; diff -up kdbg-2.1.1/kdbg/xsldbgdriver.cpp.gcc44 kdbg-2.1.1/kdbg/xsldbgdriver.cpp --- kdbg-2.1.1/kdbg/xsldbgdriver.cpp.gcc44 2009-03-02 11:08:09.000000000 +0100 +++ kdbg-2.1.1/kdbg/xsldbgdriver.cpp 2009-03-02 11:09:08.000000000 +0100 @@ -114,7 +114,7 @@ DebuggerDriver(), m_gdbMajor(2), m_gdbMi #ifndef NDEBUG // check command info array - char *perc; + const char *perc; for (int i = 0; i < NUM_CMDS; i++) { // must be indexable by DbgCommand values, i.e. sorted by DbgCommand values @@ -768,7 +768,7 @@ parseVar(const char *&s) } else if (strncmp(p, "= ", 2) == 0) { /* we're processing the result of a "print command" */ /* find next line */ - char *nextLine = strchr(p, '\n'); + const char *nextLine = strchr(p, '\n'); TRACE("Found print expr"); if (nextLine) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdbg/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 8 Jan 2008 16:32:33 -0000 1.12 +++ .cvsignore 2 Mar 2009 10:15:48 -0000 1.13 @@ -4,3 +4,4 @@ kdbg-2.0.2.tar.gz kdbg-2.0.5.tar.gz kdbg-2.1.0.tar.gz +kdbg-2.1.1.tar.gz Index: kdbg.spec =================================================================== RCS file: /cvs/extras/rpms/kdbg/devel/kdbg.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- kdbg.spec 25 Feb 2009 10:25:59 -0000 1.33 +++ kdbg.spec 2 Mar 2009 10:15:48 -0000 1.34 @@ -1,7 +1,7 @@ Name: kdbg Summary: A GUI for gdb, the GNU debugger, and KDE -Version: 2.1.0 -Release: 4%{?dist} +Version: 2.1.1 +Release: 1%{?dist} Epoch: 1 Source: http://download.sourceforge.net/kdbg/%{name}-%{version}.tar.gz # No version specified. @@ -9,6 +9,7 @@ URL: http://www.kdbg.org/ Group: Development/Debuggers Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: kdbg-2.1.0-gcc44.patch Requires: gdb @@ -23,6 +24,7 @@ %prep %setup -q +%patch0 -p1 -b .gcc44 %build unset QTDIR || : ; source /etc/profile.d/qt.sh @@ -62,8 +64,9 @@ %config (noreplace) %{_datadir}/config/kdbgrc %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 1:2.1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Fri Feb 27 2009 Than Ngo - 2.1.1-1 +- 2.1.1 +- fix build issue against gcc-4.4 * Tue Aug 5 2008 Tom "spot" Callaway 2.1.0-3 - fix license tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdbg/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 8 Jan 2008 16:32:33 -0000 1.12 +++ sources 2 Mar 2009 10:15:48 -0000 1.13 @@ -1 +1 @@ -dbac8bbc9f0182be6a272201b342fafc kdbg-2.1.0.tar.gz +2b7998528a68d09ff871925335092a1e kdbg-2.1.1.tar.gz From ltinkl at fedoraproject.org Mon Mar 2 10:20:24 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Mar 2009 10:20:24 +0000 (UTC) Subject: rpms/kdebase-workspace/F-10 kdebase-workspace-4.2.1-redhat-startkde.patch, NONE, 1.1 kdebase-workspace.spec, 1.162, 1.163 solid-bluetoothTrunkTo42.diff, 1.1, 1.2 kdebase-workspace-4.1.2-kdm-i18n.patch, 1.2, NONE kdebase-workspace-4.1.82-redhat-startkde.patch, 1.1, NONE Message-ID: <20090302102024.952F170115@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase-workspace/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16420/F-10 Modified Files: kdebase-workspace.spec solid-bluetoothTrunkTo42.diff Added Files: kdebase-workspace-4.2.1-redhat-startkde.patch Removed Files: kdebase-workspace-4.1.2-kdm-i18n.patch kdebase-workspace-4.1.82-redhat-startkde.patch Log Message: sync with devel/ kdebase-workspace-4.2.1-redhat-startkde.patch: --- NEW FILE kdebase-workspace-4.2.1-redhat-startkde.patch --- diff -up kdebase-workspace-4.2.1/startkde.cmake.redhat-startkde kdebase-workspace-4.2.1/startkde.cmake --- kdebase-workspace-4.2.1/startkde.cmake.redhat-startkde 2009-02-27 13:42:15.000000000 +0100 +++ kdebase-workspace-4.2.1/startkde.cmake 2009-03-01 12:40:54.000000000 +0100 @@ -19,33 +19,17 @@ elif test $kcheckrunning_result -eq 2 ; exit 1 fi -# Set the background to plain grey. +# Set the background to the Red Hat default # The standard X background is nasty, causing moire effects and exploding # people's heads. We use colours from the standard KDE palette for those with # palettised displays. if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then - xsetroot -solid "#000000" + xsetroot -solid "#103D77" fi # we have to unset this for Darwin since it will screw up KDE's dynamic-loading unset DYLD_FORCE_FLAT_NAMESPACE -# in case we have been started with full pathname spec without being in PATH -bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` -if [ -n "$bindir" ]; then - qbindir=`$bindir/kde4-config --qt-binaries` - if [ -n "$qbindir" ]; then - case $PATH in - $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; - *) PATH=$qbindir:$PATH; export PATH;; - esac - fi - case $PATH in - $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; - *) PATH=$bindir:$PATH; export PATH;; - esac -fi - # Boot sequence: # # kdeinit is used to fork off processes which improves memory usage @@ -83,6 +67,13 @@ kcmrandrrc [Screen3] kcmfonts General forceFontDPI 0 kdeglobals Locale Language '' # trigger requesting languages from KLocale EOF +# read the default KSplash theme to use out of kde-settings +if [ -e /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc ] + then eval `grep '^Theme=' /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc` + if [ -n "$Theme" ] + then sed -i -e "s/Default/$Theme/g" $kdehome/share/config/startupconfigkeys + fi +fi kstartupconfig4 returncode=$? if test $returncode -ne 0; then @@ -203,8 +194,9 @@ fi # better use the Autostart folder. libpath=`kde4-config --path lib | tr : '\n'` +envpath=/etc/kde/env/ -for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do +for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` $envpath ; do for file in "$prefix"*.sh; do test -r "$file" && . "$file" done @@ -417,7 +409,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n echo 'startkde: Running shutdown scripts...' 1>&2 # Run scripts found in $KDEDIRS/shutdown -for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do +shutdownpath=/etc/kde/shutdown/ +for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do test -x "$prefix$file" && "$prefix$file" done Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- kdebase-workspace.spec 27 Feb 2009 16:14:33 -0000 1.162 +++ kdebase-workspace.spec 2 Mar 2009 10:19:54 -0000 1.163 @@ -15,7 +15,7 @@ URL: http://www.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: kdebase-workspace-4.1.82-redhat-startkde.patch +Patch1: kdebase-workspace-4.2.1-redhat-startkde.patch Patch2: kdebase-workspace-4.1.72-plasma-konsole.patch Patch3: kdebase-workspace-4.2.0-show-systemsettings.patch Patch4: kdebase-workspace-4.0.72-ck-shutdown.patch @@ -370,7 +370,7 @@ %changelog -* Fri Feb 27 2009 Luk???? Tinkl - 4.2.1-1 +* Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 * Thu Feb 26 2009 Jaroslav Reznik - 4.2.0-17 solid-bluetoothTrunkTo42.diff: Index: solid-bluetoothTrunkTo42.diff =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/solid-bluetoothTrunkTo42.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- solid-bluetoothTrunkTo42.diff 29 Jan 2009 19:03:09 -0000 1.1 +++ solid-bluetoothTrunkTo42.diff 2 Mar 2009 10:19:54 -0000 1.2 @@ -1,15 +1,3 @@ -Index: solid_bluez.desktop -=================================================================== ---- solid_bluez.desktop (.../branches/KDE/4.2/kdebase/workspace/solid/bluez) (revision 912529) -+++ solid/bluez/solid_bluez.desktop (.../trunk/KDE/kdebase/workspace/solid/bluez) (revision 912529) -@@ -7,7 +7,6 @@ - Name=BlueZ - Name[hi]=?????????????????? - Name[kn]=????????????????????? --Name[mai]=??????????????? - Name[ne]=????????????Z - Name[sr]=???????? - Name[x-test]=xxBlueZxx Index: bluez-bluetoothinterface.cpp =================================================================== --- bluez-bluetoothinterface.cpp (.../branches/KDE/4.2/kdebase/workspace/solid/bluez) (revision 912529) --- kdebase-workspace-4.1.2-kdm-i18n.patch DELETED --- --- kdebase-workspace-4.1.82-redhat-startkde.patch DELETED --- From ltinkl at fedoraproject.org Mon Mar 2 10:20:24 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Mar 2009 10:20:24 +0000 (UTC) Subject: rpms/kdebase-workspace/F-9 kdebase-workspace-4.2.1-redhat-startkde.patch, NONE, 1.1 kdebase-workspace.spec, 1.135, 1.136 solid-bluetoothTrunkTo42.diff, 1.1, 1.2 kdebase-workspace-4.1.2-kdm-i18n.patch, 1.1, NONE kdebase-workspace-4.1.82-redhat-startkde.patch, 1.1, NONE Message-ID: <20090302102024.CF33070115@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase-workspace/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16420/F-9 Modified Files: kdebase-workspace.spec solid-bluetoothTrunkTo42.diff Added Files: kdebase-workspace-4.2.1-redhat-startkde.patch Removed Files: kdebase-workspace-4.1.2-kdm-i18n.patch kdebase-workspace-4.1.82-redhat-startkde.patch Log Message: sync with devel/ kdebase-workspace-4.2.1-redhat-startkde.patch: --- NEW FILE kdebase-workspace-4.2.1-redhat-startkde.patch --- diff -up kdebase-workspace-4.2.1/startkde.cmake.redhat-startkde kdebase-workspace-4.2.1/startkde.cmake --- kdebase-workspace-4.2.1/startkde.cmake.redhat-startkde 2009-02-27 13:42:15.000000000 +0100 +++ kdebase-workspace-4.2.1/startkde.cmake 2009-03-01 12:40:54.000000000 +0100 @@ -19,33 +19,17 @@ elif test $kcheckrunning_result -eq 2 ; exit 1 fi -# Set the background to plain grey. +# Set the background to the Red Hat default # The standard X background is nasty, causing moire effects and exploding # people's heads. We use colours from the standard KDE palette for those with # palettised displays. if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then - xsetroot -solid "#000000" + xsetroot -solid "#103D77" fi # we have to unset this for Darwin since it will screw up KDE's dynamic-loading unset DYLD_FORCE_FLAT_NAMESPACE -# in case we have been started with full pathname spec without being in PATH -bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` -if [ -n "$bindir" ]; then - qbindir=`$bindir/kde4-config --qt-binaries` - if [ -n "$qbindir" ]; then - case $PATH in - $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; - *) PATH=$qbindir:$PATH; export PATH;; - esac - fi - case $PATH in - $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; - *) PATH=$bindir:$PATH; export PATH;; - esac -fi - # Boot sequence: # # kdeinit is used to fork off processes which improves memory usage @@ -83,6 +67,13 @@ kcmrandrrc [Screen3] kcmfonts General forceFontDPI 0 kdeglobals Locale Language '' # trigger requesting languages from KLocale EOF +# read the default KSplash theme to use out of kde-settings +if [ -e /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc ] + then eval `grep '^Theme=' /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc` + if [ -n "$Theme" ] + then sed -i -e "s/Default/$Theme/g" $kdehome/share/config/startupconfigkeys + fi +fi kstartupconfig4 returncode=$? if test $returncode -ne 0; then @@ -203,8 +194,9 @@ fi # better use the Autostart folder. libpath=`kde4-config --path lib | tr : '\n'` +envpath=/etc/kde/env/ -for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do +for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` $envpath ; do for file in "$prefix"*.sh; do test -r "$file" && . "$file" done @@ -417,7 +409,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n echo 'startkde: Running shutdown scripts...' 1>&2 # Run scripts found in $KDEDIRS/shutdown -for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do +shutdownpath=/etc/kde/shutdown/ +for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do test -x "$prefix$file" && "$prefix$file" done Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- kdebase-workspace.spec 27 Feb 2009 16:14:34 -0000 1.135 +++ kdebase-workspace.spec 2 Mar 2009 10:19:54 -0000 1.136 @@ -15,7 +15,7 @@ URL: http://www.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: kdebase-workspace-4.1.82-redhat-startkde.patch +Patch1: kdebase-workspace-4.2.1-redhat-startkde.patch Patch2: kdebase-workspace-4.1.72-plasma-konsole.patch Patch3: kdebase-workspace-4.2.0-show-systemsettings.patch Patch4: kdebase-workspace-4.0.72-ck-shutdown.patch @@ -370,7 +370,7 @@ %changelog -* Fri Feb 27 2009 Luk???? Tinkl - 4.2.1-1 +* Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 * Thu Feb 26 2009 Jaroslav Reznik - 4.2.0-17 solid-bluetoothTrunkTo42.diff: Index: solid-bluetoothTrunkTo42.diff =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/solid-bluetoothTrunkTo42.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- solid-bluetoothTrunkTo42.diff 29 Jan 2009 19:41:04 -0000 1.1 +++ solid-bluetoothTrunkTo42.diff 2 Mar 2009 10:19:54 -0000 1.2 @@ -1,15 +1,3 @@ -Index: solid_bluez.desktop -=================================================================== ---- solid_bluez.desktop (.../branches/KDE/4.2/kdebase/workspace/solid/bluez) (revision 912529) -+++ solid/bluez/solid_bluez.desktop (.../trunk/KDE/kdebase/workspace/solid/bluez) (revision 912529) -@@ -7,7 +7,6 @@ - Name=BlueZ - Name[hi]=?????????????????? - Name[kn]=????????????????????? --Name[mai]=??????????????? - Name[ne]=????????????Z - Name[sr]=???????? - Name[x-test]=xxBlueZxx Index: bluez-bluetoothinterface.cpp =================================================================== --- bluez-bluetoothinterface.cpp (.../branches/KDE/4.2/kdebase/workspace/solid/bluez) (revision 912529) --- kdebase-workspace-4.1.2-kdm-i18n.patch DELETED --- --- kdebase-workspace-4.1.82-redhat-startkde.patch DELETED --- From michich at fedoraproject.org Mon Mar 2 10:21:30 2009 From: michich at fedoraproject.org (Michal Schmidt) Date: Mon, 2 Mar 2009 10:21:30 +0000 (UTC) Subject: rpms/icecream/devel icecream-0.9.3-tighten-security.patch, NONE, 1.1 icecream.spec, 1.18, 1.19 icecream.te, 1.6, 1.7 Message-ID: <20090302102130.D6E5070115@cvs1.fedora.phx.redhat.com> Author: michich Update of /cvs/pkgs/rpms/icecream/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16762 Modified Files: icecream.spec icecream.te Added Files: icecream-0.9.3-tighten-security.patch Log Message: * Mon Mar 02 2009 Michal Schmidt - 0.9.3-5 - Fix a fd leak from iceccd + avoid using system(). - Allows tighter SELinux policy. icecream-0.9.3-tighten-security.patch: --- NEW FILE icecream-0.9.3-tighten-security.patch --- commit 3cf2e4b4f1912d18772a0fa476d4671c25ca2ea4 Author: coolo Date: Mon Mar 2 09:47:26 2009 +0000 more fixes from Michal Schmidt: - don't leak file descriptor to create-env - don't use the shell to call simple commands git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/icecream at 934044 283d02a7-25f6-0310-bc7c-ecb5cbfe19da diff --git a/daemon/environment.cpp b/daemon/environment.cpp index fd38f8e..9dc2831 100644 --- a/daemon/environment.cpp +++ b/daemon/environment.cpp @@ -142,40 +142,48 @@ static void list_target_dirs( const string ¤t_target, const string &target closedir( envdir ); } -bool cleanup_cache( const string &basedir ) +/* Returns true if the child exited with success */ +static bool exec_and_wait( const char *const argv[] ) { - flush_debug(); pid_t pid = fork(); - if ( pid ) - { - int status = 0; + if ( pid == -1 ) { + log_perror("fork"); + return false; + } + if ( pid ) { + // parent + int status; while ( waitpid( pid, &status, 0 ) < 0 && errno == EINTR ) ; + return WIFEXITED(status) && WEXITSTATUS(status) == 0; + } + // child + _exit(execv(argv[0], const_cast(argv))); +} - if ( mkdir( basedir.c_str(), 0755 ) && errno != EEXIST ) { - if ( errno == EPERM ) - log_error() << "permission denied on mkdir " << basedir << endl; - else - log_perror( "mkdir in cleanup_cache() failed" ); - return false; - } - chown( basedir.c_str(), 0, 0 ); - chmod( basedir.c_str(), 0755 ); +bool cleanup_cache( const string &basedir ) +{ + flush_debug(); - return WIFEXITED(status); - } - // else - char **argv; - argv = new char*[5]; - argv[0] = strdup( "/bin/rm" ); - argv[1] = strdup( "-rf" ); - argv[2] = strdup( "--" ); // make sure it ends with '/' to not fall into symlink traps string bdir = basedir + '/'; - argv[3] = strdup( bdir.c_str() ); - argv[4] = NULL; + const char *const argv[] = { + "/bin/rm", "-rf", "--", bdir.c_str(), NULL + }; - _exit(execv(argv[0], argv)); + bool ret = exec_and_wait( argv ); + + if ( mkdir( basedir.c_str(), 0755 ) && errno != EEXIST ) { + if ( errno == EPERM ) + log_error() << "permission denied on mkdir " << basedir << endl; + else + log_perror( "mkdir in cleanup_cache() failed" ); + return false; + } + chown( basedir.c_str(), 0, 0 ); + chmod( basedir.c_str(), 0755 ); + + return ret; } Environments available_environmnents(const string &basedir) @@ -259,7 +267,10 @@ size_t setup_env_cache(const string &basedir, string &native_environment, uid_t _exit(1); } - if ( system( BINDIR "/icecc --build-native" ) ) { + const char *const argv[] = { + BINDIR "/icecc", "--build-native", NULL + }; + if ( !exec_and_wait( argv ) ) { log_error() << BINDIR "/icecc --build-native failed\n"; _exit(1); } diff --git a/services/comm.cpp b/services/comm.cpp index 47e7304..5ffb790 100644 --- a/services/comm.cpp +++ b/services/comm.cpp @@ -987,6 +987,12 @@ open_send_broadcast (void) return -1; } + if (fcntl (ask_fd, F_SETFD, FD_CLOEXEC) < 0) + { + log_perror("open_send_broadcast fcntl"); + close (ask_fd); + return -1; + } int optval = 1; if (setsockopt (ask_fd, SOL_SOCKET, SO_BROADCAST, &optval, sizeof(optval)) < 0) { Index: icecream.spec =================================================================== RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- icecream.spec 25 Feb 2009 06:38:17 -0000 1.18 +++ icecream.spec 2 Mar 2009 10:21:00 -0000 1.19 @@ -11,7 +11,7 @@ Name: icecream Version: 0.9.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Distributed compiler Group: Development/Tools @@ -30,6 +30,7 @@ Patch0: %{name}-rename-scheduler.patch Patch1: %{name}-cleanup-conffile.patch Patch2: %{name}-0.9.3-fix-gcc44-ftbfs.patch +Patch3: %{name}-0.9.3-tighten-security.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +79,7 @@ %patch0 -p1 %patch1 -p0 %patch2 -p1 +%patch3 -p1 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1} > icecream.sh sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE2} > icecream.csh mkdir SELinux @@ -235,6 +237,10 @@ %{_libdir}/pkgconfig/icecc.pc %changelog +* Mon Mar 02 2009 Michal Schmidt - 0.9.3-5 +- Fix a fd leak from iceccd + avoid using system(). +- Allows tighter SELinux policy. + * Tue Feb 24 2009 Fedora Release Engineering - 0.9.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: icecream.te =================================================================== RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.te,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- icecream.te 16 Feb 2009 20:52:28 -0000 1.6 +++ icecream.te 2 Mar 2009 10:21:00 -0000 1.7 @@ -1,5 +1,5 @@ -policy_module(icecream,0.0.42) +policy_module(icecream,0.0.43) ######################################## # @@ -146,15 +146,8 @@ nscd_socket_use(iceccd_createenv_t) ') -# Some rules that can probably go away when iceccd is fixed properly: -# -# XXX: icecc-create-env does not really need to talk to the open UDP socket -# leaked from its parent. -dontaudit iceccd_createenv_t iceccd_t:udp_socket { read write }; -# XXX: iceccd could be modified to avoid the shell completely -corecmd_exec_shell(iceccd_t) -# XXX: fix iceccd to only nuke the contents of /var/cache/icecream, -# not the directory itself. +# XXX: This could be avoided if iceccd only nuked the contents of +# /var/cache/icecream, not the directory itself. files_var_filetrans(iceccd_t, iceccd_cache_t, dir) From ltinkl at fedoraproject.org Mon Mar 2 10:27:32 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Mar 2009 10:27:32 +0000 (UTC) Subject: rpms/kdebase/F-10 kdebase-4.2.1-home-icon.patch, NONE, 1.1 kdebase.spec, 1.357, 1.358 kdebase-4.2.0-home-icon.patch, 1.2, NONE Message-ID: <20090302102732.6D69E70115@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17982/F-10 Modified Files: kdebase.spec Added Files: kdebase-4.2.1-home-icon.patch Removed Files: kdebase-4.2.0-home-icon.patch Log Message: sync with devel/ kdebase-4.2.1-home-icon.patch: --- NEW FILE kdebase-4.2.1-home-icon.patch --- diff -up kdebase-4.2.1/apps/konqueror/Home.desktop.home-icon kdebase-4.2.1/apps/konqueror/Home.desktop --- kdebase-4.2.1/apps/konqueror/Home.desktop.home-icon 2009-02-26 15:16:30.000000000 +0100 +++ kdebase-4.2.1/apps/konqueror/Home.desktop 2009-03-01 18:43:05.000000000 +0100 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=kfmclient openProfile filemanagement +Exec=dolphin Icon=user-home Terminal=false @@ -170,4 +170,3 @@ GenericName[zh_CN]=???????????? GenericName[zh_TW]=???????????? Categories=Qt;KDE;Core; OnlyShowIn=KDE; -NoDisplay=true Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v retrieving revision 1.357 retrieving revision 1.358 diff -u -r1.357 -r1.358 --- kdebase.spec 27 Feb 2009 15:38:33 -0000 1.357 +++ kdebase.spec 2 Mar 2009 10:27:01 -0000 1.358 @@ -24,11 +24,9 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# fedora specific nsplugins paths Patch0: kdebase-4.1.80-nsplugins-paths.patch -# Konsole patches Patch1: kdebase-4.1.70-konsole-session.patch -patch2: kdebase-4.2.0-home-icon.patch +patch2: kdebase-4.2.1-home-icon.patch ## upstream patches --- kdebase-4.2.0-home-icon.patch DELETED --- From ltinkl at fedoraproject.org Mon Mar 2 10:27:32 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Mar 2009 10:27:32 +0000 (UTC) Subject: rpms/kdebase/F-9 kdebase-4.2.1-home-icon.patch, NONE, 1.1 kdebase.spec, 1.347, 1.348 kdebase-4.2.0-home-icon.patch, 1.2, NONE Message-ID: <20090302102732.A6A0370115@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17982/F-9 Modified Files: kdebase.spec Added Files: kdebase-4.2.1-home-icon.patch Removed Files: kdebase-4.2.0-home-icon.patch Log Message: sync with devel/ kdebase-4.2.1-home-icon.patch: --- NEW FILE kdebase-4.2.1-home-icon.patch --- diff -up kdebase-4.2.1/apps/konqueror/Home.desktop.home-icon kdebase-4.2.1/apps/konqueror/Home.desktop --- kdebase-4.2.1/apps/konqueror/Home.desktop.home-icon 2009-02-26 15:16:30.000000000 +0100 +++ kdebase-4.2.1/apps/konqueror/Home.desktop 2009-03-01 18:43:05.000000000 +0100 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=kfmclient openProfile filemanagement +Exec=dolphin Icon=user-home Terminal=false @@ -170,4 +170,3 @@ GenericName[zh_CN]=???????????? GenericName[zh_TW]=???????????? Categories=Qt;KDE;Core; OnlyShowIn=KDE; -NoDisplay=true Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v retrieving revision 1.347 retrieving revision 1.348 diff -u -r1.347 -r1.348 --- kdebase.spec 27 Feb 2009 15:38:33 -0000 1.347 +++ kdebase.spec 2 Mar 2009 10:27:02 -0000 1.348 @@ -24,11 +24,9 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# fedora specific nsplugins paths Patch0: kdebase-4.1.80-nsplugins-paths.patch -# Konsole patches Patch1: kdebase-4.1.70-konsole-session.patch -patch2: kdebase-4.2.0-home-icon.patch +patch2: kdebase-4.2.1-home-icon.patch ## upstream patches --- kdebase-4.2.0-home-icon.patch DELETED --- From pkgdb at fedoraproject.org Mon Mar 2 10:28:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 10:28:31 +0000 Subject: [pkgdb] xinetd: haiyasshah has requested watchcommits Message-ID: <20090302102853.8E756208480@bastion.fedora.phx.redhat.com> haiyasshah has requested the watchcommits acl on xinetd (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xinetd From ltinkl at fedoraproject.org Mon Mar 2 10:29:56 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Mar 2009 10:29:56 +0000 (UTC) Subject: rpms/kdegraphics/F-10 kdegraphics.spec, 1.184, 1.185 sources, 1.62, 1.63 Message-ID: <20090302102956.5B34E70115@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdegraphics/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18395/F-10 Modified Files: kdegraphics.spec sources Log Message: sync with devel, fix sources Index: kdegraphics.spec =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/F-10/kdegraphics.spec,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- kdegraphics.spec 27 Feb 2009 16:50:22 -0000 1.184 +++ kdegraphics.spec 2 Mar 2009 10:29:25 -0000 1.185 @@ -179,7 +179,7 @@ %changelog -* Fri Feb 27 2009 Luk???? Tinkl - 4.2.1-1 +* Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 * Wed Feb 25 2009 Fedora Release Engineering - 7:4.2.0-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/F-10/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 27 Feb 2009 16:50:22 -0000 1.62 +++ sources 2 Mar 2009 10:29:25 -0000 1.63 @@ -1 +1 @@ -3ccc094df33db9d61f5ad065b9b857ac kdelibs-4.2.1.tar.bz2 +9cc2bc859e678aa6178a5c6cf87eb0ab kdegraphics-4.2.1.tar.bz2 From ltinkl at fedoraproject.org Mon Mar 2 10:29:56 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Mar 2009 10:29:56 +0000 (UTC) Subject: rpms/kdegraphics/F-9 kdegraphics.spec, 1.163, 1.164 sources, 1.55, 1.56 Message-ID: <20090302102956.A0C7F70115@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdegraphics/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18395/F-9 Modified Files: kdegraphics.spec sources Log Message: sync with devel, fix sources Index: kdegraphics.spec =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/F-9/kdegraphics.spec,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- kdegraphics.spec 27 Feb 2009 16:50:22 -0000 1.163 +++ kdegraphics.spec 2 Mar 2009 10:29:26 -0000 1.164 @@ -179,7 +179,7 @@ %changelog -* Fri Feb 27 2009 Luk???? Tinkl - 4.2.1-1 +* Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 * Wed Feb 25 2009 Fedora Release Engineering - 7:4.2.0-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegraphics/F-9/sources,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- sources 27 Feb 2009 16:50:22 -0000 1.55 +++ sources 2 Mar 2009 10:29:26 -0000 1.56 @@ -1 +1 @@ -3ccc094df33db9d61f5ad065b9b857ac kdelibs-4.2.1.tar.bz2 +9cc2bc859e678aa6178a5c6cf87eb0ab kdegraphics-4.2.1.tar.bz2 From ltinkl at fedoraproject.org Mon Mar 2 10:32:27 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Mar 2009 10:32:27 +0000 (UTC) Subject: rpms/kde-l10n/F-9 kde-l10n.spec,1.43,1.44 sources,1.18,1.19 Message-ID: <20090302103227.56F1170116@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kde-l10n/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18935/F-9 Modified Files: kde-l10n.spec sources Log Message: KDE 4.2.1 Index: kde-l10n.spec =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/F-9/kde-l10n.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- kde-l10n.spec 30 Jan 2009 19:00:16 -0000 1.43 +++ kde-l10n.spec 2 Mar 2009 10:31:57 -0000 1.44 @@ -1,8 +1,8 @@ %define buildall 0 Name: kde-l10n -Version: 4.2.0 -Release: 2%{dist} +Version: 4.2.1 +Release: 1%{dist} Url: http://www.kde.org Summary: Internationalization support for KDE Group: User Interface/Desktops @@ -62,7 +62,7 @@ Source50: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2 #Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2 Source52: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2 -SOurce53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-he-4.2.0.tar.bz2 +Source53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-he-%{version}.tar.bz2 Source1000: subdirs-kde-l10n @@ -1325,6 +1325,12 @@ %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW %changelog +* Fri Feb 27 2009 Than Ngo - 4.2.1-1 +- 4.2.1 + +* Wed Feb 25 2009 Fedora Release Engineering - 4.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Jan 30 2009 Than Ngo - 4.2.0-2 - enable he Index: sources =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/F-9/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 30 Jan 2009 19:00:16 -0000 1.18 +++ sources 2 Mar 2009 10:31:57 -0000 1.19 @@ -1,47 +1,47 @@ -fc201d9b7d85b84ed02d049309d50ec7 kde-l10n-bg-4.2.0.tar.bz2 -62b468adf048dde92abcea1cc8378ee0 kde-l10n-ca-4.2.0.tar.bz2 -3fbbda2cb209e8c773c075ed3d28f831 kde-l10n-cs-4.2.0.tar.bz2 -c9e576d85e7c8644a7f363a7dc446a47 kde-l10n-csb-4.2.0.tar.bz2 -9f6a01336b631223e13df6f82f6247ad kde-l10n-da-4.2.0.tar.bz2 -da8184a7380795790d498c7d5e4a6b62 kde-l10n-de-4.2.0.tar.bz2 -2bbfca0b7a1366aee558804105b176cb kde-l10n-el-4.2.0.tar.bz2 -12814406b6d35d8098a6cd16f49f827e kde-l10n-en_GB-4.2.0.tar.bz2 -e3b9bc8ef5573f7574e296385eb130a9 kde-l10n-es-4.2.0.tar.bz2 -dc5bda4589b9a2042ade700caf8de083 kde-l10n-fi-4.2.0.tar.bz2 -ca231f7972a5269a589cad934cd4ab81 kde-l10n-fr-4.2.0.tar.bz2 -d18b399ca99aa54c936bcdb207baac0a kde-l10n-ga-4.2.0.tar.bz2 -104815bc1b20b100509f66132df52cad kde-l10n-gl-4.2.0.tar.bz2 -b828a209e2b370e4b3487be01dc0ea8e kde-l10n-hi-4.2.0.tar.bz2 -b000573be5a3b6cee9ee9aa45b0931bc kde-l10n-hu-4.2.0.tar.bz2 -42387c0b473767173ebf65622edb4278 kde-l10n-it-4.2.0.tar.bz2 -84c1dc6f18dd405b217d98312ffec6bf kde-l10n-ja-4.2.0.tar.bz2 -a984ed36132141eb8473ab541187d296 kde-l10n-kk-4.2.0.tar.bz2 -a8aaca814f556e3e8b3cd99f04eddca6 kde-l10n-km-4.2.0.tar.bz2 -bbd68e1c9eee724c7db051657fdfb50c kde-l10n-ko-4.2.0.tar.bz2 -3ce287f12f044c14608692518018bbef kde-l10n-ku-4.2.0.tar.bz2 -5ffad305fb06d70f7991745b82a427e3 kde-l10n-lt-4.2.0.tar.bz2 -9d8fe83cefb273eb065337a0ab8790a5 kde-l10n-lv-4.2.0.tar.bz2 -933d60b4c535d9d6d9729bd986906e64 kde-l10n-mk-4.2.0.tar.bz2 -462763d9a71c273b7ae6f3ebd2c798e1 kde-l10n-ml-4.2.0.tar.bz2 -db0d87c5125b05c25788cbf10fd56490 kde-l10n-nb-4.2.0.tar.bz2 -378e068c4c86670788019ae7d0dda136 kde-l10n-nds-4.2.0.tar.bz2 -f9174173973b0e235a3d729b0ef2f1cf kde-l10n-nl-4.2.0.tar.bz2 -cff7964f1c88a52d7e64df19e53c88ea kde-l10n-nn-4.2.0.tar.bz2 -a8dded180d298489861d17a761df51f8 kde-l10n-pa-4.2.0.tar.bz2 -b04d741a53b0e1ba58d315cf118985e4 kde-l10n-pl-4.2.0.tar.bz2 -eabe2a528d1e9d5c10ecae15dea68d26 kde-l10n-pt-4.2.0.tar.bz2 -d932254d7168016819aacc45a759592e kde-l10n-pt_BR-4.2.0.tar.bz2 -9038ce82cdddf3fcf028aff50a55932a kde-l10n-ru-4.2.0.tar.bz2 -b24648e4fe6552ed7253acee7306f03e kde-l10n-sl-4.2.0.tar.bz2 -8d58ae783752ba8129df1e3866e8a089 kde-l10n-sr-4.2.0.tar.bz2 -efbdb69f70e723c1ce0783e2a0693aaf kde-l10n-sv-4.2.0.tar.bz2 -010ba3a0ed85c99cd215623f6d78fcd5 kde-l10n-th-4.2.0.tar.bz2 -850a88f8d82d9d9ab4c5ef2406eba39e kde-l10n-tr-4.2.0.tar.bz2 -7dba32b49fe5d263103a617a49a1849e kde-l10n-uk-4.2.0.tar.bz2 -0db1e8dc944786811cc1364df0ee4cf2 kde-l10n-wa-4.2.0.tar.bz2 -c4730babc7bef39cea255c9528607fdc kde-l10n-zh_CN-4.2.0.tar.bz2 -08af73c8b0f82689f5ab046f0700bf9d kde-l10n-zh_TW-4.2.0.tar.bz2 -058b0bd3a7b2ca4ef56730488a234afa kde-l10n-ar-4.2.0.tar.bz2 -5248515b294143a7821055754b9236e4 kde-l10n-eu-4.2.0.tar.bz2 -fb2e1d63d9d926c6639a537b6bf73d03 kde-l10n-et-4.2.0.tar.bz2 -e45690f965c153b2f25ebba5358d1912 kde-l10n-he-4.2.0.tar.bz2 +7d2caac95a427cafadaca02f3647cd1e kde-l10n-ar-4.2.1.tar.bz2 +f6621960e9a1f3328e42a6f5735083c7 kde-l10n-bg-4.2.1.tar.bz2 +b4e42ac60e2491025705ef7d4f9ff613 kde-l10n-ca-4.2.1.tar.bz2 +7787304141fa31c4b967297b2d75b36f kde-l10n-cs-4.2.1.tar.bz2 +2f2ca099814cd3bbf1a0273d0b027b80 kde-l10n-csb-4.2.1.tar.bz2 +7765ade376b10d25d88e0b9d7ea7ef94 kde-l10n-da-4.2.1.tar.bz2 +c1521b6517667e9dd1a29ffb9182cd0e kde-l10n-de-4.2.1.tar.bz2 +53df4a6bd3f6ce8aa4130ab4c927ec93 kde-l10n-el-4.2.1.tar.bz2 +bb92656ccfd7c4e1c28b8e1ae53d01b5 kde-l10n-en_GB-4.2.1.tar.bz2 +249501d5acaf9cdaa1c81ecc7892ee9f kde-l10n-es-4.2.1.tar.bz2 +4d7ba6e07f6949bf03d810e67d55230c kde-l10n-et-4.2.1.tar.bz2 +5d4d1c5a9606f79b37ddb8bce6fd8dc8 kde-l10n-eu-4.2.1.tar.bz2 +4b69917aee664dd2b10471d8a9294dd2 kde-l10n-fi-4.2.1.tar.bz2 +d9b613ccb77cce12385ba77bfc0eb5ec kde-l10n-fr-4.2.1.tar.bz2 +e5b10ab623c56b45cf206db37024049a kde-l10n-ga-4.2.1.tar.bz2 +fafa0c2a2f6b46d0c9f4c11508ac86e6 kde-l10n-gl-4.2.1.tar.bz2 +1d69a2182408b89393cbe6d773752d03 kde-l10n-he-4.2.1.tar.bz2 +8b4a197ff42a3ec17624a612db748205 kde-l10n-hi-4.2.1.tar.bz2 +fe62f86cea5b6022b40650299ed5223c kde-l10n-hu-4.2.1.tar.bz2 +5f366b474472536371baf9890458f1a0 kde-l10n-it-4.2.1.tar.bz2 +f43e96ea7eba05616b25145cf3e26e9a kde-l10n-ja-4.2.1.tar.bz2 +e32ff330ab1caa8cc45e6474bda42fc9 kde-l10n-kk-4.2.1.tar.bz2 +3db01f4d93ef17a03173e2c0b4693889 kde-l10n-km-4.2.1.tar.bz2 +a05b21792fb0a2dc032454852a1d75e6 kde-l10n-ko-4.2.1.tar.bz2 +d065d40014e1a4a8d120b4c60ac4e298 kde-l10n-ku-4.2.1.tar.bz2 +e10ac0d7d88183849a1a811dd1dc4191 kde-l10n-lt-4.2.1.tar.bz2 +2591ad3682547ad5c5ddce2d99644325 kde-l10n-lv-4.2.1.tar.bz2 +c02330d7c1de2386dca89f9c5f4e124e kde-l10n-mk-4.2.1.tar.bz2 +27d628c4230b378bdbe5ac74b1fd7611 kde-l10n-ml-4.2.1.tar.bz2 +e4b6d5a8f7a6acb46c6493986deb2fc0 kde-l10n-nb-4.2.1.tar.bz2 +6b3cd678e8d2bfdb3b3b28d1dbc17c9a kde-l10n-nds-4.2.1.tar.bz2 +c5612a215db0b13b0cfd5b17e337300e kde-l10n-nl-4.2.1.tar.bz2 +80a3b5932356f21a8b9068ca40f7e0c1 kde-l10n-nn-4.2.1.tar.bz2 +385983a3584a639c91f0c489140e9d28 kde-l10n-pa-4.2.1.tar.bz2 +6cc2883667a293f7db927fd076623f93 kde-l10n-pl-4.2.1.tar.bz2 +55e15795d4901701b7deab813857ec06 kde-l10n-pt-4.2.1.tar.bz2 +a77c500292a1615f77a519d84d6f5a7c kde-l10n-pt_BR-4.2.1.tar.bz2 +770d39e08471b0fe91762dbee93d6d00 kde-l10n-ru-4.2.1.tar.bz2 +d643261b6b97a587a9d3fc682f4b01b0 kde-l10n-sl-4.2.1.tar.bz2 +6ec221411c0e338bb25234c95abd3045 kde-l10n-sr-4.2.1.tar.bz2 +4f2a5b6ee87c129499350418d1a0a17e kde-l10n-sv-4.2.1.tar.bz2 +62c1114df471bc35e05e2980e2c12b47 kde-l10n-th-4.2.1.tar.bz2 +8ce5790512f818320804967a6e5c6204 kde-l10n-tr-4.2.1.tar.bz2 +40f6a3fd553144ccd8a576fed272fb6d kde-l10n-uk-4.2.1.tar.bz2 +9334b0cd1a718afb59b81906a677ac44 kde-l10n-wa-4.2.1.tar.bz2 +f3cbd496581e3acdaf5bb371549103ee kde-l10n-zh_CN-4.2.1.tar.bz2 +4b78c747661c0f1f7840f180b06e48a8 kde-l10n-zh_TW-4.2.1.tar.bz2 From ltinkl at fedoraproject.org Mon Mar 2 10:32:27 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Mar 2009 10:32:27 +0000 (UTC) Subject: rpms/kde-l10n/F-10 kde-l10n.spec,1.56,1.57 sources,1.19,1.20 Message-ID: <20090302103227.2A01E70115@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kde-l10n/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18935/F-10 Modified Files: kde-l10n.spec sources Log Message: KDE 4.2.1 Index: kde-l10n.spec =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/F-10/kde-l10n.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- kde-l10n.spec 30 Jan 2009 17:01:39 -0000 1.56 +++ kde-l10n.spec 2 Mar 2009 10:31:56 -0000 1.57 @@ -1,8 +1,8 @@ %define buildall 0 Name: kde-l10n -Version: 4.2.0 -Release: 2%{dist} +Version: 4.2.1 +Release: 1%{dist} Url: http://www.kde.org Summary: Internationalization support for KDE Group: User Interface/Desktops @@ -62,7 +62,7 @@ Source50: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2 #Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2 Source52: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2 -SOurce53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-he-4.2.0.tar.bz2 +Source53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-he-%{version}.tar.bz2 Source1000: subdirs-kde-l10n @@ -1325,6 +1325,12 @@ %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW %changelog +* Fri Feb 27 2009 Than Ngo - 4.2.1-1 +- 4.2.1 + +* Wed Feb 25 2009 Fedora Release Engineering - 4.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Jan 30 2009 Than Ngo - 4.2.0-2 - enable he Index: sources =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/F-10/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 30 Jan 2009 17:01:39 -0000 1.19 +++ sources 2 Mar 2009 10:31:56 -0000 1.20 @@ -1,47 +1,47 @@ -fc201d9b7d85b84ed02d049309d50ec7 kde-l10n-bg-4.2.0.tar.bz2 -62b468adf048dde92abcea1cc8378ee0 kde-l10n-ca-4.2.0.tar.bz2 -3fbbda2cb209e8c773c075ed3d28f831 kde-l10n-cs-4.2.0.tar.bz2 -c9e576d85e7c8644a7f363a7dc446a47 kde-l10n-csb-4.2.0.tar.bz2 -9f6a01336b631223e13df6f82f6247ad kde-l10n-da-4.2.0.tar.bz2 -da8184a7380795790d498c7d5e4a6b62 kde-l10n-de-4.2.0.tar.bz2 -2bbfca0b7a1366aee558804105b176cb kde-l10n-el-4.2.0.tar.bz2 -12814406b6d35d8098a6cd16f49f827e kde-l10n-en_GB-4.2.0.tar.bz2 -e3b9bc8ef5573f7574e296385eb130a9 kde-l10n-es-4.2.0.tar.bz2 -dc5bda4589b9a2042ade700caf8de083 kde-l10n-fi-4.2.0.tar.bz2 -ca231f7972a5269a589cad934cd4ab81 kde-l10n-fr-4.2.0.tar.bz2 -d18b399ca99aa54c936bcdb207baac0a kde-l10n-ga-4.2.0.tar.bz2 -104815bc1b20b100509f66132df52cad kde-l10n-gl-4.2.0.tar.bz2 -b828a209e2b370e4b3487be01dc0ea8e kde-l10n-hi-4.2.0.tar.bz2 -b000573be5a3b6cee9ee9aa45b0931bc kde-l10n-hu-4.2.0.tar.bz2 -42387c0b473767173ebf65622edb4278 kde-l10n-it-4.2.0.tar.bz2 -84c1dc6f18dd405b217d98312ffec6bf kde-l10n-ja-4.2.0.tar.bz2 -a984ed36132141eb8473ab541187d296 kde-l10n-kk-4.2.0.tar.bz2 -a8aaca814f556e3e8b3cd99f04eddca6 kde-l10n-km-4.2.0.tar.bz2 -bbd68e1c9eee724c7db051657fdfb50c kde-l10n-ko-4.2.0.tar.bz2 -3ce287f12f044c14608692518018bbef kde-l10n-ku-4.2.0.tar.bz2 -5ffad305fb06d70f7991745b82a427e3 kde-l10n-lt-4.2.0.tar.bz2 -9d8fe83cefb273eb065337a0ab8790a5 kde-l10n-lv-4.2.0.tar.bz2 -933d60b4c535d9d6d9729bd986906e64 kde-l10n-mk-4.2.0.tar.bz2 -462763d9a71c273b7ae6f3ebd2c798e1 kde-l10n-ml-4.2.0.tar.bz2 -db0d87c5125b05c25788cbf10fd56490 kde-l10n-nb-4.2.0.tar.bz2 -378e068c4c86670788019ae7d0dda136 kde-l10n-nds-4.2.0.tar.bz2 -f9174173973b0e235a3d729b0ef2f1cf kde-l10n-nl-4.2.0.tar.bz2 -cff7964f1c88a52d7e64df19e53c88ea kde-l10n-nn-4.2.0.tar.bz2 -a8dded180d298489861d17a761df51f8 kde-l10n-pa-4.2.0.tar.bz2 -b04d741a53b0e1ba58d315cf118985e4 kde-l10n-pl-4.2.0.tar.bz2 -eabe2a528d1e9d5c10ecae15dea68d26 kde-l10n-pt-4.2.0.tar.bz2 -d932254d7168016819aacc45a759592e kde-l10n-pt_BR-4.2.0.tar.bz2 -9038ce82cdddf3fcf028aff50a55932a kde-l10n-ru-4.2.0.tar.bz2 -b24648e4fe6552ed7253acee7306f03e kde-l10n-sl-4.2.0.tar.bz2 -8d58ae783752ba8129df1e3866e8a089 kde-l10n-sr-4.2.0.tar.bz2 -efbdb69f70e723c1ce0783e2a0693aaf kde-l10n-sv-4.2.0.tar.bz2 -010ba3a0ed85c99cd215623f6d78fcd5 kde-l10n-th-4.2.0.tar.bz2 -850a88f8d82d9d9ab4c5ef2406eba39e kde-l10n-tr-4.2.0.tar.bz2 -7dba32b49fe5d263103a617a49a1849e kde-l10n-uk-4.2.0.tar.bz2 -0db1e8dc944786811cc1364df0ee4cf2 kde-l10n-wa-4.2.0.tar.bz2 -c4730babc7bef39cea255c9528607fdc kde-l10n-zh_CN-4.2.0.tar.bz2 -08af73c8b0f82689f5ab046f0700bf9d kde-l10n-zh_TW-4.2.0.tar.bz2 -058b0bd3a7b2ca4ef56730488a234afa kde-l10n-ar-4.2.0.tar.bz2 -5248515b294143a7821055754b9236e4 kde-l10n-eu-4.2.0.tar.bz2 -fb2e1d63d9d926c6639a537b6bf73d03 kde-l10n-et-4.2.0.tar.bz2 -e45690f965c153b2f25ebba5358d1912 kde-l10n-he-4.2.0.tar.bz2 +7d2caac95a427cafadaca02f3647cd1e kde-l10n-ar-4.2.1.tar.bz2 +f6621960e9a1f3328e42a6f5735083c7 kde-l10n-bg-4.2.1.tar.bz2 +b4e42ac60e2491025705ef7d4f9ff613 kde-l10n-ca-4.2.1.tar.bz2 +7787304141fa31c4b967297b2d75b36f kde-l10n-cs-4.2.1.tar.bz2 +2f2ca099814cd3bbf1a0273d0b027b80 kde-l10n-csb-4.2.1.tar.bz2 +7765ade376b10d25d88e0b9d7ea7ef94 kde-l10n-da-4.2.1.tar.bz2 +c1521b6517667e9dd1a29ffb9182cd0e kde-l10n-de-4.2.1.tar.bz2 +53df4a6bd3f6ce8aa4130ab4c927ec93 kde-l10n-el-4.2.1.tar.bz2 +bb92656ccfd7c4e1c28b8e1ae53d01b5 kde-l10n-en_GB-4.2.1.tar.bz2 +249501d5acaf9cdaa1c81ecc7892ee9f kde-l10n-es-4.2.1.tar.bz2 +4d7ba6e07f6949bf03d810e67d55230c kde-l10n-et-4.2.1.tar.bz2 +5d4d1c5a9606f79b37ddb8bce6fd8dc8 kde-l10n-eu-4.2.1.tar.bz2 +4b69917aee664dd2b10471d8a9294dd2 kde-l10n-fi-4.2.1.tar.bz2 +d9b613ccb77cce12385ba77bfc0eb5ec kde-l10n-fr-4.2.1.tar.bz2 +e5b10ab623c56b45cf206db37024049a kde-l10n-ga-4.2.1.tar.bz2 +fafa0c2a2f6b46d0c9f4c11508ac86e6 kde-l10n-gl-4.2.1.tar.bz2 +1d69a2182408b89393cbe6d773752d03 kde-l10n-he-4.2.1.tar.bz2 +8b4a197ff42a3ec17624a612db748205 kde-l10n-hi-4.2.1.tar.bz2 +fe62f86cea5b6022b40650299ed5223c kde-l10n-hu-4.2.1.tar.bz2 +5f366b474472536371baf9890458f1a0 kde-l10n-it-4.2.1.tar.bz2 +f43e96ea7eba05616b25145cf3e26e9a kde-l10n-ja-4.2.1.tar.bz2 +e32ff330ab1caa8cc45e6474bda42fc9 kde-l10n-kk-4.2.1.tar.bz2 +3db01f4d93ef17a03173e2c0b4693889 kde-l10n-km-4.2.1.tar.bz2 +a05b21792fb0a2dc032454852a1d75e6 kde-l10n-ko-4.2.1.tar.bz2 +d065d40014e1a4a8d120b4c60ac4e298 kde-l10n-ku-4.2.1.tar.bz2 +e10ac0d7d88183849a1a811dd1dc4191 kde-l10n-lt-4.2.1.tar.bz2 +2591ad3682547ad5c5ddce2d99644325 kde-l10n-lv-4.2.1.tar.bz2 +c02330d7c1de2386dca89f9c5f4e124e kde-l10n-mk-4.2.1.tar.bz2 +27d628c4230b378bdbe5ac74b1fd7611 kde-l10n-ml-4.2.1.tar.bz2 +e4b6d5a8f7a6acb46c6493986deb2fc0 kde-l10n-nb-4.2.1.tar.bz2 +6b3cd678e8d2bfdb3b3b28d1dbc17c9a kde-l10n-nds-4.2.1.tar.bz2 +c5612a215db0b13b0cfd5b17e337300e kde-l10n-nl-4.2.1.tar.bz2 +80a3b5932356f21a8b9068ca40f7e0c1 kde-l10n-nn-4.2.1.tar.bz2 +385983a3584a639c91f0c489140e9d28 kde-l10n-pa-4.2.1.tar.bz2 +6cc2883667a293f7db927fd076623f93 kde-l10n-pl-4.2.1.tar.bz2 +55e15795d4901701b7deab813857ec06 kde-l10n-pt-4.2.1.tar.bz2 +a77c500292a1615f77a519d84d6f5a7c kde-l10n-pt_BR-4.2.1.tar.bz2 +770d39e08471b0fe91762dbee93d6d00 kde-l10n-ru-4.2.1.tar.bz2 +d643261b6b97a587a9d3fc682f4b01b0 kde-l10n-sl-4.2.1.tar.bz2 +6ec221411c0e338bb25234c95abd3045 kde-l10n-sr-4.2.1.tar.bz2 +4f2a5b6ee87c129499350418d1a0a17e kde-l10n-sv-4.2.1.tar.bz2 +62c1114df471bc35e05e2980e2c12b47 kde-l10n-th-4.2.1.tar.bz2 +8ce5790512f818320804967a6e5c6204 kde-l10n-tr-4.2.1.tar.bz2 +40f6a3fd553144ccd8a576fed272fb6d kde-l10n-uk-4.2.1.tar.bz2 +9334b0cd1a718afb59b81906a677ac44 kde-l10n-wa-4.2.1.tar.bz2 +f3cbd496581e3acdaf5bb371549103ee kde-l10n-zh_CN-4.2.1.tar.bz2 +4b78c747661c0f1f7840f180b06e48a8 kde-l10n-zh_TW-4.2.1.tar.bz2 From timlau at fedoraproject.org Mon Mar 2 10:32:43 2009 From: timlau at fedoraproject.org (Tim Lauridsen) Date: Mon, 2 Mar 2009 10:32:43 +0000 (UTC) Subject: rpms/yum-utils/devel yum-utils.spec,1.56,1.57 Message-ID: <20090302103243.BB08670115@cvs1.fedora.phx.redhat.com> Author: timlau Update of /cvs/pkgs/rpms/yum-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19037 Modified Files: yum-utils.spec Log Message: Release 1.1.20-3 Index: yum-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- yum-utils.spec 2 Mar 2009 08:21:23 -0000 1.56 +++ yum-utils.spec 2 Mar 2009 10:32:13 -0000 1.57 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 1.1.20 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Development/Tools Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz @@ -21,9 +21,6 @@ %package -n yum-updateonboot Summary: Run yum update on system boot Group: System Environment/Base -Provides: yum-updateonboot -Obsoletes: yum-updateonboot < 1.1.20-0 -Conflicts: yum-updateonboot < 1.1.20-0 Requires: python, yum >= 2.4 Requires(pre): chkconfig Requires(post): chkconfig @@ -36,7 +33,7 @@ %package -n yum-plugin-changelog Summary: Yum plugin for viewing package changelogs before/after updating Group: System Environment/Base -Provides: yum-changelog +Provides: yum-changelog = %{version}-%{release} Obsoletes: yum-changelog < 1.1.20-0 Conflicts: yum-changelog < 1.1.20-0 Requires: yum >= 3.2.19 @@ -49,7 +46,7 @@ %package -n yum-plugin-fastestmirror Summary: Yum plugin which chooses fastest repository from a mirrorlist Group: System Environment/Base -Provides: yum-fastestmirror +Provides: yum-fastestmirror = %{version}-%{release} Obsoletes: yum-fastestmirror < 1.1.20-0 Conflicts: yum-fastestmirror < 1.1.20-0 Requires: yum >= 3.0 @@ -61,7 +58,7 @@ %package -n yum-plugin-protectbase Summary: Yum plugin to protect packages from certain repositories. Group: System Environment/Base -Provides: yum-protectbase +Provides: yum-protectbase = %{version}-%{release} Obsoletes: yum-protectbase < 1.1.20-0 Conflicts: yum-protectbase < 1.1.20-0 Requires: yum >= 3.0 @@ -74,7 +71,7 @@ %package -n yum-plugin-versionlock Summary: Yum plugin to lock specified packages from being updated Group: System Environment/Base -Provides: yum-versionlock +Provides: yum-versionlock = %{version}-%{release} Obsoletes: yum-versionlock < 1.1.20-0 Conflicts: yum-versionlock < 1.1.20-0 Requires: yum >= 3.0 @@ -88,7 +85,7 @@ %package -n yum-plugin-tsflags Summary: Yum plugin to add tsflags by a commandline option Group: System Environment/Base -Provides: yum-tsflags +Provides: yum-tsflags = %{version}-%{release} Obsoletes: yum-tsflags < 1.1.20-0 Conflicts: yum-tsflags < 1.1.20-0 Requires: yum >= 3.0 @@ -100,7 +97,7 @@ %package -n yum-plugin-downloadonly Summary: Yum plugin to add downloadonly command option Group: System Environment/Base -Provides: yum-downloadonly +Provides: yum-downloadonly = %{version}-%{release} Obsoletes: yum-downloadonly < 1.1.20-0 Conflicts: yum-downloadonly < 1.1.20-0 Requires: yum >= 3.0 @@ -112,7 +109,7 @@ %package -n yum-plugin-allowdowngrade Summary: Yum plugin to enable manual downgrading of packages Group: System Environment/Base -Provides: yum-allowdowngrade +Provides: yum-allowdowngrade = %{version}-%{release} Obsoletes: yum-allowdowngrade < 1.1.20-0 Conflicts: yum-allowdowngrade < 1.1.20-0 Requires: yum >= 3.0 @@ -124,7 +121,7 @@ %package -n yum-plugin-priorities Summary: plugin to give priorities to packages from different repos Group: System Environment/Base -Provides: yum-priorities +Provides: yum-priorities = %{version}-%{release} Obsoletes: yum-priorities < 1.1.20-0 Conflicts: yum-priorities < 1.1.20-0 Requires: yum >= 3.0 @@ -137,7 +134,7 @@ %package -n yum-plugin-refresh-updatesd Summary: Tell yum-updatesd to check for updates when yum exits Group: System Environment/Base -Provides: yum-refresh-updatesd +Provides: yum-refresh-updatesd = %{version}-%{release} Obsoletes: yum-refresh-updatesd < 1.1.20-0 Conflicts: yum-refresh-updatesd < 1.1.20-0 Requires: yum >= 3.0 @@ -151,7 +148,7 @@ %package -n yum-plugin-merge-conf Summary: Yum plugin to merge configuration changes when installing packages Group: System Environment/Base -Provides: yum-merge-conf +Provides: yum-merge-conf = %{version}-%{release} Obsoletes: yum-merge-conf < 1.1.20-0 Conflicts: yum-merge-conf < 1.1.20-0 Requires: yum >= 3.0 @@ -164,7 +161,7 @@ %package -n yum-plugin-security Summary: Yum plugin to enable security filters Group: System Environment/Base -Provides: yum-security +Provides: yum-security = %{version}-%{release} Obsoletes: yum-security < 1.1.20-0 Conflicts: yum-security < 1.1.20-0 Requires: yum >= 3.2.18 @@ -178,7 +175,7 @@ %package -n yum-plugin-protect-packages Summary: Yum plugin to prevents Yum from removing itself and other protected packages Group: System Environment/Base -Provides: yum-protect-packages +Provides: yum-protect-packages = %{version}-%{release} Obsoletes: yum-protect-packages < 1.1.20-0 Conflicts: yum-protect-packages < 1.1.20-0 Requires: yum >= 3.0 @@ -193,7 +190,7 @@ %package -n yum-plugin-basearchonly Summary: Yum plugin to let Yum install only basearch packages. Group: System Environment/Base -Provides: yum-basearchonly +Provides: yum-basearchonly = %{version}-%{release} Obsoletes: yum-basearchonly < 1.1.20-0 Conflicts: yum-basearchonly < 1.1.20-0 Requires: yum >= 3.0 @@ -207,7 +204,7 @@ %package -n yum-plugin-upgrade-helper Summary: Yum plugin to help upgrades to the next distribution version Group: System Environment/Base -Provides: yum-upgrade-helper +Provides: yum-upgrade-helper = %{version}-%{release} Obsoletes: yum-upgrade-helper < 1.1.20-0 Conflicts: yum-upgrade-helper < 1.1.20-0 Requires: yum >= 3.0 @@ -219,7 +216,7 @@ %package -n yum-plugin-aliases Summary: Yum plugin to enable aliases filters Group: System Environment/Base -Provides: yum-aliases +Provides: yum-aliases = %{version}-%{release} Obsoletes: yum-aliases < 1.1.20-0 Conflicts: yum-aliases < 1.1.20-0 Requires: yum >= 3.0.5 @@ -231,7 +228,7 @@ %package -n yum-plugin-list-data Summary: Yum plugin to list aggregate package data Group: System Environment/Base -Provides: yum-list-data +Provides: yum-list-data = %{version}-%{release} Obsoletes: yum-list-data < 1.1.20-0 Conflicts: yum-list-data < 1.1.20-0 Requires: yum >= 3.0.5 @@ -244,7 +241,7 @@ %package -n yum-plugin-filter-data Summary: Yum plugin to list filter based on package data Group: System Environment/Base -Provides: yum-filter-data +Provides: yum-filter-data = %{version}-%{release} Obsoletes: yum-filter-data < 1.1.20-0 Conflicts: yum-filter-data < 1.1.20-0 Requires: yum >= 3.2.17 @@ -258,7 +255,7 @@ %package -n yum-plugin-tmprepo Summary: Yum plugin to add temporary repositories Group: System Environment/Base -Provides: yum-tmprepo +Provides: yum-tmprepo = %{version}-%{release} Obsoletes: yum-tmprepo < 1.1.20-0 Conflicts: yum-tmprepo < 1.1.20-0 Requires: yum >= 3.2.11 @@ -273,7 +270,7 @@ %package -n yum-plugin-verify Summary: Yum plugin to add verify command, and options Group: System Environment/Base -Provides: yum-verify +Provides: yum-verify = %{version}-%{release} Obsoletes: yum-verify < 1.1.20-0 Conflicts: yum-verify < 1.1.20-0 Requires: yum >= 3.2.12 @@ -286,7 +283,7 @@ %package -n yum-plugin-keys Summary: Yum plugin to deal with signing keys Group: System Environment/Base -Provides: yum-keys +Provides: yum-keys = %{version}-%{release} Obsoletes: yum-keys < 1.1.20-0 Conflicts: yum-keys < 1.1.20-0 Requires: yum >= 3.2.19 @@ -298,7 +295,7 @@ %package -n yum-plugin-remove-with-leaves Summary: Yum plugin to remove dependencies which are no longer used because of a removal Group: System Environment/Base -Provides: yum-remove-with-leaves +Provides: yum-remove-with-leaves = %{version}-%{release} Obsoletes: yum-remove-with-leaves < 1.1.20-0 Conflicts: yum-remove-with-leaves < 1.1.20-0 Requires: yum >= 3.2.19 @@ -311,7 +308,7 @@ %package -n yum-plugin-post-transaction-actions Summary: Yum plugin to run arbitrary commands when certain pkgs are acted on Group: System Environment/Base -Provides: yum-post-transaction-actions +Provides: yum-post-transaction-actions = %{version}-%{release} Obsoletes: yum-post-transaction-actions < 1.1.20-0 Conflicts: yum-post-transaction-actions < 1.1.20-0 Requires: yum >= 3.2.19 @@ -334,7 +331,7 @@ %package -n yum-plugin-rpm-warm-cache Summary: Yum plugin to access the rpmdb files early to warm up access to the db Group: System Environment/Base -Provides: yum-rpm-warm-cache +Provides: yum-rpm-warm-cache = %{version}-%{release} Obsoletes: yum-rpm-warm-cache < 1.1.20-0 Conflicts: yum-rpm-warm-cache < 1.1.20-0 Requires: yum >= 3.2.19 @@ -594,8 +591,9 @@ %changelog -* Sun Mar 1 2009 Tim Lauridsen +* Mon Mar 2 2009 Tim Lauridsen - set yum require to 3.2.21 (the 3.2.21 in rawhide is patched to yum head, so it matches the need yum 3.2.22 code) +- Added versioned yum- to make rpm/yum happy. * Sun Mar 1 2009 Tim Lauridsen - mark as 1.1.20 From kwizart at fedoraproject.org Mon Mar 2 10:33:31 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 2 Mar 2009 10:33:31 +0000 (UTC) Subject: rpms/yafray/devel yafray-0.0.9-gcc44.patch, NONE, 1.1 yafray.spec, 1.7, 1.8 Message-ID: <20090302103331.0066A70115@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/yafray/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19229 Modified Files: yafray.spec Added Files: yafray-0.0.9-gcc44.patch Log Message: Fix for gcc44 yafray-0.0.9-gcc44.patch: --- NEW FILE yafray-0.0.9-gcc44.patch --- diff -up yafray/src/shaders/basictex.cc.gcc44 yafray/src/shaders/basictex.cc --- yafray/src/shaders/basictex.cc.gcc44 2009-03-02 11:26:49.000000000 +0100 +++ yafray/src/shaders/basictex.cc 2009-03-02 11:27:25.000000000 +0100 @@ -261,7 +261,7 @@ textureImage_t::textureImage_t(const cha intp_type = BICUBIC; // Load image, try to determine from extensions first - char *ext = strrchr(filename, '.'); + const char *ext = strrchr(filename, '.'); bool jpg_tried = false; bool tga_tried = false; bool hdr_tried = false; Index: yafray.spec =================================================================== RCS file: /cvs/pkgs/rpms/yafray/devel/yafray.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- yafray.spec 25 Feb 2009 18:03:36 -0000 1.7 +++ yafray.spec 2 Mar 2009 10:33:00 -0000 1.8 @@ -1,6 +1,6 @@ Name: yafray Version: 0.0.9 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Yet Another Free RAYtracer Group: Applications/Multimedia @@ -8,6 +8,7 @@ URL: http://www.yafray.org Source: http://www.yafray.org/sec/2/downloads/yafray-%{version}.tar.gz Patch0: yafray-0.0.9-gcc43.patch +Patch1: yafray-0.0.9-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel BuildRequires: libjpeg-devel @@ -26,6 +27,7 @@ %prep %setup -q -n %{name} %patch0 -p0 -b .gcc43 +%patch1 -p1 -b .gcc44 #sed -i "s|/usr/local|%{_prefix}|" linux-settings.py sed -i "s|flags='|flags='$RPM_OPT_FLAGS |" linux-settings.py sed -i "s|/lib|/%{_lib}|" linux-settings.py @@ -70,6 +72,9 @@ %changelog +* Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 0.0.9-9 +- Fix gcc44 + * Wed Feb 25 2009 Fedora Release Engineering - 0.0.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kraxel at fedoraproject.org Mon Mar 2 10:46:46 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Mon, 2 Mar 2009 10:46:46 +0000 (UTC) Subject: rpms/xen/devel xen-initscript-pvops.patch, NONE, 1.1 xen.spec, 1.230, 1.231 Message-ID: <20090302104646.E165A70115@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21503 Modified Files: xen.spec Added Files: xen-initscript-pvops.patch Log Message: fix xenstored init script for pv_ops kernel xen-initscript-pvops.patch: --- NEW FILE xen-initscript-pvops.patch --- pv_ops/dom0 kernel has xenfs -> mount it if needed. --- a/tools/examples/init.d/xenstored.orig 2009-02-26 16:01:57.000000000 +0100 +++ b/tools/examples/init.d/xenstored 2009-02-26 16:03:20.000000000 +0100 @@ -25,6 +25,9 @@ if [ ! -d /proc/xen ]; then exit 0 fi +if [ ! -f /proc/xen/capabilities ]; then + mount -t xenfs xen /proc/xen +fi if ! grep -q "control_d" /proc/xen/capabilities ; then exit 0 fi @@ -38,6 +41,7 @@ test -f /etc/sysconfig/xenstored && . /e start() { echo -n $"Starting xenstored daemon: " + rm -f /var/lib/xenstored/tdb /usr/sbin/xenstored --pid-file $XENSTORED_PID $XENSTORED_ARGS RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- xen.spec 27 Feb 2009 09:58:07 -0000 1.230 +++ xen.spec 2 Mar 2009 10:46:16 -0000 1.231 @@ -66,6 +66,7 @@ Source13: pciutils-2.2.9.tar.bz2 Source14: grub-0.97.tar.gz Patch1: xen-initscript.patch +Patch2: xen-initscript-pvops.patch Patch8: xen-xenstore-cli.patch Patch13: xen-dumpdir.patch Patch14: xen-net-disable-bridge-by-default.patch @@ -166,6 +167,7 @@ %prep %setup -q -n %{directory_tag} %patch1 -p1 +%patch2 -p1 %patch8 -p1 %patch13 -p1 @@ -497,6 +499,9 @@ %{_libdir}/*.a %changelog +* Mon Mar 2 2009 Gerd Hoffmann - 3.3.1-7 +- fix xenstored init script for pv_ops kernel. + * Fri Feb 27 2009 Gerd Hoffmann - 3.3.1-6 - fix xenstored crash. - backport qemu-unplug patch. From dnielsen at fedoraproject.org Mon Mar 2 10:48:36 2009 From: dnielsen at fedoraproject.org (David Nielsen) Date: Mon, 2 Mar 2009 10:48:36 +0000 (UTC) Subject: rpms/monsoon/F-10 import.log, NONE, 1.1 monsoon-0.20-handle-root-only-perm.patch, NONE, 1.1 monsoon-desktopfile.patch, NONE, 1.1 monsoon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090302104836.C134070115@cvs1.fedora.phx.redhat.com> Author: dnielsen Update of /cvs/pkgs/rpms/monsoon/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22061/F-10 Modified Files: .cvsignore sources Added Files: import.log monsoon-0.20-handle-root-only-perm.patch monsoon-desktopfile.patch monsoon.spec Log Message: Initial import --- NEW FILE import.log --- monsoon-0_20-2_fc10:F-10:monsoon-0.20-2.fc10.src.rpm:1235990824 monsoon-0.20-handle-root-only-perm.patch: --- NEW FILE monsoon-0.20-handle-root-only-perm.patch --- # http://anonsvn.mono-project.com/viewvc?view=rev&revision=127458 diff -uraN monsoon-0.20.orig/Monsoon/TorrentController.cs monsoon-0.20/Monsoon/TorrentController.cs --- monsoon-0.20.orig/Monsoon/TorrentController.cs 2009-02-26 23:31:23.794260634 +0100 +++ monsoon-0.20/Monsoon/TorrentController.cs 2009-02-26 23:34:42.605013073 +0100 @@ -278,7 +278,7 @@ if (File.Exists (newPath)) File.Delete (newPath); - File.Copy (torrentPath, newPath, true); + File.WriteAllBytes (newPath, File.ReadAllBytes (torrentPath)); Torrent t = Torrent.Load (newPath); for (int i=0; i < torrent.Files.Length; i++) @@ -451,7 +451,7 @@ if (Path.GetDirectoryName (args.TorrentPath) != MainWindow.Preferences.TorrentStorageLocation) { logger.Info ("Copying: {0} to {1}", args.TorrentPath, newPath); - File.Copy(args.TorrentPath, newPath ,true); + File.WriteAllBytes (newPath, File.ReadAllBytes (args.TorrentPath)); if(prefSettings.RemoveOnImport) File.Delete(args.TorrentPath); } monsoon-desktopfile.patch: --- NEW FILE monsoon-desktopfile.patch --- # Make desktop file compliant with specification diff -uraN monsoon-0.15.orig/Monsoon/monsoon.desktop monsoon-0.15/Monsoon/monsoon.desktop --- monsoon-0.15.orig/Monsoon/monsoon.desktop 2008-07-12 03:39:53.000000000 +0200 +++ monsoon-0.15/Monsoon/monsoon.desktop 2008-07-12 03:40:28.000000000 +0200 @@ -6,13 +6,13 @@ Exec=monsoon Terminal=false Type=Application -Categories=GNOME;Internet;FileTransfer;Network; +Categories=GNOME;X-Internet;FileTransfer;Network; X-GNOME-Bugzilla-Bugzilla=Novell X-GNOME-Bugzilla-Product=Mono:Tools X-GNOME-Bugzilla-Component=Monsoon X-Desktop-File-Install-Version=0.9 OnlyShowIn=GNOME; Name[en_GB]=Monsoon -Icon=stock_weather-showers.png +Icon=stock_weather-showers GenericName=BitTorrent Client MimeType=application/x-bittorrent; --- NEW FILE monsoon.spec --- %define debug_package %{nil} Name: monsoon Version: 0.20 Release: 2%{?dist} Summary: Bittorrent client based on MonoTorrent Group: Development/Languages License: MIT URL: http://www.monsoon-project.org Source0: http://www.monsoon-project.org/jaws/data/files/%{name}-%{version}.tar.gz Patch0: monsoon-desktopfile.patch Patch1: monsoon-0.20-handle-root-only-perm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ndesk-dbus-glib-devel, monotorrent-devel >= 0.70, mono-nat-devel >= 1.0, mono-devel, gtk-sharp2-devel, gnome-sharp-devel, desktop-file-utils, gettext-devel, perl-XML-Parser, intltool # Bug 241850 - no Mono on pp64 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha %description Monsoon is a Bittorrent client written in Mono and GTK# %prep %setup -q %patch0 -p1 -b .patch %patch1 -p1 -b .patch %build %configure make %{?_smp_mflags} %install %{__rm} -rf %{buildroot} make DESTDIR=%{buildroot} install desktop-file-install --vendor gnome --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/monsoon.desktop %find_lang %{name} %clean %{__rm} -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING README %{_bindir}/monsoon %{_libdir}/monsoon/ %{_datadir}/applications/ %changelog * Fri Feb 27 2009 David Nielsen - 0.20-2 - Disable ppc due to build error * Fri Feb 20 2009 David Nielsen - 0.20-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/monsoon/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Feb 2009 00:18:12 -0000 1.1 +++ .cvsignore 2 Mar 2009 10:48:06 -0000 1.2 @@ -0,0 +1 @@ +monsoon-0.20.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/monsoon/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Feb 2009 00:18:12 -0000 1.1 +++ sources 2 Mar 2009 10:48:06 -0000 1.2 @@ -0,0 +1 @@ +1530450ee43d6103c063ea7d940854a9 monsoon-0.20.tar.gz From kraxel at fedoraproject.org Mon Mar 2 10:52:29 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Mon, 2 Mar 2009 10:52:29 +0000 (UTC) Subject: rpms/xen/devel xen.spec,1.231,1.232 Message-ID: <20090302105229.5235D70115@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23676 Modified Files: xen.spec Log Message: bump release Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- xen.spec 2 Mar 2009 10:46:16 -0000 1.231 +++ xen.spec 2 Mar 2009 10:51:58 -0000 1.232 @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.3.1 -%define base_release 6 +%define base_release 7 # Hypervisor ABI %define hv_abi 3.3 From dnielsen at fedoraproject.org Mon Mar 2 10:52:49 2009 From: dnielsen at fedoraproject.org (David Nielsen) Date: Mon, 2 Mar 2009 10:52:49 +0000 (UTC) Subject: rpms/monsoon/F-9 import.log, NONE, 1.1 monsoon-0.20-handle-root-only-perm.patch, NONE, 1.1 monsoon-desktopfile.patch, NONE, 1.1 monsoon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090302105249.9014570115@cvs1.fedora.phx.redhat.com> Author: dnielsen Update of /cvs/pkgs/rpms/monsoon/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23628/F-9 Modified Files: .cvsignore sources Added Files: import.log monsoon-0.20-handle-root-only-perm.patch monsoon-desktopfile.patch monsoon.spec Log Message: initial import --- NEW FILE import.log --- monsoon-0_20-2_fc9:F-9:monsoon-0.20-2.fc9.src.rpm:1235991063 monsoon-0.20-handle-root-only-perm.patch: --- NEW FILE monsoon-0.20-handle-root-only-perm.patch --- # http://anonsvn.mono-project.com/viewvc?view=rev&revision=127458 diff -uraN monsoon-0.20.orig/Monsoon/TorrentController.cs monsoon-0.20/Monsoon/TorrentController.cs --- monsoon-0.20.orig/Monsoon/TorrentController.cs 2009-02-26 23:31:23.794260634 +0100 +++ monsoon-0.20/Monsoon/TorrentController.cs 2009-02-26 23:34:42.605013073 +0100 @@ -278,7 +278,7 @@ if (File.Exists (newPath)) File.Delete (newPath); - File.Copy (torrentPath, newPath, true); + File.WriteAllBytes (newPath, File.ReadAllBytes (torrentPath)); Torrent t = Torrent.Load (newPath); for (int i=0; i < torrent.Files.Length; i++) @@ -451,7 +451,7 @@ if (Path.GetDirectoryName (args.TorrentPath) != MainWindow.Preferences.TorrentStorageLocation) { logger.Info ("Copying: {0} to {1}", args.TorrentPath, newPath); - File.Copy(args.TorrentPath, newPath ,true); + File.WriteAllBytes (newPath, File.ReadAllBytes (args.TorrentPath)); if(prefSettings.RemoveOnImport) File.Delete(args.TorrentPath); } monsoon-desktopfile.patch: --- NEW FILE monsoon-desktopfile.patch --- # Make desktop file compliant with specification diff -uraN monsoon-0.15.orig/Monsoon/monsoon.desktop monsoon-0.15/Monsoon/monsoon.desktop --- monsoon-0.15.orig/Monsoon/monsoon.desktop 2008-07-12 03:39:53.000000000 +0200 +++ monsoon-0.15/Monsoon/monsoon.desktop 2008-07-12 03:40:28.000000000 +0200 @@ -6,13 +6,13 @@ Exec=monsoon Terminal=false Type=Application -Categories=GNOME;Internet;FileTransfer;Network; +Categories=GNOME;X-Internet;FileTransfer;Network; X-GNOME-Bugzilla-Bugzilla=Novell X-GNOME-Bugzilla-Product=Mono:Tools X-GNOME-Bugzilla-Component=Monsoon X-Desktop-File-Install-Version=0.9 OnlyShowIn=GNOME; Name[en_GB]=Monsoon -Icon=stock_weather-showers.png +Icon=stock_weather-showers GenericName=BitTorrent Client MimeType=application/x-bittorrent; --- NEW FILE monsoon.spec --- %define debug_package %{nil} Name: monsoon Version: 0.20 Release: 2%{?dist} Summary: Bittorrent client based on MonoTorrent Group: Development/Languages License: MIT URL: http://www.monsoon-project.org Source0: http://www.monsoon-project.org/jaws/data/files/%{name}-%{version}.tar.gz Patch0: monsoon-desktopfile.patch Patch1: monsoon-0.20-handle-root-only-perm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ndesk-dbus-glib-devel, monotorrent-devel >= 0.70, mono-nat-devel >= 1.0, mono-devel, gtk-sharp2-devel, gnome-sharp-devel, desktop-file-utils, gettext-devel, perl-XML-Parser, intltool # Bug 241850 - no Mono on pp64 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha %description Monsoon is a Bittorrent client written in Mono and GTK# %prep %setup -q %patch0 -p1 -b .patch %patch1 -p1 -b .patch %build %configure make %{?_smp_mflags} %install %{__rm} -rf %{buildroot} make DESTDIR=%{buildroot} install desktop-file-install --vendor gnome --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/monsoon.desktop %find_lang %{name} %clean %{__rm} -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING README %{_bindir}/monsoon %{_libdir}/monsoon/ %{_datadir}/applications/ %changelog * Fri Feb 27 2009 David Nielsen - 0.20-2 - Disable ppc due to build error * Fri Feb 20 2009 David Nielsen - 0.20-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/monsoon/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Feb 2009 00:18:12 -0000 1.1 +++ .cvsignore 2 Mar 2009 10:52:19 -0000 1.2 @@ -0,0 +1 @@ +monsoon-0.20.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/monsoon/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Feb 2009 00:18:12 -0000 1.1 +++ sources 2 Mar 2009 10:52:19 -0000 1.2 @@ -0,0 +1 @@ +1530450ee43d6103c063ea7d940854a9 monsoon-0.20.tar.gz From oliver at fedoraproject.org Mon Mar 2 10:57:22 2009 From: oliver at fedoraproject.org (Oliver Falk) Date: Mon, 2 Mar 2009 10:57:22 +0000 (UTC) Subject: rpms/postgresql/F-9 postgresql.spec,1.100,1.101 Message-ID: <20090302105722.77A0270115@cvs1.fedora.phx.redhat.com> Author: oliver Update of /cvs/pkgs/rpms/postgresql/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24814 Modified Files: postgresql.spec Log Message: * Do not run the selftest on alpha. We know about the problems, but cannot fix them ad hoc Index: postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/postgresql/F-9/postgresql.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- postgresql.spec 7 Feb 2009 06:12:44 -0000 1.100 +++ postgresql.spec 2 Mar 2009 10:56:52 -0000 1.101 @@ -76,6 +76,10 @@ %{!?pgfts:%define pgfts 1} %{!?runselftest:%define runselftest 1} +%ifarch alpha + %define runselftest 0 +%endif + # Python major version. %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} From oliver at fedoraproject.org Mon Mar 2 10:58:52 2009 From: oliver at fedoraproject.org (Oliver Falk) Date: Mon, 2 Mar 2009 10:58:52 +0000 (UTC) Subject: rpms/postgresql/F-10 postgresql.spec,1.104,1.105 Message-ID: <20090302105852.0FE6F70115@cvs1.fedora.phx.redhat.com> Author: oliver Update of /cvs/pkgs/rpms/postgresql/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25266 Modified Files: postgresql.spec Log Message: * Do not run the selftest on alpha. We know about the problems, but cannot fix them ad hoc Index: postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/postgresql/F-10/postgresql.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- postgresql.spec 7 Feb 2009 06:11:19 -0000 1.104 +++ postgresql.spec 2 Mar 2009 10:58:21 -0000 1.105 @@ -76,6 +76,10 @@ %{!?pgfts:%define pgfts 1} %{!?runselftest:%define runselftest 1} +%ifarch alpha + %define runselftest 0 +%endif + # Python major version. %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} From msivak at fedoraproject.org Mon Mar 2 11:12:20 2009 From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=) Date: Mon, 2 Mar 2009 11:12:20 +0000 (UTC) Subject: rpms/python-cryptsetup/devel .cvsignore, 1.3, 1.4 python-cryptsetup.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090302111221.18CF770115@cvs1.fedora.phx.redhat.com> Author: msivak Update of /cvs/extras/rpms/python-cryptsetup/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27772 Modified Files: .cvsignore python-cryptsetup.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Feb 2009 14:28:37 -0000 1.3 +++ .cvsignore 2 Mar 2009 11:11:49 -0000 1.4 @@ -1 +1 @@ -python-cryptsetup-0.0.2.tar.bz2 +python-cryptsetup-0.0.3.tar.bz2 Index: python-cryptsetup.spec =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/python-cryptsetup.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-cryptsetup.spec 23 Feb 2009 14:28:37 -0000 1.2 +++ python-cryptsetup.spec 2 Mar 2009 11:11:49 -0000 1.3 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-cryptsetup -Version: 0.0.2 +Version: 0.0.3 Release: 1%{?dist} Summary: Python bindings for cryptsetup @@ -42,6 +42,10 @@ %doc selftest.py %changelog +* Mon Mar 01 2009 Martin Sivak - 0.0.3-1 +- Improve documentation +- luksFormat now accepts keyfile argument + * Mon Feb 23 2009 Martin Sivak - 0.0.2-1 - Throw a runtime exception when buildvalue problem is encountered Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Feb 2009 14:28:37 -0000 1.3 +++ sources 2 Mar 2009 11:11:49 -0000 1.4 @@ -1 +1 @@ -6f62c3b97528b86d75ca75e075fe4323 python-cryptsetup-0.0.2.tar.bz2 +7e91efef01f32760d76ea80e3200ed2b python-cryptsetup-0.0.3.tar.bz2 From monnerat at fedoraproject.org Mon Mar 2 11:33:08 2009 From: monnerat at fedoraproject.org (Patrick Monnerat) Date: Mon, 2 Mar 2009 11:33:08 +0000 (UTC) Subject: rpms/insight/devel insight.desktop,1.1,1.2 insight.spec,1.3,1.4 Message-ID: <20090302113309.62C4B70115@cvs1.fedora.phx.redhat.com> Author: monnerat Update of /cvs/pkgs/rpms/insight/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5367 Modified Files: insight.desktop insight.spec Log Message: * Mon Mar 2 2009 Patrick Monnerat 6.8-7 - Removed libXft-devel build requirement. - .desktop file categories fixed. Index: insight.desktop =================================================================== RCS file: /cvs/pkgs/rpms/insight/devel/insight.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- insight.desktop 15 Oct 2008 09:26:53 -0000 1.1 +++ insight.desktop 2 Mar 2009 11:32:36 -0000 1.2 @@ -7,4 +7,4 @@ Icon=insight Terminal=false Type=Application -Categories=Application;Development; +Categories=Development;Debugger; Index: insight.spec =================================================================== RCS file: /cvs/pkgs/rpms/insight/devel/insight.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- insight.spec 25 Feb 2009 07:31:01 -0000 1.3 +++ insight.spec 2 Mar 2009 11:32:37 -0000 1.4 @@ -1,6 +1,6 @@ Name: insight Version: 6.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Graphical debugger based on GDB License: GPLv3+ Group: Development/Debuggers @@ -34,8 +34,6 @@ BuildRequires: desktop-file-utils BuildRequires: automake BuildRequires: autoconf -# The requirement below should be suppressed when tk-devel will do it. -BuildRequires: libXft-devel %description Insight is a tight graphical user interface to GDB written in Tcl/Tk. @@ -214,11 +212,15 @@ #------------------------------------------------------------------------------- %changelog +#------------------------------------------------------------------------------- + +* Mon Mar 2 2009 Patrick Monnerat 6.8-7 +- Removed libXft-devel build requirement. +- .desktop file categories fixed. + * Tue Feb 24 2009 Fedora Release Engineering - 6.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -#------------------------------------------------------------------------------- - * Wed Feb 18 2009 Patrick Monnerat 6.8-5 - Patch "gcc44" to make it compilable with gcc 4.4. - Build converts image format using ImageMagick instead of gif2png. From dhavalgiani at fedoraproject.org Mon Mar 2 11:33:30 2009 From: dhavalgiani at fedoraproject.org (Dhaval Giani) Date: Mon, 2 Mar 2009 11:33:30 +0000 (UTC) Subject: rpms/libcgroup/devel 01-fedora-fix-build.patch, NONE, 1.1 02-fedora-fix-initscripts.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 libcgroup.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <20090302113330.5A06E70115@cvs1.fedora.phx.redhat.com> Author: dhavalgiani Update of /cvs/pkgs/rpms/libcgroup/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13537 Modified Files: .cvsignore libcgroup.spec sources Added Files: 01-fedora-fix-build.patch 02-fedora-fix-initscripts.patch Log Message: Update to latest upstream, v0.33 01-fedora-fix-build.patch: --- NEW FILE 01-fedora-fix-build.patch --- --- Makefile.in | 1 + 1 file changed, 1 insertion(+) Index: v0.33/Makefile.in =================================================================== --- v0.33.orig/Makefile.in +++ v0.33/Makefile.in @@ -26,6 +26,7 @@ datarootdir=@datarootdir@ mandir=@mandir@ INSTALL=install INSTALL_DATA=install -m 644 +PACKAGE_VERSION=@PACKAGE_VERSION@ CFLAGS=@CFLAGS@ $(INC) VERSION=1 02-fedora-fix-initscripts.patch: --- NEW FILE 02-fedora-fix-initscripts.patch --- --- scripts/init.d/cgconfig | 2 +- scripts/init.d/cgred | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) Index: v0.33/scripts/init.d/cgconfig =================================================================== --- v0.33.orig/scripts/init.d/cgconfig +++ v0.33/scripts/init.d/cgconfig @@ -44,7 +44,7 @@ servicename=cgconfig # # Source LSB routines # -. /lib/lsb/init-functions +. /etc/rc.d/init.d/functions parse_mounts() { while read name mountpt fs opts other Index: v0.33/scripts/init.d/cgred =================================================================== --- v0.33.orig/scripts/init.d/cgred +++ v0.33/scripts/init.d/cgred @@ -43,7 +43,6 @@ CGRED_BIN=${exec_prefix}/${bindir}/cgrul # Source function library & LSB routines . /etc/rc.d/init.d/functions -. /lib/lsb/init-functions # Read in configuration options. if [ -f "/etc/sysconfig/cgred.conf" ] ; then Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libcgroup/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 29 Dec 2008 13:51:46 -0000 1.7 +++ .cvsignore 2 Mar 2009 11:32:59 -0000 1.8 @@ -1,2 +1 @@ -libcgroup-0.32.2.tar.bz2 -fix_makefile_dep.patch +libcgroup-0.33.tar.bz2 Index: libcgroup.spec =================================================================== RCS file: /cvs/pkgs/rpms/libcgroup/devel/libcgroup.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libcgroup.spec 25 Feb 2009 14:04:17 -0000 1.9 +++ libcgroup.spec 2 Mar 2009 11:32:59 -0000 1.10 @@ -1,12 +1,13 @@ Name: libcgroup Summary: Tools and libraries to control and monitor control groups Group: Development/Libraries -Version: 0.32.2 -Release: 4%{?dist} +Version: 0.33 +Release: 1%{?dist} License: LGPLv2+ URL: http://libcg.sourceforge.net/ Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2 -Patch0: http://downloads.sourceforge.net/libcg/fix_makefile_dep.patch +Patch0: http://downloads.sourceforge.net/libcg/01-fedora-fix-build.patch +Patch1: http://downloads.sourceforge.net/libcg/02-fedora-fix-initscripts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: byacc BuildRequires: flex @@ -16,7 +17,6 @@ Requires(post): initscripts Requires(preun): initscripts Requires(preun): chkconfig -Requires: redhat-lsb %description Control groups infrastructure. The tools and library help manipulate, control, @@ -35,6 +35,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure @@ -47,6 +48,13 @@ mkdir -p $RPM_BUILD_ROOT/%{_initrddir} cp scripts/init.d/cgconfig $RPM_BUILD_ROOT/%{_initrddir}/cgconfig cp scripts/init.d/cgred $RPM_BUILD_ROOT/%{_initrddir}/cgred +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig +cp samples/cgred.conf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cgred.conf +cp samples/cgconfig.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgconfig.conf +cp samples/cgrules.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgrules.conf +mkdir -p $RPM_BUILD_ROOT/%{_lib}/security/ +mv $RPM_BUILD_ROOT/%{_libdir}/security/pam_cgroup.so \ + $RPM_BUILD_ROOT/%{_lib}/security/ %clean @@ -70,14 +78,21 @@ %files %defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/sysconfig/cgred.conf +%config(noreplace) %{_sysconfdir}/cgconfig.conf +%config(noreplace) %{_sysconfdir}/cgrules.conf %{_libdir}/libcgroup-%{version}.so %{_libdir}/libcgroup.so.* %{_bindir}/cgexec %{_bindir}/cgclassify %{_sbindir}/cgconfigparser %{_bindir}/cgrulesengd +%attr(0644, root, root) %{_mandir}/man1/* +%attr(0644, root, root) %{_mandir}/man5/* +%attr(0644, root, root) %{_mandir}/man8/* %attr(0755,root,root) %{_initrddir}/cgconfig %attr(0755,root,root) %{_initrddir}/cgred +%attr(0755,root,root) /%{_lib}/security/pam_cgroup.so %doc COPYING INSTALL README_daemon @@ -89,6 +104,8 @@ %changelog +* Mon Mar 02 2009 Dhaval Giani 0.33-1 +- Update to latest upstream * Wed Feb 25 2009 Fedora Release Engineering - 0.32.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libcgroup/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 Dec 2008 13:51:46 -0000 1.7 +++ sources 2 Mar 2009 11:32:59 -0000 1.8 @@ -1,2 +1 @@ -ee971527040433ce7e5bcbd8f9b58134 libcgroup-0.32.2.tar.bz2 -c9f1eef2c91d91da508dbfb2cc2eed2f fix_makefile_dep.patch +d67de6001bff6c6d086d6ccb7757a5dc libcgroup-0.33.tar.bz2 From msivak at fedoraproject.org Mon Mar 2 11:36:30 2009 From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=) Date: Mon, 2 Mar 2009 11:36:30 +0000 (UTC) Subject: rpms/python-cryptsetup/devel .cvsignore, 1.4, 1.5 python-cryptsetup.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <20090302113630.60BF370115@cvs1.fedora.phx.redhat.com> Author: msivak Update of /cvs/extras/rpms/python-cryptsetup/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19235 Modified Files: .cvsignore python-cryptsetup.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Mar 2009 11:11:49 -0000 1.4 +++ .cvsignore 2 Mar 2009 11:35:59 -0000 1.5 @@ -1 +1 @@ -python-cryptsetup-0.0.3.tar.bz2 +python-cryptsetup-0.0.4.tar.bz2 Index: python-cryptsetup.spec =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/python-cryptsetup.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-cryptsetup.spec 2 Mar 2009 11:11:49 -0000 1.3 +++ python-cryptsetup.spec 2 Mar 2009 11:35:59 -0000 1.4 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-cryptsetup -Version: 0.0.3 +Version: 0.0.4 Release: 1%{?dist} Summary: Python bindings for cryptsetup @@ -42,6 +42,9 @@ %doc selftest.py %changelog +* Mon Mar 01 2009 Martin Sivak - 0.0.4-1 +- add prepare_passphrase_file method + * Mon Mar 01 2009 Martin Sivak - 0.0.3-1 - Improve documentation - luksFormat now accepts keyfile argument Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Mar 2009 11:11:49 -0000 1.4 +++ sources 2 Mar 2009 11:35:59 -0000 1.5 @@ -1 +1 @@ -7e91efef01f32760d76ea80e3200ed2b python-cryptsetup-0.0.3.tar.bz2 +0134e1e32df74eee4ef3b9ae6649672c python-cryptsetup-0.0.4.tar.bz2 From dnielsen at fedoraproject.org Mon Mar 2 11:47:56 2009 From: dnielsen at fedoraproject.org (David Nielsen) Date: Mon, 2 Mar 2009 11:47:56 +0000 (UTC) Subject: rpms/mono-zeroconf/F-10 mono-zeroconf-0.7.6-libdir.patch, NONE, 1.1 import.log, 1.1, 1.2 mono-zeroconf.spec, 1.6, 1.7 zeroconf-076-config.patch, 1.1, NONE Message-ID: <20090302114756.B037970115@cvs1.fedora.phx.redhat.com> Author: dnielsen Update of /cvs/pkgs/rpms/mono-zeroconf/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21255/F-10 Modified Files: import.log mono-zeroconf.spec Added Files: mono-zeroconf-0.7.6-libdir.patch Removed Files: zeroconf-076-config.patch Log Message: Fix libdir patch Remove unmaintainable sed magic Rebuild for #487155 mono-zeroconf-0.7.6-libdir.patch: --- NEW FILE mono-zeroconf-0.7.6-libdir.patch --- # Fix libdir diff -uraN mono-zeroconf-0.7.6.orig/configure mono-zeroconf-0.7.6/configure --- mono-zeroconf-0.7.6.orig/configure 2009-03-02 12:30:24.573870303 +0100 +++ mono-zeroconf-0.7.6/configure 2009-03-02 12:32:34.966899234 +0100 @@ -3100,8 +3100,8 @@ { (exit 1); exit 1; }; } fi -GACUTIL_FLAGS='-package $(PACKAGE) -root $(DESTDIR)$(prefix)/lib' -GACUTIL_POLICY_FLAGS='-root $(DESTDIR)$(prefix)/lib' +GACUTIL_FLAGS='-package $(PACKAGE) -root $(DESTDIR)$(libdir)' +GACUTIL_POLICY_FLAGS='-root $(DESTDIR)$(libdir)' diff -uraN mono-zeroconf-0.7.6.orig/configure.ac mono-zeroconf-0.7.6/configure.ac --- mono-zeroconf-0.7.6.orig/configure.ac 2009-03-02 12:30:24.569870285 +0100 +++ mono-zeroconf-0.7.6/configure.ac 2009-03-02 12:31:45.105899220 +0100 @@ -33,8 +33,8 @@ AC_MSG_ERROR([You need to install al]) fi -GACUTIL_FLAGS='-package $(PACKAGE) -root $(DESTDIR)$(prefix)/lib' -GACUTIL_POLICY_FLAGS='-root $(DESTDIR)$(prefix)/lib' +GACUTIL_FLAGS='-package $(PACKAGE) -root $(DESTDIR)$(libdir)' +GACUTIL_POLICY_FLAGS='-root $(DESTDIR)$(libdir)' AC_SUBST(GACUTIL_FLAGS) AC_SUBST(GACUTIL_POLICY_FLAGS) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/mono-zeroconf/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Aug 2008 17:41:05 -0000 1.1 +++ import.log 2 Mar 2009 11:47:24 -0000 1.2 @@ -1 +1,2 @@ mono-zeroconf-0_7_6-3_fc10:HEAD:mono-zeroconf-0.7.6-3.fc10.src.rpm:1219772405 +mono-zeroconf-0_7_6-4_fc10:F-10:mono-zeroconf-0.7.6-4.fc10.src.rpm:1235994369 Index: mono-zeroconf.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono-zeroconf/F-10/mono-zeroconf.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mono-zeroconf.spec 26 Aug 2008 17:41:05 -0000 1.6 +++ mono-zeroconf.spec 2 Mar 2009 11:47:24 -0000 1.7 @@ -2,13 +2,13 @@ Name: mono-zeroconf Version: 0.7.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Mono-zeroconf namespace Group: Development/Languages License: MIT URL: http://banshee-project.org/files/mono-zeroconf Source0: %{name}-%{version}.tar.bz2 -Patch0: zeroconf-076-config.patch +Patch0: mono-zeroconf-0.7.6-libdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel, avahi-sharp, monodoc-devel Requires: monodoc @@ -29,10 +29,7 @@ %prep %setup -q -# sed magic... -sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH0} -%patch0 -p1 -b .original -sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH0} +%patch0 -p1 -b .patch %build %configure @@ -60,6 +57,10 @@ %{_libdir}/pkgconfig/mono-zeroconf.pc %changelog +* Mon Mar 02 2009 David Nielsen - 0.7.6-4 +- Rebuild for #487155 +- Update libdir fixes + * Sun Aug 17 2008 Paul F. Johnson 0.7.6-3 - added autoreconf --- zeroconf-076-config.patch DELETED --- From caolanm at fedoraproject.org Mon Mar 2 11:56:06 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 2 Mar 2009 11:56:06 +0000 (UTC) Subject: rpms/openoffice.org/devel .cvsignore, 1.205, 1.206 openoffice.org.spec, 1.1837, 1.1838 sources, 1.345, 1.346 Message-ID: <20090302115606.21A6870115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23508 Modified Files: .cvsignore openoffice.org.spec sources Log Message: Resolves: rhbz#488053 Hindi Translations Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- .cvsignore 2 Mar 2009 08:59:50 -0000 1.205 +++ .cvsignore 2 Mar 2009 11:55:35 -0000 1.206 @@ -12,3 +12,4 @@ mr-IN_DEV300_m40.sdf te-IN_DEV300_m40.sdf kn-IN_DEV300_m40.sdf +hi-IN-D300-m40.tar.gz Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1837 retrieving revision 1.1838 diff -u -r1.1837 -r1.1838 --- openoffice.org.spec 2 Mar 2009 08:59:50 -0000 1.1837 +++ openoffice.org.spec 2 Mar 2009 11:55:35 -0000 1.1838 @@ -56,6 +56,7 @@ Source12: http://www.openoffice.org/nonav/issues/showattachment.cgi/60507/mr-IN_DEV300_m40.sdf Source13: http://www.openoffice.org/nonav/issues/showattachment.cgi/60513/te-IN_DEV300_m40.sdf Source14: http://www.openoffice.org/nonav/issues/showattachment.cgi/60506/kn-IN_DEV300_m40.sdf +Source15: http://indian.googlecode.com/files/hi-IN-D300-m40.tar.gz BuildRequires: zip, findutils, autoconf, flex, bison, icu, gcc-c++ BuildRequires: binutils, java-devel, boost-devel, zlib-devel, vigra-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc @@ -1682,6 +1683,9 @@ # i99659 cp %{SOURCE14} . localize -m -x -l kn-IN -f kn-IN_DEV300_m40.sdf +# i99657 +tar xf %{SOURCE15} +localize -m -x -l hi-IN -f hi-IN-D300-m40/hi-IN-300m40.sdf cd ../.. #build OOo, on failure make a stab at debugging the crash if any, and @@ -4091,6 +4095,7 @@ %changelog * Mon Mar 02 2009 Caol??n McNamara - 1:3.1.0-3.3 - Resolves: rhbz#488021 Kannada Translations +- Resolves: rhbz#488053 Hindi Translations * Sat Feb 28 2009 Caol??n McNamara - 1:3.1.0-3.2 - Resolves: rhbz#487664 Marathi Translations Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.345 retrieving revision 1.346 diff -u -r1.345 -r1.346 --- sources 2 Mar 2009 08:59:51 -0000 1.345 +++ sources 2 Mar 2009 11:55:35 -0000 1.346 @@ -11,4 +11,5 @@ b6558e6e74c60dfd9fcd15a722188d45 mr-IN_DEV300_m40.sdf d826ee150349ee5fe4b43cdd7a130084 te-IN_DEV300_m40.sdf f457cdd91857701b1282bfffb0ec5e8a kn-IN_DEV300_m40.sdf +bdc3b2b8b90ac1879f216cfa3c50d7e1 hi-IN-D300-m40.tar.gz f4d811bf2c10fadf34b68805697e2b72 OOO310_m3.tar.bz2 From kwizart at fedoraproject.org Mon Mar 2 12:04:36 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 2 Mar 2009 12:04:36 +0000 (UTC) Subject: rpms/afflib/devel afflib-3.3.4-WCtype.patch, NONE, 1.1 afflib-3.3.4-gcc44.patch, NONE, 1.1 afflib.spec, 1.24, 1.25 afflib-3.0.1-WCtype.patch, 1.1, NONE Message-ID: <20090302120436.471AD70115@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/afflib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25047 Modified Files: afflib.spec Added Files: afflib-3.3.4-WCtype.patch afflib-3.3.4-gcc44.patch Removed Files: afflib-3.0.1-WCtype.patch Log Message: Fix for gcc44 afflib-3.3.4-WCtype.patch: --- NEW FILE afflib-3.3.4-WCtype.patch --- diff -up afflib-3.3.4/configure.ac.WCtype afflib-3.3.4/configure.ac --- afflib-3.3.4/configure.ac.WCtype 2008-09-29 21:45:05.000000000 +0200 +++ afflib-3.3.4/configure.ac 2009-03-02 11:58:36.000000000 +0100 @@ -101,6 +101,18 @@ AC_LANG_POP([C++]) +AS_IF([test "x$ac_afflib_enable_wide_character_type" != xno ], + [AC_DEFINE([HAVE_WIDE_CHARACTER_TYPE],[1],[Defines if wide character type should be used]) + AC_CHECK_FUNCS([btowc fgetws mbsinit mbsrtowcs swprintf wmain wmemchr wmemcmp wmemcpy wmemrchr wctob wcschr wcscmp wcscpy wcsdup wcslen wcsncmp wcsncpy wcsrchr wcsrtombs wcstol wcstoul]) + AC_CHECK_HEADERS([wchar.h], + [AC_DEFINE([HAVE_WCHAR_H],[1],[Define to 1 if you have the header file.]) + AC_SUBST([HAVE_WCHAR_H],[1])], + [AC_SUBST([HAVE_WCHAR_H],[0])]) + + AC_SUBST([HAVE_WIDE_CHARACTER_TYPE],[1])], + [AC_SUBST([HAVE_WIDE_CHARACTER_TYPE],[0]) + AC_SUBST([HAVE_WCHAR_H],[0])]) + ################################################################ ## LIBEWF support dnl Function to test if a libewf_get_media_size takes value as an argument afflib-3.3.4-gcc44.patch: --- NEW FILE afflib-3.3.4-gcc44.patch --- diff -up afflib-3.3.4/tools/afverify.cpp.gcc44 afflib-3.3.4/tools/afverify.cpp --- afflib-3.3.4/tools/afverify.cpp.gcc44 2008-07-21 06:25:29.000000000 +0200 +++ afflib-3.3.4/tools/afverify.cpp 2009-03-02 12:48:59.000000000 +0100 @@ -240,12 +240,16 @@ string get_xml_field(const char *buf,con int verify_bom_signature(AFFILE *af,const char *buf) { const char *cce = "\n"; - char *chain_end = strstr(buf,cce); + char *buf_tmp; + char *cce_tmp; + strcpy(buf_tmp, buf); + strcpy(cce_tmp, cce); + char *chain_end = strstr(buf_tmp,cce_tmp); if(!chain_end){ warn("end of chain XML can't be found\n"); return -1; // can't find it } - char *sig_start = chain_end + strlen(cce); + char *sig_start = chain_end + strlen(cce_tmp); BIO *seg = BIO_new_mem_buf((void *)buf,strlen(buf)); BIO_seek(seg,0); Index: afflib.spec =================================================================== RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- afflib.spec 24 Feb 2009 00:15:06 -0000 1.24 +++ afflib.spec 2 Mar 2009 12:04:05 -0000 1.25 @@ -1,15 +1,14 @@ -%define _default_patch_fuzz 2 - Name: afflib Version: 3.3.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz -Patch0: afflib-3.0.1-WCtype.patch +Patch0: afflib-3.3.4-WCtype.patch +Patch1: afflib-3.3.4-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -59,6 +58,7 @@ %prep %setup -q %patch0 -p1 -b .WCtype +%patch1 -p1 -b .gcc44 # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -68,7 +68,7 @@ # Autoreconf autoreconf -libtoolize +libtoolize --force %build @@ -123,6 +123,9 @@ %changelog +* Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 3.3.4-7 +- Fix for gcc44 + * Mon Feb 23 2009 Fedora Release Engineering - 3.3.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- afflib-3.0.1-WCtype.patch DELETED --- From mbarnes at fedoraproject.org Mon Mar 2 12:06:13 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 2 Mar 2009 12:06:13 +0000 (UTC) Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.34, 1.35 gnome-doc-utils.spec, 1.62, 1.63 sources, 1.34, 1.35 Message-ID: <20090302120613.943B670115@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/gnome-doc-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25406 Modified Files: .cvsignore gnome-doc-utils.spec sources Log Message: * Mon Mar 02 2009 Matthew Barnes - 0.15.2-1 - Update to 0.15.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 3 Feb 2009 05:08:05 -0000 1.34 +++ .cvsignore 2 Mar 2009 12:05:43 -0000 1.35 @@ -1 +1 @@ -gnome-doc-utils-0.15.1.tar.bz2 +gnome-doc-utils-0.15.2.tar.bz2 Index: gnome-doc-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- gnome-doc-utils.spec 24 Feb 2009 22:53:25 -0000 1.62 +++ gnome-doc-utils.spec 2 Mar 2009 12:05:43 -0000 1.63 @@ -1,8 +1,8 @@ ### Abstract ### Name: gnome-doc-utils -Version: 0.15.1 -Release: 3%{?dist} +Version: 0.15.2 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ and GFDL Group: Development/Tools Summary: Documentation utilities for GNOME @@ -100,6 +100,9 @@ %{_datadir}/xml/gnome %changelog +* Mon Mar 02 2009 Matthew Barnes - 0.15.2-1 +- Update to 0.15.2 + * Tue Feb 24 2009 Fedora Release Engineering - 0.15.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 3 Feb 2009 05:08:05 -0000 1.34 +++ sources 2 Mar 2009 12:05:43 -0000 1.35 @@ -1 +1 @@ -ddaa44de375f0b13e8e74bbaa1349bf5 gnome-doc-utils-0.15.1.tar.bz2 +29ab180fb58b0b5c98840b18d3a0d488 gnome-doc-utils-0.15.2.tar.bz2 From timlau at fedoraproject.org Mon Mar 2 12:15:57 2009 From: timlau at fedoraproject.org (Tim Lauridsen) Date: Mon, 2 Mar 2009 12:15:57 +0000 (UTC) Subject: rpms/python-iniparse/devel iniparse.patch, NONE, 1.1 python-iniparse.spec, 1.16, 1.17 Message-ID: <20090302121557.326A970115@cvs1.fedora.phx.redhat.com> Author: timlau Update of /cvs/pkgs/rpms/python-iniparse/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26998 Modified Files: python-iniparse.spec Added Files: iniparse.patch Log Message: Release 0.3.0-2 : Added patch to fix upstream regrestion iniparse.patch: --- NEW FILE iniparse.patch --- Index: iniparse/ini.py =================================================================== --- iniparse/ini.py (revision 111) +++ iniparse/ini.py (working copy) @@ -404,7 +404,7 @@ def make_comment(line): - return CommentLine(line.rstrip()) + return CommentLine(line.rstrip('\n')) def readline_iterator(f): @@ -578,11 +578,9 @@ if isinstance(lineobj, OptionLine): if pending_lines: - cur_option.extend(pending_lines) + cur_section.extend(pending_lines) pending_lines = [] - if pending_empty_lines: - optobj._compat_skip_empty_lines.add(cur_option_name) - pending_empty_lines = False + pending_empty_lines = False cur_option = LineContainer(lineobj) cur_section.add(cur_option) if self._optionxform: Index: python-iniparse.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-iniparse/devel/python-iniparse.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- python-iniparse.spec 28 Feb 2009 11:06:51 -0000 1.16 +++ python-iniparse.spec 2 Mar 2009 12:15:26 -0000 1.17 @@ -2,12 +2,14 @@ Name: python-iniparse Version: 0.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python Module for Accessing and Modifying Configuration Data in INI files Group: Development/Libraries License: MIT URL: http://code.google.com/p/iniparse/ Source0: http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz +Patch0: iniparse.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?fedora} >= 8 @@ -27,7 +29,8 @@ %prep %setup -q -n iniparse-%{version} - +%patch0 + %build %{__python} setup.py build @@ -51,6 +54,9 @@ %changelog +* Mon Mar 2 2009 Tim Lauridsen - 0.3.0-2 +- added patch from upstream to fix regrestion : + * Sat Feb 28 2009 Tim Lauridsen - 0.3.0-1 - Release 0.3.0 - Fix handling of continuation lines From caolanm at fedoraproject.org Mon Mar 2 12:22:04 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 2 Mar 2009 12:22:04 +0000 (UTC) Subject: rpms/autotrace/devel autotrace-0.31.1-GetOnePixel.patch, NONE, 1.1 autotrace.spec, 1.21, 1.22 Message-ID: <20090302122204.D711070115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/autotrace/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28085 Modified Files: autotrace.spec Added Files: autotrace-0.31.1-GetOnePixel.patch Log Message: Modify GetOnePixel usage to build against current ImageMagick api autotrace-0.31.1-GetOnePixel.patch: --- NEW FILE autotrace-0.31.1-GetOnePixel.patch --- diff -ru autotrace-0.31.1.orig/input-magick.c autotrace-0.31.1/input-magick.c --- autotrace-0.31.1.orig/input-magick.c 2009-03-02 12:08:45.000000000 +0000 +++ autotrace-0.31.1/input-magick.c 2009-03-02 12:12:21.000000000 +0000 @@ -83,7 +83,11 @@ for(j=0,runcount=0,point=0;jrows;j++) for(i=0;icolumns;i++) { +#if (MagickLibVersion < 0x0645) p=GetOnePixel(image,i,j); +#else + GetOnePixel(image,i,j,pixel); +#endif AT_BITMAP_BITS(bitmap)[point++]=pixel->red; /* if gray: red=green=blue */ if(np==3) { AT_BITMAP_BITS(bitmap)[point++]=pixel->green; Index: autotrace.spec =================================================================== RCS file: /cvs/pkgs/rpms/autotrace/devel/autotrace.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- autotrace.spec 24 Feb 2009 03:33:00 -0000 1.21 +++ autotrace.spec 2 Mar 2009 12:21:34 -0000 1.22 @@ -1,6 +1,6 @@ Name: autotrace Version: 0.31.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Utility for converting bitmaps to vector graphics @@ -20,6 +20,8 @@ #BuildRequires: pstoedit-devel BuildConflicts: pstoedit-devel +Patch0: autotrace-0.31.1-GetOnePixel.patch + %description AutoTrace is a program similar to CorelTrace or Adobe Streamline for converting bitmaps to vector graphics. @@ -43,7 +45,7 @@ %prep %setup -q - +%patch0 -p1 -b .GetOnePixel %build %configure @@ -86,6 +88,9 @@ %changelog +* Mon Mar 02 2009 Caol??n McNamara - 0.31.1-20 +- Modify GetOnePixel usage to build against current ImageMagick api + * Mon Feb 23 2009 Fedora Release Engineering - 0.31.1-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mbarnes at fedoraproject.org Mon Mar 2 12:25:13 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 2 Mar 2009 12:25:13 +0000 (UTC) Subject: rpms/yelp/devel .cvsignore, 1.47, 1.48 sources, 1.49, 1.50 yelp.spec, 1.151, 1.152 Message-ID: <20090302122513.28A2070115@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/yelp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29385 Modified Files: .cvsignore sources yelp.spec Log Message: * Mon Mar 02 2009 Matthew Barnes - 2.25.1-1 - Update to 2.25.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/yelp/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 22 Sep 2008 17:42:53 -0000 1.47 +++ .cvsignore 2 Mar 2009 12:24:42 -0000 1.48 @@ -1 +1 @@ -yelp-2.24.0.tar.bz2 +yelp-2.25.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/yelp/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 22 Sep 2008 17:42:53 -0000 1.49 +++ sources 2 Mar 2009 12:24:42 -0000 1.50 @@ -1 +1 @@ -1d308838bc6a492ac74ff89f58b0fc1b yelp-2.24.0.tar.bz2 +41f77e4048423dadf8db398b35dd52d7 yelp-2.25.1.tar.bz2 Index: yelp.spec =================================================================== RCS file: /cvs/pkgs/rpms/yelp/devel/yelp.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- yelp.spec 25 Feb 2009 18:09:58 -0000 1.151 +++ yelp.spec 2 Mar 2009 12:24:42 -0000 1.152 @@ -19,8 +19,8 @@ Summary: Help browser for the GNOME desktop Name: yelp -Version: 2.24.0 -Release: 6%{?dist} +Version: 2.25.1 +Release: 1%{?dist} Source: http://download.gnome.org/sources/yelp/2.24/%{name}-%{version}.tar.bz2 URL: http://live.gnome.org/Yelp # http://bugzilla.gnome.org/show_bug.cgi?id=319096 @@ -158,6 +158,9 @@ %{_datadir}/yelp %changelog +* Mon Mar 02 2009 Matthew Barnes - 2.25.1-1 +- Update to 2.25.1 + * Wed Feb 25 2009 Fedora Release Engineering - 2.24.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ovasik at fedoraproject.org Mon Mar 2 12:43:25 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Mon, 2 Mar 2009 12:43:25 +0000 (UTC) Subject: rpms/coreutils/devel coreutils-7.1-sort-endoffields.patch, 1.1, 1.2 coreutils-i18n.patch, 1.31, 1.32 coreutils.spec, 1.251, 1.252 Message-ID: <20090302124325.D1E2970115@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32696 Modified Files: coreutils-7.1-sort-endoffields.patch coreutils-i18n.patch coreutils.spec Log Message: fix sort bugs (including #485715) for multibyte locales coreutils-7.1-sort-endoffields.patch: Index: coreutils-7.1-sort-endoffields.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-7.1-sort-endoffields.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- coreutils-7.1-sort-endoffields.patch 25 Feb 2009 15:36:19 -0000 1.1 +++ coreutils-7.1-sort-endoffields.patch 2 Mar 2009 12:42:55 -0000 1.2 @@ -64,7 +64,18 @@ diff -urNp coreutils-7.1-orig/tests/misc/sort coreutils-7.1/tests/misc/sort --- coreutils-7.1-orig/tests/misc/sort 2009-01-27 22:11:25.000000000 +0100 +++ coreutils-7.1/tests/misc/sort 2009-02-25 16:21:48.000000000 +0100 -@@ -110,6 +110,8 @@ my @Tests = +@@ -24,6 +24,10 @@ my $prog = 'sort'; + # Turn off localization of executable's output. + @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + ++my $mb_locale = $ENV{LOCALE_FR_UTF8}; ++! defined $mb_locale || $mb_locale eq 'none' ++ and $mb_locale = 'C'; ++ + # Since each test is run with a file name and with redirected stdin, + # the name in the diagnostic is either the file name or "-". + # Normalize each diagnostic to use '-'. +@@ -110,6 +114,8 @@ my @Tests = ["07b", '-k 2,3', {IN=>"a a b\nz a a\n"}, {OUT=>"z a a\na a b\n"}], ["07c", '-k 2,3', {IN=>"y k b\nz k a\n"}, {OUT=>"z k a\ny k b\n"}], ["07d", '+1 -3', {IN=>"y k b\nz k a\n"}, {OUT=>"z k a\ny k b\n"}], @@ -73,7 +84,7 @@ # # report an error for `.' without following char spec ["08a", '-k 2.,3', {EXIT=>2}, -@@ -210,6 +212,10 @@ my @Tests = +@@ -210,6 +216,15 @@ my @Tests = # key start and key end. ["18e", '-nb -k1.1,1.2', {IN=>" 901\n100\n"}, {OUT=>"100\n 901\n"}], @@ -81,6 +92,11 @@ +# next field are not included in the sort. I.E. order should not change here. +["18f", '-k1,1b', {IN=>"a y\na z\n"}, {OUT=>"a y\na z\n"}], + ++# When ignoring leading blanks for start position, ensure blanks from ++# next field are not included in the sort. I.E. order should not change here. ++# This was noticed as an issue on fedora 8 (only in multibyte locales). ++["18g", '-k1b,1', {IN=>"a y\na z\n"}, {OUT=>"a y\na z\n"}, ++ {ENV => "LC_ALL=$mb_locale"}], # This looks odd, but works properly -- 2nd keyspec is never # used because all lines are different. ["19a", '+0 +1nr', {IN=>"b 2\nb 1\nb 3\n"}, {OUT=>"b 1\nb 2\nb 3\n"}], coreutils-i18n.patch: Index: coreutils-i18n.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- coreutils-i18n.patch 25 Feb 2009 13:13:05 -0000 1.31 +++ coreutils-i18n.patch 2 Mar 2009 12:42:55 -0000 1.32 @@ -1938,7 +1938,7 @@ if (newlim) lim = newlim; } -@@ -1384,6 +1570,107 @@ +@@ -1384,6 +1570,113 @@ return ptr; } @@ -1952,6 +1952,9 @@ + size_t mblength; + mbstate_t state; + ++ if (echar == 0) ++ eword++; /* skip all of end field. */ ++ + memset (&state, '\0', sizeof(mbstate_t)); + + if (tab_length) @@ -2020,24 +2023,27 @@ + } +# endif + -+ /* If we're skipping leading blanks, don't start counting characters -+ * until after skipping past any leading blanks. */ -+ if (key->skipsblanks) -+ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) -+ ptr += mblength; -+ -+ memset (&state, '\0', sizeof(mbstate_t)); -+ -+ /* Advance PTR by ECHAR (if possible), but no further than LIM. */ -+ for (i = 0; i < echar; i++) -+ { -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); -+ -+ if (ptr + mblength > lim) -+ break; -+ else -+ ptr += mblength; -+ } ++ if (echar != 0) ++ { ++ /* If we're skipping leading blanks, don't start counting characters ++ * until after skipping past any leading blanks. */ ++ if (key->skipsblanks) ++ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) ++ ptr += mblength; ++ ++ memset (&state, '\0', sizeof(mbstate_t)); ++ ++ /* Advance PTR by ECHAR (if possible), but no further than LIM. */ ++ for (i = 0; i < echar; i++) ++ { ++ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); ++ ++ if (ptr + mblength > lim) ++ break; ++ else ++ ptr += mblength; ++ } ++ } + + return ptr; +} Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- coreutils.spec 27 Feb 2009 12:13:54 -0000 1.251 +++ coreutils.spec 2 Mar 2009 12:42:55 -0000 1.252 @@ -1,7 +1,7 @@ Summary: A set of basic GNU tools commonly used in shell scripts Name: coreutils Version: 7.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -313,6 +313,9 @@ /sbin/runuser %changelog +* Mon Mar 02 2009 Ondrej Vasik 7.1-6 +- fix sort bugs (including #485715) for multibyte locales + as well * Fri Feb 27 2009 Ondrej Vasik 7.1-5 - fix infinite loop in recursive cp (upstream, introduced by 7.1) From than at fedoraproject.org Mon Mar 2 12:44:16 2009 From: than at fedoraproject.org (Than Ngo) Date: Mon, 2 Mar 2009 12:44:16 +0000 (UTC) Subject: rpms/kdelibs3/devel kdelibs3.spec,1.55,1.56 Message-ID: <20090302124416.554E870115@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs3/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv449 Modified Files: kdelibs3.spec Log Message: enable -apidocs Index: kdelibs3.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs3.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- kdelibs3.spec 27 Feb 2009 16:38:40 -0000 1.55 +++ kdelibs3.spec 2 Mar 2009 12:43:45 -0000 1.56 @@ -27,11 +27,7 @@ %define make_cvs 1 -# disable temporarily for f11+, while rawhide doxygen hang can be fixed -# http://bugzilla.redhat.com/487719 -%if 0%{?fedora} < 11 %define apidocs 1 -%endif # We always include this here now because kdeartwork 4 has moved on to # icon-naming-spec names (partially, so the icon theme isn't usable with KDE 4 @@ -40,7 +36,7 @@ Summary: K Desktop Environment 3 - Libraries Version: 3.5.10 -Release: 8%{?dist} +Release: 9%{?dist} %if 0%{?fedora} > 8 Name: kdelibs3 @@ -338,6 +334,7 @@ make %{?_smp_mflags} %if 0%{?apidocs} + doxygen -s -u admin/Doxyfile.global make %{?_smp_mflags} apidox %endif @@ -633,6 +630,9 @@ %changelog +* Mon Mar 02 2009 Than Ngo - 3.5.10-9 +- enable -apidocs + * Fri Feb 27 2009 Rex Dieter - 3.5.10-8 - disable -apidocs (f11+, #487719) - cleanup unused kdeui_symlink hack baggage From kwizart at fedoraproject.org Mon Mar 2 12:47:08 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 2 Mar 2009 12:47:08 +0000 (UTC) Subject: rpms/aimage/devel aimage-3.2.0-gcc44.patch, NONE, 1.1 aimage.spec, 1.5, 1.6 Message-ID: <20090302124708.2CA8270115@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/aimage/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1262 Modified Files: aimage.spec Added Files: aimage-3.2.0-gcc44.patch Log Message: Fix for gcc44 aimage-3.2.0-gcc44.patch: --- NEW FILE aimage-3.2.0-gcc44.patch --- diff -up aimage-3.2.0/src/aimage_os.cpp.gcc44 aimage-3.2.0/src/aimage_os.cpp --- aimage-3.2.0/src/aimage_os.cpp.gcc44 2009-03-02 13:36:09.000000000 +0100 +++ aimage-3.2.0/src/aimage_os.cpp 2009-03-02 13:41:32.000000000 +0100 @@ -33,11 +33,15 @@ void checkline(const char *name,const ch { while(buf[0] && isspace(buf[0])) buf++; // advance buf to end of spaces - char *pos = strstr(buf,name); + char *buf_tmp; + char *name_tmp; + strcpy(buf_tmp, buf); + strcpy(name_tmp, name); + char *pos = strstr(buf_tmp,name_tmp); if(pos==0) return; /* The string was found */ - char *cc = pos + strlen(name); // skip past to the end of the string + char *cc = pos + strlen(name_tmp); // skip past to the end of the string while(*cc && isspace(*cc)) cc++; // scan to end of spaces char *dd = index(cc,'\n'); // can we find a \n? if(dd) *dd = '\000'; // yes; clear it Index: aimage.spec =================================================================== RCS file: /cvs/pkgs/rpms/aimage/devel/aimage.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- aimage.spec 24 Feb 2009 00:22:04 -0000 1.5 +++ aimage.spec 2 Mar 2009 12:46:37 -0000 1.6 @@ -1,12 +1,13 @@ Name: aimage Version: 3.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Advanced Disk Imager Group: Applications/System License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/aimage-%{version}.tar.gz +Patch0: aimage-3.2.0-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: afflib-devel @@ -19,6 +20,7 @@ %prep %setup -q +%patch0 -p1 -b .gcc44 %build @@ -42,6 +44,9 @@ %changelog +* Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 3.2.0-4 +- Fix for gcc44 + * Mon Feb 23 2009 Fedora Release Engineering - 3.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From harald at fedoraproject.org Mon Mar 2 12:48:23 2009 From: harald at fedoraproject.org (Harald Hoyer) Date: Mon, 2 Mar 2009 12:48:23 +0000 (UTC) Subject: rpms/readahead/F-10 readahead.spec,1.52,1.53 sources,1.13,1.14 Message-ID: <20090302124823.73E5E70115@cvs1.fedora.phx.redhat.com> Author: harald Update of /cvs/pkgs/rpms/readahead/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1634 Modified Files: readahead.spec sources Log Message: * Fri Feb 20 2009 Harald Hoyer 1.4.8-1 - version 1.4.8 - /etc/readahead.d moved to /var/lib/readahead Index: readahead.spec =================================================================== RCS file: /cvs/pkgs/rpms/readahead/F-10/readahead.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- readahead.spec 16 Oct 2008 13:28:54 -0000 1.52 +++ readahead.spec 2 Mar 2009 12:47:53 -0000 1.53 @@ -1,13 +1,13 @@ Summary: Read a preset list of files into memory Name: readahead -Version: 1.4.7 +Version: 1.4.8 Release: 1%{?dist} Epoch: 1 Group: System Environment/Base License: GPLv2+ Source0: readahead-%{version}.tar.bz2 -URL: https://hosted.fedoraproject.org/projects/readahead +URL: https://fedorahosted.org/readahead/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/chkconfig, /sbin/service @@ -16,6 +16,9 @@ BuildRequires: e2fsprogs-devel BuildRequires: audit-libs-devel + +%define pkgvardatadir %{_localstatedir}/lib/%{name} + %description readahead reads the contents of a list of files into memory, which causes them to be read from cache when they are actually @@ -31,7 +34,7 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=${RPM_BUILD_ROOT} -mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/readahead.d/ +mkdir -p ${RPM_BUILD_ROOT}%{pkgvardatadir} %find_lang %{name} %clean @@ -52,11 +55,11 @@ %files -f %{name}.lang %defattr(-,root,root,- ) -%doc COPYING README lists/README.lists +%doc COPYING README lists/README.lists NEWS %{_sysconfdir}/cron.daily/readahead.cron %{_sysconfdir}/cron.monthly/readahead-monthly.cron %config %{_sysconfdir}/readahead.conf -%dir %{_sysconfdir}/readahead.d +%dir %{pkgvardatadir} %{_sysconfdir}/event.d/readahead-collector.event %{_sysconfdir}/event.d/readahead-disable-services.event %{_sysconfdir}/event.d/readahead.event @@ -65,6 +68,10 @@ /sbin/readahead-collector %changelog +* Fri Feb 20 2009 Harald Hoyer 1.4.8-1 +- version 1.4.8 +- /etc/readahead.d moved to /var/lib/readahead + * Thu Oct 16 2008 Harald Hoyer 1.4.7-1 - fixed error message in cron script (rhbz#460795) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/readahead/F-10/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 16 Oct 2008 13:28:54 -0000 1.13 +++ sources 2 Mar 2009 12:47:53 -0000 1.14 @@ -1 +1 @@ -8bbd92a4fd0401cd5addad5f970bd71d readahead-1.4.7.tar.bz2 +e249a7c6d4aebea77412ffa3e2b8a570 readahead-1.4.8.tar.bz2 From xhorak at fedoraproject.org Mon Mar 2 12:50:52 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Mon, 2 Mar 2009 12:50:52 +0000 (UTC) Subject: rpms/thunderbird/devel .cvsignore, 1.22, 1.23 sources, 1.29, 1.30 thunderbird-mozconfig, 1.7, 1.8 thunderbird.spec, 1.122, 1.123 firefox-1.0-prdtoa.patch, 1.1, NONE firefox-1.1-uriloader.patch, 1.1, NONE firefox-1.5-bullet-bill.patch, 1.1, NONE firefox-1.5-pango-cursor-position-more.patch, 1.2, NONE firefox-1.5-pango-cursor-position.patch, 1.1, NONE firefox-1.5-pango-justified-range.patch, 1.1, NONE firefox-1.5-pango-underline.patch, 1.2, NONE firefox-1.5-theme-change.patch, 1.2, NONE firefox-1.5-xft-rangewidth.patch, 1.1, NONE firefox-2.0-link-layout.patch, 1.1, NONE firefox-2.0-pango-ligatures.patch, 1.2, NONE firefox-2.0-pango-printing.patch, 1.2, NONE firefox-2.0.0.4-undo-uriloader.patch, 1.1, NONE thunderbird-0.7.3-gnome-uriloader.patch, 1.1, NONE thunderbird-0.7.3-psfonts.patch, 1.1, NONE thunderbird-1.5-profile-migrator.patch, 1.1, NONE thunderbird-2.0-default-applications.patch, 1.2, NONE thunderbird-2.0-enable-debug.patch, 1.1, NONE thunderbird-2.0.0.12-SECAlgorithmID.patch, 1.1, NONE thunderbird-2.0.0.12-gcc43.patch, 1.1, NONE Message-ID: <20090302125052.9AC7C70115@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/thunderbird/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2161 Modified Files: .cvsignore sources thunderbird-mozconfig thunderbird.spec Removed Files: firefox-1.0-prdtoa.patch firefox-1.1-uriloader.patch firefox-1.5-bullet-bill.patch firefox-1.5-pango-cursor-position-more.patch firefox-1.5-pango-cursor-position.patch firefox-1.5-pango-justified-range.patch firefox-1.5-pango-underline.patch firefox-1.5-theme-change.patch firefox-1.5-xft-rangewidth.patch firefox-2.0-link-layout.patch firefox-2.0-pango-ligatures.patch firefox-2.0-pango-printing.patch firefox-2.0.0.4-undo-uriloader.patch thunderbird-0.7.3-gnome-uriloader.patch thunderbird-0.7.3-psfonts.patch thunderbird-1.5-profile-migrator.patch thunderbird-2.0-default-applications.patch thunderbird-2.0-enable-debug.patch thunderbird-2.0.0.12-SECAlgorithmID.patch thunderbird-2.0.0.12-gcc43.patch Log Message: Update to Thunderbird 3.0b2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 20 Nov 2008 00:24:36 -0000 1.22 +++ .cvsignore 2 Mar 2009 12:50:21 -0000 1.23 @@ -1,2 +1,2 @@ -thunderbird-2.0.0.18-source.tar.bz2 -thunderbird-langpacks-2.0.0.18-20081119.tar.bz2 +thunderbird-langpacks-3.0-20090302.tar.bz2 +thunderbird-3.0b2-source.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 20 Nov 2008 00:24:37 -0000 1.29 +++ sources 2 Mar 2009 12:50:21 -0000 1.30 @@ -1,2 +1,2 @@ -1d131408b2338132a154700cc92a1d58 thunderbird-2.0.0.18-source.tar.bz2 -0391bb2456dd3c8cb633152802279f4b thunderbird-langpacks-2.0.0.18-20081119.tar.bz2 +91bcb8746641112642f043a81cb6d2f8 thunderbird-langpacks-3.0-20090302.tar.bz2 +3a6a95040c4356139a02eab5d32b9ad1 thunderbird-3.0b2-source.tar.bz2 Index: thunderbird-mozconfig =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird-mozconfig,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- thunderbird-mozconfig 12 Apr 2007 20:32:40 -0000 1.7 +++ thunderbird-mozconfig 2 Mar 2009 12:50:22 -0000 1.8 @@ -1,4 +1,9 @@ -. $topsrcdir/mail/config/mozconfig +mk_add_options MOZ_CO_PROJECT=mail +ac_add_options --enable-application=mail +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/ +mk_add_options AUTOCONF=autoconf-2.13 + +#ac_add_options --with-system-png ac_add_options --prefix="$PREFIX" ac_add_options --libdir="$LIBDIR" @@ -6,16 +11,16 @@ 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 --enable-default-toolkit=cairo-gtk2 ac_add_options --disable-xprint ac_add_options --disable-strip +ac_add_options --disable-install-strip ac_add_options --enable-pango ac_add_options --enable-system-cairo ac_add_options --enable-svg Index: thunderbird.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- thunderbird.spec 25 Feb 2009 20:32:54 -0000 1.122 +++ thunderbird.spec 2 Mar 2009 12:50:22 -0000 1.123 @@ -7,18 +7,18 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 2.0.0.18 -Release: 3%{?dist} +Version: 3.0 +Release: 1.beta2%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet %if %{official_branding} -%define tarball thunderbird-%{version}-source.tar.bz2 +%define tarball thunderbird-%{version}b2-source.tar.bz2 %else -%define tarball thunderbird-2.0.0.0rc1-source.tar.bz2 +%define tarball thunderbird-3.0b2-source.tar.bz2 %endif Source0: %{tarball} -Source1: thunderbird-langpacks-%{version}-20081119.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20090302.tar.bz2 Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded Source12: thunderbird-redhat-default-prefs.js @@ -28,35 +28,8 @@ Source30: thunderbird-open-browser.sh Source100: find-external-requires -# Build patches -Patch1: firefox-2.0-link-layout.patch -Patch2: firefox-1.0-prdtoa.patch - -Patch10: thunderbird-0.7.3-psfonts.patch -Patch11: thunderbird-0.7.3-gnome-uriloader.patch - -# customization patches -Patch24: thunderbird-2.0-default-applications.patch - -# local bugfixes -Patch40: firefox-1.5-bullet-bill.patch -Patch41: firefox-2.0.0.4-undo-uriloader.patch -Patch42: firefox-1.1-uriloader.patch - -# font system fixes -Patch83: firefox-1.5-pango-cursor-position.patch -Patch84: firefox-2.0-pango-printing.patch -Patch85: firefox-1.5-pango-cursor-position-more.patch -Patch86: firefox-1.5-pango-justified-range.patch -Patch87: firefox-1.5-pango-underline.patch -Patch88: firefox-1.5-xft-rangewidth.patch -Patch89: firefox-2.0-pango-ligatures.patch - -# Other -Patch102: firefox-1.5-theme-change.patch -Patch103: thunderbird-1.5-profile-migrator.patch -Patch111: thunderbird-path.patch -Patch112: thunderbird-2.0-enable-debug.patch +Patch1: mozilla-jemalloc.patch +Patch2: thunderbird-shared-error.patch %if %{official_branding} # Required by Mozilla Corporation @@ -87,7 +60,7 @@ BuildRequires: libXrender-devel Requires: desktop-file-utils >= %{desktop_file_utils_version} -%define mozappdir %{_libdir}/thunderbird-%{version} +%define mozappdir %{_libdir}/thunderbird-%{version}b2 AutoProv: 0 %define _use_internal_dependency_generator 0 @@ -100,39 +73,10 @@ %prep %setup -q -c -cd mozilla - -%patch1 -p1 -b .link-layout -%patch2 -p0 +#cd mozilla -%patch10 -p1 -b .psfonts -%patch11 -p1 -b .gnome-uriloader -%patch24 -p1 -b .default-applications -%patch40 -p1 -%patch41 -p1 -%patch42 -p0 - -# font system fixes -%patch83 -p1 -b .pango-cursor-position -%patch84 -p0 -b .pango-printing -%patch85 -p1 -b .pango-cursor-position-more -%patch86 -p1 -b .pango-justified-range -%patch87 -p1 -b .pango-underline -%patch88 -p1 -b .nopangoxft2 -%patch89 -p1 -b .pango-ligatures -pushd gfx/src/ps - # This sort of sucks, but it works for now. - ln -s ../gtk/nsFontMetricsPango.h . - ln -s ../gtk/nsFontMetricsPango.cpp . - ln -s ../gtk/mozilla-decoder.h . - ln -s ../gtk/mozilla-decoder.cpp . -popd - - -%patch102 -p0 -b .theme-change -%patch103 -p1 -b .profile-migrator -%patch111 -p1 -b .path -%patch112 -p1 -b .debug +%patch1 -p0 -b .jemalloc +%patch2 -p1 -b .shared-error %if %{official_branding} # Required by Mozilla Corporation @@ -154,7 +98,7 @@ #=============================================================================== %build -cd mozilla +#cd mozilla # Build with -Os as it helps the browser; also, don't override mozilla's warning # level; they use -Wall but disable a few warnings that show up _everywhere_ @@ -178,10 +122,12 @@ %install %{__rm} -rf $RPM_BUILD_ROOT -cd mozilla +#cd mozilla +cd objdir-tb DESTDIR=$RPM_BUILD_ROOT make install +cd - %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications,%{_datadir}/icons/hicolor/48x48/apps} %{__install} -p -D %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png @@ -192,20 +138,22 @@ --add-category Email \ %{SOURCE20} + # set up the thunderbird start script -%{__cat} %{SOURCE21} | %{__sed} -e 's,TBIRD_VERSION,%{version},g' > \ +rm -f $RPM_BUILD_ROOT/%{_bindir}/thunderbird +%{__cat} %{SOURCE21} | %{__sed} -e 's,TBIRD_VERSION,%{version}b2,g' > \ $RPM_BUILD_ROOT%{_bindir}/thunderbird %{__chmod} 755 $RPM_BUILD_ROOT/%{_bindir}/thunderbird -install -m755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh +install -Dm755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh %{__sed} -i -e 's|LIBDIR|%{_libdir}|g' $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh # set up our default preferences %{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' \ -e 's,COMMAND,%{mozappdir}/open-browser.sh,g' > \ $RPM_BUILD_ROOT/rh-default-prefs -%{__cp} $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-redhat.js -%{__cp} $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js +%{__install} -D $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-redhat.js +%{__install} -D $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js %{__rm} $RPM_BUILD_ROOT/rh-default-prefs %{__rm} -f $RPM_BUILD_ROOT%{_bindir}/thunderbird-config @@ -217,6 +165,8 @@ %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/chrome/icons/default/ %{__cp} other-licenses/branding/%{name}/default.xpm \ $RPM_BUILD_ROOT%{mozappdir}/chrome/icons/default/ + +%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/icons/ %{__cp} other-licenses/branding/%{name}/default.xpm \ $RPM_BUILD_ROOT%{mozappdir}/icons/ @@ -224,7 +174,9 @@ %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins # Install langpacks -touch ../%{name}.lang +%{__rm} -f %{name}.lang # Delete for --short-circuit option +touch %{name}.lang + %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/extensions %{__tar} xjf %{SOURCE1} for langpack in `ls thunderbird-langpacks/*.xpi`; do @@ -250,19 +202,22 @@ language=`echo $language | sed -e 's/-/_/g'` extensiondir=`echo $extensiondir | sed -e "s,^$RPM_BUILD_ROOT,,"` - echo "%%lang($language) $extensiondir" >> ../%{name}.lang + echo "%%lang($language) $extensiondir" >> %{name}.lang done %{__rm} -rf thunderbird-langpacks # Copy over the LICENSE +cd mozilla install -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir} +cd - # Use the system hunspell dictionaries %{__rm} -rf $RPM_BUILD_ROOT/%{mozappdir}/dictionaries ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{mozappdir}/dictionaries # ghost files +%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/components touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat @@ -304,31 +259,39 @@ %{mozappdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{mozappdir}/greprefs %{mozappdir}/icons -%{mozappdir}/init.d %{mozappdir}/isp %{mozappdir}/mozilla-xremote-client %{mozappdir}/open-browser.sh -%{mozappdir}/regxpcom %{mozappdir}/res %{mozappdir}/run-mozilla.sh %{mozappdir}/thunderbird-bin %{mozappdir}/thunderbird %{mozappdir}/updater %{mozappdir}/*.so - -%exclude %{_includedir}/%{name}-%{version} -%exclude %{_datadir}/idl/%{name}-%{version} -%exclude %{_libdir}/pkgconfig/*.pc -%exclude %{mozappdir}/TestGtkEmbed -%exclude %{mozappdir}/xpidl -%exclude %{mozappdir}/xpcshell -%exclude %{mozappdir}/xpt_dump -%exclude %{mozappdir}/xpt_link -%exclude %{mozappdir}/xpicleanup +%dir %{mozappdir}/modules +%{mozappdir}/modules/*.jsm +%{mozappdir}/modules/*.js +%dir %{mozappdir}/modules/gloda +%{mozappdir}/modules/gloda/*.js +%dir %{mozappdir}/modules/activity +%{mozappdir}/modules/activity/*.js +%{mozappdir}/README.txt +%{mozappdir}/platform.ini +%{mozappdir}/updater.ini +%{mozappdir}/application.ini +%exclude %{mozappdir}/LICENSE.txt +%exclude %{mozappdir}/license.html +%exclude %{mozappdir}/dependentlibs.list +%exclude %{mozappdir}/removed-files #=============================================================================== %changelog +* Mon Mar 2 2009 Jan Horak - 3.0-1.beta2 +- Update to 3.0 beta2 +- Removed creation of thunderbird start script by rpmbuild +- Added Patch2 to build correctly when building with --enable-shared option + * Wed Feb 25 2009 Fedora Release Engineering - 2.0.0.18-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- firefox-1.0-prdtoa.patch DELETED --- --- firefox-1.1-uriloader.patch DELETED --- --- firefox-1.5-bullet-bill.patch DELETED --- --- firefox-1.5-pango-cursor-position-more.patch DELETED --- --- firefox-1.5-pango-cursor-position.patch DELETED --- --- firefox-1.5-pango-justified-range.patch DELETED --- --- firefox-1.5-pango-underline.patch DELETED --- --- firefox-1.5-theme-change.patch DELETED --- --- firefox-1.5-xft-rangewidth.patch DELETED --- --- firefox-2.0-link-layout.patch DELETED --- --- firefox-2.0-pango-ligatures.patch DELETED --- --- firefox-2.0-pango-printing.patch DELETED --- --- firefox-2.0.0.4-undo-uriloader.patch DELETED --- --- thunderbird-0.7.3-gnome-uriloader.patch DELETED --- --- thunderbird-0.7.3-psfonts.patch DELETED --- --- thunderbird-1.5-profile-migrator.patch DELETED --- --- thunderbird-2.0-default-applications.patch DELETED --- --- thunderbird-2.0-enable-debug.patch DELETED --- --- thunderbird-2.0.0.12-SECAlgorithmID.patch DELETED --- --- thunderbird-2.0.0.12-gcc43.patch DELETED --- From ovasik at fedoraproject.org Mon Mar 2 12:52:34 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Mon, 2 Mar 2009 12:52:34 +0000 (UTC) Subject: rpms/coreutils/devel coreutils-7.1-sort-endoffields.patch,1.2,1.3 Message-ID: <20090302125234.37F0070115@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2662 Modified Files: coreutils-7.1-sort-endoffields.patch Log Message: fix typo coreutils-7.1-sort-endoffields.patch: Index: coreutils-7.1-sort-endoffields.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-7.1-sort-endoffields.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- coreutils-7.1-sort-endoffields.patch 2 Mar 2009 12:42:55 -0000 1.2 +++ coreutils-7.1-sort-endoffields.patch 2 Mar 2009 12:52:33 -0000 1.3 @@ -65,7 +65,7 @@ --- coreutils-7.1-orig/tests/misc/sort 2009-01-27 22:11:25.000000000 +0100 +++ coreutils-7.1/tests/misc/sort 2009-02-25 16:21:48.000000000 +0100 @@ -24,6 +24,10 @@ my $prog = 'sort'; - # Turn off localization of executable's output. + # Turn off localization of executable's output. @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; +my $mb_locale = $ENV{LOCALE_FR_UTF8}; From mlichvar at fedoraproject.org Mon Mar 2 12:52:50 2009 From: mlichvar at fedoraproject.org (Miroslav Lichvar) Date: Mon, 2 Mar 2009 12:52:50 +0000 (UTC) Subject: rpms/xterm/devel xterm-242-xbell.patch, NONE, 1.1 xterm.spec, 1.72, 1.73 Message-ID: <20090302125250.E619270115@cvs1.fedora.phx.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/xterm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2543 Modified Files: xterm.spec Added Files: xterm-242-xbell.patch Log Message: - fix bell (#487829) xterm-242-xbell.patch: --- NEW FILE xterm-242-xbell.patch --- # patch by Thomas E. Dickey # created Sat Feb 28 16:00:38 UTC 2009 # ------------------------------------------------------------------------------ # misc.c | 16 +++++++--------- # version.h | 4 ++-- # xterm.log.html | 10 +++++++++- # 3 files changed, 18 insertions(+), 12 deletions(-) # ------------------------------------------------------------------------------ Index: misc.c --- xterm-242+/misc.c 2009-02-13 23:39:29.000000000 +0000 +++ xterm-242a/misc.c 2009-02-28 15:37:30.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: misc.c,v 1.405 2009/02/13 23:39:29 tom Exp $ */ +/* $XTermId: misc.c,v 1.406 2009/02/28 15:37:30 tom Exp $ */ /* * @@ -821,16 +821,14 @@ void xtermBell(XtermWidget xw, int which, int percent) { - if (percent > 0) { - TScreen *screen = TScreenOf(xw); + TScreen *screen = TScreenOf(xw); #if defined(HAVE_XKB_BELL_EXT) - Atom tony = AtomBell(xw, which); - if (tony != None) { - XkbBell(screen->display, VShellWindow, percent, tony); - } else + Atom tony = AtomBell(xw, which); + if (tony != None) { + XkbBell(screen->display, VShellWindow, percent, tony); + } else #endif - XBell(screen->display, percent); - } + XBell(screen->display, percent); } void Index: xterm.spec =================================================================== RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- xterm.spec 26 Feb 2009 12:09:49 -0000 1.72 +++ xterm.spec 2 Mar 2009 12:52:20 -0000 1.73 @@ -1,7 +1,7 @@ Summary: Terminal emulator for the X Window System Name: xterm Version: 242 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -16,6 +16,7 @@ Patch1: xterm-242-resources.patch Patch2: xterm-222-can-2003-0063.patch Patch3: xterm-226-man-page_paths.patch +Patch4: xterm-242-xbell.patch %bcond_with trace @@ -32,6 +33,7 @@ %patch1 -p1 -b .resources %patch2 -p1 -b .can-2003-0063 %patch3 -p1 -b .man-page_paths +%patch4 -p1 -b .xbell %build %configure \ @@ -82,6 +84,9 @@ %{x11_app_defaults_dir}/XTerm-color %changelog +* Mon Mar 02 2009 Miroslav Lichvar 242-3 +- fix bell (#487829) + * Thu Feb 26 2009 Fedora Release Engineering - 242-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From msivak at fedoraproject.org Mon Mar 2 12:55:18 2009 From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=) Date: Mon, 2 Mar 2009 12:55:18 +0000 (UTC) Subject: rpms/python-cryptsetup/devel .cvsignore, 1.5, 1.6 python-cryptsetup.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <20090302125518.125B670115@cvs1.fedora.phx.redhat.com> Author: msivak Update of /cvs/extras/rpms/python-cryptsetup/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4007 Modified Files: .cvsignore python-cryptsetup.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Mar 2009 11:35:59 -0000 1.5 +++ .cvsignore 2 Mar 2009 12:54:47 -0000 1.6 @@ -1 +1 @@ -python-cryptsetup-0.0.4.tar.bz2 +python-cryptsetup-0.0.5.tar.bz2 Index: python-cryptsetup.spec =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/python-cryptsetup.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-cryptsetup.spec 2 Mar 2009 11:35:59 -0000 1.4 +++ python-cryptsetup.spec 2 Mar 2009 12:54:47 -0000 1.5 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-cryptsetup -Version: 0.0.4 +Version: 0.0.5 Release: 1%{?dist} Summary: Python bindings for cryptsetup @@ -42,6 +42,9 @@ %doc selftest.py %changelog +* Mon Mar 01 2009 Martin Sivak - 0.0.5-1 +- fix the luksUUID + * Mon Mar 01 2009 Martin Sivak - 0.0.4-1 - add prepare_passphrase_file method Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Mar 2009 11:35:59 -0000 1.5 +++ sources 2 Mar 2009 12:54:47 -0000 1.6 @@ -1 +1 @@ -0134e1e32df74eee4ef3b9ae6649672c python-cryptsetup-0.0.4.tar.bz2 +d32b0808c38cf31c99600bfcc271f645 python-cryptsetup-0.0.5.tar.bz2 From mlichvar at fedoraproject.org Mon Mar 2 12:56:49 2009 From: mlichvar at fedoraproject.org (Miroslav Lichvar) Date: Mon, 2 Mar 2009 12:56:49 +0000 (UTC) Subject: rpms/xterm/F-10 xterm-242-xbell.patch, NONE, 1.1 xterm.spec, 1.71, 1.72 Message-ID: <20090302125649.478F970115@cvs1.fedora.phx.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/xterm/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4497 Modified Files: xterm.spec Added Files: xterm-242-xbell.patch Log Message: - fix bell (#487829) xterm-242-xbell.patch: --- NEW FILE xterm-242-xbell.patch --- # patch by Thomas E. Dickey # created Sat Feb 28 16:00:38 UTC 2009 # ------------------------------------------------------------------------------ # misc.c | 16 +++++++--------- # version.h | 4 ++-- # xterm.log.html | 10 +++++++++- # 3 files changed, 18 insertions(+), 12 deletions(-) # ------------------------------------------------------------------------------ Index: misc.c --- xterm-242+/misc.c 2009-02-13 23:39:29.000000000 +0000 +++ xterm-242a/misc.c 2009-02-28 15:37:30.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: misc.c,v 1.405 2009/02/13 23:39:29 tom Exp $ */ +/* $XTermId: misc.c,v 1.406 2009/02/28 15:37:30 tom Exp $ */ /* * @@ -821,16 +821,14 @@ void xtermBell(XtermWidget xw, int which, int percent) { - if (percent > 0) { - TScreen *screen = TScreenOf(xw); + TScreen *screen = TScreenOf(xw); #if defined(HAVE_XKB_BELL_EXT) - Atom tony = AtomBell(xw, which); - if (tony != None) { - XkbBell(screen->display, VShellWindow, percent, tony); - } else + Atom tony = AtomBell(xw, which); + if (tony != None) { + XkbBell(screen->display, VShellWindow, percent, tony); + } else #endif - XBell(screen->display, percent); - } + XBell(screen->display, percent); } void Index: xterm.spec =================================================================== RCS file: /cvs/pkgs/rpms/xterm/F-10/xterm.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- xterm.spec 18 Feb 2009 14:53:38 -0000 1.71 +++ xterm.spec 2 Mar 2009 12:56:48 -0000 1.72 @@ -1,7 +1,7 @@ Summary: Terminal emulator for the X Window System Name: xterm Version: 242 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -16,6 +16,7 @@ Patch1: xterm-242-resources.patch Patch2: xterm-222-can-2003-0063.patch Patch3: xterm-226-man-page_paths.patch +Patch4: xterm-242-xbell.patch %bcond_with trace @@ -32,6 +33,7 @@ %patch1 -p1 -b .resources %patch2 -p1 -b .can-2003-0063 %patch3 -p1 -b .man-page_paths +%patch4 -p1 -b .xbell %build %configure \ @@ -82,6 +84,9 @@ %{x11_app_defaults_dir}/XTerm-color %changelog +* Mon Mar 02 2009 Miroslav Lichvar 242-2.fc10 +- fix bell (#487829) + * Wed Feb 18 2009 Miroslav Lichvar 242-1.fc10 - update to 242 From xhorak at fedoraproject.org Mon Mar 2 12:57:03 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Mon, 2 Mar 2009 12:57:03 +0000 (UTC) Subject: rpms/thunderbird/devel mozilla-jemalloc.patch, NONE, 1.1 thunderbird-shared-error.patch, NONE, 1.1 Message-ID: <20090302125703.E109370115@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/thunderbird/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4584 Added Files: mozilla-jemalloc.patch thunderbird-shared-error.patch Log Message: Adding missing patches mozilla-jemalloc.patch: --- NEW FILE mozilla-jemalloc.patch --- diff -r f1af606531f5 memory/jemalloc/jemalloc.h --- mozilla/memory/jemalloc/jemalloc.h Sat Nov 22 20:22:22 2008 +0100 +++ mozilla/memory/jemalloc/jemalloc.h Mon Dec 01 16:53:06 2008 -0500 @@ -45,14 +45,14 @@ } jemalloc_stats_t; #ifndef MOZ_MEMORY_DARWIN -void *malloc(size_t size); -void *valloc(size_t size); -void *calloc(size_t num, size_t size); -void *realloc(void *ptr, size_t size); -void free(void *ptr); +void *malloc(size_t size) __THROW __attribute_malloc__ __wur; +void *valloc(size_t size) __THROW __attribute_malloc__ __wur; +void *calloc(size_t num, size_t size) __THROW __attribute_malloc__ __wur; +void *realloc(void *ptr, size_t size) __THROW __attribute_malloc__ __wur; +void free(void *ptr) __THROW __attribute_malloc__ __wur; #endif -int posix_memalign(void **memptr, size_t alignment, size_t size); +int posix_memalign(void **memptr, size_t alignment, size_t size) __THROW __attribute_malloc__ __wur; void *memalign(size_t alignment, size_t size); size_t malloc_usable_size(const void *ptr); void jemalloc_stats(jemalloc_stats_t *stats); thunderbird-shared-error.patch: --- NEW FILE thunderbird-shared-error.patch --- diff -upU8 thunderbird-3.0/mail/installer/Makefile.in.shared-error thunderbird-3.0/mail/installer/Makefile.in --- thunderbird-3.0/mail/installer/Makefile.in.shared-error 2009-02-24 03:16:03.000000000 +0100 +++ thunderbird-3.0/mail/installer/Makefile.in 2009-02-27 16:02:31.000000000 +0100 @@ -56,16 +56,17 @@ NO_PKG_FILES = \ PalmSyncInstall.exe \ $(NULL) include $(topsrcdir)/config/rules.mk MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in ifdef BUILD_STATIC_LIBS +ifeq (BUILD_STATIC_LIBS, 1) ifeq (WINNT,$(OS_ARCH)) MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static endif else $(error you need a "--enable-static --disable-shared" build to create an installer) endif MOZ_NONLOCALIZED_PKG_LIST = \ @@ -80,16 +81,17 @@ MOZ_LOCALIZED_PKG_LIST = $(AB_CD) DEFINES += -DAB_CD=$(AB_CD) ifdef MOZ_PKG_MANIFEST_P MOZ_PKG_MANIFEST = packages-static $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@ endif +endif ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) MOZ_PKG_MAC_DSSTORE=branding/dsstore MOZ_PKG_MAC_BACKGROUND=branding/background.png MOZ_PKG_MAC_ICON=branding/disk.icns MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ " endif From nphilipp at fedoraproject.org Mon Mar 2 13:00:14 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 2 Mar 2009 13:00:14 +0000 (UTC) Subject: rpms/sane-backends/devel sane-backends.spec,1.115,1.116 Message-ID: <20090302130014.DF6AF70115@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/sane-backends/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5206 Modified Files: sane-backends.spec Log Message: let sane-backends-devel require libjpeg-devel, libtiff-devel Index: sane-backends.spec =================================================================== RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- sane-backends.spec 27 Feb 2009 15:12:02 -0000 1.115 +++ sane-backends.spec 2 Mar 2009 12:59:44 -0000 1.116 @@ -1,7 +1,7 @@ Summary: Scanner access software Name: sane-backends Version: 1.0.19 -Release: 14%{?dist} +Release: 15%{?dist} # lib/ is LGPLv2+, backends are GPLv2+ with exceptions # Tools are GPLv2+, docs are public domain # see LICENSE for details @@ -40,6 +40,8 @@ Requires: sane-backends = %{version}-%{release} Requires: libusb-devel Requires: libieee1284-devel +Requires: libjpeg-devel +Requires: libtiff-devel Requires: pkgconfig Requires: gphoto2-devel Requires: sane-backends-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -155,6 +157,9 @@ %{_libdir}/pkgconfig/sane-backends.pc %changelog +* Mon Mar 02 2009 Nils Philippsen - 1.0.19-15 +- let sane-backends-devel require libjpeg-devel, libtiff-devel + * Fri Feb 27 2009 Nils Philippsen - 1.0.19-14 - fix pkgconfig files From mlichvar at fedoraproject.org Mon Mar 2 13:00:31 2009 From: mlichvar at fedoraproject.org (Miroslav Lichvar) Date: Mon, 2 Mar 2009 13:00:31 +0000 (UTC) Subject: rpms/xterm/F-9 xterm-242-xbell.patch,NONE,1.1 xterm.spec,1.70,1.71 Message-ID: <20090302130031.81F0570115@cvs1.fedora.phx.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/xterm/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5272 Modified Files: xterm.spec Added Files: xterm-242-xbell.patch Log Message: - fix bell (#487829) xterm-242-xbell.patch: --- NEW FILE xterm-242-xbell.patch --- # patch by Thomas E. Dickey # created Sat Feb 28 16:00:38 UTC 2009 # ------------------------------------------------------------------------------ # misc.c | 16 +++++++--------- # version.h | 4 ++-- # xterm.log.html | 10 +++++++++- # 3 files changed, 18 insertions(+), 12 deletions(-) # ------------------------------------------------------------------------------ Index: misc.c --- xterm-242+/misc.c 2009-02-13 23:39:29.000000000 +0000 +++ xterm-242a/misc.c 2009-02-28 15:37:30.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: misc.c,v 1.405 2009/02/13 23:39:29 tom Exp $ */ +/* $XTermId: misc.c,v 1.406 2009/02/28 15:37:30 tom Exp $ */ /* * @@ -821,16 +821,14 @@ void xtermBell(XtermWidget xw, int which, int percent) { - if (percent > 0) { - TScreen *screen = TScreenOf(xw); + TScreen *screen = TScreenOf(xw); #if defined(HAVE_XKB_BELL_EXT) - Atom tony = AtomBell(xw, which); - if (tony != None) { - XkbBell(screen->display, VShellWindow, percent, tony); - } else + Atom tony = AtomBell(xw, which); + if (tony != None) { + XkbBell(screen->display, VShellWindow, percent, tony); + } else #endif - XBell(screen->display, percent); - } + XBell(screen->display, percent); } void Index: xterm.spec =================================================================== RCS file: /cvs/pkgs/rpms/xterm/F-9/xterm.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- xterm.spec 18 Feb 2009 14:57:59 -0000 1.70 +++ xterm.spec 2 Mar 2009 13:00:01 -0000 1.71 @@ -1,7 +1,7 @@ Summary: Terminal emulator for the X Window System Name: xterm Version: 242 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -16,6 +16,7 @@ Patch1: xterm-242-resources.patch Patch2: xterm-222-can-2003-0063.patch Patch3: xterm-226-man-page_paths.patch +Patch4: xterm-242-xbell.patch %bcond_with trace @@ -32,6 +33,7 @@ %patch1 -p1 -b .resources %patch2 -p1 -b .can-2003-0063 %patch3 -p1 -b .man-page_paths +%patch4 -p1 -b .xbell %build %configure \ @@ -82,6 +84,9 @@ %{x11_app_defaults_dir}/XTerm-color %changelog +* Mon Mar 02 2009 Miroslav Lichvar 242-2.fc9 +- fix bell (#487829) + * Wed Feb 18 2009 Miroslav Lichvar 242-1.fc9 - update to 242 From mbarnes at fedoraproject.org Mon Mar 2 13:04:57 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 2 Mar 2009 13:04:57 +0000 (UTC) Subject: rpms/yelp/devel libxul.patch,1.1,1.2 Message-ID: <20090302130457.E25AD70115@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/yelp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6403 Modified Files: libxul.patch Log Message: Fix patch. libxul.patch: Index: libxul.patch =================================================================== RCS file: /cvs/pkgs/rpms/yelp/devel/libxul.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libxul.patch 20 Jun 2008 18:01:02 -0000 1.1 +++ libxul.patch 2 Mar 2009 13:04:27 -0000 1.2 @@ -1,8 +1,8 @@ -diff -up yelp-2.23.1/configure.in.libxul yelp-2.23.1/configure.in ---- yelp-2.23.1/configure.in.libxul 2008-06-20 13:58:52.000000000 -0400 -+++ yelp-2.23.1/configure.in 2008-06-20 13:59:02.000000000 -0400 -@@ -248,7 +248,7 @@ if test $MOZILLA = libxul-embedding; the - PKG_CHECK_MODULES([MOZILLA_COMPONENT],[libxul-embedding $gecko_cv_extra_pkg_dependencies]) +diff -up yelp-2.25.1/configure.in.libxul yelp-2.25.1/configure.in +--- yelp-2.25.1/configure.in.libxul 2009-03-02 01:13:20.000000000 -0500 ++++ yelp-2.25.1/configure.in 2009-03-02 08:03:44.000000000 -0500 +@@ -251,7 +251,7 @@ if test "$MOZILLA" = "libxul-embedding" + PKG_CHECK_MODULES([MOZILLA_COMPONENT],[$MOZILLA $gecko_cv_extra_pkg_dependencies]) MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS `$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`" else - PKG_CHECK_MODULES([MOZILLA_COMPONENT],[${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies]) From than at fedoraproject.org Mon Mar 2 13:06:20 2009 From: than at fedoraproject.org (Than Ngo) Date: Mon, 2 Mar 2009 13:06:20 +0000 (UTC) Subject: rpms/kdevelop/devel kdevelop-3.5.4-gcc-44.patch, NONE, 1.1 kdevelop.spec, 1.84, 1.85 Message-ID: <20090302130620.F30D170115@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdevelop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6793 Modified Files: kdevelop.spec Added Files: kdevelop-3.5.4-gcc-44.patch Log Message: fix build problem with gcc-4.4 kdevelop-3.5.4-gcc-44.patch: --- NEW FILE kdevelop-3.5.4-gcc-44.patch --- diff -up kdevelop-3.5.4/lib/antlr/antlr/CharScanner.hpp.orig kdevelop-3.5.4/lib/antlr/antlr/CharScanner.hpp --- kdevelop-3.5.4/lib/antlr/antlr/CharScanner.hpp.orig 2009-03-02 13:50:12.000000000 +0100 +++ kdevelop-3.5.4/lib/antlr/antlr/CharScanner.hpp 2009-03-02 13:51:48.000000000 +0100 @@ -12,6 +12,8 @@ #include +#include + #ifdef HAS_NOT_CCTYPE_H #include #else diff -up kdevelop-3.5.4/lib/antlr/src/String.cpp.orig kdevelop-3.5.4/lib/antlr/src/String.cpp Index: kdevelop.spec =================================================================== RCS file: /cvs/extras/rpms/kdevelop/devel/kdevelop.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- kdevelop.spec 25 Feb 2009 10:56:16 -0000 1.84 +++ kdevelop.spec 2 Mar 2009 13:05:50 -0000 1.85 @@ -20,7 +20,7 @@ Summary: Integrated Development Environment for C++/C Epoch: 9 Version: 3.5.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ @@ -32,6 +32,7 @@ Patch1: c_cpp_reference-2.0.2-config.patch Patch2: kdevelop-2.1.5_for_KDE_3.1-doc.patch +Patch3: kdevelop-3.5.4-gcc-44.patch # improved integration for the KDE 4 template - no special KDE 4 build environment needed in Fedora Patch4: kdevelop-3.5.2-kde4template.patch @@ -146,6 +147,7 @@ %setup -q -a1 %patch1 -p0 -b .config %patch2 -p1 -b .doc +%patch3 -p1 -b .gcc44 %patch4 -p1 -b .kde4template %if %{make_cvs} @@ -256,6 +258,9 @@ %changelog +* Mon Mar 02 2009 Than Ngo - 3.5.4-3 +- fix build problem with gcc-4.4 + * Wed Feb 25 2009 Fedora Release Engineering - 9:3.5.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From nphilipp at fedoraproject.org Mon Mar 2 13:06:26 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 2 Mar 2009 13:06:26 +0000 (UTC) Subject: rpms/sane-frontends/devel sane-frontends.spec,1.25,1.26 Message-ID: <20090302130626.F28D970115@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/sane-frontends/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6865 Modified Files: sane-frontends.spec Log Message: don't require libieee2384-devel, libjpeg-devel but require fixed sane-backends-devel for building Index: sane-frontends.spec =================================================================== RCS file: /cvs/pkgs/rpms/sane-frontends/devel/sane-frontends.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sane-frontends.spec 25 Feb 2009 22:32:14 -0000 1.25 +++ sane-frontends.spec 2 Mar 2009 13:05:56 -0000 1.26 @@ -7,8 +7,8 @@ Patch0: sane-frontends-1.0.14-badcode.patch License: GPLv2+ Group: Applications/System -BuildRequires: gtk2-devel gimp-devel libjpeg-devel -BuildRequires: sane-backends-devel libieee1284-devel +BuildRequires: gtk2-devel gimp-devel +BuildRequires: sane-backends-devel >= 1.0.19-15 Requires: sane-backends Buildroot: %{_tmppath}/%{name}-root Obsoletes: sane <= 0:1.0.9 @@ -44,7 +44,11 @@ %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 1.0.14-6 +* Tue Apr 24 2007 Nils Philippsen 1.0.14-6 +- don't require libieee2384-devel, libjpeg-devel but require fixed + sane-backends-devel for building + +* Wed Feb 25 2009 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Thu Sep 4 2008 Tom "spot" Callaway - 1.0.14-5 From dnielsen at fedoraproject.org Mon Mar 2 13:08:38 2009 From: dnielsen at fedoraproject.org (David Nielsen) Date: Mon, 2 Mar 2009 13:08:38 +0000 (UTC) Subject: rpms/mono-addins/F-10 import.log,1.1,1.2 mono-addins.spec,1.8,1.9 Message-ID: <20090302130838.7AFC070115@cvs1.fedora.phx.redhat.com> Author: dnielsen Update of /cvs/pkgs/rpms/mono-addins/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7537/F-10 Modified Files: import.log mono-addins.spec Log Message: Monumental screwup.. I am deep suck today Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/mono-addins/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jul 2008 10:51:32 -0000 1.1 +++ import.log 2 Mar 2009 13:08:07 -0000 1.2 @@ -1 +1,2 @@ mono-addins-0_3_1-2_2_fc10:HEAD:mono-addins-0.3.1-2.2.fc10.src.rpm:1216032635 +mono-addins-0_3_1-3_1_fc10:F-10:mono-addins-0.3.1-3.1.fc10.src.rpm:1235999246 Index: mono-addins.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono-addins/F-10/mono-addins.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mono-addins.spec 14 Jul 2008 10:51:32 -0000 1.8 +++ mono-addins.spec 2 Mar 2009 13:08:08 -0000 1.9 @@ -2,7 +2,7 @@ Name: mono-addins Version: 0.3.1 -Release: 2.2%{?dist} +Release: 3.1%{?dist} Summary: Addins for mono Group: Development/Languages License: GPLv2 @@ -63,6 +63,12 @@ %{_libdir}/pkgconfig/mono-addins* %changelog +* Mon Mar 02 2009 David Nielsen - 0.3.1-3.1 +- cvs screwup + +* Mon Mar 02 2009 David Nielsen - 0.3.1-3 +- Rebuild for #487155 + * Mon Jul 14 2008 Paul F. Johnson - 0.3.1-2.2 - rebuild From nphilipp at fedoraproject.org Mon Mar 2 13:10:43 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 2 Mar 2009 13:10:43 +0000 (UTC) Subject: rpms/sane-frontends/devel sane-frontends.spec,1.26,1.27 Message-ID: <20090302131043.C438E70115@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/sane-frontends/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8065 Modified Files: sane-frontends.spec Log Message: fix changelog entry Index: sane-frontends.spec =================================================================== RCS file: /cvs/pkgs/rpms/sane-frontends/devel/sane-frontends.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sane-frontends.spec 2 Mar 2009 13:05:56 -0000 1.26 +++ sane-frontends.spec 2 Mar 2009 13:10:13 -0000 1.27 @@ -44,7 +44,7 @@ %changelog -* Tue Apr 24 2007 Nils Philippsen 1.0.14-6 +* Mon Mar 02 2009 Nils Philippsen 1.0.14-6 - don't require libieee2384-devel, libjpeg-devel but require fixed sane-backends-devel for building From tsmetana at fedoraproject.org Mon Mar 2 13:25:31 2009 From: tsmetana at fedoraproject.org (Tomas Smetana) Date: Mon, 2 Mar 2009 13:25:31 +0000 (UTC) Subject: rpms/tvtime/devel tvtime-1.0.2-fonts.patch, NONE, 1.1 tvtime.spec, 1.35, 1.36 Message-ID: <20090302132531.1AADF70115@cvs1.fedora.phx.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/tvtime/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10982 Modified Files: tvtime.spec Added Files: tvtime-1.0.2-fonts.patch Log Message: * Mon Mar 02 2009 Tomas Smetana 1.0.2-4 - fix #477473 - drop fonts, depend on liberation-fonts tvtime-1.0.2-fonts.patch: --- NEW FILE tvtime-1.0.2-fonts.patch --- diff -up tvtime-1.0.2/src/tvtimeosd.c.fonts tvtime-1.0.2/src/tvtimeosd.c --- tvtime-1.0.2/src/tvtimeosd.c.fonts 2009-03-02 14:08:30.000000000 +0100 +++ tvtime-1.0.2/src/tvtimeosd.c 2009-03-02 14:09:20.000000000 +0100 @@ -206,7 +206,7 @@ tvtime_osd_t *tvtime_osd_new( int width, memset( osd->network_call, 0, sizeof( osd->network_call ) ); memset( osd->show_info, 0, sizeof( osd->show_info ) ); - fontfile = "tvtimeSansBold.ttf"; + fontfile = "LiberationSans-Bold.ttf"; osd->databar = osd_rect_new(); if( !osd->databar ) { diff -up tvtime-1.0.2/src/vbiscreen.c.fonts tvtime-1.0.2/src/vbiscreen.c --- tvtime-1.0.2/src/vbiscreen.c.fonts 2009-03-02 14:08:40.000000000 +0100 +++ tvtime-1.0.2/src/vbiscreen.c 2009-03-02 14:09:52.000000000 +0100 @@ -99,7 +99,7 @@ vbiscreen_t *vbiscreen_new( int video_wi vs->bg_cr = 128; vs->rows = ROWS; vs->cols = COLS; - vs->fontfile = "FreeMonoBold.ttf"; + vs->fontfile = "LiberationMono-Bold.ttf"; vs->fontsize = fontsize; vs->width = video_width; vs->height = video_height; Index: tvtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/tvtime/devel/tvtime.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- tvtime.spec 25 Feb 2009 22:19:10 -0000 1.35 +++ tvtime.spec 2 Mar 2009 13:25:00 -0000 1.36 @@ -1,7 +1,7 @@ Summary: A high quality TV viewer Name: tvtime Version: 1.0.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/Multimedia URL: http://tvtime.sourceforge.net @@ -10,10 +10,12 @@ Patch1: tvtime-1.0.1-gcc4.1.patch Patch2: tvtime-1.0.1-header.patch Patch3: tvtime-1.0.1-fsbadval.patch +Patch4: tvtime-1.0.2-fonts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gtk2 >= 2.6 +Requires: liberation-fonts Requires(post): desktop-file-utils Requires(post): hicolor-icon-theme Requires(postun): desktop-file-utils @@ -48,6 +50,7 @@ %patch1 -p1 -b .gcc %patch2 -p1 -b .header %patch3 -p1 -b .fsbadval +%patch4 -p1 -b .fonts for i in docs/man/de/*.?; do iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" @@ -57,12 +60,16 @@ %build %configure --disable-dependency-tracking --disable-rpath -make CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} +make CXXFLAGS="$RPM_OPT_FLAGS" \ + CFLAGS="$RPM_OPT_FLAGS -DFONTDIR='\"/usr/share/fonts/liberation/\"'" \ + %{?_smp_mflags} %install rm -rf %{buildroot} %makeinstall +# remove fonts +rm -f %{buildroot}%{_datadir}/tvtime/*.ttf %find_lang %{name} @@ -102,6 +109,9 @@ %{_bindir}/tvtime %changelog +* Mon Mar 02 2009 Tomas Smetana 1.0.2-4 +- fix #477473 - drop fonts, depend on liberation-fonts + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From wolfy at fedoraproject.org Mon Mar 2 13:28:37 2009 From: wolfy at fedoraproject.org (Manuel Wolfshant) Date: Mon, 2 Mar 2009 13:28:37 +0000 (UTC) Subject: rpms/rpmlint/EL-4 .cvsignore, 1.13, 1.14 rpmlint.spec, 1.23, 1.24 sources, 1.13, 1.14 Message-ID: <20090302132837.4E5E770115@cvs1.fedora.phx.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/rpmlint/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11491 Modified Files: .cvsignore rpmlint.spec sources Log Message: bump to release 0.85, sync with EL-5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 26 Jul 2008 20:15:41 -0000 1.13 +++ .cvsignore 2 Mar 2009 13:28:06 -0000 1.14 @@ -1,2 +1,3 @@ -rpmlint-0.84.tar.bz2 -rpmlint-0.84-distregex.patch +rpmlint-0.85.tar.bz2 +rpmlint-0.85-compile.patch +rpmlint-0.85-configs.patch Index: rpmlint.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/rpmlint.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- rpmlint.spec 18 Oct 2008 02:38:14 -0000 1.23 +++ rpmlint.spec 2 Mar 2009 13:28:06 -0000 1.24 @@ -1,6 +1,6 @@ Name: rpmlint -Version: 0.84 -Release: 3%{?dist} +Version: 0.85 +Release: 3%{?dist}.1 Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -9,8 +9,11 @@ Source0: http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2 Source1: %{name}.config Source2: %{name}-CHANGES.package.old -Patch0: %{name}-0.84-distregex.patch -Patch1: %{name}-0.77-compile.patch +Source3: %{name}-etc.config +# Fedora specific, not upstreamable +Patch0: %{name}-0.85-compile.patch +# From upstream svn +Patch1: %{name}-0.85-configs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -32,9 +35,10 @@ %prep %setup -q %patch0 -p1 -%patch1 +%patch1 -p0 sed -i -e /MenuCheck/d Config.py install -pm 644 %{SOURCE2} CHANGES.package.old +install -pm 644 %{SOURCE3} config %build @@ -46,8 +50,6 @@ touch rpmlint.pyc rpmlint.pyo # just for the %%exclude to work everywhere make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \ LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir} -echo "# Add local system wide rpmlint configuration here." \ - > $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config @@ -68,6 +70,18 @@ %changelog +* Thu Feb 05 2009 Manuel Wolfshant - 0.85-3.1 +- Bump release to express relationship with the rawhide version. + No other changes. + +* Sat Jan 24 2009 Manuel Wolfshant - 0.85-1 +- Sync with Fedora rawhide version 0.85-3, including: +-- Update to upstream version 0.85 +-- Apply upstream patch to load all *config from /etc/rpmlint. +- Sync Fedora license list as Wiki revision 1.34 +- Filter out "filename-too-long-for-joliet" and "symlink-should-be-*" + warnings in default config. + * Sat Oct 18 2008 Manuel Wolfshant - 0.84-3 - Sync Fedora license list with Wiki revision 1.09 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 26 Jul 2008 20:15:41 -0000 1.13 +++ sources 2 Mar 2009 13:28:06 -0000 1.14 @@ -1,2 +1,3 @@ -d7e2aab6135a44a845f677d27f2722bd rpmlint-0.84.tar.bz2 -4a6a0894e3f1a305464cb651b629af30 rpmlint-0.84-distregex.patch +a9344017826f709328c63192c5a727ec rpmlint-0.85.tar.bz2 +92915e2bcbaccaaa0a2237183dd87762 rpmlint-0.85-compile.patch +b19d6406ceeec7a6ed6ebe6bd7b16faf rpmlint-0.85-configs.patch From kwizart at fedoraproject.org Mon Mar 2 13:29:31 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 2 Mar 2009 13:29:31 +0000 (UTC) Subject: rpms/lcms/devel lcms.spec,1.21,1.22 Message-ID: <20090302132931.A95A170115@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/lcms/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11630 Modified Files: lcms.spec Log Message: Fix circle dependency Index: lcms.spec =================================================================== RCS file: /cvs/pkgs/rpms/lcms/devel/lcms.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- lcms.spec 25 Feb 2009 12:46:07 -0000 1.21 +++ lcms.spec 2 Mar 2009 13:29:01 -0000 1.22 @@ -2,7 +2,7 @@ Name: lcms Version: 1.17 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Color Management System Group: Applications/Productivity @@ -31,7 +31,6 @@ %package libs Summary: Library for %{name} Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} # Introduced in F-9 to solve multilib transition Obsoletes: lcms < 1.17-3 @@ -126,6 +125,9 @@ %changelog +* Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 1.17-10 +- Fix circle dependency #452352 + * Wed Feb 25 2009 Fedora Release Engineering - 1.17-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kwizart at fedoraproject.org Mon Mar 2 13:35:30 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 2 Mar 2009 13:35:30 +0000 (UTC) Subject: rpms/lcms/devel lcms.spec,1.22,1.23 Message-ID: <20090302133530.1400770115@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/lcms/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12541 Modified Files: lcms.spec Log Message: Fix full versioned requires for lcms Index: lcms.spec =================================================================== RCS file: /cvs/pkgs/rpms/lcms/devel/lcms.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- lcms.spec 2 Mar 2009 13:29:01 -0000 1.22 +++ lcms.spec 2 Mar 2009 13:34:59 -0000 1.23 @@ -23,6 +23,7 @@ BuildRequires: automake, autoconf, libtool Provides: littlecms = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description LittleCMS intends to be a small-footprint, speed optimized color management From xhorak at fedoraproject.org Mon Mar 2 13:37:14 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Mon, 2 Mar 2009 13:37:14 +0000 (UTC) Subject: rpms/thunderbird/devel thunderbird-mozconfig,1.8,1.9 Message-ID: <20090302133714.8603170115@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/thunderbird/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12912 Modified Files: thunderbird-mozconfig Log Message: Removed specific autoconf version usage Index: thunderbird-mozconfig =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird-mozconfig,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- thunderbird-mozconfig 2 Mar 2009 12:50:22 -0000 1.8 +++ thunderbird-mozconfig 2 Mar 2009 13:36:44 -0000 1.9 @@ -1,7 +1,7 @@ mk_add_options MOZ_CO_PROJECT=mail ac_add_options --enable-application=mail mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/ -mk_add_options AUTOCONF=autoconf-2.13 +#mk_add_options AUTOCONF=autoconf-2.13 #ac_add_options --with-system-png From wolfy at fedoraproject.org Mon Mar 2 13:38:30 2009 From: wolfy at fedoraproject.org (Manuel Wolfshant) Date: Mon, 2 Mar 2009 13:38:30 +0000 (UTC) Subject: rpms/rpmlint/EL-4 .cvsignore,1.14,1.15 sources,1.14,1.15 Message-ID: <20090302133830.D764B70115@cvs1.fedora.phx.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/rpmlint/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13288 Modified Files: .cvsignore sources Log Message: config files, list with older changes Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 2 Mar 2009 13:28:06 -0000 1.14 +++ .cvsignore 2 Mar 2009 13:38:00 -0000 1.15 @@ -1,3 +1,6 @@ rpmlint-0.85.tar.bz2 rpmlint-0.85-compile.patch rpmlint-0.85-configs.patch +rpmlint.config +rpmlint-CHANGES.package.old +rpmlint-etc.config Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 2 Mar 2009 13:28:06 -0000 1.14 +++ sources 2 Mar 2009 13:38:00 -0000 1.15 @@ -1,3 +1,6 @@ a9344017826f709328c63192c5a727ec rpmlint-0.85.tar.bz2 92915e2bcbaccaaa0a2237183dd87762 rpmlint-0.85-compile.patch b19d6406ceeec7a6ed6ebe6bd7b16faf rpmlint-0.85-configs.patch +a76667a5aa1bbe3cd9858c83efa8686b rpmlint.config +551fa43711bbeb5bbff04a97f3e35ff6 rpmlint-CHANGES.package.old +17a16d32424bae3869b732261d1eef6a rpmlint-etc.config From nphilipp at fedoraproject.org Mon Mar 2 13:45:41 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 2 Mar 2009 13:45:41 +0000 (UTC) Subject: rpms/sane-backends/devel sane-backends-1.0.19-rpath.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sane-backends.spec, 1.116, 1.117 sources, 1.16, 1.17 sane-backends-1.0.18-rpath.patch, 1.1, NONE sane-backends-1.0.19-pkgconfig.patch, 1.2, NONE Message-ID: <20090302134541.394DE70115@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/sane-backends/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14663 Modified Files: .cvsignore sane-backends.spec sources Added Files: sane-backends-1.0.19-rpath.patch Removed Files: sane-backends-1.0.18-rpath.patch sane-backends-1.0.19-pkgconfig.patch Log Message: update rpath patch (no longer touch sane-config.in as that is replaced anyway) fix pkgconfig patch, bzip2 it sane-backends-1.0.19-rpath.patch: --- NEW FILE sane-backends-1.0.19-rpath.patch --- diff -up sane-backends-1.0.19/configure.rpath sane-backends-1.0.19/configure --- sane-backends-1.0.19/configure.rpath 2008-02-11 00:02:31.000000000 +0100 +++ sane-backends-1.0.19/configure 2009-03-02 14:14:04.967158365 +0100 @@ -4077,6 +4077,7 @@ else esac fi +LINKER_RPATH= { echo "$as_me:$LINENO: result: $LINKER_RPATH" >&5 echo "${ECHO_T}$LINKER_RPATH" >&6; } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sane-backends/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 12 Feb 2008 10:40:51 -0000 1.16 +++ .cvsignore 2 Mar 2009 13:45:10 -0000 1.17 @@ -1 +1,2 @@ sane-backends-1.0.19.tar.gz +sane-backends-1.0.19-pkgconfig.patch.bz2 Index: sane-backends.spec =================================================================== RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- sane-backends.spec 2 Mar 2009 12:59:44 -0000 1.116 +++ sane-backends.spec 2 Mar 2009 13:45:10 -0000 1.117 @@ -10,8 +10,8 @@ Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz Source1: sane.png Source2: hal-usb-scanner-add -Patch0: sane-backends-1.0.18-rpath.patch -Patch1: sane-backends-1.0.19-pkgconfig.patch +Patch0: sane-backends-1.0.19-rpath.patch +Patch1: sane-backends-1.0.19-pkgconfig.patch.bz2 Patch2: sane-backends-1.0.19-glibc-2.7.patch Patch3: sane-backends-1.0.19-policykit.patch Patch4: sane-backends-1.0.19-uninitialized.patch @@ -159,6 +159,9 @@ %changelog * Mon Mar 02 2009 Nils Philippsen - 1.0.19-15 - let sane-backends-devel require libjpeg-devel, libtiff-devel +- update rpath patch (no longer touch sane-config.in as that is replaced + anyway) +- fix pkgconfig patch, bzip2 it * Fri Feb 27 2009 Nils Philippsen - 1.0.19-14 - fix pkgconfig files Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sane-backends/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 12 Feb 2008 10:40:51 -0000 1.16 +++ sources 2 Mar 2009 13:45:10 -0000 1.17 @@ -1 +1,2 @@ 8c0936272dcfd4e98c51512699f1c06f sane-backends-1.0.19.tar.gz +b188dafd7729e2a6a012000c1c056353 sane-backends-1.0.19-pkgconfig.patch.bz2 --- sane-backends-1.0.18-rpath.patch DELETED --- --- sane-backends-1.0.19-pkgconfig.patch DELETED --- From dnielsen at fedoraproject.org Mon Mar 2 13:47:16 2009 From: dnielsen at fedoraproject.org (David Nielsen) Date: Mon, 2 Mar 2009 13:47:16 +0000 (UTC) Subject: rpms/mono-addins/F-10 import.log,1.2,1.3 mono-addins.spec,1.9,1.10 Message-ID: <20090302134716.0FE0A70115@cvs1.fedora.phx.redhat.com> Author: dnielsen Update of /cvs/pkgs/rpms/mono-addins/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15013/F-10 Modified Files: import.log mono-addins.spec Log Message: I suck Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/mono-addins/F-10/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 2 Mar 2009 13:08:07 -0000 1.2 +++ import.log 2 Mar 2009 13:46:45 -0000 1.3 @@ -1,2 +1,3 @@ mono-addins-0_3_1-2_2_fc10:HEAD:mono-addins-0.3.1-2.2.fc10.src.rpm:1216032635 mono-addins-0_3_1-3_1_fc10:F-10:mono-addins-0.3.1-3.1.fc10.src.rpm:1235999246 +mono-addins-0_3_1-3_fc10_2:F-10:mono-addins-0.3.1-3.fc10.2.src.rpm:1236001534 Index: mono-addins.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono-addins/F-10/mono-addins.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mono-addins.spec 2 Mar 2009 13:08:08 -0000 1.9 +++ mono-addins.spec 2 Mar 2009 13:46:45 -0000 1.10 @@ -2,7 +2,7 @@ Name: mono-addins Version: 0.3.1 -Release: 3.1%{?dist} +Release: 3%{?dist}.2 Summary: Addins for mono Group: Development/Languages License: GPLv2 @@ -63,6 +63,9 @@ %{_libdir}/pkgconfig/mono-addins* %changelog +* Mon Mar 02 2009 David Nielsen - 0.3.1-3.2 +- spec change suggested by ivazquez + * Mon Mar 02 2009 David Nielsen - 0.3.1-3.1 - cvs screwup From ovasik at fedoraproject.org Mon Mar 2 13:51:19 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Mon, 2 Mar 2009 13:51:19 +0000 (UTC) Subject: rpms/coreutils/F-10 coreutils-6.12-sort-endoffields.patch, 1.1, 1.2 coreutils-i18n.patch, 1.27, 1.28 coreutils.spec, 1.237, 1.238 Message-ID: <20090302135119.7553870115@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15763 Modified Files: coreutils-6.12-sort-endoffields.patch coreutils-i18n.patch coreutils.spec Log Message: fix sort bugs (including #485715) for multibyte locales coreutils-6.12-sort-endoffields.patch: Index: coreutils-6.12-sort-endoffields.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-10/coreutils-6.12-sort-endoffields.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- coreutils-6.12-sort-endoffields.patch 26 Feb 2009 16:28:44 -0000 1.1 +++ coreutils-6.12-sort-endoffields.patch 2 Mar 2009 13:51:18 -0000 1.2 @@ -79,7 +79,18 @@ diff -urNp coreutils-6.12-orig/tests/misc/sort coreutils-6.12/tests/misc/sort --- coreutils-6.12-orig/tests/misc/sort 2008-05-17 08:41:12.000000000 +0200 +++ coreutils-6.12/tests/misc/sort 2009-02-26 16:25:39.000000000 +0100 -@@ -108,6 +108,8 @@ my @Tests = +@@ -24,6 +24,10 @@ my $prog = 'sort'; + # Turn off localization of executable's output. + @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + ++my $mb_locale = $ENV{LOCALE_FR_UTF8}; ++! defined $mb_locale || $mb_locale eq 'none' ++ and $mb_locale = 'C'; ++ + # Since each test is run with a file name and with redirected stdin, + # the name in the diagnostic is either the file name or "-". + # Normalize each diagnostic to use '-'. +@@ -108,6 +114,8 @@ my @Tests = ["07b", '-k 2,3', {IN=>"a a b\nz a a\n"}, {OUT=>"z a a\na a b\n"}], ["07c", '-k 2,3', {IN=>"y k b\nz k a\n"}, {OUT=>"z k a\ny k b\n"}], ["07d", '+1 -3', {IN=>"y k b\nz k a\n"}, {OUT=>"z k a\ny k b\n"}], @@ -88,7 +99,7 @@ # # report an error for `.' without following char spec ["08a", '-k 2.,3', {EXIT=>2}, -@@ -208,6 +210,10 @@ my @Tests = +@@ -208,6 +216,15 @@ my @Tests = # key start and key end. ["18e", '-nb -k1.1,1.2', {IN=>" 901\n100\n"}, {OUT=>"100\n 901\n"}], @@ -96,6 +107,11 @@ +# next field are not included in the sort. I.E. order should not change here. +["18f", '-k1,1b', {IN=>"a y\na z\n"}, {OUT=>"a y\na z\n"}], + ++# When ignoring leading blanks for start position, ensure blanks from ++# next field are not included in the sort. I.E. order should not change here. ++# This was noticed as an issue on fedora 8 (only in multibyte locales). ++["18g", '-k1b,1', {IN=>"a y\na z\n"}, {OUT=>"a y\na z\n"}, ++ {ENV => "LC_ALL=$mb_locale"}], # This looks odd, but works properly -- 2nd keyspec is never # used because all lines are different. ["19a", '+0 +1nr', {IN=>"b 2\nb 1\nb 3\n"}, {OUT=>"b 1\nb 2\nb 3\n"}], coreutils-i18n.patch: Index: coreutils-i18n.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-10/coreutils-i18n.patch,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- coreutils-i18n.patch 16 Jul 2008 14:22:18 -0000 1.27 +++ coreutils-i18n.patch 2 Mar 2009 13:51:18 -0000 1.28 @@ -1919,7 +1919,7 @@ if (newlim) lim = newlim; } -@@ -1384,6 +1570,107 @@ +@@ -1384,6 +1570,113 @@ return ptr; } @@ -1931,7 +1931,10 @@ + size_t eword = key->eword, echar = key->echar; + int i; + size_t mblength; ++ + mbstate_t state; ++ if (echar == 0) ++ eword++; /* skip all of end field. */ + + memset (&state, '\0', sizeof(mbstate_t)); + @@ -2001,24 +2004,27 @@ + } +# endif + -+ /* If we're skipping leading blanks, don't start counting characters -+ * until after skipping past any leading blanks. */ -+ if (key->skipsblanks) -+ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) -+ ptr += mblength; ++ if (echar != 0) ++ { ++ /* If we're skipping leading blanks, don't start counting characters ++ * until after skipping past any leading blanks. */ ++ if (key->skipsblanks) ++ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) ++ ptr += mblength; + -+ memset (&state, '\0', sizeof(mbstate_t)); ++ memset (&state, '\0', sizeof(mbstate_t)); + -+ /* Advance PTR by ECHAR (if possible), but no further than LIM. */ -+ for (i = 0; i < echar; i++) -+ { -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); ++ /* Advance PTR by ECHAR (if possible), but no further than LIM. */ ++ for (i = 0; i < echar; i++) ++ { ++ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); + -+ if (ptr + mblength > lim) -+ break; -+ else -+ ptr += mblength; -+ } ++ if (ptr + mblength > lim) ++ break; ++ else ++ ptr += mblength; ++ } ++ } + + return ptr; +} Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-10/coreutils.spec,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- coreutils.spec 26 Feb 2009 16:28:44 -0000 1.237 +++ coreutils.spec 2 Mar 2009 13:51:18 -0000 1.238 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.12 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -342,6 +342,10 @@ /sbin/runuser %changelog +* Mon Mar 02 2009 Ondrej Vasik - 6.12-20 +- fix sort bugs (including #485715) for multibyte locales + as well + * Thu Feb 26 2009 Ondrej Vasik - 6.12-19 - fix showing ACL's for ls -Z (#487374), fix automatic column width for it as well From nickc at fedoraproject.org Mon Mar 2 13:58:08 2009 From: nickc at fedoraproject.org (Nicholas Clifton) Date: Mon, 2 Mar 2009 13:58:08 +0000 (UTC) Subject: rpms/binutils/devel binutils-2.19.51.0.2-ifunc.patch, NONE, 1.1 binutils.spec, 1.155, 1.156 Message-ID: <20090302135808.EF88F70115@cvs1.fedora.phx.redhat.com> Author: nickc Update of /cvs/pkgs/rpms/binutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17396 Modified Files: binutils.spec Added Files: binutils-2.19.51.0.2-ifunc.patch Log Message: Add IFUNC support. (BZ 465302) binutils-2.19.51.0.2-ifunc.patch: --- NEW FILE binutils-2.19.51.0.2-ifunc.patch --- diff -rcp binutils-2.19.51.0.2.orig/bfd/bfd-in2.h binutils-2.19.51.0.2/bfd/bfd-in2.h *** binutils-2.19.51.0.2.orig/bfd/bfd-in2.h 2009-02-06 09:19:47.000000000 +0000 --- binutils-2.19.51.0.2/bfd/bfd-in2.h 2009-02-10 12:27:00.000000000 +0000 *************** typedef struct bfd_symbol *** 4568,4573 **** --- 4568,4579 ---- /* This symbol was created by bfd_get_synthetic_symtab. */ #define BSF_SYNTHETIC (1 << 21) + /* This symbol is an indirect code object. Unrelated to BSF_INDIRECT. + The dynamic linker will compute the value of this symbol by + calling the function that it points to. BSF_FUNCTION must + also be also set. */ + #define BSF_GNU_INDIRECT_FUNCTION (1 << 22) + flagword flags; /* A pointer to the section to which this symbol is diff -rcp binutils-2.19.51.0.2.orig/bfd/elf32-i386.c binutils-2.19.51.0.2/bfd/elf32-i386.c *** binutils-2.19.51.0.2.orig/bfd/elf32-i386.c 2009-02-06 09:19:53.000000000 +0000 --- binutils-2.19.51.0.2/bfd/elf32-i386.c 2009-03-02 12:26:12.000000000 +0000 *************** elf_i386_tls_transition (struct bfd_link *** 1206,1211 **** --- 1206,1230 ---- return TRUE; } + /* Returns true if the hash entry refers to a symbol + marked for indirect handling during reloc processing. */ + + static bfd_boolean + is_indirect_symbol (bfd * abfd, struct elf_link_hash_entry * h) + { + const struct elf_backend_data * bed; + + if (abfd == NULL || h == NULL) + return FALSE; + + bed = get_elf_backend_data (abfd); + + return h->type == STT_GNU_IFUNC + && (bed->elf_osabi == ELFOSABI_LINUX + /* GNU/Linux is still using the default value 0. */ + || bed->elf_osabi == ELFOSABI_NONE); + } + /* Look through the relocs for a section during the first phase, and calculate needed space in the global offset table, procedure linkage table, and dynamic reloc sections. */ *************** elf_i386_check_relocs (bfd *abfd, *** 1465,1471 **** && (sec->flags & SEC_ALLOC) != 0 && h != NULL && (h->root.type == bfd_link_hash_defweak ! || !h->def_regular))) { struct elf_i386_dyn_relocs *p; struct elf_i386_dyn_relocs **head; --- 1484,1491 ---- && (sec->flags & SEC_ALLOC) != 0 && h != NULL && (h->root.type == bfd_link_hash_defweak ! || !h->def_regular)) ! || is_indirect_symbol (abfd, h)) { struct elf_i386_dyn_relocs *p; struct elf_i386_dyn_relocs **head; *************** elf_i386_check_relocs (bfd *abfd, *** 1483,1488 **** --- 1503,1514 ---- if (sreloc == NULL) return FALSE; + + /* Create the ifunc section as well, even if we have not encountered a + indirect function symbol yet. We may not even see one in the input + object file, but we can still encounter them in libraries. */ + (void) _bfd_elf_make_ifunc_reloc_section + (abfd, sec, htab->elf.dynobj, 2); } /* If this is a global symbol, we count the number of *************** allocate_dynrelocs (struct elf_link_hash *** 2052,2057 **** --- 2078,2092 ---- } } } + else if (is_indirect_symbol (info->output_bfd, h)) + { + if (h->dynindx == -1 + && ! h->forced_local) + { + if (! bfd_elf_link_record_dynamic_symbol (info, h)) + return FALSE; + } + } else if (ELIMINATE_COPY_RELOCS) { /* For the non-shared case, discard space for relocs against *************** allocate_dynrelocs (struct elf_link_hash *** 2090,2096 **** { asection *sreloc; ! sreloc = elf_section_data (p->sec)->sreloc; BFD_ASSERT (sreloc != NULL); sreloc->size += p->count * sizeof (Elf32_External_Rel); --- 2125,2138 ---- { asection *sreloc; ! if (! info->shared ! && is_indirect_symbol (info->output_bfd, h)) ! { ! sreloc = elf_section_data (p->sec)->indirect_relocs; ! elf_tdata (info->output_bfd)->has_ifunc_relocs = TRUE; ! } ! else ! sreloc = elf_section_data (p->sec)->sreloc; BFD_ASSERT (sreloc != NULL); sreloc->size += p->count * sizeof (Elf32_External_Rel); *************** elf_i386_relocate_section (bfd *output_b *** 2902,2908 **** && ((h->def_dynamic && !h->def_regular) || h->root.type == bfd_link_hash_undefweak ! || h->root.type == bfd_link_hash_undefined))) { Elf_Internal_Rela outrel; bfd_byte *loc; --- 2944,2951 ---- && ((h->def_dynamic && !h->def_regular) || h->root.type == bfd_link_hash_undefweak ! || h->root.type == bfd_link_hash_undefined)) ! || is_indirect_symbol (output_bfd, h)) { Elf_Internal_Rela outrel; bfd_byte *loc; *************** elf_i386_relocate_section (bfd *output_b *** 2942,2948 **** outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE); } ! sreloc = elf_section_data (input_section)->sreloc; BFD_ASSERT (sreloc != NULL && sreloc->contents != NULL); --- 2985,2994 ---- outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE); } ! if (! info->shared && is_indirect_symbol (output_bfd, h)) ! sreloc = elf_section_data (input_section)->indirect_relocs; ! else ! sreloc = elf_section_data (input_section)->sreloc; BFD_ASSERT (sreloc != NULL && sreloc->contents != NULL); *************** elf_i386_relocate_section (bfd *output_b *** 2955,2961 **** not want to fiddle with the addend. Otherwise, we need to include the symbol value so that it becomes an addend for the dynamic reloc. */ ! if (! relocate) continue; } break; --- 3001,3007 ---- not want to fiddle with the addend. Otherwise, we need to include the symbol value so that it becomes an addend for the dynamic reloc. */ ! if (! relocate || is_indirect_symbol (output_bfd, h)) continue; } break; *************** elf_i386_hash_symbol (struct elf_link_ha *** 4128,4133 **** --- 4174,4182 ---- #define elf_backend_merge_symbol \ _bfd_elf_sharable_merge_symbol + #undef elf_backend_post_process_headers + #define elf_backend_post_process_headers _bfd_elf_set_osabi + #include "elf32-target.h" /* FreeBSD support. */ *************** elf_i386_hash_symbol (struct elf_link_ha *** 4144,4158 **** executables and (for simplicity) also all other object files. */ static void ! elf_i386_post_process_headers (bfd *abfd, ! struct bfd_link_info *info ATTRIBUTE_UNUSED) { ! Elf_Internal_Ehdr *i_ehdrp; ! ! i_ehdrp = elf_elfheader (abfd); - /* Put an ABI label supported by FreeBSD >= 4.1. */ - i_ehdrp->e_ident[EI_OSABI] = get_elf_backend_data (abfd)->elf_osabi; #ifdef OLD_FREEBSD_ABI_LABEL /* The ABI label supported by FreeBSD <= 4.0 is quite nonstandard. */ memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8); --- 4193,4202 ---- executables and (for simplicity) also all other object files. */ static void ! elf_i386_post_process_headers (bfd *abfd, struct bfd_link_info *info) { ! _bfd_elf_set_osabi (abfd, info); #ifdef OLD_FREEBSD_ABI_LABEL /* The ABI label supported by FreeBSD <= 4.0 is quite nonstandard. */ memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8); diff -rcp binutils-2.19.51.0.2.orig/bfd/elf64-x86-64.c binutils-2.19.51.0.2/bfd/elf64-x86-64.c *** binutils-2.19.51.0.2.orig/bfd/elf64-x86-64.c 2009-02-06 09:19:46.000000000 +0000 --- binutils-2.19.51.0.2/bfd/elf64-x86-64.c 2009-03-02 12:43:47.000000000 +0000 *************** elf64_x86_64_tls_transition (struct bfd_ *** 987,992 **** --- 987,1011 ---- return TRUE; } + /* Returns true if the hash entry refers to a symbol + marked for indirect handling during reloc processing. */ + + static bfd_boolean + is_indirect_symbol (bfd * abfd, struct elf_link_hash_entry * h) + { + const struct elf_backend_data * bed; + + if (abfd == NULL || h == NULL) + return FALSE; + + bed = get_elf_backend_data (abfd); + + return h->type == STT_GNU_IFUNC + && (bed->elf_osabi == ELFOSABI_LINUX + /* GNU/Linux is still using the default value 0. */ + || bed->elf_osabi == ELFOSABI_NONE); + } + /* Look through the relocs for a section during the first phase, and calculate needed space in the global offset table, procedure linkage table, and dynamic reloc sections. */ *************** elf64_x86_64_check_relocs (bfd *abfd, st *** 1268,1274 **** If on the other hand, we are creating an executable, we may need to keep relocations for symbols satisfied by a dynamic library if we manage to avoid copy relocs for the ! symbol. */ if ((info->shared && (sec->flags & SEC_ALLOC) != 0 --- 1287,1296 ---- If on the other hand, we are creating an executable, we may need to keep relocations for symbols satisfied by a dynamic library if we manage to avoid copy relocs for the ! symbol. ! ! Also we must keep any relocations against GNU_IFUNC symbols ! as they will be evaluated at load time. */ if ((info->shared && (sec->flags & SEC_ALLOC) != 0 *************** elf64_x86_64_check_relocs (bfd *abfd, st *** 1285,1291 **** && (sec->flags & SEC_ALLOC) != 0 && h != NULL && (h->root.type == bfd_link_hash_defweak ! || !h->def_regular))) { struct elf64_x86_64_dyn_relocs *p; struct elf64_x86_64_dyn_relocs **head; --- 1307,1314 ---- && (sec->flags & SEC_ALLOC) != 0 && h != NULL && (h->root.type == bfd_link_hash_defweak ! || !h->def_regular)) ! || is_indirect_symbol (abfd, h)) { struct elf64_x86_64_dyn_relocs *p; struct elf64_x86_64_dyn_relocs **head; *************** elf64_x86_64_check_relocs (bfd *abfd, st *** 1303,1308 **** --- 1326,1337 ---- if (sreloc == NULL) return FALSE; + + /* Create the ifunc section as well, even if we have not encountered a + indirect function symbol yet. We may not even see one in the input + object file, but we can still encounter them in libraries. */ + (void) _bfd_elf_make_ifunc_reloc_section + (abfd, sec, htab->elf.dynobj, 2); } /* If this is a global symbol, we count the number of *************** elf64_x86_64_check_relocs (bfd *abfd, st *** 1334,1339 **** --- 1363,1369 ---- if (p == NULL || p->sec != sec) { bfd_size_type amt = sizeof *p; + p = ((struct elf64_x86_64_dyn_relocs *) bfd_alloc (htab->elf.dynobj, amt)); if (p == NULL) *************** allocate_dynrelocs (struct elf_link_hash *** 1744,1750 **** && !info->shared && h->dynindx == -1 && elf64_x86_64_hash_entry (h)->tls_type == GOT_TLS_IE) ! h->got.offset = (bfd_vma) -1; else if (h->got.refcount > 0) { asection *s; --- 1774,1782 ---- && !info->shared && h->dynindx == -1 && elf64_x86_64_hash_entry (h)->tls_type == GOT_TLS_IE) ! { ! h->got.offset = (bfd_vma) -1; ! } else if (h->got.refcount > 0) { asection *s; *************** allocate_dynrelocs (struct elf_link_hash *** 1843,1855 **** /* Make sure undefined weak symbols are output as a dynamic symbol in PIEs. */ else if (h->dynindx == -1 ! && !h->forced_local) ! { ! if (! bfd_elf_link_record_dynamic_symbol (info, h)) ! return FALSE; ! } } } else if (ELIMINATE_COPY_RELOCS) { /* For the non-shared case, discard space for relocs against --- 1875,1892 ---- /* Make sure undefined weak symbols are output as a dynamic symbol in PIEs. */ else if (h->dynindx == -1 ! && ! h->forced_local ! && ! bfd_elf_link_record_dynamic_symbol (info, h)) ! return FALSE; } } + else if (is_indirect_symbol (info->output_bfd, h)) + { + if (h->dynindx == -1 + && ! h->forced_local + && ! bfd_elf_link_record_dynamic_symbol (info, h)) + return FALSE; + } else if (ELIMINATE_COPY_RELOCS) { /* For the non-shared case, discard space for relocs against *************** allocate_dynrelocs (struct elf_link_hash *** 1866,1876 **** /* Make sure this symbol is output as a dynamic symbol. Undefined weak syms won't yet be marked as dynamic. */ if (h->dynindx == -1 ! && !h->forced_local) ! { ! if (! bfd_elf_link_record_dynamic_symbol (info, h)) ! return FALSE; ! } /* If that succeeded, we know we'll be keeping all the relocs. */ --- 1903,1911 ---- /* Make sure this symbol is output as a dynamic symbol. Undefined weak syms won't yet be marked as dynamic. */ if (h->dynindx == -1 ! && ! h->forced_local ! && ! bfd_elf_link_record_dynamic_symbol (info, h)) ! return FALSE; /* If that succeeded, we know we'll be keeping all the relocs. */ *************** allocate_dynrelocs (struct elf_link_hash *** 1888,1894 **** { asection * sreloc; ! sreloc = elf_section_data (p->sec)->sreloc; BFD_ASSERT (sreloc != NULL); --- 1923,1936 ---- { asection * sreloc; ! if (! info->shared ! && is_indirect_symbol (info->output_bfd, h)) ! { ! sreloc = elf_section_data (p->sec)->indirect_relocs; ! elf_tdata (info->output_bfd)->has_ifunc_relocs = TRUE; ! } ! else ! sreloc = elf_section_data (p->sec)->sreloc; BFD_ASSERT (sreloc != NULL); *************** elf64_x86_64_relocate_section (bfd *outp *** 2704,2710 **** && ((h->def_dynamic && !h->def_regular) || h->root.type == bfd_link_hash_undefweak ! || h->root.type == bfd_link_hash_undefined))) { Elf_Internal_Rela outrel; bfd_byte *loc; --- 2746,2753 ---- && ((h->def_dynamic && !h->def_regular) || h->root.type == bfd_link_hash_undefweak ! || h->root.type == bfd_link_hash_undefined)) ! || is_indirect_symbol (output_bfd, h)) { Elf_Internal_Rela outrel; bfd_byte *loc; *************** elf64_x86_64_relocate_section (bfd *outp *** 2790,2796 **** } } ! sreloc = elf_section_data (input_section)->sreloc; BFD_ASSERT (sreloc != NULL && sreloc->contents != NULL); --- 2833,2842 ---- } } ! if (! info->shared && is_indirect_symbol (output_bfd, h)) ! sreloc = elf_section_data (input_section)->indirect_relocs; ! else ! sreloc = elf_section_data (input_section)->sreloc; BFD_ASSERT (sreloc != NULL && sreloc->contents != NULL); *************** elf64_x86_64_relocate_section (bfd *outp *** 2802,2808 **** not want to fiddle with the addend. Otherwise, we need to include the symbol value so that it becomes an addend for the dynamic reloc. */ ! if (! relocate) continue; } --- 2848,2854 ---- not want to fiddle with the addend. Otherwise, we need to include the symbol value so that it becomes an addend for the dynamic reloc. */ ! if (! relocate || is_indirect_symbol (output_bfd, h)) continue; } *************** static const struct bfd_elf_special_sect *** 3958,3963 **** --- 4004,4012 ---- #define elf_backend_hash_symbol \ elf64_x86_64_hash_symbol + #undef elf_backend_post_process_headers + #define elf_backend_post_process_headers _bfd_elf_set_osabi + #include "elf64-target.h" /* FreeBSD support. */ *************** static const struct bfd_elf_special_sect *** 3970,3978 **** #undef ELF_OSABI #define ELF_OSABI ELFOSABI_FREEBSD - #undef elf_backend_post_process_headers - #define elf_backend_post_process_headers _bfd_elf_set_osabi - #undef elf64_bed #define elf64_bed elf64_x86_64_fbsd_bed --- 4019,4024 ---- diff -rcp binutils-2.19.51.0.2.orig/bfd/elf-bfd.h binutils-2.19.51.0.2/bfd/elf-bfd.h *** binutils-2.19.51.0.2.orig/bfd/elf-bfd.h 2009-02-06 09:19:48.000000000 +0000 --- binutils-2.19.51.0.2/bfd/elf-bfd.h 2009-03-02 12:14:23.000000000 +0000 *************** struct bfd_elf_section_data *** 1294,1299 **** --- 1294,1302 ---- /* A pointer to the bfd section used for dynamic relocs. */ asection *sreloc; + /* A pointer to the bfd section used for dynamic relocs against ifunc symbols. */ + asection *indirect_relocs; + union { /* Group name, if this section is a member of a group. */ const char *name; *************** struct elf_obj_tdata *** 1556,1561 **** --- 1559,1569 ---- bfd_size_type build_id_size; bfd_byte *build_id; + /* True if the bfd contains relocs that refer to symbols that + have the STT_GNU_IFUNC symbol type. Used to set the osabi + field in the ELF header structure. */ + bfd_boolean has_ifunc_relocs; + /* An identifier used to distinguish different target specific extensions to this structure. */ enum elf_object_id object_id; *************** extern int _bfd_elf_obj_attrs_arg_type ( *** 2158,2163 **** --- 2166,2174 ---- extern void _bfd_elf_parse_attributes (bfd *, Elf_Internal_Shdr *); extern bfd_boolean _bfd_elf_merge_object_attributes (bfd *, bfd *); + extern asection * _bfd_elf_make_ifunc_reloc_section + (bfd *, asection *, bfd *, unsigned int); + /* Large common section. */ extern asection _bfd_elf_large_com_section; diff -rcp binutils-2.19.51.0.2.orig/bfd/elf.c binutils-2.19.51.0.2/bfd/elf.c *** binutils-2.19.51.0.2.orig/bfd/elf.c 2009-02-06 09:19:47.000000000 +0000 --- binutils-2.19.51.0.2/bfd/elf.c 2009-03-02 12:43:58.000000000 +0000 *************** Unable to find equivalent output section *** 6508,6513 **** --- 6508,6515 ---- if ((flags & BSF_THREAD_LOCAL) != 0) type = STT_TLS; + else if ((flags & BSF_GNU_INDIRECT_FUNCTION) != 0) + type = STT_GNU_IFUNC; else if ((flags & BSF_FUNCTION) != 0) type = STT_FUNC; else if ((flags & BSF_OBJECT) != 0) *************** _bfd_elf_set_osabi (bfd * abfd, *** 9014,9028 **** i_ehdrp = elf_elfheader (abfd); i_ehdrp->e_ident[EI_OSABI] = get_elf_backend_data (abfd)->elf_osabi; } /* Return TRUE for ELF symbol types that represent functions. This is the default version of this function, which is sufficient for ! most targets. It returns true if TYPE is STT_FUNC. */ bfd_boolean _bfd_elf_is_function_type (unsigned int type) { ! return (type == STT_FUNC); } --- 9016,9038 ---- i_ehdrp = elf_elfheader (abfd); i_ehdrp->e_ident[EI_OSABI] = get_elf_backend_data (abfd)->elf_osabi; + + /* To make things simpler for the loader on Linux systems we set the + osabi field to ELFOSABI_LINUX if the binary contains relocs that + reference symbols with the STT_GNU_IFUNC type. */ + if (i_ehdrp->e_ident[EI_OSABI] == ELFOSABI_NONE + && elf_tdata (abfd)->has_ifunc_relocs) + i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_LINUX; } /* Return TRUE for ELF symbol types that represent functions. This is the default version of this function, which is sufficient for ! most targets. It returns true if TYPE is STT_FUNC or STT_GNU_IFUNC. */ bfd_boolean _bfd_elf_is_function_type (unsigned int type) { ! return (type == STT_FUNC ! || type == STT_GNU_IFUNC); } diff -rcp binutils-2.19.51.0.2.orig/bfd/elfcode.h binutils-2.19.51.0.2/bfd/elfcode.h *** binutils-2.19.51.0.2.orig/bfd/elfcode.h 2009-02-06 09:19:47.000000000 +0000 --- binutils-2.19.51.0.2/bfd/elfcode.h 2009-02-10 12:27:38.000000000 +0000 *************** elf_slurp_symbol_table (bfd *abfd, asymb *** 1371,1376 **** --- 1371,1379 ---- case STT_SRELC: sym->symbol.flags |= BSF_SRELC; break; + case STT_GNU_IFUNC: + sym->symbol.flags |= BSF_GNU_INDIRECT_FUNCTION; + break; } if (dynamic) diff -rcp binutils-2.19.51.0.2.orig/bfd/elflink.c binutils-2.19.51.0.2/bfd/elflink.c *** binutils-2.19.51.0.2.orig/bfd/elflink.c 2009-02-06 09:19:47.000000000 +0000 --- binutils-2.19.51.0.2/bfd/elflink.c 2009-02-10 12:28:16.000000000 +0000 *************** _bfd_elf_adjust_dynamic_symbol (struct e *** 2776,2781 **** --- 2776,2788 ---- dynobj = elf_hash_table (eif->info)->dynobj; bed = get_elf_backend_data (dynobj); + + if (h->type == STT_GNU_IFUNC + && (bed->elf_osabi == ELFOSABI_LINUX + /* GNU/Linux is still using the default value 0. */ + || bed->elf_osabi == ELFOSABI_NONE)) + h->needs_plt = 1; + if (! (*bed->elf_backend_adjust_dynamic_symbol) (eif->info, h)) { eif->failed = TRUE; *************** _bfd_elf_sharable_merge_symbol *** 12806,12808 **** --- 12813,12882 ---- return TRUE; } + + /* Returns the name of the ifunc using dynamic reloc section associated with SEC. */ + #define IFUNC_INFIX ".ifunc" + + static const char * + get_ifunc_reloc_section_name (bfd * abfd, + asection * sec) + { + const char * dot; + char * name; + const char * base_name; + unsigned int strndx = elf_elfheader (abfd)->e_shstrndx; + unsigned int shnam = elf_section_data (sec)->rel_hdr.sh_name; + + base_name = bfd_elf_string_from_elf_section (abfd, strndx, shnam); + if (base_name == NULL) + return NULL; + + dot = strchr (base_name + 1, '.'); + name = bfd_alloc (abfd, strlen (base_name) + strlen (IFUNC_INFIX) + 1); + sprintf (name, "%.*s%s%s", (int)(dot - base_name), base_name, IFUNC_INFIX, dot); + + return name; + } + + /* Like _bfd_elf_make_dynamic_reloc_section but it creates a + section for holding relocs against symbols with the STT_GNU_IFUNC + type. The section is attached to the OWNER bfd but it is created + with a name based on SEC from ABFD. */ + + asection * + _bfd_elf_make_ifunc_reloc_section (bfd * abfd, + asection * sec, + bfd * owner, + unsigned int align) + { + asection * reloc_sec = elf_section_data (sec)->indirect_relocs; + + if (reloc_sec == NULL) + { + const char * name = get_ifunc_reloc_section_name (abfd, sec); + + if (name == NULL) + return NULL; + + reloc_sec = bfd_get_section_by_name (owner, name); + + if (reloc_sec == NULL) + { + flagword flags; + + flags = (SEC_HAS_CONTENTS | SEC_READONLY | SEC_IN_MEMORY | SEC_LINKER_CREATED); + if ((sec->flags & SEC_ALLOC) != 0) + flags |= SEC_ALLOC | SEC_LOAD; + + reloc_sec = bfd_make_section_with_flags (owner, name, flags); + + if (reloc_sec != NULL + && ! bfd_set_section_alignment (owner, reloc_sec, align)) + reloc_sec = NULL; + } + + elf_section_data (sec)->indirect_relocs = reloc_sec; + } + + return reloc_sec; + } diff -rcp binutils-2.19.51.0.2.orig/bfd/elfxx-target.h binutils-2.19.51.0.2/bfd/elfxx-target.h *** binutils-2.19.51.0.2.orig/bfd/elfxx-target.h 2009-02-06 09:19:48.000000000 +0000 --- binutils-2.19.51.0.2/bfd/elfxx-target.h 2009-03-02 12:05:55.000000000 +0000 *************** static struct elf_backend_data elfNN_bed *** 742,748 **** elf_backend_want_got_sym, elf_backend_want_dynbss, elf_backend_want_p_paddr_set_to_zero, ! elf_backend_default_execstack }; /* Forward declaration for use when initialising alternative_target field. */ --- 742,748 ---- elf_backend_want_got_sym, elf_backend_want_dynbss, elf_backend_want_p_paddr_set_to_zero, ! elf_backend_default_execstack, }; /* Forward declaration for use when initialising alternative_target field. */ diff -rcp binutils-2.19.51.0.2.orig/bfd/syms.c binutils-2.19.51.0.2/bfd/syms.c *** binutils-2.19.51.0.2.orig/bfd/syms.c 2009-02-06 09:19:51.000000000 +0000 --- binutils-2.19.51.0.2/bfd/syms.c 2009-02-10 12:21:59.000000000 +0000 *************** CODE_FRAGMENT *** 297,302 **** --- 297,308 ---- . {* This symbol was created by bfd_get_synthetic_symtab. *} .#define BSF_SYNTHETIC (1 << 21) . + . {* This symbol is an indirect code object. Unrelated to BSF_INDIRECT. + . The dynamic linker will compute the value of this symbol by + . calling the function that it points to. BSF_FUNCTION must + . also be also set. *} + .#define BSF_GNU_INDIRECT_FUNCTION (1 << 22) + . . flagword flags; . . {* A pointer to the section to which this symbol is *************** bfd_print_symbol_vandf (bfd *abfd, void *** 483,489 **** (type & BSF_WEAK) ? 'w' : ' ', (type & BSF_CONSTRUCTOR) ? 'C' : ' ', (type & BSF_WARNING) ? 'W' : ' ', ! (type & BSF_INDIRECT) ? 'I' : ' ', (type & BSF_DEBUGGING) ? 'd' : (type & BSF_DYNAMIC) ? 'D' : ' ', ((type & BSF_FUNCTION) ? 'F' --- 489,495 ---- (type & BSF_WEAK) ? 'w' : ' ', (type & BSF_CONSTRUCTOR) ? 'C' : ' ', (type & BSF_WARNING) ? 'W' : ' ', ! (type & BSF_INDIRECT) ? 'I' : (type & BSF_GNU_INDIRECT_FUNCTION) ? 'i' : ' ', (type & BSF_DEBUGGING) ? 'd' : (type & BSF_DYNAMIC) ? 'D' : ' ', ((type & BSF_FUNCTION) ? 'F' *************** bfd_decode_symclass (asymbol *symbol) *** 669,674 **** --- 675,682 ---- } if (bfd_is_ind_section (symbol->section)) return 'I'; + if (symbol->flags & BSF_GNU_INDIRECT_FUNCTION) + return 'i'; if (symbol->flags & BSF_WEAK) { /* If weak, determine if it's specifically an object diff -rcp binutils-2.19.51.0.2.orig/binutils/objdump.c binutils-2.19.51.0.2/binutils/objdump.c *** binutils-2.19.51.0.2.orig/binutils/objdump.c 2009-02-06 09:18:56.000000000 +0000 --- binutils-2.19.51.0.2/binutils/objdump.c 2009-02-09 17:36:51.000000000 +0000 *************** dump_reloc_set (bfd *abfd, asection *sec *** 2804,2809 **** --- 2804,2810 ---- if (q->addend) { bfd_signed_vma addend = q->addend; + if (addend < 0) { printf ("-0x"); diff -rcp binutils-2.19.51.0.2.orig/binutils/readelf.c binutils-2.19.51.0.2/binutils/readelf.c *** binutils-2.19.51.0.2.orig/binutils/readelf.c 2009-02-06 09:18:59.000000000 +0000 --- binutils-2.19.51.0.2/binutils/readelf.c 2009-02-10 12:31:17.000000000 +0000 *************** dump_relocations (FILE *file, *** 1247,1255 **** printf (" "); - print_vma (psym->st_value, LONG_HEX); ! printf (is_32bit_elf ? " " : " "); if (psym->st_name == 0) { --- 1247,1285 ---- printf (" "); ! if (ELF_ST_TYPE (psym->st_info) == STT_GNU_IFUNC) ! { ! const char * name; ! unsigned int len; ! unsigned int width = is_32bit_elf ? 8 : 14; ! ! /* Relocations against GNU_IFUNC symbols do not use the value ! of the symbol as the address to relocate against. Instead ! they invoke the function named by the symbol and use its ! result as the address for relocation. ! ! To indicate this to the user, do not display the value of ! the symbol in the "Symbols's Value" field. Instead show ! its name followed by () as a hint that the symbol is ! invoked. */ ! ! if (strtab == NULL ! || psym->st_name == 0 ! || psym->st_name >= strtablen) ! name = "??"; ! else ! name = strtab + psym->st_name; ! ! len = print_symbol (width, name); ! printf ("()%-*s", len <= width ? (width + 1) - len : 1, " "); ! } ! else ! { ! print_vma (psym->st_value, LONG_HEX); ! ! printf (is_32bit_elf ? " " : " "); ! } if (psym->st_name == 0) { *************** get_symbol_type (unsigned int type) *** 7166,7171 **** --- 7196,7207 ---- return "HP_STUB"; } + if (type == STT_GNU_IFUNC + && (elf_header.e_ident[EI_OSABI] == ELFOSABI_LINUX + /* GNU/Linux is still using the default value 0. */ + || elf_header.e_ident[EI_OSABI] == ELFOSABI_NONE)) + return "IFUNC"; + snprintf (buff, sizeof (buff), _(": %d"), type); } else diff -rcp binutils-2.19.51.0.2.orig/elfcpp/elfcpp.h binutils-2.19.51.0.2/elfcpp/elfcpp.h *** binutils-2.19.51.0.2.orig/elfcpp/elfcpp.h 2009-02-06 09:18:19.000000000 +0000 --- binutils-2.19.51.0.2/elfcpp/elfcpp.h 2009-02-10 12:19:01.000000000 +0000 *************** enum STT *** 476,481 **** --- 476,482 ---- STT_COMMON = 5, STT_TLS = 6, STT_LOOS = 10, + STT_GNU_IFUNC = 10, STT_HIOS = 12, STT_LOPROC = 13, STT_HIPROC = 15, diff -rcp binutils-2.19.51.0.2.orig/gas/config/obj-elf.c binutils-2.19.51.0.2/gas/config/obj-elf.c *** binutils-2.19.51.0.2.orig/gas/config/obj-elf.c 2009-02-06 09:19:19.000000000 +0000 --- binutils-2.19.51.0.2/gas/config/obj-elf.c 2009-02-10 12:26:06.000000000 +0000 *************** obj_elf_type (int ignore ATTRIBUTE_UNUSE *** 1706,1711 **** --- 1706,1725 ---- } } } + else if (strcmp (typename, "gnu_indirect_function") == 0 + || strcmp (typename, "10") == 0 + || strcmp (typename, "STT_GNU_IFUNC") == 0) + { + const struct elf_backend_data *bed; + + bed = get_elf_backend_data (stdoutput); + if (!(bed->elf_osabi == ELFOSABI_LINUX + /* GNU/Linux is still using the default value 0. */ + || bed->elf_osabi == ELFOSABI_NONE)) + as_bad (_("symbol type \"%s\" is supported only by GNU targets"), + typename); + type = BSF_FUNCTION | BSF_GNU_INDIRECT_FUNCTION; + } #ifdef md_elf_symbol_type else if ((type = md_elf_symbol_type (typename, sym, elfsym)) != -1) ; diff -rcp binutils-2.19.51.0.2.orig/gas/config/tc-i386.c binutils-2.19.51.0.2/gas/config/tc-i386.c *** binutils-2.19.51.0.2.orig/gas/config/tc-i386.c 2009-02-06 09:19:20.000000000 +0000 --- binutils-2.19.51.0.2/gas/config/tc-i386.c 2009-03-02 12:41:09.000000000 +0000 *************** tc_i386_fix_adjustable (fixS *fixP ATTRI *** 2499,2504 **** --- 2499,2508 ---- || fixP->fx_r_type == BFD_RELOC_VTABLE_INHERIT || fixP->fx_r_type == BFD_RELOC_VTABLE_ENTRY) return 0; + + if (fixP->fx_addsy != NULL + && symbol_get_bfdsym (fixP->fx_addsy)->flags & BSF_GNU_INDIRECT_FUNCTION) + return 0; #endif return 1; } diff -rcp binutils-2.19.51.0.2.orig/gas/doc/as.texinfo binutils-2.19.51.0.2/gas/doc/as.texinfo *** binutils-2.19.51.0.2.orig/gas/doc/as.texinfo 2009-02-06 09:19:18.000000000 +0000 --- binutils-2.19.51.0.2/gas/doc/as.texinfo 2009-02-10 12:25:39.000000000 +0000 *************** The types supported are: *** 6277,6282 **** --- 6277,6287 ---- @itemx function Mark the symbol as being a function name. + @item STT_GNU_IFUNC + @itemx gnu_indirect_function + Mark the symbol as an indirect function when evaluated during reloc + processing. (This is only supported on Linux targeted assemblers). + @item STT_OBJECT @itemx object Mark the symbol as being a data object. diff -rcp binutils-2.19.51.0.2.orig/gas/NEWS binutils-2.19.51.0.2/gas/NEWS *** binutils-2.19.51.0.2.orig/gas/NEWS 2009-02-06 09:19:44.000000000 +0000 --- binutils-2.19.51.0.2/gas/NEWS 2009-02-09 18:10:40.000000000 +0000 *************** *** 1,5 **** --- 1,10 ---- -*- text -*- + * The .type pseudo-op now accepts a type of STT_GNU_IFUNC which can be used to + indicate that if the symbol is the target of a relocation, its value should + not be use. Instead the function should be invoked and its result used as + the value. + * Add support for Lattice Mico32 (lm32) architecture. Changes in 2.19: diff -rcp binutils-2.19.51.0.2.orig/gas/testsuite/gas/elf/type.e binutils-2.19.51.0.2/gas/testsuite/gas/elf/type.e *** binutils-2.19.51.0.2.orig/gas/testsuite/gas/elf/type.e 2009-02-06 09:19:32.000000000 +0000 --- binutils-2.19.51.0.2/gas/testsuite/gas/elf/type.e 2009-02-10 12:31:27.000000000 +0000 *************** *** 1,5 **** .: 0+0 1 FUNC LOCAL DEFAULT . function .: 0+0 1 OBJECT LOCAL DEFAULT . object .: 0+1 1 TLS LOCAL DEFAULT . tls_object ! .: 0+2 1 NOTYPE LOCAL DEFAULT . notype ..: 0+1 1 (COMMON|OBJECT) GLOBAL DEFAULT COM common --- 1,6 ---- .: 0+0 1 FUNC LOCAL DEFAULT . function + .: 0+1 1 IFUNC LOCAL DEFAULT . indirect_function .: 0+0 1 OBJECT LOCAL DEFAULT . object .: 0+1 1 TLS LOCAL DEFAULT . tls_object ! ..: 0+2 1 NOTYPE LOCAL DEFAULT . notype ..: 0+1 1 (COMMON|OBJECT) GLOBAL DEFAULT COM common diff -rcp binutils-2.19.51.0.2.orig/gas/testsuite/gas/elf/type.s binutils-2.19.51.0.2/gas/testsuite/gas/elf/type.s *** binutils-2.19.51.0.2.orig/gas/testsuite/gas/elf/type.s 2009-02-06 09:19:32.000000000 +0000 --- binutils-2.19.51.0.2/gas/testsuite/gas/elf/type.s 2009-02-10 12:26:29.000000000 +0000 *************** *** 3,8 **** --- 3,12 ---- .type function,%function function: .byte 0x0 + .size indirect_function,1 + .type indirect_function,%gnu_indirect_function + indirect_function: + .byte 0x0 .data .type object,%object .size object,1 diff -rcp binutils-2.19.51.0.2.orig/include/elf/common.h binutils-2.19.51.0.2/include/elf/common.h *** binutils-2.19.51.0.2.orig/include/elf/common.h 2009-02-06 09:18:19.000000000 +0000 --- binutils-2.19.51.0.2/include/elf/common.h 2009-02-10 12:18:39.000000000 +0000 *************** *** 549,554 **** --- 549,555 ---- #define STT_RELC 8 /* Complex relocation expression */ #define STT_SRELC 9 /* Signed Complex relocation expression */ #define STT_LOOS 10 /* OS-specific semantics */ + #define STT_GNU_IFUNC 10 /* Symbol is an indirect code object */ #define STT_HIOS 12 /* OS-specific semantics */ #define STT_LOPROC 13 /* Application-specific semantics */ #define STT_HIPROC 15 /* Application-specific semantics */ diff -rcp binutils-2.19.51.0.2.orig/ld/NEWS binutils-2.19.51.0.2/ld/NEWS *** binutils-2.19.51.0.2.orig/ld/NEWS 2009-02-06 09:18:41.000000000 +0000 --- binutils-2.19.51.0.2/ld/NEWS 2009-02-09 18:11:13.000000000 +0000 *************** *** 1,5 **** --- 1,9 ---- -*- text -*- + * For GNU/Linux systems the linker will now avoid processing any relocations + made against symbols of the STT_GNU_IFUNC type and instead emit them into + the resulting binary for processing by the loader. + * --as-needed now links in a dynamic library if it satisfies undefined symbols in regular objects, or in other dynamic libraries. In the latter case the library is not linked if it is found in a DT_NEEDED Index: binutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- binutils.spec 24 Feb 2009 04:45:33 -0000 1.155 +++ binutils.spec 2 Mar 2009 13:57:38 -0000 1.156 @@ -17,7 +17,7 @@ Summary: A GNU collection of binary utilities Name: %{?cross}binutils%{?_with_debug:-debug} Version: 2.19.51.0.2 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -30,6 +30,7 @@ Patch05: binutils-2.19.50.0.1-version.patch Patch06: binutils-2.19.50.0.1-set-long-long.patch Patch07: binutils-2.19.50.0.1-build-id.patch +Patch08: binutils-2.19.51.0.2-ifunc.patch %if 0%{?_with_debug:1} # Define this if you want to skip the strip step and preserve debug info. @@ -100,6 +101,7 @@ %patch05 -p0 -b .version~ %patch06 -p0 -b .set-long-long~ %patch07 -p0 -b .build-id~ +%patch08 -p0 -b .ifunc~ # We cannot run autotools as there is an exact requirement of autoconf-2.59. @@ -343,6 +345,9 @@ %endif # %{isnative} %changelog +* Mon Mar 02 2009 Nick Clifton 2.19.51.0.2-15 +- Add IFUNC support. (BZ 465302) + * Mon Feb 23 2009 Fedora Release Engineering - 2.19.51.0.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From nphilipp at fedoraproject.org Mon Mar 2 13:59:30 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 2 Mar 2009 13:59:30 +0000 (UTC) Subject: rpms/sane-backends/devel sane-backends.spec, 1.117, 1.118 sources, 1.17, 1.18 Message-ID: <20090302135930.27A0770115@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/sane-backends/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17715 Modified Files: sane-backends.spec sources Log Message: fix pkgconfig patch even more Index: sane-backends.spec =================================================================== RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- sane-backends.spec 2 Mar 2009 13:45:10 -0000 1.117 +++ sane-backends.spec 2 Mar 2009 13:58:59 -0000 1.118 @@ -79,6 +79,7 @@ %patch0 -p1 -b .rpath %patch1 -p1 -b .pkgconfig +exit 1 %patch2 -p1 -b .glibc-2.7 %patch3 -p1 -b .policykit %patch4 -p1 -b .uninitialized Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sane-backends/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 2 Mar 2009 13:45:10 -0000 1.17 +++ sources 2 Mar 2009 13:58:59 -0000 1.18 @@ -1,2 +1,2 @@ 8c0936272dcfd4e98c51512699f1c06f sane-backends-1.0.19.tar.gz -b188dafd7729e2a6a012000c1c056353 sane-backends-1.0.19-pkgconfig.patch.bz2 +f54cb9be1016ede98c2a4eee6720d13f sane-backends-1.0.19-pkgconfig.patch.bz2 From xhorak at fedoraproject.org Mon Mar 2 14:04:42 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Mon, 2 Mar 2009 14:04:42 +0000 (UTC) Subject: rpms/thunderbird/devel thunderbird-mozconfig, 1.9, 1.10 thunderbird.spec, 1.123, 1.124 Message-ID: <20090302140442.C663070115@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/thunderbird/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18599 Modified Files: thunderbird-mozconfig thunderbird.spec Log Message: Fix autoconf dependency Index: thunderbird-mozconfig =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird-mozconfig,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- thunderbird-mozconfig 2 Mar 2009 13:36:44 -0000 1.9 +++ thunderbird-mozconfig 2 Mar 2009 14:04:12 -0000 1.10 @@ -1,7 +1,7 @@ mk_add_options MOZ_CO_PROJECT=mail ac_add_options --enable-application=mail mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/ -#mk_add_options AUTOCONF=autoconf-2.13 +mk_add_options AUTOCONF=autoconf-2.13 #ac_add_options --with-system-png Index: thunderbird.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- thunderbird.spec 2 Mar 2009 12:50:22 -0000 1.123 +++ thunderbird.spec 2 Mar 2009 14:04:12 -0000 1.124 @@ -2,6 +2,7 @@ %define nspr_version 4.6 %define nss_version 3.10 %define cairo_version 1.0 +%define autoconf_version 2.13 %define official_branding 1 @@ -48,6 +49,7 @@ %if 0%{?rhel} >= 5 Requires: launchmail %endif +BuildRequires: autoconf >= %{autoconf_version} BuildRequires: cairo-devel >= %{cairo_version} BuildRequires: libpng-devel, libjpeg-devel, gtk2-devel BuildRequires: zlib-devel, gzip, zip, unzip From nphilipp at fedoraproject.org Mon Mar 2 14:08:45 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 2 Mar 2009 14:08:45 +0000 (UTC) Subject: rpms/sane-backends/devel sane-backends.spec,1.118,1.119 Message-ID: <20090302140845.880DE70115@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/sane-backends/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19259 Modified Files: sane-backends.spec Log Message: remove stray "exit 1" Index: sane-backends.spec =================================================================== RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- sane-backends.spec 2 Mar 2009 13:58:59 -0000 1.118 +++ sane-backends.spec 2 Mar 2009 14:08:15 -0000 1.119 @@ -79,7 +79,6 @@ %patch0 -p1 -b .rpath %patch1 -p1 -b .pkgconfig -exit 1 %patch2 -p1 -b .glibc-2.7 %patch3 -p1 -b .policykit %patch4 -p1 -b .uninitialized From nickc at fedoraproject.org Mon Mar 2 14:09:27 2009 From: nickc at fedoraproject.org (Nicholas Clifton) Date: Mon, 2 Mar 2009 14:09:27 +0000 (UTC) Subject: rpms/binutils/devel binutils.spec,1.156,1.157 Message-ID: <20090302140927.2CF7D70115@cvs1.fedora.phx.redhat.com> Author: nickc Update of /cvs/pkgs/rpms/binutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19365 Modified Files: binutils.spec Log Message: Fix off-by-one error in patch 8 Index: binutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- binutils.spec 2 Mar 2009 13:57:38 -0000 1.156 +++ binutils.spec 2 Mar 2009 14:08:56 -0000 1.157 @@ -101,7 +101,7 @@ %patch05 -p0 -b .version~ %patch06 -p0 -b .set-long-long~ %patch07 -p0 -b .build-id~ -%patch08 -p0 -b .ifunc~ +%patch08 -p1 -b .ifunc~ # We cannot run autotools as there is an exact requirement of autoconf-2.59. From ovasik at fedoraproject.org Mon Mar 2 14:09:28 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Mon, 2 Mar 2009 14:09:28 +0000 (UTC) Subject: rpms/coreutils/F-9 coreutils-i18n.patch, 1.24, 1.25 coreutils.spec, 1.221, 1.222 Message-ID: <20090302140928.4A19770115@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19436 Modified Files: coreutils-i18n.patch coreutils.spec Log Message: fix sort bugs (including #485715) for multibyte locales coreutils-i18n.patch: Index: coreutils-i18n.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-9/coreutils-i18n.patch,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- coreutils-i18n.patch 14 Apr 2008 11:06:39 -0000 1.24 +++ coreutils-i18n.patch 2 Mar 2009 14:08:57 -0000 1.25 @@ -1933,7 +1933,7 @@ if (newlim) lim = newlim; } -@@ -1384,6 +1570,107 @@ +@@ -1384,6 +1570,113 @@ return ptr; } @@ -1946,6 +1946,9 @@ + int i; + size_t mblength; + mbstate_t state; ++ if (echar == 0) ++ eword++; /* skip all of end field. */ ++ + + memset (&state, '\0', sizeof(mbstate_t)); + @@ -2015,24 +2018,27 @@ + } +# endif + -+ /* If we're skipping leading blanks, don't start counting characters -+ * until after skipping past any leading blanks. */ -+ if (key->skipsblanks) -+ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) -+ ptr += mblength; ++ if (echar != 0) ++ { ++ /* If we're skipping leading blanks, don't start counting characters ++ * until after skipping past any leading blanks. */ ++ if (key->skipsblanks) ++ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) ++ ptr += mblength; + -+ memset (&state, '\0', sizeof(mbstate_t)); ++ memset (&state, '\0', sizeof(mbstate_t)); + -+ /* Advance PTR by ECHAR (if possible), but no further than LIM. */ -+ for (i = 0; i < echar; i++) -+ { -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); ++ /* Advance PTR by ECHAR (if possible), but no further than LIM. */ ++ for (i = 0; i < echar; i++) ++ { ++ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); + -+ if (ptr + mblength > lim) -+ break; -+ else -+ ptr += mblength; -+ } ++ if (ptr + mblength > lim) ++ break; ++ else ++ ptr += mblength; ++ } ++ } + + return ptr; +} Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-9/coreutils.spec,v retrieving revision 1.221 retrieving revision 1.222 diff -u -r1.221 -r1.222 --- coreutils.spec 27 Feb 2009 10:49:41 -0000 1.221 +++ coreutils.spec 2 Mar 2009 14:08:57 -0000 1.222 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.10 -Release: 34%{?dist} +Release: 35%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -344,6 +344,10 @@ /sbin/runuser %changelog +* Mon Mar 02 2009 Ondrej Vasik 6.10-35 +- fix sort bugs (including #485715) for multibyte locales + as well + * Fri Feb 27 2009 Ondrej Vasik - 6.10-34 - fix showing ACL's for ls -Z (#487374), fix automatic column width for it as well From msivak at fedoraproject.org Mon Mar 2 14:10:00 2009 From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=) Date: Mon, 2 Mar 2009 14:10:00 +0000 (UTC) Subject: rpms/python-cryptsetup/devel .cvsignore, 1.6, 1.7 python-cryptsetup.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <20090302141000.92CE770115@cvs1.fedora.phx.redhat.com> Author: msivak Update of /cvs/extras/rpms/python-cryptsetup/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19612 Modified Files: .cvsignore python-cryptsetup.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 Mar 2009 12:54:47 -0000 1.6 +++ .cvsignore 2 Mar 2009 14:09:30 -0000 1.7 @@ -1 +1 @@ -python-cryptsetup-0.0.5.tar.bz2 +python-cryptsetup-0.0.6.tar.bz2 Index: python-cryptsetup.spec =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/python-cryptsetup.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-cryptsetup.spec 2 Mar 2009 12:54:47 -0000 1.5 +++ python-cryptsetup.spec 2 Mar 2009 14:09:30 -0000 1.6 @@ -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-cryptsetup -Version: 0.0.5 +Version: 0.0.6 Release: 1%{?dist} Summary: Python bindings for cryptsetup @@ -43,6 +43,10 @@ %changelog * Mon Mar 01 2009 Martin Sivak - 0.0.5-1 +- fix the UUID extraction logic +- fix the key manipulation + +* Mon Mar 01 2009 Martin Sivak - 0.0.5-1 - fix the luksUUID * Mon Mar 01 2009 Martin Sivak - 0.0.4-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Mar 2009 12:54:47 -0000 1.6 +++ sources 2 Mar 2009 14:09:30 -0000 1.7 @@ -1 +1 @@ -d32b0808c38cf31c99600bfcc271f645 python-cryptsetup-0.0.5.tar.bz2 +8bdd2ba915a1c11a50385359d0a0ea22 python-cryptsetup-0.0.6.tar.bz2 From vcrhonek at fedoraproject.org Mon Mar 2 14:12:22 2009 From: vcrhonek at fedoraproject.org (Vitezslav Crhonek) Date: Mon, 2 Mar 2009 14:12:22 +0000 (UTC) Subject: rpms/tcsh/devel tcsh-6.15.00-rs-color.patch, NONE, 1.1 tcsh.spec, 1.59, 1.60 Message-ID: <20090302141222.BCFE770115@cvs1.fedora.phx.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/tcsh/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20285 Modified Files: tcsh.spec Added Files: tcsh-6.15.00-rs-color.patch Log Message: Fix tcsh needs to know about new colorls variables tcsh-6.15.00-rs-color.patch: --- NEW FILE tcsh-6.15.00-rs-color.patch --- --- tcsh-6.15.00/tw.color.c.rs 2009-02-27 16:03:44.000000000 -0500 +++ tcsh-6.15.00/tw.color.c 2009-02-27 16:05:57.000000000 -0500 @@ -86,6 +86,8 @@ static Variable variables[] = { VAR(NOS, "ow", ""), /* Other writable dir (o+w) but not sticky */ VAR(NOS, "st", ""), /* Sticky dir (+t) but not other writable */ VAR(NOS, "ca", ""), /* file with capability */ + VAR(NOS, "rs", ""), /* RESET */ + VAR(NOS, "hl", ""), /* Hardlink */ }; enum FileType { Index: tcsh.spec =================================================================== RCS file: /cvs/extras/rpms/tcsh/devel/tcsh.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- tcsh.spec 25 Feb 2009 19:07:42 -0000 1.59 +++ tcsh.spec 2 Mar 2009 14:11:52 -0000 1.60 @@ -3,7 +3,7 @@ Summary: An enhanced version of csh, the C shell Name: tcsh Version: 6.15 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD with advertising Group: System Environment/Shells Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz @@ -19,6 +19,7 @@ Patch10: tcsh-6.14.00-octal.patch Patch11: tcsh-6.14.00-order.patch Patch12: tcsh-6.15.00-wide-str.patch +Patch13: tcsh-6.15.00-rs-color.patch Provides: csh = %{version} Requires(post): grep Requires(postun): coreutils, grep @@ -48,6 +49,7 @@ %patch10 -p1 -b .octal %patch11 -p1 -b .order %patch12 -p1 -b .wide-str +%patch13 -p1 -b .rs-color %build # For tcsh-6.14.00-tinfo.patch @@ -115,6 +117,10 @@ %{_mandir}/*/* %changelog +* Mon Mar 2 2009 Vitezslav Crhonek - 6.15-8 +- Fix tcsh needs to know about new colorls variables + Resolves: #487783 + * Wed Feb 25 2009 Fedora Release Engineering - 6.15-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ausil at fedoraproject.org Mon Mar 2 14:13:19 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Mon, 2 Mar 2009 14:13:19 +0000 (UTC) Subject: rpms/pl/F-9 pl.spec,1.52,1.53 Message-ID: <20090302141319.5A19E70115@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/pl/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20431 Modified Files: pl.spec Log Message: fix JAVA_HOME and JAVA_LIB on sparc arches Index: pl.spec =================================================================== RCS file: /cvs/pkgs/rpms/pl/F-9/pl.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- pl.spec 25 Feb 2009 12:10:13 -0000 1.52 +++ pl.spec 2 Mar 2009 14:12:48 -0000 1.53 @@ -3,7 +3,7 @@ Name: pl Version: 5.6.60 -Release: 3%{?dist} +Release: 4%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -124,8 +124,17 @@ %ifarch x86_64 export JAVA_LIB=$JAVA_HOME/jre/lib/amd64 %else +%ifarch sparcv9 +export JAVA_HOME=/usr/lib/jvm/java-%{jdkvershort}-openjdk-%{jdkverlong} +export JAVA_LIB=$JAVA_HOME/jre/lib/sparc +%else +%ifarch sparc64 +export JAVA_LIB=$JAVA_HOME/jre/lib/sparcv9 +%else export JAVA_LIB=$JAVA_HOME/jre/lib/%{_arch} %endif +%endif +%endif %configure --enable-shared make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" PATH=$PWD/src:$PATH @@ -230,6 +239,9 @@ %changelog +* Mon Mar 02 2009 Dennis Gilmore - 5.6.60-4 +- fix JAVA_HOME and JAVA_LIB for sparc arches + * Wed Feb 25 2009 Mary Ellen Foster - 5.6.60-3 - Unify F9 and F10 changes: - Update to 5.6.60 (Tom Callaway) From xhorak at fedoraproject.org Mon Mar 2 14:15:02 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Mon, 2 Mar 2009 14:15:02 +0000 (UTC) Subject: rpms/thunderbird/devel thunderbird-mozconfig,1.10,1.11 Message-ID: <20090302141502.2173E70115@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/thunderbird/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21001 Modified Files: thunderbird-mozconfig Log Message: Fix autoconf dependency Index: thunderbird-mozconfig =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird-mozconfig,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- thunderbird-mozconfig 2 Mar 2009 14:04:12 -0000 1.10 +++ thunderbird-mozconfig 2 Mar 2009 14:14:31 -0000 1.11 @@ -1,7 +1,7 @@ mk_add_options MOZ_CO_PROJECT=mail ac_add_options --enable-application=mail mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/ -mk_add_options AUTOCONF=autoconf-2.13 +#mk_add_options AUTOCONF=autoconf-2.13 #ac_add_options --with-system-png From xhorak at fedoraproject.org Mon Mar 2 14:24:29 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Mon, 2 Mar 2009 14:24:29 +0000 (UTC) Subject: rpms/thunderbird/devel thunderbird-mozconfig,1.11,1.12 Message-ID: <20090302142429.A7F8F70115@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/thunderbird/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22423 Modified Files: thunderbird-mozconfig Log Message: Fix autoconf dependency Index: thunderbird-mozconfig =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird-mozconfig,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- thunderbird-mozconfig 2 Mar 2009 14:14:31 -0000 1.11 +++ thunderbird-mozconfig 2 Mar 2009 14:23:59 -0000 1.12 @@ -1,7 +1,7 @@ mk_add_options MOZ_CO_PROJECT=mail ac_add_options --enable-application=mail mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/ -#mk_add_options AUTOCONF=autoconf-2.13 +mk_add_options AUTOCONF=autoconf #ac_add_options --with-system-png From nphilipp at fedoraproject.org Mon Mar 2 14:27:34 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 2 Mar 2009 14:27:34 +0000 (UTC) Subject: rpms/xsane/devel xsane.spec,1.65,1.66 Message-ID: <20090302142734.79C5370115@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/xsane/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23541 Modified Files: xsane.spec Log Message: rebuild against new sane-backends (just in case) Index: xsane.spec =================================================================== RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- xsane.spec 26 Feb 2009 12:00:18 -0000 1.65 +++ xsane.spec 2 Mar 2009 14:27:03 -0000 1.66 @@ -3,7 +3,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.996 -Release: 4%{?dist} +Release: 5%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane.desktop Source2: xsane.conf.in @@ -18,7 +18,7 @@ BuildRequires: lcms-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: sane-backends-devel +BuildRequires: sane-backends-devel >= sane-backends-1.0.19-15 BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: libtiff-devel BuildRequires: gettext-devel @@ -113,6 +113,9 @@ %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf %changelog +* Tue Jan 20 2009 Nils Philippsen - 0.996-5 +- rebuild against new sane-backends (just in case) + * Thu Feb 26 2009 Fedora Release Engineering - 0.996-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From nphilipp at fedoraproject.org Mon Mar 2 14:29:54 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 2 Mar 2009 14:29:54 +0000 (UTC) Subject: rpms/xsane/devel xsane.spec,1.66,1.67 Message-ID: <20090302142954.74B6770115@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/xsane/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24046 Modified Files: xsane.spec Log Message: fix changelog entry Index: xsane.spec =================================================================== RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- xsane.spec 2 Mar 2009 14:27:03 -0000 1.66 +++ xsane.spec 2 Mar 2009 14:29:24 -0000 1.67 @@ -113,7 +113,7 @@ %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf %changelog -* Tue Jan 20 2009 Nils Philippsen - 0.996-5 +* Mon Mar 02 2009 Nils Philippsen - 0.996-5 - rebuild against new sane-backends (just in case) * Thu Feb 26 2009 Fedora Release Engineering - 0.996-4 From ausil at fedoraproject.org Mon Mar 2 14:33:55 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Mon, 2 Mar 2009 14:33:55 +0000 (UTC) Subject: rpms/pl/F-10 pl.spec,1.53,1.54 Message-ID: <20090302143355.1E44F70115@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/pl/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24843 Modified Files: pl.spec Log Message: fix JAVA_HOME and JAVA_LIB for sparc arches Index: pl.spec =================================================================== RCS file: /cvs/pkgs/rpms/pl/F-10/pl.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- pl.spec 25 Feb 2009 12:10:13 -0000 1.53 +++ pl.spec 2 Mar 2009 14:33:24 -0000 1.54 @@ -3,7 +3,7 @@ Name: pl Version: 5.6.60 -Release: 3%{?dist} +Release: 4%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -124,8 +124,17 @@ %ifarch x86_64 export JAVA_LIB=$JAVA_HOME/jre/lib/amd64 %else +%ifarch sparcv9 +export JAVA_HOME=/usr/lib/jvm/java-%{jdkvershort}-openjdk-%{jdkverlong} +export JAVA_LIB=$JAVA_HOME/jre/lib/sparc +%else +%ifarch sparc64 +export JAVA_LIB=$JAVA_HOME/jre/lib/sparcv9 +%else export JAVA_LIB=$JAVA_HOME/jre/lib/%{_arch} %endif +%endif +%endif %configure --enable-shared make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" PATH=$PWD/src:$PATH @@ -230,17 +239,22 @@ %changelog +* Mon Mar 02 2009 Dennis Gilmore - 5.6.60-4 +- fix JAVA_HOME and JAVA_LIB for sparc arches + * Wed Feb 25 2009 Mary Ellen Foster - 5.6.60-3 - Unify F9 and F10 changes: - - Fix java LIBDIRS on alpha (Oliver Falk) * Fri Sep 19 2008 Tom "spot" Callaway - 5.6.60-2 - forgot to remove ANNOUNCE from doc list - + * Fri Sep 19 2008 Tom "spot" Callaway - 5.6.60-1 - update to 5.6.60 - use openjdk (FIXME: there may be a way to make this more generic) +* Mon Feb 16 2009 Oliver Falk - 5.6.57-3 +- Fix java LIBDIRS on alpha + * Wed Jul 2 2008 Mary Ellen Foster - 5.6.57-2 - Build using any Java - Include patch from SWI for Turkish locale (thanks to Keri Harris) From xhorak at fedoraproject.org Mon Mar 2 14:36:19 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Mon, 2 Mar 2009 14:36:19 +0000 (UTC) Subject: rpms/thunderbird/devel thunderbird.spec,1.124,1.125 Message-ID: <20090302143620.0546870115@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/thunderbird/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25405 Modified Files: thunderbird.spec Log Message: Fix autoconf dependency Index: thunderbird.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- thunderbird.spec 2 Mar 2009 14:04:12 -0000 1.124 +++ thunderbird.spec 2 Mar 2009 14:35:49 -0000 1.125 @@ -49,7 +49,7 @@ %if 0%{?rhel} >= 5 Requires: launchmail %endif -BuildRequires: autoconf >= %{autoconf_version} +BuildRequires: autoconf = %{autoconf_version} BuildRequires: cairo-devel >= %{cairo_version} BuildRequires: libpng-devel, libjpeg-devel, gtk2-devel BuildRequires: zlib-devel, gzip, zip, unzip From ausil at fedoraproject.org Mon Mar 2 14:37:09 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Mon, 2 Mar 2009 14:37:09 +0000 (UTC) Subject: rpms/pl/F-10 pl.spec,1.54,1.55 Message-ID: <20090302143709.D13B170115@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/pl/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25583 Modified Files: pl.spec Log Message: Fix SPEC Index: pl.spec =================================================================== RCS file: /cvs/pkgs/rpms/pl/F-10/pl.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- pl.spec 2 Mar 2009 14:33:24 -0000 1.54 +++ pl.spec 2 Mar 2009 14:36:39 -0000 1.55 @@ -252,9 +252,6 @@ - update to 5.6.60 - use openjdk (FIXME: there may be a way to make this more generic) -* Mon Feb 16 2009 Oliver Falk - 5.6.57-3 -- Fix java LIBDIRS on alpha - * Wed Jul 2 2008 Mary Ellen Foster - 5.6.57-2 - Build using any Java - Include patch from SWI for Turkish locale (thanks to Keri Harris) From nphilipp at fedoraproject.org Mon Mar 2 14:42:39 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 2 Mar 2009 14:42:39 +0000 (UTC) Subject: rpms/xsane/devel xsane.spec,1.67,1.68 Message-ID: <20090302144239.C2B0970115@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/xsane/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26714 Modified Files: xsane.spec Log Message: fix sane-backends-devel BR Index: xsane.spec =================================================================== RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- xsane.spec 2 Mar 2009 14:29:24 -0000 1.67 +++ xsane.spec 2 Mar 2009 14:42:09 -0000 1.68 @@ -3,7 +3,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.996 -Release: 5%{?dist} +Release: 6%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane.desktop Source2: xsane.conf.in @@ -18,7 +18,7 @@ BuildRequires: lcms-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: sane-backends-devel >= sane-backends-1.0.19-15 +BuildRequires: sane-backends-devel >= 1.0.19-15 BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: libtiff-devel BuildRequires: gettext-devel @@ -113,7 +113,7 @@ %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf %changelog -* Mon Mar 02 2009 Nils Philippsen - 0.996-5 +* Mon Mar 02 2009 Nils Philippsen - 0.996-6 - rebuild against new sane-backends (just in case) * Thu Feb 26 2009 Fedora Release Engineering - 0.996-4 From ausil at fedoraproject.org Mon Mar 2 14:45:05 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Mon, 2 Mar 2009 14:45:05 +0000 (UTC) Subject: rpms/pl/devel pl.spec,1.56,1.57 Message-ID: <20090302144505.8A07270115@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/pl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27275 Modified Files: pl.spec Log Message: fix JAVA_HOME and JAVA_LIB for sparc arches Index: pl.spec =================================================================== RCS file: /cvs/pkgs/rpms/pl/devel/pl.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- pl.spec 1 Mar 2009 15:48:36 -0000 1.56 +++ pl.spec 2 Mar 2009 14:44:34 -0000 1.57 @@ -126,8 +126,17 @@ %ifarch x86_64 export JAVA_LIB=$JAVA_HOME/jre/lib/amd64 %else +%ifarch sparcv9 +export JAVA_HOME=/usr/lib/jvm/java-%{jdkvershort}-openjdk-%{jdkverlong} +export JAVA_LIB=$JAVA_HOME/jre/lib/sparc +%else +%ifarch sparc64 +export JAVA_LIB=$JAVA_HOME/jre/lib/sparcv9 +%else export JAVA_LIB=$JAVA_HOME/jre/lib/%{_arch} %endif +%endif +%endif %configure --enable-shared make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" PATH=$PWD/src:$PATH @@ -232,6 +241,9 @@ %changelog +* Mon Mar 02 2009 Dennis Gilmore 5.7.6-4 +- fix JAVA_HOME and JAVA_LIB for sparc arches + * Sun Mar 01 2009 Karsten Hopp 5.7.6-3 - fix java LIBDIRS for mainframe, similar to alpha From tbzatek at fedoraproject.org Mon Mar 2 14:46:18 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 2 Mar 2009 14:46:18 +0000 (UTC) Subject: rpms/gvfs/F-10 gvfs-1.0.4-fuse-truncate-immediately.patch, NONE, 1.1 gvfs.spec, 1.96, 1.97 Message-ID: <20090302144618.50A3170115@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27598 Modified Files: gvfs.spec Added Files: gvfs-1.0.4-fuse-truncate-immediately.patch Log Message: * Mon Mar 2 2009 Tomas Bzatek - 1.0.3-6 - FUSE: truncate files immediately (#479199) gvfs-1.0.4-fuse-truncate-immediately.patch: --- NEW FILE gvfs-1.0.4-fuse-truncate-immediately.patch --- Index: client/gvfsfusedaemon.c =================================================================== --- client/gvfsfusedaemon.c (revision 2250) +++ client/gvfsfusedaemon.c (working copy) @@ -1773,6 +1773,16 @@ vfs_ftruncate (const gchar *path, off_t fh->stream = NULL; fh->stream = g_file_replace (file, 0, FALSE, 0, NULL, &error); + + if (fh->stream != NULL) + { + /* The stream created by g_file_replace() won't always replace + * the file until it's been closed. So close it now to make + * future operations consistent. */ + g_output_stream_close (fh->stream, NULL, NULL); + g_object_unref (fh->stream); + fh->stream = NULL; + } } else { Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/F-10/gvfs.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- gvfs.spec 28 Jan 2009 13:01:04 -0000 1.96 +++ gvfs.spec 2 Mar 2009 14:45:48 -0000 1.97 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.0.3 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -52,6 +52,11 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=519071 Patch10: obex-write-v3.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=479199 +# Immediately close the stream we get from g_file_replace(), so truncation becomes visible. +Patch11: gvfs-1.0.4-fuse-truncate-immediately.patch + + %description The gvfs package provides backend implementations for the gio framework in GLib. It includes ftp, sftp, cifs. @@ -142,6 +147,8 @@ pushd daemon/ %patch10 -p0 -b .obexftp-write popd +%patch11 -p0 -b .fuse-trunc + %build @@ -279,6 +286,9 @@ %changelog +* Mon Mar 2 2009 Tomas Bzatek - 1.0.3-6 +- FUSE: truncate files immediately (#479199) + * Wed Jan 28 2009 - Bastien Nocera - 1.0.3-5 - Add ObexFTP write support From ausil at fedoraproject.org Mon Mar 2 14:47:10 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Mon, 2 Mar 2009 14:47:10 +0000 (UTC) Subject: rpms/pl/devel pl.spec,1.57,1.58 Message-ID: <20090302144710.7D90470115@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/pl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27761 Modified Files: pl.spec Log Message: actually bump release Index: pl.spec =================================================================== RCS file: /cvs/pkgs/rpms/pl/devel/pl.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- pl.spec 2 Mar 2009 14:44:34 -0000 1.57 +++ pl.spec 2 Mar 2009 14:46:40 -0000 1.58 @@ -3,7 +3,7 @@ Name: pl Version: 5.7.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler From pkgdb at fedoraproject.org Mon Mar 2 14:47:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 14:47:51 +0000 Subject: [pkgdb] aircrack-ng: bilel has requested watchcommits Message-ID: <20090302144812.DA7752084D1@bastion.fedora.phx.redhat.com> bilel has requested the watchcommits acl on aircrack-ng (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng From pkgdb at fedoraproject.org Mon Mar 2 14:47:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 14:47:48 +0000 Subject: [pkgdb] aircrack-ng: bilel has given up watchcommits Message-ID: <20090302144818.C09EA20820B@bastion.fedora.phx.redhat.com> bilel has given up the watchcommits acl on aircrack-ng (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng From rdieter at fedoraproject.org Mon Mar 2 14:48:23 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 2 Mar 2009 14:48:23 +0000 (UTC) Subject: rpms/ntl/devel ntl-5.4.2-gcc44.patch,NONE,1.1 ntl.spec,1.15,1.16 Message-ID: <20090302144823.6963F70115@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/ntl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28140 Modified Files: ntl.spec Added Files: ntl-5.4.2-gcc44.patch Log Message: gcc44 patch ntl-5.4.2-gcc44.patch: --- NEW FILE ntl-5.4.2-gcc44.patch --- diff -up ntl-5.4.2/src/WordVector.c.gcc44 ntl-5.4.2/src/WordVector.c --- ntl-5.4.2/src/WordVector.c.gcc44 2008-03-04 17:35:01.000000000 -0600 +++ ntl-5.4.2/src/WordVector.c 2009-03-02 08:25:20.000000000 -0600 @@ -3,6 +3,8 @@ #include +#include + NTL_START_IMPL diff -up ntl-5.4.2/src/GF2EX.c.gcc44 ntl-5.4.2/src/GF2EX.c diff -up ntl-5.4.2/src/GF2X.c.gcc44 ntl-5.4.2/src/GF2X.c --- ntl-5.4.2/src/GF2X.c.gcc44 2008-03-04 17:35:01.000000000 -0600 +++ ntl-5.4.2/src/GF2X.c 2009-03-02 08:32:09.000000000 -0600 @@ -4,6 +4,8 @@ #include +#include + NTL_START_IMPL long GF2X::HexOutput = 0; diff -up ntl-5.4.2/src/newnames.c.gcc44 ntl-5.4.2/src/newnames.c diff -up ntl-5.4.2/src/vec_GF2.c.gcc44 ntl-5.4.2/src/vec_GF2.c --- ntl-5.4.2/src/vec_GF2.c.gcc44 2008-03-04 17:35:01.000000000 -0600 +++ ntl-5.4.2/src/vec_GF2.c 2009-03-02 08:31:48.000000000 -0600 @@ -3,6 +3,8 @@ #include +#include + NTL_START_IMPL void vec_GF2::SetLength(long n) diff -up ntl-5.4.2/src/tools.c.gcc44 ntl-5.4.2/src/tools.c --- ntl-5.4.2/src/tools.c.gcc44 2008-03-04 17:35:01.000000000 -0600 +++ ntl-5.4.2/src/tools.c 2009-03-02 08:31:20.000000000 -0600 @@ -5,6 +5,8 @@ #include +#include + NTL_START_IMPL diff -up ntl-5.4.2/include/NTL/vector.h.gcc44 ntl-5.4.2/include/NTL/vector.h --- ntl-5.4.2/include/NTL/vector.h.gcc44 2008-03-04 17:35:02.000000000 -0600 +++ ntl-5.4.2/include/NTL/vector.h 2009-03-02 08:25:44.000000000 -0600 @@ -4,6 +4,8 @@ #include +#include + struct _ntl_VectorHeader { long length; long alloc; Index: ntl.spec =================================================================== RCS file: /cvs/pkgs/rpms/ntl/devel/ntl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ntl.spec 2 Mar 2009 02:54:34 -0000 1.15 +++ ntl.spec 2 Mar 2009 14:47:53 -0000 1.16 @@ -14,6 +14,8 @@ Source1: multilib_template.h +Patch1: ntl-5.4.2-gcc44.patch + BuildRequires: gmp-devel # includes no debuginfo'able bits, disable @@ -64,6 +66,8 @@ %prep %setup -q +%patch1 -p1 -b .gcc44 + %build cd src @@ -127,8 +131,9 @@ %changelog -* Sun Mar 01 2009 Rex Dieter 5.4.2-6 +* Mon Mar 02 2009 Rex Dieter 5.4.2-6 - s/i386/%%ix86/ +- gcc44 patch * Wed Feb 25 2009 Fedora Release Engineering - 5.4.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kyle at fedoraproject.org Mon Mar 2 15:00:40 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Mon, 2 Mar 2009 15:00:40 +0000 (UTC) Subject: rpms/kernel/devel ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch, NONE, 1.1 kernel.spec, 1.1357, 1.1358 Message-ID: <20090302150040.5DB0270115@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31026 Modified Files: kernel.spec Added Files: ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch Log Message: * Mon Mar 02 2009 Kyle McMartin - fix oops in ipv6 when NET_NS is enabled. ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch: --- NEW FILE ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch --- >From netdev-owner at vger.kernel.org Thu Feb 26 06:32:12 2009 Date: Thu, 26 Feb 2009 14:31:55 +0300 From: Pavel Emelyanov Subject: ipv6: don't use tw net when accounting for recycled tw We already have a valid net in that place, but this is not just a cleanup - the tw pointer can be NULL there sometimes, thus causing an oops in NET_NS=y case. The same place in ipv4 code already works correctly using existing net, rather than tw's one. The bug exists since 2.6.27. Signed-off-by: Pavel Emelyanov --- diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index 8fe267f..1bcc343 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c @@ -258,11 +258,11 @@ unique: if (twp != NULL) { *twp = tw; - NET_INC_STATS_BH(twsk_net(tw), LINUX_MIB_TIMEWAITRECYCLED); + NET_INC_STATS_BH(net, LINUX_MIB_TIMEWAITRECYCLED); } else if (tw != NULL) { /* Silly. Should hash-dance instead... */ inet_twsk_deschedule(tw, death_row); - NET_INC_STATS_BH(twsk_net(tw), LINUX_MIB_TIMEWAITRECYCLED); + NET_INC_STATS_BH(net, LINUX_MIB_TIMEWAITRECYCLED); inet_twsk_put(tw); } -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1357 retrieving revision 1.1358 diff -u -r1.1357 -r1.1358 --- kernel.spec 2 Mar 2009 06:13:20 -0000 1.1357 +++ kernel.spec 2 Mar 2009 15:00:09 -0000 1.1358 @@ -660,6 +660,8 @@ Patch2200: linux-2.6-firewire-git-update.patch Patch2201: linux-2.6-firewire-git-pending.patch +Patch2250: ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch + Patch2300: linux-2.6.28-sunrpc-ipv6-rpcbind.patch Patch2301: linux-2.6.28-lockd-svc-register.patch @@ -1192,6 +1194,9 @@ #ApplyPatch linux-2.6-firewire-git-pending.patch #fi +# fix oops with CONFIG_NET_NS=y +ApplyPatch ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch + # Fix NFS ApplyPatch linux-2.6.28-sunrpc-ipv6-rpcbind.patch @@ -1790,6 +1795,9 @@ # and build. %changelog +* Mon Mar 02 2009 Kyle McMartin +- fix oops in ipv6 when NET_NS is enabled. + * Mon Mar 02 2009 Ben Skeggs - nouveau fixes for recent drm-next changes, and various kms issues From kyle at fedoraproject.org Mon Mar 2 15:02:58 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Mon, 2 Mar 2009 15:02:58 +0000 (UTC) Subject: rpms/kernel/devel kernel.spec,1.1358,1.1359 Message-ID: <20090302150258.60C1070115@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31502 Modified Files: kernel.spec Log Message: bump Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1358 retrieving revision 1.1359 diff -u -r1.1358 -r1.1359 --- kernel.spec 2 Mar 2009 15:00:09 -0000 1.1358 +++ kernel.spec 2 Mar 2009 15:02:27 -0000 1.1359 @@ -1795,7 +1795,7 @@ # and build. %changelog -* Mon Mar 02 2009 Kyle McMartin +* Mon Mar 02 2009 Kyle McMartin 2.6.29-0.179.rc6.git5 - fix oops in ipv6 when NET_NS is enabled. * Mon Mar 02 2009 Ben Skeggs From langel at fedoraproject.org Mon Mar 2 15:15:47 2009 From: langel at fedoraproject.org (Lillian Angel) Date: Mon, 2 Mar 2009 15:15:47 +0000 (UTC) Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.108,1.109 Message-ID: <20090302151547.712D070115@cvs1.fedora.phx.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1624 Modified Files: java-1.6.0-openjdk.spec Log Message: * Mon Mar 2 2009 Lillian Angel - 1:1.6.0-14.b14 - Fixed archinstall i386 to i586, since Fedora 11 made the switch. Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- java-1.6.0-openjdk.spec 25 Feb 2009 21:19:04 -0000 1.108 +++ java-1.6.0-openjdk.spec 2 Mar 2009 15:15:16 -0000 1.109 @@ -35,7 +35,7 @@ %ifarch %{ix86} %define archbuild i586 -%define archinstall i386 +%define archinstall i586 %endif %ifarch x86_64 %define archbuild amd64 @@ -120,7 +120,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 13.%{openjdkver}%{?dist} +Release: 14.%{openjdkver}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -921,6 +921,9 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so %changelog +* Mon Mar 2 2009 Lillian Angel - 1:1.6.0-14.b14 +- Fixed archinstall i386 to i586, since Fedora 11 made the switch. + * Wed Feb 25 2009 Dennis Gilmore - 1:1.6.0-13.b14 - fix sparc arch building asm-sparc has gone. we only have asm/ now - add sparc arches back to the jit arch list From hadess at fedoraproject.org Mon Mar 2 15:23:22 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 2 Mar 2009 15:23:22 +0000 (UTC) Subject: rpms/sound-juicer/devel sound-juicer.spec,1.109,1.110 Message-ID: <20090302152322.45BEC70115@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/sound-juicer/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3316 Modified Files: sound-juicer.spec Log Message: * Mon Mar 02 2009 - Bastien Nocera - 2.25.3-3 - Remove nautilus-cd-burner dependency Index: sound-juicer.spec =================================================================== RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- sound-juicer.spec 26 Feb 2009 02:06:57 -0000 1.109 +++ sound-juicer.spec 2 Mar 2009 15:22:51 -0000 1.110 @@ -8,14 +8,13 @@ Name: sound-juicer Summary: Clean and lean CD ripper Version: 2.25.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Multimedia Source: http://download.gnome.org/sources/sound-juicer/2.25/%{name}-%{version}.tar.bz2 URL: http://www.burtonini.com/blog/computers/sound-juicer BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: cdparanoia -Requires: nautilus-cd-burner >= %{nautilus_cd_burner_version} Requires(pre): GConf2 >= %{gconf_version} Requires(post): GConf2 >= %{gconf_version} @@ -113,6 +112,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 02 2009 - Bastien Nocera - 2.25.3-3 +- Remove nautilus-cd-burner dependency + * Wed Feb 25 2009 Fedora Release Engineering - 2.25.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From drago01 at fedoraproject.org Mon Mar 2 15:24:53 2009 From: drago01 at fedoraproject.org (Adel Gadllah) Date: Mon, 2 Mar 2009 15:24:53 +0000 (UTC) Subject: rpms/beagle/devel beagle.spec,1.163,1.164 Message-ID: <20090302152453.C8D3970115@cvs1.fedora.phx.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/beagle/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3981 Modified Files: beagle.spec Log Message: spec cleanups Index: beagle.spec =================================================================== RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- beagle.spec 28 Feb 2009 11:22:51 -0000 1.163 +++ beagle.spec 2 Mar 2009 15:24:23 -0000 1.164 @@ -1,6 +1,6 @@ Name: beagle Version: 0.3.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Beagle Search Infrastructure Group: User Interface/Desktops # see COPYING for details @@ -126,12 +126,13 @@ %package devel Summary: Development files for the Beagle search infrastructure Group: Development/Libraries +Requires: %{name} = %{version}-%{release} # for /usr/lib/pkgconfig Requires: pkgconfig # for /usr/lib/monodoc/ -Requires: monodoc +Requires: monodoc Requires(post): monodoc -Requires(postun): monodoc +Requires(postun):monodoc %description devel The beagle-devel package contains documentation and other materials @@ -205,13 +206,11 @@ find $RPM_BUILD_ROOT -name '*.rdf' -exec chmod a-x {} ';' find $RPM_BUILD_ROOT -name '*.xul' -exec chmod a-x {} ';' find $RPM_BUILD_ROOT -name '*.dtd' -exec chmod a-x {} ';' - +find $RPM_BUILD_ROOT -name '*.css' -exec chmod a-x {} ';' %pre %define beagle_user_uid 58 -# Remove old username, we switched to an 8 char one -for x in $(cut -d: -f1 /etc/passwd) ; do if [ "$x" == "beagleindex" ]; then /usr/sbin/userdel beagleindex; break; fi; done -for x in $(cut -d: -f1 /etc/group) ; do if [ "$x" == "beagleindex" ]; then /usr/sbin/groupdel beagleindex; break; fi; done + #only create user if it doesn't exists %{_bindir}/id -u beaglidx 1>/dev/null 2>&1 if [ $? -ne 0 ]; then @@ -352,6 +351,9 @@ %{_libdir}/pkgconfig/beagle*.pc %changelog +* Mon Mar 02 2009 Adel Gadllah - 0.3.9-5 +- Spec file cleanups (RH #225612) + * Sat Feb 28 2009 Adel Gadllah - 0.3.9-4 - Spec file cleanups (RH #225612) From lennart at fedoraproject.org Mon Mar 2 15:26:41 2009 From: lennart at fedoraproject.org (Lennart Poettering) Date: Mon, 2 Mar 2009 15:26:41 +0000 (UTC) Subject: rpms/udev-extras/devel udev-extras.spec,1.8,1.9 Message-ID: <20090302152641.6CEFF70115@cvs1.fedora.phx.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/udev-extras/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4450 Modified Files: udev-extras.spec Log Message: Update snapshot from git Index: udev-extras.spec =================================================================== RCS file: /cvs/pkgs/rpms/udev-extras/devel/udev-extras.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- udev-extras.spec 27 Feb 2009 09:50:11 -0000 1.8 +++ udev-extras.spec 2 Mar 2009 15:26:11 -0000 1.9 @@ -4,9 +4,9 @@ Summary: Extra rules and tools for udev Name: udev-extras Version: 20090226 -Release: 0.5.20090227git%{?dist} +Release: 0.5.20090302git%{?dist} # Source from http://git.kernel.org/?p=linux/hotplug/udev-extras.git -Source: udev-extras-20090226-git20090227.tar.bz2 +Source: udev-extras-20090226-git20090302.tar.bz2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -57,6 +57,9 @@ %attr(0644,root,root) %{_mandir}/man8/modem-modeswitch*.8* %changelog +* Mon Mar 3 2009 Lennart Poettering 20090226-0.5.20090302git +- Update snapshot from git + * Fri Feb 27 2009 Harald Hoyer 20090226-0.5.20090227git - add dependency for hwdata From victorv at fedoraproject.org Mon Mar 2 15:26:42 2009 From: victorv at fedoraproject.org (Victor G. Vasilyev) Date: Mon, 2 Mar 2009 15:26:42 +0000 (UTC) Subject: rpms/ini4j/devel ini4j.spec,1.2,1.3 Message-ID: <20090302152642.9B90A70115@cvs1.fedora.phx.redhat.com> Author: victorv Update of /cvs/pkgs/rpms/ini4j/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4339 Modified Files: ini4j.spec Log Message: BR tomcat5, because tomcat-tomcat-parent.pom is required Index: ini4j.spec =================================================================== RCS file: /cvs/pkgs/rpms/ini4j/devel/ini4j.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ini4j.spec 25 Feb 2009 07:20:08 -0000 1.2 +++ ini4j.spec 2 Mar 2009 15:26:12 -0000 1.3 @@ -1,6 +1,6 @@ Name: ini4j Version: 0.3.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java API for handling files in Windows .ini format Group: Development/Libraries @@ -31,6 +31,7 @@ # These dependencies are required to compile the application: BuildRequires: java-devel >= 1:1.6.0 BuildRequires: maven2 >= 2.0.4 +BuildRequires: tomcat5 >= 5.5 BuildRequires: tomcat5-servlet-2.4-api >= 5.5 # These dependencies are only required to compile unit tests for the application: # BuildRequires: jetty >= 4.2.2 @@ -131,6 +132,9 @@ %changelog +* Mon Mar 02 2009 Victor Vasilyev 0.3.2-6 +- BR tomcat5, because tomcat-tomcat-parent.pom is required + * Tue Feb 24 2009 Fedora Release Engineering - 0.3.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From hadess at fedoraproject.org Mon Mar 2 15:27:21 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 2 Mar 2009 15:27:21 +0000 (UTC) Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.109,1.110 Message-ID: <20090302152721.A99EF70116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-cd-burner/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4588 Modified Files: nautilus-cd-burner.spec Log Message: * Mon Mar 02 2009 - Bastien Nocera - 2.25.3-3 - Split into libs Index: nautilus-cd-burner.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- nautilus-cd-burner.spec 26 Feb 2009 04:20:21 -0000 1.109 +++ nautilus-cd-burner.spec 2 Mar 2009 15:26:51 -0000 1.110 @@ -12,7 +12,7 @@ Summary: Easy to use CD burning for Gnome Name: nautilus-cd-burner Version: 2.25.3 -Release: 2%{?dist} +Release: 3%{?dist} Source0: http://download.gnome.org/sources/nautilus-cd-burner/2.25/%{name}-%{version}.tar.bz2 License: GPLv2+ Group: User Interface/Desktops @@ -26,6 +26,7 @@ Requires: hal >= %{hal_version} Requires: gnome-mount >= %{gnome_mount_version} Requires: GConf2 >= %{gconf_version} +Requires: %name-libs = %{version}-%{release} Requires(post): GConf2 >= %{gconf_version} Requires(pre): GConf2 >= %{gconf_version} @@ -51,7 +52,7 @@ %package devel Summary: The files needed for nautilus-cd-burner application development Group: Development/Libraries -Requires: %name = %{version}-%{release} +Requires: %name-libs = %{version}-%{release} Requires: gtk2-devel >= %{gtk_version} Requires: nautilus-devel >= %{nautilus_version} Requires: pkgconfig @@ -62,6 +63,18 @@ include files that you can use to develop applications that use the nautilus-cd-burner library. +%package libs +Summary: The libraries used by nautilus-cd-burner +Group: Development/Libraries +Requires: gtk2-devel >= %{gtk_version} +Requires: nautilus-devel >= %{nautilus_version} +Requires: pkgconfig +Requires: gtk-doc + +%description libs +The nautilus-cd-burner-libs package contains the libraries applications +need to have nautilus-cd-burner integration. + %prep %setup -q @@ -124,13 +137,15 @@ %defattr(-,root,root) %{_sysconfdir}/gconf/schemas/* %{_libdir}/nautilus/extensions-2.0/*.so* -%{_libdir}/lib*.so.* %{_bindir}/nautilus-cd-burner %{_datadir}/nautilus-cd-burner %{_datadir}/applications/nautilus-cd-burner.desktop %{_datadir}/applications/nautilus-cd-burner-open-iso.desktop %{_datadir}/icons/hicolor/* +%files libs +%{_libdir}/lib*.so.* + %files devel %defattr(-, root, root) %{_libdir}/lib*.so @@ -140,6 +155,9 @@ %changelog +* Mon Mar 02 2009 - Bastien Nocera - 2.25.3-3 +- Split into libs + * Wed Feb 25 2009 Fedora Release Engineering - 2.25.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From lennart at fedoraproject.org Mon Mar 2 15:28:06 2009 From: lennart at fedoraproject.org (Lennart Poettering) Date: Mon, 2 Mar 2009 15:28:06 +0000 (UTC) Subject: rpms/udev-extras/devel .cvsignore,1.4,1.5 sources,1.4,1.5 Message-ID: <20090302152806.4387B70116@cvs1.fedora.phx.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/udev-extras/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4886 Modified Files: .cvsignore sources Log Message: add tarball Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/udev-extras/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Feb 2009 09:42:36 -0000 1.4 +++ .cvsignore 2 Mar 2009 15:27:35 -0000 1.5 @@ -1 +1 @@ -udev-extras-20090226-git20090227.tar.bz2 +udev-extras-20090226-git20090302.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/udev-extras/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Feb 2009 09:42:36 -0000 1.4 +++ sources 2 Mar 2009 15:27:35 -0000 1.5 @@ -1 +1 @@ -b52cdbfd436c3102042c387e45da97ba udev-extras-20090226-git20090227.tar.bz2 +cefec938d47cb7d2a04172858fe0bfa1 udev-extras-20090226-git20090302.tar.bz2 From pkgdb at fedoraproject.org Mon Mar 2 15:29:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 15:29:27 +0000 Subject: [pkgdb] uml_utilities had acl change status Message-ID: <20090302152957.DC487208201@bastion.fedora.phx.redhat.com> pwouters has set the watchcommits acl on uml_utilities (Fedora devel) to Approved for chkr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From pkgdb at fedoraproject.org Mon Mar 2 15:29:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 15:29:59 +0000 Subject: [pkgdb] uml_utilities had acl change status Message-ID: <20090302152959.585D12084D0@bastion.fedora.phx.redhat.com> pwouters has set the watchbugzilla acl on uml_utilities (Fedora devel) to Approved for chkr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From pkgdb at fedoraproject.org Mon Mar 2 15:29:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 15:29:29 +0000 Subject: [pkgdb] uml_utilities had acl change status Message-ID: <20090302153000.1831E208519@bastion.fedora.phx.redhat.com> pwouters has set the commit acl on uml_utilities (Fedora devel) to Approved for chkr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From pkgdb at fedoraproject.org Mon Mar 2 15:29:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 15:29:44 +0000 Subject: [pkgdb] uml_utilities had acl change status Message-ID: <20090302153006.25FB320851E@bastion.fedora.phx.redhat.com> pwouters has set the watchbugzilla acl on uml_utilities (Fedora 10) to Approved for chkr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From pkgdb at fedoraproject.org Mon Mar 2 15:30:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 15:30:07 +0000 Subject: [pkgdb] uml_utilities had acl change status Message-ID: <20090302153007.09A55208521@bastion.fedora.phx.redhat.com> pwouters has set the watchcommits acl on uml_utilities (Fedora 10) to Approved for chkr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From pkgdb at fedoraproject.org Mon Mar 2 15:30:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 15:30:10 +0000 Subject: [pkgdb] uml_utilities had acl change status Message-ID: <20090302153009.E764F208201@bastion.fedora.phx.redhat.com> pwouters has set the commit acl on uml_utilities (Fedora 10) to Approved for chkr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From ltinkl at fedoraproject.org Mon Mar 2 15:33:55 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Mar 2009 15:33:55 +0000 (UTC) Subject: rpms/soprano/devel .cvsignore, 1.17, 1.18 soprano.spec, 1.28, 1.29 sources, 1.17, 1.18 Message-ID: <20090302153355.F2CB470115@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/soprano/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6606 Modified Files: .cvsignore soprano.spec sources Log Message: update to 2.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/soprano/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 29 Jan 2009 16:57:59 -0000 1.17 +++ .cvsignore 2 Mar 2009 15:33:25 -0000 1.18 @@ -1 +1 @@ -soprano-2.2.1.tar.bz2 +soprano-2.2.3.tar.bz2 Index: soprano.spec =================================================================== RCS file: /cvs/extras/rpms/soprano/devel/soprano.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- soprano.spec 26 Feb 2009 02:04:07 -0000 1.28 +++ soprano.spec 2 Mar 2009 15:33:25 -0000 1.29 @@ -6,8 +6,8 @@ Summary: Qt wrapper API to different RDF storage solutions Name: soprano -Version: 2.2.1 -Release: 2%{?dist} +Version: 2.2.3 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -108,6 +108,9 @@ %changelog +* Mon Mar 2 2009 Luk???? Tinkl - 2.2.3-1 +- update to 2.2.3 + * Wed Feb 25 2009 Fedora Release Engineering - 2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/soprano/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 29 Jan 2009 16:57:59 -0000 1.17 +++ sources 2 Mar 2009 15:33:25 -0000 1.18 @@ -1 +1 @@ -69688a71273e1e9389fc60e3085c695f soprano-2.2.1.tar.bz2 +22c992a252144ae0a3a964ba2f6f1933 soprano-2.2.3.tar.bz2 From james at fedoraproject.org Mon Mar 2 15:38:52 2009 From: james at fedoraproject.org (James Antill) Date: Mon, 2 Mar 2009 15:38:52 +0000 (UTC) Subject: rpms/zsh/devel zsh.spec,1.55,1.56 Message-ID: <20090302153852.A5D2C70115@cvs1.fedora.phx.redhat.com> Author: james Update of /cvs/pkgs/rpms/zsh/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7573 Modified Files: zsh.spec Log Message: * Mon Mar 2 2009 James Antill - 4.3.9-3 - Change to --enable-prce, see if that solves the ppc problems Index: zsh.spec =================================================================== RCS file: /cvs/pkgs/rpms/zsh/devel/zsh.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- zsh.spec 25 Feb 2009 18:45:43 -0000 1.55 +++ zsh.spec 2 Mar 2009 15:38:22 -0000 1.56 @@ -3,7 +3,7 @@ Summary: A powerful interactive shell Name: zsh Version: 4.3.9 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD URL: http://zsh.sunsite.dk/ Group: System Environment/Shells @@ -26,7 +26,7 @@ Prereq: fileutils grep /sbin/install-info Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: mktemp coreutils sed ncurses-devel libcap-devel -BuildRequires: texinfo tetex texi2html gawk /bin/hostname +BuildRequires: texinfo tetex texi2html gawk /bin/hostname pcre-devel Requires(post): /sbin/install-info grep Requires(preun): /sbin/install-info Requires(postun): mktemp coreutils grep @@ -68,7 +68,7 @@ %define _bindir /bin # Avoid stripping... export LDFLAGS="" -%configure --enable-etcdir=%{_sysconfdir} --with-tcsetpgrp --enable-maildir-support +%configure --enable-etcdir=%{_sysconfdir} --with-tcsetpgrp --enable-maildir-support --enable-pcre make all html @@ -163,6 +163,9 @@ %doc Doc/*.html %changelog +* Mon Mar 2 2009 James Antill - 4.3.9-3 +- Change to --enable-prce, see if that solves the ppc problems + * Wed Feb 25 2009 Fedora Release Engineering - 4.3.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Mon Mar 2 15:44:55 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 2 Mar 2009 15:44:55 +0000 (UTC) Subject: rpms/openoffice.org/devel workspace.localization35.patch, NONE, 1.1 .cvsignore, 1.206, 1.207 openoffice.org.spec, 1.1838, 1.1839 sources, 1.346, 1.347 Message-ID: <20090302154455.B1DA470115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8636 Modified Files: .cvsignore openoffice.org.spec sources Added Files: workspace.localization35.patch Log Message: add Maithili workspace.localization35.patch: --- NEW FILE workspace.localization35.patch --- Index: inc/postset.mk =================================================================== --- inc/postset.mk (.../tags/DEV300_m40/solenv) (revision 268665) +++ inc/postset.mk (.../cws/localization35/solenv) (revision 268665) @@ -35,6 +35,6 @@ defaultlangiso=en-US # Complete list of all supported ISO codes -completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs by ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gd gl gu gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk mn ms ml-IN mr-IN my ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu +completelangiso=af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs by ca cs cy da de dgo dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gd gl gu gu-IN he hi-IN hr hu it ja ka kk km kn ko kok ks ku lo lt lv mai mk mn mni ms ml-IN mr-IN my ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sat sa-IN sd sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG))))) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.206 retrieving revision 1.207 diff -u -r1.206 -r1.207 --- .cvsignore 2 Mar 2009 11:55:35 -0000 1.206 +++ .cvsignore 2 Mar 2009 15:44:24 -0000 1.207 @@ -13,3 +13,4 @@ te-IN_DEV300_m40.sdf kn-IN_DEV300_m40.sdf hi-IN-D300-m40.tar.gz +Maithili-mai-ooo3.0.sdf.tar.gz Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1838 retrieving revision 1.1839 diff -u -r1.1838 -r1.1839 --- openoffice.org.spec 2 Mar 2009 11:55:35 -0000 1.1838 +++ openoffice.org.spec 2 Mar 2009 15:44:24 -0000 1.1839 @@ -25,7 +25,7 @@ %endif %if %{langpacks} -%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn uk +%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn uk mai-IN %else %define langpack_langs en-US %endif @@ -57,6 +57,7 @@ Source13: http://www.openoffice.org/nonav/issues/showattachment.cgi/60513/te-IN_DEV300_m40.sdf Source14: http://www.openoffice.org/nonav/issues/showattachment.cgi/60506/kn-IN_DEV300_m40.sdf Source15: http://indian.googlecode.com/files/hi-IN-D300-m40.tar.gz +Source16: http://www.openoffice.org/nonav/issues/showattachment.cgi/57666/Maithili-mai-ooo3.0.sdf.tar.gz BuildRequires: zip, findutils, autoconf, flex, bison, icu, gcc-c++ BuildRequires: binutils, java-devel, boost-devel, zlib-devel, vigra-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc @@ -133,6 +134,7 @@ Patch55: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch Patch56: openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch Patch57: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch +Patch58: workspace.localization35.patch %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)") %define instdir %{_libdir} @@ -1349,6 +1351,16 @@ %description langpack-uk Provides additional Ukrainian translations and resources for %{name}. +%package langpack-mai_IN +Summary: Maithili language pack for %{name} +Group: Applications/Productivity +Requires: %{name}-core = %{epoch}:%{version}-%{release} +Requires: lohit-maithili-fonts + +%description langpack-mai_IN +Provides additional maithili translations and resources for %{name}. + + %package -n autocorr-en Summary: English autocorrection rules Group: Applications/Text @@ -1595,6 +1607,7 @@ %patch55 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch %patch56 -p0 -b .ooo98465.sw.fix-doctables.patch %patch57 -p1 -b .oooXXXXX.solenv.allowmissing.patch +%patch58 -p1 -b .workspace.localization35.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -1684,8 +1697,11 @@ cp %{SOURCE14} . localize -m -x -l kn-IN -f kn-IN_DEV300_m40.sdf # i99657 -tar xf %{SOURCE15} +tar xzf %{SOURCE15} localize -m -x -l hi-IN -f hi-IN-D300-m40/hi-IN-300m40.sdf +# i95786 +tar xzf %{SOURCE16} +localize -m -x -l mai-IN -f Maithili-mai-ooo3.0.sdf cd ../.. #build OOo, on failure make a stab at debugging the crash if any, and @@ -2030,7 +2046,7 @@ st help western ss nohelp western \ nr help western ns help western \ dz help ctl uk help western \ -sh nohelp western \ +sh nohelp western mai nohelp western \ ) tar xzf %{SOURCE7} @@ -2369,6 +2385,7 @@ %files langpack-kn_IN -f kn.filelist %files langpack-dz -f dz.filelist %files langpack-uk -f uk.filelist +%files langpack-mai_IN -f mai.filelist %endif %files core @@ -4096,6 +4113,8 @@ * Mon Mar 02 2009 Caol??n McNamara - 1:3.1.0-3.3 - Resolves: rhbz#488021 Kannada Translations - Resolves: rhbz#488053 Hindi Translations +- backport workspace.localization35.patch for mai_IN +- Maithili Translations and langpack * Sat Feb 28 2009 Caol??n McNamara - 1:3.1.0-3.2 - Resolves: rhbz#487664 Marathi Translations Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.346 retrieving revision 1.347 diff -u -r1.346 -r1.347 --- sources 2 Mar 2009 11:55:35 -0000 1.346 +++ sources 2 Mar 2009 15:44:24 -0000 1.347 @@ -12,4 +12,5 @@ d826ee150349ee5fe4b43cdd7a130084 te-IN_DEV300_m40.sdf f457cdd91857701b1282bfffb0ec5e8a kn-IN_DEV300_m40.sdf bdc3b2b8b90ac1879f216cfa3c50d7e1 hi-IN-D300-m40.tar.gz +0835c667327f7ffa5d7eed61b47d681e Maithili-mai-ooo3.0.sdf.tar.gz f4d811bf2c10fadf34b68805697e2b72 OOO310_m3.tar.bz2 From salimma at fedoraproject.org Mon Mar 2 15:53:38 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Mon, 2 Mar 2009 15:53:38 +0000 (UTC) Subject: rpms/libgee/EL-5 .cvsignore, 1.5, 1.6 libgee.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <20090302155338.EDBA170115@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/libgee/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10044/EL-5 Modified Files: .cvsignore libgee.spec sources Log Message: * Mon Mar 2 2009 Michel Salim - 0.1.5-1 - Update to 0.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgee/EL-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Dec 2008 07:15:55 -0000 1.5 +++ .cvsignore 2 Mar 2009 15:53:08 -0000 1.6 @@ -1 +1 @@ -libgee-0.1.4.tar.bz2 +libgee-0.1.5.tar.bz2 Index: libgee.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgee/EL-5/libgee.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libgee.spec 14 Dec 2008 06:26:29 -0000 1.5 +++ libgee.spec 2 Mar 2009 15:53:08 -0000 1.6 @@ -1,6 +1,6 @@ Name: libgee -Version: 0.1.4 -Release: 2%{?dist} +Version: 0.1.5 +Release: 1%{?dist} Summary: GObject collection library Group: System Environment/Libraries @@ -93,6 +93,12 @@ %changelog +* Mon Mar 2 2009 Michel Salim - 0.1.5-1 +- Update to 0.1.5 + +* Wed Feb 25 2009 Fedora Release Engineering - 0.1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Dec 13 2008 Michel Salim - 0.1.4-2 - Run unit tests only on releases with glib2 >= 2.16 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgee/EL-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Dec 2008 07:15:55 -0000 1.5 +++ sources 2 Mar 2009 15:53:08 -0000 1.6 @@ -1 +1 @@ -1ac35c278299fcbc69b7dde79a642d89 libgee-0.1.4.tar.bz2 +80102073421e4d7fb18a6aa9622f4de2 libgee-0.1.5.tar.bz2 From salimma at fedoraproject.org Mon Mar 2 15:53:40 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Mon, 2 Mar 2009 15:53:40 +0000 (UTC) Subject: rpms/libgee/devel .cvsignore, 1.4, 1.5 libgee.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <20090302155340.013D170115@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/libgee/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10044/devel Modified Files: .cvsignore libgee.spec sources Log Message: * Mon Mar 2 2009 Michel Salim - 0.1.5-1 - Update to 0.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgee/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Dec 2008 07:15:56 -0000 1.4 +++ .cvsignore 2 Mar 2009 15:53:09 -0000 1.5 @@ -1 +1 @@ -libgee-0.1.4.tar.bz2 +libgee-0.1.5.tar.bz2 Index: libgee.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgee/devel/libgee.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libgee.spec 25 Feb 2009 15:05:57 -0000 1.7 +++ libgee.spec 2 Mar 2009 15:53:09 -0000 1.8 @@ -1,6 +1,6 @@ Name: libgee -Version: 0.1.4 -Release: 3%{?dist} +Version: 0.1.5 +Release: 1%{?dist} Summary: GObject collection library Group: System Environment/Libraries @@ -93,6 +93,9 @@ %changelog +* Mon Mar 2 2009 Michel Salim - 0.1.5-1 +- Update to 0.1.5 + * Wed Feb 25 2009 Fedora Release Engineering - 0.1.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgee/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Dec 2008 07:15:56 -0000 1.4 +++ sources 2 Mar 2009 15:53:09 -0000 1.5 @@ -1 +1 @@ -1ac35c278299fcbc69b7dde79a642d89 libgee-0.1.4.tar.bz2 +80102073421e4d7fb18a6aa9622f4de2 libgee-0.1.5.tar.bz2 From salimma at fedoraproject.org Mon Mar 2 15:53:39 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Mon, 2 Mar 2009 15:53:39 +0000 (UTC) Subject: rpms/libgee/F-9 .cvsignore, 1.4, 1.5 libgee.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <20090302155339.8B80270116@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/libgee/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10044/F-9 Modified Files: .cvsignore libgee.spec sources Log Message: * Mon Mar 2 2009 Michel Salim - 0.1.5-1 - Update to 0.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgee/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Dec 2008 07:15:56 -0000 1.4 +++ .cvsignore 2 Mar 2009 15:53:09 -0000 1.5 @@ -1 +1 @@ -libgee-0.1.4.tar.bz2 +libgee-0.1.5.tar.bz2 Index: libgee.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgee/F-9/libgee.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libgee.spec 14 Dec 2008 06:26:30 -0000 1.6 +++ libgee.spec 2 Mar 2009 15:53:09 -0000 1.7 @@ -1,6 +1,6 @@ Name: libgee -Version: 0.1.4 -Release: 2%{?dist} +Version: 0.1.5 +Release: 1%{?dist} Summary: GObject collection library Group: System Environment/Libraries @@ -93,6 +93,12 @@ %changelog +* Mon Mar 2 2009 Michel Salim - 0.1.5-1 +- Update to 0.1.5 + +* Wed Feb 25 2009 Fedora Release Engineering - 0.1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Dec 13 2008 Michel Salim - 0.1.4-2 - Run unit tests only on releases with glib2 >= 2.16 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgee/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Dec 2008 07:15:56 -0000 1.4 +++ sources 2 Mar 2009 15:53:09 -0000 1.5 @@ -1 +1 @@ -1ac35c278299fcbc69b7dde79a642d89 libgee-0.1.4.tar.bz2 +80102073421e4d7fb18a6aa9622f4de2 libgee-0.1.5.tar.bz2 From salimma at fedoraproject.org Mon Mar 2 15:53:39 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Mon, 2 Mar 2009 15:53:39 +0000 (UTC) Subject: rpms/libgee/F-10 .cvsignore, 1.4, 1.5 libgee.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <20090302155339.42F3070115@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/libgee/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10044/F-10 Modified Files: .cvsignore libgee.spec sources Log Message: * Mon Mar 2 2009 Michel Salim - 0.1.5-1 - Update to 0.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgee/F-10/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Dec 2008 07:15:56 -0000 1.4 +++ .cvsignore 2 Mar 2009 15:53:08 -0000 1.5 @@ -1 +1 @@ -libgee-0.1.4.tar.bz2 +libgee-0.1.5.tar.bz2 Index: libgee.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgee/F-10/libgee.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libgee.spec 14 Dec 2008 06:26:30 -0000 1.6 +++ libgee.spec 2 Mar 2009 15:53:08 -0000 1.7 @@ -1,6 +1,6 @@ Name: libgee -Version: 0.1.4 -Release: 2%{?dist} +Version: 0.1.5 +Release: 1%{?dist} Summary: GObject collection library Group: System Environment/Libraries @@ -93,6 +93,12 @@ %changelog +* Mon Mar 2 2009 Michel Salim - 0.1.5-1 +- Update to 0.1.5 + +* Wed Feb 25 2009 Fedora Release Engineering - 0.1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Dec 13 2008 Michel Salim - 0.1.4-2 - Run unit tests only on releases with glib2 >= 2.16 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgee/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Dec 2008 07:15:56 -0000 1.4 +++ sources 2 Mar 2009 15:53:08 -0000 1.5 @@ -1 +1 @@ -1ac35c278299fcbc69b7dde79a642d89 libgee-0.1.4.tar.bz2 +80102073421e4d7fb18a6aa9622f4de2 libgee-0.1.5.tar.bz2 From mclasen at fedoraproject.org Mon Mar 2 15:55:03 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Mar 2009 15:55:03 +0000 (UTC) Subject: rpms/vte/devel vte-gcc44.patch,NONE,1.1 vte.spec,1.144,1.145 Message-ID: <20090302155503.4AD9F70115@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/vte/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10390 Modified Files: vte.spec Added Files: vte-gcc44.patch Log Message: Workaround gcc miscompilation vte-gcc44.patch: --- NEW FILE vte-gcc44.patch --- diff -up vte-0.19.4/src/vte.c.gcc44 vte-0.19.4/src/vte.c --- vte-0.19.4/src/vte.c.gcc44 2009-03-02 10:51:42.840701017 -0500 +++ vte-0.19.4/src/vte.c 2009-03-02 10:50:10.687451140 -0500 @@ -3049,6 +3049,7 @@ _vte_terminal_cursor_down (VteTerminal * } /* Insert a single character into the stored data array. */ +__attribute__((optimize ("no-tree-sra"))) gboolean _vte_terminal_insert_char(VteTerminal *terminal, gunichar c, gboolean insert, gboolean invalidate_now) Index: vte.spec =================================================================== RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- vte.spec 26 Feb 2009 00:53:36 -0000 1.144 +++ vte.spec 2 Mar 2009 15:54:32 -0000 1.145 @@ -4,12 +4,14 @@ Name: vte Version: 0.19.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A terminal emulator License: LGPLv2+ Group: User Interface/X BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source: http://download.gnome.org/sources/vte/0.19/%{name}-%{version}.tar.bz2 +# https://bugzilla.redhat.com/show_bug.cgi?id=487795 +Patch0: vte-gcc44.patch BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: pango-devel >= %{pango_version} @@ -44,6 +46,7 @@ %prep %setup -q +%patch0 -p1 -b .gcc44 %build PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"` @@ -109,6 +112,9 @@ %doc %{_datadir}/gtk-doc/html/%{name} %changelog +* Mon Mar 2 2009 Matthias Clasen 0.19.4-5 +- Work around gcc 4.4 miscompilation + * Wed Feb 25 2009 Fedora Release Engineering - 0.19.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From limb at fedoraproject.org Mon Mar 2 15:55:04 2009 From: limb at fedoraproject.org (Jon Ciesla) Date: Mon, 2 Mar 2009 15:55:04 +0000 (UTC) Subject: rpms/ddd/devel ddd.desktop,1.1,1.2 ddd.spec,1.11,1.12 Message-ID: <20090302155504.6511870115@cvs1.fedora.phx.redhat.com> Author: limb Update of /cvs/pkgs/rpms/ddd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10425 Modified Files: ddd.desktop ddd.spec Log Message: Desktop file fix, BZ 487811. Index: ddd.desktop =================================================================== RCS file: /cvs/pkgs/rpms/ddd/devel/ddd.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ddd.desktop 30 Sep 2006 01:19:12 -0000 1.1 +++ ddd.desktop 2 Mar 2009 15:54:34 -0000 1.2 @@ -3,7 +3,7 @@ Name=DDD Debugger Comment=Data Display Debugger Exec=ddd -Icon=ddd.png +Icon=ddd Type=Application X-Desktop-File-Install-Version=0.2 -Categories=Application;Development; +Categories=Development;Debugger; Index: ddd.spec =================================================================== RCS file: /cvs/pkgs/rpms/ddd/devel/ddd.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ddd.spec 27 Feb 2009 21:12:11 -0000 1.11 +++ ddd.spec 2 Mar 2009 15:54:34 -0000 1.12 @@ -1,7 +1,7 @@ Summary: GUI for several command-line debuggers Name: ddd Version: 3.3.12 -Release: 1.rc1%{?dist}.2 +Release: 1.rc1%{?dist}.3 License: GPLv2+ Group: Development/Debuggers URL: http://www.gnu.org/software/ddd/ @@ -100,6 +100,9 @@ %{_mandir}/man1/ddd.1* %changelog +* Mon Mar 02 2009 Jon Ciesla - 3.3.12-1.rc1.3 +- Desktop file fix, BZ 487811. + * Fri Feb 27 2009 Jon Ciesla - 3.3.12-1.rc1.2 - Includes fix. From ajax at fedoraproject.org Mon Mar 2 15:58:10 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Mon, 2 Mar 2009 15:58:10 +0000 (UTC) Subject: rpms/xorg-x11-drv-intel/devel intel-2.6.0-kms-dpms.patch, NONE, 1.1 xorg-x11-drv-intel.spec, 1.4, 1.5 Message-ID: <20090302155810.98A6D70116@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11203 Modified Files: xorg-x11-drv-intel.spec Added Files: intel-2.6.0-kms-dpms.patch Log Message: * Mon Mar 02 2009 Adam Jackson 2.6.0-11 - intel-2.6.0-kms-dpms.patch: Enable DPMS on KMS outputs. intel-2.6.0-kms-dpms.patch: --- NEW FILE intel-2.6.0-kms-dpms.patch --- diff -up xf86-video-intel-2.6.0/src/drmmode_display.c.dpms xf86-video-intel-2.6.0/src/drmmode_display.c --- xf86-video-intel-2.6.0/src/drmmode_display.c.dpms 2009-03-02 10:09:52.000000000 -0500 +++ xf86-video-intel-2.6.0/src/drmmode_display.c 2009-03-02 10:12:13.000000000 -0500 @@ -520,7 +520,29 @@ drmmode_output_destroy(xf86OutputPtr out static void drmmode_output_dpms(xf86OutputPtr output, int mode) { - return; + drmmode_output_private_ptr drmmode_output = output->driver_private; + drmModeConnectorPtr koutput = drmmode_output->mode_output; + drmmode_ptr drmmode = drmmode_output->drmmode; + int i; + drmModePropertyPtr props; + + for (i = 0; i < koutput->count_props; i++) { + props = drmModeGetProperty(drmmode->fd, koutput->props[i]); + if (!props) + continue; + + if (!strcmp(props->name, "DPMS")) { + drmModeConnectorSetProperty(drmmode->fd, + drmmode_output->output_id, + props->prop_id, + mode); + drmModeFreeProperty(props); + return; + } + drmModeFreeProperty(props); + } + + ErrorF("No DPMS property found\n"); } static const xf86OutputFuncsRec drmmode_output_funcs = { Index: xorg-x11-drv-intel.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xorg-x11-drv-intel.spec 28 Feb 2009 16:40:34 -0000 1.4 +++ xorg-x11-drv-intel.spec 2 Mar 2009 15:57:40 -0000 1.5 @@ -8,7 +8,7 @@ Summary: Xorg X11 Intel video driver(s) Name: xorg-x11-drv-intel Version: 2.6.0 -Release: 10%{?dist} +Release: 11%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -26,6 +26,7 @@ Patch6: intel-2.5.0-no-gem-legacy-3d.patch Patch7: kill-svideo.patch Patch8: copy-fb.patch +Patch9: intel-2.6.0-kms-dpms.patch ExclusiveArch: %{ix86} x86_64 ia64 @@ -64,6 +65,7 @@ %patch6 -p1 -b .nogem3d %patch7 -p1 -b .svideo %patch8 -p1 -b .copy-fb +%patch9 -p1 -b .dpms %build @@ -71,9 +73,6 @@ %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri --enable-kms make -# Build the wrapper driver that lets us load either intel_master or -# intel_batchbuffer driver as just 'intel' - %install rm -rf $RPM_BUILD_ROOT @@ -106,6 +105,9 @@ %{_libdir}/libIntelXvMC.so %changelog +* Mon Mar 02 2009 Adam Jackson 2.6.0-11 +- intel-2.6.0-kms-dpms.patch: Enable DPMS on KMS outputs. + * Sat Feb 28 2009 Kristian H??gsberg - 2.6.0-10 - Update to master again, should fix the 1MB per pixmap problem. - Drop no-op intel-2.1.1-fix-xv-reset.patch. From tmz at fedoraproject.org Mon Mar 2 16:00:36 2009 From: tmz at fedoraproject.org (Todd M. Zullinger) Date: Mon, 2 Mar 2009 16:00:36 +0000 (UTC) Subject: rpms/git/F-10 git.spec,1.76,1.77 Message-ID: <20090302160036.7E01A70115@cvs1.fedora.phx.redhat.com> Author: tmz Update of /cvs/extras/rpms/git/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12394 Modified Files: git.spec Log Message: * Mon Mar 02 2009 Todd Zullinger - 1.6.0.6-2 - Enable parallel delta searching when packing objects (Roland McGrath) - Consolidate build/install options in %make_git (Roland McGrath) - Require perl(Authen::SASL) in git-email (bug 483062) - Exclude vc-git.el from emacs-git (bug 479531) - Update URL field Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/F-10/git.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- git.spec 20 Dec 2008 17:39:13 -0000 1.76 +++ git.spec 2 Mar 2009 16:00:05 -0000 1.77 @@ -1,11 +1,11 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools -URL: http://kernel.org/pub/software/scm/git/ +URL: http://git-scm.com/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 Source1: git-init.el Source2: git.xinetd @@ -90,7 +90,7 @@ Summary: Git tools for sending email Group: Development/Tools Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} -Requires: perl(Net::SMTP::SSL) +Requires: perl(Net::SMTP::SSL), perl(Authen::SASL) %description email Git tools for sending email. @@ -131,20 +131,24 @@ %setup -q %patch0 -p1 +# Use these same options for every invocation of 'make'. +# Otherwise it will rebuild in %%install due to flags changes. +%define make_git \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \\\ + ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ + DESTDIR=$RPM_BUILD_ROOT \\\ + INSTALLDIRS=vendor \\\ + THREADED_DELTA_SEARCH=YesPlease \\\ + gitexecdir=%{_bindir} \\\ + prefix=%{_prefix} + %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ - ETC_GITCONFIG=/etc/gitconfig \ - gitexecdir=%{_bindir} \ - prefix=%{_prefix} all %{!?_without_docs: doc} +%{make_git} all %{!?_without_docs: doc} make -C contrib/emacs %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ - prefix=%{_prefix} mandir=%{_mandir} \ - ETC_GITCONFIG=/etc/gitconfig \ - gitexecdir=%{_bindir} \ - INSTALLDIRS=vendor install %{!?_without_docs: install-doc} +%{make_git} install %{!?_without_docs: install-doc} make -C contrib/emacs install \ emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do @@ -242,6 +246,7 @@ %files -n emacs-git %defattr(-,root,root) +%exclude %{_datadir}/emacs/site-lisp/vc-git.el* %{_datadir}/emacs/site-lisp/*git*.el* %{_datadir}/emacs/site-lisp/site-start.d/git-init.el @@ -261,6 +266,13 @@ # No files for you! %changelog +* Mon Mar 02 2009 Todd Zullinger - 1.6.0.6-2 +- Enable parallel delta searching when packing objects (Roland McGrath) +- Consolidate build/install options in %%make_git (Roland McGrath) +- Require perl(Authen::SASL) in git-email (bug 483062) +- Exclude vc-git.el from emacs-git (bug 479531) +- Update URL field + * Sat Dec 20 2008 Todd Zullinger 1.6.0.6-1 - git-1.6.0.6 - Fixes a local privilege escalation bug in gitweb From nphilipp at fedoraproject.org Mon Mar 2 16:02:24 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 2 Mar 2009 16:02:24 +0000 (UTC) Subject: rpms/bzflag/devel bzflag-2.0.12-gcc-4.4.patch, NONE, 1.1 bzflag.spec, 1.49, 1.50 bzflag-2.0.10-gcc-4.3.patch, 1.3, NONE Message-ID: <20090302160224.4ADDE70115@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/bzflag/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12794 Modified Files: bzflag.spec Added Files: bzflag-2.0.12-gcc-4.4.patch Removed Files: bzflag-2.0.10-gcc-4.3.patch Log Message: fix building with gcc-4.4 bzflag-2.0.12-gcc-4.4.patch: --- NEW FILE bzflag-2.0.12-gcc-4.4.patch --- diff -up bzflag-2.0.12/include/common.h.gcc-4.4 bzflag-2.0.12/include/common.h --- bzflag-2.0.12/include/common.h.gcc-4.4 2008-04-06 07:30:59.000000000 +0200 +++ bzflag-2.0.12/include/common.h 2008-12-22 17:28:01.000000000 +0100 @@ -33,9 +33,12 @@ #include #include /* needed for bzfrand */ -#include #ifdef __cplusplus # include +# include +#else +# include +# include #endif diff -up bzflag-2.0.12/plugins/airspawn/airspawn.cpp.gcc-4.4 bzflag-2.0.12/plugins/airspawn/airspawn.cpp --- bzflag-2.0.12/plugins/airspawn/airspawn.cpp.gcc-4.4 2007-09-11 00:13:24.000000000 +0200 +++ bzflag-2.0.12/plugins/airspawn/airspawn.cpp 2008-12-22 17:28:01.000000000 +0100 @@ -3,6 +3,7 @@ #include "bzfsAPI.h" +#include #include #include diff -up bzflag-2.0.12/plugins/flagStay/flagStay.cpp.gcc-4.4 bzflag-2.0.12/plugins/flagStay/flagStay.cpp --- bzflag-2.0.12/plugins/flagStay/flagStay.cpp.gcc-4.4 2007-09-11 00:13:24.000000000 +0200 +++ bzflag-2.0.12/plugins/flagStay/flagStay.cpp 2008-12-22 17:28:01.000000000 +0100 @@ -2,6 +2,7 @@ // #include "bzfsAPI.h" +#include #include #include #include diff -up bzflag-2.0.12/plugins/HoldTheFlag/HoldTheFlag.cpp.gcc-4.4 bzflag-2.0.12/plugins/HoldTheFlag/HoldTheFlag.cpp --- bzflag-2.0.12/plugins/HoldTheFlag/HoldTheFlag.cpp.gcc-4.4 2007-10-27 10:53:51.000000000 +0200 +++ bzflag-2.0.12/plugins/HoldTheFlag/HoldTheFlag.cpp 2009-03-02 15:34:07.141548486 +0100 @@ -5,6 +5,9 @@ #include "bzfsAPI.h" #include +#include +#include +#include #include BZ_GET_PLUGIN_VERSION diff -up bzflag-2.0.12/plugins/keepaway/keepaway.cpp.gcc-4.4 bzflag-2.0.12/plugins/keepaway/keepaway.cpp --- bzflag-2.0.12/plugins/keepaway/keepaway.cpp.gcc-4.4 2007-10-27 10:53:50.000000000 +0200 +++ bzflag-2.0.12/plugins/keepaway/keepaway.cpp 2008-12-22 17:28:01.000000000 +0100 @@ -1,6 +1,7 @@ // keepaway.cpp : Defines the entry point for the DLL application. #include "bzfsAPI.h" +#include #include #include #include diff -up bzflag-2.0.12/plugins/koth/koth.cpp.gcc-4.4 bzflag-2.0.12/plugins/koth/koth.cpp --- bzflag-2.0.12/plugins/koth/koth.cpp.gcc-4.4 2007-10-27 10:53:50.000000000 +0200 +++ bzflag-2.0.12/plugins/koth/koth.cpp 2008-12-22 17:28:01.000000000 +0100 @@ -1,6 +1,7 @@ // koth.cpp : Defines the entry point for the DLL application. #include "bzfsAPI.h" +#include #include #include #include diff -up bzflag-2.0.12/plugins/logDetail/logDetail.cpp.gcc-4.4 bzflag-2.0.12/plugins/logDetail/logDetail.cpp --- bzflag-2.0.12/plugins/logDetail/logDetail.cpp.gcc-4.4 2008-04-24 23:08:49.000000000 +0200 +++ bzflag-2.0.12/plugins/logDetail/logDetail.cpp 2008-12-22 17:28:01.000000000 +0100 @@ -13,6 +13,7 @@ // logDetail.cpp : Plugin module for logging server events to stdout // +#include #include #include #include "bzfsAPI.h" diff -up bzflag-2.0.12/plugins/nagware/nagware.cpp.gcc-4.4 bzflag-2.0.12/plugins/nagware/nagware.cpp --- bzflag-2.0.12/plugins/nagware/nagware.cpp.gcc-4.4 2007-11-15 23:28:18.000000000 +0100 +++ bzflag-2.0.12/plugins/nagware/nagware.cpp 2009-03-02 15:49:58.962903218 +0100 @@ -3,6 +3,9 @@ // $Id: nagware.cpp 16200 2007-11-15 17:31:43Z JeffM2501 $ #include "bzfsAPI.h" +#include +#include +#include #include BZ_GET_PLUGIN_VERSION @@ -485,25 +488,33 @@ char *strtrim (char *s){ } MsgEnt * parseCfgMessage(const char *m){ - char *p; + char *p, *new_m; int time, repeat=0; + MsgEnt *retval = NULL; + + new_m = (char *)malloc (strlen (m)); + strcpy (new_m, m); - if ((p = strchr (m, ' ')) == NULL) - return NULL; + if ((p = strchr (new_m, ' ')) == NULL) + goto fail; *p = '\0'; - if (strchr (m, ',') != NULL){ - if (sscanf (m, "%d,%d", &time, &repeat) != 2) - return NULL; + if (strchr (new_m, ',') != NULL){ + if (sscanf (new_m, "%d,%d", &time, &repeat) != 2) + goto fail; } else { - if (sscanf (m, "%d", &time) != 1) - return NULL; + if (sscanf (new_m, "%d", &time) != 1) + goto fail; } if (time<0 || time > 500 || repeat < 0 || repeat > 1000) - return NULL; + goto fail; // TODO: check linelen < 128 - return new MsgEnt (time*TIME_FACTOR, repeat*TIME_FACTOR, p+1); + retval = new MsgEnt (time*TIME_FACTOR, repeat*TIME_FACTOR, p+1); + +fail: + free (new_m); + return retval; } diff -up bzflag-2.0.12/plugins/rabbitTimer/rabbitTimer.cpp.gcc-4.4 bzflag-2.0.12/plugins/rabbitTimer/rabbitTimer.cpp --- bzflag-2.0.12/plugins/rabbitTimer/rabbitTimer.cpp.gcc-4.4 2007-09-20 21:48:54.000000000 +0200 +++ bzflag-2.0.12/plugins/rabbitTimer/rabbitTimer.cpp 2008-12-22 17:28:01.000000000 +0100 @@ -2,6 +2,7 @@ // #include "bzfsAPI.h" +#include BZ_GET_PLUGIN_VERSION diff -up bzflag-2.0.12/plugins/rabidRabbit/rabidRabbit.cpp.gcc-4.4 bzflag-2.0.12/plugins/rabidRabbit/rabidRabbit.cpp --- bzflag-2.0.12/plugins/rabidRabbit/rabidRabbit.cpp.gcc-4.4 2007-10-27 10:53:51.000000000 +0200 +++ bzflag-2.0.12/plugins/rabidRabbit/rabidRabbit.cpp 2008-12-22 17:28:01.000000000 +0100 @@ -4,7 +4,8 @@ #include #include #include -#include +#include +#include BZ_GET_PLUGIN_VERSION diff -up bzflag-2.0.12/plugins/recordmatch/recordmatch.cpp.gcc-4.4 bzflag-2.0.12/plugins/recordmatch/recordmatch.cpp --- bzflag-2.0.12/plugins/recordmatch/recordmatch.cpp.gcc-4.4 2009-03-02 15:51:00.115553228 +0100 +++ bzflag-2.0.12/plugins/recordmatch/recordmatch.cpp 2009-03-02 15:51:15.233550713 +0100 @@ -2,6 +2,7 @@ // #include "bzfsAPI.h" +#include class GameStartEndHandler : public bz_EventHandler { diff -up bzflag-2.0.12/plugins/teamflagreset/teamflagreset.cpp.gcc-4.4 bzflag-2.0.12/plugins/teamflagreset/teamflagreset.cpp --- bzflag-2.0.12/plugins/teamflagreset/teamflagreset.cpp.gcc-4.4 2007-10-27 10:53:49.000000000 +0200 +++ bzflag-2.0.12/plugins/teamflagreset/teamflagreset.cpp 2008-12-22 17:28:01.000000000 +0100 @@ -1,6 +1,7 @@ // teamflagreset.cpp : Defines the entry point for the DLL application. #include "bzfsAPI.h" +#include BZ_GET_PLUGIN_VERSION diff -up bzflag-2.0.12/plugins/timedctf/timedctf.cpp.gcc-4.4 bzflag-2.0.12/plugins/timedctf/timedctf.cpp --- bzflag-2.0.12/plugins/timedctf/timedctf.cpp.gcc-4.4 2007-10-27 10:53:51.000000000 +0200 +++ bzflag-2.0.12/plugins/timedctf/timedctf.cpp 2008-12-22 17:28:01.000000000 +0100 @@ -1,6 +1,7 @@ // timedctf.cpp : Defines the entry point for the DLL application. #include "bzfsAPI.h" +#include BZ_GET_PLUGIN_VERSION diff -up bzflag-2.0.12/plugins/torBlock/torBlock.cpp.gcc-4.4 bzflag-2.0.12/plugins/torBlock/torBlock.cpp --- bzflag-2.0.12/plugins/torBlock/torBlock.cpp.gcc-4.4 2007-11-15 23:28:18.000000000 +0100 +++ bzflag-2.0.12/plugins/torBlock/torBlock.cpp 2008-12-22 17:28:01.000000000 +0100 @@ -2,6 +2,7 @@ // #include "bzfsAPI.h" +#include #include #include #include diff -up bzflag-2.0.12/plugins/wwzones/wwzones.cpp.gcc-4.4 bzflag-2.0.12/plugins/wwzones/wwzones.cpp --- bzflag-2.0.12/plugins/wwzones/wwzones.cpp.gcc-4.4 2007-10-27 10:53:51.000000000 +0200 +++ bzflag-2.0.12/plugins/wwzones/wwzones.cpp 2008-12-22 17:28:01.000000000 +0100 @@ -1,6 +1,7 @@ // wwzones.cpp : Defines the entry point for the DLL application. #include "bzfsAPI.h" +#include #include #include #include Index: bzflag.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzflag/devel/bzflag.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- bzflag.spec 24 Feb 2009 06:13:47 -0000 1.49 +++ bzflag.spec 2 Mar 2009 16:01:53 -0000 1.50 @@ -40,7 +40,7 @@ Source0: http://downloads.sourceforge.net/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 Source1: bzflag.desktop Patch0: bzflag-2.0.4-lookup.patch -Patch1: bzflag-2.0.10-gcc-4.3.patch +Patch1: bzflag-2.0.12-gcc-4.4.patch Patch2: bzflag-2.0.12-findresolutions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) %if %{with modular_x} @@ -92,7 +92,7 @@ %prep %setup -q -n %{name}-%{version}%{?date:.%{date}} %patch0 -p1 -b .lookup -%patch1 -p1 -b .gcc-4.3 +%patch1 -p1 -b .gcc-4.4 %patch2 -p1 -b .findresolutions %build @@ -149,7 +149,10 @@ %{_mandir}/man*/* %changelog -* Mon Feb 23 2009 Fedora Release Engineering - 2.0.12-5 +* Mon Mar 02 2009 Nils Philippsen 2.0.12-5 +- fix building with gcc-4.4 + +* Mon Feb 23 2009 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Mon Dec 22 2008 Nils Philippsen 2.0.12-4 --- bzflag-2.0.10-gcc-4.3.patch DELETED --- From nphilipp at fedoraproject.org Mon Mar 2 16:05:13 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 2 Mar 2009 16:05:13 +0000 (UTC) Subject: rpms/ufraw/devel ufraw-0.15-gcc-4.4.patch, NONE, 1.1 ufraw.spec, 1.41, 1.42 Message-ID: <20090302160513.AEB5470115@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/ufraw/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13444 Modified Files: ufraw.spec Added Files: ufraw-0.15-gcc-4.4.patch Log Message: fix building with gcc-4.4 ufraw-0.15-gcc-4.4.patch: --- NEW FILE ufraw-0.15-gcc-4.4.patch --- diff -up ufraw-0.15/dcraw.cc.gcc-4.4 ufraw-0.15/dcraw.cc --- ufraw-0.15/dcraw.cc.gcc-4.4 2008-12-23 08:19:41.000000000 +0100 +++ ufraw-0.15/dcraw.cc 2009-03-02 15:56:58.724512142 +0100 @@ -8337,8 +8337,8 @@ int CLASS main (int argc, const char **a static int timestamp_only=0, thumbnail_only=0, identify_only=0; static int user_qual=-1, user_black=-1, user_sat=-1, user_flip=-1; static int use_fuji_rotate=1, write_to_stdout=0, quality, i, c; - static char opm, opt, *ofname, *cp, *bpfile=0; - static const char *sp, *dark_frame=0, *write_ext; + static char opm, opt, *ofname, *sp, *cp, *bpfile=0; + static const char *dark_frame=0, *write_ext; static struct utimbuf ut; static FILE *ofp; #ifndef NO_LCMS Index: ufraw.spec =================================================================== RCS file: /cvs/pkgs/rpms/ufraw/devel/ufraw.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- ufraw.spec 25 Feb 2009 22:39:39 -0000 1.41 +++ ufraw.spec 2 Mar 2009 16:04:43 -0000 1.42 @@ -41,6 +41,7 @@ License: GPLv2+ URL: http://ufraw.sourceforge.net Source0: http://downloads.sourceforge.net/ufraw/ufraw-%{version}.tar.gz +Patch0: ufraw-0.15-gcc-4.4.patch BuildRequires: gimp-devel >= 2.0 BuildRequires: gimp >= 2.0 %if %{with cinepaint} @@ -141,6 +142,7 @@ EOF %setup -q +%patch0 -p1 -b .gcc-4.4 #./autogen.sh @@ -227,7 +229,10 @@ %endif %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 0.15-2 +* Mon Mar 02 2009 Nils Philippsen - 0.15-2 +- fix building with gcc-4.4 + +* Wed Feb 25 2009 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Mon Jan 26 2009 Nils Philippsen - 0.15-1 From spot at fedoraproject.org Mon Mar 2 16:08:02 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Mon, 2 Mar 2009 16:08:02 +0000 (UTC) Subject: rpms/nant/devel nant.spec,1.25,1.26 Message-ID: <20090302160802.F1D9570115@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nant/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14091 Modified Files: nant.spec Log Message: bootstrap hack Index: nant.spec =================================================================== RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- nant.spec 26 Feb 2009 04:14:35 -0000 1.25 +++ nant.spec 2 Mar 2009 16:07:32 -0000 1.26 @@ -5,7 +5,7 @@ Summary: NAnt is a build tool for Mono and .NET Name: nant Version: 0.85 -Release: 24%{?dist} +Release: 24%{?dist}.1 Epoch: 1 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz Patch0: nant-build.patch @@ -55,16 +55,16 @@ # Clean out the prebuilt files # If you're bootstrapping, comment out these two rm lines # sharpcvslib bits -rm -rf lib/ICSharpCode.SharpCvsLib.Console.dll lib/ICSharpCode.SharpCvsLib.dll lib/scvs.exe +# rm -rf lib/ICSharpCode.SharpCvsLib.Console.dll lib/ICSharpCode.SharpCvsLib.dll lib/scvs.exe # other system lib bits -rm -rf lib/ICSharpCode.SharpZipLib.dll lib/NUnitCore.dll lib/log4net.dll lib/mono/1.0/*.dll lib/mono/2.0/*.dll +# rm -rf lib/ICSharpCode.SharpZipLib.dll lib/NUnitCore.dll lib/log4net.dll lib/mono/1.0/*.dll lib/mono/2.0/*.dll # Copy in the system libs # If you're bootstrapping, comment out all these cp lines -cp -p %{_libdir}/mono/sharpcvslib/ICSharpCode.SharpCvsLib.dll lib/ -cp -p %{_libdir}/mono/sharpcvslib/cvs.exe lib/scvs.exe -cp -p %{_libdir}/mono/1.0/ICSharpCode.SharpZipLib.dll lib/ -cp -p %{_libdir}/mono/log4net/log4net.dll lib/ +# cp -p %{_libdir}/mono/sharpcvslib/ICSharpCode.SharpCvsLib.dll lib/ +# cp -p %{_libdir}/mono/sharpcvslib/cvs.exe lib/scvs.exe +# cp -p %{_libdir}/mono/1.0/ICSharpCode.SharpZipLib.dll lib/ +# cp -p %{_libdir}/mono/log4net/log4net.dll lib/ cp -p %{_libdir}/mono/ndoc/NDoc.Core.dll lib/mono/1.0/ cp -p %{_libdir}/mono/ndoc/NDoc.Documenter.Msdn.dll lib/mono/1.0/ @@ -117,6 +117,9 @@ %doc examples/* doc/help/* %changelog +* Mon Mar 2 2009 Tom "spot" Callaway - 1:0.85-24.1 +- bootstrap hack (to recover from mass rebuild) + * Wed Feb 25 2009 Fedora Release Engineering - 1:0.85-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From nphilipp at fedoraproject.org Mon Mar 2 16:08:08 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 2 Mar 2009 16:08:08 +0000 (UTC) Subject: rpms/dcraw/devel .cvsignore, 1.11, 1.12 dcraw.spec, 1.23, 1.24 sources, 1.12, 1.13 Message-ID: <20090302160808.EA22A70115@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/dcraw/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14068 Modified Files: .cvsignore dcraw.spec sources Log Message: version 8.91 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dcraw/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 27 Nov 2008 14:31:59 -0000 1.11 +++ .cvsignore 2 Mar 2009 16:07:38 -0000 1.12 @@ -1 +1 @@ -dcraw-8.89.tar.gz +dcraw-8.91.tar.gz Index: dcraw.spec =================================================================== RCS file: /cvs/pkgs/rpms/dcraw/devel/dcraw.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- dcraw.spec 24 Feb 2009 11:10:19 -0000 1.23 +++ dcraw.spec 2 Mar 2009 16:07:38 -0000 1.24 @@ -1,7 +1,7 @@ Summary: Tool for decoding raw image data from digital cameras Name: dcraw -Version: 8.89 -Release: 2%{?dist} +Version: 8.91 +Release: 1%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://cybercom.net/~dcoffin/dcraw @@ -62,6 +62,9 @@ %{_mandir}/*/man1/* %changelog +* Mon Mar 02 2009 Nils Philippsen - 8.91-1 +- version 8.91 + * Tue Feb 24 2009 Fedora Release Engineering - 8.89-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dcraw/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 27 Nov 2008 14:31:59 -0000 1.12 +++ sources 2 Mar 2009 16:07:38 -0000 1.13 @@ -1 +1 @@ -201fd4fb1fe39f7f07a5b2c7315df8f7 dcraw-8.89.tar.gz +06ab626770e9144f144dc6bac296c44f dcraw-8.91.tar.gz From ltinkl at fedoraproject.org Mon Mar 2 16:10:37 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Mar 2009 16:10:37 +0000 (UTC) Subject: rpms/soprano/devel soprano.spec,1.29,1.30 Message-ID: <20090302161037.8EFDA70115@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/soprano/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14749 Modified Files: soprano.spec Log Message: fix apidocs build failure Index: soprano.spec =================================================================== RCS file: /cvs/extras/rpms/soprano/devel/soprano.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- soprano.spec 2 Mar 2009 15:33:25 -0000 1.29 +++ soprano.spec 2 Mar 2009 16:10:07 -0000 1.30 @@ -56,14 +56,9 @@ %build -%cmake . -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` - +%cmake . -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` -DSOPRANO_BUILD_API_DOCS:BOOL=%{?apidocs} make %{?_smp_mflags} -%if "%{?apidocs}" == "1" -make apidox -%endif - %install rm -rf $RPM_BUILD_ROOT @@ -109,7 +104,7 @@ %changelog * Mon Mar 2 2009 Luk???? Tinkl - 2.2.3-1 -- update to 2.2.3 +- update to 2.2.3, fix apidox building * Wed Feb 25 2009 Fedora Release Engineering - 2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mtasaka at fedoraproject.org Mon Mar 2 16:13:06 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Mon, 2 Mar 2009 16:13:06 +0000 (UTC) Subject: rpms/alexandria/F-9 .cvsignore, 1.6, 1.7 alexandria.spec, 1.17, 1.18 sources, 1.6, 1.7 Message-ID: <20090302161306.19BE670116@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/alexandria/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15193/F-9 Modified Files: .cvsignore alexandria.spec sources Log Message: * Thu Mar 2 2009 Mamoru Tasaka - 0.6.4-0.1.b1 - Update to 0.6.4 beta 1 - Drop all patches, merged into upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/alexandria/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 23 Feb 2008 04:14:17 -0000 1.6 +++ .cvsignore 2 Mar 2009 16:12:35 -0000 1.7 @@ -1 +1 @@ -alexandria-0.6.3.tar.gz +alexandria-0.6.4b1.tar.gz Index: alexandria.spec =================================================================== RCS file: /cvs/extras/rpms/alexandria/F-9/alexandria.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- alexandria.spec 27 Feb 2009 11:21:33 -0000 1.17 +++ alexandria.spec 2 Mar 2009 16:12:35 -0000 1.18 @@ -1,11 +1,11 @@ %{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")} %define rubyabi 1.8 -%define repoid 32739 +%define repoid 52527 -%define majorver 0.6.3 -%undefine minorver +%define majorver 0.6.4 +%define minorver b1 -%define fedorarel 11 +%define fedorarel 1 %define rel %{?minorver:0.}%{fedorarel}%{?minorver:.%minorver} @@ -19,12 +19,6 @@ License: GPLv2+ URL: http://alexandria.rubyforge.org/ Source0: http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz -# http://rubyforge.org/tracker/?func=detail&atid=863&aid=19042&group_id=205 -# Turned out this was actually bug in ruby-gnome2, fixed in 0.17.0 rc1 -#Patch0: alexandria-0.6.3-crash_tooltips.patch -# http://rubyforge.org/tracker/?func=detail&atid=863&aid=20168&group_id=205 -# Patch is already in upstream svn repo -Patch1: alexandria-0.6.3-library-utf8-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -46,8 +40,11 @@ #Requires: ruby(amazon) Requires: ruby(gettext-package) Requires: ruby(hpricot) +# Not available on Fedora yet +#Requires: ruby(htmlentities) Requires: ruby(imagesize) -Requires: ruby(mechanize) +# Dependency removed on 0.6.4b1 +#Requires: ruby(mechanize) Requires: ruby(revolution) # ruby(zoom) -> rubygem(zoom) switch @@ -72,8 +69,6 @@ %prep %setup -q -n %{name}-%{majorver}%{?minorver} -#%%patch0 -p1 -b .tooltips -%patch1 -p0 -b .utf_8 %build rake build @@ -193,6 +188,10 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Thu Mar 2 2009 Mamoru Tasaka - 0.6.4-0.1.b1 +- Update to 0.6.4 beta 1 +- Drop all patches, merged into upstream + * Fri Feb 27 2009 Mamoru Tasaka - 0.6.3-11 - library UTF-8 patch update Index: sources =================================================================== RCS file: /cvs/extras/rpms/alexandria/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 23 Feb 2008 04:14:17 -0000 1.6 +++ sources 2 Mar 2009 16:12:35 -0000 1.7 @@ -1 +1 @@ -e0c2d5ebcac02077372094c17c31b053 alexandria-0.6.3.tar.gz +8ba05129772f6bfb4b57f7b01bde00b3 alexandria-0.6.4b1.tar.gz From mtasaka at fedoraproject.org Mon Mar 2 16:13:06 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Mon, 2 Mar 2009 16:13:06 +0000 (UTC) Subject: rpms/alexandria/devel .cvsignore, 1.6, 1.7 alexandria.spec, 1.23, 1.24 sources, 1.6, 1.7 Message-ID: <20090302161306.6918370117@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/alexandria/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15193/devel Modified Files: .cvsignore alexandria.spec sources Log Message: * Thu Mar 2 2009 Mamoru Tasaka - 0.6.4-0.1.b1 - Update to 0.6.4 beta 1 - Drop all patches, merged into upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/alexandria/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 23 Feb 2008 04:14:17 -0000 1.6 +++ .cvsignore 2 Mar 2009 16:12:36 -0000 1.7 @@ -1 +1 @@ -alexandria-0.6.3.tar.gz +alexandria-0.6.4b1.tar.gz Index: alexandria.spec =================================================================== RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- alexandria.spec 26 Feb 2009 19:44:05 -0000 1.23 +++ alexandria.spec 2 Mar 2009 16:12:36 -0000 1.24 @@ -1,11 +1,11 @@ %{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")} %define rubyabi 1.8 -%define repoid 32739 +%define repoid 52527 -%define majorver 0.6.3 -%undefine minorver +%define majorver 0.6.4 +%define minorver b1 -%define fedorarel 11 +%define fedorarel 1 %define rel %{?minorver:0.}%{fedorarel}%{?minorver:.%minorver} @@ -19,12 +19,6 @@ License: GPLv2+ URL: http://alexandria.rubyforge.org/ Source0: http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz -# http://rubyforge.org/tracker/?func=detail&atid=863&aid=19042&group_id=205 -# Turned out this was actually bug in ruby-gnome2, fixed in 0.17.0 rc1 -#Patch0: alexandria-0.6.3-crash_tooltips.patch -# http://rubyforge.org/tracker/?func=detail&atid=863&aid=20168&group_id=205 -# Patch is already in upstream svn repo -Patch1: alexandria-0.6.3-library-utf8-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -46,8 +40,11 @@ #Requires: ruby(amazon) Requires: ruby(gettext-package) Requires: ruby(hpricot) +# Not available on Fedora yet +#Requires: ruby(htmlentities) Requires: ruby(imagesize) -Requires: ruby(mechanize) +# Dependency removed on 0.6.4b1 +#Requires: ruby(mechanize) Requires: ruby(revolution) # ruby(zoom) -> rubygem(zoom) switch @@ -72,8 +69,6 @@ %prep %setup -q -n %{name}-%{majorver}%{?minorver} -#%%patch0 -p1 -b .tooltips -%patch1 -p0 -b .utf_8 %build rake build @@ -193,6 +188,10 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Thu Mar 2 2009 Mamoru Tasaka - 0.6.4-0.1.b1 +- Update to 0.6.4 beta 1 +- Drop all patches, merged into upstream + * Fri Feb 27 2009 Mamoru Tasaka - 0.6.3-11 - library UTF-8 patch update Index: sources =================================================================== RCS file: /cvs/extras/rpms/alexandria/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 23 Feb 2008 04:14:17 -0000 1.6 +++ sources 2 Mar 2009 16:12:36 -0000 1.7 @@ -1 +1 @@ -e0c2d5ebcac02077372094c17c31b053 alexandria-0.6.3.tar.gz +8ba05129772f6bfb4b57f7b01bde00b3 alexandria-0.6.4b1.tar.gz From mtasaka at fedoraproject.org Mon Mar 2 16:13:05 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Mon, 2 Mar 2009 16:13:05 +0000 (UTC) Subject: rpms/alexandria/F-10 .cvsignore, 1.6, 1.7 alexandria.spec, 1.17, 1.18 sources, 1.6, 1.7 Message-ID: <20090302161305.B49AA70115@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/alexandria/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15193/F-10 Modified Files: .cvsignore alexandria.spec sources Log Message: * Thu Mar 2 2009 Mamoru Tasaka - 0.6.4-0.1.b1 - Update to 0.6.4 beta 1 - Drop all patches, merged into upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/alexandria/F-10/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 23 Feb 2008 04:14:17 -0000 1.6 +++ .cvsignore 2 Mar 2009 16:12:34 -0000 1.7 @@ -1 +1 @@ -alexandria-0.6.3.tar.gz +alexandria-0.6.4b1.tar.gz Index: alexandria.spec =================================================================== RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- alexandria.spec 27 Feb 2009 11:21:32 -0000 1.17 +++ alexandria.spec 2 Mar 2009 16:12:35 -0000 1.18 @@ -1,11 +1,11 @@ %{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")} %define rubyabi 1.8 -%define repoid 32739 +%define repoid 52527 -%define majorver 0.6.3 -%undefine minorver +%define majorver 0.6.4 +%define minorver b1 -%define fedorarel 11 +%define fedorarel 1 %define rel %{?minorver:0.}%{fedorarel}%{?minorver:.%minorver} @@ -19,12 +19,6 @@ License: GPLv2+ URL: http://alexandria.rubyforge.org/ Source0: http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz -# http://rubyforge.org/tracker/?func=detail&atid=863&aid=19042&group_id=205 -# Turned out this was actually bug in ruby-gnome2, fixed in 0.17.0 rc1 -#Patch0: alexandria-0.6.3-crash_tooltips.patch -# http://rubyforge.org/tracker/?func=detail&atid=863&aid=20168&group_id=205 -# Patch is already in upstream svn repo -Patch1: alexandria-0.6.3-library-utf8-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -46,8 +40,11 @@ #Requires: ruby(amazon) Requires: ruby(gettext-package) Requires: ruby(hpricot) +# Not available on Fedora yet +#Requires: ruby(htmlentities) Requires: ruby(imagesize) -Requires: ruby(mechanize) +# Dependency removed on 0.6.4b1 +#Requires: ruby(mechanize) Requires: ruby(revolution) # ruby(zoom) -> rubygem(zoom) switch @@ -72,8 +69,6 @@ %prep %setup -q -n %{name}-%{majorver}%{?minorver} -#%%patch0 -p1 -b .tooltips -%patch1 -p0 -b .utf_8 %build rake build @@ -193,6 +188,10 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Thu Mar 2 2009 Mamoru Tasaka - 0.6.4-0.1.b1 +- Update to 0.6.4 beta 1 +- Drop all patches, merged into upstream + * Fri Feb 27 2009 Mamoru Tasaka - 0.6.3-11 - library UTF-8 patch update Index: sources =================================================================== RCS file: /cvs/extras/rpms/alexandria/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 23 Feb 2008 04:14:17 -0000 1.6 +++ sources 2 Mar 2009 16:12:35 -0000 1.7 @@ -1 +1 @@ -e0c2d5ebcac02077372094c17c31b053 alexandria-0.6.3.tar.gz +8ba05129772f6bfb4b57f7b01bde00b3 alexandria-0.6.4b1.tar.gz From spot at fedoraproject.org Mon Mar 2 16:15:46 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Mon, 2 Mar 2009 16:15:46 +0000 (UTC) Subject: rpms/nant/devel nant.spec,1.26,1.27 Message-ID: <20090302161546.7A7EB70115@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nant/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15625 Modified Files: nant.spec Log Message: undo bootstrap hack Index: nant.spec =================================================================== RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- nant.spec 2 Mar 2009 16:07:32 -0000 1.26 +++ nant.spec 2 Mar 2009 16:15:16 -0000 1.27 @@ -5,7 +5,7 @@ Summary: NAnt is a build tool for Mono and .NET Name: nant Version: 0.85 -Release: 24%{?dist}.1 +Release: 25%{?dist} Epoch: 1 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz Patch0: nant-build.patch @@ -55,16 +55,16 @@ # Clean out the prebuilt files # If you're bootstrapping, comment out these two rm lines # sharpcvslib bits -# rm -rf lib/ICSharpCode.SharpCvsLib.Console.dll lib/ICSharpCode.SharpCvsLib.dll lib/scvs.exe +rm -rf lib/ICSharpCode.SharpCvsLib.Console.dll lib/ICSharpCode.SharpCvsLib.dll lib/scvs.exe # other system lib bits -# rm -rf lib/ICSharpCode.SharpZipLib.dll lib/NUnitCore.dll lib/log4net.dll lib/mono/1.0/*.dll lib/mono/2.0/*.dll +rm -rf lib/ICSharpCode.SharpZipLib.dll lib/NUnitCore.dll lib/log4net.dll lib/mono/1.0/*.dll lib/mono/2.0/*.dll # Copy in the system libs # If you're bootstrapping, comment out all these cp lines -# cp -p %{_libdir}/mono/sharpcvslib/ICSharpCode.SharpCvsLib.dll lib/ -# cp -p %{_libdir}/mono/sharpcvslib/cvs.exe lib/scvs.exe -# cp -p %{_libdir}/mono/1.0/ICSharpCode.SharpZipLib.dll lib/ -# cp -p %{_libdir}/mono/log4net/log4net.dll lib/ +cp -p %{_libdir}/mono/sharpcvslib/ICSharpCode.SharpCvsLib.dll lib/ +cp -p %{_libdir}/mono/sharpcvslib/cvs.exe lib/scvs.exe +cp -p %{_libdir}/mono/1.0/ICSharpCode.SharpZipLib.dll lib/ +cp -p %{_libdir}/mono/log4net/log4net.dll lib/ cp -p %{_libdir}/mono/ndoc/NDoc.Core.dll lib/mono/1.0/ cp -p %{_libdir}/mono/ndoc/NDoc.Documenter.Msdn.dll lib/mono/1.0/ @@ -117,6 +117,9 @@ %doc examples/* doc/help/* %changelog +* Mon Mar 2 2009 Tom "spot" Callaway - 1:0.85-25 +- undo bootstrapping hack + * Mon Mar 2 2009 Tom "spot" Callaway - 1:0.85-24.1 - bootstrap hack (to recover from mass rebuild) From rdieter at fedoraproject.org Mon Mar 2 16:16:39 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 2 Mar 2009 16:16:39 +0000 (UTC) Subject: rpms/arts/devel arts.spec,1.92,1.93 Message-ID: <20090302161639.4E4E470115@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/arts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15810 Modified Files: arts.spec Log Message: * Mon Mar 02 2009 Rex Dieter - 8:1.5.10-5 - s/i386/%ix86/ Index: arts.spec =================================================================== RCS file: /cvs/pkgs/rpms/arts/devel/arts.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- arts.spec 24 Feb 2009 01:57:43 -0000 1.92 +++ arts.spec 2 Mar 2009 16:16:08 -0000 1.93 @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 -%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparcv9 sparc64 +%define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64 %define final 1 %define make_cvs 1 @@ -27,7 +27,7 @@ Group: System Environment/Daemons Epoch: 8 Version: 1.5.10 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Url: http://www.kde.org @@ -208,6 +208,9 @@ %changelog +* Mon Mar 02 2009 Rex Dieter - 8:1.5.10-5 +- s/i386/%%ix86/ + * Mon Feb 23 2009 Fedora Release Engineering - 8:1.5.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Mon Mar 2 16:17:38 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 2 Mar 2009 16:17:38 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1839,1.1840 Message-ID: <20090302161738.0AD2870115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16025 Modified Files: openoffice.org.spec Log Message: wrong patch prefix Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1839 retrieving revision 1.1840 diff -u -r1.1839 -r1.1840 --- openoffice.org.spec 2 Mar 2009 15:44:24 -0000 1.1839 +++ openoffice.org.spec 2 Mar 2009 16:17:07 -0000 1.1840 @@ -1607,7 +1607,7 @@ %patch55 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch %patch56 -p0 -b .ooo98465.sw.fix-doctables.patch %patch57 -p1 -b .oooXXXXX.solenv.allowmissing.patch -%patch58 -p1 -b .workspace.localization35.patch +%patch58 -p0 -b .workspace.localization35.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` From mbarnes at fedoraproject.org Mon Mar 2 16:18:58 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 2 Mar 2009 16:18:58 +0000 (UTC) Subject: rpms/gtkhtml3/devel .cvsignore, 1.90, 1.91 gtkhtml3.spec, 1.145, 1.146 sources, 1.90, 1.91 Message-ID: <20090302161858.72F8C70115@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/gtkhtml3/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11613 Modified Files: .cvsignore gtkhtml3.spec sources Log Message: * Mon Mar 02 2009 Matthew Barnes - 3.25.92-1.fc11 - Update to 3.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- .cvsignore 16 Feb 2009 18:26:33 -0000 1.90 +++ .cvsignore 2 Mar 2009 16:18:27 -0000 1.91 @@ -1 +1 @@ -gtkhtml-3.25.91.tar.bz2 +gtkhtml-3.25.92.tar.bz2 Index: gtkhtml3.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- gtkhtml3.spec 25 Feb 2009 02:20:06 -0000 1.145 +++ gtkhtml3.spec 2 Mar 2009 16:18:27 -0000 1.146 @@ -9,8 +9,8 @@ ### Abstract ### Name: gtkhtml3 -Version: 3.25.91 -Release: 2%{?dist} +Version: 3.25.92 +Release: 1%{?dist} Group: System Environment/Libraries Summary: GtkHTML library License: LGPLv2+ and GPLv2 @@ -119,6 +119,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Mar 02 2009 Matthew Barnes - 3.25.92-1.fc11 +- Update to 3.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 3.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- sources 16 Feb 2009 18:26:33 -0000 1.90 +++ sources 2 Mar 2009 16:18:28 -0000 1.91 @@ -1 +1 @@ -67066134732346ffe2e4688049ab0de7 gtkhtml-3.25.91.tar.bz2 +528af6eaa83971f76b119dd550af1b4b gtkhtml-3.25.92.tar.bz2 From mbarnes at fedoraproject.org Mon Mar 2 16:19:03 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 2 Mar 2009 16:19:03 +0000 (UTC) Subject: rpms/evolution-data-server/devel .cvsignore, 1.102, 1.103 evolution-data-server.spec, 1.253, 1.254 sources, 1.102, 1.103 Message-ID: <20090302161903.CFB1670115@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution-data-server/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16054 Modified Files: .cvsignore evolution-data-server.spec sources Log Message: * Mon Mar 02 2009 Matthew Barnes - 2.25.92-1.fc11 - Update to 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- .cvsignore 16 Feb 2009 18:26:41 -0000 1.102 +++ .cvsignore 2 Mar 2009 16:18:33 -0000 1.103 @@ -1 +1 @@ -evolution-data-server-2.25.91.tar.bz2 +evolution-data-server-2.25.92.tar.bz2 Index: evolution-data-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.253 retrieving revision 1.254 diff -u -r1.253 -r1.254 --- evolution-data-server.spec 25 Feb 2009 03:00:21 -0000 1.253 +++ evolution-data-server.spec 2 Mar 2009 16:18:33 -0000 1.254 @@ -30,8 +30,8 @@ ### Abstract ### Name: evolution-data-server -Version: 2.25.91 -Release: 3%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Group: System Environment/Libraries Summary: Backend data server for Evolution License: LGPLv2+ @@ -381,6 +381,9 @@ %{_datadir}/gtk-doc/html/libedataserverui %changelog +* Mon Mar 02 2009 Matthew Barnes - 2.25.92-1.fc11 +- Update to 2.25.92 + * Tue Feb 24 2009 Matthias Clasen 2.25.91-3 - Make -doc noarch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- sources 16 Feb 2009 18:26:41 -0000 1.102 +++ sources 2 Mar 2009 16:18:33 -0000 1.103 @@ -1 +1 @@ -f994db97bb33fcdb5a6f8f126ea15716 evolution-data-server-2.25.91.tar.bz2 +d3705271d44f657f3ff0735b055845c4 evolution-data-server-2.25.92.tar.bz2 From spot at fedoraproject.org Mon Mar 2 16:22:45 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Mon, 2 Mar 2009 16:22:45 +0000 (UTC) Subject: rpms/nant/devel nant.spec,1.27,1.28 Message-ID: <20090302162245.CE97C70115@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nant/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17298 Modified Files: nant.spec Log Message: bootstrap hack Index: nant.spec =================================================================== RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- nant.spec 2 Mar 2009 16:15:16 -0000 1.27 +++ nant.spec 2 Mar 2009 16:22:15 -0000 1.28 @@ -1,11 +1,12 @@ -%define debug_package %{nil} -%define monodir %{_libdir} -%define mlib %{_lib} +%global debug_package %{nil} +%global monodir %{_libdir} +%global mlib %{_lib} +%global bootstrap 1 Summary: NAnt is a build tool for Mono and .NET Name: nant Version: 0.85 -Release: 25%{?dist} +Release: 25%{?dist}.1 Epoch: 1 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz Patch0: nant-build.patch @@ -52,33 +53,38 @@ sed -i 's/\r//' COPYING.txt sed -i 's/\r//' README.txt sed -i 's/\r//' doc/releasenotes.html -# Clean out the prebuilt files -# If you're bootstrapping, comment out these two rm lines -# sharpcvslib bits + +# Clean out the prebuilt files (unless we're bootstrapping) +%if 0%{bootstrap} +echo "NORMAL BUILD" +%else +echo "BOOTSTRAPPING BUILD" rm -rf lib/ICSharpCode.SharpCvsLib.Console.dll lib/ICSharpCode.SharpCvsLib.dll lib/scvs.exe -# other system lib bits rm -rf lib/ICSharpCode.SharpZipLib.dll lib/NUnitCore.dll lib/log4net.dll lib/mono/1.0/*.dll lib/mono/2.0/*.dll +%endif # Copy in the system libs # If you're bootstrapping, comment out all these cp lines +%if 0%{bootstrap} +# do nothing +%else cp -p %{_libdir}/mono/sharpcvslib/ICSharpCode.SharpCvsLib.dll lib/ cp -p %{_libdir}/mono/sharpcvslib/cvs.exe lib/scvs.exe cp -p %{_libdir}/mono/1.0/ICSharpCode.SharpZipLib.dll lib/ cp -p %{_libdir}/mono/log4net/log4net.dll lib/ - cp -p %{_libdir}/mono/ndoc/NDoc.Core.dll lib/mono/1.0/ cp -p %{_libdir}/mono/ndoc/NDoc.Documenter.Msdn.dll lib/mono/1.0/ cp -p %{_libdir}/mono/ndoc/NDoc.ExtendedUI.dll lib/mono/1.0/ cp -p %{_libdir}/mono/1.0/nunit.core.dll lib/mono/1.0/ cp -p %{_libdir}/mono/1.0/nunit.framework.dll lib/mono/1.0/ cp -p %{_libdir}/mono/1.0/nunit.util.dll lib/mono/1.0/ - cp -p %{_libdir}/mono/ndoc/NDoc.Core.dll lib/mono/2.0/ cp -p %{_libdir}/mono/ndoc/NDoc.Documenter.Msdn.dll lib/mono/2.0/ cp -p %{_libdir}/mono/ndoc/NDoc.ExtendedUI.dll lib/mono/2.0/ cp -p %{_libdir}/mono/nunit22/nunit.core.dll lib/mono/2.0/ cp -p %{_libdir}/mono/nunit22/nunit.framework.dll lib/mono/2.0/ cp -p %{_libdir}/mono/nunit22/nunit.util.dll lib/mono/2.0/ +%endif %build export MONO_PATH=%{buildroot}/%{mlib} @@ -93,9 +99,13 @@ # Flush out the binary bits that we used to build # If you're bootstrapping, comment out all these rm lines +%if 0%{bootstrap} +# Do nothing +%else rm -rf %{buildroot}%{_libdir}/NAnt/bin/lib rm -rf %{buildroot}%{_libdir}/NAnt/bin/log4net.dll rm -rf %{buildroot}%{_libdir}/NAnt/bin/scvs.exe +%endif %clean rm -rf %{buildroot} @@ -117,8 +127,8 @@ %doc examples/* doc/help/* %changelog -* Mon Mar 2 2009 Tom "spot" Callaway - 1:0.85-25 -- undo bootstrapping hack +* Mon Mar 2 2009 Tom "spot" Callaway - 1:0.85-25.1 +- proper conditionals for bootstrapping * Mon Mar 2 2009 Tom "spot" Callaway - 1:0.85-24.1 - bootstrap hack (to recover from mass rebuild) From ondrejj at fedoraproject.org Mon Mar 2 16:23:12 2009 From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=) Date: Mon, 2 Mar 2009 16:23:12 +0000 (UTC) Subject: rpms/openser/devel openser.spec,1.30,1.31 Message-ID: <20090302162312.384B670115@cvs1.fedora.phx.redhat.com> Author: ondrejj Update of /cvs/pkgs/rpms/openser/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17422 Modified Files: openser.spec Log Message: Compatibility with F<=10 Index: openser.spec =================================================================== RCS file: /cvs/pkgs/rpms/openser/devel/openser.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- openser.spec 28 Feb 2009 18:20:03 -0000 1.30 +++ openser.spec 2 Mar 2009 16:22:41 -0000 1.31 @@ -10,7 +10,7 @@ Summary: Open Source SIP Server Name: openser Version: 1.3.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: http://www.kamailio.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz @@ -442,8 +442,15 @@ # clean some things mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib} -mv $RPM_BUILD_ROOT/%{_prefix}/perl/* \ - $RPM_BUILD_ROOT/%{perl_vendorlib}/ +if [ -d "$RPM_BUILD_ROOT/%{_prefix}/perl" ]; then + # for fedora>=11 + mv $RPM_BUILD_ROOT/%{_prefix}/perl/* \ + $RPM_BUILD_ROOT/%{perl_vendorlib}/ +else + # for fedora<=10 + mv $RPM_BUILD_ROOT/%{_libdir}/openser/perl/* \ + $RPM_BUILD_ROOT/%{perl_vendorlib}/ +fi mv $RPM_BUILD_ROOT/%{_sysconfdir}/openser/tls/README \ $RPM_BUILD_ROOT/%{_docdir}/openser/README.tls rm -f $RPM_BUILD_ROOT%{_docdir}/openser/INSTALL @@ -840,6 +847,9 @@ %doc docdir/README.xmpp %changelog +* Mon Mar 02 2009 Jan ONDREJ (SAL) - 1.3.4-6 +- allow build of this package on fedora<=10 + * Sat Feb 28 2009 Jan ONDREJ (SAL) - 1.3.4-5 - fix module path From mbarnes at fedoraproject.org Mon Mar 2 16:23:46 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 2 Mar 2009 16:23:46 +0000 (UTC) Subject: rpms/evolution/devel .cvsignore, 1.107, 1.108 evolution.spec, 1.374, 1.375 sources, 1.107, 1.108 Message-ID: <20090302162346.A35E370115@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17661 Modified Files: .cvsignore evolution.spec sources Log Message: * Mon Mar 02 2009 Matthew Barnes - 2.25.92-1.fc11 - Update to 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- .cvsignore 16 Feb 2009 18:26:47 -0000 1.107 +++ .cvsignore 2 Mar 2009 16:23:15 -0000 1.108 @@ -1 +0,0 @@ -evolution-2.25.91.tar.bz2 Index: evolution.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v retrieving revision 1.374 retrieving revision 1.375 diff -u -r1.374 -r1.375 --- evolution.spec 24 Feb 2009 15:39:30 -0000 1.374 +++ evolution.spec 2 Mar 2009 16:23:16 -0000 1.375 @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.25.91 -Release: 3%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -689,6 +689,9 @@ %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Mar 02 2009 Matthew Barnes - 2.25.92-1.fc11 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.91-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- sources 16 Feb 2009 18:26:47 -0000 1.107 +++ sources 2 Mar 2009 16:23:16 -0000 1.108 @@ -1 +0,0 @@ -d34ac084be104abe2ded2823bf53a76a evolution-2.25.91.tar.bz2 From vcrhonek at fedoraproject.org Mon Mar 2 16:24:01 2009 From: vcrhonek at fedoraproject.org (Vitezslav Crhonek) Date: Mon, 2 Mar 2009 16:24:01 +0000 (UTC) Subject: rpms/kbd/devel kbd.spec,1.61,1.62 Message-ID: <20090302162401.82E0170115@cvs1.fedora.phx.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/kbd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17761 Modified Files: kbd.spec Log Message: Remove static loadkeys binary (it's not needed anymore) Index: kbd.spec =================================================================== RCS file: /cvs/extras/rpms/kbd/devel/kbd.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- kbd.spec 25 Feb 2009 10:17:03 -0000 1.61 +++ kbd.spec 2 Mar 2009 16:23:31 -0000 1.62 @@ -1,6 +1,6 @@ Name: kbd Version: 1.15 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) Group: System Environment/Base @@ -61,11 +61,6 @@ %build %configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir} --localedir=%{_datadir}/locale --enable-nls -make %{?_smp_mflags} LDFLAGS="-static" -mv src/loadkeys src/loadkeys.static -make clean - -%configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir} --localedir=%{_datadir}/locale --enable-nls make %{?_smp_mflags} %install @@ -95,9 +90,6 @@ # Link open to openvt ln -s openvt $RPM_BUILD_ROOT%{_bindir}/open -# install static binary for mkinitrd to use -install -c -m755 src/loadkeys.static $RPM_BUILD_ROOT/bin - %find_lang %{name} %clean @@ -112,6 +104,9 @@ /lib/kbd %changelog +* Mon Mar 2 2009 Vitezslav Crhonek - 1.15-6 +- Remove static loadkeys binary (it's not needed anymore) + * Wed Feb 25 2009 Fedora Release Engineering - 1.15-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mbarnes at fedoraproject.org Mon Mar 2 16:24:03 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 2 Mar 2009 16:24:03 +0000 (UTC) Subject: rpms/evolution-exchange/devel .cvsignore, 1.38, 1.39 evolution-exchange.spec, 1.56, 1.57 sources, 1.38, 1.39 Message-ID: <20090302162403.DCC6C70115@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution-exchange/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17719 Modified Files: .cvsignore evolution-exchange.spec sources Log Message: * Mon Mar 02 2009 Matthew Barnes - 2.25.92-1.fc11 - Update to 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 16 Feb 2009 18:26:54 -0000 1.38 +++ .cvsignore 2 Mar 2009 16:23:33 -0000 1.39 @@ -1 +1 @@ -evolution-exchange-2.25.91.tar.bz2 +evolution-exchange-2.25.92.tar.bz2 Index: evolution-exchange.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- evolution-exchange.spec 24 Feb 2009 15:42:18 -0000 1.56 +++ evolution-exchange.spec 2 Mar 2009 16:23:33 -0000 1.57 @@ -20,8 +20,8 @@ ### Abstract ### Name: evolution-exchange -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Group: Applications/Productivity Summary: Evolution plugin to interact with MS Exchange Server License: GPLv2+ @@ -151,6 +151,9 @@ %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas %changelog +* Mon Mar 02 2009 Matthew Barnes - 2.25.92-1.fc11 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 16 Feb 2009 18:26:54 -0000 1.38 +++ sources 2 Mar 2009 16:23:33 -0000 1.39 @@ -1 +1 @@ -34e5c7f05929e44454833f948ffa577b evolution-exchange-2.25.91.tar.bz2 +ff6de8d6e482dbb0591a745c5f1c3806 evolution-exchange-2.25.92.tar.bz2 From mbarnes at fedoraproject.org Mon Mar 2 16:24:13 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 2 Mar 2009 16:24:13 +0000 (UTC) Subject: rpms/evolution-mapi/devel .cvsignore, 1.2, 1.3 evolution-mapi.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090302162413.A28EA70115@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution-mapi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17799 Modified Files: .cvsignore evolution-mapi.spec sources Log Message: * Mon Mar 02 2009 Matthew Barnes - 0.25.92-1 - Update to 0.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Feb 2009 01:47:28 -0000 1.2 +++ .cvsignore 2 Mar 2009 16:23:43 -0000 1.3 @@ -1 +1 @@ -evolution-mapi-0.25.91.tar.bz2 +evolution-mapi-0.25.92.tar.bz2 Index: evolution-mapi.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/evolution-mapi.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-mapi.spec 27 Feb 2009 01:47:28 -0000 1.1 +++ evolution-mapi.spec 2 Mar 2009 16:23:43 -0000 1.2 @@ -11,8 +11,8 @@ ### Abstract ### Name: evolution-mapi -Version: 0.25.91 -Release: 3%{?dist} +Version: 0.25.92 +Release: 1%{?dist} Group: Applications/Productivity Summary: Evolution extension for MS Exchange 2007 servers License: LGPLv2+ @@ -111,6 +111,9 @@ %{_libdir}/pkgconfig/libexchangemapi-1.0.pc %changelog +* Mon Mar 02 2009 Matthew Barnes - 0.25.92-1 +- Update to 0.25.92 + * Thu Feb 26 2009 Matthew Barnes - 0.25.91-3 - Formal package review cleanups. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Feb 2009 01:47:28 -0000 1.2 +++ sources 2 Mar 2009 16:23:43 -0000 1.3 @@ -1 +1 @@ -efc148c8ab8a82d46a6417e84e43f396 evolution-mapi-0.25.91.tar.bz2 +2d560af0186420a66f6bb4c2096f8498 evolution-mapi-0.25.92.tar.bz2 From caolanm at fedoraproject.org Mon Mar 2 16:28:33 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 2 Mar 2009 16:28:33 +0000 (UTC) Subject: rpms/enigma/devel enigma-consts.patch, NONE, 1.1 enigma.spec, 1.27, 1.28 Message-ID: <20090302162833.35C6C70115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/enigma/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18774 Modified Files: enigma.spec Added Files: enigma-consts.patch Log Message: fix up consts enigma-consts.patch: --- NEW FILE enigma-consts.patch --- diff -ru enigma-1.01.orig/src/lua.cc enigma-1.01/src/lua.cc --- enigma-1.01.orig/src/lua.cc 2009-03-02 16:14:03.000000000 +0000 +++ enigma-1.01/src/lua.cc 2009-03-02 16:14:30.000000000 +0000 @@ -574,7 +574,7 @@ int y = round_down(lua_tonumber(L, 2)); const char *dir = lua_tostring(L,3); const char *allowed = "wsen"; - char *found = strchr(allowed, dir[0]); + const char *found = strchr(allowed, dir[0]); if (found && found[0]) world::AddScramble(GridPos(x,y), enigma::Direction(found-allowed)); Index: enigma.spec =================================================================== RCS file: /cvs/pkgs/rpms/enigma/devel/enigma.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- enigma.spec 24 Feb 2009 15:05:22 -0000 1.27 +++ enigma.spec 2 Mar 2009 16:28:02 -0000 1.28 @@ -1,6 +1,6 @@ Name: enigma Version: 1.01 -Release: 9.1 +Release: 10 Summary: Clone of the ATARI game Oxyd Group: Amusements/Games @@ -11,6 +11,7 @@ Patch1: enigma-gcc-4.3-ftbfs.patch # taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505358 Patch2: enigma-gcc-4.4-ftbfs.patch +Patch3: enigma-consts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{_datadir}/fonts/dejavu/DejaVuSans.ttf @@ -40,6 +41,7 @@ %patch0 -p1 %patch1 -p0 %patch2 -p1 +%patch3 -p1 %build %configure --enable-optimize @@ -91,6 +93,9 @@ %exclude %{_libdir}/libenet.a %changelog +* Mon Mar 02 2009 Caol??n McNamara - 1.01-10 +- fix up consts + * Tue Feb 24 2009 Fedora Release Engineering - 1.01-9.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mschwendt at fedoraproject.org Mon Mar 2 16:28:38 2009 From: mschwendt at fedoraproject.org (Michael Schwendt) Date: Mon, 2 Mar 2009 16:28:38 +0000 (UTC) Subject: rpms/audacity/devel audacity-1.3.7-audiodevdefaults.patch, 1.1, 1.2 audacity.spec, 1.73, 1.74 Message-ID: <20090302162838.BFF8A70115@cvs1.fedora.phx.redhat.com> Author: mschwendt Update of /cvs/pkgs/rpms/audacity/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18898 Modified Files: audacity-1.3.7-audiodevdefaults.patch audacity.spec Log Message: * Mon Mar 2 2009 Michael Schwendt - 1.3.7-0.6.beta - revise default device names patch, so it doesn't save the defaults audacity-1.3.7-audiodevdefaults.patch: Index: audacity-1.3.7-audiodevdefaults.patch =================================================================== RCS file: /cvs/pkgs/rpms/audacity/devel/audacity-1.3.7-audiodevdefaults.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- audacity-1.3.7-audiodevdefaults.patch 1 Mar 2009 08:03:00 -0000 1.1 +++ audacity-1.3.7-audiodevdefaults.patch 2 Mar 2009 16:28:38 -0000 1.2 @@ -1,27 +1,77 @@ -diff -Nur audacity-src-1.3.7-orig/src/AudioIO.cpp audacity-src-1.3.7/src/AudioIO.cpp ---- audacity-src-1.3.7-orig/src/AudioIO.cpp 2009-01-27 21:50:59.000000000 +0100 -+++ audacity-src-1.3.7/src/AudioIO.cpp 2009-03-01 08:48:20.000000000 +0100 -@@ -1898,6 +1898,11 @@ - // device, so we just use the first one available - if (recDeviceNum < 0) - recDeviceNum = 0; -+ const PaDeviceInfo* info = Pa_GetDeviceInfo(recDeviceNum); -+ if (info && (info->maxInputChannels > 0)) -+ { -+ gPrefs->Write(wxT("/AudioIO/RecordingDevice"), DeviceName(info)); -+ } - return recDeviceNum; - } +diff -Nur audacity-src-1.3.7-orig/src/prefs/AudioIOPrefs.cpp audacity-src-1.3.7/src/prefs/AudioIOPrefs.cpp +--- audacity-src-1.3.7-orig/src/prefs/AudioIOPrefs.cpp 2009-01-27 21:50:58.000000000 +0100 ++++ audacity-src-1.3.7/src/prefs/AudioIOPrefs.cpp 2009-03-02 17:25:17.000000000 +0100 +@@ -71,6 +71,25 @@ + wxString Name; + wxString Label; -@@ -1937,6 +1942,11 @@ - // device, so we just use the first one available - if (DeviceNum < 0) - DeviceNum = 0; -+ const PaDeviceInfo* info = Pa_GetDeviceInfo(DeviceNum); -+ if (info && (info->maxInputChannels > 0)) -+ { -+ gPrefs->Write(wxT("/AudioIO/PlaybackDevice"), DeviceName(info)); ++ mDefaultPlayDeviceName = gPrefs->Read(wxT("/AudioIO/PlaybackDevice"), wxT("")); ++ int playDeviceNum = -1; // use device name from gPrefs ++ if ( mDefaultPlayDeviceName == wxT("") ) { ++#if USE_PORTAUDIO_V19 ++ playDeviceNum = Pa_GetDefaultOutputDevice(); ++#else ++ playDeviceNum = Pa_GetDefaultOutputDeviceID(); ++#endif ++ } ++ mDefaultRecDeviceName = gPrefs->Read(wxT("/AudioIO/RecordingDevice"), wxT("")); ++ int recDeviceNum = -1; // use device name from gPrefs ++ if ( mDefaultRecDeviceName == wxT("") ) { ++#if USE_PORTAUDIO_V19 ++ recDeviceNum = Pa_GetDefaultInputDevice(); ++#else ++ recDeviceNum = Pa_GetDefaultInputDeviceID(); ++#endif + } - return DeviceNum; - } ++ + #if USE_PORTAUDIO_V19 + int nDevices = Pa_GetDeviceCount(); + #else +@@ -85,10 +104,16 @@ + if (info->maxOutputChannels > 0) { + mmPlayNames.Add( Name ); + mmPlayLabels.Add( Label ); ++ if ( playDeviceNum == j ) { ++ mDefaultPlayDeviceName = Name; ++ } + } + if (info->maxInputChannels > 0) { + mmRecordNames.Add( Name ); + mmRecordLabels.Add( Label ); ++ if ( recDeviceNum == j ) { ++ mDefaultRecDeviceName = Name; ++ } + // if (info->maxInputChannels > numChannels) + // numChannels = info->maxInputChannels; + } +@@ -121,7 +146,7 @@ + S.StartMultiColumn(2, wxEXPAND); + S.SetStretchyCol(1); + mPlay = S.TieChoice( _("Device") + wxString(wxT(":")), wxT("PlaybackDevice"), +- wxT(""), mmPlayNames, mmPlayLabels ); ++ mDefaultPlayDeviceName, mmPlayNames, mmPlayLabels ); + + S.AddPrompt( _("Using:") ); + wxString ver = _("Portaudio v"); +@@ -139,7 +164,7 @@ + S.StartMultiColumn(2, wxEXPAND); + S.SetStretchyCol(1); + mRec = S.TieChoice( _("Device") + wxString(wxT(":")), wxT("RecordingDevice"), +- wxT(""), mmRecordNames, mmRecordLabels ); ++ mDefaultRecDeviceName, mmRecordNames, mmRecordLabels ); + S.TieChoice( _("Channels") + wxString(wxT(":")), wxT("RecordChannels"), + 2, mmChannelNames, mmChannelLabels ); + S.EndMultiColumn(); +diff -Nur audacity-src-1.3.7-orig/src/prefs/AudioIOPrefs.h audacity-src-1.3.7/src/prefs/AudioIOPrefs.h +--- audacity-src-1.3.7-orig/src/prefs/AudioIOPrefs.h 2009-01-27 21:50:58.000000000 +0100 ++++ audacity-src-1.3.7/src/prefs/AudioIOPrefs.h 2009-03-02 17:25:16.000000000 +0100 +@@ -48,6 +48,9 @@ + + wxChoice *mPlay; + wxChoice *mRec; ++ ++ wxString mDefaultPlayDeviceName; ++ wxString mDefaultRecDeviceName; + }; + #endif Index: audacity.spec =================================================================== RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- audacity.spec 1 Mar 2009 08:03:00 -0000 1.73 +++ audacity.spec 2 Mar 2009 16:28:38 -0000 1.74 @@ -5,7 +5,7 @@ Name: audacity Version: 1.3.7 -Release: 0.5.beta%{?dist} +Release: 0.6.beta%{?dist} Summary: Multitrack audio editor Group: Applications/Multimedia License: GPLv2 @@ -143,6 +143,9 @@ %changelog +* Mon Mar 2 2009 Michael Schwendt - 1.3.7-0.6.beta +- revise default device names patch, so it doesn't save the defaults + * Sun Mar 1 2009 Michael Schwendt - 1.3.7-0.5.beta - show default device names in Audio I/O preferences From ltinkl at fedoraproject.org Mon Mar 2 16:32:26 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Mar 2009 16:32:26 +0000 (UTC) Subject: rpms/soprano/F-10 soprano.spec,1.25,1.26 sources,1.15,1.16 Message-ID: <20090302163226.EB08D70115@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/soprano/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20240/F-10 Modified Files: soprano.spec sources Log Message: soprano 2.2.3 Index: soprano.spec =================================================================== RCS file: /cvs/extras/rpms/soprano/F-10/soprano.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- soprano.spec 29 Jan 2009 16:57:58 -0000 1.25 +++ soprano.spec 2 Mar 2009 16:31:56 -0000 1.26 @@ -6,7 +6,7 @@ Summary: Qt wrapper API to different RDF storage solutions Name: soprano -Version: 2.2.1 +Version: 2.2.3 Release: 1%{?dist} Group: System Environment/Libraries @@ -56,14 +56,9 @@ %build -%cmake . -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` - +%cmake . -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` -DSOPRANO_BUILD_API_DOCS:BOOL=%{?apidocs} make %{?_smp_mflags} -%if "%{?apidocs}" == "1" -make apidox -%endif - %install rm -rf $RPM_BUILD_ROOT @@ -108,6 +103,12 @@ %changelog +* Mon Mar 2 2009 Luk???? Tinkl - 2.2.3-1 +- update to 2.2.3, fix apidox building + +* Wed Feb 25 2009 Fedora Release Engineering - 2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jan 29 2009 Luk???? Tinkl 2.2.1-1 - update to 2.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/soprano/F-10/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 29 Jan 2009 16:57:58 -0000 1.15 +++ sources 2 Mar 2009 16:31:56 -0000 1.16 @@ -1 +1 @@ -69688a71273e1e9389fc60e3085c695f soprano-2.2.1.tar.bz2 +22c992a252144ae0a3a964ba2f6f1933 soprano-2.2.3.tar.bz2 From ltinkl at fedoraproject.org Mon Mar 2 16:32:27 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Mar 2009 16:32:27 +0000 (UTC) Subject: rpms/soprano/F-9 soprano.spec,1.22,1.23 sources,1.13,1.14 Message-ID: <20090302163227.248D070116@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/soprano/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20240/F-9 Modified Files: soprano.spec sources Log Message: soprano 2.2.3 Index: soprano.spec =================================================================== RCS file: /cvs/extras/rpms/soprano/F-9/soprano.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- soprano.spec 29 Jan 2009 16:57:58 -0000 1.22 +++ soprano.spec 2 Mar 2009 16:31:56 -0000 1.23 @@ -6,7 +6,7 @@ Summary: Qt wrapper API to different RDF storage solutions Name: soprano -Version: 2.2.1 +Version: 2.2.3 Release: 1%{?dist} Group: System Environment/Libraries @@ -56,14 +56,9 @@ %build -%cmake . -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` - +%cmake . -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` -DSOPRANO_BUILD_API_DOCS:BOOL=%{?apidocs} make %{?_smp_mflags} -%if "%{?apidocs}" == "1" -make apidox -%endif - %install rm -rf $RPM_BUILD_ROOT @@ -108,6 +103,12 @@ %changelog +* Mon Mar 2 2009 Luk???? Tinkl - 2.2.3-1 +- update to 2.2.3, fix apidox building + +* Wed Feb 25 2009 Fedora Release Engineering - 2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jan 29 2009 Luk???? Tinkl 2.2.1-1 - update to 2.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/soprano/F-9/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 29 Jan 2009 16:57:58 -0000 1.13 +++ sources 2 Mar 2009 16:31:56 -0000 1.14 @@ -1 +1 @@ -69688a71273e1e9389fc60e3085c695f soprano-2.2.1.tar.bz2 +22c992a252144ae0a3a964ba2f6f1933 soprano-2.2.3.tar.bz2 From tbzatek at fedoraproject.org Mon Mar 2 16:34:52 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 2 Mar 2009 16:34:52 +0000 (UTC) Subject: rpms/gvfs/devel .cvsignore, 1.35, 1.36 gvfs.spec, 1.108, 1.109 sources, 1.35, 1.36 gvfs-burn-move.patch, 1.1, NONE Message-ID: <20090302163452.344DA70115@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21025 Modified Files: .cvsignore gvfs.spec sources Removed Files: gvfs-burn-move.patch Log Message: * Mon Mar 2 2009 Tomas Bzatek - 1.1.7-1 - Update to 1.1.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 16 Feb 2009 14:00:12 -0000 1.35 +++ .cvsignore 2 Mar 2009 16:34:21 -0000 1.36 @@ -1 +1 @@ -gvfs-1.1.6.tar.bz2 +gvfs-1.1.7.tar.bz2 Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- gvfs.spec 25 Feb 2009 03:02:42 -0000 1.108 +++ gvfs.spec 2 Mar 2009 16:34:21 -0000 1.109 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs -Version: 1.1.6 -Release: 2%{?dist} +Version: 1.1.7 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -31,9 +31,6 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=567235 Patch1: gvfs-0.99.2-archive-integration.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=565041 -Patch2: gvfs-burn-move.patch - %description The gvfs package provides backend implementations for the gio @@ -116,7 +113,6 @@ %prep %setup -q %patch1 -p0 -b .archive-integration -%patch2 -p0 -b .burn-move %build @@ -257,6 +253,9 @@ %changelog +* Mon Mar 2 2009 Tomas Bzatek - 1.1.7-1 +- Update to 1.1.7 + * Tue Feb 24 2009 Fedora Release Engineering - 1.1.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 16 Feb 2009 14:00:12 -0000 1.35 +++ sources 2 Mar 2009 16:34:21 -0000 1.36 @@ -1 +1 @@ -66c69088f63991a965e242e4a516bc2c gvfs-1.1.6.tar.bz2 +c5528812561936fd9501a62382d24585 gvfs-1.1.7.tar.bz2 --- gvfs-burn-move.patch DELETED --- From tmraz at fedoraproject.org Mon Mar 2 16:46:25 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Mon, 2 Mar 2009 16:46:25 +0000 (UTC) Subject: rpms/opensc/F-10 opensc-0.11.7-develconfig.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 opensc.spec, 1.39, 1.40 sources, 1.21, 1.22 opensc-0.11.6-develconfig.patch, 1.1, NONE Message-ID: <20090302164625.E5D9270115@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/opensc/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22390 Modified Files: .cvsignore opensc.spec sources Added Files: opensc-0.11.7-develconfig.patch Removed Files: opensc-0.11.6-develconfig.patch Log Message: * Fri Feb 27 2009 Tomas Mraz - 0.11.7-1 - new upstream version - fixes CVE-2009-0368 opensc-0.11.7-develconfig.patch: --- NEW FILE opensc-0.11.7-develconfig.patch --- diff -up opensc-0.11.7/src/libopensc/libopensc.pc.in.config opensc-0.11.7/src/libopensc/libopensc.pc.in --- opensc-0.11.7/src/libopensc/libopensc.pc.in.config 2006-05-15 22:57:30.000000000 +0200 +++ opensc-0.11.7/src/libopensc/libopensc.pc.in 2009-02-27 19:05:56.000000000 +0100 @@ -6,6 +6,6 @@ includedir=@includedir@ Name: libopensc Description: libopensc Version: @VERSION@ -Libs: -L${libdir} -lopensc -lscconf +Libs: -L${libdir} -lopensc Cflags: -I${includedir} diff -up opensc-0.11.7/src/libopensc/opensc-config.in.config opensc-0.11.7/src/libopensc/opensc-config.in --- opensc-0.11.7/src/libopensc/opensc-config.in.config 2008-12-27 17:15:30.000000000 +0100 +++ opensc-0.11.7/src/libopensc/opensc-config.in 2009-02-27 19:03:11.000000000 +0100 @@ -15,10 +15,10 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" exec_prefix_set=no -libdir="@libdir@" -includedir="@includedir@" +libdir="" +includedir="" opensc_cflags="" -opensc_libs="-L${libdir} -lopensc -lscconf" +opensc_libs="-lopensc -lscconf" usage() { Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/opensc/F-10/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 2 Sep 2008 14:32:04 -0000 1.21 +++ .cvsignore 2 Mar 2009 16:45:55 -0000 1.22 @@ -1 +1 @@ -opensc-0.11.6.tar.gz +opensc-0.11.7.tar.gz Index: opensc.spec =================================================================== RCS file: /cvs/pkgs/rpms/opensc/F-10/opensc.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- opensc.spec 2 Sep 2008 14:32:04 -0000 1.39 +++ opensc.spec 2 Mar 2009 16:45:55 -0000 1.40 @@ -1,7 +1,7 @@ %define plugindir %{_libdir}/mozilla/plugins Name: opensc -Version: 0.11.6 +Version: 0.11.7 Release: 1%{?dist} Summary: Smart card library and applications @@ -9,7 +9,7 @@ License: LGPLv2+ URL: http://www.opensc-project.org/opensc/ Source0: http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz -Patch1: %{name}-0.11.6-develconfig.patch +Patch1: %{name}-0.11.7-develconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcsc-lite-devel >= 1.1.1 @@ -20,6 +20,8 @@ BuildRequires: openssl-devel >= 0.9.7a BuildRequires: libtool-ltdl-devel BuildRequires: libtool +BuildRequires: pkgconfig +Requires: pcsc-lite-libs %description OpenSC is a package for for accessing smart card devices. Basic @@ -68,6 +70,7 @@ --enable-pcsc \ --enable-openct \ --enable-doc \ + --with-pcsc-provider=%{_libdir}/libpcsclite.so.1 \ --with-plugindir=%{plugindir} \ --with-pin-entry=%{_bindir}/pinentry make %{?_smp_mflags} @@ -103,6 +106,7 @@ %doc docdir/* %config(noreplace) %{_sysconfdir}/opensc.conf %{_bindir}/cardos-info +%{_bindir}/cardos-tool %{_bindir}/cryptoflex-tool %{_bindir}/eidenv %{_bindir}/netkey-tool @@ -120,7 +124,7 @@ %{_libdir}/pkcs11/onepin-opensc-pkcs11.so %{_libdir}/pkcs11/opensc-pkcs11.so %{_datadir}/opensc/ -%{_mandir}/man1/cardos-info.1* +%{_mandir}/man1/cardos-tool.1* %{_mandir}/man1/cryptoflex-tool.1* %{_mandir}/man1/netkey-tool.1* %{_mandir}/man1/opensc-explorer.* @@ -149,6 +153,16 @@ %changelog +* Fri Feb 27 2009 Tomas Mraz - 0.11.7-1 +- new upstream version - fixes CVE-2009-0368 + +* Thu Feb 26 2009 Fedora Release Engineering - 0.11.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jan 15 2009 Tomas Mraz - 0.11.6-2 +- Add explicit requires for pcsc-lite-libs. Dlopen libpcsclite with the full + soname. + * Tue Sep 2 2008 Tomas Mraz - 0.11.6-1 - Update to latest upstream, fixes CVE-2008-2235 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/opensc/F-10/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 2 Sep 2008 14:32:04 -0000 1.21 +++ sources 2 Mar 2009 16:45:55 -0000 1.22 @@ -1 +1 @@ -a426759f11350c32af2f17a5cd4d5938 opensc-0.11.6.tar.gz +419e9be372c2f9bbb3ce9704c929d5ec opensc-0.11.7.tar.gz --- opensc-0.11.6-develconfig.patch DELETED --- From caolanm at fedoraproject.org Mon Mar 2 16:49:05 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 2 Mar 2009 16:49:05 +0000 (UTC) Subject: rpms/openoffice.org/devel workspace.localization35.patch,1.1,1.2 Message-ID: <20090302164905.6040E70115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22738 Modified Files: workspace.localization35.patch Log Message: wrong patch prefix workspace.localization35.patch: Index: workspace.localization35.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.localization35.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- workspace.localization35.patch 2 Mar 2009 15:44:25 -0000 1.1 +++ workspace.localization35.patch 2 Mar 2009 16:48:34 -0000 1.2 @@ -1,7 +1,7 @@ Index: inc/postset.mk =================================================================== ---- inc/postset.mk (.../tags/DEV300_m40/solenv) (revision 268665) -+++ inc/postset.mk (.../cws/localization35/solenv) (revision 268665) +--- solenv/inc/postset.mk (.../tags/DEV300_m40/solenv) (revision 268665) ++++ solenv/inc/postset.mk (.../cws/localization35/solenv) (revision 268665) @@ -35,6 +35,6 @@ defaultlangiso=en-US From james at fedoraproject.org Mon Mar 2 16:54:02 2009 From: james at fedoraproject.org (James Antill) Date: Mon, 2 Mar 2009 16:54:02 +0000 (UTC) Subject: rpms/zsh/devel zsh.spec,1.56,1.57 Message-ID: <20090302165402.3208C70115@cvs1.fedora.phx.redhat.com> Author: james Update of /cvs/pkgs/rpms/zsh/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23468 Modified Files: zsh.spec Log Message: * Mon Mar 2 2009 James Antill - 4.3.9-4 - Remove D02glob testcase on ppc/ppc64, and hope noone cares Index: zsh.spec =================================================================== RCS file: /cvs/pkgs/rpms/zsh/devel/zsh.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- zsh.spec 2 Mar 2009 15:38:22 -0000 1.56 +++ zsh.spec 2 Mar 2009 16:53:31 -0000 1.57 @@ -26,7 +26,7 @@ Prereq: fileutils grep /sbin/install-info Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: mktemp coreutils sed ncurses-devel libcap-devel -BuildRequires: texinfo tetex texi2html gawk /bin/hostname pcre-devel +BuildRequires: texinfo tetex texi2html gawk /bin/hostname Requires(post): /sbin/install-info grep Requires(preun): /sbin/install-info Requires(postun): mktemp coreutils grep @@ -68,7 +68,7 @@ %define _bindir /bin # Avoid stripping... export LDFLAGS="" -%configure --enable-etcdir=%{_sysconfdir} --with-tcsetpgrp --enable-maildir-support --enable-pcre +%configure --enable-etcdir=%{_sysconfdir} --with-tcsetpgrp --enable-maildir-support make all html @@ -80,6 +80,11 @@ %ifarch s390 s390x ppc ppc64 mv Y*.ztst skipped %endif +%ifarch ppc ppc64 + # FIXME: This is a real failure, Debian apparently just don't test. + # RHBZ: 460043 + mv D02glob.ztst skipped +%endif # FIXME: This hangs in mock # Running test: Test loading of all compiled modules mv V01zmodload.ztst skipped @@ -163,8 +168,8 @@ %doc Doc/*.html %changelog -* Mon Mar 2 2009 James Antill - 4.3.9-3 -- Change to --enable-prce, see if that solves the ppc problems +* Mon Mar 2 2009 James Antill - 4.3.9-4 +- Remove D02glob testcase on ppc/ppc64, and hope noone cares * Wed Feb 25 2009 Fedora Release Engineering - 4.3.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From tbzatek at fedoraproject.org Mon Mar 2 16:55:12 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 2 Mar 2009 16:55:12 +0000 (UTC) Subject: rpms/nautilus/devel .cvsignore, 1.90, 1.91 nautilus.spec, 1.261, 1.262 sources, 1.94, 1.95 Message-ID: <20090302165512.6D2F670115@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/nautilus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23797 Modified Files: .cvsignore nautilus.spec sources Log Message: * Mon Mar 2 2009 Tomas Bzatek - 2.25.92-1 - Update to 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- .cvsignore 16 Feb 2009 16:31:34 -0000 1.90 +++ .cvsignore 2 Mar 2009 16:54:42 -0000 1.91 @@ -1 +1 @@ -nautilus-2.25.91.tar.bz2 +nautilus-2.25.92.tar.bz2 Index: nautilus.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- nautilus.spec 26 Feb 2009 04:18:34 -0000 1.261 +++ nautilus.spec 2 Mar 2009 16:54:42 -0000 1.262 @@ -15,8 +15,8 @@ Name: nautilus Summary: File manager for GNOME -Version: 2.25.91 -Release: 3%{?dist} +Version: 2.25.92 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2 @@ -261,6 +261,9 @@ %changelog +* Mon Mar 2 2009 Tomas Bzatek - 2.25.92-1 +- Update to 2.25.92 + * Wed Feb 25 2009 Fedora Release Engineering - 2.25.91-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/sources,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- sources 16 Feb 2009 16:31:34 -0000 1.94 +++ sources 2 Mar 2009 16:54:42 -0000 1.95 @@ -1 +1 @@ -2a19cefe832dc1e9458f9a09bf47cbea nautilus-2.25.91.tar.bz2 +478821fc4dc6e04bf87c8b6bdda85826 nautilus-2.25.92.tar.bz2 From tbzatek at fedoraproject.org Mon Mar 2 16:59:25 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 2 Mar 2009 16:59:25 +0000 (UTC) Subject: rpms/gnome-keyring/devel .cvsignore, 1.58, 1.59 gnome-keyring.spec, 1.114, 1.115 sources, 1.58, 1.59 Message-ID: <20090302165925.60B7E70115@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gnome-keyring/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24633 Modified Files: .cvsignore gnome-keyring.spec sources Log Message: * Mon Mar 2 2009 Tomas Bzatek - 2.25.92-1 - Update to 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- .cvsignore 15 Feb 2009 00:23:25 -0000 1.58 +++ .cvsignore 2 Mar 2009 16:58:54 -0000 1.59 @@ -1 +1 @@ -gnome-keyring-2.25.91.tar.bz2 +gnome-keyring-2.25.92.tar.bz2 Index: gnome-keyring.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- gnome-keyring.spec 24 Feb 2009 22:59:10 -0000 1.114 +++ gnome-keyring.spec 2 Mar 2009 16:58:54 -0000 1.115 @@ -7,8 +7,8 @@ Summary: Framework for managing passwords and other secrets Name: gnome-keyring -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gnome-keyring/2.25/gnome-keyring-%{version}.tar.bz2 @@ -140,6 +140,9 @@ %changelog +* Mon Mar 2 2009 Tomas Bzatek - 2.25.92-1 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- sources 15 Feb 2009 00:23:25 -0000 1.58 +++ sources 2 Mar 2009 16:58:54 -0000 1.59 @@ -1 +1 @@ -c583ad06527f5eb456a0649dbba261dc gnome-keyring-2.25.91.tar.bz2 +ce1faf711b6769831bec2e0a3e9c9ad5 gnome-keyring-2.25.92.tar.bz2 From tmraz at fedoraproject.org Mon Mar 2 16:59:29 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Mon, 2 Mar 2009 16:59:29 +0000 (UTC) Subject: rpms/opensc/F-9 opensc-0.11.7-develconfig.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 opensc.spec, 1.38, 1.39 sources, 1.20, 1.21 opensc-0.11.1-develconfig.patch, 1.1, NONE Message-ID: <20090302165929.32FEA70115@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/opensc/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24662 Modified Files: .cvsignore opensc.spec sources Added Files: opensc-0.11.7-develconfig.patch Removed Files: opensc-0.11.1-develconfig.patch Log Message: * Fri Feb 27 2009 Tomas Mraz - 0.11.7-1 - new upstream version - fixes CVE-2009-0368 opensc-0.11.7-develconfig.patch: --- NEW FILE opensc-0.11.7-develconfig.patch --- diff -up opensc-0.11.7/src/libopensc/libopensc.pc.in.config opensc-0.11.7/src/libopensc/libopensc.pc.in --- opensc-0.11.7/src/libopensc/libopensc.pc.in.config 2006-05-15 22:57:30.000000000 +0200 +++ opensc-0.11.7/src/libopensc/libopensc.pc.in 2009-02-27 19:05:56.000000000 +0100 @@ -6,6 +6,6 @@ includedir=@includedir@ Name: libopensc Description: libopensc Version: @VERSION@ -Libs: -L${libdir} -lopensc -lscconf +Libs: -L${libdir} -lopensc Cflags: -I${includedir} diff -up opensc-0.11.7/src/libopensc/opensc-config.in.config opensc-0.11.7/src/libopensc/opensc-config.in --- opensc-0.11.7/src/libopensc/opensc-config.in.config 2008-12-27 17:15:30.000000000 +0100 +++ opensc-0.11.7/src/libopensc/opensc-config.in 2009-02-27 19:03:11.000000000 +0100 @@ -15,10 +15,10 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" exec_prefix_set=no -libdir="@libdir@" -includedir="@includedir@" +libdir="" +includedir="" opensc_cflags="" -opensc_libs="-L${libdir} -lopensc -lscconf" +opensc_libs="-lopensc -lscconf" usage() { Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/opensc/F-9/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 10 Sep 2007 16:18:55 -0000 1.20 +++ .cvsignore 2 Mar 2009 16:58:58 -0000 1.21 @@ -1 +1 @@ -opensc-0.11.4.tar.gz +opensc-0.11.7.tar.gz Index: opensc.spec =================================================================== RCS file: /cvs/pkgs/rpms/opensc/F-9/opensc.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- opensc.spec 10 Apr 2008 15:01:45 -0000 1.38 +++ opensc.spec 2 Mar 2009 16:58:58 -0000 1.39 @@ -1,15 +1,15 @@ %define plugindir %{_libdir}/mozilla/plugins Name: opensc -Version: 0.11.4 -Release: 5%{?dist} +Version: 0.11.7 +Release: 1%{?dist} Summary: Smart card library and applications Group: System Environment/Libraries License: LGPLv2+ URL: http://www.opensc-project.org/opensc/ Source0: http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz -Patch0: %{name}-0.11.1-develconfig.patch +Patch1: %{name}-0.11.7-develconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcsc-lite-devel >= 1.1.1 @@ -20,6 +20,8 @@ BuildRequires: openssl-devel >= 0.9.7a BuildRequires: libtool-ltdl-devel BuildRequires: libtool +BuildRequires: pkgconfig +Requires: pcsc-lite-libs %description OpenSC is a package for for accessing smart card devices. Basic @@ -54,9 +56,8 @@ %prep %setup -q -%patch0 -p1 +%patch1 -p1 -b .config sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure # lib64 rpaths -f=doc/ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f cp -p src/pkcs15init/README ./README.pkcs15init cp -p src/scconf/README.scconf . # No %{_libdir} here to avoid multilib conflicts; it's just an example @@ -64,9 +65,13 @@ %build -%configure --disable-dependency-tracking \ - --disable-static \ - --with-plugin-dir=%{plugindir} \ +%configure --disable-static \ + --enable-nsplugin \ + --enable-pcsc \ + --enable-openct \ + --enable-doc \ + --with-pcsc-provider=%{_libdir}/libpcsclite.so.1 \ + --with-plugindir=%{plugindir} \ --with-pin-entry=%{_bindir}/pinentry make %{?_smp_mflags} @@ -77,16 +82,14 @@ make install DESTDIR=$RPM_BUILD_ROOT install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf -install -dm 755 _docs/openssh -install -pm 644 src/openssh/README src/openssh/ask-for-pin.diff _docs/openssh -cp -pR doc _docs -rm -r _docs/doc/{*.sh,*.xsl,api,Makefile*,tools} - find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" | xargs rm rm $RPM_BUILD_ROOT%{plugindir}/opensc-signer.so mv $RPM_BUILD_ROOT%{_libdir}/opensc-signer.so $RPM_BUILD_ROOT%{plugindir} +mkdir apidocdir +mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/api.html apidocdir +mv -T $RPM_BUILD_ROOT%{_datadir}/doc/%{name} docdir %clean rm -rf $RPM_BUILD_ROOT @@ -99,9 +102,11 @@ %files %defattr(-,root,root,-) -%doc COPYING NEWS README* _docs/doc/ +%doc COPYING NEWS README* +%doc docdir/* %config(noreplace) %{_sysconfdir}/opensc.conf %{_bindir}/cardos-info +%{_bindir}/cardos-tool %{_bindir}/cryptoflex-tool %{_bindir}/eidenv %{_bindir}/netkey-tool @@ -112,11 +117,14 @@ %{_bindir}/pkcs15-crypt %{_bindir}/pkcs15-init %{_bindir}/pkcs15-tool +%{_bindir}/rutoken-tool %{_libdir}/lib*.so.* %{_libdir}/onepin-opensc-pkcs11.so %{_libdir}/opensc-pkcs11.so +%{_libdir}/pkcs11/onepin-opensc-pkcs11.so +%{_libdir}/pkcs11/opensc-pkcs11.so %{_datadir}/opensc/ -%{_mandir}/man1/cardos-info.1* +%{_mandir}/man1/cardos-tool.1* %{_mandir}/man1/cryptoflex-tool.1* %{_mandir}/man1/netkey-tool.1* %{_mandir}/man1/opensc-explorer.* @@ -133,17 +141,31 @@ %files devel %defattr(-,root,root,-) -%doc _docs/openssh/ +%doc apidocdir/* %{_bindir}/opensc-config %{_includedir}/opensc/ %{_libdir}/lib*.so %{_libdir}/pkcs11-spy.so +%{_libdir}/pkcs11/pkcs11-spy.so %{_libdir}/pkgconfig/lib*.pc %{_mandir}/man1/opensc-config.1* %{_mandir}/man3/*.3* %changelog +* Fri Feb 27 2009 Tomas Mraz - 0.11.7-1 +- new upstream version - fixes CVE-2009-0368 + +* Thu Feb 26 2009 Fedora Release Engineering - 0.11.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jan 15 2009 Tomas Mraz - 0.11.6-2 +- Add explicit requires for pcsc-lite-libs. Dlopen libpcsclite with the full + soname. + +* Tue Sep 2 2008 Tomas Mraz - 0.11.6-1 +- Update to latest upstream, fixes CVE-2008-2235 + * Thu Apr 10 2008 Hans de Goede - 0.11.4-5 - BuildRequire libassuan-devel instead of libassuan-static (bz 441812) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/opensc/F-9/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 10 Sep 2007 16:18:55 -0000 1.20 +++ sources 2 Mar 2009 16:58:58 -0000 1.21 @@ -1 +1 @@ -2031aa617be609d50d014d5d370bb8a2 opensc-0.11.4.tar.gz +419e9be372c2f9bbb3ce9704c929d5ec opensc-0.11.7.tar.gz --- opensc-0.11.1-develconfig.patch DELETED --- From than at fedoraproject.org Mon Mar 2 17:07:30 2009 From: than at fedoraproject.org (Than Ngo) Date: Mon, 2 Mar 2009 17:07:30 +0000 (UTC) Subject: rpms/kdelibs3/devel kdelibs3.spec,1.56,1.57 Message-ID: <20090302170730.645DC70115@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs3/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26648 Modified Files: kdelibs3.spec Log Message: enable -apidocs Index: kdelibs3.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs3.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- kdelibs3.spec 2 Mar 2009 12:43:45 -0000 1.56 +++ kdelibs3.spec 2 Mar 2009 17:07:00 -0000 1.57 @@ -331,13 +331,12 @@ --with-openexr \ --with-xinerama -make %{?_smp_mflags} - %if 0%{?apidocs} doxygen -s -u admin/Doxyfile.global make %{?_smp_mflags} apidox %endif +make %{?_smp_mflags} %install rm -rf %{buildroot} From tbzatek at fedoraproject.org Mon Mar 2 17:10:02 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 2 Mar 2009 17:10:02 +0000 (UTC) Subject: rpms/seahorse/devel .cvsignore, 1.25, 1.26 seahorse.spec, 1.65, 1.66 sources, 1.27, 1.28 Message-ID: <20090302171002.5DCF070115@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/seahorse/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27112 Modified Files: .cvsignore seahorse.spec sources Log Message: * Mon Mar 2 2009 Tomas Bzatek 2.25.92-1 - Update to 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 15 Feb 2009 02:13:39 -0000 1.25 +++ .cvsignore 2 Mar 2009 17:09:31 -0000 1.26 @@ -1 +1 @@ -seahorse-2.25.91.tar.bz2 +seahorse-2.25.92.tar.bz2 Index: seahorse.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- seahorse.spec 26 Feb 2009 00:14:22 -0000 1.65 +++ seahorse.spec 2 Mar 2009 17:09:32 -0000 1.66 @@ -1,6 +1,6 @@ Name: seahorse -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Summary: A GNOME application for managing encryption keys Group: User Interface/Desktops # seahorse is GPLv2+ @@ -154,6 +154,9 @@ %{_datadir}/gtk-doc/html/libcryptui %changelog +* Mon Mar 2 2009 Tomas Bzatek 2.25.92-1 +- Update to 2.25.92 + * Wed Feb 25 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 15 Feb 2009 02:13:39 -0000 1.27 +++ sources 2 Mar 2009 17:09:32 -0000 1.28 @@ -1 +1 @@ -24862d74d64eed36af8bbfb1efa5111c seahorse-2.25.91.tar.bz2 +ad939bf8b7ab49afa4add90aafd9575a seahorse-2.25.92.tar.bz2 From james at fedoraproject.org Mon Mar 2 17:12:01 2009 From: james at fedoraproject.org (James Antill) Date: Mon, 2 Mar 2009 17:12:01 +0000 (UTC) Subject: rpms/zsh/devel zsh.spec,1.57,1.58 Message-ID: <20090302171201.5002470115@cvs1.fedora.phx.redhat.com> Author: james Update of /cvs/pkgs/rpms/zsh/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27537 Modified Files: zsh.spec Log Message: * Mon Mar 2 2009 James Antill - 4.3.9-4 - Remove D02glob testcase on ppc/ppc64, and hope noone cares Index: zsh.spec =================================================================== RCS file: /cvs/pkgs/rpms/zsh/devel/zsh.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- zsh.spec 2 Mar 2009 16:53:31 -0000 1.57 +++ zsh.spec 2 Mar 2009 17:11:30 -0000 1.58 @@ -3,7 +3,7 @@ Summary: A powerful interactive shell Name: zsh Version: 4.3.9 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD URL: http://zsh.sunsite.dk/ Group: System Environment/Shells @@ -80,7 +80,7 @@ %ifarch s390 s390x ppc ppc64 mv Y*.ztst skipped %endif -%ifarch ppc ppc64 +%ifarch ppc64 # FIXME: This is a real failure, Debian apparently just don't test. # RHBZ: 460043 mv D02glob.ztst skipped From ovasik at fedoraproject.org Mon Mar 2 17:16:20 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Mon, 2 Mar 2009 17:16:20 +0000 (UTC) Subject: rpms/xmlto/devel xmlto-xmllintoptions.patch, 1.1, 1.2 xmlto.spec, 1.45, 1.46 Message-ID: <20090302171620.2FD9270115@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/xmlto/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28457 Modified Files: xmlto-xmllintoptions.patch xmlto.spec Log Message: temporarily disable noent switch - blocks lcdproc doc build(#488093) xmlto-xmllintoptions.patch: Index: xmlto-xmllintoptions.patch =================================================================== RCS file: /cvs/extras/rpms/xmlto/devel/xmlto-xmllintoptions.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xmlto-xmllintoptions.patch 28 Jan 2009 12:01:32 -0000 1.1 +++ xmlto-xmllintoptions.patch 2 Mar 2009 17:16:19 -0000 1.2 @@ -8,8 +8,8 @@ - echo >&2 "xmllint >/dev/null --xinclude --postvalid \"$INPUT_FILE\"" - xmllint >/dev/null --xinclude --postvalid "$INPUT_FILE" 2>"${VALIDATION}" + echo >&2 \ -+ "xmllint >/dev/null --nonet --xinclude --postvalid --noent \"$INPUT_FILE\"" -+ xmllint >/dev/null --nonet --xinclude --postvalid --noent \ ++ "xmllint >/dev/null --nonet --xinclude --postvalid \"$INPUT_FILE\"" ++ xmllint >/dev/null --nonet --xinclude --postvalid \ + "$INPUT_FILE" 2>"${VALIDATION}" xmllint_status=$? if [ $xmllint_status -ne 0 ] Index: xmlto.spec =================================================================== RCS file: /cvs/extras/rpms/xmlto/devel/xmlto.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- xmlto.spec 26 Feb 2009 10:08:11 -0000 1.45 +++ xmlto.spec 2 Mar 2009 17:16:19 -0000 1.46 @@ -1,7 +1,7 @@ Summary: A tool for converting XML files to various formats Name: xmlto Version: 0.0.21 -Release: 7%{?dist} +Release: 8%{?dist} #xmlto is released under GPLv2+ license, xmlif under GPL+ license License: GPLv2+ and GPL+ Group: Applications/System @@ -65,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc COPYING ChangeLog README AUTHORS NEWS %{_bindir}/* %{_mandir}/*/* @@ -75,12 +75,16 @@ %exclude %{_datadir}/xmlto/format/fo/pdf %files tex -%defattr(-,root,root) +%defattr(-,root,root,-) %{_datadir}/xmlto/format/fo/dvi %{_datadir}/xmlto/format/fo/ps %{_datadir}/xmlto/format/fo/pdf %changelog +* Mon Mar 02 2009 Ondrej Vasik - 0.0.21-7 +- temporarily disable noent switch - blocks lcdproc doc build + (#488093) + * Thu Feb 26 2009 Fedora Release Engineering - 0.0.21-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Mon Mar 2 17:16:34 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 2 Mar 2009 17:16:34 +0000 (UTC) Subject: rpms/synopsis/devel synopsis-0.11-includes.patch, NONE, 1.1 synopsis.spec, 1.2, 1.3 Message-ID: <20090302171634.D79B270115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/synopsis/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28409 Modified Files: synopsis.spec Added Files: synopsis-0.11-includes.patch Log Message: include stdio.h for EOF, ostream for std::ostream synopsis-0.11-includes.patch: --- NEW FILE synopsis-0.11-includes.patch --- diff -ru synopsis-0.11.orig/src/Synopsis/PTree/Encoding.hh synopsis-0.11/src/Synopsis/PTree/Encoding.hh --- synopsis-0.11.orig/src/Synopsis/PTree/Encoding.hh 2009-03-02 16:31:56.000000000 +0000 +++ synopsis-0.11/src/Synopsis/PTree/Encoding.hh 2009-03-02 16:32:41.000000000 +0000 @@ -12,6 +12,7 @@ #include #include #include +#include namespace Synopsis { diff -ru synopsis-0.11.orig/Synopsis/Parsers/Cxx/QName.hh synopsis-0.11/Synopsis/Parsers/Cxx/QName.hh --- synopsis-0.11.orig/Synopsis/Parsers/Cxx/QName.hh 2009-03-02 16:31:56.000000000 +0000 +++ synopsis-0.11/Synopsis/Parsers/Cxx/QName.hh 2009-03-02 17:02:49.000000000 +0000 @@ -11,6 +11,7 @@ #include #include +#include //. A qualified name, containing zero or more elements. This typedef makes it //. easier to use qualified name types, and also makes it clearer than using the Index: synopsis.spec =================================================================== RCS file: /cvs/pkgs/rpms/synopsis/devel/synopsis.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- synopsis.spec 26 Feb 2009 04:49:51 -0000 1.2 +++ synopsis.spec 2 Mar 2009 17:16:04 -0000 1.3 @@ -1,6 +1,6 @@ %define name synopsis %define version 0.11 -%define release 2 +%define release 3 %define py_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") %define py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") %define url http://synopsis.fresco.org @@ -22,6 +22,8 @@ Requires: python-docutils Requires: graphviz +Patch0: synopsis-0.11-includes.patch + %description Synopsis is a multi-language source code introspection tool that provides a variety of representations for the parsed code, to @@ -56,8 +58,8 @@ %prep - %setup -q +%patch0 -p1 -b .includes env CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \ python setup.py config --with-gc-prefix=%{_prefix} --libdir=%{_libdir} @@ -127,6 +129,9 @@ %{_docdir}/synopsis-%{version}/NEWS %changelog +* Mon Mar 02 2009 Caol??n McNamara - 0.11-3 +- include stdio.h for EOF, ostream for std::ostream + * Wed Feb 25 2009 Fedora Release Engineering - 0.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From hadess at fedoraproject.org Mon Mar 2 17:17:12 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 2 Mar 2009 17:17:12 +0000 (UTC) Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.110,1.111 Message-ID: <20090302171712.967D370115@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-cd-burner/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28494 Modified Files: nautilus-cd-burner.spec Log Message: * Mon Mar 02 2009 - Bastien Nocera - 2.25.3-4 - Add missing ldconfig calls for -libs Index: nautilus-cd-burner.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- nautilus-cd-burner.spec 2 Mar 2009 15:26:51 -0000 1.110 +++ nautilus-cd-burner.spec 2 Mar 2009 17:16:42 -0000 1.111 @@ -12,7 +12,7 @@ Summary: Easy to use CD burning for Gnome Name: nautilus-cd-burner Version: 2.25.3 -Release: 3%{?dist} +Release: 4%{?dist} Source0: http://download.gnome.org/sources/nautilus-cd-burner/2.25/%{name}-%{version}.tar.bz2 License: GPLv2+ Group: User Interface/Desktops @@ -130,6 +130,12 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi +%post libs +/sbin/ldconfig + +%postun libs +/sbin/ldconfig + %clean rm -rf $RPM_BUILD_ROOT @@ -155,6 +161,9 @@ %changelog +* Mon Mar 02 2009 - Bastien Nocera - 2.25.3-4 +- Add missing ldconfig calls for -libs + * Mon Mar 02 2009 - Bastien Nocera - 2.25.3-3 - Split into libs From caolanm at fedoraproject.org Mon Mar 2 17:19:25 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 2 Mar 2009 17:19:25 +0000 (UTC) Subject: rpms/adanaxisgpl/devel adanaxisgpl-1.2.5-const.patch, NONE, 1.1 adanaxisgpl.spec, 1.4, 1.5 Message-ID: <20090302171925.E0A1D70115@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/adanaxisgpl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29116 Modified Files: adanaxisgpl.spec Added Files: adanaxisgpl-1.2.5-const.patch Log Message: constify strchr adanaxisgpl-1.2.5-const.patch: --- NEW FILE adanaxisgpl-1.2.5-const.patch --- diff -ru adanaxisgpl-1.2.5.orig/src/Platform/X11/PlatformMiscUtils.cpp adanaxisgpl-1.2.5/src/Platform/X11/PlatformMiscUtils.cpp --- adanaxisgpl-1.2.5.orig/src/Platform/X11/PlatformMiscUtils.cpp 2009-03-02 16:58:02.000000000 +0000 +++ adanaxisgpl-1.2.5/src/Platform/X11/PlatformMiscUtils.cpp 2009-03-02 16:59:05.000000000 +0000 @@ -1237,7 +1237,8 @@ char * br_dirname (const char *path) { - char *end, *result; + const char *end; + char *result; if (path == (const char *) NULL) return (char *) NULL; Index: adanaxisgpl.spec =================================================================== RCS file: /cvs/pkgs/rpms/adanaxisgpl/devel/adanaxisgpl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- adanaxisgpl.spec 24 Feb 2009 00:06:09 -0000 1.4 +++ adanaxisgpl.spec 2 Mar 2009 17:18:55 -0000 1.5 @@ -1,8 +1,8 @@ # Spec file for Mandriva Linux # $Id$ # $Log$ -# Revision 1.4 2009/02/24 00:06:09 jkeating -# - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +# Revision 1.5 2009/03/02 17:18:55 caolanm +# constify strchr # # Revision 1.4 2007/10/18 00:04:13 southa # Fedora packaging review comments @@ -35,7 +35,7 @@ Summary: Action game in four spatial dimensions Name: adanaxisgpl Version: 1.2.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Amusements/Games URL: http://www.mushware.com/ @@ -53,6 +53,8 @@ BuildRequires: pcre-devel BuildRequires: SDL_mixer-devel +Patch0: adanaxisgpl-1.2.5-const.patch + %description Adanaxis is a fast-moving first person shooter set in deep space, where the fundamentals of space itself are changed. By adding another dimension to @@ -69,6 +71,7 @@ %prep %setup -q +%patch0 -p1 -b .const %build %configure @@ -153,6 +156,9 @@ %_mandir/man6/%{name}*.6* %changelog +* Mon Mar 02 2009 Caol??n McNamara - 1.2.5-4 +- constify strchr + * Mon Feb 23 2009 Fedora Release Engineering - 1.2.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ovasik at fedoraproject.org Mon Mar 2 17:19:58 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Mon, 2 Mar 2009 17:19:58 +0000 (UTC) Subject: rpms/xmlto/F-10 xmlto.spec,1.41,1.42 Message-ID: <20090302171958.BC6FC70115@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/xmlto/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29258 Modified Files: xmlto.spec Log Message: temporarily revert xmllint noent change (#488093) Index: xmlto.spec =================================================================== RCS file: /cvs/extras/rpms/xmlto/F-10/xmlto.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- xmlto.spec 28 Jan 2009 12:22:22 -0000 1.41 +++ xmlto.spec 2 Mar 2009 17:19:28 -0000 1.42 @@ -1,7 +1,7 @@ Summary: A tool for converting XML files to various formats Name: xmlto Version: 0.0.21 -Release: 3%{?dist} +Release: 4%{?dist} #xmlto is released under GPLv2+ license, xmlif under GPL+ license License: GPLv2+ and GPL+ Group: Applications/System @@ -12,7 +12,7 @@ Source0: http://svn.fedorahosted.org/svn/%{name}/%{name}-%{version}.tar.bz2 Patch0: xmlto-stringparam.patch Patch1: xmlto-libpaper.patch -Patch2: xmlto-xmllintoptions.patch +#Patch2: xmlto-xmllintoptions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -48,7 +48,7 @@ %setup -q %patch0 -p1 -b .stringparam %patch1 -p1 -b .libpapercleanup -%patch2 -p1 -b .xmllintoptions +#%patch2 -p1 -b .xmllintoptions %build touch doc/xmlto.xml doc/xmlif.xml @@ -82,6 +82,9 @@ %{_datadir}/xmlto/format/fo/pdf %changelog +* Mon Mar 02 2009 Ondrej Vasik - 0.0.21-4 +- temporarily revert xmllint noent change (#488093) + * Wed Jan 28 2009 Ondrej Vasik - 0.0.21-3 - fix cleaning up of temporary files with libpaper(Debian) - fix xmllint postvalid (added noent option) From ovasik at fedoraproject.org Mon Mar 2 17:22:13 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Mon, 2 Mar 2009 17:22:13 +0000 (UTC) Subject: rpms/xmlto/F-9 xmlto.spec,1.38,1.39 Message-ID: <20090302172213.90BBB70115@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/xmlto/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29722 Modified Files: xmlto.spec Log Message: temporarily revert xmllint noent change (#488093) Index: xmlto.spec =================================================================== RCS file: /cvs/extras/rpms/xmlto/F-9/xmlto.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- xmlto.spec 2 Feb 2009 12:32:22 -0000 1.38 +++ xmlto.spec 2 Mar 2009 17:21:43 -0000 1.39 @@ -3,7 +3,7 @@ Summary: A tool for converting XML files to various formats Name: xmlto Version: 0.0.20 -Release: 4%{?dist} +Release: 5%{?dist} #xmlto is released under GPLv2+ license, xmlif under GPL+ license License: GPLv2+ and GPL+ Group: Applications/System @@ -13,7 +13,7 @@ Patch1: xmlto-backendstylesheet.patch Patch2: xmlto-stringparam.patch -Patch3: xmlto-xmllintoptions.patch +#Patch3: xmlto-xmllintoptions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,7 +42,7 @@ %setup -q %patch1 -p1 -b .backendstylesheet %patch2 -p1 -b .stringparam -%patch3 -p1 -b .xmllintoptions +#%patch3 -p1 -b .xmllintoptions %build touch doc/xmlto.xml doc/xmlif.xml @@ -67,6 +67,9 @@ %{_datadir}/xmlto %changelog +* Mon Mar 02 2009 Ondrej Vasik - 0.0.20-5 +- temporarily revert xmllint noent change (#488093) + * Mon Feb 02 2009 Ondrej Vasik - 0.0.20-4 - fix xmllint postvalid (added noent option) - fix stringparam option functionality From pbrobinson at fedoraproject.org Mon Mar 2 17:37:35 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Mon, 2 Mar 2009 17:37:35 +0000 (UTC) Subject: rpms/gupnp/devel gupnp.spec,1.15,1.16 Message-ID: <20090302173736.0870870115@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gupnp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32411 Modified Files: gupnp.spec Log Message: - Add some extra -devel Requires packages Index: gupnp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gupnp/devel/gupnp.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gupnp.spec 25 Feb 2009 02:55:14 -0000 1.15 +++ gupnp.spec 2 Mar 2009 17:37:05 -0000 1.16 @@ -1,6 +1,6 @@ Name: gupnp Version: 0.12.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A framework for creating UPnP devices & control points Group: System Environment/Libraries @@ -26,10 +26,14 @@ %package devel Summary: Development package for gupnp Group: Development/Libraries -Requires: gssdp-devel Requires: gupnp = %{version}-%{release} +Requires: gssdp-devel Requires: pkgconfig Requires: gtk-doc +Requires: libsoup-devel +Requires: libxml2-devel +Requires: e2fsprogs-devel +Requires: glib2-devel %description devel Files for development with gupnp. @@ -68,6 +72,9 @@ %{_includedir}/gupnp-1.0 %changelog +* Mon Mar 2 2009 Peter Robinson 0.12.6-3 +- Add some extra -devel Requires packages + * Tue Feb 24 2009 Fedora Release Engineering - 0.12.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From hadess at fedoraproject.org Mon Mar 2 17:51:59 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 2 Mar 2009 17:51:59 +0000 (UTC) Subject: rpms/brasero/devel nautilus-cd-burner.desktop, NONE, 1.1 brasero.spec, 1.38, 1.39 Message-ID: <20090302175159.387E070115@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/brasero/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2221 Modified Files: brasero.spec Added Files: nautilus-cd-burner.desktop Log Message: * Mon Mar 02 2009 - Bastien Nocera - 2.25.91.2-2 - Fix regressions in burn:/// and blank media handling --- NEW FILE nautilus-cd-burner.desktop --- [Desktop Entry] Encoding=UTF-8 Name=CD/DVD Creator Name[ar]=???????? ????????????????/???????????? Name[as]=CD/DVD ????????????????????? ???????????????????????? Name[ast]=Creador CD/DVD Name[be]=?????????????????????? CD/DVD Name[be at latin]=Stvaralnik CD/DVD Name[bg]=?????????????????? ???? CD/DVD Name[bn_IN]=CD/DVD ????????????????????? ???????????????????????? Name[ca]=Creador de CD/DVD Name[cs]=Tv??rce CD a DVD Name[cy]=Cr??wr CD/DVD Name[da]=Cd/dvd-br??nder Name[de]=CD/DVD-Ersteller Name[dz]=??????????????????/??????????????????????????? ??????????????????????????????????????? Name[el]=???????????????????? CD/DVD Name[en_CA]=CD/DVD Creator Name[en_GB]=CD/DVD Creator Name[es]=Creador de CD/DVD Name[et]=CD/DVD-kirjutaja Name[eu]=CD/DVD sortzailea Name[fa]=???????????/?????????????????? ?????? Name[fi]=CD/DVD-luontity??kalu Name[fr]=Cr??ateur de CD/DVD Name[ga]=Cruthaitheoir CD/DVD Name[gl]=Creador de CD ou de DVD Name[gu]=CD/DVD ????????????????????? Name[he]=???????? ???????????????????? Name[hi]=CD/DVD ??????????????? Name[hr]=CD/DVD Kreator Name[hu]=CD/DVD-k??sz??t?? Name[id]=Pembuat CD/DVD Name[it]=Creazione CD/DVD Name[ja]=CD/DVD ????????? Name[ka]=CD/DVD ??????????????????????????? Name[kn]=CD/DVD ???????????? Name[ko]=CD/DVD ????????? Name[ku]=Afirand??r?? CD/DVD'yan Name[lt]=CD/DVD k??rimas Name[lv]=CD/DVD Veidot??js Name[mg]=Mpamorona CD/DVD Name[mk]=CD/DVD ?????????????? Name[ml]=??????.??????/??????.??????.?????? ?????????????????????????????? ???????????????????????? Name[mn]=CD/DVD ?????????????? Name[mr]=CD/DVD ???????????????????????? Name[nb]=CD/DVD brenner Name[ne]=????????????/?????????????????? ???????????????????????????????????? Name[nl]=Cd/dvd branden Name[nn]=CD/DVD brennar Name[oc]=Creator de CD/DVD Name[or]=??????.??????./??????.??????.??????. ????????????????????? Name[pa]=CD/DVD ????????????????????? Name[pl]=Asystent CD/DVD Name[pt]=Criador de CD/DVD Name[pt_BR]=Criador de CD/DVD Name[ro]=Creare CD/DVD Name[ru]=?????????????? CD/DVD Name[si]=CD/DVD ???????????????????????? Name[sk]=Tvorca CD/DVD Name[sl]=Zapisovalec CD/DVD Name[sq]=Krijuesi i CD/DVD Name[sr]=?????????? ???? ???????????? ?????????????? Name[sr at latin]=Mesto za izradu diskova Name[sv]=Cd/Dvd-skaparen Name[ta]=???????????????????????????/DVD ??????????????????????????? Name[te]=CD/DVD ???????????????????????????????????? Name[th]=???????????????????????????????????????????????????????????????????????????????????? Name[tr]=CD/DVD Olu??turucu Name[uk]=?????????????????? CD/DVD Name[vi]=B??? T???o CD/DVD Name[zh_CN]=CD/DVD ????????? Name[zh_HK]=CD/DVD ???????????? Name[zh_TW]=CD/DVD ???????????? Comment=Open a folder into which you can drag files to burn to a CD or DVD Comment[ar]=???????? ???????????? ?????????? ?????? ?????????????? ???????? ???????????? ?????? ?????????????? ???? ???????????? Comment[as]=CD ???????????? DVD??? ??????????????? ???????????? ???????????? ????????????????????? ???????????? ???????????? ??????????????????????????? ????????? ????????????????????? ????????????????????? ????????? Comment[be]=?????????????? ??????????, ?? ???????? ?????????? ???????????????????? ?????????? ?????? ???????????? ???? CD ?????????? DVD Comment[be at latin]=Ad??yniaje kataloh, u jaki mo??na zakidva?? faj??y dla zapisu CD albo DVD Comment[bg]=???????????????? ???? ??????????, ?? ?????????? ???????????? ???? ?????????????????? ?????????????? ?? ???? ???? ???????????????? ???? CD ?????? DVD Comment[bn_IN]=CD ???????????? DVD-??? ??????????????? ??????????????? ???????????? ???????????? ???????????? ???????????? ???????????? ??????????????????????????? ???????????? ????????????????????? ????????????????????? ???????????? Comment[ca]=Obriu una carpeta on podreu arrossegar-hi fitxers per a enregistrar a un CD o DVD Comment[cs]=Otev????t adres????, do kter??ho m????ete p??etahovat soubory k vyp??len?? na CD nebo DVD Comment[da]=??ben en mappe hvori du kan tr??kke filer til som skal skrives til en cd eller dvd Comment[de]=??ffnet einen Ordner in den Sie Dateien ziehen k??nnen, die auf eine CD oder DVD gebrannt werden sollen Comment[dz]=??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Comment[el]=?????????????? ?????? ???????????? ???????? ?????????? ???????????????? ???? ???????????? ???????????? ?????? ???? ???? ?????????????? ???? CD ?? ???? DVD Comment[en_GB]=Open a folder into which you can drag files to burn to a CD or DVD Comment[es]=Abra una carpeta a la que puede arrastrar archivos para grabarlos en un CD o DVD Comment[et]=Kataloogi avamine, kuhu lohistada CD-le v??i DVD-le kirjutamiseks m??eldud failid Comment[eu]=Ireki karpeta bertara fitxategiak arrastatzeko eta CDa edo DVDa grabatzeko Comment[fi]=Avaa kansio, jonka sis??ll??n voit kirjoittaa helposti CD- tai DVD-levylle Comment[fr]=Ouvre un dossier dans lequel vous pouvez d??poser des fichiers pour les graver sur un CD ou un DVD Comment[gl]=Abra un cartafol ao que pode arrastrar ficheiros para gravalos nun CD ou DVD Comment[gu]=?????????????????? ???????????? ?????? ??????????????? ????????? CD ???????????? DVD ????????? ???????????? ???????????? ??????????????? ??????????????? ????????? Comment[he]=???????? ???????????? ???????????? ???????? ?????????? ?????????? ???????????????? ???????????? ???? CD ???? DVD Comment[hu]=Mappa megnyit??sa, amelybe a CD-re vagy DVD-re ??rand?? f??jlokat h??zhatja Comment[it]=Apre una cartella in cui trascinare i file da masterizzare su un CD o DVD Comment[ja]=????????????????????????????????? CD/DVD ????????????????????????????????????????????? Comment[ka]=?????????????????? ??????????????????, ???????????????????????? ?????????????????????????????? ???????????????????????? ??????????????????????????? CD-?????? ?????? DVD-?????? ??????????????????????????? Comment[ko]=????????? ????????? ????????? ???????????? ??? CD??? DVD??? ???????????? Comment[lt]=Atverti aplank??, ?? kur?? galima tempti failus, kuriuos norite ??ra??yti ?? CD ar DVD Comment[lv]=Atver mapi, kur?? j???? varat p??rvilkt failus un mapes, ko v??laties ierakst??t CD vai DVD disk?? Comment[mk]=???????????????? ?????????? ???? ???????? ?????? ???? ?????????????? ???????????????? ?????? ???? ???? ?????????????? ???? CD ?????? ???? DVD Comment[ml]=???????????? ???????????????????????????????????? ?????????????????????????????????????????? ???????????????????????????????????? ???????????????????????? ????????????????????????????????????????????????????????? ????????? ??????????????????????????? ????????????????????????. Comment[mr]=????????????????????? ???????????? ??????????????? ?????????????????? CD ??????????????? DVD ??????????????????????????????????????? ???????????? ?????????????????? ????????? ???????????? Comment[nb]=??pne en mappe hvor du kan dra filer for ?? brenne en CD eller DVD Comment[ne]=????????????????????? ???????????? ?????? ?????????????????? ???????????? ????????????????????? ???????????? ??????????????? ??????????????? ?????????????????? ?????????????????????????????? Comment[nl]=Een map openen waar u bestanden heen kunt slepen om op een cd of dvd te branden Comment[nn]=Opna ei mappe kor du kan dra filer for ?? brenne ein CD eller DVD Comment[or]=??????????????? ??????.??????. ?????????????????? ??????.??????.??????. ?????????????????? ???????????? ????????? ???????????? ????????????????????? ?????????????????? ???????????? ??????????????? ??????????????? ????????????????????? Comment[pa]=????????? ??????????????? ??????????????????, ????????? ???????????? ??????????????? ????????? CD ????????? DVD ???????????? ???????????? ??????????????? ???????????? ???????????? ????????? Comment[pl]=Otwiera katalog, do kt??rego mo??na przeci??gn???? pliki do nagrania na p??yt?? CD lub DVD Comment[pt]=Abrir uma pasta para a qual possa arrastar ficheiros para gravar um CD ou DVD Comment[pt_BR]=Abre uma pasta para a qual voc?? pode arrastar arquivos para gravar um CD ou DVD Comment[ro]=Deschide un dosar ??n care pute??i trage fi??iere pentru a fi scrise pe CD sau DVD Comment[ru]=?????????????????? ??????????, ???????? ?????????? ?????????????????? ?????????? ?? ?????????? ???????????????? ???? ???? CD ?????? DVD Comment[si]=CD ?????? DVD ???????????????????????? ???????????? ????????? ???????????? ?????? ??????????????? ???????????? ????????????????????? ??????????????? ??????????????? Comment[sk]=Otvori?? prie??inok, do ktor??ho m????ete pretiahnu?? s??bory na nap??lenie na CD alebo DVD Comment[sl]=Odprite mapo v katero lahko povle??ete datoteke za zapis na CD ali DVD Comment[sq]=Hap nj?? kartel?? n?? t?? cil??n mund t?? zvarriten file p??r tu masterizuar n?? nj?? CD apo DVD Comment[sr]=???????????? ???????????????? ?? ???????? ?????????? ?????????????? ???????????????? ???? ???????????????????? ???? ???? ?????? ?????? Comment[sr at latin]=Otvori fasciklu u koju mo??e?? prevu??i datoteke za narezivanje na CD ili DVD Comment[sv]=??ppna en mapp i vilken du kan dra filer f??r att br??nna till en cd eller dvd Comment[ta]=????????? ??????????????????????????????????????? ?????????????????? ???????????? ???????????????????????? ??????????????????????????? ?????????????????????????????? ????????? ??????????????? ????????????????????????. Comment[te]=???????????? CD ???????????? DVD ?????? ???????????????????????????????????????????????? ?????????????????????????????? ???????????? ????????????????????? ?????? ????????????????????? ???????????????????????? Comment[th]=??????????????????????????????????????????????????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????????????????????????????????????????????????????????????????? Comment[tr]=????ine CD'ye veya DVD'ye yaz??lacak dosyalar?? s??r??kleyebilece??iniz bir klas??r a?? Comment[uk]=???????????????? ????????, ?? ?????? ?????????? ?????????????????????? ?????????? ?????? ???????????? ???? CD ???? DVD Comment[vi]=M??? th?? m???c m?? b???n c?? th??? th??? t???p tin v??o ????? ghi CD ho???c DVD Comment[zh_CN]=???????????????????????????????????????????????? CD ??? DVD ?????????????????????????????? Comment[zh_HK]=?????????????????????????????????????????????????????????????????????????????? CD ??? DVD Comment[zh_TW]=?????????????????????????????????????????????????????????????????????????????? CD ??? DVD TryExec=nautilus Exec=nautilus --no-default-window --no-desktop burn:/// Icon=nautilus-cd-burner Terminal=false StartupNotify=true MimeType=x-content/blank-cd;x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd; Type=Application Categories=GNOME;GTK;System; OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=nautilus-cd-burner X-GNOME-Bugzilla-Component=cd-burner Index: brasero.spec =================================================================== RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- brasero.spec 24 Feb 2009 08:03:47 -0000 1.38 +++ brasero.spec 2 Mar 2009 17:51:28 -0000 1.39 @@ -1,12 +1,16 @@ Name: brasero Version: 2.25.91.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gnome CD/DVD burning application Group: Applications/Multimedia License: GPLv2+ URL: http://www.gnome.org/projects/brasero/ Source0: http://ftp.gnome.org/pub/GNOME/sources/brasero/0.9/%{name}-%{version}.tar.bz2 +# http://bugzilla.gnome.org/show_bug.cgi?id=573789 +# http://bugzilla.gnome.org/show_bug.cgi?id=573790 +# http://bugzilla.gnome.org/show_bug.cgi?id=573791 +Source1: nautilus-cd-burner.desktop Patch0: brasero-2.25.90-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -116,6 +120,11 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +# See comment for source1 +cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-ncb.desktop +desktop-file-install --vendor "" \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-ncb.desktop %clean rm -rf $RPM_BUILD_ROOT @@ -200,6 +209,9 @@ %changelog +* Mon Mar 02 2009 - Bastien Nocera - 2.25.91.2-2 +- Fix regressions in burn:/// and blank media handling + * Tue Feb 24 2009 Denis Leroy - 2.25.91.2-1 - Update to upstream 2.25.91.2 - Dvdcss patch upstreamed From limb at fedoraproject.org Mon Mar 2 17:52:28 2009 From: limb at fedoraproject.org (Jon Ciesla) Date: Mon, 2 Mar 2009 17:52:28 +0000 (UTC) Subject: rpms/pinball/devel pinball-0.3.1-strictproto.patch, NONE, 1.1 pinball.spec, 1.9, 1.10 Message-ID: <20090302175228.1D16C70115@cvs1.fedora.phx.redhat.com> Author: limb Update of /cvs/pkgs/rpms/pinball/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2331 Modified Files: pinball.spec Added Files: pinball-0.3.1-strictproto.patch Log Message: Strict prototypes patch. pinball-0.3.1-strictproto.patch: --- NEW FILE pinball-0.3.1-strictproto.patch --- --- base/Config.cpp.orig 2009-03-02 10:46:40.000000000 -0600 +++ base/Config.cpp 2009-03-02 10:46:40.000000000 -0600 @@ -426,2 +426,2 @@ - char* ptr=0; - char* ptrw = 0; + const char* ptr=0; + const char* ptrw = 0; Index: pinball.spec =================================================================== RCS file: /cvs/pkgs/rpms/pinball/devel/pinball.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pinball.spec 27 Feb 2009 00:29:37 -0000 1.9 +++ pinball.spec 2 Mar 2009 17:51:57 -0000 1.10 @@ -1,6 +1,6 @@ Name: pinball Version: 0.3.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Emilia arcade game Group: Amusements/Games License: GPL+ @@ -10,6 +10,7 @@ Source2: %{name}.png Patch0: pinball-0.3.1-sys-ltdl.patch Patch1: pinball-0.3.1-hiscore.patch +Patch2: pinball-0.3.1-strictproto.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libXt-devel freeglut-devel SDL_image-devel SDL_mixer-devel BuildRequires: libpng-devel libvorbis-devel libtool-ltdl-devel @@ -26,6 +27,7 @@ %setup -q %patch0 -p1 -z .sys-ltdl %patch1 -p1 -z .hiscore +%patch2 -p0 rm -fr libltdl # sigh stop autoxxx from rerunning because of our patches above. touch aclocal.m4 @@ -93,6 +95,9 @@ %changelog +* Mon Mar 02 2009 Jon Ciesla - 0.3.1-14 +- Patch for strict prototypes. + * Thu Feb 26 2009 Fedora Release Engineering - 0.3.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pbrobinson at fedoraproject.org Mon Mar 2 17:57:52 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Mon, 2 Mar 2009 17:57:52 +0000 (UTC) Subject: rpms/gupnp/F-10 gupnp.spec,1.12,1.13 Message-ID: <20090302175752.3753A70115@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gupnp/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3581 Modified Files: gupnp.spec Log Message: - Add some extra -devel Requires packages Index: gupnp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gupnp/F-10/gupnp.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gupnp.spec 25 Feb 2009 23:41:14 -0000 1.12 +++ gupnp.spec 2 Mar 2009 17:57:21 -0000 1.13 @@ -1,6 +1,6 @@ Name: gupnp Version: 0.12.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A framework for creating UPnP devices & control points Group: System Environment/Libraries @@ -26,10 +26,14 @@ %package devel Summary: Development package for gupnp Group: Development/Libraries -Requires: gssdp-devel Requires: gupnp = %{version}-%{release} +Requires: gssdp-devel Requires: pkgconfig Requires: gtk-doc +Requires: libsoup-devel +Requires: libxml2-devel +Requires: e2fsprogs-devel +Requires: glib2-devel %description devel Files for development with gupnp. @@ -68,6 +72,9 @@ %{_includedir}/gupnp-1.0 %changelog +* Mon Mar 2 2009 Peter Robinson 0.12.6-2 +- Add some extra -devel Requires packages + * Mon Feb 23 2009 Peter Robinson 0.12.6-1 - New upstream release From mtruch at fedoraproject.org Mon Mar 2 17:57:42 2009 From: mtruch at fedoraproject.org (Matthew D Truch) Date: Mon, 2 Mar 2009 17:57:42 +0000 (UTC) Subject: rpms/kst/devel kst.spec,1.32,1.33 Message-ID: <20090302175742.798A570115@cvs1.fedora.phx.redhat.com> Author: mtruch Update of /cvs/extras/rpms/kst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3526 Modified Files: kst.spec Log Message: Noarch the docs subpackage. Index: kst.spec =================================================================== RCS file: /cvs/extras/rpms/kst/devel/kst.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- kst.spec 23 Feb 2009 20:50:06 -0000 1.32 +++ kst.spec 2 Mar 2009 17:57:11 -0000 1.33 @@ -1,6 +1,6 @@ Name: kst Version: 1.7.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A data viewing program for KDE Group: Applications/Engineering @@ -44,6 +44,7 @@ Summary: Documentation for kst Group: Applications/Engineering Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description docs Documentation, tutorial, and sample data for kst. @@ -237,6 +238,9 @@ %{_datadir}/services/kst/kstdata_netcdf.desktop %changelog +* Thu Feb 26 2009 Matthew Truch - 1.7.0-5 +- Make documentation noarch. + * Mon Feb 23 2009 Matthew Truch - 1.7.0-4 - Bump for mass rebuild. From ajax at fedoraproject.org Mon Mar 2 17:59:35 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Mon, 2 Mar 2009 17:59:35 +0000 (UTC) Subject: rpms/xorg-x11-server/devel xserver-1.6.0-preferred-thinko.patch, NONE, 1.1 xorg-x11-server.spec, 1.414, 1.415 Message-ID: <20090302175935.1B02870115@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3918 Modified Files: xorg-x11-server.spec Added Files: xserver-1.6.0-preferred-thinko.patch Log Message: * Mon Mar 02 2009 Adam Jackson 1.6.0-3 - xserver-1.6.0-preferred-thinko.patch: Fix a thinko in output setup when only one head is attached. xserver-1.6.0-preferred-thinko.patch: --- NEW FILE xserver-1.6.0-preferred-thinko.patch --- >From 33c791b421db742e78c74028a5ef5f6604e66c48 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 2 Mar 2009 13:00:31 -0500 Subject: [PATCH] Fix output setup when only one head, and it's not the zeroth one. --- hw/xfree86/modes/xf86Crtc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index a8fd099..ad6ca98 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -2070,9 +2070,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, (float)config->output[p]->mm_height; if (aspect) - preferred_match[0] = bestModeForAspect(config, enabled, aspect); + preferred_match[p] = bestModeForAspect(config, enabled, aspect); - if (preferred_match[0]) + if (preferred_match[p]) ret = TRUE; } while (0); -- 1.6.1.3 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.414 retrieving revision 1.415 diff -u -r1.414 -r1.415 --- xorg-x11-server.spec 27 Feb 2009 00:42:40 -0000 1.414 +++ xorg-x11-server.spec 2 Mar 2009 17:59:04 -0000 1.415 @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -94,6 +94,7 @@ # from master, may end up in 1.6.1. Patch6018: xserver-1.6.0-XIPropToInt.patch Patch6019: xserver-1.6.0-XATOM_FLOAT.patch +Patch6020: xserver-1.6.0-preferred-thinko.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -511,6 +512,10 @@ %changelog +* Mon Mar 02 2009 Adam Jackson 1.6.0-3 +- xserver-1.6.0-preferred-thinko.patch: Fix a thinko in output setup when + only one head is attached. + * Fri Feb 27 2009 Peter Hutterer 1.6.0-2 - xserver-1.6.0-XIPropToInt.patch: add XIPropToInt helper function (requirement for XATOM_FLOAT patch) From s4504kr at fedoraproject.org Mon Mar 2 18:04:21 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Mon, 2 Mar 2009 18:04:21 +0000 (UTC) Subject: rpms/crossvc/devel crossvc.desktop,1.1,1.2 crossvc.spec,1.17,1.18 Message-ID: <20090302180421.9700170115@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/crossvc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5624 Modified Files: crossvc.desktop crossvc.spec Log Message: Change categories of the desktop file Index: crossvc.desktop =================================================================== RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- crossvc.desktop 25 Oct 2006 16:51:44 -0000 1.1 +++ crossvc.desktop 2 Mar 2009 18:03:50 -0000 1.2 @@ -3,8 +3,8 @@ Name=CrossVC Comment=Graphical CVS Client (QT) Exec=crossvc -Icon=crossvc.xpm +Icon=crossvc Terminal=false StartupNotify=true Type=Application -Categories=Application;Development; +Categories=Development;Qt;RevisionControl; Index: crossvc.spec =================================================================== RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- crossvc.spec 24 Feb 2009 09:48:26 -0000 1.17 +++ crossvc.spec 2 Mar 2009 18:03:51 -0000 1.18 @@ -1,6 +1,6 @@ Name: crossvc Version: 1.5.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Graphical CVS Client @@ -85,6 +85,9 @@ %changelog +* Mon Mar 2 2009 Jochen Schmitt 1.5.2-6 +- Change categories in the desktop file (BZ #487862) + * Tue Feb 24 2009 Fedora Release Engineering - 1.5.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From dyoung at fedoraproject.org Mon Mar 2 18:05:53 2009 From: dyoung at fedoraproject.org (Daniel M. Young) Date: Mon, 2 Mar 2009 18:05:53 +0000 (UTC) Subject: rpms/tasks/devel libkoto-ical-config.patch, NONE, 1.1 tasks.spec, 1.15, 1.16 Message-ID: <20090302180553.1000D70115@cvs1.fedora.phx.redhat.com> Author: dyoung Update of /cvs/extras/rpms/tasks/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6020 Modified Files: tasks.spec Added Files: libkoto-ical-config.patch Log Message: Add patch to libkoto/ical-util.c to fix FTBFS libkoto-ical-config.patch: --- NEW FILE libkoto-ical-config.patch --- --- libkoto/ical-util.c.orig 2009-03-02 09:46:36.398582945 -0800 +++ libkoto/ical-util.c 2009-03-02 09:46:57.225583409 -0800 @@ -33,6 +33,7 @@ } \ } +#include "config.h" #include "ical-util.h" #include Index: tasks.spec =================================================================== RCS file: /cvs/extras/rpms/tasks/devel/tasks.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- tasks.spec 25 Feb 2009 18:32:55 -0000 1.15 +++ tasks.spec 2 Mar 2009 18:05:22 -0000 1.16 @@ -1,12 +1,13 @@ Name: tasks Version: 0.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple to-do list application Group: Applications/Productivity License: GPLv2+ URL: http://pimlico-project.org/tasks.html Source0: http://pimlico-project.org/sources/tasks/tasks-%{version}.tar.gz +Patch0: libkoto-ical-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: evolution-data-server-devel >= 1.2.0 @@ -19,6 +20,7 @@ %prep %setup -q +%patch0 %build @@ -63,6 +65,9 @@ %changelog +* Mon Mar 02 2009 Dan Young - 0.14-4 +- patch libkoto/ical-util.c to fix FTBFS + * Wed Feb 25 2009 Fedora Release Engineering - 0.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From hadess at fedoraproject.org Mon Mar 2 18:07:58 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 2 Mar 2009 18:07:58 +0000 (UTC) Subject: rpms/brasero/devel brasero.spec,1.39,1.40 Message-ID: <20090302180758.9444470115@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/brasero/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6655 Modified Files: brasero.spec Log Message: Add ncb desktop file to the filelist Index: brasero.spec =================================================================== RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- brasero.spec 2 Mar 2009 17:51:28 -0000 1.39 +++ brasero.spec 2 Mar 2009 18:07:28 -0000 1.40 @@ -182,6 +182,7 @@ %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}-open-*.desktop %{_datadir}/applications/%{name}-copy-*.desktop +%{_datadir}/applications/%{name}-ncb.desktop %{_datadir}/gnome/help/%{name} %{_datadir}/omf/%{name} %{_datadir}/icons/hicolor/*/apps/* From pvrabec at fedoraproject.org Mon Mar 2 18:09:43 2009 From: pvrabec at fedoraproject.org (Peter Vrabec) Date: Mon, 2 Mar 2009 18:09:43 +0000 (UTC) Subject: rpms/ntop/devel .cvsignore, 1.3, 1.4 ntop.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <20090302180943.0AF4A70115@cvs1.fedora.phx.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/ntop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7164 Modified Files: .cvsignore ntop.spec sources Log Message: - upgrade - invalid certificate fix (#486725) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ntop/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Oct 2008 13:36:48 -0000 1.3 +++ .cvsignore 2 Mar 2009 18:09:12 -0000 1.4 @@ -1 +1,4 @@ -ntop-3.3.8.tar.gz +GeoIP.tar.gz +GeoIPASNum.dat.gz +GeoLiteCity.dat.gz +ntop-3.3.9.tar.gz Index: ntop.spec =================================================================== RCS file: /cvs/extras/rpms/ntop/devel/ntop.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ntop.spec 26 Feb 2009 06:19:10 -0000 1.4 +++ ntop.spec 2 Mar 2009 18:09:12 -0000 1.5 @@ -1,6 +1,6 @@ Name: ntop -Version: 3.3.8 -Release: 3%{?dist} +Version: 3.3.9 +Release: 1%{?dist} Summary: A network traffic probe similar to the UNIX top command Group: Applications/Internet License: GPLv2 @@ -8,17 +8,21 @@ Source0: http://downloads.sourceforge.net/ntop/ntop-%{version}.tar.gz Source1: ntop.init Source2: ntop.conf +Source3: GeoIP.tar.gz +Source4: GeoLiteCity.dat.gz +Source5: GeoIPASNum.dat.gz Patch1: ntop-am.patch Patch2: ntop-running-user.patch Patch3: ntop-dbfile-default-dir.patch Patch4: ntop-enable-sslv3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf, automake, pkgconfig, libtool, groff, libpcap-devel +BuildRequires: autoconf, automake, pkgconfig, libtool, groff, libpcap-devel wget BuildRequires: gdbm-devel, gd-devel, rrdtool-devel, openssl-devel BuildRequires: net-snmp-devel, lm_sensors-devel, pcre-devel, mysql-devel BuildRequires: tcp_wrappers-devel, perl(ExtUtils::Embed) Requires: initscripts, graphviz Requires(post): /sbin/chkconfig +Requires(post): openssl >= 0.9.7f-4, /bin/cat Requires(preun):/sbin/chkconfig @@ -46,6 +50,10 @@ %prep %setup -q -n ntop-%{version} +#this looks stupid, ask upstream +cp %SOURCE3 ./ && tar xvfz GeoIP.tar.gz +cp %SOURCE4 ./ && gunzip GeoLiteCity.dat.gz +cp %SOURCE5 ./ && gunzip GeoIPASNum.dat.gz # executable bits are set on some config files and docs that go into # %%{_sysconfdir}/ntop and %%{_datadir}, and some debug source files. Remove @@ -59,8 +67,21 @@ %patch3 -p1 -b .dbfile-default-dir %patch4 -p1 -b .sslv3 +#fix files not in UTF-8 +for file in {geoiplookup.1.in,geoiplookup6.1.in,geoipupdate.1.in} +do + mv GeoIP-1.4.6/man/"$file" GeoIP-1.4.6/man/"$file".ISO; + iconv -f ISO_8859-1 -t UTF8 GeoIP-1.4.6/man/"$file".ISO > GeoIP-1.4.6/man/"$file"; +done %build +#take care of GeoIP +cd GeoIP-1.4.6 +%{configure} --disable-static --libdir=/usr/%{_lib} +#rpath problem +sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +cd .. + #run ntop own autoconf wrapper ./autogen.sh --noconfig @@ -70,6 +91,11 @@ --enable-snmp \ --enable-mysql \ --disable-static +#rpath problem +sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +#take care of GeoIP +cd GeoIP-1.4.6 && make %{?_smp_mflags} && cd .. make %{?_smp_mflags} @@ -91,11 +117,16 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/ntop/html/ntop.html # fix permissions chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/ntop/plugins/* - -# Create files to be %ghost'ed - %ghost'ed files must exist in the buildroot +# create files to be %ghost'ed - %ghost'ed files must exist in the buildroot install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/ntop/rrd install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/ntop/rrd/{flows,graphics,interfaces} touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/ntop/{addressQueue,dnsCache,fingerprint,LsWatch,macPrefix,ntop_pw,prefsCache}.db +#remove expired certificate +rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/ntop/ntop-cert.pem + +#get a rid of GeoIP devel stuff +rm -rf $RPM_BUILD_ROOT/%{_includedir} +rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib{GeoIP,GeoIPUpdate}.so %clean rm -rf $RPM_BUILD_ROOT @@ -109,10 +140,27 @@ fi %post +/sbin/ldconfig if [ $1 = 1 ]; then /sbin/chkconfig --add %{name} &> /dev/null || : fi +# create new self-signed certificate +%define sslcert %{_sysconfdir}/ntop/ntop-cert.pem +FQDN=`hostname` +if [ "x${FQDN}" = "x" ]; then + FQDN=localhost.localdomain +fi +cat << EOF | %{_bindir}/openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -keyout %{sslcert} -out %{sslcert} 2>/dev/null +-- +SomeState +SomeCity +SomeOrganization +SomeOrganizationalUnit +${FQDN} +root@${FQDN} +EOF + %preun if [ $1 = 0 ]; then /sbin/service %{name} stop &> /dev/null || : @@ -120,6 +168,7 @@ fi %postun +/sbin/ldconfig if [ "$1" -ge "1" ]; then /sbin/service %{name} condrestart &> /dev/null || : fi @@ -132,12 +181,16 @@ %doc docs/1STRUN.txt NEWS README SUPPORT_NTOP.txt THANKS %config(noreplace) %{_sysconfdir}/ntop.conf %config(noreplace) %{_sysconfdir}/ntop +%config(noreplace) %{_sysconfdir}/GeoIP.conf +%config(noreplace) %{_sysconfdir}/GeoIP.conf.default %{_initrddir}/ntop %{_sbindir}/* -%{_libdir}/lib*%{version}*.so -%{_libdir}/ntop +%{_bindir}/* +%{_libdir}/* +%{_mandir}/man1/* %{_mandir}/man8/* %{_datadir}/ntop +%{_datadir}/GeoIP %dir %{_localstatedir}/lib/ntop %defattr(0644,root,root,-) %ghost %{_localstatedir}/lib/ntop/addressQueue.db @@ -154,8 +207,9 @@ %{_localstatedir}/lib/ntop/rrd %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 3.3.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Fri Feb 27 2009 Peter Vrabec - 3.3.9-1 +- upgrade +- invalid certificate fix (#486725) * Sat Jan 24 2009 Rakesh Pandit - 3.3.8-2 - Bumped - for new update in mysql Index: sources =================================================================== RCS file: /cvs/extras/rpms/ntop/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Oct 2008 13:36:48 -0000 1.3 +++ sources 2 Mar 2009 18:09:12 -0000 1.4 @@ -1 +1,4 @@ -19c6a582c285ffae18bf0c3b599d184e ntop-3.3.8.tar.gz +cb14b1beeb40631a12676b11ca0c309a GeoIP.tar.gz +32997e6d3b1df64cbbb3ecc0adfb9ad8 GeoIPASNum.dat.gz +1838a3a68f2c7a9eb310cee8f82b6a64 GeoLiteCity.dat.gz +0c22038e0f2aa003110437b5a5d5a6a5 ntop-3.3.9.tar.gz From dwalsh at fedoraproject.org Mon Mar 2 18:22:17 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 2 Mar 2009 18:22:17 +0000 (UTC) Subject: rpms/libselinux/devel .cvsignore, 1.179, 1.180 libselinux-rhat.patch, 1.183, 1.184 libselinux.spec, 1.358, 1.359 sources, 1.182, 1.183 Message-ID: <20090302182217.7A52770115@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libselinux/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9290 Modified Files: .cvsignore libselinux-rhat.patch libselinux.spec sources Log Message: * Mon Mar 2 2009 Dan Walsh - 2.0.78-1 - Update to upstream * Fix incorrect conversion in discover_class code. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- .cvsignore 6 Jan 2009 14:31:46 -0000 1.179 +++ .cvsignore 2 Mar 2009 18:21:46 -0000 1.180 @@ -161,3 +161,4 @@ libselinux-2.0.75.tgz libselinux-2.0.76.tgz libselinux-2.0.77.tgz +libselinux-2.0.78.tgz libselinux-rhat.patch: Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- libselinux-rhat.patch 18 Feb 2009 19:45:22 -0000 1.183 +++ libselinux-rhat.patch 2 Mar 2009 18:21:46 -0000 1.184 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-2.0.77/include/selinux/selinux.h ---- nsalibselinux/include/selinux/selinux.h 2009-01-27 14:47:32.000000000 -0500 -+++ libselinux-2.0.77/include/selinux/selinux.h 2009-02-18 13:18:50.305037000 -0500 +--- nsalibselinux/include/selinux/selinux.h 2009-01-05 17:45:35.000000000 -0500 ++++ libselinux-2.0.77/include/selinux/selinux.h 2009-02-18 14:18:54.000000000 -0500 @@ -459,6 +459,8 @@ extern const char *selinux_file_context_local_path(void); extern const char *selinux_homedir_context_path(void); @@ -27,7 +27,7 @@ const security_context_t b); diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.77/man/man8/selinuxconlist.8 --- nsalibselinux/man/man8/selinuxconlist.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.77/man/man8/selinuxconlist.8 2009-02-18 13:12:22.736391000 -0500 ++++ libselinux-2.0.77/man/man8/selinuxconlist.8 2009-02-18 14:18:54.000000000 -0500 @@ -0,0 +1,18 @@ +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -49,7 +49,7 @@ +secon(8), selinuxdefcon(8) diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.77/man/man8/selinuxdefcon.8 --- nsalibselinux/man/man8/selinuxdefcon.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.77/man/man8/selinuxdefcon.8 2009-02-18 13:12:22.740386000 -0500 ++++ libselinux-2.0.77/man/man8/selinuxdefcon.8 2009-02-18 14:18:54.000000000 -0500 @@ -0,0 +1,19 @@ +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -71,8 +71,8 @@ +.SH "SEE ALSO" +secon(8), selinuxconlist(8) diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.77/src/callbacks.c ---- nsalibselinux/src/callbacks.c 2009-01-27 14:47:32.000000000 -0500 -+++ libselinux-2.0.77/src/callbacks.c 2009-02-18 13:12:22.743390000 -0500 +--- nsalibselinux/src/callbacks.c 2008-08-28 09:34:24.000000000 -0400 ++++ libselinux-2.0.77/src/callbacks.c 2009-02-18 14:18:54.000000000 -0500 @@ -16,6 +16,7 @@ { int rc; @@ -82,8 +82,8 @@ rc = vfprintf(stderr, fmt, ap); va_end(ap); diff --exclude-from=exclude -N -u -r nsalibselinux/src/file_path_suffixes.h libselinux-2.0.77/src/file_path_suffixes.h ---- nsalibselinux/src/file_path_suffixes.h 2009-01-27 14:47:32.000000000 -0500 -+++ libselinux-2.0.77/src/file_path_suffixes.h 2009-02-18 13:23:48.929908000 -0500 +--- nsalibselinux/src/file_path_suffixes.h 2009-01-05 17:45:35.000000000 -0500 ++++ libselinux-2.0.77/src/file_path_suffixes.h 2009-02-18 14:18:54.000000000 -0500 @@ -20,3 +20,5 @@ S_(FILE_CONTEXTS_LOCAL, "/contexts/files/file_contexts.local") S_(X_CONTEXTS, "/contexts/x_contexts") @@ -91,8 +91,8 @@ + S_(VIRTUAL_DOMAIN, "/contexts/virtual_domain_context") + S_(VIRTUAL_IMAGE, "/contexts/virtual_image_context") diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.77/src/matchpathcon.c ---- nsalibselinux/src/matchpathcon.c 2009-01-27 14:47:32.000000000 -0500 -+++ libselinux-2.0.77/src/matchpathcon.c 2009-02-18 13:12:22.749385000 -0500 +--- nsalibselinux/src/matchpathcon.c 2008-08-28 09:34:24.000000000 -0400 ++++ libselinux-2.0.77/src/matchpathcon.c 2009-02-18 14:18:54.000000000 -0500 @@ -2,6 +2,7 @@ #include #include @@ -111,8 +111,8 @@ } diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-2.0.77/src/selinux_config.c ---- nsalibselinux/src/selinux_config.c 2009-01-27 14:47:32.000000000 -0500 -+++ libselinux-2.0.77/src/selinux_config.c 2009-02-18 13:22:49.083769000 -0500 +--- nsalibselinux/src/selinux_config.c 2009-01-05 17:45:35.000000000 -0500 ++++ libselinux-2.0.77/src/selinux_config.c 2009-02-18 14:18:54.000000000 -0500 @@ -40,7 +40,9 @@ #define SECURETTY_TYPES 18 #define X_CONTEXTS 19 @@ -143,8 +143,8 @@ + +hidden_def(selinux_virtual_image_context_path) diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libselinux-2.0.77/src/selinux_internal.h ---- nsalibselinux/src/selinux_internal.h 2009-01-27 14:47:32.000000000 -0500 -+++ libselinux-2.0.77/src/selinux_internal.h 2009-02-18 13:20:00.321376000 -0500 +--- nsalibselinux/src/selinux_internal.h 2009-01-05 17:45:35.000000000 -0500 ++++ libselinux-2.0.77/src/selinux_internal.h 2009-02-18 14:18:54.000000000 -0500 @@ -56,6 +56,8 @@ hidden_proto(selinux_securetty_types_path) hidden_proto(selinux_failsafe_context_path) @@ -155,8 +155,8 @@ hidden_proto(selinux_file_context_homedir_path) hidden_proto(selinux_file_context_local_path) diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.77/src/selinux.py ---- nsalibselinux/src/selinux.py 2009-01-27 14:47:32.000000000 -0500 -+++ libselinux-2.0.77/src/selinux.py 2009-02-18 13:12:22.814394000 -0500 +--- nsalibselinux/src/selinux.py 2009-01-13 08:45:35.000000000 -0500 ++++ libselinux-2.0.77/src/selinux.py 2009-02-18 14:18:54.000000000 -0500 @@ -1,5 +1,5 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 1.3.35 @@ -556,8 +556,8 @@ get_default_type = _selinux.get_default_type SELINUX_DEFAULTUSER = _selinux.SELINUX_DEFAULTUSER diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.77/src/selinuxswig.i ---- nsalibselinux/src/selinuxswig.i 2009-01-27 14:47:32.000000000 -0500 -+++ libselinux-2.0.77/src/selinuxswig.i 2009-02-18 13:12:22.820386000 -0500 +--- nsalibselinux/src/selinuxswig.i 2008-08-28 09:34:24.000000000 -0400 ++++ libselinux-2.0.77/src/selinuxswig.i 2009-02-18 14:18:54.000000000 -0500 @@ -47,8 +47,36 @@ %ignore set_matchpathcon_printf; %ignore set_matchpathcon_invalidcon; @@ -597,8 +597,8 @@ %include "../include/selinux/selinux.h" %include "../include/selinux/avc.h" diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libselinux-2.0.77/src/selinuxswig_python.i ---- nsalibselinux/src/selinuxswig_python.i 2009-01-27 14:47:32.000000000 -0500 -+++ libselinux-2.0.77/src/selinuxswig_python.i 2009-02-18 13:12:22.826386000 -0500 +--- nsalibselinux/src/selinuxswig_python.i 2009-01-13 08:45:35.000000000 -0500 ++++ libselinux-2.0.77/src/selinuxswig_python.i 2009-02-18 14:18:54.000000000 -0500 @@ -21,6 +21,15 @@ map(restorecon, [os.path.join(dirname, fname) for fname in fnames]), None) @@ -629,8 +629,8 @@ + %include "selinuxswig.i" diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-2.0.77/src/selinuxswig_wrap.c ---- nsalibselinux/src/selinuxswig_wrap.c 2009-01-27 14:47:32.000000000 -0500 -+++ libselinux-2.0.77/src/selinuxswig_wrap.c 2009-02-18 13:12:22.850392000 -0500 +--- nsalibselinux/src/selinuxswig_wrap.c 2009-01-13 08:45:35.000000000 -0500 ++++ libselinux-2.0.77/src/selinuxswig_wrap.c 2009-02-18 14:18:54.000000000 -0500 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). @@ -10292,8 +10292,8 @@ _swigc__p_unsigned_int, _swigc__p_unsigned_short, diff --exclude-from=exclude -N -u -r nsalibselinux/src/seusers.c libselinux-2.0.77/src/seusers.c ---- nsalibselinux/src/seusers.c 2009-01-27 14:47:32.000000000 -0500 -+++ libselinux-2.0.77/src/seusers.c 2009-02-18 13:12:22.856386000 -0500 +--- nsalibselinux/src/seusers.c 2008-08-28 09:34:24.000000000 -0400 ++++ libselinux-2.0.77/src/seusers.c 2009-02-18 14:18:54.000000000 -0500 @@ -243,3 +243,67 @@ *r_level = NULL; return 0; @@ -10363,8 +10363,8 @@ + return (ret ? getseuserbyname(username, r_seuser, r_level) : ret); +} diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getdefaultcon.c libselinux-2.0.77/utils/getdefaultcon.c ---- nsalibselinux/utils/getdefaultcon.c 2009-01-27 14:47:32.000000000 -0500 -+++ libselinux-2.0.77/utils/getdefaultcon.c 2009-02-18 13:12:22.860383000 -0500 +--- nsalibselinux/utils/getdefaultcon.c 2008-08-28 09:34:24.000000000 -0400 ++++ libselinux-2.0.77/utils/getdefaultcon.c 2009-02-18 14:18:54.000000000 -0500 @@ -22,8 +22,9 @@ security_context_t usercon = NULL, cur_context = NULL; char *user = NULL, *level = NULL, *role=NULL, *seuser=NULL, *dlevel=NULL; @@ -10411,8 +10411,8 @@ + return ret >= 0; } diff --exclude-from=exclude -N -u -r nsalibselinux/utils/Makefile libselinux-2.0.77/utils/Makefile ---- nsalibselinux/utils/Makefile 2009-01-27 14:47:32.000000000 -0500 -+++ libselinux-2.0.77/utils/Makefile 2009-02-18 13:12:22.863385000 -0500 +--- nsalibselinux/utils/Makefile 2008-08-28 09:34:24.000000000 -0400 ++++ libselinux-2.0.77/utils/Makefile 2009-02-18 14:18:54.000000000 -0500 @@ -2,28 +2,33 @@ PREFIX ?= $(DESTDIR)/usr LIBDIR ?= $(PREFIX)/lib @@ -10452,8 +10452,8 @@ indent: ../../scripts/Lindent $(wildcard *.[ch]) diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.77/utils/matchpathcon.c ---- nsalibselinux/utils/matchpathcon.c 2009-01-27 14:47:32.000000000 -0500 -+++ libselinux-2.0.77/utils/matchpathcon.c 2009-02-18 13:12:22.867388000 -0500 +--- nsalibselinux/utils/matchpathcon.c 2008-10-28 10:06:51.000000000 -0400 ++++ libselinux-2.0.77/utils/matchpathcon.c 2009-02-18 14:18:54.000000000 -0500 @@ -101,6 +101,11 @@ for (i = optind; i < argc; i++) { int mode = 0; Index: libselinux.spec =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.358 retrieving revision 1.359 diff -u -r1.358 -r1.359 --- libselinux.spec 25 Feb 2009 18:01:00 -0000 1.358 +++ libselinux.spec 2 Mar 2009 18:21:46 -0000 1.359 @@ -4,8 +4,8 @@ Summary: SELinux library and simple utilities Name: libselinux -Version: 2.0.77 -Release: 6%{?dist} +Version: 2.0.78 +Release: 1%{?dist} License: Public Domain Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -164,6 +164,10 @@ %{ruby_sitearch}/selinux.so %changelog +* Mon Mar 2 2009 Dan Walsh - 2.0.78-1 +- Update to upstream + * Fix incorrect conversion in discover_class code. + * Wed Feb 25 2009 Fedora Release Engineering - 2.0.77-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/sources,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- sources 27 Jan 2009 20:00:47 -0000 1.182 +++ sources 2 Mar 2009 18:21:46 -0000 1.183 @@ -1 +1 @@ -d6c274a09a741d28ba30e5a0dc89839b libselinux-2.0.77.tgz +c34327ec14643572f284589a2c72dcaa libselinux-2.0.78.tgz From dwalsh at fedoraproject.org Mon Mar 2 18:25:27 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 2 Mar 2009 18:25:27 +0000 (UTC) Subject: rpms/libselinux/F-10 libselinux-rhat.patch, 1.171, 1.172 libselinux.spec, 1.347, 1.348 sources, 1.179, 1.180 Message-ID: <20090302182527.3AE3F70115@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libselinux/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9873 Modified Files: libselinux-rhat.patch libselinux.spec sources Log Message: * Mon Mar 2 2009 Dan Walsh - 2.0.78-1 - Update to upstream * Fix incorrect conversion in discover_class code. libselinux-rhat.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.171 -r 1.172 libselinux-rhat.patch Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/libselinux/F-10/libselinux-rhat.patch,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- libselinux-rhat.patch 16 Dec 2008 14:45:24 -0000 1.171 +++ libselinux-rhat.patch 2 Mar 2009 18:24:55 -0000 1.172 @@ -1,7 +1,16 @@ -diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-2.0.76/include/selinux/selinux.h ---- nsalibselinux/include/selinux/selinux.h 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.76/include/selinux/selinux.h 2008-12-12 10:06:21.000000000 -0500 -@@ -511,6 +511,14 @@ +diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-2.0.77/include/selinux/selinux.h +--- nsalibselinux/include/selinux/selinux.h 2009-01-05 17:45:35.000000000 -0500 ++++ libselinux-2.0.77/include/selinux/selinux.h 2009-02-18 14:18:54.000000000 -0500 +@@ -459,6 +459,8 @@ + extern const char *selinux_file_context_local_path(void); + extern const char *selinux_homedir_context_path(void); + extern const char *selinux_media_context_path(void); ++extern const char *selinux_virtual_domain_context_path(void); ++extern const char *selinux_virtual_image_context_path(void); + extern const char *selinux_x_context_path(void); + extern const char *selinux_contexts_path(void); + extern const char *selinux_securetty_types_path(void); +@@ -520,6 +522,14 @@ Caller must free the returned strings via free. */ extern int getseuserbyname(const char *linuxuser, char **seuser, char **level); @@ -16,9 +25,9 @@ /* Compare two file contexts, return 0 if equivalent. */ int selinux_file_context_cmp(const security_context_t a, const security_context_t b); -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.76/man/man8/selinuxconlist.8 +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.77/man/man8/selinuxconlist.8 --- nsalibselinux/man/man8/selinuxconlist.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.76/man/man8/selinuxconlist.8 2008-12-02 09:14:48.000000000 -0500 ++++ libselinux-2.0.77/man/man8/selinuxconlist.8 2009-02-18 14:18:54.000000000 -0500 @@ -0,0 +1,18 @@ +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -38,9 +47,9 @@ + +.SH "SEE ALSO" +secon(8), selinuxdefcon(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.76/man/man8/selinuxdefcon.8 +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.77/man/man8/selinuxdefcon.8 --- nsalibselinux/man/man8/selinuxdefcon.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.76/man/man8/selinuxdefcon.8 2008-12-02 09:14:48.000000000 -0500 ++++ libselinux-2.0.77/man/man8/selinuxdefcon.8 2009-02-18 14:18:54.000000000 -0500 @@ -0,0 +1,19 @@ +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -61,9 +70,9 @@ + +.SH "SEE ALSO" +secon(8), selinuxconlist(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.76/src/callbacks.c +diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.77/src/callbacks.c --- nsalibselinux/src/callbacks.c 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.76/src/callbacks.c 2008-12-02 09:14:48.000000000 -0500 ++++ libselinux-2.0.77/src/callbacks.c 2009-02-18 14:18:54.000000000 -0500 @@ -16,6 +16,7 @@ { int rc; @@ -72,9 +81,18 @@ va_start(ap, fmt); rc = vfprintf(stderr, fmt, ap); va_end(ap); -diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.76/src/matchpathcon.c +diff --exclude-from=exclude -N -u -r nsalibselinux/src/file_path_suffixes.h libselinux-2.0.77/src/file_path_suffixes.h +--- nsalibselinux/src/file_path_suffixes.h 2009-01-05 17:45:35.000000000 -0500 ++++ libselinux-2.0.77/src/file_path_suffixes.h 2009-02-18 14:18:54.000000000 -0500 +@@ -20,3 +20,5 @@ + S_(FILE_CONTEXTS_LOCAL, "/contexts/files/file_contexts.local") + S_(X_CONTEXTS, "/contexts/x_contexts") + S_(COLORS, "/secolor.conf") ++ S_(VIRTUAL_DOMAIN, "/contexts/virtual_domain_context") ++ S_(VIRTUAL_IMAGE, "/contexts/virtual_image_context") +diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.77/src/matchpathcon.c --- nsalibselinux/src/matchpathcon.c 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.76/src/matchpathcon.c 2008-12-02 09:14:48.000000000 -0500 ++++ libselinux-2.0.77/src/matchpathcon.c 2009-02-18 14:18:54.000000000 -0500 @@ -2,6 +2,7 @@ #include #include @@ -92,33 +110,64 @@ va_end(ap); } -diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.76/src/selinux.py ---- nsalibselinux/src/selinux.py 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.76/src/selinux.py 2008-12-12 10:08:01.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-2.0.77/src/selinux_config.c +--- nsalibselinux/src/selinux_config.c 2009-01-05 17:45:35.000000000 -0500 ++++ libselinux-2.0.77/src/selinux_config.c 2009-02-18 14:18:54.000000000 -0500 +@@ -40,7 +40,9 @@ + #define SECURETTY_TYPES 18 + #define X_CONTEXTS 19 + #define COLORS 20 +-#define NEL 21 ++#define VIRTUAL_DOMAIN 21 ++#define VIRTUAL_IMAGE 22 ++#define NEL 23 + + /* New layout is relative to SELINUXDIR/policytype. */ + static char *file_paths[NEL]; +@@ -391,3 +393,17 @@ + } + + hidden_def(selinux_x_context_path) ++ ++const char *selinux_virtual_domain_context_path() ++{ ++ return get_path(VIRTUAL_DOMAIN); ++} ++ ++hidden_def(selinux_virtual_domain_context_path) ++ ++const char *selinux_virtual_image_context_path() ++{ ++ return get_path(VIRTUAL_IMAGE); ++} ++ ++hidden_def(selinux_virtual_image_context_path) +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libselinux-2.0.77/src/selinux_internal.h +--- nsalibselinux/src/selinux_internal.h 2009-01-05 17:45:35.000000000 -0500 ++++ libselinux-2.0.77/src/selinux_internal.h 2009-02-18 14:18:54.000000000 -0500 +@@ -56,6 +56,8 @@ + hidden_proto(selinux_securetty_types_path) + hidden_proto(selinux_failsafe_context_path) + hidden_proto(selinux_removable_context_path) ++ hidden_proto(selinux_virtual_domain_context_path) ++ hidden_proto(selinux_virtual_image_context_path) + hidden_proto(selinux_file_context_path) + hidden_proto(selinux_file_context_homedir_path) + hidden_proto(selinux_file_context_local_path) +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.77/src/selinux.py +--- nsalibselinux/src/selinux.py 2009-01-13 08:45:35.000000000 -0500 ++++ libselinux-2.0.77/src/selinux.py 2009-02-18 14:18:54.000000000 -0500 @@ -1,5 +1,5 @@ # This file was automatically generated by SWIG (http://www.swig.org). --# Version 1.3.33 +-# Version 1.3.35 +# Version 1.3.36 # # Don't modify this file, modify the SWIG interface instead. # This file is compatible with both classic and new-style classes. -@@ -48,6 +48,29 @@ - del types - +@@ -61,6 +61,15 @@ + map(restorecon, [os.path.join(dirname, fname) + for fname in fnames]), None) -+import shutil, os, stat -+ -+def restorecon(path, recursive=False): -+ """ Restore SELinux context on a given path """ -+ mode = os.stat(path)[stat.ST_MODE] -+ status, context = matchpathcon(path, mode) -+ if status == 0: -+ lsetfilecon(path, context) -+ if recursive: -+ os.path.walk(path, lambda arg, dirname, fnames: -+ map(restorecon, [os.path.join(dirname, fname) -+ for fname in fnames]), None) -+ +def copytree(src, dest): + """ An SELinux-friendly shutil.copytree method """ + shutil.copytree(src, dest) @@ -128,40 +177,432 @@ + """ An SELinux-friendly shutil.move method """ + shutil.move(src, dest) + restorecon(dest, recursive=True) -+ + is_selinux_enabled = _selinux.is_selinux_enabled is_selinux_mls_enabled = _selinux.is_selinux_mls_enabled - getcon = _selinux.getcon -@@ -297,6 +320,7 @@ +@@ -102,86 +111,9 @@ + fsetfilecon_raw = _selinux.fsetfilecon_raw + getpeercon = _selinux.getpeercon + getpeercon_raw = _selinux.getpeercon_raw +-class av_decision(_object): +- __swig_setmethods__ = {} +- __setattr__ = lambda self, name, value: _swig_setattr(self, av_decision, name, value) +- __swig_getmethods__ = {} +- __getattr__ = lambda self, name: _swig_getattr(self, av_decision, name) +- __repr__ = _swig_repr +- __swig_setmethods__["allowed"] = _selinux.av_decision_allowed_set +- __swig_getmethods__["allowed"] = _selinux.av_decision_allowed_get +- if _newclass:allowed = _swig_property(_selinux.av_decision_allowed_get, _selinux.av_decision_allowed_set) +- __swig_setmethods__["decided"] = _selinux.av_decision_decided_set +- __swig_getmethods__["decided"] = _selinux.av_decision_decided_get +- if _newclass:decided = _swig_property(_selinux.av_decision_decided_get, _selinux.av_decision_decided_set) +- __swig_setmethods__["auditallow"] = _selinux.av_decision_auditallow_set +- __swig_getmethods__["auditallow"] = _selinux.av_decision_auditallow_get +- if _newclass:auditallow = _swig_property(_selinux.av_decision_auditallow_get, _selinux.av_decision_auditallow_set) [...11618 lines suppressed...] ++static swig_type_info _swigt__p_avc_memory_callback = {"_p_avc_memory_callback", "struct avc_memory_callback *", 0, 0, (void*)0, 0}; ++static swig_type_info _swigt__p_avc_thread_callback = {"_p_avc_thread_callback", "struct avc_thread_callback *", 0, 0, (void*)0, 0}; + static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; +-static swig_type_info _swigt__p_f_int_p_q_const__char_v_______int = {"_p_f_int_p_q_const__char_v_______int", "int (*)(int,char const *,...)", 0, 0, (void*)0, 0}; +-static swig_type_info _swigt__p_f_p_f_void__void__p_void = {"_p_f_p_f_void__void__p_void", "void *(*)(void (*)(void))", 0, 0, (void*)0, 0}; +-static swig_type_info _swigt__p_f_p_p_char__int = {"_p_f_p_p_char__int", "int (*)(char **)|int (*)(security_context_t *)", 0, 0, (void*)0, 0}; +-static swig_type_info _swigt__p_f_p_q_const__char_v_______void = {"_p_f_p_q_const__char_v_______void", "void (*)(char const *,...)", 0, 0, (void*)0, 0}; +-static swig_type_info _swigt__p_f_p_void__void = {"_p_f_p_void__void", "void (*)(void *)", 0, 0, (void*)0, 0}; +-static swig_type_info _swigt__p_f_p_void_unsigned_short_p_char_size_t__int = {"_p_f_p_void_unsigned_short_p_char_size_t__int", "int (*)(void *,unsigned short,char *,size_t)|int (*)(void *,security_class_t,char *,size_t)", 0, 0, (void*)0, 0}; +-static swig_type_info _swigt__p_f_p_void_unsigned_short_p_char_size_t__void = {"_p_f_p_void_unsigned_short_p_char_size_t__void", "void (*)(void *,unsigned short,char *,size_t)|void (*)(void *,security_class_t,char *,size_t)", 0, 0, (void*)0, 0}; +-static swig_type_info _swigt__p_f_size_t__p_void = {"_p_f_size_t__p_void", "void *(*)(size_t)", 0, 0, (void*)0, 0}; +-static swig_type_info _swigt__p_f_void__p_void = {"_p_f_void__p_void", "void *(*)(void)", 0, 0, (void*)0, 0}; + static swig_type_info _swigt__p_ino_t = {"_p_ino_t", "ino_t *", 0, 0, (void*)0, 0}; + static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0}; + static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **|security_context_t *", 0, 0, (void*)0, 0}; + static swig_type_info _swigt__p_p_p_char = {"_p_p_p_char", "char ***|security_context_t **", 0, 0, (void*)0, 0}; + static swig_type_info _swigt__p_p_security_id = {"_p_p_security_id", "struct security_id **|security_id_t *", 0, 0, (void*)0, 0}; +-static swig_type_info _swigt__p_security_class_mapping = {"_p_security_class_mapping", "struct security_class_mapping *|security_class_mapping *", 0, 0, (void*)0, 0}; +-static swig_type_info _swigt__p_security_id = {"_p_security_id", "security_id_t|struct security_id *|security_id *", 0, 0, (void*)0, 0}; +-static swig_type_info _swigt__p_selinux_callback = {"_p_selinux_callback", "union selinux_callback *|selinux_callback *", 0, 0, (void*)0, 0}; +-static swig_type_info _swigt__p_selinux_opt = {"_p_selinux_opt", "struct selinux_opt *|selinux_opt *", 0, 0, (void*)0, 0}; ++static swig_type_info _swigt__p_security_id = {"_p_security_id", "security_id_t|struct security_id *", 0, 0, (void*)0, 0}; ++static swig_type_info _swigt__p_selinux_opt = {"_p_selinux_opt", "struct selinux_opt *", 0, 0, (void*)0, 0}; + static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|access_vector_t *|mode_t *|pid_t *", 0, 0, (void*)0, 0}; + static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "security_class_t *|unsigned short *", 0, 0, (void*)0, 0}; + + static swig_type_info *swig_type_initial[] = { + &_swigt__p_SELboolean, + &_swigt__p_av_decision, +- &_swigt__p_avc_cache_stats, +- &_swigt__p_avc_entry, + &_swigt__p_avc_entry_ref, + &_swigt__p_avc_lock_callback, + &_swigt__p_avc_log_callback, + &_swigt__p_avc_memory_callback, + &_swigt__p_avc_thread_callback, + &_swigt__p_char, +- &_swigt__p_f_int_p_q_const__char_v_______int, +- &_swigt__p_f_p_f_void__void__p_void, +- &_swigt__p_f_p_p_char__int, +- &_swigt__p_f_p_q_const__char_v_______void, +- &_swigt__p_f_p_void__void, +- &_swigt__p_f_p_void_unsigned_short_p_char_size_t__int, +- &_swigt__p_f_p_void_unsigned_short_p_char_size_t__void, +- &_swigt__p_f_size_t__p_void, +- &_swigt__p_f_void__p_void, + &_swigt__p_ino_t, + &_swigt__p_int, + &_swigt__p_p_char, + &_swigt__p_p_p_char, + &_swigt__p_p_security_id, +- &_swigt__p_security_class_mapping, + &_swigt__p_security_id, +- &_swigt__p_selinux_callback, + &_swigt__p_selinux_opt, + &_swigt__p_unsigned_int, + &_swigt__p_unsigned_short, +@@ -10454,31 +8494,18 @@ + + static swig_cast_info _swigc__p_SELboolean[] = { {&_swigt__p_SELboolean, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_av_decision[] = { {&_swigt__p_av_decision, 0, 0, 0},{0, 0, 0, 0}}; +-static swig_cast_info _swigc__p_avc_cache_stats[] = { {&_swigt__p_avc_cache_stats, 0, 0, 0},{0, 0, 0, 0}}; +-static swig_cast_info _swigc__p_avc_entry[] = { {&_swigt__p_avc_entry, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_avc_entry_ref[] = { {&_swigt__p_avc_entry_ref, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_avc_lock_callback[] = { {&_swigt__p_avc_lock_callback, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_avc_log_callback[] = { {&_swigt__p_avc_log_callback, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_avc_memory_callback[] = { {&_swigt__p_avc_memory_callback, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_avc_thread_callback[] = { {&_swigt__p_avc_thread_callback, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; +-static swig_cast_info _swigc__p_f_int_p_q_const__char_v_______int[] = { {&_swigt__p_f_int_p_q_const__char_v_______int, 0, 0, 0},{0, 0, 0, 0}}; +-static swig_cast_info _swigc__p_f_p_f_void__void__p_void[] = { {&_swigt__p_f_p_f_void__void__p_void, 0, 0, 0},{0, 0, 0, 0}}; +-static swig_cast_info _swigc__p_f_p_p_char__int[] = { {&_swigt__p_f_p_p_char__int, 0, 0, 0},{0, 0, 0, 0}}; +-static swig_cast_info _swigc__p_f_p_q_const__char_v_______void[] = { {&_swigt__p_f_p_q_const__char_v_______void, 0, 0, 0},{0, 0, 0, 0}}; +-static swig_cast_info _swigc__p_f_p_void__void[] = { {&_swigt__p_f_p_void__void, 0, 0, 0},{0, 0, 0, 0}}; +-static swig_cast_info _swigc__p_f_p_void_unsigned_short_p_char_size_t__int[] = { {&_swigt__p_f_p_void_unsigned_short_p_char_size_t__int, 0, 0, 0},{0, 0, 0, 0}}; +-static swig_cast_info _swigc__p_f_p_void_unsigned_short_p_char_size_t__void[] = { {&_swigt__p_f_p_void_unsigned_short_p_char_size_t__void, 0, 0, 0},{0, 0, 0, 0}}; +-static swig_cast_info _swigc__p_f_size_t__p_void[] = { {&_swigt__p_f_size_t__p_void, 0, 0, 0},{0, 0, 0, 0}}; +-static swig_cast_info _swigc__p_f_void__p_void[] = { {&_swigt__p_f_void__p_void, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_ino_t[] = { {&_swigt__p_ino_t, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_p_char[] = { {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_p_p_char[] = { {&_swigt__p_p_p_char, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_p_security_id[] = { {&_swigt__p_p_security_id, 0, 0, 0},{0, 0, 0, 0}}; +-static swig_cast_info _swigc__p_security_class_mapping[] = { {&_swigt__p_security_class_mapping, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_security_id[] = { {&_swigt__p_security_id, 0, 0, 0},{0, 0, 0, 0}}; +-static swig_cast_info _swigc__p_selinux_callback[] = { {&_swigt__p_selinux_callback, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_selinux_opt[] = { {&_swigt__p_selinux_opt, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_unsigned_int[] = { {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_unsigned_short[] = { {&_swigt__p_unsigned_short, 0, 0, 0},{0, 0, 0, 0}}; +@@ -10486,31 +8513,18 @@ + static swig_cast_info *swig_cast_initial[] = { + _swigc__p_SELboolean, + _swigc__p_av_decision, +- _swigc__p_avc_cache_stats, +- _swigc__p_avc_entry, + _swigc__p_avc_entry_ref, + _swigc__p_avc_lock_callback, + _swigc__p_avc_log_callback, + _swigc__p_avc_memory_callback, + _swigc__p_avc_thread_callback, + _swigc__p_char, +- _swigc__p_f_int_p_q_const__char_v_______int, +- _swigc__p_f_p_f_void__void__p_void, +- _swigc__p_f_p_p_char__int, +- _swigc__p_f_p_q_const__char_v_______void, +- _swigc__p_f_p_void__void, +- _swigc__p_f_p_void_unsigned_short_p_char_size_t__int, +- _swigc__p_f_p_void_unsigned_short_p_char_size_t__void, +- _swigc__p_f_size_t__p_void, +- _swigc__p_f_void__p_void, + _swigc__p_ino_t, + _swigc__p_int, + _swigc__p_p_char, + _swigc__p_p_p_char, + _swigc__p_p_security_id, +- _swigc__p_security_class_mapping, + _swigc__p_security_id, +- _swigc__p_selinux_callback, + _swigc__p_selinux_opt, + _swigc__p_unsigned_int, + _swigc__p_unsigned_short, +diff --exclude-from=exclude -N -u -r nsalibselinux/src/seusers.c libselinux-2.0.77/src/seusers.c --- nsalibselinux/src/seusers.c 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.76/src/seusers.c 2008-12-16 09:36:39.000000000 -0500 ++++ libselinux-2.0.77/src/seusers.c 2009-02-18 14:18:54.000000000 -0500 @@ -243,3 +243,67 @@ *r_level = NULL; return 0; @@ -3030,9 +10362,9 @@ + + return (ret ? getseuserbyname(username, r_seuser, r_level) : ret); +} -diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getdefaultcon.c libselinux-2.0.76/utils/getdefaultcon.c +diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getdefaultcon.c libselinux-2.0.77/utils/getdefaultcon.c --- nsalibselinux/utils/getdefaultcon.c 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.76/utils/getdefaultcon.c 2008-12-02 09:33:14.000000000 -0500 ++++ libselinux-2.0.77/utils/getdefaultcon.c 2009-02-18 14:18:54.000000000 -0500 @@ -22,8 +22,9 @@ security_context_t usercon = NULL, cur_context = NULL; char *user = NULL, *level = NULL, *role=NULL, *seuser=NULL, *dlevel=NULL; @@ -3078,3 +10410,59 @@ - return 0; + return ret >= 0; } +diff --exclude-from=exclude -N -u -r nsalibselinux/utils/Makefile libselinux-2.0.77/utils/Makefile +--- nsalibselinux/utils/Makefile 2008-08-28 09:34:24.000000000 -0400 ++++ libselinux-2.0.77/utils/Makefile 2009-02-18 14:18:54.000000000 -0500 +@@ -2,28 +2,33 @@ + PREFIX ?= $(DESTDIR)/usr + LIBDIR ?= $(PREFIX)/lib + BINDIR ?= $(PREFIX)/sbin ++_BINDIR ?= $(DESTDIR)/sbin + + CFLAGS ?= -Wall + override CFLAGS += -I../include -D_GNU_SOURCE $(EMFLAGS) + LDLIBS += -L../src -lselinux -L$(LIBDIR) + + TARGETS=$(patsubst %.c,%,$(wildcard *.c)) ++ ++ + ifeq ($(DISABLE_AVC),y) + UNUSED_TARGETS+=compute_av compute_create compute_member compute_relabel + endif + ifeq ($(DISABLE_BOOL),y) + UNUSED_TARGETS+=getsebool togglesebool + endif +-TARGETS:= $(filter-out $(UNUSED_TARGETS), $(TARGETS)) ++TARGETS:= $(filter-out $(UNUSED_TARGETS) matchpathcon, $(TARGETS)) + +-all: $(TARGETS) ++all: $(TARGETS) matchpathcon + + install: all + -mkdir -p $(BINDIR) + install -m 755 $(TARGETS) $(BINDIR) +- ++ -mkdir -p $(_BINDIR) ++ install -m 755 matchpathcon $(_BINDIR) ++ (cd $(BINDIR); ln -fs ../../sbin/matchpathcon) + clean: +- rm -f $(TARGETS) *.o ++ rm -f $(TARGETS) *.o *~ + + indent: + ../../scripts/Lindent $(wildcard *.[ch]) +diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.77/utils/matchpathcon.c +--- nsalibselinux/utils/matchpathcon.c 2008-10-28 10:06:51.000000000 -0400 ++++ libselinux-2.0.77/utils/matchpathcon.c 2009-02-18 14:18:54.000000000 -0500 +@@ -101,6 +101,11 @@ + for (i = optind; i < argc; i++) { + int mode = 0; + struct stat buf; ++ int len = strlen(argv[i]); ++ if (len > 1 && argv[i][len - 1 ] == '/') { ++ argv[i][len - 1 ] = '\0'; ++ } ++ + if (lstat(argv[i], &buf) == 0) + mode = buf.st_mode; + Index: libselinux.spec =================================================================== RCS file: /cvs/extras/rpms/libselinux/F-10/libselinux.spec,v retrieving revision 1.347 retrieving revision 1.348 diff -u -r1.347 -r1.348 --- libselinux.spec 16 Dec 2008 14:45:25 -0000 1.347 +++ libselinux.spec 2 Mar 2009 18:24:56 -0000 1.348 @@ -4,8 +4,8 @@ Summary: SELinux library and simple utilities Name: libselinux -Version: 2.0.76 -Release: 5%{?dist} +Version: 2.0.78 +Release: 1%{?dist} License: Public Domain Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -127,6 +127,7 @@ %defattr(-,root,root,-) /%{_lib}/libselinux.so.* /var/run/setrans +/sbin/matchpathcon %files utils %defattr(-,root,root,-) @@ -163,7 +164,31 @@ %{ruby_sitearch}/selinux.so %changelog -* Tue Dec 16 2008 Dan Walsh - 2.0.76-5 +* Mon Mar 2 2009 Dan Walsh - 2.0.78-1 +- Update to upstream + * Fix incorrect conversion in discover_class code. + +* Wed Feb 25 2009 Fedora Release Engineering - 2.0.77-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 18 2009 Dan Walsh - 2.0.77-5 +- Add + - selinux_virtual_domain_context_path + - selinux_virtual_image_context_path + +* Tue Jan 6 2009 Dan Walsh - 2.0.77-3 +- Throw exeptions in python swig bindings on failures + +* Tue Jan 6 2009 Dan Walsh - 2.0.77-2 +- Fix restorecon python code + +* Tue Jan 6 2009 Dan Walsh - 2.0.77-1 +- Update to upstream + +* Tue Dec 16 2008 Dan Walsh - 2.0.76-6 +- Strip trailing / for matchpathcon + +* Tue Dec 16 2008 Dan Walsh l - 2.0.76-5 - Fix segfault if seusers file does not work * Fri Dec 12 2008 Dan Walsh - 2.0.76-4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libselinux/F-10/sources,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- sources 12 Dec 2008 15:30:56 -0000 1.179 +++ sources 2 Mar 2009 18:24:56 -0000 1.180 @@ -1 +1 @@ -6829e79d3103683961d82c419bdb4e86 libselinux-2.0.76.tgz +c34327ec14643572f284589a2c72dcaa libselinux-2.0.78.tgz From kkofler at fedoraproject.org Mon Mar 2 18:27:28 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Mon, 2 Mar 2009 18:27:28 +0000 (UTC) Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.2.0-bluetooth-revert.patch, 1.1, 1.2 Message-ID: <20090302182728.C5A4E70115@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10228/devel Modified Files: kdebase-workspace-4.2.0-bluetooth-revert.patch Log Message: Drop unneeded .desktop translation reversion which does not apply against 4.2.1 from bluetooth-revert patch. kdebase-workspace-4.2.0-bluetooth-revert.patch: Index: kdebase-workspace-4.2.0-bluetooth-revert.patch =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.2.0-bluetooth-revert.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdebase-workspace-4.2.0-bluetooth-revert.patch 29 Jan 2009 21:33:46 -0000 1.1 +++ kdebase-workspace-4.2.0-bluetooth-revert.patch 2 Mar 2009 18:27:26 -0000 1.2 @@ -3759,71 +3759,6 @@ private: QString m_objectPath; -diff -ur kdebase-workspace-4.2.0/solid/bluez/solid_bluez.desktop kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/solid_bluez.desktop ---- kdebase-workspace-4.2.0/solid/bluez/solid_bluez.desktop 2009-01-17 11:59:34.000000000 +0100 -+++ kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/solid_bluez.desktop 2008-08-28 10:06:58.000000000 +0200 -@@ -5,22 +5,20 @@ - InitialPreference=100 - Icon=preferences-system-bluetooth - Name=BlueZ -+Name[ar]=???????????? - Name[hi]=?????????????????? --Name[kn]=????????????????????? --Name[mai]=??????????????? - Name[ne]=????????????Z - Name[sr]=???????? - Name[x-test]=xxBlueZxx - Comment=Bluetooth management using the BlueZ stack --Comment[ar]=?????????? ???????????? ???????????????? ???????? BlueZ -+Comment[ar]=?????????? ???????????? ???????????????? ???????? ???????????????? - Comment[be]=?????????????????? Bluetooth ?????? ???????????????? ?????????? BlueZ --Comment[be at latin]=Kirava??nie pry??adami ???Bluetooth??? praz systemu ???BlueZ???. - Comment[ca]=Gesti?? del Bluetooth usant la pila BlueZ - Comment[da]=Bluetooth-h??ndtering med brug af BlueZ-stakken - Comment[de]=Bluetooth-Verwaltung mit Hilfe von Bluez - Comment[el]=???????????????????? bluetooth ???? ?????????? ?????? ?????????????? BlueZ - Comment[eo]=Bluetooth-administrado uzante la BlueZ-stakon --Comment[es]=Gesti??n de Bluetooth mediante la pila BlueZ -+Comment[es]=Administrar Bluetooth mediante la pila BlueZ - Comment[et]=Bluetoothi haldamine BlueZi pinuga - Comment[eu]=Bluetooth kudeaketa BlueZ pila erabiliz - Comment[fa]=???????????? ???????????? ???? ?????????????? ???? ???????? BlueZ -@@ -31,14 +29,12 @@ - Comment[gl]=Xesti??n de Bluetooth usando a pila BlueZ - Comment[gu]=BlueZ ????????????????????? ??????????????? ??????????????? ??????????????????????????? ?????????????????? - Comment[he]=?????????? Bluetooth ?????????????? ???????????? BlueZ --Comment[hi]=?????????????????? ??????????????? ?????? ?????????????????? ?????? ????????????????????? ????????????????????? - Comment[hu]=Bluetooth-kezel?? (a BlueZ keretrendszerre ??p??l) - Comment[is]=Ums??sla me?? Bl??t??nn um BlueZ kerfi?? - Comment[it]=Gestione Bluetooth che usa lo stack BlueZ - Comment[ja]=BlueZ ????????????????????? Bluetooth ?????? - Comment[kk]=BlueZ ?????????? ?????????????????? Bluetooth-???? ?????????????? - Comment[km]=?????????????????????????????????????????????????????????????????????????????????????????????????????? BlueZ --Comment[kn]=????????????????????? ??????????????? (??????????????????) ???????????? ???????????????????????? ????????????????????????????????? - Comment[ko]=BlueZ ????????? ???????????? ???????????? ?????? - Comment[ku]=Ger??nendetiya Bluetooth?? BlueZ stack bi kar t??ne - Comment[lv]=Bluetooth p??rvald??ba lietojot BlueZ -@@ -49,7 +45,6 @@ - Comment[ne]=????????????Z ????????? ?????????????????? ?????????????????? ????????????????????? ?????????????????????????????? - Comment[nl]=Bluetooth-beheer via de BlueZ Stack - Comment[nn]=Bluetooth-handtering med BlueZ --Comment[or]=BlueZ ????????? ????????????????????? ????????? ????????????????????? ???????????????????????? - Comment[pa]=BlueZ ???????????? ????????? ???????????????????????? ??????????????????????????? - Comment[pl]=Zarz??dzanie interfejsami Bluetooth za pomoc?? stosu BlueZ - Comment[pt]=Gest??o do Bluetooth com a plataforma BlueZ -@@ -57,12 +52,10 @@ - Comment[ro]=Gestiune bluetooth folosind stiva BlueZ - Comment[ru]=???????????????????? ?????????????????? Bluetooth ???? ???????????? ?????????? BlueZ - Comment[se]=Gie??ahala Bluetooth BlueZain --Comment[sk]=Spr??va bluetooth pomocou aplik??cie BlueZ - Comment[sl]=Upravljanje z Bluetooth z uporabo sklada BlueZ - Comment[sr]=?????????????????? ???????????????? ?????????????????????? ????????????? - Comment[sr at latin]=Upravljanje Bluetoothom mehanizmima BlueZ???a - Comment[sv]=Bl??tandshantering som anv??nder BlueZ --Comment[te]=BlueZ ?????????????????? ?????????????????????????????? ???????????????????????? ????????????????????? - Comment[th]=????????????????????????????????????????????????????????????????????????????????????????????????????????? BlueZ - Comment[tr]=BlueZ kullanan Bluetooth y??netimi - Comment[uk]=?????????????????? Bluetooth ?????????? ???????? BlueZ diff -ur kdebase-workspace-4.2.0/solid/bluez/tests/blueztest.cpp kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/tests/blueztest.cpp --- kdebase-workspace-4.2.0/solid/bluez/tests/blueztest.cpp 2008-10-17 13:00:20.000000000 +0200 +++ kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/tests/blueztest.cpp 2008-01-05 00:55:19.000000000 +0100 From kkofler at fedoraproject.org Mon Mar 2 18:27:56 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Mon, 2 Mar 2009 18:27:56 +0000 (UTC) Subject: rpms/kdebase-workspace/F-10 kdebase-workspace-4.2.0-bluetooth-revert.patch, 1.1, 1.2 Message-ID: <20090302182756.3549B70115@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10228/F-10 Modified Files: kdebase-workspace-4.2.0-bluetooth-revert.patch Log Message: Drop unneeded .desktop translation reversion which does not apply against 4.2.1 from bluetooth-revert patch. kdebase-workspace-4.2.0-bluetooth-revert.patch: Index: kdebase-workspace-4.2.0-bluetooth-revert.patch =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace-4.2.0-bluetooth-revert.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdebase-workspace-4.2.0-bluetooth-revert.patch 29 Jan 2009 21:33:45 -0000 1.1 +++ kdebase-workspace-4.2.0-bluetooth-revert.patch 2 Mar 2009 18:27:25 -0000 1.2 @@ -3759,71 +3759,6 @@ private: QString m_objectPath; -diff -ur kdebase-workspace-4.2.0/solid/bluez/solid_bluez.desktop kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/solid_bluez.desktop ---- kdebase-workspace-4.2.0/solid/bluez/solid_bluez.desktop 2009-01-17 11:59:34.000000000 +0100 -+++ kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/solid_bluez.desktop 2008-08-28 10:06:58.000000000 +0200 -@@ -5,22 +5,20 @@ - InitialPreference=100 - Icon=preferences-system-bluetooth - Name=BlueZ -+Name[ar]=???????????? - Name[hi]=?????????????????? --Name[kn]=????????????????????? --Name[mai]=??????????????? - Name[ne]=????????????Z - Name[sr]=???????? - Name[x-test]=xxBlueZxx - Comment=Bluetooth management using the BlueZ stack --Comment[ar]=?????????? ???????????? ???????????????? ???????? BlueZ -+Comment[ar]=?????????? ???????????? ???????????????? ???????? ???????????????? - Comment[be]=?????????????????? Bluetooth ?????? ???????????????? ?????????? BlueZ --Comment[be at latin]=Kirava??nie pry??adami ???Bluetooth??? praz systemu ???BlueZ???. - Comment[ca]=Gesti?? del Bluetooth usant la pila BlueZ - Comment[da]=Bluetooth-h??ndtering med brug af BlueZ-stakken - Comment[de]=Bluetooth-Verwaltung mit Hilfe von Bluez - Comment[el]=???????????????????? bluetooth ???? ?????????? ?????? ?????????????? BlueZ - Comment[eo]=Bluetooth-administrado uzante la BlueZ-stakon --Comment[es]=Gesti??n de Bluetooth mediante la pila BlueZ -+Comment[es]=Administrar Bluetooth mediante la pila BlueZ - Comment[et]=Bluetoothi haldamine BlueZi pinuga - Comment[eu]=Bluetooth kudeaketa BlueZ pila erabiliz - Comment[fa]=???????????? ???????????? ???? ?????????????? ???? ???????? BlueZ -@@ -31,14 +29,12 @@ - Comment[gl]=Xesti??n de Bluetooth usando a pila BlueZ - Comment[gu]=BlueZ ????????????????????? ??????????????? ??????????????? ??????????????????????????? ?????????????????? - Comment[he]=?????????? Bluetooth ?????????????? ???????????? BlueZ --Comment[hi]=?????????????????? ??????????????? ?????? ?????????????????? ?????? ????????????????????? ????????????????????? - Comment[hu]=Bluetooth-kezel?? (a BlueZ keretrendszerre ??p??l) - Comment[is]=Ums??sla me?? Bl??t??nn um BlueZ kerfi?? - Comment[it]=Gestione Bluetooth che usa lo stack BlueZ - Comment[ja]=BlueZ ????????????????????? Bluetooth ?????? - Comment[kk]=BlueZ ?????????? ?????????????????? Bluetooth-???? ?????????????? - Comment[km]=?????????????????????????????????????????????????????????????????????????????????????????????????????? BlueZ --Comment[kn]=????????????????????? ??????????????? (??????????????????) ???????????? ???????????????????????? ????????????????????????????????? - Comment[ko]=BlueZ ????????? ???????????? ???????????? ?????? - Comment[ku]=Ger??nendetiya Bluetooth?? BlueZ stack bi kar t??ne - Comment[lv]=Bluetooth p??rvald??ba lietojot BlueZ -@@ -49,7 +45,6 @@ - Comment[ne]=????????????Z ????????? ?????????????????? ?????????????????? ????????????????????? ?????????????????????????????? - Comment[nl]=Bluetooth-beheer via de BlueZ Stack - Comment[nn]=Bluetooth-handtering med BlueZ --Comment[or]=BlueZ ????????? ????????????????????? ????????? ????????????????????? ???????????????????????? - Comment[pa]=BlueZ ???????????? ????????? ???????????????????????? ??????????????????????????? - Comment[pl]=Zarz??dzanie interfejsami Bluetooth za pomoc?? stosu BlueZ - Comment[pt]=Gest??o do Bluetooth com a plataforma BlueZ -@@ -57,12 +52,10 @@ - Comment[ro]=Gestiune bluetooth folosind stiva BlueZ - Comment[ru]=???????????????????? ?????????????????? Bluetooth ???? ???????????? ?????????? BlueZ - Comment[se]=Gie??ahala Bluetooth BlueZain --Comment[sk]=Spr??va bluetooth pomocou aplik??cie BlueZ - Comment[sl]=Upravljanje z Bluetooth z uporabo sklada BlueZ - Comment[sr]=?????????????????? ???????????????? ?????????????????????? ????????????? - Comment[sr at latin]=Upravljanje Bluetoothom mehanizmima BlueZ???a - Comment[sv]=Bl??tandshantering som anv??nder BlueZ --Comment[te]=BlueZ ?????????????????? ?????????????????????????????? ???????????????????????? ????????????????????? - Comment[th]=????????????????????????????????????????????????????????????????????????????????????????????????????????? BlueZ - Comment[tr]=BlueZ kullanan Bluetooth y??netimi - Comment[uk]=?????????????????? Bluetooth ?????????? ???????? BlueZ diff -ur kdebase-workspace-4.2.0/solid/bluez/tests/blueztest.cpp kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/tests/blueztest.cpp --- kdebase-workspace-4.2.0/solid/bluez/tests/blueztest.cpp 2008-10-17 13:00:20.000000000 +0200 +++ kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/tests/blueztest.cpp 2008-01-05 00:55:19.000000000 +0100 From kkofler at fedoraproject.org Mon Mar 2 18:27:57 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Mon, 2 Mar 2009 18:27:57 +0000 (UTC) Subject: rpms/kdebase-workspace/F-9 kdebase-workspace-4.2.0-bluetooth-revert.patch, 1.2, 1.3 Message-ID: <20090302182757.258B270115@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-workspace/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10228/F-9 Modified Files: kdebase-workspace-4.2.0-bluetooth-revert.patch Log Message: Drop unneeded .desktop translation reversion which does not apply against 4.2.1 from bluetooth-revert patch. kdebase-workspace-4.2.0-bluetooth-revert.patch: Index: kdebase-workspace-4.2.0-bluetooth-revert.patch =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace-4.2.0-bluetooth-revert.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kdebase-workspace-4.2.0-bluetooth-revert.patch 29 Jan 2009 20:10:23 -0000 1.2 +++ kdebase-workspace-4.2.0-bluetooth-revert.patch 2 Mar 2009 18:27:25 -0000 1.3 @@ -3759,71 +3759,6 @@ private: QString m_objectPath; -diff -ur kdebase-workspace-4.2.0/solid/bluez/solid_bluez.desktop kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/solid_bluez.desktop ---- kdebase-workspace-4.2.0/solid/bluez/solid_bluez.desktop 2009-01-17 11:59:34.000000000 +0100 -+++ kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/solid_bluez.desktop 2008-08-28 10:06:58.000000000 +0200 -@@ -5,22 +5,20 @@ - InitialPreference=100 - Icon=preferences-system-bluetooth - Name=BlueZ -+Name[ar]=???????????? - Name[hi]=?????????????????? --Name[kn]=????????????????????? --Name[mai]=??????????????? - Name[ne]=????????????Z - Name[sr]=???????? - Name[x-test]=xxBlueZxx - Comment=Bluetooth management using the BlueZ stack --Comment[ar]=?????????? ???????????? ???????????????? ???????? BlueZ -+Comment[ar]=?????????? ???????????? ???????????????? ???????? ???????????????? - Comment[be]=?????????????????? Bluetooth ?????? ???????????????? ?????????? BlueZ --Comment[be at latin]=Kirava??nie pry??adami ???Bluetooth??? praz systemu ???BlueZ???. - Comment[ca]=Gesti?? del Bluetooth usant la pila BlueZ - Comment[da]=Bluetooth-h??ndtering med brug af BlueZ-stakken - Comment[de]=Bluetooth-Verwaltung mit Hilfe von Bluez - Comment[el]=???????????????????? bluetooth ???? ?????????? ?????? ?????????????? BlueZ - Comment[eo]=Bluetooth-administrado uzante la BlueZ-stakon --Comment[es]=Gesti??n de Bluetooth mediante la pila BlueZ -+Comment[es]=Administrar Bluetooth mediante la pila BlueZ - Comment[et]=Bluetoothi haldamine BlueZi pinuga - Comment[eu]=Bluetooth kudeaketa BlueZ pila erabiliz - Comment[fa]=???????????? ???????????? ???? ?????????????? ???? ???????? BlueZ -@@ -31,14 +29,12 @@ - Comment[gl]=Xesti??n de Bluetooth usando a pila BlueZ - Comment[gu]=BlueZ ????????????????????? ??????????????? ??????????????? ??????????????????????????? ?????????????????? - Comment[he]=?????????? Bluetooth ?????????????? ???????????? BlueZ --Comment[hi]=?????????????????? ??????????????? ?????? ?????????????????? ?????? ????????????????????? ????????????????????? - Comment[hu]=Bluetooth-kezel?? (a BlueZ keretrendszerre ??p??l) - Comment[is]=Ums??sla me?? Bl??t??nn um BlueZ kerfi?? - Comment[it]=Gestione Bluetooth che usa lo stack BlueZ - Comment[ja]=BlueZ ????????????????????? Bluetooth ?????? - Comment[kk]=BlueZ ?????????? ?????????????????? Bluetooth-???? ?????????????? - Comment[km]=?????????????????????????????????????????????????????????????????????????????????????????????????????? BlueZ --Comment[kn]=????????????????????? ??????????????? (??????????????????) ???????????? ???????????????????????? ????????????????????????????????? - Comment[ko]=BlueZ ????????? ???????????? ???????????? ?????? - Comment[ku]=Ger??nendetiya Bluetooth?? BlueZ stack bi kar t??ne - Comment[lv]=Bluetooth p??rvald??ba lietojot BlueZ -@@ -49,7 +45,6 @@ - Comment[ne]=????????????Z ????????? ?????????????????? ?????????????????? ????????????????????? ?????????????????????????????? - Comment[nl]=Bluetooth-beheer via de BlueZ Stack - Comment[nn]=Bluetooth-handtering med BlueZ --Comment[or]=BlueZ ????????? ????????????????????? ????????? ????????????????????? ???????????????????????? - Comment[pa]=BlueZ ???????????? ????????? ???????????????????????? ??????????????????????????? - Comment[pl]=Zarz??dzanie interfejsami Bluetooth za pomoc?? stosu BlueZ - Comment[pt]=Gest??o do Bluetooth com a plataforma BlueZ -@@ -57,12 +52,10 @@ - Comment[ro]=Gestiune bluetooth folosind stiva BlueZ - Comment[ru]=???????????????????? ?????????????????? Bluetooth ???? ???????????? ?????????? BlueZ - Comment[se]=Gie??ahala Bluetooth BlueZain --Comment[sk]=Spr??va bluetooth pomocou aplik??cie BlueZ - Comment[sl]=Upravljanje z Bluetooth z uporabo sklada BlueZ - Comment[sr]=?????????????????? ???????????????? ?????????????????????? ????????????? - Comment[sr at latin]=Upravljanje Bluetoothom mehanizmima BlueZ???a - Comment[sv]=Bl??tandshantering som anv??nder BlueZ --Comment[te]=BlueZ ?????????????????? ?????????????????????????????? ???????????????????????? ????????????????????? - Comment[th]=????????????????????????????????????????????????????????????????????????????????????????????????????????? BlueZ - Comment[tr]=BlueZ kullanan Bluetooth y??netimi - Comment[uk]=?????????????????? Bluetooth ?????????? ???????? BlueZ diff -ur kdebase-workspace-4.2.0/solid/bluez/tests/blueztest.cpp kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/tests/blueztest.cpp --- kdebase-workspace-4.2.0/solid/bluez/tests/blueztest.cpp 2008-10-17 13:00:20.000000000 +0200 +++ kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/tests/blueztest.cpp 2008-01-05 00:55:19.000000000 +0100 From hadess at fedoraproject.org Mon Mar 2 18:47:15 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 2 Mar 2009 18:47:15 +0000 (UTC) Subject: rpms/brasero/devel brasero.spec, 1.40, 1.41 nautilus-cd-burner.desktop, 1.1, 1.2 Message-ID: <20090302184715.C6D8870115@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/brasero/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14200 Modified Files: brasero.spec nautilus-cd-burner.desktop Log Message: * Mon Mar 02 2009 - Bastien Nocera - 2.25.91.2-3 - Fix icon and Bugzilla component Index: brasero.spec =================================================================== RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- brasero.spec 2 Mar 2009 18:07:28 -0000 1.40 +++ brasero.spec 2 Mar 2009 18:46:45 -0000 1.41 @@ -1,7 +1,7 @@ Name: brasero Version: 2.25.91.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Gnome CD/DVD burning application Group: Applications/Multimedia License: GPLv2+ @@ -210,6 +210,9 @@ %changelog +* Mon Mar 02 2009 - Bastien Nocera - 2.25.91.2-3 +- Fix icon and Bugzilla component + * Mon Mar 02 2009 - Bastien Nocera - 2.25.91.2-2 - Fix regressions in burn:/// and blank media handling Index: nautilus-cd-burner.desktop =================================================================== RCS file: /cvs/pkgs/rpms/brasero/devel/nautilus-cd-burner.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nautilus-cd-burner.desktop 2 Mar 2009 17:51:28 -0000 1.1 +++ nautilus-cd-burner.desktop 2 Mar 2009 18:46:45 -0000 1.2 @@ -133,7 +133,7 @@ Comment[zh_TW]=?????????????????????????????????????????????????????????????????????????????? CD ??? DVD TryExec=nautilus Exec=nautilus --no-default-window --no-desktop burn:/// -Icon=nautilus-cd-burner +Icon=brasero Terminal=false StartupNotify=true MimeType=x-content/blank-cd;x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd; @@ -141,5 +141,5 @@ Categories=GNOME;GTK;System; OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=nautilus-cd-burner -X-GNOME-Bugzilla-Component=cd-burner +X-GNOME-Bugzilla-Product=gvfs +X-GNOME-Bugzilla-Component=burn backend From rdieter at fedoraproject.org Mon Mar 2 18:52:10 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 2 Mar 2009 18:52:10 +0000 (UTC) Subject: rpms/konversation/devel konversation-1.1-amarok2.patch,NONE,1.1 Message-ID: <20090302185210.B973070115@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/konversation/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15226 Added Files: konversation-1.1-amarok2.patch Log Message: import awol patch konversation-1.1-amarok2.patch: --- NEW FILE konversation-1.1-amarok2.patch --- diff -up konversation-1.1/konversation/scripts/media.amarok2 konversation-1.1/konversation/scripts/media --- konversation-1.1/konversation/scripts/media.amarok2 2008-08-06 10:56:27.000000000 -0500 +++ konversation-1.1/konversation/scripts/media 2009-02-13 12:41:41.000000000 -0600 @@ -244,35 +244,35 @@ class AmarokPlayer(DCOPPlayer): return '' return data -#class Amarok2Player(Player): -# def __init__(self): -# Player.__init__(self, 'Amarok2', 'audio') -# self.isRunning() -# -# def getData(self): -# playing=os.popen("qdbus org.mpris.amarok /Player PositionGet").readline().strip() != "0" -# if playing and self.isRunning(): -# for line in os.popen("qdbus org.mpris.amarok /Player GetMetadata").readlines(): -# if re.match("^title", line): -# title=self.reEncodeString(line.strip().split(None,1)[1]) -# if re.match("^artist", line): -# artist=self.reEncodeString(line.strip().split(None,1)[1]) -# if re.match("^album", line): -# album=self.reEncodeString(line.strip().split(None,1)[1]) -# return (title, artist, album) -# else: -# return '' -# -# def isRunning(self): -# qdbus_items=subprocess.Popen(['qdbus'], stdout=subprocess.PIPE).communicate()[0] -# running=re.findall('^ org.mpris.amarok$', qdbus_items, re.M) -# if type(running) is list: -# try: -# running=running[0] -# except IndexError: -# running='' -# self.running=bool(running.strip()) -# return self.running +class Amarok2Player(Player): + def __init__(self): + Player.__init__(self, 'Amarok2', 'audio') + self.isRunning() + + def getData(self): + playing=os.popen("qdbus org.mpris.amarok /Player PositionGet").readline().strip() != "0" + if playing and self.isRunning(): + for line in os.popen("qdbus org.mpris.amarok /Player GetMetadata").readlines(): + if re.match("^title", line): + title=self.reEncodeString(line.strip().split(None,1)[1]) + if re.match("^artist", line): + artist=self.reEncodeString(line.strip().split(None,1)[1]) + if re.match("^album", line): + album=self.reEncodeString(line.strip().split(None,1)[1]) + return (title, artist, album) + else: + return '' + + def isRunning(self): + qdbus_items=subprocess.Popen(['qdbus'], stdout=subprocess.PIPE).communicate()[0] + running=re.findall('^ org.mpris.amarok$', qdbus_items, re.M) + if type(running) is list: + try: + running=running[0] + except IndexError: + running='' + self.running=bool(running.strip()) + return self.running import socket @@ -432,6 +432,7 @@ DCOP_ITEMS=subprocess.Popen(['dcop'], st PLAYERS = [ AmarokPlayer(), +Amarok2Player(), DCOPPlayer("JuK","juk","Player trackProperty Title","Player trackProperty Artist","Player trackProperty Album"), DCOPPlayer("Noatun",'noatun',"Noatun title",playerType='audio, video'), DCOPPlayer("Kaffeine","kaffeine","KaffeineIface title","KaffeineIface artist","KaffeineIface album",playerType='video, audio'), From tmz at fedoraproject.org Mon Mar 2 18:54:41 2009 From: tmz at fedoraproject.org (Todd M. Zullinger) Date: Mon, 2 Mar 2009 18:54:41 +0000 (UTC) Subject: rpms/git/F-10 git.spec,1.77,1.78 git.xinetd,1.2,1.3 Message-ID: <20090302185441.E743A70115@cvs1.fedora.phx.redhat.com> Author: tmz Update of /cvs/extras/rpms/git/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15638 Modified Files: git.spec git.xinetd Log Message: Change /var/lib/git-daemon to %{_var}/lib/git Include docs in the git-daemon package Drop redundant libcurl Requires Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/F-10/git.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- git.spec 2 Mar 2009 16:00:05 -0000 1.77 +++ git.spec 2 Mar 2009 18:54:11 -0000 1.78 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl-Git = %{version}-%{release} -Requires: zlib >= 1.2, rsync, libcurl, less, openssh-clients, expat, perl(Error) +Requires: zlib >= 1.2, rsync, less, openssh-clients, expat, perl(Error) Provides: git-core = %{version}-%{release} Obsoletes: git-core <= 1.5.4.3 @@ -172,11 +172,11 @@ (find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif -mkdir -p $RPM_BUILD_ROOT/var/lib/git-daemon +mkdir -p $RPM_BUILD_ROOT%{_var}/lib/git mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git @@ -252,9 +252,12 @@ %files daemon %defattr(-,root,root) +%doc Documentation/*daemon*.txt %{_bindir}/git-daemon %config(noreplace)%{_sysconfdir}/xinetd.d/git -/var/lib/git-daemon +%{_var}/lib/git +%{!?_without_docs: %{_mandir}/man1/*daemon*.1*} +%{!?_without_docs: %doc Documentation/*daemon*.html} %files -n gitweb %defattr(-,root,root) @@ -266,11 +269,14 @@ # No files for you! %changelog -* Mon Mar 02 2009 Todd Zullinger - 1.6.0.6-2 +* Mon Mar 02 2009 Todd Zullinger - 1.6.0.6-3 - Enable parallel delta searching when packing objects (Roland McGrath) - Consolidate build/install options in %%make_git (Roland McGrath) - Require perl(Authen::SASL) in git-email (bug 483062) - Exclude vc-git.el from emacs-git (bug 479531) +- Change /var/lib/git-daemon to %{_var}/lib/git +- Include docs in the git-daemon package +- Drop redundant libcurl Requires - Update URL field * Sat Dec 20 2008 Todd Zullinger 1.6.0.6-1 Index: git.xinetd =================================================================== RCS file: /cvs/extras/rpms/git/F-10/git.xinetd,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- git.xinetd 17 Nov 2008 19:34:35 -0000 1.2 +++ git.xinetd 2 Mar 2009 18:54:11 -0000 1.3 @@ -9,7 +9,7 @@ wait = no user = nobody server = /usr/bin/git-daemon - server_args = --base-path=/var/lib/git-daemon --export-all --user-path=public_git --syslog --inetd --verbose + server_args = --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose log_on_failure += USERID # xinetd doesn't do this by default. bug #195265 flags = IPv6 From tmz at fedoraproject.org Mon Mar 2 18:57:23 2009 From: tmz at fedoraproject.org (Todd M. Zullinger) Date: Mon, 2 Mar 2009 18:57:23 +0000 (UTC) Subject: rpms/git/F-9 .cvsignore, 1.59, 1.60 git.spec, 1.69, 1.70 git.xinetd, 1.1, 1.2 sources, 1.61, 1.62 Message-ID: <20090302185723.576D770115@cvs1.fedora.phx.redhat.com> Author: tmz Update of /cvs/extras/rpms/git/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16155 Modified Files: .cvsignore git.spec git.xinetd sources Log Message: Update to git-1.6.0.6, and (mostly) sync specfile with F-10 branch - Enable parallel delta searching when packing objects (Roland McGrath) - Consolidate build/install options in %make_git (Roland McGrath) - Require perl(Authen::SASL) in git-email (bug 483062) - Exclude vc-git.el from emacs-git (bug 479531) - Change /srv/git to %{_var}/lib/git - Drop redundant libcurl Requires - Update URL field Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/F-9/.cvsignore,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- .cvsignore 20 Dec 2008 17:40:14 -0000 1.59 +++ .cvsignore 2 Mar 2009 18:56:52 -0000 1.60 @@ -1 +1 @@ -git-1.5.6.6.tar.gz +git-1.6.0.6.tar.bz2 Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/F-9/git.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- git.spec 20 Dec 2008 17:40:14 -0000 1.69 +++ git.spec 2 Mar 2009 18:56:52 -0000 1.70 @@ -1,21 +1,21 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.6.6 -Release: 1%{?dist} +Version: 1.6.0.6 +Release: 3%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools -URL: http://kernel.org/pub/software/scm/git/ -Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz +URL: http://git-scm.com/ +Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl-Git = %{version}-%{release} -Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat, perl(Error) +Requires: zlib >= 1.2, rsync, less, openssh-clients, expat, perl(Error) Provides: git-core = %{version}-%{release} Obsoletes: git-core <= 1.5.4.3 @@ -90,7 +90,7 @@ Summary: Git tools for sending email Group: Development/Tools Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} -Requires: perl(Net::SMTP::SSL) +Requires: perl(Net::SMTP::SSL), perl(Authen::SASL) %description email Git tools for sending email. @@ -131,18 +131,24 @@ %setup -q %patch0 -p1 +# Use these same options for every invocation of 'make'. +# Otherwise it will rebuild in %%install due to flags changes. +%define make_git \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \\\ + ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ + DESTDIR=$RPM_BUILD_ROOT \\\ + INSTALLDIRS=vendor \\\ + THREADED_DELTA_SEARCH=YesPlease \\\ + gitexecdir=%{_bindir} \\\ + prefix=%{_prefix} + %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ - ETC_GITCONFIG=/etc/gitconfig \ - prefix=%{_prefix} all %{!?_without_docs: doc} +%{make_git} all %{!?_without_docs: doc} make -C contrib/emacs %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ - prefix=%{_prefix} mandir=%{_mandir} \ - ETC_GITCONFIG=/etc/gitconfig \ - INSTALLDIRS=vendor install %{!?_without_docs: install-doc} +%{make_git} install %{!?_without_docs: install-doc} make -C contrib/emacs install \ emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do @@ -166,11 +172,11 @@ (find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif -mkdir -p $RPM_BUILD_ROOT/srv/git +mkdir -p $RPM_BUILD_ROOT%{_var}/lib/git mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git @@ -240,14 +246,18 @@ %files -n emacs-git %defattr(-,root,root) +%exclude %{_datadir}/emacs/site-lisp/vc-git.el* %{_datadir}/emacs/site-lisp/*git*.el* %{_datadir}/emacs/site-lisp/site-start.d/git-init.el %files daemon %defattr(-,root,root) +%doc Documentation/*daemon*.txt %{_bindir}/git-daemon %config(noreplace)%{_sysconfdir}/xinetd.d/git -/srv/git +%{_var}/lib/git +%{!?_without_docs: %{_mandir}/man1/*daemon*.1*} +%{!?_without_docs: %doc Documentation/*daemon*.html} %files -n gitweb %defattr(-,root,root) @@ -259,14 +269,50 @@ # No files for you! %changelog -* Sat Dec 20 2008 Todd Zullinger 1.5.6.6-1 -- git-1.5.6.6 +* Mon Mar 02 2009 Todd Zullinger - 1.6.0.6-3 +- Enable parallel delta searching when packing objects (Roland McGrath) +- Consolidate build/install options in %%make_git (Roland McGrath) +- Require perl(Authen::SASL) in git-email (bug 483062) +- Exclude vc-git.el from emacs-git (bug 479531) +- Change /srv/git to %{_var}/lib/git +- Include docs in the git-daemon package +- Drop redundant libcurl Requires +- Update URL field + +* Sat Dec 20 2008 Todd Zullinger 1.6.0.6-1 +- git-1.6.0.6 - Fixes a local privilege escalation bug in gitweb -- Make git-email require perl(Net::SMTP::SSL) (bug 443615) + (http://article.gmane.org/gmane.comp.version-control.git/103624) - Add gitk Requires to git-gui (bug 476308) -* Tue Oct 22 2008 Josh Boyer 1.5.6.5-1 -- git-1.5.6.5 (bug 458156) +* Thu Dec 11 2008 Josh Boyer 1.6.0.5-1 +- git-1.6.0.5 + +* Mon Nov 17 2008 Seth Vidal +- switch from /srv/git to /var/lib/git-daemon for packaging rules compliance + +* Fri Nov 14 2008 Josh Boyer 1.6.0.4-1 +- git-1.6.0.4 + +* Wed Oct 22 2008 Josh Boyer 1.6.0.3-1 +- git-1.6.0.3 +- Drop curl requirement in favor of libcurl (bug 449388) +- Add requires for SMTP-SSL perl module to make git-send-email work (bug 443615) + +* Thu Aug 28 2008 James Bowes 1.6.0.1-1 +- git-1.6.0.1 + +* Thu Jul 24 2008 James Bowes 1.5.6-4 +- git-1.5.6.4 + +* Thu Jun 19 2008 James Bowes 1.5.6-1 +- git-1.5.6 + +* Tue Jun 3 2008 Stepan Kasal 1.5.5.3-2 +- use tar.bz2 instead of tar.gz + +* Wed May 28 2008 James Bowes 1.5.5.3-1 +- git-1.5.5.3 * Mon May 26 2008 James Bowes 1.5.5.2-1 - git-1.5.5.2 Index: git.xinetd =================================================================== RCS file: /cvs/extras/rpms/git/F-9/git.xinetd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- git.xinetd 4 Aug 2007 02:05:22 -0000 1.1 +++ git.xinetd 2 Mar 2009 18:56:52 -0000 1.2 @@ -9,7 +9,7 @@ wait = no user = nobody server = /usr/bin/git-daemon - server_args = --base-path=/srv/git --export-all --user-path=public_git --syslog --inetd --verbose + server_args = --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose log_on_failure += USERID # xinetd doesn't do this by default. bug #195265 flags = IPv6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/F-9/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 20 Dec 2008 17:40:14 -0000 1.61 +++ sources 2 Mar 2009 18:56:52 -0000 1.62 @@ -1 +1 @@ -802fd4324af504415b0f40bcfcbdc610 git-1.5.6.6.tar.gz +b5be9b34b441cb57f92086bfaf59f255 git-1.6.0.6.tar.bz2 From bpepple at fedoraproject.org Mon Mar 2 19:02:01 2009 From: bpepple at fedoraproject.org (Brian Pepple) Date: Mon, 2 Mar 2009 19:02:01 +0000 (UTC) Subject: rpms/telepathy-gabble/devel .cvsignore, 1.40, 1.41 sources, 1.40, 1.41 telepathy-gabble.spec, 1.50, 1.51 Message-ID: <20090302190201.32F6E70115@cvs1.fedora.phx.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/telepathy-gabble/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16909 Modified Files: .cvsignore sources telepathy-gabble.spec Log Message: * Mon Mar 2 2009 Brian Pepple - 0.7.22-1 - Update to 0.7.22. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 19 Feb 2009 19:50:02 -0000 1.40 +++ .cvsignore 2 Mar 2009 19:01:30 -0000 1.41 @@ -1 +1 @@ -telepathy-gabble-0.7.21.tar.gz +telepathy-gabble-0.7.22.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 19 Feb 2009 19:50:02 -0000 1.40 +++ sources 2 Mar 2009 19:01:30 -0000 1.41 @@ -1 +1 @@ -8b86d4fa82eb2c8cc5dc64f300596ae7 telepathy-gabble-0.7.21.tar.gz +de21d35c242c95d7ebb2cc7a246c6390 telepathy-gabble-0.7.22.tar.gz Index: telepathy-gabble.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- telepathy-gabble.spec 25 Feb 2009 19:36:57 -0000 1.50 +++ telepathy-gabble.spec 2 Mar 2009 19:01:30 -0000 1.51 @@ -1,6 +1,6 @@ Name: telepathy-gabble -Version: 0.7.21 -Release: 2%{?dist} +Version: 0.7.22 +Release: 1%{?dist} Summary: A Jabber/XMPP connection manager Group: Applications/Communications @@ -13,7 +13,7 @@ BuildRequires: dbus-devel >= 1.1.0 BuildRequires: dbus-glib-devel >= 0.78 BuildRequires: loudmouth-devel >= 1.3.2 -BuildRequires: telepathy-glib-devel >= 0.7.23 +BuildRequires: telepathy-glib-devel >= 0.7.24 BuildRequires: glib2-devel >= 2.16 BuildRequires: libxslt BuildRequires: python @@ -57,6 +57,9 @@ %changelog +* Mon Mar 2 2009 Brian Pepple - 0.7.22-1 +- Update to 0.7.22. + * Wed Feb 25 2009 Fedora Release Engineering - 0.7.21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ausil at fedoraproject.org Mon Mar 2 19:04:28 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Mon, 2 Mar 2009 19:04:28 +0000 (UTC) Subject: rpms/konversation/devel konversation.spec,1.23,1.24 Message-ID: <20090302190428.2319370115@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/extras/rpms/konversation/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17393 Modified Files: konversation.spec Log Message: make %patcha nd Patch numbers match Index: konversation.spec =================================================================== RCS file: /cvs/extras/rpms/konversation/devel/konversation.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- konversation.spec 25 Feb 2009 11:48:53 -0000 1.23 +++ konversation.spec 2 Mar 2009 19:03:57 -0000 1.24 @@ -1,6 +1,6 @@ Name: konversation Version: 1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A user friendly IRC client Group: Applications/Internet @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # upstream patches -Patch100: konversation-1.1-amarok2.patch +Patch1: konversation-1.1-amarok2.patch BuildRequires: desktop-file-utils @@ -102,6 +102,9 @@ %changelog +* Mon Mar 02 2009 Dennis gilmore - 1.1-6 +- make Patch and %%patch use the same number + * Wed Feb 25 2009 Fedora Release Engineering - 1.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ausil at fedoraproject.org Mon Mar 2 19:13:47 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Mon, 2 Mar 2009 19:13:47 +0000 (UTC) Subject: rpms/konversation/devel konversation.spec,1.24,1.25 Message-ID: <20090302191347.6C66B70115@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/extras/rpms/konversation/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19381 Modified Files: konversation.spec Log Message: add missing -b Index: konversation.spec =================================================================== RCS file: /cvs/extras/rpms/konversation/devel/konversation.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- konversation.spec 2 Mar 2009 19:03:57 -0000 1.24 +++ konversation.spec 2 Mar 2009 19:13:17 -0000 1.25 @@ -36,7 +36,7 @@ %prep %setup -q -n %{name}-%{version} -%patch1 -p1 .amarok2 +%patch1 -p1 -b .amarok2 %build From sgrubb at fedoraproject.org Mon Mar 2 19:34:22 2009 From: sgrubb at fedoraproject.org (Steve Grubb) Date: Mon, 2 Mar 2009 19:34:22 +0000 (UTC) Subject: rpms/prelude-correlator/devel prelude-correlator-0.9.0-getraw.patch, NONE, 1.1 prelude-correlator.spec, 1.8, 1.9 Message-ID: <20090302193422.8FB0C70115@cvs1.fedora.phx.redhat.com> Author: sgrubb Update of /cvs/pkgs/rpms/prelude-correlator/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22308 Modified Files: prelude-correlator.spec Added Files: prelude-correlator-0.9.0-getraw.patch Log Message: * Mon Mar 02 2009 Steve Grubb 0.9.0-0.7.beta3 - Fix bz#484361 Error message regarding missing arguments lua ruleset prelude-correlator-0.9.0-getraw.patch: --- NEW FILE prelude-correlator-0.9.0-getraw.patch --- diff --git a/plugins/lua/lua-idmef.c b/plugins/lua/lua-idmef.c index ebde74a..09e82c9 100644 --- a/plugins/lua/lua-idmef.c +++ b/plugins/lua/lua-idmef.c @@ -320,8 +320,10 @@ static int IDMEF_getraw(lua_State *lstate) return -1; } - if ( ret == 0 ) - return 0; + if ( ret == 0 ) { + lua_pushnil(lstate); + return 1; + } pushIDMEFValue(lstate, value); return 1; Index: prelude-correlator.spec =================================================================== RCS file: /cvs/pkgs/rpms/prelude-correlator/devel/prelude-correlator.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- prelude-correlator.spec 27 Feb 2009 02:12:39 -0000 1.8 +++ prelude-correlator.spec 2 Mar 2009 19:33:51 -0000 1.9 @@ -3,7 +3,7 @@ Name: prelude-correlator Version: 0.9.0 -Release: 0.6.%{prelude_rel}%{?dist} +Release: 0.7.%{prelude_rel}%{?dist} Summary: Real time correlator of events received by Prelude Manager Group: Applications/Internet @@ -13,6 +13,7 @@ Source1: prelude-correlator.init Patch1: prelude-correlator-0.9.0-brute.patch Patch2: prelude-correlator-0.9.0-signal.patch +Patch3: prelude-correlator-0.9.0-getraw.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libprelude-devel @@ -49,6 +50,7 @@ %setup -q -n %{name}-%{version}-%{prelude_rel} %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure @@ -105,6 +107,9 @@ %changelog +* Mon Mar 02 2009 Steve Grubb 0.9.0-0.7.beta3 +- Fix bz#484361 Error message regarding missing arguments lua ruleset + * Thu Feb 26 2009 Fedora Release Engineering - 0.9.0-0.6.beta3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From langel at fedoraproject.org Mon Mar 2 19:43:13 2009 From: langel at fedoraproject.org (Lillian Angel) Date: Mon, 2 Mar 2009 19:43:13 +0000 (UTC) Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.109,1.110 Message-ID: <20090302194313.2260F70115@cvs1.fedora.phx.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24036 Modified Files: java-1.6.0-openjdk.spec Log Message: * Mon Mar 2 2009 Lillian Angel - 1:1.6.0-14.b14 - Reverting last change. Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- java-1.6.0-openjdk.spec 2 Mar 2009 15:15:16 -0000 1.109 +++ java-1.6.0-openjdk.spec 2 Mar 2009 19:42:42 -0000 1.110 @@ -35,7 +35,7 @@ %ifarch %{ix86} %define archbuild i586 -%define archinstall i586 +%define archinstall i386 %endif %ifarch x86_64 %define archbuild amd64 @@ -922,6 +922,9 @@ %changelog * Mon Mar 2 2009 Lillian Angel - 1:1.6.0-14.b14 +- Reverting last change. + +* Mon Mar 2 2009 Lillian Angel - 1:1.6.0-14.b14 - Fixed archinstall i386 to i586, since Fedora 11 made the switch. * Wed Feb 25 2009 Dennis Gilmore - 1:1.6.0-13.b14 From dbhole at fedoraproject.org Mon Mar 2 19:44:49 2009 From: dbhole at fedoraproject.org (Deepak Bhole) Date: Mon, 2 Mar 2009 19:44:49 +0000 (UTC) Subject: rpms/maven2/devel maven2.spec,1.18,1.19 Message-ID: <20090302194449.49B8470115@cvs1.fedora.phx.redhat.com> Author: dbhole Update of /cvs/extras/rpms/maven2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24279 Modified Files: maven2.spec Log Message: Build with OpenJDK again, now that koji issues are resolved Index: maven2.spec =================================================================== RCS file: /cvs/extras/rpms/maven2/devel/maven2.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- maven2.spec 27 Feb 2009 21:49:25 -0000 1.18 +++ maven2.spec 2 Mar 2009 19:44:19 -0000 1.19 @@ -50,7 +50,7 @@ Name: %{name} Version: %{maven_version} -Release: 11.18%{?dist} +Release: 11.19%{?dist} Epoch: 0 Summary: Java project management and project comprehension tool @@ -114,6 +114,7 @@ Patch11: %{name}-commons-cli-1.1.patch BuildRequires: jpackage-utils >= 0:1.7.2 +BuildRequires: java-1.6.0-openjdk-devel BuildRequires: /bin/ls,/usr/bin/head,/usr/bin/find,/usr/bin/awk,/bin/grep,/bin/sed BuildRequires: ant >= 1.6.5 @@ -2299,6 +2300,9 @@ %endif %changelog +* Mon Mar 02 2009 Deepak Bhole 2.0.4-11.19 +- Build with OpenJDK again, now that koji issues are resolved + * Fri Feb 27 2009 Deepak Bhole 2.0.4-11.18 - Revert back to building with gcj From sgrubb at fedoraproject.org Mon Mar 2 19:50:52 2009 From: sgrubb at fedoraproject.org (Steve Grubb) Date: Mon, 2 Mar 2009 19:50:52 +0000 (UTC) Subject: rpms/prelude-correlator/F-10 prelude-correlator-0.9.0-getraw.patch, NONE, 1.1 prelude-correlator.spec, 1.4, 1.5 Message-ID: <20090302195052.6458970115@cvs1.fedora.phx.redhat.com> Author: sgrubb Update of /cvs/pkgs/rpms/prelude-correlator/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25022 Modified Files: prelude-correlator.spec Added Files: prelude-correlator-0.9.0-getraw.patch Log Message: * Mon Mar 02 2009 Steve Grubb 0.9.0-0.5.beta3 - Fix bz#484361 Error message regarding missing arguments lua ruleset prelude-correlator-0.9.0-getraw.patch: --- NEW FILE prelude-correlator-0.9.0-getraw.patch --- diff --git a/plugins/lua/lua-idmef.c b/plugins/lua/lua-idmef.c index ebde74a..09e82c9 100644 --- a/plugins/lua/lua-idmef.c +++ b/plugins/lua/lua-idmef.c @@ -320,8 +320,10 @@ static int IDMEF_getraw(lua_State *lstate) return -1; } - if ( ret == 0 ) - return 0; + if ( ret == 0 ) { + lua_pushnil(lstate); + return 1; + } pushIDMEFValue(lstate, value); return 1; Index: prelude-correlator.spec =================================================================== RCS file: /cvs/pkgs/rpms/prelude-correlator/F-10/prelude-correlator.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- prelude-correlator.spec 6 Dec 2008 15:25:56 -0000 1.4 +++ prelude-correlator.spec 2 Mar 2009 19:50:21 -0000 1.5 @@ -3,7 +3,7 @@ Name: prelude-correlator Version: 0.9.0 -Release: 0.4.%{prelude_rel}%{?dist} +Release: 0.5.%{prelude_rel}%{?dist} Summary: Real time correlator of events received by Prelude Manager Group: Applications/Internet @@ -13,6 +13,7 @@ Source1: prelude-correlator.init Patch1: prelude-correlator-0.9.0-brute.patch Patch2: prelude-correlator-0.9.0-signal.patch +Patch3: prelude-correlator-0.9.0-getraw.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libprelude-devel @@ -49,6 +50,7 @@ %setup -q -n %{name}-%{version}-%{prelude_rel} %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure @@ -105,6 +107,9 @@ %changelog +* Mon Mar 02 2009 Steve Grubb 0.9.0-0.5.beta3 +- Fix bz#484361 Error message regarding missing arguments lua ruleset + * Sat Dec 05 2008 Steve Grubb 0.9.0-0.4.beta3 - Fix bz#469824 Correct brute force correlation rules - Add signal header to prelude-correlator.c so it builds correctly bz#474698 From bpepple at fedoraproject.org Mon Mar 2 19:52:29 2009 From: bpepple at fedoraproject.org (Brian Pepple) Date: Mon, 2 Mar 2009 19:52:29 +0000 (UTC) Subject: rpms/libjingle/devel libjingle-0.3.12-gcc44.patch, NONE, 1.1 libjingle.spec, 1.13, 1.14 Message-ID: <20090302195229.4F76270115@cvs1.fedora.phx.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/libjingle/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25336 Modified Files: libjingle.spec Added Files: libjingle-0.3.12-gcc44.patch Log Message: * Mon Mar 2 2009 Brian Pepple - 0.3.12-4 - Add patch to fix gcc-4.4.0 errors. libjingle-0.3.12-gcc44.patch: --- NEW FILE libjingle-0.3.12-gcc44.patch --- diff -urp libjingle-0.3.12.OLD/talk/base/logging.cc libjingle-0.3.12/talk/base/logging.cc --- libjingle-0.3.12.OLD/talk/base/logging.cc 2008-09-16 09:55:22.000000000 -0400 +++ libjingle-0.3.12/talk/base/logging.cc 2009-03-02 14:32:09.000000000 -0500 @@ -34,6 +34,7 @@ #include #include #include +#include #include "talk/base/logging.h" #include "talk/base/stream.h" diff -urp libjingle-0.3.12.OLD/talk/base/stream.cc libjingle-0.3.12/talk/base/stream.cc --- libjingle-0.3.12.OLD/talk/base/stream.cc 2008-09-16 09:55:22.000000000 -0400 +++ libjingle-0.3.12/talk/base/stream.cc 2009-03-02 14:43:48.000000000 -0500 @@ -30,6 +30,7 @@ #include #include #include +#include #include "talk/base/basictypes.h" #include "talk/base/common.h" #include "talk/base/stream.h" Index: libjingle.spec =================================================================== RCS file: /cvs/pkgs/rpms/libjingle/devel/libjingle.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libjingle.spec 25 Feb 2009 15:58:45 -0000 1.13 +++ libjingle.spec 2 Mar 2009 19:51:59 -0000 1.14 @@ -1,12 +1,13 @@ Name: libjingle Version: 0.3.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GoogleTalk implementation of Jingle Group: System Environment/Libraries License: BSD URL: http://code.google.com/apis/talk/libjingle/ Source0: http://farsight.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-%{version}-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel @@ -34,7 +35,7 @@ %prep %setup -q - +%patch0 -p1 -b .gcc %build %configure --disable-static @@ -77,6 +78,9 @@ %changelog +* Mon Mar 2 2009 Brian Pepple - 0.3.12-4 +- Add patch to fix gcc-4.4.0 errors. + * Wed Feb 25 2009 Fedora Release Engineering - 0.3.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kevin at fedoraproject.org Mon Mar 2 19:57:51 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 2 Mar 2009 19:57:51 +0000 (UTC) Subject: rpms/fontforge/devel sources, 1.24, 1.25 .cvsignore, 1.24, 1.25 fontforge.spec, 1.42, 1.43 Message-ID: <20090302195751.9E44270115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/extras/rpms/fontforge/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25954 Modified Files: sources .cvsignore fontforge.spec Log Message: Upgrade to 20090224 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 21 Feb 2009 00:47:37 -0000 1.24 +++ sources 2 Mar 2009 19:57:21 -0000 1.25 @@ -1,2 +1,2 @@ -eb00467bff69b15a4137595c16cdbff5 fontforge_full-20081224.tar.bz2 -476b047dc6cdc36d79ac34da1c3fcb58 fontforge_htdocs-20081224.tar.bz2 +5b564437e5e3db660b0202647b6f733b fontforge_full-20090224.tar.bz2 +fdd4420934fe12575e7240642c0ffbe4 fontforge_htdocs-20090224.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 21 Feb 2009 00:47:37 -0000 1.24 +++ .cvsignore 2 Mar 2009 19:57:21 -0000 1.25 @@ -1,2 +1,2 @@ -fontforge_full-20081224.tar.bz2 -fontforge_htdocs-20081224.tar.bz2 +fontforge_full-20090224.tar.bz2 +fontforge_htdocs-20090224.tar.bz2 Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- fontforge.spec 24 Feb 2009 17:48:41 -0000 1.42 +++ fontforge.spec 2 Mar 2009 19:57:21 -0000 1.43 @@ -1,11 +1,11 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%global docs_version 20081224 +%global docs_version 20090224 %global gettext_package FontForge Name: fontforge -Version: 20081224 -Release: 3%{?dist} +Version: 20090224 +Release: 1%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing @@ -142,6 +142,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Feb 26 2009 Kevin Fenzi - 20090224-1 +- Upgrade to 20090224 + * Tue Feb 24 2009 Fedora Release Engineering - 20081224-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From glommer at fedoraproject.org Mon Mar 2 19:58:07 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Mon, 2 Mar 2009 19:58:07 +0000 (UTC) Subject: rpms/etherboot/devel etherboot.spec,1.9,1.10 Message-ID: <20090302195807.2B10570115@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/etherboot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25809 Modified Files: etherboot.spec Log Message: more prebuilt binaries. Koji now supports noarch subpackages Index: etherboot.spec =================================================================== RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- etherboot.spec 24 Feb 2009 15:32:32 -0000 1.9 +++ etherboot.spec 2 Mar 2009 19:57:36 -0000 1.10 @@ -2,11 +2,9 @@ # the arches where we are able to actually build the binaries. # on the other arches, we will use the prebuilt binaries -%define real_build_arches %{ix86} x86_64 - Name: etherboot Version: 5.4.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Etherboot collection of boot roms Group: Development/Tools @@ -17,47 +15,46 @@ #Source0: http://kernel.org/pub/software/utils/boot/etherboot/%{name}-%{version}.tar.gz # The source without proto_fsp.c: Source0: %{name}-%{version}-nofsp.tar.gz -# prebuilt binaries, from etherboot-*-5.4.4-6.fc11.i386.rpm: -Source1: etherboot-binaries-5.4.4-6.fc11.i386.tar.bz # The script used to remove the proto_fsp.c files: Source2: strip-etherboot-tarball.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%ifarch %{real_build_arches} -%ifarch x86_64 -BuildRequires: glibc32 -%endif BuildRequires: perl BuildRequires: syslinux BuildRequires: mtools -%endif +BuildArch: %{ix86} %package pxes Summary: Etherboot - boot roms in .pxe format Group: Development/Tools +BuildArch: noarch %package roms Summary: Etherboot - boot roms in .rom format Group: Development/Tools Requires: %{name}-roms-kvm +BuildArch: noarch %package roms-kvm Summary: Etherboot - boot roms supported by KVM, .rom format Group: Development/Tools +BuildArch: noarch %package zroms Summary: Etherboot - boot roms in .zrom format Group: Development/Tools Requires: %{name}-zroms-kvm +BuildArch: noarch %package zroms-kvm Summary: Etherboot - boot roms supported by KVM, .zrom format Group: Development/Tools +BuildArch: noarch @@ -106,40 +103,20 @@ %prep %setup -q -%ifnarch %{real_build_arches} -# can't build the images on this arch. extract the prebuilt ones: -mkdir src/prebuilt -cd src/prebuilt -tar -jxf %{SOURCE1} -%endif - %build cd src -%ifarch %{real_build_arches} - # %{optflags} wouldn't work with our hack to build the 32-bit binaries # on x86_64, so use %{__global_cflags} instead, that doesn't include # -m64 & related flags %define extra_cflags `echo %{__global_cflags} |sed 's|-fstack-protector||g'` - -%ifarch x86_64 -# flags needed to build the 32-bit binaries on x86_64 -%define makeflags ARCH=i386 EXTRA_CFLAGS="%{extra_cflags} -m32" EXTRA_ASFLAGS="--32" EXTRA_LDFLAGS="-m elf_i386" -%else %define makeflags EXTRA_CFLAGS="%{extra_cflags}" -%endif + # undi is broken by now sed -i -e '/undi/d' Families make %{?_smp_mflags} allpxes allroms allzroms %{makeflags} -%else -# Simply copy the prebuilt binaries: -cp prebuilt/etherboot/* bin/ -%endif - - %install rm -rf %{buildroot} @@ -189,6 +166,9 @@ %changelog +* Mon Mar 02 2009 Glauber Costa - 5.4.5-10 +- No more prebuilt binaries. Koji now supports noarch subpackages + * Tue Feb 24 2009 Fedora Release Engineering - 5.4.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From cwickert at fedoraproject.org Mon Mar 2 20:07:41 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Mar 2009 20:07:41 +0000 (UTC) Subject: rpms/libxfce4util/devel libxfce4util.spec,1.26,1.27 Message-ID: <20090302200741.4998470115@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/libxfce4util/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27883 Modified Files: libxfce4util.spec Log Message: * Mon Mar 02 2009 Christoph Wickert - 4.6.0-2 - Make devel package require pkgconfig and gtk-doc - Mark gtk-doc files as %doc Index: libxfce4util.spec =================================================================== RCS file: /cvs/pkgs/rpms/libxfce4util/devel/libxfce4util.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- libxfce4util.spec 27 Feb 2009 19:51:34 -0000 1.26 +++ libxfce4util.spec 2 Mar 2009 20:07:10 -0000 1.27 @@ -1,7 +1,7 @@ Summary: Utility library for the Xfce4 desktop environment Name: libxfce4util Version: 4.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-%{version}/src/libxfce4util-%{version}.tar.bz2 @@ -20,6 +20,8 @@ Requires: %{name} = %{version}-%{release} Requires: glib2-devel Requires: gtk2-devel +Requires: pkgconfig +Requires: gtk-doc %description devel This package includes static libraries and header files for the @@ -61,9 +63,13 @@ %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/xfce4 -%{_datadir}/gtk-doc/html/libxfce4util/ +%doc %{_datadir}/gtk-doc/html/libxfce4util/ %changelog +* Mon Mar 02 2009 Christoph Wickert - 4.6.0-2 +- Make devel package require pkgconfig and gtk-doc +- Mark gtk-doc files as %%doc + * Thu Feb 26 2009 Kevin Fenzi - 4.6.0-1 - Update to 4.6.0 From glommer at fedoraproject.org Mon Mar 2 20:11:59 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Mon, 2 Mar 2009 20:11:59 +0000 (UTC) Subject: rpms/etherboot/devel etherboot.spec,1.10,1.11 Message-ID: <20090302201159.AE85070115@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/etherboot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28626 Modified Files: etherboot.spec Log Message: Due to a not yet fixed bug in rpm, have to keep x86_64 in BuildArch Index: etherboot.spec =================================================================== RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- etherboot.spec 2 Mar 2009 19:57:36 -0000 1.10 +++ etherboot.spec 2 Mar 2009 20:11:29 -0000 1.11 @@ -4,7 +4,7 @@ # on the other arches, we will use the prebuilt binaries Name: etherboot Version: 5.4.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Etherboot collection of boot roms Group: Development/Tools @@ -24,7 +24,11 @@ BuildRequires: perl BuildRequires: syslinux BuildRequires: mtools -BuildArch: %{ix86} +%ifarch x86_64 +BuildRequires: glibc32 +%endif + +BuildArch: %{ix86} x86_64 %package pxes @@ -110,7 +114,12 @@ # on x86_64, so use %{__global_cflags} instead, that doesn't include # -m64 & related flags %define extra_cflags `echo %{__global_cflags} |sed 's|-fstack-protector||g'` +%ifarch x86_64 +# flags needed to build the 32-bit binaries on x86_64 +%define makeflags ARCH=i386 EXTRA_CFLAGS="%{extra_cflags} -m32" EXTRA_ASFLAGS="--32" EXTRA_LDFLAGS="-m elf_i386" +%else %define makeflags EXTRA_CFLAGS="%{extra_cflags}" +%endif # undi is broken by now @@ -166,6 +175,9 @@ %changelog +* Mon Mar 02 2009 Glauber Costa - 5.4.5-11 +- Due to a not yet fixed bug in rpm, have to keep x86_64 in BuildArch + * Mon Mar 02 2009 Glauber Costa - 5.4.5-10 - No more prebuilt binaries. Koji now supports noarch subpackages From pjones at fedoraproject.org Mon Mar 2 20:17:23 2009 From: pjones at fedoraproject.org (Peter Jones) Date: Mon, 2 Mar 2009 20:17:23 +0000 (UTC) Subject: rpms/grub/devel grub-0.97-eficd.patch, NONE, 1.1 grub-0.97-printf_hex.patch, NONE, 1.1 grub.spec, 1.80, 1.81 Message-ID: <20090302201723.427F570115@cvs1.fedora.phx.redhat.com> Author: pjones Update of /cvs/extras/rpms/grub/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29469 Modified Files: grub.spec Added Files: grub-0.97-eficd.patch grub-0.97-printf_hex.patch Log Message: * Mon Mar 02 2009 Peter Jones - 0.97-41 - Fix CD Booting on EFI. grub-0.97-eficd.patch: --- NEW FILE grub-0.97-eficd.patch --- --- grub-0.97/stage2/common.c 2009-03-02 14:00:46.000000000 -0500 +++ grub-0.97/stage2/common.c 2009-03-02 14:04:16.000000000 -0500 @@ -32,7 +32,7 @@ struct multiboot_info mbi; unsigned long saved_drive; unsigned long saved_partition; -unsigned long cdrom_drive; +unsigned long cdrom_drive = 0x100; #ifndef STAGE1_5 unsigned long saved_mem_upper; --- grub-0.97/efi/efidisk.c 2009-03-02 14:00:46.000000000 -0500 +++ grub-0.97/efi/efidisk.c 2009-03-02 14:04:12.000000000 -0500 @@ -534,7 +534,7 @@ unsigned long *drive, unsigned long *partition) { - grub_efi_device_path_t *dp; + grub_efi_device_path_t *dp, *dp1; struct grub_efidisk_data *d, *devices; int drv; unsigned long part; @@ -562,6 +563,27 @@ if (! dp) return 0; + dp1 = dp; + while (1) + { + grub_efi_uint8_t type = GRUB_EFI_DEVICE_PATH_TYPE (dp1); + grub_efi_uint8_t subtype = GRUB_EFI_DEVICE_PATH_SUBTYPE(dp1); + + if (type == GRUB_EFI_MEDIA_DEVICE_PATH_TYPE && + subtype == GRUB_EFI_CDROM_DEVICE_PATH_SUBTYPE) + { + dp1->type = GRUB_EFI_END_DEVICE_PATH_TYPE; + dp1->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE; + dp1->length[0] = 4; + dp1->length[1] = 0; + } + + if (GRUB_EFI_END_ENTIRE_DEVICE_PATH (dp1)) + break; + + dp1 = GRUB_EFI_NEXT_DEVICE_PATH(dp1); + } + drv = 0; for (d = fd_devices; d; d = d->next, drv++) { grub-0.97-printf_hex.patch: --- NEW FILE grub-0.97-printf_hex.patch --- --- grub-0.97/stage2/char_io.c 2009-03-02 14:00:46.000000000 -0500 +++ grub-0.97/stage2/char_io.c 2009-03-02 14:04:16.000000000 -0500 @@ -198,13 +198,15 @@ } } -#define format_ascii(buf, val, is_hex, is_cap) ({ \ +#define format_ascii(buf, val, is_hex, is_cap, num_pad_chars) ({ \ int _n = sizeof ((buf)) - 2; \ typeof(val) _nval = (val); \ int _negative = 0; \ int _mult = is_hex ? 16 : 10; \ char _a = is_cap ? 'A' : 'a'; \ - memset((buf), '\0', sizeof ((buf))); \ + int _pad = num_pad_chars; \ + char hex[] = "0123456789abcdef"; \ + memset((buf), '\0', sizeof ((buf))); \ if (!(_nval > 0LL)) \ _negative = 1; \ if (_nval == 0LL) \ @@ -214,12 +216,15 @@ do { \ int _dig = _nval % _mult; \ (buf)[_n--] = ((_dig > 9) ? _dig + _a - 10 : '0'+_dig); \ + if (_pad > 0) _pad--; \ } while (_nval /= _mult); \ + while (_pad--) \ + (buf)[_n--] = '0'; \ if (_negative) \ (buf)[_n--] = '-'; \ _mult = 0; \ _n++; \ - while (_n < sizeof ((buf))) \ + while (_n < sizeof ((buf))) \ (buf)[_mult++] = (buf)[_n++]; \ if (_negative && _mult > 1) \ ((buf)[_mult-2])++; \ @@ -236,6 +241,8 @@ char *str_arg; int int_arg; + unsigned char uchar_arg; + unsigned ushort_arg; unsigned int uint_arg; signed long long_arg; unsigned long ulong_arg; @@ -246,7 +253,9 @@ if (!c) return 0; - int is_fmt = 0, is_long = 0, is_signed = 1, is_cap = 0, restart = 1; + int is_fmt = 0, is_long = 0, is_signed = 1, is_cap = 0, is_zero_padded = 0; + int num_pad_chars = 0; + int restart = 1; do { if (restart) { restart = 0; @@ -254,6 +263,8 @@ is_long = 0; is_cap = 0; is_signed = 1; + is_zero_padded = 0; + num_pad_chars = 0; buf[0] = '\0'; pos = 0; } @@ -279,10 +290,31 @@ write_char(&str, c, &count); restart = 1; continue; + case '0': + if (!is_zero_padded) { + buf[pos++] = c; + buf[pos] = '\0'; + is_zero_padded++; + continue; + } + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + buf[pos++] = c; + buf[pos] = '\0'; + num_pad_chars *= 10; + num_pad_chars += c - '0'; + continue; case 'l': buf[pos++] = c; buf[pos] = '\0'; - is_long ++; + is_long++; continue; case 'L': buf[pos++] = c; @@ -304,13 +336,13 @@ case 'd': if (is_long == 0) { int_arg = va_arg(args, signed int); - format_ascii(buf, int_arg, 0, 0); + format_ascii(buf, int_arg, 0, 0, 0); } else if (is_long == 1) { long_arg = va_arg(args, signed long); - format_ascii(buf, long_arg, 0, 0); + format_ascii(buf, long_arg, 0, 0, 0); } else { longlong_arg = va_arg(args, signed long long); - format_ascii(buf, longlong_arg, 0, 0); + format_ascii(buf, longlong_arg, 0, 0, 0); } write_str(&str, buf, &count); restart = 1; @@ -324,13 +356,13 @@ case 'U': if (is_long == 0) { uint_arg = va_arg(args, unsigned int); - format_ascii(buf, uint_arg, 0, 0); + format_ascii(buf, uint_arg, 0, 0, 0); } else if (is_long == 1) { ulong_arg = va_arg(args, unsigned long); - format_ascii(buf, ulong_arg, 0, 0); + format_ascii(buf, ulong_arg, 0, 0, 0); } else { ulonglong_arg = va_arg(args, unsigned long long); - format_ascii(buf, ulonglong_arg, 0, 0); + format_ascii(buf, ulonglong_arg, 0, 0, 0); } write_str(&str, buf, &count); restart = 1; @@ -339,7 +371,8 @@ is_cap = 1; case 'p': ulong_arg = va_arg(args, unsigned long); - format_ascii(buf, ulong_arg, 1, is_cap); + is_zero_padded = 1; + format_ascii(buf, ulong_arg, 1, is_cap, sizeof(ulong_arg)); write_str(&str, is_cap ? "0X" : "0x", &count); write_str(&str, buf, &count); restart = 1; @@ -347,15 +380,25 @@ case 'X': is_cap = 1; case 'x': - if (is_long == 0) { + if (num_pad_chars == 2) { + int i; + char hex[] = "0123456789abcdef"; + uint_arg = va_arg(args, unsigned int); + uchar_arg = uint_arg & 0xff; + format_ascii(buf, uchar_arg, 1, is_cap, num_pad_chars); + } else if (num_pad_chars == 4) { + uint_arg = va_arg(args, unsigned int); + ushort_arg = uint_arg & 0xffff; + format_ascii(buf, ushort_arg, 1, is_cap, num_pad_chars); + } else if (is_long == 0) { uint_arg = va_arg(args, unsigned int); - format_ascii(buf, uint_arg, 1, is_cap); + format_ascii(buf, uint_arg, 1, is_cap, num_pad_chars); } else if (is_long == 1) { ulong_arg = va_arg(args, unsigned long); - format_ascii(buf, ulong_arg, 1, is_cap); + format_ascii(buf, ulong_arg, 1, is_cap, num_pad_chars); } else { ulonglong_arg = va_arg(args, unsigned long long); - format_ascii(buf, ulonglong_arg, 1, is_cap); + format_ascii(buf, ulonglong_arg, 1, is_cap, num_pad_chars); } write_str(&str, buf, &count); restart = 1; Index: grub.spec =================================================================== RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- grub.spec 25 Feb 2009 01:16:09 -0000 1.80 +++ grub.spec 2 Mar 2009 20:16:52 -0000 1.81 @@ -1,6 +1,6 @@ Name: grub Version: 0.97 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Grand Unified Boot Loader. Group: System Environment/Base License: GPLv2+ @@ -29,6 +29,9 @@ Patch4: 0003-Allow-passing-multiple-image-files-to-the-initrd-com.patch Patch5: 0004-Obey-2.06-boot-protocol-s-cmdline_size.patch +Patch6: grub-0.97-printf_hex.patch +Patch7: grub-0.97-eficd.patch + %description GRUB (Grand Unified Boot Loader) is an experimental boot loader capable of booting into most free operating systems - Linux, FreeBSD, @@ -43,6 +46,8 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build autoreconf @@ -105,6 +110,9 @@ %{_datadir}/grub %changelog +* Mon Mar 02 2009 Peter Jones - 0.97-41 +- Fix CD Booting on EFI. + * Tue Feb 24 2009 Fedora Release Engineering - 0.97-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From als at fedoraproject.org Mon Mar 2 20:18:14 2009 From: als at fedoraproject.org (=?utf-8?q?Ale=C5=A1_Koval?=) Date: Mon, 2 Mar 2009 20:18:14 +0000 (UTC) Subject: rpms/fpm2/devel .cvsignore, 1.3, 1.4 fpm2.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20090302201814.6165E70115@cvs1.fedora.phx.redhat.com> Author: als Update of /cvs/pkgs/rpms/fpm2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29650 Modified Files: .cvsignore fpm2.spec sources Log Message: Update to 0.75 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Jul 2008 19:35:50 -0000 1.3 +++ .cvsignore 2 Mar 2009 20:17:44 -0000 1.4 @@ -1 +1 @@ -fpm2-0.72.tar.bz2 +fpm2-0.75.tar.bz2 Index: fpm2.spec =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/devel/fpm2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fpm2.spec 24 Feb 2009 18:06:04 -0000 1.3 +++ fpm2.spec 2 Mar 2009 20:17:44 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Password manager with GTK2 GUI Name: fpm2 -Version: 0.72 -Release: 2%{?dist} +Version: 0.75 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity Source: http://als.regnet.cz/%{name}/download/%{name}-%{version}.tar.bz2 @@ -12,7 +12,7 @@ %description Figaro's Password Manager 2 is a program that allows you to securely store the passwords using GTK2 interface. Features include: -- Passwords are encrypted with the blowfish algorithm. +- Passwords are encrypted with the AES-256 algorithm. - Copy passwords or usernames to the clipboard/primary selection. - If the password is for a web site, FPM2 can keep track of the URLs of your login screens and can automatically launch your browser. In this capacity, @@ -59,6 +59,10 @@ %{_datadir}/applications/*.desktop %changelog +* Mon Mar 02 2009 Ale?? Koval - 0.75-1 +- Update to 0.75 +- Update cipher in %descripton section + * Tue Feb 24 2009 Fedora Release Engineering - 0.72-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Jul 2008 19:35:50 -0000 1.3 +++ sources 2 Mar 2009 20:17:44 -0000 1.4 @@ -1 +1 @@ -608e78db5b771a719ad1aeb506b92fb2 fpm2-0.72.tar.bz2 +fdd779c678d16a7949ee66287d242606 fpm2-0.75.tar.bz2 From cwickert at fedoraproject.org Mon Mar 2 20:18:51 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Mar 2009 20:18:51 +0000 (UTC) Subject: rpms/xfconf/devel xfconf.spec,1.9,1.10 Message-ID: <20090302201851.751D770115@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfconf/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29781 Modified Files: xfconf.spec Log Message: * Mon Mar 02 2009 Christoph Wickert - 4.6.0-2 - Fix directory ownership problems - Move gtk-doc into devel package and mark it %doc - Make devel package require gtk-doc Index: xfconf.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfconf/devel/xfconf.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xfconf.spec 27 Feb 2009 19:55:03 -0000 1.9 +++ xfconf.spec 2 Mar 2009 20:18:21 -0000 1.10 @@ -1,6 +1,6 @@ Name: xfconf Version: 4.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Hierarchical configuration system for Xfce Group: System Environment/Base @@ -16,7 +16,7 @@ BuildRequires: perl(ExtUtils::Depends) perl(ExtUtils::PkgConfig) perl(Glib) BuildRequires: gettext -Obsoletes: libxfce4mcs < 4.4.3-2 +Obsoletes: libxfce4mcs < 4.4.3-3 %description Xfconf is a hierarchical (tree-like) configuration system where the @@ -28,11 +28,12 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig +Requires: gtk-doc Requires: dbus-devel Requires: dbus-glib-devel Requires: glib2-devel -Obsoletes: libxfce4mcs-devel < 4.4.3-2 -Obsoletes: xfce-mcs-manager-devel < 4.4.3-2 +Obsoletes: libxfce4mcs-devel < 4.4.3-3 +Obsoletes: xfce-mcs-manager-devel < 4.4.3-3 %description devel This package includes the libraries and header files you will need @@ -75,6 +76,10 @@ %find_lang %{name} +# we need to own +mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/xfce4/ +mkdir -p ${RPM_BUILD_ROOT}%{_libexecdir}/xfce4/ + %clean rm -rf $RPM_BUILD_ROOT @@ -89,10 +94,12 @@ %{_bindir}/xfconf-query %{_libexecdir}/xfconfd %{_datadir}/dbus-1/services/org.xfce.Xfconf.service -%{_datadir}/gtk-doc/html/xfconf +%ghost %dir %{_libdir}/xfce4/ +%ghost %dir %{_libexecdir}/xfce4/ %files devel %defattr(-,root,root,-) +%doc %{_datadir}/gtk-doc/html/xfconf %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/xfce4/xfconf-0 @@ -104,6 +111,11 @@ %{_mandir}/man3/*.3* %changelog +* Mon Mar 02 2009 Christoph Wickert - 4.6.0-2 +- Fix directory ownership problems +- Move gtk-doc into devel package and mark it %%doc +- Make devel package require gtk-doc + * Thu Feb 26 2009 Kevin Fenzi - 4.6.0-1 - Update to 4.6.0 From als at fedoraproject.org Mon Mar 2 20:22:27 2009 From: als at fedoraproject.org (=?utf-8?q?Ale=C5=A1_Koval?=) Date: Mon, 2 Mar 2009 20:22:27 +0000 (UTC) Subject: rpms/fpm2/F-9 .cvsignore,1.2,1.3 fpm2.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <20090302202227.365A470115@cvs1.fedora.phx.redhat.com> Author: als Update of /cvs/pkgs/rpms/fpm2/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30728 Modified Files: .cvsignore fpm2.spec sources Log Message: Update to 0.75 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Jul 2008 19:27:14 -0000 1.2 +++ .cvsignore 2 Mar 2009 20:21:56 -0000 1.3 @@ -1 +1 @@ -fpm2-0.72.tar.bz2 +fpm2-0.75.tar.bz2 Index: fpm2.spec =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/F-9/fpm2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fpm2.spec 7 Jul 2008 19:27:14 -0000 1.2 +++ fpm2.spec 2 Mar 2009 20:21:56 -0000 1.3 @@ -1,6 +1,6 @@ Summary: Password manager with GTK2 GUI Name: fpm2 -Version: 0.72 +Version: 0.75 Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity @@ -12,7 +12,7 @@ %description Figaro's Password Manager 2 is a program that allows you to securely store the passwords using GTK2 interface. Features include: -- Passwords are encrypted with the blowfish algorithm. +- Passwords are encrypted with the AES-256 algorithm. - Copy passwords or usernames to the clipboard/primary selection. - If the password is for a web site, FPM2 can keep track of the URLs of your login screens and can automatically launch your browser. In this capacity, @@ -59,6 +59,13 @@ %{_datadir}/applications/*.desktop %changelog +* Mon Mar 02 2009 Ale?? Koval - 0.75-1 +- Update to 0.75 +- Update cipher in %descripton section + +* Tue Feb 24 2009 Fedora Release Engineering - 0.72-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Jul 7 2008 Ale?? Koval - 0.72-1 - Update to 0.72 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Jul 2008 19:27:14 -0000 1.3 +++ sources 2 Mar 2009 20:21:56 -0000 1.4 @@ -1 +1 @@ -608e78db5b771a719ad1aeb506b92fb2 fpm2-0.72.tar.bz2 +fdd779c678d16a7949ee66287d242606 fpm2-0.75.tar.bz2 From cwickert at fedoraproject.org Mon Mar 2 20:22:54 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Mar 2009 20:22:54 +0000 (UTC) Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.31,1.32 Message-ID: <20090302202254.5B5A370115@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/libxfcegui4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30808 Modified Files: libxfcegui4.spec Log Message: * Mon Mar 02 2009 Christoph Wickert - 4.6.0-3 - Make devel package require pkgconfig and gtk-doc - Mark gtk-doc files as %doc Index: libxfcegui4.spec =================================================================== RCS file: /cvs/pkgs/rpms/libxfcegui4/devel/libxfcegui4.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- libxfcegui4.spec 28 Feb 2009 00:10:47 -0000 1.31 +++ libxfcegui4.spec 2 Mar 2009 20:22:24 -0000 1.32 @@ -1,7 +1,7 @@ Summary: GTK widgets for Xfce Name: libxfcegui4 Version: 4.6.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-%{version}/src/libxfcegui4-%{version}.tar.bz2 @@ -31,6 +31,8 @@ Requires: %{name} = %{version}-%{release} Requires: gtk2-devel Requires: libxfce4util-devel +Requires: pkgconfig +Requires: gtk-doc %description devel This package includes the static libraries and header files you will need @@ -85,12 +87,16 @@ %{_libdir}/glade3/modules/lib*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/xfce4/* -%{_datadir}/gtk-doc/html/libxfcegui4/ +%doc %{_datadir}/gtk-doc/html/libxfcegui4/ %{_datadir}/glade3/catalogs/xfce4.xml %{_datadir}/glade3/catalogs/xfce4.xml.in %{_datadir}/glade3/pixmaps/hicolor/*/actions/* %changelog +* Mon Mar 02 2009 Christoph Wickert - 4.6.0-3 +- Make devel package require pkgconfig and gtk-doc +- Mark gtk-doc files as %%doc + * Fri Feb 27 2009 Kevin Fenzi - 4.6.0-2 - Add back in libSM-devel to BuildRequires From glommer at fedoraproject.org Mon Mar 2 20:24:24 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Mon, 2 Mar 2009 20:24:24 +0000 (UTC) Subject: rpms/qemu/devel qemu.spec,1.46,1.47 sources,1.9,1.10 Message-ID: <20090302202424.7D03070115@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31075 Modified Files: qemu.spec sources Log Message: Updated to tip svn (release 6666). Featuring split packages for qemu. Unfortunately, still using binary blobs for the bioses. Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- qemu.spec 25 Feb 2009 17:26:18 -0000 1.46 +++ qemu.spec 2 Mar 2009 20:23:54 -0000 1.47 @@ -1,35 +1,55 @@ -# For FC >= 6 we have gcc 3.4, for FC <= 5 we have gcc 3.2 -%if %{!?fedora:6}%{?fedora} >= 6 -%define gccver 34 -%else -%define gccver 32 -%endif - Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.9.1 -Release: 13%{?dist} +Version: 1.0 +Release: 0.1.svn6666%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://www.qemu.org/ Source0: http://www.qemu.org/%{name}-%{version}.tar.gz Source1: qemu.init -Patch0: qemu-0.9.1-build.patch -# Change default NIC to rtl8139 to get link-state detection -Patch3: qemu-0.9.1-nic-defaults.patch -Patch4: qemu-%{version}-block-rw-range-check.patch -# Upstream SVN changeset #4338 -Patch5: qemu-%{version}-pty-rawmode.patch -Patch6: qemu-0.9.1-alpha-int.patch -Patch7: qemu-0.9.1-dirent.patch -Patch8: qemu-0.9.1-sparc-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel compat-gcc-%{gccver} zlib-devel which texi2html gnutls-devel -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/service /sbin/chkconfig -Requires(postun): /sbin/service +BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel +Requires: %{name}-user = %{version}-%{release} +Requires: %{name}-system-x86 = %{version}-%{release} +Requires: %{name}-system-sparc = %{version}-%{release} +Requires: %{name}-system-arm = %{version}-%{release} +Requires: %{name}-system-cris = %{version}-%{release} +Requires: %{name}-system-sh4 = %{version}-%{release} +Requires: %{name}-system-m68k = %{version}-%{release} +Requires: %{name}-system-mips = %{version}-%{release} +Requires: %{name}-system-ppc = %{version}-%{release} Requires: %{name}-img = %{version}-%{release} -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 sparc64 armv4l + +#ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 sparc64 armv4l + +%define qemudocdir %{_docdir}/%{name}-%{version} + +%define qemupkg() \ +%package %1\ +Summary: QEMU %2\ +Group: Development/Tools \ +Requires: %{name}-common = %{version}-%{release} \ +%{nil} + +%define qemudesc() \ +%description %1 \ +QEMU is a generic and open source processor emulator which achieves a good \ +emulation speed by using dynamic translation. \ + \ +This package provides the %2 +%{nil} + +%define qemupkgdesc() \ +%package %1\ +Summary: QEMU %2\ +Group: Development/Tools \ +Requires: %{name}-common = %{version}-%{release} \ +%description %1 \ +QEMU is a generic and open source processor emulator which achieves a good \ +emulation speed by using dynamic translation. \ + \ +This package provides the %2 +%{nil} %description QEMU is a generic and open source processor emulator which achieves a good @@ -44,43 +64,56 @@ As QEMU requires no host kernel patches to run, it is safe and easy to use. -%package img -Summary: QEMU command line tool for disk image manipulation -Group: Development/Tools +%qemupkgdesc img {command line tool for manipulating disk images} -%description img -QEMU is a generic and open source processor emulator which achieves a good -emulation speed by using dynamic translation. +%qemupkgdesc common {common files needed by all QEMU targets} -This package provides the command line tool for manipulating disk images. +%qemupkg user {user mode emulation of qemu targets} +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/service /sbin/chkconfig +Requires(postun): /sbin/service +Requires: %{name}-common = %{version}-%{release} +%qemudesc user {user mode emulation of qemu targets} + +%qemupkg system-x86 {system emulator for x86} +%qemudesc system-x86 {system emulator for x86} +%qemupkgdesc system-ppc {system emulator for ppc} + +%qemupkg system-sparc {system emulator for sparc} +%qemudesc system-sparc {system emulator for sparc} + +%qemupkgdesc system-arm {system emulator for arm} +%qemupkgdesc system-mips {system emulator for mips} +%qemupkgdesc system-cris {system emulator for cris} +%qemupkgdesc system-m68k {system emulator for m68k} +%qemupkgdesc system-sh4 {system emulator for sh4} %prep %setup -q -%patch0 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 %build -# FIXME: add --extra-cflags="$RPM_OPT_FLAGS" when we drop gcc34 +# systems like rhel build system does not have a recent enough linker so +# --build-id works. this option is used fedora 8 onwards for giving info +# to the debug packages. + +build_id_available() { + echo "int main () { return 0; }" | gcc -x c -Wl,--build-id - 2>/dev/null +} + +if build_id_available; then + extraldflags="--extra-ldflags=-Wl,--build-id" + buildldflags="VL_LDFLAGS=-Wl,--build-id" +else + extraldflags="" + buildldflags="" +fi + ./configure \ --prefix=%{_prefix} \ --interp-prefix=%{_prefix}/qemu-%%M \ - --cc=gcc%{gccver} \ -%ifnarch sparcv9 - --enable-alsa \ -%endif -%ifarch sparcv9 - --sparc_cpu=v932 \ -%endif -%ifarch sparc64 - --sparc_cpu=v9 \ -%endif - --extra-ldflags="-Wl,--build-id" -make %{?_smp_mflags} VL_LDFLAGS="-Wl,--build-id" + $extraldflags; +make %{?_smp_mflags} $buildldflags + %install rm -rf $RPM_BUILD_ROOT @@ -94,6 +127,7 @@ chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/* install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu +install -D -p -m 0644 -t ${RPM_BUILD_ROOT}/%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE %clean rm -rf $RPM_BUILD_ROOT @@ -112,18 +146,33 @@ /sbin/service qemu condrestart &>/dev/null || : fi -%files +%files +%defattr(-,root,root) + +%files common +%defattr(-,root,root) +%doc %{qemudocdir}/Changelog +%doc %{qemudocdir}/README +%doc %{qemudocdir}/TODO +%doc %{qemudocdir}/qemu-doc.html +%doc %{qemudocdir}/qemu-tech.html +%doc %{qemudocdir}/COPYING +%doc %{qemudocdir}/COPYING.LIB +%doc %{qemudocdir}/LICENSE +%{_prefix}/share/qemu/keymaps/ +%{_prefix}/share/qemu/* +%{_mandir}/man1/qemu.1* +%{_mandir}/man8/qemu-nbd.8* +%{_bindir}/qemu-nbd +%files user %defattr(-,root,root) -%doc Changelog README TODO -%doc qemu-doc.html qemu-tech.html -%doc COPYING COPYING.LIB LICENSE %{_sysconfdir}/rc.d/init.d/qemu -%{_bindir}/qemu %{_bindir}/qemu-alpha %{_bindir}/qemu-arm %{_bindir}/qemu-armeb %{_bindir}/qemu-cris %{_bindir}/qemu-i386 +%{_bindir}/qemu-x86_64 %{_bindir}/qemu-m68k %{_bindir}/qemu-mips %{_bindir}/qemu-mipsel @@ -133,25 +182,44 @@ %{_bindir}/qemu-sh4 %{_bindir}/qemu-sh4eb %{_bindir}/qemu-sparc -%{_bindir}/qemu-sparc32plus %{_bindir}/qemu-sparc64 +%{_bindir}/qemu-sparc32plus +%files system-x86 +%defattr(-,root,root) +%{_bindir}/qemu +%{_bindir}/qemu-system-x86_64 +%{_prefix}/share/qemu/bios.bin +%{_prefix}/share/qemu/vgabios.bin +%{_prefix}/share/qemu/vgabios-cirrus.bin +%files system-sparc +%defattr(-,root,root) +%{_bindir}/qemu-system-sparc +%{_prefix}/share/qemu/openbios-sparc32 +%{_prefix}/share/qemu/openbios-sparc64 +%files system-arm +%defattr(-,root,root) %{_bindir}/qemu-system-arm +%files system-mips +%defattr(-,root,root) %{_bindir}/qemu-system-mips %{_bindir}/qemu-system-mipsel -%{_bindir}/qemu-system-ppc -%{_bindir}/qemu-system-sparc -%{_bindir}/qemu-system-x86_64 -%{_bindir}/qemu-system-cris -%{_bindir}/qemu-system-m68k %{_bindir}/qemu-system-mips64 %{_bindir}/qemu-system-mips64el +%files system-ppc +%defattr(-,root,root) +%{_bindir}/qemu-system-ppc %{_bindir}/qemu-system-ppc64 %{_bindir}/qemu-system-ppcemb +%files system-cris +%defattr(-,root,root) +%{_bindir}/qemu-system-cris +%files system-m68k +%defattr(-,root,root) +%{_bindir}/qemu-system-m68k +%files system-sh4 +%defattr(-,root,root) %{_bindir}/qemu-system-sh4 %{_bindir}/qemu-system-sh4eb -%{_bindir}/qemu-x86_64 -%{_prefix}/share/qemu/ -%{_mandir}/man1/qemu.1* %files img %defattr(-,root,root) @@ -159,6 +227,10 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Mon Mar 02 2009 Glauber Costa - 1.0-0.1.svn6666 +- Updated to tip svn (release 6666). Featuring split packages for qemu. + Unfortunately, still using binary blobs for the bioses. + * Wed Feb 25 2009 Fedora Release Engineering - 0.9.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 8 Jan 2008 22:34:32 -0000 1.9 +++ sources 2 Mar 2009 20:23:54 -0000 1.10 @@ -1 +1 @@ -6591df8e9270eb358c881de4ebea1262 qemu-0.9.1.tar.gz +8394aa871af278efcdec46c37f913533 qemu-1.0.tar.gz From als at fedoraproject.org Mon Mar 2 20:25:50 2009 From: als at fedoraproject.org (=?utf-8?q?Ale=C5=A1_Koval?=) Date: Mon, 2 Mar 2009 20:25:50 +0000 (UTC) Subject: rpms/fpm2/F-10 .cvsignore, 1.3, 1.4 fpm2.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090302202550.8A9D570115@cvs1.fedora.phx.redhat.com> Author: als Update of /cvs/pkgs/rpms/fpm2/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31396 Modified Files: .cvsignore fpm2.spec sources Log Message: Update to 0.75 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Jul 2008 19:35:50 -0000 1.3 +++ .cvsignore 2 Mar 2009 20:25:20 -0000 1.4 @@ -1 +1 @@ -fpm2-0.72.tar.bz2 +fpm2-0.75.tar.bz2 Index: fpm2.spec =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/F-10/fpm2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fpm2.spec 7 Jul 2008 19:35:50 -0000 1.2 +++ fpm2.spec 2 Mar 2009 20:25:20 -0000 1.3 @@ -1,6 +1,6 @@ Summary: Password manager with GTK2 GUI Name: fpm2 -Version: 0.72 +Version: 0.75 Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity @@ -12,7 +12,7 @@ %description Figaro's Password Manager 2 is a program that allows you to securely store the passwords using GTK2 interface. Features include: -- Passwords are encrypted with the blowfish algorithm. +- Passwords are encrypted with the AES-256 algorithm. - Copy passwords or usernames to the clipboard/primary selection. - If the password is for a web site, FPM2 can keep track of the URLs of your login screens and can automatically launch your browser. In this capacity, @@ -59,6 +59,13 @@ %{_datadir}/applications/*.desktop %changelog +* Mon Mar 02 2009 Ale?? Koval - 0.75-1 +- Update to 0.75 +- Update cipher in %descripton section + +* Tue Feb 24 2009 Fedora Release Engineering - 0.72-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Jul 7 2008 Ale?? Koval - 0.72-1 - Update to 0.72 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fpm2/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Jul 2008 19:35:50 -0000 1.3 +++ sources 2 Mar 2009 20:25:20 -0000 1.4 @@ -1 +1 @@ -608e78db5b771a719ad1aeb506b92fb2 fpm2-0.72.tar.bz2 +fdd779c678d16a7949ee66287d242606 fpm2-0.75.tar.bz2 From glommer at fedoraproject.org Mon Mar 2 20:31:39 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Mon, 2 Mar 2009 20:31:39 +0000 (UTC) Subject: rpms/qemu/devel .cvsignore,1.9,1.10 Message-ID: <20090302203139.B876970115@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32403 Modified Files: .cvsignore Log Message: new source file Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 8 Jan 2008 22:34:32 -0000 1.9 +++ .cvsignore 2 Mar 2009 20:31:09 -0000 1.10 @@ -1,3 +1 @@ -.build*.log -*.src.rpm -qemu-0.9.1.tar.gz +qemu-1.0.tar.gz From glommer at fedoraproject.org Mon Mar 2 20:33:51 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Mon, 2 Mar 2009 20:33:51 +0000 (UTC) Subject: rpms/etherboot/devel etherboot.spec,1.11,1.12 Message-ID: <20090302203351.62DEB70115@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/etherboot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv335 Modified Files: etherboot.spec Log Message: bump version Index: etherboot.spec =================================================================== RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- etherboot.spec 2 Mar 2009 20:11:29 -0000 1.11 +++ etherboot.spec 2 Mar 2009 20:33:20 -0000 1.12 @@ -4,7 +4,7 @@ # on the other arches, we will use the prebuilt binaries Name: etherboot Version: 5.4.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Etherboot collection of boot roms Group: Development/Tools @@ -175,10 +175,13 @@ %changelog -* Mon Mar 02 2009 Glauber Costa - 5.4.5-11 +* Mon Mar 02 2009 Glauber Costa - 5.4.4-11 +- bump version + +* Mon Mar 02 2009 Glauber Costa - 5.4.4-11 - Due to a not yet fixed bug in rpm, have to keep x86_64 in BuildArch -* Mon Mar 02 2009 Glauber Costa - 5.4.5-10 +* Mon Mar 02 2009 Glauber Costa - 5.4.4-10 - No more prebuilt binaries. Koji now supports noarch subpackages * Tue Feb 24 2009 Fedora Release Engineering - 5.4.4-9 From mclasen at fedoraproject.org Mon Mar 2 20:37:03 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Mar 2009 20:37:03 +0000 (UTC) Subject: rpms/file-roller/devel .cvsignore, 1.83, 1.84 file-roller.spec, 1.144, 1.145 sources, 1.83, 1.84 Message-ID: <20090302203703.55AAF70115@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/file-roller/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv796 Modified Files: .cvsignore file-roller.spec sources Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/file-roller/devel/.cvsignore,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- .cvsignore 18 Feb 2009 03:35:52 -0000 1.83 +++ .cvsignore 2 Mar 2009 20:36:32 -0000 1.84 @@ -1 +1 @@ -file-roller-2.25.91.tar.bz2 +file-roller-2.25.92.tar.bz2 Index: file-roller.spec =================================================================== RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- file-roller.spec 24 Feb 2009 17:01:38 -0000 1.144 +++ file-roller.spec 2 Mar 2009 20:36:32 -0000 1.145 @@ -10,8 +10,8 @@ Summary: Tool for viewing and creating archives Name: file-roller -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Archiving URL: http://download.gnome.org/sources/file-roller/ @@ -128,6 +128,9 @@ %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg %changelog +* Mon Mar 2 2009 Matthias Clasen 2.25.92-1 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/file-roller/devel/sources,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- sources 18 Feb 2009 03:35:53 -0000 1.83 +++ sources 2 Mar 2009 20:36:32 -0000 1.84 @@ -1 +1 @@ -9e51d86af15639c13ba56af485dee914 file-roller-2.25.91.tar.bz2 +681368f7e698a7a1cbe78b9a2ffe961c file-roller-2.25.92.tar.bz2 From mclasen at fedoraproject.org Mon Mar 2 20:41:16 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Mar 2009 20:41:16 +0000 (UTC) Subject: rpms/libgtop2/devel .cvsignore, 1.48, 1.49 libgtop2.spec, 1.73, 1.74 sources, 1.48, 1.49 read-cpuinfo-completely.patch, 1.2, NONE Message-ID: <20090302204117.05F2E70115@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/libgtop2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1914 Modified Files: .cvsignore libgtop2.spec sources Removed Files: read-cpuinfo-completely.patch Log Message: 2.26.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgtop2/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 18 Feb 2009 03:52:55 -0000 1.48 +++ .cvsignore 2 Mar 2009 20:40:46 -0000 1.49 @@ -1 +1 @@ -libgtop-2.25.91.tar.bz2 +libgtop-2.26.0.tar.bz2 Index: libgtop2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgtop2/devel/libgtop2.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- libgtop2.spec 25 Feb 2009 15:34:16 -0000 1.73 +++ libgtop2.spec 2 Mar 2009 20:40:46 -0000 1.74 @@ -6,23 +6,16 @@ Name: libgtop2 Summary: libgtop library (version 2) -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.26.0 +Release: 1%{?dist} License: GPLv2+ -URL: http://download.gnome.org/sources/libgtop/2.25 +URL: http://download.gnome.org/sources/libgtop/2.26 Group: System Environment/Libraries -Source: http://download.gnome.org/sources/libgtop/2.25/libgtop-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: glib2 >= %{glib2_version} +Source: http://download.gnome.org/sources/libgtop/2.26/libgtop-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: texinfo libtool gettext BuildRequires: intltool -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gtk-doc - -# http://bugzilla.gnome.org/show_bug.cgi?id=468495 -Patch0: read-cpuinfo-completely.patch %description libgtop is a library for portably obtaining information about processes, @@ -42,7 +35,6 @@ %prep %setup -q -n libgtop-%{version} -%patch0 -p1 -b .read-cpuinfo-completely %build %configure --disable-gtk-doc --disable-static @@ -79,6 +71,9 @@ %exclude %{_datadir}/info %changelog +* Mon Mar 2 2009 Matthias Clasen - 2.26.0-1 +- Update to 2.26.0 + * Wed Feb 25 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgtop2/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 18 Feb 2009 03:52:55 -0000 1.48 +++ sources 2 Mar 2009 20:40:46 -0000 1.49 @@ -1 +1 @@ -de09d5470da7157a9301bdfc4d8cd697 libgtop-2.25.91.tar.bz2 +a51ff49eddcce4573f7385e4be33158a libgtop-2.26.0.tar.bz2 --- read-cpuinfo-completely.patch DELETED --- From pjones at fedoraproject.org Mon Mar 2 20:43:49 2009 From: pjones at fedoraproject.org (Peter Jones) Date: Mon, 2 Mar 2009 20:43:49 +0000 (UTC) Subject: rpms/grub/devel grub.spec,1.81,1.82 Message-ID: <20090302204349.97D3D70115@cvs1.fedora.phx.redhat.com> Author: pjones Update of /cvs/extras/rpms/grub/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2447 Modified Files: grub.spec Log Message: * Mon Mar 02 2009 Peter Jones - 0.97-41 - Fix CD Booting on EFI. - Fix XFS build on x86_64. Index: grub.spec =================================================================== RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- grub.spec 2 Mar 2009 20:16:52 -0000 1.81 +++ grub.spec 2 Mar 2009 20:43:19 -0000 1.82 @@ -31,6 +31,7 @@ Patch6: grub-0.97-printf_hex.patch Patch7: grub-0.97-eficd.patch +Patch8: grub-0.97-xfs-buildfix.patch %description GRUB (Grand Unified Boot Loader) is an experimental boot loader @@ -48,6 +49,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build autoreconf @@ -112,6 +114,7 @@ %changelog * Mon Mar 02 2009 Peter Jones - 0.97-41 - Fix CD Booting on EFI. +- Fix XFS build on x86_64. * Tue Feb 24 2009 Fedora Release Engineering - 0.97-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mclasen at fedoraproject.org Mon Mar 2 20:47:06 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Mar 2009 20:47:06 +0000 (UTC) Subject: rpms/libgtop2/devel libgtop2.spec,1.74,1.75 Message-ID: <20090302204706.19F1370115@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/libgtop2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3082 Modified Files: libgtop2.spec Log Message: fix spec Index: libgtop2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgtop2/devel/libgtop2.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- libgtop2.spec 2 Mar 2009 20:40:46 -0000 1.74 +++ libgtop2.spec 2 Mar 2009 20:46:35 -0000 1.75 @@ -12,13 +12,13 @@ URL: http://download.gnome.org/sources/libgtop/2.26 Group: System Environment/Libraries Source: http://download.gnome.org/sources/libgtop/2.26/libgtop-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: texinfo libtool gettext BuildRequires: intltool %description -libgtop is a library for portably obtaining information about processes, +libgtop is a library for portably obtaining information about processes, such as their PID, memory usage, etc. %package devel From pjones at fedoraproject.org Mon Mar 2 20:48:23 2009 From: pjones at fedoraproject.org (Peter Jones) Date: Mon, 2 Mar 2009 20:48:23 +0000 (UTC) Subject: rpms/grub/devel grub-0.97-xfs-buildfix.patch,NONE,1.1 Message-ID: <20090302204823.2A04070115@cvs1.fedora.phx.redhat.com> Author: pjones Update of /cvs/extras/rpms/grub/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3487 Added Files: grub-0.97-xfs-buildfix.patch Log Message: * Mon Mar 02 2009 Peter Jones - 0.97-41 - Fix CD Booting on EFI. - Fix XFS build on x86_64. grub-0.97-xfs-buildfix.patch: --- NEW FILE grub-0.97-xfs-buildfix.patch --- diff --git a/stage2/fsys_xfs.c b/stage2/fsys_xfs.c index 1c01c3b..eee7576 100644 --- a/stage2/fsys_xfs.c +++ b/stage2/fsys_xfs.c @@ -100,10 +100,14 @@ ino2offset (xfs_ino_t ino) static inline xfs_uint16_t __attribute__((__const__)) le16 (xfs_uint16_t x) { +#if 1 + return ((x & 0xff00) >> 8) | ((x & 0xff) << 8); +#else __asm__("xchgb %b0,%h0" \ : "=q" (x) \ : "0" (x)); \ return x; +#endif } static inline xfs_uint32_t __attribute__((__const__)) From cwickert at fedoraproject.org Mon Mar 2 20:49:23 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Mar 2009 20:49:23 +0000 (UTC) Subject: rpms/libxfcegui4/devel libxfcegui4-4.6.0-keyboard-shortcuts.patch, NONE, 1.1 libxfcegui4.spec, 1.32, 1.33 Message-ID: <20090302204923.6C42070115@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/libxfcegui4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3651 Modified Files: libxfcegui4.spec Added Files: libxfcegui4-4.6.0-keyboard-shortcuts.patch Log Message: Patch to bring back missing keyboard shortcuts from Xfce 4.4 libxfcegui4-4.6.0-keyboard-shortcuts.patch: --- NEW FILE libxfcegui4-4.6.0-keyboard-shortcuts.patch --- --- libxfcegui4-4.6.0.orig/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2009-02-18 09:58:22.000000000 +0100 +++ libxfcegui4-4.6.0/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2009-02-28 21:25:33.000000000 +0100 @@ -3,9 +3,20 @@ + + + + + + + + + + + Index: libxfcegui4.spec =================================================================== RCS file: /cvs/pkgs/rpms/libxfcegui4/devel/libxfcegui4.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- libxfcegui4.spec 2 Mar 2009 20:22:24 -0000 1.32 +++ libxfcegui4.spec 2 Mar 2009 20:48:53 -0000 1.33 @@ -6,6 +6,7 @@ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-%{version}/src/libxfcegui4-%{version}.tar.bz2 Patch0: %{name}-4.4.2-xfce-exec-use-thunar.patch +Patch1: libxfcegui4-4.6.0-keyboard-shortcuts.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: gtk2 >= 2.0.6 @@ -41,6 +42,7 @@ %prep %setup -q %patch0 -p1 -b .thunar +%patch1 -p1 -b .shortcut %build %configure --enable-xinerama --disable-static @@ -94,6 +96,7 @@ %changelog * Mon Mar 02 2009 Christoph Wickert - 4.6.0-3 +- Patch to bring back missing keyboard shortcuts from Xfce 4.4 - Make devel package require pkgconfig and gtk-doc - Mark gtk-doc files as %%doc From jwilson at fedoraproject.org Mon Mar 2 20:51:30 2009 From: jwilson at fedoraproject.org (Jarod Wilson) Date: Mon, 2 Mar 2009 20:51:30 +0000 (UTC) Subject: rpms/kernel/devel kernel.spec, 1.1359, 1.1360 linux-2.6.29-lirc.patch, 1.4, 1.5 Message-ID: <20090302205131.04C5470115@cvs1.fedora.phx.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3969 Modified Files: kernel.spec linux-2.6.29-lirc.patch Log Message: * Mon Mar 02 2009 Jarod Wilson - Change 32-bit x86 %hdrarch from i386 to i586, since we don't build i386 anymore in F11+ Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1359 retrieving revision 1.1360 diff -u -r1.1359 -r1.1360 --- kernel.spec 2 Mar 2009 15:02:27 -0000 1.1359 +++ kernel.spec 2 Mar 2009 20:50:59 -0000 1.1360 @@ -272,7 +272,7 @@ %ifarch %{all_x86} %define asmarch x86 -%define hdrarch i386 +%define hdrarch i586 %define all_arch_configs kernel-%{version}-i?86*.config %define image_install_path boot %define kernel_image arch/x86/boot/bzImage @@ -1795,6 +1795,10 @@ # and build. %changelog +* Mon Mar 02 2009 Jarod Wilson +- Change 32-bit x86 %%hdrarch from i386 to i586, since we + don't build i386 anymore in F11+ + * Mon Mar 02 2009 Kyle McMartin 2.6.29-0.179.rc6.git5 - fix oops in ipv6 when NET_NS is enabled. linux-2.6.29-lirc.patch: Index: linux-2.6.29-lirc.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.29-lirc.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6.29-lirc.patch 27 Feb 2009 17:03:34 -0000 1.4 +++ linux-2.6.29-lirc.patch 2 Mar 2009 20:51:00 -0000 1.5 @@ -1,4 +1,6 @@ -Linux Infrared Remote Control drivers (http://www.lirc.org/) +Linux Infrared Remote Control drivers -- http://www.lirc.org + +From http://git.wilsonet.com/linux-2.6-lirc.git/ Signed-off-by: Jarod Wilson @@ -9,26 +11,26 @@ drivers/input/lirc/Kconfig | 118 +++ drivers/input/lirc/Makefile | 21 + drivers/input/lirc/lirc.h | 100 +++ - drivers/input/lirc/lirc_bt829.c | 381 +++++++++ + drivers/input/lirc/lirc_bt829.c | 383 +++++++++ drivers/input/lirc/lirc_dev.c | 853 +++++++++++++++++++ drivers/input/lirc/lirc_dev.h | 180 ++++ - drivers/input/lirc/lirc_i2c.c | 649 +++++++++++++++ - drivers/input/lirc/lirc_igorplugusb.c | 555 +++++++++++++ - drivers/input/lirc/lirc_imon.c | 1459 +++++++++++++++++++++++++++++++++ + drivers/input/lirc/lirc_i2c.c | 649 ++++++++++++++ + drivers/input/lirc/lirc_igorplugusb.c | 556 ++++++++++++ + drivers/input/lirc/lirc_imon.c | 1487 +++++++++++++++++++++++++++++++++ drivers/input/lirc/lirc_it87.c | 984 ++++++++++++++++++++++ drivers/input/lirc/lirc_it87.h | 116 +++ drivers/input/lirc/lirc_ite8709.c | 539 ++++++++++++ drivers/input/lirc/lirc_mceusb.c | 747 +++++++++++++++++ - drivers/input/lirc/lirc_mceusb2.c | 1097 +++++++++++++++++++++++++ + drivers/input/lirc/lirc_mceusb2.c | 1099 ++++++++++++++++++++++++ drivers/input/lirc/lirc_parallel.c | 709 ++++++++++++++++ drivers/input/lirc/lirc_parallel.h | 26 + - drivers/input/lirc/lirc_sasem.c | 933 +++++++++++++++++++++ + drivers/input/lirc/lirc_sasem.c | 931 +++++++++++++++++++++ drivers/input/lirc/lirc_serial.c | 1321 +++++++++++++++++++++++++++++ - drivers/input/lirc/lirc_sir.c | 1294 +++++++++++++++++++++++++++++ - drivers/input/lirc/lirc_streamzap.c | 773 +++++++++++++++++ + drivers/input/lirc/lirc_sir.c | 1294 ++++++++++++++++++++++++++++ + drivers/input/lirc/lirc_streamzap.c | 775 +++++++++++++++++ drivers/input/lirc/lirc_ttusbir.c | 398 +++++++++ - drivers/input/lirc/lirc_zilog.c | 1382 +++++++++++++++++++++++++++++++ - 25 files changed, 14648 insertions(+), 0 deletions(-) + drivers/input/lirc/lirc_zilog.c | 1382 ++++++++++++++++++++++++++++++ + 25 files changed, 14681 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 59fd2d1..ad1b16c 100644 @@ -332,10 +334,10 @@ +#endif diff --git a/drivers/input/lirc/lirc_bt829.c b/drivers/input/lirc/lirc_bt829.c new file mode 100644 -index 0000000..7981849 +index 0000000..c3852f2 --- /dev/null +++ b/drivers/input/lirc/lirc_bt829.c -@@ -0,0 +1,381 @@ +@@ -0,0 +1,383 @@ +/* + * Remote control driver for the TV-card based on bt829 + * @@ -389,11 +391,13 @@ +#define DATA_PCI_OFF 0x7FFC00 +#define WAIT_CYCLE 20 + ++#define DRIVER_NAME "lirc_bt829" ++ +static int debug; -+#define dprintk(fmt, args...) \ -+ do { \ -+ if (debug) \ -+ printk(KERN_DEBUG fmt, ## args); \ ++#define dprintk(fmt, args...) \ ++ do { \ ++ if (debug) \ ++ printk(KERN_DEBUG DRIVER_NAME ": "fmt, ## args); \ + } while (0) + +static int atir_minor; @@ -408,20 +412,20 @@ + my_dev = pci_get_device(PCI_VENDOR_ID_ATI, + PCI_DEVICE_ID_ATI_264VT, NULL); + if (my_dev) { -+ printk(KERN_ERR "ATIR: Using device: %s\n", ++ printk(KERN_ERR DRIVER_NAME "Using device: %s\n", + pci_name(my_dev)); + pci_addr_phys = 0; + if (my_dev->resource[0].flags & IORESOURCE_MEM) { + pci_addr_phys = my_dev->resource[0].start; -+ printk(KERN_INFO "ATIR memory at 0x%08X \n", ++ printk(KERN_INFO DRIVER_NAME "memory at 0x%08X \n", + (unsigned int)pci_addr_phys); + } + if (pci_addr_phys == 0) { -+ printk(KERN_ERR "ATIR no memory resource ?\n"); ++ printk(KERN_ERR DRIVER_NAME "no memory resource ?\n"); + return NULL; + } + } else { -+ printk(KERN_ERR "ATIR: pci_prob failed\n"); ++ printk(KERN_ERR DRIVER_NAME "pci_probe failed\n"); + return NULL; + } + return my_dev; @@ -434,7 +438,7 @@ + status = poll_main(); + key = (status >> 8) & 0xFF; + if (status & 0xFF) { -+ dprintk("ATIR reading key %02X\n", key); ++ dprintk("reading key %02X\n", key); + lirc_buffer_write(buf, &key); + return 0; + } @@ -443,13 +447,13 @@ + +static int atir_set_use_inc(void *data) +{ -+ dprintk("ATIR driver is opened\n"); ++ dprintk("driver is opened\n"); + return 0; +} + +static void atir_set_use_dec(void *data) +{ -+ dprintk("ATIR driver is closed\n"); ++ dprintk("driver is closed\n"); +} + +int init_module(void) @@ -476,10 +480,10 @@ + + atir_minor = lirc_register_driver(&atir_driver); + if (atir_minor < 0) { -+ printk(KERN_ERR "lirc_bt829: failed to register driver!\n"); ++ printk(KERN_ERR DRIVER_NAME "failed to register driver!\n"); + return atir_minor; + } -+ dprintk("ATIR driver is registered on minor %d\n", atir_minor); ++ dprintk("driver is registered on minor %d\n", atir_minor); + + return 0; +} @@ -495,7 +499,7 @@ +{ + pci_addr_lin = ioremap(pci_addr_phys + DATA_PCI_OFF, 0x400); + if (pci_addr_lin == 0) { -+ printk(KERN_INFO "atir: pci mem must be mapped\n"); ++ printk(KERN_INFO DRIVER_NAME "pci mem must be mapped\n"); + return 0; + } + return 1; @@ -2419,10 +2423,10 @@ +module_exit(lirc_i2c_exit); diff --git a/drivers/input/lirc/lirc_igorplugusb.c b/drivers/input/lirc/lirc_igorplugusb.c new file mode 100644 -index 0000000..51ccd1c +index 0000000..ff49bdd --- /dev/null +++ b/drivers/input/lirc/lirc_igorplugusb.c -@@ -0,0 +1,555 @@ +@@ -0,0 +1,556 @@ +/* + * lirc_igorplugusb - USB remote support for LIRC + * @@ -2885,10 +2889,11 @@ + do_gettimeofday(&ir->last_time); + + if (dev->descriptor.iManufacturer -+ && usb_string(dev, dev->descriptor.iManufacturer, buf, 63) > 0) ++ && usb_string(dev, dev->descriptor.iManufacturer, ++ buf, sizeof(buf)) > 0) + strlcpy(name, buf, sizeof(name)); + if (dev->descriptor.iProduct -+ && usb_string(dev, dev->descriptor.iProduct, buf, 63) > 0) ++ && usb_string(dev, dev->descriptor.iProduct, buf, sizeof(buf)) > 0) + snprintf(name + strlen(name), sizeof(name) - strlen(name), + " %s", buf); + printk(DRIVER_NAME "[%d]: %s on usb%d:%d\n", devnum, name, @@ -2980,12 +2985,12 @@ + diff --git a/drivers/input/lirc/lirc_imon.c b/drivers/input/lirc/lirc_imon.c new file mode 100644 -index 0000000..5655a0d +index 0000000..05cb293 --- /dev/null +++ b/drivers/input/lirc/lirc_imon.c -@@ -0,0 +1,1459 @@ +@@ -0,0 +1,1487 @@ +/* -+ * lirc_imon.c: LIRC/VFD/LCD driver for Ahanix/Soundgraph IMON IR/VFD/LCD ++ * lirc_imon.c: LIRC/VFD/LCD driver for Ahanix/Soundgraph iMON IR/VFD/LCD + * including the iMON PAD model + * + * Copyright(C) 2004 Venky Raju(dev at venky.ws) @@ -3040,6 +3045,10 @@ +static void usb_rx_callback(struct urb *urb); +static void usb_tx_callback(struct urb *urb); + ++/* suspend/resume support */ ++static int imon_resume(struct usb_interface *intf); ++static int imon_suspend(struct usb_interface *intf, pm_message_t message); ++ +/* display file_operations function prototypes */ +static int display_open(struct inode *inode, struct file *file); +static int display_close(struct inode *inode, struct file *file); @@ -3113,7 +3122,7 @@ + IMON_DISPLAY_TYPE_NONE, +}; + -+/* USB Device ID for IMON USB Control Board */ ++/* USB Device ID for iMON USB Control Board */ +static struct usb_device_id imon_usb_id_table[] = { + /* iMON USB Control Board (IR & VFD) */ + { USB_DEVICE(0x0aa8, 0xffda) }, @@ -3220,6 +3229,8 @@ + .name = MOD_NAME, + .probe = imon_probe, + .disconnect = imon_disconnect, ++ .suspend = imon_suspend, ++ .resume = imon_resume, + .id_table = imon_usb_id_table, +}; + @@ -3554,7 +3565,7 @@ + + +/** -+ * Writes data to the VFD. The IMON VFD is 2x16 characters ++ * Writes data to the VFD. The iMON VFD is 2x16 characters + * and requires data in 5 consecutive USB interrupt packets, + * each packet but the last carrying 7 bytes. + * @@ -4120,7 +4131,7 @@ + struct imon_context *context = NULL; + int i; + -+ printk(KERN_INFO "%s: found IMON device\n", __func__); ++ printk(KERN_INFO "%s: found iMON device\n", __func__); + + /* + * If it's the LCD, as opposed to the VFD, we just need to replace @@ -4420,6 +4431,27 @@ + printk(KERN_INFO "%s: iMON device disconnected\n", __func__); +} + ++static int imon_suspend(struct usb_interface *intf, pm_message_t message) ++{ ++ struct imon_context *context = usb_get_intfdata(intf); ++ ++ if (context->ir_isopen) ++ usb_kill_urb(context->rx_urb); ++ ++ return 0; ++} ++ ++static int imon_resume(struct usb_interface *intf) ++{ ++ int rc = 0; ++ struct imon_context *context = usb_get_intfdata(intf); ++ ++ if (context->ir_isopen) ++ rc = usb_submit_urb(context->rx_urb, GFP_ATOMIC); ++ ++ return rc; ++} ++ +static int __init imon_init(void) +{ + int rc; @@ -4432,6 +4464,7 @@ + err("%s: usb register failed(%d)", __func__, rc); + return -ENODEV; + } ++ + return 0; +} + @@ -6855,10 +6888,10 @@ +MODULE_PARM_DESC(debug, "Debug enabled or not"); diff --git a/drivers/input/lirc/lirc_mceusb2.c b/drivers/input/lirc/lirc_mceusb2.c new file mode 100644 -index 0000000..089ee21 +index 0000000..0551adf --- /dev/null +++ b/drivers/input/lirc/lirc_mceusb2.c -@@ -0,0 +1,1097 @@ +@@ -0,0 +1,1099 @@ +/* + * LIRC driver for Philips eHome USB Infrared Transceiver + * and the Microsoft MCE 2005 Remote Control @@ -7804,10 +7837,12 @@ + ir->usb_ep_out = ep_out; + + if (dev->descriptor.iManufacturer -+ && usb_string(dev, dev->descriptor.iManufacturer, buf, 63) > 0) ++ && usb_string(dev, dev->descriptor.iManufacturer, ++ buf, sizeof(buf)) > 0) + strlcpy(name, buf, sizeof(name)); + if (dev->descriptor.iProduct -+ && usb_string(dev, dev->descriptor.iProduct, buf, 63) > 0) ++ && usb_string(dev, dev->descriptor.iProduct, ++ buf, sizeof(buf)) > 0) + snprintf(name + strlen(name), sizeof(name) - strlen(name), + " %s", buf); + printk(DRIVER_NAME "[%d]: %s on usb%d:%d\n", devnum, name, @@ -8705,10 +8740,10 @@ +#endif diff --git a/drivers/input/lirc/lirc_sasem.c b/drivers/input/lirc/lirc_sasem.c new file mode 100644 -index 0000000..3b79372 +index 0000000..270f8ff --- /dev/null +++ b/drivers/input/lirc/lirc_sasem.c -@@ -0,0 +1,933 @@ +@@ -0,0 +1,931 @@ +/* + * lirc_sasem.c - USB remote support for LIRC + * Version 0.5 @@ -8836,8 +8871,6 @@ + .write = &vfd_write, + .ioctl = &vfd_ioctl, + .release = &vfd_close, -+ .read = lirc_dev_fop_read, -+ .poll = lirc_dev_fop_poll, +}; + +/* USB Device ID for Sasem USB Control Board */ @@ -9644,7 +9677,7 @@ +module_exit(sasem_exit); diff --git a/drivers/input/lirc/lirc_serial.c b/drivers/input/lirc/lirc_serial.c new file mode 100644 -index 0000000..692634f +index 0000000..3e9292e --- /dev/null +++ b/drivers/input/lirc/lirc_serial.c @@ -0,0 +1,1321 @@ @@ -10545,10 +10578,10 @@ + msleep(jiffies_to_msecs(HZ/25)); + } + sense = (nlow >= nhigh ? 1 : 0); -+ printk(KERN_INFO LIRC_DRIVER_NAME ": auto-detected active " ++ printk(KERN_INFO LIRC_DRIVER_NAME ": auto-detected active " + "%s receiver\n", sense ? "low" : "high"); + } else -+ printk(KERN_INFO LIRC_DRIVER_NAME ": Manually using active " ++ printk(KERN_INFO LIRC_DRIVER_NAME ": Manually using active " + "%s receiver\n", sense ? "low" : "high"); + + return 0; @@ -12271,10 +12304,10 @@ +MODULE_PARM_DESC(debug, "Enable debugging messages"); diff --git a/drivers/input/lirc/lirc_streamzap.c b/drivers/input/lirc/lirc_streamzap.c new file mode 100644 -index 0000000..f91c1e3 +index 0000000..6db4310 --- /dev/null +++ b/drivers/input/lirc/lirc_streamzap.c -@@ -0,0 +1,773 @@ +@@ -0,0 +1,775 @@ +/* + * Streamzap Remote Control driver + * @@ -12516,7 +12549,7 @@ + lirc_buffer_write(&sz->lirc_buf, + (unsigned char *) &data); + } else { -+ dprintk("buffer overflow\n", sz->driver.minor); ++ dprintk("buffer overflow", sz->driver.minor); + } + } + if (!empty) @@ -12553,7 +12586,7 @@ +} + +static void push_full_pulse(struct usb_streamzap *sz, -+ unsigned char value) ++ unsigned char value) +{ + int pulse; + @@ -12580,23 +12613,23 @@ + sz->sum = 0; + } + -+ pulse = ((int) value)*STREAMZAP_RESOLUTION; -+ pulse += STREAMZAP_RESOLUTION/2; ++ pulse = ((int) value) * STREAMZAP_RESOLUTION; ++ pulse += STREAMZAP_RESOLUTION / 2; + sz->sum += pulse; + pulse |= PULSE_BIT; + -+ dprintk("p %u", sz->driver.minor, pulse&PULSE_MASK); ++ dprintk("p %u", sz->driver.minor, pulse & PULSE_MASK); + push(sz, (char *)&pulse); +} + +static void push_half_pulse(struct usb_streamzap *sz, -+ unsigned char value) ++ unsigned char value) +{ + push_full_pulse(sz, (value & STREAMZAP_PULSE_MASK)>>4); +} + +static void push_full_space(struct usb_streamzap *sz, -+ unsigned char value) ++ unsigned char value) +{ + int space; + @@ -12608,7 +12641,7 @@ +} + +static void push_half_space(struct usb_streamzap *sz, -+ unsigned char value) ++ unsigned char value) +{ + push_full_space(sz, value & STREAMZAP_SPACE_MASK); +} @@ -12821,11 +12854,13 @@ + sz->endpoint->bInterval); + + if (udev->descriptor.iManufacturer -+ && usb_string(udev, udev->descriptor.iManufacturer, buf, 63) > 0) ++ && usb_string(udev, udev->descriptor.iManufacturer, ++ buf, sizeof(buf)) > 0) + strlcpy(name, buf, sizeof(name)); + + if (udev->descriptor.iProduct -+ && usb_string(udev, udev->descriptor.iProduct, buf, 63) > 0) ++ && usb_string(udev, udev->descriptor.iProduct, ++ buf, sizeof(buf)) > 0) + snprintf(name + strlen(name), sizeof(name) - strlen(name), + " %s", buf); + @@ -12974,7 +13009,7 @@ +{ + struct usb_streamzap *sz = usb_get_intfdata(intf); + -+ printk(DRIVER_NAME "[%d]: suspend\n", sz->driver.minor); ++ printk(KERN_INFO DRIVER_NAME "[%d]: suspend\n", sz->driver.minor); + if (sz->in_use) { + if (sz->flush) { + sz->flush = 0; From cwickert at fedoraproject.org Mon Mar 2 20:55:11 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Mar 2009 20:55:11 +0000 (UTC) Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.33,1.34 Message-ID: <20090302205511.903AF70115@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/libxfcegui4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4692 Modified Files: libxfcegui4.spec Log Message: * Mon Mar 02 2009 Christoph Wickert - 4.6.0-3 - Patch to bring back missing keyboard shortcuts from Xfce 4.4 - Make devel package require glade3-libgladeui-devel, pkgconfig and gtk-doc - Mark gtk-doc files as %doc Index: libxfcegui4.spec =================================================================== RCS file: /cvs/pkgs/rpms/libxfcegui4/devel/libxfcegui4.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- libxfcegui4.spec 2 Mar 2009 20:48:53 -0000 1.33 +++ libxfcegui4.spec 2 Mar 2009 20:54:41 -0000 1.34 @@ -27,11 +27,12 @@ The package includes various gtk widgets for Xfce. %package devel -Summary: Developpment tools for libxfcegui4 library +Summary: Development tools for libxfcegui4 library Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: gtk2-devel Requires: libxfce4util-devel +Requires: glade3-libgladeui-devel Requires: pkgconfig Requires: gtk-doc @@ -97,7 +98,7 @@ %changelog * Mon Mar 02 2009 Christoph Wickert - 4.6.0-3 - Patch to bring back missing keyboard shortcuts from Xfce 4.4 -- Make devel package require pkgconfig and gtk-doc +- Make devel package require glade3-libgladeui-devel, pkgconfig and gtk-doc - Mark gtk-doc files as %%doc * Fri Feb 27 2009 Kevin Fenzi - 4.6.0-2 From jwilson at fedoraproject.org Mon Mar 2 20:55:05 2009 From: jwilson at fedoraproject.org (Jarod Wilson) Date: Mon, 2 Mar 2009 20:55:05 +0000 (UTC) Subject: rpms/cpuspeed/devel cpuspeed.spec,1.73,1.74 Message-ID: <20090302205505.BECBB70115@cvs1.fedora.phx.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/cpuspeed/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4629 Modified Files: cpuspeed.spec Log Message: * Mon Mar 02 2009 Jarod Wilson 1.5-4 - Fix up ExclusiveArch, now that 32-bit x86 is built i586 for F11 Index: cpuspeed.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- cpuspeed.spec 24 Feb 2009 09:33:52 -0000 1.73 +++ cpuspeed.spec 2 Mar 2009 20:54:35 -0000 1.74 @@ -1,7 +1,7 @@ Summary: CPU frequency adjusting daemon Name: cpuspeed Version: 1.5 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Group: System Environment/Base License: GPLv2+ @@ -17,7 +17,7 @@ Requires(preun): /sbin/service BuildRequires: automake util-linux groff gettext -ExclusiveArch: i386 x86_64 ppc ppc64 ia64 sparcv9 sparc64 +ExclusiveArch: %{ix86} x86_64 ppc ppc64 ia64 sparcv9 sparc64 Obsoletes: kernel-utils Patch1: cpuspeed-1.5-Makefile.patch @@ -81,6 +81,9 @@ exit 0 %changelog +* Mon Mar 02 2009 Jarod Wilson 1.5-4 +- Fix up ExclusiveArch, now that 32-bit x86 is built i586 for F11 + * Tue Feb 24 2009 Fedora Release Engineering - 1:1.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Mon Mar 2 20:59:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 20:59:01 +0000 Subject: [pkgdb] python-quixote ownership updated Message-ID: <20090302205900.C38AD20820B@bastion.fedora.phx.redhat.com> Package python-quixote in Fedora devel is now owned by maxamillion To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-quixote From pkgdb at fedoraproject.org Mon Mar 2 20:58:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 20:58:41 +0000 Subject: [pkgdb] python-quixote ownership updated Message-ID: <20090302205902.BDCFB2084BA@bastion.fedora.phx.redhat.com> Package python-quixote in Fedora 10 is now owned by maxamillion To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-quixote From pkgdb at fedoraproject.org Mon Mar 2 20:59:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 20:59:04 +0000 Subject: [pkgdb] python-quixote ownership updated Message-ID: <20090302205904.58A9B2084D2@bastion.fedora.phx.redhat.com> Package python-quixote in Fedora 9 is now owned by maxamillion To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-quixote From pkgdb at fedoraproject.org Mon Mar 2 20:59:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 20:59:49 +0000 Subject: [pkgdb] python-tpg ownership updated Message-ID: <20090302210021.B533F208480@bastion.fedora.phx.redhat.com> Package python-tpg in Fedora devel is now owned by maxamillion To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tpg From pkgdb at fedoraproject.org Mon Mar 2 21:00:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:00:02 +0000 Subject: [pkgdb] python-tpg ownership updated Message-ID: <20090302210024.801662084BA@bastion.fedora.phx.redhat.com> Package python-tpg in Fedora 10 is now owned by maxamillion To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tpg From pkgdb at fedoraproject.org Mon Mar 2 21:00:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:00:24 +0000 Subject: [pkgdb] python-tpg ownership updated Message-ID: <20090302210025.293F62084D2@bastion.fedora.phx.redhat.com> Package python-tpg in Fedora 9 is now owned by maxamillion To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tpg From steved at fedoraproject.org Mon Mar 2 20:59:58 2009 From: steved at fedoraproject.org (Steve Dickson) Date: Mon, 2 Mar 2009 20:59:58 +0000 (UTC) Subject: rpms/kernel/devel linux-2.6.29.rc5-nfs41-030208.patch, NONE, 1.1.2.1 config-generic, 1.250, 1.250.2.1 kernel.spec, 1.1359, 1.1359.2.1 Message-ID: <20090302205958.464E370115@cvs1.fedora.phx.redhat.com> Author: steved Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5394 Modified Files: Tag: kernel-2_6_29-nfs41_030208 config-generic kernel.spec Added Files: Tag: kernel-2_6_29-nfs41_030208 linux-2.6.29.rc5-nfs41-030208.patch Log Message: Update to latest nfs41 patches. linux-2.6.29.rc5-nfs41-030208.patch: --- NEW FILE linux-2.6.29.rc5-nfs41-030208.patch --- diff -up linux-2.6.28.noarch/fs/nfs/callback.c.orig linux-2.6.28.noarch/fs/nfs/callback.c --- linux-2.6.28.noarch/fs/nfs/callback.c.orig 2009-03-02 13:25:05.000000000 -0500 +++ linux-2.6.28.noarch/fs/nfs/callback.c 2009-03-02 13:29:52.000000000 -0500 @@ -17,6 +17,9 @@ #include #include #include +#if defined(CONFIG_NFS_V4_1) +#include +#endif #include @@ -28,11 +31,12 @@ struct nfs_callback_data { unsigned int users; + struct svc_serv *serv; struct svc_rqst *rqst; struct task_struct *task; }; -static struct nfs_callback_data nfs_callback_info; +static struct nfs_callback_data nfs_callback_info[NFS4_MAX_MINOR_VERSION + 1]; static DEFINE_MUTEX(nfs_callback_mutex); static struct svc_program nfs4_callback_program; @@ -65,10 +69,10 @@ module_param_call(callback_tcpport, para &nfs_callback_set_tcpport, 0644); /* - * This is the callback kernel thread. + * This is the NFSv4 callback kernel thread. */ static int -nfs_callback_svc(void *vrqstp) +nfs4_callback_svc(void *vrqstp) { int err, preverr = 0; struct svc_rqst *rqstp = vrqstp; @@ -105,48 +109,163 @@ nfs_callback_svc(void *vrqstp) return 0; } + +/* + * Prepare to bring up the NFSv4 callback service + */ +struct svc_rqst * +nfs4_callback_up(struct svc_serv *serv) +{ + int ret; + + ret = svc_create_xprt(serv, "tcp", nfs_callback_set_tcpport, + SVC_SOCK_ANONYMOUS); + if (unlikely(ret <= 0)) { + if (ret == 0) + ret = -EIO; + return ERR_PTR(ret); + } + nfs_callback_tcpport = ret; + dprintk("NFS: Callback listener port = %u (af %u)\n", + nfs_callback_tcpport, nfs_callback_family); + return svc_prepare_thread(serv, &serv->sv_pools[0]); +} + +#if defined(CONFIG_NFS_V4_1) +/* + * The callback service for NFSv4.1 callbacks + */ +static int +nfs41_callback_svc(void *vrqstp) +{ + struct svc_rqst *rqstp = vrqstp; + struct svc_serv *serv = rqstp->rq_server; + struct rpc_rqst *req; + int error; + DEFINE_WAIT(wq); + + set_freezable(); + + /* + * FIXME: do we really need to run this under the BKL? If so, please + * add a comment about what it's intended to protect. + */ + lock_kernel(); + while (!kthread_should_stop()) { + prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_INTERRUPTIBLE); + spin_lock_bh(&serv->sv_cb_lock); + if (!list_empty(&serv->sv_cb_list)) { + req = list_first_entry(&serv->sv_cb_list, + struct rpc_rqst, rq_bc_list); + list_del(&req->rq_bc_list); + spin_unlock_bh(&serv->sv_cb_lock); + dprintk("Invoking bc_svc_process()\n"); + error = bc_svc_process(serv, req, rqstp); + dprintk("bc_svc_process() returned w/ error code= %d\n", + error); + } else { + spin_unlock_bh(&serv->sv_cb_lock); + schedule(); + } + finish_wait(&serv->sv_cb_waitq, &wq); + } + unlock_kernel(); + return 0; +} + +/* + * Bring up the NFSv4.1 callback service + */ +struct svc_rqst * +nfs41_callback_up(struct svc_serv *serv, struct rpc_xprt *xprt) +{ + struct svc_xprt *bc_xprt; + struct svc_rqst *rqstp = ERR_PTR(-ENOMEM); + + dprintk("--> %s\n", __func__); + /* Create a svc_sock for the service */ + bc_xprt = svc_sock_create(serv, xprt->prot); + if (!bc_xprt) + goto out; + + /* + * Save the svc_serv in the transport so that it can + * be referenced when the session backchannel is initialized + */ + serv->bc_xprt = bc_xprt; + xprt->bc_serv = serv; + + INIT_LIST_HEAD(&serv->sv_cb_list); + spin_lock_init(&serv->sv_cb_lock); + init_waitqueue_head(&serv->sv_cb_waitq); + rqstp = svc_prepare_thread(serv, &serv->sv_pools[0]); + if (IS_ERR(rqstp)) + svc_sock_destroy(bc_xprt); +out: + dprintk("--> %s return %p\n", __func__, rqstp); + return rqstp; +} +#endif /* CONFIG_NFS_V4_1 */ + /* * Bring up the callback thread if it is not already up. */ -int nfs_callback_up(void) +int nfs_callback_up(u32 minorversion, void *args) { struct svc_serv *serv = NULL; + struct svc_rqst *rqst; + int (* callback_svc)(void *vrqstp); + struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion]; + char svc_name[12]; int ret = 0; +#if defined(CONFIG_NFS_V4_1) + struct rpc_xprt *xprt = (struct rpc_xprt *)args; +#endif /* CONFIG_NFS_V4_1 */ mutex_lock(&nfs_callback_mutex); - if (nfs_callback_info.users++ || nfs_callback_info.task != NULL) + if (cb_info->users++ || cb_info->task != NULL) { +#if defined(CONFIG_NFS_V4_1) + if (minorversion) + xprt->bc_serv = cb_info->serv; +#endif /* CONFIG_NFS_V4_1 */ goto out; + } serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, nfs_callback_family, NULL); - ret = -ENOMEM; - if (!serv) - goto out_err; - - ret = svc_create_xprt(serv, "tcp", nfs_callback_set_tcpport, - SVC_SOCK_ANONYMOUS); - if (ret <= 0) + if (!serv) { + ret = -ENOMEM; goto out_err; - nfs_callback_tcpport = ret; - dprintk("NFS: Callback listener port = %u (af %u)\n", - nfs_callback_tcpport, nfs_callback_family); + } - nfs_callback_info.rqst = svc_prepare_thread(serv, &serv->sv_pools[0]); - if (IS_ERR(nfs_callback_info.rqst)) { - ret = PTR_ERR(nfs_callback_info.rqst); - nfs_callback_info.rqst = NULL; + /* FIXME: either 4.0 or 4.1 callback service can be up at a time + * need to monitor and control them both */ + if (!minorversion) { + rqst = nfs4_callback_up(serv); + callback_svc = nfs4_callback_svc; + } else { +#if defined(CONFIG_NFS_V4_1) + rqst = nfs41_callback_up(serv, xprt); + callback_svc = nfs41_callback_svc; +#else /* CONFIG_NFS_V4_1 */ + BUG(); [...12153 lines suppressed...] + /* + * send page data + * + * Check the amount of data to be sent. If it is less than the + * remaining page, then send it else send the current page + */ + + size = PAGE_SIZE - base < pglen ? PAGE_SIZE - base : pglen; + while (pglen > 0) { + if (total_len == size) + flags = 0; + result = sock->ops->sendpage(sock, *pages, base, size, flags); + if (result > 0) + len += result; + if (result != size) + goto out; + total_len -= size; + pglen -= size; + size = PAGE_SIZE < pglen ? PAGE_SIZE : pglen; + base = 0; + pages++; + } + /* + * send tail + */ + if (xbufp->tail[0].iov_len) { + result = sock->ops->sendpage(sock, + xbufp->tail[0].iov_base, + (unsigned long)xbufp->tail[0].iov_base & ~PAGE_MASK, + xbufp->tail[0].iov_len, + 0); + + if (result > 0) + len += result; + } +out: + if (len != xbufp->len) + printk(KERN_NOTICE "Error sending entire callback!\n"); + + return len; +} + +/* + * The send routine. Borrows from svc_send + */ +static int bc_send_request(struct rpc_task *task) +{ + struct rpc_rqst *req = task->tk_rqstp; + struct rpc_xprt *bc_xprt = req->rq_xprt; + struct svc_xprt *xprt; + struct svc_sock *svsk; + u32 len; + + dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid)); + /* + * Get the server socket associated with this callback xprt + */ + svsk = bc_xprt->bc_sock; + xprt = &svsk->sk_xprt; + + mutex_lock(&xprt->xpt_mutex); + if (test_bit(XPT_DEAD, &xprt->xpt_flags)) + len = -ENOTCONN; + else + len = bc_sendto(req); + mutex_unlock(&xprt->xpt_mutex); + + return 0; + +} + +/* + * The close routine. Since this is client initiated, we do nothing + */ + +static void bc_close(struct rpc_xprt *xprt) +{ + return; +} + +/* + * The xprt destroy routine. Again, because this connection is client + * initiated, we do nothing + */ + +static void bc_destroy(struct rpc_xprt *xprt) +{ + return; +} +#endif /* CONFIG_NFSD_V4_1 */ + static struct rpc_xprt_ops xs_udp_ops = { .set_buffer_size = xs_udp_set_buffer_size, .reserve_xprt = xprt_reserve_xprt_cong, @@ -1899,11 +2266,34 @@ static struct rpc_xprt_ops xs_tcp_ops = .buf_free = rpc_free, .send_request = xs_tcp_send_request, .set_retrans_timeout = xprt_set_retrans_timeout_def, +#if defined(CONFIG_NFS_V4_1) + .release_request = bc_release_request, +#endif /* CONFIG_NFS_V4_1 */ .close = xs_tcp_shutdown, .destroy = xs_destroy, .print_stats = xs_tcp_print_stats, }; +#if defined(CONFIG_NFSD_V4_1) +/* + * The rpc_xprt_ops for the server backchannel + */ + +static struct rpc_xprt_ops bc_tcp_ops = { + .reserve_xprt = xprt_reserve_xprt, + .release_xprt = xprt_release_xprt, + .set_port = bc_set_port, + .connect = bc_connect, + .buf_alloc = bc_malloc, + .buf_free = bc_free, + .send_request = bc_send_request, + .set_retrans_timeout = xprt_set_retrans_timeout_def, + .close = bc_close, + .destroy = bc_destroy, + .print_stats = xs_tcp_print_stats, +}; +#endif /* CONFIG_NFSD_V4_1 */ + static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args, unsigned int slot_table_size) { @@ -2036,13 +2426,31 @@ static struct rpc_xprt *xs_setup_tcp(str xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32); xprt->max_payload = RPC_MAX_FRAGMENT_SIZE; - xprt->bind_timeout = XS_BIND_TO; - xprt->connect_timeout = XS_TCP_CONN_TO; - xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO; - xprt->idle_timeout = XS_IDLE_DISC_TO; +#ifdef CONFIG_NFSD_V4_1 + if (args->bc_sock) { + /* backchannel */ + xprt_set_bound(xprt); + INIT_DELAYED_WORK(&transport->connect_worker, + bc_connect_worker); + xprt->bind_timeout = 0; + xprt->connect_timeout = 0; + xprt->reestablish_timeout = 0; + xprt->idle_timeout = (~0); - xprt->ops = &xs_tcp_ops; - xprt->timeout = &xs_tcp_default_timeout; + /* + * The backchannel uses the same socket connection as the + * forechannel + */ + xprt->bc_sock = args->bc_sock; + xprt->bc_sock->sk_bc_xprt = xprt; + transport->sock = xprt->bc_sock->sk_sock; + transport->inet = xprt->bc_sock->sk_sk; + + xprt->ops = &bc_tcp_ops; + + goto next; + } +#endif /* CONFIG_NFSD_V4_1 */ switch (addr->sa_family) { case AF_INET: @@ -2050,13 +2458,31 @@ static struct rpc_xprt *xs_setup_tcp(str xprt_set_bound(xprt); INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4); - xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP); break; case AF_INET6: if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0)) xprt_set_bound(xprt); INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker6); + break; + } + xprt->bind_timeout = XS_BIND_TO; + xprt->connect_timeout = XS_TCP_CONN_TO; + xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO; + xprt->idle_timeout = XS_IDLE_DISC_TO; + + xprt->ops = &xs_tcp_ops; + +#ifdef CONFIG_NFSD_V4_1 +next: +#endif /* CONFIG_NFSD_V4_1 */ + xprt->timeout = &xs_tcp_default_timeout; + + switch (addr->sa_family) { + case AF_INET: + xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP); + break; + case AF_INET6: xs_format_ipv6_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6); break; default: Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.250 retrieving revision 1.250.2.1 diff -u -r1.250 -r1.250.2.1 --- config-generic 28 Feb 2009 15:35:25 -0000 1.250 +++ config-generic 2 Mar 2009 20:59:27 -0000 1.250.2.1 @@ -3154,6 +3154,12 @@ CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_TCP=y +# +# Needed for NFSv41 +# +CONFIG_NFS_V4_1=y +CONFIG_NFSD_V4_1=y + CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1359 retrieving revision 1.1359.2.1 diff -u -r1.1359 -r1.1359.2.1 --- kernel.spec 2 Mar 2009 15:02:27 -0000 1.1359 +++ kernel.spec 2 Mar 2009 20:59:27 -0000 1.1359.2.1 @@ -12,7 +12,7 @@ # that the kernel isn't the stock distribution kernel, for example, # by setting the define to ".local" or ".bz123456" # -# % define buildid .local +%define buildid .nfs41_030208 # fedora_build defines which build revision of this kernel version we're # building. Rather than incrementing forever, as with the prior versioning @@ -678,6 +678,7 @@ Patch9001: revert-fix-modules_install-via-nfs.patch +Patch9100: linux-2.6.29.rc5-nfs41-030208.patch %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1212,6 +1213,8 @@ ApplyPatch linux-2.6.28-lockd-svc-register.patch +ApplyPatch linux-2.6.29.rc5-nfs41-030208.patch + # END OF PATCH APPLICATIONS %endif @@ -1795,6 +1798,9 @@ # and build. %changelog +* Mon Mar 2 2009 Steve Dickskno 2.6.29.rc6-nfs41_030208 +- Update to latest nfs41 patches. + * Mon Mar 02 2009 Kyle McMartin 2.6.29-0.179.rc6.git5 - fix oops in ipv6 when NET_NS is enabled. From lyosnorezel at fedoraproject.org Mon Mar 2 21:00:36 2009 From: lyosnorezel at fedoraproject.org (Lyos Gemini Norezel) Date: Mon, 2 Mar 2009 21:00:36 +0000 (UTC) Subject: rpms/thibault-fonts/devel import.log, 1.2, 1.3 thibault-fonts.spec, 1.4, 1.5 Message-ID: <20090302210036.6039370115@cvs1.fedora.phx.redhat.com> Author: lyosnorezel Update of /cvs/pkgs/rpms/thibault-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5578/devel Modified Files: import.log thibault-fonts.spec Log Message: Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/thibault-fonts/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 12 Jan 2009 02:03:20 -0000 1.2 +++ import.log 2 Mar 2009 21:00:06 -0000 1.3 @@ -1,2 +1,3 @@ thibault-fonts-0_1-1_fc9:HEAD:thibault-fonts-0.1-1.fc9.src.rpm:1217662070 thibault-fonts-0_1-3_fc11:HEAD:thibault-fonts-0.1-3.fc11.src.rpm:1231725737 +thibault-fonts-0_1-5_fc10:HEAD:thibault-fonts-0.1-5.fc10.src.rpm:1236027541 Index: thibault-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/thibault-fonts/devel/thibault-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- thibault-fonts.spec 25 Feb 2009 20:26:46 -0000 1.4 +++ thibault-fonts.spec 2 Mar 2009 21:00:06 -0000 1.5 @@ -1,15 +1,17 @@ -%define fontname thibault -%define conf1 69-essays1743.conf -%define conf2 69-isabella.conf -%define conf3 69-rockets.conf -%define conf4 69-staypuft.conf +%global fontname thibault +%global conf1 69-essays1743.conf +%global conf2 69-isabella.conf +%global conf3 69-rockets.conf +%global conf4 69-staypuft.conf %define common_desc \ -A collection of fonts from thibault.org, including Isabella, Essays1743, StayPuft, and Rockets. +A collection of fonts from thibault.org,\ +including Isabella, Essays1743, StayPuft,\ +and Rockets. Name: %{fontname}-fonts Version: 0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Thibault.org font collection Group: User Interface/X @@ -28,7 +30,7 @@ #Not included due to legal concerns #Engadget: A sort of modernistic font done to match the logo of http://www.engadget.com -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: fontpackages-devel @@ -47,13 +49,14 @@ This package consists of files used by other %{name} packages. -%package essays1743 +%package -n %{fontname}-essays1743-fonts Summary: Thibault.org Montaigne's Essays typeface font -Group: User Interface/X + Requires: %{name}-common = %{version}-%{release} +Obsoletes: %{name}-essays1743 < 0.1-4 -%description essays1743 +%description -n %{fontname}-essays1743-fonts %common_desc A font by John Stracke, based on the @@ -62,13 +65,14 @@ %_font_pkg -n essays1743 -f %{conf1} Essays1743*.ttf -%package isabella +%package -n %{fontname}-isabella-fonts Summary: Thibault.org Isabella Breviary calligraphic font -Group: User Interface/X + Requires: %{name}-common = %{version}-%{release} +Obsoletes: %{name}-isabella < 0.1-4 -%description isabella +%description -n %{fontname}-isabella-fonts %common_desc This font is called Isabella because it is based on the @@ -77,13 +81,14 @@ %_font_pkg -n isabella -f %{conf2} Isabella*.ttf -%package rockets +%package -n %{fontname}-rockets-fonts Summary: Thibault.org font, vaguely space themed -Group: User Interface/X + Requires: %{name}-common = %{version}-%{release} +Obsoletes: %{name}-rockets < 0.1-4 -%description rockets +%description -n %{fontname}-rockets-fonts %common_desc This font is called Rockets because it's vaguely space @@ -93,13 +98,14 @@ %_font_pkg -n rockets -f %{conf3} Rockets*.ttf -%package staypuft +%package -n %{fontname}-staypuft-fonts Summary: Thibault.org font, rounded and marshmellowy -Group: User Interface/X + Requires: %{name}-common = %{version}-%{release} +Obsoletes: %{name}-staypuft < 0.1-4 -%description staypuft +%description -n %{fontname}-staypuft-fonts %common_desc A rounded marshmellow type font. Good for frivolous things @@ -147,6 +153,7 @@ install -m 0644 -p %{SOURCE4} \ %{buildroot}%{_fontconfig_templatedir}/%{conf1} + install -m 0644 -p %{SOURCE5} \ %{buildroot}%{_fontconfig_templatedir}/%{conf2} @@ -173,21 +180,18 @@ %doc isabella/COPYING.LIB isabella/README.txt %doc rockets/COPYING.LIB rockets/README.txt %doc staypuft/COPYING.LIB staypuft/README.txt -%dir %{_fontdir}/ -%{_fontdir}/Essays1743*.ttf -%dir %{_fontdir}/ -%{_fontdir}/Isabella.ttf -%dir %{_fontdir}/ -%{_fontdir}/Rockets.ttf -%dir %{_fontdir}/ -%{_fontdir}/StayPuft.ttf %changelog + +#thibault +* Mon Mar 2 2009 Lyos Gemini Norezel 0.1-5 +- Fixed errors in previous modifications. +- Updated for latest policy changes. +- Deleted erroneous edits made by jkeating. + * Wed Feb 25 2009 Fedora Release Engineering - 0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -#thibault * Sun Jan 11 2009 Lyos Gemini Norezel 0.1-3 - Modified spec file to comply with new policy changes. From cwickert at fedoraproject.org Mon Mar 2 21:00:52 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Mar 2009 21:00:52 +0000 (UTC) Subject: rpms/libxfce4menu/devel libxfce4menu.spec,1.5,1.6 Message-ID: <20090302210052.DC7C870115@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/libxfce4menu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5746 Modified Files: libxfce4menu.spec Log Message: * Mon Mar 02 2009 Christoph Wickert - 4.6.0-2 - Fix directory ownership problems - Mark gtk-doc files as %doc Index: libxfce4menu.spec =================================================================== RCS file: /cvs/pkgs/rpms/libxfce4menu/devel/libxfce4menu.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libxfce4menu.spec 27 Feb 2009 20:01:12 -0000 1.5 +++ libxfce4menu.spec 2 Mar 2009 21:00:22 -0000 1.6 @@ -1,6 +1,6 @@ Name: libxfce4menu Version: 4.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A freedesktop.org compliant menu implementation for Xfce Group: System Environment/Libraries @@ -24,6 +24,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig +Requires: libxfce4util-devel %description devel The %{name}-devel package contains libraries and header files for @@ -57,12 +58,16 @@ %files devel %defattr(-,root,root,-) -%{_includedir}/* +%{_includedir}/xfce4/* %{_libdir}/*.so -%{_datadir}/gtk-doc/html/libxfce4menu +%doc %{_datadir}/gtk-doc/html/libxfce4menu %{_libdir}/pkgconfig/%{name}-0.1.pc %changelog +* Mon Mar 02 2009 Christoph Wickert - 4.6.0-2 +- Fix directory ownership problems +- Mark gtk-doc files as %%doc + * Thu Feb 26 2009 Kevin Fenzi - 4.6.0-1 - Update to 4.6.0 final From kevin at fedoraproject.org Mon Mar 2 21:07:19 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 2 Mar 2009 21:07:19 +0000 (UTC) Subject: rpms/levien-inconsolata-fonts/devel Inconsolata.sfd, NONE, 1.1 import.log, NONE, 1.1 levien-inconsolata-fonts-fontconfig.conf, NONE, 1.1 levien-inconsolata-fonts.spec, NONE, 1.1 Message-ID: <20090302210719.9BD7D70115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/extras/rpms/levien-inconsolata-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7392/devel Added Files: Inconsolata.sfd import.log levien-inconsolata-fonts-fontconfig.conf levien-inconsolata-fonts.spec Log Message: Initial version import into fedora --- NEW FILE Inconsolata.sfd --- SplineFontDB: 3.0 FontName: Inconsolata FullName: Inconsolata FamilyName: Inconsolata Weight: Medium Copyright: Created by Raph Levien using his own tools and FontForge. Copyright 2006 Raph Levien. Released under the SIL Open Font License, http://scripts.sil.org/OFL. UComments: "2005-8-26: Created." Version: 001.010 ItalicAngle: 0 UnderlinePosition: -100 UnderlineWidth: 50 Ascent: 820 Descent: 180 LayerCount: 2 Layer: 0 0 "Back" 1 Layer: 1 0 "Fore" 0 XUID: [1021 77 1780377399 11264577] FSType: 8 OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 0 CreationTime: 1161020814 ModificationTime: 1234036730 PfmFamily: 17 TTFWeight: 500 TTFWidth: 5 LineGap: 200 VLineGap: 0 Panose: 2 11 6 9 3 0 3 0 0 0 OS2TypoAscent: 0 OS2TypoAOffset: 1 OS2TypoDescent: 0 OS2TypoDOffset: 1 OS2TypoLinegap: 0 OS2WinAscent: 0 OS2WinAOffset: 1 OS2WinDescent: 0 OS2WinDOffset: 1 HheadAscent: 0 HheadAOffset: 1 HheadDescent: 0 HheadDOffset: 1 OS2Vendor: 'PfEd' DEI: 91125 LangName: 1033 Encoding: Custom UnicodeInterp: none NameList: Adobe Glyph List DisplaySize: -36 AntiAlias: 1 FitToEm: 1 WinInfo: 64 16 14 Grid 168 917 m 25 406.5 917 l 25 EndSplineSet TeXData: 1 0 0 629145 314572 209715 554697 1048576 209715 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 BeginChars: 359 294 StartChar: a Encoding: 97 97 0 Width: 600 Flags: HMW TeX: 97 0 LayerCount: 2 Fore SplineSet 115 467 m 0 164.456 518.083 232.512 541.055 303.925 541.055 c 0 386.091 541.055 453.267 510.995 488.008 453.097 c 0 512.442 412.375 514 371.39 514 328 c 0 514 0 l 0 435 0 l 0 435 58 l 0 377.24 10.665 309.94 -13.0023 244.918 -13.0023 c 0 134.316 -13.0023 66.8187 59.1626 66.8187 136.825 c 0 66.8187 195.507 104.707 257.379 188.205 288.065 c 0 255.557 312.817 339.023 312 417 312 c 0 434 312 l 0 434 331 l 0 434 359.055 434.409 393.114 416.772 422.078 c 0 401.83 446.615 370.745 473.031 307.869 473.031 c 0 258.955 473.031 199.358 459.393 156 414 c 0 115 467 l 0 437 248 m 0 418 248 l 0 362.991 248 292.114 251.465 244.035 239.987 c 0 177.665 224.143 150.668 180.909 150.668 142.456 c 0 150.668 95.137 191.681 50.8142 261.864 50.8142 c 0 331.199 50.8142 381.823 92.8437 401.058 113.287 c 0 436.77 151.242 437 185.578 437 213 c 0 437 248 l 0 EndSplineSet EndChar StartChar: c Encoding: 99 99 1 Width: 600 Flags: HMW TeX: 99 0 LayerCount: 2 Fore SplineSet 539 442 m 4 480 373 l 4 470.825 379.924 477.126 390.809 472.703 399.753 c 4 469.634 405.96 426.164 469.074 335.78 469.074 c 4 238.504 469.074 160.969 393.768 160.969 273.126 c 4 160.969 149.42 239.6 62.9789 342.756 62.9789 c 4 395.811 62.9789 447.209 86.4429 483 127 c 4 531 71 l 4 480.516 16.5812 409.687 -13.0011 335.781 -13.0011 c 4 186.048 -13.0011 74.9996 104.892 74.9996 264.509 c 4 74.9996 423.38 185.476 540.028 341.051 540.028 c 4 426.18 540.028 497.315 503.103 539 442 c 4 EndSplineSet EndChar StartChar: m Encoding: 109 109 2 Width: 600 Flags: HMW TeX: 109 0 LayerCount: 2 Fore SplineSet 54 0 m 0 54 529 l 0 131 529 l 0 130 477 l 0 154.337 514.017 194.92 542.056 238.342 542.056 c 0 285.783 542.056 323.7 508.722 332 465 c 0 352.564 511.823 399.84 542.002 450.616 542.002 c 0 480.394 542.002 513.14 530.575 533.429 499.943 c 0 556.856 464.574 555 419.808 555 376 c 0 555 -1 l 0 476 -1 l 0 476 375 l 0 476 399.068 478.585 429.361 468.835 451.652 c 0 460.274 471.228 443.933 481.204 426.805 481.204 c 0 394.659 481.204 374.014 448.262 365.249 433.479 c 0 345.703 400.513 343 377.821 343 350 c 0 343 0 l 0 265 0 l 0 265 368 l 0 265 389.832 266.608 415.372 259.774 437.513 c 0 250.804 466.572 229.599 478.297 210.74 478.297 c 0 189.54 478.297 165.885 464.471 146.732 428.907 c 0 131.729 401.049 130 377.928 130 353 c 0 130 0 l 0 54 0 l 0 EndSplineSet EndChar StartChar: s Encoding: 115 115 3 Width: 600 Flags: HMW TeX: 115 0 LayerCount: 2 Fore SplineSet 511 459 m 0 462 386 l 0 459.954 386.487 455.921 388.387 455.967 395.318 c 0 455.994 399.389 456.754 402.17 453.49 406.383 c 0 433.342 432.386 382.005 479.074 306.539 479.074 c 0 246.687 479.074 195 449.386 195 406.786 c 0 195 389 204.202 363.327 247.446 342.429 c 0 296.926 318.517 382.175 306.563 441.996 272.983 c 0 504.635 237.822 519.699 189.926 519.699 153.285 c 0 519.699 73.3785 444.137 -12.0003 299.462 -12.0003 c 0 219.049 -12.0003 138.142 14.2177 76 72 c 0 124 155 l 0 129.709 152.331 129.203 145.694 129.13 144.104 c 0 128.917 139.47 128.401 136.208 132.349 131.72 c 0 149.099 112.681 207.222 58 297.964 58 c 0 373.592 58 434.068 92.1676 434.068 141.757 c 0 434.068 160.887 424.919 188.765 381.245 209.208 c 0 342.194 227.486 283.74 241.548 238.968 257.732 c 0 210.234 268.119 109.997 301.799 109.997 394.231 c 0 109.997 473.3 190.548 542.004 313.496 542.004 c 0 391.8 542.004 462.083 512.905 511 459 c 0 EndSplineSet EndChar StartChar: I Encoding: 73 73 4 Width: 600 Flags: HMW TeX: 73 0 LayerCount: 2 Fore SplineSet 112 722 m 0 470 722 l 0 470 654 l 0 327 654 l 0 327 66 l 0 [...5331 lines suppressed...] Fore Refer: 107 180 S 1 0 0 1 0 0 2 Refer: 16 114 N 1 0 0 1 0 0 2 EndChar StartChar: zacute Encoding: 352 378 285 Width: 600 Flags: HMW LayerCount: 2 Fore Refer: 107 180 S 1 0 0 1 0 0 2 Refer: 69 122 N 1 0 0 1 0 0 2 EndChar StartChar: tcaron Encoding: 351 357 286 Width: 600 Flags: HMW LayerCount: 2 Fore Refer: 56 8217 S 0.8 0 0 0.8 276.515 226.393 2 Refer: 8 116 N 1 0 0 1 -30 0 2 EndChar StartChar: bullet Encoding: 353 8226 287 Width: 600 Flags: HMW LayerCount: 2 Fore SplineSet 405.001 343.496 m 0 405.001 290.47 361.103 246.968 306.461 246.968 c 0 251.887 246.968 207.967 290.437 207.967 343.507 c 0 207.967 396.512 251.854 440.001 306.474 440.001 c 0 361.085 440.001 405.001 396.528 405.001 343.496 c 0 EndSplineSet EndChar StartChar: florin Encoding: 354 402 288 Width: 600 Flags: HMW LayerCount: 2 Fore SplineSet 566 719 m 1 528 642 l 1 524.387 642.014 519.832 644.287 518.495 650.917 c 0 517.585 655.43 518.381 658.903 515.477 665.038 c 0 504.735 687.73 476.304 714.31 438.015 714.31 c 0 408.828 714.31 375.637 697.84 356.674 655.963 c 0 340.302 619.806 338.928 575.492 336 539 c 2 328.378 444 l 1 471 444 l 1 471 378 l 1 323.082 378 l 1 295 28 l 2 290.863 -23.5551 284.654 -73.9088 257.475 -120.242 c 0 224.265 -176.855 172.982 -203.002 125.302 -203.002 c 0 89.2414 -203.002 55.0861 -188.068 31 -162 c 1 78 -88 l 1 84.9954 -91.4507 87.1891 -97.9286 90.1488 -102.751 c 0 96.5551 -113.189 111.389 -124.965 131.92 -124.965 c 0 150.936 -124.965 174.229 -114.524 191.263 -83.2958 c 0 210.753 -47.5643 214.363 -4.0862 217 31 c 2 243.075 378 l 1 103 378 l 1 103 444 l 1 248.035 444 l 1 256 550 l 2 259.285 593.711 263.037 638.828 284.817 682.438 c 0 316.683 746.244 375.812 780 436.757 780 c 0 486.409 780 533.918 757.602 566 719 c 1 EndSplineSet EndChar StartChar: dagger Encoding: 355 8224 289 Width: 600 Flags: HMW LayerCount: 2 Fore SplineSet 261 756 m 1 339 756 l 1 339 529 l 1 531 529 l 1 531 460 l 1 339 460 l 1 339 -175 l 1 261 -175 l 1 261 460 l 1 67 460 l 1 67 529 l 1 261 529 l 1 261 756 l 1 EndSplineSet EndChar StartChar: daggerdbl Encoding: 356 8225 290 Width: 600 Flags: HMW LayerCount: 2 Fore SplineSet 261 756 m 1 339 756 l 1 339 529 l 1 531 529 l 1 531 460 l 1 339 460 l 1 339 140 l 1 531 140 l 1 531 71 l 1 339 71 l 1 339 -175 l 1 261 -175 l 1 261 71 l 1 67 71 l 1 67 140 l 1 261 140 l 1 261 460 l 1 67 460 l 1 67 529 l 1 261 529 l 1 261 756 l 1 EndSplineSet EndChar StartChar: trademark Encoding: 357 8482 291 Width: 600 VWidth: 1157 Flags: HMW LayerCount: 2 Fore SplineSet 286.552 735.33 m 5 286.552 689.01 l 5 182.332 689.01 l 5 182.332 370.56 l 5 130.222 370.56 l 5 130.222 689.01 l 5 30.6338 689.01 l 5 30.6338 735.33 l 5 286.552 735.33 l 5 360.664 735.33 m 5 444.04 567.42 l 5 466.042 609.108 466.042 609.108 487.465 651.375 c 132 508.888 693.642 508.888 693.642 530.89 735.33 c 5 569.104 735.33 l 5 569.104 370.56 l 5 520.468 370.56 l 5 520.468 619.53 l 5 503.098 588.264 503.098 588.264 485.149 556.419 c 132 467.2 524.574 467.2 524.574 450.988 494.466 c 5 432.46 495.624 l 5 368.77 619.53 l 5 368.77 370.56 l 5 320.134 370.56 l 5 320.134 735.33 l 5 360.664 735.33 l 5 EndSplineSet EndChar StartChar: zero.noslash Encoding: 358 -1 292 Width: 600 Flags: HW LayerCount: 2 Fore SplineSet 517.025 357.799 m 4 517.025 137.688 423.592 -13.0208 297.523 -13.0208 c 4 183.255 -13.0208 82.8194 113.451 82.8194 341.437 c 4 82.8194 574.873 173.246 727.004 299.955 727.004 c 4 420.815 727.004 517.025 585.161 517.025 357.799 c 4 299.205 656.004 m 4 273.981 656.004 230.75 644.394 201.424 580.18 c 4 177.708 528.251 159.966 454.416 159.966 351.701 c 4 159.966 277.625 175.139 200.382 194.564 153.681 c 4 226.53 76.8272 272.306 60.9815 302.777 60.9815 c 4 329.251 60.9815 369.189 73.0652 399.83 130.196 c 4 432.501 191.111 442.125 283.781 442.125 342.506 c 4 442.125 419.575 425.889 514.517 403.194 568.433 c 4 372.393 641.605 328.293 656.004 299.205 656.004 c 4 EndSplineSet EndChar StartChar: .notdef Encoding: 0 -1 293 Width: 600 Flags: HW LayerCount: 2 EndChar EndChars EndSplineFont --- NEW FILE import.log --- levien-inconsolata-fonts-1_01-2_fc11:HEAD:levien-inconsolata-fonts-1.01-2.fc11.src.rpm:1236027988 --- NEW FILE levien-inconsolata-fonts-fontconfig.conf --- monospace Inconsolata Inconsolata monospace --- NEW FILE levien-inconsolata-fonts.spec --- %global fontname levien-inconsolata %global fontconf 75-%{fontname}.conf Name: %{fontname}-fonts Version: 1.01 Release: 2%{?dist} Summary: Inconsolata fonts Group: User Interface/X License: OFL URL: http://www.levien.com/type/myfonts/inconsolata.html Source0: http://www.levien.com/type/myfonts/Inconsolata.sfd Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: fontpackages-devel BuildRequires: fontforge Requires: fontpackages-filesystem Obsoletes: inconsolata-fonts < 1.009-3 %description A monospace font, designed for code listings and the like, in print. %prep %build fontforge -script "-" %{SOURCE0} <<_EOF i = 1 while ( i < \$argc ) Open (\$argv[i], 1) Generate (\$fontname + ".ttf") PrintSetup (5) PrintFont (0, 0, "", \$fontname + "-sample.pdf") Close() i++ endloop _EOF %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{_fontdir} install -m 0644 -p *.ttf %{buildroot}%{_fontdir} install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ %{buildroot}%{_fontconfig_confdir} install -m 0644 -p %{SOURCE1} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf} ln -s %{_fontconfig_templatedir}/%{fontconf} \ %{buildroot}%{_fontconfig_confdir}/%{fontconf} %clean rm -fr %{buildroot} %_font_pkg -f %{fontconf} *.ttf %doc *.pdf %changelog * Tue Feb 24 2009 Kevin Fenzi - 1.01-2 - Add fontconfig file - Don't bother to provide old name - use global instead of define * Wed Feb 18 2009 Kevin Fenzi - 1.01-1 - Re-named from old inconsolata-fonts package - Updated to new spec template/rules. - Updated to new upstream release. * Sat Feb 02 2008 Kevin Fenzi - 1.009-1 - Initial package for fedora From cwickert at fedoraproject.org Mon Mar 2 21:10:52 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Mar 2009 21:10:52 +0000 (UTC) Subject: rpms/exo/devel exo.spec,1.33,1.34 Message-ID: <20090302211052.33DDB70115@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/exo/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8620 Modified Files: exo.spec Log Message: * Mon Mar 02 2009 Christoph Wickert - 0.3.100-2 - Fix directory ownership problems - Move exo-csource into devel package - Make devel package require pkgconfig and gtk-doc - Mark gtk-doc files as %doc Index: exo.spec =================================================================== RCS file: /cvs/pkgs/rpms/exo/devel/exo.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- exo.spec 27 Feb 2009 20:06:13 -0000 1.33 +++ exo.spec 2 Mar 2009 21:10:51 -0000 1.34 @@ -3,7 +3,7 @@ Summary: Application library for the Xfce desktop environment Name: exo Version: 0.3.100 -Release: 1%{?dist} +Release: 2%{?dist} # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+ # everything else is LGPLv2+ License: LGPLv2+ and GPLv2+ @@ -13,6 +13,7 @@ Group: System Environment/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: dbus-glib >= 0.22 +Requires: xfce4-doc BuildRequires: dbus-devel >= 0.22 BuildRequires: gtk-doc BuildRequires: pygtk2-devel @@ -23,6 +24,7 @@ BuildRequires: hal-devel libnotify-devel BuildRequires: intltool >= 0.31 BuildRequires: chrpath +BuildRequires: desktop-file-utils %description Extension library for Xfce, targeted at application development. @@ -33,9 +35,11 @@ Requires: %{name} = %{version}-%{release} Requires: libxfce4util-devel Requires: hal-devel +Requires: pkgconfig +Requires: gtk-doc %description devel -Static libraries and header files for the exo library. +Development tools and static libraries and header files for the exo library. %package -n python-exo Summary: Python tools for exo library @@ -70,6 +74,11 @@ %find_lang libexo-0.3 +desktop-file-install \ + --delete-original \ + --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/exo-preferred-applications.desktop + %clean rm -rf $RPM_BUILD_ROOT @@ -92,16 +101,9 @@ %doc AUTHORS ChangeLog HACKING NEWS README THANKS TODO COPYING %{_libdir}/lib*.so.* %{_datadir}/xfce4/helpers -%{_datadir}/xfce4/doc/C -%{_datadir}/xfce4/doc/es -%{_datadir}/xfce4/doc/ja -%{_datadir}/xfce4/doc/fr -%{_datadir}/xfce4/doc/id -%{_datadir}/xfce4/doc/pt_BR -%{_datadir}/xfce4/doc/tr -%{_mandir}/man1/exo-csource.1.gz +%doc %{_datadir}/xfce4/doc/*/images/* +%doc %{_datadir}/xfce4/doc/*/*.html %{_mandir}/man1/exo-open.1.gz -%{_bindir}/exo-csource %{_bindir}/exo-desktop-item-edit %{_bindir}/exo-open %{_bindir}/exo-preferred-applications @@ -113,19 +115,18 @@ %{_libexecdir}/exo-mount-notify-0.3 %{_libexecdir}/exo-compose-mail-0.3 %{_datadir}/applications/exo-preferred-applications.desktop -%{_datadir}/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png -%{_datadir}/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png -%{_datadir}/icons/hicolor/48x48/apps/applications-internet.png -%{_datadir}/icons/hicolor/48x48/apps/applications-other.png +%{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/pixmaps/exo-0.3/exo-thumbnail-frame.png %files devel %defattr(-, root, root,-) %doc %{_datadir}/gtk-doc/html/exo/ +%{_bindir}/exo-csource %{_includedir}/exo* %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc %{_datadir}/pygtk/*/defs/exo-*/ +%{_mandir}/man1/exo-csource.1.gz %files -n python-exo %defattr(-, root, root,-) @@ -133,6 +134,12 @@ %{python_sitearch}/pyexo.* %changelog +* Mon Mar 02 2009 Christoph Wickert - 0.3.100-2 +- Fix directory ownership problems +- Move exo-csource into devel package +- Make devel package require pkgconfig and gtk-doc +- Mark gtk-doc files as %%doc + * Thu Feb 26 2009 Kevin Fenzi - 0.3.100-1 - Update to 0.3.100 - Remove some unneeded BuildRequires From kevin at fedoraproject.org Mon Mar 2 21:12:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 2 Mar 2009 21:12:37 +0000 (UTC) Subject: rpms/levien-inconsolata-fonts/devel sources, 1.1, 1.2 .cvsignore, 1.1, 1.2 Inconsolata.sfd, 1.1, NONE Message-ID: <20090302211237.9A1AA70115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/extras/rpms/levien-inconsolata-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8908 Modified Files: sources .cvsignore Removed Files: Inconsolata.sfd Log Message: Move sfd file into lookaside Index: sources =================================================================== RCS file: /cvs/extras/rpms/levien-inconsolata-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2009 23:40:41 -0000 1.1 +++ sources 2 Mar 2009 21:12:07 -0000 1.2 @@ -0,0 +1 @@ +d74e17f15990e5b24ba697f236cc9a98 Inconsolata.sfd Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/levien-inconsolata-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2009 23:40:41 -0000 1.1 +++ .cvsignore 2 Mar 2009 21:12:07 -0000 1.2 @@ -0,0 +1 @@ +Inconsolata.sfd --- Inconsolata.sfd DELETED --- From scop at fedoraproject.org Mon Mar 2 21:15:51 2009 From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=) Date: Mon, 2 Mar 2009 21:15:51 +0000 (UTC) Subject: rpms/keychain/devel keychain-2.6.8-gpg-agent-envfile.patch, NONE, 1.1 keychain.sh, 1.6, 1.7 keychain.spec, 1.13, 1.14 Message-ID: <20090302211551.BDABF70115@cvs1.fedora.phx.redhat.com> Author: scop Update of /cvs/pkgs/rpms/keychain/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9611 Modified Files: keychain.sh keychain.spec Added Files: keychain-2.6.8-gpg-agent-envfile.patch Log Message: * Mon Mar 2 2009 Ville Skytt?? - 2.6.8-6 - Write ~/.gpg-agent-info when launching gpg-agent for better compatibility with other things using it, e.g. KDE 4 (#486025). - Drop no longer needed zsh special case which caused issues with ksh from profile.d script (#314431). keychain-2.6.8-gpg-agent-envfile.patch: --- NEW FILE keychain-2.6.8-gpg-agent-envfile.patch --- https://bugzilla.redhat.com/show_bug.cgi?id=486025 diff -up keychain-2.6.8/keychain~ keychain-2.6.8/keychain --- keychain-2.6.8/keychain~ 2006-10-25 01:09:34.000000000 +0300 +++ keychain-2.6.8/keychain 2009-03-01 01:05:18.000000000 +0200 @@ -860,7 +860,7 @@ startagent() { unset start_gpg_timeout fi # the 1.9.x series of gpg spews debug on stderr - start_out=`gpg-agent --daemon $start_gpg_timeout 2>/dev/null` + start_out=`gpg-agent --daemon --write-env-file $start_gpg_timeout 2>/dev/null` else error "I don't know how to start $start_prog-agent (2)" return 1 Index: keychain.sh =================================================================== RCS file: /cvs/pkgs/rpms/keychain/devel/keychain.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- keychain.sh 16 Feb 2009 18:06:55 -0000 1.6 +++ keychain.sh 2 Mar 2009 21:15:20 -0000 1.7 @@ -18,11 +18,7 @@ $HOME/.ssh/*` [ -n "$GPGKEYS" ] || GPGKEYS="" - if [ -n "$ZSH_VERSION" ] ; then - keychain ${=KCHOPTS} ${=SSHKEYS} ${=GPGKEYS} - else - keychain $KCHOPTS $SSHKEYS $GPGKEYS - fi + keychain $KCHOPTS $SSHKEYS $GPGKEYS host=`uname -n` [ -f $HOME/.keychain/$host-sh ] && \ Index: keychain.spec =================================================================== RCS file: /cvs/pkgs/rpms/keychain/devel/keychain.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- keychain.spec 25 Feb 2009 11:09:25 -0000 1.13 +++ keychain.spec 2 Mar 2009 21:15:20 -0000 1.14 @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.6.8 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: Applications/Internet URL: http://agriffis.n01se.net/keychain/ @@ -10,9 +10,16 @@ Source2: keychain.csh Source3: README.Fedora Patch0: keychain-manpage.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=486025 +Patch1: keychain-2.6.8-gpg-agent-envfile.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# https://bugzilla.redhat.com/show_bug.cgi?id=486025 +Conflicts: kde-settings < 4.2-3 +# https://bugzilla.redhat.com/show_bug.cgi?id=314431 +Conflicts: zsh < 4.3.4-7 + %description Keychain is a manager for OpenSSH, ssh.com, Sun SSH and GnuPG agents. It acts as a front-end to the agents, allowing you to easily have one @@ -24,6 +31,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 sed -i -e 's|/usr/ucb:||' keychain %install @@ -49,6 +57,12 @@ %{_mandir}/man1/keychain.1* %changelog +* Mon Mar 2 2009 Ville Skytt?? - 2.6.8-6 +- Write ~/.gpg-agent-info when launching gpg-agent for better compatibility + with other things using it, e.g. KDE 4 (#486025). +- Drop no longer needed zsh special case which caused issues with ksh from + profile.d script (#314431). + * Wed Feb 25 2009 Fedora Release Engineering - 2.6.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kevin at fedoraproject.org Mon Mar 2 21:16:51 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 2 Mar 2009 21:16:51 +0000 (UTC) Subject: rpms/levien-inconsolata-fonts/devel levien-inconsolata-fonts.spec, 1.1, 1.2 Message-ID: <20090302211651.1074B70115@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/extras/rpms/levien-inconsolata-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9798 Modified Files: levien-inconsolata-fonts.spec Log Message: Fix lang issue Index: levien-inconsolata-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/levien-inconsolata-fonts/devel/levien-inconsolata-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- levien-inconsolata-fonts.spec 2 Mar 2009 21:07:19 -0000 1.1 +++ levien-inconsolata-fonts.spec 2 Mar 2009 21:16:20 -0000 1.2 @@ -26,7 +26,7 @@ %prep %build -fontforge -script "-" %{SOURCE0} <<_EOF +fontforge -lang=ff -script "-" %{SOURCE0} <<_EOF i = 1 while ( i < \$argc ) Open (\$argv[i], 1) From pawsa at fedoraproject.org Mon Mar 2 21:17:43 2009 From: pawsa at fedoraproject.org (Pawel Salek) Date: Mon, 2 Mar 2009 21:17:43 +0000 (UTC) Subject: rpms/balsa/devel .cvsignore, 1.28, 1.29 balsa-gmime-537507.patch, 1.1, 1.2 balsa.spec, 1.46, 1.47 sources, 1.28, 1.29 Message-ID: <20090302211743.DFAD470115@cvs1.fedora.phx.redhat.com> Author: pawsa Update of /cvs/pkgs/rpms/balsa/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9948 Modified Files: .cvsignore balsa-gmime-537507.patch balsa.spec sources Log Message: - upgrade to 2.3.28. Fix bug 487780. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/balsa/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 7 Sep 2008 20:16:10 -0000 1.28 +++ .cvsignore 2 Mar 2009 21:17:13 -0000 1.29 @@ -1 +1 @@ -balsa-2.3.26.tar.bz2 +balsa-2.3.28.tar.bz2 balsa-gmime-537507.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 balsa-gmime-537507.patch Index: balsa-gmime-537507.patch =================================================================== RCS file: /cvs/pkgs/rpms/balsa/devel/balsa-gmime-537507.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- balsa-gmime-537507.patch 18 Dec 2008 21:31:53 -0000 1.1 +++ balsa-gmime-537507.patch 2 Mar 2009 21:17:13 -0000 1.2 @@ -1,849 +1,861 @@ -Index: src/balsa-mime-widget-message.c -=================================================================== ---- src/balsa-mime-widget-message.c (revision 7967) -+++ src/balsa-mime-widget-message.c (working copy) -@@ -305,9 +305,9 @@ - - /* create a message */ - message = libbalsa_message_new(); -- data = internet_address_to_string(balsa_app.current_ident->ia, FALSE); -- message->headers->from = internet_address_parse_string(data); -- g_free(data); -+ message->headers->from = internet_address_list_new(); -+ internet_address_list_add(message->headers->from, -+ balsa_app.current_ident->ia); - - data = libbalsa_message_body_get_parameter(mime_body, "subject"); - if (data) { -@@ -316,7 +316,7 @@ - } - - data = libbalsa_message_body_get_parameter(mime_body, "server"); -- message->headers->to_list = internet_address_parse_string(data); -+ message->headers->to_list = internet_address_list_parse_string(data); - g_free(data); +diff -ur balsa-2.3.28-orig/configure.in balsa-2.3.28/configure.in +--- balsa-2.3.28-orig/configure.in 2009-01-18 17:46:40.000000000 +0100 ++++ balsa-2.3.28/configure.in 2009-03-02 21:50:03.000000000 +0100 +@@ -371,7 +371,7 @@ + PKG_CHECK_MODULES(BALSA, [ + glib-2.0 + gtk+-2.0 >= 2.4 +-gmime-2.0 >= 2.1.9 ++gmime-2.4 >= 2.3.8 + gconf-2.0 + $gio_extra + $gnome_extras +@@ -382,7 +382,7 @@ + libgnome-2.0 libgnomeui-2.0 + glib-2.0 + gtk+-2.0 >= 2.4 +- gmime-2.0 >= 2.1.9 ++ gmime-2.4 >= 2.3.8 + ]) - /* the original body my have some data to be returned as commands... */ -@@ -614,7 +614,7 @@ - { - gchar *value; + dnl ########################################################################## +@@ -951,16 +951,6 @@ + dnl things that it fixes, for eg. user installs, package builds etc. + dnl AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache) -- if (list == NULL) -+ if (list == NULL || internet_address_list_length(list) == 0) - return; +-dnl check GMime version +-if $PKG_CONFIG --atleast-version=2.2.5 gmime-2.0 ; then +- AC_DEFINE(HAVE_GMIME_2_2_5,1,[Defined when GMime is at least version +- 2.2.5.]) +-fi +-if $PKG_CONFIG --atleast-version=2.2.7 gmime-2.0 ; then +- AC_DEFINE(HAVE_GMIME_2_2_7,1,[Defined when GMime is at least version +- 2.2.7.]) +-fi +- + dnl ##################################################################### + dnl 8. Output + dnl ##################################################################### +diff -ur balsa-2.3.28-orig/libbalsa/abook-completion.c balsa-2.3.28/libbalsa/abook-completion.c +--- balsa-2.3.28-orig/libbalsa/abook-completion.c 2007-01-01 20:13:32.000000000 +0100 ++++ balsa-2.3.28/libbalsa/abook-completion.c 2009-03-02 21:50:03.000000000 +0100 +@@ -46,7 +46,7 @@ - if (!(bm->shown_headers == HEADERS_ALL || -Index: src/store-address.c -=================================================================== ---- src/store-address.c (revision 7967) -+++ src/store-address.c (working copy) -@@ -59,13 +59,13 @@ - StoreAddressInfo * info); - static void store_address_add_address(StoreAddressInfo * info, - const gchar * label, -- const InternetAddress * address, -- const InternetAddress * group); -+ InternetAddress * address, -+ InternetAddress * group); - static void store_address_add_lbaddress(StoreAddressInfo * info, - const LibBalsaAddress *address); - static void store_address_add_list(StoreAddressInfo * info, - const gchar * label, -- const InternetAddressList * list); -+ InternetAddressList * list); + ret = g_new0(CompletionData, 1); - /* - * public interface: balsa_store_address -@@ -348,8 +348,8 @@ - * make a new page in the notebook */ - static void - store_address_add_address(StoreAddressInfo * info, -- const gchar * lab, const InternetAddress * ia, -- const InternetAddress * group) -+ const gchar * lab, InternetAddress * ia, -+ InternetAddress * group) - { - gchar *text; - LibBalsaAddress *address; -@@ -366,7 +366,7 @@ - address = libbalsa_address_new(); - address->full_name = - g_strdup(ia->name ? ia->name : group ? group->name : NULL); -- address->address_list = g_list_prepend(NULL, g_strdup(ia->value.addr)); -+ address->address_list = g_list_prepend(NULL, g_strdup(INTERNET_ADDRESS_MAILBOX (ia)->addr)); - ew = libbalsa_address_get_edit_widget(address, entries, NULL, NULL); - g_object_unref(address); +- internet_address_ref(ia); ++ g_object_ref(ia); + ret->ia = ia; -@@ -409,20 +409,22 @@ - static void - store_address_add_list(StoreAddressInfo * info, - const gchar * label, -- const InternetAddressList * list) -+ InternetAddressList * list) + string = g_string_new(nick_name); +@@ -78,7 +78,7 @@ + void + completion_data_free(CompletionData * data) { -- for (; list; list = list->next) { -- InternetAddress *ia = list->address; -- -- if (ia->type == INTERNET_ADDRESS_NAME) -+ int i, j; -+ -+ for (i = 0; i < internet_address_list_length (list); i++) { -+ InternetAddress *ia = internet_address_list_get_address (list, i); -+ -+ if (INTERNET_ADDRESS_IS_MAILBOX (ia)) - store_address_add_address(info, label, ia, NULL); -- else if (ia->type == INTERNET_ADDRESS_GROUP) { -- InternetAddressList *member; -+ else { -+ InternetAddressList *members = INTERNET_ADDRESS_GROUP (ia)->members; +- internet_address_unref(data->ia); ++ g_object_unref(data->ia); + g_free(data->string); + g_free(data); + } +diff -ur balsa-2.3.28-orig/libbalsa/address-book-extern.c balsa-2.3.28/libbalsa/address-book-extern.c +--- balsa-2.3.28-orig/libbalsa/address-book-extern.c 2007-10-13 21:33:51.000000000 +0200 ++++ balsa-2.3.28/libbalsa/address-book-extern.c 2009-03-02 21:50:13.000000000 +0100 +@@ -369,7 +369,7 @@ + if(!name || !*name) + name = _("No-Name"); + *res = g_list_prepend(*res, +- internet_address_new_name(name, email)); ++ internet_address_mailbox_new(name, email)); + } + } -- for (member = ia->value.members; member; member = member->next) { -- InternetAddress *member_address = member->address; -+ for (j = 0; j < internet_address_list_length (members); j++) { -+ InternetAddress *member_address = internet_address_list_get_address (members, j); +diff -ur balsa-2.3.28-orig/libbalsa/address-book-gpe.c balsa-2.3.28/libbalsa/address-book-gpe.c +--- balsa-2.3.28-orig/libbalsa/address-book-gpe.c 2007-01-01 20:13:32.000000000 +0100 ++++ balsa-2.3.28/libbalsa/address-book-gpe.c 2009-03-02 21:50:03.000000000 +0100 +@@ -729,7 +729,7 @@ + if(!a->full_name) + a->full_name = create_name(a->first_name, a->last_name); + for(l=a->address_list; l; l = l->next) { +- ia = internet_address_new_name(a->full_name, l->data); ++ ia = internet_address_mailbox_new(a->full_name, l->data); + gc->res = g_list_prepend(gc->res, ia); + } + if(gc->new_prefix && !*gc->new_prefix) +diff -ur balsa-2.3.28-orig/libbalsa/address-book-rubrica.c balsa-2.3.28/libbalsa/address-book-rubrica.c +--- balsa-2.3.28-orig/libbalsa/address-book-rubrica.c 2007-10-23 20:06:21.000000000 +0200 ++++ balsa-2.3.28/libbalsa/address-book-rubrica.c 2009-03-02 21:50:03.000000000 +0100 +@@ -236,8 +236,7 @@ + g_completion_complete(ab_text->name_complete, (gchar *) prefix, + new_prefix); list; list = list->next) { + InternetAddress *ia = ((CompletionData *) list->data)->ia; +- internet_address_ref(ia); +- res = g_list_prepend(res, ia); ++ res = g_list_prepend(res, g_object_ref(ia)); + } [...6413 lines suppressed...] -@@ -7144,7 +7144,7 @@ - libgnome-2.0 libgnomeui-2.0 - glib-2.0 - gtk+-2.0 >= 2.4 -- gmime-2.0 >= 2.1.9 -+ gmime-2.4 >= 2.1.9 - " 2>/dev/null` - else - pkg_failed=yes -@@ -7160,13 +7160,13 @@ - libgnome-2.0 libgnomeui-2.0 - glib-2.0 - gtk+-2.0 >= 2.4 -- gmime-2.0 >= 2.1.9 -+ gmime-2.4 >= 2.1.9 - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - libgnome-2.0 libgnomeui-2.0 - glib-2.0 - gtk+-2.0 >= 2.4 -- gmime-2.0 >= 2.1.9 -+ gmime-2.4 >= 2.1.9 - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -7175,7 +7175,7 @@ - libgnome-2.0 libgnomeui-2.0 - glib-2.0 - gtk+-2.0 >= 2.4 -- gmime-2.0 >= 2.1.9 -+ gmime-2.4 >= 2.1.9 - " 2>/dev/null` - else - pkg_failed=yes -@@ -7198,14 +7198,14 @@ - libgnome-2.0 libgnomeui-2.0 - glib-2.0 - gtk+-2.0 >= 2.4 -- gmime-2.0 >= 2.1.9 -+ gmime-2.4 >= 2.1.9 - " 2>&1` - else - BALSA_AB_PKG_ERRORS=`$PKG_CONFIG --print-errors " - libgnome-2.0 libgnomeui-2.0 - glib-2.0 - gtk+-2.0 >= 2.4 -- gmime-2.0 >= 2.1.9 -+ gmime-2.4 >= 2.1.9 - " 2>&1` - fi - # Put the nasty error message in config.log where it belongs -@@ -7215,7 +7215,7 @@ - libgnome-2.0 libgnomeui-2.0 - glib-2.0 - gtk+-2.0 >= 2.4 -- gmime-2.0 >= 2.1.9 -+ gmime-2.4 >= 2.1.9 - ) were not met: + /* collect all to and cc recipients */ +- ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:"); +- cc_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "Cc:"); +- from_list = internet_address_list_prepend(NULL, bsmsg->ident->ia); + protocol = bsmsg->gpg_mode & LIBBALSA_PROTECT_SMIMEV3 ? + GPGME_PROTOCOL_CMS : GPGME_PROTOCOL_OpenPGP; +- can_encrypt = libbalsa_can_encrypt_for_all(from_list, protocol) & +- libbalsa_can_encrypt_for_all(ia_list, protocol) & +- libbalsa_can_encrypt_for_all(cc_list, protocol); +- internet_address_list_destroy(from_list); +- internet_address_list_destroy(ia_list); +- internet_address_list_destroy(cc_list); ++ ++ ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:"); ++ can_encrypt = libbalsa_can_encrypt_for_all(ia_list, protocol); ++ g_object_unref(ia_list); ++ if (can_encrypt) { ++ ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "Cc:"); ++ can_encrypt = libbalsa_can_encrypt_for_all(ia_list, protocol); ++ g_object_unref(ia_list); ++ } ++ if (can_encrypt) { ++ ia_list = internet_address_list_new(); ++ internet_address_list_add(ia_list, bsmsg->ident->ia); ++ can_encrypt = libbalsa_can_encrypt_for_all(ia_list, protocol); ++ g_object_unref(ia_list); ++ } - $BALSA_AB_PKG_ERRORS -@@ -7231,7 +7231,7 @@ - libgnome-2.0 libgnomeui-2.0 - glib-2.0 - gtk+-2.0 >= 2.4 -- gmime-2.0 >= 2.1.9 -+ gmime-2.4 >= 2.1.9 - ) were not met: + /* ask the user if we could encrypt this message */ + if (can_encrypt) { +@@ -6768,7 +6765,7 @@ + if (mailing_list_address) { + libbalsa_address_view_set_from_list(bsmsg->recipient_view, "To:", + mailing_list_address); +- internet_address_list_destroy(mailing_list_address); ++ g_object_unref(mailing_list_address); + return; + } - $BALSA_AB_PKG_ERRORS -@@ -10703,14 +10703,14 @@ - HICOLOR_ICON_DIR=`$PKG_CONFIG --variable=prefix gtk+-2.0`/share/icons/hicolor +@@ -6902,7 +6899,7 @@ + list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:"); + to_string = internet_address_list_to_string(list, FALSE); +- internet_address_list_destroy(list); ++ g_object_unref(list); --if $PKG_CONFIG --atleast-version=2.2.5 gmime-2.0 ; then -+if $PKG_CONFIG --atleast-version=2.2.5 gmime-2.4 ; then + title = g_strdup_printf(title_format, to_string, + gtk_entry_get_text(GTK_ENTRY(bsmsg->subject[1]))); +diff -ur balsa-2.3.28-orig/src/store-address.c balsa-2.3.28/src/store-address.c +--- balsa-2.3.28-orig/src/store-address.c 2009-01-02 14:40:57.000000000 +0100 ++++ balsa-2.3.28/src/store-address.c 2009-03-02 21:50:03.000000000 +0100 +@@ -58,13 +58,13 @@ + StoreAddressInfo * info); + static void store_address_add_address(StoreAddressInfo * info, + const gchar * label, +- const InternetAddress * address, +- const InternetAddress * group); ++ InternetAddress * address, ++ InternetAddress * group); + static void store_address_add_lbaddress(StoreAddressInfo * info, + const LibBalsaAddress *address); + static void store_address_add_list(StoreAddressInfo * info, + const gchar * label, +- const InternetAddressList * list); ++ InternetAddressList * list); + + /* + * public interface: balsa_store_address +@@ -347,8 +347,8 @@ + * make a new page in the notebook */ + static void + store_address_add_address(StoreAddressInfo * info, +- const gchar * lab, const InternetAddress * ia, +- const InternetAddress * group) ++ const gchar * lab, InternetAddress * ia, ++ InternetAddress * group) + { + gchar *text; + LibBalsaAddress *address; +@@ -365,7 +365,7 @@ + address = libbalsa_address_new(); + address->full_name = + g_strdup(ia->name ? ia->name : group ? group->name : NULL); +- address->address_list = g_list_prepend(NULL, g_strdup(ia->value.addr)); ++ address->address_list = g_list_prepend(NULL, g_strdup(INTERNET_ADDRESS_MAILBOX (ia)->addr)); + ew = libbalsa_address_get_edit_widget(address, entries, NULL, NULL); + g_object_unref(address); - cat >>confdefs.h <<\_ACEOF - #define HAVE_GMIME_2_2_5 1 - _ACEOF +@@ -408,20 +408,22 @@ + static void + store_address_add_list(StoreAddressInfo * info, + const gchar * label, +- const InternetAddressList * list) ++ InternetAddressList * list) + { +- for (; list; list = list->next) { +- InternetAddress *ia = list->address; +- +- if (ia->type == INTERNET_ADDRESS_NAME) ++ int i, j; ++ ++ for (i = 0; i < internet_address_list_length (list); i++) { ++ InternetAddress *ia = internet_address_list_get_address (list, i); ++ ++ if (INTERNET_ADDRESS_IS_MAILBOX (ia)) + store_address_add_address(info, label, ia, NULL); +- else if (ia->type == INTERNET_ADDRESS_GROUP) { +- InternetAddressList *member; ++ else { ++ InternetAddressList *members = INTERNET_ADDRESS_GROUP (ia)->members; - fi --if $PKG_CONFIG --atleast-version=2.2.7 gmime-2.0 ; then -+if $PKG_CONFIG --atleast-version=2.2.7 gmime-2.4 ; then +- for (member = ia->value.members; member; member = member->next) { +- InternetAddress *member_address = member->address; ++ for (j = 0; j < internet_address_list_length (members); j++) { ++ InternetAddress *member_address = internet_address_list_get_address (members, j); - cat >>confdefs.h <<\_ACEOF - #define HAVE_GMIME_2_2_7 1 +- if (member_address->type == INTERNET_ADDRESS_NAME) ++ if (INTERNET_ADDRESS_IS_MAILBOX (member_address)) + store_address_add_address(info, label, member_address, + ia); + } Index: balsa.spec =================================================================== RCS file: /cvs/pkgs/rpms/balsa/devel/balsa.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- balsa.spec 24 Feb 2009 04:01:20 -0000 1.46 +++ balsa.spec 2 Mar 2009 21:17:13 -0000 1.47 @@ -1,8 +1,8 @@ %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell --with-gpgme Name: balsa -Version: 2.3.26 -Release: 5%{?dist} +Version: 2.3.28 +Release: 1%{?dist} Summary: Mail Client Group: Applications/Internet @@ -59,7 +59,8 @@ desktop-file-install $RPM_BUILD_ROOT%{_datadir}/applications/balsa.desktop \ --vendor=fedora \ - --add-category=X-Fedora \ + --add-category=Email \ + --remove-category=Application \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ --copy-name-to-generic-name \ --delete-original @@ -106,6 +107,9 @@ %changelog +* Mon Mar 2 2009 Pawel Salek - 2.3.28-1 +- upgrade to 2.3.28. Fix bug 487780. + * Mon Feb 23 2009 Fedora Release Engineering - 2.3.26-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/balsa/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 7 Sep 2008 20:16:10 -0000 1.28 +++ sources 2 Mar 2009 21:17:13 -0000 1.29 @@ -1 +1 @@ -e2d59f88ab0c39ba49dac09a47531b70 balsa-2.3.26.tar.bz2 +c9ea1f5683fc094b1ffcab7b9e66dd5c balsa-2.3.28.tar.bz2 From jlaska at fedoraproject.org Mon Mar 2 21:22:42 2009 From: jlaska at fedoraproject.org (James Laska) Date: Mon, 2 Mar 2009 21:22:42 +0000 (UTC) Subject: rpms/snake/devel .cvsignore, 1.10, 1.11 import.log, 1.5, 1.6 snake.spec, 1.19, 1.20 sources, 1.18, 1.19 Message-ID: <20090302212242.7FC1370115@cvs1.fedora.phx.redhat.com> Author: jlaska Update of /cvs/pkgs/rpms/snake/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11344/devel Modified Files: .cvsignore import.log snake.spec sources Log Message: Update to snake-0.11-0.13 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 5 Jan 2009 21:35:39 -0000 1.10 +++ .cvsignore 2 Mar 2009 21:22:11 -0000 1.11 @@ -1 +1 @@ -snake-0.11-0.12.tar.bz2 +snake-0.11-0.13.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 5 Jan 2009 21:35:39 -0000 1.5 +++ import.log 2 Mar 2009 21:22:11 -0000 1.6 @@ -3,3 +3,4 @@ snake-0_11-0_9_fc9:HEAD:snake-0.11-0.9.fc9.src.rpm:1217261529 snake-0_11-0_11_fc10:HEAD:snake-0.11-0.11.fc10.src.rpm:1229635008 snake-0_11-0_12_fc10:HEAD:snake-0.11-0.12.fc10.src.rpm:1231191321 +snake-0_11-0_13_fc11:HEAD:snake-0.11-0.13.fc11.src.rpm:1236028891 Index: snake.spec =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/snake.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- snake.spec 26 Feb 2009 01:46:22 -0000 1.19 +++ snake.spec 2 Mar 2009 21:22:11 -0000 1.20 @@ -135,7 +135,7 @@ %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 0.11-0.13 +* Mon Mar 2 2009 James Laska 0.11-0.13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Mon Jan 5 2009 James Laska 0.11-0.12 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 5 Jan 2009 21:35:39 -0000 1.18 +++ sources 2 Mar 2009 21:22:11 -0000 1.19 @@ -1 +1 @@ -0a763da58a7f8babeccae3a6d35abff6 snake-0.11-0.12.tar.bz2 +ce7682306613429a7dbf3cef78438b12 snake-0.11-0.13.tar.bz2 From cwickert at fedoraproject.org Mon Mar 2 21:27:08 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Mar 2009 21:27:08 +0000 (UTC) Subject: rpms/xfce-utils/devel xfce-utils.spec,1.28,1.29 Message-ID: <20090302212708.C68C970115@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12248 Modified Files: xfce-utils.spec Log Message: * Mon Mar 02 2009 Christoph Wickert - 4.6.0-2 - Fix directory ownership problems - Make separate xfce4-doc package Index: xfce-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce-utils/devel/xfce-utils.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- xfce-utils.spec 27 Feb 2009 20:23:10 -0000 1.28 +++ xfce-utils.spec 2 Mar 2009 21:26:37 -0000 1.29 @@ -3,7 +3,7 @@ Summary: Utilities for the Xfce Desktop Environment Name: xfce-utils Version: 4.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce-utils-%{version}.tar.bz2 @@ -16,6 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: xfwm4 Requires: xfdesktop +Requires: xfce4-doc Requires: /usr/bin/id BuildRequires: libxfcegui4-devel >= %{version} BuildRequires: gettext @@ -25,7 +26,16 @@ BuildRequires: intltool %description -This package includes utilities for the Xfce Desktop Environment +This package includes utilities for the Xfce Desktop Environment. + +%package -n xfce4-doc +Summary: Basic documentation for the Xfce Desktop Environment +Group: Documentation +BuildArch: noarch +#Requires: %{name} = %{version}-%{release} + +%description -n xfce4-doc +This package includes common docs for the Xfce Desktop Environment. %prep %setup -q @@ -46,14 +56,12 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{xsessiondir}/xfce.desktop -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/ - -rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la -rm -rf $RPM_BUILD_ROOT/%{_datadir}/apps +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/ %find_lang %{name} -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11 +# we need the doc package to own these +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/xfce4/doc/{es,fr,id,it,ja,pt_BR,tr}/images %clean rm -rf $RPM_BUILD_ROOT @@ -77,36 +85,53 @@ %config(noreplace) %{_sysconfdir}/xdg/xfce4/xinitrc %config(noreplace) %{_sysconfdir}/xdg/xfce4/Xft.xrdb %config(noreplace) %{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop -%dir %{_libexecdir}/xfce4 %dir %{_libexecdir}/xfce4/xfconf-migration %{_libexecdir}/xfce4/xfconf-migration/xfconf-migration-4.6.pl -%{_bindir}/* -%{_datadir}/xfce4/AUTHORS -%{_datadir}/xfce4/BSD -%{_datadir}/xfce4/COPYING -%{_datadir}/xfce4/GPL -%{_datadir}/xfce4/INFO -%lang(de) %{_datadir}/xfce4/INFO.de -%lang(ca) %{_datadir}/xfce4/INFO.ca -%lang(es) %{_datadir}/xfce4/INFO.es -%lang(fi) %{_datadir}/xfce4/INFO.fi -%lang(fr) %{_datadir}/xfce4/INFO.fr -%lang(it) %{_datadir}/xfce4/INFO.it -%lang(ja) %{_datadir}/xfce4/INFO.ja -%lang(ru) %{_datadir}/xfce4/INFO.ru -%lang(en_GB) %{_datadir}/xfce4/INFO.uk -%lang(vi) %{_datadir}/xfce4/INFO.vi -%{_datadir}/xfce4/LGPL -%{_datadir}/xfce4/doc/*/images/* -%{_datadir}/xfce4/doc/*/*.html -%{_datadir}/xfce4/doc/xfce-mouse.png -%{_datadir}/xfce4/doc/xfce.css -%{_datadir}/xfce4/doc/xfce-chunk.css -%{_datadir}/icons/*/*/* +%{_bindir}/startxfce4 +%{_bindir}/xfbrowser4 +%{_bindir}/xfce4-about +%{_bindir}/xflock4 +%{_bindir}/xfmountdev4 +%{_bindir}/xfrun4 +%{_bindir}/xfterm4 +%{_datadir}/icons/hicolor/*/apps/* %{xsessiondir}/* %{_datadir}/dbus-1/services/org.xfce.RunDialog.service +%files -n xfce4-doc +%defattr(-,root,root,-) +%{_bindir}/xfhelp4 +%dir %{_datadir}/xfce4 +%doc %{_datadir}/xfce4/AUTHORS +%doc %{_datadir}/xfce4/BSD +%doc %{_datadir}/xfce4/COPYING +%doc %{_datadir}/xfce4/GPL +%doc %{_datadir}/xfce4/INFO +%doc %lang(de) %{_datadir}/xfce4/INFO.de +%doc %lang(ca) %{_datadir}/xfce4/INFO.ca +%doc %lang(es) %{_datadir}/xfce4/INFO.es +%doc %lang(fi) %{_datadir}/xfce4/INFO.fi +%doc %lang(fr) %{_datadir}/xfce4/INFO.fr +%doc %lang(it) %{_datadir}/xfce4/INFO.it +%doc %lang(ja) %{_datadir}/xfce4/INFO.ja +%doc %lang(ru) %{_datadir}/xfce4/INFO.ru +%doc %lang(en_GB) %{_datadir}/xfce4/INFO.uk +%doc %lang(vi) %{_datadir}/xfce4/INFO.vi +%doc %{_datadir}/xfce4/LGPL +%dir %{_datadir}/xfce4/doc +%dir %{_datadir}/xfce4/doc/* +%dir %{_datadir}/xfce4/doc/*/images +%doc %{_datadir}/xfce4/doc/*/images/* +%doc %{_datadir}/xfce4/doc/*/*.html +%doc %{_datadir}/xfce4/doc/xfce-mouse.png +%doc %{_datadir}/xfce4/doc/xfce.css +%doc %{_datadir}/xfce4/doc/xfce-chunk.css + %changelog +* Mon Mar 02 2009 Christoph Wickert - 4.6.0-2 +- Fix directory ownership problems +- Make separate xfce4-doc package + * Thu Feb 26 2009 Kevin Fenzi - 4.6.0-1 - Update to 4.6.0 - Remove unneeded BuildRequires From lkundrak at fedoraproject.org Mon Mar 2 21:27:12 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Mon, 2 Mar 2009 21:27:12 +0000 (UTC) Subject: rpms/inkscape/devel inkscape-0.46+devel-uniconv.patch, 1.1, 1.2 inkscape-20090226svn-oldcairo.patch, NONE, 1.1 inkscape-20090227svn-automake.patch, NONE, 1.1 inkscape-20090227svn-gcc44.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 inkscape.spec, 1.63, 1.64 sources, 1.16, 1.17 inkscape-0.46-bitmap-fonts.patch, 1.1, NONE inkscape-0.46-colors.patch, 1.1, NONE inkscape-0.46-cxxinclude.patch, 1.1, NONE inkscape-0.46-desktop.patch, 1.1, NONE inkscape-0.46-fixlatex.patch, 1.1, NONE inkscape-0.46-gtk2.13.3.patch, 1.1, NONE inkscape-0.46-gtkopen.patch, 1.1, NONE inkscape-0.46-poppler-0.8.3.patch, 1.1, NONE inkscape-0.46-uniconv.patch, 1.1, NONE inkscape-0.46pre2-icons.patch, 1.2, NONE Message-ID: <20090302212712.48BE270115@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12339 Modified Files: .cvsignore inkscape.spec sources Added Files: inkscape-0.46+devel-uniconv.patch inkscape-20090226svn-oldcairo.patch inkscape-20090227svn-automake.patch inkscape-20090227svn-gcc44.patch Removed Files: inkscape-0.46-bitmap-fonts.patch inkscape-0.46-colors.patch inkscape-0.46-cxxinclude.patch inkscape-0.46-desktop.patch inkscape-0.46-fixlatex.patch inkscape-0.46-gtk2.13.3.patch inkscape-0.46-gtkopen.patch inkscape-0.46-poppler-0.8.3.patch inkscape-0.46-uniconv.patch inkscape-0.46pre2-icons.patch Log Message: Update to SVN snapshot with solemn intent of annoying users. And compile with GCC 4.4 as well inkscape-0.46+devel-uniconv.patch: Index: inkscape-0.46+devel-uniconv.patch =================================================================== RCS file: inkscape-0.46+devel-uniconv.patch diff -N inkscape-0.46+devel-uniconv.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ inkscape-0.46+devel-uniconv.patch 2 Mar 2009 21:27:11 -0000 1.2 @@ -0,0 +1,108 @@ +See https://bugs.launchpad.net/inkscape/+bug/226383 +https://bugzilla.redhat.com/show_bug.cgi?id=458845 + +Lubomir Rintel + +diff -up inkscape/inkscape.desktop.in.uniconv inkscape/inkscape.desktop.in +--- inkscape/inkscape.desktop.in.uniconv 2009-01-06 11:38:13.000000000 +0100 ++++ inkscape/inkscape.desktop.in 2009-01-06 11:38:39.000000000 +0100 +@@ -4,7 +4,7 @@ _Name=Inkscape Vector Graphics Editor + _Comment=Create and edit Scalable Vector Graphics images + Type=Application + Categories=Graphics;VectorGraphics;GTK; +-MimeType=image/svg+xml;image/svg+xml-compressed; ++MimeType=image/svg+xml;image/svg+xml-compressed;image/cgm;image/x-wmf;application/vnd.corel-draw;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr; + Exec=inkscape %F + TryExec=inkscape + Terminal=false +diff -up inkscape/share/extensions/ccx_input.inx.uniconv inkscape/share/extensions/ccx_input.inx +--- inkscape/share/extensions/ccx_input.inx.uniconv 2009-01-05 14:23:27.000000000 +0100 ++++ inkscape/share/extensions/ccx_input.inx 2009-01-06 11:37:02.000000000 +0100 +@@ -2,7 +2,7 @@ + + <_name>Corel DRAW Compressed Exchange files input + org.inkscape.input.ccx +- uniconv ++ uniconvertor + uniconv-ext.py + + .ccx +diff -up inkscape/share/extensions/cdr_input.inx.uniconv inkscape/share/extensions/cdr_input.inx +diff -up inkscape/share/extensions/cdt_input.inx.uniconv inkscape/share/extensions/cdt_input.inx +--- inkscape/share/extensions/cdt_input.inx.uniconv 2009-01-05 14:23:28.000000000 +0100 ++++ inkscape/share/extensions/cdt_input.inx 2009-01-06 11:37:02.000000000 +0100 +@@ -2,7 +2,7 @@ + + <_name>Corel DRAW templates input + org.inkscape.input.cdt +- uniconv ++ uniconvertor + uniconv-ext.py + + .cdt +diff -up inkscape/share/extensions/cgm_input.inx.uniconv inkscape/share/extensions/cgm_input.inx +--- inkscape/share/extensions/cgm_input.inx.uniconv 2009-01-05 14:23:26.000000000 +0100 ++++ inkscape/share/extensions/cgm_input.inx 2009-01-06 11:37:02.000000000 +0100 +@@ -2,7 +2,7 @@ + + <_name>Computer Graphics Metafile files input + org.inkscape.input.cgm +- uniconv ++ uniconvertor + uniconv-ext.py + + .cgm +diff -up inkscape/share/extensions/cmx_input.inx.uniconv inkscape/share/extensions/cmx_input.inx +--- inkscape/share/extensions/cmx_input.inx.uniconv 2009-01-05 14:23:26.000000000 +0100 ++++ inkscape/share/extensions/cmx_input.inx 2009-01-06 11:37:02.000000000 +0100 +@@ -2,7 +2,7 @@ + + <_name>Corel DRAW Presentation Exchange files input + org.inkscape.input.cmx +- uniconv ++ uniconvertor + uniconv-ext.py + + .cmx +diff -up inkscape/share/extensions/sk1_input.inx.uniconv inkscape/share/extensions/sk1_input.inx +--- inkscape/share/extensions/sk1_input.inx.uniconv 2009-01-05 14:23:27.000000000 +0100 ++++ inkscape/share/extensions/sk1_input.inx 2009-01-06 11:37:02.000000000 +0100 +@@ -2,7 +2,7 @@ + + <_name>sK1 vector graphics files input + org.inkscape.input.sk1 +- uniconv ++ uniconvertor + uniconv-ext.py + + .sk1 +diff -up inkscape/share/extensions/uniconv-ext.py.uniconv inkscape/share/extensions/uniconv-ext.py +--- inkscape/share/extensions/uniconv-ext.py.uniconv 2009-01-05 14:23:28.000000000 +0100 ++++ inkscape/share/extensions/uniconv-ext.py 2009-01-06 11:41:29.000000000 +0100 +@@ -28,14 +28,10 @@ from subprocess import Popen, PIPE + cmd = 'none' + + try: +- p = Popen('uniconv', shell=True, stdout=PIPE, stderr=PIPE).wait() +- if p!=127 : cmd = 'uniconv' + p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait() + if p!=127 : cmd = 'uniconvertor' + except ImportError: + from popen2 import Popen3 +- p = Popen3('uniconv', True).wait() +- if p!=32512 : cmd = 'uniconv' + p = Popen3('uniconvertor', True).wait() + if p!=32512 : cmd = 'uniconvertor' + +diff -up inkscape/share/extensions/wmf_input.inx.uniconv inkscape/share/extensions/wmf_input.inx +--- inkscape/share/extensions/wmf_input.inx.uniconv 2009-01-05 14:23:28.000000000 +0100 ++++ inkscape/share/extensions/wmf_input.inx 2009-01-06 11:37:02.000000000 +0100 +@@ -2,7 +2,7 @@ + + <_name>Windows Metafile Input + org.inkscape.input.wmf +- uniconv ++ uniconvertor + uniconv-ext.py + + .wmf inkscape-20090226svn-oldcairo.patch: --- NEW FILE inkscape-20090226svn-oldcairo.patch --- Solves the compilation issue with older cairo (tested with EL-5's 1.2.8) Lubomir Rintel Index: src/extension/internal/cairo-ps-out.cpp =================================================================== --- src/extension/internal/cairo-ps-out.cpp (revision 20786) +++ src/extension/internal/cairo-ps-out.cpp (working copy) @@ -38,6 +38,11 @@ #include "io/sys.h" +#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 5, 1) +# define CAIRO_PS_LEVEL_2 0 +# define CAIRO_PS_LEVEL_3 1 +#endif + namespace Inkscape { namespace Extension { namespace Internal { inkscape-20090227svn-automake.patch: --- NEW FILE inkscape-20090227svn-automake.patch --- Be able to autogen with older automake, that doesn't correctly compile assembly language source files. Lubomir Rintel Index: src/Makefile.am =================================================================== --- src/Makefile.am (revision 20789) +++ src/Makefile.am (working copy) @@ -282,3 +282,8 @@ distclean-local: rm -f cxxtests.xml cxxtests.log + +# Work around old Automake bug (fixed in 1.10) +CCASCOMPILE ?= $(CPPASCOMPILE) +.S.o: + $(CCASCOMPILE) -c -o $@ $< Index: autogen.sh =================================================================== --- autogen.sh (revision 20789) +++ autogen.sh (working copy) @@ -15,7 +15,7 @@ FILE=inkscape.spec.in AUTOCONF_REQUIRED_VERSION=2.52 -AUTOMAKE_REQUIRED_VERSION=1.10 +AUTOMAKE_REQUIRED_VERSION=1.9.6 GLIB_REQUIRED_VERSION=2.0.0 INTLTOOL_REQUIRED_VERSION=0.17 @@ -86,9 +86,9 @@ echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... " # Prefer earlier versions just so that the earliest supported version gets test coverage by developers. -if (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.10 - ACLOCAL=aclocal-1.10 +if (automake-$AUTOMAKE_REQUIRED_VERSION --version) < /dev/null > /dev/null 2>&1; then + AUTOMAKE=automake-$AUTOMAKE_REQUIRED_VERSION + ACLOCAL=aclocal-$AUTOMAKE_REQUIRED_VERSION elif (automake --version) < /dev/null > /dev/null 2>&1; then # Leave unversioned automake for a last resort: it may be a version earlier # than what we require. @@ -98,7 +98,7 @@ ACLOCAL=aclocal else echo - echo " You must have automake 1.10 or newer installed to compile $PROJECT." + echo " You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT." DIE=1 fi if test x$AUTOMAKE != x; then inkscape-20090227svn-gcc44.patch: --- NEW FILE inkscape-20090227svn-gcc44.patch --- One more typing fix for GCC 4.4, and fix a NULL dereference on startup. Lubomir Rintel diff -up inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 inkscape/src/extension/internal/bitmap/imagemagick.cpp --- inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 2009-01-28 22:12:57.000000000 +0100 +++ inkscape/src/extension/internal/bitmap/imagemagick.cpp 2009-03-02 17:05:57.000000000 +0100 @@ -114,7 +114,7 @@ ImageMagickDocCache::readImage(const cha char *search = (char *) g_strndup(xlink, 30); if (strstr(search, "base64") != (char*)NULL) { // 7 = strlen("base64") + strlen(",") - char* pureBase64 = strstr(xlink, "base64") + 7; + const char* pureBase64 = strstr(xlink, "base64") + 7; Magick::Blob blob; blob.base64(pureBase64); image->read(blob); diff -up inkscape/src/libnr/nr-object.cpp.gcc44 inkscape/src/libnr/nr-object.cpp --- inkscape/src/libnr/nr-object.cpp.gcc44 2009-03-02 17:06:46.000000000 +0100 +++ inkscape/src/libnr/nr-object.cpp 2009-03-02 17:06:58.000000000 +0100 @@ -198,8 +198,8 @@ NRObject *NRObject::alloc(NRType type) ); memset(object, 0xf0, c->isize); - object->klass = c; c->cpp_ctor(object); + object->klass = c; nr_class_tree_object_invoke_init (c, object); return object; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 25 Mar 2008 16:27:22 -0000 1.16 +++ .cvsignore 2 Mar 2009 21:27:10 -0000 1.17 @@ -1 +1 @@ -inkscape-0.46.tar.bz2 +inkscape.tar.lzma Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- inkscape.spec 25 Feb 2009 07:24:49 -0000 1.63 +++ inkscape.spec 2 Mar 2009 21:27:11 -0000 1.64 @@ -1,22 +1,28 @@ +# Preserve lot of debugging information for now. This effectively +# disables FORTIFY_SOURCE, so it must be enabled before Gold +%define optflags %(rpm --eval %%optflags |sed 's/-O2/-O0/') + Name: inkscape -Version: 0.46 -Release: 11%{?dist} +Version: 0.47 +Release: 0.4.20090301svn%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPLv2+ URL: http://inkscape.sourceforge.net/ -Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 -Patch0: inkscape-0.46-cxxinclude.patch -Patch1: inkscape-0.46-desktop.patch -Patch2: inkscape-0.46pre2-icons.patch -Patch3: inkscape-0.46-fixlatex.patch -Patch4: inkscape-0.46-gtkopen.patch -Patch5: inkscape-0.46-gtk2.13.3.patch -Patch6: inkscape-0.46-poppler-0.8.3.patch -Patch7: inkscape-0.46-uniconv.patch -Patch8: inkscape-0.46-colors.patch -Patch9: inkscape-0.46-bitmap-fonts.patch +#Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 +# svn export -r20798 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 20798 inkscape +# tar cf - inkscape |lzma -9 -c >inkscape.tar.lzma +# Chuck the SVN snapshot specific blocks when bumping to a release: +# perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' = 1.13 BuildRequires: cairo-devel -BuildRequires: openssl-devel BuildRequires: dos2unix -BuildRequires: perl-XML-Parser BuildRequires: python-devel BuildRequires: poppler-devel BuildRequires: loudmouth-devel BuildRequires: boost-devel - -# Use popt-devel if Fedora 8, RHEL 6, newer or unknown, -# rely on popt otherwise -%if %{!?fedora:8}%{?fedora} < 8 || %{!?rhel:6}%{?rhel} < 6 -BuildRequires: popt -%else +BuildRequires: gsl-devel +BuildRequires: libwpg-devel +BuildRequires: ImageMagick-c++-devel +BuildRequires: perl(XML::Parser) +BuildRequires: perl(ExtUtils::Embed) +BuildRequires: intltool +# A packaging bug in EL-5 +%if 0%{?fedora > 6} BuildRequires: popt-devel +%else +BuildRequires: popt %endif - +# BEGIN SVN SNAPSHOT SPECIFIC +BuildRequires: autoconf +BuildRequires: automake +# END SVN SNAPSHOT SPECIFIC + +# Incompatible license +BuildConflicts: openssl-devel + +# Disable all for now. TODO: Be smarter +%if 0 +Requires: dia Requires: pstoedit +Requires: ghostscript Requires: perl(Image::Magick) +Requires: tex(latex) +Requires: tex(dvips) +Requires: transfig +Requires: gimp Requires: numpy -Requires: PyXML Requires: python-lxml Requires: uniconvertor +# TODO: Deal with these (autoreqs, disabled now): +# perl(Cwd) +# perl(Exporter) +# perl(File::Basename) +# perl(Getopt::Long) +# perl(Getopt::Std) +# perl(MIME::Base64) +# perl(Pod::Usage) +# perl(SVG) +# perl(SVG::Parser) +# perl(XML::XQL) +# perl(XML::XQL::DOM) +# perl(strict) +# perl(vars) +# perl(warnings) +%endif Requires(post): desktop-file-utils Requires(postun): desktop-file-utils +# Filter out perl requires and provides +# XXX: For now _all_ +%global __perl_provides %{nil} +%global __perl_requires %{nil} + %description -Inkscape is a vector-based drawing program, like CorelDraw?? or Adobe -Illustrator?? from the proprietary software world, and Sketch or Karbon14 from -the free software world. It is free software, distributed under the terms of -the Gnu General Public License, Version 2. - -Inkscape uses W3C SVG as its native file format. It is therefore a very useful -tool for web designers and as an interchange format for desktop publishing. - -It has a relatively modern display engine, giving you finely antialiased -display, alpha transparencies, vector fonts and so on. Inkscape is written in -C and C++, using the Gtk+ toolkit and optionally some Gnome libraries. +Inkscape is a vector graphics editor, with capabilities similar to +Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector +Graphics (SVG) file format. It is therefore a very useful tool for web +designers and as an interchange format for desktop publishing. + +Inkscape supports many advanced SVG features (markers, clones, alpha +blending, etc.) and great care is taken in designing a streamlined +interface. It is very easy to edit nodes, perform complex path operations, +trace bitmaps and much more. %prep -%setup -q -%patch0 -p1 -b .cxxinclude -%patch1 -p1 -b .desktop -%patch2 -p1 -b .icons -%patch3 -p1 -b .fixlatex -%patch4 -p0 -b .gtkopen -%patch5 -p1 -b .gtk2.13.3 -%patch6 -p1 -b .poppler-0.8.3 -%patch7 -p1 -b .uniconv -%patch8 -p2 -b .colors -%patch9 -p1 -b .bitmap-fonts -find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';' -find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';' +%setup -q -n %{name} +%patch0 -p1 -b .uniconv +%patch1 -p1 -b .gcc44 +%patch2 -p0 -b .oldcairo +# BEGIN SVN SNAPSHOT SPECIFIC +%patch3 -p0 -b .automake +# END SVN SNAPSHOT SPECIFIC + +# https://bugs.launchpad.net/inkscape/+bug/314381 +# A couple of files have executable bits set, +# despite not being executable +(find . \( -name '*.cpp' -o -name '*.h' \) -perm +111 + find share/extensions -name '*.py' -perm +111 +) |xargs chmod -x + +# Fix end of line encodings dos2unix -k -q share/extensions/*.py %build -%configure \ ---disable-dependency-tracking \ ---with-xinerama \ ---enable-static=no \ ---with-python \ ---with-perl \ ---with-gnome-vfs \ ---with-inkjar \ ---enable-inkboard \ ---enable-lcms \ ---enable-poppler-cairo +# BEGIN SVN SNAPSHOT SPECIFIC +sh autogen.sh +# END SVN SNAPSHOT SPECIFIC +%configure \ + --with-python \ + --with-perl \ + --with-gnome-vfs \ + --with-xft \ + --enable-lcms \ + --enable-poppler-cairo \ + --disable-dependency-tracking +# --enable-inkboard \ make %{?_smp_mflags} @@ -111,15 +156,21 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -%find_lang %{name} find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' -rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/outline2svg.* -rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/txt2svg.* +desktop-file-install --vendor fedora --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop + +# No skencil anymore +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh + +%find_lang %{name} + -desktop-file-install --vendor fedora --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +%check +# XXX: Tests fail, ignore it for now +make -k check || : %clean @@ -127,27 +178,64 @@ %post -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +exec >/dev/null 2>&1 +update-desktop-database %{_datadir}/applications || : +touch --no-create %{_datadir}/icons/hicolor +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +exec >/dev/null 2>&1 +update-desktop-database %{_datadir}/applications || : +touch --no-create %{_datadir}/icons/hicolor +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README -%doc %{_mandir}/man1/* -%{_bindir}/* -%{_datadir}/%{name}/ -%{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/* -%{_mandir}/fr/man1/* +%{_bindir}/inkscape +%{_bindir}/inkview +%{_datadir}/inkscape +%{_datadir}/applications/fedora-inkscape.desktop +%{_datadir}/icons/hicolor/scalable/apps/inkscape.svg +%{_datadir}/pixmaps/inkscape.png +%{_mandir}/man1/inkscape.1* +%{_mandir}/man1/inkview.1* +%{_mandir}/fr/man1/inkscape.1* %changelog -* Tue Feb 24 2009 Fedora Release Engineering - 0.46-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Tue Mar 01 2009 Lubomir Rintel - 0.47-0.4.20090301svn +- Bump to later SVN snapshot to fix inkscape/+bug/331864 +- Fix a startup crash when compiled with GCC 4.4 +- It even runs now! :) + +* Tue Feb 27 2009 Lubomir Rintel - 0.47-0.4.20090227svn +- Enable the test suite + +* Tue Feb 27 2009 Lubomir Rintel - 0.47-0.3.20090227svn +- Past midnight! :) +- More recent snapshot, our gcc44 fixes now upstream +- One more gcc44 fix, it even compiles now +- We install icons now, update icon cache +- Disable inkboard, for it won't currently compile + +* Tue Feb 26 2009 Lubomir Rintel - 0.47-0.3.20090226svn +- Later snapshot +- Compile with GCC 4.4 + +* Tue Jan 06 2009 Lubomir Rintel - 0.47-0.3.20090105svn +- Update to newer SVN +- Drop upstreamed patches +- Enable WordPerfect Graphics support +- Enable embedded Perl scripting +- Enable Imagemagick support +- Disable OpenSSL due to licensing issues + +* Thu Aug 14 2008 Lubomir Rintel - 0.47-0.3.20080814svn +- Update to today's SVN snapshot +- Drop the upstreamed poppler patch * Sat Jan 17 2009 Tomas Mraz - 0.46-10 - rebuild with new openssl @@ -157,17 +245,15 @@ * Sun Nov 30 2008 Ignacio Vazquez-Abrams - 0.46-8 - Rebuild for Python 2.6 +>>>>>>> 1.63 -* Fri Nov 28 2008 Caol??n McNamara - 0.46-7 -- rebuild for dependencies - -* Fri Oct 17 2008 Lubomir Rintel - 0.46-6 -- Fix color sliders with recent GTK (#467431) - -* Wed Aug 13 2008 Lubomir Rintel - 0.46-5 +* Wed Aug 13 2008 Lubomir Rintel - 0.47-0.2.20080705svn - Rediff patches for zero fuzz - Use uniconvertor to handle CDR and WMF (#458845) +* Wed Jul 09 2008 Lubomir Rintel - 0.47-0.1.20080705svn +- Subversion snapshot + * Wed Jul 09 2008 Lubomir Rintel - 0.46-4 - Fix compile issues with newer gtk and poppler Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 25 Mar 2008 16:27:22 -0000 1.16 +++ sources 2 Mar 2009 21:27:11 -0000 1.17 @@ -1 +1 @@ -59997096c3640b2601c2b4afba8a3d75 inkscape-0.46.tar.bz2 +8803034773154e5d90e3bdac7de7ab30 inkscape.tar.lzma --- inkscape-0.46-bitmap-fonts.patch DELETED --- --- inkscape-0.46-colors.patch DELETED --- --- inkscape-0.46-cxxinclude.patch DELETED --- --- inkscape-0.46-desktop.patch DELETED --- --- inkscape-0.46-fixlatex.patch DELETED --- --- inkscape-0.46-gtk2.13.3.patch DELETED --- --- inkscape-0.46-gtkopen.patch DELETED --- --- inkscape-0.46-poppler-0.8.3.patch DELETED --- --- inkscape-0.46-uniconv.patch DELETED --- --- inkscape-0.46pre2-icons.patch DELETED --- From pkgdb at fedoraproject.org Mon Mar 2 21:28:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:28:11 +0000 Subject: [pkgdb] gkrellm-themes ownership updated Message-ID: <20090302212810.B8651208480@bastion.fedora.phx.redhat.com> Package gkrellm-themes in Fedora devel is now owned by pali To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-themes From pkgdb at fedoraproject.org Mon Mar 2 21:28:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:28:09 +0000 Subject: [pkgdb] gkrellm-themes ownership updated Message-ID: <20090302212830.902042084D0@bastion.fedora.phx.redhat.com> Package gkrellm-themes in Fedora 9 is now owned by pali To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-themes From orion at fedoraproject.org Mon Mar 2 21:28:39 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Mon, 2 Mar 2009 21:28:39 +0000 (UTC) Subject: rpms/hdf/F-10 hdf-4.2r4-buffer.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.5, 1.6 hdf.spec, 1.28, 1.29 sources, 1.5, 1.6 hdf-4.2r2-libm.patch, 1.1, NONE Message-ID: <20090302212839.14D3A70115@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/hdf/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12776/F-10 Modified Files: .cvsignore hdf.spec sources Added Files: hdf-4.2r4-buffer.patch import.log Removed Files: hdf-4.2r2-libm.patch Log Message: Sync to devel hdf-4.2r4-buffer.patch: --- NEW FILE hdf-4.2r4-buffer.patch --- --- HDF4.2r4/mfhdf/libsrc/tncunlim.c.buffer 2009-01-10 19:34:26.000000000 -0700 +++ HDF4.2r4/mfhdf/libsrc/tncunlim.c 2009-02-25 11:08:46.000000000 -0700 @@ -646,7 +646,7 @@ long dimsize = 0, /* unlimited dimension size */ dimsize1 = 0, dimsize2 = 0; /* other dimension sizes */ short outdata[DIM0][DIM1][DIM2]; /* data read back */ - char varname[10]; /* variable name */ + char varname[12]; /* variable name */ nc_type rh_type; /* variable type */ int rh_ndims; /* number of dims */ int rh_dims[H4_MAX_VAR_DIMS]; /* variable shape */ --- NEW FILE import.log --- hdf-4_2r4-1_fc11:F-10:hdf-4.2r4-1.fc11.src.rpm:1236029258 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hdf/F-10/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Feb 2008 16:52:36 -0000 1.5 +++ .cvsignore 2 Mar 2009 21:28:08 -0000 1.6 @@ -1 +1 @@ -HDF4.2r3.tar.gz +HDF4.2r4.tar.gz Index: hdf.spec =================================================================== RCS file: /cvs/pkgs/rpms/hdf/F-10/hdf.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- hdf.spec 1 Oct 2008 17:59:49 -0000 1.28 +++ hdf.spec 2 Mar 2009 21:28:08 -0000 1.29 @@ -1,6 +1,6 @@ Name: hdf -Version: 4.2r3 -Release: 4%{?dist} +Version: 4.2r4 +Release: 1%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD Group: System Environment/Libraries @@ -10,7 +10,8 @@ Patch1: hdf-4.2r3-ppc.patch Patch2: hdf-4.2r2-sparc.patch Patch3: hdf-4.2r2-s390.patch -Patch4: hdf-4.2r2-libm.patch +# Reported upstream to help at hdfgroup.org +Patch4: hdf-4.2r4-buffer.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex byacc libjpeg-devel zlib-devel BuildRequires: gcc-gfortran @@ -42,7 +43,7 @@ %patch1 -p1 -b .ppc %patch2 -p1 -b .sparc %patch3 -p1 -b .s390 -%patch4 -p1 -b .libm +%patch4 -p1 -b .buffer chmod a-x *hdf/*/*.c hdf/*/*.h # restore include file timestamps modified by patching @@ -109,7 +110,15 @@ %changelog -* Wed Oct 1 2008 Orion Poplawski 4.2.r3-4 +* Wed Feb 25 2009 Orion Poplawski 4.2r4-1 +- Update to 4.2r4 +- Add patch to increase buffer size in test +- Drop upstreamed libm patch + +* Tue Feb 24 2009 Fedora Release Engineering - 4.2r3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Oct 1 2008 Orion Poplawski 4.2r3-4 - Rebase maxavailfiles patch * Sun Sep 21 2008 Ville Skytt?? - 4.2r3-3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hdf/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Feb 2008 16:52:36 -0000 1.5 +++ sources 2 Mar 2009 21:28:08 -0000 1.6 @@ -1 +1 @@ -767382a31470e795f4c4217e33a689e8 HDF4.2r3.tar.gz +cbcfcdb65f27b743c6001c17619704a8 HDF4.2r4.tar.gz --- hdf-4.2r2-libm.patch DELETED --- From mclasen at fedoraproject.org Mon Mar 2 21:28:55 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Mar 2009 21:28:55 +0000 (UTC) Subject: rpms/at-spi/devel .cvsignore, 1.58, 1.59 at-spi.spec, 1.113, 1.114 sources, 1.58, 1.59 Message-ID: <20090302212855.6D3C670115@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/at-spi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12704 Modified Files: .cvsignore at-spi.spec sources Log Message: 1.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/at-spi/devel/.cvsignore,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- .cvsignore 20 Jan 2009 17:03:34 -0000 1.58 +++ .cvsignore 2 Mar 2009 21:28:25 -0000 1.59 @@ -1 +1 @@ -at-spi-1.25.5.tar.bz2 +at-spi-1.25.92.tar.bz2 Index: at-spi.spec =================================================================== RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- at-spi.spec 24 Feb 2009 02:51:57 -0000 1.113 +++ at-spi.spec 2 Mar 2009 21:28:25 -0000 1.114 @@ -7,16 +7,16 @@ %define orbit2_version 2.6.0 %define pango_version 1.2.0 -Summary: Assistive Technology Service Provider Interface +Summary: Assistive Technology Service Provider Interface Name: at-spi -Version: 1.25.5 +Version: 1.25.92 Release: 2%{?dist} URL: http://developer.gnome.org/projects/gap/ Source0: http://download.gnome.org/sources/at-spi/1.25/%{name}-%{version}.tar.bz2 License: LGPLv2+ Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gtk2 >= %{gtk2_version} Requires: libbonobo >= %{libbonobo_version} Requires: ORBit2 >= %{orbit2_version} @@ -37,12 +37,11 @@ BuildRequires: fontconfig BuildRequires: gettext BuildRequires: intltool -BuildRequires: perl(XML::Parser) BuildRequires: libX11-devel BuildRequires: libXtst-devel BuildRequires: libXi-devel -BuildRequires: libXevie-devel -BuildRequires: libXt-devel +BuildRequires: libXevie-devel +BuildRequires: libXt-devel BuildRequires: gnome-common BuildRequires: automake, autoconf, libtool, intltool @@ -103,7 +102,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/*.la mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} \ - $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version} + $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version} %pre if [ "$1" -gt 1 -a -f %{_sysconfdir}/gconf/schemas/at-spi.schemas ]; then @@ -145,7 +144,7 @@ %{_datadir}/idl/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/* -%{_includedir}/* +%{_includedir}/* %files python %defattr(-,root,root) @@ -153,6 +152,9 @@ %changelog +* Mon Mar 2 2009 Matthias Clasen - 1.25.92-1 +- Update to 1.25.92 + * Mon Feb 23 2009 Fedora Release Engineering - 1.25.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/at-spi/devel/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- sources 20 Jan 2009 17:03:34 -0000 1.58 +++ sources 2 Mar 2009 21:28:25 -0000 1.59 @@ -1 +1 @@ -9d9b6ad01c0dc8a6aff8b948368bddff at-spi-1.25.5.tar.bz2 +1ef31941b3d8814964faecfa7a3ffd54 at-spi-1.25.92.tar.bz2 From pkgdb at fedoraproject.org Mon Mar 2 21:29:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:29:33 +0000 Subject: [pkgdb] gkrellm: pali has requested watchbugzilla Message-ID: <20090302212933.503722084D2@bastion.fedora.phx.redhat.com> pali has requested the watchbugzilla acl on gkrellm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm From pkgdb at fedoraproject.org Mon Mar 2 21:29:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:29:40 +0000 Subject: [pkgdb] gkrellm: pali has given up watchbugzilla Message-ID: <20090302212939.999112084D0@bastion.fedora.phx.redhat.com> pali has given up the watchbugzilla acl on gkrellm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm From lkundrak at fedoraproject.org Mon Mar 2 21:29:53 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Mon, 2 Mar 2009 21:29:53 +0000 (UTC) Subject: rpms/inkscape/devel inkscape.spec,1.64,1.65 Message-ID: <20090302212953.DD59070115@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13084 Modified Files: inkscape.spec Log Message: Fix changelog dates Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- inkscape.spec 2 Mar 2009 21:27:11 -0000 1.64 +++ inkscape.spec 2 Mar 2009 21:29:23 -0000 1.65 @@ -206,22 +206,22 @@ %changelog -* Tue Mar 01 2009 Lubomir Rintel - 0.47-0.4.20090301svn +* Mon Mar 02 2009 Lubomir Rintel - 0.47-0.4.20090301svn - Bump to later SVN snapshot to fix inkscape/+bug/331864 - Fix a startup crash when compiled with GCC 4.4 - It even runs now! :) -* Tue Feb 27 2009 Lubomir Rintel - 0.47-0.4.20090227svn +* Fri Feb 27 2009 Lubomir Rintel - 0.47-0.4.20090227svn - Enable the test suite -* Tue Feb 27 2009 Lubomir Rintel - 0.47-0.3.20090227svn +* Thu Feb 27 2009 Lubomir Rintel - 0.47-0.3.20090227svn - Past midnight! :) - More recent snapshot, our gcc44 fixes now upstream - One more gcc44 fix, it even compiles now - We install icons now, update icon cache - Disable inkboard, for it won't currently compile -* Tue Feb 26 2009 Lubomir Rintel - 0.47-0.3.20090226svn +* Thu Feb 26 2009 Lubomir Rintel - 0.47-0.3.20090226svn - Later snapshot - Compile with GCC 4.4 From lkundrak at fedoraproject.org Mon Mar 2 21:32:02 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Mon, 2 Mar 2009 21:32:02 +0000 (UTC) Subject: rpms/inkscape/devel inkscape.spec,1.65,1.66 Message-ID: <20090302213202.6722D70116@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13692 Modified Files: inkscape.spec Log Message: Fix changelog dates Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- inkscape.spec 2 Mar 2009 21:29:23 -0000 1.65 +++ inkscape.spec 2 Mar 2009 21:31:32 -0000 1.66 @@ -214,7 +214,7 @@ * Fri Feb 27 2009 Lubomir Rintel - 0.47-0.4.20090227svn - Enable the test suite -* Thu Feb 27 2009 Lubomir Rintel - 0.47-0.3.20090227svn +* Fri Feb 27 2009 Lubomir Rintel - 0.47-0.3.20090227svn - Past midnight! :) - More recent snapshot, our gcc44 fixes now upstream - One more gcc44 fix, it even compiles now @@ -245,7 +245,6 @@ * Sun Nov 30 2008 Ignacio Vazquez-Abrams - 0.46-8 - Rebuild for Python 2.6 ->>>>>>> 1.63 * Wed Aug 13 2008 Lubomir Rintel - 0.47-0.2.20080705svn - Rediff patches for zero fuzz From lkundrak at fedoraproject.org Mon Mar 2 21:35:07 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Mon, 2 Mar 2009 21:35:07 +0000 (UTC) Subject: rpms/inkscape/devel inkscape.spec,1.66,1.67 Message-ID: <20090302213508.481E170115@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14310 Modified Files: inkscape.spec Log Message: Now for real--remove the out of order changelog entries Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- inkscape.spec 2 Mar 2009 21:31:32 -0000 1.66 +++ inkscape.spec 2 Mar 2009 21:34:32 -0000 1.67 @@ -237,15 +237,6 @@ - Update to today's SVN snapshot - Drop the upstreamed poppler patch -* Sat Jan 17 2009 Tomas Mraz - 0.46-10 -- rebuild with new openssl - -* Tue Jan 13 2009 Lubomir Rintel - 0.46-9 -- Fix crash with bitmap font (#477158) - -* Sun Nov 30 2008 Ignacio Vazquez-Abrams - 0.46-8 -- Rebuild for Python 2.6 - * Wed Aug 13 2008 Lubomir Rintel - 0.47-0.2.20080705svn - Rediff patches for zero fuzz - Use uniconvertor to handle CDR and WMF (#458845) From pkgdb at fedoraproject.org Mon Mar 2 21:36:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:36:22 +0000 Subject: [pkgdb] gkrellm: pali has requested watchcommits Message-ID: <20090302213643.C5E112084D1@bastion.fedora.phx.redhat.com> pali has requested the watchcommits acl on gkrellm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm From pkgdb at fedoraproject.org Mon Mar 2 21:36:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:36:12 +0000 Subject: [pkgdb] gkrellm: pali has requested commit Message-ID: <20090302213644.E30A6208526@bastion.fedora.phx.redhat.com> pali has requested the commit acl on gkrellm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm From pkgdb at fedoraproject.org Mon Mar 2 21:36:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:36:46 +0000 Subject: [pkgdb] gkrellm: pali has requested watchbugzilla Message-ID: <20090302213646.DA81F20851A@bastion.fedora.phx.redhat.com> pali has requested the watchbugzilla acl on gkrellm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm From pkgdb at fedoraproject.org Mon Mar 2 21:36:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:36:34 +0000 Subject: [pkgdb] gkrellm: pali has requested watchcommits Message-ID: <20090302213657.76DCD20820B@bastion.fedora.phx.redhat.com> pali has requested the watchcommits acl on gkrellm (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm From pkgdb at fedoraproject.org Mon Mar 2 21:36:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:36:25 +0000 Subject: [pkgdb] gkrellm: pali has requested commit Message-ID: <20090302213659.7C20820851D@bastion.fedora.phx.redhat.com> pali has requested the commit acl on gkrellm (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm From pkgdb at fedoraproject.org Mon Mar 2 21:37:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:37:08 +0000 Subject: [pkgdb] gkrellm: pali has requested watchbugzilla Message-ID: <20090302213709.2607B20851F@bastion.fedora.phx.redhat.com> pali has requested the watchbugzilla acl on gkrellm (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm From pkgdb at fedoraproject.org Mon Mar 2 21:36:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:36:49 +0000 Subject: [pkgdb] samba4 had acl change status Message-ID: <20090302213710.AC3CF208519@bastion.fedora.phx.redhat.com> mbarnes has set the commit acl on samba4 (Fedora devel) to Approved for simo To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/samba4 From pkgdb at fedoraproject.org Mon Mar 2 21:37:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:37:30 +0000 Subject: [pkgdb] gkrellm: pali has requested watchbugzilla Message-ID: <20090302213730.C20C920851D@bastion.fedora.phx.redhat.com> pali has requested the watchbugzilla acl on gkrellm (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm From pkgdb at fedoraproject.org Mon Mar 2 21:37:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:37:31 +0000 Subject: [pkgdb] gkrellm: pali has requested watchcommits Message-ID: <20090302213731.5FBA5208521@bastion.fedora.phx.redhat.com> pali has requested the watchcommits acl on gkrellm (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm From pkgdb at fedoraproject.org Mon Mar 2 21:37:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:37:00 +0000 Subject: [pkgdb] gkrellm: pali has requested commit Message-ID: <20090302213732.8FBEE20851F@bastion.fedora.phx.redhat.com> pali has requested the commit acl on gkrellm (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm From pkgdb at fedoraproject.org Mon Mar 2 21:37:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 21:37:38 +0000 Subject: [pkgdb] samba4 had acl change status Message-ID: <20090302213739.04BB2208524@bastion.fedora.phx.redhat.com> mbarnes has set the approveacls acl on samba4 (Fedora devel) to Approved for simo To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/samba4 From davidz at fedoraproject.org Mon Mar 2 21:38:00 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Mon, 2 Mar 2009 21:38:00 +0000 (UTC) Subject: rpms/DeviceKit/devel .cvsignore, 1.3, 1.4 DeviceKit.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <20090302213800.A203670115@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/DeviceKit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14599 Modified Files: .cvsignore DeviceKit.spec sources Log Message: * Mon Mar 02 2009 David Zeuthen - 003-1%{?dist} - Update to release 003 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Nov 2008 15:44:47 -0000 1.3 +++ .cvsignore 2 Mar 2009 21:37:29 -0000 1.4 @@ -1 +1,2 @@ DeviceKit-002.tar.gz +DeviceKit-003.tar.gz Index: DeviceKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit/devel/DeviceKit.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- DeviceKit.spec 23 Feb 2009 21:45:02 -0000 1.10 +++ DeviceKit.spec 2 Mar 2009 21:37:30 -0000 1.11 @@ -6,8 +6,8 @@ Summary: Device Enumeration Framework Name: DeviceKit -Version: 002 -Release: 9 +Version: 003 +Release: 1 License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit.git;a=summary @@ -25,8 +25,6 @@ Requires: glib2 >= %{glib2_version} Requires: udev >= %{udev_version} -Patch0: devicekit-dbus-permissions.patch - %description DeviceKit is a framework for enumerating devices. @@ -44,7 +42,6 @@ %prep %setup -q -%patch0 -p1 %build %configure @@ -98,6 +95,9 @@ %{_datadir}/gtk-doc/html/devkit/* %changelog +* Mon Mar 02 2009 David Zeuthen - 003-1%{?dist} +- Update to release 003 + * Mon Feb 23 2009 Fedora Release Engineering - 002-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Nov 2008 15:44:47 -0000 1.3 +++ sources 2 Mar 2009 21:37:30 -0000 1.4 @@ -1 +1 @@ -0049da1b9e1137ed18c4f68088f6dea7 DeviceKit-002.tar.gz +8b311547f4a2c8c6b6598e3318d66cd7 DeviceKit-003.tar.gz From pjones at fedoraproject.org Mon Mar 2 21:38:19 2009 From: pjones at fedoraproject.org (Peter Jones) Date: Mon, 2 Mar 2009 21:38:19 +0000 (UTC) Subject: rpms/grub/devel grub.spec,1.82,1.83 Message-ID: <20090302213819.A21A370115@cvs1.fedora.phx.redhat.com> Author: pjones Update of /cvs/extras/rpms/grub/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15017 Modified Files: grub.spec Log Message: * Mon Mar 02 2009 Peter Jones - 0.97-42 - Switch from i386 to i586. Index: grub.spec =================================================================== RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- grub.spec 2 Mar 2009 20:43:19 -0000 1.82 +++ grub.spec 2 Mar 2009 21:37:49 -0000 1.83 @@ -1,11 +1,11 @@ Name: grub Version: 0.97 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Grand Unified Boot Loader. Group: System Environment/Base License: GPLv2+ -ExclusiveArch: i386 x86_64 ia64 +ExclusiveArch: i586 x86_64 ia64 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, ncurses-static, texinfo BuildRequires: autoconf /usr/lib/crt1.o automake gnu-efi >= 3.0e-3 Requires(post): /sbin/install-info @@ -112,6 +112,9 @@ %{_datadir}/grub %changelog +* Mon Mar 02 2009 Peter Jones - 0.97-42 +- Switch from i386 to i586. + * Mon Mar 02 2009 Peter Jones - 0.97-41 - Fix CD Booting on EFI. - Fix XFS build on x86_64. From kevin at fedoraproject.org Mon Mar 2 21:39:05 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 2 Mar 2009 21:39:05 +0000 (UTC) Subject: rpms/inconsolata-fonts/devel dead.package, NONE, 1.1 import.log, 1.1, NONE inconsolata-fonts.spec, 1.3, NONE Makefile, 1.1, NONE sources, 1.2, NONE Message-ID: <20090302213905.5700070116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/extras/rpms/inconsolata-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15380 Added Files: dead.package Removed Files: import.log inconsolata-fonts.spec Makefile sources Log Message: Mark package dead, replaced by levien-inconsolata-fonts --- NEW FILE dead.package --- This package was re-named levien-inconsolata-fonts --- import.log DELETED --- --- inconsolata-fonts.spec DELETED --- --- Makefile DELETED --- --- sources DELETED --- From davidz at fedoraproject.org Mon Mar 2 21:40:18 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Mon, 2 Mar 2009 21:40:18 +0000 (UTC) Subject: rpms/DeviceKit-disks/devel .cvsignore, 1.2, 1.3 DeviceKit-disks.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <20090302214018.751DB70115@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/DeviceKit-disks/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15874 Modified Files: .cvsignore DeviceKit-disks.spec sources Log Message: * Mon Mar 02 2009 David Zeuthen - 003-1%{?dist} - Update to version 003 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jul 2008 19:37:27 -0000 1.2 +++ .cvsignore 2 Mar 2009 21:39:47 -0000 1.3 @@ -1 +1,2 @@ DeviceKit-disks-002.git20080720.tar.gz +DeviceKit-disks-003.tar.gz Index: DeviceKit-disks.spec =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DeviceKit-disks.spec 23 Feb 2009 21:45:59 -0000 1.4 +++ DeviceKit-disks.spec 2 Mar 2009 21:39:47 -0000 1.5 @@ -4,18 +4,18 @@ %define devicekit_version 002 %define polkit_version 0.8 %define parted_version 1.8.8 -%define udev_version 124 +%define udev_version 139 %define mdadm_version 2.6.7 %define device_mapper_version 1.02 Summary: Disk Management Service Name: DeviceKit-disks -Version: 002 -Release: 3.git20080720%{?dist} +Version: 003 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary -Source0: %{name}-%{version}.git20080720.tar.gz +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -37,8 +37,6 @@ Requires: smartmontools Conflicts: kernel < 2.6.25 -Patch0: devicekit-disks-dbus-permissions.patch - %description DeviceKit-disks provides a daemon, D-Bus API and command line tools for managing disks and storage devices. @@ -55,7 +53,6 @@ %prep %setup -q -%patch0 -p1 %build %configure @@ -84,7 +81,7 @@ %{_sysconfdir}/profile.d/*.sh %{_sysconfdir}/udev/rules.d/*.rules -/lib/udev/part_id +/lib/udev/devkit-disks-part-id /lib/udev/devkit-disks-dm-export /sbin/umount.devkit @@ -110,6 +107,9 @@ %{_datadir}/gtk-doc/html/devkit-disks/* %changelog +* Mon Mar 02 2009 David Zeuthen - 003-1%{?dist} +- Update to version 003 + * Mon Feb 23 2009 Fedora Release Engineering - 002-3.git20080720 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jul 2008 19:37:27 -0000 1.2 +++ sources 2 Mar 2009 21:39:47 -0000 1.3 @@ -1 +1 @@ -e5fc1c23c3cf7036ba8c92d19f4fdbca DeviceKit-disks-002.git20080720.tar.gz +7b88acc8cb0744b110e96557f5bcd9e3 DeviceKit-disks-003.tar.gz From james at fedoraproject.org Mon Mar 2 21:40:31 2009 From: james at fedoraproject.org (James Antill) Date: Mon, 2 Mar 2009 21:40:31 +0000 (UTC) Subject: rpms/yum-utils/devel yumdownloader-import-os.patch, NONE, 1.1 yum-utils.spec, 1.57, 1.58 Message-ID: <20090302214031.7E55070115@cvs1.fedora.phx.redhat.com> Author: james Update of /cvs/pkgs/rpms/yum-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16196 Modified Files: yum-utils.spec Added Files: yumdownloader-import-os.patch Log Message: * Mon Mar 2 2009 James Antill - fix yumdownloader for koji yumdownloader-import-os.patch: --- NEW FILE yumdownloader-import-os.patch --- commit c080e7050972d635ce0a8f293145422aec475d7b Author: James Antill Date: Mon Mar 2 16:34:18 2009 -0500 Fix yumdownload to import os diff --git a/yumdownloader.py b/yumdownloader.py index e5e9c94..ed7f11a 100755 --- a/yumdownloader.py +++ b/yumdownloader.py @@ -15,6 +15,7 @@ import sys sys.path.insert(0,'/usr/share/yum-cli') +import os import yum from yum.misc import getCacheDir, setup_locale Index: yum-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- yum-utils.spec 2 Mar 2009 10:32:13 -0000 1.57 +++ yum-utils.spec 2 Mar 2009 21:40:01 -0000 1.58 @@ -1,10 +1,11 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 1.1.20 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Development/Tools Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz +Patch0: yumdownloader-import-os.patch URL: http://yum.baseurl.org/download/yum-utils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -353,6 +354,8 @@ %prep %setup -q +%patch0 -p1 + %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install @@ -591,6 +594,9 @@ %changelog +* Mon Mar 2 2009 James Antill +- fix yumdownloader for koji + * Mon Mar 2 2009 Tim Lauridsen - set yum require to 3.2.21 (the 3.2.21 in rawhide is patched to yum head, so it matches the need yum 3.2.22 code) - Added versioned yum- to make rpm/yum happy. From jlaska at fedoraproject.org Mon Mar 2 21:40:33 2009 From: jlaska at fedoraproject.org (James Laska) Date: Mon, 2 Mar 2009 21:40:33 +0000 (UTC) Subject: rpms/snake/devel .cvsignore, 1.11, 1.12 import.log, 1.6, 1.7 snake.spec, 1.20, 1.21 sources, 1.19, 1.20 Message-ID: <20090302214033.16C4170115@cvs1.fedora.phx.redhat.com> Author: jlaska Update of /cvs/pkgs/rpms/snake/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16280/devel Modified Files: .cvsignore import.log snake.spec sources Log Message: Update to snake-0.11-0.14 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 2 Mar 2009 21:22:11 -0000 1.11 +++ .cvsignore 2 Mar 2009 21:40:02 -0000 1.12 @@ -1 +1 @@ -snake-0.11-0.13.tar.bz2 +snake-0.11-0.14.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 2 Mar 2009 21:22:11 -0000 1.6 +++ import.log 2 Mar 2009 21:40:02 -0000 1.7 @@ -4,3 +4,4 @@ snake-0_11-0_11_fc10:HEAD:snake-0.11-0.11.fc10.src.rpm:1229635008 snake-0_11-0_12_fc10:HEAD:snake-0.11-0.12.fc10.src.rpm:1231191321 snake-0_11-0_13_fc11:HEAD:snake-0.11-0.13.fc11.src.rpm:1236028891 +snake-0_11-0_14_fc11:HEAD:snake-0.11-0.14.fc11.src.rpm:1236029965 Index: snake.spec =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/snake.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- snake.spec 2 Mar 2009 21:22:11 -0000 1.20 +++ snake.spec 2 Mar 2009 21:40:02 -0000 1.21 @@ -4,7 +4,7 @@ Name: snake Summary: Smart Network Automated Kickstart Environment Version: 0.11 -%define rel 0.13 +%define rel 0.14 Release: %{rel}%{?dist} Source0: http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2 License: GPLv2+ @@ -135,6 +135,9 @@ %changelog +* Mon Mar 2 2009 James Laska 0.11-0.14 +- Bump to work around previous koji tag + * Mon Mar 2 2009 James Laska 0.11-0.13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/snake/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 2 Mar 2009 21:22:11 -0000 1.19 +++ sources 2 Mar 2009 21:40:02 -0000 1.20 @@ -1 +1 @@ -ce7682306613429a7dbf3cef78438b12 snake-0.11-0.13.tar.bz2 +05d5497710e35da48c2a4a095e9a9416 snake-0.11-0.14.tar.bz2 From pawsa at fedoraproject.org Mon Mar 2 21:41:20 2009 From: pawsa at fedoraproject.org (Pawel Salek) Date: Mon, 2 Mar 2009 21:41:20 +0000 (UTC) Subject: rpms/balsa/devel balsa.spec,1.47,1.48 Message-ID: <20090302214120.148C870116@cvs1.fedora.phx.redhat.com> Author: pawsa Update of /cvs/pkgs/rpms/balsa/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14825 Modified Files: balsa.spec Log Message: - specify a correct patch path strip argument. Index: balsa.spec =================================================================== RCS file: /cvs/pkgs/rpms/balsa/devel/balsa.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- balsa.spec 2 Mar 2009 21:17:13 -0000 1.47 +++ balsa.spec 2 Mar 2009 21:40:49 -0000 1.48 @@ -2,7 +2,7 @@ Name: balsa Version: 2.3.28 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mail Client Group: Applications/Internet @@ -42,7 +42,7 @@ %prep %setup -q -%patch1 -p0 +%patch1 -p1 perl -pi -e 's,-DGTK_DISABLE_DEPRECATED,,g' libbalsa/Makefile* libinit_balsa/Makefile* src/Makefile* @@ -107,6 +107,9 @@ %changelog +* Mon Mar 2 2009 Pawel Salek - 2.3.28-2 +- specify a correct patch path strip argument. + * Mon Mar 2 2009 Pawel Salek - 2.3.28-1 - upgrade to 2.3.28. Fix bug 487780. From davidz at fedoraproject.org Mon Mar 2 21:42:15 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Mon, 2 Mar 2009 21:42:15 +0000 (UTC) Subject: rpms/gnome-disk-utility/devel .cvsignore, 1.2, 1.3 gnome-disk-utility.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <20090302214215.ED5A170117@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/gnome-disk-utility/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17169 Modified Files: .cvsignore gnome-disk-utility.spec sources Log Message: * Mon Mar 02 2009 David Zeuthen - 0.2-1%{?dist} - Update to version 0.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jul 2008 19:38:35 -0000 1.2 +++ .cvsignore 2 Mar 2009 21:42:15 -0000 1.3 @@ -1 +1,2 @@ gnome-disk-utility-0.1.git20080720.tar.bz2 +gnome-disk-utility-0.2.tar.bz2 Index: gnome-disk-utility.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/gnome-disk-utility.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnome-disk-utility.spec 24 Feb 2009 22:51:24 -0000 1.4 +++ gnome-disk-utility.spec 2 Mar 2009 21:42:15 -0000 1.5 @@ -6,16 +6,16 @@ %define polkit_version 0.8 %define polkit_gnome_version 0.8 %define gnome_keyring_version 2.22 -%define devicekit_disks_version 002 +%define devicekit_disks_version 003 Summary: Disk management application Name: gnome-disk-utility -Version: 0.1 -Release: 0.git20080720.2%{?dist}.1 +Version: 0.2 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=users/david/gnome-disk-utility.git;a=summary -Source0: %{name}-%{version}.git20080720.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -36,7 +36,7 @@ %description This package contains the Palimpsest disk management application. -Palimpsest supports partitioning, file system creation, encryption, +Palimpsest supports partitioning, file system creation, encryption, RAID, SMART monitoring, etc. %package libs @@ -194,6 +194,9 @@ %{_includedir}/gnome-disk-utility/gdu-gtk/* %changelog +* Mon Mar 02 2009 David Zeuthen - 0.2-1%{?dist} +- Update to version 0.2 + * Tue Feb 24 2009 Fedora Release Engineering - 0.1-0.git20080720.2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jul 2008 19:38:35 -0000 1.2 +++ sources 2 Mar 2009 21:42:15 -0000 1.3 @@ -1 +1 @@ -c084cc2f0b3e97ff2f01a13d7c76651d gnome-disk-utility-0.1.git20080720.tar.bz2 +b320e428fdbc63445c310a538e10e4bc gnome-disk-utility-0.2.tar.bz2 From cwickert at fedoraproject.org Mon Mar 2 21:43:36 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Mar 2009 21:43:36 +0000 (UTC) Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.33,1.34 Message-ID: <20090302214336.30C1170116@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-panel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17546 Modified Files: xfce4-panel.spec Log Message: * Sat Feb 28 2009 Christoph Wickert - 4.6.0-2 - Fix directory ownership problems - Require xfce4-doc - Mark gtk-doc files as %doc Index: xfce4-panel.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/xfce4-panel.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- xfce4-panel.spec 27 Feb 2009 20:33:29 -0000 1.33 +++ xfce4-panel.spec 2 Mar 2009 21:43:05 -0000 1.34 @@ -1,7 +1,7 @@ Summary: Next generation panel for Xfce Name: xfce4-panel Version: 4.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-panel-%{version}.tar.bz2 @@ -11,6 +11,7 @@ Requires: libxfcegui4 >= %{version} Requires: Terminal Requires: mousepad +Requires: xfce4-doc BuildRequires: libxfcegui4-devel >= %{version} BuildRequires: libxml2-devel >= 2.4.0 BuildRequires: startup-notification-devel @@ -107,10 +108,10 @@ %{_libdir}/xfce4/panel-plugins/ %{_libdir}/libxfce4panel.so.* %{_bindir}/* -%{_libexecdir}/xfce4/ +%{_libexecdir}/xfce4/panel-plugins/ %{_datadir}/icons/hicolor/*/*/*.png -%{_datadir}/xfce4/doc/C/xfce4-panel.html -%{_datadir}/xfce4/doc/C/images/ +%doc %{_datadir}/xfce4/doc/*/images/* +%doc %{_datadir}/xfce4/doc/*/*.html %{_datadir}/xfce4/panel-plugins/ %{_datadir}/applications/xfce4-panel-manager.desktop @@ -118,10 +119,15 @@ %defattr(-, root,root,-) %{_libdir}/pkgconfig/* %{_libdir}/libxfce4panel.so -%{_datadir}/gtk-doc/html/libxfce4panel +%doc %{_datadir}/gtk-doc/html/libxfce4panel %{_includedir}/xfce4/libxfce4panel %changelog +* Sat Feb 28 2009 Christoph Wickert - 4.6.0-2 +- Fix directory ownership problems +- Require xfce4-doc +- Mark gtk-doc files as %%doc + * Thu Feb 26 2009 Kevin Fenzi - 4.6.0-1 - Update to 4.6.0 - Remove some unneeded BuildRequires From kevin at fedoraproject.org Mon Mar 2 21:45:31 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 2 Mar 2009 21:45:31 +0000 (UTC) Subject: comps comps-f11.xml.in,1.135,1.136 Message-ID: <20090302214531.0C55870116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/extras/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17866 Modified Files: comps-f11.xml.in Log Message: Change inconsolata-fonts to levien-inconsolata-fonts Index: comps-f11.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f11.xml.in,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- comps-f11.xml.in 27 Feb 2009 18:43:39 -0000 1.135 +++ comps-f11.xml.in 2 Mar 2009 21:45:00 -0000 1.136 @@ -1627,7 +1627,7 @@ hartke-aurulent-sans-fonts hartke-aurulent-sans-mono-fonts icelandic-fonts - inconsolata-fonts + levien-inconsolata-fonts khmeros-battambang-fonts khmeros-bokor-fonts khmeros-handwritten-fonts From mclasen at fedoraproject.org Mon Mar 2 21:46:53 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Mar 2009 21:46:53 +0000 (UTC) Subject: rpms/gtk2/devel .cvsignore, 1.101, 1.102 gtk2.spec, 1.365, 1.366 sources, 1.110, 1.111 disconnected-monitors.patch, 1.1, NONE monitor-sizes.patch, 1.1, NONE polkit-action.patch, 1.1, NONE Message-ID: <20090302214653.5131870116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gtk2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14355 Modified Files: .cvsignore gtk2.spec sources Removed Files: disconnected-monitors.patch monitor-sizes.patch polkit-action.patch Log Message: 2.15.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtk2/devel/.cvsignore,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- .cvsignore 18 Feb 2009 00:39:22 -0000 1.101 +++ .cvsignore 2 Mar 2009 21:46:22 -0000 1.102 @@ -1 +1 @@ -gtk+-2.15.4.tar.bz2 +gtk+-2.15.5.tar.bz2 Index: gtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.365 retrieving revision 1.366 diff -u -r1.365 -r1.366 --- gtk2.spec 26 Feb 2009 14:55:06 -0000 1.365 +++ gtk2.spec 2 Mar 2009 21:46:22 -0000 1.366 @@ -11,13 +11,13 @@ %define libpng_version 2:1.2.2-16 %define xrandr_version 1.2.99.4-2 -%define base_version 2.15.4 +%define base_version 2.15.5 %define bin_version 2.10.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 7%{?dist} +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gtk+/2.15/gtk+-%{version}.tar.bz2 @@ -31,9 +31,6 @@ Patch2: workaround.patch # http://bugzilla.redhat.com/show_bug.cgi?id=478400 Patch3: default_printer.patch -# from upstream -Patch4: disconnected-monitors.patch -Patch5: monitor-sizes.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} @@ -138,8 +135,6 @@ %patch0 -p1 -b .lib64 %patch2 -p1 -b .workaround %patch3 -p0 -b .default-printer -%patch4 -p1 -b .disconnected-monitors -%patch5 -p1 -b .monitor-sizes %build @@ -340,6 +335,9 @@ %changelog +* Mon Mar 2 2009 Matthias Clasen - 2.15.5-1 +- Update to 2.15.5 + * Thu Feb 26 2009 - Bastien Nocera - 2.15.4-7 - Require a newer libXrandr to build and run Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtk2/devel/sources,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- sources 18 Feb 2009 00:39:22 -0000 1.110 +++ sources 2 Mar 2009 21:46:22 -0000 1.111 @@ -1 +1 @@ -663b63d82d88215c1cc0c53390bf9512 gtk+-2.15.4.tar.bz2 +aa010d3fa57cba96f32db352eb35754f gtk+-2.15.5.tar.bz2 --- disconnected-monitors.patch DELETED --- --- monitor-sizes.patch DELETED --- --- polkit-action.patch DELETED --- From mbarnes at fedoraproject.org Mon Mar 2 21:47:53 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 2 Mar 2009 21:47:53 +0000 (UTC) Subject: rpms/evolution/devel .cvsignore,1.108,1.109 sources,1.108,1.109 Message-ID: <20090302214753.BFBCA70116@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18341 Modified Files: .cvsignore sources Log Message: Tarball upload successful. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- .cvsignore 2 Mar 2009 16:23:15 -0000 1.108 +++ .cvsignore 2 Mar 2009 21:47:23 -0000 1.109 @@ -0,0 +1 @@ +evolution-2.25.92.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- sources 2 Mar 2009 16:23:16 -0000 1.108 +++ sources 2 Mar 2009 21:47:23 -0000 1.109 @@ -0,0 +1 @@ +0a79bf1f00e38c55df7b619b5f74b4c3 evolution-2.25.92.tar.bz2 From jwilson at fedoraproject.org Mon Mar 2 21:49:14 2009 From: jwilson at fedoraproject.org (Jarod Wilson) Date: Mon, 2 Mar 2009 21:49:14 +0000 (UTC) Subject: rpms/kernel/devel kernel.spec,1.1360,1.1361 Message-ID: <20090302214914.A7BC870116@cvs1.fedora.phx.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18654 Modified Files: kernel.spec Log Message: narf. over-zealous s/i386/i586/, this isn't rpm build arch related, its for the kernel build itself... Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1360 retrieving revision 1.1361 diff -u -r1.1360 -r1.1361 --- kernel.spec 2 Mar 2009 20:50:59 -0000 1.1360 +++ kernel.spec 2 Mar 2009 21:48:44 -0000 1.1361 @@ -272,7 +272,7 @@ %ifarch %{all_x86} %define asmarch x86 -%define hdrarch i586 +%define hdrarch i386 %define all_arch_configs kernel-%{version}-i?86*.config %define image_install_path boot %define kernel_image arch/x86/boot/bzImage @@ -1795,10 +1795,6 @@ # and build. %changelog -* Mon Mar 02 2009 Jarod Wilson -- Change 32-bit x86 %%hdrarch from i386 to i586, since we - don't build i386 anymore in F11+ - * Mon Mar 02 2009 Kyle McMartin 2.6.29-0.179.rc6.git5 - fix oops in ipv6 when NET_NS is enabled. From mclasen at fedoraproject.org Mon Mar 2 21:51:55 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Mar 2009 21:51:55 +0000 (UTC) Subject: rpms/gnome-applets/devel .cvsignore, 1.77, 1.78 gnome-applets.spec, 1.329, 1.330 sources, 1.87, 1.88 gnome-applets-resizeable.patch, 1.2, NONE Message-ID: <20090302215155.2266070116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-applets/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18969 Modified Files: .cvsignore gnome-applets.spec sources Removed Files: gnome-applets-resizeable.patch Log Message: 2.15.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applets/devel/.cvsignore,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- .cvsignore 19 Feb 2009 05:10:29 -0000 1.77 +++ .cvsignore 2 Mar 2009 21:51:24 -0000 1.78 @@ -1 +1 @@ -gnome-applets-2.25.91.tar.bz2 +gnome-applets-2.25.92.tar.bz2 Index: gnome-applets.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.329 retrieving revision 1.330 diff -u -r1.329 -r1.330 --- gnome-applets.spec 24 Feb 2009 22:42:02 -0000 1.329 +++ gnome-applets.spec 2 Mar 2009 21:51:24 -0000 1.330 @@ -34,8 +34,8 @@ Summary: Small applications for the GNOME panel Name: gnome-applets -Version: 2.25.91 -Release: 3%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -61,9 +61,6 @@ # and keep the mixer hidden away from the add to panel dialog Patch41: gnome-applets-no-mixer-icon.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=572372 -Patch42: gnome-applets-resizeable.patch - BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libgnomeui-devel >= %{libgnomeui_version} @@ -97,7 +94,7 @@ BuildRequires: which BuildRequires: libtool autoconf gettext intltool BuildRequires: pkgconfig -BuildRequires: gnome-icon-theme +BuildRequires: gnome-icon-theme BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version} BuildRequires: libxslt # for patch 39 @@ -133,10 +130,10 @@ Requires: pkgconfig %description -The gnome-applets package contains small applications which generally -run in the background and display their output to the GNOME panel. -It includes a clock, a character palette, load monitors, little toys, -and more. +The gnome-applets package contains small applications which generally +run in the background and display their output to the GNOME panel. +It includes a clock, a character palette, load monitors, little toys, +and more. %prep %setup -q @@ -147,7 +144,6 @@ %patch31 -p1 -b .fix-find %patch40 -p1 -b .battstat-null %patch41 -p1 -b .no-mixer-icon -%patch42 -p1 -b .resizeable # We don't ship gnome-system-tools rm -rf modemlights @@ -178,7 +174,7 @@ cd po grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep # some files go missing due to our modemlights surgery -grep -v "modemlights/GNOME_ModemLights.xml\|modemlights/modemlights.ui\|modemlights/modem-applet.c" POTFILES.keep > POTFILES.keep2 +grep -v "modemlights/GNOME_ModemLights.xml\|modemlights/modemlights.ui\|modemlights/modem-applet.c" POTFILES.keep > POTFILES.keep2 mv POTFILES.keep2 POTFILES.in intltool-update --pot for p in *.po; do @@ -342,6 +338,9 @@ %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy %changelog +* Mon Mar 2 2009 Matthias Clasen - 1:2.25.92-1 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 1:2.25.91-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applets/devel/sources,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- sources 19 Feb 2009 05:34:45 -0000 1.87 +++ sources 2 Mar 2009 21:51:24 -0000 1.88 @@ -1,2 +1,2 @@ -fe766bc1e01934024140d11870c1766e gnome-applets-2.25.91.tar.bz2 +6c19de60f92fa619892f16dae8ebf238 gnome-applets-2.25.92.tar.bz2 ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2 --- gnome-applets-resizeable.patch DELETED --- From lyosnorezel at fedoraproject.org Mon Mar 2 21:54:58 2009 From: lyosnorezel at fedoraproject.org (Lyos Gemini Norezel) Date: Mon, 2 Mar 2009 21:54:58 +0000 (UTC) Subject: rpms/thibault-fonts/devel thibault-fonts.spec,1.5,1.6 Message-ID: <20090302215458.C226E70116@cvs1.fedora.phx.redhat.com> Author: lyosnorezel Update of /cvs/pkgs/rpms/thibault-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19482 Modified Files: thibault-fonts.spec Log Message: Index: thibault-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/thibault-fonts/devel/thibault-fonts.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- thibault-fonts.spec 2 Mar 2009 21:00:06 -0000 1.5 +++ thibault-fonts.spec 2 Mar 2009 21:54:28 -0000 1.6 @@ -11,7 +11,7 @@ Name: %{fontname}-fonts Version: 0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Thibault.org font collection Group: User Interface/X @@ -121,6 +121,7 @@ tar xvzf %{SOURCE3} -C staypuft %build +fontforge '-lang=ff' pushd Essays1743 fontforge -c 'Open($1); Generate($2)' Essays1743.sfd ../Essays1743.ttf fontforge -c 'Open($1); Generate($2)' Essays1743-Bold.sfd ../Essays1743-Bold.ttf @@ -184,6 +185,10 @@ %changelog #thibault +* Mon Mar 2 2009 Lyos Gemini Norezel 0.1-6 +- Fixed error in fontforge script that was +- caused by some fucker turning on python bindings. + * Mon Mar 2 2009 Lyos Gemini Norezel 0.1-5 - Fixed errors in previous modifications. - Updated for latest policy changes. From cwickert at fedoraproject.org Mon Mar 2 21:59:13 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Mar 2009 21:59:13 +0000 (UTC) Subject: rpms/xfce4-appfinder/devel xfce4-appfinder.spec,1.22,1.23 Message-ID: <20090302215913.2929B70116@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-appfinder/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20160 Modified Files: xfce4-appfinder.spec Log Message: adjust buildrequires Index: xfce4-appfinder.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xfce4-appfinder.spec 27 Feb 2009 20:18:08 -0000 1.22 +++ xfce4-appfinder.spec 2 Mar 2009 21:58:42 -0000 1.23 @@ -12,7 +12,7 @@ BuildRequires: libxfce4menu-devel >= %{version} BuildRequires: startup-notification-devel BuildRequires: gettext intltool -BuildRequires: Thunar-devel +BuildRequires: Thunar-devel >= 1.0.0 BuildRequires: xfconf-devel %description From pawsa at fedoraproject.org Mon Mar 2 22:12:44 2009 From: pawsa at fedoraproject.org (Pawel Salek) Date: Mon, 2 Mar 2009 22:12:44 +0000 (UTC) Subject: rpms/balsa/devel balsa.spec,1.48,1.49 Message-ID: <20090302221244.DFF0270116@cvs1.fedora.phx.redhat.com> Author: pawsa Update of /cvs/pkgs/rpms/balsa/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22940 Modified Files: balsa.spec Log Message: - Add autoreconf, mock on devel does not work right now. Index: balsa.spec =================================================================== RCS file: /cvs/pkgs/rpms/balsa/devel/balsa.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- balsa.spec 2 Mar 2009 21:40:49 -0000 1.48 +++ balsa.spec 2 Mar 2009 22:12:14 -0000 1.49 @@ -2,7 +2,7 @@ Name: balsa Version: 2.3.28 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Mail Client Group: Applications/Internet @@ -48,6 +48,7 @@ %build +autoreconf %configure %{config_opts} make %{?_smp_mflags} @@ -107,6 +108,9 @@ %changelog +* Mon Mar 2 2009 Pawel Salek - 2.3.28-3 +- Add autoreconf, mock on devel does not work right now. + * Mon Mar 2 2009 Pawel Salek - 2.3.28-2 - specify a correct patch path strip argument. From pjones at fedoraproject.org Mon Mar 2 22:16:20 2009 From: pjones at fedoraproject.org (Peter Jones) Date: Mon, 2 Mar 2009 22:16:20 +0000 (UTC) Subject: rpms/grub/devel grub.spec,1.83,1.84 Message-ID: <20090302221620.C744E70116@cvs1.fedora.phx.redhat.com> Author: pjones Update of /cvs/extras/rpms/grub/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23582 Modified Files: grub.spec Log Message: * Mon Mar 02 2009 Peter Jones - 0.97-42 - Switch from i386 to i586. Index: grub.spec =================================================================== RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- grub.spec 2 Mar 2009 21:37:49 -0000 1.83 +++ grub.spec 2 Mar 2009 22:15:50 -0000 1.84 @@ -7,7 +7,8 @@ ExclusiveArch: i586 x86_64 ia64 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, ncurses-static, texinfo -BuildRequires: autoconf /usr/lib/crt1.o automake gnu-efi >= 3.0e-3 +BuildRequires: autoconf /usr/lib/crt1.o automake +BuildRequires: gnu-efi >= 3.0e-5 Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Requires: mktemp From pjones at fedoraproject.org Mon Mar 2 22:16:27 2009 From: pjones at fedoraproject.org (Peter Jones) Date: Mon, 2 Mar 2009 22:16:27 +0000 (UTC) Subject: rpms/gnu-efi/devel gnu-efi.spec,1.27,1.28 Message-ID: <20090302221627.1B41B70116@cvs1.fedora.phx.redhat.com> Author: pjones Update of /cvs/extras/rpms/gnu-efi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23633 Modified Files: gnu-efi.spec Log Message: * Mon Mar 02 2009 Peter Jones - 3.0e-5 - Switch to i586 from i386. Index: gnu-efi.spec =================================================================== RCS file: /cvs/extras/rpms/gnu-efi/devel/gnu-efi.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gnu-efi.spec 24 Feb 2009 23:51:53 -0000 1.27 +++ gnu-efi.spec 2 Mar 2009 22:15:56 -0000 1.28 @@ -1,7 +1,7 @@ Summary: Development Libraries and headers for EFI Name: gnu-efi Version: 3.0e -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/System License: GPLv2+ URL: ftp://ftp.hpl.hp.com/pub/linux-ia64 @@ -13,7 +13,7 @@ Patch4: gnu-efi-3.0d-uefi_wrap.patch Patch5: gnu-efi-3.0d-uefi_wrap_call10.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: i386 x86_64 +ExclusiveArch: i586 x86_64 %description This package contains development headers and libraries for developing @@ -57,6 +57,9 @@ %{_libdir}/* %changelog +* Mon Mar 02 2009 Peter Jones - 3.0e-5 +- Switch to i586 from i386. + * Tue Feb 24 2009 Fedora Release Engineering - 3.0e-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Mon Mar 2 22:22:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 22:22:40 +0000 Subject: [pkgdb] gkrellm-themes ownership updated Message-ID: <20090302222240.76363208525@bastion.fedora.phx.redhat.com> Package gkrellm-themes in Fedora devel was orphaned by pali To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-themes From pkgdb at fedoraproject.org Mon Mar 2 22:22:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 22:22:51 +0000 Subject: [pkgdb] gkrellm-themes ownership updated Message-ID: <20090302222251.D3F4A2084D0@bastion.fedora.phx.redhat.com> Package gkrellm-themes in Fedora 9 was orphaned by pali To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-themes From cwickert at fedoraproject.org Mon Mar 2 22:23:05 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Mar 2009 22:23:05 +0000 (UTC) Subject: rpms/xfdesktop/devel xfdesktop-4.6.0-redhat-menus.patch, NONE, 1.1 xfdesktop.spec, 1.30, 1.31 Message-ID: <20090302222305.C91DD70116@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfdesktop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24865 Modified Files: xfdesktop.spec Added Files: xfdesktop-4.6.0-redhat-menus.patch Log Message: * Mon Mar 02 2009 Christoph Wickert - 4.6.0-3 - Fix directory ownership problems - Require xfce4-doc and redhat-menus - Tweak and clean up Xfce menu xfdesktop-4.6.0-redhat-menus.patch: --- NEW FILE xfdesktop-4.6.0-redhat-menus.patch --- --- xfdesktop-4.6.0.orig/modules/menu/menu-data/xfce-applications.menu 2009-01-12 23:03:21.000000000 +0100 +++ xfdesktop-4.6.0/modules/menu/menu-data/xfce-applications.menu 2009-02-28 23:26:49.000000000 +0100 @@ -18,7 +18,8 @@ xfce4-file-manager.desktop xfce4-web-browser.desktop - Settings + Preferences + Administration @@ -28,10 +29,14 @@ - Settings - xfce-settings.directory + Preferences + Settings.directory - Settings + + Settings + System + Screensaver + @@ -40,25 +45,29 @@ - - Screensavers - xfce-screensavers.directory - - Screensaver - - + + + + Administration + SystemConfig.directory + + + Settings + System + Screensaver + + + Accessories xfce-accessories.directory - - Accessibility - Core - Legacy + Utility - + System + @@ -124,7 +133,11 @@ System xfce-system.directory - System + + System + Settings + Screensaver + @@ -133,7 +146,13 @@ xfce-other.directory - + + Core + Settings + SystemSetup + X-Red-Hat-ServerConfig + Screensaver + Index: xfdesktop.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- xfdesktop.spec 28 Feb 2009 04:01:51 -0000 1.30 +++ xfdesktop.spec 2 Mar 2009 22:22:35 -0000 1.31 @@ -1,7 +1,7 @@ Summary: Desktop manager for the XFce Desktop Environment Name: xfdesktop Version: 4.6.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfdesktop-%{version}.tar.bz2 @@ -10,6 +10,8 @@ Patch0: xfdesktop-4.5.92-backdrop-image.patch # Enable distro specific logo in desktop menu Patch1: xfdesktop-4.5.92-desktop-menu-icon.patch +# Use redhat-menus to avoid duplicate entries in the menu +Patch2: xfdesktop-4.6.0-redhat-menus.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -17,6 +19,8 @@ Requires: xfwm4 Requires: xfce4-panel Requires: desktop-backgrounds-basic +Requires: xfce4-doc +Requires: redhat-menus BuildRequires: libxfcegui4-devel >= %{version} BuildRequires: xfce4-panel-devel >= %{version} BuildRequires: libxml2-devel @@ -40,6 +44,7 @@ %patch0 -p1 -b .backdrop %patch1 -p1 -b .distro-logo +%patch2 -p1 -b .orig %build %configure @@ -76,7 +81,8 @@ %{_datadir}/applications/* %{_datadir}/icons/hicolor/*/*/* %{_datadir}/pixmaps/* -%{_datadir}/xfce4/doc +%doc %{_datadir}/xfce4/doc/*/images/* +%doc %{_datadir}/xfce4/doc/*/*.html %{_datadir}/xfce4/backdrops %{_mandir}/man1/* %config(noreplace) %{_sysconfdir}/xdg/menus/xfce-applications.menu @@ -84,6 +90,11 @@ %{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop %changelog +* Mon Mar 02 2009 Christoph Wickert - 4.6.0-3 +- Fix directory ownership problems +- Require xfce4-doc and redhat-menus +- Tweak and clean up Xfce menu + * Fri Feb 27 2009 Kevin Fenzi - 4.6.0-2 - Add libSM-devel to BuildRequires From cwickert at fedoraproject.org Mon Mar 2 22:28:13 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Mar 2009 22:28:13 +0000 (UTC) Subject: rpms/xfdesktop/devel xfdesktop.spec,1.31,1.32 Message-ID: <20090302222813.D775A70116@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfdesktop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25690 Modified Files: xfdesktop.spec Log Message: fix dir ownership Index: xfdesktop.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- xfdesktop.spec 2 Mar 2009 22:22:35 -0000 1.31 +++ xfdesktop.spec 2 Mar 2009 22:27:43 -0000 1.32 @@ -86,7 +86,7 @@ %{_datadir}/xfce4/backdrops %{_mandir}/man1/* %config(noreplace) %{_sysconfdir}/xdg/menus/xfce-applications.menu -%{_datadir}/desktop-directories +%{_datadir}/desktop-directories/* %{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop %changelog From ausil at fedoraproject.org Mon Mar 2 22:36:36 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Mon, 2 Mar 2009 22:36:36 +0000 (UTC) Subject: rpms/fedora-packager/devel .cvsignore, 1.5, 1.6 fedora-packager.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <20090302223636.44D2870116@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/extras/rpms/fedora-packager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26970 Modified Files: .cvsignore fedora-packager.spec sources Log Message: update to 0.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-packager/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Aug 2008 18:10:34 -0000 1.5 +++ .cvsignore 2 Mar 2009 22:36:05 -0000 1.6 @@ -1 +1 @@ -fedora-packager-0.3.1.tar.bz2 +fedora-packager-0.3.3.tar.bz2 Index: fedora-packager.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-packager/devel/fedora-packager.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fedora-packager.spec 24 Feb 2009 16:36:19 -0000 1.5 +++ fedora-packager.spec 2 Mar 2009 22:36:05 -0000 1.6 @@ -1,17 +1,18 @@ Name: fedora-packager -Version: 0.3.1 -Release: 2%{?dist} +Version: 0.3.3 +Release: 1%{?dist} Summary: Tools for setting up a fedora maintainer environment Group: Applications/Productivity License: GPLv2+ URL: https://fedorahosted.org/fedora-packager -Source0: https://fedorahosted.org/fedora-packager/attachment/wiki/WikiStart/fedora-packager-%{version}.tar.bz2 +Source0: https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: koji bodhi-client plague-client +Requires: koji bodhi-client Requires: rpm-build rpmdevtools rpmlint -Requires: mock pyOpenSSL curl wget cvs +Requires: mock cvs curl wget +Requires: pyOpenSSL python-pycurl BuildArch: noarch @@ -44,6 +45,9 @@ %changelog +* Mon Mar 02 2009 Dennis Gilmore - 0.3.3-1 +- update to 0.3.3 + * Tue Feb 24 2009 Fedora Release Engineering - 0.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-packager/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Aug 2008 18:10:34 -0000 1.5 +++ sources 2 Mar 2009 22:36:05 -0000 1.6 @@ -1 +1 @@ -6860e38e5755e3e7f65bc26864427706 fedora-packager-0.3.1.tar.bz2 +94a56c521445b5744213c603c9501ac5 fedora-packager-0.3.3.tar.bz2 From cwickert at fedoraproject.org Mon Mar 2 22:46:41 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Mar 2009 22:46:41 +0000 (UTC) Subject: rpms/xfprint/devel xfprint.spec,1.27,1.28 Message-ID: <20090302224641.A64CC70116@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfprint/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29104 Modified Files: xfprint.spec Log Message: * Sat Feb 28 2009 Christoph Wickert - 4.6.0-2 - Fix directory ownership problems - Move gtk-doc into devel package and mark it %doc - Make devel package require pkgconfig and gtk-doc - Require xfce4-doc Index: xfprint.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfprint/devel/xfprint.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- xfprint.spec 27 Feb 2009 20:25:43 -0000 1.27 +++ xfprint.spec 2 Mar 2009 22:46:11 -0000 1.28 @@ -1,7 +1,7 @@ Summary: Print dialog and printer manager for Xfce 4 Name: xfprint Version: 4.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.xfce.org Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfprint-%{version}.tar.bz2 @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libxfcegui4 >= %{version} Requires: a2ps +Requires: xfce4-doc BuildRequires: glib2-devel BuildRequires: libxfcegui4-devel >= %{version} BuildRequires: a2ps @@ -26,6 +27,8 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libxfcegui4-devel >= %{version} +Requires: pkgconfig +Requires: gtk-doc %description devel Static libraries and header files for the Xfce xfprint library. @@ -72,9 +75,8 @@ %{_libdir}/xfce4/xfprint-plugins %{_libdir}/*.so.* %{_datadir}/applications/* -%{_datadir}/xfce4/doc/C -%{_datadir}/xfce4/doc/fr -%{_datadir}/gtk-doc/html/libxfprint +%doc %{_datadir}/xfce4/doc/*/images/* +%doc %{_datadir}/xfce4/doc/*/*.html %{_datadir}/icons/hicolor/*/*/* %files devel @@ -82,8 +84,15 @@ %{_includedir}/xfce4/libxfprint %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc +%doc %{_datadir}/gtk-doc/html/libxfprint %changelog +* Sat Feb 28 2009 Christoph Wickert - 4.6.0-2 +- Fix directory ownership problems +- Move gtk-doc into devel package and mark it %%doc +- Make devel package require pkgconfig and gtk-doc +- Require xfce4-doc + * Thu Feb 26 2009 Kevin Fenzi - 4.6.0-1 - Update to 4.6.0 From pkgdb at fedoraproject.org Mon Mar 2 22:51:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 22:51:51 +0000 Subject: [pkgdb] heartbeat (Fedora EPEL, 5) updated by toshio Message-ID: <20090302225151.9734E208480@bastion.fedora.phx.redhat.com> toshio added a Fedora EPEL 5 branch for heartbeat toshio has set commit to Approved for provenpackager on heartbeat (Fedora EPEL 5) toshio has set build to Approved for provenpackager on heartbeat (Fedora EPEL 5) toshio has set checkout to Approved for provenpackager on heartbeat (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/heartbeat From ausil at fedoraproject.org Mon Mar 2 22:56:32 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Mon, 2 Mar 2009 22:56:32 +0000 (UTC) Subject: rpms/fedora-packager/F-10 .cvsignore, 1.5, 1.6 fedora-packager.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <20090302225632.DDDCC70116@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/extras/rpms/fedora-packager/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30327 Modified Files: .cvsignore fedora-packager.spec sources Log Message: update to 0.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-packager/F-10/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Aug 2008 18:10:34 -0000 1.5 +++ .cvsignore 2 Mar 2009 22:56:02 -0000 1.6 @@ -1 +1 @@ -fedora-packager-0.3.1.tar.bz2 +fedora-packager-0.3.3.tar.bz2 Index: fedora-packager.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-packager/F-10/fedora-packager.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-packager.spec 19 Aug 2008 18:10:34 -0000 1.4 +++ fedora-packager.spec 2 Mar 2009 22:56:02 -0000 1.5 @@ -1,17 +1,18 @@ Name: fedora-packager -Version: 0.3.1 +Version: 0.3.3 Release: 1%{?dist} Summary: Tools for setting up a fedora maintainer environment Group: Applications/Productivity License: GPLv2+ URL: https://fedorahosted.org/fedora-packager -Source0: https://fedorahosted.org/fedora-packager/attachment/wiki/WikiStart/fedora-packager-%{version}.tar.bz2 +Source0: https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: koji bodhi-client plague-client +Requires: koji bodhi-client Requires: rpm-build rpmdevtools rpmlint -Requires: mock pyOpenSSL curl wget cvs +Requires: mock cvs curl wget +Requires: pyOpenSSL python-pycurl BuildArch: noarch @@ -44,6 +45,12 @@ %changelog +* Mon Mar 02 2009 Dennis Gilmore - 0.3.3-1 +- update to 0.3.3 + +* Tue Feb 24 2009 Fedora Release Engineering - 0.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Aug 18 2008 Dennis Gilmore - 0.3.1-1 - update to 0.3.1 fedora-cvs allows anonymous checkout - fix some Requires add cvs curl and wget Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-packager/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Aug 2008 18:10:34 -0000 1.5 +++ sources 2 Mar 2009 22:56:02 -0000 1.6 @@ -1 +1 @@ -6860e38e5755e3e7f65bc26864427706 fedora-packager-0.3.1.tar.bz2 +94a56c521445b5744213c603c9501ac5 fedora-packager-0.3.3.tar.bz2 From caolanm at fedoraproject.org Mon Mar 2 23:02:13 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 2 Mar 2009 23:02:13 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1840,1.1841 Message-ID: <20090302230213.2317F70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31276 Modified Files: openoffice.org.spec Log Message: wrong language ? Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1840 retrieving revision 1.1841 diff -u -r1.1840 -r1.1841 --- openoffice.org.spec 2 Mar 2009 16:17:07 -0000 1.1840 +++ openoffice.org.spec 2 Mar 2009 23:01:42 -0000 1.1841 @@ -1701,7 +1701,7 @@ localize -m -x -l hi-IN -f hi-IN-D300-m40/hi-IN-300m40.sdf # i95786 tar xzf %{SOURCE16} -localize -m -x -l mai-IN -f Maithili-mai-ooo3.0.sdf +localize -m -x -l mai -f Maithili-mai-ooo3.0.sdf cd ../.. #build OOo, on failure make a stab at debugging the crash if any, and @@ -3327,7 +3327,6 @@ %dir %{baseinstdir} %dir %{basisinstdir}/program %{basisinstdir}/program/OGLTrans.uno.so -%dir %{basisinstdir}/share %dir %{basisinstdir}/share/config %dir %{basisinstdir}/share/config/soffice.cfg %dir %{basisinstdir}/share/config/soffice.cfg/simpress @@ -3446,7 +3445,6 @@ %{basisinstdir}/program/resource/forui%{UPD}en-US.res %{basisinstdir}/program/resource/sc%{UPD}en-US.res %{basisinstdir}/program/resource/solver%{UPD}en-US.res -%dir %{basisinstdir}/share %dir %{basisinstdir}/share/registry %dir %{basisinstdir}/share/registry/data %dir %{basisinstdir}/share/registry/data/org @@ -3517,7 +3515,6 @@ %defattr(-,root,root,-) %dir %{basisinstdir} %{basisinstdir}/help/en/sdraw.* -%dir %{basisinstdir}/share %dir %{basisinstdir}/share/registry %dir %{basisinstdir}/share/registry/data %dir %dir %{basisinstdir}/share/registry/data/org @@ -3583,7 +3580,6 @@ %dir %{basisinstdir} %dir %{basisinstdir}/program %{basisinstdir}/program/mailmerge.py* -%dir %{basisinstdir}/share %dir %{basisinstdir}/share/registry %dir %{basisinstdir}/share/registry/modules %dir %{basisinstdir}/share/registry/modules/org @@ -3608,7 +3604,6 @@ %dir %{basisinstdir}/program/resource %{basisinstdir}/program/resource/bf_sw%{UPD}en-US.res %{basisinstdir}/program/resource/t602filter%{UPD}en-US.res -%dir %{basisinstdir}/share %dir %{basisinstdir}/share/registry %dir %{basisinstdir}/share/registry/data %dir %{basisinstdir}/share/registry/data/org @@ -3702,7 +3697,6 @@ %dir %{basisinstdir}/program %{basisinstdir}/program/libanimcore.so %{basisinstdir}/program/libplaceware*.so -%dir %{basisinstdir}/share %dir %{basisinstdir}/share/config %dir %{basisinstdir}/share/config/soffice.cfg %dir %{basisinstdir}/share/config/soffice.cfg/simpress @@ -3865,7 +3859,6 @@ %files xsltfilter %defattr(-,root,root,-) %dir %{basisinstdir} -%dir %{basisinstdir}/share %dir %{basisinstdir}/share/registry %dir %{basisinstdir}/share/registry/modules %dir %{basisinstdir}/share/registry/modules/org @@ -3892,7 +3885,6 @@ %{basisinstdir}/program/classes/aportisdoc.jar %{basisinstdir}/program/classes/pexcel.jar %{basisinstdir}/program/classes/pocketword.jar -%dir %{basisinstdir}/share %dir %{basisinstdir}/share/registry %dir %{basisinstdir}/share/registry/modules %dir %{basisinstdir}/share/registry/modules/org @@ -3975,7 +3967,6 @@ %{basisinstdir}/program/pythonloader.uno.so %{basisinstdir}/program/pythonloader.unorc %{basisinstdir}/program/pyuno.so -%dir %{basisinstdir}/share %dir %{basisinstdir}/share/Scripts %{basisinstdir}/share/Scripts/python %dir %{basisinstdir}/share/registry From caolanm at fedoraproject.org Mon Mar 2 23:03:56 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 2 Mar 2009 23:03:56 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1841,1.1842 Message-ID: <20090302230356.B720670116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31496 Modified Files: openoffice.org.spec Log Message: wrong language ? Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1841 retrieving revision 1.1842 diff -u -r1.1841 -r1.1842 --- openoffice.org.spec 2 Mar 2009 23:01:42 -0000 1.1841 +++ openoffice.org.spec 2 Mar 2009 23:03:26 -0000 1.1842 @@ -25,7 +25,7 @@ %endif %if %{langpacks} -%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn uk mai-IN +%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn uk mai %else %define langpack_langs en-US %endif From ausil at fedoraproject.org Mon Mar 2 23:07:03 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Mon, 2 Mar 2009 23:07:03 +0000 (UTC) Subject: rpms/fedora-packager/F-9 .cvsignore, 1.4, 1.5 fedora-packager.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <20090302230703.8483270116@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/extras/rpms/fedora-packager/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31976 Modified Files: .cvsignore fedora-packager.spec sources Log Message: update tp 0.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-packager/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Apr 2008 13:22:20 -0000 1.4 +++ .cvsignore 2 Mar 2009 23:06:33 -0000 1.5 @@ -1 +1 @@ -fedora-packager-0.3.0.tar.bz2 +fedora-packager-0.3.3.tar.bz2 Index: fedora-packager.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-packager/F-9/fedora-packager.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-packager.spec 1 Apr 2008 13:22:20 -0000 1.3 +++ fedora-packager.spec 2 Mar 2009 23:06:33 -0000 1.4 @@ -1,17 +1,18 @@ Name: fedora-packager -Version: 0.3.0 +Version: 0.3.3 Release: 1%{?dist} Summary: Tools for setting up a fedora maintainer environment Group: Applications/Productivity License: GPLv2+ URL: https://fedorahosted.org/fedora-packager -Source0: https://fedorahosted.org/fedora-packager/attachment/wiki/WikiStart/fedora-packager-%{version}.tar.bz2 +Source0: https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: koji bodhi-client plague-client +Requires: koji bodhi-client Requires: rpm-build rpmdevtools rpmlint -Requires: mock pyOpenSSL +Requires: mock cvs curl wget +Requires: pyOpenSSL python-pycurl BuildArch: noarch @@ -44,6 +45,16 @@ %changelog +* Mon Mar 02 2009 Dennis Gilmore - 0.3.3-1 +- update to 0.3.3 + +* Tue Feb 24 2009 Fedora Release Engineering - 0.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Aug 18 2008 Dennis Gilmore - 0.3.1-1 +- update to 0.3.1 fedora-cvs allows anonymous checkout +- fix some Requires add cvs curl and wget + * Sun Mar 30 2008 Dennis Gilmore - 0.3.0-1 - update to 0.3.0 fedora-cvs uses pyOpenSSL to work out username - remove Requires on RCS's for fedora-hosted Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-packager/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Apr 2008 13:22:20 -0000 1.4 +++ sources 2 Mar 2009 23:06:33 -0000 1.5 @@ -1 +1 @@ -39cfae6f1905e0e564bddf53a2b0d495 fedora-packager-0.3.0.tar.bz2 +94a56c521445b5744213c603c9501ac5 fedora-packager-0.3.3.tar.bz2 From bskeggs at fedoraproject.org Mon Mar 2 23:10:22 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Mon, 2 Mar 2009 23:10:22 +0000 (UTC) Subject: rpms/kernel/devel config-generic, 1.250, 1.251 kernel.spec, 1.1361, 1.1362 Message-ID: <20090302231022.9476470116@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32489 Modified Files: config-generic kernel.spec Log Message: * Tue Mar 03 2009 Ben Skeggs - CONFIG_DRM_NOUVEAU_KMS got enabled somewhere, lets not do that yet Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- config-generic 28 Feb 2009 15:35:25 -0000 1.250 +++ config-generic 2 Mar 2009 23:09:52 -0000 1.251 @@ -2174,7 +2174,7 @@ CONFIG_DRM_I915_KMS=y CONFIG_DRM_VIA=m CONFIG_DRM_NOUVEAU=m -CONFIG_DRM_NOUVEAU_KMS=y +# CONFIG_DRM_NOUVEAU_KMS is not set # # PCMCIA character devices Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1361 retrieving revision 1.1362 diff -u -r1.1361 -r1.1362 --- kernel.spec 2 Mar 2009 21:48:44 -0000 1.1361 +++ kernel.spec 2 Mar 2009 23:09:52 -0000 1.1362 @@ -1795,6 +1795,9 @@ # and build. %changelog +* Tue Mar 03 2009 Ben Skeggs +- CONFIG_DRM_NOUVEAU_KMS got enabled somewhere, lets not do that yet + * Mon Mar 02 2009 Kyle McMartin 2.6.29-0.179.rc6.git5 - fix oops in ipv6 when NET_NS is enabled. From mbarnes at fedoraproject.org Mon Mar 2 23:10:40 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 2 Mar 2009 23:10:40 +0000 (UTC) Subject: rpms/pygobject2/devel .cvsignore,1.20,1.21 sources,1.20,1.21 Message-ID: <20090302231040.4B47F70116@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/pygobject2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32516 Modified Files: .cvsignore sources Log Message: Cute. Somehow I committed the SRPM as the source for this package. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pygobject2/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 22 Feb 2009 17:15:59 -0000 1.20 +++ .cvsignore 2 Mar 2009 23:10:09 -0000 1.21 @@ -1 +1 @@ -pygobject2-2.16.1-1.fc11.src.rpm +pygobject-2.16.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pygobject2/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 22 Feb 2009 17:16:00 -0000 1.20 +++ sources 2 Mar 2009 23:10:10 -0000 1.21 @@ -1 +1 @@ -fe4ab10c9c6a45c6866ebc807ebad34e pygobject2-2.16.1-1.fc11.src.rpm +8e26f2572e6b72dbd2591677055f8d30 pygobject-2.16.1.tar.bz2 From cwickert at fedoraproject.org Mon Mar 2 23:12:28 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Mar 2009 23:12:28 +0000 (UTC) Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.34,1.35 Message-ID: <20090302231228.10D6470117@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-panel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv425 Modified Files: xfce4-panel.spec Log Message: fix dir duplicate ownership Index: xfce4-panel.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/xfce4-panel.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- xfce4-panel.spec 2 Mar 2009 21:43:05 -0000 1.34 +++ xfce4-panel.spec 2 Mar 2009 23:11:57 -0000 1.35 @@ -100,7 +100,6 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc README ChangeLog NEWS COPYING AUTHORS -%dir %{_sysconfdir}/xdg/xfce4/ %dir %{_sysconfdir}/xdg/xfce4/panel/ %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/*.rc %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/panels.xml From jkratoch at fedoraproject.org Mon Mar 2 23:14:46 2009 From: jkratoch at fedoraproject.org (Jan Kratochvil) Date: Mon, 2 Mar 2009 23:14:46 +0000 (UTC) Subject: rpms/gdb/devel gdb-6.8-bz457187-largefile.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 gdb-6.3-readnever-20050907.patch, 1.4, 1.5 gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch, 1.9, 1.10 gdb-6.8-fortran-tag-constant.patch, 1.3, 1.4 gdb-6.8-inlining.patch, 1.8, 1.9 gdb-archer.patch, 1.1, 1.2 gdb.spec, 1.324, 1.325 sources, 1.30, 1.31 Message-ID: <20090302231446.9A0D370116@cvs1.fedora.phx.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1358 Modified Files: .cvsignore gdb-6.3-readnever-20050907.patch gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch gdb-6.8-fortran-tag-constant.patch gdb-6.8-inlining.patch gdb-archer.patch gdb.spec sources Added Files: gdb-6.8-bz457187-largefile.patch Log Message: * Mon Mar 2 2009 Jan Kratochvil - 6.8.50.20090302-1 - Include the Archer Project: http://sourceware.org/gdb/wiki/ProjectArcher * [python] Python scripting support: http://sourceware.org/gdb/wiki/PythonGdb * [catch-syscall] Trap and display syscalls. * [delayed-symfile] Improve startup performance by lazily read psymtabs. * [exception-rewind] Fix fatal C++ exceptions in an inferior function call. * [expr] Expressions, single-quote elimination, C++ input canonicalization. * [using-directive] C++ namespaces. * [vla] C variable length arrays / DW_FORM_block / Fortran dynamic arrays. * [misc] Fix debuginfoless `return' (BZ 365111), fix command-line macros for expected GCC (BZ 479914), new testcase for valgrind (for BZ 483262), implement `info common' for Fortran, fix Fortran logical-kind=8 (BZ 465310), fix static variable in C++ constructors (BZ 445912), fix power7 (BZ 485319). - Upgrade to the FSF GDB gdb-6.8.50 snapshot. - Fix parsing elf64-i386 files for kdump PAE vmcore dumps (BZ 457187). - Turn on 64-bit BFD support, globally enable AC_SYS_LARGEFILE. gdb-6.8-bz457187-largefile.patch: --- NEW FILE gdb-6.8-bz457187-largefile.patch --- gdb/ 2009-03-02 Jan Kratochvil * configure.ac: Call AC_SYS_LARGEFILE. * config.in: Regenerate. * configure: Regenerate. diff -up -rup gdb-orig/configure.ac gdb/configure.ac --- ./gdb-orig/configure.ac 2009-03-02 23:39:01.000000000 +0100 +++ ./gdb/configure.ac 2009-03-02 23:40:46.000000000 +0100 @@ -30,6 +30,7 @@ AC_GNU_SOURCE AC_AIX AC_ISC_POSIX gl_EARLY +AC_SYS_LARGEFILE AM_PROG_CC_STDC AC_CONFIG_AUX_DIR(..) diff -up -rup gdb-orig/config.in gdb/config.in --- ./gdb-orig/config.in 2009-03-02 23:39:01.000000000 +0100 +++ ./gdb/config.in 2009-03-02 23:40:53.000000000 +0100 @@ -725,6 +725,9 @@ # undef _ALL_SOURCE #endif +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS + /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # undef _GNU_SOURCE @@ -734,6 +737,9 @@ problem on IRIX 5. */ #undef _KMEMUSER +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES + /* Define to 1 if on MINIX. */ #undef _MINIX diff -up -rup gdb-orig/configure gdb/configure --- ./gdb-orig/configure 2009-03-02 23:39:01.000000000 +0100 +++ ./gdb/configure 2009-03-02 23:40:49.000000000 +0100 @@ -862,6 +862,7 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer + --disable-largefile omit support for large files --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-targets alternative target configurations @@ -3313,6 +3314,370 @@ _ACEOF +# Check whether --enable-largefile or --disable-largefile was given. +if test "${enable_largefile+set}" = set; then + enableval="$enable_largefile" + +fi; +if test "$enable_largefile" != no; then + + echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 +echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 +if test "${ac_cv_sys_largefile_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext + CC="$CC -n32" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi +fi +echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 +echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 +if test "${ac_cv_sys_file_offset_bits+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + while :; do + ac_cv_sys_file_offset_bits=no + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_file_offset_bits=64; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + break +done +fi +echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 +echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 +if test "$ac_cv_sys_file_offset_bits" != no; then + +cat >>confdefs.h <<_ACEOF +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +_ACEOF + +fi +rm -f conftest* + echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 +echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 +if test "${ac_cv_sys_large_files+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + while :; do + ac_cv_sys_large_files=no + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#define _LARGE_FILES 1 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_large_files=1; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + break +done +fi +echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 +echo "${ECHO_T}$ac_cv_sys_large_files" >&6 +if test "$ac_cv_sys_large_files" != no; then + +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF + +fi +rm -f conftest* +fi + Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 2 Mar 2009 00:11:34 -0000 1.31 +++ .cvsignore 2 Mar 2009 23:14:15 -0000 1.32 @@ -1 +1 @@ -gdb-6.8.50.20090228.tar.bz2 +gdb-6.8.50.20090302.tar.bz2 gdb-6.3-readnever-20050907.patch: Index: gdb-6.3-readnever-20050907.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-readnever-20050907.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gdb-6.3-readnever-20050907.patch 2 Mar 2009 00:11:35 -0000 1.4 +++ gdb-6.3-readnever-20050907.patch 2 Mar 2009 23:14:15 -0000 1.5 @@ -11,10 +11,10 @@ * gdb.texinfo (File Options): Document --readnever. -Index: gdb-6.8.50.20090226/gdb/doc/gdb.texinfo +Index: gdb-6.8.50.20090228/gdb/doc/gdb.texinfo =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/doc/gdb.texinfo 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/doc/gdb.texinfo 2009-02-28 07:19:50.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/doc/gdb.texinfo 2009-03-02 01:01:15.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/doc/gdb.texinfo 2009-03-02 01:01:23.000000000 +0100 @@ -988,6 +988,12 @@ Read each symbol file's entire symbol ta the default, which is to read it incrementally as it is needed. This makes startup slower, but makes future operations faster. @@ -28,10 +28,10 @@ @end table @node Mode Options -Index: gdb-6.8.50.20090226/gdb/main.c +Index: gdb-6.8.50.20090228/gdb/main.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/main.c 2009-02-28 07:15:57.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/main.c 2009-02-28 07:20:20.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/main.c 2009-03-02 01:01:17.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/main.c 2009-03-02 01:01:23.000000000 +0100 @@ -427,6 +427,7 @@ captured_main (void *data) {"xdb", no_argument, &xdb_commands, 1}, {"dbx", no_argument, &dbx_commands, 1}, @@ -48,10 +48,10 @@ "), stream); fputs_unfiltered (_("\ --se=FILE Use FILE as symbol file and executable file.\n\ -Index: gdb-6.8.50.20090226/gdb/symfile.c +Index: gdb-6.8.50.20090228/gdb/symfile.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/symfile.c 2009-02-27 07:51:56.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/symfile.c 2009-02-28 07:19:50.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/symfile.c 2009-03-02 01:01:17.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/symfile.c 2009-03-02 01:01:23.000000000 +0100 @@ -77,6 +77,7 @@ static void clear_symtab_users_cleanup ( /* Global variables owned by this file */ @@ -60,19 +60,19 @@ /* External variables and functions referenced. */ -Index: gdb-6.8.50.20090226/gdb/dwarf2read.c +Index: gdb-6.8.50.20090228/gdb/dwarf2read.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/dwarf2read.c 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/dwarf2read.c 2009-02-28 07:21:27.000000000 +0100 -@@ -48,6 +48,7 @@ - #include "gdbcmd.h" - #include "addrmap.h" +--- gdb-6.8.50.20090228.orig/gdb/dwarf2read.c 2009-03-02 01:01:15.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/dwarf2read.c 2009-03-02 01:01:36.000000000 +0100 +@@ -49,6 +49,7 @@ #include "f-lang.h" + #include "c-lang.h" + #include "typeprint.h" +#include "top.h" #include #include "gdb_string.h" -@@ -1169,7 +1170,8 @@ dwarf2_has_info (struct objfile *objfile +@@ -1161,7 +1162,8 @@ dwarf2_has_info (struct objfile *objfile dwarf_aranges_section = 0; bfd_map_over_sections (objfile->obfd, dwarf2_locate_sections, &update_sizes); @@ -82,10 +82,10 @@ } /* When loading sections, we can either look for ".", or for -Index: gdb-6.8.50.20090226/gdb/top.h +Index: gdb-6.8.50.20090228/gdb/top.h =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/top.h 2009-01-03 06:57:53.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/top.h 2009-02-28 07:19:50.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/top.h 2009-01-03 06:57:53.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/top.h 2009-03-02 01:01:23.000000000 +0100 @@ -59,6 +59,7 @@ extern void set_prompt (char *); /* From random places. */ gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch: Index: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch 2 Mar 2009 00:11:35 -0000 1.9 +++ gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch 2 Mar 2009 23:14:15 -0000 1.10 @@ -30,52 +30,11 @@ <81a2> DW_AT_name : (indirect string, offset: 0x280e): __errno_location <81a8> DW_AT_MIPS_linkage_name: (indirect string, offset: 0x2808): *__GI___errno_location -Index: gdb-6.8.50.20090226/gdb/dwarf2read.c +Index: gdb-6.8.50.20090228/gdb/gdbtypes.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/dwarf2read.c 2009-02-28 07:22:44.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/dwarf2read.c 2009-02-28 07:31:33.000000000 +0100 -@@ -6376,6 +6376,8 @@ read_partial_die (struct partial_die_inf - switch (attr.name) - { - case DW_AT_name: -+ /* Prefer DW_AT_MIPS_linkage_name over DW_AT_name for non-C. */ -+if (cu->language == language_c || part_die->name == NULL) - switch (part_die->tag) - { - case DW_TAG_compile_unit: -@@ -6399,7 +6401,9 @@ read_partial_die (struct partial_die_inf - part_die->dirname = DW_STRING (&attr); - break; - case DW_AT_MIPS_linkage_name: -- part_die->name = DW_STRING (&attr); -+ /* Prefer DW_AT_MIPS_linkage_name over DW_AT_name for non-C. */ -+ if (cu->language != language_c || part_die->name == NULL) -+ part_die->name = DW_STRING (&attr); - break; - case DW_AT_low_pc: - has_low_pc_attr = 1; -@@ -8650,9 +8654,13 @@ dwarf2_linkage_name (struct die_info *di - { - struct attribute *attr; - -- attr = dwarf2_attr (die, DW_AT_MIPS_linkage_name, cu); -- if (attr && DW_STRING (attr)) -- return DW_STRING (attr); -+ /* Prefer DW_AT_MIPS_linkage_name over DW_AT_name for non-C. */ -+ if (cu->language != language_c) -+ { -+ attr = dwarf2_attr (die, DW_AT_MIPS_linkage_name, cu); -+ if (attr && DW_STRING (attr)) -+ return DW_STRING (attr); -+ } - return dwarf2_name (die, cu); - } - -Index: gdb-6.8.50.20090226/gdb/gdbtypes.c -=================================================================== ---- gdb-6.8.50.20090226.orig/gdb/gdbtypes.c 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/gdbtypes.c 2009-02-28 07:22:55.000000000 +0100 -@@ -3643,6 +3643,8 @@ gdbtypes_post_init (struct gdbarch *gdba +--- gdb-6.8.50.20090228.orig/gdb/gdbtypes.c 2009-03-02 01:01:15.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/gdbtypes.c 2009-03-02 01:01:53.000000000 +0100 +@@ -3633,6 +3633,8 @@ gdbtypes_post_init (struct gdbarch *gdba init_type (TYPE_CODE_INT, gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT, 0, "int", OBJFILE_INTERNAL); @@ -84,7 +43,7 @@ builtin_type->builtin_unsigned_int = init_type (TYPE_CODE_INT, gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT, -@@ -3752,6 +3754,12 @@ gdbtypes_post_init (struct gdbarch *gdba +@@ -3742,6 +3744,12 @@ gdbtypes_post_init (struct gdbarch *gdba "", OBJFILE_INTERNAL); TYPE_TARGET_TYPE (builtin_type->nodebug_text_symbol) = builtin_type->builtin_int; @@ -97,10 +56,10 @@ builtin_type->nodebug_data_symbol = init_type (TYPE_CODE_INT, gdbarch_int_bit (gdbarch) / HOST_CHAR_BIT, 0, -Index: gdb-6.8.50.20090226/gdb/gdbtypes.h +Index: gdb-6.8.50.20090228/gdb/gdbtypes.h =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/gdbtypes.h 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/gdbtypes.h 2009-02-28 07:22:55.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/gdbtypes.h 2009-03-02 01:01:15.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/gdbtypes.h 2009-03-02 01:01:53.000000000 +0100 @@ -1053,6 +1053,7 @@ struct builtin_type /* Types used for symbols with no debug information. */ @@ -117,10 +76,10 @@ struct type *builtin_long; struct type *builtin_signed_char; struct type *builtin_unsigned_char; -Index: gdb-6.8.50.20090226/gdb/parse.c +Index: gdb-6.8.50.20090228/gdb/parse.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/parse.c 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/parse.c 2009-02-28 07:22:55.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/parse.c 2009-03-02 01:01:15.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/parse.c 2009-03-02 01:01:53.000000000 +0100 @@ -508,7 +508,12 @@ write_exp_msymbol (struct minimal_symbol case mst_text: case mst_file_text: @@ -135,10 +94,10 @@ break; case mst_data: -Index: gdb-6.8.50.20090226/gdb/target.c +Index: gdb-6.8.50.20090228/gdb/target.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/target.c 2009-02-28 07:22:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/target.c 2009-02-28 07:22:55.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/target.c 2009-03-02 01:01:44.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/target.c 2009-03-02 01:01:53.000000000 +0100 @@ -827,6 +827,25 @@ pop_all_targets (int quitting) pop_all_targets_above (dummy_stratum, quitting); } @@ -195,10 +154,10 @@ return addr; } -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.dwarf2/dw2-errno.c +Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.dwarf2/dw2-errno.c 2009-02-28 07:22:55.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.c 2009-03-02 01:01:53.000000000 +0100 @@ -0,0 +1,28 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -228,10 +187,10 @@ + + return 0; /* breakpoint */ +} -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.dwarf2/dw2-errno.exp +Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.dwarf2/dw2-errno.exp 2009-02-28 07:22:55.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.exp 2009-03-02 01:01:53.000000000 +0100 @@ -0,0 +1,67 @@ +# Copyright 2007 Free Software Foundation, Inc. + gdb-6.8-fortran-tag-constant.patch: Index: gdb-6.8-fortran-tag-constant.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-fortran-tag-constant.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.8-fortran-tag-constant.patch 11 Feb 2009 00:43:22 -0000 1.3 +++ gdb-6.8-fortran-tag-constant.patch 2 Mar 2009 23:14:15 -0000 1.4 @@ -1,8 +1,8 @@ -Index: gdb-6.8.50.20090210/gdb/dwarf2read.c +Index: gdb-6.8.50.20090228/gdb/dwarf2read.c =================================================================== ---- gdb-6.8.50.20090210.orig/gdb/dwarf2read.c 2009-02-11 01:25:45.000000000 +0100 -+++ gdb-6.8.50.20090210/gdb/dwarf2read.c 2009-02-11 01:26:25.000000000 +0100 -@@ -1845,6 +1845,7 @@ scan_partial_symbols (struct partial_die +--- gdb-6.8.50.20090228.orig/gdb/dwarf2read.c 2009-03-02 01:07:36.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/dwarf2read.c 2009-03-02 01:07:50.000000000 +0100 +@@ -1996,6 +1996,7 @@ scan_partial_symbols (struct partial_die add_partial_subprogram (pdi, lowpc, highpc, need_pc, cu); break; case DW_TAG_variable: @@ -10,7 +10,7 @@ case DW_TAG_typedef: case DW_TAG_union_type: if (!pdi->is_declaration) -@@ -2030,6 +2031,7 @@ add_partial_symbol (struct partial_die_i +@@ -2211,6 +2212,7 @@ add_partial_symbol (struct partial_die_i } break; case DW_TAG_variable: @@ -18,15 +18,7 @@ if (pdi->is_external) { /* Global Variable. -@@ -2895,6 +2897,7 @@ dwarf2_full_name (struct die_info *die, - if (!pdi_needs_namespace (die->tag) - && die->tag != DW_TAG_subprogram - && die->tag != DW_TAG_variable -+ && die->tag != DW_TAG_constant - && die->tag != DW_TAG_member) - return name; - -@@ -3735,7 +3738,8 @@ dwarf2_add_field (struct field_info *fip +@@ -4213,7 +4215,8 @@ dwarf2_add_field (struct field_info *fip fip->non_public_fields = 1; } } @@ -36,7 +28,7 @@ { /* C++ static member. */ -@@ -4213,7 +4217,8 @@ read_structure_type (struct die_info *di +@@ -4703,7 +4706,8 @@ read_structure_type (struct die_info *di while (child_die && child_die->tag) { if (child_die->tag == DW_TAG_member @@ -46,7 +38,7 @@ { /* NOTE: carlton/2002-11-05: A C++ static data member should be a DW_TAG_member that is a declaration, but -@@ -4332,6 +4337,7 @@ process_structure_scope (struct die_info +@@ -4822,6 +4826,7 @@ process_structure_scope (struct die_info { if (child_die->tag == DW_TAG_member || child_die->tag == DW_TAG_variable @@ -54,7 +46,7 @@ || child_die->tag == DW_TAG_inheritance) { /* Do nothing. */ -@@ -5862,6 +5868,7 @@ load_partial_dies (bfd *abfd, gdb_byte * +@@ -6455,6 +6460,7 @@ load_partial_dies (bfd *abfd, gdb_byte * && abbrev->tag != DW_TAG_subprogram && abbrev->tag != DW_TAG_lexical_block && abbrev->tag != DW_TAG_variable @@ -62,7 +54,7 @@ && abbrev->tag != DW_TAG_namespace && abbrev->tag != DW_TAG_member) { -@@ -5969,6 +5976,7 @@ load_partial_dies (bfd *abfd, gdb_byte * +@@ -6562,6 +6568,7 @@ load_partial_dies (bfd *abfd, gdb_byte * if (load_all || abbrev->tag == DW_TAG_subprogram || abbrev->tag == DW_TAG_variable @@ -70,7 +62,7 @@ || abbrev->tag == DW_TAG_namespace || part_die->is_declaration) { -@@ -7759,6 +7767,11 @@ new_symbol (struct die_info *die, struct +@@ -8341,6 +8348,11 @@ new_symbol (struct die_info *die, struct /* Do not add the symbol to any lists. It will be found via BLOCK_FUNCTION from the blockvector. */ break; gdb-6.8-inlining.patch: Index: gdb-6.8-inlining.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-inlining.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gdb-6.8-inlining.patch 2 Mar 2009 00:11:35 -0000 1.8 +++ gdb-6.8-inlining.patch 2 Mar 2009 23:14:15 -0000 1.9 @@ -5,10 +5,10 @@ Removed dwarf_expr_frame_base NULL check duplicity with *-vla.patch. -Index: gdb-6.8.50.20090226/gdb/NEWS +Index: gdb-6.8.50.20090228/gdb/NEWS =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/NEWS 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/NEWS 2009-02-28 07:34:29.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/NEWS 2009-03-02 01:01:15.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/NEWS 2009-03-02 01:04:45.000000000 +0100 @@ -1,6 +1,11 @@ What has changed in GDB? (Organized release by release) @@ -21,10 +21,10 @@ *** Changes since GDB 6.8 * GDB now has support for multi-byte and wide character sets on the -Index: gdb-6.8.50.20090226/gdb/block.c +Index: gdb-6.8.50.20090228/gdb/block.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/block.c 2009-01-03 06:57:50.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/block.c 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/block.c 2009-03-02 01:01:15.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/block.c 2009-03-02 01:04:45.000000000 +0100 @@ -47,8 +47,16 @@ contained_in (const struct block *a, con { if (!a || !b) @@ -67,10 +67,10 @@ /* Return the blockvector immediately containing the innermost lexical block containing the specified pc value and section, or 0 if there is none. PBLOCK is a pointer to the block. If PBLOCK is NULL, we -Index: gdb-6.8.50.20090226/gdb/block.h +Index: gdb-6.8.50.20090228/gdb/block.h =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/block.h 2009-01-03 06:57:50.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/block.h 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/block.h 2009-01-03 06:57:50.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/block.h 2009-03-02 01:04:45.000000000 +0100 @@ -65,7 +65,7 @@ struct block CORE_ADDR endaddr; @@ -89,10 +89,10 @@ extern int contained_in (const struct block *, const struct block *); extern struct blockvector *blockvector_for_pc (CORE_ADDR, struct block **); -Index: gdb-6.8.50.20090226/gdb/blockframe.c +Index: gdb-6.8.50.20090228/gdb/blockframe.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/blockframe.c 2009-01-03 06:57:50.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/blockframe.c 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/blockframe.c 2009-01-03 06:57:50.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/blockframe.c 2009-03-02 01:04:45.000000000 +0100 @@ -36,6 +36,7 @@ #include "command.h" #include "gdbcmd.h" @@ -161,10 +161,10 @@ return frame; frame = get_prev_frame (frame); -Index: gdb-6.8.50.20090226/gdb/breakpoint.c +Index: gdb-6.8.50.20090228/gdb/breakpoint.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/breakpoint.c 2009-02-28 07:33:47.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/breakpoint.c 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/breakpoint.c 2009-03-02 01:04:33.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/breakpoint.c 2009-03-02 01:04:45.000000000 +0100 @@ -2641,19 +2641,21 @@ watchpoint_check (void *p) within_current_scope = 1; else @@ -342,11 +342,11 @@ bp_until); make_cleanup_delete_breakpoint (breakpoint2); } -Index: gdb-6.8.50.20090226/gdb/buildsym.c +Index: gdb-6.8.50.20090228/gdb/buildsym.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/buildsym.c 2009-01-03 06:57:50.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/buildsym.c 2009-02-28 07:34:09.000000000 +0100 -@@ -1159,6 +1159,12 @@ end_symtab (CORE_ADDR end_addr, struct o +--- gdb-6.8.50.20090228.orig/gdb/buildsym.c 2009-03-02 01:01:15.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/buildsym.c 2009-03-02 01:04:45.000000000 +0100 +@@ -1155,6 +1155,12 @@ end_symtab (CORE_ADDR end_addr, struct o struct symbol *sym; struct dict_iterator iter; @@ -359,10 +359,10 @@ for (sym = dict_iterator_first (BLOCK_DICT (block), &iter); sym != NULL; sym = dict_iterator_next (&iter)) -Index: gdb-6.8.50.20090226/gdb/doc/gdb.texinfo +Index: gdb-6.8.50.20090228/gdb/doc/gdb.texinfo =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/doc/gdb.texinfo 2009-02-28 07:33:47.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/doc/gdb.texinfo 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/doc/gdb.texinfo 2009-03-02 01:04:33.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/doc/gdb.texinfo 2009-03-02 01:04:45.000000000 +0100 @@ -137,6 +137,7 @@ software in general. We will miss him. * Stack:: Examining the stack * Source:: Examining source files @@ -512,10 +512,10 @@ @node Macros @chapter C Preprocessor Macros -Index: gdb-6.8.50.20090226/gdb/dwarf2loc.c +Index: gdb-6.8.50.20090228/gdb/dwarf2loc.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/dwarf2loc.c 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/dwarf2loc.c 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/dwarf2loc.c 2009-03-02 01:01:15.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/dwarf2loc.c 2009-03-02 01:04:45.000000000 +0100 @@ -31,6 +31,7 @@ #include "regcache.h" #include "objfiles.h" @@ -536,19 +536,19 @@ /* If we found a frame-relative symbol then it was certainly within some function associated with a frame. If we can't find the frame, -Index: gdb-6.8.50.20090226/gdb/dwarf2read.c +Index: gdb-6.8.50.20090228/gdb/dwarf2read.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/dwarf2read.c 2009-02-28 07:33:47.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/dwarf2read.c 2009-02-28 07:36:45.000000000 +0100 -@@ -49,6 +49,7 @@ - #include "addrmap.h" - #include "f-lang.h" +--- gdb-6.8.50.20090228.orig/gdb/dwarf2read.c 2009-03-02 01:04:32.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/dwarf2read.c 2009-03-02 01:07:36.000000000 +0100 +@@ -50,6 +50,7 @@ + #include "c-lang.h" + #include "typeprint.h" #include "top.h" +#include "block.h" #include #include "gdb_string.h" -@@ -2947,12 +2948,8 @@ process_die (struct die_info *die, struc +@@ -2984,12 +2985,8 @@ process_die (struct die_info *die, struc read_file_scope (die, cu); break; case DW_TAG_subprogram: @@ -562,10 +562,10 @@ break; case DW_TAG_lexical_block: case DW_TAG_try_block: -@@ -3233,6 +3230,22 @@ read_func_scope (struct die_info *die, s +@@ -3464,6 +3461,22 @@ read_func_scope (struct die_info *die, s CORE_ADDR baseaddr; struct block *block; - unsigned die_children; + unsigned die_children = 0; + struct attribute *call_line, *call_file; + int inlined_func = (die->tag == DW_TAG_inlined_subroutine); + @@ -585,7 +585,7 @@ baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); -@@ -7310,6 +7323,9 @@ die_specification (struct die_info *die, +@@ -7526,6 +7539,9 @@ die_specification (struct die_info *die, *spec_cu); if (spec_attr == NULL) @@ -595,7 +595,7 @@ return NULL; else return follow_die_ref (die, spec_attr, spec_cu); -@@ -7993,6 +8009,7 @@ new_symbol (struct die_info *die, struct +@@ -8209,6 +8225,7 @@ new_symbol (struct die_info *die, struct struct attribute *attr = NULL; struct attribute *attr2 = NULL; CORE_ADDR baseaddr; @@ -603,7 +603,7 @@ baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); -@@ -8022,13 +8039,17 @@ new_symbol (struct die_info *die, struct +@@ -8259,13 +8276,17 @@ new_symbol (struct die_info *die, struct SYMBOL_TYPE (sym) = type; else SYMBOL_TYPE (sym) = die_type (die, cu); @@ -623,7 +623,7 @@ if (attr) { int file_index = DW_UNSND (attr); -@@ -8075,6 +8096,14 @@ new_symbol (struct die_info *die, struct +@@ -8312,6 +8333,14 @@ new_symbol (struct die_info *die, struct add_symbol_to_list (sym, cu->list_in_scope); } break; @@ -638,7 +638,7 @@ case DW_TAG_variable: /* Compilation with minimal debug info may result in variables with missing type entries. Change the misleading `void' type -@@ -8130,7 +8159,14 @@ new_symbol (struct die_info *die, struct +@@ -8367,7 +8396,14 @@ new_symbol (struct die_info *die, struct } break; case DW_TAG_formal_parameter: @@ -654,10 +654,10 @@ attr = dwarf2_attr (die, DW_AT_location, cu); if (attr) { -Index: gdb-6.8.50.20090226/gdb/frame-unwind.c +Index: gdb-6.8.50.20090228/gdb/frame-unwind.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/frame-unwind.c 2009-01-03 06:57:51.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/frame-unwind.c 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/frame-unwind.c 2009-01-03 06:57:51.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/frame-unwind.c 2009-03-02 01:04:45.000000000 +0100 @@ -21,6 +21,7 @@ #include "frame.h" #include "frame-unwind.h" @@ -678,10 +678,10 @@ return table; } -Index: gdb-6.8.50.20090226/gdb/frame.c +Index: gdb-6.8.50.20090228/gdb/frame.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/frame.c 2009-02-28 07:22:02.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/frame.c 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/frame.c 2009-03-02 01:01:44.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/frame.c 2009-03-02 01:04:45.000000000 +0100 @@ -41,8 +41,14 @@ #include "objfiles.h" #include "exceptions.h" @@ -1038,10 +1038,10 @@ } /* Per "frame.h", return the ``address'' of the frame. Code should -Index: gdb-6.8.50.20090226/gdb/frame.h +Index: gdb-6.8.50.20090228/gdb/frame.h =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/frame.h 2009-02-05 18:28:20.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/frame.h 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/frame.h 2009-02-05 18:28:20.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/frame.h 2009-03-02 01:04:45.000000000 +0100 @@ -34,6 +34,9 @@ frame_unwind_WHAT...(): Unwind THIS frame's WHAT from the NEXT frame. @@ -1103,10 +1103,10 @@ extern struct frame_id frame_unwind_id (struct frame_info *next_frame); /* Assuming that a frame is `normal', return its base-address, or 0 if -Index: gdb-6.8.50.20090226/gdb/gdbthread.h +Index: gdb-6.8.50.20090228/gdb/gdbthread.h =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/gdbthread.h 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/gdbthread.h 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/gdbthread.h 2009-03-02 01:01:15.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/gdbthread.h 2009-03-02 01:04:45.000000000 +0100 @@ -83,6 +83,13 @@ struct thread_info This is how we know when we step into a subroutine call, and how to set the frame for the breakpoint used to step out. */ @@ -1121,10 +1121,10 @@ int current_line; struct symtab *current_symtab; -Index: gdb-6.8.50.20090226/gdb/infcall.c +Index: gdb-6.8.50.20090228/gdb/infcall.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/infcall.c 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/infcall.c 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/infcall.c 2009-03-02 01:01:15.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/infcall.c 2009-03-02 01:04:45.000000000 +0100 @@ -898,15 +898,8 @@ The program being debugged exited while if (unwind_on_signal_p) @@ -1143,10 +1143,10 @@ /* FIXME: Insert a bunch of wrap_here; name can be very long if it's a C++ name with arguments and stuff. */ -Index: gdb-6.8.50.20090226/gdb/infcmd.c +Index: gdb-6.8.50.20090228/gdb/infcmd.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/infcmd.c 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/infcmd.c 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/infcmd.c 2009-03-02 01:01:15.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/infcmd.c 2009-03-02 01:04:45.000000000 +0100 @@ -52,6 +52,7 @@ #include "cli/cli-decode.h" #include "gdbthread.h" @@ -1248,10 +1248,10 @@ /* Find the function we will return from. */ function = find_pc_function (get_frame_pc (get_selected_frame (NULL))); -Index: gdb-6.8.50.20090226/gdb/inferior.h +Index: gdb-6.8.50.20090228/gdb/inferior.h =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/inferior.h 2009-02-27 00:04:34.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/inferior.h 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/inferior.h 2009-03-02 01:01:15.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/inferior.h 2009-03-02 01:04:45.000000000 +0100 @@ -259,6 +259,9 @@ extern void error_is_running (void); /* Calls error_is_running if the current thread is running. */ extern void ensure_not_running (void); @@ -1262,10 +1262,10 @@ /* From infcmd.c */ extern void tty_command (char *, int); -Index: gdb-6.8.50.20090226/gdb/infrun.c +Index: gdb-6.8.50.20090228/gdb/infrun.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/infrun.c 2009-02-28 07:31:50.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/infrun.c 2009-02-28 07:37:36.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/infrun.c 2009-03-02 01:04:32.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/infrun.c 2009-03-02 01:04:45.000000000 +0100 @@ -48,6 +48,7 @@ #include "gdb_assert.h" #include "mi/mi-common.h" @@ -1538,10 +1538,10 @@ tp->step_over_calls = inf_status->step_over_calls; stop_after_trap = inf_status->stop_after_trap; inf->stop_soon = inf_status->stop_soon; -Index: gdb-6.8.50.20090226/gdb/inline-frame.c +Index: gdb-6.8.50.20090228/gdb/inline-frame.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090226/gdb/inline-frame.c 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/inline-frame.c 2009-03-02 01:04:45.000000000 +0100 @@ -0,0 +1,382 @@ +/* Inline frame unwinder for GDB. + @@ -1925,10 +1925,10 @@ + + return inline_count; +} -Index: gdb-6.8.50.20090226/gdb/inline-frame.h +Index: gdb-6.8.50.20090228/gdb/inline-frame.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090226/gdb/inline-frame.h 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/inline-frame.h 2009-03-02 01:04:45.000000000 +0100 @@ -0,0 +1,62 @@ +/* Definitions for inline frame support. + @@ -1992,11 +1992,11 @@ +int frame_inlined_callees (struct frame_info *this_frame); + +#endif /* !defined (INLINE_FRAME_H) */ -Index: gdb-6.8.50.20090226/gdb/minsyms.c +Index: gdb-6.8.50.20090228/gdb/minsyms.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/minsyms.c 2009-02-28 07:31:49.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/minsyms.c 2009-02-28 07:34:09.000000000 +0100 -@@ -767,7 +767,7 @@ prim_record_minimal_symbol_and_info (con +--- gdb-6.8.50.20090228.orig/gdb/minsyms.c 2009-03-02 01:04:32.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/minsyms.c 2009-03-02 01:04:45.000000000 +0100 +@@ -795,7 +795,7 @@ prim_record_minimal_symbol_and_info (con if (msym_bunch_index == BUNCH_SIZE) { @@ -2005,10 +2005,10 @@ msym_bunch_index = 0; new->next = msym_bunch; msym_bunch = new; -Index: gdb-6.8.50.20090226/gdb/s390-tdep.c +Index: gdb-6.8.50.20090228/gdb/s390-tdep.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/s390-tdep.c 2009-02-22 02:02:19.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/s390-tdep.c 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/s390-tdep.c 2009-02-22 02:02:19.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/s390-tdep.c 2009-03-02 01:04:45.000000000 +0100 @@ -1182,6 +1182,7 @@ s390_prologue_frame_unwind_cache (struct CORE_ADDR prev_sp; int frame_pointer; @@ -2042,10 +2042,10 @@ || get_frame_type (get_next_frame (this_frame)) != NORMAL_FRAME)) { /* See the comment in s390_in_function_epilogue_p on why this is -Index: gdb-6.8.50.20090226/gdb/stack.c +Index: gdb-6.8.50.20090228/gdb/stack.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/stack.c 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/stack.c 2009-02-28 07:35:20.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/stack.c 2009-03-02 01:01:15.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/stack.c 2009-03-02 01:04:45.000000000 +0100 @@ -45,6 +45,7 @@ #include "valprint.h" #include "gdbthread.h" @@ -2192,26 +2192,27 @@ /* Compute the return value. If the computation triggers an error, let it bail. If the return type can't be handled, set RETURN_VALUE to NULL, and QUERY_PREFIX to an informational -Index: gdb-6.8.50.20090226/gdb/symtab.c +Index: gdb-6.8.50.20090228/gdb/symtab.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/symtab.c 2009-02-28 07:31:49.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/symtab.c 2009-02-28 07:34:09.000000000 +0100 -@@ -1408,10 +1408,13 @@ lookup_symbol_aux_local (const char *nam +--- gdb-6.8.50.20090228.orig/gdb/symtab.c 2009-03-02 01:04:32.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/symtab.c 2009-03-02 01:06:36.000000000 +0100 +@@ -1414,11 +1414,14 @@ lookup_symbol_aux_local (const char *nam sym = lookup_symbol_aux_block (name, linkage_name, block, domain); if (sym != NULL) return sym; + + if (BLOCK_FUNCTION (block) != NULL && block_inlined_p (block)) + break; + block = BLOCK_SUPERBLOCK (block); } -- /* We've reached the static block without finding a result. */ +- /* We've reached the global block without finding a result. */ + /* We've reached the edge of the function without finding a result. */ return NULL; } -@@ -2668,6 +2671,7 @@ find_function_start_sal (struct symbol * +@@ -2675,6 +2678,7 @@ find_function_start_sal (struct symbol * CORE_ADDR pc; struct symtab_and_line sal; @@ -2219,7 +2220,7 @@ pc = BLOCK_START (block); fixup_symbol_section (sym, objfile); -@@ -2706,6 +2710,25 @@ find_function_start_sal (struct symbol * +@@ -2713,6 +2717,25 @@ find_function_start_sal (struct symbol * sal.pc = pc; @@ -2245,7 +2246,7 @@ return sal; } -@@ -3728,6 +3751,24 @@ add_macro_name (const char *name, const +@@ -3735,6 +3758,24 @@ add_macro_name (const char *name, const datum->text, datum->word); } @@ -2270,7 +2271,7 @@ char ** default_make_symbol_completion_list (char *text, char *word) { -@@ -3740,9 +3781,9 @@ default_make_symbol_completion_list (cha +@@ -3747,9 +3788,9 @@ default_make_symbol_completion_list (cha struct partial_symtab *ps; struct minimal_symbol *msymbol; struct objfile *objfile; @@ -2282,7 +2283,7 @@ struct partial_symbol **psym; /* The symbol we are completing on. Points in same buffer as text. */ char *sym_text; -@@ -3852,41 +3893,43 @@ default_make_symbol_completion_list (cha +@@ -3859,41 +3900,43 @@ default_make_symbol_completion_list (cha } /* Search upwards from currently selected frame (so that we can @@ -2357,7 +2358,7 @@ /* Go through the symtabs and check the externs and statics for symbols which match. */ -@@ -3905,9 +3948,6 @@ default_make_symbol_completion_list (cha +@@ -3912,9 +3955,6 @@ default_make_symbol_completion_list (cha { QUIT; b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK); @@ -2367,7 +2368,7 @@ ALL_BLOCK_SYMBOLS (b, iter, sym) { COMPLETION_LIST_ADD_SYMBOL (sym, sym_text, sym_text_len, text, word); -@@ -4374,6 +4414,25 @@ skip_prologue_using_sal (CORE_ADDR func_ +@@ -4381,6 +4421,25 @@ skip_prologue_using_sal (CORE_ADDR func_ line mark the prologue -> body transition. */ if (sal.line >= prologue_sal.line) break; @@ -2393,11 +2394,11 @@ /* The case in which compiler's optimizer/scheduler has moved instructions into the prologue. We look ahead in the function looking for address ranges whose -Index: gdb-6.8.50.20090226/gdb/symtab.h +Index: gdb-6.8.50.20090228/gdb/symtab.h =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/symtab.h 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/symtab.h 2009-02-28 07:34:09.000000000 +0100 -@@ -559,9 +559,18 @@ struct symbol +--- gdb-6.8.50.20090228.orig/gdb/symtab.h 2009-03-02 01:01:15.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/symtab.h 2009-03-02 01:04:45.000000000 +0100 +@@ -556,9 +556,18 @@ struct symbol unsigned is_argument : 1; @@ -2419,7 +2420,7 @@ unsigned short line; -@@ -592,6 +601,7 @@ struct symbol +@@ -589,6 +598,7 @@ struct symbol #define SYMBOL_DOMAIN(symbol) (symbol)->domain #define SYMBOL_CLASS(symbol) (symbol)->aclass #define SYMBOL_IS_ARGUMENT(symbol) (symbol)->is_argument @@ -2427,10 +2428,10 @@ #define SYMBOL_TYPE(symbol) (symbol)->type #define SYMBOL_LINE(symbol) (symbol)->line #define SYMBOL_SYMTAB(symbol) (symbol)->symtab -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.base/break.exp +Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.base/break.exp =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.base/break.exp 2009-01-19 20:05:01.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.base/break.exp 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/testsuite/gdb.base/break.exp 2009-01-19 20:05:01.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/testsuite/gdb.base/break.exp 2009-03-02 01:04:45.000000000 +0100 @@ -880,6 +880,13 @@ gdb_expect { # marker4() is defined at line 46 when compiled with -DPROTOTYPES pass "run until breakpoint set at small function, optimized file (line bp_location14)" @@ -2445,10 +2446,10 @@ -re ".*$gdb_prompt " { fail "run until breakpoint set at small function, optimized file" } -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.cp/annota2.exp +Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.cp/annota2.exp =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.cp/annota2.exp 2009-01-03 06:58:04.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.cp/annota2.exp 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/testsuite/gdb.cp/annota2.exp 2009-01-03 06:58:04.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/testsuite/gdb.cp/annota2.exp 2009-03-02 01:04:45.000000000 +0100 @@ -119,10 +119,11 @@ gdb_expect { # continue until exit # this will test: @@ -2462,10 +2463,10 @@ { pass "continue until exit" } -re ".*$gdb_prompt$" { fail "continue to exit" } timeout { fail "continue to exit (timeout)" } -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.c +Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/inline-bt.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.c 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/inline-bt.c 2009-03-02 01:04:45.000000000 +0100 @@ -0,0 +1,47 @@ +/* Copyright (C) 2008 Free Software Foundation, Inc. + @@ -2514,10 +2515,10 @@ + + return 0; +} -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.exp +Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/inline-bt.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.exp 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/inline-bt.exp 2009-03-02 01:04:45.000000000 +0100 @@ -0,0 +1,63 @@ +# Copyright 2008 Free Software Foundation, Inc. + @@ -2582,10 +2583,10 @@ +gdb_test "info frame" ".*inlined into frame.*" "func1 inlined (3)" +gdb_test "up" "#2 .*func2.*" "up from func1 (3)" +gdb_test "info frame" ".*inlined into frame.*" "func2 inlined (3)" -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.c +Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/inline-cmds.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.c 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/inline-cmds.c 2009-03-02 01:04:45.000000000 +0100 @@ -0,0 +1,85 @@ +/* Copyright (C) 2008 Free Software Foundation, Inc. + @@ -2672,10 +2673,10 @@ + + return 0; +} -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.exp +Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/inline-cmds.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-03-02 01:04:45.000000000 +0100 @@ -0,0 +1,279 @@ +# Copyright 2008 Free Software Foundation, Inc. + @@ -2956,10 +2957,10 @@ +gdb_test "info frame" ".*inlined into frame.*" "outer_inline2 inlined" +gdb_test "up" "#4 main.*" "up from outer_inline2" +gdb_test "info frame" ".*\n caller of frame.*" "main not inlined" -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.c +Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/inline-locals.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.c 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/inline-locals.c 2009-03-02 01:04:45.000000000 +0100 @@ -0,0 +1,52 @@ +/* Copyright (C) 2008 Free Software Foundation, Inc. + @@ -3013,10 +3014,10 @@ + + return 0; +} -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.exp +Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/inline-locals.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.exp 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/inline-locals.exp 2009-03-02 01:04:45.000000000 +0100 @@ -0,0 +1,118 @@ +# Copyright 2008 Free Software Foundation, Inc. + @@ -3136,10 +3137,10 @@ +} + +gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local (3)" -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-markers.c +Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/inline-markers.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-markers.c 2009-02-28 07:34:09.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/inline-markers.c 2009-03-02 01:04:45.000000000 +0100 @@ -0,0 +1,36 @@ +/* Copyright (C) 2008 Free Software Foundation, Inc. + @@ -3177,10 +3178,10 @@ +{ + inlined_fn (); /* inlined */ +} -Index: gdb-6.8.50.20090226/gdb/testsuite/lib/gdb.exp +Index: gdb-6.8.50.20090228/gdb/testsuite/lib/gdb.exp =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/testsuite/lib/gdb.exp 2009-02-28 07:31:58.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/testsuite/lib/gdb.exp 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/testsuite/lib/gdb.exp 2009-03-02 01:04:32.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/testsuite/lib/gdb.exp 2009-03-02 01:04:45.000000000 +0100 @@ -1474,6 +1474,37 @@ proc skip_hp_tests {} { return $skip_hp } @@ -3219,10 +3220,10 @@ set compiler_info "unknown" set gcc_compiled 0 set hp_cc_compiler 0 -Index: gdb-6.8.50.20090226/gdb/valops.c +Index: gdb-6.8.50.20090228/gdb/valops.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/valops.c 2009-02-27 07:51:56.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/valops.c 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/valops.c 2009-03-02 01:01:17.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/valops.c 2009-03-02 01:04:45.000000000 +0100 @@ -1072,7 +1072,7 @@ value_of_variable (struct symbol *var, s frame = block_innermost_frame (b); if (!frame) @@ -3232,11 +3233,11 @@ && SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b))) error (_("No frame is currently executing in block %s."), SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b))); -Index: gdb-6.8.50.20090226/gdb/Makefile.in +Index: gdb-6.8.50.20090228/gdb/Makefile.in =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/Makefile.in 2009-02-28 07:31:58.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/Makefile.in 2009-02-28 07:34:09.000000000 +0100 -@@ -663,6 +663,7 @@ SFILES = ada-exp.y ada-lang.c ada-typepr +--- gdb-6.8.50.20090228.orig/gdb/Makefile.in 2009-03-02 01:04:32.000000000 +0100 ++++ gdb-6.8.50.20090228/gdb/Makefile.in 2009-03-02 01:04:45.000000000 +0100 +@@ -665,6 +665,7 @@ SFILES = ada-exp.y ada-lang.c ada-typepr inf-loop.c \ infcall.c \ infcmd.c inflow.c infrun.c \ @@ -3244,7 +3245,7 @@ interps.c \ jv-exp.y jv-lang.c jv-valprint.c jv-typeprint.c \ language.c linespec.c \ -@@ -835,6 +836,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $ +@@ -837,6 +838,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $ user-regs.o \ frame.o frame-unwind.o doublest.o \ frame-base.o \ @@ -3252,10 +3253,10 @@ gnu-v2-abi.o gnu-v3-abi.o cp-abi.o cp-support.o \ cp-namespace.o \ reggroups.o regset.o \ -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/Makefile.in +Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/Makefile.in =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/Makefile.in 2008-04-18 01:06:54.000000000 +0200 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/Makefile.in 2009-02-28 07:34:09.000000000 +0100 +--- gdb-6.8.50.20090228.orig/gdb/testsuite/gdb.opt/Makefile.in 2008-04-18 01:06:54.000000000 +0200 ++++ gdb-6.8.50.20090228/gdb/testsuite/gdb.opt/Makefile.in 2009-03-02 01:04:45.000000000 +0100 @@ -1,7 +1,7 @@ VPATH = @srcdir@ srcdir = @srcdir@ gdb-archer.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 gdb-archer.patch Index: gdb-archer.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-archer.patch 2 Mar 2009 00:11:35 -0000 1.1 +++ gdb-archer.patch 2 Mar 2009 23:14:15 -0000 1.2 @@ -1,8 +1,30 @@ +http://sourceware.org/gdb/wiki/ProjectArcher +http://sourceware.org/gdb/wiki/ArcherBranchManagement + +GIT snapshot: +commit 8cc3753a9aad85bf53bef54c04334c60d16cb251 + +branch `archer' - the merge of branches: +archer-jankratochvil-merge-expr + archer-keiths-expr-cumulative + (archer-swagiaal-using-directive) +archer-jankratochvil-misc +archer-jankratochvil-python + archer-jankratochvil-type-refcount + archer-tromey-python +archer-jankratochvil-vla + archer-jankratochvil-type-refcount +archer-pmuldoon-exception-rewind-master +archer-sergio-catch-syscall +archer-tromey-charset +archer-tromey-delayed-symfile + + diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index af3f534..716884d 100644 +index 74aa72e..fdb0582 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -167,11 +167,16 @@ INTL_CFLAGS = @INCINTL@ +@@ -167,11 +167,18 @@ INTL_CFLAGS = @INCINTL@ # Where is the ICONV library? This can be empty if libc has iconv. LIBICONV = @LIBICONV@ @@ -16,10 +38,12 @@ +# Did the user give us a --with-gdb-datadir option? +GDB_DATADIR_PATH = @GDB_DATADIR_PATH@ + ++GDB_PYTHONDIR_PATH = @GDB_PYTHONDIR_PATH@ ++ # Helper code from gnulib. LIBGNU = gnulib/libgnu.a INCGNU = -I$(srcdir)/gnulib -Ignulib -@@ -270,12 +275,34 @@ SUBDIR_TUI_CFLAGS= \ +@@ -270,12 +277,34 @@ SUBDIR_TUI_CFLAGS= \ # SUBDIR_PYTHON_OBS = \ python.o \ @@ -54,7 +78,7 @@ python/python-utils.c \ python/python-value.c SUBDIR_PYTHON_DEPS = -@@ -389,7 +416,8 @@ INTERNAL_CFLAGS_BASE = \ +@@ -390,7 +419,8 @@ INTERNAL_CFLAGS_BASE = \ $(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \ $(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \ $(BFD_CFLAGS) $(INCLUDE_CFLAGS) $(LIBDECNUMBER_CFLAGS) \ @@ -64,7 +88,7 @@ INTERNAL_WARN_CFLAGS = $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS) INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS) -@@ -401,7 +429,7 @@ LDFLAGS = @LDFLAGS@ +@@ -402,7 +432,7 @@ LDFLAGS = @LDFLAGS@ # I think it's perfectly reasonable for a user to set -pg in CFLAGS # and have it work; that's why CFLAGS is here. # PROFILE_CFLAGS is _not_ included, however, because we use monstartup. @@ -73,7 +97,7 @@ # If your system is missing alloca(), or, more likely, it's there but # it doesn't work, then refer to libiberty. -@@ -662,6 +690,7 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \ +@@ -663,6 +693,7 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \ valarith.c valops.c valprint.c value.c varobj.c vec.c \ wrapper.c \ xml-tdesc.c xml-support.c \ @@ -81,7 +105,7 @@ inferior.c LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c -@@ -732,7 +761,8 @@ config/sparc/nm-sol2.h config/nm-linux.h config/mips/nm-irix5.h \ +@@ -733,7 +764,8 @@ config/sparc/nm-sol2.h config/nm-linux.h config/mips/nm-irix5.h \ config/rs6000/nm-rs6000.h top.h bsd-kvm.h gdb-stabs.h reggroups.h \ annotate.h sim-regno.h dictionary.h dfp.h main.h frame-unwind.h \ remote-fileio.h i386-linux-tdep.h vax-tdep.h objc-lang.h \ @@ -91,7 +115,7 @@ # Header files that already have srcdir in them, or which are in objdir. -@@ -811,10 +841,16 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \ +@@ -812,10 +844,16 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \ trad-frame.o \ tramp-frame.o \ solib.o solib-null.o \ @@ -109,7 +133,7 @@ TSOBS = inflow.o SUBDIRS = @subdirs@ -@@ -848,11 +884,38 @@ generated_files = config.h observer.h observer.inc ada-lex.c \ +@@ -849,11 +887,38 @@ generated_files = config.h observer.h observer.inc ada-lex.c \ $(COMPILE) $< $(POSTCOMPILE) @@ -149,7 +173,7 @@ installcheck: # The check target can not use subdir_do, because subdir_do does not -@@ -906,8 +969,11 @@ gdb.z:gdb.1 +@@ -907,8 +972,11 @@ gdb.z:gdb.1 # source file and doesn't care about rebuilding or just wants to save the # time it takes for make to check that all is up to date. # install-only is intended to address that need. @@ -163,7 +187,7 @@ transformed_name=`t='$(program_transform_name)'; \ echo gdb | sed -e "$$t"` ; \ if test "x$$transformed_name" = x; then \ -@@ -1200,6 +1266,12 @@ stamp-h: config.in config.status +@@ -1202,6 +1270,12 @@ stamp-h: config.in config.status CONFIG_LINKS= \ $(SHELL) config.status @@ -176,7 +200,7 @@ config.status: configure configure.tgt configure.host $(SHELL) config.status --recheck -@@ -1843,10 +1915,54 @@ python.o: $(srcdir)/python/python.c +@@ -1845,10 +1919,54 @@ python.o: $(srcdir)/python/python.c $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python.c $(POSTCOMPILE) @@ -231,7 +255,7 @@ python-utils.o: $(srcdir)/python/python-utils.c $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-utils.c $(POSTCOMPILE) -@@ -1855,6 +1971,30 @@ python-value.o: $(srcdir)/python/python-value.c +@@ -1857,6 +1975,39 @@ python-value.o: $(srcdir)/python/python-value.c $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-value.c $(POSTCOMPILE) @@ -242,22 +266,31 @@ + gdb/command/pahole.py gdb/command/__init__.py \ + gdb/command/ignore_errors.py gdb/command/save_breakpoints.py \ + gdb/libstdcxx/v6/printers.py gdb/libstdcxx/v6/__init__.py \ -+ gdb/libstdcxx/__init__.py gdb/function/caller_is.py \ ++ gdb/libstdcxx/__init__.py gdb/function/caller_is.py \ + gdb/function/in_scope.py gdb/function/__init__.py gdb/backtrace.py \ + gdb/__init__.py + +# Install the Python library. Python library files go under -+# $(GDB_DATADIR_PATH)/python. ++# $(GDB_PYTHONDIR_PATH)/python. +install-python: + files='$(PY_FILES)'; for file in $$files; do \ + dir=`echo "$$file" | sed 's,/[^/]*$$,,'`; \ -+ $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_DATADIR_PATH)/python/$$dir; \ -+ $(INSTALL_DATA) $(srcdir)/python/lib/$$file $(DESTDIR)$(GDB_DATADIR_PATH)/python/$$file; \ ++ $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_PYTHONDIR_PATH)/$$dir; \ ++ $(INSTALL_DATA) $(srcdir)/python/lib/$$file $(DESTDIR)$(GDB_PYTHONDIR_PATH)/$$file; \ + done + -+# Brute force. ++# Other packages may have their files installed in $(GDB_PYTHONDIR_PATH). +uninstall-python: -+ rm -rf $(DESTDIR)/$(GDB_DATADIR_PATH)/python ++ rm -rf $(DESTDIR)/$(GDB_PYTHONDIR_PATH)/python ++ files='$(PY_FILES)'; for file in $$files; do \ ++ dir=`echo "$$file" | sed 's,/[^/]*$$,,'`; \ ++ rm -f $(DESTDIR)$(GDB_PYTHONDIR_PATH)/$$file; \ ++ while test "x$$file" != "x$$dir"; do \ ++ rmdir 2>/dev/null "$(DESTDIR)$(GDB_PYTHONDIR_PATH)/$$dir"; \ ++ file="$$dir"; \ ++ dir=`echo "$$file" | sed 's,/[^/]*$$,,'`; \ ++ done \ ++ done + # # Dependency tracking. Most of this is conditional on GNU Make being @@ -798,6 +831,39 @@ fprintf_filtered (file, "\n"); } break; +diff --git a/gdb/block.c b/gdb/block.c +index 8f0140c..d451769 100644 +--- a/gdb/block.c ++++ b/gdb/block.c +@@ -207,24 +207,16 @@ block_set_scope (struct block *block, const char *scope, + } + + /* This returns the first using directives associated to BLOCK, if +- any. */ +- +-/* FIXME: carlton/2003-04-23: This uses the fact that we currently +- only have using directives in static blocks, because we only +- generate using directives from anonymous namespaces. Eventually, [...5758 lines suppressed...] + extern char *ui_file_xstrdup (struct ui_file *file, long *length); + +- ++/* Similar to ui_file_xstrdup, but return a new string allocated on ++ OBSTACK. */ ++extern char *ui_file_obsavestring (struct ui_file *file, ++ struct obstack *obstack, long *length); + + extern long ui_file_read (struct ui_file *file, char *buf, long length_buf); + diff --git a/gdb/utils.c b/gdb/utils.c index 9224839..88a9a39 100644 --- a/gdb/utils.c @@ -33030,7 +37059,7 @@ } diff --git a/gdb/valops.c b/gdb/valops.c -index 9810f2b..3f8d92c 100644 +index 9810f2b..14c562e 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -38,6 +38,7 @@ @@ -33356,7 +37385,105 @@ if (base_offset == -1) error (_("virtual baseclass botch")); } -@@ -2725,7 +2808,7 @@ value_struct_elt_for_reference (struct type *domain, int offset, +@@ -2083,12 +2166,25 @@ find_overload_match (struct type **arg_types, int nargs, + if (method) + { + gdb_assert (obj); ++ ++ /* OBJ may be a pointer value rather than the object itself. */ ++ obj = coerce_ref (obj); ++ while (TYPE_CODE (check_typedef (value_type (obj))) == TYPE_CODE_PTR) ++ obj = coerce_ref (value_ind (obj)); + obj_type_name = TYPE_NAME (value_type (obj)); +- /* Hack: evaluate_subexp_standard often passes in a pointer +- value rather than the object itself, so try again. */ +- if ((!obj_type_name || !*obj_type_name) +- && (TYPE_CODE (value_type (obj)) == TYPE_CODE_PTR)) +- obj_type_name = TYPE_NAME (TYPE_TARGET_TYPE (value_type (obj))); ++ ++ /* First check whether this is a data member, e.g. a pointer to ++ a function. */ ++ if (TYPE_CODE (check_typedef (value_type (obj))) == TYPE_CODE_STRUCT) ++ { ++ *valp = search_struct_field (name, obj, 0, ++ check_typedef (value_type (obj)), 0); ++ if (*valp) ++ { ++ *staticp = 1; ++ return 0; ++ } ++ } + + fns_ptr = value_find_oload_method_list (&temp, name, + 0, &num_fns, +@@ -2108,16 +2204,29 @@ find_overload_match (struct type **arg_types, int nargs, + } + else + { +- const char *qualified_name = SYMBOL_CPLUS_DEMANGLED_NAME (fsym); ++ const char *qualified_name = SYMBOL_NATURAL_NAME (fsym); + +- /* If we have a C++ name, try to extract just the function +- part. */ +- if (qualified_name) +- func_name = cp_func_name (qualified_name); ++ /* If we have a function with a C++ name, try to extract just ++ the function part. Do not try this for non-functions (e.g. ++ function pointers). */ ++ if (qualified_name ++ && TYPE_CODE (check_typedef (SYMBOL_TYPE (fsym))) == TYPE_CODE_FUNC) ++ { ++ func_name = cp_func_name (qualified_name); ++ ++ /* If cp_func_name did not remove anything, the name of the ++ symbol did not include scope or argument types - it was ++ probably a C-style function. */ ++ if (func_name && strcmp (func_name, qualified_name) == 0) ++ { ++ xfree (func_name); ++ func_name = NULL; ++ } ++ } + +- /* If there was no C++ name, this must be a C-style function. +- Just return the same symbol. Do the same if cp_func_name +- fails for some reason. */ ++ /* If there was no C++ name, this must be a C-style function or ++ not a function at all. Just return the same symbol. Do the ++ same if cp_func_name fails for some reason. */ + if (func_name == NULL) + { + *symp = fsym; +@@ -2558,8 +2667,8 @@ check_field (struct type *type, const char *name) + the comment before value_struct_elt_for_reference. */ + + struct value * +-value_aggregate_elt (struct type *curtype, +- char *name, int want_address, ++value_aggregate_elt (struct type *curtype, char *name, ++ struct type *expect_type, int want_address, + enum noside noside) + { + switch (TYPE_CODE (curtype)) +@@ -2567,7 +2676,7 @@ value_aggregate_elt (struct type *curtype, + case TYPE_CODE_STRUCT: + case TYPE_CODE_UNION: + return value_struct_elt_for_reference (curtype, 0, curtype, +- name, NULL, ++ name, expect_type, + want_address, noside); + case TYPE_CODE_NAMESPACE: + return value_namespace_elt (curtype, name, +@@ -2671,7 +2780,7 @@ value_struct_elt_for_reference (struct type *domain, int offset, + if (intype) + { + while (j--) +- if (TYPE_FN_FIELD_TYPE (f, j) == intype) ++ if (compare_parameters (TYPE_FN_FIELD_TYPE (f, j), intype)) + break; + if (j < 0) + error (_("no member function matches that type instantiation")); +@@ -2725,7 +2834,7 @@ value_struct_elt_for_reference (struct type *domain, int offset, result = allocate_value (lookup_methodptr_type (TYPE_FN_FIELD_TYPE (f, j))); cplus_make_method_ptr (value_type (result), value_contents_writeable (result), @@ -33365,7 +37492,16 @@ } } return result; -@@ -2884,7 +2967,7 @@ value_full_object (struct value *argp, +@@ -2791,7 +2900,7 @@ value_maybe_namespace_elt (const struct type *curtype, + struct symbol *sym; + struct value *result; + +- sym = cp_lookup_symbol_namespace (namespace_name, name, NULL, ++ sym = cp_lookup_symbol_namespace_incremental (namespace_name, name, NULL, + get_selected_block (0), + VAR_DOMAIN); + +@@ -2884,7 +2993,7 @@ value_full_object (struct value *argp, /* Go back by the computed top_offset from the beginning of the object, adjusting for the embedded offset of argp if that's what value_rtti_type used for its computation. */ @@ -33374,7 +37510,7 @@ (using_enc ? 0 : value_embedded_offset (argp))); deprecated_set_value_type (new_val, value_type (argp)); set_value_embedded_offset (new_val, (using_enc -@@ -2989,8 +3072,6 @@ value_slice (struct value *array, int lowbound, int length) +@@ -2989,8 +3098,6 @@ value_slice (struct value *array, int lowbound, int length) || lowbound + length - 1 > upperbound) error (_("slice out of range")); @@ -34079,7 +38215,7 @@ + make_final_cleanup (value_history_cleanup, NULL); } diff --git a/gdb/value.h b/gdb/value.h -index aa43365..fdb22d2 100644 +index aa43365..f41def9 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -272,12 +272,23 @@ extern void set_value_component_location (struct value *component, @@ -34136,7 +38272,15 @@ extern struct value *value_string (char *ptr, int len); extern struct value *value_bitstring (char *ptr, int len); -@@ -533,14 +551,14 @@ extern void set_internalvar_component (struct internalvar *var, +@@ -435,6 +453,7 @@ extern struct value *value_struct_elt (struct value **argp, + + extern struct value *value_aggregate_elt (struct type *curtype, + char *name, ++ struct type *expect_type, + int want_address, + enum noside noside); + +@@ -533,14 +552,14 @@ extern void set_internalvar_component (struct internalvar *var, int bitpos, int bitsize, struct value *newvalue); @@ -34154,7 +38298,7 @@ extern int value_equal (struct value *arg1, struct value *arg2); -@@ -619,7 +637,7 @@ extern int common_val_print (struct value *val, +@@ -619,7 +638,7 @@ extern int common_val_print (struct value *val, const struct value_print_options *options, const struct language_defn *language); @@ -34163,7 +38307,7 @@ struct ui_file *stream, const struct value_print_options *options); -@@ -658,5 +676,22 @@ extern struct value *value_allocate_space_in_inferior (int); +@@ -658,5 +677,22 @@ extern struct value *value_allocate_space_in_inferior (int); extern struct value *value_of_local (const char *name, int complain); Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.324 retrieving revision 1.325 diff -u -r1.324 -r1.325 --- gdb.spec 2 Mar 2009 00:11:35 -0000 1.324 +++ gdb.spec 2 Mar 2009 23:14:15 -0000 1.325 @@ -9,7 +9,7 @@ # Set version to contents of gdb/version.in. # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch). -Version: 6.8.50.20090228 +Version: 6.8.50.20090302 # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. @@ -370,11 +370,16 @@ # The merged branch `archer' of: http://sourceware.org/gdb/wiki/ProjectArcher Patch349: gdb-archer.patch +# Fix parsing elf64-i386 files for kdump PAE vmcore dumps (BZ 457187). +# - Turn on 64-bit BFD support, globally enable AC_SYS_LARGEFILE. +Patch352: gdb-6.8-bz457187-largefile.patch + BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel Requires: readline BuildRequires: readline-devel Requires: rpm-libs BuildRequires: rpm-devel +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Requires: python-libs BuildRequires: python-devel @@ -556,6 +561,7 @@ %patch337 -p1 %patch343 -p1 %patch348 -p1 +%patch352 -p1 %patch124 -p1 find -name "*.orig" | xargs rm -f @@ -629,6 +635,7 @@ %else --without-libunwind \ %endif + --enable-64-bit-bfd \ %if 0%{?_with_debug:1} --enable-static --disable-shared --enable-debug \ %endif @@ -806,7 +813,8 @@ %{_bindir}/pstack %{_mandir}/*/gstack.1* %{_mandir}/*/pstack.1* -%{_datadir}/%{name} +%{python_sitelib}/gdb +%{_datadir}/gdb %endif # 0%{!?_with_upstream:1} %{_infodir}/annotate.info* %{_infodir}/gdb.info* @@ -822,18 +830,22 @@ %endif %changelog -* Sat Feb 28 2009 Jan Kratochvil - 6.8.50.20090228-1 +* Mon Mar 2 2009 Jan Kratochvil - 6.8.50.20090302-1 - Include the Archer Project: http://sourceware.org/gdb/wiki/ProjectArcher * [python] Python scripting support: http://sourceware.org/gdb/wiki/PythonGdb * [catch-syscall] Trap and display syscalls. * [delayed-symfile] Improve startup performance by lazily read psymtabs. * [exception-rewind] Fix fatal C++ exceptions in an inferior function call. + * [expr] Expressions, single-quote elimination, C++ input canonicalization. + * [using-directive] C++ namespaces. * [vla] C variable length arrays / DW_FORM_block / Fortran dynamic arrays. * [misc] Fix debuginfoless `return' (BZ 365111), fix command-line macros for expected GCC (BZ 479914), new testcase for valgrind (for BZ 483262), implement `info common' for Fortran, fix Fortran logical-kind=8 (BZ 465310), - fix static variable in C++ constructors (BZ 445912) + fix static variable in C++ constructors (BZ 445912), fix power7 (BZ 485319). - Upgrade to the FSF GDB gdb-6.8.50 snapshot. +- Fix parsing elf64-i386 files for kdump PAE vmcore dumps (BZ 457187). + - Turn on 64-bit BFD support, globally enable AC_SYS_LARGEFILE. * Tue Feb 24 2009 Fedora Release Engineering - 6.8.50.20090210-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 2 Mar 2009 00:11:35 -0000 1.30 +++ sources 2 Mar 2009 23:14:15 -0000 1.31 @@ -1 +1 @@ -4cde9c3dd1df54ec819af6407ec9d61b gdb-6.8.50.20090228.tar.bz2 +a8eae0d4ef955ebcecfc7511af31070a gdb-6.8.50.20090302.tar.bz2 From ausil at fedoraproject.org Mon Mar 2 23:17:05 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Mon, 2 Mar 2009 23:17:05 +0000 (UTC) Subject: rpms/fedora-packager/EL-5 .cvsignore, 1.3, 1.4 fedora-packager.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <20090302231705.F05A870116@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/extras/rpms/fedora-packager/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1896 Modified Files: .cvsignore fedora-packager.spec sources Log Message: update to 0.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-packager/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Apr 2008 15:20:08 -0000 1.3 +++ .cvsignore 2 Mar 2009 23:16:35 -0000 1.4 @@ -1 +1 @@ -fedora-packager-0.3.0.tar.bz2 +fedora-packager-0.3.3.tar.bz2 Index: fedora-packager.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-packager/EL-5/fedora-packager.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-packager.spec 1 Apr 2008 15:20:08 -0000 1.4 +++ fedora-packager.spec 2 Mar 2009 23:16:35 -0000 1.5 @@ -1,17 +1,18 @@ Name: fedora-packager -Version: 0.3.0 +Version: 0.3.3 Release: 1%{?dist} Summary: Tools for setting up a fedora maintainer environment Group: Applications/Productivity License: GPLv2+ URL: https://fedorahosted.org/fedora-packager -Source0: https://fedorahosted.org/fedora-packager/attachment/wiki/WikiStart/fedora-packager-%{version}.tar.bz2 +Source0: https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: koji bodhi-client plague-client +Requires: koji bodhi-client Requires: rpm-build rpmdevtools rpmlint -Requires: mock pyOpenSSL +Requires: mock cvs curl wget +Requires: pyOpenSSL python-pycurl BuildArch: noarch @@ -44,6 +45,16 @@ %changelog +* Mon Mar 02 2009 Dennis Gilmore - 0.3.3-1 +- update to 0.3.3 + +* Tue Feb 24 2009 Fedora Release Engineering - 0.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Aug 18 2008 Dennis Gilmore - 0.3.1-1 +- update to 0.3.1 fedora-cvs allows anonymous checkout +- fix some Requires add cvs curl and wget + * Sun Mar 30 2008 Dennis Gilmore - 0.3.0-1 - update to 0.3.0 fedora-cvs uses pyOpenSSL to work out username - remove Requires on RCS's for fedora-hosted Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-packager/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Apr 2008 15:20:08 -0000 1.3 +++ sources 2 Mar 2009 23:16:35 -0000 1.4 @@ -1 +1 @@ -39cfae6f1905e0e564bddf53a2b0d495 fedora-packager-0.3.0.tar.bz2 +94a56c521445b5744213c603c9501ac5 fedora-packager-0.3.3.tar.bz2 From mclasen at fedoraproject.org Mon Mar 2 23:18:25 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Mar 2009 23:18:25 +0000 (UTC) Subject: rpms/gnome-utils/devel .cvsignore, 1.71, 1.72 gnome-utils.spec, 1.186, 1.187 sources, 1.75, 1.76 Message-ID: <20090302231825.48F5670116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32764 Modified Files: .cvsignore gnome-utils.spec sources Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-utils/devel/.cvsignore,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- .cvsignore 3 Feb 2009 05:52:50 -0000 1.71 +++ .cvsignore 2 Mar 2009 23:17:54 -0000 1.72 @@ -1 +1 @@ -gnome-utils-2.25.90.tar.bz2 +gnome-utils-2.25.92.tar.bz2 Index: gnome-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- gnome-utils.spec 24 Feb 2009 23:37:53 -0000 1.186 +++ gnome-utils.spec 2 Mar 2009 23:17:54 -0000 1.187 @@ -8,8 +8,8 @@ %define gnome_panel_version 2.9.4 Name: gnome-utils -Version: 2.25.90 -Release: 5%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Epoch: 1 Summary: GNOME utility programs @@ -28,8 +28,8 @@ BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version} BuildRequires: gnome-panel-devel >= %{gnome_panel_version} -BuildRequires: libXmu-devel -BuildRequires: libX11-devel +BuildRequires: libXmu-devel +BuildRequires: libX11-devel BuildRequires: libgtop2-devel BuildRequires: e2fsprogs-devel BuildRequires: usermode @@ -41,20 +41,20 @@ Requires: usermode Requires(post): scrollkeeper -Requires(post): desktop-file-utils >= %{desktop_file_utils_version} +Requires(post): desktop-file-utils >= %{desktop_file_utils_version} Requires(post): GConf2 >= 2.14 Requires(preun): GConf2 >= 2.14 Requires(pre): GConf2 >= 2.14 Requires(postun): scrollkeeper -Requires(postun): desktop-file-utils >= %{desktop_file_utils_version} +Requires(postun): desktop-file-utils >= %{desktop_file_utils_version} -# obsolete the standalone baobab package from Extras +# obsolete the standalone baobab package from Extras Obsoletes: baobab Provides: baobab %description -The gnome-utils package contains a set of small "desk accessory" utility +The gnome-utils package contains a set of small "desk accessory" utility applications for GNOME, such as a dictionary, a disk usage analyzer, a screenshot tool and others. @@ -189,7 +189,7 @@ %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - for f in gnome-dictionary.schemas logview.schemas gnome-system-log.schemas gnome-search-tool.schemas gnome-screenshot.schemas baobab.schemas; do + for f in gnome-dictionary.schemas logview.schemas gnome-system-log.schemas gnome-search-tool.schemas gnome-screenshot.schemas baobab.schemas; do if [ -f %{_sysconfdir}/gconf/schemas/$f ]; then gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/$f >& /dev/null || : fi @@ -199,7 +199,7 @@ %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - for f in gnome-dictionary.schemas logview.schemas gnome-system-log.schemas gnome-search-tool.schemas gnome-screenshot.schemas baobab.schemas; do + for f in gnome-dictionary.schemas logview.schemas gnome-system-log.schemas gnome-search-tool.schemas gnome-screenshot.schemas baobab.schemas; do if [ -f %{_sysconfdir}/gconf/schemas/$f ]; then gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/$f >& /dev/null || : fi @@ -219,11 +219,11 @@ %files -f gnome-utils-2.0.lang %defattr(-,root,root,-) %doc COPYING NEWS README -%doc gnome-dictionary/AUTHORS +%doc gnome-dictionary/AUTHORS %doc gnome-dictionary/README %doc gsearchtool/AUTHORS %doc gfloppy/AUTHORS -%doc baobab/AUTHORS +%doc baobab/AUTHORS %doc baobab/README %{_sysconfdir}/security/console.apps/gnome-system-log %{_sysconfdir}/pam.d/gnome-system-log @@ -273,6 +273,9 @@ %changelog +* Mon Mar 2 2009 Matthias Clasen - 1:2.25.92-1 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 1:2.25.90-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-utils/devel/sources,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- sources 3 Feb 2009 05:52:50 -0000 1.75 +++ sources 2 Mar 2009 23:17:55 -0000 1.76 @@ -1 +1 @@ -46ac7e0095a94765e63c2822adf7cbca gnome-utils-2.25.90.tar.bz2 +46d74a16c80ecbb7ea0ba13f102e304b gnome-utils-2.25.92.tar.bz2 From caolanm at fedoraproject.org Mon Mar 2 23:22:01 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 2 Mar 2009 23:22:01 +0000 (UTC) Subject: rpms/libbinio/devel libbinio-1.4-includes.patch, NONE, 1.1 libbinio.spec, 1.7, 1.8 Message-ID: <20090302232201.AED9A70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/libbinio/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2851 Modified Files: libbinio.spec Added Files: libbinio-1.4-includes.patch Log Message: include stdio.h for EOF libbinio-1.4-includes.patch: --- NEW FILE libbinio-1.4-includes.patch --- diff -ru libbinio-1.4.orig/src/binwrap.cpp libbinio-1.4/src/binwrap.cpp --- libbinio-1.4.orig/src/binwrap.cpp 2009-03-02 23:14:25.000000000 +0000 +++ libbinio-1.4/src/binwrap.cpp 2009-03-02 23:14:59.000000000 +0000 @@ -18,6 +18,7 @@ */ #include "binwrap.h" +#include #if BINIO_ENABLE_IOSTREAM Index: libbinio.spec =================================================================== RCS file: /cvs/pkgs/rpms/libbinio/devel/libbinio.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libbinio.spec 25 Feb 2009 13:51:12 -0000 1.7 +++ libbinio.spec 2 Mar 2009 23:21:31 -0000 1.8 @@ -3,13 +3,14 @@ Name: libbinio Version: 1.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A software library for binary I/O classes in C++ URL: http://libbinio.sourceforge.net/ Group: System Environment/Libraries Source: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: libbinio-1.4-texinfo.patch Patch1: libbinio-1.4-pkgconfigurl.patch +Patch2: libbinio-1.4-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPLv2+ BuildRequires: /sbin/install-info @@ -38,6 +39,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure --disable-static @@ -81,6 +83,9 @@ %{_infodir}/*.gz %changelog +* Mon Mar 02 2009 Caol??n McNamara - 1.4-11 +- include stdio.h for EOF + * Wed Feb 25 2009 Fedora Release Engineering - 1.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Mon Mar 2 23:23:51 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 2 Mar 2009 23:23:51 +0000 (UTC) Subject: rpms/xdotool/devel xdotool.spec,1.2,1.3 Message-ID: <20090302232351.AEDE570116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/xdotool/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3137 Modified Files: xdotool.spec Log Message: add BuildRequires libX11-devel to build Index: xdotool.spec =================================================================== RCS file: /cvs/pkgs/rpms/xdotool/devel/xdotool.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xdotool.spec 26 Feb 2009 08:21:12 -0000 1.2 +++ xdotool.spec 2 Mar 2009 23:23:21 -0000 1.3 @@ -1,6 +1,6 @@ Name: xdotool Version: 20071230 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fake keyboard/mouse input Group: User Interface/X @@ -10,7 +10,7 @@ Patch0: %{name}-%{version}-prefix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libXtst-devel +BuildRequires: libXtst-devel, libX11-devel %description This tool lets you programatically (or manually) simulate keyboard input @@ -45,6 +45,9 @@ %changelog +* Mon Mar 02 2009 Caol??n McNamara - 20071230-4 +- add BuildRequires libX11-devel to build + * Thu Feb 26 2009 Fedora Release Engineering - 20071230-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rvinyard at fedoraproject.org Mon Mar 2 23:33:42 2009 From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.) Date: Mon, 2 Mar 2009 23:33:42 +0000 (UTC) Subject: rpms/papyrus/devel papyrus.spec,1.20,1.21 Message-ID: <20090302233342.E244C70116@cvs1.fedora.phx.redhat.com> Author: rvinyard Update of /cvs/pkgs/rpms/papyrus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4308 Modified Files: papyrus.spec Log Message: Index: papyrus.spec =================================================================== RCS file: /cvs/pkgs/rpms/papyrus/devel/papyrus.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- papyrus.spec 25 Feb 2009 22:08:36 -0000 1.20 +++ papyrus.spec 2 Mar 2009 23:33:12 -0000 1.21 @@ -1,11 +1,11 @@ Summary: Cairo based C++ scenegraph library Name: papyrus Version: 0.10.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv3 URL: http://libpapyrus.sourceforge.net/ Group: System Environment/Libraries -Source: http://download.sourceforge.net/libpapyrus/papyrus-0.10.0.tar.bz2 +Source: http://downloads.sourceforge.net/libpapyrus/papyrus-0.10.0.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.10 BuildRequires: cairomm-devel >= 1.2 @@ -53,7 +53,7 @@ %package gtkmm Summary: Gtkmm UI widgets for the papyrus scenegraph library Group: System Environment/Libraries -Requires: papyrus = %{version}-%{release} +Requires: papyrus-extras = %{version}-%{release} %description gtkmm This package contains gtkmm widgets associated with the papyrus library. @@ -62,7 +62,7 @@ Summary: Headers for developing programs that will use papyrus-gtkmm Group: Development/Libraries Requires: papyrus-gtkmm = %{version}-%{release} -Requires: papyrus-devel = %{version}-%{release} +Requires: papyrus-extras-devel = %{version}-%{release} Requires: gtkmm24-devel >= 2.6 %description gtkmm-devel @@ -85,8 +85,8 @@ # Fix documentation installation and put papyrus-gtkmm docs under gtk-doc %{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.10/reference/html/ -%{__install} --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.10/reference/html/ doc/reference/html/* -%{__install} --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.10/ doc/papyrus-0.10.devhelp +%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.10/reference/html/ doc/reference/html/* +%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.10/ doc/papyrus-0.10.devhelp %clean @@ -152,6 +152,11 @@ %changelog +* Mon Mar 02 2009 Rick L Vinyard Jr - 0.10.0-2 +- Changed papyrus-gtkmm dependency from papyrus to papyrus-extras +- Changed Sourceforge url to downloads.sf.net from download.sf.net +- Added -p to doc installs + * Fri Feb 06 2009 Rick L Vinyard Jr - 0.10.0-1 - New release - Added new dependencies on glibmm and libxml++ for new release From mclasen at fedoraproject.org Mon Mar 2 23:34:36 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Mar 2009 23:34:36 +0000 (UTC) Subject: rpms/gnome-utils/devel gnome-utils.spec, 1.187, 1.188 dict-whitelisting.patch, 1.1, NONE gcalctool-5.7.23-dummy-uses.patch, 1.1, NONE gcalctool-flex-crap.patch, 1.1, NONE gfloppy-libgnome.patch, 1.1, NONE gnome-screenshot-hideous-uri.patch, 1.1, NONE gnome-utils-2.1.4-alphabitops.patch, 1.1, NONE gnome-utils-2.11.90-schemasdir.patch, 1.1, NONE gnome-utils-2.12.1-monitor.patch, 1.1, NONE gnome-utils-2.13.91-logview-crash.patch, 1.1, NONE gnome-utils-2.15.3-chooser.patch, 1.1, NONE gnome-utils-2.6.1-floppy-major.patch, 1.1, NONE gnome-utils-2.9.92-gfloppy_new_hal_api.patch, 1.1, NONE gnome-utils-logfiles.patch, 1.1, NONE icon-names.patch, 1.1, NONE logview-close-crash.patch, 1.1, NONE logview-scroll-crash.patch, 1.1, NONE logview-versions-crash.patch, 1.1, NONE logview-versions-format.patch, 1.2, NONE shape-crash.patch, 1.1, NONE tempdir.patch, 1.1, NONE Message-ID: <20090302233436.937BE70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4387 Modified Files: gnome-utils.spec Removed Files: dict-whitelisting.patch gcalctool-5.7.23-dummy-uses.patch gcalctool-flex-crap.patch gfloppy-libgnome.patch gnome-screenshot-hideous-uri.patch gnome-utils-2.1.4-alphabitops.patch gnome-utils-2.11.90-schemasdir.patch gnome-utils-2.12.1-monitor.patch gnome-utils-2.13.91-logview-crash.patch gnome-utils-2.15.3-chooser.patch gnome-utils-2.6.1-floppy-major.patch gnome-utils-2.9.92-gfloppy_new_hal_api.patch gnome-utils-logfiles.patch icon-names.patch logview-close-crash.patch logview-scroll-crash.patch logview-versions-crash.patch logview-versions-format.patch shape-crash.patch tempdir.patch Log Message: drop old patches Index: gnome-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- gnome-utils.spec 2 Mar 2009 23:17:54 -0000 1.187 +++ gnome-utils.spec 2 Mar 2009 23:34:06 -0000 1.188 @@ -19,8 +19,6 @@ Source0: http://download.gnome.org/sources/gnome-utils/2.25/gnome-utils-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: gnome-utils-logfiles.patch - BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk2-devel >= %{gtk2_version} @@ -73,7 +71,6 @@ %prep %setup -q -%patch0 -p1 -b .logfiles # Hide from menus pushd gsearchtool --- dict-whitelisting.patch DELETED --- --- gcalctool-5.7.23-dummy-uses.patch DELETED --- --- gcalctool-flex-crap.patch DELETED --- --- gfloppy-libgnome.patch DELETED --- --- gnome-screenshot-hideous-uri.patch DELETED --- --- gnome-utils-2.1.4-alphabitops.patch DELETED --- --- gnome-utils-2.11.90-schemasdir.patch DELETED --- --- gnome-utils-2.12.1-monitor.patch DELETED --- --- gnome-utils-2.13.91-logview-crash.patch DELETED --- --- gnome-utils-2.15.3-chooser.patch DELETED --- --- gnome-utils-2.6.1-floppy-major.patch DELETED --- --- gnome-utils-2.9.92-gfloppy_new_hal_api.patch DELETED --- --- gnome-utils-logfiles.patch DELETED --- --- icon-names.patch DELETED --- --- logview-close-crash.patch DELETED --- --- logview-scroll-crash.patch DELETED --- --- logview-versions-crash.patch DELETED --- --- logview-versions-format.patch DELETED --- --- shape-crash.patch DELETED --- --- tempdir.patch DELETED --- From rvinyard at fedoraproject.org Mon Mar 2 23:35:00 2009 From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.) Date: Mon, 2 Mar 2009 23:35:00 +0000 (UTC) Subject: rpms/papyrus/F-10 papyrus.spec,1.23,1.24 Message-ID: <20090302233500.EA94770116@cvs1.fedora.phx.redhat.com> Author: rvinyard Update of /cvs/pkgs/rpms/papyrus/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4536 Modified Files: papyrus.spec Log Message: Index: papyrus.spec =================================================================== RCS file: /cvs/pkgs/rpms/papyrus/F-10/papyrus.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- papyrus.spec 25 Feb 2009 22:54:49 -0000 1.23 +++ papyrus.spec 2 Mar 2009 23:34:30 -0000 1.24 @@ -1,11 +1,11 @@ Summary: Cairo based C++ scenegraph library Name: papyrus Version: 0.10.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv3 URL: http://libpapyrus.sourceforge.net/ Group: System Environment/Libraries -Source: http://download.sourceforge.net/libpapyrus/papyrus-0.10.0.tar.bz2 +Source: http://downloads.sourceforge.net/libpapyrus/papyrus-0.10.0.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.10 BuildRequires: cairomm-devel >= 1.2 @@ -53,7 +53,7 @@ %package gtkmm Summary: Gtkmm UI widgets for the papyrus scenegraph library Group: System Environment/Libraries -Requires: papyrus = %{version}-%{release} +Requires: papyrus-extras = %{version}-%{release} %description gtkmm This package contains gtkmm widgets associated with the papyrus library. @@ -62,7 +62,7 @@ Summary: Headers for developing programs that will use papyrus-gtkmm Group: Development/Libraries Requires: papyrus-gtkmm = %{version}-%{release} -Requires: papyrus-devel = %{version}-%{release} +Requires: papyrus-extras-devel = %{version}-%{release} Requires: gtkmm24-devel >= 2.6 %description gtkmm-devel @@ -85,8 +85,8 @@ # Fix documentation installation and put papyrus-gtkmm docs under gtk-doc %{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.10/reference/html/ -%{__install} --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.10/reference/html/ doc/reference/html/* -%{__install} --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.10/ doc/papyrus-0.10.devhelp +%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.10/reference/html/ doc/reference/html/* +%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.10/ doc/papyrus-0.10.devhelp %clean @@ -152,6 +152,11 @@ %changelog +* Mon Mar 02 2009 Rick L Vinyard Jr - 0.10.0-2 +- Changed papyrus-gtkmm dependency from papyrus to papyrus-extras +- Changed Sourceforge url to downloads.sf.net from download.sf.net +- Added -p to doc installs + * Fri Feb 06 2009 Rick L Vinyard Jr - 0.10.0-1 - New release - Added new dependencies on glibmm and libxml++ for new release From spot at fedoraproject.org Mon Mar 2 23:37:23 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Mon, 2 Mar 2009 23:37:23 +0000 (UTC) Subject: rpms/mono-sharpcvslib/devel mono-sharpcvslib.spec,1.7,1.8 Message-ID: <20090302233723.CD85C70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/mono-sharpcvslib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4970 Modified Files: mono-sharpcvslib.spec Log Message: rebuild again Index: mono-sharpcvslib.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono-sharpcvslib/devel/mono-sharpcvslib.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mono-sharpcvslib.spec 26 Feb 2009 02:34:07 -0000 1.7 +++ mono-sharpcvslib.spec 2 Mar 2009 23:36:52 -0000 1.8 @@ -2,7 +2,7 @@ Name: mono-sharpcvslib Version: 0.35 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Client cvs library written in C# URL: http://sharpcvslib.sourceforge.net/ # Exception: Permission is given to use this library in commercial closed-source applications @@ -95,6 +95,9 @@ %{_libdir}/pkgconfig/sharpcvslib.pc %changelog +* Mon Mar 2 2009 Tom "spot" Callaway 0.35-9 +- rebuild again + * Wed Feb 25 2009 Fedora Release Engineering - 0.35-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From spot at fedoraproject.org Mon Mar 2 23:37:47 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Mon, 2 Mar 2009 23:37:47 +0000 (UTC) Subject: rpms/nant/devel nant.spec,1.28,1.29 Message-ID: <20090302233747.874E570116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nant/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5068 Modified Files: nant.spec Log Message: disable bootstrapping Index: nant.spec =================================================================== RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- nant.spec 2 Mar 2009 16:22:15 -0000 1.28 +++ nant.spec 2 Mar 2009 23:37:17 -0000 1.29 @@ -1,12 +1,12 @@ %global debug_package %{nil} %global monodir %{_libdir} %global mlib %{_lib} -%global bootstrap 1 +%global bootstrap 0 Summary: NAnt is a build tool for Mono and .NET Name: nant Version: 0.85 -Release: 25%{?dist}.1 +Release: 26%{?dist} Epoch: 1 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz Patch0: nant-build.patch @@ -127,6 +127,9 @@ %doc examples/* doc/help/* %changelog +* Mon Mar 2 2009 Tom "spot" Callaway - 1:0.85-26 +- disable bootstrap + * Mon Mar 2 2009 Tom "spot" Callaway - 1:0.85-25.1 - proper conditionals for bootstrapping From mclasen at fedoraproject.org Mon Mar 2 23:40:45 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Mar 2009 23:40:45 +0000 (UTC) Subject: rpms/gtksourceview2/devel .cvsignore, 1.24, 1.25 gtksourceview2.spec, 1.29, 1.30 sources, 1.24, 1.25 Message-ID: <20090302234045.5DFE370116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gtksourceview2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5567 Modified Files: .cvsignore gtksourceview2.spec sources Log Message: 2.5.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 18 Feb 2009 23:54:20 -0000 1.24 +++ .cvsignore 2 Mar 2009 23:40:14 -0000 1.25 @@ -1 +1 @@ -gtksourceview-2.5.5.tar.bz2 +gtksourceview-2.5.6.tar.bz2 Index: gtksourceview2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/gtksourceview2.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gtksourceview2.spec 25 Feb 2009 02:30:01 -0000 1.29 +++ gtksourceview2.spec 2 Mar 2009 23:40:14 -0000 1.30 @@ -5,24 +5,24 @@ Summary: A library for viewing source files Name: gtksourceview2 -Version: 2.5.5 -Release: 2%{?dist} +Version: 2.5.6 +Release: 1%{?dist} License: LGPLv2+ and GPLv2+ # the library itself is LGPL, some .lang files are GPL Group: System Environment/Libraries -URL: http://gtksourceview.sourceforge.net/ +URL: http://gtksourceview.sourceforge.net/ Source0: http://download.gnome.org/sources/gtksourceview/2.5/gtksourceview-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-vfs2-devel BuildRequires: libxml2-devel BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: intltool >= 0.35 -BuildRequires: gettext +BuildRequires: gettext %description GtkSourceView is a text widget that extends the standard GTK+ -GtkTextView widget. It improves GtkTextView by implementing +GtkTextView widget. It improves GtkTextView by implementing syntax highlighting and other features typical of a source code editor. This package contains version 2 of GtkSourceView. The older version @@ -32,12 +32,12 @@ Summary: Files to compile applications that use gtksourceview2 Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: gtk2-devel >= %{gtk2_version} +Requires: gtk2-devel >= %{gtk2_version} Requires: libxml2-devel Requires: pkgconfig %description devel -gtksourceview2-devel contains the files required to compile +gtksourceview2-devel contains the files required to compile applications which use GtkSourceView 2.x. %prep @@ -81,6 +81,9 @@ %{_libdir}/*.so %changelog +* Mon Mar 2 2009 Matthias Clasen - 2.5.6-1 +- Update to 2.5.6 + * Tue Feb 24 2009 Fedora Release Engineering - 2.5.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 18 Feb 2009 23:54:20 -0000 1.24 +++ sources 2 Mar 2009 23:40:14 -0000 1.25 @@ -1 +1 @@ -c50acd3f033eabe412b995991f3c7c07 gtksourceview-2.5.5.tar.bz2 +3df9c9133ff4007c3ceaf5c3710b6a5f gtksourceview-2.5.6.tar.bz2 From pkgdb at fedoraproject.org Mon Mar 2 23:41:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 23:41:20 +0000 Subject: [pkgdb] xfce4-xmms-plugin ownership updated Message-ID: <20090302234152.D0516208480@bastion.fedora.phx.redhat.com> Package xfce4-xmms-plugin in Fedora devel was orphaned by cwickert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-xmms-plugin From airlied at fedoraproject.org Mon Mar 2 23:42:19 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Mon, 2 Mar 2009 23:42:19 +0000 (UTC) Subject: rpms/xorg-x11-drv-ati/devel radeon-6.11.0-git.patch, 1.1, 1.2 radeon-modeset.patch, 1.32, 1.33 xorg-x11-drv-ati.spec, 1.150, 1.151 Message-ID: <20090302234219.D86B570116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5987 Modified Files: radeon-6.11.0-git.patch radeon-modeset.patch xorg-x11-drv-ati.spec Log Message: * Tue Mar 03 2009 Dave Airlie 6.11.0-2 - rebase to latest upstream r600 accel - fixup VT switch on DRI2 radeon-6.11.0-git.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 radeon-6.11.0-git.patch Index: radeon-6.11.0-git.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-6.11.0-git.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- radeon-6.11.0-git.patch 27 Feb 2009 03:57:32 -0000 1.1 +++ radeon-6.11.0-git.patch 2 Mar 2009 23:42:19 -0000 1.2 @@ -1,5 +1,5 @@ diff --git a/configure.ac b/configure.ac -index 0523cc0..28207d6 100644 +index 0523cc0..b094a50 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ @@ -11,34 +11,8 @@ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-ati) -@@ -129,7 +129,7 @@ if test "x$EXA" = xyes; then - AC_MSG_RESULT(yes) - - SAVE_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" -+ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS -DEXA_DRIVER_KNOWN_MAJOR=3" - AC_CHECK_HEADER(exa.h, - [have_exa_h="yes"], [have_exa_h="no"]) - CPPFLAGS="$SAVE_CPPFLAGS" -@@ -138,7 +138,7 @@ else - fi - - SAVE_CPPFLAGS="$CPPFLAGS" --CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" -+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS -DEXA_DRIVER_KNOWN_MAJOR=3" - if test "x$have_exa_h" = xyes; then - AC_MSG_CHECKING([whether EXA version is at least 2.0.0]) - AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ -@@ -153,6 +153,7 @@ if test "x$have_exa_h" = xyes; then - - if test "x$USE_EXA" = xyes; then - AC_DEFINE(USE_EXA, 1, [Build support for Exa]) -+ AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we know how to handle]) - fi - fi - diff --git a/src/Makefile.am b/src/Makefile.am -index c15cc30..7ff7d31 100644 +index c15cc30..7cc2a6f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,7 +66,7 @@ XMODE_SRCS=\ @@ -46,7 +20,7 @@ if USE_EXA -RADEON_EXA_SOURCES = radeon_exa.c -+RADEON_EXA_SOURCES = radeon_exa.c r600_exa.c r6xx_accel.c r600_textured_videofuncs.c ++RADEON_EXA_SOURCES = radeon_exa.c r600_exa.c r6xx_accel.c r600_textured_videofuncs.c r600_shader.c endif AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER @@ -63,12 +37,24 @@ ati.h \ ativersion.h \ bicubic_table.h \ +diff --git a/src/atipciids.h b/src/atipciids.h +index 7735e93..47c03c7 100644 +--- a/src/atipciids.h ++++ b/src/atipciids.h +@@ -34,6 +34,7 @@ + #define _ATIPCIIDS_H + + /* PCI Vendor */ ++#define PCI_VENDOR_ASUS 0x1043 + #define PCI_VENDOR_ATI 0x1002 + #define PCI_VENDOR_IBM 0x1014 + #define PCI_VENDOR_AMD 0x1022 diff --git a/src/r600_exa.c b/src/r600_exa.c new file mode 100644 -index 0000000..17c5567 +index 0000000..3a4dc8d --- /dev/null +++ b/src/r600_exa.c -@@ -0,0 +1,4441 @@ +@@ -0,0 +1,2128 @@ +/* + * Copyright 2008 Advanced Micro Devices, Inc. + * @@ -105,6 +91,7 @@ + +#include "radeon.h" +#include "radeon_macros.h" ++#include "radeon_reg.h" +#include "r600_shader.h" +#include "r600_reg.h" +#include "r600_state.h" @@ -112,7 +99,7 @@ +extern PixmapPtr +RADEONGetDrawablePixmap(DrawablePtr pDrawable); + -+//#define SHOW_VERTEXES ++/* #define SHOW_VERTEXES */ + +# define RADEON_ROP3_ZERO 0x00000000 +# define RADEON_ROP3_DSa 0x00880000 @@ -173,11 +160,11 @@ + accel_state->dst_size = exaGetPixmapPitch(pPix) * pPix->drawable.height; + accel_state->dst_pitch = exaGetPixmapPitch(pPix) / (pPix->drawable.bitsPerPixel / 8); + -+ // bad pitch ++ /* bad pitch */ + if (accel_state->dst_pitch & 7) + return FALSE; + -+ // bad offset ++ /* bad offset */ + if (accel_state->dst_mc_addr & 0xff) + return FALSE; + @@ -188,7 +175,7 @@ + CLEAR (vs_conf); + CLEAR (ps_conf); + -+ //return FALSE; ++ /* return FALSE; */ + +#ifdef SHOW_VERTEXES + ErrorF("%dx%d @ %dbpp, 0x%08x\n", pPix->drawable.width, pPix->drawable.height, @@ -200,13 +187,11 @@ + /* Init */ + start_3d(pScrn, accel_state->ib); + -+ //cp_set_surface_sync(pScrn, accel_state->ib); -+ + set_default_state(pScrn, accel_state->ib); + + /* Scissor / viewport */ -+ ereg (accel_state->ib, PA_CL_VTE_CNTL, VTX_XY_FMT_bit); -+ ereg (accel_state->ib, PA_CL_CLIP_CNTL, CLIP_DISABLE_bit); ++ EREG(accel_state->ib, PA_CL_VTE_CNTL, VTX_XY_FMT_bit); ++ EREG(accel_state->ib, PA_CL_CLIP_CNTL, CLIP_DISABLE_bit); + + accel_state->vs_mc_addr = info->fbLocation + pScrn->fbOffset + accel_state->shaders->offset + + accel_state->solid_vs_offset; @@ -240,17 +225,16 @@ + + /* Render setup */ + if (pm & 0x000000ff) -+ pmask |= 4; //B ++ pmask |= 4; /* B */ + if (pm & 0x0000ff00) -+ pmask |= 2; //G ++ pmask |= 2; /* G */ + if (pm & 0x00ff0000) -+ pmask |= 1; //R ++ pmask |= 1; /* R */ + if (pm & 0xff000000) -+ pmask |= 8; //A -+ ereg (accel_state->ib, CB_SHADER_MASK, (pmask << OUTPUT0_ENABLE_shift)); -+ ereg (accel_state->ib, R7xx_CB_SHADER_CONTROL, (RT0_ENABLE_bit)); -+ ereg (accel_state->ib, CB_COLOR_CONTROL, RADEON_ROP[alu]); -+ ++ pmask |= 8; /* A */ ++ EREG(accel_state->ib, CB_SHADER_MASK, (pmask << OUTPUT0_ENABLE_shift)); ++ EREG(accel_state->ib, R7xx_CB_SHADER_CONTROL, (RT0_ENABLE_bit)); ++ EREG(accel_state->ib, CB_COLOR_CONTROL, RADEON_ROP[alu]); + + cb_conf.id = 0; + cb_conf.w = accel_state->dst_pitch; @@ -259,67 +243,68 @@ + + if (pPix->drawable.bitsPerPixel == 8) { + cb_conf.format = COLOR_8; -+ cb_conf.comp_swap = 3; //A ++ cb_conf.comp_swap = 3; /* A */ + } else if (pPix->drawable.bitsPerPixel == 16) { + cb_conf.format = COLOR_5_6_5; -+ cb_conf.comp_swap = 2; //RGB ++ cb_conf.comp_swap = 2; /* RGB */ + } else { + cb_conf.format = COLOR_8_8_8_8; -+ cb_conf.comp_swap = 1; //ARGB ++ cb_conf.comp_swap = 1; /* ARGB */ + } + cb_conf.source_format = 1; + cb_conf.blend_clamp = 1; + set_render_target(pScrn, accel_state->ib, &cb_conf); + -+ ereg (accel_state->ib, PA_SU_SC_MODE_CNTL, (FACE_bit | -+ (POLYMODE_PTYPE__TRIANGLES << POLYMODE_FRONT_PTYPE_shift) | -+ (POLYMODE_PTYPE__TRIANGLES << POLYMODE_BACK_PTYPE_shift))); -+ ereg (accel_state->ib, DB_SHADER_CONTROL, ((1 << Z_ORDER_shift) | /* EARLY_Z_THEN_LATE_Z */ -+ DUAL_EXPORT_ENABLE_bit)); /* Only useful if no depth export */ ++ EREG(accel_state->ib, PA_SU_SC_MODE_CNTL, (FACE_bit | ++ (POLYMODE_PTYPE__TRIANGLES << POLYMODE_FRONT_PTYPE_shift) | ++ (POLYMODE_PTYPE__TRIANGLES << POLYMODE_BACK_PTYPE_shift))); ++ EREG(accel_state->ib, DB_SHADER_CONTROL, ((1 << Z_ORDER_shift) | /* EARLY_Z_THEN_LATE_Z */ ++ DUAL_EXPORT_ENABLE_bit)); /* Only useful if no depth export */ + + /* Interpolator setup */ -+ // one unused export from VS (VS_EXPORT_COUNT is zero based, count minus one) [...7293 lines suppressed...] + /* Intel 82830 830 Chipset Host Bridge / Mobility M6 LY Needs AGPMode 2 (fdo #17360)*/ + { PCI_VENDOR_INTEL,0x3575, PCI_VENDOR_ATI,0x4c59, PCI_VENDOR_DELL,0x00e3, 2 }, ++ /* Intel 82852/82855 host bridge / Mobility FireGL 9000 R250 Needs AGPMode 1 (lp #296617) */ ++ { PCI_VENDOR_INTEL,0x3580, PCI_VENDOR_ATI,0x4c66, PCI_VENDOR_DELL,0x0149, 1 }, + /* Intel 82852/82855 host bridge / Mobility 9600 M10 RV350 Needs AGPMode 1 (deb #467460) */ +- { PCI_VENDOR_INTEL,0x3580, PCI_VENDOR_ATI,0x4e50, 0x1025,0x0061, 1 }, ++ { PCI_VENDOR_INTEL,0x3580, PCI_VENDOR_ATI,0x4e50, 0x1025,0x0061, 1 }, + /* Intel 82852/82855 host bridge / Mobility 9600 M10 RV350 Needs AGPMode 1 (lp #203007) */ +- { PCI_VENDOR_INTEL,0x3580, PCI_VENDOR_ATI,0x4e50, 0x1025,0x0064, 1 }, ++ { PCI_VENDOR_INTEL,0x3580, PCI_VENDOR_ATI,0x4e50, 0x1025,0x0064, 1 }, + /* Intel 82852/82855 host bridge / Mobility 9600 M10 RV350 Needs AGPMode 1 (lp #141551) */ +- { PCI_VENDOR_INTEL,0x3580, PCI_VENDOR_ATI,0x4e50, 0x1043,0x1942, 1 }, +- /* Intel 82852/82855 host bridge / Mobility FireGL 9000 R250 Needs AGPMode 1 (lp #296617) */ +- { PCI_VENDOR_INTEL,0x3580, PCI_VENDOR_ATI,0x4c66, 0x1028,0x0149, 1 }, ++ { PCI_VENDOR_INTEL,0x3580, PCI_VENDOR_ATI,0x4e50, PCI_VENDOR_ASUS,0x1942, 1 }, + /* Intel 82852/82855 host bridge / Mobility 9600/9700 Needs AGPMode 1 (deb #510208) */ +- { PCI_VENDOR_INTEL,0x3580, PCI_VENDOR_ATI,0x4e50, 0x10cf,0x127f, 1 }, ++ { PCI_VENDOR_INTEL,0x3580, PCI_VENDOR_ATI,0x4e50, 0x10cf,0x127f, 1 }, + +- /* ASRock K7VT4A+ AGP 8x / ATI Radeon 9250 AGP Needs AGPMode 4 (LP: #133192) */ +- { 0x1849,0x3189, PCI_VENDOR_ATI,0x5960, 0x1787, 0x5960, 4 }, ++ /* ASRock K7VT4A+ AGP 8x / ATI Radeon 9250 AGP Needs AGPMode 4 (lp #133192) */ ++ { 0x1849,0x3189, PCI_VENDOR_ATI,0x5960, 0x1787,0x5960, 4 }, + ++ /* VIA K8M800 Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 4 (fdo #12544) */ ++ { PCI_VENDOR_VIA,0x0204, PCI_VENDOR_ATI,0x5960, 0x17af,0x2020, 4 }, ++ /* VIA KT880 Host Bridge / RV350 [Radeon 9550] Needs AGPMode 4 (fdo #19981) */ ++ { PCI_VENDOR_VIA,0x0269, PCI_VENDOR_ATI,0x4153, PCI_VENDOR_ASUS,0x003c, 4 }, + /* VIA VT8363 Host Bridge / R200 QL [Radeon 8500] Needs AGPMode 2 (lp #141551) */ +- { 0x1106,0x0305, PCI_VENDOR_ATI,0x514c, 0x1002,0x013a, 2 }, ++ { PCI_VENDOR_VIA,0x0305, PCI_VENDOR_ATI,0x514c, PCI_VENDOR_ATI,0x013a, 2 }, ++ /* VIA VT82C693A Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 2 (deb #515512) */ ++ { PCI_VENDOR_VIA,0x0691, PCI_VENDOR_ATI,0x5960, PCI_VENDOR_ASUS,0x004c, 2 }, ++ /* VIA VT82C693A Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 2 */ ++ { PCI_VENDOR_VIA,0x0691, PCI_VENDOR_ATI,0x5960, PCI_VENDOR_ASUS,0x0054, 2 }, + /* VIA VT8377 Host Bridge / R200 QM [Radeon 9100] Needs AGPMode 4 (deb #461144) */ +- { 0x1106,0x3189, PCI_VENDOR_ATI,0x514d, 0x174b,0x7149, 4 }, ++ { PCI_VENDOR_VIA,0x3189, PCI_VENDOR_ATI,0x514d, 0x174b,0x7149, 4 }, + /* VIA VT8377 Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 4 (lp #312693) */ +- { 0x1106,0x3189, PCI_VENDOR_ATI,0x5960, 0x1462,0x0380, 4 }, ++ { PCI_VENDOR_VIA,0x3189, PCI_VENDOR_ATI,0x5960, 0x1462,0x0380, 4 }, + /* VIA VT8377 Host Bridge / RV280 Needs AGPMode 4 (ati ML) */ +- { 0x1106,0x3189, PCI_VENDOR_ATI,0x5964, 0x148c,0x2073, 4 }, +- /* VIA VT82C693A Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 2 */ +- { 0x1106,0x0691, PCI_VENDOR_ATI,0x5960, 0x1043,0x0054, 2 }, +- /* VIA VT82C693A Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 2 (deb #515512) */ +- { 0x1106,0x0691, PCI_VENDOR_ATI,0x5960, 0x1043,0x004c, 2 }, +- /* VIA K8M800 Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 4 (fdo #12544) */ +- { 0x1106,0x0204, PCI_VENDOR_ATI,0x5960, 0x17af,0x2020, 4 }, +- /* VIA KT880 Host Bridge / RV350 [Radeon 9550] Needs AGPMode 4 (fdo #19981) */ +- { 0x1106,0x0269, PCI_VENDOR_ATI,0x4153, 0x1043,0x003c, 4 }, ++ { PCI_VENDOR_VIA,0x3189, PCI_VENDOR_ATI,0x5964, 0x148c,0x2073, 4 }, + + /* ATI Host Bridge / RV280 [M9+] Needs AGPMode 1 (phoronix forum) */ +- { 0x1002,0xcbb2, PCI_VENDOR_ATI,0x5c61, 0x104d,0x8175, 1 }, ++ { PCI_VENDOR_ATI,0xcbb2, PCI_VENDOR_ATI,0x5c61, PCI_VENDOR_SONY,0x8175, 1 }, ++ ++ /* HP Host Bridge / R300 [FireGL X1] Needs AGPMode 2 (fdo #7770) */ ++ { PCI_VENDOR_HP,0x122e, PCI_VENDOR_ATI,0x4e47, PCI_VENDOR_ATI,0x0152, 2 }, + + { 0, 0, 0, 0, 0, 0, 0 }, + }; +@@ -790,92 +800,96 @@ static Bool RADEONSetAgpMode(RADEONInfoPtr info, ScreenPtr pScreen) unsigned long mode = drmAgpGetMode(info->dri->drmFD); /* Default mode */ unsigned int vendor = drmAgpVendorId(info->dri->drmFD); unsigned int device = drmAgpDeviceId(info->dri->drmFD); @@ -11481,7 +11089,7 @@ xf86DrvMsg(pScreen->myNum, X_INFO, "[agp] Mode 0x%08lx [AGP 0x%04x/0x%04x; Card 0x%04x/0x%04x 0x%04x/0x%04x]\n", -@@ -910,6 +915,9 @@ static void RADEONSetAgpBase(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -910,6 +924,9 @@ static void RADEONSetAgpBase(RADEONInfoPtr info, ScreenPtr pScreen) ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; unsigned char *RADEONMMIO = info->MMIO; @@ -11491,7 +11099,7 @@ /* drm already does this, so we can probably remove this. * agp_base_2 ? */ -@@ -1183,13 +1191,14 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1183,13 +1200,14 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) drm_radeon_init_t drmInfo; memset(&drmInfo, 0, sizeof(drm_radeon_init_t)); @@ -11512,7 +11120,7 @@ drmInfo.sarea_priv_offset = sizeof(XF86DRISAREARec); drmInfo.is_pci = (info->cardType!=CARD_AGP); -@@ -1223,7 +1232,8 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1223,7 +1241,8 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) * registers back to their default values, so we need to restore * those engine register here. */ @@ -11522,7 +11130,7 @@ return TRUE; } -@@ -1299,14 +1309,16 @@ static void RADEONDRIIrqInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1299,14 +1318,16 @@ static void RADEONDRIIrqInit(RADEONInfoPtr info, ScreenPtr pScreen) "[drm] falling back to irq-free operation\n"); info->dri->irq = 0; } else { @@ -11547,7 +11155,7 @@ } } -@@ -1840,7 +1852,8 @@ void RADEONDRIResume(ScreenPtr pScreen) +@@ -1840,7 +1861,8 @@ void RADEONDRIResume(ScreenPtr pScreen) /* FIXME: return? */ } @@ -12033,19 +11641,10 @@ static Bool RADEONPrepareAccess(PixmapPtr pPix, int index) { diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c -index cd97cc6..dec0285 100644 +index cd97cc6..59cb46f 100644 --- a/src/radeon_exa_funcs.c +++ b/src/radeon_exa_funcs.c -@@ -56,8 +56,6 @@ - - #include "radeon.h" - --#include "exa.h" -- - static int - FUNC_NAME(RADEONMarkSync)(ScreenPtr pScreen) - { -@@ -129,7 +127,8 @@ FUNC_NAME(RADEONSolid)(PixmapPtr pPix, int x1, int y1, int x2, int y2) +@@ -129,7 +129,8 @@ FUNC_NAME(RADEONSolid)(PixmapPtr pPix, int x1, int y1, int x2, int y2) TRACE; @@ -12055,7 +11654,7 @@ BEGIN_ACCEL(2); OUT_ACCEL_REG(RADEON_DST_Y_X, (y1 << 16) | x1); -@@ -230,7 +229,8 @@ FUNC_NAME(RADEONCopy)(PixmapPtr pDst, +@@ -230,7 +231,8 @@ FUNC_NAME(RADEONCopy)(PixmapPtr pDst, dstY += h - 1; } @@ -12065,7 +11664,7 @@ BEGIN_ACCEL(3); -@@ -281,7 +281,8 @@ RADEONUploadToScreenCP(PixmapPtr pDst, int x, int y, int w, int h, +@@ -281,7 +283,8 @@ RADEONUploadToScreenCP(PixmapPtr pDst, int x, int y, int w, int h, RADEON_SWITCH_TO_2D(); @@ -12075,6 +11674,16 @@ while ((buf = RADEONHostDataBlit(pScrn, cpp, w, dst_pitch_off, &buf_pitch, +@@ -476,6 +479,9 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) + #endif /* X_BYTE_ORDER == X_BIG_ENDIAN */ + + info->accel_state->exa->flags = EXA_OFFSCREEN_PIXMAPS; ++#ifdef EXA_SUPPORTS_PREPARE_AUX ++ info->accel_state->exa->flags |= EXA_SUPPORTS_PREPARE_AUX; ++#endif + info->accel_state->exa->pixmapOffsetAlign = RADEON_BUFFER_ALIGN + 1; + info->accel_state->exa->pixmapPitchAlign = 64; + diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c index c44502c..571204a 100644 --- a/src/radeon_exa_render.c @@ -12201,20 +11810,10 @@ range[0] = 0; /* off */ diff --git a/src/radeon_probe.h b/src/radeon_probe.h -index 447ef57..49044e3 100644 +index 447ef57..f072b9c 100644 --- a/src/radeon_probe.h +++ b/src/radeon_probe.h -@@ -43,9 +43,6 @@ - - #include "xf86Crtc.h" - --#ifdef USE_EXA --#include "exa.h" --#endif - #ifdef USE_XAA - #include "xaa.h" - #endif -@@ -373,7 +370,7 @@ struct avivo_state +@@ -373,7 +373,7 @@ struct avivo_state /* dvoa */ uint32_t dvoa[16]; @@ -12223,7 +11822,7 @@ uint32_t fmt1[18]; uint32_t fmt2[18]; uint32_t dig1[19]; -@@ -384,9 +381,15 @@ struct avivo_state +@@ -384,9 +384,15 @@ struct avivo_state uint32_t aux_cntl2[14]; uint32_t aux_cntl3[14]; uint32_t aux_cntl4[14]; radeon-modeset.patch: Index: radeon-modeset.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- radeon-modeset.patch 27 Feb 2009 03:57:32 -0000 1.32 +++ radeon-modeset.patch 2 Mar 2009 23:42:19 -0000 1.33 @@ -1,5 +1,5 @@ diff --git a/configure.ac b/configure.ac -index 28207d6..051eca8 100644 +index b094a50..29a19e3 100644 --- a/configure.ac +++ b/configure.ac @@ -114,8 +114,19 @@ if test "$DRI" = yes; then @@ -23,7 +23,7 @@ CFLAGS="$XORG_CFLAGS" AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"]) diff --git a/src/Makefile.am b/src/Makefile.am -index 7ff7d31..c03a2c7 100644 +index 7cc2a6f..8a55d1c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -90,12 +90,14 @@ radeon_drv_ladir = @moduledir@/drivers @@ -1012,7 +1012,7 @@ +#endif +#endif diff --git a/src/radeon.h b/src/radeon.h -index a7ed95e..69e41a6 100644 +index 355a949..9cdc12a 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -46,6 +46,8 @@ @@ -1118,7 +1118,7 @@ int fbX; int fbY; int backX; -@@ -817,6 +852,7 @@ typedef struct { +@@ -783,6 +818,7 @@ typedef struct { RADEONCardType cardType; /* Current card is a PCI card */ struct radeon_cp *cp; struct radeon_dri *dri; @@ -1126,7 +1126,7 @@ #ifdef USE_EXA Bool accelDFS; #endif -@@ -918,6 +954,44 @@ typedef struct { +@@ -884,6 +920,44 @@ typedef struct { int virtualX; int virtualY; @@ -1171,7 +1171,7 @@ } RADEONInfoRec, *RADEONInfoPtr; #define RADEONWaitForFifo(pScrn, entries) \ -@@ -1170,6 +1244,23 @@ extern void +@@ -1136,6 +1210,23 @@ extern void radeon_legacy_free_memory(ScrnInfoPtr pScrn, void *mem_struct); @@ -1195,7 +1195,7 @@ #ifdef XF86DRI # ifdef USE_XAA /* radeon_accelfuncs.c */ -@@ -1188,7 +1279,9 @@ do { \ +@@ -1154,7 +1245,9 @@ do { \ #define RADEONCP_RELEASE(pScrn, info) \ do { \ @@ -1206,7 +1206,7 @@ RADEON_PURGE_CACHE(); \ RADEON_WAIT_UNTIL_IDLE(); \ RADEONCPReleaseIndirect(pScrn); \ -@@ -1223,7 +1316,7 @@ do { \ +@@ -1189,7 +1282,7 @@ do { \ #define RADEONCP_REFRESH(pScrn, info) \ do { \ @@ -1215,7 +1215,7 @@ if (info->cp->needCacheFlush) { \ RADEON_PURGE_CACHE(); \ RADEON_PURGE_ZCACHE(); \ -@@ -1250,6 +1343,13 @@ do { \ +@@ -1216,6 +1309,13 @@ do { \ #define RING_LOCALS uint32_t *__head = NULL; int __expected; int __count = 0 #define BEGIN_RING(n) do { \ @@ -1229,7 +1229,7 @@ if (RADEON_VERBOSE) { \ xf86DrvMsg(pScrn->scrnIndex, X_INFO, \ "BEGIN_RING(%d) in %s\n", (unsigned int)n, __FUNCTION__);\ -@@ -1262,13 +1362,6 @@ do { \ +@@ -1228,13 +1328,6 @@ do { \ } \ info->cp->dma_debug_func = __FILE__; \ info->cp->dma_debug_lineno = __LINE__; \ @@ -1243,7 +1243,7 @@ __expected = n; \ __head = (pointer)((char *)info->cp->indirectBuffer->address + \ info->cp->indirectBuffer->used); \ -@@ -1311,6 +1404,14 @@ do { \ +@@ -1277,6 +1370,14 @@ do { \ OUT_RING(val); \ } while (0) @@ -2481,7 +2481,7 @@ xf86CrtcPtr crtc = xf86_config->crtc[c]; RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private; diff --git a/src/radeon_dri.c b/src/radeon_dri.c -index 45c927f..b9641a8 100644 +index 45f79ed..0b1f7d8 100644 --- a/src/radeon_dri.c +++ b/src/radeon_dri.c @@ -40,6 +40,8 @@ @@ -2493,16 +2493,16 @@ /* Driver data structures */ #include "radeon.h" -@@ -51,6 +53,8 @@ - #include "radeon_dri.h" - #include "radeon_version.h" +@@ -53,6 +55,8 @@ + + #include "atipciids.h" +#include "radeon_drm.h" + /* X and server generic header files */ #include "xf86.h" #include "xf86PciInfo.h" -@@ -68,16 +72,31 @@ static size_t radeon_drm_page_size; +@@ -70,16 +74,31 @@ static size_t radeon_drm_page_size; extern void GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs, void **configprivs); @@ -2536,7 +2536,7 @@ static void RADEONDRIClipNotify(ScreenPtr pScreen, WindowPtr *ppWin, int num); #endif #endif -@@ -350,6 +369,129 @@ static void RADEONDestroyContext(ScreenPtr pScreen, drm_context_t hwContext, +@@ -352,6 +371,133 @@ static void RADEONDestroyContext(ScreenPtr pScreen, drm_context_t hwContext, #endif } @@ -2645,7 +2645,7 @@ + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + RADEONInfoPtr info = RADEONPTR(pScrn); + Bool success; -+ drm_radeon_sarea_t * sarea = DRIGetSAREAPrivate(pScreen); ++ drm_radeon_sarea_t *sarea; + + if (info->ChipFamily >= CHIP_FAMILY_R600) + return TRUE; @@ -2653,6 +2653,10 @@ + if (!info->drm_mm) + return TRUE; + ++ if (info->dri2.enabled) ++ return TRUE; ++ ++ sarea = DRIGetSAREAPrivate(pScreen); + success = radeon_update_dri_mappings(pScrn, sarea); + + if (!success) @@ -2666,7 +2670,7 @@ /* Called when the X server is woken up to allow the last client's * context to be saved and the X server's context to be loaded. This is * not necessary for the Radeon since the client detects when it's -@@ -699,25 +841,35 @@ static void RADEONDRIInitGARTValues(RADEONInfoPtr info) +@@ -701,25 +847,35 @@ static void RADEONDRIInitGARTValues(RADEONInfoPtr info) info->dri->gartOffset = 0; @@ -2721,7 +2725,7 @@ } /* AGP Mode Quirk List - Certain hostbridge/gfx-card combos don't work with -@@ -979,6 +1131,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -988,6 +1144,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) "[agp] ring handle = 0x%08x\n", (unsigned int)info->dri->ringHandle); @@ -2730,7 +2734,7 @@ if (drmMap(info->dri->drmFD, info->dri->ringHandle, info->dri->ringMapSize, &info->dri->ring) < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[agp] Could not map ring\n"); -@@ -987,9 +1141,10 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -996,9 +1154,10 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) xf86DrvMsg(pScreen->myNum, X_INFO, "[agp] Ring mapped at 0x%08lx\n", (unsigned long)info->dri->ring); @@ -2742,7 +2746,7 @@ xf86DrvMsg(pScreen->myNum, X_ERROR, "[agp] Could not add ring read ptr mapping\n"); return FALSE; -@@ -998,6 +1153,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1007,6 +1166,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) "[agp] ring read ptr handle = 0x%08x\n", (unsigned int)info->dri->ringReadPtrHandle); @@ -2751,7 +2755,7 @@ if (drmMap(info->dri->drmFD, info->dri->ringReadPtrHandle, info->dri->ringReadMapSize, &info->dri->ringReadPtr) < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, -@@ -1007,6 +1164,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1016,6 +1177,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) xf86DrvMsg(pScreen->myNum, X_INFO, "[agp] Ring read ptr mapped at 0x%08lx\n", (unsigned long)info->dri->ringReadPtr); @@ -2759,7 +2763,7 @@ if (drmAddMap(info->dri->drmFD, info->dri->bufStart, info->dri->bufMapSize, DRM_AGP, 0, &info->dri->bufHandle) < 0) { -@@ -1084,6 +1242,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1093,6 +1255,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) "[pci] ring handle = 0x%08x\n", (unsigned int)info->dri->ringHandle); @@ -2767,7 +2771,7 @@ if (drmMap(info->dri->drmFD, info->dri->ringHandle, info->dri->ringMapSize, &info->dri->ring) < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[pci] Could not map ring\n"); -@@ -1095,6 +1254,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1104,6 +1267,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) xf86DrvMsg(pScreen->myNum, X_INFO, "[pci] Ring contents 0x%08lx\n", *(unsigned long *)(pointer)info->dri->ring); @@ -2775,7 +2779,7 @@ if (drmAddMap(info->dri->drmFD, info->dri->ringReadOffset, info->dri->ringReadMapSize, DRM_SCATTER_GATHER, flags, &info->dri->ringReadPtrHandle) < 0) { -@@ -1106,8 +1266,10 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1115,8 +1279,10 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) "[pci] ring read ptr handle = 0x%08x\n", (unsigned int)info->dri->ringReadPtrHandle); @@ -2786,7 +2790,7 @@ xf86DrvMsg(pScreen->myNum, X_ERROR, "[pci] Could not map ring read ptr\n"); return FALSE; -@@ -1118,6 +1280,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1127,6 +1293,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) xf86DrvMsg(pScreen->myNum, X_INFO, "[pci] Ring read ptr contents 0x%08lx\n", *(unsigned long *)(pointer)info->dri->ringReadPtr); @@ -2794,7 +2798,7 @@ if (drmAddMap(info->dri->drmFD, info->dri->bufStart, info->dri->bufMapSize, DRM_SCATTER_GATHER, 0, &info->dri->bufHandle) < 0) { -@@ -1170,6 +1333,9 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1179,6 +1346,9 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) */ static Bool RADEONDRIMapInit(RADEONInfoPtr info, ScreenPtr pScreen) { @@ -2804,7 +2808,7 @@ /* Map registers */ info->dri->registerSize = info->MMIOSize; if (drmAddMap(info->dri->drmFD, info->MMIOAddr, info->dri->registerSize, -@@ -1210,20 +1376,23 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1219,20 +1389,23 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) drmInfo.fb_bpp = info->CurrentLayout.pixel_code; drmInfo.depth_bpp = (info->dri->depthBits - 8) * 2; @@ -2842,7 +2846,7 @@ if (drmCommandWrite(info->dri->drmFD, DRM_RADEON_CP_INIT, &drmInfo, sizeof(drm_radeon_init_t)) < 0) return FALSE; -@@ -1232,8 +1401,9 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1241,8 +1414,9 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) * registers back to their default values, so we need to restore * those engine register here. */ @@ -2854,7 +2858,7 @@ return TRUE; } -@@ -1431,12 +1601,11 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn) +@@ -1440,12 +1614,11 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn) /* Get DRM version & close DRM */ info->dri->pKernelDRMVersion = drmGetVersion(fd); @@ -2868,7 +2872,7 @@ } /* Now check if we qualify */ -@@ -1470,10 +1639,29 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn) +@@ -1479,10 +1652,29 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn) req_patch); drmFreeVersion(info->dri->pKernelDRMVersion); info->dri->pKernelDRMVersion = NULL; @@ -2899,7 +2903,7 @@ } Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on) -@@ -1482,6 +1670,9 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on) +@@ -1491,6 +1683,9 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on) xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); int value = 0; @@ -2909,7 +2913,7 @@ if (!info->want_vblank_interrupts) on = FALSE; -@@ -1501,6 +1692,48 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on) +@@ -1510,6 +1705,48 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on) return TRUE; } @@ -2958,7 +2962,7 @@ /* Initialize the screen-specific data structures for the DRI and the * Radeon. This is the main entry point to the device-specific -@@ -1564,10 +1797,22 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) +@@ -1573,10 +1810,22 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) pDRIInfo->ddxDriverMajorVersion = info->allowColorTiling ? 5 : 4; pDRIInfo->ddxDriverMinorVersion = 3; pDRIInfo->ddxDriverPatchVersion = 0; @@ -2985,7 +2989,7 @@ pDRIInfo->ddxDrawableTableEntry = RADEON_MAX_DRAWABLES; pDRIInfo->maxDrawableTableEntry = (SAREA_MAX_DRAWABLES < RADEON_MAX_DRAWABLES -@@ -1620,9 +1865,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) +@@ -1629,9 +1878,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) pDRIInfo->TransitionTo3d = RADEONDRITransitionTo3d; pDRIInfo->TransitionSingleToMulti3D = RADEONDRITransitionSingleToMulti3d; pDRIInfo->TransitionMultiToSingle3D = RADEONDRITransitionMultiToSingle3d; @@ -2996,7 +3000,7 @@ pDRIInfo->ClipNotify = RADEONDRIClipNotify; #endif -@@ -1654,57 +1897,60 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) +@@ -1663,57 +1910,60 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) pDRIInfo = NULL; return FALSE; } @@ -3101,7 +3105,7 @@ static Bool RADEONDRIDoCloseScreen(int scrnIndex, ScreenPtr pScreen) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -@@ -1746,17 +1992,21 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen) +@@ -1755,17 +2005,21 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen) return FALSE; } @@ -3131,7 +3135,7 @@ /* Initialize and start the CP if required */ RADEONDRICPInit(pScrn); -@@ -1765,6 +2015,10 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen) +@@ -1774,6 +2028,10 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen) pSAREAPriv = (drm_radeon_sarea_t*)DRIGetSAREAPrivate(pScreen); memset(pSAREAPriv, 0, sizeof(*pSAREAPriv)); @@ -3142,7 +3146,7 @@ pRADEONDRI = (RADEONDRIPtr)info->dri->pDRIInfo->devPrivate; pRADEONDRI->deviceID = info->Chipset; -@@ -1922,6 +2176,8 @@ void RADEONDRICloseScreen(ScreenPtr pScreen) +@@ -1931,6 +2189,8 @@ void RADEONDRICloseScreen(ScreenPtr pScreen) drmUnmap(info->dri->buf, info->dri->bufMapSize); info->dri->buf = NULL; } @@ -3151,7 +3155,7 @@ if (info->dri->ringReadPtr) { drmUnmap(info->dri->ringReadPtr, info->dri->ringReadMapSize); info->dri->ringReadPtr = NULL; -@@ -1930,6 +2186,7 @@ void RADEONDRICloseScreen(ScreenPtr pScreen) +@@ -1939,6 +2199,7 @@ void RADEONDRICloseScreen(ScreenPtr pScreen) drmUnmap(info->dri->ring, info->dri->ringMapSize); info->dri->ring = NULL; } @@ -3159,7 +3163,7 @@ if (info->dri->agpMemHandle != DRM_AGP_NO_HANDLE) { drmAgpUnbind(info->dri->drmFD, info->dri->agpMemHandle); drmAgpFree(info->dri->drmFD, info->dri->agpMemHandle); -@@ -2335,3 +2592,16 @@ int RADEONDRISetParam(ScrnInfoPtr pScrn, unsigned int param, int64_t value) +@@ -2344,3 +2605,16 @@ int RADEONDRISetParam(ScrnInfoPtr pScrn, unsigned int param, int64_t value) &radeonsetparam, sizeof(drm_radeon_setparam_t)); return ret; } @@ -6093,10 +6097,10 @@ } #endif diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c -index dec0285..6e9c212 100644 +index 59cb46f..7172cc2 100644 --- a/src/radeon_exa_funcs.c +++ b/src/radeon_exa_funcs.c -@@ -72,21 +72,73 @@ FUNC_NAME(RADEONSync)(ScreenPtr pScreen, int marker) +@@ -74,21 +74,73 @@ FUNC_NAME(RADEONSync)(ScreenPtr pScreen, int marker) ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; RADEONInfoPtr info = RADEONPTR(pScrn); @@ -6171,7 +6175,7 @@ ACCEL_PREAMBLE(); TRACE; -@@ -95,25 +147,58 @@ FUNC_NAME(RADEONPrepareSolid)(PixmapPtr pPix, int alu, Pixel pm, Pixel fg) +@@ -97,25 +149,58 @@ FUNC_NAME(RADEONPrepareSolid)(PixmapPtr pPix, int alu, Pixel pm, Pixel fg) RADEON_FALLBACK(("24bpp unsupported\n")); if (!RADEONGetDatatypeBpp(pPix->drawable.bitsPerPixel, &datatype)) RADEON_FALLBACK(("RADEONGetDatatypeBpp failed\n")); @@ -6245,7 +6249,7 @@ return TRUE; } -@@ -144,6 +229,7 @@ FUNC_NAME(RADEONDoneSolid)(PixmapPtr pPix) +@@ -146,6 +231,7 @@ FUNC_NAME(RADEONDoneSolid)(PixmapPtr pPix) TRACE; @@ -6253,7 +6257,7 @@ BEGIN_ACCEL(2); OUT_ACCEL_REG(RADEON_DSTCACHE_CTLSTAT, RADEON_RB2D_DC_FLUSH_ALL); OUT_ACCEL_REG(RADEON_WAIT_UNTIL, -@@ -151,6 +237,7 @@ FUNC_NAME(RADEONDoneSolid)(PixmapPtr pPix) +@@ -153,6 +239,7 @@ FUNC_NAME(RADEONDoneSolid)(PixmapPtr pPix) FINISH_ACCEL(); } @@ -6261,7 +6265,7 @@ void FUNC_NAME(RADEONDoPrepareCopy)(ScrnInfoPtr pScrn, uint32_t src_pitch_offset, uint32_t dst_pitch_offset, uint32_t datatype, int rop, -@@ -161,23 +248,28 @@ FUNC_NAME(RADEONDoPrepareCopy)(ScrnInfoPtr pScrn, uint32_t src_pitch_offset, +@@ -163,23 +250,28 @@ FUNC_NAME(RADEONDoPrepareCopy)(ScrnInfoPtr pScrn, uint32_t src_pitch_offset, RADEON_SWITCH_TO_2D(); @@ -6307,7 +6311,7 @@ } static Bool -@@ -188,9 +280,46 @@ FUNC_NAME(RADEONPrepareCopy)(PixmapPtr pSrc, PixmapPtr pDst, +@@ -190,9 +282,46 @@ FUNC_NAME(RADEONPrepareCopy)(PixmapPtr pSrc, PixmapPtr pDst, { RINFO_FROM_SCREEN(pDst->drawable.pScreen); uint32_t datatype, src_pitch_offset, dst_pitch_offset; @@ -6355,7 +6359,7 @@ info->accel_state->xdir = xdir; info->accel_state->ydir = ydir; -@@ -198,10 +327,11 @@ FUNC_NAME(RADEONPrepareCopy)(PixmapPtr pSrc, PixmapPtr pDst, +@@ -200,10 +329,11 @@ FUNC_NAME(RADEONPrepareCopy)(PixmapPtr pSrc, PixmapPtr pDst, RADEON_FALLBACK(("24bpp unsupported")); if (!RADEONGetDatatypeBpp(pDst->drawable.bitsPerPixel, &datatype)) RADEON_FALLBACK(("RADEONGetDatatypeBpp failed\n")); @@ -6369,7 +6373,7 @@ FUNC_NAME(RADEONDoPrepareCopy)(pScrn, src_pitch_offset, dst_pitch_offset, datatype, rop, planemask); -@@ -249,6 +379,7 @@ FUNC_NAME(RADEONDoneCopy)(PixmapPtr pDst) +@@ -251,6 +381,7 @@ FUNC_NAME(RADEONDoneCopy)(PixmapPtr pDst) TRACE; @@ -6377,7 +6381,7 @@ BEGIN_ACCEL(2); OUT_ACCEL_REG(RADEON_DSTCACHE_CTLSTAT, RADEON_RB2D_DC_FLUSH_ALL); OUT_ACCEL_REG(RADEON_WAIT_UNTIL, -@@ -259,12 +390,15 @@ FUNC_NAME(RADEONDoneCopy)(PixmapPtr pDst) +@@ -261,12 +392,15 @@ FUNC_NAME(RADEONDoneCopy)(PixmapPtr pDst) #ifdef ACCEL_CP @@ -6393,7 +6397,7 @@ unsigned int hpass; uint32_t buf_pitch, dst_pitch_off; -@@ -273,9 +407,45 @@ RADEONUploadToScreenCP(PixmapPtr pDst, int x, int y, int w, int h, +@@ -275,9 +409,45 @@ RADEONUploadToScreenCP(PixmapPtr pDst, int x, int y, int w, int h, if (bpp < 8) return FALSE; @@ -6442,7 +6446,7 @@ int cpp = bpp / 8; ACCEL_PREAMBLE(); -@@ -298,17 +468,24 @@ RADEONUploadToScreenCP(PixmapPtr pDst, int x, int y, int w, int h, +@@ -300,17 +470,24 @@ RADEONUploadToScreenCP(PixmapPtr pDst, int x, int y, int w, int h, return FALSE; } @@ -6469,7 +6473,7 @@ OUT_ACCEL_REG(RADEON_DP_GUI_MASTER_CNTL, RADEON_GMC_DST_PITCH_OFFSET_CNTL | RADEON_GMC_SRC_PITCH_OFFSET_CNTL | -@@ -319,8 +496,14 @@ RADEONBlitChunk(ScrnInfoPtr pScrn, uint32_t datatype, uint32_t src_pitch_offset, +@@ -321,8 +498,14 @@ RADEONBlitChunk(ScrnInfoPtr pScrn, uint32_t datatype, uint32_t src_pitch_offset, RADEON_DP_SRC_SOURCE_MEMORY | RADEON_GMC_CLR_CMP_CNTL_DIS | RADEON_GMC_WR_MSK_DIS); @@ -6484,7 +6488,7 @@ OUT_ACCEL_REG(RADEON_SRC_Y_X, (srcY << 16) | srcX); OUT_ACCEL_REG(RADEON_DST_Y_X, (dstY << 16) | dstX); OUT_ACCEL_REG(RADEON_DST_HEIGHT_WIDTH, (h << 16) | w); -@@ -332,6 +515,173 @@ RADEONBlitChunk(ScrnInfoPtr pScrn, uint32_t datatype, uint32_t src_pitch_offset, +@@ -334,6 +517,173 @@ RADEONBlitChunk(ScrnInfoPtr pScrn, uint32_t datatype, uint32_t src_pitch_offset, FINISH_ACCEL(); } @@ -6658,7 +6662,7 @@ static Bool RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h, -@@ -345,12 +695,17 @@ RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h, +@@ -347,12 +697,17 @@ RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h, TRACE; @@ -6677,7 +6681,7 @@ RADEONGetPixmapOffsetPitch(pSrc, &src_pitch_offset) && (scratch = RADEONCPGetBuffer(pScrn))) { -@@ -365,7 +720,8 @@ RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h, +@@ -367,7 +722,8 @@ RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h, RADEON_SWITCH_TO_2D(); /* Kick the first blit as early as possible */ @@ -6687,7 +6691,7 @@ x, y, 0, 0, w, hpass); FLUSH_RING(); -@@ -392,7 +748,8 @@ RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h, +@@ -394,7 +750,8 @@ RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h, /* Prepare next blit if anything's left */ if (hpass) { scratch_off = scratch->total/2 - scratch_off; @@ -6697,7 +6701,7 @@ x, y, 0, 0, w, hpass); } -@@ -466,19 +823,22 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) +@@ -468,15 +825,13 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) info->accel_state->exa->MarkSync = FUNC_NAME(RADEONMarkSync); info->accel_state->exa->WaitMarker = FUNC_NAME(RADEONSync); #ifdef ACCEL_CP @@ -6713,18 +6717,20 @@ -#endif /* X_BYTE_ORDER == X_BIG_ENDIAN */ info->accel_state->exa->flags = EXA_OFFSCREEN_PIXMAPS; -- info->accel_state->exa->pixmapOffsetAlign = RADEON_BUFFER_ALIGN + 1; + #ifdef EXA_SUPPORTS_PREPARE_AUX +@@ -485,6 +840,11 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) + info->accel_state->exa->pixmapOffsetAlign = RADEON_BUFFER_ALIGN + 1; info->accel_state->exa->pixmapPitchAlign = 64; -+ info->accel_state->exa->pixmapOffsetAlign = RADEON_BUFFER_ALIGN + 1; -+ + + if (info->drm_mm) { + info->accel_state->exa->flags |= EXA_HANDLES_PIXMAPS; + } else { + } - ++ #ifdef RENDER if (info->RenderAccel) { -@@ -488,7 +848,7 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) + if (info->ChipFamily >= CHIP_FAMILY_R600) +@@ -493,7 +853,7 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) else if (IS_R300_3D || IS_R500_3D) { if ((info->ChipFamily < CHIP_FAMILY_RS400) #ifdef XF86DRI @@ -6733,7 +6739,7 @@ #endif ) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Render acceleration " -@@ -523,6 +883,16 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) +@@ -528,6 +888,16 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) } #endif @@ -7779,10 +7785,10 @@ +} + diff --git a/src/radeon_probe.h b/src/radeon_probe.h -index 49044e3..9a01a24 100644 +index f072b9c..6d31e39 100644 --- a/src/radeon_probe.h +++ b/src/radeon_probe.h -@@ -142,6 +142,27 @@ typedef struct +@@ -145,6 +145,27 @@ typedef struct Bool hw_capable; } RADEONI2CBusRec, *RADEONI2CBusPtr; @@ -7810,7 +7816,7 @@ typedef struct _RADEONCrtcPrivateRec { void *crtc_rotate_mem; void *cursor_mem; -@@ -155,6 +176,8 @@ typedef struct _RADEONCrtcPrivateRec { +@@ -158,6 +179,8 @@ typedef struct _RADEONCrtcPrivateRec { int can_tile; Bool enabled; Bool initialized; Index: xorg-x11-drv-ati.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- xorg-x11-drv-ati.spec 27 Feb 2009 03:57:32 -0000 1.150 +++ xorg-x11-drv-ati.spec 2 Mar 2009 23:42:19 -0000 1.151 @@ -5,7 +5,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.11.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -76,6 +76,10 @@ %{_mandir}/man4/radeon.4* %changelog +* Tue Mar 03 2009 Dave Airlie 6.11.0-2 +- rebase to latest upstream r600 accel +- fixup VT switch on DRI2 + * Fri Feb 27 2009 Dave Airlie 6.11.0-1 - rebase to latest upstream - enable R600 acceleration for EXA and Xv. From pkgdb at fedoraproject.org Mon Mar 2 23:42:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 23:42:37 +0000 Subject: [pkgdb] thunar-shares had acl change status Message-ID: <20090302234258.C026D208480@bastion.fedora.phx.redhat.com> cwickert has set the watchbugzilla acl on thunar-shares (Fedora devel) to Obsolete for kevin To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/thunar-shares From pkgdb at fedoraproject.org Mon Mar 2 23:43:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Mar 2009 23:43:02 +0000 Subject: [pkgdb] thunar-shares ownership updated Message-ID: <20090302234302.287F52084D2@bastion.fedora.phx.redhat.com> Package thunar-shares in Fedora devel was orphaned by cwickert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/thunar-shares From apevec at fedoraproject.org Mon Mar 2 23:43:33 2009 From: apevec at fedoraproject.org (Alan Pevec) Date: Mon, 2 Mar 2009 23:43:33 +0000 (UTC) Subject: rpms/collectd/devel .cvsignore, 1.6, 1.7 collectd.spec, 1.15, 1.16 sources, 1.6, 1.7 Message-ID: <20090302234333.357F570116@cvs1.fedora.phx.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/collectd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6120 Modified Files: .cvsignore collectd.spec sources Log Message: * Mon Mar 02 2009 Alan Pevec 4.5.3-1 - New upstream version 4.5.3 - fixes collectd is built without iptables plugin, bz# 479208 - list all expected plugins explicitly to avoid such bugs Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Nov 2008 10:06:55 -0000 1.6 +++ .cvsignore 2 Mar 2009 23:43:02 -0000 1.7 @@ -1 +1 @@ -collectd-4.5.1.tar.bz2 +collectd-4.5.3.tar.bz2 Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- collectd.spec 24 Feb 2009 08:20:06 -0000 1.15 +++ collectd.spec 2 Mar 2009 23:43:02 -0000 1.16 @@ -1,15 +1,16 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd -Version: 4.5.1 -Release: 4%{?dist} +Version: 4.5.3 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ Source: http://collectd.org/files/%{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-include-collectd.d.patch +Patch0: %{name}-4.5.1-include-collectd.d.patch # bug 468067 "pkg-config --libs OpenIPMIpthread" fails -Patch1: %{name}-%{version}-configure-OpenIPMI.patch +Patch1: %{name}-4.5.1-configure-OpenIPMI.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libvirt-devel, libxml2-devel @@ -156,7 +157,6 @@ %build %configure \ - --without-libiptc \ --disable-ascent \ --disable-static \ --enable-mysql \ @@ -168,6 +168,7 @@ --enable-ipmi \ --enable-nut \ --enable-postgresql \ + --enable-iptables \ --with-perl-bindings=INSTALLDIRS=vendor %{__make} %{?_smp_mflags} @@ -267,21 +268,47 @@ %dir %{_localstatedir}/lib/collectd/ %dir %{_libdir}/collectd -%{_libdir}/collectd/*.so* +%{_libdir}/collectd/apcups.so +%{_libdir}/collectd/battery.so +%{_libdir}/collectd/cpu.so +%{_libdir}/collectd/cpufreq.so +%{_libdir}/collectd/csv.so +%{_libdir}/collectd/df.so +%{_libdir}/collectd/disk.so +%{_libdir}/collectd/entropy.so +%{_libdir}/collectd/exec.so +%{_libdir}/collectd/filecount.so +%{_libdir}/collectd/hddtemp.so +%{_libdir}/collectd/interface.so +%{_libdir}/collectd/iptables.so +%{_libdir}/collectd/ipvs.so +%{_libdir}/collectd/irq.so +%{_libdir}/collectd/load.so +%{_libdir}/collectd/logfile.so +%{_libdir}/collectd/mbmon.so +%{_libdir}/collectd/memcached.so +%{_libdir}/collectd/memory.so +%{_libdir}/collectd/multimeter.so +%{_libdir}/collectd/network.so +%{_libdir}/collectd/nfs.so +%{_libdir}/collectd/ntpd.so +%{_libdir}/collectd/ping.so +%{_libdir}/collectd/powerdns.so +%{_libdir}/collectd/processes.so +%{_libdir}/collectd/serial.so +%{_libdir}/collectd/swap.so +%{_libdir}/collectd/syslog.so +%{_libdir}/collectd/tail.so +%{_libdir}/collectd/tcpconns.so +%{_libdir}/collectd/teamspeak2.so +%{_libdir}/collectd/thermal.so +%{_libdir}/collectd/unixsock.so +%{_libdir}/collectd/users.so +%{_libdir}/collectd/uuid.so +%{_libdir}/collectd/vmem.so +%{_libdir}/collectd/vserver.so +%{_libdir}/collectd/wireless.so %{_libdir}/collectd/types.db -%exclude %{_libdir}/collectd/apache.so* -%exclude %{_libdir}/collectd/dns.so* -%exclude %{_libdir}/collectd/email.so* -%exclude %{_libdir}/collectd/ipmi.so* -%exclude %{_libdir}/collectd/libvirt.so* -%exclude %{_libdir}/collectd/nut.so* -%exclude %{_libdir}/collectd/mysql.so* -%exclude %{_libdir}/collectd/nginx.so* -%exclude %{_libdir}/collectd/perl.so* -%exclude %{_libdir}/collectd/postgresql.so* -%exclude %{_libdir}/collectd/rrdtool.so* -%exclude %{_libdir}/collectd/sensors.so* -%exclude %{_libdir}/collectd/snmp.so* %doc AUTHORS ChangeLog COPYING INSTALL README %doc %{_mandir}/man1/collectd.1* @@ -295,51 +322,51 @@ %files apache %defattr(-, root, root, -) -%{_libdir}/collectd/apache.so* +%{_libdir}/collectd/apache.so %config(noreplace) %{_sysconfdir}/collectd.d/apache.conf %files dns %defattr(-, root, root, -) -%{_libdir}/collectd/dns.so* +%{_libdir}/collectd/dns.so %config(noreplace) %{_sysconfdir}/collectd.d/dns.conf %files email %defattr(-, root, root, -) -%{_libdir}/collectd/email.so* +%{_libdir}/collectd/email.so %config(noreplace) %{_sysconfdir}/collectd.d/email.conf %doc %{_mandir}/man5/collectd-email.5* %files ipmi %defattr(-, root, root, -) -%{_libdir}/collectd/ipmi.so* +%{_libdir}/collectd/ipmi.so %config(noreplace) %{_sysconfdir}/collectd.d/ipmi.conf %files mysql %defattr(-, root, root, -) -%{_libdir}/collectd/mysql.so* +%{_libdir}/collectd/mysql.so %config(noreplace) %{_sysconfdir}/collectd.d/mysql.conf %files nginx %defattr(-, root, root, -) -%{_libdir}/collectd/nginx.so* +%{_libdir}/collectd/nginx.so %config(noreplace) %{_sysconfdir}/collectd.d/nginx.conf %files nut %defattr(-, root, root, -) -%{_libdir}/collectd/nut.so* +%{_libdir}/collectd/nut.so %config(noreplace) %{_sysconfdir}/collectd.d/nut.conf %files -n perl-Collectd %defattr(-, root, root, -) %doc perl-examples/* -%{_libdir}/collectd/perl.so* +%{_libdir}/collectd/perl.so %{perl_vendorlib}/Collectd.pm %{perl_vendorlib}/Collectd/ %config(noreplace) %{_sysconfdir}/collectd.d/perl.conf @@ -349,37 +376,42 @@ %files postgresql %defattr(-, root, root, -) -%{_libdir}/collectd/postgresql.so* +%{_libdir}/collectd/postgresql.so %config(noreplace) %{_sysconfdir}/collectd.d/postgresql.conf %doc src/postgresql_default.conf %files rrdtool %defattr(-, root, root, -) -%{_libdir}/collectd/rrdtool.so* +%{_libdir}/collectd/rrdtool.so %config(noreplace) %{_sysconfdir}/collectd.d/rrdtool.conf %files sensors %defattr(-, root, root, -) -%{_libdir}/collectd/sensors.so* +%{_libdir}/collectd/sensors.so %config(noreplace) %{_sysconfdir}/collectd.d/sensors.conf %files snmp %defattr(-, root, root, -) -%{_libdir}/collectd/snmp.so* +%{_libdir}/collectd/snmp.so %config(noreplace) %{_sysconfdir}/collectd.d/snmp.conf %doc %{_mandir}/man5/collectd-snmp.5* %files virt %defattr(-, root, root, -) -%{_libdir}/collectd/libvirt.so* +%{_libdir}/collectd/libvirt.so %config(noreplace) %{_sysconfdir}/collectd.d/libvirt.conf %changelog +* Mon Mar 02 2009 Alan Pevec 4.5.3-1 +- New upstream version 4.5.3 +- fixes collectd is built without iptables plugin, bz# 479208 +- list all expected plugins explicitly to avoid such bugs + * Tue Feb 24 2009 Fedora Release Engineering - 4.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Nov 2008 10:06:55 -0000 1.6 +++ sources 2 Mar 2009 23:43:02 -0000 1.7 @@ -1 +1 @@ -d85e00de03d40ca66d5eb4775e58fc1f collectd-4.5.1.tar.bz2 +f368200c4bedd64baba46094906e81ee collectd-4.5.3.tar.bz2 From petersen at fedoraproject.org Mon Mar 2 23:53:07 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 2 Mar 2009 23:53:07 +0000 (UTC) Subject: rpms/ibus/devel ibus.spec,1.50,1.51 Message-ID: <20090302235307.D9C2370116@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ibus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8196 Modified Files: ibus.spec Log Message: convert requires: glib to requires(post) Index: ibus.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- ibus.spec 2 Mar 2009 09:04:14 -0000 1.50 +++ ibus.spec 2 Mar 2009 23:52:37 -0000 1.51 @@ -62,7 +62,7 @@ Summary: IBus im module for gtk2 Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -Requires: glib2 >= %{glib_ver} +Requires(post): glib2 >= %{glib_ver} %description gtk This package contains ibus im module for gtk2 @@ -185,6 +185,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Mar 3 2009 Jens Petersen +- use post for ibus-gtk requires glib2 + * Mon Mar 2 2009 Jens Petersen - 1.1.0.20090225-2 - drop the superfluous ibus-0.1 engine obsoletes - move glib2 requires to gtk package From cwickert at fedoraproject.org Mon Mar 2 23:54:52 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Mar 2009 23:54:52 +0000 (UTC) Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.35,1.36 Message-ID: <20090302235453.0571970116@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-panel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8403 Modified Files: xfce4-panel.spec Log Message: obsolete xfce4-xmms-plugin Index: xfce4-panel.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/xfce4-panel.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- xfce4-panel.spec 2 Mar 2009 23:11:57 -0000 1.35 +++ xfce4-panel.spec 2 Mar 2009 23:54:22 -0000 1.36 @@ -40,6 +40,9 @@ # xfce4-windowlist-plugin isn't in Xfce 4.4 Provides: xfce4-windowlist-plugin = %{version}-%{release} Obsoletes: xfce4-windowlist-plugin <= 0.1.0-7.fc6 +# xfce4-xmms-plugin isn't in F11 +Provides: xfce4-xmms-plugin = 0.5.1-4 +Obsoletes: xfce4-xmms-plugin <= 0.5.1-3.fc11 %description This package includes the panel for the Xfce desktop environment. @@ -126,6 +129,7 @@ - Fix directory ownership problems - Require xfce4-doc - Mark gtk-doc files as %%doc +- Obsolete the xfce4-xmms-plugin * Thu Feb 26 2009 Kevin Fenzi - 4.6.0-1 - Update to 4.6.0 From pkgdb at fedoraproject.org Tue Mar 3 00:14:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:14:34 +0000 Subject: [pkgdb] php-pear-Config was added for bjohnson Message-ID: <20090303001434.A0D182084BA@bastion.fedora.phx.redhat.com> kevin has added Package php-pear-Config with summary Configuration file manipulation for PHP kevin has approved Package php-pear-Config kevin has added a Fedora devel branch for php-pear-Config with an owner of bjohnson kevin has approved php-pear-Config in Fedora devel kevin has approved Package php-pear-Config kevin has set commit to Approved for provenpackager on php-pear-Config (Fedora devel) kevin has set build to Approved for provenpackager on php-pear-Config (Fedora devel) kevin has set checkout to Approved for provenpackager on php-pear-Config (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Config From pkgdb at fedoraproject.org Tue Mar 3 00:14:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:14:37 +0000 Subject: [pkgdb] php-pear-Config (Fedora, 10) updated by kevin Message-ID: <20090303001436.8A5E2208519@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for php-pear-Config kevin has set commit to Approved for provenpackager on php-pear-Config (Fedora 10) kevin has set build to Approved for provenpackager on php-pear-Config (Fedora 10) kevin has set checkout to Approved for provenpackager on php-pear-Config (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Config From kevin at fedoraproject.org Tue Mar 3 00:14:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:14:55 +0000 (UTC) Subject: rpms/php-pear-Config - New directory Message-ID: <20090303001455.4987E70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/php-pear-Config In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU11945/rpms/php-pear-Config Log Message: Directory /cvs/pkgs/rpms/php-pear-Config added to the repository From kevin at fedoraproject.org Tue Mar 3 00:14:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:14:55 +0000 (UTC) Subject: rpms/php-pear-Config/devel - New directory Message-ID: <20090303001455.9B39670117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/php-pear-Config/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU11945/rpms/php-pear-Config/devel Log Message: Directory /cvs/pkgs/rpms/php-pear-Config/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 00:15:24 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:15:24 +0000 (UTC) Subject: rpms/php-pear-Config/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303001524.2B26A70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/php-pear-Config/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU11945/rpms/php-pear-Config/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-pear-Config --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: php-pear-Config # $Id: Makefile,v 1.1 2009/03/03 00:15:23 kevin Exp $ NAME := php-pear-Config SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Tue Mar 3 00:15:23 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:15:23 +0000 (UTC) Subject: rpms/php-pear-Config Makefile,NONE,1.1 Message-ID: <20090303001523.B465670116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/php-pear-Config In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU11945/rpms/php-pear-Config Added Files: Makefile Log Message: Setup of module php-pear-Config --- NEW FILE Makefile --- # Top level Makefile for module php-pear-Config all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From pkgdb at fedoraproject.org Tue Mar 3 00:16:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:16:40 +0000 Subject: [pkgdb] couchdb was added for allisson Message-ID: <20090303001640.2C98A2084BA@bastion.fedora.phx.redhat.com> kevin has added Package couchdb with summary document database server, accessible via a RESTful JSON API kevin has approved Package couchdb kevin has added a Fedora devel branch for couchdb with an owner of allisson kevin has approved couchdb in Fedora devel kevin has approved Package couchdb kevin has set commit to Approved for provenpackager on couchdb (Fedora devel) kevin has set build to Approved for provenpackager on couchdb (Fedora devel) kevin has set checkout to Approved for provenpackager on couchdb (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/couchdb From pkgdb at fedoraproject.org Tue Mar 3 00:16:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:16:09 +0000 Subject: [pkgdb] couchdb (Fedora, 9) updated by kevin Message-ID: <20090303001641.AF2D92084D2@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for couchdb kevin has set commit to Approved for provenpackager on couchdb (Fedora 9) kevin has set build to Approved for provenpackager on couchdb (Fedora 9) kevin has set checkout to Approved for provenpackager on couchdb (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/couchdb From kevin at fedoraproject.org Tue Mar 3 00:16:30 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:16:30 +0000 (UTC) Subject: rpms/couchdb - New directory Message-ID: <20090303001630.2FC1870116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/couchdb In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT12356/rpms/couchdb Log Message: Directory /cvs/pkgs/rpms/couchdb added to the repository From pkgdb at fedoraproject.org Tue Mar 3 00:16:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:16:09 +0000 Subject: [pkgdb] couchdb (Fedora, 10) updated by kevin Message-ID: <20090303001641.BBB8720851B@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for couchdb kevin has set commit to Approved for provenpackager on couchdb (Fedora 10) kevin has set build to Approved for provenpackager on couchdb (Fedora 10) kevin has set checkout to Approved for provenpackager on couchdb (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/couchdb From kevin at fedoraproject.org Tue Mar 3 00:16:30 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:16:30 +0000 (UTC) Subject: rpms/couchdb/devel - New directory Message-ID: <20090303001630.9B9A170117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/couchdb/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT12356/rpms/couchdb/devel Log Message: Directory /cvs/pkgs/rpms/couchdb/devel added to the repository From glommer at fedoraproject.org Tue Mar 3 00:16:30 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 3 Mar 2009 00:16:30 +0000 (UTC) Subject: rpms/qemu/devel qemu.spec,1.47,1.48 Message-ID: <20090303001630.7F4F270116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12155 Modified Files: qemu.spec Log Message: use pxe roms from etherboot package. Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- qemu.spec 2 Mar 2009 20:23:54 -0000 1.47 +++ qemu.spec 3 Mar 2009 00:16:00 -0000 1.48 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 1.0 -Release: 0.1.svn6666%{?dist} +Release: 0.2.svn6666%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://www.qemu.org/ @@ -76,6 +76,7 @@ %qemudesc user {user mode emulation of qemu targets} %qemupkg system-x86 {system emulator for x86} +Requires: etherboot-zroms-kvm %qemudesc system-x86 {system emulator for x86} %qemupkgdesc system-ppc {system emulator for ppc} @@ -129,6 +130,21 @@ install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu install -D -p -m 0644 -t ${RPM_BUILD_ROOT}/%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE +rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/pxe*bin + +# the pxe etherboot images will be symlinks to the images on +# /usr/share/etherboot, as QEMU doesn't know how to look +# for other paths, yet. +pxe_link() { + ln -s ../etherboot/$2.zrom %{buildroot}/usr/share/qemu/pxe-$1.bin +} + +pxe_link e1000 e1000-82542 +pxe_link ne2k_pci ne +pxe_link pcnet pcnet32 +pxe_link rtl8139 rtl8139 +pxe_link virtio virtio-net + %clean rm -rf $RPM_BUILD_ROOT @@ -227,6 +243,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Mon Mar 02 2009 Glauber Costa - 1.0-0.2.svn6666 +- use pxe roms from etherboot package. + * Mon Mar 02 2009 Glauber Costa - 1.0-0.1.svn6666 - Updated to tip svn (release 6666). Featuring split packages for qemu. Unfortunately, still using binary blobs for the bioses. From kevin at fedoraproject.org Tue Mar 3 00:16:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:16:55 +0000 (UTC) Subject: rpms/couchdb Makefile,NONE,1.1 Message-ID: <20090303001655.EC1BC70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/couchdb In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT12356/rpms/couchdb Added Files: Makefile Log Message: Setup of module couchdb --- NEW FILE Makefile --- # Top level Makefile for module couchdb all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 00:16:56 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:16:56 +0000 (UTC) Subject: rpms/couchdb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303001656.7C17270116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/couchdb/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT12356/rpms/couchdb/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module couchdb --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: couchdb # $Id: Makefile,v 1.1 2009/03/03 00:16:56 kevin Exp $ NAME := couchdb SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 3 00:17:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:17:28 +0000 Subject: [pkgdb] perl-Verilog-Readmem was added for chitlesh Message-ID: <20090303001749.922022084D1@bastion.fedora.phx.redhat.com> kevin has added Package perl-Verilog-Readmem with summary Parse Verilog $readmemh or $readmemb kevin has approved Package perl-Verilog-Readmem kevin has added a Fedora devel branch for perl-Verilog-Readmem with an owner of chitlesh kevin has approved perl-Verilog-Readmem in Fedora devel kevin has approved Package perl-Verilog-Readmem kevin has set commit to Approved for provenpackager on perl-Verilog-Readmem (Fedora devel) kevin has set build to Approved for provenpackager on perl-Verilog-Readmem (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Verilog-Readmem (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Verilog-Readmem From pkgdb at fedoraproject.org Tue Mar 3 00:17:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:17:31 +0000 Subject: [pkgdb] perl-Verilog-Readmem (Fedora, 9) updated by kevin Message-ID: <20090303001752.846C32084D0@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-Verilog-Readmem kevin has set commit to Approved for provenpackager on perl-Verilog-Readmem (Fedora 9) kevin has set build to Approved for provenpackager on perl-Verilog-Readmem (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-Verilog-Readmem (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Verilog-Readmem From pkgdb at fedoraproject.org Tue Mar 3 00:17:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:17:31 +0000 Subject: [pkgdb] perl-Verilog-Readmem (Fedora, 10) updated by kevin Message-ID: <20090303001752.8FE2120851A@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Verilog-Readmem kevin has set commit to Approved for provenpackager on perl-Verilog-Readmem (Fedora 10) kevin has set build to Approved for provenpackager on perl-Verilog-Readmem (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Verilog-Readmem (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Verilog-Readmem From pkgdb at fedoraproject.org Tue Mar 3 00:17:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:17:31 +0000 Subject: [pkgdb] perl-Verilog-Readmem (Fedora EPEL, 5) updated by kevin Message-ID: <20090303001752.A24CF20851E@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for perl-Verilog-Readmem kevin has set commit to Approved for provenpackager on perl-Verilog-Readmem (Fedora EPEL 5) kevin has set build to Approved for provenpackager on perl-Verilog-Readmem (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on perl-Verilog-Readmem (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Verilog-Readmem From lutter at fedoraproject.org Tue Mar 3 00:18:09 2009 From: lutter at fedoraproject.org (David Lutterkort) Date: Tue, 3 Mar 2009 00:18:09 +0000 (UTC) Subject: rpms/augeas/EL-4 .cvsignore, 1.14, 1.15 augeas.spec, 1.15, 1.16 sources, 1.14, 1.15 Message-ID: <20090303001809.35F0D70116@cvs1.fedora.phx.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12457/EL-4 Modified Files: .cvsignore augeas.spec sources Log Message: Version 0.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/EL-4/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 7 Feb 2009 06:14:45 -0000 1.14 +++ .cvsignore 3 Mar 2009 00:17:38 -0000 1.15 @@ -1 +1 @@ -augeas-0.4.0.tar.gz +augeas-0.4.1.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/EL-4/augeas.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- augeas.spec 7 Feb 2009 06:14:45 -0000 1.15 +++ augeas.spec 3 Mar 2009 00:17:38 -0000 1.16 @@ -1,5 +1,5 @@ Name: augeas -Version: 0.4.0 +Version: 0.4.1 Release: 1%{?dist} Summary: A library for changing configuration files @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/augeas.pc %changelog +* Fri Feb 27 2009 David Lutterkort - 0.4.1-1 +- New version + * Fri Feb 6 2009 David Lutterkort - 0.4.0-1 - New version @@ -89,38 +92,5 @@ * Tue Dec 23 2008 David Lutterkort - 0.3.5-1 - New version -* Wed Nov 5 2008 David Lutterkort - 0.3.4-1 -- New version - -* Fri Oct 24 2008 David Lutterkort - 0.3.3-1 -- New version - -* Tue Oct 21 2008 David Lutterkort - 0.3.2-1 -- New version - -* Thu Sep 4 2008 David Lutterkort - 0.3.1-1 -- New version - -* Thu Aug 7 2008 David Lutterkort - 0.3.0-1 -- New version - -* Fri Jul 18 2008 David Lutterkort - 0.2.2-1 -- New version - -* Tue Jul 1 2008 David Lutterkort - 0.2.1-1 -- New version - -* Thu Jun 5 2008 David Lutterkort - 0.2.0-1 -- New version - -* Fri May 16 2008 David Lutterkort - 0.1.1-1 -- New version - -* Fri May 2 2008 David Lutterkort - 0.1.0-2 -- Fixes according to Fedora review - -* Thu May 1 2008 David Lutterkort - 0.1.0-1 -- New version - * Mon Feb 25 2008 David Lutterkort - 0.0.4-1 - Initial specfile Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/EL-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 7 Feb 2009 06:14:45 -0000 1.14 +++ sources 3 Mar 2009 00:17:38 -0000 1.15 @@ -1 +1 @@ -da921c10811341a9365eb5e4717dcd39 augeas-0.4.0.tar.gz +2cf261ed428d51c24171d0bc39f9ee6a augeas-0.4.1.tar.gz From lutter at fedoraproject.org Tue Mar 3 00:18:09 2009 From: lutter at fedoraproject.org (David Lutterkort) Date: Tue, 3 Mar 2009 00:18:09 +0000 (UTC) Subject: rpms/augeas/F-10 .cvsignore, 1.14, 1.15 augeas.spec, 1.13, 1.14 sources, 1.14, 1.15 Message-ID: <20090303001809.D643670116@cvs1.fedora.phx.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12457/F-10 Modified Files: .cvsignore augeas.spec sources Log Message: Version 0.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-10/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 7 Feb 2009 06:14:45 -0000 1.14 +++ .cvsignore 3 Mar 2009 00:17:39 -0000 1.15 @@ -1 +1 @@ -augeas-0.4.0.tar.gz +augeas-0.4.1.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-10/augeas.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- augeas.spec 7 Feb 2009 06:14:45 -0000 1.13 +++ augeas.spec 3 Mar 2009 00:17:39 -0000 1.14 @@ -1,5 +1,5 @@ Name: augeas -Version: 0.4.0 +Version: 0.4.1 Release: 1%{?dist} Summary: A library for changing configuration files @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/augeas.pc %changelog +* Fri Feb 27 2009 David Lutterkort - 0.4.1-1 +- New version + * Fri Feb 6 2009 David Lutterkort - 0.4.0-1 - New version @@ -89,38 +92,5 @@ * Tue Dec 23 2008 David Lutterkort - 0.3.5-1 - New version -* Wed Nov 5 2008 David Lutterkort - 0.3.4-1 -- New version - -* Fri Oct 24 2008 David Lutterkort - 0.3.3-1 -- New version - -* Tue Oct 21 2008 David Lutterkort - 0.3.2-1 -- New version - -* Thu Sep 4 2008 David Lutterkort - 0.3.1-1 -- New version - -* Thu Aug 7 2008 David Lutterkort - 0.3.0-1 -- New version - -* Fri Jul 18 2008 David Lutterkort - 0.2.2-1 -- New version - -* Tue Jul 1 2008 David Lutterkort - 0.2.1-1 -- New version - -* Thu Jun 5 2008 David Lutterkort - 0.2.0-1 -- New version - -* Fri May 16 2008 David Lutterkort - 0.1.1-1 -- New version - -* Fri May 2 2008 David Lutterkort - 0.1.0-2 -- Fixes according to Fedora review - -* Thu May 1 2008 David Lutterkort - 0.1.0-1 -- New version - * Mon Feb 25 2008 David Lutterkort - 0.0.4-1 - Initial specfile Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-10/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 7 Feb 2009 06:14:45 -0000 1.14 +++ sources 3 Mar 2009 00:17:39 -0000 1.15 @@ -1 +1 @@ -da921c10811341a9365eb5e4717dcd39 augeas-0.4.0.tar.gz +2cf261ed428d51c24171d0bc39f9ee6a augeas-0.4.1.tar.gz From lutter at fedoraproject.org Tue Mar 3 00:18:09 2009 From: lutter at fedoraproject.org (David Lutterkort) Date: Tue, 3 Mar 2009 00:18:09 +0000 (UTC) Subject: rpms/augeas/EL-5 .cvsignore, 1.14, 1.15 augeas.spec, 1.14, 1.15 sources, 1.14, 1.15 Message-ID: <20090303001809.8438870116@cvs1.fedora.phx.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12457/EL-5 Modified Files: .cvsignore augeas.spec sources Log Message: Version 0.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/EL-5/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 7 Feb 2009 06:14:45 -0000 1.14 +++ .cvsignore 3 Mar 2009 00:17:39 -0000 1.15 @@ -1 +1 @@ -augeas-0.4.0.tar.gz +augeas-0.4.1.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/EL-5/augeas.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- augeas.spec 7 Feb 2009 06:14:45 -0000 1.14 +++ augeas.spec 3 Mar 2009 00:17:39 -0000 1.15 @@ -1,5 +1,5 @@ Name: augeas -Version: 0.4.0 +Version: 0.4.1 Release: 1%{?dist} Summary: A library for changing configuration files @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/augeas.pc %changelog +* Fri Feb 27 2009 David Lutterkort - 0.4.1-1 +- New version + * Fri Feb 6 2009 David Lutterkort - 0.4.0-1 - New version @@ -89,38 +92,5 @@ * Tue Dec 23 2008 David Lutterkort - 0.3.5-1 - New version -* Wed Nov 5 2008 David Lutterkort - 0.3.4-1 -- New version - -* Fri Oct 24 2008 David Lutterkort - 0.3.3-1 -- New version - -* Tue Oct 21 2008 David Lutterkort - 0.3.2-1 -- New version - -* Thu Sep 4 2008 David Lutterkort - 0.3.1-1 -- New version - -* Thu Aug 7 2008 David Lutterkort - 0.3.0-1 -- New version - -* Fri Jul 18 2008 David Lutterkort - 0.2.2-1 -- New version - -* Tue Jul 1 2008 David Lutterkort - 0.2.1-1 -- New version - -* Thu Jun 5 2008 David Lutterkort - 0.2.0-1 -- New version - -* Fri May 16 2008 David Lutterkort - 0.1.1-1 -- New version - -* Fri May 2 2008 David Lutterkort - 0.1.0-2 -- Fixes according to Fedora review - -* Thu May 1 2008 David Lutterkort - 0.1.0-1 -- New version - * Mon Feb 25 2008 David Lutterkort - 0.0.4-1 - Initial specfile Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/EL-5/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 7 Feb 2009 06:14:45 -0000 1.14 +++ sources 3 Mar 2009 00:17:39 -0000 1.15 @@ -1 +1 @@ -da921c10811341a9365eb5e4717dcd39 augeas-0.4.0.tar.gz +2cf261ed428d51c24171d0bc39f9ee6a augeas-0.4.1.tar.gz From lutter at fedoraproject.org Tue Mar 3 00:18:10 2009 From: lutter at fedoraproject.org (David Lutterkort) Date: Tue, 3 Mar 2009 00:18:10 +0000 (UTC) Subject: rpms/augeas/F-9 .cvsignore, 1.14, 1.15 augeas.spec, 1.13, 1.14 sources, 1.14, 1.15 Message-ID: <20090303001810.3C6EE70116@cvs1.fedora.phx.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12457/F-9 Modified Files: .cvsignore augeas.spec sources Log Message: Version 0.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-9/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 7 Feb 2009 06:14:45 -0000 1.14 +++ .cvsignore 3 Mar 2009 00:17:39 -0000 1.15 @@ -1 +1 @@ -augeas-0.4.0.tar.gz +augeas-0.4.1.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-9/augeas.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- augeas.spec 7 Feb 2009 06:14:45 -0000 1.13 +++ augeas.spec 3 Mar 2009 00:17:39 -0000 1.14 @@ -1,5 +1,5 @@ Name: augeas -Version: 0.4.0 +Version: 0.4.1 Release: 1%{?dist} Summary: A library for changing configuration files @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/augeas.pc %changelog +* Fri Feb 27 2009 David Lutterkort - 0.4.1-1 +- New version + * Fri Feb 6 2009 David Lutterkort - 0.4.0-1 - New version @@ -89,38 +92,5 @@ * Tue Dec 23 2008 David Lutterkort - 0.3.5-1 - New version -* Wed Nov 5 2008 David Lutterkort - 0.3.4-1 -- New version - -* Fri Oct 24 2008 David Lutterkort - 0.3.3-1 -- New version - -* Tue Oct 21 2008 David Lutterkort - 0.3.2-1 -- New version - -* Thu Sep 4 2008 David Lutterkort - 0.3.1-1 -- New version - -* Thu Aug 7 2008 David Lutterkort - 0.3.0-1 -- New version - -* Fri Jul 18 2008 David Lutterkort - 0.2.2-1 -- New version - -* Tue Jul 1 2008 David Lutterkort - 0.2.1-1 -- New version - -* Thu Jun 5 2008 David Lutterkort - 0.2.0-1 -- New version - -* Fri May 16 2008 David Lutterkort - 0.1.1-1 -- New version - -* Fri May 2 2008 David Lutterkort - 0.1.0-2 -- Fixes according to Fedora review - -* Thu May 1 2008 David Lutterkort - 0.1.0-1 -- New version - * Mon Feb 25 2008 David Lutterkort - 0.0.4-1 - Initial specfile Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-9/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 7 Feb 2009 06:14:45 -0000 1.14 +++ sources 3 Mar 2009 00:17:39 -0000 1.15 @@ -1 +1 @@ -da921c10811341a9365eb5e4717dcd39 augeas-0.4.0.tar.gz +2cf261ed428d51c24171d0bc39f9ee6a augeas-0.4.1.tar.gz From lutter at fedoraproject.org Tue Mar 3 00:18:10 2009 From: lutter at fedoraproject.org (David Lutterkort) Date: Tue, 3 Mar 2009 00:18:10 +0000 (UTC) Subject: rpms/augeas/devel .cvsignore, 1.14, 1.15 augeas.spec, 1.14, 1.15 sources, 1.14, 1.15 Message-ID: <20090303001810.AC0E370116@cvs1.fedora.phx.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12457/devel Modified Files: .cvsignore augeas.spec sources Log Message: Version 0.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 7 Feb 2009 06:14:46 -0000 1.14 +++ .cvsignore 3 Mar 2009 00:17:40 -0000 1.15 @@ -1 +1 @@ -augeas-0.4.0.tar.gz +augeas-0.4.1.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/devel/augeas.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- augeas.spec 24 Feb 2009 03:13:06 -0000 1.14 +++ augeas.spec 3 Mar 2009 00:17:40 -0000 1.15 @@ -1,6 +1,6 @@ Name: augeas -Version: 0.4.0 -Release: 2%{?dist} +Version: 0.4.1 +Release: 1%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries @@ -80,8 +80,8 @@ %{_libdir}/pkgconfig/augeas.pc %changelog -* Mon Feb 23 2009 Fedora Release Engineering - 0.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Fri Feb 27 2009 David Lutterkort - 0.4.1-1 +- New version * Fri Feb 6 2009 David Lutterkort - 0.4.0-1 - New version @@ -92,38 +92,5 @@ * Tue Dec 23 2008 David Lutterkort - 0.3.5-1 - New version -* Wed Nov 5 2008 David Lutterkort - 0.3.4-1 -- New version - -* Fri Oct 24 2008 David Lutterkort - 0.3.3-1 -- New version - -* Tue Oct 21 2008 David Lutterkort - 0.3.2-1 -- New version - -* Thu Sep 4 2008 David Lutterkort - 0.3.1-1 -- New version - -* Thu Aug 7 2008 David Lutterkort - 0.3.0-1 -- New version - -* Fri Jul 18 2008 David Lutterkort - 0.2.2-1 -- New version - -* Tue Jul 1 2008 David Lutterkort - 0.2.1-1 -- New version - -* Thu Jun 5 2008 David Lutterkort - 0.2.0-1 -- New version - -* Fri May 16 2008 David Lutterkort - 0.1.1-1 -- New version - -* Fri May 2 2008 David Lutterkort - 0.1.0-2 -- Fixes according to Fedora review - -* Thu May 1 2008 David Lutterkort - 0.1.0-1 -- New version - * Mon Feb 25 2008 David Lutterkort - 0.0.4-1 - Initial specfile Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 7 Feb 2009 06:14:46 -0000 1.14 +++ sources 3 Mar 2009 00:17:40 -0000 1.15 @@ -1 +1 @@ -da921c10811341a9365eb5e4717dcd39 augeas-0.4.0.tar.gz +2cf261ed428d51c24171d0bc39f9ee6a augeas-0.4.1.tar.gz From kevin at fedoraproject.org Tue Mar 3 00:21:12 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:21:12 +0000 (UTC) Subject: rpms/perl-Verilog-Readmem - New directory Message-ID: <20090303002112.4093070116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Verilog-Readmem In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ13308/rpms/perl-Verilog-Readmem Log Message: Directory /cvs/pkgs/rpms/perl-Verilog-Readmem added to the repository From kevin at fedoraproject.org Tue Mar 3 00:21:12 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:21:12 +0000 (UTC) Subject: rpms/perl-Verilog-Readmem/devel - New directory Message-ID: <20090303002112.9CCAE70117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Verilog-Readmem/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ13308/rpms/perl-Verilog-Readmem/devel Log Message: Directory /cvs/pkgs/rpms/perl-Verilog-Readmem/devel added to the repository From pkgdb at fedoraproject.org Tue Mar 3 00:21:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:21:45 +0000 Subject: [pkgdb] iscan-firmware (Fedora, 9) updated by kevin Message-ID: <20090303002217.305342084D1@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for iscan-firmware kevin has set commit to Approved for provenpackager on iscan-firmware (Fedora 9) kevin has set build to Approved for provenpackager on iscan-firmware (Fedora 9) kevin has set checkout to Approved for provenpackager on iscan-firmware (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/iscan-firmware From pkgdb at fedoraproject.org Tue Mar 3 00:21:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:21:43 +0000 Subject: [pkgdb] iscan-firmware was added for rathann Message-ID: <20090303002215.65C69208485@bastion.fedora.phx.redhat.com> kevin has added Package iscan-firmware with summary Firmware for Epson flatbed scanners kevin has approved Package iscan-firmware kevin has added a Fedora devel branch for iscan-firmware with an owner of rathann kevin has approved iscan-firmware in Fedora devel kevin has approved Package iscan-firmware kevin has set commit to Approved for provenpackager on iscan-firmware (Fedora devel) kevin has set build to Approved for provenpackager on iscan-firmware (Fedora devel) kevin has set checkout to Approved for provenpackager on iscan-firmware (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/iscan-firmware From pkgdb at fedoraproject.org Tue Mar 3 00:21:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:21:45 +0000 Subject: [pkgdb] iscan-firmware (Fedora, 10) updated by kevin Message-ID: <20090303002217.43A5620851A@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for iscan-firmware kevin has set commit to Approved for provenpackager on iscan-firmware (Fedora 10) kevin has set build to Approved for provenpackager on iscan-firmware (Fedora 10) kevin has set checkout to Approved for provenpackager on iscan-firmware (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/iscan-firmware From kevin at fedoraproject.org Tue Mar 3 00:21:53 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:21:53 +0000 (UTC) Subject: rpms/perl-Verilog-Readmem/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303002153.2A65370116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Verilog-Readmem/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ13308/rpms/perl-Verilog-Readmem/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Verilog-Readmem --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Verilog-Readmem # $Id: Makefile,v 1.1 2009/03/03 00:21:52 kevin Exp $ NAME := perl-Verilog-Readmem SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Tue Mar 3 00:21:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:21:52 +0000 (UTC) Subject: rpms/perl-Verilog-Readmem Makefile,NONE,1.1 Message-ID: <20090303002152.ADAE570116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Verilog-Readmem In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ13308/rpms/perl-Verilog-Readmem Added Files: Makefile Log Message: Setup of module perl-Verilog-Readmem --- NEW FILE Makefile --- # Top level Makefile for module perl-Verilog-Readmem all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 00:22:54 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:22:54 +0000 (UTC) Subject: rpms/iscan-firmware - New directory Message-ID: <20090303002254.4718770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/iscan-firmware In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL13844/rpms/iscan-firmware Log Message: Directory /cvs/pkgs/rpms/iscan-firmware added to the repository From kevin at fedoraproject.org Tue Mar 3 00:22:54 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:22:54 +0000 (UTC) Subject: rpms/iscan-firmware/devel - New directory Message-ID: <20090303002254.994EB70118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/iscan-firmware/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL13844/rpms/iscan-firmware/devel Log Message: Directory /cvs/pkgs/rpms/iscan-firmware/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 00:23:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:23:29 +0000 (UTC) Subject: rpms/iscan-firmware/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303002329.7435D70118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/iscan-firmware/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL13844/rpms/iscan-firmware/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module iscan-firmware --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: iscan-firmware # $Id: Makefile,v 1.1 2009/03/03 00:23:29 kevin Exp $ NAME := iscan-firmware SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Tue Mar 3 00:23:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:23:29 +0000 (UTC) Subject: rpms/iscan-firmware Makefile,NONE,1.1 Message-ID: <20090303002329.09AE870116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/iscan-firmware In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL13844/rpms/iscan-firmware Added Files: Makefile Log Message: Setup of module iscan-firmware --- NEW FILE Makefile --- # Top level Makefile for module iscan-firmware all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From pkgdb at fedoraproject.org Tue Mar 3 00:24:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:24:12 +0000 Subject: [pkgdb] vgabios was added for glommer Message-ID: <20090303002412.329DD208201@bastion.fedora.phx.redhat.com> kevin has added Package vgabios with summary an LPGL implementation of a bios for a video card kevin has approved Package vgabios kevin has added a Fedora devel branch for vgabios with an owner of glommer kevin has approved vgabios in Fedora devel kevin has approved Package vgabios kevin has set commit to Approved for provenpackager on vgabios (Fedora devel) kevin has set build to Approved for provenpackager on vgabios (Fedora devel) kevin has set checkout to Approved for provenpackager on vgabios (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vgabios From allisson at fedoraproject.org Tue Mar 3 00:26:02 2009 From: allisson at fedoraproject.org (Allisson Azevedo) Date: Tue, 3 Mar 2009 00:26:02 +0000 (UTC) Subject: rpms/couchdb/devel couchdb.init, NONE, 1.1 couchdb.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303002602.1FE1770116@cvs1.fedora.phx.redhat.com> Author: allisson Update of /cvs/pkgs/rpms/couchdb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14459/devel Modified Files: .cvsignore sources Added Files: couchdb.init couchdb.spec import.log Log Message: First import --- NEW FILE couchdb.init --- #!/bin/sh # # couchdb This is the init script for starting up the CouchDB server # # chkconfig: - 20 80 # description: Starts and stops the CouchDB daemon that handles \ # all database requests. ### BEGIN INIT INFO # Provides: couchdb # Required-Start: $local_fs $network # Required-Stop: $local_fs $network # Should-Start: $remote_fs # Should-Stop: $remote_fs # Default-Start: # Default-Stop: 0 1 2 3 4 5 6 # Short-Description: start and stop CouchDB database server # Description: Apache CouchDB is a distributed, fault-tolerant and # schema-free document-oriented database accessible # via a RESTful HTTP/JSON API ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions exec="/usr/bin/couchdb" prog="couchdb" config="/etc/sysconfig/couchdb" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog lockfile=/var/lock/subsys/couchdb start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " daemon --user couchdb "$exec -b -c $COUCHDB_INI_FILE -p $COUCHDB_PID_FILE \ -o $COUCHDB_STDOUT_FILE -e $COUCHDB_STDERR_FILE \ -r $COUCHDB_RESPAWN_TIMEOUT" retval=$? echo [ $retval -eq 0 ] && touch $lockfile return $retval } stop() { echo -n $"Stopping $prog: " # stop it here, often "killproc $prog" daemon --user couchdb "$exec -d -p $COUCHDB_PID_FILE" retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile return $retval } restart() { stop start } reload() { restart } force_reload() { restart } rh_status() { # run checks to determine if the service is running or use generic status status $prog } rh_status_q() { rh_status >/dev/null 2>&1 } case "$1" in start) rh_status_q && exit 0 $1 ;; stop) rh_status_q || exit 0 $1 ;; restart) $1 ;; reload) rh_status_q || exit 7 $1 ;; force-reload) force_reload ;; status) rh_status ;; condrestart|try-restart) rh_status_q || exit 0 restart ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" exit 2 esac exit $? --- NEW FILE couchdb.spec --- %define tarname apache-couchdb %define couchdb_user couchdb %define couchdb_group couchdb %define couchdb_home %{_localstatedir}/lib/couchdb Name: couchdb Version: 0.8.1 Release: 4%{?dist} Summary: A document database server, accessible via a RESTful JSON API Group: Applications/Databases License: ASL 2.0 URL: http://incubator.apache.org/couchdb/ Source0: http://www.apache.org/dist/incubator/%{name}/%{version}-incubating/%{tarname}-%{version}-incubating.tar.gz Source1: %{name}.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: erlang BuildRequires: libicu-devel BuildRequires: js-devel BuildRequires: help2man Requires: erlang #Requires: %{_bindir}/icu-config Requires: libicu-devel #Initscripts Requires(post): chkconfig Requires(preun): chkconfig initscripts # Users and groups Requires(pre): shadow-utils %description Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database accessible via a RESTful HTTP/JSON API. Among other features, it provides robust, incremental replication with bi-directional conflict detection and resolution, and is queryable and indexable using a table-oriented view engine with JavaScript acting as the default view definition language. %prep %setup -q -n %{tarname}-%{version}-incubating %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Install couchdb initscript install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name} # Create /var/log/couchdb mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/couchdb # Create /var/run/couchdb mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/couchdb # Create /var/lib/couchdb mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/couchdb # Use /etc/sysconfig instead of /etc/default mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig mv $RPM_BUILD_ROOT%{_sysconfdir}/default/couchdb \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/couchdb rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/default sed -i 's/\/var\/run\/couchdb.pid/\%{_localstatedir}\/run\/couchdb\/couchdb.pid/g' \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/couchdb # Remove unecessary files rm $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/couchdb rm $RPM_BUILD_ROOT%{_libdir}/couchdb/erlang/lib/couch-0.8.1-incubating/priv/lib/couch_erl_driver.la rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/couchdb %clean rm -rf $RPM_BUILD_ROOT %pre getent group %{couchdb_group} >/dev/null || groupadd -r %{couchdb_group} getent passwd %{couchdb_user} >/dev/null || \ useradd -r -g %{couchdb_group} -d %{couchdb_home} -s /bin/bash \ -c "Couchdb Database Server" %{couchdb_user} exit 0 %post /sbin/ldconfig /sbin/chkconfig --add couchdb %postun -p /sbin/ldconfig %preun if [ $1 = 0 ] ; then /sbin/service couchdb stop >/dev/null 2>&1 /sbin/chkconfig --del couchdb fi %files %defattr(-,root,root,-) %doc AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS %dir %{_sysconfdir}/couchdb %config(noreplace) %{_sysconfdir}/couchdb/couch.ini #%config(noreplace) %{_sysconfdir}/default/couchdb %config(noreplace) %{_sysconfdir}/sysconfig/couchdb %config(noreplace) %{_sysconfdir}/logrotate.d/couchdb %{_initrddir}/couchdb %{_bindir}/* %{_libdir}/couchdb %{_datadir}/couchdb %{_mandir}/man1/* %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/log/couchdb %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/run/couchdb %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb %changelog * Tue Nov 25 2008 Allisson Azevedo 0.8.1-4 - Use /etc/sysconfig for settings. * Tue Nov 25 2008 Allisson Azevedo 0.8.1-3 - Fix couchdb_home. - Added libicu-devel for requires. * Tue Nov 25 2008 Allisson Azevedo 0.8.1-2 - Fix spec issues. * Tue Nov 25 2008 Allisson Azevedo 0.8.1-1 - Initial RPM release --- NEW FILE import.log --- couchdb-0_8_1-4_fc10:HEAD:couchdb-0.8.1-4.fc10.src.rpm:1236039841 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/couchdb/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:16:56 -0000 1.1 +++ .cvsignore 3 Mar 2009 00:25:31 -0000 1.2 @@ -0,0 +1 @@ +apache-couchdb-0.8.1-incubating.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/couchdb/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:16:56 -0000 1.1 +++ sources 3 Mar 2009 00:25:31 -0000 1.2 @@ -0,0 +1 @@ +89e037b370bef33be93f0f317e07615f apache-couchdb-0.8.1-incubating.tar.gz From pkgdb at fedoraproject.org Tue Mar 3 00:30:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:30:15 +0000 Subject: [pkgdb] libyaml was added for jeckersb Message-ID: <20090303003014.CBA1F208480@bastion.fedora.phx.redhat.com> kevin has added Package libyaml with summary LibYAML is a YAML parser and emitter written in C kevin has approved Package libyaml kevin has added a Fedora devel branch for libyaml with an owner of jeckersb kevin has approved libyaml in Fedora devel kevin has approved Package libyaml kevin has set commit to Approved for provenpackager on libyaml (Fedora devel) kevin has set build to Approved for provenpackager on libyaml (Fedora devel) kevin has set checkout to Approved for provenpackager on libyaml (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libyaml From pkgdb at fedoraproject.org Tue Mar 3 00:30:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:30:17 +0000 Subject: [pkgdb] libyaml (Fedora, 9) updated by kevin Message-ID: <20090303003017.25F7D2084BA@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for libyaml kevin has set commit to Approved for provenpackager on libyaml (Fedora 9) kevin has set build to Approved for provenpackager on libyaml (Fedora 9) kevin has set checkout to Approved for provenpackager on libyaml (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libyaml From pkgdb at fedoraproject.org Tue Mar 3 00:30:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:30:17 +0000 Subject: [pkgdb] libyaml (Fedora, 10) updated by kevin Message-ID: <20090303003017.37B3720851F@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for libyaml kevin has set commit to Approved for provenpackager on libyaml (Fedora 10) kevin has set build to Approved for provenpackager on libyaml (Fedora 10) kevin has set checkout to Approved for provenpackager on libyaml (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libyaml From pkgdb at fedoraproject.org Tue Mar 3 00:30:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:30:17 +0000 Subject: [pkgdb] libyaml (Fedora EPEL, 4) updated by kevin Message-ID: <20090303003017.342BD20851B@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for libyaml kevin has set commit to Approved for provenpackager on libyaml (Fedora EPEL 4) kevin has set build to Approved for provenpackager on libyaml (Fedora EPEL 4) kevin has set checkout to Approved for provenpackager on libyaml (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libyaml From pkgdb at fedoraproject.org Tue Mar 3 00:30:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:30:17 +0000 Subject: [pkgdb] libyaml (Fedora EPEL, 5) updated by kevin Message-ID: <20090303003017.3F855208524@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for libyaml kevin has set commit to Approved for provenpackager on libyaml (Fedora EPEL 5) kevin has set build to Approved for provenpackager on libyaml (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on libyaml (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libyaml From kevin at fedoraproject.org Tue Mar 3 00:30:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:30:00 +0000 (UTC) Subject: rpms/vgabios - New directory Message-ID: <20090303003000.4289C70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/vgabios In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF15275/rpms/vgabios Log Message: Directory /cvs/pkgs/rpms/vgabios added to the repository From kevin at fedoraproject.org Tue Mar 3 00:30:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:30:00 +0000 (UTC) Subject: rpms/vgabios/devel - New directory Message-ID: <20090303003000.B848C70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/vgabios/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF15275/rpms/vgabios/devel Log Message: Directory /cvs/pkgs/rpms/vgabios/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 00:30:27 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:30:27 +0000 (UTC) Subject: rpms/vgabios Makefile,NONE,1.1 Message-ID: <20090303003027.A631A70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/vgabios In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF15275/rpms/vgabios Added Files: Makefile Log Message: Setup of module vgabios --- NEW FILE Makefile --- # Top level Makefile for module vgabios all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 00:30:28 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:30:28 +0000 (UTC) Subject: rpms/vgabios/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303003028.110CA70118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/vgabios/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF15275/rpms/vgabios/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module vgabios --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: vgabios # $Id: Makefile,v 1.1 2009/03/03 00:30:27 kevin Exp $ NAME := vgabios SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Tue Mar 3 00:30:54 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:30:54 +0000 (UTC) Subject: rpms/libyaml - New directory Message-ID: <20090303003054.26BFC70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libyaml In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL15509/rpms/libyaml Log Message: Directory /cvs/pkgs/rpms/libyaml added to the repository From kevin at fedoraproject.org Tue Mar 3 00:30:54 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:30:54 +0000 (UTC) Subject: rpms/libyaml/devel - New directory Message-ID: <20090303003054.6724E70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libyaml/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL15509/rpms/libyaml/devel Log Message: Directory /cvs/pkgs/rpms/libyaml/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 00:31:15 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:31:15 +0000 (UTC) Subject: rpms/libyaml Makefile,NONE,1.1 Message-ID: <20090303003115.0E2A770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libyaml In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL15509/rpms/libyaml Added Files: Makefile Log Message: Setup of module libyaml --- NEW FILE Makefile --- # Top level Makefile for module libyaml all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 00:31:15 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:31:15 +0000 (UTC) Subject: rpms/libyaml/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303003115.6483270116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libyaml/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL15509/rpms/libyaml/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libyaml --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libyaml # $Id: Makefile,v 1.1 2009/03/03 00:31:15 kevin Exp $ NAME := libyaml SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From allisson at fedoraproject.org Tue Mar 3 00:31:17 2009 From: allisson at fedoraproject.org (Allisson Azevedo) Date: Tue, 3 Mar 2009 00:31:17 +0000 (UTC) Subject: rpms/couchdb/F-10 couchdb.init, NONE, 1.1 couchdb.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303003117.AA3A770116@cvs1.fedora.phx.redhat.com> Author: allisson Update of /cvs/pkgs/rpms/couchdb/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15442/F-10 Modified Files: .cvsignore sources Added Files: couchdb.init couchdb.spec import.log Log Message: First import --- NEW FILE couchdb.init --- #!/bin/sh # # couchdb This is the init script for starting up the CouchDB server # # chkconfig: - 20 80 # description: Starts and stops the CouchDB daemon that handles \ # all database requests. ### BEGIN INIT INFO # Provides: couchdb # Required-Start: $local_fs $network # Required-Stop: $local_fs $network # Should-Start: $remote_fs # Should-Stop: $remote_fs # Default-Start: # Default-Stop: 0 1 2 3 4 5 6 # Short-Description: start and stop CouchDB database server # Description: Apache CouchDB is a distributed, fault-tolerant and # schema-free document-oriented database accessible # via a RESTful HTTP/JSON API ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions exec="/usr/bin/couchdb" prog="couchdb" config="/etc/sysconfig/couchdb" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog lockfile=/var/lock/subsys/couchdb start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " daemon --user couchdb "$exec -b -c $COUCHDB_INI_FILE -p $COUCHDB_PID_FILE \ -o $COUCHDB_STDOUT_FILE -e $COUCHDB_STDERR_FILE \ -r $COUCHDB_RESPAWN_TIMEOUT" retval=$? echo [ $retval -eq 0 ] && touch $lockfile return $retval } stop() { echo -n $"Stopping $prog: " # stop it here, often "killproc $prog" daemon --user couchdb "$exec -d -p $COUCHDB_PID_FILE" retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile return $retval } restart() { stop start } reload() { restart } force_reload() { restart } rh_status() { # run checks to determine if the service is running or use generic status status $prog } rh_status_q() { rh_status >/dev/null 2>&1 } case "$1" in start) rh_status_q && exit 0 $1 ;; stop) rh_status_q || exit 0 $1 ;; restart) $1 ;; reload) rh_status_q || exit 7 $1 ;; force-reload) force_reload ;; status) rh_status ;; condrestart|try-restart) rh_status_q || exit 0 restart ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" exit 2 esac exit $? --- NEW FILE couchdb.spec --- %define tarname apache-couchdb %define couchdb_user couchdb %define couchdb_group couchdb %define couchdb_home %{_localstatedir}/lib/couchdb Name: couchdb Version: 0.8.1 Release: 4%{?dist} Summary: A document database server, accessible via a RESTful JSON API Group: Applications/Databases License: ASL 2.0 URL: http://incubator.apache.org/couchdb/ Source0: http://www.apache.org/dist/incubator/%{name}/%{version}-incubating/%{tarname}-%{version}-incubating.tar.gz Source1: %{name}.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: erlang BuildRequires: libicu-devel BuildRequires: js-devel BuildRequires: help2man Requires: erlang #Requires: %{_bindir}/icu-config Requires: libicu-devel #Initscripts Requires(post): chkconfig Requires(preun): chkconfig initscripts # Users and groups Requires(pre): shadow-utils %description Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database accessible via a RESTful HTTP/JSON API. Among other features, it provides robust, incremental replication with bi-directional conflict detection and resolution, and is queryable and indexable using a table-oriented view engine with JavaScript acting as the default view definition language. %prep %setup -q -n %{tarname}-%{version}-incubating %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Install couchdb initscript install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name} # Create /var/log/couchdb mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/couchdb # Create /var/run/couchdb mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/couchdb # Create /var/lib/couchdb mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/couchdb # Use /etc/sysconfig instead of /etc/default mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig mv $RPM_BUILD_ROOT%{_sysconfdir}/default/couchdb \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/couchdb rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/default sed -i 's/\/var\/run\/couchdb.pid/\%{_localstatedir}\/run\/couchdb\/couchdb.pid/g' \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/couchdb # Remove unecessary files rm $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/couchdb rm $RPM_BUILD_ROOT%{_libdir}/couchdb/erlang/lib/couch-0.8.1-incubating/priv/lib/couch_erl_driver.la rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/couchdb %clean rm -rf $RPM_BUILD_ROOT %pre getent group %{couchdb_group} >/dev/null || groupadd -r %{couchdb_group} getent passwd %{couchdb_user} >/dev/null || \ useradd -r -g %{couchdb_group} -d %{couchdb_home} -s /bin/bash \ -c "Couchdb Database Server" %{couchdb_user} exit 0 %post /sbin/ldconfig /sbin/chkconfig --add couchdb %postun -p /sbin/ldconfig %preun if [ $1 = 0 ] ; then /sbin/service couchdb stop >/dev/null 2>&1 /sbin/chkconfig --del couchdb fi %files %defattr(-,root,root,-) %doc AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS %dir %{_sysconfdir}/couchdb %config(noreplace) %{_sysconfdir}/couchdb/couch.ini #%config(noreplace) %{_sysconfdir}/default/couchdb %config(noreplace) %{_sysconfdir}/sysconfig/couchdb %config(noreplace) %{_sysconfdir}/logrotate.d/couchdb %{_initrddir}/couchdb %{_bindir}/* %{_libdir}/couchdb %{_datadir}/couchdb %{_mandir}/man1/* %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/log/couchdb %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/run/couchdb %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb %changelog * Tue Nov 25 2008 Allisson Azevedo 0.8.1-4 - Use /etc/sysconfig for settings. * Tue Nov 25 2008 Allisson Azevedo 0.8.1-3 - Fix couchdb_home. - Added libicu-devel for requires. * Tue Nov 25 2008 Allisson Azevedo 0.8.1-2 - Fix spec issues. * Tue Nov 25 2008 Allisson Azevedo 0.8.1-1 - Initial RPM release --- NEW FILE import.log --- couchdb-0_8_1-4_fc10:F-10:couchdb-0.8.1-4.fc10.src.rpm:1236040037 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/couchdb/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:16:56 -0000 1.1 +++ .cvsignore 3 Mar 2009 00:30:47 -0000 1.2 @@ -0,0 +1 @@ +apache-couchdb-0.8.1-incubating.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/couchdb/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:16:56 -0000 1.1 +++ sources 3 Mar 2009 00:30:47 -0000 1.2 @@ -0,0 +1 @@ +89e037b370bef33be93f0f317e07615f apache-couchdb-0.8.1-incubating.tar.gz From pkgdb at fedoraproject.org Tue Mar 3 00:33:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:33:37 +0000 Subject: [pkgdb] rtaudio was added for oget Message-ID: <20090303003336.C6B2320820B@bastion.fedora.phx.redhat.com> kevin has added Package rtaudio with summary Real-time Audio I/O Library kevin has approved Package rtaudio kevin has added a Fedora devel branch for rtaudio with an owner of oget kevin has approved rtaudio in Fedora devel kevin has approved Package rtaudio kevin has set commit to Approved for provenpackager on rtaudio (Fedora devel) kevin has set build to Approved for provenpackager on rtaudio (Fedora devel) kevin has set checkout to Approved for provenpackager on rtaudio (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rtaudio From pkgdb at fedoraproject.org Tue Mar 3 00:33:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:33:38 +0000 Subject: [pkgdb] rtaudio (Fedora, 10) updated by kevin Message-ID: <20090303003338.5458D2084D1@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for rtaudio kevin has set commit to Approved for provenpackager on rtaudio (Fedora 10) kevin has set build to Approved for provenpackager on rtaudio (Fedora 10) kevin has set checkout to Approved for provenpackager on rtaudio (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rtaudio From kevin at fedoraproject.org Tue Mar 3 00:33:26 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:33:26 +0000 (UTC) Subject: rpms/rtaudio - New directory Message-ID: <20090303003326.3E86B70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rtaudio In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16384/rpms/rtaudio Log Message: Directory /cvs/pkgs/rpms/rtaudio added to the repository From kevin at fedoraproject.org Tue Mar 3 00:33:26 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:33:26 +0000 (UTC) Subject: rpms/rtaudio/devel - New directory Message-ID: <20090303003326.C386670116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rtaudio/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16384/rpms/rtaudio/devel Log Message: Directory /cvs/pkgs/rpms/rtaudio/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 00:33:50 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:33:50 +0000 (UTC) Subject: rpms/rtaudio Makefile,NONE,1.1 Message-ID: <20090303003350.3A9F070116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rtaudio In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16384/rpms/rtaudio Added Files: Makefile Log Message: Setup of module rtaudio --- NEW FILE Makefile --- # Top level Makefile for module rtaudio all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 00:33:50 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:33:50 +0000 (UTC) Subject: rpms/rtaudio/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303003350.9A86E70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rtaudio/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16384/rpms/rtaudio/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rtaudio --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: rtaudio # $Id: Makefile,v 1.1 2009/03/03 00:33:50 kevin Exp $ NAME := rtaudio SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 3 00:34:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:34:56 +0000 Subject: [pkgdb] ghc-haskell-src-exts (Fedora, devel) updated by kevin Message-ID: <20090303003517.EF85F2084D2@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on ghc-haskell-src-exts (Fedora devel) for haskell-sig kevin approved watchcommits on ghc-haskell-src-exts (Fedora devel) for haskell-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ghc-haskell-src-exts From pkgdb at fedoraproject.org Tue Mar 3 00:34:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:34:53 +0000 Subject: [pkgdb] ghc-haskell-src-exts was added for konradm Message-ID: <20090303003515.0D5D92084BA@bastion.fedora.phx.redhat.com> kevin has added Package ghc-haskell-src-exts with summary Library for Manipulating Haskell source kevin has approved Package ghc-haskell-src-exts kevin has added a Fedora devel branch for ghc-haskell-src-exts with an owner of konradm kevin has approved ghc-haskell-src-exts in Fedora devel kevin has approved Package ghc-haskell-src-exts kevin has set commit to Approved for provenpackager on ghc-haskell-src-exts (Fedora devel) kevin has set build to Approved for provenpackager on ghc-haskell-src-exts (Fedora devel) kevin has set checkout to Approved for provenpackager on ghc-haskell-src-exts (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ghc-haskell-src-exts From pkgdb at fedoraproject.org Tue Mar 3 00:34:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:34:56 +0000 Subject: [pkgdb] ghc-haskell-src-exts (Fedora, 10) updated by kevin Message-ID: <20090303003518.06CC120851D@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for ghc-haskell-src-exts kevin has set commit to Approved for provenpackager on ghc-haskell-src-exts (Fedora 10) kevin has set build to Approved for provenpackager on ghc-haskell-src-exts (Fedora 10) kevin has set checkout to Approved for provenpackager on ghc-haskell-src-exts (Fedora 10) kevin approved watchbugzilla on ghc-haskell-src-exts (Fedora 10) for haskell-sig kevin approved watchcommits on ghc-haskell-src-exts (Fedora 10) for haskell-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ghc-haskell-src-exts From allisson at fedoraproject.org Tue Mar 3 00:35:01 2009 From: allisson at fedoraproject.org (Allisson Azevedo) Date: Tue, 3 Mar 2009 00:35:01 +0000 (UTC) Subject: rpms/couchdb/F-9 couchdb.init, NONE, 1.1 couchdb.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303003501.D570D70116@cvs1.fedora.phx.redhat.com> Author: allisson Update of /cvs/pkgs/rpms/couchdb/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16699/F-9 Modified Files: .cvsignore sources Added Files: couchdb.init couchdb.spec import.log Log Message: First import --- NEW FILE couchdb.init --- #!/bin/sh # # couchdb This is the init script for starting up the CouchDB server # # chkconfig: - 20 80 # description: Starts and stops the CouchDB daemon that handles \ # all database requests. ### BEGIN INIT INFO # Provides: couchdb # Required-Start: $local_fs $network # Required-Stop: $local_fs $network # Should-Start: $remote_fs # Should-Stop: $remote_fs # Default-Start: # Default-Stop: 0 1 2 3 4 5 6 # Short-Description: start and stop CouchDB database server # Description: Apache CouchDB is a distributed, fault-tolerant and # schema-free document-oriented database accessible # via a RESTful HTTP/JSON API ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions exec="/usr/bin/couchdb" prog="couchdb" config="/etc/sysconfig/couchdb" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog lockfile=/var/lock/subsys/couchdb start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " daemon --user couchdb "$exec -b -c $COUCHDB_INI_FILE -p $COUCHDB_PID_FILE \ -o $COUCHDB_STDOUT_FILE -e $COUCHDB_STDERR_FILE \ -r $COUCHDB_RESPAWN_TIMEOUT" retval=$? echo [ $retval -eq 0 ] && touch $lockfile return $retval } stop() { echo -n $"Stopping $prog: " # stop it here, often "killproc $prog" daemon --user couchdb "$exec -d -p $COUCHDB_PID_FILE" retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile return $retval } restart() { stop start } reload() { restart } force_reload() { restart } rh_status() { # run checks to determine if the service is running or use generic status status $prog } rh_status_q() { rh_status >/dev/null 2>&1 } case "$1" in start) rh_status_q && exit 0 $1 ;; stop) rh_status_q || exit 0 $1 ;; restart) $1 ;; reload) rh_status_q || exit 7 $1 ;; force-reload) force_reload ;; status) rh_status ;; condrestart|try-restart) rh_status_q || exit 0 restart ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" exit 2 esac exit $? --- NEW FILE couchdb.spec --- %define tarname apache-couchdb %define couchdb_user couchdb %define couchdb_group couchdb %define couchdb_home %{_localstatedir}/lib/couchdb Name: couchdb Version: 0.8.1 Release: 4%{?dist} Summary: A document database server, accessible via a RESTful JSON API Group: Applications/Databases License: ASL 2.0 URL: http://incubator.apache.org/couchdb/ Source0: http://www.apache.org/dist/incubator/%{name}/%{version}-incubating/%{tarname}-%{version}-incubating.tar.gz Source1: %{name}.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: erlang BuildRequires: libicu-devel BuildRequires: js-devel BuildRequires: help2man Requires: erlang #Requires: %{_bindir}/icu-config Requires: libicu-devel #Initscripts Requires(post): chkconfig Requires(preun): chkconfig initscripts # Users and groups Requires(pre): shadow-utils %description Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database accessible via a RESTful HTTP/JSON API. Among other features, it provides robust, incremental replication with bi-directional conflict detection and resolution, and is queryable and indexable using a table-oriented view engine with JavaScript acting as the default view definition language. %prep %setup -q -n %{tarname}-%{version}-incubating %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Install couchdb initscript install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name} # Create /var/log/couchdb mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/couchdb # Create /var/run/couchdb mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/couchdb # Create /var/lib/couchdb mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/couchdb # Use /etc/sysconfig instead of /etc/default mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig mv $RPM_BUILD_ROOT%{_sysconfdir}/default/couchdb \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/couchdb rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/default sed -i 's/\/var\/run\/couchdb.pid/\%{_localstatedir}\/run\/couchdb\/couchdb.pid/g' \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/couchdb # Remove unecessary files rm $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/couchdb rm $RPM_BUILD_ROOT%{_libdir}/couchdb/erlang/lib/couch-0.8.1-incubating/priv/lib/couch_erl_driver.la rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/couchdb %clean rm -rf $RPM_BUILD_ROOT %pre getent group %{couchdb_group} >/dev/null || groupadd -r %{couchdb_group} getent passwd %{couchdb_user} >/dev/null || \ useradd -r -g %{couchdb_group} -d %{couchdb_home} -s /bin/bash \ -c "Couchdb Database Server" %{couchdb_user} exit 0 %post /sbin/ldconfig /sbin/chkconfig --add couchdb %postun -p /sbin/ldconfig %preun if [ $1 = 0 ] ; then /sbin/service couchdb stop >/dev/null 2>&1 /sbin/chkconfig --del couchdb fi %files %defattr(-,root,root,-) %doc AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS %dir %{_sysconfdir}/couchdb %config(noreplace) %{_sysconfdir}/couchdb/couch.ini #%config(noreplace) %{_sysconfdir}/default/couchdb %config(noreplace) %{_sysconfdir}/sysconfig/couchdb %config(noreplace) %{_sysconfdir}/logrotate.d/couchdb %{_initrddir}/couchdb %{_bindir}/* %{_libdir}/couchdb %{_datadir}/couchdb %{_mandir}/man1/* %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/log/couchdb %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/run/couchdb %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb %changelog * Tue Nov 25 2008 Allisson Azevedo 0.8.1-4 - Use /etc/sysconfig for settings. * Tue Nov 25 2008 Allisson Azevedo 0.8.1-3 - Fix couchdb_home. - Added libicu-devel for requires. * Tue Nov 25 2008 Allisson Azevedo 0.8.1-2 - Fix spec issues. * Tue Nov 25 2008 Allisson Azevedo 0.8.1-1 - Initial RPM release --- NEW FILE import.log --- couchdb-0_8_1-4_fc10:F-9:couchdb-0.8.1-4.fc10.src.rpm:1236040363 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/couchdb/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:16:56 -0000 1.1 +++ .cvsignore 3 Mar 2009 00:34:31 -0000 1.2 @@ -0,0 +1 @@ +apache-couchdb-0.8.1-incubating.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/couchdb/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:16:56 -0000 1.1 +++ sources 3 Mar 2009 00:34:31 -0000 1.2 @@ -0,0 +1 @@ +89e037b370bef33be93f0f317e07615f apache-couchdb-0.8.1-incubating.tar.gz From kevin at fedoraproject.org Tue Mar 3 00:35:08 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:35:08 +0000 (UTC) Subject: rpms/ghc-haskell-src-exts - New directory Message-ID: <20090303003508.2D0CC70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ghc-haskell-src-exts In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss16844/rpms/ghc-haskell-src-exts Log Message: Directory /cvs/pkgs/rpms/ghc-haskell-src-exts added to the repository From kevin at fedoraproject.org Tue Mar 3 00:35:08 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:35:08 +0000 (UTC) Subject: rpms/ghc-haskell-src-exts/devel - New directory Message-ID: <20090303003508.825DB70118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ghc-haskell-src-exts/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss16844/rpms/ghc-haskell-src-exts/devel Log Message: Directory /cvs/pkgs/rpms/ghc-haskell-src-exts/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 00:35:31 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:35:31 +0000 (UTC) Subject: rpms/ghc-haskell-src-exts Makefile,NONE,1.1 Message-ID: <20090303003531.9107F70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ghc-haskell-src-exts In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss16844/rpms/ghc-haskell-src-exts Added Files: Makefile Log Message: Setup of module ghc-haskell-src-exts --- NEW FILE Makefile --- # Top level Makefile for module ghc-haskell-src-exts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 00:35:32 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:35:32 +0000 (UTC) Subject: rpms/ghc-haskell-src-exts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303003532.2B6CC70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ghc-haskell-src-exts/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss16844/rpms/ghc-haskell-src-exts/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ghc-haskell-src-exts --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ghc-haskell-src-exts # $Id: Makefile,v 1.1 2009/03/03 00:35:31 kevin Exp $ NAME := ghc-haskell-src-exts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 3 00:36:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:36:35 +0000 Subject: [pkgdb] fedora-setup-keyboard was added for drago01 Message-ID: <20090303003635.2A1A0208480@bastion.fedora.phx.redhat.com> kevin has added Package fedora-setup-keyboard with summary Hal keyboard layout callout kevin has approved Package fedora-setup-keyboard kevin has added a Fedora devel branch for fedora-setup-keyboard with an owner of drago01 kevin has approved fedora-setup-keyboard in Fedora devel kevin has approved Package fedora-setup-keyboard kevin has set commit to Approved for provenpackager on fedora-setup-keyboard (Fedora devel) kevin has set build to Approved for provenpackager on fedora-setup-keyboard (Fedora devel) kevin has set checkout to Approved for provenpackager on fedora-setup-keyboard (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fedora-setup-keyboard From pkgdb at fedoraproject.org Tue Mar 3 00:36:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:36:15 +0000 Subject: [pkgdb] fedora-setup-keyboard (Fedora, devel) updated by kevin Message-ID: <20090303003639.25B582084D2@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on fedora-setup-keyboard (Fedora devel) for whot kevin approved watchcommits on fedora-setup-keyboard (Fedora devel) for whot kevin approved commit on fedora-setup-keyboard (Fedora devel) for whot kevin approved build on fedora-setup-keyboard (Fedora devel) for whot kevin approved approveacls on fedora-setup-keyboard (Fedora devel) for whot To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fedora-setup-keyboard From pkgdb at fedoraproject.org Tue Mar 3 00:36:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:36:15 +0000 Subject: [pkgdb] fedora-setup-keyboard (Fedora, 10) updated by kevin Message-ID: <20090303003639.48ABB20851E@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for fedora-setup-keyboard kevin has set commit to Approved for provenpackager on fedora-setup-keyboard (Fedora 10) kevin has set build to Approved for provenpackager on fedora-setup-keyboard (Fedora 10) kevin has set checkout to Approved for provenpackager on fedora-setup-keyboard (Fedora 10) kevin approved watchbugzilla on fedora-setup-keyboard (Fedora 10) for whot kevin approved watchcommits on fedora-setup-keyboard (Fedora 10) for whot kevin approved commit on fedora-setup-keyboard (Fedora 10) for whot kevin approved build on fedora-setup-keyboard (Fedora 10) for whot kevin approved approveacls on fedora-setup-keyboard (Fedora 10) for whot To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fedora-setup-keyboard From kevin at fedoraproject.org Tue Mar 3 00:36:22 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:36:22 +0000 (UTC) Subject: rpms/fedora-setup-keyboard - New directory Message-ID: <20090303003622.2525F70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/fedora-setup-keyboard In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk17183/rpms/fedora-setup-keyboard Log Message: Directory /cvs/pkgs/rpms/fedora-setup-keyboard added to the repository From kevin at fedoraproject.org Tue Mar 3 00:36:22 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:36:22 +0000 (UTC) Subject: rpms/fedora-setup-keyboard/devel - New directory Message-ID: <20090303003622.5A3E870116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/fedora-setup-keyboard/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk17183/rpms/fedora-setup-keyboard/devel Log Message: Directory /cvs/pkgs/rpms/fedora-setup-keyboard/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 00:36:41 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:36:41 +0000 (UTC) Subject: rpms/fedora-setup-keyboard/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303003641.593C770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/fedora-setup-keyboard/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk17183/rpms/fedora-setup-keyboard/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fedora-setup-keyboard --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: fedora-setup-keyboard # $Id: Makefile,v 1.1 2009/03/03 00:36:41 kevin Exp $ NAME := fedora-setup-keyboard SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Tue Mar 3 00:36:40 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:36:40 +0000 (UTC) Subject: rpms/fedora-setup-keyboard Makefile,NONE,1.1 Message-ID: <20090303003640.E899670116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/fedora-setup-keyboard In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk17183/rpms/fedora-setup-keyboard Added Files: Makefile Log Message: Setup of module fedora-setup-keyboard --- NEW FILE Makefile --- # Top level Makefile for module fedora-setup-keyboard all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From pkgdb at fedoraproject.org Tue Mar 3 00:38:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:38:08 +0000 Subject: [pkgdb] bochs-bios was added for glommer Message-ID: <20090303003807.CD5AF208480@bastion.fedora.phx.redhat.com> kevin has added Package bochs-bios with summary bios for bochs/qemu projects kevin has approved Package bochs-bios kevin has added a Fedora devel branch for bochs-bios with an owner of glommer kevin has approved bochs-bios in Fedora devel kevin has approved Package bochs-bios kevin has set commit to Approved for provenpackager on bochs-bios (Fedora devel) kevin has set build to Approved for provenpackager on bochs-bios (Fedora devel) kevin has set checkout to Approved for provenpackager on bochs-bios (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bochs-bios From kevin at fedoraproject.org Tue Mar 3 00:37:59 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:37:59 +0000 (UTC) Subject: rpms/bochs-bios/devel - New directory Message-ID: <20090303003759.9256370118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/bochs-bios/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb17733/rpms/bochs-bios/devel Log Message: Directory /cvs/pkgs/rpms/bochs-bios/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 00:37:59 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:37:59 +0000 (UTC) Subject: rpms/bochs-bios - New directory Message-ID: <20090303003759.39C0770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/bochs-bios In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb17733/rpms/bochs-bios Log Message: Directory /cvs/pkgs/rpms/bochs-bios added to the repository From kevin at fedoraproject.org Tue Mar 3 00:38:19 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:38:19 +0000 (UTC) Subject: rpms/bochs-bios Makefile,NONE,1.1 Message-ID: <20090303003819.4325870116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/bochs-bios In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb17733/rpms/bochs-bios Added Files: Makefile Log Message: Setup of module bochs-bios --- NEW FILE Makefile --- # Top level Makefile for module bochs-bios all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 00:38:19 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:38:19 +0000 (UTC) Subject: rpms/bochs-bios/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303003819.9096370116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/bochs-bios/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb17733/rpms/bochs-bios/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bochs-bios --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: bochs-bios # $Id: Makefile,v 1.1 2009/03/03 00:38:19 kevin Exp $ NAME := bochs-bios SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From jeckersb at fedoraproject.org Tue Mar 3 00:38:21 2009 From: jeckersb at fedoraproject.org (John Eckersberg) Date: Tue, 3 Mar 2009 00:38:21 +0000 (UTC) Subject: rpms/libyaml/devel libyaml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303003821.9D08F70116@cvs1.fedora.phx.redhat.com> Author: jeckersb Update of /cvs/pkgs/rpms/libyaml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17700 Modified Files: .cvsignore sources Added Files: libyaml.spec Log Message: initial checkin of source and spec --- NEW FILE libyaml.spec --- Name: libyaml Version: 0.1.2 Release: 2%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: Development/Libraries License: MIT URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/libyaml/yaml-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description YAML is a data serialization format designed for human readability and interaction with scripting languages. LibYAML is a YAML parser and emitter written in C. %package devel Summary: Development libraries and headers for developing LibYAML applications Group: Development/Libraries Requires: libyaml = %{version}-%{release} %description devel Development libraries and headers for developing LibYAML applications. %prep %setup -q -n yaml-%{version} %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL="install -p" install rm -f %{buildroot}%{_libdir}/*.la %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc README LICENSE %{_libdir}/%{name}*.so.* %files devel %defattr(-,root,root,-) %doc doc/html %{_libdir}/%{name}*.so %{_libdir}/*a %{_includedir}/yaml.h %changelog * Thu Feb 26 2009 John Eckersberg - 0.1.2-2 - Remove README and LICENSE from docs on -devel package - Remove -static package and merge contents into the -devel package * Wed Feb 25 2009 John Eckersberg - 0.1.2-1 - Initial packaging for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libyaml/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:31:15 -0000 1.1 +++ .cvsignore 3 Mar 2009 00:37:51 -0000 1.2 @@ -0,0 +1 @@ +yaml-0.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libyaml/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:31:15 -0000 1.1 +++ sources 3 Mar 2009 00:37:51 -0000 1.2 @@ -0,0 +1 @@ +f6c9b5c2b0f6919abd79f5fd059b01dc yaml-0.1.2.tar.gz From pkgdb at fedoraproject.org Tue Mar 3 00:39:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:39:00 +0000 Subject: [pkgdb] elisa-plugins-bad was added for thias Message-ID: <20090303003932.2986A208485@bastion.fedora.phx.redhat.com> kevin has added Package elisa-plugins-bad with summary Bad Plugins for the Elisa Media Center kevin has approved Package elisa-plugins-bad kevin has added a Fedora devel branch for elisa-plugins-bad with an owner of thias kevin has approved elisa-plugins-bad in Fedora devel kevin has approved Package elisa-plugins-bad kevin has set commit to Approved for provenpackager on elisa-plugins-bad (Fedora devel) kevin has set build to Approved for provenpackager on elisa-plugins-bad (Fedora devel) kevin has set checkout to Approved for provenpackager on elisa-plugins-bad (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elisa-plugins-bad From pkgdb at fedoraproject.org Tue Mar 3 00:39:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:39:37 +0000 Subject: [pkgdb] elisa-plugins-bad (Fedora, 9) updated by kevin Message-ID: <20090303003936.E8EAB2084D2@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for elisa-plugins-bad kevin has set commit to Approved for provenpackager on elisa-plugins-bad (Fedora 9) kevin has set build to Approved for provenpackager on elisa-plugins-bad (Fedora 9) kevin has set checkout to Approved for provenpackager on elisa-plugins-bad (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elisa-plugins-bad From pkgdb at fedoraproject.org Tue Mar 3 00:39:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:39:37 +0000 Subject: [pkgdb] elisa-plugins-bad (Fedora, 10) updated by kevin Message-ID: <20090303003937.0E6D120851B@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for elisa-plugins-bad kevin has set commit to Approved for provenpackager on elisa-plugins-bad (Fedora 10) kevin has set build to Approved for provenpackager on elisa-plugins-bad (Fedora 10) kevin has set checkout to Approved for provenpackager on elisa-plugins-bad (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/elisa-plugins-bad From kevin at fedoraproject.org Tue Mar 3 00:39:25 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:39:25 +0000 (UTC) Subject: rpms/elisa-plugins-bad - New directory Message-ID: <20090303003925.3728170116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/elisa-plugins-bad In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst18302/rpms/elisa-plugins-bad Log Message: Directory /cvs/pkgs/rpms/elisa-plugins-bad added to the repository From kevin at fedoraproject.org Tue Mar 3 00:39:25 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:39:25 +0000 (UTC) Subject: rpms/elisa-plugins-bad/devel - New directory Message-ID: <20090303003925.7C71070116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/elisa-plugins-bad/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst18302/rpms/elisa-plugins-bad/devel Log Message: Directory /cvs/pkgs/rpms/elisa-plugins-bad/devel added to the repository From spot at fedoraproject.org Tue Mar 3 00:39:39 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Mar 2009 00:39:39 +0000 (UTC) Subject: rpms/ms-sys/F-10 dead.package, NONE, 1.1 Makefile, 1.1, NONE ms-sys.spec, 1.1, NONE sources, 1.2, NONE Message-ID: <20090303003939.0BA2F70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ms-sys/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18249/F-10 Added Files: dead.package Removed Files: Makefile ms-sys.spec sources Log Message: kill this off for legal reasons --- NEW FILE dead.package --- Source contains multiple MBRs and boot records from various proprietary OSes, all used without permission. This package cannot be revived without a thorough legal update, including explicit permission to redistribute, copy, and modify this data. Tom Callaway, Monday Mar 2, 2009 --- Makefile DELETED --- --- ms-sys.spec DELETED --- --- sources DELETED --- From spot at fedoraproject.org Tue Mar 3 00:39:39 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Mar 2009 00:39:39 +0000 (UTC) Subject: rpms/ms-sys/F-9 dead.package, NONE, 1.1 Makefile, 1.1, NONE ms-sys.spec, 1.1, NONE sources, 1.2, NONE Message-ID: <20090303003939.CC31770116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ms-sys/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18249/F-9 Added Files: dead.package Removed Files: Makefile ms-sys.spec sources Log Message: kill this off for legal reasons --- NEW FILE dead.package --- Source contains multiple MBRs and boot records from various proprietary OSes, all used without permission. This package cannot be revived without a thorough legal update, including explicit permission to redistribute, copy, and modify this data. Tom Callaway, Monday Mar 2, 2009 --- Makefile DELETED --- --- ms-sys.spec DELETED --- --- sources DELETED --- From spot at fedoraproject.org Tue Mar 3 00:39:40 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Mar 2009 00:39:40 +0000 (UTC) Subject: rpms/ms-sys/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE ms-sys.spec, 1.2, NONE sources, 1.2, NONE Message-ID: <20090303003940.6384A70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ms-sys/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18249/devel Added Files: dead.package Removed Files: Makefile ms-sys.spec sources Log Message: kill this off for legal reasons --- NEW FILE dead.package --- Source contains multiple MBRs and boot records from various proprietary OSes, all used without permission. This package cannot be revived without a thorough legal update, including explicit permission to redistribute, copy, and modify this data. Tom Callaway, Monday Mar 2, 2009 --- Makefile DELETED --- --- ms-sys.spec DELETED --- --- sources DELETED --- From kevin at fedoraproject.org Tue Mar 3 00:39:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:39:52 +0000 (UTC) Subject: rpms/elisa-plugins-bad Makefile,NONE,1.1 Message-ID: <20090303003952.CA7C870116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/elisa-plugins-bad In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst18302/rpms/elisa-plugins-bad Added Files: Makefile Log Message: Setup of module elisa-plugins-bad --- NEW FILE Makefile --- # Top level Makefile for module elisa-plugins-bad all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 00:39:53 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:39:53 +0000 (UTC) Subject: rpms/elisa-plugins-bad/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303003953.5051B70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/elisa-plugins-bad/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst18302/rpms/elisa-plugins-bad/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module elisa-plugins-bad --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: elisa-plugins-bad # $Id: Makefile,v 1.1 2009/03/03 00:39:53 kevin Exp $ NAME := elisa-plugins-bad SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From mclasen at fedoraproject.org Tue Mar 3 00:39:52 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 00:39:52 +0000 (UTC) Subject: rpms/evince/devel .cvsignore, 1.59, 1.60 evince.spec, 1.158, 1.159 sources, 1.58, 1.59 Message-ID: <20090303003952.4425F70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/evince/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18210 Modified Files: .cvsignore evince.spec sources Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evince/devel/.cvsignore,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- .cvsignore 18 Feb 2009 04:43:54 -0000 1.59 +++ .cvsignore 3 Mar 2009 00:39:21 -0000 1.60 @@ -1 +1 @@ -evince-2.25.91.tar.bz2 +evince-2.25.92.tar.bz2 Index: evince.spec =================================================================== RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- evince.spec 24 Feb 2009 15:38:33 -0000 1.158 +++ evince.spec 3 Mar 2009 00:39:21 -0000 1.159 @@ -5,8 +5,8 @@ %define theme_version 2.17.1 Name: evince -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Summary: Document viewer License: GPLv2+ and GFDL @@ -241,6 +241,9 @@ %{_libdir}/evince/1/backends/djvudocument.evince-backend %changelog +* Mon Mar 2 2009 Matthias Clasen - 2.25.92-1 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evince/devel/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- sources 18 Feb 2009 04:43:54 -0000 1.58 +++ sources 3 Mar 2009 00:39:21 -0000 1.59 @@ -1 +1 @@ -53e6774241d08347fda26ff98cac2aff evince-2.25.91.tar.bz2 +5e0d0fc2d900856074b556e4eacc68e6 evince-2.25.92.tar.bz2 From pkgdb at fedoraproject.org Tue Mar 3 00:40:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:40:40 +0000 Subject: [pkgdb] tuned was added for pknirsch Message-ID: <20090303004112.D22D92084D1@bastion.fedora.phx.redhat.com> kevin has added Package tuned with summary A dynamic adaptive system tuning daemon kevin has approved Package tuned kevin has added a Fedora devel branch for tuned with an owner of pknirsch kevin has approved tuned in Fedora devel kevin has approved Package tuned kevin has set commit to Approved for provenpackager on tuned (Fedora devel) kevin has set build to Approved for provenpackager on tuned (Fedora devel) kevin has set checkout to Approved for provenpackager on tuned (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tuned From kevin at fedoraproject.org Tue Mar 3 00:41:02 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:41:02 +0000 (UTC) Subject: rpms/tuned - New directory Message-ID: <20090303004102.4E71670116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tuned In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz18776/rpms/tuned Log Message: Directory /cvs/pkgs/rpms/tuned added to the repository From kevin at fedoraproject.org Tue Mar 3 00:41:02 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:41:02 +0000 (UTC) Subject: rpms/tuned/devel - New directory Message-ID: <20090303004102.D51D770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tuned/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz18776/rpms/tuned/devel Log Message: Directory /cvs/pkgs/rpms/tuned/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 00:41:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:41:29 +0000 (UTC) Subject: rpms/tuned Makefile,NONE,1.1 Message-ID: <20090303004129.D3DF670116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tuned In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz18776/rpms/tuned Added Files: Makefile Log Message: Setup of module tuned --- NEW FILE Makefile --- # Top level Makefile for module tuned all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 00:41:30 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 00:41:30 +0000 (UTC) Subject: rpms/tuned/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303004130.5966D70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tuned/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz18776/rpms/tuned/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tuned --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: tuned # $Id: Makefile,v 1.1 2009/03/03 00:41:30 kevin Exp $ NAME := tuned SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 3 00:42:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:42:09 +0000 Subject: [pkgdb] atlas (Fedora EPEL, 5) updated by kevin Message-ID: <20090303004209.9EF1920851D@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for atlas kevin has set commit to Approved for provenpackager on atlas (Fedora EPEL 5) kevin has set build to Approved for provenpackager on atlas (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on atlas (Fedora EPEL 5) kevin changed owner of atlas in Fedora EPEL 5 to deji To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/atlas From mclasen at fedoraproject.org Tue Mar 3 00:42:17 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 00:42:17 +0000 (UTC) Subject: rpms/vino/devel .cvsignore, 1.45, 1.46 sources, 1.45, 1.46 vino.spec, 1.91, 1.92 Message-ID: <20090303004217.8B19670116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/vino/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19134 Modified Files: .cvsignore sources vino.spec Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vino/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 19 Feb 2009 04:34:29 -0000 1.45 +++ .cvsignore 3 Mar 2009 00:41:47 -0000 1.46 @@ -1 +1 @@ -vino-2.25.91.tar.bz2 +vino-2.25.92.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vino/devel/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sources 19 Feb 2009 04:34:29 -0000 1.45 +++ sources 3 Mar 2009 00:41:47 -0000 1.46 @@ -1 +1 @@ -fe5e003727ecb36600316eeeeef9c372 vino-2.25.91.tar.bz2 +7c41330a31ea36dd1f22b16564c1d966 vino-2.25.92.tar.bz2 Index: vino.spec =================================================================== RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- vino.spec 26 Feb 2009 00:26:13 -0000 1.91 +++ vino.spec 3 Mar 2009 00:41:47 -0000 1.92 @@ -8,8 +8,8 @@ Summary: A remote desktop system for GNOME Name: vino -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/vino/2.25/%{name}-%{version}.tar.bz2 License: GPLv2+ @@ -33,6 +33,7 @@ BuildRequires: gettext BuildRequires: dbus-glib-devel BuildRequires: libsoup-devel +BuildRequires: NetworkManager-devel %description Vino is a VNC server for GNOME. It allows remote users to @@ -46,7 +47,8 @@ --enable-avahi \ --disable-gnutls \ --disable-http-server \ - --enable-libnotify + --enable-libnotify \ + --enable-network-manager make %install @@ -106,6 +108,10 @@ %{_sysconfdir}/xdg/autostart/vino-server.desktop %changelog +* Mon Mar 2 2009 Matthias Clasen - 2.25.92-1 +- Update to 2.25.92 +- Enable NetworkManager support + * Wed Feb 25 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Tue Mar 3 00:42:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 00:42:33 +0000 Subject: [pkgdb] tokyocabinet (Fedora EPEL, 5) updated by kevin Message-ID: <20090303004254.ADD01208485@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for tokyocabinet kevin has set commit to Approved for provenpackager on tokyocabinet (Fedora EPEL 5) kevin has set build to Approved for provenpackager on tokyocabinet (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on tokyocabinet (Fedora EPEL 5) kevin changed owner of tokyocabinet in Fedora EPEL 5 to deji To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tokyocabinet From mclasen at fedoraproject.org Tue Mar 3 00:49:49 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 00:49:49 +0000 (UTC) Subject: rpms/vinagre/devel .cvsignore, 1.22, 1.23 sources, 1.22, 1.23 vinagre.spec, 1.41, 1.42 Message-ID: <20090303004949.C320170116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/vinagre/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20852 Modified Files: .cvsignore sources vinagre.spec Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vinagre/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 19 Feb 2009 03:59:33 -0000 1.22 +++ .cvsignore 3 Mar 2009 00:49:19 -0000 1.23 @@ -1 +1 @@ -vinagre-2.25.91.tar.bz2 +vinagre-2.25.92.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vinagre/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 19 Feb 2009 03:59:33 -0000 1.22 +++ sources 3 Mar 2009 00:49:19 -0000 1.23 @@ -1 +1 @@ -51c4496d62368327e78ff41d7539bf83 vinagre-2.25.91.tar.bz2 +cc1fa6f31f645eab24f4b927a79c710e vinagre-2.25.92.tar.bz2 Index: vinagre.spec =================================================================== RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- vinagre.spec 26 Feb 2009 00:25:10 -0000 1.41 +++ vinagre.spec 3 Mar 2009 00:49:19 -0000 1.42 @@ -1,6 +1,6 @@ Name: vinagre -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Summary: VNC client for GNOME Group: Applications/System @@ -17,7 +17,7 @@ BuildRequires: avahi-ui-devel >= 0.6.18 BuildRequires: avahi-gobject-devel >= 0.6.18 BuildRequires: libglade2-devel >= 2.6.0 -BuildRequires: perl(XML::Parser) gettext intltool +BuildRequires: gettext intltool BuildRequires: desktop-file-utils BuildRequires: gnome-keyring-devel BuildRequires: gnome-doc-utils @@ -26,8 +26,8 @@ %description Vinagre is a VNC client for the GNOME desktop. -With Vinagre you can have several connections open simultaneously, bookmark -your servers thanks to the Favorites support, store the passwords in the +With Vinagre you can have several connections open simultaneously, bookmark +your servers thanks to the Favorites support, store the passwords in the GNOME keyring, and browse the network to look for VNC servers. @@ -122,6 +122,9 @@ %doc README NEWS COPYING AUTHORS %changelog +* Mon Mar 2 2009 Matthias Clasen - 2.25.92-1 +- Update to 2.25.92 + * Wed Feb 25 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mclasen at fedoraproject.org Tue Mar 3 00:55:34 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 00:55:34 +0000 (UTC) Subject: rpms/gedit/devel .cvsignore, 1.86, 1.87 gedit.spec, 1.188, 1.189 sources, 1.88, 1.89 Message-ID: <20090303005535.021BD70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gedit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22243 Modified Files: .cvsignore gedit.spec sources Log Message: 2.25.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gedit/devel/.cvsignore,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- .cvsignore 19 Feb 2009 00:35:00 -0000 1.86 +++ .cvsignore 3 Mar 2009 00:55:04 -0000 1.87 @@ -1 +1 @@ -gedit-2.25.7.tar.bz2 +gedit-2.25.8.tar.bz2 Index: gedit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- gedit.spec 24 Feb 2009 20:23:07 -0000 1.188 +++ gedit.spec 3 Mar 2009 00:55:04 -0000 1.189 @@ -17,8 +17,8 @@ Summary: Text editor for the GNOME desktop Name: gedit -Version: 2.25.7 -Release: 2%{?dist} +Version: 2.25.8 +Release: 1%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: Applications/Editors @@ -225,6 +225,9 @@ %changelog +* Mon Mar 2 2009 Matthias Clasen - 1:2.25.8-1 +- Update to 2.25.8 + * Tue Feb 24 2009 Fedora Release Engineering - 1:2.25.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gedit/devel/sources,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- sources 19 Feb 2009 00:35:00 -0000 1.88 +++ sources 3 Mar 2009 00:55:04 -0000 1.89 @@ -1 +1 @@ -d546e268af207cc74c40adbd5af294f7 gedit-2.25.7.tar.bz2 +065bd79feb2e53896f1da5669cb97313 gedit-2.25.8.tar.bz2 From jeckersb at fedoraproject.org Tue Mar 3 00:56:10 2009 From: jeckersb at fedoraproject.org (John Eckersberg) Date: Tue, 3 Mar 2009 00:56:10 +0000 (UTC) Subject: rpms/PyYAML/devel PyYAML.spec,1.5,1.6 Message-ID: <20090303005610.8BA9C70116@cvs1.fedora.phx.redhat.com> Author: jeckersb Update of /cvs/pkgs/rpms/PyYAML/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22428 Modified Files: PyYAML.spec Log Message: Add libyaml to BuildRequires Index: PyYAML.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyYAML/devel/PyYAML.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PyYAML.spec 23 Feb 2009 22:40:03 -0000 1.5 +++ PyYAML.spec 3 Mar 2009 00:55:40 -0000 1.6 @@ -2,7 +2,7 @@ Name: PyYAML Version: 3.08 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -11,7 +11,7 @@ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel, python-setuptools +BuildRequires: python-devel, python-setuptools, libyaml %description YAML is a data serialization format designed for human readability and @@ -52,6 +52,9 @@ %changelog +* Mon Mar 2 2009 John Eckersberg - 3.08-3 +- Add libyaml to BuildRequires + * Mon Feb 23 2009 Fedora Release Engineering - 3.08-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mclasen at fedoraproject.org Tue Mar 3 01:01:37 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 01:01:37 +0000 (UTC) Subject: rpms/gnome-themes/devel .cvsignore, 1.73, 1.74 gnome-themes.spec, 1.130, 1.131 sources, 1.78, 1.79 Message-ID: <20090303010137.C697E70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-themes/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23376 Modified Files: .cvsignore gnome-themes.spec sources Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-themes/devel/.cvsignore,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- .cvsignore 18 Feb 2009 03:19:03 -0000 1.73 +++ .cvsignore 3 Mar 2009 01:01:07 -0000 1.74 @@ -1 +1 @@ -gnome-themes-2.25.91.tar.bz2 +gnome-themes-2.25.92.tar.bz2 Index: gnome-themes.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- gnome-themes.spec 24 Feb 2009 23:33:06 -0000 1.130 +++ gnome-themes.spec 3 Mar 2009 01:01:07 -0000 1.131 @@ -1,13 +1,13 @@ Summary: Themes for GNOME Name: gnome-themes -Version: 2.25.91 -Release:2%{?dist} +Version: 2.25.92 +Release:1%{?dist} URL: http://download.gnome.org/sources/gnome-themes/ Source: http://download.gnome.org/sources/gnome-themes/2.25/%{name}-%{version}.tar.bz2 License: LGPLv2 and GPLv2 Group: User Interface/Desktops BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gtk2-engines >= 2.15.3 Requires: gnome-icon-theme @@ -60,9 +60,9 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -for dir in /usr/share/icons/*; do - if test -d "$dir"; then +%post +for dir in /usr/share/icons/*; do + if test -d "$dir"; then if test -f "$dir/index.theme"; then /usr/bin/gtk-update-icon-cache --quiet "$dir" fi @@ -97,6 +97,9 @@ %doc AUTHORS COPYING NEWS README %changelog +* Mon Mar 3 2009 Matthias Clasen - 2.25.92-1 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-themes/devel/sources,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- sources 18 Feb 2009 03:19:04 -0000 1.78 +++ sources 3 Mar 2009 01:01:07 -0000 1.79 @@ -1 +1 @@ -4ada848d47c6025b414757384a499bc5 gnome-themes-2.25.91.tar.bz2 +63ed3fde313f5b185f8fee3d2f07d86c gnome-themes-2.25.92.tar.bz2 From mclasen at fedoraproject.org Tue Mar 3 01:04:10 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 01:04:10 +0000 (UTC) Subject: rpms/orca/devel .cvsignore, 1.48, 1.49 orca.spec, 1.80, 1.81 sources, 1.49, 1.50 Message-ID: <20090303010410.71F6170116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/orca/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23882 Modified Files: .cvsignore orca.spec sources Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/orca/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 19 Feb 2009 04:56:57 -0000 1.48 +++ .cvsignore 3 Mar 2009 01:03:39 -0000 1.49 @@ -1 +1 @@ -orca-2.25.91.tar.bz2 +orca-2.25.92.tar.bz2 Index: orca.spec =================================================================== RCS file: /cvs/pkgs/rpms/orca/devel/orca.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- orca.spec 26 Feb 2009 09:03:31 -0000 1.80 +++ orca.spec 3 Mar 2009 01:03:39 -0000 1.81 @@ -16,8 +16,8 @@ %define control_center_version 2.16.0-5 Name: orca -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Summary: Assistive technology for people with visual impairments Group: User Interface/Desktops @@ -35,7 +35,6 @@ BuildRequires: gail-devel >= %{gail_version} BuildRequires: at-spi-devel >= %{libspi_version} BuildRequires: gnome-speech-devel >= %{gnome_speech_version} -BuildRequires: perl(XML::Parser) BuildRequires: gettext BuildRequires: intltool BuildRequires: gnome-python2-bonobo @@ -105,6 +104,9 @@ %changelog +* Mon Mar 2 2009 Matthias Clasen - 2.25.92-1 +- Update to 2.25.92 + * Thu Feb 26 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/orca/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 19 Feb 2009 04:56:57 -0000 1.49 +++ sources 3 Mar 2009 01:03:39 -0000 1.50 @@ -1 +1 @@ -a783bb36eb0ad0f500190c35780162df orca-2.25.91.tar.bz2 +da65829a28c52a9ae63acd78a93d4c07 orca-2.25.92.tar.bz2 From jeckersb at fedoraproject.org Tue Mar 3 01:04:46 2009 From: jeckersb at fedoraproject.org (John Eckersberg) Date: Tue, 3 Mar 2009 01:04:46 +0000 (UTC) Subject: rpms/libyaml/EL-4 libyaml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303010446.F1B9F70116@cvs1.fedora.phx.redhat.com> Author: jeckersb Update of /cvs/pkgs/rpms/libyaml/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24085 Modified Files: .cvsignore sources Added Files: libyaml.spec Log Message: initial checkin --- NEW FILE libyaml.spec --- Name: libyaml Version: 0.1.2 Release: 2%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: Development/Libraries License: MIT URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/libyaml/yaml-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description YAML is a data serialization format designed for human readability and interaction with scripting languages. LibYAML is a YAML parser and emitter written in C. %package devel Summary: Development libraries and headers for developing LibYAML applications Group: Development/Libraries Requires: libyaml = %{version}-%{release} %description devel Development libraries and headers for developing LibYAML applications. %prep %setup -q -n yaml-%{version} %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL="install -p" install rm -f %{buildroot}%{_libdir}/*.la %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc README LICENSE %{_libdir}/%{name}*.so.* %files devel %defattr(-,root,root,-) %doc doc/html %{_libdir}/%{name}*.so %{_libdir}/*a %{_includedir}/yaml.h %changelog * Thu Feb 26 2009 John Eckersberg - 0.1.2-2 - Remove README and LICENSE from docs on -devel package - Remove -static package and merge contents into the -devel package * Wed Feb 25 2009 John Eckersberg - 0.1.2-1 - Initial packaging for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libyaml/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:31:15 -0000 1.1 +++ .cvsignore 3 Mar 2009 01:04:16 -0000 1.2 @@ -0,0 +1 @@ +yaml-0.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libyaml/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:31:15 -0000 1.1 +++ sources 3 Mar 2009 01:04:16 -0000 1.2 @@ -0,0 +1 @@ +f6c9b5c2b0f6919abd79f5fd059b01dc yaml-0.1.2.tar.gz From jeckersb at fedoraproject.org Tue Mar 3 01:06:16 2009 From: jeckersb at fedoraproject.org (John Eckersberg) Date: Tue, 3 Mar 2009 01:06:16 +0000 (UTC) Subject: rpms/libyaml/EL-5 libyaml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303010616.A54F170116@cvs1.fedora.phx.redhat.com> Author: jeckersb Update of /cvs/pkgs/rpms/libyaml/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24547 Modified Files: .cvsignore sources Added Files: libyaml.spec Log Message: initial checkin --- NEW FILE libyaml.spec --- Name: libyaml Version: 0.1.2 Release: 2%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: Development/Libraries License: MIT URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/libyaml/yaml-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description YAML is a data serialization format designed for human readability and interaction with scripting languages. LibYAML is a YAML parser and emitter written in C. %package devel Summary: Development libraries and headers for developing LibYAML applications Group: Development/Libraries Requires: libyaml = %{version}-%{release} %description devel Development libraries and headers for developing LibYAML applications. %prep %setup -q -n yaml-%{version} %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL="install -p" install rm -f %{buildroot}%{_libdir}/*.la %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc README LICENSE %{_libdir}/%{name}*.so.* %files devel %defattr(-,root,root,-) %doc doc/html %{_libdir}/%{name}*.so %{_libdir}/*a %{_includedir}/yaml.h %changelog * Thu Feb 26 2009 John Eckersberg - 0.1.2-2 - Remove README and LICENSE from docs on -devel package - Remove -static package and merge contents into the -devel package * Wed Feb 25 2009 John Eckersberg - 0.1.2-1 - Initial packaging for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libyaml/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:31:15 -0000 1.1 +++ .cvsignore 3 Mar 2009 01:05:46 -0000 1.2 @@ -0,0 +1 @@ +yaml-0.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libyaml/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:31:15 -0000 1.1 +++ sources 3 Mar 2009 01:05:46 -0000 1.2 @@ -0,0 +1 @@ +f6c9b5c2b0f6919abd79f5fd059b01dc yaml-0.1.2.tar.gz From mclasen at fedoraproject.org Tue Mar 3 01:08:01 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 01:08:01 +0000 (UTC) Subject: rpms/cheese/devel .cvsignore, 1.25, 1.26 cheese.spec, 1.49, 1.50 sources, 1.25, 1.26 Message-ID: <20090303010801.D8BE170116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/cheese/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24898 Modified Files: .cvsignore cheese.spec sources Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cheese/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 19 Feb 2009 04:02:53 -0000 1.25 +++ .cvsignore 3 Mar 2009 01:07:31 -0000 1.26 @@ -1 +1 @@ -cheese-2.25.91.tar.bz2 +cheese-2.25.92.tar.bz2 Index: cheese.spec =================================================================== RCS file: /cvs/pkgs/rpms/cheese/devel/cheese.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- cheese.spec 24 Feb 2009 07:17:19 -0000 1.49 +++ cheese.spec 3 Mar 2009 01:07:31 -0000 1.50 @@ -1,6 +1,6 @@ Name: cheese -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Summary: Application for taking pictures and movies from a webcam Group: Amusements/Graphics @@ -25,7 +25,6 @@ BuildRequires: libXxf86vm-devel BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: perl(XML::Parser) BuildRequires: gnome-doc-utils BuildRequires: intltool BuildRequires: gnome-desktop-devel >= 2.25.1 @@ -33,10 +32,10 @@ Requires: gstreamer-plugins-good >= 0.10.6-2 Requires(post): GConf2 Requires(pre): GConf2 -Requires(preun): GConf2 +Requires(preun): GConf2 %description -Cheese is a Photobooth-inspired GNOME application for taking pictures and +Cheese is a Photobooth-inspired GNOME application for taking pictures and videos from a webcam. It can also apply fancy graphical effects. %prep @@ -125,6 +124,9 @@ %{_datadir}/dbus-1/services/org.gnome.Cheese.service %changelog +* Mon Mar 2 2009 Matthias Clasen 2.25.92-1 +- Update to 2.25.92 + * Mon Feb 23 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cheese/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 19 Feb 2009 04:02:53 -0000 1.25 +++ sources 3 Mar 2009 01:07:31 -0000 1.26 @@ -1 +1 @@ -b4bd1d4726cbac2fc633232ebc873310 cheese-2.25.91.tar.bz2 +e9ee8f3f3fdca7ffcbb6cadb433e4e8d cheese-2.25.92.tar.bz2 From jeckersb at fedoraproject.org Tue Mar 3 01:09:03 2009 From: jeckersb at fedoraproject.org (John Eckersberg) Date: Tue, 3 Mar 2009 01:09:03 +0000 (UTC) Subject: rpms/libyaml/F-9 libyaml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303010903.58BD470116@cvs1.fedora.phx.redhat.com> Author: jeckersb Update of /cvs/pkgs/rpms/libyaml/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25252 Modified Files: .cvsignore sources Added Files: libyaml.spec Log Message: initial checkin --- NEW FILE libyaml.spec --- Name: libyaml Version: 0.1.2 Release: 2%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: Development/Libraries License: MIT URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/libyaml/yaml-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description YAML is a data serialization format designed for human readability and interaction with scripting languages. LibYAML is a YAML parser and emitter written in C. %package devel Summary: Development libraries and headers for developing LibYAML applications Group: Development/Libraries Requires: libyaml = %{version}-%{release} %description devel Development libraries and headers for developing LibYAML applications. %prep %setup -q -n yaml-%{version} %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL="install -p" install rm -f %{buildroot}%{_libdir}/*.la %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc README LICENSE %{_libdir}/%{name}*.so.* %files devel %defattr(-,root,root,-) %doc doc/html %{_libdir}/%{name}*.so %{_libdir}/*a %{_includedir}/yaml.h %changelog * Thu Feb 26 2009 John Eckersberg - 0.1.2-2 - Remove README and LICENSE from docs on -devel package - Remove -static package and merge contents into the -devel package * Wed Feb 25 2009 John Eckersberg - 0.1.2-1 - Initial packaging for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libyaml/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:31:15 -0000 1.1 +++ .cvsignore 3 Mar 2009 01:08:33 -0000 1.2 @@ -0,0 +1 @@ +yaml-0.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libyaml/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:31:15 -0000 1.1 +++ sources 3 Mar 2009 01:08:33 -0000 1.2 @@ -0,0 +1 @@ +f6c9b5c2b0f6919abd79f5fd059b01dc yaml-0.1.2.tar.gz From jeckersb at fedoraproject.org Tue Mar 3 01:10:15 2009 From: jeckersb at fedoraproject.org (John Eckersberg) Date: Tue, 3 Mar 2009 01:10:15 +0000 (UTC) Subject: rpms/libyaml/F-10 libyaml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303011015.9A72C70116@cvs1.fedora.phx.redhat.com> Author: jeckersb Update of /cvs/pkgs/rpms/libyaml/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25493 Modified Files: .cvsignore sources Added Files: libyaml.spec Log Message: initial checkin --- NEW FILE libyaml.spec --- Name: libyaml Version: 0.1.2 Release: 2%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: Development/Libraries License: MIT URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/libyaml/yaml-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description YAML is a data serialization format designed for human readability and interaction with scripting languages. LibYAML is a YAML parser and emitter written in C. %package devel Summary: Development libraries and headers for developing LibYAML applications Group: Development/Libraries Requires: libyaml = %{version}-%{release} %description devel Development libraries and headers for developing LibYAML applications. %prep %setup -q -n yaml-%{version} %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL="install -p" install rm -f %{buildroot}%{_libdir}/*.la %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc README LICENSE %{_libdir}/%{name}*.so.* %files devel %defattr(-,root,root,-) %doc doc/html %{_libdir}/%{name}*.so %{_libdir}/*a %{_includedir}/yaml.h %changelog * Thu Feb 26 2009 John Eckersberg - 0.1.2-2 - Remove README and LICENSE from docs on -devel package - Remove -static package and merge contents into the -devel package * Wed Feb 25 2009 John Eckersberg - 0.1.2-1 - Initial packaging for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libyaml/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:31:15 -0000 1.1 +++ .cvsignore 3 Mar 2009 01:09:45 -0000 1.2 @@ -0,0 +1 @@ +yaml-0.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libyaml/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:31:15 -0000 1.1 +++ sources 3 Mar 2009 01:09:45 -0000 1.2 @@ -0,0 +1 @@ +f6c9b5c2b0f6919abd79f5fd059b01dc yaml-0.1.2.tar.gz From mclasen at fedoraproject.org Tue Mar 3 01:16:10 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 01:16:10 +0000 (UTC) Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.75, 1.76 gnome-system-monitor.spec, 1.137, 1.138 sources, 1.75, 1.76 Message-ID: <20090303011610.CAF1970117@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-system-monitor/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26074 Modified Files: .cvsignore gnome-system-monitor.spec sources Log Message: 2.26.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/.cvsignore,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- .cvsignore 18 Feb 2009 04:41:22 -0000 1.75 +++ .cvsignore 3 Mar 2009 01:15:39 -0000 1.76 @@ -1 +1 @@ -gnome-system-monitor-2.25.91.tar.bz2 +gnome-system-monitor-2.26.0.tar.bz2 Index: gnome-system-monitor.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- gnome-system-monitor.spec 24 Feb 2009 23:30:17 -0000 1.137 +++ gnome-system-monitor.spec 3 Mar 2009 01:15:39 -0000 1.138 @@ -12,14 +12,14 @@ Summary: Process and resource monitor Name: gnome-system-monitor -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.26.0 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.gnome.org/ -Source: http://download.gnome.org/sources/gnome-system-monitor/2.25/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gnome-system-monitor/2.26/%{name}-%{version}.tar.bz2 Source1: about-this-computer.desktop -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: GConf2-devel BuildRequires: gnome-vfs2-devel BuildRequires: libgtop2-devel >= %{libgtop2_version} @@ -56,8 +56,8 @@ Requires(postun): scrollkeeper %description -gnome-system-monitor allows to graphically view and manipulate the running -processes on your system. It also provides an overview of available resources +gnome-system-monitor allows to graphically view and manipulate the running +processes on your system. It also provides an overview of available resources such as CPU and memory. %prep @@ -145,6 +145,9 @@ %changelog +* Mon Mar 2 2009 Matthias Clasen - 2.26.0-1 +- Update to 2.26.0 + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/sources,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- sources 18 Feb 2009 04:41:22 -0000 1.75 +++ sources 3 Mar 2009 01:15:39 -0000 1.76 @@ -1 +1 @@ -6c688fda8dcfdc01a201fa8e05a42dba gnome-system-monitor-2.25.91.tar.bz2 +f8a6a89b57c9705ef46c825ffe7d2930 gnome-system-monitor-2.26.0.tar.bz2 From kevin at fedoraproject.org Tue Mar 3 01:26:58 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 01:26:58 +0000 (UTC) Subject: rpms/heartbeat/EL-5 heartbeat-2.1.4-default-init.patch, NONE, 1.1 sources, 1.7, 1.8 .cvsignore, 1.7, 1.8 heartbeat.spec, 1.12, 1.13 heartbeat-fedora-ccmuser.patch, 1.1, NONE heartbeat-fedora-chkconfig.patch, 1.2, NONE Message-ID: <20090303012658.3C13770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/extras/rpms/heartbeat/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29187 Modified Files: sources .cvsignore heartbeat.spec Added Files: heartbeat-2.1.4-default-init.patch Removed Files: heartbeat-fedora-ccmuser.patch heartbeat-fedora-chkconfig.patch Log Message: 2.1.4 for epel5 heartbeat-2.1.4-default-init.patch: --- NEW FILE heartbeat-2.1.4-default-init.patch --- diff -Nur Heartbeat-STABLE-2-1-STABLE-2.1.4.orig/heartbeat/init.d/heartbeat.in Heartbeat-STABLE-2-1-STABLE-2.1.4/heartbeat/init.d/heartbeat.in --- Heartbeat-STABLE-2-1-STABLE-2.1.4.orig/heartbeat/init.d/heartbeat.in 2008-08-18 06:32:19.000000000 -0600 +++ Heartbeat-STABLE-2-1-STABLE-2.1.4/heartbeat/init.d/heartbeat.in 2008-12-01 20:23:23.000000000 -0700 @@ -12,7 +12,7 @@ # We don't hate anyone, and like for everyone to use # our software, no matter what OS or distribution you're using. # -# chkconfig: 2345 @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ +# chkconfig: - @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ # description: Startup script high-availability services. # processname: heartbeat # pidfile: @localstatedir@/run/heartbeat.pid Index: sources =================================================================== RCS file: /cvs/extras/rpms/heartbeat/EL-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 Jan 2007 20:05:01 -0000 1.7 +++ sources 3 Mar 2009 01:26:27 -0000 1.8 @@ -1 +1 @@ -39d7d12d2a7d5c98d1e3f8ae7977a3e6 heartbeat-2.0.8.tar.gz +2e53a9996beb1ff7611d3f7300586951 STABLE-2.1.4.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/heartbeat/EL-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 Jan 2007 20:05:01 -0000 1.7 +++ .cvsignore 3 Mar 2009 01:26:27 -0000 1.8 @@ -1 +1 @@ -heartbeat-2.0.8.tar.gz +STABLE-2.1.4.tar.bz2 Index: heartbeat.spec =================================================================== RCS file: /cvs/extras/rpms/heartbeat/EL-5/heartbeat.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- heartbeat.spec 9 Feb 2007 09:54:56 -0000 1.12 +++ heartbeat.spec 3 Mar 2009 01:26:27 -0000 1.13 @@ -5,14 +5,14 @@ %define uname hacluster Summary: Heartbeat subsystem for High-Availability Linux Name: heartbeat -Version: 2.0.8 -Release: 2%{?dist} -License: GPL/LGPL +Version: 2.1.4 +Release: 6%{?dist} +License: GPLv2 and LGPLv2+ URL: http://linux-ha.org/ Group: System Environment/Daemons -Source0: http://linux-ha.org/download/%{name}-%{version}.tar.gz +Source0: http://hg.linux-ha.org/lha-2.1/archive/STABLE-%{version}.tar.bz2 Patch0: heartbeat-fedora-pam.patch -Patch1: heartbeat-fedora-chkconfig.patch +Patch1: heartbeat-2.1.4-default-init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel BuildRequires: iputils @@ -21,18 +21,21 @@ BuildRequires: net-snmp-devel >= 5.4 BuildRequires: bzip2-devel BuildRequires: ncurses-devel +BuildRequires: openssl-devel +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: gettext +BuildRequires: bison +BuildRequires: flex %if %{ENABLE_MGMT} BuildRequires: gnutls-devel BuildRequires: pam-devel BuildRequires: python-devel BuildRequires: swig %endif -Requires: stonith = %{version}-%{release} -Requires: pils = %{version}-%{release} Requires: ldirectord = %{version}-%{release} -Requires: pygtk2 >= 2.4 -Requires(pre): fedora-usermgmt -Requires(postun): fedora-usermgmt +Requires: PyXML +Requires(pre): shadow-utils Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig %if %{ENABLE_MGMT} @@ -57,37 +60,42 @@ - "ping" heartbeats (for routers, switches, etc.) (to be used for breaking ties in 2-node systems) -%package -n ldirectord +%package ldirectord Summary: Monitor daemon for maintaining high availability resources Group: System Environment/Daemons Requires: ipvsadm Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig +Provides: ldirectord = %{version}-%{release} +Obsoletes: ldirectord < 2.1.4-5 -%description -n ldirectord +%description ldirectord ldirectord is a stand-alone daemon to monitor services of real for virtual services provided by The Linux Virtual Server (http://www.linuxvirtualserver.org/). It is simple to install and works with the heartbeat code (http://www.linux-ha.org/). -%package -n stonith -Requires: pils = %{version}-%{release} +%package stonith Requires: net-snmp-libs Summary: Provides an interface to Shoot The Other Node In The Head Group: System Environment/Daemons +Provides: stonith = %{version}-%{release} +Obsoletes: stonith < 2.1.4-5 -%description -n stonith -The STONITH module (a.k.a. STOMITH) provides an extensible interface +%description stonith +The STONITH module (a.k.a. STONITH) provides an extensible interface for remotely powering down a node in the cluster. The idea is quite simple: When the software running on one machine wants to make sure another machine in the cluster is not using a resource, pull the plug on the other machine. It's simple and reliable, albeit admittedly brutal. -%package -n pils +%package pils Summary: Provides a general plugin and interface loading library Group: System Environment/Daemons +Provides: pils = %{version}-%{release} +Obsoletes: pils < 2.1.4-5 -%description -n pils +%description pils PILS is an generalized and portable open source Plugin and Interface Loading System. PILS was developed as part of the Open Cluster Framework reference implementation, and is designed to be directly usable by a wide variety of @@ -104,15 +112,27 @@ %description devel Heartbeat development package +%package gui +Summary: Provides a gui interface to manage heartbeat clusters +Group: System Environment/Daemons +Requires: heartbeat = %{version}-%{release} +Requires: PyXML +Requires: pygtk2 >= 2.4 + +%description gui +GUI client for Heartbeat clusters + %prep -%setup -q +%setup -q -n Heartbeat-STABLE-2-1-STABLE-%{version} %patch0 -p1 %patch1 -p1 %build +./bootstrap # disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness' CFLAGS=${RPM_OPT_FLAGS} \ %configure \ + --with-ocf-root=%{_datadir}/ocf \ --disable-fatal-warnings \ --disable-static \ %if %{ENABLE_MGMT} @@ -120,16 +140,17 @@ %else --disable-mgmt %endif -make + +# get rid of rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -( - cd $RPM_BUILD_ROOT/etc/ha.d/resource.d - ln -s /usr/sbin/ldirectord ldirectord -) # cleanup [ -d $RPM_BUILD_ROOT/usr/man ] && rm -rf $RPM_BUILD_ROOT/usr/man @@ -142,55 +163,61 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat-gui/pymgmt.py +# fix some wrong line endings issues +sed -i 's/\r//' $RPM_BUILD_ROOT/%{_datadir}/ocf/resource.d/heartbeat/SAPDatabase +sed -i 's/\r//' $RPM_BUILD_ROOT/%{_datadir}/ocf/resource.d/heartbeat/SAPInstance + +%find_lang haclient + %clean -if [ -n "${RPM_BUILD_ROOT}" -a "${RPM_BUILD_ROOT}" != "/" ]; then - rm -rf $RPM_BUILD_ROOT -fi -rm -rf $RPM_BUILD_DIR/heartbeat-%{version} +rm -rf $RPM_BUILD_ROOT %pre -/usr/sbin/fedora-groupadd %{uid} -r %{gname} &>/dev/null || : -/usr/sbin/fedora-useradd %{uid} -r -s /sbin/nologin -d /var/lib/heartbeat/cores/hacluster -M \ - -c 'heartbeat user' -g %{gname} %{uname} &>/dev/null || : +getent group %{gname} >/dev/null || groupadd -r %{gname} +getent passwd %{uname} >/dev/null || \ +useradd -r -g %{gname} -d /var/lib/heartbeat/cores/hacluster -s /sbin/nologin \ +-c "heartbeat user" %{uname} +exit 0 %post /sbin/ldconfig /sbin/chkconfig --add heartbeat +%postun -p /sbin/ldconfig + %preun if [ $1 = 0 ] ; then /sbin/service heartbeat stop /sbin/chkconfig --del heartbeat fi -%postun -if [ "$1" -ge "1" ] ; then - /sbin/service heartbeat restart -fi /sbin/ldconfig -test "$1" != 0 || /usr/sbin/fedora-userdel %{uname} &>/dev/null || : -test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || : -%post -n ldirectord +%post ldirectord /sbin/chkconfig --add ldirectord -%preun -n ldirectord +%postun ldirectord -p /sbin/ldconfig + +%preun ldirectord /sbin/chkconfig --del ldirectord -%post -n stonith -p /sbin/ldconfig +%post stonith -p /sbin/ldconfig + +%postun stonith -p /sbin/ldconfig -%postun -n stonith -p /sbin/ldconfig +%post pils -p /sbin/ldconfig -%files +%postun pils -p /sbin/ldconfig + +%files -f haclient.lang %doc %{_datadir}/doc/%{name}-%{version} -%defattr(-,root,root) +%defattr(-,root,root,-) %dir %{_sysconfdir}/ha.d %{_sysconfdir}/ha.d/harc %config(noreplace) %{_sysconfdir}/ha.d/shellfuncs %{_sysconfdir}/ha.d/rc.d %config(noreplace) %{_sysconfdir}/ha.d/README.config %{_libdir}/heartbeat -%{_libdir}/heartbeat-gui %{_libdir}/libapphb.so.* %{_libdir}/libccmclient.so.* %{_libdir}/libcib.so.* @@ -204,7 +231,10 @@ %{_libdir}/libplumbgpl.so.* %{_libdir}/librecoverymgr.so.* %{_libdir}/libstonithd.so.* -%{_prefix}/lib/ocf +%{_libdir}/libpe_rules.so.* +%{_libdir}/libpe_status.so.* +%{_datadir}/heartbeat/ +%{_datadir}/ocf/ %{_sysconfdir}/ha.d/resource.d/ %exclude %{_sysconfdir}/ha.d/resource.d/ldirectord %{_sysconfdir}/init.d/heartbeat @@ -217,6 +247,8 @@ %dir %{_var}/run/heartbeat %attr (2755, hacluster, haclient) %{_bindir}/cl_status %{_bindir}/cl_respawn +%{_sbindir}/ciblint +%{_sbindir}/hb_report %{_sbindir}/crmadmin %{_sbindir}/cibadmin %{_sbindir}/ccm_tool @@ -233,6 +265,8 @@ %{_sbindir}/attrd_updater %{_sbindir}/crm_failcount %{_sbindir}/ocf-tester +%{_sbindir}/ha_logger +%{_sbindir}/ptest %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/ccm %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/crm %dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/crm @@ -257,44 +291,41 @@ %{_libdir}/libhbmgmtcommon.so.* %{_libdir}/libhbmgmttls.so.* %config(noreplace) %{_sysconfdir}/pam.d/hbmgmtd -%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.mo %endif -%files -n ldirectord +%files ldirectord %doc doc/COPYING %doc doc/README %doc ldirectord/ldirectord.cf -%defattr(-,root,root) +%defattr(-,root,root,-) %{_sbindir}/ldirectord -%{_sbindir}/supervise-ldirectord-config %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord %{_sysconfdir}/init.d/ldirectord %{_sysconfdir}/ha.d/resource.d/ldirectord %{_mandir}/man8/ldirectord.8* -%{_mandir}/man8/supervise-ldirectord-config.8* -%files -n stonith +%files stonith %doc doc/COPYING %doc doc/README -%defattr(-,root,root) -%{_libdir}/*.so.* +%defattr(-,root,root,-) +%{_libdir}/libstonith.so.* %{_libdir}/stonith/ %{_sbindir}/stonith %{_sbindir}/meatclient %{_mandir}/man8/stonith.8* %{_mandir}/man8/meatclient.8* -%files -n pils +%files pils %doc doc/COPYING %doc doc/README -%defattr(-,root,root) +%defattr(-,root,root,-) /usr/include/pils %{_libdir}/libpils.* %{_libdir}/pils/ %files devel %doc %{_datadir}/doc/%{name}-%{version} -%defattr(-,root,root) +%defattr(-,root,root,-) %{_includedir}/heartbeat/ %{_includedir}/clplumbing/ %{_includedir}/saf/ @@ -303,7 +334,79 @@ %{_includedir}/pils/ %{_libdir}/*.so +%files gui +%defattr(-,root,root) +%{_libdir}/heartbeat-gui +%{_datadir}/heartbeat-gui +%{_bindir}/hb_gui + %changelog +* Tue Feb 24 2009 Kevin Fenzi - 2.1.4-6 +- Remove symlink thats no longer needed. + +* Mon Feb 23 2009 Kevin Fenzi - 2.1.4-5 +- Remove fedora-usermgmt +- Change subpackage names to match all the other heartbeat packages out there. + +* Sat Jan 17 2009 Kevin Fenzi - 2.1.4-4 +- Main package shouldn't require pygtk2 (#480157) + +* Fri Jan 16 2009 Tomas Mraz - 2.1.4-3 +- rebuild with new openssl + +* Thu Dec 04 2008 Ignacio Vazquez-Abrams - 2.1.4-2 +- Rebuild for Python 2.6 + +* Mon Dec 01 2008 Kevin Fenzi - 2.1.4-1 +- Update to 2.1.4 +- Drop upstreamed patch +- Add patch to disable init script by default (#441286) + +* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 2.1.3-4 +- Rebuild for Python 2.6 + +* Tue Oct 21 2008 Lon Hohberger - 2.1.3-3 +- Fix requires line to include PyXML (#467807) + +* Wed Jun 25 2008 Tomas Mraz - 2.1.3-2 +- rebuild with new gnutls + +* Mon Feb 25 2008 Kevin Fenzi - 2.1.3-1 +- Update to 2.1.3 +- Add management GUI +- Drop upstreamed patches +- Add patch for IPAddr (bz #434653) + +* Tue Feb 19 2008 Fedora Release Engineering - 2.1.2-4 +- Autorebuild for GCC 4.3 + +* Fri Dec 07 2007 Release Engineering - 2.1.2-3 +- Rebuild for deps + +* Tue Aug 29 2007 Kevin Fenzi - 2.1.2-2 +- Update sources + +* Tue Aug 29 2007 Kevin Fenzi - 2.1.2-1 +- Upgrade to 2.1.2 +- Update license tag for new guidelines. +- Patch open function issues. + +* Wed Aug 29 2007 Fedora Release Engineering - 2.0.8-4 +- Rebuild for selinux ppc32 issue. + +* Tue Jun 26 2007 Kevin Fenzi - 2.0.8-3 +- Add openssl-devel BuildRequires +- Remove restart from postun (bz #223949) +- Fix up Requires (bz #245704) +- Remove duplicate libraries in subpackages (bz #245704) +- Add smp_mflags +- Fix typo in stonith subpackage description +- Simplify clean section. +- Use find_lang macro +- Fix some multilib issues with ocf dir (bz #228165) +- Kill rpath +- Add ldconfig to postun + * Fri Feb 9 2007 Joost Soeterbroek - 2.0.8-2 - change condrestart -> restart (bz #223949) --- heartbeat-fedora-ccmuser.patch DELETED --- --- heartbeat-fedora-chkconfig.patch DELETED --- From mclasen at fedoraproject.org Tue Mar 3 01:45:49 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 01:45:49 +0000 (UTC) Subject: rpms/gnome-settings-daemon/devel .cvsignore, 1.23, 1.24 gnome-settings-daemon.spec, 1.96, 1.97 sources, 1.24, 1.25 notify-statusicon.patch, 1.2, NONE Message-ID: <20090303014549.0F58E70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32120 Modified Files: .cvsignore gnome-settings-daemon.spec sources Removed Files: notify-statusicon.patch Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 5 Feb 2009 04:33:18 -0000 1.23 +++ .cvsignore 3 Mar 2009 01:45:18 -0000 1.24 @@ -1 +1 @@ -gnome-settings-daemon-2.25.90.tar.bz2 +gnome-settings-daemon-2.25.92.tar.bz2 Index: gnome-settings-daemon.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- gnome-settings-daemon.spec 24 Feb 2009 23:25:47 -0000 1.96 +++ gnome-settings-daemon.spec 3 Mar 2009 01:45:18 -0000 1.97 @@ -1,6 +1,6 @@ Name: gnome-settings-daemon -Version: 2.25.90 -Release: 3%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons @@ -38,9 +38,6 @@ # http://bugzilla.redhat.com/324721 #Patch11: gnome-settings-daemon-2.24.0-fix-touchpad.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=570590 -Patch12: notify-statusicon.patch - %description A daemon to share settings from GNOME to other applications. It also handles global keybindings, as well as a number of desktop-wide settings. @@ -62,7 +59,6 @@ %patch10 -p1 -b .catch-deviceadded # This one is buggy, stop using for now #%patch11 -p1 -b .fix-touchpad -%patch12 -p1 -b .notify-statusicon autoreconf -i -f @@ -164,6 +160,9 @@ %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Mon Mar 2 2009 Matthias Clasen - 2.25.92-1 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.90-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 5 Feb 2009 04:33:18 -0000 1.24 +++ sources 3 Mar 2009 01:45:18 -0000 1.25 @@ -1 +1 @@ -e50852ecd22ef956ac5ec5650683f2dd gnome-settings-daemon-2.25.90.tar.bz2 +0b3588da5366fb3978aa936ad2a2140c gnome-settings-daemon-2.25.92.tar.bz2 --- notify-statusicon.patch DELETED --- From oget at fedoraproject.org Tue Mar 3 01:46:44 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Tue, 3 Mar 2009 01:46:44 +0000 (UTC) Subject: rpms/rtaudio/devel import.log, NONE, 1.1 rtaudio-gcc44.patch, NONE, 1.1 rtaudio.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303014644.1EF8570117@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/rtaudio/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32434/devel Modified Files: .cvsignore sources Added Files: import.log rtaudio-gcc44.patch rtaudio.spec Log Message: * Sat Feb 28 2009 Orcan Ogetbil 4.0.5-3 - Don't remove the tests/Release directory * Fri Feb 27 2009 Orcan Ogetbil 4.0.5-2 - Build static library only * Tue Feb 24 2009 Orcan Ogetbil 4.0.5-1 - Initial build --- NEW FILE import.log --- rtaudio-4_0_5-3_fc10:HEAD:rtaudio-4.0.5-3.fc10.src.rpm:1236044738 rtaudio-gcc44.patch: --- NEW FILE rtaudio-gcc44.patch --- --- rtaudio-4.0.5.old/RtAudio.cpp 2009-01-30 13:50:01.000000000 -0500 +++ rtaudio-4.0.5/RtAudio.cpp 2009-02-26 16:51:34.000000000 -0500 @@ -45,7 +45,7 @@ #include #include #include - +#include // Static variable definitions. const unsigned int RtApi::MAX_SAMPLE_RATES = 14; const unsigned int RtApi::SAMPLE_RATES[] = { --- NEW FILE rtaudio.spec --- # Don't create a debuginfo package since it would be empty %define debug_package %{nil} Summary: Real-time Audio I/O Library Name: rtaudio Version: 4.0.5 Release: 3%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.music.mcgill.ca/~gary/rtaudio/ # The original tarball contains nonfree bits. We remove them and create a free tarball: # wget -N http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-4.0.5.tar.gz # tar zxf rtaudio-4.0.5.tar.gz # rm -fr rtaudio-4.0.5/include/ rtaudio-4.0.5/tests/Windows # tar zcf rtaudio-4.0.5-fe.tar.gz rtaudio-4.0.5 Source0: %{name}-%{version}-fe.tar.gz # Make rtaudio compilable against gcc-4.4 # https://sourceforge.net/tracker/index.php?func=detail&aid=2644431&group_id=162430&atid=823757 Patch1: rtaudio-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel jack-audio-connection-kit-devel doxygen %description RtAudio is a set of C++ classes that provide a common API for realtime audio input/output across different operating systems. RtAudio significantly simplifies the process of interacting with computer audio hardware. It was designed with the following objectives: * object-oriented C++ design * simple, common API across all supported platforms * allow simultaneous multi-api support * support dynamic connection of devices * provide extensive audio device parameter control * allow audio device capability probing * automatic internal conversion for data format, channel number compensation, (de)interleaving, and byte-swapping %package devel Summary: Real-time Audio I/O Library Group: System Environment/Libraries Provides: %{name}-static = %{version}-%{release} %description devel RtAudio is a set of C++ classes that provide a common API for realtime audio input/output across different operating systems. RtAudio significantly simplifies the process of interacting with computer audio hardware. It was designed with the following objectives: * object-oriented C++ design * simple, common API across all supported platforms * allow simultaneous multi-api support * support dynamic connection of devices * provide extensive audio device parameter control * allow audio device capability probing * automatic internal conversion for data format, channel number compensation, (de)interleaving, and byte-swapping %prep %setup -q %patch1 -p1 # We are going to build the doxygen documentation from source rm -fr doc/html # Remove empty directory rm -fr tests/Debug # To pass the optflags properly sed -i '/CFLAGS *=/d' Makefile.in # To fix the ppc64 compilation issue cp -p /usr/lib/rpm/config.{sub,guess} config/ %build export CFLAGS="%optflags -fPIC" %configure --with-jack --with-alsa make %{?_smp_mflags} # Doxygen documentation: pushd doc/doxygen doxygen popd %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_includedir} %{buildroot}%{_libdir} cp -a RtAudio.h RtError.h %{buildroot}%{_includedir} cp -a lib%{name}.a %{buildroot}%{_libdir} %clean rm -rf %{buildroot} %files devel %defattr(-,root,root,-) %doc readme doc/release.txt doc/html doc/images tests %{_includedir}/*.h %{_libdir}/lib%{name}.a %changelog * Sat Feb 28 2009 Orcan Ogetbil 4.0.5-3 - Don't remove the tests/Release directory * Fri Feb 27 2009 Orcan Ogetbil 4.0.5-2 - Build static library only * Tue Feb 24 2009 Orcan Ogetbil 4.0.5-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rtaudio/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:33:50 -0000 1.1 +++ .cvsignore 3 Mar 2009 01:46:13 -0000 1.2 @@ -0,0 +1 @@ +rtaudio-4.0.5-fe.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rtaudio/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:33:50 -0000 1.1 +++ sources 3 Mar 2009 01:46:13 -0000 1.2 @@ -0,0 +1 @@ +581f765e9b423d3ce2fc0c5ab51447dd rtaudio-4.0.5-fe.tar.gz From oget at fedoraproject.org Tue Mar 3 01:48:40 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Tue, 3 Mar 2009 01:48:40 +0000 (UTC) Subject: rpms/rtaudio/F-10 import.log, NONE, 1.1 rtaudio-gcc44.patch, NONE, 1.1 rtaudio.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303014840.3AAB870116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/rtaudio/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1270/F-10 Modified Files: .cvsignore sources Added Files: import.log rtaudio-gcc44.patch rtaudio.spec Log Message: * Sat Feb 28 2009 Orcan Ogetbil 4.0.5-3 - Don't remove the tests/Release directory * Fri Feb 27 2009 Orcan Ogetbil 4.0.5-2 - Build static library only * Tue Feb 24 2009 Orcan Ogetbil 4.0.5-1 - Initial build --- NEW FILE import.log --- rtaudio-4_0_5-3_fc10:F-10:rtaudio-4.0.5-3.fc10.src.rpm:1236044839 rtaudio-gcc44.patch: --- NEW FILE rtaudio-gcc44.patch --- --- rtaudio-4.0.5.old/RtAudio.cpp 2009-01-30 13:50:01.000000000 -0500 +++ rtaudio-4.0.5/RtAudio.cpp 2009-02-26 16:51:34.000000000 -0500 @@ -45,7 +45,7 @@ #include #include #include - +#include // Static variable definitions. const unsigned int RtApi::MAX_SAMPLE_RATES = 14; const unsigned int RtApi::SAMPLE_RATES[] = { --- NEW FILE rtaudio.spec --- # Don't create a debuginfo package since it would be empty %define debug_package %{nil} Summary: Real-time Audio I/O Library Name: rtaudio Version: 4.0.5 Release: 3%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.music.mcgill.ca/~gary/rtaudio/ # The original tarball contains nonfree bits. We remove them and create a free tarball: # wget -N http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-4.0.5.tar.gz # tar zxf rtaudio-4.0.5.tar.gz # rm -fr rtaudio-4.0.5/include/ rtaudio-4.0.5/tests/Windows # tar zcf rtaudio-4.0.5-fe.tar.gz rtaudio-4.0.5 Source0: %{name}-%{version}-fe.tar.gz # Make rtaudio compilable against gcc-4.4 # https://sourceforge.net/tracker/index.php?func=detail&aid=2644431&group_id=162430&atid=823757 Patch1: rtaudio-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel jack-audio-connection-kit-devel doxygen %description RtAudio is a set of C++ classes that provide a common API for realtime audio input/output across different operating systems. RtAudio significantly simplifies the process of interacting with computer audio hardware. It was designed with the following objectives: * object-oriented C++ design * simple, common API across all supported platforms * allow simultaneous multi-api support * support dynamic connection of devices * provide extensive audio device parameter control * allow audio device capability probing * automatic internal conversion for data format, channel number compensation, (de)interleaving, and byte-swapping %package devel Summary: Real-time Audio I/O Library Group: System Environment/Libraries Provides: %{name}-static = %{version}-%{release} %description devel RtAudio is a set of C++ classes that provide a common API for realtime audio input/output across different operating systems. RtAudio significantly simplifies the process of interacting with computer audio hardware. It was designed with the following objectives: * object-oriented C++ design * simple, common API across all supported platforms * allow simultaneous multi-api support * support dynamic connection of devices * provide extensive audio device parameter control * allow audio device capability probing * automatic internal conversion for data format, channel number compensation, (de)interleaving, and byte-swapping %prep %setup -q %patch1 -p1 # We are going to build the doxygen documentation from source rm -fr doc/html # Remove empty directory rm -fr tests/Debug # To pass the optflags properly sed -i '/CFLAGS *=/d' Makefile.in # To fix the ppc64 compilation issue cp -p /usr/lib/rpm/config.{sub,guess} config/ %build export CFLAGS="%optflags -fPIC" %configure --with-jack --with-alsa make %{?_smp_mflags} # Doxygen documentation: pushd doc/doxygen doxygen popd %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_includedir} %{buildroot}%{_libdir} cp -a RtAudio.h RtError.h %{buildroot}%{_includedir} cp -a lib%{name}.a %{buildroot}%{_libdir} %clean rm -rf %{buildroot} %files devel %defattr(-,root,root,-) %doc readme doc/release.txt doc/html doc/images tests %{_includedir}/*.h %{_libdir}/lib%{name}.a %changelog * Sat Feb 28 2009 Orcan Ogetbil 4.0.5-3 - Don't remove the tests/Release directory * Fri Feb 27 2009 Orcan Ogetbil 4.0.5-2 - Build static library only * Tue Feb 24 2009 Orcan Ogetbil 4.0.5-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rtaudio/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:33:50 -0000 1.1 +++ .cvsignore 3 Mar 2009 01:48:09 -0000 1.2 @@ -0,0 +1 @@ +rtaudio-4.0.5-fe.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rtaudio/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:33:50 -0000 1.1 +++ sources 3 Mar 2009 01:48:09 -0000 1.2 @@ -0,0 +1 @@ +581f765e9b423d3ce2fc0c5ab51447dd rtaudio-4.0.5-fe.tar.gz From mclasen at fedoraproject.org Tue Mar 3 01:50:20 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 01:50:20 +0000 (UTC) Subject: rpms/mousetweaks/devel .cvsignore, 1.18, 1.19 mousetweaks.spec, 1.24, 1.25 sources, 1.18, 1.19 Message-ID: <20090303015020.2C1A170116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/mousetweaks/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1733 Modified Files: .cvsignore mousetweaks.spec sources Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mousetweaks/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 19 Feb 2009 01:33:51 -0000 1.18 +++ .cvsignore 3 Mar 2009 01:49:49 -0000 1.19 @@ -1 +1 @@ -mousetweaks-2.25.91.tar.bz2 +mousetweaks-2.25.92.tar.bz2 Index: mousetweaks.spec =================================================================== RCS file: /cvs/pkgs/rpms/mousetweaks/devel/mousetweaks.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mousetweaks.spec 26 Feb 2009 02:49:26 -0000 1.24 +++ mousetweaks.spec 3 Mar 2009 01:49:49 -0000 1.25 @@ -1,6 +1,6 @@ Name: mousetweaks -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Summary: Mouse accessibility support for the GNOME desktop Group: User Interface/Desktops License: GPLv3 and GFDL @@ -27,7 +27,7 @@ %description The Mousetweaks package provides mouse accessibility enhancements for the GNOME desktop, such as performing various clicks without using any -hardware button. The options can be accessed through the Accessibility +hardware button. The options can be accessed through the Accessibility tab of the Mouse Preferences of GNOME Control Center or through command-line. @@ -66,16 +66,16 @@ %clean rm -rf $RPM_BUILD_ROOT -%pre +%pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` for f in %{_sysconfdir}/gconf/schemas/mouseweaks.schemas \ - %{_sysconfdir}/gconf/schemas/pointer-capture-applet.schemas ; - do - if [ -f $f ]; then - gconftool-2 --makefile-uninstall-rule $f >/dev/null - fi - done + %{_sysconfdir}/gconf/schemas/pointer-capture-applet.schemas ; + do + if [ -f $f ]; then + gconftool-2 --makefile-uninstall-rule $f >/dev/null + fi + done fi %post @@ -96,7 +96,7 @@ %files -f mousetweaks.lang %defattr(-,root,root,-) -%doc COPYING COPYING.FDL COPYING.GPL README NEWS +%doc COPYING COPYING.FDL COPYING.GPL README NEWS %{_sysconfdir}/gconf/schemas/mousetweaks.schemas %{_sysconfdir}/gconf/schemas/pointer-capture-applet.schemas %{_bindir}/dwell-click-applet @@ -108,6 +108,9 @@ %doc %{_mandir}/man1/* %changelog +* Mon Mar 2 2009 Matthias Clasen - 2.25.92-1 +- Update to 2.25.92 + * Wed Feb 25 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mousetweaks/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 19 Feb 2009 01:33:51 -0000 1.18 +++ sources 3 Mar 2009 01:49:49 -0000 1.19 @@ -1 +1 @@ -db6e6d50d18006f1fddebcc1609e5981 mousetweaks-2.25.91.tar.bz2 +b602d263bfa130fd7fc689adb8c7cd54 mousetweaks-2.25.92.tar.bz2 From rathann at fedoraproject.org Tue Mar 3 01:56:18 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Tue, 3 Mar 2009 01:56:18 +0000 (UTC) Subject: rpms/freefem++/devel freefem++-gcc44-link.patch, NONE, 1.1 freefem++-gcc44.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 freefem++-rpm.patch, 1.3, 1.4 freefem++.spec, 1.16, 1.17 sources, 1.6, 1.7 freefem++-gcc43.patch, 1.6, NONE Message-ID: <20090303015618.CC98170116@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/freefem++/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2898 Modified Files: .cvsignore freefem++-rpm.patch freefem++.spec sources Added Files: freefem++-gcc44-link.patch freefem++-gcc44.patch Removed Files: freefem++-gcc43.patch Log Message: * Thu Feb 26 2009 Dominik Mierzejewski 3.0-4.5 - update to 3.0-5 - fix build with gcc-4.4 - fix build with Fedora-mandated CFLAGS - sort BRs alphabetically freefem++-gcc44-link.patch: --- NEW FILE freefem++-gcc44-link.patch --- diff -up freefem++-3.0-5/src/fflib/Makefile.link freefem++-3.0-5/src/fflib/Makefile --- freefem++-3.0-5/src/fflib/Makefile.link 2009-03-03 02:39:02.000000000 +0100 +++ freefem++-3.0-5/src/fflib/Makefile 2009-03-03 02:39:52.000000000 +0100 @@ -464,7 +464,7 @@ libmesh5.obj: ../femlib/libmesh5.c # $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` Drawing.o: ../femlib/Drawing.cpp - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Drawing.o -MD -MP -MF $(DEPDIR)/Drawing.Tpo -c -o Drawing.o `test -f '../femlib/Drawing.cpp' || echo '$(srcdir)/'`../femlib/Drawing.cpp + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -O1 -MT Drawing.o -MD -MP -MF $(DEPDIR)/Drawing.Tpo -c -o Drawing.o `test -f '../femlib/Drawing.cpp' || echo '$(srcdir)/'`../femlib/Drawing.cpp mv -f $(DEPDIR)/Drawing.Tpo $(DEPDIR)/Drawing.Po # source='../femlib/Drawing.cpp' object='Drawing.o' libtool=no \ # DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ freefem++-gcc44.patch: --- NEW FILE freefem++-gcc44.patch --- diff -up freefem++-3.0-5/src/fflib/environment.cpp.gcc44 freefem++-3.0-5/src/fflib/environment.cpp --- freefem++-3.0-5/src/fflib/environment.cpp.gcc44 2008-12-12 15:17:22.000000000 +0100 +++ freefem++-3.0-5/src/fflib/environment.cpp 2009-02-27 00:55:12.000000000 +0100 @@ -57,7 +57,7 @@ const char BACKSLACH='\\'; string DirName(const char * f) { - char *c= strrchr(f,dirsep); + const char *c= strrchr(f,dirsep); if(!c) return string(""); else return string(f,strlen(f)-strlen(c)); } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/freefem++/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 11 Dec 2008 00:12:58 -0000 1.6 +++ .cvsignore 3 Mar 2009 01:55:48 -0000 1.7 @@ -1,2 +1,2 @@ FreeFem++.1 -freefem++-3.0-2.tar.gz +freefem++-3.0-5.tar.gz freefem++-rpm.patch: Index: freefem++-rpm.patch =================================================================== RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++-rpm.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- freefem++-rpm.patch 11 Dec 2008 00:12:58 -0000 1.3 +++ freefem++-rpm.patch 3 Mar 2009 01:55:48 -0000 1.4 @@ -1,6 +1,61 @@ -diff -up freefem++-3.0-2/configure.ac.r freefem++-3.0-2/configure.ac ---- freefem++-3.0-2/configure.ac.r 2008-12-09 23:56:07.000000000 +0100 -+++ freefem++-3.0-2/configure.ac 2008-12-10 23:27:23.000000000 +0100 +diff -up freefem++-3.0-5/acoptim.m4.r freefem++-3.0-5/acoptim.m4 +--- freefem++-3.0-5/acoptim.m4.r 2006-01-27 16:51:16.000000000 +0100 ++++ freefem++-3.0-5/acoptim.m4 2009-03-03 01:29:12.000000000 +0100 +@@ -16,14 +16,6 @@ AC_MSG_CHECKING(whether to generate debu + AC_ARG_ENABLE(debug,[ --enable-debug Turn on debug versions of FreeFem++]) + AC_ARG_ENABLE(optim,[ --enable-optim Turn on compiler optimization]) + +-# Autoconf always chooses -O2. -O2 in gcc makes some functions +-# disappear. This is not ideal for debugging. And when we optimize, we +-# do not use -O2 anyway. +- +-CFLAGS="`echo $CFLAGS | sed 's/-O2//g'`" +-FFLAGS="`echo $FFLAGS | sed 's/-O2//g'`" +-CXXFLAGS="`echo $CXXFLAGS | sed 's/-O2//g'`" +- + if test "$enable_debug" = yes; + then + AC_MSG_RESULT(yes) +@@ -32,9 +24,9 @@ else + + # No debugging information in optimized code + +- CFLAGS="`echo $CFLAGS | sed 's/-g//g'` -DNDEBUG" +- FFLAGS="`echo $FFLAGS | sed 's/-g//g'` -DNDEBUG" +- CXXFLAGS="`echo $CXXFLAGS | sed 's/-g//g'` -DNDEBUG" ++ CFLAGS="$CFLAGS -DNDEBUG" ++ FFLAGS="$FFLAGS -DNDEBUG" ++ CXXFLAGS="$CXXFLAGS -DNDEBUG" + fi + + # Hardware-independant optimization +@@ -68,6 +60,14 @@ if test "$enable_debug" != yes \ + -a "$enable_generic" != yes + then + ++# Autoconf always chooses -O2. -O2 in gcc makes some functions ++# disappear. This is not ideal for debugging. And when we optimize, we ++# do not use -O2 anyway. ++ ++CFLAGS="`echo $CFLAGS | sed 's/-O2//g'`" ++FFLAGS="`echo $FFLAGS | sed 's/-O2//g'`" ++CXXFLAGS="`echo $CXXFLAGS | sed 's/-O2//g'`" ++ + # MacOS X Darwin + if test -x /usr/bin/hostinfo + then +diff -up freefem++-3.0-5/configure.ac.r freefem++-3.0-5/configure.ac +--- freefem++-3.0-5/configure.ac.r 2009-01-20 20:56:56.000000000 +0100 ++++ freefem++-3.0-5/configure.ac 2009-03-03 01:31:15.000000000 +0100 +@@ -247,7 +247,7 @@ AC_DEFINE_UNQUOTED(VersionFreeFempp,$ff_ + # date is only useful for config-version.h + + test "$prefix" = NONE && prefix="$ac_default_prefix" +-ff_prefix_dir="${prefix}/lib/ff++/$VERSION" ++ff_prefix_dir="${libdir}/freefem++" + AC_MSG_CHECKING(prefix dir freefem++ ) + AC_MSG_RESULT($ff_prefix_dir) + @@ -344,10 +344,7 @@ ff_x11=no if test "$ff_mingw" = no && test "$with_x" != "no"; @@ -12,7 +67,7 @@ fi AC_MSG_RESULT($ff_x11) -@@ -1075,7 +1072,7 @@ then +@@ -1082,7 +1079,7 @@ then AC_CHECK_LIB(umfpack,umf_i_malloc, ff_umfpack_libs=" -lumfpack $ff_umfpack_libs" ff_umfpack_ok=yes,,$ff_umfpack_libs) @@ -21,32 +76,9 @@ AC_MSG_WARN([ Sorry we find UMFPACK lib but not the include umfpack.h file]) fi fi -diff -up freefem++-3.0-2/configure.r freefem++-3.0-2/configure ---- freefem++-3.0-2/configure.r 2008-12-09 23:16:21.000000000 +0100 -+++ freefem++-3.0-2/configure 2008-12-10 23:27:23.000000000 +0100 -@@ -7689,10 +7689,7 @@ ff_x11=no - - if test "$ff_mingw" = no && test "$with_x" != "no"; - then -- if test -d /usr/X11R6 -- then - ff_x11=yes -- fi - fi - - echo "$as_me:$LINENO: result: $ff_x11" >&5 -@@ -13728,7 +13725,7 @@ if test $ac_cv_lib_umfpack_umf_i_malloc - ff_umfpack_ok=yes - fi - -- if test "$ff_umfpack_ok" != yes -o "$ff_umfpack_header" != yes ; then -+ if test "$ff_umfpack_ok" = yes -a "$ff_umfpack_header" != yes ; then - { echo "$as_me:$LINENO: WARNING: Sorry we find UMFPACK lib but not the include umfpack.h file" >&5 - echo "$as_me: WARNING: Sorry we find UMFPACK lib but not the include umfpack.h file" >&2;} - fi -diff -up freefem++-3.0-2/examples++-load/load.link.r freefem++-3.0-2/examples++-load/load.link ---- freefem++-3.0-2/examples++-load/load.link.r 2008-12-09 17:03:50.000000000 +0100 -+++ freefem++-3.0-2/examples++-load/load.link 2008-12-10 23:27:23.000000000 +0100 +diff -up freefem++-3.0-5/examples++-load/load.link.in.r freefem++-3.0-5/examples++-load/load.link.in +--- freefem++-3.0-5/examples++-load/load.link.in.r 2009-01-20 20:56:57.000000000 +0100 ++++ freefem++-3.0-5/examples++-load/load.link.in 2009-03-03 01:04:15.000000000 +0100 @@ -5,9 +5,9 @@ FFVERSION='@VERSION@' FFCXXFLAGS='@CXXFLAGS@ @CPPFLAGS@' INCFF= @@ -58,78 +90,46 @@ +if [ "$FFCXXFLAGS" = '@CXXFLAGS@' ] ; then FFCXXFLAGS=""; fi +if [ "$FFVERSION" = '@VERSION@' ] ; then FFVERSION=""; fi if [ -z "$INCFF" ] ; then - if [ -d "@INCFF@/." ] ; then + if [ -f "@INCFF@/ff++.hpp" ] ; then INCFF="-I at INCFF@" @@ -15,8 +15,8 @@ if [ -z "$INCFF" ] ; then INCFF="-Iinclude" - elif [ -d "FFAPPLI_INC/." ] ; then + elif [ -f "FFAPPLI_INC/ff++.hpp" ] ; then INCFF="-IFFAPPLI_INC" -- elif [ -d '@ff_prefix_dir@/include/.' ] ; then +- elif [ -f '@ff_prefix_dir@/include/ff++.hpp' ] ; then - INCFF='-I at ff_prefix_dir@/include' -+ elif [ -d '@includedir@/freefem++/.' ] ; then ++ elif [ -f '@includedir@/freefem++/ff++.hpp' ] ; then + INCFF='-I at includedir@/freefem++' else echo " erreur PB include freefem++ directory " ; exit 1; -diff -up freefem++-3.0-2/examples++-load/Makefile.am.r freefem++-3.0-2/examples++-load/Makefile.am ---- freefem++-3.0-2/examples++-load/Makefile.am.r 2008-12-08 22:55:59.000000000 +0100 -+++ freefem++-3.0-2/examples++-load/Makefile.am 2008-12-10 23:27:23.000000000 +0100 -@@ -130,15 +130,15 @@ ff-c++:load.link - chmod a+x ff-c++ +diff -up freefem++-3.0-5/examples++-load/Makefile.am.r freefem++-3.0-5/examples++-load/Makefile.am +--- freefem++-3.0-5/examples++-load/Makefile.am.r 2009-01-06 20:30:40.000000000 +0100 ++++ freefem++-3.0-5/examples++-load/Makefile.am 2009-03-03 01:04:15.000000000 +0100 +@@ -132,13 +132,13 @@ load.link:load.link.in Makefile + chmod a+x load.link install-exec-local:: load_compile -- mkdir -p $(ff_prefix_dir)/lib -- mkdir -p $(ff_prefix_dir)/include -- mkdir -p $(ff_prefix_dir)/etc -- mkdir -p $(ff_prefix_dir)/edp -- $(INSTALL_DATA) include/* $(ff_prefix_dir)/include -- $(INSTALL) -m 555 $(LIST_COMPILE) $(ff_prefix_dir)/lib -- echo loadpath += \"$(ff_prefix_dir)/lib\" >$(ff_prefix_dir)/etc/freefem++.pref -- echo includepath += \"$(ff_prefix_dir)/edp\" >>$(ff_prefix_dir)/etc/freefem++.pref -- $(INSTALL_SCRIPT) ff-c++ ${bindir} -+ mkdir -p $(DESTDIR)$(libdir)/freefem++ -+ mkdir -p $(DESTDIR)$(includedir)/freefem++ -+ mkdir -p $(DESTDIR)$(sysconfdir) -+ mkdir -p $(DESTDIR)$(datadir)/freefem++/edp -+ $(INSTALL_DATA) include/* $(DESTDIR)$(includedir)/freefem++ -+ $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++ -+ echo loadpath += \"$(libdir)\" >$(DESTDIR)$(sysconfdir)/freefem++.pref -+ echo includepath += \"$(datadir)/freefem++/edp\" >>$(DESTDIR)$(sysconfdir)/freefem++.pref -+ $(INSTALL_SCRIPT) ff-c++ $(DESTDIR)$(bindir) - - - -diff -up freefem++-3.0-2/examples++-load/Makefile.in.r freefem++-3.0-2/examples++-load/Makefile.in ---- freefem++-3.0-2/examples++-load/Makefile.in.r 2008-12-09 23:56:08.000000000 +0100 -+++ freefem++-3.0-2/examples++-load/Makefile.in 2008-12-10 23:27:23.000000000 +0100 -@@ -606,15 +606,15 @@ ff-c++:load.link - chmod a+x ff-c++ - - install-exec-local:: load_compile -- mkdir -p $(ff_prefix_dir)/lib -- mkdir -p $(ff_prefix_dir)/include -- mkdir -p $(ff_prefix_dir)/etc -- mkdir -p $(ff_prefix_dir)/edp -- $(INSTALL_DATA) include/* $(ff_prefix_dir)/include -- $(INSTALL) -m 555 $(LIST_COMPILE) $(ff_prefix_dir)/lib -- echo loadpath += \"$(ff_prefix_dir)/lib\" >$(ff_prefix_dir)/etc/freefem++.pref -- echo includepath += \"$(ff_prefix_dir)/edp\" >>$(ff_prefix_dir)/etc/freefem++.pref -- $(INSTALL_SCRIPT) ff-c++ ${bindir} -+ mkdir -p $(DESTDIR)$(libdir)/freefem++ -+ mkdir -p $(DESTDIR)$(includedir)/freefem++ -+ mkdir -p $(DESTDIR)$(sysconfdir) -+ mkdir -p $(DESTDIR)$(datadir)/freefem++/edp -+ $(INSTALL_DATA) include/* $(DESTDIR)$(includedir)/freefem++ -+ $(INSTALL) -m 755 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++ -+ echo loadpath += \"$(libdir)\" >$(DESTDIR)$(sysconfdir)/freefem++.pref -+ echo includepath += \"$(datadir)/freefem++/edp\" >>$(DESTDIR)$(sysconfdir)/freefem++.pref -+ $(INSTALL_SCRIPT) ff-c++ $(DESTDIR)$(bindir) - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -diff -up freefem++-3.0-2/src/lglib/Makefile.am.r freefem++-3.0-2/src/lglib/Makefile.am ---- freefem++-3.0-2/src/lglib/Makefile.am.r 2006-04-10 22:51:52.000000000 +0200 -+++ freefem++-3.0-2/src/lglib/Makefile.am 2008-12-10 23:27:23.000000000 +0100 +- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/lib +- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/include +- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/etc +- $(INSTALL_DATA) include/* $(DESTDIR)$(ff_prefix_dir)/include +- $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib +- echo loadpath += \"$(ff_prefix_dir)/lib\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref +- echo includepath += \"$(ff_prefix_dir)/edp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref ++ $(mkinstalldirs) -m 755 $(DESTDIR)$(libdir)/freefem++ ++ $(mkinstalldirs) -m 755 $(DESTDIR)$(includedir)/freefem++ ++ $(mkinstalldirs) -m 755 $(DESTDIR)$(sysconfdir) ++ $(INSTALL_DATA) include/* $(DESTDIR)$(includedir)/freefem++ ++ $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++ ++ echo loadpath += \"$(ff_prefix_dir)/lib\" >$(DESTDIR)$(sysconfdir)/freefem++.pref ++ echo includepath += \"$(ff_prefix_dir)/edp\" >>$(DESTDIR)$(sysconfdir)/freefem++.pref + $(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir} + + +diff -up freefem++-3.0-5/src/lglib/Makefile.am.r freefem++-3.0-5/src/lglib/Makefile.am +--- freefem++-3.0-5/src/lglib/Makefile.am.r 2006-04-10 22:51:52.000000000 +0200 ++++ freefem++-3.0-5/src/lglib/Makefile.am 2009-03-03 01:04:15.000000000 +0100 @@ -9,9 +9,9 @@ INCLUDES=-I../fflib -I../bamglib -I../Gr BUILT_SOURCES=lg.tab.hpp lg.tab.cpp @@ -142,18 +142,3 @@ libfreefem++.dylib: lg.tab.o ../fflib/libff.a g++ -bundle lg.tab.o ../fflib/libff.a $(UMFPACKLIB) $(ARPACKLIB) $(BLASLIB) $(LIBS) -o libfreefem++.dylib EXTRA_DIST=lg.y -diff -up freefem++-3.0-2/src/lglib/Makefile.in.r freefem++-3.0-2/src/lglib/Makefile.in ---- freefem++-3.0-2/src/lglib/Makefile.in.r 2008-12-09 23:56:09.000000000 +0100 -+++ freefem++-3.0-2/src/lglib/Makefile.in 2008-12-10 23:27:23.000000000 +0100 -@@ -483,9 +483,9 @@ uninstall-am: uninstall-info-am - - - lg.tab.hpp lg.tab.cpp: lg.y -- -rm lg.tab.hpp lg.tab.cpp lg.tab.cpp.h -+ -rm -f lg.tab.hpp lg.tab.cpp lg.tab.cpp.h - bison -dtv -p lg $< -o lg.tab.cpp -- -mv lg.tab.cpp.h lg.tab.hpp # pour un pb entre des versions de bison -+ -mv -f lg.tab.cpp.h lg.tab.hpp - libfreefem++.dylib: lg.tab.o ../fflib/libff.a - g++ -bundle lg.tab.o ../fflib/libff.a $(UMFPACKLIB) $(ARPACKLIB) $(BLASLIB) $(LIBS) -o libfreefem++.dylib - # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: freefem++.spec =================================================================== RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- freefem++.spec 24 Feb 2009 18:18:55 -0000 1.16 +++ freefem++.spec 3 Mar 2009 01:55:48 -0000 1.17 @@ -1,18 +1,19 @@ -%define dotpl .3 -%define dashpl -2 +%define dotpl .5 +%define dashpl -5 Summary: PDE solving tool Name: freefem++ Version: 3.0 -Release: 3%{dotpl}%{?dist} +Release: 4%{dotpl}%{?dist} URL: http://www.freefem.org/ff++/index.htm Group: Applications/Engineering Source0: http://www.freefem.org/ff++/ftp/%{name}-%{version}%{dashpl}.tar.gz Source1: FreeFem++.1 Patch0: %{name}-rpm.patch -Patch1: %{name}-gcc43.patch +Patch1: %{name}-gcc44.patch Patch2: %{name}-name.patch Patch3: %{name}-tex.patch +Patch4: %{name}-gcc44-link.patch License: LGPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: arpack-devel @@ -25,12 +26,13 @@ BuildRequires: gcc-gfortran BuildRequires: glut-devel BuildRequires: ImageMagick +BuildRequires: lam-devel BuildRequires: lapack-devel BuildRequires: libGLU-devel +BuildRequires: libtool BuildRequires: libXpm-devel BuildRequires: libXt-devel BuildRequires: libXxf86vm-devel -BuildRequires: lam-devel BuildRequires: suitesparse-devel #BuildRequires: superlu-devel %{?_with_tetgen:BuildRequires: tetgen-devel} @@ -80,7 +82,7 @@ %prep %setup -q -n %{name}-%{version}%{dashpl} %patch0 -p1 -b .r -%patch1 -p1 -b .gcc43 +%patch1 -p1 -b .gcc44 %patch2 -p1 %patch3 -p1 -b .t find . -type f -perm 755 \( -name "*.c*" -o -name "*.h*" \) | xargs chmod 644 @@ -93,6 +95,8 @@ %build . /etc/profile.d/modules.sh module load %{_libdir}/lam/lam.module +export CFLAGS="$CFLAGS $RPM_OPT_FLAGS" +autoreconf -vif %configure \ INSTALL="%{__install} -p" \ --disable-download \ @@ -101,7 +105,10 @@ --with-blas="-L%{_libdir}/atlas -llapack -lf77blas -lcblas -latlas" \ --with-mpi=mpic++ -%{__make} CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} +# work around gcc44 bug +patch -p1 -b --suffix .gcc44-link < %{PATCH4} + +%{__make} %{?_smp_mflags} %{__make} documentation %install @@ -154,6 +161,12 @@ %{_bindir}/FreeFem++-mpi %changelog +* Thu Feb 26 2009 Dominik Mierzejewski 3.0-4.5 +- update to 3.0-5 +- fix build with gcc-4.4 +- fix build with Fedora-mandated CFLAGS +- sort BRs alphabetically + * Tue Feb 24 2009 Fedora Release Engineering - 3.0-3.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/freefem++/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 11 Dec 2008 00:12:58 -0000 1.6 +++ sources 3 Mar 2009 01:55:48 -0000 1.7 @@ -1,2 +1,2 @@ f1accc292794bbafb66e963080f9d15b FreeFem++.1 -75b7e8faae3afe01a6800a523ebb54f6 freefem++-3.0-2.tar.gz +fcdaff128c57fb95427954cbe2f52a61 freefem++-3.0-5.tar.gz --- freefem++-gcc43.patch DELETED --- From spot at fedoraproject.org Tue Mar 3 02:00:07 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Mar 2009 02:00:07 +0000 (UTC) Subject: rpms/graphviz/devel graphviz.spec,1.54,1.55 Message-ID: <20090303020007.7AE5170116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/graphviz/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3833 Modified Files: graphviz.spec Log Message: fix this package up Index: graphviz.spec =================================================================== RCS file: /cvs/pkgs/rpms/graphviz/devel/graphviz.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- graphviz.spec 27 Feb 2009 14:25:33 -0000 1.54 +++ graphviz.spec 3 Mar 2009 01:59:37 -0000 1.55 @@ -1,607 +1,215 @@ -# $Id$ $Revision$ -# graphviz.spec. Generated from graphviz.spec.in by configure. - -# Note: pre gd-2.0.34 graphviz uses its own gd tree with gif support and other fixes - -#-- Global graphviz rpm and src.rpm tags------------------------------------- -Name: graphviz -Summary: Graph Visualization Tools -Version: 2.20.3 - -%define truerelease 2 -%{?distroagnostic: %define release %{truerelease}} -%{!?distroagnostic: %define release %{truerelease}%{?dist}} - -Release: %{?release}.3 - -Group: Applications/Multimedia -License: CPL -URL: http://www.graphviz.org/ -Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz -Patch0: graphviz-2.20.3-configure-php.patch -Patch1: graphviz-2.20.3-gv.i.patch - - -# graphviz is relocatable - Caution: this feature is used in AT&T, -# but probably will not be supported in Redhat/Fedora/Centos distros -#Prefix: /usr - -#-- feature and package selection ------------------------------------------- -# depends on %dist and %fedora (or %rhl or %rhel) which are set -# in .rpmmacros on each build host - -# Define a default set of features incase none of the conditionals apply -%define SHARP 0 -%define GUILE 0 -%define _IO 0 -%define JAVA 0 -%define LUA 0 -%define OCAML 0 -%define PERL 0 -%define PHP 0 -%define PYTHON 0 -%define RUBY 0 -%define R_LANG 0 -%define TCL 1 -%define IPSEPCOLA --without-ipsepcola -%define MYLIBGD --with-mylibgd -%define PANGOCAIRO --without-pangocairo -%define DEVIL 0 -%define MING 0 -%define GDK_PIXBUF --without-gdk-pixbuf - -# SuSE uses a different mechanism to generate BuildRequires -# norootforbuild -# neededforbuild expat freetype2 freetype2-devel gcc libjpeg libpng-devel-packages tcl tcl-devel tk tk-devel x-devel-packages - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: zlib-devel libpng-devel libjpeg-devel expat-devel freetype-devel >= 2 -BuildRequires: /bin/ksh bison m4 flex tk tcl >= 8.3 swig - -# This just indicates the requirement for tcl.h, tk.h, but doesn't identify -# where to get them from. In RH9 and earlier they were in the tcl, tk, -# base packages which are always BR'd anyway (above). -BuildRequires: /usr/include/tcl.h /usr/include/tk.h - -#-- Red Hat Linux specific Build Requirements ------------------------------- -%if 0%{?rhl} -%define TCL 1 -BuildRequires: XFree86-devel -%endif - -#-- Red Hat Enterprise Linux specific Build Requirements -------------------- -%if 0%{?rhel} -%define TCL 1 -%if}0%{?rhel} < 4 -BuildRequires: XFree86-devel -%endif -%if 0%{?rhel} >= 3 -%define IPSEPCOLA --with-ipsepcola -BuildRequires: fontconfig-devel tcl-devel tk-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?rhel} >= 4 -# PERL is available earlier, but a suitable SWIG isn't -%define PERL 1 -%define RUBY 1 -%define GUILE 1 -%define PYTHON 1 -BuildRequires: perl ruby-devel guile-devel python-devel -%endif -%if 0%{?rhel} >= 5 -%define JAVA 1 -%define PANGOCAIRO --with-pangocairo -BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel -BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel libgnomeui-devel -%endif -%if 0%{?rhel} >= 6 -%define PHP 1 -%define MYLIBGD --without-mylibgd -%define GDK_PIXBUF --with-gdk-pixbuf -BuildRequires: gd gd-devel perl-devel php-devel -%endif -%endif - -#-- Fedora specific Build Requirements -------------------------------------- -%if 0%{?fedora} -%define PERL 1 -%define TCL 1 -BuildRequires: fontconfig-devel tcl-devel tk-devel -%if 0%{?fedora} < 3 -BuildRequires: XFree86-devel -%endif -%if 0%{?fedora} == 3 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?fedora} == 4 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?fedora} >= 3 -%define IPSEPCOLA --with-ipsepcola -%endif -%if 0%{?fedora} >= 4 -%define RUBY 1 -%define GUILE 1 -%define PYTHON 1 -BuildRequires: libtool-ltdl libtool-ltdl-devel ruby ruby-devel guile-devel python-devel -%endif -%if 0%{?fedora} >= 5 -%define PHP 1 -%define JAVA 1 -BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel php-devel -%ifnarch ppc64 s390 s390x -%define SHARP 1 -%define OCAML 1 -BuildRequires: mono-core ocaml -%endif -%endif -%if 0%{?fedora} >= 6 -%define LUA 1 -%define PANGOCAIRO --with-pangocairo -BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel libgnomeui-devel -%endif -%if 0%{?fedora} >= 7 -%define DEVIL 1 -%define MYLIBGD --without-mylibgd -%define GDK_PIXBUF --with-gdk-pixbuf -BuildRequires: gd gd-devel perl-devel DevIL-devel -%endif -%if 0%{?fedora} >= 8 -%define R_LANG 1 -BuildRequires: R-devel swig >= 1.3.33 -%endif -%if 0%{?fedora} >= 9 -%define MING 0 -#BuildRequires: ming ming-devel -%endif -%endif - -#-- main graphviz rpm ------------------------------------------------ -Requires: urw-fonts -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - -%description -A collection of tools for the manipulation and layout -of graphs (as in nodes and edges, not as in barcharts). - -# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config -%post -/sbin/ldconfig -%{_bindir}/dot -c - -# if there is no dot after everything else is done, then remove config -%postun -if [ $1 -eq 0 ]; then - rm -f %{_libdir}/graphviz/config || : -fi -/sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog NEWS README -%{_bindir}/* -%dir %{_libdir}/graphviz -%{_libdir}/*.so.* -%{_libdir}/graphviz/*.so.* -%{_mandir}/man1/*.1* -%{_mandir}/man7/*.7* -%dir %{_datadir}/graphviz -%{_datadir}/graphviz/lefty -%exclude %{_libdir}/graphviz/*/* -%exclude %{_libdir}/graphviz/libgvplugin_gd.* -%if %{DEVIL} -%exclude %{_libdir}/graphviz/libgvplugin_devil.* -%endif -%if %{MING} -%exclude %{_libdir}/graphviz/libgvplugin_ming.* -%exclude %{_libdir}/graphviz/*fdb +Name: graphviz +Summary: Graph Visualization Tools +Version: 2.20.3 +Release: 3%{?dist} +Group: Applications/Multimedia +License: CPL +URL: http://www.graphviz.org/ +Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz +Patch0: graphviz-2.20.3-configure-php.patch +Patch1: graphviz-2.20.3-gv.i.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2 +BuildRequires: /bin/ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig +BuildRequires: fontconfig-devel, libtool-ltdl-devel, ruby-devel, ruby, guile-devel, python-devel +BuildRequires: libXaw-devel, libSM-devel, libXext-devel, java-devel, php-devel +BuildRequires: cairo-devel >= 1.1.10, pango-devel, gmp-devel, lua-devel, gtk2-devel, libgnomeui-devel +BuildRequires: gd-devel, perl-devel, DevIL-devel, R-devel, swig >= 1.3.33 +%ifnarch ppc64 s390 s390x sparc64 +BuildRequires: mono-core, ocaml +%endif +Requires: urw-fonts +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +# Necessary conditionals +%ifarch ppc64 s390 s390x sparc64 +%global SHARP 0 +%global OCAML 0 +%else +%global SHARP 1 +%global OCAML 1 %endif +# Not in Fedora yet. +%global MING 0 -#-- graphviz-gd rpm -------------------------------------------------- -%package gd -Group: Applications/Multimedia -Summary: Graphviz plugin for renderers based on gd -Requires: graphviz = %{version}-%{release} -Requires(post): %{_bindir}/dot /sbin/ldconfig -Requires(postun): %{_bindir}/dot /sbin/ldconfig - -%description gd -Graphviz plugin for renderers based on gd. (Unless you absolutely have -to use GIF, you are recommended to use the PNG format instead because -of the better quality anti-aliased lines provided by the cairo+pango -based renderer.) - -# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config -%post gd -/sbin/ldconfig -%{_bindir}/dot -c +%description +A collection of tools for the manipulation and layout of graphs (as in nodes +and edges, not as in barcharts). -%postun gd -/sbin/ldconfig -[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : +%package devel +Group: Development/Libraries +Summary: Development package for graphviz +Requires: %{name} = %{version}-%{release}, pkgconfig -%files gd -%{_libdir}/graphviz/libgvplugin_gd.so.* +%description devel +A collection of tools for the manipulation and layout of graphs (as in nodes +and edges, not as in barcharts). This package contains development files for +graphviz. -#-- graphviz-devil rpm -------------------------------------------------- -%if %{DEVIL} %package devil -Group: Applications/Multimedia -Summary: Graphviz plugin for renderers based on DevIL -Requires: graphviz = %{version}-%{release} +Group: Applications/Multimedia +Summary: Graphviz plugin for renderers based on DevIL +Requires: %{name} = %{version}-%{release} %description devil -Graphviz plugin for renderers based on DevIL. (Unless you absolutely have +Graphviz plugin for renderers based on DevIL. (Unless you absolutely have to use BMP, TIF, or TGA, you are recommended to use the PNG format instead supported directly by the cairo+pango based renderer in the base graphviz rpm.) -# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config -%post devil -%{_bindir}/dot -c - -%postun devil -[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : - -%files devil -%{_libdir}/graphviz/libgvplugin_devil.so.* -%endif - -#-- graphviz-ming rpm -------------------------------------------------- -%if %{MING} -%package ming -Group: Applications/Multimedia -Summary: Graphviz plugin for flash renderer based on ming -Requires: graphviz = %{version}-%{release} - -%description ming -Graphviz plugin for -Tswf (flash) renderer based on ming. - -# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config -%post ming -%{_bindir}/dot -c +%package doc +Group: Documentation +Summary: PDF and HTML documents for graphviz -%postun ming -[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : +%description doc +Provides some additional PDF and HTML documentation for graphviz. -%files ming -%{_libdir}/graphviz/libgvplugin_ming.so.* -%{_libdir}/graphviz/*fdb -%endif +%package gd +Group: Applications/Multimedia +Summary: Graphviz plugin for renderers based on gd +Requires: %{name} = %{version}-%{release} +Requires(post): %{_bindir}/dot /sbin/ldconfig +Requires(postun): %{_bindir}/dot /sbin/ldconfig -#-- graphviz-sharp rpm -------------------------------------------- -%if %{SHARP} -%package sharp -Group: Applications/Multimedia -Summary: C# extension for graphviz -Requires: graphviz = %{version}-%{release} mono-core +%description gd +Graphviz plugin for renderers based on gd. (Unless you absolutely have to use +GIF, you are recommended to use the PNG format instead because of the better +quality anti-aliased lines provided by the cairo+pango based renderer.) -%description sharp -C# extension for graphviz. +%package graphs +Group: Applications/Multimedia +Summary: Demo graphs for graphviz -%files sharp -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/sharp -%{_libdir}/graphviz/sharp/* -%{_mandir}/mann/gv_sharp.n* -%endif +%description graphs +Some demo graphs for graphviz. -#-- graphviz-guile rpm -------------------------------------------- -%if %{GUILE} %package guile -Group: Applications/Multimedia -Summary: Guile extension for graphviz -Requires: graphviz = %{version}-%{release} guile +Group: Applications/Multimedia +Summary: Guile extension for graphviz +Requires: %{name} = %{version}-%{release}, guile %description guile Guile extension for graphviz. -%files guile -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/guile -%{_libdir}/graphviz/guile/* -%{_mandir}/mann/gv_guile.n* -%endif - -#-- graphviz-io rpm ----------------------------------------------- -%if %{_IO} -%package io -Group: Applications/Multimedia -Summary: Io extension for graphviz -Requires: graphviz = %{version}-%{release} io - -%description io -Io extension for graphviz. - -%files io -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/io -%{_libdir}/graphviz/io/* -%{_mandir}/mann/gv_io.n* -%endif - -#-- graphviz-java rpm --------------------------------------------- -%if %{JAVA} %package java -Group: Applications/Multimedia -Summary: Java extension for graphviz -Requires: graphviz = %{version}-%{release} java +Group: Applications/Multimedia +Summary: Java extension for graphviz +Requires: %{name} = %{version}-%{release} %description java Java extension for graphviz. -%files java -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/java -%{_libdir}/graphviz/java/* -%{_mandir}/mann/gv_java.n* -%endif - -#-- graphviz-lua rpm ---------------------------------------------- -%if %{LUA} %package lua -Group: Applications/Multimedia -Summary: Lua extension for graphviz -Requires: graphviz = %{version}-%{release} lua +Group: Applications/Multimedia +Summary: Lua extension for graphviz +Requires: %{name} = %{version}-%{release}, lua %description lua Lua extension for graphviz. -%files lua -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/lua -%{_libdir}/graphviz/lua/* -%{_libdir}/lua*/* -%{_mandir}/mann/gv_lua.n* +%if %{MING} +%package ming +Group: Applications/Multimedia +Summary: Graphviz plugin for flash renderer based on ming +Requires: %{name} = %{version}-%{release} + +%description ming +Graphviz plugin for -Tswf (flash) renderer based on ming. %endif -#-- graphviz-ocaml rpm -------------------------------------------- %if %{OCAML} %package ocaml -Group: Applications/Multimedia -Summary: Ocaml extension for graphviz -Requires: graphviz = %{version}-%{release} ocaml +Group: Applications/Multimedia +Summary: Ocaml extension for graphviz +Requires: %{name} = %{version}-%{release}, ocaml %description ocaml Ocaml extension for graphviz. - -%files ocaml -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/ocaml -%{_libdir}/graphviz/ocaml/* -%{_mandir}/mann/gv_ocaml.n* %endif -#-- graphviz-perl rpm --------------------------------------------- -%if %{PERL} %package perl -Group: Applications/Multimedia -Summary: Perl extension for graphviz -Requires: graphviz = %{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Group: Applications/Multimedia +Summary: Perl extension for graphviz +Requires: %{name} = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl Perl extension for graphviz. -%files perl -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/perl -%{_libdir}/graphviz/perl/* -%{_libdir}/perl*/* -%{_mandir}/mann/gv_perl.n* -%endif - -#-- graphviz-php rpm ---------------------------------------------- -%if %{PHP} %package php -Group: Applications/Multimedia -Summary: PHP extension for graphviz -Requires: graphviz = %{version}-%{release} php +Group: Applications/Multimedia +Summary: PHP extension for graphviz +Requires: %{name} = %{version}-%{release}, php %description php PHP extension for graphviz. -%files php -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/php -%{_libdir}/graphviz/php/* -%{_libdir}/php*/* -%{_datadir}/php*/* -%{_mandir}/mann/gv_php.n* -%endif - -#-- graphviz-python rpm ------------------------------------------- -%if %{PYTHON} %package python -Group: Applications/Multimedia -Summary: Python extension for graphviz -Requires: graphviz = %{version}-%{release} python +Group: Applications/Multimedia +Summary: Python extension for graphviz +Requires: %{name} = %{version}-%{release}, python %description python Python extension for graphviz. -%files python -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/python -%{_libdir}/graphviz/python/* -%{_libdir}/python*/* -%{_mandir}/mann/gv_python.n* -%endif - -#-- graphviz-r rpm --------------------------------------------- -%if %{R_LANG} %package R -Group: Applications/Multimedia -Summary: R extension for graphviz -Requires: graphviz = %{version}-%{release} R-core +Group: Applications/Multimedia +Summary: R extension for graphviz +Requires: %{name} = %{version}-%{release}, R-core %description R R extension for graphviz. -%files R -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/R -%{_libdir}/graphviz/R/* -%{_mandir}/mann/gv_R.n* -%endif - -#-- graphviz-ruby rpm --------------------------------------------- -%if %{RUBY} %package ruby -Group: Applications/Multimedia -Summary: Ruby extension for graphviz -Requires: graphviz = %{version}-%{release} ruby +Group: Applications/Multimedia +Summary: Ruby extension for graphviz +Requires: %{name} = %{version}-%{release}, ruby %description ruby Ruby extension for graphviz. -%files ruby -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/ruby -%{_libdir}/graphviz/ruby/* -%{_libdir}/*ruby*/* -%{_mandir}/mann/gv_ruby.n* +%if %{SHARP} +%package sharp +Group: Applications/Multimedia +Summary: C# extension for graphviz +Requires: %{name} = %{version}-%{release}, mono-core + +%description sharp +C# extension for graphviz. %endif -#-- graphviz-tcl rpm ---------------------------------------------- -%if %{TCL} %package tcl -Group: Applications/Multimedia -Summary: Tcl extension & tools for graphviz -Requires: graphviz = %{version}-%{release} tcl >= 8.3 tk +Group: Applications/Multimedia +Summary: Tcl extension & tools for graphviz +Requires: %{name} = %{version}-%{release}, tcl >= 8.3, tk %description tcl Various tcl packages (extensions) for the graphviz tools. -%files tcl -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/tcl -%{_libdir}/graphviz/tcl/* -%{_libdir}/tcl*/* -%{_datadir}/graphviz/demo/ -# hack to include gv_tcl.n only if available -# always includes tcldot.n, gdtclft.n -%{_mandir}/mann/*tcl*.n* -%{_mandir}/mann/tkspline.n* -%endif - -#-- graphviz-devel rpm -------------------------------------------- -%package devel -Group: Development/Libraries -Summary: Development package for graphviz -Requires: graphviz = %{version}-%{release} pkgconfig - -%description devel -A collection of tools for the manipulation and layout -of graphs (as in nodes and edges, not as in barcharts). -This package contains development files for graphviz. - -%files devel -%defattr(-,root,root,-) -%{_includedir}/graphviz -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc -%{_mandir}/man3/*.3* -%exclude %{_libdir}/graphviz/*/* -%exclude %{_libdir}/graphviz/libgvplugin* -%exclude %{_libdir}/graphviz/*.so - -#-- graphviz-graphs rpm ------------------------------------------- -%package graphs -Group: Applications/Multimedia -Summary: Demo graphs for graphviz - -%description graphs -Some demo graphs for graphviz. - -%files graphs -%defattr(-,root,root,-) -%dir %{_datadir}/graphviz -%{_datadir}/graphviz/graphs - -#-- graphviz-doc rpm ---------------------------------------------- -%package doc -Group: Documentation -Summary: PDF and HTML documents for graphviz - -%description doc -Provides some additional PDF and HTML documentation for graphviz. - -%files doc -%defattr(-,root,root,-) -%doc __doc/* - -#-- building -------------------------------------------------- - %prep %setup -q %patch0 -p1 %patch1 -p1 %build +# %%define NO_IO --disable-io + +# XXX ix86 only used to have -ffast-math, let's use everywhere +%{expand: %%define optflags %{optflags} -ffast-math} +# Hack in the java includes we need +sed -i '/JavaVM.framework/!s/JAVA_INCLUDES=/JAVA_INCLUDES=\"_MY_JAVA_INCLUDES_\"/g' configure +sed -i 's|_MY_JAVA_INCLUDES_|-I%{java_home}/include/ -I%{java_home}/include/linux/|g' configure +%configure --with-x --disable-static --disable-dependency-tracking --without-mylibgd --with-ipsepcola --with-pangocairo --with-gdk-pixbuf \ %if ! %{SHARP} -%define NO_SHARP --disable-sharp -%endif -%if ! %{GUILE} -%define NO_GUILE --disable-guile -%endif -%if ! %{_IO} -%define NO_IO --disable-io -%endif -%if ! %{JAVA} -%define NO_JAVA --disable-java -%endif -%if ! %{LUA} -%define NO_LUA --disable-lua + --disable-sharp \ %endif %if ! %{OCAML} -%define NO_OCAML --disable-ocaml -%endif -%if ! %{PERL} -%define NO_PERL --disable-perl -%endif -%if ! %{PHP} -%define NO_PHP --disable-php -%endif -%if ! %{PYTHON} -%define NO_PYTHON --disable-python -%endif -%if ! %{R_LANG} -%define NO_R_LANG --disable-r -%endif -%if ! %{RUBY} -%define NO_RUBY --disable-ruby -%endif -%if ! %{TCL} -%define NO_TCL --disable-tcl -%endif -%if ! %{DEVIL} -%define NO_DEVIL --without-devil + --disable-ocaml \ %endif %if ! %{MING} -%define NO_MING --without-ming + --without-ming \ %endif -# XXX ix86 only used to have -ffast-math, let's use everywhere -%{expand: %%define optflags %{optflags} -ffast-math} - -# %%configure is broken in RH7.3 rpmbuild -CFLAGS="$RPM_OPT_FLAGS" \ -./configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --includedir=%{_includedir} \ - --datadir=%{_datadir} \ - --mandir=%{_mandir} \ - --with-x \ - --disable-static \ - --disable-dependency-tracking \ - %{MYLIBGD} %{IPSEPCOLA} %{PANGOCAIRO} %{GDK_PIXBUF} \ - %{?NO_SHARP} %{?NO_GUILE} %{?NO_IO} %{?NO_JAVA} %{?NO_LUA} %{?NO_OCAML} %{?NO_PERL} %{?NO_PHP} %{?NO_PYTHON} %{?NO_R_LANG} %{?NO_RUBY} %{?NO_TCL} %{?NO_DEVIL} %{?NO_MING} make %{?_smp_mflags} %install @@ -615,16 +223,179 @@ cp -a %{buildroot}%{_datadir}/%{name}/doc __doc rm -rf %{buildroot}%{_datadir}/%{name}/doc -%clean -# regression test +%check +%ifnarch ppc64 ppc +# regression test, segfaults on ppc/ppc64, possible endian issues? cd rtest make rtest -# clean up temporary installation +%endif + +%clean rm -rf %{buildroot} -#-- changelog -------------------------------------------------- +%post +/sbin/ldconfig +%{_bindir}/dot -c + +# if there is no dot after everything else is done, then remove config +%postun +if [ $1 -eq 0 ]; then + rm -f %{_libdir}/graphviz/config || : +fi +/sbin/ldconfig + +# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config +%post devil +%{_bindir}/dot -c + +%postun devil +[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : + +%post gd +/sbin/ldconfig +%{_bindir}/dot -c + +%postun gd +/sbin/ldconfig +[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : + +%if %{MING} +# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config +%post ming +%{_bindir}/dot -c + +%postun ming +[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : +%endif + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog NEWS README +%{_bindir}/* +%dir %{_libdir}/graphviz +%{_libdir}/*.so.* +%{_libdir}/graphviz/*.so.* +%{_mandir}/man1/*.1* +%{_mandir}/man7/*.7* +%dir %{_datadir}/graphviz +%{_datadir}/graphviz/lefty +%exclude %{_libdir}/graphviz/*/* +%exclude %{_libdir}/graphviz/libgvplugin_gd.* +%exclude %{_libdir}/graphviz/libgvplugin_devil.* +%if %{MING} +%exclude %{_libdir}/graphviz/libgvplugin_ming.* +%exclude %{_libdir}/graphviz/*fdb +%endif + +%files devel +%defattr(-,root,root,-) +%{_includedir}/graphviz +%{_libdir}/*.so +%{_libdir}/graphviz/*.so +%{_libdir}/pkgconfig/*.pc +%{_mandir}/man3/*.3* + +%files devil +%defattr(-,root,root,-) +%{_libdir}/graphviz/libgvplugin_devil.so.* + +%files doc +%defattr(-,root,root,-) +%doc __doc/* + +%files gd +%defattr(-,root,root,-) +%{_libdir}/graphviz/libgvplugin_gd.so.* + +%files graphs +%defattr(-,root,root,-) +%dir %{_datadir}/graphviz +%{_datadir}/graphviz/graphs + +%files guile +%defattr(-,root,root,-) +%{_libdir}/graphviz/guile/ +%{_mandir}/mann/gv_guile.n* + +%files java +%defattr(-,root,root,-) +%{_libdir}/graphviz/java/ +%{_mandir}/mann/gv_java.n* + +%files lua +%defattr(-,root,root,-) +%{_libdir}/graphviz/lua/ +%{_libdir}/lua*/* +%{_mandir}/mann/gv_lua.n* + +%if %{MING} +%files ming +%defattr(-,root,root,-) +%{_libdir}/graphviz/libgvplugin_ming.so.* +%{_libdir}/graphviz/*fdb +%endif + +%if %{OCAML} +%files ocaml +%defattr(-,root,root,-) +%{_libdir}/graphviz/ocaml/ +%{_mandir}/mann/gv_ocaml.n* +%endif + +%files perl +%defattr(-,root,root,-) +%{_libdir}/graphviz/perl/ +%{_libdir}/perl*/* +%{_mandir}/mann/gv_perl.n* + +%files php +%defattr(-,root,root,-) +%{_libdir}/graphviz/php/ +%{_libdir}/php*/* +%{_datadir}/php*/* +%{_mandir}/mann/gv_php.n* + +%files python +%defattr(-,root,root,-) +%{_libdir}/graphviz/python/ +%{_libdir}/python*/* +%{_mandir}/mann/gv_python.n* + +%files R +%defattr(-,root,root,-) +%{_libdir}/graphviz/R/ +%{_mandir}/mann/gv_R.n* + +%files ruby +%defattr(-,root,root,-) +%{_libdir}/graphviz/ruby/ +%{_libdir}/*ruby*/* +%{_mandir}/mann/gv_ruby.n* + +%if %{SHARP} +%files sharp +%defattr(-,root,root,-) +%{_libdir}/graphviz/sharp/ +%{_mandir}/mann/gv_sharp.n* +%endif + +%files tcl +%defattr(-,root,root,-) +%{_libdir}/graphviz/tcl/ +%{_libdir}/tcl*/* +%{_datadir}/graphviz/demo/ +# hack to include gv_tcl.n only if available +# always includes tcldot.n, gdtclft.n +%{_mandir}/mann/*tcl*.n* +%{_mandir}/mann/tkspline.n* + %changelog +* Mon Mar 2 2009 Tom "spot" Callaway 2.20.3-3 +- this spec makes baby animals cry... massively clean it up +- hack in java includes to build against openjdk +- add ruby as a BuildRequires (configure checks for /usr/bin/ruby) + * Wed Feb 25 2009 John Ellson 2.20.3-2.2 - fixes for swig changes From rathann at fedoraproject.org Tue Mar 3 02:00:29 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Tue, 3 Mar 2009 02:00:29 +0000 (UTC) Subject: rpms/freefem++/devel freefem++.spec,1.17,1.18 Message-ID: <20090303020029.A789F70116@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/freefem++/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4030 Modified Files: freefem++.spec Log Message: - try and enable testsuite Index: freefem++.spec =================================================================== RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- freefem++.spec 3 Mar 2009 01:55:48 -0000 1.17 +++ freefem++.spec 3 Mar 2009 01:59:59 -0000 1.18 @@ -120,15 +120,11 @@ %clean rm -rf $RPM_BUILD_ROOT -%if 0 -%ifnarch ppc64 %check . /etc/profile.d/modules.sh module load %{_libdir}/lam/lam.module %{__make} check pkill lamd -%endif -%endif %files %defattr(-,root,root,-) From mclasen at fedoraproject.org Tue Mar 3 02:02:04 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 02:02:04 +0000 (UTC) Subject: rpms/gtk2-engines/devel .cvsignore, 1.61, 1.62 gtk2-engines.spec, 1.106, 1.107 sources, 1.62, 1.63 Message-ID: <20090303020204.CB16570116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gtk2-engines/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4814 Modified Files: .cvsignore gtk2-engines.spec sources Log Message: 2.17.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtk2-engines/devel/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- .cvsignore 18 Feb 2009 02:45:10 -0000 1.61 +++ .cvsignore 3 Mar 2009 02:01:34 -0000 1.62 @@ -1 +1 @@ -gtk-engines-2.17.3.tar.bz2 +gtk-engines-2.17.4.tar.bz2 Index: gtk2-engines.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk2-engines/devel/gtk2-engines.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- gtk2-engines.spec 25 Feb 2009 01:56:39 -0000 1.106 +++ gtk2-engines.spec 3 Mar 2009 02:01:34 -0000 1.107 @@ -2,8 +2,8 @@ Summary: Theme engines for GTK+ 2.0 Name: gtk2-engines -Version: 2.17.3 -Release: 2%{?dist} +Version: 2.17.4 +Release: 1%{?dist} # for details on which engines are GPL vs LGPL, see COPYING License: LGPLv2+ Group: System Environment/Libraries @@ -21,7 +21,7 @@ BuildRequires: pkgconfig URL: http://download.gnome.org/sources/gtk-engines -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package devel Summary: Development files for %{name} @@ -30,7 +30,7 @@ Requires: pkgconfig %description devel -The gtk2-engines-devel package contains files needed to develop +The gtk2-engines-devel package contains files needed to develop software that uses the theme engines in the gtk2-engines package. @@ -38,7 +38,7 @@ The gtk2-engines package contains shared objects and configuration files that implement a number of GTK+ theme engines. Theme engines provide different looks for GTK+, some of which resemble other -toolkits or operating systems. +toolkits or operating systems. %prep %setup -q -n gtk-engines-%{version} @@ -53,7 +53,7 @@ make install DESTDIR=$RPM_BUILD_ROOT # no .la, please -find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs rm +find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs rm # sanitize permissions find $RPM_BUILD_ROOT%{_datadir}/themes -type d -exec chmod 755 {} \; @@ -68,7 +68,7 @@ %clean rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(644, root, root, 755) %doc README AUTHORS NEWS COPYING %attr (755, root, root) %{_libdir}/gtk-2.0/2.10.0/engines/*.so @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/gtk-engines-2.pc %changelog +* Mon Mar 2 2009 Matthias Clasen - 2.17.4-1 +- Update to 2.17.4 + * Tue Feb 24 2009 Fedora Release Engineering - 2.17.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtk2-engines/devel/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 18 Feb 2009 02:45:10 -0000 1.62 +++ sources 3 Mar 2009 02:01:34 -0000 1.63 @@ -1 +1 @@ -67d02de0e94ddfee99373631b022afbd gtk-engines-2.17.3.tar.bz2 +bb8c698633421f4e5a3212318dcbe588 gtk-engines-2.17.4.tar.bz2 From glommer at fedoraproject.org Tue Mar 3 02:02:07 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 3 Mar 2009 02:02:07 +0000 (UTC) Subject: rpms/vgabios/devel import.log, NONE, 1.1 vgabios.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303020207.B3E9570116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/vgabios/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4871/devel Modified Files: .cvsignore sources Added Files: import.log vgabios.spec Log Message: initial import of vgabios --- NEW FILE import.log --- vgabios-0_6-0_5_b_fc11:HEAD:vgabios-0.6-0.5.b.fc11.src.rpm:1236045633 --- NEW FILE vgabios.spec --- Name: vgabios Version: 0.6 Release: 0.5.b%{?dist} Summary: LGPL implementation of a vga video bios Group: Applications/Emulators License: LGPLv2 URL: http://www.nongnu.org/vgabios/ Source0: http://savannah.gnu.org/download/%{name}/%{name}-%{version}b.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dev86 BuildArch: noarch %description vgabios is an LPGL implementation of a bios for a video card. It is tied to plex86/bochs, althoug it will likely work on other emulators. It is not intended for use in real cards. %prep %setup -q -n %{name}-%{version}b %build make clean make biossums %{?_smp_mflags} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/vgabios install -m 0644 VGABIOS-lgpl-*.bin $RPM_BUILD_ROOT%{_datadir}/vgabios %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %dir %{_datadir}/vgabios/ %doc README COPYING %{_datadir}/vgabios/VGABIOS-lgpl-latest.bin %{_datadir}/vgabios/VGABIOS-lgpl-latest.cirrus.bin %{_datadir}/vgabios/VGABIOS-lgpl-latest.cirrus.debug.bin %{_datadir}/vgabios/VGABIOS-lgpl-latest.debug.bin %changelog * Mon Mar 02 2009 Glauber Costa - 0.6.0.5.b - fixed naming to comply with guidelines. * Tue Feb 17 2009 Glauber Costa - 0.6.0.4beta - removed leftovers and fixed rpmlint errors. * Mon Feb 16 2009 Glauber Costa - 0.6.0.3beta - using dev86 to build directly on all arches, made package noarch. No more binaries \o/ * Fri Feb 13 2009 Glauber Costa - 0.6.0.2beta - Addressing BZ 485418: added doc section, clean build root before we proceed, own vgabios directory * Fri Feb 13 2009 Glauber Costa - 0.6.0.1beta - Created initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vgabios/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:30:27 -0000 1.1 +++ .cvsignore 3 Mar 2009 02:01:37 -0000 1.2 @@ -0,0 +1 @@ +vgabios-0.6b.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vgabios/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:30:27 -0000 1.1 +++ sources 3 Mar 2009 02:01:37 -0000 1.2 @@ -0,0 +1 @@ +36399621c4d6753e83a3cec3009c7183 vgabios-0.6b.tgz From davej at fedoraproject.org Tue Mar 3 02:02:26 2009 From: davej at fedoraproject.org (Dave Jones) Date: Tue, 3 Mar 2009 02:02:26 +0000 (UTC) Subject: rpms/kernel/devel patch-2.6.29-rc6-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.1025, 1.1026 kernel.spec, 1.1362, 1.1363 linux-2.6-hotfixes.patch, 1.4, 1.5 sources, 1.986, 1.987 upstream, 1.898, 1.899 ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch, 1.1, NONE linux-2.6-libertas-netpriv-fixes.patch, 1.1, NONE patch-2.6.29-rc6-git5.bz2.sign, 1.1, NONE Message-ID: <20090303020226.99AB470116@cvs1.fedora.phx.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5105 Modified Files: .cvsignore kernel.spec linux-2.6-hotfixes.patch sources upstream Added Files: patch-2.6.29-rc6-git6.bz2.sign Removed Files: ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch linux-2.6-libertas-netpriv-fixes.patch patch-2.6.29-rc6-git5.bz2.sign Log Message: 2.6.29-rc6-git6 --- NEW FILE patch-2.6.29-rc6-git6.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBJrHVxyGugalF9Dw4RAiEGAJ0eLlBZStiVw7ThPY5jwdI5fHGBugCeOy4o ELXG+/devfwfgZByv6LdHOA= =lGW3 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.1025 retrieving revision 1.1026 diff -u -r1.1025 -r1.1026 --- .cvsignore 28 Feb 2009 15:35:25 -0000 1.1025 +++ .cvsignore 3 Mar 2009 02:01:55 -0000 1.1026 @@ -6,4 +6,4 @@ kernel-2.6.28 linux-2.6.28.tar.bz2 patch-2.6.29-rc6.bz2 -patch-2.6.29-rc6-git5.bz2 +patch-2.6.29-rc6-git6.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1362 retrieving revision 1.1363 diff -u -r1.1362 -r1.1363 --- kernel.spec 2 Mar 2009 23:09:52 -0000 1.1362 +++ kernel.spec 3 Mar 2009 02:01:55 -0000 1.1363 @@ -58,7 +58,7 @@ # The rc snapshot level %define rcrev 6 # The git snapshot level -%define gitrev 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -660,14 +660,9 @@ Patch2200: linux-2.6-firewire-git-update.patch Patch2201: linux-2.6-firewire-git-pending.patch -Patch2250: ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch - Patch2300: linux-2.6.28-sunrpc-ipv6-rpcbind.patch Patch2301: linux-2.6.28-lockd-svc-register.patch -# fix libertas problem for olpc (http://lists.infradead.org/pipermail/libertas-dev/2009-February/002297.html) -Patch2400: linux-2.6-libertas-netpriv-fixes.patch - # Quiet boot fixes # silence the ACPI blacklist code Patch2802: linux-2.6-silence-acpi-blacklist.patch @@ -1176,8 +1171,6 @@ ApplyPatch linux-2.6-net-tulip-interrupt.patch -ApplyPatch linux-2.6-libertas-netpriv-fixes.patch - ApplyPatch agp-set_memory_ucwb.patch # Nouveau DRM + drm fixes ApplyPatch drm-next.patch @@ -1194,9 +1187,6 @@ #ApplyPatch linux-2.6-firewire-git-pending.patch #fi -# fix oops with CONFIG_NET_NS=y -ApplyPatch ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch - # Fix NFS ApplyPatch linux-2.6.28-sunrpc-ipv6-rpcbind.patch @@ -1795,7 +1785,10 @@ # and build. %changelog -* Tue Mar 03 2009 Ben Skeggs +* Mon Mar 02 2009 Dave Jones 2.6.29-0.183.rc6.git6 +- 2.6.29-rc6-git6 + +* Mon Mar 02 2009 Ben Skeggs - CONFIG_DRM_NOUVEAU_KMS got enabled somewhere, lets not do that yet * Mon Mar 02 2009 Kyle McMartin 2.6.29-0.179.rc6.git5 linux-2.6-hotfixes.patch: Index: linux-2.6-hotfixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-hotfixes.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-hotfixes.patch 28 Feb 2009 15:35:26 -0000 1.4 +++ linux-2.6-hotfixes.patch 3 Mar 2009 02:01:55 -0000 1.5 @@ -1,60 +0,0 @@ -Ingo Molnar (1): - x86: i915 needs pgprot_writecombine() and is_io_mapping_possible() - - - arch/x86/mm/iomap_32.c | 15 ++++----------- - arch/x86/mm/pat.c | 2 ++ - 2 files changed, 6 insertions(+), 11 deletions(-) - -diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c -index 6c2b1af..04102d4 100644 ---- a/arch/x86/mm/iomap_32.c -+++ b/arch/x86/mm/iomap_32.c -@@ -20,23 +20,16 @@ - #include - #include - --#ifdef CONFIG_X86_PAE --int --is_io_mapping_possible(resource_size_t base, unsigned long size) --{ -- return 1; --} --#else --int --is_io_mapping_possible(resource_size_t base, unsigned long size) -+int is_io_mapping_possible(resource_size_t base, unsigned long size) - { -+#ifndef CONFIG_X86_PAE - /* There is no way to map greater than 1 << 32 address without PAE */ - if (base + size > 0x100000000ULL) - return 0; -- -+#endif - return 1; - } --#endif -+EXPORT_SYMBOL_GPL(is_io_mapping_possible); - - /* Map 'pfn' using fixed map 'type' and protections 'prot' - */ -diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c -index aebbf67..e0ab173 100644 ---- a/arch/x86/mm/pat.c -+++ b/arch/x86/mm/pat.c -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -868,6 +869,7 @@ pgprot_t pgprot_writecombine(pgprot_t prot) - else - return pgprot_noncached(prot); - } -+EXPORT_SYMBOL_GPL(pgprot_writecombine); - - #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_X86_PAT) - Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.986 retrieving revision 1.987 diff -u -r1.986 -r1.987 --- sources 28 Feb 2009 15:35:26 -0000 1.986 +++ sources 3 Mar 2009 02:01:56 -0000 1.987 @@ -1,3 +1,3 @@ d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2 26f67d99666834cc579094619821d3c8 patch-2.6.29-rc6.bz2 -c9924c779a427f2b57cd201fbef62cee patch-2.6.29-rc6-git5.bz2 +2bd40cb2f0f7ea71abb95a46e5ba84fe patch-2.6.29-rc6-git6.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.898 retrieving revision 1.899 diff -u -r1.898 -r1.899 --- upstream 28 Feb 2009 15:35:26 -0000 1.898 +++ upstream 3 Mar 2009 02:01:56 -0000 1.899 @@ -1,3 +1,3 @@ linux-2.6.28.tar.bz2 patch-2.6.29-rc6.bz2 -patch-2.6.29-rc6-git5.bz2 +patch-2.6.29-rc6-git6.bz2 --- ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch DELETED --- --- linux-2.6-libertas-netpriv-fixes.patch DELETED --- --- patch-2.6.29-rc6-git5.bz2.sign DELETED --- From glommer at fedoraproject.org Tue Mar 3 02:05:32 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 3 Mar 2009 02:05:32 +0000 (UTC) Subject: rpms/bochs-bios/devel bochs-bios-0001_bx-qemu.patch, NONE, 1.1 bochs-bios-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch, NONE, 1.1 bochs-bios-0003_kvm-bios-generate-mptable-unconditionally.patch, NONE, 1.1 bochs-bios-0004_kvm-bios-add-mtrr-support.patch, NONE, 1.1 bochs-bios-0005_kvm-bios-smp-mtrr-support.patch, NONE, 1.1 bochs-bios-0006_kvm-bios-extend-mtrrs-to-above-4g.patch, NONE, 1.1 bochs-bios-0007_kvm-bios-cleanup-consolidate-above-4g-memory-parsing.patch, NONE, 1.1 bochs-bios-0008_kvm-bios-switch-mtrrs-to-cover-only-the-pci-range-and--default-to-wb.patch, NONE, 1.1 bochs-bios-0009_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch, NONE, 1.1 bochs-bios-0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch, NONE, 1.1 bochs-bios.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303020532.5AB8570116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/bochs-bios/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5666/devel Modified Files: .cvsignore sources Added Files: bochs-bios-0001_bx-qemu.patch bochs-bios-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch bochs-bios-0003_kvm-bios-generate-mptable-unconditionally.patch bochs-bios-0004_kvm-bios-add-mtrr-support.patch bochs-bios-0005_kvm-bios-smp-mtrr-support.patch bochs-bios-0006_kvm-bios-extend-mtrrs-to-above-4g.patch bochs-bios-0007_kvm-bios-cleanup-consolidate-above-4g-memory-parsing.patch bochs-bios-0008_kvm-bios-switch-mtrrs-to-cover-only-the-pci-range-and--default-to-wb.patch bochs-bios-0009_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch bochs-bios-0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch bochs-bios.spec import.log Log Message: initial commit of bochs-bios bochs-bios-0001_bx-qemu.patch: --- NEW FILE bochs-bios-0001_bx-qemu.patch --- --- bochs-2.3.7.orig/bios/rombios.h +++ bochs-2.3.7/bios/rombios.h @@ -19,7 +19,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA /* define it to include QEMU specific code */ -//#define BX_QEMU +#define BX_QEMU #ifndef LEGACY # define BX_ROMBIOS32 1 bochs-bios-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch: --- NEW FILE bochs-bios-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch --- update SMBIOS table to report memory above 4G (Alex Williamson) Signed-off-by: Alex Williamson Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/rombios32.c =================================================================== --- bochs.orig/bios/rombios32.c +++ bochs/bios/rombios32.c @@ -2081,7 +2081,8 @@ void smbios_init(void) { unsigned cpu_num, nr_structs = 0, max_struct_size = 0; char *start, *p, *q; - int memsize = ram_size / (1024 * 1024); + int memsize = (ram_end == ram_size) ? ram_size / (1024 * 1024) : + (ram_end - (1ull << 32) + ram_size) / (1024 * 1024); #ifdef BX_USE_EBDA_TABLES ebda_cur_addr = align(ebda_cur_addr, 16); @@ -2108,8 +2109,8 @@ void smbios_init(void) add_struct(smbios_type_4_init(p, cpu_num)); add_struct(smbios_type_16_init(p, memsize)); add_struct(smbios_type_17_init(p, memsize)); - add_struct(smbios_type_19_init(p, memsize)); - add_struct(smbios_type_20_init(p, memsize)); + add_struct(smbios_type_19_init(p, ram_end / (1024 * 1024))); + add_struct(smbios_type_20_init(p, ram_end / (1024 * 1024))); add_struct(smbios_type_32_init(p)); add_struct(smbios_type_127_init(p)); bochs-bios-0003_kvm-bios-generate-mptable-unconditionally.patch: --- NEW FILE bochs-bios-0003_kvm-bios-generate-mptable-unconditionally.patch --- generate mptable unconditionally (Avi Kivity) VMware ESX requires an mptable even for uniprocessor guests. Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/rombios32.c =================================================================== --- bochs.orig/bios/rombios32.c +++ bochs/bios/rombios32.c @@ -970,11 +970,6 @@ static void mptable_init(void) int ioapic_id, i, len; int mp_config_table_size; -#ifdef BX_QEMU - if (smp_cpus <= 1) - return; -#endif - #ifdef BX_USE_EBDA_TABLES mp_config_table = (uint8_t *)(ram_size - ACPI_DATA_SIZE - MPTABLE_MAX_SIZE); #else bochs-bios-0004_kvm-bios-add-mtrr-support.patch: --- NEW FILE bochs-bios-0004_kvm-bios-add-mtrr-support.patch --- add mtrr support (Avi Kivity) program mtrrs for cpu 0. Doesn't support >=4G at the moment. Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/rombios32.c =================================================================== --- bochs.orig/bios/rombios32.c +++ bochs/bios/rombios32.c @@ -64,6 +64,23 @@ typedef unsigned long long uint64_t; #define BIOS_TMP_STORAGE 0x00030000 /* 64 KB used to copy the BIOS to shadow RAM */ +#define MSR_MTRRcap 0x000000fe +#define MSR_MTRRfix64K_00000 0x00000250 +#define MSR_MTRRfix16K_80000 0x00000258 +#define MSR_MTRRfix16K_A0000 0x00000259 +#define MSR_MTRRfix4K_C0000 0x00000268 +#define MSR_MTRRfix4K_C8000 0x00000269 +#define MSR_MTRRfix4K_D0000 0x0000026a +#define MSR_MTRRfix4K_D8000 0x0000026b +#define MSR_MTRRfix4K_E0000 0x0000026c +#define MSR_MTRRfix4K_E8000 0x0000026d +#define MSR_MTRRfix4K_F0000 0x0000026e +#define MSR_MTRRfix4K_F8000 0x0000026f +#define MSR_MTRRdefType 0x000002ff + +#define MTRRphysBase_MSR(reg) (0x200 + 2 * (reg)) +#define MTRRphysMask_MSR(reg) (0x200 + 2 * (reg) + 1) + static inline void outl(int addr, int val) { asm volatile ("outl %1, %w0" : : "d" (addr), "a" (val)); @@ -135,6 +152,19 @@ static inline void putc(int c) outb(INFO_PORT, c); } +static uint64_t rdmsr(unsigned index) +{ + unsigned long long ret; + + asm ("rdmsr" : "=A"(ret) : "c"(index)); + return ret; +} + +static void wrmsr(unsigned index, uint64_t val) +{ + asm volatile ("wrmsr" : : "c"(index), "A"(val)); +} + static inline int isdigit(int c) { return c >= '0' && c <= '9'; @@ -469,6 +499,54 @@ static int cmos_readb(int addr) return inb(0x71); } +void setup_mtrr(void) +{ + int i, vcnt, fix, wc; + uint32_t mtrr_cap; + union { + uint8_t valb[8]; + uint64_t val; + } u; + uint64_t vbase, vmask; + + mtrr_cap = rdmsr(MSR_MTRRcap); + vcnt = mtrr_cap & 0xff; + fix = mtrr_cap & 0x100; + wc = mtrr_cap & 0x400; + if (!vcnt || !fix) + return; + u.val = 0; + for (i = 0; i < 8; ++i) + if (ram_size >= 65536 * (i + 1)) + u.valb[i] = 6; + wrmsr(MSR_MTRRfix64K_00000, u.val); + u.val = 0; + for (i = 0; i < 8; ++i) + if (ram_size >= 65536 * 8 + 16384 * (i + 1)) + u.valb[i] = 6; + wrmsr(MSR_MTRRfix16K_80000, u.val); + wrmsr(MSR_MTRRfix16K_A0000, 0); + wrmsr(MSR_MTRRfix4K_C0000, 0); + wrmsr(MSR_MTRRfix4K_C8000, 0); + wrmsr(MSR_MTRRfix4K_D0000, 0); + wrmsr(MSR_MTRRfix4K_D8000, 0); + wrmsr(MSR_MTRRfix4K_E0000, 0); + wrmsr(MSR_MTRRfix4K_E8000, 0); + wrmsr(MSR_MTRRfix4K_F0000, 0); + wrmsr(MSR_MTRRfix4K_F8000, 0); + vbase = 0; + --vcnt; /* leave one mtrr for VRAM */ + for (i = 0; i < vcnt && vbase < ram_size; ++i) { + vmask = (1ull << 40) - 1; + while (vbase + vmask + 1 > ram_size) + vmask >>= 1; + wrmsr(MTRRphysBase_MSR(i), vbase | 6); + wrmsr(MTRRphysMask_MSR(i), (~vmask & 0xfffffff000ull) | 0x800); + vbase += vmask + 1; + } + wrmsr(MSR_MTRRdefType, 0xc00); +} + void ram_probe(void) { if (cmos_readb(0x34) | cmos_readb(0x35)) @@ -482,6 +560,7 @@ void ram_probe(void) ebda_cur_addr = ((*(uint16_t *)(0x40e)) << 4) + 0x380; BX_INFO("ebda_cur_addr: 0x%08lx\n", ebda_cur_addr); #endif + setup_mtrr(); } /****************************************************/ bochs-bios-0005_kvm-bios-smp-mtrr-support.patch: --- NEW FILE bochs-bios-0005_kvm-bios-smp-mtrr-support.patch --- smp mtrr support (Avi Kivity) Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/rombios.h =================================================================== --- bochs.orig/bios/rombios.h +++ bochs/bios/rombios.h @@ -56,6 +56,7 @@ #define ACPI_DATA_SIZE 0x00010000L #define PM_IO_BASE 0xb000 #define SMB_IO_BASE 0xb100 +#define SMP_MSR_ADDR 0xf010 // Define the application NAME #if defined(BX_QEMU) Index: bochs/bios/rombios32.c =================================================================== --- bochs.orig/bios/rombios32.c +++ bochs/bios/rombios32.c @@ -472,6 +472,23 @@ void qemu_cfg_read(uint8_t *buf, int len } #endif +void init_smp_msrs(void) +{ + *(uint32_t *)SMP_MSR_ADDR = 0; +} + +void wrmsr_smp(uint32_t index, uint64_t val) +{ + static struct { uint32_t ecx, eax, edx; } *p = (void *)SMP_MSR_ADDR; + + wrmsr(index, val); + p->ecx = index; + p->eax = val; + p->edx = val >> 32; + ++p; + p->ecx = 0; +} + void uuid_probe(void) { #ifdef BX_QEMU @@ -519,32 +536,32 @@ void setup_mtrr(void) for (i = 0; i < 8; ++i) if (ram_size >= 65536 * (i + 1)) u.valb[i] = 6; - wrmsr(MSR_MTRRfix64K_00000, u.val); + wrmsr_smp(MSR_MTRRfix64K_00000, u.val); u.val = 0; for (i = 0; i < 8; ++i) if (ram_size >= 65536 * 8 + 16384 * (i + 1)) u.valb[i] = 6; - wrmsr(MSR_MTRRfix16K_80000, u.val); - wrmsr(MSR_MTRRfix16K_A0000, 0); - wrmsr(MSR_MTRRfix4K_C0000, 0); - wrmsr(MSR_MTRRfix4K_C8000, 0); - wrmsr(MSR_MTRRfix4K_D0000, 0); - wrmsr(MSR_MTRRfix4K_D8000, 0); - wrmsr(MSR_MTRRfix4K_E0000, 0); - wrmsr(MSR_MTRRfix4K_E8000, 0); - wrmsr(MSR_MTRRfix4K_F0000, 0); - wrmsr(MSR_MTRRfix4K_F8000, 0); + wrmsr_smp(MSR_MTRRfix16K_80000, u.val); + wrmsr_smp(MSR_MTRRfix16K_A0000, 0); + wrmsr_smp(MSR_MTRRfix4K_C0000, 0); + wrmsr_smp(MSR_MTRRfix4K_C8000, 0); + wrmsr_smp(MSR_MTRRfix4K_D0000, 0); + wrmsr_smp(MSR_MTRRfix4K_D8000, 0); + wrmsr_smp(MSR_MTRRfix4K_E0000, 0); + wrmsr_smp(MSR_MTRRfix4K_E8000, 0); + wrmsr_smp(MSR_MTRRfix4K_F0000, 0); + wrmsr_smp(MSR_MTRRfix4K_F8000, 0); vbase = 0; --vcnt; /* leave one mtrr for VRAM */ for (i = 0; i < vcnt && vbase < ram_size; ++i) { vmask = (1ull << 40) - 1; while (vbase + vmask + 1 > ram_size) vmask >>= 1; - wrmsr(MTRRphysBase_MSR(i), vbase | 6); - wrmsr(MTRRphysMask_MSR(i), (~vmask & 0xfffffff000ull) | 0x800); + wrmsr_smp(MTRRphysBase_MSR(i), vbase | 6); + wrmsr_smp(MTRRphysMask_MSR(i), (~vmask & 0xfffffff000ull) | 0x800); vbase += vmask + 1; } - wrmsr(MSR_MTRRdefType, 0xc00); + wrmsr_smp(MSR_MTRRdefType, 0xc00); } void ram_probe(void) @@ -2263,6 +2280,8 @@ void rombios32_init(uint32_t *s3_resume_ qemu_cfg_port = qemu_cfg_port_probe(); #endif + init_smp_msrs(); + ram_probe(); cpu_probe(); Index: bochs/bios/rombios32start.S =================================================================== --- bochs.orig/bios/rombios32start.S +++ bochs/bios/rombios32start.S @@ -49,6 +49,18 @@ _start: smp_ap_boot_code_start: xor %ax, %ax mov %ax, %ds + + mov $SMP_MSR_ADDR, %ebx +11: + mov 0(%ebx), %ecx + test %ecx, %ecx + jz 12f + mov 4(%ebx), %eax + mov 8(%ebx), %edx + wrmsr + add $12, %ebx + jmp 11b +12: lock incw smp_cpus 1: hlt bochs-bios-0006_kvm-bios-extend-mtrrs-to-above-4g.patch: --- NEW FILE bochs-bios-0006_kvm-bios-extend-mtrrs-to-above-4g.patch --- extend MTRRs to above 4G (Alex Williamson) When I try to boot guests using a recent Linux kernel (2.6.26+), memory above 3.5G gets thrown away with an error like this: WARNING: BIOS bug: CPU MTRRs don't cover all of memory, losing 4608MB of RAM This extends MTRRs to cover all of memory. Signed-off-by: Alex Williamson Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/rombios32.c =================================================================== --- bochs.orig/bios/rombios32.c +++ bochs/bios/rombios32.c @@ -427,6 +427,7 @@ uint32_t cpuid_signature; uint32_t cpuid_features; uint32_t cpuid_ext_features; unsigned long ram_size; +uint64_t above4g_ram_size; uint8_t bios_uuid[16]; #ifdef BX_USE_EBDA_TABLES unsigned long ebda_cur_addr; @@ -561,6 +562,14 @@ void setup_mtrr(void) wrmsr_smp(MTRRphysMask_MSR(i), (~vmask & 0xfffffff000ull) | 0x800); vbase += vmask + 1; } + for (vbase = 1ull << 32; i < vcnt && vbase < above4g_ram_size; ++i) { + vmask = (1ull << 40) - 1; + while (vbase + vmask + 1 > above4g_ram_size) + vmask >>= 1; + wrmsr_smp(MTRRphysBase_MSR(i), vbase | 6); + wrmsr_smp(MTRRphysMask_MSR(i), (~vmask & 0xfffffff000ull) | 0x800); + vbase += vmask + 1; + } wrmsr_smp(MSR_MTRRdefType, 0xc00); } @@ -572,11 +581,19 @@ void ram_probe(void) else ram_size = (cmos_readb(0x30) | (cmos_readb(0x31) << 8)) * 1024 + 1 * 1024 * 1024; + if (cmos_readb(0x5b) | cmos_readb(0x5c) | cmos_readb(0x5d)) + above4g_ram_size = ((uint64_t)cmos_readb(0x5b) << 16) | + ((uint64_t)cmos_readb(0x5c) << 24) | ((uint64_t)cmos_readb(0x5d) << 32); + + if (above4g_ram_size) + above4g_ram_size += 1ull << 32; + BX_INFO("ram_size=0x%08lx\n", ram_size); #ifdef BX_USE_EBDA_TABLES ebda_cur_addr = ((*(uint16_t *)(0x40e)) << 4) + 0x380; BX_INFO("ebda_cur_addr: 0x%08lx\n", ebda_cur_addr); #endif + BX_INFO("top of ram %ldMB\n", above4g_ram_size >> 20); setup_mtrr(); } bochs-bios-0007_kvm-bios-cleanup-consolidate-above-4g-memory-parsing.patch: --- NEW FILE bochs-bios-0007_kvm-bios-cleanup-consolidate-above-4g-memory-parsing.patch --- cleanup/consolidate above 4G memory parsing (Alex Williamson) Signed-off-by: Alex Williamson Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/rombios32.c =================================================================== --- bochs.orig/bios/rombios32.c +++ bochs/bios/rombios32.c @@ -427,7 +427,7 @@ uint32_t cpuid_signature; uint32_t cpuid_features; uint32_t cpuid_ext_features; unsigned long ram_size; -uint64_t above4g_ram_size; +uint64_t ram_end; uint8_t bios_uuid[16]; #ifdef BX_USE_EBDA_TABLES unsigned long ebda_cur_addr; @@ -562,9 +562,9 @@ void setup_mtrr(void) wrmsr_smp(MTRRphysMask_MSR(i), (~vmask & 0xfffffff000ull) | 0x800); vbase += vmask + 1; } - for (vbase = 1ull << 32; i < vcnt && vbase < above4g_ram_size; ++i) { + for (vbase = 1ull << 32; i < vcnt && vbase < ram_end; ++i) { vmask = (1ull << 40) - 1; - while (vbase + vmask + 1 > above4g_ram_size) + while (vbase + vmask + 1 > ram_end) vmask >>= 1; wrmsr_smp(MTRRphysBase_MSR(i), vbase | 6); wrmsr_smp(MTRRphysMask_MSR(i), (~vmask & 0xfffffff000ull) | 0x800); @@ -582,18 +582,19 @@ void ram_probe(void) ram_size = (cmos_readb(0x30) | (cmos_readb(0x31) << 8)) * 1024 + 1 * 1024 * 1024; if (cmos_readb(0x5b) | cmos_readb(0x5c) | cmos_readb(0x5d)) - above4g_ram_size = ((uint64_t)cmos_readb(0x5b) << 16) | - ((uint64_t)cmos_readb(0x5c) << 24) | ((uint64_t)cmos_readb(0x5d) << 32); + ram_end = (((uint64_t)cmos_readb(0x5b) << 16) | + ((uint64_t)cmos_readb(0x5c) << 24) | + ((uint64_t)cmos_readb(0x5d) << 32)) + (1ull << 32); + else + ram_end = ram_size; - if (above4g_ram_size) - above4g_ram_size += 1ull << 32; + BX_INFO("end of ram=%ldMB\n", ram_end >> 20); BX_INFO("ram_size=0x%08lx\n", ram_size); #ifdef BX_USE_EBDA_TABLES ebda_cur_addr = ((*(uint16_t *)(0x40e)) << 4) + 0x380; BX_INFO("ebda_cur_addr: 0x%08lx\n", ebda_cur_addr); #endif - BX_INFO("top of ram %ldMB\n", above4g_ram_size >> 20); setup_mtrr(); } bochs-bios-0008_kvm-bios-switch-mtrrs-to-cover-only-the-pci-range-and--default-to-wb.patch: --- NEW FILE bochs-bios-0008_kvm-bios-switch-mtrrs-to-cover-only-the-pci-range-and--default-to-wb.patch --- switch MTRRs to cover only the PCI range and default to WB (Alex Williamson) This matches how some bare metal machines report MTRRs and avoids the problem of running out of MTRRs to cover all of RAM. Signed-off-by: Alex Williamson Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/rombios32.c =================================================================== --- bochs.orig/bios/rombios32.c +++ bochs/bios/rombios32.c @@ -525,7 +525,6 @@ void setup_mtrr(void) uint8_t valb[8]; uint64_t val; } u; - uint64_t vbase, vmask; mtrr_cap = rdmsr(MSR_MTRRcap); vcnt = mtrr_cap & 0xff; @@ -552,25 +551,10 @@ void setup_mtrr(void) wrmsr_smp(MSR_MTRRfix4K_E8000, 0); wrmsr_smp(MSR_MTRRfix4K_F0000, 0); wrmsr_smp(MSR_MTRRfix4K_F8000, 0); - vbase = 0; - --vcnt; /* leave one mtrr for VRAM */ - for (i = 0; i < vcnt && vbase < ram_size; ++i) { - vmask = (1ull << 40) - 1; - while (vbase + vmask + 1 > ram_size) - vmask >>= 1; - wrmsr_smp(MTRRphysBase_MSR(i), vbase | 6); - wrmsr_smp(MTRRphysMask_MSR(i), (~vmask & 0xfffffff000ull) | 0x800); - vbase += vmask + 1; - } - for (vbase = 1ull << 32; i < vcnt && vbase < ram_end; ++i) { - vmask = (1ull << 40) - 1; - while (vbase + vmask + 1 > ram_end) - vmask >>= 1; - wrmsr_smp(MTRRphysBase_MSR(i), vbase | 6); - wrmsr_smp(MTRRphysMask_MSR(i), (~vmask & 0xfffffff000ull) | 0x800); - vbase += vmask + 1; - } - wrmsr_smp(MSR_MTRRdefType, 0xc00); + /* Mark 3.5-4GB as UC, anything not specified defaults to WB */ + wrmsr_smp(MTRRphysBase_MSR(0), 0xe0000000ull | 0); + wrmsr_smp(MTRRphysMask_MSR(0), ~(0x20000000ull - 1) | 0x800); + wrmsr_smp(MSR_MTRRdefType, 0xc06); } void ram_probe(void) bochs-bios-0009_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch: --- NEW FILE bochs-bios-0009_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch --- resolve memory device roll over reporting issues with >32G guests (Bill Rieske) The field within the Memory Device type 17 is only a word with the MSB being used to report MB/KB. Thereby, a guest with 32G and greater would report incorrect memory device information rolling over to 0. This presents more than one memory device and associated memory structures if the memory is larger than 16G Signed-off-by: Bill Rieske Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/rombios32.c =================================================================== --- bochs.orig/bios/rombios32.c +++ bochs/bios/rombios32.c @@ -381,6 +381,17 @@ int vsnprintf(char *buf, int buflen, con return buf - buf0; } +int snprintf(char * buf, size_t size, const char *fmt, ...) +{ + va_list args; + int i; + + va_start(args, fmt); + i=vsnprintf(buf,size,fmt,args); + va_end(args); + return i; +} + void bios_printf(int flags, const char *fmt, ...) { va_list ap; @@ -2039,7 +2050,7 @@ smbios_type_4_init(void *start, unsigned /* Type 16 -- Physical Memory Array */ static void * -smbios_type_16_init(void *start, uint32_t memsize) +smbios_type_16_init(void *start, uint32_t memsize, int nr_mem_devs) { struct smbios_type_16 *p = (struct smbios_type_16*)start; @@ -2052,7 +2063,7 @@ smbios_type_16_init(void *start, uint32_ p->error_correction = 0x01; /* other */ p->maximum_capacity = memsize * 1024; p->memory_error_information_handle = 0xfffe; /* none provided */ - p->number_of_memory_devices = 1; + p->number_of_memory_devices = nr_mem_devs; start += sizeof(struct smbios_type_16); *((uint16_t *)start) = 0; @@ -2062,20 +2073,19 @@ smbios_type_16_init(void *start, uint32_ /* Type 17 -- Memory Device */ static void * -smbios_type_17_init(void *start, uint32_t memory_size_mb) +smbios_type_17_init(void *start, uint32_t memory_size_mb, int instance) { struct smbios_type_17 *p = (struct smbios_type_17 *)start; p->header.type = 17; p->header.length = sizeof(struct smbios_type_17); - p->header.handle = 0x1100; + p->header.handle = 0x1100 + instance; p->physical_memory_array_handle = 0x1000; p->total_width = 64; p->data_width = 64; - /* truncate memory_size_mb to 16 bits and clear most significant - bit [indicates size in MB] */ - p->size = (uint16_t) memory_size_mb & 0x7fff; +/* TODO: should assert in case something is wrong ASSERT((memory_size_mb & ~0x7fff) == 0); */ + p->size = memory_size_mb; p->form_factor = 0x09; /* DIMM */ p->device_set = 0; p->device_locator_str = 1; @@ -2084,8 +2094,8 @@ smbios_type_17_init(void *start, uint32_ p->type_detail = 0; start += sizeof(struct smbios_type_17); - memcpy((char *)start, "DIMM 1", 7); - start += 7; + snprintf(start, 8, "DIMM %d", instance); + start += strlen(start) + 1; *((uint8_t *)start) = 0; return start+1; @@ -2093,16 +2103,16 @@ smbios_type_17_init(void *start, uint32_ /* Type 19 -- Memory Array Mapped Address */ static void * -smbios_type_19_init(void *start, uint32_t memory_size_mb) +smbios_type_19_init(void *start, uint32_t memory_size_mb, int instance) { struct smbios_type_19 *p = (struct smbios_type_19 *)start; p->header.type = 19; p->header.length = sizeof(struct smbios_type_19); - p->header.handle = 0x1300; + p->header.handle = 0x1300 + instance; - p->starting_address = 0; - p->ending_address = (memory_size_mb * 1024) - 1; + p->starting_address = instance << 24; + p->ending_address = p->starting_address + (memory_size_mb << 10) - 1; p->memory_array_handle = 0x1000; p->partition_width = 1; @@ -2114,18 +2124,18 @@ smbios_type_19_init(void *start, uint32_ /* Type 20 -- Memory Device Mapped Address */ static void * -smbios_type_20_init(void *start, uint32_t memory_size_mb) +smbios_type_20_init(void *start, uint32_t memory_size_mb, int instance) { struct smbios_type_20 *p = (struct smbios_type_20 *)start; p->header.type = 20; p->header.length = sizeof(struct smbios_type_20); - p->header.handle = 0x1400; + p->header.handle = 0x1400 + instance; - p->starting_address = 0; - p->ending_address = (memory_size_mb * 1024) - 1; - p->memory_device_handle = 0x1100; - p->memory_array_mapped_address_handle = 0x1300; + p->starting_address = instance << 24; + p->ending_address = p->starting_address + (memory_size_mb << 10) - 1; + p->memory_device_handle = 0x1100 + instance; + p->memory_array_mapped_address_handle = 0x1300 + instance; p->partition_row_position = 1; p->interleave_position = 0; p->interleaved_data_depth = 0; @@ -2176,6 +2186,7 @@ void smbios_init(void) char *start, *p, *q; int memsize = (ram_end == ram_size) ? ram_size / (1024 * 1024) : (ram_end - (1ull << 32) + ram_size) / (1024 * 1024); + int i, nr_mem_devs; #ifdef BX_USE_EBDA_TABLES ebda_cur_addr = align(ebda_cur_addr, 16); @@ -2187,23 +2198,32 @@ void smbios_init(void) p = (char *)start + sizeof(struct smbios_entry_point); -#define add_struct(fn) { \ +#define add_struct(fn) do{ \ q = (fn); \ nr_structs++; \ if ((q - p) > max_struct_size) \ max_struct_size = q - p; \ p = q; \ -} +}while (0) add_struct(smbios_type_0_init(p)); add_struct(smbios_type_1_init(p)); add_struct(smbios_type_3_init(p)); for (cpu_num = 1; cpu_num <= smp_cpus; cpu_num++) add_struct(smbios_type_4_init(p, cpu_num)); - add_struct(smbios_type_16_init(p, memsize)); - add_struct(smbios_type_17_init(p, memsize)); - add_struct(smbios_type_19_init(p, ram_end / (1024 * 1024))); - add_struct(smbios_type_20_init(p, ram_end / (1024 * 1024))); + + /* Each 'memory device' covers up to 16GB of address space. */ + nr_mem_devs = (memsize + 0x3fff) >> 14; + add_struct(smbios_type_16_init(p, memsize, nr_mem_devs)); + for ( i = 0; i < nr_mem_devs; i++ ) + { + uint32_t dev_memsize = ((i == (nr_mem_devs - 1)) + ? (memsize & 0x3fff) : 0x4000); + add_struct(smbios_type_17_init(p, dev_memsize, i)); + add_struct(smbios_type_19_init(p, dev_memsize, i)); + add_struct(smbios_type_20_init(p, dev_memsize, i)); + } + add_struct(smbios_type_32_init(p)); add_struct(smbios_type_127_init(p)); bochs-bios-0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch: --- NEW FILE bochs-bios-0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch --- fix smbios memory device length boundary condition (Bill Rieske) dev_memsize ends up 0 when it shouldn't be on 16G boundary conditions. Signed-off-by: Bill Rieske Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/rombios32.c =================================================================== --- bochs.orig/bios/rombios32.c +++ bochs/bios/rombios32.c @@ -2218,7 +2218,7 @@ void smbios_init(void) for ( i = 0; i < nr_mem_devs; i++ ) { uint32_t dev_memsize = ((i == (nr_mem_devs - 1)) - ? (memsize & 0x3fff) : 0x4000); + ? (((memsize-1) & 0x3fff)+1) : 0x4000); add_struct(smbios_type_17_init(p, dev_memsize, i)); add_struct(smbios_type_19_init(p, dev_memsize, i)); add_struct(smbios_type_20_init(p, dev_memsize, i)); --- NEW FILE bochs-bios.spec --- %define githead 36989b0d2 Name: bochs-bios Version: 2.3.8 Release: 0.4.git%{githead}%{?dist} Summary: Bios implementation from the Bochs project Group: Applications/Emulators License: LGPLv2+ URL: http://bochs.sourceforge.net/ # git clone git://git.kernel.org/pub/scm/virt/bochs/bochs.git # cd bochs # git archive --format=tar --prefix=bochs-bios-2.3.8/ %{githead} | gzip > ../bochs-bios-2.3.8.tar.gz Source0: %{name}-%{version}.tar.gz Patch0: %{name}-0001_bx-qemu.patch Patch1: %{name}-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch Patch2: %{name}-0003_kvm-bios-generate-mptable-unconditionally.patch Patch3: %{name}-0004_kvm-bios-add-mtrr-support.patch Patch4: %{name}-0005_kvm-bios-smp-mtrr-support.patch Patch5: %{name}-0006_kvm-bios-extend-mtrrs-to-above-4g.patch Patch6: %{name}-0007_kvm-bios-cleanup-consolidate-above-4g-memory-parsing.patch Patch7: %{name}-0008_kvm-bios-switch-mtrrs-to-cover-only-the-pci-range-and--default-to-wb.patch Patch8: %{name}-0009_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch Patch9: %{name}-0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libXt-devel libXpm-devel SDL-devel readline-devel byacc dev86 iasl BuildArch: %{ix86} x86_64 %description Bochs BIOS is a free implementation of a x86 BIOS provided by the Bochs projects. It can also be used in other emulators, such as QEMU %package data Summary: real data for the bios BuildArch: noarch %description data Bochs BIOS is a free implementation of a x86 BIOS provided by the Bochs projects. It can also be used in other emulators, such as QEMU %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 %build %configure --prefix=/%{_prefix} make -C bios %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/bochs install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/bochs/ bios/BIOS* %clean rm -rf $RPM_BUILD_ROOT %files data %defattr(-,root,root,-) %dir %{_datadir}/bochs/ %{_datadir}/bochs/BIOS-bochs-latest %{_datadir}/bochs/BIOS-bochs-legacy %changelog * Mon Mar 02 2009 Glauber Costa 2.3.8-0.4.git36989b0d2 - Don't use prebuilt binaries anymore. * Tue Feb 17 2009 Glauber Costa 2.3.8-0.3.git36989b0d2 - giving instructions on how to get the source tarball. * Thu Feb 13 2009 Glauber Costa 2.3.8-0.2.git36989b0d2 - Addressed comments for BZ 485417: clean up build environment, own created directories. * Thu Feb 13 2009 Glauber Costa 2.3.8-0.1.git36989b0d2 - Created initial package with qemu upstream patches. The patches apply to a specific git commit. --- NEW FILE import.log --- bochs-bios-2_3_8-0_4_git36989b0d2_fc11:HEAD:bochs-bios-2.3.8-0.4.git36989b0d2.fc11.src.rpm:1236045942 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bochs-bios/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:38:19 -0000 1.1 +++ .cvsignore 3 Mar 2009 02:05:31 -0000 1.2 @@ -0,0 +1 @@ +bochs-bios-2.3.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bochs-bios/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:38:19 -0000 1.1 +++ sources 3 Mar 2009 02:05:32 -0000 1.2 @@ -0,0 +1 @@ +b894abdf32e45ce4943ecc80e9f76ef8 bochs-bios-2.3.8.tar.gz From rathann at fedoraproject.org Tue Mar 3 02:05:31 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Tue, 3 Mar 2009 02:05:31 +0000 (UTC) Subject: rpms/freefem++/devel freefem++.spec,1.18,1.19 Message-ID: <20090303020531.0A14470116@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/freefem++/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6131 Modified Files: freefem++.spec Log Message: bump Index: freefem++.spec =================================================================== RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- freefem++.spec 3 Mar 2009 01:59:59 -0000 1.18 +++ freefem++.spec 3 Mar 2009 02:05:00 -0000 1.19 @@ -4,7 +4,7 @@ Summary: PDE solving tool Name: freefem++ Version: 3.0 -Release: 4%{dotpl}%{?dist} +Release: 5%{dotpl}%{?dist} URL: http://www.freefem.org/ff++/index.htm Group: Applications/Engineering Source0: http://www.freefem.org/ff++/ftp/%{name}-%{version}%{dashpl}.tar.gz @@ -157,7 +157,7 @@ %{_bindir}/FreeFem++-mpi %changelog -* Thu Feb 26 2009 Dominik Mierzejewski 3.0-4.5 +* Thu Feb 26 2009 Dominik Mierzejewski 3.0-5.5 - update to 3.0-5 - fix build with gcc-4.4 - fix build with Fedora-mandated CFLAGS From mclasen at fedoraproject.org Tue Mar 3 02:08:31 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 02:08:31 +0000 (UTC) Subject: rpms/gnome-games/devel .cvsignore, 1.94, 1.95 gnome-games.spec, 1.200, 1.201 sources, 1.99, 1.100 Message-ID: <20090303020831.9540570116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-games/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6778 Modified Files: .cvsignore gnome-games.spec sources Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-games/devel/.cvsignore,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- .cvsignore 19 Feb 2009 05:40:05 -0000 1.94 +++ .cvsignore 3 Mar 2009 02:08:01 -0000 1.95 @@ -1 +1 @@ -gnome-games-2.25.91.tar.bz2 +gnome-games-2.25.92.tar.bz2 Index: gnome-games.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- gnome-games.spec 25 Feb 2009 00:19:02 -0000 1.200 +++ gnome-games.spec 3 Mar 2009 02:08:01 -0000 1.201 @@ -43,17 +43,17 @@ Summary: Games for the GNOME desktop Name: gnome-games -Version: 2.25.91 -Release: 3%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: Amusements/Games Source: http://download.gnome.org/sources/gnome-games/2.25/gnome-games-%{version}.tar.bz2 -# http://bugzilla.gnome.org/show_bug.cgi?id=551455 +# http://bugzilla.gnome.org/show_bug.cgi?id=551455 Patch0: ggz-api-changes.patch Patch1: gnome-games-2.19.4-gnometris-rebrand.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: gnome-games-devel URL: http://projects.gnome.org/gnome-games/ @@ -91,8 +91,6 @@ # Newer than internal gettext needed BuildRequires: gettext -# Needed by intltool -BuildRequires: perl(XML::Parser) BuildRequires: autoconf >= 2.60 BuildRequires: gnome-doc-utils >= 0.3.2 @@ -109,8 +107,8 @@ %description -The gnome-games package is a collection of some small "five-minute" games -in a variety of styles and genres for the GNOME desktop. +The gnome-games package is a collection of some small "five-minute" games +in a variety of styles and genres for the GNOME desktop. %package help Group: Applications/Productivity @@ -119,7 +117,7 @@ BuildArch: noarch %description help -This package contains user documentation for %{name}. +This package contains user documentation for %{name}. %prep %setup -q @@ -140,7 +138,7 @@ autoconf export CFLAGS="$RPM_OPT_FLAGS -DNO_HOWL" %configure --localstatedir=/var/lib --disable-gnuchess %{omitgames} -make +make # strip unneeded translations from .mo files # ideally intltool (ha!) would do that for us @@ -357,6 +355,9 @@ %{_datadir}/omf/* %changelog +* Mon Mar 2 2009 Matthias Clasen - 1:2.25.92-1 +- Update 2.25.92 + * Tue Feb 24 2009 Matthias Clasen - 1:2.25.91-2 - Make gnome-games-help noarch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-games/devel/sources,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- sources 19 Feb 2009 05:40:05 -0000 1.99 +++ sources 3 Mar 2009 02:08:01 -0000 1.100 @@ -1 +1 @@ -ca83298acb0cd0b8418ad7b5d7d7f765 gnome-games-2.25.91.tar.bz2 +f8cba0eba30b6a1818e7e87abf49777a gnome-games-2.25.92.tar.bz2 From mclasen at fedoraproject.org Tue Mar 3 02:09:34 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 02:09:34 +0000 (UTC) Subject: rpms/gnome-user-docs/devel .cvsignore, 1.25, 1.26 gnome-user-docs.spec, 1.38, 1.39 sources, 1.25, 1.26 Message-ID: <20090303020934.B3D5A70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-user-docs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6952 Modified Files: .cvsignore gnome-user-docs.spec sources Log Message: 2.25.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 17 Dec 2008 05:48:58 -0000 1.25 +++ .cvsignore 3 Mar 2009 02:09:04 -0000 1.26 @@ -1 +1 @@ -gnome-user-docs-2.24.1.tar.bz2 +gnome-user-docs-2.25.1.tar.bz2 Index: gnome-user-docs.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- gnome-user-docs.spec 24 Feb 2009 23:35:56 -0000 1.38 +++ gnome-user-docs.spec 3 Mar 2009 02:09:04 -0000 1.39 @@ -1,13 +1,13 @@ Summary: GNOME User Documentation Name: gnome-user-docs -Version: 2.24.1 -Release: 2%{?dist} +Version: 2.25.1 +Release: 1%{?dist} License: GFDL -Source: http://download.gnome.org/sources/gnome-user-docs/2.24/gnome-user-docs-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gnome-user-docs/2.25/gnome-user-docs-%{version}.tar.bz2 Group: Documentation BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: gnome-users-guide Requires(post): scrollkeeper >= 0.3.11 @@ -15,10 +15,10 @@ BuildRequires: scrollkeeper >= 0.3.11 BuildRequires: gnome-doc-utils >= 0.5.6 BuildRequires: pkgconfig -BuildRequires: gettext +BuildRequires: gettext %description -This package contains end user documentation for the GNOME desktop +This package contains end user documentation for the GNOME desktop environment. %prep @@ -26,7 +26,7 @@ %build %configure --disable-scrollkeeper -make +make %install rm -rf $RPM_BUILD_ROOT @@ -35,7 +35,7 @@ %find_lang %{name} --all-name --with-gnome -%clean +%clean rm -rf $RPM_BUILD_ROOT %post @@ -53,6 +53,9 @@ %dir %{_datadir}/omf/gnome-access-guide %changelog +* Mon Mar 2 2009 Matthias Clasen - 2.25.1-1 +- Update to 2.25.1 + * Tue Feb 24 2009 Fedora Release Engineering - 2.24.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 17 Dec 2008 05:48:59 -0000 1.25 +++ sources 3 Mar 2009 02:09:04 -0000 1.26 @@ -1 +1 @@ -f64cc15f772e0e4d31626fa3b679e155 gnome-user-docs-2.24.1.tar.bz2 +4403d2991bf5e04ce9c3995966b71f9c gnome-user-docs-2.25.1.tar.bz2 From rathann at fedoraproject.org Tue Mar 3 02:12:06 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Tue, 3 Mar 2009 02:12:06 +0000 (UTC) Subject: rpms/iscan-firmware/devel iscan-firmware.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303021206.7784970116@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/iscan-firmware/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7480 Modified Files: .cvsignore sources Added Files: iscan-firmware.spec Log Message: - initial import into devel branch --- NEW FILE iscan-firmware.spec --- Summary: Firmware for Epson flatbed scanners Name: iscan-firmware Version: 2.1.0 Release: 3 License: Redistributable, no modification permitted URL: http://www.avasys.jp/english/linux_e/index.html # Perfection 2480/2580 PHOTO Source0: http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm # Perfection 3170 PHOTO Source1: http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-9400-1.0.0-1.c2.i386.rpm # Perfection 3490 PHOTO Source2: http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-f520-1.0.0-1.c2.i386.rpm # Perfection 4180 PHOTO Source3: http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-f600-1.0.0-1.c2.i386.rpm # Perfection 4490 PHOTO Source4: http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm # Perfection V10 / V100 PHOTO Source5: http://lx1.avasys.jp/iscan/2.3.0/iscan-plugin-gt-s600-2.0.0-1.c2.i386.rpm # Perfection V200 PHOTO Source6: http://linux.avasys.jp/drivers/iscan/plugins/iscan-plugin-gt-f670-2.1.0-2.c2.i386.rpm # Perfection V350 PHOTO Source7: http://lx1.avasys.jp/iscan/2.3.0/iscan-plugin-gt-f700-2.0.0-0.c2.i386.rpm # GT-1500 Source8: http://lx1.avasys.jp/iscan/2.12.0/iscan-plugin-gt-1500-2.1.0-2.c2.i386.rpm # Perfection V30 / V300 Source9: http://linux.avasys.jp/drivers/iscan/plugins/esci-interpreter-gt-f720-0.0.0-1.i386.rpm # Perfection V500 PHOTO Source10: http://lx1.avasys.jp/iscan/2.12.0/iscan-plugin-gt-x770-2.1.0-1.c2.i386.rpm Group: System Environment/Base BuildArch: noarch Requires: udev BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Firmware for the following Epson flatbed scanners: * GT-1500 / GT-D1000 * Perfection 2480/2580 PHOTO / GT-F500 * Perfection 3170 PHOTO / GT-9400 * Perfection 3490 PHOTO / GT-F520 * Perfection 4180 PHOTO / GT-F600 * Perfection 4490 PHOTO / GT-X750 * Perfection V10/V100 PHOTO / GT-S600 * Perfection V200 PHOTO / GT-F670 * Perfection V30/V300 / GT-F720 / GT-S620 * Perfection V350 PHOTO / GT-F700 * Perfection V500 PHOTO / GT-X770 %prep %setup -c -T for f in \ %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} ; do rpm2cpio $f | cpio --extract --make-directories --no-absolute-filenames --preserve-modification-time --quiet done cp -p usr/share/doc/iscan-plugin-gt-1500-*/AVASYSPL.*.txt ./ cp -p usr/share/doc/iscan-plugin-gt-f520-*/{EAPL,LICENSE.EPSON}.en.txt ./ for file in EAPL.ja.txt LICENSE.EPSON.ja.txt ; do iconv -f euc-jp -t utf8 usr/share/doc/iscan-plugin-gt-f520-*/$file > ./$file && \ touch -r usr/share/doc/iscan-plugin-gt-f520-*/$file ./$file done %build echo Nothing to build %install rm -rf %{buildroot} install -dm755 %{buildroot}/lib/firmware/epson install -pm644 .%{_datadir}/{iscan,esci}/esfw*.bin %{buildroot}/lib/firmware/epson %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AVASYSPL.en.txt EAPL.en.txt LICENSE.EPSON.en.txt %lang(ja) %doc AVASYSPL.ja.txt EAPL.ja.txt LICENSE.EPSON.ja.txt /lib/firmware/epson %changelog * Mon Mar 03 2009 Dominik Mierzejewski 2.1.0-3 - set version to that of the latest firmware package - updated source url for Perfection V200 firmware * Sun Mar 01 2009 Dominik Mierzejewski 2.1.0-2 - changed licence tag - added requires udev for /lib/firmware dir ownership - added missing licence texts * Tue Feb 03 2009 Dominik Mierzejewski 2.1.0-1 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/iscan-firmware/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:23:29 -0000 1.1 +++ .cvsignore 3 Mar 2009 02:11:36 -0000 1.2 @@ -0,0 +1,11 @@ +esci-interpreter-gt-f720-0.0.0-1.i386.rpm +iscan-plugin-gt-1500-2.1.0-2.c2.i386.rpm +iscan-plugin-gt-9400-1.0.0-1.c2.i386.rpm +iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm +iscan-plugin-gt-f520-1.0.0-1.c2.i386.rpm +iscan-plugin-gt-f600-1.0.0-1.c2.i386.rpm +iscan-plugin-gt-f670-2.1.0-2.c2.i386.rpm +iscan-plugin-gt-f700-2.0.0-0.c2.i386.rpm +iscan-plugin-gt-s600-2.0.0-1.c2.i386.rpm +iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm +iscan-plugin-gt-x770-2.1.0-1.c2.i386.rpm Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iscan-firmware/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:23:29 -0000 1.1 +++ sources 3 Mar 2009 02:11:36 -0000 1.2 @@ -0,0 +1,11 @@ +a40321092887e426b04408840ad29b50 esci-interpreter-gt-f720-0.0.0-1.i386.rpm +ed12335648c893eda194afee38e51351 iscan-plugin-gt-1500-2.1.0-2.c2.i386.rpm +f76725766f44debe3f3fec06d0e2023b iscan-plugin-gt-9400-1.0.0-1.c2.i386.rpm +8b1c398ef58769d9ceb77ad771515de3 iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm +b72a512a927b9f2020af817c5a541ae8 iscan-plugin-gt-f520-1.0.0-1.c2.i386.rpm +5f4137fd69198617b95bd59261affd75 iscan-plugin-gt-f600-1.0.0-1.c2.i386.rpm +b03b4e52d3c7c784599b1191b4d6740a iscan-plugin-gt-f670-2.1.0-2.c2.i386.rpm +cf191e84b03b28a8b0f629d60ba0b36e iscan-plugin-gt-f700-2.0.0-0.c2.i386.rpm +bda9d1dfe5c9524084b01e46a7a9f5e3 iscan-plugin-gt-s600-2.0.0-1.c2.i386.rpm +02c151a49608ae911b1e200672ed236f iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm +c33515ec3e57eed680cd599452141d45 iscan-plugin-gt-x770-2.1.0-1.c2.i386.rpm From rathann at fedoraproject.org Tue Mar 3 02:20:14 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Tue, 3 Mar 2009 02:20:14 +0000 (UTC) Subject: rpms/iscan-firmware/F-10 iscan-firmware.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303022014.A3B4E70116@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/iscan-firmware/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9172/F-10 Modified Files: .cvsignore sources Added Files: iscan-firmware.spec Log Message: - initial import into F-9/10 branches --- NEW FILE iscan-firmware.spec --- Summary: Firmware for Epson flatbed scanners Name: iscan-firmware Version: 2.1.0 Release: 3 License: Redistributable, no modification permitted URL: http://www.avasys.jp/english/linux_e/index.html # Perfection 2480/2580 PHOTO Source0: http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm # Perfection 3170 PHOTO Source1: http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-9400-1.0.0-1.c2.i386.rpm # Perfection 3490 PHOTO Source2: http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-f520-1.0.0-1.c2.i386.rpm # Perfection 4180 PHOTO Source3: http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-f600-1.0.0-1.c2.i386.rpm # Perfection 4490 PHOTO Source4: http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm # Perfection V10 / V100 PHOTO Source5: http://lx1.avasys.jp/iscan/2.3.0/iscan-plugin-gt-s600-2.0.0-1.c2.i386.rpm # Perfection V200 PHOTO Source6: http://linux.avasys.jp/drivers/iscan/plugins/iscan-plugin-gt-f670-2.1.0-2.c2.i386.rpm # Perfection V350 PHOTO Source7: http://lx1.avasys.jp/iscan/2.3.0/iscan-plugin-gt-f700-2.0.0-0.c2.i386.rpm # GT-1500 Source8: http://lx1.avasys.jp/iscan/2.12.0/iscan-plugin-gt-1500-2.1.0-2.c2.i386.rpm # Perfection V30 / V300 Source9: http://linux.avasys.jp/drivers/iscan/plugins/esci-interpreter-gt-f720-0.0.0-1.i386.rpm # Perfection V500 PHOTO Source10: http://lx1.avasys.jp/iscan/2.12.0/iscan-plugin-gt-x770-2.1.0-1.c2.i386.rpm Group: System Environment/Base BuildArch: noarch Requires: udev BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Firmware for the following Epson flatbed scanners: * GT-1500 / GT-D1000 * Perfection 2480/2580 PHOTO / GT-F500 * Perfection 3170 PHOTO / GT-9400 * Perfection 3490 PHOTO / GT-F520 * Perfection 4180 PHOTO / GT-F600 * Perfection 4490 PHOTO / GT-X750 * Perfection V10/V100 PHOTO / GT-S600 * Perfection V200 PHOTO / GT-F670 * Perfection V30/V300 / GT-F720 / GT-S620 * Perfection V350 PHOTO / GT-F700 * Perfection V500 PHOTO / GT-X770 %prep %setup -c -T for f in \ %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} ; do rpm2cpio $f | cpio --extract --make-directories --no-absolute-filenames --preserve-modification-time --quiet done cp -p usr/share/doc/iscan-plugin-gt-1500-*/AVASYSPL.*.txt ./ cp -p usr/share/doc/iscan-plugin-gt-f520-*/{EAPL,LICENSE.EPSON}.en.txt ./ for file in EAPL.ja.txt LICENSE.EPSON.ja.txt ; do iconv -f euc-jp -t utf8 usr/share/doc/iscan-plugin-gt-f520-*/$file > ./$file && \ touch -r usr/share/doc/iscan-plugin-gt-f520-*/$file ./$file done %build echo Nothing to build %install rm -rf %{buildroot} install -dm755 %{buildroot}/lib/firmware/epson install -pm644 .%{_datadir}/{iscan,esci}/esfw*.bin %{buildroot}/lib/firmware/epson %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AVASYSPL.en.txt EAPL.en.txt LICENSE.EPSON.en.txt %lang(ja) %doc AVASYSPL.ja.txt EAPL.ja.txt LICENSE.EPSON.ja.txt /lib/firmware/epson %changelog * Mon Mar 03 2009 Dominik Mierzejewski 2.1.0-3 - set version to that of the latest firmware package - updated source url for Perfection V200 firmware * Sun Mar 01 2009 Dominik Mierzejewski 2.1.0-2 - changed licence tag - added requires udev for /lib/firmware dir ownership - added missing licence texts * Tue Feb 03 2009 Dominik Mierzejewski 2.1.0-1 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/iscan-firmware/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:23:29 -0000 1.1 +++ .cvsignore 3 Mar 2009 02:19:44 -0000 1.2 @@ -0,0 +1,11 @@ +esci-interpreter-gt-f720-0.0.0-1.i386.rpm +iscan-plugin-gt-1500-2.1.0-2.c2.i386.rpm +iscan-plugin-gt-9400-1.0.0-1.c2.i386.rpm +iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm +iscan-plugin-gt-f520-1.0.0-1.c2.i386.rpm +iscan-plugin-gt-f600-1.0.0-1.c2.i386.rpm +iscan-plugin-gt-f670-2.1.0-2.c2.i386.rpm +iscan-plugin-gt-f700-2.0.0-0.c2.i386.rpm +iscan-plugin-gt-s600-2.0.0-1.c2.i386.rpm +iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm +iscan-plugin-gt-x770-2.1.0-1.c2.i386.rpm Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iscan-firmware/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:23:29 -0000 1.1 +++ sources 3 Mar 2009 02:19:44 -0000 1.2 @@ -0,0 +1,11 @@ +a40321092887e426b04408840ad29b50 esci-interpreter-gt-f720-0.0.0-1.i386.rpm +ed12335648c893eda194afee38e51351 iscan-plugin-gt-1500-2.1.0-2.c2.i386.rpm +f76725766f44debe3f3fec06d0e2023b iscan-plugin-gt-9400-1.0.0-1.c2.i386.rpm +8b1c398ef58769d9ceb77ad771515de3 iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm +b72a512a927b9f2020af817c5a541ae8 iscan-plugin-gt-f520-1.0.0-1.c2.i386.rpm +5f4137fd69198617b95bd59261affd75 iscan-plugin-gt-f600-1.0.0-1.c2.i386.rpm +b03b4e52d3c7c784599b1191b4d6740a iscan-plugin-gt-f670-2.1.0-2.c2.i386.rpm +cf191e84b03b28a8b0f629d60ba0b36e iscan-plugin-gt-f700-2.0.0-0.c2.i386.rpm +bda9d1dfe5c9524084b01e46a7a9f5e3 iscan-plugin-gt-s600-2.0.0-1.c2.i386.rpm +02c151a49608ae911b1e200672ed236f iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm +c33515ec3e57eed680cd599452141d45 iscan-plugin-gt-x770-2.1.0-1.c2.i386.rpm From rathann at fedoraproject.org Tue Mar 3 02:20:14 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Tue, 3 Mar 2009 02:20:14 +0000 (UTC) Subject: rpms/iscan-firmware/F-9 iscan-firmware.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303022014.C312370117@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/iscan-firmware/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9172/F-9 Modified Files: .cvsignore sources Added Files: iscan-firmware.spec Log Message: - initial import into F-9/10 branches --- NEW FILE iscan-firmware.spec --- Summary: Firmware for Epson flatbed scanners Name: iscan-firmware Version: 2.1.0 Release: 3 License: Redistributable, no modification permitted URL: http://www.avasys.jp/english/linux_e/index.html # Perfection 2480/2580 PHOTO Source0: http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm # Perfection 3170 PHOTO Source1: http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-9400-1.0.0-1.c2.i386.rpm # Perfection 3490 PHOTO Source2: http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-f520-1.0.0-1.c2.i386.rpm # Perfection 4180 PHOTO Source3: http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-f600-1.0.0-1.c2.i386.rpm # Perfection 4490 PHOTO Source4: http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm # Perfection V10 / V100 PHOTO Source5: http://lx1.avasys.jp/iscan/2.3.0/iscan-plugin-gt-s600-2.0.0-1.c2.i386.rpm # Perfection V200 PHOTO Source6: http://linux.avasys.jp/drivers/iscan/plugins/iscan-plugin-gt-f670-2.1.0-2.c2.i386.rpm # Perfection V350 PHOTO Source7: http://lx1.avasys.jp/iscan/2.3.0/iscan-plugin-gt-f700-2.0.0-0.c2.i386.rpm # GT-1500 Source8: http://lx1.avasys.jp/iscan/2.12.0/iscan-plugin-gt-1500-2.1.0-2.c2.i386.rpm # Perfection V30 / V300 Source9: http://linux.avasys.jp/drivers/iscan/plugins/esci-interpreter-gt-f720-0.0.0-1.i386.rpm # Perfection V500 PHOTO Source10: http://lx1.avasys.jp/iscan/2.12.0/iscan-plugin-gt-x770-2.1.0-1.c2.i386.rpm Group: System Environment/Base BuildArch: noarch Requires: udev BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Firmware for the following Epson flatbed scanners: * GT-1500 / GT-D1000 * Perfection 2480/2580 PHOTO / GT-F500 * Perfection 3170 PHOTO / GT-9400 * Perfection 3490 PHOTO / GT-F520 * Perfection 4180 PHOTO / GT-F600 * Perfection 4490 PHOTO / GT-X750 * Perfection V10/V100 PHOTO / GT-S600 * Perfection V200 PHOTO / GT-F670 * Perfection V30/V300 / GT-F720 / GT-S620 * Perfection V350 PHOTO / GT-F700 * Perfection V500 PHOTO / GT-X770 %prep %setup -c -T for f in \ %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} ; do rpm2cpio $f | cpio --extract --make-directories --no-absolute-filenames --preserve-modification-time --quiet done cp -p usr/share/doc/iscan-plugin-gt-1500-*/AVASYSPL.*.txt ./ cp -p usr/share/doc/iscan-plugin-gt-f520-*/{EAPL,LICENSE.EPSON}.en.txt ./ for file in EAPL.ja.txt LICENSE.EPSON.ja.txt ; do iconv -f euc-jp -t utf8 usr/share/doc/iscan-plugin-gt-f520-*/$file > ./$file && \ touch -r usr/share/doc/iscan-plugin-gt-f520-*/$file ./$file done %build echo Nothing to build %install rm -rf %{buildroot} install -dm755 %{buildroot}/lib/firmware/epson install -pm644 .%{_datadir}/{iscan,esci}/esfw*.bin %{buildroot}/lib/firmware/epson %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AVASYSPL.en.txt EAPL.en.txt LICENSE.EPSON.en.txt %lang(ja) %doc AVASYSPL.ja.txt EAPL.ja.txt LICENSE.EPSON.ja.txt /lib/firmware/epson %changelog * Mon Mar 03 2009 Dominik Mierzejewski 2.1.0-3 - set version to that of the latest firmware package - updated source url for Perfection V200 firmware * Sun Mar 01 2009 Dominik Mierzejewski 2.1.0-2 - changed licence tag - added requires udev for /lib/firmware dir ownership - added missing licence texts * Tue Feb 03 2009 Dominik Mierzejewski 2.1.0-1 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/iscan-firmware/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:23:29 -0000 1.1 +++ .cvsignore 3 Mar 2009 02:19:44 -0000 1.2 @@ -0,0 +1,11 @@ +esci-interpreter-gt-f720-0.0.0-1.i386.rpm +iscan-plugin-gt-1500-2.1.0-2.c2.i386.rpm +iscan-plugin-gt-9400-1.0.0-1.c2.i386.rpm +iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm +iscan-plugin-gt-f520-1.0.0-1.c2.i386.rpm +iscan-plugin-gt-f600-1.0.0-1.c2.i386.rpm +iscan-plugin-gt-f670-2.1.0-2.c2.i386.rpm +iscan-plugin-gt-f700-2.0.0-0.c2.i386.rpm +iscan-plugin-gt-s600-2.0.0-1.c2.i386.rpm +iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm +iscan-plugin-gt-x770-2.1.0-1.c2.i386.rpm Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iscan-firmware/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:23:29 -0000 1.1 +++ sources 3 Mar 2009 02:19:44 -0000 1.2 @@ -0,0 +1,11 @@ +a40321092887e426b04408840ad29b50 esci-interpreter-gt-f720-0.0.0-1.i386.rpm +ed12335648c893eda194afee38e51351 iscan-plugin-gt-1500-2.1.0-2.c2.i386.rpm +f76725766f44debe3f3fec06d0e2023b iscan-plugin-gt-9400-1.0.0-1.c2.i386.rpm +8b1c398ef58769d9ceb77ad771515de3 iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm +b72a512a927b9f2020af817c5a541ae8 iscan-plugin-gt-f520-1.0.0-1.c2.i386.rpm +5f4137fd69198617b95bd59261affd75 iscan-plugin-gt-f600-1.0.0-1.c2.i386.rpm +b03b4e52d3c7c784599b1191b4d6740a iscan-plugin-gt-f670-2.1.0-2.c2.i386.rpm +cf191e84b03b28a8b0f629d60ba0b36e iscan-plugin-gt-f700-2.0.0-0.c2.i386.rpm +bda9d1dfe5c9524084b01e46a7a9f5e3 iscan-plugin-gt-s600-2.0.0-1.c2.i386.rpm +02c151a49608ae911b1e200672ed236f iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm +c33515ec3e57eed680cd599452141d45 iscan-plugin-gt-x770-2.1.0-1.c2.i386.rpm From rathann at fedoraproject.org Tue Mar 3 02:22:36 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Tue, 3 Mar 2009 02:22:36 +0000 (UTC) Subject: rpms/iscan-firmware/F-10 iscan-firmware.spec,1.1,1.2 Message-ID: <20090303022236.3285870116@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/iscan-firmware/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9584/F-10 Modified Files: iscan-firmware.spec Log Message: - added disttag Index: iscan-firmware.spec =================================================================== RCS file: /cvs/pkgs/rpms/iscan-firmware/F-10/iscan-firmware.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- iscan-firmware.spec 3 Mar 2009 02:19:44 -0000 1.1 +++ iscan-firmware.spec 3 Mar 2009 02:22:05 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Firmware for Epson flatbed scanners Name: iscan-firmware Version: 2.1.0 -Release: 3 +Release: 3%{?dist} License: Redistributable, no modification permitted URL: http://www.avasys.jp/english/linux_e/index.html # Perfection 2480/2580 PHOTO @@ -83,6 +83,7 @@ * Mon Mar 03 2009 Dominik Mierzejewski 2.1.0-3 - set version to that of the latest firmware package - updated source url for Perfection V200 firmware +- added disttag * Sun Mar 01 2009 Dominik Mierzejewski 2.1.0-2 - changed licence tag From rathann at fedoraproject.org Tue Mar 3 02:22:36 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Tue, 3 Mar 2009 02:22:36 +0000 (UTC) Subject: rpms/iscan-firmware/devel iscan-firmware.spec,1.1,1.2 Message-ID: <20090303022236.905A670116@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/iscan-firmware/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9584/devel Modified Files: iscan-firmware.spec Log Message: - added disttag Index: iscan-firmware.spec =================================================================== RCS file: /cvs/pkgs/rpms/iscan-firmware/devel/iscan-firmware.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- iscan-firmware.spec 3 Mar 2009 02:11:36 -0000 1.1 +++ iscan-firmware.spec 3 Mar 2009 02:22:06 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Firmware for Epson flatbed scanners Name: iscan-firmware Version: 2.1.0 -Release: 3 +Release: 3%{?dist} License: Redistributable, no modification permitted URL: http://www.avasys.jp/english/linux_e/index.html # Perfection 2480/2580 PHOTO @@ -83,6 +83,7 @@ * Mon Mar 03 2009 Dominik Mierzejewski 2.1.0-3 - set version to that of the latest firmware package - updated source url for Perfection V200 firmware +- added disttag * Sun Mar 01 2009 Dominik Mierzejewski 2.1.0-2 - changed licence tag From rathann at fedoraproject.org Tue Mar 3 02:22:36 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Tue, 3 Mar 2009 02:22:36 +0000 (UTC) Subject: rpms/iscan-firmware/F-9 iscan-firmware.spec,1.1,1.2 Message-ID: <20090303022236.5456870116@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/iscan-firmware/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9584/F-9 Modified Files: iscan-firmware.spec Log Message: - added disttag Index: iscan-firmware.spec =================================================================== RCS file: /cvs/pkgs/rpms/iscan-firmware/F-9/iscan-firmware.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- iscan-firmware.spec 3 Mar 2009 02:19:44 -0000 1.1 +++ iscan-firmware.spec 3 Mar 2009 02:22:06 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Firmware for Epson flatbed scanners Name: iscan-firmware Version: 2.1.0 -Release: 3 +Release: 3%{?dist} License: Redistributable, no modification permitted URL: http://www.avasys.jp/english/linux_e/index.html # Perfection 2480/2580 PHOTO @@ -83,6 +83,7 @@ * Mon Mar 03 2009 Dominik Mierzejewski 2.1.0-3 - set version to that of the latest firmware package - updated source url for Perfection V200 firmware +- added disttag * Sun Mar 01 2009 Dominik Mierzejewski 2.1.0-2 - changed licence tag From mclasen at fedoraproject.org Tue Mar 3 02:32:25 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 02:32:25 +0000 (UTC) Subject: rpms/tomboy/devel .cvsignore, 1.40, 1.41 sources, 1.40, 1.41 tomboy.spec, 1.107, 1.108 Message-ID: <20090303023225.B86DA70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/tomboy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11446 Modified Files: .cvsignore sources tomboy.spec Log Message: 0.13.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 19 Feb 2009 05:38:15 -0000 1.40 +++ .cvsignore 3 Mar 2009 02:31:55 -0000 1.41 @@ -1 +1 @@ -tomboy-0.13.5.tar.bz2 +tomboy-0.13.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 19 Feb 2009 05:38:15 -0000 1.40 +++ sources 3 Mar 2009 02:31:55 -0000 1.41 @@ -1 +1 @@ -c61662c215513911a828581c0ce46f4d tomboy-0.13.5.tar.bz2 +95a3966a5622ed1b96af1d9a92263de6 tomboy-0.13.6.tar.bz2 Index: tomboy.spec =================================================================== RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- tomboy.spec 25 Feb 2009 21:13:53 -0000 1.107 +++ tomboy.spec 3 Mar 2009 02:31:55 -0000 1.108 @@ -1,6 +1,6 @@ Name: tomboy -Version: 0.13.5 -Release: 2%{?dist} +Version: 0.13.6 +Release: 1%{?dist} Summary: Note-taking application Group: User Interface/Desktops @@ -31,7 +31,6 @@ BuildRequires: mono-addins-devel BuildRequires: automake, autoconf, libtool, intltool - Requires: gtkspell # Mono isn't available for s390 or ppc64 apparently @@ -40,8 +39,8 @@ %description Tomboy is a desktop note-taking application which is simple and easy to use. -It lets you organise your notes intelligently by allowing you to easily link -ideas together with Wiki style interconnects. +It lets you organise your notes intelligently by allowing you to easily link +ideas together with Wiki style interconnects. %prep %setup -q @@ -132,6 +131,9 @@ %changelog +* Mon Mar 2 2009 Matthias Clasen - 0.13.6-1 +- Update to 0.13.6 + * Wed Feb 25 2009 Fedora Release Engineering - 0.13.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mclasen at fedoraproject.org Tue Mar 3 02:37:07 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 02:37:07 +0000 (UTC) Subject: rpms/control-center/devel .cvsignore, 1.86, 1.87 control-center.spec, 1.436, 1.437 sources, 1.89, 1.90 Message-ID: <20090303023707.55CB070116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/control-center/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12229 Modified Files: .cvsignore control-center.spec sources Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/.cvsignore,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- .cvsignore 5 Feb 2009 05:12:54 -0000 1.86 +++ .cvsignore 3 Mar 2009 02:36:36 -0000 1.87 @@ -1 +1 @@ -gnome-control-center-2.25.90.tar.bz2 +gnome-control-center-2.25.92.tar.bz2 Index: control-center.spec =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v retrieving revision 1.436 retrieving revision 1.437 diff -u -r1.436 -r1.437 --- control-center.spec 24 Feb 2009 09:06:37 -0000 1.436 +++ control-center.spec 3 Mar 2009 02:36:36 -0000 1.437 @@ -22,8 +22,8 @@ Summary: Utilities to configure the GNOME desktop Name: control-center -Version: 2.25.90 -Release: 4%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -37,7 +37,7 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=475804 Patch10: gcc-pam-fprintd-avail.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=545075 +# http://bugzilla.gnome.org/show_bug.cgi?id=545075 Patch22: slab-icon-names.patch # http://bugzilla.gnome.org/show_bug.cgi?id=554507 @@ -60,10 +60,10 @@ # change default preferred apps to programs we ship Patch99: default-applications.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.gnome.org -# the background capplets expects its .xml files in +# the background capplets expects its .xml files in # a different place now Conflicts: desktop-backgrounds-basic < 2.0-27 Conflicts: desktop-backgrounds-extended < 2.0-27 @@ -85,7 +85,7 @@ Requires: pkgconfig BuildRequires: autoconf automake libtool -BuildRequires: pango-devel +BuildRequires: pango-devel BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: librsvg2-devel @@ -111,7 +111,7 @@ BuildRequires: gnome-settings-daemon-devel BuildRequires: intltool >= 0.37.1 BuildRequires: evolution-data-server-devel >= 1.9.1 -BuildRequires: libXxf86misc-devel +BuildRequires: libXxf86misc-devel BuildRequires: libxkbfile-devel BuildRequires: libXScrnSaver-devel BuildRequires: gnome-doc-utils @@ -136,9 +136,9 @@ %description This package contains configuration utilities for the GNOME desktop, which -allow to configure accessibility options, desktop fonts, keyboard and mouse -properties, sound setup, desktop theme and background, user interface -properties, screen resolution, and other settings. +allow to configure accessibility options, desktop fonts, keyboard and mouse +properties, sound setup, desktop theme and background, user interface +properties, screen resolution, and other settings. %package devel Summary: Development files for the GNOME control-center @@ -147,7 +147,7 @@ Requires: pkgconfig %description devel -Th control-center package contains configuration utilities for the +Th control-center package contains configuration utilities for the GNOME desktop. This package contains libraries and header files needed for integrating @@ -162,7 +162,7 @@ %description filesystem The GNOME control-center provides a number of extension points -for applications. This package contains directories where applications +for applications. This package contains directories where applications can install configuration files that are picked up by the control-center utilities. @@ -199,7 +199,7 @@ --enable-alsa \ --enable-aboutme \ --disable-update-mimedb \ - CFLAGS="$RPM_OPT_FLAGS -Wno-error" + CFLAGS="$RPM_OPT_FLAGS -Wno-error" make %{?_smp_mflags} %install @@ -351,6 +351,9 @@ %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Mon Mar 2 2009 Matthias Clasen - 2.25.92-1 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 1:2.25.90-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- sources 5 Feb 2009 05:12:54 -0000 1.89 +++ sources 3 Mar 2009 02:36:36 -0000 1.90 @@ -1 +1 @@ -26c9193ed7bc7061800af7058c6d1ce7 gnome-control-center-2.25.90.tar.bz2 +e6dce514e1a03e43c1f51b05928ddad3 gnome-control-center-2.25.92.tar.bz2 From glommer at fedoraproject.org Tue Mar 3 02:39:12 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 3 Mar 2009 02:39:12 +0000 (UTC) Subject: rpms/qemu/devel qemu.spec,1.48,1.49 Message-ID: <20090303023912.B9E4E70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12602 Modified Files: qemu.spec Log Message: use vgabios from vgabios package Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- qemu.spec 3 Mar 2009 00:16:00 -0000 1.48 +++ qemu.spec 3 Mar 2009 02:38:42 -0000 1.49 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 1.0 -Release: 0.2.svn6666%{?dist} +Release: 0.3.svn6666%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://www.qemu.org/ @@ -77,6 +77,7 @@ %qemupkg system-x86 {system emulator for x86} Requires: etherboot-zroms-kvm +Requires: vgabios %qemudesc system-x86 {system emulator for x86} %qemupkgdesc system-ppc {system emulator for ppc} @@ -131,6 +132,7 @@ install -D -p -m 0644 -t ${RPM_BUILD_ROOT}/%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/pxe*bin +rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/vgabios*bin # the pxe etherboot images will be symlinks to the images on # /usr/share/etherboot, as QEMU doesn't know how to look @@ -144,6 +146,8 @@ pxe_link pcnet pcnet32 pxe_link rtl8139 rtl8139 pxe_link virtio virtio-net +ln -s ../vgabios/VGABIOS-lgpl-latest.bin %{buildroot}/usr/share/qemu/vgabios.bin +ln -s ../vgabios/VGABIOS-lgpl-latest.cirrus.bin %{buildroot}/usr/share/qemu/vgabios-cirrus.bin %clean rm -rf $RPM_BUILD_ROOT @@ -243,6 +247,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Tue Mar 03 2009 Glauber Costa - 1.0-0.3.svn6666 +- use vgabios from vgabios package. + * Mon Mar 02 2009 Glauber Costa - 1.0-0.2.svn6666 - use pxe roms from etherboot package. From mclasen at fedoraproject.org Tue Mar 3 02:49:53 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 02:49:53 +0000 (UTC) Subject: rpms/control-center/devel control-center.spec, 1.437, 1.438 initial-layout.patch, 1.1, NONE Message-ID: <20090303024953.8BCC270116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/control-center/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14834 Modified Files: control-center.spec Removed Files: initial-layout.patch Log Message: drop upstreamed patch Index: control-center.spec =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v retrieving revision 1.437 retrieving revision 1.438 diff -u -r1.437 -r1.438 --- control-center.spec 3 Mar 2009 02:36:36 -0000 1.437 +++ control-center.spec 3 Mar 2009 02:49:23 -0000 1.438 @@ -51,9 +51,6 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=546036 Patch33: notification-theme.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=550721 -Patch34: initial-layout.patch - # call the Fedora/RHEL graphical passwd changing apps Patch95: gnome-control-center-2.25.2-passwd.patch Patch96: gnome-control-center-2.25.2-gecos.patch @@ -176,7 +173,6 @@ %patch30 -p1 -b .default-layout-toggle %patch32 -p1 -b .display-no-help %patch33 -p1 -b .notification-theme -%patch34 -p1 -b .initial-layout # vendor configuration patches %patch95 -p1 -b .passwd --- initial-layout.patch DELETED --- From glommer at fedoraproject.org Tue Mar 3 02:55:49 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 3 Mar 2009 02:55:49 +0000 (UTC) Subject: rpms/bochs-bios/devel bochs-bios.spec,1.1,1.2 Message-ID: <20090303025549.94D2370116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/bochs-bios/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15534 Modified Files: bochs-bios.spec Log Message: try to avoid the clashes by getting rid of the debuginfo package. Index: bochs-bios.spec =================================================================== RCS file: /cvs/pkgs/rpms/bochs-bios/devel/bochs-bios.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bochs-bios.spec 3 Mar 2009 02:05:32 -0000 1.1 +++ bochs-bios.spec 3 Mar 2009 02:55:19 -0000 1.2 @@ -1,8 +1,13 @@ %define githead 36989b0d2 +# debugging firmwares does not goes the same way as a normal program. +# moreover, all architectures providing debuginfo for a single noarch +# package is currently clashing in koji, so don't bother. +%global debug_package %{nil} + Name: bochs-bios Version: 2.3.8 -Release: 0.4.git%{githead}%{?dist} +Release: 0.5.git%{githead}%{?dist} Summary: Bios implementation from the Bochs project Group: Applications/Emulators License: LGPLv2+ @@ -76,6 +81,9 @@ %changelog +* Tue Mar 03 2009 Glauber Costa 2.3.8-0.5.git36989b0d2 +- Don't create debug packages, as they'll clash. + * Mon Mar 02 2009 Glauber Costa 2.3.8-0.4.git36989b0d2 - Don't use prebuilt binaries anymore. From pkgdb at fedoraproject.org Tue Mar 3 03:01:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 03:01:06 +0000 Subject: [pkgdb] hal: whot has requested watchcommits Message-ID: <20090303030128.5A7D42084BA@bastion.fedora.phx.redhat.com> whot has requested the watchcommits acl on hal (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/hal From pkgdb at fedoraproject.org Tue Mar 3 03:01:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 03:01:39 +0000 Subject: [pkgdb] hal: whot has requested watchcommits Message-ID: <20090303030139.ED3242084D0@bastion.fedora.phx.redhat.com> whot has requested the watchcommits acl on hal (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/hal From whot at fedoraproject.org Tue Mar 3 03:10:02 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Tue, 3 Mar 2009 03:10:02 +0000 (UTC) Subject: rpms/hal/devel hal.spec,1.184,1.185 hal-tablet.patch,1.1,NONE Message-ID: <20090303031002.9497270116@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/hal/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17596 Modified Files: hal.spec Removed Files: hal-tablet.patch Log Message: * Tue Mar 03 2009 Peter Hutterer - purge hal-tablet.patch: fixed upstream in a different manner, see b0a2575f1. Index: hal.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- hal.spec 28 Feb 2009 09:26:13 -0000 1.184 +++ hal.spec 3 Mar 2009 03:09:32 -0000 1.185 @@ -40,11 +40,6 @@ Patch2: hal-change-priority.patch Patch3: hal-add-keys-to-buttons.patch -# -- I have disabled patch6 as the code upstream is very different, and possibly -# fixed in a different way. Can you get this patch upstream if this is not -# correct please. Thanks, Richard Hughes. -# https://bugzilla.redhat.com/show_bug.cgi?id=473144 -#Patch6: hal-tablet.patch Patch7: hal-tablet-evdev.patch # upstream @@ -146,7 +141,6 @@ %patch1 -p1 -b .direct %patch2 -p1 -b .priority %patch3 -p1 -b .keys -#%patch6 -p1 -b .tablet %patch7 -p1 -b .tablet-evdev %patch8 -p1 -b .fix-udev @@ -299,6 +293,9 @@ %{_datadir}/gtk-doc/html/libhal-storage/* %changelog +* Tue Mar 03 2009 Peter Hutterer +- purge hal-tablet.patch: fixed upstream in a different manner, see b0a2575f1. + * Sat Feb 28 2009 Richard Hughes - 0.5.12-22.20090226git - Fix the udev install path, as upstream hal is broken --- hal-tablet.patch DELETED --- From spot at fedoraproject.org Tue Mar 3 03:11:11 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Mar 2009 03:11:11 +0000 (UTC) Subject: rpms/mono-nunit22/devel mono-nunit22.spec,1.9,1.10 Message-ID: <20090303031111.6EBA870116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/mono-nunit22/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17788 Modified Files: mono-nunit22.spec Log Message: add fonts to fix build Index: mono-nunit22.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono-nunit22/devel/mono-nunit22.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mono-nunit22.spec 26 Feb 2009 02:33:12 -0000 1.9 +++ mono-nunit22.spec 3 Mar 2009 03:10:41 -0000 1.10 @@ -2,7 +2,7 @@ Name: mono-nunit22 Version: 2.4.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Unit-testing framework for .NET URL: http://www.nunit.org/ License: MIT with acknowledgement @@ -13,6 +13,9 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: mono-devel >= 2.2 , nant BuildRequires: unzip +# I don't know why this thing needs fonts to be present at build. But it does. +# It's C#. Who knows why it does the wacky things it does? +BuildRequires: liberation-sans-fonts # There is no nant for ppc/ppc64/sparc64 ExcludeArch: ppc64 ppc sparc64 @@ -72,6 +75,9 @@ %changelog +* Mon Mar 2 2009 Tom "spot" Callaway - 2.4.8-4 +- add fonts as BR to get this turd building again + * Wed Feb 25 2009 Fedora Release Engineering - 2.4.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From glommer at fedoraproject.org Tue Mar 3 03:12:35 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 3 Mar 2009 03:12:35 +0000 (UTC) Subject: rpms/bochs-bios/devel bochs-bios.spec,1.2,1.3 Message-ID: <20090303031235.43F1170116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/bochs-bios/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17879 Modified Files: bochs-bios.spec Log Message: Use conditionals on ix86 instead of BuildArch. This scheme is uglier, but works much better while rpm bug #442105 is not fixed yet. Index: bochs-bios.spec =================================================================== RCS file: /cvs/pkgs/rpms/bochs-bios/devel/bochs-bios.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bochs-bios.spec 3 Mar 2009 02:55:19 -0000 1.2 +++ bochs-bios.spec 3 Mar 2009 03:12:05 -0000 1.3 @@ -7,7 +7,7 @@ Name: bochs-bios Version: 2.3.8 -Release: 0.5.git%{githead}%{?dist} +Release: 0.6.git%{githead}%{?dist} Summary: Bios implementation from the Bochs project Group: Applications/Emulators License: LGPLv2+ @@ -28,14 +28,13 @@ Patch9: %{name}-0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libXt-devel libXpm-devel SDL-devel readline-devel byacc dev86 iasl -BuildArch: %{ix86} x86_64 - %description Bochs BIOS is a free implementation of a x86 BIOS provided by the Bochs projects. It can also be used in other emulators, such as QEMU +%ifarch %{ix86} %package data Summary: real data for the bios BuildArch: noarch @@ -43,6 +42,7 @@ %description data Bochs BIOS is a free implementation of a x86 BIOS provided by the Bochs projects. It can also be used in other emulators, such as QEMU +%endif %prep @@ -60,27 +60,36 @@ %build +%ifarch %{ix86} %configure --prefix=/%{_prefix} make -C bios %{?_smp_mflags} +%endif %install rm -rf $RPM_BUILD_ROOT +%ifarch %{ix86} mkdir -p $RPM_BUILD_ROOT%{_datadir}/bochs install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/bochs/ bios/BIOS* +%endif %clean rm -rf $RPM_BUILD_ROOT - +%ifarch %{ix86} %files data %defattr(-,root,root,-) %dir %{_datadir}/bochs/ %{_datadir}/bochs/BIOS-bochs-latest %{_datadir}/bochs/BIOS-bochs-legacy +%endif %changelog +* Tue Mar 03 2009 Glauber Costa 2.3.8-0.6.git36989b0d2 +- Use conditionals on ix86 instead of BuildArch. This scheme is uglier, but + works much better while rpm bug #442105 is not fixed yet. + * Tue Mar 03 2009 Glauber Costa 2.3.8-0.5.git36989b0d2 - Don't create debug packages, as they'll clash. From salimma at fedoraproject.org Tue Mar 3 03:27:16 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Tue, 3 Mar 2009 03:27:16 +0000 (UTC) Subject: rpms/banshee/F-10 banshee.spec,1.67,1.68 Message-ID: <20090303032716.8CA2C70116@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/banshee/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21298 Modified Files: banshee.spec Log Message: * Mon Mar 2 2009 Michel Salim - 1.4.2-3.1 - Rebuild for new mono-zeroconf Index: banshee.spec =================================================================== RCS file: /cvs/pkgs/rpms/banshee/F-10/banshee.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- banshee.spec 12 Feb 2009 15:26:33 -0000 1.67 +++ banshee.spec 3 Mar 2009 03:26:46 -0000 1.68 @@ -2,7 +2,7 @@ Name: banshee Version: 1.4.2 -Release: 3%{?dist} +Release: 3%{?dist}.1 Summary: Easily import, manage, and play selections from your music collection Group: Applications/Multimedia License: MIT @@ -197,6 +197,9 @@ %changelog +* Mon Mar 2 2009 Michel Salim - 1.4.2-3.1 +- Rebuild for new mono-zeroconf + * Wed Feb 11 2009 Michel Salim - 1.4.2-3 - Enable video mode support - Enable unit tests if nunit-2.4 is available From tmz at fedoraproject.org Tue Mar 3 03:28:39 2009 From: tmz at fedoraproject.org (Todd M. Zullinger) Date: Tue, 3 Mar 2009 03:28:39 +0000 (UTC) Subject: rpms/facter/devel facter-1.5.4-libperms.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 facter.spec, 1.12, 1.13 sources, 1.9, 1.10 Message-ID: <20090303032839.292A270116@cvs1.fedora.phx.redhat.com> Author: tmz Update of /cvs/extras/rpms/facter/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21517 Modified Files: .cvsignore facter.spec sources Added Files: facter-1.5.4-libperms.patch Log Message: Update to 1.5.4 - Use upstream install script facter-1.5.4-libperms.patch: --- NEW FILE facter-1.5.4-libperms.patch --- diff -up facter-1.5.4/install.rb.libperms facter-1.5.4/install.rb --- facter-1.5.4/install.rb.libperms 2008-09-08 23:00:03.000000000 -0400 +++ facter-1.5.4/install.rb 2009-02-28 14:15:53.000000000 -0500 @@ -93,7 +93,7 @@ def do_libs(libs, strip = 'lib/') op = File.dirname(olf) File.makedirs(op, true) File.chmod(0755, op) - File.install(lf, olf, 0755, true) + File.install(lf, olf, 0644, true) end end Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/facter/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 10 Sep 2008 06:40:51 -0000 1.9 +++ .cvsignore 3 Mar 2009 03:28:08 -0000 1.10 @@ -1 +1 @@ -facter-1.5.2.tgz +facter-1.5.4.tgz Index: facter.spec =================================================================== RCS file: /cvs/extras/rpms/facter/devel/facter.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- facter.spec 24 Feb 2009 16:03:41 -0000 1.12 +++ facter.spec 3 Mar 2009 03:28:08 -0000 1.13 @@ -5,12 +5,14 @@ Summary: Ruby module for collecting simple facts about a host operating system Name: facter -Version: 1.5.2 -Release: 2%{?dist} +Version: 1.5.4 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://reductivelabs.com/projects/facter Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz +# http://github.com/reductivelabs/facter/commit/75db918c37a9fef36c829105d1f8a99ff8bcf751 +Patch0: facter-1.5.4-libperms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %has_ruby_noarch BuildArch: noarch @@ -30,26 +32,13 @@ %prep %setup -q +%patch0 -p1 -b .libperms %build -sed -i -e 's@^#!.*$@#! /usr/bin/ruby@' bin/facter %install rm -rf %{buildroot} -mkdir -p %{buildroot} - -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir} -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util/plist -%{__install} -d -m0755 %{buildroot}%{_bindir} -%{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version} - -%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir} -%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter -%{__install} -p -m0644 lib/facter/util/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util -%{__install} -p -m0644 lib/facter/util/plist/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util/plist -%{__install} -p -m0755 bin/facter %{buildroot}%{_bindir} +ruby install.rb --destdir=%{buildroot} --quick --no-rdoc %clean rm -rf %{buildroot} @@ -64,6 +53,10 @@ %changelog +* Sat Feb 28 2009 Todd Zullinger - 1.5.4-1 +- New version +- Use upstream install script + * Tue Feb 24 2009 Fedora Release Engineering - 1.5.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/facter/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 10 Sep 2008 06:40:52 -0000 1.9 +++ sources 3 Mar 2009 03:28:08 -0000 1.10 @@ -1 +1 @@ -3d257bc2755217690fca868c0fa0cc7b facter-1.5.2.tgz +0df92b81606f8e23bdd1f2ade597049b facter-1.5.4.tgz From glommer at fedoraproject.org Tue Mar 3 03:32:23 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 3 Mar 2009 03:32:23 +0000 (UTC) Subject: rpms/etherboot/devel etherboot.spec,1.12,1.13 Message-ID: <20090303033223.2553D70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/etherboot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22182 Modified Files: etherboot.spec Log Message: Use conditionals on ix86 instead of BuildArch. This scheme is uglier, but works much better while rpm bug #442105 is not fixed yet. Index: etherboot.spec =================================================================== RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- etherboot.spec 2 Mar 2009 20:33:20 -0000 1.12 +++ etherboot.spec 3 Mar 2009 03:31:52 -0000 1.13 @@ -1,10 +1,15 @@ %define formats pxe rom zrom +# debugging firmwares does not goes the same way as a normal program. +# moreover, all architectures providing debuginfo for a single noarch +# package is currently clashing in koji, so don't bother. +%global debug_package %{nil} + # the arches where we are able to actually build the binaries. # on the other arches, we will use the prebuilt binaries Name: etherboot Version: 5.4.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Etherboot collection of boot roms Group: Development/Tools @@ -21,15 +26,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%ifarch %{ix86} BuildRequires: perl BuildRequires: syslinux BuildRequires: mtools -%ifarch x86_64 -BuildRequires: glibc32 -%endif - -BuildArch: %{ix86} x86_64 - %package pxes Summary: Etherboot - boot roms in .pxe format @@ -62,12 +62,6 @@ -%description -Etherboot is a software package for creating ROM images that can -download code over an Ethernet network to be executed on an x86 -computer. Many network adapters have a socket where a ROM chip can be -installed. Etherboot is code that can be put in such a ROM - %description pxes Etherboot is a software package for creating ROM images that can @@ -102,33 +96,39 @@ %description zroms-kvm This package contains the etherboot ROMs for devices emulated by KVM, in .zrom format. +%endif + +%description +Etherboot is a software package for creating ROM images that can +download code over an Ethernet network to be executed on an x86 +computer. Many network adapters have a socket where a ROM chip can be +installed. Etherboot is code that can be put in such a ROM + %prep %setup -q %build +%ifarch %{ix86} cd src # %{optflags} wouldn't work with our hack to build the 32-bit binaries # on x86_64, so use %{__global_cflags} instead, that doesn't include # -m64 & related flags %define extra_cflags `echo %{__global_cflags} |sed 's|-fstack-protector||g'` -%ifarch x86_64 -# flags needed to build the 32-bit binaries on x86_64 -%define makeflags ARCH=i386 EXTRA_CFLAGS="%{extra_cflags} -m32" EXTRA_ASFLAGS="--32" EXTRA_LDFLAGS="-m elf_i386" -%else %define makeflags EXTRA_CFLAGS="%{extra_cflags}" -%endif # undi is broken by now sed -i -e '/undi/d' Families make %{?_smp_mflags} allpxes allroms allzroms %{makeflags} +%endif %install rm -rf %{buildroot} +%ifarch %{ix86} mkdir -p %{buildroot}/%{_datadir}/%{name}/ pushd src/bin/ for fmt in %{formats};do @@ -148,11 +148,12 @@ echo %{_datadir}/%{name}/${rom}.${fmt} >> kvm.${fmt}.list done done +%endif %clean rm -rf %{buildroot} - +%ifarch %{ix86} %files pxes -f pxe.list %defattr(-,root,root,-) %dir %{_datadir}/%{name} @@ -172,10 +173,15 @@ %files zroms-kvm -f kvm.zrom.list %defattr(-,root,root,-) %dir %{_datadir}/%{name} +%endif %changelog -* Mon Mar 02 2009 Glauber Costa - 5.4.4-11 +* Tue Mar 03 2009 Glauber Costa - 5.4.4.13 +- Use conditionals on ix86 instead of BuildArch. This scheme is uglier, but + works much better while rpm bug #442105 is not fixed yet. + +* Mon Mar 02 2009 Glauber Costa - 5.4.4-12 - bump version * Mon Mar 02 2009 Glauber Costa - 5.4.4-11 From tmz at fedoraproject.org Tue Mar 3 03:39:12 2009 From: tmz at fedoraproject.org (Todd M. Zullinger) Date: Tue, 3 Mar 2009 03:39:12 +0000 (UTC) Subject: rpms/facter/F-10 facter-1.5.4-libperms.patch, NONE, 1.1 facter.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <20090303033912.5B42C70116@cvs1.fedora.phx.redhat.com> Author: tmz Update of /cvs/extras/rpms/facter/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23499 Modified Files: facter.spec sources Added Files: facter-1.5.4-libperms.patch Log Message: Update to 1.5.4 - Use upstream install script facter-1.5.4-libperms.patch: --- NEW FILE facter-1.5.4-libperms.patch --- diff -up facter-1.5.4/install.rb.libperms facter-1.5.4/install.rb --- facter-1.5.4/install.rb.libperms 2008-09-08 23:00:03.000000000 -0400 +++ facter-1.5.4/install.rb 2009-02-28 14:15:53.000000000 -0500 @@ -93,7 +93,7 @@ def do_libs(libs, strip = 'lib/') op = File.dirname(olf) File.makedirs(op, true) File.chmod(0755, op) - File.install(lf, olf, 0755, true) + File.install(lf, olf, 0644, true) end end Index: facter.spec =================================================================== RCS file: /cvs/extras/rpms/facter/F-10/facter.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- facter.spec 10 Sep 2008 06:40:52 -0000 1.11 +++ facter.spec 3 Mar 2009 03:38:41 -0000 1.12 @@ -5,12 +5,14 @@ Summary: Ruby module for collecting simple facts about a host operating system Name: facter -Version: 1.5.2 +Version: 1.5.4 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://reductivelabs.com/projects/facter Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz +# http://github.com/reductivelabs/facter/commit/75db918c37a9fef36c829105d1f8a99ff8bcf751 +Patch0: facter-1.5.4-libperms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %has_ruby_noarch BuildArch: noarch @@ -30,26 +32,13 @@ %prep %setup -q +%patch0 -p1 -b .libperms %build -sed -i -e 's@^#!.*$@#! /usr/bin/ruby@' bin/facter %install rm -rf %{buildroot} -mkdir -p %{buildroot} - -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir} -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util/plist -%{__install} -d -m0755 %{buildroot}%{_bindir} -%{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version} - -%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir} -%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter -%{__install} -p -m0644 lib/facter/util/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util -%{__install} -p -m0644 lib/facter/util/plist/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util/plist -%{__install} -p -m0755 bin/facter %{buildroot}%{_bindir} +ruby install.rb --destdir=%{buildroot} --quick --no-rdoc %clean rm -rf %{buildroot} @@ -64,6 +53,13 @@ %changelog +* Sat Feb 28 2009 Todd Zullinger - 1.5.4-1 +- New version +- Use upstream install script + +* Tue Feb 24 2009 Fedora Release Engineering - 1.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Sep 09 2008 Todd Zullinger - 1.5.2-1 - New version - Simplify spec file checking for Fedora and RHEL versions Index: sources =================================================================== RCS file: /cvs/extras/rpms/facter/F-10/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 10 Sep 2008 06:40:52 -0000 1.9 +++ sources 3 Mar 2009 03:38:41 -0000 1.10 @@ -1 +1 @@ -3d257bc2755217690fca868c0fa0cc7b facter-1.5.2.tgz +0df92b81606f8e23bdd1f2ade597049b facter-1.5.4.tgz From glommer at fedoraproject.org Tue Mar 3 03:41:12 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 3 Mar 2009 03:41:12 +0000 (UTC) Subject: rpms/qemu/devel qemu.spec,1.49,1.50 Message-ID: <20090303034112.8579C70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23848 Modified Files: qemu.spec Log Message: use bios from bochs-bios package. Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- qemu.spec 3 Mar 2009 02:38:42 -0000 1.49 +++ qemu.spec 3 Mar 2009 03:40:42 -0000 1.50 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 1.0 -Release: 0.3.svn6666%{?dist} +Release: 0.4.svn6666%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://www.qemu.org/ @@ -78,6 +78,7 @@ %qemupkg system-x86 {system emulator for x86} Requires: etherboot-zroms-kvm Requires: vgabios +Requires: bochs-bios %qemudesc system-x86 {system emulator for x86} %qemupkgdesc system-ppc {system emulator for ppc} @@ -133,6 +134,7 @@ rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/pxe*bin rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/vgabios*bin +rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/bios.bin # the pxe etherboot images will be symlinks to the images on # /usr/share/etherboot, as QEMU doesn't know how to look @@ -148,6 +150,7 @@ pxe_link virtio virtio-net ln -s ../vgabios/VGABIOS-lgpl-latest.bin %{buildroot}/usr/share/qemu/vgabios.bin ln -s ../vgabios/VGABIOS-lgpl-latest.cirrus.bin %{buildroot}/usr/share/qemu/vgabios-cirrus.bin +ln -s ../bochs/BIOS-bochs-latest %{buildroot}/usr/share/qemu/bios.bin %clean rm -rf $RPM_BUILD_ROOT @@ -247,6 +250,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Tue Mar 03 2009 Glauber Costa - 1.0-0.4.svn6666 +- use bios from bochs-bios package. + * Tue Mar 03 2009 Glauber Costa - 1.0-0.3.svn6666 - use vgabios from vgabios package. From tmz at fedoraproject.org Tue Mar 3 03:42:57 2009 From: tmz at fedoraproject.org (Todd M. Zullinger) Date: Tue, 3 Mar 2009 03:42:57 +0000 (UTC) Subject: rpms/facter/F-9 facter-1.5.4-libperms.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 facter.spec, 1.10, 1.11 sources, 1.9, 1.10 Message-ID: <20090303034257.8E4D370116@cvs1.fedora.phx.redhat.com> Author: tmz Update of /cvs/extras/rpms/facter/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24276 Modified Files: .cvsignore facter.spec sources Added Files: facter-1.5.4-libperms.patch Log Message: Update to 1.5.4 - Use upstream install script facter-1.5.4-libperms.patch: --- NEW FILE facter-1.5.4-libperms.patch --- diff -up facter-1.5.4/install.rb.libperms facter-1.5.4/install.rb --- facter-1.5.4/install.rb.libperms 2008-09-08 23:00:03.000000000 -0400 +++ facter-1.5.4/install.rb 2009-02-28 14:15:53.000000000 -0500 @@ -93,7 +93,7 @@ def do_libs(libs, strip = 'lib/') op = File.dirname(olf) File.makedirs(op, true) File.chmod(0755, op) - File.install(lf, olf, 0755, true) + File.install(lf, olf, 0644, true) end end Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/facter/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 10 Sep 2008 06:45:08 -0000 1.9 +++ .cvsignore 3 Mar 2009 03:42:27 -0000 1.10 @@ -1 +1 @@ -facter-1.5.2.tgz +facter-1.5.4.tgz Index: facter.spec =================================================================== RCS file: /cvs/extras/rpms/facter/F-9/facter.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- facter.spec 10 Sep 2008 06:45:08 -0000 1.10 +++ facter.spec 3 Mar 2009 03:42:27 -0000 1.11 @@ -5,12 +5,14 @@ Summary: Ruby module for collecting simple facts about a host operating system Name: facter -Version: 1.5.2 +Version: 1.5.4 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://reductivelabs.com/projects/facter Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz +# http://github.com/reductivelabs/facter/commit/75db918c37a9fef36c829105d1f8a99ff8bcf751 +Patch0: facter-1.5.4-libperms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %has_ruby_noarch BuildArch: noarch @@ -30,26 +32,13 @@ %prep %setup -q +%patch0 -p1 -b .libperms %build -sed -i -e 's@^#!.*$@#! /usr/bin/ruby@' bin/facter %install rm -rf %{buildroot} -mkdir -p %{buildroot} - -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir} -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util/plist -%{__install} -d -m0755 %{buildroot}%{_bindir} -%{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version} - -%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir} -%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter -%{__install} -p -m0644 lib/facter/util/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util -%{__install} -p -m0644 lib/facter/util/plist/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util/plist -%{__install} -p -m0755 bin/facter %{buildroot}%{_bindir} +ruby install.rb --destdir=%{buildroot} --quick --no-rdoc %clean rm -rf %{buildroot} @@ -64,6 +53,13 @@ %changelog +* Sat Feb 28 2009 Todd Zullinger - 1.5.4-1 +- New version +- Use upstream install script + +* Tue Feb 24 2009 Fedora Release Engineering - 1.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Sep 09 2008 Todd Zullinger - 1.5.2-1 - New version - Simplify spec file checking for Fedora and RHEL versions Index: sources =================================================================== RCS file: /cvs/extras/rpms/facter/F-9/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 10 Sep 2008 06:45:08 -0000 1.9 +++ sources 3 Mar 2009 03:42:27 -0000 1.10 @@ -1 +1 @@ -3d257bc2755217690fca868c0fa0cc7b facter-1.5.2.tgz +0df92b81606f8e23bdd1f2ade597049b facter-1.5.4.tgz From tmz at fedoraproject.org Tue Mar 3 03:43:54 2009 From: tmz at fedoraproject.org (Todd M. Zullinger) Date: Tue, 3 Mar 2009 03:43:54 +0000 (UTC) Subject: rpms/facter/EL-5 facter-1.5.4-libperms.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 facter.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <20090303034354.45F2570116@cvs1.fedora.phx.redhat.com> Author: tmz Update of /cvs/extras/rpms/facter/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24538 Modified Files: .cvsignore facter.spec sources Added Files: facter-1.5.4-libperms.patch Log Message: Update to 1.5.4 - Use upstream install script facter-1.5.4-libperms.patch: --- NEW FILE facter-1.5.4-libperms.patch --- diff -up facter-1.5.4/install.rb.libperms facter-1.5.4/install.rb --- facter-1.5.4/install.rb.libperms 2008-09-08 23:00:03.000000000 -0400 +++ facter-1.5.4/install.rb 2009-02-28 14:15:53.000000000 -0500 @@ -93,7 +93,7 @@ def do_libs(libs, strip = 'lib/') op = File.dirname(olf) File.makedirs(op, true) File.chmod(0755, op) - File.install(lf, olf, 0755, true) + File.install(lf, olf, 0644, true) end end Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/facter/EL-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 10 Sep 2008 06:51:05 -0000 1.9 +++ .cvsignore 3 Mar 2009 03:43:23 -0000 1.10 @@ -1 +1 @@ -facter-1.5.2.tgz +facter-1.5.4.tgz Index: facter.spec =================================================================== RCS file: /cvs/extras/rpms/facter/EL-5/facter.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- facter.spec 7 Nov 2008 19:03:42 -0000 1.11 +++ facter.spec 3 Mar 2009 03:43:23 -0000 1.12 @@ -5,14 +5,14 @@ Summary: Ruby module for collecting simple facts about a host operating system Name: facter -Version: 1.5.2 -Release: 2%{?dist} +Version: 1.5.4 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://reductivelabs.com/projects/facter Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz -# Committed upstream as de39f6c8; remove with next upstream release -Patch0: domain-search-order.patch +# http://github.com/reductivelabs/facter/commit/75db918c37a9fef36c829105d1f8a99ff8bcf751 +Patch0: facter-1.5.4-libperms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %has_ruby_noarch BuildArch: noarch @@ -32,27 +32,13 @@ %prep %setup -q -%patch0 -p1 -b .domain_order +%patch0 -p1 -b .libperms %build -sed -i -e 's@^#!.*$@#! /usr/bin/ruby@' bin/facter %install rm -rf %{buildroot} -mkdir -p %{buildroot} - -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir} -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util/plist -%{__install} -d -m0755 %{buildroot}%{_bindir} -%{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version} - -%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir} -%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter -%{__install} -p -m0644 lib/facter/util/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util -%{__install} -p -m0644 lib/facter/util/plist/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util/plist -%{__install} -p -m0755 bin/facter %{buildroot}%{_bindir} +ruby install.rb --destdir=%{buildroot} --quick --no-rdoc %clean rm -rf %{buildroot} @@ -67,8 +53,12 @@ %changelog -* Fri Nov 7 2008 David Lutterkort - 1.5.2-2 -- Add patch for upstream ticket 1654 (domain name resolution) +* Sat Feb 28 2009 Todd Zullinger - 1.5.4-1 +- New version +- Use upstream install script + +* Tue Feb 24 2009 Fedora Release Engineering - 1.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Tue Sep 09 2008 Todd Zullinger - 1.5.2-1 - New version Index: sources =================================================================== RCS file: /cvs/extras/rpms/facter/EL-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 10 Sep 2008 06:51:05 -0000 1.9 +++ sources 3 Mar 2009 03:43:23 -0000 1.10 @@ -1 +1 @@ -3d257bc2755217690fca868c0fa0cc7b facter-1.5.2.tgz +0df92b81606f8e23bdd1f2ade597049b facter-1.5.4.tgz From tmz at fedoraproject.org Tue Mar 3 03:44:51 2009 From: tmz at fedoraproject.org (Todd M. Zullinger) Date: Tue, 3 Mar 2009 03:44:51 +0000 (UTC) Subject: rpms/facter/EL-4 facter-1.5.4-libperms.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 facter.spec, 1.9, 1.10 sources, 1.8, 1.9 Message-ID: <20090303034451.31F3770116@cvs1.fedora.phx.redhat.com> Author: tmz Update of /cvs/extras/rpms/facter/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24782 Modified Files: .cvsignore facter.spec sources Added Files: facter-1.5.4-libperms.patch Log Message: Update to 1.5.4 - Use upstream install script facter-1.5.4-libperms.patch: --- NEW FILE facter-1.5.4-libperms.patch --- diff -up facter-1.5.4/install.rb.libperms facter-1.5.4/install.rb --- facter-1.5.4/install.rb.libperms 2008-09-08 23:00:03.000000000 -0400 +++ facter-1.5.4/install.rb 2009-02-28 14:15:53.000000000 -0500 @@ -93,7 +93,7 @@ def do_libs(libs, strip = 'lib/') op = File.dirname(olf) File.makedirs(op, true) File.chmod(0755, op) - File.install(lf, olf, 0755, true) + File.install(lf, olf, 0644, true) end end Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/facter/EL-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 10 Sep 2008 06:53:07 -0000 1.8 +++ .cvsignore 3 Mar 2009 03:44:20 -0000 1.9 @@ -1 +1 @@ -facter-1.5.2.tgz +facter-1.5.4.tgz Index: facter.spec =================================================================== RCS file: /cvs/extras/rpms/facter/EL-4/facter.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- facter.spec 10 Sep 2008 06:53:07 -0000 1.9 +++ facter.spec 3 Mar 2009 03:44:20 -0000 1.10 @@ -5,12 +5,14 @@ Summary: Ruby module for collecting simple facts about a host operating system Name: facter -Version: 1.5.2 +Version: 1.5.4 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://reductivelabs.com/projects/facter Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz +# http://github.com/reductivelabs/facter/commit/75db918c37a9fef36c829105d1f8a99ff8bcf751 +Patch0: facter-1.5.4-libperms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %has_ruby_noarch BuildArch: noarch @@ -30,26 +32,13 @@ %prep %setup -q +%patch0 -p1 -b .libperms %build -sed -i -e 's@^#!.*$@#! /usr/bin/ruby@' bin/facter %install rm -rf %{buildroot} -mkdir -p %{buildroot} - -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir} -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util -%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util/plist -%{__install} -d -m0755 %{buildroot}%{_bindir} -%{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version} - -%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir} -%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter -%{__install} -p -m0644 lib/facter/util/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util -%{__install} -p -m0644 lib/facter/util/plist/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util/plist -%{__install} -p -m0755 bin/facter %{buildroot}%{_bindir} +ruby install.rb --destdir=%{buildroot} --quick --no-rdoc %clean rm -rf %{buildroot} @@ -64,6 +53,13 @@ %changelog +* Sat Feb 28 2009 Todd Zullinger - 1.5.4-1 +- New version +- Use upstream install script + +* Tue Feb 24 2009 Fedora Release Engineering - 1.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Sep 09 2008 Todd Zullinger - 1.5.2-1 - New version - Simplify spec file checking for Fedora and RHEL versions Index: sources =================================================================== RCS file: /cvs/extras/rpms/facter/EL-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 10 Sep 2008 06:53:07 -0000 1.8 +++ sources 3 Mar 2009 03:44:20 -0000 1.9 @@ -1 +1 @@ -3d257bc2755217690fca868c0fa0cc7b facter-1.5.2.tgz +0df92b81606f8e23bdd1f2ade597049b facter-1.5.4.tgz From tmz at fedoraproject.org Tue Mar 3 03:47:56 2009 From: tmz at fedoraproject.org (Todd M. Zullinger) Date: Tue, 3 Mar 2009 03:47:56 +0000 (UTC) Subject: rpms/facter/EL-5 domain-search-order.patch,1.1,NONE Message-ID: <20090303034756.21F5170116@cvs1.fedora.phx.redhat.com> Author: tmz Update of /cvs/extras/rpms/facter/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25544 Removed Files: domain-search-order.patch Log Message: Remove unused domain-search-order patch --- domain-search-order.patch DELETED --- From lyosnorezel at fedoraproject.org Tue Mar 3 03:49:17 2009 From: lyosnorezel at fedoraproject.org (Lyos Gemini Norezel) Date: Tue, 3 Mar 2009 03:49:17 +0000 (UTC) Subject: rpms/thibault-fonts/devel thibault-fonts.spec,1.6,1.7 Message-ID: <20090303034917.1352570116@cvs1.fedora.phx.redhat.com> Author: lyosnorezel Update of /cvs/pkgs/rpms/thibault-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25684 Modified Files: thibault-fonts.spec Log Message: Index: thibault-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/thibault-fonts/devel/thibault-fonts.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- thibault-fonts.spec 2 Mar 2009 21:54:28 -0000 1.6 +++ thibault-fonts.spec 3 Mar 2009 03:48:46 -0000 1.7 @@ -11,7 +11,7 @@ Name: %{fontname}-fonts Version: 0.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Thibault.org font collection Group: User Interface/X @@ -121,24 +121,24 @@ tar xvzf %{SOURCE3} -C staypuft %build -fontforge '-lang=ff' + pushd Essays1743 -fontforge -c 'Open($1); Generate($2)' Essays1743.sfd ../Essays1743.ttf -fontforge -c 'Open($1); Generate($2)' Essays1743-Bold.sfd ../Essays1743-Bold.ttf -fontforge -c 'Open($1); Generate($2)' Essays1743-BoldItalic.sfd ../Essays1743-BoldItalic.ttf -fontforge -c 'Open($1); Generate($2)' Essays1743-Italic.sfd ../Essays1743-Italic.ttf +fontforge -lang=ff -c 'Open($1); Generate($2)' Essays1743.sfd ../Essays1743.ttf +fontforge -lang=ff -c 'Open($1); Generate($2)' Essays1743-Bold.sfd ../Essays1743-Bold.ttf +fontforge -lang=ff -c 'Open($1); Generate($2)' Essays1743-BoldItalic.sfd ../Essays1743-BoldItalic.ttf +fontforge -lang=ff -c 'Open($1); Generate($2)' Essays1743-Italic.sfd ../Essays1743-Italic.ttf popd pushd isabella -fontforge -c 'Open($1); Generate($2)' Isabella-first.sfd ../Isabella.ttf +fontforge -lang=ff -c 'Open($1); Generate($2)' Isabella-first.sfd ../Isabella.ttf popd pushd rockets -fontforge -c 'Open($1); Generate($2)' Rockets.sfd ../Rockets.ttf +fontforge -lang=ff -c 'Open($1); Generate($2)' Rockets.sfd ../Rockets.ttf popd pushd staypuft -fontforge -c 'Open($1); Generate($2)' StayPuft.sfd ../StayPuft.ttf +fontforge -lanf=ff -c 'Open($1); Generate($2)' StayPuft.sfd ../StayPuft.ttf popd %install @@ -185,6 +185,9 @@ %changelog #thibault +* Mon Mar 2 2009 Lyos Gemini Norezel 0.1-7 +- Fontforge script errors fixed. + * Mon Mar 2 2009 Lyos Gemini Norezel 0.1-6 - Fixed error in fontforge script that was - caused by some fucker turning on python bindings. From whot at fedoraproject.org Tue Mar 3 04:00:02 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Tue, 3 Mar 2009 04:00:02 +0000 (UTC) Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.45, 1.46 sources, 1.44, 1.45 xorg-x11-proto-devel.spec, 1.89, 1.90 x11proto-7.0.14-XF86XK_Suspend.patch, 1.1, NONE Message-ID: <20090303040002.C964870116@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28174 Modified Files: .cvsignore sources xorg-x11-proto-devel.spec Removed Files: x11proto-7.0.14-XF86XK_Suspend.patch Log Message: * Tue Mar 03 2009 Peter Hutterer 7.4-14 - xproto 7.0.15 - Purge x11proto-7.0.14-XF86XK_Suspend.patch. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 20 Dec 2008 09:42:59 -0000 1.45 +++ .cvsignore 3 Mar 2009 03:59:31 -0000 1.46 @@ -22,7 +22,7 @@ xf86miscproto-0.9.2.tar.bz2 xf86vidmodeproto-2.2.2.tar.bz2 xineramaproto-1.1.2.tar.bz2 -xproto-7.0.14.tar.bz2 +xproto-7.0.15.tar.bz2 xproxymanagementprotocol-1.0.2.tar.bz2 randrproto-1.2.99.3.tar.bz2 dri2proto-1.99.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 20 Dec 2008 09:42:59 -0000 1.44 +++ sources 3 Mar 2009 03:59:31 -0000 1.45 @@ -21,7 +21,7 @@ acae8edeb05a406f7f60bcbb218a8f1d xf86miscproto-0.9.2.tar.bz2 f00844a63d6e76b69eb0eb5e41eed843 xf86vidmodeproto-2.2.2.tar.bz2 1cc292c562962ad0ad3a253cae68c632 xineramaproto-1.1.2.tar.bz2 -5bbf47f4ad6eb3b3f3a119231abe8e5e xproto-7.0.14.tar.bz2 +1a2b31430d04340be2e49e8b6445e076 xproto-7.0.15.tar.bz2 d28007a50976204960fc1fc07b4ca093 xproxymanagementprotocol-1.0.2.tar.bz2 d4a7b90d826dfa1c39d41d323ce7366c randrproto-1.2.99.3.tar.bz2 fffbbb3c26368ac63d408e81c51ec374 dri2proto-1.99.3.tar.bz2 Index: xorg-x11-proto-devel.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- xorg-x11-proto-devel.spec 26 Feb 2009 11:31:00 -0000 1.89 +++ xorg-x11-proto-devel.spec 3 Mar 2009 03:59:31 -0000 1.90 @@ -7,7 +7,7 @@ Summary: X.Org X11 Protocol headers Name: xorg-x11-proto-devel Version: 7.4 -Release: 13%{?dist} +Release: 14%{?dist} License: MIT Group: Development/System URL: http://www.x.org @@ -39,12 +39,9 @@ Source25: http://www.x.org/pub/individual/proto/xf86miscproto-0.9.2.tar.bz2 Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.2.2.tar.bz2 Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.1.2.tar.bz2 -Source29: http://www.x.org/pub/individual/proto/xproto-7.0.14.tar.bz2 +Source29: http://www.x.org/pub/individual/proto/xproto-7.0.15.tar.bz2 Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2 -# Pushed upstream, will be x11proto-7.0.15 -Patch1: x11proto-7.0.14-XF86XK_Suspend.patch - BuildRequires: pkgconfig BuildRequires: xorg-x11-util-macros >= 1.0.2-1 @@ -60,8 +57,6 @@ %prep %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a27 -a28 -a29 -a30 -a31 -%patch1 -p0 -b .xf86suspend - %build # Proceed through each proto package directory, building them all @@ -264,6 +259,10 @@ %{_datadir}/pkgconfig/xproxymngproto.pc %changelog +* Tue Mar 03 2009 Peter Hutterer 7.4-14 +- xproto 7.0.15 +- Purge x11proto-7.0.14-XF86XK_Suspend.patch. + * Thu Feb 26 2009 Fedora Release Engineering - 7.4-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- x11proto-7.0.14-XF86XK_Suspend.patch DELETED --- From lyosnorezel at fedoraproject.org Tue Mar 3 04:02:51 2009 From: lyosnorezel at fedoraproject.org (Lyos Gemini Norezel) Date: Tue, 3 Mar 2009 04:02:51 +0000 (UTC) Subject: rpms/thibault-fonts/devel thibault-fonts.spec,1.7,1.8 Message-ID: <20090303040251.B218270116@cvs1.fedora.phx.redhat.com> Author: lyosnorezel Update of /cvs/pkgs/rpms/thibault-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28670 Modified Files: thibault-fonts.spec Log Message: Index: thibault-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/thibault-fonts/devel/thibault-fonts.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- thibault-fonts.spec 3 Mar 2009 03:48:46 -0000 1.7 +++ thibault-fonts.spec 3 Mar 2009 04:02:21 -0000 1.8 @@ -11,7 +11,7 @@ Name: %{fontname}-fonts Version: 0.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Thibault.org font collection Group: User Interface/X @@ -138,7 +138,7 @@ popd pushd staypuft -fontforge -lanf=ff -c 'Open($1); Generate($2)' StayPuft.sfd ../StayPuft.ttf +fontforge -lang=ff -c 'Open($1); Generate($2)' StayPuft.sfd ../StayPuft.ttf popd %install @@ -185,6 +185,9 @@ %changelog #thibault +* Mon Mar 2 2009 Lyos Gemini Norezel 0.1-8 +- Typo. + * Mon Mar 2 2009 Lyos Gemini Norezel 0.1-7 - Fontforge script errors fixed. From guthrie at fedoraproject.org Tue Mar 3 04:06:25 2009 From: guthrie at fedoraproject.org (John T. Guthrie III) Date: Tue, 3 Mar 2009 04:06:25 +0000 (UTC) Subject: rpms/simplyhtml/F-10 gpl.txt, NONE, 1.1 readme.txt, NONE, 1.1 simplyhtml-ExampleFileFilter.patch, NONE, 1.1 simplyhtml-build_xml.patch, NONE, 1.1 simplyhtml.sh, NONE, 1.1 simplyhtml.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090303040625.EF5F870116@cvs1.fedora.phx.redhat.com> Author: guthrie Update of /cvs/extras/rpms/simplyhtml/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29337 Modified Files: sources Added Files: gpl.txt readme.txt simplyhtml-ExampleFileFilter.patch simplyhtml-build_xml.patch simplyhtml.sh simplyhtml.spec Log Message: Initial import of simplyhtml into F-10. --- NEW FILE gpl.txt --- 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. Copyright (C) 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. , 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 readme.txt --- SimplyHTML readme file stage 11, April 27, 2003 Copyright (c) 2002, 2003 Ulrich Hilger http://www.lightdev.com (see 'License' below) This file contains ------------------ About SimplyHTML Contents Installation Requirements Usage License About SimplyHTML ---------------- SimplyHTML is an application for text processing. It stores documents as HTML files in combination with Cascading Style Sheets (CSS). SimplyHTML is not intended to be used as an editor for web pages. The application combines text processing features as known from popular word processors with a simple and generic way of storing textual information and styles. Installation ------------ Once downloaded 1. create an arbitrary folder such as 'c:\Programs\SimplyHTML' 2. extract contents of the downloaded zip file into that folder Contents of the downloaded zip file can be restored by using one of the many applications capable to extract ZIP files. If you do not have such an application, you can use application Extractor available free at http://www.calcom.de/eng/product/xtract.htm Contents -------- The distribution package comes as a single compressed zip file. It contains SimplyHTML.jar........the executable file for the latest stage of SimplyHTML Help.pdf..............tutorial as PDF file readme.txt............this file gpl.txt...............the file containing the license agreement valid for all parts of the distribution package jhall.jar.............JavaHelp runtime extension source................source code directory doc...................directory with API documentation files Please refer to 'License' below for terms and conditions of using above parts. Requirements ------------ To compile and run the sources, a Java 2 Standard Edition 1.4 (J2SE) or higher Software Development Kit (SDK) is required. To only run the executable JAR file or the classes of SimplyHTML, a Java Runtime Environment (JRE) is required. J2SE and/or JRE can be obtained at http://java.sun.com/j2se/1.4 Usage ----- The javadoc API documents can be read with any web browser. To read the javadoc API documents, open file 'index.htm' in the doc directory from out of your browser. The source files can be viewed with any text editor. Please refer to the documentation of the J2SE SDK about how to compile source files to classes and how to run classes. To run the executable JAR file, use the following command on the command line prompt of your system (replace \ by / and omit .exe on Unix or Linux systems) [JRE]\bin\javaw.exe -jar [AppDir]\SimplyHTML.jar [AppDir] in above command means the directory, you have installed SimplyHTML on your computer. [JRE] means the directory, the Java Runtime Environment (JRE) is stored on your computer. NOTE: All paths should not contain blanks. A path such as C:\Program Files\SimplyHTML as the will only work if it is put in quotes, such as in "C:\Program Files\SimplyHTML\SimplyHTML.jar" License ------- This distribution of SimplyHTML is published under the terms and conditions of the GNU General Public License. To read the license, please open file 'gpl.txt' which is part of this package too. simplyhtml-ExampleFileFilter.patch: --- NEW FILE simplyhtml-ExampleFileFilter.patch --- --- simplyhtml-0.12.5/src/com/lightdev/app/shtm/DocumentPane.java.orig 2008-12-22 14:45:50.000000000 -0500 +++ simplyhtml-0.12.5/src/com/lightdev/app/shtm/DocumentPane.java 2009-02-11 20:03:39.000000000 -0500 @@ -28,7 +28,6 @@ import javax.swing.text.*; import javax.swing.text.html.*; -import com.sun.demo.ExampleFileFilter; import java.util.*; import java.util.prefs.*; @@ -498,10 +497,6 @@ File.separator); try { if(srcDir.exists()) { - ExampleFileFilter filter = new ExampleFileFilter(); - filter.addExtension("gif"); - filter.addExtension("jpg"); - filter.addExtension("jpeg"); File[] imgFiles = srcDir.listFiles(); for(int i = 0; i < imgFiles.length; i++) { Util.copyFile(imgFiles[i], new File(destDir.getAbsolutePath() + --- simplyhtml-0.12.5/src/com/lightdev/app/shtm/ImageDialog.java.orig 2008-12-22 14:45:50.000000000 -0500 +++ simplyhtml-0.12.5/src/com/lightdev/app/shtm/ImageDialog.java 2009-02-11 20:03:16.000000000 -0500 @@ -39,6 +39,8 @@ import java.awt.event.ActionListener; import java.awt.event.ActionEvent; import javax.swing.JFileChooser; +import javax.swing.filechooser.FileFilter; +import javax.swing.filechooser.FileNameExtensionFilter; @@ -49,7 +51,6 @@ -import com.sun.demo.ExampleFileFilter; import java.io.File; import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionEvent; @@ -499,12 +500,9 @@ try { JFileChooser chooser = new JFileChooser(); chooser.setMultiSelectionEnabled(true); - ExampleFileFilter filter = new ExampleFileFilter(); - filter.addExtension("gif"); - filter.addExtension("jpg"); - filter.addExtension("jpeg"); - filter.setDescription(Util.getResourceString( - "imageFileDesc")); + String extensionList[] = {"gif", "jpg", "jpeg"}; + FileFilter filter = new FileNameExtensionFilter( + Util.getResourceString("imageFileDesc"), extensionList); chooser.setFileFilter(filter); if(chooser.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) { File[] sFiles = chooser.getSelectedFiles(); --- simplyhtml-0.12.5/src/com/lightdev/app/shtm/SHTMLEditorKitActions.java.orig 2008-12-22 14:45:51.000000000 -0500 +++ simplyhtml-0.12.5/src/com/lightdev/app/shtm/SHTMLEditorKitActions.java 2009-02-11 20:02:56.000000000 -0500 @@ -44,7 +44,8 @@ import com.lightdev.app.shtm.SHTMLPanelImpl.FontFamilyPicker; import com.lightdev.app.shtm.SHTMLPanelImpl.FontSizePicker; import com.sun.demo.ElementTreePanel; -import com.sun.demo.ExampleFileFilter; +import javax.swing.filechooser.FileFilter; +import javax.swing.filechooser.FileNameExtensionFilter; import de.calcom.cclib.text.FindReplaceDialog; import de.calcom.cclib.text.FindReplaceEvent; @@ -2575,10 +2576,9 @@ public void actionPerformed(ActionEvent ae) { Preferences prefs = Preferences.userNodeForPackage( this.panel.getClass() ); JFileChooser chooser = new JFileChooser(); // create a file chooser - ExampleFileFilter filter = new ExampleFileFilter(); // create a filter - filter.addExtension("htm"); - filter.addExtension("html"); - filter.setDescription(Util.getResourceString("htmlFileDesc")); + String extensionList[] = { "htm", "html" }; + FileFilter filter = new FileNameExtensionFilter( + Util.getResourceString("htmlFileDesc"), extensionList); // create a filter chooser.setFileFilter(filter); // apply the file filter String lastFileName = prefs.get(SHTMLPanelImpl.FILE_LAST_OPEN, ""); if(lastFileName.length() > 0) { @@ -2802,10 +2802,9 @@ boolean canSave = true; Preferences prefs = Preferences.userNodeForPackage( this.panel.getClass() ); JFileChooser chooser = new JFileChooser(); - ExampleFileFilter filter = new ExampleFileFilter(); - filter.addExtension("htm"); - filter.addExtension("html"); - filter.setDescription(Util.getResourceString("htmlFileDesc")); + String extensionList[] = { "htm", "html" }; + FileFilter filter = new FileNameExtensionFilter( + Util.getResourceString("htmlFileDesc"), extensionList); chooser.setFileFilter(filter); String lastSaveFileName = prefs.get(SHTMLPanelImpl.FILE_LAST_SAVE, ""); if(lastSaveFileName.length() > 0) { simplyhtml-build_xml.patch: --- NEW FILE simplyhtml-build_xml.patch --- *** src/build.xml.orig 2007-01-14 06:25:49.000000000 -0500 --- src/build.xml 2008-09-02 23:15:07.000000000 -0400 *************** *** 9,14 **** --- 9,15 ---- + *************** *** 16,22 **** ! --- 17,23 ---- ! --- NEW FILE simplyhtml.sh --- #!/bin/sh exec java -cp \ `build-classpath gnu-regexp javahelp2 simplyhtml simplyhtml-help` \ com.lightdev.app.shtm.App --- NEW FILE simplyhtml.spec --- %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: simplyhtml Version: 0.12.5 Release: 5%{?dist} Epoch: 0 Summary: Application and a java component for rich text processing # All files are GPL except for src/com/sun/demo/ElementTreePanel.java which has # a BSD license. License: GPLv2+ and BSD Group: Development/Java URL: http://simplyhtml.sourceforge.net/ Source0: http://downloads.sourceforge.net/simplyhtml/SimplyHTML_src_%(echo %{version} | sed -e 's/\./_/g').tar.gz # cvs -z3 -d:pserver:guest at simplyhtml.cvs.sourceforge.net:/cvsroot/simplyhtml export -r shtml_0_12_5 shtml/gpl.txt # mv shtml/gpl.txt . Source1: gpl.txt # cvs -z3 -d:pserver:guest at simplyhtml.cvs.sourceforge.net:/cvsroot/simplyhtml export -r shtml_0_12_5 shtml/readme.txt # mv shtml/readme.txt . Source2: readme.txt Source3: simplyhtml.sh Patch0: simplyhtml-build_xml.patch Patch1: simplyhtml-ExampleFileFilter.patch Requires: gnu-regexp Requires: javahelp2 Requires: java Requires: jpackage-utils BuildRequires: ant BuildRequires: gnu-regexp BuildRequires: javahelp2 BuildRequires: java-devel BuildRequires: jpackage-utils %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif # We need this to get a version of ElementTreePanel with an acceptable license BuildRequires: java-1.6.0-openjdk-demo BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description SimplyHTML is an application and a java component for rich text processing. It stores documents as HTML files in combination with Cascading Style Sheets (CSS). SimplyHTML is not intended to be used as an editor for web pages. %package javadoc Summary: Javadoc documentation for %{name} Group: Development/Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc Javadoc documentation for %{name}. %prep %setup -q -c %{name}-%{version} # In the 0.12.5 version of the source tarball, we simply get the com and de # directories spewed out into the current directory, without so much as even # an all encompassing name-version directory. Hence, we need the -c flag for # the setup macro above. But it gets even better. It turns out that the # build.xml file still references directories like ../bin and ../lib even # though those directories are now outside of the source tree. So now we have # to manually create a src directory and move everything from the source tarball # into that directory first. mkdir lib src mv build.xml com de MANIFEST.MF src # We need to remove the carriage returns *before* applying patch 0 %{__perl} -pi -e 's/\r$//' src/build.xml %patch0 -p0 -b .build_xml %{_bindir}/find . -name '*.jar' | %{_bindir}/xargs -t %{__rm} %{__cp} %{SOURCE1} %{SOURCE2} . %patch1 -p1 -b .ExampleFileFilter rm src/com/sun/demo/ExampleFileFilter.java # Now bring in a version of ElementTreePanel that doesn't have a "No nukes" # clause in its license pushd src/com/sun/demo mv ElementTreePanel.java ElementTreePanel.java.BadLicense unzip %{_libdir}/jvm/java-1.6.0-openjdk-1.6.0.0/demo/jfc/Notepad/src.zip \ ElementTreePanel.java sed -i -e '33 i\ /* for use in SimplyHTML */\ package com.sun.demo;' ElementTreePanel.java popd %{_bindir}/find . -type f -name '*.htm' | \ %{_bindir}/xargs -t %{__perl} -pi -e 's/\r$//g' %{__perl} -pi -e 's/^Class-Path:.*\n//;' \ -e 's/^Created-By:.*\n//;' \ src/MANIFEST.MF #We don't need these with Patch 0 #cd lib #%{__ln_s} $(build-classpath gnu-regexp) gnu-regexp-1.1.4.jar #%{__ln_s} $(build-classpath javahelp2) jhall.jar #cd .. %build export CLASSPATH= export OPT_JAR_LIST=: cd src ant ant javadoc cd .. %install %{__rm} -rf %{buildroot} %{__mkdir_p} %{buildroot}%{_javadir} %{__mkdir_p} %{buildroot}%{_bindir} %{__cp} -a dist/lib/SimplyHTML.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar %{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar %{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/SimplyHTML-%{version}.jar %{__ln_s} SimplyHTML-%{version}.jar %{buildroot}%{_javadir}/SimplyHTML.jar %{__cp} -a dist/lib/SimplyHTMLHelp.jar %{buildroot}%{_javadir}/%{name}-help-%{version}.jar %{__ln_s} %{name}-help-%{version}.jar %{buildroot}%{_javadir}/%{name}-help.jar %{__ln_s} %{name}-help-%{version}.jar %{buildroot}%{_javadir}/SimplyHTMLHelp-%{version}.jar %{__ln_s} SimplyHTMLHelp-%{version}.jar %{buildroot}%{_javadir}/SimplyHTMLHelp.jar %{__cp} %{SOURCE3} %{buildroot}%{_bindir} %{__ln_s} %(basename %{SOURCE3}) %{buildroot}%{_bindir}/%(basename %{SOURCE3} .sh) %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} %{__cp} -a dist/api/* %{buildroot}%{_javadocdir}/%{name}-%{version} %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %clean %{__rm} -rf %{buildroot} %post %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] ; then %{_bindir}/rebuild-gcj-db fi %endif %postun %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] ; then %{_bindir}/rebuild-gcj-db fi %endif %files %defattr(0644,root,root,0755) #%doc doc/* %doc gpl.txt readme.txt %{_bindir}/simplyhtml %attr(0755,root,root) %{_bindir}/simplyhtml.sh %{_javadir}/*.jar %if %{with_gcj} %attr(-,root,root) %{_libdir}/gcj/%{name} %endif %files javadoc %defattr(0644,root,root,0755) %doc %{_javadocdir}/%{name}-%{version} %doc %{_javadocdir}/%{name} %changelog * Wed Feb 25 2009 John Guthrie 0:0.12.5-5 - Fixed the perms on the simplyhtml.sh source file. Allowing the %%attr to take care of the perms. * Thu Feb 12 2009 John Guthrie 0:0.12.5-4 - Replaced the version of ElementTreePanel.java that came with the source code with a version that has an acceptable license. Added java-1.6.0-openjdk-demo as a BuildRequire as a result. - Updated the license tag. * Mon Feb 9 2009 John Guthrie 0:0.12.5-3 - So it turns out that the source tarball doesn't come with the javadoc documentation because the javadoc documentation can be generated using the build.xml file. Therefore, I added a command to do this as well as uncommenting all of the javadoc-related portions of the Spec file. - Removed dependecy on ExampleFileFilter. * Sat Feb 7 2009 John Guthrie 0:0.12.5-2 - Added simplyhtml.sh script to run the .jar file with the correct CLASSPATH. * Fri Feb 6 2009 John Guthrie 0:0.12.5-1 - Upgraded to 0.12.5. This included making changes for new source code tree structure. - Added -c flag to %%setup. - Changed %%patch in %%prep to %%patch0. - Replaced tabs with spaces to make rpmlint happy. * Mon Sep 15 2008 John Guthrie 0:0.12.3-2 - Added several Requires and BuildRequires lines as required by Packaging/Java guidelines. - Changed source to version that is downloadable from the simplyhtml web page as opposed to just a tag from the simplyhtml CVS. - Added gpl.txt and readme.txt to documentation. - Stripped carriage returns from build.xml. - Changed the package group for the javadoc subpackage. * Tue Sep 2 2008 John Guthrie 0:0.12.3-1 - Re-built RPM for Fedora 9 - Removed symlinks to .jar files from lib * Sun Aug 10 2008 David Walluck 0:0.12.3-0.0.1mdv2009.0 + Revision: 270182 - 0.12.3 * Sat Dec 29 2007 David Walluck 0:0.12.2-0.0.3mdv2008.1 + Revision: 139131 - fix jar symlinks * Sat Dec 29 2007 David Walluck 0:0.12.2-0.0.2mdv2008.1 + Revision: 139120 - add Requires - import simplyhtml Index: sources =================================================================== RCS file: /cvs/extras/rpms/simplyhtml/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Feb 2009 00:23:20 -0000 1.1 +++ sources 3 Mar 2009 04:05:55 -0000 1.2 @@ -0,0 +1 @@ +79520ab2b1b6f884e922637c92921884 SimplyHTML_src_0_12_5.tar.gz From guthrie at fedoraproject.org Tue Mar 3 04:11:57 2009 From: guthrie at fedoraproject.org (John T. Guthrie III) Date: Tue, 3 Mar 2009 04:11:57 +0000 (UTC) Subject: rpms/simplyhtml/F-9 gpl.txt, NONE, 1.1 readme.txt, NONE, 1.1 simplyhtml-ExampleFileFilter.patch, NONE, 1.1 simplyhtml-build_xml.patch, NONE, 1.1 simplyhtml.sh, NONE, 1.1 simplyhtml.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090303041157.33C4C70116@cvs1.fedora.phx.redhat.com> Author: guthrie Update of /cvs/extras/rpms/simplyhtml/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30175 Modified Files: sources Added Files: gpl.txt readme.txt simplyhtml-ExampleFileFilter.patch simplyhtml-build_xml.patch simplyhtml.sh simplyhtml.spec Log Message: Initial import of simplyhtml into F-9. --- NEW FILE gpl.txt --- 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. Copyright (C) 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. , 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 readme.txt --- SimplyHTML readme file stage 11, April 27, 2003 Copyright (c) 2002, 2003 Ulrich Hilger http://www.lightdev.com (see 'License' below) This file contains ------------------ About SimplyHTML Contents Installation Requirements Usage License About SimplyHTML ---------------- SimplyHTML is an application for text processing. It stores documents as HTML files in combination with Cascading Style Sheets (CSS). SimplyHTML is not intended to be used as an editor for web pages. The application combines text processing features as known from popular word processors with a simple and generic way of storing textual information and styles. Installation ------------ Once downloaded 1. create an arbitrary folder such as 'c:\Programs\SimplyHTML' 2. extract contents of the downloaded zip file into that folder Contents of the downloaded zip file can be restored by using one of the many applications capable to extract ZIP files. If you do not have such an application, you can use application Extractor available free at http://www.calcom.de/eng/product/xtract.htm Contents -------- The distribution package comes as a single compressed zip file. It contains SimplyHTML.jar........the executable file for the latest stage of SimplyHTML Help.pdf..............tutorial as PDF file readme.txt............this file gpl.txt...............the file containing the license agreement valid for all parts of the distribution package jhall.jar.............JavaHelp runtime extension source................source code directory doc...................directory with API documentation files Please refer to 'License' below for terms and conditions of using above parts. Requirements ------------ To compile and run the sources, a Java 2 Standard Edition 1.4 (J2SE) or higher Software Development Kit (SDK) is required. To only run the executable JAR file or the classes of SimplyHTML, a Java Runtime Environment (JRE) is required. J2SE and/or JRE can be obtained at http://java.sun.com/j2se/1.4 Usage ----- The javadoc API documents can be read with any web browser. To read the javadoc API documents, open file 'index.htm' in the doc directory from out of your browser. The source files can be viewed with any text editor. Please refer to the documentation of the J2SE SDK about how to compile source files to classes and how to run classes. To run the executable JAR file, use the following command on the command line prompt of your system (replace \ by / and omit .exe on Unix or Linux systems) [JRE]\bin\javaw.exe -jar [AppDir]\SimplyHTML.jar [AppDir] in above command means the directory, you have installed SimplyHTML on your computer. [JRE] means the directory, the Java Runtime Environment (JRE) is stored on your computer. NOTE: All paths should not contain blanks. A path such as C:\Program Files\SimplyHTML as the will only work if it is put in quotes, such as in "C:\Program Files\SimplyHTML\SimplyHTML.jar" License ------- This distribution of SimplyHTML is published under the terms and conditions of the GNU General Public License. To read the license, please open file 'gpl.txt' which is part of this package too. simplyhtml-ExampleFileFilter.patch: --- NEW FILE simplyhtml-ExampleFileFilter.patch --- --- simplyhtml-0.12.5/src/com/lightdev/app/shtm/DocumentPane.java.orig 2008-12-22 14:45:50.000000000 -0500 +++ simplyhtml-0.12.5/src/com/lightdev/app/shtm/DocumentPane.java 2009-02-11 20:03:39.000000000 -0500 @@ -28,7 +28,6 @@ import javax.swing.text.*; import javax.swing.text.html.*; -import com.sun.demo.ExampleFileFilter; import java.util.*; import java.util.prefs.*; @@ -498,10 +497,6 @@ File.separator); try { if(srcDir.exists()) { - ExampleFileFilter filter = new ExampleFileFilter(); - filter.addExtension("gif"); - filter.addExtension("jpg"); - filter.addExtension("jpeg"); File[] imgFiles = srcDir.listFiles(); for(int i = 0; i < imgFiles.length; i++) { Util.copyFile(imgFiles[i], new File(destDir.getAbsolutePath() + --- simplyhtml-0.12.5/src/com/lightdev/app/shtm/ImageDialog.java.orig 2008-12-22 14:45:50.000000000 -0500 +++ simplyhtml-0.12.5/src/com/lightdev/app/shtm/ImageDialog.java 2009-02-11 20:03:16.000000000 -0500 @@ -39,6 +39,8 @@ import java.awt.event.ActionListener; import java.awt.event.ActionEvent; import javax.swing.JFileChooser; +import javax.swing.filechooser.FileFilter; +import javax.swing.filechooser.FileNameExtensionFilter; @@ -49,7 +51,6 @@ -import com.sun.demo.ExampleFileFilter; import java.io.File; import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionEvent; @@ -499,12 +500,9 @@ try { JFileChooser chooser = new JFileChooser(); chooser.setMultiSelectionEnabled(true); - ExampleFileFilter filter = new ExampleFileFilter(); - filter.addExtension("gif"); - filter.addExtension("jpg"); - filter.addExtension("jpeg"); - filter.setDescription(Util.getResourceString( - "imageFileDesc")); + String extensionList[] = {"gif", "jpg", "jpeg"}; + FileFilter filter = new FileNameExtensionFilter( + Util.getResourceString("imageFileDesc"), extensionList); chooser.setFileFilter(filter); if(chooser.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) { File[] sFiles = chooser.getSelectedFiles(); --- simplyhtml-0.12.5/src/com/lightdev/app/shtm/SHTMLEditorKitActions.java.orig 2008-12-22 14:45:51.000000000 -0500 +++ simplyhtml-0.12.5/src/com/lightdev/app/shtm/SHTMLEditorKitActions.java 2009-02-11 20:02:56.000000000 -0500 @@ -44,7 +44,8 @@ import com.lightdev.app.shtm.SHTMLPanelImpl.FontFamilyPicker; import com.lightdev.app.shtm.SHTMLPanelImpl.FontSizePicker; import com.sun.demo.ElementTreePanel; -import com.sun.demo.ExampleFileFilter; +import javax.swing.filechooser.FileFilter; +import javax.swing.filechooser.FileNameExtensionFilter; import de.calcom.cclib.text.FindReplaceDialog; import de.calcom.cclib.text.FindReplaceEvent; @@ -2575,10 +2576,9 @@ public void actionPerformed(ActionEvent ae) { Preferences prefs = Preferences.userNodeForPackage( this.panel.getClass() ); JFileChooser chooser = new JFileChooser(); // create a file chooser - ExampleFileFilter filter = new ExampleFileFilter(); // create a filter - filter.addExtension("htm"); - filter.addExtension("html"); - filter.setDescription(Util.getResourceString("htmlFileDesc")); + String extensionList[] = { "htm", "html" }; + FileFilter filter = new FileNameExtensionFilter( + Util.getResourceString("htmlFileDesc"), extensionList); // create a filter chooser.setFileFilter(filter); // apply the file filter String lastFileName = prefs.get(SHTMLPanelImpl.FILE_LAST_OPEN, ""); if(lastFileName.length() > 0) { @@ -2802,10 +2802,9 @@ boolean canSave = true; Preferences prefs = Preferences.userNodeForPackage( this.panel.getClass() ); JFileChooser chooser = new JFileChooser(); - ExampleFileFilter filter = new ExampleFileFilter(); - filter.addExtension("htm"); - filter.addExtension("html"); - filter.setDescription(Util.getResourceString("htmlFileDesc")); + String extensionList[] = { "htm", "html" }; + FileFilter filter = new FileNameExtensionFilter( + Util.getResourceString("htmlFileDesc"), extensionList); chooser.setFileFilter(filter); String lastSaveFileName = prefs.get(SHTMLPanelImpl.FILE_LAST_SAVE, ""); if(lastSaveFileName.length() > 0) { simplyhtml-build_xml.patch: --- NEW FILE simplyhtml-build_xml.patch --- *** src/build.xml.orig 2007-01-14 06:25:49.000000000 -0500 --- src/build.xml 2008-09-02 23:15:07.000000000 -0400 *************** *** 9,14 **** --- 9,15 ---- + *************** *** 16,22 **** ! --- 17,23 ---- ! --- NEW FILE simplyhtml.sh --- #!/bin/sh exec java -cp \ `build-classpath gnu-regexp javahelp2 simplyhtml simplyhtml-help` \ com.lightdev.app.shtm.App --- NEW FILE simplyhtml.spec --- %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: simplyhtml Version: 0.12.5 Release: 5%{?dist} Epoch: 0 Summary: Application and a java component for rich text processing # All files are GPL except for src/com/sun/demo/ElementTreePanel.java which has # a BSD license. License: GPLv2+ and BSD Group: Development/Java URL: http://simplyhtml.sourceforge.net/ Source0: http://downloads.sourceforge.net/simplyhtml/SimplyHTML_src_%(echo %{version} | sed -e 's/\./_/g').tar.gz # cvs -z3 -d:pserver:guest at simplyhtml.cvs.sourceforge.net:/cvsroot/simplyhtml export -r shtml_0_12_5 shtml/gpl.txt # mv shtml/gpl.txt . Source1: gpl.txt # cvs -z3 -d:pserver:guest at simplyhtml.cvs.sourceforge.net:/cvsroot/simplyhtml export -r shtml_0_12_5 shtml/readme.txt # mv shtml/readme.txt . Source2: readme.txt Source3: simplyhtml.sh Patch0: simplyhtml-build_xml.patch Patch1: simplyhtml-ExampleFileFilter.patch Requires: gnu-regexp Requires: javahelp2 Requires: java Requires: jpackage-utils BuildRequires: ant BuildRequires: gnu-regexp BuildRequires: javahelp2 BuildRequires: java-devel BuildRequires: jpackage-utils %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif # We need this to get a version of ElementTreePanel with an acceptable license BuildRequires: java-1.6.0-openjdk-demo BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description SimplyHTML is an application and a java component for rich text processing. It stores documents as HTML files in combination with Cascading Style Sheets (CSS). SimplyHTML is not intended to be used as an editor for web pages. %package javadoc Summary: Javadoc documentation for %{name} Group: Development/Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc Javadoc documentation for %{name}. %prep %setup -q -c %{name}-%{version} # In the 0.12.5 version of the source tarball, we simply get the com and de # directories spewed out into the current directory, without so much as even # an all encompassing name-version directory. Hence, we need the -c flag for # the setup macro above. But it gets even better. It turns out that the # build.xml file still references directories like ../bin and ../lib even # though those directories are now outside of the source tree. So now we have # to manually create a src directory and move everything from the source tarball # into that directory first. mkdir lib src mv build.xml com de MANIFEST.MF src # We need to remove the carriage returns *before* applying patch 0 %{__perl} -pi -e 's/\r$//' src/build.xml %patch0 -p0 -b .build_xml %{_bindir}/find . -name '*.jar' | %{_bindir}/xargs -t %{__rm} %{__cp} %{SOURCE1} %{SOURCE2} . %patch1 -p1 -b .ExampleFileFilter rm src/com/sun/demo/ExampleFileFilter.java # Now bring in a version of ElementTreePanel that doesn't have a "No nukes" # clause in its license pushd src/com/sun/demo mv ElementTreePanel.java ElementTreePanel.java.BadLicense unzip %{_libdir}/jvm/java-1.6.0-openjdk-1.6.0.0/demo/jfc/Notepad/src.zip \ ElementTreePanel.java sed -i -e '33 i\ /* for use in SimplyHTML */\ package com.sun.demo;' ElementTreePanel.java popd %{_bindir}/find . -type f -name '*.htm' | \ %{_bindir}/xargs -t %{__perl} -pi -e 's/\r$//g' %{__perl} -pi -e 's/^Class-Path:.*\n//;' \ -e 's/^Created-By:.*\n//;' \ src/MANIFEST.MF #We don't need these with Patch 0 #cd lib #%{__ln_s} $(build-classpath gnu-regexp) gnu-regexp-1.1.4.jar #%{__ln_s} $(build-classpath javahelp2) jhall.jar #cd .. %build export CLASSPATH= export OPT_JAR_LIST=: cd src ant ant javadoc cd .. %install %{__rm} -rf %{buildroot} %{__mkdir_p} %{buildroot}%{_javadir} %{__mkdir_p} %{buildroot}%{_bindir} %{__cp} -a dist/lib/SimplyHTML.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar %{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar %{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/SimplyHTML-%{version}.jar %{__ln_s} SimplyHTML-%{version}.jar %{buildroot}%{_javadir}/SimplyHTML.jar %{__cp} -a dist/lib/SimplyHTMLHelp.jar %{buildroot}%{_javadir}/%{name}-help-%{version}.jar %{__ln_s} %{name}-help-%{version}.jar %{buildroot}%{_javadir}/%{name}-help.jar %{__ln_s} %{name}-help-%{version}.jar %{buildroot}%{_javadir}/SimplyHTMLHelp-%{version}.jar %{__ln_s} SimplyHTMLHelp-%{version}.jar %{buildroot}%{_javadir}/SimplyHTMLHelp.jar %{__cp} %{SOURCE3} %{buildroot}%{_bindir} %{__ln_s} %(basename %{SOURCE3}) %{buildroot}%{_bindir}/%(basename %{SOURCE3} .sh) %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} %{__cp} -a dist/api/* %{buildroot}%{_javadocdir}/%{name}-%{version} %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %clean %{__rm} -rf %{buildroot} %post %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] ; then %{_bindir}/rebuild-gcj-db fi %endif %postun %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] ; then %{_bindir}/rebuild-gcj-db fi %endif %files %defattr(0644,root,root,0755) #%doc doc/* %doc gpl.txt readme.txt %{_bindir}/simplyhtml %attr(0755,root,root) %{_bindir}/simplyhtml.sh %{_javadir}/*.jar %if %{with_gcj} %attr(-,root,root) %{_libdir}/gcj/%{name} %endif %files javadoc %defattr(0644,root,root,0755) %doc %{_javadocdir}/%{name}-%{version} %doc %{_javadocdir}/%{name} %changelog * Wed Feb 25 2009 John Guthrie 0:0.12.5-5 - Fixed the perms on the simplyhtml.sh source file. Allowing the %%attr to take care of the perms. * Thu Feb 12 2009 John Guthrie 0:0.12.5-4 - Replaced the version of ElementTreePanel.java that came with the source code with a version that has an acceptable license. Added java-1.6.0-openjdk-demo as a BuildRequire as a result. - Updated the license tag. * Mon Feb 9 2009 John Guthrie 0:0.12.5-3 - So it turns out that the source tarball doesn't come with the javadoc documentation because the javadoc documentation can be generated using the build.xml file. Therefore, I added a command to do this as well as uncommenting all of the javadoc-related portions of the Spec file. - Removed dependecy on ExampleFileFilter. * Sat Feb 7 2009 John Guthrie 0:0.12.5-2 - Added simplyhtml.sh script to run the .jar file with the correct CLASSPATH. * Fri Feb 6 2009 John Guthrie 0:0.12.5-1 - Upgraded to 0.12.5. This included making changes for new source code tree structure. - Added -c flag to %%setup. - Changed %%patch in %%prep to %%patch0. - Replaced tabs with spaces to make rpmlint happy. * Mon Sep 15 2008 John Guthrie 0:0.12.3-2 - Added several Requires and BuildRequires lines as required by Packaging/Java guidelines. - Changed source to version that is downloadable from the simplyhtml web page as opposed to just a tag from the simplyhtml CVS. - Added gpl.txt and readme.txt to documentation. - Stripped carriage returns from build.xml. - Changed the package group for the javadoc subpackage. * Tue Sep 2 2008 John Guthrie 0:0.12.3-1 - Re-built RPM for Fedora 9 - Removed symlinks to .jar files from lib * Sun Aug 10 2008 David Walluck 0:0.12.3-0.0.1mdv2009.0 + Revision: 270182 - 0.12.3 * Sat Dec 29 2007 David Walluck 0:0.12.2-0.0.3mdv2008.1 + Revision: 139131 - fix jar symlinks * Sat Dec 29 2007 David Walluck 0:0.12.2-0.0.2mdv2008.1 + Revision: 139120 - add Requires - import simplyhtml Index: sources =================================================================== RCS file: /cvs/extras/rpms/simplyhtml/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Feb 2009 00:23:20 -0000 1.1 +++ sources 3 Mar 2009 04:11:26 -0000 1.2 @@ -0,0 +1 @@ +79520ab2b1b6f884e922637c92921884 SimplyHTML_src_0_12_5.tar.gz From cweyl at fedoraproject.org Tue Mar 3 04:15:33 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Tue, 3 Mar 2009 04:15:33 +0000 (UTC) Subject: rpms/perl-Workflow/devel .cvsignore, 1.2, 1.3 perl-Workflow.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <20090303041533.6E98470116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Workflow/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30829 Modified Files: .cvsignore perl-Workflow.spec sources Log Message: * Mon Mar 02 2009 Chris Weyl 1.32-1 - update to 1.32 - update br's to latest required Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Workflow/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Apr 2007 18:45:37 -0000 1.2 +++ .cvsignore 3 Mar 2009 04:15:02 -0000 1.3 @@ -1 +1,8 @@ -Workflow-0.26.tar.gz +Workflow-1.32.tar.gz +Workflow-* +*.rpm +*.gz +*.tar +noarch +clog +.build* Index: perl-Workflow.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Workflow/devel/perl-Workflow.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Workflow.spec 27 Feb 2009 04:21:59 -0000 1.4 +++ perl-Workflow.spec 3 Mar 2009 04:15:03 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Workflow -Version: 0.26 -Release: 5%{?dist} +Version: 1.32 +Release: 1%{?dist} Summary: Simple, flexible system to implement workflows License: GPL+ or Artistic Group: Development/Libraries @@ -15,19 +15,32 @@ %define __perl_provides %{SOURCE98} %define __perl_requires %{SOURCE99} -BuildRequires: perl, perl(Module::Build) +BuildRequires: perl +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Module::Build) +BuildRequires: perl(Carp) BuildRequires: perl(Class::Accessor) >= 0.18 BuildRequires: perl(Class::Factory) >= 1 BuildRequires: perl(Class::Observable) >= 1.04 BuildRequires: perl(DateTime) >= 0.15 BuildRequires: perl(DateTime::Format::Strptime) >= 1 +BuildRequires: perl(Data::Dumper) BuildRequires: perl(DBD::Mock) >= 0.1 +BuildRequires: perl(DBI) BuildRequires: perl(Exception::Class) >= 1.1 +BuildRequires: perl(File::Slurp) +BuildRequires: perl(List::MoreUtils) BuildRequires: perl(Log::Dispatch) >= 2 BuildRequires: perl(Log::Log4perl) >= 0.34 BuildRequires: perl(Test::Exception) BuildRequires: perl(XML::Simple) >= 2 +# tests +BuildRequires: perl(Test::More) +BuildRequires: perl(DateTime) +BuildRequires: perl(DateTime::Format::Strptime) +BuildRequires: perl(DBD::SQLite) + # optional test #1 BuildRequires: perl(Data::UUID) # optional test #2 -- not in Fedora yet @@ -85,6 +98,10 @@ %{_mandir}/man3/* %changelog +* Mon Mar 02 2009 Chris Weyl 1.32-1 +- update to 1.32 +- update br's to latest required + * Thu Feb 26 2009 Fedora Release Engineering - 0.26-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Workflow/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2007 18:45:37 -0000 1.2 +++ sources 3 Mar 2009 04:15:03 -0000 1.3 @@ -1 +1 @@ -e9c25c357b0e2a62fa91493b818a538f Workflow-0.26.tar.gz +fd82389980de5640b9b100c17a930f90 Workflow-1.32.tar.gz From cweyl at fedoraproject.org Tue Mar 3 04:39:30 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Tue, 3 Mar 2009 04:39:30 +0000 (UTC) Subject: rpms/perl-GStreamer/devel .cvsignore, 1.2, 1.3 perl-GStreamer.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <20090303043930.DED6870116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-GStreamer/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2518 Modified Files: .cvsignore perl-GStreamer.spec sources Log Message: * Mon Mar 02 2009 Chris Weyl 0.15-1 - update to 1.15 - trim doc - update BR's Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GStreamer/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Sep 2006 08:49:26 -0000 1.2 +++ .cvsignore 3 Mar 2009 04:39:00 -0000 1.3 @@ -1 +1,9 @@ -GStreamer-0.09.tar.gz +GStreamer-0.15.tar.gz +GStreamer-* +*.rpm +*.gz +*.tar +clog +.build* +x86_64 +i386 Index: perl-GStreamer.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GStreamer/devel/perl-GStreamer.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-GStreamer.spec 26 Feb 2009 16:52:03 -0000 1.7 +++ perl-GStreamer.spec 3 Mar 2009 04:39:00 -0000 1.8 @@ -1,23 +1,25 @@ Name: perl-GStreamer -Version: 0.09 -Release: 7%{?dist} +Version: 0.15 +Release: 1%{?dist} Summary: Perl bindings to the GStreamer framework License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/GStreamer/ Source0: http://www.cpan.org/authors/id/T/TS/TSCH/GStreamer-%{version}.tar.gz - # see http://bugzilla.gnome.org/show_bug.cgi?id=348454 Patch0: test.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildRequires: perl(ExtUtils::Depends) >= 0.205 -BuildRequires: perl(ExtUtils::PkgConfig) >= 1.07 -BuildRequires: perl(Glib) >= 1.120 +# non-perl BuildRequires: gstreamer-devel -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::Depends) >= 0.205 +BuildRequires: perl(ExtUtils::PkgConfig) >= 1.07 +BuildRequires: perl(Glib) >= 1.180 +# test +BuildRequires: perl(Test::More) %description GStreamer makes everybody dance like crazy. It provides the means to play, @@ -28,7 +30,7 @@ %prep %setup -q -n GStreamer-%{version} -%patch0 -p0 +#patch0 -p0 %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" @@ -60,17 +62,22 @@ %files %defattr(-,root,root,-) -%doc ChangeLog doctypes gst.typemap LICENSE maps NEWS README TODO examples/ +%doc ChangeLog doctypes LICENSE MAINTAINERS NEWS README TODO examples/ %{perl_vendorarch}/auto/* %{perl_vendorarch}/GStreamer* %{_mandir}/man3/* %changelog +* Mon Mar 02 2009 Chris Weyl 0.15-1 +- update to 1.15 +- trim doc +- update BR's + * Thu Feb 26 2009 Fedora Release Engineering - 0.09-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Thu Mar 06 2008 Tom "spot" Callaway - 0.09-6 -Rebuild for new perl +- Rebuild for new perl * Mon Feb 18 2008 Fedora Release Engineering - 0.09-5 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GStreamer/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Sep 2006 08:49:26 -0000 1.2 +++ sources 3 Mar 2009 04:39:00 -0000 1.3 @@ -1 +1 @@ -4f6f27edded250b00055d076eb738ff5 GStreamer-0.09.tar.gz +a01261f5a1012f4d6763e3721f1c9de7 GStreamer-0.15.tar.gz From pnemade at fedoraproject.org Tue Mar 3 04:45:59 2009 From: pnemade at fedoraproject.org (Parag Nemade) Date: Tue, 3 Mar 2009 04:45:59 +0000 (UTC) Subject: rpms/m17n-lib/devel .cvsignore, 1.10, 1.11 m17n-lib.spec, 1.23, 1.24 sources, 1.12, 1.13 Message-ID: <20090303044559.6B7FD70116@cvs1.fedora.phx.redhat.com> Author: pnemade Update of /cvs/pkgs/rpms/m17n-lib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3531 Modified Files: .cvsignore m17n-lib.spec sources Log Message: * Tue Mar 03 2009 Parag -1.5.4-1 - Update to new upstream release 1.5.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/m17n-lib/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 21 Oct 2008 10:17:24 -0000 1.10 +++ .cvsignore 3 Mar 2009 04:45:29 -0000 1.11 @@ -1,6 +1 @@ -m17n-lib-1.3.3.tar.gz -m17n-lib-1.4.0.tar.gz -m17n-lib-1.5.0.tar.gz -m17n-lib-1.5.1.tar.gz -m17n-lib-1.5.2.tar.gz -m17n-lib-1.5.3.tar.gz +m17n-lib-1.5.4.tar.gz Index: m17n-lib.spec =================================================================== RCS file: /cvs/pkgs/rpms/m17n-lib/devel/m17n-lib.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- m17n-lib.spec 25 Feb 2009 22:36:35 -0000 1.23 +++ m17n-lib.spec 3 Mar 2009 04:45:29 -0000 1.24 @@ -4,8 +4,8 @@ %define with_examples 0 Name: m17n-lib -Version: 1.5.3 -Release: 2%{?dist} +Version: 1.5.4 +Release: 1%{?dist} Summary: Multilingual text library Group: System Environment/Libraries @@ -96,6 +96,9 @@ %changelog +* Tue Mar 03 2009 Parag Nemade -1.5.4-1 +- Update to new upstream release 1.5.4 + * Wed Feb 25 2009 Fedora Release Engineering - 1.5.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/m17n-lib/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 21 Oct 2008 10:17:24 -0000 1.12 +++ sources 3 Mar 2009 04:45:29 -0000 1.13 @@ -1 +1 @@ -6c6c243a14305fee373283b553226215 m17n-lib-1.5.3.tar.gz +f7ef72fc1e084c6fc6fb3ba9663fd151 m17n-lib-1.5.4.tar.gz From mclasen at fedoraproject.org Tue Mar 3 04:46:59 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 04:46:59 +0000 (UTC) Subject: rpms/gvfs/devel gvfs-gdu.patch,NONE,1.1 gvfs.spec,1.109,1.110 Message-ID: <20090303044659.45A7C70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gvfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3570 Modified Files: gvfs.spec Added Files: gvfs-gdu.patch Log Message: Port to DeviceKit-disks gvfs-gdu.patch: --- NEW FILE gvfs-gdu.patch --- Index: configure.ac =================================================================== --- configure.ac (revision 2275) +++ configure.ac (working copy) @@ -198,6 +198,31 @@ AM_CONDITIONAL(USE_GCONF, [test "$msg_gconf" = "yes"]) +dnl ************************************ +dnl *** Check for gnome-disk-utility *** +dnl ************************************ + +dnl TODO: when there is a more stable version of gdu available, turn this on by default +AC_ARG_ENABLE(gdu, [ --enable-gdu build with gdu support]) +msg_gdu=no +GDU_LIBS= +GDU_CFLAGS= +GDU_REQUIRED=0.2 + +if test "x$enable_gdu" = "xyes"; then + PKG_CHECK_EXISTS([gdu >= $GDU_REQUIRED], msg_gdu=yes) + + if test "x$msg_gdu" == "xyes"; then + PKG_CHECK_MODULES([GDU],[gdu >= $GDU_REQUIRED]) + AC_DEFINE(HAVE_GDU, 1, [Define to 1 if gnome-disk-utility is available]) + fi +fi + +AC_SUBST(GDU_LIBS) +AC_SUBST(GDU_CFLAGS) + +AM_CONDITIONAL(USE_GDU, [test "$msg_gdu" = "yes"]) + dnl ********************** dnl *** Check for HAL *** dnl ********************** @@ -558,6 +583,7 @@ monitor/Makefile monitor/proxy/Makefile monitor/hal/Makefile +monitor/gdu/Makefile monitor/gphoto2/Makefile gconf/Makefile programs/Makefile @@ -579,7 +605,8 @@ archive support: $msg_archive GConf support: $msg_gconf DNS-SD support: $msg_avahi - Use HAL for volume monitor: $msg_hal (with fast init path: $have_hal_fast_init) + Build HAL volume monitor: $msg_hal (with fast init path: $have_hal_fast_init) + Build GDU volume monitor: $msg_gdu GNOME Keyring support: $msg_keyring Bash-completion support: $msg_bash_completion " Index: monitor/Makefile.am =================================================================== --- monitor/Makefile.am (revision 2275) +++ monitor/Makefile.am (working copy) @@ -5,6 +5,10 @@ SUBDIRS += hal endif +if USE_GDU +SUBDIRS += gdu +endif + if USE_GPHOTO2 SUBDIRS += gphoto2 endif --- /dev/null 2009-03-02 15:45:22.087299058 -0500 +++ monitor/gdu/gdu-volume-monitor-daemon.c 2009-03-01 23:47:15.000000000 -0500 @@ -0,0 +1,46 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* gvfs - extensions for gio + * + * Copyright (C) 2006-2009 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 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. + * + * Author: David Zeuthen + */ + +#include + +#include +#include +#include +#include + +#include + +#include "ggduvolumemonitor.h" + +int +main (int argc, char *argv[]) +{ + g_vfs_proxy_volume_monitor_daemon_init (); + + g_set_application_name (_("GVfs GDU Volume Monitor")); + + return g_vfs_proxy_volume_monitor_daemon_main (argc, + argv, + "org.gtk.Private.GduVolumeMonitor", + G_TYPE_GDU_VOLUME_MONITOR); +} --- /dev/null 2009-03-02 15:45:22.087299058 -0500 +++ monitor/gdu/ggdudrive.c 2009-03-01 23:48:33.000000000 -0500 @@ -0,0 +1,691 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* gvfs - extensions for gio + * + * Copyright (C) 2006-2009 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 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. + * + * Author: David Zeuthen + */ + +#include + +#include +#include +#include + +#include +#include + +#include "ggduvolumemonitor.h" +#include "ggdudrive.h" +#include "ggduvolume.h" + +struct _GGduDrive { + GObject parent; + + GVolumeMonitor *volume_monitor; /* owned by volume monitor */ + GList *volumes; /* entries in list are owned by volume_monitor */ + + GduPresentable *presentable; + + /* the following members need to be set upon construction */ + GIcon *icon; + gchar *name; + gchar *device_file; + gboolean is_media_removable; + gboolean has_media; + gboolean can_eject; + gboolean can_poll_for_media; + gboolean is_media_check_automatic; + time_t time_of_last_media_insertion; +}; + +static void g_gdu_drive_drive_iface_init (GDriveIface *iface); + +G_DEFINE_TYPE_EXTENDED (GGduDrive, g_gdu_drive, G_TYPE_OBJECT, 0, + G_IMPLEMENT_INTERFACE (G_TYPE_DRIVE, + g_gdu_drive_drive_iface_init)) + +static void presentable_changed (GduPresentable *presentable, + GGduDrive *drive); + +static void presentable_job_changed (GduPresentable *presentable, + GGduDrive *drive); + +static void +g_gdu_drive_finalize (GObject *object) +{ + GList *l; + GGduDrive *drive; + + drive = G_GDU_DRIVE (object); + + for (l = drive->volumes; l != NULL; l = l->next) + { [...4760 lines suppressed...] + "Error parsing reply for ObtainAuthorization(): %s: %s", + derror.name, derror.message); + dbus_error_free (&derror); + goto out; + } + + if (!gained_authz && error == NULL) + { + /* no need to translate, is never shown */ + g_simple_async_result_set_error (simple, + G_IO_ERROR, + G_IO_ERROR_FAILED_HANDLED, + "Didn't obtain authorization (bug in libgio user, it shouldn't display this error)"); + } + + out: + g_simple_async_result_complete (simple); + g_object_unref (simple); +} + + +gboolean +_obtain_authz_finish (GAsyncResult *res, + GError **error) +{ + GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res); + + g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == _obtain_authz); + + if (g_simple_async_result_propagate_error (simple, error)) + return FALSE; + else + return TRUE; +} + +void +_obtain_authz (const gchar *action_id, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + DBusConnection *connection; + DBusMessage *message; + GSimpleAsyncResult *simple; + guint xid; + guint pid; + DBusError derror; + + dbus_error_init (&derror); + + /* this connection is already integrated and guaranteed to exist, see gvfsproxyvolumemonitordaemon.c */ + connection = dbus_bus_get (DBUS_BUS_SESSION, &derror); + + simple = g_simple_async_result_new (NULL, + callback, + user_data, + _obtain_authz); + + message = dbus_message_new_method_call ("org.freedesktop.PolicyKit.AuthenticationAgent", /* bus name */ + "/", /* object */ + "org.freedesktop.PolicyKit.AuthenticationAgent", /* interface */ + "ObtainAuthorization"); + + xid = 0; + pid = getpid (); + + dbus_message_append_args (message, + DBUS_TYPE_STRING, + &(action_id), + DBUS_TYPE_UINT32, + &(xid), + DBUS_TYPE_UINT32, + &(pid), + DBUS_TYPE_INVALID); + + _g_dbus_connection_call_async (connection, + message, + -1, + (GAsyncDBusCallback) _obtain_authz_cb, + simple); + dbus_message_unref (message); + dbus_connection_unref (connection); +} --- /dev/null 2009-03-02 15:45:22.087299058 -0500 +++ monitor/gdu/polkit.h 2009-03-01 23:47:41.000000000 -0500 @@ -0,0 +1,44 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* gvfs - extensions for gio + * + * Copyright (C) 2006-2009 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 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. + * + * Author: David Zeuthen + */ + + +#ifndef __POLKIT_H__ +#define __POLKIT_H__ + +#include +#include +#include + +G_BEGIN_DECLS + +void _obtain_authz (const gchar *action_id, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean _obtain_authz_finish (GAsyncResult *res, + GError **error); + +G_END_DECLS + +#endif /* __POLKIT_H__ */ --- /dev/null 2009-03-02 15:45:22.087299058 -0500 +++ monitor/gdu/Makefile.am 2009-03-01 21:13:46.000000000 -0500 @@ -0,0 +1,53 @@ + +NULL = + +libexec_PROGRAMS = gvfs-gdu-volume-monitor + + +gvfs_gdu_volume_monitor_SOURCES = \ + gdu-volume-monitor-daemon.c \ + ggdudrive.c ggdudrive.h \ + ggduvolume.c ggduvolume.h \ + ggdumount.c ggdumount.h \ + ggduvolumemonitor.c ggduvolumemonitor.h \ + polkit.c polkit.h \ + $(NULL) + +gvfs_gdu_volume_monitor_CFLAGS = \ + -DG_LOG_DOMAIN=\"GVFS-Gdu\" \ + -I$(top_srcdir)/common \ + -I$(top_srcdir)/monitor/proxy \ + $(GLIB_CFLAGS) \ + $(GDU_CFLAGS) \ + $(DBUS_CFLAGS) \ + -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \ + -DGVFS_LOCALEDIR=\""$(localedir)"\" \ + -DG_DISABLE_DEPRECATED \ + -DGDU_API_IS_SUBJECT_TO_CHANGE \ + $(NULL) + +gvfs_gdu_volume_monitor_LDFLAGS = \ + $(NULL) + +gvfs_gdu_volume_monitor_LDADD = \ + $(GLIB_LIBS) \ + $(GDU_LIBS) \ + $(DBUS_LIBS) \ + $(top_builddir)/common/libgvfscommon.la \ + $(top_builddir)/monitor/proxy/libgvfsproxyvolumemonitordaemon-noin.la \ + $(NULL) + +remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors +remote_volume_monitors_DATA = gdu.monitor + +servicedir = $(datadir)/dbus-1/services +service_in_files = org.gtk.Private.GduVolumeMonitor.service.in +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + +clean-local: + rm -f *~ *.loT $(BUILT_SOURCES) $(service_DATA) + +EXTRA_DIST = $(service_in_files) gdu.monitor --- /dev/null 2009-03-02 15:45:22.087299058 -0500 +++ monitor/gdu/gdu.monitor 2009-02-11 06:42:26.000000000 -0500 @@ -0,0 +1,5 @@ +[RemoteVolumeMonitor] +Name=GProxyVolumeMonitorGdu +DBusName=org.gtk.Private.GduVolumeMonitor +IsNative=true +NativePriority=3 --- /dev/null 2009-03-02 15:45:22.087299058 -0500 +++ monitor/gdu/org.gtk.Private.GduVolumeMonitor.service.in 2009-02-19 22:34:26.000000000 -0500 @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.gtk.Private.GduVolumeMonitor +Exec=@libexecdir@/gvfs-gdu-volume-monitor Index: gvfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- gvfs.spec 2 Mar 2009 16:34:21 -0000 1.109 +++ gvfs.spec 3 Mar 2009 04:46:29 -0000 1.110 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.1.7 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig BuildRequires: glib2-devel >= 2.19.2 -BuildRequires: dbus-glib-devel +BuildRequires: dbus-glib-devel BuildRequires: /usr/bin/ssh BuildRequires: libcdio-devel >= 0.78.2 BuildRequires: hal-devel >= 0.5.10 @@ -18,8 +18,8 @@ BuildRequires: gnome-keyring-devel BuildRequires: intltool BuildRequires: gettext-devel -BuildRequires: perl(XML::Parser) BuildRequires: GConf2-devel +BuildRequires: gnome-disk-utility-devel >= 0.2 Requires(post): desktop-file-utils @@ -31,10 +31,12 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=567235 Patch1: gvfs-0.99.2-archive-integration.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=573826 +Patch2: gvfs-gdu.patch %description -The gvfs package provides backend implementations for the gio -framework in GLib. It includes ftp, sftp, cifs. +The gvfs package provides backend implementations for the gio +framework in GLib. It includes ftp, sftp, cifs. %package devel @@ -113,6 +115,7 @@ %prep %setup -q %patch1 -p0 -b .archive-integration +%patch2 -p0 -b .gdu %build @@ -123,7 +126,7 @@ automake || : autoconf || : -%configure +%configure --enable-gdu make # %{?_smp_mflags} %install @@ -170,7 +173,9 @@ %{_datadir}/gvfs/mounts/ftp.mount %{_datadir}/dbus-1/services/gvfs-daemon.service %{_datadir}/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service +%{_datadir}/dbus-1/services/org.gtk.Private.GduVolumeMonitor.service %{_datadir}/gvfs/remote-volume-monitors/hal.monitor +%{_datadir}/gvfs/remote-volume-monitors/gdu.monitor %{_libdir}/libgvfscommon.so.* %{_libdir}/libgvfscommon-dnssd.so.* # %{_libdir}/gio/modules/libgiohal-volume-monitor.so @@ -190,6 +195,7 @@ %{_libexecdir}/gvfsd-dnssd %{_libexecdir}/gvfsd-network %{_libexecdir}/gvfs-hal-volume-monitor +%{_libexecdir}/gvfs-gdu-volume-monitor %{_bindir}/gvfs-cat %{_bindir}/gvfs-copy %{_bindir}/gvfs-info @@ -253,6 +259,9 @@ %changelog +* Mon Mar 2 2009 Matthias Clasen - 1.1.7-2 +- Port to DeviceKit-disks + * Mon Mar 2 2009 Tomas Bzatek - 1.1.7-1 - Update to 1.1.7 From lyosnorezel at fedoraproject.org Tue Mar 3 05:09:21 2009 From: lyosnorezel at fedoraproject.org (Lyos Gemini Norezel) Date: Tue, 3 Mar 2009 05:09:21 +0000 (UTC) Subject: rpms/darkgarden-fonts/devel darkgarden-fonts.spec,1.7,1.8 Message-ID: <20090303050921.D86E070116@cvs1.fedora.phx.redhat.com> Author: lyosnorezel Update of /cvs/pkgs/rpms/darkgarden-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7840 Modified Files: darkgarden-fonts.spec Log Message: Index: darkgarden-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/darkgarden-fonts/devel/darkgarden-fonts.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- darkgarden-fonts.spec 24 Feb 2009 10:48:32 -0000 1.7 +++ darkgarden-fonts.spec 3 Mar 2009 05:08:51 -0000 1.8 @@ -1,9 +1,9 @@ -%define fontname darkgarden -%define fontconf 69-darkgarden.conf +%global fontname darkgarden +%global fontconf 69-darkgarden.conf Name: %{fontname}-fonts Version: 1.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Dark Garden is a decorative outline font of unusual shape Group: User Interface/X @@ -13,7 +13,7 @@ Source0: http://darkgarden.sourceforge.net/darkgarden-1.1.src.zip Source1: %{name}-fontconfig.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: fontpackages-devel @@ -34,7 +34,7 @@ %setup -q -n darkgarden-1.1 %{SOURCE0} %build -fontforge -c 'Open($1); Generate($2)' DarkGarden.sfd DarkGarden.ttf +fontforge -lang=ff -c 'Open($1); Generate($2)' DarkGarden.sfd DarkGarden.ttf %install rm -fr %{buildroot} @@ -61,9 +61,12 @@ %doc README.txt %doc COPYING-GPL.txt -%dir %{_fontdir}/ %changelog +* Mon Mar 2 2009 Lyos Gemini Norezel 1.1-8 +- Fixed fontconfig problems caused by some f***er turning python bindings on. +- Deleted erroneous modifications made by rel-eng. + * Tue Feb 24 2009 Fedora Release Engineering - 1.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From lyosnorezel at fedoraproject.org Tue Mar 3 05:42:52 2009 From: lyosnorezel at fedoraproject.org (Lyos Gemini Norezel) Date: Tue, 3 Mar 2009 05:42:52 +0000 (UTC) Subject: rpms/thibault-fonts/devel thibault-fonts.spec,1.8,1.9 Message-ID: <20090303054252.1117770116@cvs1.fedora.phx.redhat.com> Author: lyosnorezel Update of /cvs/pkgs/rpms/thibault-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13051 Modified Files: thibault-fonts.spec Log Message: Index: thibault-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/thibault-fonts/devel/thibault-fonts.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- thibault-fonts.spec 3 Mar 2009 04:02:21 -0000 1.8 +++ thibault-fonts.spec 3 Mar 2009 05:42:21 -0000 1.9 @@ -11,7 +11,7 @@ Name: %{fontname}-fonts Version: 0.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Thibault.org font collection Group: User Interface/X @@ -185,6 +185,9 @@ %changelog #thibault +* Mon Mar 2 2009 Lyos Gemini Norezel 0.1-9 +- Edited to censor to fit the whining nature of Fedora PC Freaks. + * Mon Mar 2 2009 Lyos Gemini Norezel 0.1-8 - Typo. @@ -193,7 +196,7 @@ * Mon Mar 2 2009 Lyos Gemini Norezel 0.1-6 - Fixed error in fontforge script that was -- caused by some fucker turning on python bindings. +- caused by some f***er turning on python bindings. * Mon Mar 2 2009 Lyos Gemini Norezel 0.1-5 - Fixed errors in previous modifications. From kevin at fedoraproject.org Tue Mar 3 05:44:57 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 05:44:57 +0000 (UTC) Subject: rpms/twinkle/F-10 twinkle.spec, 1.16, 1.17 sources, 1.7, 1.8 twinkle-1.3.2-command-line-segfault.patch, 1.1, NONE Message-ID: <20090303054457.7EC4F70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/extras/rpms/twinkle/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13561 Modified Files: twinkle.spec sources Removed Files: twinkle-1.3.2-command-line-segfault.patch Log Message: Update to 1.4.2 Index: twinkle.spec =================================================================== RCS file: /cvs/extras/rpms/twinkle/F-10/twinkle.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- twinkle.spec 10 Dec 2008 20:58:34 -0000 1.16 +++ twinkle.spec 3 Mar 2009 05:44:27 -0000 1.17 @@ -1,6 +1,6 @@ Name: twinkle -Version: 1.3.2 -Release: 2%{?dist} +Version: 1.4.2 +Release: 1%{?dist} Summary: A SIP Soft Phone Group: Applications/Internet @@ -8,7 +8,6 @@ URL: http://www.twinklephone.com Source0: http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz Patch0: twinkle-1.1-msg.patch -Patch1: twinkle-1.3.2-command-line-segfault.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: commoncpp2-devel @@ -22,6 +21,7 @@ BuildRequires: bison BuildRequires: libzrtpcpp-devel BuildRequires: file-devel +BuildRequires: readline-devel %description Twinkle is a SIP based soft phone for making telephone calls over IP networks. @@ -29,7 +29,6 @@ %prep %setup -q %patch0 -p1 -b .msg -%patch1 -p1 -b .segfault %build %configure @@ -62,6 +61,21 @@ %{_datadir}/applications/fedora-twinkle.desktop %changelog +* Wed Feb 25 2009 Kevin Fenzi - 1.4.2-1 +- Update to 1.4.2 + +* Wed Feb 25 2009 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 02 2009 Kevin Fenzi - 1.4.1-1 +- Update to 1.4.1 + +* Sun Jan 25 2009 Kevin Fenzi - 1.4-1 +- Update to 1.4 + +* Wed Dec 17 2008 Benjamin Kosnik - 1.3.2-3 +- Rebuild for boost-1.37.0. + * Tue Dec 09 2008 Kevin Fenzi - 1.3.2-2 - Add patch to fix command line segfault (fixes #473677) Index: sources =================================================================== RCS file: /cvs/extras/rpms/twinkle/F-10/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Sep 2008 20:08:39 -0000 1.7 +++ sources 3 Mar 2009 05:44:27 -0000 1.8 @@ -1 +1 @@ -8bafa14baeafc47be43c59fefc836c63 twinkle-1.3.2.tar.gz +d70c8972f296ffd998c7fb698774705b twinkle-1.4.2.tar.gz --- twinkle-1.3.2-command-line-segfault.patch DELETED --- From fabbione at fedoraproject.org Tue Mar 3 05:49:06 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Tue, 3 Mar 2009 05:49:06 +0000 (UTC) Subject: rpms/corosync/devel corosync-bump-soname.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 corosync.spec, 1.17, 1.18 sources, 1.3, 1.4 corosync-trunk_r1767.diff, 1.1, NONE corosync-trunk_r1774.diff, 1.1, NONE corosync-trunk_r1780.diff, 1.1, NONE Message-ID: <20090303054906.D87B870116@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/corosync/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14362 Modified Files: .cvsignore corosync.spec sources Added Files: corosync-bump-soname.diff Removed Files: corosync-trunk_r1767.diff corosync-trunk_r1774.diff corosync-trunk_r1780.diff Log Message: New upstream release corosync-bump-soname.diff: --- NEW FILE corosync-bump-soname.diff --- diff -Naurd corosync-0.94.orig/exec/Makefile corosync-0.94/exec/Makefile --- corosync-0.94.orig/exec/Makefile 2009-02-19 03:23:58.000000000 +0100 +++ corosync-0.94/exec/Makefile 2009-03-03 05:49:45.000000000 +0100 @@ -73,7 +73,7 @@ EXEC_OBJS = $(MAIN_OBJS) override CFLAGS += -fPIC -all:libtotem_pg.a libtotem_pg.so.2.0.0 liblogsys.a liblogsys.so.2.0.0 \ +all:libtotem_pg.a libtotem_pg.so.3.0.0 liblogsys.a liblogsys.so.3.0.0 \ ../lcr/lcr_ifact.o corosync_ \ objdb.lcrso vsf_ykd.lcrso coroparse.lcrso vsf_quorum.lcrso else @@ -125,18 +125,18 @@ ifeq (${COROSYNC_COMPAT}, DARWIN) -libtotem_pg.so.2.0.0: $(TOTEM_OBJS) +libtotem_pg.so.3.0.0: $(TOTEM_OBJS) $(CC) $(LDFLAGS) -bundle -bind_at_load $(TOTEM_OBJS) -o $@ -liblogsys.so.2.0.0: $(LOGSYS_OBJS) +liblogsys.so.3.0.0: $(LOGSYS_OBJS) $(CC) $(LDFLAGS) -bundle -bind_at_load $(LOGSYS_OBJS) -o $@ else -libtotem_pg.so.2.0.0: $(TOTEM_OBJS) - $(CC) $(LDFLAGS) -shared -Wl,-soname,libtotem_pg.so.2 $(TOTEM_OBJS) -o $@ +libtotem_pg.so.3.0.0: $(TOTEM_OBJS) + $(CC) $(LDFLAGS) -shared -Wl,-soname,libtotem_pg.so.3 $(TOTEM_OBJS) -o $@ -liblogsys.so.2.0.0: $(LIBLOGSYS_OBJS) - $(CC) -shared -Wl,-soname,liblogsys.so.2 $(LOGSYS_OBJS) -o $@ $(LDFLAGS) +liblogsys.so.3.0.0: $(LIBLOGSYS_OBJS) + $(CC) -shared -Wl,-soname,liblogsys.so.3 $(LOGSYS_OBJS) -o $@ $(LDFLAGS) endif diff -Naurd corosync-0.94.orig/lib/Makefile corosync-0.94/lib/Makefile --- corosync-0.94.orig/lib/Makefile 2009-02-19 03:23:58.000000000 +0100 +++ corosync-0.94/lib/Makefile 2009-03-03 05:49:45.000000000 +0100 @@ -37,14 +37,14 @@ override LDFLAGS += -L./ -all: libcpg.a libcpg.so.2.0.0 \ - libconfdb.a libconfdb.so.2.0.0 \ - libevs.a libevs.so.2.0.0 \ - libcfg.a libcfg.so.2.0.0 \ - libquorum.a libquorum.so.2.0.0 \ - libpload.a libpload.so.2.0.0 \ - libcoroipc.a libcoroipc.so.2.0.0 \ - libvotequorum.a libvotequorum.so.2.0.0 +all: libcpg.a libcpg.so.3.0.0 \ + libconfdb.a libconfdb.so.3.0.0 \ + libevs.a libevs.so.3.0.0 \ + libcfg.a libcfg.so.3.0.0 \ + libquorum.a libquorum.so.3.0.0 \ + libpload.a libpload.so.3.0.0 \ + libcoroipc.a libcoroipc.so.3.0.0 \ + libvotequorum.a libvotequorum.so.3.0.0 libcoroipc.a: coroipc.o $(AR) -rc libcoroipc.a coroipc.o @@ -52,55 +52,55 @@ ifeq (${COROSYNC_COMPAT}, DARWIN) DARWIN_OPTS=-dynamiclib -bind_at_load -current_version 2.0.0 -compatibility_version 2.0.0 -libcoroipc.so.2.0.0: coroipc.o +libcoroipc.so.3.0.0: coroipc.o $(CC) $(LDFLAGS) $(DARWIN_OPTS) coroipc.o -o $@ -libevs.so.2.0.0: coroipc.o evs.o +libevs.so.3.0.0: coroipc.o evs.o $(CC) $(LDFLAGS) $(DARWIN_OPTS) coroipc.o evs.o -o $@ -libcpg.so.2.0.0: coroipc.o cpg.o +libcpg.so.3.0.0: coroipc.o cpg.o $(CC) $(DARWIN_OPTS) coroipc.o cpg.o -o $@ -libquorum.so.2.0.0: coroipc.o quorum.o +libquorum.so.3.0.0: coroipc.o quorum.o $(CC) $(DARWIN_OPTS) coroipc.o quorum.o -o $@ -libvotequorum.so.2.0.0: coroipc.o votequorum.o +libvotequorum.so.3.0.0: coroipc.o votequorum.o $(CC) $(DARWIN_OPTS) coroipc.o votequorum.o -o $@ -libconfdb.so.2.0.0: coroipc.o confdb.o sa-confdb.o +libconfdb.so.3.0.0: coroipc.o confdb.o sa-confdb.o $(CC) $(LDFLAGS) $(DARWIN_OPTS) coroipc.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o -o $@ -libcfg.so.2.0.0: coroipc.o cfg.o +libcfg.so.3.0.0: coroipc.o cfg.o $(CC) $(DARWIN_OPTS) coroipc.o cfg.o -o $@ -libpload.so.2.0.0: coroipc.o pload.o +libpload.so.3.0.0: coroipc.o pload.o $(CC) $(DARWIN_OPTS) coroipc.o pload.o -o $@ else -libcoroipc.so.2.0.0: coroipc.o - $(CC) $(LDFLAGS) -shared -Wl,-soname,libcoroipc.so.2,-version-script=$(srcdir)$(subdir)libcoroipc.versions coroipc.o -o $@ +libcoroipc.so.3.0.0: coroipc.o + $(CC) $(LDFLAGS) -shared -Wl,-soname,libcoroipc.so.3,-version-script=$(srcdir)$(subdir)libcoroipc.versions coroipc.o -o $@ -libevs.so.2.0.0: coroipc.o evs.o - $(CC) $(LDFLAGS) -shared -Wl,-soname,libevs.so.2,-version-script=$(srcdir)$(subdir)libevs.versions coroipc.o evs.o -o $@ +libevs.so.3.0.0: coroipc.o evs.o + $(CC) $(LDFLAGS) -shared -Wl,-soname,libevs.so.3,-version-script=$(srcdir)$(subdir)libevs.versions coroipc.o evs.o -o $@ -libcpg.so.2.0.0: coroipc.o cpg.o - $(CC) -shared -Wl,-soname,libcpg.so.2,-version-script=$(srcdir)$(subdir)libcpg.versions coroipc.o cpg.o -o $@ +libcpg.so.3.0.0: coroipc.o cpg.o + $(CC) -shared -Wl,-soname,libcpg.so.3,-version-script=$(srcdir)$(subdir)libcpg.versions coroipc.o cpg.o -o $@ -libquorum.so.2.0.0: coroipc.o quorum.o - $(CC) -shared -Wl,-soname,libquorum.so.2,-version-script=$(srcdir)$(subdir)libquorum.versions coroipc.o quorum.o -o $@ +libquorum.so.3.0.0: coroipc.o quorum.o + $(CC) -shared -Wl,-soname,libquorum.so.3,-version-script=$(srcdir)$(subdir)libquorum.versions coroipc.o quorum.o -o $@ -libvotequorum.so.2.0.0: coroipc.o votequorum.o - $(CC) -shared -Wl,-soname,libvotequorum.so.2,-version-script=$(srcdir)$(subdir)libvotequorum.versions coroipc.o votequorum.o -o $@ +libvotequorum.so.3.0.0: coroipc.o votequorum.o + $(CC) -shared -Wl,-soname,libvotequorum.so.3,-version-script=$(srcdir)$(subdir)libvotequorum.versions coroipc.o votequorum.o -o $@ -libconfdb.so.2.0.0: coroipc.o confdb.o sa-confdb.o - $(CC) $(LDFLAGS) -shared -Wl,-soname,libconfdb.so.2,-version-script=$(srcdir)$(subdir)libconfdb.versions coroipc.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o -o $@ +libconfdb.so.3.0.0: coroipc.o confdb.o sa-confdb.o + $(CC) $(LDFLAGS) -shared -Wl,-soname,libconfdb.so.3,-version-script=$(srcdir)$(subdir)libconfdb.versions coroipc.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o -o $@ -libcfg.so.2.0.0: coroipc.o cfg.o - $(CC) -shared -Wl,-soname,libcfg.so.2,-version-script=$(srcdir)$(subdir)libcfg.versions coroipc.o cfg.o -o $@ +libcfg.so.3.0.0: coroipc.o cfg.o + $(CC) -shared -Wl,-soname,libcfg.so.3,-version-script=$(srcdir)$(subdir)libcfg.versions coroipc.o cfg.o -o $@ -libpload.so.2.0.0: coroipc.o pload.o - $(CC) -shared -Wl,-soname,libpload.so.2,-version-script=$(srcdir)$(subdir)libpload.versions coroipc.o cfg.o -o $@ +libpload.so.3.0.0: coroipc.o pload.o + $(CC) -shared -Wl,-soname,libpload.so.3,-version-script=$(srcdir)$(subdir)libpload.versions coroipc.o cfg.o -o $@ endif diff -Naurd corosync-0.94.orig/Makefile corosync-0.94/Makefile --- corosync-0.94.orig/Makefile 2009-02-25 05:58:08.000000000 +0100 +++ corosync-0.94/Makefile 2009-03-03 05:49:45.000000000 +0100 @@ -133,11 +133,11 @@ for eLib in $(EXEC_LIBS); do \ ( cd $(builddir) ; \ - ln -sf lib$$eLib.so.2.0.0 exec/lib$$eLib.so; \ - ln -sf lib$$eLib.so.2.0.0 exec/lib$$eLib.so.2; \ + ln -sf lib$$eLib.so.3.0.0 exec/lib$$eLib.so; \ + ln -sf lib$$eLib.so.3.0.0 exec/lib$$eLib.so.3; \ $(CP) -a exec/lib$$eLib.so $(DESTDIR)$(LIBDIR); \ - $(CP) -a exec/lib$$eLib.so.2 $(DESTDIR)$(LIBDIR); \ - install -m 755 exec/lib$$eLib.so.2.* $(DESTDIR)$(LIBDIR); \ + $(CP) -a exec/lib$$eLib.so.3 $(DESTDIR)$(LIBDIR); \ + install -m 755 exec/lib$$eLib.so.3.* $(DESTDIR)$(LIBDIR); \ if [ "xYES" = "x$(STATICLIBS)" ]; then \ install -m 755 exec/lib$$eLib.a $(DESTDIR)$(LIBDIR); \ if [ ${COROSYNC_COMPAT} = "DARWIN" ]; then \ @@ -149,11 +149,11 @@ for aLib in $(COROSYNC_LIBS); do \ ( cd $(builddir) ; \ - ln -sf lib$$aLib.so.2.0.0 lib/lib$$aLib.so; \ - ln -sf lib$$aLib.so.2.0.0 lib/lib$$aLib.so.2; \ + ln -sf lib$$aLib.so.3.0.0 lib/lib$$aLib.so; \ + ln -sf lib$$aLib.so.3.0.0 lib/lib$$aLib.so.3; \ $(CP) -a lib/lib$$aLib.so $(DESTDIR)$(LIBDIR); \ - $(CP) -a lib/lib$$aLib.so.2 $(DESTDIR)$(LIBDIR); \ - install -m 755 lib/lib$$aLib.so.2.* $(DESTDIR)$(LIBDIR); \ + $(CP) -a lib/lib$$aLib.so.3 $(DESTDIR)$(LIBDIR); \ + install -m 755 lib/lib$$aLib.so.3.* $(DESTDIR)$(LIBDIR); \ if [ "xYES" = "x$(STATICLIBS)" ]; then \ install -m 755 lib/lib$$aLib.a $(DESTDIR)$(LIBDIR); \ if [ ${COROSYNC_COMPAT} = "DARWIN" ]; then \ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/corosync/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Feb 2009 08:56:08 -0000 1.3 +++ .cvsignore 3 Mar 2009 05:48:35 -0000 1.4 @@ -1 +1 @@ -corosync-0.93.tar.gz +corosync-0.94.tar.gz Index: corosync.spec =================================================================== RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- corosync.spec 25 Feb 2009 05:12:19 -0000 1.17 +++ corosync.spec 3 Mar 2009 05:48:35 -0000 1.18 @@ -2,15 +2,13 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 0.93 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Version: 0.94 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} License: BSD Group: System Environment/Base URL: http://www.openais.org Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz -Patch0: corosync-trunk_r1767.diff -Patch1: corosync-trunk_r1774.diff -Patch2: corosync-trunk_r1780.diff +Patch0: corosync-bump-soname.diff # Runtime bits Requires: corosynclib = %{version}-%{release} @@ -26,9 +24,7 @@ %prep %setup -q -n corosync-%{version} -%patch0 -p0 -%patch1 -p0 -%patch2 -p0 +%patch0 -p1 %build @@ -118,7 +114,7 @@ %{_libdir}/corosync/libevs.so.* %{_libdir}/corosync/libtotem_pg.so.* %{_libdir}/corosync/liblogsys.so.* -%{_libdir}/corosync/libcoroutil.so.* +%{_libdir}/corosync/libcoroipc.so.* %{_libdir}/corosync/libquorum.so.* %{_libdir}/corosync/libvotequorum.so.* @@ -143,7 +139,7 @@ %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/README.devmap %dir %{_includedir}/corosync/ -%{_includedir}/corosync/ais_util.h +%{_includedir}/corosync/coroipc.h %{_includedir}/corosync/cfg.h %{_includedir}/corosync/confdb.h %{_includedir}/corosync/corotypes.h @@ -177,7 +173,7 @@ %{_libdir}/corosync/libevs.so %{_libdir}/corosync/libtotem_pg.so %{_libdir}/corosync/liblogsys.so -%{_libdir}/corosync/libcoroutil.so +%{_libdir}/corosync/libcoroipc.so %{_libdir}/corosync/libquorum.so %{_libdir}/corosync/libvotequorum.so %{_libdir}/pkgconfig/*.pc @@ -192,6 +188,11 @@ %{_mandir}/man8/votequorum_overview.8* %changelog +* Tue Mar 3 2009 Fabio M. Di Nitto - 0.94-1 +- New upstream release. +- Drop obsolete patches. +- Add soname bump patch that was missing from upstream. + * Wed Feb 25 2009 Fabio M. Di Nitto - 0.93-4 - Add Makefile fix to install all corosync tools (commit r1780) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/corosync/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Feb 2009 08:56:09 -0000 1.3 +++ sources 3 Mar 2009 05:48:35 -0000 1.4 @@ -1 +1 @@ -8080c8a45304ffb959db74de1ce55fb8 corosync-0.93.tar.gz +5839592fbb6982c6c897aa5020f0b629 corosync-0.94.tar.gz --- corosync-trunk_r1767.diff DELETED --- --- corosync-trunk_r1774.diff DELETED --- --- corosync-trunk_r1780.diff DELETED --- From pnemade at fedoraproject.org Tue Mar 3 05:50:21 2009 From: pnemade at fedoraproject.org (Parag Nemade) Date: Tue, 3 Mar 2009 05:50:21 +0000 (UTC) Subject: rpms/m17n-db/devel .cvsignore, 1.65, 1.66 m17n-db.spec, 1.97, 1.98 sources, 1.69, 1.70 hi-typewriter.mim, 1.1, NONE Message-ID: <20090303055021.48D8370116@cvs1.fedora.phx.redhat.com> Author: pnemade Update of /cvs/pkgs/rpms/m17n-db/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14680 Modified Files: .cvsignore m17n-db.spec sources Removed Files: hi-typewriter.mim Log Message: * Tue Mar 03 2009 Parag Nemade -1.5.4-1 - Update to new upstream release 1.5.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/m17n-db/devel/.cvsignore,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- .cvsignore 21 Oct 2008 10:17:44 -0000 1.65 +++ .cvsignore 3 Mar 2009 05:49:50 -0000 1.66 @@ -1,27 +1 @@ -m17n-db-1.3.3.tar.gz -m17n-db-indic-0.4.28.tar.gz -m17n-db-indic-0.4.29.tar.gz -m17n-db-indic-0.4.30.tar.gz -m17n-db-indic-0.4.31.tar.gz -m17n-db-indic-0.4.32.tar.gz -m17n-db-indic-0.4.33.tar.gz -m17n-db-indic-0.4.34.tar.gz -m17n-db-indic-0.4.35.tar.gz -m17n-db-indic-0.4.36.tar.gz -m17n-db-indic-0.4.37.tar.gz -m17n-db-indic-0.4.38.tar.gz -m17n-db-indic-0.4.39.tar.gz -m17n-db-indic-0.4.40.tar.gz -m17n-db-indic-0.4.41.tar.gz -m17n-db-1.3.4.tar.gz -m17n-db-indic-0.4.42.tar.gz -m17n-db-indic-0.4.43.tar.gz -m17n-db-indic-0.4.44.tar.gz -m17n-db-indic-0.4.45.tar.gz -m17n-db-indic-0.4.46.tar.gz -m17n-db-1.4.0.tar.gz -m17n-contrib-1.1.2.tar.gz -m17n-db-1.5.0.tar.gz -m17n-db-1.5.1.tar.gz -m17n-db-1.5.2.tar.gz -m17n-db-1.5.3.tar.gz +m17n-db-1.5.4.tar.gz Index: m17n-db.spec =================================================================== RCS file: /cvs/pkgs/rpms/m17n-db/devel/m17n-db.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- m17n-db.spec 25 Feb 2009 22:35:41 -0000 1.97 +++ m17n-db.spec 3 Mar 2009 05:49:50 -0000 1.98 @@ -1,7 +1,7 @@ Name: m17n-db Summary: Multilingualization datafiles for m17n-lib -Version: 1.5.3 -Release: 2%{?dist} +Version: 1.5.4 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://www.m17n.org/m17n-lib/index.html @@ -168,6 +168,7 @@ %mk_pkg_uses_contrib oriya or 1 %mk_pkg_uses_contrib punjabi pa 1 %mk_pkg_uses_contrib russian ru 1 +%mk_pkg sanskrit sa 0 %mk_pkg serbian sr 1 %mk_pkg_uses_contrib sinhala si 1 %mk_pkg slovak sk 1 @@ -297,6 +298,9 @@ %{_datadir}/ibus/engine/m17n-ug-*.engine %changelog +* Tue Mar 03 2009 Parag Nemade -1.5.4-1 +- Update to new upstream release 1.5.4 + * Wed Feb 25 2009 Fedora Release Engineering - 1.5.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/m17n-db/devel/sources,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- sources 21 Oct 2008 10:17:44 -0000 1.69 +++ sources 3 Mar 2009 05:49:51 -0000 1.70 @@ -1 +1 @@ -0fdf4582389bb8de75de88caffdd0776 m17n-db-1.5.3.tar.gz +c29db871d1e9c3cdde5891f1380c9eb2 m17n-db-1.5.4.tar.gz --- hi-typewriter.mim DELETED --- From pnemade at fedoraproject.org Tue Mar 3 05:55:21 2009 From: pnemade at fedoraproject.org (Parag Nemade) Date: Tue, 3 Mar 2009 05:55:21 +0000 (UTC) Subject: rpms/m17n-contrib/devel .cvsignore, 1.7, 1.8 m17n-contrib.spec, 1.23, 1.24 sources, 1.8, 1.9 Message-ID: <20090303055521.78A4570116@cvs1.fedora.phx.redhat.com> Author: pnemade Update of /cvs/pkgs/rpms/m17n-contrib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16000 Modified Files: .cvsignore m17n-contrib.spec sources Log Message: * Tue Mar 03 2009 Parag -1.1.9-1 - Update to new upstream release 1.1.9 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/m17n-contrib/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 Oct 2008 10:21:42 -0000 1.7 +++ .cvsignore 3 Mar 2009 05:54:50 -0000 1.8 @@ -1,6 +1 @@ -m17n-contrib-1.1.3.tar.gz -m17n-contrib-1.1.4.tar.gz -m17n-contrib-1.1.5.tar.gz -m17n-contrib-1.1.6.tar.gz -m17n-contrib-1.1.7.tar.gz -m17n-contrib-1.1.8.tar.gz +m17n-contrib-1.1.9.tar.gz Index: m17n-contrib.spec =================================================================== RCS file: /cvs/pkgs/rpms/m17n-contrib/devel/m17n-contrib.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- m17n-contrib.spec 25 Feb 2009 22:34:24 -0000 1.23 +++ m17n-contrib.spec 3 Mar 2009 05:54:50 -0000 1.24 @@ -1,7 +1,7 @@ Name: m17n-contrib Summary: Contributed multilingualization datafiles for m17n-lib -Version: 1.1.8 -Release: 3%{?dist} +Version: 1.1.9 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://www.m17n.org/m17n-lib/index.html @@ -123,6 +123,9 @@ %{_datadir}/m17n/scripts %changelog +* Tue Mar 03 2009 Parag Nemade -1.1.9-1 +- Update to new upstream release 1.1.9 + * Wed Feb 25 2009 Fedora Release Engineering - 1.1.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/m17n-contrib/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Oct 2008 10:21:42 -0000 1.8 +++ sources 3 Mar 2009 05:54:51 -0000 1.9 @@ -1 +1 @@ -1e36885707c854a7b9437c2be628354e m17n-contrib-1.1.8.tar.gz +541f628ca20b6e9ff99ccecea82c8d75 m17n-contrib-1.1.9.tar.gz From phuang at fedoraproject.org Tue Mar 3 05:55:49 2009 From: phuang at fedoraproject.org (Huang Peng) Date: Tue, 3 Mar 2009 05:55:49 +0000 (UTC) Subject: rpms/ibus-pinyin/devel .cvsignore, 1.11, 1.12 ibus-pinyin.spec, 1.12, 1.13 sources, 1.11, 1.12 Message-ID: <20090303055549.18E2570116@cvs1.fedora.phx.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/ibus-pinyin/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16091 Modified Files: .cvsignore ibus-pinyin.spec sources Log Message: Update to 1.1.0.20090303 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 25 Feb 2009 07:18:08 -0000 1.11 +++ .cvsignore 3 Mar 2009 05:55:18 -0000 1.12 @@ -1,2 +1,2 @@ -ibus-pinyin-1.1.0.20090225.tar.gz +ibus-pinyin-1.1.0.20090303.tar.gz pinyin-database-0.1.10.6.tar.bz2 Index: ibus-pinyin.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/ibus-pinyin.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ibus-pinyin.spec 25 Feb 2009 07:18:08 -0000 1.12 +++ ibus-pinyin.spec 3 Mar 2009 05:55:18 -0000 1.13 @@ -1,5 +1,5 @@ Name: ibus-pinyin -Version: 1.1.0.20090225 +Version: 1.1.0.20090303 Release: 1%{?dist} Summary: The PinYin engine for IBus platform License: GPLv2+ @@ -49,6 +49,9 @@ %{_libexecdir}/ibus-setup-pinyin %changelog +* Tue Mar 3 2009 Huang Peng - 1.1.0.20090303-1 +- Update to 1.1.0.20090303. + * Wed Feb 25 2009 Huang Peng - 1.1.0.20090225-1 - Update to 1.1.0.20090225. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 25 Feb 2009 07:18:08 -0000 1.11 +++ sources 3 Mar 2009 05:55:18 -0000 1.12 @@ -1,2 +1,2 @@ -0ef28b0d97dc1acfff4f142c5b7090d9 ibus-pinyin-1.1.0.20090225.tar.gz +f14c1110310598f0c332661d4a1a1a99 ibus-pinyin-1.1.0.20090303.tar.gz ebd8d2381993372bb97a877b549e14a0 pinyin-database-0.1.10.6.tar.bz2 From fabbione at fedoraproject.org Tue Mar 3 06:30:46 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Tue, 3 Mar 2009 06:30:46 +0000 (UTC) Subject: rpms/openais/devel openais-bump-soname.diff, NONE, 1.1 .cvsignore, 1.11, 1.12 openais.spec, 1.39, 1.40 sources, 1.12, 1.13 openais-trunk_r1717.diff, 1.1, NONE Message-ID: <20090303063046.469BB70116@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/openais/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21666 Modified Files: .cvsignore openais.spec sources Added Files: openais-bump-soname.diff Removed Files: openais-trunk_r1717.diff Log Message: New upstream release openais-bump-soname.diff: --- NEW FILE openais-bump-soname.diff --- diff -Nuard openais-0.93.orig/lib/Makefile openais-0.93/lib/Makefile --- openais-0.93.orig/lib/Makefile 2009-02-24 11:29:10.000000000 +0100 +++ openais-0.93/lib/Makefile 2009-03-03 06:42:22.000000000 +0100 @@ -38,89 +38,89 @@ override LDFLAGS += -L./ -L$(COROSYNCLIBDIR) -all: libSaClm.a libSaClm.so.2.0.0 \ - libSaCkpt.a libSaCkpt.so.2.0.0 \ - libSaAmf.a libSaAmf.so.2.0.0 \ - libSaEvt.a libSaEvt.so.2.0.0 \ - libSaMsg.a libSaMsg.so.2.0.0 \ - libSaLck.a libSaLck.so.2.0.0 \ - libSaTmr.a libSaTmr.so.2.0.0 +all: libSaClm.a libSaClm.so.3.0.0 \ + libSaCkpt.a libSaCkpt.so.3.0.0 \ + libSaAmf.a libSaAmf.so.3.0.0 \ + libSaEvt.a libSaEvt.so.3.0.0 \ + libSaMsg.a libSaMsg.so.3.0.0 \ + libSaLck.a libSaLck.so.3.0.0 \ + libSaTmr.a libSaTmr.so.3.0.0 ifeq (${OPENAIS_COMPAT}, DARWIN) DARWIN_OPTS=-dynamiclib -bind_at_load -current_version 2.0.0 -compatibility_version 2.0.0 -libSaAmf.so.2.0.0: util.o amf.o +libSaAmf.so.3.0.0: util.o amf.o $(CC) $(DARWIN_OPTS) amf.o -o $@ - ln -sf libSaAmf.so.2.0.0 libSaAmf.so.2 - ln -sf libSaAmf.so.2.0.0 libSaAmf.so + ln -sf libSaAmf.so.3.0.0 libSaAmf.so.3 + ln -sf libSaAmf.so.3.0.0 libSaAmf.so -libSaClm.so.2.0.0: util.o clm.o +libSaClm.so.3.0.0: util.o clm.o $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o clm.o -lcoroipc -o $@ - ln -sf libSaClm.so.2.0.0 libSaClm.so.2 - ln -sf libSaClm.so.2.0.0 libSaClm.so + ln -sf libSaClm.so.3.0.0 libSaClm.so.3 + ln -sf libSaClm.so.3.0.0 libSaClm.so -libSaCkpt.so.2.0.0: util.o ckpt.o +libSaCkpt.so.3.0.0: util.o ckpt.o $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o ckpt.o -lcoroipc -o $@ - ln -sf libSaCkpt.so.2.0.0 libSaCkpt.so.2 - ln -sf libSaCkpt.so.2.0.0 libSaCkpt.so + ln -sf libSaCkpt.so.3.0.0 libSaCkpt.so.3 + ln -sf libSaCkpt.so.3.0.0 libSaCkpt.so -libSaEvt.so.2.0.0: util.o evt.o +libSaEvt.so.3.0.0: util.o evt.o $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o evt.o -lcoroipc -o $@ - ln -sf libSaEvt.so.2.0.0 libSaEvt.so.2 - ln -sf libSaEvt.so.2.0.0 libSaEvt.so + ln -sf libSaEvt.so.3.0.0 libSaEvt.so.3 + ln -sf libSaEvt.so.3.0.0 libSaEvt.so -libSaMsg.so.2.0.0: util.o msg.o +libSaMsg.so.3.0.0: util.o msg.o $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o msg.o -lcoroipc -o $@ - ln -sf libSaMsg.so.2.0.0 libSaMsg.so.2 - ln -sf libSaMsg.so.2.0.0 libSaMsg.so + ln -sf libSaMsg.so.3.0.0 libSaMsg.so.3 + ln -sf libSaMsg.so.3.0.0 libSaMsg.so -libSaLck.so.2.0.0: util.o lck.o +libSaLck.so.3.0.0: util.o lck.o $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o lck.o -lcoroipc -o $@ - ln -sf libSaLck.so.2.0.0 libSaLck.so.2 - ln -sf libSaLck.so.2.0.0 libSaLck.so + ln -sf libSaLck.so.3.0.0 libSaLck.so.3 + ln -sf libSaLck.so.3.0.0 libSaLck.so -libSaTmr.so.2.0.0: util.o tmr.o +libSaTmr.so.3.0.0: util.o tmr.o $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o tmr.o -lcoroipc -o $@ - ln -sf libSaTmr.so.2.0.0 libSaTmr.so.2 - ln -sf libSaTmr.so.2.0.0 libSaTmr.so + ln -sf libSaTmr.so.3.0.0 libSaTmr.so.3 + ln -sf libSaTmr.so.3.0.0 libSaTmr.so else -libSaAmf.so.2.0.0: util.o amf.o - $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaAmf.so.2,-version-script=$(srcdir)$(subdir)libSaAmf.versions util.o amf.o -lcoroipc -o $@ - ln -sf libSaAmf.so.2.0.0 libSaAmf.so.2 - ln -sf libSaAmf.so.2.0.0 libSaAmf.so +libSaAmf.so.3.0.0: util.o amf.o + $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaAmf.so.3,-version-script=$(srcdir)$(subdir)libSaAmf.versions util.o amf.o -lcoroipc -o $@ + ln -sf libSaAmf.so.3.0.0 libSaAmf.so.3 + ln -sf libSaAmf.so.3.0.0 libSaAmf.so -libSaClm.so.2.0.0: util.o clm.o - $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaClm.so.2,-version-script=$(srcdir)$(subdir)libSaClm.versions clm.o util.o -lcoroipc -o $@ - ln -sf libSaClm.so.2.0.0 libSaClm.so.2 - ln -sf libSaClm.so.2.0.0 libSaClm.so +libSaClm.so.3.0.0: util.o clm.o + $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaClm.so.3,-version-script=$(srcdir)$(subdir)libSaClm.versions clm.o util.o -lcoroipc -o $@ + ln -sf libSaClm.so.3.0.0 libSaClm.so.3 + ln -sf libSaClm.so.3.0.0 libSaClm.so -libSaCkpt.so.2.0.0: util.o ckpt.o - $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaCkpt.so.2,-version-script=$(srcdir)$(subdir)libSaCkpt.versions util.o ckpt.o -lcoroipc -o $@ - ln -sf libSaCkpt.so.2.0.0 libSaCkpt.so.2 - ln -sf libSaCkpt.so.2.0.0 libSaCkpt.so +libSaCkpt.so.3.0.0: util.o ckpt.o + $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaCkpt.so.3,-version-script=$(srcdir)$(subdir)libSaCkpt.versions util.o ckpt.o -lcoroipc -o $@ + ln -sf libSaCkpt.so.3.0.0 libSaCkpt.so.3 + ln -sf libSaCkpt.so.3.0.0 libSaCkpt.so -libSaEvt.so.2.0.0: util.o evt.o - $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaEvt.so.2,-version-script=$(srcdir)$(subdir)libSaEvt.versions util.o evt.o -lcoroipc -o $@ - ln -sf libSaEvt.so.2.0.0 libSaEvt.so.2 - ln -sf libSaEvt.so.2.0.0 libSaEvt.so +libSaEvt.so.3.0.0: util.o evt.o + $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaEvt.so.3,-version-script=$(srcdir)$(subdir)libSaEvt.versions util.o evt.o -lcoroipc -o $@ + ln -sf libSaEvt.so.3.0.0 libSaEvt.so.3 + ln -sf libSaEvt.so.3.0.0 libSaEvt.so -libSaMsg.so.2.0.0: util.o msg.o - $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaMsg.so.2,-version-script=$(srcdir)$(subdir)libSaMsg.versions util.o msg.o -lcoroipc -o $@ - ln -sf libSaMsg.so.2.0.0 libSaMsg.so.2 - ln -sf libSaMsg.so.2.0.0 libSaMsg.so +libSaMsg.so.3.0.0: util.o msg.o + $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaMsg.so.3,-version-script=$(srcdir)$(subdir)libSaMsg.versions util.o msg.o -lcoroipc -o $@ + ln -sf libSaMsg.so.3.0.0 libSaMsg.so.3 + ln -sf libSaMsg.so.3.0.0 libSaMsg.so -libSaLck.so.2.0.0: util.o lck.o - $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaLck.so.2,-version-script=$(srcdir)$(subdir)libSaLck.versions util.o lck.o -lcoroipc -o $@ - ln -sf libSaLck.so.2.0.0 libSaLck.so.2 - ln -sf libSaLck.so.2.0.0 libSaLck.so +libSaLck.so.3.0.0: util.o lck.o + $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaLck.so.3,-version-script=$(srcdir)$(subdir)libSaLck.versions util.o lck.o -lcoroipc -o $@ + ln -sf libSaLck.so.3.0.0 libSaLck.so.3 + ln -sf libSaLck.so.3.0.0 libSaLck.so -libSaTmr.so.2.0.0: util.o tmr.o - $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaTmr.so.2,-version-script=$(srcdir)$(subdir)libSaTmr.versions util.o tmr.o -lcoroipc -o $@ - ln -sf libSaTmr.so.2.0.0 libSaTmr.so.2 - ln -sf libSaTmr.so.2.0.0 libSaTmr.so +libSaTmr.so.3.0.0: util.o tmr.o + $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaTmr.so.3,-version-script=$(srcdir)$(subdir)libSaTmr.versions util.o tmr.o -lcoroipc -o $@ + ln -sf libSaTmr.so.3.0.0 libSaTmr.so.3 + ln -sf libSaTmr.so.3.0.0 libSaTmr.so endif diff -Nuard openais-0.93.orig/Makefile openais-0.93/Makefile --- openais-0.93.orig/Makefile 2009-02-24 11:29:10.000000000 +0100 +++ openais-0.93/Makefile 2009-03-03 06:42:22.000000000 +0100 @@ -110,11 +110,11 @@ for aLib in $(AIS_LIBS); do \ ( cd $(builddir) ; \ - ln -sf lib$$aLib.so.2.0.0 lib/lib$$aLib.so; \ - ln -sf lib$$aLib.so.2.0.0 lib/lib$$aLib.so.2; \ + ln -sf lib$$aLib.so.3.0.0 lib/lib$$aLib.so; \ + ln -sf lib$$aLib.so.3.0.0 lib/lib$$aLib.so.3; \ $(CP) -a lib/lib$$aLib.so $(DESTDIR)$(LIBDIR); \ - $(CP) -a lib/lib$$aLib.so.2 $(DESTDIR)$(LIBDIR); \ - install -m 755 lib/lib$$aLib.so.2.* $(DESTDIR)$(LIBDIR); \ + $(CP) -a lib/lib$$aLib.so.3 $(DESTDIR)$(LIBDIR); \ + install -m 755 lib/lib$$aLib.so.3.* $(DESTDIR)$(LIBDIR); \ if [ "xYES" = "x$(STATICLIBS)" ]; then \ install -m 755 lib/lib$$aLib.a $(DESTDIR)$(LIBDIR); \ if [ ${OPENAIS_COMPAT} = "DARWIN" ]; then \ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openais/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 19 Feb 2009 08:58:14 -0000 1.11 +++ .cvsignore 3 Mar 2009 06:30:15 -0000 1.12 @@ -1 +1 @@ -openais-0.92.tar.gz +openais-0.93.tar.gz Index: openais.spec =================================================================== RCS file: /cvs/pkgs/rpms/openais/devel/openais.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- openais.spec 26 Feb 2009 08:17:16 -0000 1.39 +++ openais.spec 3 Mar 2009 06:30:15 -0000 1.40 @@ -2,28 +2,28 @@ Name: openais Summary: The openais Standards-Based Cluster Framework executive and APIs -Version: 0.92 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Version: 0.93 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} License: BSD Group: System Environment/Base URL: http://developer.osdl.org/dev/openais/ Source0: http://www.osdl.org/downloads/openais-%{version}/openais-%{version}.tar.gz -Patch0: openais-trunk_r1717.diff +Patch0: openais-bump-soname.diff # Runtime bits Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig -Requires: corosync >= 0.93-1 +Requires: corosync >= 0.94-1 Requires: openaislib = %{version}-%{release} Conflicts: openais-devel <= 0.89 # Setup/build bits BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: corosynclib-devel >= 0.93-1 +BuildRequires: corosynclib-devel >= 0.94-1 %prep %setup -q -n openais-%{version} -%patch0 -p0 +%patch0 -p1 %build # -O3 required for performance reasons @@ -140,6 +140,10 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Mar 3 2009 Fabio M. Di Nitto - 0.93-1 +- New upstream release. +- Bump Requires and BuildRequires to corosync 0.94-1. + * Thu Feb 26 2009 Fedora Release Engineering - 0.92-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openais/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 19 Feb 2009 08:58:14 -0000 1.12 +++ sources 3 Mar 2009 06:30:15 -0000 1.13 @@ -1 +1 @@ -6f96bafd16d5f690c1798248cd8e499b openais-0.92.tar.gz +64c8988d630e20e827dba31522b52c17 openais-0.93.tar.gz --- openais-trunk_r1717.diff DELETED --- From fabbione at fedoraproject.org Tue Mar 3 06:55:01 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Tue, 3 Mar 2009 06:55:01 +0000 (UTC) Subject: rpms/resource-agents/devel .cvsignore, 1.2, 1.3 resource-agents.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090303065501.393BF70117@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/resource-agents/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25593 Modified Files: .cvsignore resource-agents.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/resource-agents/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Feb 2009 12:37:00 -0000 1.2 +++ .cvsignore 3 Mar 2009 06:54:30 -0000 1.3 @@ -1 +1 @@ -resource-agents-3.0.0.alpha5.tar.gz +resource-agents-3.0.0.alpha6.tar.gz Index: resource-agents.spec =================================================================== RCS file: /cvs/pkgs/rpms/resource-agents/devel/resource-agents.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- resource-agents.spec 24 Feb 2009 12:39:24 -0000 1.2 +++ resource-agents.spec 3 Mar 2009 06:54:30 -0000 1.3 @@ -14,12 +14,12 @@ # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html # keep around ready for later user -%define alphatag alpha5 +%define alphatag alpha6 Name: resource-agents Summary: Open Source HA Resource Agents for Red Hat Cluster Version: 3.0.0 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sources.redhat.com/cluster/wiki/ @@ -72,6 +72,9 @@ %{_datadir}/cluster %changelog +* Tue Mar 3 2009 Fabio M. Di Nitto - 3.0.0-5.alpha6 +- New upstream release. + * Tue Feb 24 2009 Fabio M. Di Nitto - 3.0.0-4.alpha5 - Drop Conflicts with rgmanager. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/resource-agents/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Feb 2009 12:37:00 -0000 1.2 +++ sources 3 Mar 2009 06:54:30 -0000 1.3 @@ -1 +1 @@ -59f5e56f17a3dfefb2a3e3ccc2dacc5c resource-agents-3.0.0.alpha5.tar.gz +cc66511f122f21c2936e63ec34fef7b7 resource-agents-3.0.0.alpha6.tar.gz From jnovy at fedoraproject.org Tue Mar 3 07:08:57 2009 From: jnovy at fedoraproject.org (Jindrich Novy) Date: Tue, 3 Mar 2009 07:08:57 +0000 (UTC) Subject: rpms/curl/devel curl-7.19.4-easy-leak.patch, NONE, 1.1 .cvsignore, 1.32, 1.33 curl.spec, 1.86, 1.87 sources, 1.32, 1.33 curl-7.19.3-nss-fix.patch, 1.1, NONE Message-ID: <20090303070857.E1B2B70116@cvs1.fedora.phx.redhat.com> Author: jnovy Update of /cvs/pkgs/rpms/curl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28890 Modified Files: .cvsignore curl.spec sources Added Files: curl-7.19.4-easy-leak.patch Removed Files: curl-7.19.3-nss-fix.patch Log Message: * Tue Mar 03 2009 Jindrich Novy 7.19.4-1 - update to 7.19.4 (fixes CVE-2009-0037) - fix leak in curl_easy* functions, thanks to Kamil Dudka - drop nss-fix patch, applied upstream curl-7.19.4-easy-leak.patch: --- NEW FILE curl-7.19.4-easy-leak.patch --- diff -up curl-7.19.4/lib/easy.c.easy-leak curl-7.19.4/lib/easy.c --- curl-7.19.4/lib/easy.c.easy-leak 2009-01-29 21:41:51.000000000 +0100 +++ curl-7.19.4/lib/easy.c 2009-03-03 07:54:58.000000000 +0100 @@ -352,13 +352,11 @@ CURL *curl_easy_init(void) struct SessionHandle *data; /* Make sure we inited the global SSL stuff */ - if(!initialized) { - res = curl_global_init(CURL_GLOBAL_DEFAULT); - if(res) { - /* something in the global init failed, return nothing */ - DEBUGF(fprintf(stderr, "Error: curl_global_init failed\n")); - return NULL; - } + res = curl_global_init(CURL_GLOBAL_DEFAULT); + if(res) { + /* something in the global init failed, return nothing */ + DEBUGF(fprintf(stderr, "Error: curl_global_init failed\n")); + return NULL; } /* We use curl_open() with undefined URL so far */ @@ -549,10 +547,10 @@ void curl_easy_cleanup(CURL *curl) { struct SessionHandle *data = (struct SessionHandle *)curl; - if(!data) - return; + if(data) + Curl_close(data); - Curl_close(data); + curl_global_cleanup(); } /* Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/curl/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 17 Feb 2009 11:31:20 -0000 1.32 +++ .cvsignore 3 Mar 2009 07:08:27 -0000 1.33 @@ -1,2 +1 @@ -curl-7.18.2.tar.bz2 -curl-7.19.3.tar.bz2 +curl-7.19.4.tar.bz2 Index: curl.spec =================================================================== RCS file: /cvs/pkgs/rpms/curl/devel/curl.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- curl.spec 24 Feb 2009 10:20:40 -0000 1.86 +++ curl.spec 3 Mar 2009 07:08:27 -0000 1.87 @@ -1,14 +1,14 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl -Version: 7.19.3 -Release: 2%{?dist} +Version: 7.19.4 +Release: 1%{?dist} License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 Patch1: curl-7.15.3-multilib.patch Patch2: curl-7.16.0-privlibs.patch Patch3: curl-7.17.1-badsocket.patch -Patch4: curl-7.19.3-nss-fix.patch +Patch4: curl-7.19.4-easy-leak.patch Provides: webclient URL: http://curl.haxx.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -49,7 +49,7 @@ %patch1 -p1 -b .multilib %patch2 -p1 -b .privlibs %patch3 -p1 -b .badsocket -%patch4 -p1 -b .nssfix +%patch4 -p1 -b .easy-leak # Convert docs to UTF-8 for f in CHANGES README; do @@ -118,6 +118,11 @@ %{_datadir}/aclocal/libcurl.m4 %changelog +* Tue Mar 03 2009 Jindrich Novy 7.19.4-1 +- update to 7.19.4 (fixes CVE-2009-0037) +- fix leak in curl_easy* functions, thanks to Kamil Dudka +- drop nss-fix patch, applied upstream + * Tue Feb 24 2009 Fedora Release Engineering - 7.19.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/curl/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 17 Feb 2009 11:31:20 -0000 1.32 +++ sources 3 Mar 2009 07:08:27 -0000 1.33 @@ -1 +1 @@ -10eb8c13350c735eff20d7b4530be8cd curl-7.19.3.tar.bz2 +2734167c1e5f7ce6be99b75d2d371d85 curl-7.19.4.tar.bz2 --- curl-7.19.3-nss-fix.patch DELETED --- From jnovy at fedoraproject.org Tue Mar 3 07:30:16 2009 From: jnovy at fedoraproject.org (Jindrich Novy) Date: Tue, 3 Mar 2009 07:30:16 +0000 (UTC) Subject: rpms/curl/F-10 curl-7.19.4-easy-leak.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 curl-7.17.1-badsocket.patch, 1.1, 1.2 curl.spec, 1.84, 1.85 sources, 1.31, 1.32 curl-7.17.1-sslgen.patch, 1.1, NONE curl-7.18.2-nss-init.patch, 1.1, NONE curl-7.18.2-nssproxy.patch, 1.1, NONE Message-ID: <20090303073016.1AADD70116@cvs1.fedora.phx.redhat.com> Author: jnovy Update of /cvs/pkgs/rpms/curl/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv441 Modified Files: .cvsignore curl-7.17.1-badsocket.patch curl.spec sources Added Files: curl-7.19.4-easy-leak.patch Removed Files: curl-7.17.1-sslgen.patch curl-7.18.2-nss-init.patch curl-7.18.2-nssproxy.patch Log Message: * Tue Mar 03 2009 Jindrich Novy 7.19.4-1 - update to 7.19.4 (fixes CVE-2009-0037) - fix leak in curl_easy* functions, thanks to Kamil Dudka - drop nss-proxy, sslgen, nss-init patches - update badsocket patch curl-7.19.4-easy-leak.patch: --- NEW FILE curl-7.19.4-easy-leak.patch --- diff -up curl-7.19.4/lib/easy.c.easy-leak curl-7.19.4/lib/easy.c --- curl-7.19.4/lib/easy.c.easy-leak 2009-01-29 21:41:51.000000000 +0100 +++ curl-7.19.4/lib/easy.c 2009-03-03 07:54:58.000000000 +0100 @@ -352,13 +352,11 @@ CURL *curl_easy_init(void) struct SessionHandle *data; /* Make sure we inited the global SSL stuff */ - if(!initialized) { - res = curl_global_init(CURL_GLOBAL_DEFAULT); - if(res) { - /* something in the global init failed, return nothing */ - DEBUGF(fprintf(stderr, "Error: curl_global_init failed\n")); - return NULL; - } + res = curl_global_init(CURL_GLOBAL_DEFAULT); + if(res) { + /* something in the global init failed, return nothing */ + DEBUGF(fprintf(stderr, "Error: curl_global_init failed\n")); + return NULL; } /* We use curl_open() with undefined URL so far */ @@ -549,10 +547,10 @@ void curl_easy_cleanup(CURL *curl) { struct SessionHandle *data = (struct SessionHandle *)curl; - if(!data) - return; + if(data) + Curl_close(data); - Curl_close(data); + curl_global_cleanup(); } /* Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/curl/F-10/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 4 Jun 2008 17:30:58 -0000 1.31 +++ .cvsignore 3 Mar 2009 07:29:45 -0000 1.32 @@ -1 +1 @@ -curl-7.18.2.tar.bz2 +curl-7.19.4.tar.bz2 curl-7.17.1-badsocket.patch: Index: curl-7.17.1-badsocket.patch =================================================================== RCS file: /cvs/pkgs/rpms/curl/F-10/curl-7.17.1-badsocket.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- curl-7.17.1-badsocket.patch 8 Jan 2008 14:18:28 -0000 1.1 +++ curl-7.17.1-badsocket.patch 3 Mar 2009 07:29:45 -0000 1.2 @@ -1,13 +1,13 @@ -diff -up curl-7.17.1/lib/ftp.c.badsocket curl-7.17.1/lib/ftp.c ---- curl-7.17.1/lib/ftp.c.badsocket 2007-10-27 00:25:19.000000000 +0200 -+++ curl-7.17.1/lib/ftp.c 2008-01-08 15:09:03.000000000 +0100 -@@ -3228,7 +3228,8 @@ static CURLcode Curl_ftp_done(struct con - /* Note that we keep "use" set to TRUE since that (next) connection is - still requested to use SSL */ - } -- sclose(conn->sock[SECONDARYSOCKET]); -+ if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET]) -+ sclose(conn->sock[SECONDARYSOCKET]); - - conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD; +diff -ruNp curl-7.19.3.orig/lib/ftp.c curl-7.19.3/lib/ftp.c +--- curl-7.19.3.orig/lib/ftp.c 2009-02-11 10:57:33.334280000 +0100 ++++ curl-7.19.3/lib/ftp.c 2009-02-11 10:59:43.957585266 +0100 +@@ -3222,7 +3222,8 @@ static CURLcode ftp_done(struct connectd + /* Note that we keep "use" set to TRUE since that (next) connection is + still requested to use SSL */ + } +- sclose(conn->sock[SECONDARYSOCKET]); ++ if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET]) ++ sclose(conn->sock[SECONDARYSOCKET]); + conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD; + } Index: curl.spec =================================================================== RCS file: /cvs/pkgs/rpms/curl/F-10/curl.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- curl.spec 15 Dec 2008 13:40:46 -0000 1.84 +++ curl.spec 3 Mar 2009 07:29:45 -0000 1.85 @@ -1,15 +1,14 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl -Version: 7.18.2 -Release: 9%{?dist} +Version: 7.19.4 +Release: 1%{?dist} License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 Patch1: curl-7.15.3-multilib.patch Patch2: curl-7.16.0-privlibs.patch Patch3: curl-7.17.1-badsocket.patch -Patch4: curl-7.18.2-nssproxy.patch -Patch5: curl-7.18.2-nss-init.patch +Patch4: curl-7.19.4-easy-leak.patch Provides: webclient URL: http://curl.haxx.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -50,8 +49,7 @@ %patch1 -p1 -b .multilib %patch2 -p1 -b .privlibs %patch3 -p1 -b .badsocket -%patch4 -p1 -b .nssproxy -%patch5 -p1 -b .nssinit +%patch4 -p1 -b .easy-leak # Convert docs to UTF-8 for f in CHANGES README; do @@ -120,6 +118,12 @@ %{_datadir}/aclocal/libcurl.m4 %changelog +* Tue Mar 03 2009 Jindrich Novy 7.19.4-1 +- update to 7.19.4 (fixes CVE-2009-0037) +- fix leak in curl_easy* functions, thanks to Kamil Dudka +- drop nss-proxy, sslgen, nss-init patches +- update badsocket patch + * Mon Dec 15 2008 Jindrich Novy 7.18.2-9 - release++ because of tag conflict caused by f10/rawhide branch split Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/curl/F-10/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 4 Jun 2008 17:30:58 -0000 1.31 +++ sources 3 Mar 2009 07:29:45 -0000 1.32 @@ -1 +1 @@ -c389be5b0525276e58865956b7465562 curl-7.18.2.tar.bz2 +2734167c1e5f7ce6be99b75d2d371d85 curl-7.19.4.tar.bz2 --- curl-7.17.1-sslgen.patch DELETED --- --- curl-7.18.2-nss-init.patch DELETED --- --- curl-7.18.2-nssproxy.patch DELETED --- From fabbione at fedoraproject.org Tue Mar 3 07:34:14 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Tue, 3 Mar 2009 07:34:14 +0000 (UTC) Subject: rpms/fence-agents/devel .cvsignore, 1.2, 1.3 fence-agents.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <20090303073414.D0DB170116@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/fence-agents/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1259 Modified Files: .cvsignore fence-agents.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fence-agents/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Feb 2009 12:30:04 -0000 1.2 +++ .cvsignore 3 Mar 2009 07:33:44 -0000 1.3 @@ -1 +1 @@ -fence-agents-3.0.0.alpha5.tar.gz +fence-agents-3.0.0.alpha6.tar.gz Index: fence-agents.spec =================================================================== RCS file: /cvs/pkgs/rpms/fence-agents/devel/fence-agents.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fence-agents.spec 24 Feb 2009 13:05:00 -0000 1.3 +++ fence-agents.spec 3 Mar 2009 07:33:44 -0000 1.4 @@ -14,12 +14,12 @@ # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html # keep around ready for later user -%define alphatag alpha5 +%define alphatag alpha6 Name: fence-agents Summary: Fence Agents for Red Hat Cluster Version: 3.0.0 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Release: 6%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sources.redhat.com/cluster/wiki/ @@ -45,8 +45,8 @@ BuildRequires: glibc-devel BuildRequires: libxml2-devel BuildRequires: clusterlib-devel >= 3.0.0 -BuildRequires: corosynclib-devel >= 0.93-1 -BuildRequires: openaislib-devel >= 0.92-1 +BuildRequires: corosynclib-devel >= 0.94-1 +BuildRequires: openaislib-devel >= 0.93-1 %if %{buildvirt} BuildRequires: nss-devel nspr-devel libvirt-devel xen-libs @@ -112,6 +112,9 @@ %{_mandir}/man8/fence* %changelog +* Tue Mar 3 2009 Fabio M. Di Nitto - 3.0.0-6.alpha6 +- New upstream release. + * Tue Feb 24 2009 Fabio M. Di Nitto - 3.0.0-5.alpha5 - Fix directory ownership. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fence-agents/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Feb 2009 12:30:04 -0000 1.2 +++ sources 3 Mar 2009 07:33:44 -0000 1.3 @@ -1 +1 @@ -8f268a7fd15ebff15d668003b620aadd fence-agents-3.0.0.alpha5.tar.gz +ce58a2548d880d709bc22777179acab5 fence-agents-3.0.0.alpha6.tar.gz From fabbione at fedoraproject.org Tue Mar 3 07:37:32 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Tue, 3 Mar 2009 07:37:32 +0000 (UTC) Subject: rpms/cluster/devel fix-typo.diff, NONE, 1.1 .cvsignore, 1.19, 1.20 cluster.spec, 1.43, 1.44 sources, 1.19, 1.20 fence-man-pages.diff, 1.1, NONE Message-ID: <20090303073732.4367570116@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/cluster/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2056 Modified Files: .cvsignore cluster.spec sources Added Files: fix-typo.diff Removed Files: fence-man-pages.diff Log Message: New upstream release fix-typo.diff: --- NEW FILE fix-typo.diff --- diff --git a/fence/fence_node/Makefile b/fence/fence_node/Makefile index 06a8e54..9f97089 100644 --- a/fence/fence_node/Makefile +++ b/fence/fence_node/Makefile @@ -18,7 +18,7 @@ CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${fenceincdir} -I${logtincdir} CFLAGS += -I$(S)/../libfenced CFLAGS += -I${incdir} -LDFLAGS += -L${ccslibdir} -L{cmanlibdir} -L${fencelibdir} -lccs -lcman -lfence +LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -L${fencelibdir} -lccs -lcman -lfence LDFLAGS += -L${logtlibdir} -llogthread LDFLAGS += -L../libfenced -lfenced LDFLAGS += -L${libdir} Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cluster/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 23 Feb 2009 11:38:03 -0000 1.19 +++ .cvsignore 3 Mar 2009 07:37:01 -0000 1.20 @@ -1 +1 @@ -cluster-3.0.0.alpha5.tar.gz +cluster-3.0.0.alpha6.tar.gz Index: cluster.spec =================================================================== RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- cluster.spec 24 Feb 2009 13:38:36 -0000 1.43 +++ cluster.spec 3 Mar 2009 07:37:01 -0000 1.44 @@ -14,17 +14,17 @@ # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html # keep around ready for later user -%define alphatag alpha5 +%define alphatag alpha6 Name: cluster Summary: Red Hat Cluster Version: 3.0.0 -Release: 11%{?alphatag:.%{alphatag}}%{?dist} +Release: 12%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sources.redhat.com/cluster/wiki/ Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}%{?alphatag:.%{alphatag}}.tar.gz -Patch0: fence-man-pages.diff +Patch0: fix-typo.diff ## Setup/build bits @@ -34,8 +34,8 @@ BuildRequires: perl python BuildRequires: glibc-kernheaders glibc-devel BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel -BuildRequires: corosynclib-devel >= 0.93-1 -BuildRequires: openaislib-devel >= 0.92-1 +BuildRequires: corosynclib-devel >= 0.94-1 +BuildRequires: openaislib-devel >= 0.93-1 BuildRequires: openldap-devel perl(ExtUtils::MakeMaker) %prep @@ -102,8 +102,8 @@ Requires(post): chkconfig Requires(preun): initscripts Requires(preun): chkconfig -Requires: corosync >= 0.93-1 -Requires: openais >= 0.92-1 +Requires: corosync >= 0.94-1 +Requires: openais >= 0.93-1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: ricci >= 0.15.0-4 modcluster >= 0.15.0-3 Requires: fence-agents @@ -197,6 +197,7 @@ %files -n clusterlib-devel %defattr(-,root,root,-) +%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence %{_libdir}/libcman.so %{_libdir}/libccs*.so %{_libdir}/libdlm*.so @@ -311,6 +312,11 @@ %{_mandir}/man8/*.gfs.* %changelog +* Tue Mar 3 2009 Fabio M. Di Nitto - 3.0.0-12.alpha6 +- New upstream release. +- Add missing LICENCE and COPYRIGHT files from clusterlib-devel. +- Add patch to fix build failure (already upstream). + * Tue Feb 24 2009 Fabio M. Di Nitto - 3.0.0-11.alpha5 - Stop building fence and resource agents. - cman now Requires: fence-agents. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 23 Feb 2009 11:38:03 -0000 1.19 +++ sources 3 Mar 2009 07:37:01 -0000 1.20 @@ -1 +1 @@ -d8d0a2ef723b9d5d47004b2aa3decd0d cluster-3.0.0.alpha5.tar.gz +6bedf9e9598ea501db994294c45af522 cluster-3.0.0.alpha6.tar.gz --- fence-man-pages.diff DELETED --- From jnovy at fedoraproject.org Tue Mar 3 07:43:53 2009 From: jnovy at fedoraproject.org (Jindrich Novy) Date: Tue, 3 Mar 2009 07:43:53 +0000 (UTC) Subject: rpms/curl/F-9 curl-7.19.4-easy-leak.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 curl-7.17.1-badsocket.patch, 1.1, 1.2 curl.spec, 1.81, 1.82 sources, 1.31, 1.32 curl-7.17.1-sslgen.patch, 1.1, NONE curl-7.18.2-nss-init.patch, 1.1, NONE curl-7.18.2-nssproxy.patch, 1.1, NONE Message-ID: <20090303074353.4469870116@cvs1.fedora.phx.redhat.com> Author: jnovy Update of /cvs/pkgs/rpms/curl/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3198 Modified Files: .cvsignore curl-7.17.1-badsocket.patch curl.spec sources Added Files: curl-7.19.4-easy-leak.patch Removed Files: curl-7.17.1-sslgen.patch curl-7.18.2-nss-init.patch curl-7.18.2-nssproxy.patch Log Message: * Tue Mar 03 2009 Jindrich Novy 7.19.4-1 - update to 7.19.4 (fixes CVE-2009-0037) - fix leak in curl_easy* functions, thanks to Kamil Dudka - drop nss-proxy, sslgen, nss-init patches - update badsocket patch curl-7.19.4-easy-leak.patch: --- NEW FILE curl-7.19.4-easy-leak.patch --- diff -up curl-7.19.4/lib/easy.c.easy-leak curl-7.19.4/lib/easy.c --- curl-7.19.4/lib/easy.c.easy-leak 2009-01-29 21:41:51.000000000 +0100 +++ curl-7.19.4/lib/easy.c 2009-03-03 07:54:58.000000000 +0100 @@ -352,13 +352,11 @@ CURL *curl_easy_init(void) struct SessionHandle *data; /* Make sure we inited the global SSL stuff */ - if(!initialized) { - res = curl_global_init(CURL_GLOBAL_DEFAULT); - if(res) { - /* something in the global init failed, return nothing */ - DEBUGF(fprintf(stderr, "Error: curl_global_init failed\n")); - return NULL; - } + res = curl_global_init(CURL_GLOBAL_DEFAULT); + if(res) { + /* something in the global init failed, return nothing */ + DEBUGF(fprintf(stderr, "Error: curl_global_init failed\n")); + return NULL; } /* We use curl_open() with undefined URL so far */ @@ -549,10 +547,10 @@ void curl_easy_cleanup(CURL *curl) { struct SessionHandle *data = (struct SessionHandle *)curl; - if(!data) - return; + if(data) + Curl_close(data); - Curl_close(data); + curl_global_cleanup(); } /* Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/curl/F-9/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 18 Jun 2008 06:16:34 -0000 1.31 +++ .cvsignore 3 Mar 2009 07:43:22 -0000 1.32 @@ -1 +1 @@ -curl-7.18.2.tar.bz2 +curl-7.19.4.tar.bz2 curl-7.17.1-badsocket.patch: Index: curl-7.17.1-badsocket.patch =================================================================== RCS file: /cvs/pkgs/rpms/curl/F-9/curl-7.17.1-badsocket.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- curl-7.17.1-badsocket.patch 8 Jan 2008 14:18:28 -0000 1.1 +++ curl-7.17.1-badsocket.patch 3 Mar 2009 07:43:22 -0000 1.2 @@ -1,13 +1,13 @@ -diff -up curl-7.17.1/lib/ftp.c.badsocket curl-7.17.1/lib/ftp.c ---- curl-7.17.1/lib/ftp.c.badsocket 2007-10-27 00:25:19.000000000 +0200 -+++ curl-7.17.1/lib/ftp.c 2008-01-08 15:09:03.000000000 +0100 -@@ -3228,7 +3228,8 @@ static CURLcode Curl_ftp_done(struct con - /* Note that we keep "use" set to TRUE since that (next) connection is - still requested to use SSL */ - } -- sclose(conn->sock[SECONDARYSOCKET]); -+ if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET]) -+ sclose(conn->sock[SECONDARYSOCKET]); - - conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD; +diff -ruNp curl-7.19.3.orig/lib/ftp.c curl-7.19.3/lib/ftp.c +--- curl-7.19.3.orig/lib/ftp.c 2009-02-11 10:57:33.334280000 +0100 ++++ curl-7.19.3/lib/ftp.c 2009-02-11 10:59:43.957585266 +0100 +@@ -3222,7 +3222,8 @@ static CURLcode ftp_done(struct connectd + /* Note that we keep "use" set to TRUE since that (next) connection is + still requested to use SSL */ + } +- sclose(conn->sock[SECONDARYSOCKET]); ++ if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET]) ++ sclose(conn->sock[SECONDARYSOCKET]); + conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD; + } Index: curl.spec =================================================================== RCS file: /cvs/pkgs/rpms/curl/F-9/curl.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- curl.spec 14 Dec 2008 19:54:06 -0000 1.81 +++ curl.spec 3 Mar 2009 07:43:22 -0000 1.82 @@ -1,15 +1,14 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl -Version: 7.18.2 -Release: 7%{?dist} +Version: 7.19.4 +Release: 1%{?dist} License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 Patch1: curl-7.15.3-multilib.patch Patch2: curl-7.16.0-privlibs.patch Patch3: curl-7.17.1-badsocket.patch -Patch4: curl-7.18.2-nssproxy.patch -Patch5: curl-7.18.2-nss-init.patch +Patch4: curl-7.19.4-easy-leak.patch Provides: webclient URL: http://curl.haxx.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -50,8 +49,7 @@ %patch1 -p1 -b .multilib %patch2 -p1 -b .privlibs %patch3 -p1 -b .badsocket -%patch4 -p1 -b .nssproxy -%patch5 -p1 -b .nssinit +%patch4 -p1 -b .easy-leak # Convert docs to UTF-8 for f in CHANGES README; do @@ -120,6 +118,12 @@ %{_datadir}/aclocal/libcurl.m4 %changelog +* Tue Mar 03 2009 Jindrich Novy 7.19.4-1 +- update to 7.19.4 (fixes CVE-2009-0037) +- fix leak in curl_easy* functions, thanks to Kamil Dudka +- drop nss-proxy, sslgen, nss-init patches +- update badsocket patch + * Sun Dec 14 2008 Jindrich Novy 7.18.2-7 - use improved NSS patch, thanks to Rob Crittenden (#472489) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/curl/F-9/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 18 Jun 2008 06:16:34 -0000 1.31 +++ sources 3 Mar 2009 07:43:22 -0000 1.32 @@ -1 +1 @@ -c389be5b0525276e58865956b7465562 curl-7.18.2.tar.bz2 +2734167c1e5f7ce6be99b75d2d371d85 curl-7.19.4.tar.bz2 --- curl-7.17.1-sslgen.patch DELETED --- --- curl-7.18.2-nss-init.patch DELETED --- --- curl-7.18.2-nssproxy.patch DELETED --- From mmaslano at fedoraproject.org Tue Mar 3 07:44:16 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Tue, 3 Mar 2009 07:44:16 +0000 (UTC) Subject: rpms/tcl-html/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tcl-html.spec, 1.6, 1.7 Message-ID: <20090303074416.7A99A70116@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/tcl-html/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3292 Modified Files: .cvsignore sources tcl-html.spec Log Message: * Tue Mar 3 2009 Marcela Ma??l????ov?? - 8.5.6-1 - update to 8.5.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tcl-html/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Nov 2008 15:20:40 -0000 1.6 +++ .cvsignore 3 Mar 2009 07:43:46 -0000 1.7 @@ -1 +1 @@ -tcl8.5.5-html.tar.gz +tcl8.5.6-html.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tcl-html/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Nov 2008 15:20:41 -0000 1.6 +++ sources 3 Mar 2009 07:43:46 -0000 1.7 @@ -1 +1 @@ -c733ccd6f2bd6bfde899b23080bcbcc7 tcl8.5.5-html.tar.gz +e287dcb71b7e6ba9c7b1606a2020e61c tcl8.5.6-html.tar.gz Index: tcl-html.spec =================================================================== RCS file: /cvs/pkgs/rpms/tcl-html/devel/tcl-html.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tcl-html.spec 25 Feb 2009 18:38:32 -0000 1.6 +++ tcl-html.spec 3 Mar 2009 07:43:46 -0000 1.7 @@ -1,9 +1,9 @@ %define majorver 8.5 -%define vers %{majorver}.5 +%define vers %{majorver}.6 Summary: Tcl/Tk manual in html format Name: tcl-html Version: %{vers} -Release: 2%{?dist} +Release: 1%{?dist} License: TCL Group: Documentation URL: http://tcl.sourceforge.net/ @@ -35,6 +35,9 @@ %doc html/* %changelog +* Tue Mar 3 2009 Marcela Ma??l????ov?? - 8.5.6-1 +- update to 8.5.6 + * Wed Feb 25 2009 Fedora Release Engineering - 8.5.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mmaslano at fedoraproject.org Tue Mar 3 07:46:01 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Tue, 3 Mar 2009 07:46:01 +0000 (UTC) Subject: rpms/perl-XML-LibXML/F-10 .cvsignore, 1.7, 1.8 perl-XML-LibXML.spec, 1.29, 1.30 sources, 1.7, 1.8 Message-ID: <20090303074601.D05F670116@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-XML-LibXML/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3774 Modified Files: .cvsignore perl-XML-LibXML.spec sources Log Message: * Tue Mar 3 2009 Marcela Ma??l????ov?? - 1:1.69-1 - update to 1.69 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-LibXML/F-10/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 23 Jun 2008 10:07:16 -0000 1.7 +++ .cvsignore 3 Mar 2009 07:45:31 -0000 1.8 @@ -1 +1 @@ -XML-LibXML-1.66.tar.gz +XML-LibXML-1.69.tar.gz Index: perl-XML-LibXML.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-LibXML/F-10/perl-XML-LibXML.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- perl-XML-LibXML.spec 3 Nov 2008 14:26:02 -0000 1.29 +++ perl-XML-LibXML.spec 3 Mar 2009 07:45:31 -0000 1.30 @@ -1,8 +1,8 @@ Name: perl-XML-LibXML # NOTE: also update perl-XML-LibXSLT to the same version, see # https://bugzilla.redhat.com/show_bug.cgi?id=469480 -Version: 1.66 -Release: 2%{?dist} +Version: 1.69 +Release: 1%{?dist} # Epoch set when version went from 1.62001 to 1.65 Epoch: 1 Summary: Perl interface to the libxml2 library @@ -77,6 +77,9 @@ %{_mandir}/man3/*.3* %changelog +* Tue Mar 3 2009 Marcela Ma??l????ov?? - 1:1.69-1 +- update to 1.69 + * Fri Aug 01 2008 Lubomir Rintel - 1:1.66-2 - Supress warning about nonexistent file in perl-XML-SAX install trigger Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-LibXML/F-10/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 23 Jun 2008 10:07:16 -0000 1.7 +++ sources 3 Mar 2009 07:45:31 -0000 1.8 @@ -1 +1 @@ -18e765429a4b22c8fb68b5273ead1e3c XML-LibXML-1.66.tar.gz +8295f4ae7b09729985dd1133e3ad0d0a XML-LibXML-1.69.tar.gz From mmaslano at fedoraproject.org Tue Mar 3 08:01:46 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Tue, 3 Mar 2009 08:01:46 +0000 (UTC) Subject: rpms/perl-XML-LibXSLT/F-10 .cvsignore, 1.6, 1.7 perl-XML-LibXSLT.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <20090303080146.4E46670116@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-XML-LibXSLT/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6534 Modified Files: .cvsignore perl-XML-LibXSLT.spec sources Log Message: * Tue Mar 3 2009 Marcela Ma??l????ov?? - 1.68-1 - update to the latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-LibXSLT/F-10/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Aug 2008 03:00:21 -0000 1.6 +++ .cvsignore 3 Mar 2009 08:01:15 -0000 1.7 @@ -1 +1 @@ -XML-LibXSLT-1.66.tar.gz +XML-LibXSLT-1.68.tar.gz Index: perl-XML-LibXSLT.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-LibXSLT/F-10/perl-XML-LibXSLT.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-XML-LibXSLT.spec 3 Nov 2008 14:52:43 -0000 1.16 +++ perl-XML-LibXSLT.spec 3 Mar 2009 08:01:15 -0000 1.17 @@ -2,25 +2,25 @@ Name: perl-XML-LibXSLT -# NOTE: also update perl-XML-LibXML to the matching version. See below why. -Version: 1.66 -Release: 2%{?dist} +# NOTE: also update perl-XML-LibXML to a compatible version. See below why. +Version: 1.68 +Release: 1%{?dist} Summary: Perl module for interfacing to GNOME's libxslt Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/XML-LibXSLT/ -Source0: http://search.cpan.org/CPAN/authors/id/P/PA/PAJAS/XML-LibXSLT-1.66.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/P/PA/PAJAS/XML-LibXSLT-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl >= 1:5.6.1, perl-devel +BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: libxslt-devel >= 1.1.18, gdbm-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -# the package shares code with perl-XML-LibXML, we have to require the same version +# the package shares code with perl-XML-LibXML, we have to require a compatible version # see https://bugzilla.redhat.com/show_bug.cgi?id=469480 -BuildRequires: perl(XML::LibXML) = %{version} -Requires: perl(XML::LibXML) = %{version} +BuildRequires: perl(XML::LibXML) >= 1.67 +Requires: perl(XML::LibXML) >= 1.67 %description This module is a fast XSLT library, based on the Gnome libxslt engine @@ -30,8 +30,8 @@ %setup -q -n XML-LibXSLT-%{version} %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -56,6 +56,9 @@ %{_mandir}/man3/*.3* %changelog +* Tue Mar 3 2009 Marcela Ma??l????ov?? - 1.68-1 +- update to the latest version + * Mon Nov 3 2008 Stepan Kasal - 1.66-2 - require XML::LibXML of the same version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-LibXSLT/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Aug 2008 03:00:21 -0000 1.6 +++ sources 3 Mar 2009 08:01:15 -0000 1.7 @@ -1 +1 @@ -cfabf853c7139fb21948a31bc77e6ac7 XML-LibXSLT-1.66.tar.gz +23265ad14469b3eede5833f205198a6f XML-LibXSLT-1.68.tar.gz From drago01 at fedoraproject.org Tue Mar 3 08:02:18 2009 From: drago01 at fedoraproject.org (Adel Gadllah) Date: Tue, 3 Mar 2009 08:02:18 +0000 (UTC) Subject: rpms/fedora-setup-keyboard/devel fedora-setup-keyboard.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303080218.1AB4870116@cvs1.fedora.phx.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/fedora-setup-keyboard/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6736/devel Modified Files: .cvsignore sources Added Files: fedora-setup-keyboard.spec import.log Log Message: Initial Commit --- NEW FILE fedora-setup-keyboard.spec --- Name: fedora-setup-keyboard Version: 0.3 Release: 2%{?dist} Summary: Hal keyboard layout callout Group: Applications/System License: MIT URL: http://git.fedorahosted.org/git/fedora-setup-keyboard.git/ Source0: https://fedorahosted.org/releases/f/e/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: hal-devel BuildRequires: glib2-devel BuildRequires: rhpl Requires: hal %description %{name} gets invoked by hal to apply the keyboard layout defined in /etc/sysconfig/keyboard. %prep %setup -q %build make CFLAGS="%{optflags}" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/%{name} %{_datadir}/hal/fdi/policy/10osvendor/10-x11-keymap.fdi %doc COPYING %changelog * Mon Mar 02 2009 Adel Gadllah 0.3-2 - Fix license tag * Wed Feb 25 2009 Adel Gadllah 0.3-1 - 0.3 release - Require hal * Sat Feb 21 2009 Adel Gadllah 0.2-1 - Initial package --- NEW FILE import.log --- fedora-setup-keyboard-0_3-2_fc10:HEAD:fedora-setup-keyboard-0.3-2.fc10.src.rpm:1236067348 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:36:41 -0000 1.1 +++ .cvsignore 3 Mar 2009 08:01:47 -0000 1.2 @@ -0,0 +1 @@ +fedora-setup-keyboard-0.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:36:41 -0000 1.1 +++ sources 3 Mar 2009 08:01:47 -0000 1.2 @@ -0,0 +1 @@ +6bcb3d6a9f31eddd69aac5df3b50dd98 fedora-setup-keyboard-0.3.tar.bz2 From remi at fedoraproject.org Tue Mar 3 08:23:04 2009 From: remi at fedoraproject.org (Remi Collet) Date: Tue, 3 Mar 2009 08:23:04 +0000 (UTC) Subject: rpms/glpi-mass-ocs-import/devel .cvsignore, 1.3, 1.4 glpi-mass-ocs-import.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20090303082304.4395670116@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi-mass-ocs-import/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9568 Modified Files: .cvsignore glpi-mass-ocs-import.spec sources Log Message: update to 1.2.1 (bugfixes) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Jul 2008 08:35:40 -0000 1.3 +++ .cvsignore 3 Mar 2009 08:22:33 -0000 1.4 @@ -1 +1 @@ -glpi-mass_ocs_import-1.2.tar.gz +glpi-mass_ocs_import-1.2.1.tar.gz Index: glpi-mass-ocs-import.spec =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/glpi-mass-ocs-import.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- glpi-mass-ocs-import.spec 24 Feb 2009 22:15:46 -0000 1.3 +++ glpi-mass-ocs-import.spec 3 Mar 2009 08:22:33 -0000 1.4 @@ -2,8 +2,8 @@ %define lockname mass_ocs_import.lock Name: glpi-mass-ocs-import -Version: 1.2 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: GLPI Plugin for OCS Massive import Summary(fr): Extension GLPI d'import en masse OCS @@ -18,9 +18,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.71 +Requires: glpi >= 0.71.5 Requires: %{_sysconfdir}/cron.d +# This plugin is going to be renamed (for 0.72) +Provides: glpi-massocsimport = %{version}-%{release} + + %description Plugin which allow OCS continuous synchronization and massive importation. @@ -36,7 +40,16 @@ %prep %setup -q -c -cat >README.fedora <$fic + touch -r $fic.ref $fic + rm $fic.ref +done + +cat >README-RPM-POSTINTALL.txt < - 1.2.1-1 +- update to 1.2.1 (bugfixes) +- rename README.fedora to README-RPM-POSTINTALL.txt +- add some docs + * Tue Feb 24 2009 Fedora Release Engineering - 1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Sun Sep 28 2008 Remi Collet - 1.2-1.el4.1 +- Fix MySQL 4.1 compatibility issue + * Sat Jul 12 2008 Remi Collet - 1.2-1 - update to 1.2 for glpi 0.71 Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jul 2008 08:35:40 -0000 1.3 +++ sources 3 Mar 2009 08:22:33 -0000 1.4 @@ -1 +1 @@ -725e8b7c7d230fda2e049e3bef058d5c glpi-mass_ocs_import-1.2.tar.gz +76fdbe8592f6458c9accda669eb2e750 glpi-mass_ocs_import-1.2.1.tar.gz From remi at fedoraproject.org Tue Mar 3 08:24:30 2009 From: remi at fedoraproject.org (Remi Collet) Date: Tue, 3 Mar 2009 08:24:30 +0000 (UTC) Subject: rpms/glpi-mass-ocs-import/devel glpi-mass-ocs-import.spec,1.4,1.5 Message-ID: <20090303082430.44B9570116@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi-mass-ocs-import/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9807 Modified Files: glpi-mass-ocs-import.spec Log Message: update to 1.2.1 (bugfixes) + missing dep Index: glpi-mass-ocs-import.spec =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/glpi-mass-ocs-import.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- glpi-mass-ocs-import.spec 3 Mar 2009 08:22:33 -0000 1.4 +++ glpi-mass-ocs-import.spec 3 Mar 2009 08:24:00 -0000 1.5 @@ -19,6 +19,7 @@ BuildArch: noarch Requires: glpi >= 0.71.5 +Requires: php-cli Requires: %{_sysconfdir}/cron.d # This plugin is going to be renamed (for 0.72) From pkgdb at fedoraproject.org Tue Mar 3 08:27:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 08:27:51 +0000 Subject: [pkgdb] hal had acl change status Message-ID: <20090303082813.5AF5A208485@bastion.fedora.phx.redhat.com> rhughes has set the watchcommits acl on hal (Fedora devel) to Approved for whot To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/hal From pkgdb at fedoraproject.org Tue Mar 3 08:28:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 08:28:22 +0000 Subject: [pkgdb] hal had acl change status Message-ID: <20090303082821.D1BA52084D1@bastion.fedora.phx.redhat.com> rhughes has set the commit acl on hal (Fedora devel) to Approved for whot To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/hal From caolanm at fedoraproject.org Tue Mar 3 08:30:38 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 08:30:38 +0000 (UTC) Subject: rpms/PyXML/devel PyXML-0.8.4-python2.6.patch, 1.1, 1.2 PyXML.spec, 1.35, 1.36 Message-ID: <20090303083038.2B72D70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/PyXML/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11253 Modified Files: PyXML-0.8.4-python2.6.patch PyXML.spec Log Message: Another 'as' hiding in Stylesheet.py -> as_ PyXML-0.8.4-python2.6.patch: Index: PyXML-0.8.4-python2.6.patch =================================================================== RCS file: /cvs/pkgs/rpms/PyXML/devel/PyXML-0.8.4-python2.6.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PyXML-0.8.4-python2.6.patch 24 Dec 2008 06:01:25 -0000 1.1 +++ PyXML-0.8.4-python2.6.patch 3 Mar 2009 08:30:07 -0000 1.2 @@ -26,3 +26,17 @@ def evaluate(self, context): res = [] +diff -ru PyXML-0.8.4.orig/xml/xslt/Stylesheet.py PyXML-0.8.4/xml/xslt/Stylesheet.py +--- PyXML-0.8.4/xml/xslt/Stylesheet.py.patch 2009-03-03 08:20:01.000000000 +0000 ++++ PyXML-0.8.4/xml/xslt/Stylesheet.py 2009-03-03 08:21:18.000000000 +0000 +@@ -373,8 +373,8 @@ + + #Attribute sets + attribute_sets = filter(lambda x: x.nodeType == Node.ELEMENT_NODE and (x.namespaceURI, x.localName) == (XSL_NAMESPACE, 'attribute-set'), self.childNodes) +- for as in attribute_sets: +- as.instantiate(context, processor) ++ for as_ in attribute_sets: ++ as_.instantiate(context, processor) + overridden_params = {} + for k in topLevelParams.keys(): + if type(k) != types.TupleType: Index: PyXML.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyXML/devel/PyXML.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- PyXML.spec 23 Feb 2009 22:39:11 -0000 1.35 +++ PyXML.spec 3 Mar 2009 08:30:07 -0000 1.36 @@ -1,7 +1,7 @@ Summary: XML libraries for python Name: PyXML Version: 0.8.4 -Release: 13 +Release: 14 Source: http://prdownloads.sourceforge.net/pyxml/PyXML-%{version}.tar.gz Patch0: PyXML-0.7.1-intern.patch Patch1: PyXML-0.8.4-cvs20041111-python2.4-backport.patch @@ -62,6 +62,9 @@ %{_libdir}/python?.?/site-packages/_xmlplus %changelog +* Tue Mar 03 2009 Caol??n McNamara - 0.8.4-14 +- Another 'as' hiding in Stylesheet.py -> as_ + * Mon Feb 23 2009 Fedora Release Engineering - 0.8.4-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From remi at fedoraproject.org Tue Mar 3 08:33:42 2009 From: remi at fedoraproject.org (Remi Collet) Date: Tue, 3 Mar 2009 08:33:42 +0000 (UTC) Subject: rpms/glpi-mass-ocs-import/F-10 glpi-mass-ocs-import.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090303083342.5128370116@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi-mass-ocs-import/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11781 Modified Files: glpi-mass-ocs-import.spec sources Log Message: update to 1.2.1 (bugfixes) Index: glpi-mass-ocs-import.spec =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-10/glpi-mass-ocs-import.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- glpi-mass-ocs-import.spec 12 Jul 2008 08:35:40 -0000 1.2 +++ glpi-mass-ocs-import.spec 3 Mar 2009 08:33:11 -0000 1.3 @@ -2,7 +2,7 @@ %define lockname mass_ocs_import.lock Name: glpi-mass-ocs-import -Version: 1.2 +Version: 1.2.1 Release: 1%{?dist} Summary: GLPI Plugin for OCS Massive import Summary(fr): Extension GLPI d'import en masse OCS @@ -18,9 +18,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.71 +Requires: glpi >= 0.71.5 +Requires: php-cli Requires: %{_sysconfdir}/cron.d +# This plugin is going to be renamed (for 0.72) +Provides: glpi-massocsimport = %{version}-%{release} + + %description Plugin which allow OCS continuous synchronization and massive importation. @@ -36,7 +41,16 @@ %prep %setup -q -c -cat >README.fedora <$fic + touch -r $fic.ref $fic + rm $fic.ref +done + +cat >README-RPM-POSTINTALL.txt < - 1.2.1-1 +- update to 1.2.1 (bugfixes) +- rename README.fedora to README-RPM-POSTINTALL.txt +- add some docs + +* Tue Feb 24 2009 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Sep 28 2008 Remi Collet - 1.2-1.el4.1 +- Fix MySQL 4.1 compatibility issue + * Sat Jul 12 2008 Remi Collet - 1.2-1 - update to 1.2 for glpi 0.71 Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jul 2008 08:35:40 -0000 1.3 +++ sources 3 Mar 2009 08:33:11 -0000 1.4 @@ -1 +1 @@ -725e8b7c7d230fda2e049e3bef058d5c glpi-mass_ocs_import-1.2.tar.gz +76fdbe8592f6458c9accda669eb2e750 glpi-mass_ocs_import-1.2.1.tar.gz From remi at fedoraproject.org Tue Mar 3 08:40:00 2009 From: remi at fedoraproject.org (Remi Collet) Date: Tue, 3 Mar 2009 08:40:00 +0000 (UTC) Subject: rpms/glpi-mass-ocs-import/F-9 glpi-mass-ocs-import.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090303084000.B765770116@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi-mass-ocs-import/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12552 Modified Files: glpi-mass-ocs-import.spec sources Log Message: update to 1.2.1 (bugfixes) Index: glpi-mass-ocs-import.spec =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-9/glpi-mass-ocs-import.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- glpi-mass-ocs-import.spec 12 Jul 2008 08:42:56 -0000 1.2 +++ glpi-mass-ocs-import.spec 3 Mar 2009 08:39:30 -0000 1.3 @@ -2,7 +2,7 @@ %define lockname mass_ocs_import.lock Name: glpi-mass-ocs-import -Version: 1.2 +Version: 1.2.1 Release: 1%{?dist} Summary: GLPI Plugin for OCS Massive import Summary(fr): Extension GLPI d'import en masse OCS @@ -18,9 +18,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.71 +Requires: glpi >= 0.71.5 +Requires: php-cli Requires: %{_sysconfdir}/cron.d +# This plugin is going to be renamed (for 0.72) +Provides: glpi-massocsimport = %{version}-%{release} + + %description Plugin which allow OCS continuous synchronization and massive importation. @@ -36,7 +41,16 @@ %prep %setup -q -c -cat >README.fedora <$fic + touch -r $fic.ref $fic + rm $fic.ref +done + +cat >README-RPM-POSTINTALL.txt < - 1.2.1-1 +- update to 1.2.1 (bugfixes) +- rename README.fedora to README-RPM-POSTINTALL.txt +- add some docs + +* Tue Feb 24 2009 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Sep 28 2008 Remi Collet - 1.2-1.el4.1 +- Fix MySQL 4.1 compatibility issue + * Sat Jul 12 2008 Remi Collet - 1.2-1 - update to 1.2 for glpi 0.71 Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jul 2008 08:42:56 -0000 1.3 +++ sources 3 Mar 2009 08:39:30 -0000 1.4 @@ -1 +1 @@ -725e8b7c7d230fda2e049e3bef058d5c glpi-mass_ocs_import-1.2.tar.gz +76fdbe8592f6458c9accda669eb2e750 glpi-mass_ocs_import-1.2.1.tar.gz From remi at fedoraproject.org Tue Mar 3 08:46:35 2009 From: remi at fedoraproject.org (Remi Collet) Date: Tue, 3 Mar 2009 08:46:35 +0000 (UTC) Subject: rpms/glpi-mass-ocs-import/EL-5 glpi-mass-ocs-import.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090303084635.285E770116@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi-mass-ocs-import/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13446 Modified Files: glpi-mass-ocs-import.spec sources Log Message: update to 1.2.1 (bugfixes) Index: glpi-mass-ocs-import.spec =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-5/glpi-mass-ocs-import.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- glpi-mass-ocs-import.spec 15 Sep 2008 18:21:38 -0000 1.2 +++ glpi-mass-ocs-import.spec 3 Mar 2009 08:46:04 -0000 1.3 @@ -2,7 +2,7 @@ %define lockname mass_ocs_import.lock Name: glpi-mass-ocs-import -Version: 1.2 +Version: 1.2.1 Release: 1%{?dist} Summary: GLPI Plugin for OCS Massive import Summary(fr): Extension GLPI d'import en masse OCS @@ -18,9 +18,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.71 +Requires: glpi >= 0.71.5 +Requires: php-cli Requires: %{_sysconfdir}/cron.d +# This plugin is going to be renamed (for 0.72) +Provides: glpi-massocsimport = %{version}-%{release} + + %description Plugin which allow OCS continuous synchronization and massive importation. @@ -36,7 +41,16 @@ %prep %setup -q -c -cat >README.fedora <$fic + touch -r $fic.ref $fic + rm $fic.ref +done + +cat >README-RPM-POSTINTALL.txt < - 1.2.1-1 +- update to 1.2.1 (bugfixes) +- rename README.fedora to README-RPM-POSTINTALL.txt +- add some docs + +* Tue Feb 24 2009 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Sep 28 2008 Remi Collet - 1.2-1.el4.1 +- Fix MySQL 4.1 compatibility issue + * Sat Jul 12 2008 Remi Collet - 1.2-1 - update to 1.2 for glpi 0.71 Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Sep 2008 18:21:38 -0000 1.3 +++ sources 3 Mar 2009 08:46:04 -0000 1.4 @@ -1 +1 @@ -725e8b7c7d230fda2e049e3bef058d5c glpi-mass_ocs_import-1.2.tar.gz +76fdbe8592f6458c9accda669eb2e750 glpi-mass_ocs_import-1.2.1.tar.gz From remi at fedoraproject.org Tue Mar 3 08:52:40 2009 From: remi at fedoraproject.org (Remi Collet) Date: Tue, 3 Mar 2009 08:52:40 +0000 (UTC) Subject: rpms/glpi-mass-ocs-import/EL-4 glpi-mass-ocs-import.spec, 1.3, 1.4 sources, 1.3, 1.4 glpi-rev7301.patch, 1.1, NONE Message-ID: <20090303085240.0EA7670116@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/glpi-mass-ocs-import/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14254 Modified Files: glpi-mass-ocs-import.spec sources Removed Files: glpi-rev7301.patch Log Message: update to 1.2.1 (bugfixes) Index: glpi-mass-ocs-import.spec =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-4/glpi-mass-ocs-import.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- glpi-mass-ocs-import.spec 28 Sep 2008 17:50:17 -0000 1.3 +++ glpi-mass-ocs-import.spec 3 Mar 2009 08:52:09 -0000 1.4 @@ -2,8 +2,8 @@ %define lockname mass_ocs_import.lock Name: glpi-mass-ocs-import -Version: 1.2 -Release: 1%{?dist}.1 +Version: 1.2.1 +Release: 1%{?dist} Summary: GLPI Plugin for OCS Massive import Summary(fr): Extension GLPI d'import en masse OCS @@ -14,16 +14,22 @@ Source0: http://www.glpi-project.org/IMG/gz/glpi-%{pluginname}-%{version}.tar.gz Source1: %{name}.conf -# MySQL 4.1 bug https://dev.indepnet.net/glpi/ticket/1148 -Patch0: glpi-rev7301.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.71 +Requires: glpi >= 0.71.5 +%if 0%{?rhel} == 4 +Requires: php +%else +Requires: php-cli +%endif Requires: %{_sysconfdir}/cron.d +# This plugin is going to be renamed (for 0.72) +Provides: glpi-massocsimport = %{version}-%{release} + + %description Plugin which allow OCS continuous synchronization and massive importation. @@ -39,11 +45,16 @@ %prep %setup -q -c -cd %{pluginname} -%patch0 -p0 -cd .. +# fix wrong-file-end-of-line-encoding, preserving timestamp +mv %{pluginname}/docs docs +for fic in docs/*; do + mv $fic $fic.ref + sed -e 's/\r//' $fic.ref >$fic + touch -r $fic.ref $fic + rm $fic.ref +done -cat >README.fedora <README-RPM-POSTINTALL.txt < - 1.2.1-1 +- update to 1.2.1 (bugfixes) +- rename README.fedora to README-RPM-POSTINTALL.txt +- add some docs + +* Tue Feb 24 2009 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Sep 28 2008 Remi Collet - 1.2-1.el4.1 - Fix MySQL 4.1 compatibility issue Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Sep 2008 18:40:02 -0000 1.3 +++ sources 3 Mar 2009 08:52:09 -0000 1.4 @@ -1 +1 @@ -725e8b7c7d230fda2e049e3bef058d5c glpi-mass_ocs_import-1.2.tar.gz +76fdbe8592f6458c9accda669eb2e750 glpi-mass_ocs_import-1.2.1.tar.gz --- glpi-rev7301.patch DELETED --- From caolanm at fedoraproject.org Tue Mar 3 08:54:34 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 08:54:34 +0000 (UTC) Subject: rpms/ocaml-omake/devel ocaml-omake-0.9.8.5-free-buffer.patch, 1.1, 1.2 ocaml-omake.spec, 1.5, 1.6 Message-ID: <20090303085434.671C670116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/ocaml-omake/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14671 Modified Files: ocaml-omake-0.9.8.5-free-buffer.patch ocaml-omake.spec Log Message: patch the original file, rather than the build-time created link ocaml-omake-0.9.8.5-free-buffer.patch: Index: ocaml-omake-0.9.8.5-free-buffer.patch =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-omake/devel/ocaml-omake-0.9.8.5-free-buffer.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-omake-0.9.8.5-free-buffer.patch 6 Feb 2009 11:28:45 -0000 1.1 +++ ocaml-omake-0.9.8.5-free-buffer.patch 3 Mar 2009 08:54:33 -0000 1.2 @@ -1,6 +1,6 @@ -diff -ur omake-0.9.8.5.orig/src/clib/lm_printf.c omake-0.9.8.5/src/clib/lm_printf.c ---- omake-0.9.8.5.orig/src/clib/lm_printf.c 2007-07-15 18:55:23.000000000 +0100 -+++ omake-0.9.8.5/src/clib/lm_printf.c 2009-02-06 11:13:42.000000000 +0000 +diff -ur omake-0.9.8.5.orig/src/libmojave-external/cutil/lm_printf.c omake-0.9.8.5/src/libmojave-external/cutil/lm_printf.c +--- omake-0.9.8.5.orig/src/libmojave-external/cutil/lm_printf.c 2007-07-15 18:55:23.000000000 +0100 ++++ omake-0.9.8.5/src/libmojave-external/cutil/lm_printf.c 2009-02-06 11:13:42.000000000 +0000 @@ -142,12 +142,12 @@ #endif if(code < 0) { Index: ocaml-omake.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-omake/devel/ocaml-omake.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ocaml-omake.spec 26 Feb 2009 07:21:25 -0000 1.5 +++ ocaml-omake.spec 3 Mar 2009 08:54:33 -0000 1.6 @@ -2,7 +2,7 @@ Name: ocaml-omake Version: 0.9.8.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: OCaml build system with automated dependency analysis Group: Development/Tools @@ -88,6 +88,11 @@ %changelog +* Tue Mar 3 2009 Caol??n McNamara - 0.9.8.5-7 +- patch src/libmojave-external/cutil/lm_printf.c rather than + src/clib/lm_printf.c as the latter is created as a link of the + former during the build + * Wed Feb 25 2009 Fedora Release Engineering - 0.9.8.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Tue Mar 3 08:58:12 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 08:58:12 +0000 (UTC) Subject: rpms/ricci/devel ricci-0.15.0-includes.patch, NONE, 1.1 ricci.spec, 1.14, 1.15 Message-ID: <20090303085812.1FA0E70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/ricci/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15274 Modified Files: ricci.spec Added Files: ricci-0.15.0-includes.patch Log Message: include stdio.h for perror, stdint.h for uint32_t ricci-0.15.0-includes.patch: --- NEW FILE ricci-0.15.0-includes.patch --- diff -ru ricci-0.15.0.orig/common/executils.cpp ricci-0.15.0/common/executils.cpp --- ricci-0.15.0.orig/common/executils.cpp 2009-03-03 08:25:55.000000000 +0000 +++ ricci-0.15.0/common/executils.cpp 2009-03-03 08:26:31.000000000 +0000 @@ -32,6 +32,7 @@ #include #include #include +#include static void read_data(struct pollfd& poll_info, bool& fd_closed, String& data); static void close_fd(int fd); diff -ru ricci-0.15.0.orig/common/Logger.cpp ricci-0.15.0/common/Logger.cpp --- ricci-0.15.0.orig/common/Logger.cpp 2009-03-03 08:25:55.000000000 +0000 +++ ricci-0.15.0/common/Logger.cpp 2009-03-03 08:35:43.000000000 +0000 @@ -24,6 +24,7 @@ #include #include +#include #include #include #include diff -ru ricci-0.15.0.orig/common/Module.cpp ricci-0.15.0/common/Module.cpp --- ricci-0.15.0.orig/common/Module.cpp 2009-03-03 08:25:55.000000000 +0000 +++ ricci-0.15.0/common/Module.cpp 2009-03-03 08:45:13.000000000 +0000 @@ -30,6 +30,7 @@ #include #include #include +#include extern "C" { #include "sys_util.h" diff -ru ricci-0.15.0.orig/common/Random.cpp ricci-0.15.0/common/Random.cpp --- ricci-0.15.0.orig/common/Random.cpp 2009-03-03 08:25:55.000000000 +0000 +++ ricci-0.15.0/common/Random.cpp 2009-03-03 08:40:10.000000000 +0000 @@ -26,6 +26,7 @@ #include #include +#include #include #include "String.h" diff -ru ricci-0.15.0.orig/include/Logger.h ricci-0.15.0/include/Logger.h --- ricci-0.15.0.orig/include/Logger.h 2009-03-03 08:25:55.000000000 +0000 +++ ricci-0.15.0/include/Logger.h 2009-03-03 08:31:53.000000000 +0000 @@ -25,6 +25,7 @@ #include "counting_auto_ptr.h" #include "String.h" +#include enum LogLevel { LogNone = 0x00000000, diff -ru ricci-0.15.0.orig/ricci/RicciWorker.cpp ricci-0.15.0/ricci/RicciWorker.cpp --- ricci-0.15.0.orig/ricci/RicciWorker.cpp 2009-03-03 08:25:55.000000000 +0000 +++ ricci-0.15.0/ricci/RicciWorker.cpp 2009-03-03 08:49:58.000000000 +0000 @@ -33,6 +33,7 @@ #include #include #include +#include extern "C" { #include "sys_util.h" Index: ricci.spec =================================================================== RCS file: /cvs/pkgs/rpms/ricci/devel/ricci.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ricci.spec 25 Feb 2009 19:58:01 -0000 1.14 +++ ricci.spec 3 Mar 2009 08:57:41 -0000 1.15 @@ -10,7 +10,7 @@ Name: ricci Version: 0.15.0 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 URL: http://sources.redhat.com/cluster/conga/ Group: System Environment/Base @@ -40,6 +40,8 @@ Requires(preun): chkconfig initscripts Requires(postun): initscripts util-linux +Patch0: ricci-0.15.0-includes.patch + %description Conga is a project developing management system for remote stations. It consists of luci, https frontend, and ricci, secure daemon that dispatches @@ -47,6 +49,7 @@ %prep %setup -q +%patch0 -p1 -b .includes %build %configure --arch=%{_arch} --docdir=%{_docdir} @@ -135,6 +138,9 @@ exit 0 %changelog +* Tue Mar 03 2009 Caol??n McNamara - 0.15.0-11 +- include stdio.h for perror, stdint.h for uint32_t + * Wed Feb 25 2009 Fedora Release Engineering - 0.15.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From airlied at fedoraproject.org Tue Mar 3 09:09:16 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 3 Mar 2009 09:09:16 +0000 (UTC) Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.59, 1.60 kernel.spec, 1.1363, 1.1364 Message-ID: <20090303090916.F366670116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17924 Modified Files: drm-modesetting-radeon.patch kernel.spec Log Message: * Tue Mar 03 2009 Dave Airlie 2.6.29-0.184.rc6.git6 - drm-modesetting-radeon.patch: fix suspend/resume, proc->debugfs drm-modesetting-radeon.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.59 -r 1.60 drm-modesetting-radeon.patch Index: drm-modesetting-radeon.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- drm-modesetting-radeon.patch 28 Feb 2009 15:35:25 -0000 1.59 +++ drm-modesetting-radeon.patch 3 Mar 2009 09:09:15 -0000 1.60 @@ -1,3 +1,59 @@ +commit 524351732a7a48d274f5a4e48e004284ba673ebf +Author: Dave Airlie +Date: Tue Mar 3 18:23:22 2009 +1000 + + radeon: port proc debug files to new debugfs interface + +commit 8030b34a3383a6b490c128b7cbafb4e1a201f5d4 +Author: Dave Airlie +Date: Tue Mar 3 15:33:52 2009 +1000 + + radeon: pin framebuffer and cursors dynamically + +commit a00b8f579d6fafc16149902445697255062b45b1 +Author: Alex Deucher +Date: Fri Feb 27 20:25:36 2009 -0500 + + radeon: fix MC setup on systems with more than 512 MB of VRAM + + Signed-off-by: Alex Deucher + +commit 5ad681c0f59c99dee86781a049fc41c66ff7d3b8 +Author: Alex Deucher +Date: Fri Feb 27 20:18:20 2009 -0500 + + radeon: leave the MC_FB_LOCATION alone on RS780 + + Signed-off-by: Alex Deucher + +commit 7400fdab0318a2b04d06b2cb6466e9c585d23115 +Author: Alex Deucher +Date: Fri Feb 27 20:15:04 2009 -0500 + + radeon: wait for MC idle on r6xx/r7xx chips + + Signed-off-by: Alex Deucher + +commit b95e633f684312ccc260112ee6a58875f2d1e143 +Author: Alex Deucher +Date: Fri Feb 27 20:07:13 2009 -0500 + + radeon: fix up RS600 mc setup and unify mc reg access + + Signed-off-by: Alex Deucher + +commit 0b64b9965802b5455e9ea6a69eca2f6171235559 +Author: Dave Airlie +Date: Mon Mar 2 23:51:30 2009 +1100 + + radeon: fixup suspend/resume hooks + +commit af74fbead4da9cfd979e4092c7e1ffe912c978c7 +Author: Dave Airlie +Date: Sun Mar 1 18:25:07 2009 +1100 + + radeon: fix rs480 gart size + commit 1f756299d935d5a0a4beb82ddeaf0e4b2935861a Author: Dave Airlie Date: Fri Feb 27 15:37:14 2009 +1000 @@ -6764,7 +6820,7 @@ default: DRM_ERROR("Can't update pipe %d in SAREA\n", pipe); diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile -index 52ce439..3abfd0d 100644 +index 52ce439..0eea827 100644 --- a/drivers/gpu/drm/radeon/Makefile +++ b/drivers/gpu/drm/radeon/Makefile @@ -3,7 +3,11 @@ @@ -6776,7 +6832,7 @@ + radeon_gem.o radeon_buffer.o radeon_fence.o radeon_cs.o \ + radeon_i2c.o radeon_fb.o radeon_encoders.o radeon_connectors.o radeon_display.o \ + atombios_crtc.o atom.o radeon_atombios.o radeon_combios.o radeon_legacy_crtc.o \ -+ radeon_legacy_encoders.o radeon_cursor.o radeon_pm.o radeon_gem_proc.o ++ radeon_legacy_encoders.o radeon_cursor.o radeon_pm.o radeon_gem_debugfs.o radeon-$(CONFIG_COMPAT) += radeon_ioc32.o @@ -13848,10 +13904,10 @@ +#endif /* _ATOMBIOS_H */ diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c new file mode 100644 -index 0000000..b9f3257 +index 0000000..64d2e09 --- /dev/null +++ b/drivers/gpu/drm/radeon/atombios_crtc.c -@@ -0,0 +1,463 @@ +@@ -0,0 +1,469 @@ +/* + * Copyright 2007-8 Advanced Micro Devices, Inc. + * Copyright 2008 Red Hat Inc. @@ -13951,7 +14007,6 @@ + +void atombios_crtc_dpms(struct drm_crtc *crtc, int mode) +{ -+ struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); + struct drm_device *dev = crtc->dev; + struct drm_radeon_private *dev_priv = dev->dev_private; + @@ -13978,7 +14033,6 @@ +static void +atombios_set_crtc_dtd_timing(struct drm_crtc *crtc, SET_CRTC_USING_DTD_TIMING_PARAMETERS *crtc_param) +{ -+ struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); + struct drm_device *dev = crtc->dev; + struct drm_radeon_private *dev_priv = dev->dev_private; + SET_CRTC_USING_DTD_TIMING_PARAMETERS conv_param; @@ -14001,7 +14055,6 @@ + +void atombios_crtc_set_timing(struct drm_crtc *crtc, SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION *crtc_param) +{ -+ struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); + struct drm_device *dev = crtc->dev; + struct drm_radeon_private *dev_priv = dev->dev_private; + SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION conv_param; @@ -14133,6 +14186,9 @@ + obj = radeon_fb->obj; + obj_priv = obj->driver_private; + ++ if (radeon_gem_object_pin(obj, 0, RADEON_GEM_DOMAIN_VRAM)) ++ return -EINVAL; ++ + fb_location = obj_priv->bo->offset + dev_priv->fb_location; + + switch(crtc->fb->bits_per_pixel) { @@ -14148,7 +14204,7 @@ + break; + default: + DRM_ERROR("Unsupported screen depth %d\n", crtc->fb->bits_per_pixel); -+ return; ++ return -EINVAL; + } + + /* TODO tiling */ @@ -14184,6 +14240,12 @@ + else + RADEON_WRITE(AVIVO_D1MODE_DATA_FORMAT + radeon_crtc->crtc_offset, + 0); ++ ++ if (old_fb) { ++ radeon_fb = to_radeon_framebuffer(old_fb); ++ radeon_gem_object_unpin(radeon_fb->obj); ++ } ++ return 0; +} + +int atombios_crtc_mode_set(struct drm_crtc *crtc, @@ -17854,7 +17916,7 @@ + return NULL; +} diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c -index 15cfe56..cead67d 100644 +index 15cfe56..a5b1078 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c @@ -46,8 +46,12 @@ static void radeon_do_cp_start(drm_radeon_private_t * dev_priv); @@ -17918,40 +17980,40 @@ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600) return radeon_read_ring_rptr(dev_priv, R600_SCRATCHOFF(index)); -@@ -159,7 +175,24 @@ static u32 IGP_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) +@@ -151,15 +167,18 @@ static u32 RS600_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) + return ret; + } + +-static u32 IGP_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) ++u32 RADEON_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) + { + if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) || + ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS740)) + return RS690_READ_MCIND(dev_priv, addr); else if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS600) return RS600_READ_MCIND(dev_priv, addr); - else -- return RS480_READ_MCIND(dev_priv, addr); -+ return RS480_READ_MCIND(dev_priv, addr); -+} -+ -+u32 radeon_read_mc_reg(drm_radeon_private_t *dev_priv, int addr) -+{ -+ if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) -+ return IGP_READ_MCIND(dev_priv, addr); -+ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) +- else ++ else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS400) || ++ ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS480)) + return RS480_READ_MCIND(dev_priv, addr); ++ else + return R500_READ_MCIND(dev_priv, addr); -+ return 0; -+} -+ [...1631 lines suppressed...] new file mode 100644 -index 0000000..18e4082 +index 0000000..cfe9682 --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c -@@ -0,0 +1,1078 @@ +@@ -0,0 +1,1097 @@ +/* + * Copyright 2007-8 Advanced Micro Devices, Inc. + * Copyright 2008 Red Hat Inc. @@ -26656,7 +26878,8 @@ + } +} + -+static bool radeon_set_crtc1_base(struct drm_crtc *crtc, int x, int y) ++static bool radeon_set_crtc1_base(struct drm_crtc *crtc, int x, int y, ++ struct drm_framebuffer *old_fb) +{ + struct drm_device *dev = crtc->dev; + struct drm_radeon_private *dev_priv = dev->dev_private; @@ -26675,6 +26898,9 @@ + obj = radeon_fb->obj; + obj_priv = obj->driver_private; + ++ if (radeon_gem_object_pin(obj, 0, RADEON_GEM_DOMAIN_VRAM)) ++ return -EINVAL; ++ + crtc_offset = obj_priv->bo->offset; + + crtc_offset_cntl = 0; @@ -26753,6 +26979,11 @@ + disp_merge_cntl &= ~RADEON_DISP_RGB_OFFSET_EN; + RADEON_WRITE(RADEON_DISP_MERGE_CNTL, disp_merge_cntl); + ++ if (old_fb) { ++ radeon_fb = to_radeon_framebuffer(old_fb); ++ radeon_gem_object_unpin(radeon_fb->obj); ++ } ++ + return true; +} + @@ -27079,7 +27310,8 @@ + +} + -+static bool radeon_set_crtc2_base(struct drm_crtc *crtc, int x, int y) ++static bool radeon_set_crtc2_base(struct drm_crtc *crtc, int x, int y, ++ struct drm_framebuffer *old_fb) +{ + struct drm_device *dev = crtc->dev; + struct drm_radeon_private *dev_priv = dev->dev_private; @@ -27098,6 +27330,9 @@ + obj = radeon_fb->obj; + obj_priv = obj->driver_private; + ++ if (radeon_gem_object_pin(obj, 0, RADEON_GEM_DOMAIN_VRAM)) ++ return -EINVAL; ++ + crtc2_offset = obj_priv->bo->offset; + + crtc2_offset_cntl = 0; @@ -27146,7 +27381,7 @@ + offset *= 4; + break; + default: -+ return false; ++ goto out; + } + base += offset; + } @@ -27174,6 +27409,12 @@ + disp2_merge_cntl &= ~RADEON_DISP2_RGB_OFFSET_EN; + RADEON_WRITE(RADEON_DISP2_MERGE_CNTL, disp2_merge_cntl); + ++ out: ++ if (old_fb) { ++ radeon_fb = to_radeon_framebuffer(old_fb); ++ radeon_gem_object_unpin(radeon_fb->obj); ++ } ++ + return true; +} + @@ -27455,10 +27696,10 @@ + + switch(radeon_crtc->crtc_id) { + case 0: -+ radeon_set_crtc1_base(crtc, x, y); ++ radeon_set_crtc1_base(crtc, x, y, old_fb); + break; + case 1: -+ radeon_set_crtc2_base(crtc, x, y); ++ radeon_set_crtc2_base(crtc, x, y, old_fb); + break; + + } @@ -28909,10 +29150,10 @@ diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h new file mode 100644 -index 0000000..e80903f +index 0000000..43668b7 --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_mode.h -@@ -0,0 +1,354 @@ +@@ -0,0 +1,356 @@ +/* + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and + * VA Linux Systems Inc., Fremont, California. @@ -29108,6 +29349,8 @@ + uint32_t crtc_offset; + struct radeon_framebuffer *fbdev_fb; + struct drm_mode_set mode_set; ++ struct drm_gem_object *cursor_bo; ++ uint64_t cursor_addr; +}; + +#define RADEON_USE_RMX 1 @@ -29269,10 +29512,10 @@ +#endif diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c new file mode 100644 -index 0000000..af348ae +index 0000000..ac7bc0a --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_pm.c -@@ -0,0 +1,248 @@ +@@ -0,0 +1,257 @@ +/* + * Copyright 2007-8 Advanced Micro Devices, Inc. + * Copyright 2008 Red Hat Inc. @@ -29319,8 +29562,13 @@ + if (state.event == PM_EVENT_PRETHAW) + return 0; + -+ if (!drm_core_check_feature(dev, DRIVER_MODESET)) ++ if (!drm_core_check_feature(dev, DRIVER_MODESET)) { ++ /* Disable *all* interrupts */ ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) ++ RADEON_WRITE(R500_DxMODE_INT_MASK, 0); ++ RADEON_WRITE(RADEON_GEN_INT_CNTL, 0); + return 0; ++ } + + /* unpin the front buffers */ + list_for_each_entry(fb, &dev->mode_config.fb_kernel_list, filp_head) { @@ -29369,8 +29617,12 @@ + struct drm_framebuffer *fb; + int i; + -+ if (!drm_core_check_feature(dev, DRIVER_MODESET)) ++ if (!drm_core_check_feature(dev, DRIVER_MODESET)) { ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) ++ RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg); ++ RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg); + return 0; ++ } + + pci_set_power_state(dev->pdev, PCI_D0); + pci_restore_state(dev->pdev); @@ -29523,10 +29775,10 @@ + diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h new file mode 100644 -index 0000000..3341d38 +index 0000000..bb9ad4a --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_reg.h -@@ -0,0 +1,5343 @@ +@@ -0,0 +1,5335 @@ +/* + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and + * VA Linux Systems Inc., Fremont, California. @@ -33016,16 +33268,6 @@ +#define RS690_MC_STATUS 0x90 +#define RS690_MC_STATUS_IDLE (1 << 0) + -+#define RS600_MC_INDEX 0x78 -+# define RS600_MC_INDEX_MASK 0xff -+# define RS600_MC_INDEX_WR_EN (1 << 8) -+# define RS600_MC_INDEX_WR_ACK 0xff -+#define RS600_MC_DATA 0x7c -+ -+#define RS600_MC_FB_LOCATION 0xA -+#define RS600_MC_STATUS 0x0 -+#define RS600_MC_STATUS_IDLE (1 << 0) -+ +#define AVIVO_MC_INDEX 0x0070 +#define R520_MC_STATUS 0x00 +#define R520_MC_STATUS_IDLE (1<<1) @@ -33052,6 +33294,8 @@ +# define R600_CHANSIZE (1 << 7) +# define R600_CHANSIZE_OVERRIDE (1 << 10) + ++#define R600_SRBM_STATUS 0x0e50 ++ +#define AVIVO_HDP_FB_LOCATION 0x134 + +#define AVIVO_VGA_RENDER_CONTROL 0x0300 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1363 retrieving revision 1.1364 diff -u -r1.1363 -r1.1364 --- kernel.spec 3 Mar 2009 02:01:55 -0000 1.1363 +++ kernel.spec 3 Mar 2009 09:09:16 -0000 1.1364 @@ -1785,6 +1785,9 @@ # and build. %changelog +* Tue Mar 03 2009 Dave Airlie 2.6.29-0.184.rc6.git6 +- drm-modesetting-radeon.patch: fix suspend/resume, proc->debugfs + * Mon Mar 02 2009 Dave Jones 2.6.29-0.183.rc6.git6 - 2.6.29-rc6-git6 From pvrabec at fedoraproject.org Tue Mar 3 09:14:31 2009 From: pvrabec at fedoraproject.org (Peter Vrabec) Date: Tue, 3 Mar 2009 09:14:31 +0000 (UTC) Subject: rpms/ntop/devel ntop.spec,1.5,1.6 Message-ID: <20090303091431.1E24B70116@cvs1.fedora.phx.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/ntop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18958 Modified Files: ntop.spec Log Message: do not create new certificate if there is already one installed Index: ntop.spec =================================================================== RCS file: /cvs/extras/rpms/ntop/devel/ntop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ntop.spec 2 Mar 2009 18:09:12 -0000 1.5 +++ ntop.spec 3 Mar 2009 09:14:00 -0000 1.6 @@ -1,6 +1,6 @@ Name: ntop Version: 3.3.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network traffic probe similar to the UNIX top command Group: Applications/Internet License: GPLv2 @@ -147,11 +147,14 @@ # create new self-signed certificate %define sslcert %{_sysconfdir}/ntop/ntop-cert.pem -FQDN=`hostname` -if [ "x${FQDN}" = "x" ]; then - FQDN=localhost.localdomain -fi -cat << EOF | %{_bindir}/openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -keyout %{sslcert} -out %{sslcert} 2>/dev/null +if [ ! -f %{sslcert} ] ; then + #get hosname + FQDN=`hostname` + if [ "x${FQDN}" = "x" ]; then + FQDN=localhost.localdomain + fi + #create key and certificate in one file + cat << EOF | %{_bindir}/openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -keyout %{sslcert} -out %{sslcert} 2>/dev/null -- SomeState SomeCity @@ -160,6 +163,7 @@ ${FQDN} root@${FQDN} EOF +fi %preun if [ $1 = 0 ]; then @@ -207,6 +211,9 @@ %{_localstatedir}/lib/ntop/rrd %changelog +* Tue Mar 03 2009 Peter Vrabec - 3.3.9-2 +- do not create new certificate if there is already one installed + * Fri Feb 27 2009 Peter Vrabec - 3.3.9-1 - upgrade - invalid certificate fix (#486725) From pvrabec at fedoraproject.org Tue Mar 3 09:20:15 2009 From: pvrabec at fedoraproject.org (Peter Vrabec) Date: Tue, 3 Mar 2009 09:20:15 +0000 (UTC) Subject: rpms/ntop/F-10 ntop.spec,1.2,1.3 Message-ID: <20090303092015.2D80B70116@cvs1.fedora.phx.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/ntop/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20102 Modified Files: ntop.spec Log Message: invalid certificate fix (#486725) Index: ntop.spec =================================================================== RCS file: /cvs/extras/rpms/ntop/F-10/ntop.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ntop.spec 22 Oct 2008 13:36:48 -0000 1.2 +++ ntop.spec 3 Mar 2009 09:19:44 -0000 1.3 @@ -1,6 +1,6 @@ Name: ntop Version: 3.3.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network traffic probe similar to the UNIX top command Group: Applications/Internet License: GPLv2 @@ -96,6 +96,8 @@ install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/ntop/rrd install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/ntop/rrd/{flows,graphics,interfaces} touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/ntop/{addressQueue,dnsCache,fingerprint,LsWatch,macPrefix,ntop_pw,prefsCache}.db +#remove expired certificate +rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/ntop/ntop-cert.pem %clean rm -rf $RPM_BUILD_ROOT @@ -113,6 +115,26 @@ /sbin/chkconfig --add %{name} &> /dev/null || : fi +# create new self-signed certificate +%define sslcert %{_sysconfdir}/ntop/ntop-cert.pem +if [ ! -f %{sslcert} ] ; then + #get hosname + FQDN=`hostname` + if [ "x${FQDN}" = "x" ]; then + FQDN=localhost.localdomain + fi + #create key and certificate in one file + cat << EOF | %{_bindir}/openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -keyout %{sslcert} -out %{sslcert} 2>/dev/null +-- +SomeState +SomeCity +SomeOrganization +SomeOrganizationalUnit +${FQDN} +root@${FQDN} +EOF +fi + %preun if [ $1 = 0 ]; then /sbin/service %{name} stop &> /dev/null || : @@ -154,6 +176,9 @@ %{_localstatedir}/lib/ntop/rrd %changelog +* Tue Mar 03 2009 Peter Vrabec - 3.3.8-2 +- invalid certificate fix (#486725) + * Wed Oct 22 2008 Rakesh Pandit - 3.3.8-1 - updated to 3.3.8, removed ntop compile patch From airlied at fedoraproject.org Tue Mar 3 09:20:17 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 3 Mar 2009 09:20:17 +0000 (UTC) Subject: rpms/xorg-x11-drv-ati/devel radeon-modeset.patch, 1.33, 1.34 xorg-x11-drv-ati.spec, 1.151, 1.152 Message-ID: <20090303092017.5713870116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20185 Modified Files: radeon-modeset.patch xorg-x11-drv-ati.spec Log Message: * Tue Mar 03 2009 Dave Airlie 6.11.0-3 - initial support for dynamic fb resize radeon-modeset.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.33 -r 1.34 radeon-modeset.patch Index: radeon-modeset.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- radeon-modeset.patch 2 Mar 2009 23:42:19 -0000 1.33 +++ radeon-modeset.patch 3 Mar 2009 09:20:16 -0000 1.34 @@ -1,3 +1,895 @@ +commit 00c0032dac820986b84effdb37c5cc1884eabcaf +Author: Dave Airlie +Date: Tue Mar 3 15:30:21 2009 +1000 + + radeon: initial framebuffer resize support + + This relies on the kernel pinning everything which the latest + rawhide kernel should do fine + +commit 354303071be3e40e5cffb97e61d1ec6475ea4685 +Author: Dave Airlie +Date: Tue Mar 3 09:20:30 2009 +1000 + + radeon: do get sarea until we know we aren't DRI2 + +commit 908f5308463b69b89d8b7ff34b2f534fddf0fd77 +Author: Dave Airlie +Date: Tue Mar 3 09:12:30 2009 +1000 + + radeon: no need to do any of this for DRI2 + +commit 0b144608c88ce2dfc265873cd55608f5fbd179bd +Author: Dave Airlie +Date: Fri Feb 27 12:00:29 2009 +1000 + + fixup issues post rebase + +commit d6801eeb38720a7aec7c6392136382a006561a15 +Author: Dave Airlie +Date: Thu Feb 26 10:47:42 2009 +1000 + + radeon: don't init 3d engine in Xv path for drm mm + +commit f49b3d2a3b523cfc0ea3ec10ee1bdfdea0da9423 +Author: Dave Airlie +Date: Tue Feb 17 19:14:27 2009 +1000 + + radeon: fix vt switch for legacy paths + +commit cd0fd2b14d6b732e2852bf93cd4bd4cce79936bf +Author: Dave Airlie +Date: Tue Feb 17 19:13:05 2009 +1000 + + radeon: only init gart heap for non-kms + +commit 6d5fc6d6ca642ceda1351b941955614a792fc5ec +Author: Dave Airlie +Date: Sun Jan 11 09:29:44 2009 +1000 + + radeon: drop CS1 + +commit c1a806452b802f5284a113908109cf810d3b33be +Author: Jerome Glisse +Date: Wed Nov 12 14:36:52 2008 +0100 + + radeon: enable dri2 only if memory manager is present + (cherry picked from commit fd4bb9b7b639befd63e7acd37254011b9e46732d) + +commit 48c2d0902416bfed8a5d768ea1e923b5d34c6320 +Author: Jerome Glisse +Date: Mon Nov 10 22:16:57 2008 +0100 + + radeon: flush command stream in block handler and in dri2 copy callback + (cherry picked from commit 13fa5ab73a707af52e71af400ea186073022f8b7) + +commit 2ea27ca1bf6fa9e96703932981e57b11e653d6a3 +Author: Jerome Glisse +Date: Fri Nov 14 12:44:29 2008 +0100 + + radeon: bufmgr exa doesn't exist + (cherry picked from commit 8a00de47a186db1707b82a5977da8cbf2e8e0c80) + +commit 68b3becc0620c4357872ca034fc6ae5b41432591 +Author: Jerome Glisse +Date: Thu Nov 6 00:25:18 2008 +0100 + + radeon: initial dri2 support + +commit 1190226af0c2685557fe90cb0a5fd3446f31c672 +Author: Dave Airlie +Date: Mon Dec 1 19:15:41 2008 +1000 + + radeno: fixup unpinned buffers + (cherry picked from commit d9759ca976cad48e6c8fd3c7d17ce38588522c34) + +commit eb09bc9aaee774acff6d07cae0018d020ad3ec44 +Author: Dave Airlie +Date: Mon Dec 22 16:16:16 2008 +1000 + + radeon: fix for 1.6 server + +commit 068107ac540d8e7bd1781799fb2b3268f3d9fe34 +Author: Dave Airlie +Date: Fri Dec 19 12:37:01 2008 +1100 + + radeon: only do mappings if direct rendering is enabled + +commit fa8b8dc164393bc43c6f6273aeed50924bc1d6c1 +Author: Dave Airlie +Date: Tue Dec 9 13:29:18 2008 +1000 + + radeon: upstream fix for Init3D vs switch to/from 2d/3d + +commit 77034ccc327b54f2f6c643e3baa9f42477fa221c +Author: Dave Airlie +Date: Mon Dec 8 14:19:47 2008 +1000 + + radeon: only update dri buffers if DRI enabled + +commit 400bc21d00dfe433c3341f8c3be87f15c1b52fae +Author: Dave Airlie +Date: Mon Dec 1 15:31:08 2008 +1100 + + radeon: don't have 2D and 3D in one CS buffer + +commit c25a72d143129b4cd4c8a6c16c27d13b9b173e74 +Author: Dave Airlie +Date: Wed Nov 26 16:09:29 2008 +1100 + + radeon: set touched flag on pinned buffers + +commit 1d2a6732029a80e8c47fc1420186941eb8f210dc +Author: Dave Airlie +Date: Wed Nov 26 16:04:35 2008 +1100 + + radeon: fix up some of the touched by gpu handling and force gtt handling + + this fixes DFS on the rs690 + +commit 434c9f580cb7350510997070b191f3202e88d24b +Author: Dave Airlie +Date: Wed Nov 26 12:52:24 2008 +1100 + + radeon: brutal attempt to fix RS4xx and RS6xx by flushing more often + + this might take more CPU but hopefully leads to stabler GPU + +commit e6b95cd6c312e3ea785956f1d26f65724f66af46 +Author: Dave Airlie +Date: Sun Nov 23 17:56:02 2008 +1000 + + radeon: wait for rendering before doing UTS + +commit a80b03a333c17334400abe0ad65c8eacf203e4e7 +Author: Dave Airlie +Date: Sun Nov 23 17:54:27 2008 +1000 + + radeon: stop this_op_read from going negative + +commit d802c2d18b877b4f45057d550bf8e72136ca6143 +Author: Dave Airlie +Date: Sun Nov 23 17:52:42 2008 +1000 + + radeon: return flush for conflicting domains + +commit c96555c16890ccdb148fb3b84c7544786418a599 +Author: Dave Airlie +Date: Sun Nov 23 17:50:47 2008 +1000 + + radeon: only reset state2d before emitting cache flush + +commit 1c00a7c0b71cbf0161c21f3eab01670717b6fd81 +Author: Dave Airlie +Date: Thu Nov 20 16:48:33 2008 +1000 + + flush on UTS if any references + +commit 77cb0c5b5a1c0c4bcffbcfc0a0c55facdc0aa451 +Author: Dave Airlie +Date: Thu Nov 20 16:44:40 2008 +1000 + + radeon: add gart vs vram writes + +commit cdc160b2aa809f7c6cb6dd47083ea4ca0857eeac +Author: Dave Airlie +Date: Thu Nov 20 16:37:07 2008 +1000 + + radeon: improve DFS performance for non-vram objects + +commit 2ff1aa8bdd2f54b46291ce8b3b9683e01f959c7d +Author: Dave Airlie +Date: Wed Nov 19 14:49:44 2008 +1000 + + radeon: scrap state on LeaveVT not EnterVT + +commit a6023c6f60cb49db2479c9bd9ae1b09cfb5edf0d +Author: Dave Airlie +Date: Wed Nov 19 11:08:34 2008 +1000 + + radeon: even more typos + [...1693 lines suppressed...] ++ ++void radeon_set_pixmap_bo(PixmapPtr pPix, struct radeon_memory *mem) ++{ ++ ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum]; ++ RADEONInfoPtr info = RADEONPTR(pScrn); ++ ++#ifdef XF86DRM_MODE ++ struct radeon_exa_pixmap_priv *driver_priv; ++ ++ driver_priv = exaGetPixmapDriverPrivate(pPix); ++ if (driver_priv) { ++ if (driver_priv->bo) ++ dri_bo_unreference(driver_priv->bo); ++ ++ driver_priv->bo = radeon_bo_gem_create_from_name(info->bufmgr, "front", ++ radeon_name_buffer(pScrn, mem)); ++ } ++#endif ++} ++ ++ +static Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix) +{ + struct radeon_exa_pixmap_priv *driver_priv; @@ -5801,7 +6786,7 @@ #define ENTER_DRAW(x) TRACE #define LEAVE_DRAW(x) TRACE -@@ -332,6 +483,7 @@ static void RADEONFinishAccess(PixmapPtr pPix, int index) +@@ -332,6 +521,7 @@ static void RADEONFinishAccess(PixmapPtr pPix, int index) #define BEGIN_ACCEL(n) RADEONWaitForFifo(pScrn, (n)) #define OUT_ACCEL_REG(reg, val) OUTREG(reg, val) #define OUT_ACCEL_REG_F(reg, val) OUTREG(reg, F_TO_DW(val)) @@ -5809,7 +6794,7 @@ #define FINISH_ACCEL() #ifdef RENDER -@@ -345,6 +497,7 @@ static void RADEONFinishAccess(PixmapPtr pPix, int index) +@@ -345,6 +535,7 @@ static void RADEONFinishAccess(PixmapPtr pPix, int index) #undef OUT_ACCEL_REG #undef OUT_ACCEL_REG_F #undef FINISH_ACCEL @@ -5817,7 +6802,7 @@ #ifdef XF86DRI -@@ -355,6 +508,7 @@ static void RADEONFinishAccess(PixmapPtr pPix, int index) +@@ -355,6 +546,7 @@ static void RADEONFinishAccess(PixmapPtr pPix, int index) #define BEGIN_ACCEL(n) BEGIN_RING(2*(n)) #define OUT_ACCEL_REG(reg, val) OUT_RING_REG(reg, val) #define FINISH_ACCEL() ADVANCE_RING() @@ -5825,7 +6810,7 @@ #define OUT_RING_F(x) OUT_RING(F_TO_DW(x)) -@@ -372,6 +526,8 @@ static void RADEONFinishAccess(PixmapPtr pPix, int index) +@@ -372,6 +564,8 @@ static void RADEONFinishAccess(PixmapPtr pPix, int index) #endif /* XF86DRI */ @@ -5834,7 +6819,7 @@ /* * Once screen->off_screen_base is set, this function * allocates the remaining memory appropriately -@@ -393,122 +549,126 @@ Bool RADEONSetupMemEXA (ScreenPtr pScreen) +@@ -393,122 +587,126 @@ Bool RADEONSetupMemEXA (ScreenPtr pScreen) if (info->accel_state->exa == NULL) return FALSE; @@ -6064,7 +7049,7 @@ return TRUE; } -@@ -523,14 +683,23 @@ RADEONTexOffsetStart(PixmapPtr pPix) +@@ -523,14 +721,23 @@ RADEONTexOffsetStart(PixmapPtr pPix) { RINFO_FROM_SCREEN(pPix->drawable.pScreen); unsigned long long offset; @@ -7357,10 +8342,10 @@ diff --git a/src/radeon_memory.c b/src/radeon_memory.c new file mode 100644 -index 0000000..2b6bc4d +index 0000000..568f9ba --- /dev/null +++ b/src/radeon_memory.c -@@ -0,0 +1,423 @@ +@@ -0,0 +1,396 @@ + +#include +#include @@ -7420,7 +8405,6 @@ + if (!info->drm_mm) + return FALSE; + -+ + if (mem->kernel_bo_handle) { + struct drm_radeon_gem_unpin unpin; + @@ -7639,13 +8623,11 @@ + cursor_size = RADEON_ALIGN(cursor_size, pagesize); + for (c = 0; c < xf86_config->num_crtc; c++) { + /* cursor objects */ -+ info->mm.cursor[c] = radeon_allocate_memory(pScrn, RADEON_POOL_VRAM, cursor_size, 0, 1, "Cursor", 1); ++ info->mm.cursor[c] = radeon_allocate_memory(pScrn, RADEON_POOL_VRAM, cursor_size, 0, 1, "Cursor", 0); + if (!info->mm.cursor[c]) { + return FALSE; + } + -+ radeon_bind_memory(pScrn, info->mm.cursor[c]); -+ + if (radeon_map_memory(pScrn, info->mm.cursor[c])) { + ErrorF("Failed to map front buffer memory\n"); + } @@ -7665,13 +8647,12 @@ + /* keep area front front buffer - but don't allocate it yet */ + total_size_bytes += screen_size; + -+ if (info->directRenderingEnabled) { ++ if (info->directRenderingEnabled && !info->dri2.enabled) { + info->dri->backPitch = pScrn->displayWidth; + info->mm.back_buffer = radeon_allocate_memory(pScrn, RADEON_POOL_VRAM, screen_size, 0, 1, "Back Buffer", 0); + if (!info->mm.back_buffer) { + return FALSE; + } -+ // radeon_bind_memory(pScrn, info->mm.back_buffer); + total_size_bytes += screen_size; + + info->dri->depthPitch = RADEON_ALIGN(pScrn->displayWidth, 32); @@ -7683,7 +8664,6 @@ + if (!info->mm.depth_buffer) { + return FALSE; + } -+ // radeon_bind_memory(pScrn, info->mm.depth_buffer); + total_size_bytes += depth_size; + } + } @@ -7715,11 +8695,13 @@ + return FALSE; + } + -+ radeon_bind_memory(pScrn, info->mm.front_buffer); -+ if (radeon_map_memory(pScrn, info->mm.front_buffer)) { ++ /* don't need to bind or map memory */ ++ if (!info->dri2.enabled) { ++ if (radeon_map_memory(pScrn, info->mm.front_buffer)) { + ErrorF("Failed to map front buffer memory\n"); ++ } ++ info->dri->frontPitch = pScrn->displayWidth; + } -+ info->dri->frontPitch = pScrn->displayWidth; + + if (info->directRenderingEnabled && info->dri->textureSize) { + info->mm.texture_buffer = radeon_allocate_memory(pScrn, RADEON_POOL_VRAM, info->dri->textureSize, 0, 1, "Texture Buffer", 1); @@ -7734,8 +8716,10 @@ + } + + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Front buffer size: %dK at 0x%08x\n", info->mm.front_buffer->size/1024, info->mm.front_buffer->offset); -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Back buffer size: %dK at 0x%08x\n", info->mm.back_buffer->size/1024, info->mm.back_buffer->offset); -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Depth buffer size: %dK at 0x%08x\n", info->mm.depth_buffer->size/1024, info->mm.depth_buffer->offset); ++ if (info->directRenderingEnabled && !info->dri2.enabled) { ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Back buffer size: %dK at 0x%08x\n", info->mm.back_buffer->size/1024, info->mm.back_buffer->offset); ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Depth buffer size: %dK at 0x%08x\n", info->mm.depth_buffer->size/1024, info->mm.depth_buffer->offset); ++ } + if (info->mm.texture_buffer) + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Texture size: %dK at 0x%08x\n", info->mm.texture_buffer->size/1024, info->mm.texture_buffer->offset); + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Remaining VRAM size (used for pixmaps): %dK\n", remain_size_bytes/1024); @@ -7747,32 +8731,6 @@ + return TRUE; +} + -+Bool radeon_setup_gart_mem(ScreenPtr pScreen) -+{ -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ RADEONInfoPtr info = RADEONPTR(pScrn); -+ -+#if 0 -+ info->mm.gart_texture_buffer = -+ radeon_allocate_memory(pScrn, RADEON_POOL_GART, -+ info->dri->gartTexMapSize, -+ 0, 1, "GART texture buffers", 1); -+ -+ if (!info->mm.gart_texture_buffer) { -+ return FALSE; -+ } -+ -+ radeon_bind_memory(pScrn, info->mm.gart_texture_buffer); -+#endif -+ return TRUE; -+} -+ -+uint32_t radeon_create_new_fb(ScrnInfoPtr pScrn, int width, int height, int *pitch) -+{ -+ return 0; -+} -+ -+ +dri_bo *radeon_create_rotate_bo(ScrnInfoPtr pScrn, int size) +{ + RADEONInfoPtr info = RADEONPTR(pScrn); Index: xorg-x11-drv-ati.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- xorg-x11-drv-ati.spec 2 Mar 2009 23:42:19 -0000 1.151 +++ xorg-x11-drv-ati.spec 3 Mar 2009 09:20:16 -0000 1.152 @@ -5,7 +5,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.11.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -76,6 +76,9 @@ %{_mandir}/man4/radeon.4* %changelog +* Tue Mar 03 2009 Dave Airlie 6.11.0-3 +- initial support for dynamic fb resize + * Tue Mar 03 2009 Dave Airlie 6.11.0-2 - rebase to latest upstream r600 accel - fixup VT switch on DRI2 From giallu at fedoraproject.org Tue Mar 3 09:03:11 2009 From: giallu at fedoraproject.org (Gianluca Sforna) Date: Tue, 3 Mar 2009 09:03:11 +0000 (UTC) Subject: rpms/alleyoop/devel alleyoop.desktop,1.2,1.3 Message-ID: <20090303090311.BBBC070116@cvs1.fedora.phx.redhat.com> Author: giallu Update of /cvs/extras/rpms/alleyoop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16532 Modified Files: alleyoop.desktop Log Message: Add Debugger category, use same Comment as debian Index: alleyoop.desktop =================================================================== RCS file: /cvs/extras/rpms/alleyoop/devel/alleyoop.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- alleyoop.desktop 22 Aug 2007 07:31:28 -0000 1.2 +++ alleyoop.desktop 3 Mar 2009 09:02:41 -0000 1.3 @@ -2,10 +2,10 @@ Encoding=UTF-8 Name=Alleyoop GenericName=Memory Checker -Comment=Validate the memory usage of any program +Comment=Find memory-management problems in your programs using the valgrind tool Exec=alleyoop Icon=gnome-devel.png StartupNotify=true Terminal=false Type=Application -Categories=Application;GNOME;Development +Categories=Application;GNOME;Development;Debugger; From caolanm at fedoraproject.org Tue Mar 3 09:28:47 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 09:28:47 +0000 (UTC) Subject: rpms/mythes-sk/devel mythes-sk.spec,1.9,1.10 sources,1.7,1.8 Message-ID: <20090303092848.37FF970116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/mythes-sk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21664 Modified Files: mythes-sk.spec sources Log Message: latest version Index: mythes-sk.spec =================================================================== RCS file: /cvs/pkgs/rpms/mythes-sk/devel/mythes-sk.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mythes-sk.spec 26 Feb 2009 04:00:01 -0000 1.9 +++ mythes-sk.spec 3 Mar 2009 09:28:14 -0000 1.10 @@ -1,8 +1,8 @@ Name: mythes-sk Summary: Slovak thesaurus -%define upstreamid 20090202 +%define upstreamid 20090302 Version: 0.%{upstreamid} -Release: 2%{?dist} +Release: 1%{?dist} Source: http://www.sk-spell.sk.cx/thesaurus/download/OOo-Thesaurus2-sk_SK.zip Group: Applications/Text URL: http://www.sk-spell.sk.cx/thesaurus/ @@ -36,6 +36,9 @@ %{_datadir}/mythes/* %changelog +* Tue Mar 03 2009 Caolan McNamara - 0.20090302-1 +- latest version + * Wed Feb 25 2009 Fedora Release Engineering - 0.20090202-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mythes-sk/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Feb 2009 08:51:55 -0000 1.7 +++ sources 3 Mar 2009 09:28:15 -0000 1.8 @@ -1 +1 @@ -e8468e294d3ecc52387eed889a730dfd OOo-Thesaurus2-sk_SK.zip +11442604464856ddd21f5afc9b44f945 OOo-Thesaurus2-sk_SK.zip From caolanm at fedoraproject.org Tue Mar 3 09:32:44 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 09:32:44 +0000 (UTC) Subject: rpms/hunspell-ca/devel .cvsignore, 1.10, 1.11 hunspell-ca.spec, 1.13, 1.14 sources, 1.10, 1.11 Message-ID: <20090303093244.3695570116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-ca/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23116 Modified Files: .cvsignore hunspell-ca.spec sources Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 28 Oct 2008 08:55:25 -0000 1.10 +++ .cvsignore 3 Mar 2009 09:32:13 -0000 1.11 @@ -1 +1 @@ -hunspell-ca-20081027.tar.bz2 +hunspell-ca-20090302.tar.bz2 Index: hunspell-ca.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/hunspell-ca.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- hunspell-ca.spec 25 Feb 2009 04:31:19 -0000 1.13 +++ hunspell-ca.spec 3 Mar 2009 09:32:13 -0000 1.14 @@ -1,8 +1,8 @@ Name: hunspell-ca Summary: Catalan hunspell dictionaries -%define upstreamid 20081027 +%define upstreamid 20090302 Version: 0.%{upstreamid} -Release: 2%{?dist} +Release: 1%{?dist} #svn checkout svn://softcatala.org/corrector/trunk/resultats/hunspell Source: hunspell-ca-%{upstreamid}.tar.bz2 Group: Applications/Text @@ -43,6 +43,9 @@ %{_datadir}/myspell/* %changelog +* Tue Mar 03 2009 Caolan McNamara - 0.20090302-1 +- latest version + * Tue Feb 24 2009 Fedora Release Engineering - 0.20081027-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 28 Oct 2008 08:55:25 -0000 1.10 +++ sources 3 Mar 2009 09:32:13 -0000 1.11 @@ -1 +1 @@ -4fbc44f1bb5225e7e5a357401dd0c1b9 hunspell-ca-20081027.tar.bz2 +f6d7dcaf2157fa3b3fdb141db9941166 hunspell-ca-20090302.tar.bz2 From pkgdb at fedoraproject.org Tue Mar 3 09:34:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 09:34:12 +0000 Subject: [pkgdb] hal had acl change status Message-ID: <20090303093445.BE6E2208485@bastion.fedora.phx.redhat.com> rhughes has set the watchcommits acl on hal (Fedora 10) to Approved for whot To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/hal From thias at fedoraproject.org Tue Mar 3 09:56:17 2009 From: thias at fedoraproject.org (Matthias Saou) Date: Tue, 3 Mar 2009 09:56:17 +0000 (UTC) Subject: rpms/elisa/devel .cvsignore, 1.15, 1.16 elisa.spec, 1.19, 1.20 sources, 1.15, 1.16 Message-ID: <20090303095617.D42BE70116@cvs1.fedora.phx.redhat.com> Author: thias Update of /cvs/extras/rpms/elisa/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26852 Modified Files: .cvsignore elisa.spec sources Log Message: Update to 0.5.30. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/elisa/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 28 Feb 2009 14:44:58 -0000 1.15 +++ .cvsignore 3 Mar 2009 09:55:45 -0000 1.16 @@ -1 +1 @@ -elisa-0.5.29.tar.gz +elisa-0.5.30.tar.gz Index: elisa.spec =================================================================== RCS file: /cvs/extras/rpms/elisa/devel/elisa.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- elisa.spec 28 Feb 2009 14:44:58 -0000 1.19 +++ elisa.spec 3 Mar 2009 09:55:45 -0000 1.20 @@ -2,7 +2,7 @@ Summary: Media Center Name: elisa -Version: 0.5.29 +Version: 0.5.30 Release: 1%{?dist} # The base of Elisa is GPLv3, some plugins are MIT but are in other packages. # See the included COPYING file for the details. @@ -92,6 +92,9 @@ %changelog +* Tue Mar 3 2009 Matthias Saou 0.5.30-1 +- Update to 0.5.30. + * Sat Feb 28 2009 Matthias Saou 0.5.29-1 - Update to 0.5.29. - Include patch to disable automatic updates, which should better conform with Index: sources =================================================================== RCS file: /cvs/extras/rpms/elisa/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 28 Feb 2009 14:44:58 -0000 1.15 +++ sources 3 Mar 2009 09:55:45 -0000 1.16 @@ -1 +1 @@ -8b94031ff4ede2a61f13a33532141807 elisa-0.5.29.tar.gz +e733f377103d2ded6eb4acc16fbf1768 elisa-0.5.30.tar.gz From thias at fedoraproject.org Tue Mar 3 09:56:25 2009 From: thias at fedoraproject.org (Matthias Saou) Date: Tue, 3 Mar 2009 09:56:25 +0000 (UTC) Subject: rpms/elisa-plugins-good/devel .cvsignore, 1.3, 1.4 elisa-plugins-good.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20090303095625.1349770116@cvs1.fedora.phx.redhat.com> Author: thias Update of /cvs/extras/rpms/elisa-plugins-good/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26954 Modified Files: .cvsignore elisa-plugins-good.spec sources Log Message: Update to 0.5.30. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/elisa-plugins-good/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Feb 2009 14:47:20 -0000 1.3 +++ .cvsignore 3 Mar 2009 09:55:54 -0000 1.4 @@ -1 +1 @@ -elisa-plugins-good-0.5.29.tar.gz +elisa-plugins-good-0.5.30.tar.gz Index: elisa-plugins-good.spec =================================================================== RCS file: /cvs/extras/rpms/elisa-plugins-good/devel/elisa-plugins-good.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- elisa-plugins-good.spec 28 Feb 2009 14:47:20 -0000 1.3 +++ elisa-plugins-good.spec 3 Mar 2009 09:55:54 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Good Plugins for the Elisa Media Center Name: elisa-plugins-good -Version: 0.5.29 +Version: 0.5.30 Release: 1%{?dist} License: GPLv3 Group: Applications/Multimedia @@ -58,6 +58,9 @@ %changelog +* Tue Mar 3 2009 Matthias Saou 0.5.30-1 +- Update to 0.5.30. + * Sat Feb 28 2009 Matthias Saou 0.5.29-1 - Update to 0.5.29. Index: sources =================================================================== RCS file: /cvs/extras/rpms/elisa-plugins-good/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Feb 2009 14:47:20 -0000 1.3 +++ sources 3 Mar 2009 09:55:54 -0000 1.4 @@ -1 +1 @@ -fb30afe04996cc814b44680efe03ad95 elisa-plugins-good-0.5.29.tar.gz +104b35232f7f765cacb4c3220dda8944 elisa-plugins-good-0.5.30.tar.gz From pknirsch at fedoraproject.org Tue Mar 3 09:56:47 2009 From: pknirsch at fedoraproject.org (Phil Knirsch) Date: Tue, 3 Mar 2009 09:56:47 +0000 (UTC) Subject: rpms/tuned/devel import.log, NONE, 1.1 tuned.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303095647.61A6270116@cvs1.fedora.phx.redhat.com> Author: pknirsch Update of /cvs/pkgs/rpms/tuned/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27095/devel Modified Files: .cvsignore sources Added Files: import.log tuned.spec Log Message: - Initial CVS import --- NEW FILE import.log --- tuned-0_1_3-1_fc10:HEAD:tuned-0.1.3-1.fc10.src.rpm:1236074130 --- NEW FILE tuned.spec --- Summary: A dynamic adaptive system tuning daemon Name: tuned Version: 0.1.3 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons # The source for this package was pulled from upstream git. Use the # following commands to get the corresponding tarball: # git clone git://fedorapeople.org/~pknirsch/tuned.git/ # cd tuned # git checkout v%{version} # make archive Source: tuned-%{version}.tar.bz2 URL: http://fedorapeople.org/~pknirsch/git/tuned.git/ Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts Requires(postun): initscripts BuildArch: noarch %description The tuned package contains a daemon that tunes system settings dynamically. It does so by monitoring the usage of several system components periodically. Based on that information components will then be put into lower or higher power saving modes to adapt to the current usage. Currently only ethernet network and ATA harddisk devices are implemented. %package utils Summary: Disk and net statistic monitoring systemtap scripts Requires: systemtap kernel-debuginfo Group: Applications/System %description utils The tuned-utils package contains several systemtap scripts to allow detailed manual monitoring of the system. Instead of the typical IO/sec it collects minimal, maximal and average time between operations to be able to identify applications that behave power inefficient (many small operations instead of fewer large ones). %prep %setup -q %build %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} %clean rm -rf %{buildroot} %post /sbin/chkconfig --add tuned %preun if [ $1 = 0 ] ; then /sbin/service tuned stop >/dev/null 2>&1 /sbin/chkconfig --del tuned fi %postun if [ "$1" -ge "1" ] ; then /sbin/service tuned condrestart >/dev/null 2>&1 || : fi %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING INSTALL NEWS README doc/DESIGN.txt doc/TIPS.txt %{_initddir}/tuned %config(noreplace) %{_sysconfdir}/tuned.conf %{_sbindir}/tuned %{_datadir}/tuned %{_mandir}/man5/* %{_mandir}/man8/* %files utils %defattr(-,root,root,-) %doc doc/README.utils %{_sbindir}/netdevstat %{_sbindir}/diskdevstat %changelog * Mon Mar 02 2009 Phil Knirsch - 0.1.3-1 - Fixed placement of doc entry at tuned-utils package * Thu Feb 26 2009 Phil Knirsch - 0.1.2-1 - Added config file option to enable/disable plugins - Switched from ConfigParser to RawConfigParser - Renamed doc/README.txt to doc/DESIGN.txt - Added tuned.conf man page - Updated tuned man page - Updated package descriptions (#487312) - Added documentation for utils scripts (#487312) * Wed Feb 25 2009 Phil Knirsch - 0.1.1-1 - Bump version - Added comment in empty __init__.py files - Fixed BuildRoot tag to use latest recommendation of FPG - Lots of whitespace changes - Some minor README changes - Added a changelog rule in Makefile - Fixed rpmlint error messages - Add init() methods to each plugin - Call plugin init() methods during tuned's init() - Add support for command line parameters o -c conffile|--config==conffile to specify the location of the config file o -d to start tuned as a daemon (instead of as normal app) - Readded the debug output in case tuned isn't started as as daemon - Fixed initialization of max transfer values for net tuning plugin - Added complete cleanup code in case of tuned exiting and/or getting a SIGTERM to restore default values - Made the disk tuning pluging less nosy if started as non-daemon - Fixed missing self. in the tuned.py config handling - Added a manpage - Fixed summary - Added missing GPL notic to tuned.py - Added explanation for Source entry in specfile - Added a distarchive target for the Makefile for proper tagging in git - Added a explanation how to create the tarball via git in the specfile - Fixed the defattr() lines in the specfile to conform FRG * Mon Feb 23 2009 Phil Knirsch - 0.1.0-1 - Initial version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tuned/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:41:30 -0000 1.1 +++ .cvsignore 3 Mar 2009 09:56:17 -0000 1.2 @@ -0,0 +1 @@ +tuned-0.1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tuned/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:41:30 -0000 1.1 +++ sources 3 Mar 2009 09:56:17 -0000 1.2 @@ -0,0 +1 @@ +d0ba7818725f5bef65582645aa429dd3 tuned-0.1.3.tar.bz2 From thias at fedoraproject.org Tue Mar 3 09:58:33 2009 From: thias at fedoraproject.org (Matthias Saou) Date: Tue, 3 Mar 2009 09:58:33 +0000 (UTC) Subject: rpms/elisa-plugins-bad/devel elisa-plugins-bad-0.5.2-install.patch, NONE, 1.1 elisa-plugins-bad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303095833.C6D8E70116@cvs1.fedora.phx.redhat.com> Author: thias Update of /cvs/extras/rpms/elisa-plugins-bad/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27620 Modified Files: .cvsignore sources Added Files: elisa-plugins-bad-0.5.2-install.patch elisa-plugins-bad.spec Log Message: Initial import of 0.5.30. elisa-plugins-bad-0.5.2-install.patch: --- NEW FILE elisa-plugins-bad-0.5.2-install.patch --- diff -Naupr elisa-plugins-bad-0.5.2.orig/setup_bundle.py elisa-plugins-bad-0.5.2/setup_bundle.py --- elisa-plugins-bad-0.5.2.orig/setup_bundle.py 2008-07-21 19:24:34.000000000 +0200 +++ elisa-plugins-bad-0.5.2/setup_bundle.py 2008-07-23 16:22:10.000000000 +0200 @@ -7,14 +7,10 @@ def setup(args, plugins): if installed: # Run extracted from the tarball to install plugins_dir = os.path.normpath(os.path.join(script_dir, 'elisa', 'plugins')) - if os.path.exists(build_dir): - shutil.rmtree(build_dir) else: # Run from the development branch to create the tarball plugins_dir = os.path.normpath(os.path.join(script_dir, '..', 'elisa-plugins', 'elisa', 'plugins')) for plugin in plugins: - if 'install' in args and installed and os.path.exists(build_dir): - shutil.rmtree(build_dir) script = os.path.join(plugins_dir, plugin, 'setup.py') subprocess.call([sys.executable, script] + args) --- NEW FILE elisa-plugins-bad.spec --- %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Summary: Bad Plugins for the Elisa Media Center Name: elisa-plugins-bad Version: 0.5.30 Release: 1%{?dist} License: GPLv3 Group: Applications/Multimedia URL: http://elisa.fluendo.com/ Source: http://elisa.fluendo.com/static/download/elisa/elisa-plugins-bad-%{version}.tar.gz Patch0: elisa-plugins-bad-0.5.2-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # For the parent directories Requires: elisa >= %{version} # Plugin requirements, in order, only once each # amazon # amp # avahi Requires: dbus-python Requires: avahi-tools # coherence Requires: python-Coherence # daap Requires: python-twisted-web2 # database Requires: python-storm-sqlite # discogs #Requires: python-twisted-web2 # dvd ## elisa_updater # favorites Requires: ipython # filtered_shares # gstreamer Requires: gstreamer-python Requires: gstreamer-plugins-good Requires: python-imaging # http_client #Requires: python-twisted-web2 # ipod Requires: python-gpod # osso #Requires: dbus-python # pigment Requires: pigment-python >= 0.3.8 Requires: pygtk2 Requires: python-cssutils # poblesec (gst.element_factory_make('libvisual_jess')) #Requires: libvisual-plugins #Requires: pygtk2 #Requires: python-dbus # search # shelf ## smbwin32 ## winremote ## wmd # yesfm Requires: python-simplejson #Requires: python-twisted-web2 BuildRequires: elisa-base = %{version} BuildRequires: python-devel BuildArch: noarch %description This package contains the bad set of plugins for the Elisa Media Center, plugins which are not considered feature complete or polished enough to be in the good set of plugins, but do not present any licensing issues. %prep %setup -q %patch0 -p1 %build %{__python} setup.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install \ --single-version-externally-managed \ -O1 --skip-build --root %{buildroot} # Remove Windows only plugins %{__rm} -rf %{buildroot}%{python_sitelib}/elisa/plugins/elisa_updater/ \ %{buildroot}%{python_sitelib}/elisa_plugin_elisa_updater* \ %{buildroot}%{python_sitelib}/elisa/plugins/smbwin32/ \ %{buildroot}%{python_sitelib}/elisa_plugin_smb_win32* \ %{buildroot}%{python_sitelib}/elisa/plugins/winremote/ \ %{buildroot}%{python_sitelib}/elisa_plugin_winremote* \ %{buildroot}%{python_sitelib}/elisa/plugins/wmd/ \ %{buildroot}%{python_sitelib}/elisa_plugin_wmd* %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %{python_sitelib}/elisa/plugins/amazon/ %{python_sitelib}/elisa/plugins/amp/ %{python_sitelib}/elisa/plugins/avahi/ %{python_sitelib}/elisa/plugins/coherence/ %{python_sitelib}/elisa/plugins/daap/ %{python_sitelib}/elisa/plugins/database/ %{python_sitelib}/elisa/plugins/discogs/ %{python_sitelib}/elisa/plugins/dvd/ %{python_sitelib}/elisa/plugins/favorites/ %{python_sitelib}/elisa/plugins/filtered_shares/ %{python_sitelib}/elisa/plugins/gstreamer/ %{python_sitelib}/elisa/plugins/http_client/ %{python_sitelib}/elisa/plugins/ipod/ %{python_sitelib}/elisa/plugins/osso/ %{python_sitelib}/elisa/plugins/pigment/ %{python_sitelib}/elisa/plugins/poblesec/ %{python_sitelib}/elisa/plugins/rss/ %{python_sitelib}/elisa/plugins/search/ %{python_sitelib}/elisa/plugins/shelf/ %{python_sitelib}/elisa/plugins/themoviedb/ %{python_sitelib}/elisa/plugins/thetvdb/ %{python_sitelib}/elisa_plugin_* %changelog * Tue Mar 3 2009 Matthias Saou 0.5.30-1 - Update to 0.5.30. * Sat Feb 28 2009 Matthias Saou 0.5.29-1 - Update to 0.5.29. * Tue Feb 17 2009 Matthias Saou 0.5.28-1 - Update to 0.5.28. * Fri Feb 13 2009 Matthias Saou 0.5.27-1 - Update to 0.5.27. - Remove no longer present yesfm plugin. - Add new thetvdb and themoviedb plugins. * Sat Feb 7 2009 Matthias Saou 0.5.26-1 - Update to 0.5.26. * Mon Jan 26 2009 Matthias Saou 0.5.24.1-1 - Update to 0.5.24.1. * Mon Jan 12 2009 Matthias Saou 0.5.23-1 - Update to 0.5.23. * Sun Dec 28 2008 Matthias Saou 0.5.22-2 - Add missing python-cssutils requirement (used in the pigment plugin). * Thu Dec 18 2008 Matthias Saou 0.5.22-1 - Update to 0.5.22. - Include new rss plugin. * Mon Dec 1 2008 Matthias Saou 0.5.20-1 - Update to 0.5.20. * Mon Nov 24 2008 Matthias Saou 0.5.19-1 - Update to 0.5.19. * Mon Nov 17 2008 Matthias Saou 0.5.18-1 - Update to 0.5.18. * Mon Nov 10 2008 Matthias Saou 0.5.17-2 - Add python-simplejson requirement for the yesfm plugin. * Tue Nov 4 2008 Matthias Saou 0.5.17-1 - Update to 0.5.17. * Tue Oct 28 2008 Matthias Saou 0.5.16.1-1 - Update to 0.5.16.1. * Mon Oct 27 2008 Matthias Saou 0.5.16-1 - Update to 0.5.16. * Tue Oct 21 2008 Matthias Saou 0.5.15-1 - Update to 0.5.15. * Mon Oct 13 2008 Matthias Saou 0.5.14-1 - Update to 0.5.14. * Fri Oct 10 2008 Matthias Saou 0.5.13-2 - Build require elisa-base from now on. - Update description to explain what "bad" plugins are. * Tue Oct 7 2008 Matthias Saou 0.5.13-1 - Update to 0.5.13. * Tue Sep 30 2008 Matthias Saou 0.5.12-1 - Update to 0.5.12. * Tue Sep 23 2008 Matthias Saou 0.5.11-1 - Update to 0.5.11. * Tue Sep 16 2008 Matthias Saou 0.5.10-1 - Update to 0.5.10. * Tue Sep 9 2008 Matthias Saou 0.5.9-1 - Update to 0.5.9. * Mon Sep 2 2008 Matthias Saou 0.5.8-1 - Update to 0.5.8. * Tue Aug 26 2008 Matthias Saou 0.5.7-1 - Update to 0.5.7. * Tue Aug 19 2008 Matthias Saou 0.5.6-1 - Update to 0.5.6. - Require the exact same elisa version, as elisa and all plugins are always released all at once and should always match. * Mon Aug 11 2008 Matthias Saou 0.5.5-1 - Update to 0.5.5. * Fri Aug 8 2008 Matthias Saou 0.5.4-1 - Update to 0.5.4. * Tue Jul 29 2008 Matthias Saou 0.5.3-1 - Update to 0.5.3. - Exclude wmd plugin, the dependency problem should be fixed. - Disable all %%lang translations, they're gone... * Wed Jul 23 2008 Matthias Saou 0.5.2-2 - Update to 0.5.2. - List translations as %%lang. - Update the build patch which is still required. - Now build require the elisa-devel package. - Update requirements. * Tue Jul 15 2008 Matthias Saou 0.5.1-6 - Update to 0.5.1. - Add python-cssutils requirement for the pigment theme plugin. - Include install patch. - Remove winremote plugin, it seems to be Windows specific (win32api req). - Remove smbwin32 plugin, it seems to be Windows specific (win32net req). - Remove wmd plugin, it seems to be Windows specific (win32api req)... NOT! As the poblesec plugin requires it anyway (ugly, should go away). - Remove elisa_updater plugin, as we only want to update elisa with rpms. * Sun Mar 16 2008 Matthias Saou 0.3.5-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/elisa-plugins-bad/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:39:52 -0000 1.1 +++ .cvsignore 3 Mar 2009 09:58:03 -0000 1.2 @@ -0,0 +1 @@ +elisa-plugins-bad-0.5.30.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/elisa-plugins-bad/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:39:53 -0000 1.1 +++ sources 3 Mar 2009 09:58:03 -0000 1.2 @@ -0,0 +1 @@ +dac30feca252a25dd3d7cf147ad0d184 elisa-plugins-bad-0.5.30.tar.gz From bskeggs at fedoraproject.org Tue Mar 3 10:01:15 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Tue, 3 Mar 2009 10:01:15 +0000 (UTC) Subject: rpms/kernel/devel drm-nouveau.patch, 1.13, 1.14 kernel.spec, 1.1364, 1.1365 Message-ID: <20090303100115.D05E470117@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28065 Modified Files: drm-nouveau.patch kernel.spec Log Message: * Tue Mar 03 2009 Ben Skeggs - nouveau: some gf8/9 and kms fixes drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- drm-nouveau.patch 2 Mar 2009 06:13:20 -0000 1.13 +++ drm-nouveau.patch 3 Mar 2009 10:01:14 -0000 1.14 @@ -1361,10 +1361,10 @@ +#endif /* __NOUVEAU_BIOS_H__ */ diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c new file mode 100644 -index 0000000..1d4d1be +index 0000000..dc52670 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c -@@ -0,0 +1,385 @@ +@@ -0,0 +1,414 @@ +/* + * Copyright 2007 Dave Airlied + * All Rights Reserved. @@ -1529,6 +1529,7 @@ + struct drm_device *dev = bo->dev; + struct drm_nouveau_private *dev_priv = dev->dev_private; + struct nouveau_channel *chan = dev_priv->fifos[bo->new_fence_class]; ++ uint64_t src_offset, dst_offset; + uint32_t page_count; + + if (!chan) { @@ -1540,25 +1541,50 @@ + return -EINVAL; + } + ++ src_offset = old_mem->mm_node->start << PAGE_SHIFT; ++ dst_offset = new_mem->mm_node->start << PAGE_SHIFT; ++ if (dev_priv->card_type >= NV_50 && ++ !(new_mem->proposed_flags & DRM_NOUVEAU_BO_FLAG_NOVM)) { ++ /* It's quite possibly safe to use bo->offset for src */ ++ if (old_mem->mem_type == DRM_BO_MEM_TT) ++ src_offset += dev_priv->vm_gart_base; ++ else ++ src_offset += dev_priv->vm_vram_base; ++ ++ if (new_mem->mem_type == DRM_BO_MEM_TT) ++ dst_offset += dev_priv->vm_gart_base; ++ else ++ dst_offset += dev_priv->vm_vram_base; ++ } ++ + RING_SPACE(chan, 3); + BEGIN_RING(chan, NvSubM2MF, NV_MEMORY_TO_MEMORY_FORMAT_DMA_SOURCE, 2); + OUT_RING (chan, nouveau_bo_mem_ctxdma(chan, old_mem)); + OUT_RING (chan, nouveau_bo_mem_ctxdma(chan, new_mem)); + ++ if (dev_priv->card_type >= NV_50) { ++ RING_SPACE(chan, 4); ++ BEGIN_RING(chan, NvSubM2MF, 0x0200, 1); ++ OUT_RING (chan, 1); ++ BEGIN_RING(chan, NvSubM2MF, 0x021c, 1); ++ OUT_RING (chan, 1); ++ } ++ + page_count = new_mem->num_pages; + while (page_count) { + int line_count = (page_count > 2047) ? 2047 : page_count; + ++ if (dev_priv->card_type >= NV_50) { ++ RING_SPACE(chan, 3); ++ BEGIN_RING(chan, NvSubM2MF, 0x0238, 2); ++ OUT_RING (chan, upper_32_bits(src_offset)); ++ OUT_RING (chan, upper_32_bits(dst_offset)); ++ } + RING_SPACE(chan, 11); + BEGIN_RING(chan, NvSubM2MF, + NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8); -+ /*XXX: not correct on nv5x - these'd be offsets from -+ * the start of the memtype - not in the GPU -+ * address space.. sigh.. not used on nv5x currently -+ * due to other reasons anyhow, so, later! -+ */ -+ OUT_RING (chan, old_mem->mm_node->start << PAGE_SHIFT); -+ OUT_RING (chan, new_mem->mm_node->start << PAGE_SHIFT); ++ OUT_RING (chan, lower_32_bits(src_offset)); ++ OUT_RING (chan, lower_32_bits(dst_offset)); + OUT_RING (chan, PAGE_SIZE); /* src_pitch */ + OUT_RING (chan, PAGE_SIZE); /* dst_pitch */ + OUT_RING (chan, PAGE_SIZE); /* line_length */ @@ -1569,6 +1595,8 @@ + OUT_RING (chan, 0); + + page_count -= line_count; ++ src_offset += (PAGE_SIZE * line_count); ++ dst_offset += (PAGE_SIZE * line_count); + } + + return drm_bo_move_accel_cleanup(bo, evict, no_wait, chan->id, @@ -1696,7 +1724,8 @@ + new_mem); + } + -+ if (dev_priv->card_type == NV_50) ++ if (dev_priv->card_type == NV_50 && ++ new_mem->proposed_flags & DRM_NOUVEAU_BO_FLAG_TILE) + return drm_bo_move_memcpy(bo, evict, no_wait, new_mem); + + if (new_mem->mem_type == DRM_BO_MEM_LOCAL) { @@ -1989,7 +2018,7 @@ + diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c new file mode 100644 -index 0000000..5af1577 +index 0000000..e529be0 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_dma.c @@ -0,0 +1,213 @@ @@ -2036,7 +2065,7 @@ + /* On !mm_enabled, we can't map a GART push buffer into kernel + * space easily - so we'll just use VRAM. + */ -+ pushbuf = nouveau_mem_alloc(dev, 0, 0x8000, ++ pushbuf = nouveau_mem_alloc(dev, 0, 0x8000, NOUVEAU_MEM_NOVM | + NOUVEAU_MEM_FB | NOUVEAU_MEM_MAPPED, + (struct drm_file *)-2); + if (!pushbuf) { @@ -3328,10 +3357,10 @@ +#endif /* __NOUVEAU_FB_H__ */ diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c new file mode 100644 -index 0000000..4da3d40 +index 0000000..6c9db9e --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c -@@ -0,0 +1,933 @@ +@@ -0,0 +1,945 @@ +/* + * Copyright ?? 2007 David Airlie + * @@ -3770,6 +3799,7 @@ + struct drm_gem_object *gem = NULL; + struct nouveau_gem_object *ngem; + struct device *device = &dev->pdev->dev; ++ struct fb_fillrect rect; + int size, ret; + + mode_cmd.width = surface_width; @@ -3940,6 +3970,17 @@ + break; + }; + ++ /* Clear the entire fbcon. The drm will program every connector ++ * with it's preferred mode. If the sizes differ, one display will ++ * quite likely have garbage around the console. ++ */ ++ rect.dx = rect.dy = 0; ++ rect.width = surface_width; ++ rect.height = surface_height; ++ rect.color = 0; ++ rect.rop = ROP_COPY; ++ info->fbops->fb_fillrect(info, &rect); ++ + /* To allow resizeing without swapping buffers */ + printk("allocated %dx%d fb: 0x%lx, bo %p\n", nouveau_fb->base.width, + nouveau_fb->base.height, ngem->bo->offset, gem); @@ -4454,7 +4495,7 @@ +}; diff --git a/drivers/gpu/drm/nouveau/nouveau_fifo.c b/drivers/gpu/drm/nouveau/nouveau_fifo.c new file mode 100644 -index 0000000..9cfc171 +index 0000000..b31a000 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_fifo.c @@ -0,0 +1,673 @@ @@ -4704,8 +4745,8 @@ + } + + pb = nouveau_mem_alloc(dev, 0, config->cmdbuf.size, -+ config->cmdbuf.location | NOUVEAU_MEM_MAPPED, -+ (struct drm_file *)-2); ++ config->cmdbuf.location | NOUVEAU_MEM_MAPPED | ++ NOUVEAU_MEM_NOVM, (struct drm_file *)-2); + if (!pb) { + DRM_ERROR("Couldn't allocate DMA push buffer\n"); + return NULL; @@ -6545,10 +6586,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c new file mode 100644 -index 0000000..ca2b935 +index 0000000..abc00ec --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c -@@ -0,0 +1,1066 @@ +@@ -0,0 +1,1067 @@ +/* + * Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. + * Copyright 2005 Stephane Marchesin @@ -7119,7 +7160,8 @@ + bar1_size = drm_get_resource_len(dev, 1) >> PAGE_SHIFT; + text_size = (256 * 1024) >> PAGE_SHIFT; + if (bar1_size < vram_size) { -+ if ((ret = drm_bo_init_mm(dev, DRM_BO_MEM_PRIV0, bar1_size, ++ if (dev_priv->card_type < NV_50 && ++ (ret = drm_bo_init_mm(dev, DRM_BO_MEM_PRIV0, bar1_size, + vram_size - bar1_size, 1))) { + DRM_ERROR("Failed PRIV0 mm init: %d\n", ret); + return ret; @@ -17595,10 +17637,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c new file mode 100644 -index 0000000..95376f9 +index 0000000..b081230 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c -@@ -0,0 +1,728 @@ +@@ -0,0 +1,723 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -17953,7 +17995,6 @@ +static void nv50_crtc_destroy(struct drm_crtc *drm_crtc) +{ + struct nouveau_crtc *crtc = to_nouveau_crtc(drm_crtc); -+ struct drm_device *dev = drm_crtc->dev; + + DRM_DEBUG("\n"); + @@ -17965,7 +18006,7 @@ + nv50_lut_destroy(crtc); + nv50_cursor_destroy(crtc); + -+ drm_mode_destroy(dev, crtc->mode); ++ kfree(crtc->mode); + kfree(crtc); +} + @@ -18019,10 +18060,6 @@ +{ + struct nouveau_crtc *crtc = to_nouveau_crtc(drm_crtc); + -+ /* temporarily disabled due to some bugs */ -+ if (1) -+ return; -+ + if (size != 256) + return; + @@ -18301,7 +18338,7 @@ + if (!crtc) + return -ENOMEM; + -+ crtc->mode = drm_mode_create(dev); ++ crtc->mode = kzalloc(sizeof(*crtc->mode), GFP_KERNEL); + if (!crtc->mode) { + kfree(crtc); + return -ENOMEM; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1364 retrieving revision 1.1365 diff -u -r1.1364 -r1.1365 --- kernel.spec 3 Mar 2009 09:09:16 -0000 1.1364 +++ kernel.spec 3 Mar 2009 10:01:15 -0000 1.1365 @@ -1785,6 +1785,9 @@ # and build. %changelog +* Tue Mar 03 2009 Ben Skeggs +- nouveau: some gf8/9 and kms fixes + * Tue Mar 03 2009 Dave Airlie 2.6.29-0.184.rc6.git6 - drm-modesetting-radeon.patch: fix suspend/resume, proc->debugfs From berrange at fedoraproject.org Tue Mar 3 10:19:08 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Tue, 3 Mar 2009 10:19:08 +0000 (UTC) Subject: rpms/gtk-vnc/devel gtk-vnc-0.3.8-sasl-auth.patch, NONE, 1.1 gtk-vnc.spec, 1.28, 1.29 Message-ID: <20090303101909.1820670116@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/gtk-vnc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31490 Modified Files: gtk-vnc.spec Added Files: gtk-vnc-0.3.8-sasl-auth.patch Log Message: Support SASL authentication extension gtk-vnc-0.3.8-sasl-auth.patch: --- NEW FILE gtk-vnc-0.3.8-sasl-auth.patch --- diff -rup gtk-vnc-0.3.8.orig/configure.ac gtk-vnc-0.3.8.new/configure.ac --- gtk-vnc-0.3.8.orig/configure.ac 2008-12-07 19:35:14.000000000 +0000 +++ gtk-vnc-0.3.8.new/configure.ac 2009-03-03 10:13:25.000000000 +0000 @@ -145,6 +145,53 @@ PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNU AC_SUBST(GNUTLS_CFLAGS) AC_SUBST(GNUTLS_LIBS) +dnl Cyrus SASL +AC_ARG_WITH([sasl], + [ --with-sasl use cyrus SASL for authentication], + [], + [with_sasl=check]) + +SASL_CFLAGS= +SASL_LIBS= +if test "x$with_sasl" != "xno"; then + if test "x$with_sasl" != "xyes" -a "x$with_sasl" != "xcheck"; then + SASL_CFLAGS="-I$with_sasl" + SASL_LIBS="-L$with_sasl" + fi + fail=0 + old_cflags="$CFLAGS" + old_libs="$LIBS" + CFLAGS="$CFLAGS $SASL_CFLAGS" + LIBS="$LIBS $SASL_LIBS" + AC_CHECK_HEADER([sasl/sasl.h],[],[ + if test "x$with_sasl" != "xcheck" ; then + with_sasl=no + else + fail=1 + fi]) + if test "x$with_sasl" != "xno" ; then + AC_CHECK_LIB([sasl2], [sasl_client_init],[with_sasl=yes],[ + if test "x$with_sasl" = "xcheck" ; then + with_sasl=no + else + fail=1 + fi]) + fi + test $fail = 1 && + AC_MSG_ERROR([You must install the Cyrus SASL development package in order to compile GTK-VNC]) + CFLAGS="$old_cflags" + LIBS="$old_libs" + SASL_LIBS="$SASL_LIBS -lsasl2" + if test "x$with_sasl" = "xyes" ; then + AC_DEFINE_UNQUOTED([HAVE_SASL], 1, + [whether Cyrus SASL is available for authentication]) + fi +fi +AM_CONDITIONAL([HAVE_SASL], [test "x$with_sasl" = "xyes"]) +AC_SUBST([SASL_CFLAGS]) +AC_SUBST([SASL_LIBS]) + + GTHREAD_CFLAGS= GTHREAD_LIBS= diff -rup gtk-vnc-0.3.8.orig/examples/gvncviewer.c gtk-vnc-0.3.8.new/examples/gvncviewer.c --- gtk-vnc-0.3.8.orig/examples/gvncviewer.c 2008-12-07 19:35:14.000000000 +0000 +++ gtk-vnc-0.3.8.new/examples/gvncviewer.c 2009-03-03 10:13:25.000000000 +0000 @@ -241,7 +241,10 @@ static void vnc_credential(GtkWidget *vn case VNC_DISPLAY_CREDENTIAL_PASSWORD: data[i] = gtk_entry_get_text(GTK_ENTRY(entry[row])); break; + default: + continue; } + row++; } } } diff -rup gtk-vnc-0.3.8.orig/gtk-vnc.spec.in gtk-vnc-0.3.8.new/gtk-vnc.spec.in --- gtk-vnc-0.3.8.orig/gtk-vnc.spec.in 2008-12-07 19:35:14.000000000 +0000 +++ gtk-vnc-0.3.8.new/gtk-vnc.spec.in 2009-03-03 10:13:25.000000000 +0000 @@ -14,7 +14,7 @@ Source: http://downloads.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gtk-vnc.sf.net/ BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel -BuildRequires: gnutls-devel +BuildRequires: gnutls-devel cyrus-sasl-devel %if %{with_plugin} %if "%{fedora}" > "8" BuildRequires: xulrunner-devel diff -rup gtk-vnc-0.3.8.orig/src/gvnc.c gtk-vnc-0.3.8.new/src/gvnc.c --- gtk-vnc-0.3.8.orig/src/gvnc.c 2008-12-07 19:35:14.000000000 +0000 +++ gtk-vnc-0.3.8.new/src/gvnc.c 2009-03-03 10:13:25.000000000 +0000 @@ -46,6 +46,10 @@ #include #include +#ifdef HAVE_SASL +#include +#endif + #include #include @@ -133,6 +137,16 @@ struct gvnc char *cred_x509_cacrl; char *cred_x509_cert; char *cred_x509_key; + gboolean want_cred_username; + gboolean want_cred_password; + gboolean want_cred_x509; + +#if HAVE_SASL + sasl_conn_t *saslconn; /* SASL context */ + const char *saslDecoded; + unsigned int saslDecodedLength; + unsigned int saslDecodedOffset; +#endif char read_buffer[4096]; size_t read_offset; @@ -355,6 +369,133 @@ static int gvnc_zread(struct gvnc *gvnc, /* IO functions */ + +/* + * Read at least 1 more byte of data straight off the wire + * into the requested buffer. + */ +static int gvnc_read_wire(struct gvnc *gvnc, void *data, size_t len) +{ + int ret; + + reread: + if (gvnc->tls_session) { + ret = gnutls_read(gvnc->tls_session, data, len); + if (ret < 0) { + if (ret == GNUTLS_E_AGAIN) + errno = EAGAIN; + else + errno = EIO; + ret = -1; + } + } else + ret = recv (gvnc->fd, data, len, 0); + + if (ret == -1) { + switch (errno) { + case EWOULDBLOCK: + if (gvnc->wait_interruptable) { + if (!g_io_wait_interruptable(&gvnc->wait, + gvnc->channel, G_IO_IN)) { + GVNC_DEBUG("Read blocking interrupted %d", gvnc->has_error); + return -EAGAIN; + } + } else + g_io_wait(gvnc->channel, G_IO_IN); + case EINTR: + goto reread; + + default: + GVNC_DEBUG("Closing the connection: gvnc_read() - errno=%d\n", errno); + gvnc->has_error = TRUE; + return -errno; + } + } + if (ret == 0) { + GVNC_DEBUG("Closing the connection: gvnc_read() - ret=0\n"); + gvnc->has_error = TRUE; + return -EPIPE; + } + //GVNC_DEBUG("Read wire %p %d -> %d", data, len, ret); + + return ret; +} + + +/* + * Read at least 1 more byte of data out of the SASL decrypted + * data buffer, into the internal read buffer + */ +static int gvnc_read_sasl(struct gvnc *gvnc) +{ + size_t want; + //GVNC_DEBUG("Read SASL %p size %d offset %d", gvnc->saslDecoded, + // gvnc->saslDecodedLength, gvnc->saslDecodedOffset); + if (gvnc->saslDecoded == NULL) { + char encoded[8192]; + int encodedLen = sizeof(encoded); + int err, ret; + + ret = gvnc_read_wire(gvnc, encoded, encodedLen); + if (ret < 0) { + return ret; + } + + err = sasl_decode(gvnc->saslconn, encoded, ret, + &gvnc->saslDecoded, &gvnc->saslDecodedLength); + if (err != SASL_OK) { + GVNC_DEBUG("Failed to decode SASL data %s", + sasl_errstring(err, NULL, NULL)); + gvnc->has_error = TRUE; + return -EINVAL; + } + gvnc->saslDecodedOffset = 0; + } + + want = gvnc->saslDecodedLength - gvnc->saslDecodedOffset; + if (want > sizeof(gvnc->read_buffer)) + want = sizeof(gvnc->read_buffer); + + memcpy(gvnc->read_buffer, + gvnc->saslDecoded + gvnc->saslDecodedOffset, + want); + gvnc->saslDecodedOffset += want; + if (gvnc->saslDecodedOffset == gvnc->saslDecodedLength) { + gvnc->saslDecodedLength = gvnc->saslDecodedOffset = 0; + gvnc->saslDecoded = NULL; + } + //GVNC_DEBUG("Done read write %d - %d", want, gvnc->has_error); + return want; +} + + +/* + * Read at least 1 more byte of data straight off the wire + * into the internal read buffer + */ +static int gvnc_read_plain(struct gvnc *gvnc) +{ + //GVNC_DEBUG("Read plain %d", sizeof(gvnc->read_buffer)); + return gvnc_read_wire(gvnc, gvnc->read_buffer, sizeof(gvnc->read_buffer)); +} + +/* + * Read at least 1 more byte of data into the internal read_buffer + */ +static int gvnc_read_buf(struct gvnc *gvnc) +{ + //GVNC_DEBUG("Start read %d", gvnc->has_error); +#if HAVE_SASL + if (gvnc->saslconn) + return gvnc_read_sasl(gvnc); + else +#endif + return gvnc_read_plain(gvnc); +} + +/* + * Fill the 'data' buffer up with exactly 'len' bytes worth of data + */ static int gvnc_read(struct gvnc *gvnc, void *data, size_t len) { char *ptr = data; @@ -377,43 +518,10 @@ static int gvnc_read(struct gvnc *gvnc, offset += ret; continue; } else if (gvnc->read_offset == gvnc->read_size) { - int ret; - - if (gvnc->tls_session) { - ret = gnutls_read(gvnc->tls_session, gvnc->read_buffer, 4096); - if (ret < 0) { - if (ret == GNUTLS_E_AGAIN) - errno = EAGAIN; - else - errno = EIO; - ret = -1; - } - } else - ret = recv (gvnc->fd, gvnc->read_buffer, 4096, 0); - - if (ret == -1) { - switch (errno) { - case EWOULDBLOCK: - if (gvnc->wait_interruptable) { - if (!g_io_wait_interruptable(&gvnc->wait, - gvnc->channel, G_IO_IN)) - return -EAGAIN; - } else - g_io_wait(gvnc->channel, G_IO_IN); - case EINTR: - continue; - default: - GVNC_DEBUG("Closing the connection: gvnc_read() - errno=%d\n", errno); - gvnc->has_error = TRUE; - return -errno; - } - } - if (ret == 0) { - GVNC_DEBUG("Closing the connection: gvnc_read() - ret=0\n"); - gvnc->has_error = TRUE; - return -EPIPE; - } + int ret = gvnc_read_buf(gvnc); + if (ret < 0) + return ret; gvnc->read_offset = 0; gvnc->read_size = ret; } @@ -429,16 +537,23 @@ static int gvnc_read(struct gvnc *gvnc, return 0; } -static void gvnc_flush(struct gvnc *gvnc) +/* + * Write all 'data' of length 'datalen' bytes out to + * the wire + */ +static void gvnc_flush_wire(struct gvnc *gvnc, + const void *data, + size_t datalen) { size_t offset = 0; - while (offset < gvnc->write_offset) { + //GVNC_DEBUG("Flush write %p %d", data, datalen); + while (offset < datalen) { int ret; if (gvnc->tls_session) { ret = gnutls_write(gvnc->tls_session, - gvnc->write_buffer+offset, - gvnc->write_offset-offset); + data+offset, + datalen-offset); if (ret < 0) { if (ret == GNUTLS_E_AGAIN) errno = EAGAIN; @@ -448,8 +563,8 @@ static void gvnc_flush(struct gvnc *gvnc } } else ret = send (gvnc->fd, - gvnc->write_buffer+offset, - gvnc->write_offset-offset, 0); + data+offset, + datalen-offset, 0); if (ret == -1) { switch (errno) { case EWOULDBLOCK: @@ -469,6 +584,57 @@ static void gvnc_flush(struct gvnc *gvnc } offset += ret; } +} + + +/* + * Encode all buffered data, write all encrypted data out + * to the wire + */ +static void gvnc_flush_sasl(struct gvnc *gvnc) +{ + const char *output; + unsigned int outputlen; + int err; + + err = sasl_encode(gvnc->saslconn, + gvnc->write_buffer, + gvnc->write_offset, + &output, &outputlen); + if (err != SASL_OK) { + GVNC_DEBUG("Failed to encode SASL data %s", + sasl_errstring(err, NULL, NULL)); + gvnc->has_error = TRUE; + return; + } + //GVNC_DEBUG("Flush SASL %d: %p %d", gvnc->write_offset, output, outputlen); + gvnc_flush_wire(gvnc, output, outputlen); +} + +/* + * Write all buffered data straight out to the wire + */ +static void gvnc_flush_plain(struct gvnc *gvnc) +{ + //GVNC_DEBUG("Flush plain %d", gvnc->write_offset); + gvnc_flush_wire(gvnc, + gvnc->write_buffer, + gvnc->write_offset); +} + + +/* + * Write all buffered data out to the wire + */ +static void gvnc_flush(struct gvnc *gvnc) +{ + //GVNC_DEBUG("STart write %d", gvnc->has_error); +#if HAVE_SASL + if (gvnc->saslconn) + gvnc_flush_sasl(gvnc); + else +#endif + gvnc_flush_plain(gvnc); gvnc->write_offset = 0; } @@ -602,6 +768,10 @@ static void gvnc_write_s32(struct gvnc * #define DH_BITS 1024 static gnutls_dh_params_t dh_params; +static void gvnc_debug_gnutls_log(int level, const char* str) { + GVNC_DEBUG("%d %s", level, str); +} + static gboolean gvnc_tls_initialize(void) { static int tlsinitialized = 0; @@ -617,6 +787,11 @@ static gboolean gvnc_tls_initialize(void if (gnutls_dh_params_generate2 (dh_params, DH_BITS) < 0) return FALSE; + if (debug_enabled) { + //gnutls_global_set_log_level(10); + //gnutls_global_set_log_function(gvnc_debug_gnutls_log); + } + tlsinitialized = TRUE; return TRUE; @@ -2120,6 +2295,64 @@ gboolean gvnc_server_message(struct gvnc return !gvnc_has_error(gvnc); } +gboolean gvnc_wants_credential_password(struct gvnc *gvnc) +{ + return gvnc->want_cred_password; +} + +gboolean gvnc_wants_credential_username(struct gvnc *gvnc) +{ + return gvnc->want_cred_username; +} + +gboolean gvnc_wants_credential_x509(struct gvnc *gvnc) +{ + return gvnc->want_cred_x509; +} + +static gboolean gvnc_has_credentials(gpointer data) +{ + struct gvnc *gvnc = (struct gvnc *)data; + + if (gvnc->has_error) + return TRUE; + if (gvnc_wants_credential_username(gvnc) && !gvnc->cred_username) + return FALSE; + if (gvnc_wants_credential_password(gvnc) && !gvnc->cred_password) + return FALSE; + /* + * For x509 we require a minimum of the CA cert. + * Anything else is a bonus - though the server + * may reject auth if it decides it wants a client + * cert. We can't express that based on auth type + * alone though - we'll merely find out when TLS + * negotiation takes place. + */ + if (gvnc_wants_credential_x509(gvnc) && !gvnc->cred_x509_cacert) + return FALSE; + return TRUE; +} + +static gboolean gvnc_gather_credentials(struct gvnc *gvnc) +{ + if (!gvnc_has_credentials(gvnc)) { + GVNC_DEBUG("Requesting missing credentials\n"); + if (gvnc->has_error || !gvnc->ops.auth_cred) { + gvnc->has_error = TRUE; + return FALSE; + } + if (!gvnc->ops.auth_cred(gvnc->ops_data)) + gvnc->has_error = TRUE; + if (gvnc->has_error) + return FALSE; + GVNC_DEBUG("Waiting for missing credentials\n"); + g_condition_wait(gvnc_has_credentials, gvnc); + GVNC_DEBUG("Got all credentials\n"); + } + return !gvnc_has_error(gvnc); +} + + static gboolean gvnc_check_auth_result(struct gvnc *gvnc) { uint32_t result; @@ -2142,7 +2375,7 @@ static gboolean gvnc_check_auth_result(s if (!gvnc->has_error && gvnc->ops.auth_failure) gvnc->ops.auth_failure(gvnc->ops_data, reason); } else { - GVNC_DEBUG("Fail\n"); + GVNC_DEBUG("Fail auth no result\n"); if (!gvnc->has_error && gvnc->ops.auth_failure) gvnc->ops.auth_failure(gvnc->ops_data, NULL); } @@ -2155,6 +2388,12 @@ static gboolean gvnc_perform_auth_vnc(st uint8_t key[8]; GVNC_DEBUG("Do Challenge\n"); + gvnc->want_cred_password = TRUE; + gvnc->want_cred_username = FALSE; + gvnc->want_cred_x509 = FALSE; + if (!gvnc_gather_credentials(gvnc)) + return FALSE; + if (!gvnc->cred_password) return FALSE; @@ -2173,6 +2412,472 @@ static gboolean gvnc_perform_auth_vnc(st } +#if HAVE_SASL +/* + * NB, keep in sync with similar method in qemud/remote.c + */ +static char *gvnc_addr_to_string(struct sockaddr_storage *sa, socklen_t salen) +{ + char host[NI_MAXHOST], port[NI_MAXSERV]; + char *addr; + int err; + + if ((err = getnameinfo((struct sockaddr *)sa, salen, + host, sizeof(host), + port, sizeof(port), + NI_NUMERICHOST | NI_NUMERICSERV)) != 0) { + GVNC_DEBUG("Cannot resolve address %d: %s", + err, gai_strerror(err)); + return NULL; + } + + addr = g_malloc0(strlen(host) + 1 + strlen(port) + 1); + strcpy(addr, host); + strcat(addr, ";"); + strcat(addr, port); + return addr; +} + + + +static gboolean +gvnc_gather_sasl_credentials(struct gvnc *gvnc, + sasl_interact_t *interact) +{ + int ninteract; + + gvnc->want_cred_password = FALSE; + gvnc->want_cred_username = FALSE; + gvnc->want_cred_x509 = FALSE; + + for (ninteract = 0 ; interact[ninteract].id != 0 ; ninteract++) { + switch (interact[ninteract].id) { + case SASL_CB_AUTHNAME: + case SASL_CB_USER: + gvnc->want_cred_username = TRUE; + break; + + case SASL_CB_PASS: + gvnc->want_cred_password = TRUE; + break; + + default: + GVNC_DEBUG("Unsupported credential %lu", + interact[ninteract].id); + /* Unsupported */ + return FALSE; + } + } + + if ((gvnc->want_cred_password || + gvnc->want_cred_username) && + !gvnc_gather_credentials(gvnc)) { + GVNC_DEBUG("%s", "damn "); + return FALSE; + } + + for (ninteract = 0 ; interact[ninteract].id != 0 ; ninteract++) { + switch (interact[ninteract].id) { + case SASL_CB_AUTHNAME: + case SASL_CB_USER: + interact[ninteract].result = gvnc->cred_username; + interact[ninteract].len = strlen(gvnc->cred_username); + GVNC_DEBUG("Gather Username %s", gvnc->cred_username); + break; + + case SASL_CB_PASS: + interact[ninteract].result = gvnc->cred_password; + interact[ninteract].len = strlen(gvnc->cred_password); + GVNC_DEBUG("Gather Password %s", gvnc->cred_password); + break; + } + } + + GVNC_DEBUG("%s", "Filled SASL interact"); + + return TRUE; +} + + + +/* + * + * Init msg from server + * + * u32 mechlist-length + * u8-array mechlist-string + * + * Start msg to server + * + * u32 mechname-length + * u8-array mechname-string + * u32 clientout-length + * u8-array clientout-string + * + * Start msg from server + * + * u32 serverin-length + * u8-array serverin-string + * u8 continue + * + * Step msg to server + * + * u32 clientout-length + * u8-array clientout-string + * + * Step msg from server + * + * u32 serverin-length + * u8-array serverin-string + * u8 continue + */ + +#define SASL_MAX_MECHLIST_LEN 300 +#define SASL_MAX_MECHNAME_LEN 100 +#define SASL_MAX_DATA_LEN (1024 * 1024) + +/* Perform the SASL authentication process + */ +static gboolean gvnc_perform_auth_sasl(struct gvnc *gvnc) +{ + sasl_conn_t *saslconn = NULL; + sasl_security_properties_t secprops; + const char *clientout; + char *serverin = NULL; + unsigned int clientoutlen, serverinlen; + int err, complete; + struct sockaddr_storage sa; + socklen_t salen; + char *localAddr = NULL, *remoteAddr = NULL; + const void *val; + sasl_ssf_t ssf; + sasl_callback_t saslcb[] = { + { .id = SASL_CB_AUTHNAME }, + // { .id = SASL_CB_USER }, + { .id = SASL_CB_PASS }, + { .id = 0 }, + }; + sasl_interact_t *interact = NULL; + guint32 mechlistlen; + char *mechlist; + const char *mechname; + gboolean ret; + + /* Sets up the SASL library as a whole */ + err = sasl_client_init(NULL); + GVNC_DEBUG("Client initialize SASL authentication %d", err); + if (err != SASL_OK) { + GVNC_DEBUG("failed to initialize SASL library: %d (%s)", + err, sasl_errstring(err, NULL, NULL)); + goto error; + } + + /* Get local address in form IPADDR:PORT */ + salen = sizeof(sa); + if (getsockname(gvnc->fd, (struct sockaddr*)&sa, &salen) < 0) { + GVNC_DEBUG("failed to get sock address %d (%s)", + errno, strerror(errno)); + goto error; + } + if ((localAddr = gvnc_addr_to_string(&sa, salen)) == NULL) + goto error; + + /* Get remote address in form IPADDR:PORT */ + salen = sizeof(sa); + if (getpeername(gvnc->fd, (struct sockaddr*)&sa, &salen) < 0) { + GVNC_DEBUG("failed to get peer address %d (%s)", + errno, strerror(errno)); + g_free(localAddr); + goto error; + } + if ((remoteAddr = gvnc_addr_to_string(&sa, salen)) == NULL) { + g_free(localAddr); + goto error; + } + + GVNC_DEBUG("Client SASL new host:'%s' local:'%s' remote:'%s'", gvnc->host, localAddr, remoteAddr); + + /* Setup a handle for being a client */ + err = sasl_client_new("vnc", + gvnc->host, + localAddr, + remoteAddr, + saslcb, + SASL_SUCCESS_DATA, + &saslconn); + g_free(localAddr); + g_free(remoteAddr); + + if (err != SASL_OK) { + GVNC_DEBUG("Failed to create SASL client context: %d (%s)", + err, sasl_errstring(err, NULL, NULL)); + goto error; + } + + /* Initialize some connection props we care about */ + if (gvnc->tls_session) { + gnutls_cipher_algorithm_t cipher; + + cipher = gnutls_cipher_get(gvnc->tls_session); + if (!(ssf = (sasl_ssf_t)gnutls_cipher_get_key_size(cipher))) { + GVNC_DEBUG("%s", "invalid cipher size for TLS session"); + goto error; + } + ssf *= 8; /* key size is bytes, sasl wants bits */ + + GVNC_DEBUG("Setting external SSF %d", ssf); + err = sasl_setprop(saslconn, SASL_SSF_EXTERNAL, &ssf); + if (err != SASL_OK) { + GVNC_DEBUG("cannot set external SSF %d (%s)", + err, sasl_errstring(err, NULL, NULL)); + goto error; + } + } + + memset (&secprops, 0, sizeof secprops); + /* If we've got TLS, we don't care about SSF */ + secprops.min_ssf = gvnc->tls_session ? 0 : 56; /* Equiv to DES supported by all Kerberos */ + secprops.max_ssf = gvnc->tls_session ? 0 : 100000; /* Very strong ! AES == 256 */ + secprops.maxbufsize = 100000; + /* If we're not TLS, then forbid any anonymous or trivially crackable auth */ + secprops.security_flags = gvnc->tls_session ? 0 : + SASL_SEC_NOANONYMOUS | SASL_SEC_NOPLAINTEXT; + + err = sasl_setprop(saslconn, SASL_SEC_PROPS, &secprops); + if (err != SASL_OK) { + GVNC_DEBUG("cannot set security props %d (%s)", + err, sasl_errstring(err, NULL, NULL)); + goto error; + } + + /* Get the supported mechanisms from the server */ + mechlistlen = gvnc_read_u32(gvnc); + if (gvnc->has_error) + goto error; + if (mechlistlen > SASL_MAX_MECHLIST_LEN) { + GVNC_DEBUG("mechlistlen %d too long", mechlistlen); + goto error; + } + + mechlist = g_malloc(mechlistlen+1); + gvnc_read(gvnc, mechlist, mechlistlen); + mechlist[mechlistlen] = '\0'; + if (gvnc->has_error) { + g_free(mechlist); + mechlist = NULL; + goto error; + } + +#if 0 + if (wantmech) { + if (strstr(mechlist, wantmech) == NULL) { + GVNC_DEBUG("SASL mechanism %s not supported by server", + wantmech); + VIR_FREE(iret.mechlist); + goto error; + } + mechlist = wantmech; + } +#endif + + restart: + /* Start the auth negotiation on the client end first */ + GVNC_DEBUG("Client start negotiation mechlist '%s'", mechlist); + err = sasl_client_start(saslconn, + mechlist, + &interact, + &clientout, + &clientoutlen, + &mechname); + if (err != SASL_OK && err != SASL_CONTINUE && err != SASL_INTERACT) { + GVNC_DEBUG("Failed to start SASL negotiation: %d (%s)", + err, sasl_errdetail(saslconn)); + g_free(mechlist); + mechlist = NULL; + goto error; + } + + /* Need to gather some credentials from the client */ + if (err == SASL_INTERACT) { + if (!gvnc_gather_sasl_credentials(gvnc, + interact)) { + GVNC_DEBUG("%s", "Failed to collect auth credentials"); + goto error; + } + goto restart; + } + + GVNC_DEBUG("Server start negotiation with mech %s. Data %d bytes %p '%s'", + mechname, clientoutlen, clientout, clientout); + + if (clientoutlen > SASL_MAX_DATA_LEN) { + GVNC_DEBUG("SASL negotiation data too long: %d bytes", + clientoutlen); + goto error; + } + + /* Send back the chosen mechname */ + gvnc_write_u32(gvnc, strlen(mechname)); + gvnc_write(gvnc, mechname, strlen(mechname)); + + /* NB, distinction of NULL vs "" is *critical* in SASL */ + if (clientout) { + gvnc_write_u32(gvnc, clientoutlen + 1); + gvnc_write(gvnc, clientout, clientoutlen + 1); + } else { + gvnc_write_u32(gvnc, 0); + } + gvnc_flush(gvnc); + if (gvnc->has_error) + goto error; + + + GVNC_DEBUG("%s", "Getting sever start negotiation reply"); + /* Read the 'START' message reply from server */ + serverinlen = gvnc_read_u32(gvnc); + if (gvnc->has_error) + goto error; + if (serverinlen > SASL_MAX_DATA_LEN) { + GVNC_DEBUG("SASL negotiation data too long: %d bytes", + clientoutlen); + goto error; + } + + /* NB, distinction of NULL vs "" is *critical* in SASL */ + if (serverinlen) { + serverin = g_malloc(serverinlen); + gvnc_read(gvnc, serverin, serverinlen); + serverin[serverinlen-1] = '\0'; + serverinlen--; + } else { + serverin = NULL; + } + complete = gvnc_read_u8(gvnc); + if (gvnc->has_error) + goto error; + + GVNC_DEBUG("Client start result complete: %d. Data %d bytes %p '%s'", + complete, serverinlen, serverin, serverin); + + /* Loop-the-loop... + * Even if the server has completed, the client must *always* do at least one step + * in this loop to verify the server isn't lying about something. Mutual auth */ + for (;;) { + restep: + err = sasl_client_step(saslconn, + serverin, + serverinlen, + &interact, + &clientout, + &clientoutlen); + if (err != SASL_OK && err != SASL_CONTINUE && err != SASL_INTERACT) { + GVNC_DEBUG("Failed SASL step: %d (%s)", + err, sasl_errdetail(saslconn)); + goto error; + } + + /* Need to gather some credentials from the client */ + if (err == SASL_INTERACT) { + if (!gvnc_gather_sasl_credentials(gvnc, + interact)) { + GVNC_DEBUG("%s", "Failed to collect auth credentials"); + goto error; + } + goto restep; + } + + if (serverin) { + g_free(serverin); + serverin = NULL; + } + + GVNC_DEBUG("Client step result %d. Data %d bytes %p '%s'", err, clientoutlen, clientout, clientout); + + /* Previous server call showed completion & we're now locally complete too */ + if (complete && err == SASL_OK) + break; + + /* Not done, prepare to talk with the server for another iteration */ + + /* NB, distinction of NULL vs "" is *critical* in SASL */ + if (clientout) { + gvnc_write_u32(gvnc, clientoutlen + 1); + gvnc_write(gvnc, clientout, clientoutlen + 1); + } else { + gvnc_write_u32(gvnc, 0); + } + gvnc_flush(gvnc); + if (gvnc->has_error) + goto error; + + GVNC_DEBUG("Server step with %d bytes %p", clientoutlen, clientout); + + serverinlen = gvnc_read_u32(gvnc); + if (gvnc->has_error) + goto error; + if (serverinlen > SASL_MAX_DATA_LEN) { + GVNC_DEBUG("SASL negotiation data too long: %d bytes", + clientoutlen); + goto error; + } + + /* NB, distinction of NULL vs "" is *critical* in SASL */ + if (serverinlen) { + serverin = g_malloc(serverinlen); + gvnc_read(gvnc, serverin, serverinlen); + serverin[serverinlen-1] = '\0'; + serverinlen--; + } else { + serverin = NULL; + } + complete = gvnc_read_u8(gvnc); + if (gvnc->has_error) + goto error; + + GVNC_DEBUG("Client step result complete: %d. Data %d bytes %p '%s'", + complete, serverinlen, serverin, serverin); + + /* This server call shows complete, and earlier client step was OK */ + if (complete && err == SASL_OK) { + g_free(serverin); + serverin = NULL; + break; + } + } + + /* Check for suitable SSF if non-TLS */ + if (!gvnc->tls_session) { + err = sasl_getprop(saslconn, SASL_SSF, &val); + if (err != SASL_OK) { + GVNC_DEBUG("cannot query SASL ssf on connection %d (%s)", + err, sasl_errstring(err, NULL, NULL)); + goto error; + } + ssf = *(const int *)val; + GVNC_DEBUG("SASL SSF value %d", ssf); + if (ssf < 56) { /* 56 == DES level, good for Kerberos */ + GVNC_DEBUG("negotiation SSF %d was not strong enough", ssf); + goto error; + } + } + + GVNC_DEBUG("%s", "SASL authentication complete"); + ret = gvnc_check_auth_result(gvnc); + /* This must come *after* check-auth-result, because the former + * is defined to be sent unencrypted, and setting saslconn turns + * on the SSF layer encryption processing */ + gvnc->saslconn = saslconn; + return ret; + + error: + gvnc->has_error = TRUE; + if (saslconn) + sasl_dispose(&saslconn); + return FALSE; +} +#endif /* HAVE_SASL */ + + static gboolean gvnc_start_tls(struct gvnc *gvnc, int anonTLS) { static const int cert_type_priority[] = { GNUTLS_CRT_X509, 0 }; @@ -2230,6 +2935,12 @@ static gboolean gvnc_start_tls(struct gv return FALSE; } } else { + gvnc->want_cred_password = FALSE; + gvnc->want_cred_username = FALSE; + gvnc->want_cred_x509 = TRUE; + if (!gvnc_gather_credentials(gvnc)) + return FALSE; + gnutls_certificate_credentials_t x509_cred = gvnc_tls_initialize_cert_cred(gvnc); if (!x509_cred) { gnutls_deinit(gvnc->tls_session); @@ -2279,92 +2990,6 @@ static gboolean gvnc_start_tls(struct gv } } -gboolean gvnc_wants_credential_password(struct gvnc *gvnc) -{ - if (gvnc->auth_type == GVNC_AUTH_VNC) - return TRUE; - - if (gvnc->auth_type == GVNC_AUTH_TLS && - gvnc->auth_subtype == GVNC_AUTH_VNC) - return TRUE; - - if (gvnc->auth_type == GVNC_AUTH_VENCRYPT) { - if (gvnc->auth_subtype == GVNC_AUTH_VENCRYPT_PLAIN || - gvnc->auth_subtype == GVNC_AUTH_VENCRYPT_TLSVNC || - gvnc->auth_subtype == GVNC_AUTH_VENCRYPT_TLSPLAIN || - gvnc->auth_subtype == GVNC_AUTH_VENCRYPT_X509VNC || - gvnc->auth_subtype == GVNC_AUTH_VENCRYPT_X509PLAIN) - return TRUE; - } - - return FALSE; -} - -gboolean gvnc_wants_credential_username(struct gvnc *gvnc) -{ - if (gvnc->auth_type == GVNC_AUTH_VENCRYPT) { - if (gvnc->auth_subtype == GVNC_AUTH_VENCRYPT_PLAIN || - gvnc->auth_subtype == GVNC_AUTH_VENCRYPT_TLSPLAIN || - gvnc->auth_subtype == GVNC_AUTH_VENCRYPT_X509PLAIN) - return TRUE; - } - - return FALSE; -} - -gboolean gvnc_wants_credential_x509(struct gvnc *gvnc) -{ - if (gvnc->auth_type == GVNC_AUTH_VENCRYPT) { - if (gvnc->auth_subtype == GVNC_AUTH_VENCRYPT_X509NONE || - gvnc->auth_subtype == GVNC_AUTH_VENCRYPT_X509PLAIN || - gvnc->auth_subtype == GVNC_AUTH_VENCRYPT_X509VNC) - return TRUE; - } - - return FALSE; -} - -static gboolean gvnc_has_credentials(gpointer data) -{ - struct gvnc *gvnc = (struct gvnc *)data; - - if (gvnc->has_error) - return TRUE; - if (gvnc_wants_credential_username(gvnc) && !gvnc->cred_username) - return FALSE; - if (gvnc_wants_credential_password(gvnc) && !gvnc->cred_password) - return FALSE; - /* - * For x509 we require a minimum of the CA cert. - * Anything else is a bonus - though the server - * may reject auth if it decides it wants a client - * cert. We can't express that based on auth type - * alone though - we'll merely find out when TLS - * negotiation takes place. - */ - if (gvnc_wants_credential_x509(gvnc) && !gvnc->cred_x509_cacert) - return FALSE; - return TRUE; -} - -static gboolean gvnc_gather_credentials(struct gvnc *gvnc) -{ - if (!gvnc_has_credentials(gvnc)) { - GVNC_DEBUG("Requesting missing credentials\n"); - if (gvnc->has_error || !gvnc->ops.auth_cred) { - gvnc->has_error = TRUE; - return TRUE; - } - if (!gvnc->ops.auth_cred(gvnc->ops_data)) - gvnc->has_error = TRUE; - if (gvnc->has_error) - return TRUE; - GVNC_DEBUG("Waiting for missing credentials\n"); - g_condition_wait(gvnc_has_credentials, gvnc); - GVNC_DEBUG("Got all credentials\n"); - } - return !gvnc_has_error(gvnc); -} static gboolean gvnc_has_auth_subtype(gpointer data) { @@ -2387,14 +3012,18 @@ static gboolean gvnc_perform_auth_tls(st GVNC_DEBUG("Could not start TLS\n"); return FALSE; } - GVNC_DEBUG("Completed TLS setup\n"); + GVNC_DEBUG("Completed TLS setup!!!\n"); nauth = gvnc_read_u8(gvnc); + GVNC_DEBUG("Got %d subauths\n", nauth); if (gvnc_has_error(gvnc)) return FALSE; - if (nauth == 0) + GVNC_DEBUG("Got %d subauths\n", nauth); + if (nauth == 0) { + GVNC_DEBUG("No sub-auth types requested\n"); return gvnc_check_auth_result(gvnc); + } if (nauth > sizeof(auth)) { GVNC_DEBUG("Too many (%d) auth types\n", nauth); @@ -2424,9 +3053,6 @@ static gboolean gvnc_perform_auth_tls(st GVNC_DEBUG("Choose auth %d\n", gvnc->auth_subtype); - if (!gvnc_gather_credentials(gvnc)) - return FALSE; - gvnc_write_u8(gvnc, gvnc->auth_subtype); gvnc_flush(gvnc); @@ -2437,6 +3063,10 @@ static gboolean gvnc_perform_auth_tls(st return TRUE; case GVNC_AUTH_VNC: return gvnc_perform_auth_vnc(gvnc); +#ifdef HAVE_SASL + case GVNC_AUTH_SASL: + return gvnc_perform_auth_sasl(gvnc); +#endif default: return FALSE; } @@ -2519,6 +3149,7 @@ static gboolean gvnc_perform_auth_vencry case GVNC_AUTH_VENCRYPT_TLSNONE: case GVNC_AUTH_VENCRYPT_TLSPLAIN: case GVNC_AUTH_VENCRYPT_TLSVNC: + case GVNC_AUTH_VENCRYPT_TLSSASL: anonTLS = 1; break; default: @@ -2529,7 +3160,7 @@ static gboolean gvnc_perform_auth_vencry GVNC_DEBUG("Could not start TLS\n"); return FALSE; } - GVNC_DEBUG("Completed TLS setup\n"); + GVNC_DEBUG("Completed TLS setup, do subauth %d\n", gvnc->auth_subtype); switch (gvnc->auth_subtype) { /* Plain certificate based auth */ @@ -2544,7 +3175,16 @@ static gboolean gvnc_perform_auth_vencry GVNC_DEBUG("Handing off to VNC auth\n"); return gvnc_perform_auth_vnc(gvnc); +#ifdef HAVE_SASL + /* SASL layered over TLS */ + case GVNC_AUTH_VENCRYPT_TLSSASL: + case GVNC_AUTH_VENCRYPT_X509SASL: + GVNC_DEBUG("Handing off to SASL auth\n"); + return gvnc_perform_auth_sasl(gvnc); +#endif + default: + GVNC_DEBUG("Unknown auth subtype %d\n", gvnc->auth_subtype); return FALSE; } } @@ -2626,6 +3266,11 @@ static gboolean gvnc_perform_auth(struct case GVNC_AUTH_VENCRYPT: return gvnc_perform_auth_vencrypt(gvnc); +#ifdef HAVE_SASL + case GVNC_AUTH_SASL: + return gvnc_perform_auth_sasl(gvnc); +#endif + default: if (gvnc->ops.auth_unsupported) gvnc->ops.auth_unsupported (gvnc->ops_data, gvnc->auth_type); @@ -2671,6 +3316,11 @@ void gvnc_close(struct gvnc *gvnc) gnutls_bye(gvnc->tls_session, GNUTLS_SHUT_RDWR); gvnc->tls_session = NULL; } +#if HAVE_SASL + if (gvnc->saslconn) + sasl_dispose (&gvnc->saslconn); +#endif + if (gvnc->channel) { g_io_channel_unref(gvnc->channel); gvnc->channel = NULL; @@ -2987,7 +3637,7 @@ gboolean gvnc_open_host(struct gvnc *gvn gboolean gvnc_set_auth_type(struct gvnc *gvnc, unsigned int type) { - GVNC_DEBUG("Requested auth type %u\n", type); + GVNC_DEBUG("Thinking about auth type %u", type); if (gvnc->auth_type != GVNC_AUTH_INVALID) { gvnc->has_error = TRUE; return !gvnc_has_error(gvnc); @@ -2995,13 +3645,16 @@ gboolean gvnc_set_auth_type(struct gvnc if (type != GVNC_AUTH_NONE && type != GVNC_AUTH_VNC && type != GVNC_AUTH_TLS && - type != GVNC_AUTH_VENCRYPT) { + type != GVNC_AUTH_VENCRYPT && + type != GVNC_AUTH_SASL) { + GVNC_DEBUG("Unsupported auth type %u", type); if (gvnc->ops.auth_unsupported) - gvnc->ops.auth_unsupported (gvnc->ops_data, type); + gvnc->ops.auth_unsupported (gvnc->ops_data, type); gvnc->has_error = TRUE; return !gvnc_has_error(gvnc); } + GVNC_DEBUG("Decided on auth type %u", type); gvnc->auth_type = type; gvnc->auth_subtype = GVNC_AUTH_INVALID; @@ -3027,7 +3680,7 @@ gboolean gvnc_set_auth_subtype(struct gv gboolean gvnc_set_credential_password(struct gvnc *gvnc, const char *password) { - GVNC_DEBUG("Set password credential\n"); + GVNC_DEBUG("Set password credential %s", password); if (gvnc->cred_password) g_free(gvnc->cred_password); if (!(gvnc->cred_password = g_strdup(password))) { @@ -3039,7 +3692,7 @@ gboolean gvnc_set_credential_password(st gboolean gvnc_set_credential_username(struct gvnc *gvnc, const char *username) { - GVNC_DEBUG("Set username credential %s\n", username); + GVNC_DEBUG("Set username credential %s", username); if (gvnc->cred_username) g_free(gvnc->cred_username); if (!(gvnc->cred_username = g_strdup(username))) { @@ -3051,7 +3704,7 @@ gboolean gvnc_set_credential_username(st gboolean gvnc_set_credential_x509_cacert(struct gvnc *gvnc, const char *file) { - GVNC_DEBUG("Set x509 cacert %s\n", file); + GVNC_DEBUG("Set x509 cacert %s", file); if (gvnc->cred_x509_cacert) g_free(gvnc->cred_x509_cacert); if (!(gvnc->cred_x509_cacert = g_strdup(file))) { diff -rup gtk-vnc-0.3.8.orig/src/gvnc.h gtk-vnc-0.3.8.new/src/gvnc.h --- gtk-vnc-0.3.8.orig/src/gvnc.h 2008-12-07 19:35:14.000000000 +0000 +++ gtk-vnc-0.3.8.new/src/gvnc.h 2009-03-03 10:13:25.000000000 +0000 @@ -128,7 +128,8 @@ typedef enum { GVNC_AUTH_TIGHT = 16, GVNC_AUTH_ULTRA = 17, GVNC_AUTH_TLS = 18, /* Used by VINO */ - GVNC_AUTH_VENCRYPT = 19 /* Used by VeNCrypt and QEMU */ + GVNC_AUTH_VENCRYPT = 19, /* Used by VeNCrypt and QEMU */ + GVNC_AUTH_SASL = 20, /* SASL type used by VINO and QEMU */ } gvnc_auth; typedef enum { @@ -139,6 +140,8 @@ typedef enum { GVNC_AUTH_VENCRYPT_X509NONE = 260, GVNC_AUTH_VENCRYPT_X509VNC = 261, GVNC_AUTH_VENCRYPT_X509PLAIN = 262, + GVNC_AUTH_VENCRYPT_X509SASL = 263, + GVNC_AUTH_VENCRYPT_TLSSASL = 264, } gvnc_auth_vencrypt; diff -rup gtk-vnc-0.3.8.orig/src/Makefile.am gtk-vnc-0.3.8.new/src/Makefile.am --- gtk-vnc-0.3.8.orig/src/Makefile.am 2008-12-07 19:35:14.000000000 +0000 +++ gtk-vnc-0.3.8.new/src/Makefile.am 2009-03-03 10:13:25.000000000 +0000 @@ -4,10 +4,10 @@ EXTRA_DIST = libgtk-vnc_sym.version vncm lib_LTLIBRARIES = libgtk-vnc-1.0.la libgtk_vnc_1_0_la_LIBADD = @GTK_LIBS@ @GNUTLS_LIBS@ \ - @GTHREAD_LIBS@ \ + @GTHREAD_LIBS@ @SASL_LIBS@ \ ../gnulib/lib/libgnu.la libgtk_vnc_1_0_la_CFLAGS = @GTK_CFLAGS@ @GNUTLS_CFLAGS@ \ - @GTHREAD_CFLAGS@ @WARNING_CFLAGS@ \ + @GTHREAD_CFLAGS@ @SASL_CFLAGS@ @WARNING_CFLAGS@ \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DG_LOG_DOMAIN=\"gtk-vnc\" \ -I$(top_srcdir)/gnulib/lib -I../gnulib/lib diff -rup gtk-vnc-0.3.8.orig/src/vncdisplay.c gtk-vnc-0.3.8.new/src/vncdisplay.c --- gtk-vnc-0.3.8.orig/src/vncdisplay.c 2009-03-03 10:13:12.000000000 +0000 +++ gtk-vnc-0.3.8.new/src/vncdisplay.c 2009-03-03 10:13:25.000000000 +0000 @@ -1904,9 +1904,23 @@ static void vnc_display_init(VncDisplay priv->shared_flag = FALSE; priv->force_size = TRUE; + /* + * Both these two provide TLS based auth, and can layer + * all the other auth types on top. So these two must + * be the first listed + */ priv->preferable_auths = g_slist_append (priv->preferable_auths, GUINT_TO_POINTER (GVNC_AUTH_VENCRYPT)); priv->preferable_auths = g_slist_append (priv->preferable_auths, GUINT_TO_POINTER (GVNC_AUTH_TLS)); + + /* + * Then stackable auth types in order of preference + */ + priv->preferable_auths = g_slist_append (priv->preferable_auths, GUINT_TO_POINTER (GVNC_AUTH_SASL)); priv->preferable_auths = g_slist_append (priv->preferable_auths, GUINT_TO_POINTER (GVNC_AUTH_VNC)); + + /* + * Or nothing at all + */ priv->preferable_auths = g_slist_append (priv->preferable_auths, GUINT_TO_POINTER (GVNC_AUTH_NONE)); priv->gvnc = gvnc_new(&vnc_display_ops, obj); Index: gtk-vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- gtk-vnc.spec 26 Feb 2009 14:32:23 -0000 1.28 +++ gtk-vnc.spec 3 Mar 2009 10:18:37 -0000 1.29 @@ -7,11 +7,12 @@ Summary: A GTK widget for VNC clients Name: gtk-vnc Version: 0.3.8 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: Development/Libraries Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.gz Patch1: %{name}-%{version}-relative-mouse.patch +Patch2: %{name}-%{version}-sasl-auth.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://live.gnome.org/gtk-vnc BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel @@ -69,6 +70,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build %if %{with_plugin} @@ -122,6 +124,9 @@ %endif %changelog +* Tue Mar 3 2009 Daniel P. Berrange - 0.3.8-5.fc11 +- Support SASL authentication extension + * Thu Feb 26 2009 Daniel P. Berrange - 0.3.8-4.fc11 - Fix relative mouse handling to avoid 'invisible wall' From giallu at fedoraproject.org Tue Mar 3 10:20:01 2009 From: giallu at fedoraproject.org (Gianluca Sforna) Date: Tue, 3 Mar 2009 10:20:01 +0000 (UTC) Subject: rpms/buildbot/devel .cvsignore, 1.6, 1.7 buildbot.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <20090303102001.6CE1B70116@cvs1.fedora.phx.redhat.com> Author: giallu Update of /cvs/extras/rpms/buildbot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31744 Modified Files: .cvsignore buildbot.spec sources Log Message: * Thu Feb 26 2009 Gianluca Sforna - 0.7.10p1-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/buildbot/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Feb 2009 00:31:35 -0000 1.6 +++ .cvsignore 3 Mar 2009 10:19:31 -0000 1.7 @@ -1 +1 @@ -buildbot-0.7.10.tar.gz +buildbot-0.7.10p1.tar.gz Index: buildbot.spec =================================================================== RCS file: /cvs/extras/rpms/buildbot/devel/buildbot.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- buildbot.spec 28 Feb 2009 00:31:35 -0000 1.11 +++ buildbot.spec 3 Mar 2009 10:19:31 -0000 1.12 @@ -1,7 +1,7 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: buildbot -Version: 0.7.10 +Version: 0.7.10p1 Release: 1%{?dist} Summary: Build/test automation system @@ -19,7 +19,8 @@ BuildRequires: python-twisted-web BuildRequires: python-twisted-mail BuildRequires: python-twisted-words -BuildRequires: bazaar +# Removed until http://buildbot.net/trac/ticket/434 is fixed +# BuildRequires: bazaar BuildRequires: bzr BuildRequires: cvs BuildRequires: darcs @@ -35,6 +36,7 @@ BuildArch: noarch + %description The BuildBot is a system to automate the compile/test cycle required by most software projects to validate code changes. By automatically @@ -45,13 +47,12 @@ %prep %setup -q + %build %{__python} setup.py build %check -# Had to disable this because of failures due to missing files -# Upstream is probably going to roll a 0.7.10.1 release soon -#trial buildbot.test +trial buildbot.test %install rm -rf %{buildroot} @@ -80,6 +81,9 @@ %changelog +* Tue Mar 3 2009 Gianluca Sforna - 0.7.10p1-1 +- New upstream release + * Thu Feb 26 2009 Gianluca Sforna - 0.7.10-1 - New upstream release - Drop upstreamed patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/buildbot/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Feb 2009 00:31:35 -0000 1.6 +++ sources 3 Mar 2009 10:19:31 -0000 1.7 @@ -1 +1 @@ -3a51f6ba8a852382863d1940cef89a46 buildbot-0.7.10.tar.gz +38475c54ff26ab4028cfd371b3f76c1f buildbot-0.7.10p1.tar.gz From caolanm at fedoraproject.org Tue Mar 3 10:22:28 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 10:22:28 +0000 (UTC) Subject: rpms/ctemplate/devel ctemplate-0.91.consts.patch, NONE, 1.1 ctemplate.spec, 1.3, 1.4 Message-ID: <20090303102228.576AA70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/ctemplate/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32418 Modified Files: ctemplate.spec Added Files: ctemplate-0.91.consts.patch Log Message: fix up consts to build ctemplate-0.91.consts.patch: --- NEW FILE ctemplate-0.91.consts.patch --- diff -ru ctemplate-0.91.orig/src/template.cc ctemplate-0.91/src/template.cc --- ctemplate-0.91.orig/src/template.cc 2009-03-03 10:01:11.000000000 +0000 +++ ctemplate-0.91/src/template.cc 2009-03-03 10:02:47.000000000 +0000 @@ -186,7 +186,7 @@ const char* match; const char* hayend = haystack + haystack_len - needle_len + 1; - while ((match = static_cast(memchr(haystack, needle[0], + while ((match = static_cast(memchr(haystack, needle[0], hayend - haystack)))) { if (memcmp(match, needle, needle_len) == 0) return match; @@ -2175,7 +2175,7 @@ bool Template::ParseDelimiters(const char* text, size_t textlen, MarkerDelimiters* delim) { - const char* space = reinterpret_cast(memchr(text, ' ', textlen)); + const char* space = reinterpret_cast(memchr(text, ' ', textlen)); if (textlen < 3 || text[0] != '=' || text[textlen - 1] != '=' || // no = at ends memchr(text + 1, '=', textlen - 2) || // = in the middle diff -ru ctemplate-0.91.orig/src/tests/htmlparser_test.cc ctemplate-0.91/src/tests/htmlparser_test.cc --- ctemplate-0.91.orig/src/tests/htmlparser_test.cc 2009-03-03 10:01:11.000000000 +0000 +++ ctemplate-0.91/src/tests/htmlparser_test.cc 2009-03-03 10:10:48.000000000 +0000 @@ -70,6 +70,7 @@ #include #include #include +#include #include #include #include @@ -113,7 +114,7 @@ static int strcount(const string& str, char c) { int count = 0; - for (char* p = strchr(str.c_str(), c); p; p = strchr(p+1, c)) + for (const char* p = strchr(str.c_str(), c); p; p = strchr(p+1, c)) count++; return count; } Index: ctemplate.spec =================================================================== RCS file: /cvs/pkgs/rpms/ctemplate/devel/ctemplate.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ctemplate.spec 24 Feb 2009 10:11:32 -0000 1.3 +++ ctemplate.spec 3 Mar 2009 10:21:58 -0000 1.4 @@ -1,12 +1,13 @@ Name: ctemplate Version: 0.91 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A simple but powerful template language for C++ Group: Development/Tools License: BSD URL: http://code.google.com/p/google-ctemplate/ Source0: http://google-ctemplate.googlecode.com/files/%{name}-%{version}.tar.gz +Patch0: ctemplate-0.91.consts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: chrpath @@ -27,6 +28,7 @@ %prep %setup -q +%patch0 -p1 -b .consts %build %configure --disable-static @@ -88,6 +90,9 @@ %{_includedir}/%{name}/*.h %changelog +* Tue Mar 03 2009 Caol??n McNamara - 0.91-5 +- fix up consts to build + * Tue Feb 24 2009 Fedora Release Engineering - 0.91-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From nphilipp at fedoraproject.org Tue Mar 3 10:28:13 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Tue, 3 Mar 2009 10:28:13 +0000 (UTC) Subject: rpms/convmv/devel .cvsignore, 1.5, 1.6 convmv.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <20090303102813.A53C370116@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/convmv/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1058 Modified Files: .cvsignore convmv.spec sources Log Message: version 1.14 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/convmv/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Feb 2008 13:32:41 -0000 1.5 +++ .cvsignore 3 Mar 2009 10:27:42 -0000 1.6 @@ -1 +1 @@ -convmv-1.12.tar.gz +convmv-1.14.tar.gz Index: convmv.spec =================================================================== RCS file: /cvs/pkgs/rpms/convmv/devel/convmv.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- convmv.spec 24 Feb 2009 09:07:34 -0000 1.12 +++ convmv.spec 3 Mar 2009 10:27:43 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Convert filename encodings Name: convmv -Version: 1.12 -Release: 2%{?dist} +Version: 1.14 +Release: 1%{?dist} Group: Applications/System License: GPLv2 or GPLv3 @@ -38,6 +38,9 @@ %{_mandir}/man*/* %changelog +* Tue Mar 03 2009 Nils Philippsen - 1.14-1 +- version 1.14 + * Tue Feb 24 2009 Fedora Release Engineering - 1.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/convmv/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 25 Feb 2008 13:32:41 -0000 1.5 +++ sources 3 Mar 2009 10:27:43 -0000 1.6 @@ -1 +1 @@ -f96ca9198fc0a2192920f5baf002dfe4 convmv-1.12.tar.gz +d41238051c13b2e6c0cc2310a8f69d68 convmv-1.14.tar.gz From berrange at fedoraproject.org Tue Mar 3 10:29:21 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Tue, 3 Mar 2009 10:29:21 +0000 (UTC) Subject: rpms/gtk-vnc/devel gtk-vnc.spec,1.29,1.30 Message-ID: <20090303102921.1014670116@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/gtk-vnc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1476 Modified Files: gtk-vnc.spec Log Message: Rerun autotools for patched configure.in Index: gtk-vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gtk-vnc.spec 3 Mar 2009 10:18:37 -0000 1.29 +++ gtk-vnc.spec 3 Mar 2009 10:29:20 -0000 1.30 @@ -24,6 +24,8 @@ BuildRequires: firefox-devel %endif %endif +# Temp hack for Patch2 +BuildRequires: automake autoconf libtool %description gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines @@ -73,6 +75,12 @@ %patch2 -p1 %build +# Temp hack for patch2 +libtoolize --copy --force +aclocal -I gnulib/m4 +autoheader +automake --add-missing --copy +autoconf %if %{with_plugin} %configure --enable-plugin=yes %else From xhorak at fedoraproject.org Tue Mar 3 10:30:08 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Tue, 3 Mar 2009 10:30:08 +0000 (UTC) Subject: rpms/thunderbird/devel xulrunner-elif.patch, NONE, 1.1 thunderbird-mozconfig, 1.12, 1.13 thunderbird.spec, 1.125, 1.126 Message-ID: <20090303103008.666BA70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/thunderbird/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1551 Modified Files: thunderbird-mozconfig thunderbird.spec Added Files: xulrunner-elif.patch Log Message: Trying to build on rawhide xulrunner-elif.patch: --- NEW FILE xulrunner-elif.patch --- diff -up mozilla/toolkit/xre/nsAppRunner.cpp.old mozilla/toolkit/xre/nsAppRunner.cpp --- mozilla/toolkit/xre/nsAppRunner.cpp.old 2008-12-10 20:07:01.000000000 +0100 +++ mozilla/toolkit/xre/nsAppRunner.cpp 2009-02-27 17:17:59.000000000 +0100 @@ -1475,7 +1475,7 @@ XRE_GetBinaryPath(const char* argv0, nsI if (NS_FAILED(rv)) return rv; -#elif +#else #error Oops, you need platform-specific code here #endif Index: thunderbird-mozconfig =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird-mozconfig,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- thunderbird-mozconfig 2 Mar 2009 14:23:59 -0000 1.12 +++ thunderbird-mozconfig 3 Mar 2009 10:29:37 -0000 1.13 @@ -1,7 +1,7 @@ mk_add_options MOZ_CO_PROJECT=mail ac_add_options --enable-application=mail mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/ -mk_add_options AUTOCONF=autoconf +mk_add_options AUTOCONF=autoconf-2.13 #ac_add_options --with-system-png Index: thunderbird.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- thunderbird.spec 2 Mar 2009 14:35:49 -0000 1.125 +++ thunderbird.spec 3 Mar 2009 10:29:37 -0000 1.126 @@ -2,6 +2,7 @@ %define nspr_version 4.6 %define nss_version 3.10 %define cairo_version 1.0 +%define dbus_glib_version 0.6 %define autoconf_version 2.13 %define official_branding 1 @@ -31,6 +32,7 @@ Patch1: mozilla-jemalloc.patch Patch2: thunderbird-shared-error.patch +Patch3: xulrunner-elif.patch %if %{official_branding} # Required by Mozilla Corporation @@ -49,15 +51,19 @@ %if 0%{?rhel} >= 5 Requires: launchmail %endif -BuildRequires: autoconf = %{autoconf_version} +BuildRequires: autoconf213 >= %{autoconf_version} +BuildRequires: alsa-lib-devel +BuildRequires: libcurl-devel BuildRequires: cairo-devel >= %{cairo_version} +BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: libpng-devel, libjpeg-devel, gtk2-devel BuildRequires: zlib-devel, gzip, zip, unzip BuildRequires: nspr-devel >= %{nspr_version} BuildRequires: nss-devel >= %{nss_version} BuildRequires: libIDL-devel BuildRequires: desktop-file-utils -BuildRequires: freetype-devel +BuildRequires: pango-devel >= 1.22 +BuildRequires: freetype-devel >= 2.1.9 BuildRequires: libXt-devel BuildRequires: libXrender-devel Requires: desktop-file-utils >= %{desktop_file_utils_version} @@ -79,6 +85,7 @@ %patch1 -p0 -b .jemalloc %patch2 -p1 -b .shared-error +%patch3 -p0 -b .xulrunner-elif %if %{official_branding} # Required by Mozilla Corporation From ltinkl at fedoraproject.org Tue Mar 3 10:31:36 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Tue, 3 Mar 2009 10:31:36 +0000 (UTC) Subject: rpms/kdebase-runtime/F-10 kdebase-runtime-4.2.1-pulseaudio-cmake.patch, NONE, 1.1 kdebase-runtime.spec, 1.84, 1.85 Message-ID: <20090303103136.D17E270116@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase-runtime/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1839/F-10 Modified Files: kdebase-runtime.spec Added Files: kdebase-runtime-4.2.1-pulseaudio-cmake.patch Log Message: fix PulseAudio cmake detection kdebase-runtime-4.2.1-pulseaudio-cmake.patch: --- NEW FILE kdebase-runtime-4.2.1-pulseaudio-cmake.patch --- Index: runtime/cmake/modules/FindPulseAudio.cmake =================================================================== --- runtime/cmake/modules/FindPulseAudio.cmake (revision 933025) +++ runtime/cmake/modules/FindPulseAudio.cmake (revision 933026) @@ -30,8 +30,8 @@ FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h HINTS - ${PC_PULSEADUIO_INCLUDEDIR} - ${PC_PULSEADUIO_INCLUDE_DIRS} + ${PC_PULSEAUDIO_INCLUDEDIR} + ${PC_PULSEAUDIO_INCLUDE_DIRS} ) FIND_LIBRARY(PULSEAUDIO_LIBRARY NAMES pulse libpulse Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- kdebase-runtime.spec 27 Feb 2009 15:52:26 -0000 1.84 +++ kdebase-runtime.spec 3 Mar 2009 10:31:06 -0000 1.85 @@ -6,7 +6,7 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: User Interface/Desktops @@ -21,6 +21,7 @@ Patch3: kdebase-runtime-4.1.1-iconthemes-inherit.patch ## Upstream patches +Patch100: kdebase-runtime-4.2.1-pulseaudio-cmake.patch %ifarch noarch %define icons 1 @@ -108,6 +109,7 @@ %patch3 -p1 -b .iconthemes-inherit # upstream patches +%patch100 -p1 -b .pulseaudio-cmake %build mkdir -p %{_target_platform} @@ -334,7 +336,10 @@ %changelog -* Fri Feb 27 2009 Luk???? Tinkl - 4.2.1-1 +* Tue Mar 3 2009 Luk???? Tinkl - 4.2.1-2 +- fix PulseAudio cmake detection + +* Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 * Wed Feb 25 2009 Fedora Release Engineering - 4.2.0-8 From ltinkl at fedoraproject.org Tue Mar 3 10:31:37 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Tue, 3 Mar 2009 10:31:37 +0000 (UTC) Subject: rpms/kdebase-runtime/F-9 kdebase-runtime-4.2.1-pulseaudio-cmake.patch, NONE, 1.1 kdebase-runtime.spec, 1.66, 1.67 Message-ID: <20090303103137.362C570116@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase-runtime/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1839/F-9 Modified Files: kdebase-runtime.spec Added Files: kdebase-runtime-4.2.1-pulseaudio-cmake.patch Log Message: fix PulseAudio cmake detection kdebase-runtime-4.2.1-pulseaudio-cmake.patch: --- NEW FILE kdebase-runtime-4.2.1-pulseaudio-cmake.patch --- Index: runtime/cmake/modules/FindPulseAudio.cmake =================================================================== --- runtime/cmake/modules/FindPulseAudio.cmake (revision 933025) +++ runtime/cmake/modules/FindPulseAudio.cmake (revision 933026) @@ -30,8 +30,8 @@ FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h HINTS - ${PC_PULSEADUIO_INCLUDEDIR} - ${PC_PULSEADUIO_INCLUDE_DIRS} + ${PC_PULSEAUDIO_INCLUDEDIR} + ${PC_PULSEAUDIO_INCLUDE_DIRS} ) FIND_LIBRARY(PULSEAUDIO_LIBRARY NAMES pulse libpulse Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- kdebase-runtime.spec 27 Feb 2009 15:52:27 -0000 1.66 +++ kdebase-runtime.spec 3 Mar 2009 10:31:06 -0000 1.67 @@ -6,7 +6,7 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: User Interface/Desktops @@ -21,6 +21,7 @@ Patch3: kdebase-runtime-4.1.1-iconthemes-inherit.patch ## Upstream patches +Patch100: kdebase-runtime-4.2.1-pulseaudio-cmake.patch %ifarch noarch %define icons 1 @@ -108,6 +109,7 @@ %patch3 -p1 -b .iconthemes-inherit # upstream patches +%patch100 -p1 -b .pulseaudio-cmake %build mkdir -p %{_target_platform} @@ -334,7 +336,10 @@ %changelog -* Fri Feb 27 2009 Luk???? Tinkl - 4.2.1-1 +* Tue Mar 3 2009 Luk???? Tinkl - 4.2.1-2 +- fix PulseAudio cmake detection + +* Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 * Wed Feb 25 2009 Fedora Release Engineering - 4.2.0-8 From ltinkl at fedoraproject.org Tue Mar 3 10:31:37 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Tue, 3 Mar 2009 10:31:37 +0000 (UTC) Subject: rpms/kdebase-runtime/devel kdebase-runtime-4.2.1-pulseaudio-cmake.patch, NONE, 1.1 kdebase-runtime.spec, 1.97, 1.98 Message-ID: <20090303103137.8E00770116@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase-runtime/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1839/devel Modified Files: kdebase-runtime.spec Added Files: kdebase-runtime-4.2.1-pulseaudio-cmake.patch Log Message: fix PulseAudio cmake detection kdebase-runtime-4.2.1-pulseaudio-cmake.patch: --- NEW FILE kdebase-runtime-4.2.1-pulseaudio-cmake.patch --- Index: runtime/cmake/modules/FindPulseAudio.cmake =================================================================== --- runtime/cmake/modules/FindPulseAudio.cmake (revision 933025) +++ runtime/cmake/modules/FindPulseAudio.cmake (revision 933026) @@ -30,8 +30,8 @@ FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h HINTS - ${PC_PULSEADUIO_INCLUDEDIR} - ${PC_PULSEADUIO_INCLUDE_DIRS} + ${PC_PULSEAUDIO_INCLUDEDIR} + ${PC_PULSEAUDIO_INCLUDE_DIRS} ) FIND_LIBRARY(PULSEAUDIO_LIBRARY NAMES pulse libpulse Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- kdebase-runtime.spec 27 Feb 2009 11:56:16 -0000 1.97 +++ kdebase-runtime.spec 3 Mar 2009 10:31:07 -0000 1.98 @@ -6,7 +6,7 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: User Interface/Desktops @@ -21,6 +21,7 @@ Patch3: kdebase-runtime-4.1.1-iconthemes-inherit.patch ## Upstream patches +Patch100: kdebase-runtime-4.2.1-pulseaudio-cmake.patch %ifarch noarch %define icons 1 @@ -108,6 +109,7 @@ %patch3 -p1 -b .iconthemes-inherit # upstream patches +%patch100 -p1 -b .pulseaudio-cmake %build mkdir -p %{_target_platform} @@ -334,6 +336,9 @@ %changelog +* Tue Mar 3 2009 Luk???? Tinkl - 4.2.1-2 +- fix PulseAudio cmake detection + * Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 From hadess at fedoraproject.org Tue Mar 3 10:36:05 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 3 Mar 2009 10:36:05 +0000 (UTC) Subject: rpms/hal-info/devel hal-info.spec,1.38,1.39 Message-ID: <20090303103605.71F9D70116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/hal-info/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3511 Modified Files: hal-info.spec Log Message: * Tue Mar 03 2009 - Bastien Nocera - 20090202-3 - Remove the Dell native killswitches, replaced by the kernel killswitches in dell_laptop (#488177) Index: hal-info.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- hal-info.spec 25 Feb 2009 03:17:18 -0000 1.38 +++ hal-info.spec 3 Mar 2009 10:35:35 -0000 1.39 @@ -1,7 +1,7 @@ Summary: Device information files for HAL Name: hal-info Version: 20090202 -Release: 2%{?dist} +Release: 3%{?dist} License: AFL or GPLv2 Group: System Environment/Libraries URL: http://www.freedesktop.org/Software/hal @@ -23,7 +23,7 @@ %setup -q %build -%configure +%configure --enable-killswitch-dell-wlan=no --enable-killswitch-dell-bluetooth=no --enable-killswitch-dell-wwan=no %install rm -rf $RPM_BUILD_ROOT @@ -42,6 +42,10 @@ %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi %changelog +* Tue Mar 03 2009 - Bastien Nocera - 20090202-3 +- Remove the Dell native killswitches, replaced by the kernel killswitches + in dell_laptop (#488177) + * Tue Feb 24 2009 Fedora Release Engineering - 20090202-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From nphilipp at fedoraproject.org Tue Mar 3 10:40:04 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Tue, 3 Mar 2009 10:40:04 +0000 (UTC) Subject: rpms/gtkimageview/devel .cvsignore, 1.4, 1.5 gtkimageview.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <20090303104004.4548B70116@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/gtkimageview/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4603 Modified Files: .cvsignore gtkimageview.spec sources Log Message: version 1.6.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtkimageview/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Jul 2008 09:02:36 -0000 1.4 +++ .cvsignore 3 Mar 2009 10:39:33 -0000 1.5 @@ -1 +1 @@ -gtkimageview-1.6.1.tar.gz +gtkimageview-1.6.3.tar.gz Index: gtkimageview.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkimageview/devel/gtkimageview.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gtkimageview.spec 25 Feb 2009 02:21:02 -0000 1.6 +++ gtkimageview.spec 3 Mar 2009 10:39:33 -0000 1.7 @@ -1,6 +1,6 @@ Name: gtkimageview -Version: 1.6.1 -Release: 3%{?dist} +Version: 1.6.3 +Release: 1%{?dist} Summary: Simple image viewer widget Group: System Environment/Libraries @@ -70,6 +70,9 @@ %{_libdir}/pkgconfig/gtkimageview.pc %changelog +* Tue Mar 03 2009 Nils Philippsen - 1.6.3-1 +- version 1.6.3 + * Tue Feb 24 2009 Fedora Release Engineering - 1.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtkimageview/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Jul 2008 09:02:36 -0000 1.4 +++ sources 3 Mar 2009 10:39:33 -0000 1.5 @@ -1 +1 @@ -311ae45afc721186cbe346b38341fef7 gtkimageview-1.6.1.tar.gz +9c241ecf36faeb750d42c5cbc1301bcf gtkimageview-1.6.3.tar.gz From caolanm at fedoraproject.org Tue Mar 3 10:42:56 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 10:42:56 +0000 (UTC) Subject: rpms/barry/devel barry-includes.patch, NONE, 1.1 barry.spec, 1.13, 1.14 Message-ID: <20090303104256.2563870116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/barry/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5136 Modified Files: barry.spec Added Files: barry-includes.patch Log Message: fix up extra includes and consts for gcc44 barry-includes.patch: --- NEW FILE barry-includes.patch --- diff -ru barry-0.15.orig/src/base64.cc barry-0.15/src/base64.cc --- barry-0.15.orig/src/base64.cc 2009-03-03 10:07:23.000000000 +0000 +++ barry-0.15/src/base64.cc 2009-03-03 10:07:52.000000000 +0000 @@ -13,6 +13,7 @@ #include "base64.h" #include #include +#include #define TRUE 1 #define FALSE 0 diff -ru barry-0.15.orig/src/error.h barry-0.15/src/error.h --- barry-0.15.orig/src/error.h 2009-03-03 10:07:24.000000000 +0000 +++ barry-0.15/src/error.h 2009-03-03 10:20:31.000000000 +0000 @@ -24,6 +24,7 @@ #include "dll.h" #include +#include namespace Barry { diff -ru barry-0.15.orig/src/record.cc barry-0.15/src/record.cc --- barry-0.15.orig/src/record.cc 2009-03-03 10:07:23.000000000 +0000 +++ barry-0.15/src/record.cc 2009-03-03 10:30:09.000000000 +0000 @@ -36,6 +36,7 @@ #include #include #include +#include #include #define __DEBUG_MODE__ Index: barry.spec =================================================================== RCS file: /cvs/pkgs/rpms/barry/devel/barry.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- barry.spec 24 Feb 2009 04:08:33 -0000 1.13 +++ barry.spec 3 Mar 2009 10:42:25 -0000 1.14 @@ -6,7 +6,7 @@ Name: barry Version: 0.15 -Release: 0.4.20090109git%{?dist} +Release: 0.5.20090109git%{?dist} Summary: BlackBerry Desktop for Linux Group: Applications/Productivity @@ -24,6 +24,7 @@ # ip_modem password patch for the Blackberry Bold 9000 # http://sourceforge.net/mailarchive/forum.php?thread_name=4968F513.1050909%40comcast.net&forum_name=barry-devel Patch0: barry-ipmodem.patch +Patch1: barry-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel boost-devel desktop-file-utils gtkmm24-devel @@ -99,6 +100,7 @@ %{__rm} -rf ./doc/www/doxygen/html/breset_8cc__incl.map %{__rm} -rf ./doc/www/doxygen/html/endian_8h__incl.map %patch0 -p1 +%patch1 -p1 %build @@ -201,6 +203,9 @@ %postun libs -p /sbin/ldconfig %changelog +* Tue Mar 03 2009 Caol??n McNamara - 0.15-0.5.20090109git +- include stdio.h for EOF + * Mon Feb 23 2009 Fedora Release Engineering - 0.15-0.4.20090109git - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From sindrepb at fedoraproject.org Tue Mar 3 10:49:52 2009 From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=) Date: Tue, 3 Mar 2009 10:49:52 +0000 (UTC) Subject: rpms/gnome-do/devel gnome-do.spec,1.29,1.30 Message-ID: <20090303104952.E308770116@cvs1.fedora.phx.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/gnome-do/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6334 Modified Files: gnome-do.spec Log Message: own datadir Index: gnome-do.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gnome-do.spec 24 Feb 2009 22:52:27 -0000 1.29 +++ gnome-do.spec 3 Mar 2009 10:49:22 -0000 1.30 @@ -3,7 +3,7 @@ Name: gnome-do Version: %{mainver} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Quick launch and search License: GPLv3+ @@ -73,6 +73,9 @@ --add-only-show-in=GNOME \ $RPM_BUILD_ROOT%{_datadir}/applications/gnome-do.desktop +#own this dir: +mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} + %find_lang %{name} %pre @@ -113,6 +116,7 @@ %doc AUTHORS COPYING COPYRIGHT %{_bindir}/gnome-do/ %{_libdir}/gnome-do/ +%dir %{_datadir}/gnome-do/ %config(noreplace) %{_sysconfdir}/xdg/autostart/gnome-do.desktop %config(noreplace) %{_sysconfdir}/gconf/schemas/* %{_datadir}/icons/hicolor/*/apps/gnome-do.* @@ -122,6 +126,8 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Mar 3 2009 Sindre Pedersen Bj??rdal - 0.8.0-4 +- Own _datadir/gnome-do * Tue Feb 24 2009 Fedora Release Engineering - 0.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From berrange at fedoraproject.org Tue Mar 3 10:52:53 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Tue, 3 Mar 2009 10:52:53 +0000 (UTC) Subject: rpms/qemu/devel qemu-0.9.1-alpha-int.patch, 1.1, NONE qemu-0.9.1-block-rw-range-check.patch, 1.2, NONE qemu-0.9.1-build.patch, 1.1, NONE qemu-0.9.1-dirent.patch, 1.1, NONE qemu-0.9.1-nic-defaults.patch, 1.1, NONE qemu-0.9.1-pty-rawmode.patch, 1.1, NONE qemu-0.9.1-sparc-configure.patch, 1.1, NONE Message-ID: <20090303105253.3DBCF70116@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/extras/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7018 Removed Files: qemu-0.9.1-alpha-int.patch qemu-0.9.1-block-rw-range-check.patch qemu-0.9.1-build.patch qemu-0.9.1-dirent.patch qemu-0.9.1-nic-defaults.patch qemu-0.9.1-pty-rawmode.patch qemu-0.9.1-sparc-configure.patch Log Message: Remove unused patches --- qemu-0.9.1-alpha-int.patch DELETED --- --- qemu-0.9.1-block-rw-range-check.patch DELETED --- --- qemu-0.9.1-build.patch DELETED --- --- qemu-0.9.1-dirent.patch DELETED --- --- qemu-0.9.1-nic-defaults.patch DELETED --- --- qemu-0.9.1-pty-rawmode.patch DELETED --- --- qemu-0.9.1-sparc-configure.patch DELETED --- From hadess at fedoraproject.org Tue Mar 3 10:55:13 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 3 Mar 2009 10:55:13 +0000 (UTC) Subject: rpms/hal/devel hal-remove-dell-killswitch.patch, NONE, 1.1 hal.spec, 1.185, 1.186 Message-ID: <20090303105513.7CCF070116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/hal/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7321 Modified Files: hal.spec Added Files: hal-remove-dell-killswitch.patch Log Message: * Tue Mar 03 2009 - Bastien Nocera - 0.5.12-23.20090226git - Remove Dell killswitches support, they're handled through the kernel's dell_laptop module instead now (#488177), removes requires for smbios-utils hal-remove-dell-killswitch.patch: --- NEW FILE hal-remove-dell-killswitch.patch --- diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux --- hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux 2008-08-22 07:34:47.000000000 +0100 +++ hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux 2009-03-03 10:45:20.000000000 +0000 @@ -8,11 +8,6 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -DELL_WCTL=/usr/bin/dellWirelessCtl -if [ -x "/usr/sbin/dellWirelessCtl" ]; then - DELL_WCTL=/usr/sbin/dellWirelessCtl -fi - if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then value="`hal-system-sonypic getbluetooth`" @@ -22,25 +17,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue exit 1 fi exit ${value} - elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then - if [ -x "$DELL_WCTL" ]; then - # TODO: write our own binary that links with libsmbios? - $DELL_WCTL --st_bt - value=$? - if [ "$value" = "0" ]; then - exit 1 - elif [ "$value" = "1" ]; then - exit 0 - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "dellWirelessCtl returned $value" >&2 - exit 1 - fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 - exit 1 - fi elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -r "$HAL_PROP_LINUX_SYSFS_PATH" ]; then read value < $HAL_PROP_LINUX_SYSFS_PATH 2> /dev/null if [ $? -eq 0 ]; then @@ -55,56 +31,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue echo "Access type not supported" >&2 exit 1 fi -elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then - if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then - if [ -x "$DELL_WCTL" ]; then - # TODO: write our own binary that links with libsmbios? - $DELL_WCTL --st_wlan - value=$? - if [ "$value" = "0" ]; then - exit 1 - elif [ "$value" = "1" ]; then - exit 0 - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "dellWirelessCtl returned $value" >&2 - exit 1 - fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 - exit 1 - fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "Access type not supported" >&2 - exit 1 - fi -elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then - if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then - if [ -x "$DELL_WCTL" ]; then - # TODO: write our own binary that links with libsmbios? - $DELL_WCTL --st_wwan - value=$? - if [ "$value" = "0" ]; then - exit 1 - elif [ "$value" = "1" ]; then - exit 0 - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "dellWirelessCtl returned $value" >&2 - exit 1 - fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 - exit 1 - fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "Access type not supported" >&2 - exit 1 - fi else echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 echo "Killswitch type not supported" >&2 diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux --- hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux 2008-10-24 09:45:54.000000000 +0100 +++ hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux 2009-03-03 10:44:49.000000000 +0000 @@ -8,11 +8,6 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -DELL_WCTL=/usr/bin/dellWirelessCtl -if [ -x "/usr/sbin/dellWirelessCtl" ]; then - DELL_WCTL=/usr/sbin/dellWirelessCtl -fi - if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then hal-system-sonypic setbluetooth $value @@ -23,26 +18,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue exit 1 fi exit 0 - elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then - if [ -x "$DELL_WCTL" ]; then - # TODO: write our own binary that links with libsmbios? - if [ "$value" = "true" ]; then - $DELL_WCTL --bt 1 - ret=$? - else - $DELL_WCTL --bt 0 - ret=$? - fi - if [ "$ret" != "0" ]; then - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "dellWirelessCtl returned $ret" >&2 - exit 1 - fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 - exit 1 - fi elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -w "$HAL_PROP_LINUX_SYSFS_PATH" ]; then if [ "$value" = "true" ]; then bit=1; @@ -61,60 +36,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue echo "Access type not supported" >&2 exit 1 fi -elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then - if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then - if [ -x "$DELL_WCTL" ]; then - # As a side effect we disable the physical kill switch - # TODO: write our own binary that links with libsmbios? - if [ "$value" = "true" ]; then - $DELL_WCTL --sw_wlan 0 --wlan 1 - ret=$? - else - $DELL_WCTL --sw_wlan 0 --wlan 0 - ret=$? - fi - if [ "$ret" != "0" ]; then - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "dellWirelessCtl returned $ret" >&2 - exit 1 - fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 - exit 1 - fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "Access type not supported" >&2 - exit 1 - fi -elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then - if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then - if [ -x "$DELL_WCTL" ]; then - # As a side effect we disable the physical kill switch - # TODO: write our own binary that links with libsmbios? - if [ "$value" = "true" ]; then - $DELL_WCTL --sw_wwan 0 --wwan 1 - ret=$? - else - $DELL_WCTL --sw_wwan 0 --wwan 0 - ret=$? - fi - if [ "$ret" != "0" ]; then - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "dellWirelessCtl returned $ret" >&2 - exit 1 - fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 - exit 1 - fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "Access type not supported" >&2 - exit 1 - fi else echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 echo "Killswitch type not supported" >&2 Index: hal.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- hal.spec 3 Mar 2009 03:09:32 -0000 1.185 +++ hal.spec 3 Mar 2009 10:54:43 -0000 1.186 @@ -28,7 +28,7 @@ Name: hal Version: 0.5.12 #Release: 14%{?dist} -Release: 22.%{?alphatag}%{?dist} +Release: 23.%{?alphatag}%{?dist} URL: http://www.freedesktop.org/Software/hal #Source0: http://hal.freedesktop.org/releases/%{name}-%{version}rc1.tar.bz2 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz @@ -40,6 +40,9 @@ Patch2: hal-change-priority.patch Patch3: hal-add-keys-to-buttons.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=488177 +Patch4: hal-remove-dell-killswitch.patch + Patch7: hal-tablet-evdev.patch # upstream @@ -93,7 +96,6 @@ %endif %ifarch %{ix86} x86_64 Requires: dmidecode >= %{dmidecode_version} -Requires: smbios-utils %endif Requires: ConsoleKit >= %{consolekit_version} Requires: PolicyKit >= %{policykit_version} @@ -141,6 +143,7 @@ %patch1 -p1 -b .direct %patch2 -p1 -b .priority %patch3 -p1 -b .keys +%patch4 -p1 -b .dell-killswitch %patch7 -p1 -b .tablet-evdev %patch8 -p1 -b .fix-udev @@ -293,6 +296,10 @@ %{_datadir}/gtk-doc/html/libhal-storage/* %changelog +* Tue Mar 03 2009 - Bastien Nocera - 0.5.12-23.20090226git +- Remove Dell killswitches support, they're handled through the kernel's + dell_laptop module instead now (#488177), removes requires for smbios-utils + * Tue Mar 03 2009 Peter Hutterer - purge hal-tablet.patch: fixed upstream in a different manner, see b0a2575f1. From airlied at fedoraproject.org Tue Mar 3 11:03:52 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 3 Mar 2009 11:03:52 +0000 (UTC) Subject: rpms/kernel/devel git-linus.diff, 1.15, 1.16 kernel.spec, 1.1365, 1.1366 Message-ID: <20090303110353.12D4070117@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9018 Modified Files: git-linus.diff kernel.spec Log Message: * Tue Mar 03 2009 Dave Airlie - pull patch from Linus to fix build git-linus.diff: Index: git-linus.diff =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- git-linus.diff 27 Jan 2009 02:39:41 -0000 1.15 +++ git-linus.diff 3 Mar 2009 11:03:50 -0000 1.16 @@ -0,0 +1,77 @@ +From 2450cf51a1bdba7037e91b1bcc494b01c58aaf66 Mon Sep 17 00:00:00 2001 +From: Linus Torvalds +Date: Mon, 2 Mar 2009 16:23:33 -0800 +Subject: [PATCH] Revert "menu: fix embedded menu snafu" + +This reverts commit 155b25bcc28631a5b5230191aa3f56c40dfffa3f, which was +totally wrong - the "embedded" options still exists (very much so) even +on non-embedded platforms. + +It's just that we don't bother with actually asking about them when +we're not embedded, we just take their default values (which is usually +'y' - the options add features that may not be worth it in a constrained +environment). + +Noticed-by: Andrew Morton +Cc: Randy Dunlap +Signed-off-by: Linus Torvalds +--- + init/Kconfig | 28 ++++++++++++---------------- + 1 files changed, 12 insertions(+), 16 deletions(-) + +diff --git a/init/Kconfig b/init/Kconfig +index 9000316..f068071 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -683,8 +683,6 @@ menuconfig EMBEDDED + environments which can tolerate a "non-standard" kernel. + Only use this if you really know what you are doing. + +-if EMBEDDED +- + config UID16 + bool "Enable 16-bit UID system calls" if EMBEDDED + depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION) +@@ -782,6 +780,18 @@ config PCSPKR_PLATFORM + This option allows to disable the internal PC-Speaker + support, saving some memory. + ++config COMPAT_BRK ++ bool "Disable heap randomization" ++ default y ++ help ++ Randomizing heap placement makes heap exploits harder, but it ++ also breaks ancient binaries (including anything libc5 based). ++ This option changes the bootup default to heap randomization ++ disabled, and can be overriden runtime by setting ++ /proc/sys/kernel/randomize_va_space to 2. ++ ++ On non-ancient distros (post-2000 ones) N is usually a safe choice. ++ + config BASE_FULL + default y + bool "Enable full-sized data structures for core" if EMBEDDED +@@ -887,20 +897,6 @@ config SLUB_DEBUG + SLUB sysfs support. /sys/slab will not exist and there will be + no support for cache validation etc. + +-endif # EMBEDDED +- +-config COMPAT_BRK +- bool "Disable heap randomization" +- default y +- help +- Randomizing heap placement makes heap exploits harder, but it +- also breaks ancient binaries (including anything libc5 based). +- This option changes the bootup default to heap randomization +- disabled, and can be overriden runtime by setting +- /proc/sys/kernel/randomize_va_space to 2. +- +- On non-ancient distros (post-2000 ones) N is usually a safe choice. +- + choice + prompt "Choose SLAB allocator" + default SLUB +-- +1.5.5.1 + Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1365 retrieving revision 1.1366 diff -u -r1.1365 -r1.1366 --- kernel.spec 3 Mar 2009 10:01:15 -0000 1.1365 +++ kernel.spec 3 Mar 2009 11:03:51 -0000 1.1366 @@ -1785,6 +1785,9 @@ # and build. %changelog +* Tue Mar 03 2009 Dave Airlie +- pull patch from Linus to fix build + * Tue Mar 03 2009 Ben Skeggs - nouveau: some gf8/9 and kms fixes From nphilipp at fedoraproject.org Tue Mar 3 11:07:43 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Tue, 3 Mar 2009 11:07:43 +0000 (UTC) Subject: rpms/convmv/devel convmv.spec,1.13,1.14 Message-ID: <20090303110744.11E1F70116@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/convmv/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10307 Modified Files: convmv.spec Log Message: temporarily disable "make test" to workaround problems in koji Index: convmv.spec =================================================================== RCS file: /cvs/pkgs/rpms/convmv/devel/convmv.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- convmv.spec 3 Mar 2009 10:27:43 -0000 1.13 +++ convmv.spec 3 Mar 2009 11:07:13 -0000 1.14 @@ -22,7 +22,7 @@ make %check -make test +#make test %install rm -rf %{buildroot} @@ -40,6 +40,7 @@ %changelog * Tue Mar 03 2009 Nils Philippsen - 1.14-1 - version 1.14 +- temporarily disable "make test" to workaround problems in koji * Tue Feb 24 2009 Fedora Release Engineering - 1.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From than at fedoraproject.org Tue Mar 3 11:15:05 2009 From: than at fedoraproject.org (Than Ngo) Date: Tue, 3 Mar 2009 11:15:05 +0000 (UTC) Subject: rpms/qt/devel .cvsignore, 1.50, 1.51 qt.spec, 1.241, 1.242 sources, 1.51, 1.52 qt-x11-opensource-src-4.5.0-rc1-misc.patch, 1.2, NONE qt-x11-opensource-src-4.5.0-rc1-ppc64.patch, 1.1, NONE Message-ID: <20090303111505.A572F70116@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11522 Modified Files: .cvsignore qt.spec sources Removed Files: qt-x11-opensource-src-4.5.0-rc1-misc.patch qt-x11-opensource-src-4.5.0-rc1-ppc64.patch Log Message: 4.5.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qt/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 27 Feb 2009 19:32:21 -0000 1.50 +++ .cvsignore 3 Mar 2009 11:14:33 -0000 1.51 @@ -2,3 +2,5 @@ hi48-app-qt4-logo.png qt-copy-patches-20090220svn.tar.bz2 qt-x11-opensource-src-4.5.0-snapshot-20090224.tar.gz +qt-x11-opensource-src-4.5.0.tar.bz2 +qt-copy-patches-20090303svn.tar.bz2 Index: qt.spec =================================================================== RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v retrieving revision 1.241 retrieving revision 1.242 diff -u -r1.241 -r1.242 --- qt.spec 1 Mar 2009 20:52:19 -0000 1.241 +++ qt.spec 3 Mar 2009 11:14:34 -0000 1.242 @@ -1,7 +1,4 @@ # Fedora Review: http://bugzilla.redhat.com/188180 -#define pre rc1 -%define snap 20090224 -%define pre snapshot-%{snap} # configure options # -no-pch disables precompiled headers, make ccache-friendly @@ -15,21 +12,16 @@ Name: qt4 %endif Version: 4.5.0 -Release: 0.8.%{snap}%{?dist} +Release: 1%{?dist} ## for 4.5.0 final: ##License: LGPLv2 or GPLv3 with exceptions ## but, until then, # see GPL_EXCEPTIONS*.txt License: GPLv3 with exceptions or GPLv2 with exceptions - Group: System Environment/Libraries Url: http://www.qtsoftware.com/ -%if 0%{?snap:1} -Source0: ftp://ftp.trolltech.no/qt/snapshots/qt-x11-opensource-src-%{version}-snapshot-%{snap}.tar.gz -%else -Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}%{?pre:-%{pre}}}.tar.bz2 -%endif +Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{name}" != "qt4" @@ -51,15 +43,13 @@ # under GNOME, default to QGtkStyle if available # (otherwise fall back to QCleanlooksStyle) Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch -patch11: qt-x11-opensource-src-4.5.0-rc1-misc.patch -Patch12: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch ## upstreamable bits # http://bugzilla.redhat.com/485677 Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch ## qt-copy patches -%define qt_copy 20090220 +%define qt_copy 20090303 Source1: qt-copy-patches-svn_checkout.sh %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2} %{?qt_copy:Provides: qt-copy = %{qt_copy}} @@ -304,14 +294,11 @@ %prep -%setup -q -n qt-x11-opensource-src-%{version}%{?pre:-%{pre}} %{?qt_copy:-a 2} +%setup -q -n qt-x11-opensource-src-%{version} %{?qt_copy:-a 2} %if 0%{?qt_copy} echo "0250" >> patches/DISABLED -%if 0%{?snap} >= 20090224 echo "0272" >> patches/DISABLED -%endif - test -x apply_patches && ./apply_patches %endif @@ -323,10 +310,6 @@ %endif %patch5 -p1 -b .bz#437440-as_IN-437440 %patch9 -p1 -b .qgtkstyle -%if 0%{?snap} < 20090224 -%patch11 -p1 -b .misc -%patch12 -p1 -b .ppc64 -%endif %patch50 -p1 -b .qhostaddress @@ -370,11 +353,6 @@ %build -# workaround snapshot "can't find libQtXml.so.4" in docs generation -#if 0%{?snap:1} -export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" -#endif - # build shared, threaded (default) libraries ./configure -v \ -confirm-license \ @@ -431,25 +409,12 @@ make %{?_smp_mflags} -# snapshot doesn't generate docs by default for some reason -#if 0%{?snap:1} -test -d doc/html || make docs -#endif - %install rm -rf %{buildroot} make install INSTALL_ROOT=%{buildroot} -# snapshot install_htmldocs install_pchdocs targets broken too, qmake bug? -#if %{?snap:1} -test -d %{buildroot}%{_qt4_docdir}/html || \ - cp -a doc/html/ %{buildroot}%{_qt4_docdir}/ -test -d %{buildroot}%{_qt4_docdir}/qch || \ - cp -a doc/qch/ %{buildroot}%{_qt4_docdir}/ -#endif - # Add desktop file(s) desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ @@ -818,6 +783,9 @@ %changelog +* Tue Mar 03 2009 Than Ngo - 4.5.0-1 +- 4.5.0 + * Fri Feb 27 2009 Rex Dieter - 1:4.5.0-0.8.20090224 - 20090224 snapshot - adjust pkgconfig hackery Index: sources =================================================================== RCS file: /cvs/extras/rpms/qt/devel/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 27 Feb 2009 19:32:21 -0000 1.51 +++ sources 3 Mar 2009 11:14:34 -0000 1.52 @@ -1,4 +1,4 @@ d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png 6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png -d371c9807e43528ef188be59549e58e1 qt-copy-patches-20090220svn.tar.bz2 -eac497de448bf38c969119ad979ad699 qt-x11-opensource-src-4.5.0-snapshot-20090224.tar.gz +55e8c74a89e1bc128a5a6f1ff6b8b5ba qt-x11-opensource-src-4.5.0.tar.bz2 +fcc348cd5997c978e882849bad65b1c0 qt-copy-patches-20090303svn.tar.bz2 --- qt-x11-opensource-src-4.5.0-rc1-misc.patch DELETED --- --- qt-x11-opensource-src-4.5.0-rc1-ppc64.patch DELETED --- From rrakus at fedoraproject.org Tue Mar 3 11:20:19 2009 From: rrakus at fedoraproject.org (Roman Rakus) Date: Tue, 3 Mar 2009 11:20:19 +0000 (UTC) Subject: rpms/powerpc-utils/devel .cvsignore, 1.3, 1.4 powerpc-utils.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <20090303112019.EEF9570116@cvs1.fedora.phx.redhat.com> Author: rrakus Update of /cvs/extras/rpms/powerpc-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12572 Modified Files: .cvsignore powerpc-utils.spec sources Log Message: new upstream version 1.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/powerpc-utils/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Feb 2009 14:16:38 -0000 1.3 +++ .cvsignore 3 Mar 2009 11:19:48 -0000 1.4 @@ -1 +1 @@ -powerpc-utils-1.1.1.tar.gz +powerpc-utils-1.1.2.tar.gz Index: powerpc-utils.spec =================================================================== RCS file: /cvs/extras/rpms/powerpc-utils/devel/powerpc-utils.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- powerpc-utils.spec 27 Feb 2009 02:00:20 -0000 1.5 +++ powerpc-utils.spec 3 Mar 2009 11:19:48 -0000 1.6 @@ -1,5 +1,5 @@ Name: powerpc-utils -Version: 1.1.1 +Version: 1.1.2 Release: 2%{?dist} Summary: Utilities for PowerPC platforms @@ -50,6 +50,9 @@ %changelog +* Tue Mar 03 2009 Roman Rakus - 1.1.2-1 +- new upstream version 1.1.2 + * Thu Feb 26 2009 Fedora Release Engineering - 1.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/powerpc-utils/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Feb 2009 14:16:38 -0000 1.3 +++ sources 3 Mar 2009 11:19:48 -0000 1.4 @@ -1 +1 @@ -cebaa0a438c595dc908e98695d611c2c powerpc-utils-1.1.1.tar.gz +f551aa8c35db8204daef3cc2312c06bd powerpc-utils-1.1.2.tar.gz From hadess at fedoraproject.org Tue Mar 3 11:22:26 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 3 Mar 2009 11:22:26 +0000 (UTC) Subject: rpms/totem-pl-parser/devel .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 totem-pl-parser.spec, 1.34, 1.35 Message-ID: <20090303112226.A76D470116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem-pl-parser/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12906 Modified Files: .cvsignore sources totem-pl-parser.spec Log Message: * Tue Mar 03 2009 - Bastien Nocera - 2.25.92-1 - Update to 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 17 Feb 2009 13:39:46 -0000 1.18 +++ .cvsignore 3 Mar 2009 11:21:56 -0000 1.19 @@ -1 +1 @@ -totem-pl-parser-2.25.91.tar.bz2 +totem-pl-parser-2.25.92.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 17 Feb 2009 13:39:46 -0000 1.18 +++ sources 3 Mar 2009 11:21:56 -0000 1.19 @@ -1 +1 @@ -6c8a676c5140782015a5f9a4e7e4e473 totem-pl-parser-2.25.91.tar.bz2 +2a1c9dee0a986d0311a9608c93927322 totem-pl-parser-2.25.92.tar.bz2 Index: totem-pl-parser.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/totem-pl-parser.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- totem-pl-parser.spec 25 Feb 2009 21:27:45 -0000 1.34 +++ totem-pl-parser.spec 3 Mar 2009 11:21:56 -0000 1.35 @@ -1,6 +1,6 @@ Name: totem-pl-parser -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Summary: Totem Playlist Parser library Group: System Environment/Libraries @@ -68,6 +68,9 @@ %{_datadir}/gtk-doc/html/totem-pl-parser %changelog +* Tue Mar 03 2009 - Bastien Nocera - 2.25.92-1 +- Update to 2.25.92 + * Wed Feb 25 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ltinkl at fedoraproject.org Tue Mar 3 11:23:17 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Tue, 3 Mar 2009 11:23:17 +0000 (UTC) Subject: rpms/kdebase/F-10 kdebase.spec,1.358,1.359 Message-ID: <20090303112317.DA08D70116@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11711/F-10 Modified Files: kdebase.spec Log Message: minor typo fix Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v retrieving revision 1.358 retrieving revision 1.359 diff -u -r1.358 -r1.359 --- kdebase.spec 2 Mar 2009 10:27:01 -0000 1.358 +++ kdebase.spec 3 Mar 2009 11:22:47 -0000 1.359 @@ -26,7 +26,7 @@ Patch0: kdebase-4.1.80-nsplugins-paths.patch Patch1: kdebase-4.1.70-konsole-session.patch -patch2: kdebase-4.2.1-home-icon.patch +Patch2: kdebase-4.2.1-home-icon.patch ## upstream patches From ltinkl at fedoraproject.org Tue Mar 3 11:23:18 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Tue, 3 Mar 2009 11:23:18 +0000 (UTC) Subject: rpms/kdebase/F-9 kdebase.spec,1.348,1.349 Message-ID: <20090303112318.7DF2570116@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11711/F-9 Modified Files: kdebase.spec Log Message: minor typo fix Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v retrieving revision 1.348 retrieving revision 1.349 diff -u -r1.348 -r1.349 --- kdebase.spec 2 Mar 2009 10:27:02 -0000 1.348 +++ kdebase.spec 3 Mar 2009 11:22:47 -0000 1.349 @@ -26,7 +26,7 @@ Patch0: kdebase-4.1.80-nsplugins-paths.patch Patch1: kdebase-4.1.70-konsole-session.patch -patch2: kdebase-4.2.1-home-icon.patch +Patch2: kdebase-4.2.1-home-icon.patch ## upstream patches From ltinkl at fedoraproject.org Tue Mar 3 11:23:19 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Tue, 3 Mar 2009 11:23:19 +0000 (UTC) Subject: rpms/kdebase/devel kdebase.spec,1.365,1.366 Message-ID: <20090303112319.0FEED70116@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11711/devel Modified Files: kdebase.spec Log Message: minor typo fix Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.365 retrieving revision 1.366 diff -u -r1.365 -r1.366 --- kdebase.spec 1 Mar 2009 17:45:42 -0000 1.365 +++ kdebase.spec 3 Mar 2009 11:22:48 -0000 1.366 @@ -26,7 +26,7 @@ Patch0: kdebase-4.1.80-nsplugins-paths.patch Patch1: kdebase-4.1.70-konsole-session.patch -patch2: kdebase-4.2.1-home-icon.patch +Patch2: kdebase-4.2.1-home-icon.patch ## upstream patches From than at fedoraproject.org Tue Mar 3 11:33:48 2009 From: than at fedoraproject.org (Than Ngo) Date: Tue, 3 Mar 2009 11:33:48 +0000 (UTC) Subject: rpms/qt/devel qt.spec,1.242,1.243 Message-ID: <20090303113348.E7EB870116@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31834 Modified Files: qt.spec Log Message: 4.5.0 Index: qt.spec =================================================================== RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v retrieving revision 1.242 retrieving revision 1.243 diff -u -r1.242 -r1.243 --- qt.spec 3 Mar 2009 11:14:34 -0000 1.242 +++ qt.spec 3 Mar 2009 11:33:16 -0000 1.243 @@ -14,11 +14,7 @@ Version: 4.5.0 Release: 1%{?dist} -## for 4.5.0 final: -##License: LGPLv2 or GPLv3 with exceptions -## but, until then, -# see GPL_EXCEPTIONS*.txt -License: GPLv3 with exceptions or GPLv2 with exceptions +License: LGPLv2 or GPLv3 with exceptions Group: System Environment/Libraries Url: http://www.qtsoftware.com/ Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2 @@ -298,7 +294,6 @@ %if 0%{?qt_copy} echo "0250" >> patches/DISABLED -echo "0272" >> patches/DISABLED test -x apply_patches && ./apply_patches %endif @@ -611,9 +606,7 @@ %files %defattr(-,root,root,-) -%doc README* -%doc LICENSE.GPL2 GPL_EXCEPTION*.TXT -%doc LICENSE.GPL3 +%doc README* LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3 #config /etc/profile.d/qt4.* %if "%{_qt4_libdir}" != "%{_libdir}" /etc/ld.so.conf.d/* From karsten at fedoraproject.org Tue Mar 3 11:40:43 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Tue, 3 Mar 2009 11:40:43 +0000 (UTC) Subject: rpms/jakarta-commons-daemon/devel jakarta-commons-daemon-s390x-configure.patch, NONE, 1.1 jakarta-commons-daemon.spec, 1.22, 1.23 Message-ID: <20090303114043.8A09570116@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/jakarta-commons-daemon/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1299 Modified Files: jakarta-commons-daemon.spec Added Files: jakarta-commons-daemon-s390x-configure.patch Log Message: - add configure patch for s390x jakarta-commons-daemon-s390x-configure.patch: --- NEW FILE jakarta-commons-daemon-s390x-configure.patch --- diff -up src/native/unix/configure.s390x src/native/unix/configure --- src/native/unix/configure.s390x 2009-03-03 12:36:47.000000000 +0100 +++ src/native/unix/configure 2009-03-03 12:37:04.000000000 +0100 @@ -2432,6 +2432,8 @@ echo "$as_me: error: Unsupported operati CFLAGS="$CFLAGS -DCPU=\\\"amd64\\\"" ;; ia64) CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\"" ;; + s390*) + CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" ;; bs2000) CFLAGS="$CFLAGS -DCPU=\\\"osd\\\" -DCHARSET_EBCDIC -DOSD_POSIX" supported_os="osd" Index: jakarta-commons-daemon.spec =================================================================== RCS file: /cvs/extras/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- jakarta-commons-daemon.spec 25 Feb 2009 08:40:22 -0000 1.22 +++ jakarta-commons-daemon.spec 3 Mar 2009 11:40:13 -0000 1.23 @@ -39,7 +39,7 @@ Name: jakarta-%{short_name} Version: 1.0.1 -Release: 7.6%{?dist} +Release: 7.7%{?dist} Epoch: 1 Summary: Defines API to support an alternative invocation mechanism License: ASL 2.0 @@ -49,6 +49,7 @@ Patch0: %{name}-crosslink.patch Patch1: %{name}-execve-path-warning.patch Patch2: %{name}-ia64-configure.patch +Patch3: %{name}-s390x-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %{native} @@ -106,6 +107,7 @@ %patch0 -p0 %patch1 -p0 %patch2 -p0 +%patch3 -p0 chmod 644 src/samples/* %if %{native} pushd src/native/unix @@ -189,6 +191,9 @@ %endif %changelog +* Tue Mar 03 2009 Karsten Hopp 1.0.1-7.7 +- add configure patch for s390x + * Wed Feb 25 2009 Fedora Release Engineering - 1:1.0.1-7.6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Tue Mar 3 11:53:26 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 11:53:26 +0000 (UTC) Subject: rpms/openoffice.org/devel .cvsignore, 1.207, 1.208 openoffice.org.spec, 1.1842, 1.1843 sources, 1.347, 1.348 Message-ID: <20090303115326.171F370116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3107 Modified Files: .cvsignore openoffice.org.spec sources Log Message: Resolves: rhbz#488228 Assamese Translations Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.207 retrieving revision 1.208 diff -u -r1.207 -r1.208 --- .cvsignore 2 Mar 2009 15:44:24 -0000 1.207 +++ .cvsignore 3 Mar 2009 11:52:55 -0000 1.208 @@ -14,3 +14,4 @@ kn-IN_DEV300_m40.sdf hi-IN-D300-m40.tar.gz Maithili-mai-ooo3.0.sdf.tar.gz +as-IN_DEV300_m40.sdf Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1842 retrieving revision 1.1843 diff -u -r1.1842 -r1.1843 --- openoffice.org.spec 2 Mar 2009 23:03:26 -0000 1.1842 +++ openoffice.org.spec 3 Mar 2009 11:52:55 -0000 1.1843 @@ -1,6 +1,6 @@ %define oootag OOO310 %define ooomilestone 3 -%define rh_rpm_release 3 +%define rh_rpm_release 4 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF %define __jar_repack %{nil} @@ -58,6 +58,7 @@ Source14: http://www.openoffice.org/nonav/issues/showattachment.cgi/60506/kn-IN_DEV300_m40.sdf Source15: http://indian.googlecode.com/files/hi-IN-D300-m40.tar.gz Source16: http://www.openoffice.org/nonav/issues/showattachment.cgi/57666/Maithili-mai-ooo3.0.sdf.tar.gz +Source17: http://www.openoffice.org/nonav/issues/showattachment.cgi/60530/as-IN_DEV300_m40.sdf BuildRequires: zip, findutils, autoconf, flex, bison, icu, gcc-c++ BuildRequires: binutils, java-devel, boost-devel, zlib-devel, vigra-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc @@ -1702,6 +1703,9 @@ # i95786 tar xzf %{SOURCE16} localize -m -x -l mai -f Maithili-mai-ooo3.0.sdf +# i99699 +tar xzf %{SOURCE17} +localize -m -x -l s-IN -f as-IN_DEV300_m40.sdf cd ../.. #build OOo, on failure make a stab at debugging the crash if any, and @@ -4101,6 +4105,9 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog +* Tue Mar 03 2009 Caol??n McNamara - 1:3.1.0-3.4 +- Resolves: rhbz#488228 Assamese Translations + * Mon Mar 02 2009 Caol??n McNamara - 1:3.1.0-3.3 - Resolves: rhbz#488021 Kannada Translations - Resolves: rhbz#488053 Hindi Translations Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.347 retrieving revision 1.348 diff -u -r1.347 -r1.348 --- sources 2 Mar 2009 15:44:24 -0000 1.347 +++ sources 3 Mar 2009 11:52:55 -0000 1.348 @@ -13,4 +13,5 @@ f457cdd91857701b1282bfffb0ec5e8a kn-IN_DEV300_m40.sdf bdc3b2b8b90ac1879f216cfa3c50d7e1 hi-IN-D300-m40.tar.gz 0835c667327f7ffa5d7eed61b47d681e Maithili-mai-ooo3.0.sdf.tar.gz +be8d6866609e7aa7282220c0f469b279 as-IN_DEV300_m40.sdf f4d811bf2c10fadf34b68805697e2b72 OOO310_m3.tar.bz2 From airlied at fedoraproject.org Tue Mar 3 11:55:25 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 3 Mar 2009 11:55:25 +0000 (UTC) Subject: rpms/kernel/devel kernel.spec,1.1366,1.1367 Message-ID: <20090303115525.3E6DC70116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3379 Modified Files: kernel.spec Log Message: reenable linus git patch Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1366 retrieving revision 1.1367 diff -u -r1.1366 -r1.1367 --- kernel.spec 3 Mar 2009 11:03:51 -0000 1.1366 +++ kernel.spec 3 Mar 2009 11:54:54 -0000 1.1367 @@ -1010,7 +1010,7 @@ done %endif -#ApplyPatch git-linus.diff +ApplyPatch git-linus.diff # This patch adds a "make nonint_oldconfig" which is non-interactive and # also gives a list of missing options at the end. Useful for automated From than at fedoraproject.org Tue Mar 3 11:59:22 2009 From: than at fedoraproject.org (Than Ngo) Date: Tue, 3 Mar 2009 11:59:22 +0000 (UTC) Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec, 1.195, 1.196 sources, 1.33, 1.34 Message-ID: <20090303115922.B2CE770116@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4005 Modified Files: kdebase-workspace.spec sources Log Message: respin Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- kdebase-workspace.spec 1 Mar 2009 17:13:52 -0000 1.195 +++ kdebase-workspace.spec 3 Mar 2009 11:58:52 -0000 1.196 @@ -8,7 +8,7 @@ Name: kdebase-workspace Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -370,6 +370,9 @@ %changelog +* Tue Mar 03 2009 Than Ngo - 4.2.1-2 +- respin + * Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 27 Feb 2009 13:57:38 -0000 1.33 +++ sources 3 Mar 2009 11:58:52 -0000 1.34 @@ -1 +1 @@ -629463e9dcf55ea53225ae252c72783d kdebase-workspace-4.2.1.tar.bz2 +5659e3c7c992fab38223b0a467377495 kdebase-workspace-4.2.1.tar.bz2 From ovasik at fedoraproject.org Tue Mar 3 12:10:42 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Tue, 3 Mar 2009 12:10:42 +0000 (UTC) Subject: rpms/taskjuggler/devel taskjuggler.spec,1.27,1.28 Message-ID: <20090303121042.8C65570116@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/taskjuggler/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6314 Modified Files: taskjuggler.spec Log Message: fix build requires, rebuild for F11 Index: taskjuggler.spec =================================================================== RCS file: /cvs/extras/rpms/taskjuggler/devel/taskjuggler.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- taskjuggler.spec 25 Feb 2009 18:32:00 -0000 1.27 +++ taskjuggler.spec 3 Mar 2009 12:10:12 -0000 1.28 @@ -1,6 +1,6 @@ Name: taskjuggler Version: 2.4.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Project management tool Group: Applications/Productivity @@ -19,6 +19,7 @@ %endif # need gettext for untranslated .po files Buildrequires: gettext +Buildrequires: qt3 qt3-devel Requires: %{name}-libs = %{version}-%{release} Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -124,6 +125,9 @@ %{_libdir}/libtaskjuggler* %changelog +* Tue Mar 03 2009 Ondrej Vasik - 2.4.1-6 +- fix build requires, rebuild for F11 + * Wed Feb 25 2009 Fedora Release Engineering - 2.4.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From hadess at fedoraproject.org Tue Mar 3 12:15:36 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 3 Mar 2009 12:15:36 +0000 (UTC) Subject: rpms/totem/devel .cvsignore, 1.71, 1.72 sources, 1.71, 1.72 totem.spec, 1.230, 1.231 totem-set-pulse-role.patch, 1.1, NONE Message-ID: <20090303121536.931F670116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7104 Modified Files: .cvsignore sources totem.spec Removed Files: totem-set-pulse-role.patch Log Message: * Tue Mar 03 2009 - Bastien Nocera -2.25.92-1 - Update to 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/.cvsignore,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- .cvsignore 17 Feb 2009 14:57:48 -0000 1.71 +++ .cvsignore 3 Mar 2009 12:15:05 -0000 1.72 @@ -1 +1 @@ -totem-2.25.91.tar.bz2 +totem-2.25.92.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/sources,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- sources 17 Feb 2009 14:57:49 -0000 1.71 +++ sources 3 Mar 2009 12:15:05 -0000 1.72 @@ -1 +1 @@ -33e1ccbaf8bfdd9b4ac70bc45680516c totem-2.25.91.tar.bz2 +aaa0cb23c0a4e7bdbc6840f6e94aca96 totem-2.25.92.tar.bz2 Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- totem.spec 26 Feb 2009 15:56:49 -0000 1.230 +++ totem.spec 3 Mar 2009 12:15:05 -0000 1.231 @@ -8,8 +8,8 @@ Summary: Movie player for GNOME Name: totem -Version: 2.25.91 -Release: 4%{?dist} +Version: 2.25.92 +Release: 1%{?dist} License: GPLv2+ with exceptions Group: Applications/Multimedia URL: http://projects.gnome.org/totem/ @@ -17,7 +17,6 @@ Source1: totem-bin-backend-ondemand.sh # Will be removed when we switch to playbin2 Patch0: totem-use-pulsesink-volume.patch -Patch1: totem-set-pulse-role.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): GConf2 >= 2.14 @@ -206,7 +205,6 @@ %setup -q -c pushd totem-%{version}/ %patch0 -p0 -b .pulsesink-vol -%patch1 -p0 popd # Whatever needs to be changed in both copies do here ## remember to update me when changing %doc @@ -480,6 +478,9 @@ %endif %changelog +* Tue Mar 03 2009 - Bastien Nocera -2.25.92-1 +- Update to 2.25.92 + * Thu Feb 26 2009 - Bastien Nocera - 2.25.91-4 - Kill galago plugin --- totem-set-pulse-role.patch DELETED --- From hadess at fedoraproject.org Tue Mar 3 12:15:48 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 3 Mar 2009 12:15:48 +0000 (UTC) Subject: rpms/gnome-user-share/devel .cvsignore, 1.17, 1.18 gnome-user-share.spec, 1.49, 1.50 sources, 1.17, 1.18 Message-ID: <20090303121548.A02C270116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-user-share/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7210 Modified Files: .cvsignore gnome-user-share.spec sources Log Message: * Tue Mar 03 2009 - Bastien Nocera - 2.25.92-1 - Update to 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 3 Feb 2009 16:38:19 -0000 1.17 +++ .cvsignore 3 Mar 2009 12:15:18 -0000 1.18 @@ -1 +1 @@ -gnome-user-share-2.25.91.tar.bz2 +gnome-user-share-2.25.92.tar.bz2 Index: gnome-user-share.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- gnome-user-share.spec 24 Feb 2009 23:36:54 -0000 1.49 +++ gnome-user-share.spec 3 Mar 2009 12:15:18 -0000 1.50 @@ -1,7 +1,7 @@ Summary: Gnome user file sharing Name: gnome-user-share -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.gnome.org @@ -120,6 +120,9 @@ %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png %changelog +* Tue Mar 03 2009 - Bastien Nocera - 2.25.92-1 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 3 Feb 2009 16:38:19 -0000 1.17 +++ sources 3 Mar 2009 12:15:18 -0000 1.18 @@ -1 +1 @@ -60a563df6974742fbca88abf9ddc46eb gnome-user-share-2.25.91.tar.bz2 +6a65768577e959607023469dfc2886ea gnome-user-share-2.25.92.tar.bz2 From than at fedoraproject.org Tue Mar 3 12:17:04 2009 From: than at fedoraproject.org (Than Ngo) Date: Tue, 3 Mar 2009 12:17:04 +0000 (UTC) Subject: rpms/qt/devel qt-x11-opensource-src-4.5.0-rc1-ppc64.patch, 1.2, 1.3 qt.spec, 1.243, 1.244 Message-ID: <20090303121704.30A4370116@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7339 Modified Files: qt.spec Added Files: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch Log Message: add patch for ppc, it's missing in final. qt-x11-opensource-src-4.5.0-rc1-ppc64.patch: Index: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch =================================================================== RCS file: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch diff -N qt-x11-opensource-src-4.5.0-rc1-ppc64.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ qt-x11-opensource-src-4.5.0-rc1-ppc64.patch 3 Mar 2009 12:17:03 -0000 1.3 @@ -0,0 +1,12 @@ +diff -up qt-x11-opensource-src-4.5.0-rc1/src/corelib/arch/qatomic_powerpc.h.orig qt-x11-opensource-src-4.5.0-rc1/src/corelib/arch/qatomic_powerpc.h +--- qt-x11-opensource-src-4.5.0-rc1/src/corelib/arch/qatomic_powerpc.h.orig 2009-02-14 22:51:51.000000000 +0100 ++++ qt-x11-opensource-src-4.5.0-rc1/src/corelib/arch/qatomic_powerpc.h 2009-02-14 22:53:03.000000000 +0100 +@@ -188,7 +188,7 @@ inline bool QBasicAtomicInt::testAndSetR + "lwarx %[result]," _Q_VALUE "\n" + "xor. %[result], %[result], %[expectedValue]\n" + "bne $+12\n" +- "stwcx. %[newValue],0,%[_q_value]\n" ++ "stwcx. %[newValue]," _Q_VALUE "\n" + "bne- $-16\n" + : [result] "=&r" (result), + _Q_VALUE_MEMORY_OPERAND Index: qt.spec =================================================================== RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v retrieving revision 1.243 retrieving revision 1.244 diff -u -r1.243 -r1.244 --- qt.spec 3 Mar 2009 11:33:16 -0000 1.243 +++ qt.spec 3 Mar 2009 12:17:03 -0000 1.244 @@ -39,7 +39,7 @@ # under GNOME, default to QGtkStyle if available # (otherwise fall back to QCleanlooksStyle) Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch - +Patch10: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch ## upstreamable bits # http://bugzilla.redhat.com/485677 Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch @@ -305,7 +305,7 @@ %endif %patch5 -p1 -b .bz#437440-as_IN-437440 %patch9 -p1 -b .qgtkstyle - +%patch10 -p1 -b .ppc64 %patch50 -p1 -b .qhostaddress # drop -fexceptions from $RPM_OPT_FLAGS From than at fedoraproject.org Tue Mar 3 12:22:35 2009 From: than at fedoraproject.org (Than Ngo) Date: Tue, 3 Mar 2009 12:22:35 +0000 (UTC) Subject: rpms/kdebase-workspace/F-10 kdebase-workspace.spec, 1.163, 1.164 sources, 1.27, 1.28 Message-ID: <20090303122235.4E45370116@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8415 Modified Files: kdebase-workspace.spec sources Log Message: respin Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- kdebase-workspace.spec 2 Mar 2009 10:19:54 -0000 1.163 +++ kdebase-workspace.spec 3 Mar 2009 12:22:04 -0000 1.164 @@ -8,7 +8,7 @@ Name: kdebase-workspace Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -370,6 +370,9 @@ %changelog +* Tue Mar 03 2009 Than Ngo - 4.2.1-2 +- respin + * Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 27 Feb 2009 16:14:33 -0000 1.27 +++ sources 3 Mar 2009 12:22:04 -0000 1.28 @@ -1 +1 @@ -629463e9dcf55ea53225ae252c72783d kdebase-workspace-4.2.1.tar.bz2 +5659e3c7c992fab38223b0a467377495 kdebase-workspace-4.2.1.tar.bz2 From than at fedoraproject.org Tue Mar 3 12:24:55 2009 From: than at fedoraproject.org (Than Ngo) Date: Tue, 3 Mar 2009 12:24:55 +0000 (UTC) Subject: rpms/kdebase-workspace/F-9 kdebase-workspace.spec, 1.136, 1.137 sources, 1.21, 1.22 Message-ID: <20090303122455.58DF270116@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8899 Modified Files: kdebase-workspace.spec sources Log Message: respin Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- kdebase-workspace.spec 2 Mar 2009 10:19:54 -0000 1.136 +++ kdebase-workspace.spec 3 Mar 2009 12:24:24 -0000 1.137 @@ -8,7 +8,7 @@ Name: kdebase-workspace Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -370,6 +370,9 @@ %changelog +* Tue Mar 03 2009 Than Ngo - 4.2.1-2 +- respin + * Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 27 Feb 2009 16:14:34 -0000 1.21 +++ sources 3 Mar 2009 12:24:24 -0000 1.22 @@ -1 +1 @@ -629463e9dcf55ea53225ae252c72783d kdebase-workspace-4.2.1.tar.bz2 +5659e3c7c992fab38223b0a467377495 kdebase-workspace-4.2.1.tar.bz2 From caolanm at fedoraproject.org Tue Mar 3 12:29:14 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 12:29:14 +0000 (UTC) Subject: rpms/openoffice.org/devel .cvsignore, 1.208, 1.209 openoffice.org.spec, 1.1843, 1.1844 sources, 1.348, 1.349 Message-ID: <20090303122914.0F37770116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9794 Modified Files: .cvsignore openoffice.org.spec sources Log Message: Resolves: rhbz#488234 Tamil Translations Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- .cvsignore 3 Mar 2009 11:52:55 -0000 1.208 +++ .cvsignore 3 Mar 2009 12:28:43 -0000 1.209 @@ -15,3 +15,4 @@ hi-IN-D300-m40.tar.gz Maithili-mai-ooo3.0.sdf.tar.gz as-IN_DEV300_m40.sdf +ta-090227.sdf Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1843 retrieving revision 1.1844 diff -u -r1.1843 -r1.1844 --- openoffice.org.spec 3 Mar 2009 11:52:55 -0000 1.1843 +++ openoffice.org.spec 3 Mar 2009 12:28:43 -0000 1.1844 @@ -59,6 +59,7 @@ Source15: http://indian.googlecode.com/files/hi-IN-D300-m40.tar.gz Source16: http://www.openoffice.org/nonav/issues/showattachment.cgi/57666/Maithili-mai-ooo3.0.sdf.tar.gz Source17: http://www.openoffice.org/nonav/issues/showattachment.cgi/60530/as-IN_DEV300_m40.sdf +Source18: http://sunvirtuallab.com:32305/sdf/090209/ta-090227.sdf BuildRequires: zip, findutils, autoconf, flex, bison, icu, gcc-c++ BuildRequires: binutils, java-devel, boost-devel, zlib-devel, vigra-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc @@ -1705,7 +1706,10 @@ localize -m -x -l mai -f Maithili-mai-ooo3.0.sdf # i99699 tar xzf %{SOURCE17} -localize -m -x -l s-IN -f as-IN_DEV300_m40.sdf +localize -m -x -l as-IN -f as-IN_DEV300_m40.sdf +# i99663 +tar xzf %{SOURCE18} +localize -m -x -l ta-IN -f ta-090227.sdf cd ../.. #build OOo, on failure make a stab at debugging the crash if any, and @@ -4107,6 +4111,7 @@ %changelog * Tue Mar 03 2009 Caol??n McNamara - 1:3.1.0-3.4 - Resolves: rhbz#488228 Assamese Translations +- Resolves: rhbz#488234 Tamil Translations * Mon Mar 02 2009 Caol??n McNamara - 1:3.1.0-3.3 - Resolves: rhbz#488021 Kannada Translations Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.348 retrieving revision 1.349 diff -u -r1.348 -r1.349 --- sources 3 Mar 2009 11:52:55 -0000 1.348 +++ sources 3 Mar 2009 12:28:43 -0000 1.349 @@ -7,11 +7,12 @@ eaf47e2e3d3586f6156c61379cc34df9 redhat-langpacks.tar.gz 6c28507e29056a3afb4baffdadab8499 openoffice.org-javafilter.desktop d4cd987dca2f091c888d95d5aef19f46 GSI_fi.sdf.gz +0835c667327f7ffa5d7eed61b47d681e Maithili-mai-ooo3.0.sdf.tar.gz 7d7eb194a61b3b1c59e3c82da889ac27 or-IN_DEV300_m40.sdf b6558e6e74c60dfd9fcd15a722188d45 mr-IN_DEV300_m40.sdf d826ee150349ee5fe4b43cdd7a130084 te-IN_DEV300_m40.sdf f457cdd91857701b1282bfffb0ec5e8a kn-IN_DEV300_m40.sdf bdc3b2b8b90ac1879f216cfa3c50d7e1 hi-IN-D300-m40.tar.gz -0835c667327f7ffa5d7eed61b47d681e Maithili-mai-ooo3.0.sdf.tar.gz be8d6866609e7aa7282220c0f469b279 as-IN_DEV300_m40.sdf +ab6765f3f969e0c676bc13bc9960f60c ta-090227.sdf f4d811bf2c10fadf34b68805697e2b72 OOO310_m3.tar.bz2 From xhorak at fedoraproject.org Tue Mar 3 12:32:48 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Tue, 3 Mar 2009 12:32:48 +0000 (UTC) Subject: rpms/thunderbird/devel thunderbird-pango.patch, NONE, 1.1 thunderbird.spec, 1.126, 1.127 Message-ID: <20090303123248.162FC70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/thunderbird/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10599 Modified Files: thunderbird.spec Added Files: thunderbird-pango.patch Log Message: Fix for rawhide build thunderbird-pango.patch: --- NEW FILE thunderbird-pango.patch --- diff -upU8 thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp.pango-fix thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp --- thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp.pango-fix 2009-03-03 12:04:16.000000000 +0100 +++ thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp 2009-03-03 12:05:37.000000000 +0100 @@ -1798,22 +1798,21 @@ gfx_pango_font_map_context_substitute(Pa double size = pango_font_description_get_size(desc) / FLOAT_PANGO_SCALE; gfxPangoFontGroup *fontGroup = GetFontGroup(context); PRBool usePrinterFont = fontGroup && fontGroup->GetStyle()->printerFont; PrepareSortPattern(pattern, size, 1.0, usePrinterFont); } static PangoFcFont * gfx_pango_font_map_create_font(PangoFcFontMap *fontmap, - PangoContext *context, - const PangoFontDescription *desc, - FcPattern *pattern) + PangoFcFontKey *fontkey) { + const FcPattern *p_pattern = pango_fc_font_key_get_pattern(fontkey); return PANGO_FC_FONT(g_object_new(GFX_TYPE_PANGO_FC_FONT, - "pattern", pattern, NULL)); + "pattern", p_pattern, NULL)); } static void gfx_pango_font_map_class_init(gfxPangoFontMapClass *klass) { // inherit GObjectClass::finalize from parent as this class adds no data. PangoFontMapClass *fontmap_class = PANGO_FONT_MAP_CLASS (klass); @@ -1823,19 +1822,18 @@ gfx_pango_font_map_class_init(gfxPangoFo fontmap_class->load_fontset = gfx_pango_font_map_load_fontset; // inherit fontmap_class->shape_engine_type from PangoFcFontMap PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (klass); fcfontmap_class->get_resolution = gfx_pango_font_map_get_resolution; // context_key_* virtual functions are only necessary if we want to // dynamically respond to changes in the screen cairo_font_options_t. - // context_substitute and get_font are not likely to be used but + // get_font are not likely to be used but // implemented because the class makes them available. - fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute; fcfontmap_class->create_font = gfx_pango_font_map_create_font; } /** ** gfxPangoFontGroup **/ struct FamilyCallbackData { Index: thunderbird.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- thunderbird.spec 3 Mar 2009 10:29:37 -0000 1.126 +++ thunderbird.spec 3 Mar 2009 12:32:17 -0000 1.127 @@ -3,7 +3,6 @@ %define nss_version 3.10 %define cairo_version 1.0 %define dbus_glib_version 0.6 -%define autoconf_version 2.13 %define official_branding 1 @@ -33,6 +32,7 @@ Patch1: mozilla-jemalloc.patch Patch2: thunderbird-shared-error.patch Patch3: xulrunner-elif.patch +Patch4: thunderbird-pango.patch %if %{official_branding} # Required by Mozilla Corporation @@ -51,7 +51,7 @@ %if 0%{?rhel} >= 5 Requires: launchmail %endif -BuildRequires: autoconf213 >= %{autoconf_version} +BuildRequires: autoconf213 BuildRequires: alsa-lib-devel BuildRequires: libcurl-devel BuildRequires: cairo-devel >= %{cairo_version} @@ -86,6 +86,7 @@ %patch1 -p0 -b .jemalloc %patch2 -p1 -b .shared-error %patch3 -p0 -b .xulrunner-elif +%patch4 -p1 -b .pango-fix %if %{official_branding} # Required by Mozilla Corporation From berrange at fedoraproject.org Tue Mar 3 12:55:34 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Tue, 3 Mar 2009 12:55:34 +0000 (UTC) Subject: rpms/qemu/devel qemu-sasl-01-tls-handshake-fix.patch, NONE, 1.1 qemu-sasl-02-vnc-monitor-info.patch, NONE, 1.1 qemu-sasl-03-display-keymaps.patch, NONE, 1.1 qemu-sasl-04-vnc-struct.patch, NONE, 1.1 qemu-sasl-05-vnc-tls-vencrypt.patch, NONE, 1.1 qemu-sasl-06-vnc-sasl.patch, NONE, 1.1 qemu-sasl-07-vnc-monitor-authinfo.patch, NONE, 1.1 qemu-sasl-08-vnc-acl-mgmt.patch, NONE, 1.1 qemu.spec, 1.50, 1.51 Message-ID: <20090303125534.1FBBE70116@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/extras/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15820 Modified Files: qemu.spec Added Files: qemu-sasl-01-tls-handshake-fix.patch qemu-sasl-02-vnc-monitor-info.patch qemu-sasl-03-display-keymaps.patch qemu-sasl-04-vnc-struct.patch qemu-sasl-05-vnc-tls-vencrypt.patch qemu-sasl-06-vnc-sasl.patch qemu-sasl-07-vnc-monitor-authinfo.patch qemu-sasl-08-vnc-acl-mgmt.patch Log Message: Added VNC SASL auth protocol support & fix bochs-bios-data dep qemu-sasl-01-tls-handshake-fix.patch: --- NEW FILE qemu-sasl-01-tls-handshake-fix.patch --- This patch was previously posted here: http://lists.gnu.org/archive/html/qemu-devel/2009-02/msg00820.html In the case where the TLS handshake does *not* block on I/O, QEMU sends the next 'start sub-auth' message twice. This seriously confuses the VNC client :-) Fortunately the chances of the handshake not blocking are close to zero for a TCP socket, which is why it has not been noticed thus far. Even with both client & server on localhost, I can only hit the bug 1 time in 20. NB, the diff context here is not too informative. If you look at the full code you'll see that a few lines early we called vnc_start_tls() which called vnc_continue_handshake() which called the method start_auth_vencrypt_subauth(). Hence, fixing the bug, just involves removing the 2nd bogus call to start_auth_vencrypt_subauth() as per this patch. vnc.c | 8 -------- 1 file changed, 8 deletions(-) Signed-off-by: Daniel P. Berrange diff -r ff004fb525e7 vnc.c --- a/vnc.c Thu Feb 19 11:26:55 2009 +0000 +++ b/vnc.c Thu Feb 19 11:27:44 2009 +0000 @@ -2096,14 +2096,6 @@ static int protocol_client_vencrypt_auth VNC_DEBUG("Failed to complete TLS\n"); return 0; } - - if (vs->wiremode == VNC_WIREMODE_TLS) { - VNC_DEBUG("Starting VeNCrypt subauth\n"); - return start_auth_vencrypt_subauth(vs); - } else { - VNC_DEBUG("TLS handshake blocked\n"); - return 0; - } } return 0; } qemu-sasl-02-vnc-monitor-info.patch: --- NEW FILE qemu-sasl-02-vnc-monitor-info.patch --- The current 'info vnc' monitor output just displays the VNC server address as provided by the -vnc command line flag. This isn't particularly useful since it doesn't tell you what VNC is actually listening on. eg, if you use '-vnc :1' it is useful to know whether this translated to '0.0.0.0:5901' or chose IPv6 ':::5901'. It is also useful to know the address of the client that is currently connected. It is also useful to know the active authentication (if any). This patch tweaks the monitor output to look like: (qemu) info vnc Server: address: 0.0.0.0:5902 auth: vencrypt+x509 Client: none And when 2 clients are connected (qemu) info vnc Server: address: 0.0.0.0:5902 auth: vencrypt+x509 Client: address: 10.33.6.67:38621 Client: address: 10.33.6.63:38620 More data will be added to this later in the patch series... The 'addr_to_string' helper method in this patch is overly generic for the needs of this patch alone. This is because it will be re-used by the later SASL patches in this series, where the flexibility is important. vnc.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 127 insertions(+), 10 deletions(-) Signed-off-by: Daniel P. Berrange diff -r 4dbf24b567c4 vnc.c --- a/vnc.c Thu Feb 19 11:27:44 2009 +0000 +++ b/vnc.c Thu Feb 19 11:53:31 2009 +0000 @@ -166,19 +166,136 @@ struct VncState static VncDisplay *vnc_display; /* needed for info vnc */ static DisplayChangeListener *dcl; +static char *addr_to_string(const char *format, + struct sockaddr_storage *sa, + socklen_t salen) { + char *addr; + char host[NI_MAXHOST]; + char serv[NI_MAXSERV]; + int err; + + if ((err = getnameinfo((struct sockaddr *)sa, salen, + host, sizeof(host), + serv, sizeof(serv), + NI_NUMERICHOST | NI_NUMERICSERV)) != 0) { + VNC_DEBUG("Cannot resolve address %d: %s\n", + err, gai_strerror(err)); + return NULL; + } + + if (asprintf(&addr, format, host, serv) < 0) + return NULL; + + return addr; +} + +static char *vnc_socket_local_addr(const char *format, int fd) { + struct sockaddr_storage sa; + socklen_t salen; + + salen = sizeof(sa); + if (getsockname(fd, (struct sockaddr*)&sa, &salen) < 0) + return NULL; + + return addr_to_string(format, &sa, salen); +} + +static char *vnc_socket_remote_addr(const char *format, int fd) { + struct sockaddr_storage sa; + socklen_t salen; + + salen = sizeof(sa); + if (getpeername(fd, (struct sockaddr*)&sa, &salen) < 0) + return NULL; + + return addr_to_string(format, &sa, salen); +} + +static const char *vnc_auth_name(VncDisplay *vd) { + switch (vd->auth) { + case VNC_AUTH_INVALID: + return "invalid"; + case VNC_AUTH_NONE: + return "none"; + case VNC_AUTH_VNC: + return "vnc"; + case VNC_AUTH_RA2: + return "ra2"; + case VNC_AUTH_RA2NE: + return "ra2ne"; + case VNC_AUTH_TIGHT: + return "tight"; + case VNC_AUTH_ULTRA: + return "ultra"; + case VNC_AUTH_TLS: + return "tls"; + case VNC_AUTH_VENCRYPT: +#ifdef CONFIG_VNC_TLS + switch (vd->subauth) { + case VNC_AUTH_VENCRYPT_PLAIN: + return "vencrypt+plain"; + case VNC_AUTH_VENCRYPT_TLSNONE: + return "vencrypt+tls+none"; + case VNC_AUTH_VENCRYPT_TLSVNC: + return "vencrypt+tls+vnc"; + case VNC_AUTH_VENCRYPT_TLSPLAIN: + return "vencrypt+tls+plain"; + case VNC_AUTH_VENCRYPT_X509NONE: + return "vencrypt+x509+none"; + case VNC_AUTH_VENCRYPT_X509VNC: + return "vencrypt+x509+vnc"; + case VNC_AUTH_VENCRYPT_X509PLAIN: + return "vencrypt+x509+plain"; + default: + return "vencrypt"; + } +#else + return "vencrypt"; +#endif + } + return "unknown"; +} + +#define VNC_SOCKET_FORMAT_PRETTY "local %s:%s" + +static void do_info_vnc_client(VncState *client) +{ + char *clientAddr = + vnc_socket_remote_addr(" address: %s:%s\n", + client->csock); + if (!clientAddr) + return; + + term_puts("Client:\n"); + term_puts(clientAddr); + free(clientAddr); +} + void do_info_vnc(void) { - if (vnc_display == NULL || vnc_display->display == NULL) - term_printf("VNC server disabled\n"); - else { - term_printf("VNC server active on: "); - term_print_filename(vnc_display->display); - term_printf("\n"); + if (vnc_display == NULL || vnc_display->display == NULL) { + term_printf("Server: disabled\n"); + } else { + char *serverAddr = vnc_socket_local_addr(" address: %s:%s\n", + vnc_display->lsock); - if (vnc_display->clients == NULL) - term_printf("No client connected\n"); - else - term_printf("Client connected\n"); + if (!serverAddr) + return; + + term_puts("Server:\n"); + term_puts(serverAddr); + free(serverAddr); + term_printf(" auth: %s\n", vnc_auth_name(vnc_display)); + + if (vnc_display->clients) { + VncState *client = vnc_display->clients; + while (client) { + do_info_vnc_client(client); + client = client->next; + } + } else { + term_printf("Client: none\n"); + } } } qemu-sasl-03-display-keymaps.patch: --- NEW FILE qemu-sasl-03-display-keymaps.patch --- Each of the graphical frontends #include a .c file, for keymap code resulting in duplicated definitions & duplicated compiled code. A couple of small changes allowed this to be sanitized, so instead of doing a #include "keymaps.c", duplicating all code, we can have a shared keymaps.h file, and only compile code once. This allows the next patch to move the VncState struct out into a header file without causing clashing definitions. Makefile | 9 +++++--- b/keymaps.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ curses.c | 3 -- curses_keys.h | 9 +++----- keymaps.c | 45 ++++++++++++++++--------------------------- sdl.c | 3 -- sdl_keysym.h | 7 ++---- vnc.c | 5 +--- vnc_keysym.h | 7 ++---- 9 files changed, 97 insertions(+), 51 deletions(-) Signed-off-by: Daniel P. Berrange diff -r 9ccd7a5b0382 Makefile --- a/Makefile Thu Feb 19 11:54:21 2009 +0000 +++ b/Makefile Thu Feb 19 13:15:19 2009 +0000 @@ -137,6 +137,7 @@ endif AUDIO_OBJS+= wavcapture.o OBJS+=$(addprefix audio/, $(AUDIO_OBJS)) +OBJS+=keymaps.o ifdef CONFIG_SDL OBJS+=sdl.o x_keymap.o endif @@ -161,15 +162,17 @@ LIBS+=$(VDE_LIBS) cocoa.o: cocoa.m -sdl.o: sdl.c keymaps.c sdl_keysym.h +keymaps.o: keymaps.c keymaps.h + +sdl.o: sdl.c keymaps.h sdl_keysym.h sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) -vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h d3des.c d3des.h +vnc.o: vnc.c keymaps.h sdl_keysym.h vnchextile.h d3des.c d3des.h vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) -curses.o: curses.c keymaps.c curses_keys.h +curses.o: curses.c keymaps.h curses_keys.h bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) diff -r 9ccd7a5b0382 curses.c --- a/curses.c Thu Feb 19 11:54:21 2009 +0000 +++ b/curses.c Thu Feb 19 13:15:19 2009 +0000 @@ -158,7 +158,6 @@ static void curses_cursor_position(Displ /* generic keyboard conversion */ #include "curses_keys.h" -#include "keymaps.c" static kbd_layout_t *kbd_layout = 0; static int keycode2keysym[CURSES_KEYS]; @@ -311,7 +310,7 @@ static void curses_keyboard_setup(void) keyboard_layout = "en-us"; #endif if(keyboard_layout) { - kbd_layout = init_keyboard_layout(keyboard_layout); + kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout); if (!kbd_layout) exit(1); } diff -r 9ccd7a5b0382 curses_keys.h --- a/curses_keys.h Thu Feb 19 11:54:21 2009 +0000 +++ b/curses_keys.h Thu Feb 19 13:15:19 2009 +0000 @@ -21,6 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + +#include "keymaps.h" + + #define KEY_RELEASE 0x80 #define KEY_MASK 0x7f #define SHIFT_CODE 0x2a @@ -239,11 +243,6 @@ static const int curses2keysym[CURSES_KE }; -typedef struct { - const char* name; - int keysym; -} name2keysym_t; - static const name2keysym_t name2keysym[] = { /* Plain ASCII */ { "space", 0x020 }, diff -r 9ccd7a5b0382 keymaps.c --- a/keymaps.c Thu Feb 19 11:54:21 2009 +0000 +++ b/keymaps.c Thu Feb 19 13:15:19 2009 +0000 @@ -22,34 +22,20 @@ * THE SOFTWARE. */ -static int get_keysym(const char *name) +#include "keymaps.h" +#include "sysemu.h" + +static int get_keysym(const name2keysym_t *table, + const char *name) { const name2keysym_t *p; - for(p = name2keysym; p->name != NULL; p++) { + for(p = table; p->name != NULL; p++) { if (!strcmp(p->name, name)) return p->keysym; } return 0; } -struct key_range { - int start; - int end; - struct key_range *next; -}; - -#define MAX_NORMAL_KEYCODE 512 -#define MAX_EXTRA_COUNT 256 -typedef struct { - uint16_t keysym2keycode[MAX_NORMAL_KEYCODE]; - struct { - int keysym; - uint16_t keycode; - } keysym2keycode_extra[MAX_EXTRA_COUNT]; - int extra_count; - struct key_range *keypad_range; - struct key_range *numlock_range; -} kbd_layout_t; static void add_to_key_range(struct key_range **krp, int code) { struct key_range *kr; @@ -73,7 +59,8 @@ static void add_to_key_range(struct key_ } } -static kbd_layout_t *parse_keyboard_layout(const char *language, +static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table, + const char *language, kbd_layout_t * k) { FILE *f; @@ -102,7 +89,7 @@ static kbd_layout_t *parse_keyboard_layo if (!strncmp(line, "map ", 4)) continue; if (!strncmp(line, "include ", 8)) { - parse_keyboard_layout(line + 8, k); + parse_keyboard_layout(table, line + 8, k); } else { char *end_of_keysym = line; while (*end_of_keysym != 0 && *end_of_keysym != ' ') @@ -110,7 +97,7 @@ static kbd_layout_t *parse_keyboard_layo if (*end_of_keysym) { int keysym; *end_of_keysym = 0; - keysym = get_keysym(line); + keysym = get_keysym(table, line); if (keysym == 0) { // fprintf(stderr, "Warning: unknown keysym %s\n", line); } else { @@ -154,12 +141,14 @@ static kbd_layout_t *parse_keyboard_layo return k; } -static void *init_keyboard_layout(const char *language) + +void *init_keyboard_layout(const name2keysym_t *table, const char *language) { - return parse_keyboard_layout(language, 0); + return parse_keyboard_layout(table, language, 0); } -static int keysym2scancode(void *kbd_layout, int keysym) + +int keysym2scancode(void *kbd_layout, int keysym) { kbd_layout_t *k = kbd_layout; if (keysym < MAX_NORMAL_KEYCODE) { @@ -180,7 +169,7 @@ static int keysym2scancode(void *kbd_lay return 0; } -static inline int keycode_is_keypad(void *kbd_layout, int keycode) +int keycode_is_keypad(void *kbd_layout, int keycode) { kbd_layout_t *k = kbd_layout; struct key_range *kr; @@ -191,7 +180,7 @@ static inline int keycode_is_keypad(void return 0; } -static inline int keysym_is_numlock(void *kbd_layout, int keysym) +int keysym_is_numlock(void *kbd_layout, int keysym) { kbd_layout_t *k = kbd_layout; struct key_range *kr; diff -r 9ccd7a5b0382 keymaps.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/keymaps.h Thu Feb 19 13:15:19 2009 +0000 @@ -0,0 +1,60 @@ +/* + * QEMU keysym to keycode conversion using rdesktop keymaps + * + * Copyright (c) 2004 Johannes Schindelin + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef __QEMU_KEYMAPS_H__ +#define __QEMU_KEYMAPS_H__ + +#include "qemu-common.h" + +typedef struct { + const char* name; + int keysym; +} name2keysym_t; + +struct key_range { + int start; + int end; + struct key_range *next; +}; + +#define MAX_NORMAL_KEYCODE 512 +#define MAX_EXTRA_COUNT 256 +typedef struct { + uint16_t keysym2keycode[MAX_NORMAL_KEYCODE]; + struct { + int keysym; + uint16_t keycode; + } keysym2keycode_extra[MAX_EXTRA_COUNT]; + int extra_count; + struct key_range *keypad_range; + struct key_range *numlock_range; +} kbd_layout_t; + + +void *init_keyboard_layout(const name2keysym_t *table, const char *language); +int keysym2scancode(void *kbd_layout, int keysym); +int keycode_is_keypad(void *kbd_layout, int keycode); +int keysym_is_numlock(void *kbd_layout, int keysym); + +#endif /* __QEMU_KEYMAPS_H__ */ diff -r 9ccd7a5b0382 sdl.c --- a/sdl.c Thu Feb 19 11:54:21 2009 +0000 +++ b/sdl.c Thu Feb 19 13:15:19 2009 +0000 @@ -107,7 +107,6 @@ static void sdl_resize(DisplayState *ds) /* generic keyboard conversion */ #include "sdl_keysym.h" -#include "keymaps.c" static kbd_layout_t *kbd_layout = NULL; @@ -623,7 +622,7 @@ void sdl_display_init(DisplayState *ds, keyboard_layout = "en-us"; #endif if(keyboard_layout) { - kbd_layout = init_keyboard_layout(keyboard_layout); + kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout); if (!kbd_layout) exit(1); } diff -r 9ccd7a5b0382 sdl_keysym.h --- a/sdl_keysym.h Thu Feb 19 11:54:21 2009 +0000 +++ b/sdl_keysym.h Thu Feb 19 13:15:19 2009 +0000 @@ -1,7 +1,6 @@ -typedef struct { - const char* name; - int keysym; -} name2keysym_t; + +#include "keymaps.h" + static const name2keysym_t name2keysym[]={ /* ascii */ { "space", 0x020}, diff -r 9ccd7a5b0382 vnc.c --- a/vnc.c Thu Feb 19 11:54:21 2009 +0000 +++ b/vnc.c Thu Feb 19 13:15:19 2009 +0000 @@ -35,7 +35,6 @@ #include "vnc.h" #include "vnc_keysym.h" -#include "keymaps.c" #include "d3des.h" #ifdef CONFIG_VNC_TLS @@ -2420,9 +2419,9 @@ void vnc_display_init(DisplayState *ds) vs->ds = ds; if (keyboard_layout) - vs->kbd_layout = init_keyboard_layout(keyboard_layout); + vs->kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout); else - vs->kbd_layout = init_keyboard_layout("en-us"); + vs->kbd_layout = init_keyboard_layout(name2keysym, "en-us"); if (!vs->kbd_layout) exit(1); diff -r 9ccd7a5b0382 vnc_keysym.h --- a/vnc_keysym.h Thu Feb 19 11:54:21 2009 +0000 +++ b/vnc_keysym.h Thu Feb 19 13:15:19 2009 +0000 @@ -1,7 +1,6 @@ -typedef struct { - const char* name; - int keysym; -} name2keysym_t; + +#include "keymaps.h" + static const name2keysym_t name2keysym[]={ /* ascii */ { "space", 0x020}, qemu-sasl-04-vnc-struct.patch: --- NEW FILE qemu-sasl-04-vnc-struct.patch --- This patch moves the definitions of VncState and VncDisplay structs out into a vnc.h header file. This is to allow the code for TLS and SASL auth mechanisms to be moved out of the main vnc.c file. vnc.c | 109 ------------------------------------------------ vnc.h | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 148 insertions(+), 110 deletions(-) Signed-off-by: Daniel P. Berrange diff -r 216ec7d1e30f vnc.c --- a/vnc.c Thu Feb 19 13:15:19 2009 +0000 +++ b/vnc.c Thu Feb 19 13:25:09 2009 +0000 @@ -3,6 +3,7 @@ * * Copyright (C) 2006 Anthony Liguori * Copyright (C) 2006 Fabrice Bellard + * Copyright (C) 2009 Red Hat, Inc * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,25 +24,16 @@ * THE SOFTWARE. */ -#include "qemu-common.h" -#include "console.h" +#include "vnc.h" #include "sysemu.h" #include "qemu_socket.h" #include "qemu-timer.h" -#include "audio/audio.h" -#include #define VNC_REFRESH_INTERVAL (1000 / 30) -#include "vnc.h" #include "vnc_keysym.h" #include "d3des.h" -#ifdef CONFIG_VNC_TLS -#include -#include -#endif /* CONFIG_VNC_TLS */ - // #define _VNC_DEBUG 1 #ifdef _VNC_DEBUG @@ -64,103 +56,6 @@ static void vnc_debug_gnutls_log(int lev } \ } -typedef struct Buffer -{ - size_t capacity; - size_t offset; - uint8_t *buffer; -} Buffer; - -typedef struct VncState VncState; - -typedef int VncReadEvent(VncState *vs, uint8_t *data, size_t len); - -typedef void VncWritePixels(VncState *vs, void *data, int size); - -typedef void VncSendHextileTile(VncState *vs, - int x, int y, int w, int h, - void *last_bg, - void *last_fg, - int *has_bg, int *has_fg); - -#define VNC_MAX_WIDTH 2048 -#define VNC_MAX_HEIGHT 2048 -#define VNC_DIRTY_WORDS (VNC_MAX_WIDTH / (16 * 32)) - -#define VNC_AUTH_CHALLENGE_SIZE 16 - -typedef struct VncDisplay VncDisplay; - -struct VncDisplay -{ - int lsock; - DisplayState *ds; - VncState *clients; - kbd_layout_t *kbd_layout; - - char *display; - char *password; - int auth; -#ifdef CONFIG_VNC_TLS - int subauth; - int x509verify; - - char *x509cacert; - char *x509cacrl; - char *x509cert; - char *x509key; -#endif -}; - -struct VncState -{ - QEMUTimer *timer; - int csock; - DisplayState *ds; - VncDisplay *vd; - int need_update; - uint32_t dirty_row[VNC_MAX_HEIGHT][VNC_DIRTY_WORDS]; - char *old_data; - uint32_t features; - int absolute; - int last_x; - int last_y; - - uint32_t vnc_encoding; - uint8_t tight_quality; - uint8_t tight_compression; - - int major; - int minor; - - char challenge[VNC_AUTH_CHALLENGE_SIZE]; - -#ifdef CONFIG_VNC_TLS - int wiremode; - gnutls_session_t tls_session; -#endif - - Buffer output; - Buffer input; - /* current output mode information */ - VncWritePixels *write_pixels; - VncSendHextileTile *send_hextile_tile; - DisplaySurface clientds, serverds; - - CaptureVoiceOut *audio_cap; - struct audsettings as; - - VncReadEvent *read_handler; - size_t read_handler_expect; - /* input */ - uint8_t modifiers_state[256]; - - Buffer zlib; - Buffer zlib_tmp; - z_stream zlib_stream[4]; - - VncState *next; -}; static VncDisplay *vnc_display; /* needed for info vnc */ static DisplayChangeListener *dcl; diff -r 216ec7d1e30f vnc.h --- a/vnc.h Thu Feb 19 13:15:19 2009 +0000 +++ b/vnc.h Thu Feb 19 13:25:09 2009 +0000 @@ -1,5 +1,148 @@ -#ifndef __VNCTIGHT_H -#define __VNCTIGHT_H +/* + * QEMU VNC display driver + * + * Copyright (C) 2006 Anthony Liguori + * Copyright (C) 2006 Fabrice Bellard + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef __QEMU_VNC_H +#define __QEMU_VNC_H + +#include "qemu-common.h" +#include "console.h" +#include "audio/audio.h" +#include + +#ifdef CONFIG_VNC_TLS +#include +#include +#endif /* CONFIG_VNC_TLS */ + +#include "keymaps.h" + +/***************************************************************************** + * + * Core data structures + * + *****************************************************************************/ + +typedef struct Buffer +{ + size_t capacity; + size_t offset; + uint8_t *buffer; +} Buffer; + +typedef struct VncState VncState; + +typedef int VncReadEvent(VncState *vs, uint8_t *data, size_t len); + +typedef void VncWritePixels(VncState *vs, void *data, int size); + +typedef void VncSendHextileTile(VncState *vs, + int x, int y, int w, int h, + void *last_bg, + void *last_fg, + int *has_bg, int *has_fg); + +#define VNC_MAX_WIDTH 2048 +#define VNC_MAX_HEIGHT 2048 +#define VNC_DIRTY_WORDS (VNC_MAX_WIDTH / (16 * 32)) + +#define VNC_AUTH_CHALLENGE_SIZE 16 + +typedef struct VncDisplay VncDisplay; + +struct VncDisplay +{ + int lsock; + DisplayState *ds; + VncState *clients; + kbd_layout_t *kbd_layout; + + char *display; + char *password; + int auth; +#ifdef CONFIG_VNC_TLS + int subauth; + int x509verify; + + char *x509cacert; + char *x509cacrl; + char *x509cert; + char *x509key; +#endif +}; + +struct VncState +{ + QEMUTimer *timer; + int csock; + DisplayState *ds; + VncDisplay *vd; + int need_update; + uint32_t dirty_row[VNC_MAX_HEIGHT][VNC_DIRTY_WORDS]; + char *old_data; + uint32_t features; + int absolute; + int last_x; + int last_y; + + uint32_t vnc_encoding; + uint8_t tight_quality; + uint8_t tight_compression; + + int major; + int minor; + + char challenge[VNC_AUTH_CHALLENGE_SIZE]; + +#ifdef CONFIG_VNC_TLS + int wiremode; + gnutls_session_t tls_session; +#endif + + Buffer output; + Buffer input; + /* current output mode information */ + VncWritePixels *write_pixels; + VncSendHextileTile *send_hextile_tile; + DisplaySurface clientds, serverds; + + CaptureVoiceOut *audio_cap; + struct audsettings as; + + VncReadEvent *read_handler; + size_t read_handler_expect; + /* input */ + uint8_t modifiers_state[256]; + + Buffer zlib; + Buffer zlib_tmp; + z_stream zlib_stream[4]; + + VncState *next; +}; + /***************************************************************************** * @@ -111,4 +254,4 @@ enum { #define VNC_FEATURE_ZLIB_MASK (1 << VNC_FEATURE_ZLIB) #define VNC_FEATURE_COPYRECT_MASK (1 << VNC_FEATURE_COPYRECT) -#endif /* __VNCTIGHT_H */ +#endif /* __QEMU_VNC_H */ qemu-sasl-05-vnc-tls-vencrypt.patch: --- NEW FILE qemu-sasl-05-vnc-tls-vencrypt.patch --- This patch refactors the existing TLS code to make the main VNC code more managable. The code moves to two new files - vnc-tls.c: generic helpers for TLS handshake & credential setup - vnc-auth-vencrypt.c: the actual VNC TLS authentication mechanism. The reason for this split is that there are other TLS based auth mechanisms which we may like to use in the future. These can all share the same vnc-tls.c routines. In addition this will facilitate anyone who may want to port the vnc-tls.c file to allow for choice of GNUTLS & NSS for impl. The TLS state is moved out of the VncState struct, and into a separate VncStateTLS struct, defined in vnc-tls.h. This is then referenced from the main VncState. End size of the struct is the same, but it keeps things a little more managable. The vnc.h file gains a bunch more function prototypes, for functions in vnc.c that were previously static, but now need to be accessed from the separate auth code files. The only TLS related code still in the main vl.c is the command line argument handling / setup, and the low level I/O routines calling gnutls_send/recv. Makefile | 11 b/vnc-auth-vencrypt.c | 167 ++++++++++++++ b/vnc-auth-vencrypt.h | 33 ++ b/vnc-tls.c | 414 +++++++++++++++++++++++++++++++++++ b/vnc-tls.h | 70 ++++++ vnc.c | 581 +++----------------------------------------------- vnc.h | 76 ++++-- 7 files changed, 780 insertions(+), 572 deletions(-) Signed-off-by: Daniel P. Berrange diff -r dfa890dd7417 Makefile --- a/Makefile Mon Feb 23 13:05:49 2009 +0000 +++ b/Makefile Mon Feb 23 13:06:22 2009 +0000 @@ -145,6 +145,9 @@ ifdef CONFIG_CURSES OBJS+=curses.o endif OBJS+=vnc.o d3des.o +ifdef CONFIG_VNC_TLS +OBJS+=vnc-tls.o vnc-auth-vencrypt.o +endif ifdef CONFIG_COCOA OBJS+=cocoa.o @@ -168,10 +171,16 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) -vnc.o: vnc.c keymaps.h sdl_keysym.h vnchextile.h d3des.c d3des.h +vnc.h: vnc-tls.h vnc-auth-vencrypt.h keymaps.h + +vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) +vnc-tls.o: vnc-tls.c vnc.h + +vnc-auth-vencrypt.o: vnc-auth-vencrypt.c vnc.h + curses.o: curses.c keymaps.h curses_keys.h bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) diff -r dfa890dd7417 vnc-auth-vencrypt.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vnc-auth-vencrypt.c Mon Feb 23 13:06:22 2009 +0000 @@ -0,0 +1,167 @@ +/* + * QEMU VNC display driver: VeNCrypt authentication setup + * + * Copyright (C) 2006 Anthony Liguori + * Copyright (C) 2006 Fabrice Bellard + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "vnc.h" + + +static void start_auth_vencrypt_subauth(VncState *vs) +{ + switch (vs->vd->subauth) { + case VNC_AUTH_VENCRYPT_TLSNONE: + case VNC_AUTH_VENCRYPT_X509NONE: + VNC_DEBUG("Accept TLS auth none\n"); + vnc_write_u32(vs, 0); /* Accept auth completion */ + start_client_init(vs); + break; + + case VNC_AUTH_VENCRYPT_TLSVNC: + case VNC_AUTH_VENCRYPT_X509VNC: + VNC_DEBUG("Start TLS auth VNC\n"); + start_auth_vnc(vs); + break; + + default: /* Should not be possible, but just in case */ + VNC_DEBUG("Reject auth %d\n", vs->vd->auth); + vnc_write_u8(vs, 1); + if (vs->minor >= 8) { + static const char err[] = "Unsupported authentication type"; + vnc_write_u32(vs, sizeof(err)); + vnc_write(vs, err, sizeof(err)); + } + vnc_client_error(vs); + } +} + +static void vnc_tls_handshake_io(void *opaque); + +static int vnc_start_vencrypt_handshake(struct VncState *vs) { + int ret; + + if ((ret = gnutls_handshake(vs->tls.session)) < 0) { + if (!gnutls_error_is_fatal(ret)) { + VNC_DEBUG("Handshake interrupted (blocking)\n"); + if (!gnutls_record_get_direction(vs->tls.session)) + qemu_set_fd_handler(vs->csock, vnc_tls_handshake_io, NULL, vs); + else + qemu_set_fd_handler(vs->csock, NULL, vnc_tls_handshake_io, vs); + return 0; + } + VNC_DEBUG("Handshake failed %s\n", gnutls_strerror(ret)); + vnc_client_error(vs); + return -1; + } + + if (vs->vd->tls.x509verify) { + if (vnc_tls_validate_certificate(vs) < 0) { + VNC_DEBUG("Client verification failed\n"); + vnc_client_error(vs); + return -1; + } else { + VNC_DEBUG("Client verification passed\n"); + } + } + + VNC_DEBUG("Handshake done, switching to TLS data mode\n"); + vs->tls.wiremode = VNC_WIREMODE_TLS; + qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, vnc_client_write, vs); + + start_auth_vencrypt_subauth(vs); + + return 0; +} + +static void vnc_tls_handshake_io(void *opaque) { + struct VncState *vs = (struct VncState *)opaque; + + VNC_DEBUG("Handshake IO continue\n"); + vnc_start_vencrypt_handshake(vs); +} + + + +#define NEED_X509_AUTH(vs) \ + ((vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509NONE || \ + (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509VNC || \ + (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509PLAIN) + + +static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len) +{ + int auth = read_u32(data, 0); + + if (auth != vs->vd->subauth) { + VNC_DEBUG("Rejecting auth %d\n", auth); + vnc_write_u8(vs, 0); /* Reject auth */ + vnc_flush(vs); + vnc_client_error(vs); + } else { + VNC_DEBUG("Accepting auth %d, setting up TLS for handshake\n", auth); + vnc_write_u8(vs, 1); /* Accept auth */ + vnc_flush(vs); + + if (vnc_tls_client_setup(vs, NEED_X509_AUTH(vs)) < 0) { + VNC_DEBUG("Failed to setup TLS\n"); + return 0; + } + + VNC_DEBUG("Start TLS VeNCrypt handshake process\n"); + if (vnc_start_vencrypt_handshake(vs) < 0) { + VNC_DEBUG("Failed to start TLS handshake\n"); + return 0; + } + } + return 0; +} + +static int protocol_client_vencrypt_init(VncState *vs, uint8_t *data, size_t len) +{ + if (data[0] != 0 || + data[1] != 2) { + VNC_DEBUG("Unsupported VeNCrypt protocol %d.%d\n", (int)data[0], (int)data[1]); + vnc_write_u8(vs, 1); /* Reject version */ + vnc_flush(vs); + vnc_client_error(vs); + } else { + VNC_DEBUG("Sending allowed auth %d\n", vs->vd->subauth); + vnc_write_u8(vs, 0); /* Accept version */ + vnc_write_u8(vs, 1); /* Number of sub-auths */ + vnc_write_u32(vs, vs->vd->subauth); /* The supported auth */ + vnc_flush(vs); + vnc_read_when(vs, protocol_client_vencrypt_auth, 4); + } + return 0; +} + + +void start_auth_vencrypt(VncState *vs) +{ + /* Send VeNCrypt version 0.2 */ + vnc_write_u8(vs, 0); + vnc_write_u8(vs, 2); + + vnc_read_when(vs, protocol_client_vencrypt_init, 2); +} + diff -r dfa890dd7417 vnc-auth-vencrypt.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vnc-auth-vencrypt.h Mon Feb 23 13:06:22 2009 +0000 @@ -0,0 +1,33 @@ +/* + * QEMU VNC display driver + * + * Copyright (C) 2006 Anthony Liguori + * Copyright (C) 2006 Fabrice Bellard + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + + +#ifndef __QEMU_VNC_AUTH_VENCRYPT_H__ +#define __QEMU_VNC_AUTH_VENCRYPT_H__ + +void start_auth_vencrypt(VncState *vs); + +#endif /* __QEMU_VNC_AUTH_VENCRYPT_H__ */ diff -r dfa890dd7417 vnc-tls.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vnc-tls.c Mon Feb 23 13:06:22 2009 +0000 @@ -0,0 +1,414 @@ +/* + * QEMU VNC display driver: TLS helpers + * + * Copyright (C) 2006 Anthony Liguori + * Copyright (C) 2006 Fabrice Bellard + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "vnc.h" +#include "qemu_socket.h" + +#if defined(_VNC_DEBUG) && _VNC_DEBUG >= 2 +/* Very verbose, so only enabled for _VNC_DEBUG >= 2 */ +static void vnc_debug_gnutls_log(int level, const char* str) { + VNC_DEBUG("%d %s", level, str); +} +#endif /* defined(_VNC_DEBUG) && _VNC_DEBUG >= 2 */ + + +#define DH_BITS 1024 +static gnutls_dh_params_t dh_params; + +static int vnc_tls_initialize(void) +{ + static int tlsinitialized = 0; + + if (tlsinitialized) + return 1; + + if (gnutls_global_init () < 0) + return 0; + + /* XXX ought to re-generate diffie-hellmen params periodically */ + if (gnutls_dh_params_init (&dh_params) < 0) + return 0; + if (gnutls_dh_params_generate2 (dh_params, DH_BITS) < 0) + return 0; + +#if defined(_VNC_DEBUG) && _VNC_DEBUG >= 2 + gnutls_global_set_log_level(10); + gnutls_global_set_log_function(vnc_debug_gnutls_log); +#endif + + tlsinitialized = 1; + + return 1; +} + +static ssize_t vnc_tls_push(gnutls_transport_ptr_t transport, + const void *data, + size_t len) { + struct VncState *vs = (struct VncState *)transport; + int ret; + + retry: + ret = send(vs->csock, data, len, 0); + if (ret < 0) { + if (errno == EINTR) + goto retry; + return -1; + } + return ret; +} + + +static ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport, + void *data, + size_t len) { + struct VncState *vs = (struct VncState *)transport; + int ret; + + retry: + ret = recv(vs->csock, data, len, 0); + if (ret < 0) { + if (errno == EINTR) + goto retry; + return -1; + } + return ret; +} + + +static gnutls_anon_server_credentials vnc_tls_initialize_anon_cred(void) +{ + gnutls_anon_server_credentials anon_cred; + int ret; + + if ((ret = gnutls_anon_allocate_server_credentials(&anon_cred)) < 0) { + VNC_DEBUG("Cannot allocate credentials %s\n", gnutls_strerror(ret)); + return NULL; + } + + gnutls_anon_set_server_dh_params(anon_cred, dh_params); + + return anon_cred; +} + + +static gnutls_certificate_credentials_t vnc_tls_initialize_x509_cred(VncDisplay *vd) +{ + gnutls_certificate_credentials_t x509_cred; + int ret; + + if (!vd->tls.x509cacert) { + VNC_DEBUG("No CA x509 certificate specified\n"); + return NULL; + } + if (!vd->tls.x509cert) { + VNC_DEBUG("No server x509 certificate specified\n"); + return NULL; + } + if (!vd->tls.x509key) { + VNC_DEBUG("No server private key specified\n"); + return NULL; + } + + if ((ret = gnutls_certificate_allocate_credentials(&x509_cred)) < 0) { + VNC_DEBUG("Cannot allocate credentials %s\n", gnutls_strerror(ret)); + return NULL; + } + if ((ret = gnutls_certificate_set_x509_trust_file(x509_cred, + vd->tls.x509cacert, + GNUTLS_X509_FMT_PEM)) < 0) { + VNC_DEBUG("Cannot load CA certificate %s\n", gnutls_strerror(ret)); + gnutls_certificate_free_credentials(x509_cred); + return NULL; + } + + if ((ret = gnutls_certificate_set_x509_key_file (x509_cred, + vd->tls.x509cert, + vd->tls.x509key, + GNUTLS_X509_FMT_PEM)) < 0) { + VNC_DEBUG("Cannot load certificate & key %s\n", gnutls_strerror(ret)); + gnutls_certificate_free_credentials(x509_cred); + return NULL; + } + + if (vd->tls.x509cacrl) { + if ((ret = gnutls_certificate_set_x509_crl_file(x509_cred, + vd->tls.x509cacrl, + GNUTLS_X509_FMT_PEM)) < 0) { + VNC_DEBUG("Cannot load CRL %s\n", gnutls_strerror(ret)); + gnutls_certificate_free_credentials(x509_cred); + return NULL; + } + } + + gnutls_certificate_set_dh_params (x509_cred, dh_params); + + return x509_cred; +} + + +int vnc_tls_validate_certificate(struct VncState *vs) +{ + int ret; + unsigned int status; + const gnutls_datum_t *certs; + unsigned int nCerts, i; + time_t now; + + VNC_DEBUG("Validating client certificate\n"); + if ((ret = gnutls_certificate_verify_peers2 (vs->tls.session, &status)) < 0) { + VNC_DEBUG("Verify failed %s\n", gnutls_strerror(ret)); + return -1; + } + + if ((now = time(NULL)) == ((time_t)-1)) { + return -1; + } + + if (status != 0) { + if (status & GNUTLS_CERT_INVALID) + VNC_DEBUG("The certificate is not trusted.\n"); + + if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) + VNC_DEBUG("The certificate hasn't got a known issuer.\n"); + + if (status & GNUTLS_CERT_REVOKED) + VNC_DEBUG("The certificate has been revoked.\n"); + + if (status & GNUTLS_CERT_INSECURE_ALGORITHM) + VNC_DEBUG("The certificate uses an insecure algorithm\n"); + + return -1; + } else { + VNC_DEBUG("Certificate is valid!\n"); + } + + /* Only support x509 for now */ + if (gnutls_certificate_type_get(vs->tls.session) != GNUTLS_CRT_X509) + return -1; + + if (!(certs = gnutls_certificate_get_peers(vs->tls.session, &nCerts))) + return -1; + + for (i = 0 ; i < nCerts ; i++) { + gnutls_x509_crt_t cert; + VNC_DEBUG ("Checking certificate chain %d\n", i); + if (gnutls_x509_crt_init (&cert) < 0) + return -1; + + if (gnutls_x509_crt_import(cert, &certs[i], GNUTLS_X509_FMT_DER) < 0) { + gnutls_x509_crt_deinit (cert); + return -1; + } + + if (gnutls_x509_crt_get_expiration_time (cert) < now) { + VNC_DEBUG("The certificate has expired\n"); + gnutls_x509_crt_deinit (cert); + return -1; + } + + if (gnutls_x509_crt_get_activation_time (cert) > now) { + VNC_DEBUG("The certificate is not yet activated\n"); + gnutls_x509_crt_deinit (cert); + return -1; + } + + if (gnutls_x509_crt_get_activation_time (cert) > now) { + VNC_DEBUG("The certificate is not yet activated\n"); + gnutls_x509_crt_deinit (cert); + return -1; + } + + gnutls_x509_crt_deinit (cert); + } + + return 0; +} + + +int vnc_tls_client_setup(struct VncState *vs, + int needX509Creds) { + static const int cert_type_priority[] = { GNUTLS_CRT_X509, 0 }; + static const int protocol_priority[]= { GNUTLS_TLS1_1, GNUTLS_TLS1_0, GNUTLS_SSL3, 0 }; + static const int kx_anon[] = {GNUTLS_KX_ANON_DH, 0}; + static const int kx_x509[] = {GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, GNUTLS_KX_DHE_RSA, GNUTLS_KX_SRP, 0}; + + VNC_DEBUG("Do TLS setup\n"); + if (vnc_tls_initialize() < 0) { + VNC_DEBUG("Failed to init TLS\n"); + vnc_client_error(vs); + return -1; + } + if (vs->tls.session == NULL) { + if (gnutls_init(&vs->tls.session, GNUTLS_SERVER) < 0) { + vnc_client_error(vs); + return -1; + } + + if (gnutls_set_default_priority(vs->tls.session) < 0) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + vnc_client_error(vs); + return -1; + } + + if (gnutls_kx_set_priority(vs->tls.session, needX509Creds ? kx_x509 : kx_anon) < 0) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + vnc_client_error(vs); + return -1; + } + + if (gnutls_certificate_type_set_priority(vs->tls.session, cert_type_priority) < 0) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + vnc_client_error(vs); + return -1; + } + + if (gnutls_protocol_set_priority(vs->tls.session, protocol_priority) < 0) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + vnc_client_error(vs); + return -1; + } + + if (needX509Creds) { + gnutls_certificate_server_credentials x509_cred = vnc_tls_initialize_x509_cred(vs->vd); + if (!x509_cred) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + vnc_client_error(vs); + return -1; + } + if (gnutls_credentials_set(vs->tls.session, GNUTLS_CRD_CERTIFICATE, x509_cred) < 0) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + gnutls_certificate_free_credentials(x509_cred); + vnc_client_error(vs); + return -1; + } + if (vs->vd->tls.x509verify) { + VNC_DEBUG("Requesting a client certificate\n"); + gnutls_certificate_server_set_request (vs->tls.session, GNUTLS_CERT_REQUEST); + } + + } else { + gnutls_anon_server_credentials anon_cred = vnc_tls_initialize_anon_cred(); + if (!anon_cred) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + vnc_client_error(vs); + return -1; + } + if (gnutls_credentials_set(vs->tls.session, GNUTLS_CRD_ANON, anon_cred) < 0) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + gnutls_anon_free_server_credentials(anon_cred); + vnc_client_error(vs); + return -1; + } + } + + gnutls_transport_set_ptr(vs->tls.session, (gnutls_transport_ptr_t)vs); + gnutls_transport_set_push_function(vs->tls.session, vnc_tls_push); + gnutls_transport_set_pull_function(vs->tls.session, vnc_tls_pull); + } + return 0; +} + + +void vnc_tls_client_cleanup(struct VncState *vs) +{ + if (vs->tls.session) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + } + vs->tls.wiremode = VNC_WIREMODE_CLEAR; +} + + + +static int vnc_set_x509_credential(VncDisplay *vd, + const char *certdir, + const char *filename, + char **cred, + int ignoreMissing) +{ + struct stat sb; + + if (*cred) { + qemu_free(*cred); + *cred = NULL; + } + + *cred = qemu_malloc(strlen(certdir) + strlen(filename) + 2); + + strcpy(*cred, certdir); + strcat(*cred, "/"); + strcat(*cred, filename); + + VNC_DEBUG("Check %s\n", *cred); + if (stat(*cred, &sb) < 0) { + qemu_free(*cred); + *cred = NULL; + if (ignoreMissing && errno == ENOENT) + return 0; + return -1; + } + + return 0; +} + + +#define X509_CA_CERT_FILE "ca-cert.pem" +#define X509_CA_CRL_FILE "ca-crl.pem" +#define X509_SERVER_KEY_FILE "server-key.pem" +#define X509_SERVER_CERT_FILE "server-cert.pem" + + +int vnc_tls_set_x509_creds_dir(VncDisplay *vd, + const char *certdir) +{ + if (vnc_set_x509_credential(vd, certdir, X509_CA_CERT_FILE, &vd->tls.x509cacert, 0) < 0) + goto cleanup; + if (vnc_set_x509_credential(vd, certdir, X509_CA_CRL_FILE, &vd->tls.x509cacrl, 1) < 0) + goto cleanup; + if (vnc_set_x509_credential(vd, certdir, X509_SERVER_CERT_FILE, &vd->tls.x509cert, 0) < 0) + goto cleanup; + if (vnc_set_x509_credential(vd, certdir, X509_SERVER_KEY_FILE, &vd->tls.x509key, 0) < 0) + goto cleanup; + + return 0; + + cleanup: + qemu_free(vd->tls.x509cacert); + qemu_free(vd->tls.x509cacrl); + qemu_free(vd->tls.x509cert); + qemu_free(vd->tls.x509key); + vd->tls.x509cacert = vd->tls.x509cacrl = vd->tls.x509cert = vd->tls.x509key = NULL; + return -1; +} + diff -r dfa890dd7417 vnc-tls.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vnc-tls.h Mon Feb 23 13:06:22 2009 +0000 @@ -0,0 +1,70 @@ +/* + * QEMU VNC display driver. TLS helpers + * + * Copyright (C) 2006 Anthony Liguori + * Copyright (C) 2006 Fabrice Bellard + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + + +#ifndef __QEMU_VNC_TLS_H__ +#define __QEMU_VNC_TLS_H__ + +#include +#include + +enum { + VNC_WIREMODE_CLEAR, + VNC_WIREMODE_TLS, +}; + +typedef struct VncDisplayTLS VncDisplayTLS; +typedef struct VncStateTLS VncStateTLS; + +/* Server state */ +struct VncDisplayTLS { + int x509verify; /* Non-zero if server requests & validates client cert */ + + /* Paths to x509 certs/keys */ + char *x509cacert; + char *x509cacrl; + char *x509cert; + char *x509key; +}; + +/* Per client state */ +struct VncStateTLS { + /* Whether data is being TLS encrypted yet */ + int wiremode; + gnutls_session_t session; +}; + +int vnc_tls_client_setup(VncState *vs, int x509Creds); +void vnc_tls_client_cleanup(VncState *vs); + +int vnc_tls_validate_certificate(VncState *vs); + +int vnc_tls_set_x509_creds_dir(VncDisplay *vd, + const char *path); + + +#endif /* __QEMU_VNC_TLS_H__ */ + diff -r dfa890dd7417 vnc.c --- a/vnc.c Mon Feb 23 13:05:49 2009 +0000 +++ b/vnc.c Mon Feb 23 13:06:22 2009 +0000 @@ -34,21 +34,6 @@ #include "vnc_keysym.h" #include "d3des.h" -// #define _VNC_DEBUG 1 - -#ifdef _VNC_DEBUG -#define VNC_DEBUG(fmt, ...) do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0) - -#if defined(CONFIG_VNC_TLS) && _VNC_DEBUG >= 2 -/* Very verbose, so only enabled for _VNC_DEBUG >= 2 */ -static void vnc_debug_gnutls_log(int level, const char* str) { - VNC_DEBUG("%d %s", level, str); -} -#endif /* CONFIG_VNC_TLS && _VNC_DEBUG */ -#else -#define VNC_DEBUG(fmt, ...) do { } while (0) -#endif - #define count_bits(c, v) { \ for (c = 0; v; v >>= 1) \ { \ @@ -204,14 +189,7 @@ static inline uint32_t vnc_has_feature(V 3) resolutions > 1024 */ -static void vnc_write(VncState *vs, const void *data, size_t len); -static void vnc_write_u32(VncState *vs, uint32_t value); -static void vnc_write_s32(VncState *vs, int32_t value); -static void vnc_write_u16(VncState *vs, uint16_t value); -static void vnc_write_u8(VncState *vs, uint8_t value); -static void vnc_flush(VncState *vs); static void vnc_update_client(void *opaque); -static void vnc_client_read(void *opaque); static void vnc_colordepth(VncState *vs); @@ -867,10 +845,7 @@ static int vnc_client_io_error(VncState if (vs->input.buffer) qemu_free(vs->input.buffer); if (vs->output.buffer) qemu_free(vs->output.buffer); #ifdef CONFIG_VNC_TLS - if (vs->tls_session) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - } + vnc_tls_client_cleanup(vs); #endif /* CONFIG_VNC_TLS */ audio_del(vs); @@ -896,19 +871,20 @@ static int vnc_client_io_error(VncState return ret; } -static void vnc_client_error(VncState *vs) + +void vnc_client_error(VncState *vs) { vnc_client_io_error(vs, -1, EINVAL); } -static void vnc_client_write(void *opaque) +void vnc_client_write(void *opaque) { long ret; VncState *vs = opaque; #ifdef CONFIG_VNC_TLS - if (vs->tls_session) { - ret = gnutls_write(vs->tls_session, vs->output.buffer, vs->output.offset); + if (vs->tls.session) { + ret = gnutls_write(vs->tls.session, vs->output.buffer, vs->output.offset); if (ret < 0) { if (ret == GNUTLS_E_AGAIN) errno = EAGAIN; @@ -931,13 +907,13 @@ static void vnc_client_write(void *opaqu } } -static void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting) +void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting) { vs->read_handler = func; vs->read_handler_expect = expecting; } -static void vnc_client_read(void *opaque) +void vnc_client_read(void *opaque) { VncState *vs = opaque; long ret; @@ -945,8 +921,8 @@ static void vnc_client_read(void *opaque buffer_reserve(&vs->input, 4096); #ifdef CONFIG_VNC_TLS - if (vs->tls_session) { - ret = gnutls_read(vs->tls_session, buffer_end(&vs->input), 4096); + if (vs->tls.session) { + ret = gnutls_read(vs->tls.session, buffer_end(&vs->input), 4096); if (ret < 0) { if (ret == GNUTLS_E_AGAIN) errno = EAGAIN; @@ -980,7 +956,7 @@ static void vnc_client_read(void *opaque } } -static void vnc_write(VncState *vs, const void *data, size_t len) +void vnc_write(VncState *vs, const void *data, size_t len) { buffer_reserve(&vs->output, len); @@ -991,12 +967,12 @@ static void vnc_write(VncState *vs, cons buffer_append(&vs->output, data, len); } -static void vnc_write_s32(VncState *vs, int32_t value) +void vnc_write_s32(VncState *vs, int32_t value) { vnc_write_u32(vs, *(uint32_t *)&value); } -static void vnc_write_u32(VncState *vs, uint32_t value) +void vnc_write_u32(VncState *vs, uint32_t value) { uint8_t buf[4]; @@ -1008,7 +984,7 @@ static void vnc_write_u32(VncState *vs, vnc_write(vs, buf, 4); } -static void vnc_write_u16(VncState *vs, uint16_t value) +void vnc_write_u16(VncState *vs, uint16_t value) { uint8_t buf[2]; @@ -1018,74 +994,39 @@ static void vnc_write_u16(VncState *vs, vnc_write(vs, buf, 2); } -static void vnc_write_u8(VncState *vs, uint8_t value) +void vnc_write_u8(VncState *vs, uint8_t value) { vnc_write(vs, (char *)&value, 1); } -static void vnc_flush(VncState *vs) +void vnc_flush(VncState *vs) { if (vs->output.offset) vnc_client_write(vs); } -static uint8_t read_u8(uint8_t *data, size_t offset) +uint8_t read_u8(uint8_t *data, size_t offset) { return data[offset]; } -static uint16_t read_u16(uint8_t *data, size_t offset) +uint16_t read_u16(uint8_t *data, size_t offset) { return ((data[offset] & 0xFF) << 8) | (data[offset + 1] & 0xFF); } -static int32_t read_s32(uint8_t *data, size_t offset) +int32_t read_s32(uint8_t *data, size_t offset) { return (int32_t)((data[offset] << 24) | (data[offset + 1] << 16) | (data[offset + 2] << 8) | data[offset + 3]); } -static uint32_t read_u32(uint8_t *data, size_t offset) +uint32_t read_u32(uint8_t *data, size_t offset) { return ((data[offset] << 24) | (data[offset + 1] << 16) | (data[offset + 2] << 8) | data[offset + 3]); } -#ifdef CONFIG_VNC_TLS -static ssize_t vnc_tls_push(gnutls_transport_ptr_t transport, - const void *data, - size_t len) { - struct VncState *vs = (struct VncState *)transport; - int ret; - - retry: - ret = send(vs->csock, data, len, 0); - if (ret < 0) { - if (errno == EINTR) - goto retry; - return -1; - } - return ret; -} - - -static ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport, - void *data, - size_t len) { - struct VncState *vs = (struct VncState *)transport; - int ret; - - retry: - ret = recv(vs->csock, data, len, 0); - if (ret < 0) { - if (errno == EINTR) - goto retry; - return -1; - } - return ret; -} -#endif /* CONFIG_VNC_TLS */ - static void client_cut_text(VncState *vs, size_t len, uint8_t *text) { } @@ -1668,6 +1609,11 @@ static int protocol_client_init(VncState return 0; } +void start_client_init(VncState *vs) +{ + vnc_read_when(vs, protocol_client_init, 1); +} + static void make_challenge(VncState *vs) { int i; @@ -1723,12 +1669,12 @@ static int protocol_client_auth_vnc(VncS vnc_write_u32(vs, 0); /* Accept auth */ vnc_flush(vs); - vnc_read_when(vs, protocol_client_init, 1); + start_client_init(vs); } return 0; } -static int start_auth_vnc(VncState *vs) +void start_auth_vnc(VncState *vs) { make_challenge(vs); /* Send client a 'random' challenge */ @@ -1736,411 +1682,9 @@ static int start_auth_vnc(VncState *vs) vnc_flush(vs); vnc_read_when(vs, protocol_client_auth_vnc, sizeof(vs->challenge)); - return 0; } -#ifdef CONFIG_VNC_TLS -#define DH_BITS 1024 -static gnutls_dh_params_t dh_params; - -static int vnc_tls_initialize(void) -{ - static int tlsinitialized = 0; - - if (tlsinitialized) - return 1; - - if (gnutls_global_init () < 0) - return 0; - - /* XXX ought to re-generate diffie-hellmen params periodically */ - if (gnutls_dh_params_init (&dh_params) < 0) - return 0; - if (gnutls_dh_params_generate2 (dh_params, DH_BITS) < 0) - return 0; - -#if defined(_VNC_DEBUG) && _VNC_DEBUG >= 2 - gnutls_global_set_log_level(10); - gnutls_global_set_log_function(vnc_debug_gnutls_log); -#endif - - tlsinitialized = 1; - - return 1; -} - -static gnutls_anon_server_credentials vnc_tls_initialize_anon_cred(void) -{ - gnutls_anon_server_credentials anon_cred; - int ret; - - if ((ret = gnutls_anon_allocate_server_credentials(&anon_cred)) < 0) { - VNC_DEBUG("Cannot allocate credentials %s\n", gnutls_strerror(ret)); - return NULL; - } - - gnutls_anon_set_server_dh_params(anon_cred, dh_params); - - return anon_cred; -} - - -static gnutls_certificate_credentials_t vnc_tls_initialize_x509_cred(VncState *vs) -{ - gnutls_certificate_credentials_t x509_cred; - int ret; - - if (!vs->vd->x509cacert) { - VNC_DEBUG("No CA x509 certificate specified\n"); - return NULL; - } - if (!vs->vd->x509cert) { - VNC_DEBUG("No server x509 certificate specified\n"); - return NULL; - } - if (!vs->vd->x509key) { - VNC_DEBUG("No server private key specified\n"); - return NULL; - } - - if ((ret = gnutls_certificate_allocate_credentials(&x509_cred)) < 0) { - VNC_DEBUG("Cannot allocate credentials %s\n", gnutls_strerror(ret)); - return NULL; - } - if ((ret = gnutls_certificate_set_x509_trust_file(x509_cred, - vs->vd->x509cacert, - GNUTLS_X509_FMT_PEM)) < 0) { - VNC_DEBUG("Cannot load CA certificate %s\n", gnutls_strerror(ret)); - gnutls_certificate_free_credentials(x509_cred); - return NULL; - } - - if ((ret = gnutls_certificate_set_x509_key_file (x509_cred, - vs->vd->x509cert, - vs->vd->x509key, - GNUTLS_X509_FMT_PEM)) < 0) { - VNC_DEBUG("Cannot load certificate & key %s\n", gnutls_strerror(ret)); - gnutls_certificate_free_credentials(x509_cred); - return NULL; - } - - if (vs->vd->x509cacrl) { - if ((ret = gnutls_certificate_set_x509_crl_file(x509_cred, - vs->vd->x509cacrl, - GNUTLS_X509_FMT_PEM)) < 0) { - VNC_DEBUG("Cannot load CRL %s\n", gnutls_strerror(ret)); - gnutls_certificate_free_credentials(x509_cred); - return NULL; - } - } - - gnutls_certificate_set_dh_params (x509_cred, dh_params); - - return x509_cred; -} - -static int vnc_validate_certificate(struct VncState *vs) -{ - int ret; - unsigned int status; - const gnutls_datum_t *certs; - unsigned int nCerts, i; - time_t now; - - VNC_DEBUG("Validating client certificate\n"); - if ((ret = gnutls_certificate_verify_peers2 (vs->tls_session, &status)) < 0) { - VNC_DEBUG("Verify failed %s\n", gnutls_strerror(ret)); - return -1; - } - - if ((now = time(NULL)) == ((time_t)-1)) { - return -1; - } - - if (status != 0) { - if (status & GNUTLS_CERT_INVALID) - VNC_DEBUG("The certificate is not trusted.\n"); - - if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) - VNC_DEBUG("The certificate hasn't got a known issuer.\n"); - - if (status & GNUTLS_CERT_REVOKED) - VNC_DEBUG("The certificate has been revoked.\n"); - - if (status & GNUTLS_CERT_INSECURE_ALGORITHM) - VNC_DEBUG("The certificate uses an insecure algorithm\n"); - - return -1; - } else { - VNC_DEBUG("Certificate is valid!\n"); - } - - /* Only support x509 for now */ - if (gnutls_certificate_type_get(vs->tls_session) != GNUTLS_CRT_X509) - return -1; - - if (!(certs = gnutls_certificate_get_peers(vs->tls_session, &nCerts))) - return -1; - - for (i = 0 ; i < nCerts ; i++) { - gnutls_x509_crt_t cert; - VNC_DEBUG ("Checking certificate chain %d\n", i); - if (gnutls_x509_crt_init (&cert) < 0) - return -1; - - if (gnutls_x509_crt_import(cert, &certs[i], GNUTLS_X509_FMT_DER) < 0) { - gnutls_x509_crt_deinit (cert); - return -1; - } - - if (gnutls_x509_crt_get_expiration_time (cert) < now) { - VNC_DEBUG("The certificate has expired\n"); - gnutls_x509_crt_deinit (cert); - return -1; - } - - if (gnutls_x509_crt_get_activation_time (cert) > now) { - VNC_DEBUG("The certificate is not yet activated\n"); - gnutls_x509_crt_deinit (cert); - return -1; - } - - if (gnutls_x509_crt_get_activation_time (cert) > now) { - VNC_DEBUG("The certificate is not yet activated\n"); - gnutls_x509_crt_deinit (cert); - return -1; - } - - gnutls_x509_crt_deinit (cert); - } - - return 0; -} - - -static int start_auth_vencrypt_subauth(VncState *vs) -{ - switch (vs->vd->subauth) { - case VNC_AUTH_VENCRYPT_TLSNONE: - case VNC_AUTH_VENCRYPT_X509NONE: - VNC_DEBUG("Accept TLS auth none\n"); - vnc_write_u32(vs, 0); /* Accept auth completion */ - vnc_read_when(vs, protocol_client_init, 1); - break; - - case VNC_AUTH_VENCRYPT_TLSVNC: - case VNC_AUTH_VENCRYPT_X509VNC: - VNC_DEBUG("Start TLS auth VNC\n"); - return start_auth_vnc(vs); - - default: /* Should not be possible, but just in case */ - VNC_DEBUG("Reject auth %d\n", vs->vd->auth); - vnc_write_u8(vs, 1); - if (vs->minor >= 8) { - static const char err[] = "Unsupported authentication type"; - vnc_write_u32(vs, sizeof(err)); - vnc_write(vs, err, sizeof(err)); - } - vnc_client_error(vs); - } - - return 0; -} - -static void vnc_handshake_io(void *opaque); - -static int vnc_continue_handshake(struct VncState *vs) { - int ret; - - if ((ret = gnutls_handshake(vs->tls_session)) < 0) { - if (!gnutls_error_is_fatal(ret)) { - VNC_DEBUG("Handshake interrupted (blocking)\n"); - if (!gnutls_record_get_direction(vs->tls_session)) - qemu_set_fd_handler(vs->csock, vnc_handshake_io, NULL, vs); - else - qemu_set_fd_handler(vs->csock, NULL, vnc_handshake_io, vs); - return 0; - } - VNC_DEBUG("Handshake failed %s\n", gnutls_strerror(ret)); - vnc_client_error(vs); - return -1; - } - - if (vs->vd->x509verify) { - if (vnc_validate_certificate(vs) < 0) { - VNC_DEBUG("Client verification failed\n"); - vnc_client_error(vs); - return -1; - } else { - VNC_DEBUG("Client verification passed\n"); - } - } - - VNC_DEBUG("Handshake done, switching to TLS data mode\n"); - vs->wiremode = VNC_WIREMODE_TLS; - qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, vnc_client_write, vs); - - return start_auth_vencrypt_subauth(vs); -} - -static void vnc_handshake_io(void *opaque) { - struct VncState *vs = (struct VncState *)opaque; - - VNC_DEBUG("Handshake IO continue\n"); - vnc_continue_handshake(vs); -} - -#define NEED_X509_AUTH(vs) \ - ((vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509NONE || \ - (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509VNC || \ - (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509PLAIN) - - -static int vnc_start_tls(struct VncState *vs) { - static const int cert_type_priority[] = { GNUTLS_CRT_X509, 0 }; - static const int protocol_priority[]= { GNUTLS_TLS1_1, GNUTLS_TLS1_0, GNUTLS_SSL3, 0 }; - static const int kx_anon[] = {GNUTLS_KX_ANON_DH, 0}; - static const int kx_x509[] = {GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, GNUTLS_KX_DHE_RSA, GNUTLS_KX_SRP, 0}; - - VNC_DEBUG("Do TLS setup\n"); - if (vnc_tls_initialize() < 0) { - VNC_DEBUG("Failed to init TLS\n"); - vnc_client_error(vs); - return -1; - } - if (vs->tls_session == NULL) { - if (gnutls_init(&vs->tls_session, GNUTLS_SERVER) < 0) { - vnc_client_error(vs); - return -1; - } - - if (gnutls_set_default_priority(vs->tls_session) < 0) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - vnc_client_error(vs); - return -1; - } - - if (gnutls_kx_set_priority(vs->tls_session, NEED_X509_AUTH(vs) ? kx_x509 : kx_anon) < 0) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - vnc_client_error(vs); - return -1; - } - - if (gnutls_certificate_type_set_priority(vs->tls_session, cert_type_priority) < 0) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - vnc_client_error(vs); - return -1; - } - - if (gnutls_protocol_set_priority(vs->tls_session, protocol_priority) < 0) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - vnc_client_error(vs); - return -1; - } - - if (NEED_X509_AUTH(vs)) { - gnutls_certificate_server_credentials x509_cred = vnc_tls_initialize_x509_cred(vs); - if (!x509_cred) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - vnc_client_error(vs); - return -1; - } - if (gnutls_credentials_set(vs->tls_session, GNUTLS_CRD_CERTIFICATE, x509_cred) < 0) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - gnutls_certificate_free_credentials(x509_cred); - vnc_client_error(vs); - return -1; - } - if (vs->vd->x509verify) { - VNC_DEBUG("Requesting a client certificate\n"); - gnutls_certificate_server_set_request (vs->tls_session, GNUTLS_CERT_REQUEST); - } - - } else { - gnutls_anon_server_credentials anon_cred = vnc_tls_initialize_anon_cred(); - if (!anon_cred) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - vnc_client_error(vs); - return -1; - } - if (gnutls_credentials_set(vs->tls_session, GNUTLS_CRD_ANON, anon_cred) < 0) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - gnutls_anon_free_server_credentials(anon_cred); - vnc_client_error(vs); - return -1; - } - } - - gnutls_transport_set_ptr(vs->tls_session, (gnutls_transport_ptr_t)vs); - gnutls_transport_set_push_function(vs->tls_session, vnc_tls_push); - gnutls_transport_set_pull_function(vs->tls_session, vnc_tls_pull); - } - - VNC_DEBUG("Start TLS handshake process\n"); - return vnc_continue_handshake(vs); -} - -static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len) -{ - int auth = read_u32(data, 0); - - if (auth != vs->vd->subauth) { - VNC_DEBUG("Rejecting auth %d\n", auth); - vnc_write_u8(vs, 0); /* Reject auth */ - vnc_flush(vs); - vnc_client_error(vs); - } else { - VNC_DEBUG("Accepting auth %d, starting handshake\n", auth); - vnc_write_u8(vs, 1); /* Accept auth */ - vnc_flush(vs); - - if (vnc_start_tls(vs) < 0) { - VNC_DEBUG("Failed to complete TLS\n"); - return 0; - } - } - return 0; -} - -static int protocol_client_vencrypt_init(VncState *vs, uint8_t *data, size_t len) -{ - if (data[0] != 0 || - data[1] != 2) { - VNC_DEBUG("Unsupported VeNCrypt protocol %d.%d\n", (int)data[0], (int)data[1]); - vnc_write_u8(vs, 1); /* Reject version */ - vnc_flush(vs); - vnc_client_error(vs); - } else { - VNC_DEBUG("Sending allowed auth %d\n", vs->vd->subauth); - vnc_write_u8(vs, 0); /* Accept version */ - vnc_write_u8(vs, 1); /* Number of sub-auths */ - vnc_write_u32(vs, vs->vd->subauth); /* The supported auth */ - vnc_flush(vs); - vnc_read_when(vs, protocol_client_vencrypt_auth, 4); - } - return 0; -} - -static int start_auth_vencrypt(VncState *vs) -{ - /* Send VeNCrypt version 0.2 */ - vnc_write_u8(vs, 0); - vnc_write_u8(vs, 2); - - vnc_read_when(vs, protocol_client_vencrypt_init, 2); - return 0; -} -#endif /* CONFIG_VNC_TLS */ - static int protocol_client_auth(VncState *vs, uint8_t *data, size_t len) { /* We only advertise 1 auth scheme at a time, so client @@ -2163,17 +1707,19 @@ static int protocol_client_auth(VncState vnc_write_u32(vs, 0); /* Accept auth completion */ vnc_flush(vs); } - vnc_read_when(vs, protocol_client_init, 1); + start_client_init(vs); break; case VNC_AUTH_VNC: VNC_DEBUG("Start VNC auth\n"); - return start_auth_vnc(vs); + start_auth_vnc(vs); + break; #ifdef CONFIG_VNC_TLS case VNC_AUTH_VENCRYPT: VNC_DEBUG("Accept VeNCrypt auth\n");; - return start_auth_vencrypt(vs); + start_auth_vencrypt(vs); + break; #endif /* CONFIG_VNC_TLS */ default: /* Should not be possible, but just in case */ @@ -2226,7 +1772,7 @@ static int protocol_version(VncState *vs VNC_DEBUG("Tell client auth none\n"); vnc_write_u32(vs, vs->vd->auth); vnc_flush(vs); - vnc_read_when(vs, protocol_client_init, 1); + start_client_init(vs); } else if (vs->vd->auth == VNC_AUTH_VNC) { VNC_DEBUG("Tell client VNC auth\n"); vnc_write_u32(vs, vs->vd->auth); @@ -2328,61 +1874,6 @@ void vnc_display_init(DisplayState *ds) register_displaychangelistener(ds, dcl); } -#ifdef CONFIG_VNC_TLS -static int vnc_set_x509_credential(VncDisplay *vs, - const char *certdir, - const char *filename, - char **cred, - int ignoreMissing) -{ - struct stat sb; - - if (*cred) { - qemu_free(*cred); - *cred = NULL; - } - - *cred = qemu_malloc(strlen(certdir) + strlen(filename) + 2); - - strcpy(*cred, certdir); - strcat(*cred, "/"); - strcat(*cred, filename); - - VNC_DEBUG("Check %s\n", *cred); - if (stat(*cred, &sb) < 0) { - qemu_free(*cred); - *cred = NULL; - if (ignoreMissing && errno == ENOENT) - return 0; - return -1; - } - - return 0; -} - -static int vnc_set_x509_credential_dir(VncDisplay *vs, - const char *certdir) -{ - if (vnc_set_x509_credential(vs, certdir, X509_CA_CERT_FILE, &vs->x509cacert, 0) < 0) - goto cleanup; - if (vnc_set_x509_credential(vs, certdir, X509_CA_CRL_FILE, &vs->x509cacrl, 1) < 0) - goto cleanup; - if (vnc_set_x509_credential(vs, certdir, X509_SERVER_CERT_FILE, &vs->x509cert, 0) < 0) - goto cleanup; - if (vnc_set_x509_credential(vs, certdir, X509_SERVER_KEY_FILE, &vs->x509key, 0) < 0) - goto cleanup; - - return 0; - - cleanup: - qemu_free(vs->x509cacert); - qemu_free(vs->x509cacrl); - qemu_free(vs->x509cert); - qemu_free(vs->x509key); - vs->x509cacert = vs->x509cacrl = vs->x509cert = vs->x509key = NULL; - return -1; -} -#endif /* CONFIG_VNC_TLS */ void vnc_display_close(DisplayState *ds) { @@ -2402,7 +1893,7 @@ void vnc_display_close(DisplayState *ds) vs->auth = VNC_AUTH_INVALID; #ifdef CONFIG_VNC_TLS vs->subauth = VNC_AUTH_INVALID; - vs->x509verify = 0; + vs->tls.x509verify = 0; #endif } @@ -2458,7 +1949,7 @@ int vnc_display_open(DisplayState *ds, c char *start, *end; x509 = 1; /* Require x509 certificates */ if (strncmp(options, "x509verify", 10) == 0) - vs->x509verify = 1; /* ...and verify client certs */ + vs->tls.x509verify = 1; /* ...and verify client certs */ /* Now check for 'x509=/some/path' postfix * and use that to setup x509 certificate/key paths */ @@ -2469,7 +1960,7 @@ int vnc_display_open(DisplayState *ds, c char *path = qemu_strndup(start + 1, len); VNC_DEBUG("Trying certificate path '%s'\n", path); - if (vnc_set_x509_credential_dir(vs, path) < 0) { + if (vnc_tls_set_x509_creds_dir(vs, path) < 0) { fprintf(stderr, "Failed to find x509 certificates/keys in %s\n", path); qemu_free(path); qemu_free(vs->display); diff -r dfa890dd7417 vnc.h --- a/vnc.h Mon Feb 23 13:05:49 2009 +0000 +++ b/vnc.h Mon Feb 23 13:06:22 2009 +0000 @@ -32,12 +32,15 @@ #include "audio/audio.h" #include -#ifdef CONFIG_VNC_TLS -#include -#include -#endif /* CONFIG_VNC_TLS */ +#include "keymaps.h" -#include "keymaps.h" +// #define _VNC_DEBUG 1 + +#ifdef _VNC_DEBUG +#define VNC_DEBUG(fmt, ...) do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0) +#else +#define VNC_DEBUG(fmt, ...) do { } while (0) +#endif /***************************************************************************** * @@ -72,6 +75,11 @@ typedef void VncSendHextileTile(VncState typedef struct VncDisplay VncDisplay; +#ifdef CONFIG_VNC_TLS +#include "vnc-tls.h" +#include "vnc-auth-vencrypt.h" +#endif + struct VncDisplay { int lsock; @@ -83,13 +91,8 @@ struct VncDisplay char *password; int auth; #ifdef CONFIG_VNC_TLS - int subauth; - int x509verify; - - char *x509cacert; - char *x509cacrl; - char *x509cert; - char *x509key; + int subauth; /* Used by VeNCrypt */ + VncDisplayTLS tls; #endif }; @@ -117,8 +120,7 @@ struct VncState char challenge[VNC_AUTH_CHALLENGE_SIZE]; #ifdef CONFIG_VNC_TLS - int wiremode; - gnutls_session_t tls_session; + VncStateTLS tls; #endif Buffer output; @@ -162,12 +164,6 @@ enum { VNC_AUTH_VENCRYPT = 19 }; -#ifdef CONFIG_VNC_TLS -enum { - VNC_WIREMODE_CLEAR, - VNC_WIREMODE_TLS, -}; - enum { VNC_AUTH_VENCRYPT_PLAIN = 256, VNC_AUTH_VENCRYPT_TLSNONE = 257, @@ -178,12 +174,6 @@ enum { VNC_AUTH_VENCRYPT_X509PLAIN = 262, }; -#define X509_CA_CERT_FILE "ca-cert.pem" -#define X509_CA_CRL_FILE "ca-crl.pem" -#define X509_SERVER_KEY_FILE "server-key.pem" -#define X509_SERVER_CERT_FILE "server-cert.pem" - -#endif /* CONFIG_VNC_TLS */ /***************************************************************************** * @@ -254,4 +244,38 @@ enum { #define VNC_FEATURE_ZLIB_MASK (1 << VNC_FEATURE_ZLIB) #define VNC_FEATURE_COPYRECT_MASK (1 << VNC_FEATURE_COPYRECT) + +/***************************************************************************** + * + * Internal APIs + * + *****************************************************************************/ + +/* Event loop functions */ +void vnc_client_read(void *opaque); +void vnc_client_write(void *opaque); + + +/* Protocol I/O functions */ +void vnc_write(VncState *vs, const void *data, size_t len); +void vnc_write_u32(VncState *vs, uint32_t value); +void vnc_write_s32(VncState *vs, int32_t value); +void vnc_write_u16(VncState *vs, uint16_t value); +void vnc_write_u8(VncState *vs, uint8_t value); +void vnc_flush(VncState *vs); +void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting); + + +/* Buffer I/O functions */ +uint8_t read_u8(uint8_t *data, size_t offset); +uint16_t read_u16(uint8_t *data, size_t offset); +int32_t read_s32(uint8_t *data, size_t offset); +uint32_t read_u32(uint8_t *data, size_t offset); + +/* Protocol stage functions */ +void vnc_client_error(VncState *vs); + +void start_client_init(VncState *vs); +void start_auth_vnc(VncState *vs); + #endif /* __QEMU_VNC_H */ qemu-sasl-06-vnc-sasl.patch: --- NEW FILE qemu-sasl-06-vnc-sasl.patch --- This patch adds the new SASL authentication protocol to the VNC server. It is enabled by setting the 'sasl' flag when launching VNC. SASL can optionally provide encryption via its SSF layer, if a suitable mechanism is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is not available, then it should be combined with the x509 VNC authentication protocol which provides encryption. eg, if using GSSAPI qemu -vnc localhost:1,sasl eg if using TLS/x509 for encryption qemu -vnc localhost:1,sasl,tls,x509 By default the Cyrus SASL library will look for its configuration in the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden by setting the SASL_CONF_PATH environment variable, eg to make it look in $HOME/.sasl2. NB unprivileged users may not have access to the full range of SASL mechanisms, since some of them require some administrative privileges to configure. The patch includes an example SASL configuration file which illustrates config for GSSAPI and Digest-MD5, though it should be noted that the latter is not really considered secure any more. Most of the SASL authentication code is located in a separate source file, vnc-auth-sasl.c. The main vnc.c file only contains minimal integration glue, specifically parsing of command line flags / setup, and calls to start the SASL auth process, to do encoding/decoding for data. There are several possible stacks for reading & writing of data, depending on the combo of VNC authentication methods in use - Clear. read/write straight to socket - TLS. read/write via GNUTLS helpers - SASL. encode/decode via SASL SSF layer, then read/write to socket - SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS Hence, the vnc_client_read & vnc_client_write methods have been refactored a little. vnc_client_read: main entry point for reading, calls either - vnc_client_read_plain reading, with no intermediate decoding - vnc_client_read_sasl reading, with SASL SSF decoding These two methods, then call vnc_client_read_buf(). This decides whether to write to the socket directly or write via GNUTLS. The situation is the same for writing data. More extensive comments have been added in the code / patch. The vnc_client_read_sasl and vnc_client_write_sasl method implementations live in the separate vnc-auth-sasl.c file. The state required for the SASL auth mechanism is kept in a separate VncStateSASL struct, defined in vnc-auth-sasl.h and included in the main VncState. The configure script probes for SASL and automatically enables it if found, unless --disable-vnc-sasl was given to override it. Makefile | 7 Makefile.target | 5 b/qemu.sasl | 34 ++ b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++ b/vnc-auth-sasl.h | 67 +++++ configure | 34 ++ qemu-doc.texi | 97 ++++++++ vnc-auth-vencrypt.c | 12 vnc.c | 249 ++++++++++++++++++-- vnc.h | 31 ++ 10 files changed, 1129 insertions(+), 33 deletions(-) Signed-off-by: Daniel P. Berrange diff -r 6981d4d832a9 Makefile --- a/Makefile Mon Mar 02 11:13:33 2009 +0000 +++ b/Makefile Mon Mar 02 11:13:38 2009 +0000 @@ -148,6 +148,9 @@ OBJS+=vnc.o d3des.o ifdef CONFIG_VNC_TLS OBJS+=vnc-tls.o vnc-auth-vencrypt.o endif +ifdef CONFIG_VNC_SASL +OBJS+=vnc-auth-sasl.o +endif ifdef CONFIG_COCOA OBJS+=cocoa.o @@ -171,7 +174,7 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) -vnc.h: vnc-tls.h vnc-auth-vencrypt.h keymaps.h +vnc.h: vnc-tls.h vnc-auth-vencrypt.h vnc-auth-sasl.h keymaps.h vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h @@ -181,6 +184,8 @@ vnc-tls.o: vnc-tls.c vnc.h vnc-auth-vencrypt.o: vnc-auth-vencrypt.c vnc.h +vnc-auth-sasl.o: vnc-auth-sasl.c vnc.h + curses.o: curses.c keymaps.h curses_keys.h bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) diff -r 6981d4d832a9 Makefile.target --- a/Makefile.target Mon Mar 02 11:13:33 2009 +0000 +++ b/Makefile.target Mon Mar 02 11:13:38 2009 +0000 @@ -554,6 +554,11 @@ CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS) LIBS += $(CONFIG_VNC_TLS_LIBS) endif +ifdef CONFIG_VNC_SASL +CPPFLAGS += $(CONFIG_VNC_SASL_CFLAGS) +LIBS += $(CONFIG_VNC_SASL_LIBS) +endif + ifdef CONFIG_BLUEZ LIBS += $(CONFIG_BLUEZ_LIBS) endif diff -r 6981d4d832a9 configure --- a/configure Mon Mar 02 11:13:33 2009 +0000 +++ b/configure Mon Mar 02 11:13:38 2009 +0000 @@ -164,6 +164,7 @@ fmod_lib="" fmod_inc="" oss_lib="" vnc_tls="yes" +vnc_sasl="yes" bsd="no" linux="no" solaris="no" @@ -387,6 +388,8 @@ for opt do ;; --disable-vnc-tls) vnc_tls="no" ;; + --disable-vnc-sasl) vnc_sasl="no" + ;; --disable-slirp) slirp="no" ;; --disable-vde) vde="no" @@ -544,6 +547,7 @@ echo " Availab echo " --enable-mixemu enable mixer emulation" echo " --disable-brlapi disable BrlAPI" echo " --disable-vnc-tls disable TLS encryption for VNC server" +echo " --disable-vnc-sasl disable SASL encryption for VNC server" echo " --disable-curses disable curses output" echo " --disable-bluez disable bluez stack connectivity" echo " --disable-kvm disable KVM acceleration support" @@ -823,6 +827,25 @@ EOF fi ########################################## +# VNC SASL detection +if test "$vnc_sasl" = "yes" ; then +cat > $TMPC < +#include +int main(void) { sasl_server_init(NULL, "qemu"); return 0; } +EOF + # Assuming Cyrus-SASL installed in /usr prefix + vnc_sasl_cflags="" + vnc_sasl_libs="-lsasl2" + if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $vnc_sasl_cflags $TMPC \ + $vnc_sasl_libs 2> /dev/null ; then + : + else + vnc_sasl="no" + fi +fi + +########################################## # vde libraries probe if test "$vde" = "yes" ; then cat > $TMPC << EOF @@ -1130,6 +1153,11 @@ if test "$vnc_tls" = "yes" ; then echo " TLS CFLAGS $vnc_tls_cflags" echo " TLS LIBS $vnc_tls_libs" fi +echo "VNC SASL support $vnc_sasl" +if test "$vnc_sasl" = "yes" ; then + echo " SASL CFLAGS $vnc_sasl_cflags" + echo " SASL LIBS $vnc_sasl_libs" +fi if test -n "$sparc_cpu"; then echo "Target Sparc Arch $sparc_cpu" fi @@ -1371,6 +1399,12 @@ if test "$vnc_tls" = "yes" ; then echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak echo "#define CONFIG_VNC_TLS 1" >> $config_h fi +if test "$vnc_sasl" = "yes" ; then + echo "CONFIG_VNC_SASL=yes" >> $config_mak + echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_mak + echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_mak + echo "#define CONFIG_VNC_SASL 1" >> $config_h +fi qemu_version=`head $source_path/VERSION` echo "VERSION=$qemu_version" >>$config_mak echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h diff -r 6981d4d832a9 qemu-doc.texi --- a/qemu-doc.texi Mon Mar 02 11:13:33 2009 +0000 +++ b/qemu-doc.texi Mon Mar 02 11:13:38 2009 +0000 @@ -616,6 +616,21 @@ path following this option specifies whe be loaded from. See the @ref{vnc_security} section for details on generating certificates. + at item sasl + +Require that the client use SASL to authenticate with the VNC server. +The exact choice of authentication method used is controlled from the +system / user's SASL configuration file for the 'qemu' service. This +is typically found in /etc/sasl2/qemu.conf. If running QEMU as an +unprivileged user, an environment variable SASL_CONF_PATH can be used +to make it search alternate locations for the service config. +While some SASL auth methods can also provide data encryption (eg GSSAPI), +it is recommended that SASL always be combined with the 'tls' and +'x509' settings to enable use of SSL and server certificates. This +ensures a data encryption preventing compromise of authentication +credentials. See the @ref{vnc_security} section for details on using +SASL authentication. + @end table @end table @@ -2061,7 +2076,10 @@ considerations depending on the deployme * vnc_sec_certificate:: * vnc_sec_certificate_verify:: * vnc_sec_certificate_pw:: +* vnc_sec_sasl:: +* vnc_sec_certificate_sasl:: * vnc_generate_cert:: +* vnc_setup_sasl:: @end menu @node vnc_sec_none @subsection Without passwords @@ -2144,6 +2162,41 @@ Password: ******** (qemu) @end example + + at node vnc_sec_sasl + at subsection With SASL authentication + +The SASL authentication method is a VNC extension, that provides an +easily extendable, pluggable authentication method. This allows for +integration with a wide range of authentication mechanisms, such as +PAM, GSSAPI/Kerberos, LDAP, SQL databases, one-time keys and more. +The strength of the authentication depends on the exact mechanism +configured. If the chosen mechanism also provides a SSF layer, then +it will encrypt the datastream as well. + +Refer to the later docs on how to choose the exact SASL mechanism +used for authentication, but assuming use of one supporting SSF, +then QEMU can be launched with: + + at example +qemu [...OPTIONS...] -vnc :1,sasl -monitor stdio + at end example + + at node vnc_sec_certificate_sasl + at subsection With x509 certificates and SASL authentication + +If the desired SASL authentication mechanism does not supported +SSF layers, then it is strongly advised to run it in combination +with TLS and x509 certificates. This provides securely encrypted +data stream, avoiding risk of compromising of the security +credentials. This can be enabled, by combining the 'sasl' option +with the aforementioned TLS + x509 options: + + at example +qemu [...OPTIONS...] -vnc :1,tls,x509,sasl -monitor stdio + at end example + + @node vnc_generate_cert @subsection Generating certificates for VNC @@ -2255,6 +2308,50 @@ EOF The @code{client-key.pem} and @code{client-cert.pem} files should now be securely copied to the client for which they were generated. + + at node vnc_setup_sasl + + at subsection Configuring SASL mechanisms + +The following documentation assumes use of the Cyrus SASL implementation on a +Linux host, but the principals should apply to any other SASL impl. When SASL +is enabled, the mechanism configuration will be loaded from system default +SASL service config /etc/sasl2/qemu.conf. If running QEMU as an +unprivileged user, an environment variable SASL_CONF_PATH can be used +to make it search alternate locations for the service config. + +The default configuration might contain + + at example +mech_list: digest-md5 +sasldb_path: /etc/qemu/passwd.db + at end example + +This says to use the 'Digest MD5' mechanism, which is similar to the HTTP +Digest-MD5 mechanism. The list of valid usernames & passwords is maintained +in the /etc/qemu/passwd.db file, and can be updated using the saslpasswd2 +command. While this mechanism is easy to configure and use, it is not +considered secure by modern standards, so only suitable for developers / +ad-hoc testing. + +A more serious deployment might use Kerberos, which is done with the 'gssapi' +mechanism + + at example +mech_list: gssapi +keytab: /etc/qemu/krb5.tab + at end example + +For this to work the administrator of your KDC must generate a Kerberos +principal for the server, with a name of 'qemu/somehost.example.com@@EXAMPLE.COM' +replacing 'somehost.example.com' with the fully qualified host name of the +machine running QEMU, and 'EXAMPLE.COM' with the Keberos Realm. + +Other configurations will be left as an exercise for the reader. It should +be noted that only Digest-MD5 and GSSAPI provides a SSF layer for data +encryption. For all other mechanisms, VNC should always be configured to +use TLS and x509 certificates to protect security credentials from snooping. + @node gdb_usage @section GDB usage diff -r 6981d4d832a9 qemu.sasl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qemu.sasl Mon Mar 02 11:13:38 2009 +0000 @@ -0,0 +1,34 @@ +# If you want to use the non-TLS socket, then you *must* include +# the GSSAPI or DIGEST-MD5 mechanisms, because they are the only +# ones that can offer session encryption as well as authentication. +# +# If you're only using TLS, then you can turn on any mechanisms +# you like for authentication, because TLS provides the encryption +# +# Default to a simple username+password mechanism +# NB digest-md5 is no longer considered secure by current standards +mech_list: digest-md5 + +# Before you can use GSSAPI, you need a service principle on the +# KDC server for libvirt, and that to be exported to the keytab +# file listed below +#mech_list: gssapi +# +# You can also list many mechanisms at once, then the user can choose +# by adding '?auth=sasl.gssapi' to their libvirt URI, eg +# qemu+tcp://hostname/system?auth=sasl.gssapi +#mech_list: digest-md5 gssapi + +# Some older builds of MIT kerberos on Linux ignore this option & +# instead need KRB5_KTNAME env var. +# For modern Linux, and other OS, this should be sufficient +keytab: /etc/qemu/krb5.tab + +# If using digest-md5 for username/passwds, then this is the file +# containing the passwds. Use 'saslpasswd2 -a qemu [username]' +# to add entries, and 'sasldblistusers2 -a qemu' to browse it +sasldb_path: /etc/qemu/passwd.db + + +auxprop_plugin: sasldb + diff -r 6981d4d832a9 vnc-auth-sasl.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vnc-auth-sasl.c Mon Mar 02 11:13:38 2009 +0000 @@ -0,0 +1,626 @@ +/* + * QEMU VNC display driver: SASL auth protocol + * + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "vnc.h" + +/* Max amount of data we send/recv for SASL steps to prevent DOS */ +#define SASL_DATA_MAX_LEN (1024 * 1024) + + +void vnc_sasl_client_cleanup(VncState *vs) +{ + if (vs->sasl.conn) { + vs->sasl.runSSF = vs->sasl.waitWriteSSF = vs->sasl.wantSSF = 0; + vs->sasl.encodedLength = vs->sasl.encodedOffset = 0; + vs->sasl.encoded = NULL; + free(vs->sasl.username); + free(vs->sasl.mechlist); + vs->sasl.username = vs->sasl.mechlist = NULL; + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + } +} + + +long vnc_client_write_sasl(VncState *vs) +{ + long ret; + + VNC_DEBUG("Write SASL: Pending output %p size %d offset %d Encoded: %p size %d offset %d\n", + vs->output.buffer, vs->output.capacity, vs->output.offset, + vs->sasl.encoded, vs->sasl.encodedLength, vs->sasl.encodedOffset); + + if (!vs->sasl.encoded) { + int err; + err = sasl_encode(vs->sasl.conn, + (char *)vs->output.buffer, + vs->output.offset, + (const char **)&vs->sasl.encoded, + &vs->sasl.encodedLength); + if (err != SASL_OK) + return vnc_client_io_error(vs, -1, EIO); + + vs->sasl.encodedOffset = 0; + } + + ret = vnc_client_write_buf(vs, + vs->sasl.encoded + vs->sasl.encodedOffset, + vs->sasl.encodedLength - vs->sasl.encodedOffset); + if (!ret) + return 0; + + vs->sasl.encodedOffset += ret; + if (vs->sasl.encodedOffset == vs->sasl.encodedLength) { + vs->output.offset = 0; + vs->sasl.encoded = NULL; + vs->sasl.encodedOffset = vs->sasl.encodedLength = 0; + } + + /* Can't merge this block with one above, because + * someone might have written more unencrypted + * data in vs->output while we were processing + * SASL encoded output + */ + if (vs->output.offset == 0) { + qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, NULL, vs); + } + + return ret; +} + + +long vnc_client_read_sasl(VncState *vs) +{ + long ret; + uint8_t encoded[4096]; + const char *decoded; + unsigned int decodedLen; + int err; + + ret = vnc_client_read_buf(vs, encoded, sizeof(encoded)); + if (!ret) + return 0; + + err = sasl_decode(vs->sasl.conn, + (char *)encoded, ret, + &decoded, &decodedLen); + + if (err != SASL_OK) + return vnc_client_io_error(vs, -1, -EIO); + VNC_DEBUG("Read SASL Encoded %p size %ld Decoded %p size %d\n", + encoded, ret, decoded, decodedLen); + buffer_reserve(&vs->input, decodedLen); + buffer_append(&vs->input, decoded, decodedLen); + return decodedLen; +} + + +static int vnc_auth_sasl_check_access(VncState *vs) +{ + const void *val; + int err; + + err = sasl_getprop(vs->sasl.conn, SASL_USERNAME, &val); + if (err != SASL_OK) { + VNC_DEBUG("cannot query SASL username on connection %d (%s)\n", + err, sasl_errstring(err, NULL, NULL)); + return -1; + } + if (val == NULL) { + VNC_DEBUG("no client username was found\n"); + return -1; + } + VNC_DEBUG("SASL client username %s\n", (const char *)val); + + vs->sasl.username = qemu_strdup((const char*)val); + + return 0; +} + +static int vnc_auth_sasl_check_ssf(VncState *vs) +{ + const void *val; + int err, ssf; + + if (!vs->sasl.wantSSF) + return 1; + + err = sasl_getprop(vs->sasl.conn, SASL_SSF, &val); + if (err != SASL_OK) + return 0; + + ssf = *(const int *)val; + VNC_DEBUG("negotiated an SSF of %d\n", ssf); + if (ssf < 56) + return 0; /* 56 is good for Kerberos */ + + /* Only setup for read initially, because we're about to send an RPC + * reply which must be in plain text. When the next incoming RPC + * arrives, we'll switch on writes too + * + * cf qemudClientReadSASL in qemud.c + */ + vs->sasl.runSSF = 1; + + /* We have a SSF that's good enough */ + return 1; +} + +/* + * Step Msg + * + * Input from client: + * + * u32 clientin-length + * u8-array clientin-string + * + * Output to client: + * + * u32 serverout-length + * u8-array serverout-strin + * u8 continue + */ + +static int protocol_client_auth_sasl_step_len(VncState *vs, uint8_t *data, size_t len); + +static int protocol_client_auth_sasl_step(VncState *vs, uint8_t *data, size_t len) +{ + uint32_t datalen = len; + const char *serverout; + unsigned int serveroutlen; + int err; + char *clientdata = NULL; + + /* NB, distinction of NULL vs "" is *critical* in SASL */ + if (datalen) { + clientdata = (char*)data; + clientdata[datalen-1] = '\0'; /* Wire includes '\0', but make sure */ + datalen--; /* Don't count NULL byte when passing to _start() */ + } + + VNC_DEBUG("Step using SASL Data %p (%d bytes)\n", + clientdata, datalen); + err = sasl_server_step(vs->sasl.conn, + clientdata, + datalen, + &serverout, + &serveroutlen); + if (err != SASL_OK && + err != SASL_CONTINUE) { + VNC_DEBUG("sasl step failed %d (%s)\n", + err, sasl_errdetail(vs->sasl.conn)); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + + if (serveroutlen > SASL_DATA_MAX_LEN) { + VNC_DEBUG("sasl step reply data too long %d\n", + serveroutlen); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + + VNC_DEBUG("SASL return data %d bytes, nil; %d\n", + serveroutlen, serverout ? 0 : 1); + + if (serveroutlen) { + vnc_write_u32(vs, serveroutlen + 1); + vnc_write(vs, serverout, serveroutlen + 1); + } else { + vnc_write_u32(vs, 0); + } + + /* Whether auth is complete */ + vnc_write_u8(vs, err == SASL_CONTINUE ? 0 : 1); + + if (err == SASL_CONTINUE) { + VNC_DEBUG("%s", "Authentication must continue\n"); + /* Wait for step length */ + vnc_read_when(vs, protocol_client_auth_sasl_step_len, 4); + } else { + if (!vnc_auth_sasl_check_ssf(vs)) { + VNC_DEBUG("Authentication rejected for weak SSF %d\n", vs->csock); + goto authreject; + } + + /* Check username whitelist ACL */ + if (vnc_auth_sasl_check_access(vs) < 0) { + VNC_DEBUG("Authentication rejected for ACL %d\n", vs->csock); + goto authreject; + } + + VNC_DEBUG("Authentication successful %d\n", vs->csock); + vnc_write_u32(vs, 0); /* Accept auth */ + /* + * Delay writing in SSF encoded mode until pending output + * buffer is written + */ + if (vs->sasl.runSSF) + vs->sasl.waitWriteSSF = vs->output.offset; + start_client_init(vs); + } + + return 0; + + authreject: + vnc_write_u32(vs, 1); /* Reject auth */ + vnc_write_u32(vs, sizeof("Authentication failed")); + vnc_write(vs, "Authentication failed", sizeof("Authentication failed")); + vnc_flush(vs); + vnc_client_error(vs); + return -1; + + authabort: + vnc_client_error(vs); + return -1; +} + +static int protocol_client_auth_sasl_step_len(VncState *vs, uint8_t *data, size_t len) +{ + uint32_t steplen = read_u32(data, 0); + VNC_DEBUG("Got client step len %d\n", steplen); + if (steplen > SASL_DATA_MAX_LEN) { + VNC_DEBUG("Too much SASL data %d\n", steplen); + vnc_client_error(vs); + return -1; + } + + if (steplen == 0) + return protocol_client_auth_sasl_step(vs, NULL, 0); + else + vnc_read_when(vs, protocol_client_auth_sasl_step, steplen); + return 0; +} + +/* + * Start Msg + * + * Input from client: + * + * u32 clientin-length + * u8-array clientin-string + * + * Output to client: + * + * u32 serverout-length + * u8-array serverout-strin + * u8 continue + */ + +#define SASL_DATA_MAX_LEN (1024 * 1024) + +static int protocol_client_auth_sasl_start(VncState *vs, uint8_t *data, size_t len) +{ + uint32_t datalen = len; + const char *serverout; + unsigned int serveroutlen; + int err; + char *clientdata = NULL; + + /* NB, distinction of NULL vs "" is *critical* in SASL */ + if (datalen) { + clientdata = (char*)data; + clientdata[datalen-1] = '\0'; /* Should be on wire, but make sure */ + datalen--; /* Don't count NULL byte when passing to _start() */ + } + + VNC_DEBUG("Start SASL auth with mechanism %s. Data %p (%d bytes)\n", + vs->sasl.mechlist, clientdata, datalen); + err = sasl_server_start(vs->sasl.conn, + vs->sasl.mechlist, + clientdata, + datalen, + &serverout, + &serveroutlen); + if (err != SASL_OK && + err != SASL_CONTINUE) { + VNC_DEBUG("sasl start failed %d (%s)\n", + err, sasl_errdetail(vs->sasl.conn)); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + if (serveroutlen > SASL_DATA_MAX_LEN) { + VNC_DEBUG("sasl start reply data too long %d\n", + serveroutlen); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + + VNC_DEBUG("SASL return data %d bytes, nil; %d\n", + serveroutlen, serverout ? 0 : 1); + + if (serveroutlen) { + vnc_write_u32(vs, serveroutlen + 1); + vnc_write(vs, serverout, serveroutlen + 1); + } else { + vnc_write_u32(vs, 0); + } + + /* Whether auth is complete */ + vnc_write_u8(vs, err == SASL_CONTINUE ? 0 : 1); + + if (err == SASL_CONTINUE) { + VNC_DEBUG("%s", "Authentication must continue\n"); + /* Wait for step length */ + vnc_read_when(vs, protocol_client_auth_sasl_step_len, 4); + } else { + if (!vnc_auth_sasl_check_ssf(vs)) { + VNC_DEBUG("Authentication rejected for weak SSF %d\n", vs->csock); + goto authreject; + } + + /* Check username whitelist ACL */ + if (vnc_auth_sasl_check_access(vs) < 0) { + VNC_DEBUG("Authentication rejected for ACL %d\n", vs->csock); + goto authreject; + } + + VNC_DEBUG("Authentication successful %d\n", vs->csock); + vnc_write_u32(vs, 0); /* Accept auth */ + start_client_init(vs); + } + + return 0; + + authreject: + vnc_write_u32(vs, 1); /* Reject auth */ + vnc_write_u32(vs, sizeof("Authentication failed")); + vnc_write(vs, "Authentication failed", sizeof("Authentication failed")); + vnc_flush(vs); + vnc_client_error(vs); + return -1; + + authabort: + vnc_client_error(vs); + return -1; +} + +static int protocol_client_auth_sasl_start_len(VncState *vs, uint8_t *data, size_t len) +{ + uint32_t startlen = read_u32(data, 0); + VNC_DEBUG("Got client start len %d\n", startlen); + if (startlen > SASL_DATA_MAX_LEN) { + VNC_DEBUG("Too much SASL data %d\n", startlen); + vnc_client_error(vs); + return -1; + } + + if (startlen == 0) + return protocol_client_auth_sasl_start(vs, NULL, 0); + + vnc_read_when(vs, protocol_client_auth_sasl_start, startlen); + return 0; +} + +static int protocol_client_auth_sasl_mechname(VncState *vs, uint8_t *data, size_t len) +{ + char *mechname = malloc(len + 1); + if (!mechname) { + VNC_DEBUG("Out of memory reading mechname\n"); + vnc_client_error(vs); + } + strncpy(mechname, (char*)data, len); + mechname[len] = '\0'; + VNC_DEBUG("Got client mechname '%s' check against '%s'\n", + mechname, vs->sasl.mechlist); + + if (strncmp(vs->sasl.mechlist, mechname, len) == 0) { + if (vs->sasl.mechlist[len] != '\0' && + vs->sasl.mechlist[len] != ',') { + VNC_DEBUG("One %d", vs->sasl.mechlist[len]); + vnc_client_error(vs); + return -1; + } + } else { + char *offset = strstr(vs->sasl.mechlist, mechname); + VNC_DEBUG("Two %p\n", offset); + if (!offset) { + vnc_client_error(vs); + return -1; + } + VNC_DEBUG("Two '%s'\n", offset); + if (offset[-1] != ',' || + (offset[len] != '\0'&& + offset[len] != ',')) { + vnc_client_error(vs); + return -1; + } + } + + free(vs->sasl.mechlist); + vs->sasl.mechlist = mechname; + + VNC_DEBUG("Validated mechname '%s'\n", mechname); + vnc_read_when(vs, protocol_client_auth_sasl_start_len, 4); + return 0; +} + +static int protocol_client_auth_sasl_mechname_len(VncState *vs, uint8_t *data, size_t len) +{ + uint32_t mechlen = read_u32(data, 0); + VNC_DEBUG("Got client mechname len %d\n", mechlen); + if (mechlen > 100) { + VNC_DEBUG("Too long SASL mechname data %d\n", mechlen); + vnc_client_error(vs); + return -1; + } + if (mechlen < 1) { + VNC_DEBUG("Too short SASL mechname %d\n", mechlen); + vnc_client_error(vs); + return -1; + } + vnc_read_when(vs, protocol_client_auth_sasl_mechname,mechlen); + return 0; +} + +#define USES_X509_AUTH(vs) \ + ((vs)->subauth == VNC_AUTH_VENCRYPT_X509NONE || \ + (vs)->subauth == VNC_AUTH_VENCRYPT_X509VNC || \ + (vs)->subauth == VNC_AUTH_VENCRYPT_X509PLAIN || \ + (vs)->subauth == VNC_AUTH_VENCRYPT_X509SASL) + + +void start_auth_sasl(VncState *vs) +{ + const char *mechlist = NULL; + sasl_security_properties_t secprops; + int err; + char *localAddr, *remoteAddr; + int mechlistlen; + + VNC_DEBUG("Initialize SASL auth %d\n", vs->csock); + + /* Get local & remote client addresses in form IPADDR;PORT */ + if (!(localAddr = vnc_socket_local_addr("%s;%s", vs->csock))) + goto authabort; + + if (!(remoteAddr = vnc_socket_remote_addr("%s;%s", vs->csock))) { + free(localAddr); + goto authabort; + } + + err = sasl_server_new("vnc", + NULL, /* FQDN - just delegates to gethostname */ + NULL, /* User realm */ + localAddr, + remoteAddr, + NULL, /* Callbacks, not needed */ + SASL_SUCCESS_DATA, + &vs->sasl.conn); + free(localAddr); + free(remoteAddr); + localAddr = remoteAddr = NULL; + + if (err != SASL_OK) { + VNC_DEBUG("sasl context setup failed %d (%s)", + err, sasl_errstring(err, NULL, NULL)); + vs->sasl.conn = NULL; + goto authabort; + } + +#ifdef CONFIG_VNC_TLS + /* Inform SASL that we've got an external SSF layer from TLS/x509 */ + if (vs->vd->auth == VNC_AUTH_VENCRYPT && + vs->vd->subauth == VNC_AUTH_VENCRYPT_X509SASL) { + gnutls_cipher_algorithm_t cipher; + sasl_ssf_t ssf; + + cipher = gnutls_cipher_get(vs->tls.session); + if (!(ssf = (sasl_ssf_t)gnutls_cipher_get_key_size(cipher))) { + VNC_DEBUG("%s", "cannot TLS get cipher size\n"); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + ssf *= 8; /* tls key size is bytes, sasl wants bits */ + + err = sasl_setprop(vs->sasl.conn, SASL_SSF_EXTERNAL, &ssf); + if (err != SASL_OK) { + VNC_DEBUG("cannot set SASL external SSF %d (%s)\n", + err, sasl_errstring(err, NULL, NULL)); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + } else +#endif /* CONFIG_VNC_TLS */ + vs->sasl.wantSSF = 1; + + memset (&secprops, 0, sizeof secprops); + /* Inform SASL that we've got an external SSF layer from TLS */ + if (strncmp(vs->vd->display, "unix:", 5) == 0 +#ifdef CONFIG_VNC_TLS + /* Disable SSF, if using TLS+x509+SASL only. TLS without x509 + is not sufficiently strong */ + || (vs->vd->auth == VNC_AUTH_VENCRYPT && + vs->vd->subauth == VNC_AUTH_VENCRYPT_X509SASL) +#endif /* CONFIG_VNC_TLS */ + ) { + /* If we've got TLS or UNIX domain sock, we don't care about SSF */ + secprops.min_ssf = 0; + secprops.max_ssf = 0; + secprops.maxbufsize = 8192; + secprops.security_flags = 0; + } else { + /* Plain TCP, better get an SSF layer */ + secprops.min_ssf = 56; /* Good enough to require kerberos */ + secprops.max_ssf = 100000; /* Arbitrary big number */ + secprops.maxbufsize = 8192; + /* Forbid any anonymous or trivially crackable auth */ + secprops.security_flags = + SASL_SEC_NOANONYMOUS | SASL_SEC_NOPLAINTEXT; + } + + err = sasl_setprop(vs->sasl.conn, SASL_SEC_PROPS, &secprops); + if (err != SASL_OK) { + VNC_DEBUG("cannot set SASL security props %d (%s)\n", + err, sasl_errstring(err, NULL, NULL)); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + + err = sasl_listmech(vs->sasl.conn, + NULL, /* Don't need to set user */ + "", /* Prefix */ + ",", /* Separator */ + "", /* Suffix */ + &mechlist, + NULL, + NULL); + if (err != SASL_OK) { + VNC_DEBUG("cannot list SASL mechanisms %d (%s)\n", + err, sasl_errdetail(vs->sasl.conn)); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + VNC_DEBUG("Available mechanisms for client: '%s'\n", mechlist); + + if (!(vs->sasl.mechlist = strdup(mechlist))) { + VNC_DEBUG("Out of memory"); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + mechlistlen = strlen(mechlist); + vnc_write_u32(vs, mechlistlen); + vnc_write(vs, mechlist, mechlistlen); + vnc_flush(vs); + + VNC_DEBUG("Wait for client mechname length\n"); + vnc_read_when(vs, protocol_client_auth_sasl_mechname_len, 4); + + return; + + authabort: + vnc_client_error(vs); + return; +} + + diff -r 6981d4d832a9 vnc-auth-sasl.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vnc-auth-sasl.h Mon Mar 02 11:13:38 2009 +0000 @@ -0,0 +1,67 @@ +/* + * QEMU VNC display driver: SASL auth protocol + * + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + + +#ifndef __QEMU_VNC_AUTH_SASL_H__ +#define __QEMU_VNC_AUTH_SASL_H__ + + +#include + +typedef struct VncStateSASL VncStateSASL; + +struct VncStateSASL { + sasl_conn_t *conn; + /* If we want to negotiate an SSF layer with client */ + int wantSSF :1; + /* If we are now running the SSF layer */ + int runSSF :1; + /* + * If this is non-zero, then wait for that many bytes + * to be written plain, before switching to SSF encoding + * This allows the VNC auth result to finish being + * written in plain. + */ + unsigned int waitWriteSSF; + + /* + * Buffering encoded data to allow more clear data + * to be stuffed onto the output buffer + */ + const uint8_t *encoded; + unsigned int encodedLength; + unsigned int encodedOffset; + char *username; + char *mechlist; +}; + +void vnc_sasl_client_cleanup(VncState *vs); + +long vnc_client_read_sasl(VncState *vs); +long vnc_client_write_sasl(VncState *vs); + +void start_auth_sasl(VncState *vs); + +#endif /* __QEMU_VNC_AUTH_SASL_H__ */ + diff -r 6981d4d832a9 vnc-auth-vencrypt.c --- a/vnc-auth-vencrypt.c Mon Mar 02 11:13:33 2009 +0000 +++ b/vnc-auth-vencrypt.c Mon Mar 02 11:13:38 2009 +0000 @@ -43,8 +43,15 @@ static void start_auth_vencrypt_subauth( start_auth_vnc(vs); break; +#ifdef CONFIG_VNC_SASL + case VNC_AUTH_VENCRYPT_TLSSASL: + case VNC_AUTH_VENCRYPT_X509SASL: + VNC_DEBUG("Start TLS auth SASL\n"); + return start_auth_sasl(vs); +#endif /* CONFIG_VNC_SASL */ + default: /* Should not be possible, but just in case */ - VNC_DEBUG("Reject auth %d\n", vs->vd->auth); + VNC_DEBUG("Reject subauth %d server bug\n", vs->vd->auth); vnc_write_u8(vs, 1); if (vs->minor >= 8) { static const char err[] = "Unsupported authentication type"; @@ -105,7 +112,8 @@ static void vnc_tls_handshake_io(void *o #define NEED_X509_AUTH(vs) \ ((vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509NONE || \ (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509VNC || \ - (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509PLAIN) + (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509PLAIN || \ + (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509SASL) static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len) diff -r 6981d4d832a9 vnc.c --- a/vnc.c Mon Mar 02 11:13:33 2009 +0000 +++ b/vnc.c Mon Mar 02 11:13:38 2009 +0000 @@ -68,7 +68,8 @@ static char *addr_to_string(const char * return addr; } -static char *vnc_socket_local_addr(const char *format, int fd) { + +char *vnc_socket_local_addr(const char *format, int fd) { struct sockaddr_storage sa; socklen_t salen; @@ -79,7 +80,8 @@ static char *vnc_socket_local_addr(const return addr_to_string(format, &sa, salen); } -static char *vnc_socket_remote_addr(const char *format, int fd) { + +char *vnc_socket_remote_addr(const char *format, int fd) { struct sockaddr_storage sa; socklen_t salen; @@ -125,12 +127,18 @@ static const char *vnc_auth_name(VncDisp return "vencrypt+x509+vnc"; case VNC_AUTH_VENCRYPT_X509PLAIN: return "vencrypt+x509+plain"; + case VNC_AUTH_VENCRYPT_TLSSASL: + return "vencrypt+tls+sasl"; + case VNC_AUTH_VENCRYPT_X509SASL: + return "vencrypt+x509+sasl"; default: return "vencrypt"; } #else return "vencrypt"; #endif + case VNC_AUTH_SASL: + return "sasl"; } return "unknown"; } @@ -278,7 +286,7 @@ static void vnc_framebuffer_update(VncSt vnc_write_s32(vs, encoding); } -static void buffer_reserve(Buffer *buffer, size_t len) +void buffer_reserve(Buffer *buffer, size_t len) { if ((buffer->capacity - buffer->offset) < len) { buffer->capacity += (len + 1024); @@ -290,22 +298,22 @@ static void buffer_reserve(Buffer *buffe } } -static int buffer_empty(Buffer *buffer) +int buffer_empty(Buffer *buffer) { return buffer->offset == 0; } -static uint8_t *buffer_end(Buffer *buffer) +uint8_t *buffer_end(Buffer *buffer) { return buffer->buffer + buffer->offset; } -static void buffer_reset(Buffer *buffer) +void buffer_reset(Buffer *buffer) { buffer->offset = 0; } -static void buffer_append(Buffer *buffer, const void *data, size_t len) +void buffer_append(Buffer *buffer, const void *data, size_t len) { memcpy(buffer->buffer + buffer->offset, data, len); buffer->offset += len; @@ -821,7 +829,8 @@ static void audio_del(VncState *vs) } } -static int vnc_client_io_error(VncState *vs, int ret, int last_errno) + +int vnc_client_io_error(VncState *vs, int ret, int last_errno) { if (ret == 0 || ret == -1) { if (ret == -1) { @@ -847,6 +856,9 @@ static int vnc_client_io_error(VncState #ifdef CONFIG_VNC_TLS vnc_tls_client_cleanup(vs); #endif /* CONFIG_VNC_TLS */ +#ifdef CONFIG_VNC_SASL + vnc_sasl_client_cleanup(vs); +#endif /* CONFIG_VNC_SASL */ audio_del(vs); VncState *p, *parent = NULL; @@ -877,14 +889,28 @@ void vnc_client_error(VncState *vs) vnc_client_io_error(vs, -1, EINVAL); } -void vnc_client_write(void *opaque) + +/* + * Called to write a chunk of data to the client socket. The data may + * be the raw data, or may have already been encoded by SASL. + * The data will be written either straight onto the socket, or + * written via the GNUTLS wrappers, if TLS/SSL encryption is enabled + * + * NB, it is theoretically possible to have 2 layers of encryption, + * both SASL, and this TLS layer. It is highly unlikely in practice + * though, since SASL encryption will typically be a no-op if TLS + * is active + * + * Returns the number of bytes written, which may be less than + * the requested 'datalen' if the socket would block. Returns + * -1 on error, and disconnects the client socket. + */ +long vnc_client_write_buf(VncState *vs, const uint8_t *data, size_t datalen) { long ret; - VncState *vs = opaque; - #ifdef CONFIG_VNC_TLS if (vs->tls.session) { - ret = gnutls_write(vs->tls.session, vs->output.buffer, vs->output.offset); + ret = gnutls_write(vs->tls.session, data, datalen); if (ret < 0) { if (ret == GNUTLS_E_AGAIN) errno = EAGAIN; @@ -894,10 +920,42 @@ void vnc_client_write(void *opaque) } } else #endif /* CONFIG_VNC_TLS */ - ret = send(vs->csock, vs->output.buffer, vs->output.offset, 0); - ret = vnc_client_io_error(vs, ret, socket_error()); + ret = send(vs->csock, data, datalen, 0); + VNC_DEBUG("Wrote wire %p %d -> %ld\n", data, datalen, ret); + return vnc_client_io_error(vs, ret, socket_error()); +} + + +/* + * Called to write buffered data to the client socket, when not + * using any SASL SSF encryption layers. Will write as much data + * as possible without blocking. If all buffered data is written, + * will switch the FD poll() handler back to read monitoring. + * + * Returns the number of bytes written, which may be less than + * the buffered output data if the socket would block. Returns + * -1 on error, and disconnects the client socket. + */ +static long vnc_client_write_plain(VncState *vs) +{ + long ret; + +#ifdef CONFIG_VNC_SASL + VNC_DEBUG("Write Plain: Pending output %p size %d offset %d. Wait SSF %d\n", + vs->output.buffer, vs->output.capacity, vs->output.offset, + vs->sasl.waitWriteSSF); + + if (vs->sasl.conn && + vs->sasl.runSSF && + vs->sasl.waitWriteSSF) { + ret = vnc_client_write_buf(vs, vs->output.buffer, vs->sasl.waitWriteSSF); + if (ret) + vs->sasl.waitWriteSSF -= ret; + } else +#endif /* CONFIG_VNC_SASL */ + ret = vnc_client_write_buf(vs, vs->output.buffer, vs->output.offset); if (!ret) - return; + return 0; memmove(vs->output.buffer, vs->output.buffer + ret, (vs->output.offset - ret)); vs->output.offset -= ret; @@ -905,6 +963,29 @@ void vnc_client_write(void *opaque) if (vs->output.offset == 0) { qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, NULL, vs); } + + return ret; +} + + +/* + * First function called whenever there is data to be written to + * the client socket. Will delegate actual work according to whether + * SASL SSF layers are enabled (thus requiring encryption calls) + */ +void vnc_client_write(void *opaque) +{ + long ret; + VncState *vs = opaque; + +#ifdef CONFIG_VNC_SASL + if (vs->sasl.conn && + vs->sasl.runSSF && + !vs->sasl.waitWriteSSF) + ret = vnc_client_write_sasl(vs); + else +#endif /* CONFIG_VNC_SASL */ + ret = vnc_client_write_plain(vs); } void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting) @@ -913,16 +994,28 @@ void vnc_read_when(VncState *vs, VncRead vs->read_handler_expect = expecting; } -void vnc_client_read(void *opaque) + +/* + * Called to read a chunk of data from the client socket. The data may + * be the raw data, or may need to be further decoded by SASL. + * The data will be read either straight from to the socket, or + * read via the GNUTLS wrappers, if TLS/SSL encryption is enabled + * + * NB, it is theoretically possible to have 2 layers of encryption, + * both SASL, and this TLS layer. It is highly unlikely in practice + * though, since SASL encryption will typically be a no-op if TLS + * is active + * + * Returns the number of bytes read, which may be less than + * the requested 'datalen' if the socket would block. Returns + * -1 on error, and disconnects the client socket. + */ +long vnc_client_read_buf(VncState *vs, uint8_t *data, size_t datalen) { - VncState *vs = opaque; long ret; - - buffer_reserve(&vs->input, 4096); - #ifdef CONFIG_VNC_TLS if (vs->tls.session) { - ret = gnutls_read(vs->tls.session, buffer_end(&vs->input), 4096); + ret = gnutls_read(vs->tls.session, data, datalen); if (ret < 0) { if (ret == GNUTLS_E_AGAIN) errno = EAGAIN; @@ -932,13 +1025,53 @@ void vnc_client_read(void *opaque) } } else #endif /* CONFIG_VNC_TLS */ - ret = recv(vs->csock, buffer_end(&vs->input), 4096, 0); - ret = vnc_client_io_error(vs, ret, socket_error()); + ret = recv(vs->csock, data, datalen, 0); + VNC_DEBUG("Read wire %p %d -> %ld\n", data, datalen, ret); + return vnc_client_io_error(vs, ret, socket_error()); +} + + +/* + * Called to read data from the client socket to the input buffer, + * when not using any SASL SSF encryption layers. Will read as much + * data as possible without blocking. + * + * Returns the number of bytes read. Returns -1 on error, and + * disconnects the client socket. + */ +static long vnc_client_read_plain(VncState *vs) +{ + int ret; + VNC_DEBUG("Read plain %p size %d offset %d\n", + vs->input.buffer, vs->input.capacity, vs->input.offset); + buffer_reserve(&vs->input, 4096); + ret = vnc_client_read_buf(vs, buffer_end(&vs->input), 4096); + if (!ret) + return 0; + vs->input.offset += ret; + return ret; +} + + +/* + * First function called whenever there is more data to be read from + * the client socket. Will delegate actual work according to whether + * SASL SSF layers are enabled (thus requiring decryption calls) + */ +void vnc_client_read(void *opaque) +{ + VncState *vs = opaque; + long ret; + +#ifdef CONFIG_VNC_SASL + if (vs->sasl.conn && vs->sasl.runSSF) + ret = vnc_client_read_sasl(vs); + else +#endif /* CONFIG_VNC_SASL */ + ret = vnc_client_read_plain(vs); if (!ret) return; - vs->input.offset += ret; - while (vs->read_handler && vs->input.offset >= vs->read_handler_expect) { size_t len = vs->read_handler_expect; int ret; @@ -1722,6 +1855,13 @@ static int protocol_client_auth(VncState break; #endif /* CONFIG_VNC_TLS */ +#ifdef CONFIG_VNC_SASL + case VNC_AUTH_SASL: + VNC_DEBUG("Accept SASL auth\n"); + start_auth_sasl(vs); + break; +#endif /* CONFIG_VNC_SASL */ + default: /* Should not be possible, but just in case */ VNC_DEBUG("Reject auth %d\n", vs->vd->auth); vnc_write_u8(vs, 1); @@ -1923,6 +2063,10 @@ int vnc_display_open(DisplayState *ds, c #ifdef CONFIG_VNC_TLS int tls = 0, x509 = 0; #endif +#ifdef CONFIG_VNC_SASL + int sasl = 0; + int saslErr; +#endif if (!vnc_display) return -1; @@ -1942,6 +2086,10 @@ int vnc_display_open(DisplayState *ds, c reverse = 1; } else if (strncmp(options, "to=", 3) == 0) { to_port = atoi(options+3) + 5900; +#ifdef CONFIG_VNC_SASL + } else if (strncmp(options, "sasl", 4) == 0) { + sasl = 1; /* Require SASL auth */ +#endif #ifdef CONFIG_VNC_TLS } else if (strncmp(options, "tls", 3) == 0) { tls = 1; /* Require TLS */ @@ -1978,6 +2126,22 @@ int vnc_display_open(DisplayState *ds, c } } + /* + * Combinations we support here: + * + * - no-auth (clear text, no auth) + * - password (clear text, weak auth) + * - sasl (encrypt, good auth *IF* using Kerberos via GSSAPI) + * - tls (encrypt, weak anonymous creds, no auth) + * - tls + password (encrypt, weak anonymous creds, weak auth) + * - tls + sasl (encrypt, weak anonymous creds, good auth) + * - tls + x509 (encrypt, good x509 creds, no auth) + * - tls + x509 + password (encrypt, good x509 creds, weak auth) + * - tls + x509 + sasl (encrypt, good x509 creds, good auth) + * + * NB1. TLS is a stackable auth scheme. + * NB2. the x509 schemes have option to validate a client cert dname + */ if (password) { #ifdef CONFIG_VNC_TLS if (tls) { @@ -1990,13 +2154,34 @@ int vnc_display_open(DisplayState *ds, c vs->subauth = VNC_AUTH_VENCRYPT_TLSVNC; } } else { -#endif +#endif /* CONFIG_VNC_TLS */ VNC_DEBUG("Initializing VNC server with password auth\n"); vs->auth = VNC_AUTH_VNC; #ifdef CONFIG_VNC_TLS vs->subauth = VNC_AUTH_INVALID; } -#endif +#endif /* CONFIG_VNC_TLS */ +#ifdef CONFIG_VNC_SASL + } else if (sasl) { +#ifdef CONFIG_VNC_TLS + if (tls) { + vs->auth = VNC_AUTH_VENCRYPT; + if (x509) { + VNC_DEBUG("Initializing VNC server with x509 SASL auth\n"); + vs->subauth = VNC_AUTH_VENCRYPT_X509SASL; + } else { + VNC_DEBUG("Initializing VNC server with TLS SASL auth\n"); + vs->subauth = VNC_AUTH_VENCRYPT_TLSSASL; + } + } else { +#endif /* CONFIG_VNC_TLS */ + VNC_DEBUG("Initializing VNC server with SASL auth\n"); + vs->auth = VNC_AUTH_SASL; +#ifdef CONFIG_VNC_TLS + vs->subauth = VNC_AUTH_INVALID; + } +#endif /* CONFIG_VNC_TLS */ +#endif /* CONFIG_VNC_SASL */ } else { #ifdef CONFIG_VNC_TLS if (tls) { @@ -2018,6 +2203,16 @@ int vnc_display_open(DisplayState *ds, c #endif } +#ifdef CONFIG_VNC_SASL + if ((saslErr = sasl_server_init(NULL, "qemu")) != SASL_OK) { + fprintf(stderr, "Failed to initialize SASL auth %s", + sasl_errstring(saslErr, NULL, NULL)); + free(vs->display); + vs->display = NULL; + return -1; + } +#endif + if (reverse) { /* connect to viewer */ if (strncmp(display, "unix:", 5) == 0) diff -r 6981d4d832a9 vnc.h --- a/vnc.h Mon Mar 02 11:13:33 2009 +0000 +++ b/vnc.h Mon Mar 02 11:13:38 2009 +0000 @@ -79,6 +79,10 @@ typedef struct VncDisplay VncDisplay; #include "vnc-tls.h" #include "vnc-auth-vencrypt.h" #endif +#ifdef CONFIG_VNC_SASL +#include "vnc-auth-sasl.h" +#endif + struct VncDisplay { @@ -118,10 +122,12 @@ struct VncState int minor; char challenge[VNC_AUTH_CHALLENGE_SIZE]; - #ifdef CONFIG_VNC_TLS VncStateTLS tls; #endif +#ifdef CONFIG_VNC_SASL + VncStateSASL sasl; +#endif Buffer output; Buffer input; @@ -160,8 +166,9 @@ enum { VNC_AUTH_RA2NE = 6, VNC_AUTH_TIGHT = 16, VNC_AUTH_ULTRA = 17, - VNC_AUTH_TLS = 18, - VNC_AUTH_VENCRYPT = 19 + VNC_AUTH_TLS = 18, /* Supported in GTK-VNC & VINO */ + VNC_AUTH_VENCRYPT = 19, /* Supported in GTK-VNC & VeNCrypt */ + VNC_AUTH_SASL = 20, /* Supported in GTK-VNC & VINO */ }; enum { @@ -172,6 +179,8 @@ enum { VNC_AUTH_VENCRYPT_X509NONE = 260, VNC_AUTH_VENCRYPT_X509VNC = 261, VNC_AUTH_VENCRYPT_X509PLAIN = 262, + VNC_AUTH_VENCRYPT_X509SASL = 263, + VNC_AUTH_VENCRYPT_TLSSASL = 264, }; @@ -255,6 +264,8 @@ enum { void vnc_client_read(void *opaque); void vnc_client_write(void *opaque); +long vnc_client_read_buf(VncState *vs, uint8_t *data, size_t datalen); +long vnc_client_write_buf(VncState *vs, const uint8_t *data, size_t datalen); /* Protocol I/O functions */ void vnc_write(VncState *vs, const void *data, size_t len); @@ -274,8 +285,22 @@ uint32_t read_u32(uint8_t *data, size_t /* Protocol stage functions */ void vnc_client_error(VncState *vs); +int vnc_client_io_error(VncState *vs, int ret, int last_errno); void start_client_init(VncState *vs); void start_auth_vnc(VncState *vs); +/* Buffer management */ +void buffer_reserve(Buffer *buffer, size_t len); +int buffer_empty(Buffer *buffer); +uint8_t *buffer_end(Buffer *buffer); +void buffer_reset(Buffer *buffer); +void buffer_append(Buffer *buffer, const void *data, size_t len); + + +/* Misc helpers */ + +char *vnc_socket_local_addr(const char *format, int fd); +char *vnc_socket_remote_addr(const char *format, int fd); + #endif /* __QEMU_VNC_H */ qemu-sasl-07-vnc-monitor-authinfo.patch: --- NEW FILE qemu-sasl-07-vnc-monitor-authinfo.patch --- This patch extends the 'info vnc' monitor output to include information about the VNC client authentication credentials. For clients authenticated using SASL, this will output the username. For clients authenticated using x509 certificates, this will output the x509 distinguished name. Auth can be stacked, so both username & x509 dname may be shown. Server: address: 0.0.0.0:5902 auth: vencrypt+x509+sasl Client: address: 10.33.6.67:38621 x509 dname: C=GB,O=ACME,L=London,ST=London,CN=localhost username: admin Client: address: 10.33.6.63:38620 x509 dname: C=GB,O=ACME,L=London,ST=London,CN=localhost username: admin vnc-tls.c | 17 +++++++++++++++++ vnc-tls.h | 3 +++ vnc.c | 19 +++++++++++++++++-- 3 files changed, 37 insertions(+), 2 deletions(-) Signed-off-by: Daniel P. Berrange diff -r 440be37a35ea vnc-tls.c --- a/vnc-tls.c Fri Feb 20 11:46:26 2009 +0000 +++ b/vnc-tls.c Fri Feb 20 11:47:52 2009 +0000 @@ -241,6 +241,22 @@ int vnc_tls_validate_certificate(struct return -1; } + if (i == 0) { + size_t dnameSize = 1024; + vs->tls.dname = qemu_malloc(dnameSize); + requery: + if ((ret = gnutls_x509_crt_get_dn (cert, vs->tls.dname, &dnameSize)) != 0) { + if (ret == GNUTLS_E_SHORT_MEMORY_BUFFER) { + vs->tls.dname = qemu_realloc(vs->tls.dname, dnameSize); + goto requery; + } + gnutls_x509_crt_deinit (cert); + VNC_DEBUG("Cannot get client distinguished name: %s", + gnutls_strerror (ret)); + return -1; + } + } + gnutls_x509_crt_deinit (cert); } @@ -347,6 +363,7 @@ void vnc_tls_client_cleanup(struct VncSt vs->tls.session = NULL; } vs->tls.wiremode = VNC_WIREMODE_CLEAR; + free(vs->tls.dname); } diff -r 440be37a35ea vnc-tls.h --- a/vnc-tls.h Fri Feb 20 11:46:26 2009 +0000 +++ b/vnc-tls.h Fri Feb 20 11:47:52 2009 +0000 @@ -55,6 +55,9 @@ struct VncStateTLS { /* Whether data is being TLS encrypted yet */ int wiremode; gnutls_session_t session; + + /* Client's Distinguished Name from the x509 cert */ + char *dname; }; int vnc_tls_client_setup(VncState *vs, int x509Creds); diff -r 440be37a35ea vnc.c --- a/vnc.c Fri Feb 20 11:46:26 2009 +0000 +++ b/vnc.c Fri Feb 20 11:47:52 2009 +0000 @@ -156,6 +156,21 @@ static void do_info_vnc_client(VncState term_puts("Client:\n"); term_puts(clientAddr); free(clientAddr); + +#ifdef CONFIG_VNC_TLS + if (client->tls.session && + client->tls.dname) + term_printf(" x509 dname: %s\n", client->tls.dname); + else + term_puts(" x509 dname: none\n"); +#endif +#ifdef CONFIG_VNC_SASL + if (client->sasl.conn && + client->sasl.username) + term_printf(" username: %s\n", client->sasl.username); + else + term_puts(" username: none\n"); +#endif } void do_info_vnc(void) @@ -1823,7 +1838,7 @@ static int protocol_client_auth(VncState /* We only advertise 1 auth scheme at a time, so client * must pick the one we sent. Verify this */ if (data[0] != vs->vd->auth) { /* Reject auth */ - VNC_DEBUG("Reject auth %d\n", (int)data[0]); + VNC_DEBUG("Reject auth %d because it didn't match advertized\n", (int)data[0]); vnc_write_u32(vs, 1); if (vs->minor >= 8) { static const char err[] = "Authentication failed"; @@ -1863,7 +1878,7 @@ static int protocol_client_auth(VncState #endif /* CONFIG_VNC_SASL */ default: /* Should not be possible, but just in case */ - VNC_DEBUG("Reject auth %d\n", vs->vd->auth); + VNC_DEBUG("Reject auth %d server code bug\n", vs->vd->auth); vnc_write_u8(vs, 1); if (vs->minor >= 8) { static const char err[] = "Authentication failed"; qemu-sasl-08-vnc-acl-mgmt.patch: --- NEW FILE qemu-sasl-08-vnc-acl-mgmt.patch --- This patch introduces a generic internal API for access control lists to be used by network servers in QEMU. It adds support for checking these ACL in the VNC server, in two places. The first ACL is for the SASL authentication mechanism, checking the SASL username. This ACL is called 'vnc.username'. The second is for the TLS authentication mechanism, when x509 client certificates are turned on, checking against the Distinguished Name of the client. This ACL is called 'vnc.x509dname' The internal API provides for an ACL with the following characteristics - A unique name, eg vnc.username, and vnc.x509dname. - A default policy, allow or deny - An ordered series of match rules, with allow or deny policy If none of the match rules apply, then the default policy is used. There is a monitor API to manipulate the ACLs, which I'll describe via examples (qemu) acl show vnc.username policy: allow (qemu) acl policy vnc.username denya acl: policy set to 'deny' (qemu) acl allow vnc.username fred acl: added rule at position 1 (qemu) acl allow vnc.username bob acl: added rule at position 2 (qemu) acl allow vnc.username joe 1 acl: added rule at position 1 (qemu) acl show vnc.username policy: deny 0: allow fred 1: allow joe 2: allow bob (qemu) acl show vnc.x509dname policy: allow (qemu) acl policy vnc.x509dname deny acl: policy set to 'deny' (qemu) acl allow vnc.x509dname C=GB,O=ACME,L=London,CN=* acl: added rule at position 1 (qemu) acl allow vnc.x509dname C=GB,O=ACME,L=Boston,CN=bob acl: added rule at position 2 (qemu) acl show vnc.x509dname policy: deny 0: allow C=GB,O=ACME,L=London,CN=* 1: allow C=GB,O=ACME,L=Boston,CN=bob By default the VNC server will not use any ACLs, allowing access to the server if the user successfully authenticates. To enable use of ACLs to restrict user access, the ',acl' flag should be given when starting QEMU. The initial ACL activated will be a 'deny all' policy and should be customized using monitor commands. eg enable SASL auth and ACLs qemu .... -vnc localhost:1,sasl,acl The next patch will provide a way to load a pre-defined ACL when starting up Makefile | 6 + b/acl.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ b/acl.h | 74 ++++++++++++++++++++++ configure | 18 +++++ monitor.c | 95 ++++++++++++++++++++++++++++ qemu-doc.texi | 49 ++++++++++++++ vnc-auth-sasl.c | 16 +++- vnc-auth-sasl.h | 7 ++ vnc-tls.c | 19 +++++ vnc-tls.h | 3 vnc.c | 21 ++++++ vnc.h | 3 12 files changed, 491 insertions(+), 5 deletions(-) Signed-off-by: Daniel P. Berrange diff -r b1008c5c6c16 Makefile --- a/Makefile Mon Mar 02 11:13:40 2009 +0000 +++ b/Makefile Mon Mar 02 12:11:04 2009 +0000 @@ -144,7 +144,7 @@ endif ifdef CONFIG_CURSES OBJS+=curses.o endif -OBJS+=vnc.o d3des.o +OBJS+=vnc.o acl.o d3des.o ifdef CONFIG_VNC_TLS OBJS+=vnc-tls.o vnc-auth-vencrypt.o endif @@ -174,9 +174,11 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) +acl.o: acl.h acl.c + vnc.h: vnc-tls.h vnc-auth-vencrypt.h vnc-auth-sasl.h keymaps.h -vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h +vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h acl.h vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) diff -r b1008c5c6c16 acl.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/acl.c Mon Mar 02 12:11:04 2009 +0000 @@ -0,0 +1,185 @@ +/* + * QEMU access control list management + * + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + + +#include "qemu-common.h" +#include "sysemu.h" +#include "acl.h" + +#ifdef HAVE_FNMATCH_H +#include +#endif + + +static unsigned int nacls = 0; +static qemu_acl **acls = NULL; + + + +qemu_acl *qemu_acl_find(const char *aclname) +{ + int i; + for (i = 0 ; i < nacls ; i++) { + if (strcmp(acls[i]->aclname, aclname) == 0) + return acls[i]; + } + + return NULL; +} + +qemu_acl *qemu_acl_init(const char *aclname) +{ + qemu_acl *acl; + + acl = qemu_acl_find(aclname); + if (acl) + return acl; + + acl = qemu_malloc(sizeof(*acl)); + acl->aclname = qemu_strdup(aclname); + /* Deny by default, so there is no window of "open + * access" between QEMU starting, and the user setting + * up ACLs in the monitor */ + acl->defaultDeny = 1; + + acl->nentries = 0; + TAILQ_INIT(&acl->entries); + + acls = qemu_realloc(acls, sizeof(*acls) * (nacls +1)); + acls[nacls] = acl; + nacls++; + + return acl; +} + +int qemu_acl_party_is_allowed(qemu_acl *acl, + const char *party) +{ + qemu_acl_entry *entry; + + TAILQ_FOREACH(entry, &acl->entries, next) { +#ifdef HAVE_FNMATCH_H + if (fnmatch(entry->match, party, 0) == 0) + return entry->deny ? 0 : 1; +#else + /* No fnmatch, so fallback to exact string matching + * instead of allowing wildcards */ + if (strcmp(entry->match, party) == 0) + return entry->deny ? 0 : 1; +#endif + } + + return acl->defaultDeny ? 0 : 1; +} + + +void qemu_acl_reset(qemu_acl *acl) +{ + qemu_acl_entry *entry; + + /* Put back to deny by default, so there is no window + * of "open access" while the user re-initializes the + * access control list */ + acl->defaultDeny = 1; + TAILQ_FOREACH(entry, &acl->entries, next) { + TAILQ_REMOVE(&acl->entries, entry, next); + free(entry->match); + free(entry); + } + acl->nentries = 0; +} + + +int qemu_acl_append(qemu_acl *acl, + int deny, + const char *match) +{ + qemu_acl_entry *entry; + + entry = qemu_malloc(sizeof(*entry)); + entry->match = qemu_strdup(match); + entry->deny = deny; + + TAILQ_INSERT_TAIL(&acl->entries, entry, next); + acl->nentries++; + + return acl->nentries; +} + + +int qemu_acl_insert(qemu_acl *acl, + int deny, + const char *match, + int index) +{ + qemu_acl_entry *entry; + qemu_acl_entry *tmp; + int i = 0; + + if (index <= 0) + return -1; + if (index >= acl->nentries) + return qemu_acl_append(acl, deny, match); + + + entry = qemu_malloc(sizeof(*entry)); + entry->match = qemu_strdup(match); + entry->deny = deny; + + TAILQ_FOREACH(tmp, &acl->entries, next) { + i++; + if (i == index) { + TAILQ_INSERT_BEFORE(tmp, entry, next); + acl->nentries++; + break; + } + } + + return i; +} + +int qemu_acl_remove(qemu_acl *acl, + const char *match) +{ + qemu_acl_entry *entry; + int i = 0; + + TAILQ_FOREACH(entry, &acl->entries, next) { + i++; + if (strcmp(entry->match, match) == 0) { + TAILQ_REMOVE(&acl->entries, entry, next); + return i; + } + } + return -1; +} + + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * tab-width: 8 + * End: + */ diff -r b1008c5c6c16 acl.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/acl.h Mon Mar 02 12:11:04 2009 +0000 @@ -0,0 +1,74 @@ +/* + * QEMU access control list management + * + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef __QEMU_ACL_H__ +#define __QEMU_ACL_H__ + +#include "sys-queue.h" + +typedef struct qemu_acl_entry qemu_acl_entry; +typedef struct qemu_acl qemu_acl; + +struct qemu_acl_entry { + char *match; + int deny; + + TAILQ_ENTRY(qemu_acl_entry) next; +}; + +struct qemu_acl { + char *aclname; + unsigned int nentries; + TAILQ_HEAD(,qemu_acl_entry) entries; + int defaultDeny; +}; + +qemu_acl *qemu_acl_init(const char *aclname); + +qemu_acl *qemu_acl_find(const char *aclname); + +int qemu_acl_party_is_allowed(qemu_acl *acl, + const char *party); + +void qemu_acl_reset(qemu_acl *acl); + +int qemu_acl_append(qemu_acl *acl, + int deny, + const char *match); +int qemu_acl_insert(qemu_acl *acl, + int deny, + const char *match, + int index); +int qemu_acl_remove(qemu_acl *acl, + const char *match); + +#endif /* __QEMU_ACL_H__ */ + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * tab-width: 8 + * End: + */ diff -r b1008c5c6c16 configure --- a/configure Mon Mar 02 11:13:40 2009 +0000 +++ b/configure Mon Mar 02 12:11:04 2009 +0000 @@ -846,6 +846,21 @@ EOF fi ########################################## +# fnmatch() probe, used for ACL routines +fnmatch="no" +cat > $TMPC << EOF +#include +int main(void) +{ + fnmatch("foo", "foo", 0); + return 0; +} +EOF +if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then + fnmatch="yes" +fi + +########################################## # vde libraries probe if test "$vde" = "yes" ; then cat > $TMPC << EOF @@ -1405,6 +1420,9 @@ if test "$vnc_sasl" = "yes" ; then echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_mak echo "#define CONFIG_VNC_SASL 1" >> $config_h fi +if test "$fnmatch" = "yes" ; then + echo "#define HAVE_FNMATCH_H 1" >> $config_h +fi qemu_version=`head $source_path/VERSION` echo "VERSION=$qemu_version" >>$config_mak echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h diff -r b1008c5c6c16 monitor.c --- a/monitor.c Mon Mar 02 11:13:40 2009 +0000 +++ b/monitor.c Mon Mar 02 12:11:04 2009 +0000 @@ -39,6 +39,7 @@ #include "qemu-timer.h" #include "migration.h" #include "kvm.h" +#include "acl.h" //#define DEBUG //#define DEBUG_COMPLETION @@ -1425,6 +1426,85 @@ static void do_info_balloon(void) term_printf("balloon: actual=%d\n", (int)(actual >> 20)); } +static void do_acl(const char *command, + const char *aclname, + const char *match, + int has_index, + int index) +{ + qemu_acl *acl; + + acl = qemu_acl_find(aclname); + if (!acl) { + term_printf("acl: unknown list '%s'\n", aclname); + return; + } + + if (strcmp(command, "show") == 0) { + int i = 0; + qemu_acl_entry *entry; + term_printf("policy: %s\n", + acl->defaultDeny ? "deny" : "allow"); + TAILQ_FOREACH(entry, &acl->entries, next) { + i++; + term_printf("%d: %s %s\n", i, + entry->deny ? "deny" : "allow", + entry->match); + } + } else if (strcmp(command, "reset") == 0) { + qemu_acl_reset(acl); + term_printf("acl: removed all rules\n"); + } else if (strcmp(command, "policy") == 0) { + if (!match) { + term_printf("acl: missing policy parameter\n"); + return; + } + + if (strcmp(match, "allow") == 0) { + acl->defaultDeny = 0; + term_printf("acl: policy set to 'allow'\n"); + } else if (strcmp(match, "deny") == 0) { + acl->defaultDeny = 1; + term_printf("acl: policy set to 'deny'\n"); + } else { + term_printf("acl: unknown policy '%s', expected 'deny' or 'allow'\n", match); + } + } else if ((strcmp(command, "allow") == 0) || + (strcmp(command, "deny") == 0)) { + int deny = strcmp(command, "deny") == 0 ? 1 : 0; + int ret; + + if (!match) { + term_printf("acl: missing match parameter\n"); + return; + } + + if (has_index) + ret = qemu_acl_insert(acl, deny, match, index); + else + ret = qemu_acl_append(acl, deny, match); + if (ret < 0) + term_printf("acl: unable to add acl entry\n"); + else + term_printf("acl: added rule at position %d\n", ret); + } else if (strcmp(command, "remove") == 0) { + int ret; + + if (!match) { + term_printf("acl: missing match parameter\n"); + return; + } + + ret = qemu_acl_remove(acl, match); + if (ret < 0) + term_printf("acl: no matching acl entry\n"); + else + term_printf("acl: removed rule at position %d\n", ret); + } else { + term_printf("acl: unknown command '%s'\n", command); + } +} + /* Please update qemu-doc.texi when adding or changing commands */ static const term_cmd_t term_cmds[] = { { "help|?", "s?", do_help, @@ -1529,6 +1609,12 @@ static const term_cmd_t term_cmds[] = { "target", "request VM to change it's memory allocation (in MB)" }, { "set_link", "ss", do_set_link, "name [up|down]", "change the link status of a network adapter" }, + { "acl", "sss?i?", do_acl, " [] []\n", + "acl show vnc.username\n" + "acl policy vnc.username deny\n" + "acl allow vnc.username fred\n" + "acl deny vnc.username bob\n" + "acl reset vnc.username\n" }, { NULL, NULL, }, }; @@ -2891,3 +2977,12 @@ void monitor_readline(const char *prompt monitor_hd[i]->focus = old_focus[i]; } } + + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * tab-width: 8 + * End: + */ diff -r b1008c5c6c16 qemu-doc.texi --- a/qemu-doc.texi Mon Mar 02 11:13:40 2009 +0000 +++ b/qemu-doc.texi Mon Mar 02 12:11:04 2009 +0000 @@ -631,6 +631,19 @@ ensures a data encryption preventing com credentials. See the @ref{vnc_security} section for details on using SASL authentication. + at item acl + +Turn on access control lists for checking of the x509 client certificate +and SASL party. For x509 certs, the ACL check is made against the +certificate's distinguished name. This is something that looks like + at code{C=GB,O=ACME,L=Boston,CN=bob}. For SASL party, the ACL check is +made against the username, which depending on the SASL plugin, may +include a realm component, eg @code{bob} or @code{bob\@EXAMPLE.COM}. +When the @option{acl} flag is set, the initial access list will be +empty, with a @code{deny} policy. Thus no one will be allowed to +use the VNC server until the ACLs have been loaded. This can be +achieved using the @code{acl} monitor command. + @end table @end table @@ -1392,6 +1405,42 @@ Password: ******** @end table + at item acl @var{subcommand} @var{aclname} @var{match} @var{index} + +Manage access control lists for network services. There are currently +two named access control lists, @var{vnc.x509dname} and @var{vnc.username} +matching on the x509 client certificate distinguished name, and SASL +username respectively. + + at table @option + at item acl show +list all the match rules in the access control list, and the default +policy + at item acl policy @code{allow|deny} +set the default access control list policy, used in the event that +none of the explicit rules match. The default policy at startup is +always @code{deny} + at item acl allow [] +add a match to the access control list, allowing access. The match will +normally be an exact username or x509 distinguished name, but can +optionally include wildcard globs. eg @code{*\@EXAMPLE.COM} to allow +all users in the @code{EXAMPLE.COM} kerberos realm. The match will +normally be appended to the end of the ACL, but can be inserted +earlier in the list if the optional @code{index} parameter is supplied. + at item acl deny [] +add a match to the access control list, denying access. The match will +normally be an exact username or x509 distinguished name, but can +optionally include wildcard globs. eg @code{*\@EXAMPLE.COM} to allow +all users in the @code{EXAMPLE.COM} kerberos realm. The match will +normally be appended to the end of the ACL, but can be inserted +earlier in the list if the optional @code{index} parameter is supplied. + at item acl remove +remove the specified match rule from the access control list. + at item acl reset +remove all matches from the access control list, and set the default +policy back to @code{deny}. + at end table + @item screendump @var{filename} Save screen into PPM image @var{filename}. diff -r b1008c5c6c16 vnc-auth-sasl.c --- a/vnc-auth-sasl.c Mon Mar 02 11:13:40 2009 +0000 +++ b/vnc-auth-sasl.c Mon Mar 02 12:11:04 2009 +0000 @@ -120,22 +120,32 @@ static int vnc_auth_sasl_check_access(Vn { const void *val; int err; + int allow; err = sasl_getprop(vs->sasl.conn, SASL_USERNAME, &val); if (err != SASL_OK) { - VNC_DEBUG("cannot query SASL username on connection %d (%s)\n", + VNC_DEBUG("cannot query SASL username on connection %d (%s), denying access\n", err, sasl_errstring(err, NULL, NULL)); return -1; } if (val == NULL) { - VNC_DEBUG("no client username was found\n"); + VNC_DEBUG("no client username was found, denying access\n"); return -1; } VNC_DEBUG("SASL client username %s\n", (const char *)val); vs->sasl.username = qemu_strdup((const char*)val); - return 0; + if (vs->vd->sasl.acl == NULL) { + VNC_DEBUG("no ACL activated, allowing access\n"); + return 0; + } + + allow = qemu_acl_party_is_allowed(vs->vd->sasl.acl, vs->sasl.username); + + VNC_DEBUG("SASL client %s %s by ACL\n", vs->sasl.username, + allow ? "allowed" : "denied"); + return allow ? 0 : -1; } static int vnc_auth_sasl_check_ssf(VncState *vs) diff -r b1008c5c6c16 vnc-auth-sasl.h --- a/vnc-auth-sasl.h Mon Mar 02 11:13:40 2009 +0000 +++ b/vnc-auth-sasl.h Mon Mar 02 12:11:04 2009 +0000 @@ -30,6 +30,9 @@ #include typedef struct VncStateSASL VncStateSASL; +typedef struct VncDisplaySASL VncDisplaySASL; + +#include "acl.h" struct VncStateSASL { sasl_conn_t *conn; @@ -56,6 +59,10 @@ struct VncStateSASL { char *mechlist; }; +struct VncDisplaySASL { + qemu_acl *acl; +}; + void vnc_sasl_client_cleanup(VncState *vs); long vnc_client_read_sasl(VncState *vs); diff -r b1008c5c6c16 vnc-tls.c --- a/vnc-tls.c Mon Mar 02 11:13:40 2009 +0000 +++ b/vnc-tls.c Mon Mar 02 12:11:04 2009 +0000 @@ -255,6 +255,25 @@ int vnc_tls_validate_certificate(struct gnutls_strerror (ret)); return -1; } + + if (vs->vd->tls.x509verify) { + int allow; + if (!vs->vd->tls.acl) { + VNC_DEBUG("no ACL activated, allowing access"); + gnutls_x509_crt_deinit (cert); + continue; + } + + allow = qemu_acl_party_is_allowed(vs->vd->tls.acl, + vs->tls.dname); + + VNC_DEBUG("TLS x509 ACL check for %s is %s\n", + vs->tls.dname, allow ? "allowed" : "denied"); + if (!allow) { + gnutls_x509_crt_deinit (cert); + return -1; + } + } } gnutls_x509_crt_deinit (cert); diff -r b1008c5c6c16 vnc-tls.h --- a/vnc-tls.h Mon Mar 02 11:13:40 2009 +0000 +++ b/vnc-tls.h Mon Mar 02 12:11:04 2009 +0000 @@ -31,6 +31,8 @@ #include #include +#include "acl.h" + enum { VNC_WIREMODE_CLEAR, VNC_WIREMODE_TLS, @@ -42,6 +44,7 @@ typedef struct VncStateTLS VncStateTLS; /* Server state */ struct VncDisplayTLS { int x509verify; /* Non-zero if server requests & validates client cert */ + qemu_acl *acl; /* Paths to x509 certs/keys */ char *x509cacert; diff -r b1008c5c6c16 vnc.c --- a/vnc.c Mon Mar 02 11:13:40 2009 +0000 +++ b/vnc.c Mon Mar 02 12:11:04 2009 +0000 @@ -28,6 +28,7 @@ #include "sysemu.h" #include "qemu_socket.h" #include "qemu-timer.h" +#include "acl.h" #define VNC_REFRESH_INTERVAL (1000 / 30) @@ -2082,6 +2083,7 @@ int vnc_display_open(DisplayState *ds, c int sasl = 0; int saslErr; #endif + int acl = 0; if (!vnc_display) return -1; @@ -2138,9 +2140,28 @@ int vnc_display_open(DisplayState *ds, c return -1; } #endif + } else if (strncmp(options, "acl", 3) == 0) { + acl = 1; } } +#ifdef CONFIG_VNC_TLS + if (acl && x509 && vs->tls.x509verify) { + if (!(vs->tls.acl = qemu_acl_init("vnc.x509dname"))) { + fprintf(stderr, "Failed to create x509 dname ACL\n"); + exit(1); + } + } +#endif +#ifdef CONFIG_VNC_SASL + if (acl && sasl) { + if (!(vs->sasl.acl = qemu_acl_init("vnc.username"))) { + fprintf(stderr, "Failed to create username ACL\n"); + exit(1); + } + } +#endif + /* * Combinations we support here: * diff -r b1008c5c6c16 vnc.h --- a/vnc.h Mon Mar 02 11:13:40 2009 +0000 +++ b/vnc.h Mon Mar 02 12:11:04 2009 +0000 @@ -98,6 +98,9 @@ struct VncDisplay int subauth; /* Used by VeNCrypt */ VncDisplayTLS tls; #endif +#ifdef CONFIG_VNC_SASL + VncDisplaySASL sasl; +#endif }; struct VncState Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- qemu.spec 3 Mar 2009 03:40:42 -0000 1.50 +++ qemu.spec 3 Mar 2009 12:55:33 -0000 1.51 @@ -1,14 +1,29 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 1.0 -Release: 0.4.svn6666%{?dist} +Release: 0.5.svn6666%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://www.qemu.org/ Source0: http://www.qemu.org/%{name}-%{version}.tar.gz Source1: qemu.init + +# VNC SASL authentication support +# Not upstream yet, but approved for commit immediately +# after this release +Patch1: qemu-sasl-01-tls-handshake-fix.patch +Patch2: qemu-sasl-02-vnc-monitor-info.patch +Patch3: qemu-sasl-03-display-keymaps.patch +Patch4: qemu-sasl-04-vnc-struct.patch +Patch5: qemu-sasl-05-vnc-tls-vencrypt.patch +Patch6: qemu-sasl-06-vnc-sasl.patch +Patch7: qemu-sasl-07-vnc-monitor-authinfo.patch +Patch8: qemu-sasl-08-vnc-acl-mgmt.patch +# NB, delibrately not including patch 09 which is not +# intended for commit + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel +BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel Requires: %{name}-user = %{version}-%{release} Requires: %{name}-system-x86 = %{version}-%{release} Requires: %{name}-system-sparc = %{version}-%{release} @@ -78,7 +93,7 @@ %qemupkg system-x86 {system emulator for x86} Requires: etherboot-zroms-kvm Requires: vgabios -Requires: bochs-bios +Requires: bochs-bios-data %qemudesc system-x86 {system emulator for x86} %qemupkgdesc system-ppc {system emulator for ppc} @@ -93,6 +108,22 @@ %prep %setup -q +# 01-tls-handshake-fix +%patch1 -p1 +# 02-vnc-monitor-info +%patch2 -p1 +# 03-display-keymaps +%patch3 -p1 +# 04-vnc-struct +%patch4 -p1 +# 05-vnc-tls-vencrypt +%patch5 -p1 +# 06-vnc-sasl +%patch6 -p1 +# 07-vnc-monitor-authinfo +%patch7 -p1 +# 08-vnc-acl-mgmt +%patch8 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -132,6 +163,8 @@ install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu install -D -p -m 0644 -t ${RPM_BUILD_ROOT}/%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE +install -D -p -m 0644 qemu.sasl $RPM_BUILD_ROOT%{_sysconfdir}/sasl2/qemu.conf + rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/pxe*bin rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/vgabios*bin rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/bios.bin @@ -187,6 +220,7 @@ %{_mandir}/man1/qemu.1* %{_mandir}/man8/qemu-nbd.8* %{_bindir}/qemu-nbd +%config(noreplace) %{_sysconfdir}/sasl2/qemu.conf %files user %defattr(-,root,root) %{_sysconfdir}/rc.d/init.d/qemu @@ -250,6 +284,10 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Tue Mar 3 2009 Daniel P. Berrange - 1.0-0.5.svn6666 +- Support VNC SASL authentication protocol +- Fix dep on bochs-bios-data + * Tue Mar 03 2009 Glauber Costa - 1.0-0.4.svn6666 - use bios from bochs-bios package. From berrange at fedoraproject.org Tue Mar 3 12:57:04 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Tue, 3 Mar 2009 12:57:04 +0000 (UTC) Subject: rpms/gtk-vnc/devel gtk-vnc.spec,1.30,1.31 Message-ID: <20090303125704.1DB3A70116@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/gtk-vnc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16086 Modified Files: gtk-vnc.spec Log Message: Added missing cyrus-sasl-devel BR Index: gtk-vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gtk-vnc.spec 3 Mar 2009 10:29:20 -0000 1.30 +++ gtk-vnc.spec 3 Mar 2009 12:56:33 -0000 1.31 @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://live.gnome.org/gtk-vnc BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel -BuildRequires: gnutls-devel gtkglext-devel +BuildRequires: gnutls-devel gtkglext-devel cyrus-sasl-devel %if %{with_plugin} %if 0%{?fedora} > 8 BuildRequires: xulrunner-devel From kkofler at fedoraproject.org Tue Mar 3 13:05:10 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 3 Mar 2009 13:05:10 +0000 (UTC) Subject: rpms/kde-plasma-networkmanagement/devel kde-plasma-networkmanagement.spec, 1.1, 1.2 Message-ID: <20090303130510.2487770116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17780/devel Modified Files: kde-plasma-networkmanagement.spec Log Message: * Tue Mar 3 2009 Kevin Kofler 0.1-0.7.20090217svn - Obsoletes/Provides knetworkmanager on F11+ for upgrade paths Index: kde-plasma-networkmanagement.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kde-plasma-networkmanagement.spec 1 Mar 2009 03:21:11 -0000 1.1 +++ kde-plasma-networkmanagement.spec 3 Mar 2009 13:04:39 -0000 1.2 @@ -1,6 +1,6 @@ Name: kde-plasma-networkmanagement Version: 0.1 -Release: 0.6.20090217svn%{?dist} +Release: 0.7.20090217svn%{?dist} Summary: NetworkManager KDE 4 integration Group: User Interface/Desktops @@ -19,6 +19,10 @@ Obsoletes: kde-plasma-networkmanager < %{version}-%{release} Provides: kde-plasma-networkmanager = %{version}-%{release} +%if 0%{?fedora} > 10 +Obsoletes: knetworkmanager < 1:%{version}-%{release} +Provides: knetworkmanager = 1:%{version}-%{release} +%endif %description A Plasma applet to control your wired and wireless network(s) in KDE 4 using @@ -33,6 +37,10 @@ Obsoletes: kde-plasma-networkmanager-devel < %{version}-%{release} Provides: kde-plasma-networkmanager-devel = %{version}-%{release} +%if 0%{?fedora} > 10 +Obsoletes: knetworkmanager-devel < 1:%{version}-%{release} +Provides: knetworkmanager-devel = 1:%{version}-%{release} +%endif %description devel %{summary}. @@ -45,6 +53,10 @@ Obsoletes: kde-plasma-networkmanager-openvpn < %{version}-%{release} Provides: kde-plasma-networkmanager-openvpn = %{version}-%{release} +%if 0%{?fedora} > 10 +Obsoletes: knetworkmanager-openvpn < 1:%{version}-%{release} +Provides: knetworkmanager-openvpn = 1:%{version}-%{release} +%endif %description openvpn %{summary}. @@ -57,6 +69,10 @@ Obsoletes: kde-plasma-networkmanager-vpnc < %{version}-%{release} Provides: kde-plasma-networkmanager-vpnc = %{version}-%{release} +%if 0%{?fedora} > 10 +Obsoletes: knetworkmanager-vpnc < 1:%{version}-%{release} +Provides: knetworkmanager-vpnc = 1:%{version}-%{release} +%endif %description vpnc %{summary}. @@ -134,6 +150,9 @@ %changelog +* Tue Mar 3 2009 Kevin Kofler 0.1-0.7.20090217svn +- Obsoletes/Provides knetworkmanager on F11+ for upgrade paths + * Tue Feb 24 2009 Ben Boeckel 0.1-0.6.20090217svn - Moved P/O to correct places From harald at fedoraproject.org Tue Mar 3 13:11:39 2009 From: harald at fedoraproject.org (Harald Hoyer) Date: Tue, 3 Mar 2009 13:11:39 +0000 (UTC) Subject: rpms/udev/devel start_udev,1.81,1.82 udev.spec,1.267,1.268 Message-ID: <20090303131139.9C2EE70116@cvs1.fedora.phx.redhat.com> Author: harald Update of /cvs/pkgs/rpms/udev/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19436 Modified Files: start_udev udev.spec Log Message: * Tue Mar 03 2009 Harald Hoyer 139-2 - speedup of start_udev by doing make_extra_nodes in parallel to the daemon start Index: start_udev =================================================================== RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- start_udev 5 Feb 2009 07:35:23 -0000 1.81 +++ start_udev 3 Mar 2009 13:11:08 -0000 1.82 @@ -188,6 +188,25 @@ done } +# returns OK if $1 contains $2 +strstr() { + [ "${1#*$2*}" = "$1" ] && return 1 + return 0 +} + +getval() { + what=$1 + shift + for arg; do + if strstr "$arg" "$what="; then + val=${arg#${what}=*} + echo $val + return 0 + fi + done + return 1 +} + wait_for_queue() { local timeout=${1:-0} local ret=0 @@ -235,26 +254,7 @@ ret=$[$ret + $?] } -# returns OK if $1 contains $2 -strstr() { - [ "${1#*$2*}" = "$1" ] && return 1 - return 0 -} - -getval() { - what=$1 - shift - for arg; do - if strstr "$arg" "$what="; then - val=${arg#${what}=*} - echo $val - return 0 - fi - done - return 1 -} - -make_extra_nodes +make_extra_nodes & cmdline=$(cat /proc/cmdline) kill_udevd > "$udev_root/null" 2>&1 rm -fr $udev_root/.udev > "$udev_root/null" 2>&1 @@ -267,6 +267,7 @@ UDEV_OPTS="$UDEV_OPTS --debug-trace" fi /sbin/udevd -d $UDEV_OPTS + wait ret=$[$ret + $?] udevtimeout=$(getval udevtimeout $cmdline) Index: udev.spec =================================================================== RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- udev.spec 27 Feb 2009 07:49:44 -0000 1.267 +++ udev.spec 3 Mar 2009 13:11:08 -0000 1.268 @@ -6,7 +6,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 139 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -379,6 +379,10 @@ %changelog +* Tue Mar 03 2009 Harald Hoyer 139-2 +- speedup of start_udev by doing make_extra_nodes in parallel to + the daemon start + * Fri Feb 27 2009 Harald Hoyer 139-1 - version 139 From tmz at fedoraproject.org Tue Mar 3 13:35:14 2009 From: tmz at fedoraproject.org (Todd M. Zullinger) Date: Tue, 3 Mar 2009 13:35:14 +0000 (UTC) Subject: rpms/git/devel noautobuild,1.1,NONE Message-ID: <20090303133514.402BA70116@cvs1.fedora.phx.redhat.com> Author: tmz Update of /cvs/extras/rpms/git/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23595 Removed Files: noautobuild Log Message: Remove unneeded noautobuild file now that the F11 mass rebuild is done --- noautobuild DELETED --- From vcrhonek at fedoraproject.org Tue Mar 3 13:43:27 2009 From: vcrhonek at fedoraproject.org (Vitezslav Crhonek) Date: Tue, 3 Mar 2009 13:43:27 +0000 (UTC) Subject: rpms/ypserv/devel ypserv.spec,1.42,1.43 Message-ID: <20090303134327.8FD4770116@cvs1.fedora.phx.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/ypserv/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25459 Modified Files: ypserv.spec Log Message: Mark apropriate config files as noreplace Index: ypserv.spec =================================================================== RCS file: /cvs/extras/rpms/ypserv/devel/ypserv.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- ypserv.spec 25 Feb 2009 18:18:14 -0000 1.42 +++ ypserv.spec 3 Mar 2009 13:42:57 -0000 1.43 @@ -4,7 +4,7 @@ Url: http://www.linux-nis.org/nis/ypserv/index.html Name: ypserv Version: 2.19 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2 @@ -133,10 +133,9 @@ %doc AUTHORS README INSTALL ChangeLog TODO NEWS %doc etc/ypserv.conf etc/securenets etc/README.etc %doc etc/netgroup etc/locale etc/netmasks etc/timezone -%config %{_sysconfdir}/ypserv.conf +%config(noreplace) %{_sysconfdir}/ypserv.conf %config(noreplace) %{_sysconfdir}/sysconfig/yppasswdd -%config /var/yp/* -%config(noreplace) /var/yp/Makefile +%config(noreplace) /var/yp/* %dir /var/yp %config %{initdir}/* %{_libdir}/yp @@ -145,6 +144,9 @@ %{_includedir}/*/* %changelog +* Tue Mar 3 2009 Vitezslav Crhonek - 2.19-12 +- Mark apropriate config files as noreplace + * Wed Feb 25 2009 Fedora Release Engineering - 2.19-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From apevec at fedoraproject.org Tue Mar 3 13:48:30 2009 From: apevec at fedoraproject.org (Alan Pevec) Date: Tue, 3 Mar 2009 13:48:30 +0000 (UTC) Subject: rpms/collectd/devel collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch, NONE, 1.1 collectd.spec, 1.16, 1.17 Message-ID: <20090303134830.2C8B870116@cvs1.fedora.phx.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/collectd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26447 Modified Files: collectd.spec Added Files: collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch Log Message: * Tue Mar 03 2009 Alan Pevec 4.5.3-2 - patch for strict-aliasing issue in liboping.c collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch: --- NEW FILE collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch --- >From 76cdc4d21f40a65d775bbce3468996c4d0045d96 Mon Sep 17 00:00:00 2001 From: Alan Pevec Date: Tue, 3 Mar 2009 14:36:36 +0100 Subject: [PATCH] Fix gcc-4.4 strict-aliasing issue cc1: warnings being treated as errors liboping.c: In function 'ping_host_add': liboping.c:995: error: dereferencing pointer 'si' does break strict-aliasing rules ... Signed-off-by: Alan Pevec --- src/liboping/liboping.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/liboping/liboping.c b/src/liboping/liboping.c index 13bcc92..dee28fb 100644 --- a/src/liboping/liboping.c +++ b/src/liboping/liboping.c @@ -987,9 +987,12 @@ int ping_host_add (pingobj_t *obj, const char *host) if (ai_ptr->ai_family == AF_INET) { - struct sockaddr_in *si; - - si = (struct sockaddr_in *) &sockaddr; + union { + struct sockaddr_storage any_socket; + struct sockaddr_in si; + } s; + s.any_socket = sockaddr; + si = &s.si; si->sin_family = AF_INET; si->sin_port = htons (ph->ident); si->sin_addr.s_addr = htonl (INADDR_ANY); @@ -999,9 +1002,12 @@ int ping_host_add (pingobj_t *obj, const char *host) } else if (ai_ptr->ai_family == AF_INET6) { - struct sockaddr_in6 *si; - - si = (struct sockaddr_in6 *) &sockaddr; + union { + struct sockaddr_storage any_socket; + struct sockaddr_in6 si; + } s; + s.any_socket = sockaddr; + si = &s.si; si->sin6_family = AF_INET6; si->sin6_port = htons (ph->ident); si->sin6_addr = in6addr_any; -- 1.6.0.6 Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- collectd.spec 2 Mar 2009 23:43:02 -0000 1.16 +++ collectd.spec 3 Mar 2009 13:47:59 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd Version: 4.5.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ @@ -10,6 +10,8 @@ Patch0: %{name}-4.5.1-include-collectd.d.patch # bug 468067 "pkg-config --libs OpenIPMIpthread" fails Patch1: %{name}-4.5.1-configure-OpenIPMI.patch +# posted upstream +Patch2: collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -151,6 +153,7 @@ %setup -q %patch0 -p1 %patch1 -p0 +%patch2 -p1 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in @@ -407,6 +410,9 @@ %changelog +* Tue Mar 03 2009 Alan Pevec 4.5.3-2 +- patch for strict-aliasing issue in liboping.c + * Mon Mar 02 2009 Alan Pevec 4.5.3-1 - New upstream version 4.5.3 - fixes collectd is built without iptables plugin, bz# 479208 From xhorak at fedoraproject.org Tue Mar 3 13:57:47 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Tue, 3 Mar 2009 13:57:47 +0000 (UTC) Subject: rpms/thunderbird/devel thunderbird.spec,1.127,1.128 Message-ID: <20090303135747.7A69D70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/thunderbird/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28881 Modified Files: thunderbird.spec Log Message: Removed SMP compilation Index: thunderbird.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- thunderbird.spec 3 Mar 2009 12:32:17 -0000 1.127 +++ thunderbird.spec 3 Mar 2009 13:57:17 -0000 1.128 @@ -118,11 +118,11 @@ export PREFIX='%{_prefix}' export LIBDIR='%{_libdir}' -%ifarch ppc ppc64 s390 s390x -%define moz_make_flags -j1 -%else -%define moz_make_flags %{?_smp_mflags} -%endif +#%ifarch ppc ppc64 s390 s390x +#%define moz_make_flags -j1 +#%else +#%define moz_make_flags %{?_smp_mflags} +#%endif export LDFLAGS="-Wl,-rpath,%{mozappdir}" export MAKE="gmake %{moz_make_flags}" From karsten at fedoraproject.org Tue Mar 3 14:19:30 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Tue, 3 Mar 2009 14:19:30 +0000 (UTC) Subject: rpms/jakarta-commons-daemon/devel jakarta-commons-daemon-ppc64-configure.patch, NONE, 1.1 jakarta-commons-daemon.spec, 1.23, 1.24 Message-ID: <20090303141930.2B36770116@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/jakarta-commons-daemon/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv593 Modified Files: jakarta-commons-daemon.spec Added Files: jakarta-commons-daemon-ppc64-configure.patch Log Message: - ppc needs a similar patch jakarta-commons-daemon-ppc64-configure.patch: --- NEW FILE jakarta-commons-daemon-ppc64-configure.patch --- diff -up src/native/unix/configure.ppc src/native/unix/configure --- src/native/unix/configure.ppc 2009-03-03 14:12:41.000000000 +0100 +++ src/native/unix/configure 2009-03-03 14:12:44.000000000 +0100 @@ -2422,7 +2422,9 @@ echo "$as_me: error: Unsupported operati ;; esac case $host_cpu in - powerpc) + powerpc*) + CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" ;; + ppc*) CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" ;; sparc*) CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" ;; diff -up src/native/unix/support/config.sub.ppc src/native/unix/support/config.sub --- src/native/unix/support/config.sub.ppc 2009-03-03 14:13:10.000000000 +0100 +++ src/native/unix/support/config.sub 2009-03-03 15:08:18.000000000 +0100 @@ -225,7 +225,7 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ | alphaev6[78] \ | we32k | ns16k | clipper | i370 | sh | sh[34] \ - | powerpc | powerpcle \ + | powerpc | powerpc64 | powerpcle \ | 1750a | dsp16xx | pdp10 | pdp11 \ | mips16 | mips64 | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ @@ -272,7 +272,8 @@ case $basic_machine in | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ | clipper-* | orion-* \ | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \ - | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ + | powerpc-* | powerpc64-* | powerpcle-* \ + | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ | mips16-* | mips64-* | mipsel-* \ | mips64el-* | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ @@ -719,8 +720,12 @@ case $basic_machine in ;; ppc) basic_machine=powerpc-unknown ;; + ppc64) basic_machine=powerpc64-unknown + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ;; Index: jakarta-commons-daemon.spec =================================================================== RCS file: /cvs/extras/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- jakarta-commons-daemon.spec 3 Mar 2009 11:40:13 -0000 1.23 +++ jakarta-commons-daemon.spec 3 Mar 2009 14:18:59 -0000 1.24 @@ -39,7 +39,7 @@ Name: jakarta-%{short_name} Version: 1.0.1 -Release: 7.7%{?dist} +Release: 7.8%{?dist} Epoch: 1 Summary: Defines API to support an alternative invocation mechanism License: ASL 2.0 @@ -50,6 +50,7 @@ Patch1: %{name}-execve-path-warning.patch Patch2: %{name}-ia64-configure.patch Patch3: %{name}-s390x-configure.patch +Patch4: %{name}-ppc64-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %{native} @@ -107,7 +108,8 @@ %patch0 -p0 %patch1 -p0 %patch2 -p0 -%patch3 -p0 +%patch3 -p0 -b .s390x +%patch4 -p0 -b .ppc chmod 644 src/samples/* %if %{native} pushd src/native/unix @@ -191,6 +193,9 @@ %endif %changelog +* Tue Mar 03 2009 Karsten Hopp 1.0.1-7.8 +- ppc needs a similar patch + * Tue Mar 03 2009 Karsten Hopp 1.0.1-7.7 - add configure patch for s390x From caolanm at fedoraproject.org Tue Mar 3 14:27:54 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 14:27:54 +0000 (UTC) Subject: rpms/ttmkfdir/devel ttmkfdir-3.0.9-bug434301.patch, 1.1, 1.2 ttmkfdir-3.0.9-segfaults.patch, 1.1, 1.2 ttmkfdir.spec, 1.32, 1.33 Message-ID: <20090303142754.5A12370116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/ttmkfdir/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2054 Modified Files: ttmkfdir-3.0.9-bug434301.patch ttmkfdir-3.0.9-segfaults.patch ttmkfdir.spec Log Message: fix ttmkfdir-3.0.9-segfaults.patch to include stdio.h for added printf ttmkfdir-3.0.9-bug434301.patch: Index: ttmkfdir-3.0.9-bug434301.patch =================================================================== RCS file: /cvs/pkgs/rpms/ttmkfdir/devel/ttmkfdir-3.0.9-bug434301.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ttmkfdir-3.0.9-bug434301.patch 27 Feb 2008 02:38:59 -0000 1.1 +++ ttmkfdir-3.0.9-bug434301.patch 3 Mar 2009 14:27:23 -0000 1.2 @@ -1,7 +1,7 @@ --- ttmkfdir-3.0.9/directory.cpp.bak 2008-02-27 10:18:52.000000000 +0800 +++ ttmkfdir-3.0.9/directory.cpp 2008-02-27 10:20:24.000000000 +0800 -@@ -2,6 +2,8 @@ - #include +@@ -3,6 +3,8 @@ + #include #include #include +#include ttmkfdir-3.0.9-segfaults.patch: Index: ttmkfdir-3.0.9-segfaults.patch =================================================================== RCS file: /cvs/pkgs/rpms/ttmkfdir/devel/ttmkfdir-3.0.9-segfaults.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ttmkfdir-3.0.9-segfaults.patch 8 Oct 2005 06:36:12 -0000 1.1 +++ ttmkfdir-3.0.9-segfaults.patch 3 Mar 2009 14:27:23 -0000 1.2 @@ -1,6 +1,13 @@ --- ttmkfdir-3.0.9/directory.cpp.back 2005-10-08 14:25:37.839328408 +0800 +++ ttmkfdir-3.0.9/directory.cpp 2005-10-08 14:26:00.021956136 +0800 -@@ -13,6 +13,10 @@ +@@ -1,5 +1,6 @@ + #include + #include ++#include + #include + #include + +@@ -13,6 +14,10 @@ directory::scan (const std::string &dir) { DIR *ttfdir = opendir(dir.c_str ()); Index: ttmkfdir.spec =================================================================== RCS file: /cvs/pkgs/rpms/ttmkfdir/devel/ttmkfdir.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- ttmkfdir.spec 25 Feb 2009 22:07:02 -0000 1.32 +++ ttmkfdir.spec 3 Mar 2009 14:27:23 -0000 1.33 @@ -1,7 +1,7 @@ Summary: Utility to create fonts.scale files for truetype fonts Name: ttmkfdir Version: 3.0.9 -Release: 29%{?dist} +Release: 30%{?dist} # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from # within this srpm. @@ -62,6 +62,9 @@ %{_bindir}/ttmkfdir %changelog +* Tue Mar 03 2009 Caol??n McNamara - 3.0.9-30 +- fix ttmkfdir-3.0.9-segfaults.patch to include stdio.h for added printf + * Wed Feb 25 2009 Fedora Release Engineering - 3.0.9-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Tue Mar 3 14:28:16 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 14:28:16 +0000 (UTC) Subject: rpms/scim-bridge/devel scim-bridge-0.4.15-EOF.patch, NONE, 1.1 scim-bridge.spec, 1.68, 1.69 Message-ID: <20090303142816.665E970116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/scim-bridge/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2169 Modified Files: scim-bridge.spec Added Files: scim-bridge-0.4.15-EOF.patch Log Message: use -1 instead of EOF for ret of getopt_long scim-bridge-0.4.15-EOF.patch: --- NEW FILE scim-bridge-0.4.15-EOF.patch --- diff -ru scim-bridge-0.4.15.orig/agent/scim-bridge-agent-application.cpp scim-bridge-0.4.15/agent/scim-bridge-agent-application.cpp --- scim-bridge-0.4.15.orig/agent/scim-bridge-agent-application.cpp 2009-03-03 14:19:54.000000000 +0000 +++ scim-bridge-0.4.15/agent/scim-bridge-agent-application.cpp 2009-03-03 14:20:27.000000000 +0000 @@ -65,7 +65,7 @@ unsigned int tmp_uint; int option = 0; - while (option != EOF) { + while (option != -1) { option = getopt_long (argc, argv, short_options, long_options, NULL); switch (option) { case 'v': Index: scim-bridge.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-bridge/devel/scim-bridge.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- scim-bridge.spec 25 Feb 2009 23:02:30 -0000 1.68 +++ scim-bridge.spec 3 Mar 2009 14:27:46 -0000 1.69 @@ -6,7 +6,7 @@ Name: scim-bridge Version: 0.4.15.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: SCIM Bridge Gtk IM module Group: System Environment/Libraries @@ -26,6 +26,7 @@ Patch0: scim-bridge-0.4.15-fix-gdm.patch Patch1: scim-bridge-0.4.15-hotkey-help.patch Patch2: scim-bridge-0.4.15-bz461373.patch +Patch3: scim-bridge-0.4.15-EOF.patch %description @@ -79,6 +80,7 @@ %patch0 -p1 -b .0-fix-gdm %patch1 -p1 -b .1-hotkey-help %patch2 -p1 -b .2-bz461373 +%patch3 -p1 -b .3-EOF %if %{snapshot} mkdir m4 @@ -149,6 +151,9 @@ %changelog +* Tue Mar 03 2009 Caol??n McNamara - 0.4.15.2-3 +- use -1 instead of EOF for ret of getopt_long + * Wed Feb 25 2009 Fedora Release Engineering - 0.4.15.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From tagoh at fedoraproject.org Tue Mar 3 14:35:24 2009 From: tagoh at fedoraproject.org (Akira TAGOH) Date: Tue, 3 Mar 2009 14:35:24 +0000 (UTC) Subject: rpms/libgxim/F-10 libgxim-fix-unwanted-window-destroy.patch, NONE, 1.1 libgxim.spec, 1.6, 1.7 Message-ID: <20090303143524.3F61870116@cvs1.fedora.phx.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/libgxim/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3619 Modified Files: libgxim.spec Added Files: libgxim-fix-unwanted-window-destroy.patch Log Message: * Tue Mar 3 2009 Akira TAGOH - 0.3.2-4 - Fix destroying a window unexpectedly. (#488223) libgxim-fix-unwanted-window-destroy.patch: --- NEW FILE libgxim-fix-unwanted-window-destroy.patch --- 2009-03-03 Akira TAGOH * libgxim/gximmisc.c (g_xim_get_window): increase a reference count here to avoid destroying a window unexpectedly. (g_xim_get_selection_owner): hack to keep similar behavior. * libgxim/gximclconn.c (g_xim_client_transport_real_do_send_via_property): do increase/decrease a reference count appropriately (g_xim_client_transport_real_do_send_via_cm): likewise. * libgxim/gximsrvconn.c (g_xim_server_transport_real_do_send_via_property): likewise. (g_xim_server_transport_real_do_send_via_cm): likewise. * libgxim/gximcltmpl.c (g_xim_cl_tmpl_real_dispose): likewise. (g_xim_cl_tmpl_real_translate_events): likewise. (g_xim_cl_tmpl_real_selection_notify_event): likewise. * libgxim/gximsrvtmpl.c (_weak_notify_conn_cb): likewise. (g_xim_srv_tmpl_real_translate_events): likewise. (g_xim_srv_tmpl_real_xconnect): likewise. (g_xim_srv_tmpl_send_selection_notify): likewise. (g_xim_srv_tmpl_add_connection): likewise. Index: libgxim/gximclconn.c =================================================================== --- libgxim/gximclconn.c (??????????????? 199) +++ libgxim/gximclconn.c (??????????????? 201) @@ -508,7 +508,7 @@ ev = gdk_event_new(GDK_CLIENT_EVENT); G_XIM_CHECK_ALLOC (ev, FALSE); - ev->client.window = g_object_ref(w); + ev->client.window = w; ev->client.message_type = G_XIM_TRANSPORT_GET_IFACE (trans)->atom_xim_protocol; ev->client.data_format = 32; ev->client.data.l[0] = length; @@ -565,7 +565,7 @@ ev = gdk_event_new(GDK_CLIENT_EVENT); G_XIM_CHECK_ALLOC (ev, FALSE); - ev->client.window = g_object_ref(w); + ev->client.window = w; ev->client.message_type = G_XIM_TRANSPORT_GET_IFACE (trans)->atom_xim_protocol; ev->client.data_format = 8; memset(ev->client.data.b, 0, transport_size); Index: libgxim/gximsrvconn.c =================================================================== --- libgxim/gximsrvconn.c (??????????????? 199) +++ libgxim/gximsrvconn.c (??????????????? 201) @@ -524,7 +524,7 @@ ev = gdk_event_new(GDK_CLIENT_EVENT); G_XIM_CHECK_ALLOC (ev, FALSE); - ev->client.window = g_object_ref(w); + ev->client.window = w; ev->client.message_type = G_XIM_TRANSPORT_GET_IFACE (trans)->atom_xim_protocol; ev->client.data_format = 32; ev->client.data.l[0] = length; @@ -581,7 +581,7 @@ ev = gdk_event_new(GDK_CLIENT_EVENT); G_XIM_CHECK_ALLOC (ev, FALSE); - ev->client.window = g_object_ref(w); + ev->client.window = w; ev->client.message_type = G_XIM_TRANSPORT_GET_IFACE (trans)->atom_xim_protocol; ev->client.data_format = 8; memset(ev->client.data.b, 0, transport_size); Index: libgxim/gximmisc.c =================================================================== --- libgxim/gximmisc.c (??????????????? 199) +++ libgxim/gximmisc.c (??????????????? 201) @@ -725,7 +725,7 @@ G_XIM_NATIVE_WINDOW_TO_POINTER (window)); } - return retval; + return retval != NULL ? g_object_ref(retval) : NULL; } GdkPixmap * @@ -750,6 +750,7 @@ GdkAtom selection) { Window xwindow; + GdkWindow *retval; g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); g_return_val_if_fail (selection != GDK_NONE, NULL); @@ -763,7 +764,11 @@ if (xwindow == None) return NULL; - return g_xim_get_window(display, (GdkNativeWindow)xwindow); + retval = g_xim_get_window(display, (GdkNativeWindow)xwindow); + /* just decrease a counter to not mind unref outside this function */ + g_object_unref(retval); + + return retval; } GdkWindow * Index: libgxim/gximcltmpl.c =================================================================== --- libgxim/gximcltmpl.c (??????????????? 199) +++ libgxim/gximcltmpl.c (??????????????? 201) @@ -178,6 +178,7 @@ w = g_xim_get_window(dpy, nw); if (w) g_xim_core_unwatch_event(core, w); + g_object_unref(w); w = g_xim_transport_get_channel(G_XIM_TRANSPORT (client->connection), NULL); if (w) g_xim_core_unwatch_event(core, w); @@ -231,7 +232,7 @@ */ if (w) { event->any.type = GDK_DESTROY; - event->any.window = g_object_ref(w); + event->any.window = w; event->any.send_event = xev->xdestroywindow.send_event ? TRUE : FALSE; retval = GDK_FILTER_TRANSLATE; } @@ -332,7 +333,7 @@ { GXimClientTemplate *client = G_XIM_CL_TMPL (core); GdkDisplay *dpy = g_xim_core_get_display(core); - GdkWindow *w; + GdkWindow *w = NULL; GdkAtom atom_type; gint format, bytes; gchar *prop = NULL, *p = NULL; @@ -409,6 +410,8 @@ goto end; } end: + if (w) + g_object_unref(w); g_free(prop); g_free(p); Index: libgxim/gximsrvtmpl.c =================================================================== --- libgxim/gximsrvtmpl.c (??????????????? 199) +++ libgxim/gximsrvtmpl.c (??????????????? 201) @@ -331,6 +331,7 @@ G_XIM_NATIVE_WINDOW_TO_POINTER (nw)); w = g_xim_get_window(dpy, nw); g_xim_core_unwatch_event(core, w); + g_object_unref(w); g_hash_table_remove(server->conn_table, G_XIM_NATIVE_WINDOW_TO_POINTER (nw)); } @@ -341,6 +342,7 @@ G_XIM_NATIVE_WINDOW_TO_POINTER (nw)); w = g_xim_get_window(dpy, nw); g_xim_core_unwatch_event(core, w); + g_object_unref(w); g_hash_table_remove(server->conn_table, G_XIM_NATIVE_WINDOW_TO_POINTER (nw)); } @@ -473,7 +475,7 @@ */ if (w) { event->any.type = GDK_DESTROY; - event->any.window = g_object_ref(w); + event->any.window = w; event->any.send_event = xev->xdestroywindow.send_event ? TRUE : FALSE; retval = GDK_FILTER_TRANSLATE; } @@ -762,7 +764,7 @@ ev = gdk_event_new(GDK_CLIENT_EVENT); G_XIM_CHECK_ALLOC_WITH_CODE (ev, g_object_unref(conn), NULL); - ev->client.window = g_object_ref(window); + ev->client.window = window; ev->client.message_type = event->message_type; ev->client.data_format = 32; ev->client.data.l[0] = (long)comm_window; @@ -1110,6 +1112,7 @@ window = g_xim_get_window(dpy, event->requestor); gdk_property_change(window, event->property, event->target, 8, GDK_PROP_MODE_REPLACE, (const guchar *)data, length); + g_object_unref(window); gdk_selection_send_notify_for_display(dpy, event->requestor, event->selection, @@ -1170,6 +1173,7 @@ mask = gdk_window_get_events(w); gdk_window_set_events(w, mask | GDK_STRUCTURE_MASK); g_xim_core_watch_event(core, w); + g_object_unref(w); } /** Index: libgxim.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgxim/F-10/libgxim.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libgxim.spec 2 Mar 2009 07:32:39 -0000 1.6 +++ libgxim.spec 3 Mar 2009 14:34:53 -0000 1.7 @@ -1,6 +1,6 @@ Name: libgxim Version: 0.3.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ URL: http://code.google.com/p/libgxim/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -8,6 +8,7 @@ BuildRequires: dbus-devel > 0.23, dbus-glib-devel >= 0.74, glib2-devel >= 2.16, gtk2-devel Source0: http://libgxim.googlecode.com/files/%{name}-%{version}.tar.bz2 Patch0: libgxim-fix-x-event.patch +Patch1: libgxim-fix-unwanted-window-destroy.patch Summary: GObject-based XIM protocol library Group: System Environment/Libraries @@ -40,6 +41,7 @@ %prep %setup -q %patch0 -p0 -b .xevent +%patch1 -p0 -b .window %build @@ -79,6 +81,9 @@ %{_datadir}/gtk-doc/html/libgxim %changelog +* Tue Mar 3 2009 Akira TAGOH - 0.3.2-4 +- Fix destroying a window unexpectedly. (#488223) + * Mon Mar 2 2009 Akira TAGOH - 0.3.2-3 - Backport a patch to fix the unknown event issue. From tagoh at fedoraproject.org Tue Mar 3 14:38:58 2009 From: tagoh at fedoraproject.org (Akira TAGOH) Date: Tue, 3 Mar 2009 14:38:58 +0000 (UTC) Subject: rpms/libgxim/devel libgxim-fix-unwanted-window-destroy.patch, NONE, 1.1 libgxim.spec, 1.8, 1.9 Message-ID: <20090303143858.5A1D970116@cvs1.fedora.phx.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/libgxim/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4290 Modified Files: libgxim.spec Added Files: libgxim-fix-unwanted-window-destroy.patch Log Message: * Tue Mar 3 2009 Akira TAGOH - 0.3.2-4 - Fix destroying a window unexpectedly. (#488223) libgxim-fix-unwanted-window-destroy.patch: --- NEW FILE libgxim-fix-unwanted-window-destroy.patch --- 2009-03-03 Akira TAGOH * libgxim/gximmisc.c (g_xim_get_window): increase a reference count here to avoid destroying a window unexpectedly. (g_xim_get_selection_owner): hack to keep similar behavior. * libgxim/gximclconn.c (g_xim_client_transport_real_do_send_via_property): do increase/decrease a reference count appropriately (g_xim_client_transport_real_do_send_via_cm): likewise. * libgxim/gximsrvconn.c (g_xim_server_transport_real_do_send_via_property): likewise. (g_xim_server_transport_real_do_send_via_cm): likewise. * libgxim/gximcltmpl.c (g_xim_cl_tmpl_real_dispose): likewise. (g_xim_cl_tmpl_real_translate_events): likewise. (g_xim_cl_tmpl_real_selection_notify_event): likewise. * libgxim/gximsrvtmpl.c (_weak_notify_conn_cb): likewise. (g_xim_srv_tmpl_real_translate_events): likewise. (g_xim_srv_tmpl_real_xconnect): likewise. (g_xim_srv_tmpl_send_selection_notify): likewise. (g_xim_srv_tmpl_add_connection): likewise. Index: libgxim/gximclconn.c =================================================================== --- libgxim/gximclconn.c (??????????????? 199) +++ libgxim/gximclconn.c (??????????????? 201) @@ -508,7 +508,7 @@ ev = gdk_event_new(GDK_CLIENT_EVENT); G_XIM_CHECK_ALLOC (ev, FALSE); - ev->client.window = g_object_ref(w); + ev->client.window = w; ev->client.message_type = G_XIM_TRANSPORT_GET_IFACE (trans)->atom_xim_protocol; ev->client.data_format = 32; ev->client.data.l[0] = length; @@ -565,7 +565,7 @@ ev = gdk_event_new(GDK_CLIENT_EVENT); G_XIM_CHECK_ALLOC (ev, FALSE); - ev->client.window = g_object_ref(w); + ev->client.window = w; ev->client.message_type = G_XIM_TRANSPORT_GET_IFACE (trans)->atom_xim_protocol; ev->client.data_format = 8; memset(ev->client.data.b, 0, transport_size); Index: libgxim/gximsrvconn.c =================================================================== --- libgxim/gximsrvconn.c (??????????????? 199) +++ libgxim/gximsrvconn.c (??????????????? 201) @@ -524,7 +524,7 @@ ev = gdk_event_new(GDK_CLIENT_EVENT); G_XIM_CHECK_ALLOC (ev, FALSE); - ev->client.window = g_object_ref(w); + ev->client.window = w; ev->client.message_type = G_XIM_TRANSPORT_GET_IFACE (trans)->atom_xim_protocol; ev->client.data_format = 32; ev->client.data.l[0] = length; @@ -581,7 +581,7 @@ ev = gdk_event_new(GDK_CLIENT_EVENT); G_XIM_CHECK_ALLOC (ev, FALSE); - ev->client.window = g_object_ref(w); + ev->client.window = w; ev->client.message_type = G_XIM_TRANSPORT_GET_IFACE (trans)->atom_xim_protocol; ev->client.data_format = 8; memset(ev->client.data.b, 0, transport_size); Index: libgxim/gximmisc.c =================================================================== --- libgxim/gximmisc.c (??????????????? 199) +++ libgxim/gximmisc.c (??????????????? 201) @@ -725,7 +725,7 @@ G_XIM_NATIVE_WINDOW_TO_POINTER (window)); } - return retval; + return retval != NULL ? g_object_ref(retval) : NULL; } GdkPixmap * @@ -750,6 +750,7 @@ GdkAtom selection) { Window xwindow; + GdkWindow *retval; g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); g_return_val_if_fail (selection != GDK_NONE, NULL); @@ -763,7 +764,11 @@ if (xwindow == None) return NULL; - return g_xim_get_window(display, (GdkNativeWindow)xwindow); + retval = g_xim_get_window(display, (GdkNativeWindow)xwindow); + /* just decrease a counter to not mind unref outside this function */ + g_object_unref(retval); + + return retval; } GdkWindow * Index: libgxim/gximcltmpl.c =================================================================== --- libgxim/gximcltmpl.c (??????????????? 199) +++ libgxim/gximcltmpl.c (??????????????? 201) @@ -178,6 +178,7 @@ w = g_xim_get_window(dpy, nw); if (w) g_xim_core_unwatch_event(core, w); + g_object_unref(w); w = g_xim_transport_get_channel(G_XIM_TRANSPORT (client->connection), NULL); if (w) g_xim_core_unwatch_event(core, w); @@ -231,7 +232,7 @@ */ if (w) { event->any.type = GDK_DESTROY; - event->any.window = g_object_ref(w); + event->any.window = w; event->any.send_event = xev->xdestroywindow.send_event ? TRUE : FALSE; retval = GDK_FILTER_TRANSLATE; } @@ -332,7 +333,7 @@ { GXimClientTemplate *client = G_XIM_CL_TMPL (core); GdkDisplay *dpy = g_xim_core_get_display(core); - GdkWindow *w; + GdkWindow *w = NULL; GdkAtom atom_type; gint format, bytes; gchar *prop = NULL, *p = NULL; @@ -409,6 +410,8 @@ goto end; } end: + if (w) + g_object_unref(w); g_free(prop); g_free(p); Index: libgxim/gximsrvtmpl.c =================================================================== --- libgxim/gximsrvtmpl.c (??????????????? 199) +++ libgxim/gximsrvtmpl.c (??????????????? 201) @@ -331,6 +331,7 @@ G_XIM_NATIVE_WINDOW_TO_POINTER (nw)); w = g_xim_get_window(dpy, nw); g_xim_core_unwatch_event(core, w); + g_object_unref(w); g_hash_table_remove(server->conn_table, G_XIM_NATIVE_WINDOW_TO_POINTER (nw)); } @@ -341,6 +342,7 @@ G_XIM_NATIVE_WINDOW_TO_POINTER (nw)); w = g_xim_get_window(dpy, nw); g_xim_core_unwatch_event(core, w); + g_object_unref(w); g_hash_table_remove(server->conn_table, G_XIM_NATIVE_WINDOW_TO_POINTER (nw)); } @@ -473,7 +475,7 @@ */ if (w) { event->any.type = GDK_DESTROY; - event->any.window = g_object_ref(w); + event->any.window = w; event->any.send_event = xev->xdestroywindow.send_event ? TRUE : FALSE; retval = GDK_FILTER_TRANSLATE; } @@ -762,7 +764,7 @@ ev = gdk_event_new(GDK_CLIENT_EVENT); G_XIM_CHECK_ALLOC_WITH_CODE (ev, g_object_unref(conn), NULL); - ev->client.window = g_object_ref(window); + ev->client.window = window; ev->client.message_type = event->message_type; ev->client.data_format = 32; ev->client.data.l[0] = (long)comm_window; @@ -1110,6 +1112,7 @@ window = g_xim_get_window(dpy, event->requestor); gdk_property_change(window, event->property, event->target, 8, GDK_PROP_MODE_REPLACE, (const guchar *)data, length); + g_object_unref(window); gdk_selection_send_notify_for_display(dpy, event->requestor, event->selection, @@ -1170,6 +1173,7 @@ mask = gdk_window_get_events(w); gdk_window_set_events(w, mask | GDK_STRUCTURE_MASK); g_xim_core_watch_event(core, w); + g_object_unref(w); } /** Index: libgxim.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgxim/devel/libgxim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libgxim.spec 2 Mar 2009 05:48:14 -0000 1.8 +++ libgxim.spec 3 Mar 2009 14:38:28 -0000 1.9 @@ -1,6 +1,6 @@ Name: libgxim Version: 0.3.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ URL: http://code.google.com/p/libgxim/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -8,6 +8,7 @@ BuildRequires: dbus-devel > 0.23, dbus-glib-devel >= 0.74, glib2-devel >= 2.16, gtk2-devel Source0: http://libgxim.googlecode.com/files/%{name}-%{version}.tar.bz2 Patch0: libgxim-fix-x-event.patch +Patch1: libgxim-fix-unwanted-window-destroy.patch Summary: GObject-based XIM protocol library Group: System Environment/Libraries @@ -40,6 +41,7 @@ %prep %setup -q %patch0 -p0 -b .xevent +%patch1 -p0 -b .window %build @@ -79,6 +81,9 @@ %{_datadir}/gtk-doc/html/libgxim %changelog +* Tue Mar 3 2009 Akira TAGOH - 0.3.2-4 +- Fix destroying a window unexpectedly. (#488223) + * Mon Mar 2 2009 Akira TAGOH - 0.3.2-3 - Backport a patch to fix the unknown event issue. From tuxbrewr at fedoraproject.org Tue Mar 3 14:42:38 2009 From: tuxbrewr at fedoraproject.org (Steven M. Parrish) Date: Tue, 3 Mar 2009 14:42:38 +0000 (UTC) Subject: rpms/sugar-chat/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sugar-chat.spec, 1.4, 1.5 Message-ID: <20090303144238.9CB6170116@cvs1.fedora.phx.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/sugar-chat/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9986 Modified Files: .cvsignore sources sugar-chat.spec Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-chat/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Jan 2009 15:53:13 -0000 1.3 +++ .cvsignore 3 Mar 2009 14:42:08 -0000 1.4 @@ -1 +1 @@ -Chat-62.tar.bz2 +Chat-64.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-chat/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jan 2009 15:53:13 -0000 1.3 +++ sources 3 Mar 2009 14:42:08 -0000 1.4 @@ -1 +1 @@ -b7593ec62a8c86727e177aeb00cff708 Chat-62.tar.bz2 +dfb2b0abfb21dfbb419173a24dad67ff Chat-64.tar.bz2 Index: sugar-chat.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-chat/devel/sugar-chat.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sugar-chat.spec 26 Feb 2009 03:38:46 -0000 1.4 +++ sugar-chat.spec 3 Mar 2009 14:42:08 -0000 1.5 @@ -1,6 +1,6 @@ Name: sugar-chat -Version: 62 -Release: 2%{?dist} +Version: 64 +Release: 1%{?dist} Summary: Chat client for Sugar Group: Sugar/Activities License: GPLv2+ @@ -38,6 +38,9 @@ %changelog +* Tue Mar 03 2009 Steven M. Parrish - 64-2 +- New upstream release + * Wed Feb 25 2009 Fedora Release Engineering - 62-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Tue Mar 3 14:53:58 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 14:53:58 +0000 (UTC) Subject: rpms/stratagus/devel stratagus-includes.patch, NONE, 1.1 stratagus.spec, 1.24, 1.25 Message-ID: <20090303145358.707B070116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/stratagus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16751 Modified Files: stratagus.spec Added Files: stratagus-includes.patch Log Message: add stdio.h for stderr stratagus-includes.patch: --- NEW FILE stratagus-includes.patch --- diff -ru stratagus-2.2.4.orig/src/stratagus/util.cpp stratagus-2.2.4/src/stratagus/util.cpp --- stratagus-2.2.4.orig/src/stratagus/util.cpp 2009-03-03 14:38:10.000000000 +0000 +++ stratagus-2.2.4/src/stratagus/util.cpp 2009-03-03 14:38:39.000000000 +0000 @@ -30,6 +30,7 @@ #include #include +#include #include #include Index: stratagus.spec =================================================================== RCS file: /cvs/pkgs/rpms/stratagus/devel/stratagus.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- stratagus.spec 26 Feb 2009 03:18:30 -0000 1.24 +++ stratagus.spec 3 Mar 2009 14:53:28 -0000 1.25 @@ -1,7 +1,7 @@ Name: stratagus Summary: Real-time strategy gaming engine Version: 2.2.4 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: Development/Libraries URL: http://stratagus.sourceforge.net/ @@ -10,6 +10,7 @@ Patch1: stratagus-gcc43.patch # currently broken Patch2: stratagus--guichan_external.diff +Patch3: stratagus-includes.patch BuildRequires: mikmod-devel BuildRequires: tolua++-devel BuildRequires: lua-devel @@ -37,6 +38,7 @@ %patch0 %patch1 -p1 -b .gcc43 #%patch2 -p0 -b .guichan +%patch3 -p1 -b .includes dos2unix doc/graphics/stratagus.gimp dos2unix doc/scripts/makeindex.py dos2unix doc/scripts/showindex.py @@ -68,6 +70,9 @@ %{_bindir}/%{name} %changelog +* Tue Mar 03 2009 Caol??n McNamara - 2.2.4-7 +- add stdio.h for stderr + * Wed Feb 25 2009 Fedora Release Engineering - 2.2.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mmcgrath at fedoraproject.org Tue Mar 3 14:54:51 2009 From: mmcgrath at fedoraproject.org (Mike McGrath) Date: Tue, 3 Mar 2009 14:54:51 +0000 (UTC) Subject: rpms/nagios/EL-5 output_buffer.patch, NONE, 1.1 nagios-initrd.patch, 1.1, 1.2 nagios.spec, 1.36, 1.37 Message-ID: <20090303145451.E04EE70116@cvs1.fedora.phx.redhat.com> Author: mmcgrath Update of /cvs/pkgs/rpms/nagios/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17103 Modified Files: nagios-initrd.patch nagios.spec Added Files: output_buffer.patch Log Message: Increasing output buffer size output_buffer.patch: --- NEW FILE output_buffer.patch --- diff -uNr nagios-2.12.bak/include/common.h nagios-2.12/include/common.h --- nagios-2.12.bak/include/common.h 2008-05-19 12:04:40.000000000 -0500 +++ nagios-2.12/include/common.h 2009-03-03 08:45:44.000000000 -0600 @@ -379,7 +379,7 @@ /************************** MISC DEFINITIONS ****************************/ #define MAX_FILENAME_LENGTH 256 /* max length of path/filename that Nagios will process */ -#define MAX_INPUT_BUFFER 1024 /* size in bytes of max. input buffer (for reading files) */ +#define MAX_INPUT_BUFFER 8192 /* size in bytes of max. input buffer (for reading files) */ #define MAX_COMMAND_BUFFER 8192 /* max length of raw or processed command line */ #define MAX_DATETIME_LENGTH 48 diff -uNr nagios-2.12.bak/include/objects.h nagios-2.12/include/objects.h --- nagios-2.12.bak/include/objects.h 2006-03-21 16:21:51.000000000 -0600 +++ nagios-2.12/include/objects.h 2009-03-03 08:46:28.000000000 -0600 @@ -45,7 +45,7 @@ #define MAX_HOSTNAME_LENGTH 64 /* max. host name length */ #define MAX_SERVICEDESC_LENGTH 64 /* max. service description length */ -#define MAX_PLUGINOUTPUT_LENGTH 332 /* max. length of plugin output */ +#define MAX_PLUGINOUTPUT_LENGTH 8192 /* max. length of plugin output */ #define MAX_STATE_HISTORY_ENTRIES 21 /* max number of old states to keep track of for flap detection */ nagios-initrd.patch: Index: nagios-initrd.patch =================================================================== RCS file: /cvs/pkgs/rpms/nagios/EL-5/nagios-initrd.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nagios-initrd.patch 9 May 2006 23:25:13 -0000 1.1 +++ nagios-initrd.patch 3 Mar 2009 14:54:51 -0000 1.2 @@ -1,7 +1,7 @@ ---- nagios 2006-05-08 10:39:49.000000000 -0300 -+++ daemon-init.in 2006-05-08 10:33:26.000000000 -0300 -@@ -114,11 +114,13 @@ - echo "Starting network monitor: nagios" +--- daemon-init.in.orig 2007-04-09 12:43:30.000000000 -0500 ++++ daemon-init.in 2009-03-03 08:50:15.000000000 -0600 +@@ -124,11 +124,13 @@ + echo -n "Starting nagios:" $NagiosBin -v $NagiosCfgFile > /dev/null 2>&1; if [ $? -eq 0 ]; then - su - $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile" @@ -13,5 +13,5 @@ $NagiosBin -d $NagiosCfgFile + pidof nagios > $NagiosRunFile if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi - #sleep 1 - #status_nagios nagios + echo " done." + exit 0 Index: nagios.spec =================================================================== RCS file: /cvs/pkgs/rpms/nagios/EL-5/nagios.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- nagios.spec 5 Oct 2008 20:51:00 -0000 1.36 +++ nagios.spec 3 Mar 2009 14:54:51 -0000 1.37 @@ -2,7 +2,7 @@ Name: nagios Version: 2.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -12,6 +12,7 @@ Source1: nagios.logrotate Source2: nagios.htaccess Patch0: nagios-initrd.patch +Patch1: output_buffer.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel > 1.8, mailx, libjpeg-devel, libpng-devel @@ -61,6 +62,7 @@ %prep %setup -q %patch0 -p0 +%patch1 -p1 %build ./configure \ @@ -169,6 +171,9 @@ %{_includedir}/%{name} %changelog +* Tue Mar 3 2009 Mike McGrath 2.12-5 +- Fix for bug 469198, increased plugin output buffer + * Sun Oct 5 2008 Mike McGrath 2.12-4 - Rebuild to test build system From rdieter at fedoraproject.org Tue Mar 3 14:56:13 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Tue, 3 Mar 2009 14:56:13 +0000 (UTC) Subject: rpms/qt/devel qt.spec,1.244,1.245 Message-ID: <20090303145613.CE83170116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17359 Modified Files: qt.spec Log Message: * Tue Mar 03 2009 Rex Dieter - 4.5.0-2 - License: LGPLv2 with exceptions or GPLv3 - BR: gstreamer-devel Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- qt.spec 3 Mar 2009 12:17:03 -0000 1.244 +++ qt.spec 3 Mar 2009 14:55:43 -0000 1.245 @@ -12,9 +12,10 @@ Name: qt4 %endif Version: 4.5.0 -Release: 1%{?dist} +Release: 2%{?dist} -License: LGPLv2 or GPLv3 with exceptions +# See LGPL_EXCEPTIONS.txt +License: LGPLv2 with exceptions or GPLv3 Group: System Environment/Libraries Url: http://www.qtsoftware.com/ Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2 @@ -139,6 +140,7 @@ %if "%{?phonon}" == "-phonon" BuildRequires: glib2-devel +BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel %endif @@ -776,6 +778,10 @@ %changelog +* Tue Mar 03 2009 Rex Dieter - 4.5.0-2 +- License: LGPLv2 with exceptions or GPLv3 +- BR: gstreamer-devel + * Tue Mar 03 2009 Than Ngo - 4.5.0-1 - 4.5.0 From sindrepb at fedoraproject.org Tue Mar 3 14:56:51 2009 From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=) Date: Tue, 3 Mar 2009 14:56:51 +0000 (UTC) Subject: rpms/muine-scrobbler/devel muine-scrobbler.spec,1.8,1.9 Message-ID: <20090303145651.910DF70116@cvs1.fedora.phx.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/muine-scrobbler/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17469 Modified Files: muine-scrobbler.spec Log Message: Fix i386 issue Index: muine-scrobbler.spec =================================================================== RCS file: /cvs/pkgs/rpms/muine-scrobbler/devel/muine-scrobbler.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- muine-scrobbler.spec 26 Feb 2009 03:20:18 -0000 1.8 +++ muine-scrobbler.spec 3 Mar 2009 14:56:21 -0000 1.9 @@ -13,7 +13,7 @@ Patch1: %{real_name}-fixcompile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: i386 x86_64 +ExclusiveArch: %{ix86} x86_64 BuildRequires: mono-devel, muine-devel >= 0.8.8-8 BuildRequires: gtk-sharp2-devel, gnome-sharp-devel From xhorak at fedoraproject.org Tue Mar 3 14:58:19 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Tue, 3 Mar 2009 14:58:19 +0000 (UTC) Subject: rpms/thunderbird/devel thunderbird.spec,1.128,1.129 Message-ID: <20090303145819.D2BF570116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/thunderbird/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17765 Modified Files: thunderbird.spec Log Message: Move of autoconf213 Index: thunderbird.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- thunderbird.spec 3 Mar 2009 13:57:17 -0000 1.128 +++ thunderbird.spec 3 Mar 2009 14:57:49 -0000 1.129 @@ -48,11 +48,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: nspr >= %{nspr_version} Requires: nss >= %{nss_version} -%if 0%{?rhel} >= 5 -Requires: launchmail -%endif -BuildRequires: autoconf213 -BuildRequires: alsa-lib-devel +#%if 0%{?rhel} >= 5 +#Requires: launchmail +#%endif BuildRequires: libcurl-devel BuildRequires: cairo-devel >= %{cairo_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -66,6 +64,8 @@ BuildRequires: freetype-devel >= 2.1.9 BuildRequires: libXt-devel BuildRequires: libXrender-devel +BuildRequires: alsa-lib-devel +BuildRequires: autoconf213 Requires: desktop-file-utils >= %{desktop_file_utils_version} %define mozappdir %{_libdir}/thunderbird-%{version}b2 From sindrepb at fedoraproject.org Tue Mar 3 14:59:15 2009 From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=) Date: Tue, 3 Mar 2009 14:59:15 +0000 (UTC) Subject: rpms/muine-scrobbler/devel muine-scrobbler.spec,1.9,1.10 Message-ID: <20090303145915.E878070116@cvs1.fedora.phx.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/muine-scrobbler/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17905 Modified Files: muine-scrobbler.spec Log Message: Index: muine-scrobbler.spec =================================================================== RCS file: /cvs/pkgs/rpms/muine-scrobbler/devel/muine-scrobbler.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- muine-scrobbler.spec 3 Mar 2009 14:56:21 -0000 1.9 +++ muine-scrobbler.spec 3 Mar 2009 14:58:45 -0000 1.10 @@ -2,7 +2,7 @@ Name: muine-scrobbler Version: 0.1.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Audioscrobbler plugin for Muine Group: Applications/Multimedia @@ -52,6 +52,8 @@ %changelog +* Tue Mar 04 2009 Sindre Pedersen Bj??rdal - 0.1.8-9 +- Don't use i386, use macro instead * Wed Feb 25 2009 Fedora Release Engineering - 0.1.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Tue Mar 3 14:59:50 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 14:59:50 +0000 (UTC) Subject: rpms/HippoDraw/devel HippoDraw-1.21.1-includes.patch, NONE, 1.1 HippoDraw.spec, 1.9, 1.10 Message-ID: <20090303145950.DA86F70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/HippoDraw/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18040 Modified Files: HippoDraw.spec Added Files: HippoDraw-1.21.1-includes.patch Log Message: include cstdio for std::sprintf HippoDraw-1.21.1-includes.patch: --- NEW FILE HippoDraw-1.21.1-includes.patch --- diff -ru HippoDraw-1.21.1.orig/reps/AxisRepBase.cxx HippoDraw-1.21.1/reps/AxisRepBase.cxx --- HippoDraw-1.21.1.orig/reps/AxisRepBase.cxx 2009-03-03 14:30:24.000000000 +0000 +++ HippoDraw-1.21.1/reps/AxisRepBase.cxx 2009-03-03 14:31:06.000000000 +0000 @@ -30,11 +30,13 @@ #include #include +#include using std::max; using std::min; using std::string; using std::vector; +using std::sprintf; #ifdef __USE_ISOC99 using std::isfinite; #endif Index: HippoDraw.spec =================================================================== RCS file: /cvs/pkgs/rpms/HippoDraw/devel/HippoDraw.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- HippoDraw.spec 23 Feb 2009 21:25:14 -0000 1.9 +++ HippoDraw.spec 3 Mar 2009 14:59:20 -0000 1.10 @@ -1,6 +1,6 @@ Name: HippoDraw Version: 1.21.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Interactive and Python scriptable data analysis application %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")} @@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: HippoDraw-1.21.1-gcc43.patch +Patch2: HippoDraw-1.21.1-includes.patch BuildRequires: cfitsio-devel qt3-devel desktop-file-utils doxygen graphviz @@ -63,6 +64,7 @@ %setup -q %patch1 -p1 -b .gcc43 +%patch2 -p1 -b .includes %build # Exclude or avoid packages that might be installed in /usr/local @@ -142,6 +144,9 @@ %{_datadir}/%{name}/examples %changelog +* Tue Mar 03 2009 Caol??n McNamara - 1.21.1-9 +- include cstdio for std::sprintf + * Mon Feb 23 2009 Fedora Release Engineering - 1.21.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Tue Mar 3 15:04:07 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 15:04:07 +0000 (UTC) Subject: rpms/fuse-encfs/devel encfs-1.5-const.patch, NONE, 1.1 fuse-encfs.spec, 1.27, 1.28 Message-ID: <20090303150407.1900D70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/fuse-encfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18842 Modified Files: fuse-encfs.spec Added Files: encfs-1.5-const.patch Log Message: constify ret of strchr(const char*) encfs-1.5-const.patch: --- NEW FILE encfs-1.5-const.patch --- diff -ru encfs-1.5.orig/encfs/NameIO.cpp encfs-1.5/encfs/NameIO.cpp --- encfs-1.5.orig/encfs/NameIO.cpp 2009-03-03 14:56:44.000000000 +0000 +++ encfs-1.5/encfs/NameIO.cpp 2009-03-03 14:57:02.000000000 +0000 @@ -190,7 +190,7 @@ } else { bool isDotFile = (*path == '.'); - char *next = strchr( path, '/' ); + const char *next = strchr( path, '/' ); int len = next ? next - path : strlen( path ); // at this point we know that len > 0 Index: fuse-encfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/fuse-encfs/devel/fuse-encfs.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- fuse-encfs.spec 24 Feb 2009 18:52:46 -0000 1.27 +++ fuse-encfs.spec 3 Mar 2009 15:03:36 -0000 1.28 @@ -1,12 +1,13 @@ Name: fuse-encfs Version: 1.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPLv3+ Group: System Environment/Kernel Url: http://www.arg0.net/encfs Source0: http://encfs.googlecode.com/files/encfs-%{version}-2.tgz Source1: http://encfs.googlecode.com/files/encfs-%{version}-2.tgz.asc +Patch0: encfs-1.5-const.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: fuse >= 2.6 Provides: encfs = %{version} @@ -25,6 +26,7 @@ %prep %setup -q -n encfs-%{version} +%patch0 -p1 -b .const %build %configure --disable-static --with-boost-libdir=%{_libdir} @@ -52,6 +54,9 @@ %{_mandir}/man1/* %changelog +* Tue Mar 03 2009 Caol??n McNamara - 1.5-6 +- constify ret of strchr(const char*) + * Tue Feb 24 2009 Fedora Release Engineering - 1.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From tuxbrewr at fedoraproject.org Tue Mar 3 15:05:09 2009 From: tuxbrewr at fedoraproject.org (Steven M. Parrish) Date: Tue, 3 Mar 2009 15:05:09 +0000 (UTC) Subject: rpms/sugar-terminal/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sugar-terminal.spec, 1.5, 1.6 Message-ID: <20090303150509.B8EF470116@cvs1.fedora.phx.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/sugar-terminal/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19111 Modified Files: .cvsignore sources sugar-terminal.spec Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-terminal/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Jan 2009 18:29:57 -0000 1.3 +++ .cvsignore 3 Mar 2009 15:04:39 -0000 1.4 @@ -1 +1 @@ -Terminal-21.tar.bz2 +Terminal-23.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-terminal/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jan 2009 18:29:57 -0000 1.3 +++ sources 3 Mar 2009 15:04:39 -0000 1.4 @@ -1 +1 @@ -9afb07bba8e9d8630b2831f5200f5ee6 Terminal-21.tar.bz2 +597856f5b887ef7571d18d58fd553854 Terminal-23.tar.bz2 Index: sugar-terminal.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-terminal/devel/sugar-terminal.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sugar-terminal.spec 26 Feb 2009 03:56:12 -0000 1.5 +++ sugar-terminal.spec 3 Mar 2009 15:04:39 -0000 1.6 @@ -1,6 +1,6 @@ Name: sugar-terminal -Version: 21 -Release: 2%{?dist} +Version: 23 +Release: 1%{?dist} Summary: Terminal for Sugar Group: Sugar/Activities License: GPLv2+ @@ -42,6 +42,9 @@ %changelog +* Tue Mar 03 2009 Steven M. Parrish - 23-1 +- New upstream release + * Wed Feb 25 2009 Fedora Release Engineering - 21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pjones at fedoraproject.org Tue Mar 3 15:15:11 2009 From: pjones at fedoraproject.org (Peter Jones) Date: Tue, 3 Mar 2009 15:15:11 +0000 (UTC) Subject: rpms/grub/devel grub.spec,1.84,1.85 Message-ID: <20090303151511.A8F7670116@cvs1.fedora.phx.redhat.com> Author: pjones Update of /cvs/extras/rpms/grub/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21354 Modified Files: grub.spec Log Message: * Tue Mar 03 2009 Peter Jones - 0.97-42 - Switch from i386 to i586. - BuildReq on glibc-static. Index: grub.spec =================================================================== RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- grub.spec 2 Mar 2009 22:15:50 -0000 1.84 +++ grub.spec 3 Mar 2009 15:14:41 -0000 1.85 @@ -9,6 +9,7 @@ BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, ncurses-static, texinfo BuildRequires: autoconf /usr/lib/crt1.o automake BuildRequires: gnu-efi >= 3.0e-5 +BuildRequires: glibc-static Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Requires: mktemp @@ -113,8 +114,9 @@ %{_datadir}/grub %changelog -* Mon Mar 02 2009 Peter Jones - 0.97-42 +* Tue Mar 03 2009 Peter Jones - 0.97-42 - Switch from i386 to i586. +- BuildReq on glibc-static. * Mon Mar 02 2009 Peter Jones - 0.97-41 - Fix CD Booting on EFI. From corsepiu at fedoraproject.org Tue Mar 3 15:23:23 2009 From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=) Date: Tue, 3 Mar 2009 15:23:23 +0000 (UTC) Subject: rpms/perl-Data-ICal/devel .cvsignore, 1.2, 1.3 perl-Data-ICal.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <20090303152323.50EF070116@cvs1.fedora.phx.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Data-ICal/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22619 Modified Files: .cvsignore perl-Data-ICal.spec sources Log Message: * Tue Mar 03 2009 Ralf Cors??pius - 0.15-1 - Upstream update. - Reflect upstream maintainer having changed. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-ICal/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Aug 2008 03:04:30 -0000 1.2 +++ .cvsignore 3 Mar 2009 15:22:52 -0000 1.3 @@ -1 +1 @@ -Data-ICal-0.13.tar.gz +Data-ICal-0.15.tar.gz Index: perl-Data-ICal.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-ICal/devel/perl-Data-ICal.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Data-ICal.spec 26 Feb 2009 14:29:47 -0000 1.4 +++ perl-Data-ICal.spec 3 Mar 2009 15:22:52 -0000 1.5 @@ -1,11 +1,11 @@ Name: perl-Data-ICal -Version: 0.13 -Release: 5%{?dist} +Version: 0.15 +Release: 1%{?dist} Summary: Generates iCalendar (RFC 2445) calendar files License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Data-ICal/ -Source0: http://www.cpan.org/authors/id/J/JE/JESSE/Data-ICal-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/A/AL/ALEXMV/Data-ICal-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Class::Accessor) @@ -60,6 +60,10 @@ %{_mandir}/man3/* %changelog +* Tue Mar 03 2009 Ralf Cors??pius - 0.15-1 +- Upstream update. +- Reflect upstream maintainer having changed. + * Thu Feb 26 2009 Fedora Release Engineering - 0.13-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-ICal/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Aug 2008 03:04:30 -0000 1.2 +++ sources 3 Mar 2009 15:22:52 -0000 1.3 @@ -1 +1 @@ -42496ff9b75108813b696ffbcffe5913 Data-ICal-0.13.tar.gz +71c830a2da27163d770b5c17fcc11541 Data-ICal-0.15.tar.gz From apevec at fedoraproject.org Tue Mar 3 15:26:39 2009 From: apevec at fedoraproject.org (Alan Pevec) Date: Tue, 3 Mar 2009 15:26:39 +0000 (UTC) Subject: rpms/collectd/devel collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch, 1.1, 1.2 collectd.spec, 1.17, 1.18 Message-ID: <20090303152639.402A070116@cvs1.fedora.phx.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/collectd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23034 Modified Files: collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch collectd.spec Log Message: fix the patch temp remove ipvs . . . . . . . . no (ip_vs.h not found) collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch: Index: collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch 3 Mar 2009 13:47:59 -0000 1.1 +++ collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch 3 Mar 2009 15:26:08 -0000 1.2 @@ -1,4 +1,4 @@ -From 76cdc4d21f40a65d775bbce3468996c4d0045d96 Mon Sep 17 00:00:00 2001 +From b96ca3bd632f5fef539486a4c2c9906b32c31817 Mon Sep 17 00:00:00 2001 From: Alan Pevec Date: Tue, 3 Mar 2009 14:36:36 +0100 Subject: [PATCH] Fix gcc-4.4 strict-aliasing issue @@ -14,7 +14,7 @@ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/liboping/liboping.c b/src/liboping/liboping.c -index 13bcc92..dee28fb 100644 +index 13bcc92..94adb1d 100644 --- a/src/liboping/liboping.c +++ b/src/liboping/liboping.c @@ -987,9 +987,12 @@ int ping_host_add (pingobj_t *obj, const char *host) @@ -29,7 +29,7 @@ + struct sockaddr_in si; + } s; + s.any_socket = sockaddr; -+ si = &s.si; ++ struct sockaddr_in *si = &s.si; si->sin_family = AF_INET; si->sin_port = htons (ph->ident); si->sin_addr.s_addr = htonl (INADDR_ANY); @@ -45,7 +45,7 @@ + struct sockaddr_in6 si; + } s; + s.any_socket = sockaddr; -+ si = &s.si; ++ struct sockaddr_in6 *si = &s.si; si->sin6_family = AF_INET6; si->sin6_port = htons (ph->ident); si->sin6_addr = in6addr_any; Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- collectd.spec 3 Mar 2009 13:47:59 -0000 1.17 +++ collectd.spec 3 Mar 2009 15:26:08 -0000 1.18 @@ -162,6 +162,7 @@ %configure \ --disable-ascent \ --disable-static \ + --disable-ipvs \ --enable-mysql \ --enable-sensors \ --enable-email \ @@ -284,7 +285,6 @@ %{_libdir}/collectd/hddtemp.so %{_libdir}/collectd/interface.so %{_libdir}/collectd/iptables.so -%{_libdir}/collectd/ipvs.so %{_libdir}/collectd/irq.so %{_libdir}/collectd/load.so %{_libdir}/collectd/logfile.so From rdieter at fedoraproject.org Tue Mar 3 15:26:40 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Tue, 3 Mar 2009 15:26:40 +0000 (UTC) Subject: rpms/qt/devel qt.spec,1.245,1.246 Message-ID: <20090303152640.D2BF270116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23208 Modified Files: qt.spec Log Message: GPLv3 has exceptions too Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.245 retrieving revision 1.246 diff -u -r1.245 -r1.246 --- qt.spec 3 Mar 2009 14:55:43 -0000 1.245 +++ qt.spec 3 Mar 2009 15:26:10 -0000 1.246 @@ -14,8 +14,8 @@ Version: 4.5.0 Release: 2%{?dist} -# See LGPL_EXCEPTIONS.txt -License: LGPLv2 with exceptions or GPLv3 +# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details +License: LGPLv2 with exceptions or GPLv3 with exceptions Group: System Environment/Libraries Url: http://www.qtsoftware.com/ Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2 @@ -779,7 +779,7 @@ %changelog * Tue Mar 03 2009 Rex Dieter - 4.5.0-2 -- License: LGPLv2 with exceptions or GPLv3 +- License: LGPLv2 with exceptions or GPLv3 with exceptions - BR: gstreamer-devel * Tue Mar 03 2009 Than Ngo - 4.5.0-1 From caolanm at fedoraproject.org Tue Mar 3 15:36:22 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 15:36:22 +0000 (UTC) Subject: rpms/libdap/devel libdap-3.8.2-includes.patch, NONE, 1.1 libdap.spec, 1.24, 1.25 Message-ID: <20090303153622.E06D770116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/libdap/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24857 Modified Files: libdap.spec Added Files: libdap-3.8.2-includes.patch Log Message: include cstdio for std::sprintf libdap-3.8.2-includes.patch: --- NEW FILE libdap-3.8.2-includes.patch --- diff -ru libdap-3.8.2.orig/util_mit.cc libdap-3.8.2/util_mit.cc --- libdap-3.8.2.orig/util_mit.cc 2009-03-03 15:12:12.000000000 +0000 +++ libdap-3.8.2/util_mit.cc 2009-03-03 15:12:52.000000000 +0000 @@ -35,6 +35,7 @@ #include #include +#include #include #include @@ -54,6 +55,7 @@ using std::cerr; using std::endl; using std::string; +using std::sprintf; #include "debug.h" Index: libdap.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdap/devel/libdap.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- libdap.spec 25 Feb 2009 14:17:28 -0000 1.24 +++ libdap.spec 3 Mar 2009 15:35:52 -0000 1.25 @@ -1,13 +1,14 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP Version: 3.8.2 -Release: 2%{?dist} +Release: 3%{?dist} # the deflate program is covered by the W3C license License: LGPLv2+ and W3C Group: Development/Libraries URL: http://www.opendap.org/ Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz +Patch0: libdap-3.8.2-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -58,6 +59,7 @@ %prep %setup -q +%patch0 -p1 -b .includes iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C @@ -120,6 +122,9 @@ %changelog +* Tue Mar 2 2009 Caol??n McNamara - 3.8.2-3 +- include cstdio for std::sprintf + * Wed Feb 25 2009 Fedora Release Engineering - 3.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From xhorak at fedoraproject.org Tue Mar 3 15:39:50 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Tue, 3 Mar 2009 15:39:50 +0000 (UTC) Subject: rpms/thunderbird/devel thunderbird-mozconfig, 1.13, 1.14 thunderbird.spec, 1.129, 1.130 Message-ID: <20090303153950.25A4470116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/thunderbird/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25467 Modified Files: thunderbird-mozconfig thunderbird.spec Log Message: Disable crash reporter Index: thunderbird-mozconfig =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird-mozconfig,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- thunderbird-mozconfig 3 Mar 2009 10:29:37 -0000 1.13 +++ thunderbird-mozconfig 3 Mar 2009 15:39:19 -0000 1.14 @@ -25,6 +25,7 @@ ac_add_options --enable-system-cairo ac_add_options --enable-svg ac_add_options --enable-canvas +ac_add_options --disable-crashreporter export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 Index: thunderbird.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- thunderbird.spec 3 Mar 2009 14:57:49 -0000 1.129 +++ thunderbird.spec 3 Mar 2009 15:39:19 -0000 1.130 @@ -48,9 +48,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: nspr >= %{nspr_version} Requires: nss >= %{nss_version} -#%if 0%{?rhel} >= 5 -#Requires: launchmail -#%endif BuildRequires: libcurl-devel BuildRequires: cairo-devel >= %{cairo_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -299,7 +296,6 @@ %changelog * Mon Mar 2 2009 Jan Horak - 3.0-1.beta2 - Update to 3.0 beta2 -- Removed creation of thunderbird start script by rpmbuild - Added Patch2 to build correctly when building with --enable-shared option * Wed Feb 25 2009 Fedora Release Engineering - 2.0.0.18-3 From rdieter at fedoraproject.org Tue Mar 3 15:44:17 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Tue, 3 Mar 2009 15:44:17 +0000 (UTC) Subject: rpms/qt/devel qt.spec, 1.246, 1.247 qt-x11-opensource-src-4.4.0-qgtkstyle.patch, 1.1, NONE Message-ID: <20090303154417.4CB9A70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26278 Modified Files: qt.spec Removed Files: qt-x11-opensource-src-4.4.0-qgtkstyle.patch Log Message: - drop qgtkstyle patch (no longer needed) Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.246 retrieving revision 1.247 diff -u -r1.246 -r1.247 --- qt.spec 3 Mar 2009 15:26:10 -0000 1.246 +++ qt.spec 3 Mar 2009 15:43:46 -0000 1.247 @@ -37,9 +37,6 @@ Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch -# under GNOME, default to QGtkStyle if available -# (otherwise fall back to QCleanlooksStyle) -Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch Patch10: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch ## upstreamable bits # http://bugzilla.redhat.com/485677 @@ -306,7 +303,6 @@ %patch3 -p1 -b .multilib-QMAKEPATH %endif %patch5 -p1 -b .bz#437440-as_IN-437440 -%patch9 -p1 -b .qgtkstyle %patch10 -p1 -b .ppc64 %patch50 -p1 -b .qhostaddress @@ -781,6 +777,7 @@ * Tue Mar 03 2009 Rex Dieter - 4.5.0-2 - License: LGPLv2 with exceptions or GPLv3 with exceptions - BR: gstreamer-devel +- drop qgtkstyle patch (no longer needed) * Tue Mar 03 2009 Than Ngo - 4.5.0-1 - 4.5.0 --- qt-x11-opensource-src-4.4.0-qgtkstyle.patch DELETED --- From sindrepb at fedoraproject.org Tue Mar 3 15:48:36 2009 From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=) Date: Tue, 3 Mar 2009 15:48:36 +0000 (UTC) Subject: rpms/perl-Nmap-Parser/devel .cvsignore, 1.3, 1.4 perl-Nmap-Parser.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <20090303154836.344D070116@cvs1.fedora.phx.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/perl-Nmap-Parser/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27616 Modified Files: .cvsignore perl-Nmap-Parser.spec sources Log Message: new upstream, fixes gcc 4.4 build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Nmap-Parser/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Aug 2008 15:13:07 -0000 1.3 +++ .cvsignore 3 Mar 2009 15:48:05 -0000 1.4 @@ -1 +1 @@ -Nmap-Parser-1.16.tar.gz +Nmap-Parser-1.19.tar.gz Index: perl-Nmap-Parser.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Nmap-Parser/devel/perl-Nmap-Parser.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Nmap-Parser.spec 26 Feb 2009 23:35:12 -0000 1.7 +++ perl-Nmap-Parser.spec 3 Mar 2009 15:48:05 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Nmap-Parser -Version: 1.16 -Release: 3%{?dist} +Version: 1.19 +Release: 1%{?dist} Summary: Parse nmap scan data with perl Group: Development/Libraries @@ -11,7 +11,6 @@ BuildArch: noarch BuildRequires: perl(XML::Twig), perl(ExtUtils::MakeMaker), perl(Test::More) -BuildRequires: /usr/bin/dos2unix Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -26,8 +25,8 @@ %setup -qn Nmap-Parser-%{version} #fix end-of-line encoding -/usr/bin/dos2unix $RPM_BUILD_DIR/Nmap-Parser-%{version}/README -/usr/bin/dos2unix $RPM_BUILD_DIR/Nmap-Parser-%{version}/Parser.pm +sed -i 's/\r//' $RPM_BUILD_DIR/Nmap-Parser-%{version}/README +sed -i 's/\r//' $RPM_BUILD_DIR/Nmap-Parser-%{version}/Parser.pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -41,9 +40,9 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* -install -D -m 755 tools/nmap2sqlite.pl $RPM_BUILD_ROOT%{_datadir}%{name}/nmap2sqlite.pl -install -m 755 tools/pdev.pl $RPM_BUILD_ROOT%{_datadir}%{name}/pdev.pl -install -m 755 tools/scan.pl $RPM_BUILD_ROOT%{_datadir}%{name}/scan.pl +install -D -m 755 tools/nmap2sqlite.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/nmap2sqlite.pl +install -m 755 tools/pdev.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/pdev.pl +install -m 755 tools/scan.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/scan.pl #fix permissions chmod 0644 $RPM_BUILD_DIR/Nmap-Parser-%{version}/README @@ -67,6 +66,11 @@ %{_mandir}/man3/*.3* %changelog +* Tue Mar 04 2009 Sindre Pedersen Bj??rdal +- New upstream release +- Fix typo in manual install +- Don't use dos2unix, rely on sed magic instead + * Thu Feb 26 2009 Fedora Release Engineering - 1.16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Nmap-Parser/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Aug 2008 15:13:07 -0000 1.3 +++ sources 3 Mar 2009 15:48:05 -0000 1.4 @@ -1 +1 @@ -0d663caf90de3cd6c85ba1a1f6c36f7f Nmap-Parser-1.16.tar.gz +79e50c9e325b1920545eb4a07e2f5b10 Nmap-Parser-1.19.tar.gz From xhorak at fedoraproject.org Tue Mar 3 16:13:01 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Tue, 3 Mar 2009 16:13:01 +0000 (UTC) Subject: rpms/thunderbird/devel thunderbird.spec,1.130,1.131 Message-ID: <20090303161301.D4C3E70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/thunderbird/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31741 Modified Files: thunderbird.spec Log Message: Allow only one make thread Index: thunderbird.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- thunderbird.spec 3 Mar 2009 15:39:19 -0000 1.130 +++ thunderbird.spec 3 Mar 2009 16:12:30 -0000 1.131 @@ -115,6 +115,7 @@ export PREFIX='%{_prefix}' export LIBDIR='%{_libdir}' +%define moz_make_flags -j1 #%ifarch ppc ppc64 s390 s390x #%define moz_make_flags -j1 #%else From cebbert at fedoraproject.org Tue Mar 3 16:15:18 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Tue, 3 Mar 2009 16:15:18 +0000 (UTC) Subject: rpms/kernel/F-10 patch-2.6.29-rc6-git7.bz2.sign, NONE, 1.1 .cvsignore, 1.993, 1.994 drm-modesetting-radeon.patch, 1.73, 1.74 kernel.spec, 1.1280, 1.1281 linux-2.6-hotfixes.patch, 1.4, 1.5 sources, 1.954, 1.955 upstream, 1.865, 1.866 patch-2.6.29-rc6-git5.bz2.sign, 1.1, NONE Message-ID: <20090303161518.54C8E70117@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32099 Modified Files: .cvsignore drm-modesetting-radeon.patch kernel.spec linux-2.6-hotfixes.patch sources upstream Added Files: patch-2.6.29-rc6-git7.bz2.sign Removed Files: patch-2.6.29-rc6-git5.bz2.sign Log Message: Linux 2.6.29-rc6-git7 Copy drm-modesetting-radeon from rawhide (it does not apply cleanly.) --- NEW FILE patch-2.6.29-rc6-git7.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBJrRx3yGugalF9Dw4RAqeYAJkBalQDnkma5jKpyTeq2ROB7+NDhwCgghKE rLns6acfEa3gzUO7HIwTTXI= =8rGP -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v retrieving revision 1.993 retrieving revision 1.994 diff -u -r1.993 -r1.994 --- .cvsignore 1 Mar 2009 02:52:35 -0000 1.993 +++ .cvsignore 3 Mar 2009 16:14:45 -0000 1.994 @@ -6,4 +6,4 @@ kernel-2.6.28 linux-2.6.28.tar.bz2 patch-2.6.29-rc6.bz2 -patch-2.6.29-rc6-git5.bz2 +patch-2.6.29-rc6-git7.bz2 drm-modesetting-radeon.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.73 -r 1.74 drm-modesetting-radeon.patch Index: drm-modesetting-radeon.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-modesetting-radeon.patch,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- drm-modesetting-radeon.patch 1 Mar 2009 02:52:36 -0000 1.73 +++ drm-modesetting-radeon.patch 3 Mar 2009 16:14:45 -0000 1.74 @@ -1,3 +1,59 @@ +commit 524351732a7a48d274f5a4e48e004284ba673ebf +Author: Dave Airlie +Date: Tue Mar 3 18:23:22 2009 +1000 + + radeon: port proc debug files to new debugfs interface + +commit 8030b34a3383a6b490c128b7cbafb4e1a201f5d4 +Author: Dave Airlie +Date: Tue Mar 3 15:33:52 2009 +1000 + + radeon: pin framebuffer and cursors dynamically + +commit a00b8f579d6fafc16149902445697255062b45b1 +Author: Alex Deucher +Date: Fri Feb 27 20:25:36 2009 -0500 + + radeon: fix MC setup on systems with more than 512 MB of VRAM + + Signed-off-by: Alex Deucher + +commit 5ad681c0f59c99dee86781a049fc41c66ff7d3b8 +Author: Alex Deucher +Date: Fri Feb 27 20:18:20 2009 -0500 + + radeon: leave the MC_FB_LOCATION alone on RS780 + + Signed-off-by: Alex Deucher + +commit 7400fdab0318a2b04d06b2cb6466e9c585d23115 +Author: Alex Deucher +Date: Fri Feb 27 20:15:04 2009 -0500 + + radeon: wait for MC idle on r6xx/r7xx chips + + Signed-off-by: Alex Deucher + +commit b95e633f684312ccc260112ee6a58875f2d1e143 +Author: Alex Deucher +Date: Fri Feb 27 20:07:13 2009 -0500 + + radeon: fix up RS600 mc setup and unify mc reg access + + Signed-off-by: Alex Deucher + +commit 0b64b9965802b5455e9ea6a69eca2f6171235559 +Author: Dave Airlie +Date: Mon Mar 2 23:51:30 2009 +1100 + + radeon: fixup suspend/resume hooks + +commit af74fbead4da9cfd979e4092c7e1ffe912c978c7 +Author: Dave Airlie +Date: Sun Mar 1 18:25:07 2009 +1100 + + radeon: fix rs480 gart size + commit 1f756299d935d5a0a4beb82ddeaf0e4b2935861a Author: Dave Airlie Date: Fri Feb 27 15:37:14 2009 +1000 @@ -6764,7 +6820,7 @@ default: DRM_ERROR("Can't update pipe %d in SAREA\n", pipe); diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile -index 52ce439..3abfd0d 100644 +index 52ce439..0eea827 100644 --- a/drivers/gpu/drm/radeon/Makefile +++ b/drivers/gpu/drm/radeon/Makefile @@ -3,7 +3,11 @@ @@ -6776,7 +6832,7 @@ + radeon_gem.o radeon_buffer.o radeon_fence.o radeon_cs.o \ + radeon_i2c.o radeon_fb.o radeon_encoders.o radeon_connectors.o radeon_display.o \ + atombios_crtc.o atom.o radeon_atombios.o radeon_combios.o radeon_legacy_crtc.o \ -+ radeon_legacy_encoders.o radeon_cursor.o radeon_pm.o radeon_gem_proc.o ++ radeon_legacy_encoders.o radeon_cursor.o radeon_pm.o radeon_gem_debugfs.o radeon-$(CONFIG_COMPAT) += radeon_ioc32.o @@ -13848,10 +13904,10 @@ +#endif /* _ATOMBIOS_H */ diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c new file mode 100644 -index 0000000..b9f3257 +index 0000000..64d2e09 --- /dev/null +++ b/drivers/gpu/drm/radeon/atombios_crtc.c -@@ -0,0 +1,463 @@ +@@ -0,0 +1,469 @@ +/* + * Copyright 2007-8 Advanced Micro Devices, Inc. + * Copyright 2008 Red Hat Inc. @@ -13951,7 +14007,6 @@ + +void atombios_crtc_dpms(struct drm_crtc *crtc, int mode) +{ -+ struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); + struct drm_device *dev = crtc->dev; + struct drm_radeon_private *dev_priv = dev->dev_private; + @@ -13978,7 +14033,6 @@ +static void +atombios_set_crtc_dtd_timing(struct drm_crtc *crtc, SET_CRTC_USING_DTD_TIMING_PARAMETERS *crtc_param) +{ -+ struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); + struct drm_device *dev = crtc->dev; + struct drm_radeon_private *dev_priv = dev->dev_private; + SET_CRTC_USING_DTD_TIMING_PARAMETERS conv_param; @@ -14001,7 +14055,6 @@ + +void atombios_crtc_set_timing(struct drm_crtc *crtc, SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION *crtc_param) +{ -+ struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); + struct drm_device *dev = crtc->dev; + struct drm_radeon_private *dev_priv = dev->dev_private; + SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION conv_param; @@ -14133,6 +14186,9 @@ + obj = radeon_fb->obj; + obj_priv = obj->driver_private; + ++ if (radeon_gem_object_pin(obj, 0, RADEON_GEM_DOMAIN_VRAM)) ++ return -EINVAL; ++ + fb_location = obj_priv->bo->offset + dev_priv->fb_location; + + switch(crtc->fb->bits_per_pixel) { @@ -14148,7 +14204,7 @@ + break; + default: + DRM_ERROR("Unsupported screen depth %d\n", crtc->fb->bits_per_pixel); -+ return; ++ return -EINVAL; + } + + /* TODO tiling */ @@ -14184,6 +14240,12 @@ + else + RADEON_WRITE(AVIVO_D1MODE_DATA_FORMAT + radeon_crtc->crtc_offset, + 0); ++ ++ if (old_fb) { ++ radeon_fb = to_radeon_framebuffer(old_fb); ++ radeon_gem_object_unpin(radeon_fb->obj); ++ } ++ return 0; +} + +int atombios_crtc_mode_set(struct drm_crtc *crtc, @@ -17854,7 +17916,7 @@ + return NULL; +} diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c -index 15cfe56..cead67d 100644 +index 15cfe56..a5b1078 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c @@ -46,8 +46,12 @@ static void radeon_do_cp_start(drm_radeon_private_t * dev_priv); @@ -17918,40 +17980,40 @@ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600) return radeon_read_ring_rptr(dev_priv, R600_SCRATCHOFF(index)); -@@ -159,7 +175,24 @@ static u32 IGP_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) +@@ -151,15 +167,18 @@ static u32 RS600_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) + return ret; + } + +-static u32 IGP_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) ++u32 RADEON_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) + { + if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) || + ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS740)) + return RS690_READ_MCIND(dev_priv, addr); else if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS600) return RS600_READ_MCIND(dev_priv, addr); - else -- return RS480_READ_MCIND(dev_priv, addr); -+ return RS480_READ_MCIND(dev_priv, addr); -+} -+ -+u32 radeon_read_mc_reg(drm_radeon_private_t *dev_priv, int addr) -+{ -+ if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) -+ return IGP_READ_MCIND(dev_priv, addr); -+ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) +- else ++ else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS400) || ++ ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS480)) + return RS480_READ_MCIND(dev_priv, addr); ++ else + return R500_READ_MCIND(dev_priv, addr); -+ return 0; -+} -+ [...1631 lines suppressed...] new file mode 100644 -index 0000000..18e4082 +index 0000000..cfe9682 --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c -@@ -0,0 +1,1078 @@ +@@ -0,0 +1,1097 @@ +/* + * Copyright 2007-8 Advanced Micro Devices, Inc. + * Copyright 2008 Red Hat Inc. @@ -26656,7 +26878,8 @@ + } +} + -+static bool radeon_set_crtc1_base(struct drm_crtc *crtc, int x, int y) ++static bool radeon_set_crtc1_base(struct drm_crtc *crtc, int x, int y, ++ struct drm_framebuffer *old_fb) +{ + struct drm_device *dev = crtc->dev; + struct drm_radeon_private *dev_priv = dev->dev_private; @@ -26675,6 +26898,9 @@ + obj = radeon_fb->obj; + obj_priv = obj->driver_private; + ++ if (radeon_gem_object_pin(obj, 0, RADEON_GEM_DOMAIN_VRAM)) ++ return -EINVAL; ++ + crtc_offset = obj_priv->bo->offset; + + crtc_offset_cntl = 0; @@ -26753,6 +26979,11 @@ + disp_merge_cntl &= ~RADEON_DISP_RGB_OFFSET_EN; + RADEON_WRITE(RADEON_DISP_MERGE_CNTL, disp_merge_cntl); + ++ if (old_fb) { ++ radeon_fb = to_radeon_framebuffer(old_fb); ++ radeon_gem_object_unpin(radeon_fb->obj); ++ } ++ + return true; +} + @@ -27079,7 +27310,8 @@ + +} + -+static bool radeon_set_crtc2_base(struct drm_crtc *crtc, int x, int y) ++static bool radeon_set_crtc2_base(struct drm_crtc *crtc, int x, int y, ++ struct drm_framebuffer *old_fb) +{ + struct drm_device *dev = crtc->dev; + struct drm_radeon_private *dev_priv = dev->dev_private; @@ -27098,6 +27330,9 @@ + obj = radeon_fb->obj; + obj_priv = obj->driver_private; + ++ if (radeon_gem_object_pin(obj, 0, RADEON_GEM_DOMAIN_VRAM)) ++ return -EINVAL; ++ + crtc2_offset = obj_priv->bo->offset; + + crtc2_offset_cntl = 0; @@ -27146,7 +27381,7 @@ + offset *= 4; + break; + default: -+ return false; ++ goto out; + } + base += offset; + } @@ -27174,6 +27409,12 @@ + disp2_merge_cntl &= ~RADEON_DISP2_RGB_OFFSET_EN; + RADEON_WRITE(RADEON_DISP2_MERGE_CNTL, disp2_merge_cntl); + ++ out: ++ if (old_fb) { ++ radeon_fb = to_radeon_framebuffer(old_fb); ++ radeon_gem_object_unpin(radeon_fb->obj); ++ } ++ + return true; +} + @@ -27455,10 +27696,10 @@ + + switch(radeon_crtc->crtc_id) { + case 0: -+ radeon_set_crtc1_base(crtc, x, y); ++ radeon_set_crtc1_base(crtc, x, y, old_fb); + break; + case 1: -+ radeon_set_crtc2_base(crtc, x, y); ++ radeon_set_crtc2_base(crtc, x, y, old_fb); + break; + + } @@ -28909,10 +29150,10 @@ diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h new file mode 100644 -index 0000000..e80903f +index 0000000..43668b7 --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_mode.h -@@ -0,0 +1,354 @@ +@@ -0,0 +1,356 @@ +/* + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and + * VA Linux Systems Inc., Fremont, California. @@ -29108,6 +29349,8 @@ + uint32_t crtc_offset; + struct radeon_framebuffer *fbdev_fb; + struct drm_mode_set mode_set; ++ struct drm_gem_object *cursor_bo; ++ uint64_t cursor_addr; +}; + +#define RADEON_USE_RMX 1 @@ -29269,10 +29512,10 @@ +#endif diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c new file mode 100644 -index 0000000..af348ae +index 0000000..ac7bc0a --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_pm.c -@@ -0,0 +1,248 @@ +@@ -0,0 +1,257 @@ +/* + * Copyright 2007-8 Advanced Micro Devices, Inc. + * Copyright 2008 Red Hat Inc. @@ -29319,8 +29562,13 @@ + if (state.event == PM_EVENT_PRETHAW) + return 0; + -+ if (!drm_core_check_feature(dev, DRIVER_MODESET)) ++ if (!drm_core_check_feature(dev, DRIVER_MODESET)) { ++ /* Disable *all* interrupts */ ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) ++ RADEON_WRITE(R500_DxMODE_INT_MASK, 0); ++ RADEON_WRITE(RADEON_GEN_INT_CNTL, 0); + return 0; ++ } + + /* unpin the front buffers */ + list_for_each_entry(fb, &dev->mode_config.fb_kernel_list, filp_head) { @@ -29369,8 +29617,12 @@ + struct drm_framebuffer *fb; + int i; + -+ if (!drm_core_check_feature(dev, DRIVER_MODESET)) ++ if (!drm_core_check_feature(dev, DRIVER_MODESET)) { ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) ++ RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg); ++ RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg); + return 0; ++ } + + pci_set_power_state(dev->pdev, PCI_D0); + pci_restore_state(dev->pdev); @@ -29523,10 +29775,10 @@ + diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h new file mode 100644 -index 0000000..3341d38 +index 0000000..bb9ad4a --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_reg.h -@@ -0,0 +1,5343 @@ +@@ -0,0 +1,5335 @@ +/* + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and + * VA Linux Systems Inc., Fremont, California. @@ -33016,16 +33268,6 @@ +#define RS690_MC_STATUS 0x90 +#define RS690_MC_STATUS_IDLE (1 << 0) + -+#define RS600_MC_INDEX 0x78 -+# define RS600_MC_INDEX_MASK 0xff -+# define RS600_MC_INDEX_WR_EN (1 << 8) -+# define RS600_MC_INDEX_WR_ACK 0xff -+#define RS600_MC_DATA 0x7c -+ -+#define RS600_MC_FB_LOCATION 0xA -+#define RS600_MC_STATUS 0x0 -+#define RS600_MC_STATUS_IDLE (1 << 0) -+ +#define AVIVO_MC_INDEX 0x0070 +#define R520_MC_STATUS 0x00 +#define R520_MC_STATUS_IDLE (1<<1) @@ -33052,6 +33294,8 @@ +# define R600_CHANSIZE (1 << 7) +# define R600_CHANSIZE_OVERRIDE (1 << 10) + ++#define R600_SRBM_STATUS 0x0e50 ++ +#define AVIVO_HDP_FB_LOCATION 0x134 + +#define AVIVO_VGA_RENDER_CONTROL 0x0300 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v retrieving revision 1.1280 retrieving revision 1.1281 diff -u -r1.1280 -r1.1281 --- kernel.spec 1 Mar 2009 02:52:38 -0000 1.1280 +++ kernel.spec 3 Mar 2009 16:14:46 -0000 1.1281 @@ -57,7 +57,7 @@ # The rc snapshot level %define rcrev 6 # The git snapshot level -%define gitrev 5 +%define gitrev 7 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1767,6 +1767,10 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Tue Mar 03 2009 Chuck Ebbert 2.6.29-0.51.rc6.git7 +- Linux 2.6.29-rc6-git7 +- Copy drm-modesetting-radeon from rawhide (it does not apply cleanly.) + * Sat Feb 28 2009 Chuck Ebbert 2.6.29-0.50.rc6.git5 - Linux 2.6.29-rc6-git5 - Disable CONFIG_NET_NS because of bug #486889 in rawhide. linux-2.6-hotfixes.patch: Index: linux-2.6-hotfixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-hotfixes.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-hotfixes.patch 1 Mar 2009 04:28:55 -0000 1.4 +++ linux-2.6-hotfixes.patch 3 Mar 2009 16:14:46 -0000 1.5 @@ -1,60 +0,0 @@ -Ingo Molnar (1): - x86: i915 needs pgprot_writecombine() and is_io_mapping_possible() - - - arch/x86/mm/iomap_32.c | 15 ++++----------- - arch/x86/mm/pat.c | 2 ++ - 2 files changed, 6 insertions(+), 11 deletions(-) - -diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c -index 6c2b1af..04102d4 100644 ---- a/arch/x86/mm/iomap_32.c -+++ b/arch/x86/mm/iomap_32.c -@@ -20,23 +20,16 @@ - #include - #include - --#ifdef CONFIG_X86_PAE --int --is_io_mapping_possible(resource_size_t base, unsigned long size) --{ -- return 1; --} --#else --int --is_io_mapping_possible(resource_size_t base, unsigned long size) -+int is_io_mapping_possible(resource_size_t base, unsigned long size) - { -+#ifndef CONFIG_X86_PAE - /* There is no way to map greater than 1 << 32 address without PAE */ - if (base + size > 0x100000000ULL) - return 0; -- -+#endif - return 1; - } --#endif -+EXPORT_SYMBOL_GPL(is_io_mapping_possible); - - /* Map 'pfn' using fixed map 'type' and protections 'prot' - */ -diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c -index aebbf67..e0ab173 100644 ---- a/arch/x86/mm/pat.c -+++ b/arch/x86/mm/pat.c -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -868,6 +869,7 @@ pgprot_t pgprot_writecombine(pgprot_t prot) - else - return pgprot_noncached(prot); - } -+EXPORT_SYMBOL_GPL(pgprot_writecombine); - - #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_X86_PAT) - Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v retrieving revision 1.954 retrieving revision 1.955 diff -u -r1.954 -r1.955 --- sources 1 Mar 2009 02:52:38 -0000 1.954 +++ sources 3 Mar 2009 16:14:47 -0000 1.955 @@ -1,3 +1,3 @@ d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2 26f67d99666834cc579094619821d3c8 patch-2.6.29-rc6.bz2 -c9924c779a427f2b57cd201fbef62cee patch-2.6.29-rc6-git5.bz2 +46b64d52e8f2f1e5b55784beb939ee2e patch-2.6.29-rc6-git7.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v retrieving revision 1.865 retrieving revision 1.866 diff -u -r1.865 -r1.866 --- upstream 1 Mar 2009 02:52:38 -0000 1.865 +++ upstream 3 Mar 2009 16:14:47 -0000 1.866 @@ -1,3 +1,3 @@ linux-2.6.28.tar.bz2 patch-2.6.29-rc6.bz2 -patch-2.6.29-rc6-git5.bz2 +patch-2.6.29-rc6-git7.bz2 --- patch-2.6.29-rc6-git5.bz2.sign DELETED --- From cebbert at fedoraproject.org Tue Mar 3 16:19:23 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Tue, 3 Mar 2009 16:19:23 +0000 (UTC) Subject: rpms/kernel/F-10 drm-modesetting-radeon.patch, 1.74, 1.75 kernel.spec, 1.1281, 1.1282 Message-ID: <20090303161924.013B770116@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1009 Modified Files: drm-modesetting-radeon.patch kernel.spec Log Message: Fix up drm-modesetting-radeon so it applies. drm-modesetting-radeon.patch: Index: drm-modesetting-radeon.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-modesetting-radeon.patch,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- drm-modesetting-radeon.patch 3 Mar 2009 16:14:45 -0000 1.74 +++ drm-modesetting-radeon.patch 3 Mar 2009 16:19:23 -0000 1.75 @@ -4965,7 +4965,7 @@ + dev->sigdata.lock = &dev->default_lock; + master->lock.hw_lock = &dev->default_lock; master->lock.file_priv = NULL; - wake_up_interruptible(&master->lock.lock_queue); + wake_up_interruptible_all(&master->lock.lock_queue); } @@ -481,6 +481,9 @@ int drm_rmmap_locked(struct drm_device *dev, struct drm_local_map *map) case _DRM_GEM: @@ -5691,7 +5691,16 @@ mutex_lock(&dev->struct_mutex); if (file_priv->is_master) { -@@ -500,6 +504,7 @@ int drm_release(struct inode *inode, struct file *filp) +@@ -501,7 +501,7 @@ int drm_release(struct inode *inode, str + * possibility to lock. + */ + +- if (master->lock.hw_lock) { ++ if (master->lock.hw_lock != &dev->default_lock) { + if (dev->sigdata.lock == master->lock.hw_lock) + dev->sigdata.lock = NULL; + master->lock.hw_lock = NULL; +@@ -510,6 +514,7 @@ int drm_release(struct inode *inode, struct file *filp) /* drop the reference held my the file priv */ drm_master_put(&file_priv->master); file_priv->is_master = 0; @@ -5836,15 +5845,6 @@ list_add_tail(&master->head, &minor->master_list); -@@ -147,7 +148,7 @@ static void drm_master_destroy(struct kref *kref) - - drm_ht_remove(&master->magiclist); - -- if (master->lock.hw_lock) { -+ if (master->lock.hw_lock != &dev->default_lock) { - if (dev->sigdata.lock == master->lock.hw_lock) - dev->sigdata.lock = NULL; - master->lock.hw_lock = NULL; @@ -210,6 +211,7 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, init_timer(&dev->timer); mutex_init(&dev->struct_mutex); Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v retrieving revision 1.1281 retrieving revision 1.1282 diff -u -r1.1281 -r1.1282 --- kernel.spec 3 Mar 2009 16:14:46 -0000 1.1281 +++ kernel.spec 3 Mar 2009 16:19:23 -0000 1.1282 @@ -1767,6 +1767,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Tue Mar 03 2009 Chuck Ebbert 2.6.29-0.52.rc6.git7 +- Fix up drm-modesetting-radeon so it applies. + * Tue Mar 03 2009 Chuck Ebbert 2.6.29-0.51.rc6.git7 - Linux 2.6.29-rc6-git7 - Copy drm-modesetting-radeon from rawhide (it does not apply cleanly.) From pjones at fedoraproject.org Tue Mar 3 16:25:57 2009 From: pjones at fedoraproject.org (Peter Jones) Date: Tue, 3 Mar 2009 16:25:57 +0000 (UTC) Subject: rpms/anaconda/devel .cvsignore,1.613,1.614 Message-ID: <20090303162557.6BE1670116@cvs1.fedora.phx.redhat.com> Author: pjones Update of /cvs/extras/rpms/anaconda/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2100 Modified Files: .cvsignore Log Message: Add clog to cvsignore. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.613 retrieving revision 1.614 diff -u -r1.613 -r1.614 --- .cvsignore 20 Feb 2009 23:14:06 -0000 1.613 +++ .cvsignore 3 Mar 2009 16:25:26 -0000 1.614 @@ -1 +1,2 @@ anaconda-11.5.0.23.tar.bz2 +clog From mathstuf at fedoraproject.org Tue Mar 3 16:35:40 2009 From: mathstuf at fedoraproject.org (Ben Boeckel) Date: Tue, 3 Mar 2009 16:35:40 +0000 (UTC) Subject: rpms/kde-plasma-networkmanagement/devel kde-plasma-networkmanagement.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090303163540.DF4B470116@cvs1.fedora.phx.redhat.com> Author: mathstuf Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3733 Modified Files: kde-plasma-networkmanagement.spec sources Log Message: Respin tarball with new snapshot Index: kde-plasma-networkmanagement.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kde-plasma-networkmanagement.spec 3 Mar 2009 13:04:39 -0000 1.2 +++ kde-plasma-networkmanagement.spec 3 Mar 2009 16:35:10 -0000 1.3 @@ -1,6 +1,6 @@ Name: kde-plasma-networkmanagement Version: 0.1 -Release: 0.7.20090217svn%{?dist} +Release: 0.8.20090302svn%{?dist} Summary: NetworkManager KDE 4 integration Group: User Interface/Desktops @@ -8,7 +8,7 @@ URL: http://websvn.kde.org/trunk/playground/base/plasma/applets/networkmanager/ # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# svn export -r 929313 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1 +# svn export -r 934706 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1 # tar -c kde-plasma-networkmanagement-0.1 | bzip2 --best -c > kde-plasma-networkmanagement-0.1.tar.bz2 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -150,6 +150,9 @@ %changelog +* Tue Mar 3 2009 Ben Boeckel 0.1-0.8.20090302svn +- Respin snapshot + * Tue Mar 3 2009 Kevin Kofler 0.1-0.7.20090217svn - Obsoletes/Provides knetworkmanager on F11+ for upgrade paths Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Mar 2009 03:21:11 -0000 1.2 +++ sources 3 Mar 2009 16:35:10 -0000 1.3 @@ -1 +1 @@ -13c29035a9584ada3dac8c4692f8d2ec kde-plasma-networkmanagement-0.1.tar.bz2 +d4c2dd492777239c45bb42026f0fa48e kde-plasma-networkmanagement-0.1.tar.bz2 From vcrhonek at fedoraproject.org Tue Mar 3 16:38:12 2009 From: vcrhonek at fedoraproject.org (Vitezslav Crhonek) Date: Tue, 3 Mar 2009 16:38:12 +0000 (UTC) Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.68,1.69 Message-ID: <20090303163812.DA81370116@cvs1.fedora.phx.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/tog-pegasus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4294 Modified Files: tog-pegasus.spec Log Message: Add noreplace to config files Index: tog-pegasus.spec =================================================================== RCS file: /cvs/extras/rpms/tog-pegasus/devel/tog-pegasus.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- tog-pegasus.spec 28 Feb 2009 14:06:17 -0000 1.68 +++ tog-pegasus.spec 3 Mar 2009 16:37:42 -0000 1.69 @@ -43,7 +43,7 @@ %define _default_patch_fuzz 2 Version: 2.7.2 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 2 # Summary: OpenPegasus WBEM Services for Linux @@ -318,7 +318,7 @@ %attr(0755, root, pegasus) /usr/bin/cimprovider %attr(0755, root, pegasus) /usr/bin/osinfo %attr(0755, root, pegasus) /usr/bin/wbemexec -%config /etc/rc.d/init.d/tog-pegasus +%config(noreplace) /etc/rc.d/init.d/tog-pegasus %defattr(0640, root, pegasus, 0750) %dir /etc/Pegasus %ghost %config(noreplace) /etc/Pegasus/cimserver_current.conf @@ -462,6 +462,9 @@ %changelog +* Tue Mar 3 2009 Vitezslav Crhonek - 2:2.7.2-7 +- Add noreplace to config files + * Sat Feb 28 2009 Caol??n McNamara - 2:2.7.2-6 - fix elif From giallu at fedoraproject.org Tue Mar 3 16:40:34 2009 From: giallu at fedoraproject.org (Gianluca Sforna) Date: Tue, 3 Mar 2009 16:40:34 +0000 (UTC) Subject: rpms/buildbot/devel buildbot.spec,1.12,1.13 Message-ID: <20090303164034.C425070116@cvs1.fedora.phx.redhat.com> Author: giallu Update of /cvs/extras/rpms/buildbot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4662 Modified Files: buildbot.spec Log Message: Darcs not available outside ix86 Index: buildbot.spec =================================================================== RCS file: /cvs/extras/rpms/buildbot/devel/buildbot.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- buildbot.spec 3 Mar 2009 10:19:31 -0000 1.12 +++ buildbot.spec 3 Mar 2009 16:40:04 -0000 1.13 @@ -2,7 +2,7 @@ Name: buildbot Version: 0.7.10p1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Build/test automation system Group: Development/Tools @@ -23,7 +23,10 @@ # BuildRequires: bazaar BuildRequires: bzr BuildRequires: cvs +%ifarch {ix86} +# looks like darcs is not available outside ix86 BuildRequires: darcs +%endif BuildRequires: git BuildRequires: mercurial BuildRequires: subversion @@ -81,8 +84,9 @@ %changelog -* Tue Mar 3 2009 Gianluca Sforna - 0.7.10p1-1 +* Tue Mar 3 2009 Gianluca Sforna - 0.7.10p1-2 - New upstream release +- darcs only avaliable on ix86 platforms * Thu Feb 26 2009 Gianluca Sforna - 0.7.10-1 - New upstream release From ltinkl at fedoraproject.org Tue Mar 3 16:42:03 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Tue, 3 Mar 2009 16:42:03 +0000 (UTC) Subject: rpms/phonon/devel phonon-4.3.2-gstreamer-utf8-url.patch, NONE, 1.1 phonon-4.3.2-gstreamer-volumefader.patch, NONE, 1.1 phonon.spec, 1.29, 1.30 Message-ID: <20090303164203.CBCF670116@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/phonon/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5130 Modified Files: phonon.spec Added Files: phonon-4.3.2-gstreamer-utf8-url.patch phonon-4.3.2-gstreamer-volumefader.patch Log Message: backport some GStreamer fixes phonon-4.3.2-gstreamer-utf8-url.patch: --- NEW FILE phonon-4.3.2-gstreamer-utf8-url.patch --- Index: gstreamer/mediaobject.h =================================================================== --- gstreamer/mediaobject.h (revision 932755) +++ gstreamer/mediaobject.h (revision 932756) @@ -185,7 +185,7 @@ /* * @param encodedUrl percent-encoded QString for source compat reasons. Should change to QUrl */ - bool createPipefromURL(const QString &encodedUrl); + bool createPipefromURL(const QUrl &url); bool createPipefromStream(const MediaSource &); private Q_SLOTS: Index: gstreamer/mediaobject.cpp =================================================================== --- gstreamer/mediaobject.cpp (revision 932755) +++ gstreamer/mediaobject.cpp (revision 932756) @@ -347,11 +347,8 @@ * * returns true if successful */ -bool MediaObject::createPipefromURL(const QString &encodedUrl) +bool MediaObject::createPipefromURL(const QUrl &url) { - // Convert back to URL - QUrl url(encodedUrl, QUrl::StrictMode); - // Remove any existing data source if (m_datasource) { gst_bin_remove(GST_BIN(m_pipeline), m_datasource); @@ -361,7 +358,7 @@ // Verify that the uri can be parsed if (!url.isValid()) { - m_backend->logMessage(QString("%1 is not a valid URI").arg(encodedUrl)); + m_backend->logMessage(QString("%1 is not a valid URI").arg(url.toString())); return false; } @@ -875,8 +872,7 @@ switch (source.type()) { case MediaSource::Url: { - QString urlString = source.url().toEncoded(); - if (createPipefromURL(urlString)) + if (createPipefromURL(source.url())) m_loading = true; else setError(tr("Could not open media source.")); @@ -884,8 +880,7 @@ break; case MediaSource::LocalFile: { - QString urlString = QUrl::fromLocalFile(source.fileName()).toString(); - if (createPipefromURL(urlString)) + if (createPipefromURL(QUrl::fromLocalFile(source.fileName()))) m_loading = true; else setError(tr("Could not open media source.")); phonon-4.3.2-gstreamer-volumefader.patch: --- NEW FILE phonon-4.3.2-gstreamer-volumefader.patch --- Index: gstreamer/mediaobject.cpp =================================================================== --- gstreamer/mediaobject.cpp (revision 932979) +++ gstreamer/mediaobject.cpp (revision 932980) @@ -141,9 +141,9 @@ if (m_resumeState) return; - if (m_state == Phonon::PlayingState || m_state == Phonon::PausedState) { + if (m_pendingState == Phonon::PlayingState || m_pendingState == Phonon::PausedState) { m_resumeState = true; - m_oldState = m_state; + m_oldState = m_pendingState; m_oldPos = getPipelinePos(); } } Index: phonon.spec =================================================================== RCS file: /cvs/extras/rpms/phonon/devel/phonon.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- phonon.spec 27 Feb 2009 11:07:08 -0000 1.29 +++ phonon.spec 3 Mar 2009 16:41:33 -0000 1.30 @@ -1,7 +1,7 @@ Summary: Multimedia framework api Name: phonon Version: 4.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://phonon.kde.org/ @@ -15,6 +15,11 @@ # it as a "sink", and then the device setting is ignored entirely. Patch0: phonon-4.2.96-pulseaudio.patch Patch1: phonon-4.2.96-xine-pulseaudio.patch + +## Upstream patches +Patch100: phonon-4.3.2-gstreamer-utf8-url.patch +Patch101: phonon-4.3.2-gstreamer-volumefader.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automoc4 >= 0.9.86 @@ -73,7 +78,8 @@ %setup -q -n phonon-%{version}%{?alphatag} %patch0 -p1 -b .pulseaudio %patch1 -p1 -b .xine-pulseaudio - +%patch100 -p0 -b .gstreamer-utf8-url +%patch101 -p0 -b .gstreamer-volumefader %build mkdir -p %{_target_platform} @@ -153,6 +159,10 @@ %changelog +* Tue Mar 3 2009 Luk???? Tinkl - 4.3.1-2 +- backport GStreamer backend bugfixes (UTF-8 file handling, volume +fader) + * Fri Feb 27 2009 Than Ngo - 4.3.1-1 - 4.3.1 From rvinyard at fedoraproject.org Tue Mar 3 16:44:14 2009 From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.) Date: Tue, 3 Mar 2009 16:44:14 +0000 (UTC) Subject: rpms/clips/devel DR0873.txt, NONE, 1.1 FunctionContext.zip, NONE, 1.1 objrtmch.c, NONE, 1.1 .cvsignore, 1.4, 1.5 clips.spec, 1.11, 1.12 sources, 1.6, 1.7 xclips.desktop, 1.1, 1.2 Message-ID: <20090303164414.B4DAA70116@cvs1.fedora.phx.redhat.com> Author: rvinyard Update of /cvs/pkgs/rpms/clips/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5775 Modified Files: .cvsignore clips.spec sources xclips.desktop Added Files: DR0873.txt FunctionContext.zip objrtmch.c Log Message: --- NEW FILE DR0873.txt --- CLIPS DISCREPANCY REPORT DR # : 0873 DATE : 06/22/06 STATUS : OPEN REPORTED BY : CLIPS User ORGANIZATION : PHONE # : ADDRESS : CLIPS VERSION : CLIPS 6.24 HOST : All OS : All ******************** PROBLEM DESCRIPTION: ******************** Use of the object-pattern-match-delay function could cause a NULL pointer exception. ***************** COMMAND SEQUENCE: ***************** 1) Load this program: (defclass A (is-a USER) (slot x)) (defclass B (is-a USER) (slot y)) (definstances initialization (ob1 of A (x 1)) (ob2 of B (y 1))) (defrule one (object (is-a A) (x ~0)) (object (is-a B) (y ?val)) (test (> ?val 0)) =>) (defrule trigger => (object-pattern-match-delay (modify-instance [ob1] (x 2)) (make-instance [ob2] of B (y 2)))) 2) Issue a (reset) command followed by a (run) command. *********** RESOLUTION: *********** Modified the QueueObjectMatchAction function in objrtmch.c so that instance retract actions always occur before instance assert and modify actions. This prevents the pattern matching process from attempting the evaluation of a join expression that accesses the slots of a retracted instance. ******* STATUS: ******* FIXED BY : Gary Riley DATE : 06/22/06 IMPLEMENTED BY : Gary Riley IN VERSION : 6.25 DATE : DOCUMENTED BY : DATE : TESTED BY : DATE : APPROVED BY : DATE : --- NEW FILE FunctionContext.zip --- PK `????]???????A??g?x?t?x??CJN??S??9O? ?ga??G???n/?8???????'?2???????????????3?W??????:??.ys?;?:=???g'???xYjo, ?????t?0z at .?< c?? I?a<$1?????@? ? ?.dY?>?A????T? e??>??~P?%$?????4???pL?D??f?~2?? F?Y?&[1???;???4*\x??u?PIS??????1!?h%/?s?r?????u? T?????'-?????w??r? w?? ??a????P??Y|#V????? ??{????/p?%$??G??^?>?)?~?2F??j?Vu?v5:??N/?z?;????????^?g?|?9?v?>???o?g?????DB{co?X??`M?1g?:s?jimM?IS??^[???,??@k h??C%V?O??4;???g?????3??E??d???^\?????????&?b/m????]???I?\??1$??g ??q?pu?????O??r??k???DFIA??W?6? Y?????C??????????6??f???????&???m?]????? ????:d???b?!?????:??-??T?????:~???C????~?????T????j?????%?#?i?????'??=??B??gWU*Jg??O???$`?k???s???6q?[?4???H???)v*&?`??H0???????"????b[~????o?6I" ;F.?L-??=M3? ?8?M"???(Y??? ???I?:2Ii_$?Q??????cB?o/FL???C?w?;J???*???? ???.N?1i? ?14Kj??~?9 yn?O *?}$|M1J???????S?|s?G ?????O8?L?-?~??#???S?????????|??PN?????3???f???s????oY??49V??5???J???2????N??'?AN?? F??Ni??$w?????%)???U?Y?r_?NU??R?/Y!????'?;r5?Y???5????;H?1?qE??$???K?,??R^]??20M?r ?X???3|??H?G>??m???8*va1??? ?F?#??`?|<F????????a(Dg??xY???t>??#A????L0;j? XI?b????,8?i????????C#Fm?rZ}n? _?jr?tW?????5k?|j N???9w??cI??eu>a???? ??z???1??^O?ld?5??x??h?????L}?+?sf?x6;??C>?h ?CV`????????z?"+??iE F  G?? 2C????#??~?_??n ?R??{??J;M?? ;p?)x??????$?"W??$?e?5?w??f?k???_3?6J#?jm xM`??Xt?o??7R?? ????*? ?xA??)3P??Lv?K????????????+??m??v??}(P???S???????(E????c???$???????)?z?r^(?$%?Q6I?#1???? 3AB?9<???Y??[r????W?????a ????$??f?_???~.?????M??y?? ??^K??" ?`??R ???D{ ?????SYi?9??S????$,?l>6??Q6?L??L? ???j???P?F ? ,?.?R?*??C`?????LS??? "?d?Y?N?c?????`??01 Cm???[?|?/??jiMY???/?XO???X=2??? ????L??N??w?*g????#??????3?(???b????q??DM_ ????????L??Jo1Vy?|????Pk??2f6n,??-U?C?T???B??5?u??1Pq?g |??K?? ?????~??{?oWr-????xx5????(?p?S?c??A|x?FC?'?????\u{?k6 n?QJjn?MQ??H?=Mi?Z?>5???bB?Xl?Fi?E?]J??$Z?Kt??abC`&z??/??????q?:?0xc?em?{??o?47???????&???w?&?IS???v;?H????v4??g?w?~?d`5?&1????)v????E???H:?5?Rl{ m?z??4?????T??jTY#O_(5J??&?y??g?t??D;?G???:Jfo??'??????Tc??x? f??_?]?:!???????Dk?W?^%q?X {?{????q?JA9?30?????]c???I??????? ????nC0?Q?#n????B??j?????rK ??%`A?v `?r??-??flv?????m?W??`X5{??wo4?ZO%??i?Z??*}d-[k?>ny?????????)?Sn"?S:?-BQ???*??(n?9I?l???H5m?#?2??pAG??-%???_??j????Rt6u?$?i??}???? ??{Vh?? m? TA????E/8M?i?.???V?????0????:???????? ??Y??s?l?/????G2?I???I)i?+?\??Aef&Ho6?v???k????Rm?'?.?W??h?6? S??????kY#?q?:l??H??? Ig????nk\?8 a?P?c???o??CP?.R?b?!?ED)?t7K????$5????F?_:??!0????~???{c??Qk????`?]x??9??F8|??????,x??:?>?s??! ?K?'O?]D?R?+k)$???R? >Mu??4????????R?????j%????+h?Tl ????f?6?qy???????TA??hl???G Z?c?v? t????P?????g?e?A??` [? ?>?OyUx???5????G???W??^?K?*p?\??D^?2?M$U?k????V?Cy8= ??`?????`.?RT???z??>???\?s?vt?????OG4???l????!-gx?P]?^?u???S?S?J;????ES?;"????K?TkVi1? b1kZ ?5?f? N?T^?n?da,????????cK_M??k???4?/??? ?2/<0yb????ATug:???dW)7?myi?mY??"&?X?Rz at qb??`?C??_??????pZ??? ew?{?eL???[M;CW?n???6n^?h?g?H?+?? ?(wbl4?????? ???z???|???ML?&U??n???U?P???oL!&+l??W?B?v%1 3G3M(J?:??}????? n??\+x??B?q?X6?FE?S"V.8?????Yt???????it???[????zB6?B?? ?0????X?tY??s?V??6??r? ??tv'9k? Y?t?n?L??y?????E?q_j??C&???~I??U?a???}?{?K?Y?oq*j????"l??%H?I_[%o9??L??!????-?? ?(????3\_????q?A??L2???9?r`4? y??fs????.???????V???Y#*?%?? 0??X8??j?-_|?b%???vU[???????-???? ??????B\??~Z???s????????????g????K[u???V??[:???N)uo?????q????Zb?=V_|?I??AX-? ?~4??K+H?l??/??????c7??2?|?n`[PT???j??)???L??8?J?sFN?????GA ??M?y?$M=L????\N_m*qGr??nk???O?c?H$?,??eU?T????bj??????,?B???6v}Q?????P??a? jC%??z?XBq?? Fq?????n??C;??9}bS???????^`?m?@~_? ?$??o~??u{?xi? ?F3????*zYL???D\m?^qDx?????w??????db??????`t?????T?{??n???v??1??t(??wF?K??{b~?< ??9??F?G????=,?$?b>?:???N???f< ???W???yzx?????0B23?R)?????/'2??\?]???a1u??????W??????+ ??D)??DUx ?o?g??+2g??????????????:??????[ ?8?, (P????!?ZuR?'&-???/???F(?0???Zw??'??? :???n>???????%{bJ ?9??E?'??o?r? ??ML.???? ?4??:?????~?2?????Vdz0H??1=9? )@?$:{?YS??Pv?96?????ou?.i???&?I????(y'."a??u??Ke????mwZ??????~,Mk*?)??8??8???m6Ki)????*??p5?-??+??(?J)? ?????????t?B??kmH????Z?6:?jg?@]\o?G9vd??????"?7?G$*l|?Q ????T?!9?5z?????????}?~?6S?? d;{????#?(E $e[M??????x???????????B/:???LF?y:x?F^t??n1:?2|?x???$???,?#t?I3?d???[>??????K?')?????!t?????/_UN?igx???????b8?B?????drSj4?* 1??]???GY?c?7$??????,Xy! ??'??}Tw>}?y????4?f????l??T??i'???u??>B}????>FY? }?L#/? ???{!L?7?o????^??`???x??FK??9?@|? ??????"??y ?? ? ?-C?s??)1V?p??{/E???Rj ???%py??????Ue?C?mn'?;????t??x??#?????(??Q?^s?/??=?Q??????????e}/O?9? ?#t>?N?????xpu>????????x? ????G???4???&'??% `? $r????w? ??{/]`_1&-???JQ ?i++ : "m?u??D??8??V?F??i V?7???(?/ ~W?&???x???|?#pS5?c0*K B?E????????X??i????-?n?_??@?&E????a?e???z????%?a???c?/Av?????N????=??@4????I?????B????? :?!????K?`??z4??0????w1??gc?N?^????gi?)??|?A?+????g0?????4? ~9?r?T?? /\P?? ?G?7u??Sg?:?QS[?1???@jS?@????\C %3.?8a???J) G]???vK?#i+?: ?kw???=3??hEj???S??X???IO????m??????lf*?,??D??? 5??I ???>??;??]?0ra????+???z?u???$???????|?]@*?/?uhv???[????)Xh?=???(? $T?????!)j4)'?R??????Umoo???T??0?L??n?OI?s?uh /???%?5????@???.?S?g ??#???Yt??qj?????!?K??ms ?%???T????~V?J??YK????K??$o?+??(?N13`???p'????7????_?VD??ax{????J#M????PK ??DUx --- NEW FILE objrtmch.c --- /*******************************************************/ /* "C" Language Integrated Production System */ /* */ /* CLIPS Version 6.25 06/22/06 */ /* */ /* OBJECT PATTERN MATCHER MODULE */ /*******************************************************/ /**************************************************************/ /* Purpose: RETE Network Interface for Objects */ /* */ /* Principal Programmer(s): */ /* Brian L. Donnell */ /* */ /* Contributing Programmer(s): */ /* */ /* Revision History: */ /* 6.23: Correction for FalseSymbol/TrueSymbol. DR0859 */ /* */ /* 6.24: Removed INCREMENTAL_RESET and */ /* LOGICAL_DEPENDENCIES compilation flags. */ /* */ /* Converted INSTANCE_PATTERN_MATCHING to */ /* DEFRULE_CONSTRUCT. */ /* */ /* Renamed BOOLEAN macro type to intBool. */ /* */ /* 6.25: Modified the QueueObjectMatchAction function */ /* so that instance retract actions always occur */ /* before instance assert and modify actions. */ /* This prevents the pattern matching process */ /* from attempting the evaluation of a join */ /* expression that accesses the slots of a */ /* retracted instance. */ /* */ /**************************************************************/ /* ========================================= ***************************************** EXTERNAL DEFINITIONS ========================================= ***************************************** */ #include "setup.h" #if DEFRULE_CONSTRUCT && OBJECT_SYSTEM #include "classfun.h" #include "memalloc.h" #include "drive.h" #include "engine.h" #include "envrnmnt.h" #include "lgcldpnd.h" #include "multifld.h" #if (! RUN_TIME) && (! BLOAD_ONLY) #include "incrrset.h" #endif #include "reteutil.h" #include "ruledlt.h" #include "reorder.h" #include "retract.h" #include "router.h" #include "objrtfnx.h" #define _OBJRTMCH_SOURCE_ #include "objrtmch.h" #include "insmngr.h" /* ========================================= ***************************************** INTERNALLY VISIBLE FUNCTION HEADERS ========================================= ***************************************** */ static void QueueObjectMatchAction(void *,int,INSTANCE_TYPE *,int); static SLOT_BITMAP *QueueModifySlotMap(void *,SLOT_BITMAP *,int); static void ReturnObjectMatchAction(void *,OBJECT_MATCH_ACTION *); static void ProcessObjectMatchQueue(void *); static void MarkObjectPatternNetwork(void *,SLOT_BITMAP *); static intBool CompareSlotBitMaps(SLOT_BITMAP *,SLOT_BITMAP *); static void ObjectPatternMatch(void *,int,OBJECT_PATTERN_NODE *,struct multifieldMarker *); static void ProcessPatternNode(void *,int,OBJECT_PATTERN_NODE *,struct multifieldMarker *); static void CreateObjectAlphaMatch(void *,OBJECT_ALPHA_NODE *); static intBool EvaluateObjectPatternTest(void *,int,struct multifieldMarker *,EXPRESSION *, OBJECT_PATTERN_NODE *); static void ObjectAssertAction(void *,INSTANCE_TYPE *); static void ObjectModifyAction(void *,INSTANCE_TYPE *,SLOT_BITMAP *); static void ObjectRetractAction(void *,INSTANCE_TYPE *,SLOT_BITMAP *); static void ObjectPatternNetErrorMessage(void *,OBJECT_PATTERN_NODE *); static void TraceErrorToObjectPattern(void *,int,OBJECT_PATTERN_NODE *); /* ========================================= ***************************************** EXTERNALLY VISIBLE FUNCTIONS ========================================= ***************************************** */ /*************************************************************************** NAME : ObjectMatchDelay DESCRIPTION : H/L interface for SetDelayObjectPatternMatching INPUTS : None RETURNS : Nothing useful SIDE EFFECTS : DelayObjectPatternMatching set and Rete network updates delayed until pattern-matching is completed NOTES : H/L Syntax: (object-pattern-match-delay *) ***************************************************************************/ globle void ObjectMatchDelay( void *theEnv, DATA_OBJECT *result) { register int ov; ov = SetDelayObjectPatternMatching(theEnv,TRUE); EvaluateExpression(theEnv,GetFirstArgument(),result); if (EvaluationData(theEnv)->EvaluationError) { SetHaltExecution(theEnv,FALSE); SetEvaluationError(theEnv,FALSE); SetDelayObjectPatternMatching(theEnv,ov); SetEvaluationError(theEnv,TRUE); } else SetDelayObjectPatternMatching(theEnv,ov); } /*************************************************** NAME : SetDelayObjectPatternMatching DESCRIPTION : Sets the flag determining if Rete network activity is to be delayed for objects or not INPUTS : The value of the flag RETURNS : The old value of the flag SIDE EFFECTS : DelayObjectPatternMatching set NOTES : When the delay is set to FALSE, all pending Rete network updates are performed ***************************************************/ globle intBool SetDelayObjectPatternMatching( void *theEnv, int value) { intBool oldval; oldval = ObjectReteData(theEnv)->DelayObjectPatternMatching; if (value) ObjectReteData(theEnv)->DelayObjectPatternMatching = TRUE; else { ObjectReteData(theEnv)->DelayObjectPatternMatching = FALSE; ObjectNetworkAction(theEnv,0,NULL,-1); } return(oldval); } /*************************************************** NAME : GetDelayObjectPatternMatching DESCRIPTION : Gets the flag determining if Rete network activity is to be delayed for objects or not INPUTS : None RETURNS : The flag SIDE EFFECTS : None NOTES : None ***************************************************/ globle intBool GetDelayObjectPatternMatching( void *theEnv) { return(ObjectReteData(theEnv)->DelayObjectPatternMatching); } /******************************************************** NAME : ObjectNetworkPointer DESCRIPTION : Returns the first object network pattern node INPUTS : None RETURNS : The top of the object pattern network SIDE EFFECTS : None NOTES : None ********************************************************/ globle OBJECT_PATTERN_NODE *ObjectNetworkPointer( void *theEnv) { return(ObjectReteData(theEnv)->ObjectPatternNetworkPointer); } /******************************************************** NAME : ObjectNetworkTerminalPointer DESCRIPTION : Returns the first terminal pattern node INPUTS : None RETURNS : The last node of a pattern SIDE EFFECTS : None NOTES : None ********************************************************/ globle OBJECT_ALPHA_NODE *ObjectNetworkTerminalPointer( void *theEnv) { return(ObjectReteData(theEnv)->ObjectPatternNetworkTerminalPointer); } /*************************************************** NAME : SetObjectNetworkPointer DESCRIPTION : Sets the object pattern network to the given network INPUTS : Top of the new pattern network RETURNS : Nothing useful SIDE EFFECTS : ObjectPatternNetworkPointer set NOTES : None ***************************************************/ globle void SetObjectNetworkPointer( void *theEnv, OBJECT_PATTERN_NODE *value) { ObjectReteData(theEnv)->ObjectPatternNetworkPointer = value; } /******************************************************* NAME : SetObjectNetworkTerminalPointer DESCRIPTION : Sets the global list of terminal pattern nodes (the ones containing the bitmaps) to the given node INPUTS : The last node of a pattern RETURNS : Nothing useful SIDE EFFECTS : ObjectPatternNetworkTerminalPointer set NOTES : None *******************************************************/ globle void SetObjectNetworkTerminalPointer( void *theEnv, OBJECT_ALPHA_NODE *value) { ObjectReteData(theEnv)->ObjectPatternNetworkTerminalPointer = value; } /************************************************************************ NAME : ObjectNetworkAction DESCRIPTION : Main driver for pattern-matching on objects If the pattern-matching is current delayed or another object is currently being pattern-matched, the requested match action is queued for later processing. Otherwise, the match action is performed and the Rete network is updated. INPUTS : 1) The match action type OBJECT_ASSERT (1) OBJECT_RETRACT (2) OBJECT_MODIFY (3) 2) The instance to be matched (can be NULL if only want pending actions to be performed) 3) The name id of the slot being updated (can be -1) If this argument is -1, it is assumed that any pattern which could match this instance must be checked. Otherwise, only the patterns which explicitly match on the named slot will be checked. RETURNS : Nothing useful SIDE EFFECTS : Action queued or Rete network updated NOTES : None ************************************************************************/ globle void ObjectNetworkAction( void *theEnv, int type, INSTANCE_TYPE *ins, int slotNameID) { SLOT_BITMAP *tmpMap; if (EngineData(theEnv)->JoinOperationInProgress) return; EngineData(theEnv)->JoinOperationInProgress = TRUE; /* ================================================ For purposes of conflict resolution, all objects which have had pattern-matching delayed will have the same relative timestamp, i.e., the inference engine thinks they all just appeared simultaneously When delay is off, however, each object gets the new and current timestamp as expected. ================================================ */ ObjectReteData(theEnv)->UseEntityTimeTag = DefruleData(theEnv)->CurrentEntityTimeTag++; /* ================================================== If pattern-matching is delayed (by use of the set-object-pattern-match-delay function), then the instance should be marked for later processing (when the delay is turned off). ================================================== */ if (ins != NULL) { /* 6.05 Bug Fix */ ins->reteSynchronized = FALSE; if (ObjectReteData(theEnv)->DelayObjectPatternMatching == FALSE) switch (type) { case OBJECT_ASSERT : ObjectAssertAction(theEnv,ins); break; case OBJECT_RETRACT : ObjectRetractAction(theEnv,ins,NULL); break; default : tmpMap = QueueModifySlotMap(theEnv,NULL,slotNameID); ObjectModifyAction(theEnv,ins,tmpMap); rm(theEnv,(void *) tmpMap,SlotBitMapSize(tmpMap)); } else QueueObjectMatchAction(theEnv,type,ins,slotNameID); } /* ======================================== Process all pending actions in the queue All updates will use the same timestamp ======================================== */ ProcessObjectMatchQueue(theEnv); EngineData(theEnv)->JoinOperationInProgress = FALSE; ForceLogicalRetractions(theEnv); /*=========================================*/ /* Free partial matches that were released */ /* by the assertion of the fact. */ /*=========================================*/ if (EngineData(theEnv)->ExecutingRule == NULL) FlushGarbagePartialMatches(theEnv); } /* ========================================= ***************************************** INTERNALLY VISIBLE FUNCTIONS ========================================= ***************************************** */ /*************************************************** NAME : ResetObjectMatchTimeTags DESCRIPTION : If CurrentObjectMatchTimeTag + 1 would cause an overflow, CurrentObjectMatchTimeTag is reset to 0L and all time tags in object pattern nodes are reset. INPUTS : None RETURNS : Nothing useful SIDE EFFECTS : CurrentObjectMatchTimeTag reset to 0, and all match time tags reset These tags are used to recognize valid pattern nodes on a match NOTES : None ***************************************************/ globle void ResetObjectMatchTimeTags( void *theEnv) { OBJECT_ALPHA_NODE *alphaPtr; OBJECT_PATTERN_NODE *lastLevel; /* ============================================ If the current tag incremented by one would not cause an overflow, then we can leave things alone. ============================================ */ if ((ObjectReteData(theEnv)->CurrentObjectMatchTimeTag + 1L) > ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) return; ObjectReteData(theEnv)->CurrentObjectMatchTimeTag = 0L; alphaPtr = ObjectNetworkTerminalPointer(theEnv); while (alphaPtr != NULL) { alphaPtr->matchTimeTag = 0L; lastLevel = alphaPtr->patternNode; while (lastLevel != NULL) { if (lastLevel->matchTimeTag == 0L) break; lastLevel->matchTimeTag = 0L; lastLevel = lastLevel->lastLevel; } alphaPtr = alphaPtr->nxtTerminal; } } /*************************************************** NAME : QueueObjectMatchAction DESCRIPTION : Posts a Rete network match event for later processing INPUTS : 1) The match action type OBJECT_ASSERT (1) OBJECT_RETRACT (2) OBJECT_MODIFY (3) 2) The instance to be matched 3) The name id of the slot being updated (can be -1) RETURNS : Nothing useful SIDE EFFECTS : Queue updated NOTES : None ***************************************************/ static void QueueObjectMatchAction( void *theEnv, int type, INSTANCE_TYPE *ins, int slotNameID) { OBJECT_MATCH_ACTION *prv,*cur,*newMatch; OBJECT_MATCH_ACTION *prvRetract = NULL; /* DR0873 */ prv = NULL; cur = ObjectReteData(theEnv)->ObjectMatchActionQueue; while (cur != NULL) { /* =========================================================== Here are the possibilities for the first Rete event already on the queue as compared with the new event for an object: Assert/Retract --> Delete assert event Ignore retract event Assert/Modify --> Ignore modify event Modify/Modify --> Merge new modify event Modify/Retract --> Delete modify event Queue the retract event =========================================================== */ if (cur->ins == ins) { /* =================================================== An action for initially asserting the newly created object to all applicable patterns =================================================== */ if (cur->type == OBJECT_ASSERT) { if (type == OBJECT_RETRACT) { /* =================================================== If we are retracting the entire object, then we can remove the assert action (and all modifies as well) and ignore the retract action (basically the object came and went before the Rete network had a chance to see it) =================================================== */ if (prv == NULL) ObjectReteData(theEnv)->ObjectMatchActionQueue = cur->nxt; else prv->nxt = cur->nxt; cur->ins->busy--; ReturnObjectMatchAction(theEnv,cur); } /* ================================================= If this is a modify action, then we can ignore it since the assert action will encompass it ================================================= */ } /* =================================================== If the object is being deleted after a slot modify, drop the modify event and replace with the retract =================================================== */ else if (type == OBJECT_RETRACT) { cur->type = OBJECT_RETRACT; if (cur->slotNameIDs != NULL) { rm(theEnv,(void *) cur->slotNameIDs,SlotBitMapSize(cur->slotNameIDs)); cur->slotNameIDs = NULL; } } /* ==================================================== If a modify event for this slot is already on the queue, ignore this one. Otherwise, merge the slot id ==================================================== */ else cur->slotNameIDs = QueueModifySlotMap(theEnv,cur->slotNameIDs,slotNameID); return; } if (cur->type == OBJECT_RETRACT) /* DR0873 */ { prvRetract = cur; } /* DR0873 */ prv = cur; cur = cur->nxt; } /* ================================================ If there are no actions for the instance already on the queue, the new action is simply appended. ================================================ */ newMatch = get_struct(theEnv,objectMatchAction); newMatch->type = type; newMatch->nxt = NULL; /* If we get here, cur should be NULL */ newMatch->slotNameIDs = (type != OBJECT_MODIFY) ? NULL : QueueModifySlotMap(theEnv,NULL,slotNameID); newMatch->ins = ins; newMatch->ins->busy++; /* DR0873 Begin */ /* Retract operations must be processed before assert and */ /* modify actions, otherwise the pattern matching process */ /* might attempt to access the slots of a retract instance. */ if (type == OBJECT_RETRACT) { if (prvRetract == NULL) { newMatch->nxt = ObjectReteData(theEnv)->ObjectMatchActionQueue; ObjectReteData(theEnv)->ObjectMatchActionQueue = newMatch; } else { newMatch->nxt = prvRetract->nxt; prvRetract->nxt = newMatch; } } else /* DR0873 End */ if (prv == NULL) ObjectReteData(theEnv)->ObjectMatchActionQueue = newMatch; else prv->nxt = newMatch; } /**************************************************** NAME : QueueModifySlotMap DESCRIPTION : Sets the bitmap for a queued object modify Rete network action INPUTS : 1) The old bitmap (can be NULL) 2) The canonical slot id to set RETURNS : The (new) bitmap SIDE EFFECTS : Bitmap allocated/reallocated if necessary, and slot id bit set NOTES : If the bitmap must be (re)allocated, this routine allocates twice the room necessary for the current id to allow for growth. ****************************************************/ static SLOT_BITMAP *QueueModifySlotMap( void *theEnv, SLOT_BITMAP *oldMap, int slotNameID) { SLOT_BITMAP *newMap; unsigned short newmaxid; unsigned oldsz,newsz; if ((oldMap == NULL) ? TRUE : (slotNameID > oldMap->maxid)) { newmaxid = (unsigned short) (slotNameID * 2); newsz = sizeof(SLOT_BITMAP) + (sizeof(char) * (newmaxid / BITS_PER_BYTE)); newMap = (SLOT_BITMAP *) gm2(theEnv,newsz); ClearBitString((void *) newMap,newsz); if (oldMap != NULL) { oldsz = SlotBitMapSize(oldMap); GenCopyMemory(char,oldsz,newMap,oldMap); rm(theEnv,(void *) oldMap,oldsz); } newMap->maxid = newmaxid; } else newMap = oldMap; SetBitMap(newMap->map,slotNameID); return(newMap); } /*************************************************** NAME : ReturnObjectMatchAction DESCRIPTION : Deallocates and object match action structure and associated slot bitmap (if any) INPUTS : The queued match action item RETURNS : Nothing useful SIDE EFFECTS : Object match action item deleted NOTES : None ***************************************************/ static void ReturnObjectMatchAction( void *theEnv, OBJECT_MATCH_ACTION *omaPtr) { if (omaPtr->slotNameIDs != NULL) rm(theEnv,(void *) omaPtr->slotNameIDs,SlotBitMapSize(omaPtr->slotNameIDs)); rtn_struct(theEnv,objectMatchAction,omaPtr); } /*************************************************** NAME : ProcessObjectMatchQueue DESCRIPTION : Processes all outstanding object Rete network update events INPUTS : None RETURNS : Nothing useful SIDE EFFECTS : Pattern-matching on objects NOTES : None ***************************************************/ static void ProcessObjectMatchQueue( void *theEnv) { OBJECT_MATCH_ACTION *cur; while ((ObjectReteData(theEnv)->ObjectMatchActionQueue != NULL) && (ObjectReteData(theEnv)->DelayObjectPatternMatching == FALSE)) { cur = ObjectReteData(theEnv)->ObjectMatchActionQueue; ObjectReteData(theEnv)->ObjectMatchActionQueue = cur->nxt; switch(cur->type) { case OBJECT_ASSERT : ObjectAssertAction(theEnv,cur->ins); break; case OBJECT_RETRACT : ObjectRetractAction(theEnv,cur->ins,cur->slotNameIDs); break; default : ObjectModifyAction(theEnv,cur->ins,cur->slotNameIDs); } cur->ins->busy--; ReturnObjectMatchAction(theEnv,cur); } } /****************************************************** NAME : MarkObjectPatternNetwork DESCRIPTION : Iterates through all terminal pattern nodes checking class and slot bitmaps. If a pattern is applicable to the object/slot change, then all the nodes belonging to the pattern are marked as needing to be examined by the pattern matcher. INPUTS : The bitmap of ids of the slots being changed (NULL if this is an assert for the for the entire object) RETURNS : Nothing useful SIDE EFFECTS : Applicable pattern nodes marked NOTES : Incremental reset status is also checked here ******************************************************/ static void MarkObjectPatternNetwork( void *theEnv, SLOT_BITMAP *slotNameIDs) { OBJECT_ALPHA_NODE *alphaPtr; OBJECT_PATTERN_NODE *upper; CLASS_BITMAP *clsset; unsigned id; ResetObjectMatchTimeTags(theEnv); ObjectReteData(theEnv)->CurrentObjectMatchTimeTag++; alphaPtr = ObjectNetworkTerminalPointer(theEnv); id = ObjectReteData(theEnv)->CurrentPatternObject->cls->id; while (alphaPtr != NULL) { /* ============================================================= If an incremental reset is in progress, make sure that the pattern has been marked for initialization before proceeding. ============================================================= */ #if (! RUN_TIME) && (! BLOAD_ONLY) if (EngineData(theEnv)->IncrementalResetInProgress && (alphaPtr->header.initialize == FALSE)) { alphaPtr = alphaPtr->nxtTerminal; continue; } #endif /* ============================================ Check the class bitmap to see if the pattern pattern is applicable to the object at all ============================================ */ clsset = (CLASS_BITMAP *) ValueToBitMap(alphaPtr->classbmp); if ((id > (unsigned) clsset->maxid) ? FALSE : TestBitMap(clsset->map,id)) { /* =================================================== If we are doing an assert, then we need to check all patterns which satsify the class bitmap (The retraction has already been done in this case) =================================================== */ if (slotNameIDs == NULL) { alphaPtr->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; for (upper = alphaPtr->patternNode ; upper != NULL ; upper = upper->lastLevel) { if (upper->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) break; else upper->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; } } /* =================================================== If we are doing a slot modify, then we need to check only the subset of patterns which satisfy the class bitmap AND actually match on the slot in question. =================================================== */ else if (alphaPtr->slotbmp != NULL) { if (CompareSlotBitMaps(slotNameIDs, (SLOT_BITMAP *) ValueToBitMap(alphaPtr->slotbmp))) { alphaPtr->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; for (upper = alphaPtr->patternNode ; upper != NULL ; upper = upper->lastLevel) { if (upper->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) break; else upper->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; } } } } alphaPtr = alphaPtr->nxtTerminal; } } /*************************************************** NAME : CompareSlotBitMaps DESCRIPTION : Compares two slot bitmaps by bitwising and'ing byte per byte up to the length of the smaller map. INPUTS : The two slot bitmaps RETURNS : TRUE if any common bits are set in both maps, FALSE otherwise SIDE EFFECTS : None NOTES : None ***************************************************/ static intBool CompareSlotBitMaps( SLOT_BITMAP *smap1, SLOT_BITMAP *smap2) { unsigned short i,maxByte; maxByte = (unsigned short) (((smap1->maxid < smap2->maxid) ? smap1->maxid : smap2->maxid) / BITS_PER_BYTE); for (i = 0 ; i <= maxByte ; i++) if (smap1->map[i] & smap2->map[i]) return(TRUE); return(FALSE); } /********************************************************************************** NAME : ObjectPatternMatch DESCRIPTION : Iterates through all the pattern nodes on one level in the pattern network. A node is only processed if it can lead to a terminating class bitmap node which applies to the object being matched. This allows for a significant reduction in the number of patterns considered. INPUTS : 1) The offset of the slot position from the pattern index 2) The pattern node being examined 3) The end of the list of multifield markers for the pattern RETURNS : Nothing useful SIDE EFFECTS : The pattern tests are evaluated and the child nodes may be processed (which may cause a whole series of Rete network updates). NOTES : Several globals are used to keep track of the current slot being examined: CurrentPatternMarks - the series of multifield markers CurrentPatternObject - the object being pattern-matched CurrentPatternObjectSlot - the current slot being examined CurrentObjectSlotLength - the cardinality of the slot value An optimization is performed when evaluating constant tests on a slot value field. All pattern nodes on a level which restrict the same slot are grouped together. Those which are constant tests are placed at the far right. Thus, as soon as one of these constant tests succeeds, the remaining nodes for that slot on this level can be skipped **********************************************************************************/ static void ObjectPatternMatch( void *theEnv, int offset, OBJECT_PATTERN_NODE *patternTop, struct multifieldMarker *endMark) { register unsigned saveSlotLength; register INSTANCE_SLOT *saveSlot; OBJECT_PATTERN_NODE *blockedNode; while (patternTop != NULL) { /* =========================================================== MarkObjectPatternNetwork() has already marked pattern nodes which need processing according to the class bitmaps, slot updates and incremental reset status =========================================================== */ if (patternTop->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) { /* ======================================== Make sure we are examining the correct slot of the object for this pattern node ======================================== */ if ((patternTop->slotNameID == ISA_ID) || (patternTop->slotNameID == NAME_ID)) { ObjectReteData(theEnv)->CurrentPatternObjectSlot = NULL; ObjectReteData(theEnv)->CurrentObjectSlotLength = 1; offset = 0; } else if ((ObjectReteData(theEnv)->CurrentPatternObjectSlot == NULL) ? TRUE : (ObjectReteData(theEnv)->CurrentPatternObjectSlot->desc->slotName->id != patternTop->slotNameID)) { /* ==================================================== Need to reset the indices for the multifield markers now that we have moved onto a different slot ==================================================== */ ObjectReteData(theEnv)->CurrentPatternObjectSlot = ObjectReteData(theEnv)->CurrentPatternObject->slotAddresses[ObjectReteData(theEnv)->CurrentPatternObject->cls->slotNameMap [patternTop->slotNameID] - 1]; offset = 0; if (ObjectReteData(theEnv)->CurrentPatternObjectSlot->desc->multiple) ObjectReteData(theEnv)->CurrentObjectSlotLength = GetInstanceSlotLength(ObjectReteData(theEnv)->CurrentPatternObjectSlot); else ObjectReteData(theEnv)->CurrentObjectSlotLength = 1; } /* ======================================================== Process the pattern node. If it is satisfied by the the instance, ProcessPatternNode() will recursively pass all of its children nodes through ObjectPatternMatch() ======================================================== */ saveSlotLength = ObjectReteData(theEnv)->CurrentObjectSlotLength; saveSlot = ObjectReteData(theEnv)->CurrentPatternObjectSlot; ProcessPatternNode(theEnv,offset,patternTop,endMark); ObjectReteData(theEnv)->CurrentObjectSlotLength = saveSlotLength; ObjectReteData(theEnv)->CurrentPatternObjectSlot = saveSlot; } /* ============================================================== Move on to the siblings of this node - if the current node was a constant test that succeeded, skip further sibling nodes (which test on the same field in the pattern) which match on the same slot since they are all constant tests as well and will, of course fail. ============================================================== */ if (patternTop->blocked == TRUE) { patternTop->blocked = FALSE; blockedNode = patternTop; patternTop = patternTop->rightNode; while (patternTop != NULL) { if ((patternTop->slotNameID != blockedNode->slotNameID) || (patternTop->whichField != blockedNode->whichField)) break; patternTop = patternTop->rightNode; } } else patternTop = patternTop->rightNode; } } /********************************************************************************** NAME : ProcessPatternNode DESCRIPTION : Determines if a pattern node satsifies the corresponding slot value field(s) in an object. If it does, ObjectPatternMatch() is recursively called to process the child nodes of this node. In this mutual recursion between ObjectPatternMatch() and ProcessPatternNode(), the nodes of all applicable patterns are processed to completion. ObjectPatternMatch() enters an object into a pattern's aplha memory when the traversal reaches a terminal class bitmap node. INPUTS : 1) The offset of the slot index from the pattern index 2) The pattern node being examined 3) The end of the list of multifield markers for the pattern RETURNS : Nothing useful SIDE EFFECTS : The pattern tests are evaluated and the child nodes may be processed (which may cause a whole series of Rete network updates). NOTES : Several globals are used to keep track of the current slot being examined: CurrentPatternMarks - the series of multifield markers CurrentPatternObject - the object being pattern-matched CurrentPatternObjectSlot - the current slot being examined CurrentObjectSlotLength - the cardinality of the slot value **********************************************************************************/ static void ProcessPatternNode( void *theEnv, int offset, OBJECT_PATTERN_NODE *patternNode, struct multifieldMarker *endMark) { int patternSlotField,objectSlotField; unsigned objectSlotLength; int repeatCount; INSTANCE_SLOT *objectSlot; struct multifieldMarker *newMark; patternSlotField = patternNode->whichField; objectSlotField = patternSlotField + offset; /* ========================================== If this is a test on the class or the name of the object, process it separately. ========================================== */ if (ObjectReteData(theEnv)->CurrentPatternObjectSlot == NULL) { if ((patternNode->networkTest == NULL) ? TRUE : (EvaluateObjectPatternTest(theEnv,objectSlotField,NULL, (EXPRESSION *) patternNode->networkTest,patternNode))) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,offset,patternNode->nextLevel,endMark); } return; } /* ================================ Check a single-field restriction ================================ */ if (patternNode->multifieldNode == 0) { if ((patternNode->networkTest == NULL) ? TRUE : EvaluateObjectPatternTest(theEnv,objectSlotField,NULL, (EXPRESSION *) patternNode->networkTest,patternNode)) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,offset,patternNode->nextLevel,endMark); } return; } /* ================================================================== Check a multifield restriction. Add a marker for this field which has indices indicating to which values in the object slot the multifield pattern node is bound ================================================================== */ newMark = get_struct(theEnv,multifieldMarker); newMark->whichField = patternSlotField; newMark->where.whichSlot = (void *) ObjectReteData(theEnv)->CurrentPatternObjectSlot->desc->slotName->name; newMark->startPosition = objectSlotField; newMark->next = NULL; if (ObjectReteData(theEnv)->CurrentPatternObjectMarks == NULL) ObjectReteData(theEnv)->CurrentPatternObjectMarks = newMark; else endMark->next = newMark; /* ========================================================== If there are further pattern restrictions on this slot, try pattern-matching for all possible bound values of the multifield pattern node: from no values to all values from the starting position of the multifield to the end of the object slot. Otherwise, bind the multifield to all the remaining fields in the slot value and continue with pattern-matching ========================================================== */ if (patternNode->endSlot == FALSE) { objectSlotLength = ObjectReteData(theEnv)->CurrentObjectSlotLength; objectSlot = ObjectReteData(theEnv)->CurrentPatternObjectSlot; newMark->endPosition = newMark->startPosition - 1; repeatCount = (int) (objectSlotLength - newMark->startPosition - patternNode->leaveFields + 2); while (repeatCount > 0) { if ((patternNode->networkTest == NULL) ? TRUE : EvaluateObjectPatternTest(theEnv,objectSlotField,newMark, (EXPRESSION *) patternNode->networkTest,patternNode)) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,(int) (offset + (newMark->endPosition - objectSlotField)), patternNode->nextLevel,newMark); ObjectReteData(theEnv)->CurrentObjectSlotLength = objectSlotLength; ObjectReteData(theEnv)->CurrentPatternObjectSlot = objectSlot; } newMark->endPosition++; repeatCount--; } } else { newMark->endPosition = (long) ObjectReteData(theEnv)->CurrentObjectSlotLength; if ((patternNode->networkTest == NULL) ? TRUE : EvaluateObjectPatternTest(theEnv,objectSlotField,newMark, (EXPRESSION *) patternNode->networkTest,patternNode)) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,0,patternNode->nextLevel,newMark); } } /* ====================================== Delete the temporary multifield marker ====================================== */ if (ObjectReteData(theEnv)->CurrentPatternObjectMarks == newMark) ObjectReteData(theEnv)->CurrentPatternObjectMarks = NULL; else endMark->next = NULL; rtn_struct(theEnv,multifieldMarker,newMark); } /*************************************************** NAME : CreateObjectAlphaMatch DESCRIPTION : Places an instance in the alpha memory of a pattern and drives the partial match through the join network INPUTS : The alpha memory node RETURNS : Nothing useful SIDE EFFECTS : Join network updated NOTES : None ***************************************************/ static void CreateObjectAlphaMatch( void *theEnv, OBJECT_ALPHA_NODE *alphaPtr) { struct joinNode *listOfJoins; struct partialMatch *theMatch; struct patternMatch *newMatch; while (alphaPtr != NULL) { if (alphaPtr->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) { /* =================================================== If we have reached the class bitmap of the pattern, place the object in the alpha memory of each of the terminal nodes underneath and drive the partial matches through the join network. Insert the instance into the alpha memory of this pattern and mark it as busy =================================================== */ ObjectReteData(theEnv)->CurrentPatternObject->busy++; theMatch = CreateAlphaMatch(theEnv,(void *) ObjectReteData(theEnv)->CurrentPatternObject, ObjectReteData(theEnv)->CurrentPatternObjectMarks, (struct patternNodeHeader *) alphaPtr); /* ====================================== Attach the partial match to the object to ease later retraction ====================================== */ newMatch = get_struct(theEnv,patternMatch); newMatch->next = (struct patternMatch *) ObjectReteData(theEnv)->CurrentPatternObject->partialMatchList; newMatch->matchingPattern = (struct patternNodeHeader *) alphaPtr; newMatch->theMatch = theMatch; ObjectReteData(theEnv)->CurrentPatternObject->partialMatchList = (void *) newMatch; /* ================================================ Drive the partial match through the join network ================================================ */ listOfJoins = alphaPtr->header.entryJoin; while (listOfJoins != NULL) { NetworkAssert(theEnv,theMatch,listOfJoins,RHS); listOfJoins = listOfJoins->rightMatchNode; } } alphaPtr = alphaPtr->nxtInGroup; } } /****************************************************** NAME : EvaluateObjectPatternTest DESCRIPTION : Evaluates the pattern network test expression for a node INPUTS : 1) The actual index of the slot value field currently being examined 2) The multifield marker (if any) for the pattern node being exmained 3) The pattern network test expression 4) The pattern node being examined RETURNS : TRUE if the node passes the test, FALSE otherwise SIDE EFFECTS : Evaluation of the test EvaluationError and HaltExecution are always set to FALSE NOTES : Assumes networkTest != NULL ******************************************************/ static intBool EvaluateObjectPatternTest( void *theEnv, int objectSlotField, struct multifieldMarker *selfSlotMarker, EXPRESSION *networkTest, OBJECT_PATTERN_NODE *patternNode) { DATA_OBJECT vresult; int rv; if (networkTest->type == OBJ_PN_CONSTANT) { struct expr *oldArgument; oldArgument = EvaluationData(theEnv)->CurrentExpression; EvaluationData(theEnv)->CurrentExpression = networkTest; rv = ObjectCmpConstantFunction(theEnv,networkTest->value,&vresult); EvaluationData(theEnv)->CurrentExpression = oldArgument; if (rv) { if (((struct ObjectCmpPNConstant *) ValueToBitMap(networkTest->value))->pass) patternNode->blocked = TRUE; return(TRUE); } return(FALSE); } /* ========================================================= Evaluate or expressions expressed in the format: (or ... ) Returns TRUE (1.0) if any of the expression are TRUE, otherwise returns false (0.0). ========================================================= */ if (networkTest->value == ExpressionData(theEnv)->PTR_OR) { networkTest = networkTest->argList; while (networkTest != NULL) { if (EvaluateObjectPatternTest(theEnv,objectSlotField,selfSlotMarker,networkTest,patternNode)) { /* ============================================ A node can be blocked ONLY if there were one positive constant test on that node ============================================ */ patternNode->blocked = FALSE; return(TRUE); } patternNode->blocked = FALSE; networkTest = networkTest->nextArg; } return(FALSE); } /* ========================================================== Evaluate and expressions expressed in the format: (and ... ) Returns false (0.0) if any of the expression are false, otherwise returns TRUE (1.0). ========================================================== */ else if (networkTest->value == ExpressionData(theEnv)->PTR_AND) { networkTest = networkTest->argList; while (networkTest != NULL) { if (EvaluateObjectPatternTest(theEnv,objectSlotField,selfSlotMarker,networkTest,patternNode) == FALSE) { patternNode->blocked = FALSE; return(FALSE); } patternNode->blocked = FALSE; networkTest = networkTest->nextArg; } return(TRUE); } /* ======================================================= Evaluate all other expressions using EvaluateExpression ======================================================= */ else { EvaluationData(theEnv)->HaltExecution = FALSE; if (EvaluateExpression(theEnv,networkTest,&vresult)) { ObjectPatternNetErrorMessage(theEnv,patternNode); EvaluationData(theEnv)->EvaluationError = FALSE; EvaluationData(theEnv)->HaltExecution = FALSE; return(FALSE); } if ((vresult.value != EnvFalseSymbol(theEnv)) || (vresult.type != SYMBOL)) return(TRUE); } return(FALSE); } /*************************************************** NAME : ObjectAssertAction DESCRIPTION : Filters an instance through the object pattern network INPUTS : The instance RETURNS : Nothing useful SIDE EFFECTS : Instance matched NOTES : None ***************************************************/ static void ObjectAssertAction( void *theEnv, INSTANCE_TYPE *ins) { ins->header.timeTag = ObjectReteData(theEnv)->UseEntityTimeTag; ObjectReteData(theEnv)->CurrentPatternObject = ins; ObjectReteData(theEnv)->CurrentPatternObjectSlot = NULL; MarkObjectPatternNetwork(theEnv,NULL); ObjectPatternMatch(theEnv,0,ObjectNetworkPointer(theEnv),NULL); ins->reteSynchronized = TRUE; } /********************************************************************** NAME : ObjectModifyAction DESCRIPTION : Removes an instance from patterns (and attached joins) applicable to specified slot(s), and then filters same instance through object pattern network (only against patterns which explicitly match on named slot(s)) INPUTS : 1) The instance 2) The bitmap of slot ids RETURNS : Nothing useful SIDE EFFECTS : Instance retracted/asserted NOTES : None **********************************************************************/ static void ObjectModifyAction( void *theEnv, INSTANCE_TYPE *ins, SLOT_BITMAP *slotNameIDs) { ins->header.timeTag = ObjectReteData(theEnv)->UseEntityTimeTag; ObjectRetractAction(theEnv,ins,slotNameIDs); ObjectReteData(theEnv)->CurrentPatternObject = ins; ObjectReteData(theEnv)->CurrentPatternObjectSlot = NULL; MarkObjectPatternNetwork(theEnv,slotNameIDs); ObjectPatternMatch(theEnv,0,ObjectNetworkPointer(theEnv),NULL); ins->reteSynchronized = TRUE; } /**************************************************** NAME : ObjectRetractAction DESCRIPTION : Retracts the instance from the applicable patterns for the object (if the slotNameID != -1, then the instance is only retracted from the alpha memories of the patterns which actually match on that slot) INPUTS : 1) The instance 2) The slot bitmap for a modify (NULL if the instance is actually being removed) RETURNS : Nothing useful SIDE EFFECTS : Retractions performed NOTES : None ****************************************************/ static void ObjectRetractAction( void *theEnv, INSTANCE_TYPE *ins, SLOT_BITMAP *slotNameIDs) { struct patternMatch *prvMatch,*tmpMatch, *deleteMatch,*lastDeleteMatch; OBJECT_ALPHA_NODE *alphaPtr; void *saveDependents; if (slotNameIDs == NULL) { if (ins->partialMatchList != NULL) { tmpMatch = (struct patternMatch *) ins->partialMatchList; while (tmpMatch != NULL) { ins->busy--; tmpMatch = tmpMatch->next; } NetworkRetract(theEnv,(struct patternMatch *) ins->partialMatchList); ins->partialMatchList = NULL; } } else { deleteMatch = NULL; lastDeleteMatch = NULL; prvMatch = NULL; tmpMatch = (struct patternMatch *) ins->partialMatchList; while (tmpMatch != NULL) { alphaPtr = (OBJECT_ALPHA_NODE *) tmpMatch->matchingPattern; if (alphaPtr->slotbmp != NULL) { if (CompareSlotBitMaps(slotNameIDs, (SLOT_BITMAP *) ValueToBitMap(alphaPtr->slotbmp))) { ins->busy--; if (prvMatch == NULL) ins->partialMatchList = (void *) tmpMatch->next; else prvMatch->next = tmpMatch->next; if (!deleteMatch) deleteMatch = tmpMatch; else lastDeleteMatch->next = tmpMatch; lastDeleteMatch = tmpMatch; tmpMatch = tmpMatch->next; lastDeleteMatch->next = NULL; } else { prvMatch = tmpMatch; tmpMatch = tmpMatch->next; } } else { prvMatch = tmpMatch; tmpMatch = tmpMatch->next; } } /* ============================================= We need to preserve any logical dependencies of this object and reattach them after doing the retract. Otherwise, the Rete network will believe the object is gone and remove the links from the partial matches upon which this object is logically dependent. ============================================= */ if (deleteMatch != NULL) { saveDependents = ins->header.dependents; ins->header.dependents = NULL; NetworkRetract(theEnv,deleteMatch); ins->header.dependents = saveDependents; } } ins->reteSynchronized = TRUE; } /***************************************************** NAME : ObjectPatternNetErrorMessage DESCRIPTION : Prints out a locational error message when an evaluation error occurs during object pattern-matching INPUTS : The pattern node RETURNS : Nothing useful SIDE EFFECTS : Error message displayed NOTES : None *****************************************************/ static void ObjectPatternNetErrorMessage( void *theEnv, OBJECT_PATTERN_NODE *patternPtr) { PrintErrorID(theEnv,"OBJRTMCH",1,TRUE); EnvPrintRouter(theEnv,WERROR,"This error occurred in the object pattern network\n"); EnvPrintRouter(theEnv,WERROR," Currently active instance: ["); EnvPrintRouter(theEnv,WERROR,ValueToString(ObjectReteData(theEnv)->CurrentPatternObject->name)); EnvPrintRouter(theEnv,WERROR,"]\n"); EnvPrintRouter(theEnv,WERROR," Problem resides in slot "); EnvPrintRouter(theEnv,WERROR,ValueToString(FindIDSlotName(theEnv,patternPtr->slotNameID))); EnvPrintRouter(theEnv,WERROR," field #"); PrintLongInteger(theEnv,WERROR,(long) patternPtr->whichField); EnvPrintRouter(theEnv,WERROR,"\n"); TraceErrorToObjectPattern(theEnv,TRUE,patternPtr); EnvPrintRouter(theEnv,WERROR,"\n"); } /********************************************************* NAME : TraceErrorToObjectPattern DESCRIPTION : Used by ObjectPatternNetErrorMessage() to print the rule(s) which contain an object pattern. INPUTS : 1) A flag indicating if this is the node in which the error actually occurred or not 2) The pattern node RETURNS : Nothing useful SIDE EFFECTS : Error message displayed NOTES : None *********************************************************/ static void TraceErrorToObjectPattern( void *theEnv, int errorNode, OBJECT_PATTERN_NODE *patternPtr) { struct joinNode *joinPtr; while (patternPtr != NULL) { if (patternPtr->alphaNode != NULL) { joinPtr = patternPtr->alphaNode->header.entryJoin; while (joinPtr != NULL) { EnvPrintRouter(theEnv,WERROR," Of pattern #"); PrintLongInteger(theEnv,WERROR,(long) joinPtr->depth); EnvPrintRouter(theEnv,WERROR," in rule(s):\n"); TraceErrorToRule(theEnv,joinPtr," "); joinPtr = joinPtr->rightMatchNode; } } TraceErrorToObjectPattern(theEnv,FALSE,patternPtr->nextLevel); if (errorNode) break; patternPtr = patternPtr->rightNode; } } #endif Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clips/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Feb 2007 19:04:04 -0000 1.4 +++ .cvsignore 3 Mar 2009 16:43:44 -0000 1.5 @@ -1,14 +1,12 @@ -3CCP.pdf -AllExamples.tar.Z abstract.pdf +clips_core_source_624.tar.Z +x_windows_ide_source_624.tar.Z +examples_624.tar.Z apg.pdf arch5-1.pdf bpg.pdf -clipssrc.tar.Z ig.pdf -usrguide.pdf -x-prjct.tar.Z -FunctionContext.zip -objrtmch.c -DR0873.txt -clips-6.24-linux.patch.bz2 +ug.pdf +3CCP.pdf +clips-doc-html.tar.bz2 +clips-6.24-linux.patch Index: clips.spec =================================================================== RCS file: /cvs/pkgs/rpms/clips/devel/clips.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- clips.spec 24 Feb 2009 07:51:15 -0000 1.11 +++ clips.spec 3 Mar 2009 16:43:44 -0000 1.12 @@ -1,33 +1,48 @@ Summary: CLIPS language for developing expert systems Name: clips Version: 6.24 -Release: 26%{?dist} -Url: http://www.ghg.net/clips/download/source/ +Release: 27%{?dist} +Url: http://clipsrules.sourceforge.net License: GPLv2 Group: Development/Tools -Source0: http://www.ghg.net/clips/download/source/clipssrc.tar.Z -Source1: http://www.ghg.net/clips/download/source/x-prjct.tar.Z -Source2: http://www.ghg.net/clips/download/executables/examples/AllExamples.tar.Z -Source3: http://www.ghg.net/clips/download/documentation/abstract.pdf -Source4: http://www.ghg.net/clips/download/documentation/apg.pdf -Source5: http://www.ghg.net/clips/download/documentation/arch5-1.pdf -Source6: http://www.ghg.net/clips/download/documentation/bpg.pdf -Source7: http://www.ghg.net/clips/download/documentation/ig.pdf -Source8: http://www.ghg.net/clips/download/documentation/usrguide.pdf -Source9: http://www.ghg.net/clips/download/documentation/3CCP.pdf +Source0: http://downloads.sourceforge.net/clipsrules/clips_core_source_624.tar.Z +Source1: http://downloads.sourceforge.net/clipsrules/x_windows_ide_source_624.tar.Z +Source2: http://downloads.sourceforge.net/clipsrules/examples_624.tar.Z +Source3: abstract.pdf +Source4: http://clipsrules.sourceforge.net/documentation/v624/apg.pdf +Source5: http://clipsrules.sourceforge.net/documentation/other/arch5-1.pdf +Source6: http://clipsrules.sourceforge.net/documentation/v624/bpg.pdf +Source7: http://clipsrules.sourceforge.net/documentation/v624/ig.pdf +Source8: http://clipsrules.sourceforge.net/documentation/v624/ug.pdf +Source9: http://clipsrules.sourceforge.net/documentation/other/3CCP.pdf Source10: xclips.png Source11: clips-init.el Source12: clips-mode.el Source13: inf-clips.el -Source14: http://www.ghg.net/clips/download/other/Bug_Fixes/objrtmch.c -Source15: http://www.ghg.net/clips/download/other/FunctionContext.zip -Source16: http://www.ghg.net/clips/download/other/Bug_Fixes/DR0873.txt +Source14: objrtmch.c +Source15: FunctionContext.zip +Source16: DR0873.txt Source17: xclips.desktop +# The following source was generated with the following commands: +# mkdir html +# cd html +# for i in apg.htm bpg.htm ig.htm ug.htm; do +# wget -p -nH --cut-dirs=2 --convert-links http://clipsrules.sourceforge.net/documentation/v624/$i +# dos2unix $i +# done +# cd .. +# tar -cjf clips-doc-html.tar.bz2 html +Source18: clips-doc-html.tar.bz2 Patch0: clips-6.24-linux.patch Patch1: clips-6.24-time-sysdep.c.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel libXt-devel libXext-devel libXmu-devel libXaw-devel xorg-x11-server-Xorg xorg-x11-proto-devel xorg-x11-xbitmaps desktop-file-utils +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: ncurses-devel +BuildRequires: libXt-devel libXext-devel libXmu-devel libXaw-devel +BuildRequires: xorg-x11-server-Xorg xorg-x11-proto-devel xorg-x11-xbitmaps +BuildRequires: desktop-file-utils BuildRequires: automake autoconf libtool +BuildRequires: pkgconfig +BuildRequires: ImageMagick %description CLIPS is a productive development and delivery expert system tool which @@ -46,7 +61,7 @@ This package contains the run-time libraries needed for CLIPS applications. %package devel -Summary: Headers for developing programs that will embed CLIPS +Summary: C headers for developing programs that will embed CLIPS Group: Development/Libraries Requires: clips-libs = %{version}-%{release} Requires: ncurses-devel pkgconfig @@ -58,6 +73,8 @@ %package xclips Summary: X interface to CLIPS Group: Development/Tools +Requires: %{name} = %{version}-%{release} +Requires: hicolor-icon-theme %description xclips X interface to CLIPS. @@ -73,15 +90,15 @@ The following are some of the documents in this package: - Proceedings of the Third Conference on CLIPS, 1994 (3CCP.pdf) - Application abstracts (abstract.pdf) -- CLIPS Reference Manual, Volume II, Advanced Programming Guide (apg.pdf) +- CLIPS Reference Manual, Volume I, Basic Programming Guide (bpg.pdf,bpg.htm) +- CLIPS Reference Manual, Volume II, Adv. Programming Guide (apg.pdf, apg.htm) +- CLIPS Reference Manual, Volume III, Interfaces Guide (ig.pdf,ig.htm) - CLIPS Architecture Manual (arch5-1.pdf) -- CLIPS Reference Manual, Volume I, Basic Programming Guide (bpg.pdf) -- CLIPS Reference Manual, Volume III, Interfaces Guide (ig.pdf) -- CLIPS Users Guide (usrguide.pdf) +- CLIPS Users Guide (ug.pdf,ug.htm) %prep -%setup -q -a 1 -a 2 -a 15 -c +%setup -q -a 1 -a 2 -a 15 -a 18 -c mv x-prjct/xinterface clipssrc/ mv x-prjct/color clipssrc/ mv clipssrc/clipssrc clipssrc/clips @@ -110,18 +127,27 @@ %{__make} %{?_smp_mflags} %install -%{__rm} -rf %{buildroot} -%{__install} -D %{SOURCE10} %{buildroot}%{_datadir}/pixmaps/xclips.png -%{__install} -m 644 -D %{SOURCE11} %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d/clips-init.el -%{__install} -m 644 -D %{SOURCE12} %{buildroot}%{_datadir}/emacs/site-lisp/clips-mode.el -%{__install} -m 644 -D %{SOURCE13} %{buildroot}%{_datadir}/emacs/site-lisp/inf-clips.el cd clipssrc +%{__rm} -rf %{buildroot} +%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p" +find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' +%{__install} -p --mode=0644 -D %{SOURCE11} %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d/clips-init.el +%{__install} -p --mode=0644 -D %{SOURCE12} %{buildroot}%{_datadir}/emacs/site-lisp/clips-mode.el +%{__install} -p --mode=0644 -D %{SOURCE13} %{buildroot}%{_datadir}/emacs/site-lisp/inf-clips.el + +# create icons +# create 16x16, 32x32, 64x64, 128x128 icons +for s in 16 32 64 128 ; do + %{__mkdir_p} %{buildroot}/%{_datadir}/icons/hicolor/${s}x${s}/apps/ + convert -scale ${s}x${s} \ + %{SOURCE10} \ + %{buildroot}/%{_datadir}/icons/hicolor/${s}x${s}/apps/xclips.png +done + desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE17} -%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p" -find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' %clean %{__rm} -rf %{buildroot} @@ -130,6 +156,19 @@ %postun libs -p /sbin/ldconfig +%post xclips +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 xclips +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}/clips @@ -156,17 +195,31 @@ %defattr(-,root,root,-) %{_bindir}/xclips %{_bindir}/xclips-color -%{_datadir}/pixmaps/xclips.png +%{_datadir}/icons/hicolor/*x*/apps/xclips.png %{_datadir}/applications/*xclips.desktop %files doc %defattr(-,root,root,-) %doc Examples/ -%doc abstract.pdf arch5-1.pdf bpg.pdf usrguide.pdf 3CCP.pdf +%doc abstract.pdf arch5-1.pdf bpg.pdf ug.pdf 3CCP.pdf %doc apg.pdf %doc ig.pdf +%doc html/ %changelog +* Tue Mar 03 2009 Rick L Vinyard Jr 6.24-27 +- Updated desktop entry file to add categories and remove deprecated items +- Added hicolor-icon-theme requires to xclips +- Install xclips icons to hicolor directory +- Added validation to desktop file +- Added icon cache rebuild to pre and post sections for xclips +- Added preserve to file installs +- Made install modes explicit +- Added pkgconfig and ImageMagick to build requires +- Updated URL +- Updated source URL's +- Added html docs + * Tue Feb 24 2009 Fedora Release Engineering - 6.24-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clips/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Feb 2007 19:19:53 -0000 1.6 +++ sources 3 Mar 2009 16:43:44 -0000 1.7 @@ -1,14 +1,12 @@ -a6a60733af08f9e9e6d0928272ad4dd9 3CCP.pdf -f5c02b997199f3ede779b8502af2ba09 AllExamples.tar.Z cd3ecddc4e538b8af0e5cf08ab7fd89c abstract.pdf +ccba9d912375e57a1b7d9eba12da4198 clips_core_source_624.tar.Z +1bb0d0e684742188b8c14912c26f12cb x_windows_ide_source_624.tar.Z +f5c02b997199f3ede779b8502af2ba09 examples_624.tar.Z fae2267d96fb95603345e91c9990caaa apg.pdf 9a13d2ed18fe6ab67902d5bce29957cb arch5-1.pdf 63891971aa782dc67c2de0579647247e bpg.pdf -ccba9d912375e57a1b7d9eba12da4198 clipssrc.tar.Z 89beca5caa08b30d8285cca7f1df1d26 ig.pdf -44e54697a8acf3509bc4ca51d88b65bd usrguide.pdf -1bb0d0e684742188b8c14912c26f12cb x-prjct.tar.Z -ac0d7c465a909158ae908fe39d68478c FunctionContext.zip -da5ad2328e4d8dd7680d8bb28005e90d objrtmch.c -f80256270a8a93504e37644ab9bc16b4 DR0873.txt -cbf0382ca4153adc0446b0bf5c123559 clips-6.24-linux.patch.bz2 +44e54697a8acf3509bc4ca51d88b65bd ug.pdf +a6a60733af08f9e9e6d0928272ad4dd9 3CCP.pdf +99f463e8a2536198da37e9dc73304322 clips-doc-html.tar.bz2 +0cb3238a5be85211658ba7ca47257bf8 clips-6.24-linux.patch Index: xclips.desktop =================================================================== RCS file: /cvs/pkgs/rpms/clips/devel/xclips.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xclips.desktop 26 Aug 2007 06:16:44 -0000 1.1 +++ xclips.desktop 3 Mar 2009 16:43:44 -0000 1.2 @@ -1,10 +1,9 @@ [Desktop Entry] -Encoding=UTF-8 Name=XCLIPS GenericName=XCLIPS Expert System Exec=xclips -Icon=xclips.png +Icon=xclips Terminal=false Type=Application -Categories=Application;Development; +Categories=Development;Building;IDE;Education;Science;ArtificialIntelligence;ComputerScience;Robotics; Version=1.0 From mclasen at fedoraproject.org Tue Mar 3 16:49:05 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 16:49:05 +0000 (UTC) Subject: rpms/gcalctool/devel .cvsignore, 1.56, 1.57 gcalctool.spec, 1.86, 1.87 sources, 1.57, 1.58 Message-ID: <20090303164905.D0F0370116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gcalctool/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6206 Modified Files: .cvsignore gcalctool.spec sources Log Message: 5.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gcalctool/devel/.cvsignore,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- .cvsignore 19 Feb 2009 00:49:21 -0000 1.56 +++ .cvsignore 3 Mar 2009 16:48:35 -0000 1.57 @@ -1 +1 @@ -gcalctool-5.25.91.tar.bz2 +gcalctool-5.25.92.tar.bz2 Index: gcalctool.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcalctool/devel/gcalctool.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- gcalctool.spec 24 Feb 2009 19:44:34 -0000 1.86 +++ gcalctool.spec 3 Mar 2009 16:48:35 -0000 1.87 @@ -1,6 +1,6 @@ Name: gcalctool -Version: 5.25.91 -Release: 2%{?dist} +Version: 5.25.92 +Release: 1%{?dist} Summary: A desktop calculator Group: Applications/System @@ -17,7 +17,7 @@ BuildRequires: scrollkeeper BuildRequires: gnome-doc-utils BuildRequires: gettext -BuildRequires: flex +BuildRequires: flex BuildRequires: bison BuildRequires: intltool @@ -30,8 +30,8 @@ Requires: GConf2 %description -gcalctool is a powerful graphical calculator with financial, logical and -scientific modes. It uses a multiple precision package to do its arithmetic +gcalctool is a powerful graphical calculator with financial, logical and +scientific modes. It uses a multiple precision package to do its arithmetic to give a high degree of accuracy. %prep @@ -97,6 +97,9 @@ %changelog +* Tue Mar 3 2009 Matthias Clasen - 5.25.92-1 +- Update to 5.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 5.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gcalctool/devel/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sources 19 Feb 2009 00:49:21 -0000 1.57 +++ sources 3 Mar 2009 16:48:35 -0000 1.58 @@ -1 +1 @@ -ee58fcdba2ce748369e51696bbbe2ace gcalctool-5.25.91.tar.bz2 +db4bd3e8ca3f70ce82a5551c6233c1e7 gcalctool-5.25.92.tar.bz2 From ltinkl at fedoraproject.org Tue Mar 3 16:54:53 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Tue, 3 Mar 2009 16:54:53 +0000 (UTC) Subject: rpms/phonon/F-9 phonon-4.3.2-gstreamer-utf8-url.patch, NONE, 1.1 phonon-4.3.2-gstreamer-volumefader.patch, NONE, 1.1 phonon.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <20090303165453.C26B970116@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/phonon/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8531/F-9 Modified Files: phonon.spec sources Added Files: phonon-4.3.2-gstreamer-utf8-url.patch phonon-4.3.2-gstreamer-volumefader.patch Log Message: Phonon 4.3.1 + backported GStreamer patches phonon-4.3.2-gstreamer-utf8-url.patch: --- NEW FILE phonon-4.3.2-gstreamer-utf8-url.patch --- Index: gstreamer/mediaobject.h =================================================================== --- gstreamer/mediaobject.h (revision 932755) +++ gstreamer/mediaobject.h (revision 932756) @@ -185,7 +185,7 @@ /* * @param encodedUrl percent-encoded QString for source compat reasons. Should change to QUrl */ - bool createPipefromURL(const QString &encodedUrl); + bool createPipefromURL(const QUrl &url); bool createPipefromStream(const MediaSource &); private Q_SLOTS: Index: gstreamer/mediaobject.cpp =================================================================== --- gstreamer/mediaobject.cpp (revision 932755) +++ gstreamer/mediaobject.cpp (revision 932756) @@ -347,11 +347,8 @@ * * returns true if successful */ -bool MediaObject::createPipefromURL(const QString &encodedUrl) +bool MediaObject::createPipefromURL(const QUrl &url) { - // Convert back to URL - QUrl url(encodedUrl, QUrl::StrictMode); - // Remove any existing data source if (m_datasource) { gst_bin_remove(GST_BIN(m_pipeline), m_datasource); @@ -361,7 +358,7 @@ // Verify that the uri can be parsed if (!url.isValid()) { - m_backend->logMessage(QString("%1 is not a valid URI").arg(encodedUrl)); + m_backend->logMessage(QString("%1 is not a valid URI").arg(url.toString())); return false; } @@ -875,8 +872,7 @@ switch (source.type()) { case MediaSource::Url: { - QString urlString = source.url().toEncoded(); - if (createPipefromURL(urlString)) + if (createPipefromURL(source.url())) m_loading = true; else setError(tr("Could not open media source.")); @@ -884,8 +880,7 @@ break; case MediaSource::LocalFile: { - QString urlString = QUrl::fromLocalFile(source.fileName()).toString(); - if (createPipefromURL(urlString)) + if (createPipefromURL(QUrl::fromLocalFile(source.fileName()))) m_loading = true; else setError(tr("Could not open media source.")); phonon-4.3.2-gstreamer-volumefader.patch: --- NEW FILE phonon-4.3.2-gstreamer-volumefader.patch --- Index: gstreamer/mediaobject.cpp =================================================================== --- gstreamer/mediaobject.cpp (revision 932979) +++ gstreamer/mediaobject.cpp (revision 932980) @@ -141,9 +141,9 @@ if (m_resumeState) return; - if (m_state == Phonon::PlayingState || m_state == Phonon::PausedState) { + if (m_pendingState == Phonon::PlayingState || m_pendingState == Phonon::PausedState) { m_resumeState = true; - m_oldState = m_state; + m_oldState = m_pendingState; m_oldPos = getPipelinePos(); } } Index: phonon.spec =================================================================== RCS file: /cvs/extras/rpms/phonon/F-9/phonon.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- phonon.spec 26 Feb 2009 11:29:43 -0000 1.10 +++ phonon.spec 3 Mar 2009 16:54:23 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Multimedia framework api Name: phonon -Version: 4.3.0 -Release: 5%{?dist} +Version: 4.3.1 +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://phonon.kde.org/ @@ -15,6 +15,11 @@ # it as a "sink", and then the device setting is ignored entirely. Patch0: phonon-4.2.96-pulseaudio.patch Patch1: phonon-4.2.96-xine-pulseaudio.patch + +## Upstream patches +Patch100: phonon-4.3.2-gstreamer-utf8-url.patch +Patch101: phonon-4.3.2-gstreamer-volumefader.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automoc4 >= 0.9.86 @@ -73,7 +78,8 @@ %setup -q -n phonon-%{version}%{?alphatag} %patch0 -p1 -b .pulseaudio %patch1 -p1 -b .xine-pulseaudio - +%patch100 -p0 -b .gstreamer-utf8-url +%patch101 -p0 -b .gstreamer-volumefader %build mkdir -p %{_target_platform} @@ -153,6 +159,16 @@ %changelog +* Tue Mar 3 2009 Luk???? Tinkl - 4.3.1-2 +- backport GStreamer backend bugfixes (UTF-8 file handling, volume +fader) + +* Fri Feb 27 2009 Than Ngo - 4.3.1-1 +- 4.3.1 + +* Thu Feb 26 2009 Fedora Release Engineering - 4.3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Feb 01 2009 Rex Dieter - 4.3.0-5 - put icons in the right subpkg Index: sources =================================================================== RCS file: /cvs/extras/rpms/phonon/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2009 15:51:03 -0000 1.5 +++ sources 3 Mar 2009 16:54:23 -0000 1.6 @@ -1,2 +1,2 @@ 8e3924f417fea67f72b2105faed2119c gstreamer-logo.svg -f851219ec1fb4eadc7904f053b6b498d phonon-4.3.0.tar.bz2 +767cb68052c108e95f293f30acdef3fb phonon-4.3.1.tar.bz2 From ltinkl at fedoraproject.org Tue Mar 3 16:54:53 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Tue, 3 Mar 2009 16:54:53 +0000 (UTC) Subject: rpms/phonon/F-10 phonon-4.3.2-gstreamer-utf8-url.patch, NONE, 1.1 phonon-4.3.2-gstreamer-volumefader.patch, NONE, 1.1 phonon.spec, 1.16, 1.17 sources, 1.7, 1.8 Message-ID: <20090303165453.82F2970116@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/phonon/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8531/F-10 Modified Files: phonon.spec sources Added Files: phonon-4.3.2-gstreamer-utf8-url.patch phonon-4.3.2-gstreamer-volumefader.patch Log Message: Phonon 4.3.1 + backported GStreamer patches phonon-4.3.2-gstreamer-utf8-url.patch: --- NEW FILE phonon-4.3.2-gstreamer-utf8-url.patch --- Index: gstreamer/mediaobject.h =================================================================== --- gstreamer/mediaobject.h (revision 932755) +++ gstreamer/mediaobject.h (revision 932756) @@ -185,7 +185,7 @@ /* * @param encodedUrl percent-encoded QString for source compat reasons. Should change to QUrl */ - bool createPipefromURL(const QString &encodedUrl); + bool createPipefromURL(const QUrl &url); bool createPipefromStream(const MediaSource &); private Q_SLOTS: Index: gstreamer/mediaobject.cpp =================================================================== --- gstreamer/mediaobject.cpp (revision 932755) +++ gstreamer/mediaobject.cpp (revision 932756) @@ -347,11 +347,8 @@ * * returns true if successful */ -bool MediaObject::createPipefromURL(const QString &encodedUrl) +bool MediaObject::createPipefromURL(const QUrl &url) { - // Convert back to URL - QUrl url(encodedUrl, QUrl::StrictMode); - // Remove any existing data source if (m_datasource) { gst_bin_remove(GST_BIN(m_pipeline), m_datasource); @@ -361,7 +358,7 @@ // Verify that the uri can be parsed if (!url.isValid()) { - m_backend->logMessage(QString("%1 is not a valid URI").arg(encodedUrl)); + m_backend->logMessage(QString("%1 is not a valid URI").arg(url.toString())); return false; } @@ -875,8 +872,7 @@ switch (source.type()) { case MediaSource::Url: { - QString urlString = source.url().toEncoded(); - if (createPipefromURL(urlString)) + if (createPipefromURL(source.url())) m_loading = true; else setError(tr("Could not open media source.")); @@ -884,8 +880,7 @@ break; case MediaSource::LocalFile: { - QString urlString = QUrl::fromLocalFile(source.fileName()).toString(); - if (createPipefromURL(urlString)) + if (createPipefromURL(QUrl::fromLocalFile(source.fileName()))) m_loading = true; else setError(tr("Could not open media source.")); phonon-4.3.2-gstreamer-volumefader.patch: --- NEW FILE phonon-4.3.2-gstreamer-volumefader.patch --- Index: gstreamer/mediaobject.cpp =================================================================== --- gstreamer/mediaobject.cpp (revision 932979) +++ gstreamer/mediaobject.cpp (revision 932980) @@ -141,9 +141,9 @@ if (m_resumeState) return; - if (m_state == Phonon::PlayingState || m_state == Phonon::PausedState) { + if (m_pendingState == Phonon::PlayingState || m_pendingState == Phonon::PausedState) { m_resumeState = true; - m_oldState = m_state; + m_oldState = m_pendingState; m_oldPos = getPipelinePos(); } } Index: phonon.spec =================================================================== RCS file: /cvs/extras/rpms/phonon/F-10/phonon.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- phonon.spec 26 Feb 2009 11:29:42 -0000 1.16 +++ phonon.spec 3 Mar 2009 16:54:23 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Multimedia framework api Name: phonon -Version: 4.3.0 -Release: 5%{?dist} +Version: 4.3.1 +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://phonon.kde.org/ @@ -15,6 +15,11 @@ # it as a "sink", and then the device setting is ignored entirely. Patch0: phonon-4.2.96-pulseaudio.patch Patch1: phonon-4.2.96-xine-pulseaudio.patch + +## Upstream patches +Patch100: phonon-4.3.2-gstreamer-utf8-url.patch +Patch101: phonon-4.3.2-gstreamer-volumefader.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automoc4 >= 0.9.86 @@ -73,7 +78,8 @@ %setup -q -n phonon-%{version}%{?alphatag} %patch0 -p1 -b .pulseaudio %patch1 -p1 -b .xine-pulseaudio - +%patch100 -p0 -b .gstreamer-utf8-url +%patch101 -p0 -b .gstreamer-volumefader %build mkdir -p %{_target_platform} @@ -153,6 +159,16 @@ %changelog +* Tue Mar 3 2009 Luk???? Tinkl - 4.3.1-2 +- backport GStreamer backend bugfixes (UTF-8 file handling, volume +fader) + +* Fri Feb 27 2009 Than Ngo - 4.3.1-1 +- 4.3.1 + +* Thu Feb 26 2009 Fedora Release Engineering - 4.3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Feb 01 2009 Rex Dieter - 4.3.0-5 - put icons in the right subpkg Index: sources =================================================================== RCS file: /cvs/extras/rpms/phonon/F-10/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 Jan 2009 15:46:57 -0000 1.7 +++ sources 3 Mar 2009 16:54:23 -0000 1.8 @@ -1,2 +1,2 @@ 8e3924f417fea67f72b2105faed2119c gstreamer-logo.svg -f851219ec1fb4eadc7904f053b6b498d phonon-4.3.0.tar.bz2 +767cb68052c108e95f293f30acdef3fb phonon-4.3.1.tar.bz2 From mclasen at fedoraproject.org Tue Mar 3 17:03:02 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 17:03:02 +0000 (UTC) Subject: rpms/eog/devel .cvsignore, 1.78, 1.79 eog.spec, 1.140, 1.141 sources, 1.78, 1.79 Message-ID: <20090303170302.AEB2E70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/eog/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9921 Modified Files: .cvsignore eog.spec sources Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eog/devel/.cvsignore,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- .cvsignore 19 Feb 2009 00:56:14 -0000 1.78 +++ .cvsignore 3 Mar 2009 17:02:32 -0000 1.79 @@ -1 +1 @@ -eog-2.25.91.tar.bz2 +eog-2.25.92.tar.bz2 Index: eog.spec =================================================================== RCS file: /cvs/pkgs/rpms/eog/devel/eog.spec,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- eog.spec 24 Feb 2009 15:10:09 -0000 1.140 +++ eog.spec 3 Mar 2009 17:02:32 -0000 1.141 @@ -11,8 +11,8 @@ Summary: Eye of GNOME image viewer Name: eog -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} URL: http://projects.gnome.org/eog/ Source: http://download.gnome.org/sources/eog/2.25/%{name}-%{version}.tar.bz2 Patch0: libxml.patch @@ -20,7 +20,7 @@ # There is no need to add the + here. License: GPLv2+ and GFDL Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libglade2-devel >= %{libglade_version} @@ -50,8 +50,8 @@ Requires(postun): scrollkeeper %description -The Eye of GNOME image viewer (eog) is the official image viewer for the -GNOME desktop. It can view single image files in a variety of formats, as +The Eye of GNOME image viewer (eog) is the official image viewer for the +GNOME desktop. It can view single image files in a variety of formats, as well as large image collections. eog is extensible through a plugin system. @@ -67,7 +67,7 @@ Requires: GConf2-devel %description devel -The Eye of GNOME image viewer (eog) is the official image viewer for the +The Eye of GNOME image viewer (eog) is the official image viewer for the GNOME desktop. This package allows you to develop plugins that add new functionality to eog. @@ -80,7 +80,7 @@ %build -%configure --disable-scrollkeeper +%configure --disable-scrollkeeper make %install @@ -126,7 +126,7 @@ update-desktop-database -q scrollkeeper-update -q export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/eog.schemas > /dev/null || : +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/eog.schemas > /dev/null || : touch %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor @@ -170,6 +170,9 @@ %{_datadir}/gtk-doc/html/eog %changelog +* Tue Mar 3 2009 Matthias Clasen - 2.25.92-1 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eog/devel/sources,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- sources 19 Feb 2009 00:56:14 -0000 1.78 +++ sources 3 Mar 2009 17:02:32 -0000 1.79 @@ -1 +1 @@ -a910f3515a9fa9e9e43c7424dcd3bb38 eog-2.25.91.tar.bz2 +d63c1b834129ffbe147376d73baf63b9 eog-2.25.92.tar.bz2 From mclasen at fedoraproject.org Tue Mar 3 17:10:16 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 17:10:16 +0000 (UTC) Subject: rpms/libgweather/devel .cvsignore, 1.20, 1.21 libgweather.spec, 1.36, 1.37 sources, 1.20, 1.21 Message-ID: <20090303171016.557B470116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/libgweather/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11335 Modified Files: .cvsignore libgweather.spec sources Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgweather/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 19 Feb 2009 02:09:54 -0000 1.20 +++ .cvsignore 3 Mar 2009 17:09:45 -0000 1.21 @@ -1 +1 @@ -libgweather-2.25.91.tar.bz2 +libgweather-2.25.92.tar.bz2 Index: libgweather.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgweather/devel/libgweather.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- libgweather.spec 25 Feb 2009 15:35:19 -0000 1.36 +++ libgweather.spec 3 Mar 2009 17:09:45 -0000 1.37 @@ -1,11 +1,11 @@ Name: libgweather -Version: 2.25.91 -Release: 2%{?dist} -Summary: A library for weather information +Version: 2.25.92 +Release: 1%{?dist} +Summary: A library for weather information Group: System Environment/Libraries License: GPLv2+ -URL: http://www.gnome.org +URL: http://www.gnome.org Source0: http://download.gnome.org/sources/libgweather/2.25/%{name}-%{version}.tar.bz2 Source1: copy.xsl BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,7 +16,6 @@ BuildRequires: libsoup-devel >= 2.4 BuildRequires: libxml2-devel >= 2.6 BuildRequires: gettext -BuildRequires: perl(XML::Parser) BuildRequires: intltool %description @@ -69,7 +68,7 @@ %install rm -rf $RPM_BUILD_ROOT -# waste less space +# waste less space xsltproc %{SOURCE1} data/Locations.xml > loc.xml sed -e "s/^\s*//" -e "/^$/d" loc.xml > data/Locations.xml @@ -123,6 +122,9 @@ %changelog +* Tue Mar 3 2009 Matthias Clasen 2.25.92-1 +- Update to 2.25.92 + * Wed Feb 25 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgweather/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 19 Feb 2009 02:09:54 -0000 1.20 +++ sources 3 Mar 2009 17:09:45 -0000 1.21 @@ -1 +1 @@ -9377cb2cfafb2e55ac8f7357714f25f8 libgweather-2.25.91.tar.bz2 +9b65db7227a7a59b0d3fb8ab7f3cd689 libgweather-2.25.92.tar.bz2 From rathann at fedoraproject.org Tue Mar 3 17:11:35 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Tue, 3 Mar 2009 17:11:35 +0000 (UTC) Subject: rpms/freefem++/devel freefem++.spec,1.19,1.20 Message-ID: <20090303171135.D8FDD70116@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/freefem++/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11756 Modified Files: freefem++.spec Log Message: - disable testsuite for now Index: freefem++.spec =================================================================== RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- freefem++.spec 3 Mar 2009 02:05:00 -0000 1.19 +++ freefem++.spec 3 Mar 2009 17:11:05 -0000 1.20 @@ -120,11 +120,13 @@ %clean rm -rf $RPM_BUILD_ROOT +%if 0 %check . /etc/profile.d/modules.sh module load %{_libdir}/lam/lam.module %{__make} check pkill lamd +%endif %files %defattr(-,root,root,-) From pkgdb at fedoraproject.org Tue Mar 3 17:17:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 17:17:35 +0000 Subject: [pkgdb] gdal: orion has requested commit Message-ID: <20090303171756.B95162084D0@bastion.fedora.phx.redhat.com> orion has requested the commit acl on gdal (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdal From mclasen at fedoraproject.org Tue Mar 3 17:32:08 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 17:32:08 +0000 (UTC) Subject: rpms/gnome-panel/devel .cvsignore, 1.91, 1.92 gnome-panel.spec, 1.347, 1.348 sources, 1.94, 1.95 gnome-panel-2.24.0-hide-shutdown-if-unavailable.patch, 1.1, NONE gnome-panel-2.24.1-smoother-slide-in.patch, 1.3, NONE panel-resizing.patch, 1.1, NONE tryexec.patch, 1.1, NONE Message-ID: <20090303173208.86D9F70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-panel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15434 Modified Files: .cvsignore gnome-panel.spec sources Removed Files: gnome-panel-2.24.0-hide-shutdown-if-unavailable.patch gnome-panel-2.24.1-smoother-slide-in.patch panel-resizing.patch tryexec.patch Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/devel/.cvsignore,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- .cvsignore 19 Feb 2009 05:24:07 -0000 1.91 +++ .cvsignore 3 Mar 2009 17:31:37 -0000 1.92 @@ -1 +1 @@ -gnome-panel-2.25.91.tar.bz2 +gnome-panel-2.25.92.tar.bz2 Index: gnome-panel.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.347 retrieving revision 1.348 diff -u -r1.347 -r1.348 --- gnome-panel.spec 27 Feb 2009 14:39:08 -0000 1.347 +++ gnome-panel.spec 3 Mar 2009 17:31:38 -0000 1.348 @@ -22,8 +22,8 @@ Summary: GNOME panel Name: gnome-panel -Version: 2.25.91 -Release: 3%{?dist} +Version: 2.25.92 +Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar.bz2 @@ -105,17 +105,14 @@ Patch9: desktop-file-monitoring.patch Patch10: preferred-apps.patch -# don't pop up an error dialog if an applet from the +# don't pop up an error dialog if an applet from the # default configuration is missing; we don't want to -# add a hard dependency on e.g. tomboy +# add a hard dependency on e.g. tomboy Patch11: applet-error.patch # http://bugzilla.gnome.org/show_bug.cgi?id=520111 Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=572933 -Patch25: panel-resizing.patch - Patch35: clock-wakeups.patch Conflicts: gnome-power-manager < 2.15.3 @@ -163,7 +160,6 @@ %patch10 -p1 -b .preferred-apps %patch11 -p1 -b .applet-error %patch24 -p1 -b .allow-spurious-view-done-signals -%patch25 -p1 -b .panel-resizing %patch35 -p1 -b .clock-wakeups libtoolize --force --copy @@ -366,6 +362,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Tue Mar 3 2009 Matthias Clasen - 2.25.92-1 +- Update to 2.25.92 + * Fri Feb 27 2009 Matthias Clasen - 2.25.91-3 - Require PolicyKit-authentication-agent Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/devel/sources,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- sources 19 Feb 2009 05:24:07 -0000 1.94 +++ sources 3 Mar 2009 17:31:38 -0000 1.95 @@ -1 +1 @@ -8b6f0c2c1d53be49cfe1bbe433e1e758 gnome-panel-2.25.91.tar.bz2 +0cbff3b35bb71d0d25b8bdbb3d348312 gnome-panel-2.25.92.tar.bz2 --- gnome-panel-2.24.0-hide-shutdown-if-unavailable.patch DELETED --- --- gnome-panel-2.24.1-smoother-slide-in.patch DELETED --- --- panel-resizing.patch DELETED --- --- tryexec.patch DELETED --- From till at fedoraproject.org Tue Mar 3 17:35:50 2009 From: till at fedoraproject.org (Till Maas) Date: Tue, 3 Mar 2009 17:35:50 +0000 (UTC) Subject: rpms/libHX/devel .cvsignore, 1.9, 1.10 libHX.spec, 1.14, 1.15 sources, 1.9, 1.10 Message-ID: <20090303173550.A45FD70116@cvs1.fedora.phx.redhat.com> Author: till Update of /cvs/pkgs/rpms/libHX/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16161 Modified Files: .cvsignore libHX.spec sources Log Message: * Tue Mar 03 2009 Till Maas - 2.5-1 - Update to new release - Update URL/Source0 to SF.net webpage Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libHX/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Jan 2009 15:54:00 -0000 1.9 +++ .cvsignore 3 Mar 2009 17:35:20 -0000 1.10 @@ -1,2 +1,2 @@ -libHX-2.3.tar.bz2 -libHX-2.3.tar.bz2.asc +libHX-2.5.tar.bz2 +libHX-2.5.tar.bz2.asc Index: libHX.spec =================================================================== RCS file: /cvs/pkgs/rpms/libHX/devel/libHX.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libHX.spec 25 Feb 2009 13:04:02 -0000 1.14 +++ libHX.spec 3 Mar 2009 17:35:20 -0000 1.15 @@ -1,13 +1,13 @@ Name: libHX -Version: 2.3 -Release: 2%{?dist} +Version: 2.5 +Release: 1%{?dist} Summary: General-purpose library for typical low-level operations Group: System Environment/Libraries License: LGPLv2 or LGPLv3 -URL: http://jengelh.hopto.org/files/libHX/ -Source0: http://jengelh.hopto.org/files/libHX/libHX-%{version}.tar.bz2 -Source1: http://jengelh.hopto.org/files/libHX/libHX-%{version}.tar.bz2.asc +URL: http://sourceforge.net/projects/libhx/ +Source0: http://downloads.sourceforge.net/libhx/libHX-%{version}.tar.bz2 +Source1: http://downloads.sourceforge.net/libhx/libHX-%{version}.tar.bz2.asc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl gcc-c++ @@ -88,6 +88,10 @@ %changelog +* Tue Mar 03 2009 Till Maas - 2.5-1 +- Update to new release +- Update URL/Source0 to SF.net webpage + * Wed Feb 25 2009 Fedora Release Engineering - 2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libHX/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Jan 2009 15:54:00 -0000 1.9 +++ sources 3 Mar 2009 17:35:20 -0000 1.10 @@ -1,2 +1,2 @@ -cf100330b7ed4f2be17602dba7080077 libHX-2.3.tar.bz2 -04f7f54ba07e38c0580e92e82c2878b0 libHX-2.3.tar.bz2.asc +8d8730995b48ac51d0bafd4b60077a21 libHX-2.5.tar.bz2 +2aab1b82d77e15418ba12fe1c8b8298d libHX-2.5.tar.bz2.asc From mclasen at fedoraproject.org Tue Mar 3 17:36:24 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 17:36:24 +0000 (UTC) Subject: rpms/gnome-session/devel .cvsignore, 1.71, 1.72 gnome-session.spec, 1.227, 1.228 sources, 1.75, 1.76 xsync-is-great.patch, 1.1, NONE Message-ID: <20090303173624.3D9E170116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-session/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15967 Modified Files: .cvsignore gnome-session.spec sources Removed Files: xsync-is-great.patch Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/.cvsignore,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- .cvsignore 19 Feb 2009 03:15:47 -0000 1.71 +++ .cvsignore 3 Mar 2009 17:35:53 -0000 1.72 @@ -1 +1 @@ -gnome-session-2.25.91.tar.bz2 +gnome-session-2.25.92.tar.bz2 Index: gnome-session.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.227 retrieving revision 1.228 diff -u -r1.227 -r1.228 --- gnome-session.spec 26 Feb 2009 20:17:32 -0000 1.227 +++ gnome-session.spec 3 Mar 2009 17:35:53 -0000 1.228 @@ -9,15 +9,15 @@ Summary: GNOME session manager Name: gnome-session -Version: 2.25.91 -Release: 4%{?dist} +Version: 2.25.92 +Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-session/2.25/%{name}-%{version}.tar.bz2 Source1: redhat-default-session Source2: gnome.desktop License: GPLv2+ Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: system-logos # required to get gconf-sanity-check-2 in the right place @@ -61,10 +61,8 @@ Requires(post): GConf2 >= %{gconf2_version} Requires(preun): GConf2 >= %{gconf2_version} -Patch0: xsync-is-great.patch - %description -gnome-session manages a GNOME desktop or GDM login session. It starts up +gnome-session manages a GNOME desktop or GDM login session. It starts up the other core GNOME components and handles logout and saving the session. %package xsession @@ -77,7 +75,6 @@ %prep %setup -q -%patch0 -p1 -b .xsync-is-great #workaround broken perl-XML-Parser on 64bit arches export PERL5LIB=/usr/lib64/perl5/vendor_perl/5.8.2 perl @@ -176,6 +173,9 @@ %changelog +* Tue Mar 3 2009 Matthias Clasen - 2.25.92-1 +- Update to 2.25.92 + * Thu Feb 26 2009 Matthias Clasen - 2.25.91-4 - Make -xsession arch again - Fix xsync usage Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/sources,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- sources 19 Feb 2009 03:15:48 -0000 1.75 +++ sources 3 Mar 2009 17:35:53 -0000 1.76 @@ -1 +1 @@ -521502729dd7481304287068988f013b gnome-session-2.25.91.tar.bz2 +bb06f7962d9e9e55abc0a4727b596b20 gnome-session-2.25.92.tar.bz2 --- xsync-is-great.patch DELETED --- From till at fedoraproject.org Tue Mar 3 17:39:56 2009 From: till at fedoraproject.org (Till Maas) Date: Tue, 3 Mar 2009 17:39:56 +0000 (UTC) Subject: rpms/pam_mount/devel .cvsignore, 1.22, 1.23 pam_mount.spec, 1.53, 1.54 sources, 1.23, 1.24 Message-ID: <20090303173956.D97C770116@cvs1.fedora.phx.redhat.com> Author: till Update of /cvs/pkgs/rpms/pam_mount/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16974 Modified Files: .cvsignore pam_mount.spec sources Log Message: * Tue Mar 03 2009 Till Maas - 1.20-1 - Update to new release - Update libHX dependency Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pam_mount/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 15 Feb 2009 10:27:16 -0000 1.22 +++ .cvsignore 3 Mar 2009 17:39:26 -0000 1.23 @@ -1,2 +1,2 @@ -pam_mount-1.18.tar.bz2 -pam_mount-1.18.tar.bz2.asc +pam_mount-1.20.tar.bz2 +pam_mount-1.20.tar.bz2.asc Index: pam_mount.spec =================================================================== RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- pam_mount.spec 26 Feb 2009 09:35:35 -0000 1.53 +++ pam_mount.spec 3 Mar 2009 17:39:26 -0000 1.54 @@ -1,8 +1,8 @@ %define packext bz2 Name: pam_mount -Version: 1.18 -Release: 2%{?dist} +Version: 1.20 +Release: 1%{?dist} Summary: A PAM module that can mount volumes for a user session Group: System Environment/Base @@ -17,9 +17,10 @@ BuildRequires: glib2-devel, pam-devel, openssl-devel BuildRequires: libxml2-devel -BuildRequires: libHX-devel >= 2.2 +BuildRequires: libHX-devel >= 2.5 BuildRequires: lzip Requires: pam +Requires: libHX >= 2.5 # for /etc/catalog and xmlcatalog #Requires: xml-common @@ -109,6 +110,10 @@ %changelog +* Tue Mar 03 2009 Till Maas - 1.20-1 +- Update to new release +- Update libHX dependency + * Thu Feb 26 2009 Fedora Release Engineering - 1.18-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pam_mount/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 15 Feb 2009 10:27:16 -0000 1.23 +++ sources 3 Mar 2009 17:39:26 -0000 1.24 @@ -1,2 +1,2 @@ -209a0e73d1b71e4fc724f2f3be695119 pam_mount-1.18.tar.bz2 -b869282e2308f7b422e052b6ee446c78 pam_mount-1.18.tar.bz2.asc +006136e2d955be6b4feeda89fdea0d1a pam_mount-1.20.tar.bz2 +1d063a0532c788fd3d72c08556e006a7 pam_mount-1.20.tar.bz2.asc From rdieter at fedoraproject.org Tue Mar 3 17:42:28 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Tue, 3 Mar 2009 17:42:28 +0000 (UTC) Subject: rpms/qt/devel qt.spec,1.247,1.248 Message-ID: <20090303174228.B174070116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17473 Modified Files: qt.spec Log Message: -x11: move libQtScriptTools here (linked with libQtGui) Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.247 retrieving revision 1.248 diff -u -r1.247 -r1.248 --- qt.spec 3 Mar 2009 15:43:46 -0000 1.247 +++ qt.spec 3 Mar 2009 17:41:58 -0000 1.248 @@ -640,7 +640,6 @@ %{_qt4_libdir}/libQtTest.so.* %{_qt4_libdir}/libQtXml.so.* %{_qt4_libdir}/libQtXmlPatterns.so.* -%{_qt4_libdir}/libQtScriptTools.so.* %dir %{_qt4_plugindir} %dir %{_qt4_plugindir}/sqldrivers/ %{_qt4_plugindir}/sqldrivers/libqsqlite* @@ -657,6 +656,7 @@ %{_qt4_libdir}/libQtGui.so.* %{_qt4_libdir}/libQtHelp.so.* %{_qt4_libdir}/libQtOpenGL.so.* +%{_qt4_libdir}/libQtScriptTools.so.* %{_qt4_libdir}/libQtSvg.so.* %{?webkit:%{_qt4_libdir}/libQtWebKit.so.*} %{_qt4_plugindir}/* @@ -778,6 +778,7 @@ - License: LGPLv2 with exceptions or GPLv3 with exceptions - BR: gstreamer-devel - drop qgtkstyle patch (no longer needed) +- -x11: move libQtScriptTools here (linked with libQtGui) * Tue Mar 03 2009 Than Ngo - 4.5.0-1 - 4.5.0 From buc at fedoraproject.org Tue Mar 3 17:43:35 2009 From: buc at fedoraproject.org (Dmitry Butskoy) Date: Tue, 3 Mar 2009 17:43:35 +0000 (UTC) Subject: rpms/libtranslate/devel libtranslate-0.99-update-services1.patch, NONE, 1.1 libtranslate.spec, 1.25, 1.26 Message-ID: <20090303174335.3DBCD70116@cvs1.fedora.phx.redhat.com> Author: buc Update of /cvs/extras/rpms/libtranslate/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17737 Modified Files: libtranslate.spec Added Files: libtranslate-0.99-update-services1.patch Log Message: libtranslate-0.99-update-services1.patch: --- NEW FILE libtranslate-0.99-update-services1.patch --- diff -Nrbu libtranslate-0.99/data/services.xml.in libtranslate-0.99-OK/data/services.xml.in --- libtranslate-0.99/data/services.xml.in 2009-03-03 20:33:20.000000000 +0300 +++ libtranslate-0.99-OK/data/services.xml.in 2009-03-03 20:36:38.000000000 +0300 @@ -93,18 +93,22 @@ + + + + @@ -114,8 +118,11 @@ + + + Index: libtranslate.spec =================================================================== RCS file: /cvs/extras/rpms/libtranslate/devel/libtranslate.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- libtranslate.spec 25 Feb 2009 19:33:01 -0000 1.25 +++ libtranslate.spec 3 Mar 2009 17:43:05 -0000 1.26 @@ -1,7 +1,7 @@ Name: libtranslate Summary: Natural language translation library Version: 0.99 -Release: 19%{?dist} +Release: 20%{?dist} License: BSD Group: System Environment/Libraries %define url http://savannah.nongnu.org/download/libtranslate @@ -12,8 +12,9 @@ Patch4: %{url}/libtranslate-0.99-postmarker.diff Patch5: %{url}/libtranslate-0.99-services.diff Patch10: libtranslate-0.99-libsoup24.diff -Patch12: libtranslate-0.99-update-services.patch Patch11: libtranslate-0.99-fix-modules.patch +Patch12: libtranslate-0.99-update-services.patch +Patch13: libtranslate-0.99-update-services1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig >= 1:0.8, gettext, intltool, libtool BuildRequires: glib2-devel, libsoup-devel >= 2.2, libxml2-devel @@ -57,6 +58,7 @@ %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 libtoolize --force intltoolize --automake --force @@ -122,6 +124,10 @@ %changelog +* Tue Mar 3 2009 Dmitry Butskoy - 0.99-20 +- add more language pairs for google service + (#487951, by Dwayne Bailey (dwayne at translate.org.za>) + * Wed Feb 25 2009 Fedora Release Engineering - 0.99-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From sindrepb at fedoraproject.org Tue Mar 3 17:44:03 2009 From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=) Date: Tue, 3 Mar 2009 17:44:03 +0000 (UTC) Subject: rpms/rubyripper/devel .cvsignore, 1.6, 1.7 rubyripper.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <20090303174403.9C26070116@cvs1.fedora.phx.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/rubyripper/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17845 Modified Files: .cvsignore rubyripper.spec sources Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubyripper/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 1 Jan 2009 17:03:49 -0000 1.6 +++ .cvsignore 3 Mar 2009 17:43:33 -0000 1.7 @@ -1 +1 @@ -rubyripper-0.5.4.tar.bz2 +rubyripper-0.5.5.tar.bz2 Index: rubyripper.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubyripper/devel/rubyripper.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- rubyripper.spec 25 Feb 2009 22:09:01 -0000 1.12 +++ rubyripper.spec 3 Mar 2009 17:43:33 -0000 1.13 @@ -1,8 +1,8 @@ %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')} Name: rubyripper -Version: 0.5.4 -Release: 2%{?dist} +Version: 0.5.5 +Release: 1%{?dist} Summary: Open-source secure ripper for Linux Group: Applications/Multimedia @@ -82,6 +82,9 @@ %changelog +* Tue Mar 04 2009 Sindre Pedersen Bj??rdal - 0.5.5-1 +- New upstream release + * Wed Feb 25 2009 Fedora Release Engineering - 0.5.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubyripper/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 1 Jan 2009 17:03:50 -0000 1.6 +++ sources 3 Mar 2009 17:43:33 -0000 1.7 @@ -1 +1 @@ -7c728ddd517c36c1c6b853c7e0bff8a3 rubyripper-0.5.4.tar.bz2 +45d5d85d2b528538b9d50243360f88cd rubyripper-0.5.5.tar.bz2 From jkratoch at fedoraproject.org Tue Mar 3 17:45:51 2009 From: jkratoch at fedoraproject.org (Jan Kratochvil) Date: Tue, 3 Mar 2009 17:45:51 +0000 (UTC) Subject: rpms/libunwind/devel libunwind.spec,1.27,1.28 Message-ID: <20090303174551.6400E70116@cvs1.fedora.phx.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/libunwind/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18289 Modified Files: libunwind.spec Log Message: * Tue Mar 3 2009 Jan Kratochvil - 0.99-0.8.frysk20070405cvs - Fix .spec ExclusiveArch from i386 to %{ix86}. - Remove `BuildRequires: glibc gcc make tar gzip' - minimum build environment. Index: libunwind.spec =================================================================== RCS file: /cvs/pkgs/rpms/libunwind/devel/libunwind.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- libunwind.spec 25 Feb 2009 19:39:12 -0000 1.27 +++ libunwind.spec 3 Mar 2009 17:45:21 -0000 1.28 @@ -11,7 +11,7 @@ Version: 0.99 %define frysksnap 20070405cvs %define upstreamsnap 070224 -Release: 0.7.frysk%{frysksnap}%{?dist} +Release: 0.8.frysk%{frysksnap}%{?dist} License: BSD Group: Development/Debuggers Source: http://download.savannah.nongnu.org/releases/libunwind/libunwind-snap-%{upstreamsnap}.tar.gz @@ -22,9 +22,8 @@ Source1: libunwind-orphanripper.c Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://savannah.nongnu.org/projects/libunwind -ExclusiveArch: ia64 x86_64 i386 ppc64 +ExclusiveArch: ia64 x86_64 %{ix86} ppc64 -BuildRequires: glibc gcc make tar gzip BuildRequires: automake libtool autoconf Conflicts: gdb < 6.6-9 @@ -96,6 +95,10 @@ %{_includedir}/* %changelog +* Tue Mar 3 2009 Jan Kratochvil - 0.99-0.8.frysk20070405cvs +- Fix .spec ExclusiveArch from i386 to %%{ix86}. +- Remove `BuildRequires: glibc gcc make tar gzip' - minimum build environment. + * Wed Feb 25 2009 Fedora Release Engineering - 0.99-0.7.frysk20070405cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From atorkhov at fedoraproject.org Tue Mar 3 17:47:46 2009 From: atorkhov at fedoraproject.org (Alexey Torkhov) Date: Tue, 3 Mar 2009 17:47:46 +0000 (UTC) Subject: rpms/vegastrike/devel vegastrike.spec,1.17,1.18 Message-ID: <20090303174746.4F75D70117@cvs1.fedora.phx.redhat.com> Author: atorkhov Update of /cvs/pkgs/rpms/vegastrike/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18593 Modified Files: vegastrike.spec Log Message: * Tue Mar 03 2009 Alexey Torkhov - 0.5.0-9 - Rebuild for new ogre Index: vegastrike.spec =================================================================== RCS file: /cvs/pkgs/rpms/vegastrike/devel/vegastrike.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- vegastrike.spec 26 Feb 2009 00:06:22 -0000 1.17 +++ vegastrike.spec 3 Mar 2009 17:47:15 -0000 1.18 @@ -1,6 +1,6 @@ Name: vegastrike Version: 0.5.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: 3D OpenGL spaceflight simulator Group: Amusements/Games License: GPLv2+ @@ -98,6 +98,9 @@ %changelog +* Tue Mar 03 2009 Alexey Torkhov - 0.5.0-9 +- Rebuild for new ogre + * Wed Feb 25 2009 Fedora Release Engineering - 0.5.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jeckersb at fedoraproject.org Tue Mar 3 18:14:18 2009 From: jeckersb at fedoraproject.org (John Eckersberg) Date: Tue, 3 Mar 2009 18:14:18 +0000 (UTC) Subject: rpms/PyYAML/devel PyYAML.spec,1.6,1.7 Message-ID: <20090303181418.BA2F370116@cvs1.fedora.phx.redhat.com> Author: jeckersb Update of /cvs/pkgs/rpms/PyYAML/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23365 Modified Files: PyYAML.spec Log Message: fix buildrequires s/libyaml/libyaml-devel/ Index: PyYAML.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyYAML/devel/PyYAML.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- PyYAML.spec 3 Mar 2009 00:55:40 -0000 1.6 +++ PyYAML.spec 3 Mar 2009 18:13:47 -0000 1.7 @@ -2,7 +2,7 @@ Name: PyYAML Version: 3.08 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -11,7 +11,7 @@ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel, python-setuptools, libyaml +BuildRequires: python-devel, python-setuptools, libyaml-devel %description YAML is a data serialization format designed for human readability and @@ -52,6 +52,9 @@ %changelog +* Tue Mar 3 2009 John Eckersberg - 3.08-4 +- Correction, change libyaml to libyaml-devel in BuildRequires + * Mon Mar 2 2009 John Eckersberg - 3.08-3 - Add libyaml to BuildRequires From s4504kr at fedoraproject.org Tue Mar 3 18:15:55 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Tue, 3 Mar 2009 18:15:55 +0000 (UTC) Subject: rpms/kaya/devel kaya-0.5.1-ghc.patch,NONE,1.1 kaya.spec,1.4,1.5 Message-ID: <20090303181555.D929C70116@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/kaya/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23675 Modified Files: kaya.spec Added Files: kaya-0.5.1-ghc.patch Log Message: Fix ghc-6.10 relelated issues kaya-0.5.1-ghc.patch: --- NEW FILE kaya-0.5.1-ghc.patch --- diff -up kaya-0.5.1/compiler/REPL.hs.ghc kaya-0.5.1/compiler/REPL.hs --- kaya-0.5.1/compiler/REPL.hs.ghc 2009-03-03 19:01:07.000000000 +0100 +++ kaya-0.5.1/compiler/REPL.hs 2009-03-03 19:01:45.000000000 +0100 @@ -32,7 +32,7 @@ import List import CForeign import Ptr import IO -import System.Console.Readline +import System.Console.Editline.Readline import System.Directory foreign import ccall "repl_load.h" interp_load :: Ptr CChar -> IO () Index: kaya.spec =================================================================== RCS file: /cvs/extras/rpms/kaya/devel/kaya.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kaya.spec 25 Feb 2009 10:15:09 -0000 1.4 +++ kaya.spec 3 Mar 2009 18:15:25 -0000 1.5 @@ -4,7 +4,7 @@ Name: kaya Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Statically typed, imperative programming-language Group: Development/Languages @@ -13,6 +13,7 @@ Source0: http://kayalang.org/src/%{name}-%{version}.tgz Patch1: kaya-0.5.1-tst.patch Patch2: kaya-0.5.0-conf.patch +Patch3: kaya-0.5.1-ghc.patch # # ghc is not supported on alpha and ppc64 @@ -22,11 +23,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf -BuildRequires: ghc, gc-devel, happy, zlib-devel, gnutls-devel +BuildRequires: ghc >= 6.10.0, gc-devel, happy, zlib-devel, gnutls-devel BuildRequires: libgcrypt-devel, pcre-devel BuildRequires: postgresql-devel, mysql-devel, sqlite-devel BuildRequires: gd-devel, SDL-devel, mesa-libGL-devel BuildRequires: ncurses-devel, freeglut-devel +BuildRequires: libtool %description Kaya is a compiled statically typed (ie, types are checked at compile time) @@ -52,6 +54,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build autoconf @@ -95,7 +98,10 @@ %doc examples/ docs/ %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 0.5.1-2 +* Tue Mar 3 2009 Jochen Schmitt 0.5.1-3 +- Fix ghc-6.10 releated issues + +* Wed Feb 25 2009 Fedora Release Engineering 0.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Mon Aug 4 2008 Jochen Schmitt 0.5.1-1 From agk at fedoraproject.org Tue Mar 3 18:16:10 2009 From: agk at fedoraproject.org (Alasdair Kergon) Date: Tue, 3 Mar 2009 18:16:10 +0000 (UTC) Subject: rpms/lvm2/devel LVM2.2.02.45.tgz.asc, NONE, 1.1 .cvsignore, 1.64, 1.65 lvm2.spec, 1.153, 1.154 sources, 1.68, 1.69 upstream, 1.57, 1.58 LVM2.2.02.44.tgz.asc, 1.1, NONE Message-ID: <20090303181610.9E47E70116@cvs1.fedora.phx.redhat.com> Author: agk Update of /cvs/pkgs/rpms/lvm2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23656 Modified Files: .cvsignore lvm2.spec sources upstream Added Files: LVM2.2.02.45.tgz.asc Removed Files: LVM2.2.02.44.tgz.asc Log Message: new upstream release and switch cluster code to use corosync... --- NEW FILE LVM2.2.02.45.tgz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQBJrV5+IoGRwVZ+LBcRAjEfAJ0W6QcbtMX5O/H6nHAQ68NzO2ThmgCgsqNY MKXx9CYw4vQ2tpGtCrF7zzo= =U8vL -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lvm2/devel/.cvsignore,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- .cvsignore 27 Jan 2009 21:15:40 -0000 1.64 +++ .cvsignore 3 Mar 2009 18:15:39 -0000 1.65 @@ -1 +1 @@ -LVM2.2.02.44.tgz +LVM2.2.02.45.tgz Index: lvm2.spec =================================================================== RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- lvm2.spec 25 Feb 2009 22:14:53 -0000 1.153 +++ lvm2.spec 3 Mar 2009 18:15:40 -0000 1.154 @@ -1,12 +1,14 @@ -%define device_mapper_version 1.02.30 +%define device_mapper_version 1.02.31 +%define corosync_version 0.94-1 +%define clusterlib_version 3.0.0-12.alpha6 # Do not reset Release to 1 unless both lvm2 and device-mapper # versions are increased together. Summary: Userland logical volume management tools Name: lvm2 -Version: 2.02.44 -Release: 2%{?dist} +Version: 2.02.45 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Base URL: http://sources.redhat.com/lvm2 @@ -19,8 +21,10 @@ BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel BuildRequires: ncurses-devel BuildRequires: readline-devel -BuildRequires: cman-devel >= 2.99.10-4 cmanlib-devel >= 2.99.10-4 +BuildRequires: corosynclib-devel >= %{corosync_version} +BuildRequires: clusterlib-devel >= %{clusterlib_version} BuildRequires: module-init-tools +BuildRequires: pkgconfig Requires: device-mapper >= %{device_mapper_version}-%{release} Requires: module-init-tools Conflicts: lvm @@ -44,7 +48,7 @@ %define _sbindir /sbin %define _libdir /%{_lib} -%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-dmdir=device-mapper.%{device_mapper_version} --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig +%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-dmdir=device-mapper.%{device_mapper_version} --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig make DESTDIR=$RPM_BUILD_ROOT %install @@ -174,6 +178,8 @@ Requires(preun): chkconfig Requires(preun): device-mapper >= %{device_mapper_version} Requires(preun): lvm2 >= 2.02 +Requires: corosync >= %{corosync_version} +Requires: clusterlib >= %{clusterlib_version} %description cluster Extensions to LVM2 to support clusters. @@ -226,6 +232,7 @@ Group: Development/Libraries Requires: device-mapper = %{device_mapper_version}-%{release} Requires: device-mapper-libs = %{device_mapper_version}-%{release} +Requires: pkgconfig %description -n device-mapper-devel This package contains files needed to develop applications that use @@ -257,6 +264,32 @@ %changelog +* Tue Mar 3 2009 Alasdair Kergon - 2.02.45-1 +- Update clusterlib and corosync dependencies. +- Attempt proper clean up in child before executing fsadm or modprobe. +- Do not scan devices if reporting only attributes from PV label. +- Use pkgconfig to obtain corosync library details during configuration. +- Fix error returns in clvmd-corosync interface to DLM. +- Add --refresh to vgchange and vgmknodes man pages. +- Pass --test from lvresize to fsadm as --dry-run. +- Prevent fsadm from checking mounted filesystems. +- No longer treats any other key as 'no' when prompting in fsadm. +- Add --dataalignment to pvcreate to specify alignment of data area. +- Fix unblocking of interrupts after several commands. +- Provide da and mda locations in debug message when writing text format label. +- Mention the restriction on file descriptors at invocation on the lvm man page. +- Index cached vgmetadata by vgid not vgname to cope with duplicate vgnames. +- No longer require kernel and metadata major numbers to match. +- If kernel supports only one dm major number, use in place of any supplied. +- Add option to /etc/sysconfig/cluster to select cluster type for clvmd. +- Allow clvmd to start up if its lockspace already exists. +- Separate PV label attributes which do not need parse metadata when reporting. +- Remove external dependency on the 'cut' command from fsadm. +- Fix pvs segfault when pv mda attributes requested for unavailable PV. +- Add fsadm support for reszing ext4 filesysystems. +- Change lvm2-cluster to corosync instead of cman. +- Fix some old changelog typos in email addresses. + * Wed Feb 25 2009 Fedora Release Engineering - 2.02.44-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -285,7 +318,7 @@ - Add "all" field to reports expanding to all fields of report type. - Enforce device name length and character limitations in libdm. -* Mon Nov 10 2008 Alasdair Kergon > - 2.02.43-1 +* Mon Nov 10 2008 Alasdair Kergon - 2.02.43-1 - Upstream merge of device-mapper and lvm2 source. - Correct prototype for --permission on lvchange and lvcreate man pages. - Exit with non-zero status from vgdisplay if couldn't show any requested VG. @@ -325,7 +358,7 @@ - libdevmapper: Extend deptree buffers so the largest possible device numbers fit. - libdevmapper: Underline longer report help text headings. -* Tue Oct 7 2008 Alasdair Kergon > - 2.02.39-6 +* Tue Oct 7 2008 Alasdair Kergon - 2.02.39-6 - Only set exec_prefix once and configure explicit directories to work with new version of rpm. @@ -344,7 +377,7 @@ * Thu Aug 7 2008 Tom "spot" Callaway - 2.02.39-4 - Fix license tag. -* Fri Jun 27 2008 Alasdair Kergon > - 2.02.39-3 +* Fri Jun 27 2008 Alasdair Kergon - 2.02.39-3 - Fix up cache for PVs without mdas after consistent VG metadata is processed. - Update validation of safe mirror log type conversions in lvconvert. - Fix lvconvert to disallow snapshot and mirror combinations. @@ -357,11 +390,11 @@ - Add --force to lvextend and lvresize. - Fix vgchange to not activate component mirror volumes directly. -* Wed Jun 25 2008 Alasdair Kergon > - 2.02.38-2 +* Wed Jun 25 2008 Alasdair Kergon - 2.02.38-2 - dmsetup: Add --unquoted and --rows to 'info -c' command. - libdevmapper: Fix inverted no_flush debug message. -* Fri Jun 13 2008 Alasdair Kergon > - 2.02.38-1 +* Fri Jun 13 2008 Alasdair Kergon - 2.02.38-1 - libdevmapper: Make dm_hash_iter safe against deletion. - libdevmapper: Accept a NULL pointer to dm_free silently. - libdevmapper: Calculate string size within dm_pool_grow_object. @@ -455,21 +488,21 @@ * Wed Mar 5 2008 Jeremy Katz - 2.02.33-10 - recognize vio disks -* Thu Jan 31 2008 Alasdair Kergon > - 2.02.33-9 +* Thu Jan 31 2008 Alasdair Kergon - 2.02.33-9 - Improve internal label caching performance while locks are held. - Fix mirror log name construction during lvconvert. -* Tue Jan 29 2008 Alasdair Kergon > - 2.02.32-8 +* Tue Jan 29 2008 Alasdair Kergon - 2.02.32-8 - Fix pvs, vgs, lvs error exit status on some error paths. - Fix new parameter validation in vgsplit and test mode. - Fix internal metadata corruption in lvchange --resync. -* Sat Jan 19 2008 Alasdair Kergon > - 2.02.31-7 +* Sat Jan 19 2008 Alasdair Kergon - 2.02.31-7 - Avoid readahead error message when using default setting of lvcreate -M1. - Fix lvcreate --nosync not to wait for non-happening sync. - Add very_verbose lvconvert messages. -* Thu Jan 17 2008 Alasdair Kergon > - 2.02.30-6 +* Thu Jan 17 2008 Alasdair Kergon - 2.02.30-6 - Remove static libraries and binaries and move most binaries out of /usr. - Fix a segfault if using pvs with --all argument. - Fix vgreduce PV list processing not to process every PV in the VG. @@ -490,10 +523,10 @@ - Update --uuid argument description in man pages. - Print warning when lvm tools are running as non-root. -* Thu Dec 20 2007 Alasdair Kergon > - 2.02.29-5 +* Thu Dec 20 2007 Alasdair Kergon - 2.02.29-5 - Fix libdevmapper readahead processing with snapshots (for example). -* Thu Dec 13 2007 Alasdair Kergon > - 2.02.29-4 +* Thu Dec 13 2007 Alasdair Kergon - 2.02.29-4 - Add missing lvm2 build & runtime dependencies on module-init-tools (modprobe). * Thu Dec 6 2007 Jeremy Katz - 2.02.29-3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lvm2/devel/sources,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- sources 27 Jan 2009 21:15:40 -0000 1.68 +++ sources 3 Mar 2009 18:15:40 -0000 1.69 @@ -1 +1 @@ -4ed7b99903a6fc5165b7b0b8def42486 LVM2.2.02.44.tgz +440daa01b8f2ec4fe97b1cc621108220 LVM2.2.02.45.tgz Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/lvm2/devel/upstream,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- upstream 27 Jan 2009 21:15:40 -0000 1.57 +++ upstream 3 Mar 2009 18:15:40 -0000 1.58 @@ -1 +1 @@ -LVM2.2.02.44.tgz +LVM2.2.02.45.tgz --- LVM2.2.02.44.tgz.asc DELETED --- From kyle at fedoraproject.org Tue Mar 3 18:19:13 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Tue, 3 Mar 2009 18:19:13 +0000 (UTC) Subject: rpms/kernel/devel git-bluetooth.patch, NONE, 1.1 kernel.spec, 1.1367, 1.1368 Message-ID: <20090303181913.E76FF70117@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24584 Modified Files: kernel.spec Added Files: git-bluetooth.patch Log Message: * Tue Mar 03 2009 Kyle McMartin - Add bluetooth-testing git tree. Mostly bugfixes... git-bluetooth.patch: --- NEW FILE git-bluetooth.patch --- commit f71c4ff1ff024b49e4b3f6a1d0f7c810b69d2cc8 Author: Wei Yongjun Date: Wed Feb 25 15:38:13 2009 +0100 Bluetooth: Remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: Marcel Holtmann commit de90fec13347388b5944be2fad7d58adc3c5cb2f Author: Wei Yongjun Date: Wed Feb 25 15:38:12 2009 +0100 Bluetooth: Remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: Marcel Holtmann commit 7e0e532d609f65b69f5af83e66b7fdb8ed420a7a Author: Dave Young Date: Wed Feb 25 15:38:12 2009 +0100 Bluetooth: Move hci_conn_del_sysfs() back to avoid device destruct too early The following commit introduce a regression: commit 7d0db0a373195385a2e0b19d1f5e4b186fdcffac Author: Marcel Holtmann Date: Mon Jul 14 20:13:51 2008 +0200 [Bluetooth] Use a more unique bus name for connections I get panic as following (by netconsole): [ 2709.344034] usb 5-1: new full speed USB device using uhci_hcd and address 4 [ 2709.505776] usb 5-1: configuration #1 chosen from 1 choice [ 2709.569207] Bluetooth: Generic Bluetooth USB driver ver 0.4 [ 2709.570169] usbcore: registered new interface driver btusb [ 2845.742781] BUG: unable to handle kernel paging request at 6b6b6c2f [ 2845.742958] IP: [] __lock_acquire+0x6c/0xa80 [ 2845.743087] *pde = 00000000 [ 2845.743206] Oops: 0002 [#1] SMP [ 2845.743377] last sysfs file: /sys/class/bluetooth/hci0/hci0:6/type [ 2845.743742] Modules linked in: btusb netconsole snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss rfcomm l2cap bluetooth vfat fuse snd_hda_codec_idt snd_hda_intel snd_hda_codec snd_hwdep snd_pcm pl2303 snd_timer psmouse usbserial snd 3c59x e100 serio_raw soundcore i2c_i801 intel_agp mii agpgart snd_page_alloc rtc_cmos rtc_core thermal processor rtc_lib button thermal_sys sg evdev [ 2845.743742] [ 2845.743742] Pid: 0, comm: swapper Not tainted (2.6.29-rc5-smp #54) Dell DM051 [ 2845.743742] EIP: 0060:[] EFLAGS: 00010002 CPU: 0 [ 2845.743742] EIP is at __lock_acquire+0x6c/0xa80 [ 2845.743742] EAX: 00000046 EBX: 00000046 ECX: 6b6b6b6b EDX: 00000002 [ 2845.743742] ESI: 6b6b6b6b EDI: 00000000 EBP: c064fd14 ESP: c064fcc8 [ 2845.743742] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 [ 2845.743742] Process swapper (pid: 0, ti=c064e000 task=c05d1400 task.ti=c064e000) [ 2845.743742] Stack: [ 2845.743742] c05d1400 00000002 c05d1400 00000001 00000002 00000000 f65388dc c05d1400 [ 2845.743742] 6b6b6b6b 00000292 c064fd0c c0153732 00000000 00000000 00000001 f700fa50 [ 2845.743742] 00000046 00000000 00000000 c064fd40 c0155be6 00000000 00000002 00000001 [ 2845.743742] Call Trace: [ 2845.743742] [] ? trace_hardirqs_on_caller+0x72/0x1c0 [ 2845.743742] [] ? lock_acquire+0x76/0xa0 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] ? _spin_lock_irqsave+0x45/0x80 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] ? skb_queue_purge+0x14/0x20 [ 2845.743742] [] ? hci_conn_del+0x10a/0x1c0 [bluetooth] [ 2845.743742] [] ? l2cap_disconn_ind+0x59/0xb0 [l2cap] [ 2845.743742] [] ? hci_conn_del_sysfs+0x8e/0xd0 [bluetooth] [ 2845.743742] [] ? hci_event_packet+0x5f8/0x31c0 [bluetooth] [ 2845.743742] [] ? sock_def_readable+0x59/0x80 [ 2845.743742] [] ? _read_unlock+0x1d/0x20 [ 2845.743742] [] ? hci_send_to_sock+0xe9/0x1d0 [bluetooth] [ 2845.743742] [] ? trace_hardirqs_on+0xb/0x10 [ 2845.743742] [] ? hci_rx_task+0x2ba/0x490 [bluetooth] [ 2845.743742] [] ? tasklet_action+0x31/0xc0 [ 2845.743742] [] ? tasklet_action+0x4c/0xc0 [ 2845.743742] [] ? __do_softirq+0xa7/0x170 [ 2845.743742] [] ? ack_apic_level+0x5c/0x1c0 [ 2845.743742] [] ? do_softirq+0x57/0x60 [ 2845.743742] [] ? irq_exit+0x7c/0x90 [ 2845.743742] [] ? do_IRQ+0x4b/0x90 [ 2845.743742] [] ? irq_exit+0x75/0x90 [ 2845.743742] [] ? common_interrupt+0x2c/0x34 [ 2845.743742] [] ? mwait_idle+0x4f/0x70 [ 2845.743742] [] ? cpu_idle+0x65/0xb0 [ 2845.743742] [] ? rest_init+0x4e/0x60 [ 2845.743742] Code: 0f 84 69 02 00 00 83 ff 07 0f 87 1e 06 00 00 85 ff 0f 85 08 05 00 00 8b 4d cc 8b 49 04 85 c9 89 4d d4 0f 84 f7 04 00 00 8b 75 d4 ff 86 c4 00 00 00 89 f0 e8 56 a9 ff ff 85 c0 0f 85 6e 03 00 [ 2845.743742] EIP: [] __lock_acquire+0x6c/0xa80 SS:ESP 0068:c064fcc8 [ 2845.743742] ---[ end trace 4c985b38f022279f ]--- [ 2845.743742] Kernel panic - not syncing: Fatal exception in interrupt [ 2845.743742] ------------[ cut here ]------------ [ 2845.743742] WARNING: at kernel/smp.c:329 smp_call_function_many+0x151/0x200() [ 2845.743742] Hardware name: Dell DM051 [ 2845.743742] Modules linked in: btusb netconsole snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss rfcomm l2cap bluetooth vfat fuse snd_hda_codec_idt snd_hda_intel snd_hda_codec snd_hwdep snd_pcm pl2303 snd_timer psmouse usbserial snd 3c59x e100 serio_raw soundcore i2c_i801 intel_agp mii agpgart snd_page_alloc rtc_cmos rtc_core thermal processor rtc_lib button thermal_sys sg evdev [ 2845.743742] Pid: 0, comm: swapper Tainted: G D 2.6.29-rc5-smp #54 [ 2845.743742] Call Trace: [ 2845.743742] [] warn_slowpath+0x86/0xa0 [ 2845.743742] [] ? trace_hardirqs_off+0xb/0x10 [ 2845.743742] [] ? up+0x14/0x40 [ 2845.743742] [] ? release_console_sem+0x31/0x1e0 [ 2845.743742] [] ? _spin_lock_irqsave+0x6b/0x80 [ 2845.743742] [] ? trace_hardirqs_off+0xb/0x10 [ 2845.743742] [] ? _read_lock_irqsave+0x40/0x80 [ 2845.743742] [] ? release_console_sem+0x1c2/0x1e0 [ 2845.743742] [] ? up+0x14/0x40 [ 2845.743742] [] ? trace_hardirqs_off+0xb/0x10 [ 2845.743742] [] ? __mutex_unlock_slowpath+0x97/0x160 [ 2845.743742] [] ? mutex_trylock+0xb3/0x180 [ 2845.743742] [] ? mutex_unlock+0x8/0x10 [ 2845.743742] [] smp_call_function_many+0x151/0x200 [ 2845.743742] [] ? stop_this_cpu+0x0/0x40 [ 2845.743742] [] smp_call_function+0x21/0x30 [ 2845.743742] [] native_smp_send_stop+0x1e/0x50 [ 2845.743742] [] panic+0x55/0x110 [ 2845.743742] [] oops_end+0xb8/0xc0 [ 2845.743742] [] die+0x4f/0x70 [ 2845.743742] [] do_page_fault+0x269/0x610 [ 2845.743742] [] ? do_page_fault+0x0/0x610 [ 2845.743742] [] error_code+0x77/0x7c [ 2845.743742] [] ? __lock_acquire+0x6c/0xa80 [ 2845.743742] [] ? trace_hardirqs_on_caller+0x72/0x1c0 [ 2845.743742] [] lock_acquire+0x76/0xa0 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] _spin_lock_irqsave+0x45/0x80 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] skb_dequeue+0x1d/0x70 [ 2845.743742] [] skb_queue_purge+0x14/0x20 [ 2845.743742] [] hci_conn_del+0x10a/0x1c0 [bluetooth] [ 2845.743742] [] ? l2cap_disconn_ind+0x59/0xb0 [l2cap] [ 2845.743742] [] ? hci_conn_del_sysfs+0x8e/0xd0 [bluetooth] [ 2845.743742] [] hci_event_packet+0x5f8/0x31c0 [bluetooth] [ 2845.743742] [] ? sock_def_readable+0x59/0x80 [ 2845.743742] [] ? _read_unlock+0x1d/0x20 [ 2845.743742] [] ? hci_send_to_sock+0xe9/0x1d0 [bluetooth] [ 2845.743742] [] ? trace_hardirqs_on+0xb/0x10 [ 2845.743742] [] hci_rx_task+0x2ba/0x490 [bluetooth] [ 2845.743742] [] ? tasklet_action+0x31/0xc0 [ 2845.743742] [] tasklet_action+0x4c/0xc0 [ 2845.743742] [] __do_softirq+0xa7/0x170 [ 2845.743742] [] ? ack_apic_level+0x5c/0x1c0 [ 2845.743742] [] do_softirq+0x57/0x60 [ 2845.743742] [] irq_exit+0x7c/0x90 [ 2845.743742] [] do_IRQ+0x4b/0x90 [ 2845.743742] [] ? irq_exit+0x75/0x90 [ 2845.743742] [] common_interrupt+0x2c/0x34 [ 2845.743742] [] ? mwait_idle+0x4f/0x70 [ 2845.743742] [] cpu_idle+0x65/0xb0 [ 2845.743742] [] rest_init+0x4e/0x60 [ 2845.743742] ---[ end trace 4c985b38f02227a0 ]--- [ 2845.743742] ------------[ cut here ]------------ [ 2845.743742] WARNING: at kernel/smp.c:226 smp_call_function_single+0x8e/0x110() [ 2845.743742] Hardware name: Dell DM051 [ 2845.743742] Modules linked in: btusb netconsole snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss rfcomm l2cap bluetooth vfat fuse snd_hda_codec_idt snd_hda_intel snd_hda_codec snd_hwdep snd_pcm pl2303 snd_timer psmouse usbserial snd 3c59x e100 serio_raw soundcore i2c_i801 intel_agp mii agpgart snd_page_alloc rtc_cmos rtc_core thermal processor rtc_lib button thermal_sys sg evdev [ 2845.743742] Pid: 0, comm: swapper Tainted: G D W 2.6.29-rc5-smp #54 [ 2845.743742] Call Trace: [ 2845.743742] [] warn_slowpath+0x86/0xa0 [ 2845.743742] [] ? warn_slowpath+0x10/0xa0 [ 2845.743742] [] ? trace_hardirqs_off+0xb/0x10 [ 2845.743742] [] ? up+0x14/0x40 [ 2845.743742] [] ? release_console_sem+0x31/0x1e0 [ 2845.743742] [] ? _spin_lock_irqsave+0x6b/0x80 [ 2845.743742] [] ? trace_hardirqs_off+0xb/0x10 [ 2845.743742] [] ? _read_lock_irqsave+0x40/0x80 [ 2845.743742] [] ? release_console_sem+0x1c2/0x1e0 [ 2845.743742] [] ? up+0x14/0x40 [ 2845.743742] [] smp_call_function_single+0x8e/0x110 [ 2845.743742] [] ? stop_this_cpu+0x0/0x40 [ 2845.743742] [] ? cpumask_next_and+0x1f/0x40 [ 2845.743742] [] smp_call_function_many+0x11a/0x200 [ 2845.743742] [] ? stop_this_cpu+0x0/0x40 [ 2845.743742] [] smp_call_function+0x21/0x30 [ 2845.743742] [] native_smp_send_stop+0x1e/0x50 [ 2845.743742] [] panic+0x55/0x110 [ 2845.743742] [] oops_end+0xb8/0xc0 [ 2845.743742] [] die+0x4f/0x70 [ 2845.743742] [] do_page_fault+0x269/0x610 [ 2845.743742] [] ? do_page_fault+0x0/0x610 [ 2845.743742] [] error_code+0x77/0x7c [ 2845.743742] [] ? __lock_acquire+0x6c/0xa80 [ 2845.743742] [] ? trace_hardirqs_on_caller+0x72/0x1c0 [ 2845.743742] [] lock_acquire+0x76/0xa0 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] _spin_lock_irqsave+0x45/0x80 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] skb_dequeue+0x1d/0x70 [ 2845.743742] [] skb_queue_purge+0x14/0x20 [ 2845.743742] [] hci_conn_del+0x10a/0x1c0 [bluetooth] [ 2845.743742] [] ? l2cap_disconn_ind+0x59/0xb0 [l2cap] [ 2845.743742] [] ? hci_conn_del_sysfs+0x8e/0xd0 [bluetooth] [ 2845.743742] [] hci_event_packet+0x5f8/0x31c0 [bluetooth] [ 2845.743742] [] ? sock_def_readable+0x59/0x80 [ 2845.743742] [] ? _read_unlock+0x1d/0x20 [ 2845.743742] [] ? hci_send_to_sock+0xe9/0x1d0 [bluetooth] [ 2845.743742] [] ? trace_hardirqs_on+0xb/0x10 [ 2845.743742] [] hci_rx_task+0x2ba/0x490 [bluetooth] [ 2845.743742] [] ? tasklet_action+0x31/0xc0 [...2939 lines suppressed...] + case BT_SECURITY_HIGH: + opt = RFCOMM_LM_AUTH | RFCOMM_LM_ENCRYPT | + RFCOMM_LM_SECURE; + break; + default: + opt = 0; + break; + } + + if (rfcomm_pi(sk)->role_switch) + opt |= RFCOMM_LM_MASTER; + + if (put_user(opt, (u32 __user *) optval)) err = -EFAULT; break; case RFCOMM_CONNINFO: - if (sk->sk_state != BT_CONNECTED) { + if (sk->sk_state != BT_CONNECTED && + !rfcomm_pi(sk)->dlc->defer_setup) { err = -ENOTCONN; break; } @@ -785,6 +896,60 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c return err; } +static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen) +{ + struct sock *sk = sock->sk; + struct bt_security sec; + int len, err = 0; + + BT_DBG("sk %p", sk); + + if (level == SOL_RFCOMM) + return rfcomm_sock_getsockopt_old(sock, optname, optval, optlen); + + if (level != SOL_BLUETOOTH) + return -ENOPROTOOPT; + + if (get_user(len, optlen)) + return -EFAULT; + + lock_sock(sk); + + switch (optname) { + case BT_SECURITY: + if (sk->sk_type != SOCK_STREAM) { + err = -EINVAL; + break; + } + + sec.level = rfcomm_pi(sk)->sec_level; + + len = min_t(unsigned int, len, sizeof(sec)); + if (copy_to_user(optval, (char *) &sec, len)) + err = -EFAULT; + + break; + + case BT_DEFER_SETUP: + if (sk->sk_state != BT_BOUND && sk->sk_state != BT_LISTEN) { + err = -EINVAL; + break; + } + + if (put_user(bt_sk(sk)->defer_setup, (u32 __user *) optval)) + err = -EFAULT; + + break; + + default: + err = -ENOPROTOOPT; + break; + } + + release_sock(sk); + return err; +} + static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) { struct sock *sk __maybe_unused = sock->sk; @@ -888,6 +1053,10 @@ int rfcomm_connect_ind(struct rfcomm_session *s, u8 channel, struct rfcomm_dlc * done: bh_unlock_sock(parent); + + if (bt_sk(parent)->defer_setup) + parent->sk_state_change(parent); + return result; } diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 46fd8bf..51ae0c3 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -195,7 +195,7 @@ static int sco_connect(struct sock *sk) else type = SCO_LINK; - hcon = hci_connect(hdev, type, dst, HCI_AT_NO_BONDING); + hcon = hci_connect(hdev, type, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING); if (!hcon) goto done; @@ -668,7 +668,7 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, char return err; } -static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen) +static int sco_sock_getsockopt_old(struct socket *sock, int optname, char __user *optval, int __user *optlen) { struct sock *sk = sock->sk; struct sco_options opts; @@ -723,6 +723,31 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char return err; } +static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen) +{ + struct sock *sk = sock->sk; + int len, err = 0; + + BT_DBG("sk %p", sk); + + if (level == SOL_SCO) + return sco_sock_getsockopt_old(sock, optname, optval, optlen); + + if (get_user(len, optlen)) + return -EFAULT; + + lock_sock(sk); + + switch (optname) { + default: + err = -ENOPROTOOPT; + break; + } + + release_sock(sk); + return err; +} + static int sco_sock_release(struct socket *sock) { struct sock *sk = sock->sk; @@ -832,10 +857,30 @@ done: /* ----- SCO interface with lower layer (HCI) ----- */ static int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 type) { + register struct sock *sk; + struct hlist_node *node; + int lm = 0; + + if (type != SCO_LINK && type != ESCO_LINK) + return 0; + BT_DBG("hdev %s, bdaddr %s", hdev->name, batostr(bdaddr)); - /* Always accept connection */ - return HCI_LM_ACCEPT; + /* Find listening sockets */ + read_lock(&sco_sk_list.lock); + sk_for_each(sk, node, &sco_sk_list.head) { + if (sk->sk_state != BT_LISTEN) + continue; + + if (!bacmp(&bt_sk(sk)->src, &hdev->bdaddr) || + !bacmp(&bt_sk(sk)->src, BDADDR_ANY)) { + lm |= HCI_LM_ACCEPT; + break; + } + } + read_unlock(&sco_sk_list.lock); + + return lm; } static int sco_connect_cfm(struct hci_conn *hcon, __u8 status) @@ -857,7 +902,7 @@ static int sco_connect_cfm(struct hci_conn *hcon, __u8 status) return 0; } -static int sco_disconn_ind(struct hci_conn *hcon, __u8 reason) +static int sco_disconn_cfm(struct hci_conn *hcon, __u8 reason) { BT_DBG("hcon %p reason %d", hcon, reason); @@ -940,7 +985,7 @@ static struct hci_proto sco_hci_proto = { .id = HCI_PROTO_SCO, .connect_ind = sco_connect_ind, .connect_cfm = sco_connect_cfm, - .disconn_ind = sco_disconn_ind, + .disconn_cfm = sco_disconn_cfm, .recv_scodata = sco_recv_scodata }; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1367 retrieving revision 1.1368 diff -u -r1.1367 -r1.1368 --- kernel.spec 3 Mar 2009 11:54:54 -0000 1.1367 +++ kernel.spec 3 Mar 2009 18:18:42 -0000 1.1368 @@ -588,6 +588,7 @@ Patch09: linux-2.6-upstream-reverts.patch # Git trees. Patch10: git-cpufreq.patch +Patch11: git-bluetooth.patch # Standalone patches Patch20: linux-2.6-hotfixes.patch @@ -1038,6 +1039,7 @@ fi #ApplyPatch git-cpufreq.patch +ApplyPatch git-bluetooth.patch ApplyPatch linux-2.6-hotfixes.patch @@ -1785,6 +1787,9 @@ # and build. %changelog +* Tue Mar 03 2009 Kyle McMartin +- Add bluetooth-testing git tree. Mostly bugfixes... + * Tue Mar 03 2009 Dave Airlie - pull patch from Linus to fix build From jeckersb at fedoraproject.org Tue Mar 3 18:21:33 2009 From: jeckersb at fedoraproject.org (John Eckersberg) Date: Tue, 3 Mar 2009 18:21:33 +0000 (UTC) Subject: rpms/libyaml/devel libyaml.spec,1.1,1.2 Message-ID: <20090303182133.C865370116@cvs1.fedora.phx.redhat.com> Author: jeckersb Update of /cvs/pkgs/rpms/libyaml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25573 Modified Files: libyaml.spec Log Message: do not include static libraries in RPMs Index: libyaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/libyaml/devel/libyaml.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libyaml.spec 3 Mar 2009 00:37:51 -0000 1.1 +++ libyaml.spec 3 Mar 2009 18:21:03 -0000 1.2 @@ -1,6 +1,6 @@ Name: libyaml Version: 0.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: Development/Libraries @@ -38,7 +38,7 @@ %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL="install -p" install -rm -f %{buildroot}%{_libdir}/*.la +rm -f %{buildroot}%{_libdir}/*.{la,a} %clean rm -rf %{buildroot} @@ -60,11 +60,13 @@ %defattr(-,root,root,-) %doc doc/html %{_libdir}/%{name}*.so -%{_libdir}/*a %{_includedir}/yaml.h %changelog +* Tue Mar 3 2009 John Eckersberg - 0.1.2-3 +- Remove static libraries + * Thu Feb 26 2009 John Eckersberg - 0.1.2-2 - Remove README and LICENSE from docs on -devel package - Remove -static package and merge contents into the -devel package From jeckersb at fedoraproject.org Tue Mar 3 18:28:48 2009 From: jeckersb at fedoraproject.org (John Eckersberg) Date: Tue, 3 Mar 2009 18:28:48 +0000 (UTC) Subject: rpms/libyaml/F-10 libyaml.spec,1.1,1.2 Message-ID: <20090303182848.8FCC570116@cvs1.fedora.phx.redhat.com> Author: jeckersb Update of /cvs/pkgs/rpms/libyaml/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26599 Modified Files: libyaml.spec Log Message: do not include static libraries in RPMs Index: libyaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/libyaml/F-10/libyaml.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libyaml.spec 3 Mar 2009 01:09:45 -0000 1.1 +++ libyaml.spec 3 Mar 2009 18:28:17 -0000 1.2 @@ -1,6 +1,6 @@ Name: libyaml Version: 0.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: Development/Libraries @@ -38,7 +38,7 @@ %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL="install -p" install -rm -f %{buildroot}%{_libdir}/*.la +rm -f %{buildroot}%{_libdir}/*.{la,a} %clean rm -rf %{buildroot} @@ -60,11 +60,13 @@ %defattr(-,root,root,-) %doc doc/html %{_libdir}/%{name}*.so -%{_libdir}/*a %{_includedir}/yaml.h %changelog +* Tue Mar 3 2009 John Eckersberg - 0.1.2-3 +- Remove static libraries + * Thu Feb 26 2009 John Eckersberg - 0.1.2-2 - Remove README and LICENSE from docs on -devel package - Remove -static package and merge contents into the -devel package From hedayat at fedoraproject.org Tue Mar 3 18:31:10 2009 From: hedayat at fedoraproject.org (Hedayat Vatankhah) Date: Tue, 3 Mar 2009 18:31:10 +0000 (UTC) Subject: rpms/rcssserver3d/devel rcssserver3d.spec,1.10,1.11 Message-ID: <20090303183110.8C4B470116@cvs1.fedora.phx.redhat.com> Author: hedayat Update of /cvs/pkgs/rpms/rcssserver3d/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27050 Modified Files: rcssserver3d.spec Log Message: Use the new name of dejavu font package Index: rcssserver3d.spec =================================================================== RCS file: /cvs/pkgs/rpms/rcssserver3d/devel/rcssserver3d.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rcssserver3d.spec 1 Mar 2009 18:38:30 -0000 1.10 +++ rcssserver3d.spec 3 Mar 2009 18:30:39 -0000 1.11 @@ -1,6 +1,6 @@ Name: rcssserver3d Version: 0.6 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Robocup 3D Soccer Simulation Server Group: Applications/System @@ -21,7 +21,7 @@ BuildRequires: automake autoconf gcc-c++ boost-devel slang-devel BuildRequires: ruby ruby-devel SDL-devel desktop-file-utils libtool BuildRequires: ode-devel libGL-devel DevIL-devel freetype-devel libGLU-devel -Requires: ruby ruby(abi) = 1.8 dejavu-fonts-sans-mono +Requires: ruby ruby(abi) = 1.8 dejavu-sans-mono-fonts %define linvendor fedora @@ -173,6 +173,9 @@ %endif %changelog +* Tue Mar 03 2009 Hedayat Vatankhah 0.6-11 +- Fixed the name of fonts package requirement to the new name + * Sun Mar 01 2009 Hedayat Vatankhah 0.6-10 - Added patch for gcc 4.4 compatibility From rvinyard at fedoraproject.org Tue Mar 3 18:34:26 2009 From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.) Date: Tue, 3 Mar 2009 18:34:26 +0000 (UTC) Subject: rpms/clips/F-10 DR0873.txt, NONE, 1.1 FunctionContext.zip, NONE, 1.1 objrtmch.c, NONE, 1.1 .cvsignore, 1.4, 1.5 clips.spec, 1.10, 1.11 sources, 1.6, 1.7 xclips.desktop, 1.1, 1.2 Message-ID: <20090303183426.B45CE70116@cvs1.fedora.phx.redhat.com> Author: rvinyard Update of /cvs/pkgs/rpms/clips/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27848 Modified Files: .cvsignore clips.spec sources xclips.desktop Added Files: DR0873.txt FunctionContext.zip objrtmch.c Log Message: --- NEW FILE DR0873.txt --- CLIPS DISCREPANCY REPORT DR # : 0873 DATE : 06/22/06 STATUS : OPEN REPORTED BY : CLIPS User ORGANIZATION : PHONE # : ADDRESS : CLIPS VERSION : CLIPS 6.24 HOST : All OS : All ******************** PROBLEM DESCRIPTION: ******************** Use of the object-pattern-match-delay function could cause a NULL pointer exception. ***************** COMMAND SEQUENCE: ***************** 1) Load this program: (defclass A (is-a USER) (slot x)) (defclass B (is-a USER) (slot y)) (definstances initialization (ob1 of A (x 1)) (ob2 of B (y 1))) (defrule one (object (is-a A) (x ~0)) (object (is-a B) (y ?val)) (test (> ?val 0)) =>) (defrule trigger => (object-pattern-match-delay (modify-instance [ob1] (x 2)) (make-instance [ob2] of B (y 2)))) 2) Issue a (reset) command followed by a (run) command. *********** RESOLUTION: *********** Modified the QueueObjectMatchAction function in objrtmch.c so that instance retract actions always occur before instance assert and modify actions. This prevents the pattern matching process from attempting the evaluation of a join expression that accesses the slots of a retracted instance. ******* STATUS: ******* FIXED BY : Gary Riley DATE : 06/22/06 IMPLEMENTED BY : Gary Riley IN VERSION : 6.25 DATE : DOCUMENTED BY : DATE : TESTED BY : DATE : APPROVED BY : DATE : --- NEW FILE FunctionContext.zip --- PK `????]???????A??g?x?t?x??CJN??S??9O? ?ga??G???n/?8???????'?2???????????????3?W??????:??.ys?;?:=???g'???xYjo, ?????t?0z at .?< c?? I?a<$1?????@? ? ?.dY?>?A????T? e??>??~P?%$?????4???pL?D??f?~2?? F?Y?&[1???;???4*\x??u?PIS??????1!?h%/?s?r?????u? T?????'-?????w??r? w?? ??a????P??Y|#V????? ??{????/p?%$??G??^?>?)?~?2F??j?Vu?v5:??N/?z?;????????^?g?|?9?v?>???o?g?????DB{co?X??`M?1g?:s?jimM?IS??^[???,??@k h??C%V?O??4;???g?????3??E??d???^\?????????&?b/m????]???I?\??1$??g ??q?pu?????O??r??k???DFIA??W?6? Y?????C??????????6??f???????&???m?]????? ????:d???b?!?????:??-??T?????:~???C????~?????T????j?????%?#?i?????'??=??B??gWU*Jg??O???$`?k???s???6q?[?4???H???)v*&?`??H0???????"????b[~????o?6I" ;F.?L-??=M3? ?8?M"???(Y??? ???I?:2Ii_$?Q??????cB?o/FL???C?w?;J???*???? ???.N?1i? ?14Kj??~?9 yn?O *?}$|M1J???????S?|s?G ?????O8?L?-?~??#???S?????????|??PN?????3???f???s????oY??49V??5???J???2????N??'?AN?? F??Ni??$w?????%)???U?Y?r_?NU??R?/Y!????'?;r5?Y???5????;H?1?qE??$???K?,??R^]??20M?r ?X???3|??H?G>??m???8*va1??? ?F?#??`?|<F????????a(Dg??xY???t>??#A????L0;j? XI?b????,8?i????????C#Fm?rZ}n? _?jr?tW?????5k?|j N???9w??cI??eu>a???? ??z???1??^O?ld?5??x??h?????L}?+?sf?x6;??C>?h ?CV`????????z?"+??iE F  G?? 2C????#??~?_??n ?R??{??J;M?? ;p?)x??????$?"W??$?e?5?w??f?k???_3?6J#?jm xM`??Xt?o??7R?? ????*? ?xA??)3P??Lv?K????????????+??m??v??}(P???S???????(E????c???$???????)?z?r^(?$%?Q6I?#1???? 3AB?9<???Y??[r????W?????a ????$??f?_???~.?????M??y?? ??^K??" ?`??R ???D{ ?????SYi?9??S????$,?l>6??Q6?L??L? ???j???P?F ? ,?.?R?*??C`?????LS??? "?d?Y?N?c?????`??01 Cm???[?|?/??jiMY???/?XO???X=2??? ????L??N??w?*g????#??????3?(???b????q??DM_ ????????L??Jo1Vy?|????Pk??2f6n,??-U?C?T???B??5?u??1Pq?g |??K?? ?????~??{?oWr-????xx5????(?p?S?c??A|x?FC?'?????\u{?k6 n?QJjn?MQ??H?=Mi?Z?>5???bB?Xl?Fi?E?]J??$Z?Kt??abC`&z??/??????q?:?0xc?em?{??o?47???????&???w?&?IS???v;?H????v4??g?w?~?d`5?&1????)v????E???H:?5?Rl{ m?z??4?????T??jTY#O_(5J??&?y??g?t??D;?G???:Jfo??'??????Tc??x? f??_?]?:!???????Dk?W?^%q?X {?{????q?JA9?30?????]c???I??????? ????nC0?Q?#n????B??j?????rK ??%`A?v `?r??-??flv?????m?W??`X5{??wo4?ZO%??i?Z??*}d-[k?>ny?????????)?Sn"?S:?-BQ???*??(n?9I?l???H5m?#?2??pAG??-%???_??j????Rt6u?$?i??}???? ??{Vh?? m? TA????E/8M?i?.???V?????0????:???????? ??Y??s?l?/????G2?I???I)i?+?\??Aef&Ho6?v???k????Rm?'?.?W??h?6? S??????kY#?q?:l??H??? Ig????nk\?8 a?P?c???o??CP?.R?b?!?ED)?t7K????$5????F?_:??!0????~???{c??Qk????`?]x??9??F8|??????,x??:?>?s??! ?K?'O?]D?R?+k)$???R? >Mu??4????????R?????j%????+h?Tl ????f?6?qy???????TA??hl???G Z?c?v? t????P?????g?e?A??` [? ?>?OyUx???5????G???W??^?K?*p?\??D^?2?M$U?k????V?Cy8= ??`?????`.?RT???z??>???\?s?vt?????OG4???l????!-gx?P]?^?u???S?S?J;????ES?;"????K?TkVi1? b1kZ ?5?f? N?T^?n?da,????????cK_M??k???4?/??? ?2/<0yb????ATug:???dW)7?myi?mY??"&?X?Rz at qb??`?C??_??????pZ??? ew?{?eL???[M;CW?n???6n^?h?g?H?+?? ?(wbl4?????? ???z???|???ML?&U??n???U?P???oL!&+l??W?B?v%1 3G3M(J?:??}????? n??\+x??B?q?X6?FE?S"V.8?????Yt???????it???[????zB6?B?? ?0????X?tY??s?V??6??r? ??tv'9k? Y?t?n?L??y?????E?q_j??C&???~I??U?a???}?{?K?Y?oq*j????"l??%H?I_[%o9??L??!????-?? ?(????3\_????q?A??L2???9?r`4? y??fs????.???????V???Y#*?%?? 0??X8??j?-_|?b%???vU[???????-???? ??????B\??~Z???s????????????g????K[u???V??[:???N)uo?????q????Zb?=V_|?I??AX-? ?~4??K+H?l??/??????c7??2?|?n`[PT???j??)???L??8?J?sFN?????GA ??M?y?$M=L????\N_m*qGr??nk???O?c?H$?,??eU?T????bj??????,?B???6v}Q?????P??a? jC%??z?XBq?? Fq?????n??C;??9}bS???????^`?m?@~_? ?$??o~??u{?xi? ?F3????*zYL???D\m?^qDx?????w??????db??????`t?????T?{??n???v??1??t(??wF?K??{b~?< ??9??F?G????=,?$?b>?:???N???f< ???W???yzx?????0B23?R)?????/'2??\?]???a1u??????W??????+ ??D)??DUx ?o?g??+2g??????????????:??????[ ?8?, (P????!?ZuR?'&-???/???F(?0???Zw??'??? :???n>???????%{bJ ?9??E?'??o?r? ??ML.???? ?4??:?????~?2?????Vdz0H??1=9? )@?$:{?YS??Pv?96?????ou?.i???&?I????(y'."a??u??Ke????mwZ??????~,Mk*?)??8??8???m6Ki)????*??p5?-??+??(?J)? ?????????t?B??kmH????Z?6:?jg?@]\o?G9vd??????"?7?G$*l|?Q ????T?!9?5z?????????}?~?6S?? d;{????#?(E $e[M??????x???????????B/:???LF?y:x?F^t??n1:?2|?x???$???,?#t?I3?d???[>??????K?')?????!t?????/_UN?igx???????b8?B?????drSj4?* 1??]???GY?c?7$??????,Xy! ??'??}Tw>}?y????4?f????l??T??i'???u??>B}????>FY? }?L#/? ???{!L?7?o????^??`???x??FK??9?@|? ??????"??y ?? ? ?-C?s??)1V?p??{/E???Rj ???%py??????Ue?C?mn'?;????t??x??#?????(??Q?^s?/??=?Q??????????e}/O?9? ?#t>?N?????xpu>????????x? ????G???4???&'??% `? $r????w? ??{/]`_1&-???JQ ?i++ : "m?u??D??8??V?F??i V?7???(?/ ~W?&???x???|?#pS5?c0*K B?E????????X??i????-?n?_??@?&E????a?e???z????%?a???c?/Av?????N????=??@4????I?????B????? :?!????K?`??z4??0????w1??gc?N?^????gi?)??|?A?+????g0?????4? ~9?r?T?? /\P?? ?G?7u??Sg?:?QS[?1???@jS?@????\C %3.?8a???J) G]???vK?#i+?: ?kw???=3??hEj???S??X???IO????m??????lf*?,??D??? 5??I ???>??;??]?0ra????+???z?u???$???????|?]@*?/?uhv???[????)Xh?=???(? $T?????!)j4)'?R??????Umoo???T??0?L??n?OI?s?uh /???%?5????@???.?S?g ??#???Yt??qj?????!?K??ms ?%???T????~V?J??YK????K??$o?+??(?N13`???p'????7????_?VD??ax{????J#M????PK ??DUx --- NEW FILE objrtmch.c --- /*******************************************************/ /* "C" Language Integrated Production System */ /* */ /* CLIPS Version 6.25 06/22/06 */ /* */ /* OBJECT PATTERN MATCHER MODULE */ /*******************************************************/ /**************************************************************/ /* Purpose: RETE Network Interface for Objects */ /* */ /* Principal Programmer(s): */ /* Brian L. Donnell */ /* */ /* Contributing Programmer(s): */ /* */ /* Revision History: */ /* 6.23: Correction for FalseSymbol/TrueSymbol. DR0859 */ /* */ /* 6.24: Removed INCREMENTAL_RESET and */ /* LOGICAL_DEPENDENCIES compilation flags. */ /* */ /* Converted INSTANCE_PATTERN_MATCHING to */ /* DEFRULE_CONSTRUCT. */ /* */ /* Renamed BOOLEAN macro type to intBool. */ /* */ /* 6.25: Modified the QueueObjectMatchAction function */ /* so that instance retract actions always occur */ /* before instance assert and modify actions. */ /* This prevents the pattern matching process */ /* from attempting the evaluation of a join */ /* expression that accesses the slots of a */ /* retracted instance. */ /* */ /**************************************************************/ /* ========================================= ***************************************** EXTERNAL DEFINITIONS ========================================= ***************************************** */ #include "setup.h" #if DEFRULE_CONSTRUCT && OBJECT_SYSTEM #include "classfun.h" #include "memalloc.h" #include "drive.h" #include "engine.h" #include "envrnmnt.h" #include "lgcldpnd.h" #include "multifld.h" #if (! RUN_TIME) && (! BLOAD_ONLY) #include "incrrset.h" #endif #include "reteutil.h" #include "ruledlt.h" #include "reorder.h" #include "retract.h" #include "router.h" #include "objrtfnx.h" #define _OBJRTMCH_SOURCE_ #include "objrtmch.h" #include "insmngr.h" /* ========================================= ***************************************** INTERNALLY VISIBLE FUNCTION HEADERS ========================================= ***************************************** */ static void QueueObjectMatchAction(void *,int,INSTANCE_TYPE *,int); static SLOT_BITMAP *QueueModifySlotMap(void *,SLOT_BITMAP *,int); static void ReturnObjectMatchAction(void *,OBJECT_MATCH_ACTION *); static void ProcessObjectMatchQueue(void *); static void MarkObjectPatternNetwork(void *,SLOT_BITMAP *); static intBool CompareSlotBitMaps(SLOT_BITMAP *,SLOT_BITMAP *); static void ObjectPatternMatch(void *,int,OBJECT_PATTERN_NODE *,struct multifieldMarker *); static void ProcessPatternNode(void *,int,OBJECT_PATTERN_NODE *,struct multifieldMarker *); static void CreateObjectAlphaMatch(void *,OBJECT_ALPHA_NODE *); static intBool EvaluateObjectPatternTest(void *,int,struct multifieldMarker *,EXPRESSION *, OBJECT_PATTERN_NODE *); static void ObjectAssertAction(void *,INSTANCE_TYPE *); static void ObjectModifyAction(void *,INSTANCE_TYPE *,SLOT_BITMAP *); static void ObjectRetractAction(void *,INSTANCE_TYPE *,SLOT_BITMAP *); static void ObjectPatternNetErrorMessage(void *,OBJECT_PATTERN_NODE *); static void TraceErrorToObjectPattern(void *,int,OBJECT_PATTERN_NODE *); /* ========================================= ***************************************** EXTERNALLY VISIBLE FUNCTIONS ========================================= ***************************************** */ /*************************************************************************** NAME : ObjectMatchDelay DESCRIPTION : H/L interface for SetDelayObjectPatternMatching INPUTS : None RETURNS : Nothing useful SIDE EFFECTS : DelayObjectPatternMatching set and Rete network updates delayed until pattern-matching is completed NOTES : H/L Syntax: (object-pattern-match-delay *) ***************************************************************************/ globle void ObjectMatchDelay( void *theEnv, DATA_OBJECT *result) { register int ov; ov = SetDelayObjectPatternMatching(theEnv,TRUE); EvaluateExpression(theEnv,GetFirstArgument(),result); if (EvaluationData(theEnv)->EvaluationError) { SetHaltExecution(theEnv,FALSE); SetEvaluationError(theEnv,FALSE); SetDelayObjectPatternMatching(theEnv,ov); SetEvaluationError(theEnv,TRUE); } else SetDelayObjectPatternMatching(theEnv,ov); } /*************************************************** NAME : SetDelayObjectPatternMatching DESCRIPTION : Sets the flag determining if Rete network activity is to be delayed for objects or not INPUTS : The value of the flag RETURNS : The old value of the flag SIDE EFFECTS : DelayObjectPatternMatching set NOTES : When the delay is set to FALSE, all pending Rete network updates are performed ***************************************************/ globle intBool SetDelayObjectPatternMatching( void *theEnv, int value) { intBool oldval; oldval = ObjectReteData(theEnv)->DelayObjectPatternMatching; if (value) ObjectReteData(theEnv)->DelayObjectPatternMatching = TRUE; else { ObjectReteData(theEnv)->DelayObjectPatternMatching = FALSE; ObjectNetworkAction(theEnv,0,NULL,-1); } return(oldval); } /*************************************************** NAME : GetDelayObjectPatternMatching DESCRIPTION : Gets the flag determining if Rete network activity is to be delayed for objects or not INPUTS : None RETURNS : The flag SIDE EFFECTS : None NOTES : None ***************************************************/ globle intBool GetDelayObjectPatternMatching( void *theEnv) { return(ObjectReteData(theEnv)->DelayObjectPatternMatching); } /******************************************************** NAME : ObjectNetworkPointer DESCRIPTION : Returns the first object network pattern node INPUTS : None RETURNS : The top of the object pattern network SIDE EFFECTS : None NOTES : None ********************************************************/ globle OBJECT_PATTERN_NODE *ObjectNetworkPointer( void *theEnv) { return(ObjectReteData(theEnv)->ObjectPatternNetworkPointer); } /******************************************************** NAME : ObjectNetworkTerminalPointer DESCRIPTION : Returns the first terminal pattern node INPUTS : None RETURNS : The last node of a pattern SIDE EFFECTS : None NOTES : None ********************************************************/ globle OBJECT_ALPHA_NODE *ObjectNetworkTerminalPointer( void *theEnv) { return(ObjectReteData(theEnv)->ObjectPatternNetworkTerminalPointer); } /*************************************************** NAME : SetObjectNetworkPointer DESCRIPTION : Sets the object pattern network to the given network INPUTS : Top of the new pattern network RETURNS : Nothing useful SIDE EFFECTS : ObjectPatternNetworkPointer set NOTES : None ***************************************************/ globle void SetObjectNetworkPointer( void *theEnv, OBJECT_PATTERN_NODE *value) { ObjectReteData(theEnv)->ObjectPatternNetworkPointer = value; } /******************************************************* NAME : SetObjectNetworkTerminalPointer DESCRIPTION : Sets the global list of terminal pattern nodes (the ones containing the bitmaps) to the given node INPUTS : The last node of a pattern RETURNS : Nothing useful SIDE EFFECTS : ObjectPatternNetworkTerminalPointer set NOTES : None *******************************************************/ globle void SetObjectNetworkTerminalPointer( void *theEnv, OBJECT_ALPHA_NODE *value) { ObjectReteData(theEnv)->ObjectPatternNetworkTerminalPointer = value; } /************************************************************************ NAME : ObjectNetworkAction DESCRIPTION : Main driver for pattern-matching on objects If the pattern-matching is current delayed or another object is currently being pattern-matched, the requested match action is queued for later processing. Otherwise, the match action is performed and the Rete network is updated. INPUTS : 1) The match action type OBJECT_ASSERT (1) OBJECT_RETRACT (2) OBJECT_MODIFY (3) 2) The instance to be matched (can be NULL if only want pending actions to be performed) 3) The name id of the slot being updated (can be -1) If this argument is -1, it is assumed that any pattern which could match this instance must be checked. Otherwise, only the patterns which explicitly match on the named slot will be checked. RETURNS : Nothing useful SIDE EFFECTS : Action queued or Rete network updated NOTES : None ************************************************************************/ globle void ObjectNetworkAction( void *theEnv, int type, INSTANCE_TYPE *ins, int slotNameID) { SLOT_BITMAP *tmpMap; if (EngineData(theEnv)->JoinOperationInProgress) return; EngineData(theEnv)->JoinOperationInProgress = TRUE; /* ================================================ For purposes of conflict resolution, all objects which have had pattern-matching delayed will have the same relative timestamp, i.e., the inference engine thinks they all just appeared simultaneously When delay is off, however, each object gets the new and current timestamp as expected. ================================================ */ ObjectReteData(theEnv)->UseEntityTimeTag = DefruleData(theEnv)->CurrentEntityTimeTag++; /* ================================================== If pattern-matching is delayed (by use of the set-object-pattern-match-delay function), then the instance should be marked for later processing (when the delay is turned off). ================================================== */ if (ins != NULL) { /* 6.05 Bug Fix */ ins->reteSynchronized = FALSE; if (ObjectReteData(theEnv)->DelayObjectPatternMatching == FALSE) switch (type) { case OBJECT_ASSERT : ObjectAssertAction(theEnv,ins); break; case OBJECT_RETRACT : ObjectRetractAction(theEnv,ins,NULL); break; default : tmpMap = QueueModifySlotMap(theEnv,NULL,slotNameID); ObjectModifyAction(theEnv,ins,tmpMap); rm(theEnv,(void *) tmpMap,SlotBitMapSize(tmpMap)); } else QueueObjectMatchAction(theEnv,type,ins,slotNameID); } /* ======================================== Process all pending actions in the queue All updates will use the same timestamp ======================================== */ ProcessObjectMatchQueue(theEnv); EngineData(theEnv)->JoinOperationInProgress = FALSE; ForceLogicalRetractions(theEnv); /*=========================================*/ /* Free partial matches that were released */ /* by the assertion of the fact. */ /*=========================================*/ if (EngineData(theEnv)->ExecutingRule == NULL) FlushGarbagePartialMatches(theEnv); } /* ========================================= ***************************************** INTERNALLY VISIBLE FUNCTIONS ========================================= ***************************************** */ /*************************************************** NAME : ResetObjectMatchTimeTags DESCRIPTION : If CurrentObjectMatchTimeTag + 1 would cause an overflow, CurrentObjectMatchTimeTag is reset to 0L and all time tags in object pattern nodes are reset. INPUTS : None RETURNS : Nothing useful SIDE EFFECTS : CurrentObjectMatchTimeTag reset to 0, and all match time tags reset These tags are used to recognize valid pattern nodes on a match NOTES : None ***************************************************/ globle void ResetObjectMatchTimeTags( void *theEnv) { OBJECT_ALPHA_NODE *alphaPtr; OBJECT_PATTERN_NODE *lastLevel; /* ============================================ If the current tag incremented by one would not cause an overflow, then we can leave things alone. ============================================ */ if ((ObjectReteData(theEnv)->CurrentObjectMatchTimeTag + 1L) > ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) return; ObjectReteData(theEnv)->CurrentObjectMatchTimeTag = 0L; alphaPtr = ObjectNetworkTerminalPointer(theEnv); while (alphaPtr != NULL) { alphaPtr->matchTimeTag = 0L; lastLevel = alphaPtr->patternNode; while (lastLevel != NULL) { if (lastLevel->matchTimeTag == 0L) break; lastLevel->matchTimeTag = 0L; lastLevel = lastLevel->lastLevel; } alphaPtr = alphaPtr->nxtTerminal; } } /*************************************************** NAME : QueueObjectMatchAction DESCRIPTION : Posts a Rete network match event for later processing INPUTS : 1) The match action type OBJECT_ASSERT (1) OBJECT_RETRACT (2) OBJECT_MODIFY (3) 2) The instance to be matched 3) The name id of the slot being updated (can be -1) RETURNS : Nothing useful SIDE EFFECTS : Queue updated NOTES : None ***************************************************/ static void QueueObjectMatchAction( void *theEnv, int type, INSTANCE_TYPE *ins, int slotNameID) { OBJECT_MATCH_ACTION *prv,*cur,*newMatch; OBJECT_MATCH_ACTION *prvRetract = NULL; /* DR0873 */ prv = NULL; cur = ObjectReteData(theEnv)->ObjectMatchActionQueue; while (cur != NULL) { /* =========================================================== Here are the possibilities for the first Rete event already on the queue as compared with the new event for an object: Assert/Retract --> Delete assert event Ignore retract event Assert/Modify --> Ignore modify event Modify/Modify --> Merge new modify event Modify/Retract --> Delete modify event Queue the retract event =========================================================== */ if (cur->ins == ins) { /* =================================================== An action for initially asserting the newly created object to all applicable patterns =================================================== */ if (cur->type == OBJECT_ASSERT) { if (type == OBJECT_RETRACT) { /* =================================================== If we are retracting the entire object, then we can remove the assert action (and all modifies as well) and ignore the retract action (basically the object came and went before the Rete network had a chance to see it) =================================================== */ if (prv == NULL) ObjectReteData(theEnv)->ObjectMatchActionQueue = cur->nxt; else prv->nxt = cur->nxt; cur->ins->busy--; ReturnObjectMatchAction(theEnv,cur); } /* ================================================= If this is a modify action, then we can ignore it since the assert action will encompass it ================================================= */ } /* =================================================== If the object is being deleted after a slot modify, drop the modify event and replace with the retract =================================================== */ else if (type == OBJECT_RETRACT) { cur->type = OBJECT_RETRACT; if (cur->slotNameIDs != NULL) { rm(theEnv,(void *) cur->slotNameIDs,SlotBitMapSize(cur->slotNameIDs)); cur->slotNameIDs = NULL; } } /* ==================================================== If a modify event for this slot is already on the queue, ignore this one. Otherwise, merge the slot id ==================================================== */ else cur->slotNameIDs = QueueModifySlotMap(theEnv,cur->slotNameIDs,slotNameID); return; } if (cur->type == OBJECT_RETRACT) /* DR0873 */ { prvRetract = cur; } /* DR0873 */ prv = cur; cur = cur->nxt; } /* ================================================ If there are no actions for the instance already on the queue, the new action is simply appended. ================================================ */ newMatch = get_struct(theEnv,objectMatchAction); newMatch->type = type; newMatch->nxt = NULL; /* If we get here, cur should be NULL */ newMatch->slotNameIDs = (type != OBJECT_MODIFY) ? NULL : QueueModifySlotMap(theEnv,NULL,slotNameID); newMatch->ins = ins; newMatch->ins->busy++; /* DR0873 Begin */ /* Retract operations must be processed before assert and */ /* modify actions, otherwise the pattern matching process */ /* might attempt to access the slots of a retract instance. */ if (type == OBJECT_RETRACT) { if (prvRetract == NULL) { newMatch->nxt = ObjectReteData(theEnv)->ObjectMatchActionQueue; ObjectReteData(theEnv)->ObjectMatchActionQueue = newMatch; } else { newMatch->nxt = prvRetract->nxt; prvRetract->nxt = newMatch; } } else /* DR0873 End */ if (prv == NULL) ObjectReteData(theEnv)->ObjectMatchActionQueue = newMatch; else prv->nxt = newMatch; } /**************************************************** NAME : QueueModifySlotMap DESCRIPTION : Sets the bitmap for a queued object modify Rete network action INPUTS : 1) The old bitmap (can be NULL) 2) The canonical slot id to set RETURNS : The (new) bitmap SIDE EFFECTS : Bitmap allocated/reallocated if necessary, and slot id bit set NOTES : If the bitmap must be (re)allocated, this routine allocates twice the room necessary for the current id to allow for growth. ****************************************************/ static SLOT_BITMAP *QueueModifySlotMap( void *theEnv, SLOT_BITMAP *oldMap, int slotNameID) { SLOT_BITMAP *newMap; unsigned short newmaxid; unsigned oldsz,newsz; if ((oldMap == NULL) ? TRUE : (slotNameID > oldMap->maxid)) { newmaxid = (unsigned short) (slotNameID * 2); newsz = sizeof(SLOT_BITMAP) + (sizeof(char) * (newmaxid / BITS_PER_BYTE)); newMap = (SLOT_BITMAP *) gm2(theEnv,newsz); ClearBitString((void *) newMap,newsz); if (oldMap != NULL) { oldsz = SlotBitMapSize(oldMap); GenCopyMemory(char,oldsz,newMap,oldMap); rm(theEnv,(void *) oldMap,oldsz); } newMap->maxid = newmaxid; } else newMap = oldMap; SetBitMap(newMap->map,slotNameID); return(newMap); } /*************************************************** NAME : ReturnObjectMatchAction DESCRIPTION : Deallocates and object match action structure and associated slot bitmap (if any) INPUTS : The queued match action item RETURNS : Nothing useful SIDE EFFECTS : Object match action item deleted NOTES : None ***************************************************/ static void ReturnObjectMatchAction( void *theEnv, OBJECT_MATCH_ACTION *omaPtr) { if (omaPtr->slotNameIDs != NULL) rm(theEnv,(void *) omaPtr->slotNameIDs,SlotBitMapSize(omaPtr->slotNameIDs)); rtn_struct(theEnv,objectMatchAction,omaPtr); } /*************************************************** NAME : ProcessObjectMatchQueue DESCRIPTION : Processes all outstanding object Rete network update events INPUTS : None RETURNS : Nothing useful SIDE EFFECTS : Pattern-matching on objects NOTES : None ***************************************************/ static void ProcessObjectMatchQueue( void *theEnv) { OBJECT_MATCH_ACTION *cur; while ((ObjectReteData(theEnv)->ObjectMatchActionQueue != NULL) && (ObjectReteData(theEnv)->DelayObjectPatternMatching == FALSE)) { cur = ObjectReteData(theEnv)->ObjectMatchActionQueue; ObjectReteData(theEnv)->ObjectMatchActionQueue = cur->nxt; switch(cur->type) { case OBJECT_ASSERT : ObjectAssertAction(theEnv,cur->ins); break; case OBJECT_RETRACT : ObjectRetractAction(theEnv,cur->ins,cur->slotNameIDs); break; default : ObjectModifyAction(theEnv,cur->ins,cur->slotNameIDs); } cur->ins->busy--; ReturnObjectMatchAction(theEnv,cur); } } /****************************************************** NAME : MarkObjectPatternNetwork DESCRIPTION : Iterates through all terminal pattern nodes checking class and slot bitmaps. If a pattern is applicable to the object/slot change, then all the nodes belonging to the pattern are marked as needing to be examined by the pattern matcher. INPUTS : The bitmap of ids of the slots being changed (NULL if this is an assert for the for the entire object) RETURNS : Nothing useful SIDE EFFECTS : Applicable pattern nodes marked NOTES : Incremental reset status is also checked here ******************************************************/ static void MarkObjectPatternNetwork( void *theEnv, SLOT_BITMAP *slotNameIDs) { OBJECT_ALPHA_NODE *alphaPtr; OBJECT_PATTERN_NODE *upper; CLASS_BITMAP *clsset; unsigned id; ResetObjectMatchTimeTags(theEnv); ObjectReteData(theEnv)->CurrentObjectMatchTimeTag++; alphaPtr = ObjectNetworkTerminalPointer(theEnv); id = ObjectReteData(theEnv)->CurrentPatternObject->cls->id; while (alphaPtr != NULL) { /* ============================================================= If an incremental reset is in progress, make sure that the pattern has been marked for initialization before proceeding. ============================================================= */ #if (! RUN_TIME) && (! BLOAD_ONLY) if (EngineData(theEnv)->IncrementalResetInProgress && (alphaPtr->header.initialize == FALSE)) { alphaPtr = alphaPtr->nxtTerminal; continue; } #endif /* ============================================ Check the class bitmap to see if the pattern pattern is applicable to the object at all ============================================ */ clsset = (CLASS_BITMAP *) ValueToBitMap(alphaPtr->classbmp); if ((id > (unsigned) clsset->maxid) ? FALSE : TestBitMap(clsset->map,id)) { /* =================================================== If we are doing an assert, then we need to check all patterns which satsify the class bitmap (The retraction has already been done in this case) =================================================== */ if (slotNameIDs == NULL) { alphaPtr->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; for (upper = alphaPtr->patternNode ; upper != NULL ; upper = upper->lastLevel) { if (upper->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) break; else upper->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; } } /* =================================================== If we are doing a slot modify, then we need to check only the subset of patterns which satisfy the class bitmap AND actually match on the slot in question. =================================================== */ else if (alphaPtr->slotbmp != NULL) { if (CompareSlotBitMaps(slotNameIDs, (SLOT_BITMAP *) ValueToBitMap(alphaPtr->slotbmp))) { alphaPtr->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; for (upper = alphaPtr->patternNode ; upper != NULL ; upper = upper->lastLevel) { if (upper->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) break; else upper->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; } } } } alphaPtr = alphaPtr->nxtTerminal; } } /*************************************************** NAME : CompareSlotBitMaps DESCRIPTION : Compares two slot bitmaps by bitwising and'ing byte per byte up to the length of the smaller map. INPUTS : The two slot bitmaps RETURNS : TRUE if any common bits are set in both maps, FALSE otherwise SIDE EFFECTS : None NOTES : None ***************************************************/ static intBool CompareSlotBitMaps( SLOT_BITMAP *smap1, SLOT_BITMAP *smap2) { unsigned short i,maxByte; maxByte = (unsigned short) (((smap1->maxid < smap2->maxid) ? smap1->maxid : smap2->maxid) / BITS_PER_BYTE); for (i = 0 ; i <= maxByte ; i++) if (smap1->map[i] & smap2->map[i]) return(TRUE); return(FALSE); } /********************************************************************************** NAME : ObjectPatternMatch DESCRIPTION : Iterates through all the pattern nodes on one level in the pattern network. A node is only processed if it can lead to a terminating class bitmap node which applies to the object being matched. This allows for a significant reduction in the number of patterns considered. INPUTS : 1) The offset of the slot position from the pattern index 2) The pattern node being examined 3) The end of the list of multifield markers for the pattern RETURNS : Nothing useful SIDE EFFECTS : The pattern tests are evaluated and the child nodes may be processed (which may cause a whole series of Rete network updates). NOTES : Several globals are used to keep track of the current slot being examined: CurrentPatternMarks - the series of multifield markers CurrentPatternObject - the object being pattern-matched CurrentPatternObjectSlot - the current slot being examined CurrentObjectSlotLength - the cardinality of the slot value An optimization is performed when evaluating constant tests on a slot value field. All pattern nodes on a level which restrict the same slot are grouped together. Those which are constant tests are placed at the far right. Thus, as soon as one of these constant tests succeeds, the remaining nodes for that slot on this level can be skipped **********************************************************************************/ static void ObjectPatternMatch( void *theEnv, int offset, OBJECT_PATTERN_NODE *patternTop, struct multifieldMarker *endMark) { register unsigned saveSlotLength; register INSTANCE_SLOT *saveSlot; OBJECT_PATTERN_NODE *blockedNode; while (patternTop != NULL) { /* =========================================================== MarkObjectPatternNetwork() has already marked pattern nodes which need processing according to the class bitmaps, slot updates and incremental reset status =========================================================== */ if (patternTop->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) { /* ======================================== Make sure we are examining the correct slot of the object for this pattern node ======================================== */ if ((patternTop->slotNameID == ISA_ID) || (patternTop->slotNameID == NAME_ID)) { ObjectReteData(theEnv)->CurrentPatternObjectSlot = NULL; ObjectReteData(theEnv)->CurrentObjectSlotLength = 1; offset = 0; } else if ((ObjectReteData(theEnv)->CurrentPatternObjectSlot == NULL) ? TRUE : (ObjectReteData(theEnv)->CurrentPatternObjectSlot->desc->slotName->id != patternTop->slotNameID)) { /* ==================================================== Need to reset the indices for the multifield markers now that we have moved onto a different slot ==================================================== */ ObjectReteData(theEnv)->CurrentPatternObjectSlot = ObjectReteData(theEnv)->CurrentPatternObject->slotAddresses[ObjectReteData(theEnv)->CurrentPatternObject->cls->slotNameMap [patternTop->slotNameID] - 1]; offset = 0; if (ObjectReteData(theEnv)->CurrentPatternObjectSlot->desc->multiple) ObjectReteData(theEnv)->CurrentObjectSlotLength = GetInstanceSlotLength(ObjectReteData(theEnv)->CurrentPatternObjectSlot); else ObjectReteData(theEnv)->CurrentObjectSlotLength = 1; } /* ======================================================== Process the pattern node. If it is satisfied by the the instance, ProcessPatternNode() will recursively pass all of its children nodes through ObjectPatternMatch() ======================================================== */ saveSlotLength = ObjectReteData(theEnv)->CurrentObjectSlotLength; saveSlot = ObjectReteData(theEnv)->CurrentPatternObjectSlot; ProcessPatternNode(theEnv,offset,patternTop,endMark); ObjectReteData(theEnv)->CurrentObjectSlotLength = saveSlotLength; ObjectReteData(theEnv)->CurrentPatternObjectSlot = saveSlot; } /* ============================================================== Move on to the siblings of this node - if the current node was a constant test that succeeded, skip further sibling nodes (which test on the same field in the pattern) which match on the same slot since they are all constant tests as well and will, of course fail. ============================================================== */ if (patternTop->blocked == TRUE) { patternTop->blocked = FALSE; blockedNode = patternTop; patternTop = patternTop->rightNode; while (patternTop != NULL) { if ((patternTop->slotNameID != blockedNode->slotNameID) || (patternTop->whichField != blockedNode->whichField)) break; patternTop = patternTop->rightNode; } } else patternTop = patternTop->rightNode; } } /********************************************************************************** NAME : ProcessPatternNode DESCRIPTION : Determines if a pattern node satsifies the corresponding slot value field(s) in an object. If it does, ObjectPatternMatch() is recursively called to process the child nodes of this node. In this mutual recursion between ObjectPatternMatch() and ProcessPatternNode(), the nodes of all applicable patterns are processed to completion. ObjectPatternMatch() enters an object into a pattern's aplha memory when the traversal reaches a terminal class bitmap node. INPUTS : 1) The offset of the slot index from the pattern index 2) The pattern node being examined 3) The end of the list of multifield markers for the pattern RETURNS : Nothing useful SIDE EFFECTS : The pattern tests are evaluated and the child nodes may be processed (which may cause a whole series of Rete network updates). NOTES : Several globals are used to keep track of the current slot being examined: CurrentPatternMarks - the series of multifield markers CurrentPatternObject - the object being pattern-matched CurrentPatternObjectSlot - the current slot being examined CurrentObjectSlotLength - the cardinality of the slot value **********************************************************************************/ static void ProcessPatternNode( void *theEnv, int offset, OBJECT_PATTERN_NODE *patternNode, struct multifieldMarker *endMark) { int patternSlotField,objectSlotField; unsigned objectSlotLength; int repeatCount; INSTANCE_SLOT *objectSlot; struct multifieldMarker *newMark; patternSlotField = patternNode->whichField; objectSlotField = patternSlotField + offset; /* ========================================== If this is a test on the class or the name of the object, process it separately. ========================================== */ if (ObjectReteData(theEnv)->CurrentPatternObjectSlot == NULL) { if ((patternNode->networkTest == NULL) ? TRUE : (EvaluateObjectPatternTest(theEnv,objectSlotField,NULL, (EXPRESSION *) patternNode->networkTest,patternNode))) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,offset,patternNode->nextLevel,endMark); } return; } /* ================================ Check a single-field restriction ================================ */ if (patternNode->multifieldNode == 0) { if ((patternNode->networkTest == NULL) ? TRUE : EvaluateObjectPatternTest(theEnv,objectSlotField,NULL, (EXPRESSION *) patternNode->networkTest,patternNode)) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,offset,patternNode->nextLevel,endMark); } return; } /* ================================================================== Check a multifield restriction. Add a marker for this field which has indices indicating to which values in the object slot the multifield pattern node is bound ================================================================== */ newMark = get_struct(theEnv,multifieldMarker); newMark->whichField = patternSlotField; newMark->where.whichSlot = (void *) ObjectReteData(theEnv)->CurrentPatternObjectSlot->desc->slotName->name; newMark->startPosition = objectSlotField; newMark->next = NULL; if (ObjectReteData(theEnv)->CurrentPatternObjectMarks == NULL) ObjectReteData(theEnv)->CurrentPatternObjectMarks = newMark; else endMark->next = newMark; /* ========================================================== If there are further pattern restrictions on this slot, try pattern-matching for all possible bound values of the multifield pattern node: from no values to all values from the starting position of the multifield to the end of the object slot. Otherwise, bind the multifield to all the remaining fields in the slot value and continue with pattern-matching ========================================================== */ if (patternNode->endSlot == FALSE) { objectSlotLength = ObjectReteData(theEnv)->CurrentObjectSlotLength; objectSlot = ObjectReteData(theEnv)->CurrentPatternObjectSlot; newMark->endPosition = newMark->startPosition - 1; repeatCount = (int) (objectSlotLength - newMark->startPosition - patternNode->leaveFields + 2); while (repeatCount > 0) { if ((patternNode->networkTest == NULL) ? TRUE : EvaluateObjectPatternTest(theEnv,objectSlotField,newMark, (EXPRESSION *) patternNode->networkTest,patternNode)) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,(int) (offset + (newMark->endPosition - objectSlotField)), patternNode->nextLevel,newMark); ObjectReteData(theEnv)->CurrentObjectSlotLength = objectSlotLength; ObjectReteData(theEnv)->CurrentPatternObjectSlot = objectSlot; } newMark->endPosition++; repeatCount--; } } else { newMark->endPosition = (long) ObjectReteData(theEnv)->CurrentObjectSlotLength; if ((patternNode->networkTest == NULL) ? TRUE : EvaluateObjectPatternTest(theEnv,objectSlotField,newMark, (EXPRESSION *) patternNode->networkTest,patternNode)) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,0,patternNode->nextLevel,newMark); } } /* ====================================== Delete the temporary multifield marker ====================================== */ if (ObjectReteData(theEnv)->CurrentPatternObjectMarks == newMark) ObjectReteData(theEnv)->CurrentPatternObjectMarks = NULL; else endMark->next = NULL; rtn_struct(theEnv,multifieldMarker,newMark); } /*************************************************** NAME : CreateObjectAlphaMatch DESCRIPTION : Places an instance in the alpha memory of a pattern and drives the partial match through the join network INPUTS : The alpha memory node RETURNS : Nothing useful SIDE EFFECTS : Join network updated NOTES : None ***************************************************/ static void CreateObjectAlphaMatch( void *theEnv, OBJECT_ALPHA_NODE *alphaPtr) { struct joinNode *listOfJoins; struct partialMatch *theMatch; struct patternMatch *newMatch; while (alphaPtr != NULL) { if (alphaPtr->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) { /* =================================================== If we have reached the class bitmap of the pattern, place the object in the alpha memory of each of the terminal nodes underneath and drive the partial matches through the join network. Insert the instance into the alpha memory of this pattern and mark it as busy =================================================== */ ObjectReteData(theEnv)->CurrentPatternObject->busy++; theMatch = CreateAlphaMatch(theEnv,(void *) ObjectReteData(theEnv)->CurrentPatternObject, ObjectReteData(theEnv)->CurrentPatternObjectMarks, (struct patternNodeHeader *) alphaPtr); /* ====================================== Attach the partial match to the object to ease later retraction ====================================== */ newMatch = get_struct(theEnv,patternMatch); newMatch->next = (struct patternMatch *) ObjectReteData(theEnv)->CurrentPatternObject->partialMatchList; newMatch->matchingPattern = (struct patternNodeHeader *) alphaPtr; newMatch->theMatch = theMatch; ObjectReteData(theEnv)->CurrentPatternObject->partialMatchList = (void *) newMatch; /* ================================================ Drive the partial match through the join network ================================================ */ listOfJoins = alphaPtr->header.entryJoin; while (listOfJoins != NULL) { NetworkAssert(theEnv,theMatch,listOfJoins,RHS); listOfJoins = listOfJoins->rightMatchNode; } } alphaPtr = alphaPtr->nxtInGroup; } } /****************************************************** NAME : EvaluateObjectPatternTest DESCRIPTION : Evaluates the pattern network test expression for a node INPUTS : 1) The actual index of the slot value field currently being examined 2) The multifield marker (if any) for the pattern node being exmained 3) The pattern network test expression 4) The pattern node being examined RETURNS : TRUE if the node passes the test, FALSE otherwise SIDE EFFECTS : Evaluation of the test EvaluationError and HaltExecution are always set to FALSE NOTES : Assumes networkTest != NULL ******************************************************/ static intBool EvaluateObjectPatternTest( void *theEnv, int objectSlotField, struct multifieldMarker *selfSlotMarker, EXPRESSION *networkTest, OBJECT_PATTERN_NODE *patternNode) { DATA_OBJECT vresult; int rv; if (networkTest->type == OBJ_PN_CONSTANT) { struct expr *oldArgument; oldArgument = EvaluationData(theEnv)->CurrentExpression; EvaluationData(theEnv)->CurrentExpression = networkTest; rv = ObjectCmpConstantFunction(theEnv,networkTest->value,&vresult); EvaluationData(theEnv)->CurrentExpression = oldArgument; if (rv) { if (((struct ObjectCmpPNConstant *) ValueToBitMap(networkTest->value))->pass) patternNode->blocked = TRUE; return(TRUE); } return(FALSE); } /* ========================================================= Evaluate or expressions expressed in the format: (or ... ) Returns TRUE (1.0) if any of the expression are TRUE, otherwise returns false (0.0). ========================================================= */ if (networkTest->value == ExpressionData(theEnv)->PTR_OR) { networkTest = networkTest->argList; while (networkTest != NULL) { if (EvaluateObjectPatternTest(theEnv,objectSlotField,selfSlotMarker,networkTest,patternNode)) { /* ============================================ A node can be blocked ONLY if there were one positive constant test on that node ============================================ */ patternNode->blocked = FALSE; return(TRUE); } patternNode->blocked = FALSE; networkTest = networkTest->nextArg; } return(FALSE); } /* ========================================================== Evaluate and expressions expressed in the format: (and ... ) Returns false (0.0) if any of the expression are false, otherwise returns TRUE (1.0). ========================================================== */ else if (networkTest->value == ExpressionData(theEnv)->PTR_AND) { networkTest = networkTest->argList; while (networkTest != NULL) { if (EvaluateObjectPatternTest(theEnv,objectSlotField,selfSlotMarker,networkTest,patternNode) == FALSE) { patternNode->blocked = FALSE; return(FALSE); } patternNode->blocked = FALSE; networkTest = networkTest->nextArg; } return(TRUE); } /* ======================================================= Evaluate all other expressions using EvaluateExpression ======================================================= */ else { EvaluationData(theEnv)->HaltExecution = FALSE; if (EvaluateExpression(theEnv,networkTest,&vresult)) { ObjectPatternNetErrorMessage(theEnv,patternNode); EvaluationData(theEnv)->EvaluationError = FALSE; EvaluationData(theEnv)->HaltExecution = FALSE; return(FALSE); } if ((vresult.value != EnvFalseSymbol(theEnv)) || (vresult.type != SYMBOL)) return(TRUE); } return(FALSE); } /*************************************************** NAME : ObjectAssertAction DESCRIPTION : Filters an instance through the object pattern network INPUTS : The instance RETURNS : Nothing useful SIDE EFFECTS : Instance matched NOTES : None ***************************************************/ static void ObjectAssertAction( void *theEnv, INSTANCE_TYPE *ins) { ins->header.timeTag = ObjectReteData(theEnv)->UseEntityTimeTag; ObjectReteData(theEnv)->CurrentPatternObject = ins; ObjectReteData(theEnv)->CurrentPatternObjectSlot = NULL; MarkObjectPatternNetwork(theEnv,NULL); ObjectPatternMatch(theEnv,0,ObjectNetworkPointer(theEnv),NULL); ins->reteSynchronized = TRUE; } /********************************************************************** NAME : ObjectModifyAction DESCRIPTION : Removes an instance from patterns (and attached joins) applicable to specified slot(s), and then filters same instance through object pattern network (only against patterns which explicitly match on named slot(s)) INPUTS : 1) The instance 2) The bitmap of slot ids RETURNS : Nothing useful SIDE EFFECTS : Instance retracted/asserted NOTES : None **********************************************************************/ static void ObjectModifyAction( void *theEnv, INSTANCE_TYPE *ins, SLOT_BITMAP *slotNameIDs) { ins->header.timeTag = ObjectReteData(theEnv)->UseEntityTimeTag; ObjectRetractAction(theEnv,ins,slotNameIDs); ObjectReteData(theEnv)->CurrentPatternObject = ins; ObjectReteData(theEnv)->CurrentPatternObjectSlot = NULL; MarkObjectPatternNetwork(theEnv,slotNameIDs); ObjectPatternMatch(theEnv,0,ObjectNetworkPointer(theEnv),NULL); ins->reteSynchronized = TRUE; } /**************************************************** NAME : ObjectRetractAction DESCRIPTION : Retracts the instance from the applicable patterns for the object (if the slotNameID != -1, then the instance is only retracted from the alpha memories of the patterns which actually match on that slot) INPUTS : 1) The instance 2) The slot bitmap for a modify (NULL if the instance is actually being removed) RETURNS : Nothing useful SIDE EFFECTS : Retractions performed NOTES : None ****************************************************/ static void ObjectRetractAction( void *theEnv, INSTANCE_TYPE *ins, SLOT_BITMAP *slotNameIDs) { struct patternMatch *prvMatch,*tmpMatch, *deleteMatch,*lastDeleteMatch; OBJECT_ALPHA_NODE *alphaPtr; void *saveDependents; if (slotNameIDs == NULL) { if (ins->partialMatchList != NULL) { tmpMatch = (struct patternMatch *) ins->partialMatchList; while (tmpMatch != NULL) { ins->busy--; tmpMatch = tmpMatch->next; } NetworkRetract(theEnv,(struct patternMatch *) ins->partialMatchList); ins->partialMatchList = NULL; } } else { deleteMatch = NULL; lastDeleteMatch = NULL; prvMatch = NULL; tmpMatch = (struct patternMatch *) ins->partialMatchList; while (tmpMatch != NULL) { alphaPtr = (OBJECT_ALPHA_NODE *) tmpMatch->matchingPattern; if (alphaPtr->slotbmp != NULL) { if (CompareSlotBitMaps(slotNameIDs, (SLOT_BITMAP *) ValueToBitMap(alphaPtr->slotbmp))) { ins->busy--; if (prvMatch == NULL) ins->partialMatchList = (void *) tmpMatch->next; else prvMatch->next = tmpMatch->next; if (!deleteMatch) deleteMatch = tmpMatch; else lastDeleteMatch->next = tmpMatch; lastDeleteMatch = tmpMatch; tmpMatch = tmpMatch->next; lastDeleteMatch->next = NULL; } else { prvMatch = tmpMatch; tmpMatch = tmpMatch->next; } } else { prvMatch = tmpMatch; tmpMatch = tmpMatch->next; } } /* ============================================= We need to preserve any logical dependencies of this object and reattach them after doing the retract. Otherwise, the Rete network will believe the object is gone and remove the links from the partial matches upon which this object is logically dependent. ============================================= */ if (deleteMatch != NULL) { saveDependents = ins->header.dependents; ins->header.dependents = NULL; NetworkRetract(theEnv,deleteMatch); ins->header.dependents = saveDependents; } } ins->reteSynchronized = TRUE; } /***************************************************** NAME : ObjectPatternNetErrorMessage DESCRIPTION : Prints out a locational error message when an evaluation error occurs during object pattern-matching INPUTS : The pattern node RETURNS : Nothing useful SIDE EFFECTS : Error message displayed NOTES : None *****************************************************/ static void ObjectPatternNetErrorMessage( void *theEnv, OBJECT_PATTERN_NODE *patternPtr) { PrintErrorID(theEnv,"OBJRTMCH",1,TRUE); EnvPrintRouter(theEnv,WERROR,"This error occurred in the object pattern network\n"); EnvPrintRouter(theEnv,WERROR," Currently active instance: ["); EnvPrintRouter(theEnv,WERROR,ValueToString(ObjectReteData(theEnv)->CurrentPatternObject->name)); EnvPrintRouter(theEnv,WERROR,"]\n"); EnvPrintRouter(theEnv,WERROR," Problem resides in slot "); EnvPrintRouter(theEnv,WERROR,ValueToString(FindIDSlotName(theEnv,patternPtr->slotNameID))); EnvPrintRouter(theEnv,WERROR," field #"); PrintLongInteger(theEnv,WERROR,(long) patternPtr->whichField); EnvPrintRouter(theEnv,WERROR,"\n"); TraceErrorToObjectPattern(theEnv,TRUE,patternPtr); EnvPrintRouter(theEnv,WERROR,"\n"); } /********************************************************* NAME : TraceErrorToObjectPattern DESCRIPTION : Used by ObjectPatternNetErrorMessage() to print the rule(s) which contain an object pattern. INPUTS : 1) A flag indicating if this is the node in which the error actually occurred or not 2) The pattern node RETURNS : Nothing useful SIDE EFFECTS : Error message displayed NOTES : None *********************************************************/ static void TraceErrorToObjectPattern( void *theEnv, int errorNode, OBJECT_PATTERN_NODE *patternPtr) { struct joinNode *joinPtr; while (patternPtr != NULL) { if (patternPtr->alphaNode != NULL) { joinPtr = patternPtr->alphaNode->header.entryJoin; while (joinPtr != NULL) { EnvPrintRouter(theEnv,WERROR," Of pattern #"); PrintLongInteger(theEnv,WERROR,(long) joinPtr->depth); EnvPrintRouter(theEnv,WERROR," in rule(s):\n"); TraceErrorToRule(theEnv,joinPtr," "); joinPtr = joinPtr->rightMatchNode; } } TraceErrorToObjectPattern(theEnv,FALSE,patternPtr->nextLevel); if (errorNode) break; patternPtr = patternPtr->rightNode; } } #endif Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clips/F-10/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Feb 2007 19:04:04 -0000 1.4 +++ .cvsignore 3 Mar 2009 18:33:55 -0000 1.5 @@ -1,14 +1,12 @@ -3CCP.pdf -AllExamples.tar.Z abstract.pdf +clips_core_source_624.tar.Z +x_windows_ide_source_624.tar.Z +examples_624.tar.Z apg.pdf arch5-1.pdf bpg.pdf -clipssrc.tar.Z ig.pdf -usrguide.pdf -x-prjct.tar.Z -FunctionContext.zip -objrtmch.c -DR0873.txt -clips-6.24-linux.patch.bz2 +ug.pdf +3CCP.pdf +clips-doc-html.tar.bz2 +clips-6.24-linux.patch Index: clips.spec =================================================================== RCS file: /cvs/pkgs/rpms/clips/F-10/clips.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- clips.spec 19 Feb 2008 22:49:18 -0000 1.10 +++ clips.spec 3 Mar 2009 18:33:56 -0000 1.11 @@ -1,33 +1,48 @@ Summary: CLIPS language for developing expert systems Name: clips Version: 6.24 -Release: 25%{?dist} -Url: http://www.ghg.net/clips/download/source/ +Release: 27%{?dist} +Url: http://clipsrules.sourceforge.net License: GPLv2 Group: Development/Tools -Source0: http://www.ghg.net/clips/download/source/clipssrc.tar.Z -Source1: http://www.ghg.net/clips/download/source/x-prjct.tar.Z -Source2: http://www.ghg.net/clips/download/executables/examples/AllExamples.tar.Z -Source3: http://www.ghg.net/clips/download/documentation/abstract.pdf -Source4: http://www.ghg.net/clips/download/documentation/apg.pdf -Source5: http://www.ghg.net/clips/download/documentation/arch5-1.pdf -Source6: http://www.ghg.net/clips/download/documentation/bpg.pdf -Source7: http://www.ghg.net/clips/download/documentation/ig.pdf -Source8: http://www.ghg.net/clips/download/documentation/usrguide.pdf -Source9: http://www.ghg.net/clips/download/documentation/3CCP.pdf +Source0: http://downloads.sourceforge.net/clipsrules/clips_core_source_624.tar.Z +Source1: http://downloads.sourceforge.net/clipsrules/x_windows_ide_source_624.tar.Z +Source2: http://downloads.sourceforge.net/clipsrules/examples_624.tar.Z +Source3: abstract.pdf +Source4: http://clipsrules.sourceforge.net/documentation/v624/apg.pdf +Source5: http://clipsrules.sourceforge.net/documentation/other/arch5-1.pdf +Source6: http://clipsrules.sourceforge.net/documentation/v624/bpg.pdf +Source7: http://clipsrules.sourceforge.net/documentation/v624/ig.pdf +Source8: http://clipsrules.sourceforge.net/documentation/v624/ug.pdf +Source9: http://clipsrules.sourceforge.net/documentation/other/3CCP.pdf Source10: xclips.png Source11: clips-init.el Source12: clips-mode.el Source13: inf-clips.el -Source14: http://www.ghg.net/clips/download/other/Bug_Fixes/objrtmch.c -Source15: http://www.ghg.net/clips/download/other/FunctionContext.zip -Source16: http://www.ghg.net/clips/download/other/Bug_Fixes/DR0873.txt +Source14: objrtmch.c +Source15: FunctionContext.zip +Source16: DR0873.txt Source17: xclips.desktop +# The following source was generated with the following commands: +# mkdir html +# cd html +# for i in apg.htm bpg.htm ig.htm ug.htm; do +# wget -p -nH --cut-dirs=2 --convert-links http://clipsrules.sourceforge.net/documentation/v624/$i +# dos2unix $i +# done +# cd .. +# tar -cjf clips-doc-html.tar.bz2 html +Source18: clips-doc-html.tar.bz2 Patch0: clips-6.24-linux.patch Patch1: clips-6.24-time-sysdep.c.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel libXt-devel libXext-devel libXmu-devel libXaw-devel xorg-x11-server-Xorg xorg-x11-proto-devel xorg-x11-xbitmaps desktop-file-utils +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: ncurses-devel +BuildRequires: libXt-devel libXext-devel libXmu-devel libXaw-devel +BuildRequires: xorg-x11-server-Xorg xorg-x11-proto-devel xorg-x11-xbitmaps +BuildRequires: desktop-file-utils BuildRequires: automake autoconf libtool +BuildRequires: pkgconfig +BuildRequires: ImageMagick %description CLIPS is a productive development and delivery expert system tool which @@ -46,7 +61,7 @@ This package contains the run-time libraries needed for CLIPS applications. %package devel -Summary: Headers for developing programs that will embed CLIPS +Summary: C headers for developing programs that will embed CLIPS Group: Development/Libraries Requires: clips-libs = %{version}-%{release} Requires: ncurses-devel pkgconfig @@ -58,6 +73,8 @@ %package xclips Summary: X interface to CLIPS Group: Development/Tools +Requires: %{name} = %{version}-%{release} +Requires: hicolor-icon-theme %description xclips X interface to CLIPS. @@ -73,15 +90,15 @@ The following are some of the documents in this package: - Proceedings of the Third Conference on CLIPS, 1994 (3CCP.pdf) - Application abstracts (abstract.pdf) -- CLIPS Reference Manual, Volume II, Advanced Programming Guide (apg.pdf) +- CLIPS Reference Manual, Volume I, Basic Programming Guide (bpg.pdf,bpg.htm) +- CLIPS Reference Manual, Volume II, Adv. Programming Guide (apg.pdf, apg.htm) +- CLIPS Reference Manual, Volume III, Interfaces Guide (ig.pdf,ig.htm) - CLIPS Architecture Manual (arch5-1.pdf) -- CLIPS Reference Manual, Volume I, Basic Programming Guide (bpg.pdf) -- CLIPS Reference Manual, Volume III, Interfaces Guide (ig.pdf) -- CLIPS Users Guide (usrguide.pdf) +- CLIPS Users Guide (ug.pdf,ug.htm) %prep -%setup -q -a 1 -a 2 -a 15 -c +%setup -q -a 1 -a 2 -a 15 -a 18 -c mv x-prjct/xinterface clipssrc/ mv x-prjct/color clipssrc/ mv clipssrc/clipssrc clipssrc/clips @@ -110,18 +127,27 @@ %{__make} %{?_smp_mflags} %install -%{__rm} -rf %{buildroot} -%{__install} -D %{SOURCE10} %{buildroot}%{_datadir}/pixmaps/xclips.png -%{__install} -m 644 -D %{SOURCE11} %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d/clips-init.el -%{__install} -m 644 -D %{SOURCE12} %{buildroot}%{_datadir}/emacs/site-lisp/clips-mode.el -%{__install} -m 644 -D %{SOURCE13} %{buildroot}%{_datadir}/emacs/site-lisp/inf-clips.el cd clipssrc +%{__rm} -rf %{buildroot} +%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p" +find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' +%{__install} -p --mode=0644 -D %{SOURCE11} %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d/clips-init.el +%{__install} -p --mode=0644 -D %{SOURCE12} %{buildroot}%{_datadir}/emacs/site-lisp/clips-mode.el +%{__install} -p --mode=0644 -D %{SOURCE13} %{buildroot}%{_datadir}/emacs/site-lisp/inf-clips.el + +# create icons +# create 16x16, 32x32, 64x64, 128x128 icons +for s in 16 32 64 128 ; do + %{__mkdir_p} %{buildroot}/%{_datadir}/icons/hicolor/${s}x${s}/apps/ + convert -scale ${s}x${s} \ + %{SOURCE10} \ + %{buildroot}/%{_datadir}/icons/hicolor/${s}x${s}/apps/xclips.png +done + desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE17} -%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p" -find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' %clean %{__rm} -rf %{buildroot} @@ -130,6 +156,19 @@ %postun libs -p /sbin/ldconfig +%post xclips +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 xclips +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}/clips @@ -156,17 +195,34 @@ %defattr(-,root,root,-) %{_bindir}/xclips %{_bindir}/xclips-color -%{_datadir}/pixmaps/xclips.png +%{_datadir}/icons/hicolor/*x*/apps/xclips.png %{_datadir}/applications/*xclips.desktop %files doc %defattr(-,root,root,-) %doc Examples/ -%doc abstract.pdf arch5-1.pdf bpg.pdf usrguide.pdf 3CCP.pdf +%doc abstract.pdf arch5-1.pdf bpg.pdf ug.pdf 3CCP.pdf %doc apg.pdf %doc ig.pdf +%doc html/ %changelog +* Tue Mar 03 2009 Rick L Vinyard Jr 6.24-27 +- Updated desktop entry file to add categories and remove deprecated items +- Added hicolor-icon-theme requires to xclips +- Install xclips icons to hicolor directory +- Added validation to desktop file +- Added icon cache rebuild to pre and post sections for xclips +- Added preserve to file installs +- Made install modes explicit +- Added pkgconfig and ImageMagick to build requires +- Updated URL +- Updated source URL's +- Added html docs + +* Tue Feb 24 2009 Fedora Release Engineering - 6.24-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Feb 19 2008 Fedora Release Engineering - 6.24-25 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clips/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Feb 2007 19:19:53 -0000 1.6 +++ sources 3 Mar 2009 18:33:56 -0000 1.7 @@ -1,14 +1,12 @@ -a6a60733af08f9e9e6d0928272ad4dd9 3CCP.pdf -f5c02b997199f3ede779b8502af2ba09 AllExamples.tar.Z cd3ecddc4e538b8af0e5cf08ab7fd89c abstract.pdf +ccba9d912375e57a1b7d9eba12da4198 clips_core_source_624.tar.Z +1bb0d0e684742188b8c14912c26f12cb x_windows_ide_source_624.tar.Z +f5c02b997199f3ede779b8502af2ba09 examples_624.tar.Z fae2267d96fb95603345e91c9990caaa apg.pdf 9a13d2ed18fe6ab67902d5bce29957cb arch5-1.pdf 63891971aa782dc67c2de0579647247e bpg.pdf -ccba9d912375e57a1b7d9eba12da4198 clipssrc.tar.Z 89beca5caa08b30d8285cca7f1df1d26 ig.pdf -44e54697a8acf3509bc4ca51d88b65bd usrguide.pdf -1bb0d0e684742188b8c14912c26f12cb x-prjct.tar.Z -ac0d7c465a909158ae908fe39d68478c FunctionContext.zip -da5ad2328e4d8dd7680d8bb28005e90d objrtmch.c -f80256270a8a93504e37644ab9bc16b4 DR0873.txt -cbf0382ca4153adc0446b0bf5c123559 clips-6.24-linux.patch.bz2 +44e54697a8acf3509bc4ca51d88b65bd ug.pdf +a6a60733af08f9e9e6d0928272ad4dd9 3CCP.pdf +99f463e8a2536198da37e9dc73304322 clips-doc-html.tar.bz2 +0cb3238a5be85211658ba7ca47257bf8 clips-6.24-linux.patch Index: xclips.desktop =================================================================== RCS file: /cvs/pkgs/rpms/clips/F-10/xclips.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xclips.desktop 26 Aug 2007 06:16:44 -0000 1.1 +++ xclips.desktop 3 Mar 2009 18:33:56 -0000 1.2 @@ -1,10 +1,9 @@ [Desktop Entry] -Encoding=UTF-8 Name=XCLIPS GenericName=XCLIPS Expert System Exec=xclips -Icon=xclips.png +Icon=xclips Terminal=false Type=Application -Categories=Application;Development; +Categories=Development;Building;IDE;Education;Science;ArtificialIntelligence;ComputerScience;Robotics; Version=1.0 From jeckersb at fedoraproject.org Tue Mar 3 18:35:07 2009 From: jeckersb at fedoraproject.org (John Eckersberg) Date: Tue, 3 Mar 2009 18:35:07 +0000 (UTC) Subject: rpms/libyaml/F-9 libyaml.spec,1.1,1.2 Message-ID: <20090303183507.2D74070116@cvs1.fedora.phx.redhat.com> Author: jeckersb Update of /cvs/pkgs/rpms/libyaml/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28033 Modified Files: libyaml.spec Log Message: do not include static libraries in RPMs Index: libyaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/libyaml/F-9/libyaml.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libyaml.spec 3 Mar 2009 01:08:33 -0000 1.1 +++ libyaml.spec 3 Mar 2009 18:34:36 -0000 1.2 @@ -1,6 +1,6 @@ Name: libyaml Version: 0.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: Development/Libraries @@ -38,7 +38,7 @@ %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL="install -p" install -rm -f %{buildroot}%{_libdir}/*.la +rm -f %{buildroot}%{_libdir}/*.{la,a} %clean rm -rf %{buildroot} @@ -60,11 +60,13 @@ %defattr(-,root,root,-) %doc doc/html %{_libdir}/%{name}*.so -%{_libdir}/*a %{_includedir}/yaml.h %changelog +* Tue Mar 3 2009 John Eckersberg - 0.1.2-3 +- Remove static libraries + * Thu Feb 26 2009 John Eckersberg - 0.1.2-2 - Remove README and LICENSE from docs on -devel package - Remove -static package and merge contents into the -devel package From kyle at fedoraproject.org Tue Mar 3 18:36:50 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Tue, 3 Mar 2009 18:36:50 +0000 (UTC) Subject: rpms/kernel/devel hda_intel-prealloc-4mb-dmabuffer.patch, NONE, 1.1 kernel.spec, 1.1368, 1.1369 Message-ID: <20090303183650.1F86970116@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28425 Modified Files: kernel.spec Added Files: hda_intel-prealloc-4mb-dmabuffer.patch Log Message: * Tue Mar 03 2009 Kyle McMartin - Allocate a bigger default DMA buffer for snd-hda_intel. Azalia uses a 32-bit or wider DMA mask, so this is fine. hda_intel-prealloc-4mb-dmabuffer.patch: --- NEW FILE hda_intel-prealloc-4mb-dmabuffer.patch --- diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index c8d9178..7d3bb15 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1774,6 +1774,7 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec, struct azx_pcm *apcm; int pcm_dev = cpcm->device; int s, err; + size_t prealloc_min = 64*1024; /* 64KB */ if (pcm_dev >= AZX_MAX_PCMS) { snd_printk(KERN_ERR SFX "Invalid PCM device number %d\n", @@ -1807,10 +1808,21 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec, if (cpcm->stream[s].substreams) snd_pcm_set_ops(pcm, s, &azx_pcm_ops); } + /* buffer pre-allocation */ + + /* subtle, don't allocate a big buffer for modems... + * also, don't just test 32BIT_MASK, since azx supports + * 64-bit DMA in some cases. + */ + /* lennart wants a 2.2MB buffer for 2sec of 48khz */ + if (pcm->dev_class == SNDRV_PCM_CLASS_GENERIC && + chip->pci->dma_mask >= DMA_32BIT_MASK) + prealloc_min = 4 * 1024 * 1024; /* 4MB */ + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(chip->pci), - 1024 * 64, 32 * 1024 * 1024); + prealloc_min, 32 * 1024 * 1024); return 0; } Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1368 retrieving revision 1.1369 diff -u -r1.1368 -r1.1369 --- kernel.spec 3 Mar 2009 18:18:42 -0000 1.1368 +++ kernel.spec 3 Mar 2009 18:36:19 -0000 1.1369 @@ -628,6 +628,7 @@ Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch +Patch610: hda_intel-prealloc-4mb-dmabuffer.patch Patch670: linux-2.6-ata-quirk.patch @@ -1149,6 +1150,7 @@ # squelch hda_beep by default ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch +ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch # ia64 ata quirk ApplyPatch linux-2.6-ata-quirk.patch @@ -1788,6 +1790,10 @@ %changelog * Tue Mar 03 2009 Kyle McMartin +- Allocate a bigger default DMA buffer for snd-hda_intel. Azalia uses a + 32-bit or wider DMA mask, so this is fine. + +* Tue Mar 03 2009 Kyle McMartin - Add bluetooth-testing git tree. Mostly bugfixes... * Tue Mar 03 2009 Dave Airlie From wtogami at fedoraproject.org Tue Mar 3 18:38:22 2009 From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=) Date: Tue, 3 Mar 2009 18:38:22 +0000 (UTC) Subject: rpms/nspluginwrapper/devel nspluginwrapper.spec,1.77,1.78 Message-ID: <20090303183822.D8FED70116@cvs1.fedora.phx.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/nspluginwrapper/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28727 Modified Files: nspluginwrapper.spec Log Message: Really Fix x86 32bit build (#488308) Index: nspluginwrapper.spec =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- nspluginwrapper.spec 2 Mar 2009 02:51:38 -0000 1.77 +++ nspluginwrapper.spec 3 Mar 2009 18:37:52 -0000 1.78 @@ -16,6 +16,14 @@ %define target_bits 32 %endif +%if "%{_target_cpu}" == "i586" +%define target_bits 32 +%endif + +%if "%{_target_cpu}" == "i686" +%define target_bits 32 +%endif + %if "%{_target_cpu}" == "ppc" %define target_bits 32 %endif @@ -65,7 +73,7 @@ Summary: A compatibility layer for Netscape 4 plugins Name: nspluginwrapper Version: 1.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Source0: %{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2 Source1: %{plugin_config_name}.tar.gz Source2: plugin-config.sh.in @@ -236,6 +244,9 @@ %changelog +* Tue Mar 03 2009 Warren Togami - 1.3.0-5 +- Really Fix x86 32bit build (#488308) + * Sun Mar 01 2009 Warren Togami - 1.3.0-4 - Fix x86 32bit build From mclasen at fedoraproject.org Tue Mar 3 18:41:47 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 18:41:47 +0000 (UTC) Subject: rpms/gnome-desktop/devel .cvsignore, 1.80, 1.81 gnome-desktop.spec, 1.203, 1.204 sources, 1.80, 1.81 detect-monitors-dammit.patch, 1.1, NONE rr-leaks.patch, 1.1, NONE Message-ID: <20090303184147.4EB3D70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-desktop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29337 Modified Files: .cvsignore gnome-desktop.spec sources Removed Files: detect-monitors-dammit.patch rr-leaks.patch Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/.cvsignore,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- .cvsignore 19 Feb 2009 05:42:59 -0000 1.80 +++ .cvsignore 3 Mar 2009 18:41:16 -0000 1.81 @@ -1 +1 @@ -gnome-desktop-2.25.91.tar.bz2 +gnome-desktop-2.25.92.tar.bz2 Index: gnome-desktop.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.203 retrieving revision 1.204 diff -u -r1.203 -r1.204 --- gnome-desktop.spec 24 Feb 2009 22:47:37 -0000 1.203 +++ gnome-desktop.spec 3 Mar 2009 18:41:16 -0000 1.204 @@ -11,8 +11,8 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop -Version: 2.25.91 -Release: 3%{?dist} +Version: 2.25.92 +Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-desktop/2.25/%{name}-%{version}.tar.bz2 License: GPLv2+ and LGPLv2+ @@ -43,9 +43,6 @@ BuildRequires: gtk-doc >= %{gtk_doc_version} BuildRequires: automake autoconf libtool intltool -# http://bugzilla.gnome.org/show_bug.cgi?id=568160 -Patch0: detect-monitors-dammit.patch - %description The gnome-desktop package contains an internal library @@ -75,7 +72,6 @@ %prep %setup -q -%patch0 -p1 -b .detect-monitors-dammit %build %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper @@ -121,6 +117,9 @@ %doc %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Tue Mar 3 2009 Matthias Clasen - 2.25.92-1 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.91-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/sources,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- sources 19 Feb 2009 05:42:59 -0000 1.80 +++ sources 3 Mar 2009 18:41:16 -0000 1.81 @@ -1 +1 @@ -e5a7b7d0766205e1cfda10ec919688f6 gnome-desktop-2.25.91.tar.bz2 +96eefb592b2c8249ded40efbfb8399f5 gnome-desktop-2.25.92.tar.bz2 --- detect-monitors-dammit.patch DELETED --- --- rr-leaks.patch DELETED --- From jeckersb at fedoraproject.org Tue Mar 3 18:42:21 2009 From: jeckersb at fedoraproject.org (John Eckersberg) Date: Tue, 3 Mar 2009 18:42:21 +0000 (UTC) Subject: rpms/libyaml/EL-5 libyaml.spec,1.1,1.2 Message-ID: <20090303184221.22DE370116@cvs1.fedora.phx.redhat.com> Author: jeckersb Update of /cvs/pkgs/rpms/libyaml/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29467 Modified Files: libyaml.spec Log Message: do not include static libraries in RPMs Index: libyaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/libyaml/EL-5/libyaml.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libyaml.spec 3 Mar 2009 01:05:46 -0000 1.1 +++ libyaml.spec 3 Mar 2009 18:41:50 -0000 1.2 @@ -1,6 +1,6 @@ Name: libyaml Version: 0.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: Development/Libraries @@ -38,7 +38,7 @@ %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL="install -p" install -rm -f %{buildroot}%{_libdir}/*.la +rm -f %{buildroot}%{_libdir}/*.{la,a} %clean rm -rf %{buildroot} @@ -60,11 +60,13 @@ %defattr(-,root,root,-) %doc doc/html %{_libdir}/%{name}*.so -%{_libdir}/*a %{_includedir}/yaml.h %changelog +* Tue Mar 3 2009 John Eckersberg - 0.1.2-3 +- Remove static libraries + * Thu Feb 26 2009 John Eckersberg - 0.1.2-2 - Remove README and LICENSE from docs on -devel package - Remove -static package and merge contents into the -devel package From jeckersb at fedoraproject.org Tue Mar 3 18:43:39 2009 From: jeckersb at fedoraproject.org (John Eckersberg) Date: Tue, 3 Mar 2009 18:43:39 +0000 (UTC) Subject: rpms/libyaml/EL-4 libyaml.spec,1.1,1.2 Message-ID: <20090303184339.7A0CB70116@cvs1.fedora.phx.redhat.com> Author: jeckersb Update of /cvs/pkgs/rpms/libyaml/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29766 Modified Files: libyaml.spec Log Message: do not include static libraries in RPMs Index: libyaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/libyaml/EL-4/libyaml.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libyaml.spec 3 Mar 2009 01:04:16 -0000 1.1 +++ libyaml.spec 3 Mar 2009 18:43:09 -0000 1.2 @@ -1,6 +1,6 @@ Name: libyaml Version: 0.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.1 parser and emitter written in C Group: Development/Libraries @@ -38,7 +38,7 @@ %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL="install -p" install -rm -f %{buildroot}%{_libdir}/*.la +rm -f %{buildroot}%{_libdir}/*.{la,a} %clean rm -rf %{buildroot} @@ -60,11 +60,13 @@ %defattr(-,root,root,-) %doc doc/html %{_libdir}/%{name}*.so -%{_libdir}/*a %{_includedir}/yaml.h %changelog +* Tue Mar 3 2009 John Eckersberg - 0.1.2-3 +- Remove static libraries + * Thu Feb 26 2009 John Eckersberg - 0.1.2-2 - Remove README and LICENSE from docs on -devel package - Remove -static package and merge contents into the -devel package From s4504kr at fedoraproject.org Tue Mar 3 18:43:43 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Tue, 3 Mar 2009 18:43:43 +0000 (UTC) Subject: rpms/gnu-smalltalk/devel gst-retcode-tests.patch, NONE, 1.1 gnu-smalltalk.spec, 1.44, 1.45 Message-ID: <20090303184343.9879170116@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gnu-smalltalk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29786 Modified Files: gnu-smalltalk.spec Added Files: gst-retcode-tests.patch Log Message: Fix retcode source issue gst-retcode-tests.patch: --- NEW FILE gst-retcode-tests.patch --- diff --git a/tests/local.at b/tests/local.at index babc8c6..2dc1dee 100755 --- a/tests/local.at +++ b/tests/local.at @@ -25,8 +25,8 @@ m4_define([AT_CHECK_GST], [ *) image_path="m4_ifval([$2], [-I $2])" ;; esac - echo "{ (cd m4_ifval([$3], [$3], [$abs_top_builddir]) && gst $image_path $1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode" - AT_CHECK([{ (cd m4_ifval([$3], [$3], [$abs_top_builddir]) && gst $image_path $1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode], 0, [$4], [$5]) + echo "{ (cd m4_ifval([$3], [$3], [$abs_top_builddir]) && gst $image_path $1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode" + AT_CHECK([{ (cd m4_ifval([$3], [$3], [$abs_top_builddir]) && gst $image_path $1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode], 0, [$4], [$5]) ]) dnl AT_DIFF_TEST([FILE], [XFAILS]) diff --git a/tests/testsuite b/tests/testsuite index 2cf3968..58455f1 100755 --- a/tests/testsuite +++ b/tests/testsuite @@ -1352,14 +1352,14 @@ _ATEOF *) image_path="" ;; esac - echo "{ (cd $abs_srcdir && gst $image_path -r arrays.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode" + echo "{ (cd $abs_srcdir && gst $image_path -r arrays.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode" $at_traceoff -echo "$at_srcdir/testsuite.at:27: { (cd \$abs_srcdir && gst \$image_path -r arrays.st 2>&1); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode" +echo "$at_srcdir/testsuite.at:27: { (cd \$abs_srcdir && gst \$image_path -r arrays.st 2>&1); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" echo testsuite.at:27 >"$at_check_line_file" at_trace_this= if test -n "$at_traceon"; then - case "{ (cd $abs_srcdir && gst $image_path -r arrays.st 2>&1); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . retcode" in + case "{ (cd $abs_srcdir && gst $image_path -r arrays.st 2>&1); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" in *' '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; *) at_trace_this=yes ;; @@ -1367,12 +1367,12 @@ if test -n "$at_traceon"; then fi if test -n "$at_trace_this"; then - ( $at_traceon; { (cd $abs_srcdir && gst $image_path -r arrays.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1" + ( $at_traceon; { (cd $abs_srcdir && gst $image_path -r arrays.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stder1" at_status=$? grep '^ *+' "$at_stder1" >&2 grep -v '^ *+' "$at_stder1" >"$at_stderr" else - ( :; { (cd $abs_srcdir && gst $image_path -r arrays.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr" + ( :; { (cd $abs_srcdir && gst $image_path -r arrays.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi @@ -1420,14 +1420,14 @@ $at_traceon *) image_path="" ;; esac - echo "{ (cd $abs_srcdir && gst $image_path -r classes.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode" + echo "{ (cd $abs_srcdir && gst $image_path -r classes.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode" $at_traceoff -echo "$at_srcdir/testsuite.at:28: { (cd \$abs_srcdir && gst \$image_path -r classes.st 2>&1); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode" +echo "$at_srcdir/testsuite.at:28: { (cd \$abs_srcdir && gst \$image_path -r classes.st 2>&1); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" echo testsuite.at:28 >"$at_check_line_file" at_trace_this= if test -n "$at_traceon"; then - case "{ (cd $abs_srcdir && gst $image_path -r classes.st 2>&1); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . retcode" in + case "{ (cd $abs_srcdir && gst $image_path -r classes.st 2>&1); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" in *' '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; *) at_trace_this=yes ;; @@ -1435,12 +1435,12 @@ if test -n "$at_traceon"; then fi if test -n "$at_trace_this"; then - ( $at_traceon; { (cd $abs_srcdir && gst $image_path -r classes.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1" + ( $at_traceon; { (cd $abs_srcdir && gst $image_path -r classes.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stder1" at_status=$? grep '^ *+' "$at_stder1" >&2 grep -v '^ *+' "$at_stder1" >"$at_stderr" else - ( :; { (cd $abs_srcdir && gst $image_path -r classes.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr" + ( :; { (cd $abs_srcdir && gst $image_path -r classes.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi @@ -1488,14 +1488,14 @@ $at_traceon *) image_path="" ;; esac - echo "{ (cd $abs_srcdir && gst $image_path -r blocks.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode" + echo "{ (cd $abs_srcdir && gst $image_path -r blocks.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode" $at_traceoff -echo "$at_srcdir/testsuite.at:29: { (cd \$abs_srcdir && gst \$image_path -r blocks.st 2>&1); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode" +echo "$at_srcdir/testsuite.at:29: { (cd \$abs_srcdir && gst \$image_path -r blocks.st 2>&1); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" echo testsuite.at:29 >"$at_check_line_file" at_trace_this= if test -n "$at_traceon"; then - case "{ (cd $abs_srcdir && gst $image_path -r blocks.st 2>&1); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . retcode" in + case "{ (cd $abs_srcdir && gst $image_path -r blocks.st 2>&1); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" in *' '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; *) at_trace_this=yes ;; @@ -1503,12 +1503,12 @@ if test -n "$at_traceon"; then fi if test -n "$at_trace_this"; then - ( $at_traceon; { (cd $abs_srcdir && gst $image_path -r blocks.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1" + ( $at_traceon; { (cd $abs_srcdir && gst $image_path -r blocks.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stder1" at_status=$? grep '^ *+' "$at_stder1" >&2 grep -v '^ *+' "$at_stder1" >"$at_stderr" else - ( :; { (cd $abs_srcdir && gst $image_path -r blocks.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr" + ( :; { (cd $abs_srcdir && gst $image_path -r blocks.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi @@ -1556,14 +1556,14 @@ $at_traceon *) image_path="" ;; esac - echo "{ (cd $abs_srcdir && gst $image_path -r sets.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode" + echo "{ (cd $abs_srcdir && gst $image_path -r sets.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode" $at_traceoff -echo "$at_srcdir/testsuite.at:30: { (cd \$abs_srcdir && gst \$image_path -r sets.st 2>&1); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode" +echo "$at_srcdir/testsuite.at:30: { (cd \$abs_srcdir && gst \$image_path -r sets.st 2>&1); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" echo testsuite.at:30 >"$at_check_line_file" at_trace_this= if test -n "$at_traceon"; then - case "{ (cd $abs_srcdir && gst $image_path -r sets.st 2>&1); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . retcode" in + case "{ (cd $abs_srcdir && gst $image_path -r sets.st 2>&1); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" in *' '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; *) at_trace_this=yes ;; @@ -1571,12 +1571,12 @@ if test -n "$at_traceon"; then fi if test -n "$at_trace_this"; then - ( $at_traceon; { (cd $abs_srcdir && gst $image_path -r sets.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1" + ( $at_traceon; { (cd $abs_srcdir && gst $image_path -r sets.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stder1" at_status=$? grep '^ *+' "$at_stder1" >&2 grep -v '^ *+' "$at_stder1" >"$at_stderr" else - ( :; { (cd $abs_srcdir && gst $image_path -r sets.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr" + ( :; { (cd $abs_srcdir && gst $image_path -r sets.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi @@ -1624,14 +1624,14 @@ $at_traceon *) image_path="" ;; esac - echo "{ (cd $abs_srcdir && gst $image_path -r processes.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode" + echo "{ (cd $abs_srcdir && gst $image_path -r processes.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode" $at_traceoff -echo "$at_srcdir/testsuite.at:31: { (cd \$abs_srcdir && gst \$image_path -r processes.st 2>&1); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode" +echo "$at_srcdir/testsuite.at:31: { (cd \$abs_srcdir && gst \$image_path -r processes.st 2>&1); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" echo testsuite.at:31 >"$at_check_line_file" at_trace_this= if test -n "$at_traceon"; then - case "{ (cd $abs_srcdir && gst $image_path -r processes.st 2>&1); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . retcode" in + case "{ (cd $abs_srcdir && gst $image_path -r processes.st 2>&1); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" in *' '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; *) at_trace_this=yes ;; @@ -1639,12 +1639,12 @@ if test -n "$at_traceon"; then fi if test -n "$at_trace_this"; then - ( $at_traceon; { (cd $abs_srcdir && gst $image_path -r processes.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1" + ( $at_traceon; { (cd $abs_srcdir && gst $image_path -r processes.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stder1" at_status=$? grep '^ *+' "$at_stder1" >&2 grep -v '^ *+' "$at_stder1" >"$at_stderr" else - ( :; { (cd $abs_srcdir && gst $image_path -r processes.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr" + ( :; { (cd $abs_srcdir && gst $image_path -r processes.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi @@ -1692,14 +1692,14 @@ $at_traceon *) image_path="" ;; esac - echo "{ (cd $abs_srcdir && gst $image_path -r exceptions.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode" + echo "{ (cd $abs_srcdir && gst $image_path -r exceptions.st 2>&1); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode" $at_traceoff -echo "$at_srcdir/testsuite.at:32: { (cd \$abs_srcdir && gst \$image_path -r exceptions.st 2>&1); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode" +echo "$at_srcdir/testsuite.at:32: { (cd \$abs_srcdir && gst \$image_path -r exceptions.st 2>&1); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" echo testsuite.at:32 >"$at_check_line_file" at_trace_this= if test -n "$at_traceon"; then - case "{ (cd $abs_srcdir && gst $image_path -r exceptions.st 2>&1); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . retcode" in + case "{ (cd $abs_srcdir && gst $image_path -r exceptions.st 2>&1); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" in [...3689 lines suppressed...] esac - echo "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Magritte); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode" + echo "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Magritte); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode" $at_traceoff -echo "$at_srcdir/testsuite.at:156: { (cd \$abs_top_builddir && gst \$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p Magritte); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode" +echo "$at_srcdir/testsuite.at:156: { (cd \$abs_top_builddir && gst \$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p Magritte); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" echo testsuite.at:156 >"$at_check_line_file" at_trace_this= if test -n "$at_traceon"; then - case "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Magritte); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . retcode" in + case "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Magritte); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" in *' '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; *) at_trace_this=yes ;; @@ -9387,12 +9387,12 @@ if test -n "$at_traceon"; then fi if test -n "$at_trace_this"; then - ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Magritte); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1" + ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Magritte); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stder1" at_status=$? grep '^ *+' "$at_stder1" >&2 grep -v '^ *+' "$at_stder1" >"$at_stderr" else - ( :; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Magritte); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr" + ( :; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Magritte); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi @@ -9445,14 +9445,14 @@ $at_traceon case $ret in 2) exit 77 ;; 0|1) exit $ret ;; - esac); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode" + esac); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode" $at_traceoff echo "$at_srcdir/testsuite.at:157: { (cd \$abs_top_builddir && gst \$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p ROE ret=\$? case \$ret in 2) exit 77 ;; 0|1) exit \$ret ;; - esac); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode" + esac); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" echo testsuite.at:157 >"$at_check_line_file" at_trace_this= @@ -9466,7 +9466,7 @@ if test -n "$at_trace_this"; then case $ret in 2) exit 77 ;; 0|1) exit $ret ;; - esac); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1" + esac); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stder1" at_status=$? grep '^ *+' "$at_stder1" >&2 grep -v '^ *+' "$at_stder1" >"$at_stderr" @@ -9476,7 +9476,7 @@ else case $ret in 2) exit 77 ;; 0|1) exit $ret ;; - esac); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr" + esac); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi @@ -9524,14 +9524,14 @@ $at_traceon *) image_path="" ;; esac - echo "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Seaside-Core); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode" + echo "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Seaside-Core); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode" $at_traceoff -echo "$at_srcdir/testsuite.at:158: { (cd \$abs_top_builddir && gst \$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p Seaside-Core); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode" +echo "$at_srcdir/testsuite.at:158: { (cd \$abs_top_builddir && gst \$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p Seaside-Core); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" echo testsuite.at:158 >"$at_check_line_file" at_trace_this= if test -n "$at_traceon"; then - case "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Seaside-Core); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . retcode" in + case "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Seaside-Core); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" in *' '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; *) at_trace_this=yes ;; @@ -9539,12 +9539,12 @@ if test -n "$at_traceon"; then fi if test -n "$at_trace_this"; then - ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Seaside-Core); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1" + ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Seaside-Core); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stder1" at_status=$? grep '^ *+' "$at_stder1" >&2 grep -v '^ *+' "$at_stder1" >"$at_stderr" else - ( :; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Seaside-Core); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr" + ( :; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Seaside-Core); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi @@ -9592,14 +9592,14 @@ $at_traceon *) image_path="" ;; esac - echo "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Sport); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode" + echo "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Sport); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode" $at_traceoff -echo "$at_srcdir/testsuite.at:159: { (cd \$abs_top_builddir && gst \$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p Sport); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode" +echo "$at_srcdir/testsuite.at:159: { (cd \$abs_top_builddir && gst \$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p Sport); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" echo testsuite.at:159 >"$at_check_line_file" at_trace_this= if test -n "$at_traceon"; then - case "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Sport); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . retcode" in + case "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Sport); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" in *' '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; *) at_trace_this=yes ;; @@ -9607,12 +9607,12 @@ if test -n "$at_traceon"; then fi if test -n "$at_trace_this"; then - ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Sport); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1" + ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Sport); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stder1" at_status=$? grep '^ *+' "$at_stder1" >&2 grep -v '^ *+' "$at_stder1" >"$at_stderr" else - ( :; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Sport); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr" + ( :; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Sport); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi @@ -9660,14 +9660,14 @@ $at_traceon *) image_path="" ;; esac - echo "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Swazoo); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode" + echo "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Swazoo); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode" $at_traceoff -echo "$at_srcdir/testsuite.at:160: { (cd \$abs_top_builddir && gst \$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p Swazoo); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode" +echo "$at_srcdir/testsuite.at:160: { (cd \$abs_top_builddir && gst \$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p Swazoo); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" echo testsuite.at:160 >"$at_check_line_file" at_trace_this= if test -n "$at_traceon"; then - case "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Swazoo); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . retcode" in + case "{ (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Swazoo); echo exit $? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" in *' '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; *) at_trace_this=yes ;; @@ -9675,12 +9675,12 @@ if test -n "$at_traceon"; then fi if test -n "$at_trace_this"; then - ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Swazoo); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1" + ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Swazoo); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stder1" at_status=$? grep '^ *+' "$at_stder1" >&2 grep -v '^ *+' "$at_stder1" >"$at_stderr" else - ( :; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Swazoo); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr" + ( :; { (cd $abs_top_builddir && gst $image_path -f $abs_top_srcdir/scripts/Test.st --verbose -p Swazoo); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi @@ -9733,14 +9733,14 @@ $at_traceon case $ret in 2) exit 77 ;; 0|1) exit $ret ;; - esac); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode" + esac); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode" $at_traceoff echo "$at_srcdir/testsuite.at:161: { (cd \$abs_top_builddir && gst \$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p ZLib ret=\$? case \$ret in 2) exit 77 ;; 0|1) exit \$ret ;; - esac); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode" + esac); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . ./retcode" echo testsuite.at:161 >"$at_check_line_file" at_trace_this= @@ -9754,7 +9754,7 @@ if test -n "$at_trace_this"; then case $ret in 2) exit 77 ;; 0|1) exit $ret ;; - esac); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1" + esac); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stder1" at_status=$? grep '^ *+' "$at_stder1" >&2 grep -v '^ *+' "$at_stder1" >"$at_stderr" @@ -9764,7 +9764,7 @@ else case $ret in 2) exit 77 ;; 0|1) exit $ret ;; - esac); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr" + esac); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . ./retcode ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi Index: gnu-smalltalk.spec =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- gnu-smalltalk.spec 24 Feb 2009 23:54:55 -0000 1.44 +++ gnu-smalltalk.spec 3 Mar 2009 18:43:12 -0000 1.45 @@ -1,10 +1,11 @@ Summary: GNU Smalltalk Name: gnu-smalltalk Version: 3.1 -Release: 2%{?dist} +Release: 3%{?dist} Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz Patch1: gst-3.1-am.patch Patch2: gst-3.1-tst.patch +Patch3: gst-retcode-tests.patch License: GPLv2 Group: Development/Languages URL: http://www.gnu.org/software/smalltalk/smalltalk.html @@ -73,6 +74,7 @@ %setup -q -n smalltalk-%{version} %patch1 -p1 -b .auto %patch2 -p1 -b .tst +%patch3 -p1 %build autoreconf @@ -178,7 +180,10 @@ %{_datadir}/emacs/site-lisp/* %changelog -* Tue Feb 24 2009 Fedora Release Engineering - 3.1-2 +* Tue Mar 3 2009 Jochen Schmitt 3.1-3 +- Fix retcode source issue + +* Tue Feb 24 2009 Fedora Release Engineering 3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Sun Oct 19 2008 Jochen Schmitt 3.1-1 From mtasaka at fedoraproject.org Tue Mar 3 18:58:24 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Tue, 3 Mar 2009 18:58:24 +0000 (UTC) Subject: rpms/WebKit/devel WebKit.spec,1.27,1.28 Message-ID: <20090303185824.60D4A70116@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/WebKit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv370 Modified Files: WebKit.spec Log Message: * Wed Mar 4 2009 Mamoru Tasaka - 1.1.0-0.21.svn41071 - Compile libJavaScriptCore.a with -fno-strict-aliasing to do workaround for #488112 Index: WebKit.spec =================================================================== RCS file: /cvs/extras/rpms/WebKit/devel/WebKit.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- WebKit.spec 23 Feb 2009 23:43:46 -0000 1.27 +++ WebKit.spec 3 Mar 2009 18:57:53 -0000 1.28 @@ -36,7 +36,7 @@ Name: WebKit Version: 1.1.0 -Release: 0.20.svn%{svn_revision}%{?dist} +Release: 0.21.svn%{svn_revision}%{?dist} Summary: Web content engine library Group: Development/Libraries @@ -134,6 +134,11 @@ make %{?_smp_mflags} +# workaround for bug 488112 +# Compile libJavaScriptCore.a with -fno-strict-aliasing +touch JavaScriptCore/AllInOneFile.cpp +make %{?_smp_mflags} CXXFLAGS="%{optflags} -fno-strict-aliasing" + %install rm -rf %{buildroot} @@ -191,6 +196,10 @@ %changelog +* Wed Mar 4 2009 Mamoru Tasaka - 1.1.0-0.21.svn41071 +- Compile libJavaScriptCore.a with -fno-strict-aliasing to + do workaround for #488112 + * Mon Feb 23 2009 Fedora Release Engineering - 1.1.0-0.20.svn41071 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From dcbw at fedoraproject.org Tue Mar 3 19:03:12 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Tue, 3 Mar 2009 19:03:12 +0000 (UTC) Subject: rpms/knetworkmanager/F-10 knetworkmanager-0.7-no-blank-psk.patch, NONE, 1.1 knetworkmanager.spec, 1.24, 1.25 Message-ID: <20090303190312.C8DDC70116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/knetworkmanager/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1259 Modified Files: knetworkmanager.spec Added Files: knetworkmanager-0.7-no-blank-psk.patch Log Message: * Tue Mar 3 2009 Dan Williams - 0.7-0.8.20080926svn - don't send blank passwords in settings (rh #486877) knetworkmanager-0.7-no-blank-psk.patch: --- NEW FILE knetworkmanager-0.7-no-blank-psk.patch --- diff -up knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp.fix knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp --- knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp.fix 2009-03-02 15:28:38.000000000 -0500 +++ knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp 2009-03-02 15:30:01.000000000 -0500 @@ -290,14 +290,9 @@ WirelessSecurity::toMap() const map.insert(NM_SETTING_WIRELESS_SECURITY_PAIRWISE, QDBusData::fromQValueList(ciphers)); } - if (!_psk.isNull()) - map.insert(NM_SETTING_WIRELESS_SECURITY_PSK, QDBusData::fromString("")); - if (!_leapUsername.isEmpty()) map.insert(NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, QDBusData::fromString(_leapUsername)); - if (!_leapPassword.isEmpty()) - map.insert(NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, QDBusData::fromString("")); return map; } Index: knetworkmanager.spec =================================================================== RCS file: /cvs/pkgs/rpms/knetworkmanager/F-10/knetworkmanager.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- knetworkmanager.spec 20 Oct 2008 17:21:35 -0000 1.24 +++ knetworkmanager.spec 3 Mar 2009 19:02:42 -0000 1.25 @@ -2,7 +2,7 @@ Name: knetworkmanager Version: 0.7 -Release: 0.7.%{svn}%{?dist} +Release: 0.8.%{svn}%{?dist} Summary: KDE applet for Network Manager Group: Applications/Internet @@ -13,6 +13,7 @@ Source1: knetworkmanager-svn_checkout.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: knetworkmanager-0.7-no-blank-psk.patch BuildRequires: automake libtool BuildRequires: dbus-qt3-devel >= 0.8.1 @@ -58,7 +59,7 @@ %prep %setup -q -n %{name}-%{version} - +%patch0 -p1 make -f admin/Makefile.common @@ -167,6 +168,9 @@ %changelog +* Tue Mar 3 2009 Dan Williams - 0.7-0.8.20080926svn +- don't send blank passwords in settings (rh #486877) + * Mon Oct 20 2008 Rex Dieter - 0.7-0.7.20080926svn - fix icon hack (from 0.7-0.4) From sindrepb at fedoraproject.org Tue Mar 3 19:10:46 2009 From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=) Date: Tue, 3 Mar 2009 19:10:46 +0000 (UTC) Subject: rpms/avant-window-navigator/devel avant-window-navigator-0.3.2-python-platform.patch, NONE, 1.1 avant-window-navigator.spec, 1.27, 1.28 Message-ID: <20090303191046.5812170116@cvs1.fedora.phx.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/avant-window-navigator/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2535 Modified Files: avant-window-navigator.spec Added Files: avant-window-navigator-0.3.2-python-platform.patch Log Message: add patch to fix #486395 avant-window-navigator-0.3.2-python-platform.patch: --- NEW FILE avant-window-navigator-0.3.2-python-platform.patch --- diff -up ./bindings/python/Makefile.am.orig ./bindings/python/Makefile.am --- ./bindings/python/Makefile.am.orig 2009-03-03 20:00:10.000000000 +0100 +++ ./bindings/python/Makefile.am 2009-03-03 20:01:13.000000000 +0100 @@ -1,7 +1,7 @@ NULL = # awn python scripts -pyawndir = $(PYTHON_SITE_PKG)/awn +pyawndir = $(PYTHON_PLATFORM_PKG)/awn pyawn_PYTHON = __init__.py INCLUDES = \ diff -up ./bindings/python/Makefile.in.orig ./bindings/python/Makefile.in --- ./bindings/python/Makefile.in.orig 2009-03-03 20:00:17.000000000 +0100 +++ ./bindings/python/Makefile.in 2009-03-03 20:00:43.000000000 +0100 @@ -286,7 +286,7 @@ top_srcdir = @top_srcdir@ NULL = # awn python scripts -pyawndir = $(PYTHON_SITE_PKG)/awn +pyawndir = $(PYTHON_PLATFORM_PKG)/awn pyawn_PYTHON = __init__.py INCLUDES = \ $(PYTHON_CPPFLAGS) \ Index: avant-window-navigator.spec =================================================================== RCS file: /cvs/pkgs/rpms/avant-window-navigator/devel/avant-window-navigator.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- avant-window-navigator.spec 24 Feb 2009 03:37:40 -0000 1.27 +++ avant-window-navigator.spec 3 Mar 2009 19:10:15 -0000 1.28 @@ -1,10 +1,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - Name: avant-window-navigator Version: 0.3.2 -Release: 4%{?dist} +Release: 5%{?dist} Provides: avant-window-navigator-python = %{version}-%{release} Obsoletes: avant-window-navigator-python < 0.2.6-3 @@ -16,8 +14,8 @@ License: GPLv2+ and LGPLv2+ URL: https://launchpad.net/awn Source0: https://launchpad.net/awn/0.2/0.2/+download/%{name}-%{version}.tar.gz -#fixes schemas file -#Patch0: avant-window-navigator-schemas.patch +#fixes issue with python binding on x86 +Patch0: avant-window-navigator-0.3.2-python-platform.patch #fixes issue where awn only appears on one desktop, #469032 #Patch1: avant-window-navigator-0.2.6-sticky.patch @@ -51,9 +49,12 @@ %prep %setup -q -#%patch0 -p1 +%patch0 -p1 #%patch1 -p0 +#patch alters Makefile.am +cd bindnigs/python/ && autoreconf -i + #fix permissions chmod 0644 $RPM_BUILD_DIR/%{name}-%{version}/src/xutils.h chmod 0644 $RPM_BUILD_DIR/%{name}-%{version}/src/xutils.c @@ -155,8 +156,6 @@ %{_datadir}/avant-window-navigator %{_datadir}/icons/hicolor/*/apps/* %{python_sitearch}/awn -%{python_sitelib}/awn - %files devel %defattr(-,root,root,-) @@ -166,6 +165,9 @@ %changelog +* Tue Mar 03 2009 Sindre Pedersen Bj??rdal - 0.3.2-5 +- Fix issue with arch dependent python files installed to noarch dir, #486395 + * Mon Feb 23 2009 Fedora Release Engineering - 0.3.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rvinyard at fedoraproject.org Tue Mar 3 19:12:42 2009 From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.) Date: Tue, 3 Mar 2009 19:12:42 +0000 (UTC) Subject: rpms/clips/F-9 DR0873.txt, NONE, 1.1 FunctionContext.zip, NONE, 1.1 objrtmch.c, NONE, 1.1 .cvsignore, 1.4, 1.5 clips.spec, 1.10, 1.11 sources, 1.6, 1.7 xclips.desktop, 1.1, 1.2 Message-ID: <20090303191242.D97B470116@cvs1.fedora.phx.redhat.com> Author: rvinyard Update of /cvs/pkgs/rpms/clips/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2908 Modified Files: .cvsignore clips.spec sources xclips.desktop Added Files: DR0873.txt FunctionContext.zip objrtmch.c Log Message: --- NEW FILE DR0873.txt --- CLIPS DISCREPANCY REPORT DR # : 0873 DATE : 06/22/06 STATUS : OPEN REPORTED BY : CLIPS User ORGANIZATION : PHONE # : ADDRESS : CLIPS VERSION : CLIPS 6.24 HOST : All OS : All ******************** PROBLEM DESCRIPTION: ******************** Use of the object-pattern-match-delay function could cause a NULL pointer exception. ***************** COMMAND SEQUENCE: ***************** 1) Load this program: (defclass A (is-a USER) (slot x)) (defclass B (is-a USER) (slot y)) (definstances initialization (ob1 of A (x 1)) (ob2 of B (y 1))) (defrule one (object (is-a A) (x ~0)) (object (is-a B) (y ?val)) (test (> ?val 0)) =>) (defrule trigger => (object-pattern-match-delay (modify-instance [ob1] (x 2)) (make-instance [ob2] of B (y 2)))) 2) Issue a (reset) command followed by a (run) command. *********** RESOLUTION: *********** Modified the QueueObjectMatchAction function in objrtmch.c so that instance retract actions always occur before instance assert and modify actions. This prevents the pattern matching process from attempting the evaluation of a join expression that accesses the slots of a retracted instance. ******* STATUS: ******* FIXED BY : Gary Riley DATE : 06/22/06 IMPLEMENTED BY : Gary Riley IN VERSION : 6.25 DATE : DOCUMENTED BY : DATE : TESTED BY : DATE : APPROVED BY : DATE : --- NEW FILE FunctionContext.zip --- PK `????]???????A??g?x?t?x??CJN??S??9O? ?ga??G???n/?8???????'?2???????????????3?W??????:??.ys?;?:=???g'???xYjo, ?????t?0z at .?< c?? I?a<$1?????@? ? ?.dY?>?A????T? e??>??~P?%$?????4???pL?D??f?~2?? F?Y?&[1???;???4*\x??u?PIS??????1!?h%/?s?r?????u? T?????'-?????w??r? w?? ??a????P??Y|#V????? ??{????/p?%$??G??^?>?)?~?2F??j?Vu?v5:??N/?z?;????????^?g?|?9?v?>???o?g?????DB{co?X??`M?1g?:s?jimM?IS??^[???,??@k h??C%V?O??4;???g?????3??E??d???^\?????????&?b/m????]???I?\??1$??g ??q?pu?????O??r??k???DFIA??W?6? Y?????C??????????6??f???????&???m?]????? ????:d???b?!?????:??-??T?????:~???C????~?????T????j?????%?#?i?????'??=??B??gWU*Jg??O???$`?k???s???6q?[?4???H???)v*&?`??H0???????"????b[~????o?6I" ;F.?L-??=M3? ?8?M"???(Y??? ???I?:2Ii_$?Q??????cB?o/FL???C?w?;J???*???? ???.N?1i? ?14Kj??~?9 yn?O *?}$|M1J???????S?|s?G ?????O8?L?-?~??#???S?????????|??PN?????3???f???s????oY??49V??5???J???2????N??'?AN?? F??Ni??$w?????%)???U?Y?r_?NU??R?/Y!????'?;r5?Y???5????;H?1?qE??$???K?,??R^]??20M?r ?X???3|??H?G>??m???8*va1??? ?F?#??`?|<F????????a(Dg??xY???t>??#A????L0;j? XI?b????,8?i????????C#Fm?rZ}n? _?jr?tW?????5k?|j N???9w??cI??eu>a???? ??z???1??^O?ld?5??x??h?????L}?+?sf?x6;??C>?h ?CV`????????z?"+??iE F  G?? 2C????#??~?_??n ?R??{??J;M?? ;p?)x??????$?"W??$?e?5?w??f?k???_3?6J#?jm xM`??Xt?o??7R?? ????*? ?xA??)3P??Lv?K????????????+??m??v??}(P???S???????(E????c???$???????)?z?r^(?$%?Q6I?#1???? 3AB?9<???Y??[r????W?????a ????$??f?_???~.?????M??y?? ??^K??" ?`??R ???D{ ?????SYi?9??S????$,?l>6??Q6?L??L? ???j???P?F ? ,?.?R?*??C`?????LS??? "?d?Y?N?c?????`??01 Cm???[?|?/??jiMY???/?XO???X=2??? ????L??N??w?*g????#??????3?(???b????q??DM_ ????????L??Jo1Vy?|????Pk??2f6n,??-U?C?T???B??5?u??1Pq?g |??K?? ?????~??{?oWr-????xx5????(?p?S?c??A|x?FC?'?????\u{?k6 n?QJjn?MQ??H?=Mi?Z?>5???bB?Xl?Fi?E?]J??$Z?Kt??abC`&z??/??????q?:?0xc?em?{??o?47???????&???w?&?IS???v;?H????v4??g?w?~?d`5?&1????)v????E???H:?5?Rl{ m?z??4?????T??jTY#O_(5J??&?y??g?t??D;?G???:Jfo??'??????Tc??x? f??_?]?:!???????Dk?W?^%q?X {?{????q?JA9?30?????]c???I??????? ????nC0?Q?#n????B??j?????rK ??%`A?v `?r??-??flv?????m?W??`X5{??wo4?ZO%??i?Z??*}d-[k?>ny?????????)?Sn"?S:?-BQ???*??(n?9I?l???H5m?#?2??pAG??-%???_??j????Rt6u?$?i??}???? ??{Vh?? m? TA????E/8M?i?.???V?????0????:???????? ??Y??s?l?/????G2?I???I)i?+?\??Aef&Ho6?v???k????Rm?'?.?W??h?6? S??????kY#?q?:l??H??? Ig????nk\?8 a?P?c???o??CP?.R?b?!?ED)?t7K????$5????F?_:??!0????~???{c??Qk????`?]x??9??F8|??????,x??:?>?s??! ?K?'O?]D?R?+k)$???R? >Mu??4????????R?????j%????+h?Tl ????f?6?qy???????TA??hl???G Z?c?v? t????P?????g?e?A??` [? ?>?OyUx???5????G???W??^?K?*p?\??D^?2?M$U?k????V?Cy8= ??`?????`.?RT???z??>???\?s?vt?????OG4???l????!-gx?P]?^?u???S?S?J;????ES?;"????K?TkVi1? b1kZ ?5?f? N?T^?n?da,????????cK_M??k???4?/??? ?2/<0yb????ATug:???dW)7?myi?mY??"&?X?Rz at qb??`?C??_??????pZ??? ew?{?eL???[M;CW?n???6n^?h?g?H?+?? ?(wbl4?????? ???z???|???ML?&U??n???U?P???oL!&+l??W?B?v%1 3G3M(J?:??}????? n??\+x??B?q?X6?FE?S"V.8?????Yt???????it???[????zB6?B?? ?0????X?tY??s?V??6??r? ??tv'9k? Y?t?n?L??y?????E?q_j??C&???~I??U?a???}?{?K?Y?oq*j????"l??%H?I_[%o9??L??!????-?? ?(????3\_????q?A??L2???9?r`4? y??fs????.???????V???Y#*?%?? 0??X8??j?-_|?b%???vU[???????-???? ??????B\??~Z???s????????????g????K[u???V??[:???N)uo?????q????Zb?=V_|?I??AX-? ?~4??K+H?l??/??????c7??2?|?n`[PT???j??)???L??8?J?sFN?????GA ??M?y?$M=L????\N_m*qGr??nk???O?c?H$?,??eU?T????bj??????,?B???6v}Q?????P??a? jC%??z?XBq?? Fq?????n??C;??9}bS???????^`?m?@~_? ?$??o~??u{?xi? ?F3????*zYL???D\m?^qDx?????w??????db??????`t?????T?{??n???v??1??t(??wF?K??{b~?< ??9??F?G????=,?$?b>?:???N???f< ???W???yzx?????0B23?R)?????/'2??\?]???a1u??????W??????+ ??D)??DUx ?o?g??+2g??????????????:??????[ ?8?, (P????!?ZuR?'&-???/???F(?0???Zw??'??? :???n>???????%{bJ ?9??E?'??o?r? ??ML.???? ?4??:?????~?2?????Vdz0H??1=9? )@?$:{?YS??Pv?96?????ou?.i???&?I????(y'."a??u??Ke????mwZ??????~,Mk*?)??8??8???m6Ki)????*??p5?-??+??(?J)? ?????????t?B??kmH????Z?6:?jg?@]\o?G9vd??????"?7?G$*l|?Q ????T?!9?5z?????????}?~?6S?? d;{????#?(E $e[M??????x???????????B/:???LF?y:x?F^t??n1:?2|?x???$???,?#t?I3?d???[>??????K?')?????!t?????/_UN?igx???????b8?B?????drSj4?* 1??]???GY?c?7$??????,Xy! ??'??}Tw>}?y????4?f????l??T??i'???u??>B}????>FY? }?L#/? ???{!L?7?o????^??`???x??FK??9?@|? ??????"??y ?? ? ?-C?s??)1V?p??{/E???Rj ???%py??????Ue?C?mn'?;????t??x??#?????(??Q?^s?/??=?Q??????????e}/O?9? ?#t>?N?????xpu>????????x? ????G???4???&'??% `? $r????w? ??{/]`_1&-???JQ ?i++ : "m?u??D??8??V?F??i V?7???(?/ ~W?&???x???|?#pS5?c0*K B?E????????X??i????-?n?_??@?&E????a?e???z????%?a???c?/Av?????N????=??@4????I?????B????? :?!????K?`??z4??0????w1??gc?N?^????gi?)??|?A?+????g0?????4? ~9?r?T?? /\P?? ?G?7u??Sg?:?QS[?1???@jS?@????\C %3.?8a???J) G]???vK?#i+?: ?kw???=3??hEj???S??X???IO????m??????lf*?,??D??? 5??I ???>??;??]?0ra????+???z?u???$???????|?]@*?/?uhv???[????)Xh?=???(? $T?????!)j4)'?R??????Umoo???T??0?L??n?OI?s?uh /???%?5????@???.?S?g ??#???Yt??qj?????!?K??ms ?%???T????~V?J??YK????K??$o?+??(?N13`???p'????7????_?VD??ax{????J#M????PK ??DUx --- NEW FILE objrtmch.c --- /*******************************************************/ /* "C" Language Integrated Production System */ /* */ /* CLIPS Version 6.25 06/22/06 */ /* */ /* OBJECT PATTERN MATCHER MODULE */ /*******************************************************/ /**************************************************************/ /* Purpose: RETE Network Interface for Objects */ /* */ /* Principal Programmer(s): */ /* Brian L. Donnell */ /* */ /* Contributing Programmer(s): */ /* */ /* Revision History: */ /* 6.23: Correction for FalseSymbol/TrueSymbol. DR0859 */ /* */ /* 6.24: Removed INCREMENTAL_RESET and */ /* LOGICAL_DEPENDENCIES compilation flags. */ /* */ /* Converted INSTANCE_PATTERN_MATCHING to */ /* DEFRULE_CONSTRUCT. */ /* */ /* Renamed BOOLEAN macro type to intBool. */ /* */ /* 6.25: Modified the QueueObjectMatchAction function */ /* so that instance retract actions always occur */ /* before instance assert and modify actions. */ /* This prevents the pattern matching process */ /* from attempting the evaluation of a join */ /* expression that accesses the slots of a */ /* retracted instance. */ /* */ /**************************************************************/ /* ========================================= ***************************************** EXTERNAL DEFINITIONS ========================================= ***************************************** */ #include "setup.h" #if DEFRULE_CONSTRUCT && OBJECT_SYSTEM #include "classfun.h" #include "memalloc.h" #include "drive.h" #include "engine.h" #include "envrnmnt.h" #include "lgcldpnd.h" #include "multifld.h" #if (! RUN_TIME) && (! BLOAD_ONLY) #include "incrrset.h" #endif #include "reteutil.h" #include "ruledlt.h" #include "reorder.h" #include "retract.h" #include "router.h" #include "objrtfnx.h" #define _OBJRTMCH_SOURCE_ #include "objrtmch.h" #include "insmngr.h" /* ========================================= ***************************************** INTERNALLY VISIBLE FUNCTION HEADERS ========================================= ***************************************** */ static void QueueObjectMatchAction(void *,int,INSTANCE_TYPE *,int); static SLOT_BITMAP *QueueModifySlotMap(void *,SLOT_BITMAP *,int); static void ReturnObjectMatchAction(void *,OBJECT_MATCH_ACTION *); static void ProcessObjectMatchQueue(void *); static void MarkObjectPatternNetwork(void *,SLOT_BITMAP *); static intBool CompareSlotBitMaps(SLOT_BITMAP *,SLOT_BITMAP *); static void ObjectPatternMatch(void *,int,OBJECT_PATTERN_NODE *,struct multifieldMarker *); static void ProcessPatternNode(void *,int,OBJECT_PATTERN_NODE *,struct multifieldMarker *); static void CreateObjectAlphaMatch(void *,OBJECT_ALPHA_NODE *); static intBool EvaluateObjectPatternTest(void *,int,struct multifieldMarker *,EXPRESSION *, OBJECT_PATTERN_NODE *); static void ObjectAssertAction(void *,INSTANCE_TYPE *); static void ObjectModifyAction(void *,INSTANCE_TYPE *,SLOT_BITMAP *); static void ObjectRetractAction(void *,INSTANCE_TYPE *,SLOT_BITMAP *); static void ObjectPatternNetErrorMessage(void *,OBJECT_PATTERN_NODE *); static void TraceErrorToObjectPattern(void *,int,OBJECT_PATTERN_NODE *); /* ========================================= ***************************************** EXTERNALLY VISIBLE FUNCTIONS ========================================= ***************************************** */ /*************************************************************************** NAME : ObjectMatchDelay DESCRIPTION : H/L interface for SetDelayObjectPatternMatching INPUTS : None RETURNS : Nothing useful SIDE EFFECTS : DelayObjectPatternMatching set and Rete network updates delayed until pattern-matching is completed NOTES : H/L Syntax: (object-pattern-match-delay *) ***************************************************************************/ globle void ObjectMatchDelay( void *theEnv, DATA_OBJECT *result) { register int ov; ov = SetDelayObjectPatternMatching(theEnv,TRUE); EvaluateExpression(theEnv,GetFirstArgument(),result); if (EvaluationData(theEnv)->EvaluationError) { SetHaltExecution(theEnv,FALSE); SetEvaluationError(theEnv,FALSE); SetDelayObjectPatternMatching(theEnv,ov); SetEvaluationError(theEnv,TRUE); } else SetDelayObjectPatternMatching(theEnv,ov); } /*************************************************** NAME : SetDelayObjectPatternMatching DESCRIPTION : Sets the flag determining if Rete network activity is to be delayed for objects or not INPUTS : The value of the flag RETURNS : The old value of the flag SIDE EFFECTS : DelayObjectPatternMatching set NOTES : When the delay is set to FALSE, all pending Rete network updates are performed ***************************************************/ globle intBool SetDelayObjectPatternMatching( void *theEnv, int value) { intBool oldval; oldval = ObjectReteData(theEnv)->DelayObjectPatternMatching; if (value) ObjectReteData(theEnv)->DelayObjectPatternMatching = TRUE; else { ObjectReteData(theEnv)->DelayObjectPatternMatching = FALSE; ObjectNetworkAction(theEnv,0,NULL,-1); } return(oldval); } /*************************************************** NAME : GetDelayObjectPatternMatching DESCRIPTION : Gets the flag determining if Rete network activity is to be delayed for objects or not INPUTS : None RETURNS : The flag SIDE EFFECTS : None NOTES : None ***************************************************/ globle intBool GetDelayObjectPatternMatching( void *theEnv) { return(ObjectReteData(theEnv)->DelayObjectPatternMatching); } /******************************************************** NAME : ObjectNetworkPointer DESCRIPTION : Returns the first object network pattern node INPUTS : None RETURNS : The top of the object pattern network SIDE EFFECTS : None NOTES : None ********************************************************/ globle OBJECT_PATTERN_NODE *ObjectNetworkPointer( void *theEnv) { return(ObjectReteData(theEnv)->ObjectPatternNetworkPointer); } /******************************************************** NAME : ObjectNetworkTerminalPointer DESCRIPTION : Returns the first terminal pattern node INPUTS : None RETURNS : The last node of a pattern SIDE EFFECTS : None NOTES : None ********************************************************/ globle OBJECT_ALPHA_NODE *ObjectNetworkTerminalPointer( void *theEnv) { return(ObjectReteData(theEnv)->ObjectPatternNetworkTerminalPointer); } /*************************************************** NAME : SetObjectNetworkPointer DESCRIPTION : Sets the object pattern network to the given network INPUTS : Top of the new pattern network RETURNS : Nothing useful SIDE EFFECTS : ObjectPatternNetworkPointer set NOTES : None ***************************************************/ globle void SetObjectNetworkPointer( void *theEnv, OBJECT_PATTERN_NODE *value) { ObjectReteData(theEnv)->ObjectPatternNetworkPointer = value; } /******************************************************* NAME : SetObjectNetworkTerminalPointer DESCRIPTION : Sets the global list of terminal pattern nodes (the ones containing the bitmaps) to the given node INPUTS : The last node of a pattern RETURNS : Nothing useful SIDE EFFECTS : ObjectPatternNetworkTerminalPointer set NOTES : None *******************************************************/ globle void SetObjectNetworkTerminalPointer( void *theEnv, OBJECT_ALPHA_NODE *value) { ObjectReteData(theEnv)->ObjectPatternNetworkTerminalPointer = value; } /************************************************************************ NAME : ObjectNetworkAction DESCRIPTION : Main driver for pattern-matching on objects If the pattern-matching is current delayed or another object is currently being pattern-matched, the requested match action is queued for later processing. Otherwise, the match action is performed and the Rete network is updated. INPUTS : 1) The match action type OBJECT_ASSERT (1) OBJECT_RETRACT (2) OBJECT_MODIFY (3) 2) The instance to be matched (can be NULL if only want pending actions to be performed) 3) The name id of the slot being updated (can be -1) If this argument is -1, it is assumed that any pattern which could match this instance must be checked. Otherwise, only the patterns which explicitly match on the named slot will be checked. RETURNS : Nothing useful SIDE EFFECTS : Action queued or Rete network updated NOTES : None ************************************************************************/ globle void ObjectNetworkAction( void *theEnv, int type, INSTANCE_TYPE *ins, int slotNameID) { SLOT_BITMAP *tmpMap; if (EngineData(theEnv)->JoinOperationInProgress) return; EngineData(theEnv)->JoinOperationInProgress = TRUE; /* ================================================ For purposes of conflict resolution, all objects which have had pattern-matching delayed will have the same relative timestamp, i.e., the inference engine thinks they all just appeared simultaneously When delay is off, however, each object gets the new and current timestamp as expected. ================================================ */ ObjectReteData(theEnv)->UseEntityTimeTag = DefruleData(theEnv)->CurrentEntityTimeTag++; /* ================================================== If pattern-matching is delayed (by use of the set-object-pattern-match-delay function), then the instance should be marked for later processing (when the delay is turned off). ================================================== */ if (ins != NULL) { /* 6.05 Bug Fix */ ins->reteSynchronized = FALSE; if (ObjectReteData(theEnv)->DelayObjectPatternMatching == FALSE) switch (type) { case OBJECT_ASSERT : ObjectAssertAction(theEnv,ins); break; case OBJECT_RETRACT : ObjectRetractAction(theEnv,ins,NULL); break; default : tmpMap = QueueModifySlotMap(theEnv,NULL,slotNameID); ObjectModifyAction(theEnv,ins,tmpMap); rm(theEnv,(void *) tmpMap,SlotBitMapSize(tmpMap)); } else QueueObjectMatchAction(theEnv,type,ins,slotNameID); } /* ======================================== Process all pending actions in the queue All updates will use the same timestamp ======================================== */ ProcessObjectMatchQueue(theEnv); EngineData(theEnv)->JoinOperationInProgress = FALSE; ForceLogicalRetractions(theEnv); /*=========================================*/ /* Free partial matches that were released */ /* by the assertion of the fact. */ /*=========================================*/ if (EngineData(theEnv)->ExecutingRule == NULL) FlushGarbagePartialMatches(theEnv); } /* ========================================= ***************************************** INTERNALLY VISIBLE FUNCTIONS ========================================= ***************************************** */ /*************************************************** NAME : ResetObjectMatchTimeTags DESCRIPTION : If CurrentObjectMatchTimeTag + 1 would cause an overflow, CurrentObjectMatchTimeTag is reset to 0L and all time tags in object pattern nodes are reset. INPUTS : None RETURNS : Nothing useful SIDE EFFECTS : CurrentObjectMatchTimeTag reset to 0, and all match time tags reset These tags are used to recognize valid pattern nodes on a match NOTES : None ***************************************************/ globle void ResetObjectMatchTimeTags( void *theEnv) { OBJECT_ALPHA_NODE *alphaPtr; OBJECT_PATTERN_NODE *lastLevel; /* ============================================ If the current tag incremented by one would not cause an overflow, then we can leave things alone. ============================================ */ if ((ObjectReteData(theEnv)->CurrentObjectMatchTimeTag + 1L) > ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) return; ObjectReteData(theEnv)->CurrentObjectMatchTimeTag = 0L; alphaPtr = ObjectNetworkTerminalPointer(theEnv); while (alphaPtr != NULL) { alphaPtr->matchTimeTag = 0L; lastLevel = alphaPtr->patternNode; while (lastLevel != NULL) { if (lastLevel->matchTimeTag == 0L) break; lastLevel->matchTimeTag = 0L; lastLevel = lastLevel->lastLevel; } alphaPtr = alphaPtr->nxtTerminal; } } /*************************************************** NAME : QueueObjectMatchAction DESCRIPTION : Posts a Rete network match event for later processing INPUTS : 1) The match action type OBJECT_ASSERT (1) OBJECT_RETRACT (2) OBJECT_MODIFY (3) 2) The instance to be matched 3) The name id of the slot being updated (can be -1) RETURNS : Nothing useful SIDE EFFECTS : Queue updated NOTES : None ***************************************************/ static void QueueObjectMatchAction( void *theEnv, int type, INSTANCE_TYPE *ins, int slotNameID) { OBJECT_MATCH_ACTION *prv,*cur,*newMatch; OBJECT_MATCH_ACTION *prvRetract = NULL; /* DR0873 */ prv = NULL; cur = ObjectReteData(theEnv)->ObjectMatchActionQueue; while (cur != NULL) { /* =========================================================== Here are the possibilities for the first Rete event already on the queue as compared with the new event for an object: Assert/Retract --> Delete assert event Ignore retract event Assert/Modify --> Ignore modify event Modify/Modify --> Merge new modify event Modify/Retract --> Delete modify event Queue the retract event =========================================================== */ if (cur->ins == ins) { /* =================================================== An action for initially asserting the newly created object to all applicable patterns =================================================== */ if (cur->type == OBJECT_ASSERT) { if (type == OBJECT_RETRACT) { /* =================================================== If we are retracting the entire object, then we can remove the assert action (and all modifies as well) and ignore the retract action (basically the object came and went before the Rete network had a chance to see it) =================================================== */ if (prv == NULL) ObjectReteData(theEnv)->ObjectMatchActionQueue = cur->nxt; else prv->nxt = cur->nxt; cur->ins->busy--; ReturnObjectMatchAction(theEnv,cur); } /* ================================================= If this is a modify action, then we can ignore it since the assert action will encompass it ================================================= */ } /* =================================================== If the object is being deleted after a slot modify, drop the modify event and replace with the retract =================================================== */ else if (type == OBJECT_RETRACT) { cur->type = OBJECT_RETRACT; if (cur->slotNameIDs != NULL) { rm(theEnv,(void *) cur->slotNameIDs,SlotBitMapSize(cur->slotNameIDs)); cur->slotNameIDs = NULL; } } /* ==================================================== If a modify event for this slot is already on the queue, ignore this one. Otherwise, merge the slot id ==================================================== */ else cur->slotNameIDs = QueueModifySlotMap(theEnv,cur->slotNameIDs,slotNameID); return; } if (cur->type == OBJECT_RETRACT) /* DR0873 */ { prvRetract = cur; } /* DR0873 */ prv = cur; cur = cur->nxt; } /* ================================================ If there are no actions for the instance already on the queue, the new action is simply appended. ================================================ */ newMatch = get_struct(theEnv,objectMatchAction); newMatch->type = type; newMatch->nxt = NULL; /* If we get here, cur should be NULL */ newMatch->slotNameIDs = (type != OBJECT_MODIFY) ? NULL : QueueModifySlotMap(theEnv,NULL,slotNameID); newMatch->ins = ins; newMatch->ins->busy++; /* DR0873 Begin */ /* Retract operations must be processed before assert and */ /* modify actions, otherwise the pattern matching process */ /* might attempt to access the slots of a retract instance. */ if (type == OBJECT_RETRACT) { if (prvRetract == NULL) { newMatch->nxt = ObjectReteData(theEnv)->ObjectMatchActionQueue; ObjectReteData(theEnv)->ObjectMatchActionQueue = newMatch; } else { newMatch->nxt = prvRetract->nxt; prvRetract->nxt = newMatch; } } else /* DR0873 End */ if (prv == NULL) ObjectReteData(theEnv)->ObjectMatchActionQueue = newMatch; else prv->nxt = newMatch; } /**************************************************** NAME : QueueModifySlotMap DESCRIPTION : Sets the bitmap for a queued object modify Rete network action INPUTS : 1) The old bitmap (can be NULL) 2) The canonical slot id to set RETURNS : The (new) bitmap SIDE EFFECTS : Bitmap allocated/reallocated if necessary, and slot id bit set NOTES : If the bitmap must be (re)allocated, this routine allocates twice the room necessary for the current id to allow for growth. ****************************************************/ static SLOT_BITMAP *QueueModifySlotMap( void *theEnv, SLOT_BITMAP *oldMap, int slotNameID) { SLOT_BITMAP *newMap; unsigned short newmaxid; unsigned oldsz,newsz; if ((oldMap == NULL) ? TRUE : (slotNameID > oldMap->maxid)) { newmaxid = (unsigned short) (slotNameID * 2); newsz = sizeof(SLOT_BITMAP) + (sizeof(char) * (newmaxid / BITS_PER_BYTE)); newMap = (SLOT_BITMAP *) gm2(theEnv,newsz); ClearBitString((void *) newMap,newsz); if (oldMap != NULL) { oldsz = SlotBitMapSize(oldMap); GenCopyMemory(char,oldsz,newMap,oldMap); rm(theEnv,(void *) oldMap,oldsz); } newMap->maxid = newmaxid; } else newMap = oldMap; SetBitMap(newMap->map,slotNameID); return(newMap); } /*************************************************** NAME : ReturnObjectMatchAction DESCRIPTION : Deallocates and object match action structure and associated slot bitmap (if any) INPUTS : The queued match action item RETURNS : Nothing useful SIDE EFFECTS : Object match action item deleted NOTES : None ***************************************************/ static void ReturnObjectMatchAction( void *theEnv, OBJECT_MATCH_ACTION *omaPtr) { if (omaPtr->slotNameIDs != NULL) rm(theEnv,(void *) omaPtr->slotNameIDs,SlotBitMapSize(omaPtr->slotNameIDs)); rtn_struct(theEnv,objectMatchAction,omaPtr); } /*************************************************** NAME : ProcessObjectMatchQueue DESCRIPTION : Processes all outstanding object Rete network update events INPUTS : None RETURNS : Nothing useful SIDE EFFECTS : Pattern-matching on objects NOTES : None ***************************************************/ static void ProcessObjectMatchQueue( void *theEnv) { OBJECT_MATCH_ACTION *cur; while ((ObjectReteData(theEnv)->ObjectMatchActionQueue != NULL) && (ObjectReteData(theEnv)->DelayObjectPatternMatching == FALSE)) { cur = ObjectReteData(theEnv)->ObjectMatchActionQueue; ObjectReteData(theEnv)->ObjectMatchActionQueue = cur->nxt; switch(cur->type) { case OBJECT_ASSERT : ObjectAssertAction(theEnv,cur->ins); break; case OBJECT_RETRACT : ObjectRetractAction(theEnv,cur->ins,cur->slotNameIDs); break; default : ObjectModifyAction(theEnv,cur->ins,cur->slotNameIDs); } cur->ins->busy--; ReturnObjectMatchAction(theEnv,cur); } } /****************************************************** NAME : MarkObjectPatternNetwork DESCRIPTION : Iterates through all terminal pattern nodes checking class and slot bitmaps. If a pattern is applicable to the object/slot change, then all the nodes belonging to the pattern are marked as needing to be examined by the pattern matcher. INPUTS : The bitmap of ids of the slots being changed (NULL if this is an assert for the for the entire object) RETURNS : Nothing useful SIDE EFFECTS : Applicable pattern nodes marked NOTES : Incremental reset status is also checked here ******************************************************/ static void MarkObjectPatternNetwork( void *theEnv, SLOT_BITMAP *slotNameIDs) { OBJECT_ALPHA_NODE *alphaPtr; OBJECT_PATTERN_NODE *upper; CLASS_BITMAP *clsset; unsigned id; ResetObjectMatchTimeTags(theEnv); ObjectReteData(theEnv)->CurrentObjectMatchTimeTag++; alphaPtr = ObjectNetworkTerminalPointer(theEnv); id = ObjectReteData(theEnv)->CurrentPatternObject->cls->id; while (alphaPtr != NULL) { /* ============================================================= If an incremental reset is in progress, make sure that the pattern has been marked for initialization before proceeding. ============================================================= */ #if (! RUN_TIME) && (! BLOAD_ONLY) if (EngineData(theEnv)->IncrementalResetInProgress && (alphaPtr->header.initialize == FALSE)) { alphaPtr = alphaPtr->nxtTerminal; continue; } #endif /* ============================================ Check the class bitmap to see if the pattern pattern is applicable to the object at all ============================================ */ clsset = (CLASS_BITMAP *) ValueToBitMap(alphaPtr->classbmp); if ((id > (unsigned) clsset->maxid) ? FALSE : TestBitMap(clsset->map,id)) { /* =================================================== If we are doing an assert, then we need to check all patterns which satsify the class bitmap (The retraction has already been done in this case) =================================================== */ if (slotNameIDs == NULL) { alphaPtr->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; for (upper = alphaPtr->patternNode ; upper != NULL ; upper = upper->lastLevel) { if (upper->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) break; else upper->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; } } /* =================================================== If we are doing a slot modify, then we need to check only the subset of patterns which satisfy the class bitmap AND actually match on the slot in question. =================================================== */ else if (alphaPtr->slotbmp != NULL) { if (CompareSlotBitMaps(slotNameIDs, (SLOT_BITMAP *) ValueToBitMap(alphaPtr->slotbmp))) { alphaPtr->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; for (upper = alphaPtr->patternNode ; upper != NULL ; upper = upper->lastLevel) { if (upper->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) break; else upper->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; } } } } alphaPtr = alphaPtr->nxtTerminal; } } /*************************************************** NAME : CompareSlotBitMaps DESCRIPTION : Compares two slot bitmaps by bitwising and'ing byte per byte up to the length of the smaller map. INPUTS : The two slot bitmaps RETURNS : TRUE if any common bits are set in both maps, FALSE otherwise SIDE EFFECTS : None NOTES : None ***************************************************/ static intBool CompareSlotBitMaps( SLOT_BITMAP *smap1, SLOT_BITMAP *smap2) { unsigned short i,maxByte; maxByte = (unsigned short) (((smap1->maxid < smap2->maxid) ? smap1->maxid : smap2->maxid) / BITS_PER_BYTE); for (i = 0 ; i <= maxByte ; i++) if (smap1->map[i] & smap2->map[i]) return(TRUE); return(FALSE); } /********************************************************************************** NAME : ObjectPatternMatch DESCRIPTION : Iterates through all the pattern nodes on one level in the pattern network. A node is only processed if it can lead to a terminating class bitmap node which applies to the object being matched. This allows for a significant reduction in the number of patterns considered. INPUTS : 1) The offset of the slot position from the pattern index 2) The pattern node being examined 3) The end of the list of multifield markers for the pattern RETURNS : Nothing useful SIDE EFFECTS : The pattern tests are evaluated and the child nodes may be processed (which may cause a whole series of Rete network updates). NOTES : Several globals are used to keep track of the current slot being examined: CurrentPatternMarks - the series of multifield markers CurrentPatternObject - the object being pattern-matched CurrentPatternObjectSlot - the current slot being examined CurrentObjectSlotLength - the cardinality of the slot value An optimization is performed when evaluating constant tests on a slot value field. All pattern nodes on a level which restrict the same slot are grouped together. Those which are constant tests are placed at the far right. Thus, as soon as one of these constant tests succeeds, the remaining nodes for that slot on this level can be skipped **********************************************************************************/ static void ObjectPatternMatch( void *theEnv, int offset, OBJECT_PATTERN_NODE *patternTop, struct multifieldMarker *endMark) { register unsigned saveSlotLength; register INSTANCE_SLOT *saveSlot; OBJECT_PATTERN_NODE *blockedNode; while (patternTop != NULL) { /* =========================================================== MarkObjectPatternNetwork() has already marked pattern nodes which need processing according to the class bitmaps, slot updates and incremental reset status =========================================================== */ if (patternTop->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) { /* ======================================== Make sure we are examining the correct slot of the object for this pattern node ======================================== */ if ((patternTop->slotNameID == ISA_ID) || (patternTop->slotNameID == NAME_ID)) { ObjectReteData(theEnv)->CurrentPatternObjectSlot = NULL; ObjectReteData(theEnv)->CurrentObjectSlotLength = 1; offset = 0; } else if ((ObjectReteData(theEnv)->CurrentPatternObjectSlot == NULL) ? TRUE : (ObjectReteData(theEnv)->CurrentPatternObjectSlot->desc->slotName->id != patternTop->slotNameID)) { /* ==================================================== Need to reset the indices for the multifield markers now that we have moved onto a different slot ==================================================== */ ObjectReteData(theEnv)->CurrentPatternObjectSlot = ObjectReteData(theEnv)->CurrentPatternObject->slotAddresses[ObjectReteData(theEnv)->CurrentPatternObject->cls->slotNameMap [patternTop->slotNameID] - 1]; offset = 0; if (ObjectReteData(theEnv)->CurrentPatternObjectSlot->desc->multiple) ObjectReteData(theEnv)->CurrentObjectSlotLength = GetInstanceSlotLength(ObjectReteData(theEnv)->CurrentPatternObjectSlot); else ObjectReteData(theEnv)->CurrentObjectSlotLength = 1; } /* ======================================================== Process the pattern node. If it is satisfied by the the instance, ProcessPatternNode() will recursively pass all of its children nodes through ObjectPatternMatch() ======================================================== */ saveSlotLength = ObjectReteData(theEnv)->CurrentObjectSlotLength; saveSlot = ObjectReteData(theEnv)->CurrentPatternObjectSlot; ProcessPatternNode(theEnv,offset,patternTop,endMark); ObjectReteData(theEnv)->CurrentObjectSlotLength = saveSlotLength; ObjectReteData(theEnv)->CurrentPatternObjectSlot = saveSlot; } /* ============================================================== Move on to the siblings of this node - if the current node was a constant test that succeeded, skip further sibling nodes (which test on the same field in the pattern) which match on the same slot since they are all constant tests as well and will, of course fail. ============================================================== */ if (patternTop->blocked == TRUE) { patternTop->blocked = FALSE; blockedNode = patternTop; patternTop = patternTop->rightNode; while (patternTop != NULL) { if ((patternTop->slotNameID != blockedNode->slotNameID) || (patternTop->whichField != blockedNode->whichField)) break; patternTop = patternTop->rightNode; } } else patternTop = patternTop->rightNode; } } /********************************************************************************** NAME : ProcessPatternNode DESCRIPTION : Determines if a pattern node satsifies the corresponding slot value field(s) in an object. If it does, ObjectPatternMatch() is recursively called to process the child nodes of this node. In this mutual recursion between ObjectPatternMatch() and ProcessPatternNode(), the nodes of all applicable patterns are processed to completion. ObjectPatternMatch() enters an object into a pattern's aplha memory when the traversal reaches a terminal class bitmap node. INPUTS : 1) The offset of the slot index from the pattern index 2) The pattern node being examined 3) The end of the list of multifield markers for the pattern RETURNS : Nothing useful SIDE EFFECTS : The pattern tests are evaluated and the child nodes may be processed (which may cause a whole series of Rete network updates). NOTES : Several globals are used to keep track of the current slot being examined: CurrentPatternMarks - the series of multifield markers CurrentPatternObject - the object being pattern-matched CurrentPatternObjectSlot - the current slot being examined CurrentObjectSlotLength - the cardinality of the slot value **********************************************************************************/ static void ProcessPatternNode( void *theEnv, int offset, OBJECT_PATTERN_NODE *patternNode, struct multifieldMarker *endMark) { int patternSlotField,objectSlotField; unsigned objectSlotLength; int repeatCount; INSTANCE_SLOT *objectSlot; struct multifieldMarker *newMark; patternSlotField = patternNode->whichField; objectSlotField = patternSlotField + offset; /* ========================================== If this is a test on the class or the name of the object, process it separately. ========================================== */ if (ObjectReteData(theEnv)->CurrentPatternObjectSlot == NULL) { if ((patternNode->networkTest == NULL) ? TRUE : (EvaluateObjectPatternTest(theEnv,objectSlotField,NULL, (EXPRESSION *) patternNode->networkTest,patternNode))) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,offset,patternNode->nextLevel,endMark); } return; } /* ================================ Check a single-field restriction ================================ */ if (patternNode->multifieldNode == 0) { if ((patternNode->networkTest == NULL) ? TRUE : EvaluateObjectPatternTest(theEnv,objectSlotField,NULL, (EXPRESSION *) patternNode->networkTest,patternNode)) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,offset,patternNode->nextLevel,endMark); } return; } /* ================================================================== Check a multifield restriction. Add a marker for this field which has indices indicating to which values in the object slot the multifield pattern node is bound ================================================================== */ newMark = get_struct(theEnv,multifieldMarker); newMark->whichField = patternSlotField; newMark->where.whichSlot = (void *) ObjectReteData(theEnv)->CurrentPatternObjectSlot->desc->slotName->name; newMark->startPosition = objectSlotField; newMark->next = NULL; if (ObjectReteData(theEnv)->CurrentPatternObjectMarks == NULL) ObjectReteData(theEnv)->CurrentPatternObjectMarks = newMark; else endMark->next = newMark; /* ========================================================== If there are further pattern restrictions on this slot, try pattern-matching for all possible bound values of the multifield pattern node: from no values to all values from the starting position of the multifield to the end of the object slot. Otherwise, bind the multifield to all the remaining fields in the slot value and continue with pattern-matching ========================================================== */ if (patternNode->endSlot == FALSE) { objectSlotLength = ObjectReteData(theEnv)->CurrentObjectSlotLength; objectSlot = ObjectReteData(theEnv)->CurrentPatternObjectSlot; newMark->endPosition = newMark->startPosition - 1; repeatCount = (int) (objectSlotLength - newMark->startPosition - patternNode->leaveFields + 2); while (repeatCount > 0) { if ((patternNode->networkTest == NULL) ? TRUE : EvaluateObjectPatternTest(theEnv,objectSlotField,newMark, (EXPRESSION *) patternNode->networkTest,patternNode)) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,(int) (offset + (newMark->endPosition - objectSlotField)), patternNode->nextLevel,newMark); ObjectReteData(theEnv)->CurrentObjectSlotLength = objectSlotLength; ObjectReteData(theEnv)->CurrentPatternObjectSlot = objectSlot; } newMark->endPosition++; repeatCount--; } } else { newMark->endPosition = (long) ObjectReteData(theEnv)->CurrentObjectSlotLength; if ((patternNode->networkTest == NULL) ? TRUE : EvaluateObjectPatternTest(theEnv,objectSlotField,newMark, (EXPRESSION *) patternNode->networkTest,patternNode)) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,0,patternNode->nextLevel,newMark); } } /* ====================================== Delete the temporary multifield marker ====================================== */ if (ObjectReteData(theEnv)->CurrentPatternObjectMarks == newMark) ObjectReteData(theEnv)->CurrentPatternObjectMarks = NULL; else endMark->next = NULL; rtn_struct(theEnv,multifieldMarker,newMark); } /*************************************************** NAME : CreateObjectAlphaMatch DESCRIPTION : Places an instance in the alpha memory of a pattern and drives the partial match through the join network INPUTS : The alpha memory node RETURNS : Nothing useful SIDE EFFECTS : Join network updated NOTES : None ***************************************************/ static void CreateObjectAlphaMatch( void *theEnv, OBJECT_ALPHA_NODE *alphaPtr) { struct joinNode *listOfJoins; struct partialMatch *theMatch; struct patternMatch *newMatch; while (alphaPtr != NULL) { if (alphaPtr->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) { /* =================================================== If we have reached the class bitmap of the pattern, place the object in the alpha memory of each of the terminal nodes underneath and drive the partial matches through the join network. Insert the instance into the alpha memory of this pattern and mark it as busy =================================================== */ ObjectReteData(theEnv)->CurrentPatternObject->busy++; theMatch = CreateAlphaMatch(theEnv,(void *) ObjectReteData(theEnv)->CurrentPatternObject, ObjectReteData(theEnv)->CurrentPatternObjectMarks, (struct patternNodeHeader *) alphaPtr); /* ====================================== Attach the partial match to the object to ease later retraction ====================================== */ newMatch = get_struct(theEnv,patternMatch); newMatch->next = (struct patternMatch *) ObjectReteData(theEnv)->CurrentPatternObject->partialMatchList; newMatch->matchingPattern = (struct patternNodeHeader *) alphaPtr; newMatch->theMatch = theMatch; ObjectReteData(theEnv)->CurrentPatternObject->partialMatchList = (void *) newMatch; /* ================================================ Drive the partial match through the join network ================================================ */ listOfJoins = alphaPtr->header.entryJoin; while (listOfJoins != NULL) { NetworkAssert(theEnv,theMatch,listOfJoins,RHS); listOfJoins = listOfJoins->rightMatchNode; } } alphaPtr = alphaPtr->nxtInGroup; } } /****************************************************** NAME : EvaluateObjectPatternTest DESCRIPTION : Evaluates the pattern network test expression for a node INPUTS : 1) The actual index of the slot value field currently being examined 2) The multifield marker (if any) for the pattern node being exmained 3) The pattern network test expression 4) The pattern node being examined RETURNS : TRUE if the node passes the test, FALSE otherwise SIDE EFFECTS : Evaluation of the test EvaluationError and HaltExecution are always set to FALSE NOTES : Assumes networkTest != NULL ******************************************************/ static intBool EvaluateObjectPatternTest( void *theEnv, int objectSlotField, struct multifieldMarker *selfSlotMarker, EXPRESSION *networkTest, OBJECT_PATTERN_NODE *patternNode) { DATA_OBJECT vresult; int rv; if (networkTest->type == OBJ_PN_CONSTANT) { struct expr *oldArgument; oldArgument = EvaluationData(theEnv)->CurrentExpression; EvaluationData(theEnv)->CurrentExpression = networkTest; rv = ObjectCmpConstantFunction(theEnv,networkTest->value,&vresult); EvaluationData(theEnv)->CurrentExpression = oldArgument; if (rv) { if (((struct ObjectCmpPNConstant *) ValueToBitMap(networkTest->value))->pass) patternNode->blocked = TRUE; return(TRUE); } return(FALSE); } /* ========================================================= Evaluate or expressions expressed in the format: (or ... ) Returns TRUE (1.0) if any of the expression are TRUE, otherwise returns false (0.0). ========================================================= */ if (networkTest->value == ExpressionData(theEnv)->PTR_OR) { networkTest = networkTest->argList; while (networkTest != NULL) { if (EvaluateObjectPatternTest(theEnv,objectSlotField,selfSlotMarker,networkTest,patternNode)) { /* ============================================ A node can be blocked ONLY if there were one positive constant test on that node ============================================ */ patternNode->blocked = FALSE; return(TRUE); } patternNode->blocked = FALSE; networkTest = networkTest->nextArg; } return(FALSE); } /* ========================================================== Evaluate and expressions expressed in the format: (and ... ) Returns false (0.0) if any of the expression are false, otherwise returns TRUE (1.0). ========================================================== */ else if (networkTest->value == ExpressionData(theEnv)->PTR_AND) { networkTest = networkTest->argList; while (networkTest != NULL) { if (EvaluateObjectPatternTest(theEnv,objectSlotField,selfSlotMarker,networkTest,patternNode) == FALSE) { patternNode->blocked = FALSE; return(FALSE); } patternNode->blocked = FALSE; networkTest = networkTest->nextArg; } return(TRUE); } /* ======================================================= Evaluate all other expressions using EvaluateExpression ======================================================= */ else { EvaluationData(theEnv)->HaltExecution = FALSE; if (EvaluateExpression(theEnv,networkTest,&vresult)) { ObjectPatternNetErrorMessage(theEnv,patternNode); EvaluationData(theEnv)->EvaluationError = FALSE; EvaluationData(theEnv)->HaltExecution = FALSE; return(FALSE); } if ((vresult.value != EnvFalseSymbol(theEnv)) || (vresult.type != SYMBOL)) return(TRUE); } return(FALSE); } /*************************************************** NAME : ObjectAssertAction DESCRIPTION : Filters an instance through the object pattern network INPUTS : The instance RETURNS : Nothing useful SIDE EFFECTS : Instance matched NOTES : None ***************************************************/ static void ObjectAssertAction( void *theEnv, INSTANCE_TYPE *ins) { ins->header.timeTag = ObjectReteData(theEnv)->UseEntityTimeTag; ObjectReteData(theEnv)->CurrentPatternObject = ins; ObjectReteData(theEnv)->CurrentPatternObjectSlot = NULL; MarkObjectPatternNetwork(theEnv,NULL); ObjectPatternMatch(theEnv,0,ObjectNetworkPointer(theEnv),NULL); ins->reteSynchronized = TRUE; } /********************************************************************** NAME : ObjectModifyAction DESCRIPTION : Removes an instance from patterns (and attached joins) applicable to specified slot(s), and then filters same instance through object pattern network (only against patterns which explicitly match on named slot(s)) INPUTS : 1) The instance 2) The bitmap of slot ids RETURNS : Nothing useful SIDE EFFECTS : Instance retracted/asserted NOTES : None **********************************************************************/ static void ObjectModifyAction( void *theEnv, INSTANCE_TYPE *ins, SLOT_BITMAP *slotNameIDs) { ins->header.timeTag = ObjectReteData(theEnv)->UseEntityTimeTag; ObjectRetractAction(theEnv,ins,slotNameIDs); ObjectReteData(theEnv)->CurrentPatternObject = ins; ObjectReteData(theEnv)->CurrentPatternObjectSlot = NULL; MarkObjectPatternNetwork(theEnv,slotNameIDs); ObjectPatternMatch(theEnv,0,ObjectNetworkPointer(theEnv),NULL); ins->reteSynchronized = TRUE; } /**************************************************** NAME : ObjectRetractAction DESCRIPTION : Retracts the instance from the applicable patterns for the object (if the slotNameID != -1, then the instance is only retracted from the alpha memories of the patterns which actually match on that slot) INPUTS : 1) The instance 2) The slot bitmap for a modify (NULL if the instance is actually being removed) RETURNS : Nothing useful SIDE EFFECTS : Retractions performed NOTES : None ****************************************************/ static void ObjectRetractAction( void *theEnv, INSTANCE_TYPE *ins, SLOT_BITMAP *slotNameIDs) { struct patternMatch *prvMatch,*tmpMatch, *deleteMatch,*lastDeleteMatch; OBJECT_ALPHA_NODE *alphaPtr; void *saveDependents; if (slotNameIDs == NULL) { if (ins->partialMatchList != NULL) { tmpMatch = (struct patternMatch *) ins->partialMatchList; while (tmpMatch != NULL) { ins->busy--; tmpMatch = tmpMatch->next; } NetworkRetract(theEnv,(struct patternMatch *) ins->partialMatchList); ins->partialMatchList = NULL; } } else { deleteMatch = NULL; lastDeleteMatch = NULL; prvMatch = NULL; tmpMatch = (struct patternMatch *) ins->partialMatchList; while (tmpMatch != NULL) { alphaPtr = (OBJECT_ALPHA_NODE *) tmpMatch->matchingPattern; if (alphaPtr->slotbmp != NULL) { if (CompareSlotBitMaps(slotNameIDs, (SLOT_BITMAP *) ValueToBitMap(alphaPtr->slotbmp))) { ins->busy--; if (prvMatch == NULL) ins->partialMatchList = (void *) tmpMatch->next; else prvMatch->next = tmpMatch->next; if (!deleteMatch) deleteMatch = tmpMatch; else lastDeleteMatch->next = tmpMatch; lastDeleteMatch = tmpMatch; tmpMatch = tmpMatch->next; lastDeleteMatch->next = NULL; } else { prvMatch = tmpMatch; tmpMatch = tmpMatch->next; } } else { prvMatch = tmpMatch; tmpMatch = tmpMatch->next; } } /* ============================================= We need to preserve any logical dependencies of this object and reattach them after doing the retract. Otherwise, the Rete network will believe the object is gone and remove the links from the partial matches upon which this object is logically dependent. ============================================= */ if (deleteMatch != NULL) { saveDependents = ins->header.dependents; ins->header.dependents = NULL; NetworkRetract(theEnv,deleteMatch); ins->header.dependents = saveDependents; } } ins->reteSynchronized = TRUE; } /***************************************************** NAME : ObjectPatternNetErrorMessage DESCRIPTION : Prints out a locational error message when an evaluation error occurs during object pattern-matching INPUTS : The pattern node RETURNS : Nothing useful SIDE EFFECTS : Error message displayed NOTES : None *****************************************************/ static void ObjectPatternNetErrorMessage( void *theEnv, OBJECT_PATTERN_NODE *patternPtr) { PrintErrorID(theEnv,"OBJRTMCH",1,TRUE); EnvPrintRouter(theEnv,WERROR,"This error occurred in the object pattern network\n"); EnvPrintRouter(theEnv,WERROR," Currently active instance: ["); EnvPrintRouter(theEnv,WERROR,ValueToString(ObjectReteData(theEnv)->CurrentPatternObject->name)); EnvPrintRouter(theEnv,WERROR,"]\n"); EnvPrintRouter(theEnv,WERROR," Problem resides in slot "); EnvPrintRouter(theEnv,WERROR,ValueToString(FindIDSlotName(theEnv,patternPtr->slotNameID))); EnvPrintRouter(theEnv,WERROR," field #"); PrintLongInteger(theEnv,WERROR,(long) patternPtr->whichField); EnvPrintRouter(theEnv,WERROR,"\n"); TraceErrorToObjectPattern(theEnv,TRUE,patternPtr); EnvPrintRouter(theEnv,WERROR,"\n"); } /********************************************************* NAME : TraceErrorToObjectPattern DESCRIPTION : Used by ObjectPatternNetErrorMessage() to print the rule(s) which contain an object pattern. INPUTS : 1) A flag indicating if this is the node in which the error actually occurred or not 2) The pattern node RETURNS : Nothing useful SIDE EFFECTS : Error message displayed NOTES : None *********************************************************/ static void TraceErrorToObjectPattern( void *theEnv, int errorNode, OBJECT_PATTERN_NODE *patternPtr) { struct joinNode *joinPtr; while (patternPtr != NULL) { if (patternPtr->alphaNode != NULL) { joinPtr = patternPtr->alphaNode->header.entryJoin; while (joinPtr != NULL) { EnvPrintRouter(theEnv,WERROR," Of pattern #"); PrintLongInteger(theEnv,WERROR,(long) joinPtr->depth); EnvPrintRouter(theEnv,WERROR," in rule(s):\n"); TraceErrorToRule(theEnv,joinPtr," "); joinPtr = joinPtr->rightMatchNode; } } TraceErrorToObjectPattern(theEnv,FALSE,patternPtr->nextLevel); if (errorNode) break; patternPtr = patternPtr->rightNode; } } #endif Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clips/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Feb 2007 19:04:04 -0000 1.4 +++ .cvsignore 3 Mar 2009 19:12:12 -0000 1.5 @@ -1,14 +1,12 @@ -3CCP.pdf -AllExamples.tar.Z abstract.pdf +clips_core_source_624.tar.Z +x_windows_ide_source_624.tar.Z +examples_624.tar.Z apg.pdf arch5-1.pdf bpg.pdf -clipssrc.tar.Z ig.pdf -usrguide.pdf -x-prjct.tar.Z -FunctionContext.zip -objrtmch.c -DR0873.txt -clips-6.24-linux.patch.bz2 +ug.pdf +3CCP.pdf +clips-doc-html.tar.bz2 +clips-6.24-linux.patch Index: clips.spec =================================================================== RCS file: /cvs/pkgs/rpms/clips/F-9/clips.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- clips.spec 19 Feb 2008 22:49:18 -0000 1.10 +++ clips.spec 3 Mar 2009 19:12:12 -0000 1.11 @@ -1,33 +1,48 @@ Summary: CLIPS language for developing expert systems Name: clips Version: 6.24 -Release: 25%{?dist} -Url: http://www.ghg.net/clips/download/source/ +Release: 27%{?dist} +Url: http://clipsrules.sourceforge.net License: GPLv2 Group: Development/Tools -Source0: http://www.ghg.net/clips/download/source/clipssrc.tar.Z -Source1: http://www.ghg.net/clips/download/source/x-prjct.tar.Z -Source2: http://www.ghg.net/clips/download/executables/examples/AllExamples.tar.Z -Source3: http://www.ghg.net/clips/download/documentation/abstract.pdf -Source4: http://www.ghg.net/clips/download/documentation/apg.pdf -Source5: http://www.ghg.net/clips/download/documentation/arch5-1.pdf -Source6: http://www.ghg.net/clips/download/documentation/bpg.pdf -Source7: http://www.ghg.net/clips/download/documentation/ig.pdf -Source8: http://www.ghg.net/clips/download/documentation/usrguide.pdf -Source9: http://www.ghg.net/clips/download/documentation/3CCP.pdf +Source0: http://downloads.sourceforge.net/clipsrules/clips_core_source_624.tar.Z +Source1: http://downloads.sourceforge.net/clipsrules/x_windows_ide_source_624.tar.Z +Source2: http://downloads.sourceforge.net/clipsrules/examples_624.tar.Z +Source3: abstract.pdf +Source4: http://clipsrules.sourceforge.net/documentation/v624/apg.pdf +Source5: http://clipsrules.sourceforge.net/documentation/other/arch5-1.pdf +Source6: http://clipsrules.sourceforge.net/documentation/v624/bpg.pdf +Source7: http://clipsrules.sourceforge.net/documentation/v624/ig.pdf +Source8: http://clipsrules.sourceforge.net/documentation/v624/ug.pdf +Source9: http://clipsrules.sourceforge.net/documentation/other/3CCP.pdf Source10: xclips.png Source11: clips-init.el Source12: clips-mode.el Source13: inf-clips.el -Source14: http://www.ghg.net/clips/download/other/Bug_Fixes/objrtmch.c -Source15: http://www.ghg.net/clips/download/other/FunctionContext.zip -Source16: http://www.ghg.net/clips/download/other/Bug_Fixes/DR0873.txt +Source14: objrtmch.c +Source15: FunctionContext.zip +Source16: DR0873.txt Source17: xclips.desktop +# The following source was generated with the following commands: +# mkdir html +# cd html +# for i in apg.htm bpg.htm ig.htm ug.htm; do +# wget -p -nH --cut-dirs=2 --convert-links http://clipsrules.sourceforge.net/documentation/v624/$i +# dos2unix $i +# done +# cd .. +# tar -cjf clips-doc-html.tar.bz2 html +Source18: clips-doc-html.tar.bz2 Patch0: clips-6.24-linux.patch Patch1: clips-6.24-time-sysdep.c.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel libXt-devel libXext-devel libXmu-devel libXaw-devel xorg-x11-server-Xorg xorg-x11-proto-devel xorg-x11-xbitmaps desktop-file-utils +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: ncurses-devel +BuildRequires: libXt-devel libXext-devel libXmu-devel libXaw-devel +BuildRequires: xorg-x11-server-Xorg xorg-x11-proto-devel xorg-x11-xbitmaps +BuildRequires: desktop-file-utils BuildRequires: automake autoconf libtool +BuildRequires: pkgconfig +BuildRequires: ImageMagick %description CLIPS is a productive development and delivery expert system tool which @@ -46,7 +61,7 @@ This package contains the run-time libraries needed for CLIPS applications. %package devel -Summary: Headers for developing programs that will embed CLIPS +Summary: C headers for developing programs that will embed CLIPS Group: Development/Libraries Requires: clips-libs = %{version}-%{release} Requires: ncurses-devel pkgconfig @@ -58,6 +73,8 @@ %package xclips Summary: X interface to CLIPS Group: Development/Tools +Requires: %{name} = %{version}-%{release} +Requires: hicolor-icon-theme %description xclips X interface to CLIPS. @@ -73,15 +90,15 @@ The following are some of the documents in this package: - Proceedings of the Third Conference on CLIPS, 1994 (3CCP.pdf) - Application abstracts (abstract.pdf) -- CLIPS Reference Manual, Volume II, Advanced Programming Guide (apg.pdf) +- CLIPS Reference Manual, Volume I, Basic Programming Guide (bpg.pdf,bpg.htm) +- CLIPS Reference Manual, Volume II, Adv. Programming Guide (apg.pdf, apg.htm) +- CLIPS Reference Manual, Volume III, Interfaces Guide (ig.pdf,ig.htm) - CLIPS Architecture Manual (arch5-1.pdf) -- CLIPS Reference Manual, Volume I, Basic Programming Guide (bpg.pdf) -- CLIPS Reference Manual, Volume III, Interfaces Guide (ig.pdf) -- CLIPS Users Guide (usrguide.pdf) +- CLIPS Users Guide (ug.pdf,ug.htm) %prep -%setup -q -a 1 -a 2 -a 15 -c +%setup -q -a 1 -a 2 -a 15 -a 18 -c mv x-prjct/xinterface clipssrc/ mv x-prjct/color clipssrc/ mv clipssrc/clipssrc clipssrc/clips @@ -110,18 +127,27 @@ %{__make} %{?_smp_mflags} %install -%{__rm} -rf %{buildroot} -%{__install} -D %{SOURCE10} %{buildroot}%{_datadir}/pixmaps/xclips.png -%{__install} -m 644 -D %{SOURCE11} %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d/clips-init.el -%{__install} -m 644 -D %{SOURCE12} %{buildroot}%{_datadir}/emacs/site-lisp/clips-mode.el -%{__install} -m 644 -D %{SOURCE13} %{buildroot}%{_datadir}/emacs/site-lisp/inf-clips.el cd clipssrc +%{__rm} -rf %{buildroot} +%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p" +find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' +%{__install} -p --mode=0644 -D %{SOURCE11} %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d/clips-init.el +%{__install} -p --mode=0644 -D %{SOURCE12} %{buildroot}%{_datadir}/emacs/site-lisp/clips-mode.el +%{__install} -p --mode=0644 -D %{SOURCE13} %{buildroot}%{_datadir}/emacs/site-lisp/inf-clips.el + +# create icons +# create 16x16, 32x32, 64x64, 128x128 icons +for s in 16 32 64 128 ; do + %{__mkdir_p} %{buildroot}/%{_datadir}/icons/hicolor/${s}x${s}/apps/ + convert -scale ${s}x${s} \ + %{SOURCE10} \ + %{buildroot}/%{_datadir}/icons/hicolor/${s}x${s}/apps/xclips.png +done + desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE17} -%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p" -find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' %clean %{__rm} -rf %{buildroot} @@ -130,6 +156,19 @@ %postun libs -p /sbin/ldconfig +%post xclips +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 xclips +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}/clips @@ -156,17 +195,34 @@ %defattr(-,root,root,-) %{_bindir}/xclips %{_bindir}/xclips-color -%{_datadir}/pixmaps/xclips.png +%{_datadir}/icons/hicolor/*x*/apps/xclips.png %{_datadir}/applications/*xclips.desktop %files doc %defattr(-,root,root,-) %doc Examples/ -%doc abstract.pdf arch5-1.pdf bpg.pdf usrguide.pdf 3CCP.pdf +%doc abstract.pdf arch5-1.pdf bpg.pdf ug.pdf 3CCP.pdf %doc apg.pdf %doc ig.pdf +%doc html/ %changelog +* Tue Mar 03 2009 Rick L Vinyard Jr 6.24-27 +- Updated desktop entry file to add categories and remove deprecated items +- Added hicolor-icon-theme requires to xclips +- Install xclips icons to hicolor directory +- Added validation to desktop file +- Added icon cache rebuild to pre and post sections for xclips +- Added preserve to file installs +- Made install modes explicit +- Added pkgconfig and ImageMagick to build requires +- Updated URL +- Updated source URL's +- Added html docs + +* Tue Feb 24 2009 Fedora Release Engineering - 6.24-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Feb 19 2008 Fedora Release Engineering - 6.24-25 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clips/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Feb 2007 19:19:53 -0000 1.6 +++ sources 3 Mar 2009 19:12:12 -0000 1.7 @@ -1,14 +1,12 @@ -a6a60733af08f9e9e6d0928272ad4dd9 3CCP.pdf -f5c02b997199f3ede779b8502af2ba09 AllExamples.tar.Z cd3ecddc4e538b8af0e5cf08ab7fd89c abstract.pdf +ccba9d912375e57a1b7d9eba12da4198 clips_core_source_624.tar.Z +1bb0d0e684742188b8c14912c26f12cb x_windows_ide_source_624.tar.Z +f5c02b997199f3ede779b8502af2ba09 examples_624.tar.Z fae2267d96fb95603345e91c9990caaa apg.pdf 9a13d2ed18fe6ab67902d5bce29957cb arch5-1.pdf 63891971aa782dc67c2de0579647247e bpg.pdf -ccba9d912375e57a1b7d9eba12da4198 clipssrc.tar.Z 89beca5caa08b30d8285cca7f1df1d26 ig.pdf -44e54697a8acf3509bc4ca51d88b65bd usrguide.pdf -1bb0d0e684742188b8c14912c26f12cb x-prjct.tar.Z -ac0d7c465a909158ae908fe39d68478c FunctionContext.zip -da5ad2328e4d8dd7680d8bb28005e90d objrtmch.c -f80256270a8a93504e37644ab9bc16b4 DR0873.txt -cbf0382ca4153adc0446b0bf5c123559 clips-6.24-linux.patch.bz2 +44e54697a8acf3509bc4ca51d88b65bd ug.pdf +a6a60733af08f9e9e6d0928272ad4dd9 3CCP.pdf +99f463e8a2536198da37e9dc73304322 clips-doc-html.tar.bz2 +0cb3238a5be85211658ba7ca47257bf8 clips-6.24-linux.patch Index: xclips.desktop =================================================================== RCS file: /cvs/pkgs/rpms/clips/F-9/xclips.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xclips.desktop 26 Aug 2007 06:16:44 -0000 1.1 +++ xclips.desktop 3 Mar 2009 19:12:12 -0000 1.2 @@ -1,10 +1,9 @@ [Desktop Entry] -Encoding=UTF-8 Name=XCLIPS GenericName=XCLIPS Expert System Exec=xclips -Icon=xclips.png +Icon=xclips Terminal=false Type=Application -Categories=Application;Development; +Categories=Development;Building;IDE;Education;Science;ArtificialIntelligence;ComputerScience;Robotics; Version=1.0 From s4504kr at fedoraproject.org Tue Mar 3 19:23:30 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Tue, 3 Mar 2009 19:23:30 +0000 (UTC) Subject: rpms/lightning/devel lightning-1.2-execstack.patch, 1.2, 1.3 lightning.spec, 1.16, 1.17 lightning-1.2c-execstack.patch, 1.1, NONE Message-ID: <20090303192330.AF79670116@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/lightning/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5140 Modified Files: lightning.spec Added Files: lightning-1.2-execstack.patch Removed Files: lightning-1.2c-execstack.patch Log Message: Failback to release 1.2 lightning-1.2-execstack.patch: Index: lightning-1.2-execstack.patch =================================================================== RCS file: lightning-1.2-execstack.patch diff -N lightning-1.2-execstack.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lightning-1.2-execstack.patch 3 Mar 2009 19:23:00 -0000 1.3 @@ -0,0 +1,10 @@ +--- lightning-1.2/tests/run-test.excstk 2007-07-04 17:56:40.000000000 +0200 ++++ lightning-1.2/tests/run-test 2007-07-04 17:57:01.000000000 +0200 +@@ -1,5 +1,7 @@ + #! /bin/sh + ++execstack -s $1 ++ + ./$1 > $1.log + if cmp -s $srcdir/$1.ok $1.log; then + rm $1.log Index: lightning.spec =================================================================== RCS file: /cvs/extras/rpms/lightning/devel/lightning.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- lightning.spec 25 Feb 2009 20:19:54 -0000 1.16 +++ lightning.spec 3 Mar 2009 19:23:00 -0000 1.17 @@ -1,13 +1,13 @@ Name: lightning -Version: 1.2c -Release: 2%{?dist} +Version: 1.2 +Release: 15%{?dist} Summary: Library for generating assembly code on run time Group: Development/Libraries License: LGPLv2+ URL: http://www.gnu.org/software/lightning/lightning.html -Source0: ftp://alpha.gnu.org/gnu/lightning/lightning-%{version}.tar.gz -Patch1: lightning-1.2c-execstack.patch +Source0: ftp://ftp.gnu.org/gnu/lightning/lightning-%{version}.tar.gz +Patch1: lightning-1.2-execstack.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} ppc sparc @@ -52,7 +52,7 @@ %defattr(-,root,root,-) %{_bindir}/lightningize %{_includedir}/lightning/ -%{_includedir}/lightning.h +# %{_includedir}/lightning.h %{_datadir}/aclocal/lightning.m4 %dir %{_datadir}/lightning %{_datadir}/lightning/Makefile.am @@ -63,6 +63,9 @@ %changelog +* Tue Mar 3 2009 Jochen Schmitt 1.2-15 +- Failback to release 1.2 + * Wed Feb 25 2009 Fedora Release Engineering - 1.2c-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- lightning-1.2c-execstack.patch DELETED --- From jwrdegoede at fedoraproject.org Tue Mar 3 19:25:56 2009 From: jwrdegoede at fedoraproject.org (Hans de Goede) Date: Tue, 3 Mar 2009 19:25:56 +0000 (UTC) Subject: rpms/maniadrive/devel maniadrive.spec,1.12,1.13 Message-ID: <20090303192557.0625F70116@cvs1.fedora.phx.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/maniadrive/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5642 Modified Files: maniadrive.spec Log Message: * Tue Mar 3 2009 Hans de Goede 1.2-14 - Rebuild for new php Index: maniadrive.spec =================================================================== RCS file: /cvs/extras/rpms/maniadrive/devel/maniadrive.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- maniadrive.spec 25 Feb 2009 23:33:29 -0000 1.12 +++ maniadrive.spec 3 Mar 2009 19:25:26 -0000 1.13 @@ -1,6 +1,6 @@ Name: maniadrive Version: 1.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: 3D stunt driving game Group: Amusements/Games License: GPLv2+ @@ -165,6 +165,9 @@ %changelog +* Tue Mar 3 2009 Hans de Goede 1.2-14 +- Rebuild for new php + * Wed Feb 25 2009 Fedora Release Engineering - 1.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rvinyard at fedoraproject.org Tue Mar 3 19:28:36 2009 From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.) Date: Tue, 3 Mar 2009 19:28:36 +0000 (UTC) Subject: rpms/clips/EL-5 DR0873.txt, NONE, 1.1 FunctionContext.zip, NONE, 1.1 clips-6.24-time-sysdep.c.patch, NONE, 1.1 objrtmch.c, NONE, 1.1 xclips.desktop, NONE, 1.1 .cvsignore, 1.4, 1.5 clips.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <20090303192836.E8D5170116@cvs1.fedora.phx.redhat.com> Author: rvinyard Update of /cvs/pkgs/rpms/clips/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6164 Modified Files: .cvsignore clips.spec sources Added Files: DR0873.txt FunctionContext.zip clips-6.24-time-sysdep.c.patch objrtmch.c xclips.desktop Log Message: --- NEW FILE DR0873.txt --- CLIPS DISCREPANCY REPORT DR # : 0873 DATE : 06/22/06 STATUS : OPEN REPORTED BY : CLIPS User ORGANIZATION : PHONE # : ADDRESS : CLIPS VERSION : CLIPS 6.24 HOST : All OS : All ******************** PROBLEM DESCRIPTION: ******************** Use of the object-pattern-match-delay function could cause a NULL pointer exception. ***************** COMMAND SEQUENCE: ***************** 1) Load this program: (defclass A (is-a USER) (slot x)) (defclass B (is-a USER) (slot y)) (definstances initialization (ob1 of A (x 1)) (ob2 of B (y 1))) (defrule one (object (is-a A) (x ~0)) (object (is-a B) (y ?val)) (test (> ?val 0)) =>) (defrule trigger => (object-pattern-match-delay (modify-instance [ob1] (x 2)) (make-instance [ob2] of B (y 2)))) 2) Issue a (reset) command followed by a (run) command. *********** RESOLUTION: *********** Modified the QueueObjectMatchAction function in objrtmch.c so that instance retract actions always occur before instance assert and modify actions. This prevents the pattern matching process from attempting the evaluation of a join expression that accesses the slots of a retracted instance. ******* STATUS: ******* FIXED BY : Gary Riley DATE : 06/22/06 IMPLEMENTED BY : Gary Riley IN VERSION : 6.25 DATE : DOCUMENTED BY : DATE : TESTED BY : DATE : APPROVED BY : DATE : --- NEW FILE FunctionContext.zip --- PK `????]???????A??g?x?t?x??CJN??S??9O? ?ga??G???n/?8???????'?2???????????????3?W??????:??.ys?;?:=???g'???xYjo, ?????t?0z at .?< c?? I?a<$1?????@? ? ?.dY?>?A????T? e??>??~P?%$?????4???pL?D??f?~2?? F?Y?&[1???;???4*\x??u?PIS??????1!?h%/?s?r?????u? T?????'-?????w??r? w?? ??a????P??Y|#V????? ??{????/p?%$??G??^?>?)?~?2F??j?Vu?v5:??N/?z?;????????^?g?|?9?v?>???o?g?????DB{co?X??`M?1g?:s?jimM?IS??^[???,??@k h??C%V?O??4;???g?????3??E??d???^\?????????&?b/m????]???I?\??1$??g ??q?pu?????O??r??k???DFIA??W?6? Y?????C??????????6??f???????&???m?]????? ????:d???b?!?????:??-??T?????:~???C????~?????T????j?????%?#?i?????'??=??B??gWU*Jg??O???$`?k???s???6q?[?4???H???)v*&?`??H0???????"????b[~????o?6I" ;F.?L-??=M3? ?8?M"???(Y??? ???I?:2Ii_$?Q??????cB?o/FL???C?w?;J???*???? ???.N?1i? ?14Kj??~?9 yn?O *?}$|M1J???????S?|s?G ?????O8?L?-?~??#???S?????????|??PN?????3???f???s????oY??49V??5???J???2????N??'?AN?? F??Ni??$w?????%)???U?Y?r_?NU??R?/Y!????'?;r5?Y???5????;H?1?qE??$???K?,??R^]??20M?r ?X???3|??H?G>??m???8*va1??? ?F?#??`?|<F????????a(Dg??xY???t>??#A????L0;j? XI?b????,8?i????????C#Fm?rZ}n? _?jr?tW?????5k?|j N???9w??cI??eu>a???? ??z???1??^O?ld?5??x??h?????L}?+?sf?x6;??C>?h ?CV`????????z?"+??iE F  G?? 2C????#??~?_??n ?R??{??J;M?? ;p?)x??????$?"W??$?e?5?w??f?k???_3?6J#?jm xM`??Xt?o??7R?? ????*? ?xA??)3P??Lv?K????????????+??m??v??}(P???S???????(E????c???$???????)?z?r^(?$%?Q6I?#1???? 3AB?9<???Y??[r????W?????a ????$??f?_???~.?????M??y?? ??^K??" ?`??R ???D{ ?????SYi?9??S????$,?l>6??Q6?L??L? ???j???P?F ? ,?.?R?*??C`?????LS??? "?d?Y?N?c?????`??01 Cm???[?|?/??jiMY???/?XO???X=2??? ????L??N??w?*g????#??????3?(???b????q??DM_ ????????L??Jo1Vy?|????Pk??2f6n,??-U?C?T???B??5?u??1Pq?g |??K?? ?????~??{?oWr-????xx5????(?p?S?c??A|x?FC?'?????\u{?k6 n?QJjn?MQ??H?=Mi?Z?>5???bB?Xl?Fi?E?]J??$Z?Kt??abC`&z??/??????q?:?0xc?em?{??o?47???????&???w?&?IS???v;?H????v4??g?w?~?d`5?&1????)v????E???H:?5?Rl{ m?z??4?????T??jTY#O_(5J??&?y??g?t??D;?G???:Jfo??'??????Tc??x? f??_?]?:!???????Dk?W?^%q?X {?{????q?JA9?30?????]c???I??????? ????nC0?Q?#n????B??j?????rK ??%`A?v `?r??-??flv?????m?W??`X5{??wo4?ZO%??i?Z??*}d-[k?>ny?????????)?Sn"?S:?-BQ???*??(n?9I?l???H5m?#?2??pAG??-%???_??j????Rt6u?$?i??}???? ??{Vh?? m? TA????E/8M?i?.???V?????0????:???????? ??Y??s?l?/????G2?I???I)i?+?\??Aef&Ho6?v???k????Rm?'?.?W??h?6? S??????kY#?q?:l??H??? Ig????nk\?8 a?P?c???o??CP?.R?b?!?ED)?t7K????$5????F?_:??!0????~???{c??Qk????`?]x??9??F8|??????,x??:?>?s??! ?K?'O?]D?R?+k)$???R? >Mu??4????????R?????j%????+h?Tl ????f?6?qy???????TA??hl???G Z?c?v? t????P?????g?e?A??` [? ?>?OyUx???5????G???W??^?K?*p?\??D^?2?M$U?k????V?Cy8= ??`?????`.?RT???z??>???\?s?vt?????OG4???l????!-gx?P]?^?u???S?S?J;????ES?;"????K?TkVi1? b1kZ ?5?f? N?T^?n?da,????????cK_M??k???4?/??? ?2/<0yb????ATug:???dW)7?myi?mY??"&?X?Rz at qb??`?C??_??????pZ??? ew?{?eL???[M;CW?n???6n^?h?g?H?+?? ?(wbl4?????? ???z???|???ML?&U??n???U?P???oL!&+l??W?B?v%1 3G3M(J?:??}????? n??\+x??B?q?X6?FE?S"V.8?????Yt???????it???[????zB6?B?? ?0????X?tY??s?V??6??r? ??tv'9k? Y?t?n?L??y?????E?q_j??C&???~I??U?a???}?{?K?Y?oq*j????"l??%H?I_[%o9??L??!????-?? ?(????3\_????q?A??L2???9?r`4? y??fs????.???????V???Y#*?%?? 0??X8??j?-_|?b%???vU[???????-???? ??????B\??~Z???s????????????g????K[u???V??[:???N)uo?????q????Zb?=V_|?I??AX-? ?~4??K+H?l??/??????c7??2?|?n`[PT???j??)???L??8?J?sFN?????GA ??M?y?$M=L????\N_m*qGr??nk???O?c?H$?,??eU?T????bj??????,?B???6v}Q?????P??a? jC%??z?XBq?? Fq?????n??C;??9}bS???????^`?m?@~_? ?$??o~??u{?xi? ?F3????*zYL???D\m?^qDx?????w??????db??????`t?????T?{??n???v??1??t(??wF?K??{b~?< ??9??F?G????=,?$?b>?:???N???f< ???W???yzx?????0B23?R)?????/'2??\?]???a1u??????W??????+ ??D)??DUx ?o?g??+2g??????????????:??????[ ?8?, (P????!?ZuR?'&-???/???F(?0???Zw??'??? :???n>???????%{bJ ?9??E?'??o?r? ??ML.???? ?4??:?????~?2?????Vdz0H??1=9? )@?$:{?YS??Pv?96?????ou?.i???&?I????(y'."a??u??Ke????mwZ??????~,Mk*?)??8??8???m6Ki)????*??p5?-??+??(?J)? ?????????t?B??kmH????Z?6:?jg?@]\o?G9vd??????"?7?G$*l|?Q ????T?!9?5z?????????}?~?6S?? d;{????#?(E $e[M??????x???????????B/:???LF?y:x?F^t??n1:?2|?x???$???,?#t?I3?d???[>??????K?')?????!t?????/_UN?igx???????b8?B?????drSj4?* 1??]???GY?c?7$??????,Xy! ??'??}Tw>}?y????4?f????l??T??i'???u??>B}????>FY? }?L#/? ???{!L?7?o????^??`???x??FK??9?@|? ??????"??y ?? ? ?-C?s??)1V?p??{/E???Rj ???%py??????Ue?C?mn'?;????t??x??#?????(??Q?^s?/??=?Q??????????e}/O?9? ?#t>?N?????xpu>????????x? ????G???4???&'??% `? $r????w? ??{/]`_1&-???JQ ?i++ : "m?u??D??8??V?F??i V?7???(?/ ~W?&???x???|?#pS5?c0*K B?E????????X??i????-?n?_??@?&E????a?e???z????%?a???c?/Av?????N????=??@4????I?????B????? :?!????K?`??z4??0????w1??gc?N?^????gi?)??|?A?+????g0?????4? ~9?r?T?? /\P?? ?G?7u??Sg?:?QS[?1???@jS?@????\C %3.?8a???J) G]???vK?#i+?: ?kw???=3??hEj???S??X???IO????m??????lf*?,??D??? 5??I ???>??;??]?0ra????+???z?u???$???????|?]@*?/?uhv???[????)Xh?=???(? $T?????!)j4)'?R??????Umoo???T??0?L??n?OI?s?uh /???%?5????@???.?S?g ??#???Yt??qj?????!?K??ms ?%???T????~V?J??YK????K??$o?+??(?N13`???p'????7????_?VD??ax{????J#M????PK ??DUx clips-6.24-time-sysdep.c.patch: --- NEW FILE clips-6.24-time-sysdep.c.patch --- --- clipssrc/clips/sysdep.c 2006-06-07 10:54:53.000000000 -0600 +++ clipssrc/clips/sysdep.c.patched 2007-08-25 10:45:45.000000000 -0600 @@ -736,10 +736,15 @@ struct timeval now; gettimeofday(&now, 0); return (now.tv_usec / 1000000.0) + now.tv_sec; #endif +#elif UNIX_7 + struct timeval now; + gettimeofday(&now, 0); + return (now.tv_usec / 1000000.0) + now.tv_sec; + #else return((double) clock() / (double) CLOCKS_PER_SEC); #endif } --- NEW FILE objrtmch.c --- /*******************************************************/ /* "C" Language Integrated Production System */ /* */ /* CLIPS Version 6.25 06/22/06 */ /* */ /* OBJECT PATTERN MATCHER MODULE */ /*******************************************************/ /**************************************************************/ /* Purpose: RETE Network Interface for Objects */ /* */ /* Principal Programmer(s): */ /* Brian L. Donnell */ /* */ /* Contributing Programmer(s): */ /* */ /* Revision History: */ /* 6.23: Correction for FalseSymbol/TrueSymbol. DR0859 */ /* */ /* 6.24: Removed INCREMENTAL_RESET and */ /* LOGICAL_DEPENDENCIES compilation flags. */ /* */ /* Converted INSTANCE_PATTERN_MATCHING to */ /* DEFRULE_CONSTRUCT. */ /* */ /* Renamed BOOLEAN macro type to intBool. */ /* */ /* 6.25: Modified the QueueObjectMatchAction function */ /* so that instance retract actions always occur */ /* before instance assert and modify actions. */ /* This prevents the pattern matching process */ /* from attempting the evaluation of a join */ /* expression that accesses the slots of a */ /* retracted instance. */ /* */ /**************************************************************/ /* ========================================= ***************************************** EXTERNAL DEFINITIONS ========================================= ***************************************** */ #include "setup.h" #if DEFRULE_CONSTRUCT && OBJECT_SYSTEM #include "classfun.h" #include "memalloc.h" #include "drive.h" #include "engine.h" #include "envrnmnt.h" #include "lgcldpnd.h" #include "multifld.h" #if (! RUN_TIME) && (! BLOAD_ONLY) #include "incrrset.h" #endif #include "reteutil.h" #include "ruledlt.h" #include "reorder.h" #include "retract.h" #include "router.h" #include "objrtfnx.h" #define _OBJRTMCH_SOURCE_ #include "objrtmch.h" #include "insmngr.h" /* ========================================= ***************************************** INTERNALLY VISIBLE FUNCTION HEADERS ========================================= ***************************************** */ static void QueueObjectMatchAction(void *,int,INSTANCE_TYPE *,int); static SLOT_BITMAP *QueueModifySlotMap(void *,SLOT_BITMAP *,int); static void ReturnObjectMatchAction(void *,OBJECT_MATCH_ACTION *); static void ProcessObjectMatchQueue(void *); static void MarkObjectPatternNetwork(void *,SLOT_BITMAP *); static intBool CompareSlotBitMaps(SLOT_BITMAP *,SLOT_BITMAP *); static void ObjectPatternMatch(void *,int,OBJECT_PATTERN_NODE *,struct multifieldMarker *); static void ProcessPatternNode(void *,int,OBJECT_PATTERN_NODE *,struct multifieldMarker *); static void CreateObjectAlphaMatch(void *,OBJECT_ALPHA_NODE *); static intBool EvaluateObjectPatternTest(void *,int,struct multifieldMarker *,EXPRESSION *, OBJECT_PATTERN_NODE *); static void ObjectAssertAction(void *,INSTANCE_TYPE *); static void ObjectModifyAction(void *,INSTANCE_TYPE *,SLOT_BITMAP *); static void ObjectRetractAction(void *,INSTANCE_TYPE *,SLOT_BITMAP *); static void ObjectPatternNetErrorMessage(void *,OBJECT_PATTERN_NODE *); static void TraceErrorToObjectPattern(void *,int,OBJECT_PATTERN_NODE *); /* ========================================= ***************************************** EXTERNALLY VISIBLE FUNCTIONS ========================================= ***************************************** */ /*************************************************************************** NAME : ObjectMatchDelay DESCRIPTION : H/L interface for SetDelayObjectPatternMatching INPUTS : None RETURNS : Nothing useful SIDE EFFECTS : DelayObjectPatternMatching set and Rete network updates delayed until pattern-matching is completed NOTES : H/L Syntax: (object-pattern-match-delay *) ***************************************************************************/ globle void ObjectMatchDelay( void *theEnv, DATA_OBJECT *result) { register int ov; ov = SetDelayObjectPatternMatching(theEnv,TRUE); EvaluateExpression(theEnv,GetFirstArgument(),result); if (EvaluationData(theEnv)->EvaluationError) { SetHaltExecution(theEnv,FALSE); SetEvaluationError(theEnv,FALSE); SetDelayObjectPatternMatching(theEnv,ov); SetEvaluationError(theEnv,TRUE); } else SetDelayObjectPatternMatching(theEnv,ov); } /*************************************************** NAME : SetDelayObjectPatternMatching DESCRIPTION : Sets the flag determining if Rete network activity is to be delayed for objects or not INPUTS : The value of the flag RETURNS : The old value of the flag SIDE EFFECTS : DelayObjectPatternMatching set NOTES : When the delay is set to FALSE, all pending Rete network updates are performed ***************************************************/ globle intBool SetDelayObjectPatternMatching( void *theEnv, int value) { intBool oldval; oldval = ObjectReteData(theEnv)->DelayObjectPatternMatching; if (value) ObjectReteData(theEnv)->DelayObjectPatternMatching = TRUE; else { ObjectReteData(theEnv)->DelayObjectPatternMatching = FALSE; ObjectNetworkAction(theEnv,0,NULL,-1); } return(oldval); } /*************************************************** NAME : GetDelayObjectPatternMatching DESCRIPTION : Gets the flag determining if Rete network activity is to be delayed for objects or not INPUTS : None RETURNS : The flag SIDE EFFECTS : None NOTES : None ***************************************************/ globle intBool GetDelayObjectPatternMatching( void *theEnv) { return(ObjectReteData(theEnv)->DelayObjectPatternMatching); } /******************************************************** NAME : ObjectNetworkPointer DESCRIPTION : Returns the first object network pattern node INPUTS : None RETURNS : The top of the object pattern network SIDE EFFECTS : None NOTES : None ********************************************************/ globle OBJECT_PATTERN_NODE *ObjectNetworkPointer( void *theEnv) { return(ObjectReteData(theEnv)->ObjectPatternNetworkPointer); } /******************************************************** NAME : ObjectNetworkTerminalPointer DESCRIPTION : Returns the first terminal pattern node INPUTS : None RETURNS : The last node of a pattern SIDE EFFECTS : None NOTES : None ********************************************************/ globle OBJECT_ALPHA_NODE *ObjectNetworkTerminalPointer( void *theEnv) { return(ObjectReteData(theEnv)->ObjectPatternNetworkTerminalPointer); } /*************************************************** NAME : SetObjectNetworkPointer DESCRIPTION : Sets the object pattern network to the given network INPUTS : Top of the new pattern network RETURNS : Nothing useful SIDE EFFECTS : ObjectPatternNetworkPointer set NOTES : None ***************************************************/ globle void SetObjectNetworkPointer( void *theEnv, OBJECT_PATTERN_NODE *value) { ObjectReteData(theEnv)->ObjectPatternNetworkPointer = value; } /******************************************************* NAME : SetObjectNetworkTerminalPointer DESCRIPTION : Sets the global list of terminal pattern nodes (the ones containing the bitmaps) to the given node INPUTS : The last node of a pattern RETURNS : Nothing useful SIDE EFFECTS : ObjectPatternNetworkTerminalPointer set NOTES : None *******************************************************/ globle void SetObjectNetworkTerminalPointer( void *theEnv, OBJECT_ALPHA_NODE *value) { ObjectReteData(theEnv)->ObjectPatternNetworkTerminalPointer = value; } /************************************************************************ NAME : ObjectNetworkAction DESCRIPTION : Main driver for pattern-matching on objects If the pattern-matching is current delayed or another object is currently being pattern-matched, the requested match action is queued for later processing. Otherwise, the match action is performed and the Rete network is updated. INPUTS : 1) The match action type OBJECT_ASSERT (1) OBJECT_RETRACT (2) OBJECT_MODIFY (3) 2) The instance to be matched (can be NULL if only want pending actions to be performed) 3) The name id of the slot being updated (can be -1) If this argument is -1, it is assumed that any pattern which could match this instance must be checked. Otherwise, only the patterns which explicitly match on the named slot will be checked. RETURNS : Nothing useful SIDE EFFECTS : Action queued or Rete network updated NOTES : None ************************************************************************/ globle void ObjectNetworkAction( void *theEnv, int type, INSTANCE_TYPE *ins, int slotNameID) { SLOT_BITMAP *tmpMap; if (EngineData(theEnv)->JoinOperationInProgress) return; EngineData(theEnv)->JoinOperationInProgress = TRUE; /* ================================================ For purposes of conflict resolution, all objects which have had pattern-matching delayed will have the same relative timestamp, i.e., the inference engine thinks they all just appeared simultaneously When delay is off, however, each object gets the new and current timestamp as expected. ================================================ */ ObjectReteData(theEnv)->UseEntityTimeTag = DefruleData(theEnv)->CurrentEntityTimeTag++; /* ================================================== If pattern-matching is delayed (by use of the set-object-pattern-match-delay function), then the instance should be marked for later processing (when the delay is turned off). ================================================== */ if (ins != NULL) { /* 6.05 Bug Fix */ ins->reteSynchronized = FALSE; if (ObjectReteData(theEnv)->DelayObjectPatternMatching == FALSE) switch (type) { case OBJECT_ASSERT : ObjectAssertAction(theEnv,ins); break; case OBJECT_RETRACT : ObjectRetractAction(theEnv,ins,NULL); break; default : tmpMap = QueueModifySlotMap(theEnv,NULL,slotNameID); ObjectModifyAction(theEnv,ins,tmpMap); rm(theEnv,(void *) tmpMap,SlotBitMapSize(tmpMap)); } else QueueObjectMatchAction(theEnv,type,ins,slotNameID); } /* ======================================== Process all pending actions in the queue All updates will use the same timestamp ======================================== */ ProcessObjectMatchQueue(theEnv); EngineData(theEnv)->JoinOperationInProgress = FALSE; ForceLogicalRetractions(theEnv); /*=========================================*/ /* Free partial matches that were released */ /* by the assertion of the fact. */ /*=========================================*/ if (EngineData(theEnv)->ExecutingRule == NULL) FlushGarbagePartialMatches(theEnv); } /* ========================================= ***************************************** INTERNALLY VISIBLE FUNCTIONS ========================================= ***************************************** */ /*************************************************** NAME : ResetObjectMatchTimeTags DESCRIPTION : If CurrentObjectMatchTimeTag + 1 would cause an overflow, CurrentObjectMatchTimeTag is reset to 0L and all time tags in object pattern nodes are reset. INPUTS : None RETURNS : Nothing useful SIDE EFFECTS : CurrentObjectMatchTimeTag reset to 0, and all match time tags reset These tags are used to recognize valid pattern nodes on a match NOTES : None ***************************************************/ globle void ResetObjectMatchTimeTags( void *theEnv) { OBJECT_ALPHA_NODE *alphaPtr; OBJECT_PATTERN_NODE *lastLevel; /* ============================================ If the current tag incremented by one would not cause an overflow, then we can leave things alone. ============================================ */ if ((ObjectReteData(theEnv)->CurrentObjectMatchTimeTag + 1L) > ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) return; ObjectReteData(theEnv)->CurrentObjectMatchTimeTag = 0L; alphaPtr = ObjectNetworkTerminalPointer(theEnv); while (alphaPtr != NULL) { alphaPtr->matchTimeTag = 0L; lastLevel = alphaPtr->patternNode; while (lastLevel != NULL) { if (lastLevel->matchTimeTag == 0L) break; lastLevel->matchTimeTag = 0L; lastLevel = lastLevel->lastLevel; } alphaPtr = alphaPtr->nxtTerminal; } } /*************************************************** NAME : QueueObjectMatchAction DESCRIPTION : Posts a Rete network match event for later processing INPUTS : 1) The match action type OBJECT_ASSERT (1) OBJECT_RETRACT (2) OBJECT_MODIFY (3) 2) The instance to be matched 3) The name id of the slot being updated (can be -1) RETURNS : Nothing useful SIDE EFFECTS : Queue updated NOTES : None ***************************************************/ static void QueueObjectMatchAction( void *theEnv, int type, INSTANCE_TYPE *ins, int slotNameID) { OBJECT_MATCH_ACTION *prv,*cur,*newMatch; OBJECT_MATCH_ACTION *prvRetract = NULL; /* DR0873 */ prv = NULL; cur = ObjectReteData(theEnv)->ObjectMatchActionQueue; while (cur != NULL) { /* =========================================================== Here are the possibilities for the first Rete event already on the queue as compared with the new event for an object: Assert/Retract --> Delete assert event Ignore retract event Assert/Modify --> Ignore modify event Modify/Modify --> Merge new modify event Modify/Retract --> Delete modify event Queue the retract event =========================================================== */ if (cur->ins == ins) { /* =================================================== An action for initially asserting the newly created object to all applicable patterns =================================================== */ if (cur->type == OBJECT_ASSERT) { if (type == OBJECT_RETRACT) { /* =================================================== If we are retracting the entire object, then we can remove the assert action (and all modifies as well) and ignore the retract action (basically the object came and went before the Rete network had a chance to see it) =================================================== */ if (prv == NULL) ObjectReteData(theEnv)->ObjectMatchActionQueue = cur->nxt; else prv->nxt = cur->nxt; cur->ins->busy--; ReturnObjectMatchAction(theEnv,cur); } /* ================================================= If this is a modify action, then we can ignore it since the assert action will encompass it ================================================= */ } /* =================================================== If the object is being deleted after a slot modify, drop the modify event and replace with the retract =================================================== */ else if (type == OBJECT_RETRACT) { cur->type = OBJECT_RETRACT; if (cur->slotNameIDs != NULL) { rm(theEnv,(void *) cur->slotNameIDs,SlotBitMapSize(cur->slotNameIDs)); cur->slotNameIDs = NULL; } } /* ==================================================== If a modify event for this slot is already on the queue, ignore this one. Otherwise, merge the slot id ==================================================== */ else cur->slotNameIDs = QueueModifySlotMap(theEnv,cur->slotNameIDs,slotNameID); return; } if (cur->type == OBJECT_RETRACT) /* DR0873 */ { prvRetract = cur; } /* DR0873 */ prv = cur; cur = cur->nxt; } /* ================================================ If there are no actions for the instance already on the queue, the new action is simply appended. ================================================ */ newMatch = get_struct(theEnv,objectMatchAction); newMatch->type = type; newMatch->nxt = NULL; /* If we get here, cur should be NULL */ newMatch->slotNameIDs = (type != OBJECT_MODIFY) ? NULL : QueueModifySlotMap(theEnv,NULL,slotNameID); newMatch->ins = ins; newMatch->ins->busy++; /* DR0873 Begin */ /* Retract operations must be processed before assert and */ /* modify actions, otherwise the pattern matching process */ /* might attempt to access the slots of a retract instance. */ if (type == OBJECT_RETRACT) { if (prvRetract == NULL) { newMatch->nxt = ObjectReteData(theEnv)->ObjectMatchActionQueue; ObjectReteData(theEnv)->ObjectMatchActionQueue = newMatch; } else { newMatch->nxt = prvRetract->nxt; prvRetract->nxt = newMatch; } } else /* DR0873 End */ if (prv == NULL) ObjectReteData(theEnv)->ObjectMatchActionQueue = newMatch; else prv->nxt = newMatch; } /**************************************************** NAME : QueueModifySlotMap DESCRIPTION : Sets the bitmap for a queued object modify Rete network action INPUTS : 1) The old bitmap (can be NULL) 2) The canonical slot id to set RETURNS : The (new) bitmap SIDE EFFECTS : Bitmap allocated/reallocated if necessary, and slot id bit set NOTES : If the bitmap must be (re)allocated, this routine allocates twice the room necessary for the current id to allow for growth. ****************************************************/ static SLOT_BITMAP *QueueModifySlotMap( void *theEnv, SLOT_BITMAP *oldMap, int slotNameID) { SLOT_BITMAP *newMap; unsigned short newmaxid; unsigned oldsz,newsz; if ((oldMap == NULL) ? TRUE : (slotNameID > oldMap->maxid)) { newmaxid = (unsigned short) (slotNameID * 2); newsz = sizeof(SLOT_BITMAP) + (sizeof(char) * (newmaxid / BITS_PER_BYTE)); newMap = (SLOT_BITMAP *) gm2(theEnv,newsz); ClearBitString((void *) newMap,newsz); if (oldMap != NULL) { oldsz = SlotBitMapSize(oldMap); GenCopyMemory(char,oldsz,newMap,oldMap); rm(theEnv,(void *) oldMap,oldsz); } newMap->maxid = newmaxid; } else newMap = oldMap; SetBitMap(newMap->map,slotNameID); return(newMap); } /*************************************************** NAME : ReturnObjectMatchAction DESCRIPTION : Deallocates and object match action structure and associated slot bitmap (if any) INPUTS : The queued match action item RETURNS : Nothing useful SIDE EFFECTS : Object match action item deleted NOTES : None ***************************************************/ static void ReturnObjectMatchAction( void *theEnv, OBJECT_MATCH_ACTION *omaPtr) { if (omaPtr->slotNameIDs != NULL) rm(theEnv,(void *) omaPtr->slotNameIDs,SlotBitMapSize(omaPtr->slotNameIDs)); rtn_struct(theEnv,objectMatchAction,omaPtr); } /*************************************************** NAME : ProcessObjectMatchQueue DESCRIPTION : Processes all outstanding object Rete network update events INPUTS : None RETURNS : Nothing useful SIDE EFFECTS : Pattern-matching on objects NOTES : None ***************************************************/ static void ProcessObjectMatchQueue( void *theEnv) { OBJECT_MATCH_ACTION *cur; while ((ObjectReteData(theEnv)->ObjectMatchActionQueue != NULL) && (ObjectReteData(theEnv)->DelayObjectPatternMatching == FALSE)) { cur = ObjectReteData(theEnv)->ObjectMatchActionQueue; ObjectReteData(theEnv)->ObjectMatchActionQueue = cur->nxt; switch(cur->type) { case OBJECT_ASSERT : ObjectAssertAction(theEnv,cur->ins); break; case OBJECT_RETRACT : ObjectRetractAction(theEnv,cur->ins,cur->slotNameIDs); break; default : ObjectModifyAction(theEnv,cur->ins,cur->slotNameIDs); } cur->ins->busy--; ReturnObjectMatchAction(theEnv,cur); } } /****************************************************** NAME : MarkObjectPatternNetwork DESCRIPTION : Iterates through all terminal pattern nodes checking class and slot bitmaps. If a pattern is applicable to the object/slot change, then all the nodes belonging to the pattern are marked as needing to be examined by the pattern matcher. INPUTS : The bitmap of ids of the slots being changed (NULL if this is an assert for the for the entire object) RETURNS : Nothing useful SIDE EFFECTS : Applicable pattern nodes marked NOTES : Incremental reset status is also checked here ******************************************************/ static void MarkObjectPatternNetwork( void *theEnv, SLOT_BITMAP *slotNameIDs) { OBJECT_ALPHA_NODE *alphaPtr; OBJECT_PATTERN_NODE *upper; CLASS_BITMAP *clsset; unsigned id; ResetObjectMatchTimeTags(theEnv); ObjectReteData(theEnv)->CurrentObjectMatchTimeTag++; alphaPtr = ObjectNetworkTerminalPointer(theEnv); id = ObjectReteData(theEnv)->CurrentPatternObject->cls->id; while (alphaPtr != NULL) { /* ============================================================= If an incremental reset is in progress, make sure that the pattern has been marked for initialization before proceeding. ============================================================= */ #if (! RUN_TIME) && (! BLOAD_ONLY) if (EngineData(theEnv)->IncrementalResetInProgress && (alphaPtr->header.initialize == FALSE)) { alphaPtr = alphaPtr->nxtTerminal; continue; } #endif /* ============================================ Check the class bitmap to see if the pattern pattern is applicable to the object at all ============================================ */ clsset = (CLASS_BITMAP *) ValueToBitMap(alphaPtr->classbmp); if ((id > (unsigned) clsset->maxid) ? FALSE : TestBitMap(clsset->map,id)) { /* =================================================== If we are doing an assert, then we need to check all patterns which satsify the class bitmap (The retraction has already been done in this case) =================================================== */ if (slotNameIDs == NULL) { alphaPtr->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; for (upper = alphaPtr->patternNode ; upper != NULL ; upper = upper->lastLevel) { if (upper->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) break; else upper->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; } } /* =================================================== If we are doing a slot modify, then we need to check only the subset of patterns which satisfy the class bitmap AND actually match on the slot in question. =================================================== */ else if (alphaPtr->slotbmp != NULL) { if (CompareSlotBitMaps(slotNameIDs, (SLOT_BITMAP *) ValueToBitMap(alphaPtr->slotbmp))) { alphaPtr->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; for (upper = alphaPtr->patternNode ; upper != NULL ; upper = upper->lastLevel) { if (upper->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) break; else upper->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; } } } } alphaPtr = alphaPtr->nxtTerminal; } } /*************************************************** NAME : CompareSlotBitMaps DESCRIPTION : Compares two slot bitmaps by bitwising and'ing byte per byte up to the length of the smaller map. INPUTS : The two slot bitmaps RETURNS : TRUE if any common bits are set in both maps, FALSE otherwise SIDE EFFECTS : None NOTES : None ***************************************************/ static intBool CompareSlotBitMaps( SLOT_BITMAP *smap1, SLOT_BITMAP *smap2) { unsigned short i,maxByte; maxByte = (unsigned short) (((smap1->maxid < smap2->maxid) ? smap1->maxid : smap2->maxid) / BITS_PER_BYTE); for (i = 0 ; i <= maxByte ; i++) if (smap1->map[i] & smap2->map[i]) return(TRUE); return(FALSE); } /********************************************************************************** NAME : ObjectPatternMatch DESCRIPTION : Iterates through all the pattern nodes on one level in the pattern network. A node is only processed if it can lead to a terminating class bitmap node which applies to the object being matched. This allows for a significant reduction in the number of patterns considered. INPUTS : 1) The offset of the slot position from the pattern index 2) The pattern node being examined 3) The end of the list of multifield markers for the pattern RETURNS : Nothing useful SIDE EFFECTS : The pattern tests are evaluated and the child nodes may be processed (which may cause a whole series of Rete network updates). NOTES : Several globals are used to keep track of the current slot being examined: CurrentPatternMarks - the series of multifield markers CurrentPatternObject - the object being pattern-matched CurrentPatternObjectSlot - the current slot being examined CurrentObjectSlotLength - the cardinality of the slot value An optimization is performed when evaluating constant tests on a slot value field. All pattern nodes on a level which restrict the same slot are grouped together. Those which are constant tests are placed at the far right. Thus, as soon as one of these constant tests succeeds, the remaining nodes for that slot on this level can be skipped **********************************************************************************/ static void ObjectPatternMatch( void *theEnv, int offset, OBJECT_PATTERN_NODE *patternTop, struct multifieldMarker *endMark) { register unsigned saveSlotLength; register INSTANCE_SLOT *saveSlot; OBJECT_PATTERN_NODE *blockedNode; while (patternTop != NULL) { /* =========================================================== MarkObjectPatternNetwork() has already marked pattern nodes which need processing according to the class bitmaps, slot updates and incremental reset status =========================================================== */ if (patternTop->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) { /* ======================================== Make sure we are examining the correct slot of the object for this pattern node ======================================== */ if ((patternTop->slotNameID == ISA_ID) || (patternTop->slotNameID == NAME_ID)) { ObjectReteData(theEnv)->CurrentPatternObjectSlot = NULL; ObjectReteData(theEnv)->CurrentObjectSlotLength = 1; offset = 0; } else if ((ObjectReteData(theEnv)->CurrentPatternObjectSlot == NULL) ? TRUE : (ObjectReteData(theEnv)->CurrentPatternObjectSlot->desc->slotName->id != patternTop->slotNameID)) { /* ==================================================== Need to reset the indices for the multifield markers now that we have moved onto a different slot ==================================================== */ ObjectReteData(theEnv)->CurrentPatternObjectSlot = ObjectReteData(theEnv)->CurrentPatternObject->slotAddresses[ObjectReteData(theEnv)->CurrentPatternObject->cls->slotNameMap [patternTop->slotNameID] - 1]; offset = 0; if (ObjectReteData(theEnv)->CurrentPatternObjectSlot->desc->multiple) ObjectReteData(theEnv)->CurrentObjectSlotLength = GetInstanceSlotLength(ObjectReteData(theEnv)->CurrentPatternObjectSlot); else ObjectReteData(theEnv)->CurrentObjectSlotLength = 1; } /* ======================================================== Process the pattern node. If it is satisfied by the the instance, ProcessPatternNode() will recursively pass all of its children nodes through ObjectPatternMatch() ======================================================== */ saveSlotLength = ObjectReteData(theEnv)->CurrentObjectSlotLength; saveSlot = ObjectReteData(theEnv)->CurrentPatternObjectSlot; ProcessPatternNode(theEnv,offset,patternTop,endMark); ObjectReteData(theEnv)->CurrentObjectSlotLength = saveSlotLength; ObjectReteData(theEnv)->CurrentPatternObjectSlot = saveSlot; } /* ============================================================== Move on to the siblings of this node - if the current node was a constant test that succeeded, skip further sibling nodes (which test on the same field in the pattern) which match on the same slot since they are all constant tests as well and will, of course fail. ============================================================== */ if (patternTop->blocked == TRUE) { patternTop->blocked = FALSE; blockedNode = patternTop; patternTop = patternTop->rightNode; while (patternTop != NULL) { if ((patternTop->slotNameID != blockedNode->slotNameID) || (patternTop->whichField != blockedNode->whichField)) break; patternTop = patternTop->rightNode; } } else patternTop = patternTop->rightNode; } } /********************************************************************************** NAME : ProcessPatternNode DESCRIPTION : Determines if a pattern node satsifies the corresponding slot value field(s) in an object. If it does, ObjectPatternMatch() is recursively called to process the child nodes of this node. In this mutual recursion between ObjectPatternMatch() and ProcessPatternNode(), the nodes of all applicable patterns are processed to completion. ObjectPatternMatch() enters an object into a pattern's aplha memory when the traversal reaches a terminal class bitmap node. INPUTS : 1) The offset of the slot index from the pattern index 2) The pattern node being examined 3) The end of the list of multifield markers for the pattern RETURNS : Nothing useful SIDE EFFECTS : The pattern tests are evaluated and the child nodes may be processed (which may cause a whole series of Rete network updates). NOTES : Several globals are used to keep track of the current slot being examined: CurrentPatternMarks - the series of multifield markers CurrentPatternObject - the object being pattern-matched CurrentPatternObjectSlot - the current slot being examined CurrentObjectSlotLength - the cardinality of the slot value **********************************************************************************/ static void ProcessPatternNode( void *theEnv, int offset, OBJECT_PATTERN_NODE *patternNode, struct multifieldMarker *endMark) { int patternSlotField,objectSlotField; unsigned objectSlotLength; int repeatCount; INSTANCE_SLOT *objectSlot; struct multifieldMarker *newMark; patternSlotField = patternNode->whichField; objectSlotField = patternSlotField + offset; /* ========================================== If this is a test on the class or the name of the object, process it separately. ========================================== */ if (ObjectReteData(theEnv)->CurrentPatternObjectSlot == NULL) { if ((patternNode->networkTest == NULL) ? TRUE : (EvaluateObjectPatternTest(theEnv,objectSlotField,NULL, (EXPRESSION *) patternNode->networkTest,patternNode))) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,offset,patternNode->nextLevel,endMark); } return; } /* ================================ Check a single-field restriction ================================ */ if (patternNode->multifieldNode == 0) { if ((patternNode->networkTest == NULL) ? TRUE : EvaluateObjectPatternTest(theEnv,objectSlotField,NULL, (EXPRESSION *) patternNode->networkTest,patternNode)) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,offset,patternNode->nextLevel,endMark); } return; } /* ================================================================== Check a multifield restriction. Add a marker for this field which has indices indicating to which values in the object slot the multifield pattern node is bound ================================================================== */ newMark = get_struct(theEnv,multifieldMarker); newMark->whichField = patternSlotField; newMark->where.whichSlot = (void *) ObjectReteData(theEnv)->CurrentPatternObjectSlot->desc->slotName->name; newMark->startPosition = objectSlotField; newMark->next = NULL; if (ObjectReteData(theEnv)->CurrentPatternObjectMarks == NULL) ObjectReteData(theEnv)->CurrentPatternObjectMarks = newMark; else endMark->next = newMark; /* ========================================================== If there are further pattern restrictions on this slot, try pattern-matching for all possible bound values of the multifield pattern node: from no values to all values from the starting position of the multifield to the end of the object slot. Otherwise, bind the multifield to all the remaining fields in the slot value and continue with pattern-matching ========================================================== */ if (patternNode->endSlot == FALSE) { objectSlotLength = ObjectReteData(theEnv)->CurrentObjectSlotLength; objectSlot = ObjectReteData(theEnv)->CurrentPatternObjectSlot; newMark->endPosition = newMark->startPosition - 1; repeatCount = (int) (objectSlotLength - newMark->startPosition - patternNode->leaveFields + 2); while (repeatCount > 0) { if ((patternNode->networkTest == NULL) ? TRUE : EvaluateObjectPatternTest(theEnv,objectSlotField,newMark, (EXPRESSION *) patternNode->networkTest,patternNode)) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,(int) (offset + (newMark->endPosition - objectSlotField)), patternNode->nextLevel,newMark); ObjectReteData(theEnv)->CurrentObjectSlotLength = objectSlotLength; ObjectReteData(theEnv)->CurrentPatternObjectSlot = objectSlot; } newMark->endPosition++; repeatCount--; } } else { newMark->endPosition = (long) ObjectReteData(theEnv)->CurrentObjectSlotLength; if ((patternNode->networkTest == NULL) ? TRUE : EvaluateObjectPatternTest(theEnv,objectSlotField,newMark, (EXPRESSION *) patternNode->networkTest,patternNode)) { if (patternNode->alphaNode != NULL) CreateObjectAlphaMatch(theEnv,patternNode->alphaNode); ObjectPatternMatch(theEnv,0,patternNode->nextLevel,newMark); } } /* ====================================== Delete the temporary multifield marker ====================================== */ if (ObjectReteData(theEnv)->CurrentPatternObjectMarks == newMark) ObjectReteData(theEnv)->CurrentPatternObjectMarks = NULL; else endMark->next = NULL; rtn_struct(theEnv,multifieldMarker,newMark); } /*************************************************** NAME : CreateObjectAlphaMatch DESCRIPTION : Places an instance in the alpha memory of a pattern and drives the partial match through the join network INPUTS : The alpha memory node RETURNS : Nothing useful SIDE EFFECTS : Join network updated NOTES : None ***************************************************/ static void CreateObjectAlphaMatch( void *theEnv, OBJECT_ALPHA_NODE *alphaPtr) { struct joinNode *listOfJoins; struct partialMatch *theMatch; struct patternMatch *newMatch; while (alphaPtr != NULL) { if (alphaPtr->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag) { /* =================================================== If we have reached the class bitmap of the pattern, place the object in the alpha memory of each of the terminal nodes underneath and drive the partial matches through the join network. Insert the instance into the alpha memory of this pattern and mark it as busy =================================================== */ ObjectReteData(theEnv)->CurrentPatternObject->busy++; theMatch = CreateAlphaMatch(theEnv,(void *) ObjectReteData(theEnv)->CurrentPatternObject, ObjectReteData(theEnv)->CurrentPatternObjectMarks, (struct patternNodeHeader *) alphaPtr); /* ====================================== Attach the partial match to the object to ease later retraction ====================================== */ newMatch = get_struct(theEnv,patternMatch); newMatch->next = (struct patternMatch *) ObjectReteData(theEnv)->CurrentPatternObject->partialMatchList; newMatch->matchingPattern = (struct patternNodeHeader *) alphaPtr; newMatch->theMatch = theMatch; ObjectReteData(theEnv)->CurrentPatternObject->partialMatchList = (void *) newMatch; /* ================================================ Drive the partial match through the join network ================================================ */ listOfJoins = alphaPtr->header.entryJoin; while (listOfJoins != NULL) { NetworkAssert(theEnv,theMatch,listOfJoins,RHS); listOfJoins = listOfJoins->rightMatchNode; } } alphaPtr = alphaPtr->nxtInGroup; } } /****************************************************** NAME : EvaluateObjectPatternTest DESCRIPTION : Evaluates the pattern network test expression for a node INPUTS : 1) The actual index of the slot value field currently being examined 2) The multifield marker (if any) for the pattern node being exmained 3) The pattern network test expression 4) The pattern node being examined RETURNS : TRUE if the node passes the test, FALSE otherwise SIDE EFFECTS : Evaluation of the test EvaluationError and HaltExecution are always set to FALSE NOTES : Assumes networkTest != NULL ******************************************************/ static intBool EvaluateObjectPatternTest( void *theEnv, int objectSlotField, struct multifieldMarker *selfSlotMarker, EXPRESSION *networkTest, OBJECT_PATTERN_NODE *patternNode) { DATA_OBJECT vresult; int rv; if (networkTest->type == OBJ_PN_CONSTANT) { struct expr *oldArgument; oldArgument = EvaluationData(theEnv)->CurrentExpression; EvaluationData(theEnv)->CurrentExpression = networkTest; rv = ObjectCmpConstantFunction(theEnv,networkTest->value,&vresult); EvaluationData(theEnv)->CurrentExpression = oldArgument; if (rv) { if (((struct ObjectCmpPNConstant *) ValueToBitMap(networkTest->value))->pass) patternNode->blocked = TRUE; return(TRUE); } return(FALSE); } /* ========================================================= Evaluate or expressions expressed in the format: (or ... ) Returns TRUE (1.0) if any of the expression are TRUE, otherwise returns false (0.0). ========================================================= */ if (networkTest->value == ExpressionData(theEnv)->PTR_OR) { networkTest = networkTest->argList; while (networkTest != NULL) { if (EvaluateObjectPatternTest(theEnv,objectSlotField,selfSlotMarker,networkTest,patternNode)) { /* ============================================ A node can be blocked ONLY if there were one positive constant test on that node ============================================ */ patternNode->blocked = FALSE; return(TRUE); } patternNode->blocked = FALSE; networkTest = networkTest->nextArg; } return(FALSE); } /* ========================================================== Evaluate and expressions expressed in the format: (and ... ) Returns false (0.0) if any of the expression are false, otherwise returns TRUE (1.0). ========================================================== */ else if (networkTest->value == ExpressionData(theEnv)->PTR_AND) { networkTest = networkTest->argList; while (networkTest != NULL) { if (EvaluateObjectPatternTest(theEnv,objectSlotField,selfSlotMarker,networkTest,patternNode) == FALSE) { patternNode->blocked = FALSE; return(FALSE); } patternNode->blocked = FALSE; networkTest = networkTest->nextArg; } return(TRUE); } /* ======================================================= Evaluate all other expressions using EvaluateExpression ======================================================= */ else { EvaluationData(theEnv)->HaltExecution = FALSE; if (EvaluateExpression(theEnv,networkTest,&vresult)) { ObjectPatternNetErrorMessage(theEnv,patternNode); EvaluationData(theEnv)->EvaluationError = FALSE; EvaluationData(theEnv)->HaltExecution = FALSE; return(FALSE); } if ((vresult.value != EnvFalseSymbol(theEnv)) || (vresult.type != SYMBOL)) return(TRUE); } return(FALSE); } /*************************************************** NAME : ObjectAssertAction DESCRIPTION : Filters an instance through the object pattern network INPUTS : The instance RETURNS : Nothing useful SIDE EFFECTS : Instance matched NOTES : None ***************************************************/ static void ObjectAssertAction( void *theEnv, INSTANCE_TYPE *ins) { ins->header.timeTag = ObjectReteData(theEnv)->UseEntityTimeTag; ObjectReteData(theEnv)->CurrentPatternObject = ins; ObjectReteData(theEnv)->CurrentPatternObjectSlot = NULL; MarkObjectPatternNetwork(theEnv,NULL); ObjectPatternMatch(theEnv,0,ObjectNetworkPointer(theEnv),NULL); ins->reteSynchronized = TRUE; } /********************************************************************** NAME : ObjectModifyAction DESCRIPTION : Removes an instance from patterns (and attached joins) applicable to specified slot(s), and then filters same instance through object pattern network (only against patterns which explicitly match on named slot(s)) INPUTS : 1) The instance 2) The bitmap of slot ids RETURNS : Nothing useful SIDE EFFECTS : Instance retracted/asserted NOTES : None **********************************************************************/ static void ObjectModifyAction( void *theEnv, INSTANCE_TYPE *ins, SLOT_BITMAP *slotNameIDs) { ins->header.timeTag = ObjectReteData(theEnv)->UseEntityTimeTag; ObjectRetractAction(theEnv,ins,slotNameIDs); ObjectReteData(theEnv)->CurrentPatternObject = ins; ObjectReteData(theEnv)->CurrentPatternObjectSlot = NULL; MarkObjectPatternNetwork(theEnv,slotNameIDs); ObjectPatternMatch(theEnv,0,ObjectNetworkPointer(theEnv),NULL); ins->reteSynchronized = TRUE; } /**************************************************** NAME : ObjectRetractAction DESCRIPTION : Retracts the instance from the applicable patterns for the object (if the slotNameID != -1, then the instance is only retracted from the alpha memories of the patterns which actually match on that slot) INPUTS : 1) The instance 2) The slot bitmap for a modify (NULL if the instance is actually being removed) RETURNS : Nothing useful SIDE EFFECTS : Retractions performed NOTES : None ****************************************************/ static void ObjectRetractAction( void *theEnv, INSTANCE_TYPE *ins, SLOT_BITMAP *slotNameIDs) { struct patternMatch *prvMatch,*tmpMatch, *deleteMatch,*lastDeleteMatch; OBJECT_ALPHA_NODE *alphaPtr; void *saveDependents; if (slotNameIDs == NULL) { if (ins->partialMatchList != NULL) { tmpMatch = (struct patternMatch *) ins->partialMatchList; while (tmpMatch != NULL) { ins->busy--; tmpMatch = tmpMatch->next; } NetworkRetract(theEnv,(struct patternMatch *) ins->partialMatchList); ins->partialMatchList = NULL; } } else { deleteMatch = NULL; lastDeleteMatch = NULL; prvMatch = NULL; tmpMatch = (struct patternMatch *) ins->partialMatchList; while (tmpMatch != NULL) { alphaPtr = (OBJECT_ALPHA_NODE *) tmpMatch->matchingPattern; if (alphaPtr->slotbmp != NULL) { if (CompareSlotBitMaps(slotNameIDs, (SLOT_BITMAP *) ValueToBitMap(alphaPtr->slotbmp))) { ins->busy--; if (prvMatch == NULL) ins->partialMatchList = (void *) tmpMatch->next; else prvMatch->next = tmpMatch->next; if (!deleteMatch) deleteMatch = tmpMatch; else lastDeleteMatch->next = tmpMatch; lastDeleteMatch = tmpMatch; tmpMatch = tmpMatch->next; lastDeleteMatch->next = NULL; } else { prvMatch = tmpMatch; tmpMatch = tmpMatch->next; } } else { prvMatch = tmpMatch; tmpMatch = tmpMatch->next; } } /* ============================================= We need to preserve any logical dependencies of this object and reattach them after doing the retract. Otherwise, the Rete network will believe the object is gone and remove the links from the partial matches upon which this object is logically dependent. ============================================= */ if (deleteMatch != NULL) { saveDependents = ins->header.dependents; ins->header.dependents = NULL; NetworkRetract(theEnv,deleteMatch); ins->header.dependents = saveDependents; } } ins->reteSynchronized = TRUE; } /***************************************************** NAME : ObjectPatternNetErrorMessage DESCRIPTION : Prints out a locational error message when an evaluation error occurs during object pattern-matching INPUTS : The pattern node RETURNS : Nothing useful SIDE EFFECTS : Error message displayed NOTES : None *****************************************************/ static void ObjectPatternNetErrorMessage( void *theEnv, OBJECT_PATTERN_NODE *patternPtr) { PrintErrorID(theEnv,"OBJRTMCH",1,TRUE); EnvPrintRouter(theEnv,WERROR,"This error occurred in the object pattern network\n"); EnvPrintRouter(theEnv,WERROR," Currently active instance: ["); EnvPrintRouter(theEnv,WERROR,ValueToString(ObjectReteData(theEnv)->CurrentPatternObject->name)); EnvPrintRouter(theEnv,WERROR,"]\n"); EnvPrintRouter(theEnv,WERROR," Problem resides in slot "); EnvPrintRouter(theEnv,WERROR,ValueToString(FindIDSlotName(theEnv,patternPtr->slotNameID))); EnvPrintRouter(theEnv,WERROR," field #"); PrintLongInteger(theEnv,WERROR,(long) patternPtr->whichField); EnvPrintRouter(theEnv,WERROR,"\n"); TraceErrorToObjectPattern(theEnv,TRUE,patternPtr); EnvPrintRouter(theEnv,WERROR,"\n"); } /********************************************************* NAME : TraceErrorToObjectPattern DESCRIPTION : Used by ObjectPatternNetErrorMessage() to print the rule(s) which contain an object pattern. INPUTS : 1) A flag indicating if this is the node in which the error actually occurred or not 2) The pattern node RETURNS : Nothing useful SIDE EFFECTS : Error message displayed NOTES : None *********************************************************/ static void TraceErrorToObjectPattern( void *theEnv, int errorNode, OBJECT_PATTERN_NODE *patternPtr) { struct joinNode *joinPtr; while (patternPtr != NULL) { if (patternPtr->alphaNode != NULL) { joinPtr = patternPtr->alphaNode->header.entryJoin; while (joinPtr != NULL) { EnvPrintRouter(theEnv,WERROR," Of pattern #"); PrintLongInteger(theEnv,WERROR,(long) joinPtr->depth); EnvPrintRouter(theEnv,WERROR," in rule(s):\n"); TraceErrorToRule(theEnv,joinPtr," "); joinPtr = joinPtr->rightMatchNode; } } TraceErrorToObjectPattern(theEnv,FALSE,patternPtr->nextLevel); if (errorNode) break; patternPtr = patternPtr->rightNode; } } #endif --- NEW FILE xclips.desktop --- [Desktop Entry] Name=XCLIPS GenericName=XCLIPS Expert System Exec=xclips Icon=xclips Terminal=false Type=Application Categories=Development;Building;IDE;Education;Science;ArtificialIntelligence;ComputerScience;Robotics; Version=1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clips/EL-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Feb 2007 19:04:02 -0000 1.4 +++ .cvsignore 3 Mar 2009 19:28:06 -0000 1.5 @@ -1,14 +1,12 @@ -3CCP.pdf -AllExamples.tar.Z abstract.pdf +clips_core_source_624.tar.Z +x_windows_ide_source_624.tar.Z +examples_624.tar.Z apg.pdf arch5-1.pdf bpg.pdf -clipssrc.tar.Z ig.pdf -usrguide.pdf -x-prjct.tar.Z -FunctionContext.zip -objrtmch.c -DR0873.txt -clips-6.24-linux.patch.bz2 +ug.pdf +3CCP.pdf +clips-doc-html.tar.bz2 +clips-6.24-linux.patch Index: clips.spec =================================================================== RCS file: /cvs/pkgs/rpms/clips/EL-5/clips.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- clips.spec 2 Feb 2007 19:19:51 -0000 1.8 +++ clips.spec 3 Mar 2009 19:28:06 -0000 1.9 @@ -1,30 +1,48 @@ -Summary: CLIPS language for developing expert systems -Name: clips -Version: 6.24 -Release: 22%{?dist} -Url: http://www.ghg.net/clips/download/source/ -License: GPL -Group: Development/Tools -Source0: http://www.ghg.net/clips/download/source/clipssrc.tar.Z -Source1: http://www.ghg.net/clips/download/source/x-prjct.tar.Z -Source2: http://www.ghg.net/clips/download/executables/examples/AllExamples.tar.Z -Source3: http://www.ghg.net/clips/download/documentation/abstract.pdf -Source4: http://www.ghg.net/clips/download/documentation/apg.pdf -Source5: http://www.ghg.net/clips/download/documentation/arch5-1.pdf -Source6: http://www.ghg.net/clips/download/documentation/bpg.pdf -Source7: http://www.ghg.net/clips/download/documentation/ig.pdf -Source8: http://www.ghg.net/clips/download/documentation/usrguide.pdf -Source9: http://www.ghg.net/clips/download/documentation/3CCP.pdf -Source10: xclips.png -Source11: clips-init.el -Source12: clips-mode.el -Source13: inf-clips.el -Source14: http://www.ghg.net/clips/download/other/Bug_Fixes/objrtmch.c -Source15: http://www.ghg.net/clips/download/other/FunctionContext.zip -Source16: http://www.ghg.net/clips/download/other/Bug_Fixes/DR0873.txt -Patch0: clips-6.24-linux.patch.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel libXt-devel libXext-devel libXmu-devel libXaw-devel xorg-x11-server-Xorg xorg-x11-proto-devel xorg-x11-xbitmaps desktop-file-utils +Summary: CLIPS language for developing expert systems +Name: clips +Version: 6.24 +Release: 27%{?dist} +Url: http://clipsrules.sourceforge.net +License: GPLv2 +Group: Development/Tools +Source0: http://downloads.sourceforge.net/clipsrules/clips_core_source_624.tar.Z +Source1: http://downloads.sourceforge.net/clipsrules/x_windows_ide_source_624.tar.Z +Source2: http://downloads.sourceforge.net/clipsrules/examples_624.tar.Z +Source3: abstract.pdf +Source4: http://clipsrules.sourceforge.net/documentation/v624/apg.pdf +Source5: http://clipsrules.sourceforge.net/documentation/other/arch5-1.pdf +Source6: http://clipsrules.sourceforge.net/documentation/v624/bpg.pdf +Source7: http://clipsrules.sourceforge.net/documentation/v624/ig.pdf +Source8: http://clipsrules.sourceforge.net/documentation/v624/ug.pdf +Source9: http://clipsrules.sourceforge.net/documentation/other/3CCP.pdf +Source10: xclips.png +Source11: clips-init.el +Source12: clips-mode.el +Source13: inf-clips.el +Source14: objrtmch.c +Source15: FunctionContext.zip +Source16: DR0873.txt +Source17: xclips.desktop +# The following source was generated with the following commands: +# mkdir html +# cd html +# for i in apg.htm bpg.htm ig.htm ug.htm; do +# wget -p -nH --cut-dirs=2 --convert-links http://clipsrules.sourceforge.net/documentation/v624/$i +# dos2unix $i +# done +# cd .. +# tar -cjf clips-doc-html.tar.bz2 html +Source18: clips-doc-html.tar.bz2 +Patch0: clips-6.24-linux.patch +Patch1: clips-6.24-time-sysdep.c.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: ncurses-devel +BuildRequires: libXt-devel libXext-devel libXmu-devel libXaw-devel +BuildRequires: xorg-x11-server-Xorg xorg-x11-proto-devel xorg-x11-xbitmaps +BuildRequires: desktop-file-utils +BuildRequires: automake autoconf libtool +BuildRequires: pkgconfig +BuildRequires: ImageMagick %description CLIPS is a productive development and delivery expert system tool which @@ -35,54 +53,57 @@ This package provides the CLIPS command line environment and the clips library. -%package libs -Summary: Run-time libraries for CLIPS applications -Group: System Environment/Libraries +%package libs +Summary: Run-time libraries for CLIPS applications +Group: System Environment/Libraries -%description libs +%description libs This package contains the run-time libraries needed for CLIPS applications. -%package devel -Summary: Headers for developing programs that will embed CLIPS -Group: Development/Libraries -Requires: clips-libs = %{version}-%{release} -Requires: ncurses-devel pkgconfig +%package devel +Summary: C headers for developing programs that will embed CLIPS +Group: Development/Libraries +Requires: clips-libs = %{version}-%{release} +Requires: ncurses-devel pkgconfig -%description devel +%description devel This package contains the libraries and header files needed for developing embedded CLIPS applications. -%package xclips -Summary: X interface to CLIPS -Group: Development/Tools +%package xclips +Summary: X interface to CLIPS +Group: Development/Tools +Requires: %{name} = %{version}-%{release} +Requires: hicolor-icon-theme -%description xclips +%description xclips X interface to CLIPS. -%package doc -Summary: Documentation for CLIPS -Group: Documentation +%package doc +Summary: Documentation for CLIPS +Group: Documentation -%description doc +%description doc This package contains documentation for the CLIPS library as well as numerous examples. The following are some of the documents in this package: - Proceedings of the Third Conference on CLIPS, 1994 (3CCP.pdf) - Application abstracts (abstract.pdf) -- CLIPS Reference Manual, Volume II, Advanced Programming Guide (apg.pdf) +- CLIPS Reference Manual, Volume I, Basic Programming Guide (bpg.pdf,bpg.htm) +- CLIPS Reference Manual, Volume II, Adv. Programming Guide (apg.pdf, apg.htm) +- CLIPS Reference Manual, Volume III, Interfaces Guide (ig.pdf,ig.htm) - CLIPS Architecture Manual (arch5-1.pdf) -- CLIPS Reference Manual, Volume I, Basic Programming Guide (bpg.pdf) -- CLIPS Reference Manual, Volume III, Interfaces Guide (ig.pdf) -- CLIPS Users Guide (usrguide.pdf) +- CLIPS Users Guide (ug.pdf,ug.htm) %prep -%setup -q -a 1 -a 2 -a 15 -c +%setup -q -a 1 -a 2 -a 15 -a 18 -c mv x-prjct/xinterface clipssrc/ mv x-prjct/color clipssrc/ mv clipssrc/clipssrc clipssrc/clips -%patch0 -p0 +%patch0 -p0 +%patch1 -p0 #move in the function context patch files mv envrnmnt.h clipssrc/clips mv envrnmnt.c clipssrc/clips @@ -94,29 +115,39 @@ chmod a-x clipssrc/*/*.h clipssrc/*/*.c chmod a-x Examples/*.clp chmod a-x Examples/Cholesterol/* -chmod u+x clipssrc/configure +chmod u+x clipssrc/autogen.sh for i in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE16}; do cp $i . done %build cd clipssrc +./autogen.sh %configure --disable-static %{__make} %{?_smp_mflags} %install -%{__rm} -rf %{buildroot} -%{__install} -D %{SOURCE10} %{buildroot}%{_datadir}/pixmaps/xclips.png -%{__install} -m 644 -D %{SOURCE11} %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d/clips-init.el -%{__install} -m 644 -D %{SOURCE12} %{buildroot}%{_datadir}/emacs/site-lisp/clips-mode.el -%{__install} -m 644 -D %{SOURCE13} %{buildroot}%{_datadir}/emacs/site-lisp/inf-clips.el cd clipssrc +%{__rm} -rf %{buildroot} +%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p" +find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' +%{__install} -p --mode=0644 -D %{SOURCE11} %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d/clips-init.el +%{__install} -p --mode=0644 -D %{SOURCE12} %{buildroot}%{_datadir}/emacs/site-lisp/clips-mode.el +%{__install} -p --mode=0644 -D %{SOURCE13} %{buildroot}%{_datadir}/emacs/site-lisp/inf-clips.el + +# create icons +# create 16x16, 32x32, 64x64, 128x128 icons +for s in 16 32 64 128 ; do + %{__mkdir_p} %{buildroot}/%{_datadir}/icons/hicolor/${s}x${s}/apps/ + convert -scale ${s}x${s} \ + %{SOURCE10} \ + %{buildroot}/%{_datadir}/icons/hicolor/${s}x${s}/apps/xclips.png +done + desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ - xclips.desktop -%{__make} DESTDIR=%{buildroot} install -find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' + %{SOURCE17} %clean %{__rm} -rf %{buildroot} @@ -125,6 +156,19 @@ %postun libs -p /sbin/ldconfig +%post xclips +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 xclips +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}/clips @@ -151,17 +195,50 @@ %defattr(-,root,root,-) %{_bindir}/xclips %{_bindir}/xclips-color -%{_datadir}/pixmaps/xclips.png +%{_datadir}/icons/hicolor/*x*/apps/xclips.png %{_datadir}/applications/*xclips.desktop %files doc %defattr(-,root,root,-) %doc Examples/ -%doc abstract.pdf arch5-1.pdf bpg.pdf usrguide.pdf 3CCP.pdf +%doc abstract.pdf arch5-1.pdf bpg.pdf ug.pdf 3CCP.pdf %doc apg.pdf %doc ig.pdf +%doc html/ %changelog +* Tue Mar 03 2009 Rick L Vinyard Jr 6.24-27 +- Updated desktop entry file to add categories and remove deprecated items +- Added hicolor-icon-theme requires to xclips +- Install xclips icons to hicolor directory +- Added validation to desktop file +- Added icon cache rebuild to pre and post sections for xclips +- Added preserve to file installs +- Made install modes explicit +- Added pkgconfig and ImageMagick to build requires +- Updated URL +- Updated source URL's +- Added html docs + +* Tue Feb 24 2009 Fedora Release Engineering - 6.24-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Feb 19 2008 Fedora Release Engineering - 6.24-25 +- Autorebuild for GCC 4.3 + +* Sat Aug 25 2007 Rick L Vinyard Jr 6.24-24 +- Added automake, autoconf and libtool to build requires + +* Sat Aug 25 2007 Rick L Vinyard Jr 6.24-23 +- Added patch to fix time function; closes bug 249995 +- Fixed the version in the xclips.desktop file and removed it from the linux patch +- Added the linux patch and xclips.desktop files to cvs +- Changed the linux patch from a bzip file to a normal patch file +- Removed the pre-generated autotools files from the linux patch +- Added running of autogen.sh prior to running configure to build autotools files +- Added timestamp preservation to install +- Updated (not changed) license to new tag GPLv2 + * Fri Feb 02 2007 Rick L Vinyard Jr 6.24-22 - Bump release to build FC-5 and devel against new patch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clips/EL-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Feb 2007 19:04:02 -0000 1.6 +++ sources 3 Mar 2009 19:28:06 -0000 1.7 @@ -1,14 +1,12 @@ -a6a60733af08f9e9e6d0928272ad4dd9 3CCP.pdf -f5c02b997199f3ede779b8502af2ba09 AllExamples.tar.Z cd3ecddc4e538b8af0e5cf08ab7fd89c abstract.pdf +ccba9d912375e57a1b7d9eba12da4198 clips_core_source_624.tar.Z +1bb0d0e684742188b8c14912c26f12cb x_windows_ide_source_624.tar.Z +f5c02b997199f3ede779b8502af2ba09 examples_624.tar.Z fae2267d96fb95603345e91c9990caaa apg.pdf 9a13d2ed18fe6ab67902d5bce29957cb arch5-1.pdf 63891971aa782dc67c2de0579647247e bpg.pdf -ccba9d912375e57a1b7d9eba12da4198 clipssrc.tar.Z 89beca5caa08b30d8285cca7f1df1d26 ig.pdf -44e54697a8acf3509bc4ca51d88b65bd usrguide.pdf -1bb0d0e684742188b8c14912c26f12cb x-prjct.tar.Z -ac0d7c465a909158ae908fe39d68478c FunctionContext.zip -da5ad2328e4d8dd7680d8bb28005e90d objrtmch.c -f80256270a8a93504e37644ab9bc16b4 DR0873.txt -cbf0382ca4153adc0446b0bf5c123559 clips-6.24-linux.patch.bz2 +44e54697a8acf3509bc4ca51d88b65bd ug.pdf +a6a60733af08f9e9e6d0928272ad4dd9 3CCP.pdf +99f463e8a2536198da37e9dc73304322 clips-doc-html.tar.bz2 +0cb3238a5be85211658ba7ca47257bf8 clips-6.24-linux.patch From bkearney at fedoraproject.org Tue Mar 3 19:29:04 2009 From: bkearney at fedoraproject.org (Bryan Kearney) Date: Tue, 3 Mar 2009 19:29:04 +0000 (UTC) Subject: rpms/sugar-turtleart/devel .cvsignore, 1.6, 1.7 import.log, 1.4, 1.5 sources, 1.6, 1.7 sugar-turtleart.spec, 1.7, 1.8 Message-ID: <20090303192904.8F52970116@cvs1.fedora.phx.redhat.com> Author: bkearney Update of /cvs/pkgs/rpms/sugar-turtleart/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6309/devel Modified Files: .cvsignore import.log sources sugar-turtleart.spec Log Message: Bring in the latest release from upstream. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-turtleart/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 15 Dec 2008 15:01:04 -0000 1.6 +++ .cvsignore 3 Mar 2009 19:28:34 -0000 1.7 @@ -1 +1 @@ -TurtleArt-23.tar.bz2 +TurtleArt-36.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/sugar-turtleart/devel/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 15 Dec 2008 15:01:04 -0000 1.4 +++ import.log 3 Mar 2009 19:28:34 -0000 1.5 @@ -2,3 +2,4 @@ sugar-turtleart-16-1_fc9:HEAD:sugar-turtleart-16-1.fc9.src.rpm:1226933828 sugar-turtleart-18-1_fc9:HEAD:sugar-turtleart-18-1.fc9.src.rpm:1227622131 sugar-turtleart-23-1_fc10:HEAD:sugar-turtleart-23-1.fc10.src.rpm:1229352953 +sugar-turtleart-36-1_fc10:HEAD:sugar-turtleart-36-1.fc10.src.rpm:1236108263 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-turtleart/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 15 Dec 2008 15:01:04 -0000 1.6 +++ sources 3 Mar 2009 19:28:34 -0000 1.7 @@ -1 +1 @@ -510d84be7667afba593f85e51b64e55c TurtleArt-23.tar.bz2 +c99326d3630f194c4c39a1c610ca153d TurtleArt-36.tar.bz2 Index: sugar-turtleart.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-turtleart/devel/sugar-turtleart.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sugar-turtleart.spec 26 Feb 2009 03:58:13 -0000 1.7 +++ sugar-turtleart.spec 3 Mar 2009 19:28:34 -0000 1.8 @@ -1,13 +1,13 @@ Name: sugar-turtleart -Version: 23 -Release: 2%{?dist} +Version: 36 +Release: 1%{?dist} Summary: Turtle Art activity for sugar Group: Sugar/Activities License: MIT BuildArch: noarch -URL: http://wiki.laptop.org/go/TurtleArt -Source0: http://dev.laptop.org/pub/sugar/sources/turtleart-activity/TurtleArt-%{version}.tar.bz2 +URL: http://sugarlabs.org/go/Activities/TurtleArt +Source0: http://download.sugarlabs.org/sources/sucrose/fructose/TurtleArt/TurtleArt-36.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python BuildRequires: sugar-toolkit @@ -45,6 +45,9 @@ %changelog +* Tue Mar 03 2009 Bryan Kearney - 36-1 +- Bring in the latest from upstream + * Wed Feb 25 2009 Fedora Release Engineering - 23-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From s4504kr at fedoraproject.org Tue Mar 3 19:29:21 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Tue, 3 Mar 2009 19:29:21 +0000 (UTC) Subject: rpms/lightning/devel lightning.spec,1.17,1.18 sources,1.5,1.6 Message-ID: <20090303192921.3B0DC70116@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/lightning/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6414 Modified Files: lightning.spec sources Log Message: Uploaded old tar ball Index: lightning.spec =================================================================== RCS file: /cvs/extras/rpms/lightning/devel/lightning.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- lightning.spec 3 Mar 2009 19:23:00 -0000 1.17 +++ lightning.spec 3 Mar 2009 19:28:51 -0000 1.18 @@ -1,6 +1,6 @@ Name: lightning Version: 1.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Library for generating assembly code on run time Group: Development/Libraries @@ -63,7 +63,7 @@ %changelog -* Tue Mar 3 2009 Jochen Schmitt 1.2-15 +* Tue Mar 3 2009 Jochen Schmitt 1.2-16 - Failback to release 1.2 * Wed Feb 25 2009 Fedora Release Engineering - 1.2c-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/lightning/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Sep 2008 20:04:43 -0000 1.5 +++ sources 3 Mar 2009 19:28:51 -0000 1.6 @@ -1 +1 @@ -b6b9862b436f6006cb10d35dd4ae8a32 lightning-1.2c.tar.gz +dcd2c46ee4dd5d99edd9930022ad2153 lightning-1.2.tar.gz From bkearney at fedoraproject.org Tue Mar 3 19:32:05 2009 From: bkearney at fedoraproject.org (Bryan Kearney) Date: Tue, 3 Mar 2009 19:32:05 +0000 (UTC) Subject: rpms/sugar-moon/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3 sugar-moon.spec, 1.3, 1.4 Message-ID: <20090303193205.B3C4E70116@cvs1.fedora.phx.redhat.com> Author: bkearney Update of /cvs/pkgs/rpms/sugar-moon/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7132/devel Modified Files: .cvsignore import.log sources sugar-moon.spec Log Message: Pulled in latest from upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-moon/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Oct 2008 12:29:39 -0000 1.2 +++ .cvsignore 3 Mar 2009 19:32:05 -0000 1.3 @@ -1 +1 @@ -Moon-8.tar.bz2 +Moon-9.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/sugar-moon/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 Oct 2008 12:29:39 -0000 1.1 +++ import.log 3 Mar 2009 19:32:05 -0000 1.2 @@ -1 +1,2 @@ sugar-moon-8-2_fc10:HEAD:sugar-moon-8-2.fc10.src.rpm:1224159915 +sugar-moon-9-1_fc10:HEAD:sugar-moon-9-1.fc10.src.rpm:1236108461 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-moon/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Oct 2008 12:29:39 -0000 1.2 +++ sources 3 Mar 2009 19:32:05 -0000 1.3 @@ -1 +1 @@ -fe553ce2ca007f64e2d4aaf1cf7e9300 Moon-8.tar.bz2 +dc04744dc63a9065af1985b247312031 Moon-9.tar.bz2 Index: sugar-moon.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-moon/devel/sugar-moon.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sugar-moon.spec 26 Feb 2009 03:51:25 -0000 1.3 +++ sugar-moon.spec 3 Mar 2009 19:32:05 -0000 1.4 @@ -1,15 +1,15 @@ # Moon Phases activity for the sugar desktop Name: sugar-moon -Version: 8 -Release: 4%{?dist} +Version: 9 +Release: 1%{?dist} Summary: Moon phases activity for sugar Group: Sugar/Activities License: GPLv2+ BuildArch: noarch URL: http://wiki.laptop.org/go/Moon -Source0: http://dev.laptop.org/pub/sugar/sources/moon-activity/Moon-%{version}.tar.bz2 +Source0: http://download.sugarlabs.org/sources/honey/Moon/Moon-9.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python BuildRequires: sugar-toolkit @@ -50,6 +50,13 @@ %changelog +* Fri Feb 27 2009 Bryan Kearney - 9-1 +- Code cleanup (make pylint happier) +- Merged alsroot's excellent independence resolution code addition + (resizes moon image to fit available display, much better for misc + SoaS hardware screen resolutions) +- Updated localizations (latest from Pootle, thanks all!) + * Wed Feb 25 2009 Fedora Release Engineering - 8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From sindrepb at fedoraproject.org Tue Mar 3 19:33:12 2009 From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=) Date: Tue, 3 Mar 2009 19:33:12 +0000 (UTC) Subject: rpms/avant-window-navigator/F-10 avant-window-navigator-0.3.2-python-platform.patch, NONE, 1.1 avant-window-navigator.spec, 1.20, 1.21 Message-ID: <20090303193312.6B7A070116@cvs1.fedora.phx.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/avant-window-navigator/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7295 Modified Files: avant-window-navigator.spec Added Files: avant-window-navigator-0.3.2-python-platform.patch Log Message: fix x86 issue avant-window-navigator-0.3.2-python-platform.patch: --- NEW FILE avant-window-navigator-0.3.2-python-platform.patch --- diff -up ./bindings/python/Makefile.am.orig ./bindings/python/Makefile.am --- ./bindings/python/Makefile.am.orig 2009-03-03 20:00:10.000000000 +0100 +++ ./bindings/python/Makefile.am 2009-03-03 20:01:13.000000000 +0100 @@ -1,7 +1,7 @@ NULL = # awn python scripts -pyawndir = $(PYTHON_SITE_PKG)/awn +pyawndir = $(PYTHON_PLATFORM_PKG)/awn pyawn_PYTHON = __init__.py INCLUDES = \ diff -up ./bindings/python/Makefile.in.orig ./bindings/python/Makefile.in --- ./bindings/python/Makefile.in.orig 2009-03-03 20:00:17.000000000 +0100 +++ ./bindings/python/Makefile.in 2009-03-03 20:00:43.000000000 +0100 @@ -286,7 +286,7 @@ top_srcdir = @top_srcdir@ NULL = # awn python scripts -pyawndir = $(PYTHON_SITE_PKG)/awn +pyawndir = $(PYTHON_PLATFORM_PKG)/awn pyawn_PYTHON = __init__.py INCLUDES = \ $(PYTHON_CPPFLAGS) \ Index: avant-window-navigator.spec =================================================================== RCS file: /cvs/pkgs/rpms/avant-window-navigator/F-10/avant-window-navigator.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- avant-window-navigator.spec 18 Feb 2009 13:34:32 -0000 1.20 +++ avant-window-navigator.spec 3 Mar 2009 19:32:42 -0000 1.21 @@ -1,10 +1,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - Name: avant-window-navigator Version: 0.3.2 -Release: 3%{?dist} +Release: 5%{?dist} Provides: avant-window-navigator-python = %{version}-%{release} Obsoletes: avant-window-navigator-python < 0.2.6-3 @@ -16,8 +14,8 @@ License: GPLv2+ and LGPLv2+ URL: https://launchpad.net/awn Source0: https://launchpad.net/awn/0.2/0.2/+download/%{name}-%{version}.tar.gz -#fixes schemas file -#Patch0: avant-window-navigator-schemas.patch +#fixes issue with python binding on x86 +Patch0: avant-window-navigator-0.3.2-python-platform.patch #fixes issue where awn only appears on one desktop, #469032 #Patch1: avant-window-navigator-0.2.6-sticky.patch @@ -51,9 +49,12 @@ %prep %setup -q -#%patch0 -p1 +%patch0 -p1 #%patch1 -p0 +#patch alters Makefile.am +cd bindnigs/python/ && autoreconf -i + #fix permissions chmod 0644 $RPM_BUILD_DIR/%{name}-%{version}/src/xutils.h chmod 0644 $RPM_BUILD_DIR/%{name}-%{version}/src/xutils.c @@ -155,8 +156,6 @@ %{_datadir}/avant-window-navigator %{_datadir}/icons/hicolor/*/apps/* %{python_sitearch}/awn -%{python_sitelib}/awn - %files devel %defattr(-,root,root,-) @@ -166,6 +165,12 @@ %changelog +* Tue Mar 03 2009 Sindre Pedersen Bj??rdal - 0.3.2-5 +- Fix issue with arch dependent python files installed to noarch dir, #486395 + +* Mon Feb 23 2009 Fedora Release Engineering - 0.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Feb 18 2009 Sindre Pedersen Bj??rdal - 0.3.2-3 - New upstream release From ajax at fedoraproject.org Tue Mar 3 19:34:21 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Tue, 3 Mar 2009 19:34:21 +0000 (UTC) Subject: rpms/xorg-x11-server/devel xserver-1.6.0-primary.patch, NONE, 1.1 xserver-1.6.0-selinux-destroy.patch, NONE, 1.1 xserver-1.6.0-selinux-raw.patch, NONE, 1.1 Message-ID: <20090303193421.CF59870116@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7597 Added Files: xserver-1.6.0-primary.patch xserver-1.6.0-selinux-destroy.patch xserver-1.6.0-selinux-raw.patch Log Message: * Tue Mar 03 2009 Adam Jackson 1.6.0-4 - xserver-1.6.0-selinux-raw.patch: Deal in raw contexts, to avoid paying the price for setrans on every object. - xserver-1.6.0-primary.patch: Try harder to figure out what the primary video device is on machines with multiple GPUs. - xserver-1.6.0-selinux-destroy.patch: Don't bother relabeling objects that are on the way to destruction. xserver-1.6.0-primary.patch: --- NEW FILE xserver-1.6.0-primary.patch --- >From 9ee22b4f743a2850fed35f179c56f94ce4bb5242 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 3 Mar 2009 10:58:33 -0500 Subject: [PATCH] Primary video device hack --- hw/xfree86/common/xf86pciBus.c | 54 ++++++++++++++++++++++++++++++++++----- 1 files changed, 47 insertions(+), 7 deletions(-) diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index 467a0c3..f9999d8 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -341,6 +341,39 @@ restorePciBusState(BusAccPtr ptr) } #undef MASKBITS +/* oh god what have i done */ +static Bool +looks_like_bios_primary(struct pci_device *info) +{ + unsigned char *bios; + unsigned short vendor, device; + int offset; + Bool ret = FALSE; + + bios = xf86MapVidMem(-1, VIDMEM_MMIO, 0xc0000, 0x10000); + if (!bios) + return FALSE; + + if (bios[0] != 0x55 || bios[1] != 0xAA) + goto out; + + offset = (bios[0x19] << 8) + bios[0x18]; + + if (bios[offset] != 'P' || + bios[offset+1] != 'C' || + bios[offset+2] != 'I' || + bios[offset+3] != 'R') + goto out; + + vendor = (bios[offset+5] << 8) + bios[offset+4]; + device = (bios[offset+7] << 8) + bios[offset+6]; + + ret = (info->vendor_id == vendor) && (info->device_id == device); + +out: + xf86UnMapVidMem(-1, bios, 0x10000); + return ret; +} /* * xf86Bus.c interface @@ -375,24 +408,31 @@ xf86PciProbe(void) } } - /* If we haven't found a primary device try a different heuristic */ if (primaryBus.type == BUS_NONE && num) { for (i = 0; i < num; i++) { uint16_t command; info = xf86PciVideoInfo[i]; + if (!IS_VGA(info->device_class)) + continue; + pci_device_cfg_read_u16(info, & command, 4); - if ((command & PCI_CMD_MEM_ENABLE) - && ((num == 1) || IS_VGA(info->device_class))) { - if (primaryBus.type == BUS_NONE) { + if ((command & PCI_CMD_MEM_ENABLE)) { + if (num == 1) { primaryBus.type = BUS_PCI; primaryBus.id.pci = info; - } else { - xf86Msg(X_NOTICE, + break; + } else if (looks_like_bios_primary(info)) { + if (primaryBus.type == BUS_NONE) { + primaryBus.type = BUS_PCI; + primaryBus.id.pci = info; + } else { + xf86Msg(X_NOTICE, "More than one possible primary device found\n"); - primaryBus.type ^= (BusType)(-1); + primaryBus.type ^= (BusType)(-1); + } } } } -- 1.6.1.3 xserver-1.6.0-selinux-destroy.patch: --- NEW FILE xserver-1.6.0-selinux-destroy.patch --- >From 00fb367cffcc6dd36e5c023757414ed63e13e643 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 3 Mar 2009 14:32:52 -0500 Subject: [PATCH] Don't bother relabeling resources that are being destroyed --- Xext/xselinux.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Xext/xselinux.c b/Xext/xselinux.c index 6085983..f8495ea 100644 --- a/Xext/xselinux.c +++ b/Xext/xselinux.c @@ -1150,6 +1150,8 @@ SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata) if (rec->type != RT_WINDOW) return; + if (rec->state != ResourceStateAdding) + return; pWin = (WindowPtr)rec->value; subj = dixLookupPrivate(&wClient(pWin)->devPrivates, subjectKey); -- 1.6.1.3 xserver-1.6.0-selinux-raw.patch: --- NEW FILE xserver-1.6.0-selinux-raw.patch --- >From 252522d2caa87dbfb510436a56332bd6e86b1a96 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 2 Mar 2009 18:31:18 -0500 Subject: [PATCH] selinux raw patch --- Xext/xselinux.c | 64 +++++++++++++++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Xext/xselinux.c b/Xext/xselinux.c index 8e026be..6085983 100644 --- a/Xext/xselinux.c +++ b/Xext/xselinux.c @@ -186,19 +186,19 @@ SELinuxAtomToSIDLookup(Atom atom, SELinuxObjectRec *obj, int map, int polymap) obj->poly = 1; /* Look in the mappings of names to contexts */ - if (selabel_lookup(label_hnd, &ctx, name, map) == 0) { + if (selabel_lookup_raw(label_hnd, &ctx, name, map) == 0) { obj->poly = 0; } else if (errno != ENOENT) { ErrorF("SELinux: a property label lookup failed!\n"); return BadValue; - } else if (selabel_lookup(label_hnd, &ctx, name, polymap) < 0) { + } else if (selabel_lookup_raw(label_hnd, &ctx, name, polymap) < 0) { ErrorF("SELinux: a property label lookup failed!\n"); return BadValue; } /* Get a SID for context */ - if (avc_context_to_sid(ctx, &obj->sid) < 0) { - ErrorF("SELinux: a context_to_SID call failed!\n"); + if (avc_context_to_sid_raw(ctx, &obj->sid) < 0) { + ErrorF("SELinux: a context_to_SID_raw call failed!\n"); rc = BadAlloc; } @@ -343,7 +343,7 @@ SELinuxEventToSID(unsigned type, security_id_t sid_of_window, SELinuxObjectRec *sid_return) { const char *name = LookupEventName(type); - security_context_t con; + security_context_t ctx; type &= 127; if (type >= numKnownEvents) { @@ -359,16 +359,16 @@ SELinuxEventToSID(unsigned type, security_id_t sid_of_window, if (!knownEvents[type]) { /* Look in the mappings of event names to contexts */ - if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EVENT) < 0) { + if (selabel_lookup_raw(label_hnd, &ctx, name, SELABEL_X_EVENT) < 0) { ErrorF("SELinux: an event label lookup failed!\n"); return BadValue; } /* Get a SID for context */ - if (avc_context_to_sid(con, knownEvents + type) < 0) { - ErrorF("SELinux: a context_to_SID call failed!\n"); + if (avc_context_to_sid_raw(ctx, knownEvents + type) < 0) { + ErrorF("SELinux: a context_to_SID_raw call failed!\n"); return BadAlloc; } - freecon(con); + freecon(ctx); } /* Perform a transition to obtain the final SID */ @@ -474,7 +474,7 @@ SELinuxLabelClient(ClientPtr client) /* Try to get a context from the socket */ if (fd < 0 || getpeercon_raw(fd, &ctx) < 0) { /* Otherwise, fall back to a default context */ - if (selabel_lookup(label_hnd, &ctx, "remote", SELABEL_X_CLIENT) < 0) + if (selabel_lookup_raw(label_hnd, &ctx, "remote", SELABEL_X_CLIENT) < 0) FatalError("SELinux: failed to look up remote-client context\n"); } @@ -509,8 +509,8 @@ SELinuxLabelClient(ClientPtr client) finish: /* Get a SID from the context */ - if (avc_context_to_sid(ctx, &subj->sid) < 0) - FatalError("SELinux: client %d: context_to_sid(%s) failed\n", + if (avc_context_to_sid_raw(ctx, &subj->sid) < 0) + FatalError("SELinux: client %d: context_to_sid_raw(%s) failed\n", client->index, ctx); sidget(obj->sid = subj->sid); @@ -541,7 +541,7 @@ SELinuxLabelInitial(void) FatalError("SELinux: couldn't get context of X server process\n"); /* Get a SID from the context */ - if (avc_context_to_sid(ctx, &subj->sid) < 0) + if (avc_context_to_sid_raw(ctx, &subj->sid) < 0) FatalError("SELinux: serverClient: context_to_sid(%s) failed\n", ctx); sidget(obj->sid = subj->sid); @@ -827,20 +827,20 @@ SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata) /* XXX there should be a separate callback for this */ if (obj->sid == unlabeled_sid) { const char *name = rec->ext->name; - security_context_t con; + security_context_t ctx; security_id_t sid; serv = dixLookupPrivate(&serverClient->devPrivates, subjectKey); /* Look in the mappings of extension names to contexts */ - if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EXT) < 0) { + if (selabel_lookup_raw(label_hnd, &ctx, name, SELABEL_X_EXT) < 0) { ErrorF("SELinux: a property label lookup failed!\n"); rec->status = BadValue; return; } /* Get a SID for context */ - if (avc_context_to_sid(con, &sid) < 0) { - ErrorF("SELinux: a context_to_SID call failed!\n"); + if (avc_context_to_sid_raw(ctx, &sid) < 0) { + ErrorF("SELinux: a context_to_SID_raw call failed!\n"); rec->status = BadAlloc; return; } @@ -851,11 +851,11 @@ SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata) if (avc_compute_create(serv->sid, sid, SECCLASS_X_EXTENSION, &obj->sid) < 0) { ErrorF("SELinux: a SID transition call failed!\n"); - freecon(con); + freecon(ctx); rec->status = BadValue; return; } - freecon(con); + freecon(ctx); } /* Perform the security check */ @@ -1156,7 +1156,7 @@ SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata) if (subj->sid) { security_context_t ctx; - int rc = avc_sid_to_context(subj->sid, &ctx); + int rc = avc_sid_to_context_raw(subj->sid, &ctx); if (rc < 0) FatalError("SELinux: Failed to get security context!\n"); rc = dixChangeWindowProperty(serverClient, @@ -1172,7 +1172,7 @@ SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata) if (obj->sid) { security_context_t ctx; - int rc = avc_sid_to_context(obj->sid, &ctx); + int rc = avc_sid_to_context_raw(obj->sid, &ctx); if (rc < 0) FatalError("SELinux: Failed to get security context!\n"); rc = dixChangeWindowProperty(serverClient, @@ -1288,7 +1288,7 @@ SELinuxSendContextReply(ClientPtr client, security_id_t sid) int len = 0; if (sid) { - if (avc_sid_to_context(sid, &ctx) < 0) + if (avc_sid_to_context_raw(sid, &ctx) < 0) return BadValue; len = strlen(ctx) + 1; } @@ -1347,9 +1347,9 @@ ProcSELinuxSetCreateContext(ClientPtr client, unsigned offset) *pSid = NULL; if (stuff->context_len > 0) { - if (security_check_context(ctx) < 0) + if (security_check_context_raw(ctx) < 0) return BadValue; - if (avc_context_to_sid(ctx, pSid) < 0) + if (avc_context_to_sid_raw(ctx, pSid) < 0) return BadValue; } return Success; @@ -1393,9 +1393,9 @@ ProcSELinuxSetDeviceContext(ClientPtr client) if (rc != Success) return rc; - if (security_check_context(ctx) < 0) + if (security_check_context_raw(ctx) < 0) return BadValue; - if (avc_context_to_sid(ctx, &sid) < 0) + if (avc_context_to_sid_raw(ctx, &sid) < 0) return BadValue; subj = dixLookupPrivate(&dev->devPrivates, subjectKey); @@ -1511,9 +1511,9 @@ SELinuxPopulateItem(SELinuxListItemRec *i, PrivateRec **privPtr, CARD32 id, SELinuxObjectRec *obj = dixLookupPrivate(privPtr, objectKey); SELinuxObjectRec *data = dixLookupPrivate(privPtr, dataKey); - if (avc_sid_to_context(obj->sid, &i->octx) < 0) + if (avc_sid_to_context_raw(obj->sid, &i->octx) < 0) return BadValue; - if (avc_sid_to_context(data->sid, &i->dctx) < 0) + if (avc_sid_to_context_raw(data->sid, &i->dctx) < 0) return BadValue; i->id = id; @@ -1941,7 +1941,7 @@ SELinuxExtensionInit(INITARGS) ExtensionEntry *extEntry; struct selinux_opt selabel_option = { SELABEL_OPT_VALIDATE, (char *)1 }; struct selinux_opt avc_option = { AVC_OPT_SETENFORCE, (char *)0 }; - security_context_t con; + security_context_t ctx; int ret = TRUE; /* Check SELinux mode on system */ @@ -1988,11 +1988,11 @@ SELinuxExtensionInit(INITARGS) if (!label_hnd) FatalError("SELinux: Failed to open x_contexts mapping in policy\n"); - if (security_get_initial_context("unlabeled", &con) < 0) + if (security_get_initial_context_raw("unlabeled", &ctx) < 0) FatalError("SELinux: Failed to look up unlabeled context\n"); - if (avc_context_to_sid(con, &unlabeled_sid) < 0) + if (avc_context_to_sid_raw(ctx, &unlabeled_sid) < 0) FatalError("SELinux: a context_to_SID call failed!\n"); - freecon(con); + freecon(ctx); /* Prepare for auditing */ audit_fd = audit_open(); -- 1.6.1.3 From kkofler at fedoraproject.org Tue Mar 3 19:40:46 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 3 Mar 2009 19:40:46 +0000 (UTC) Subject: rpms/kdelibs/F-10 kdelibs-4.2.1-kjs-gcc44-crash.patch, NONE, 1.1 kdelibs.spec, 1.407, 1.408 kdelibs-4.2.0-kjs-gcc44-crash.patch, 1.1, NONE Message-ID: <20090303194046.2999170116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8685/F-10 Modified Files: kdelibs.spec Added Files: kdelibs-4.2.1-kjs-gcc44-crash.patch Removed Files: kdelibs-4.2.0-kjs-gcc44-crash.patch Log Message: * Tue Mar 03 2009 Kevin Kofler - 4.2.1-3 - better fix for #485968 (fix aliasing instead of using -fno-strict-aliasing) kdelibs-4.2.1-kjs-gcc44-crash.patch: --- NEW FILE kdelibs-4.2.1-kjs-gcc44-crash.patch --- diff -ur kdelibs-4.2.1/kjs/dtoa.cpp kdelibs-4.2.1-kjs-gcc44-crash/kjs/dtoa.cpp --- kdelibs-4.2.1/kjs/dtoa.cpp 2008-05-21 13:06:47.000000000 +0200 +++ kdelibs-4.2.1-kjs-gcc44-crash/kjs/dtoa.cpp 2009-03-03 20:18:46.000000000 +0100 @@ -299,6 +299,15 @@ #define word0(x) ((ULong *)&x)[0] #define word1(x) ((ULong *)&x)[1] #endif +#elif defined __GNUC__ +#define dval(x) x +#ifdef IEEE_8087 +#define word0(x) (__extension__ ((U) { d: (x) }).L[1]) +#define word1(x) (__extension__ ((U) { d: (x) }).L[0]) +#else +#define word0(x) (__extension__ ((U) { d: (x) }).L[0]) +#define word1(x) (__extension__ ((U) { d: (x) }).L[1]) +#endif #else #ifdef IEEE_8087 #define word0(x) ((U*)&x)->L[1] @@ -314,7 +323,9 @@ * An alternative that might be better on some machines is * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff) */ -#if defined(IEEE_8087) + defined(VAX) +#if !defined(YES_ALIAS) && defined(__GNUC__) +#define Storeinc(a,b,c) (*a++ = b << 16 | (c & 0xffff)) +#elif defined(IEEE_8087) + defined(VAX) #define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \ ((unsigned short *)a)[0] = (unsigned short)c, a++) #else Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v retrieving revision 1.407 retrieving revision 1.408 diff -u -r1.407 -r1.408 --- kdelibs.spec 2 Mar 2009 10:11:41 -0000 1.407 +++ kdelibs.spec 3 Mar 2009 19:40:15 -0000 1.408 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -79,8 +79,8 @@ Patch20: kdelibs-4.1.70-cmake.patch Patch22: kdelibs-4.1.96-cmake.patch Patch23: kdelibs-4.2.0-gcc44-workaround.patch -# disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968) -Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch +# fix aliasing problems in kjs/dtoa.cpp (GCC 4.4 crash) (#485968) +Patch24: kdelibs-4.2.1-kjs-gcc44-crash.patch Patch25: kdelibs-4.2.0-gcc44-misc.patch # upstream @@ -401,6 +401,9 @@ %changelog +* Tue Mar 03 2009 Kevin Kofler - 4.2.1-3 +- better fix for #485968 (fix aliasing instead of using -fno-strict-aliasing) + * Sun Mar 01 2009 Than Ngo - 4.2.1-2 - respin --- kdelibs-4.2.0-kjs-gcc44-crash.patch DELETED --- From kkofler at fedoraproject.org Tue Mar 3 19:40:46 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 3 Mar 2009 19:40:46 +0000 (UTC) Subject: rpms/kdelibs/devel kdelibs-4.2.1-kjs-gcc44-crash.patch, NONE, 1.1 kdelibs.spec, 1.449, 1.450 kdelibs-4.2.0-kjs-gcc44-crash.patch, 1.2, NONE Message-ID: <20090303194046.BFA4670116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8685/devel Modified Files: kdelibs.spec Added Files: kdelibs-4.2.1-kjs-gcc44-crash.patch Removed Files: kdelibs-4.2.0-kjs-gcc44-crash.patch Log Message: * Tue Mar 03 2009 Kevin Kofler - 4.2.1-3 - better fix for #485968 (fix aliasing instead of using -fno-strict-aliasing) kdelibs-4.2.1-kjs-gcc44-crash.patch: --- NEW FILE kdelibs-4.2.1-kjs-gcc44-crash.patch --- diff -ur kdelibs-4.2.1/kjs/dtoa.cpp kdelibs-4.2.1-kjs-gcc44-crash/kjs/dtoa.cpp --- kdelibs-4.2.1/kjs/dtoa.cpp 2008-05-21 13:06:47.000000000 +0200 +++ kdelibs-4.2.1-kjs-gcc44-crash/kjs/dtoa.cpp 2009-03-03 20:18:46.000000000 +0100 @@ -299,6 +299,15 @@ #define word0(x) ((ULong *)&x)[0] #define word1(x) ((ULong *)&x)[1] #endif +#elif defined __GNUC__ +#define dval(x) x +#ifdef IEEE_8087 +#define word0(x) (__extension__ ((U) { d: (x) }).L[1]) +#define word1(x) (__extension__ ((U) { d: (x) }).L[0]) +#else +#define word0(x) (__extension__ ((U) { d: (x) }).L[0]) +#define word1(x) (__extension__ ((U) { d: (x) }).L[1]) +#endif #else #ifdef IEEE_8087 #define word0(x) ((U*)&x)->L[1] @@ -314,7 +323,9 @@ * An alternative that might be better on some machines is * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff) */ -#if defined(IEEE_8087) + defined(VAX) +#if !defined(YES_ALIAS) && defined(__GNUC__) +#define Storeinc(a,b,c) (*a++ = b << 16 | (c & 0xffff)) +#elif defined(IEEE_8087) + defined(VAX) #define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \ ((unsigned short *)a)[0] = (unsigned short)c, a++) #else Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.449 retrieving revision 1.450 diff -u -r1.449 -r1.450 --- kdelibs.spec 1 Mar 2009 11:21:50 -0000 1.449 +++ kdelibs.spec 3 Mar 2009 19:40:16 -0000 1.450 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -79,8 +79,8 @@ Patch20: kdelibs-4.1.70-cmake.patch Patch22: kdelibs-4.1.96-cmake.patch Patch23: kdelibs-4.2.0-gcc44-workaround.patch -# disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968) -Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch +# fix aliasing problems in kjs/dtoa.cpp (GCC 4.4 crash) (#485968) +Patch24: kdelibs-4.2.1-kjs-gcc44-crash.patch Patch25: kdelibs-4.2.0-gcc44-misc.patch # upstream @@ -401,6 +401,9 @@ %changelog +* Tue Mar 03 2009 Kevin Kofler - 4.2.1-3 +- better fix for #485968 (fix aliasing instead of using -fno-strict-aliasing) + * Sun Mar 01 2009 Than Ngo - 4.2.1-2 - respin --- kdelibs-4.2.0-kjs-gcc44-crash.patch DELETED --- From kkofler at fedoraproject.org Tue Mar 3 19:40:46 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 3 Mar 2009 19:40:46 +0000 (UTC) Subject: rpms/kdelibs/F-9 kdelibs-4.2.1-kjs-gcc44-crash.patch, NONE, 1.1 kdelibs.spec, 1.382, 1.383 kdelibs-4.2.0-kjs-gcc44-crash.patch, 1.1, NONE Message-ID: <20090303194046.64CEB70116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8685/F-9 Modified Files: kdelibs.spec Added Files: kdelibs-4.2.1-kjs-gcc44-crash.patch Removed Files: kdelibs-4.2.0-kjs-gcc44-crash.patch Log Message: * Tue Mar 03 2009 Kevin Kofler - 4.2.1-3 - better fix for #485968 (fix aliasing instead of using -fno-strict-aliasing) kdelibs-4.2.1-kjs-gcc44-crash.patch: --- NEW FILE kdelibs-4.2.1-kjs-gcc44-crash.patch --- diff -ur kdelibs-4.2.1/kjs/dtoa.cpp kdelibs-4.2.1-kjs-gcc44-crash/kjs/dtoa.cpp --- kdelibs-4.2.1/kjs/dtoa.cpp 2008-05-21 13:06:47.000000000 +0200 +++ kdelibs-4.2.1-kjs-gcc44-crash/kjs/dtoa.cpp 2009-03-03 20:18:46.000000000 +0100 @@ -299,6 +299,15 @@ #define word0(x) ((ULong *)&x)[0] #define word1(x) ((ULong *)&x)[1] #endif +#elif defined __GNUC__ +#define dval(x) x +#ifdef IEEE_8087 +#define word0(x) (__extension__ ((U) { d: (x) }).L[1]) +#define word1(x) (__extension__ ((U) { d: (x) }).L[0]) +#else +#define word0(x) (__extension__ ((U) { d: (x) }).L[0]) +#define word1(x) (__extension__ ((U) { d: (x) }).L[1]) +#endif #else #ifdef IEEE_8087 #define word0(x) ((U*)&x)->L[1] @@ -314,7 +323,9 @@ * An alternative that might be better on some machines is * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff) */ -#if defined(IEEE_8087) + defined(VAX) +#if !defined(YES_ALIAS) && defined(__GNUC__) +#define Storeinc(a,b,c) (*a++ = b << 16 | (c & 0xffff)) +#elif defined(IEEE_8087) + defined(VAX) #define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \ ((unsigned short *)a)[0] = (unsigned short)c, a++) #else Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v retrieving revision 1.382 retrieving revision 1.383 diff -u -r1.382 -r1.383 --- kdelibs.spec 2 Mar 2009 10:11:42 -0000 1.382 +++ kdelibs.spec 3 Mar 2009 19:40:16 -0000 1.383 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -79,8 +79,8 @@ Patch20: kdelibs-4.1.70-cmake.patch Patch22: kdelibs-4.1.96-cmake.patch Patch23: kdelibs-4.2.0-gcc44-workaround.patch -# disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968) -Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch +# fix aliasing problems in kjs/dtoa.cpp (GCC 4.4 crash) (#485968) +Patch24: kdelibs-4.2.1-kjs-gcc44-crash.patch Patch25: kdelibs-4.2.0-gcc44-misc.patch # upstream @@ -401,6 +401,9 @@ %changelog +* Tue Mar 03 2009 Kevin Kofler - 4.2.1-3 +- better fix for #485968 (fix aliasing instead of using -fno-strict-aliasing) + * Sun Mar 01 2009 Than Ngo - 4.2.1-2 - respin --- kdelibs-4.2.0-kjs-gcc44-crash.patch DELETED --- From robert at fedoraproject.org Tue Mar 3 19:42:29 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Tue, 3 Mar 2009 19:42:29 +0000 (UTC) Subject: rpms/libpolyxmass/devel libpolyxmass.spec,1.11,1.12 Message-ID: <20090303194229.D4C5E70116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/libpolyxmass/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9167 Modified Files: libpolyxmass.spec Log Message: Rebuilt against libtool 2.2 Index: libpolyxmass.spec =================================================================== RCS file: /cvs/pkgs/rpms/libpolyxmass/devel/libpolyxmass.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libpolyxmass.spec 25 Feb 2009 17:33:10 -0000 1.11 +++ libpolyxmass.spec 3 Mar 2009 19:41:59 -0000 1.12 @@ -1,6 +1,6 @@ Name: libpolyxmass Version: 0.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Polymer chemistry-related functionalities Group: System Environment/Libraries @@ -45,6 +45,7 @@ %setup -q %patch0 +libtoolize autoreconf %build @@ -81,6 +82,9 @@ %{_libdir}/pkgconfig/libpolyxmass.pc %changelog +* Tue Mar 03 2009 Robert Scheck - 0.9.1-4 +- Rebuilt against libtool 2.2 + * Wed Feb 25 2009 Fedora Release Engineering - 0.9.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From robert at fedoraproject.org Tue Mar 3 19:48:33 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Tue, 3 Mar 2009 19:48:33 +0000 (UTC) Subject: rpms/libpqxx/devel libpqxx.spec,1.22,1.23 Message-ID: <20090303194833.5F4B270116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/libpqxx/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10458 Modified Files: libpqxx.spec Log Message: Rebuilt against libtool 2.2 Index: libpqxx.spec =================================================================== RCS file: /cvs/pkgs/rpms/libpqxx/devel/libpqxx.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- libpqxx.spec 25 Feb 2009 17:34:06 -0000 1.22 +++ libpqxx.spec 3 Mar 2009 19:48:03 -0000 1.23 @@ -1,6 +1,6 @@ Name: libpqxx Version: 2.6.8 -Release: 11%{?dist} +Release: 12%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries @@ -47,7 +47,8 @@ %patch2 -p1 -b .gcc43 %patch3 -p1 -b .multilib -# better fix/hack for current rpath issues +# better fix/hack for current rpath and libtool issues +libtoolize autoreconf @@ -96,6 +97,9 @@ %changelog +* Tue Mar 03 2009 Robert Scheck - 2.6.8-12 +- Rebuilt against libtool 2.2 + * Wed Feb 25 2009 Fedora Release Engineering - 2.6.8-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From atorkhov at fedoraproject.org Tue Mar 3 19:49:10 2009 From: atorkhov at fedoraproject.org (Alexey Torkhov) Date: Tue, 3 Mar 2009 19:49:10 +0000 (UTC) Subject: rpms/chess/devel chess.desktop,1.2,1.3 Message-ID: <20090303194910.7DB1470116@cvs1.fedora.phx.redhat.com> Author: atorkhov Update of /cvs/pkgs/rpms/chess/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10635 Modified Files: chess.desktop Log Message: Removing extension from icon filename in chess.desktop. Index: chess.desktop =================================================================== RCS file: /cvs/pkgs/rpms/chess/devel/chess.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- chess.desktop 3 Aug 2007 15:16:55 -0000 1.2 +++ chess.desktop 3 Mar 2009 19:48:40 -0000 1.3 @@ -3,7 +3,7 @@ Name=Chess Comment=3D Chess Game Exec=chess -Icon=chess.png +Icon=chess Terminal=false StartupNotify=false Type=Application From mclasen at fedoraproject.org Tue Mar 3 19:53:19 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Mar 2009 19:53:19 +0000 (UTC) Subject: rpms/seahorse-plugins/devel .cvsignore, 1.9, 1.10 seahorse-plugins.spec, 1.20, 1.21 sources, 1.9, 1.10 Message-ID: <20090303195319.7186970116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/seahorse-plugins/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12025 Modified Files: .cvsignore seahorse-plugins.spec sources Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/seahorse-plugins/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 4 Feb 2009 05:25:57 -0000 1.9 +++ .cvsignore 3 Mar 2009 19:52:48 -0000 1.10 @@ -1 +1 @@ -seahorse-plugins-2.25.90.tar.bz2 +seahorse-plugins-2.25.92.tar.bz2 Index: seahorse-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- seahorse-plugins.spec 27 Feb 2009 05:27:13 -0000 1.20 +++ seahorse-plugins.spec 3 Mar 2009 19:52:48 -0000 1.21 @@ -1,6 +1,6 @@ Name: seahorse-plugins -Version: 2.25.90 -Release: 4%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Summary: Plugins and utilities for encryption in GNOME Group: User Interface/Desktops License: GPLv2+ and GFDL @@ -53,16 +53,16 @@ Requires(postun): shared-mime-info Requires(postun): GConf2 -Patch0: epiphany-2.26.patch +#Patch0: epiphany-2.26.patch %description -The plugins and utilities in this package integrate seahorse into +The plugins and utilities in this package integrate seahorse into the GNOME desktop environment and allow users to perform operations from applications like nautilus or gedit. %prep %setup -q -%patch0 -p1 -b .epiphany +#%patch0 -p1 -b .epiphany autoreconf -i -f @@ -147,7 +147,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING NEWS README +%doc AUTHORS COPYING NEWS README %{_sysconfdir}/X11/xinit/xinitrc.d/seahorse-agent.sh %{_sysconfdir}/gconf/schemas/seahorse-plugins.schemas %{_sysconfdir}/gconf/schemas/seahorse-gedit.schemas @@ -177,6 +177,9 @@ %changelog +* Tue Mar 3 2009 Matthias Clasen - 2.25.92-1 +- Update to 2.25.92 + * Thu Feb 26 2009 Matthias Clasen - 2.25.90-3 - Fix file list Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/seahorse-plugins/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 4 Feb 2009 05:25:57 -0000 1.9 +++ sources 3 Mar 2009 19:52:48 -0000 1.10 @@ -1 +1 @@ -605c84dd83aed62daf38ae4629aa5eab seahorse-plugins-2.25.90.tar.bz2 +6b8e06cb6c83659c4d63f80a2f90eb7c seahorse-plugins-2.25.92.tar.bz2 From ajax at fedoraproject.org Tue Mar 3 19:57:14 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Tue, 3 Mar 2009 19:57:14 +0000 (UTC) Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.415,1.416 Message-ID: <20090303195714.17B4370116@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12618 Modified Files: xorg-x11-server.spec Log Message: * Tue Mar 03 2009 Adam Jackson 1.6.0-4 - xserver-1.6.0-selinux-raw.patch: Deal in raw contexts, to avoid paying the price for setrans on every object. - xserver-1.6.0-primary.patch: Try harder to figure out what the primary video device is on machines with multiple GPUs. - xserver-1.6.0-selinux-destroy.patch: Don't bother relabeling objects that are on the way to destruction. Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.415 retrieving revision 1.416 diff -u -r1.415 -r1.416 --- xorg-x11-server.spec 2 Mar 2009 17:59:04 -0000 1.415 +++ xorg-x11-server.spec 3 Mar 2009 19:56:43 -0000 1.416 @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -95,6 +95,9 @@ Patch6018: xserver-1.6.0-XIPropToInt.patch Patch6019: xserver-1.6.0-XATOM_FLOAT.patch Patch6020: xserver-1.6.0-preferred-thinko.patch +Patch6021: xserver-1.6.0-selinux-raw.patch +Patch6022: xserver-1.6.0-primary.patch +Patch6023: xserver-1.6.0-selinux-destroy.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -512,6 +515,14 @@ %changelog +* Tue Mar 03 2009 Adam Jackson 1.6.0-4 +- xserver-1.6.0-selinux-raw.patch: Deal in raw contexts, to avoid paying + the price for setrans on every object. +- xserver-1.6.0-primary.patch: Try harder to figure out what the primary + video device is on machines with multiple GPUs. +- xserver-1.6.0-selinux-destroy.patch: Don't bother relabeling objects that + are on the way to destruction. + * Mon Mar 02 2009 Adam Jackson 1.6.0-3 - xserver-1.6.0-preferred-thinko.patch: Fix a thinko in output setup when only one head is attached. From robert at fedoraproject.org Tue Mar 3 20:07:56 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Tue, 3 Mar 2009 20:07:56 +0000 (UTC) Subject: rpms/openal/devel openal-gcc43.patch, 1.1, 1.2 openal.spec, 1.28, 1.29 openal-arch.patch, 1.1, NONE Message-ID: <20090303200756.8BCB170116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/openal/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14097 Modified Files: openal-gcc43.patch openal.spec Removed Files: openal-arch.patch Log Message: Re-diffed the openal arch and gcc 4.3 patches for no fuzz openal-gcc43.patch: Index: openal-gcc43.patch =================================================================== RCS file: /cvs/pkgs/rpms/openal/devel/openal-gcc43.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openal-gcc43.patch 4 Jan 2008 16:26:07 -0000 1.1 +++ openal-gcc43.patch 3 Mar 2009 20:07:56 -0000 1.2 @@ -1,21 +1,20 @@ -diff -upNr portable.orign/common/include/AL/alc.h portable/common/include/AL/alc.h ---- portable.orign/common/include/AL/alc.h 2006-01-31 11:49:20.000000000 +0100 -+++ portable/common/include/AL/alc.h 2008-01-04 15:02:31.000000000 +0100 -@@ -187,7 +187,7 @@ ALC_API void ALC_APIENTRY alc - - ALC_API void ALC_APIENTRY alcDestroyContext( ALCcontext *context ); - --ALC_API ALCcontext * ALC_APIENTRY alcGetCurrentContext( ALCvoid ); -+ALC_API ALCcontext * ALC_APIENTRY alcGetCurrentContext( void ); - - ALC_API ALCdevice* ALC_APIENTRY alcGetContextsDevice( ALCcontext *context ); - -@@ -248,7 +248,7 @@ typedef ALCboolean (ALC_APIENTRY *LP - typedef void (ALC_APIENTRY *LPALCPROCESSCONTEXT)( ALCcontext *context ); - typedef void (ALC_APIENTRY *LPALCSUSPENDCONTEXT)( ALCcontext *context ); - typedef void (ALC_APIENTRY *LPALCDESTROYCONTEXT)( ALCcontext *context ); --typedef ALCcontext * (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( ALCvoid ); -+typedef ALCcontext * (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( void ); - typedef ALCdevice * (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)( ALCcontext *context ); - typedef ALCdevice * (ALC_APIENTRY *LPALCOPENDEVICE)( const ALCchar *devicename ); - typedef ALCboolean (ALC_APIENTRY *LPALCCLOSEDEVICE)( ALCdevice *device ); \ No newline at end of file +--- portable/common/include/AL/alc.h 2006-01-31 11:49:20.000000000 +0100 ++++ portable/common/include/AL/alc.h.gcc43 2009-03-03 20:58:16.000000000 +0100 +@@ -187,7 +187,7 @@ + + ALC_API void ALC_APIENTRY alcDestroyContext( ALCcontext *context ); + +-ALC_API ALCcontext * ALC_APIENTRY alcGetCurrentContext( ALCvoid ); ++ALC_API ALCcontext * ALC_APIENTRY alcGetCurrentContext( void ); + + ALC_API ALCdevice* ALC_APIENTRY alcGetContextsDevice( ALCcontext *context ); + +@@ -248,7 +248,7 @@ + typedef void (ALC_APIENTRY *LPALCPROCESSCONTEXT)( ALCcontext *context ); + typedef void (ALC_APIENTRY *LPALCSUSPENDCONTEXT)( ALCcontext *context ); + typedef void (ALC_APIENTRY *LPALCDESTROYCONTEXT)( ALCcontext *context ); +-typedef ALCcontext * (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( ALCvoid ); ++typedef ALCcontext * (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( void ); + typedef ALCdevice * (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)( ALCcontext *context ); + typedef ALCdevice * (ALC_APIENTRY *LPALCOPENDEVICE)( const ALCchar *devicename ); + typedef ALCboolean (ALC_APIENTRY *LPALCCLOSEDEVICE)( ALCdevice *device ); Index: openal.spec =================================================================== RCS file: /cvs/pkgs/rpms/openal/devel/openal.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- openal.spec 26 Feb 2009 08:18:14 -0000 1.28 +++ openal.spec 3 Mar 2009 20:07:56 -0000 1.29 @@ -1,6 +1,6 @@ Name: openal Version: 0.0.9 -Release: 0.16.20060204cvs%{?dist} +Release: 0.17.20060204cvs%{?dist} Summary: Open Audio Library Group: System Environment/Libraries @@ -12,7 +12,6 @@ #cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository co MODULE Source0: openal-cvs-20060204.tar.bz2 Source1: openalrc -Patch0: openal-arch.patch Patch1: openal-no-undefined.patch Patch2: openal-pkgconfig.patch Patch3: openal-pause.patch @@ -64,7 +63,7 @@ %patch3 -p1 %patch4 -p1 ./autogen.sh -%patch0 -p1 +sed -e 's/^\(libopenal_la_CFLAGS = .*\)/\1 $(ARCH_INCLUDES)/' -i src/Makefile.in %patch5 -p1 %build @@ -115,6 +114,9 @@ %changelog +* Tue Mar 03 2009 Robert Scheck - 0.0.9-0.17.20060204cvs +- Re-diffed the openal arch and gcc 4.3 patches for no fuzz + * Thu Feb 26 2009 Fedora Release Engineering - 0.0.9-0.16.20060204cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- openal-arch.patch DELETED --- From dwalsh at fedoraproject.org Tue Mar 3 20:11:01 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Tue, 3 Mar 2009 20:11:01 +0000 (UTC) Subject: rpms/selinux-policy/devel .cvsignore, 1.159, 1.160 policy-20090105.patch, 1.49, 1.50 selinux-policy.spec, 1.798, 1.799 setrans-minimum.conf, 1.1, 1.2 setrans-olpc.conf, 1.1, 1.2 setrans-targeted.conf, 1.2, 1.3 setrans.conf, 1.2, 1.3 sources, 1.178, 1.179 Message-ID: <20090303201101.E445C70116@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14584 Modified Files: .cvsignore policy-20090105.patch selinux-policy.spec setrans-minimum.conf setrans-olpc.conf setrans-targeted.conf setrans.conf sources Log Message: * Mon Mar 2 2009 Dan Walsh 3.6.7-1 - Update to Latest upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- .cvsignore 16 Feb 2009 22:30:36 -0000 1.159 +++ .cvsignore 3 Mar 2009 20:10:30 -0000 1.160 @@ -161,3 +161,4 @@ serefpolicy-3.6.4.tgz serefpolicy-3.6.5.tgz serefpolicy-3.6.6.tgz +serefpolicy-3.6.7.tgz policy-20090105.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.49 -r 1.50 policy-20090105.patch Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- policy-20090105.patch 27 Feb 2009 21:22:47 -0000 1.49 +++ policy-20090105.patch 3 Mar 2009 20:10:30 -0000 1.50 @@ -1,6 +1,6 @@ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.6/config/appconfig-mcs/default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.7/config/appconfig-mcs/default_contexts --- nsaserefpolicy/config/appconfig-mcs/default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.6/config/appconfig-mcs/default_contexts 2009-02-16 13:18:05.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/default_contexts 2009-03-02 17:01:39.000000000 -0500 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -22,15 +22,15 @@ -user_r:user_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 -user_r:user_sudo_t:s0 sysadm_r:sysadm_t:s0 user_r:user_t:s0 +system_r:xdm_t:s0 user_r:user_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.6/config/appconfig-mcs/failsafe_context +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.7/config/appconfig-mcs/failsafe_context --- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.6/config/appconfig-mcs/failsafe_context 2009-02-16 13:18:05.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/failsafe_context 2009-03-02 17:01:39.000000000 -0500 @@ -1 +1 @@ -sysadm_r:sysadm_t:s0 +system_r:unconfined_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.6.6/config/appconfig-mcs/guest_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.6/config/appconfig-mcs/guest_u_default_contexts 2009-02-16 13:18:05.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/guest_u_default_contexts 2009-03-02 17:01:39.000000000 -0500 @@ -0,0 +1,6 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -38,9 +38,9 @@ +system_r:crond_t:s0 guest_r:guest_t:s0 +system_r:initrc_su_t:s0 guest_r:guest_t:s0 +guest_r:guest_t:s0 guest_r:guest_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.6/config/appconfig-mcs/root_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/root_default_contexts --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.6/config/appconfig-mcs/root_default_contexts 2009-02-16 13:18:05.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/root_default_contexts 2009-03-02 17:01:39.000000000 -0500 @@ -1,11 +1,7 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0 +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -55,18 +55,18 @@ # -#system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.6/config/appconfig-mcs/seusers +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.7/config/appconfig-mcs/seusers --- nsaserefpolicy/config/appconfig-mcs/seusers 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.6/config/appconfig-mcs/seusers 2009-02-16 13:18:05.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/seusers 2009-03-02 17:01:39.000000000 -0500 @@ -1,3 +1,3 @@ system_u:system_u:s0-mcs_systemhigh -root:root:s0-mcs_systemhigh -__default__:user_u:s0 +root:unconfined_u:s0-mcs_systemhigh +__default__:unconfined_u:s0-mcs_systemhigh -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.6/config/appconfig-mcs/staff_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/staff_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.6/config/appconfig-mcs/staff_u_default_contexts 2009-02-16 13:18:05.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/staff_u_default_contexts 2009-03-02 17:01:39.000000000 -0500 @@ -1,10 +1,12 @@ system_r:local_login_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 system_r:remote_login_t:s0 staff_r:staff_t:s0 @@ -81,9 +81,9 @@ sysadm_r:sysadm_su_t:s0 sysadm_r:sysadm_t:s0 sysadm_r:sysadm_sudo_t:s0 sysadm_r:sysadm_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.6/config/appconfig-mcs/unconfined_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.6/config/appconfig-mcs/unconfined_u_default_contexts 2009-02-16 13:18:05.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/unconfined_u_default_contexts 2009-03-02 17:01:39.000000000 -0500 @@ -1,4 +1,4 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0 +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 @@ -97,15 +97,15 @@ +system_r:initrc_su_t:s0 unconfined_r:unconfined_t:s0 +unconfined_r:unconfined_t:s0 unconfined_r:unconfined_t:s0 system_r:xdm_t:s0 unconfined_r:unconfined_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.6/config/appconfig-mcs/userhelper_context +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.7/config/appconfig-mcs/userhelper_context --- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.6/config/appconfig-mcs/userhelper_context 2009-02-16 13:18:06.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/userhelper_context 2009-03-02 17:01:39.000000000 -0500 @@ -1 +1 @@ -system_u:sysadm_r:sysadm_t:s0 +system_u:system_r:unconfined_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.6/config/appconfig-mcs/user_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/user_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.6/config/appconfig-mcs/user_u_default_contexts 2009-02-16 13:18:06.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/user_u_default_contexts 2009-03-02 17:01:39.000000000 -0500 @@ -1,8 +1,9 @@ system_r:local_login_t:s0 user_r:user_t:s0 system_r:remote_login_t:s0 user_r:user_t:s0 @@ -118,19 +118,19 @@ - +system_r:initrc_su_t:s0 user_r:user_t:s0 +user_r:user_t:s0 user_r:user_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.6/config/appconfig-mcs/virtual_domain_context +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.7/config/appconfig-mcs/virtual_domain_context --- nsaserefpolicy/config/appconfig-mcs/virtual_domain_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.6/config/appconfig-mcs/virtual_domain_context 2009-02-25 15:59:16.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/virtual_domain_context 2009-03-02 17:01:39.000000000 -0500 @@ -0,0 +1 @@ +system_u:system_r:qemu_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.6/config/appconfig-mcs/virtual_image_context +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.7/config/appconfig-mcs/virtual_image_context --- nsaserefpolicy/config/appconfig-mcs/virtual_image_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.6/config/appconfig-mcs/virtual_image_context 2009-02-25 15:59:31.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/virtual_image_context 2009-03-02 17:01:39.000000000 -0500 @@ -0,0 +1 @@ +system_u:object_r:virt_image_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.6.6/config/appconfig-mcs/xguest_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.6/config/appconfig-mcs/xguest_u_default_contexts 2009-02-16 13:18:06.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/xguest_u_default_contexts 2009-03-02 17:01:39.000000000 -0500 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -139,9 +139,9 @@ +system_r:xdm_t xguest_r:xguest_t:s0 +system_r:initrc_su_t:s0 xguest_r:xguest_t:s0 +xguest_r:xguest_t:s0 xguest_r:xguest_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.6/config/appconfig-mls/default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.7/config/appconfig-mls/default_contexts --- nsaserefpolicy/config/appconfig-mls/default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.6/config/appconfig-mls/default_contexts 2009-02-16 13:18:06.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/default_contexts 2009-03-02 17:01:39.000000000 -0500 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -163,17 +163,17 @@ -user_r:user_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 -user_r:user_sudo_t:s0 sysadm_r:sysadm_t:s0 user_r:user_t:s0 +system_r:xdm_t:s0 user_r:user_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.6.6/config/appconfig-mls/guest_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.6/config/appconfig-mls/guest_u_default_contexts 2009-02-16 13:18:06.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/guest_u_default_contexts 2009-03-02 17:01:39.000000000 -0500 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 +system_r:sshd_t:s0 guest_r:guest_t:s0 +system_r:crond_t:s0 guest_r:guest_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.6/config/appconfig-mls/root_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.7/config/appconfig-mls/root_default_contexts --- nsaserefpolicy/config/appconfig-mls/root_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.6/config/appconfig-mls/root_default_contexts 2009-02-16 13:18:06.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/root_default_contexts 2009-03-02 17:01:39.000000000 -0500 @@ -1,11 +1,11 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0 -system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -192,19 +192,19 @@ # -#system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 +#system_r:sshd_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.6/config/appconfig-mls/virtual_domain_context +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.7/config/appconfig-mls/virtual_domain_context --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.6/config/appconfig-mls/virtual_domain_context 2009-02-25 15:59:44.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/virtual_domain_context 2009-03-02 17:01:39.000000000 -0500 @@ -0,0 +1 @@ +system_u:system_r:qemu_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.6/config/appconfig-mls/virtual_image_context +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.7/config/appconfig-mls/virtual_image_context --- nsaserefpolicy/config/appconfig-mls/virtual_image_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.6/config/appconfig-mls/virtual_image_context 2009-02-25 15:59:44.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/virtual_image_context 2009-03-02 17:01:39.000000000 -0500 @@ -0,0 +1 @@ +system_u:object_r:virt_image_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.6.6/config/appconfig-mls/xguest_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mls/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.6/config/appconfig-mls/xguest_u_default_contexts 2009-02-16 13:18:06.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/xguest_u_default_contexts 2009-03-02 17:01:39.000000000 -0500 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -213,9 +213,9 @@ +system_r:xdm_t xguest_r:xguest_t:s0 +system_r:initrc_su_t:s0 xguest_r:xguest_t:s0 +xguest_r:xguest_t:s0 xguest_r:xguest_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.6/Makefile +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.7/Makefile --- nsaserefpolicy/Makefile 2009-01-19 11:07:35.000000000 -0500 -+++ serefpolicy-3.6.6/Makefile 2009-02-18 14:17:28.000000000 -0500 ++++ serefpolicy-3.6.7/Makefile 2009-03-02 17:01:39.000000000 -0500 @@ -241,7 +241,7 @@ [...5042 lines suppressed...] allow $1 userdomain:dbus send_msg; ') @@ -31409,9 +31558,34 @@ + +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.6/policy/modules/system/userdomain.te ++ ++######################################## ++## ++## Create objects in a user home directory ++## with an automatic type transition to ++## the user home file type. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The class of the object to be created. ++## ++## ++# ++interface(`userdom_user_home_dir_filetrans_pattern',` ++ gen_require(` ++ type user_home_dir_t, user_home_t; ++ ') ++ ++ type_transition $1 user_home_dir_t:$2 user_home_t; ++') +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.7/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.6/policy/modules/system/userdomain.te 2009-02-16 13:18:06.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/userdomain.te 2009-03-02 17:01:39.000000000 -0500 @@ -8,13 +8,6 @@ ## @@ -31495,15 +31669,15 @@ + fs_read_cifs_named_sockets(userhomereader) + fs_read_cifs_named_pipes(userhomereader) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.6/policy/modules/system/virtual.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.7/policy/modules/system/virtual.fc --- nsaserefpolicy/policy/modules/system/virtual.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.6/policy/modules/system/virtual.fc 2009-02-26 17:48:30.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/virtual.fc 2009-03-02 17:01:39.000000000 -0500 @@ -0,0 +1 @@ +# No application file contexts. -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.6/policy/modules/system/virtual.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.7/policy/modules/system/virtual.if --- nsaserefpolicy/policy/modules/system/virtual.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.6/policy/modules/system/virtual.if 2009-02-26 17:56:43.000000000 -0500 -@@ -0,0 +1,70 @@ ++++ serefpolicy-3.6.7/policy/modules/system/virtual.if 2009-03-03 11:10:11.000000000 -0500 +@@ -0,0 +1,96 @@ +## Virtual machine emulator and virtualizer + +######################################## @@ -31534,6 +31708,32 @@ + +######################################## +## ++## Make the specified type a virtual domain ++## ++## ++##

++## Make the specified type a virtual domain ++##

++##

++## Gives the basic access required for a virtual operatins system ++##

++## ++## ++## ++## Type granted access ++## ++## ++# ++interface(`virtual_separated_domain',` ++ gen_require(` ++ attribute virtual_separated_domain; ++ ') ++ ++ typeattribute $1 virtual_separated_domain; ++') ++ ++######################################## ++## +## Make the specified type usable as a virtual os image +## +## @@ -31574,10 +31774,10 @@ + manage_lnk_files_pattern($1, virtual_image_type, virtual_image_type) + rw_blk_files_pattern($1, virtual_image_type, virtual_image_type) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.6/policy/modules/system/virtual.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.7/policy/modules/system/virtual.te --- nsaserefpolicy/policy/modules/system/virtual.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.6/policy/modules/system/virtual.te 2009-02-26 17:57:06.000000000 -0500 -@@ -0,0 +1,72 @@ ++++ serefpolicy-3.6.7/policy/modules/system/virtual.te 2009-03-03 11:09:55.000000000 -0500 +@@ -0,0 +1,73 @@ + +policy_module(virtualization, 1.1.2) + @@ -31586,6 +31786,7 @@ +# Declarations +# + ++attribute virtual_separated_domain; +attribute virtualdomain; +attribute virtual_image_type; + @@ -31650,9 +31851,9 @@ + xserver_rw_shm(virtualdomain) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.6/policy/modules/system/xen.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.7/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.6/policy/modules/system/xen.fc 2009-02-16 13:18:06.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/xen.fc 2009-03-02 17:01:39.000000000 -0500 @@ -2,17 +2,10 @@ /usr/bin/virsh -- gen_context(system_u:object_r:xm_exec_t,s0) @@ -31679,9 +31880,9 @@ /var/run/xenstore\.pid -- gen_context(system_u:object_r:xenstored_var_run_t,s0) /var/run/xenstored(/.*)? gen_context(system_u:object_r:xenstored_var_run_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.6/policy/modules/system/xen.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.7/policy/modules/system/xen.if --- nsaserefpolicy/policy/modules/system/xen.if 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.6/policy/modules/system/xen.if 2009-02-16 13:18:06.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/xen.if 2009-03-02 17:01:39.000000000 -0500 @@ -167,11 +167,14 @@ # interface(`xen_stream_connect',` @@ -31723,9 +31924,9 @@ + allow $1 xend_var_lib_t:dir search_dir_perms; + rw_files_pattern($1, xen_image_t, xen_image_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.6/policy/modules/system/xen.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.7/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.6/policy/modules/system/xen.te 2009-02-16 13:18:06.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/xen.te 2009-03-02 17:01:39.000000000 -0500 @@ -6,6 +6,13 @@ # Declarations # @@ -31947,9 +32148,9 @@ +optional_policy(` + unconfined_domain(xend_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.6/policy/support/obj_perm_sets.spt +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.7/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-10-16 17:21:16.000000000 -0400 -+++ serefpolicy-3.6.6/policy/support/obj_perm_sets.spt 2009-02-17 08:43:20.000000000 -0500 ++++ serefpolicy-3.6.7/policy/support/obj_perm_sets.spt 2009-03-02 17:01:39.000000000 -0500 @@ -179,20 +179,20 @@ # # Directory (dir) @@ -32003,9 +32204,9 @@ +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ') + +define(`manage_key_perms', `{ create link read search setattr view write } ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.6/policy/users +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.7/policy/users --- nsaserefpolicy/policy/users 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.6.6/policy/users 2009-02-16 13:18:06.000000000 -0500 ++++ serefpolicy-3.6.7/policy/users 2009-03-02 17:01:39.000000000 -0500 @@ -25,11 +25,8 @@ # permit any access to such users, then remove this entry. # @@ -32030,9 +32231,9 @@ - gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats) -') +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.6/Rules.modular +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.7/Rules.modular --- nsaserefpolicy/Rules.modular 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.6/Rules.modular 2009-02-16 13:18:06.000000000 -0500 ++++ serefpolicy-3.6.7/Rules.modular 2009-03-02 17:01:39.000000000 -0500 @@ -73,8 +73,8 @@ $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te @echo "Compliling $(NAME) $(@F) module" @@ -32062,9 +32263,9 @@ $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.6/support/Makefile.devel +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.7/support/Makefile.devel --- nsaserefpolicy/support/Makefile.devel 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.6/support/Makefile.devel 2009-02-16 13:18:06.000000000 -0500 ++++ serefpolicy-3.6.7/support/Makefile.devel 2009-03-02 17:01:39.000000000 -0500 @@ -185,8 +185,7 @@ tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te @$(EINFO) "Compiling $(NAME) $(basename $(@F)) module" Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.798 retrieving revision 1.799 diff -u -r1.798 -r1.799 --- selinux-policy.spec 27 Feb 2009 21:22:47 -0000 1.798 +++ selinux-policy.spec 3 Mar 2009 20:10:30 -0000 1.799 @@ -19,8 +19,8 @@ %define CHECKPOLICYVER 2.0.16-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 3.6.6 -Release: 8%{?dist} +Version: 3.6.7 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -186,7 +186,7 @@ %description SELinux Reference Policy - modular. -Based off of reference policy: Checked out revision 2909. +Based off of reference policy: Checked out revision 2913. %build @@ -446,6 +446,12 @@ %endif %changelog +* Mon Mar 2 2009 Dan Walsh 3.6.7-1 +- Update to Latest upstream + +* Sat Feb 28 2009 Dan Walsh 3.6.6-9 +- Fix setrans.conf to show SystemLow for s0 + * Fri Feb 27 2009 Dan Walsh 3.6.6-8 - Further confinement of qemu images via svirt Index: setrans-minimum.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/setrans-minimum.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- setrans-minimum.conf 9 Oct 2008 12:02:27 -0000 1.1 +++ setrans-minimum.conf 3 Mar 2009 20:10:30 -0000 1.2 @@ -14,6 +14,6 @@ # s0:c2=Unclassified # s0:c3=TopSecret # s0:c1,c3=CompanyConfidentialRedHat -s0= +s0=SystemLow s0-s0:c0.c1023=SystemLow-SystemHigh s0:c0.c1023=SystemHigh Index: setrans-olpc.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/setrans-olpc.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- setrans-olpc.conf 26 Jun 2007 11:15:55 -0000 1.1 +++ setrans-olpc.conf 3 Mar 2009 20:10:30 -0000 1.2 @@ -14,6 +14,6 @@ # s0:c2=Unclassified # s0:c3=TopSecret # s0:c1,c3=CompanyConfidentialRedHat -s0= +s0=SystemLow s0-s0:c0.c1023=SystemLow-SystemHigh s0:c0.c1023=SystemHigh Index: setrans-targeted.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/setrans-targeted.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- setrans-targeted.conf 19 Sep 2006 14:59:46 -0000 1.2 +++ setrans-targeted.conf 3 Mar 2009 20:10:30 -0000 1.3 @@ -14,6 +14,6 @@ # s0:c2=Unclassified # s0:c3=TopSecret # s0:c1,c3=CompanyConfidentialRedHat -s0= +s0=SystemLow s0-s0:c0.c1023=SystemLow-SystemHigh s0:c0.c1023=SystemHigh Index: setrans.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/setrans.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- setrans.conf 19 Sep 2006 14:59:46 -0000 1.2 +++ setrans.conf 3 Mar 2009 20:10:30 -0000 1.3 @@ -14,6 +14,6 @@ # s0:c2=Unclassified # s0:c3=TopSecret # s0:c1,c3=CompanyConfidentialRedHat -s0= +s0=SystemLow s0-s0:c0.c1023=SystemLow-SystemHigh s0:c0.c1023=SystemHigh Index: sources =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- sources 16 Feb 2009 22:30:36 -0000 1.178 +++ sources 3 Mar 2009 20:10:30 -0000 1.179 @@ -1 +1 @@ -bd6b3b5efc3d8b620ee975eb82f28905 serefpolicy-3.6.6.tgz +1ba196a49315403311352d577c40fced serefpolicy-3.6.7.tgz From robert at fedoraproject.org Tue Mar 3 20:11:49 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Tue, 3 Mar 2009 20:11:49 +0000 (UTC) Subject: rpms/rubygem-pam/devel rubygem-pam.spec,1.2,1.3 Message-ID: <20090303201149.4FD4D70116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/rubygem-pam/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14785 Modified Files: rubygem-pam.spec Log Message: Another rebuilt to solve the koji buildsystem failure Index: rubygem-pam.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-pam/devel/rubygem-pam.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rubygem-pam.spec 25 Feb 2009 21:54:22 -0000 1.2 +++ rubygem-pam.spec 3 Mar 2009 20:11:19 -0000 1.3 @@ -10,7 +10,7 @@ # Main package bundles it at a gem Name: rubygem-%{gemname} Version: 1.5.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Ruby bindings for pam Group: Development/Languages @@ -90,6 +90,9 @@ %changelog +* Tue Mar 03 2009 Robert Scheck - 1.5.3-3 +- Another rebuilt to solve the koji buildsystem failure + * Wed Feb 25 2009 Fedora Release Engineering - 1.5.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -104,4 +107,3 @@ * Mon Aug 6 2008 Bryan Kearney - 1.5.2-1 - Initial specfile - From bkearney at fedoraproject.org Tue Mar 3 20:21:09 2009 From: bkearney at fedoraproject.org (Bryan Kearney) Date: Tue, 3 Mar 2009 20:21:09 +0000 (UTC) Subject: rpms/sugar-turtleart/devel .cvsignore, 1.7, 1.8 import.log, 1.5, 1.6 sources, 1.7, 1.8 sugar-turtleart.spec, 1.8, 1.9 Message-ID: <20090303202110.0898270116@cvs1.fedora.phx.redhat.com> Author: bkearney Update of /cvs/pkgs/rpms/sugar-turtleart/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15771/devel Modified Files: .cvsignore import.log sources sugar-turtleart.spec Log Message: Pulled in the latst from upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-turtleart/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Mar 2009 19:28:34 -0000 1.7 +++ .cvsignore 3 Mar 2009 20:20:39 -0000 1.8 @@ -1 +1 @@ -TurtleArt-36.tar.bz2 +TurtleArt-41.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/sugar-turtleart/devel/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 3 Mar 2009 19:28:34 -0000 1.5 +++ import.log 3 Mar 2009 20:20:39 -0000 1.6 @@ -3,3 +3,4 @@ sugar-turtleart-18-1_fc9:HEAD:sugar-turtleart-18-1.fc9.src.rpm:1227622131 sugar-turtleart-23-1_fc10:HEAD:sugar-turtleart-23-1.fc10.src.rpm:1229352953 sugar-turtleart-36-1_fc10:HEAD:sugar-turtleart-36-1.fc10.src.rpm:1236108263 +sugar-turtleart-41-1_fc10:HEAD:sugar-turtleart-41-1.fc10.src.rpm:1236111176 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-turtleart/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Mar 2009 19:28:34 -0000 1.7 +++ sources 3 Mar 2009 20:20:39 -0000 1.8 @@ -1 +1 @@ -c99326d3630f194c4c39a1c610ca153d TurtleArt-36.tar.bz2 +6da81e05da7664529506f660681e0238 TurtleArt-41.tar.bz2 Index: sugar-turtleart.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-turtleart/devel/sugar-turtleart.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sugar-turtleart.spec 3 Mar 2009 19:28:34 -0000 1.8 +++ sugar-turtleart.spec 3 Mar 2009 20:20:39 -0000 1.9 @@ -1,5 +1,5 @@ Name: sugar-turtleart -Version: 36 +Version: 41 Release: 1%{?dist} Summary: Turtle Art activity for sugar @@ -7,7 +7,7 @@ License: MIT BuildArch: noarch URL: http://sugarlabs.org/go/Activities/TurtleArt -Source0: http://download.sugarlabs.org/sources/sucrose/fructose/TurtleArt/TurtleArt-36.tar.bz2 +Source0: http://download.sugarlabs.org/sources/sucrose/fructose/TurtleArt/TurtleArt-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python BuildRequires: sugar-toolkit @@ -45,6 +45,10 @@ %changelog +* Tue Mar 03 2009 Bryan Kearney - 41-1 +- Additional Languages +- Artwork cleanup + * Tue Mar 03 2009 Bryan Kearney - 36-1 - Bring in the latest from upstream From pwouters at fedoraproject.org Tue Mar 3 20:24:11 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Tue, 3 Mar 2009 20:24:11 +0000 (UTC) Subject: rpms/uml_utilities/devel uml_utilities.spec,1.1,1.2 Message-ID: <20090303202411.5757B70116@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/uml_utilities/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16540 Modified Files: uml_utilities.spec Log Message: * Tue Mar 03 2009 Paul Wouters - 20070815-5 - Limited setuid binary to only members of the uml-net group Index: uml_utilities.spec =================================================================== RCS file: /cvs/extras/rpms/uml_utilities/devel/uml_utilities.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- uml_utilities.spec 1 Mar 2009 21:26:11 -0000 1.1 +++ uml_utilities.spec 3 Mar 2009 20:23:40 -0000 1.2 @@ -1,11 +1,12 @@ Name: uml_utilities Version: 20070815 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ URL: http://user-mode-linux.sourceforge.net/index.html Source0: http://user-mode-linux.sourceforge.net/%{name}_%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fuse-devel, readline-devel +Requires(pre): shadow-utils Group: Applications/Internet Summary: Utilities for user-mode linux kernel # installation problem was reported upstream: @@ -37,7 +38,7 @@ %defattr(-,root,root,-) %doc COPYING Changelog %attr(755,root,root) %dir %{_libdir}/uml -%attr(4755,root,root) %{_bindir}/uml_net +%attr(4750,root,uml-net) %{_bindir}/uml_net %{_bindir}/jailtest %{_bindir}/tunctl %{_bindir}/uml_mconsole @@ -57,7 +58,14 @@ %clean rm -rf ${RPM_BUILD_ROOT} +%pre +getent group uml-net >/dev/null || groupadd -r uml-net +exit 0 + %changelog +* Tue Mar 03 2009 Paul Wouters - 20070815-5 +- Limited setuid binary to only members of the uml-net group + * Fri Feb 27 2009 Christian Krause - 20070815-4 - use regular version tag - fixed license tag From spot at fedoraproject.org Tue Mar 3 20:26:05 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Mar 2009 20:26:05 +0000 (UTC) Subject: rpms/mono-nunit22/devel nunit22-key.patch, 1.2, 1.3 nunit22-mono.patch, 1.2, 1.3 mono-nunit22.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <20090303202605.20EF770116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/mono-nunit22/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17774 Modified Files: mono-nunit22.spec sources Added Files: nunit22-key.patch nunit22-mono.patch Log Message: revert to 2.2.10, bump epoch nunit22-key.patch: Index: nunit22-key.patch =================================================================== RCS file: nunit22-key.patch diff -N nunit22-key.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ nunit22-key.patch 3 Mar 2009 20:26:04 -0000 1.3 @@ -0,0 +1,120 @@ +diff -up mono-nunit22-2.2.10/src/ClientUtilities/util/nunit.util.build.key mono-nunit22-2.2.10/src/ClientUtilities/util/nunit.util.build +--- mono-nunit22-2.2.10/src/ClientUtilities/util/nunit.util.build.key 2008-04-11 10:15:09.000000000 -0400 ++++ mono-nunit22-2.2.10/src/ClientUtilities/util/nunit.util.build 2008-04-11 10:15:34.000000000 -0400 +@@ -8,7 +8,7 @@ + + ++ debug="${build.debug}" define="${build.defines.csc}" keyfile="../../../nunit.snk"> + + + +diff -up mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console-exe/nunit-console.exe.build.key mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console-exe/nunit-console.exe.build +--- mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console-exe/nunit-console.exe.build.key 2008-04-11 10:15:44.000000000 -0400 ++++ mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console-exe/nunit-console.exe.build 2008-04-11 10:16:06.000000000 -0400 +@@ -9,7 +9,7 @@ + + ++ debug="${build.debug}" define="${build.defines.csc}" keyfile="../../../nunit.snk"> + + + +diff -up mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console/nunit-console.build.key mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console/nunit-console.build +--- mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console/nunit-console.build.key 2008-04-11 10:16:16.000000000 -0400 ++++ mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console/nunit-console.build 2008-04-11 10:16:34.000000000 -0400 +@@ -9,7 +9,7 @@ + + ++ debug="${build.debug}" define="${build.defines.csc}" keyfile="../../../nunit.snk"> + + + +diff -up mono-nunit22-2.2.10/src/GuiComponents/UiKit/nunit.uikit.build.key mono-nunit22-2.2.10/src/GuiComponents/UiKit/nunit.uikit.build +--- mono-nunit22-2.2.10/src/GuiComponents/UiKit/nunit.uikit.build.key 2008-04-11 10:16:50.000000000 -0400 ++++ mono-nunit22-2.2.10/src/GuiComponents/UiKit/nunit.uikit.build 2008-04-11 10:17:09.000000000 -0400 +@@ -8,7 +8,7 @@ + + ++ debug="${build.debug}" define="${build.defines.csc}" keyfile="../../../nunit.snk"> + + + +diff -up mono-nunit22-2.2.10/src/GuiRunner/nunit-gui-exe/nunit-gui.exe.build.key mono-nunit22-2.2.10/src/GuiRunner/nunit-gui-exe/nunit-gui.exe.build +--- mono-nunit22-2.2.10/src/GuiRunner/nunit-gui-exe/nunit-gui.exe.build.key 2008-04-11 10:17:20.000000000 -0400 ++++ mono-nunit22-2.2.10/src/GuiRunner/nunit-gui-exe/nunit-gui.exe.build 2008-04-11 10:17:37.000000000 -0400 +@@ -10,7 +10,7 @@ + ++ define="${build.defines.csc}" keyfile="../../../nunit.snk"> + + + +diff -up mono-nunit22-2.2.10/src/GuiRunner/nunit-gui/nunit-gui.build.key mono-nunit22-2.2.10/src/GuiRunner/nunit-gui/nunit-gui.build +--- mono-nunit22-2.2.10/src/GuiRunner/nunit-gui/nunit-gui.build.key 2008-04-11 10:17:56.000000000 -0400 ++++ mono-nunit22-2.2.10/src/GuiRunner/nunit-gui/nunit-gui.build 2008-04-11 10:18:18.000000000 -0400 +@@ -9,7 +9,7 @@ + ++ define="${build.defines.csc}" keyfile="../../../nunit.snk"> + + + +diff -up mono-nunit22-2.2.10/src/NUnitExtensions/core/nunit.core.extensions.build.key mono-nunit22-2.2.10/src/NUnitExtensions/core/nunit.core.extensions.build +--- mono-nunit22-2.2.10/src/NUnitExtensions/core/nunit.core.extensions.build.key 2008-04-11 10:19:45.000000000 -0400 ++++ mono-nunit22-2.2.10/src/NUnitExtensions/core/nunit.core.extensions.build 2008-04-11 10:20:03.000000000 -0400 +@@ -9,7 +9,7 @@ + + ++ debug="${build.debug}" define="${build.defines.csc}" keyfile="../../../nunit.snk"> + + + +diff -up mono-nunit22-2.2.10/src/NUnitFramework/core/nunit.core.build.key mono-nunit22-2.2.10/src/NUnitFramework/core/nunit.core.build +--- mono-nunit22-2.2.10/src/NUnitFramework/core/nunit.core.build.key 2008-04-11 10:18:35.000000000 -0400 ++++ mono-nunit22-2.2.10/src/NUnitFramework/core/nunit.core.build 2008-04-11 10:19:06.000000000 -0400 +@@ -9,7 +9,7 @@ + ++ define="${build.defines.csc},StronglyNamedAssembly" keyfile="../../../nunit.snk"> + + + +diff -up mono-nunit22-2.2.10/src/NUnitFramework/framework/nunit.framework.build.key mono-nunit22-2.2.10/src/NUnitFramework/framework/nunit.framework.build +--- mono-nunit22-2.2.10/src/NUnitFramework/framework/nunit.framework.build.key 2008-04-11 10:20:35.000000000 -0400 ++++ mono-nunit22-2.2.10/src/NUnitFramework/framework/nunit.framework.build 2008-04-11 10:20:50.000000000 -0400 +@@ -10,7 +10,7 @@ + output="${current.build.dir}/nunit.framework.dll" + debug="${build.debug}" + define="${build.defines.csc},StronglyNamedAssembly" +- nowarn="618,672"> ++ nowarn="618,672" keyfile="../../../nunit.snk"> + + + +diff -up mono-nunit22-2.2.10/src/NUnitMocks/mocks/nunit.mocks.build.key mono-nunit22-2.2.10/src/NUnitMocks/mocks/nunit.mocks.build +--- mono-nunit22-2.2.10/src/NUnitMocks/mocks/nunit.mocks.build.key 2008-04-11 10:21:13.000000000 -0400 ++++ mono-nunit22-2.2.10/src/NUnitMocks/mocks/nunit.mocks.build 2008-04-11 10:21:29.000000000 -0400 +@@ -8,7 +8,7 @@ + + ++ debug="${build.debug}" define="${build.defines.csc}" keyfile="../../../nunit.snk"> + + + nunit22-mono.patch: Index: nunit22-mono.patch =================================================================== RCS file: nunit22-mono.patch diff -N nunit22-mono.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ nunit22-mono.patch 3 Mar 2009 20:26:04 -0000 1.3 @@ -0,0 +1,19 @@ +diff -up mono-nunit22-2.2.10/src/nunit.build.include.BAD mono-nunit22-2.2.10/src/nunit.build.include +--- mono-nunit22-2.2.10/src/nunit.build.include.BAD 2008-04-11 10:12:49.000000000 -0400 ++++ mono-nunit22-2.2.10/src/nunit.build.include 2008-04-11 10:13:07.000000000 -0400 +@@ -76,7 +76,7 @@ + + ++ value="mono-1.0,mono-2.0"/> + + + +@@ -329,4 +329,4 @@ + VS 2005: ${vs.2005.path} + + +- +\ No newline at end of file ++ Index: mono-nunit22.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono-nunit22/devel/mono-nunit22.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mono-nunit22.spec 3 Mar 2009 03:10:41 -0000 1.10 +++ mono-nunit22.spec 3 Mar 2009 20:26:04 -0000 1.11 @@ -1,25 +1,26 @@ %define debug_package %{nil} Name: mono-nunit22 -Version: 2.4.8 -Release: 4%{?dist} +Version: 2.2.10 +Release: 6%{?dist} Summary: Unit-testing framework for .NET URL: http://www.nunit.org/ License: MIT with acknowledgement Group: System Environment/Libraries -Source0: http://downloads.sourceforge.net/nunit/NUnit-2.4.8-src.zip +Source0: http://downloads.sourceforge.net/nunit/NUnit-2.2.10-src.zip Source1: nunit22.pc -Patch0: mono-nunit22-248-buildkey.patch +Patch0: nunit22-mono.patch +Patch1: nunit22-key.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: mono-devel >= 2.2 , nant +BuildRequires: mono-devel, nant BuildRequires: unzip -# I don't know why this thing needs fonts to be present at build. But it does. -# It's C#. Who knows why it does the wacky things it does? -BuildRequires: liberation-sans-fonts -# There is no nant for ppc/ppc64/sparc64 -ExcludeArch: ppc64 ppc sparc64 +# I had to add this because someone updated this package to 2.4. The 2.4 Nunit +# stuff comes out of the main mono package. This is the 2.2 compat version. +Epoch: 1 +# There is no nant for ppc/ppc64 +ExcludeArch: ppc64 ppc -%description +%description NUnit is a unit-testing framework for all .Net languages. Initially ported from JUnit, this xUnit based unit testing tool is written entirely in C# and has been completely redesigned to take advantage of many .NET language features, @@ -37,7 +38,8 @@ %prep %setup -q -c -n %{name}-%{version} -%patch0 -p1 -b .key +%patch0 -p1 +%patch1 -p1 -b .key %build sn -k nunit.snk @@ -50,8 +52,9 @@ nant mono-2.0 copy-bins %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig cp -p %{S:1} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig +sed -i -e 's!@libdir@!%{_libdir}!' $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nunit22.pc mkdir -p $RPM_BUILD_ROOT/%{_libdir}/mono/gac/ -cd ../package/NUnit-%{version} +cd package/NUnit-%{version} gacutil -i bin/nunit-console.exe -f -package nunit22 -root ${RPM_BUILD_ROOT}/%{_libdir} gacutil -i bin/nunit-console-runner.dll -f -package nunit22 -root ${RPM_BUILD_ROOT}/%{_libdir} gacutil -i bin/nunit.core.dll -f -package nunit22 -root ${RPM_BUILD_ROOT}/%{_libdir} @@ -75,28 +78,6 @@ %changelog -* Mon Mar 2 2009 Tom "spot" Callaway - 2.4.8-4 -- add fonts as BR to get this turd building again - -* Wed Feb 25 2009 Fedora Release Engineering - 2.4.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Jan 02 2009 Dennis Gilmore 2.4.8-2 -- exclude sparc64 -- add missing changelog entries - -* Sun Nov 30 2008 Paul F. Johnson 2.4.8-1 -- bump to bring it up to date -- remove nunit22 build patch -- fix new nunit22 key patch -- spec file fix - -* Mon Aug 11 2008 Tom "spot" Callaway 2.2.10-7 -- fix license tag - -* Thu Jun 5 2008 Tom "spot" Callaway 2.2.10-6 -- rebuild for new mono bits - * Tue Apr 22 2008 Tom "spot" Callaway 2.2.10-5 - fix sed invocation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mono-nunit22/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Dec 2008 12:32:05 -0000 1.3 +++ sources 3 Mar 2009 20:26:04 -0000 1.4 @@ -1 +1 @@ -460d0c283ae814f76d789b3fb10be647 NUnit-2.4.8-src.zip +21f03da90e34d2eb36e9445c816f53c5 NUnit-2.2.10-src.zip From pkgdb at fedoraproject.org Tue Mar 3 20:28:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:28:33 +0000 Subject: [pkgdb] nmh (Fedora EPEL, 5) updated by kevin Message-ID: <20090303202908.14D9E2082B2@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for nmh kevin has set commit to Approved for provenpackager on nmh (Fedora EPEL 5) kevin has set build to Approved for provenpackager on nmh (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on nmh (Fedora EPEL 5) kevin changed owner of nmh in Fedora EPEL 5 to ralston To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nmh From pkgdb at fedoraproject.org Tue Mar 3 20:28:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:28:33 +0000 Subject: [pkgdb] nmh (Fedora EPEL, 4) updated by kevin Message-ID: <20090303202908.2859D208545@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for nmh kevin has set commit to Approved for provenpackager on nmh (Fedora EPEL 4) kevin has set build to Approved for provenpackager on nmh (Fedora EPEL 4) kevin has set checkout to Approved for provenpackager on nmh (Fedora EPEL 4) kevin changed owner of nmh in Fedora EPEL 4 to ralston To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nmh From rdieter at fedoraproject.org Tue Mar 3 20:32:27 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Tue, 3 Mar 2009 20:32:27 +0000 (UTC) Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.75,1.76 Message-ID: <20090303203227.B5E0870116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepimlibs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18913 Modified Files: kdepimlibs.spec Log Message: * Tue Mar 03 2009 Rex Dieter - 4.2.1-2 - avoid libkcal conflict with kdepim3 Index: kdepimlibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- kdepimlibs.spec 27 Feb 2009 12:44:16 -0000 1.75 +++ kdepimlibs.spec 3 Mar 2009 20:31:57 -0000 1.76 @@ -17,7 +17,7 @@ Name: kdepimlibs Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: K Desktop Environment 4 - PIM Libraries License: LGPLv2 @@ -139,9 +139,14 @@ rm -f "$i" ln -sf "../../$linktarget" "kde4/devel/$i" ;; +# conflicts with kdepim3 (compat) + libkcal.so) + rm -f "$i" + ln -sf "../../$linktarget" "kde4/devel/$i" + ;; %if 0%{?fedora} < 10 -# conflicts with kdepim3 - libgpgme++.so | libkcal.so | libkmime.so | libkpimidentities.so | libktnef.so | libqgpgme.so) +# conflicts with kdepim(3) + libgpgme++.so | libkmime.so | libkpimidentities.so | libktnef.so | libqgpgme.so) linktarget=`readlink "$i"` rm -f "$i" ln -sf "../../$linktarget" "kde4/devel/$i" @@ -215,6 +220,9 @@ %changelog +* Tue Mar 03 2009 Rex Dieter - 4.2.1-2 +- avoid libkcal conflict with kdepim3 + * Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 From pkgdb at fedoraproject.org Tue Mar 3 20:32:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:32:49 +0000 Subject: [pkgdb] abrt was added for jmoskovc Message-ID: <20090303203310.D234E208543@bastion.fedora.phx.redhat.com> kevin has added Package abrt with summary Automatic bug detection and reporting tool kevin has approved Package abrt kevin has added a Fedora devel branch for abrt with an owner of jmoskovc kevin has approved abrt in Fedora devel kevin has approved Package abrt kevin has set commit to Approved for provenpackager on abrt (Fedora devel) kevin has set build to Approved for provenpackager on abrt (Fedora devel) kevin has set checkout to Approved for provenpackager on abrt (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/abrt From pkgdb at fedoraproject.org Tue Mar 3 20:32:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:32:38 +0000 Subject: [pkgdb] abrt (Fedora, devel) updated by kevin Message-ID: <20090303203314.3C9A0208548@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on abrt (Fedora devel) for zprikryl kevin approved watchcommits on abrt (Fedora devel) for zprikryl kevin approved commit on abrt (Fedora devel) for zprikryl kevin approved build on abrt (Fedora devel) for zprikryl kevin approved approveacls on abrt (Fedora devel) for zprikryl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/abrt From pkgdb at fedoraproject.org Tue Mar 3 20:32:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:32:38 +0000 Subject: [pkgdb] abrt (Fedora, 10) updated by kevin Message-ID: <20090303203314.4988F20854C@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for abrt kevin has set commit to Approved for provenpackager on abrt (Fedora 10) kevin has set build to Approved for provenpackager on abrt (Fedora 10) kevin has set checkout to Approved for provenpackager on abrt (Fedora 10) kevin approved watchbugzilla on abrt (Fedora 10) for zprikryl kevin approved watchcommits on abrt (Fedora 10) for zprikryl kevin approved commit on abrt (Fedora 10) for zprikryl kevin approved build on abrt (Fedora 10) for zprikryl kevin approved approveacls on abrt (Fedora 10) for zprikryl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/abrt From kevin at fedoraproject.org Tue Mar 3 20:32:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:32:52 +0000 (UTC) Subject: rpms/abrt/devel - New directory Message-ID: <20090303203252.7047E70118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/abrt/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19148/rpms/abrt/devel Log Message: Directory /cvs/pkgs/rpms/abrt/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 20:32:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:32:52 +0000 (UTC) Subject: rpms/abrt - New directory Message-ID: <20090303203252.3479270116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/abrt In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19148/rpms/abrt Log Message: Directory /cvs/pkgs/rpms/abrt added to the repository From pkgdb at fedoraproject.org Tue Mar 3 20:33:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:33:36 +0000 Subject: [pkgdb] vgabios (Fedora, devel) updated by toshio Message-ID: <20090303203335.47C6620854D@bastion.fedora.phx.redhat.com> toshio approved watchbugzilla on vgabios (Fedora devel) for virtmaint toshio approved watchcommits on vgabios (Fedora devel) for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vgabios From pkgdb at fedoraproject.org Tue Mar 3 20:33:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:33:36 +0000 Subject: [pkgdb] vgabios (Fedora, 10) updated by toshio Message-ID: <20090303203335.6464F208550@bastion.fedora.phx.redhat.com> toshio added a Fedora 10 branch for vgabios toshio has set commit to Approved for provenpackager on vgabios (Fedora 10) toshio has set build to Approved for provenpackager on vgabios (Fedora 10) toshio has set checkout to Approved for provenpackager on vgabios (Fedora 10) toshio approved watchbugzilla on vgabios (Fedora 10) for virtmaint toshio approved watchcommits on vgabios (Fedora 10) for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vgabios From tmraz at fedoraproject.org Tue Mar 3 20:33:07 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Tue, 3 Mar 2009 20:33:07 +0000 (UTC) Subject: rpms/libgcrypt/devel libgcrypt-1.4.4-use-fipscheck.patch, NONE, 1.1 libgcrypt.spec, 1.34, 1.35 Message-ID: <20090303203307.A9F1870116@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/libgcrypt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19030 Modified Files: libgcrypt.spec Added Files: libgcrypt-1.4.4-use-fipscheck.patch Log Message: * Tue Mar 3 2009 Tomas Mraz 1.4.4-2 - add hmac FIPS integrity verification check libgcrypt-1.4.4-use-fipscheck.patch: --- NEW FILE libgcrypt-1.4.4-use-fipscheck.patch --- diff -up libgcrypt-1.4.4/src/fips.c.use-fipscheck libgcrypt-1.4.4/src/fips.c --- libgcrypt-1.4.4/src/fips.c.use-fipscheck 2009-03-03 18:10:49.000000000 +0100 +++ libgcrypt-1.4.4/src/fips.c 2009-03-03 18:51:31.000000000 +0100 @@ -570,23 +570,48 @@ run_random_selftests (void) return !!err; } +static int +get_library_path(const char *libname, const char *symbolname, char *path, size_t pathlen) +{ + Dl_info info; + void *dl, *sym; + int rv = -1; + + dl = dlopen(libname, RTLD_LAZY); + if (dl == NULL) { + return -1; + } + + sym = dlsym(dl, symbolname); + + if (sym != NULL && dladdr(sym, &info)) { + strncpy(path, info.dli_fname, pathlen-1); + path[pathlen-1] = '\0'; + rv = 0; + } + + dlclose(dl); + + return rv; +} + /* Run an integrity check on the binary. Returns 0 on success. */ static int check_binary_integrity (void) { #ifdef ENABLE_HMAC_BINARY_CHECK gpg_error_t err; - Dl_info info; + char libpath[4096]; unsigned char digest[32]; int dlen; char *fname = NULL; - const char key[] = "What am I, a doctor or a moonshuttle conductor?"; + const char key[] = "orboDeJITITejsirpADONivirpUkvarP"; - if (!dladdr ("gcry_check_version", &info)) + if (get_library_path ("libgcrypt.so.11", "gcry_check_version", libpath, sizeof(libpath))) err = gpg_error_from_syserror (); else { - dlen = _gcry_hmac256_file (digest, sizeof digest, info.dli_fname, + dlen = _gcry_hmac256_file (digest, sizeof digest, libpath, key, strlen (key)); if (dlen < 0) err = gpg_error_from_syserror (); @@ -594,7 +619,7 @@ check_binary_integrity (void) err = gpg_error (GPG_ERR_INTERNAL); else { - fname = gcry_malloc (strlen (info.dli_fname) + 1 + 5 + 1 ); + fname = gcry_malloc (strlen (libpath) + 1 + 5 + 1 ); if (!fname) err = gpg_error_from_syserror (); else @@ -603,7 +628,7 @@ check_binary_integrity (void) char *p; /* Prefix the basename with a dot. */ - strcpy (fname, info.dli_fname); + strcpy (fname, libpath); p = strrchr (fname, '/'); if (p) p++; Index: libgcrypt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgcrypt/devel/libgcrypt.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- libgcrypt.spec 25 Feb 2009 15:00:17 -0000 1.34 +++ libgcrypt.spec 3 Mar 2009 20:32:37 -0000 1.35 @@ -1,6 +1,6 @@ Name: libgcrypt Version: 1.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Source0: libgcrypt-%{version}-hobbled.tar.bz2 # The original libgcrypt sources now contain potentially patented ECC # cipher support. We have to remove it in the tarball we ship with @@ -10,12 +10,14 @@ Source2: wk at g10code.com Source3: hobble-libgcrypt Patch1: libgcrypt-1.4.4-fips-no-access.patch +Patch2: libgcrypt-1.4.4-use-fipscheck.patch # Technically LGPLv2.1+, but Fedora's table doesn't draw a distinction. License: LGPLv2+ Summary: A general-purpose cryptography library BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gawk, libgpg-error-devel >= 1.4, pkgconfig +BuildRequires: fipscheck Group: System Environment/Libraries %package devel @@ -38,6 +40,7 @@ %setup -q %{SOURCE3} %patch1 -p1 -b .no-access +%patch2 -p1 -b .use-fipscheck %build %configure --disable-static \ @@ -45,12 +48,22 @@ --disable-asm \ %endif --enable-noexecstack \ + --enable-hmac-binary-check \ --enable-pubkey-ciphers='dsa elgamal rsa' make %{?_smp_mflags} %check +fipshmac src/.libs/libgcrypt.so.?? make check +# Add generation of HMAC checksums of the final stripped binaries +%define __spec_install_post \ + %{?__debug_package:%{__debug_install_post}} \ + %{__arch_install_post} \ + %{__os_install_post} \ + fipshmac $RPM_BUILD_ROOT/%{_lib}/*.so.?? \ +%{nil} + %install rm -fr $RPM_BUILD_ROOT %makeinstall @@ -117,8 +130,8 @@ %files %defattr(-,root,root) %dir /etc/gcrypt -/%{_lib}/*.so.* -#%{_libdir}/%{name} +/%{_lib}/libgcrypt.so.* +/%{_lib}/.libgcrypt.so.*.hmac %files devel %defattr(-,root,root) @@ -128,11 +141,13 @@ %{_includedir}/* %{_libdir}/*.so %{_datadir}/aclocal/* -#%{_datadir}/%{name} %{_infodir}/gcrypt.info* %changelog +* Tue Mar 3 2009 Tomas Mraz 1.4.4-3 +- add hmac FIPS integrity verification check + * Wed Feb 25 2009 Fedora Release Engineering - 1.4.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kevin at fedoraproject.org Tue Mar 3 20:33:11 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:33:11 +0000 (UTC) Subject: rpms/abrt Makefile,NONE,1.1 Message-ID: <20090303203311.ED2E270116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/abrt In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19148/rpms/abrt Added Files: Makefile Log Message: Setup of module abrt --- NEW FILE Makefile --- # Top level Makefile for module abrt all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 20:33:12 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:33:12 +0000 (UTC) Subject: rpms/abrt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303203312.3397770117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/abrt/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19148/rpms/abrt/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module abrt --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: abrt # $Id: Makefile,v 1.1 2009/03/03 20:33:12 kevin Exp $ NAME := abrt SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 3 20:34:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:34:49 +0000 Subject: [pkgdb] stardict-dic-cs_CZ was added for psklenar Message-ID: <20090303203510.801802082B2@bastion.fedora.phx.redhat.com> kevin has added Package stardict-dic-cs_CZ with summary Czech dictionaries for StarDict kevin has approved Package stardict-dic-cs_CZ kevin has added a Fedora devel branch for stardict-dic-cs_CZ with an owner of psklenar kevin has approved stardict-dic-cs_CZ in Fedora devel kevin has approved Package stardict-dic-cs_CZ kevin has set commit to Approved for provenpackager on stardict-dic-cs_CZ (Fedora devel) kevin has set build to Approved for provenpackager on stardict-dic-cs_CZ (Fedora devel) kevin has set checkout to Approved for provenpackager on stardict-dic-cs_CZ (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ From pkgdb at fedoraproject.org Tue Mar 3 20:35:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:35:15 +0000 Subject: [pkgdb] stardict-dic-cs_CZ (Fedora, 10) updated by kevin Message-ID: <20090303203515.A9969208545@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for stardict-dic-cs_CZ kevin has set commit to Approved for provenpackager on stardict-dic-cs_CZ (Fedora 10) kevin has set build to Approved for provenpackager on stardict-dic-cs_CZ (Fedora 10) kevin has set checkout to Approved for provenpackager on stardict-dic-cs_CZ (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/stardict-dic-cs_CZ From kevin at fedoraproject.org Tue Mar 3 20:34:54 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:34:54 +0000 (UTC) Subject: rpms/stardict-dic-cs_CZ/devel - New directory Message-ID: <20090303203454.72D2870116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/stardict-dic-cs_CZ/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse19650/rpms/stardict-dic-cs_CZ/devel Log Message: Directory /cvs/pkgs/rpms/stardict-dic-cs_CZ/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 20:34:54 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:34:54 +0000 (UTC) Subject: rpms/stardict-dic-cs_CZ - New directory Message-ID: <20090303203454.2AE8C70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/stardict-dic-cs_CZ In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse19650/rpms/stardict-dic-cs_CZ Log Message: Directory /cvs/pkgs/rpms/stardict-dic-cs_CZ added to the repository From kevin at fedoraproject.org Tue Mar 3 20:35:13 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:35:13 +0000 (UTC) Subject: rpms/stardict-dic-cs_CZ Makefile,NONE,1.1 Message-ID: <20090303203513.D33FD70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/stardict-dic-cs_CZ In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse19650/rpms/stardict-dic-cs_CZ Added Files: Makefile Log Message: Setup of module stardict-dic-cs_CZ --- NEW FILE Makefile --- # Top level Makefile for module stardict-dic-cs_CZ all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 20:35:14 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:35:14 +0000 (UTC) Subject: rpms/stardict-dic-cs_CZ/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303203514.3C25970116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/stardict-dic-cs_CZ/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse19650/rpms/stardict-dic-cs_CZ/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module stardict-dic-cs_CZ --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: stardict-dic-cs_CZ # $Id: Makefile,v 1.1 2009/03/03 20:35:14 kevin Exp $ NAME := stardict-dic-cs_CZ SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From spot at fedoraproject.org Tue Mar 3 20:36:36 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Mar 2009 20:36:36 +0000 (UTC) Subject: rpms/nant/devel nant.spec,1.29,1.30 Message-ID: <20090303203636.097DD70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nant/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20048 Modified Files: nant.spec Log Message: bootstrap again Index: nant.spec =================================================================== RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- nant.spec 2 Mar 2009 23:37:17 -0000 1.29 +++ nant.spec 3 Mar 2009 20:36:05 -0000 1.30 @@ -1,12 +1,12 @@ %global debug_package %{nil} %global monodir %{_libdir} %global mlib %{_lib} -%global bootstrap 0 +%global bootstrap 1 Summary: NAnt is a build tool for Mono and .NET Name: nant Version: 0.85 -Release: 26%{?dist} +Release: 26%{?dist}.1 Epoch: 1 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz Patch0: nant-build.patch @@ -127,6 +127,9 @@ %doc examples/* doc/help/* %changelog +* Mon Mar 2 2009 Tom "spot" Callaway - 1:0.85-26.1 +- bootstrap... again. *sigh* + * Mon Mar 2 2009 Tom "spot" Callaway - 1:0.85-26 - disable bootstrap From spot at fedoraproject.org Tue Mar 3 20:36:58 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Mar 2009 20:36:58 +0000 (UTC) Subject: rpms/mono-nunit22/devel mono-nunit22.spec,1.11,1.12 Message-ID: <20090303203658.046FF70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/mono-nunit22/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20119 Modified Files: mono-nunit22.spec Log Message: fix up spec Index: mono-nunit22.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono-nunit22/devel/mono-nunit22.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mono-nunit22.spec 3 Mar 2009 20:26:04 -0000 1.11 +++ mono-nunit22.spec 3 Mar 2009 20:36:27 -0000 1.12 @@ -2,7 +2,7 @@ Name: mono-nunit22 Version: 2.2.10 -Release: 6%{?dist} +Release: 8%{?dist} Summary: Unit-testing framework for .NET URL: http://www.nunit.org/ License: MIT with acknowledgement @@ -78,6 +78,31 @@ %changelog +* Tue Mar 3 2009 Tom "spot" Callaway - 1:2.2.10-8 +- bump epoch, revert to 2.2.10 (this is the compat package after all) + +* Mon Mar 2 2009 Tom "spot" Callaway - 2.4.8-4 +- add fonts as BR to get this turd building again + +* Wed Feb 25 2009 Fedora Release Engineering - 2.4.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Jan 02 2009 Dennis Gilmore 2.4.8-2 +- exclude sparc64 +- add missing changelog entries + +* Sun Nov 30 2008 Paul F. Johnson 2.4.8-1 +- bump to bring it up to date +- remove nunit22 build patch +- fix new nunit22 key patch +- spec file fix + +* Mon Aug 11 2008 Tom "spot" Callaway 2.2.10-7 +- fix license tag + +* Thu Jun 5 2008 Tom "spot" Callaway 2.2.10-6 +- rebuild for new mono bits + * Tue Apr 22 2008 Tom "spot" Callaway 2.2.10-5 - fix sed invocation From jcollie at fedoraproject.org Tue Mar 3 20:37:01 2009 From: jcollie at fedoraproject.org (Jeffrey C. Ollie) Date: Tue, 3 Mar 2009 20:37:01 +0000 (UTC) Subject: rpms/sofsip-cli/devel .cvsignore, 1.2, 1.3 sofsip-cli.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <20090303203701.0A9A670116@cvs1.fedora.phx.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/sofsip-cli/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20148 Modified Files: .cvsignore sofsip-cli.spec sources Log Message: * Tue Mar 3 2009 Jeffrey C. Ollie - 0.16-1 - Update to 0.16 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sofsip-cli/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Jul 2007 13:43:51 -0000 1.2 +++ .cvsignore 3 Mar 2009 20:36:30 -0000 1.3 @@ -1 +1 @@ -sofsip-cli-0.13.tar.gz +sofsip-cli-0.16.tar.gz Index: sofsip-cli.spec =================================================================== RCS file: /cvs/pkgs/rpms/sofsip-cli/devel/sofsip-cli.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sofsip-cli.spec 26 Feb 2009 01:56:33 -0000 1.7 +++ sofsip-cli.spec 3 Mar 2009 20:36:30 -0000 1.8 @@ -1,6 +1,6 @@ Name: sofsip-cli -Version: 0.13 -Release: 7%{?dist} +Version: 0.16 +Release: 1%{?dist} Summary: SIP VoIP/IM example client Group: Applications/Internet @@ -14,10 +14,8 @@ BuildRequires: sofia-sip-glib-devel >= 1.12.6 BuildRequires: readline-devel BuildRequires: gstreamer-devel -BuildRequires: farsight-devel Requires: gstreamer-plugins-base Requires: gstreamer-plugins-good -Requires: gstreamer-plugins-farsight %description This is a simple SIP VoIP/IM example client demonstrating how to use @@ -27,7 +25,7 @@ %setup -q %build -%configure --enable-farsight +%configure make %{?_smp_mflags} %install @@ -45,6 +43,9 @@ %{_mandir}/man1/sofsip_cli.1* %changelog +* Tue Mar 3 2009 Jeffrey C. Ollie - 0.16-1 +- Update to 0.16 + * Wed Feb 25 2009 Fedora Release Engineering - 0.13-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sofsip-cli/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Jul 2007 13:43:51 -0000 1.2 +++ sources 3 Mar 2009 20:36:30 -0000 1.3 @@ -1 +1 @@ -0742b6b214dd29e9a02761f5957c3b6e sofsip-cli-0.13.tar.gz +e6ca17519772207265019a4dc17d7164 sofsip-cli-0.16.tar.gz From pkgdb at fedoraproject.org Tue Mar 3 20:37:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:37:27 +0000 Subject: [pkgdb] bltk was added for jskala Message-ID: <20090303203802.723BD208546@bastion.fedora.phx.redhat.com> kevin has added Package bltk with summary The Battery Life Tool Kit kevin has approved Package bltk kevin has added a Fedora devel branch for bltk with an owner of jskala kevin has approved bltk in Fedora devel kevin has approved Package bltk kevin has set commit to Approved for provenpackager on bltk (Fedora devel) kevin has set build to Approved for provenpackager on bltk (Fedora devel) kevin has set checkout to Approved for provenpackager on bltk (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bltk From kevin at fedoraproject.org Tue Mar 3 20:37:45 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:37:45 +0000 (UTC) Subject: rpms/bltk - New directory Message-ID: <20090303203745.3BDA370116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/bltk In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp20635/rpms/bltk Log Message: Directory /cvs/pkgs/rpms/bltk added to the repository From kevin at fedoraproject.org Tue Mar 3 20:37:45 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:37:45 +0000 (UTC) Subject: rpms/bltk/devel - New directory Message-ID: <20090303203745.8952F70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/bltk/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp20635/rpms/bltk/devel Log Message: Directory /cvs/pkgs/rpms/bltk/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 20:38:09 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:38:09 +0000 (UTC) Subject: rpms/bltk Makefile,NONE,1.1 Message-ID: <20090303203809.A7E5970116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/bltk In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp20635/rpms/bltk Added Files: Makefile Log Message: Setup of module bltk --- NEW FILE Makefile --- # Top level Makefile for module bltk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 20:38:10 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:38:10 +0000 (UTC) Subject: rpms/bltk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303203810.149E870116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/bltk/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp20635/rpms/bltk/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bltk --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: bltk # $Id: Makefile,v 1.1 2009/03/03 20:38:09 kevin Exp $ NAME := bltk SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From robert at fedoraproject.org Tue Mar 3 20:39:08 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Tue, 3 Mar 2009 20:39:08 +0000 (UTC) Subject: rpms/ifm/devel ifm.spec,1.7,1.8 Message-ID: <20090303203908.B565370116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/ifm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20817 Modified Files: ifm.spec Log Message: Solve the ppc64-redhat-linux-gnu configure target error Index: ifm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ifm/devel/ifm.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ifm.spec 25 Feb 2009 06:52:30 -0000 1.7 +++ ifm.spec 3 Mar 2009 20:38:38 -0000 1.8 @@ -1,6 +1,6 @@ Name: ifm Version: 5.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Interactive Fiction Mapper Group: Amusements/Games @@ -14,6 +14,7 @@ BuildRequires: tk BuildRequires: zlib-devel +BuildRequires: automake %description IFM is a language and a program for keeping track of your progress through @@ -31,6 +32,9 @@ -e 's,/usr/local/doc/ifm/ifm.pdf,%{_docdir}/%{name}-%{version}/ifm.pdf,' \ doc/ifm.1 +# Needed for ppc64, automake can't be run here +cp -f %{_datadir}/automake-*/config.* . + %build %configure @@ -62,6 +66,9 @@ %changelog +* Tue Mar 03 2009 Robert Scheck - 5.1-9 +- Solve the ppc64-redhat-linux-gnu configure target error + * Tue Feb 24 2009 Fedora Release Engineering - 5.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Tue Mar 3 20:40:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:40:18 +0000 Subject: [pkgdb] tigervnc was added for atkac Message-ID: <20090303204040.7E34E208544@bastion.fedora.phx.redhat.com> kevin has added Package tigervnc with summary A TigerVNC remote display system kevin has approved Package tigervnc kevin has added a Fedora devel branch for tigervnc with an owner of atkac kevin has approved tigervnc in Fedora devel kevin has approved Package tigervnc kevin has set commit to Approved for provenpackager on tigervnc (Fedora devel) kevin has set build to Approved for provenpackager on tigervnc (Fedora devel) kevin has set checkout to Approved for provenpackager on tigervnc (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tigervnc From kevin at fedoraproject.org Tue Mar 3 20:40:22 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:40:22 +0000 (UTC) Subject: rpms/tigervnc - New directory Message-ID: <20090303204022.3520A70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tigervnc In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP21322/rpms/tigervnc Log Message: Directory /cvs/pkgs/rpms/tigervnc added to the repository From kevin at fedoraproject.org Tue Mar 3 20:40:22 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:40:22 +0000 (UTC) Subject: rpms/tigervnc/devel - New directory Message-ID: <20090303204022.867AD70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tigervnc/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP21322/rpms/tigervnc/devel Log Message: Directory /cvs/pkgs/rpms/tigervnc/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 20:40:46 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:40:46 +0000 (UTC) Subject: rpms/tigervnc Makefile,NONE,1.1 Message-ID: <20090303204046.8566570116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tigervnc In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP21322/rpms/tigervnc Added Files: Makefile Log Message: Setup of module tigervnc --- NEW FILE Makefile --- # Top level Makefile for module tigervnc all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 20:40:46 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:40:46 +0000 (UTC) Subject: rpms/tigervnc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303204046.E0A4970118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tigervnc/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP21322/rpms/tigervnc/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tigervnc --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: tigervnc # $Id: Makefile,v 1.1 2009/03/03 20:40:46 kevin Exp $ NAME := tigervnc SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 3 20:41:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:41:28 +0000 Subject: [pkgdb] python-polib (Fedora, devel) updated by kevin Message-ID: <20090303204203.4EF05208546@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on python-polib (Fedora devel) for i18n-team kevin approved watchcommits on python-polib (Fedora devel) for i18n-team To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-polib From pkgdb at fedoraproject.org Tue Mar 3 20:41:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:41:38 +0000 Subject: [pkgdb] python-polib was added for ivazquez Message-ID: <20090303204159.BCEB32082B2@bastion.fedora.phx.redhat.com> kevin has added Package python-polib with summary A library to parse and manage gettext catalogs kevin has approved Package python-polib kevin has added a Fedora devel branch for python-polib with an owner of ivazquez kevin has approved python-polib in Fedora devel kevin has approved Package python-polib kevin has set commit to Approved for provenpackager on python-polib (Fedora devel) kevin has set build to Approved for provenpackager on python-polib (Fedora devel) kevin has set checkout to Approved for provenpackager on python-polib (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-polib From pkgdb at fedoraproject.org Tue Mar 3 20:41:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:41:28 +0000 Subject: [pkgdb] python-polib (Fedora, 10) updated by kevin Message-ID: <20090303204204.077A220854B@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for python-polib kevin has set commit to Approved for provenpackager on python-polib (Fedora 10) kevin has set build to Approved for provenpackager on python-polib (Fedora 10) kevin has set checkout to Approved for provenpackager on python-polib (Fedora 10) kevin approved watchbugzilla on python-polib (Fedora 10) for i18n-team kevin approved watchcommits on python-polib (Fedora 10) for i18n-team To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-polib From pkgdb at fedoraproject.org Tue Mar 3 20:41:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:41:28 +0000 Subject: [pkgdb] python-polib (Fedora, 9) updated by kevin Message-ID: <20090303204203.A58A3208548@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for python-polib kevin has set commit to Approved for provenpackager on python-polib (Fedora 9) kevin has set build to Approved for provenpackager on python-polib (Fedora 9) kevin has set checkout to Approved for provenpackager on python-polib (Fedora 9) kevin approved watchbugzilla on python-polib (Fedora 9) for i18n-team kevin approved watchcommits on python-polib (Fedora 9) for i18n-team To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-polib From kevin at fedoraproject.org Tue Mar 3 20:41:42 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:41:42 +0000 (UTC) Subject: rpms/python-polib - New directory Message-ID: <20090303204142.3CE8270116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/python-polib In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst21670/rpms/python-polib Log Message: Directory /cvs/pkgs/rpms/python-polib added to the repository From kevin at fedoraproject.org Tue Mar 3 20:41:42 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:41:42 +0000 (UTC) Subject: rpms/python-polib/devel - New directory Message-ID: <20090303204142.8A33070116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/python-polib/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst21670/rpms/python-polib/devel Log Message: Directory /cvs/pkgs/rpms/python-polib/devel added to the repository From pkgdb at fedoraproject.org Tue Mar 3 20:41:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:41:28 +0000 Subject: [pkgdb] python-polib (Fedora EPEL, 5) updated by kevin Message-ID: <20090303204204.1C8FD20854E@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for python-polib kevin has set commit to Approved for provenpackager on python-polib (Fedora EPEL 5) kevin has set build to Approved for provenpackager on python-polib (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on python-polib (Fedora EPEL 5) kevin approved watchbugzilla on python-polib (Fedora EPEL 5) for i18n-team kevin approved watchcommits on python-polib (Fedora EPEL 5) for i18n-team To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-polib From kevin at fedoraproject.org Tue Mar 3 20:41:59 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:41:59 +0000 (UTC) Subject: rpms/python-polib Makefile,NONE,1.1 Message-ID: <20090303204159.F03C670116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/python-polib In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst21670/rpms/python-polib Added Files: Makefile Log Message: Setup of module python-polib --- NEW FILE Makefile --- # Top level Makefile for module python-polib all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 20:42:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:42:00 +0000 (UTC) Subject: rpms/python-polib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303204200.3896170116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/python-polib/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst21670/rpms/python-polib/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-polib --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: python-polib # $Id: Makefile,v 1.1 2009/03/03 20:42:00 kevin Exp $ NAME := python-polib SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 3 20:42:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:42:59 +0000 Subject: [pkgdb] django-contact-form was added for ivazquez Message-ID: <20090303204259.AAADA208546@bastion.fedora.phx.redhat.com> kevin has added Package django-contact-form with summary An extensible contact-form application for Django kevin has approved Package django-contact-form kevin has added a Fedora devel branch for django-contact-form with an owner of ivazquez kevin has approved django-contact-form in Fedora devel kevin has approved Package django-contact-form kevin has set commit to Approved for provenpackager on django-contact-form (Fedora devel) kevin has set build to Approved for provenpackager on django-contact-form (Fedora devel) kevin has set checkout to Approved for provenpackager on django-contact-form (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form From pkgdb at fedoraproject.org Tue Mar 3 20:42:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:42:26 +0000 Subject: [pkgdb] django-contact-form (Fedora EPEL, 5) updated by kevin Message-ID: <20090303204301.7DE4F20854D@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for django-contact-form kevin has set commit to Approved for provenpackager on django-contact-form (Fedora EPEL 5) kevin has set build to Approved for provenpackager on django-contact-form (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on django-contact-form (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form From pkgdb at fedoraproject.org Tue Mar 3 20:42:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:42:26 +0000 Subject: [pkgdb] django-contact-form (Fedora, 9) updated by kevin Message-ID: <20090303204301.85C05208550@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for django-contact-form kevin has set commit to Approved for provenpackager on django-contact-form (Fedora 9) kevin has set build to Approved for provenpackager on django-contact-form (Fedora 9) kevin has set checkout to Approved for provenpackager on django-contact-form (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form From pkgdb at fedoraproject.org Tue Mar 3 20:42:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:42:26 +0000 Subject: [pkgdb] django-contact-form (Fedora, 10) updated by kevin Message-ID: <20090303204301.B9C3020854E@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for django-contact-form kevin has set commit to Approved for provenpackager on django-contact-form (Fedora 10) kevin has set build to Approved for provenpackager on django-contact-form (Fedora 10) kevin has set checkout to Approved for provenpackager on django-contact-form (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form From kevin at fedoraproject.org Tue Mar 3 20:42:41 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:42:41 +0000 (UTC) Subject: rpms/django-contact-form - New directory Message-ID: <20090303204241.2F2B570116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-contact-form In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL22039/rpms/django-contact-form Log Message: Directory /cvs/pkgs/rpms/django-contact-form added to the repository From kevin at fedoraproject.org Tue Mar 3 20:42:41 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:42:41 +0000 (UTC) Subject: rpms/django-contact-form/devel - New directory Message-ID: <20090303204241.70B9770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-contact-form/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL22039/rpms/django-contact-form/devel Log Message: Directory /cvs/pkgs/rpms/django-contact-form/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 20:42:59 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:42:59 +0000 (UTC) Subject: rpms/django-contact-form Makefile,NONE,1.1 Message-ID: <20090303204259.A1E8970116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-contact-form In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL22039/rpms/django-contact-form Added Files: Makefile Log Message: Setup of module django-contact-form --- NEW FILE Makefile --- # Top level Makefile for module django-contact-form all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 20:43:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:43:00 +0000 (UTC) Subject: rpms/django-contact-form/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303204300.06C0670118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-contact-form/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL22039/rpms/django-contact-form/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module django-contact-form --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: django-contact-form # $Id: Makefile,v 1.1 2009/03/03 20:42:59 kevin Exp $ NAME := django-contact-form SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 3 20:43:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:43:14 +0000 Subject: [pkgdb] django-notification was added for ivazquez Message-ID: <20090303204349.A1D2320854E@bastion.fedora.phx.redhat.com> kevin has added Package django-notification with summary User notification management for the Django web framework kevin has approved Package django-notification kevin has added a Fedora devel branch for django-notification with an owner of ivazquez kevin has approved django-notification in Fedora devel kevin has approved Package django-notification kevin has set commit to Approved for provenpackager on django-notification (Fedora devel) kevin has set build to Approved for provenpackager on django-notification (Fedora devel) kevin has set checkout to Approved for provenpackager on django-notification (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-notification From pkgdb at fedoraproject.org Tue Mar 3 20:43:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:43:30 +0000 Subject: [pkgdb] django-notification (Fedora, 9) updated by kevin Message-ID: <20090303204351.D7DB9208555@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for django-notification kevin has set commit to Approved for provenpackager on django-notification (Fedora 9) kevin has set build to Approved for provenpackager on django-notification (Fedora 9) kevin has set checkout to Approved for provenpackager on django-notification (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-notification From pkgdb at fedoraproject.org Tue Mar 3 20:43:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:43:30 +0000 Subject: [pkgdb] django-notification (Fedora EPEL, 5) updated by kevin Message-ID: <20090303204351.E386A20860B@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for django-notification kevin has set commit to Approved for provenpackager on django-notification (Fedora EPEL 5) kevin has set build to Approved for provenpackager on django-notification (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on django-notification (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-notification From pkgdb at fedoraproject.org Tue Mar 3 20:43:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:43:30 +0000 Subject: [pkgdb] django-notification (Fedora, 10) updated by kevin Message-ID: <20090303204351.EFD4C2086FF@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for django-notification kevin has set commit to Approved for provenpackager on django-notification (Fedora 10) kevin has set build to Approved for provenpackager on django-notification (Fedora 10) kevin has set checkout to Approved for provenpackager on django-notification (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-notification From kevin at fedoraproject.org Tue Mar 3 20:43:33 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:43:33 +0000 (UTC) Subject: rpms/django-notification - New directory Message-ID: <20090303204333.2AF9E70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-notification In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx22401/rpms/django-notification Log Message: Directory /cvs/pkgs/rpms/django-notification added to the repository From kevin at fedoraproject.org Tue Mar 3 20:43:33 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:43:33 +0000 (UTC) Subject: rpms/django-notification/devel - New directory Message-ID: <20090303204333.68C0770117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-notification/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx22401/rpms/django-notification/devel Log Message: Directory /cvs/pkgs/rpms/django-notification/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 20:43:50 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:43:50 +0000 (UTC) Subject: rpms/django-notification Makefile,NONE,1.1 Message-ID: <20090303204350.2369070116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-notification In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx22401/rpms/django-notification Added Files: Makefile Log Message: Setup of module django-notification --- NEW FILE Makefile --- # Top level Makefile for module django-notification all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 20:43:50 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:43:50 +0000 (UTC) Subject: rpms/django-notification/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303204350.6529770117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-notification/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx22401/rpms/django-notification/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module django-notification --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: django-notification # $Id: Makefile,v 1.1 2009/03/03 20:43:50 kevin Exp $ NAME := django-notification SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 3 20:44:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:44:44 +0000 Subject: [pkgdb] django-tagging was added for ivazquez Message-ID: <20090303204443.A2C8B208544@bastion.fedora.phx.redhat.com> kevin has added Package django-tagging with summary A generic tagging application for Django projects kevin has approved Package django-tagging kevin has added a Fedora devel branch for django-tagging with an owner of ivazquez kevin has approved django-tagging in Fedora devel kevin has approved Package django-tagging kevin has set commit to Approved for provenpackager on django-tagging (Fedora devel) kevin has set build to Approved for provenpackager on django-tagging (Fedora devel) kevin has set checkout to Approved for provenpackager on django-tagging (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging From pkgdb at fedoraproject.org Tue Mar 3 20:44:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:44:10 +0000 Subject: [pkgdb] django-tagging (Fedora, 9) updated by kevin Message-ID: <20090303204445.A8DF3208550@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for django-tagging kevin has set commit to Approved for provenpackager on django-tagging (Fedora 9) kevin has set build to Approved for provenpackager on django-tagging (Fedora 9) kevin has set checkout to Approved for provenpackager on django-tagging (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging From pkgdb at fedoraproject.org Tue Mar 3 20:44:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:44:10 +0000 Subject: [pkgdb] django-tagging (Fedora, 10) updated by kevin Message-ID: <20090303204447.2971F208552@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for django-tagging kevin has set commit to Approved for provenpackager on django-tagging (Fedora 10) kevin has set build to Approved for provenpackager on django-tagging (Fedora 10) kevin has set checkout to Approved for provenpackager on django-tagging (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging From pkgdb at fedoraproject.org Tue Mar 3 20:44:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:44:10 +0000 Subject: [pkgdb] django-tagging (Fedora EPEL, 5) updated by kevin Message-ID: <20090303204447.B3111208555@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for django-tagging kevin has set commit to Approved for provenpackager on django-tagging (Fedora EPEL 5) kevin has set build to Approved for provenpackager on django-tagging (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on django-tagging (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging From kevin at fedoraproject.org Tue Mar 3 20:44:22 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:44:22 +0000 (UTC) Subject: rpms/django-tagging - New directory Message-ID: <20090303204422.27BB870116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-tagging In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV22733/rpms/django-tagging Log Message: Directory /cvs/pkgs/rpms/django-tagging added to the repository From kevin at fedoraproject.org Tue Mar 3 20:44:22 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:44:22 +0000 (UTC) Subject: rpms/django-tagging/devel - New directory Message-ID: <20090303204422.629CE70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-tagging/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV22733/rpms/django-tagging/devel Log Message: Directory /cvs/pkgs/rpms/django-tagging/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 20:44:39 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:44:39 +0000 (UTC) Subject: rpms/django-tagging Makefile,NONE,1.1 Message-ID: <20090303204439.8F70F70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-tagging In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV22733/rpms/django-tagging Added Files: Makefile Log Message: Setup of module django-tagging --- NEW FILE Makefile --- # Top level Makefile for module django-tagging all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 20:44:39 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:44:39 +0000 (UTC) Subject: rpms/django-tagging/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303204439.DDE6D70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-tagging/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV22733/rpms/django-tagging/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module django-tagging --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: django-tagging # $Id: Makefile,v 1.1 2009/03/03 20:44:39 kevin Exp $ NAME := django-tagging SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 3 20:45:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:45:14 +0000 Subject: [pkgdb] ibus-rawcode was added for pravins Message-ID: <20090303204552.F2FD0208551@bastion.fedora.phx.redhat.com> kevin has added Package ibus-rawcode with summary The Rawcode input engine for IBus platform kevin has approved Package ibus-rawcode kevin has added a Fedora devel branch for ibus-rawcode with an owner of pravins kevin has approved ibus-rawcode in Fedora devel kevin has approved Package ibus-rawcode kevin has set commit to Approved for provenpackager on ibus-rawcode (Fedora devel) kevin has set build to Approved for provenpackager on ibus-rawcode (Fedora devel) kevin has set checkout to Approved for provenpackager on ibus-rawcode (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ibus-rawcode From kevin at fedoraproject.org Tue Mar 3 20:45:30 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:45:30 +0000 (UTC) Subject: rpms/ibus-rawcode - New directory Message-ID: <20090303204530.2E5CF70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ibus-rawcode In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23179/rpms/ibus-rawcode Log Message: Directory /cvs/pkgs/rpms/ibus-rawcode added to the repository From kevin at fedoraproject.org Tue Mar 3 20:45:30 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:45:30 +0000 (UTC) Subject: rpms/ibus-rawcode/devel - New directory Message-ID: <20090303204530.6EF7E70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ibus-rawcode/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23179/rpms/ibus-rawcode/devel Log Message: Directory /cvs/pkgs/rpms/ibus-rawcode/devel added to the repository From kevin at fedoraproject.org Tue Mar 3 20:45:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:45:47 +0000 (UTC) Subject: rpms/ibus-rawcode Makefile,NONE,1.1 Message-ID: <20090303204547.E165770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ibus-rawcode In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23179/rpms/ibus-rawcode Added Files: Makefile Log Message: Setup of module ibus-rawcode --- NEW FILE Makefile --- # Top level Makefile for module ibus-rawcode all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 3 20:45:48 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Mar 2009 20:45:48 +0000 (UTC) Subject: rpms/ibus-rawcode/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090303204548.2E2D470116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ibus-rawcode/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23179/rpms/ibus-rawcode/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ibus-rawcode --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ibus-rawcode # $Id: Makefile,v 1.1 2009/03/03 20:45:48 kevin Exp $ NAME := ibus-rawcode SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 3 20:47:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:47:23 +0000 Subject: [pkgdb] gajim (Fedora EPEL, 4) updated by kevin Message-ID: <20090303204745.8BF57208602@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for gajim kevin has set commit to Approved for provenpackager on gajim (Fedora EPEL 4) kevin has set build to Approved for provenpackager on gajim (Fedora EPEL 4) kevin has set checkout to Approved for provenpackager on gajim (Fedora EPEL 4) kevin changed owner of gajim in Fedora EPEL 4 to michich kevin approved watchbugzilla on gajim (Fedora EPEL 4) for rishi kevin approved watchcommits on gajim (Fedora EPEL 4) for rishi To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gajim From pkgdb at fedoraproject.org Tue Mar 3 20:47:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:47:24 +0000 Subject: [pkgdb] gajim (Fedora EPEL, 5) updated by kevin Message-ID: <20090303204748.DAF9220854C@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for gajim kevin has set commit to Approved for provenpackager on gajim (Fedora EPEL 5) kevin has set build to Approved for provenpackager on gajim (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on gajim (Fedora EPEL 5) kevin changed owner of gajim in Fedora EPEL 5 to michich kevin approved watchbugzilla on gajim (Fedora EPEL 5) for rishi kevin approved watchcommits on gajim (Fedora EPEL 5) for rishi To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gajim From pkgdb at fedoraproject.org Tue Mar 3 20:48:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:48:33 +0000 Subject: [pkgdb] couchdb (Fedora EPEL, 5) updated by kevin Message-ID: <20090303204854.87E7F208544@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for couchdb kevin has set commit to Approved for provenpackager on couchdb (Fedora EPEL 5) kevin has set build to Approved for provenpackager on couchdb (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on couchdb (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/couchdb From ksebasti at fedoraproject.org Tue Mar 3 20:48:50 2009 From: ksebasti at fedoraproject.org (Kent Sebastian) Date: Tue, 3 Mar 2009 20:48:50 +0000 (UTC) Subject: rpms/eclipse-oprofile/devel .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <20090303204850.5852B70116@cvs1.fedora.phx.redhat.com> Author: ksebasti Update of /cvs/pkgs/rpms/eclipse-oprofile/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23779 Modified Files: .cvsignore sources Log Message: * Thu Feb 12 2009 Kent Sebastian 0.1.0-1 - Initial packaging. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-oprofile/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2009 23:44:57 -0000 1.1 +++ .cvsignore 3 Mar 2009 20:48:19 -0000 1.2 @@ -0,0 +1,2 @@ +eclipse-oprofile-fetched-src-0.1.0.tar.bz2 +eclipse-oprofile-fetch-src.sh From pkgdb at fedoraproject.org Tue Mar 3 20:49:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:49:05 +0000 Subject: [pkgdb] fence-agents (Fedora, 10) updated by kevin Message-ID: <20090303204940.6A0E0208543@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for fence-agents kevin has set commit to Approved for provenpackager on fence-agents (Fedora 10) kevin has set build to Approved for provenpackager on fence-agents (Fedora 10) kevin has set checkout to Approved for provenpackager on fence-agents (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/fence-agents From spot at fedoraproject.org Tue Mar 3 20:49:19 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Mar 2009 20:49:19 +0000 (UTC) Subject: rpms/nant/devel nant.spec,1.30,1.31 Message-ID: <20090303204919.1AC4070116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nant/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24011 Modified Files: nant.spec Log Message: bootstrap again again Index: nant.spec =================================================================== RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- nant.spec 3 Mar 2009 20:36:05 -0000 1.30 +++ nant.spec 3 Mar 2009 20:48:48 -0000 1.31 @@ -6,7 +6,7 @@ Summary: NAnt is a build tool for Mono and .NET Name: nant Version: 0.85 -Release: 26%{?dist}.1 +Release: 26%{?dist}.2 Epoch: 1 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz Patch0: nant-build.patch @@ -18,8 +18,13 @@ Group: Development/Tools Url: http://nant.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: mono-devel, log4net, mono-nunit, mono-nunit22-devel +BuildRequires: mono-devel +%if 0%{bootstrap} +# Nothing here if we're bootstrapping +%else +BuildRequires: log4net, mono-nunit, mono-nunit22-devel BuildRequires: mono-ndoc-devel, mono-sharpcvslib-devel +%endif Requires(post): scrollkeeper Requires(postun): scrollkeeper ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc sparcv9 alpha @@ -127,6 +132,9 @@ %doc examples/* doc/help/* %changelog +* Mon Mar 2 2009 Tom "spot" Callaway - 1:0.85-26.2 +- fix BR to be wrapped by bootstrap + * Mon Mar 2 2009 Tom "spot" Callaway - 1:0.85-26.1 - bootstrap... again. *sigh* From ksebasti at fedoraproject.org Tue Mar 3 20:49:16 2009 From: ksebasti at fedoraproject.org (Kent Sebastian) Date: Tue, 3 Mar 2009 20:49:16 +0000 (UTC) Subject: rpms/eclipse-oprofile/devel eclipse-oprofile.spec,NONE,1.1 Message-ID: <20090303204916.297D870116@cvs1.fedora.phx.redhat.com> Author: ksebasti Update of /cvs/pkgs/rpms/eclipse-oprofile/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24160 Added Files: eclipse-oprofile.spec Log Message: * Thu Feb 12 2009 Kent Sebastian 0.1.0-1 - Initial packaging. --- NEW FILE eclipse-oprofile.spec --- %define src_repo_tag 0.1.0 %define eclipse_base %{_libdir}/eclipse %define install_loc %{_libdir}/eclipse/dropins/oprofile %define qualifier 200901141551 %define ver_qual %{src_repo_tag}.%{qualifier} # All arches line up between Eclipse and Linux kernel names except i386 -> x86 %ifarch %{ix86} %define eclipse_arch x86 %else %define eclipse_arch %{_arch} %endif Name: eclipse-oprofile Version: 0.1.0 Release: 1%{?dist} Summary: Eclipse plugin for OProfile integration Group: Development/Tools License: EPL URL: http://www.eclipse.org/linuxtools/projectPages/oprofile/ ## sh %{name}-fetch-src.sh Source0: %{name}-fetched-src-%{src_repo_tag}.tar.bz2 Source1: %{name}-fetch-src.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc ppc64 BuildRequires: eclipse-pde >= 1:3.4.0 BuildRequires: eclipse-cdt >= 5.0.1 BuildRequires: eclipse-linuxprofilingframework >= 0.1.0 BuildRequires: oprofile >= 0.9.3 BuildRequires: oprofile-devel >= 0.9.3 BuildRequires: binutils-devel >= 2.18.50.0.6 Requires: eclipse-platform >= 3.4.0 Requires: eclipse-cdt >= 5.0.1 Requires: eclipse-linuxprofilingframework >= 0.1.0 Requires: oprofile >= 0.9.3 Requires: usermode >= 1.98 %description Eclipse plugins to integrate OProfile's profiling capabilities with the CDT. %prep %setup -q -c #remove binaries rm -f org.eclipse.linuxtools.oprofile.core.linux.*/os/linux/*/opxml %build #build binaries cd org.eclipse.linuxtools.oprofile.core/natives/linux/opxml make "CFLAGS=$RPM_OPT_FLAGS" mv opxml \ %{_builddir}/%{name}-%{version}/org.eclipse.linuxtools.oprofile.core.linux.%{eclipse_arch}/os/linux/%{eclipse_arch} cd %{_builddir}/%{name}-%{version} %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.linuxtools.oprofile.feature \ -d "cdt linuxprofilingframework" \ -a "-DjavacSource=1.5 -DjavacTarget=1.5" %install %{__rm} -rf %{buildroot} install -d -m 755 %{buildroot}%{install_loc} %{__unzip} -q -d %{buildroot}%{install_loc} \ build/rpmBuild/org.eclipse.linuxtools.oprofile.feature.zip ### install.sh stuff ### %define corepath %{buildroot}%{install_loc}/eclipse/plugins/org.eclipse.linuxtools.oprofile.core_%{ver_qual} #create opcontrol wrapper ln -s ../../../../../../../../../../../usr/bin/consolehelper \ %{corepath}/natives/linux/scripts/opcontrol #install opcontrol wrapper permission files install -d -m 755 %{buildroot}%{_sysconfdir}/security/console.apps install -D -m 644 \ org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/opcontrol-wrapper.security \ %{buildroot}%{_sysconfdir}/security/console.apps/opcontrol install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d install -D -m 644 \ org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/opcontrol-wrapper.pamd \ %{buildroot}%{_sysconfdir}/pam.d/opcontrol #remove install/uninstall script (used in update site only) rm -f %{corepath}/natives/linux/scripts/install.sh rm -f %{corepath}/natives/linux/scripts/uninstall.sh #remove opxml source (rpmlint warnings) rm -rf %{corepath}/natives/linux/opxml rm -f %{corepath}/natives/linux/scripts/.svnignore #+x opxml chmod +x \ %{buildroot}%{install_loc}/eclipse/plugins/org.eclipse.linuxtools.oprofile.core.linux.%{eclipse_arch}_%{ver_qual}/os/linux/%{eclipse_arch}/opxml %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %{install_loc} %doc org.eclipse.linuxtools.oprofile-feature/epl-v10.html %{_sysconfdir}/security/console.apps/opcontrol %{_sysconfdir}/pam.d/opcontrol %changelog * Thu Feb 12 2009 Kent Sebastian 0.1.0-1 - Initial packaging. From pkgdb at fedoraproject.org Tue Mar 3 20:50:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:50:17 +0000 Subject: [pkgdb] wordpress-mu (Fedora EPEL, 5) updated by kevin Message-ID: <20090303205017.09FB9208201@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for wordpress-mu kevin has set commit to Approved for provenpackager on wordpress-mu (Fedora EPEL 5) kevin has set build to Approved for provenpackager on wordpress-mu (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on wordpress-mu (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wordpress-mu From erikos at fedoraproject.org Tue Mar 3 20:50:34 2009 From: erikos at fedoraproject.org (Simon Schampijer) Date: Tue, 3 Mar 2009 20:50:34 +0000 (UTC) Subject: rpms/sugar/devel .cvsignore, 1.30, 1.31 sources, 1.32, 1.33 sugar.spec, 1.53, 1.54 Message-ID: <20090303205034.6672670116@cvs1.fedora.phx.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24447 Modified Files: .cvsignore sources sugar.spec Log Message: * Tue Mar 03 2009 Simon Schampijer - 0.84.0-1 - Focus rectangle corners should be rounded #406 - Restore minimal .xol support #459 - Check the activity version and replace an older version upon download #464 - Friendstray: icon reacting to right click #441 - Network device icons don't react on right click #463 - Don't open a launcher window when that activity is already running #426 - Fall back to application-octet-stream for unknown types #458 - Show a generic icon for clippings, if available #454 - Don't add_bundle on activity dir change when installed already #442 - Make mute sound code togglable - Keyhandler: Map XF86Search to the journal search - Keyhandler: Catch all exceptions (thanks to Sascha Silbe) - Give time for exit to execute when closing the emulator #435 - Dont hardcode the maximum amount of entries to cache in the journal #72 - Add standard Print shortcut to take a screenshot - Use keyboard specific keys to set the volume #430 - Update to new DBus policy #307 - Fix palette appearance on right-click #403 - Switch to existing instance of an activity if it's already running #410 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 27 Feb 2009 16:54:11 -0000 1.30 +++ .cvsignore 3 Mar 2009 20:50:04 -0000 1.31 @@ -1 +1 @@ -sugar-0.83.8-gitae381ce5b6.tar.bz2 +sugar-0.84.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 27 Feb 2009 16:54:11 -0000 1.32 +++ sources 3 Mar 2009 20:50:04 -0000 1.33 @@ -1 +1 @@ -d0c9e19cc32d3b1a1affb09f7f7863d5 sugar-0.83.8-gitae381ce5b6.tar.bz2 +62cb5a96b6532ce8a24c60bd6be98474 sugar-0.84.0.tar.bz2 Index: sugar.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sugar.spec 27 Feb 2009 16:54:11 -0000 1.53 +++ sugar.spec 3 Mar 2009 20:50:04 -0000 1.54 @@ -5,15 +5,15 @@ Summary: Constructionist learning platform Name: sugar -Version: 0.83.8 -#Release: 2%{?dist} -Release: 3.%{alphatag}%{?dist} +Version: 0.84.0 +Release: 1%{?dist} +#Release: 3.%{alphatag}%{?dist} URL: http://sugarlabs.org/ # git clone git://dev.laptop.org/sugar # cd sugar # git-checkout %{commitid} -Source0: %{name}-%{version}-git%{commitid}.tar.bz2 -#Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 +#Source0: %{name}-%{version}-git%{commitid}.tar.bz2 +Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 License: GPLv2+ Group: User Interface/Desktops Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -140,6 +140,27 @@ %{_bindir}/sugar-emulator %changelog +* Tue Mar 03 2009 Simon Schampijer - 0.84.0-1 +- Focus rectangle corners should be rounded #406 +- Restore minimal .xol support #459 +- Check the activity version and replace an older version upon download #464 +- Friendstray: icon reacting to right click #441 +- Network device icons don't react on right click #463 +- Don't open a launcher window when that activity is already running #426 +- Fall back to application-octet-stream for unknown types #458 +- Show a generic icon for clippings, if available #454 +- Don't add_bundle on activity dir change when installed already #442 +- Make mute sound code togglable +- Keyhandler: Map XF86Search to the journal search +- Keyhandler: Catch all exceptions (thanks to Sascha Silbe) +- Give time for exit to execute when closing the emulator #435 +- Dont hardcode the maximum amount of entries to cache in the journal #72 +- Add standard Print shortcut to take a screenshot +- Use keyboard specific keys to set the volume #430 +- Update to new DBus policy #307 +- Fix palette appearance on right-click #403 +- Switch to existing instance of an activity if it's already running #410 + * Fri Feb 27 2009 Simon Schampijer - 0.83.8-3.20090227gitae381ce5b6 - git snapshot - Don't add_bundle on activity dir change when installed already #442 From cebbert at fedoraproject.org Tue Mar 3 20:51:14 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Tue, 3 Mar 2009 20:51:14 +0000 (UTC) Subject: rpms/kerneloops/devel kerneloops.spec,1.15,1.16 Message-ID: <20090303205114.AF89E70116@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kerneloops/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24615 Modified Files: kerneloops.spec Log Message: * Tue Mar 03 2009 Bill Nottingham 0.12-3 system-activate the service, don't use an initscript Index: kerneloops.spec =================================================================== RCS file: /cvs/pkgs/rpms/kerneloops/devel/kerneloops.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- kerneloops.spec 25 Feb 2009 11:04:33 -0000 1.15 +++ kerneloops.spec 3 Mar 2009 20:50:44 -0000 1.16 @@ -1,13 +1,14 @@ Name: kerneloops Version: 0.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool to automatically collect and submit kernel crash signatures Group: System Environment/Base License: GPLv2 URL: http://www.kerneloops.org Source0: http://www.kerneloops.org/download/%{name}-%{version}.tar.gz - +Source1: kerneloops.service +Patch: kerneloops-0.12-dbus-service-activate.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: curl-devel @@ -27,6 +28,7 @@ %prep %setup -q +%patch -p1 %build make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -37,8 +39,9 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -mkdir -m 0755 -p $RPM_BUILD_ROOT%{_initrddir} -install -p -m 0755 kerneloops.init $RPM_BUILD_ROOT%{_initrddir}/%{name} +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/dbus-1/system-services +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/dbus-1/system-services/org.kerneloops.submit.service + %find_lang %{name} %clean @@ -59,14 +62,17 @@ %doc COPYING Changelog %{_sbindir}/%{name} %config(noreplace) %{_sysconfdir}/kerneloops.conf -%{_initrddir}/%{name} %{_sysconfdir}/dbus-1/system.d/kerneloops.dbus %{_sysconfdir}/xdg/autostart/kerneloops-applet.desktop %{_datadir}/kerneloops/ +%{_datadir}/dbus-1/system-services/*.service %{_bindir}/kerneloops-applet %doc %{_mandir}/man8/kerneloops.8.gz %changelog +* Tue Mar 03 2009 Bill Nottingham 0.12-3 +- system-activate the service, don't use an initscript + * Wed Feb 25 2009 Fedora Release Engineering - 0.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Tue Mar 3 20:51:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 20:51:34 +0000 Subject: [pkgdb] resource-agents (Fedora, 10) updated by kevin Message-ID: <20090303205209.B4A90208543@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for resource-agents kevin has set commit to Approved for provenpackager on resource-agents (Fedora 10) kevin has set build to Approved for provenpackager on resource-agents (Fedora 10) kevin has set checkout to Approved for provenpackager on resource-agents (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/resource-agents From cebbert at fedoraproject.org Tue Mar 3 20:51:50 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Tue, 3 Mar 2009 20:51:50 +0000 (UTC) Subject: rpms/kerneloops/devel kerneloops-0.12-dbus-service-activate.patch, NONE, 1.1 kerneloops.service, NONE, 1.1 Message-ID: <20090303205150.3F87F70116@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kerneloops/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24997 Added Files: kerneloops-0.12-dbus-service-activate.patch kerneloops.service Log Message: add missing files kerneloops-0.12-dbus-service-activate.patch: --- NEW FILE kerneloops-0.12-dbus-service-activate.patch --- diff -up kerneloops-0.12/kerneloops-applet.c.old kerneloops-0.12/kerneloops-applet.c --- kerneloops-0.12/kerneloops-applet.c.old 2009-01-11 11:26:51.000000000 -0500 +++ kerneloops-0.12/kerneloops-applet.c 2009-01-11 12:08:49.000000000 -0500 @@ -440,6 +440,7 @@ static void read_config(void) int main(int argc, char *argv[]) { DBusError error; + u_int32_t result; /* Initialize translation stuff */ setlocale(LC_ALL, ""); @@ -478,6 +479,10 @@ int main(int argc, char *argv[]) /* by default, don't show our icon */ gtk_status_icon_set_visible(statusicon, FALSE); + /* start the service */ + if (dbus_bus_start_service_by_name(bus, "org.kerneloops.submit", 0, &result, &error) == FALSE) { + dbus_error_init(&error); + } /* set the dbus message to listen for */ dbus_bus_add_match(bus, "type='signal',interface='org.kerneloops.submit.permission'", &error); dbus_bus_add_match(bus, "type='signal',interface='org.kerneloops.submit.sent'", &error); --- NEW FILE kerneloops.service --- [D-BUS Service] Name=org.kerneloops.submit Exec=/usr/sbin/kerneloops --nodaemon User=root From erikos at fedoraproject.org Tue Mar 3 20:58:25 2009 From: erikos at fedoraproject.org (Simon Schampijer) Date: Tue, 3 Mar 2009 20:58:25 +0000 (UTC) Subject: rpms/sugar-toolkit/devel .cvsignore, 1.27, 1.28 sources, 1.31, 1.32 sugar-toolkit.spec, 1.41, 1.42 Message-ID: <20090303205825.0B14C70116@cvs1.fedora.phx.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-toolkit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27066 Modified Files: .cvsignore sources sugar-toolkit.spec Log Message: * Tue Mar 03 2009 Simon Schampijer - 0.84.0-1 - Catch all exceptions while saving #224 - Listen for map in Window instead of in Canvas (alsroot) #428 - Restore minimal .xol support #459 - Use the same font size independent from scaling - Don't recursively clean an activity if it's a symbolic link #444 - Add extension to temp icon file names #458 - Process .py files in subdirectories './setup genplot' #391 (alsroot) - Improve error handling of calls to XGrabKey #431 - Cleanup temp files at exit #435 - Let activities provide their own implementation of get_preview() #152 - Show/Hide the color palette correctly (#374) - Support setting None as the secondary text #384 - Only display one line in the secondary text of a clipping palette #384 - Switch to existing instance of an activity if it's already running #410 - Reveal the palette on right click on an activity icon #409 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 27 Feb 2009 16:30:47 -0000 1.27 +++ .cvsignore 3 Mar 2009 20:57:54 -0000 1.28 @@ -1 +1 @@ -sugar-toolkit-0.83.7-git6f210f0e33.tar.bz2 +sugar-toolkit-0.84.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 27 Feb 2009 16:30:47 -0000 1.31 +++ sources 3 Mar 2009 20:57:54 -0000 1.32 @@ -1 +1 @@ -4468005264f888af38455b433a225243 sugar-toolkit-0.83.7-git6f210f0e33.tar.bz2 +6458b160133afb7f8c453ae9f9205912 sugar-toolkit-0.84.0.tar.bz2 Index: sugar-toolkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sugar-toolkit.spec 27 Feb 2009 16:30:47 -0000 1.41 +++ sugar-toolkit.spec 3 Mar 2009 20:57:54 -0000 1.42 @@ -5,15 +5,15 @@ Summary: Sugar toolkit Name: sugar-toolkit -Version: 0.83.7 -#Release: 1%{?dist} -Release: 3.%{alphatag}%{?dist} +Version: 0.84.0 +Release: 1%{?dist} +#Release: 4.%{alphatag}%{?dist} URL: http://wiki.laptop.org/go/Sugar # git clone git://dev.laptop.org/sugar # cd sugar # git-checkout %{commitid} -Source0: %{name}-%{version}-git%{commitid}.tar.bz2 -#Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 +#Source0: %{name}-%{version}-git%{commitid}.tar.bz2 +Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 Source1: macros.sugar License: LGPLv2 Group: System Environment/Libraries @@ -69,6 +69,23 @@ %{_sysconfdir}/rpm/macros.sugar %changelog +* Tue Mar 03 2009 Simon Schampijer - 0.84.0-1 +- Catch all exceptions while saving #224 +- Listen for map in Window instead of in Canvas (alsroot) #428 +- Restore minimal .xol support #459 +- Use the same font size independent from scaling +- Don't recursively clean an activity if it's a symbolic link #444 +- Add extension to temp icon file names #458 +- Process .py files in subdirectories './setup genplot' #391 (alsroot) +- Improve error handling of calls to XGrabKey #431 +- Cleanup temp files at exit #435 +- Let activities provide their own implementation of get_preview() #152 +- Show/Hide the color palette correctly (#374) +- Support setting None as the secondary text #384 +- Only display one line in the secondary text of a clipping palette #384 +- Switch to existing instance of an activity if it's already running #410 +- Reveal the palette on right click on an activity icon #409 + * Fri Feb 27 2009 Simon Schampijer - 0.83.7-3.20090227git6f210f0e33 - git snapshot - Process .py files in subdirectories './setup genplot' #391 (alsroot) From mjg59 at fedoraproject.org Tue Mar 3 21:00:42 2009 From: mjg59 at fedoraproject.org (Matthew Garrett) Date: Tue, 3 Mar 2009 21:00:42 +0000 (UTC) Subject: rpms/kernel/devel drm-radeon-pm.patch, NONE, 1.1 kernel.spec, 1.1369, 1.1370 Message-ID: <20090303210042.1832A70116@cvs1.fedora.phx.redhat.com> Author: mjg59 Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27617 Modified Files: kernel.spec Added Files: drm-radeon-pm.patch Log Message: * Tue Mar 03 2009 Matthew Garrett - Add dynamic power management for later r500-based Radeons drm-radeon-pm.patch: --- NEW FILE drm-radeon-pm.patch --- diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/atombios_crtc.c.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/atombios_crtc.c --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/atombios_crtc.c.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/atombios_crtc.c 2009-03-03 20:53:05.000000000 +0000 @@ -441,14 +441,23 @@ static bool atombios_crtc_mode_fixup(str static void atombios_crtc_prepare(struct drm_crtc *crtc) { + struct drm_device *dev = crtc->dev; + struct drm_radeon_private *dev_priv = dev->dev_private; + + mutex_lock(&dev_priv->mode_info.power.pll_mutex); + atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); atombios_lock_crtc(crtc, 1); } static void atombios_crtc_commit(struct drm_crtc *crtc) { + struct drm_device *dev = crtc->dev; + struct drm_radeon_private *dev_priv = dev->dev_private; + atombios_crtc_dpms(crtc, DRM_MODE_DPMS_ON); atombios_lock_crtc(crtc, 0); + mutex_unlock(&dev_priv->mode_info.power.pll_mutex); } static const struct drm_crtc_helper_funcs atombios_helper_funcs = { diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_atombios.c.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_atombios.c --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_atombios.c.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_atombios.c 2009-03-03 20:53:05.000000000 +0000 @@ -620,6 +620,34 @@ void radeon_atom_static_pwrmgt_setup(str atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args); } +void radeon_atom_get_mc_arb_info(struct drm_device *dev) +{ + struct drm_radeon_private *dev_priv = dev->dev_private; + struct radeon_mode_info *mode_info = &dev_priv->mode_info; + struct atom_context *ctx = mode_info->atom_context; + int index = GetIndexIntoMasterTable(DATA, MC_InitParameter); + uint8_t frev, crev; + uint16_t size, data_offset; + + atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); + dev_priv->mode_info.power.mc_arb_init_values = + kmalloc(size*sizeof(int), GFP_KERNEL); + memcpy(dev_priv->mode_info.power.mc_arb_init_values, + ctx->bios + data_offset, size * sizeof(int)); +} + +void radeon_atom_get_engine_clock(struct drm_device *dev, int *engine_clock) +{ + struct drm_radeon_private *dev_priv = dev->dev_private; + struct radeon_mode_info *mode_info = &dev_priv->mode_info; + struct atom_context *ctx = mode_info->atom_context; + GET_ENGINE_CLOCK_PS_ALLOCATION args; + int index = GetIndexIntoMasterTable(COMMAND, GetEngineClock); + + atom_execute_table(ctx, index, (uint32_t *)&args); + *engine_clock = args.ulReturnEngineClock; +} + void radeon_atom_set_engine_clock(struct drm_device *dev, int eng_clock) { struct drm_radeon_private *dev_priv = dev->dev_private; @@ -633,6 +661,18 @@ void radeon_atom_set_engine_clock(struct atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args); } +void radeon_atom_get_memory_clock(struct drm_device *dev, int *mem_clock) +{ + struct drm_radeon_private *dev_priv = dev->dev_private; + struct radeon_mode_info *mode_info = &dev_priv->mode_info; + struct atom_context *ctx = mode_info->atom_context; + GET_MEMORY_CLOCK_PS_ALLOCATION args; + int index = GetIndexIntoMasterTable(COMMAND, GetMemoryClock); + + atom_execute_table(ctx, index, (uint32_t *)&args); + *mem_clock = args.ulReturnMemoryClock; +} + void radeon_atom_set_memory_clock(struct drm_device *dev, int mem_clock) { struct drm_radeon_private *dev_priv = dev->dev_private; @@ -646,6 +686,16 @@ void radeon_atom_set_memory_clock(struct atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args); } +void radeon_atom_initialize_memory_controller(struct drm_device *dev) +{ + struct drm_radeon_private *dev_priv = dev->dev_private; + struct atom_context *ctx = dev_priv->mode_info.atom_context; + int index = GetIndexIntoMasterTable(COMMAND, MemoryDeviceInit); + MEMORY_PLLINIT_PS_ALLOCATION args; + + atom_execute_table(ctx, index, (uint32_t *)&args); +} + void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev) { struct drm_radeon_private *dev_priv = dev->dev_private; diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cp.c.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cp.c --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cp.c.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cp.c 2009-03-03 20:53:05.000000000 +0000 @@ -3223,6 +3223,8 @@ int radeon_driver_load(struct drm_device if (ret) goto modeset_fail; + mutex_init(&dev_priv->mode_info.power.pll_mutex); + radeon_modeset_init(dev); radeon_modeset_cp_init(dev); @@ -3231,7 +3233,7 @@ int radeon_driver_load(struct drm_device drm_irq_install(dev); } - + radeon_pm_init(dev); return ret; modeset_fail: dev->driver->driver_features &= ~DRIVER_MODESET; @@ -3303,6 +3305,8 @@ int radeon_driver_unload(struct drm_devi { drm_radeon_private_t *dev_priv = dev->dev_private; + radeon_pm_exit(dev); + if (drm_core_check_feature(dev, DRIVER_MODESET)) { drm_irq_uninstall(dev); radeon_modeset_cleanup(dev); diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cs.c.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cs.c --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cs.c.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cs.c 2009-03-03 20:53:05.000000000 +0000 @@ -41,6 +41,8 @@ int radeon_cs_ioctl(struct drm_device *d long size; int r, i; + radeon_pm_timer_reset(dev); + mutex_lock(&dev_priv->cs.cs_mutex); /* set command stream id to 0 which is fake id */ cs_id = 0; diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_drv.h.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_drv.h --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_drv.h.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_drv.h 2009-03-03 20:53:05.000000000 +0000 @@ -612,6 +612,9 @@ extern int radeon_modeset_cp_resume(stru /* radeon_pm.c */ int radeon_suspend(struct drm_device *dev, pm_message_t state); int radeon_resume(struct drm_device *dev); +void radeon_pm_init(struct drm_device *dev); +void radeon_pm_exit(struct drm_device *dev); +void radeon_pm_timer_reset(struct drm_device *dev); /* Flags for stats.boxes */ diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_irq.c.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_irq.c --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_irq.c.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_irq.c 2009-03-03 20:53:05.000000000 +0000 @@ -185,8 +185,10 @@ irqreturn_t radeon_driver_irq_handler(DR struct drm_device *dev = (struct drm_device *) arg; drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; + struct radeon_powermanagement_info *power = &dev_priv->mode_info.power; u32 stat; u32 r500_disp_int; + unsigned long flags; /* Only consider the bits we're interested in - others could be used * outside the DRM @@ -206,15 +208,47 @@ irqreturn_t radeon_driver_irq_handler(DR /* VBLANK interrupt */ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) { - if (r500_disp_int & R500_D1_VBLANK_INTERRUPT) + if (r500_disp_int & R500_D1_VBLANK_INTERRUPT) { + spin_lock_irqsave(&power->power_lock, flags); + if (power->reclock_head & 1) { + power->reclock_head &= ~1; + schedule_work(&power->reclock_work); + drm_vblank_put(dev, 0); + } + spin_unlock_irqrestore(&power->power_lock, flags); drm_handle_vblank(dev, 0); - if (r500_disp_int & R500_D2_VBLANK_INTERRUPT) + } + if (r500_disp_int & R500_D2_VBLANK_INTERRUPT) { + spin_lock_irqsave(&power->power_lock, flags); + if (power->reclock_head & 2) { + power->reclock_head &= ~2; + schedule_work(&power->reclock_work); + drm_vblank_put(dev, 1); + } + spin_unlock_irqrestore(&power->power_lock, flags); drm_handle_vblank(dev, 1); + } } else { - if (stat & RADEON_CRTC_VBLANK_STAT) + if (stat & RADEON_CRTC_VBLANK_STAT) { + spin_lock_irqsave(&power->power_lock, flags); + if (power->reclock_head & 1) { + power->reclock_head &= ~1; + schedule_work(&power->reclock_work); + drm_vblank_put(dev, 0); + } + spin_unlock_irqrestore(&power->power_lock, flags); drm_handle_vblank(dev, 0); - if (stat & RADEON_CRTC2_VBLANK_STAT) + } + if (stat & RADEON_CRTC2_VBLANK_STAT) { + spin_lock_irqsave(&power->power_lock, flags); + if (power->reclock_head & 2) { + power->reclock_head &= ~2; + schedule_work(&power->reclock_work); + drm_vblank_put(dev, 1); + } + spin_unlock_irqrestore(&power->power_lock, flags); drm_handle_vblank(dev, 1); + } } return IRQ_HANDLED; } diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_mode.h.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_mode.h --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_mode.h.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_mode.h 2009-03-03 20:53:05.000000000 +0000 @@ -173,6 +173,22 @@ struct radeon_i2c_chan { struct radeon_i2c_bus_rec rec; }; +struct radeon_powermanagement_info { + struct timer_list idle_power_timer; + struct work_struct reclock_work; + struct drm_device *dev; + uint32_t orig_memory_clock; + uint32_t orig_engine_clock; + uint32_t *mc_arb_init_values; + uint8_t orig_fbdiv; + int new_mem_clock; + int new_engine_clock; + int current_clock_state; + int reclock_head; + struct mutex pll_mutex; + spinlock_t power_lock; +}; + struct radeon_mode_info { struct atom_context *atom_context; struct radeon_bios_connector bios_connector[RADEON_MAX_BIOS_CONNECTOR]; @@ -182,6 +198,9 @@ struct radeon_mode_info { struct radeon_pll mpll; uint32_t mclk; uint32_t sclk; + + /* power management */ + struct radeon_powermanagement_info power; }; struct radeon_crtc { @@ -307,6 +326,12 @@ extern int radeon_crtc_cursor_move(struc extern bool radeon_atom_get_clock_info(struct drm_device *dev); extern bool radeon_combios_get_clock_info(struct drm_device *dev); +extern void radeon_atom_get_engine_clock(struct drm_device *dev, int *engine_clock); +extern void radeon_atom_get_memory_clock(struct drm_device *dev, int *memory_clock); +extern void radeon_atom_set_engine_clock(struct drm_device *dev, int engine_clock); +extern void radeon_atom_set_memory_clock(struct drm_device *dev, int memory_clock); +extern void radeon_atom_initialize_memory_controller(struct drm_device *dev); +extern void radeon_atom_get_mc_arb_info(struct drm_device *dev); extern void radeon_atombios_get_lvds_info(struct radeon_encoder *encoder); extern void radeon_atombios_get_tmds_info(struct radeon_encoder *encoder); extern bool radeon_combios_get_lvds_info(struct radeon_encoder *encoder); diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_pm.c.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_pm.c --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_pm.c.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_pm.c 2009-03-03 20:53:05.000000000 +0000 @@ -31,6 +31,8 @@ #include "drm_crtc_helper.h" +#define RADEON_DOWNCLOCK_IDLE_MS + int radeon_suspend(struct drm_device *dev, pm_message_t state) { struct drm_radeon_private *dev_priv = dev->dev_private; @@ -255,3 +257,214 @@ bool radeon_set_pcie_lanes(struct drm_de return false; } +static void radeon_pm_set_engine_clock(struct drm_device *dev, int freq) +{ + drm_radeon_private_t *dev_priv = dev->dev_private; + + if (dev_priv->is_atom_bios) + radeon_atom_set_engine_clock(dev, freq); +} + +static void radeon_pm_set_memory_clock(struct drm_device *dev, int freq) +{ + drm_radeon_private_t *dev_priv = dev->dev_private; + struct radeon_powermanagement_info *power = &dev_priv->mode_info.power; + + mutex_lock(&power->pll_mutex); + radeon_do_cp_idle(dev_priv); + if (dev_priv->is_atom_bios) { + int mpll, spll, hclk, sclk, fbdiv, index, factor; + switch (dev_priv->chip_family) { + case CHIP_R520: + case CHIP_RV530: + case CHIP_RV560: + case CHIP_RV570: + case CHIP_R580: + mpll = RADEON_READ_PLL(dev_priv, MPLL_FUNC_CNTL); + fbdiv = (mpll & 0x1fe0) >> 5; + + /* Set new fbdiv */ + factor = power->orig_memory_clock / freq; + fbdiv = power->orig_fbdiv / factor; + + mpll &= ~0x1fe0; + mpll |= ((fbdiv << 5) | (1 << 24)); + mpll &= ~(1 << 25); + + spll = RADEON_READ_PLL(dev_priv, SPLL_FUNC_CNTL); + + hclk = fbdiv << 5; + hclk += 0x20; + hclk *= 8; + + sclk = spll & 0x1fe0; + sclk += 0x20; + sclk *= 6; + sclk = sclk >> 5; + + index = (hclk/sclk); + + R500_WRITE_MCIND(R530_MC_ARB_RATIO_CLK_SEQ, + power->mc_arb_init_values[index]); + RADEON_WRITE_PLL(dev_priv, MPLL_FUNC_CNTL, mpll); + radeon_atom_initialize_memory_controller(dev); + break; + } + } + + mutex_unlock(&power->pll_mutex); +} + +static int radeon_pm_get_active_crtcs(struct drm_device *dev, int *crtcs) +{ + struct drm_crtc *crtc; + int count = 0; + struct radeon_crtc *radeon_crtc; + + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + radeon_crtc = to_radeon_crtc(crtc); + if (crtc->enabled) { + count++; + *crtcs |= (1 << radeon_crtc->crtc_id); + } + } + return count; +} + + +static void radeon_pm_perform_transition(struct drm_device *dev) +{ + drm_radeon_private_t *dev_priv = dev->dev_private; + struct radeon_powermanagement_info *power = &dev_priv->mode_info.power; + int crtcs = 0, count; + unsigned long flags; + + count = radeon_pm_get_active_crtcs(dev, &crtcs); + + spin_lock_irqsave(&power->power_lock, flags); + switch (count) { + case 0: + schedule_work(&power->reclock_work); + break; + case 1: + if (power->reclock_head) + break; + if (crtcs & 1) { + power->reclock_head |= 1; + drm_vblank_get(dev, 0); + } else { + power->reclock_head |= 2; + drm_vblank_get(dev, 1); + } + break; + default: + /* Too many active heads */ + break; + } + spin_unlock_irqrestore(&power->power_lock, flags); +} + + +static int radeon_pm_set_runtime_power(struct drm_device *dev, int value) +{ + drm_radeon_private_t *dev_priv = dev->dev_private; + struct radeon_powermanagement_info *power = &dev_priv->mode_info.power; + + if (power->current_clock_state == value) + return 1; + + switch (value) { + case 0: + power->new_engine_clock = 100*100; + power->new_mem_clock = 100*100; + break; + case 1: + power->new_engine_clock = power->orig_engine_clock; + power->new_mem_clock = power->orig_memory_clock; + break; + } + + power->current_clock_state = value; + radeon_pm_perform_transition(dev); + + return 0; +} + +static void radeon_pm_idle_timeout(unsigned long d) +{ + struct drm_device *dev = (struct drm_device *)d; + drm_radeon_private_t *dev_priv = dev->dev_private; + + radeon_pm_set_runtime_power(dev, 0); +} + +static void radeon_pm_reclock_callback(struct work_struct *work) +{ + struct radeon_powermanagement_info *power = + container_of(work, struct radeon_powermanagement_info, + reclock_work); + struct drm_device *dev = power->dev; + drm_radeon_private_t *dev_priv = dev->dev_private; + + mutex_lock(&dev_priv->cs.cs_mutex); + radeon_pm_set_memory_clock(dev, power->new_mem_clock); + radeon_pm_set_engine_clock(dev, power->new_engine_clock); + mutex_unlock(&dev_priv->cs.cs_mutex); +} + +void radeon_pm_timer_reset(struct drm_device *dev) +{ + drm_radeon_private_t *dev_priv = dev->dev_private; + struct radeon_powermanagement_info *power = &dev_priv->mode_info.power; + + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return; + + radeon_pm_set_runtime_power(dev, 1); + + mod_timer(&power->idle_power_timer, + jiffies + msecs_to_jiffies(RADEON_DOWNCLOCK_IDLE_MS)); +} + +void radeon_pm_init(struct drm_device *dev) +{ + drm_radeon_private_t *dev_priv = dev->dev_private; + struct radeon_powermanagement_info *power = &dev_priv->mode_info.power; + + power->dev = dev; + + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return; + + if (dev_priv->is_atom_bios) { + int mpll; + radeon_atom_get_mc_arb_info(dev); + radeon_atom_get_engine_clock(dev, &power->orig_engine_clock); + radeon_atom_get_memory_clock(dev, &power->orig_memory_clock); + + mpll = RADEON_READ_PLL(dev_priv, MPLL_FUNC_CNTL); + dev_priv->mode_info.power.orig_fbdiv = (mpll & 0x1fe0) >> 5; + } + + setup_timer(&power->idle_power_timer, radeon_pm_idle_timeout, + (unsigned long)dev); + INIT_WORK(&power->reclock_work, radeon_pm_reclock_callback); + + spin_lock_init(&power->power_lock); + + power->current_clock_state = 1; + power->reclock_head = 0; + + radeon_pm_timer_reset(dev); +} + +void radeon_pm_exit(struct drm_device *dev) +{ + drm_radeon_private_t *dev_priv = dev->dev_private; + struct radeon_powermanagement_info *power = &dev_priv->mode_info.power; + + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return; + + del_timer_sync(&power->idle_power_timer); +} diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_reg.h.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_reg.h --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_reg.h.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_reg.h 2009-03-03 20:53:05.000000000 +0000 @@ -303,6 +303,28 @@ # define RADEON_PLL_WR_EN (1 << 7) # define RADEON_PLL_DIV_SEL (3 << 8) # define RADEON_PLL2_DIV_SEL_MASK ~(3 << 8) +#define SPLL_FUNC_CNTL 0x0000 +#define MPLL_FUNC_CNTL 0x0004 +#define GENERAL_PWRMGT 0x0008 +# define RADEON_GLOBAL_PWRMGT_EN (1 << 0) +#define SCLK_PWRMGT_CNTL 0x0009 +# define RADEON_SCLK_PWRMGT_OFF (1 << 0) +#define MCLK_PWRMGT_CNTL 0x000a +# define RADEON_MCLK_PWRMGT_OFF (1 << 0) +#define DYN_PWRMGT_SCLK_CNTL 0x000b +# define RADEON_ENGINE_DYNCLK_MODE (1 << 0) +# define RADEON_STATIC_SCREEN_EN (1 << 20) +# define RADEON_CLIENT_SELECT_POWER_EN (1 << 21) +#define DYN_SCLK_PWMEN_PIPE 0x000d +# define RADEON_PIPE_3D_NOT_AUTO (1 << 8) +#define DYN_SCLK_VOL_CNTL 0x000e +# define RADEON_IO_CG_VOLTAGE_DROP (1 << 0) +# define RADEON_VOLTAGE_DROP_SYNC (1 << 2) +#define CP_DYN_CNTL 0x000f +# define RADEON_CP_FORCEON (1 << 0) +# define RADEON_CP_LOWER_POWER_IGNORE (1 << 20) +# define RADEON_CP_NORMAL_POWER_IGNORE (1 << 21) +# define RADEON_CP_NORMAL_POWER_BUSY (1 << 24) #define RADEON_CLK_PWRMGT_CNTL 0x0014 # define RADEON_ENGIN_DYNCLK_MODE (1 << 12) # define RADEON_ACTIVE_HILO_LAT_MASK (3 << 13) @@ -3961,7 +3983,48 @@ # define AVIVO_I2C_RESET (1 << 8) #define R600_GENERAL_PWRMGT 0x618 +# define R600_GLOBAL_PWRMGT_EN (1 << 0) +# define R600_STATIC_PM_EN (1 << 1) +# define R600_MOBILE_SU (1 << 2) +# define R600_THERMAL_PROTECTION_DIS (1 << 3) +# define R600_THERMAL_PROTECTION_TYPE (1 << 4) +# define R600_ENABLE_GEN2PCIE (1 << 5) +# define R600_SW_GPIO_INDEX (1 << 6) +# define R600_LOW_VOLT_D2_ACPI (1 << 8) +# define R600_LOW_VOLT_D3_ACPI (1 << 9) +# define R600_VOLT_PWRMGT_EN (1 << 10) # define R600_OPEN_DRAIN_PADS (1 << 11) +# define R600_AVP_SCLK_EN (1 << 12) +# define R600_IDCT_SCLK_EN (1 << 13) +# define R600_GPU_COUNTER_ACPI (1 << 14) +# define R600_COUNTER_CLK (1 << 15) +# define R600_BACKBIAS_PAD_EN (1 << 16) +# define R600_BACKBIAS_VALUE (1 << 17) +# define R600_BACKBIAS_DPM_CNTL (1 << 18) +# define R600_SPREAD_SPECTRUM_INDEX (1 << 19) +# define R600_DYN_SPREAD_SPECTRUM_EN (1 << 21) + +#define R600_SCLK_PWRMGT_CNTL 0x620 +# define R600_SCLK_PWRMGT_OFF (1 << 0) +# define R600_SCLK_TURNOFF (1 << 1) +# define R600_SPLL_TURNOFF (1 << 2) +# define R600_SU_SCLK_USE_BCLK (1 << 3) +# define R600_DYNAMIC_GFX_ISLAND_PWR_DOWN (1 << 4) +# define R600_DYNAMIC_GFX_ISLAND_LP (1 << 5) +# define R600_CLK_TURN_ON_STAGGER (1 << 6) +# define R600_CLK_TURN_OFF_STAGGER (1 << 7) +# define R600_FIR_FORCE_TREND_SEL (1 << 8) +# define R600_FIR_TREND_MODE (1 << 9) +# define R600_DYN_GFX_CLK_OFF_EN (1 << 10) +# define R600_VDDC3D_TURNOFF_D1 (1 << 11) +# define R600_VDDC3D_TURNOFF_D2 (1 << 12) +# define R600_VDDC3D_TURNOFF_D3 (1 << 13) +# define R600_SPLL_TURNOFF_D2 (1 << 14) +# define R600_SCLK_LOW_D1 (1 << 15) +# define R600_DYN_GFX_CLK_OFF_MC_EN (1 << 16) + +#define R600_MCLK_PWRMGT_CNTL 0x624 +# define R600_MPLL_PWRMGT_OFF (1 << 0) #define R600_LOWER_GPIO_ENABLE 0x710 #define R600_CTXSW_VID_LOWER_GPIO_CNTL 0x718 @@ -5331,5 +5394,6 @@ # define R500_RS_IP_OFFSET_EN (1 << 31) #define R500_DYN_SCLK_PWMEM_PIPE 0x000d /* PLL */ +#define R530_MC_ARB_RATIO_CLK_SEQ 0x0016 /* MC */ #endif Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1369 retrieving revision 1.1370 diff -u -r1.1369 -r1.1370 --- kernel.spec 3 Mar 2009 18:36:19 -0000 1.1369 +++ kernel.spec 3 Mar 2009 21:00:11 -0000 1.1370 @@ -647,6 +647,7 @@ # nouveau + drm fixes Patch1811: drm-next.patch Patch1812: drm-modesetting-radeon.patch +Patch1813: drm-radeon-pm.patch Patch1814: drm-nouveau.patch #Patch1815: drm-intel-next.patch Patch1816: drm-no-gem-on-i8xx.patch @@ -1179,6 +1180,7 @@ # Nouveau DRM + drm fixes ApplyPatch drm-next.patch ApplyPatch drm-modesetting-radeon.patch +ApplyPatch drm-radeon-pm.patch ApplyPatch drm-nouveau.patch #ApplyPatch drm-intel-next.patch ApplyPatch drm-no-gem-on-i8xx.patch @@ -1789,6 +1791,9 @@ # and build. %changelog +* Tue Mar 03 2009 Matthew Garrett +- Add dynamic power management for later r500-based Radeons + * Tue Mar 03 2009 Kyle McMartin - Allocate a bigger default DMA buffer for snd-hda_intel. Azalia uses a 32-bit or wider DMA mask, so this is fine. From atkac at fedoraproject.org Tue Mar 3 21:02:05 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Tue, 3 Mar 2009 21:02:05 +0000 (UTC) Subject: rpms/tigervnc/devel tigervnc-102434.patch, NONE, 1.1 tigervnc-bounds.patch, NONE, 1.1 tigervnc-clipboard.patch, NONE, 1.1 tigervnc-cookie.patch, NONE, 1.1 tigervnc-manminor.patch, NONE, 1.1 tigervnc-newfbsize.patch, NONE, 1.1 tigervnc-rh212985.patch, NONE, 1.1 tigervnc-viewer-reparent.patch, NONE, 1.1 tigervnc-xclients.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303210205.2F1C170116@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/tigervnc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28000 Modified Files: .cvsignore sources Added Files: tigervnc-102434.patch tigervnc-bounds.patch tigervnc-clipboard.patch tigervnc-cookie.patch tigervnc-manminor.patch tigervnc-newfbsize.patch tigervnc-rh212985.patch tigervnc-viewer-reparent.patch tigervnc-xclients.patch Log Message: Initial import of tigervnc. tigervnc-102434.patch: --- NEW FILE tigervnc-102434.patch --- diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx --- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx.102434 2008-10-10 17:48:22.000000000 +0200 +++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx 2008-10-22 18:35:46.000000000 +0200 @@ -37,6 +37,8 @@ #include "ServerDialog.h" #include "PasswdDialog.h" #include "parameters.h" +#include +#include using namespace rfb; @@ -209,6 +211,15 @@ void CConn::getUserPasswd(char** user, c return; } + /* XXX Who wrote this code? Yes, it is really ugly */ + if (passwdInput) { + std::string s; + std::cin >> s; + *password = strdup(s.c_str()); + if(user) *user = 0; + return; + } + const char* secType = secTypeName(getCurrentCSecurity()->getType()); const char* titlePrefix = _("VNC authentication"); unsigned int titleLen = strlen(titlePrefix) + strlen(secType) + 4; diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h --- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h.102434 2006-05-18 13:08:21.000000000 +0200 +++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h 2008-10-22 18:08:47.000000000 +0200 @@ -41,6 +41,7 @@ extern rfb::BoolParameter customCompress extern rfb::IntParameter compressLevel; extern rfb::BoolParameter noJpeg; extern rfb::IntParameter qualityLevel; +extern rfb::BoolParameter passwdInput; extern char aboutText[]; extern char* programName; diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx --- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx.102434 2008-09-28 07:08:48.000000000 +0200 +++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx 2008-10-22 18:04:00.000000000 +0200 @@ -58,6 +58,7 @@ IntParameter wmDecorationHeight("WMDecor "manager decoration around a window", 24); StringParameter passwordFile("PasswordFile", "Password file for VNC authentication", ""); +BoolParameter passwdInput("passwdInput", "Gets password from stdin", false); AliasParameter rfbauth("passwd", "Alias for PasswordFile", &passwordFile); BoolParameter useLocalCursor("UseLocalCursor", diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man --- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man.102434 2006-06-02 06:43:52.000000000 +0200 +++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man 2008-10-22 18:04:00.000000000 +0200 @@ -115,6 +115,11 @@ the server, you can specify it here to a "~/.vnc/passwd". .TP +.B \-passwdInput \fItrue, false\fP +Force standard vnc dialog to getting password and reads password from stdin. +Default is false(shows dialog window) + +.TP .B \-Shared When you make a connection to a VNC server, all other existing connections are normally closed. This option requests that they be left open, allowing you to tigervnc-bounds.patch: --- NEW FILE tigervnc-bounds.patch --- diff -up tightvnc-1.5.0-20081015svn3022/unix/xserver/hw/vnc/XserverDesktop.cc.bounds tightvnc-1.5.0-20081015svn3022/unix/xserver/hw/vnc/XserverDesktop.cc --- tightvnc-1.5.0-20081015svn3022/unix/xserver/hw/vnc/XserverDesktop.cc.bounds 2008-10-15 15:23:24.000000000 +0200 +++ tightvnc-1.5.0-20081015svn3022/unix/xserver/hw/vnc/XserverDesktop.cc 2008-10-23 12:46:31.000000000 +0200 @@ -500,32 +500,36 @@ void XserverDesktop::add_changed(RegionP { if (ignoreHooks_) return; if (grabbing) return; + + BoxRec screenbox; + RegionPtr newreg = REGION_CREATE(pScreen, 0, 0); + + screenbox.x1 = screenbox.y1 = 0; + screenbox.x2 = pScreen->width; + screenbox.y2 = pScreen->height; + + RegionPtr screenreg = REGION_CREATE(pScreen, &screenbox, 0); + REGION_INTERSECT(pScreen, newreg, reg, screenreg); + REGION_DESTROY (pScreen, screenreg); + try { rfb::Region rfbReg; - rfbReg.setExtentsAndOrderedRects((ShortRect*)REGION_EXTENTS(pScreen, reg), - REGION_NUM_RECTS(reg), - (ShortRect*)REGION_RECTS(reg)); + rfbReg.setExtentsAndOrderedRects((ShortRect*)REGION_EXTENTS(pScreen, newreg), + REGION_NUM_RECTS(newreg), + (ShortRect*)REGION_RECTS(newreg)); server->add_changed(rfbReg); deferUpdate(); } catch (rdr::Exception& e) { vlog.error("XserverDesktop::add_changed: %s",e.str()); } + REGION_DESTROY (pScreen, newreg); } void XserverDesktop::add_copied(RegionPtr dst, int dx, int dy) { - if (ignoreHooks_) return; - if (grabbing) return; - try { - rfb::Region rfbReg; - rfbReg.setExtentsAndOrderedRects((ShortRect*)REGION_EXTENTS(pScreen, dst), - REGION_NUM_RECTS(dst), - (ShortRect*)REGION_RECTS(dst)); - server->add_copied(rfbReg, rfb::Point(dx, dy)); - deferUpdate(); - } catch (rdr::Exception& e) { - vlog.error("XserverDesktop::add_copied: %s",e.str()); - } + add_changed (dst); + REGION_TRANSLATE (pScreen, dst, -dx, -dy); + add_changed (dst); } void XserverDesktop::positionCursor() tigervnc-clipboard.patch: --- NEW FILE tigervnc-clipboard.patch --- diff -up vnc-4_1_2-unixsrc/unix/vncserver.clipboard vnc-4_1_2-unixsrc/unix/vncserver --- vnc-4_1_2-unixsrc/unix/vncserver.clipboard 2008-03-13 16:17:07.000000000 +0100 +++ vnc-4_1_2-unixsrc/unix/vncserver 2008-03-13 16:18:14.000000000 +0100 @@ -42,13 +42,13 @@ $xauthorityFile = "$ENV{XAUTHORITY}" || $defaultXStartup = ("#!/bin/sh\n\n". + "vncconfig -iconic &\n". "# Uncomment the following two lines for normal desktop:\n". "# unset SESSION_MANAGER\n". "# exec /etc/X11/xinit/xinitrc\n\n". "[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup\n". "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n". "xsetroot -solid grey\n". - "vncconfig -iconic &\n". "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n". "twm &\n"); tigervnc-cookie.patch: --- NEW FILE tigervnc-cookie.patch --- --- vnc-4_1-unixsrc/unix/vncserver.cookie 2005-02-23 12:28:18.000000000 +0000 +++ vnc-4_1-unixsrc/unix/vncserver 2005-03-03 22:04:28.000000000 +0000 @@ -116,18 +116,12 @@ $desktopLog = "$vncUserDir/$host:$displayNumber.log"; unlink($desktopLog); -# Make an X server cookie - use as the seed the sum of the current time, our -# PID and part of the encrypted form of the password. Ideally we'd use -# /dev/urandom, but that's only available on Linux. - -srand(time+$$+unpack("L",`cat $vncUserDir/passwd`)); -$cookie = ""; -for (1..16) { - $cookie .= sprintf("%02x", int(rand(256)) % 256); -} - -system("xauth -f $xauthorityFile add $host:$displayNumber . $cookie"); -system("xauth -f $xauthorityFile add $host/unix:$displayNumber . $cookie"); +# Make an X server cookie - use mcookie +$cookie = `/usr/bin/mcookie`; +open (XAUTH, "|xauth -f $xauthorityFile source -"); +print XAUTH "add $host:$displayNumber . $cookie\n"; +print XAUTH "add $host/unix:$displayNumber . $cookie\n"; +close XAUTH; if ($opt{'-name'}) { $desktopName = $opt{'-name'}; tigervnc-manminor.patch: --- NEW FILE tigervnc-manminor.patch --- diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man.manminor tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man --- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man.manminor 2008-10-23 12:58:02.000000000 +0200 +++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man 2008-10-23 12:58:23.000000000 +0200 @@ -8,6 +8,10 @@ vncviewer \- VNC viewer for X .br .B vncviewer .RI [ options ] +.RI [ host ][:: port ] +.br +.B vncviewer +.RI [ options ] .B \-listen .RI [ port ] .SH DESCRIPTION tigervnc-newfbsize.patch: --- NEW FILE tigervnc-newfbsize.patch --- diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx.newfbsize tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx --- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx.newfbsize 2008-10-23 13:00:59.000000000 +0200 +++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx 2008-10-23 13:01:11.000000000 +0200 @@ -327,6 +327,8 @@ void CConn::beginRect(const Rect& r, uns if (encoding != encodingCopyRect) { lastServerEncoding = encoding; } + if (encoding == pseudoEncodingDesktopSize) + setDesktopSize( r.width(), r.height() ); } void CConn::endRect(const Rect& r, unsigned int encoding) tigervnc-rh212985.patch: --- NEW FILE tigervnc-rh212985.patch --- diff -up tightvnc-1.5.0-20081015svn3022/unix/vncserver.rh212985 tightvnc-1.5.0-20081015svn3022/unix/vncserver --- tightvnc-1.5.0-20081015svn3022/unix/vncserver.rh212985 2008-10-23 13:03:57.000000000 +0200 +++ tightvnc-1.5.0-20081015svn3022/unix/vncserver 2008-10-23 13:05:21.000000000 +0200 @@ -161,11 +161,25 @@ $cmd .= " >> " . "edString($desktopL # Run $cmd and record the process ID. $pidFile = "$vncUserDir/$host:$displayNumber.pid"; -system("$cmd & echo \$! >$pidFile"); +system( +"rm -f $pidFile + $cmd & + PID_TEMP=\$! + PID_NUM=\$PID_TEMP + + # Give Xvnc a chance to start up + + sleep 3; + + if ps -p \$PID_NUM -o comm= | grep -q Xvnc; then + echo \$PID_NUM > $pidFile + fi" +); -# Give Xvnc a chance to start up - -sleep(3); +if (!(-e "$pidFile")) { + warn "Unable to start Xvnc, exiting\n"; + exit 2; +} warn "\nNew '$desktopName' desktop is $host:$displayNumber\n\n"; tigervnc-viewer-reparent.patch: --- NEW FILE tigervnc-viewer-reparent.patch --- diff -up tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.cxx.viewer-reparent tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.cxx --- tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.cxx.viewer-reparent 2008-03-14 14:37:09.000000000 +0100 +++ tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.cxx 2008-10-23 13:11:39.000000000 +0200 @@ -44,6 +44,21 @@ TXViewport::~TXViewport() delete vScrollbar; } +void TXViewport::reparent(long embed_window) +{ + XReparentWindow(dpy, win(), (Window)embed_window, 0, 0); + XSelectInput(dpy, embed_window, child->eventMask); + if (!eventHandler) + this->setEventHandler(this); +} + +void TXViewport::handleEvent(TXWindow* w, XEvent* ev) +{ + if (child && child->eventHandler) + ((TXEventHandler *)child->eventHandler)->handleEvent(child, ev); +} + + void TXViewport::setChild(TXWindow* child_) { child = child_; diff -up tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.h.viewer-reparent tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.h --- tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.h.viewer-reparent 2008-03-14 14:37:09.000000000 +0100 +++ tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.h 2008-10-23 13:11:39.000000000 +0200 @@ -32,8 +32,8 @@ #include "TXWindow.h" #include "TXScrollbar.h" -class TXViewport : public TXWindow, public TXScrollbarCallback, - public rfb::Timer::Callback { +class TXViewport : public TXWindow, public TXScrollbarCallback, + public TXEventHandler, public rfb::Timer::Callback { public: TXViewport(Display* dpy_, int width, int height, TXWindow* parent_=0); virtual ~TXViewport(); @@ -59,6 +59,12 @@ public: // normally. bool bumpScrollEvent(XMotionEvent* ev); + // reparent the viewport into a new window + void reparent(long embed_window); + + // event handler + void handleEvent(TXWindow* w, XEvent* ev); + private: virtual void resizeNotify(); virtual void scrollbarPos(int x, int y, TXScrollbar* sb); diff -up tightvnc-1.5.0-20081015svn3022/unix/tx/TXWindow.h.viewer-reparent tightvnc-1.5.0-20081015svn3022/unix/tx/TXWindow.h --- tightvnc-1.5.0-20081015svn3022/unix/tx/TXWindow.h.viewer-reparent 2006-05-18 13:08:21.000000000 +0200 +++ tightvnc-1.5.0-20081015svn3022/unix/tx/TXWindow.h 2008-10-23 13:11:39.000000000 +0200 @@ -183,6 +183,9 @@ public: Display* const dpy; + TXEventHandler* eventHandler; + long eventMask; + int xPad, yPad, bevel; private: @@ -195,9 +198,7 @@ private: TXWindow* parent; Window win_; int width_, height_; - TXEventHandler* eventHandler; TXDeleteWindowCallback* dwc; - long eventMask; XSizeHints sizeHints; std::map selectionOwnTime; std::map selectionOwner_; diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx.viewer-reparent tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx --- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx.viewer-reparent 2008-10-23 13:11:39.000000000 +0200 +++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx 2008-10-23 13:11:39.000000000 +0200 @@ -647,10 +647,18 @@ void CConn::recreateViewport() void CConn::reconfigureViewport() { + const char * par = embedParent.getValueStr(); viewport->setMaxSize(cp.width, cp.height); if (fullScreen) { viewport->resize(DisplayWidth(dpy,DefaultScreen(dpy)), DisplayHeight(dpy,DefaultScreen(dpy))); + } else if (strlen(par) != 0) { + XWindowAttributes win_attr; + Window w = strtol(par, (char **)NULL, 0); + + XGetWindowAttributes(dpy, w, &win_attr); + viewport->reparent(w); + viewport->resize(win_attr.width, win_attr.height); } else { int w = cp.width; int h = cp.height; diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h.viewer-reparent tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h --- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h.viewer-reparent 2008-10-23 13:11:39.000000000 +0200 +++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h 2008-10-23 13:12:41.000000000 +0200 @@ -42,6 +42,7 @@ extern rfb::IntParameter compressLevel; extern rfb::BoolParameter noJpeg; extern rfb::IntParameter qualityLevel; extern rfb::BoolParameter passwdInput; +extern rfb::StringParameter embedParent; extern char aboutText[]; extern char* programName; diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx.viewer-reparent tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx --- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx.viewer-reparent 2008-10-23 13:11:39.000000000 +0200 +++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx 2008-10-23 13:12:59.000000000 +0200 @@ -106,6 +106,9 @@ StringParameter displayname("display", " StringParameter via("via", "Gateway to tunnel via", ""); +/* Support for reparenting */ +StringParameter embedParent("Parent", "X Window to use as a parent", ""); + BoolParameter customCompressLevel("CustomCompressLevel", "Use custom compression level. " "Default if CompressLevel is specified.", false); tigervnc-xclients.patch: --- NEW FILE tigervnc-xclients.patch --- --- vnc-4_1-unixsrc/unix/vncserver.xclients 2005-03-03 23:01:16.000000000 +0000 +++ vnc-4_1-unixsrc/unix/vncserver 2005-03-03 23:02:26.000000000 +0000 @@ -42,6 +42,10 @@ $defaultXStartup = ("#!/bin/sh\n\n". + "# Uncomment the following two lines for normal desktop:\n". + "# unset SESSION_MANAGER\n". + "# exec /etc/X11/xinit/xinitrc\n\n". + "[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup\n". "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n". "xsetroot -solid grey\n". "vncconfig -iconic &\n". Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tigervnc/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:40:46 -0000 1.1 +++ .cvsignore 3 Mar 2009 21:02:04 -0000 1.2 @@ -0,0 +1,7 @@ +tigervnc-0.0.90-20090303svn3631.tar.bz2 +vncserver.init +vncserver.sysconfig +vnc-16x16.png +vnc-24x24.png +vnc-48x48.png +vncviewer.desktop Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tigervnc/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:40:46 -0000 1.1 +++ sources 3 Mar 2009 21:02:04 -0000 1.2 @@ -0,0 +1,7 @@ +8d262508edb0e18d9d114fc56955e2ed tigervnc-0.0.90-20090303svn3631.tar.bz2 +ededd32e8bc5364c4bf41552d0b56b96 vncserver.init +833229c4a91fd869ca8a4d1c5d189a15 vncserver.sysconfig +2f19f562d4ff6b8752c1686331ce44b7 vnc-16x16.png +273f51f58324f12e2cc96e2a1dcc5a6d vnc-24x24.png +f96d936a0fcc61cabee0e6cb65e0e38a vnc-48x48.png +2531d7bbc8369fb23e4cb1578521edc6 vncviewer.desktop From erikos at fedoraproject.org Tue Mar 3 21:02:35 2009 From: erikos at fedoraproject.org (Simon Schampijer) Date: Tue, 3 Mar 2009 21:02:35 +0000 (UTC) Subject: rpms/sugar-artwork/devel .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 sugar-artwork.spec, 1.19, 1.20 Message-ID: <20090303210235.19D2C70116@cvs1.fedora.phx.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-artwork/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28025 Modified Files: .cvsignore sources sugar-artwork.spec Log Message: * Tue Mar 03 2009 Simon Schampijer - 0.84.0-1 - Rebuild for 0.84 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 23 Feb 2009 08:05:52 -0000 1.15 +++ .cvsignore 3 Mar 2009 21:02:04 -0000 1.16 @@ -1 +1 @@ -sugar-artwork-0.83.5.tar.bz2 +sugar-artwork-0.84.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 23 Feb 2009 08:05:52 -0000 1.15 +++ sources 3 Mar 2009 21:02:04 -0000 1.16 @@ -1 +1 @@ -799f990e1464c521eeb395d3a92b6273 sugar-artwork-0.83.5.tar.bz2 +b3f931e0b93635d281fe3c16fbd323c5 sugar-artwork-0.84.0.tar.bz2 Index: sugar-artwork.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sugar-artwork.spec 26 Feb 2009 03:34:49 -0000 1.19 +++ sugar-artwork.spec 3 Mar 2009 21:02:04 -0000 1.20 @@ -3,8 +3,8 @@ Summary: Artwork for Sugar look-and-feel Name: sugar-artwork -Version: 0.83.5 -Release: 2%{?dist} +Version: 0.84.0 +Release: 1%{?dist} #Release: 2.%{alphatag}%{?dist} URL: http://sugarlabs.org # git clone git://dev.laptop.org/artwork @@ -64,6 +64,9 @@ %{_libdir}/gtk-2.0/*/engines/*.so %changelog +* Tue Mar 03 2009 Simon Schampijer - 0.84.0-1 +- Rebuild for 0.84 + * Wed Feb 25 2009 Fedora Release Engineering - 0.83.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From atkac at fedoraproject.org Tue Mar 3 21:03:40 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Tue, 3 Mar 2009 21:03:40 +0000 (UTC) Subject: rpms/tigervnc/devel tigervnc.spec,NONE,1.1 Message-ID: <20090303210340.5282570116@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/tigervnc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28441 Added Files: tigervnc.spec Log Message: Forgot to add specfile - adding it. --- NEW FILE tigervnc.spec --- %define revision 3631 %define date 20090303 %define releasetag %{date}svn%{revision} Name: tigervnc Version: 0.0.90 Release: 0.3.%{releasetag}%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops License: GPLv2+ URL: http://www.tigervnc.com # The source for this package was pulled from upstream's svn. Use the # following commands to generate the tarball: # # $ svn export -r%{revison} \ # https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk \ #tigervnc-%{version}-%{releasetag} # $ tar cjf tigervnc-%{version}-%{releasetag}{.tar.bz2,} Source0: %{name}-%{version}-%{releasetag}.tar.bz2 Source1: vncserver.init Source2: vncserver.sysconfig Source3: vnc-16x16.png Source4: vnc-24x24.png Source5: vnc-48x48.png Source6: vncviewer.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel, automake, autoconf, libtool, gettext, cvs BuildRequires: libXext-devel, xorg-x11-server-source BuildRequires: xorg-x11-xtrans-devel, xorg-x11-util-macros, libXtst-devel BuildRequires: libdrm-devel, libXt-devel, pixman-devel libXfont-devel BuildRequires: libxkbfile-devel, openssl-devel, libpciaccess-devel BuildRequires: libjpeg-devel, mesa-libGL-devel, libXinerama-devel BuildRequires: freetype-devel BuildRequires: desktop-file-utils Requires(post): coreutils Requires(postun):coreutils Provides: vnc = 4.1.3-2, vnc-libs = 4.1.3-2 Obsoletes: vnc < 4.1.3-2, vnc-libs < 4.1.3-2 Provides: tightvnc = 1.5.0-0.15.20090204svn3586 Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586 Patch0: tigervnc-102434.patch Patch1: tigervnc-bounds.patch Patch2: tigervnc-xclients.patch Patch3: tigervnc-clipboard.patch Patch4: tigervnc-cookie.patch Patch5: tigervnc-manminor.patch Patch6: tigervnc-newfbsize.patch Patch7: tigervnc-rh212985.patch Patch8: tigervnc-viewer-reparent.patch %description Virtual Network Computing (VNC) is a remote display system which allows you to view a computing 'desktop' environment not only on the machine where it is running, but from anywhere on the Internet and from a wide variety of machine architectures. This package contains a client which will allow you to connect to other desktops running a VNC server. %package server Summary: A TigerVNC server Group: User Interface/X Provides: vnc-server = 4.1.3-2, vnc-libs = 4.1.3-2 Obsoletes: vnc-server < 4.1.3-2, vnc-libs < 4.1.3-2 Provides: tightvnc-server = 1.5.0-0.15.20090204svn3586 Obsoletes: tightvnc-server < 1.5.0-0.15.20090204svn3586 Requires(post): chkconfig Requires(preun):chkconfig Requires(preun):initscripts Requires(postun):initscripts %description server The VNC system allows you to access the same desktop from a wide variety of platforms. This package is a TigerVNC server, allowing others to access the desktop on your machine. %package server-module Summary: TigerVNC module to Xorg Group: User Interface/X Provides: vnc-server = 4.1.3-2, vnc-libs = 4.1.3-2 Obsoletes: vnc-server < 4.1.3-2, vnc-libs < 4.1.3-2 Provides: tightvnc-server-module = 1.5.0-0.15.20090204svn3586 Obsoletes: tightvnc-server-module < 1.5.0-0.15.20090204svn3586 Requires: xorg-x11-server-Xorg %description server-module This package contains libvnc.so module to X server, allowing others to access the desktop on your machine. %prep %setup -q -n %{name}-%{version}-%{releasetag} cp -r %{_datadir}/xorg-x11-server-source/* unix/xserver pushd unix/xserver for all in `find . -type f -perm -001`; do chmod -x "$all" done patch -p1 --fuzz=0 -b --suffix .vnc < ../xserver16.patch popd %patch0 -p1 -b .102434 %patch1 -p1 -b .bounds %patch2 -p1 -b .xclients %patch3 -p1 -b .clipboard %patch4 -p1 -b .cookie %patch5 -p1 -b .manminor %patch6 -p1 -b .newfbsize %patch7 -p1 -b .rh212985 %patch8 -p1 -b .viewer-reparent # Use newer gettext sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \ unix/configure.ac %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$CFLAGS" pushd unix autoreconf -fiv %configure \ --disable-static make %{?_smp_mflags} popd pushd unix/xserver autoreconf -fiv %configure \ --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ --disable-xwin --disable-xephyr --disable-kdrive --with-pic \ --disable-xorgcfg --disable-xprint --disable-static \ --disable-composite --disable-xtrap --enable-xcsecurity \ --disable-{a,c,m}fb \ --with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \ --with-fontdir=%{_datadir}/X11/fonts \ --with-os-name="Fedora" \ --with-os-vendor="Red Hat, Inc." \ --with-xkb-output=%{_localstatedir}/lib/xkb \ --enable-install-libxf86config \ --disable-xevie \ --disable-dri2 \ --enable-glx \ --disable-config-dbus \ --disable-config-hal \ --with-dri-driver-path=%{_libdir}/dri make %{?_smp_mflags} popd %install rm -rf $RPM_BUILD_ROOT pushd unix make install DESTDIR=$RPM_BUILD_ROOT popd pushd unix/xserver/hw/vnc make install DESTDIR=$RPM_BUILD_ROOT popd # Install Xvnc as service mkdir -p $RPM_BUILD_ROOT%{_initddir} install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}/vncserver mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vncservers # Install desktop stuff mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,24x24,48x48}/apps install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/vnc.png install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/vnc.png install -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/vnc.png mkdir $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE6} %find_lang %{name} %{name}.lang # remove unwanted files rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libvnc.la %clean rm -rf $RPM_BUILD_ROOT %post touch -c %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : fi %postun touch -c %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : fi %post server /sbin/chkconfig --add vncserver %preun server if [ "$1" -eq 0 ]; then /sbin/service vncserver stop > /dev/null 2>&1 /sbin/chkconfig --del vncserver fi %postun server if [ "$1" -ge "1" ]; then /sbin/service vncserver condrestart > /dev/null 2>&1 || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc LICENCE.TXT unix/README %{_bindir}/vncviewer %{_datadir}/icons/* %{_datadir}/applications/* %{_mandir}/man1/vncviewer.1* %files server %defattr(-,root,root,-) %{_initddir}/vncserver %config(noreplace) %{_sysconfdir}/sysconfig/vncservers %{_bindir}/vncconfig %{_bindir}/vncpasswd %{_bindir}/x0vncserver %{_bindir}/Xvnc %{_bindir}/vncserver %{_mandir}/man1/Xvnc.1* %{_mandir}/man1/vncpasswd.1* %{_mandir}/man1/vncconfig.1* %{_mandir}/man1/vncserver.1* %{_mandir}/man1/x0vncserver.1* %files server-module %defattr(-,root,root,-) %{_libdir}/xorg/modules/extensions/libvnc.so %changelog * Tue Mar 03 2009 Adam Tkac 0.0.90-0.3.20090303svn3631 - update to r3631 * Tue Mar 03 2009 Adam Tkac 0.0.90-0.2.20090302svn3621 - package review related fixes * Mon Mar 02 2009 Adam Tkac 0.0.90-0.1.20090302svn3621 - initial package, r3621 From ksebasti at fedoraproject.org Tue Mar 3 21:05:36 2009 From: ksebasti at fedoraproject.org (Kent Sebastian) Date: Tue, 3 Mar 2009 21:05:36 +0000 (UTC) Subject: rpms/eclipse-oprofile/devel import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090303210536.6ACE470116@cvs1.fedora.phx.redhat.com> Author: ksebasti Update of /cvs/pkgs/rpms/eclipse-oprofile/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28799/devel Modified Files: .cvsignore sources Added Files: import.log Log Message: * Thu Feb 12 2009 Kent Sebastian 0.1.0-1 - Initial packaging. --- NEW FILE import.log --- eclipse-oprofile-0_1_0-1_fc10:HEAD:eclipse-oprofile-0.1.0-1.fc10.src.rpm:1236114082 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-oprofile/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Mar 2009 20:48:19 -0000 1.2 +++ .cvsignore 3 Mar 2009 21:05:05 -0000 1.3 @@ -1,2 +1,2 @@ -eclipse-oprofile-fetched-src-0.1.0.tar.bz2 eclipse-oprofile-fetch-src.sh +eclipse-oprofile-fetched-src-0.1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-oprofile/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Mar 2009 20:48:20 -0000 1.2 +++ sources 3 Mar 2009 21:05:05 -0000 1.3 @@ -1,2 +1,2 @@ -d94ffe9b7664b4e9321d34be7cd6b181 eclipse-oprofile-fetched-src-0.1.0.tar.bz2 766631444239bf070d679894a534a200 eclipse-oprofile-fetch-src.sh +d94ffe9b7664b4e9321d34be7cd6b181 eclipse-oprofile-fetched-src-0.1.0.tar.bz2 From atkac at fedoraproject.org Tue Mar 3 21:06:11 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Tue, 3 Mar 2009 21:06:11 +0000 (UTC) Subject: rpms/anaconda/devel anaconda-tigervnc.patch, NONE, 1.1 anaconda.spec, 1.758, 1.759 Message-ID: <20090303210611.C22A970116@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29018 Modified Files: anaconda.spec Added Files: anaconda-tigervnc.patch Log Message: - use tigervnc* packages instead of tightvnc* anaconda-tigervnc.patch: --- NEW FILE anaconda-tigervnc.patch --- diff -up anaconda-11.5.0.23/scripts/upd-instroot.tigervnc anaconda-11.5.0.23/scripts/upd-instroot --- anaconda-11.5.0.23/scripts/upd-instroot.tigervnc 2009-03-03 21:47:58.000000000 +0100 +++ anaconda-11.5.0.23/scripts/upd-instroot 2009-03-03 21:48:18.000000000 +0100 @@ -183,8 +183,8 @@ PACKAGES="GConf2 NetworkManager ORBit2 P reiserfs-utils rhpl rpm rpm-libs rpm-python sed selinux-policy-targeted setup slang smc-fonts-meera specspo sqlite synaptics system-config-date system-config-keyboard ${brandpkgname}-logos ${brandpkgname}-release taipeifonts tcp_wrappers - tzdata udev un-core-fonts-dotum urw-fonts util-linux-ng tightvnc-server - tightvnc-server-module vlgothic-fonts + tzdata udev un-core-fonts-dotum urw-fonts util-linux-ng tigervnc-server + tigervnc-server-module vlgothic-fonts wpa_supplicant xkeyboard-config xfsdump xfsprogs xorg-x11 xorg-x11-auth xorg-x11-base xorg-x11-drivers xorg-x11-font-utils xorg-x11-fonts-ethiopic xorg-x11-fonts-misc xorg-x11-libs xorg-x11-libs-data xorg-x11-server-utils Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.758 retrieving revision 1.759 diff -u -r1.758 -r1.759 --- anaconda.spec 24 Feb 2009 01:02:21 -0000 1.758 +++ anaconda.spec 3 Mar 2009 21:05:41 -0000 1.759 @@ -3,7 +3,7 @@ Summary: Graphical system installer Name: anaconda Version: 11.5.0.23 -Release: 2 +Release: 3 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -145,6 +145,8 @@ Obsoletes: anaconda-runtime < %{version}-%{release} Provides: anaconda-runtime = %{version}-%{release} +Patch0: anaconda-tigervnc.patch + %description The anaconda package contains the program which was used to install your system. These files are of little use on an already installed system. @@ -152,6 +154,8 @@ %prep %setup -q +%patch0 -p1 -b .tigervnc + %build %{__make} depend %{__make} %{?_smp_mflags} @@ -207,6 +211,9 @@ %endif %changelog +* Tue Mar 03 2009 Adam Tkac - 11.5.0.23-3 +- use tigervnc* packages instead of tightvnc* + * Mon Feb 23 2009 Fedora Release Engineering - 11.5.0.23-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mjg59 at fedoraproject.org Tue Mar 3 21:06:54 2009 From: mjg59 at fedoraproject.org (Matthew Garrett) Date: Tue, 3 Mar 2009 21:06:54 +0000 (UTC) Subject: rpms/kernel/devel drm-radeon-pm.patch,1.1,1.2 Message-ID: <20090303210654.EF30270116@cvs1.fedora.phx.redhat.com> Author: mjg59 Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29189 Modified Files: drm-radeon-pm.patch Log Message: Build fix drm-radeon-pm.patch: Index: drm-radeon-pm.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-radeon-pm.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- drm-radeon-pm.patch 3 Mar 2009 21:00:11 -0000 1.1 +++ drm-radeon-pm.patch 3 Mar 2009 21:06:24 -0000 1.2 @@ -276,7 +276,7 @@ #include "drm_crtc_helper.h" -+#define RADEON_DOWNCLOCK_IDLE_MS ++#define RADEON_DOWNCLOCK_IDLE_MS 30 + int radeon_suspend(struct drm_device *dev, pm_message_t state) { From erikos at fedoraproject.org Tue Mar 3 21:08:31 2009 From: erikos at fedoraproject.org (Simon Schampijer) Date: Tue, 3 Mar 2009 21:08:31 +0000 (UTC) Subject: rpms/sugar-base/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 sugar-base.spec, 1.15, 1.16 Message-ID: <20090303210831.0556E70116@cvs1.fedora.phx.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-base/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30018 Modified Files: .cvsignore sources sugar-base.spec Log Message: * Tue Mar 03 2009 Simon Schampijer - 0.84.0-1 - Rebuild for 0.84 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-base/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 23 Feb 2009 07:53:42 -0000 1.10 +++ .cvsignore 3 Mar 2009 21:08:00 -0000 1.11 @@ -1 +1 @@ -sugar-base-0.83.4.tar.bz2 +sugar-base-0.84.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-base/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 23 Feb 2009 07:53:42 -0000 1.10 +++ sources 3 Mar 2009 21:08:00 -0000 1.11 @@ -1 +1 @@ -3e34d830e3a4f31e4f817c1b94d2b447 sugar-base-0.83.4.tar.bz2 +7dd197a597d01808784aa350000f26af sugar-base-0.84.0.tar.bz2 Index: sugar-base.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-base/devel/sugar-base.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sugar-base.spec 26 Feb 2009 03:35:46 -0000 1.15 +++ sugar-base.spec 3 Mar 2009 21:08:00 -0000 1.16 @@ -2,8 +2,8 @@ Summary: Base Sugar library Name: sugar-base -Version: 0.83.4 -Release: 2%{?dist} +Version: 0.84.0 +Release: 1%{?dist} #Release: 2.%{alphatag}%{?dist} URL: http://sugarlabs.org/ Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 @@ -45,6 +45,9 @@ %{python_sitelib}/* %changelog +* Tue Mar 03 2009 Simon Schampijer - 0.84.0-1 +- Rebuild for 0.84 + * Wed Feb 25 2009 Fedora Release Engineering - 0.83.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From robert at fedoraproject.org Tue Mar 3 21:09:02 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Tue, 3 Mar 2009 21:09:02 +0000 (UTC) Subject: rpms/libibcommon/devel libibcommon.spec,1.3,1.4 Message-ID: <20090303210902.66F9070116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/libibcommon/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1713 Modified Files: libibcommon.spec Log Message: Rebuilt against libtool 2.2 Index: libibcommon.spec =================================================================== RCS file: /cvs/pkgs/rpms/libibcommon/devel/libibcommon.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libibcommon.spec 25 Feb 2009 15:41:57 -0000 1.3 +++ libibcommon.spec 3 Mar 2009 21:08:32 -0000 1.4 @@ -1,7 +1,7 @@ Summary: OpenFabrics Alliance InfiniBand management common library Name: libibcommon Version: 1.1.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 or BSD Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -9,7 +9,7 @@ Url: http://openfabrics.org/ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -BuildRequires: libtool +BuildRequires: libtool, automake, autoconf %description libibcommon provides common utility functions for the OFA diagnostic and @@ -33,6 +33,9 @@ %prep %setup -q +libtoolize --copy --force +touch NEWS README +autoreconf --install --force %build %configure @@ -66,6 +69,9 @@ %{_libdir}/libibcommon.a %changelog +* Tue Mar 03 2009 Robert Scheck - 1.1.0-4 +- Rebuilt against libtool 2.2 + * Wed Feb 25 2009 Fedora Release Engineering - 1.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -74,4 +80,3 @@ * Sun Jun 08 2008 Doug Ledford - 1.1.0-1 - Initial package for Fedora review process - From jmoskovc at fedoraproject.org Tue Mar 3 21:09:37 2009 From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=) Date: Tue, 3 Mar 2009 21:09:37 +0000 (UTC) Subject: rpms/abrt/devel abrt.init, NONE, 1.1 abrt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090303210937.E056B70116@cvs1.fedora.phx.redhat.com> Author: jmoskovc Update of /cvs/extras/rpms/abrt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2037 Modified Files: .cvsignore sources Added Files: abrt.init abrt.spec Log Message: Initial release --- NEW FILE abrt.init --- #!/bin/bash # Starts the abrt daemon # # chkconfig: - 82 16 # description: Daemon to detect crashing apps # processname: abrt ### BEGIN INIT INFO # Provides: abrt # Required-Start: $syslog $local_fs # Required-Stop: $syslog $local_fs # Default-Stop: 0 1 2 3 4 5 6 # Short-Description: start and stop crash-carcher daemon # Description: Listen and dispatch crash events ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions RETVAL=0 # # See how we were called. # check() { # Check that we're a privileged user [ `id -u` = 0 ] || exit 4 # Check if abrt is executable test -x /usr/sbin/abrt || exit 5 } start() { check # Check if it is already running if [ ! -f /var/lock/subsys/abrt ]; then echo -n $"Starting abrt daemon: " daemon /usr/sbin/abrt RETVAL=$? [ $RETVAL -eq 0 ] && touch /var/lock/subsys/abrt echo fi return $RETVAL } stop() { check echo -n $"Stopping abrt daemon: " killproc /usr/sbin/abrt RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/abrt echo return $RETVAL } restart() { stop start } reload() { restart } case "$1" in start) start ;; stop) stop ;; reload) reload ;; force-reload) echo "$0: Unimplemented feature." RETVAL=3 ;; restart) restart ;; condrestart) if [ -f /var/lock/subsys/abrt ]; then restart fi ;; status) status abrt RETVAL=$? ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}" RETVAL=2 esac exit $RETVAL --- NEW FILE abrt.spec --- Summary: Automatic bug detection and reporting tool Name: abrt Version: 0.0.1 Release: 12%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/crash-catcher/ Source: http://jmoskovc.fedorapeople.org/%{name}-%{version}.tar.gz Source1: abrt.init BuildRequires: dbus-c++-devel BuildRequires: gtk2-devel BuildRequires: dbus-glib-devel BuildRequires: rpm-devel >= 4.6 BuildRequires: sqlite-devel > 3.0 BuildRequires: desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description %{name} is a tool to help users to detect defects in applications and to create a bug report with all informations needed by maintainer to fix it. It uses plugin system to extend its functionality. %package libs Summary: Libraries for %{name} Group: System Environment/Libraries %description libs Libraries for %{name}. %package devel Summary: Development libraries for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %description devel Development libraries and headers for %{name}. %package applet Summary: %{name}'s applet Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} %description applet Simple systray applet to notify user about new events detected by %{name} daemon. %package gui Summary: %{name}'s gui Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} %description gui GTK+ wizard for convenient bug reporting. %package addon-ccpp Summary: %{name}'s C/C++ addon Group: System Environment/Libraries Requires: gdb Requires: %{name} = %{version}-%{release} %description addon-ccpp This package contains hook for C/C++ crashed programs and %{name}'s C/C++ language plugin. %package plugin-sqlite3 Summary: %{name}'s SQLite3 database plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description plugin-sqlite3 This package contains SQLite3 database plugin. It is used for storing the data required for creating a bug report. %package plugin-logger Summary: %{name}'s logger reporter plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description plugin-logger The simple reporter plugin, which writes a report to a specified file. %package plugin-mailx Summary: %{name}'s mailx reporter plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: mailx %description plugin-mailx The simple reporter plugin, which sends a report via mailx to a specified email. %prep %setup -q %build %configure sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib*.la rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/lib*.la mkdir -p ${RPM_BUILD_ROOT}/%{_initrddir} install -m 755 %SOURCE1 ${RPM_BUILD_ROOT}/%{_initrddir}/%{name} mkdir -p $RPM_BUILD_ROOT/var/cache/%{name} desktop-file-install \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ src/Gui/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add %{name} %post libs -p /sbin/ldconfig %preun if [ "$1" = 0 ] ; then service %{name} stop >/dev/null 2>&1 /sbin/chkconfig --del %{name} fi %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc README COPYING %{_sbindir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf %{_initrddir}/%{name} %dir /var/cache/%{name} %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins %dir %{_libdir}/%{name} %files libs %defattr(-,root,root,-) %{_libdir}/lib*.so.* %files devel %defattr(-,root,root,-) %{_libdir}/lib*.so %files applet %defattr(-,root,root,-) %{_bindir}/cc-applet %files gui %defattr(-,root,root,-) %{_bindir}/%{name}-gui %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop %files addon-ccpp %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf %{_libdir}/%{name}/libCCpp.so* %{_libexecdir}/hookCCpp %files plugin-sqlite3 %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/SQLite3.conf %{_libdir}/%{name}/libSQLite3.so* %files plugin-logger %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Logger.conf %{_libdir}/%{name}/libLogger.so* %files plugin-mailx %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Mailx.conf %{_libdir}/%{name}/libMailx.so* %changelog * Tue Mar 3 2009 Jiri Moskovcak 0.0.1-12 - initial fedora release - changed SOURCE url - added desktop-file-utils to BR - changed crash-catcher to %%{name} * Mon Mar 2 2009 Jiri Moskovcak 0.0.1-11 - more spec file fixes according to review - async dbus method calls, added exception handler - avoid deadlocks (zprikryl) - root is god (zprikryl) - create bt only once (zprikryl) * Sat Feb 28 2009 Jiri Moskovcak 0.0.1-10 - New gui - Added new method DeleteDebugDump to daemon - Removed gcc warnings from applet - Rewritten CCpp hook and removed dealock in DebugDumps lib (zprikryl) - fixed few gcc warnings - DBusBackend improvements * Fri Feb 27 2009 Jiri Moskovcak 0.0.1-9 - fixed few gcc warnings - added scrolled window for long reports * Thu Feb 26 2009 Adam Williamson 0.0.1-8 - fixes for all issues identified in review * Thu Feb 26 2009 Jiri Moskovcak 0.0.1-7 - Fixed cancel button behaviour in reporter - disabled core file sending - removed some debug messages * Thu Feb 26 2009 Jiri Moskovcak 0.0.1-6 - fixed DB path - added new signals to handler - gui should survive the dbus timeout * Thu Feb 26 2009 Jiri Moskovcak 0.0.1-5 - fixed catching debuinfo install exceptions - some gui fixes - added check for GPGP public key * Thu Feb 26 2009 Jiri Moskovcak 0.0.1-4 - changed from full bt to simple bt * Thu Feb 26 2009 Jiri Moskovcak 0.0.1-3 - spec file cleanups - changed default paths to crash DB and log DB - fixed some memory leaks * Tue Feb 24 2009 Jiri Moskovcak 0.0.1-2 - spec cleanup - added new subpackage gui * Wed Feb 18 2009 Zdenek Prikryl 0.0.1-1 - initial packing Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abrt/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:33:12 -0000 1.1 +++ .cvsignore 3 Mar 2009 21:09:07 -0000 1.2 @@ -0,0 +1 @@ +abrt-0.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/abrt/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:33:12 -0000 1.1 +++ sources 3 Mar 2009 21:09:07 -0000 1.2 @@ -0,0 +1 @@ +37f179f0c438fc9a5906bbb00567f3ad abrt-0.0.1.tar.gz From erikos at fedoraproject.org Tue Mar 3 21:11:47 2009 From: erikos at fedoraproject.org (Simon Schampijer) Date: Tue, 3 Mar 2009 21:11:47 +0000 (UTC) Subject: rpms/sugar-datastore/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 sugar-datastore.spec, 1.14, 1.15 Message-ID: <20090303211147.EC5D070116@cvs1.fedora.phx.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-datastore/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2916 Modified Files: .cvsignore sources sugar-datastore.spec Log Message: * Tue Mar 03 2009 Simon Schampijer - 0.84.0-1 - Rebuild for 0.84 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 4 Feb 2009 12:45:34 -0000 1.11 +++ .cvsignore 3 Mar 2009 21:11:17 -0000 1.12 @@ -1 +1 @@ -sugar-datastore-0.83.3.tar.bz2 +sugar-datastore-0.84.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 4 Feb 2009 12:45:34 -0000 1.11 +++ sources 3 Mar 2009 21:11:17 -0000 1.12 @@ -1 +1 @@ -e0f691172343e7bf7e8518017a05566f sugar-datastore-0.83.3.tar.bz2 +e57580e9fd44ecc2cb7a947dd8854817 sugar-datastore-0.84.0.tar.bz2 Index: sugar-datastore.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sugar-datastore.spec 26 Feb 2009 03:41:42 -0000 1.14 +++ sugar-datastore.spec 3 Mar 2009 21:11:17 -0000 1.15 @@ -4,8 +4,8 @@ %define alphatag 20090130git%{commitid} Name: sugar-datastore -Version: 0.83.3 -Release: 2%{?dist} +Version: 0.84.0 +Release: 1%{?dist} #Release: 2.%{alphatag}%{?dist} Summary: Sugar Datastore @@ -55,6 +55,9 @@ %{_datadir}/dbus-1/services/*.service %changelog +* Tue Mar 03 2009 Simon Schampijer - 0.84.0-1 +- Rebuild for 0.84 + * Wed Feb 25 2009 Fedora Release Engineering - 0.83.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From atkac at fedoraproject.org Tue Mar 3 21:15:04 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Tue, 3 Mar 2009 21:15:04 +0000 (UTC) Subject: rpms/tightvnc/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE sources, 1.4, NONE tightvnc-102434.patch, 1.1, NONE tightvnc-bounds.patch, 1.1, NONE tightvnc-clipboard.patch, 1.1, NONE tightvnc-cookie.patch, 1.1, NONE tightvnc-manminor.patch, 1.1, NONE tightvnc-newfbsize.patch, 1.1, NONE tightvnc-rh212985.patch, 1.2, NONE tightvnc-viewer-reparent.patch, 1.1, NONE tightvnc-xclients.patch, 1.1, NONE tightvnc.spec, 1.10, NONE vncserver.init, 1.1, NONE vncserver.sysconfig, 1.1, NONE vncviewer.desktop, 1.1, NONE xserver16.patch, 1.2, NONE Message-ID: <20090303211504.B664670116@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/tightvnc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3560 Added Files: dead.package Removed Files: Makefile sources tightvnc-102434.patch tightvnc-bounds.patch tightvnc-clipboard.patch tightvnc-cookie.patch tightvnc-manminor.patch tightvnc-newfbsize.patch tightvnc-rh212985.patch tightvnc-viewer-reparent.patch tightvnc-xclients.patch tightvnc.spec vncserver.init vncserver.sysconfig vncviewer.desktop xserver16.patch Log Message: TightVNC has been obsoleted by TigerVNC. Remove all files and add dead.package. --- NEW FILE dead.package --- TightVNC has been forked as TigerVNC. Thus tightvnc package is obsoleted by tigervnc. --- Makefile DELETED --- --- sources DELETED --- --- tightvnc-102434.patch DELETED --- --- tightvnc-bounds.patch DELETED --- --- tightvnc-clipboard.patch DELETED --- --- tightvnc-cookie.patch DELETED --- --- tightvnc-manminor.patch DELETED --- --- tightvnc-newfbsize.patch DELETED --- --- tightvnc-rh212985.patch DELETED --- --- tightvnc-viewer-reparent.patch DELETED --- --- tightvnc-xclients.patch DELETED --- --- tightvnc.spec DELETED --- --- vncserver.init DELETED --- --- vncserver.sysconfig DELETED --- --- vncviewer.desktop DELETED --- --- xserver16.patch DELETED --- From robert at fedoraproject.org Tue Mar 3 21:16:32 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Tue, 3 Mar 2009 21:16:32 +0000 (UTC) Subject: rpms/ifm/devel ifm.spec,1.8,1.9 Message-ID: <20090303211632.C617570116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/ifm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3886 Modified Files: ifm.spec Log Message: Correct my wrong copy command Index: ifm.spec =================================================================== RCS file: /cvs/pkgs/rpms/ifm/devel/ifm.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ifm.spec 3 Mar 2009 20:38:38 -0000 1.8 +++ ifm.spec 3 Mar 2009 21:16:02 -0000 1.9 @@ -33,7 +33,7 @@ doc/ifm.1 # Needed for ppc64, automake can't be run here -cp -f %{_datadir}/automake-*/config.* . +cp -f %{_datadir}/automake-*/config.* etc/ %build From robert at fedoraproject.org Tue Mar 3 21:23:17 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Tue, 3 Mar 2009 21:23:17 +0000 (UTC) Subject: rpms/rubygem-pam/devel rubygem-pam.spec,1.3,1.4 Message-ID: <20090303212317.EDB9170116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/rubygem-pam/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5168 Modified Files: rubygem-pam.spec Log Message: Removed redefined version and release from subpackage Index: rubygem-pam.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-pam/devel/rubygem-pam.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rubygem-pam.spec 3 Mar 2009 20:11:19 -0000 1.3 +++ rubygem-pam.spec 3 Mar 2009 21:22:47 -0000 1.4 @@ -10,7 +10,7 @@ # Main package bundles it at a gem Name: rubygem-%{gemname} Version: 1.5.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Ruby bindings for pam Group: Development/Languages @@ -32,8 +32,6 @@ # Secondary package exposes the library not as a gem %package -n ruby-%{gemname} -Version: 1.5.3 -Release: 1%{?dist} Summary: Ruby-pam bindings exposed outside of gem Group: Development/Languages Requires: rubygem(%{gemname}) @@ -90,6 +88,9 @@ %changelog +* Tue Mar 03 2009 Robert Scheck - 1.5.3-4 +- Removed redefined version and release from subpackage + * Tue Mar 03 2009 Robert Scheck - 1.5.3-3 - Another rebuilt to solve the koji buildsystem failure From pbrobinson at fedoraproject.org Tue Mar 3 21:30:40 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Tue, 3 Mar 2009 21:30:40 +0000 (UTC) Subject: rpms/ptlib/devel .cvsignore, 1.5, 1.6 ptlib.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <20090303213040.9069770116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/ptlib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6636 Modified Files: .cvsignore ptlib.spec sources Log Message: - New release for ekiga 3.1.2 beta Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ptlib/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Jan 2009 06:13:20 -0000 1.5 +++ .cvsignore 3 Mar 2009 21:30:09 -0000 1.6 @@ -1 +1 @@ -ptlib-2.5.2.tar.bz2 +ptlib-2.6.0.tar.bz2 Index: ptlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/ptlib/devel/ptlib.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ptlib.spec 27 Feb 2009 02:53:40 -0000 1.10 +++ ptlib.spec 3 Mar 2009 21:30:10 -0000 1.11 @@ -1,7 +1,7 @@ Name: ptlib Summary: Portable Tools Library -Version: 2.5.2 -Release: 5%{?dist} +Version: 2.6.0 +Release: 1%{?dist} URL: http://www.opalvoip.org/ Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.5/%{name}-%{version}.tar.bz2 License: MPLv1.0 @@ -83,6 +83,9 @@ %attr(755,root,root) %{_bindir}/* %changelog +* Tue Mar 3 2009 Peter Robinson - 2.6.0-1 +- New release for ekiga 3.1.2 beta + * Thu Feb 26 2009 Fedora Release Engineering - 2.5.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ptlib/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Jan 2009 06:13:20 -0000 1.5 +++ sources 3 Mar 2009 21:30:10 -0000 1.6 @@ -1 +1 @@ -7d8dcd999827d51ad4a15afe74aad181 ptlib-2.5.2.tar.bz2 +87328d0c072b8a9837531f0ad0e926cf ptlib-2.6.0.tar.bz2 From erikos at fedoraproject.org Tue Mar 3 21:32:32 2009 From: erikos at fedoraproject.org (Simon Schampijer) Date: Tue, 3 Mar 2009 21:32:32 +0000 (UTC) Subject: rpms/sugar-browse/devel .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 sugar-browse.spec, 1.13, 1.14 Message-ID: <20090303213232.397B070116@cvs1.fedora.phx.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-browse/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7038 Modified Files: .cvsignore sources sugar-browse.spec Log Message: * Tue Mar 03 2009 Simon Schampijer - 105-1 - New translations Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-browse/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Feb 2009 10:05:50 -0000 1.4 +++ .cvsignore 3 Mar 2009 21:32:01 -0000 1.5 @@ -1 +1 @@ -Browse-104.tar.bz2 +Browse-105.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Feb 2009 11:48:00 -0000 1.5 +++ sources 3 Mar 2009 21:32:01 -0000 1.6 @@ -1 +1 @@ -cc08d53d7abca6fa0b18a6855e089734 Browse-104.tar.bz2 +770ba65fb167eca4de853e66ea173644 Browse-105.tar.bz2 Index: sugar-browse.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sugar-browse.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sugar-browse.spec 26 Feb 2009 03:36:49 -0000 1.13 +++ sugar-browse.spec 3 Mar 2009 21:32:01 -0000 1.14 @@ -1,6 +1,6 @@ Name: sugar-browse -Version: 104 -Release: 5%{?dist} +Version: 105 +Release: 1%{?dist} Summary: Browse activity for Sugar Group: Sugar/Activities License: GPLv2+ @@ -40,6 +40,9 @@ %changelog +* Tue Mar 03 2009 Simon Schampijer - 105-1 +- New translations + * Wed Feb 25 2009 Fedora Release Engineering - 104-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From erikos at fedoraproject.org Tue Mar 3 21:32:59 2009 From: erikos at fedoraproject.org (Simon Schampijer) Date: Tue, 3 Mar 2009 21:32:59 +0000 (UTC) Subject: rpms/sugar-write/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 sugar-write.spec, 1.5, 1.6 Message-ID: <20090303213259.D260270116@cvs1.fedora.phx.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-write/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7168 Modified Files: .cvsignore sources sugar-write.spec Log Message: * Tue Mar 03 2009 Simon Schampijer - 63-1 - Update to API change, render_page_to_image starts now with 1 #152 - Override get_preview #152 - Deprecation fix: Use bundle_id instead od service_name - Updated translations Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-write/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Feb 2009 20:51:40 -0000 1.4 +++ .cvsignore 3 Mar 2009 21:32:29 -0000 1.5 @@ -1 +1 @@ -Write-62.tar.bz2 +Write-63.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-write/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Feb 2009 20:51:40 -0000 1.4 +++ sources 3 Mar 2009 21:32:29 -0000 1.5 @@ -1 +1 @@ -686a2a913daf947fa4be5bbf68424df9 Write-62.tar.bz2 +fa0fa4984dd2ea8a6842746cbe76b285 Write-63.tar.bz2 Index: sugar-write.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-write/devel/sugar-write.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sugar-write.spec 26 Feb 2009 04:02:12 -0000 1.5 +++ sugar-write.spec 3 Mar 2009 21:32:29 -0000 1.6 @@ -1,6 +1,6 @@ Name: sugar-write -Version: 62 -Release: 2%{?dist} +Version: 63 +Release: 1%{?dist} Summary: Word processor for Sugar Group: Sugar/Activities License: GPLv2+ @@ -39,6 +39,12 @@ %changelog +* Tue Mar 03 2009 Simon Schampijer - 63-1 +- Update to API change, render_page_to_image starts now with 1 #152 +- Override get_preview #152 +- Deprecation fix: Use bundle_id instead od service_name +- Updated translations + * Wed Feb 25 2009 Fedora Release Engineering - 62-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From davidz at fedoraproject.org Tue Mar 3 21:34:23 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Tue, 3 Mar 2009 21:34:23 +0000 (UTC) Subject: rpms/DeviceKit-disks/devel devkit-disks-use-devt-to-identify-mounts.patch, NONE, 1.1 DeviceKit-disks.spec, 1.5, 1.6 Message-ID: <20090303213423.BCDEF70116@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/DeviceKit-disks/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7612 Modified Files: DeviceKit-disks.spec Added Files: devkit-disks-use-devt-to-identify-mounts.patch Log Message: * Tue Mar 03 2009 David Zeuthen - 003-2%{?dist} - Identify mounts using dev_t, not device files (#488258) devkit-disks-use-devt-to-identify-mounts.patch: --- NEW FILE devkit-disks-use-devt-to-identify-mounts.patch --- >From 7cca7ee84bd3f15f86a8648e4c39a2d3f8756803 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Tue, 03 Mar 2009 21:20:08 +0000 Subject: use dev_t to identify mounts, not device files This should fix all issues with things like device-mapper using non-canonical device file names (e.g. /dev/mapper/VolGroup00-LogVol00). Also, this allows us to delete a bunch of special case code that already tried to deal with this See https://bugzilla.redhat.com/show_bug.cgi?id=488258 for details. --- diff --git a/src/devkit-disks-daemon.c b/src/devkit-disks-daemon.c index 944a231..4a2582f 100644 --- a/src/devkit-disks-daemon.c +++ b/src/devkit-disks-daemon.c @@ -96,6 +96,7 @@ struct DevkitDisksDaemonPrivate GIOChannel *mdstat_channel; + GHashTable *map_dev_t_to_device; GHashTable *map_device_file_to_device; GHashTable *map_native_path_to_device; GHashTable *map_object_path_to_device; @@ -504,6 +505,10 @@ static void devkit_disks_daemon_init (DevkitDisksDaemon *daemon) { daemon->priv = DEVKIT_DISKS_DAEMON_GET_PRIVATE (daemon); + daemon->priv->map_dev_t_to_device = g_hash_table_new_full (g_direct_hash, + g_direct_equal, + NULL, + NULL); daemon->priv->map_device_file_to_device = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, @@ -546,6 +551,9 @@ devkit_disks_daemon_finalize (GObject *object) if (daemon->priv->mdstat_channel != NULL) g_io_channel_unref (daemon->priv->mdstat_channel); + if (daemon->priv->map_dev_t_to_device != NULL) { + g_hash_table_unref (daemon->priv->map_dev_t_to_device); + } if (daemon->priv->map_device_file_to_device != NULL) { g_hash_table_unref (daemon->priv->map_device_file_to_device); } @@ -678,6 +686,9 @@ device_went_away (gpointer user_data, GObject *where_the_object_was) g_hash_table_foreach_remove (daemon->priv->map_device_file_to_device, device_went_away_remove_cb, where_the_object_was); + g_hash_table_foreach_remove (daemon->priv->map_dev_t_to_device, + device_went_away_remove_quiet_cb, + where_the_object_was); g_hash_table_foreach_remove (daemon->priv->map_native_path_to_device, device_went_away_remove_quiet_cb, where_the_object_was); @@ -755,6 +766,9 @@ device_add (DevkitDisksDaemon *daemon, DevkitDevice *d, gboolean emit_event) * dbus-glib, no cookie for you. */ g_object_weak_ref (G_OBJECT (device), device_went_away, daemon); + g_hash_table_insert (daemon->priv->map_dev_t_to_device, + GINT_TO_POINTER (devkit_disks_device_local_get_dev (device)), + device); g_hash_table_insert (daemon->priv->map_device_file_to_device, g_strdup (devkit_disks_device_local_get_device_file (device)), device); @@ -817,6 +831,12 @@ device_event_signal_handler (DevkitClient *client, } DevkitDisksDevice * +devkit_disks_daemon_local_find_by_dev (DevkitDisksDaemon *daemon, dev_t dev) +{ + return g_hash_table_lookup (daemon->priv->map_dev_t_to_device, GINT_TO_POINTER (dev)); +} + +DevkitDisksDevice * devkit_disks_daemon_local_find_by_device_file (DevkitDisksDaemon *daemon, const char *device_file) { return g_hash_table_lookup (daemon->priv->map_device_file_to_device, device_file); @@ -849,8 +869,8 @@ mount_removed (DevkitDisksMountMonitor *monitor, DevkitDisksDaemon *daemon = DEVKIT_DISKS_DAEMON (user_data); DevkitDisksDevice *device; - device = g_hash_table_lookup (daemon->priv->map_device_file_to_device, - devkit_disks_mount_get_device_file (mount)); + device = g_hash_table_lookup (daemon->priv->map_dev_t_to_device, + GINT_TO_POINTER (devkit_disks_mount_get_dev (mount))); if (device != NULL) { g_print ("**** UNMOUNTED %s\n", device->priv->native_path); devkit_disks_daemon_local_synthesize_changed (daemon, device); @@ -865,8 +885,8 @@ mount_added (DevkitDisksMountMonitor *monitor, DevkitDisksDaemon *daemon = DEVKIT_DISKS_DAEMON (user_data); DevkitDisksDevice *device; - device = g_hash_table_lookup (daemon->priv->map_device_file_to_device, - devkit_disks_mount_get_device_file (mount)); + device = g_hash_table_lookup (daemon->priv->map_dev_t_to_device, + GINT_TO_POINTER (devkit_disks_mount_get_dev (mount))); if (device != NULL) { g_print ("**** MOUNTED %s\n", device->priv->native_path); devkit_disks_daemon_local_synthesize_changed (daemon, device); diff --git a/src/devkit-disks-daemon.h b/src/devkit-disks-daemon.h index a31cc28..c29c6c4 100644 --- a/src/devkit-disks-daemon.h +++ b/src/devkit-disks-daemon.h @@ -98,6 +98,9 @@ DevkitDisksDevice *devkit_disks_daemon_local_find_by_object_path (DevkitDisksDae DevkitDisksDevice *devkit_disks_daemon_local_find_by_device_file (DevkitDisksDaemon *daemon, const char *device_file); +DevkitDisksDevice *devkit_disks_daemon_local_find_by_dev (DevkitDisksDaemon *daemon, + dev_t dev); + PolKitCaller *devkit_disks_damon_local_get_caller_for_context (DevkitDisksDaemon *daemon, DBusGMethodInvocation *context); diff --git a/src/devkit-disks-device-private.h b/src/devkit-disks-device-private.h index 78f83f7..e84b80c 100644 --- a/src/devkit-disks-device-private.h +++ b/src/devkit-disks-device-private.h @@ -88,6 +88,8 @@ struct DevkitDisksDevicePrivate /* if non-zero, the id of the idle for emitting a 'change' signal */ guint emit_changed_idle_id; + dev_t dev; /* not exported */ + /**************/ /* properties */ /*************/ diff --git a/src/devkit-disks-device.c b/src/devkit-disks-device.c index 7c45806..bd2ec7f 100644 --- a/src/devkit-disks-device.c +++ b/src/devkit-disks-device.c @@ -2643,7 +2643,7 @@ update_info_mount_state (DevkitDisksDevice *device) goto out; monitor = devkit_disks_daemon_local_get_mount_monitor (device->priv->daemon); - mount = devkit_disks_mount_monitor_get_mount_for_device_file (monitor, device->priv->device_file); + mount = devkit_disks_mount_monitor_get_mount_for_dev (monitor, device->priv->dev); was_mounted = device->priv->device_is_mounted; old_mount_path = g_strdup (device->priv->device_mount_path); @@ -2762,6 +2762,8 @@ update_info (DevkitDisksDevice *device) GPtrArray *symlinks_by_path; GPtrArray *slaves; GPtrArray *holders; + gint major; + gint minor; ret = FALSE; @@ -2780,6 +2782,16 @@ update_info (DevkitDisksDevice *device) devkit_disks_device_set_device_is_drive (device, FALSE); } + if (!devkit_device_has_property (device->priv->d, "MAJOR") || + !devkit_device_has_property (device->priv->d, "MINOR")) { + g_warning ("No major/minor for %s", device->priv->native_path); + goto out; + } + + major = devkit_device_get_property_as_int (device->priv->d, "MAJOR"); + minor = devkit_device_get_property_as_int (device->priv->d, "MINOR"); + device->priv->dev = makedev (major, minor); + devkit_disks_device_set_device_file (device, devkit_device_get_device_file (device->priv->d)); if (device->priv->device_file == NULL) { g_warning ("No device file for %s", device->priv->native_path); @@ -3347,6 +3359,12 @@ devkit_disks_device_local_get_native_path (DevkitDisksDevice *device) return device->priv->native_path; } +dev_t +devkit_disks_device_local_get_dev (DevkitDisksDevice *device) +{ + return device->priv->dev; +} + const char * devkit_disks_device_local_get_device_file (DevkitDisksDevice *device) { diff --git a/src/devkit-disks-device.h b/src/devkit-disks-device.h index 6470580..739ed1f 100644 --- a/src/devkit-disks-device.h +++ b/src/devkit-disks-device.h @@ -66,6 +66,7 @@ void devkit_disks_device_removed (DevkitDisksDevice const char *devkit_disks_device_local_get_object_path (DevkitDisksDevice *device); const char *devkit_disks_device_local_get_native_path (DevkitDisksDevice *device); +dev_t devkit_disks_device_local_get_dev (DevkitDisksDevice *device); const char *devkit_disks_device_local_get_device_file (DevkitDisksDevice *device); const char *devkit_disks_device_local_get_mount_path (DevkitDisksDevice *device); diff --git a/src/devkit-disks-mount-monitor.c b/src/devkit-disks-mount-monitor.c index 4dd0190..ff4722a 100644 --- a/src/devkit-disks-mount-monitor.c +++ b/src/devkit-disks-mount-monitor.c @@ -82,9 +82,9 @@ devkit_disks_mount_monitor_init (DevkitDisksMountMonitor *monitor) DEVKIT_DISKS_TYPE_MOUNT_MONITOR, DevkitDisksMountMonitorPrivate); - monitor->priv->mounts = g_hash_table_new_full (g_str_hash, - g_str_equal, - g_free, + monitor->priv->mounts = g_hash_table_new_full (g_direct_hash, + g_direct_equal, + NULL, g_object_unref); } @@ -262,79 +262,6 @@ out: return mount_monitor; } -static const char * -_resolve_dev_root (void) -{ - static gboolean have_real_dev_root = FALSE; - static char real_dev_root[256]; - struct stat statbuf; - - /* see if it's cached already */ - if (have_real_dev_root) - goto found; - - /* otherwise we're going to find it right away.. */ - have_real_dev_root = TRUE; - - if (stat ("/dev/root", &statbuf) == 0) { - if (! S_ISLNK (statbuf.st_mode)) { - dev_t root_dev = statbuf.st_dev; - FILE *f; - char buf[1024]; - - /* see if device with similar major:minor as /dev/root is mentioned - * in /etc/mtab (it usually is) - */ - f = fopen ("/etc/mtab", "r"); - if (f != NULL) { - struct mntent *entp; - struct mntent ent; - while ((entp = getmntent_r (f, &ent, buf, sizeof (buf))) != NULL) { - if (stat (entp->mnt_fsname, &statbuf) == 0 && - statbuf.st_dev == root_dev) { - strncpy (real_dev_root, entp->mnt_fsname, sizeof (real_dev_root) - 1); - real_dev_root[sizeof (real_dev_root) - 1] = '\0'; - fclose (f); - goto found; - } - } - endmntent (f); - } - /* no, that didn't work.. next we could scan /dev ... but I digress.. */ - } else { - char resolved[PATH_MAX]; - if (realpath ("/dev/root", resolved) != NULL) { - strncpy (real_dev_root, resolved, sizeof (real_dev_root) - 1); - real_dev_root[sizeof (real_dev_root) - 1] = '\0'; - goto found; - } - } - } - - /* bah sucks.. */ - strcpy (real_dev_root, "/dev/root"); -found: - return real_dev_root; -} - -/* device-mapper likes to create it's own device nodes a'la /dev/mapper/VolGroup00-LogVol00; - * this is pretty useless... So check the major/minor and map back to /dev/dm- - * if major==253. - */ -static char * -_check_lvm (const char *device_path) -{ - struct stat statbuf; - if (stat (device_path, &statbuf) == 0) { - if (major (statbuf.st_rdev) == 253) { - /* TODO: should check that /dev/dm-%d exists and has same major/minor */ - return g_strdup_printf ("/dev/dm-%d", minor (statbuf.st_rdev)); - } - } - - return NULL; -} - void devkit_disks_mount_monitor_invalidate (DevkitDisksMountMonitor *monitor) { @@ -358,37 +285,22 @@ devkit_disks_mount_monitor_ensure (DevkitDisksMountMonitor *monitor) } while ((m = getmntent (f)) != NULL) { DevkitDisksMount *mount; - const gchar *device_file; - gchar *s; - gchar real_path[PATH_MAX]; + struct stat statbuf; /* ignore if not an absolute patch */ if (m->mnt_fsname[0] != '/') continue; - /* canonicalize */ - realpath (m->mnt_fsname, real_path); - if (strcmp (real_path, "/dev/root") == 0) { - device_file = _resolve_dev_root (); - } else { - device_file = real_path; - } - - s = NULL; - if (g_str_has_prefix (device_file, "/dev/mapper/")) { - s = _check_lvm (m->mnt_fsname); - if (s != NULL) { - device_file = s; - } - } - - mount = _devkit_disks_mount_new (device_file, m->mnt_dir); + if (stat (m->mnt_fsname, &statbuf) != 0) { + g_warning ("Cannot stat %s: %m", m->mnt_fsname); + } else if (statbuf.st_rdev != 0) { - g_free (s); + mount = _devkit_disks_mount_new (statbuf.st_rdev, m->mnt_dir); - g_hash_table_insert (monitor->priv->mounts, - g_strdup (device_file), - mount); + g_hash_table_insert (monitor->priv->mounts, + GINT_TO_POINTER (statbuf.st_rdev), + mount); + } } fclose (f); @@ -399,10 +311,14 @@ out: } DevkitDisksMount * -devkit_disks_mount_monitor_get_mount_for_device_file (DevkitDisksMountMonitor *monitor, - const gchar *device_file) +devkit_disks_mount_monitor_get_mount_for_dev (DevkitDisksMountMonitor *monitor, + dev_t dev) { + DevkitDisksMount *ret; + devkit_disks_mount_monitor_ensure (monitor); - return g_hash_table_lookup (monitor->priv->mounts, device_file); + ret = g_hash_table_lookup (monitor->priv->mounts, GINT_TO_POINTER (dev)); + + return ret; } diff --git a/src/devkit-disks-mount-monitor.h b/src/devkit-disks-mount-monitor.h index c931431..ac9a9ee 100644 --- a/src/devkit-disks-mount-monitor.h +++ b/src/devkit-disks-mount-monitor.h @@ -48,8 +48,8 @@ struct DevkitDisksMountMonitorClass GType devkit_disks_mount_monitor_get_type (void) G_GNUC_CONST; DevkitDisksMountMonitor *devkit_disks_mount_monitor_new (void); -DevkitDisksMount *devkit_disks_mount_monitor_get_mount_for_device_file (DevkitDisksMountMonitor *monitor, - const gchar *device_file); +DevkitDisksMount *devkit_disks_mount_monitor_get_mount_for_dev (DevkitDisksMountMonitor *monitor, + dev_t dev); void devkit_disks_mount_monitor_invalidate (DevkitDisksMountMonitor *monitor); G_END_DECLS diff --git a/src/devkit-disks-mount.c b/src/devkit-disks-mount.c index c283c5e..3f71375 100644 --- a/src/devkit-disks-mount.c +++ b/src/devkit-disks-mount.c @@ -43,7 +43,7 @@ struct DevkitDisksMountPrivate { gchar *mount_path; - gchar *device_file; + dev_t dev; }; G_DEFINE_TYPE (DevkitDisksMount, devkit_disks_mount, G_TYPE_OBJECT) @@ -56,7 +56,6 @@ devkit_disks_mount_finalize (GObject *object) DevkitDisksMount *mount = DEVKIT_DISKS_MOUNT (object); g_free (mount->priv->mount_path); - g_free (mount->priv->device_file); if (G_OBJECT_CLASS (devkit_disks_mount_parent_class)->finalize) (* G_OBJECT_CLASS (devkit_disks_mount_parent_class)->finalize) (object); @@ -80,12 +79,12 @@ devkit_disks_mount_class_init (DevkitDisksMountClass *klass) DevkitDisksMount * -_devkit_disks_mount_new (const gchar *device_file, const gchar *mount_path) +_devkit_disks_mount_new (dev_t dev, const gchar *mount_path) { DevkitDisksMount *mount; mount = DEVKIT_DISKS_MOUNT (g_object_new (DEVKIT_DISKS_TYPE_MOUNT, NULL)); - mount->priv->device_file = g_strdup (device_file); + mount->priv->dev = dev; mount->priv->mount_path = g_strdup (mount_path); return mount; @@ -98,11 +97,11 @@ devkit_disks_mount_get_mount_path (DevkitDisksMount *mount) return mount->priv->mount_path; } -const gchar * -devkit_disks_mount_get_device_file (DevkitDisksMount *mount) +dev_t +devkit_disks_mount_get_dev (DevkitDisksMount *mount) { - g_return_val_if_fail (DEVKIT_DISKS_IS_MOUNT (mount), NULL); - return mount->priv->device_file; + g_return_val_if_fail (DEVKIT_DISKS_IS_MOUNT (mount), 0); + return mount->priv->dev; } gint @@ -115,7 +114,7 @@ devkit_disks_mount_compare (DevkitDisksMount *a, if (ret != 0) goto out; - ret = g_strcmp0 (a->priv->device_file, b->priv->device_file); + ret = (a->priv->dev - b->priv->dev); out: return ret; diff --git a/src/devkit-disks-mount.h b/src/devkit-disks-mount.h index f8fc2c9..e6bc1d0 100644 --- a/src/devkit-disks-mount.h +++ b/src/devkit-disks-mount.h @@ -21,6 +21,8 @@ #ifndef __DEVKIT_DISKS_MOUNT_H__ #define __DEVKIT_DISKS_MOUNT_H__ +#include + #include "devkit-disks-types.h" G_BEGIN_DECLS @@ -48,7 +50,7 @@ struct DevkitDisksMountClass GType devkit_disks_mount_get_type (void) G_GNUC_CONST; const gchar *devkit_disks_mount_get_mount_path (DevkitDisksMount *mount); -const gchar *devkit_disks_mount_get_device_file (DevkitDisksMount *mount); +dev_t devkit_disks_mount_get_dev (DevkitDisksMount *mount); gint devkit_disks_mount_compare (DevkitDisksMount *a, DevkitDisksMount *b); diff --git a/src/devkit-disks-private.h b/src/devkit-disks-private.h index c746ae0..c528eda 100644 --- a/src/devkit-disks-private.h +++ b/src/devkit-disks-private.h @@ -25,7 +25,8 @@ G_BEGIN_DECLS -DevkitDisksMount *_devkit_disks_mount_new (const gchar *device_file, const gchar *mount_path); +DevkitDisksMount *_devkit_disks_mount_new (dev_t dev, + const gchar *mount_path); G_END_DECLS -- cgit v0.8.2 Index: DeviceKit-disks.spec =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DeviceKit-disks.spec 2 Mar 2009 21:39:47 -0000 1.5 +++ DeviceKit-disks.spec 3 Mar 2009 21:33:53 -0000 1.6 @@ -11,7 +11,7 @@ Summary: Disk Management Service Name: DeviceKit-disks Version: 003 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary @@ -37,6 +37,8 @@ Requires: smartmontools Conflicts: kernel < 2.6.25 +Patch0: devkit-disks-use-devt-to-identify-mounts.patch + %description DeviceKit-disks provides a daemon, D-Bus API and command line tools for managing disks and storage devices. @@ -54,6 +56,8 @@ %prep %setup -q +%patch0 -p1 -b .use-devt-for-mounts + %build %configure make @@ -107,6 +111,9 @@ %{_datadir}/gtk-doc/html/devkit-disks/* %changelog +* Tue Mar 03 2009 David Zeuthen - 003-2%{?dist} +- Identify mounts using dev_t, not device files (#488258) + * Mon Mar 02 2009 David Zeuthen - 003-1%{?dist} - Update to version 003 From kkofler at fedoraproject.org Tue Mar 3 21:38:24 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 3 Mar 2009 21:38:24 +0000 (UTC) Subject: rpms/mingw32-nsis/devel mingw32-nsis.spec, 1.5, 1.6 nsis-2.43-rpm-opt.patch, 1.3, 1.4 nsis-2.43-debian-debug-opt.patch, 1.2, NONE Message-ID: <20090303213824.EEF4B70116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/mingw32-nsis/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8385/devel Modified Files: mingw32-nsis.spec nsis-2.43-rpm-opt.patch Removed Files: nsis-2.43-debian-debug-opt.patch Log Message: * Tue Mar 3 2009 Kevin Kofler - 2.43-6 - Don't build the MinGW parts with debugging information, NSIS corrupts the debugging information in the stubs when building installers from them - Drop debian-debug-opt patch, all its changes are either taken care of by our rpm-opt patch, unwanted (see above) or unneeded. Index: mingw32-nsis.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-nsis/devel/mingw32-nsis.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mingw32-nsis.spec 25 Feb 2009 13:18:19 -0000 1.5 +++ mingw32-nsis.spec 3 Mar 2009 21:37:54 -0000 1.6 @@ -1,9 +1,9 @@ -%define sconsopts VERSION=%{version} PREFIX=%{_prefix} PREFIX_CONF=%{_sysconfdir} SKIPPLUGINS=System SKIPUTILS='NSIS Menu' DEBUG_SYMBOLS=1 OPTS=1 +%define sconsopts VERSION=%{version} PREFIX=%{_prefix} PREFIX_CONF=%{_sysconfdir} SKIPPLUGINS=System SKIPUTILS='NSIS Menu' STRIP_CP=false %define _default_patch_fuzz 2 Name: mingw32-nsis Version: 2.43 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Nullsoft Scriptable Install System License: zlib and CPL @@ -15,10 +15,8 @@ # This patch fixes NSIS to actually build 64-bit versions. # Originally from Debian, updated by Kevin Kofler. Patch0: nsis-2.43-64bit-fixes.patch -# Patches from Debian (mainly by Paul Wise). -Patch1: nsis-2.43-debian-debug-opt.patch # Use RPM_OPT_FLAGS for the natively-built parts -Patch2: nsis-2.43-rpm-opt.patch +Patch1: nsis-2.43-rpm-opt.patch BuildRequires: mingw32-filesystem >= 40 BuildRequires: mingw32-gcc @@ -61,8 +59,7 @@ %setup -q -n nsis-%{version}-src %patch0 -p1 -b .64bit -%patch1 -p1 -b .debug -%patch2 -p1 -b .rpmopt +%patch1 -p1 -b .rpmopt %build @@ -92,15 +89,21 @@ %changelog +* Tue Mar 3 2009 Kevin Kofler - 2.43-6 +- Don't build the MinGW parts with debugging information, NSIS corrupts the + debugging information in the stubs when building installers from them +- Drop debian-debug-opt patch, all its changes are either taken care of by our + rpm-opt patch, unwanted (see above) or unneeded. + * Wed Feb 25 2009 Kevin Kofler - 2.43-5 - Use RPM_OPT_FLAGS for the natively-built parts * Wed Feb 25 2009 Kevin Kofler - 2.43-4 -- Updated 64bit-fixes patch (remove some more -m32 use). -- Drop ExclusiveArch, not needed with the above. -- Obsoletes/Provides nsis and nsis-data for migration path from CalcForge. -- Disable NSIS Menu (does not work on *nix, see specfile comment for details). -- Drop BR wxGTK-devel. +- Updated 64bit-fixes patch (remove some more -m32 use) +- Drop ExclusiveArch, not needed with the above +- Obsoletes/Provides nsis and nsis-data for migration path from CalcForge +- Disable NSIS Menu (does not work on *nix, see specfile comment for details) +- Drop BR wxGTK-devel * Sat Feb 21 2009 Richard W.M. Jones - 2.43-3 - Restore ExclusiveArch line (Levente Farkas). nsis-2.43-rpm-opt.patch: Index: nsis-2.43-rpm-opt.patch =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-nsis/devel/nsis-2.43-rpm-opt.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nsis-2.43-rpm-opt.patch 25 Feb 2009 13:11:25 -0000 1.3 +++ nsis-2.43-rpm-opt.patch 3 Mar 2009 21:37:54 -0000 1.4 @@ -1,6 +1,6 @@ -diff -ur nsis-2.43-src-debian-debug-opt/SCons/Config/gnu nsis-2.43-src-rpm-opt/SCons/Config/gnu ---- nsis-2.43-src-debian-debug-opt/SCons/Config/gnu 2009-02-25 08:35:01.000000000 +0100 -+++ nsis-2.43-src-rpm-opt/SCons/Config/gnu 2009-02-25 14:09:34.000000000 +0100 +diff -ur nsis-2.43-src-64bit-fixes/SCons/Config/gnu nsis-2.43-src-rpm-opt/SCons/Config/gnu +--- nsis-2.43-src-64bit-fixes/SCons/Config/gnu 2009-02-25 08:33:39.000000000 +0100 ++++ nsis-2.43-src-rpm-opt/SCons/Config/gnu 2009-03-03 22:24:49.000000000 +0100 @@ -1,5 +1,7 @@ print "Using GNU tools configuration" @@ -9,20 +9,20 @@ Import('defenv') ### imports -@@ -95,7 +97,7 @@ - makensis_env.Append(LINKFLAGS = '-g') # debugging - makensis_env.Append(CCFLAGS = '-g') # debugging - if not defenv['DEBUG'] and defenv['OPT']: -- makensis_env.Append(CCFLAGS = ['-O2']) # optimize -+ makensis_env.Append(CCFLAGS = os.getenv('RPM_OPT_FLAGS')) # optimize +@@ -89,7 +91,7 @@ + makensis_env.Append(CPPPATH = ['#$BUILD_CONFIG']) + + if not defenv['DEBUG']: +- makensis_env.Append(CCFLAGS = ['-O2']) # optimize ++ makensis_env.Append(CCFLAGS = os.getenv('RPM_OPT_FLAGS')) # optimize makensis_env.Append(CFLAGS = ['-Wall']) # all warnings makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore virtual dtor warnings makensis_env.Append(CXXFLAGS = ['-Wall']) # all warnings -@@ -158,6 +160,7 @@ +@@ -146,6 +148,7 @@ ### cross-platform util environment adjustments +cp_util_env.Append(CCFLAGS = os.getenv('RPM_OPT_FLAGS')) conf = FlagsConfigure(cp_util_env) - if not defenv['DEBUG'] and not defenv['DEBUG_SYMBOLS'] and defenv['STRIP'] and defenv['STRIP_CP']: + if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']: TestStrip(conf) # strip --- nsis-2.43-debian-debug-opt.patch DELETED --- From apevec at fedoraproject.org Tue Mar 3 21:41:14 2009 From: apevec at fedoraproject.org (Alan Pevec) Date: Tue, 3 Mar 2009 21:41:14 +0000 (UTC) Subject: rpms/collectd/F-10 .cvsignore, 1.8, 1.9 collectd.spec, 1.15, 1.16 sources, 1.8, 1.9 Message-ID: <20090303214114.180E470116@cvs1.fedora.phx.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/collectd/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8843 Modified Files: .cvsignore collectd.spec sources Log Message: * Tue Mar 03 2009 Alan Pevec 4.5.3-1 - New upstream version 4.5.3 - fixes collectd is built without iptables plugin, bz# 479208 - list all expected plugins explicitly to avoid such bugs Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/collectd/F-10/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 30 Nov 2008 11:45:31 -0000 1.8 +++ .cvsignore 3 Mar 2009 21:40:43 -0000 1.9 @@ -1 +1 @@ -collectd-4.5.1.tar.bz2 +collectd-4.5.3.tar.bz2 Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/F-10/collectd.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- collectd.spec 7 Dec 2008 20:54:11 -0000 1.15 +++ collectd.spec 3 Mar 2009 21:40:43 -0000 1.16 @@ -1,15 +1,16 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd -Version: 4.5.1 -Release: 2.1%{?dist} +Version: 4.5.3 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ Source: http://collectd.org/files/%{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-include-collectd.d.patch +Patch0: %{name}-4.5.1-include-collectd.d.patch # bug 468067 "pkg-config --libs OpenIPMIpthread" fails -Patch1: %{name}-%{version}-configure-OpenIPMI.patch +Patch1: %{name}-4.5.1-configure-OpenIPMI.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libvirt-devel, libxml2-devel @@ -156,9 +157,9 @@ %build %configure \ - --without-libiptc \ --disable-ascent \ --disable-static \ + --disable-ipvs \ --enable-mysql \ --enable-sensors \ --enable-email \ @@ -168,6 +169,7 @@ --enable-ipmi \ --enable-nut \ --enable-postgresql \ + --enable-iptables \ --with-perl-bindings=INSTALLDIRS=vendor %{__make} %{?_smp_mflags} @@ -267,21 +269,46 @@ %dir %{_localstatedir}/lib/collectd/ %dir %{_libdir}/collectd -%{_libdir}/collectd/*.so* +%{_libdir}/collectd/apcups.so +%{_libdir}/collectd/battery.so +%{_libdir}/collectd/cpu.so +%{_libdir}/collectd/cpufreq.so +%{_libdir}/collectd/csv.so +%{_libdir}/collectd/df.so +%{_libdir}/collectd/disk.so +%{_libdir}/collectd/entropy.so +%{_libdir}/collectd/exec.so +%{_libdir}/collectd/filecount.so +%{_libdir}/collectd/hddtemp.so +%{_libdir}/collectd/interface.so +%{_libdir}/collectd/iptables.so +%{_libdir}/collectd/irq.so +%{_libdir}/collectd/load.so +%{_libdir}/collectd/logfile.so +%{_libdir}/collectd/mbmon.so +%{_libdir}/collectd/memcached.so +%{_libdir}/collectd/memory.so +%{_libdir}/collectd/multimeter.so +%{_libdir}/collectd/network.so +%{_libdir}/collectd/nfs.so +%{_libdir}/collectd/ntpd.so +%{_libdir}/collectd/ping.so +%{_libdir}/collectd/powerdns.so +%{_libdir}/collectd/processes.so +%{_libdir}/collectd/serial.so +%{_libdir}/collectd/swap.so +%{_libdir}/collectd/syslog.so +%{_libdir}/collectd/tail.so +%{_libdir}/collectd/tcpconns.so +%{_libdir}/collectd/teamspeak2.so +%{_libdir}/collectd/thermal.so +%{_libdir}/collectd/unixsock.so +%{_libdir}/collectd/users.so +%{_libdir}/collectd/uuid.so +%{_libdir}/collectd/vmem.so +%{_libdir}/collectd/vserver.so +%{_libdir}/collectd/wireless.so %{_libdir}/collectd/types.db -%exclude %{_libdir}/collectd/apache.so* -%exclude %{_libdir}/collectd/dns.so* -%exclude %{_libdir}/collectd/email.so* -%exclude %{_libdir}/collectd/ipmi.so* -%exclude %{_libdir}/collectd/libvirt.so* -%exclude %{_libdir}/collectd/nut.so* -%exclude %{_libdir}/collectd/mysql.so* -%exclude %{_libdir}/collectd/nginx.so* -%exclude %{_libdir}/collectd/perl.so* -%exclude %{_libdir}/collectd/postgresql.so* -%exclude %{_libdir}/collectd/rrdtool.so* -%exclude %{_libdir}/collectd/sensors.so* -%exclude %{_libdir}/collectd/snmp.so* %doc AUTHORS ChangeLog COPYING INSTALL README %doc %{_mandir}/man1/collectd.1* @@ -295,51 +322,51 @@ %files apache %defattr(-, root, root, -) -%{_libdir}/collectd/apache.so* +%{_libdir}/collectd/apache.so %config(noreplace) %{_sysconfdir}/collectd.d/apache.conf %files dns %defattr(-, root, root, -) -%{_libdir}/collectd/dns.so* +%{_libdir}/collectd/dns.so %config(noreplace) %{_sysconfdir}/collectd.d/dns.conf %files email %defattr(-, root, root, -) -%{_libdir}/collectd/email.so* +%{_libdir}/collectd/email.so %config(noreplace) %{_sysconfdir}/collectd.d/email.conf %doc %{_mandir}/man5/collectd-email.5* %files ipmi %defattr(-, root, root, -) -%{_libdir}/collectd/ipmi.so* +%{_libdir}/collectd/ipmi.so %config(noreplace) %{_sysconfdir}/collectd.d/ipmi.conf %files mysql %defattr(-, root, root, -) -%{_libdir}/collectd/mysql.so* +%{_libdir}/collectd/mysql.so %config(noreplace) %{_sysconfdir}/collectd.d/mysql.conf %files nginx %defattr(-, root, root, -) -%{_libdir}/collectd/nginx.so* +%{_libdir}/collectd/nginx.so %config(noreplace) %{_sysconfdir}/collectd.d/nginx.conf %files nut %defattr(-, root, root, -) -%{_libdir}/collectd/nut.so* +%{_libdir}/collectd/nut.so %config(noreplace) %{_sysconfdir}/collectd.d/nut.conf %files -n perl-Collectd %defattr(-, root, root, -) %doc perl-examples/* -%{_libdir}/collectd/perl.so* +%{_libdir}/collectd/perl.so %{perl_vendorlib}/Collectd.pm %{perl_vendorlib}/Collectd/ %config(noreplace) %{_sysconfdir}/collectd.d/perl.conf @@ -349,37 +376,42 @@ %files postgresql %defattr(-, root, root, -) -%{_libdir}/collectd/postgresql.so* +%{_libdir}/collectd/postgresql.so %config(noreplace) %{_sysconfdir}/collectd.d/postgresql.conf %doc src/postgresql_default.conf %files rrdtool %defattr(-, root, root, -) -%{_libdir}/collectd/rrdtool.so* +%{_libdir}/collectd/rrdtool.so %config(noreplace) %{_sysconfdir}/collectd.d/rrdtool.conf %files sensors %defattr(-, root, root, -) -%{_libdir}/collectd/sensors.so* +%{_libdir}/collectd/sensors.so %config(noreplace) %{_sysconfdir}/collectd.d/sensors.conf %files snmp %defattr(-, root, root, -) -%{_libdir}/collectd/snmp.so* +%{_libdir}/collectd/snmp.so %config(noreplace) %{_sysconfdir}/collectd.d/snmp.conf %doc %{_mandir}/man5/collectd-snmp.5* %files virt %defattr(-, root, root, -) -%{_libdir}/collectd/libvirt.so* +%{_libdir}/collectd/libvirt.so %config(noreplace) %{_sysconfdir}/collectd.d/libvirt.conf %changelog +* Tue Mar 03 2009 Alan Pevec 4.5.3-1 +- New upstream version 4.5.3 +- fixes collectd is built without iptables plugin, bz# 479208 +- list all expected plugins explicitly to avoid such bugs + * Sun Dec 07 2008 Alan Pevec 4.5.1-2.1 - fix subpackages, bz# 475093 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/collectd/F-10/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 30 Nov 2008 11:45:32 -0000 1.8 +++ sources 3 Mar 2009 21:40:43 -0000 1.9 @@ -1 +1 @@ -d85e00de03d40ca66d5eb4775e58fc1f collectd-4.5.1.tar.bz2 +f368200c4bedd64baba46094906e81ee collectd-4.5.3.tar.bz2 From pbrobinson at fedoraproject.org Tue Mar 3 21:43:59 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Tue, 3 Mar 2009 21:43:59 +0000 (UTC) Subject: rpms/opal/devel .cvsignore, 1.15, 1.16 opal.spec, 1.42, 1.43 sources, 1.16, 1.17 opal-gcc44.patch, 1.1, NONE opal-ilbc-soname.patch, 1.1, NONE Message-ID: <20090303214359.4D4EE70116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/opal/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9347 Modified Files: .cvsignore opal.spec sources Removed Files: opal-gcc44.patch opal-ilbc-soname.patch Log Message: - New release for ekiga 3.1.2 beta Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/opal/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 6 Jan 2009 06:11:13 -0000 1.15 +++ .cvsignore 3 Mar 2009 21:43:28 -0000 1.16 @@ -1 +1 @@ -opal-3.5.2.tar.bz2 +opal-3.6.0.tar.bz2 Index: opal.spec =================================================================== RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- opal.spec 26 Feb 2009 08:15:12 -0000 1.42 +++ opal.spec 3 Mar 2009 21:43:28 -0000 1.43 @@ -1,19 +1,17 @@ Name: opal Summary: Open Phone Abstraction Library -Version: 3.5.2 -Release: 8%{?dist} +Version: 3.6.0 +Release: 1%{?dist} URL: http://www.opalvoip.org/ -Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.4/%{name}-%{version}.tar.bz2 -Patch0: opal-ilbc-soname.patch -Patch1: opal-gcc44.patch +Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.6/%{name}-%{version}.tar.bz2 License: MPLv1.0 Group: System Environment/Libraries -BuildRequires: ptlib-devel = 2.5.2 +BuildRequires: ptlib-devel = 2.6.0 BuildRequires: openldap-devel BuildRequires: openssl-devel BuildRequires: libtheora-devel BuildRequires: speex-devel -#BuildRequires: celt-devel +BuildRequires: celt-devel BuildRequires: SDL-devel BuildRequires: expat-devel @@ -28,7 +26,7 @@ Group: Development/Libraries Requires: opal = %{version}-%{release} Requires: openssl-devel -Requires: ptlib-devel = 2.5.2 +Requires: ptlib-devel = 2.6.0 Requires: pkgconfig %description devel @@ -37,8 +35,6 @@ %prep %setup -q -%patch0 -p2 -b .ilbc-soname -%patch1 -p0 -b .gcc44 %build %configure --prefix=/usr @@ -75,6 +71,9 @@ %{_libdir}/pkgconfig/opal.pc %changelog +* Tue Mar 3 2009 Peter Robinson - 3.6.0-1 +- New release for ekiga 3.1.2 beta + * Thu Feb 26 2009 Fedora Release Engineering - 3.5.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/opal/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 6 Jan 2009 06:11:13 -0000 1.16 +++ sources 3 Mar 2009 21:43:28 -0000 1.17 @@ -1 +1 @@ -0b593302c10e7c5f14ae20484ddf8e6b opal-3.5.2.tar.bz2 +86896c75a5239fa85766cb4ba93a2118 opal-3.6.0.tar.bz2 --- opal-gcc44.patch DELETED --- --- opal-ilbc-soname.patch DELETED --- From pbrobinson at fedoraproject.org Tue Mar 3 21:45:32 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Tue, 3 Mar 2009 21:45:32 +0000 (UTC) Subject: rpms/ptlib/devel ptlib.spec,1.11,1.12 Message-ID: <20090303214532.C7AC070116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/ptlib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9570 Modified Files: ptlib.spec Log Message: - fix source URL Index: ptlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/ptlib/devel/ptlib.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ptlib.spec 3 Mar 2009 21:30:10 -0000 1.11 +++ ptlib.spec 3 Mar 2009 21:45:02 -0000 1.12 @@ -3,7 +3,7 @@ Version: 2.6.0 Release: 1%{?dist} URL: http://www.opalvoip.org/ -Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.5/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2 License: MPLv1.0 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From erikos at fedoraproject.org Tue Mar 3 21:55:17 2009 From: erikos at fedoraproject.org (Simon Schampijer) Date: Tue, 3 Mar 2009 21:55:17 +0000 (UTC) Subject: rpms/sugar-log/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sugar-log.spec, 1.3, 1.4 Message-ID: <20090303215517.C4B5970116@cvs1.fedora.phx.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-log/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11682 Modified Files: .cvsignore sources sugar-log.spec Log Message: * Tue Mar 03 2009 Simon Schampijer - 17-1 - Rebuild for 0.84 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-log/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Sep 2008 09:09:31 -0000 1.2 +++ .cvsignore 3 Mar 2009 21:54:47 -0000 1.3 @@ -1 +1 @@ -Log-16.tar.bz2 +Log-17.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-log/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Sep 2008 09:09:31 -0000 1.2 +++ sources 3 Mar 2009 21:54:47 -0000 1.3 @@ -1 +1 @@ -a9f011a0df4c317065c52af4ffa12831 Log-16.tar.bz2 +546c0df9bcd75ea0100dc657c4124d57 Log-17.tar.bz2 Index: sugar-log.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-log/devel/sugar-log.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sugar-log.spec 26 Feb 2009 03:49:30 -0000 1.3 +++ sugar-log.spec 3 Mar 2009 21:54:47 -0000 1.4 @@ -1,6 +1,6 @@ Name: sugar-log -Version: 16 -Release: 3%{?dist} +Version: 17 +Release: 1%{?dist} Summary: Log activity for Sugar Group: Sugar/Activities License: GPLv2+ @@ -38,6 +38,9 @@ %changelog +* Tue Mar 03 2009 Simon Schampijer - 17-1 +- Rebuild for 0.84 + * Wed Feb 25 2009 Fedora Release Engineering - 16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From davej at fedoraproject.org Tue Mar 3 21:55:49 2009 From: davej at fedoraproject.org (Dave Jones) Date: Tue, 3 Mar 2009 21:55:49 +0000 (UTC) Subject: rpms/kernel/devel patch-2.6.29-rc6-git7.bz2.sign, NONE, 1.1 .cvsignore, 1.1026, 1.1027 git-linus.diff, 1.16, 1.17 kernel.spec, 1.1370, 1.1371 sources, 1.987, 1.988 upstream, 1.899, 1.900 patch-2.6.29-rc6-git6.bz2.sign, 1.1, NONE Message-ID: <20090303215549.C8C3070116@cvs1.fedora.phx.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11864 Modified Files: .cvsignore git-linus.diff kernel.spec sources upstream Added Files: patch-2.6.29-rc6-git7.bz2.sign Removed Files: patch-2.6.29-rc6-git6.bz2.sign Log Message: 2.6.29-rc6-git7 --- NEW FILE patch-2.6.29-rc6-git7.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBJrRx3yGugalF9Dw4RAqeYAJkBalQDnkma5jKpyTeq2ROB7+NDhwCgghKE rLns6acfEa3gzUO7HIwTTXI= =8rGP -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.1026 retrieving revision 1.1027 diff -u -r1.1026 -r1.1027 --- .cvsignore 3 Mar 2009 02:01:55 -0000 1.1026 +++ .cvsignore 3 Mar 2009 21:55:18 -0000 1.1027 @@ -6,4 +6,4 @@ kernel-2.6.28 linux-2.6.28.tar.bz2 patch-2.6.29-rc6.bz2 -patch-2.6.29-rc6-git6.bz2 +patch-2.6.29-rc6-git7.bz2 git-linus.diff: Index: git-linus.diff =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- git-linus.diff 3 Mar 2009 11:03:50 -0000 1.16 +++ git-linus.diff 3 Mar 2009 21:55:18 -0000 1.17 @@ -1,77 +0,0 @@ -From 2450cf51a1bdba7037e91b1bcc494b01c58aaf66 Mon Sep 17 00:00:00 2001 -From: Linus Torvalds -Date: Mon, 2 Mar 2009 16:23:33 -0800 -Subject: [PATCH] Revert "menu: fix embedded menu snafu" - -This reverts commit 155b25bcc28631a5b5230191aa3f56c40dfffa3f, which was -totally wrong - the "embedded" options still exists (very much so) even -on non-embedded platforms. - -It's just that we don't bother with actually asking about them when -we're not embedded, we just take their default values (which is usually -'y' - the options add features that may not be worth it in a constrained -environment). - -Noticed-by: Andrew Morton -Cc: Randy Dunlap -Signed-off-by: Linus Torvalds ---- - init/Kconfig | 28 ++++++++++++---------------- - 1 files changed, 12 insertions(+), 16 deletions(-) - -diff --git a/init/Kconfig b/init/Kconfig -index 9000316..f068071 100644 ---- a/init/Kconfig -+++ b/init/Kconfig -@@ -683,8 +683,6 @@ menuconfig EMBEDDED - environments which can tolerate a "non-standard" kernel. - Only use this if you really know what you are doing. - --if EMBEDDED -- - config UID16 - bool "Enable 16-bit UID system calls" if EMBEDDED - depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION) -@@ -782,6 +780,18 @@ config PCSPKR_PLATFORM - This option allows to disable the internal PC-Speaker - support, saving some memory. - -+config COMPAT_BRK -+ bool "Disable heap randomization" -+ default y -+ help -+ Randomizing heap placement makes heap exploits harder, but it -+ also breaks ancient binaries (including anything libc5 based). -+ This option changes the bootup default to heap randomization -+ disabled, and can be overriden runtime by setting -+ /proc/sys/kernel/randomize_va_space to 2. -+ -+ On non-ancient distros (post-2000 ones) N is usually a safe choice. -+ - config BASE_FULL - default y - bool "Enable full-sized data structures for core" if EMBEDDED -@@ -887,20 +897,6 @@ config SLUB_DEBUG - SLUB sysfs support. /sys/slab will not exist and there will be - no support for cache validation etc. - --endif # EMBEDDED -- --config COMPAT_BRK -- bool "Disable heap randomization" -- default y -- help -- Randomizing heap placement makes heap exploits harder, but it -- also breaks ancient binaries (including anything libc5 based). -- This option changes the bootup default to heap randomization -- disabled, and can be overriden runtime by setting -- /proc/sys/kernel/randomize_va_space to 2. -- -- On non-ancient distros (post-2000 ones) N is usually a safe choice. -- - choice - prompt "Choose SLAB allocator" - default SLUB --- -1.5.5.1 - Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1370 retrieving revision 1.1371 diff -u -r1.1370 -r1.1371 --- kernel.spec 3 Mar 2009 21:00:11 -0000 1.1370 +++ kernel.spec 3 Mar 2009 21:55:19 -0000 1.1371 @@ -58,7 +58,7 @@ # The rc snapshot level %define rcrev 6 # The git snapshot level -%define gitrev 6 +%define gitrev 7 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1179,9 +1179,9 @@ ApplyPatch agp-set_memory_ucwb.patch # Nouveau DRM + drm fixes ApplyPatch drm-next.patch -ApplyPatch drm-modesetting-radeon.patch -ApplyPatch drm-radeon-pm.patch -ApplyPatch drm-nouveau.patch +#ApplyPatch drm-modesetting-radeon.patch +#ApplyPatch drm-nouveau.patch +#ApplyPatch drm-radeon-pm.patch #ApplyPatch drm-intel-next.patch ApplyPatch drm-no-gem-on-i8xx.patch ApplyPatch drm-i915-resume-force-mode.patch @@ -1791,6 +1791,9 @@ # and build. %changelog +* Tue Mar 03 2009 Dave Jones 2.6.29-0.184.rc6.git7 +- 2.6.29-rc6-git7 + * Tue Mar 03 2009 Matthew Garrett - Add dynamic power management for later r500-based Radeons Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.987 retrieving revision 1.988 diff -u -r1.987 -r1.988 --- sources 3 Mar 2009 02:01:56 -0000 1.987 +++ sources 3 Mar 2009 21:55:19 -0000 1.988 @@ -1,3 +1,3 @@ d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2 26f67d99666834cc579094619821d3c8 patch-2.6.29-rc6.bz2 -2bd40cb2f0f7ea71abb95a46e5ba84fe patch-2.6.29-rc6-git6.bz2 +46b64d52e8f2f1e5b55784beb939ee2e patch-2.6.29-rc6-git7.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.899 retrieving revision 1.900 diff -u -r1.899 -r1.900 --- upstream 3 Mar 2009 02:01:56 -0000 1.899 +++ upstream 3 Mar 2009 21:55:19 -0000 1.900 @@ -1,3 +1,3 @@ linux-2.6.28.tar.bz2 patch-2.6.29-rc6.bz2 -patch-2.6.29-rc6-git6.bz2 +patch-2.6.29-rc6-git7.bz2 --- patch-2.6.29-rc6-git6.bz2.sign DELETED --- From dwalsh at fedoraproject.org Tue Mar 3 21:56:39 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Tue, 3 Mar 2009 21:56:39 +0000 (UTC) Subject: rpms/selinux-policy/devel policy-20090105.patch,1.50,1.51 Message-ID: <20090303215639.36ABF70116@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12035 Modified Files: policy-20090105.patch Log Message: * Mon Mar 2 2009 Dan Walsh 3.6.7-1 - Update to Latest upstream policy-20090105.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.50 -r 1.51 policy-20090105.patch Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- policy-20090105.patch 3 Mar 2009 20:10:30 -0000 1.50 +++ policy-20090105.patch 3 Mar 2009 21:56:08 -0000 1.51 @@ -1,6 +1,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.7/config/appconfig-mcs/default_contexts --- nsaserefpolicy/config/appconfig-mcs/default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/default_contexts 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/default_contexts 2009-03-03 16:44:42.243689000 -0500 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -24,13 +24,13 @@ +system_r:xdm_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.7/config/appconfig-mcs/failsafe_context --- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.7/config/appconfig-mcs/failsafe_context 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/failsafe_context 2009-03-03 16:44:42.246686000 -0500 @@ -1 +1 @@ -sysadm_r:sysadm_t:s0 +system_r:unconfined_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/guest_u_default_contexts 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/guest_u_default_contexts 2009-03-03 16:44:42.249684000 -0500 @@ -0,0 +1,6 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -40,7 +40,7 @@ +guest_r:guest_t:s0 guest_r:guest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/root_default_contexts --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/root_default_contexts 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/root_default_contexts 2009-03-03 16:44:42.250683000 -0500 @@ -1,11 +1,7 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0 +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -57,7 +57,7 @@ +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.7/config/appconfig-mcs/seusers --- nsaserefpolicy/config/appconfig-mcs/seusers 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.7/config/appconfig-mcs/seusers 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/seusers 2009-03-03 16:44:42.252693000 -0500 @@ -1,3 +1,3 @@ system_u:system_u:s0-mcs_systemhigh -root:root:s0-mcs_systemhigh @@ -66,7 +66,7 @@ +__default__:unconfined_u:s0-mcs_systemhigh diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/staff_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/staff_u_default_contexts 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/staff_u_default_contexts 2009-03-03 16:44:42.255686000 -0500 @@ -1,10 +1,12 @@ system_r:local_login_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 system_r:remote_login_t:s0 staff_r:staff_t:s0 @@ -83,7 +83,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/unconfined_u_default_contexts 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/unconfined_u_default_contexts 2009-03-03 16:44:42.258683000 -0500 @@ -1,4 +1,4 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0 +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 @@ -99,13 +99,13 @@ system_r:xdm_t:s0 unconfined_r:unconfined_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.7/config/appconfig-mcs/userhelper_context --- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.7/config/appconfig-mcs/userhelper_context 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/userhelper_context 2009-03-03 16:44:42.259684000 -0500 @@ -1 +1 @@ -system_u:sysadm_r:sysadm_t:s0 +system_u:system_r:unconfined_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/user_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/user_u_default_contexts 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/user_u_default_contexts 2009-03-03 16:44:42.261693000 -0500 @@ -1,8 +1,9 @@ system_r:local_login_t:s0 user_r:user_t:s0 system_r:remote_login_t:s0 user_r:user_t:s0 @@ -120,17 +120,17 @@ +user_r:user_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.7/config/appconfig-mcs/virtual_domain_context --- nsaserefpolicy/config/appconfig-mcs/virtual_domain_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/virtual_domain_context 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/virtual_domain_context 2009-03-03 16:53:17.042576000 -0500 @@ -0,0 +1 @@ -+system_u:system_r:qemu_t:s0 ++system_u:system_r:svirt_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.7/config/appconfig-mcs/virtual_image_context --- nsaserefpolicy/config/appconfig-mcs/virtual_image_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/virtual_image_context 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/virtual_image_context 2009-03-03 16:44:42.265686000 -0500 @@ -0,0 +1 @@ +system_u:object_r:virt_image_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/xguest_u_default_contexts 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/xguest_u_default_contexts 2009-03-03 16:44:42.267696000 -0500 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -141,7 +141,7 @@ +xguest_r:xguest_t:s0 xguest_r:xguest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.7/config/appconfig-mls/default_contexts --- nsaserefpolicy/config/appconfig-mls/default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/default_contexts 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/default_contexts 2009-03-03 16:44:42.269686000 -0500 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -165,7 +165,7 @@ +system_r:xdm_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/guest_u_default_contexts 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/guest_u_default_contexts 2009-03-03 16:44:42.272684000 -0500 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -173,7 +173,7 @@ +system_r:crond_t:s0 guest_r:guest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.7/config/appconfig-mls/root_default_contexts --- nsaserefpolicy/config/appconfig-mls/root_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/root_default_contexts 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/root_default_contexts 2009-03-03 16:44:42.274685000 -0500 @@ -1,11 +1,11 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0 -system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -194,17 +194,17 @@ +#system_r:sshd_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.7/config/appconfig-mls/virtual_domain_context --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/virtual_domain_context 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/virtual_domain_context 2009-03-03 16:44:42.276688000 -0500 @@ -0,0 +1 @@ +system_u:system_r:qemu_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.7/config/appconfig-mls/virtual_image_context --- nsaserefpolicy/config/appconfig-mls/virtual_image_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/virtual_image_context 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/virtual_image_context 2009-03-03 16:44:42.278688000 -0500 @@ -0,0 +1 @@ +system_u:object_r:virt_image_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mls/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/xguest_u_default_contexts 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/xguest_u_default_contexts 2009-03-03 16:44:42.280688000 -0500 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -214,8 +214,8 @@ +system_r:initrc_su_t:s0 xguest_r:xguest_t:s0 +xguest_r:xguest_t:s0 xguest_r:xguest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.7/Makefile ---- nsaserefpolicy/Makefile 2009-01-19 11:07:35.000000000 -0500 -+++ serefpolicy-3.6.7/Makefile 2009-03-02 17:01:39.000000000 -0500 +--- nsaserefpolicy/Makefile 2009-02-09 12:15:51.000000000 -0500 ++++ serefpolicy-3.6.7/Makefile 2009-03-03 16:44:42.283683000 -0500 @@ -241,7 +241,7 @@ appdir := $(contextpath) user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts) @@ -280,7 +280,7 @@ $(verbose) $(INSTALL) -m 644 $< $@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.6.7/man/man8/httpd_selinux.8 --- nsaserefpolicy/man/man8/httpd_selinux.8 2008-08-25 09:12:31.000000000 -0400 -+++ serefpolicy-3.6.7/man/man8/httpd_selinux.8 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/man/man8/httpd_selinux.8 2009-03-03 16:44:42.285686000 -0500 @@ -41,7 +41,7 @@ - Set cgi scripts with httpd_unconfined_script_exec_t to allow them to run without any SELinux protection. This should only be used for a very complex httpd scripts, after exhausting all other options. It is better to use this script rather than turning off SELinux protection for httpd. @@ -301,7 +301,7 @@ setsebool -P httpd_tty_comm 1 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-3.6.7/man/man8/kerberos_selinux.8 --- nsaserefpolicy/man/man8/kerberos_selinux.8 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.7/man/man8/kerberos_selinux.8 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/man/man8/kerberos_selinux.8 2009-03-03 16:44:42.288683000 -0500 @@ -12,7 +12,7 @@ .SH "DESCRIPTION" @@ -313,7 +313,7 @@ You must set the allow_kerberos boolean to allow your system to work properly in a Kerberos environment. diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/nfs_selinux.8 serefpolicy-3.6.7/man/man8/nfs_selinux.8 --- nsaserefpolicy/man/man8/nfs_selinux.8 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.7/man/man8/nfs_selinux.8 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/man/man8/nfs_selinux.8 2009-03-03 16:44:42.290693000 -0500 @@ -1,14 +1,12 @@ -.TH "nfs_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "nfs Selinux Policy documentation" +.TH "nfs_selinux" "8" "9 Feb 2009" "dwalsh at redhat.com" "NFS SELinux Policy documentation" @@ -353,7 +353,7 @@ selinux(8), chcon(1), setsebool(8) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/samba_selinux.8 serefpolicy-3.6.7/man/man8/samba_selinux.8 --- nsaserefpolicy/man/man8/samba_selinux.8 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.7/man/man8/samba_selinux.8 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/man/man8/samba_selinux.8 2009-03-03 16:44:42.293688000 -0500 @@ -14,11 +14,17 @@ .TP [...3639 lines suppressed...] --- nsaserefpolicy/policy/modules/system/unconfined.fc 2008-09-11 16:42:49.000000000 -0400 -+++ serefpolicy-3.6.7/policy/modules/system/unconfined.fc 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/unconfined.fc 2009-03-03 16:44:43.355602000 -0500 @@ -2,15 +2,28 @@ # e.g.: # /usr/local/bin/appsrv -- gen_context(system_u:object_r:unconfined_exec_t,s0) @@ -29031,7 +29055,7 @@ +/opt/real/(.*/)?realplay\.bin -- gen_context(system_u:object_r:execmem_exec_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.7/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/unconfined.if 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/unconfined.if 2009-03-03 16:44:43.358601000 -0500 @@ -12,14 +12,13 @@ # interface(`unconfined_domain_noaudit',` @@ -29311,7 +29335,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.7/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/unconfined.te 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/unconfined.te 2009-03-03 16:44:43.361601000 -0500 @@ -5,36 +5,86 @@ # # Declarations @@ -29662,7 +29686,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.7/policy/modules/system/userdomain.fc --- nsaserefpolicy/policy/modules/system/userdomain.fc 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/userdomain.fc 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/userdomain.fc 2009-03-03 16:44:43.370603000 -0500 @@ -1,4 +1,7 @@ HOME_DIR -d gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh) +HOME_DIR -l gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh) @@ -29673,8 +29697,8 @@ +/dev/shm/pulse-shm.* gen_context(system_u:object_r:user_tmpfs_t,s0) +/dev/shm/mono.* gen_context(system_u:object_r:user_tmpfs_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.7/policy/modules/system/userdomain.if ---- nsaserefpolicy/policy/modules/system/userdomain.if 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/userdomain.if 2009-03-03 12:01:05.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/userdomain.if 2009-02-09 12:15:51.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/userdomain.if 2009-03-03 16:44:43.376604000 -0500 @@ -30,8 +30,9 @@ ') @@ -31584,8 +31608,8 @@ + type_transition $1 user_home_dir_t:$2 user_home_t; +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.7/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/userdomain.te 2009-03-02 17:01:39.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/userdomain.te 2009-02-09 12:15:51.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/userdomain.te 2009-03-03 16:44:43.379603000 -0500 @@ -8,13 +8,6 @@ ## @@ -31671,12 +31695,12 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.7/policy/modules/system/virtual.fc --- nsaserefpolicy/policy/modules/system/virtual.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/virtual.fc 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/virtual.fc 2009-03-03 16:44:43.382604000 -0500 @@ -0,0 +1 @@ +# No application file contexts. diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.7/policy/modules/system/virtual.if --- nsaserefpolicy/policy/modules/system/virtual.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/virtual.if 2009-03-03 11:10:11.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/virtual.if 2009-03-03 16:46:29.985828000 -0500 @@ -0,0 +1,96 @@ +## Virtual machine emulator and virtualizer + @@ -31726,10 +31750,10 @@ +# +interface(`virtual_separated_domain',` + gen_require(` -+ attribute virtual_separated_domain; ++ attribute virtualseparateddomain; + ') + -+ typeattribute $1 virtual_separated_domain; ++ typeattribute $1 virtualseparateddomain; +') + +######################################## @@ -31776,8 +31800,8 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.7/policy/modules/system/virtual.te --- nsaserefpolicy/policy/modules/system/virtual.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/virtual.te 2009-03-03 11:09:55.000000000 -0500 -@@ -0,0 +1,73 @@ ++++ serefpolicy-3.6.7/policy/modules/system/virtual.te 2009-03-03 16:46:59.686390000 -0500 +@@ -0,0 +1,79 @@ + +policy_module(virtualization, 1.1.2) + @@ -31786,7 +31810,7 @@ +# Declarations +# + -+attribute virtual_separated_domain; ++attribute virtualseparateddomain; +attribute virtualdomain; +attribute virtual_image_type; + @@ -31794,12 +31818,14 @@ +# +# qemu common policy +# -+allow virtualdomain self:capability { dac_read_search dac_override }; ++ ++allow virtualdomain self:capability { kill dac_read_search dac_override }; +allow virtualdomain self:process { execstack execmem signal getsched signull }; + +allow virtualdomain self:fifo_file rw_file_perms; +allow virtualdomain self:shm create_shm_perms; +allow virtualdomain self:unix_stream_socket create_stream_socket_perms; ++allow virtualdomain self:unix_dgram_socket { create_socket_perms sendto }; +allow virtualdomain self:tcp_socket create_stream_socket_perms; + +kernel_read_system_state(virtualdomain) @@ -31839,6 +31865,10 @@ +miscfiles_read_localization(virtualdomain) + +optional_policy(` ++ dbus_system_bus_client(virtualdomain) ++') ++ ++optional_policy(` + virt_read_config(virtualdomain) + virt_read_lib_files(virtualdomain) + virt_read_content(virtualdomain) @@ -31849,11 +31879,11 @@ + xserver_read_xdm_tmp_files(virtualdomain) + xserver_read_xdm_pid(virtualdomain) + xserver_rw_shm(virtualdomain) ++ xserver_common_x_domain_template(user, virtualdomain) +') -+ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.7/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/xen.fc 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/xen.fc 2009-03-03 16:44:43.389601000 -0500 @@ -2,17 +2,10 @@ /usr/bin/virsh -- gen_context(system_u:object_r:xm_exec_t,s0) @@ -31882,7 +31912,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.7/policy/modules/system/xen.if --- nsaserefpolicy/policy/modules/system/xen.if 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/xen.if 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/xen.if 2009-03-03 16:44:43.391602000 -0500 @@ -167,11 +167,14 @@ # interface(`xen_stream_connect',` @@ -31925,8 +31955,8 @@ + rw_files_pattern($1, xen_image_t, xen_image_t) +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.7/policy/modules/system/xen.te ---- nsaserefpolicy/policy/modules/system/xen.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/xen.te 2009-03-02 17:01:39.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/xen.te 2009-02-09 12:15:51.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/xen.te 2009-03-03 16:44:43.394601000 -0500 @@ -6,6 +6,13 @@ # Declarations # @@ -32150,7 +32180,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.7/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-10-16 17:21:16.000000000 -0400 -+++ serefpolicy-3.6.7/policy/support/obj_perm_sets.spt 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/policy/support/obj_perm_sets.spt 2009-03-03 16:44:43.397601000 -0500 @@ -179,20 +179,20 @@ # # Directory (dir) @@ -32206,7 +32236,7 @@ +define(`manage_key_perms', `{ create link read search setattr view write } ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.7/policy/users --- nsaserefpolicy/policy/users 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.6.7/policy/users 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/policy/users 2009-03-03 16:44:43.399602000 -0500 @@ -25,11 +25,8 @@ # permit any access to such users, then remove this entry. # @@ -32233,7 +32263,7 @@ +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.7/Rules.modular --- nsaserefpolicy/Rules.modular 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/Rules.modular 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/Rules.modular 2009-03-03 16:44:43.401606000 -0500 @@ -73,8 +73,8 @@ $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te @echo "Compliling $(NAME) $(@F) module" @@ -32265,7 +32295,7 @@ $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.7/support/Makefile.devel --- nsaserefpolicy/support/Makefile.devel 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/support/Makefile.devel 2009-03-02 17:01:39.000000000 -0500 ++++ serefpolicy-3.6.7/support/Makefile.devel 2009-03-03 16:44:43.404601000 -0500 @@ -185,8 +185,7 @@ tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te @$(EINFO) "Compiling $(NAME) $(basename $(@F)) module" From ksebasti at fedoraproject.org Tue Mar 3 21:58:43 2009 From: ksebasti at fedoraproject.org (Kent Sebastian) Date: Tue, 3 Mar 2009 21:58:43 +0000 (UTC) Subject: rpms/eclipse-oprofile/devel eclipse-oprofile.spec,1.1,1.2 Message-ID: <20090303215843.57C9670116@cvs1.fedora.phx.redhat.com> Author: ksebasti Update of /cvs/pkgs/rpms/eclipse-oprofile/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12521 Modified Files: eclipse-oprofile.spec Log Message: add glibc-devel buildrequire Index: eclipse-oprofile.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-oprofile/devel/eclipse-oprofile.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eclipse-oprofile.spec 3 Mar 2009 20:49:15 -0000 1.1 +++ eclipse-oprofile.spec 3 Mar 2009 21:58:13 -0000 1.2 @@ -33,6 +33,7 @@ BuildRequires: oprofile >= 0.9.3 BuildRequires: oprofile-devel >= 0.9.3 BuildRequires: binutils-devel >= 2.18.50.0.6 +BuildRequires: glibc-devel Requires: eclipse-platform >= 3.4.0 Requires: eclipse-cdt >= 5.0.1 Requires: eclipse-linuxprofilingframework >= 0.1.0 From airlied at fedoraproject.org Tue Mar 3 22:04:07 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 3 Mar 2009 22:04:07 +0000 (UTC) Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.60, 1.61 kernel.spec, 1.1371, 1.1372 Message-ID: <20090303220407.630B670116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13442 Modified Files: drm-modesetting-radeon.patch kernel.spec Log Message: * Wed Mar 04 2009 Dave Airlie 2.6.29-0.185.rc6.git7 - rebase drm patches on git7 drm-modesetting-radeon.patch: Index: drm-modesetting-radeon.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- drm-modesetting-radeon.patch 3 Mar 2009 09:09:15 -0000 1.60 +++ drm-modesetting-radeon.patch 3 Mar 2009 22:04:06 -0000 1.61 @@ -1,16 +1,16 @@ -commit 524351732a7a48d274f5a4e48e004284ba673ebf +commit 530ebda60cb7270795b7edd72930ab2d0e4db102 Author: Dave Airlie Date: Tue Mar 3 18:23:22 2009 +1000 radeon: port proc debug files to new debugfs interface -commit 8030b34a3383a6b490c128b7cbafb4e1a201f5d4 +commit 94137dff359fc70b51bdf035f97cfbab7424a5ce Author: Dave Airlie Date: Tue Mar 3 15:33:52 2009 +1000 radeon: pin framebuffer and cursors dynamically -commit a00b8f579d6fafc16149902445697255062b45b1 +commit 90a014f6d04548790dbcef1932ad3d89ff12aa32 Author: Alex Deucher Date: Fri Feb 27 20:25:36 2009 -0500 @@ -18,7 +18,7 @@ Signed-off-by: Alex Deucher -commit 5ad681c0f59c99dee86781a049fc41c66ff7d3b8 +commit 9e3775d3fe8677b2f995230521fd93cd9ef69327 Author: Alex Deucher Date: Fri Feb 27 20:18:20 2009 -0500 @@ -26,7 +26,7 @@ Signed-off-by: Alex Deucher -commit 7400fdab0318a2b04d06b2cb6466e9c585d23115 +commit b3c52a1d083b846541e2b6d78c917ae00e9f04c1 Author: Alex Deucher Date: Fri Feb 27 20:15:04 2009 -0500 @@ -34,7 +34,7 @@ Signed-off-by: Alex Deucher -commit b95e633f684312ccc260112ee6a58875f2d1e143 +commit b077cde9a296856bcadb3003e746950034e929bb Author: Alex Deucher Date: Fri Feb 27 20:07:13 2009 -0500 @@ -42,55 +42,55 @@ Signed-off-by: Alex Deucher -commit 0b64b9965802b5455e9ea6a69eca2f6171235559 +commit 85a3e7390f17ba442c020dda1a47e6b6b1ce0588 Author: Dave Airlie Date: Mon Mar 2 23:51:30 2009 +1100 radeon: fixup suspend/resume hooks -commit af74fbead4da9cfd979e4092c7e1ffe912c978c7 +commit 1467208a03bb127c3882c59cbcc2818fb1076b8d Author: Dave Airlie Date: Sun Mar 1 18:25:07 2009 +1100 radeon: fix rs480 gart size -commit 1f756299d935d5a0a4beb82ddeaf0e4b2935861a +commit f3812bb92e9900be559d5d4b2098b8dcef01cce9 Author: Dave Airlie Date: Fri Feb 27 15:37:14 2009 +1000 radeon: disable kms by default for r600 -commit e92784bff2fee17c8e47f11753343d99500784a6 +commit 924db462f118847e313a1a185e93e58016866da4 Author: Dave Airlie Date: Fri Feb 27 11:51:22 2009 +1000 radeon: fixup proc hacks -commit 8e01de63b0dc4be70fbf8ce33b958d3d4c5d5748 +commit 59883501a17405b6db133066d41309db083eb722 Author: Dave Airlie Date: Fri Feb 27 11:51:08 2009 +1000 radeon: fixup module load -commit 998fa33e12ba50b16e44ad1add5b82ec11aaacfc +commit 0b8ecbca3940dc13b163ab2c46f633625d52aa72 Author: Dave Airlie Date: Fri Feb 27 11:50:50 2009 +1000 radeon: fix up ring read/write for new drm-next code -commit 84044ac6eb43ebb861b661aad772be350362dfbe +commit 6bffd54b50ca1889aea58454e39edf23e3c4ec50 Author: Dave Airlie Date: Fri Feb 27 11:50:24 2009 +1000 ati_pcigart: update pcigart for changes in drm-next -commit c44d3fa4e174f3aa95ad575e802dd2d01d0615d6 +commit ddd936403f8c89d85a6407809e93e32b050b09b0 Author: Dave Airlie Date: Thu Feb 26 22:27:21 2009 +1000 radeon: fixup writeback/ring ptrs for Kms -commit 31585bd60335dbc5e6814135add77b2228bdf419 +commit b245e49600fe885e376150d9e8adc6308408c70f Author: Dave Airlie Date: Thu Feb 26 22:00:59 2009 +1000 @@ -98,19 +98,19 @@ lots more to do -commit a9c8c80c07d3e08681cfae325e62be775eb621e2 +commit c2181284133a30bd1355b9f9463710f9ec43ccaa Author: Dave Airlie Date: Thu Feb 26 12:03:55 2009 +1000 drm/radeno: add support for r100 cp type 3 packets -commit 1111b2c28fde03d81663af3a6efa9b362c80189d +commit 62fb97e2a2e71f83c2c6c783f95a36ba19ec468f Author: Dave Airlie Date: Wed Feb 25 16:07:15 2009 +1000 radeon: fixup cs buffer re-use code to not block straight away -commit 6934826040173ca3022503534b867ba0d0bc7fe3 +commit 7da8970a24bad69684fba5713106b3c7ab69c858 Author: Dave Airlie Date: Wed Feb 25 16:06:30 2009 +1000 @@ -118,37 +118,37 @@ Totally missed this before - really helps stability -commit ae76231f773dfc8cfdf86ddfc9c34de604e07968 +commit 97c941152f9ebf9e8554d5fc9810a48c722e0c9b Author: Dave Airlie Date: Wed Feb 25 13:03:47 2009 +1000 radeon: fix IB dump end -commit 7ce70adf16692a8b8d34f8ee5018a0b26f99a176 +commit 7ce614a4e8d2c1f184de524eb5185fa0004328c5 Author: Thomas Hellstrom Date: Tue Feb 24 20:26:53 2009 +1000 drm/ttm: work around some x86 pat oddities by using mixedmap instead of pfnmap -commit bc61dd6a56ae8678dd0a68074fce63a9b58f6039 +commit a7b9422d556ac958d4a13fc03f83be4cfa39b46a Author: Dave Airlie Date: Sun Feb 22 08:22:14 2009 +1000 radeon: add module IDs -commit 2cb426ab76242230ee66c62ca56346f20dda7322 +commit 9a51f123fcf038946ee12626b2b43c51aa83ce6c Author: Dave Airlie Date: Sun Feb 22 08:19:33 2009 +1000 radeon: fixup for new APIs -commit a9156df0c323939c6a61fcf4894dc160e71b7178 +commit 60f38523ede4949f2b45ca50965b63a32d7a55ba Author: Dave Airlie Date: Sun Feb 22 08:11:33 2009 +1000 drm: fix parmeter passed to fb_release -commit 0260fc0c5544220072074582c40e3807380a40d2 +commit fb9c478ac883cbff1c1dc749c375fb530516e37e Author: Dave Airlie Date: Wed Feb 18 17:36:33 2009 +1000 @@ -156,13 +156,13 @@ this adds basic IB dumping and cleans up some code around it. -commit 693ea916ff5f7e94cb766ff3326256304a10c282 +commit c7c57bbbc13a80bfd5eec9a52111f354871d6416 Author: Dave Airlie Date: Wed Feb 18 11:12:19 2009 +1000 radeon: fix packet2 parsing + enhance debug -commit d70737eeb6002581984d34073bcfce246914ee49 +commit 7970531e80133bae363d81d2da4b71b8b058a9eb Author: Dave Airlie Date: Wed Feb 18 11:11:39 2009 +1000 @@ -173,37 +173,37 @@ It also doesn't or in the table values but sets them -commit 5efc94678c2535fa8640d6ff13a382b2de593175 +commit a8b00f79936bde4eade8eb4459fdc1bd3b1264aa Author: Dave Airlie Date: Tue Feb 17 20:57:34 2009 +1000 radeon/i2c: i2c adapter id is gone -commit 06f9316ec64614270971e9f383da9841097c6897 +commit a941fade599c2468fedcf7b2cd0c8c77f8bf9db2 Author: Dave Airlie Date: Thu Jan 22 17:15:56 2009 +1000 drm: fix radeon Kconfig -commit 6185b5baf2dea5433b9bea369e0303641c12a397 +commit 6487c16ac055816293856e42f4a6b27494876fc0 Author: Dave Airlie Date: Sun Jan 11 19:50:23 2009 +1000 radeon: add missing Kconfig text -commit 5da904a88e52d5fa0ed88f0711e5901e150185f4 +commit 1194a1b6a5adfb4e21d159e6262fded6516a32ad Author: Dave Airlie Date: Sun Jan 11 19:47:39 2009 +1000 drm: fix merge issue that messes up irq -commit c8f0b003060f81347b5efd95f6b9ea61896e823c +commit 9e76a0773ffbff58e40c6a17df4cdf4bf4503b51 Author: Dave Airlie Date: Sat Jan 10 12:40:42 2009 +1000 radeon: add getparam to get pci device from userspace -commit 0dd95dc27b9e1b4734a07ffdb3edef67069f9743 +commit 1e7b2c5e999f68698514ae89aac98513851363ac Author: Dave Airlie Date: Thu Dec 18 23:01:12 2008 +1000 @@ -212,49 +212,49 @@ This should make AGP no corrupt itself to all buggery (cherry picked from commit 55c0a3f1d3693cb5c3b65f37d4bb6e8a3c025460) -commit e08687047ae2904ad9a7f18d5c4a0ccae29727d3 +commit 4d76f7199a99c2e0ecb750387f785b1eaebc3530 Author: Dave Airlie Date: Tue Dec 2 16:38:04 2008 +1000 drop old CS -commit 00a936a692a1ff6bf365f0af46afc9e828fb989f +commit 4720290ac4b4eac08c4894f8f4a3af1276d32560 Author: Dave Airlie Date: Mon Dec 1 15:09:27 2008 +1000 radeon: update with latest CS bits -commit 95af07dde6539c225de4209c05db273e880ea576 +commit 06d79c126e9b7620c22e9e1f7587085a4cd80a2a Author: Dave Airlie Date: Wed Dec 17 06:56:36 2008 +1000 fixups post rebase -commit 8a5f2de67ec28fcc7405ce21e2a7ef096e272144 +commit 34419874038ae7769ed2d194099c9fff3edaf4e9 Author: Dave Airlie Date: Thu Dec 11 01:35:09 2008 +1000 radeon: fix agp mode when kms isn't enabled -commit 83ec342fa5e9e3cb5719e032e24ffee3107bd395 +commit 806ccc89484b97af1769039da863236fe0fccdca Author: Dave Airlie Date: Wed Dec 3 17:22:07 2008 +1100 radeon: add support for accessing disabled ROMs. -commit c2de1d12709a1d4b62eeae886e0e39e9643d5a9b +commit 83b1bbc6dd0c214ed7ec1c6938c10757245fdd87 Author: Dave Airlie Date: Wed Dec 3 17:19:02 2008 +1100 radeon: make cail do pll read/write via actual PLL functions -commit 2d46c8adbef25b641f88aff3d65b02f800df87e0 +commit 5afcc1bcba1fce92cef95d2add10e31e3edc29f1 Author: Dave Airlie Date: Wed Dec 3 16:36:00 2008 +1100 radeon: atom fixes for endianness -commit 59fd02f933dcaf66582397da6c1ba29775ef33fe +commit 6c9bf33e466b575fae492559aeb58b4a50fca46c Author: Dave Airlie Date: Wed Dec 3 20:28:05 2008 +1000 @@ -264,7 +264,7 @@ Limit the AGP aperture to the GART size, and init the registers in the right place -commit 873e8ac08c193104095ad8eea7ef82a0e0a637a1 +commit 6372a63f5886f0ad9915897c7454763fff9a3711 Author: Dave Airlie Date: Tue Dec 2 12:49:17 2008 +1000 @@ -273,7 +273,7 @@ 1. Proper PCIE fallback on PCIE cards. 2. Setup agp base + location regs properly -commit 096c5b50431252b7c4da97ae2dff057958fcfbe8 +commit 6d2e37e8b2a841435cf21b3f84771f6f531c062d Author: Michal Schmidt Date: Tue Dec 2 08:06:59 2008 +1000 @@ -281,13 +281,13 @@ fedora bz 473895 -commit 8805acf286529392cb5d762e3c13fe4752fc99c5 +commit cbacfc1d773866b46812f4353228a62b4a4021c7 Author: Dave Airlie Date: Thu Nov 27 17:14:40 2008 +1000 radeon: post any GPUs that aren't posted -commit 3aaeb0eb9d3c8e5649466c49daa6f137e3bf392d +commit 7a4223a481990da2913a93879aa2ca340a10efd4 Author: Dave Airlie Date: Mon Nov 24 15:18:31 2008 +1000 @@ -298,13 +298,13 @@ Default to 512MB gart. -commit 7286a6c07095b81cf840e801ce5c259bb27c5cfc +commit e7f054bcb58fbbe2d7786880a85e08dbac36b266 Author: Dave Airlie Date: Mon Nov 24 15:17:49 2008 +1000 radeon: add some missing feature checks for modesetting -commit 1b700f17dd7aa1be70c635df2c3d58927d6bb466 +commit 38209cc0da50eb133b51e2d69711875ec550c569 Author: Dave Airlie Date: Mon Nov 24 11:41:06 2008 +1100 @@ -313,43 +313,43 @@ we really need to read back to make sure the invalidate has happened before continuing along happily in life. -commit afa8c86da0ede04abda428cff29bf7a0959beb45 +commit ddc822c6aa51fdbd487bdb35f4dc01c643422d42 Author: Dave Airlie Date: Sun Nov 23 19:19:02 2008 +1000 drm: we have discardable now so don't do special cases -commit cdeba005b811feadbca4bc2ae04074667970fa3e +commit c53d3fc833d7a3d43bc0f11ff9b8629951030fc7 Author: Dave Airlie Date: Fri Nov 21 14:52:25 2008 +1000 atom: fix bug in parser for MC reads -commit 66c8cfc772891e32675284140a3a433e7b0b28ee +commit eaeb53584e742bb8f39452bdf5066288d16944c9 Author: Dave Airlie Date: Mon Nov 17 18:14:28 2008 +1000 radeon: turn of VRAM zeroing by default for now - needs work -commit b8188080027b33999a7f6ed8fb057b1022cf1964 +commit d317233942f882cd38c6e4f39ccebde83fb8252a Author: Dave Airlie Date: Mon Nov 17 09:03:36 2008 +1000 radeon: fix return value for no relocs -commit 7ebb2b80e42486ad7a602711686882bcdefd1b03 +commit 8e80852b53071e4f0d0495bb9411b20440afce21 Author: Dave Airlie Date: Mon Nov 17 09:03:01 2008 +1000 ttm: add discard for VRAM buffers -commit 8ccf604d48fe78d64cd65c6d21ee5a7369c5128d +commit 14d8ad7615dc6ab2ec80f80d36845dca35bc9c1b Author: Dave Airlie Date: Fri Nov 14 15:52:32 2008 +1000 drm: fix the exit path of the bo unlocking -commit c8fa1c195d32f655c76a7f26525d9b2ce6fe3100 +commit 23e70d6d449c16add33986b8c5bce488510187e3 Author: Dave Airlie Date: Fri Nov 14 15:51:44 2008 +1000 @@ -357,43 +357,43 @@ Fixup failure paths and make EAGAIN work -commit b2df8c57345d9e6a00703919fda8cd72c336e5c7 +commit 31c76808cf764d3149aa122f7cae5fcf6c0368da Author: Dave Airlie Date: Thu Nov 13 17:22:26 2008 +1100 radeon: fix some issues since last rebase -commit 4605ef95364d678c98d65266a01706c08e5b1038 +commit 0975896cb6309eb31ead28e3b84a47b192ef8f8c Author: Dave Airlie Date: Wed Nov 12 09:01:14 2008 +1000 radeon: fix more build -commit 2ac8351316d5473cc32310935c7d4191d03abd0c +commit 9df9c5489aaaa72aac2f686cf2ecc1738697cd13 Author: Dave Airlie Date: Wed Nov 12 08:59:04 2008 +1000 radeon: fix compile -commit 306704a2546f0348baa6dd315eba18689634f169 +commit 1935ebe68b7d987144dac01cf263cb67d7b61eb8 Author: Dave Airlie Date: Mon Nov 10 14:26:11 2008 +1000 radeon: add gart useable size to report to userspace -commit 3c2e8c0edaa91cf5c3fe0c068d2b09e1a3ca2d74 +commit fcf26b671d65006185a5e85c085b4f56a17bc40e Author: Dave Airlie Date: Sun Nov 9 20:34:49 2008 +1000 radeon: fix powerpc oops on rv280 -commit d494ddd76e9854271b0450b639cb86f98322fbd8 +commit ed12e1f95ae0ec0dbd2f070a9c9aba8458c0ee30 Author: Dave Airlie Date: Sun Nov 9 10:23:43 2008 +1000 radeon: upgrade atom headers -commit 1024b6c2e271ca0e8b9a40e0d7c6efd2f80e9693 +commit 2a2f22fff71d5e6a541308580d0adaf9b204c203 Author: Dave Airlie Date: Sat Nov 8 14:39:41 2008 +1000 @@ -402,13 +402,13 @@ For some reason reading the SCRATCH reg from RAM causes some race to occur. Hopefully fix this. -commit 048210aa7ce3b576b7a34118c6033c7b9381a0b3 +commit 378c5388ccb236ee3240faf739b934b6466ce48d Author: Dave Airlie Date: Sat Nov 8 11:31:03 2008 +1000 drm/radeon: add dpms connector functions -commit d7ef2f22d2aac321ab30460dcd0d4cdb535dd0f4 +commit 8874fab9be9deee2b8109acf568417397446b5d8 Author: Dave Airlie Date: Fri Nov 7 16:22:22 2008 +1000 @@ -416,13 +416,13 @@ fixes cursor on second head -commit 7ea01d017da6cd05faad375266e3f7e3443dd944 +commit f033c058fa0b4af501491c05906b1d3505847b91 Author: Dave Airlie Date: Fri Nov 7 16:21:03 2008 +1000 modesetting: set the crtc x,y after the mode base change -commit 321bdb5497693498bea1d8c1a74e6ce0a974f7a6 +commit 40c30db9197e8d856be1b30162f36b345b9285a0 Author: Dave Airlie Date: Wed Nov 5 10:23:35 2008 +1000 @@ -430,31 +430,31 @@ This allows re-use of uc/wc marked pages -commit 98cbdd3d71b2aa667131120d7407d2692594bf23 +commit 6a0cdd3e68cf584fa049a4ca5d563bcf648528bb Author: Dave Airlie Date: Tue Nov 4 13:18:02 2008 +1000 radeon: disable HDP read cache for now -commit d34012fa1e78c7de57885344fda07eea1102d679 +commit 34a9abac05a42b2fe3fc61e5ef433a459175c67e Author: Dave Airlie Date: Mon Nov 3 15:43:08 2008 +1000 radeon: fixup vram visible calculation to take a/c pinned objects for now -commit 4ee3b8fa2c163aa8977be6b5f535a33d65cce5c7 +commit 4bb932122181b01f6c9598b37d87896f2dd08251 Author: Dave Airlie Date: Mon Nov 3 09:56:02 2008 +1100 radeon: if modesetting state is unknown make it known so pm-utils can use it -commit f57066dcbdf89318364f0cad971463d85cfe0a7a +commit 15d3023e3200b8cd61cb5cab9fdd42880563b7c1 Author: Dave Airlie Date: Fri Oct 31 14:40:12 2008 +1000 radeon: fix ROP values for the paint ROP -commit 05d6ca90026d28af5039df38566cd52100c2f937 +commit c26cb17a3308014f2c3cd77ddd9849b91eb5eddd Author: Dave Airlie Date: Thu Oct 30 14:00:39 2008 +1000 @@ -462,43 +462,43 @@ This speeds things up a bit -commit dc2646c5817c5d82e55ae3d103932319b9caff3d +commit 03ad11c816f8f4a99423bf4fe45af82bc13cc2da Author: Dave Airlie Date: Thu Oct 30 14:00:15 2008 +1000 radeon: disable AGP for certain chips if not specified until we figure it out -commit 3c4ae383c1c191afbc559a1d1b81046cff513a25 +commit df9a3e9a9305c438261bab921e891f31dc4b4d4d Author: Dave Airlie Date: Wed Oct 29 15:45:47 2008 +1000 radeon: disable debugging message -commit 4a0ab548b2cc20593f1d81e7d65b04513df7d8f4 +commit 60db5b10e74468bcbf5da9d83b618b2b2a532314 Author: Dave Airlie Date: Wed Oct 29 15:37:32 2008 +1000 radeon: commit ring after emitting the buffer discards -commit 2c90d107eac0f3339517b47786e2b8485314ec24 +commit d3d385a4ce61e739c99775abfd71f9c551cb7c1b Author: Dave Airlie Date: Wed Oct 29 17:39:27 2008 +1100 radeon: fix whitespace in encoders C file -commit 3e60a385f4f5a9632b53ef6c3854442e817b20ce +commit 1b80b8ce54866549864ea7537bf9bcd41a42435f Author: Dave Airlie Date: Wed Oct 29 17:39:08 2008 +1100 radeon: add more HDMI bits -commit bb027cf8766950ad9a9e013d7c54b9505cefa0fd +commit 0cb9877beb8853d82d6c616cef04e19ede211c46 Author: Dave Airlie Date: Thu Oct 30 01:41:34 2008 +1000 radeon: set dma bufs bo type to a kernel type -commit 3799ce64d28ef5bfad2e10872bf5c4ccd540d83e +commit bc9022f02add7be1cfa408fd4f384e1046034b7b Author: Dave Airlie Date: Wed Oct 29 15:46:16 2008 +1100 @@ -506,19 +506,19 @@ This allows the rs690 to work on DVI -commit 6fd4548676f3a2ac6666fb0e2e64b9d614e86f3c +commit 4ccc4381b1552e8c09c98c22313d2a262674eb77 Author: Dave Airlie Date: Tue Oct 28 20:33:13 2008 +1000 radeon: setup isync cntl properly -commit 9956146db34b48b8f869c3f6d877d5ef521c2d7a +commit b53ed2d3b13b18dff7fe72b4c887da2ecc893d24 Author: Dave Airlie Date: Tue Oct 28 20:31:27 2008 +1000 radeon: add more debugging -commit dbba800897d651db0a4de9bff3d6b606b38b0a2e +commit c5560f48a686d676b8b2bd4373b269f4079a7698 Author: Dave Airlie Date: Tue Oct 28 20:26:04 2008 +1000 @@ -526,79 +526,79 @@ emit in 16-dword blocks, emit irqs at same time as everything else -commit 160aa200a369758fe6f4ba7f43c75675688c8953 +commit f347973b04c9b9c19f6c18d0f7209cb281886186 Author: Dave Airlie Date: Tue Oct 28 16:46:47 2008 +1000 radeon: add proc debugging for interrupts/ring -commit 821cec4393683debfba0d030fdc365f486f7ae83 +commit cc776b8878587444a48c67f45306fe00baec1f17 Author: Dave Airlie Date: Tue Oct 28 16:44:54 2008 +1000 radeon: only enable dynclks if asked for -commit d94846ab1af691474b14627bf8c3a7d8c0150d1a +commit c262cf05d9987c52e6dbdac4e11496250b57f0c2 Author: Dave Airlie Date: Tue Oct 28 06:35:10 2008 +1000 radeon: add wait rendering API -commit 35b09aed9162e407c937f72768f204f2c2860516 +commit 52666e2b54456464d607657ef954bece3e200f5f Author: Dave Airlie Date: Mon Oct 27 18:30:15 2008 +1000 radeon: remove unused gem indirect ioctl -commit 1fe4e61ce03b86ff66192e77719176efca860d19 +commit 213772d83f4a0c6c512918b048c57779a5c4dbf8 Author: Dave Airlie Date: Mon Oct 27 16:41:09 2008 +1000 radeon: fix some warnings -commit e2c82216bf147ed10ca9a3a7d5d50f9235d62120 +commit e0d84e24c7d580e899a0b8f2e6438363048846db Author: Dave Airlie Date: Mon Oct 27 16:40:34 2008 +1000 radeon: fix free after refcount -commit 4db039f8b597dcb107d25b3b05b362a3caf5d10f +commit 972acd5889f79e7ceeabeb804e5fe31ce38bd407 Author: Dave Airlie Date: Mon Oct 27 16:40:15 2008 +1000 radeon: CS2 make it all work with new relocs style -commit d8e9ea24f654a29308d23a54a1d33011be8a218f +commit f5449c628e2049e7657b18cf4a4123cdab228a1f Author: Dave Airlie Date: Mon Oct 27 16:39:12 2008 +1000 radeon: don't copy to user the cs ids -commit 783fa21c9964b87a80c8406a960b3ca0842224d7 +commit f66721f00949a896f493ebeffe7148a305c2b2cf Author: Dave Airlie Date: Mon Oct 27 14:23:22 2008 +1000 radeon: make new CS2 command submission interface port older interface to this -commit e72caa6c581bcb26ccf29c19c600e58b98c98f54 +commit a44e4e0a1e084785042ffdf1e97eaf3af0b30bfc Author: Dave Airlie Date: Thu Oct 23 19:13:50 2008 +1000 radeon: release agp on module unload -commit 536d02eb3d827cdba89b49ade70a073012d74469 +commit ddccc38b3afb9d2090008780e071db9948469cad Author: Dave Airlie Date: Tue Oct 21 14:15:23 2008 +1000 radeon: add r423 bits to modesetting -commit c815792c660609d64283140d3480f1bc2dee3038 +commit 83b961482de5b0e6be6705e2989a6cfb1c0adabc Author: Dave Airlie Date: Tue Oct 21 14:12:38 2008 +1000 radeon: pull bus master enable into its own function -commit 4b61a396680b8840608cdd2a5b532add60b65996 +commit d4dc3b34b530f2dac7a56df91116637a83ca2055 Author: Dave Airlie Date: Mon Oct 20 14:44:23 2008 +1000 @@ -607,67 +607,67 @@ We actually were passing accessible to userspace, but I thought the code sized it correctly, however it doesn't seem to. -commit fe11daf2e51a19bd46e044cd3a8de6410dcda14f +commit 1fb2de1a359dfa8e1ea8dfadc1a94c01250aef33 Author: Dave Airlie Date: Mon Oct 20 13:41:05 2008 +1000 radeon: update proper chip family -commit 839f2006146cd5b16bbe6bb0e2286d86813ccbe0 +commit 264ba20f3620ab4c090ab447eab66d02927d6c60 Author: Dave Airlie Date: Mon Oct 20 12:08:50 2008 +1000 radeon: fixup scratch register interactions properly -commit 951db4d5d1e0c3c4a99335300e4828213f786c41 +commit 4858a9cac51ec6d0bc258a67f0e7fba3c21f5ff0 Author: Dave Airlie Date: Mon Oct 20 10:27:50 2008 +1000 radeon: make writeback work again -commit bf3e23b5d45b797abd7af1eb868ad54d48f37b3d +commit 8d5960697f5b711d4c16a0c2c4d468cb0cfbe01e Author: Dave Airlie Date: Mon Oct 20 09:20:23 2008 +1000 drm: cleanup some warnings -commit 4c77d01ee54680c39cea44212f0426236c24c24d +commit f3cdefa036efeca3781c1da1d5ee46cb06eb50c7 Author: Dave Airlie Date: Thu Oct 16 16:29:08 2008 +1000 radeon: fix small typo in agp code -commit 879bdb0f9f099cdcabdda4e1c44d552d9e10784f +commit 5ee89d9254e5ad17214c808440e5b28c51303b92 Author: Dave Airlie Date: Thu Oct 16 16:17:01 2008 +1000 radeon: workaround failure to parse some rs48x edid -commit 23f95fb74987a341c7a9e584080387a44b647b90 +commit 1a25b0ccaee1420ad9284221889b21b223ccda26 Author: Dave Airlie Date: Thu Oct 16 16:15:08 2008 +1000 radeon: don't enable dynclks on rs48x -commit e01b7703d2db0a9a0f9b61b718fdc3429468bcf8 +commit 3c06bb33a5c49967d6279b6363b7b89cf303260d Author: Dave Airlie Date: Wed Oct 15 15:12:20 2008 +1000 radeon: allow r100/r200 modesetting to be forced on by users -commit 311d3793f954c18f057228598102c7fc84de8845 +commit 8fa11541b7db471c49851a3494b881bad0dfb0f0 Author: Dave Airlie Date: Thu Oct 16 22:06:00 2008 +1000 radeon: fix unused agp functionality -commit e743d40bbd3b32b653d70284b753addf3e59a691 +commit 26585d469919eadfc328a565f79ed4b1f091bc13 Author: Dave Airlie Date: Thu Oct 16 22:05:02 2008 +1000 radeon: add some more r100 support to test AGP -commit 2754bed358b786963626aae3eed9c7ded8367918 +commit ff5214e476bd122ee31167b06a82dd825ed8c93c Author: airlied Date: Wed Oct 15 23:58:03 2008 +1000 @@ -675,55 +675,55 @@ This add agpmode command line option. -commit 1beab2c935821231a4bb2376b8fd4d4888b467dd +commit 440c9ac360813e0cacd0eb48a30306238e988f7c Author: airlied Date: Wed Oct 15 23:57:21 2008 +1000 radeon: add CS support for r100/r200 in 2D driver -commit 73bcf7317b9a10b180954ce69fdd1d804d35aaff +commit 095829a2618c8fa55e9acfbebe1686419a589747 Author: Dave Airlie Date: Thu Oct 9 16:37:23 2008 +1100 radeon: fixup interrupt suspend/resume -commit db9a5648f16a4fbfe039f75cafe662927b50c8fa +commit 128687b2dca9d492f304ecfec0cdd35c8afdde4c Author: Dave Airlie Date: Wed Oct 8 16:57:12 2008 +1000 radeon: fixup suspend/resume bus master enable -commit 8994ad8f6134d1855505713da727e2b4b0a70533 +commit 0096b1658d9971bda8a3a54e6aa5e9660c7a975e Author: Dave Airlie Date: Wed Oct 8 16:56:04 2008 +1000 radeon: re-enable hw blits for copying from VRAM -commit 40901646936050107de6806dd03df2f8084e49ef +commit 9e3a62b5883478c938c98cc587300b2cc943f758 Author: Dave Airlie Date: Wed Oct 8 16:53:43 2008 +1000 radeon: fix buffer copying for VRAM->TT -commit afe53045b97dd95194c08df4bef47ef57ae9c430 +commit 4ed9a1e27cfc586315d028079fa53ba26d92f0af Author: Dave Airlie Date: Wed Oct 8 16:51:58 2008 +1000 radeon: move memcpy until after CP is stopped -commit 74b121b24b228c71befca26b8082d6629b40d33b +commit fbb367da6c240e067e0d3b7a9f8390ca1543ef9f Author: Dave Airlie Date: Tue Oct 7 16:34:12 2008 +1000 drm: remove stray debug code -commit e8a47c4a6da7a867d63ff658b2e682c28e492b90 +commit 8901c452c43d38b0cd1b613ea22a72142e232360 Author: Dave Airlie Date: Tue Oct 7 16:31:22 2008 +1000 radeon: use discardable flags on no backing store objects -commit fbf26dbd2be401dc21f01250733e028f5516cc13 +commit a100ca41b73b6f05de0620eebfe6a15660481423 Author: Dave Airlie Date: Tue Oct 7 16:30:09 2008 +1000 @@ -732,7 +732,7 @@ This discards memory contents on suspend/resume with the hope the upper layers know something we don't. -commit d0a09ef8bcadaeb71f5a37dabc223e582c39d656 +commit e1140a231e92ca8dfb15c3dc46a817aeaddf33ce Author: Dave Airlie Date: Tue Oct 7 16:27:31 2008 +1000 @@ -741,7 +741,7 @@ This enables the evict code and also sets radeon up to allow evict from VRAM to LOCAL -commit e032c0e614dffbf020ba58dd8556d9ab50449044 +commit c9157f564debde3def64916cfaa42a45c4609cb3 Author: Dave Airlie Date: Mon Oct 6 16:20:38 2008 +1000 @@ -749,25 +749,25 @@ fixup the interface between gem and ttm for alignment. makes Xv work better -commit 8341e1433a87a91c0e73a226199f04fcbf8eec75 +commit 45370b4592d7943960ac37e083cd37054f024230 Author: Dave Airlie Date: Wed Oct 1 11:27:02 2008 +1000 radeon: fixup GEM pinned offset retrieval for mesa -commit a4c4cd3a1e6459b2204ddb809c2f14dcb52a47f5 +commit 48552e7950f3f963497fd1c5891b6a677d9f6e32 Author: Dave Airlie Date: Wed Oct 1 11:25:54 2008 +1000 drm: fixup clean flag handling properly -commit 67dd695c4a0fd24f8e86620649287bdd22610c7c +commit 57e3502013a0aa7575aebbaa639797054a907136 Author: Alex Deucher Date: Mon Sep 29 14:57:11 2008 +1000 radeon: use atom for ext tmds on r4xx -commit 7f5a8447d2c8412945d04ceae0b0858412003a45 +commit 7e8952e96a6cc310537345ecbe2cd75da73b7e11 Author: Alex Deucher Date: Mon Sep 29 14:56:32 2008 +1000 @@ -776,37 +776,37 @@ default is legacy modesetting. pass module option r4xx_atom to try using atom on r4xx. -commit 44bd0c08a9c47995623c71e86baa5fea8b2c8ca7 +commit 860be8961e8d620132444d1d29aef2a9a4ad7d4b Author: Alex Deucher Date: Mon Sep 29 14:55:16 2008 +1000 radeon: first pass at using atombios on r4xx hw -commit 3ae49d9117d14d0d29eb15cc2d7f2d1226631fd6 +commit 84391eb5492b737a89056685cd98e96ad13869b5 Author: Dave Airlie Date: Mon Sep 29 14:50:47 2008 +1000 radeon: add r600 modesetting registers writes -commit 7647937983b5863301ae9c39869da6f2ad2c1750 +commit 9583df7aaaee24596129ef729120d1c2b35a3476 Author: Dave Airlie Date: Mon Sep 29 14:45:11 2008 +1000 radeon: parse object tables for connectors on r600 -commit 1f84e50713ff57e2740afb5c122839ad10d9f75e +commit 6b39bf511cc27bc11312e5cefeefbf3a9fba43c5 Author: Dave Airlie Date: Tue Sep 23 16:34:55 2008 +1000 radeon: fix minor cursor disappearing issues -commit 87ec501bf82790266b6920f5c002989b077d3a4d +commit c1d4bdd0c385e90105143bd1d620b8f2a9f7f6f9 Author: Kristian H??gsberg Date: Mon Sep 22 18:40:36 2008 -0400 radeon: Fix type in check for tmds type. -commit f6699ef22d1e39fa79fdf1c2c7698079940e02fb +commit 06574fb18d2ca60cc6e58acbec22e4bd449e341e Author: Kristian H??gsberg Date: Mon Sep 22 12:00:57 2008 -0400 @@ -815,31 +815,31 @@ This lets us defer handle creation until userspace acutally asks for one, at which point we also have a drm_file to associate it with. -commit 589131727992bbe016092908ca48d3b05bf9dc00 +commit f2507f12d8f4c382a54a7da6a74cbf37be4a5793 Author: Dave Airlie Date: Sun Sep 21 09:48:51 2008 +1000 drm: fixups on top of rebase -commit 7d5c9ce894428539fd7ef6fd5726fb9bb5a621b9 +commit 56e3cf3a3d201ed4602a96c8fdff87e35d4a32db Author: Dave Airlie Date: Sat Sep 20 03:08:05 2008 +1000 radeon: rmx_fixup() fixes for legacy chips -commit 6c3e06da2b817a845225392a8608b8557b60421f +commit b70aca6a8549f814db246315e82cdc87795b623f Author: Dave Airlie Date: Sat Sep 20 01:55:27 2008 +1000 radeon: fix combios -commit 3f6f785f6f8b0a72c654951b25204dfd93e4bdb1 +commit a2f06c804d190c6476cfd1abe8e8503fedd5d268 Author: Dave Airlie Date: Fri Sep 19 09:17:36 2008 +1000 radeon: port Alexs patches from modesetting-gem -commit 161c22fa2186e3fa7db8381bb3334e524387f9c3 +commit 62b4767e33a506d258c417f24d89a65bb8c3db3d Author: Kristian H??gsberg Date: Thu Sep 18 16:10:29 2008 -0400 @@ -848,7 +848,7 @@ Shouldn't trigger under normal use and when something breaks, it will be easier to debug. -commit b500d9b81ba5999db43886233b93e1bfba31d0e6 +commit 9748274d5cb475d0070aa4a6ebcca3cd9c01bac2 Author: Kristian H??gsberg Date: Thu Sep 18 16:07:50 2008 -0400 @@ -857,25 +857,25 @@ The X server emits writes to R300_DST_PIPE_CONFIG for R420 chipsets during accel init. -commit 337315f2036421b749be4145dbc63ff8ea09e674 +commit f0139a8561825602d13f7db03df1cd55e1a6ae4f Author: Kristian H??gsberg Date: Thu Sep 18 14:53:46 2008 -0400 radeon kms: Get precedence right when computing PLL values. -commit b8606c6ea9b8a63e4ecf76086d89a36a3de22319 +commit aba6727dcca8f179117c12eff295f3ebf8f248e0 Author: Alex Deucher Date: Thu Sep 18 09:55:14 2008 +1000 radeon: further LVDS fixes -commit e76302a5f42fa6812f6ea8785bb307957ea30ee8 +commit b9d55758b0826639ba3fe72cad57b058e2780646 Author: Alex Deucher Date: Thu Sep 18 09:54:12 2008 +1000 radeon: legacy lvds updates -commit 07bc67c9aac0139512cbc8fd5d55b15e3a9fed4d +commit 1ebe28497ea9188843de5baf0cf14e19b228ba02 Author: Dave Airlie Date: Thu Sep 11 18:26:27 2008 +1000 @@ -883,7 +883,7 @@ just fallback around busted stuff for now -commit f781d45bd419e3423e7ae338e03e4c7e0c879bfb +commit 08d6b4048ee7743d7469bc988bfeeec9bca081f6 Author: Dave Airlie Date: Thu Sep 11 18:25:18 2008 +1000 @@ -891,13 +891,13 @@ also dirty buffer on validate -commit df5bf9958b71faceff5df21f3e37b42ca65b93cf +commit 407b481e2af8f876f238a94bb6258a87c9cd48b5 Author: Dave Airlie Date: Thu Sep 11 17:13:32 2008 +1000 radeon: disable blit moves -commit f73e16c27c4f864231da713e0693fde5ab233851 +commit f3101d1a95bbbd347b6433502b11bf9ea1a0b07f Author: Dave Airlie Date: Thu Sep 11 16:18:27 2008 +1000 @@ -905,67 +905,67 @@ Normally this will be due to an AGP driver needing updating -commit 86fc48dea0d9e2763caf9c75c63dc482185ac004 +commit 2b454520d131713a53235707f7dbecaa37105f44 Author: Dave Airlie Date: Wed Sep 10 14:35:43 2008 +1000 radeon: do proper memory controller init and setup -commit f1fc7ac815271b26f63406fe480472e0c720c3c6 +commit 627f0ec5f62d18a423cbe7b1fd448bfda6f5279d Author: Dave Airlie Date: Wed Sep 10 14:35:08 2008 +1000 radeon: fix return value -commit 82e785236c4cb5040bd01a4489b75139383767b7 +commit e54053ead9e59ea1799c4f419531f89a31c0bec6 Author: Dave Airlie Date: Wed Sep 10 14:34:39 2008 +1000 radeon: fixup reference counting properly -commit b580361d2907dd914dfdd3b197699500da571163 +commit d149bb5bb9307577dd1470b80cb5207a03d99400 Author: Dave Airlie Date: Tue Sep 9 15:55:38 2008 +1000 radeon: sort out atom vs combios tables for r400 cards -commit 3b6037a2893f245ad92471de9ffae30ada10221a +commit d48d723f3a2fdbf138f32a447953de7b00b0be2c Author: Dave Airlie Date: Mon Sep 8 11:37:26 2008 +1000 radeon: remove unneeded debugging -commit ebc2390b8f6d1bb1e5e9f072a2e81fc0a6c5e12f +commit 0f686ebe654b9ef686485a702544ff035fe7b150 Author: Dave Airlie Date: Mon Sep 8 11:25:12 2008 +1000 radeon: don't do full edid for detection purposes -commit ee0dc245a4087ccc52f7d37b4a4587e9349c9f11 +commit ee738d7ba56f5f3f88886ce773a48fb59a9247c6 Author: Dave Airlie Date: Mon Sep 8 10:27:48 2008 +1000 radeon: disable debugging that sneaky itself on -commit a47ee92fae6e836dd97ef93a87c391530ddfe077 +commit 05932fb2b8f9cb6833a90ed29bead5a020a636a5 Author: Dave Airlie Date: Mon Sep 8 10:20:44 2008 +1000 radeon: make text reserve 256k -commit 360cf8bcb4dd21c8fb0ce1d8cb61a60bed22d8ed +commit 7e4d33d613d9b25fe9214d92b36867e94f094086 Author: Dave Airlie Date: Mon Sep 8 10:11:27 2008 +1000 radeon: don't disable VGA bits it breaks X later -commit 2acb0b21203126628428a191e254345f26a43880 +commit 62b45cdc700cc151d7649ff7b2683d05d0dad12b Author: Dave Airlie Date: Fri Sep 5 16:12:59 2008 +1000 radeon: further suspend/resume support -commit d640f43a290671bcb335f0df25bfb2911181b15c +commit d9c0e6a6e5498c8e2411cdd02c89d126231e9cb4 Author: Dave Airlie Date: Fri Aug 29 14:52:15 2008 +1000 @@ -973,13 +973,13 @@ this gets us back to fbcon.. its dirty like zebra -commit d6d9db1ee88aa96853edca09312740a5aff6e182 +commit 69cdec7204a757ffa41a8daa6ac980aef624a373 Author: Dave Airlie Date: Fri Sep 5 11:15:03 2008 +1000 radeon: only enable KMS for radeon on x86 for now -commit c9f0970bdc6887ab58da8b910d7ce8614b4da637 +commit 4be0ae7f7cf0cf38e8332dc5fd2c8a164273486f Author: Dave Airlie Date: Fri Sep 5 10:46:17 2008 +1000 @@ -987,13 +987,13 @@ Allocate the rs480/690 tables from uncached memory. -commit 25c6adce07473548b38cb838e2bbaed2aa4966af +commit 168eb546f6345fa24a40396c6fb28e8d9ffe2dba Author: Dave Airlie Date: Thu Sep 4 11:58:08 2008 +1000 drm/radeon: fixup some avivo/rs690 checks -commit 3e2795c0cbf44c3fd9dc86504c25dbe197a95ac5 +commit e091dd6b9db6596cd268de49b1f36f8d371d5887 Author: Dave Airlie Date: Fri Aug 29 09:59:02 2008 +1000 @@ -1001,7 +1001,7 @@ also change name from text to nomodeset -commit 4e98189e3b026947a0b984e651f6aec1c6bb8b3e +commit 314068483ffdca3fc27f17feb017d21ce13c9f96 Author: Dave Airlie Date: Thu Aug 28 21:22:27 2008 +1000 @@ -1009,13 +1009,13 @@ also don't explode on lack of DDC -commit cea4f4cbb67046297892d6d09cd7ef40eb7b9284 +commit da7b7848848cbe62e028dc40de5f00967e178725 Author: Dave Airlie Date: Thu Aug 28 18:31:50 2008 +1000 drm: fix dev->master convert -commit 1f7bfecea0e267a55f6cae69488656317d876fbb +commit 81e87bd01ed1555628363eae65fe0fd00efb9e93 Author: Kristian H??gsberg Date: Wed Aug 20 11:24:13 2008 -0400 @@ -1027,43 +1027,43 @@ Signed-off-by: Kristian H??gsberg -commit d3563f5774ecd2995f07cf6ae65c7b443af4edb8 +commit 7e3adb457f625f303bb9b9293a0810c9e05bea9f Author: Dave Airlie Date: Thu Aug 28 16:38:49 2008 +1000 radeon: fix LVDS on atombios - typos -commit 7e9a1b11d3f380d8e167c88a12a97bab45401e85 +commit da4a6c203ca8a62b2ba7754dd2531b290a3ff927 Author: Dave Airlie Date: Thu Aug 28 12:01:53 2008 +1000 radeon: limit LVDS to first CRTC for now -commit 669e89d0ede8dccbf7b162ab6728f7dbb12c54c2 +commit fa4d17e8bf619bc7df43f54f04407aaad596c00d Author: Dave Airlie Date: Thu Aug 28 12:01:38 2008 +1000 radeon: fixup checks for crtc in dpms path -commit 2eb96e92145ec1f54048276d22bc005d5a0d0559 +commit fe560fafe3b5f3401661b160e05fb3dd06afc068 Author: Dave Airlie Date: Wed Aug 27 15:39:17 2008 +1000 radeon: fix after rebase -commit 23e85e41320de308b763c7ec4b97ff7e2384ca27 +commit db6498b03a2a057514cbaad0199543e9cc439883 Author: Dave Airlie Date: Wed Aug 27 13:43:04 2008 +1000 radeon: avoid oops on encdoers with no crtc set -commit 7c2ff69869a6908634e2993f73fb75052efe4044 +commit 998d6feb8de1a21188f14795b4811766d3e03364 Author: Alex Deucher Date: Tue Aug 26 17:23:21 2008 +1000 radeon: fix warning from radeon_legacy_state removal -commit 4dd47d364b988d067a4f4de78cd13b53275a62d2 +commit 954b62d3a28fd0ec13381b00c12633f88add1370 Author: Alex Deucher Date: Tue Aug 26 17:22:37 2008 +1000 @@ -1072,7 +1072,7 @@ - done: primary dac, vga on tvdac - todo: ext dac, tv on tvdac -commit ad338a53035c3f78d72ace748c0e2debe0d1e39b +commit d4b7208ef17bf36574a9bf5cab06507be6572339 Author: Alex Deucher Date: Tue Aug 26 17:22:11 2008 +1000 @@ -1080,25 +1080,25 @@ - todo: updated connected status -commit 76b449c6332d9deedd089044ec00ea03d87ab630 +commit 5629e7d7736db9e6a289b2673ebac1e967b3f5d9 Author: Alex Deucher Date: Tue Aug 26 17:20:54 2008 +1000 radeon: remove unused legacy state -commit 24d5dbb9aa68beebd065bd2c5af08206b3fe4d93 +commit 50491f33fb5a6fd62c2646ff10a2c9ec3073ef02 Author: Alex Deucher Date: Tue Aug 26 17:20:15 2008 +1000 radeon: get primary dac adj info from bios tables -commit 6f948a22bf1b82045f44eaa5fe8bd07922f6105b +commit 0e92c447f9d36ade5a08d16e2a2fdbf6f0ac19e7 Author: Dave Airlie Date: Tue Aug 26 17:03:13 2008 +1000 x86: export pat_enabled -commit e47a736c75855f69f59beef8b4264dbb8bc2b3a7 +commit a14d9a4dea55948970ef92e4e84c11858f3b893a Author: Dave Airlie Date: Tue Aug 26 17:02:43 2008 +1000 @@ -1107,7 +1107,7 @@ If PAT is enabled, enable write combining support for kernel/user mappings when pat is enabled. Also set memory to WC instead of uncached in ttm -commit 4bab63d11abe30371addf1f3b71c8db448724f6e +commit eded91caaa0d115201271604f17729a005ad486b Author: Dave Airlie Date: Tue Aug 26 17:01:35 2008 +1000 @@ -1116,7 +1116,7 @@ move domain validate function to separate function call it from correct places -commit 108203538073ae1062398c85c494263887a34470 +commit 8953bf857b1dd483f1c86d1c43163a20ff5684f5 Author: Dave Airlie Date: Tue Aug 26 17:00:49 2008 +1000 @@ -1125,37 +1125,37 @@ If a BO hasn't been dirtied, do a solid fill on VRAM instead of migrating pages to VRAM -commit 009a2d4c9a4689f94b80eb65a75bc1fa641147e3 +commit 713778614da4358945e274f94e19a02d0cb1805d Author: Dave Airlie Date: Tue Aug 26 16:59:45 2008 +1000 drm: set clean flags in new flags so it doesn't disappear -commit ed3eaf3df99dee8dc4ecaf0b470e822546eda40b +commit 71f4898bfa365cebb406436f0361e3953b1ca5aa Author: Dave Airlie Date: Fri Aug 22 10:16:20 2008 +1000 radeon: wait for dma gui idle on 2D idle -commit bf574652c96b20c21426237b97d613169e27b088 +commit 0d9b8e43e638df4630087a1da8acf04f214e9642 Author: Dave Airlie Date: Fri Aug 22 10:16:01 2008 +1000 radeon_gem: fix some misplace == -commit 1bb970bd72e9faa4df5689be33959e9ce89db82b +commit eff022a86be119e9b90e89df95ee05ce022c6d28 Author: Dave Airlie Date: Fri Aug 22 10:13:25 2008 +1000 radeon: get buffer upload working -commit d17f5cb8d8b043a0c2ab3ea0200ccfd353314282 +commit 6e32a7983164f38310cb4d7fab3d80af21f5e596 Author: Dave Airlie Date: Fri Aug 22 10:12:57 2008 +1000 radeon: read back register between on gart flush -commit 302e1c8a80263e97cac6823b6c464ae7b8adefd5 +commit 8502a3108f60d91c84d8833443fff6f49c2eccf8 Author: Dave Airlie Date: Fri Aug 22 10:11:55 2008 +1000 @@ -1164,7 +1164,7 @@ We need a buffer zeroing function for before we have accel running etc -commit 85abdbdbde631c154fd67b2445ecdf1e30508397 +commit d3d1ae15ca9732a3f95a3036838bfdabfd28c5c4 Author: Dave Airlie Date: Fri Aug 22 09:49:16 2008 +1000 @@ -1175,55 +1175,55 @@ Primarily for the move code when we get a buffer in VRAM, we don't need to copy the contents just zero them. -commit e907c43b899ed99707a36ac15c22c104f9f00782 +commit 162f143be9fd409abda1ecec913b4cefe419b038 Author: Dave Airlie Date: Fri Aug 22 09:39:07 2008 +1000 ati_pcigart: add memory barrier and volatile for table access -commit 66be01c5c7e64c3fb9332ef6e63d776deb4a6224 +commit 0e56fcb668a44fc76daa82efac6614c6899624c3 Author: Dave Airlie Date: Fri Aug 22 09:35:26 2008 +1000 drm: remove tlb flush logic from ttm -commit d177a69043cb06bd7032b82e6ec9de38c28093f7 +commit 2aa7e465d78f2b94dd3e4c1b54c9e2843847aad3 Author: Dave Airlie Date: Tue Aug 19 12:14:38 2008 +1000 radeon: add GTT domain -commit 9e6f7599ad547595ad0cea7b6964d59f596e9f2c +commit df0db06541521519b4862e414f179e5d2306844c Author: Dave Airlie Date: Wed Aug 27 14:58:05 2008 +1000 radeon: add missing regs from a previous rebase -commit 15864dc92a77d2bc93887e97174bf84076c8755f +commit 6ed84abc7ae41a641cef9f4c3f2adca7995238ae Author: Dave Airlie Date: Thu Aug 14 18:14:56 2008 +1000 disable modeset on < r300 -commit 05ff5f700ed3605534a9272b5e6ca41291d2b186 +commit 2f7f5b8fe055d1453a4d7c7e260d67a7174e20f0 Author: Dave Airlie Date: Fri Aug 15 09:36:21 2008 +1000 radeon: set the base after mode is programmed -commit af11a2194ef5a7242c5331fdd52eea6d5e3ce4e5 +commit a542c23567db12c49c0ba5f363165e1d7726a220 Author: Dave Airlie Date: Fri Aug 15 09:35:55 2008 +1000 radeon: fix LVDS modes problem -commit 2b849b5c4b4e61227249852524b403995b56f531 +commit 5d84fcb7d7449c5d3d795e1e0a98c46527c8ef20 Author: Dave Airlie Date: Thu Aug 14 18:06:31 2008 +1000 radeon: reserve 64k of VRAM for now for text mode so we don't trample it -commit d5971ce512b7b726e3f9a6d19edcd616e5c8ba81 +commit 3d91fb23d89154f87280a456eeb0152610581c88 Author: Dave Airlie Date: Thu Aug 14 14:38:27 2008 +1000 @@ -1231,31 +1231,31 @@ This gets RN50 to initialise correctly -commit 8bfecd77bf3d20a20407614853aa17b520cae52f +commit f6296bd2eb5f1413d9c9ddbdc3e5bd57d55d7540 Author: Dave Airlie Date: Thu Aug 14 14:37:25 2008 +1000 radeon: add copy/solid regs for rn50 -commit 96cad53e3612496b538efd5f6bacb03c9be957d5 +commit dfa87602624538d29b11cbc78bde8498b095d898 Author: Alex Deucher Date: Thu Aug 14 09:59:47 2008 +1000 radeon: fill in and make use of more combios tables -commit 343ef81c5ed9626dc9bb144b7868da0ab90c102d +commit 00e92e03c06b77e2bfa7b2849bf2391b31f32138 Author: Dave Airlie Date: Thu Aug 14 09:59:31 2008 +1000 radeon: add quirks from DDX -commit 1e71882a1e6d0ba0c4b2fe5beb0fc0dd01ca03d2 +commit 157f49b4292f30c81fa4e282c294f2184800ece9 Author: Alex Deucher Date: Thu Aug 14 09:59:12 2008 +1000 radeon: fix warnings -commit 9db8f19666d35c8334cd850798dd5788c3f4c676 +commit 8cc8a81f3e175fbd13c41eddd881f2391dea7b49 Author: Alex Deucher Date: Thu Aug 14 09:58:47 2008 +1000 @@ -1266,31 +1266,31 @@ - add debugging for tracing calls - fix pitch calculation -commit 42bd98095eae04f52a21a83a4a3eca8dc52c9cef +commit 29c062c51a89548c5f681bb1aabc8244c1cf258f Author: Alex Deucher Date: Thu Aug 14 09:58:24 2008 +1000 radeon: set base in legacy crtc mode set -commit 9e1896e45ab26f0b4e562efce33a01fd67bf1f3a +commit b087de02966b1a4c7ab6008190f20978103b55dd Author: Alex Deucher Date: Thu Aug 14 09:55:06 2008 +1000 radeon: Convert COM BIOS to table offset lookup function -commit 6cf32f1a9c04dc0cb8d3a2e29352506b0ab79012 +commit fff8453fbf60d3496d3b3df137cd15a976e2a0ca Author: Alex Deucher Date: Thu Aug 14 09:54:03 2008 +1000 radeon/cursor: Restructure cursor handling and add support for legacy cursors -commit cdc4a1e11454facfaa7f9fd7aad4ef2328d3a47d +commit e3b19486084d0463dbd7b6fd6d31a370d0a3592c Author: Alex Deucher Date: Thu Aug 14 09:53:08 2008 +1000 radeon/atom: implement crtc lock -commit f1b6e6c59af6799a18541fe2113c97bdc93c62f3 +commit 78e8e02b929e27423ff790301975b9d91aee6f25 Author: Alex Deucher Date: Thu Aug 14 09:50:15 2008 +1000 @@ -1299,7 +1299,7 @@ - Add gamma set for legacy chips - Add 16 bpp gamma set -commit 288c1218f90bb67cdcb3546991d4ed41d8fd73f4 +commit 8b1ee86f2b239ae88608d9ce02386b8fb3a852af Author: Alex Deucher Date: Thu Aug 14 09:49:55 2008 +1000 @@ -1309,19 +1309,19 @@ - move i2c_lock to radeon_i2c.c - enable tv dac on legacy -commit 71f6c9fa3e5aaba8819606a7c2c148cb252b4c5a +commit 231a506ff3ffa428a34a76053cb9742f90cf9ae4 Author: Alex Deucher Date: Thu Aug 14 09:49:30 2008 +1000 radeon: Add legacy dac detect stubs -commit d833d2b59429b58377b046a924b850dfab303ea8 +commit 8d722f01ff90d7ec79fd3d84a4c64cf1298487c0 Author: Alex Deucher Date: Thu Aug 14 09:49:12 2008 +1000 unify connector, i2c handling for atom and legacy -commit 894b13ab013b1807e8f2e0ecc09599a46f2811b6 +commit f768e781c80dfc1ed89b28dcc639844d1c1b11d9 Author: Alex Deucher Date: Thu Aug 14 09:48:50 2008 +1000 @@ -1329,25 +1329,25 @@ - removed save/init/restore chain with set functions -commit f7e2e377eb72a52f97e42abf698150f0ab6dc798 +commit de21abcab8649534fd0462e45d80754d50a2a440 Author: Dave Airlie Date: Thu Aug 14 08:54:04 2008 +1000 FEDORA: radeon set gart buffers start -commit 6dccbf9271bee372915b089f227a49486ce58e5f +commit 8ec0a659d106e7638ebcb3a3ea0b4b79a5c3a170 Author: Dave Airlie Date: Thu Aug 14 08:52:41 2008 +1000 radeon: command submission remove debug -commit 7b6b2fdc468136aaedaf1c2a3d082fa09c94071e +commit 188a6ce283c1991b90cb3162bd2b2dac40d14abc Author: Dave Airlie Date: Thu Aug 14 08:51:00 2008 +1000 radeon: use mm_enabled variable to denote memory manager running -commit b5e348e79a98eea1d526174082d00b70957d5057 +commit e2a7eb5d820d0aee28016543f2a7a5b9c30327f5 Author: Dave Airlie Date: Tue Aug 12 12:19:05 2008 +1000 @@ -1355,19 +1355,19 @@ in the correct place in the drm so buffer swaps work again -commit d4250305c22c6f007faec9ef982737dc092a081b +commit a615e2cee2a2a9e318e33be7d0258199adccd71b Author: Dave Airlie Date: Tue Aug 12 12:18:08 2008 +1000 radeon: add mm supported call for userspace -commit 7f66897161bfbcc242c32100ca244bd29c027fd4 +commit f9d6b141b54c39f1c539a45afc4d6ac5b2aee129 Author: Dave Airlie Date: Tue Aug 12 09:40:18 2008 +1000 FEDORA: add old DMA buffers on top of GEM -commit 914e90cfce2c726beaa693fa442c74807d89c327 +commit 2f742ebf571092dcbe0ece9e6a64166bf5f8a63d Author: Dave Airlie Date: Fri Aug 8 15:57:10 2008 +1000 @@ -1376,61 +1376,61 @@ This adds the CRTC and PLL setting code, it doesn't work yet but its all heading in the right direction. -commit 7fbba721a5708376b66ef2bfbd49381510977877 +commit dd5b4040c98328ac42820f111bad7dec13b405ad Author: Dave Airlie Date: Fri Aug 8 10:11:23 2008 +1000 radeon: add initial tmds parsing for legacy cards -commit e9196680e26f9c94e68f9d8a81ffd2280b8c78c6 +commit 6ed7e32dfb0e6bb1b20749ae03473b7f4fd3a2d2 Author: Dave Airlie Date: Wed Aug 6 16:01:22 2008 +1000 radeon: set new memmap on gem enable -commit 23eac0d75cb2b9cdb77606f640835dd309f80c9c +commit 4160d24b5b542ff18af9db9a52e59315487ce856 Author: Dave Airlie Date: Wed Aug 6 15:51:02 2008 +1000 radeon/pci: fixup table when GEM allocates it -commit 286c15fff8e368a965b1d7689287179093f543c4 +commit f64e50adc49851b0f92302c22004a1573d58b8c4 Author: Dave Airlie Date: Wed Aug 6 15:44:38 2008 +1000 radeon: set gart table size -commit bb0b2e5f85d4aa3114b9e7c0ad945af9ea013102 +commit cf58a6b17c77bfc686ea67f8ad91252035278936 Author: Dave Airlie Date: Wed Aug 6 15:44:18 2008 +1000 radeon: fix buffer evict slection -commit ad16387d65a8291c0d42793da0e9a011f0aa1c2f +commit 7ca4e7d7f9e8322da03e4a697935dfeab590e168 Author: Dave Airlie Date: Wed Aug 6 15:43:51 2008 +1000 pcigart: fix incorrect memset + no need for wbinvd -commit e7f1cca035f00fb6ffe9c422f296db0b19a60523 +commit df841fd3b4851cb79fb78b3fdb573815e1bdd7a4 Author: Dave Airlie Date: Tue Aug 5 11:22:24 2008 +1000 radeon: fix defines so blit works again -commit f2d52cf02a36d7ff37af591aee484f5281550a61 +commit 6291b15368c6ac25330def3b597be163dc33d1d9 Author: Dave Airlie Date: Mon Aug 4 17:10:35 2008 +1000 drm: leave bo driver finish to the driver -commit 12154f3ea9e432f0bdd97b8afb776eb66a5fea43 +commit dcc77ae64acdd03ac218e7a6f20eea25c89c0e2c Author: Dave Airlie Date: Mon Aug 4 14:21:22 2008 +1000 drm: fix unneeded debug -commit 562ae70f8ccda9cd9002e77499023ae1923ddf85 +commit 518910a4e455ac1fb59f156888be1d66270de090 Author: Dave Airlie Date: Mon Aug 4 14:20:47 2008 +1000 @@ -1438,52 +1438,52 @@ if kms enabled memory manager will be enabled by default -commit 14b223fb24096144b1a18095041880efb0adbab9 +commit 92a5dbb75a0e9239f3221037132b9c06faddb2d4 Author: Dave Airlie Date: Mon Aug 4 14:20:26 2008 +1000 drm: kill bo after driver lastclose -commit a28ab194409419a3fa52a97de78c8c9caa85002e +commit 144926f8fe0f261ee8c875cca6292b453b0a966c Author: Dave Airlie Date: Mon Aug 4 11:32:45 2008 +1000 radeon: don't invalidate cache if CP isn't running -commit 4d3a9380c7c061990b46eef900412f51c594e3fc +commit f667c4d907c9775bd167085383c03fa06cc27319 Author: Dave Airlie Date: Sat Aug 2 08:06:26 2008 +1000 drm: fix release locking -commit 30296bb509eeb4767c0dd584d9d03ec533f594f6 +commit 036600d5b8d4d0cd30e014f7fc75a6e02f6af079 Author: Dave Airlie Date: Fri Aug 1 16:55:34 2008 +1000 drm: add radeon modesetting support -commit 69c74f6076330e079c3a3fba6e58c17405c3847e +commit 28522b2b95cc292dc87e29f1e5832f5ad37910ee Author: Dave Airlie Date: Fri Aug 1 14:06:12 2008 +1000 drm: add TTM VM changes -commit c69d0e8f14059198d93e6d3a0216dc64650538c3 +commit 16ba6db39d08df01d6c11f815dd3f07e38f948a5 Author: Dave Airlie Date: Thu Jul 31 15:27:27 2008 +1000 drm: import TTM basic objects -commit b650608b1305c47f3cfed3a9b715460739544e2f +commit 93df5ae2f9e70d73de8fea05d062ae9674eb717a Author: Dave Airlie Date: Fri Sep 5 11:26:55 2008 +1000 drm: export drm_i915_flip_t type to userspace to build Mesa diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c -index aebbf67..3867c71 100644 +index e0ab173..69de2db 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c -@@ -29,6 +30,7 @@ +@@ -30,6 +30,7 @@ #ifdef CONFIG_X86_PAT int __read_mostly pat_enabled = 1; @@ -4944,7 +4944,7 @@ +EXPORT_SYMBOL(drm_bo_pfn_prot); + diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c -index 445c762..325b4aa 100644 +index 6d80d17..4d2161f 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -249,7 +249,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, @@ -4965,7 +4965,7 @@ + dev->sigdata.lock = &dev->default_lock; + master->lock.hw_lock = &dev->default_lock; master->lock.file_priv = NULL; - wake_up_interruptible(&master->lock.lock_queue); + wake_up_interruptible_all(&master->lock.lock_queue); } @@ -481,6 +481,9 @@ int drm_rmmap_locked(struct drm_device *dev, struct drm_local_map *map) case _DRM_GEM: @@ -5677,7 +5677,7 @@ +} + diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c -index 6c020fe..2efb96d 100644 +index f52663e..4f1a405 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c @@ -481,6 +481,10 @@ int drm_release(struct inode *inode, struct file *filp) @@ -5691,7 +5691,7 @@ mutex_lock(&dev->struct_mutex); if (file_priv->is_master) { -@@ -500,6 +504,7 @@ int drm_release(struct inode *inode, struct file *filp) +@@ -514,6 +518,7 @@ int drm_release(struct inode *inode, struct file *filp) /* drop the reference held my the file priv */ drm_master_put(&file_priv->master); file_priv->is_master = 0; @@ -5825,7 +5825,7 @@ #if __OS_HAS_AGP static void *agp_remap(unsigned long offset, unsigned long size, diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c -index 7c41600..7e277c7 100644 +index cf80507..c7817e1 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -102,6 +102,7 @@ struct drm_master *drm_master_create(struct drm_minor *minor) @@ -5836,16 +5836,7 @@ list_add_tail(&master->head, &minor->master_list); -@@ -147,7 +148,7 @@ static void drm_master_destroy(struct kref *kref) - - drm_ht_remove(&master->magiclist); - -- if (master->lock.hw_lock) { -+ if (master->lock.hw_lock != &dev->default_lock) { - if (dev->sigdata.lock == master->lock.hw_lock) - dev->sigdata.lock = NULL; - master->lock.hw_lock = NULL; -@@ -210,6 +211,7 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, +@@ -202,6 +203,7 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, init_timer(&dev->timer); mutex_init(&dev->struct_mutex); mutex_init(&dev->ctxlist_mutex); @@ -5853,7 +5844,7 @@ idr_init(&dev->drw_idr); -@@ -221,7 +223,12 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, +@@ -213,7 +215,12 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, dev->hose = pdev->sysdata; #endif @@ -5867,7 +5858,7 @@ return -ENOMEM; } -@@ -254,7 +261,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, +@@ -246,7 +253,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, } } @@ -5875,7 +5866,7 @@ retcode = drm_ctxbitmap_init(dev); if (retcode) { DRM_ERROR("Cannot allocate memory for context bitmap.\n"); -@@ -270,6 +276,13 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, +@@ -262,6 +268,13 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, } } @@ -5889,7 +5880,7 @@ return 0; error_out_unreg: -@@ -459,6 +472,7 @@ int drm_put_minor(struct drm_minor **minor_p) +@@ -451,6 +464,7 @@ int drm_put_minor(struct drm_minor **minor_p) *minor_p = NULL; return 0; } @@ -6762,7 +6753,7 @@ + return 0; +} diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 548ff2c..dd53421 100644 +index 87b6b60..fb548e0 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -374,7 +374,8 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr) Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1371 retrieving revision 1.1372 diff -u -r1.1371 -r1.1372 --- kernel.spec 3 Mar 2009 21:55:19 -0000 1.1371 +++ kernel.spec 3 Mar 2009 22:04:06 -0000 1.1372 @@ -1791,6 +1791,9 @@ # and build. %changelog +* Wed Mar 04 2009 Dave Airlie 2.6.29-0.185.rc6.git7 +- rebase drm patches on git7 + * Tue Mar 03 2009 Dave Jones 2.6.29-0.184.rc6.git7 - 2.6.29-rc6-git7 From kkofler at fedoraproject.org Tue Mar 3 22:06:11 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 3 Mar 2009 22:06:11 +0000 (UTC) Subject: rpms/kdelibs/devel kdelibs-4.2.0-kjs-gcc44-crash.patch, 1.3, 1.4 kdelibs.spec, 1.450, 1.451 kdelibs-4.2.1-kjs-gcc44-crash.patch, 1.1, NONE Message-ID: <20090303220611.9E22C70116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13907/devel Modified Files: kdelibs.spec Added Files: kdelibs-4.2.0-kjs-gcc44-crash.patch Removed Files: kdelibs-4.2.1-kjs-gcc44-crash.patch Log Message: Revert, the "better" patch does not work. kdelibs-4.2.0-kjs-gcc44-crash.patch: Index: kdelibs-4.2.0-kjs-gcc44-crash.patch =================================================================== RCS file: kdelibs-4.2.0-kjs-gcc44-crash.patch diff -N kdelibs-4.2.0-kjs-gcc44-crash.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ kdelibs-4.2.0-kjs-gcc44-crash.patch 3 Mar 2009 22:06:11 -0000 1.4 @@ -0,0 +1,12 @@ +diff -ur kdelibs-4.2.0/kjs/CMakeLists.txt kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt +--- kdelibs-4.2.0/kjs/CMakeLists.txt 2008-11-19 11:20:10.000000000 +0100 ++++ kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt 2009-02-18 19:43:20.000000000 +0100 +@@ -183,6 +183,8 @@ + CompileState.cpp + ) + ++set_source_files_properties(dtoa.cpp PROPERTIES COMPILE_FLAGS -fno-strict-aliasing) ++ + if (NOT DEFINED QT_ONLY) + set(KJSLIBNAME kjs) + else (NOT DEFINED QT_ONLY) Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.450 retrieving revision 1.451 diff -u -r1.450 -r1.451 --- kdelibs.spec 3 Mar 2009 19:40:16 -0000 1.450 +++ kdelibs.spec 3 Mar 2009 22:06:11 -0000 1.451 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.1 -Release: 3%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -79,8 +79,8 @@ Patch20: kdelibs-4.1.70-cmake.patch Patch22: kdelibs-4.1.96-cmake.patch Patch23: kdelibs-4.2.0-gcc44-workaround.patch -# fix aliasing problems in kjs/dtoa.cpp (GCC 4.4 crash) (#485968) -Patch24: kdelibs-4.2.1-kjs-gcc44-crash.patch +# disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968) +Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch Patch25: kdelibs-4.2.0-gcc44-misc.patch # upstream @@ -401,9 +401,6 @@ %changelog -* Tue Mar 03 2009 Kevin Kofler - 4.2.1-3 -- better fix for #485968 (fix aliasing instead of using -fno-strict-aliasing) - * Sun Mar 01 2009 Than Ngo - 4.2.1-2 - respin --- kdelibs-4.2.1-kjs-gcc44-crash.patch DELETED --- From kkofler at fedoraproject.org Tue Mar 3 22:06:40 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 3 Mar 2009 22:06:40 +0000 (UTC) Subject: rpms/kdelibs/F-10 kdelibs-4.2.0-kjs-gcc44-crash.patch, 1.2, 1.3 kdelibs.spec, 1.408, 1.409 kdelibs-4.2.1-kjs-gcc44-crash.patch, 1.1, NONE Message-ID: <20090303220640.C289570116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13907/F-10 Modified Files: kdelibs.spec Added Files: kdelibs-4.2.0-kjs-gcc44-crash.patch Removed Files: kdelibs-4.2.1-kjs-gcc44-crash.patch Log Message: Revert, the "better" patch does not work. kdelibs-4.2.0-kjs-gcc44-crash.patch: Index: kdelibs-4.2.0-kjs-gcc44-crash.patch =================================================================== RCS file: kdelibs-4.2.0-kjs-gcc44-crash.patch diff -N kdelibs-4.2.0-kjs-gcc44-crash.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ kdelibs-4.2.0-kjs-gcc44-crash.patch 3 Mar 2009 22:06:10 -0000 1.3 @@ -0,0 +1,12 @@ +diff -ur kdelibs-4.2.0/kjs/CMakeLists.txt kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt +--- kdelibs-4.2.0/kjs/CMakeLists.txt 2008-11-19 11:20:10.000000000 +0100 ++++ kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt 2009-02-18 19:43:20.000000000 +0100 +@@ -183,6 +183,8 @@ + CompileState.cpp + ) + ++set_source_files_properties(dtoa.cpp PROPERTIES COMPILE_FLAGS -fno-strict-aliasing) ++ + if (NOT DEFINED QT_ONLY) + set(KJSLIBNAME kjs) + else (NOT DEFINED QT_ONLY) Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v retrieving revision 1.408 retrieving revision 1.409 diff -u -r1.408 -r1.409 --- kdelibs.spec 3 Mar 2009 19:40:15 -0000 1.408 +++ kdelibs.spec 3 Mar 2009 22:06:10 -0000 1.409 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.1 -Release: 3%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -79,8 +79,8 @@ Patch20: kdelibs-4.1.70-cmake.patch Patch22: kdelibs-4.1.96-cmake.patch Patch23: kdelibs-4.2.0-gcc44-workaround.patch -# fix aliasing problems in kjs/dtoa.cpp (GCC 4.4 crash) (#485968) -Patch24: kdelibs-4.2.1-kjs-gcc44-crash.patch +# disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968) +Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch Patch25: kdelibs-4.2.0-gcc44-misc.patch # upstream @@ -401,9 +401,6 @@ %changelog -* Tue Mar 03 2009 Kevin Kofler - 4.2.1-3 -- better fix for #485968 (fix aliasing instead of using -fno-strict-aliasing) - * Sun Mar 01 2009 Than Ngo - 4.2.1-2 - respin --- kdelibs-4.2.1-kjs-gcc44-crash.patch DELETED --- From kkofler at fedoraproject.org Tue Mar 3 22:06:41 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 3 Mar 2009 22:06:41 +0000 (UTC) Subject: rpms/kdelibs/F-9 kdelibs-4.2.0-kjs-gcc44-crash.patch, 1.2, 1.3 kdelibs.spec, 1.383, 1.384 kdelibs-4.2.1-kjs-gcc44-crash.patch, 1.1, NONE Message-ID: <20090303220641.1FCFA70116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13907/F-9 Modified Files: kdelibs.spec Added Files: kdelibs-4.2.0-kjs-gcc44-crash.patch Removed Files: kdelibs-4.2.1-kjs-gcc44-crash.patch Log Message: Revert, the "better" patch does not work. kdelibs-4.2.0-kjs-gcc44-crash.patch: Index: kdelibs-4.2.0-kjs-gcc44-crash.patch =================================================================== RCS file: kdelibs-4.2.0-kjs-gcc44-crash.patch diff -N kdelibs-4.2.0-kjs-gcc44-crash.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ kdelibs-4.2.0-kjs-gcc44-crash.patch 3 Mar 2009 22:06:10 -0000 1.3 @@ -0,0 +1,12 @@ +diff -ur kdelibs-4.2.0/kjs/CMakeLists.txt kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt +--- kdelibs-4.2.0/kjs/CMakeLists.txt 2008-11-19 11:20:10.000000000 +0100 ++++ kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt 2009-02-18 19:43:20.000000000 +0100 +@@ -183,6 +183,8 @@ + CompileState.cpp + ) + ++set_source_files_properties(dtoa.cpp PROPERTIES COMPILE_FLAGS -fno-strict-aliasing) ++ + if (NOT DEFINED QT_ONLY) + set(KJSLIBNAME kjs) + else (NOT DEFINED QT_ONLY) Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v retrieving revision 1.383 retrieving revision 1.384 diff -u -r1.383 -r1.384 --- kdelibs.spec 3 Mar 2009 19:40:16 -0000 1.383 +++ kdelibs.spec 3 Mar 2009 22:06:10 -0000 1.384 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.1 -Release: 3%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -79,8 +79,8 @@ Patch20: kdelibs-4.1.70-cmake.patch Patch22: kdelibs-4.1.96-cmake.patch Patch23: kdelibs-4.2.0-gcc44-workaround.patch -# fix aliasing problems in kjs/dtoa.cpp (GCC 4.4 crash) (#485968) -Patch24: kdelibs-4.2.1-kjs-gcc44-crash.patch +# disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968) +Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch Patch25: kdelibs-4.2.0-gcc44-misc.patch # upstream @@ -401,9 +401,6 @@ %changelog -* Tue Mar 03 2009 Kevin Kofler - 4.2.1-3 -- better fix for #485968 (fix aliasing instead of using -fno-strict-aliasing) - * Sun Mar 01 2009 Than Ngo - 4.2.1-2 - respin --- kdelibs-4.2.1-kjs-gcc44-crash.patch DELETED --- From robert at fedoraproject.org Tue Mar 3 22:08:26 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Tue, 3 Mar 2009 22:08:26 +0000 (UTC) Subject: rpms/libsndfile/devel libsndfile.spec,1.21,1.22 Message-ID: <20090303220826.4330070116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/libsndfile/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14203 Modified Files: libsndfile.spec Log Message: Rebuilt against libtool 2.2 Index: libsndfile.spec =================================================================== RCS file: /cvs/pkgs/rpms/libsndfile/devel/libsndfile.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- libsndfile.spec 25 Feb 2009 18:14:56 -0000 1.21 +++ libsndfile.spec 3 Mar 2009 22:07:55 -0000 1.22 @@ -1,7 +1,7 @@ Summary: Library for reading and writing sound files Name: libsndfile Version: 1.0.17 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.mega-nerd.com/libsndfile/ @@ -41,6 +41,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +libtoolize autoreconf %build @@ -119,6 +120,9 @@ %changelog +* Tue Mar 03 2009 Robert Scheck - 1.0.17-8 +- Rebuilt against libtool 2.2 + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.17-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ksebasti at fedoraproject.org Tue Mar 3 22:10:29 2009 From: ksebasti at fedoraproject.org (Kent Sebastian) Date: Tue, 3 Mar 2009 22:10:29 +0000 (UTC) Subject: rpms/eclipse-oprofile/devel eclipse-oprofile.spec,1.2,1.3 Message-ID: <20090303221029.3232570116@cvs1.fedora.phx.redhat.com> Author: ksebasti Update of /cvs/pkgs/rpms/eclipse-oprofile/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14622 Modified Files: eclipse-oprofile.spec Log Message: glibc-headers buildrequire Index: eclipse-oprofile.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-oprofile/devel/eclipse-oprofile.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- eclipse-oprofile.spec 3 Mar 2009 21:58:13 -0000 1.2 +++ eclipse-oprofile.spec 3 Mar 2009 22:09:58 -0000 1.3 @@ -33,7 +33,7 @@ BuildRequires: oprofile >= 0.9.3 BuildRequires: oprofile-devel >= 0.9.3 BuildRequires: binutils-devel >= 2.18.50.0.6 -BuildRequires: glibc-devel +BuildRequires: glibc-headers Requires: eclipse-platform >= 3.4.0 Requires: eclipse-cdt >= 5.0.1 Requires: eclipse-linuxprofilingframework >= 0.1.0 From spot at fedoraproject.org Tue Mar 3 22:10:42 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Mar 2009 22:10:42 +0000 (UTC) Subject: rpms/nant/devel nant.spec,1.31,1.32 Message-ID: <20090303221042.6739870116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nant/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14699 Modified Files: nant.spec Log Message: unbootstrap Index: nant.spec =================================================================== RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- nant.spec 3 Mar 2009 20:48:48 -0000 1.31 +++ nant.spec 3 Mar 2009 22:10:11 -0000 1.32 @@ -1,12 +1,12 @@ %global debug_package %{nil} %global monodir %{_libdir} %global mlib %{_lib} -%global bootstrap 1 +%global bootstrap 0 Summary: NAnt is a build tool for Mono and .NET Name: nant Version: 0.85 -Release: 26%{?dist}.2 +Release: 27%{?dist} Epoch: 1 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz Patch0: nant-build.patch @@ -132,6 +132,9 @@ %doc examples/* doc/help/* %changelog +* Tue Mar 3 2009 Tom "spot" Callaway - 1:0.85-27 +- unbootstrap + * Mon Mar 2 2009 Tom "spot" Callaway - 1:0.85-26.2 - fix BR to be wrapped by bootstrap From slankes at fedoraproject.org Tue Mar 3 22:20:55 2009 From: slankes at fedoraproject.org (Sven Lankes) Date: Tue, 3 Mar 2009 22:20:55 +0000 (UTC) Subject: rpms/psi/devel psi-0.12-qt-4_5-compatibility.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 psi.spec, 1.26, 1.27 sources, 1.12, 1.13 Message-ID: <20090303222055.D4D7C70116@cvs1.fedora.phx.redhat.com> Author: slankes Update of /cvs/pkgs/rpms/psi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16487 Modified Files: .cvsignore psi.spec sources Added Files: psi-0.12-qt-4_5-compatibility.patch Log Message: - update to 0.12.1 - add qt-4.5 patch psi-0.12-qt-4_5-compatibility.patch: --- NEW FILE psi-0.12-qt-4_5-compatibility.patch --- --- src/main.cpp.old 2009-02-14 21:52:12.000000000 +0500 +++ src/main.cpp 2009-02-14 21:54:42.000000000 +0500 @@ -274,9 +274,9 @@ int main(int argc, char *argv[]) { + PsiApplication app(argc, argv); // it must be initialized first in order for ApplicationInfo::resourcesDir() to work QCA::Initializer init; - PsiApplication app(argc, argv); QApplication::addLibraryPath(ApplicationInfo::resourcesDir()); QApplication::addLibraryPath(ApplicationInfo::homeDir()); QApplication::setQuitOnLastWindowClosed(false); Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/psi/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 13 Aug 2008 20:46:11 -0000 1.10 +++ .cvsignore 3 Mar 2009 22:20:25 -0000 1.11 @@ -1,4 +1 @@ -psi-0.12.tar.bz2 -emoticons-0.10.tar.gz -psi-lang-packs-0.12.tar.gz -rostericons-0.10.tar.gz +psi-0.12.1.tar.bz2 Index: psi.spec =================================================================== RCS file: /cvs/pkgs/rpms/psi/devel/psi.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- psi.spec 1 Mar 2009 20:14:13 -0000 1.26 +++ psi.spec 3 Mar 2009 22:20:25 -0000 1.27 @@ -1,12 +1,13 @@ Name: psi -Version: 0.12 -Release: 3%{?dist} +Version: 0.12.1 +Release: 1%{?dist} Summary: Jabber client based on Qt License: GPLv2+ Group: Applications/Internet URL: http://psi-im.org Source0: http://dl.sf.net/psi/psi-%{version}.tar.bz2 Patch0: psi-0.12-qca.patch +Patch1: psi-0.12-qt-4_5-compatibility.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -68,7 +69,7 @@ %prep %setup -q %patch0 -p0 -b .qca - +%patch1 -p0 -b .qt45 %build unset QTDIR @@ -141,6 +142,10 @@ %changelog +* Tue Mar 03 2009 Sven Lankes 0.12.1-1 +- Update to 0.12.1 (fix for CVE-2008-6393) +- add patch for qt 4.5 support + * Sun Mar 01 2009 Robert Scheck 0.12-3 - Added missing build requirement to glib2-devel Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/psi/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Aug 2008 20:46:11 -0000 1.12 +++ sources 3 Mar 2009 22:20:25 -0000 1.13 @@ -1,4 +1 @@ -47b654c944ef8766b860fe0645615d18 psi-0.12.tar.bz2 -1b4b3374c676c330c87e2ef0cd9109fa emoticons-0.10.tar.gz -054311487f6bad8e749b6034461bb293 psi-lang-packs-0.12.tar.gz -51386c12abbee7100f092455bfb88bf1 rostericons-0.10.tar.gz +da273e45daef04ffc8338708e96e9173 psi-0.12.1.tar.bz2 From simo at fedoraproject.org Tue Mar 3 22:22:40 2009 From: simo at fedoraproject.org (Simo Sorce) Date: Tue, 3 Mar 2009 22:22:40 +0000 (UTC) Subject: rpms/samba4/devel samba4.spec,1.2,1.3 Message-ID: <20090303222240.A77D170116@cvs1.fedora.phx.redhat.com> Author: simo Update of /cvs/pkgs/rpms/samba4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16941 Modified Files: samba4.spec Log Message: * Mon Mar 2 2009 Simo Sorce - 4.0.0-5alpha7 - Compile and have separate packages for additional samba libraries Package in their own packages: talloc, tdb, tevent, ldb Index: samba4.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba4/devel/samba4.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- samba4.spec 27 Feb 2009 22:16:54 -0000 1.2 +++ samba4.spec 3 Mar 2009 22:22:10 -0000 1.3 @@ -1,9 +1,22 @@ -%define alpha_version 7 -%define samba_version 4.0.0alpha%{alpha_version} -%define tarball_name samba-4.0.0alpha%{alpha_version} +%define main_release 5 +%define samba4_version 4.0.0 -%define tdb_version 1.1.1 %define talloc_version 1.2.0 +%define tdb_version 1.1.3 +%define tevent_version 0.9.3 +%define ldb_version 0.9.3 + +%define pre_release alpha7 + +%define tarball_name samba-4.0.0%{pre_release} + +%define samba4_release %{main_release}%{pre_release}%{?dist} +# We need a higher talloc release to address previous releases done as +# part of the samba3 package. +%define talloc_release 29.%{main_release}%{?dist} +%define tdb_release %{main_release}%{?dist} +%define tevent_release %{main_release}%{?dist} +%define ldb_release %{main_release}%{?dist} # Most of these subpackages are disabled because they are not # needed by OpenChange, and to avoid file conflicts with Samba3. @@ -24,8 +37,8 @@ # and subject to change. Name: samba4 -Version: 4.0.0 -Release: 4.alpha%{alpha_version}%{?dist} +Version: %{samba4_version} +Release: %{samba4_release} Group: System Environment/Daemons Summary: The Samba4 CIFS and AD client and server suite License: GPLv3+ and LGPLv3+ @@ -59,8 +72,6 @@ BuildRequires: libacl-devel BuildRequires: libaio-devel BuildRequires: libattr-devel -BuildRequires: libtalloc-devel >= %{talloc_version} -BuildRequires: libtdb-devel >= %{tdb_version} BuildRequires: ncurses-devel BuildRequires: pam-devel BuildRequires: perl(ExtUtils::MakeMaker) @@ -151,6 +162,112 @@ domains and to use Windows user and group accounts on Linux. %endif +%package -n libtalloc +Group: Development/Libraries +Summary: A hierarchical allocator +Version: %{talloc_version} +Release: %{talloc_release} + +%description -n libtalloc +A library that implements a hierarchical allocator with destructors. + +%package -n libtdb +Group: Development/Libraries +Summary: A bdb like database engine +Version: %{tdb_version} +Release: %{tdb_release} + +%description -n libtdb +A library that implements a single key database with transactions support. + +%package -n tdb-tools +Group: Development/Libraries +Summary: Tools to manage TDB files +Version: %{tdb_version} +Release: %{tdb_release} +Requires: libtdb >= %{tdb_version} + +%description -n tdb-tools +Tools to manage TDB files + +%package -n libtevent +Group: Development/Libraries +Summary: An event system library +Version: %{tevent_version} +Release: %{tevent_release} +Requires: libtalloc >= %{talloc_version} + +%description -n libtevent +A library that implements an event driven system, that uses epoll/select to +fire events when file status changes, supports also timer events. + +%package -n libldb +Group: Development/Libraries +Summary: A schema-less, ldap like, API and database +Version: %{ldb_version} +Release: %{ldb_release} +Requires: libtalloc >= %{talloc_version} +Requires: libtdb >= %{tdb_version} +Requires: libtevent >= %{tevent_version} + +%description -n libldb +An extensible library that implements and LDAP like API to access remote LDAP +servers, or use local tdb databases. + +%package -n ldb-tools +Group: Development/Libraries +Summary: Tools to manage LDB files +Version: %{ldb_version} +Release: %{ldb_release} +Requires: libldb >= %{ldb_version} + +%description -n ldb-tools +Tools to manage LDB files + +%package -n libtalloc-devel +Group: Development/Libraries +Summary: Developer tools for the Talloc library +Version: %{talloc_version} +Release: %{talloc_release} +Requires: libtalloc = %{talloc_release} + +%description -n libtalloc-devel +Header files needed to develop programs that link against the Talloc library. + +%package -n libtdb-devel +Group: Development/Libraries +Summary: Developer tools for the TDB library +Version: %{tdb_version} +Release: %{tdb_release} +Requires: libtdb = %{tdb_version}-%{tdb_release} + +%description -n libtdb-devel +Header files needed to develop programs that link against the TDB library. + +%package -n libtevent-devel +Group: Development/Libraries +Summary: Developer tools for the tevent library +Version: %{tevent_version} +Release: %{tevent_release} +Requires: libtevent = %{tevent_version}-%{tevent_release} +Requires: libtalloc-devel >= %{talloc_version} + +%description -n libtevent-devel +Header files needed to develop programs that link against the tevent library. + +%package -n libldb-devel +Group: Development/Libraries +Summary: Developer tools for the LDB library +Version: %{ldb_version} +Release: %{ldb_release} +Requires: libldb = %{ldb_version}-%{ldb_release} +Requires: libtdb-devel = %{tdb_version}-%{tdb_release} +Requires: libtalloc-devel >= %{talloc_version} +Requires: libtevent-devel = %{tevent_version}-%{tevent_release} + +%description -n libldb-devel +Header files needed to develop programs that link against the LDB library. + %prep %setup -q -n %{tarball_name} @@ -163,8 +280,46 @@ #cd source4 #script/mkversion.sh #cd .. +cp -a source4/lib/ldb lib/ldb %build +%define shared_build_dir %{_sourcedir}/sbtmp +SAVE_LDLPATH=$LD_LIBRARY_PATH +SAVE_CFLAGS=$CFLAGS +export LD_LIBRARY_PATH=%{shared_build_dir}/%{_lib} +export CFLAGS="$CFLAGS -I%{shared_build_dir}/include" + +# talloc +pushd lib/talloc +./autogen.sh +%configure --with-shared-build-dir=%{shared_build_dir} +make shared-build %{?_smp_mflags} +popd + +# tdb +pushd lib/tdb +./autogen.sh +%configure --with-shared-build-dir=%{shared_build_dir} +make shared-build %{?_smp_mflags} +popd + +# tevent +pushd lib/tevent +./autogen.sh +%configure --with-shared-build-dir=%{shared_build_dir} +make shared-build %{?_smp_mflags} +popd + +# ldb +pushd lib/ldb +./autogen.sh +%configure --with-shared-build-dir=%{shared_build_dir} +make shared-build # %{?_smp_mflags} XXX Causes build failure on F10 +popd + +export LD_LIBRARY_PATH=$SAVE_LDLPATH +export CFLAGS=$SAVE_CFLAGS + cd source4 %configure \ @@ -183,9 +338,9 @@ (cd ../pidl && %{__perl} Makefile.PL INSTALLDIRS=vendor ) # Builds using PIDL the IDL and many other things. -make proto - -make everything +#make proto +#make everything +make %install rm -rf $RPM_BUILD_ROOT @@ -263,7 +418,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/setnttoken rm $RPM_BUILD_ROOT%{_bindir}/smbtorture rm $RPM_BUILD_ROOT%{_bindir}/subunitrun -rm $RPM_BUILD_ROOT%{_bindir}/tdbtorture +#rm $RPM_BUILD_ROOT%{_bindir}/tdbtorture # Avoids a file conflict with perl-Parse-Yapp. rm -rf $RPM_BUILD_ROOT%{perl_vendorlib}/Parse/Yapp @@ -273,9 +428,6 @@ rm $RPM_BUILD_ROOT%{_sbindir}/samba rm $RPM_BUILD_ROOT%{_bindir}/mymachinepw rm $RPM_BUILD_ROOT%{_bindir}/smbstatus -rm $RPM_BUILD_ROOT%{_bindir}/tdbbackup -rm $RPM_BUILD_ROOT%{_bindir}/tdbdump -rm $RPM_BUILD_ROOT%{_bindir}/tdbtool rm -r $RPM_BUILD_ROOT%{_datadir}/samba/setup %endif %if ! %enable_client @@ -285,13 +437,13 @@ %endif %if ! %enable_common rm $RPM_BUILD_ROOT%{_bindir}/ad2oLschema +rm $RPM_BUILD_ROOT%{_bindir}/net rm $RPM_BUILD_ROOT%{_bindir}/ldbadd rm $RPM_BUILD_ROOT%{_bindir}/ldbdel rm $RPM_BUILD_ROOT%{_bindir}/ldbedit rm $RPM_BUILD_ROOT%{_bindir}/ldbmodify rm $RPM_BUILD_ROOT%{_bindir}/ldbrename rm $RPM_BUILD_ROOT%{_bindir}/ldbsearch -rm $RPM_BUILD_ROOT%{_bindir}/net rm $RPM_BUILD_ROOT%{_bindir}/oLschema2ldif rm $RPM_BUILD_ROOT%{_bindir}/regdiff rm $RPM_BUILD_ROOT%{_bindir}/regpatch @@ -306,12 +458,45 @@ rm $RPM_BUILD_ROOT%{_libdir}/libgensec.so.* rm $RPM_BUILD_ROOT%{_libdir}/libregistry.so rm $RPM_BUILD_ROOT%{_libdir}/libregistry.so.* +rm $RPM_BUILD_ROOT%{_libdir}/libtorture.so +rm $RPM_BUILD_ROOT%{_libdir}/libtorture.so.* +rm $RPM_BUILD_ROOT%{_libdir}/libldb.so.* rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/dcerpc_atsvc.pc rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gensec.pc rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/registry.pc +rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/torture.pc rm $RPM_BUILD_ROOT%{_includedir}/samba-4.0/gensec.h rm $RPM_BUILD_ROOT%{_includedir}/samba-4.0/registry.h %endif + +# talloc +pushd lib/talloc +make install DESTDIR=$RPM_BUILD_ROOT +ln -s libtalloc.so.%{talloc_version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so +find $RPM_BUILD_ROOT/usr/share/swig -name talloc.i -delete +popd + +# tdb +pushd lib/tdb +make install DESTDIR=$RPM_BUILD_ROOT +ln -s libtdb.so.%{tdb_version} $RPM_BUILD_ROOT%{_libdir}/libtdb.so +popd + +# tevent +pushd lib/tevent +make install DESTDIR=$RPM_BUILD_ROOT +ln -s libtevent.so.%{tevent_version} $RPM_BUILD_ROOT%{_libdir}/libtevent.so +popd + +# ldb +pushd lib/ldb +make install DESTDIR=$RPM_BUILD_ROOT +ln -s -f libldb.so.%{ldb_version} $RPM_BUILD_ROOT%{_libdir}/libldb.so +mkdir $RPM_BUILD_ROOT%{_libdir}/ldb +popd + +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a + %if ! %enable_python rm -r $RPM_BUILD_ROOT%{python_sitearch}/* rm -r $RPM_BUILD_ROOT%{python_libdir}/lib @@ -328,10 +513,13 @@ find source4/heimdal -type f | xargs chmod -x %clean +rm -fr %{shared_build_dir} rm -rf $RPM_BUILD_ROOT %pre +%if %enable_winbind getent group wbpriv >/dev/null || groupadd -g 88 wbpriv +%endif exit 0 %post @@ -356,6 +544,30 @@ %postun libs -p /sbin/ldconfig +%post -n libtalloc +/sbin/ldconfig + +%postun -n libtalloc +/sbin/ldconfig + +%post -n libtdb +/sbin/ldconfig + +%postun -n libtdb +/sbin/ldconfig + +%post -n libtevent +/sbin/ldconfig + +%postun -n libtevent +/sbin/ldconfig + +%post -n libldb +/sbin/ldconfig + +%postun -n libldb +/sbin/ldconfig + %files %defattr(-,root,root,-) @@ -383,10 +595,9 @@ %{_datadir}/samba/*.dat %{_libdir}/libdcerpc.so.* %{_libdir}/libdcerpc_samr.so.* -%{_libdir}/libldb.so.* %{_libdir}/libndr.so.* %{_libdir}/libsamba-hostconfig.so.* -%{_libdir}/libtorture.so.* +#%{_libdir}/libtorture.so.* #Only needed if Samba's build produces plugins #%{_libdir}/samba %dir %{_sysconfdir}/%{name} @@ -423,16 +634,15 @@ %{_includedir}/samba-4.0 %{_libdir}/libdcerpc.so %{_libdir}/libdcerpc_samr.so -%{_libdir}/libldb.so %{_libdir}/libndr.so %{_libdir}/libsamba-hostconfig.so -%{_libdir}/libtorture.so +#%{_libdir}/libtorture.so %{_libdir}/pkgconfig/dcerpc.pc %{_libdir}/pkgconfig/dcerpc_samr.pc %{_libdir}/pkgconfig/ldb.pc %{_libdir}/pkgconfig/ndr.pc %{_libdir}/pkgconfig/samba-hostconfig.pc -%{_libdir}/pkgconfig/torture.pc +#%{_libdir}/pkgconfig/torture.pc %if %all_libraries %{_libdir}/libdcerpc_atsvc.so %{_libdir}/libgensec.so @@ -463,12 +673,6 @@ %defattr(-,root,root,-) %{_bindir}/net %{_bindir}/testparm -%{_bindir}/ldbadd -%{_bindir}/ldbdel -%{_bindir}/ldbedit -%{_bindir}/ldbmodify -%{_bindir}/ldbsearch -%{_bindir}/ldbrename %{_bindir}/ad2oLschema %{_bindir}/oLschema2ldif %{_bindir}/regdiff @@ -482,7 +686,86 @@ #%config(noreplace) %{_sysconfdir}/%{name}/smb.conf %endif +%files -n libtalloc +%defattr(-,root,root,-) +%{_libdir}/libtalloc.so.* + +%files -n libtdb +%defattr(-,root,root,-) +%{_libdir}/libtdb.so.* + +%files -n libtevent +%defattr(-,root,root,-) +%{_libdir}/libtevent.so.* + +%files -n libldb +%defattr(-,root,root,-) +%{_libdir}/libldb.so.* +%dir %{_libdir}/ldb +#%{_libdir}/ldb/* + +%files -n tdb-tools +%defattr(-,root,root,-) +%{_bindir}/tdbbackup +%{_bindir}/tdbdump +%{_bindir}/tdbtool +#FIXME: currently not installed in standalone build +#%{_mandir}/man8/tdbbackup.8* +#%{_mandir}/man8/tdbdump.8* +#%{_mandir}/man8/tdbtool.8* + +%files -n ldb-tools +%defattr(-,root,root,-) +%{_bindir}/ldbadd +%{_bindir}/ldbdel +%{_bindir}/ldbedit +%{_bindir}/ldbmodify +%{_bindir}/ldbrename +%{_bindir}/ldbsearch +%{_bindir}/ldbtest +%{_mandir}/man1/ldbadd.1.* +%{_mandir}/man1/ldbdel.1.* +%{_mandir}/man1/ldbedit.1.* +%{_mandir}/man1/ldbmodify.1.* +%{_mandir}/man1/ldbrename.1.* +%{_mandir}/man1/ldbsearch.1.* +%{_mandir}/man1/ad2oLschema.1.gz +%{_mandir}/man1/oLschema2ldif.1.gz + +%files -n libtalloc-devel +%defattr(-,root,root,-) +%{_includedir}/talloc.h +%{_libdir}/libtalloc.so +%{_libdir}/pkgconfig/talloc.pc +%{_mandir}/man3/talloc.3.gz + +%files -n libtdb-devel +%defattr(-,root,root,-) +%{_includedir}/tdb.h +%{_libdir}/libtdb.so +%{_libdir}/pkgconfig/tdb.pc + +%files -n libtevent-devel +%defattr(-,root,root,-) +%{_includedir}/tevent.h +%{_libdir}/libtevent.so +%{_libdir}/pkgconfig/tevent.pc + +%files -n libldb-devel +%defattr(-,root,root,-) +%{_includedir}/ldb_module.h +%{_includedir}/ldb_handlers.h +%{_includedir}/ldb_errors.h +%{_includedir}/ldb.h +%{_libdir}/libldb.so +%{_libdir}/pkgconfig/ldb.pc +%{_mandir}/man3/ldb.3.gz + %changelog +* Mon Mar 2 2009 Simo Sorce - 4.0.0-5alpha7 +- Compile and have separate packages for additional samba libraries + Package in their own packages: talloc, tdb, tevent, ldb + * Fri Feb 27 2009 Matthew Barnes - 4.0.0-4.alpha7 - Update to 4.0.0alpha7 From slankes at fedoraproject.org Tue Mar 3 22:29:43 2009 From: slankes at fedoraproject.org (Sven Lankes) Date: Tue, 3 Mar 2009 22:29:43 +0000 (UTC) Subject: rpms/psi/devel .cvsignore,1.11,1.12 sources,1.13,1.14 Message-ID: <20090303222943.9B16970116@cvs1.fedora.phx.redhat.com> Author: slankes Update of /cvs/pkgs/rpms/psi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18249 Modified Files: .cvsignore sources Log Message: re-add wrongly removed files Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/psi/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 3 Mar 2009 22:20:25 -0000 1.11 +++ .cvsignore 3 Mar 2009 22:29:13 -0000 1.12 @@ -1 +1,4 @@ psi-0.12.1.tar.bz2 +emoticons-0.10.tar.gz +psi-lang-packs-0.12.tar.gz +rostericons-0.10.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/psi/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 3 Mar 2009 22:20:25 -0000 1.13 +++ sources 3 Mar 2009 22:29:13 -0000 1.14 @@ -1 +1,4 @@ da273e45daef04ffc8338708e96e9173 psi-0.12.1.tar.bz2 +1b4b3374c676c330c87e2ef0cd9109fa emoticons-0.10.tar.gz +054311487f6bad8e749b6034461bb293 psi-lang-packs-0.12.tar.gz +51386c12abbee7100f092455bfb88bf1 rostericons-0.10.tar.gz From pbrobinson at fedoraproject.org Tue Mar 3 22:34:31 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Tue, 3 Mar 2009 22:34:31 +0000 (UTC) Subject: rpms/ekiga/devel .cvsignore, 1.18, 1.19 ekiga.spec, 1.73, 1.74 sources, 1.20, 1.21 ekiga-fix-desktop-in.patch, 1.1, NONE Message-ID: <20090303223431.B993970116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/ekiga/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19051 Modified Files: .cvsignore ekiga.spec sources Removed Files: ekiga-fix-desktop-in.patch Log Message: - Upgrade to the 3.1.2 beta release, enable celt codec, reinstate proper desktop file now its fixed Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ekiga/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 15 Jan 2009 08:53:05 -0000 1.18 +++ .cvsignore 3 Mar 2009 22:34:00 -0000 1.19 @@ -1 +1 @@ -ekiga-3.1.0.tar.bz2 +ekiga-3.1.2.tar.bz2 Index: ekiga.spec =================================================================== RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- ekiga.spec 24 Feb 2009 14:21:28 -0000 1.73 +++ ekiga.spec 3 Mar 2009 22:34:01 -0000 1.74 @@ -1,10 +1,9 @@ Summary: A Gnome based SIP/H323 teleconferencing application Name: ekiga -Version: 3.1.0 -Release: 11%{?dist} +Version: 3.1.2 +Release: 1%{?dist} URL: http://www.ekiga.org/ Source0: ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2 -Patch0: ekiga-fix-desktop-in.patch License: GPLv2+ Group: Applications/Communications BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -12,17 +11,17 @@ Requires: evolution-data-server Requires: dbus Requires: GConf2 -BuildRequires: gtk2-devel >= 2.12 -BuildRequires: GConf2-devel >= 2.2.0 +BuildRequires: gtk2-devel +BuildRequires: GConf2-devel BuildRequires: libnotify-devel -BuildRequires: avahi-devel >= 0.6.9 -BuildRequires: avahi-glib-devel >= 0.6.9 -BuildRequires: dbus-glib-devel >= 0.70 +BuildRequires: avahi-devel +BuildRequires: avahi-glib-devel +BuildRequires: dbus-glib-devel BuildRequires: openldap-devel BuildRequires: openssl-devel -BuildRequires: ptlib-devel >= 2.4.1 -BuildRequires: opal-devel >= 3.4.1 -BuildRequires: libxml2-devel >= 2.5.0 +BuildRequires: ptlib-devel >= 2.6.0 +BuildRequires: opal-devel >= 3.6.0 +BuildRequires: libxml2-devel BuildRequires: libXv-devel BuildRequires: intltool >= 0.22 BuildRequires: pkgconfig @@ -31,17 +30,11 @@ BuildRequires: gettext BuildRequires: evolution-data-server-devel BuildRequires: gnome-doc-utils >= 0.3.2 +BuildRequires: desktop-file-utils BuildRequires: libsigc++20-devel BuildRequires: speex-devel BuildRequires: expat-devel BuildRequires: SDL-devel -#BuildRequires: gstreamer-devel -#BuildRequires: gstreamer-plugins-base-devel -#Temp until the next beta -BuildRequires: autoconf -BuildRequires: libtool -BuildRequires: automake - Requires(pre): GConf2 Requires(post): GConf2 @@ -55,7 +48,6 @@ %prep %setup -q -%patch0 -p1 -b .fix-desktop-in %build autoreconf @@ -89,6 +81,12 @@ done done +desktop-file-install --vendor gnome \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --delete-original \ + --copy-generic-name-to-name \ + $RPM_BUILD_ROOT%{_datadir}/applications/ekiga.desktop + %find_lang ekiga --with-gnome %clean @@ -143,6 +141,10 @@ %{_sysconfdir}/gconf/schemas/ekiga.schemas %changelog +* Mon Mar 3 2009 Peter Robinson - 3.1.2-1 +- Upgrade to the 3.1.2 beta release, enable celt codec, reinstate + proper desktop file now its fixed + * Tue Feb 24 2009 Fedora Release Engineering - 3.1.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ekiga/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 15 Jan 2009 08:53:05 -0000 1.20 +++ sources 3 Mar 2009 22:34:01 -0000 1.21 @@ -1 +1 @@ -ec8690ff84b364d2df5b2443a01ba529 ekiga-3.1.0.tar.bz2 +f92d6dc6db80682bf82a80952e25348c ekiga-3.1.2.tar.bz2 --- ekiga-fix-desktop-in.patch DELETED --- From twaugh at fedoraproject.org Tue Mar 3 22:35:00 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Tue, 3 Mar 2009 22:35:00 +0000 (UTC) Subject: rpms/system-config-printer/devel system-config-printer-1.1.5.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.197, 1.198 sources, 1.203, 1.204 system-config-printer.spec, 1.252, 1.253 system-config-printer-1.1.4.tar.bz2.sig, 1.1, NONE system-config-printer-git-1.1.x.patch, 1.6, NONE Message-ID: <20090303223500.4ACA870116@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19115 Modified Files: .cvsignore sources system-config-printer.spec Added Files: system-config-printer-1.1.5.tar.bz2.sig Removed Files: system-config-printer-1.1.4.tar.bz2.sig system-config-printer-git-1.1.x.patch Log Message: * Tue Mar 3 2009 Tim Waugh 1.1.5-1 - 1.1.5. --- NEW FILE system-config-printer-1.1.5.tar.bz2.sig --- ?? Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- .cvsignore 18 Feb 2009 18:17:18 -0000 1.197 +++ .cvsignore 3 Mar 2009 22:34:28 -0000 1.198 @@ -196,3 +196,4 @@ system-config-printer-1.1.2.tar.bz2 system-config-printer-1.1.3.tar.bz2 system-config-printer-1.1.4.tar.bz2 +system-config-printer-1.1.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v retrieving revision 1.203 retrieving revision 1.204 diff -u -r1.203 -r1.204 --- sources 18 Feb 2009 18:17:18 -0000 1.203 +++ sources 3 Mar 2009 22:34:28 -0000 1.204 @@ -1,3 +1,3 @@ ac8f98a40b0fc4b6ab4470f10489887a pysmbc-1.0.6.tar.bz2 ff634a6751f8a859ed26751bf03abef0 pycups-1.9.45.tar.bz2 -dcd3674786f7b70157294ef62d3a3520 system-config-printer-1.1.4.tar.bz2 +02673e5db137fde1017d98dc7a4a66a5 system-config-printer-1.1.5.tar.bz2 Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- system-config-printer.spec 26 Feb 2009 05:14:44 -0000 1.252 +++ system-config-printer.spec 3 Mar 2009 22:34:29 -0000 1.253 @@ -6,15 +6,14 @@ Summary: A printer administration tool Name: system-config-printer -Version: 1.1.4 -Release: 3%{?dist} +Version: 1.1.5 +Release: 1%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.bz2 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2 -Patch1: system-config-printer-git-1.1.x.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -64,7 +63,6 @@ %prep %setup -q -a 1 -a 2 -%patch1 -p1 -b .git-1.1.x %build %configure @@ -129,6 +127,7 @@ %{_datadir}/%{name}/GroupsPane.py* %{_datadir}/%{name}/GroupsPaneModel.py* %{_datadir}/%{name}/gtkinklevel.py* +%{_datadir}/%{name}/gtkspinner.py* %{_datadir}/%{name}/HIG.py* %{_datadir}/%{name}/installpackage.py* %{_datadir}/%{name}/jobviewer.py* @@ -166,6 +165,9 @@ exit 0 %changelog +* Tue Mar 3 2009 Tim Waugh 1.1.5-1 +- 1.1.5. + * Wed Feb 25 2009 Fedora Release Engineering - 1.1.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- system-config-printer-1.1.4.tar.bz2.sig DELETED --- --- system-config-printer-git-1.1.x.patch DELETED --- From maxx at fedoraproject.org Tue Mar 3 22:42:02 2009 From: maxx at fedoraproject.org (Mads Villadsen) Date: Tue, 3 Mar 2009 22:42:02 +0000 (UTC) Subject: rpms/pdfcube/devel pdfcube.spec,1.9,1.10 Message-ID: <20090303224202.A164670116@cvs1.fedora.phx.redhat.com> Author: maxx Update of /cvs/extras/rpms/pdfcube/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20145 Modified Files: pdfcube.spec Log Message: * Tue Mar 3 2009 Mads Villadsen - 0.0.3-3 - Exclude x86_64 and ppc64 since pdfcube currently fails to build on these architectures Index: pdfcube.spec =================================================================== RCS file: /cvs/extras/rpms/pdfcube/devel/pdfcube.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pdfcube.spec 26 Feb 2009 10:20:09 -0000 1.9 +++ pdfcube.spec 3 Mar 2009 22:41:31 -0000 1.10 @@ -1,8 +1,10 @@ Name: pdfcube Version: 0.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PDF presentation viewer with a spinning cube +ExcludeArch: x86_64 # See bug 488373 +ExcludeArch: ppc64 # See bug 488374 Group: Applications/Productivity License: GPLv2+ @@ -47,6 +49,9 @@ %changelog +* Tue Mar 3 2009 Mads Villadsen - 0.0.3-3 +- Exclude x86_64 and ppc64 since pdfcube currently fails to build on these architectures + * Thu Feb 26 2009 Fedora Release Engineering - 0.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From slankes at fedoraproject.org Tue Mar 3 22:43:19 2009 From: slankes at fedoraproject.org (Sven Lankes) Date: Tue, 3 Mar 2009 22:43:19 +0000 (UTC) Subject: rpms/psi/F-10 .cvsignore, 1.10, 1.11 psi.spec, 1.24, 1.25 sources, 1.12, 1.13 Message-ID: <20090303224319.20B1E70116@cvs1.fedora.phx.redhat.com> Author: slankes Update of /cvs/pkgs/rpms/psi/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20326 Modified Files: .cvsignore psi.spec sources Log Message: new upstream 0.12.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/psi/F-10/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 13 Aug 2008 20:46:11 -0000 1.10 +++ .cvsignore 3 Mar 2009 22:42:48 -0000 1.11 @@ -1,4 +1,4 @@ -psi-0.12.tar.bz2 emoticons-0.10.tar.gz psi-lang-packs-0.12.tar.gz rostericons-0.10.tar.gz +psi-0.12.1.tar.bz2 Index: psi.spec =================================================================== RCS file: /cvs/pkgs/rpms/psi/F-10/psi.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- psi.spec 23 Aug 2008 06:25:40 -0000 1.24 +++ psi.spec 3 Mar 2009 22:42:48 -0000 1.25 @@ -1,5 +1,5 @@ Name: psi -Version: 0.12 +Version: 0.12.1 Release: 1%{?dist} Summary: Jabber client based on Qt License: GPLv2+ @@ -141,6 +141,9 @@ %changelog +* Tue Mar 03 2009 Sven Lankes 0.12.1-1 +- version 0.12.1 + * Wed Aug 13 2008 Aurelien Bompard 0.12-1 - version 0.12 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/psi/F-10/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Aug 2008 20:46:11 -0000 1.12 +++ sources 3 Mar 2009 22:42:48 -0000 1.13 @@ -1,4 +1,4 @@ -47b654c944ef8766b860fe0645615d18 psi-0.12.tar.bz2 1b4b3374c676c330c87e2ef0cd9109fa emoticons-0.10.tar.gz 054311487f6bad8e749b6034461bb293 psi-lang-packs-0.12.tar.gz 51386c12abbee7100f092455bfb88bf1 rostericons-0.10.tar.gz +da273e45daef04ffc8338708e96e9173 psi-0.12.1.tar.bz2 From simo at fedoraproject.org Tue Mar 3 22:43:40 2009 From: simo at fedoraproject.org (Simo Sorce) Date: Tue, 3 Mar 2009 22:43:40 +0000 (UTC) Subject: rpms/samba4/devel samba4.spec,1.3,1.4 Message-ID: <20090303224340.306FF70116@cvs1.fedora.phx.redhat.com> Author: simo Update of /cvs/pkgs/rpms/samba4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20486 Modified Files: samba4.spec Log Message: * Mon Mar 2 2009 Simo Sorce - 4.0.0-6alpha7 - Compile and have separate packages for additional samba libraries Package in their own packages: talloc, tdb, tevent, ldb Index: samba4.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba4/devel/samba4.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- samba4.spec 3 Mar 2009 22:22:10 -0000 1.3 +++ samba4.spec 3 Mar 2009 22:43:09 -0000 1.4 @@ -1,4 +1,4 @@ -%define main_release 5 +%define main_release 6 %define samba4_version 4.0.0 %define talloc_version 1.2.0 @@ -80,6 +80,7 @@ BuildRequires: python-devel BuildRequires: readline-devel BuildRequires: sed +BuildRequires: autoconf %description @@ -762,7 +763,7 @@ %{_mandir}/man3/ldb.3.gz %changelog -* Mon Mar 2 2009 Simo Sorce - 4.0.0-5alpha7 +* Mon Mar 2 2009 Simo Sorce - 4.0.0-6alpha7 - Compile and have separate packages for additional samba libraries Package in their own packages: talloc, tdb, tevent, ldb From caolanm at fedoraproject.org Tue Mar 3 22:45:18 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 22:45:18 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1844,1.1845 Message-ID: <20090303224518.88B9770116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20815 Modified Files: openoffice.org.spec Log Message: not in tar format Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1844 retrieving revision 1.1845 diff -u -r1.1844 -r1.1845 --- openoffice.org.spec 3 Mar 2009 12:28:43 -0000 1.1844 +++ openoffice.org.spec 3 Mar 2009 22:44:48 -0000 1.1845 @@ -1705,10 +1705,10 @@ tar xzf %{SOURCE16} localize -m -x -l mai -f Maithili-mai-ooo3.0.sdf # i99699 -tar xzf %{SOURCE17} +cp %{SOURCE17} . localize -m -x -l as-IN -f as-IN_DEV300_m40.sdf # i99663 -tar xzf %{SOURCE18} +cp %{SOURCE18} . localize -m -x -l ta-IN -f ta-090227.sdf cd ../.. From rstrode at fedoraproject.org Tue Mar 3 22:47:22 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Tue, 3 Mar 2009 22:47:22 +0000 (UTC) Subject: rpms/gdm/devel gdm-2.25.2-multistack-but-boring.patch, NONE, 1.1 gdm-2.25.2-start-faster.patch, NONE, 1.1 gdm.spec, 1.442, 1.443 Message-ID: <20090303224722.3FA2270116@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gdm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21077 Modified Files: gdm.spec Added Files: gdm-2.25.2-multistack-but-boring.patch gdm-2.25.2-start-faster.patch Log Message: - Add limited 'one-stack-only' version of multistack patch (See https://fedoraproject.org/wiki/Features/MultiplePAMStacksInGDM) - Drop 10 second delay in start up because of broken autostart file gdm-2.25.2-multistack-but-boring.patch: --- NEW FILE gdm-2.25.2-multistack-but-boring.patch --- >From 0b295480d3f0955d7133c39c0c4b2ec3bd2f3084 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 16 Jan 2009 11:00:08 -0500 Subject: [PATCH 01/65] Drop session "Open" in favor of "StartConversation" We want to eventually support having multiple simultaneous PAM conversations in one login screen (so, e.g., username/password, smart card, and fingerprint all work at the same time). This commit refactors the session code to be in terms of a conversation object. With this change, it should be easier later to have multiple conversation objects. The conversation is named by the pam service the login screen is talking to. --- daemon/gdm-factory-slave.c | 13 +- daemon/gdm-product-slave.c | 47 ++++++--- daemon/gdm-session-direct.c | 250 ++++++++++++++++++++++++++---------------- daemon/gdm-session-private.h | 3 +- daemon/gdm-session-relay.c | 29 +++-- daemon/gdm-session.c | 20 ++-- daemon/gdm-session.h | 9 +- daemon/gdm-simple-slave.c | 3 - daemon/test-session.c | 13 +- 9 files changed, 240 insertions(+), 147 deletions(-) diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c index d09c913..6497293 100644 --- a/daemon/gdm-factory-slave.c +++ b/daemon/gdm-factory-slave.c @@ -180,10 +180,11 @@ on_session_secret_info_query (GdmSession *session, } static void -on_session_opened (GdmSession *session, - GdmFactorySlave *slave) +on_session_conversation_started (GdmSession *session, + GdmFactorySlave *slave, + const char *service_name) { - g_debug ("GdmFactorySlave: session opened"); + g_debug ("GdmFactorySlave: session conversation started"); gdm_greeter_server_ready (slave->priv->greeter_server); } @@ -367,7 +368,7 @@ on_session_relay_connected (GdmSessionRelay *session, { g_debug ("GdmFactorySlave: Relay Connected"); - gdm_session_open (GDM_SESSION (slave->priv->session)); + gdm_session_start_conversation (GDM_SESSION (slave->priv->session), "gdm"); } static void @@ -694,8 +695,8 @@ gdm_factory_slave_start (GdmSlave *slave) GDM_FACTORY_SLAVE (slave)->priv->session = gdm_session_relay_new (); g_signal_connect (GDM_FACTORY_SLAVE (slave)->priv->session, - "opened", - G_CALLBACK (on_session_opened), + "conversation-started", + G_CALLBACK (on_session_conversation_started), slave); g_signal_connect (GDM_FACTORY_SLAVE (slave)->priv->session, "setup-complete", diff --git a/daemon/gdm-product-slave.c b/daemon/gdm-product-slave.c index 9adcb09..15a2820 100644 --- a/daemon/gdm-product-slave.c +++ b/daemon/gdm-product-slave.c @@ -246,19 +246,21 @@ relay_session_started (GdmProductSlave *slave, } static void -relay_session_opened (GdmProductSlave *slave) +relay_session_conversation_started (GdmProductSlave *slave, + const char *service_name) { - send_dbus_void_method (slave->priv->session_relay_connection, - "Opened"); + send_dbus_string_method (slave->priv->session_relay_connection, + "ConversationStarted", service_name); } static void -on_session_opened (GdmSession *session, - GdmProductSlave *slave) +on_session_conversation_started (GdmSession *session, + const char *service_name, + GdmProductSlave *slave) { - g_debug ("GdmProductSlave: session opened"); + g_debug ("GdmProductSlave: session conversation started"); - relay_session_opened (slave); + relay_session_conversation_started (slave, service_name); } static void @@ -784,10 +786,27 @@ on_relay_user_selected (GdmProductSlave *slave, } static void -on_relay_open (GdmProductSlave *slave, - DBusMessage *message) +on_relay_start_conversation (GdmProductSlave *slave, + DBusMessage *message) { - gdm_session_open (GDM_SESSION (slave->priv->session)); + DBusError error; + char *service_name; + dbus_bool_t res; + + dbus_error_init (&error); + res = dbus_message_get_args (message, + &error, + DBUS_TYPE_STRING, &service_name, + DBUS_TYPE_INVALID); + if (res) { + g_debug ("GdmProductSlave: Started conversation with %s service", service_name); + gdm_session_start_conversation (GDM_SESSION (slave->priv->session), + service_name); + } else { + g_warning ("Unable to get arguments: %s", error.message); + } + + dbus_error_free (&error); } static void @@ -832,8 +851,8 @@ create_new_session (GdmProductSlave *slave) g_free (display_device); g_signal_connect (slave->priv->session, - "opened", - G_CALLBACK (on_session_opened), + "conversation-started", + G_CALLBACK (on_session_conversation_started), slave); g_signal_connect (slave->priv->session, "setup-complete", @@ -991,8 +1010,8 @@ relay_dbus_handle_message (DBusConnection *connection, on_relay_user_selected (slave, message); } else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "StartSession")) { on_relay_start_session (slave, message); - } else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "Open")) { - on_relay_open (slave, message); + } else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "StartConversation")) { + on_relay_start_conversation (slave, message); } else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "Cancelled")) { on_relay_cancelled (slave, message); } else { diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c index 34a126f..a76051b 100644 --- a/daemon/gdm-session-direct.c +++ b/daemon/gdm-session-direct.c @@ -61,6 +61,15 @@ #define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin" #endif +typedef struct +{ + GdmSessionDirect *session; + GdmSessionWorkerJob *job; + GPid worker_pid; + char *service_name; + DBusConnection *worker_connection; +} GdmSessionConversation; + struct _GdmSessionDirectPrivate { /* per open scope */ @@ -74,10 +83,9 @@ struct _GdmSessionDirectPrivate char *user_x11_authority_file; DBusMessage *message_pending_reply; - DBusConnection *worker_connection; - GdmSessionWorkerJob *job; - GPid session_pid; + GdmSessionConversation *conversation; + guint32 is_authenticated : 1; guint32 is_running : 1; @@ -147,6 +155,7 @@ send_dbus_string_signal (GdmSessionDirect *session, { DBusMessage *message; DBusMessageIter iter; + GdmSessionConversation *conversation; g_return_if_fail (session != NULL); @@ -157,7 +166,8 @@ send_dbus_string_signal (GdmSessionDirect *session, dbus_message_iter_init_append (message, &iter); dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &text); - if (! send_dbus_message (session->priv->worker_connection, message)) { [...18467 lines suppressed...] + $(top_builddir)/common/libgdmcommon.la \ $(NULL) libgdmsimplegreeter_la_LDFLAGS = \ diff --git a/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c index cef435c..ee763ef 100644 --- a/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c +++ b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c @@ -25,9 +25,9 @@ #include #include "gdm-conversation.h" +#include "gdm-marshal.h" #include "gdm-task.h" - enum { ANSWER, USER_CHOSEN, @@ -76,12 +76,12 @@ gdm_conversation_class_init (gpointer g_iface) signals [USER_CHOSEN] = g_signal_new ("user-chosen", iface_type, - G_SIGNAL_RUN_FIRST, + G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GdmConversationIface, user_chosen), NULL, NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, + gdm_marshal_BOOLEAN__STRING, + G_TYPE_BOOLEAN, 1, G_TYPE_STRING); signals [CANCEL] = g_signal_new ("cancel", @@ -171,9 +171,16 @@ gdm_conversation_cancel (GdmConversation *conversation) { g_signal_emit (conversation, signals [CANCEL], 0); } -void + +gboolean gdm_conversation_choose_user (GdmConversation *conversation, const char *username) { - g_signal_emit (conversation, signals [USER_CHOSEN], 0, username); + gboolean was_chosen; + + was_chosen = FALSE; + + g_signal_emit (conversation, signals [USER_CHOSEN], 0, username, &was_chosen); + + return was_chosen; } diff --git a/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h index fb4bf49..b37b21e 100644 --- a/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h +++ b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h @@ -61,7 +61,7 @@ struct _GdmConversationIface /* signals */ char * (* answer) (GdmConversation *conversation); void (* cancel) (GdmConversation *conversation); - void (* user_chosen) (GdmConversation *conversation); + gboolean (* user_chosen) (GdmConversation *conversation); }; GType gdm_conversation_get_type (void) G_GNUC_CONST; @@ -85,8 +85,8 @@ gboolean gdm_conversation_focus (GdmConversation *conversation); void gdm_conversation_answer (GdmConversation *conversation, const char *answer); void gdm_conversation_cancel (GdmConversation *conversation); -void gdm_conversation_choose_user (GdmConversation *conversation, - const char *username); +gboolean gdm_conversation_choose_user (GdmConversation *conversation, + const char *username); G_END_DECLS diff --git a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c index 8e87db6..5a2c380 100644 --- a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c +++ b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c @@ -53,6 +53,7 @@ struct _GdmSmartcardExtensionPrivate int number_of_tokens; guint answer_pending : 1; + guint select_when_ready : 1; }; static void gdm_smartcard_extension_finalize (GObject *object); @@ -102,8 +103,14 @@ on_smartcard_event (GIOChannel *io_channel, } if (extension->priv->number_of_tokens == 1) { - gdm_conversation_choose_user (GDM_CONVERSATION (extension), - PAMSERVICENAME); + if (!gdm_conversation_choose_user (GDM_CONVERSATION (extension), + PAMSERVICENAME)) { + g_debug ("could not choose smart card user, cancelling..."); + gdm_conversation_cancel (GDM_CONVERSATION (extension)); + extension->priv->select_when_ready = TRUE; + } else { + g_debug ("chose smart card user!"); + } } else if (extension->priv->number_of_tokens == 0) { gdm_conversation_cancel (GDM_CONVERSATION (extension)); } @@ -210,10 +217,16 @@ gdm_smartcard_extension_set_ready (GdmConversation *conversation) GdmSmartcardExtension *extension = GDM_SMARTCARD_EXTENSION (conversation); gdm_task_set_enabled (GDM_TASK (conversation), TRUE); - if (extension->priv->worker_pid <= 0) - { + if (extension->priv->worker_pid <= 0) { watch_for_smartcards (extension); - } + } + + if (extension->priv->select_when_ready) { + if (gdm_conversation_choose_user (GDM_CONVERSATION (extension), + PAMSERVICENAME)) { + extension->priv->select_when_ready = FALSE; + } + } } char * -- 1.6.1 >From cdb57fbb1366ca4fe7314850d223cd0a79240fd9 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 3 Mar 2009 13:33:09 -0500 Subject: [PATCH 64/65] Don't build fingerprint and smartcard plugins I'm staging a degenerate single stack case for rawhide. --- gui/simple-greeter/plugins/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gui/simple-greeter/plugins/Makefile.am b/gui/simple-greeter/plugins/Makefile.am index 3dd336f..c0390db 100644 --- a/gui/simple-greeter/plugins/Makefile.am +++ b/gui/simple-greeter/plugins/Makefile.am @@ -1 +1 @@ -SUBDIRS = password fingerprint smartcard +SUBDIRS = password -- 1.6.1 >From 48c2237ff7efe68e116363ce51e0a4cdc42a5c78 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 3 Mar 2009 17:15:10 -0500 Subject: [PATCH 65/65] Use "gdm" instead of "gdm-password" This is so we hook into system configured auth policy --- gui/simple-greeter/plugins/password/Makefile.am | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/gui/simple-greeter/plugins/password/Makefile.am b/gui/simple-greeter/plugins/password/Makefile.am index e832c4d..097b18e 100644 --- a/gui/simple-greeter/plugins/password/Makefile.am +++ b/gui/simple-greeter/plugins/password/Makefile.am @@ -3,8 +3,6 @@ NULL = extensiondir = $(extensionsdatadir)/password extension_DATA = page.ui -pamservicename = gdm-password - AM_CPPFLAGS = \ -I$(top_srcdir)/common \ -I$(top_srcdir)/gui/simple-greeter/libnotificationarea \ @@ -12,7 +10,7 @@ AM_CPPFLAGS = \ -DDMCONFDIR=\""$(dmconfdir)"\" \ -DGDMCONFDIR=\"$(gdmconfdir)\" \ -DPLUGINDATADIR=\""$(extensiondir)"\" \ - -DPAMSERVICENAME=\""$(pamservicename)"\" \ + -DPAMSERVICENAME=\""gdm"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ @@ -39,10 +37,7 @@ password_la_SOURCES = \ gdm-password-extension.c \ plugin.c -pamdir = $(PAM_PREFIX)/pam.d -pam_DATA = $(pamservicename) - -EXTRA_DIST = $(extension_DATA) $(pam_DATA) +EXTRA_DIST = $(extension_DATA) MAINTAINERCLEANFILES = \ *~ \ -- 1.6.1 gdm-2.25.2-start-faster.patch: --- NEW FILE gdm-2.25.2-start-faster.patch --- diff -up gdm-2.25.2/data/greeter-autostart/gnome-power-manager.desktop.in.in.start-faster gdm-2.25.2/data/greeter-autostart/gnome-power-manager.desktop.in --- gdm-2.25.2/data/greeter-autostart/gnome-power-manager.desktop.in.in.start-faster 2009-03-03 17:16:56.209495297 -0500 +++ gdm-2.25.2/data/greeter-autostart/gnome-power-manager.desktop.in.in 2009-03-03 17:17:07.493469010 -0500 @@ -8,7 +8,6 @@ Terminal=false Type=Application Categories= OnlyShowIn=GNOME;XFCE; -X-GNOME-Autostart-Phase=Initialization X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-power-manager X-GNOME-Bugzilla-Component=gnome-power-manager Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.442 retrieving revision 1.443 diff -u -r1.442 -r1.443 --- gdm.spec 27 Feb 2009 14:53:57 -0000 1.442 +++ gdm.spec 3 Mar 2009 22:46:51 -0000 1.443 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.25.2 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -88,6 +88,9 @@ # should probably be changed to get the system layout from the X server Patch13: gdm-system-keyboard.patch +Patch14: gdm-2.25.2-multistack-but-boring.patch +Patch15: gdm-2.25.2-start-faster.patch + # Fedora-specific Patch99: gdm-2.23.1-fedora-logo.patch @@ -113,6 +116,9 @@ %patch4 -p1 -b .append-logs %patch13 -p1 -b .system-keyboard +%patch14 -p1 -b .multistack-but-boring +%patch15 -p1 -b .start-faster + %patch99 -p1 -b .fedora-logo autoreconf -i -f @@ -172,6 +178,10 @@ find $RPM_BUILD_ROOT -name '*.a' -delete find $RPM_BUILD_ROOT -name '*.la' -delete +rm -f $RPM_BUILD_ROOT%{_includedir}/gdm/simple-greeter/gdm-greeter-extension.h +rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdmsimplegreeter.pc +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/gdm-password + %find_lang gdm --with-gnome %clean @@ -307,6 +317,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %{_datadir}/gdm/gdb-cmd %{_libexecdir}/gdm-crash-logger +%{_libdir}/libgdm*.so* +%{_libdir}/gdm/simple-greeter/plugins/password.so +%{_datadir}/gdm/simple-greeter/extensions/password/page.ui %dir %{_datadir}/gdm %dir %{_datadir}/gdm/autostart %dir %{_datadir}/gdm/autostart/LoginWindow @@ -320,6 +333,7 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm + %files user-switch-applet %defattr(-, root, root) %{_libexecdir}/gdm-user-switch-applet @@ -327,6 +341,12 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Tue Mar 3 2009 Ray Strode - 1:2.25.2-9 +- Add limited 'one-stack-only' version of multistack patch + (See https://fedoraproject.org/wiki/Features/MultiplePAMStacksInGDM) +- Drop 10 second delay in start up because of broken autostart + file + * Fri Feb 27 2009 Matthias Clasen - Require PolicyKit-authentication-agent From slankes at fedoraproject.org Tue Mar 3 22:48:12 2009 From: slankes at fedoraproject.org (Sven Lankes) Date: Tue, 3 Mar 2009 22:48:12 +0000 (UTC) Subject: rpms/psi/F-9 .cvsignore, 1.10, 1.11 psi.spec, 1.23, 1.24 sources, 1.12, 1.13 Message-ID: <20090303224812.B328470116@cvs1.fedora.phx.redhat.com> Author: slankes Update of /cvs/pkgs/rpms/psi/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21608 Modified Files: .cvsignore psi.spec sources Log Message: update to 0.12.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/psi/F-9/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 13 Aug 2008 20:46:11 -0000 1.10 +++ .cvsignore 3 Mar 2009 22:47:42 -0000 1.11 @@ -1,4 +1,4 @@ -psi-0.12.tar.bz2 emoticons-0.10.tar.gz psi-lang-packs-0.12.tar.gz rostericons-0.10.tar.gz +psi-0.12.1.tar.bz2 Index: psi.spec =================================================================== RCS file: /cvs/pkgs/rpms/psi/F-9/psi.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- psi.spec 23 Aug 2008 06:25:40 -0000 1.23 +++ psi.spec 3 Mar 2009 22:47:42 -0000 1.24 @@ -1,5 +1,5 @@ Name: psi -Version: 0.12 +Version: 0.12.1 Release: 1%{?dist} Summary: Jabber client based on Qt License: GPLv2+ @@ -141,6 +141,9 @@ %changelog +* Tue Mar 03 2009 Sven Lankes 0.12.1-1 +- version 0.12.1 + * Wed Aug 13 2008 Aurelien Bompard 0.12-1 - version 0.12 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/psi/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Aug 2008 20:46:11 -0000 1.12 +++ sources 3 Mar 2009 22:47:42 -0000 1.13 @@ -1,4 +1,4 @@ -47b654c944ef8766b860fe0645615d18 psi-0.12.tar.bz2 1b4b3374c676c330c87e2ef0cd9109fa emoticons-0.10.tar.gz 054311487f6bad8e749b6034461bb293 psi-lang-packs-0.12.tar.gz 51386c12abbee7100f092455bfb88bf1 rostericons-0.10.tar.gz +da273e45daef04ffc8338708e96e9173 psi-0.12.1.tar.bz2 From airlied at fedoraproject.org Tue Mar 3 22:48:35 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 3 Mar 2009 22:48:35 +0000 (UTC) Subject: rpms/kernel/devel kernel.spec,1.1372,1.1373 Message-ID: <20090303224835.6DF7B70116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21712 Modified Files: kernel.spec Log Message: * Wed Mar 04 2009 Dave Airlie - rebase drm properly kill -pm it breaks my laptop Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1372 retrieving revision 1.1373 diff -u -r1.1372 -r1.1373 --- kernel.spec 3 Mar 2009 22:04:06 -0000 1.1372 +++ kernel.spec 3 Mar 2009 22:48:04 -0000 1.1373 @@ -1179,8 +1179,9 @@ ApplyPatch agp-set_memory_ucwb.patch # Nouveau DRM + drm fixes ApplyPatch drm-next.patch -#ApplyPatch drm-modesetting-radeon.patch -#ApplyPatch drm-nouveau.patch +ApplyPatch drm-modesetting-radeon.patch +ApplyPatch drm-nouveau.patch +# pm broken on my thinkpad t60p - airlied #ApplyPatch drm-radeon-pm.patch #ApplyPatch drm-intel-next.patch ApplyPatch drm-no-gem-on-i8xx.patch @@ -1791,6 +1792,9 @@ # and build. %changelog +* Wed Mar 04 2009 Dave Airlie +- rebase drm properly kill -pm it breaks my laptop + * Wed Mar 04 2009 Dave Airlie 2.6.29-0.185.rc6.git7 - rebase drm patches on git7 From rrelyea at fedoraproject.org Tue Mar 3 22:50:22 2009 From: rrelyea at fedoraproject.org (Robert Relyea) Date: Tue, 3 Mar 2009 22:50:22 +0000 (UTC) Subject: rpms/ccid/devel .cvsignore, 1.5, 1.6 ccid.spec, 1.14, 1.15 import.log, 1.1, 1.2 sources, 1.5, 1.6 Message-ID: <20090303225022.5638B70116@cvs1.fedora.phx.redhat.com> Author: rrelyea Update of /cvs/extras/rpms/ccid/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22176 Modified Files: .cvsignore ccid.spec import.log sources Log Message: Fix URL in spec. Update to 1.3.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ccid/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Aug 2008 00:39:07 -0000 1.5 +++ .cvsignore 3 Mar 2009 22:49:51 -0000 1.6 @@ -1 +1 @@ -ccid-1.3.8.tar.bz2 +ccid-1.3.9.tar.bz2 Index: ccid.spec =================================================================== RCS file: /cvs/extras/rpms/ccid/devel/ccid.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ccid.spec 24 Feb 2009 06:40:47 -0000 1.14 +++ ccid.spec 3 Mar 2009 22:49:51 -0000 1.15 @@ -1,16 +1,17 @@ %define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null) %define libusb_ver 0.1.7 %define pcsc_lite_ver 1.3.3 +%define upstream_build 2656 Name: ccid -Version: 1.3.8 -Release: 2%{dist} +Version: 1.3.9 +Release: 1%{dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries License: LGPLv2+ URL: http://pcsclite.alioth.debian.org/ccid.html -Source0: http://alioth.debian.org/download.php/1563/%{name}-%{version}.tar.bz2 +Source0: http://alioth.debian.org/download.php/%{upstream-build}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel >= %{libusb_ver} @@ -77,6 +78,9 @@ %changelog +* Tue Feb 24 2009 Bob Relyea - 1.3.9-1 +- update to ccid 1.3.9 + * Mon Feb 23 2009 Fedora Release Engineering - 1.3.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ccid/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Aug 2008 00:39:07 -0000 1.1 +++ import.log 3 Mar 2009 22:49:51 -0000 1.2 @@ -1 +1,2 @@ ccid-1_3_8-1_rhel5_bob:HEAD:ccid-1.3.8-1.rhel5_bob.src.rpm:1219884136 +ccid-1_3_9-1_rhel5_bob:HEAD:ccid-1.3.9-1.rhel5_bob.src.rpm:1236042353 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ccid/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Aug 2008 00:39:07 -0000 1.5 +++ sources 3 Mar 2009 22:49:51 -0000 1.6 @@ -1 +1 @@ -ebb5fc927d73cd63737a9114481e8957 ccid-1.3.8.tar.bz2 +4459f8389d9b3e086e2e2ed09b0e2f58 ccid-1.3.9.tar.bz2 From robert at fedoraproject.org Tue Mar 3 22:50:45 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Tue, 3 Mar 2009 22:50:45 +0000 (UTC) Subject: rpms/xmms-cdread/devel xmms-cdread.spec,1.16,1.17 Message-ID: <20090303225045.CE7F970116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/xmms-cdread/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22389 Modified Files: xmms-cdread.spec Log Message: Solve the x86_64-redhat-linux-gnu configure target error Index: xmms-cdread.spec =================================================================== RCS file: /cvs/pkgs/rpms/xmms-cdread/devel/xmms-cdread.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xmms-cdread.spec 26 Feb 2009 10:16:20 -0000 1.16 +++ xmms-cdread.spec 3 Mar 2009 22:50:15 -0000 1.17 @@ -3,7 +3,7 @@ Summary: Digital audio CD input plugin for XMMS Name: xmms-cdread Version: 0.14 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.xmms.org/ @@ -11,7 +11,7 @@ Patch1: xmms-cdread-shuffle.patch Patch2: xmms-cdread-x86_64.patch Requires: xmms-libs -BuildRequires: gtk+-devel glib-devel xmms-devel +BuildRequires: gtk+-devel glib-devel xmms-devel automake libtool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description @@ -28,6 +28,7 @@ %patch2 -p1 %build +autoreconf -i -f %configure --libdir=%{xmmsinputdir} perl -pi -e 's/^(CFLAGS.*)-O2(.*)/$1\$\(RPM_OPT_FLAGS\)$2/' Makefile make %{?_smp_mflags} @@ -47,6 +48,9 @@ %exclude %{xmmsinputdir}/libcdread.la %changelog +* Tue Mar 03 2009 Robert Scheck - 0.14-16 +- Solve the x86_64-redhat-linux-gnu configure target error + * Thu Feb 26 2009 Fedora Release Engineering - 0.14-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From robert at fedoraproject.org Tue Mar 3 22:57:02 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Tue, 3 Mar 2009 22:57:02 +0000 (UTC) Subject: rpms/libdv/devel libdv.spec,1.26,1.27 Message-ID: <20090303225702.77FE770116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/libdv/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23533 Modified Files: libdv.spec Log Message: Rebuild against libtool 2.2 Index: libdv.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdv/devel/libdv.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- libdv.spec 25 Feb 2009 14:25:56 -0000 1.26 +++ libdv.spec 3 Mar 2009 22:56:32 -0000 1.27 @@ -1,7 +1,7 @@ Summary: Software decoder for DV format video Name: libdv Version: 1.0.0 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libdv.sourceforge.net/ @@ -52,6 +52,8 @@ %patch1 -p0 -b .no-exec-stack %patch2 -p1 -b .pic %patch3 -p1 -b .gtk2 +# Required for libtool 2.2 +libtoolize # Required for the gtk2 patch autoreconf @@ -96,6 +98,9 @@ %{_libdir}/pkgconfig/libdv.pc %changelog +* Tue Mar 03 2009 Robert Scheck 1.0.0-7 +- Rebuilt against libtool 2.2 + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From spot at fedoraproject.org Tue Mar 3 22:58:51 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Mar 2009 22:58:51 +0000 (UTC) Subject: rpms/mono-nunit22/devel mono-nunit22.spec,1.12,1.13 Message-ID: <20090303225851.C672270116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/mono-nunit22/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23893 Modified Files: mono-nunit22.spec Log Message: fix devel requires Index: mono-nunit22.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono-nunit22/devel/mono-nunit22.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mono-nunit22.spec 3 Mar 2009 20:36:27 -0000 1.12 +++ mono-nunit22.spec 3 Mar 2009 22:58:21 -0000 1.13 @@ -2,7 +2,7 @@ Name: mono-nunit22 Version: 2.2.10 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Unit-testing framework for .NET URL: http://www.nunit.org/ License: MIT with acknowledgement @@ -30,7 +30,7 @@ %package devel Summary: Unit-testing framework for .NET Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} Requires: pkgconfig %description devel @@ -78,6 +78,9 @@ %changelog +* Tue Mar 3 2009 Tom "spot" Callaway - 1:2.2.10-9 +- forgot to include epoch in devel requires + * Tue Mar 3 2009 Tom "spot" Callaway - 1:2.2.10-8 - bump epoch, revert to 2.2.10 (this is the compat package after all) From cchance at fedoraproject.org Tue Mar 3 23:03:42 2009 From: cchance at fedoraproject.org (Caius Chance) Date: Tue, 3 Mar 2009 23:03:42 +0000 (UTC) Subject: rpms/ibus-table/devel ibus-table.spec,1.8,1.9 Message-ID: <20090303230342.1FFE670116@cvs1.fedora.phx.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/ibus-table/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24678 Modified Files: ibus-table.spec Log Message: * Mon Mar 02 2009 Caius Chance - 1.1.0.20090220-1.fc11 - Resolves: rhbz#484650 - Updated to latest upstream release. - Splitted chinese input methods into modules. Index: ibus-table.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ibus-table.spec 25 Feb 2009 06:34:50 -0000 1.8 +++ ibus-table.spec 3 Mar 2009 23:03:11 -0000 1.9 @@ -1,13 +1,11 @@ Name: ibus-table -Version: 0.1.1.20081014 -Release: 5%{?dist} +Version: 1.1.0.20090220 +Release: 1%{?dist} Summary: The Table engine for IBus platform License: GPLv2+ Group: System Environment/Libraries URL: http://code.google.com/p/ibus/ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz -Patch0: ibus-table-0.1.1.20081014-4a.rhbz466430.patch -Patch1: ibus-table-0.1.1.20081014-4b.rhbz466844.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -19,14 +17,6 @@ %description The package contains general Table engine for IBus platform. -%package chinese -Summary: Chinese tables for general table engine of IBus -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} - -%description chinese -This package contains Chineses tables. - %package additional Summary: Additional tables for general table engine of IBus Group: System Environment/Libraries @@ -36,20 +26,11 @@ This package contains additional tables. %prep -%setup -q -%patch0 -p1 -b .4a-bz466430 -%patch1 -p1 -b .4b-bz466844 +%setup -b0 -q %build -%configure \ - --disable-static \ - --enable-zhengma \ - --enable-wubi86 \ - --enable-wubi98 \ - --enable-cangjie5 \ - --enable-erbi-qs \ - --enable-additional -# --enable-extra-phrases +cd ../%{name}-%{version} +%configure --disable-static --enable-additional make %{?_smp_mflags} @@ -62,13 +43,6 @@ %clean rm -rf $RPM_BUILD_ROOT -%post chinese -ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/wubi86.db -ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/wubi98.db -ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/cangjie5.db -ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/erbi_qs.db -ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/zhengma.db - %post additional ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/compose.db ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/latex.db @@ -76,59 +50,70 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README -%dir %{_datadir}/ibus-table -%dir %{_datadir}/ibus-table/engine -%dir %{_datadir}/ibus-table/tables -%dir %{_datadir}/ibus-table/icons -%dir %{_datadir}/ibus-table/data -%{_datadir}/ibus-table/engine/ -%{_datadir}/ibus-table/tables/template.txt -%{_datadir}/ibus-table/icons/ibus-table.svg -%{_datadir}/ibus-table/icons/full-letter.svg -%{_datadir}/ibus-table/icons/full-punct.svg -%{_datadir}/ibus-table/icons/half-letter.svg -%{_datadir}/ibus-table/icons/half-punct.svg -%{_datadir}/ibus-table/icons/onechar.svg -%{_datadir}/ibus-table/icons/phrase.svg -%{_datadir}/ibus-table/icons/py-mode.svg -%{_datadir}/ibus-table/icons/tab-mode.svg -%{_datadir}/ibus-table/icons/chinese.svg -%{_datadir}/ibus-table/icons/dcommit.svg -%{_datadir}/ibus-table/icons/english.svg -%{_datadir}/ibus-table/icons/ncommit.svg -%{_bindir}/ibus-engine-table -%{_bindir}/ibus-table-createdb - -%files chinese -%defattr(-,root,root,-) -%{_datadir}/ibus-table/data/pinyin_table.txt.bz2 -%{_datadir}/ibus-table/tables/extra_phrase.txt.bz2 -%{_datadir}/ibus-table/tables/wubi86.db -%{_datadir}/ibus-table/tables/wubi98.db -%{_datadir}/ibus-table/tables/cangjie5.db -%{_datadir}/ibus-table/tables/erbi_qs.db -%{_datadir}/ibus-table/tables/zhengma.db -%{_datadir}/ibus-table/icons/wubi86.svg -%{_datadir}/ibus-table/icons/wubi98.svg -%{_datadir}/ibus-table/icons/cangjie5.svg -%{_datadir}/ibus-table/icons/erbi-qs.svg -%{_datadir}/ibus-table/icons/zhengma.svg -%{_datadir}/ibus/engine/wubi86.engine -%{_datadir}/ibus/engine/wubi98.engine -%{_datadir}/ibus/engine/cangjie5.engine -%{_datadir}/ibus/engine/erbi_qs.engine -%{_datadir}/ibus/engine/zhengma.engine +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/engine +%dir %{_datadir}/%{name}/tables +%dir %{_datadir}/%{name}/icons +%dir %{_datadir}/%{name}/data +%{_datadir}/ibus/component/table.xml +%{_libdir}/pkgconfig/%{name}.pc +%{_libexecdir}/ibus-engine-table +%{_bindir}/%{name}-createdb +%{_datadir}/%{name}/tables/template.txt +%{_datadir}/%{name}/icons/%{name}.svg +%{_datadir}/%{name}/icons/full-letter.svg +%{_datadir}/%{name}/icons/full-punct.svg +%{_datadir}/%{name}/icons/half-letter.svg +%{_datadir}/%{name}/icons/half-punct.svg +%{_datadir}/%{name}/icons/onechar.svg +%{_datadir}/%{name}/icons/phrase.svg +%{_datadir}/%{name}/icons/py-mode.svg +%{_datadir}/%{name}/icons/tab-mode.svg +%{_datadir}/%{name}/icons/chinese.svg +%{_datadir}/%{name}/icons/dcommit.svg +%{_datadir}/%{name}/icons/english.svg +%{_datadir}/%{name}/icons/ncommit.svg +%{_datadir}/%{name}/data/pinyin_table.txt.bz2 +%{_datadir}/%{name}/engine/factory.py +%{_datadir}/%{name}/engine/factory.pyc +%{_datadir}/%{name}/engine/factory.pyo +%{_datadir}/%{name}/engine/main.py +%{_datadir}/%{name}/engine/main.pyc +%{_datadir}/%{name}/engine/main.pyo +%{_datadir}/%{name}/engine/speedmeter.py +%{_datadir}/%{name}/engine/speedmeter.pyc +%{_datadir}/%{name}/engine/speedmeter.pyo +%{_datadir}/%{name}/engine/tabcreatedb.py +%{_datadir}/%{name}/engine/tabcreatedb.pyc +%{_datadir}/%{name}/engine/tabcreatedb.pyo +%{_datadir}/%{name}/engine/tabdict.py +%{_datadir}/%{name}/engine/tabdict.pyc +%{_datadir}/%{name}/engine/tabdict.pyo +%{_datadir}/%{name}/engine/table.py +%{_datadir}/%{name}/engine/table.pyc +%{_datadir}/%{name}/engine/table.pyo +%{_datadir}/%{name}/engine/tabsqlitedb.py +%{_datadir}/%{name}/engine/tabsqlitedb.pyc +%{_datadir}/%{name}/engine/tabsqlitedb.pyo +%{_datadir}/%{name}/icons/cb-mode.svg +%{_datadir}/%{name}/icons/sc-mode.svg +%{_datadir}/%{name}/icons/scb-mode.svg +%{_datadir}/%{name}/icons/tc-mode.svg +%{_datadir}/%{name}/icons/tcb-mode.svg %files additional %defattr(-,root,root,-) -%{_datadir}/ibus-table/tables/compose.db -%{_datadir}/ibus-table/tables/latex.db -%{_datadir}/ibus-table/icons/compose.svg -%{_datadir}/ibus-table/icons/latex.svg -%{_datadir}/ibus/engine/compose.engine -%{_datadir}/ibus/engine/latex.engine +%{_datadir}/%{name}/tables/compose.db +%{_datadir}/%{name}/tables/latex.db +%{_datadir}/%{name}/icons/compose.svg +%{_datadir}/%{name}/icons/latex.svg %changelog +* Mon Mar 02 2009 Caius Chance - 1.1.0.20090220-1.fc11 +- Resolves: rhbz#484650 +- Updated to latest upstream release. +- Splitted chinese input methods into modules. + * Tue Feb 24 2009 Fedora Release Engineering - 0.1.1.20081014-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rstrode at fedoraproject.org Tue Mar 3 23:05:34 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Tue, 3 Mar 2009 23:05:34 +0000 (UTC) Subject: rpms/gdm/devel gdm-2.25.2-multistack-but-boring.patch,1.1,1.2 Message-ID: <20090303230534.D90E770116@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gdm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24917 Modified Files: gdm-2.25.2-multistack-but-boring.patch Log Message: Regen patch to get rid of fuzz gdm-2.25.2-multistack-but-boring.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 gdm-2.25.2-multistack-but-boring.patch Index: gdm-2.25.2-multistack-but-boring.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.25.2-multistack-but-boring.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdm-2.25.2-multistack-but-boring.patch 3 Mar 2009 22:46:51 -0000 1.1 +++ gdm-2.25.2-multistack-but-boring.patch 3 Mar 2009 23:05:34 -0000 1.2 @@ -1,1115 +1,716 @@ -From 0b295480d3f0955d7133c39c0c4b2ec3bd2f3084 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Fri, 16 Jan 2009 11:00:08 -0500 -Subject: [PATCH 01/65] Drop session "Open" in favor of "StartConversation" - -We want to eventually support having multiple -simultaneous PAM conversations in one login -screen (so, e.g., username/password, smart card, and -fingerprint all work at the same time). - -This commit refactors the session code to be in terms -of a conversation object. With this change, it should -be easier later to have multiple conversation objects. - -The conversation is named by the pam service the login -screen is talking to. ---- - daemon/gdm-factory-slave.c | 13 +- - daemon/gdm-product-slave.c | 47 ++++++--- - daemon/gdm-session-direct.c | 250 ++++++++++++++++++++++++++---------------- - daemon/gdm-session-private.h | 3 +- - daemon/gdm-session-relay.c | 29 +++-- - daemon/gdm-session.c | 20 ++-- - daemon/gdm-session.h | 9 +- - daemon/gdm-simple-slave.c | 3 - - daemon/test-session.c | 13 +- - 9 files changed, 240 insertions(+), 147 deletions(-) - -diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c -index d09c913..6497293 100644 ---- a/daemon/gdm-factory-slave.c -+++ b/daemon/gdm-factory-slave.c -@@ -180,10 +180,11 @@ on_session_secret_info_query (GdmSession *session, +diff -up gdm-2.25.2/common/gdm-marshal.list.multistack-but-boring gdm-2.25.2/common/gdm-marshal.list +--- gdm-2.25.2/common/gdm-marshal.list.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 ++++ gdm-2.25.2/common/gdm-marshal.list 2009-03-03 17:45:05.814016242 -0500 +@@ -5,3 +5,4 @@ VOID:STRING,STRING + VOID:UINT,UINT + VOID:STRING,INT + VOID:DOUBLE ++BOOLEAN:STRING +diff -up gdm-2.25.2/configure.ac.multistack-but-boring gdm-2.25.2/configure.ac +--- gdm-2.25.2/configure.ac.multistack-but-boring 2009-03-03 17:45:05.512009633 -0500 ++++ gdm-2.25.2/configure.ac 2009-03-03 17:45:05.748016423 -0500 +@@ -18,6 +18,22 @@ AC_PROG_CXX + AM_PROG_CC_C_O + AC_PROG_LIBTOOL() + ++## increment if the plugin interface has additions, changes, removals. ++LT_CURRENT=1 ++ ++## increment any time the source changes; set to ++## 0 if you increment CURRENT ++LT_REVISION=0 ++ ++## increment if any interfaces have been added; set to 0 ++## if any interfaces have been changed or removed. removal has ++## precedence over adding, so set to 0 if both happened. ++LT_AGE=0 ++ ++AC_SUBST(LT_CURRENT) ++AC_SUBST(LT_REVISION) ++AC_SUBST(LT_AGE) ++ + AC_HEADER_STDC + + AC_SUBST(VERSION) +@@ -51,6 +67,7 @@ GNOME_PANEL_REQUIRED_VERSION=2.0.0 + LIBXKLAVIER_REQUIRED_VERSION=3.5 + #FONTCONFIG_REQUIRED_VERSION=2.6.0 + FONTCONFIG_REQUIRED_VERSION=2.5.0 ++NSS_REQUIRED_VERSION=3.11.1 + + EXTRA_COMPILE_WARNINGS(yes) + +@@ -74,6 +91,12 @@ PKG_CHECK_MODULES(DAEMON, + AC_SUBST(DAEMON_CFLAGS) + AC_SUBST(DAEMON_LIBS) + ++PKG_CHECK_MODULES(NSS, ++ nss >= $NSS_REQUIRED_VERSION ++) ++AC_SUBST(NSS_CFLAGS) ++AC_SUBST(NSS_LIBS) ++ + PKG_CHECK_MODULES(XLIB, x11 xau, , + [AC_PATH_XTRA + if test "x$no_x" = xyes; then +@@ -200,6 +223,15 @@ AC_ARG_WITH(dmconfdir, + AC_SUBST(dmconfdir) + + dnl --------------------------------------------------------------------------- ++dnl - Configuration file stuff ++dnl --------------------------------------------------------------------------- ++AC_ARG_WITH(extensionsdatadir, ++ AS_HELP_STRING([--with-extensions-datadir], ++ [directory where extensions store data, default=DATADIR/gdm/simple-greeter/extensions]), ++ extensionsdatadir=${withval}, extensionsdatadir=${datadir}/gdm/simple-greeter/extensions) ++AC_SUBST(extensionsdatadir) ++ ++dnl --------------------------------------------------------------------------- + dnl - Configure arguments + dnl --------------------------------------------------------------------------- + +@@ -1292,6 +1324,22 @@ AC_SUBST(GDM_SPOOL_DIR) + + + dnl --------------------------------------------------------------------------- ++dnl - Directory for simple greeter plugins ++dnl --------------------------------------------------------------------------- ++ ++AC_ARG_WITH(simple-greeter-plugins-dir, ++ AS_HELP_STRING([--with-simple-greeter-plugins-dir=], ++ [simple greeter plugins directory])) ++ ++if ! test -z "$with_simple_greeter_plugins_dir"; then ++ GDM_SIMPLE_GREETER_PLUGINS_DIR=$with_simple_greeter_plugins_dir ++else ++ GDM_SIMPLE_GREETER_PLUGINS_DIR=${libdir}/gdm/simple-greeter/plugins ++fi ++ ++AC_SUBST(GDM_SIMPLE_GREETER_PLUGINS_DIR) ++ ++dnl --------------------------------------------------------------------------- + dnl - Finish + dnl --------------------------------------------------------------------------- + +@@ -1420,6 +1468,12 @@ docs/Makefile + gui/Makefile + gui/simple-greeter/Makefile + gui/simple-greeter/libnotificationarea/Makefile ++gui/simple-greeter/libgdmsimplegreeter/Makefile ++gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc ++gui/simple-greeter/plugins/Makefile ++gui/simple-greeter/plugins/password/Makefile ++gui/simple-greeter/plugins/fingerprint/Makefile ++gui/simple-greeter/plugins/smartcard/Makefile + gui/simple-chooser/Makefile + gui/user-switch-applet/Makefile + utils/Makefile +diff -up gdm-2.25.2/daemon/gdm-factory-slave.c.multistack-but-boring gdm-2.25.2/daemon/gdm-factory-slave.c +--- gdm-2.25.2/daemon/gdm-factory-slave.c.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 ++++ gdm-2.25.2/daemon/gdm-factory-slave.c 2009-03-03 17:45:05.618017661 -0500 +@@ -144,63 +144,71 @@ on_greeter_session_died (GdmGreeterSessi + + static void + on_session_info (GdmSession *session, ++ const char *service_name, + const char *text, + GdmFactorySlave *slave) + { + g_debug ("GdmFactorySlave: Info: %s", text); +- gdm_greeter_server_info (slave->priv->greeter_server, text); ++ gdm_greeter_server_info (slave->priv->greeter_server, service_name, text); + } + + static void + on_session_problem (GdmSession *session, ++ const char *service_name, + const char *text, + GdmFactorySlave *slave) + { + g_debug ("GdmFactorySlave: Problem: %s", text); +- gdm_greeter_server_problem (slave->priv->greeter_server, text); ++ gdm_greeter_server_problem (slave->priv->greeter_server, service_name, text); + } + + static void + on_session_info_query (GdmSession *session, ++ const char *service_name, + const char *text, + GdmFactorySlave *slave) + { + + g_debug ("GdmFactorySlave: Info query: %s", text); +- gdm_greeter_server_info_query (slave->priv->greeter_server, text); ++ gdm_greeter_server_info_query (slave->priv->greeter_server, service_name, text); + } + + static void + on_session_secret_info_query (GdmSession *session, ++ const char *service_name, + const char *text, + GdmFactorySlave *slave) + { + g_debug ("GdmFactorySlave: Secret info query: %s", text); +- gdm_greeter_server_secret_info_query (slave->priv->greeter_server, text); ++ gdm_greeter_server_secret_info_query (slave->priv->greeter_server, service_name, text); } static void [...28371 lines suppressed...] ++ ++ +diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c +--- /dev/null 2009-03-03 12:39:28.547009636 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c 2009-03-03 17:45:05.728011655 -0500 +@@ -0,0 +1,40 @@ ++/* ++ * Copyright (C) 2009 Red Hat, Inc. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Written By: Ray Strode ++ * ++ */ + -+gboolean - gdm_conversation_choose_user (GdmConversation *conversation, - const char *username) - { -- g_signal_emit (conversation, signals [USER_CHOSEN], 0, username); -+ gboolean was_chosen; ++#include "gdm-smartcard-extension.h" + -+ was_chosen = FALSE; ++#include ++#include + -+ g_signal_emit (conversation, signals [USER_CHOSEN], 0, username, &was_chosen); ++GdmGreeterExtension * ++gdm_greeter_plugin_get_extension (void) ++{ ++ static GObject *extension; + -+ return was_chosen; - } -diff --git a/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h -index fb4bf49..b37b21e 100644 ---- a/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h -+++ b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h -@@ -61,7 +61,7 @@ struct _GdmConversationIface - /* signals */ - char * (* answer) (GdmConversation *conversation); - void (* cancel) (GdmConversation *conversation); -- void (* user_chosen) (GdmConversation *conversation); -+ gboolean (* user_chosen) (GdmConversation *conversation); - }; - - GType gdm_conversation_get_type (void) G_GNUC_CONST; -@@ -85,8 +85,8 @@ gboolean gdm_conversation_focus (GdmConversation *conversation); - void gdm_conversation_answer (GdmConversation *conversation, - const char *answer); - void gdm_conversation_cancel (GdmConversation *conversation); --void gdm_conversation_choose_user (GdmConversation *conversation, -- const char *username); -+gboolean gdm_conversation_choose_user (GdmConversation *conversation, -+ const char *username); - - G_END_DECLS - -diff --git a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c -index 8e87db6..5a2c380 100644 ---- a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c -+++ b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c -@@ -53,6 +53,7 @@ struct _GdmSmartcardExtensionPrivate - int number_of_tokens; - - guint answer_pending : 1; -+ guint select_when_ready : 1; - }; - - static void gdm_smartcard_extension_finalize (GObject *object); -@@ -102,8 +103,14 @@ on_smartcard_event (GIOChannel *io_channel, - } - - if (extension->priv->number_of_tokens == 1) { -- gdm_conversation_choose_user (GDM_CONVERSATION (extension), -- PAMSERVICENAME); -+ if (!gdm_conversation_choose_user (GDM_CONVERSATION (extension), -+ PAMSERVICENAME)) { -+ g_debug ("could not choose smart card user, cancelling..."); -+ gdm_conversation_cancel (GDM_CONVERSATION (extension)); -+ extension->priv->select_when_ready = TRUE; -+ } else { -+ g_debug ("chose smart card user!"); -+ } - } else if (extension->priv->number_of_tokens == 0) { - gdm_conversation_cancel (GDM_CONVERSATION (extension)); - } -@@ -210,10 +217,16 @@ gdm_smartcard_extension_set_ready (GdmConversation *conversation) - GdmSmartcardExtension *extension = GDM_SMARTCARD_EXTENSION (conversation); - gdm_task_set_enabled (GDM_TASK (conversation), TRUE); - -- if (extension->priv->worker_pid <= 0) -- { -+ if (extension->priv->worker_pid <= 0) { - watch_for_smartcards (extension); -- } ++ if (extension != NULL) { ++ g_object_ref (extension); ++ } else { ++ extension = g_object_new (GDM_TYPE_SMARTCARD_EXTENSION, NULL); ++ g_object_add_weak_pointer (extension, (gpointer *) &extension); + } + -+ if (extension->priv->select_when_ready) { -+ if (gdm_conversation_choose_user (GDM_CONVERSATION (extension), -+ PAMSERVICENAME)) { -+ extension->priv->select_when_ready = FALSE; -+ } -+ } - } - - char * --- -1.6.1 - - -From cdb57fbb1366ca4fe7314850d223cd0a79240fd9 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Tue, 3 Mar 2009 13:33:09 -0500 -Subject: [PATCH 64/65] Don't build fingerprint and smartcard plugins - -I'm staging a degenerate single stack case -for rawhide. ---- - gui/simple-greeter/plugins/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/gui/simple-greeter/plugins/Makefile.am b/gui/simple-greeter/plugins/Makefile.am -index 3dd336f..c0390db 100644 ---- a/gui/simple-greeter/plugins/Makefile.am -+++ b/gui/simple-greeter/plugins/Makefile.am -@@ -1 +1 @@ --SUBDIRS = password fingerprint smartcard -+SUBDIRS = password --- -1.6.1 - - -From 48c2237ff7efe68e116363ce51e0a4cdc42a5c78 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Tue, 3 Mar 2009 17:15:10 -0500 -Subject: [PATCH 65/65] Use "gdm" instead of "gdm-password" - -This is so we hook into system configured auth policy ---- - gui/simple-greeter/plugins/password/Makefile.am | 9 ++------- - 1 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/gui/simple-greeter/plugins/password/Makefile.am b/gui/simple-greeter/plugins/password/Makefile.am -index e832c4d..097b18e 100644 ---- a/gui/simple-greeter/plugins/password/Makefile.am -+++ b/gui/simple-greeter/plugins/password/Makefile.am -@@ -3,8 +3,6 @@ NULL = - extensiondir = $(extensionsdatadir)/password - extension_DATA = page.ui - --pamservicename = gdm-password -- - AM_CPPFLAGS = \ - -I$(top_srcdir)/common \ - -I$(top_srcdir)/gui/simple-greeter/libnotificationarea \ -@@ -12,7 +10,7 @@ AM_CPPFLAGS = \ - -DDMCONFDIR=\""$(dmconfdir)"\" \ - -DGDMCONFDIR=\"$(gdmconfdir)\" \ - -DPLUGINDATADIR=\""$(extensiondir)"\" \ -- -DPAMSERVICENAME=\""$(pamservicename)"\" \ -+ -DPAMSERVICENAME=\""gdm"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -@@ -39,10 +37,7 @@ password_la_SOURCES = \ - gdm-password-extension.c \ - plugin.c - --pamdir = $(PAM_PREFIX)/pam.d --pam_DATA = $(pamservicename) -- --EXTRA_DIST = $(extension_DATA) $(pam_DATA) -+EXTRA_DIST = $(extension_DATA) - - MAINTAINERCLEANFILES = \ - *~ \ --- -1.6.1 - ++ return GDM_GREETER_EXTENSION (extension); ++} From caolanm at fedoraproject.org Tue Mar 3 23:12:39 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 23:12:39 +0000 (UTC) Subject: rpms/pekwm/devel pekwm-0.1.5-gcc43.patch, 1.1, 1.2 pekwm.spec, 1.5, 1.6 Message-ID: <20090303231239.5798170116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/pekwm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26027 Modified Files: pekwm-0.1.5-gcc43.patch pekwm.spec Log Message: include cstdio for std::scanf pekwm-0.1.5-gcc43.patch: Index: pekwm-0.1.5-gcc43.patch =================================================================== RCS file: /cvs/pkgs/rpms/pekwm/devel/pekwm-0.1.5-gcc43.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pekwm-0.1.5-gcc43.patch 17 Sep 2008 15:21:41 -0000 1.1 +++ pekwm-0.1.5-gcc43.patch 3 Mar 2009 23:12:08 -0000 1.2 @@ -48,16 +48,6 @@ class ColorHandler { public: ---- pekwm-0.1.5.orig/src/PImageNativeLoaderXpm.cc 2008-09-17 10:02:32.000000000 -0500 -+++ pekwm-0.1.5/src/PImageNativeLoaderXpm.cc 2008-09-17 10:12:54.000000000 -0500 -@@ -13,6 +13,7 @@ - #include "PImageNativeLoaderXpm.hh" - - #include -+#include - - using std::cerr; - using std::endl; --- pekwm-0.1.5.orig/src/Util.cc 2008-09-17 10:02:32.000000000 -0500 +++ pekwm-0.1.5/src/Util.cc 2008-09-17 10:14:09.000000000 -0500 @@ -14,6 +14,7 @@ @@ -68,3 +58,20 @@ #include #include +diff -ru pekwm-0.1.5.orig/src/PImageNativeLoaderXpm.cc pekwm-0.1.5/src/PImageNativeLoaderXpm.cc +--- pekwm-0.1.5.orig/src/PImageNativeLoaderXpm.cc 2009-03-03 22:59:01.000000000 +0000 ++++ pekwm-0.1.5/src/PImageNativeLoaderXpm.cc 2009-03-03 23:06:23.000000000 +0000 +@@ -13,10 +13,13 @@ + #include "PImageNativeLoaderXpm.hh" + + #include ++#include ++#include + + using std::cerr; + using std::endl; + using std::string; ++using std::sscanf; + + const uint PImageNativeLoaderXpm::CHANNELS = 4; + const uint PImageNativeLoaderXpm::ALPHA_SOLID = 255; Index: pekwm.spec =================================================================== RCS file: /cvs/pkgs/rpms/pekwm/devel/pekwm.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pekwm.spec 26 Feb 2009 10:29:34 -0000 1.5 +++ pekwm.spec 3 Mar 2009 23:12:08 -0000 1.6 @@ -1,6 +1,6 @@ Name: pekwm Version: 0.1.5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: The Pek Window Manager Group: User Interface/Desktops @@ -85,6 +85,9 @@ %changelog +* Tue Mar 03 2009 Caol??n McNamara - 0.1.5-10 +- include cstdio for std::scanf + * Thu Feb 26 2009 Fedora Release Engineering - 0.1.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kkofler at fedoraproject.org Tue Mar 3 23:14:34 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 3 Mar 2009 23:14:34 +0000 (UTC) Subject: rpms/mingw32-nsis/devel mingw32-nsis.spec,1.6,1.7 Message-ID: <20090303231434.AFCED70116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/mingw32-nsis/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26391/devel Modified Files: mingw32-nsis.spec Log Message: Remove dot in changelog for consistency with other entries. Index: mingw32-nsis.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-nsis/devel/mingw32-nsis.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mingw32-nsis.spec 3 Mar 2009 21:37:54 -0000 1.6 +++ mingw32-nsis.spec 3 Mar 2009 23:14:04 -0000 1.7 @@ -93,7 +93,7 @@ - Don't build the MinGW parts with debugging information, NSIS corrupts the debugging information in the stubs when building installers from them - Drop debian-debug-opt patch, all its changes are either taken care of by our - rpm-opt patch, unwanted (see above) or unneeded. + rpm-opt patch, unwanted (see above) or unneeded * Wed Feb 25 2009 Kevin Kofler - 2.43-5 - Use RPM_OPT_FLAGS for the natively-built parts From kkofler at fedoraproject.org Tue Mar 3 23:17:47 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 3 Mar 2009 23:17:47 +0000 (UTC) Subject: rpms/mingw32-nsis/F-10 mingw32-nsis.spec, 1.3, 1.4 nsis-2.43-rpm-opt.patch, 1.1, 1.2 nsis-2.43-debian-debug-opt.patch, 1.2, NONE Message-ID: <20090303231747.6FA5D70116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/mingw32-nsis/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27023/F-10 Modified Files: mingw32-nsis.spec nsis-2.43-rpm-opt.patch Removed Files: nsis-2.43-debian-debug-opt.patch Log Message: Sync from devel: * Tue Mar 3 2009 Kevin Kofler - 2.43-6 - Don't build the MinGW parts with debugging information, NSIS corrupts the debugging information in the stubs when building installers from them - Drop debian-debug-opt patch, all its changes are either taken care of by our rpm-opt patch, unwanted (see above) or unneeded Index: mingw32-nsis.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-nsis/F-10/mingw32-nsis.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mingw32-nsis.spec 25 Feb 2009 14:01:17 -0000 1.3 +++ mingw32-nsis.spec 3 Mar 2009 23:17:16 -0000 1.4 @@ -1,9 +1,9 @@ -%define sconsopts VERSION=%{version} PREFIX=%{_prefix} PREFIX_CONF=%{_sysconfdir} SKIPPLUGINS=System SKIPUTILS='NSIS Menu' DEBUG_SYMBOLS=1 OPTS=1 +%define sconsopts VERSION=%{version} PREFIX=%{_prefix} PREFIX_CONF=%{_sysconfdir} SKIPPLUGINS=System SKIPUTILS='NSIS Menu' STRIP_CP=false %define _default_patch_fuzz 2 Name: mingw32-nsis Version: 2.43 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Nullsoft Scriptable Install System License: zlib and CPL @@ -15,10 +15,8 @@ # This patch fixes NSIS to actually build 64-bit versions. # Originally from Debian, updated by Kevin Kofler. Patch0: nsis-2.43-64bit-fixes.patch -# Patches from Debian (mainly by Paul Wise). -Patch1: nsis-2.43-debian-debug-opt.patch # Use RPM_OPT_FLAGS for the natively-built parts -Patch2: nsis-2.43-rpm-opt.patch +Patch1: nsis-2.43-rpm-opt.patch BuildRequires: mingw32-filesystem >= 40 BuildRequires: mingw32-gcc @@ -61,8 +59,7 @@ %setup -q -n nsis-%{version}-src %patch0 -p1 -b .64bit -%patch1 -p1 -b .debug -%patch2 -p1 -b .rpmopt +%patch1 -p1 -b .rpmopt %build @@ -92,15 +89,21 @@ %changelog +* Tue Mar 3 2009 Kevin Kofler - 2.43-6 +- Don't build the MinGW parts with debugging information, NSIS corrupts the + debugging information in the stubs when building installers from them +- Drop debian-debug-opt patch, all its changes are either taken care of by our + rpm-opt patch, unwanted (see above) or unneeded + * Wed Feb 25 2009 Kevin Kofler - 2.43-5 - Use RPM_OPT_FLAGS for the natively-built parts * Wed Feb 25 2009 Kevin Kofler - 2.43-4 -- Updated 64bit-fixes patch (remove some more -m32 use). -- Drop ExclusiveArch, not needed with the above. -- Obsoletes/Provides nsis and nsis-data for migration path from CalcForge. -- Disable NSIS Menu (does not work on *nix, see specfile comment for details). -- Drop BR wxGTK-devel. +- Updated 64bit-fixes patch (remove some more -m32 use) +- Drop ExclusiveArch, not needed with the above +- Obsoletes/Provides nsis and nsis-data for migration path from CalcForge +- Disable NSIS Menu (does not work on *nix, see specfile comment for details) +- Drop BR wxGTK-devel * Sat Feb 21 2009 Richard W.M. Jones - 2.43-3 - Restore ExclusiveArch line (Levente Farkas). nsis-2.43-rpm-opt.patch: Index: nsis-2.43-rpm-opt.patch =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-nsis/F-10/nsis-2.43-rpm-opt.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nsis-2.43-rpm-opt.patch 25 Feb 2009 14:01:17 -0000 1.1 +++ nsis-2.43-rpm-opt.patch 3 Mar 2009 23:17:16 -0000 1.2 @@ -1,6 +1,6 @@ -diff -ur nsis-2.43-src-debian-debug-opt/SCons/Config/gnu nsis-2.43-src-rpm-opt/SCons/Config/gnu ---- nsis-2.43-src-debian-debug-opt/SCons/Config/gnu 2009-02-25 08:35:01.000000000 +0100 -+++ nsis-2.43-src-rpm-opt/SCons/Config/gnu 2009-02-25 14:09:34.000000000 +0100 +diff -ur nsis-2.43-src-64bit-fixes/SCons/Config/gnu nsis-2.43-src-rpm-opt/SCons/Config/gnu +--- nsis-2.43-src-64bit-fixes/SCons/Config/gnu 2009-02-25 08:33:39.000000000 +0100 ++++ nsis-2.43-src-rpm-opt/SCons/Config/gnu 2009-03-03 22:24:49.000000000 +0100 @@ -1,5 +1,7 @@ print "Using GNU tools configuration" @@ -9,20 +9,20 @@ Import('defenv') ### imports -@@ -95,7 +97,7 @@ - makensis_env.Append(LINKFLAGS = '-g') # debugging - makensis_env.Append(CCFLAGS = '-g') # debugging - if not defenv['DEBUG'] and defenv['OPT']: -- makensis_env.Append(CCFLAGS = ['-O2']) # optimize -+ makensis_env.Append(CCFLAGS = os.getenv('RPM_OPT_FLAGS')) # optimize +@@ -89,7 +91,7 @@ + makensis_env.Append(CPPPATH = ['#$BUILD_CONFIG']) + + if not defenv['DEBUG']: +- makensis_env.Append(CCFLAGS = ['-O2']) # optimize ++ makensis_env.Append(CCFLAGS = os.getenv('RPM_OPT_FLAGS')) # optimize makensis_env.Append(CFLAGS = ['-Wall']) # all warnings makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore virtual dtor warnings makensis_env.Append(CXXFLAGS = ['-Wall']) # all warnings -@@ -158,6 +160,7 @@ +@@ -146,6 +148,7 @@ ### cross-platform util environment adjustments +cp_util_env.Append(CCFLAGS = os.getenv('RPM_OPT_FLAGS')) conf = FlagsConfigure(cp_util_env) - if not defenv['DEBUG'] and not defenv['DEBUG_SYMBOLS'] and defenv['STRIP'] and defenv['STRIP_CP']: + if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']: TestStrip(conf) # strip --- nsis-2.43-debian-debug-opt.patch DELETED --- From pkgdb at fedoraproject.org Tue Mar 3 23:19:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 23:19:04 +0000 Subject: [pkgdb] cvsps ownership updated Message-ID: <20090303231926.5693F2082B2@bastion.fedora.phx.redhat.com> Package cvsps in Fedora EPEL 5 is now owned by salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Tue Mar 3 23:20:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 23:20:11 +0000 Subject: [pkgdb] cvsps: salimma has requested watchbugzilla Message-ID: <20090303232010.A5377208543@bastion.fedora.phx.redhat.com> salimma has requested the watchbugzilla acl on cvsps (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Tue Mar 3 23:19:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 23:19:37 +0000 Subject: [pkgdb] cvsps: salimma has requested watchcommits Message-ID: <20090303232013.75421208546@bastion.fedora.phx.redhat.com> salimma has requested the watchcommits acl on cvsps (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Tue Mar 3 23:19:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 23:19:54 +0000 Subject: [pkgdb] cvsps: salimma has requested commit Message-ID: <20090303232016.0D32120854A@bastion.fedora.phx.redhat.com> salimma has requested the commit acl on cvsps (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Tue Mar 3 23:20:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 23:20:19 +0000 Subject: [pkgdb] cvsps: salimma has requested approveacls Message-ID: <20090303232018.D531720854D@bastion.fedora.phx.redhat.com> salimma has requested the approveacls acl on cvsps (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Tue Mar 3 23:19:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 23:19:56 +0000 Subject: [pkgdb] cvsps: salimma has requested watchbugzilla Message-ID: <20090303232033.43941208544@bastion.fedora.phx.redhat.com> salimma has requested the watchbugzilla acl on cvsps (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Tue Mar 3 23:20:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 23:20:37 +0000 Subject: [pkgdb] cvsps: salimma has requested commit Message-ID: <20090303232037.1E75F208543@bastion.fedora.phx.redhat.com> salimma has requested the commit acl on cvsps (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Tue Mar 3 23:20:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 23:20:03 +0000 Subject: [pkgdb] cvsps: salimma has requested watchcommits Message-ID: <20090303232039.6305720854F@bastion.fedora.phx.redhat.com> salimma has requested the watchcommits acl on cvsps (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Tue Mar 3 23:20:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 23:20:20 +0000 Subject: [pkgdb] cvsps: salimma has requested approveacls Message-ID: <20090303232041.B9D23208554@bastion.fedora.phx.redhat.com> salimma has requested the approveacls acl on cvsps (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Tue Mar 3 23:20:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 23:20:56 +0000 Subject: [pkgdb] cvsps: salimma has requested watchbugzilla Message-ID: <20090303232056.22D8220854B@bastion.fedora.phx.redhat.com> salimma has requested the watchbugzilla acl on cvsps (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Tue Mar 3 23:20:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 23:20:22 +0000 Subject: [pkgdb] cvsps: salimma has requested watchcommits Message-ID: <20090303232058.205CB20854E@bastion.fedora.phx.redhat.com> salimma has requested the watchcommits acl on cvsps (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Tue Mar 3 23:20:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 23:20:38 +0000 Subject: [pkgdb] cvsps: salimma has requested commit Message-ID: <20090303232059.EC537208556@bastion.fedora.phx.redhat.com> salimma has requested the commit acl on cvsps (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Tue Mar 3 23:21:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Mar 2009 23:21:02 +0000 Subject: [pkgdb] cvsps: salimma has requested approveacls Message-ID: <20090303232101.D6517208603@bastion.fedora.phx.redhat.com> salimma has requested the approveacls acl on cvsps (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From robert at fedoraproject.org Tue Mar 3 23:24:02 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Tue, 3 Mar 2009 23:24:02 +0000 (UTC) Subject: rpms/mod_revocator/devel mod_revocator.spec,1.6,1.7 Message-ID: <20090303232402.2292970116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mod_revocator/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27962 Modified Files: mod_revocator.spec Log Message: Solve the ppc64-redhat-linux-gnu configure target error Index: mod_revocator.spec =================================================================== RCS file: /cvs/pkgs/rpms/mod_revocator/devel/mod_revocator.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mod_revocator.spec 26 Feb 2009 02:11:48 -0000 1.6 +++ mod_revocator.spec 3 Mar 2009 23:23:31 -0000 1.7 @@ -1,6 +1,6 @@ Name: mod_revocator Version: 1.0.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: CRL retrieval module for the Apache HTTP server Group: System Environment/Daemons License: ASL 2.0 @@ -10,7 +10,7 @@ BuildRequires: nspr-devel >= 4.6, nss-devel >= 3.11 BuildRequires: nss-pkcs11-devel >= 3.11 BuildRequires: httpd-devel >= 0:2.0.52, apr-devel, apr-util-devel -BuildRequires: pkgconfig +BuildRequires: pkgconfig, automake BuildRequires: openldap-devel >= 2.2.29 Requires: httpd >= 0:2.0.52 Requires: nspr >= 4.6 @@ -27,6 +27,8 @@ %patch1 -p1 %build +# Needed for ppc64, automake can't be run here +cp -f %{_datadir}/automake-*/config.{guess,sub} . CFLAGS="$RPM_OPT_FLAGS" export CFLAGS @@ -90,6 +92,9 @@ %{_bindir}/ldapget %changelog +* Wed Mar 04 2009 Robert Scheck - 1.0.2-7 +- Solve the ppc64-redhat-linux-gnu configure target error + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Tue Mar 3 23:25:56 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Mar 2009 23:25:56 +0000 (UTC) Subject: rpms/jabbin/devel jabbin-2.0beta2a-includes.patch, NONE, 1.1 jabbin.spec, 1.4, 1.5 Message-ID: <20090303232556.1F38E70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/jabbin/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28284 Modified Files: jabbin.spec Added Files: jabbin-2.0beta2a-includes.patch Log Message: include stdio.h for sprintf jabbin-2.0beta2a-includes.patch: --- NEW FILE jabbin-2.0beta2a-includes.patch --- diff -ru jabbin-2.0beta2a.orig/3party/libjingle/talk/session/phone/phonesessionclient.cc jabbin-2.0beta2a/3party/libjingle/talk/session/phone/phonesessionclient.cc --- jabbin-2.0beta2a.orig/3party/libjingle/talk/session/phone/phonesessionclient.cc 2009-03-03 23:08:54.000000000 +0000 +++ jabbin-2.0beta2a/3party/libjingle/talk/session/phone/phonesessionclient.cc 2009-03-03 23:09:37.000000000 +0000 @@ -30,6 +30,7 @@ #include "talk/session/phone/phonesessionclient.h" #include "talk/xmpp/constants.h" #include "talk/xmllite/qname.h" +#include namespace { const std::string NS_PHONE("http://www.google.com/session/phone"); Index: jabbin.spec =================================================================== RCS file: /cvs/pkgs/rpms/jabbin/devel/jabbin.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jabbin.spec 25 Feb 2009 08:32:07 -0000 1.4 +++ jabbin.spec 3 Mar 2009 23:25:25 -0000 1.5 @@ -2,7 +2,7 @@ Summary(pl): Komunikator i VoIP Jabber klient Name: jabbin Version: 2.0 -Release: 0.8.beta2a%{?dist} +Release: 0.9.beta2a%{?dist} License: GPLv2+ Group: Applications/Communications URL: http://jabbin.com/ @@ -12,6 +12,7 @@ Patch1: jabbin-2.0beta2a-use-external.patch Patch2: jabbin-2.0beta2a-gcc43.patch Patch3: jabbin-2.0beta2a-compilation-flags.patch +Patch4: jabbin-2.0beta2a-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils qt3-devel openssl-devel expat-devel speex-devel libXScrnSaver-devel qca-devel Requires: hicolor-icon-theme @@ -28,6 +29,7 @@ %patch1 -p 1 %patch2 -p 1 %patch3 -p 1 +%patch4 -p 1 sed -i 's/\r//' README %build @@ -91,6 +93,9 @@ %{_datadir}/applications/fedora-jabbin.desktop %changelog +* Tue Mar 03 2009 Caol??n McNamara - 2.0-0.9.beta2a +- include stdio.h for sprintf + * Wed Feb 25 2009 Fedora Release Engineering - 2.0-0.8.beta2a - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From allisson at fedoraproject.org Tue Mar 3 23:26:30 2009 From: allisson at fedoraproject.org (Allisson Azevedo) Date: Tue, 3 Mar 2009 23:26:30 +0000 (UTC) Subject: rpms/couchdb/EL-5 import.log,1.1,1.2 Message-ID: <20090303232630.3FAB570116@cvs1.fedora.phx.redhat.com> Author: allisson Update of /cvs/pkgs/rpms/couchdb/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27822/EL-5 Modified Files: import.log Log Message: First import Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/couchdb/EL-5/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Mar 2009 00:25:31 -0000 1.1 +++ import.log 3 Mar 2009 23:26:00 -0000 1.2 @@ -1 +1,2 @@ couchdb-0_8_1-4_fc10:HEAD:couchdb-0.8.1-4.fc10.src.rpm:1236039841 +couchdb-0_8_1-4_fc10:EL-5:couchdb-0.8.1-4.fc10.src.rpm:1236122295 From cchance at fedoraproject.org Tue Mar 3 23:35:08 2009 From: cchance at fedoraproject.org (Caius Chance) Date: Tue, 3 Mar 2009 23:35:08 +0000 (UTC) Subject: rpms/ibus-table/devel ibus-table.spec,1.9,1.10 Message-ID: <20090303233508.3A7D470116@cvs1.fedora.phx.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/ibus-table/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29660 Modified Files: ibus-table.spec Log Message: added build req of ibus-devel Index: ibus-table.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ibus-table.spec 3 Mar 2009 23:03:11 -0000 1.9 +++ ibus-table.spec 3 Mar 2009 23:34:37 -0000 1.10 @@ -1,6 +1,6 @@ Name: ibus-table Version: 1.1.0.20090220 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Table engine for IBus platform License: GPLv2+ Group: System Environment/Libraries @@ -11,6 +11,7 @@ BuildArch: noarch BuildRequires: gettext-devel +BuildRequires: ibus-devel Requires: ibus @@ -109,6 +110,10 @@ %{_datadir}/%{name}/icons/latex.svg %changelog +* Tue Mar 03 2009 Caius Chance - 1.1.0.20090220-2.fc11 +- Resolves: rhbz#484650 +- Added BuildRequires ibus-devel. + * Mon Mar 02 2009 Caius Chance - 1.1.0.20090220-1.fc11 - Resolves: rhbz#484650 - Updated to latest upstream release. From cchance at fedoraproject.org Tue Mar 3 23:38:09 2009 From: cchance at fedoraproject.org (Caius Chance) Date: Tue, 3 Mar 2009 23:38:09 +0000 (UTC) Subject: rpms/ibus-table/devel ibus-table.spec,1.10,1.11 Message-ID: <20090303233809.CC45970116@cvs1.fedora.phx.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/ibus-table/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30066 Modified Files: ibus-table.spec Log Message: bumped rel num Index: ibus-table.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ibus-table.spec 3 Mar 2009 23:34:37 -0000 1.10 +++ ibus-table.spec 3 Mar 2009 23:37:39 -0000 1.11 @@ -110,6 +110,9 @@ %{_datadir}/%{name}/icons/latex.svg %changelog +* Tue Mar 03 2009 Caius Chance - 1.1.0.20090220-3.fc11 +- Bumped release number. + * Tue Mar 03 2009 Caius Chance - 1.1.0.20090220-2.fc11 - Resolves: rhbz#484650 - Added BuildRequires ibus-devel. From cchance at fedoraproject.org Tue Mar 3 23:39:49 2009 From: cchance at fedoraproject.org (Caius Chance) Date: Tue, 3 Mar 2009 23:39:49 +0000 (UTC) Subject: rpms/ibus-table/devel ibus-table.spec,1.11,1.12 Message-ID: <20090303233949.7E05370116@cvs1.fedora.phx.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/ibus-table/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30296 Modified Files: ibus-table.spec Log Message: same as last commit Index: ibus-table.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ibus-table.spec 3 Mar 2009 23:37:39 -0000 1.11 +++ ibus-table.spec 3 Mar 2009 23:39:19 -0000 1.12 @@ -1,6 +1,6 @@ Name: ibus-table Version: 1.1.0.20090220 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Table engine for IBus platform License: GPLv2+ Group: System Environment/Libraries From pbrobinson at fedoraproject.org Tue Mar 3 23:41:02 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Tue, 3 Mar 2009 23:41:02 +0000 (UTC) Subject: rpms/ekiga/devel ekiga.spec,1.74,1.75 Message-ID: <20090303234102.4362D70116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/ekiga/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30582 Modified Files: ekiga.spec Log Message: - Disable xcap for the moment so ekiga builds Index: ekiga.spec =================================================================== RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- ekiga.spec 3 Mar 2009 22:34:01 -0000 1.74 +++ ekiga.spec 3 Mar 2009 23:40:31 -0000 1.75 @@ -1,7 +1,7 @@ Summary: A Gnome based SIP/H323 teleconferencing application Name: ekiga Version: 3.1.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.ekiga.org/ Source0: ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2 License: GPLv2+ @@ -53,7 +53,7 @@ autoreconf libtoolize CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC" -%configure --disable-scrollkeeper --enable-xcap +%configure --disable-scrollkeeper make %{?_smp_mflags} %install @@ -132,7 +132,7 @@ %{_bindir}/ekiga %{_bindir}/ekiga-helper %{_bindir}/ekiga-config-tool -%{_datadir}/applications/ekiga.desktop +%{_datadir}/applications/gnome-ekiga.desktop %{_datadir}/pixmaps/ekiga %{_datadir}/man/*/* %{_datadir}/sounds/ekiga @@ -141,6 +141,9 @@ %{_sysconfdir}/gconf/schemas/ekiga.schemas %changelog +* Mon Mar 3 2009 Peter Robinson - 3.1.2-2 +- Disable xcap for the moment so ekiga builds + * Mon Mar 3 2009 Peter Robinson - 3.1.2-1 - Upgrade to the 3.1.2 beta release, enable celt codec, reinstate proper desktop file now its fixed From dwalsh at fedoraproject.org Tue Mar 3 23:53:43 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Tue, 3 Mar 2009 23:53:43 +0000 (UTC) Subject: rpms/selinux-policy/devel policy-20090105.patch,1.51,1.52 Message-ID: <20090303235343.1F06870116@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32203 Modified Files: policy-20090105.patch Log Message: * Mon Mar 2 2009 Dan Walsh 3.6.7-1 - Update to Latest upstream policy-20090105.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.51 -r 1.52 policy-20090105.patch Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- policy-20090105.patch 3 Mar 2009 21:56:08 -0000 1.51 +++ policy-20090105.patch 3 Mar 2009 23:53:42 -0000 1.52 @@ -1,6 +1,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.7/config/appconfig-mcs/default_contexts --- nsaserefpolicy/config/appconfig-mcs/default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/default_contexts 2009-03-03 16:44:42.243689000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/default_contexts 2009-03-03 17:11:59.000000000 -0500 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -24,13 +24,13 @@ +system_r:xdm_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.7/config/appconfig-mcs/failsafe_context --- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.7/config/appconfig-mcs/failsafe_context 2009-03-03 16:44:42.246686000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/failsafe_context 2009-03-03 17:11:59.000000000 -0500 @@ -1 +1 @@ -sysadm_r:sysadm_t:s0 +system_r:unconfined_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/guest_u_default_contexts 2009-03-03 16:44:42.249684000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/guest_u_default_contexts 2009-03-03 17:11:59.000000000 -0500 @@ -0,0 +1,6 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -40,7 +40,7 @@ +guest_r:guest_t:s0 guest_r:guest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/root_default_contexts --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/root_default_contexts 2009-03-03 16:44:42.250683000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/root_default_contexts 2009-03-03 17:11:59.000000000 -0500 @@ -1,11 +1,7 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0 +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -57,7 +57,7 @@ +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.7/config/appconfig-mcs/seusers --- nsaserefpolicy/config/appconfig-mcs/seusers 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.7/config/appconfig-mcs/seusers 2009-03-03 16:44:42.252693000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/seusers 2009-03-03 17:11:59.000000000 -0500 @@ -1,3 +1,3 @@ system_u:system_u:s0-mcs_systemhigh -root:root:s0-mcs_systemhigh @@ -66,7 +66,7 @@ +__default__:unconfined_u:s0-mcs_systemhigh diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/staff_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/staff_u_default_contexts 2009-03-03 16:44:42.255686000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/staff_u_default_contexts 2009-03-03 17:11:59.000000000 -0500 @@ -1,10 +1,12 @@ system_r:local_login_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 system_r:remote_login_t:s0 staff_r:staff_t:s0 @@ -83,7 +83,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/unconfined_u_default_contexts 2009-03-03 16:44:42.258683000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/unconfined_u_default_contexts 2009-03-03 17:11:59.000000000 -0500 @@ -1,4 +1,4 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0 +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 @@ -99,13 +99,13 @@ system_r:xdm_t:s0 unconfined_r:unconfined_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.7/config/appconfig-mcs/userhelper_context --- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.7/config/appconfig-mcs/userhelper_context 2009-03-03 16:44:42.259684000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/userhelper_context 2009-03-03 17:11:59.000000000 -0500 @@ -1 +1 @@ -system_u:sysadm_r:sysadm_t:s0 +system_u:system_r:unconfined_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/user_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/user_u_default_contexts 2009-03-03 16:44:42.261693000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/user_u_default_contexts 2009-03-03 17:11:59.000000000 -0500 @@ -1,8 +1,9 @@ system_r:local_login_t:s0 user_r:user_t:s0 system_r:remote_login_t:s0 user_r:user_t:s0 @@ -120,17 +120,17 @@ +user_r:user_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.7/config/appconfig-mcs/virtual_domain_context --- nsaserefpolicy/config/appconfig-mcs/virtual_domain_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/virtual_domain_context 2009-03-03 16:53:17.042576000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/virtual_domain_context 2009-03-03 17:11:59.000000000 -0500 @@ -0,0 +1 @@ +system_u:system_r:svirt_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.7/config/appconfig-mcs/virtual_image_context --- nsaserefpolicy/config/appconfig-mcs/virtual_image_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/virtual_image_context 2009-03-03 16:44:42.265686000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/virtual_image_context 2009-03-03 17:11:59.000000000 -0500 @@ -0,0 +1 @@ +system_u:object_r:virt_image_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/xguest_u_default_contexts 2009-03-03 16:44:42.267696000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mcs/xguest_u_default_contexts 2009-03-03 17:11:59.000000000 -0500 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -141,7 +141,7 @@ +xguest_r:xguest_t:s0 xguest_r:xguest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.7/config/appconfig-mls/default_contexts --- nsaserefpolicy/config/appconfig-mls/default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/default_contexts 2009-03-03 16:44:42.269686000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/default_contexts 2009-03-03 17:11:59.000000000 -0500 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -165,7 +165,7 @@ +system_r:xdm_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/guest_u_default_contexts 2009-03-03 16:44:42.272684000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/guest_u_default_contexts 2009-03-03 17:11:59.000000000 -0500 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -173,7 +173,7 @@ +system_r:crond_t:s0 guest_r:guest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.7/config/appconfig-mls/root_default_contexts --- nsaserefpolicy/config/appconfig-mls/root_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/root_default_contexts 2009-03-03 16:44:42.274685000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/root_default_contexts 2009-03-03 17:11:59.000000000 -0500 @@ -1,11 +1,11 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0 -system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -194,17 +194,17 @@ +#system_r:sshd_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.7/config/appconfig-mls/virtual_domain_context --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/virtual_domain_context 2009-03-03 16:44:42.276688000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/virtual_domain_context 2009-03-03 17:11:59.000000000 -0500 @@ -0,0 +1 @@ +system_u:system_r:qemu_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.7/config/appconfig-mls/virtual_image_context --- nsaserefpolicy/config/appconfig-mls/virtual_image_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/virtual_image_context 2009-03-03 16:44:42.278688000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/virtual_image_context 2009-03-03 17:11:59.000000000 -0500 @@ -0,0 +1 @@ +system_u:object_r:virt_image_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mls/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/xguest_u_default_contexts 2009-03-03 16:44:42.280688000 -0500 ++++ serefpolicy-3.6.7/config/appconfig-mls/xguest_u_default_contexts 2009-03-03 17:11:59.000000000 -0500 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -214,8 +214,8 @@ +system_r:initrc_su_t:s0 xguest_r:xguest_t:s0 +xguest_r:xguest_t:s0 xguest_r:xguest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.7/Makefile ---- nsaserefpolicy/Makefile 2009-02-09 12:15:51.000000000 -0500 -+++ serefpolicy-3.6.7/Makefile 2009-03-03 16:44:42.283683000 -0500 +--- nsaserefpolicy/Makefile 2009-01-19 11:07:35.000000000 -0500 ++++ serefpolicy-3.6.7/Makefile 2009-03-03 17:11:59.000000000 -0500 @@ -241,7 +241,7 @@ appdir := $(contextpath) user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts) @@ -280,7 +280,7 @@ $(verbose) $(INSTALL) -m 644 $< $@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.6.7/man/man8/httpd_selinux.8 --- nsaserefpolicy/man/man8/httpd_selinux.8 2008-08-25 09:12:31.000000000 -0400 -+++ serefpolicy-3.6.7/man/man8/httpd_selinux.8 2009-03-03 16:44:42.285686000 -0500 ++++ serefpolicy-3.6.7/man/man8/httpd_selinux.8 2009-03-03 17:11:59.000000000 -0500 @@ -41,7 +41,7 @@ - Set cgi scripts with httpd_unconfined_script_exec_t to allow them to run without any SELinux protection. This should only be used for a very complex httpd scripts, after exhausting all other options. It is better to use this script rather than turning off SELinux protection for httpd. @@ -301,7 +301,7 @@ setsebool -P httpd_tty_comm 1 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-3.6.7/man/man8/kerberos_selinux.8 --- nsaserefpolicy/man/man8/kerberos_selinux.8 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.7/man/man8/kerberos_selinux.8 2009-03-03 16:44:42.288683000 -0500 ++++ serefpolicy-3.6.7/man/man8/kerberos_selinux.8 2009-03-03 17:11:59.000000000 -0500 @@ -12,7 +12,7 @@ .SH "DESCRIPTION" @@ -313,7 +313,7 @@ You must set the allow_kerberos boolean to allow your system to work properly in a Kerberos environment. diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/nfs_selinux.8 serefpolicy-3.6.7/man/man8/nfs_selinux.8 --- nsaserefpolicy/man/man8/nfs_selinux.8 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.7/man/man8/nfs_selinux.8 2009-03-03 16:44:42.290693000 -0500 ++++ serefpolicy-3.6.7/man/man8/nfs_selinux.8 2009-03-03 17:11:59.000000000 -0500 @@ -1,14 +1,12 @@ -.TH "nfs_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "nfs Selinux Policy documentation" +.TH "nfs_selinux" "8" "9 Feb 2009" "dwalsh at redhat.com" "NFS SELinux Policy documentation" @@ -353,7 +353,7 @@ selinux(8), chcon(1), setsebool(8) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/samba_selinux.8 serefpolicy-3.6.7/man/man8/samba_selinux.8 --- nsaserefpolicy/man/man8/samba_selinux.8 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.7/man/man8/samba_selinux.8 2009-03-03 16:44:42.293688000 -0500 ++++ serefpolicy-3.6.7/man/man8/samba_selinux.8 2009-03-03 17:11:59.000000000 -0500 @@ -14,11 +14,17 @@ .TP chcon -t samba_share_t /var/eng [...3620 lines suppressed...] -+++ serefpolicy-3.6.7/policy/modules/system/sysnetwork.te 2009-03-03 16:44:43.344604000 -0500 +--- nsaserefpolicy/policy/modules/system/sysnetwork.te 2009-01-19 11:07:34.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/sysnetwork.te 2009-03-03 17:11:59.000000000 -0500 @@ -20,6 +20,9 @@ init_daemon_domain(dhcpc_t,dhcpc_exec_t) role system_r types dhcpc_t; @@ -28862,7 +28912,7 @@ xen_append_log(ifconfig_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.6.7/policy/modules/system/udev.fc --- nsaserefpolicy/policy/modules/system/udev.fc 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/udev.fc 2009-03-03 16:44:43.347601000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/udev.fc 2009-03-03 17:11:59.000000000 -0500 @@ -17,3 +17,5 @@ /sbin/wait_for_sysfs -- gen_context(system_u:object_r:udev_exec_t,s0) @@ -28871,7 +28921,7 @@ +/var/run/PackageKit/udev(/.*)? gen_context(system_u:object_r:udev_var_run_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.6.7/policy/modules/system/udev.if --- nsaserefpolicy/policy/modules/system/udev.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.6.7/policy/modules/system/udev.if 2009-03-03 16:44:43.349602000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/udev.if 2009-03-03 17:11:59.000000000 -0500 @@ -96,6 +96,24 @@ ######################################## @@ -28926,8 +28976,8 @@ + allow $1 udev_tbl_t:file rw_file_perms; ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.7/policy/modules/system/udev.te ---- nsaserefpolicy/policy/modules/system/udev.te 2009-03-03 15:55:59.069626000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/udev.te 2009-03-03 16:44:43.352601000 -0500 +--- nsaserefpolicy/policy/modules/system/udev.te 2009-03-02 16:51:45.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/udev.te 2009-03-03 17:11:59.000000000 -0500 @@ -55,6 +55,7 @@ can_exec(udev_t, udev_exec_t) @@ -29014,7 +29064,7 @@ ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.7/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2008-09-11 16:42:49.000000000 -0400 -+++ serefpolicy-3.6.7/policy/modules/system/unconfined.fc 2009-03-03 16:44:43.355602000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/unconfined.fc 2009-03-03 17:11:59.000000000 -0500 @@ -2,15 +2,28 @@ # e.g.: # /usr/local/bin/appsrv -- gen_context(system_u:object_r:unconfined_exec_t,s0) @@ -29055,7 +29105,7 @@ +/opt/real/(.*/)?realplay\.bin -- gen_context(system_u:object_r:execmem_exec_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.7/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/unconfined.if 2009-03-03 16:44:43.358601000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/unconfined.if 2009-03-03 17:11:59.000000000 -0500 @@ -12,14 +12,13 @@ # interface(`unconfined_domain_noaudit',` @@ -29335,7 +29385,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.7/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/unconfined.te 2009-03-03 16:44:43.361601000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/unconfined.te 2009-03-03 17:11:59.000000000 -0500 @@ -5,36 +5,86 @@ # # Declarations @@ -29686,7 +29736,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.7/policy/modules/system/userdomain.fc --- nsaserefpolicy/policy/modules/system/userdomain.fc 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/userdomain.fc 2009-03-03 16:44:43.370603000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/userdomain.fc 2009-03-03 17:11:59.000000000 -0500 @@ -1,4 +1,7 @@ HOME_DIR -d gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh) +HOME_DIR -l gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh) @@ -29697,8 +29747,8 @@ +/dev/shm/pulse-shm.* gen_context(system_u:object_r:user_tmpfs_t,s0) +/dev/shm/mono.* gen_context(system_u:object_r:user_tmpfs_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.7/policy/modules/system/userdomain.if ---- nsaserefpolicy/policy/modules/system/userdomain.if 2009-02-09 12:15:51.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/userdomain.if 2009-03-03 16:44:43.376604000 -0500 +--- nsaserefpolicy/policy/modules/system/userdomain.if 2009-01-19 11:07:34.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/userdomain.if 2009-03-03 18:02:25.000000000 -0500 @@ -30,8 +30,9 @@ ') @@ -31608,8 +31658,8 @@ + type_transition $1 user_home_dir_t:$2 user_home_t; +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.7/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2009-02-09 12:15:51.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/userdomain.te 2009-03-03 16:44:43.379603000 -0500 +--- nsaserefpolicy/policy/modules/system/userdomain.te 2009-01-19 11:07:34.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/userdomain.te 2009-03-03 17:11:59.000000000 -0500 @@ -8,13 +8,6 @@ ## @@ -31695,13 +31745,13 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.7/policy/modules/system/virtual.fc --- nsaserefpolicy/policy/modules/system/virtual.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/virtual.fc 2009-03-03 16:44:43.382604000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/virtual.fc 2009-03-03 17:11:59.000000000 -0500 @@ -0,0 +1 @@ +# No application file contexts. diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.7/policy/modules/system/virtual.if --- nsaserefpolicy/policy/modules/system/virtual.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/virtual.if 2009-03-03 16:46:29.985828000 -0500 -@@ -0,0 +1,96 @@ ++++ serefpolicy-3.6.7/policy/modules/system/virtual.if 2009-03-03 17:46:59.000000000 -0500 +@@ -0,0 +1,99 @@ +## Virtual machine emulator and virtualizer + +######################################## @@ -31728,6 +31778,9 @@ + ') + + typeattribute $1 virtualdomain; ++ ++ # start with basic domain ++ domain_type($1) +') + +######################################## @@ -31800,8 +31853,8 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.7/policy/modules/system/virtual.te --- nsaserefpolicy/policy/modules/system/virtual.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/virtual.te 2009-03-03 16:46:59.686390000 -0500 -@@ -0,0 +1,79 @@ ++++ serefpolicy-3.6.7/policy/modules/system/virtual.te 2009-03-03 17:13:55.000000000 -0500 +@@ -0,0 +1,78 @@ + +policy_module(virtualization, 1.1.2) + @@ -31879,11 +31932,10 @@ + xserver_read_xdm_tmp_files(virtualdomain) + xserver_read_xdm_pid(virtualdomain) + xserver_rw_shm(virtualdomain) -+ xserver_common_x_domain_template(user, virtualdomain) +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.7/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/xen.fc 2009-03-03 16:44:43.389601000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/xen.fc 2009-03-03 17:11:59.000000000 -0500 @@ -2,17 +2,10 @@ /usr/bin/virsh -- gen_context(system_u:object_r:xm_exec_t,s0) @@ -31912,7 +31964,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.7/policy/modules/system/xen.if --- nsaserefpolicy/policy/modules/system/xen.if 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/xen.if 2009-03-03 16:44:43.391602000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/xen.if 2009-03-03 17:11:59.000000000 -0500 @@ -167,11 +167,14 @@ # interface(`xen_stream_connect',` @@ -31955,8 +32007,8 @@ + rw_files_pattern($1, xen_image_t, xen_image_t) +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.7/policy/modules/system/xen.te ---- nsaserefpolicy/policy/modules/system/xen.te 2009-02-09 12:15:51.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/xen.te 2009-03-03 16:44:43.394601000 -0500 +--- nsaserefpolicy/policy/modules/system/xen.te 2009-01-19 11:07:34.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/xen.te 2009-03-03 17:11:59.000000000 -0500 @@ -6,6 +6,13 @@ # Declarations # @@ -32180,7 +32232,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.7/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-10-16 17:21:16.000000000 -0400 -+++ serefpolicy-3.6.7/policy/support/obj_perm_sets.spt 2009-03-03 16:44:43.397601000 -0500 ++++ serefpolicy-3.6.7/policy/support/obj_perm_sets.spt 2009-03-03 17:11:59.000000000 -0500 @@ -179,20 +179,20 @@ # # Directory (dir) @@ -32236,7 +32288,7 @@ +define(`manage_key_perms', `{ create link read search setattr view write } ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.7/policy/users --- nsaserefpolicy/policy/users 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.6.7/policy/users 2009-03-03 16:44:43.399602000 -0500 ++++ serefpolicy-3.6.7/policy/users 2009-03-03 17:11:59.000000000 -0500 @@ -25,11 +25,8 @@ # permit any access to such users, then remove this entry. # @@ -32263,7 +32315,7 @@ +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.7/Rules.modular --- nsaserefpolicy/Rules.modular 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/Rules.modular 2009-03-03 16:44:43.401606000 -0500 ++++ serefpolicy-3.6.7/Rules.modular 2009-03-03 17:11:59.000000000 -0500 @@ -73,8 +73,8 @@ $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te @echo "Compliling $(NAME) $(@F) module" @@ -32295,7 +32347,7 @@ $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.7/support/Makefile.devel --- nsaserefpolicy/support/Makefile.devel 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/support/Makefile.devel 2009-03-03 16:44:43.404601000 -0500 ++++ serefpolicy-3.6.7/support/Makefile.devel 2009-03-03 17:11:59.000000000 -0500 @@ -185,8 +185,7 @@ tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te @$(EINFO) "Compiling $(NAME) $(basename $(@F)) module" From robert at fedoraproject.org Tue Mar 3 23:56:16 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Tue, 3 Mar 2009 23:56:16 +0000 (UTC) Subject: rpms/gcombust/devel gcombust.spec,1.16,1.17 Message-ID: <20090303235616.25FC470116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/gcombust/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32619 Modified Files: gcombust.spec Log Message: Solve the x86_64-redhat-linux-gnu configure target error Index: gcombust.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcombust/devel/gcombust.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gcombust.spec 24 Feb 2009 19:50:23 -0000 1.16 +++ gcombust.spec 3 Mar 2009 23:55:45 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Powerful graphical front-end for mkisofs and cdrecord Name: gcombust Version: 0.1.55 -Release: 14 +Release: 15 Epoch: 1 License: GPLv2+ Group: Applications/Archiving @@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: cdrecord >= 1.10, mkisofs >= 1.10 Requires: cdda2wav >= 1.10, cdlabelgen >= 1.5.0 -BuildRequires: gtk+-devel +BuildRequires: gtk+-devel, automake %description Gcombust is a GUI front-end for mkisofs, mkhybrid, cdda2wav, cdrecord @@ -29,6 +29,8 @@ %patch0 -p1 -b .gcc4 %patch1 -p1 -b .desktop +# Needed for x86_64, automake can't be run here +cp -f %{_datadir}/automake-*/config.{guess,sub} . %build %configure @@ -72,6 +74,9 @@ %changelog +* Wed Mar 04 2009 Robert Scheck 1:0.1.55-15 +- Solve the x86_64-redhat-linux-gnu configure target error + * Tue Feb 24 2009 Fedora Release Engineering - 1:0.1.55-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From glommer at fedoraproject.org Tue Mar 3 23:57:38 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 3 Mar 2009 23:57:38 +0000 (UTC) Subject: rpms/qemu/devel kvm-fix-strayR.patch, NONE, 1.1 kvm-upstream-ppc.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 qemu-sasl-01-tls-handshake-fix.patch, 1.1, 1.2 qemu-sasl-02-vnc-monitor-info.patch, 1.1, 1.2 qemu-sasl-03-display-keymaps.patch, 1.1, 1.2 qemu-sasl-04-vnc-struct.patch, 1.1, 1.2 qemu-sasl-05-vnc-tls-vencrypt.patch, 1.1, 1.2 qemu-sasl-06-vnc-sasl.patch, 1.1, 1.2 qemu-sasl-07-vnc-monitor-authinfo.patch, 1.1, 1.2 qemu-sasl-08-vnc-acl-mgmt.patch, 1.1, 1.2 qemu.spec, 1.51, 1.52 sources, 1.10, 1.11 Message-ID: <20090303235738.BD2DB70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv301 Modified Files: .cvsignore qemu-sasl-01-tls-handshake-fix.patch qemu-sasl-02-vnc-monitor-info.patch qemu-sasl-03-display-keymaps.patch qemu-sasl-04-vnc-struct.patch qemu-sasl-05-vnc-tls-vencrypt.patch qemu-sasl-06-vnc-sasl.patch qemu-sasl-07-vnc-monitor-authinfo.patch qemu-sasl-08-vnc-acl-mgmt.patch qemu.spec sources Added Files: kvm-fix-strayR.patch kvm-upstream-ppc.patch Log Message: - Set Epoch to 1 - Build KVM (basic build, no tools yet) - Set ppc in ExcludeArch. This is temporary, just to fix one issue at a time. ppc users (IBM ? ;-)) please wait a little bit. kvm-fix-strayR.patch: --- NEW FILE kvm-fix-strayR.patch --- Newer gcc versions support a R"..." construct, so we can't use "abc"R"def" constructs without any space between R and the quotes, when using -std=gnu99 (that is used by the user/test code). This fixes this error: test/x86/vmexit.c:34:26: error: invalid character ' ' in raw string delimiter test/x86/vmexit.c: In function ???main???: test/x86/vmexit.c:34: error: stray ???R??? in program test/x86/vmexit.c:34:46: error: invalid character ' ' in raw string delimiter test/x86/vmexit.c:34: error: expected ???:??? or ???)??? before string constant test/x86/vmexit.c:34: error: stray ???R??? in program Signed-off-by: Eduardo Habkost --- user/test/x86/apic.c | 32 ++++++++++++++++---------------- user/test/x86/vmexit.c | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/user/test/x86/apic.c b/user/test/x86/apic.c index 9c6205b..2d963dc 100644 --- a/user/test/x86/apic.c +++ b/user/test/x86/apic.c @@ -54,14 +54,14 @@ asm ( "push %r9 \n\t" "push %r8 \n\t" #endif - "push %"R"di \n\t" - "push %"R"si \n\t" - "push %"R"bp \n\t" - "push %"R"sp \n\t" - "push %"R"bx \n\t" - "push %"R"dx \n\t" - "push %"R"cx \n\t" - "push %"R"ax \n\t" + "push %" R "di \n\t" + "push %" R "si \n\t" + "push %" R "bp \n\t" + "push %" R "sp \n\t" + "push %" R "bx \n\t" + "push %" R "dx \n\t" + "push %" R "cx \n\t" + "push %" R "ax \n\t" #ifdef __x86_64__ "mov %rsp, %rdi \n\t" "callq *8*16(%rsp) \n\t" @@ -70,14 +70,14 @@ asm ( "calll *4+4*8(%esp) \n\t" "add $4, %esp \n\t" #endif - "pop %"R"ax \n\t" - "pop %"R"cx \n\t" - "pop %"R"dx \n\t" - "pop %"R"bx \n\t" - "pop %"R"bp \n\t" - "pop %"R"bp \n\t" - "pop %"R"si \n\t" - "pop %"R"di \n\t" + "pop %" R "ax \n\t" + "pop %" R "cx \n\t" + "pop %" R "dx \n\t" + "pop %" R "bx \n\t" + "pop %" R "bp \n\t" + "pop %" R "bp \n\t" + "pop %" R "si \n\t" + "pop %" R "di \n\t" #ifdef __x86_64__ "pop %r8 \n\t" "pop %r9 \n\t" diff --git a/user/test/x86/vmexit.c b/user/test/x86/vmexit.c index bd57bfa..7339e2b 100644 --- a/user/test/x86/vmexit.c +++ b/user/test/x86/vmexit.c @@ -31,7 +31,7 @@ int main() t1 = rdtsc(); for (i = 0; i < N; ++i) - asm volatile ("push %%"R"bx; cpuid; pop %%"R"bx" + asm volatile ("push %%" R "bx; cpuid; pop %%" R "bx" : : : "eax", "ecx", "edx"); t2 = rdtsc(); printf("vmexit latency: %d\n", (int)((t2 - t1) / N)); -- 1.6.0.2.GIT kvm-upstream-ppc.patch: --- NEW FILE kvm-upstream-ppc.patch --- >From 1efd319579c8f34974d654b0a5ac5144424e693e Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Fri, 13 Feb 2009 13:00:31 -0500 Subject: [PATCH] use KVM_UPSTREAM for ppc. ppc should compile with upstream qemu code, so, put these defines in ppc specific code that references kvm functions. We don put them in config.h in this case, since there are files (like vl.c) that includes both kvm.h and qemu-kvm.h, and would break compilation. Signed-off-by: Glauber Costa --- qemu/hw/ppc440.c | 1 + qemu/hw/ppc440_bamboo.c | 1 + qemu/target-ppc/helper.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/qemu/hw/ppc440.c b/qemu/hw/ppc440.c index 00d82e4..164c326 100644 --- a/qemu/hw/ppc440.c +++ b/qemu/hw/ppc440.c @@ -18,6 +18,7 @@ #include "ppc440.h" #include "ppc405.h" #include "sysemu.h" +#define KVM_UPSTREAM #include "kvm.h" #define PPC440EP_PCI_CONFIG 0xeec00000 diff --git a/qemu/hw/ppc440_bamboo.c b/qemu/hw/ppc440_bamboo.c index fbd447c..60ddaf4 100644 --- a/qemu/hw/ppc440_bamboo.c +++ b/qemu/hw/ppc440_bamboo.c @@ -21,6 +21,7 @@ #include "boards.h" #include "sysemu.h" #include "ppc440.h" +#define KVM_UPSTREAM #include "kvm.h" #include "kvm_ppc.h" #include "device_tree.h" diff --git a/qemu/target-ppc/helper.c b/qemu/target-ppc/helper.c index fc62a63..d49acaf 100644 --- a/qemu/target-ppc/helper.c +++ b/qemu/target-ppc/helper.c @@ -29,6 +29,7 @@ #include "exec-all.h" #include "helper_regs.h" #include "qemu-common.h" +#define KVM_UPSTREAM #include "kvm.h" //#define DEBUG_MMU -- 1.5.6.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 2 Mar 2009 20:31:09 -0000 1.10 +++ .cvsignore 3 Mar 2009 23:57:07 -0000 1.11 @@ -1 +1 @@ -qemu-1.0.tar.gz +kvm-84.git-snapshot-20090303.tar.gz qemu-sasl-01-tls-handshake-fix.patch: Index: qemu-sasl-01-tls-handshake-fix.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-01-tls-handshake-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-01-tls-handshake-fix.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-01-tls-handshake-fix.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -22,9 +22,10 @@ Signed-off-by: Daniel P. Berrange -diff -r ff004fb525e7 vnc.c ---- a/vnc.c Thu Feb 19 11:26:55 2009 +0000 -+++ b/vnc.c Thu Feb 19 11:27:44 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -2096,14 +2096,6 @@ static int protocol_client_vencrypt_auth VNC_DEBUG("Failed to complete TLS\n"); return 0; qemu-sasl-02-vnc-monitor-info.patch: Index: qemu-sasl-02-vnc-monitor-info.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-02-vnc-monitor-info.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-02-vnc-monitor-info.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-02-vnc-monitor-info.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -38,9 +38,10 @@ Signed-off-by: Daniel P. Berrange -diff -r 4dbf24b567c4 vnc.c ---- a/vnc.c Thu Feb 19 11:27:44 2009 +0000 -+++ b/vnc.c Thu Feb 19 11:53:31 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -166,19 +166,136 @@ struct VncState static VncDisplay *vnc_display; /* needed for info vnc */ static DisplayChangeListener *dcl; @@ -158,16 +159,17 @@ - term_printf("VNC server active on: "); - term_print_filename(vnc_display->display); - term_printf("\n"); +- +- if (vnc_display->clients == NULL) +- term_printf("No client connected\n"); +- else +- term_printf("Client connected\n"); + if (vnc_display == NULL || vnc_display->display == NULL) { + term_printf("Server: disabled\n"); + } else { + char *serverAddr = vnc_socket_local_addr(" address: %s:%s\n", + vnc_display->lsock); - -- if (vnc_display->clients == NULL) -- term_printf("No client connected\n"); -- else -- term_printf("Client connected\n"); ++ + if (!serverAddr) + return; + qemu-sasl-03-display-keymaps.patch: Index: qemu-sasl-03-display-keymaps.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-03-display-keymaps.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-03-display-keymaps.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-03-display-keymaps.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -20,10 +20,11 @@ Signed-off-by: Daniel P. Berrange -diff -r 9ccd7a5b0382 Makefile ---- a/Makefile Thu Feb 19 11:54:21 2009 +0000 -+++ b/Makefile Thu Feb 19 13:15:19 2009 +0000 -@@ -137,6 +137,7 @@ endif +Index: kvm-84.git-snapshot-20090303/qemu/Makefile +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/Makefile ++++ kvm-84.git-snapshot-20090303/qemu/Makefile +@@ -141,6 +141,7 @@ endif AUDIO_OBJS+= wavcapture.o OBJS+=$(addprefix audio/, $(AUDIO_OBJS)) @@ -31,7 +32,7 @@ ifdef CONFIG_SDL OBJS+=sdl.o x_keymap.o endif -@@ -161,15 +162,17 @@ LIBS+=$(VDE_LIBS) +@@ -165,15 +166,17 @@ LIBS+=$(VDE_LIBS) cocoa.o: cocoa.m @@ -52,9 +53,10 @@ bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) -diff -r 9ccd7a5b0382 curses.c ---- a/curses.c Thu Feb 19 11:54:21 2009 +0000 -+++ b/curses.c Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/curses.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/curses.c ++++ kvm-84.git-snapshot-20090303/qemu/curses.c @@ -158,7 +158,6 @@ static void curses_cursor_position(Displ /* generic keyboard conversion */ @@ -72,9 +74,10 @@ if (!kbd_layout) exit(1); } -diff -r 9ccd7a5b0382 curses_keys.h ---- a/curses_keys.h Thu Feb 19 11:54:21 2009 +0000 -+++ b/curses_keys.h Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/curses_keys.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/curses_keys.h ++++ kvm-84.git-snapshot-20090303/qemu/curses_keys.h @@ -21,6 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. @@ -98,9 +101,10 @@ static const name2keysym_t name2keysym[] = { /* Plain ASCII */ { "space", 0x020 }, -diff -r 9ccd7a5b0382 keymaps.c ---- a/keymaps.c Thu Feb 19 11:54:21 2009 +0000 -+++ b/keymaps.c Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/keymaps.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/keymaps.c ++++ kvm-84.git-snapshot-20090303/qemu/keymaps.c @@ -22,34 +22,20 @@ * THE SOFTWARE. */ @@ -206,9 +210,10 @@ { kbd_layout_t *k = kbd_layout; struct key_range *kr; -diff -r 9ccd7a5b0382 keymaps.h ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/keymaps.h Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/keymaps.h +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/keymaps.h @@ -0,0 +1,60 @@ +/* + * QEMU keysym to keycode conversion using rdesktop keymaps @@ -270,9 +275,10 @@ +int keysym_is_numlock(void *kbd_layout, int keysym); + +#endif /* __QEMU_KEYMAPS_H__ */ -diff -r 9ccd7a5b0382 sdl.c ---- a/sdl.c Thu Feb 19 11:54:21 2009 +0000 -+++ b/sdl.c Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/sdl.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/sdl.c ++++ kvm-84.git-snapshot-20090303/qemu/sdl.c @@ -107,7 +107,6 @@ static void sdl_resize(DisplayState *ds) /* generic keyboard conversion */ @@ -290,9 +296,10 @@ if (!kbd_layout) exit(1); } -diff -r 9ccd7a5b0382 sdl_keysym.h ---- a/sdl_keysym.h Thu Feb 19 11:54:21 2009 +0000 -+++ b/sdl_keysym.h Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/sdl_keysym.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/sdl_keysym.h ++++ kvm-84.git-snapshot-20090303/qemu/sdl_keysym.h @@ -1,7 +1,6 @@ -typedef struct { - const char* name; @@ -304,9 +311,10 @@ static const name2keysym_t name2keysym[]={ /* ascii */ { "space", 0x020}, -diff -r 9ccd7a5b0382 vnc.c ---- a/vnc.c Thu Feb 19 11:54:21 2009 +0000 -+++ b/vnc.c Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -35,7 +35,6 @@ #include "vnc.h" @@ -327,9 +335,10 @@ if (!vs->kbd_layout) exit(1); -diff -r 9ccd7a5b0382 vnc_keysym.h ---- a/vnc_keysym.h Thu Feb 19 11:54:21 2009 +0000 -+++ b/vnc_keysym.h Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc_keysym.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc_keysym.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc_keysym.h @@ -1,7 +1,6 @@ -typedef struct { - const char* name; qemu-sasl-04-vnc-struct.patch: Index: qemu-sasl-04-vnc-struct.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-04-vnc-struct.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-04-vnc-struct.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-04-vnc-struct.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -9,9 +9,10 @@ Signed-off-by: Daniel P. Berrange -diff -r 216ec7d1e30f vnc.c ---- a/vnc.c Thu Feb 19 13:15:19 2009 +0000 -+++ b/vnc.c Thu Feb 19 13:25:09 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -3,6 +3,7 @@ * * Copyright (C) 2006 Anthony Liguori @@ -151,9 +152,10 @@ static VncDisplay *vnc_display; /* needed for info vnc */ static DisplayChangeListener *dcl; -diff -r 216ec7d1e30f vnc.h ---- a/vnc.h Thu Feb 19 13:15:19 2009 +0000 -+++ b/vnc.h Thu Feb 19 13:25:09 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc.h @@ -1,5 +1,148 @@ -#ifndef __VNCTIGHT_H -#define __VNCTIGHT_H qemu-sasl-05-vnc-tls-vencrypt.patch: Index: qemu-sasl-05-vnc-tls-vencrypt.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-05-vnc-tls-vencrypt.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-05-vnc-tls-vencrypt.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-05-vnc-tls-vencrypt.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -35,10 +35,11 @@ Signed-off-by: Daniel P. Berrange -diff -r dfa890dd7417 Makefile ---- a/Makefile Mon Feb 23 13:05:49 2009 +0000 -+++ b/Makefile Mon Feb 23 13:06:22 2009 +0000 -@@ -145,6 +145,9 @@ ifdef CONFIG_CURSES +Index: kvm-84.git-snapshot-20090303/qemu/Makefile +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/Makefile ++++ kvm-84.git-snapshot-20090303/qemu/Makefile +@@ -149,6 +149,9 @@ ifdef CONFIG_CURSES OBJS+=curses.o endif OBJS+=vnc.o d3des.o @@ -48,7 +49,7 @@ ifdef CONFIG_COCOA OBJS+=cocoa.o -@@ -168,10 +171,16 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h +@@ -172,10 +175,16 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) @@ -66,9 +67,10 @@ curses.o: curses.c keymaps.h curses_keys.h bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) -diff -r dfa890dd7417 vnc-auth-vencrypt.c ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/vnc-auth-vencrypt.c Mon Feb 23 13:06:22 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-auth-vencrypt.c +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/vnc-auth-vencrypt.c @@ -0,0 +1,167 @@ +/* + * QEMU VNC display driver: VeNCrypt authentication setup @@ -237,9 +239,10 @@ + vnc_read_when(vs, protocol_client_vencrypt_init, 2); +} + -diff -r dfa890dd7417 vnc-auth-vencrypt.h ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/vnc-auth-vencrypt.h Mon Feb 23 13:06:22 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-auth-vencrypt.h +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/vnc-auth-vencrypt.h @@ -0,0 +1,33 @@ +/* + * QEMU VNC display driver @@ -274,9 +277,10 @@ +void start_auth_vencrypt(VncState *vs); + +#endif /* __QEMU_VNC_AUTH_VENCRYPT_H__ */ -diff -r dfa890dd7417 vnc-tls.c ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/vnc-tls.c Mon Feb 23 13:06:22 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-tls.c +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/vnc-tls.c @@ -0,0 +1,414 @@ +/* + * QEMU VNC display driver: TLS helpers @@ -692,9 +696,10 @@ + return -1; +} + -diff -r dfa890dd7417 vnc-tls.h ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/vnc-tls.h Mon Feb 23 13:06:22 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-tls.h +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/vnc-tls.h @@ -0,0 +1,70 @@ +/* + * QEMU VNC display driver. TLS helpers @@ -766,9 +771,10 @@ + +#endif /* __QEMU_VNC_TLS_H__ */ + -diff -r dfa890dd7417 vnc.c ---- a/vnc.c Mon Feb 23 13:05:49 2009 +0000 -+++ b/vnc.c Mon Feb 23 13:06:22 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -34,21 +34,6 @@ #include "vnc_keysym.h" #include "d3des.h" @@ -1016,9 +1022,9 @@ vnc_read_when(vs, protocol_client_auth_vnc, sizeof(vs->challenge)); - return 0; - } - - +-} +- +- -#ifdef CONFIG_VNC_TLS -#define DH_BITS 1024 -static gnutls_dh_params_t dh_params; @@ -1062,9 +1068,9 @@ - gnutls_anon_set_server_dh_params(anon_cred, dh_params); - - return anon_cred; --} -- -- + } + + -static gnutls_certificate_credentials_t vnc_tls_initialize_x509_cred(VncState *vs) -{ - gnutls_certificate_credentials_t x509_cred; @@ -1544,10 +1550,11 @@ fprintf(stderr, "Failed to find x509 certificates/keys in %s\n", path); qemu_free(path); qemu_free(vs->display); -diff -r dfa890dd7417 vnc.h ---- a/vnc.h Mon Feb 23 13:05:49 2009 +0000 -+++ b/vnc.h Mon Feb 23 13:06:22 2009 +0000 -@@ -32,12 +32,15 @@ +Index: kvm-84.git-snapshot-20090303/qemu/vnc.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc.h +@@ -32,13 +32,16 @@ #include "audio/audio.h" #include @@ -1555,9 +1562,9 @@ -#include -#include -#endif /* CONFIG_VNC_TLS */ -+#include "keymaps.h" +- + #include "keymaps.h" --#include "keymaps.h" +// #define _VNC_DEBUG 1 + +#ifdef _VNC_DEBUG @@ -1565,9 +1572,10 @@ +#else +#define VNC_DEBUG(fmt, ...) do { } while (0) +#endif - ++ /***************************************************************************** * + * Core data structures @@ -72,6 +75,11 @@ typedef void VncSendHextileTile(VncState typedef struct VncDisplay VncDisplay; qemu-sasl-06-vnc-sasl.patch: Index: qemu-sasl-06-vnc-sasl.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-06-vnc-sasl.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-06-vnc-sasl.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-06-vnc-sasl.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -75,10 +75,11 @@ Signed-off-by: Daniel P. Berrange -diff -r 6981d4d832a9 Makefile ---- a/Makefile Mon Mar 02 11:13:33 2009 +0000 -+++ b/Makefile Mon Mar 02 11:13:38 2009 +0000 -@@ -148,6 +148,9 @@ OBJS+=vnc.o d3des.o +Index: kvm-84.git-snapshot-20090303/qemu/Makefile +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/Makefile ++++ kvm-84.git-snapshot-20090303/qemu/Makefile +@@ -152,6 +152,9 @@ OBJS+=vnc.o d3des.o ifdef CONFIG_VNC_TLS OBJS+=vnc-tls.o vnc-auth-vencrypt.o endif @@ -88,7 +89,7 @@ ifdef CONFIG_COCOA OBJS+=cocoa.o -@@ -171,7 +174,7 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h +@@ -175,7 +178,7 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) @@ -97,7 +98,7 @@ vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h -@@ -181,6 +184,8 @@ vnc-tls.o: vnc-tls.c vnc.h +@@ -185,6 +188,8 @@ vnc-tls.o: vnc-tls.c vnc.h vnc-auth-vencrypt.o: vnc-auth-vencrypt.c vnc.h @@ -106,10 +107,11 @@ curses.o: curses.c keymaps.h curses_keys.h bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) -diff -r 6981d4d832a9 Makefile.target ---- a/Makefile.target Mon Mar 02 11:13:33 2009 +0000 -+++ b/Makefile.target Mon Mar 02 11:13:38 2009 +0000 -@@ -554,6 +554,11 @@ CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS) +Index: kvm-84.git-snapshot-20090303/qemu/Makefile.target +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/Makefile.target ++++ kvm-84.git-snapshot-20090303/qemu/Makefile.target +@@ -613,6 +613,11 @@ CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS) LIBS += $(CONFIG_VNC_TLS_LIBS) endif @@ -121,9 +123,10 @@ ifdef CONFIG_BLUEZ LIBS += $(CONFIG_BLUEZ_LIBS) endif -diff -r 6981d4d832a9 configure ---- a/configure Mon Mar 02 11:13:33 2009 +0000 -+++ b/configure Mon Mar 02 11:13:38 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/configure +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/configure ++++ kvm-84.git-snapshot-20090303/qemu/configure @@ -164,6 +164,7 @@ fmod_lib="" fmod_inc="" oss_lib="" @@ -132,7 +135,7 @@ bsd="no" linux="no" solaris="no" -@@ -387,6 +388,8 @@ for opt do +@@ -403,6 +404,8 @@ for opt do ;; --disable-vnc-tls) vnc_tls="no" ;; @@ -141,7 +144,7 @@ --disable-slirp) slirp="no" ;; --disable-vde) vde="no" -@@ -544,6 +547,7 @@ echo " Availab +@@ -562,6 +565,7 @@ echo " Availab echo " --enable-mixemu enable mixer emulation" echo " --disable-brlapi disable BrlAPI" echo " --disable-vnc-tls disable TLS encryption for VNC server" @@ -149,7 +152,7 @@ echo " --disable-curses disable curses output" echo " --disable-bluez disable bluez stack connectivity" echo " --disable-kvm disable KVM acceleration support" -@@ -823,6 +827,25 @@ EOF +@@ -874,6 +878,25 @@ EOF fi ########################################## @@ -175,7 +178,7 @@ # vde libraries probe if test "$vde" = "yes" ; then cat > $TMPC << EOF -@@ -1130,6 +1153,11 @@ if test "$vnc_tls" = "yes" ; then +@@ -1208,6 +1231,11 @@ if test "$vnc_tls" = "yes" ; then echo " TLS CFLAGS $vnc_tls_cflags" echo " TLS LIBS $vnc_tls_libs" fi @@ -187,7 +190,7 @@ if test -n "$sparc_cpu"; then echo "Target Sparc Arch $sparc_cpu" fi -@@ -1371,6 +1399,12 @@ if test "$vnc_tls" = "yes" ; then +@@ -1451,6 +1479,12 @@ if test "$vnc_tls" = "yes" ; then echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak echo "#define CONFIG_VNC_TLS 1" >> $config_h fi @@ -200,10 +203,11 @@ qemu_version=`head $source_path/VERSION` echo "VERSION=$qemu_version" >>$config_mak echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h -diff -r 6981d4d832a9 qemu-doc.texi ---- a/qemu-doc.texi Mon Mar 02 11:13:33 2009 +0000 -+++ b/qemu-doc.texi Mon Mar 02 11:13:38 2009 +0000 -@@ -616,6 +616,21 @@ path following this option specifies whe +Index: kvm-84.git-snapshot-20090303/qemu/qemu-doc.texi +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/qemu-doc.texi ++++ kvm-84.git-snapshot-20090303/qemu/qemu-doc.texi +@@ -624,6 +624,21 @@ path following this option specifies whe be loaded from. See the @ref{vnc_security} section for details on generating certificates. @@ -225,7 +229,7 @@ @end table @end table -@@ -2061,7 +2076,10 @@ considerations depending on the deployme +@@ -2058,7 +2073,10 @@ considerations depending on the deployme * vnc_sec_certificate:: * vnc_sec_certificate_verify:: * vnc_sec_certificate_pw:: @@ -236,7 +240,7 @@ @end menu @node vnc_sec_none @subsection Without passwords -@@ -2144,6 +2162,41 @@ Password: ******** +@@ -2141,6 +2159,41 @@ Password: ******** (qemu) @end example @@ -278,7 +282,7 @@ @node vnc_generate_cert @subsection Generating certificates for VNC -@@ -2255,6 +2308,50 @@ EOF +@@ -2252,6 +2305,50 @@ EOF The @code{client-key.pem} and @code{client-cert.pem} files should now be securely copied to the client for which they were generated. @@ -329,9 +333,10 @@ @node gdb_usage @section GDB usage -diff -r 6981d4d832a9 qemu.sasl ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/qemu.sasl Mon Mar 02 11:13:38 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/qemu.sasl +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/qemu.sasl @@ -0,0 +1,34 @@ +# If you want to use the non-TLS socket, then you *must* include +# the GSSAPI or DIGEST-MD5 mechanisms, because they are the only @@ -367,9 +372,10 @@ + +auxprop_plugin: sasldb + -diff -r 6981d4d832a9 vnc-auth-sasl.c ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/vnc-auth-sasl.c Mon Mar 02 11:13:38 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.c +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.c @@ -0,0 +1,626 @@ +/* + * QEMU VNC display driver: SASL auth protocol @@ -997,9 +1003,10 @@ +} + + -diff -r 6981d4d832a9 vnc-auth-sasl.h ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/vnc-auth-sasl.h Mon Mar 02 11:13:38 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.h +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.h @@ -0,0 +1,67 @@ +/* + * QEMU VNC display driver: SASL auth protocol @@ -1068,9 +1075,10 @@ + +#endif /* __QEMU_VNC_AUTH_SASL_H__ */ + -diff -r 6981d4d832a9 vnc-auth-vencrypt.c ---- a/vnc-auth-vencrypt.c Mon Mar 02 11:13:33 2009 +0000 -+++ b/vnc-auth-vencrypt.c Mon Mar 02 11:13:38 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-auth-vencrypt.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc-auth-vencrypt.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc-auth-vencrypt.c @@ -43,8 +43,15 @@ static void start_auth_vencrypt_subauth( start_auth_vnc(vs); break; @@ -1098,9 +1106,10 @@ static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len) -diff -r 6981d4d832a9 vnc.c ---- a/vnc.c Mon Mar 02 11:13:33 2009 +0000 -+++ b/vnc.c Mon Mar 02 11:13:38 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -68,7 +68,8 @@ static char *addr_to_string(const char * return addr; } @@ -1340,17 +1349,19 @@ if (ret < 0) { if (ret == GNUTLS_E_AGAIN) errno = EAGAIN; -@@ -932,13 +1025,53 @@ void vnc_client_read(void *opaque) +@@ -932,12 +1025,52 @@ void vnc_client_read(void *opaque) } } else #endif /* CONFIG_VNC_TLS */ - ret = recv(vs->csock, buffer_end(&vs->input), 4096, 0); - ret = vnc_client_io_error(vs, ret, socket_error()); +- if (!ret) +- return; + ret = recv(vs->csock, data, datalen, 0); + VNC_DEBUG("Read wire %p %d -> %ld\n", data, datalen, ret); + return vnc_client_io_error(vs, ret, socket_error()); +} -+ + + +/* + * Called to read data from the client socket to the input buffer, @@ -1369,7 +1380,7 @@ + ret = vnc_client_read_buf(vs, buffer_end(&vs->input), 4096); + if (!ret) + return 0; -+ vs->input.offset += ret; + vs->input.offset += ret; + return ret; +} + @@ -1390,14 +1401,11 @@ + else +#endif /* CONFIG_VNC_SASL */ + ret = vnc_client_read_plain(vs); - if (!ret) - return; ++ if (!ret) ++ return; -- vs->input.offset += ret; -- while (vs->read_handler && vs->input.offset >= vs->read_handler_expect) { size_t len = vs->read_handler_expect; - int ret; @@ -1722,6 +1855,13 @@ static int protocol_client_auth(VncState break; #endif /* CONFIG_VNC_TLS */ @@ -1511,9 +1519,10 @@ if (reverse) { /* connect to viewer */ if (strncmp(display, "unix:", 5) == 0) -diff -r 6981d4d832a9 vnc.h ---- a/vnc.h Mon Mar 02 11:13:33 2009 +0000 -+++ b/vnc.h Mon Mar 02 11:13:38 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc.h @@ -79,6 +79,10 @@ typedef struct VncDisplay VncDisplay; #include "vnc-tls.h" #include "vnc-auth-vencrypt.h" qemu-sasl-07-vnc-monitor-authinfo.patch: Index: qemu-sasl-07-vnc-monitor-authinfo.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-07-vnc-monitor-authinfo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-07-vnc-monitor-authinfo.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-07-vnc-monitor-authinfo.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -29,9 +29,10 @@ Signed-off-by: Daniel P. Berrange -diff -r 440be37a35ea vnc-tls.c ---- a/vnc-tls.c Fri Feb 20 11:46:26 2009 +0000 -+++ b/vnc-tls.c Fri Feb 20 11:47:52 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-tls.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc-tls.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc-tls.c @@ -241,6 +241,22 @@ int vnc_tls_validate_certificate(struct return -1; } @@ -63,9 +64,10 @@ } -diff -r 440be37a35ea vnc-tls.h ---- a/vnc-tls.h Fri Feb 20 11:46:26 2009 +0000 -+++ b/vnc-tls.h Fri Feb 20 11:47:52 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-tls.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc-tls.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc-tls.h @@ -55,6 +55,9 @@ struct VncStateTLS { /* Whether data is being TLS encrypted yet */ int wiremode; @@ -76,9 +78,10 @@ }; int vnc_tls_client_setup(VncState *vs, int x509Creds); -diff -r 440be37a35ea vnc.c ---- a/vnc.c Fri Feb 20 11:46:26 2009 +0000 -+++ b/vnc.c Fri Feb 20 11:47:52 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -156,6 +156,21 @@ static void do_info_vnc_client(VncState term_puts("Client:\n"); term_puts(clientAddr); qemu-sasl-08-vnc-acl-mgmt.patch: Index: qemu-sasl-08-vnc-acl-mgmt.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-08-vnc-acl-mgmt.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-08-vnc-acl-mgmt.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-08-vnc-acl-mgmt.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -78,10 +78,11 @@ Signed-off-by: Daniel P. Berrange -diff -r b1008c5c6c16 Makefile ---- a/Makefile Mon Mar 02 11:13:40 2009 +0000 -+++ b/Makefile Mon Mar 02 12:11:04 2009 +0000 -@@ -144,7 +144,7 @@ endif +Index: kvm-84.git-snapshot-20090303/qemu/Makefile +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/Makefile ++++ kvm-84.git-snapshot-20090303/qemu/Makefile +@@ -148,7 +148,7 @@ endif ifdef CONFIG_CURSES OBJS+=curses.o endif @@ -90,7 +91,7 @@ ifdef CONFIG_VNC_TLS OBJS+=vnc-tls.o vnc-auth-vencrypt.o endif -@@ -174,9 +174,11 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h +@@ -178,9 +178,11 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) @@ -103,9 +104,10 @@ vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) -diff -r b1008c5c6c16 acl.c ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/acl.c Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/acl.c +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/acl.c @@ -0,0 +1,185 @@ +/* + * QEMU access control list management @@ -292,9 +294,10 @@ + * tab-width: 8 + * End: + */ -diff -r b1008c5c6c16 acl.h ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/acl.h Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/acl.h +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/acl.h @@ -0,0 +1,74 @@ +/* + * QEMU access control list management @@ -370,10 +373,11 @@ + * tab-width: 8 + * End: + */ -diff -r b1008c5c6c16 configure ---- a/configure Mon Mar 02 11:13:40 2009 +0000 -+++ b/configure Mon Mar 02 12:11:04 2009 +0000 -@@ -846,6 +846,21 @@ EOF +Index: kvm-84.git-snapshot-20090303/qemu/configure +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/configure ++++ kvm-84.git-snapshot-20090303/qemu/configure +@@ -897,6 +897,21 @@ EOF fi ########################################## @@ -395,7 +399,7 @@ # vde libraries probe if test "$vde" = "yes" ; then cat > $TMPC << EOF -@@ -1405,6 +1420,9 @@ if test "$vnc_sasl" = "yes" ; then +@@ -1485,6 +1500,9 @@ if test "$vnc_sasl" = "yes" ; then echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_mak echo "#define CONFIG_VNC_SASL 1" >> $config_h fi @@ -405,18 +409,19 @@ qemu_version=`head $source_path/VERSION` echo "VERSION=$qemu_version" >>$config_mak echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h -diff -r b1008c5c6c16 monitor.c ---- a/monitor.c Mon Mar 02 11:13:40 2009 +0000 -+++ b/monitor.c Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/monitor.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/monitor.c ++++ kvm-84.git-snapshot-20090303/qemu/monitor.c @@ -39,6 +39,7 @@ #include "qemu-timer.h" #include "migration.h" #include "kvm.h" +#include "acl.h" - //#define DEBUG - //#define DEBUG_COMPLETION -@@ -1425,6 +1426,85 @@ static void do_info_balloon(void) + #include "qemu-kvm.h" + +@@ -1452,6 +1453,85 @@ static void do_info_balloon(void) term_printf("balloon: actual=%d\n", (int)(actual >> 20)); } @@ -502,20 +507,20 @@ /* Please update qemu-doc.texi when adding or changing commands */ static const term_cmd_t term_cmds[] = { { "help|?", "s?", do_help, -@@ -1529,6 +1609,12 @@ static const term_cmd_t term_cmds[] = { - "target", "request VM to change it's memory allocation (in MB)" }, +@@ -1557,6 +1637,12 @@ static const term_cmd_t term_cmds[] = { { "set_link", "ss", do_set_link, "name [up|down]", "change the link status of a network adapter" }, + { "set_link", "ss", do_set_link, "name [up|down]" }, + { "acl", "sss?i?", do_acl, " [] []\n", + "acl show vnc.username\n" + "acl policy vnc.username deny\n" + "acl allow vnc.username fred\n" + "acl deny vnc.username bob\n" + "acl reset vnc.username\n" }, - { NULL, NULL, }, - }; - -@@ -2891,3 +2977,12 @@ void monitor_readline(const char *prompt + { "cpu_set", "is", do_cpu_set_nr, "cpu [online|offline]", "change cpu state" }, + #if defined(TARGET_I386) || defined(TARGET_X86_64) + { "drive_add", "iss", drive_hot_add, "pcibus pcidevfn [file=file][,if=type][,bus=n]\n" +@@ -2927,3 +3013,12 @@ void monitor_readline(const char *prompt monitor_hd[i]->focus = old_focus[i]; } } @@ -528,10 +533,11 @@ + * tab-width: 8 + * End: + */ -diff -r b1008c5c6c16 qemu-doc.texi ---- a/qemu-doc.texi Mon Mar 02 11:13:40 2009 +0000 -+++ b/qemu-doc.texi Mon Mar 02 12:11:04 2009 +0000 -@@ -631,6 +631,19 @@ ensures a data encryption preventing com +Index: kvm-84.git-snapshot-20090303/qemu/qemu-doc.texi +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/qemu-doc.texi ++++ kvm-84.git-snapshot-20090303/qemu/qemu-doc.texi +@@ -639,6 +639,19 @@ ensures a data encryption preventing com credentials. See the @ref{vnc_security} section for details on using SASL authentication. @@ -551,7 +557,7 @@ @end table @end table -@@ -1392,6 +1405,42 @@ Password: ******** +@@ -1389,6 +1402,42 @@ Password: ******** @end table @@ -594,9 +600,10 @@ @item screendump @var{filename} Save screen into PPM image @var{filename}. -diff -r b1008c5c6c16 vnc-auth-sasl.c ---- a/vnc-auth-sasl.c Mon Mar 02 11:13:40 2009 +0000 -+++ b/vnc-auth-sasl.c Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc-auth-sasl.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.c @@ -120,22 +120,32 @@ static int vnc_auth_sasl_check_access(Vn { const void *val; @@ -633,9 +640,10 @@ } static int vnc_auth_sasl_check_ssf(VncState *vs) -diff -r b1008c5c6c16 vnc-auth-sasl.h ---- a/vnc-auth-sasl.h Mon Mar 02 11:13:40 2009 +0000 -+++ b/vnc-auth-sasl.h Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc-auth-sasl.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.h @@ -30,6 +30,9 @@ #include @@ -657,9 +665,10 @@ void vnc_sasl_client_cleanup(VncState *vs); long vnc_client_read_sasl(VncState *vs); -diff -r b1008c5c6c16 vnc-tls.c ---- a/vnc-tls.c Mon Mar 02 11:13:40 2009 +0000 -+++ b/vnc-tls.c Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-tls.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc-tls.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc-tls.c @@ -255,6 +255,25 @@ int vnc_tls_validate_certificate(struct gnutls_strerror (ret)); return -1; @@ -686,9 +695,10 @@ } gnutls_x509_crt_deinit (cert); -diff -r b1008c5c6c16 vnc-tls.h ---- a/vnc-tls.h Mon Mar 02 11:13:40 2009 +0000 -+++ b/vnc-tls.h Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-tls.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc-tls.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc-tls.h @@ -31,6 +31,8 @@ #include #include @@ -706,9 +716,10 @@ /* Paths to x509 certs/keys */ char *x509cacert; -diff -r b1008c5c6c16 vnc.c ---- a/vnc.c Mon Mar 02 11:13:40 2009 +0000 -+++ b/vnc.c Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -28,6 +28,7 @@ #include "sysemu.h" #include "qemu_socket.h" @@ -754,9 +765,10 @@ /* * Combinations we support here: * -diff -r b1008c5c6c16 vnc.h ---- a/vnc.h Mon Mar 02 11:13:40 2009 +0000 -+++ b/vnc.h Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc.h @@ -98,6 +98,9 @@ struct VncDisplay int subauth; /* Used by VeNCrypt */ VncDisplayTLS tls; Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- qemu.spec 3 Mar 2009 12:55:33 -0000 1.51 +++ qemu.spec 3 Mar 2009 23:57:07 -0000 1.52 @@ -1,12 +1,18 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 1.0 -Release: 0.5.svn6666%{?dist} +Version: 0.10 +Release: 0.1.kvm20090303git%{?dist} +# I have mistakenly thought the revision name would be 1.0. +# So 0.10 series get Epoch = 1 +Epoch: 1 License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://www.qemu.org/ -Source0: http://www.qemu.org/%{name}-%{version}.tar.gz +#Source0: http://www.qemu.org/%{name}-%{version}.tar.gz +# FIXME: Say how to get the sources +Source0: kvm-84.git-snapshot-20090303.tar.gz Source1: qemu.init +Source2: kvm.modules # VNC SASL authentication support # Not upstream yet, but approved for commit immediately @@ -19,11 +25,14 @@ Patch6: qemu-sasl-06-vnc-sasl.patch Patch7: qemu-sasl-07-vnc-monitor-authinfo.patch Patch8: qemu-sasl-08-vnc-acl-mgmt.patch +Patch9: kvm-upstream-ppc.patch +Patch10: kvm-fix-strayR.patch # NB, delibrately not including patch 09 which is not # intended for commit BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel +BuildRequires: rsync Requires: %{name}-user = %{version}-%{release} Requires: %{name}-system-x86 = %{version}-%{release} Requires: %{name}-system-sparc = %{version}-%{release} @@ -35,6 +44,9 @@ Requires: %{name}-system-ppc = %{version}-%{release} Requires: %{name}-img = %{version}-%{release} +# sorry dudes, one step at a time +ExcludeArch: ppc ppc64 + #ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 sparc64 armv4l %define qemudocdir %{_docdir}/%{name}-%{version} @@ -107,7 +119,7 @@ %qemupkgdesc system-sh4 {system emulator for sh4} %prep -%setup -q +%setup -q -n kvm-84.git-snapshot-20090303 # 01-tls-handshake-fix %patch1 -p1 # 02-vnc-monitor-info @@ -124,6 +136,8 @@ %patch7 -p1 # 08-vnc-acl-mgmt %patch8 -p1 +%patch9 -p1 +%patch10 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -135,19 +149,43 @@ } if build_id_available; then - extraldflags="--extra-ldflags=-Wl,--build-id" + extraldflags="-Wl,--build-id"; buildldflags="VL_LDFLAGS=-Wl,--build-id" else extraldflags="" buildldflags="" fi +%ifarch %{ix86} x86_64 +# build kvm +echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease +./configure --with-patched-kernel --target-list=x86_64-softmmu \ + --kerneldir=$(pwd)/kernel --prefix=%{_prefix} \ + --qemu-ldflags=$extraldflags + +make %{?_smp_mflags} $buildldflags +cp qemu/x86_64-softmmu/qemu-system-x86_64 qemu-kvm +make clean +%endif + +echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease +cd qemu ./configure \ + --target-list="i386-softmmu x86_64-softmmu arm-softmmu cris-softmmu m68k-softmmu \ + mips-softmmu mipsel-softmmu mips64-softmmu mips64el-softmmu ppc-softmmu \ + ppcemb-softmmu ppc64-softmmu sh4-softmmu sh4eb-softmmu sparc-softmmu \ + i386-linux-user x86_64-linux-user alpha-linux-user arm-linux-user \ + armeb-linux-user cris-linux-user m68k-linux-user mips-linux-user \ + mipsel-linux-user ppc-linux-user ppc64-linux-user ppc64abi32-linux-user \ + sh4-linux-user sh4eb-linux-user sparc-linux-user sparc64-linux-user \ + sparc32plus-linux-user" \ --prefix=%{_prefix} \ --interp-prefix=%{_prefix}/qemu-%%M \ - $extraldflags; -make %{?_smp_mflags} $buildldflags + --kerneldir=$(pwd)/../kernel --prefix=%{_prefix} \ + --disable-kvm \ + --extra-ldflags=$extraldflags +make %{?_smp_mflags} $buildldflags %install rm -rf $RPM_BUILD_ROOT @@ -160,7 +198,14 @@ datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/* +%ifarch %{ix86} x86_64 +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules +install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules +%endif + +cd qemu install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu +install -D -p -m 0755 ../qemu-kvm $RPM_BUILD_ROOT%{_bindir}/ install -D -p -m 0644 -t ${RPM_BUILD_ROOT}/%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE install -D -p -m 0644 qemu.sasl $RPM_BUILD_ROOT%{_sysconfdir}/sasl2/qemu.conf @@ -188,6 +233,13 @@ %clean rm -rf $RPM_BUILD_ROOT +%post system-x86 +%ifarch %{ix86} +# load kvm modules now, so we can make sure no reboot is needed. +# If there's already a kvm module installed, we don't mess with it +sh /%{_sysconfdir}/sysconfig/modules/kvm.modules +%endif + %post /sbin/chkconfig --add qemu @@ -245,6 +297,10 @@ %defattr(-,root,root) %{_bindir}/qemu %{_bindir}/qemu-system-x86_64 +%ifarch %{ix86} x86_64 +%{_bindir}/qemu-kvm +%{_sysconfdir}/sysconfig/modules/kvm.modules +%endif %{_prefix}/share/qemu/bios.bin %{_prefix}/share/qemu/vgabios.bin %{_prefix}/share/qemu/vgabios-cirrus.bin @@ -284,6 +340,12 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Tue Mar 03 2009 Glauber Costa - 0.10-0.1.kvm20090303git +- Set Epoch to 1 +- Build KVM (basic build, no tools yet) +- Set ppc in ExcludeArch. This is temporary, just to fix one issue at a time. + ppc users (IBM ? ;-)) please wait a little bit. + * Tue Mar 3 2009 Daniel P. Berrange - 1.0-0.5.svn6666 - Support VNC SASL authentication protocol - Fix dep on bochs-bios-data Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 2 Mar 2009 20:23:54 -0000 1.10 +++ sources 3 Mar 2009 23:57:07 -0000 1.11 @@ -1 +1 @@ -8394aa871af278efcdec46c37f913533 qemu-1.0.tar.gz +b81c0982015b21e01fe93a1d9405def8 kvm-84.git-snapshot-20090303.tar.gz From cebbert at fedoraproject.org Wed Mar 4 00:03:51 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Wed, 4 Mar 2009 00:03:51 +0000 (UTC) Subject: rpms/kernel/F-10 drm-modesetting-radeon.patch,1.75,1.76 Message-ID: <20090304000351.417D670116@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1371 Modified Files: drm-modesetting-radeon.patch Log Message: copy radeon-modesetting from devel drm-modesetting-radeon.patch: Index: drm-modesetting-radeon.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-modesetting-radeon.patch,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- drm-modesetting-radeon.patch 3 Mar 2009 16:19:23 -0000 1.75 +++ drm-modesetting-radeon.patch 4 Mar 2009 00:03:20 -0000 1.76 @@ -1,16 +1,16 @@ -commit 524351732a7a48d274f5a4e48e004284ba673ebf +commit 530ebda60cb7270795b7edd72930ab2d0e4db102 Author: Dave Airlie Date: Tue Mar 3 18:23:22 2009 +1000 radeon: port proc debug files to new debugfs interface -commit 8030b34a3383a6b490c128b7cbafb4e1a201f5d4 +commit 94137dff359fc70b51bdf035f97cfbab7424a5ce Author: Dave Airlie Date: Tue Mar 3 15:33:52 2009 +1000 radeon: pin framebuffer and cursors dynamically -commit a00b8f579d6fafc16149902445697255062b45b1 +commit 90a014f6d04548790dbcef1932ad3d89ff12aa32 Author: Alex Deucher Date: Fri Feb 27 20:25:36 2009 -0500 @@ -18,7 +18,7 @@ Signed-off-by: Alex Deucher -commit 5ad681c0f59c99dee86781a049fc41c66ff7d3b8 +commit 9e3775d3fe8677b2f995230521fd93cd9ef69327 Author: Alex Deucher Date: Fri Feb 27 20:18:20 2009 -0500 @@ -26,7 +26,7 @@ Signed-off-by: Alex Deucher -commit 7400fdab0318a2b04d06b2cb6466e9c585d23115 +commit b3c52a1d083b846541e2b6d78c917ae00e9f04c1 Author: Alex Deucher Date: Fri Feb 27 20:15:04 2009 -0500 @@ -34,7 +34,7 @@ Signed-off-by: Alex Deucher -commit b95e633f684312ccc260112ee6a58875f2d1e143 +commit b077cde9a296856bcadb3003e746950034e929bb Author: Alex Deucher Date: Fri Feb 27 20:07:13 2009 -0500 @@ -42,55 +42,55 @@ Signed-off-by: Alex Deucher -commit 0b64b9965802b5455e9ea6a69eca2f6171235559 +commit 85a3e7390f17ba442c020dda1a47e6b6b1ce0588 Author: Dave Airlie Date: Mon Mar 2 23:51:30 2009 +1100 radeon: fixup suspend/resume hooks -commit af74fbead4da9cfd979e4092c7e1ffe912c978c7 +commit 1467208a03bb127c3882c59cbcc2818fb1076b8d Author: Dave Airlie Date: Sun Mar 1 18:25:07 2009 +1100 radeon: fix rs480 gart size -commit 1f756299d935d5a0a4beb82ddeaf0e4b2935861a +commit f3812bb92e9900be559d5d4b2098b8dcef01cce9 Author: Dave Airlie Date: Fri Feb 27 15:37:14 2009 +1000 radeon: disable kms by default for r600 -commit e92784bff2fee17c8e47f11753343d99500784a6 +commit 924db462f118847e313a1a185e93e58016866da4 Author: Dave Airlie Date: Fri Feb 27 11:51:22 2009 +1000 radeon: fixup proc hacks -commit 8e01de63b0dc4be70fbf8ce33b958d3d4c5d5748 +commit 59883501a17405b6db133066d41309db083eb722 Author: Dave Airlie Date: Fri Feb 27 11:51:08 2009 +1000 radeon: fixup module load -commit 998fa33e12ba50b16e44ad1add5b82ec11aaacfc +commit 0b8ecbca3940dc13b163ab2c46f633625d52aa72 Author: Dave Airlie Date: Fri Feb 27 11:50:50 2009 +1000 radeon: fix up ring read/write for new drm-next code -commit 84044ac6eb43ebb861b661aad772be350362dfbe +commit 6bffd54b50ca1889aea58454e39edf23e3c4ec50 Author: Dave Airlie Date: Fri Feb 27 11:50:24 2009 +1000 ati_pcigart: update pcigart for changes in drm-next -commit c44d3fa4e174f3aa95ad575e802dd2d01d0615d6 +commit ddd936403f8c89d85a6407809e93e32b050b09b0 Author: Dave Airlie Date: Thu Feb 26 22:27:21 2009 +1000 radeon: fixup writeback/ring ptrs for Kms -commit 31585bd60335dbc5e6814135add77b2228bdf419 +commit b245e49600fe885e376150d9e8adc6308408c70f Author: Dave Airlie Date: Thu Feb 26 22:00:59 2009 +1000 @@ -98,19 +98,19 @@ lots more to do -commit a9c8c80c07d3e08681cfae325e62be775eb621e2 +commit c2181284133a30bd1355b9f9463710f9ec43ccaa Author: Dave Airlie Date: Thu Feb 26 12:03:55 2009 +1000 drm/radeno: add support for r100 cp type 3 packets -commit 1111b2c28fde03d81663af3a6efa9b362c80189d +commit 62fb97e2a2e71f83c2c6c783f95a36ba19ec468f Author: Dave Airlie Date: Wed Feb 25 16:07:15 2009 +1000 radeon: fixup cs buffer re-use code to not block straight away -commit 6934826040173ca3022503534b867ba0d0bc7fe3 +commit 7da8970a24bad69684fba5713106b3c7ab69c858 Author: Dave Airlie Date: Wed Feb 25 16:06:30 2009 +1000 @@ -118,37 +118,37 @@ Totally missed this before - really helps stability -commit ae76231f773dfc8cfdf86ddfc9c34de604e07968 +commit 97c941152f9ebf9e8554d5fc9810a48c722e0c9b Author: Dave Airlie Date: Wed Feb 25 13:03:47 2009 +1000 radeon: fix IB dump end -commit 7ce70adf16692a8b8d34f8ee5018a0b26f99a176 +commit 7ce614a4e8d2c1f184de524eb5185fa0004328c5 Author: Thomas Hellstrom Date: Tue Feb 24 20:26:53 2009 +1000 drm/ttm: work around some x86 pat oddities by using mixedmap instead of pfnmap -commit bc61dd6a56ae8678dd0a68074fce63a9b58f6039 +commit a7b9422d556ac958d4a13fc03f83be4cfa39b46a Author: Dave Airlie Date: Sun Feb 22 08:22:14 2009 +1000 radeon: add module IDs -commit 2cb426ab76242230ee66c62ca56346f20dda7322 +commit 9a51f123fcf038946ee12626b2b43c51aa83ce6c Author: Dave Airlie Date: Sun Feb 22 08:19:33 2009 +1000 radeon: fixup for new APIs -commit a9156df0c323939c6a61fcf4894dc160e71b7178 +commit 60f38523ede4949f2b45ca50965b63a32d7a55ba Author: Dave Airlie Date: Sun Feb 22 08:11:33 2009 +1000 drm: fix parmeter passed to fb_release -commit 0260fc0c5544220072074582c40e3807380a40d2 +commit fb9c478ac883cbff1c1dc749c375fb530516e37e Author: Dave Airlie Date: Wed Feb 18 17:36:33 2009 +1000 @@ -156,13 +156,13 @@ this adds basic IB dumping and cleans up some code around it. -commit 693ea916ff5f7e94cb766ff3326256304a10c282 +commit c7c57bbbc13a80bfd5eec9a52111f354871d6416 Author: Dave Airlie Date: Wed Feb 18 11:12:19 2009 +1000 radeon: fix packet2 parsing + enhance debug -commit d70737eeb6002581984d34073bcfce246914ee49 +commit 7970531e80133bae363d81d2da4b71b8b058a9eb Author: Dave Airlie Date: Wed Feb 18 11:11:39 2009 +1000 @@ -173,37 +173,37 @@ It also doesn't or in the table values but sets them -commit 5efc94678c2535fa8640d6ff13a382b2de593175 +commit a8b00f79936bde4eade8eb4459fdc1bd3b1264aa Author: Dave Airlie Date: Tue Feb 17 20:57:34 2009 +1000 radeon/i2c: i2c adapter id is gone -commit 06f9316ec64614270971e9f383da9841097c6897 +commit a941fade599c2468fedcf7b2cd0c8c77f8bf9db2 Author: Dave Airlie Date: Thu Jan 22 17:15:56 2009 +1000 drm: fix radeon Kconfig -commit 6185b5baf2dea5433b9bea369e0303641c12a397 +commit 6487c16ac055816293856e42f4a6b27494876fc0 Author: Dave Airlie Date: Sun Jan 11 19:50:23 2009 +1000 radeon: add missing Kconfig text -commit 5da904a88e52d5fa0ed88f0711e5901e150185f4 +commit 1194a1b6a5adfb4e21d159e6262fded6516a32ad Author: Dave Airlie Date: Sun Jan 11 19:47:39 2009 +1000 drm: fix merge issue that messes up irq -commit c8f0b003060f81347b5efd95f6b9ea61896e823c +commit 9e76a0773ffbff58e40c6a17df4cdf4bf4503b51 Author: Dave Airlie Date: Sat Jan 10 12:40:42 2009 +1000 radeon: add getparam to get pci device from userspace -commit 0dd95dc27b9e1b4734a07ffdb3edef67069f9743 +commit 1e7b2c5e999f68698514ae89aac98513851363ac Author: Dave Airlie Date: Thu Dec 18 23:01:12 2008 +1000 @@ -212,49 +212,49 @@ This should make AGP no corrupt itself to all buggery (cherry picked from commit 55c0a3f1d3693cb5c3b65f37d4bb6e8a3c025460) -commit e08687047ae2904ad9a7f18d5c4a0ccae29727d3 +commit 4d76f7199a99c2e0ecb750387f785b1eaebc3530 Author: Dave Airlie Date: Tue Dec 2 16:38:04 2008 +1000 drop old CS -commit 00a936a692a1ff6bf365f0af46afc9e828fb989f +commit 4720290ac4b4eac08c4894f8f4a3af1276d32560 Author: Dave Airlie Date: Mon Dec 1 15:09:27 2008 +1000 radeon: update with latest CS bits -commit 95af07dde6539c225de4209c05db273e880ea576 +commit 06d79c126e9b7620c22e9e1f7587085a4cd80a2a Author: Dave Airlie Date: Wed Dec 17 06:56:36 2008 +1000 fixups post rebase -commit 8a5f2de67ec28fcc7405ce21e2a7ef096e272144 +commit 34419874038ae7769ed2d194099c9fff3edaf4e9 Author: Dave Airlie Date: Thu Dec 11 01:35:09 2008 +1000 radeon: fix agp mode when kms isn't enabled -commit 83ec342fa5e9e3cb5719e032e24ffee3107bd395 +commit 806ccc89484b97af1769039da863236fe0fccdca Author: Dave Airlie Date: Wed Dec 3 17:22:07 2008 +1100 radeon: add support for accessing disabled ROMs. -commit c2de1d12709a1d4b62eeae886e0e39e9643d5a9b +commit 83b1bbc6dd0c214ed7ec1c6938c10757245fdd87 Author: Dave Airlie Date: Wed Dec 3 17:19:02 2008 +1100 radeon: make cail do pll read/write via actual PLL functions -commit 2d46c8adbef25b641f88aff3d65b02f800df87e0 +commit 5afcc1bcba1fce92cef95d2add10e31e3edc29f1 Author: Dave Airlie Date: Wed Dec 3 16:36:00 2008 +1100 radeon: atom fixes for endianness -commit 59fd02f933dcaf66582397da6c1ba29775ef33fe +commit 6c9bf33e466b575fae492559aeb58b4a50fca46c Author: Dave Airlie Date: Wed Dec 3 20:28:05 2008 +1000 @@ -264,7 +264,7 @@ Limit the AGP aperture to the GART size, and init the registers in the right place -commit 873e8ac08c193104095ad8eea7ef82a0e0a637a1 +commit 6372a63f5886f0ad9915897c7454763fff9a3711 Author: Dave Airlie Date: Tue Dec 2 12:49:17 2008 +1000 @@ -273,7 +273,7 @@ 1. Proper PCIE fallback on PCIE cards. 2. Setup agp base + location regs properly -commit 096c5b50431252b7c4da97ae2dff057958fcfbe8 +commit 6d2e37e8b2a841435cf21b3f84771f6f531c062d Author: Michal Schmidt Date: Tue Dec 2 08:06:59 2008 +1000 @@ -281,13 +281,13 @@ fedora bz 473895 -commit 8805acf286529392cb5d762e3c13fe4752fc99c5 +commit cbacfc1d773866b46812f4353228a62b4a4021c7 Author: Dave Airlie Date: Thu Nov 27 17:14:40 2008 +1000 radeon: post any GPUs that aren't posted -commit 3aaeb0eb9d3c8e5649466c49daa6f137e3bf392d +commit 7a4223a481990da2913a93879aa2ca340a10efd4 Author: Dave Airlie Date: Mon Nov 24 15:18:31 2008 +1000 @@ -298,13 +298,13 @@ Default to 512MB gart. -commit 7286a6c07095b81cf840e801ce5c259bb27c5cfc +commit e7f054bcb58fbbe2d7786880a85e08dbac36b266 Author: Dave Airlie Date: Mon Nov 24 15:17:49 2008 +1000 radeon: add some missing feature checks for modesetting -commit 1b700f17dd7aa1be70c635df2c3d58927d6bb466 +commit 38209cc0da50eb133b51e2d69711875ec550c569 Author: Dave Airlie Date: Mon Nov 24 11:41:06 2008 +1100 @@ -313,43 +313,43 @@ we really need to read back to make sure the invalidate has happened before continuing along happily in life. -commit afa8c86da0ede04abda428cff29bf7a0959beb45 +commit ddc822c6aa51fdbd487bdb35f4dc01c643422d42 Author: Dave Airlie Date: Sun Nov 23 19:19:02 2008 +1000 drm: we have discardable now so don't do special cases -commit cdeba005b811feadbca4bc2ae04074667970fa3e +commit c53d3fc833d7a3d43bc0f11ff9b8629951030fc7 Author: Dave Airlie Date: Fri Nov 21 14:52:25 2008 +1000 atom: fix bug in parser for MC reads -commit 66c8cfc772891e32675284140a3a433e7b0b28ee +commit eaeb53584e742bb8f39452bdf5066288d16944c9 Author: Dave Airlie Date: Mon Nov 17 18:14:28 2008 +1000 radeon: turn of VRAM zeroing by default for now - needs work -commit b8188080027b33999a7f6ed8fb057b1022cf1964 +commit d317233942f882cd38c6e4f39ccebde83fb8252a Author: Dave Airlie Date: Mon Nov 17 09:03:36 2008 +1000 radeon: fix return value for no relocs -commit 7ebb2b80e42486ad7a602711686882bcdefd1b03 +commit 8e80852b53071e4f0d0495bb9411b20440afce21 Author: Dave Airlie Date: Mon Nov 17 09:03:01 2008 +1000 ttm: add discard for VRAM buffers -commit 8ccf604d48fe78d64cd65c6d21ee5a7369c5128d +commit 14d8ad7615dc6ab2ec80f80d36845dca35bc9c1b Author: Dave Airlie Date: Fri Nov 14 15:52:32 2008 +1000 drm: fix the exit path of the bo unlocking -commit c8fa1c195d32f655c76a7f26525d9b2ce6fe3100 +commit 23e70d6d449c16add33986b8c5bce488510187e3 Author: Dave Airlie Date: Fri Nov 14 15:51:44 2008 +1000 @@ -357,43 +357,43 @@ Fixup failure paths and make EAGAIN work -commit b2df8c57345d9e6a00703919fda8cd72c336e5c7 +commit 31c76808cf764d3149aa122f7cae5fcf6c0368da Author: Dave Airlie Date: Thu Nov 13 17:22:26 2008 +1100 radeon: fix some issues since last rebase -commit 4605ef95364d678c98d65266a01706c08e5b1038 +commit 0975896cb6309eb31ead28e3b84a47b192ef8f8c Author: Dave Airlie Date: Wed Nov 12 09:01:14 2008 +1000 radeon: fix more build -commit 2ac8351316d5473cc32310935c7d4191d03abd0c +commit 9df9c5489aaaa72aac2f686cf2ecc1738697cd13 Author: Dave Airlie Date: Wed Nov 12 08:59:04 2008 +1000 radeon: fix compile -commit 306704a2546f0348baa6dd315eba18689634f169 +commit 1935ebe68b7d987144dac01cf263cb67d7b61eb8 Author: Dave Airlie Date: Mon Nov 10 14:26:11 2008 +1000 radeon: add gart useable size to report to userspace -commit 3c2e8c0edaa91cf5c3fe0c068d2b09e1a3ca2d74 +commit fcf26b671d65006185a5e85c085b4f56a17bc40e Author: Dave Airlie Date: Sun Nov 9 20:34:49 2008 +1000 radeon: fix powerpc oops on rv280 -commit d494ddd76e9854271b0450b639cb86f98322fbd8 +commit ed12e1f95ae0ec0dbd2f070a9c9aba8458c0ee30 Author: Dave Airlie Date: Sun Nov 9 10:23:43 2008 +1000 radeon: upgrade atom headers -commit 1024b6c2e271ca0e8b9a40e0d7c6efd2f80e9693 +commit 2a2f22fff71d5e6a541308580d0adaf9b204c203 Author: Dave Airlie Date: Sat Nov 8 14:39:41 2008 +1000 @@ -402,13 +402,13 @@ For some reason reading the SCRATCH reg from RAM causes some race to occur. Hopefully fix this. -commit 048210aa7ce3b576b7a34118c6033c7b9381a0b3 +commit 378c5388ccb236ee3240faf739b934b6466ce48d Author: Dave Airlie Date: Sat Nov 8 11:31:03 2008 +1000 drm/radeon: add dpms connector functions -commit d7ef2f22d2aac321ab30460dcd0d4cdb535dd0f4 +commit 8874fab9be9deee2b8109acf568417397446b5d8 Author: Dave Airlie Date: Fri Nov 7 16:22:22 2008 +1000 @@ -416,13 +416,13 @@ fixes cursor on second head -commit 7ea01d017da6cd05faad375266e3f7e3443dd944 +commit f033c058fa0b4af501491c05906b1d3505847b91 Author: Dave Airlie Date: Fri Nov 7 16:21:03 2008 +1000 modesetting: set the crtc x,y after the mode base change -commit 321bdb5497693498bea1d8c1a74e6ce0a974f7a6 +commit 40c30db9197e8d856be1b30162f36b345b9285a0 Author: Dave Airlie Date: Wed Nov 5 10:23:35 2008 +1000 @@ -430,31 +430,31 @@ This allows re-use of uc/wc marked pages -commit 98cbdd3d71b2aa667131120d7407d2692594bf23 +commit 6a0cdd3e68cf584fa049a4ca5d563bcf648528bb Author: Dave Airlie Date: Tue Nov 4 13:18:02 2008 +1000 radeon: disable HDP read cache for now -commit d34012fa1e78c7de57885344fda07eea1102d679 +commit 34a9abac05a42b2fe3fc61e5ef433a459175c67e Author: Dave Airlie Date: Mon Nov 3 15:43:08 2008 +1000 radeon: fixup vram visible calculation to take a/c pinned objects for now -commit 4ee3b8fa2c163aa8977be6b5f535a33d65cce5c7 +commit 4bb932122181b01f6c9598b37d87896f2dd08251 Author: Dave Airlie Date: Mon Nov 3 09:56:02 2008 +1100 radeon: if modesetting state is unknown make it known so pm-utils can use it -commit f57066dcbdf89318364f0cad971463d85cfe0a7a +commit 15d3023e3200b8cd61cb5cab9fdd42880563b7c1 Author: Dave Airlie Date: Fri Oct 31 14:40:12 2008 +1000 radeon: fix ROP values for the paint ROP -commit 05d6ca90026d28af5039df38566cd52100c2f937 +commit c26cb17a3308014f2c3cd77ddd9849b91eb5eddd Author: Dave Airlie Date: Thu Oct 30 14:00:39 2008 +1000 @@ -462,43 +462,43 @@ This speeds things up a bit -commit dc2646c5817c5d82e55ae3d103932319b9caff3d +commit 03ad11c816f8f4a99423bf4fe45af82bc13cc2da Author: Dave Airlie Date: Thu Oct 30 14:00:15 2008 +1000 radeon: disable AGP for certain chips if not specified until we figure it out -commit 3c4ae383c1c191afbc559a1d1b81046cff513a25 +commit df9a3e9a9305c438261bab921e891f31dc4b4d4d Author: Dave Airlie Date: Wed Oct 29 15:45:47 2008 +1000 radeon: disable debugging message -commit 4a0ab548b2cc20593f1d81e7d65b04513df7d8f4 +commit 60db5b10e74468bcbf5da9d83b618b2b2a532314 Author: Dave Airlie Date: Wed Oct 29 15:37:32 2008 +1000 radeon: commit ring after emitting the buffer discards -commit 2c90d107eac0f3339517b47786e2b8485314ec24 +commit d3d385a4ce61e739c99775abfd71f9c551cb7c1b Author: Dave Airlie Date: Wed Oct 29 17:39:27 2008 +1100 radeon: fix whitespace in encoders C file -commit 3e60a385f4f5a9632b53ef6c3854442e817b20ce +commit 1b80b8ce54866549864ea7537bf9bcd41a42435f Author: Dave Airlie Date: Wed Oct 29 17:39:08 2008 +1100 radeon: add more HDMI bits -commit bb027cf8766950ad9a9e013d7c54b9505cefa0fd +commit 0cb9877beb8853d82d6c616cef04e19ede211c46 Author: Dave Airlie Date: Thu Oct 30 01:41:34 2008 +1000 radeon: set dma bufs bo type to a kernel type -commit 3799ce64d28ef5bfad2e10872bf5c4ccd540d83e +commit bc9022f02add7be1cfa408fd4f384e1046034b7b Author: Dave Airlie Date: Wed Oct 29 15:46:16 2008 +1100 @@ -506,19 +506,19 @@ This allows the rs690 to work on DVI -commit 6fd4548676f3a2ac6666fb0e2e64b9d614e86f3c +commit 4ccc4381b1552e8c09c98c22313d2a262674eb77 Author: Dave Airlie Date: Tue Oct 28 20:33:13 2008 +1000 radeon: setup isync cntl properly -commit 9956146db34b48b8f869c3f6d877d5ef521c2d7a +commit b53ed2d3b13b18dff7fe72b4c887da2ecc893d24 Author: Dave Airlie Date: Tue Oct 28 20:31:27 2008 +1000 radeon: add more debugging -commit dbba800897d651db0a4de9bff3d6b606b38b0a2e +commit c5560f48a686d676b8b2bd4373b269f4079a7698 Author: Dave Airlie Date: Tue Oct 28 20:26:04 2008 +1000 @@ -526,79 +526,79 @@ emit in 16-dword blocks, emit irqs at same time as everything else -commit 160aa200a369758fe6f4ba7f43c75675688c8953 +commit f347973b04c9b9c19f6c18d0f7209cb281886186 Author: Dave Airlie Date: Tue Oct 28 16:46:47 2008 +1000 radeon: add proc debugging for interrupts/ring -commit 821cec4393683debfba0d030fdc365f486f7ae83 +commit cc776b8878587444a48c67f45306fe00baec1f17 Author: Dave Airlie Date: Tue Oct 28 16:44:54 2008 +1000 radeon: only enable dynclks if asked for -commit d94846ab1af691474b14627bf8c3a7d8c0150d1a +commit c262cf05d9987c52e6dbdac4e11496250b57f0c2 Author: Dave Airlie Date: Tue Oct 28 06:35:10 2008 +1000 radeon: add wait rendering API -commit 35b09aed9162e407c937f72768f204f2c2860516 +commit 52666e2b54456464d607657ef954bece3e200f5f Author: Dave Airlie Date: Mon Oct 27 18:30:15 2008 +1000 radeon: remove unused gem indirect ioctl -commit 1fe4e61ce03b86ff66192e77719176efca860d19 +commit 213772d83f4a0c6c512918b048c57779a5c4dbf8 Author: Dave Airlie Date: Mon Oct 27 16:41:09 2008 +1000 radeon: fix some warnings -commit e2c82216bf147ed10ca9a3a7d5d50f9235d62120 +commit e0d84e24c7d580e899a0b8f2e6438363048846db Author: Dave Airlie Date: Mon Oct 27 16:40:34 2008 +1000 radeon: fix free after refcount -commit 4db039f8b597dcb107d25b3b05b362a3caf5d10f +commit 972acd5889f79e7ceeabeb804e5fe31ce38bd407 Author: Dave Airlie Date: Mon Oct 27 16:40:15 2008 +1000 radeon: CS2 make it all work with new relocs style -commit d8e9ea24f654a29308d23a54a1d33011be8a218f +commit f5449c628e2049e7657b18cf4a4123cdab228a1f Author: Dave Airlie Date: Mon Oct 27 16:39:12 2008 +1000 radeon: don't copy to user the cs ids -commit 783fa21c9964b87a80c8406a960b3ca0842224d7 +commit f66721f00949a896f493ebeffe7148a305c2b2cf Author: Dave Airlie Date: Mon Oct 27 14:23:22 2008 +1000 radeon: make new CS2 command submission interface port older interface to this -commit e72caa6c581bcb26ccf29c19c600e58b98c98f54 +commit a44e4e0a1e084785042ffdf1e97eaf3af0b30bfc Author: Dave Airlie Date: Thu Oct 23 19:13:50 2008 +1000 radeon: release agp on module unload -commit 536d02eb3d827cdba89b49ade70a073012d74469 +commit ddccc38b3afb9d2090008780e071db9948469cad Author: Dave Airlie Date: Tue Oct 21 14:15:23 2008 +1000 radeon: add r423 bits to modesetting -commit c815792c660609d64283140d3480f1bc2dee3038 +commit 83b961482de5b0e6be6705e2989a6cfb1c0adabc Author: Dave Airlie Date: Tue Oct 21 14:12:38 2008 +1000 radeon: pull bus master enable into its own function -commit 4b61a396680b8840608cdd2a5b532add60b65996 +commit d4dc3b34b530f2dac7a56df91116637a83ca2055 Author: Dave Airlie Date: Mon Oct 20 14:44:23 2008 +1000 @@ -607,67 +607,67 @@ We actually were passing accessible to userspace, but I thought the code sized it correctly, however it doesn't seem to. -commit fe11daf2e51a19bd46e044cd3a8de6410dcda14f +commit 1fb2de1a359dfa8e1ea8dfadc1a94c01250aef33 Author: Dave Airlie Date: Mon Oct 20 13:41:05 2008 +1000 radeon: update proper chip family -commit 839f2006146cd5b16bbe6bb0e2286d86813ccbe0 +commit 264ba20f3620ab4c090ab447eab66d02927d6c60 Author: Dave Airlie Date: Mon Oct 20 12:08:50 2008 +1000 radeon: fixup scratch register interactions properly -commit 951db4d5d1e0c3c4a99335300e4828213f786c41 +commit 4858a9cac51ec6d0bc258a67f0e7fba3c21f5ff0 Author: Dave Airlie Date: Mon Oct 20 10:27:50 2008 +1000 radeon: make writeback work again -commit bf3e23b5d45b797abd7af1eb868ad54d48f37b3d +commit 8d5960697f5b711d4c16a0c2c4d468cb0cfbe01e Author: Dave Airlie Date: Mon Oct 20 09:20:23 2008 +1000 drm: cleanup some warnings -commit 4c77d01ee54680c39cea44212f0426236c24c24d +commit f3cdefa036efeca3781c1da1d5ee46cb06eb50c7 Author: Dave Airlie Date: Thu Oct 16 16:29:08 2008 +1000 radeon: fix small typo in agp code -commit 879bdb0f9f099cdcabdda4e1c44d552d9e10784f +commit 5ee89d9254e5ad17214c808440e5b28c51303b92 Author: Dave Airlie Date: Thu Oct 16 16:17:01 2008 +1000 radeon: workaround failure to parse some rs48x edid -commit 23f95fb74987a341c7a9e584080387a44b647b90 +commit 1a25b0ccaee1420ad9284221889b21b223ccda26 Author: Dave Airlie Date: Thu Oct 16 16:15:08 2008 +1000 radeon: don't enable dynclks on rs48x -commit e01b7703d2db0a9a0f9b61b718fdc3429468bcf8 +commit 3c06bb33a5c49967d6279b6363b7b89cf303260d Author: Dave Airlie Date: Wed Oct 15 15:12:20 2008 +1000 radeon: allow r100/r200 modesetting to be forced on by users -commit 311d3793f954c18f057228598102c7fc84de8845 +commit 8fa11541b7db471c49851a3494b881bad0dfb0f0 Author: Dave Airlie Date: Thu Oct 16 22:06:00 2008 +1000 radeon: fix unused agp functionality -commit e743d40bbd3b32b653d70284b753addf3e59a691 +commit 26585d469919eadfc328a565f79ed4b1f091bc13 Author: Dave Airlie Date: Thu Oct 16 22:05:02 2008 +1000 radeon: add some more r100 support to test AGP -commit 2754bed358b786963626aae3eed9c7ded8367918 +commit ff5214e476bd122ee31167b06a82dd825ed8c93c Author: airlied Date: Wed Oct 15 23:58:03 2008 +1000 @@ -675,55 +675,55 @@ This add agpmode command line option. -commit 1beab2c935821231a4bb2376b8fd4d4888b467dd +commit 440c9ac360813e0cacd0eb48a30306238e988f7c Author: airlied Date: Wed Oct 15 23:57:21 2008 +1000 radeon: add CS support for r100/r200 in 2D driver -commit 73bcf7317b9a10b180954ce69fdd1d804d35aaff +commit 095829a2618c8fa55e9acfbebe1686419a589747 Author: Dave Airlie Date: Thu Oct 9 16:37:23 2008 +1100 radeon: fixup interrupt suspend/resume -commit db9a5648f16a4fbfe039f75cafe662927b50c8fa +commit 128687b2dca9d492f304ecfec0cdd35c8afdde4c Author: Dave Airlie Date: Wed Oct 8 16:57:12 2008 +1000 radeon: fixup suspend/resume bus master enable -commit 8994ad8f6134d1855505713da727e2b4b0a70533 +commit 0096b1658d9971bda8a3a54e6aa5e9660c7a975e Author: Dave Airlie Date: Wed Oct 8 16:56:04 2008 +1000 radeon: re-enable hw blits for copying from VRAM -commit 40901646936050107de6806dd03df2f8084e49ef +commit 9e3a62b5883478c938c98cc587300b2cc943f758 Author: Dave Airlie Date: Wed Oct 8 16:53:43 2008 +1000 radeon: fix buffer copying for VRAM->TT -commit afe53045b97dd95194c08df4bef47ef57ae9c430 +commit 4ed9a1e27cfc586315d028079fa53ba26d92f0af Author: Dave Airlie Date: Wed Oct 8 16:51:58 2008 +1000 radeon: move memcpy until after CP is stopped -commit 74b121b24b228c71befca26b8082d6629b40d33b +commit fbb367da6c240e067e0d3b7a9f8390ca1543ef9f Author: Dave Airlie Date: Tue Oct 7 16:34:12 2008 +1000 drm: remove stray debug code -commit e8a47c4a6da7a867d63ff658b2e682c28e492b90 +commit 8901c452c43d38b0cd1b613ea22a72142e232360 Author: Dave Airlie Date: Tue Oct 7 16:31:22 2008 +1000 radeon: use discardable flags on no backing store objects -commit fbf26dbd2be401dc21f01250733e028f5516cc13 +commit a100ca41b73b6f05de0620eebfe6a15660481423 Author: Dave Airlie Date: Tue Oct 7 16:30:09 2008 +1000 @@ -732,7 +732,7 @@ This discards memory contents on suspend/resume with the hope the upper layers know something we don't. -commit d0a09ef8bcadaeb71f5a37dabc223e582c39d656 +commit e1140a231e92ca8dfb15c3dc46a817aeaddf33ce Author: Dave Airlie Date: Tue Oct 7 16:27:31 2008 +1000 @@ -741,7 +741,7 @@ This enables the evict code and also sets radeon up to allow evict from VRAM to LOCAL -commit e032c0e614dffbf020ba58dd8556d9ab50449044 +commit c9157f564debde3def64916cfaa42a45c4609cb3 Author: Dave Airlie Date: Mon Oct 6 16:20:38 2008 +1000 @@ -749,25 +749,25 @@ fixup the interface between gem and ttm for alignment. makes Xv work better -commit 8341e1433a87a91c0e73a226199f04fcbf8eec75 +commit 45370b4592d7943960ac37e083cd37054f024230 Author: Dave Airlie Date: Wed Oct 1 11:27:02 2008 +1000 radeon: fixup GEM pinned offset retrieval for mesa -commit a4c4cd3a1e6459b2204ddb809c2f14dcb52a47f5 +commit 48552e7950f3f963497fd1c5891b6a677d9f6e32 Author: Dave Airlie Date: Wed Oct 1 11:25:54 2008 +1000 drm: fixup clean flag handling properly -commit 67dd695c4a0fd24f8e86620649287bdd22610c7c +commit 57e3502013a0aa7575aebbaa639797054a907136 Author: Alex Deucher Date: Mon Sep 29 14:57:11 2008 +1000 radeon: use atom for ext tmds on r4xx -commit 7f5a8447d2c8412945d04ceae0b0858412003a45 +commit 7e8952e96a6cc310537345ecbe2cd75da73b7e11 Author: Alex Deucher Date: Mon Sep 29 14:56:32 2008 +1000 @@ -776,37 +776,37 @@ default is legacy modesetting. pass module option r4xx_atom to try using atom on r4xx. -commit 44bd0c08a9c47995623c71e86baa5fea8b2c8ca7 +commit 860be8961e8d620132444d1d29aef2a9a4ad7d4b Author: Alex Deucher Date: Mon Sep 29 14:55:16 2008 +1000 radeon: first pass at using atombios on r4xx hw -commit 3ae49d9117d14d0d29eb15cc2d7f2d1226631fd6 +commit 84391eb5492b737a89056685cd98e96ad13869b5 Author: Dave Airlie Date: Mon Sep 29 14:50:47 2008 +1000 radeon: add r600 modesetting registers writes -commit 7647937983b5863301ae9c39869da6f2ad2c1750 +commit 9583df7aaaee24596129ef729120d1c2b35a3476 Author: Dave Airlie Date: Mon Sep 29 14:45:11 2008 +1000 radeon: parse object tables for connectors on r600 -commit 1f84e50713ff57e2740afb5c122839ad10d9f75e +commit 6b39bf511cc27bc11312e5cefeefbf3a9fba43c5 Author: Dave Airlie Date: Tue Sep 23 16:34:55 2008 +1000 radeon: fix minor cursor disappearing issues -commit 87ec501bf82790266b6920f5c002989b077d3a4d +commit c1d4bdd0c385e90105143bd1d620b8f2a9f7f6f9 Author: Kristian H??gsberg Date: Mon Sep 22 18:40:36 2008 -0400 radeon: Fix type in check for tmds type. -commit f6699ef22d1e39fa79fdf1c2c7698079940e02fb +commit 06574fb18d2ca60cc6e58acbec22e4bd449e341e Author: Kristian H??gsberg Date: Mon Sep 22 12:00:57 2008 -0400 @@ -815,31 +815,31 @@ This lets us defer handle creation until userspace acutally asks for one, at which point we also have a drm_file to associate it with. -commit 589131727992bbe016092908ca48d3b05bf9dc00 +commit f2507f12d8f4c382a54a7da6a74cbf37be4a5793 Author: Dave Airlie Date: Sun Sep 21 09:48:51 2008 +1000 drm: fixups on top of rebase -commit 7d5c9ce894428539fd7ef6fd5726fb9bb5a621b9 +commit 56e3cf3a3d201ed4602a96c8fdff87e35d4a32db Author: Dave Airlie Date: Sat Sep 20 03:08:05 2008 +1000 radeon: rmx_fixup() fixes for legacy chips -commit 6c3e06da2b817a845225392a8608b8557b60421f +commit b70aca6a8549f814db246315e82cdc87795b623f Author: Dave Airlie Date: Sat Sep 20 01:55:27 2008 +1000 radeon: fix combios -commit 3f6f785f6f8b0a72c654951b25204dfd93e4bdb1 +commit a2f06c804d190c6476cfd1abe8e8503fedd5d268 Author: Dave Airlie Date: Fri Sep 19 09:17:36 2008 +1000 radeon: port Alexs patches from modesetting-gem -commit 161c22fa2186e3fa7db8381bb3334e524387f9c3 +commit 62b4767e33a506d258c417f24d89a65bb8c3db3d Author: Kristian H??gsberg Date: Thu Sep 18 16:10:29 2008 -0400 @@ -848,7 +848,7 @@ Shouldn't trigger under normal use and when something breaks, it will be easier to debug. -commit b500d9b81ba5999db43886233b93e1bfba31d0e6 +commit 9748274d5cb475d0070aa4a6ebcca3cd9c01bac2 Author: Kristian H??gsberg Date: Thu Sep 18 16:07:50 2008 -0400 @@ -857,25 +857,25 @@ The X server emits writes to R300_DST_PIPE_CONFIG for R420 chipsets during accel init. -commit 337315f2036421b749be4145dbc63ff8ea09e674 +commit f0139a8561825602d13f7db03df1cd55e1a6ae4f Author: Kristian H??gsberg Date: Thu Sep 18 14:53:46 2008 -0400 radeon kms: Get precedence right when computing PLL values. -commit b8606c6ea9b8a63e4ecf76086d89a36a3de22319 +commit aba6727dcca8f179117c12eff295f3ebf8f248e0 Author: Alex Deucher Date: Thu Sep 18 09:55:14 2008 +1000 radeon: further LVDS fixes -commit e76302a5f42fa6812f6ea8785bb307957ea30ee8 +commit b9d55758b0826639ba3fe72cad57b058e2780646 Author: Alex Deucher Date: Thu Sep 18 09:54:12 2008 +1000 radeon: legacy lvds updates -commit 07bc67c9aac0139512cbc8fd5d55b15e3a9fed4d +commit 1ebe28497ea9188843de5baf0cf14e19b228ba02 Author: Dave Airlie Date: Thu Sep 11 18:26:27 2008 +1000 @@ -883,7 +883,7 @@ just fallback around busted stuff for now -commit f781d45bd419e3423e7ae338e03e4c7e0c879bfb +commit 08d6b4048ee7743d7469bc988bfeeec9bca081f6 Author: Dave Airlie Date: Thu Sep 11 18:25:18 2008 +1000 @@ -891,13 +891,13 @@ also dirty buffer on validate -commit df5bf9958b71faceff5df21f3e37b42ca65b93cf +commit 407b481e2af8f876f238a94bb6258a87c9cd48b5 Author: Dave Airlie Date: Thu Sep 11 17:13:32 2008 +1000 radeon: disable blit moves -commit f73e16c27c4f864231da713e0693fde5ab233851 +commit f3101d1a95bbbd347b6433502b11bf9ea1a0b07f Author: Dave Airlie Date: Thu Sep 11 16:18:27 2008 +1000 @@ -905,67 +905,67 @@ Normally this will be due to an AGP driver needing updating -commit 86fc48dea0d9e2763caf9c75c63dc482185ac004 +commit 2b454520d131713a53235707f7dbecaa37105f44 Author: Dave Airlie Date: Wed Sep 10 14:35:43 2008 +1000 radeon: do proper memory controller init and setup -commit f1fc7ac815271b26f63406fe480472e0c720c3c6 +commit 627f0ec5f62d18a423cbe7b1fd448bfda6f5279d Author: Dave Airlie Date: Wed Sep 10 14:35:08 2008 +1000 radeon: fix return value -commit 82e785236c4cb5040bd01a4489b75139383767b7 +commit e54053ead9e59ea1799c4f419531f89a31c0bec6 Author: Dave Airlie Date: Wed Sep 10 14:34:39 2008 +1000 radeon: fixup reference counting properly -commit b580361d2907dd914dfdd3b197699500da571163 +commit d149bb5bb9307577dd1470b80cb5207a03d99400 Author: Dave Airlie Date: Tue Sep 9 15:55:38 2008 +1000 radeon: sort out atom vs combios tables for r400 cards -commit 3b6037a2893f245ad92471de9ffae30ada10221a +commit d48d723f3a2fdbf138f32a447953de7b00b0be2c Author: Dave Airlie Date: Mon Sep 8 11:37:26 2008 +1000 radeon: remove unneeded debugging -commit ebc2390b8f6d1bb1e5e9f072a2e81fc0a6c5e12f +commit 0f686ebe654b9ef686485a702544ff035fe7b150 Author: Dave Airlie Date: Mon Sep 8 11:25:12 2008 +1000 radeon: don't do full edid for detection purposes -commit ee0dc245a4087ccc52f7d37b4a4587e9349c9f11 +commit ee738d7ba56f5f3f88886ce773a48fb59a9247c6 Author: Dave Airlie Date: Mon Sep 8 10:27:48 2008 +1000 radeon: disable debugging that sneaky itself on -commit a47ee92fae6e836dd97ef93a87c391530ddfe077 +commit 05932fb2b8f9cb6833a90ed29bead5a020a636a5 Author: Dave Airlie Date: Mon Sep 8 10:20:44 2008 +1000 radeon: make text reserve 256k -commit 360cf8bcb4dd21c8fb0ce1d8cb61a60bed22d8ed +commit 7e4d33d613d9b25fe9214d92b36867e94f094086 Author: Dave Airlie Date: Mon Sep 8 10:11:27 2008 +1000 radeon: don't disable VGA bits it breaks X later -commit 2acb0b21203126628428a191e254345f26a43880 +commit 62b45cdc700cc151d7649ff7b2683d05d0dad12b Author: Dave Airlie Date: Fri Sep 5 16:12:59 2008 +1000 radeon: further suspend/resume support -commit d640f43a290671bcb335f0df25bfb2911181b15c +commit d9c0e6a6e5498c8e2411cdd02c89d126231e9cb4 Author: Dave Airlie Date: Fri Aug 29 14:52:15 2008 +1000 @@ -973,13 +973,13 @@ this gets us back to fbcon.. its dirty like zebra -commit d6d9db1ee88aa96853edca09312740a5aff6e182 +commit 69cdec7204a757ffa41a8daa6ac980aef624a373 Author: Dave Airlie Date: Fri Sep 5 11:15:03 2008 +1000 radeon: only enable KMS for radeon on x86 for now -commit c9f0970bdc6887ab58da8b910d7ce8614b4da637 +commit 4be0ae7f7cf0cf38e8332dc5fd2c8a164273486f Author: Dave Airlie Date: Fri Sep 5 10:46:17 2008 +1000 @@ -987,13 +987,13 @@ Allocate the rs480/690 tables from uncached memory. -commit 25c6adce07473548b38cb838e2bbaed2aa4966af +commit 168eb546f6345fa24a40396c6fb28e8d9ffe2dba Author: Dave Airlie Date: Thu Sep 4 11:58:08 2008 +1000 drm/radeon: fixup some avivo/rs690 checks -commit 3e2795c0cbf44c3fd9dc86504c25dbe197a95ac5 +commit e091dd6b9db6596cd268de49b1f36f8d371d5887 Author: Dave Airlie Date: Fri Aug 29 09:59:02 2008 +1000 @@ -1001,7 +1001,7 @@ also change name from text to nomodeset -commit 4e98189e3b026947a0b984e651f6aec1c6bb8b3e +commit 314068483ffdca3fc27f17feb017d21ce13c9f96 Author: Dave Airlie Date: Thu Aug 28 21:22:27 2008 +1000 @@ -1009,13 +1009,13 @@ also don't explode on lack of DDC -commit cea4f4cbb67046297892d6d09cd7ef40eb7b9284 +commit da7b7848848cbe62e028dc40de5f00967e178725 Author: Dave Airlie Date: Thu Aug 28 18:31:50 2008 +1000 drm: fix dev->master convert -commit 1f7bfecea0e267a55f6cae69488656317d876fbb +commit 81e87bd01ed1555628363eae65fe0fd00efb9e93 Author: Kristian H??gsberg Date: Wed Aug 20 11:24:13 2008 -0400 @@ -1027,43 +1027,43 @@ Signed-off-by: Kristian H??gsberg -commit d3563f5774ecd2995f07cf6ae65c7b443af4edb8 +commit 7e3adb457f625f303bb9b9293a0810c9e05bea9f Author: Dave Airlie Date: Thu Aug 28 16:38:49 2008 +1000 radeon: fix LVDS on atombios - typos -commit 7e9a1b11d3f380d8e167c88a12a97bab45401e85 +commit da4a6c203ca8a62b2ba7754dd2531b290a3ff927 Author: Dave Airlie Date: Thu Aug 28 12:01:53 2008 +1000 radeon: limit LVDS to first CRTC for now -commit 669e89d0ede8dccbf7b162ab6728f7dbb12c54c2 +commit fa4d17e8bf619bc7df43f54f04407aaad596c00d Author: Dave Airlie Date: Thu Aug 28 12:01:38 2008 +1000 radeon: fixup checks for crtc in dpms path -commit 2eb96e92145ec1f54048276d22bc005d5a0d0559 +commit fe560fafe3b5f3401661b160e05fb3dd06afc068 Author: Dave Airlie Date: Wed Aug 27 15:39:17 2008 +1000 radeon: fix after rebase -commit 23e85e41320de308b763c7ec4b97ff7e2384ca27 +commit db6498b03a2a057514cbaad0199543e9cc439883 Author: Dave Airlie Date: Wed Aug 27 13:43:04 2008 +1000 radeon: avoid oops on encdoers with no crtc set -commit 7c2ff69869a6908634e2993f73fb75052efe4044 +commit 998d6feb8de1a21188f14795b4811766d3e03364 Author: Alex Deucher Date: Tue Aug 26 17:23:21 2008 +1000 radeon: fix warning from radeon_legacy_state removal -commit 4dd47d364b988d067a4f4de78cd13b53275a62d2 +commit 954b62d3a28fd0ec13381b00c12633f88add1370 Author: Alex Deucher Date: Tue Aug 26 17:22:37 2008 +1000 @@ -1072,7 +1072,7 @@ - done: primary dac, vga on tvdac - todo: ext dac, tv on tvdac -commit ad338a53035c3f78d72ace748c0e2debe0d1e39b +commit d4b7208ef17bf36574a9bf5cab06507be6572339 Author: Alex Deucher Date: Tue Aug 26 17:22:11 2008 +1000 @@ -1080,25 +1080,25 @@ - todo: updated connected status -commit 76b449c6332d9deedd089044ec00ea03d87ab630 +commit 5629e7d7736db9e6a289b2673ebac1e967b3f5d9 Author: Alex Deucher Date: Tue Aug 26 17:20:54 2008 +1000 radeon: remove unused legacy state -commit 24d5dbb9aa68beebd065bd2c5af08206b3fe4d93 +commit 50491f33fb5a6fd62c2646ff10a2c9ec3073ef02 Author: Alex Deucher Date: Tue Aug 26 17:20:15 2008 +1000 radeon: get primary dac adj info from bios tables -commit 6f948a22bf1b82045f44eaa5fe8bd07922f6105b +commit 0e92c447f9d36ade5a08d16e2a2fdbf6f0ac19e7 Author: Dave Airlie Date: Tue Aug 26 17:03:13 2008 +1000 x86: export pat_enabled -commit e47a736c75855f69f59beef8b4264dbb8bc2b3a7 +commit a14d9a4dea55948970ef92e4e84c11858f3b893a Author: Dave Airlie Date: Tue Aug 26 17:02:43 2008 +1000 @@ -1107,7 +1107,7 @@ If PAT is enabled, enable write combining support for kernel/user mappings when pat is enabled. Also set memory to WC instead of uncached in ttm -commit 4bab63d11abe30371addf1f3b71c8db448724f6e +commit eded91caaa0d115201271604f17729a005ad486b Author: Dave Airlie Date: Tue Aug 26 17:01:35 2008 +1000 @@ -1116,7 +1116,7 @@ move domain validate function to separate function call it from correct places -commit 108203538073ae1062398c85c494263887a34470 +commit 8953bf857b1dd483f1c86d1c43163a20ff5684f5 Author: Dave Airlie Date: Tue Aug 26 17:00:49 2008 +1000 @@ -1125,37 +1125,37 @@ If a BO hasn't been dirtied, do a solid fill on VRAM instead of migrating pages to VRAM -commit 009a2d4c9a4689f94b80eb65a75bc1fa641147e3 +commit 713778614da4358945e274f94e19a02d0cb1805d Author: Dave Airlie Date: Tue Aug 26 16:59:45 2008 +1000 drm: set clean flags in new flags so it doesn't disappear -commit ed3eaf3df99dee8dc4ecaf0b470e822546eda40b +commit 71f4898bfa365cebb406436f0361e3953b1ca5aa Author: Dave Airlie Date: Fri Aug 22 10:16:20 2008 +1000 radeon: wait for dma gui idle on 2D idle -commit bf574652c96b20c21426237b97d613169e27b088 +commit 0d9b8e43e638df4630087a1da8acf04f214e9642 Author: Dave Airlie Date: Fri Aug 22 10:16:01 2008 +1000 radeon_gem: fix some misplace == -commit 1bb970bd72e9faa4df5689be33959e9ce89db82b +commit eff022a86be119e9b90e89df95ee05ce022c6d28 Author: Dave Airlie Date: Fri Aug 22 10:13:25 2008 +1000 radeon: get buffer upload working -commit d17f5cb8d8b043a0c2ab3ea0200ccfd353314282 +commit 6e32a7983164f38310cb4d7fab3d80af21f5e596 Author: Dave Airlie Date: Fri Aug 22 10:12:57 2008 +1000 radeon: read back register between on gart flush -commit 302e1c8a80263e97cac6823b6c464ae7b8adefd5 +commit 8502a3108f60d91c84d8833443fff6f49c2eccf8 Author: Dave Airlie Date: Fri Aug 22 10:11:55 2008 +1000 @@ -1164,7 +1164,7 @@ We need a buffer zeroing function for before we have accel running etc -commit 85abdbdbde631c154fd67b2445ecdf1e30508397 +commit d3d1ae15ca9732a3f95a3036838bfdabfd28c5c4 Author: Dave Airlie Date: Fri Aug 22 09:49:16 2008 +1000 @@ -1175,55 +1175,55 @@ Primarily for the move code when we get a buffer in VRAM, we don't need to copy the contents just zero them. -commit e907c43b899ed99707a36ac15c22c104f9f00782 +commit 162f143be9fd409abda1ecec913b4cefe419b038 Author: Dave Airlie Date: Fri Aug 22 09:39:07 2008 +1000 ati_pcigart: add memory barrier and volatile for table access -commit 66be01c5c7e64c3fb9332ef6e63d776deb4a6224 +commit 0e56fcb668a44fc76daa82efac6614c6899624c3 Author: Dave Airlie Date: Fri Aug 22 09:35:26 2008 +1000 drm: remove tlb flush logic from ttm -commit d177a69043cb06bd7032b82e6ec9de38c28093f7 +commit 2aa7e465d78f2b94dd3e4c1b54c9e2843847aad3 Author: Dave Airlie Date: Tue Aug 19 12:14:38 2008 +1000 radeon: add GTT domain -commit 9e6f7599ad547595ad0cea7b6964d59f596e9f2c +commit df0db06541521519b4862e414f179e5d2306844c Author: Dave Airlie Date: Wed Aug 27 14:58:05 2008 +1000 radeon: add missing regs from a previous rebase -commit 15864dc92a77d2bc93887e97174bf84076c8755f +commit 6ed84abc7ae41a641cef9f4c3f2adca7995238ae Author: Dave Airlie Date: Thu Aug 14 18:14:56 2008 +1000 disable modeset on < r300 -commit 05ff5f700ed3605534a9272b5e6ca41291d2b186 +commit 2f7f5b8fe055d1453a4d7c7e260d67a7174e20f0 Author: Dave Airlie Date: Fri Aug 15 09:36:21 2008 +1000 radeon: set the base after mode is programmed -commit af11a2194ef5a7242c5331fdd52eea6d5e3ce4e5 +commit a542c23567db12c49c0ba5f363165e1d7726a220 Author: Dave Airlie Date: Fri Aug 15 09:35:55 2008 +1000 radeon: fix LVDS modes problem -commit 2b849b5c4b4e61227249852524b403995b56f531 +commit 5d84fcb7d7449c5d3d795e1e0a98c46527c8ef20 Author: Dave Airlie Date: Thu Aug 14 18:06:31 2008 +1000 radeon: reserve 64k of VRAM for now for text mode so we don't trample it -commit d5971ce512b7b726e3f9a6d19edcd616e5c8ba81 +commit 3d91fb23d89154f87280a456eeb0152610581c88 Author: Dave Airlie Date: Thu Aug 14 14:38:27 2008 +1000 @@ -1231,31 +1231,31 @@ This gets RN50 to initialise correctly -commit 8bfecd77bf3d20a20407614853aa17b520cae52f +commit f6296bd2eb5f1413d9c9ddbdc3e5bd57d55d7540 Author: Dave Airlie Date: Thu Aug 14 14:37:25 2008 +1000 radeon: add copy/solid regs for rn50 -commit 96cad53e3612496b538efd5f6bacb03c9be957d5 +commit dfa87602624538d29b11cbc78bde8498b095d898 Author: Alex Deucher Date: Thu Aug 14 09:59:47 2008 +1000 radeon: fill in and make use of more combios tables -commit 343ef81c5ed9626dc9bb144b7868da0ab90c102d +commit 00e92e03c06b77e2bfa7b2849bf2391b31f32138 Author: Dave Airlie Date: Thu Aug 14 09:59:31 2008 +1000 radeon: add quirks from DDX -commit 1e71882a1e6d0ba0c4b2fe5beb0fc0dd01ca03d2 +commit 157f49b4292f30c81fa4e282c294f2184800ece9 Author: Alex Deucher Date: Thu Aug 14 09:59:12 2008 +1000 radeon: fix warnings -commit 9db8f19666d35c8334cd850798dd5788c3f4c676 +commit 8cc8a81f3e175fbd13c41eddd881f2391dea7b49 Author: Alex Deucher Date: Thu Aug 14 09:58:47 2008 +1000 @@ -1266,31 +1266,31 @@ - add debugging for tracing calls - fix pitch calculation -commit 42bd98095eae04f52a21a83a4a3eca8dc52c9cef +commit 29c062c51a89548c5f681bb1aabc8244c1cf258f Author: Alex Deucher Date: Thu Aug 14 09:58:24 2008 +1000 radeon: set base in legacy crtc mode set -commit 9e1896e45ab26f0b4e562efce33a01fd67bf1f3a +commit b087de02966b1a4c7ab6008190f20978103b55dd Author: Alex Deucher Date: Thu Aug 14 09:55:06 2008 +1000 radeon: Convert COM BIOS to table offset lookup function -commit 6cf32f1a9c04dc0cb8d3a2e29352506b0ab79012 +commit fff8453fbf60d3496d3b3df137cd15a976e2a0ca Author: Alex Deucher Date: Thu Aug 14 09:54:03 2008 +1000 radeon/cursor: Restructure cursor handling and add support for legacy cursors -commit cdc4a1e11454facfaa7f9fd7aad4ef2328d3a47d +commit e3b19486084d0463dbd7b6fd6d31a370d0a3592c Author: Alex Deucher Date: Thu Aug 14 09:53:08 2008 +1000 radeon/atom: implement crtc lock -commit f1b6e6c59af6799a18541fe2113c97bdc93c62f3 +commit 78e8e02b929e27423ff790301975b9d91aee6f25 Author: Alex Deucher Date: Thu Aug 14 09:50:15 2008 +1000 @@ -1299,7 +1299,7 @@ - Add gamma set for legacy chips - Add 16 bpp gamma set -commit 288c1218f90bb67cdcb3546991d4ed41d8fd73f4 +commit 8b1ee86f2b239ae88608d9ce02386b8fb3a852af Author: Alex Deucher Date: Thu Aug 14 09:49:55 2008 +1000 @@ -1309,19 +1309,19 @@ - move i2c_lock to radeon_i2c.c - enable tv dac on legacy -commit 71f6c9fa3e5aaba8819606a7c2c148cb252b4c5a +commit 231a506ff3ffa428a34a76053cb9742f90cf9ae4 Author: Alex Deucher Date: Thu Aug 14 09:49:30 2008 +1000 radeon: Add legacy dac detect stubs -commit d833d2b59429b58377b046a924b850dfab303ea8 +commit 8d722f01ff90d7ec79fd3d84a4c64cf1298487c0 Author: Alex Deucher Date: Thu Aug 14 09:49:12 2008 +1000 unify connector, i2c handling for atom and legacy -commit 894b13ab013b1807e8f2e0ecc09599a46f2811b6 +commit f768e781c80dfc1ed89b28dcc639844d1c1b11d9 Author: Alex Deucher Date: Thu Aug 14 09:48:50 2008 +1000 @@ -1329,25 +1329,25 @@ - removed save/init/restore chain with set functions -commit f7e2e377eb72a52f97e42abf698150f0ab6dc798 +commit de21abcab8649534fd0462e45d80754d50a2a440 Author: Dave Airlie Date: Thu Aug 14 08:54:04 2008 +1000 FEDORA: radeon set gart buffers start -commit 6dccbf9271bee372915b089f227a49486ce58e5f +commit 8ec0a659d106e7638ebcb3a3ea0b4b79a5c3a170 Author: Dave Airlie Date: Thu Aug 14 08:52:41 2008 +1000 radeon: command submission remove debug -commit 7b6b2fdc468136aaedaf1c2a3d082fa09c94071e +commit 188a6ce283c1991b90cb3162bd2b2dac40d14abc Author: Dave Airlie Date: Thu Aug 14 08:51:00 2008 +1000 radeon: use mm_enabled variable to denote memory manager running -commit b5e348e79a98eea1d526174082d00b70957d5057 +commit e2a7eb5d820d0aee28016543f2a7a5b9c30327f5 Author: Dave Airlie Date: Tue Aug 12 12:19:05 2008 +1000 @@ -1355,19 +1355,19 @@ in the correct place in the drm so buffer swaps work again -commit d4250305c22c6f007faec9ef982737dc092a081b +commit a615e2cee2a2a9e318e33be7d0258199adccd71b Author: Dave Airlie Date: Tue Aug 12 12:18:08 2008 +1000 radeon: add mm supported call for userspace -commit 7f66897161bfbcc242c32100ca244bd29c027fd4 +commit f9d6b141b54c39f1c539a45afc4d6ac5b2aee129 Author: Dave Airlie Date: Tue Aug 12 09:40:18 2008 +1000 FEDORA: add old DMA buffers on top of GEM -commit 914e90cfce2c726beaa693fa442c74807d89c327 +commit 2f742ebf571092dcbe0ece9e6a64166bf5f8a63d Author: Dave Airlie Date: Fri Aug 8 15:57:10 2008 +1000 @@ -1376,61 +1376,61 @@ This adds the CRTC and PLL setting code, it doesn't work yet but its all heading in the right direction. -commit 7fbba721a5708376b66ef2bfbd49381510977877 +commit dd5b4040c98328ac42820f111bad7dec13b405ad Author: Dave Airlie Date: Fri Aug 8 10:11:23 2008 +1000 radeon: add initial tmds parsing for legacy cards -commit e9196680e26f9c94e68f9d8a81ffd2280b8c78c6 +commit 6ed7e32dfb0e6bb1b20749ae03473b7f4fd3a2d2 Author: Dave Airlie Date: Wed Aug 6 16:01:22 2008 +1000 radeon: set new memmap on gem enable -commit 23eac0d75cb2b9cdb77606f640835dd309f80c9c +commit 4160d24b5b542ff18af9db9a52e59315487ce856 Author: Dave Airlie Date: Wed Aug 6 15:51:02 2008 +1000 radeon/pci: fixup table when GEM allocates it -commit 286c15fff8e368a965b1d7689287179093f543c4 +commit f64e50adc49851b0f92302c22004a1573d58b8c4 Author: Dave Airlie Date: Wed Aug 6 15:44:38 2008 +1000 radeon: set gart table size -commit bb0b2e5f85d4aa3114b9e7c0ad945af9ea013102 +commit cf58a6b17c77bfc686ea67f8ad91252035278936 Author: Dave Airlie Date: Wed Aug 6 15:44:18 2008 +1000 radeon: fix buffer evict slection -commit ad16387d65a8291c0d42793da0e9a011f0aa1c2f +commit 7ca4e7d7f9e8322da03e4a697935dfeab590e168 Author: Dave Airlie Date: Wed Aug 6 15:43:51 2008 +1000 pcigart: fix incorrect memset + no need for wbinvd -commit e7f1cca035f00fb6ffe9c422f296db0b19a60523 +commit df841fd3b4851cb79fb78b3fdb573815e1bdd7a4 Author: Dave Airlie Date: Tue Aug 5 11:22:24 2008 +1000 radeon: fix defines so blit works again -commit f2d52cf02a36d7ff37af591aee484f5281550a61 +commit 6291b15368c6ac25330def3b597be163dc33d1d9 Author: Dave Airlie Date: Mon Aug 4 17:10:35 2008 +1000 drm: leave bo driver finish to the driver -commit 12154f3ea9e432f0bdd97b8afb776eb66a5fea43 +commit dcc77ae64acdd03ac218e7a6f20eea25c89c0e2c Author: Dave Airlie Date: Mon Aug 4 14:21:22 2008 +1000 drm: fix unneeded debug -commit 562ae70f8ccda9cd9002e77499023ae1923ddf85 +commit 518910a4e455ac1fb59f156888be1d66270de090 Author: Dave Airlie Date: Mon Aug 4 14:20:47 2008 +1000 @@ -1438,52 +1438,52 @@ if kms enabled memory manager will be enabled by default -commit 14b223fb24096144b1a18095041880efb0adbab9 +commit 92a5dbb75a0e9239f3221037132b9c06faddb2d4 Author: Dave Airlie Date: Mon Aug 4 14:20:26 2008 +1000 drm: kill bo after driver lastclose -commit a28ab194409419a3fa52a97de78c8c9caa85002e +commit 144926f8fe0f261ee8c875cca6292b453b0a966c Author: Dave Airlie Date: Mon Aug 4 11:32:45 2008 +1000 radeon: don't invalidate cache if CP isn't running -commit 4d3a9380c7c061990b46eef900412f51c594e3fc +commit f667c4d907c9775bd167085383c03fa06cc27319 Author: Dave Airlie Date: Sat Aug 2 08:06:26 2008 +1000 drm: fix release locking -commit 30296bb509eeb4767c0dd584d9d03ec533f594f6 +commit 036600d5b8d4d0cd30e014f7fc75a6e02f6af079 Author: Dave Airlie Date: Fri Aug 1 16:55:34 2008 +1000 drm: add radeon modesetting support -commit 69c74f6076330e079c3a3fba6e58c17405c3847e +commit 28522b2b95cc292dc87e29f1e5832f5ad37910ee Author: Dave Airlie Date: Fri Aug 1 14:06:12 2008 +1000 drm: add TTM VM changes -commit c69d0e8f14059198d93e6d3a0216dc64650538c3 +commit 16ba6db39d08df01d6c11f815dd3f07e38f948a5 Author: Dave Airlie Date: Thu Jul 31 15:27:27 2008 +1000 drm: import TTM basic objects -commit b650608b1305c47f3cfed3a9b715460739544e2f +commit 93df5ae2f9e70d73de8fea05d062ae9674eb717a Author: Dave Airlie Date: Fri Sep 5 11:26:55 2008 +1000 drm: export drm_i915_flip_t type to userspace to build Mesa diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c -index aebbf67..3867c71 100644 +index e0ab173..69de2db 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c -@@ -29,6 +30,7 @@ +@@ -30,6 +30,7 @@ #ifdef CONFIG_X86_PAT int __read_mostly pat_enabled = 1; @@ -4944,7 +4944,7 @@ +EXPORT_SYMBOL(drm_bo_pfn_prot); + diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c -index 445c762..325b4aa 100644 +index 6d80d17..4d2161f 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -249,7 +249,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, @@ -5677,7 +5677,7 @@ +} + diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c -index 6c020fe..2efb96d 100644 +index f52663e..4f1a405 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c @@ -481,6 +481,10 @@ int drm_release(struct inode *inode, struct file *filp) @@ -5691,16 +5691,7 @@ mutex_lock(&dev->struct_mutex); if (file_priv->is_master) { -@@ -501,7 +501,7 @@ int drm_release(struct inode *inode, str - * possibility to lock. - */ - -- if (master->lock.hw_lock) { -+ if (master->lock.hw_lock != &dev->default_lock) { - if (dev->sigdata.lock == master->lock.hw_lock) - dev->sigdata.lock = NULL; - master->lock.hw_lock = NULL; -@@ -510,6 +514,7 @@ int drm_release(struct inode *inode, struct file *filp) +@@ -514,6 +518,7 @@ int drm_release(struct inode *inode, struct file *filp) /* drop the reference held my the file priv */ drm_master_put(&file_priv->master); file_priv->is_master = 0; @@ -5834,7 +5825,7 @@ #if __OS_HAS_AGP static void *agp_remap(unsigned long offset, unsigned long size, diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c -index 7c41600..7e277c7 100644 +index cf80507..c7817e1 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -102,6 +102,7 @@ struct drm_master *drm_master_create(struct drm_minor *minor) @@ -5845,7 +5836,7 @@ list_add_tail(&master->head, &minor->master_list); -@@ -210,6 +211,7 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, +@@ -202,6 +203,7 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, init_timer(&dev->timer); mutex_init(&dev->struct_mutex); mutex_init(&dev->ctxlist_mutex); @@ -5853,7 +5844,7 @@ idr_init(&dev->drw_idr); -@@ -221,7 +223,12 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, +@@ -213,7 +215,12 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, dev->hose = pdev->sysdata; #endif @@ -5867,7 +5858,7 @@ return -ENOMEM; } -@@ -254,7 +261,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, +@@ -246,7 +253,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, } } @@ -5875,7 +5866,7 @@ retcode = drm_ctxbitmap_init(dev); if (retcode) { DRM_ERROR("Cannot allocate memory for context bitmap.\n"); -@@ -270,6 +276,13 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, +@@ -262,6 +268,13 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, } } @@ -5889,7 +5880,7 @@ return 0; error_out_unreg: -@@ -459,6 +472,7 @@ int drm_put_minor(struct drm_minor **minor_p) +@@ -451,6 +464,7 @@ int drm_put_minor(struct drm_minor **minor_p) *minor_p = NULL; return 0; } @@ -6762,7 +6753,7 @@ + return 0; +} diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 548ff2c..dd53421 100644 +index 87b6b60..fb548e0 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -374,7 +374,8 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr) From kyle at fedoraproject.org Wed Mar 4 00:10:26 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Wed, 4 Mar 2009 00:10:26 +0000 (UTC) Subject: rpms/kernel/devel config-powerpc-generic, 1.35, 1.36 kernel.spec, 1.1373, 1.1374 Message-ID: <20090304001026.97EFA70116@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2476 Modified Files: config-powerpc-generic kernel.spec Log Message: * Wed Mar 04 2009 Kyle McMartin - Tony Breeds says CONFIG_GEF_SBC610 breaks USB. I, for one, believe him. Looks to be fairly useless anyway... (#486511) Index: config-powerpc-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- config-powerpc-generic 25 Feb 2009 16:52:10 -0000 1.35 +++ config-powerpc-generic 4 Mar 2009 00:09:55 -0000 1.36 @@ -256,7 +256,8 @@ # CONFIG_PPC_SMLPAR is not set CONFIG_MGCOGE=y -CONFIG_GEF_SBC610=y +### breaks usb on mac...? #486511 +# CONFIG_GEF_SBC610 is not set CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y CONFIG_MPC8xxx_GPIO=y Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1373 retrieving revision 1.1374 diff -u -r1.1373 -r1.1374 --- kernel.spec 3 Mar 2009 22:48:04 -0000 1.1373 +++ kernel.spec 4 Mar 2009 00:09:55 -0000 1.1374 @@ -1792,6 +1792,10 @@ # and build. %changelog +* Wed Mar 04 2009 Kyle McMartin +- Tony Breeds says CONFIG_GEF_SBC610 breaks USB. I, for one, believe + him. Looks to be fairly useless anyway... (#486511) + * Wed Mar 04 2009 Dave Airlie - rebase drm properly kill -pm it breaks my laptop From glommer at fedoraproject.org Wed Mar 4 00:12:27 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 4 Mar 2009 00:12:27 +0000 (UTC) Subject: rpms/qemu/devel kvm.modules,NONE,1.1 qemu.spec,1.52,1.53 Message-ID: <20090304001227.5B85370116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2698 Modified Files: qemu.spec Added Files: kvm.modules Log Message: add kvm.modules to cvs --- NEW FILE kvm.modules --- #!/bin/sh if [ $(grep -c vmx /proc/cpuinfo) -ne 0 ]; then modprobe kvm-intel >/dev/null 2>&1 fi if [ $(grep -c svm /proc/cpuinfo) -ne 0 ]; then modprobe kvm-amd >/dev/null 2>&1 fi Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- qemu.spec 3 Mar 2009 23:57:07 -0000 1.52 +++ qemu.spec 4 Mar 2009 00:11:57 -0000 1.53 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.1.kvm20090303git%{?dist} +Release: 0.2.kvm20090303git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 1 @@ -340,6 +340,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Tue Mar 03 2009 Glauber Costa - 0.10-0.2.kvm20090303git +- put kvm.modules into cvs + * Tue Mar 03 2009 Glauber Costa - 0.10-0.1.kvm20090303git - Set Epoch to 1 - Build KVM (basic build, no tools yet) From jcm at fedoraproject.org Wed Mar 4 00:30:20 2009 From: jcm at fedoraproject.org (Jon Masters) Date: Wed, 4 Mar 2009 00:30:20 +0000 (UTC) Subject: rpms/module-init-tools/devel .cvsignore, 1.19, 1.20 module-init-tools.spec, 1.79, 1.80 sources, 1.21, 1.22 Message-ID: <20090304003020.E148170116@cvs1.fedora.phx.redhat.com> Author: jcm Update of /cvs/pkgs/rpms/module-init-tools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5088 Modified Files: .cvsignore module-init-tools.spec sources Log Message: bump to latest upstream release and switch to config(noreplace) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/module-init-tools/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 11 Feb 2009 01:55:01 -0000 1.19 +++ .cvsignore 4 Mar 2009 00:29:50 -0000 1.20 @@ -1,2 +1,2 @@ -module-init-tools-3.7-pre1.tar.bz2 -module-init-tools-3.7-pre1.tar.bz2.sign +module-init-tools-3.7-pre7.tar.bz2 +module-init-tools-3.7-pre7.tar.bz2.sign Index: module-init-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- module-init-tools.spec 26 Feb 2009 02:17:23 -0000 1.79 +++ module-init-tools.spec 4 Mar 2009 00:29:50 -0000 1.80 @@ -1,8 +1,8 @@ Summary: Kernel module management utilities. Name: module-init-tools Version: 3.7 -%define PreRelease -pre1 -Release: 2%{?dist} +%define PreRelease -pre7 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Kernel Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{PreRelease}.tar.bz2 @@ -94,9 +94,13 @@ /etc/depmod.d /sbin/* %{_mandir}/*/* -%ghost %config %verify(not md5 size mtime) /etc/modprobe.conf +%ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.conf %changelog +* Tue Mar 03 2009 Jon Masters - 3.7_pre7 +- Update to latest upstream. +- Do not replace config files by default. + * Wed Feb 25 2009 Fedora Release Engineering - 3.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/module-init-tools/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 11 Feb 2009 01:55:01 -0000 1.21 +++ sources 4 Mar 2009 00:29:50 -0000 1.22 @@ -1,2 +1,2 @@ -dd4dfa50a8aaa383898b1a2b16bccf48 module-init-tools-3.7-pre1.tar.bz2 -d9be50ff2f47afb03a3d173d3e1ca146 module-init-tools-3.7-pre1.tar.bz2.sign +43a63c53c518cfa90a07890659043bb2 module-init-tools-3.7-pre7.tar.bz2 +f0c2793aa7f258ff849d211ac03ca87d module-init-tools-3.7-pre7.tar.bz2.sign From jcm at fedoraproject.org Wed Mar 4 00:32:58 2009 From: jcm at fedoraproject.org (Jon Masters) Date: Wed, 4 Mar 2009 00:32:58 +0000 (UTC) Subject: rpms/module-init-tools/devel module-init-tools.spec,1.80,1.81 Message-ID: <20090304003258.BAD8570116@cvs1.fedora.phx.redhat.com> Author: jcm Update of /cvs/pkgs/rpms/module-init-tools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5451 Modified Files: module-init-tools.spec Log Message: bump release tag, need to fix handling of pre-release Index: module-init-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- module-init-tools.spec 4 Mar 2009 00:29:50 -0000 1.80 +++ module-init-tools.spec 4 Mar 2009 00:32:28 -0000 1.81 @@ -2,7 +2,7 @@ Name: module-init-tools Version: 3.7 %define PreRelease -pre7 -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Kernel Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{PreRelease}.tar.bz2 @@ -97,7 +97,7 @@ %ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.conf %changelog -* Tue Mar 03 2009 Jon Masters - 3.7_pre7 +* Tue Mar 03 2009 Jon Masters - 3.7-3 (pre7) - Update to latest upstream. - Do not replace config files by default. From bskeggs at fedoraproject.org Wed Mar 4 00:42:43 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Wed, 4 Mar 2009 00:42:43 +0000 (UTC) Subject: rpms/kernel/devel drm-nouveau.patch, 1.14, 1.15 kernel.spec, 1.1374, 1.1375 Message-ID: <20090304004243.4C6A470116@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6725 Modified Files: drm-nouveau.patch kernel.spec Log Message: * Wed Mar 04 2009 Ben Skeggs - drm: fix bustage of _DRM_SHM maps drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- drm-nouveau.patch 3 Mar 2009 10:01:14 -0000 1.14 +++ drm-nouveau.patch 4 Mar 2009 00:42:11 -0000 1.15 @@ -32,10 +32,10 @@ +obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/ diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c -index 325b4aa..25cf6a7 100644 +index 325b4aa..05e928f 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c -@@ -51,38 +51,23 @@ resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resour +@@ -51,38 +51,24 @@ resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resour EXPORT_SYMBOL(drm_get_resource_len); @@ -67,8 +67,10 @@ - default: /* Make gcc happy */ - ; - } +- if (entry->map->offset == map->offset) + - if (entry->map->offset == map->offset) ++ if (entry->map->offset == map->offset || ++ (map->type == _DRM_SHM && map->flags & _DRM_CONTAINS_LOCK)) return entry; } @@ -78,7 +80,7 @@ static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash, unsigned long user_token, int hashed_handle, int shm) -@@ -349,7 +334,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, +@@ -349,7 +335,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, /* We do it here so that dev->struct_mutex protects the increment */ user_token = (map->type == _DRM_SHM) ? (unsigned long)map->handle : map->offset; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1374 retrieving revision 1.1375 diff -u -r1.1374 -r1.1375 --- kernel.spec 4 Mar 2009 00:09:55 -0000 1.1374 +++ kernel.spec 4 Mar 2009 00:42:12 -0000 1.1375 @@ -1792,6 +1792,9 @@ # and build. %changelog +* Wed Mar 04 2009 Ben Skeggs +- drm: fix bustage of _DRM_SHM maps + * Wed Mar 04 2009 Kyle McMartin - Tony Breeds says CONFIG_GEF_SBC610 breaks USB. I, for one, believe him. Looks to be fairly useless anyway... (#486511) From whot at fedoraproject.org Wed Mar 4 01:06:09 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Wed, 4 Mar 2009 01:06:09 +0000 (UTC) Subject: rpms/system-config-keyboard/devel system-config-keyboard-1.2.15-nolayout.patch, NONE, 1.1 system-config-keyboard.spec, 1.45, 1.46 Message-ID: <20090304010610.1D32F70116@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/system-config-keyboard/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10086 Modified Files: system-config-keyboard.spec Added Files: system-config-keyboard-1.2.15-nolayout.patch Log Message: * Wed Mar 04 2009 Peter Hutterer 1.2.15-8 - system-config-keyboard-1.2.15-nolayout.patch: insert a default ServerLayout section if none is found. system-config-keyboard-1.2.15-nolayout.patch: --- NEW FILE system-config-keyboard-1.2.15-nolayout.patch --- Create a default layout if none is given before inserting the core keyboard. Index: keyboard_backend.py =================================================================== --- system-config-keyboard-1.2.15/src/keyboard_backend.py (revision 569) +++ system-config-keyboard-1.2.15/src/keyboard_backend.py (working copy) @@ -44,6 +44,9 @@ keyboard.options.insert (xf86config.XF86Option("XkbModel", "pc101")) keyboard.options.insert (xf86config.XF86Option("XkbLayout", "us")) xconfig.input.insert (keyboard) + if len(xconfig.layout) == 0: + xconfig.layout.insert(xf86config.XF86ConfLayout()) + xconfig.layout[0].inputs.insert (xf86config.XF86ConfInputref ("Keyboard0", "CoreKeyboard")); found = 0 Index: system-config-keyboard.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-keyboard/devel/system-config-keyboard.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- system-config-keyboard.spec 26 Feb 2009 05:06:55 -0000 1.45 +++ system-config-keyboard.spec 4 Mar 2009 01:05:38 -0000 1.46 @@ -1,6 +1,6 @@ Name: system-config-keyboard Version: 1.2.15 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A graphical interface for modifying the keyboard Group: System Environment/Base @@ -12,6 +12,7 @@ Patch2: system-config-keyboard-1.2.15-reconfig.patch Patch3: system-config-keyboard-1.2.15-icon.patch Patch4: system-config-keyboard-1.2.15-ext.patch +Patch5: system-config-keyboard-1.2.15-nolayout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -40,6 +41,7 @@ %patch2 -p1 -b .reconfig %patch3 -p1 -b .icon %patch4 -p1 -b .ext +%patch5 -p1 -b .nolayout %build @@ -88,6 +90,10 @@ %changelog +* Wed Mar 04 2009 Peter Hutterer 1.2.15-8 +- system-config-keyboard-1.2.15-nolayout.patch: insert a default ServerLayout + section if none is found. + * Wed Feb 25 2009 Fedora Release Engineering - 1.2.15-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From whot at fedoraproject.org Wed Mar 4 01:15:28 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Wed, 4 Mar 2009 01:15:28 +0000 (UTC) Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.416,1.417 Message-ID: <20090304011528.6CAB970116@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11249 Modified Files: xorg-x11-server.spec Log Message: * Wed Mar 04 2009 Peter Hutterer 1.6.0-5 - Drop our own fedora-setup-keyboard script, Require: fedora-setup-keyboard package instead. Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.416 retrieving revision 1.417 diff -u -r1.416 -r1.417 --- xorg-x11-server.spec 3 Mar 2009 19:56:43 -0000 1.416 +++ xorg-x11-server.spec 4 Mar 2009 01:14:57 -0000 1.417 @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.0 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -38,7 +38,6 @@ # keyboard enablement Source10: 10-x11-keymap.fdi -Source11: fedora-setup-keyboard # "useful" xvfb-run script Source20: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh @@ -147,6 +146,7 @@ BuildRequires: libdrm-devel >= 2.4.0 kernel-devel %if %{with_hw_servers} Requires: libdrm >= 2.4.0 +Requires: fedora-setup-keyboard %endif BuildRequires: audit-libs-devel libselinux-devel >= 2.0.59-1 @@ -347,7 +347,6 @@ # fedora-isms to slurp keyboard settings out of /etc/sysconfig/keyboard mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor install -m 0444 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor -install -m 0755 %{SOURCE11} $RPM_BUILD_ROOT%{_bindir} %endif # Make the source package @@ -413,7 +412,6 @@ %{_bindir}/X %attr(4711, root, root) %{_bindir}/Xorg %{_bindir}/cvt -%{_bindir}/fedora-setup-keyboard %{_bindir}/gtf %dir %{_datadir}/xorg %{_datadir}/hal/fdi/policy/10osvendor/10-x11-keymap.fdi @@ -515,6 +513,10 @@ %changelog +* Wed Mar 04 2009 Peter Hutterer 1.6.0-5 +- Drop our own fedora-setup-keyboard script, Require: fedora-setup-keyboard + package instead. + * Tue Mar 03 2009 Adam Jackson 1.6.0-4 - xserver-1.6.0-selinux-raw.patch: Deal in raw contexts, to avoid paying the price for setrans on every object. From glommer at fedoraproject.org Wed Mar 4 01:17:41 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 4 Mar 2009 01:17:41 +0000 (UTC) Subject: rpms/qemu/devel qemu.spec,1.53,1.54 Message-ID: <20090304011741.1D46770116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11660 Modified Files: qemu.spec Log Message: only execute post scripts for user package. Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- qemu.spec 4 Mar 2009 00:11:57 -0000 1.53 +++ qemu.spec 4 Mar 2009 01:17:10 -0000 1.54 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.2.kvm20090303git%{?dist} +Release: 0.3.kvm20090303git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 1 @@ -240,16 +240,16 @@ sh /%{_sysconfdir}/sysconfig/modules/kvm.modules %endif -%post +%post user /sbin/chkconfig --add qemu -%preun +%preun user if [ $1 -eq 0 ]; then /sbin/service qemu stop &>/dev/null || : /sbin/chkconfig --del qemu fi -%postun +%postun user if [ $1 -ge 1 ]; then /sbin/service qemu condrestart &>/dev/null || : fi @@ -340,6 +340,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Tue Mar 03 2009 Glauber Costa - 0.10-0.3.kvm20090303git +- only execute post scripts for user package. + * Tue Mar 03 2009 Glauber Costa - 0.10-0.2.kvm20090303git - put kvm.modules into cvs From deji at fedoraproject.org Wed Mar 4 01:25:13 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Wed, 4 Mar 2009 01:25:13 +0000 (UTC) Subject: rpms/atlas/EL-5 .cvsignore, 1.3, 1.4 atlas.spec, 1.7, 1.8 sources, 1.3, 1.4 atlas-3.6.0-gfortran.patch, 1.1, NONE Message-ID: <20090304012513.580D770116@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/atlas/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12638 Modified Files: .cvsignore atlas.spec sources Removed Files: atlas-3.6.0-gfortran.patch Log Message: * Tue Mar 03 2009 Deji Akingunola - 3.8.3-1 - Update to version 3.8.3 - Branch for EL-5 (EPEL) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/atlas/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Oct 2005 17:31:36 -0000 1.3 +++ .cvsignore 4 Mar 2009 01:24:42 -0000 1.4 @@ -1,2 +1 @@ -atlas3.6.0.tar.bz2 -atlas3_3.6.0-20.diff.gz +atlas3.8.3.tar.bz2 Index: atlas.spec =================================================================== RCS file: /cvs/pkgs/rpms/atlas/EL-5/atlas.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- atlas.spec 8 Sep 2006 14:31:43 -0000 1.7 +++ atlas.spec 4 Mar 2009 01:24:42 -0000 1.8 @@ -1,24 +1,19 @@ +%define enable_native_atlas 0 + Name: atlas -Version: 3.6.0 -Release: 11%{?dist} +Version: 3.8.3 +Release: 1%{?dist} Summary: Automatically Tuned Linear Algebra Software Group: System Environment/Libraries License: BSD URL: http://math-atlas.sourceforge.net/ -Source0: http://prdownloads.sourceforge.net/math-atlas/%{name}%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/math-atlas/%{name}%{version}.tar.bz2 Source1: README.Fedora -Patch0: http://ftp.debian.org/debian/pool/main/a/atlas3/%{name}3_%{version}-20.diff.gz -Patch1: %{name}-%{version}-gfortran.patch +Patch0: atlas-fedora_shared.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: /etc/ld.so.conf.d -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -BuildRequires: gcc-gfortran lapack-devel expect sharutils gawk - -%define ver_major 3 -%define ver %{ver_major}.0 +BuildRequires: gcc-gfortran lapack-devel %description The ATLAS (Automatically Tuned Linear Algebra Software) project is an @@ -36,8 +31,6 @@ the source package can be used to compile customized ATLAS packages; see the documentation for information. - - %package devel Summary: Development libraries for ATLAS Group: Development/Libraries @@ -47,492 +40,252 @@ This package contains the static libraries and headers for development with ATLAS (Automatically Tuned Linear Algebra Software). +%define types base +%if "%{?enable_native_atlas}" == "0" ############## Subpackages for architecture extensions ################# # # Because a set of ATLAS libraries is a ~5 MB package, separate packages -# are created for SSE, SSE2, and 3DNow extensions to ix86 and AltiVec -# extensions to PowerPC. +# are created for SSE, SSE2, and SSE3 extensions to ix86. %ifarch i386 -%define archt i386 -%define types base sse sse2 3dnow +%define types sse sse2 sse3 %package sse Summary: ATLAS libraries for SSE extensions Group: System Environment/Libraries +Obsoletes: %{name}-3dnow < 3.7 +Provides: %{name}-3dnow = %{version}-%{release} + %description sse This package contains the ATLAS (Automatically Tuned Linear Algebra -Software) libraries compiled with optimizations for the SSE extensions -to the ix86 architecture. +Software) libraries compiled with optimizations for the SSE(1) extensions +to the ix86 architecture. Fedora also produces ATLAS build with SSE2 and SSE3 +extensions. + %package sse-devel Summary: Development libraries for ATLAS with SSE extensions Group: Development/Libraries Requires: %{name}-sse = %{version}-%{release} +Obsoletes: %{name}-3dnow-devel < 3.7 +Provides: %{name}-3dnow-devel = %{version}-%{release} + %description sse-devel This package contains headers and static versions of the ATLAS (Automatically Tuned Linear Algebra Software) libraries compiled with -optimizations for the SSE extensions to the ix86 architecture. - +optimizations for the SSE(1) extensions to the ix86 architecture. %package sse2 Summary: ATLAS libraries for SSE2 extensions Group: System Environment/Libraries +Obsoletes: %{name} < 3.7 +Provides: %{name} = %{version}-%{release} + %description sse2 This package contains the ATLAS (Automatically Tuned Linear Algebra Software) libraries compiled with optimizations for the SSE2 -extensions to the ix86 architecture. +extensions to the ix86 architecture. Fedora also produces ATLAS build with +SSE(1) and SSE3 extensions. + %package sse2-devel Summary: Development libraries for ATLAS with SSE2 extensions Group: Development/Libraries Requires: %{name}-sse2 = %{version}-%{release} +Obsoletes: %{name}-devel < 3.7 +Provides: %{name}-devel = %{version}-%{release} + %description sse2-devel This package contains headers and static versions of the ATLAS (Automatically Tuned Linear Algebra Software) libraries compiled with optimizations for the SSE2 extensions to the ix86 architecture. - -%package 3dnow +%package sse3 Summary: ATLAS libraries for 3DNow extensions Group: System Environment/Libraries -%description 3dnow + +%description sse3 This package contains the ATLAS (Automatically Tuned Linear Algebra -Software) libraries compiled with optimizations for the 3DNow -extensions to the ix86 architecture. -%package 3dnow-devel +Software) libraries compiled with optimizations for the SSE3. +Fedora also produces ATLAS build with SSE(1) and SSE2 extensions. + +%package sse3-devel Summary: Development libraries for ATLAS with 3DNow extensions Group: Development/Libraries -Requires: %{name}-3dnow = %{version}-%{release} -%description 3dnow-devel -This package contains headers and static versions of the ATLAS -(Automatically Tuned Linear Algebra Software) libraries compiled with -optimizations for the 3DNow extensions to the ix86 architecture. - +Requires: %{name}-sse3 = %{version}-%{release} -%endif -%ifarch ppc -%define archt powerpc -%define types base altivec - -%package altivec -Summary: ATLAS libraries for AltiVec extensions -Group: System Environment/Libraries -%description altivec -This package contains the ATLAS (Automatically Tuned Linear Algebra -Software) libraries compiled with optimizations for the AltiVec -extensions to the PowerPC architecture. -%package altivec-devel -Summary: Development libraries for ATLAS with AltiVec extensions -Group: Development/Libraries -Requires: %{name}-altivec = %{version}-%{release} -%description altivec-devel +%description sse3-devel This package contains headers and static versions of the ATLAS (Automatically Tuned Linear Algebra Software) libraries compiled with -optimizations for the AltiVec extensions to the PowerPC architecture. +optimizations for the sse3 extensions to the ix86 architecture. %endif -%ifarch x86_64 -%define archt amd64 -%define types base -%define bit 2 -%else -%define bit 1 %endif -%if "%{?enable_custom_atlas}" == "1" -# This flag enables building customized ATLAS libraries with all -# compile-time optimizations. Note that compilation will take a very -# long time, and that the resulting binaries are not guaranteed to -# work well or even at all on other hardware. - -%define archt %{_arch} -%define types custom - -%package custom -Summary: Custom-compiled ATLAS libraries -Group: System Environment/Libraries -%description custom -This package contains the ATLAS (Automatically Tuned Linear Algebra -Software) libraries compiled with all compile-time optimizations enabled. -%package custom-devel -Summary: Development libraries for ATLAS with AltiVec extensions -Group: Development/Libraries -Requires: %{name}-custom = %{version}-%{release} -%description custom-devel -This package contains headers and static versions of the ATLAS -(Automatically Tuned Linear Algebra Software) libraries compiled with -all compile-time optimizations enabled. +%ifarch x86_64 ppc64 +%define mode 64 +%else +%define mode 32 %endif - %prep %setup -q -n ATLAS -%patch0 -p1 -%patch1 -p0 +%patch0 -p0 -b .shared cp %{SOURCE1} doc - %build -# The following build procedure is more or less copied from the Debian -# sources, where the output of a previously recorded build is -# replayed, so as to bypass the compile-time optimizations and produce -# predictable results independent of the hardware on which it is -# compiled. This forces builds to be sequential, so SMP builds are not -# supported. -chmod +x debian/config.expect debian/ab -sed -i debian/ab -e s/g77/gfortran/ - -########## Static Libraries ########################################## -for TYPE in %{types}; do - if [ "$TYPE" = "3dnow" ]; then - TDN=y - else - TDN=n - fi - BUILD_DIR=Linux_${TYPE}_static - ARCH_DIR=$BUILD_DIR CACHE_SIZE= BIT=%{bit} \ - DEFAULTS=y TDNCOMP=$TDN debian/config.expect - cat Make.$BUILD_DIR |\ - sed -e "s, TOPdir = \(.*\), TOPdir = `pwd`,1" \ - -e "s, FLAPACKlib = , FLAPACKlib = %{_libdir}/liblapack.a,1" >foo - mv foo Make.$BUILD_DIR - make killall arch=$BUILD_DIR - make startup arch=$BUILD_DIR - - if [ "$TYPE" = "custom" ]; then - BUILD_DATA_DIR=atlas-$TYPE-%{archt} - if [ -a %{_sourcedir}/$BUILD_DATA_DIR.tgz ]; then - tar zxf %{_sourcedir}/$BUILD_DATA_DIR.tgz - else - make install arch=$BUILD_DIR >out 2>&1 & - pid=$! - echo Waiting on $pid - tail -f --pid $pid out & - wait $pid - rm -rf ${BUILD_DATA_DIR} - mkdir -p ${BUILD_DATA_DIR} - cat out | sed -e "s,`pwd`,TOPDIR,g" -e "s,$BUILD_DIR,CARCH,g" | \ - gzip -9 | uuencode - >${BUILD_DATA_DIR}/build.uu - rm -f out - mkdir -p ${BUILD_DATA_DIR}/include - cp include/$BUILD_DIR/* ${BUILD_DATA_DIR}/include - mkdir -p ${BUILD_DATA_DIR}/mm - cp tune/blas/gemm/$BUILD_DIR/res/* ${BUILD_DATA_DIR}/mm - mkdir -p ${BUILD_DATA_DIR}/mv - cp tune/blas/gemv/$BUILD_DIR/res/* ${BUILD_DATA_DIR}/mv - mkdir -p ${BUILD_DATA_DIR}/r1 - cp tune/blas/ger/$BUILD_DIR/res/* ${BUILD_DATA_DIR}/r1 - mkdir -p ${BUILD_DATA_DIR}/l1 - cp tune/blas/level1/$BUILD_DIR/res/* ${BUILD_DATA_DIR}/l1 - tar zcf %{_sourcedir}/${BUILD_DATA_DIR}.tgz ${BUILD_DATA_DIR} - fi - else - BUILD_DATA_DIR=debian/%{archt}/${TYPE} - fi - - cp ${BUILD_DATA_DIR}/mm/* tune/blas/gemm/$BUILD_DIR/res - cp ${BUILD_DATA_DIR}/mv/* tune/blas/gemv/$BUILD_DIR/res - cp ${BUILD_DATA_DIR}/r1/* tune/blas/ger/$BUILD_DIR/res - cp ${BUILD_DATA_DIR}/l1/* tune/blas/level1/$BUILD_DIR/res - cp ${BUILD_DATA_DIR}/include/* include/$BUILD_DIR - - cat ${BUILD_DATA_DIR}/build.uu | uudecode | zcat - | \ - sed -e s/g77/gfortran/ -e s/-DAdd__/-DAdd_/ | debian/ab topdir=`pwd` \ - carch=$BUILD_DIR fpic="-Wa,--noexecstack" debug= | bash -x -e - mv lib/$BUILD_DIR/liblapack.a lib/$BUILD_DIR/liblapack_atlas.a - - # Create replacement for BLAS and LAPACK Libraries - mkdir tmp - pushd tmp - ar x ../lib/$BUILD_DIR/libatlas.a - ar x ../lib/$BUILD_DIR/libf77blas.a - ar x ../lib/$BUILD_DIR/libcblas.a - popd - rm -f lib/$BUILD_DIR/libblas.a - ar r lib/$BUILD_DIR/libblas.a tmp/*.o - rm -rf tmp - - mkdir tmp - pushd tmp - ar x %{_libdir}/liblapack.a - ar x ../lib/$BUILD_DIR/liblapack_atlas.a - ar x ../lib/$BUILD_DIR/libcblas.a - popd - rm -f lib/$BUILD_DIR/liblapack.a - ar r lib/$BUILD_DIR/liblapack.a tmp/*.o - rm -rf tmp - - ########## Shared Libraries ########################################## - BUILD_DIR=Linux_${TYPE}_shared - ARCH_DIR=$BUILD_DIR CACHE_SIZE= BIT=%{bit} \ - DEFAULTS=y TDNCOMP=$TDN debian/config.expect - cat Make.$BUILD_DIR |\ - sed -e "s, TOPdir = \(.*\), TOPdir = `pwd`,1" \ - -e "s, FLAPACKlib = , FLAPACKlib = %{_libdir}/liblapack_pic.a,1" \ - -e "s, F77FLAGS = \(.*\), F77FLAGS = \1 -fPIC,1" \ - -e "s, CCFLAGS = \(.*\), CCFLAGS = \1 -fPIC,1" \ - -e "s, MMFLAGS = \(.*\), MMFLAGS = \1 -fPIC,1" \ - -e "s, XCCFLAGS = \(.*\), XCCFLAGS = \1 -fPIC,1" >foo - mv foo Make.$BUILD_DIR - make killall arch=$BUILD_DIR - make startup arch=$BUILD_DIR - - cp ${BUILD_DATA_DIR}/mm/* tune/blas/gemm/$BUILD_DIR/res - cp ${BUILD_DATA_DIR}/mv/* tune/blas/gemv/$BUILD_DIR/res - cp ${BUILD_DATA_DIR}/r1/* tune/blas/ger/$BUILD_DIR/res - cp ${BUILD_DATA_DIR}/l1/* tune/blas/level1/$BUILD_DIR/res - cp ${BUILD_DATA_DIR}/include/* include/$BUILD_DIR - - cat ${BUILD_DATA_DIR}/build.uu | uudecode | zcat - | \ - sed -e s/g77/gfortran/ -e s/-DAdd__/-DAdd_/ | debian/ab topdir=`pwd` \ - carch=$BUILD_DIR fpic="-Wa,--noexecstack -fPIC" debug= | bash -x -e - mv lib/$BUILD_DIR/liblapack.a lib/$BUILD_DIR/liblapack_atlas.a - - mkdir tmp - pushd tmp - ar x ../lib/$BUILD_DIR/libatlas.a - rm -f ilaenv.o - popd - cc -shared -Wl,-soname=libatlas.so.%{ver_major} \ - -o lib/$BUILD_DIR/libatlas.so.%{ver} tmp/*.o -lm - ln -s libatlas.so.%{ver} lib/$BUILD_DIR/libatlas.so.%{ver_major} - ln -s libatlas.so.%{ver} lib/$BUILD_DIR/libatlas.so - rm -rf tmp - - mkdir tmp - pushd tmp - ar x ../lib/$BUILD_DIR/libcblas.a - rm -f ilaenv.o - popd - cc -shared -Wl,-soname=libcblas.so.%{ver_major} \ - -o lib/$BUILD_DIR/libcblas.so.%{ver} tmp/*.o -L lib/$BUILD_DIR -latlas - ln -s libcblas.so.%{ver} lib/$BUILD_DIR/libcblas.so.%{ver_major} - ln -s libcblas.so.%{ver} lib/$BUILD_DIR/libcblas.so - rm -rf tmp - - mkdir tmp - pushd tmp - ar x ../lib/$BUILD_DIR/libf77blas.a - rm -f ilaenv.o - popd - cc -shared -Wl,-soname=libf77blas.so.%{ver_major} \ - -o lib/$BUILD_DIR/libf77blas.so.%{ver} tmp/*.o \ - -L lib/$BUILD_DIR -latlas -lgfortran - ln -s libf77blas.so.%{ver} lib/$BUILD_DIR/libf77blas.so.%{ver_major} - ln -s libf77blas.so.%{ver} lib/$BUILD_DIR/libf77blas.so - rm -rf tmp - - mkdir tmp - pushd tmp - ar x ../lib/$BUILD_DIR/liblapack_atlas.a - rm -f ilaenv.o - popd - cc -shared -Wl,-soname=liblapack_atlas.so.%{ver_major} \ - -o lib/$BUILD_DIR/liblapack_atlas.so.%{ver} tmp/*.o \ - -L lib/$BUILD_DIR -lcblas -lf77blas - ln -s liblapack_atlas.so.%{ver} lib/$BUILD_DIR/liblapack_atlas.so.%{ver_major} - ln -s liblapack_atlas.so.%{ver} lib/$BUILD_DIR/liblapack_atlas.so - rm -rf tmp - - # Create replacement for BLAS and LAPACK Libraries - mkdir tmp - pushd tmp - ar x ../lib/$BUILD_DIR/libatlas.a - ar x ../lib/$BUILD_DIR/libf77blas.a - ar x ../lib/$BUILD_DIR/libcblas.a - popd - cc -shared -Wl,-soname=libblas.so.%{ver_major} \ - -o lib/$BUILD_DIR/libblas.so.%{ver} tmp/*.o -lgfortran - ln -s libblas.so.%{ver} lib/$BUILD_DIR/libblas.so.%{ver_major} - ln -s libblas.so.%{ver} lib/$BUILD_DIR/libblas.so - rm -rf tmp - - mkdir tmp - pushd tmp - ar x %{_libdir}/liblapack_pic.a - ar x ../lib/$BUILD_DIR/liblapack_atlas.a - ar x ../lib/$BUILD_DIR/libcblas.a - popd - cc -shared -Wl,-soname=liblapack.so.%{ver_major} \ - -o lib/$BUILD_DIR/liblapack.so.%{ver} tmp/*.o \ - -L lib/$BUILD_DIR -lblas -lgfortran - ln -s liblapack.so.%{ver} lib/$BUILD_DIR/liblapack.so.%{ver_major} - ln -s liblapack.so.%{ver} lib/$BUILD_DIR/liblapack.so - rm -rf tmp +for type in %{types}; do + if [ "$type" = "base" ]; then + libname=atlas + else + libname=atlas-${type} + fi + mkdir -p %{_arch}_${type} + pushd %{_arch}_${type} + ../configure -b %{mode} -D c -DWALL -Fa alg '-Wa,--noexecstack -fPIC'\ + --prefix=%{buildroot}%{_prefix} \ + --incdir=%{buildroot}%{_includedir} \ + --libdir=%{buildroot}%{_libdir}/${libname} \ + --with-netlib-lapack=%{_libdir}/liblapack_pic.a + + if [ "$type" = "sse" ]; then + sed -i 's#ARCH =.*#ARCH = PIII32SSE1#' Make.inc + sed -i 's#-DATL_SSE3 -DATL_SSE2##' Make.inc + elif [ "$type" = "sse2" ]; then + sed -i 's#ARCH =.*#ARCH = P432SSE2#' Make.inc + sed -i 's#-DATL_SSE3##' Make.inc + elif [ "$type" = "sse3" ]; then + sed -i 's#ARCH =.*#ARCH = P4E32SSE3#' Make.inc + fi + make build + cd lib + make shared + make ptshared + popd done - %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d -mkdir -p $RPM_BUILD_ROOT%{_includedir}/atlas -cp -a include/*.h $RPM_BUILD_ROOT%{_includedir}/atlas - -LIBNAMES="libatlas libcblas libf77blas liblapack_atlas libblas liblapack" -for TYPE in %{types}; do - if [ "$TYPE" = "base" ]; then - EXTDIR="atlas" - echo "%{_libdir}/atlas" \ - > $RPM_BUILD_ROOT/etc/ld.so.conf.d/atlas-%{_arch}.conf - elif [ "$TYPE" = "custom" ]; then - EXTDIR="atlas-custom" - echo "%{_libdir}/atlas-custom" \ - > $RPM_BUILD_ROOT/etc/ld.so.conf.d/atlas-custom-%{_arch}.conf - else - EXTDIR=$TYPE - if [ "$TYPE" != "sse2" ]; then - echo "/usr/lib/$TYPE" \ - > $RPM_BUILD_ROOT/etc/ld.so.conf.d/atlas-$TYPE.conf - fi - fi - - mkdir -p $RPM_BUILD_ROOT%{_libdir}/${EXTDIR} - for LIB in $LIBNAMES; do - LIBS="lib/Linux_${TYPE}_static/$LIB.a lib/Linux_${TYPE}_shared/$LIB.so*" - cp -a $LIBS ${RPM_BUILD_ROOT}%{_libdir}/${EXTDIR} - done +rm -rf %{buildroot} +for type in %{types}; do + pushd %{_arch}_${type} + make DESTDIR=%{buildroot} install + if [ "$type" = "base" ]; then + cp -pr lib/*.so* %{buildroot}%{_libdir}/atlas/ + else + cp -pr lib/*.so* %{buildroot}%{_libdir}/atlas-${type}/ + fi + popd + + mkdir -p %{buildroot}/etc/ld.so.conf.d + if [ "$type" = "base" ]; then + echo "%{_libdir}/atlas" \ + > %{buildroot}/etc/ld.so.conf.d/atlas-%{_arch}.conf + else + echo "%{_libdir}/atlas-${type}" \ + > %{buildroot}/etc/ld.so.conf.d/atlas-${type}.conf + fi done - - +%ifarch i386 && %if "%{?enable_native_atlas}" == "0" +cp -pr %{buildroot}%{_libdir}/atlas-sse2 %{buildroot}%{_libdir}/atlas +echo "%{_libdir}/atlas" >> %{buildroot}/etc/ld.so.conf.d/atlas-sse2.conf +%endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} + +%ifnarch i386 || %if "%{?enable_native_atlas}" == "1" %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%ifarch i386 - -%post -n atlas-sse -p /sbin/ldconfig - -%postun -n atlas-sse -p /sbin/ldconfig - -%post -n atlas-sse2 -p /sbin/ldconfig - -%postun -n atlas-sse2 -p /sbin/ldconfig - -%post -n atlas-3dnow -p /sbin/ldconfig - -%postun -n atlas-3dnow -p /sbin/ldconfig - -%endif -%ifarch ppc - -%post -n atlas-altivec -p /sbin/ldconfig - -%postun -n atlas-altivec -p /sbin/ldconfig - -%endif -%if "%{?enable_custom_atlas}" == "1" - -%post -n atlas-custom -p /sbin/ldconfig - -%postun -n atlas-custom -p /sbin/ldconfig - -%files custom -%defattr(-,root,root,-) -%doc debian/copyright doc/README.Fedora -%dir %{_libdir}/atlas-custom -%{_libdir}/atlas-custom/*.so.* -%config(noreplace) /etc/ld.so.conf.d/atlas-custom-%{_arch}.conf - -%files custom-devel -%defattr(-,root,root,-) -%doc debian/copyright doc -%dir %{_libdir}/atlas-custom -%{_libdir}/atlas-custom/*.so -%{_libdir}/atlas-custom/*.a -%{_includedir}/atlas - -%else - - %files %defattr(-,root,root,-) -%doc debian/copyright doc/README.Fedora +%doc doc/README.Fedora %dir %{_libdir}/atlas %{_libdir}/atlas/*.so.* %config(noreplace) /etc/ld.so.conf.d/atlas-%{_arch}.conf %files devel %defattr(-,root,root,-) -%doc debian/copyright doc +%doc doc %{_libdir}/atlas/*.so %{_libdir}/atlas/*.a %{_includedir}/atlas +%{_includedir}/*.h -%ifarch i386 +%else + +%post -n atlas-sse -p /sbin/ldconfig + +%postun -n atlas-sse -p /sbin/ldconfig + +%post -n atlas-sse2 -p /sbin/ldconfig + +%postun -n atlas-sse2 -p /sbin/ldconfig + +%post -n atlas-sse3 -p /sbin/ldconfig + +%postun -n atlas-sse3 -p /sbin/ldconfig %files sse %defattr(-,root,root,-) -%doc debian/copyright doc/README.Fedora -%dir %{_libdir}/sse -%{_libdir}/sse/*.so.* +%doc doc/README.Fedora +%dir %{_libdir}/atlas-sse +%{_libdir}/atlas-sse/*.so.* %config(noreplace) /etc/ld.so.conf.d/atlas-sse.conf %files sse-devel %defattr(-,root,root,-) -%doc debian/copyright doc -%dir %{_libdir}/sse -%{_libdir}/sse/*.so -%{_libdir}/sse/*.a +%doc doc +%{_libdir}/atlas-sse/*.so +%{_libdir}/atlas-sse/*.a %{_includedir}/atlas - +%{_includedir}/*.h %files sse2 %defattr(-,root,root,-) -%doc debian/copyright doc/README.Fedora -%dir %{_libdir}/sse2 -%{_libdir}/sse2/*.so.* +%doc doc/README.Fedora +%dir %{_libdir}/atlas-sse2 +%dir %{_libdir}/atlas +%{_libdir}/atlas-sse2/*.so.* +%{_libdir}/atlas/*.so.* +%config(noreplace) /etc/ld.so.conf.d/atlas-sse2.conf %files sse2-devel %defattr(-,root,root,-) -%doc debian/copyright doc -%dir %{_libdir}/sse2 -%{_libdir}/sse2/*.so -%{_libdir}/sse2/*.a +%doc doc +%{_libdir}/atlas-sse2/*.so +%{_libdir}/atlas-sse2/*.a +%{_libdir}/atlas/*.so +%{_libdir}/atlas/*.a %{_includedir}/atlas +%{_includedir}/*.h - -%files 3dnow +%files sse3 %defattr(-,root,root,-) -%doc debian/copyright doc/README.Fedora -%dir %{_libdir}/3dnow -%{_libdir}/3dnow/*.so.* -%config(noreplace) /etc/ld.so.conf.d/atlas-3dnow.conf +%doc doc/README.Fedora +%dir %{_libdir}/atlas-sse3 +%{_libdir}/atlas-sse3/*.so.* +%config(noreplace) /etc/ld.so.conf.d/atlas-sse3.conf -%files 3dnow-devel +%files sse3-devel %defattr(-,root,root,-) -%doc debian/copyright doc -%dir %{_libdir}/3dnow -%{_libdir}/3dnow/*.so -%{_libdir}/3dnow/*.a +%doc doc +%{_libdir}/atlas-sse3/*.so +%{_libdir}/atlas-sse3/*.a %{_includedir}/atlas +%{_includedir}/*.h %endif -%ifarch ppc - -%files altivec -%defattr(-,root,root,-) -%doc debian/copyright doc/README.Fedora -%dir %{_libdir}/altivec -%{_libdir}/altivec/*.so.* -%config(noreplace) /etc/ld.so.conf.d/atlas-altivec.conf -%files altivec-devel -%defattr(-,root,root,-) -%doc debian/copyright doc -%dir %{_libdir}/altivec -%{_libdir}/altivec/*.so -%{_libdir}/altivec/*.a -%{_includedir}/atlas +%changelog +* Tue Mar 03 2009 Deji Akingunola - 3.8.3-1 +- Update to version 3.8.3 +- Branch for EL-5 (EPEL) -%endif +* Mon Jun 4 2007 Orion Poplawski 3.6.0-12 +- Rebuild for ppc64 -%endif - -%changelog * Fri Sep 8 2006 Quentin Spencer 3.6.0-11 - Rebuild for FC6. - Remove outdated comments from spec file. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/atlas/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Oct 2005 17:31:36 -0000 1.3 +++ sources 4 Mar 2009 01:24:42 -0000 1.4 @@ -1,2 +1 @@ -df2ee2eb65d1c08ee93d04370172c262 atlas3.6.0.tar.bz2 -5e9d32bfba9f936cd538266b15f87a40 atlas3_3.6.0-20.diff.gz +6c13be94a87178e7582111c08e9503bc atlas3.8.3.tar.bz2 --- atlas-3.6.0-gfortran.patch DELETED --- From deji at fedoraproject.org Wed Mar 4 01:25:55 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Wed, 4 Mar 2009 01:25:55 +0000 (UTC) Subject: rpms/atlas/EL-5 atlas-fedora_shared.patch,NONE,1.1 Message-ID: <20090304012555.D9B0B70116@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/atlas/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12820 Added Files: atlas-fedora_shared.patch Log Message: Add patch atlas-fedora_shared.patch: --- NEW FILE atlas-fedora_shared.patch --- --- makes/Make.lib 2008-06-06 20:57:46.000000000 -0400 +++ makes/Make.lib.new 2008-12-21 15:36:21.000000000 -0500 @@ -3,6 +3,8 @@ # # override with libatlas.so only when atlas is built to one lib # +so_ver_major=3 +so_ver = $(so_ver_major).0 DYNlibs = liblapack.so libf77blas.so libcblas.so libatlas.so PTDYNlibs = liblapack.so libptf77blas.so libptcblas.so libatlas.so CDYNlibs = liblapack.so libcblas.so libatlas.so @@ -32,38 +34,78 @@ mv $(tarnam).tar.gz $(tarnam).tgz ptshared : - - rm -f libatlas.so liblapack.so - $(MAKE) libatlas.so liblapack.so libptf77blas.so libf77blas.so \ - libptcblas.so libcblas.so liblapack.so + - rm -f libatlas.so* liblapack.so* \ + lib*blas.so* libclapack.so* + $(MAKE) libatlas.so libcblas.so libptf77blas.so libf77blas.so \ + libptcblas.so liblapack.so libclapack.so shared : - - rm -f libatlas.so liblapack.so - $(MAKE) libatlas.so liblapack.so libf77blas.so libcblas.so liblapack.so + - rm -f libatlas.so liblapack.so \ + libatlas.so.$(so_ver) liblapack.so.$(so_ver) + $(MAKE) libatlas.so libcblas.so libf77blas.so liblapack.so libclapack.so cptshared : - - rm -f libatlas.so libclapack.so - $(MAKE) libatlas.so libclapack.so libptcblas.so libcblas.so + - rm -f libatlas.so libclapack.so \ + libatlas.so.$(so_ver) libclapack.so.$(so_ver) + $(MAKE) libatlas.so libptcblas.so libcblas.so libclapack.so cshared : - - rm -f libatlas.so libclapack.so - $(MAKE) libatlas.so libclapack.so libcblas.so + - rm -f libatlas.so libclapack.so \ + libatlas.so.$(so_ver) libclapack.so.$(so_ver) + $(MAKE) libatlas.so libcblas.so libclapack.so libatlas.so : libatlas.a - ld $(LDFLAGS) -shared -soname libatlas.so -o libatlas.so \ - --whole-archive libatlas.a --no-whole-archive -lc $(LIBS) + mkdir static_libs ; cd static_libs ; ar x ../libatlas.a ; cd ../ + gcc $(LDFLAGS) -shared -Wl,-soname=libatlas.so.$(so_ver_major) \ + -o libatlas.so.$(so_ver) static_libs/*.o -lc $(LIBS) + rm -rf static_libs + ln -s ./libatlas.so.$(so_ver) libatlas.so.$(so_ver_major) + ln -s ./libatlas.so.$(so_ver) libatlas.so liblapack.so : liblapack.a - ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive \ - liblapack.a --no-whole-archive $(F77SYSLIB) + mkdir static_libs ; cd static_libs ; ar x ../liblapack.a ; cd ../ + gcc $(LDFLAGS) -shared -Wl,-soname=liblapack.so.$(so_ver_major) \ + -o liblapack.so.$(so_ver) static_libs/*.o $(F77SYSLIB) \ + libf77blas.so.$(so_ver_major) libcblas.so.$(so_ver_major) + rm -rf static_libs + ln -s ./liblapack.so.$(so_ver) liblapack.so.$(so_ver_major) + ln -s ./liblapack.so.$(so_ver) liblapack.so libclapack.so : libclapack.a - ld $(LDFLAGS) -shared -soname liblapack.so -o liblapack.so \ - --whole-archive libclapack.a + mkdir static_libs ; cd static_libs ; ar x ../libclapack.a ; cd ../ + gcc $(LDFLAGS) -shared -Wl,-soname=libclapack.so.$(so_ver_major) \ + -o libclapack.so.$(so_ver) static_libs/*.o \ + libcblas.so.$(so_ver_major) -lc $(LIBS) + rm -rf static_libs + ln -s ./libclapack.so.$(so_ver) libclapack.so.$(so_ver_major) + ln -s ./libclapack.so.$(so_ver) libclapack.so libptf77blas.so : libptf77blas.a - ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libptf77blas.a \ - --no-whole-archive $(F77SYSLIB) + mkdir static_libs ; cd static_libs ; ar x ../libptf77blas.a ; cd ../ + gcc $(LDFLAGS) -shared -Wl,-soname=libptf77blas.so.$(so_ver_major) \ + -o libptf77blas.so.$(so_ver) static_libs/*.o \ + libatlas.so.$(so_ver) $(F77SYSLIB) + rm -rf static_libs + ln -s ./libptf77blas.so.$(so_ver) libptf77blas.so.$(so_ver_major) + ln -s ./libptf77blas.so.$(so_ver) libptf77blas.so libf77blas.so : libf77blas.a - ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libf77blas.a \ - --no-whole-archive $(F77SYSLIB) + mkdir static_libs ; cd static_libs ; ar x ../libf77blas.a ; cd ../ + gcc $(LDFLAGS) -shared -Wl,-soname=libf77blas.so.$(so_ver_major) \ + -o libf77blas.so.$(so_ver) static_libs/*.o \ + libatlas.so.$(so_ver) $(F77SYSLIB) + rm -rf static_libs + ln -s ./libf77blas.so.$(so_ver) libf77blas.so.$(so_ver_major) + ln -s ./libf77blas.so.$(so_ver) libf77blas.so libptcblas.so : libptcblas.a - ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libptcblas.a + mkdir static_libs ; cd static_libs ; ar x ../libptcblas.a ; cd ../ + gcc $(LDFLAGS) -shared -Wl,-soname=libptcblas.so.$(so_ver_major) \ + -o libptcblas.so.$(so_ver) static_libs/*.o \ + libatlas.so.$(so_ver) -lc $(LIBS) + rm -rf static_libs + ln -s ./libptcblas.so.$(so_ver) libptcblas.so.$(so_ver_major) + ln -s ./libptcblas.so.$(so_ver) libptcblas.so libcblas.so : libcblas.a - ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libcblas.a + mkdir static_libs ; cd static_libs ; ar x ../libcblas.a ; cd ../ + gcc $(LDFLAGS) -shared -Wl,-soname=libcblas.so.$(so_ver_major) \ + -o libcblas.so.$(so_ver) static_libs/*.o \ + libatlas.so.$(so_ver) -lc $(LIBS) + rm -rf static_libs + ln -s ./libcblas.so.$(so_ver) libcblas.so.$(so_ver_major) + ln -s ./libcblas.so.$(so_ver) libcblas.so # # Builds one shared lib from all ATLAS files # From deji at fedoraproject.org Wed Mar 4 01:30:23 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Wed, 4 Mar 2009 01:30:23 +0000 (UTC) Subject: rpms/tokyocabinet/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 tokyocabinet-fedora.patch, 1.2, 1.3 tokyocabinet.spec, 1.10, 1.11 Message-ID: <20090304013023.B28AE70116@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/tokyocabinet/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13546 Modified Files: .cvsignore sources tokyocabinet-fedora.patch tokyocabinet.spec Log Message: * Tue Mar 03 2009 Deji Akingunola - 1.4.9-1 - Update to version 1.4.9 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 13 Jan 2009 23:31:55 -0000 1.9 +++ .cvsignore 4 Mar 2009 01:29:53 -0000 1.10 @@ -1 +1 @@ -tokyocabinet-1.3.27.tar.gz +tokyocabinet-1.4.9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 13 Jan 2009 23:31:55 -0000 1.9 +++ sources 4 Mar 2009 01:29:53 -0000 1.10 @@ -1 +1 @@ -9dfaa4311717ee3ab56c873af312f045 tokyocabinet-1.3.27.tar.gz +295c5c04d62bfd3a772dbfa1bc9991ca tokyocabinet-1.4.9.tar.gz tokyocabinet-fedora.patch: Index: tokyocabinet-fedora.patch =================================================================== RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/tokyocabinet-fedora.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tokyocabinet-fedora.patch 13 Jan 2009 23:31:55 -0000 1.2 +++ tokyocabinet-fedora.patch 4 Mar 2009 01:29:53 -0000 1.3 @@ -1,14 +1,15 @@ ---- configure.in 2008-12-27 05:21:45.000000000 -0500 -+++ configure.in.new 2009-01-13 18:16:44.000000000 -0500 -@@ -31,26 +31,14 @@ +--- configure.in 2009-02-25 00:22:38.000000000 -0500 ++++ configure.in.new 2009-03-03 10:15:18.000000000 -0500 +@@ -31,27 +31,15 @@ MYPCFILES="tokyocabinet.pc" # Building flags -MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2" --MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include -DNDEBUG -D_GNU_SOURCE=1" +-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include" ++MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char" ++MYCPPFLAGS="-I. -I\$(INCLUDEDIR)" + MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__" -MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib" -+MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char $CFLAGS" -+MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -DNDEBUG -D_GNU_SOURCE=1" +MYLDFLAGS="-L. -L\$(LIBDIR)" MYCMDLDFLAGS="" MYRUNPATH="\$(LIBDIR)" @@ -30,17 +31,8 @@ #================================================================ # Options #================================================================ -@@ -103,7 +91,7 @@ - AC_HELP_STRING([--enable-fastest], [build for fastest run])) - if test "$enable_fastest" = "yes" - then -- MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char -O3" -+ MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char $CFLAGS -O3" - MYCFLAGS="$MYCFLAGS -fomit-frame-pointer -fforce-addr -minline-all-stringops" - MYCPPFLAGS="$MYCPPFLAGS -D_MYFASTEST" - enables="$enables (fastest)" ---- Makefile.in 2008-12-22 12:02:44.000000000 -0500 -+++ Makefile.in.new 2009-01-13 18:17:54.000000000 -0500 +--- Makefile.in 2009-02-23 11:37:15.000000000 -0500 ++++ Makefile.in.new 2009-03-03 09:56:36.000000000 -0500 @@ -54,8 +54,8 @@ LDFLAGS = @MYLDFLAGS@ CMDLDFLAGS = @MYCMDLDFLAGS@ @@ -53,7 +45,7 @@ --- tokyocabinet.pc.in 2008-02-18 02:25:18.000000000 -0500 -+++ tokyocabinet.pc.in.new 2009-01-13 18:18:52.000000000 -0500 ++++ tokyocabinet.pc.in.new 2009-03-03 09:57:26.000000000 -0500 @@ -10,5 +10,5 @@ Name: Tokyo Cabinet Description: a modern implementation of DBM Index: tokyocabinet.spec =================================================================== RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/tokyocabinet.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tokyocabinet.spec 25 Feb 2009 21:11:05 -0000 1.10 +++ tokyocabinet.spec 4 Mar 2009 01:29:53 -0000 1.11 @@ -1,7 +1,7 @@ Summary: A modern implementation of a DBM Name: tokyocabinet -Version: 1.3.27 -Release: 2%{?dist} +Version: 1.4.9 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://tokyocabinet.sourceforge.net/ @@ -70,6 +70,9 @@ %doc doc/* %changelog +* Tue Mar 03 2009 Deji Akingunola - 1.4.9-1 +- Update to version 1.4.9 + * Wed Feb 25 2009 Fedora Release Engineering - 1.3.27-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From deji at fedoraproject.org Wed Mar 4 01:39:58 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Wed, 4 Mar 2009 01:39:58 +0000 (UTC) Subject: rpms/tokyocabinet/EL-5 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 tokyocabinet-fedora.patch, 1.2, 1.3 tokyocabinet.spec, 1.10, 1.11 Message-ID: <20090304013958.6CCB270116@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/tokyocabinet/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15235 Modified Files: .cvsignore sources tokyocabinet-fedora.patch tokyocabinet.spec Log Message: * Tue Mar 03 2009 Deji Akingunola - 1.4.9-1 - Update to version 1.4.9 - First build for EPEL Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tokyocabinet/EL-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 13 Jan 2009 23:31:55 -0000 1.9 +++ .cvsignore 4 Mar 2009 01:39:27 -0000 1.10 @@ -1 +1 @@ -tokyocabinet-1.3.27.tar.gz +tokyocabinet-1.4.9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tokyocabinet/EL-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 13 Jan 2009 23:31:55 -0000 1.9 +++ sources 4 Mar 2009 01:39:27 -0000 1.10 @@ -1 +1 @@ -9dfaa4311717ee3ab56c873af312f045 tokyocabinet-1.3.27.tar.gz +295c5c04d62bfd3a772dbfa1bc9991ca tokyocabinet-1.4.9.tar.gz tokyocabinet-fedora.patch: Index: tokyocabinet-fedora.patch =================================================================== RCS file: /cvs/pkgs/rpms/tokyocabinet/EL-5/tokyocabinet-fedora.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tokyocabinet-fedora.patch 13 Jan 2009 23:31:55 -0000 1.2 +++ tokyocabinet-fedora.patch 4 Mar 2009 01:39:27 -0000 1.3 @@ -1,14 +1,15 @@ ---- configure.in 2008-12-27 05:21:45.000000000 -0500 -+++ configure.in.new 2009-01-13 18:16:44.000000000 -0500 -@@ -31,26 +31,14 @@ +--- configure.in 2009-02-25 00:22:38.000000000 -0500 ++++ configure.in.new 2009-03-03 10:15:18.000000000 -0500 +@@ -31,27 +31,15 @@ MYPCFILES="tokyocabinet.pc" # Building flags -MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2" --MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include -DNDEBUG -D_GNU_SOURCE=1" +-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include" ++MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char" ++MYCPPFLAGS="-I. -I\$(INCLUDEDIR)" + MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__" -MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib" -+MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char $CFLAGS" -+MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -DNDEBUG -D_GNU_SOURCE=1" +MYLDFLAGS="-L. -L\$(LIBDIR)" MYCMDLDFLAGS="" MYRUNPATH="\$(LIBDIR)" @@ -30,17 +31,8 @@ #================================================================ # Options #================================================================ -@@ -103,7 +91,7 @@ - AC_HELP_STRING([--enable-fastest], [build for fastest run])) - if test "$enable_fastest" = "yes" - then -- MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char -O3" -+ MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char $CFLAGS -O3" - MYCFLAGS="$MYCFLAGS -fomit-frame-pointer -fforce-addr -minline-all-stringops" - MYCPPFLAGS="$MYCPPFLAGS -D_MYFASTEST" - enables="$enables (fastest)" ---- Makefile.in 2008-12-22 12:02:44.000000000 -0500 -+++ Makefile.in.new 2009-01-13 18:17:54.000000000 -0500 +--- Makefile.in 2009-02-23 11:37:15.000000000 -0500 ++++ Makefile.in.new 2009-03-03 09:56:36.000000000 -0500 @@ -54,8 +54,8 @@ LDFLAGS = @MYLDFLAGS@ CMDLDFLAGS = @MYCMDLDFLAGS@ @@ -53,7 +45,7 @@ --- tokyocabinet.pc.in 2008-02-18 02:25:18.000000000 -0500 -+++ tokyocabinet.pc.in.new 2009-01-13 18:18:52.000000000 -0500 ++++ tokyocabinet.pc.in.new 2009-03-03 09:57:26.000000000 -0500 @@ -10,5 +10,5 @@ Name: Tokyo Cabinet Description: a modern implementation of DBM Index: tokyocabinet.spec =================================================================== RCS file: /cvs/pkgs/rpms/tokyocabinet/EL-5/tokyocabinet.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tokyocabinet.spec 25 Feb 2009 21:11:05 -0000 1.10 +++ tokyocabinet.spec 4 Mar 2009 01:39:27 -0000 1.11 @@ -1,7 +1,7 @@ Summary: A modern implementation of a DBM Name: tokyocabinet -Version: 1.3.27 -Release: 2%{?dist} +Version: 1.4.9 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://tokyocabinet.sourceforge.net/ @@ -70,6 +70,10 @@ %doc doc/* %changelog +* Tue Mar 03 2009 Deji Akingunola - 1.4.9-1 +- Update to version 1.4.9 +- First build for EPEL + * Wed Feb 25 2009 Fedora Release Engineering - 1.3.27-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From crobinso at fedoraproject.org Wed Mar 4 01:41:45 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 4 Mar 2009 01:41:45 +0000 (UTC) Subject: rpms/python-virtinst/devel .cvsignore, 1.16, 1.17 python-virtinst.spec, 1.54, 1.55 sources, 1.16, 1.17 virtinst-0.400.1-fedora11-ostype.patch, 1.1, NONE virtinst-0.400.1-fix-extra-args.patch, 1.1, NONE Message-ID: <20090304014145.71B1D70116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15578 Modified Files: .cvsignore python-virtinst.spec sources Removed Files: virtinst-0.400.1-fedora11-ostype.patch virtinst-0.400.1-fix-extra-args.patch Log Message: Update to upstream 0.400.2: virt-install --import option for creating a guest from an existing disk virt-install --host-device option for host device passthrough virt-clone --original-xml for cloning from an xml file virt-install --nonetworks option. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 27 Jan 2009 00:49:30 -0000 1.16 +++ .cvsignore 4 Mar 2009 01:41:14 -0000 1.17 @@ -1 +1 @@ -virtinst-0.400.1.tar.gz +virtinst-0.400.2.tar.gz Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- python-virtinst.spec 27 Feb 2009 11:49:10 -0000 1.54 +++ python-virtinst.spec 4 Mar 2009 01:41:14 -0000 1.55 @@ -10,11 +10,9 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} -Version: 0.400.1 -Release: 3%{_extra_release} +Version: 0.400.2 +Release: 1%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz -Patch1: %{appname}-%{version}-fix-extra-args.patch -Patch2: %{appname}-%{version}-fedora11-ostype.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,11 +27,8 @@ Requires: urlgrabber Requires: libxml2-python Requires: python-urlgrabber -BuildRequires: python-devel -BuildRequires: libxml2-python -BuildRequires: python-urlgrabber -BuildRequires: libvirt-python BuildRequires: gettext +BuildRequires: python-devel %description virtinst is a module that helps build and install libvirt based virtual @@ -43,8 +38,6 @@ %prep %setup -q -n %{appname}-%{version} -%patch1 -p1 -%patch2 -p1 %build python setup.py build @@ -78,6 +71,13 @@ %{_bindir}/virt-convert %changelog +* Tue Mar 3 2009 Cole Robinson - 0.400.2-1.fc11 +- Update to version 0.400.2 +- virt-install --import option for creating a guest from an existing disk +- virt-install --host-device option for host device passthrough +- virt-clone --original-xml for cloning from an xml file +- virt-install --nonetworks option. + * Fri Feb 27 2009 Daniel P. Berrange - 0.400.1-3.fc11 - Add Fedora 11 OS type with USB tablet (rhbz #487028) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 27 Jan 2009 00:49:30 -0000 1.16 +++ sources 4 Mar 2009 01:41:14 -0000 1.17 @@ -1 +1 @@ -f7fa786880929ed98e28982fa8ec5343 virtinst-0.400.1.tar.gz +4bde385a237a7b1d250bd7c67687bbf5 virtinst-0.400.2.tar.gz --- virtinst-0.400.1-fedora11-ostype.patch DELETED --- --- virtinst-0.400.1-fix-extra-args.patch DELETED --- From simo at fedoraproject.org Wed Mar 4 01:53:08 2009 From: simo at fedoraproject.org (Simo Sorce) Date: Wed, 4 Mar 2009 01:53:08 +0000 (UTC) Subject: rpms/samba4/devel samba4.spec,1.4,1.5 Message-ID: <20090304015308.1D36C70116@cvs1.fedora.phx.redhat.com> Author: simo Update of /cvs/pkgs/rpms/samba4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17285 Modified Files: samba4.spec Log Message: * Mon Mar 2 2009 Simo Sorce - 4.0.0-7alpha7 - Compile and have separate packages for additional samba libraries Package in their own packages: talloc, tdb, tevent, ldb Index: samba4.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba4/devel/samba4.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- samba4.spec 3 Mar 2009 22:43:09 -0000 1.4 +++ samba4.spec 4 Mar 2009 01:52:37 -0000 1.5 @@ -1,4 +1,4 @@ -%define main_release 6 +%define main_release 7 %define samba4_version 4.0.0 %define talloc_version 1.2.0 @@ -81,6 +81,7 @@ BuildRequires: readline-devel BuildRequires: sed BuildRequires: autoconf +BuildRequires: openldap-devel %description @@ -281,38 +282,46 @@ #cd source4 #script/mkversion.sh #cd .. -cp -a source4/lib/ldb lib/ldb + +# For now copy libraries into another part of the tree, because the samba4 +# build would fail if it finds standalone bits already built +mkdir -p standalone/lib +cp -a lib/replace standalone/lib/replace +cp -a lib/talloc standalone/lib/talloc +cp -a lib/tdb standalone/lib/tdb +cp -a lib/tevent standalone/lib/tevent +cp -a source4/lib/ldb standalone/lib/ldb %build -%define shared_build_dir %{_sourcedir}/sbtmp +%define shared_build_dir %{_sourcedir}/standalone/sbtmp SAVE_LDLPATH=$LD_LIBRARY_PATH SAVE_CFLAGS=$CFLAGS -export LD_LIBRARY_PATH=%{shared_build_dir}/%{_lib} +export LD_LIBRARY_PATH=%{shared_build_dir}/lib export CFLAGS="$CFLAGS -I%{shared_build_dir}/include" # talloc -pushd lib/talloc +pushd standalone/lib/talloc ./autogen.sh %configure --with-shared-build-dir=%{shared_build_dir} make shared-build %{?_smp_mflags} popd # tdb -pushd lib/tdb +pushd standalone/lib/tdb ./autogen.sh %configure --with-shared-build-dir=%{shared_build_dir} make shared-build %{?_smp_mflags} popd # tevent -pushd lib/tevent +pushd standalone/lib/tevent ./autogen.sh %configure --with-shared-build-dir=%{shared_build_dir} make shared-build %{?_smp_mflags} popd # ldb -pushd lib/ldb +pushd standalone/lib/ldb ./autogen.sh %configure --with-shared-build-dir=%{shared_build_dir} make shared-build # %{?_smp_mflags} XXX Causes build failure on F10 @@ -419,7 +428,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/setnttoken rm $RPM_BUILD_ROOT%{_bindir}/smbtorture rm $RPM_BUILD_ROOT%{_bindir}/subunitrun -#rm $RPM_BUILD_ROOT%{_bindir}/tdbtorture +rm $RPM_BUILD_ROOT%{_bindir}/tdbtorture # Avoids a file conflict with perl-Parse-Yapp. rm -rf $RPM_BUILD_ROOT%{perl_vendorlib}/Parse/Yapp @@ -471,26 +480,26 @@ %endif # talloc -pushd lib/talloc +pushd standalone/lib/talloc make install DESTDIR=$RPM_BUILD_ROOT ln -s libtalloc.so.%{talloc_version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so -find $RPM_BUILD_ROOT/usr/share/swig -name talloc.i -delete +#rm -f $RPM_BUILD_ROOT/usr/share/swig/*/talloc.i || : popd # tdb -pushd lib/tdb +pushd standalone/lib/tdb make install DESTDIR=$RPM_BUILD_ROOT ln -s libtdb.so.%{tdb_version} $RPM_BUILD_ROOT%{_libdir}/libtdb.so popd # tevent -pushd lib/tevent +pushd standalone/lib/tevent make install DESTDIR=$RPM_BUILD_ROOT ln -s libtevent.so.%{tevent_version} $RPM_BUILD_ROOT%{_libdir}/libtevent.so popd # ldb -pushd lib/ldb +pushd standalone/lib/ldb make install DESTDIR=$RPM_BUILD_ROOT ln -s -f libldb.so.%{ldb_version} $RPM_BUILD_ROOT%{_libdir}/libldb.so mkdir $RPM_BUILD_ROOT%{_libdir}/ldb @@ -730,8 +739,8 @@ %{_mandir}/man1/ldbmodify.1.* %{_mandir}/man1/ldbrename.1.* %{_mandir}/man1/ldbsearch.1.* -%{_mandir}/man1/ad2oLschema.1.gz -%{_mandir}/man1/oLschema2ldif.1.gz +#%{_mandir}/man1/ad2oLschema.1.gz +#%{_mandir}/man1/oLschema2ldif.1.gz %files -n libtalloc-devel %defattr(-,root,root,-) @@ -763,7 +772,7 @@ %{_mandir}/man3/ldb.3.gz %changelog -* Mon Mar 2 2009 Simo Sorce - 4.0.0-6alpha7 +* Mon Mar 2 2009 Simo Sorce - 4.0.0-7alpha7 - Compile and have separate packages for additional samba libraries Package in their own packages: talloc, tdb, tevent, ldb From mclasen at fedoraproject.org Wed Mar 4 01:53:13 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Wed, 4 Mar 2009 01:53:13 +0000 (UTC) Subject: rpms/gnome-media/devel .cvsignore, 1.49, 1.50 gnome-media.spec, 1.155, 1.156 sources, 1.48, 1.49 Message-ID: <20090304015313.91EEC70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-media/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17258 Modified Files: .cvsignore gnome-media.spec sources Log Message: 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-media/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 20 Jan 2009 22:07:03 -0000 1.49 +++ .cvsignore 4 Mar 2009 01:52:43 -0000 1.50 @@ -1 +1 @@ -gnome-media-2.25.5.tar.bz2 +gnome-media-2.25.92.tar.bz2 Index: gnome-media.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- gnome-media.spec 24 Feb 2009 23:04:52 -0000 1.155 +++ gnome-media.spec 4 Mar 2009 01:52:43 -0000 1.156 @@ -13,13 +13,13 @@ Summary: GNOME media programs Name: gnome-media -Version: 2.25.5 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} License: GPLv2+ and GFDL Group: Applications/Multimedia Source: http://download.gnome.org/sources/gnome-media/2.25/gnome-media-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: gnome URL: http://www.gnome.org ExcludeArch: s390 s390x @@ -45,9 +45,6 @@ BuildRequires: gnome-doc-utils BuildRequires: intltool -# Work-around for fontconfig bug https://bugzilla.redhat.com/show_bug.cgi?id=480928 -BuildRequires: liberation-sans-fonts - %description This package contains a few media utilities for the GNOME desktop, including a sound recorder and an audio mixer. @@ -62,7 +59,7 @@ Requires: pkgconfig %description devel -This package contains the libraries and header files necessary to +This package contains the libraries and header files necessary to develop GNOME media applications. %package libs @@ -78,7 +75,7 @@ %setup -q %build -# try to work around a problem where gst-inspect does +# try to work around a problem where gst-inspect does # not find playbin the first time around DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all > /dev/null %configure --disable-schemas-install --enable-gnomecd=no --enable-cddbslave=no @@ -249,6 +246,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Mar 3 2009 Matthias Clasen 2.25.92-1 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-media/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 20 Jan 2009 22:07:03 -0000 1.48 +++ sources 4 Mar 2009 01:52:43 -0000 1.49 @@ -1 +1 @@ -03985c7331f53c283286bc46962f702b gnome-media-2.25.5.tar.bz2 +0d58bb8e1b9efd1e6b79d75cedb040fb gnome-media-2.25.92.tar.bz2 From toshio at fedoraproject.org Wed Mar 4 01:58:39 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Wed, 4 Mar 2009 01:58:39 +0000 (UTC) Subject: rpms/python-turbojson/devel python-turbojson.spec,1.12,1.13 Message-ID: <20090304015839.E7D8470116@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-turbojson/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18468 Modified Files: python-turbojson.spec Log Message: * Tue Mar 3 2009 Toshio Kuratomi - 1.2.1-5 - Enable test suite. Index: python-turbojson.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-turbojson/devel/python-turbojson.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- python-turbojson.spec 26 Feb 2009 23:51:05 -0000 1.12 +++ python-turbojson.spec 4 Mar 2009 01:58:09 -0000 1.13 @@ -5,7 +5,7 @@ Name: python-turbojson Version: 1.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python template plugin that supports json Group: Development/Languages @@ -41,6 +41,8 @@ rm -rf %{buildroot} %{__python} setup.py install --skip-build --root=%{buildroot} +%check +python setup.py test %clean rm -rf %{buildroot} @@ -53,6 +55,9 @@ %changelog +* Tue Mar 3 2009 Toshio Kuratomi - 1.2.1-5 +- Enable test suite. + * Thu Feb 26 2009 Fedora Release Engineering - 1.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From toshio at fedoraproject.org Wed Mar 4 02:00:37 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Wed, 4 Mar 2009 02:00:37 +0000 (UTC) Subject: rpms/python-turbojson/EL-5 .cvsignore, 1.3, 1.4 python-turbojson.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <20090304020037.2518D70116@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-turbojson/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18829 Modified Files: .cvsignore python-turbojson.spec sources Log Message: * Tue Mar 3 2009 Toshio Kuratomi - 1.2.1-5 - Enable test suite. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-turbojson/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Nov 2007 20:24:51 -0000 1.3 +++ .cvsignore 4 Mar 2009 02:00:06 -0000 1.4 @@ -1 +1 @@ -TurboJson-1.1.2.tar.gz +TurboJson-1.2.1.tar.gz Index: python-turbojson.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-turbojson/EL-5/python-turbojson.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-turbojson.spec 2 Feb 2008 18:01:13 -0000 1.4 +++ python-turbojson.spec 4 Mar 2009 02:00:06 -0000 1.5 @@ -4,22 +4,25 @@ %define module turbojson Name: python-turbojson -Version: 1.1.2 -Release: 3%{?dist} +Version: 1.2.1 +Release: 5%{?dist} Summary: Python template plugin that supports json Group: Development/Languages License: MIT URL: http://cheeseshop.python.org/pypi/TurboJson Source0: http://pypi.python.org/packages/source/T/TurboJson/TurboJson-%{version}.tar.gz -# Backport of upstream patch to fix SQLAlchemy support:: -# http://trac.turbogears.org/changeset/3749?format=diff&new=3749 -Patch0: python-turbojson-SAfix-r3749.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel +BuildRequires: python-prioritized-methods > 0.2 +BuildRequires: python-peak-rules >= 0.5a1.dev-0.2555 + +Requires: python-peak-rules >= 0.5a1.dev-0.2555 +Requires: python-simplejson >= 1.9.1 +Requires: python-prioritized-methods > 0.2 %description This package provides a template engine plugin, allowing you @@ -29,7 +32,6 @@ %prep %setup -q -n TurboJson-%{version} -%patch0 -p0 %build %{__python} setup.py build @@ -39,6 +41,8 @@ rm -rf %{buildroot} %{__python} setup.py install --skip-build --root=%{buildroot} +%check +python setup.py test %clean rm -rf %{buildroot} @@ -51,6 +55,26 @@ %changelog +* Tue Mar 3 2009 Toshio Kuratomi - 1.2.1-5 +- Enable test suite. + +* Thu Feb 26 2009 Fedora Release Engineering - 1.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.2.1-3 +- Rebuild for Python 2.6 + +* Wed Sep 17 2008 Luke Macken 1.2.1-2 +- Require python-prioritized-methods > 0.2 + +* Tue Sep 16 2008 Luke Macken 1.2.1-1 +- Latest release of the 1.2.x series +- Require python-peak-rules (#459157, #459117) + +* Sun Jun 22 2008 Luke Macken 1.2-1 +- Latest upstream release, intended to be used with the upcoming TurboGears 1.1 version. +- Remove python-turbojson-SAfix-r3749.patch + * Sat Feb 2 2008 Toshio Kuratomi 1.1.2-3 - ...and remember to include the patch in cvs. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-turbojson/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Nov 2007 20:24:51 -0000 1.3 +++ sources 4 Mar 2009 02:00:06 -0000 1.4 @@ -1 +1 @@ -21969123122e02d87e2727a73e950796 TurboJson-1.1.2.tar.gz +57fbcd25c831c53ae9d4c595233925eb TurboJson-1.2.1.tar.gz From glommer at fedoraproject.org Wed Mar 4 02:07:02 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 4 Mar 2009 02:07:02 +0000 (UTC) Subject: rpms/qemu/devel qemu.spec,1.54,1.55 Message-ID: <20090304020702.B5ECD70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19883 Modified Files: qemu.spec Log Message: added kvm debugging tools Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- qemu.spec 4 Mar 2009 01:17:10 -0000 1.54 +++ qemu.spec 4 Mar 2009 02:06:32 -0000 1.55 @@ -118,6 +118,16 @@ %qemupkgdesc system-m68k {system emulator for m68k} %qemupkgdesc system-sh4 {system emulator for sh4} +%ifarch %{ix86} x86_64 +%package kvm-tools +Summary: KVM debugging and diagnostics tools +Group: Development/Tools + +%description kvm-tools +This package contains some diagnostics and debugging tools for KVM, +such as kvmtrace and kvm_stat. +%endif + %prep %setup -q -n kvm-84.git-snapshot-20090303 # 01-tls-handshake-fix @@ -165,6 +175,8 @@ make %{?_smp_mflags} $buildldflags cp qemu/x86_64-softmmu/qemu-system-x86_64 qemu-kvm +cp user/kvmtrace . +cp user/kvmtrace_format . make clean %endif @@ -201,6 +213,9 @@ %ifarch %{ix86} x86_64 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules +install -m 0755 kvmtrace %{buildroot}/%{_bindir}/ +install -m 0755 kvmtrace_format %{buildroot}/%{_bindir}/ +install -m 0755 kvm_stat %{buildroot}/%{_bindir}/ %endif cd qemu @@ -297,13 +312,18 @@ %defattr(-,root,root) %{_bindir}/qemu %{_bindir}/qemu-system-x86_64 +%{_prefix}/share/qemu/bios.bin +%{_prefix}/share/qemu/vgabios.bin +%{_prefix}/share/qemu/vgabios-cirrus.bin %ifarch %{ix86} x86_64 %{_bindir}/qemu-kvm %{_sysconfdir}/sysconfig/modules/kvm.modules +%files kvm-tools +%defattr(-,root,root,-) +%{_bindir}/kvmtrace +%{_bindir}/kvmtrace_format +%{_bindir}/kvm_stat %endif -%{_prefix}/share/qemu/bios.bin -%{_prefix}/share/qemu/vgabios.bin -%{_prefix}/share/qemu/vgabios-cirrus.bin %files system-sparc %defattr(-,root,root) %{_bindir}/qemu-system-sparc @@ -342,6 +362,7 @@ %changelog * Tue Mar 03 2009 Glauber Costa - 0.10-0.3.kvm20090303git - only execute post scripts for user package. +- added kvm tools. * Tue Mar 03 2009 Glauber Costa - 0.10-0.2.kvm20090303git - put kvm.modules into cvs From toshio at fedoraproject.org Wed Mar 4 02:08:17 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Wed, 4 Mar 2009 02:08:17 +0000 (UTC) Subject: rpms/python-turbojson/devel python-turbojson.spec,1.13,1.14 Message-ID: <20090304020817.E386970116@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-turbojson/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20250 Modified Files: python-turbojson.spec Log Message: * Tue Mar 3 2009 Toshio Kuratomi - 1.2.1-6 - Add BR on simplejson so testsuite will run. Index: python-turbojson.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-turbojson/devel/python-turbojson.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- python-turbojson.spec 4 Mar 2009 01:58:09 -0000 1.13 +++ python-turbojson.spec 4 Mar 2009 02:07:47 -0000 1.14 @@ -5,7 +5,7 @@ Name: python-turbojson Version: 1.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Python template plugin that supports json Group: Development/Languages @@ -19,6 +19,7 @@ BuildRequires: python-setuptools-devel BuildRequires: python-prioritized-methods > 0.2 BuildRequires: python-peak-rules >= 0.5a1.dev-0.2555 +BuildRequires: python-simplejson >= 1.9.1 Requires: python-peak-rules >= 0.5a1.dev-0.2555 Requires: python-simplejson >= 1.9.1 @@ -55,6 +56,9 @@ %changelog +* Tue Mar 3 2009 Toshio Kuratomi - 1.2.1-6 +- Add BR on simplejson so testsuite will run. + * Tue Mar 3 2009 Toshio Kuratomi - 1.2.1-5 - Enable test suite. From nosnilmot at fedoraproject.org Wed Mar 4 02:09:57 2009 From: nosnilmot at fedoraproject.org (Stu Tomlinson) Date: Wed, 4 Mar 2009 02:09:57 +0000 (UTC) Subject: rpms/pidgin/devel .cvsignore, 1.22, 1.23 pidgin.spec, 1.67, 1.68 sources, 1.22, 1.23 Message-ID: <20090304020957.21A8970116@cvs1.fedora.phx.redhat.com> Author: nosnilmot Update of /cvs/pkgs/rpms/pidgin/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20573 Modified Files: .cvsignore pidgin.spec sources Log Message: Pidgin 2.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 12 Jan 2009 19:36:21 -0000 1.22 +++ .cvsignore 4 Mar 2009 02:09:26 -0000 1.23 @@ -1 +1 @@ -pidgin-2.5.4.tar.bz2 +pidgin-2.5.5.tar.bz2 Index: pidgin.spec =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- pidgin.spec 26 Feb 2009 22:59:46 -0000 1.67 +++ pidgin.spec 4 Mar 2009 02:09:26 -0000 1.68 @@ -61,8 +61,8 @@ %endif Name: pidgin -Version: 2.5.4 -Release: 3%{?dist} +Version: 2.5.5 +Release: 1%{?dist} License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls # GPLv2 - silc & novell prpls @@ -571,6 +571,9 @@ %endif %changelog +* Tue Mar 03 2009 Stu Tomlinson 2.5.5-1 +- 2.5.5 + * Thu Feb 26 2009 Fedora Release Engineering - 2.5.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 12 Jan 2009 19:36:21 -0000 1.22 +++ sources 4 Mar 2009 02:09:26 -0000 1.23 @@ -1 +1 @@ -295fe533288c821342b660b6fc83bc11 pidgin-2.5.4.tar.bz2 +972101ca88a2ad338aad1fc4be5e1a8c pidgin-2.5.5.tar.bz2 From abompard at fedoraproject.org Wed Mar 4 02:19:31 2009 From: abompard at fedoraproject.org (Aurelien Bompard) Date: Wed, 4 Mar 2009 02:19:31 +0000 (UTC) Subject: rpms/pure-ftpd/devel pure-ftpd.spec,1.23,1.24 Message-ID: <20090304021932.0E14270116@cvs1.fedora.phx.redhat.com> Author: abompard Update of /cvs/pkgs/rpms/pure-ftpd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21396 Modified Files: pure-ftpd.spec Log Message: * Wed Mar 04 2009 Aurelien Bompard 1.0.21-20 - make pam and consolehelper's conf files noreplace Index: pure-ftpd.spec =================================================================== RCS file: /cvs/pkgs/rpms/pure-ftpd/devel/pure-ftpd.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- pure-ftpd.spec 27 Feb 2009 03:01:27 -0000 1.23 +++ pure-ftpd.spec 4 Mar 2009 02:19:01 -0000 1.24 @@ -1,6 +1,6 @@ Name: pure-ftpd Version: 1.0.21 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Lightweight, fast and secure FTP server Group: System Environment/Daemons @@ -239,8 +239,8 @@ %config(noreplace) %{_sysconfdir}/pam.d/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/xinetd.d/%{name} -%config %{_sysconfdir}/pam.d/pure-ftpwho -%config %{_sysconfdir}/security/console.apps/pure-ftpwho +%config(noreplace) %{_sysconfdir}/pam.d/pure-ftpwho +%config(noreplace) %{_sysconfdir}/security/console.apps/pure-ftpwho %{!?_without_tls:%{_sysconfdir}/pki/%{name}} %{_mandir}/man8/* %dir /var/ftp/ @@ -253,6 +253,9 @@ %changelog +* Wed Mar 04 2009 Aurelien Bompard 1.0.21-20 +- make pam and consolehelper's conf files noreplace + * Thu Feb 26 2009 Fedora Release Engineering - 1.0.21-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From abompard at fedoraproject.org Wed Mar 4 02:21:04 2009 From: abompard at fedoraproject.org (Aurelien Bompard) Date: Wed, 4 Mar 2009 02:21:04 +0000 (UTC) Subject: rpms/pure-ftpd/F-10 pure-ftpd.spec,1.20,1.21 Message-ID: <20090304022104.6F6F970116@cvs1.fedora.phx.redhat.com> Author: abompard Update of /cvs/pkgs/rpms/pure-ftpd/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21695 Modified Files: pure-ftpd.spec Log Message: * Wed Mar 04 2009 Aurelien Bompard 1.0.21-20 - make pam and consolehelper's conf files noreplace Index: pure-ftpd.spec =================================================================== RCS file: /cvs/pkgs/rpms/pure-ftpd/F-10/pure-ftpd.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- pure-ftpd.spec 5 Jun 2008 12:36:51 -0000 1.20 +++ pure-ftpd.spec 4 Mar 2009 02:20:34 -0000 1.21 @@ -1,6 +1,6 @@ Name: pure-ftpd Version: 1.0.21 -Release: 16%{?dist} +Release: 20%{?dist} Summary: Lightweight, fast and secure FTP server Group: System Environment/Daemons @@ -239,8 +239,8 @@ %config(noreplace) %{_sysconfdir}/pam.d/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/xinetd.d/%{name} -%config %{_sysconfdir}/pam.d/pure-ftpwho -%config %{_sysconfdir}/security/console.apps/pure-ftpwho +%config(noreplace) %{_sysconfdir}/pam.d/pure-ftpwho +%config(noreplace) %{_sysconfdir}/security/console.apps/pure-ftpwho %{!?_without_tls:%{_sysconfdir}/pki/%{name}} %{_mandir}/man8/* %dir /var/ftp/ @@ -253,6 +253,18 @@ %changelog +* Wed Mar 04 2009 Aurelien Bompard 1.0.21-20 +- make pam and consolehelper's conf files noreplace + +* Thu Feb 26 2009 Fedora Release Engineering - 1.0.21-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Jan 24 2009 Aurelien Bompard 1.0.21-18 +- Rebuild for mysql + +* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 1.0.21-17 +- Rebuild for Python 2.6 + * Thu Jun 05 2008 Aurelien Bompard 1.0.21-16 - Rebuild for libcap.so.2 (bug 450086) From glommer at fedoraproject.org Wed Mar 4 02:30:59 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 4 Mar 2009 02:30:59 +0000 (UTC) Subject: rpms/kvm/devel kvm.spec,1.89,1.90 Message-ID: <20090304023059.2767B70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/kvm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23025 Modified Files: kvm.spec Log Message: use source from qemu package. use this a a meta package to make migration work properly Index: kvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- kvm.spec 25 Feb 2009 12:15:36 -0000 1.89 +++ kvm.spec 4 Mar 2009 02:30:28 -0000 1.90 @@ -1,40 +1,25 @@ Summary: Kernel-based Virtual Machine Name: kvm Version: 84 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://%{name}.sf.net -Source0: http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz +#Source0: http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz #Source0: http://people.qumranet.com:8888/avi/snapshots/kvm-snapshot-%{snapshot}.tar.gz -Source1: %{name}.modules -Patch0: %{name}-62-block-rw-range-check.patch -Patch1: %{name}-83-compile-fixes.patch +#Source1: %{name}.modules +#Patch0: %{name}-62-block-rw-range-check.patch +#Patch1: %{name}-83-compile-fixes.patch # patches from upstream qemu BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel -# to build the bios -BuildRequires: dev86 -BuildRequires: iasl -BuildRequires: zlib-devel -# to check for binary blobs -BuildRequires: file -# TLS / x509 auth in VNC server -BuildRequires: gnutls-devel -# for the docs -BuildRequires: texi2html -BuildRequires: rsync # kvm kernel side is only x86/x86_64 as that's where the hardware is ExclusiveArch: %{ix86} x86_64 ia64 -Requires: initscripts >= 8.08-1 - -# We use the roms on /usr/share/etherboot -Requires: etherboot-roms-kvm - +Requires: qemu-system-x86 %package tools Summary: KVM debugging and diagnostics tools Group: Development/Tools +Requires: qemu-kvm-tools %description @@ -52,111 +37,10 @@ %prep -%setup -q - -%patch0 -p1 -b .block-rw-range-check -%patch1 -p1 -b .compile-fixes - -# "configure --kerneldir" looks for this -# FIXME: kvm-84 or later shouldn't need this anymore, see: -# http://git.kernel.org/?p=linux/kernel/git/marcelo/kvm-userspace.git;a=commit;h=4f45aa2db -echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease - -# we must not use any of the binaries from the qemu/pc-bios/ directory, -# as they don't have the corresponding sources shipped with them -rm -f qemu/pc-bios/*.{bin,x,dtb} qemu/pc-bios/openbios-* -find qemu/pc-bios -exec file {} \; | grep '\(data\|BIOS\|executable\)' && \ - echo "Found some binary blobs in qemu/pc-bios!" && exit 1 - %build -# systems like rhel build system does not have a recent enough linker so -# --build-id works. this option is used fedora 8 onwards for giving info -# to the debug packages. - -build_id_available() { - echo "int main () { return 0; }" | gcc -x c -Wl,--build-id - 2>/dev/null -} - -if build_id_available; then - qemuldflags="-Wl,--build-id"; -else - qemuldflags=""; -fi - - -# we need to install the data bits in a different path -sed -i 's/datasuffix=\"\/share\/qemu\"/datasuffix=\"\/share\/kvm\"/' qemu/configure -./configure \ - --with-patched-kernel \ - --kerneldir=$(pwd)/kernel \ - --prefix=%{_prefix} \ - --qemu-ldflags=$qemuldflags \ - --disable-blobs \ - --audio-drv-list=sdl,alsa,oss -# sdl outputs to alsa or pulseaudio directly depending on what the system has configured -# alsa works, but causes huge CPU load due to bugs -# oss works, but is very problematic because it grabs exclusive control of the device causing other apps to go haywire - -# build the bios, and fix it's makefile -sed -i 's/gcc -m32/gcc/' bios/Makefile -make bios - -make vgabios - -# we can't use RPM_OPT_FLAGS for the same reasons as qemu (#208026) for the -# qemu bits. so let's set it for the other pieces. this requires some -# manual keeping up of what is in the kvm tree. -sed -i 's/CFLAGS =/CFLAGS +=/' user/Makefile -echo "CFLAGS=$RPM_OPT_FLAGS" >> user/config.mak -make %{?_smp_mflags} - - %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install - -# we have to have our own copies of the bios/keymaps due to incompat with -# qemu 0.9. include the man page -mv $RPM_BUILD_ROOT/%{_mandir}/man1/qemu.1* $RPM_BUILD_ROOT/%{_mandir}/man1/qemu-kvm.1 -rm -rf $RPM_BUILD_ROOT/%{_mandir}/man*/qemu-img* $RPM_BUILD_ROOT/%{_docdir} -rm -f $RPM_BUILD_ROOT/%{_bindir}/qemu-img -# no shared lib, static libs -rm -fr $RPM_BUILD_ROOT/%{_includedir} $RPM_BUILD_ROOT/%{_libdir} - -# make install gives it bogus execute permissiions -chmod -x $RPM_BUILD_ROOT/%{_mandir}/man1/qemu-kvm.1* - -install -d $RPM_BUILD_ROOT/%{_datadir}/%{name} -for i in bios.bin extboot.bin vgabios.bin vgabios-cirrus.bin -do - install -m 0644 qemu/pc-bios/$i $RPM_BUILD_ROOT/%{_datadir}/%{name}/$i -done - -mv $RPM_BUILD_ROOT/%{_bindir}/qemu-system-x86_64 $RPM_BUILD_ROOT/%{_bindir}/qemu-kvm - -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules -install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules -install -m 0755 user/kvmtrace %{buildroot}/%{_bindir}/ -install -m 0755 user/kvmtrace_format %{buildroot}/%{_bindir}/ -install -m 0755 kvm_stat %{buildroot}/%{_bindir}/ - -# the pxe etherboot images will be symlinks to the images on -# /usr/share/etherboot, as KVM doesn't know how to look -# for other paths, yet. -pxe_link() { - ln -s ../etherboot/$2.rom %{buildroot}/usr/share/kvm/pxe-$1.bin -} - -pxe_link e1000 e1000-82542 -pxe_link ne2k_pci ne -pxe_link pcnet pcnet32 -pxe_link rtl8139 rtl8139 -pxe_link virtio virtio-net - %post -# load kvm modules now, so we can make sure no reboot is needed. -# If there's already a kvm module installed, we don't mess with it -sh /%{_sysconfdir}/sysconfig/modules/kvm.modules %clean @@ -164,39 +48,14 @@ %files -%defattr(-,root,root,-) -%{_bindir}/qemu-kvm -%{_bindir}/qemu-nbd - -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/keymaps -%{_datadir}/%{name}/keymaps/* - -%{_datadir}/%{name}/bios.bin -%{_datadir}/%{name}/extboot.bin -%{_datadir}/%{name}/pxe-e1000.bin -%{_datadir}/%{name}/pxe-ne2k_pci.bin -%{_datadir}/%{name}/pxe-pcnet.bin -%{_datadir}/%{name}/pxe-rtl8139.bin -%{_datadir}/%{name}/pxe-virtio.bin -%{_datadir}/%{name}/vgabios-cirrus.bin -%{_datadir}/%{name}/vgabios.bin - -%{_mandir}/man1/qemu-kvm.1* -%{_mandir}/man8/qemu-nbd.8* - -%{_sysconfdir}/sysconfig/modules/%{name}.modules - %files tools -%defattr(-,root,root,-) -%{_bindir}/kvmtrace -%{_bindir}/kvmtrace_format -%{_bindir}/kvm_stat - %changelog +* Tue Mar 03 2009 Glauber Costa - 84.3 +- don't do anything here and use qemu package. + * Wed Feb 25 2009 Fedora Release Engineering - 84-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From toshio at fedoraproject.org Wed Mar 4 02:33:29 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Wed, 4 Mar 2009 02:33:29 +0000 (UTC) Subject: rpms/python-turbojson/EL-5 python-turbojson.spec,1.5,1.6 Message-ID: <20090304023329.317CD70116@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-turbojson/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23547/EL-5 Modified Files: python-turbojson.spec Log Message: And BR python-nose... Now testsuite will complete. Index: python-turbojson.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-turbojson/EL-5/python-turbojson.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-turbojson.spec 4 Mar 2009 02:00:06 -0000 1.5 +++ python-turbojson.spec 4 Mar 2009 02:32:58 -0000 1.6 @@ -5,7 +5,7 @@ Name: python-turbojson Version: 1.2.1 -Release: 5%{?dist} +Release: 7%{?dist} Summary: Python template plugin that supports json Group: Development/Languages @@ -19,6 +19,8 @@ BuildRequires: python-setuptools-devel BuildRequires: python-prioritized-methods > 0.2 BuildRequires: python-peak-rules >= 0.5a1.dev-0.2555 +BuildRequires: python-simplejson >= 1.9.1 +BuildRequires: python-nose Requires: python-peak-rules >= 0.5a1.dev-0.2555 Requires: python-simplejson >= 1.9.1 @@ -55,6 +57,12 @@ %changelog +* Tue Mar 3 2009 Toshio Kuratomi - 1.2.1-7 +- And nose + +* Tue Mar 3 2009 Toshio Kuratomi - 1.2.1-6 +- Add BR on simplejson so testsuite will run. + * Tue Mar 3 2009 Toshio Kuratomi - 1.2.1-5 - Enable test suite. From toshio at fedoraproject.org Wed Mar 4 02:33:29 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Wed, 4 Mar 2009 02:33:29 +0000 (UTC) Subject: rpms/python-turbojson/devel python-turbojson.spec,1.14,1.15 Message-ID: <20090304023329.78D7D70117@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-turbojson/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23547/devel Modified Files: python-turbojson.spec Log Message: And BR python-nose... Now testsuite will complete. Index: python-turbojson.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-turbojson/devel/python-turbojson.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- python-turbojson.spec 4 Mar 2009 02:07:47 -0000 1.14 +++ python-turbojson.spec 4 Mar 2009 02:32:58 -0000 1.15 @@ -5,7 +5,7 @@ Name: python-turbojson Version: 1.2.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Python template plugin that supports json Group: Development/Languages @@ -20,6 +20,7 @@ BuildRequires: python-prioritized-methods > 0.2 BuildRequires: python-peak-rules >= 0.5a1.dev-0.2555 BuildRequires: python-simplejson >= 1.9.1 +BuildRequires: python-nose Requires: python-peak-rules >= 0.5a1.dev-0.2555 Requires: python-simplejson >= 1.9.1 @@ -56,6 +57,9 @@ %changelog +* Tue Mar 3 2009 Toshio Kuratomi - 1.2.1-7 +- And nose + * Tue Mar 3 2009 Toshio Kuratomi - 1.2.1-6 - Add BR on simplejson so testsuite will run. From toshio at fedoraproject.org Wed Mar 4 02:58:50 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Wed, 4 Mar 2009 02:58:50 +0000 (UTC) Subject: rpms/TurboGears/EL-5 .cvsignore, 1.8, 1.9 TurboGears.spec, 1.20, 1.21 sources, 1.8, 1.9 Message-ID: <20090304025851.04EFF70116@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/TurboGears/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29047 Modified Files: .cvsignore TurboGears.spec sources Log Message: * Tue Mar 3 2009 Toshio Kuratomi 1.0.8-1 - 1.0.8 release - Remove ez_setup from setup.py so setup will run with lesser setuptools. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 15 May 2008 15:24:19 -0000 1.8 +++ .cvsignore 4 Mar 2009 02:58:19 -0000 1.9 @@ -1 +1 @@ -TurboGears-1.0.4.4.tar.gz +TurboGears-1.0.8.tar.gz Index: TurboGears.spec =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- TurboGears.spec 24 Aug 2008 23:56:07 -0000 1.20 +++ TurboGears.spec 4 Mar 2009 02:58:19 -0000 1.21 @@ -2,8 +2,8 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: TurboGears -Version: 1.0.4.4 -Release: 2%{?dist} +Version: 1.0.8 +Release: 1%{?dist} Summary: Back-to-front web development in Python Group: Development/Languages @@ -16,14 +16,25 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-devel python-setuptools-devel +BuildRequires: python-devel python-setuptools-devel BuildRequires: python-elementtree >= 1.2.6 +BuildRequires: python-nose python-configobj python-ruledispatch +BuildRequires: python-decoratortools python-turbojson python-simplejson python-kid +BuildRequires: python-formencode python-turbokid python-turbocheetah +BuildRequires: python-paste-script python-sqlobject python-sqlalchemy + +%if 0%{?fedora} >= 9 +Requires: python-cherrypy2 +BuildRequires: python-cherrypy2 +%else +Requires: python-cherrypy +BuildRequires: python-cherrypy +%endif Requires: python-elementtree >= 1.2.6 -Requires: python-cherrypy Requires: python-sqlalchemy Requires: python-kid >= 0.8 -Requires: python-sqlobject >= 0.7.1 +Requires: python-sqlobject >= 0.8 Requires: python-formencode >= 0.7.1 Requires: python-json >= 3.3 Requires: python-setuptools >= 0.6c2 @@ -62,12 +73,14 @@ %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +%{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} +%check +PYTHONPATH=$(pwd) nosetests -q %clean rm -rf %{buildroot} @@ -80,6 +93,10 @@ %{python_sitelib}/turbogears/ %changelog +* Tue Mar 3 2009 Toshio Kuratomi 1.0.8-1 +- 1.0.8 release +- Remove ez_setup from setup.py so setup will run with lesser setuptools. + * Mon Aug 18 2008 Luke Macken 1.0.4.4-2 - Make our SQLObject requirement less strict, to match the latest TG upstream. Fixes bug #459268. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 15 May 2008 15:24:19 -0000 1.8 +++ sources 4 Mar 2009 02:58:19 -0000 1.9 @@ -1 +1 @@ -a03a66fcf7d687fd7bd4205a01fd21dd TurboGears-1.0.4.4.tar.gz +845b29a588ae8d4e7591c7226daa6f98 TurboGears-1.0.8.tar.gz From toshio at fedoraproject.org Wed Mar 4 03:12:38 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Wed, 4 Mar 2009 03:12:38 +0000 (UTC) Subject: rpms/TurboGears/EL-5 TurboGears-1.0.8-cherrypyreq.patch, NONE, 1.1 TurboGears-1.0.8-setup.patch, NONE, 1.1 TurboGears-1.0.4.4-cherrypyreq.patch, 1.1, NONE TurboGears-1.0.4.4-setup.patch, 1.2, NONE Message-ID: <20090304031238.540C170116@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/TurboGears/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32559 Added Files: TurboGears-1.0.8-cherrypyreq.patch TurboGears-1.0.8-setup.patch Removed Files: TurboGears-1.0.4.4-cherrypyreq.patch TurboGears-1.0.4.4-setup.patch Log Message: Proper versions of patches TurboGears-1.0.8-cherrypyreq.patch: --- NEW FILE TurboGears-1.0.8-cherrypyreq.patch --- --- turbogears/config.py.orig 2008-12-18 16:42:03.000000000 -0500 +++ turbogears/config.py 2008-12-18 16:42:06.000000000 -0500 @@ -1,8 +1,10 @@ import os, glob, re +import pkg_resources +pkg_resources.require("CherryPy<3.0") + from cherrypy import config from configobj import ConfigObj -import pkg_resources import logging import logging.handlers TurboGears-1.0.8-setup.patch: --- NEW FILE TurboGears-1.0.8-setup.patch --- Index: setup.py =================================================================== --- setup.py.orig +++ setup.py @@ -1,5 +1,3 @@ -from ez_setup import use_setuptools -use_setuptools() from setuptools import setup, find_packages from pkg_resources import DistributionNotFound @@ -14,7 +12,6 @@ execfile(os.path.join("turbogears", "rel # setup params install_requires = [ "CherryPy >= 2.3.0, < 3.0.0alpha", - "ConfigObj >= 4.3.2", "DecoratorTools >= 1.4", "FormEncode >= 0.7.1", "PasteScript >= 1.6.2", @@ -23,7 +20,7 @@ install_requires = [ "simplejson >= 1.3", "TurboCheetah >= 1.0", # TurboJson >= 1.2 uses PEAK-Rules - "TurboJson >= 1.1.4, < 1.2", + "TurboJson >= 1.1.4", "TurboKid >= 1.0.4", ] --- TurboGears-1.0.4.4-cherrypyreq.patch DELETED --- --- TurboGears-1.0.4.4-setup.patch DELETED --- From toshio at fedoraproject.org Wed Mar 4 03:16:58 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Wed, 4 Mar 2009 03:16:58 +0000 (UTC) Subject: rpms/TurboGears/EL-5 TurboGears.spec,1.21,1.22 Message-ID: <20090304031658.890F470116@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/TurboGears/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv959 Modified Files: TurboGears.spec Log Message: Add correct patches to cvs. Index: TurboGears.spec =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- TurboGears.spec 4 Mar 2009 02:58:19 -0000 1.21 +++ TurboGears.spec 4 Mar 2009 03:16:28 -0000 1.22 @@ -3,7 +3,7 @@ Name: TurboGears Version: 1.0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Back-to-front web development in Python Group: Development/Languages @@ -93,6 +93,9 @@ %{python_sitelib}/turbogears/ %changelog +* Tue Mar 3 2009 Toshio Kuratomi 1.0.8-2 +- Add the correct patches to cvs + * Tue Mar 3 2009 Toshio Kuratomi 1.0.8-1 - 1.0.8 release - Remove ez_setup from setup.py so setup will run with lesser setuptools. From ausil at fedoraproject.org Wed Mar 4 03:37:31 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Wed, 4 Mar 2009 03:37:31 +0000 (UTC) Subject: rpms/kernel/devel kernel.spec,1.1375,1.1376 Message-ID: <20090304033731.528D770116@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/extras/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5698 Modified Files: kernel.spec Log Message: with sparc upstream merges the sparc image moved lets make sure we pick it up Index: kernel.spec =================================================================== RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1375 retrieving revision 1.1376 diff -u -r1.1375 -r1.1376 --- kernel.spec 4 Mar 2009 00:42:12 -0000 1.1375 +++ kernel.spec 4 Mar 2009 03:36:58 -0000 1.1376 @@ -312,7 +312,7 @@ %define asmarch sparc %define all_arch_configs kernel-%{version}-sparc64*.config %define make_target image -%define kernel_image arch/sparc64/boot/image +%define kernel_image arch/sparc/boot/image %define image_install_path boot %endif @@ -1792,6 +1792,9 @@ # and build. %changelog +* Wed Mar 04 2009 Dennis Gilmore - 2.6.29-0.195.rc6.git7 +- sparc kernel is now in arch/sparc/boot/image + * Wed Mar 04 2009 Ben Skeggs - drm: fix bustage of _DRM_SHM maps From kengert at fedoraproject.org Wed Mar 4 03:50:19 2009 From: kengert at fedoraproject.org (Kai Engert) Date: Wed, 4 Mar 2009 03:50:19 +0000 (UTC) Subject: rpms/nspr/devel nspr-bug-487844.patch,NONE,1.1 nspr.spec,1.41,1.42 Message-ID: <20090304035019.8A84C70116@cvs1.fedora.phx.redhat.com> Author: kengert Update of /cvs/extras/rpms/nspr/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9006 Modified Files: nspr.spec Added Files: nspr-bug-487844.patch Log Message: * Wed Mar 04 2009 Kai Engert - 4.7.3-5 - add a workaround for bug 487844 nspr-bug-487844.patch: --- NEW FILE nspr-bug-487844.patch --- Index: mozilla/nsprpub/pr/src/misc/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/nsprpub/pr/src/misc/Makefile.in,v retrieving revision 1.20 diff -u -u -8 -r1.20 Makefile.in --- mozilla/nsprpub/pr/src/misc/Makefile.in 7 Feb 2009 03:37:28 -0000 1.20 +++ mozilla/nsprpub/pr/src/misc/Makefile.in 4 Mar 2009 00:50:16 -0000 @@ -95,16 +95,31 @@ @$(MAKE_OBJDIR) ifeq (,$(filter-out 1100 1200 1300 1310,$(MSC_VER))) $(CC) -Fo$@ -c $(CFLAGS) -Op $(call abspath,$<) else $(CC) -Fo$@ -c $(CFLAGS) -fp:precise $(call abspath,$<) endif endif +# Need -fno-strict-aliasing because prdtoa.c violates strict aliasing rules +# (bug 439144). +# +# The dtoa.c test program won't pass without -ffloat-store in optimized +# builds, but I don't know why (may be related to bug 270502). +ifeq ($(OS_TARGET),Linux) +$(OBJDIR)/prdtoa.$(OBJ_SUFFIX): prdtoa.c + @$(MAKE_OBJDIR) +ifdef NEED_ABSOLUTE_PATH + $(CC) -o $@ -c $(CFLAGS) -ffloat-store -fno-strict-aliasing $(call abspath,$<) +else + $(CC) -o $@ -c $(CFLAGS) -ffloat-store -fno-strict-aliasing $< +endif +endif + # # Generate prerr.h, prerr.c, and prerr.properties from prerr.et. # build_prerr: cd $(srcdir); $(PERL) compile-et.pl prerr.et export:: $(TARGETS) Index: nspr.spec =================================================================== RCS file: /cvs/extras/rpms/nspr/devel/nspr.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- nspr.spec 26 Feb 2009 06:09:07 -0000 1.41 +++ nspr.spec 4 Mar 2009 03:49:47 -0000 1.42 @@ -1,7 +1,7 @@ Summary: Netscape Portable Runtime Name: nspr Version: 4.7.3 -Release: 4%{?dist} +Release: 5%{?dist} License: MPLv1.1 or GPLv2+ or LGPLv2+ URL: http://www.mozilla.org/projects/nspr/ Group: System Environment/Libraries @@ -15,6 +15,7 @@ Source2: nspr-config-vars.in Patch1: nspr-config-pc.patch +Patch2: nspr-bug-487844.patch %description NSPR provides platform independence for non-GUI operating system @@ -44,6 +45,7 @@ cp ./mozilla/nsprpub/config/nspr-config.in ./mozilla/nsprpub/config/nspr-config-pc.in %patch1 -p0 +%patch2 -p0 cp %{SOURCE2} ./mozilla/nsprpub/config/ @@ -131,6 +133,9 @@ %{_bindir}/nspr-config %changelog +* Wed Mar 04 2009 Kai Engert - 4.7.3-5 +- add a workaround for bug 487844 + * Wed Feb 25 2009 Fedora Release Engineering - 4.7.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From davej at fedoraproject.org Wed Mar 4 03:51:22 2009 From: davej at fedoraproject.org (Dave Jones) Date: Wed, 4 Mar 2009 03:51:22 +0000 (UTC) Subject: rpms/kernel/devel patch-2.6.29-rc7.bz2.sign, NONE, 1.1 .cvsignore, 1.1027, 1.1028 kernel.spec, 1.1376, 1.1377 sources, 1.988, 1.989 upstream, 1.900, 1.901 patch-2.6.29-rc6-git7.bz2.sign, 1.1, NONE patch-2.6.29-rc6.bz2.sign, 1.1, NONE Message-ID: <20090304035122.755A070116@cvs1.fedora.phx.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9301 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.29-rc7.bz2.sign Removed Files: patch-2.6.29-rc6-git7.bz2.sign patch-2.6.29-rc6.bz2.sign Log Message: 2.6.29-rc7 --- NEW FILE patch-2.6.29-rc7.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBJrdg9yGugalF9Dw4RAkFfAJ4xnteJus29MN1bxtl2e2Jth3eD9gCfSg+B 7+Al92iS+MSQAiNKlvYD9Ps= =d3rT -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.1027 retrieving revision 1.1028 diff -u -r1.1027 -r1.1028 --- .cvsignore 3 Mar 2009 21:55:18 -0000 1.1027 +++ .cvsignore 4 Mar 2009 03:50:51 -0000 1.1028 @@ -5,5 +5,4 @@ temp-* kernel-2.6.28 linux-2.6.28.tar.bz2 -patch-2.6.29-rc6.bz2 -patch-2.6.29-rc6-git7.bz2 +patch-2.6.29-rc7.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1376 retrieving revision 1.1377 diff -u -r1.1376 -r1.1377 --- kernel.spec 4 Mar 2009 03:36:58 -0000 1.1376 +++ kernel.spec 4 Mar 2009 03:50:51 -0000 1.1377 @@ -56,9 +56,9 @@ # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%define rcrev 6 +%define rcrev 7 # The git snapshot level -%define gitrev 7 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -102,7 +102,7 @@ %define doc_build_fail true %endif -%define rawhide_skip_docs 1 +%define rawhide_skip_docs 0 %if 0%{?rawhide_skip_docs} %define with_doc 0 %endif @@ -1013,7 +1013,7 @@ done %endif -ApplyPatch git-linus.diff +#ApplyPatch git-linus.diff # This patch adds a "make nonint_oldconfig" which is non-interactive and # also gives a list of missing options at the end. Useful for automated @@ -1792,6 +1792,9 @@ # and build. %changelog +* Wed Mar 04 2009 Dave Jones 2.6.29-0.197.rc7 +- 2.6.29-rc7 + * Wed Mar 04 2009 Dennis Gilmore - 2.6.29-0.195.rc6.git7 - sparc kernel is now in arch/sparc/boot/image Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.988 retrieving revision 1.989 diff -u -r1.988 -r1.989 --- sources 3 Mar 2009 21:55:19 -0000 1.988 +++ sources 4 Mar 2009 03:50:51 -0000 1.989 @@ -1,3 +1,2 @@ d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2 -26f67d99666834cc579094619821d3c8 patch-2.6.29-rc6.bz2 -46b64d52e8f2f1e5b55784beb939ee2e patch-2.6.29-rc6-git7.bz2 +9404c2ead603a80a3aad6361b5fc5413 patch-2.6.29-rc7.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.900 retrieving revision 1.901 diff -u -r1.900 -r1.901 --- upstream 3 Mar 2009 21:55:19 -0000 1.900 +++ upstream 4 Mar 2009 03:50:51 -0000 1.901 @@ -1,3 +1,2 @@ linux-2.6.28.tar.bz2 -patch-2.6.29-rc6.bz2 -patch-2.6.29-rc6-git7.bz2 +patch-2.6.29-rc7.bz2 --- patch-2.6.29-rc6-git7.bz2.sign DELETED --- --- patch-2.6.29-rc6.bz2.sign DELETED --- From mclasen at fedoraproject.org Wed Mar 4 03:58:51 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Wed, 4 Mar 2009 03:58:51 +0000 (UTC) Subject: rpms/tomboy/devel tomboy-applet-no-sm.patch, NONE, 1.1 tomboy.spec, 1.108, 1.109 Message-ID: <20090304035852.0A71D70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/tomboy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10839 Modified Files: tomboy.spec Added Files: tomboy-applet-no-sm.patch Log Message: Don't register with the session manager tomboy-applet-no-sm.patch: --- NEW FILE tomboy-applet-no-sm.patch --- diff -up tomboy-0.13.6/Tomboy/tomboy-panel.in.applet-no-sm tomboy-0.13.6/Tomboy/tomboy-panel.in --- tomboy-0.13.6/Tomboy/tomboy-panel.in.applet-no-sm 2009-03-03 22:55:13.579318772 -0500 +++ tomboy-0.13.6/Tomboy/tomboy-panel.in 2009-03-03 22:55:43.677285184 -0500 @@ -10,4 +10,6 @@ if [ -n "@extragac@" ]; then export MONO_GAC_PREFIX="@extragac@:$MONO_GAC_PREFIX" fi +# applets must not connect to the session manager +export SESSION_MANAGER= exec mono $MONO_EXTRA_ARGS $THIS_EXE --panel-applet "$@" Index: tomboy.spec =================================================================== RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- tomboy.spec 3 Mar 2009 02:31:55 -0000 1.108 +++ tomboy.spec 4 Mar 2009 03:58:21 -0000 1.109 @@ -1,6 +1,6 @@ Name: tomboy Version: 0.13.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Note-taking application Group: User Interface/Desktops @@ -12,6 +12,8 @@ Source0: http://download.gnome.org/sources/tomboy/0.13/%{name}-%{version}.tar.bz2 Patch1: tomboy-wrapper.patch Patch2: no-start-here.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=533537 +Patch3: tomboy-applet-no-sm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,6 +48,7 @@ %setup -q %patch1 -p1 -b .wrapper %patch2 -p1 -b .no-start-here +%patch3 -p1 -b .applet-no-sm autoreconf -f -i @@ -131,6 +134,9 @@ %changelog +* Tue Mar 3 2009 Matthias Clasen - 0.13.6-2 +- Applets must not register with the session manager + * Mon Mar 2 2009 Matthias Clasen - 0.13.6-1 - Update to 0.13.6 From mclasen at fedoraproject.org Wed Mar 4 04:16:29 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Wed, 4 Mar 2009 04:16:29 +0000 (UTC) Subject: rpms/GConf2/devel gconf-less-work.patch, NONE, 1.1 GConf2.spec, 1.98, 1.99 Message-ID: <20090304041629.A450070116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/GConf2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15199 Modified Files: GConf2.spec Added Files: gconf-less-work.patch Log Message: do less work gconf-less-work.patch: --- NEW FILE gconf-less-work.patch --- diff -up GConf-2.25.2/backends/markup-tree.c.less-work GConf-2.25.2/backends/markup-tree.c --- GConf-2.25.2/backends/markup-tree.c.less-work 2009-02-16 19:15:19.000000000 -0500 +++ GConf-2.25.2/backends/markup-tree.c 2009-03-03 23:14:07.741320798 -0500 @@ -2167,51 +2167,40 @@ locate_attributes (GMarkupParseContext * retval = TRUE; - i = 0; - while (attribute_names[i]) + for (i = 0; attribute_names[i]; i++) { int j; - gboolean found; - found = FALSE; - j = 0; - while (j < n_attrs) + for (j = 0; j < n_attrs; j++) { + /* already matched */ + if (attrs[j].name == NULL) + continue; + if (strcmp (attrs[j].name, attribute_names[i]) == 0) { retloc = attrs[j].retloc; + attrs[j].name = NULL; - if (*retloc != NULL) - { - set_error (error, context, - GCONF_ERROR_PARSE_ERROR, - _("Attribute \"%s\" repeated twice on the same <%s> element"), - attrs[j].name, element_name); - retval = FALSE; - goto out; - } + /* if this fails we passed the same retloc twice */ + g_assert (*retloc == NULL); *retloc = attribute_values[i]; - found = TRUE; + break; } - - ++j; } - if (!found) + if (j >= n_attrs) { set_error (error, context, GCONF_ERROR_PARSE_ERROR, - _("Attribute \"%s\" is invalid on <%s> element in this context"), + _("Attribute \"%s\" is invalid, or duplicated on <%s> element in this context"), attribute_names[i], element_name); retval = FALSE; - goto out; + break; } - - ++i; } - out: return retval; } @@ -3494,10 +3483,9 @@ all_whitespace (const char *text, while (p != end) { - if (!g_ascii_isspace (*p)) - return FALSE; - - p = g_utf8_next_char (p); + if (G_UNLIKELY (*p != ' ' && *p != '\t' && *p != '\n' && *p != '\r')) + return FALSE; + p++; } return TRUE; Index: GConf2.spec =================================================================== RCS file: /cvs/pkgs/rpms/GConf2/devel/GConf2.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- GConf2.spec 23 Feb 2009 21:11:53 -0000 1.98 +++ GConf2.spec 4 Mar 2009 04:15:57 -0000 1.99 @@ -1,5 +1,5 @@ %define libxml2_version 2.4.12 -%define orbit2_version 2.8.0 +%define orbit2_version 2.8.0 %define glib2_version 2.14.0 %define dbus_version 1.0.1 %define dbus_glib_version 0.74 @@ -7,7 +7,7 @@ Summary: A process-transparent configuration system Name: GConf2 Version: 2.25.2 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Base Source: http://download.gnome.org/sources/GConf/2.25/GConf-%{version}.tar.bz2 @@ -32,6 +32,7 @@ Requires: /usr/bin/killall Patch0: GConf-2.18.0.1-reload.patch +Patch1: gconf-less-work.patch %description GConf is a process-transparent configuration database API used to @@ -67,6 +68,7 @@ %prep %setup -q -n GConf-%{version} %patch0 -p1 -b .reload +%patch1 -p1 -b .less-work %build %configure --disable-static --enable-defaults-service @@ -141,6 +143,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Mar 3 2009 Matthias Clasen - 2.25.2-2 +- Avoid some gratitious extra work in the markup backend + * Mon Feb 23 2009 Fedora Release Engineering - 2.25.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From cchance at fedoraproject.org Wed Mar 4 04:23:36 2009 From: cchance at fedoraproject.org (Caius Chance) Date: Wed, 4 Mar 2009 04:23:36 +0000 (UTC) Subject: rpms/ibus-table/devel sources,1.5,1.6 Message-ID: <20090304042336.5093F70116@cvs1.fedora.phx.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/ibus-table/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16966 Modified Files: sources Log Message: updated sources Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ibus-table/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 17 Oct 2008 07:33:53 -0000 1.5 +++ sources 4 Mar 2009 04:23:05 -0000 1.6 @@ -1 +1,2 @@ 8c72c6ec97a0dcc822784e42ed6625c8 ibus-table-0.1.1.20081014.tar.gz +8949db247404207879183915e04cf602 ibus-table-1.1.0.20090220.tar.gz From jkeating at fedoraproject.org Wed Mar 4 04:32:08 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Wed, 4 Mar 2009 04:32:08 +0000 (UTC) Subject: comps comps-f11.xml.in,1.136,1.137 Message-ID: <20090304043208.7891370116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18850 Modified Files: comps-f11.xml.in Log Message: @core updates via bug 488060 Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- comps-f11.xml.in 2 Mar 2009 21:45:00 -0000 1.136 +++ comps-f11.xml.in 4 Mar 2009 04:31:37 -0000 1.137 @@ -654,11 +654,13 @@ acl attr + audit authconfig basesystem bash coreutils cpio + cronnie dhclient e2fsprogs fedora-release @@ -668,10 +670,13 @@ initscripts iproute iprutils + iptables + iptables-ipv6 iputils kbd libgcc ncurses + openssh-server passwd policycoreutils procps @@ -682,6 +687,7 @@ selinux-policy-targeted setserial setup + sudo shadow-utils util-linux-ng vim-minimal From pravins at fedoraproject.org Wed Mar 4 04:32:21 2009 From: pravins at fedoraproject.org (Pravin Satpute) Date: Wed, 4 Mar 2009 04:32:21 +0000 (UTC) Subject: rpms/ibus-rawcode/devel ibus-rawcode.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304043221.B8E4F70116@cvs1.fedora.phx.redhat.com> Author: pravins Update of /cvs/pkgs/rpms/ibus-rawcode/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18812/devel Modified Files: .cvsignore sources Added Files: ibus-rawcode.spec import.log Log Message: * Tue Mar 03 2009 Pravin Satpute - 1.0.0.20090303-2 - removed mod_path - added build requires ibus-devel --- NEW FILE ibus-rawcode.spec --- Name: ibus-rawcode Version: 1.0.0.20090303 Release: 2%{?dist} Summary: The Rawcode engine for IBus input platform License: GPLv2+ Group: System Environment/Libraries URL: http://github.com/pravins/ibus-rawcode/tree/master Source0: http://pravins.fedorapeople.org/ibus-rawcode/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: ibus-devel Requires: ibus %description The Rawcode engine for IBus platform. %prep %setup -q %build %configure --disable-static # make -C po update-gmo make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install rm -f $RPM_BUILD_ROOT%{python_sitearch}/_rawcode.la %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_libexecdir}/ibus-engine-rawcode %{_datadir}/ibus-rawcode %{_datadir}/ibus/component/* %changelog * Tue Mar 03 2009 Pravin Satpute - 1.0.0.20090303-2 - removed mod_path - added build requires ibus-devel * Tue Mar 03 2009 Pravin Satpute - 1.0.0.20090303-1 - The first version. --- NEW FILE import.log --- ibus-rawcode-1_0_0_20090303-2_fc11:HEAD:ibus-rawcode-1.0.0.20090303-2.fc11.src.rpm:1236141134 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ibus-rawcode/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:45:48 -0000 1.1 +++ .cvsignore 4 Mar 2009 04:31:51 -0000 1.2 @@ -0,0 +1 @@ +ibus-rawcode-1.0.0.20090303.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ibus-rawcode/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:45:48 -0000 1.1 +++ sources 4 Mar 2009 04:31:51 -0000 1.2 @@ -0,0 +1 @@ +26e7aeb1e54ebbab4de222f67ffe174f ibus-rawcode-1.0.0.20090303.tar.gz From cchance at fedoraproject.org Wed Mar 4 04:33:14 2009 From: cchance at fedoraproject.org (Caius Chance) Date: Wed, 4 Mar 2009 04:33:14 +0000 (UTC) Subject: rpms/ibus-table/devel ibus-table.spec,1.12,1.13 Message-ID: <20090304043314.BCFE870116@cvs1.fedora.phx.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/ibus-table/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19120 Modified Files: ibus-table.spec Log Message: revert to rel-1 Index: ibus-table.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ibus-table.spec 3 Mar 2009 23:39:19 -0000 1.12 +++ ibus-table.spec 4 Mar 2009 04:32:44 -0000 1.13 @@ -1,6 +1,6 @@ Name: ibus-table Version: 1.1.0.20090220 -Release: 3%{?dist} +Release: 1%{?dist} Summary: The Table engine for IBus platform License: GPLv2+ Group: System Environment/Libraries @@ -110,13 +110,6 @@ %{_datadir}/%{name}/icons/latex.svg %changelog -* Tue Mar 03 2009 Caius Chance - 1.1.0.20090220-3.fc11 -- Bumped release number. - -* Tue Mar 03 2009 Caius Chance - 1.1.0.20090220-2.fc11 -- Resolves: rhbz#484650 -- Added BuildRequires ibus-devel. - * Mon Mar 02 2009 Caius Chance - 1.1.0.20090220-1.fc11 - Resolves: rhbz#484650 - Updated to latest upstream release. From cchance at fedoraproject.org Wed Mar 4 04:41:29 2009 From: cchance at fedoraproject.org (Caius Chance) Date: Wed, 4 Mar 2009 04:41:29 +0000 (UTC) Subject: rpms/ibus-table/devel .cvsignore,1.5,1.6 ibus-table.spec,1.13,1.14 Message-ID: <20090304044129.E45E770116@cvs1.fedora.phx.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/ibus-table/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21225 Modified Files: .cvsignore ibus-table.spec Log Message: bumped rel# Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ibus-table/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 17 Oct 2008 07:33:53 -0000 1.5 +++ .cvsignore 4 Mar 2009 04:40:59 -0000 1.6 @@ -1 +1,2 @@ ibus-table-0.1.1.20081014.tar.gz +ibus-table-1.1.0.20090220.tar.gz Index: ibus-table.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ibus-table.spec 4 Mar 2009 04:32:44 -0000 1.13 +++ ibus-table.spec 4 Mar 2009 04:40:59 -0000 1.14 @@ -1,6 +1,6 @@ Name: ibus-table Version: 1.1.0.20090220 -Release: 1%{?dist} +Release: 4%{?dist} Summary: The Table engine for IBus platform License: GPLv2+ Group: System Environment/Libraries @@ -110,6 +110,15 @@ %{_datadir}/%{name}/icons/latex.svg %changelog +* Mon Mar 02 2009 Caius Chance - 1.1.0.20090220-4.fc11 +- Rebuilt. + +* Mon Mar 02 2009 Caius Chance - 1.1.0.20090220-3.fc11 +- Rebuilt. + +* Mon Mar 02 2009 Caius Chance - 1.1.0.20090220-2.fc11 +- Rebuilt. + * Mon Mar 02 2009 Caius Chance - 1.1.0.20090220-1.fc11 - Resolves: rhbz#484650 - Updated to latest upstream release. From jkeating at fedoraproject.org Wed Mar 4 04:46:05 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Wed, 4 Mar 2009 04:46:05 +0000 (UTC) Subject: fedora-release fedora-rawhide.repo, 1.4, 1.5 fedora-release.spec, 1.69, 1.70 fedora-updates-testing.repo, 1.12, 1.13 fedora-updates.repo, 1.16, 1.17 fedora.repo, 1.16, 1.17 Message-ID: <20090304044605.7C3FE70116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22438 Modified Files: fedora-rawhide.repo fedora-release.spec fedora-updates-testing.repo fedora-updates.repo fedora.repo Log Message: Move the metalink urls into the mirrorlist=. Yum now parses it there. Index: fedora-rawhide.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-rawhide.repo,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-rawhide.repo 21 Jan 2009 23:43:46 -0000 1.4 +++ fedora-rawhide.repo 4 Mar 2009 04:46:04 -0000 1.5 @@ -22,8 +22,7 @@ name=Fedora - Rawhide - Developmental packages for the next Fedora release failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/$basearch/os/ -#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch enabled=1 gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch @@ -32,8 +31,7 @@ name=Fedora - Rawhide - Debug failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/$basearch/debug/ -#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-debug&arch=$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch enabled=0 gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch @@ -42,8 +40,7 @@ name=Fedora - Rawhide - Source failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/source/SRPMS/ -#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch enabled=0 gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- fedora-release.spec 4 Feb 2009 20:18:30 -0000 1.69 +++ fedora-release.spec 4 Mar 2009 04:46:04 -0000 1.70 @@ -4,7 +4,7 @@ Summary: Fedora release files Name: fedora-release Version: 10.91 -Release: 1 +Release: 3 License: GPLv2 Group: System Environment/Base URL: http://fedoraproject.org @@ -97,6 +97,12 @@ /etc/pki/rpm-gpg/* %changelog +* Tue Mar 03 2009 Jesse Keating - 10.91-3 +- Move metalink urls to mirrorlist for helping anaconda + +* Tue Feb 24 2009 Fedora Release Engineering - 10.91-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Feb 04 2009 Jesse Keating - 10.91-1 - Use the correct CPE name (#481287) Index: fedora-updates-testing.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fedora-updates-testing.repo 21 Jan 2009 23:43:46 -0000 1.12 +++ fedora-updates-testing.repo 4 Mar 2009 04:46:04 -0000 1.13 @@ -2,8 +2,7 @@ name=Fedora $releasever - $basearch - Test Updates failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/ -#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch +mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch @@ -12,8 +11,7 @@ name=Fedora $releasever - $basearch - Test Updates Debug failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/debug/ -#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f$releasever&arch=$basearch -metalink=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch +mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch @@ -22,8 +20,7 @@ name=Fedora $releasever - Test Updates Source failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/SRPMS/ -#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f$releasever&arch=$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch +mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch Index: fedora-updates.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fedora-updates.repo 21 Jan 2009 23:43:46 -0000 1.16 +++ fedora-updates.repo 4 Mar 2009 04:46:04 -0000 1.17 @@ -2,8 +2,7 @@ name=Fedora $releasever - $basearch - Updates failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/ -#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch +mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch @@ -12,8 +11,7 @@ name=Fedora $releasever - $basearch - Updates - Debug failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/debug/ -#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch +mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch @@ -22,8 +20,7 @@ name=Fedora $releasever - Updates Source failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/SRPMS/ -#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever&arch=$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch +mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch Index: fedora.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora.repo,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fedora.repo 6 Feb 2009 00:19:19 -0000 1.16 +++ fedora.repo 4 Mar 2009 04:46:04 -0000 1.17 @@ -2,8 +2,7 @@ name=Fedora $releasever - $basearch failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ -#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch +mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch enabled=0 metadata_expire=7d gpgcheck=1 @@ -13,8 +12,7 @@ name=Fedora $releasever - $basearch - Debug failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/ -#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-$releasever&arch=$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch +mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch enabled=0 metadata_expire=7d gpgcheck=1 @@ -24,8 +22,7 @@ name=Fedora $releasever - Source failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/ -#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch +mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch enabled=0 metadata_expire=7d gpgcheck=1 From oget at fedoraproject.org Wed Mar 4 04:52:49 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Wed, 4 Mar 2009 04:52:49 +0000 (UTC) Subject: rpms/itext/devel itext.spec,1.15,1.16 Message-ID: <20090304045249.137F770116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/itext/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23507 Modified Files: itext.spec Log Message: * Tue Mar 03 2009 Orcan Ogetbil 2.1.4-5 - Remove the odd Provides introduced in the 2.1.4-3 build. Index: itext.spec =================================================================== RCS file: /cvs/pkgs/rpms/itext/devel/itext.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- itext.spec 25 Feb 2009 08:18:23 -0000 1.15 +++ itext.spec 4 Mar 2009 04:52:18 -0000 1.16 @@ -4,7 +4,7 @@ Summary: A Free Java-PDF library Name: itext Version: 2.1.4 -Release: 4%{?dist} +Release: 5%{?dist} License: (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and MIT and LGPLv2+ and CC-BY URL: http://www.lowagie.com/iText/ Group: Development/Libraries @@ -30,12 +30,6 @@ Requires: jpackage-utils >= 1.5 Requires: pdf-renderer Provides: %{alternate_name} == %{version}-%{release} -# pdftk needs this kind of provides from itext: -%ifarch x86_64 ppc64 -Provides: %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.so()(64bit) -%else -Provides: %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.so -%endif %description iText is a library that allows you to generate @@ -147,6 +141,9 @@ # ----------------------------------------------------------------------------- %changelog +* Tue Mar 03 2009 Orcan Ogetbil 2.1.4-5 +- Remove the odd Provides introduced in the 2.1.4-3 build. + * Wed Feb 25 2009 Fedora Release Engineering - 2.1.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From dcantrel at fedoraproject.org Wed Mar 4 05:19:50 2009 From: dcantrel at fedoraproject.org (David Cantrell) Date: Wed, 4 Mar 2009 05:19:50 +0000 (UTC) Subject: rpms/calendar/devel calendar.spec,1.2,1.3 Message-ID: <20090304051950.7FC7470116@cvs1.fedora.phx.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/calendar/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27682 Modified Files: calendar.spec Log Message: * Tue Mar 03 2009 David Cantrell - 1.25-5 - Convert output to locale's character coding Index: calendar.spec =================================================================== RCS file: /cvs/pkgs/rpms/calendar/devel/calendar.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- calendar.spec 24 Feb 2009 06:31:51 -0000 1.2 +++ calendar.spec 4 Mar 2009 05:19:18 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Reminder utility Name: calendar Version: 1.25 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: Applications/Productivity URL: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar @@ -16,6 +16,7 @@ Source2: export-calendar-source.sh Patch0: %{name}-1.25-linux.patch +Patch1: %{name}-1.25-coding.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,8 +30,17 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %{__cp} %{SOURCE1} Makefile +for c in calendars/*.*/* ; do + fromcode="$(%{__grep} '^LANG=' "$c" | %{__sed} 's/^LANG=\(.*\)\.\(.*\)\(@.*\)\{0,1\}/\2/')" + if [ ! -z "$fromcode" ]; then + iconv -f "$fromcode" -t "UTF-8" "$c" > "$c.conv" + %{__mv} "$c.conv" "$c" + fi +done + %build %{__make} %{?_smp_mflags} @@ -48,6 +58,9 @@ %{_datadir}/calendar %changelog +* Tue Mar 03 2009 David Cantrell - 1.25-5 +- Convert output to locale's character coding + * Mon Feb 23 2009 Fedora Release Engineering - 1.25-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From dcantrel at fedoraproject.org Wed Mar 4 05:20:14 2009 From: dcantrel at fedoraproject.org (David Cantrell) Date: Wed, 4 Mar 2009 05:20:14 +0000 (UTC) Subject: rpms/calendar/devel calendar-1.25-coding.patch,NONE,1.1 Message-ID: <20090304052014.0639C70116@cvs1.fedora.phx.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/calendar/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27845 Added Files: calendar-1.25-coding.patch Log Message: * Tue Mar 03 2009 David Cantrell - 1.25-5 - Convert output to locale's character coding calendar-1.25-coding.patch: --- NEW FILE calendar-1.25-coding.patch --- diff -urN calendar-1.25.orig/calendar.h calendar-1.25/calendar.h --- calendar-1.25.orig/calendar.h 2009-03-03 22:37:55.000000000 -0500 +++ calendar-1.25/calendar.h 2009-03-04 00:08:53.000000000 -0500 @@ -31,6 +31,8 @@ #include +#include + extern struct passwd *pw; extern int doall; extern int bodun_always; @@ -70,6 +72,7 @@ int (*getev)(int); }; +void convprint(FILE *, iconv_t, char *); void cal(void); void closecal(FILE *); int getday(char *); diff -urN calendar-1.25.orig/io.c calendar-1.25/io.c --- calendar-1.25.orig/io.c 2009-03-03 22:37:55.000000000 -0500 +++ calendar-1.25/io.c 2009-03-04 00:11:21.000000000 -0500 @@ -61,10 +61,17 @@ #include #include +#include +#include + #include "pathnames.h" #include "calendar.h" +#define ICONV_TRANSLIT "/" "/" "TRANSLIT" +#define ICONV_FROMCODE "UTF-8" +#define ICONV_BUFSIZ (128) + struct iovec header[] = { { "From: ", 6 }, { NULL, 0 }, @@ -76,6 +83,39 @@ { "Auto-Submitted: auto-generated\n\n", 32 }, }; +void +convprint(FILE *fp, iconv_t ic, char *inputbuf) +{ + char *iconv_input; + char *iconv_output; + char outputbuf[ICONV_BUFSIZ]; + size_t inputsz; + size_t outputsz; + size_t iconv_result; + + iconv_input = inputbuf; + inputsz = strlen(inputbuf); + + while (inputsz > 0) + { + iconv_output = outputbuf; + outputsz = sizeof(outputbuf) - 1; + + iconv_result = iconv( + ic, + &iconv_input, + &inputsz, + &iconv_output, + &outputsz + ); + if ((((size_t) -1) == iconv_result) && (E2BIG != errno)) + { + return; + } + outputbuf[sizeof(outputbuf) - outputsz - 1] = '\0'; + (void)fprintf(fp, "%s", outputbuf); + } +} void cal(void) @@ -86,6 +126,42 @@ struct match *m; FILE *fp; + char *langinfo_coding; + char *iconv_coding; + iconv_t ic; + int use_iconv; + + use_iconv = 1; + iconv_coding = NULL; + ic = (iconv_t) -1; + (void)setlocale(LC_ALL, ""); + langinfo_coding = nl_langinfo(CODESET); + if ((NULL == langinfo_coding) || ('\0' == *langinfo_coding)) + { + use_iconv = 0; + } + else + { + iconv_coding = malloc( + strlen(langinfo_coding) + sizeof(ICONV_TRANSLIT) + ); + } + + if (NULL == iconv_coding) + { + use_iconv = 0; + } + else + { + sprintf(iconv_coding, "%s%s", langinfo_coding, ICONV_TRANSLIT); + ic = iconv_open(iconv_coding, ICONV_FROMCODE); + } + + if (((iconv_t) -1) == ic) + { + use_iconv = 0; + } + events = NULL; cur_evt = NULL; if ((fp = opencal()) == NULL) @@ -101,6 +177,14 @@ if (buf[0] == '\0') continue; if (strncmp(buf, "LANG=", 5) == 0) { + if (use_iconv) + { + char *coding_start = strchr(buf, '.'); + if (NULL != coding_start) + { + strcpy(coding_start, ".UTF-8"); + } + } (void) setlocale(LC_ALL, buf + 5); setnnames(); if (!strcmp(buf + 5, "ru_RU.KOI8-R") || @@ -215,8 +299,17 @@ } tmp = events; while (tmp) { + if (use_iconv) + { + convprint(fp, ic, tmp->print_date); + convprint(fp, ic, *(tmp->desc)); + (void)fputc((int) '\n', fp); + } + else + { (void)fprintf(fp, "%s%s\n", tmp->print_date, *(tmp->desc)); - tmp = tmp->next; + } + tmp = tmp->next; } tmp = events; while (tmp) { @@ -226,6 +319,17 @@ tmp = tmp->next; free(events); } + + if (NULL != iconv_coding) + { + free(iconv_coding); + } + + if (((iconv_t) -1) != ic) + { + iconv_close(ic); + } + closecal(fp); } From simo at fedoraproject.org Wed Mar 4 05:30:25 2009 From: simo at fedoraproject.org (Simo Sorce) Date: Wed, 4 Mar 2009 05:30:25 +0000 (UTC) Subject: rpms/samba/devel samba.spec,1.174,1.175 Message-ID: <20090304053025.2894E70116@cvs1.fedora.phx.redhat.com> Author: simo Update of /cvs/pkgs/rpms/samba/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29586 Modified Files: samba.spec Log Message: * Tue Mar 3 2009 Simo Sorce - 3.3.1-0.29 - Make the talloc and ldb packages optionsl and disable their build within the samba3 package, they are now built as part of the samba4 package until they will both be released as independent packages. Index: samba.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- samba.spec 25 Feb 2009 11:58:49 -0000 1.174 +++ samba.spec 4 Mar 2009 05:29:53 -0000 1.175 @@ -1,4 +1,4 @@ -%define main_release 28 +%define main_release 29 %define samba_version 3.3.1 %define tdb_version 1.1.2 %define talloc_version 1.2.0 @@ -6,6 +6,9 @@ %define samba_release 0%{pre_release}.%{main_release}%{?dist} +%define enable_talloc 0 +%define enable_tdb 0 + Summary: Server and Client software to interoperate with Windows machines Name: samba Epoch: 0 @@ -166,7 +169,7 @@ The libsmbclient-devel package contains the header files and libraries needed to develop programs that link against the SMB client library in the Samba suite. - +%if %enable_tdb %package -n libtdb Summary: The TDB library and tools Group: Applications/System @@ -198,8 +201,9 @@ %description -n libtdb-devel The libtdb-devel package contains the header files and libraries needed to develop programs that link against the TDB library in the Samba suite. +%endif - +%if %enable_talloc %package -n libtalloc Summary: The talloc library Group: Applications/System @@ -220,7 +224,7 @@ %description -n libtalloc-devel The libtalloc-devel package contains the header files and libraries needed to develop programs that link against the talloc library in the Samba suite. - +%endif %prep # TAG: change for non-pre @@ -386,17 +390,23 @@ # libraries { mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir} +%if %enable_talloc # talloc cd source/lib/talloc # just to get the correct .pc file generated ./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir} cd ../../.. +install -m 644 source/lib/talloc/talloc.pc $build_libdir/pkgconfig/ +%endif +%if %enable_tdb # tdb cd source/lib/tdb # just to get the correct .pc file generated ./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir} cd ../../.. +install -m 644 source/lib/tdb/tdb.pc $build_libdir/pkgconfig/ +%endif # make install puts libraries in the wrong place # (but at least gets the versioning right now) @@ -407,8 +417,6 @@ install -m 644 source/pkgconfig/$i.pc $build_libdir/pkgconfig/ || true done -install -m 644 source/lib/talloc/talloc.pc $build_libdir/pkgconfig/ -install -m 644 source/lib/tdb/tdb.pc $build_libdir/pkgconfig/ /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/ @@ -456,6 +464,25 @@ mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldbsearch.1 $RPM_BUILD_ROOT%{_mandir}/man1/ldb3search.1 mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldbrename.1 $RPM_BUILD_ROOT%{_mandir}/man1/ldb3rename.1 +%if ! %enable_talloc +rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.* +rm -f $RPM_BUILD_ROOT%{_includedir}/talloc.h +rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.so +rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/talloc.pc +%endif + +%if ! %enable_tdb +rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.so.* +rm -f $RPM_BUILD_ROOT%{_includedir}/tdb.h +rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.so +rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/tdb.pc +rm -f $RPM_BUILD_ROOT%{_bindir}/tdbbackup +rm -f $RPM_BUILD_ROOT%{_bindir}/tdbdump +rm -f $RPM_BUILD_ROOT%{_bindir}/tdbtool +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbbackup.8* +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbdump.8* +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbtool.8* +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -633,17 +660,21 @@ %postun -n libsmbclient /sbin/ldconfig +%if %enable_tdb %post -n libtdb /sbin/ldconfig %postun -n libtdb /sbin/ldconfig +%endif +%if %enable_talloc %post -n libtalloc /sbin/ldconfig %postun -n libtalloc /sbin/ldconfig +%endif %files %defattr(-,root,root) @@ -812,6 +843,7 @@ %{_libdir}/pkgconfig/smbsharemodes.pc %{_mandir}/man7/libsmbclient.7* +%if %enable_talloc %files -n libtalloc %attr(755,root,root) %{_libdir}/libtalloc.so.* @@ -819,7 +851,9 @@ %{_includedir}/talloc.h %{_libdir}/libtalloc.so %{_libdir}/pkgconfig/talloc.pc +%endif +%if %enable_tdb %files -n libtdb %attr(755,root,root) %{_libdir}/libtdb.so.* @@ -835,6 +869,7 @@ %{_mandir}/man8/tdbbackup.8* %{_mandir}/man8/tdbdump.8* %{_mandir}/man8/tdbtool.8* +%endif %files domainjoin-gui %{_sbindir}/netdomjoin-gui @@ -844,6 +879,11 @@ %{_datadir}/pixmaps/samba/logo-small.png %changelog +* Tue Mar 3 2009 Simo Sorce - 3.3.1-0.29 +- Make the talloc and ldb packages optionsl and disable their build within + the samba3 package, they are now built as part of the samba4 package + until they will both be released as independent packages. + * Wed Feb 25 2009 Guenther Deschner - 3.3.1-0.28 - Enable cluster support From bskeggs at fedoraproject.org Wed Mar 4 05:41:38 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Wed, 4 Mar 2009 05:41:38 +0000 (UTC) Subject: rpms/kernel/devel drm-nouveau.patch, 1.15, 1.16 kernel.spec, 1.1377, 1.1378 Message-ID: <20090304054138.5D62D70116@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31308 Modified Files: drm-nouveau.patch kernel.spec Log Message: * Wed Mar 04 2009 Ben Skeggs - drm-nouveau.patch: lvds, dpms and gamma_set fixes drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- drm-nouveau.patch 4 Mar 2009 00:42:11 -0000 1.15 +++ drm-nouveau.patch 4 Mar 2009 05:41:35 -0000 1.16 @@ -153,10 +153,10 @@ drm_put_minor(&dev->control); diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile new file mode 100644 -index 0000000..d2cbeb3 +index 0000000..12af41b --- /dev/null +++ b/drivers/gpu/drm/nouveau/Makefile -@@ -0,0 +1,25 @@ +@@ -0,0 +1,24 @@ +# +# Makefile for the drm device driver. This driver provides support for the +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. @@ -176,8 +176,7 @@ + nv40_graph.o nv50_graph.o \ + nv04_instmem.o nv50_instmem.o \ + nv50_crtc.o nv50_dac.o nv50_sor.o nv50_connector.o \ -+ nv50_lut.o nv50_cursor.o nv50_i2c.o nv50_display.o \ -+ nv50_fbcon.o ++ nv50_cursor.o nv50_i2c.o nv50_display.o nv50_fbcon.o + +nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o + @@ -1841,10 +1840,10 @@ +#endif /* __NOUVEAU_CONNECTOR_H__ */ diff --git a/drivers/gpu/drm/nouveau/nouveau_crtc.h b/drivers/gpu/drm/nouveau/nouveau_crtc.h new file mode 100644 -index 0000000..e0e6032 +index 0000000..0ba9475 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_crtc.h -@@ -0,0 +1,53 @@ +@@ -0,0 +1,59 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -1885,7 +1884,13 @@ + bool use_dithering; + + struct nv50_cursor *cursor; -+ struct nv50_lut *lut; ++ struct { ++ struct mem_block *mem; ++ uint16_t r[256]; ++ uint16_t g[256]; ++ uint16_t b[256]; ++ int depth; ++ } lut; + + int (*set_dither) (struct nouveau_crtc *crtc); + int (*set_scale) (struct nouveau_crtc *crtc, int mode, bool update); @@ -17040,10 +17045,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_connector.c b/drivers/gpu/drm/nouveau/nv50_connector.c new file mode 100644 -index 0000000..6e7d5fe +index 0000000..a16445a --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_connector.c -@@ -0,0 +1,593 @@ +@@ -0,0 +1,592 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -17334,12 +17339,11 @@ + int rval; + + /* DPMS */ -+ if (property == dev->mode_config.dpms_property && drm_connector->encoder) { -+ struct drm_encoder_helper_funcs *helper_funcs = -+ drm_connector->encoder->helper_private; ++ if (property == dev->mode_config.dpms_property) { ++ if (value > 3) ++ return -EINVAL; + -+ helper_funcs->dpms(drm_connector->encoder, (int)value); -+ return 0; ++ drm_helper_set_connector_dpms(drm_connector, value); + } + + /* Scaling mode */ @@ -17639,10 +17643,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c new file mode 100644 -index 0000000..b081230 +index 0000000..5e6be22 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c -@@ -0,0 +1,723 @@ +@@ -0,0 +1,776 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -17680,7 +17684,55 @@ +#include "nouveau_fbcon.h" +#include "nouveau_connector.h" +#include "nv50_cursor.h" -+#include "nv50_lut.h" ++ ++#define NV50_LUT_INDEX(val, w) ((val << (8 - w)) | (val >> ((w << 1) - 8))) ++static int ++nv50_crtc_lut_load(struct nouveau_crtc *crtc) ++{ ++ uint32_t index = 0, i; ++ void __iomem *lut = crtc->lut.mem->kmap.virtual; ++ ++ DRM_DEBUG("\n"); ++ ++ /* 16 bits, red, green, blue, unused, total of 64 bits per index */ ++ /* 10 bits lut, with 14 bits values. */ ++ switch (crtc->lut.depth) { ++ case 15: ++ /* R5G5B5 */ ++ for (i = 0; i < 32; i++) { ++ index = NV50_LUT_INDEX(i, 5); ++ writew(crtc->lut.r[i] >> 2, lut + 8*index + 0); ++ writew(crtc->lut.g[i] >> 2, lut + 8*index + 2); ++ writew(crtc->lut.b[i] >> 2, lut + 8*index + 4); ++ } ++ break; ++ case 16: ++ /* R5G6B5 */ ++ for (i = 0; i < 32; i++) { ++ index = NV50_LUT_INDEX(i, 5); ++ writew(crtc->lut.r[i] >> 2, lut + 8*index + 0); ++ writew(crtc->lut.b[i] >> 2, lut + 8*index + 4); ++ } ++ ++ /* Green has an extra bit. */ ++ for (i = 0; i < 64; i++) { ++ index = NV50_LUT_INDEX(i, 6); ++ writew(crtc->lut.g[i] >> 2, lut + 8*index + 2); ++ } ++ break; ++ default: ++ DRM_INFO("load 24bpp\n"); ++ /* R8G8B8 */ ++ for (i = 0; i < 256; i++) { ++ writew(crtc->lut.r[i] >> 2, lut + 8*i + 0); ++ writew(crtc->lut.g[i] >> 2, lut + 8*i + 2); ++ writew(crtc->lut.b[i] >> 2, lut + 8*i + 4); ++ } ++ break; ++ } ++ ++ return 0; ++} + +static int +nv50_crtc_blank(struct nouveau_crtc *crtc, bool blanked) @@ -17724,6 +17776,7 @@ + NV50_CRTC0_BLANK_CTRL_UNBLANK); + } + ++ OUT_MODE(NV50_UPDATE_DISPLAY, 0); + return 0; +} + @@ -18005,9 +18058,10 @@ + + drm_crtc_cleanup(&crtc->base); + -+ nv50_lut_destroy(crtc); + nv50_cursor_destroy(crtc); + ++ if (crtc->lut.mem) ++ nouveau_mem_free(drm_crtc->dev, crtc->lut.mem); + kfree(crtc->mode); + kfree(crtc); +} @@ -18057,15 +18111,33 @@ + return crtc->cursor->set_pos(crtc, x, y); +} + -+void nv50_crtc_gamma_set(struct drm_crtc *drm_crtc, u16 *r, u16 *g, u16 *b, -+ uint32_t size) ++void ++nv50_crtc_gamma_set(struct drm_crtc *drm_crtc, u16 *r, u16 *g, u16 *b, ++ uint32_t size) +{ + struct nouveau_crtc *crtc = to_nouveau_crtc(drm_crtc); ++ int i; + + if (size != 256) + return; + -+ crtc->lut->set(crtc, (uint16_t *)r, (uint16_t *)g, (uint16_t *)b); ++ for (i = 0; i < 256; i++) { ++ crtc->lut.r[i] = r[i]; ++ crtc->lut.g[i] = g[i]; ++ crtc->lut.b[i] = b[i]; ++ } ++ ++ /* We need to know the depth before we upload, but it's possible to ++ * get called before a framebuffer is bound. If this is the case, ++ * mark the lut values as dirty by setting depth==0, and it'll be ++ * uploaded on the first mode_set_base() ++ */ ++ if (!crtc->base.fb) { ++ crtc->lut.depth = 0; ++ return; ++ } ++ ++ nv50_crtc_lut_load(crtc); +} + +static const struct drm_crtc_funcs nv50_crtc_funcs = { @@ -18191,54 +18263,6 @@ + struct drm_crtc_helper_funcs *crtc_helper = drm_crtc->helper_private; + struct nouveau_connector *connector = NULL; + -+ { -+ int r_size = 0, g_size = 0, b_size = 0; -+ uint16_t *r_val, *g_val, *b_val; -+ int i; -+ -+ /* set framebuffer */ -+ switch (drm_crtc->fb->depth) { -+ case 15: -+ r_size = 32; -+ g_size = 32; -+ b_size = 32; -+ break; -+ case 16: -+ r_size = 32; -+ g_size = 64; -+ b_size = 32; -+ break; -+ case 24: -+ default: -+ r_size = 256; -+ g_size = 256; -+ b_size = 256; -+ break; -+ } -+ -+ r_val = kmalloc(r_size * sizeof(uint16_t), GFP_KERNEL); -+ g_val = kmalloc(g_size * sizeof(uint16_t), GFP_KERNEL); -+ b_val = kmalloc(b_size * sizeof(uint16_t), GFP_KERNEL); -+ -+ /* Set the color indices. */ -+ for (i = 0; i < r_size; i++) { -+ r_val[i] = i << 8; -+ } -+ for (i = 0; i < g_size; i++) { -+ g_val[i] = i << 8; -+ } -+ for (i = 0; i < b_size; i++) { -+ b_val[i] = i << 8; -+ } -+ -+ crtc->lut->set(crtc, r_val, g_val, b_val); -+ -+ /* free before returning */ -+ kfree(r_val); -+ kfree(g_val); -+ kfree(b_val); -+ } -+ + /* Find the connector attached to this CRTC */ + list_for_each_entry(drm_encoder, &dev->mode_config.encoder_list, head) { + struct drm_connector *drm_connector; @@ -18279,7 +18303,6 @@ + struct nouveau_framebuffer *fb = to_nouveau_framebuffer(drm_fb); + struct nouveau_gem_object *ngem = nouveau_gem_object(fb->gem); + uint32_t v_vram = ngem->bo->offset - dev_priv->vm_vram_base; -+ uint32_t v_lut = crtc->lut->bo->offset - dev_priv->vm_vram_base; + uint32_t offset = crtc->index * 0x400; + + OUT_MODE(NV50_CRTC0_FB_OFFSET + offset, v_vram >> 8); @@ -18310,9 +18333,14 @@ + NV50_CRTC_COLOR_CTRL_MODE_COLOR); + OUT_MODE(NV50_CRTC0_FB_POS + offset, (y << 16) | x); + ++ if (crtc->lut.depth != fb->base.depth) { ++ crtc->lut.depth = fb->base.depth; ++ nv50_crtc_lut_load(crtc); ++ } ++ + OUT_MODE(NV50_CRTC0_CLUT_MODE + offset, fb->base.depth == 8 ? + NV50_CRTC0_CLUT_MODE_OFF : NV50_CRTC0_CLUT_MODE_ON); -+ OUT_MODE(NV50_CRTC0_CLUT_OFFSET + offset, v_lut >> 8); ++ OUT_MODE(NV50_CRTC0_CLUT_OFFSET + offset, crtc->lut.mem->start >> 8); + + OUT_MODE(NV50_UPDATE_DISPLAY, 0); + return 0; @@ -18331,6 +18359,7 @@ +int nv50_crtc_create(struct drm_device *dev, int index) +{ + struct nouveau_crtc *crtc = NULL; ++ int ret, i; + + DRM_DEBUG("\n"); + @@ -18346,6 +18375,35 @@ + return -ENOMEM; + } + ++ /* Default CLUT parameters, will be activated on the hw upon ++ * first mode set. ++ */ ++ for (i = 0; i < 256; i++) { ++ crtc->lut.r[i] = i << 8; ++ crtc->lut.g[i] = i << 8; ++ crtc->lut.b[i] = i << 8; ++ } ++ crtc->lut.depth = 0; ++ ++ crtc->lut.mem = nouveau_mem_alloc(dev, 0x100, 4096, NOUVEAU_MEM_FB | ++ NOUVEAU_MEM_NOVM | NOUVEAU_MEM_MAPPED, ++ (struct drm_file *)-2); ++ if (crtc->lut.mem) { ++ ret = drm_bo_kmap(crtc->lut.mem->bo, 0, ++ crtc->lut.mem->bo->mem.num_pages, ++ &crtc->lut.mem->kmap); ++ if (ret) { ++ nouveau_mem_free(dev, crtc->lut.mem); ++ crtc->lut.mem = NULL; ++ } ++ } ++ ++ if (!crtc->lut.mem) { ++ kfree(crtc->mode); ++ kfree(crtc); ++ return -ENOMEM; ++ } ++ + crtc->index = index; + + /* set function pointers */ @@ -18362,7 +18420,6 @@ + drm_crtc_helper_add(&crtc->base, &nv50_crtc_helper_funcs); + drm_mode_crtc_set_gamma_size(&crtc->base, 256); + -+ nv50_lut_create(crtc); + nv50_cursor_create(crtc); + return 0; +} @@ -18912,10 +18969,10 @@ + diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c new file mode 100644 -index 0000000..0fbcf67 +index 0000000..5bd41ef --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_display.c -@@ -0,0 +1,439 @@ +@@ -0,0 +1,441 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -19111,6 +19168,7 @@ + } + } + ++#if 0 + nv_wr32(NV50_PDISPLAY_UNK200_CTRL, 0); + nv_wr32(NV50_PDISPLAY_CTRL_STATE, 0); + if (!nv_wait(NV50_PDISPLAY_UNK200_CTRL, 0x1e0000, 0)) { @@ -19118,6 +19176,7 @@ + DRM_ERROR("0x610200 = 0x%08x\n", + nv_rd32(NV50_PDISPLAY_UNK200_CTRL)); + } ++#endif + + for (i = 0; i < 2; i++) { + if (!nv_wait(NV50_PDISPLAY_SOR_REGS_DPMS_STATE(i), @@ -42309,241 +42368,6 @@ + } +} + -diff --git a/drivers/gpu/drm/nouveau/nv50_lut.c b/drivers/gpu/drm/nouveau/nv50_lut.c -new file mode 100644 -index 0000000..08881cc ---- /dev/null -+++ b/drivers/gpu/drm/nouveau/nv50_lut.c -@@ -0,0 +1,177 @@ -+/* -+ * Copyright (C) 2008 Maarten Maathuis. -+ * All Rights Reserved. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining -+ * a copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sublicense, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the -+ * next paragraph) shall be included in all copies or substantial -+ * portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE -+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ */ -+ -+#include "nv50_lut.h" -+#include "nouveau_crtc.h" -+#include "nv50_display.h" -+ -+static int nv50_lut_alloc(struct nouveau_crtc *crtc) -+{ -+ struct drm_device *dev = crtc->base.dev; -+ int ret; -+ -+ DRM_DEBUG("\n"); -+ -+ ret = drm_buffer_object_create(dev, 4096, drm_bo_type_kernel, -+ DRM_BO_FLAG_MEM_VRAM | -+ DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE | -+ DRM_BO_FLAG_NO_EVICT, -+ DRM_BO_HINT_DONT_FENCE, 0, 0, -+ &crtc->lut->bo); -+ if (ret) -+ return ret; -+ -+ ret = drm_bo_kmap(crtc->lut->bo, 0, crtc->lut->bo->mem.num_pages, -+ &crtc->lut->kmap); -+ if (ret) { -+ drm_bo_usage_deref_unlocked(&crtc->lut->bo); -+ return ret; -+ } -+ -+ return 0; -+} -+ -+static int nv50_lut_free(struct nouveau_crtc *crtc) -+{ -+ DRM_DEBUG("\n"); -+ -+ if (crtc->lut->bo) { -+ drm_bo_kunmap(&crtc->lut->kmap); -+ drm_bo_usage_deref_unlocked(&crtc->lut->bo); -+ } -+ -+ return 0; -+} -+ -+#define NV50_LUT_INDEX(val, w) ((val << (8 - w)) | (val >> ((w << 1) - 8))) -+static int nv50_lut_set(struct nouveau_crtc *crtc, -+ uint16_t *red, uint16_t *green, uint16_t *blue) -+{ -+ struct drm_framebuffer *drm_fb = crtc->base.fb; -+ uint32_t index = 0, i; -+ void __iomem *lut; -+ -+ DRM_DEBUG("\n"); -+ -+ if (!crtc->lut || !crtc->lut->bo) { -+ DRM_ERROR("Something wrong with the LUT\n"); -+ return -EINVAL; -+ } -+ lut = crtc->lut->kmap.virtual; -+ -+ /* 16 bits, red, green, blue, unused, total of 64 bits per index */ -+ /* 10 bits lut, with 14 bits values. */ -+ switch (drm_fb->depth) { -+ case 15: -+ /* R5G5B5 */ -+ for (i = 0; i < 32; i++) { -+ index = NV50_LUT_INDEX(i, 5); -+ writew(red[i] >> 2, lut + 8*index + 0); -+ writew(green[i] >> 2, lut + 8*index + 2); -+ writew(blue[i] >> 2, lut + 8*index + 4); -+ } -+ break; -+ case 16: -+ /* R5G6B5 */ -+ for (i = 0; i < 32; i++) { -+ index = NV50_LUT_INDEX(i, 5); -+ writew(red[i] >> 2, lut + 8*index + 0); -+ writew(blue[i] >> 2, lut + 8*index + 4); -+ } -+ -+ /* Green has an extra bit. */ -+ for (i = 0; i < 64; i++) { -+ index = NV50_LUT_INDEX(i, 6); -+ writew(green[i] >> 2, lut + 8*index + 2); -+ } -+ break; -+ default: -+ /* R8G8B8 */ -+ for (i = 0; i < 256; i++) { -+ writew(red[i] >> 2, lut + 8*i + 0); -+ writew(green[i] >> 2, lut + 8*i + 2); -+ writew(blue[i] >> 2, lut + 8*i + 4); -+ } -+ break; -+ } -+ -+ crtc->lut->depth = drm_fb->depth; -+ return 0; -+} -+ -+int nv50_lut_create(struct nouveau_crtc *crtc) -+{ -+ int rval = 0; -+ -+ DRM_DEBUG("\n"); -+ -+ if (!crtc) -+ return -EINVAL; -+ -+ crtc->lut = kzalloc(sizeof(struct nv50_lut), GFP_KERNEL); -+ -+ if (!crtc->lut) -+ return -ENOMEM; -+ -+ rval = nv50_lut_alloc(crtc); -+ if (rval != 0) { -+ goto out; -+ } -+ -+ /* lut will be inited when fb is bound */ -+ crtc->lut->depth = 0; -+ -+ /* function pointers */ -+ crtc->lut->set = nv50_lut_set; -+ -+ return 0; -+ -+out: -+ if (crtc->lut) -+ kfree(crtc->lut); -+ -+ return rval; -+} -+ -+int nv50_lut_destroy(struct nouveau_crtc *crtc) -+{ -+ int rval = 0; -+ -+ DRM_DEBUG("\n"); -+ -+ if (!crtc) -+ return -EINVAL; -+ -+ rval = nv50_lut_free(crtc); -+ -+ kfree(crtc->lut); -+ crtc->lut = NULL; -+ -+ if (rval != 0) -+ return rval; -+ -+ return 0; -+} -diff --git a/drivers/gpu/drm/nouveau/nv50_lut.h b/drivers/gpu/drm/nouveau/nv50_lut.h -new file mode 100644 -index 0000000..690e39f ---- /dev/null -+++ b/drivers/gpu/drm/nouveau/nv50_lut.h -@@ -0,0 +1,46 @@ -+/* -+ * Copyright (C) 2008 Maarten Maathuis. -+ * All Rights Reserved. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining -+ * a copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sublicense, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the -+ * next paragraph) shall be included in all copies or substantial -+ * portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE -+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ */ -+ -+#ifndef __NV50_LUT_H__ -+#define __NV50_LUT_H__ -+ -+#include "nv50_display.h" -+ -+struct nouveau_crtc; -+ -+struct nv50_lut { -+ struct drm_buffer_object *bo; -+ struct drm_bo_kmap_obj kmap; -+ -+ int depth; /* check against fb to see if it needs to be reuploaded */ -+ -+ int (*set) (struct nouveau_crtc *crtc, uint16_t *red, uint16_t *green, uint16_t *blue); -+}; -+ -+int nv50_lut_create(struct nouveau_crtc *crtc); -+int nv50_lut_destroy(struct nouveau_crtc *crtc); -+ -+#endif /* __NV50_LUT_H__ */ diff --git a/drivers/gpu/drm/nouveau/nv50_mc.c b/drivers/gpu/drm/nouveau/nv50_mc.c new file mode 100644 index 0000000..0843473 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1377 retrieving revision 1.1378 diff -u -r1.1377 -r1.1378 --- kernel.spec 4 Mar 2009 03:50:51 -0000 1.1377 +++ kernel.spec 4 Mar 2009 05:41:36 -0000 1.1378 @@ -1792,6 +1792,9 @@ # and build. %changelog +* Wed Mar 04 2009 Ben Skeggs +- drm-nouveau.patch: lvds, dpms and gamma_set fixes + * Wed Mar 04 2009 Dave Jones 2.6.29-0.197.rc7 - 2.6.29-rc7 From pkgdb at fedoraproject.org Wed Mar 4 06:22:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 06:22:10 +0000 Subject: [pkgdb] cvsps had acl change status Message-ID: <20090304062231.B17442082B2@bastion.fedora.phx.redhat.com> scop has set the watchbugzilla acl on cvsps (Fedora devel) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Wed Mar 4 06:22:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 06:22:11 +0000 Subject: [pkgdb] cvsps had acl change status Message-ID: <20090304062233.2966B208545@bastion.fedora.phx.redhat.com> scop has set the watchcommits acl on cvsps (Fedora devel) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Wed Mar 4 06:22:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 06:22:35 +0000 Subject: [pkgdb] cvsps had acl change status Message-ID: <20090304062235.DB543208548@bastion.fedora.phx.redhat.com> scop has set the commit acl on cvsps (Fedora devel) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Wed Mar 4 06:22:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 06:22:00 +0000 Subject: [pkgdb] cvsps had acl change status Message-ID: <20090304062237.8DEB220854C@bastion.fedora.phx.redhat.com> scop has set the approveacls acl on cvsps (Fedora devel) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Wed Mar 4 06:22:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 06:22:45 +0000 Subject: [pkgdb] cvsps had acl change status Message-ID: <20090304062245.ACE4420854F@bastion.fedora.phx.redhat.com> scop has set the watchbugzilla acl on cvsps (Fedora 9) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Wed Mar 4 06:22:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 06:22:48 +0000 Subject: [pkgdb] cvsps had acl change status Message-ID: <20090304062247.2E7F8208552@bastion.fedora.phx.redhat.com> scop has set the watchcommits acl on cvsps (Fedora 9) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Wed Mar 4 06:22:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 06:22:27 +0000 Subject: [pkgdb] cvsps had acl change status Message-ID: <20090304062248.C8BD3208555@bastion.fedora.phx.redhat.com> scop has set the commit acl on cvsps (Fedora 9) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Wed Mar 4 06:22:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 06:22:12 +0000 Subject: [pkgdb] cvsps had acl change status Message-ID: <20090304062250.9497C208602@bastion.fedora.phx.redhat.com> scop has set the approveacls acl on cvsps (Fedora 9) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Wed Mar 4 06:22:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 06:22:53 +0000 Subject: [pkgdb] cvsps had acl change status Message-ID: <20090304062253.14CAD208608@bastion.fedora.phx.redhat.com> scop has set the watchbugzilla acl on cvsps (Fedora 10) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Wed Mar 4 06:22:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 06:22:55 +0000 Subject: [pkgdb] cvsps had acl change status Message-ID: <20090304062255.2B698208544@bastion.fedora.phx.redhat.com> scop has set the watchcommits acl on cvsps (Fedora 10) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Wed Mar 4 06:22:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 06:22:34 +0000 Subject: [pkgdb] cvsps had acl change status Message-ID: <20090304062255.66DAF208545@bastion.fedora.phx.redhat.com> scop has set the commit acl on cvsps (Fedora 10) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From pkgdb at fedoraproject.org Wed Mar 4 06:22:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 06:22:19 +0000 Subject: [pkgdb] cvsps had acl change status Message-ID: <20090304062258.416902086F1@bastion.fedora.phx.redhat.com> scop has set the approveacls acl on cvsps (Fedora 10) to Approved for salimma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cvsps From guthrie at fedoraproject.org Wed Mar 4 06:24:53 2009 From: guthrie at fedoraproject.org (John T. Guthrie III) Date: Wed, 4 Mar 2009 06:24:53 +0000 (UTC) Subject: rpms/simplyhtml/F-10 simplyhtml.spec,1.1,1.2 Message-ID: <20090304062453.6FFCC70116@cvs1.fedora.phx.redhat.com> Author: guthrie Update of /cvs/extras/rpms/simplyhtml/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4760/F-10 Modified Files: simplyhtml.spec Log Message: Correcting error in location of where java-1.6.0-openjdk-demo places its files. Index: simplyhtml.spec =================================================================== RCS file: /cvs/extras/rpms/simplyhtml/F-10/simplyhtml.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- simplyhtml.spec 3 Mar 2009 04:05:55 -0000 1.1 +++ simplyhtml.spec 4 Mar 2009 06:24:20 -0000 1.2 @@ -2,7 +2,7 @@ Name: simplyhtml Version: 0.12.5 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: Application and a java component for rich text processing # All files are GPL except for src/com/sun/demo/ElementTreePanel.java which has @@ -81,7 +81,7 @@ # clause in its license pushd src/com/sun/demo mv ElementTreePanel.java ElementTreePanel.java.BadLicense -unzip %{_libdir}/jvm/java-1.6.0-openjdk-1.6.0.0/demo/jfc/Notepad/src.zip \ +unzip %{_prefix}/lib/jvm/java-1.6.0-openjdk-1.6.0.0/demo/jfc/Notepad/src.zip \ ElementTreePanel.java sed -i -e '33 i\ /* for use in SimplyHTML */\ @@ -171,6 +171,11 @@ %changelog +* Wed Mar 4 2009 John Guthrie 0:0.12.5-6 +- It turns out that the files for the java-1.6.0-openjdk-demo are placed in + %%{_prefix}/lib, not %%{_libdir}. (This is significant for 64-bit + architectures.) The appropriate line to unzip the ElementTreePanel.java file + out of the needed zip file was fixed. * Wed Feb 25 2009 John Guthrie 0:0.12.5-5 - Fixed the perms on the simplyhtml.sh source file. Allowing the %%attr to take care of the perms. From guthrie at fedoraproject.org Wed Mar 4 06:24:53 2009 From: guthrie at fedoraproject.org (John T. Guthrie III) Date: Wed, 4 Mar 2009 06:24:53 +0000 (UTC) Subject: rpms/simplyhtml/devel simplyhtml.spec,1.1,1.2 Message-ID: <20090304062453.720A470117@cvs1.fedora.phx.redhat.com> Author: guthrie Update of /cvs/extras/rpms/simplyhtml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4760/devel Modified Files: simplyhtml.spec Log Message: Correcting error in location of where java-1.6.0-openjdk-demo places its files. Index: simplyhtml.spec =================================================================== RCS file: /cvs/extras/rpms/simplyhtml/devel/simplyhtml.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- simplyhtml.spec 1 Mar 2009 21:34:38 -0000 1.1 +++ simplyhtml.spec 4 Mar 2009 06:24:21 -0000 1.2 @@ -2,7 +2,7 @@ Name: simplyhtml Version: 0.12.5 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: Application and a java component for rich text processing # All files are GPL except for src/com/sun/demo/ElementTreePanel.java which has @@ -81,7 +81,7 @@ # clause in its license pushd src/com/sun/demo mv ElementTreePanel.java ElementTreePanel.java.BadLicense -unzip %{_libdir}/jvm/java-1.6.0-openjdk-1.6.0.0/demo/jfc/Notepad/src.zip \ +unzip %{_prefix}/lib/jvm/java-1.6.0-openjdk-1.6.0.0/demo/jfc/Notepad/src.zip \ ElementTreePanel.java sed -i -e '33 i\ /* for use in SimplyHTML */\ @@ -171,6 +171,11 @@ %changelog +* Wed Mar 4 2009 John Guthrie 0:0.12.5-6 +- It turns out that the files for the java-1.6.0-openjdk-demo are placed in + %%{_prefix}/lib, not %%{_libdir}. (This is significant for 64-bit + architectures.) The appropriate line to unzip the ElementTreePanel.java file + out of the needed zip file was fixed. * Wed Feb 25 2009 John Guthrie 0:0.12.5-5 - Fixed the perms on the simplyhtml.sh source file. Allowing the %%attr to take care of the perms. From transif at fedoraproject.org Wed Mar 4 06:34:46 2009 From: transif at fedoraproject.org (Transifex System User) Date: Wed, 4 Mar 2009 06:34:46 +0000 (UTC) Subject: comps/po es.po,1.27,1.28 Message-ID: <20090304063446.2563070116@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6467/po Modified Files: es.po Log Message: 2009-03-04 Jorge A Gallegos (via kad at fedoraproject.org) * po/es.po: Updated Spanish translation, used gtranslator. View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.27 -r 1.28 es.po Index: es.po =================================================================== RCS file: /cvs/pkgs/comps/po/es.po,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- es.po 11 Feb 2009 12:31:07 -0000 1.27 +++ es.po 4 Mar 2009 06:34:15 -0000 1.28 @@ -4,336 +4,214 @@ # Manuel Ospina , 2006. # Domingo Becker , 2008. # This file is distributed under the same license as the PACKAGE package. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER. msgid "" msgstr "" "Project-Id-Version: comps.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-11 01:37+0000\n" -"PO-Revision-Date: 2009-02-11 10:27-0300\n" +"POT-Creation-Date: 2009-03-04 03:52+0000\n" +"PO-Revision-Date: 2009-03-04 00:26-0600\n" "Last-Translator: Domingo Becker \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Poedit-Language: Spanish\n" - -#: ../comps-f7.xml.in.h:1 -#: ../comps-f8.xml.in.h:1 -#: ../comps-f9.xml.in.h:1 -#: ../comps-f10.xml.in.h:1 -#: ../comps-f11.xml.in.h:1 +"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);" + +#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 +#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1 +#, fuzzy msgid "A lightweight desktop environment that works well on low end machines." -msgstr "Un entorno de escritorio liviano que funciona bien en m??quinas peque??as." +msgstr "" +"Un entorno de escritorio liviano que funciona bien en m??quinas peque??as." -#: ../comps-f7.xml.in.h:2 -#: ../comps-f8.xml.in.h:2 -#: ../comps-f9.xml.in.h:2 -#: ../comps-f10.xml.in.h:3 -#: ../comps-f11.xml.in.h:3 -#: ../comps-el4.xml.in.h:1 +#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 +#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1 #: ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "Herramientas de Administraci??n" -#: ../comps-f7.xml.in.h:3 -#: ../comps-f8.xml.in.h:3 -#: ../comps-f9.xml.in.h:3 -#: ../comps-f10.xml.in.h:4 -#: ../comps-f11.xml.in.h:4 +#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 +#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4 msgid "Afrikaans Support" msgstr "Soporte para africano" -#: ../comps-f7.xml.in.h:4 -#: ../comps-f8.xml.in.h:4 -#: ../comps-f9.xml.in.h:4 -#: ../comps-f10.xml.in.h:5 -#: ../comps-f11.xml.in.h:5 +#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 +#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5 msgid "Albanian Support" msgstr "Soporte para alban??s" -#: ../comps-f7.xml.in.h:5 -#: ../comps-f8.xml.in.h:5 -#: ../comps-f9.xml.in.h:5 -#: ../comps-f10.xml.in.h:6 -#: ../comps-f11.xml.in.h:7 -#: ../comps-el4.xml.in.h:2 +#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 +#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2 #: ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "Aplicaciones" -#: ../comps-f7.xml.in.h:6 -#: ../comps-f8.xml.in.h:6 -#: ../comps-f9.xml.in.h:6 -#: ../comps-f10.xml.in.h:7 -#: ../comps-f11.xml.in.h:8 +#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 +#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 msgid "Applications to perform a variety of tasks" msgstr "Aplicaciones para una variedad de tareas" -#: ../comps-f7.xml.in.h:7 -#: ../comps-f8.xml.in.h:7 -#: ../comps-f9.xml.in.h:7 -#: ../comps-f10.xml.in.h:8 -#: ../comps-f11.xml.in.h:9 -#: ../comps-el4.xml.in.h:4 +#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 +#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4 #: ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "Soporte para ??rabe" -#: ../comps-f7.xml.in.h:8 -#: ../comps-f8.xml.in.h:8 -#: ../comps-f9.xml.in.h:8 -#: ../comps-f10.xml.in.h:9 -#: ../comps-f11.xml.in.h:10 -#: ../comps-el4.xml.in.h:5 +#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 +#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5 #: ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "Soporte para armenio" -#: ../comps-f7.xml.in.h:9 -#: ../comps-f8.xml.in.h:9 -#: ../comps-f9.xml.in.h:9 -#: ../comps-f10.xml.in.h:10 -#: ../comps-f11.xml.in.h:11 +#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9 +#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 msgid "Assamese Support" msgstr "Soporte para assam??s" -#: ../comps-f7.xml.in.h:10 -#: ../comps-f8.xml.in.h:10 -#: ../comps-f9.xml.in.h:10 -#: ../comps-f10.xml.in.h:11 -#: ../comps-f11.xml.in.h:12 -#: ../comps-el4.xml.in.h:6 +#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10 +#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6 #: ../comps-el5.xml.in.h:6 msgid "Authoring and Publishing" msgstr "Autor??a y publicaci??n" -#: ../comps-f7.xml.in.h:11 -#: ../comps-f8.xml.in.h:11 -#: ../comps-f9.xml.in.h:11 -#: ../comps-f10.xml.in.h:12 -#: ../comps-f11.xml.in.h:13 +#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11 +#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 msgid "Base" msgstr "Base" -#: ../comps-f7.xml.in.h:12 -#: ../comps-f8.xml.in.h:12 -#: ../comps-f9.xml.in.h:12 -#: ../comps-f10.xml.in.h:13 -#: ../comps-f11.xml.in.h:14 -#: ../comps-el4.xml.in.h:7 +#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12 +#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7 #: ../comps-el5.xml.in.h:7 msgid "Base System" msgstr "Sistema Base" -#: ../comps-f7.xml.in.h:13 -#: ../comps-f8.xml.in.h:13 -#: ../comps-f9.xml.in.h:13 -#: ../comps-f10.xml.in.h:14 -#: ../comps-f11.xml.in.h:15 +#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13 +#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15 msgid "Basic support for the Ruby programming language." msgstr "Soporte b??sico para el lenguaje de programaci??n Ruby." -#: ../comps-f7.xml.in.h:14 -#: ../comps-f8.xml.in.h:14 -#: ../comps-f9.xml.in.h:14 -#: ../comps-f10.xml.in.h:15 -#: ../comps-f11.xml.in.h:16 +#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14 +#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16 msgid "Basque Support" msgstr "Soporte para vascuence" -#: ../comps-f7.xml.in.h:15 -#: ../comps-f8.xml.in.h:15 -#: ../comps-f9.xml.in.h:15 -#: ../comps-f10.xml.in.h:16 -#: ../comps-f11.xml.in.h:17 +#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15 +#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17 msgid "Belarusian Support" msgstr "Soporte para bielorruso" -#: ../comps-f7.xml.in.h:16 -#: ../comps-f8.xml.in.h:16 [...2358 lines suppressed...] msgid "Tajik Support" msgstr "Soporte para Tajik" -#: ../comps-f10.xml.in.h:207 -#: ../comps-f11.xml.in.h:217 +#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:220 msgid "Uzbek Support" msgstr "Soporte para Uszbek" @@ -1894,106 +1314,134 @@ msgid "Amazigh Support" msgstr "Soporte para amazigh" -#: ../comps-f11.xml.in.h:55 +#: ../comps-f11.xml.in.h:34 +msgid "Design and Simulation tools for hardware engineers" +msgstr "Herramientas de Dise??o y Simulaci??n para ingenieros" + +#: ../comps-f11.xml.in.h:45 +msgid "Electronic Lab" +msgstr "Laboratorio Electr??nico" + +#: ../comps-f11.xml.in.h:57 msgid "Font design and packaging" msgstr "Dise??o y empaquetamiento de Fuentes" -#: ../comps-f11.xml.in.h:59 +#: ../comps-f11.xml.in.h:61 msgid "Frisian Support" msgstr "Soporte para frisio" -#: ../comps-f11.xml.in.h:60 +#: ../comps-f11.xml.in.h:62 msgid "Friulian Support" msgstr "Soporte para friulio" -#: ../comps-f11.xml.in.h:102 +#: ../comps-f11.xml.in.h:104 msgid "Kinyarwanda Support" msgstr "Soporte para kinyarwanda" -#: ../comps-f11.xml.in.h:119 +#: ../comps-f11.xml.in.h:121 msgid "Malagasy Support" msgstr "Soporte para malagasio" -#: ../comps-f11.xml.in.h:133 +#: ../comps-f11.xml.in.h:135 msgid "Occitan Support" msgstr "Soporte para occitanio" -#: ../comps-f11.xml.in.h:201 -msgid "This group is a collection of tools used in the design, modification, manipulation, and packaging of fonts." -msgstr "Este grupo es un conjunto de herramientas que se usan en el dise??o, modificaci??n, manipulaci??n y empaquetado de fuentes (tipos de letras)." +#: ../comps-f11.xml.in.h:138 +msgid "Online Help and Documentation" +msgstr "Ayuda y Documentaci??n en linea" + +#: ../comps-f11.xml.in.h:204 +msgid "" +"This group is a collection of tools used in the design, modification, " +"manipulation, and packaging of fonts." +msgstr "" +"Este grupo es un conjunto de herramientas que se usan en el dise??o, " +"modificaci??n, manipulaci??n y empaquetado de fuentes (tipos de letras)." -#: ../comps-f11.xml.in.h:213 +#: ../comps-f11.xml.in.h:216 msgid "Turkmen Support" msgstr "Soporte para turkmenio" -#: ../comps-f11.xml.in.h:215 +#: ../comps-f11.xml.in.h:218 msgid "Upper Sorbian Support" msgstr "Soporte para serbio arribe??o" -#: ../comps-el4.xml.in.h:3 -#: ../comps-el5.xml.in.h:3 +#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" msgstr "Aplicaciones para una variedad de tareas" -#: ../comps-el4.xml.in.h:12 -#: ../comps-el5.xml.in.h:13 +#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13 msgid "Dialup Networking Support" msgstr "Soporte de red mediante discado" -#: ../comps-el4.xml.in.h:22 -#: ../comps-el5.xml.in.h:23 -msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." -msgstr "GNOME es una potente interfaz gr??fica de usuario que incluye un panel, un escritorio, iconos del sistema y gestores gr??ficos de archivos." - -#: ../comps-el4.xml.in.h:35 -#: ../comps-el5.xml.in.h:35 -msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." -msgstr "KDE es una interfaz de usuario gr??fica y potente que incluye un panel, un escritorio, iconos del sistema y un gestor gr??fico de archivos. " - -#: ../comps-el4.xml.in.h:44 -#: ../comps-el5.xml.in.h:44 -msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi." -msgstr "Existen programas que permiten crear y modificar archivos, a veces llamados editores de texto. Estos incluyen Emacs y Vi." +#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23 +msgid "" +"GNOME is a powerful, graphical user interface which includes a panel, " +"desktop, system icons, and a graphical file manager." +msgstr "" +"GNOME es una potente interfaz gr??fica de usuario que incluye un panel, un " +"escritorio, iconos del sistema y gestores gr??ficos de archivos." + +#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35 +msgid "" +"KDE is a powerful, graphical user interface which includes a panel, desktop, " +"system icons, and a graphical file manager." +msgstr "" +"KDE es una interfaz de usuario gr??fica y potente que incluye un panel, un " +"escritorio, iconos del sistema y un gestor gr??fico de archivos. " + +#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44 +msgid "" +"Sometimes called text editors, these are programs that allow you to create " +"and edit files. These include Emacs and Vi." +msgstr "" +"Existen programas que permiten crear y modificar archivos, a veces llamados " +"editores de texto. Estos incluyen Emacs y Vi." -#: ../comps-el4.xml.in.h:50 -#: ../comps-el5.xml.in.h:48 +#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48 msgid "The XEmacs text editor." msgstr "Editor de textos XEmacs." -#: ../comps-el4.xml.in.h:54 -#: ../comps-el5.xml.in.h:52 -msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text." -msgstr "Estas herramientas le permiten crear documentaci??n en formato DocBook y convertirla a HTML, PDF, Postscript y texto." +#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52 +msgid "" +"These tools allow you to create documentation in the DocBook format and " +"convert them to HTML, PDF, Postscript, and text." +msgstr "" +"Estas herramientas le permiten crear documentaci??n en formato DocBook y " +"convertirla a HTML, PDF, Postscript y texto." -#: ../comps-el4.xml.in.h:64 -#: ../comps-el5.xml.in.h:62 +#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62 msgid "This group is a collection of network servers for specific purposes" msgstr "Este grupo es un conjunto de servidores para prop??sitos espec??ficos" -#: ../comps-el4.xml.in.h:65 -#: ../comps-el5.xml.in.h:63 -msgid "This group is a collection of tools and resources of Arabic environments." -msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Ar??be." - -#: ../comps-el4.xml.in.h:67 -#: ../comps-el5.xml.in.h:66 -msgid "This group is a collection of tools and resources of Hebrew environments." -msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Hebreo." - -#: ../comps-el4.xml.in.h:68 -#: ../comps-el5.xml.in.h:67 -msgid "This group is a collection of tools and resources of Japanese environments." -msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Japon??s." +#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 +msgid "" +"This group is a collection of tools and resources of Arabic environments." +msgstr "" +"Este grupo es un conjunto de herramientas y recursos para entornos en Ar??be." + +#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 +msgid "" +"This group is a collection of tools and resources of Hebrew environments." +msgstr "" +"Este grupo es un conjunto de herramientas y recursos para entornos en Hebreo." + +#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 +msgid "" +"This group is a collection of tools and resources of Japanese environments." +msgstr "" +"Este grupo es un conjunto de herramientas y recursos para entornos en " +"Japon??s." -#: ../comps-el4.xml.in.h:77 -#: ../comps-el5.xml.in.h:77 +#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77 msgid "XEmacs" msgstr "XEmacs" #: ../comps-el5.xml.in.h:65 -msgid "This group is a collection of tools and resources of Czech environments." -msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Checo." +msgid "" +"This group is a collection of tools and resources of Czech environments." +msgstr "" +"Este grupo es un conjunto de herramientas y recursos para entornos en Checo." #~ msgid "Haskell" #~ msgstr "Haskell" - From pgordon at fedoraproject.org Wed Mar 4 06:40:25 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Wed, 4 Mar 2009 06:40:25 +0000 (UTC) Subject: rpms/linkage/F-9 dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.1, NONE linkage.spec, 1.5, NONE sources, 1.3, NONE Message-ID: <20090304064025.A50C870118@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/linkage/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7203/F-9 Added Files: dead.package Removed Files: .cvsignore Makefile linkage.spec sources Log Message: Upstream development has ceased, so mark it as dead for Fedora too. --- NEW FILE dead.package --- Upstream mailing list thread: http://groups.google.com/group/linkage-devel/browse_thread/thread/c486958b0505c6f5 Linkage is no longer actively developed by its upstream maintainers and currently fails with recent (0.14.x) releases of rb_libtorrent due to API/ABI changes. --- .cvsignore DELETED --- --- Makefile DELETED --- --- linkage.spec DELETED --- --- sources DELETED --- From pgordon at fedoraproject.org Wed Mar 4 06:40:25 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Wed, 4 Mar 2009 06:40:25 +0000 (UTC) Subject: rpms/linkage/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE linkage-0.2.0-buildfix.patch, 1.1, NONE linkage-0.2.0-rb_libtorrent.patch, 1.1, NONE linkage.spec, 1.15, NONE sources, 1.3, NONE Message-ID: <20090304064025.5F0E170116@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/linkage/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7203/devel Added Files: dead.package Removed Files: Makefile linkage-0.2.0-buildfix.patch linkage-0.2.0-rb_libtorrent.patch linkage.spec sources Log Message: Upstream development has ceased, so mark it as dead for Fedora too. --- NEW FILE dead.package --- Upstream mailing list thread: http://groups.google.com/group/linkage-devel/browse_thread/thread/c486958b0505c6f5 Linkage is no longer actively developed by its upstream maintainers and currently fails with recent (0.14.x) releases of rb_libtorrent due to API/ABI changes. --- Makefile DELETED --- --- linkage-0.2.0-buildfix.patch DELETED --- --- linkage-0.2.0-rb_libtorrent.patch DELETED --- --- linkage.spec DELETED --- --- sources DELETED --- From pgordon at fedoraproject.org Wed Mar 4 06:40:26 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Wed, 4 Mar 2009 06:40:26 +0000 (UTC) Subject: rpms/linkage/F-10 dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.1, NONE linkage-0.2.0-buildfix.patch, 1.1, NONE linkage-0.2.0-rb_libtorrent.patch, 1.1, NONE linkage.spec, 1.12, NONE sources, 1.3, NONE Message-ID: <20090304064026.25F5970116@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/linkage/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7203/F-10 Added Files: dead.package Removed Files: .cvsignore Makefile linkage-0.2.0-buildfix.patch linkage-0.2.0-rb_libtorrent.patch linkage.spec sources Log Message: Upstream development has ceased, so mark it as dead for Fedora too. --- NEW FILE dead.package --- Upstream mailing list thread: http://groups.google.com/group/linkage-devel/browse_thread/thread/c486958b0505c6f5 Linkage is no longer actively developed by its upstream maintainers and currently fails with recent (0.14.x) releases of rb_libtorrent due to API/ABI changes. --- .cvsignore DELETED --- --- Makefile DELETED --- --- linkage-0.2.0-buildfix.patch DELETED --- --- linkage-0.2.0-rb_libtorrent.patch DELETED --- --- linkage.spec DELETED --- --- sources DELETED --- From jcm at fedoraproject.org Wed Mar 4 06:45:40 2009 From: jcm at fedoraproject.org (Jon Masters) Date: Wed, 4 Mar 2009 06:45:40 +0000 (UTC) Subject: rpms/module-init-tools/devel module-init-tools.spec,1.81,1.82 Message-ID: <20090304064540.4712070116@cvs1.fedora.phx.redhat.com> Author: jcm Update of /cvs/pkgs/rpms/module-init-tools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7700 Modified Files: module-init-tools.spec Log Message: Add a BuildRequires on glibc-static. Index: module-init-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- module-init-tools.spec 4 Mar 2009 00:32:28 -0000 1.81 +++ module-init-tools.spec 4 Mar 2009 06:45:08 -0000 1.82 @@ -2,7 +2,7 @@ Name: module-init-tools Version: 3.7 %define PreRelease -pre7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Kernel Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{PreRelease}.tar.bz2 @@ -16,7 +16,7 @@ Provides: modutils = %{version} BuildPrereq: zlib-devel docbook-utils BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: zlib-static +BuildRequires: zlib-static glibc-static %description The module-init-tools package includes various programs needed for automatic @@ -97,6 +97,9 @@ %ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.conf %changelog +* Wed Mar 04 2009 Jon Masters - 3.7-4 (pre7) +- Add a BuildRequires on glibc-static. + * Tue Mar 03 2009 Jon Masters - 3.7-3 (pre7) - Update to latest upstream. - Do not replace config files by default. From cebbert at fedoraproject.org Wed Mar 4 06:54:10 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Wed, 4 Mar 2009 06:54:10 +0000 (UTC) Subject: rpms/kernel/F-10 patch-2.6.29-rc7.bz2.sign, NONE, 1.1 .cvsignore, 1.994, 1.995 config-powerpc-generic, 1.29, 1.30 kernel.spec, 1.1282, 1.1283 sources, 1.955, 1.956 upstream, 1.866, 1.867 patch-2.6.29-rc6-git7.bz2.sign, 1.1, NONE patch-2.6.29-rc6.bz2.sign, 1.1, NONE Message-ID: <20090304065410.CEF9370116@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9216 Modified Files: .cvsignore config-powerpc-generic kernel.spec sources upstream Added Files: patch-2.6.29-rc7.bz2.sign Removed Files: patch-2.6.29-rc6-git7.bz2.sign patch-2.6.29-rc6.bz2.sign Log Message: 2.6.29-rc7 Disable CONFIG_GEF_SBC610 on powerpc to fix USB detection (F10#486511) --- NEW FILE patch-2.6.29-rc7.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBJrdg9yGugalF9Dw4RAkFfAJ4xnteJus29MN1bxtl2e2Jth3eD9gCfSg+B 7+Al92iS+MSQAiNKlvYD9Ps= =d3rT -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v retrieving revision 1.994 retrieving revision 1.995 diff -u -r1.994 -r1.995 --- .cvsignore 3 Mar 2009 16:14:45 -0000 1.994 +++ .cvsignore 4 Mar 2009 06:53:38 -0000 1.995 @@ -5,5 +5,4 @@ temp-* kernel-2.6.28 linux-2.6.28.tar.bz2 -patch-2.6.29-rc6.bz2 -patch-2.6.29-rc6-git7.bz2 +patch-2.6.29-rc7.bz2 Index: config-powerpc-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/config-powerpc-generic,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- config-powerpc-generic 29 Jan 2009 23:52:22 -0000 1.29 +++ config-powerpc-generic 4 Mar 2009 06:53:39 -0000 1.30 @@ -255,7 +255,7 @@ # CONFIG_PPC_SMLPAR is not set CONFIG_MGCOGE=y -CONFIG_GEF_SBC610=y +# CONFIG_GEF_SBC610 is not set CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y CONFIG_MPC8xxx_GPIO=y Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v retrieving revision 1.1282 retrieving revision 1.1283 diff -u -r1.1282 -r1.1283 --- kernel.spec 3 Mar 2009 16:19:23 -0000 1.1282 +++ kernel.spec 4 Mar 2009 06:53:39 -0000 1.1283 @@ -55,9 +55,9 @@ # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(expr %{base_sublevel} + 1) # The rc snapshot level -%define rcrev 6 +%define rcrev 7 # The git snapshot level -%define gitrev 7 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1767,6 +1767,10 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Wed Mar 04 2009 Chuck Ebbert 2.6.29-0.53.rc7 +- 2.6.29-rc7 +- Disable CONFIG_GEF_SBC610 on powerpc to fix USB detection (F10#486511) + * Tue Mar 03 2009 Chuck Ebbert 2.6.29-0.52.rc6.git7 - Fix up drm-modesetting-radeon so it applies. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v retrieving revision 1.955 retrieving revision 1.956 diff -u -r1.955 -r1.956 --- sources 3 Mar 2009 16:14:47 -0000 1.955 +++ sources 4 Mar 2009 06:53:40 -0000 1.956 @@ -1,3 +1,2 @@ d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2 -26f67d99666834cc579094619821d3c8 patch-2.6.29-rc6.bz2 -46b64d52e8f2f1e5b55784beb939ee2e patch-2.6.29-rc6-git7.bz2 +9404c2ead603a80a3aad6361b5fc5413 patch-2.6.29-rc7.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v retrieving revision 1.866 retrieving revision 1.867 diff -u -r1.866 -r1.867 --- upstream 3 Mar 2009 16:14:47 -0000 1.866 +++ upstream 4 Mar 2009 06:53:40 -0000 1.867 @@ -1,3 +1,2 @@ linux-2.6.28.tar.bz2 -patch-2.6.29-rc6.bz2 -patch-2.6.29-rc6-git7.bz2 +patch-2.6.29-rc7.bz2 --- patch-2.6.29-rc6-git7.bz2.sign DELETED --- --- patch-2.6.29-rc6.bz2.sign DELETED --- From cebbert at fedoraproject.org Wed Mar 4 06:57:35 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Wed, 4 Mar 2009 06:57:35 +0000 (UTC) Subject: rpms/kernel/F-10 linux-2.6.29-lirc.patch,1.3,1.4 Message-ID: <20090304065735.91D9D70116@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9771 Modified Files: linux-2.6.29-lirc.patch Log Message: copy latest lirc update from rawhide linux-2.6.29-lirc.patch: Index: linux-2.6.29-lirc.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6.29-lirc.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6.29-lirc.patch 1 Mar 2009 02:52:38 -0000 1.3 +++ linux-2.6.29-lirc.patch 4 Mar 2009 06:57:35 -0000 1.4 @@ -1,4 +1,6 @@ -Linux Infrared Remote Control drivers (http://www.lirc.org/) +Linux Infrared Remote Control drivers -- http://www.lirc.org + +From http://git.wilsonet.com/linux-2.6-lirc.git/ Signed-off-by: Jarod Wilson @@ -9,26 +11,26 @@ drivers/input/lirc/Kconfig | 118 +++ drivers/input/lirc/Makefile | 21 + drivers/input/lirc/lirc.h | 100 +++ - drivers/input/lirc/lirc_bt829.c | 381 +++++++++ + drivers/input/lirc/lirc_bt829.c | 383 +++++++++ drivers/input/lirc/lirc_dev.c | 853 +++++++++++++++++++ drivers/input/lirc/lirc_dev.h | 180 ++++ - drivers/input/lirc/lirc_i2c.c | 649 +++++++++++++++ - drivers/input/lirc/lirc_igorplugusb.c | 555 +++++++++++++ - drivers/input/lirc/lirc_imon.c | 1459 +++++++++++++++++++++++++++++++++ + drivers/input/lirc/lirc_i2c.c | 649 ++++++++++++++ + drivers/input/lirc/lirc_igorplugusb.c | 556 ++++++++++++ + drivers/input/lirc/lirc_imon.c | 1487 +++++++++++++++++++++++++++++++++ drivers/input/lirc/lirc_it87.c | 984 ++++++++++++++++++++++ drivers/input/lirc/lirc_it87.h | 116 +++ drivers/input/lirc/lirc_ite8709.c | 539 ++++++++++++ drivers/input/lirc/lirc_mceusb.c | 747 +++++++++++++++++ - drivers/input/lirc/lirc_mceusb2.c | 1097 +++++++++++++++++++++++++ + drivers/input/lirc/lirc_mceusb2.c | 1099 ++++++++++++++++++++++++ drivers/input/lirc/lirc_parallel.c | 709 ++++++++++++++++ drivers/input/lirc/lirc_parallel.h | 26 + - drivers/input/lirc/lirc_sasem.c | 933 +++++++++++++++++++++ + drivers/input/lirc/lirc_sasem.c | 931 +++++++++++++++++++++ drivers/input/lirc/lirc_serial.c | 1321 +++++++++++++++++++++++++++++ - drivers/input/lirc/lirc_sir.c | 1294 +++++++++++++++++++++++++++++ - drivers/input/lirc/lirc_streamzap.c | 773 +++++++++++++++++ + drivers/input/lirc/lirc_sir.c | 1294 ++++++++++++++++++++++++++++ + drivers/input/lirc/lirc_streamzap.c | 775 +++++++++++++++++ drivers/input/lirc/lirc_ttusbir.c | 398 +++++++++ - drivers/input/lirc/lirc_zilog.c | 1382 +++++++++++++++++++++++++++++++ - 25 files changed, 14648 insertions(+), 0 deletions(-) + drivers/input/lirc/lirc_zilog.c | 1382 ++++++++++++++++++++++++++++++ + 25 files changed, 14681 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 59fd2d1..ad1b16c 100644 @@ -332,10 +334,10 @@ +#endif diff --git a/drivers/input/lirc/lirc_bt829.c b/drivers/input/lirc/lirc_bt829.c new file mode 100644 -index 0000000..7981849 +index 0000000..c3852f2 --- /dev/null +++ b/drivers/input/lirc/lirc_bt829.c -@@ -0,0 +1,381 @@ +@@ -0,0 +1,383 @@ +/* + * Remote control driver for the TV-card based on bt829 + * @@ -389,11 +391,13 @@ +#define DATA_PCI_OFF 0x7FFC00 +#define WAIT_CYCLE 20 + ++#define DRIVER_NAME "lirc_bt829" ++ +static int debug; -+#define dprintk(fmt, args...) \ -+ do { \ -+ if (debug) \ -+ printk(KERN_DEBUG fmt, ## args); \ ++#define dprintk(fmt, args...) \ ++ do { \ ++ if (debug) \ ++ printk(KERN_DEBUG DRIVER_NAME ": "fmt, ## args); \ + } while (0) + +static int atir_minor; @@ -408,20 +412,20 @@ + my_dev = pci_get_device(PCI_VENDOR_ID_ATI, + PCI_DEVICE_ID_ATI_264VT, NULL); + if (my_dev) { -+ printk(KERN_ERR "ATIR: Using device: %s\n", ++ printk(KERN_ERR DRIVER_NAME "Using device: %s\n", + pci_name(my_dev)); + pci_addr_phys = 0; + if (my_dev->resource[0].flags & IORESOURCE_MEM) { + pci_addr_phys = my_dev->resource[0].start; -+ printk(KERN_INFO "ATIR memory at 0x%08X \n", ++ printk(KERN_INFO DRIVER_NAME "memory at 0x%08X \n", + (unsigned int)pci_addr_phys); + } + if (pci_addr_phys == 0) { -+ printk(KERN_ERR "ATIR no memory resource ?\n"); ++ printk(KERN_ERR DRIVER_NAME "no memory resource ?\n"); + return NULL; + } + } else { -+ printk(KERN_ERR "ATIR: pci_prob failed\n"); ++ printk(KERN_ERR DRIVER_NAME "pci_probe failed\n"); + return NULL; + } + return my_dev; @@ -434,7 +438,7 @@ + status = poll_main(); + key = (status >> 8) & 0xFF; + if (status & 0xFF) { -+ dprintk("ATIR reading key %02X\n", key); ++ dprintk("reading key %02X\n", key); + lirc_buffer_write(buf, &key); + return 0; + } @@ -443,13 +447,13 @@ + +static int atir_set_use_inc(void *data) +{ -+ dprintk("ATIR driver is opened\n"); ++ dprintk("driver is opened\n"); + return 0; +} + +static void atir_set_use_dec(void *data) +{ -+ dprintk("ATIR driver is closed\n"); ++ dprintk("driver is closed\n"); +} + +int init_module(void) @@ -476,10 +480,10 @@ + + atir_minor = lirc_register_driver(&atir_driver); + if (atir_minor < 0) { -+ printk(KERN_ERR "lirc_bt829: failed to register driver!\n"); ++ printk(KERN_ERR DRIVER_NAME "failed to register driver!\n"); + return atir_minor; + } -+ dprintk("ATIR driver is registered on minor %d\n", atir_minor); ++ dprintk("driver is registered on minor %d\n", atir_minor); + + return 0; +} @@ -495,7 +499,7 @@ +{ + pci_addr_lin = ioremap(pci_addr_phys + DATA_PCI_OFF, 0x400); + if (pci_addr_lin == 0) { -+ printk(KERN_INFO "atir: pci mem must be mapped\n"); ++ printk(KERN_INFO DRIVER_NAME "pci mem must be mapped\n"); + return 0; + } + return 1; @@ -2419,10 +2423,10 @@ +module_exit(lirc_i2c_exit); diff --git a/drivers/input/lirc/lirc_igorplugusb.c b/drivers/input/lirc/lirc_igorplugusb.c new file mode 100644 -index 0000000..51ccd1c +index 0000000..ff49bdd --- /dev/null +++ b/drivers/input/lirc/lirc_igorplugusb.c -@@ -0,0 +1,555 @@ +@@ -0,0 +1,556 @@ +/* + * lirc_igorplugusb - USB remote support for LIRC + * @@ -2885,10 +2889,11 @@ + do_gettimeofday(&ir->last_time); + + if (dev->descriptor.iManufacturer -+ && usb_string(dev, dev->descriptor.iManufacturer, buf, 63) > 0) ++ && usb_string(dev, dev->descriptor.iManufacturer, ++ buf, sizeof(buf)) > 0) + strlcpy(name, buf, sizeof(name)); + if (dev->descriptor.iProduct -+ && usb_string(dev, dev->descriptor.iProduct, buf, 63) > 0) ++ && usb_string(dev, dev->descriptor.iProduct, buf, sizeof(buf)) > 0) + snprintf(name + strlen(name), sizeof(name) - strlen(name), + " %s", buf); + printk(DRIVER_NAME "[%d]: %s on usb%d:%d\n", devnum, name, @@ -2980,12 +2985,12 @@ + diff --git a/drivers/input/lirc/lirc_imon.c b/drivers/input/lirc/lirc_imon.c new file mode 100644 -index 0000000..5655a0d +index 0000000..05cb293 --- /dev/null +++ b/drivers/input/lirc/lirc_imon.c -@@ -0,0 +1,1459 @@ +@@ -0,0 +1,1487 @@ +/* -+ * lirc_imon.c: LIRC/VFD/LCD driver for Ahanix/Soundgraph IMON IR/VFD/LCD ++ * lirc_imon.c: LIRC/VFD/LCD driver for Ahanix/Soundgraph iMON IR/VFD/LCD + * including the iMON PAD model + * + * Copyright(C) 2004 Venky Raju(dev at venky.ws) @@ -3040,6 +3045,10 @@ +static void usb_rx_callback(struct urb *urb); +static void usb_tx_callback(struct urb *urb); + ++/* suspend/resume support */ ++static int imon_resume(struct usb_interface *intf); ++static int imon_suspend(struct usb_interface *intf, pm_message_t message); ++ +/* display file_operations function prototypes */ +static int display_open(struct inode *inode, struct file *file); +static int display_close(struct inode *inode, struct file *file); @@ -3113,7 +3122,7 @@ + IMON_DISPLAY_TYPE_NONE, +}; + -+/* USB Device ID for IMON USB Control Board */ ++/* USB Device ID for iMON USB Control Board */ +static struct usb_device_id imon_usb_id_table[] = { + /* iMON USB Control Board (IR & VFD) */ + { USB_DEVICE(0x0aa8, 0xffda) }, @@ -3220,6 +3229,8 @@ + .name = MOD_NAME, + .probe = imon_probe, + .disconnect = imon_disconnect, ++ .suspend = imon_suspend, ++ .resume = imon_resume, + .id_table = imon_usb_id_table, +}; + @@ -3554,7 +3565,7 @@ + + +/** -+ * Writes data to the VFD. The IMON VFD is 2x16 characters ++ * Writes data to the VFD. The iMON VFD is 2x16 characters + * and requires data in 5 consecutive USB interrupt packets, + * each packet but the last carrying 7 bytes. + * @@ -4120,7 +4131,7 @@ + struct imon_context *context = NULL; + int i; + -+ printk(KERN_INFO "%s: found IMON device\n", __func__); ++ printk(KERN_INFO "%s: found iMON device\n", __func__); + + /* + * If it's the LCD, as opposed to the VFD, we just need to replace @@ -4420,6 +4431,27 @@ + printk(KERN_INFO "%s: iMON device disconnected\n", __func__); +} + ++static int imon_suspend(struct usb_interface *intf, pm_message_t message) ++{ ++ struct imon_context *context = usb_get_intfdata(intf); ++ ++ if (context->ir_isopen) ++ usb_kill_urb(context->rx_urb); ++ ++ return 0; ++} ++ ++static int imon_resume(struct usb_interface *intf) ++{ ++ int rc = 0; ++ struct imon_context *context = usb_get_intfdata(intf); ++ ++ if (context->ir_isopen) ++ rc = usb_submit_urb(context->rx_urb, GFP_ATOMIC); ++ ++ return rc; ++} ++ +static int __init imon_init(void) +{ + int rc; @@ -4432,6 +4464,7 @@ + err("%s: usb register failed(%d)", __func__, rc); + return -ENODEV; + } ++ + return 0; +} + @@ -6855,10 +6888,10 @@ +MODULE_PARM_DESC(debug, "Debug enabled or not"); diff --git a/drivers/input/lirc/lirc_mceusb2.c b/drivers/input/lirc/lirc_mceusb2.c new file mode 100644 -index 0000000..089ee21 +index 0000000..0551adf --- /dev/null +++ b/drivers/input/lirc/lirc_mceusb2.c -@@ -0,0 +1,1097 @@ +@@ -0,0 +1,1099 @@ +/* + * LIRC driver for Philips eHome USB Infrared Transceiver + * and the Microsoft MCE 2005 Remote Control @@ -7804,10 +7837,12 @@ + ir->usb_ep_out = ep_out; + + if (dev->descriptor.iManufacturer -+ && usb_string(dev, dev->descriptor.iManufacturer, buf, 63) > 0) ++ && usb_string(dev, dev->descriptor.iManufacturer, ++ buf, sizeof(buf)) > 0) + strlcpy(name, buf, sizeof(name)); + if (dev->descriptor.iProduct -+ && usb_string(dev, dev->descriptor.iProduct, buf, 63) > 0) ++ && usb_string(dev, dev->descriptor.iProduct, ++ buf, sizeof(buf)) > 0) + snprintf(name + strlen(name), sizeof(name) - strlen(name), + " %s", buf); + printk(DRIVER_NAME "[%d]: %s on usb%d:%d\n", devnum, name, @@ -8705,10 +8740,10 @@ +#endif diff --git a/drivers/input/lirc/lirc_sasem.c b/drivers/input/lirc/lirc_sasem.c new file mode 100644 -index 0000000..3b79372 +index 0000000..270f8ff --- /dev/null +++ b/drivers/input/lirc/lirc_sasem.c -@@ -0,0 +1,933 @@ +@@ -0,0 +1,931 @@ +/* + * lirc_sasem.c - USB remote support for LIRC + * Version 0.5 @@ -8836,8 +8871,6 @@ + .write = &vfd_write, + .ioctl = &vfd_ioctl, + .release = &vfd_close, -+ .read = lirc_dev_fop_read, -+ .poll = lirc_dev_fop_poll, +}; + +/* USB Device ID for Sasem USB Control Board */ @@ -9644,7 +9677,7 @@ +module_exit(sasem_exit); diff --git a/drivers/input/lirc/lirc_serial.c b/drivers/input/lirc/lirc_serial.c new file mode 100644 -index 0000000..692634f +index 0000000..3e9292e --- /dev/null +++ b/drivers/input/lirc/lirc_serial.c @@ -0,0 +1,1321 @@ @@ -10545,10 +10578,10 @@ + msleep(jiffies_to_msecs(HZ/25)); + } + sense = (nlow >= nhigh ? 1 : 0); -+ printk(KERN_INFO LIRC_DRIVER_NAME ": auto-detected active " ++ printk(KERN_INFO LIRC_DRIVER_NAME ": auto-detected active " + "%s receiver\n", sense ? "low" : "high"); + } else -+ printk(KERN_INFO LIRC_DRIVER_NAME ": Manually using active " ++ printk(KERN_INFO LIRC_DRIVER_NAME ": Manually using active " + "%s receiver\n", sense ? "low" : "high"); + + return 0; @@ -12271,10 +12304,10 @@ +MODULE_PARM_DESC(debug, "Enable debugging messages"); diff --git a/drivers/input/lirc/lirc_streamzap.c b/drivers/input/lirc/lirc_streamzap.c new file mode 100644 -index 0000000..f91c1e3 +index 0000000..6db4310 --- /dev/null +++ b/drivers/input/lirc/lirc_streamzap.c -@@ -0,0 +1,773 @@ +@@ -0,0 +1,775 @@ +/* + * Streamzap Remote Control driver + * @@ -12516,7 +12549,7 @@ + lirc_buffer_write(&sz->lirc_buf, + (unsigned char *) &data); + } else { -+ dprintk("buffer overflow\n", sz->driver.minor); ++ dprintk("buffer overflow", sz->driver.minor); + } + } + if (!empty) @@ -12553,7 +12586,7 @@ +} + +static void push_full_pulse(struct usb_streamzap *sz, -+ unsigned char value) ++ unsigned char value) +{ + int pulse; + @@ -12580,23 +12613,23 @@ + sz->sum = 0; + } + -+ pulse = ((int) value)*STREAMZAP_RESOLUTION; -+ pulse += STREAMZAP_RESOLUTION/2; ++ pulse = ((int) value) * STREAMZAP_RESOLUTION; ++ pulse += STREAMZAP_RESOLUTION / 2; + sz->sum += pulse; + pulse |= PULSE_BIT; + -+ dprintk("p %u", sz->driver.minor, pulse&PULSE_MASK); ++ dprintk("p %u", sz->driver.minor, pulse & PULSE_MASK); + push(sz, (char *)&pulse); +} + +static void push_half_pulse(struct usb_streamzap *sz, -+ unsigned char value) ++ unsigned char value) +{ + push_full_pulse(sz, (value & STREAMZAP_PULSE_MASK)>>4); +} + +static void push_full_space(struct usb_streamzap *sz, -+ unsigned char value) ++ unsigned char value) +{ + int space; + @@ -12608,7 +12641,7 @@ +} + +static void push_half_space(struct usb_streamzap *sz, -+ unsigned char value) ++ unsigned char value) +{ + push_full_space(sz, value & STREAMZAP_SPACE_MASK); +} @@ -12821,11 +12854,13 @@ + sz->endpoint->bInterval); + + if (udev->descriptor.iManufacturer -+ && usb_string(udev, udev->descriptor.iManufacturer, buf, 63) > 0) ++ && usb_string(udev, udev->descriptor.iManufacturer, ++ buf, sizeof(buf)) > 0) + strlcpy(name, buf, sizeof(name)); + + if (udev->descriptor.iProduct -+ && usb_string(udev, udev->descriptor.iProduct, buf, 63) > 0) ++ && usb_string(udev, udev->descriptor.iProduct, ++ buf, sizeof(buf)) > 0) + snprintf(name + strlen(name), sizeof(name) - strlen(name), + " %s", buf); + @@ -12974,7 +13009,7 @@ +{ + struct usb_streamzap *sz = usb_get_intfdata(intf); + -+ printk(DRIVER_NAME "[%d]: suspend\n", sz->driver.minor); ++ printk(KERN_INFO DRIVER_NAME "[%d]: suspend\n", sz->driver.minor); + if (sz->in_use) { + if (sz->flush) { + sz->flush = 0; From whot at fedoraproject.org Wed Mar 4 07:00:18 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Wed, 4 Mar 2009 07:00:18 +0000 (UTC) Subject: rpms/xorg-x11-drv-synaptics/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xorg-x11-drv-synaptics.spec, 1.23, 1.24 Message-ID: <20090304070018.95DAB70116@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10093 Modified Files: .cvsignore sources xorg-x11-drv-synaptics.spec Log Message: * Wed Mar 04 2009 Peter Hutterer 1.0.99.3-1 - synaptics 1.1, snapshot 3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 27 Feb 2009 03:33:22 -0000 1.10 +++ .cvsignore 4 Mar 2009 06:59:47 -0000 1.11 @@ -1 +1 @@ -xf86-input-synaptics-1.0.99.2.tar.bz2 +xf86-input-synaptics-1.0.99.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 27 Feb 2009 03:33:22 -0000 1.10 +++ sources 4 Mar 2009 06:59:48 -0000 1.11 @@ -1 +1 @@ -baac9f27665b91958fb5fca270591316 xf86-input-synaptics-1.0.99.2.tar.bz2 +f871992caa9fb32e2992bdaadd27041c xf86-input-synaptics-1.0.99.3.tar.bz2 Index: xorg-x11-drv-synaptics.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xorg-x11-drv-synaptics.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- xorg-x11-drv-synaptics.spec 27 Feb 2009 03:33:22 -0000 1.23 +++ xorg-x11-drv-synaptics.spec 4 Mar 2009 06:59:48 -0000 1.24 @@ -6,7 +6,7 @@ Name: xorg-x11-drv-synaptics Summary: Xorg X11 Synaptics touchpad input driver -Version: 1.0.99.2 +Version: 1.0.99.3 Release: 1%{?dist} URL: http://www.x.org License: MIT @@ -121,6 +121,9 @@ %changelog +* Wed Mar 04 2009 Peter Hutterer 1.0.99.3-1 +- synaptics 1.1, snapshot 3 + * Fri Feb 27 2009 Peter Hutterer 1.0.99.2-1 - Synaptics 1.1, snapshot 2 - Up Requires to 1.6.0-2 for XATOM_FLOAT defines. From airlied at fedoraproject.org Wed Mar 4 07:01:07 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Wed, 4 Mar 2009 07:01:07 +0000 (UTC) Subject: rpms/mesa/devel mesa-7.3-dri-configs-fixes.patch, NONE, 1.1 mesa-7.3-fixes-from-7.4-branch.patch, NONE, 1.1 mesa.spec, 1.225, 1.226 radeon-rewrite.patch, 1.3, 1.4 Message-ID: <20090304070107.5633970116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/mesa/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10332 Modified Files: mesa.spec radeon-rewrite.patch Added Files: mesa-7.3-dri-configs-fixes.patch mesa-7.3-fixes-from-7.4-branch.patch Log Message: * Wed Mar 04 2009 Dave Airlie 7.3-9 - try again: pull in 7.4 fixes, dri configs changes, new radeon-rewrite mesa-7.3-dri-configs-fixes.patch: --- NEW FILE mesa-7.3-dri-configs-fixes.patch --- diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c index 30c860b..fb2efbb 100644 --- a/src/mesa/drivers/dri/common/utils.c +++ b/src/mesa/drivers/dri/common/utils.c @@ -523,7 +523,8 @@ __DRIconfig ** driCreateConfigs(GLenum fb_format, GLenum fb_type, const uint8_t * depth_bits, const uint8_t * stencil_bits, unsigned num_depth_stencil_bits, - const GLenum * db_modes, unsigned num_db_modes) + const GLenum * db_modes, unsigned num_db_modes, + const u_int8_t * msaa_samples, unsigned num_msaa_modes) { static const uint8_t bits_table[4][4] = { /* R G B A */ @@ -583,9 +584,7 @@ driCreateConfigs(GLenum fb_format, GLenum fb_type, int index; __DRIconfig **configs, **c; __GLcontextModes *modes; - unsigned i; - unsigned j; - unsigned k; + unsigned i, j, k, h; unsigned num_modes; unsigned num_accum_bits = 2; @@ -666,66 +665,74 @@ driCreateConfigs(GLenum fb_format, GLenum fb_type, c = configs; for ( k = 0 ; k < num_depth_stencil_bits ; k++ ) { for ( i = 0 ; i < num_db_modes ; i++ ) { - for ( j = 0 ; j < num_accum_bits ; j++ ) { - *c = _mesa_malloc (sizeof **c); - modes = &(*c)->modes; - c++; - - memset(modes, 0, sizeof *modes); - modes->redBits = bits[0]; - modes->greenBits = bits[1]; - modes->blueBits = bits[2]; - modes->alphaBits = bits[3]; - modes->redMask = masks[0]; - modes->greenMask = masks[1]; - modes->blueMask = masks[2]; - modes->alphaMask = masks[3]; - modes->rgbBits = modes->redBits + modes->greenBits - + modes->blueBits + modes->alphaBits; - - modes->accumRedBits = 16 * j; - modes->accumGreenBits = 16 * j; - modes->accumBlueBits = 16 * j; - modes->accumAlphaBits = (masks[3] != 0) ? 16 * j : 0; - modes->visualRating = (j == 0) ? GLX_NONE : GLX_SLOW_CONFIG; - - modes->stencilBits = stencil_bits[k]; - modes->depthBits = depth_bits[k]; - - modes->transparentPixel = GLX_NONE; - modes->transparentRed = GLX_DONT_CARE; - modes->transparentGreen = GLX_DONT_CARE; - modes->transparentBlue = GLX_DONT_CARE; - modes->transparentAlpha = GLX_DONT_CARE; - modes->transparentIndex = GLX_DONT_CARE; - modes->visualType = GLX_DONT_CARE; - modes->renderType = GLX_RGBA_BIT; - modes->drawableType = GLX_WINDOW_BIT; - modes->rgbMode = GL_TRUE; - - if ( db_modes[i] == GLX_NONE ) { - modes->doubleBufferMode = GL_FALSE; - } - else { - modes->doubleBufferMode = GL_TRUE; - modes->swapMethod = db_modes[i]; - } - - modes->haveAccumBuffer = ((modes->accumRedBits + + for ( h = 0 ; h < num_msaa_modes; h++ ) { + for ( j = 0 ; j < num_accum_bits ; j++ ) { + *c = _mesa_malloc (sizeof **c); + modes = &(*c)->modes; + c++; + + memset(modes, 0, sizeof *modes); + modes->redBits = bits[0]; + modes->greenBits = bits[1]; + modes->blueBits = bits[2]; + modes->alphaBits = bits[3]; + modes->redMask = masks[0]; + modes->greenMask = masks[1]; + modes->blueMask = masks[2]; + modes->alphaMask = masks[3]; + modes->rgbBits = modes->redBits + modes->greenBits + + modes->blueBits + modes->alphaBits; + + modes->accumRedBits = 16 * j; + modes->accumGreenBits = 16 * j; + modes->accumBlueBits = 16 * j; + modes->accumAlphaBits = (masks[3] != 0) ? 16 * j : 0; + modes->visualRating = (j == 0) ? GLX_NONE : GLX_SLOW_CONFIG; + + modes->stencilBits = stencil_bits[k]; + modes->depthBits = depth_bits[k]; + + modes->transparentPixel = GLX_NONE; + modes->transparentRed = GLX_DONT_CARE; + modes->transparentGreen = GLX_DONT_CARE; + modes->transparentBlue = GLX_DONT_CARE; + modes->transparentAlpha = GLX_DONT_CARE; + modes->transparentIndex = GLX_DONT_CARE; + modes->visualType = GLX_DONT_CARE; + modes->renderType = GLX_RGBA_BIT; + modes->drawableType = GLX_WINDOW_BIT; + modes->rgbMode = GL_TRUE; + + if ( db_modes[i] == GLX_NONE ) { + modes->doubleBufferMode = GL_FALSE; + } + else { + modes->doubleBufferMode = GL_TRUE; + modes->swapMethod = db_modes[i]; + } + + modes->samples = msaa_samples[h]; + modes->sampleBuffers = modes->samples ? 1 : 0; + + + modes->haveAccumBuffer = ((modes->accumRedBits + modes->accumGreenBits + modes->accumBlueBits + modes->accumAlphaBits) > 0); - modes->haveDepthBuffer = (modes->depthBits > 0); - modes->haveStencilBuffer = (modes->stencilBits > 0); - - modes->bindToTextureRgb = GL_TRUE; - modes->bindToTextureRgba = GL_TRUE; - modes->bindToMipmapTexture = GL_FALSE; - modes->bindToTextureTargets = modes->rgbMode ? - __DRI_ATTRIB_TEXTURE_1D_BIT | - __DRI_ATTRIB_TEXTURE_2D_BIT | - __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT : - 0; + modes->haveDepthBuffer = (modes->depthBits > 0); + modes->haveStencilBuffer = (modes->stencilBits > 0); + + modes->bindToTextureRgb = GL_TRUE; + modes->bindToTextureRgba = GL_TRUE; + modes->bindToMipmapTexture = GL_FALSE; + modes->bindToTextureTargets = modes->rgbMode ? + __DRI_ATTRIB_TEXTURE_1D_BIT | + __DRI_ATTRIB_TEXTURE_2D_BIT | + __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT : + 0; + + modes = modes->next; + } } } } @@ -734,9 +741,10 @@ driCreateConfigs(GLenum fb_format, GLenum fb_type, return configs; } -const __DRIconfig **driConcatConfigs(__DRIconfig **a, __DRIconfig **b) +__DRIconfig **driConcatConfigs(__DRIconfig **a, + __DRIconfig **b) { - const __DRIconfig **all; + __DRIconfig **all; int i, j, index; i = 0; diff --git a/src/mesa/drivers/dri/common/utils.h b/src/mesa/drivers/dri/common/utils.h index 0c974db..9e9e5bc 100644 --- a/src/mesa/drivers/dri/common/utils.h +++ b/src/mesa/drivers/dri/common/utils.h @@ -131,9 +131,11 @@ extern __DRIconfig ** driCreateConfigs(GLenum fb_format, GLenum fb_type, const uint8_t * depth_bits, const uint8_t * stencil_bits, unsigned num_depth_stencil_bits, - const GLenum * db_modes, unsigned num_db_modes); + const GLenum * db_modes, unsigned num_db_modes, + const uint8_t * msaa_samples, unsigned num_msaa_modes); -const __DRIconfig **driConcatConfigs(__DRIconfig **a, __DRIconfig **b); +__DRIconfig **driConcatConfigs(__DRIconfig **a, + __DRIconfig **b); int driGetConfigAttrib(const __DRIconfig *config, diff --git a/src/mesa/drivers/dri/ffb/ffb_xmesa.c b/src/mesa/drivers/dri/ffb/ffb_xmesa.c index 679f856..b1bb010 100644 --- a/src/mesa/drivers/dri/ffb/ffb_xmesa.c +++ b/src/mesa/drivers/dri/ffb/ffb_xmesa.c @@ -626,6 +626,7 @@ ffbFillInModes( __DRIscreenPrivate *psp, uint8_t depth_bits_array[3]; uint8_t stencil_bits_array[3]; + uint8_t msaa_samples_array[1]; depth_bits_array[0] = 0; depth_bits_array[1] = depth_bits; @@ -639,6 +640,8 @@ ffbFillInModes( __DRIscreenPrivate *psp, stencil_bits_array[1] = 0; stencil_bits_array[2] = (stencil_bits == 0) ? 8 : stencil_bits; + msaa_samples_array[0] = 0; + depth_buffer_factor = ((depth_bits != 0) || (stencil_bits != 0)) ? 3 : 1; back_buffer_factor = (have_back_buffer) ? 3 : 1; @@ -654,9 +657,10 @@ ffbFillInModes( __DRIscreenPrivate *psp, configs = driCreateConfigs(fb_format, fb_type, depth_bits_array, stencil_bits_array, depth_buffer_factor, back_buffer_modes, - back_buffer_factor); + back_buffer_factor, + msaa_samples_array, 1); if (configs == NULL) { - fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, + fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__); return NULL; } diff --git a/src/mesa/drivers/dri/i810/i810screen.c b/src/mesa/drivers/dri/i810/i810screen.c index 48603f5..9a5a39c 100644 --- a/src/mesa/drivers/dri/i810/i810screen.c +++ b/src/mesa/drivers/dri/i810/i810screen.c @@ -77,6 +77,7 @@ i810FillInModes( __DRIscreenPrivate *psp, uint8_t depth_bits_array[2]; uint8_t stencil_bits_array[2]; + uint8_t msaa_samples_array[1]; depth_bits_array[0] = depth_bits; depth_bits_array[1] = depth_bits; @@ -88,13 +89,16 @@ i810FillInModes( __DRIscreenPrivate *psp, stencil_bits_array[0] = 0; stencil_bits_array[1] = (stencil_bits == 0) ? 8 : stencil_bits; + msaa_samples_array[0] = 0; + depth_buffer_factor = ((depth_bits != 0) || (stencil_bits != 0)) ? 2 : 1; back_buffer_factor = (have_back_buffer) ? 2 : 1; configs = driCreateConfigs(GL_RGB, GL_UNSIGNED_SHORT_5_6_5, depth_bits_array, stencil_bits_array, depth_buffer_factor, - back_buffer_modes, back_buffer_factor); + back_buffer_modes, back_buffer_factor, + msaa_samples_array, 1); if (configs == NULL) { fprintf( stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__ ); diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index 7042c25..52a28b3 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -467,8 +467,6 @@ intelFillInModes(__DRIscreenPrivate *psp, __GLcontextModes *m; unsigned depth_buffer_factor; unsigned back_buffer_factor; - GLenum fb_format; - GLenum fb_type; int i; /* GLX_SWAP_COPY_OML is only supported because the Intel driver doesn't @@ -480,6 +478,7 @@ intelFillInModes(__DRIscreenPrivate *psp, uint8_t depth_bits_array[3]; uint8_t stencil_bits_array[3]; + uint8_t msaa_samples_array[1]; depth_bits_array[0] = 0; depth_bits_array[1] = depth_bits; @@ -496,22 +495,39 @@ intelFillInModes(__DRIscreenPrivate *psp, stencil_bits_array[2] = (stencil_bits == 0) ? 8 : stencil_bits; + msaa_samples_array[0] = 0; + depth_buffer_factor = ((depth_bits != 0) || (stencil_bits != 0)) ? 3 : 1; back_buffer_factor = (have_back_buffer) ? 3 : 1; if (pixel_bits == 16) { - fb_format = GL_RGB; - fb_type = GL_UNSIGNED_SHORT_5_6_5; + configs = driCreateConfigs(GL_RGB, GL_UNSIGNED_SHORT_5_6_5, + depth_bits_array, stencil_bits_array, + depth_buffer_factor, back_buffer_modes, + back_buffer_factor, + msaa_samples_array, 1); } else { - fb_format = GL_BGRA; - fb_type = GL_UNSIGNED_INT_8_8_8_8_REV; + __DRIconfig **configs_a8r8g8b8; + __DRIconfig **configs_x8r8g8b8; + + configs_a8r8g8b8 = driCreateConfigs(GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, + depth_bits_array, + stencil_bits_array, + depth_buffer_factor, + back_buffer_modes, + back_buffer_factor, + msaa_samples_array, 1); + configs_x8r8g8b8 = driCreateConfigs(GL_BGR, GL_UNSIGNED_INT_8_8_8_8_REV, + depth_bits_array, + stencil_bits_array, + depth_buffer_factor, + back_buffer_modes, + back_buffer_factor, + msaa_samples_array, 1); + configs = driConcatConfigs(configs_a8r8g8b8, configs_x8r8g8b8); } - configs = driCreateConfigs(fb_format, fb_type, - depth_bits_array, stencil_bits_array, - depth_buffer_factor, back_buffer_modes, - back_buffer_factor); if (configs == NULL) { fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__); @@ -673,6 +689,17 @@ static const __DRIconfig **intelInitScreen2(__DRIscreenPrivate *psp) { intelScreenPrivate *intelScreen; + GLenum fb_format[3]; + GLenum fb_type[3]; + /* GLX_SWAP_COPY_OML is only supported because the Intel driver doesn't + * support pageflipping at all. + */ + static const GLenum back_buffer_modes[] = { + GLX_NONE, GLX_SWAP_UNDEFINED_OML, GLX_SWAP_COPY_OML + }; + uint8_t depth_bits[4], stencil_bits[4], msaa_samples_array[1]; + int color; + __DRIconfig **configs = NULL; /* Calling driInitExtensions here, with a NULL context pointer, * does not actually enable the extensions. It just makes sure @@ -712,8 +739,50 @@ __DRIconfig **intelInitScreen2(__DRIscreenPrivate *psp) intelScreen->irq_active = 1; psp->extensions = intelScreenExtensions; - return driConcatConfigs(intelFillInModes(psp, 16, 16, 0, 1), - intelFillInModes(psp, 32, 24, 8, 1)); + depth_bits[0] = 0; + stencil_bits[0] = 0; + depth_bits[1] = 16; + stencil_bits[1] = 0; + depth_bits[2] = 24; + stencil_bits[2] = 0; + depth_bits[3] = 24; + stencil_bits[3] = 8; + + msaa_samples_array[0] = 0; + + fb_format[0] = GL_RGB; + fb_type[0] = GL_UNSIGNED_SHORT_5_6_5; + + fb_format[1] = GL_BGR; + fb_type[1] = GL_UNSIGNED_INT_8_8_8_8_REV; + + fb_format[2] = GL_BGRA; + fb_type[2] = GL_UNSIGNED_INT_8_8_8_8_REV; + + for (color = 0; color < ARRAY_SIZE(fb_format); color++) { + __DRIconfig **new_configs; + + new_configs = driCreateConfigs(fb_format[color], fb_type[color], + depth_bits, + stencil_bits, + ARRAY_SIZE(depth_bits), + back_buffer_modes, + ARRAY_SIZE(back_buffer_modes), + msaa_samples_array, + ARRAY_SIZE(msaa_samples_array)); + if (configs == NULL) + configs = new_configs; + else + configs = driConcatConfigs(configs, new_configs); + } + + if (configs == NULL) { + fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, + __LINE__); + return NULL; + } + + return (const __DRIconfig **)configs; } const struct __DriverAPIRec driDriverAPI = { diff --git a/src/mesa/drivers/dri/mach64/mach64_screen.c b/src/mesa/drivers/dri/mach64/mach64_screen.c index 6bfb4c3..43e5959 100644 --- a/src/mesa/drivers/dri/mach64/mach64_screen.c +++ b/src/mesa/drivers/dri/mach64/mach64_screen.c @@ -93,6 +93,7 @@ mach64FillInModes( __DRIscreenPrivate *psp, uint8_t depth_bits_array[2]; uint8_t stencil_bits_array[2]; + uint8_t msaa_samples_array[1]; depth_bits_array[0] = depth_bits; depth_bits_array[1] = depth_bits; @@ -104,6 +105,8 @@ mach64FillInModes( __DRIscreenPrivate *psp, stencil_bits_array[0] = 0; stencil_bits_array[1] = (stencil_bits == 0) ? 8 : stencil_bits; + msaa_samples_array[0] = 0; + depth_buffer_factor = ((depth_bits != 0) || (stencil_bits != 0)) ? 2 : 1; back_buffer_factor = (have_back_buffer) ? 2 : 1; @@ -119,7 +122,8 @@ mach64FillInModes( __DRIscreenPrivate *psp, configs = driCreateConfigs(fb_format, fb_type, depth_bits_array, stencil_bits_array, depth_buffer_factor, back_buffer_modes, - back_buffer_factor); + back_buffer_factor, + msaa_samples_array, 1); if (configs == NULL) { fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__); diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c index 86da3a2..af706b3 100644 --- a/src/mesa/drivers/dri/mga/mga_xmesa.c +++ b/src/mesa/drivers/dri/mga/mga_xmesa.c @@ -133,6 +133,7 @@ mgaFillInModes( __DRIscreenPrivate *psp, uint8_t depth_bits_array[3]; uint8_t stencil_bits_array[3]; + uint8_t msaa_samples_array[1]; depth_bits_array[0] = 0; @@ -147,6 +148,8 @@ mgaFillInModes( __DRIscreenPrivate *psp, stencil_bits_array[1] = 0; stencil_bits_array[2] = (stencil_bits == 0) ? 8 : stencil_bits; + msaa_samples_array[0] = 0; + depth_buffer_factor = ((depth_bits != 0) || (stencil_bits != 0)) ? 3 : 1; back_buffer_factor = (have_back_buffer) ? 2 : 1; @@ -162,7 +165,8 @@ mgaFillInModes( __DRIscreenPrivate *psp, configs = driCreateConfigs(fb_format, fb_type, depth_bits_array, stencil_bits_array, depth_buffer_factor, - back_buffer_modes, back_buffer_factor); + back_buffer_modes, back_buffer_factor, + msaa_samples_array, 1); if (configs == NULL) { fprintf( stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__ ); diff --git a/src/mesa/drivers/dri/r128/r128_screen.c b/src/mesa/drivers/dri/r128/r128_screen.c index cb3a147..7cda4ca 100644 --- a/src/mesa/drivers/dri/r128/r128_screen.c +++ b/src/mesa/drivers/dri/r128/r128_screen.c @@ -422,7 +422,7 @@ r128FillInModes( __DRIscreenPrivate *psp, uint8_t depth_bits_array[2]; uint8_t stencil_bits_array[2]; - + uint8_t msaa_samples_array[1]; depth_bits_array[0] = depth_bits; depth_bits_array[1] = depth_bits; @@ -434,6 +434,8 @@ r128FillInModes( __DRIscreenPrivate *psp, stencil_bits_array[0] = 0; stencil_bits_array[1] = (stencil_bits == 0) ? 8 : stencil_bits; + msaa_samples_array[0] = 0; + depth_buffer_factor = ((depth_bits != 0) || (stencil_bits != 0)) ? 2 : 1; back_buffer_factor = (have_back_buffer) ? 2 : 1; @@ -446,26 +448,27 @@ r128FillInModes( __DRIscreenPrivate *psp, fb_type = GL_UNSIGNED_INT_8_8_8_8_REV; } - configs = driCreateConfigs(fb_format, fb_type, - depth_bits_array, stencil_bits_array, - depth_buffer_factor, back_buffer_modes, - back_buffer_factor); - if (configs == NULL) { - fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, - __LINE__); - return NULL; - } + configs = driCreateConfigs(fb_format, fb_type, + depth_bits_array, stencil_bits_array, + depth_buffer_factor, back_buffer_modes, + back_buffer_factor, + msaa_samples_array, 1); + if (configs == NULL) { + fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, + __LINE__); + return NULL; + } - /* Mark the visual as slow if there are "fake" stencil bits. - */ - for (i = 0; configs[i]; i++) { - m = &configs[i]->modes; - if ((m->stencilBits != 0) && (m->stencilBits != stencil_bits)) { - m->visualRating = GLX_SLOW_CONFIG; - } - } + /* Mark the visual as slow if there are "fake" stencil bits. + */ + for (i = 0; configs[i]; i++) { + m = &configs[i]->modes; + if ((m->stencilBits != 0) && (m->stencilBits != stencil_bits)) { + m->visualRating = GLX_SLOW_CONFIG; + } + } - return (const __DRIconfig **) configs; + return (const __DRIconfig **) configs; } diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index 81337da..e3afaa9 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -274,7 +274,7 @@ radeonFillInModes( __DRIscreenPrivate *psp, uint8_t depth_bits_array[2]; uint8_t stencil_bits_array[2]; - + uint8_t msaa_samples_array[1]; depth_bits_array[0] = depth_bits; depth_bits_array[1] = depth_bits; @@ -286,6 +286,8 @@ radeonFillInModes( __DRIscreenPrivate *psp, stencil_bits_array[0] = 0; stencil_bits_array[1] = (stencil_bits == 0) ? 8 : stencil_bits; + msaa_samples_array[0] = 0; + depth_buffer_factor = ((depth_bits != 0) || (stencil_bits != 0)) ? 2 : 1; back_buffer_factor = (have_back_buffer) ? 2 : 1; @@ -301,7 +303,8 @@ radeonFillInModes( __DRIscreenPrivate *psp, configs = driCreateConfigs(fb_format, fb_type, depth_bits_array, stencil_bits_array, depth_buffer_factor, - back_buffer_modes, back_buffer_factor); + back_buffer_modes, back_buffer_factor, + msaa_samples_array, 1); if (configs == NULL) { fprintf( stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__ ); diff --git a/src/mesa/drivers/dri/savage/savage_xmesa.c b/src/mesa/drivers/dri/savage/savage_xmesa.c index a344aab..5c835ac 100644 --- a/src/mesa/drivers/dri/savage/savage_xmesa.c +++ b/src/mesa/drivers/dri/savage/savage_xmesa.c @@ -914,7 +914,7 @@ savageFillInModes( __DRIscreenPrivate *psp, uint8_t depth_bits_array[2]; uint8_t stencil_bits_array[2]; - + uint8_t msaa_samples_array[1]; depth_bits_array[0] = depth_bits; depth_bits_array[1] = depth_bits; @@ -926,6 +926,8 @@ savageFillInModes( __DRIscreenPrivate *psp, stencil_bits_array[0] = 0; stencil_bits_array[1] = (stencil_bits == 0) ? 8 : stencil_bits; + msaa_samples_array[0] = 0; + depth_buffer_factor = ((depth_bits != 0) || (stencil_bits != 0)) ? 2 : 1; back_buffer_factor = (have_back_buffer) ? 2 : 1; @@ -941,7 +943,8 @@ savageFillInModes( __DRIscreenPrivate *psp, configs = driCreateConfigs(fb_format, fb_type, depth_bits_array, stencil_bits_array, depth_buffer_factor, - back_buffer_modes, back_buffer_factor); + back_buffer_modes, back_buffer_factor, + msaa_samples_array, 1); if (configs == NULL) { fprintf( stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__ ); diff --git a/src/mesa/drivers/dri/sis/sis_screen.c b/src/mesa/drivers/dri/sis/sis_screen.c index b1a5d15..9eb27fe 100644 --- a/src/mesa/drivers/dri/sis/sis_screen.c +++ b/src/mesa/drivers/dri/sis/sis_screen.c @@ -77,6 +77,7 @@ sisFillInModes(__DRIscreenPrivate *psp, int bpp) }; uint8_t depth_bits_array[4]; uint8_t stencil_bits_array[4]; + uint8_t msaa_samples_array[1]; depth_bits_array[0] = 0; stencil_bits_array[0] = 0; @@ -87,6 +88,8 @@ sisFillInModes(__DRIscreenPrivate *psp, int bpp) depth_bits_array[3] = 32; stencil_bits_array[3] = 0; + msaa_samples_array[0] = 0; + depth_buffer_factor = 4; back_buffer_factor = 2; @@ -100,7 +103,8 @@ sisFillInModes(__DRIscreenPrivate *psp, int bpp) configs = driCreateConfigs(fb_format, fb_type, depth_bits_array, stencil_bits_array, depth_buffer_factor, - back_buffer_modes, back_buffer_factor); + back_buffer_modes, back_buffer_factor, + msaa_samples_array, 1); if (configs == NULL) { fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__); return NULL; diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c index 15b5724..6bfb866 100644 --- a/src/mesa/drivers/dri/swrast/swrast.c +++ b/src/mesa/drivers/dri/swrast/swrast.c @@ -147,6 +147,7 @@ swrastFillInModes(__DRIscreen *psp, uint8_t depth_bits_array[4]; uint8_t stencil_bits_array[4]; + uint8_t msaa_samples_array[1]; depth_bits_array[0] = 0; depth_bits_array[1] = 0; @@ -161,26 +162,38 @@ swrastFillInModes(__DRIscreen *psp, stencil_bits_array[2] = 0; stencil_bits_array[3] = (stencil_bits == 0) ? 8 : stencil_bits; + msaa_samples_array[0] = 0; + depth_buffer_factor = 4; back_buffer_factor = 2; - if (pixel_bits == 8) { + switch (pixel_bits) { + case 8: fb_format = GL_RGB; fb_type = GL_UNSIGNED_BYTE_2_3_3_REV; - } - else if (pixel_bits == 16) { + break; + case 16: fb_format = GL_RGB; fb_type = GL_UNSIGNED_SHORT_5_6_5; - } - else { + break; + case 24: + fb_format = GL_BGR; + fb_type = GL_UNSIGNED_INT_8_8_8_8_REV; + break; + case 32: fb_format = GL_BGRA; fb_type = GL_UNSIGNED_INT_8_8_8_8_REV; + break; + default: + fprintf(stderr, "[%s:%u] bad depth %d\n", __func__, __LINE__, + pixel_bits); + return NULL; } configs = driCreateConfigs(fb_format, fb_type, depth_bits_array, stencil_bits_array, depth_buffer_factor, back_buffer_modes, - back_buffer_factor); + back_buffer_factor, msaa_samples_array, 1); if (configs == NULL) { fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__); @@ -196,7 +209,7 @@ driCreateNewScreen(int scrn, const __DRIextension **extensions, { static const __DRIextension *emptyExtensionList[] = { NULL }; __DRIscreen *psp; - __DRIconfig **configs8, **configs16, **configs32; + __DRIconfig **configs8, **configs16, **configs24, **configs32; (void) data; @@ -213,11 +226,13 @@ driCreateNewScreen(int scrn, const __DRIextension **extensions, configs8 = swrastFillInModes(psp, 8, 8, 0, 1); configs16 = swrastFillInModes(psp, 16, 16, 0, 1); + configs24 = swrastFillInModes(psp, 24, 24, 8, 1); configs32 = swrastFillInModes(psp, 32, 24, 8, 1); - configs16 = (__DRIconfig **)driConcatConfigs(configs8, configs16); - - *driver_configs = driConcatConfigs(configs16, configs32); + configs16 = driConcatConfigs(configs8, configs16); + configs24 = driConcatConfigs(configs16, configs24); + *driver_configs = (const __DRIconfig **) + driConcatConfigs(configs24, configs32); driInitExtensions( NULL, card_extensions, GL_FALSE ); @@ -249,19 +264,24 @@ static GLuint choose_pixel_format(const GLvisual *v) { if (v->rgbMode) { - int bpp = v->rgbBits; + int depth = v->rgbBits; - if (bpp == 32 + if (depth == 32 && v->redMask == 0xff0000 && v->greenMask == 0x00ff00 && v->blueMask == 0x0000ff) return PF_A8R8G8B8; - else if (bpp == 16 + else if (depth == 24 + && v->redMask == 0xff0000 + && v->greenMask == 0x00ff00 + && v->blueMask == 0x0000ff) + return PF_X8R8G8B8; + else if (depth == 16 && v->redMask == 0xf800 && v->greenMask == 0x07e0 && v->blueMask == 0x001f) return PF_R5G6B5; - else if (bpp == 8 + else if (depth == 8 && v->redMask == 0x07 && v->greenMask == 0x38 && v->blueMask == 0xc0) @@ -290,7 +310,6 @@ swrast_alloc_front_storage(GLcontext *ctx, struct gl_renderbuffer *rb, GLenum internalFormat, GLuint width, GLuint height) { struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb); - int bpp; unsigned mask = PITCH_ALIGN_BITS - 1; TRACE; @@ -299,23 +318,8 @@ swrast_alloc_front_storage(GLcontext *ctx, struct gl_renderbuffer *rb, rb->Width = width; rb->Height = height; - switch (internalFormat) { - case GL_RGB: - bpp = rb->RedBits + rb->GreenBits + rb->BlueBits; - break; - case GL_RGBA: - bpp = rb->RedBits + rb->GreenBits + rb->BlueBits + rb->AlphaBits; - break; - case GL_COLOR_INDEX8_EXT: - bpp = rb->IndexBits; - break; - default: - _mesa_problem( NULL, "unexpected format in %s", __FUNCTION__ ); - return GL_FALSE; - } - /* always pad to PITCH_ALIGN_BITS */ - xrb->pitch = ((width * bpp + mask) & ~mask) / 8; + xrb->pitch = ((width * xrb->bpp + mask) & ~mask) / 8; return GL_TRUE; } @@ -371,6 +375,17 @@ swrast_new_renderbuffer(const GLvisual *visual, GLboolean front) xrb->Base.GreenBits = 8 * sizeof(GLubyte); xrb->Base.BlueBits = 8 * sizeof(GLubyte); xrb->Base.AlphaBits = 8 * sizeof(GLubyte); + xrb->bpp = 32; + break; + case PF_X8R8G8B8: + xrb->Base.InternalFormat = GL_RGB; + xrb->Base._BaseFormat = GL_RGB; + xrb->Base.DataType = GL_UNSIGNED_BYTE; + xrb->Base.RedBits = 8 * sizeof(GLubyte); + xrb->Base.GreenBits = 8 * sizeof(GLubyte); + xrb->Base.BlueBits = 8 * sizeof(GLubyte); + xrb->Base.AlphaBits = 0; + xrb->bpp = 32; break; case PF_R5G6B5: xrb->Base.InternalFormat = GL_RGB; @@ -380,6 +395,7 @@ swrast_new_renderbuffer(const GLvisual *visual, GLboolean front) xrb->Base.GreenBits = 6 * sizeof(GLubyte); xrb->Base.BlueBits = 5 * sizeof(GLubyte); xrb->Base.AlphaBits = 0; + xrb->bpp = 16; break; case PF_R3G3B2: xrb->Base.InternalFormat = GL_RGB; @@ -389,12 +405,14 @@ swrast_new_renderbuffer(const GLvisual *visual, GLboolean front) xrb->Base.GreenBits = 3 * sizeof(GLubyte); xrb->Base.BlueBits = 2 * sizeof(GLubyte); xrb->Base.AlphaBits = 0; + xrb->bpp = 8; break; case PF_CI8: xrb->Base.InternalFormat = GL_COLOR_INDEX8_EXT; xrb->Base._BaseFormat = GL_COLOR_INDEX; xrb->Base.DataType = GL_UNSIGNED_BYTE; xrb->Base.IndexBits = 8 * sizeof(GLubyte); + xrb->bpp = 8; break; default: return NULL; diff --git a/src/mesa/drivers/dri/swrast/swrast_priv.h b/src/mesa/drivers/dri/swrast/swrast_priv.h index a707ffc..1a5fb31 100644 --- a/src/mesa/drivers/dri/swrast/swrast_priv.h +++ b/src/mesa/drivers/dri/swrast/swrast_priv.h @@ -90,6 +90,8 @@ struct swrast_renderbuffer { /* renderbuffer pitch (in bytes) */ GLuint pitch; + /* bits per pixel of storage */ + GLuint bpp; }; static INLINE __DRIcontext * @@ -115,10 +117,10 @@ swrast_renderbuffer(struct gl_renderbuffer *rb) * Pixel formats we support */ #define PF_CI8 1 /**< Color Index mode */ -#define PF_A8R8G8B8 2 /**< 32-bit TrueColor: 8-A, 8-R, 8-G, 8-B bits */ -#define PF_R5G6B5 3 /**< 16-bit TrueColor: 5-R, 6-G, 5-B bits */ -#define PF_R3G3B2 4 /**< 8-bit TrueColor: 3-R, 3-G, 2-B bits */ - +#define PF_A8R8G8B8 2 /**< 32bpp TrueColor: 8-A, 8-R, 8-G, 8-B bits */ +#define PF_R5G6B5 3 /**< 16bpp TrueColor: 5-R, 6-G, 5-B bits */ +#define PF_R3G3B2 4 /**< 8bpp TrueColor: 3-R, 3-G, 2-B bits */ +#define PF_X8R8G8B8 5 /**< 32bpp TrueColor: 8-R, 8-G, 8-B bits */ /** * Renderbuffer pitch alignment (in bits). diff --git a/src/mesa/drivers/dri/swrast/swrast_span.c b/src/mesa/drivers/dri/swrast/swrast_span.c index 5e99036..2d3c25d 100644 --- a/src/mesa/drivers/dri/swrast/swrast_span.c +++ b/src/mesa/drivers/dri/swrast/swrast_span.c @@ -79,6 +79,24 @@ static const GLubyte kernel[16] = { DST[BCOMP] = SRC[0] +/* 32-bit BGRX */ +#define STORE_PIXEL_X8R8G8B8(DST, X, Y, VALUE) \ + DST[3] = 0xff; \ + DST[2] = VALUE[RCOMP]; \ + DST[1] = VALUE[GCOMP]; \ + DST[0] = VALUE[BCOMP] +#define STORE_PIXEL_RGB_X8R8G8B8(DST, X, Y, VALUE) \ + DST[3] = 0xff; \ + DST[2] = VALUE[RCOMP]; \ + DST[1] = VALUE[GCOMP]; \ + DST[0] = VALUE[BCOMP] +#define FETCH_PIXEL_X8R8G8B8(DST, SRC) \ + DST[ACOMP] = 0xff; \ + DST[RCOMP] = SRC[2]; \ + DST[GCOMP] = SRC[1]; \ + DST[BCOMP] = SRC[0] + + /* 16-bit BGR */ #define STORE_PIXEL_R5G6B5(DST, X, Y, VALUE) \ do { \ @@ -139,6 +157,24 @@ static const GLubyte kernel[16] = { #include "swrast/s_spantemp.h" +/* 32-bit BGRX */ +#define NAME(FUNC) FUNC##_X8R8G8B8 +#define RB_TYPE GLubyte +#define SPAN_VARS \ + struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb); +#define INIT_PIXEL_PTR(P, X, Y) \ + GLubyte *P = (GLubyte *)xrb->Base.Data + YFLIP(xrb, Y) * xrb->pitch + (X) * 4; +#define INC_PIXEL_PTR(P) P += 4 +#define STORE_PIXEL(DST, X, Y, VALUE) \ + STORE_PIXEL_X8R8G8B8(DST, X, Y, VALUE) +#define STORE_PIXEL_RGB(DST, X, Y, VALUE) \ + STORE_PIXEL_RGB_X8R8G8B8(DST, X, Y, VALUE) +#define FETCH_PIXEL(DST, SRC) \ + FETCH_PIXEL_X8R8G8B8(DST, SRC) + +#include "swrast/s_spantemp.h" + + /* 16-bit BGR */ #define NAME(FUNC) FUNC##_R5G6B5 #define RB_TYPE GLubyte @@ -210,6 +246,24 @@ static const GLubyte kernel[16] = { #include "swrast_spantemp.h" +/* 32-bit BGRX */ +#define NAME(FUNC) FUNC##_X8R8G8B8_front +#define RB_TYPE GLubyte +#define SPAN_VARS \ + struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb); +#define INIT_PIXEL_PTR(P, X, Y) \ + GLubyte *P = (GLubyte *)row; +#define INC_PIXEL_PTR(P) P += 4 +#define STORE_PIXEL(DST, X, Y, VALUE) \ + STORE_PIXEL_X8R8G8B8(DST, X, Y, VALUE) +#define STORE_PIXEL_RGB(DST, X, Y, VALUE) \ + STORE_PIXEL_RGB_X8R8G8B8(DST, X, Y, VALUE) +#define FETCH_PIXEL(DST, SRC) \ + FETCH_PIXEL_X8R8G8B8(DST, SRC) + +#include "swrast_spantemp.h" + + /* 16-bit BGR */ #define NAME(FUNC) FUNC##_R5G6B5_front #define RB_TYPE GLubyte @@ -279,6 +333,15 @@ swrast_set_span_funcs_back(struct swrast_renderbuffer *xrb, xrb->Base.PutValues = put_values_A8R8G8B8; xrb->Base.PutMonoValues = put_mono_values_A8R8G8B8; break; + case PF_X8R8G8B8: + xrb->Base.GetRow = get_row_X8R8G8B8; + xrb->Base.GetValues = get_values_X8R8G8B8; + xrb->Base.PutRow = put_row_X8R8G8B8; + xrb->Base.PutRowRGB = put_row_rgb_X8R8G8B8; + xrb->Base.PutMonoRow = put_mono_row_X8R8G8B8; + xrb->Base.PutValues = put_values_X8R8G8B8; + xrb->Base.PutMonoValues = put_mono_values_X8R8G8B8; + break; case PF_R5G6B5: xrb->Base.GetRow = get_row_R5G6B5; xrb->Base.GetValues = get_values_R5G6B5; @@ -334,6 +397,15 @@ swrast_set_span_funcs_front(struct swrast_renderbuffer *xrb, xrb->Base.PutValues = put_values_A8R8G8B8_front; xrb->Base.PutMonoValues = put_mono_values_A8R8G8B8_front; break; + case PF_X8R8G8B8: + xrb->Base.GetRow = get_row_X8R8G8B8_front; + xrb->Base.GetValues = get_values_X8R8G8B8_front; + xrb->Base.PutRow = put_row_X8R8G8B8_front; + xrb->Base.PutRowRGB = put_row_rgb_X8R8G8B8_front; + xrb->Base.PutMonoRow = put_mono_row_X8R8G8B8_front; + xrb->Base.PutValues = put_values_X8R8G8B8_front; + xrb->Base.PutMonoValues = put_mono_values_X8R8G8B8_front; + break; case PF_R5G6B5: xrb->Base.GetRow = get_row_R5G6B5_front; xrb->Base.GetValues = get_values_R5G6B5_front; diff --git a/src/mesa/drivers/dri/tdfx/tdfx_screen.c b/src/mesa/drivers/dri/tdfx/tdfx_screen.c index cd22b84..5f2f5cf 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_screen.c +++ b/src/mesa/drivers/dri/tdfx/tdfx_screen.c @@ -361,6 +361,7 @@ tdfxFillInModes(__DRIscreenPrivate *psp, static const GLenum db_modes[2] = { GLX_NONE, GLX_SWAP_UNDEFINED_OML }; uint8_t depth_bits_array[4]; uint8_t stencil_bits_array[4]; + uint8_t msaa_samples_array[1]; if(deep) { depth_bits_array[0] = 0; depth_bits_array[1] = 24; @@ -377,13 +378,17 @@ tdfxFillInModes(__DRIscreenPrivate *psp, stencil_bits_array[3] = 8; } - return driCreateConfigs( - deep ? GL_RGBA : GL_RGB, - deep ? GL_UNSIGNED_INT_8_8_8_8 : GL_UNSIGNED_SHORT_5_6_5, - depth_bits_array, - stencil_bits_array, - deep ? 2 : 4, - db_modes, 2); + msaa_samples_array[0] = 0; + + return (const __DRIconfig **) + driCreateConfigs(deep ? GL_RGBA : GL_RGB, + deep ? GL_UNSIGNED_INT_8_8_8_8 : + GL_UNSIGNED_SHORT_5_6_5, + depth_bits_array, + stencil_bits_array, + deep ? 2 : 4, + db_modes, 2, + msaa_samples_array, 1); } /** diff --git a/src/mesa/drivers/dri/unichrome/via_screen.c b/src/mesa/drivers/dri/unichrome/via_screen.c index 988f993..e9f5661 100644 --- a/src/mesa/drivers/dri/unichrome/via_screen.c +++ b/src/mesa/drivers/dri/unichrome/via_screen.c @@ -342,6 +342,7 @@ viaFillInModes( __DRIscreenPrivate *psp, */ static const uint8_t depth_bits_array[4] = { 0, 16, 24, 32 }; static const uint8_t stencil_bits_array[4] = { 0, 0, 8, 0 }; + uint8_t msaa_samples_array[1] = { 0 }; const unsigned depth_buffer_factor = 3; if ( pixel_bits == 16 ) { @@ -356,7 +357,8 @@ viaFillInModes( __DRIscreenPrivate *psp, configs = driCreateConfigs(fb_format, fb_type, depth_bits_array, stencil_bits_array, depth_buffer_factor, back_buffer_modes, - back_buffer_factor); + back_buffer_factor, + msaa_samples_array, 1); if (configs == NULL) { fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__); mesa-7.3-fixes-from-7.4-branch.patch: --- NEW FILE mesa-7.3-fixes-from-7.4-branch.patch --- diff --git a/Makefile b/Makefile index ebc5254..ee40b75 100644 --- a/Makefile +++ b/Makefile @@ -174,10 +174,10 @@ ultrix-gcc: # Rules for making release tarballs -DIRECTORY = Mesa-7.3 -LIB_NAME = MesaLib-7.3 -DEMO_NAME = MesaDemos-7.3 -GLUT_NAME = MesaGLUT-7.3 +DIRECTORY = Mesa-7.4 +LIB_NAME = MesaLib-7.4 +DEMO_NAME = MesaDemos-7.4 +GLUT_NAME = MesaGLUT-7.4 MAIN_FILES = \ $(DIRECTORY)/Makefile* \ diff --git a/configure.ac b/configure.ac index 33c1072..73caf00 100644 --- a/configure.ac +++ b/configure.ac @@ -46,10 +46,14 @@ esac MKDEP_OPTIONS=-fdepend dnl Ask gcc where it's keeping its secret headers if test "x$GCC" = xyes; then - GCC_INCLUDES=`$CC -print-file-name=include` - if test "x$GCC_INCLUDES" != x; then - MKDEP_OPTIONS="$MKDEP_OPTIONS -I$GCC_INCLUDES" - fi + for dir in include include-fixed; do + GCC_INCLUDES=`$CC -print-file-name=$dir` + if test "x$GCC_INCLUDES" != x && \ + test "$GCC_INCLUDES" != "$dir" && \ + test -d "$GCC_INCLUDES"; then + MKDEP_OPTIONS="$MKDEP_OPTIONS -I$GCC_INCLUDES" + fi + done fi AC_SUBST([MKDEP_OPTIONS]) @@ -362,7 +366,7 @@ default_driver="xlib" case "$host_os" in linux*) case "$host_cpu" in - i*86|x86_64|powerpc*) default_driver="dri";; + i*86|x86_64|powerpc*|sparc*) default_driver="dri";; esac ;; *freebsd* | dragonfly*) diff --git a/docs/relnotes-7.3.html b/docs/relnotes-7.3.html index c083fcb..df89884 100644 --- a/docs/relnotes-7.3.html +++ b/docs/relnotes-7.3.html @@ -22,13 +22,21 @@ Some drivers don't support all the features required in OpenGL 2.1.

See the Compiling/Installing page for prerequisites -for DRI ardware acceleration. +for DRI hardware acceleration.

MD5 checksums

-tbd
+8ed03191432b22d118d88d6db497f304  MesaLib-7.3.tar.gz
+781e7811a6ed5c97b2b8defefc8ffbc9  MesaLib-7.3.tar.bz2
+3ccba9a1734ed6d4b3389e1535d90fbf  MesaLib-7.3.zip
+d312e974b31043b13b61bac5fbf00b87  MesaDemos-7.3.tar.gz
+3f0741394069bdf2329565a387396cda  MesaDemos-7.3.tar.bz2
+4d0887fd4c66a824295cdd619f6d34cb  MesaDemos-7.3.zip
+2d7661b66022bcb8878728f3d5bd33ab  MesaGLUT-7.3.tar.gz
+abe8036a724c1a483bdad6b5a55ddc1a  MesaGLUT-7.3.tar.bz2
+5f247819b47e2a7c62d07a6afe5262fb  MesaGLUT-7.3.zip
diff --git a/docs/relnotes-7.4.html b/docs/relnotes-7.4.html new file mode 100644 index 0000000..8ad23e5 --- /dev/null +++ b/docs/relnotes-7.4.html @@ -0,0 +1,79 @@ + + +Mesa Release Notes + + + + + + + +

Mesa 7.4 Release Notes / date TBD

+ +

+Mesa 7.4 is a stable development release fixing bugs since the 7.3 release. +

+

+Mesa 7.4 implements the OpenGL 2.1 API, but the version reported by +glGetString(GL_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 2.1. +

+

+See the Compiling/Installing page for prerequisites +for DRI ardware acceleration. +

+ + +

MD5 checksums

+
+tbd
+
+ + +

New features

+
    +
  • Added MESA_GLX_FORCE_DIRECT env var for Xlib/software driver +
  • GLSL version 1.20 is returnd by the GL_SHADING_LANGUAGE_VERSION query +
+ + +

Bug fixes

+
    +
  • glGetActiveUniform() returned wrong size for some array types +
  • Fixed some error checking in glUniform() +
  • Fixed a potential glTexImage('proxy target') segfault +
  • Fixed bad reference counting for 1D/2D texture arrays +
  • Fixed VBO + glPush/PopClientAttrib() bug #19835 +
  • Assorted i965 driver bug fixes +
  • Fixed a Windows compilation failure in s_triangle.c +
  • Fixed a GLSL array indexing bug +
  • Fixes for building on Haiku +
+ +

Changes

+
    +
+ + + +

Driver Status

+ +
+Driver			Status
+----------------------	----------------------
+DRI drivers		varies with the driver
+XMesa/GLX (on Xlib)	implements OpenGL 2.1
+OSMesa (off-screen)	implements OpenGL 2.1
+Windows/Win32		implements OpenGL 2.1
+Glide (3dfx Voodoo1/2)	implements OpenGL 1.3
+SVGA			unsupported
+Wind River UGL		unsupported
+DJGPP			unsupported
+GGI			unsupported
+BeOS			unsupported
+Allegro			unsupported
+D3D			unsupported
+
+ + + diff --git a/docs/relnotes.html b/docs/relnotes.html index 020e485..61c6a20 100644 --- a/docs/relnotes.html +++ b/docs/relnotes.html @@ -20,6 +20,7 @@ The release notes summarize what's new or changed in each Mesa release.

    +
  • 7.4 release notes
  • 7.3 release notes
  • 7.2 release notes
  • 7.1 release notes diff --git a/docs/xlibdriver.html b/docs/xlibdriver.html index d95f4d5..029e2b1 100644 --- a/docs/xlibdriver.html +++ b/docs/xlibdriver.html @@ -169,6 +169,20 @@ the Gamma FAQ

    +

    Direct Rendering Flag

    +

    +Some applications won't run with indirect rendering contexts (which is +what the Xlib driver supports). +To force the glXIsDirect() query to return True, set the MESA_GLX_FORCE_DIRECT +environment variable. +For example: +

    +
    +	$ export MESA_GLX_FORCE_DIRECT=1
+
    + + +

    Overlay Planes

    [...2126 lines suppressed...] texdx[1], texdy[1], /* dt/dx, dt/dy */ @@ -85,14 +93,20 @@ fetch_texel_deriv( GLcontext *ctx, const GLfloat texcoord[4], 1.0F / texcoord[3]) + lodBias; lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod); - } - swrast->TextureSample[unit](ctx, texObj, 1, (const GLfloat (*)[4]) texcoord, - &lambda, &rgba); - color[0] = CHAN_TO_FLOAT(rgba[0]); - color[1] = CHAN_TO_FLOAT(rgba[1]); - color[2] = CHAN_TO_FLOAT(rgba[2]); - color[3] = CHAN_TO_FLOAT(rgba[3]); + /* XXX use a float-valued TextureSample routine here!!! */ + swrast->TextureSample[unit](ctx, texObj, 1, + (const GLfloat (*)[4]) texcoord, + &lambda, &rgba); + color[0] = CHAN_TO_FLOAT(rgba[0]); + color[1] = CHAN_TO_FLOAT(rgba[1]); + color[2] = CHAN_TO_FLOAT(rgba[2]); + color[3] = CHAN_TO_FLOAT(rgba[3]); + } + else { + color[0] = color[1] = color[2] = 0.0F; + color[3] = 1.0F; + } } diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index a2e8433..a501f42 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -265,9 +265,6 @@ affine_span(GLcontext *ctx, SWspan *span, GLchan sample[4]; /* the filtered texture sample */ const GLuint texEnableSave = ctx->Texture._EnabledUnits; - /* Disable tex units so they're not re-applied in swrast_write_rgba_span */ - ctx->Texture._EnabledUnits = 0x0; - /* Instead of defining a function for each mode, a test is done * between the outer and inner loops. This is to reduce code size * and complexity. Observe that an optimizing compiler kills @@ -396,6 +393,9 @@ affine_span(GLcontext *ctx, SWspan *span, GLuint i; GLchan *dest = span->array->rgba[0]; + /* Disable tex units so they're not re-applied in swrast_write_rgba_span */ + ctx->Texture._EnabledUnits = 0x0; + span->intTex[0] -= FIXED_HALF; span->intTex[1] -= FIXED_HALF; switch (info->filter) { diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c index 5e2a582..19ec556 100644 --- a/src/mesa/tnl/t_context.c +++ b/src/mesa/tnl/t_context.c @@ -109,24 +109,28 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state ) tnl->pipeline.new_state |= new_state; - /* Calculate tnl->render_inputs: + /* Calculate tnl->render_inputs. This bitmask indicates which vertex + * attributes need to be emitted to the rasterizer. */ if (ctx->Visual.rgbMode) { GLuint i; RENDERINPUTS_ZERO( tnl->render_inputs_bitset ); RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_POS ); + if (!fp || (fp->Base.InputsRead & FRAG_BIT_COL0)) { RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_COLOR0 ); } + + if (NEED_SECONDARY_COLOR(ctx)) + RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_COLOR1 ); + for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) { - if (ctx->Texture._EnabledCoordUnits & (1 << i)) { + if (ctx->Texture._EnabledCoordUnits & (1 << i) || + (fp && fp->Base.InputsRead & FRAG_BIT_TEX(i))) { RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_TEX(i) ); } } - - if (NEED_SECONDARY_COLOR(ctx)) - RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_COLOR1 ); } else { RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_POS ); diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index d48f523..f6daa25 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -148,11 +148,14 @@ static void vbo_exec_copy_to_current( struct vbo_exec_context *exec ) /* Note: the exec->vtx.current[i] pointers point into the * ctx->Current.Attrib and ctx->Light.Material.Attrib arrays. */ + if (exec->vtx.attrptr[i]) { + COPY_CLEAN_4V(current, exec->vtx.attrsz[i], exec->vtx.attrptr[i]); - + } + /* Given that we explicitly state size here, there is no need * for the COPY_CLEAN above, could just copy 16 bytes and be * done. The only problem is when Mesa accesses ctx->Current diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c index 92356ba..ad8b6e8 100644 --- a/src/mesa/vbo/vbo_exec_draw.c +++ b/src/mesa/vbo/vbo_exec_draw.c @@ -175,7 +175,20 @@ static void vbo_exec_bind_arrays( GLcontext *ctx ) exec->vtx.inputs[attr + 16] = &vbo->generic_currval[attr]; } map = vbo->map_vp_arb; + + /* check if VERT_ATTRIB_POS is not read but VERT_BIT_GENERIC0 is read. + * In that case we effectively need to route the data from + * glVertexAttrib(0, val) calls to feed into the GENERIC0 input. + */ + if ((ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_POS) == 0 && + (ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_GENERIC0)) { + exec->vtx.inputs[16] = exec->vtx.inputs[0]; + exec->vtx.attrsz[16] = exec->vtx.attrsz[0]; + exec->vtx.attrsz[0] = 0; + } break; + default: + assert(0); } /* Make all active attributes (including edgeflag) available as diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c index ed82f09..ed40b5c 100644 --- a/src/mesa/vbo/vbo_save_draw.c +++ b/src/mesa/vbo/vbo_save_draw.c @@ -110,6 +110,9 @@ static void vbo_bind_vertex_list( GLcontext *ctx, GLuint data = node->buffer_offset; const GLuint *map; GLuint attr; + GLubyte node_attrsz[VBO_ATTRIB_MAX]; /* copy of node->attrsz[] */ + + memcpy(node_attrsz, node->attrsz, sizeof(node->attrsz)); /* Install the default (ie Current) attributes first, then overlay * all active ones. @@ -135,13 +138,26 @@ static void vbo_bind_vertex_list( GLcontext *ctx, save->inputs[attr + 16] = &vbo->generic_currval[attr]; } map = vbo->map_vp_arb; + + /* check if VERT_ATTRIB_POS is not read but VERT_BIT_GENERIC0 is read. + * In that case we effectively need to route the data from + * glVertexAttrib(0, val) calls to feed into the GENERIC0 input. + */ + if ((ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_POS) == 0 && + (ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_GENERIC0)) { + save->inputs[16] = save->inputs[0]; + node_attrsz[16] = node_attrsz[0]; + node_attrsz[0] = 0; + } break; + default: + assert(0); } for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) { GLuint src = map[attr]; - if (node->attrsz[src]) { + if (node_attrsz[src]) { /* override the default array set above */ save->inputs[attr] = &arrays[attr]; diff --git a/src/mesa/x86/gen_matypes.c b/src/mesa/x86/gen_matypes.c index afb4b11..8c690b4 100644 --- a/src/mesa/x86/gen_matypes.c +++ b/src/mesa/x86/gen_matypes.c @@ -61,7 +61,7 @@ do { \ printf( "\n" ); \ } while (0) -#if defined(__BEOS__) || defined(_LP64) +#if defined(__BEOS__) || defined(__HAIKU__) || defined(_LP64) #define OFFSET( s, t, m ) \ printf( "#define %s\t%ld\n", s, offsetof( t, m ) ); #else @@ -69,7 +69,7 @@ do { \ printf( "#define %s\t%d\n", s, offsetof( t, m ) ); #endif -#if defined(__BEOS__) || defined(_LP64) +#if defined(__BEOS__) || defined(__HAIKU__) || defined(_LP64) #define SIZEOF( s, t ) \ printf( "#define %s\t%ld\n", s, sizeof(t) ); #else Index: mesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v retrieving revision 1.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- mesa.spec 27 Feb 2009 09:41:56 -0000 1.225 +++ mesa.spec 4 Mar 2009 07:00:36 -0000 1.226 @@ -20,7 +20,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 7.3 -Release: 8%{?dist} +Release: 9%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -36,11 +36,13 @@ Source5: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2 -Patch0: mesa-7.1-osmesa-version.patch +Patch0: mesa-7.3-fixes-from-7.4-branch.patch +Patch1: mesa-7.1-osmesa-version.patch Patch2: mesa-7.1-nukeglthread-debug.patch Patch3: mesa-no-mach64.patch -Patch5: radeon-rewrite.patch +Patch5: mesa-7.3-dri-configs-fixes.patch +Patch6: radeon-rewrite.patch Patch7: mesa-7.1-link-shared.patch Patch9: intel-revert-vbl.patch @@ -167,10 +169,12 @@ %prep %setup -q -n Mesa-%{version}%{?snapshot} -b0 -b1 -b2 -b5 #%setup -q -n mesa-%{gitdate} -b2 -b5 -%patch0 -p1 -b .osmesa +%patch0 -p1 -b .mesa74 +%patch1 -p1 -b .osmesa %patch2 -p1 -b .intel-glthread %patch3 -p0 -b .no-mach64 -%patch5 -p1 -b .radeon-rewrite +%patch5 -p1 -b .driconfigs +%patch6 -p1 -b .radeon-rewrite %patch7 -p1 -b .dricore %patch9 -p1 -b .intel-vbl %patch12 -p1 -b .intel-nowarn @@ -423,6 +427,9 @@ %{_libdir}/mesa-demos-data %changelog +* Wed Mar 04 2009 Dave Airlie 7.3-9 +- try again: pull in 7.4 fixes, dri configs changes, new radeon-rewrite + * Fri Feb 27 2009 Dave Airlie 7.3-8 - reset whole place back to 7.3-6 - bad plan radeon-rewrite.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 radeon-rewrite.patch Index: radeon-rewrite.patch =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/radeon-rewrite.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- radeon-rewrite.patch 27 Feb 2009 09:41:56 -0000 1.3 +++ radeon-rewrite.patch 4 Mar 2009 07:00:36 -0000 1.4 @@ -1,18848 +1,47 @@ -diff --git a/configs/autoconf.in b/configs/autoconf.in -index b352974..d786029 100644 ---- a/configs/autoconf.in -+++ b/configs/autoconf.in -@@ -20,6 +20,8 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ \ - $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) - LDFLAGS = @LDFLAGS@ - EXTRA_LIB_PATH = @EXTRA_LIB_PATH@ -+RADEON_CFLAGS = @RADEON_CFLAGS@ -+RADEON_LDFLAGS = @RADEON_LDFLAGS@ - - # Assembler - MESA_ASM_SOURCES = @MESA_ASM_SOURCES@ -diff --git a/configure.ac b/configure.ac -index a9a8d5a..ea2992d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -573,6 +575,13 @@ dri) - GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED" - DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED" - -+ PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon], HAVE_LIBDRM_RADEON=yes, HAVE_LIBDRM_RADEON=no) -+ -+ if test "$HAVE_LIBDRM_RADEON" = yes; then -+ RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS" -+ RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS -+ fi -+ - # find the DRI deps for libGL - if test "$x11_pkgconfig" = yes; then - # add xcb modules if necessary -@@ -578,6 +585,8 @@ AC_SUBST([GL_PC_REQ_PRIV]) - AC_SUBST([GL_PC_LIB_PRIV]) - AC_SUBST([GL_PC_CFLAGS]) - AC_SUBST([DRI_PC_REQ_PRIV]) -+AC_SUBST([RADEON_CFLAGS]) -+AC_SUBST([RADEON_LDFLAGS]) - - dnl - dnl More X11 setup -diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile -index e9144ac..e593ed9 100644 ---- a/src/mesa/drivers/dri/r200/Makefile -+++ b/src/mesa/drivers/dri/r200/Makefile -@@ -3,6 +3,8 @@ - TOP = ../../../../.. - include $(TOP)/configs/current - -+CFLAGS += $(RADEON_CFLAGS) -+ - LIBNAME = r200_dri.so - - MINIGLX_SOURCES = server/radeon_dri.c -@@ -11,25 +13,35 @@ ifeq ($(USING_EGL), 1) - EGL_SOURCES = server/radeon_egl.c - endif - -+RADEON_COMMON_SOURCES = \ -+ radeon_texture.c \ -+ radeon_common_context.c \ -+ radeon_common.c \ -+ radeon_dma.c \ -+ radeon_lock.c \ -+ radeon_bo_legacy.c \ -+ radeon_cs_legacy.c \ -+ radeon_mipmap_tree.c \ -+ radeon_span.c -+ -+ - DRIVER_SOURCES = r200_context.c \ - r200_ioctl.c \ -- r200_lock.c \ - r200_state.c \ - r200_state_init.c \ - r200_cmdbuf.c \ - r200_pixel.c \ - r200_tex.c \ -- r200_texmem.c \ - r200_texstate.c \ - r200_tcl.c \ - r200_swtcl.c \ -- r200_span.c \ - r200_maos.c \ - r200_sanity.c \ - r200_fragshader.c \ - r200_vertprog.c \ - radeon_screen.c \ -- $(EGL_SOURCES) -+ $(EGL_SOURCES) \ -+ $(RADEON_COMMON_SOURCES) - - C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES) - -@@ -48,7 +60,29 @@ SYMLINKS = \ - COMMON_SYMLINKS = \ - radeon_chipset.h \ - radeon_screen.c \ -- radeon_screen.h -+ radeon_screen.h \ -+ radeon_bo_legacy.c \ -+ radeon_cs_legacy.c \ -+ radeon_bo_legacy.h \ -+ radeon_cs_legacy.h \ -+ radeon_bocs_wrapper.h \ -+ radeon_span.h \ -+ radeon_span.c \ -+ radeon_lock.c \ -+ radeon_lock.h \ -+ radeon_common.c \ -+ radeon_common_context.c \ -+ radeon_common_context.h \ -+ radeon_common.h \ -+ radeon_cmdbuf.h \ -+ radeon_mipmap_tree.c \ -+ radeon_mipmap_tree.h \ -+ radeon_texture.c \ -+ radeon_texture.h \ -+ radeon_dma.c \ -+ radeon_dma.h -+ -+DRI_LIB_DEPS += $(RADEON_LDFLAGS) - - ##### TARGETS ##### - -diff --git a/src/mesa/drivers/dri/r200/r200_cmdbuf.c b/src/mesa/drivers/dri/r200/r200_cmdbuf.c -index e163377..ae31bcb 100644 ---- a/src/mesa/drivers/dri/r200/r200_cmdbuf.c -+++ b/src/mesa/drivers/dri/r200/r200_cmdbuf.c -@@ -38,6 +38,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #include "swrast/swrast.h" - #include "main/simple_list.h" - -+#include "radeon_common.h" - #include "r200_context.h" - #include "r200_state.h" - #include "r200_ioctl.h" -@@ -45,18 +46,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #include "r200_sanity.h" - #include "radeon_reg.h" - --static void print_state_atom( struct r200_state_atom *state ) --{ -- int i; -- -- fprintf(stderr, "emit %s/%d\n", state->name, state->cmd_size); -- -- if (0 & R200_DEBUG & DEBUG_VERBOSE) -- for (i = 0 ; i < state->cmd_size ; i++) -- fprintf(stderr, "\t%s[%d]: %x\n", state->name, i, state->cmd[i]); -- --} -- - /* The state atoms will be emitted in the order they appear in the atom list, - * so this step is important. - */ -@@ -64,141 +53,56 @@ void r200SetUpAtomList( r200ContextPtr rmesa ) - { - int i, mtu; - -- mtu = rmesa->glCtx->Const.MaxTextureUnits; -- -- make_empty_list(&rmesa->hw.atomlist); -- rmesa->hw.atomlist.name = "atom-list"; -- -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.ctx ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.set ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.lin ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.msk ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.vpt ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.vtx ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.vap ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.vte ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.msc ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.cst ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.zbs ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.tcl ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.msl ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.tcg ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.grd ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.fog ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.tam ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.tf ); -- insert_at_tail( &rmesa->hw.atomlist, &rmesa->hw.atf ); -+ mtu = rmesa->radeon.glCtx->Const.MaxTextureUnits; -+ -+ make_empty_list(&rmesa->radeon.hw.atomlist); -+ rmesa->radeon.hw.atomlist.name = "atom-list"; -+ -+ insert_at_tail( &rmesa->radeon.hw.atomlist, &rmesa->hw.ctx ); -+ insert_at_tail( &rmesa->radeon.hw.atomlist, &rmesa->hw.set ); -+ insert_at_tail( &rmesa->radeon.hw.atomlist, &rmesa->hw.lin ); [...28039 lines suppressed...] -- fprintf(stderr, "%s: upload failed\n", __FUNCTION__); -- return GL_FALSE; -- } -+ if (t->base.Target == GL_TEXTURE_RECTANGLE_NV) { -+ t->pp_txformat |= RADEON_TXFORMAT_NON_POWER2; - } - - return GL_TRUE; - } - -- --static GLboolean update_tex_common( GLcontext *ctx, int unit ) -+static GLboolean radeon_validate_texture(GLcontext *ctx, struct gl_texture_object *texObj, int unit) - { -- radeonContextPtr rmesa = RADEON_CONTEXT(ctx); -- struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit]; -- struct gl_texture_object *tObj = texUnit->_Current; -- radeonTexObjPtr t = (radeonTexObjPtr) tObj->DriverData; -- GLenum format; -+ r100ContextPtr rmesa = R100_CONTEXT(ctx); -+ radeonTexObj *t = radeon_tex_obj(texObj); -+ int ret; - -- /* Fallback if there's a texture border */ -- if ( tObj->Image[0][tObj->BaseLevel]->Border > 0 ) { -- fprintf(stderr, "%s: border\n", __FUNCTION__); -+ if (!radeon_validate_texture_miptree(ctx, texObj)) - return GL_FALSE; -- } -+ -+ ret = setup_hardware_state(rmesa, t, unit); -+ if (ret == GL_FALSE) -+ return GL_FALSE; -+ - /* yuv conversion only works in first unit */ - if (unit != 0 && (t->pp_txfilter & RADEON_YUV_TO_RGB)) - return GL_FALSE; - -- /* Update state if this is a different texture object to last -- * time. -- */ -- if ( rmesa->state.texture.unit[unit].texobj != t ) { -- if ( rmesa->state.texture.unit[unit].texobj != NULL ) { -- /* The old texture is no longer bound to this texture unit. -- * Mark it as such. -- */ -- -- rmesa->state.texture.unit[unit].texobj->base.bound &= -- ~(1UL << unit); -- } -+ RADEON_STATECHANGE( rmesa, ctx ); -+ rmesa->hw.ctx.cmd[CTX_PP_CNTL] |= -+ (RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE) << unit; - -- rmesa->state.texture.unit[unit].texobj = t; -- t->base.bound |= (1UL << unit); -- t->dirty_state |= 1<hw.tcl.cmd[TCL_OUTPUT_VTXFMT] |= RADEON_ST_BIT(unit); - -+ rmesa->recheck_texgen[unit] = GL_TRUE; - -- /* Newly enabled? -- */ -- if ( !(rmesa->hw.ctx.cmd[CTX_PP_CNTL] & (RADEON_TEX_0_ENABLE<hw.ctx.cmd[CTX_PP_CNTL] |= -- (RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE) << unit; -- -- RADEON_STATECHANGE( rmesa, tcl ); -- -- rmesa->hw.tcl.cmd[TCL_OUTPUT_VTXFMT] |= RADEON_ST_BIT(unit); -- -- rmesa->recheck_texgen[unit] = GL_TRUE; -- } -- -- if (t->dirty_state & (1<NewGLState |= _NEW_TEXTURE_MATRIX; -- } -+ import_tex_obj_state( rmesa, unit, t ); - - if (rmesa->recheck_texgen[unit]) { - GLboolean fallback = !radeon_validate_texgen( ctx, unit ); - TCL_FALLBACK( ctx, (RADEON_TCL_FALLBACK_TEXGEN_0<recheck_texgen[unit] = 0; -- rmesa->NewGLState |= _NEW_TEXTURE_MATRIX; -+ rmesa->radeon.NewGLState |= _NEW_TEXTURE_MATRIX; - } - -- format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat; -- if ( rmesa->state.texture.unit[unit].format != format || -- rmesa->state.texture.unit[unit].envMode != texUnit->EnvMode ) { -- rmesa->state.texture.unit[unit].format = format; -- rmesa->state.texture.unit[unit].envMode = texUnit->EnvMode; -- if ( ! radeonUpdateTextureEnv( ctx, unit ) ) { -- return GL_FALSE; -- } -+ if ( ! radeonUpdateTextureEnv( ctx, unit ) ) { -+ return GL_FALSE; - } -- - FALLBACK( rmesa, RADEON_FALLBACK_BORDER_MODE, t->border_fallback ); -+ -+ t->validated = GL_TRUE; - return !t->border_fallback; - } - -- -- - static GLboolean radeonUpdateTextureUnit( GLcontext *ctx, int unit ) - { -+ r100ContextPtr rmesa = R100_CONTEXT(ctx); - struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit]; - -- if ( texUnit->_ReallyEnabled & (TEXTURE_RECT_BIT) ) { -- return (enable_tex_rect( ctx, unit ) && -- update_tex_common( ctx, unit )); -- } -- else if ( texUnit->_ReallyEnabled & (TEXTURE_1D_BIT | TEXTURE_2D_BIT) ) { -- return (enable_tex_2d( ctx, unit ) && -- update_tex_common( ctx, unit )); -- } -- else if ( texUnit->_ReallyEnabled & (TEXTURE_CUBE_BIT) ) { -- return (enable_tex_cube( ctx, unit ) && -- update_tex_common( ctx, unit )); -+ -+ if (ctx->Texture.Unit[unit]._ReallyEnabled & TEXTURE_3D_BIT) { -+ return GL_FALSE; - } -- else if ( texUnit->_ReallyEnabled ) { -- return GL_FALSE; -+ -+ if (!ctx->Texture.Unit[unit]._ReallyEnabled) { -+ /* disable the unit */ -+ disable_tex_obj_state(rmesa, unit); -+ return GL_TRUE; - } -- else { -- disable_tex( ctx, unit ); -- return GL_TRUE; -+ -+ if (!radeon_validate_texture(ctx, ctx->Texture.Unit[unit]._Current, unit)) { -+ _mesa_warning(ctx, -+ "failed to validate texture for unit %d.\n", -+ unit); -+ rmesa->state.texture.unit[unit].texobj = NULL; -+ return GL_FALSE; - } -+ rmesa->state.texture.unit[unit].texobj = radeon_tex_obj(ctx->Texture.Unit[unit]._Current); -+ return GL_TRUE; - } - - void radeonUpdateTextureState( GLcontext *ctx ) - { -- radeonContextPtr rmesa = RADEON_CONTEXT(ctx); -+ r100ContextPtr rmesa = R100_CONTEXT(ctx); - GLboolean ok; - -+ /* set the ctx all textures off */ -+ RADEON_STATECHANGE( rmesa, ctx ); -+ rmesa->hw.ctx.cmd[CTX_PP_CNTL] &= ~((RADEON_TEX_ENABLE_MASK) | (RADEON_TEX_BLEND_ENABLE_MASK)); -+ - ok = (radeonUpdateTextureUnit( ctx, 0 ) && - radeonUpdateTextureUnit( ctx, 1 ) && - radeonUpdateTextureUnit( ctx, 2 )); - - FALLBACK( rmesa, RADEON_FALLBACK_TEXTURE, !ok ); - -- if (rmesa->TclFallback) -+ if (rmesa->radeon.TclFallback) - radeonChooseVertexState( ctx ); - } diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c new file mode 100644 index 0000000..63680b4 @@ -34369,17 +6081,6 @@ + struct gl_texture_image *texImage); + +#endif -diff --git a/src/mesa/drivers/dri/radeon/server/radeon_reg.h b/src/mesa/drivers/dri/radeon/server/radeon_reg.h -index 596a8aa..0df634b 100644 ---- a/src/mesa/drivers/dri/radeon/server/radeon_reg.h -+++ b/src/mesa/drivers/dri/radeon/server/radeon_reg.h -@@ -2031,6 +2031,9 @@ - #define RADEON_CP_PACKET3_3D_DRAW_INDX 0xC0002A00 - #define RADEON_CP_PACKET3_LOAD_PALETTE 0xC0002C00 - #define RADEON_CP_PACKET3_3D_LOAD_VBPNTR 0xC0002F00 -+#define R200_CP_CMD_3D_DRAW_VBUF_2 0xC0003400 -+#define R200_CP_CMD_3D_DRAW_IMMD_2 0xC0003500 -+#define R200_CP_CMD_3D_DRAW_INDX_2 0xC0003600 - #define RADEON_CP_PACKET3_CNTL_PAINT 0xC0009100 - #define RADEON_CP_PACKET3_CNTL_BITBLT 0xC0009200 - #define RADEON_CP_PACKET3_CNTL_SMALLTEXT 0xC0009300 +-- +1.6.0.3 + From pgordon at fedoraproject.org Wed Mar 4 07:40:02 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Wed, 4 Mar 2009 07:40:02 +0000 (UTC) Subject: rpms/empathy/devel .cvsignore, 1.28, 1.29 empathy.spec, 1.49, 1.50 sources, 1.28, 1.29 Message-ID: <20090304074002.635EF70116@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/empathy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15203 Modified Files: .cvsignore empathy.spec sources Log Message: Update to 2.25.92; bump minimum telepathy-glib required version accordingly. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 16 Feb 2009 23:47:02 -0000 1.28 +++ .cvsignore 4 Mar 2009 07:39:29 -0000 1.29 @@ -1 +1 @@ -empathy-2.25.91.tar.bz2 +empathy-2.25.92.tar.bz2 Index: empathy.spec =================================================================== RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- empathy.spec 24 Feb 2009 14:59:00 -0000 1.49 +++ empathy.spec 4 Mar 2009 07:39:29 -0000 1.50 @@ -5,12 +5,12 @@ %global gtk2_min_version 2.14 %global glib2_min_version 2.16.0 %global tp_mc_min_version 4.61 -%global tp_glib_min_version 0.7.19 +%global tp_glib_min_version 0.7.23 %global enchant_version 1.2.0 Name: empathy -Version: 2.25.91 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Summary: Instant Messaging Client for GNOME Group: Applications/Communications @@ -228,6 +228,10 @@ %{python_sitearch}/empathy*.so %changelog +* Tue Mar 03 2009 Peter Gordon - 2.25.92-1 +- Update to new upstream release (2.25.92). +- Bump minimum required telepathy-glib version. + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 16 Feb 2009 23:47:02 -0000 1.28 +++ sources 4 Mar 2009 07:39:29 -0000 1.29 @@ -1 +1 @@ -77b1cfd65a28c819e779742c20e47848 empathy-2.25.91.tar.bz2 +37814b4e217730ec79131d5ce7cbe642 empathy-2.25.92.tar.bz2 From pbrobinson at fedoraproject.org Wed Mar 4 07:45:23 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Wed, 4 Mar 2009 07:45:23 +0000 (UTC) Subject: rpms/ekiga/devel ekiga.spec,1.75,1.76 Message-ID: <20090304074523.AD20170116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/ekiga/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15903 Modified Files: ekiga.spec Log Message: - Remove autoconf bits Index: ekiga.spec =================================================================== RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- ekiga.spec 3 Mar 2009 23:40:31 -0000 1.75 +++ ekiga.spec 4 Mar 2009 07:44:52 -0000 1.76 @@ -1,7 +1,7 @@ Summary: A Gnome based SIP/H323 teleconferencing application Name: ekiga Version: 3.1.2 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.ekiga.org/ Source0: ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2 License: GPLv2+ @@ -50,8 +50,6 @@ %setup -q %build -autoreconf -libtoolize CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC" %configure --disable-scrollkeeper make %{?_smp_mflags} @@ -141,6 +139,9 @@ %{_sysconfdir}/gconf/schemas/ekiga.schemas %changelog +* Mon Mar 3 2009 Peter Robinson - 3.1.2-3 +- Remove autoconf bits + * Mon Mar 3 2009 Peter Robinson - 3.1.2-2 - Disable xcap for the moment so ekiga builds From denis at fedoraproject.org Wed Mar 4 08:18:07 2009 From: denis at fedoraproject.org (Denis Leroy) Date: Wed, 4 Mar 2009 08:18:07 +0000 (UTC) Subject: rpms/libgda/devel .cvsignore, 1.7, 1.8 libgda.spec, 1.45, 1.46 sources, 1.7, 1.8 Message-ID: <20090304081807.ED29670116@cvs1.fedora.phx.redhat.com> Author: denis Update of /cvs/pkgs/rpms/libgda/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19391 Modified Files: .cvsignore libgda.spec sources Log Message: Update to upstream 3.99.12 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgda/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 14 Feb 2009 09:19:23 -0000 1.7 +++ .cvsignore 4 Mar 2009 08:17:35 -0000 1.8 @@ -1 +1 @@ -libgda-3.99.11.tar.bz2 +libgda-3.99.12.tar.bz2 Index: libgda.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgda/devel/libgda.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- libgda.spec 25 Feb 2009 15:01:20 -0000 1.45 +++ libgda.spec 4 Mar 2009 08:17:35 -0000 1.46 @@ -40,8 +40,8 @@ Name: libgda Epoch: 1 -Version: 3.99.11 -Release: 2%{?dist} +Version: 3.99.12 +Release: 1%{?dist} Summary: Library for writing gnome database programs Group: System Environment/Libraries License: LGPLv2+ @@ -51,10 +51,11 @@ Patch3: libgda-3.99.8-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig >= 0.8 -BuildRequires: glib2-devel >= 2.0.0 +BuildRequires: glib2-devel >= 2.16 BuildRequires: libxslt-devel >= 1.0.9 -BuildRequires: sqlite-devel >= 3.4.0 -BuildRequires: libxml2-devel readline-devel db4-devel gamin-devel +BuildRequires: sqlite-devel >= 3.6.0 +BuildRequires: gamin-devel >= 0.1.8 +BuildRequires: libxml2-devel readline-devel db4-devel BuildRequires: gtk-doc scrollkeeper intltool gettext flex bison perl(XML::Parser) # note we do not provide these, they no longer exist Obsoletes: %{name}-sharp < %{epoch}:%{version}-%{release} @@ -572,6 +573,9 @@ %changelog +* Wed Mar 4 2009 Denis Leroy - 1:3.99.12-1 +- Update to upstream 3.99.12 + * Wed Feb 25 2009 Fedora Release Engineering - 1:3.99.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgda/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Feb 2009 09:19:23 -0000 1.7 +++ sources 4 Mar 2009 08:17:35 -0000 1.8 @@ -1 +1 @@ -065ffe3c6d267db09f652fe02f91b935 libgda-3.99.11.tar.bz2 +a3c7df764149d4f9c1222338173af38c libgda-3.99.12.tar.bz2 From morgan at fedoraproject.org Wed Mar 4 08:20:35 2009 From: morgan at fedoraproject.org (Morgan Collett) Date: Wed, 4 Mar 2009 08:20:35 +0000 (UTC) Subject: rpms/sugar-presence-service/devel .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 sugar-presence-service.spec, 1.18, 1.19 Message-ID: <20090304082035.4E07170116@cvs1.fedora.phx.redhat.com> Author: morgan Update of /cvs/pkgs/rpms/sugar-presence-service/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19745 Modified Files: .cvsignore sources sugar-presence-service.spec Log Message: Update to 0.84.0 final - no changes from 0.83.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 20 Jan 2009 16:52:21 -0000 1.12 +++ .cvsignore 4 Mar 2009 08:20:04 -0000 1.13 @@ -1 +1 @@ -sugar-presence-service-0.83.3.tar.bz2 +sugar-presence-service-0.84.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 20 Jan 2009 16:52:22 -0000 1.12 +++ sources 4 Mar 2009 08:20:04 -0000 1.13 @@ -1 +1 @@ -571f9225a974b17c2fa0d31dac9c3eec sugar-presence-service-0.83.3.tar.bz2 +bf292605b6c2d0ef3761a957acc8a95e sugar-presence-service-0.84.0.tar.bz2 Index: sugar-presence-service.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sugar-presence-service.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sugar-presence-service.spec 26 Feb 2009 03:54:24 -0000 1.18 +++ sugar-presence-service.spec 4 Mar 2009 08:20:04 -0000 1.19 @@ -1,6 +1,6 @@ Name: sugar-presence-service -Version: 0.83.3 -Release: 3%{?dist} +Version: 0.84.0 +Release: 1%{?dist} Summary: The Sugar presence service Group: System Environment/Libraries @@ -42,6 +42,9 @@ %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service %changelog +* Wed Mar 4 2009 Morgan Collett - 0.84.0-1 +- Update to final 0.84.0 release - no changes from 0.83.3 + * Wed Feb 25 2009 Fedora Release Engineering - 0.83.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From denis at fedoraproject.org Wed Mar 4 08:35:41 2009 From: denis at fedoraproject.org (Denis Leroy) Date: Wed, 4 Mar 2009 08:35:41 +0000 (UTC) Subject: rpms/libgdamm/devel .cvsignore, 1.9, 1.10 libgdamm.spec, 1.14, 1.15 sources, 1.9, 1.10 Message-ID: <20090304083541.1B84C70116@cvs1.fedora.phx.redhat.com> Author: denis Update of /cvs/pkgs/rpms/libgdamm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21591 Modified Files: .cvsignore libgdamm.spec sources Log Message: Update to upstream 3.99.12, for glom 1.9.3 update Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgdamm/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 23 Feb 2009 08:23:50 -0000 1.9 +++ .cvsignore 4 Mar 2009 08:35:10 -0000 1.10 @@ -1 +1 @@ -libgdamm-3.99.11.tar.bz2 +libgdamm-3.99.12.tar.bz2 Index: libgdamm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgdamm/devel/libgdamm.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libgdamm.spec 25 Feb 2009 15:02:13 -0000 1.14 +++ libgdamm.spec 4 Mar 2009 08:35:10 -0000 1.15 @@ -1,6 +1,6 @@ Name: libgdamm -Version: 3.99.11 -Release: 2%{?dist} +Version: 3.99.12 +Release: 1%{?dist} Summary: C++ wrappers for libgda Group: System Environment/Libraries License: LGPLv2+ @@ -57,6 +57,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed Mar 4 2009 Denis Leroy - 3.99.12-1 +- Update to upstream 3.99.12 + * Wed Feb 25 2009 Fedora Release Engineering - 3.99.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgdamm/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 23 Feb 2009 08:23:50 -0000 1.9 +++ sources 4 Mar 2009 08:35:10 -0000 1.10 @@ -1 +1 @@ -7092db771c301a36eaf0c23fab6c663f libgdamm-3.99.11.tar.bz2 +9be3f954bb5fc53e680ad74298328fe4 libgdamm-3.99.12.tar.bz2 From tsmetana at fedoraproject.org Wed Mar 4 08:37:36 2009 From: tsmetana at fedoraproject.org (Tomas Smetana) Date: Wed, 4 Mar 2009 08:37:36 +0000 (UTC) Subject: rpms/tvtime/devel tvtime.spec,1.36,1.37 Message-ID: <20090304083736.862F370116@cvs1.fedora.phx.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/tvtime/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21952 Modified Files: tvtime.spec Log Message: * Tue Mar 03 2009 Tomas Smetana 1.0.2-5 - fix font requirements Index: tvtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/tvtime/devel/tvtime.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- tvtime.spec 2 Mar 2009 13:25:00 -0000 1.36 +++ tvtime.spec 4 Mar 2009 08:37:05 -0000 1.37 @@ -1,7 +1,7 @@ Summary: A high quality TV viewer Name: tvtime Version: 1.0.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/Multimedia URL: http://tvtime.sourceforge.net @@ -15,7 +15,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gtk2 >= 2.6 -Requires: liberation-fonts +Requires: font(liberationsans) +Requires: font(liberationmono) Requires(post): desktop-file-utils Requires(post): hicolor-icon-theme Requires(postun): desktop-file-utils @@ -109,6 +110,9 @@ %{_bindir}/tvtime %changelog +* Tue Mar 03 2009 Tomas Smetana 1.0.2-5 +- fix font requirements + * Mon Mar 02 2009 Tomas Smetana 1.0.2-4 - fix #477473 - drop fonts, depend on liberation-fonts From denis at fedoraproject.org Wed Mar 4 08:45:22 2009 From: denis at fedoraproject.org (Denis Leroy) Date: Wed, 4 Mar 2009 08:45:22 +0000 (UTC) Subject: rpms/glom/devel .cvsignore, 1.23, 1.24 glom.spec, 1.30, 1.31 sources, 1.23, 1.24 Message-ID: <20090304084523.101D470116@cvs1.fedora.phx.redhat.com> Author: denis Update of /cvs/pkgs/rpms/glom/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22988 Modified Files: .cvsignore glom.spec sources Log Message: Update to upstream 1.9.3, with new sqlite backend Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glom/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 23 Jan 2009 11:29:50 -0000 1.23 +++ .cvsignore 4 Mar 2009 08:44:52 -0000 1.24 @@ -1 +1 @@ -glom-1.9.0.tar.bz2 +glom-1.9.3.tar.bz2 Index: glom.spec =================================================================== RCS file: /cvs/pkgs/rpms/glom/devel/glom.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- glom.spec 24 Feb 2009 22:13:04 -0000 1.30 +++ glom.spec 4 Mar 2009 08:44:52 -0000 1.31 @@ -1,9 +1,9 @@ %define major_version 1.9 -%define minor_version 0 +%define minor_version 3 Name: glom Version: %{major_version}.%{minor_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Easy-to-use database designer and user interface Group: Applications/Databases @@ -14,10 +14,10 @@ BuildRequires: bakery-devel >= 2.6.0 BuildRequires: desktop-file-utils gettext-devel intltool -BuildRequires: libgdamm-devel >= 3.99.8 +BuildRequires: libgdamm-devel >= 3.99.12 BuildRequires: libxml++-devel >= 2.18.1 BuildRequires: python-devel -BuildRequires: gnome-python2-gda-devel >= 2.25.0 +BuildRequires: gnome-python2-gda-devel >= 2.25.3 BuildRequires: gnome-vfsmm26-devel >= 2.11.1 BuildRequires: gtkmm24-devel >= 2.10 BuildRequires: libxslt-devel >= 1.1.10 @@ -26,9 +26,10 @@ BuildRequires: gnome-doc-utils BuildRequires: scrollkeeper BuildRequires: gtksourceviewmm-devel >= 2.0.0 -BuildRequires: libgda-devel >= 3.99.8 +BuildRequires: libgda-devel >= 3.99.12 BuildRequires: postgresql-server BuildRequires: libgda-postgres-devel +BuildRequires: libgda-sqlite-devel BuildRequires: avahi-ui-devel BuildRequires: goocanvasmm-devel >= 0.13.0 BuildRequires: libepc-devel @@ -64,7 +65,8 @@ --disable-static \ --disable-update-mime-database \ --disable-scrollkeeper \ - --with-postgres-utils=/usr/bin + --with-postgres-utils=/usr/bin \ + --enable-sqlite make %{?_smp_mflags} @@ -124,6 +126,10 @@ %changelog +* Wed Mar 4 2009 Denis Leroy - 1.9.3-1 +- Update to upstream 1.9.3 +- Now provides sqlite backend + * Tue Feb 24 2009 Fedora Release Engineering - 1.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glom/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 23 Jan 2009 11:29:50 -0000 1.23 +++ sources 4 Mar 2009 08:44:52 -0000 1.24 @@ -1 +1 @@ -1c36d4fad63d834c9a163c80f515944f glom-1.9.0.tar.bz2 +7577f49a297469d3b7d5a65ec898638a glom-1.9.3.tar.bz2 From jskala at fedoraproject.org Wed Mar 4 08:51:47 2009 From: jskala at fedoraproject.org (Jiri Skala) Date: Wed, 4 Mar 2009 08:51:47 +0000 (UTC) Subject: rpms/bltk/devel OOCALC_FILE_SAMPLE.ods, NONE, 1.1 OODRAW_FILE_SAMPLE.odg, NONE, 1.1 OOWRITER_FILE_SAMPLE.odt, NONE, 1.1 bltk-1.0.8-all.patch, NONE, 1.1 bltk.conf, NONE, 1.1 bltk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304085147.1561870116@cvs1.fedora.phx.redhat.com> Author: jskala Update of /cvs/extras/rpms/bltk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23688 Modified Files: .cvsignore sources Added Files: OOCALC_FILE_SAMPLE.ods OODRAW_FILE_SAMPLE.odg OOWRITER_FILE_SAMPLE.odt bltk-1.0.8-all.patch bltk.conf bltk.spec Log Message: * Thu Jan 29 2009 Jiri Skala 1.0.8-1 - assembling package --- NEW FILE OOCALC_FILE_SAMPLE.ods --- PK ??? ?o?W?u????0??lX?? S??|a?VC??"C@?e??<1?J=`???S?e??On?U?????? ? T?P?????8??y{??l?P^K???GI.N?g'5wf?H ??t?o????]c/?f????yOjm??`???n9??p .'?^???x?g?#a[n?_A?s=????????]?3G??:&?????????i8?9E?????;???|????dD#U?3S#? ??q??E???a?+?18????{??-/?q?|x\}?*$???g???^(K*+.y????????o9D?-?? N?%(?;?????.?7JxO0?j?g????4?]d?dw%?? ?NO??_B?tCR??I?v?J????-?ty:???T!?=0?6O1t?v2??? ?F[p?????6\A?*",?F??n?BM?%??(???`x????C?H?????wly#???????:?6x4'x?????PK????` ?T ??b??0?K;??+??I"? X.U??%f????^Sv?(?*n?mi?j???vd?f?enK??? k,p???T???A???%R???%????*U.?p?????3.?0^,??u'WV?T???bmL??,l??????]bU??b25H?^TK?%@`?:/?)j?t?k?O??]>Bs?Ebr?p7U????r??e ??#?}>?????p?+QL????A???????,?MzR?U?E???j???e??3h (P?????6?;D+????\?Y??AeIk>?Nr]????????0?x? ???cyY?s??]???? ?7?????(I}\? ?i?#9%?dOR???J?D?l????w>?1????A.??Z???????%V_Vz????0???o? g????@?J?S*#?VC???&??2D%~???OJW~????z.K?g??,???9_?????(m?1?] 'v?S%???0?bzQ???zx????:??6G??????????+?Y?cY?? ??????B?7?f???? 1???b??6\?? ^??$?3?????@J??????^?? J>?c??M??J"??Hj!?P?q/ez ?1r??K??9?V?z?@????6? jM????(|????yy[??r??E????????z?<#?,t,]???={G???Y??R?h?m???{??? ???]{<>E???E?f?=f?!???v???=?8EmC???K?!????C??G?/??(0:t?Q??y?J?y??;?E????????z??q??J???-??? 4w??b???)?????{h?7PK?PB?? OpenOffice.org/3.0$Linux OpenOffice.org_project/300m15$Build-93792005-04-22T10:36:302005-04-22T11:59:01en-US4PT5M53SPK ??8??????3??y?8?T?y{???A???A???61.?8??{'?1?>????' ?%???I?1?g???2?3~m????.X?x????UIf`?f?t?sY??? ???Cd\SV???????}~F.?z? }H? ?B?!? ?^M?kJ?H??x? ????????_?$?'H@??Ma??VS??????j??y????#C?A`?@Yw?y ;J]?*? ??>??????m?r?????6D??V?????O|? ?????`?}??s?s??.??????????W?qg?K????????L??S? ??????!???(GBz?c?^????#?MZP" ?i??J??3YE^???G?Jp?z??Fmt?i]m?{nj??@??:???+?h5?'S???!??B=v*F?G??????w}z-{???o???*V???????? ???%??0?c????k???R?;g???7O ^??F0z?V????{l,z?v?;rj?????{??@???*IN??????Z??x~y&?rM??YU??pZvy4?*????_F?d?F??y???ob?n??&???V?V???????I? PK?~?? ???lp=@?$_5?)??A?????????RS??2<(g??Js?*?R~`}hRhm[b??:?e???[{P[?????>`?efi ?S?>s??}U???8 ??&????J?????r?W:Qr???????ZV0???Qy1g????6?8*??????s?????q??/4??3??W1I? ?????F???????9JL??Q?[??C-?;??`?Z???XyK{S,??46??*?^??uC&?k?|????) ?p?7 ?#1B?????Ba??Vr??T??,x?,????Vc??\,o? +?f|??fS??J??`Z??eG?~j?????$P?????:yZew??J?&?? ?????P???ye??9?C?)(?E??X?#?h?p 6??"@???? ??q?@?OsT?-???L?FN2OZ?9???;[?z???$?e???qR?e@?>?E??d?Lf??$i ?|w80?????*??m?Q?KF??>?????Mk',^3??^L???r'?'?Iq??P?????WKb?5?M????/?r@?$?m!?q$|??8?kn?????TL?);q???????^? ?7?:F??\J?Q?d?~)???jP???????P??%?+bK[??_?\]????[??1??)( u???SV?u?N?C?? M??bA????t??????EX???????v.7??%?Y?????n[?= ??RfVt$y? ??[C*?19a??G??~`???=???z?*???z??e9m?????j/?>[?FA;? ??????,?&? 8>???@'$?~4?-?????+ Bcnp?~??*bA? ?C?Jpo?? ??zc?#??(?A???9???y???J?A??3???W?T??P ????=@??+;I????[?2?2*??-????|???P ?%??b?s??????mg{ng?C??U?? ?????:?W????4??3??3H?;p?O?6????8 KK??P?????? r???M"?(???[??z?? ????3;r}O5?????[k?????r_?1?7O^?8???d?????????(1???t?)?Mn??? ??%V?????e8gw?g?? .S?N??J??\?q????????JV4?? ? B*???8 ?O]J????o?K??Q?v???l?Z?????F??2??]????8?? ????S at n??? ??Y?x?????Q??E?[?x?d??) |?&2Yr?9 ?Pk?T????_???~??r????Z? ?=?-?T?CO? ?I?.Fz?? ??U[?????%?,#8???????+??%+;???g?-?J3??????t??|G???g?S???a??]3K?G????l?r? ?1k???i??X ??k3? H?+? ?Rw???J?h??? ??????$????????m??????[I>??0;???T??O+KB??m&??;h???@HJ??s??1????????5?W ?,??I$?N????^rj$???w???|F?.e?(om?U?/??????1????5M:^?-?2?a!r?=z}1?8?(E=Y???y???J???$?Lp? 6?=? ???sWdK???????[g?Y??8 $w??S?????5?????c????RLVM?hx??*??????g-????c ??y?9= ???to??????_???`rx?I??#?J?????iV?????Teh?sq?K|>@??U?3????; ?oC??r?JI!?r?'??? {????:???8??eQ???vs4?m?UO?%??$?pA??3?sZ??Mgln&??wE??>??2???A?? $DS?4??q?1??/p?9???{?{? ???o ??rx?Vl&??a??E#?,??'?'p?Tv9????V??????"y??Xg _?dm?G'???????T?,? 2?3?-?????S?tQ???#??????ir??r?(m?h???wn##?=x?=*?? ?c nt?zD8?T?Jm?z~9???x>??yt??$?Td?6?n???w?????D?g?nVz?Kz????2?+ d0???A?W7?j"?'U??#)??(3?c???)?????y"??K??g,*?6e?7??8?z??-fyk??^Q???????w????:I]?\?H?gsj?s?3??[p ??5??????+?j%%??t???:\?l'?'?N???K???v?&????'%"LP2p1?#?ui?X???v?????{??[???v?i????K(|?4e?rxrG8???s3>??\M????s??( ?;vH?'9?1?t?\b?O%d?!???w9??a?{??V????:?2???Lq?-??????X?%mn7[?Uf??1??????8.k?BHd?D?I 3JH??????:t?UL+???1?????$ ????p$??e9?z?? ?z??;# ???A9?{ x??2??F54W ?????>??? ????A??k??y???R?i?;lu??2???m????6?GLZz?]?????=???}kBV??8?C ??9??>(?);y?n&?4v??X??:t?=??z?VE??%?G ?{?s??p???~????f?^I?mb?1?V??-|?ut??m?????????8????8?H?;?6Lc'??????? QH?? ?#?s??_?;?.-n? 1d.~??Ld??k????kle?!????(D??F????H,?#???a?r:??G ????e `?W?8??~_?u??b?+&?{]&t?o-??Dc??j??d?<??=???? ?a%ar?+????i?G?u?i????)?@8? ??????9??yVEX??? ??g9??R??Mi?-L;???_2Dc??XS??g?????d?Y??I?o??)? ???s??9~?i?cX??2[??Z?yb@????'?F?~8{?[???8????9? ???+??y??n?AAlg????@??X??,?`?w{??=K?WF?SX ?DC+! N??%z?????Y?5W:? .?{G???,BE ? M#????r?.v,!?.?A??GQ?@+?J??D,????e?:5V ?? R2 ??????>??SO???????K?#Q?Rzc??z?Z?Vm???Z\?F????r=H????r??????g? ???? ??Z?? ??Z  % ??%? ???? ???{??~{??[{??{~???~???????????????????{~??zz??????????????????z~??~?}z??{??~??{{??{??{~?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????}??????????????}}??}??}??????????????????????????????????????????}}??????????????????????????????????????????????????????????????????????????????????????????????~??~???????????????????????????????~??~~????????????????????????????????????????????????????????????????????????????????????????????????????? ???% ?? ???? ?? ?? ?????? ??Z ????ZZ%??? ???????????????}???????????????????????????????????~??zz??z{??~~?????????z??^??~{??????~??????{z???????????z??~??~????????????|??{z??z~??{~??~z??~??{~??z{????????????????????????????????????????????????????????????????????????~?????????????????????????????????????????????????????????????????????????????????}}?????????????????????????????????????????????????}}?????????????????????????????????????????????????????????????????????????????????????~??~{??????~??????????????????????????~??z???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? ????????????????????????????????????????????????????????????????????????????????????????~~??{??~~?????????????{^??~~??????????z{??z{????????~??{z??~z??~~?????????{??|{??~~??{??{??~??~??~~???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????}}???????????????????}???????????????????????????????????????????????}}??????}}???????????????????????????????????????????????????????????????????????????????????????z??????~????????????????????????~??~~?????????????????????????????????????????????????????????????????????????????????????????????????? ?? ?? ?????? ???? ?? ?? ?? ???? ?? ?? ?? ?? ?? ?? ???? ?? %? ?? ???? ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????zz??????{~??~{??z{??????????????~~??????{?????{z???????{z??z????zz??~??{~??z{??{~??~~?????{???????{??~z??{{???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????}????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????{????????????????????????????????????????????????????????????????????????????????????????????????? ?????????????????????????????????????? ???????? ???????? ???? ?? ?? ???? ?? ???? ?? ???? ?%???$XZ$? ?)J@ !HH!!JR$?Z????Z !ZX!! ?? ?? ?? ?? ?? ????? ?? ?? ?? ?? ?????????? ?????? ???? ???? ?? ?? ?????? ?? ???? ???? ?? ?? ?????? ?? ???? ??X%$ZX$$ [...4581 lines suppressed...] O^#[Z??!?I?On?????MTe+\???M???\ ?h????4????>`C6?by(??-?L?i?????c???>?g????0?????C???Y=?D?i?E0????4 ?G??r<S?OB??Q??XMCw:????K4f?RD="???$??eO??5;??i?z?f???n@{F?9?????????(?c??????E"[G???4]W?fE}b??W}?-?g?0z?E?D????t,m?V???^???g?R????]??f???(? B? ?8`??7z?h?Z??3??g?,??%?Ngp?? J?n???x??xOD???r??)?v8_3 ?uWuW??? ?@???C ?lS?a? ?????)?!4????l?]p%M??@o????qVx?3??|X?d???,g??I??]wQJ?Ha??????B??JE????4????Pd?L?x=???E????*?? ???#$???t"??F?v????{k? ?7q? ?#????O??????k='?x??????$??????~^?]??D??-J?E#G?? #c1???? ,????]nll;???w??????????n??F-??B????? S???????E ?????~??=???????4?7s??A&??@U??@}???b?.??????(!/??????????&%F???????????7p?]??0???=V}???A?Y ?c?"K????8??xu}?Q?v?9!;??n?f??~}?$??Wv????.?^??/??'?? j???J???!}(??k??????T?(??-n??Q?M???y??;\?s]????N?'R??n?,k???5?u?0?&?{??P?t3???J?&?pD?????I?. X???? ?J??_???a?(??????1??+?????Z?-???8??Q??UI????wO??%???:uVF?G[.V???f???[?+?'?5[?$.g?#?q?????=????????nnQ{??2???Cq?:??Y????H???|????*?R???.u?w? ?.??-5> ?*?'?? ?Rf ?i9~????X?? /??|????O% ?^2??By????2K9tZ?D% ?LBW?c?n& ?9??~vs????Q???????z?2?[?q?oc?')?????&5????R??E???5z?|????p???G????? ????-??1??>??#c?;%u?6??????l?5V????+?,?b?L??8?*??:G???c?~48R3&` ?n???c@????D?(/zy?;S?&???-?#???7?#???4p??o??? 9?G????\???????T?v??!???z???????[\?"? ?*?8T?+?>?_'??&?????r??Tjt?/U-???8i?????^xB?j?N????~6e?x??9 .qHu????-??q??]1?i??\U$K$?$;6??2G? O?&F???SHR?d?z??rF9t?n##??_99??p??0Z?!???c;?Oj????B?u????????L?(??Vj???r??C?8???m?/?d?g????i1? +=E?5QE?????\???D?n??_m??Fa??(???M f???@??t? ??b??q??(??9#^?>4k Z?D??s? a Zf??i?\P???D??j Q??J:?E??)9`???)???Pq??????v??*-??f9????2/y I??{(D???c????t?y?'?????r?W??,j?m*J???H[??#y$U?u????l}S??j?Lw???X???z=e?????Ct??O?/??q?h?We? K?q??G?????px??*"$J?g?<?j??_??lo?P?@=??????^QGfid7?????~???3e?b??I?a_?g?5???x??-?? ??i?i??G??g%_?m.*x?-?V]i=?n??V???A???,H????????~?f??#?O?.g?1?~???????=?,?#??????2??:U ????L? ??`?y????nm?0????PZK?U?????@??Ye?2%K)M?g?R? `??#???'h?V???r??-??k9"?c!?a?Y&O???????f?; ??N????????r?%V??????(h????%h#E/?5Z?s.)a~???3????a???(Z?q{?21S?O??????????????AO&?01??I?DBf2f?w?>1????~??????S??i?:5????F?-b??z?????j-?p??|???????/???????=#c?{)JN?? Ap?`?? Vpxvv]Y??? O???4?: ??????? ?*???KD ????fB?D??xo???V?5m??d(????8?]?y41?E0+??+??????0;E????@L?????q"fxI????K?U?:8?H?e?n?????R??????[y??3???(f????H b????2'Mu????Dg-?"sE?? ?R??m`t??O?? ?/7@?????nP5r?`!????????n????U*?+R?m?:T!u19F]r?????? ?b??R?y???)?t+z????U?2?~'3???? ?l ?\t x&?G???x???T?R??? ????@??WZO??????????k?:EJ%??\??Q?F?`???^'?Y?????? ?C?GR?????????8???6????.?_x?z???]??mk]??X?>?6Q??c???????!5"?*??^(?ul N?`?'M??v81?"g???#3????L-:_??iMZ?B???M???????????jD^m??]F??z????j??zt?????a???e ?+??????a!6B? ??2<|?Fiu????*??a?4?8??U?p??o?n%??p?y??er?0=?G?????n?}k????4O?Vi5?s??sS?x??Vi"YYsZfGN?9G~j?????+?J?F?V?F)?z:{?zd;?X??2?e? uA??????? O??????]??b@?u}??Ro??ryL?W???? ??H???~+9q?3T!mLD???M?+O?l?$?_?|??+Q???1;W?/?J.??0\??e???R??????uIH[`??S?J 9A??,w??q:???W3????J?+??#|&????7??K2r???+????e?@???,??n?\?l?]^M-??+??????_.????w[?i??e4L?$??D??RLpem?Vs???v?xHb?By??R$`??Kr??G"???G_???yP@/ ?v ???U?P?????????WF8(;J?????W?o??Y?Y0??_?[????_?x??????iG?\??5??"????Kz????!?T??m??O ??#E???0??LP??jW~]????J??b??~???f??P???????N@?@]?c??f???????t??"???dr??&?B??Sg??=????B?? ??g????R?Wc??'?`???p???LF?q?$o?&"r?{)?A??3-??m??;]???;7`??u.m???lz???`_???z??Ws?K6???Y?^???1c?I?r?4d?Wk??]??.??C??????aD????? ??s???$?2??????>\f?nE?v?@??=?O|Dl.???[????h??,?{oC???=???4?;M"h?T??'?,??Wc?=??B3???? ?`W lP?7??G??"?AS??*?w?(??bfF??}?h????4?$??}?????},??? ??` ???????z;p??|??d2o??S{e???7r??*?????S?X?N????&65???jc$??h"X??????9"???????s??+????? ??L[b??^K???????K?5??????8V[/??@?x?q?k????[???X?? ??EL???YK????_d? ?`?>?tP???dL????vTN+?(:??u????}W?C??y??BC?????QL{Q c????0??F*G????7??O; ?}???ND?C?K?g?:g??{??V+$h\??!h'i??L????????f?Fn-X?? ??x??6??????7???[?WQ6L8?K>??Zc?m?{ ???? ??0?z? O?AHCi_?w?m??9??????|5F??u???em;:??????+F @S???I ?[??IL? ^8???]??g??H#??j????C???E??\#=?????P?i%fS?{??td??????Q0???;|[{?????? P??wN??=?@j??^????h??~??[??????r?????kh4{% Xu???M?>?P?g??Aw??l$?L?o?B8'Oh?N????k???f?D??5?A?wB??&???YOg?C??c?[?DB??`Uyw??R???(??t???r?? ?0??3??\??Q:??5?2?}|??lc?vs?g?4????6zd,?EP?1??6???W???:??9a}?o????v????a_??_?{????? kuJne????Nvp?;??????? ??????????????J?k??6?;"?-?io????? 3td?p?CVz???0f???e??dv????????Zv+??^6??^|? ??c?????l?pvwF?/ aeHy????8?.dc??????????l?? ?i*z??`M??;???Q?????3??|1O?(+?RB?yu?U>u?5>Y???/7vz????Y?b?>?s?F?;V???????5?54g{?\??um/\?? ??pJ?*>}?(@???[RTx?JSuJ??d??{/L? ?? ??l??^?D#??B??9??R??"?R??($ds??4=.???|??????????y?q]J?????????3????v?????? ??]??/}M1>?b??wN?`?^??x#?x2?v:=?> ??q#9iM???sZzI?N?????????[V?????9?x??????0?????h_?????V??o?????yzNhx?o???C;.??bh?????;?;?sf^x???? ??`??A????^ ?q0?d???Z ?1'?g???A8???H???????1?Q???k5?@p?j?[^K?L???F?\X??9??lOQ3jU%?!3?????h?B??p^7???W ?????+@??i??D?????H?=???p?E??z?????b?B?tvhX???>?'?^'???!0???CxDR(Z?` ?s?8??^???6???N???x??????ya7?Z??vXq???????Y????$g?A? ??+{????>????~sno?wbgg????} ?????????? ??????????>??W???v????\1r???????4?? ,>3y?a=?ygkV???x5?L????X?3?>????&?x?`5?W~?6fz??n?=t??@c????\???Nth??H??^vl?u?J??N4?????P?Y?hs?S?;???r?"??$?)$??W????T?%?@???|????c?>%7????0$) ?????z??a?Fo"F?? J??3 0????X?5??0P?????Vm???C??X???????"~????5?LTv'K?5?l2??s??????RO? IO'?[@ ?? ?4???c/???t?vC?OBW???4????^?9Nkg??7??w?i;???-???0??K????}?!??y????3?6??xZ?s ??N???????k???m?????8?????m0?i?1??????#???m???? ?~n??'????M?????????|Gl?k???????{&?????????DN?/???????^?;??{$??????}??9???F$???t?D.????ocew?;W ???`?????^?vM??!p@!???L??w???&??L$:?ciy?? ???~ ??????Gp?~??`4????%\-????A??????a ?JzR??????;??s?;?:???l?).$ BY8?e??>??"?*h?#!d???.W??}??ZG???O ?????+??kO? ;&?8??????????????3??pL ?e????Y?8?YF??h???l?????w??P?K>???=|??[?[HT?0?lnVT?????`??o??e"?D???l?JR?.?X??=$?B? ?:??e???'r?l5?l??h?M??t????Y?????3?]^x?3?Z??WS;;9?p7??l?Vlk??p?+??H%?J???gD9????c=?p7?9??????x8???g?XMf???,l?bO??/??7?;?i?e??~??#z`???qt??X???{jo>???;!cl*`?b1?f???s,??o%?????E ????????f??????c???d???????+8?'?o?????=???????=s0?#X?,'-?W???G~???F???cf????:6??A????e?? ?R?????q??Wz %???Hzq O??;Z7z~????l?*?????"??Lf?4$??yN??a 1???~???w???;?_?w?|^?g??s????o???}P??#@?? ?????.??|X?^??=~????????G???5o???v???{???\ -:??w? Mm?????????_Y?k`?va?>E???S??i??mO???7??x^vbp at B?3?" ???j,K?]?X??|??&t?h??:???Fu( ?D?.i^}?q ;?????OuvtR??x?:???2qJ9?LU?X??r?>???????={??g? >?Ns}?\????o}????>[*??????!?>67%? C?r?3?8*???Y?X4:+??9?v2;?r ???M??????g#:EUn<?y????P?/????P??UV?9??,V 5O*???????C!c?/'~??|??_?W??%?0??????|???s??c????????W?W??5???????E@?????2?A`???;X???;?s?~?/?I;??? ???? ?%?ds?]?+??{?NM?A??)???W?_?KnNi?U/jvT?.L?rIR??????Z?Cn?y!?z????k>???? p? ???8?$p3?????9*??????????Po3?j??(??3?????????v???q???pI??c03?????v?5?????qfi?j?O?q??m?????)???7??1???8?u?????W?,???N?|.???o??Q?{?? g???;???x?+W1????1??(uH?7}??????kh?4?????R:????)????????N??t????5?|??mDl???'?1k??2u?[W???fs?.???Btj<1??????????Z84??-?{>??%O?????????=.?)VO?a??????????x?????u:???~ ????????HAD*&?~n????&R?_?x?3?G??'?B??{&??r)??????uT?+???q ??3B$?C?&]?????P?+?M)m???Ds?????x?$X?k?w???Lg9?9sQ ????$a????V??{??????YGs{?g &X\ ???>????w??xJ??On?O^o??;5?e??k????MMM's1?x??d"d??N2?Vgf???GV[r.????????g??)@?J?F??1.~? ?TX??#?;?#'T????}n?8?? ?`}-??A?SJ?????`?8?/?{??????d?(????<(????????e?Y???Y?Zw???V??????gs?C 8?;?j}b??k.?&???U}?????_8?"?N?|????a?:F??????II?W]???q ~?v?t?/?? ????+?????????v?C?M?C?]???S?94O?5u??n????jLvj???????Oz6`??`?c??{??????!?r??_?t??[|C?????????????p???????s????$r??s??(]>?\g???^! y?+{?Z??4B? 7???,?4-?S?v??A??D?I?I?` ? aj?$????l?/{????*?H???N&/:?p???)???=B?z???K????y?*???*??C?/?ui}???{X???????0??????2&L?J?H3???"ac??*????=?|???*R#?&?????V??394J=4M?L?D? [9Y?m?TD???\pfzco5&??1q?*???????????e?)_??y`Pm???V?r? j?????(?A?X??} ?????r???~>?1?;5?? ?w?????j?d?c6_??S?l???H??7??5r? ?~???#E????u?? ??????iN#?1??????????y3???Y?%vAX??t??v{???!'I?j???Sk?}?M$?Q??Ix{ Jm??I?4V?@?p???y??V??A?\?k?|?????%|?cO?H?h?G??@,OQ???X?1+tp?A??A2??2??Q ?? [L?LXW?9Lp???X|*?B???~??)m ?A????kt{-&??Mzn?Z?4_?'?>?)u7????????m???????[????~d?J ?3??s? ?I?32?NpA????? ????%:Ve?NC?o???? ?j???/?n????.?%V?8?}?U?yp???Hz?l???%?7???Xt????.F??????$??p.?Dr?N',??^??e?e?R??/??K??? ??C?&???C???} ???Y??4F?_<?Q??`?????1??8:n?5?M^6S??f???N??kr????5???=?,?????ONX_2????B??6 '?????s? A??{jm?s??j????A??igSG???xw6?b2>??LsS6\?X?G?????5???%s:??d0iku@?TP?j?K?S8%?&~5??f;?? ??pp ???????T?Pk?,? ?????#?L?????tdq?????V?!??Q????? S:?P?Ik??l??V?.$?q?0????????T??????Jv??ogG???L??!t?ZC?(]??\??o\??/??T?v?b?L~>?f=?????f?9dI???R//8b?N??Q_ %?????k?q|g?????????6??m?LJ?r"Z?5Tnn?i?????y??s=?!????????&"???a??????????"??EV?2??t?d3lj??;??_?;??_?YO ^?????W?????????t? ? ?Y??_p?9???????O?I?3??\J???c????lf?I?????mS?i?mRi?x?dc^Bv?LF?r-?zk`?1 at T??.l.???]??M&>????@?E U.B?????H&?!????Q:?K??I?????? ?f?$^????????XU*????b l'h???ib?i?z?2\??F[?? V??%?e?ZA??H?[?J|?v??????p??3??????]?U??????g??3???i??]V\(??%'????d--???????om??Z????!n~?2y??z?j'%??s??v??+?Z?????????=????\4???>?J?F4$??????^?'???q8?LvL,?w???W????????? ?o?y?&?$hx??!?K??">y?$<)t?0???U ?-?"\(!?i??pN?:????????j? LD???/"??j????????_g!?m???K?Y??A/2?J=????Ze???2??a?=2??b?J?i???&Iu0??8??kKS??}_??&H l at n?s {?fz???v???\?5????LF=;???peJgVv?? ?U?6 ??$m?16?u?????sv?m?^??S#?y]?>??a$SI???c/??*??????#???:?????M?me?F(???v?Bc[S?xm?'???u[?????6?J'i??->~?=?E ??\?Rl???*f?z??@b??????W??}&??/?<z??????????AR??Fx??????G6?? T?2I??%??Wk8?????????{+?1??M&??]????????? ?? ?S[j????????? ???f?=?Lk?g??Bs??gr???v?.??m??????,???M?i+U??Q??s??V?wR?????W5l4&??l??????nG6??c?_O??C.b??"hX?+???k?GC?.?????-f????Q??uy'??KI?Oe??1???e? }:??Q?\????G??1w ?K?? ?M?DZ?oEM {????Iidf$?????^E{a?Z?? ["??;???a?????J??~R???$???P??q??$? ???;0B|?gr????sx???V?jL?=??]>??Y?Jwn???m`??me?i|?????=???0???]????&}H? @????*?????J???_?>qu????}Y?`????S}s?nE??@dF>d?)1[z????&??w???-3[??&v?S?*WFC2?n????]?YY???B??:%???? ,??zhsRQ?:t??C????&?&A????e?3?gs?1??f???r)!j??@?P?~3V6? 85??r???N|?Rfg????T??$??????&??????fV?s??????X?? ??????????????\SCX?;???f??MM??1??h???{?V?xz?lJ?~}??-?0?h?v?b??5????H?)? ??I?]0??t Y$?Q#^????b???w???? ???? j?I+??=??H? %3????$6{?:?????{?-??????????z?2?M?n???G7);?9??L\?$55??'???????\?3]???{??j?g7P&?X????;???!.?s???????_;t%}?7?GK?2????! v9? ?{&U:??r?6?? T?w?OV??V?o??~??"? ?x??$?\C??i? '?Y?Vp|???hbH.?? ???%?S%?????@???H2????w?=? ??K?X????GF??Xw?Md??"L?A?????Ofl???J\g??? ??M?????????????!?#?? 9??`#d?;??,"?????N?n?1??#?e????#?\?6???R,tX??[m???u???G?2?????y??=????B??;? ,`lR??????Rm??,?F&Z?F>??@???z??Q??6 ?to??0>??_????[v?]o??Iz???g&????R??TF^??+ ??zc??"Q?#???Ib???AB?mh?<(AHM??????)??I?^ ^??q;??B??g?F?rd??m?RH?HJ(?}zG=????????H?/?????????[n?}&D??k???Z6&???y~j?? ??.n??`?'??V??c?????m?^h??K?p??*??V6iCmwn wva&?~}d?ck3?????y,?:T u S????????g6???U????????g?*?W~?"????:?2!??????????B????(?????{?S$r!Sa????I???+?S??x?9??-P???H??>?????1??????4???.?? ??q? ??u???6?????b?z? 1q[ ????d??f?m????r???o?5~?????w?L?????f?????\ [[K?r??o??1??????>??z??+r+???(&??[?\2??%k??Kypt?B????F?g_?? ????p?V?_z ???????On?Z\??3 ?{??????%|?????1??>???????? 5?L?c????? ?|pZ8n???Z??u?~?p?????k?eQ??7dVlM???0?O?+O? .?a{`*"?,b%6&?,??f?I_yw`'??????G\?VZ?:?j?4zsE ????NX}~??S?\a????Sl?[? 7{??E]?V?????.Z????XX??????x????}u???}??86??3[??`??(Fy??|??cc-?G??m?&.?8D$!?$?g????m??U"M???]m?Q|????E??C|5???\?K?`?.????&?.& ?W=?r???[=H57?e????$K#gR??????cpoH +????(1.????s???? U????'O; ;?? %??O"?G??????a?H|???SV?JG??l??V}a?(??,????2?0????\??l???&?D??8bj??:I?jn?????%????.??e?F'$???^ ????4??'6H?S???cP?GmV9M??-(???m???PCh ^8????????rA;?{??[m?^Y$???~????Om????????N???d=be??<8|?????o?1??8o???;6??I?p??? ?9JWJ}tje.????kv?#????????? ]? !??h?f&??R???""?=??dE??;?p1???;A(9?9U4<4?i???? ?1B? ??Yw??@?a?Nr?Wk6Y?-p???j?D??q-?(:???Y+.p??pb-????djX??)V?>? ??u???u??\????<9??5?-0???????kg???$?`??\????^$?>??;7qne?? ?x?%I?hb;??(Z????"??&??????q? ?????*>??m?6?r=????%?Oz(2??M^???????KI\D?[7??3"B?1y??????"?w???!????!?RA'??HO5??kG? vN?B,Ea)q???qz1b-?:??g??-??zYd???a.FY??:?f?????v?d???????,?c~????G?r?,(?;k&\ ?[??!??^?X??r??VafR?ji???6?*?P?t??$c{U????3?j??S??#?@???u$?#?nM?????,??N???.???u?J??ci?*??V??N?rwl?F}Ycf?i????B?7K?)?#\b ???M\X??????I?;04??v ?k?H}J? i?1?vg?W?????v_J?s?? Gl????m??uCR??:??W?????e&?u<?U??R?wO??pg??yJY]?%?=?I$????5I???n??mK?? .??z~w???K??_?v?????M???!???????0????&????Fj??"Hr????c7?1?%?N??C3?N???? ?r??????)?9]n?M?????|@?+K{W `aR?g???A? ?? :?I????~w?3 XEAd???p?? ?PiV?>9?39@*??F>S?FK :i?/?N?^+"??;"????X[r?Y,???q?_???????W ??f^n??,}???x c???@??_?F?L>?C?B? ?[\?R?&?1?YmR?8?w???{b??:??VjH;T^??o???B@~n?????G??XO$???y??)??P?g??D????n??v???:?+?$????k??!??$????U???2A.?3??W?3??f??>?)??I?X??Og??????????|??L??J/6?? ??tc????Z??3????B?????'????T[?`cd"1???i???K??l??)C?"|??Us!? ??Q???:?W6RX?e?w?o???P???????SC????4?c?s?=h?r???/?XB?k?????1????B6?j??[.? ?_?S??{?vyF8?? ??m/?y?Y;ky??W??[??b????L?? ??0?b???x???(??D?d?????h3?????7'???g???N???[?DQ??V??A~Y?????C?E??o???c?????? ?]j?Ug:?d???]???X8?v60?????Hd?s?z?3?]F?M-?i?Q???K??e?__KX_N?Z??Vf@?F??S`>??V0??fB?q?g??!???ue????????\m????N?P!?{"???|GD??X-zG?[??w???~NBg??K^?  I2??H??l??PB????? .n29?,????X^??E?w??[? ??Om?A>?#G?2X??>C89>xu??o;!?y~w???a.>???\??`f?b+??Y???aX?R?H5D9?#?b?i?[?S:?f??G? ~??????;?.aN@????????Zq L?O ?_????'? .??PU??|????$?Sb{???F???D??????z?U???{?MYLR?_??k??E&9?h41??? ?????&R??*Q7??3f"????{?6`-'???5?R9%.??l??????;%??)??7??? ???z?E? #sa??Q?y??7??\G??s?6M'm??? ?m?I?:???w??7?w$??&9a??I??J???:???6??}??-?$????]f???? ??n??????Y???"X ?s?'? ?p???7?????>bs.?*???D? ???#B??^1)?~??|?D???fS?N???q}?Fd? ?????? ???E????I%??I?nlX?/? jt;i???^B&>d??1??Jf?\?]?S2???Y/Z???|`@?????c?'????1F?\L?????P?/"???l? ?M?7??a??? ????.?5????S????????B?? ?\? ?v????=u??2???>??>Y$?a? m? ???ES??sT???oaem?A@??k?N?Q%J???u??M8??? Oz??? ?p??????eg/?\?s??z ?? R?"???G?Y????# ??#\OZ???~??W?Y??"?F?????? ???????2???????b??=?=????$??5???/?????Wzk???Bu??+X^??!??{????_>|????FU%??@?S ?;?n?zkT??Em???????????wb?zA?ih?Z;W??nS?ePzM'u??Y_0?r??lf ?VQI???????az?e:k??Y?2  X???,:X ?j??Y???? r?f?.?$???f?q3(z??"?u?+>???Y ? 8????W?X????&???xx/??Y7W???3?1xg#???>?????3$??? ????A?t??????S?7p??yM?{n?%^?Y???JT?nm??Ei"?\CM?c??UC?9@??}??i?AA??U?L?-;??k`?fN???]?Q?N,?kl?????dh7[???????s?? ??mWJ???E?????????? ?;??g??U?&??? n1q??9?x?G0??)9?_?/?????h'/?a????Fx+??$gR??????????$?;???r??? ?? ???E.??S???Y?4?H?XZ??ExM?p???p??? ~?O?????b6?+?\ck&Y??uS??? ????r??`B?!??b/_??.??`?"3??8>?F???'???Ql???q??`m5????????:0v?Ip??? ?u qX;??D?}?=???8????????I '5? MFVd????%D=]???????E}????3?w??&?X%P?h??????S???un&??????z???+X_ ??'q??u,H?.? ???6??!TpHL?+3>9v?d??9Qk ?{X%?h??^?pW?\g??G0?`?$??4]?v?7??x?ef?Vr>??????7 cf??MN?he????pH;Zf???????f/?T??|4?? ?H~f?=?%??d???~??K(???i??am?#??aW;P#??>?????????Iv DY??J?ho?g?-??X?????"????????&?l?p??1g ?!17+?v???B?????2,o?0?G???o?eT??ABg=3 f?>I???V?:???f7?a!????{?  ? -?r?t*?)^??&???L|_??m|?#??'Z?Z??4??&m6??n??i?=c,=???ss??SWuNd34?r???a??????! k6`?? ????wmkAp? ,? ????fv9?!9?05;wWwu?[u??|??}?s??????}?A?tWW??{??y?y??9'??q????.q?}?=?G??w??A-????(UI?=H3-??s??D ?|] |{? ?Sj??X_^?????wm?o???woo??r??o?NO~?>Sp????=?;??b,????Fp$????:???Ni?? nl???w\?v????|????0=?qm????1 Z??Ke',{???????#Yk=m?&|?!?0?v?0G?)k?i?t?8?#'?1L?P?P?h??? *??RP?C?O?? I???3 f?&???a??N??? ?????Df???C??????? h??-K??Nc?L??EK??d???9?t?? ?%t?ME=kx?4???(????{??i????N ????K$???{??O?E?F?=?n???D??TY a?*?7???n"????qj?,?G?V?$?.s?? ?C??H?1?0i???k_??H????? Z ????o7?*????????gWQ.???^??{v??{'??? C}R? ??W?N??Q???q? F?;??S%??JuN???r??Q?????????dB?#?A??????2???7_m?6??H\?\???HL$??21??l3c8????9??2V*&AY?5a???&??f???C?f=??o????) $j=NJ?Q?????1?3???M?M??0t???+<?????+@@+?) ds? ?ba?r?? Hq???\ ?23???*?ky???|??JnF?p?o??Sk???c"$?^???X> Mf?9df?8???,?"????9u>???H?3?I?#w????)??? 9?\:E4????????|fn??k?KkITst?(1h??????/????'B$A??R???M??y? M??f?c?? 0D????q W?.?? ?#I? ?F????QU?? \:????r??_???6??\J/????G40%WK?RmO??. #?z??????23?K?Y??jat ,0???f?0 ?(?=???|???8U|????TQ?7???o3 ???b?????#f?*???????E????6?????o???????3??sX???DR/?& ?j??'??K???:?F??#?? ??'????w???!??????G?J?1??*L?F,?>U+?????8?c???lR?lug???G?\??]?1fi?????-???#??:d??\T}?g.??V?#?? ?\??"`&?????&???a8?_??J??"? 9{??m??R??rvXe ::?M?K????0??G)? ? Y?n??????#?mDq??????b?????P??\8?^y????w??Z.^?dc0???%?QU?^??N?Q$O ?:toTF??B<4?H^?F??Y??}???Mh???q?,!yK???-"???HT???n????Opzm??j???XX?wf??c?~vRG??7a????[%?????ij?m??m??m7?y?dM?u??T?N?9????W?W????f?g????????% ?????????X{??~E????;L`?h???^(? 6??K?d?7? ?1?? ??p??b????????????? ??=z?????{W?????a?????i??Ap?5?FN? L?u?Fn?h?V?????j?}x?.??5?????V9???????}?o_???ID???4`??'?z??: ??w?????*S{??2(>zF??t?G}?\???????)???{???H?;Uz????e7U??-????XS[)^???U?? ?k????? ??Q#???/xD??|?.q ;???%?"L?c?\p????rN??Q?l???J?????p?9???'??g?????J tf?N+????- %?? ?*??R?w?o???|n?mOG?????e???r*p>?????[??V?x!??T???^???f3?H?6????G??0?!???gC{|UD?8o>????i?IT? ?S??_aA???aS L??M???V??? ?ODV???,B=??T1???cX??r&X\A7?C??#M???[?????>?C?~?v pLgpJ??.?E`??q??/???m?K?C%euf??d??AOV????l+/?????H?????!???x??%?4U?????I??L?m*??.?S?wu?Gyx??)???W??? ?$?WX75?EN??[[e??v???G?.~?$???]U????K?p p?L $61I????qc??Gm??d ]??By??X:?? ???"???e??"w?<;?=?y?U??L?????? G 4??? w????E?? kZVed?(?vPC?m 1 ?s9d?8?O?]o"?<&?^i??Rw!???j????p??s??w?f\? ?%UT?P8=}?P??$ zJA?+cV?(Q?????u_[o?v?I|???R?%?u??D?{w)??bI??? ? ~??`??????LB?ro_?l~o?z????)??a~?(n?0?'TGR?? s???*???.?v??TR??? ??:?+?{l+??e ?:8?r??QcEu?c???;?maPE]Y????ut?#??????????????H???x?4??NM??????c?r ??yUV?Y?????i???.???D?A??2?ca ??B??F??????k43uzH??6?2,??W|?L??@?y:B????o??U?7??9G???Cp??2y????? ??}Cm????g??????F'??(? ?j?Ym0??M????????#h??A?c?E? ??>B????F)%9????W? R?z?[?D????p?"?#??G?K?m$-????!??v???>*???`:m?2?}????6?y??Ohr`?%R ???L*?g?'l??j???iP???n?O???`?-3?????/???fX?Q?\e???????Z7?U??????V?/U???HnTy?TnP???mS?s;???W???ex??z???k????YRp?hE3J?S??FFE:???o( ????n??9?????.??PL13:??? ???v??Qo?? ??rv  ??????_ki???B????5 ?9?=??Gc?????) [x???v?e?5j??*??6e????E???????H^L???P9?7"?p?T????n?i??????L??zYF&$$??????.??????%???RN(????vr?*R???,?9?4???Bh??D?d?v??Nq'??TV??????FLEG8,??7+p????Ox?=?m?b ?????o?k!??CiV???)x:??4]?I???4??ARQf???7?#?? No????D&"???b??v?[>??w?_ |Pe? p??oU?h??+??G???yR????S??MH?~r?e?a??c???~?:>?_e?L!,??}C]????r??> ?=????R?v?{?\vA? g?v??|u????q????B?M??Y.?#/?f? ??a??-(?$[??????!???K=.I0U????8o?S5??e???{/?qBBS{??l?:Wh? ?h?4r???????s?[???&?%???? 3'?!hiX??g??", ?{v+?????s????U ?????E?m?!%UWlhRk&n?? 3???!?}??\B? _?,}?"^??E?3UW??GX?@7?/B?19??t}^N?c[{???Ct???F?Q??r+R??LD?bL??!??FA qp?sc??:?c"jY^U?N]? pT???p/d??}u?+?V?d????}???^???s]?%9?)W&??-a??bZ??C???????.12\NP/????+???6K???@?? 5}?#1?????5?; e??++???=/'?;?W??m?6h ????QF??;???p4ZQ?J%y"??????9??]SX????WD? G???3??$??S_+??J?YJv????hqr???7eB?_?????#??t ??Z?0???eg{??9??_0?Z"?m????'Z??6?&??'???~?D!?#Pnb??Psh???e??l??(0?*Uf>??k]i?\?JfQ?n?.f??b??~??-}?!????2 ?b???vTI??]t??'???G?X? M?r?t??ZB??|U&?Vo?A?L?fCE~|? T??????#??7ei/5.?u=?????&???:U?F??/??2???kG}????j???????'+?|?W?\???"?????/?s?????Nn?? ?z?]????<??? ??[??8??RR/fpB??Pv??7???1??L?m?????Gv?L?r??7p/?~?VN????)R??????4?}"???3(V?}$f,)??'?? ? ??? ???k??? ?t,??Fy??.?????z ?YzD????O???$/???A?J??uA?vTyP?> -????jk(;?^;?u?-?}?j?Ux???? !??\?|????g??X??+ ??????????H??FLO??e?7?9??D??9l?w ?%{??????Hv=?J??? ????,6?B/?????~J0?^????'Zu?,]Fg??/S?#(?vfd??um?F??????QCu???q? ?????K???j?????i??|HU??e????{L??Z?g????X?5??Vz???????~??N'Z?W???M????????Fi????????K?i? W?N?t?7???fxa??????b????,??}???|???R????#????_?*??????????K2??h?+(???_f???u????Vb??? ???Lm?a???[n???c?(:I?3????i??^0???? ????6??/? ?>"???????U?z?_??")tA?)??8Z8??@???{?gi?h|?????9???lA?N!?s???"??a? #?`?W?PIA??9{z?F>????u?s???5???:?bF?/QA&?(9qI??u?!pdZ??T????DL??W5#~?:???Cb0?`X?#??m@?>???XdQ?3?"?J?!????4_?D?*??[p4?iL? ?k???"???_7nV$???p9?? ?? {?}}CG?T??m????n\???_5=?K? ??vob0??>??H !s'??????B?????lolI?????3?2a?+$?#?%???S? @(??i'9?p?R???????;k?m?Wn&s?|nvm?qr????l ?~`.?n/,S??6??|0B????f???N??f?s?Z????:???;:? }Gv? ?>|?0?SB? ?+? ?E???8H????r?A'??O ??sZv??b t? ?1H????b?&????\? >??xC?`Ws?~?v????? ????]#F?J??3]?? ??R?N?ib??(??i0-~p ??"yh:?U*$? lu??~?' xA?? a?e?e?aA;??A?1<H$- ?????3e?I????Dy????(???O???]#X?bm1???AxP?^@cKB?:?????&????h?|?????H?L?,x?0?)x?X?"j?/???S3r&??L+?4???O#???$???P??^??? u?P?r?]L%e???q??~?S????#??d? ???;?a5qx?f?,c??????????v?D/?s;???????6?b>We???l?????z4 ?#c?l?g?y????+?????? *B????pw??j??}?Ki? 7?8??6B??n?BX?%?[U .y=h C?7?~\?????????Zu?`?=?d?s'???H????x??8 "j?|?????r??U?f6A???,9?FY??3B???Q?Gp(0?R?? ???~??`???bu??q b?????????I?s!? t??_.UVW????b????????_:? !??x?????????4??)??(S??S v???)C???3\????8n?????7l??Cbnx????z?Vwd?q?????l? ?l???????7???{?p??]?n?y???V?l1e??g???C???.)???/\p????_vM|?MAk?|???????~?2=????? e??(^A??4oVeo???Y?=p????R??????yT?x? ?(?O ?V?Kh8????anu????w???{pA?2?Z(+8?????3Y??????????7 ?=X_?6M??? ???,= R)S D????C???? 81@?l'?3???ka???6k?"?mn?t?mk#,?g?M.C??????h????J??????.??Z ???Zc?????????S?X ??????ST???;]????M?????R???M?)??h???~?????&?`???.))XAX?,????_? ?O???m ????t??PB??`?$>E;??S?(????K at jkt?_??????Q?????32?S??:?JC?| ?y????,?;?????;??0?zm^4?????I;??vt??/;?8K?bA???????{\?? ?????8?F%???TZY?W????cC?N?;???FMB??"c at q????v8??tZ??!^?x3D????~HmD c Vg?C?z??? ?? U1Y?R? ~?=~L?=???P????9??t??????? ~v??f???"??75)??S?v?g?j?#,?|(? ??U???W??e??????C?????)?????|?{s???????'R}q? ?V/???? 5??P?kY.????)G?4`?G?0N??iH?A?????????WL??f??w??~&?v?????C?f=f??Y????e?L?E<{)!c?????X??HEv???????D????=?8?lD?x????%6>?????~?)krjQ?^????n?8o?????&$? ??g?5r??? L??bO??][LOM )??ah2??????(\R|\4?Y?Y?)?.5QI+j??c&????[??|k?L??[N;-?G?wv???W[w????+?]? i??a ?-:???????K??[?Y?Vm )??}??zb'?o??G\(a??H???g?? vg????d/?_X?t???l???>?qo???H??9???6? z8?2?UI????>G??~???????w??????a????P??:1???5? ?f%??t?EpBc??k?U?Qnx???V????*??^N????eG??F?X\?1????t?/????(?$??W?U?p????@'i1???p??????Y?v?"2sN????7?????Nx?] ?-v:D???[?,?????j????n???>?MK*??????S?xaw??/&????- N[?9?B??ra?Z?k!XN???ru?v?nQU-+?L???A;?Y??FbW??ef???????7+%a?b?8&?????? ?'g?L "+??8??O??W???????k?I??G??qar????*????h]S--??????????a???Hs?? ???p????*q???M?xTr?d8o?6??^?p????>?NI???X?^?N?pf4???N?"{?I?'??Uq?"??/???g???U???e? ???kft?Z?X?H????G4???$???fp??b7???A??K??6$?~?R%??UG?\?O??^?C??n???g???I?.z?i?????s.?Mu??3?????((9?????i??????????s??f]e??5??OKT4???fH?v?t?tt}???C??S????d??(?_tZ?S?H?????????Nvx?E?Ja??#??v?NB?1?? ??%Q?j+?p???o/?:?? ?~fW?vS??????zU??g S?P?v( d??m?[?4]t??Va?$??j?Q???h??$GI????jZ??'eI????~??b$,Mi??????+??W?Y?????V0o?F?????)??????1?;???w?e??8FPsL??:?72N#?)?3?r??f 0J?0[??}Y??????R?{O???3g?^????V?Q?!? ?@??|D??+{%W}?'Z?'`????w9"?????V?`???h??;?R?b????????????6Z2N??????XjA? ?B`d?6T?q?_/?|?k?U?x??Q?ZS&?SG 8rt???1?}?N???????/u?e:Uj?k??????>kl0????q???s5?8??(?????O6?T?????y??c???"?tg?? ?uG?U?? toC&B7??wd??Y????Pq?~0,??.\G??D???????t?? ?W?VW?????T?)?G???A???C??H&?;???l????????? ????|b?????????f???????3j?iW+o?Ra?aA?W??M?2???f??b?% ?5e?O??9 e???@???Hu?,?x?6?OrVa? ?@??d?2?????+?A????(?? ?_(T???`v?dm??????e?H???[??M??3??i??\??!??? w\N} ???BE_f ?)?u??!?tRo????R?h%?YUH?????U? ???????CkO???8??iQ??5??!???[7>|???? Q?}q6?Y??3?n>??B??(?J9?????I??_P?,6??4F Y?z??N???Tij?vB??*/B/???\??)??????B?Tq??Rd/?-[FN;?^?X??????~????g%?????Yc?K??/V?A?6P???%?????A????????U ????G?y???Y????}? d??x?????j?7?X ???V???Q?? ??}???`i?q#???j?I?T???.?? ?q~ ??T"?????????y??i?X? ?Bx6O?tvVv???S?1???m.%+??}G,??Em?%?TB{B?j????$???\????9A????H??!8?>?7t%???m9d qCbA?5|?P?f???o3d?????|?z??i-Y?\?C;u?D?'?l ?.???????o.? ??FlX??`?P???">??P??K K?g?????{.&Z??:?m??N?kZ??U {??.????R?_E????X???P=?*?=??:'?????}$>?7??M???ix;Q????N??f???h?On???Z8?????*NZ ??c???? ?a?h???|??sb,????Dx??? '?Q3e?S?fi"??V+3? ? ?????Q????G' p???[_? ??s?????? '/?u???r????6?c????cCZ??f???/uV???8??vyP????????v?S??dQ?e=????-??I??g???-q?????z?z-??6?M??=o????Ot?G??L????M??j???{??I??:Q??>??Gs?&??Y?87?n=?:????????m?????hy_???4?????????Hc??????l????LW??f?M'? ?sX???.?U]?3?7B??????^g;?????m^? ???2]?^???{\?,zaT H?g#??T????$??,??E:h???=?????7?3Bi??????f?F?i??x???]????PKG??u --- NEW FILE OOWRITER_FILE_SAMPLE.odt --- PK Pf??7?;f???i??B??a<?f???m????/?c??x7?YFNR??3!??? 4??????R??CId?`?e?P? ?ZV???U[?:??t ?? ??P??v?p=\??}v*`5?l???>=?C?{I?????T??,???_?p?T? ?tU?6?'b??) ?B1x6,????tx{?S??C????#Xi??Z-?? ??Z?)?????9?.UC?7?Mw2 !{P?X?????/h?sx????0? ;VF?&???#??B??d?L???SI3?d4R?l?????? ?. ???;?'??=?????2}?GD8J1?r1???3??I|.KDR(!?q????rB?7????/????R?n;8?F+?~o??R4j?E4Y??I?-D?d??T\??+?c?9???&s?=???R?z$??J?e????F' ??l????q-????'?_Q?r?A??K?|+}N??/???m?A2??u?Z??i?????4?X??T?Lj-^? ???????&??h2N?Y?A???1]C?'p52?*???L6B??p ????X???a??:?p?-?b?-? 6**?1Uh(KB8??(?gLX(?? ???K?(tJ????`9G?0???\?l?/3????0??4W?q%tO?rQ) ?~?8?}t?Z1?B??5?S? ??1Z ???_A?dZi???r]?5,a ??T?????['?}j;-?ng?????v??XyJ)Jv?{???z?6?? ?0???BC???tt2d?8??j?Jh?DIr?Ae'F??[??#???T????p???!@????qH??L?????}^???????;B(p]}}j?!g1????F#????[?YC6?(?+?a?IVP^??}?M?@U?6?'??y???)ga????RH  -???a?`?=Y0?b{ V? c?b???R4??GuNt(??=$NFe?V???* B??S???G??N>/E???BzV9}${?($????f?@?? ?:W? ?!??`@??6??Rh?o??x2????????B????t??&G?????tM?k??0{??????? o?S??????6B5??P?%?? ??P?'?6?5;f???A??[k'?????????t??v i?N?`??????? ??^~&?=o??#NG??,???,??R!r???z]??R?l?d???}W&?nB?????h?? ?v?v?{!t)4Cg??K?w???FmPs?????,?!R??????5t$?oK??9{`??? ????Dl?^GMt?]???c???{????H?x??/"???H}?"R?^D??E??_Dj2yn??qs?` TP??_????{x????S???8p?^?"?P\?9???{l?c??????l??u?? ?? ?44H(?????z]???t?????A?+????.?????9[iG?e*??B?_???p?|q*OpenOffice.org/3.0$Linux OpenOffice.org_project/300m15$Build-93792005-04-10T04:03:112009-02-12T13:00:04en-US4PT3M34SJiri SkalaPK ??b``???p ??8????? L <]C*????P?AA?????2??rT?Rr? S??R??'$z????? ?"??qM??L? ??~.??? ?4M??????N??r!??^?s6'_U?\?^??M?~`iL??T,????????BS???8?????,??C??????6??B??Y?[??m???? ?d???R 7n???)O;`~?3%lrC??9????P ?)i????? ????C??????]?3Xb???7? S???VU'ri????y??8@??*9?~??Pzr??Lj?5? ??*]{?E???????C??O??????6?l??a@?$ ?(??$b??????/???????W\l??d_?k?.P??? {????{X?u{?T?`K?z]^HQ???K7???M???nL|?d?o]Ru at S???y?No?~????{??x??*????????????k1u????u??6x ?'(???r??yi??~?4G??'???5?h??W?F????~??Qe??C??n????MW????F???????????X\???????%?E?\???'4c5?`?f??L??v?gWjrt??????k???m=???t7??j??m?Kf???t?? .?"??????I?? ?s?{?P.M???N?G??j???????? ?eHX;a?JL?M? ???*?? ?qh?????????`(p?p?"cE&?$B?>????R?wy"?p?%}??`???a-)&1 | tee -i $work.log else - echo "Invalid parameter" - exit 1 + exit 0 fi -{ -startup -$work -cleanup 0 -} 2>&1 | tee -i $work.log - --- bltk-1.0.8/wl_office/scen_install 2006-03-08 10:12:07.000000000 +0100 +++ bltk-1.0.9/wl_office/scen_install 2009-02-12 13:19:34.000000000 +0100 @@ -1,7 +1,7 @@ ## Installation scenario -RUNCMD X 0 0 bltk_wl_office_run_app OOWRITER_FILE.sxw -SETWINDOW 0 0 0 OOWRITER_FILE.sxw +RUNCMD X 0 0 bltk_wl_office_run_app OOWRITER_FILE.odt +SETWINDOW 0 0 0 OOWRITER_FILE.odt SETWINDOW 0 0 0 OpenOffice.org Registration FOCUSIN 0 0 100 0 @@ -20,7 +20,7 @@ DELAY 0 0 2000 0 ENDWINDOW 0 0 0 Paragraph Styles -SETWINDOW 0 0 0 OOWRITER_FILE.sxw +SETWINDOW 0 0 0 OOWRITER_FILE.odt FOCUSIN 0 0 100 0 DELAY 0 0 2000 0 @@ -30,7 +30,7 @@ PRESSKEY 0 0 6000 Return DELAY 0 0 2000 0 -ENDWINDOW 0 0 0 OOWRITER_FILE.sxw +ENDWINDOW 0 0 0 OOWRITER_FILE.odt WAITFINISHCMD 0 0 0 soffice.bin --- bltk-1.0.8/wl_office/scen 2006-03-08 10:12:07.000000000 +0100 +++ bltk-1.0.9/wl_office/scen 2009-02-23 23:56:27.000000000 +0100 @@ -5,9 +5,9 @@ ##################################################################### # action state count delay string -RUNCMD X 0 0 bltk_wl_office_run_app OOWRITER_FILE.sxw +RUNCMD X 0 0 bltk_wl_office_run_app OOWRITER_FILE.odt -SETWINDOW 0 0 0 OOWRITER_FILE.sxw +SETWINDOW 0 0 0 OOWRITER_FILE.odt SENDWORKMSG 0 0 0 writer_open @@ -21,7 +21,7 @@ DELAY 0 0 3000 0 PRESSKEY A 0 1000 e -PRESSKEY 0 11 150 Down +PRESSKEY 0 0 150 f DELAY 0 0 2000 0 PRESSKEY 0 0 2000 Return @@ -34,7 +34,7 @@ DELAY 0 0 2000 0 PRESSKEY A 0 3000 l -SETWINDOW 0 0 0 \"OpenOffice.org 1.1.4 \": +SETWINDOW 0 0 0 \"OpenOffice.org .* \": FOCUSIN 0 0 150 0 DELAY 0 0 3000 0 @@ -42,7 +42,7 @@ RELEASEKEY 0 0 1000 Return DELAY 0 0 2000 0 -ENDWINDOW 0 0 0 \"OpenOffice.org 1.1.4 \": +ENDWINDOW 0 0 0 \"OpenOffice.org .* \": SETWINDOW 0 0 0 Find & Replace @@ -51,7 +51,7 @@ ENDWINDOW 0 0 0 Find & Replace -SETWINDOW 0 0 0 OOWRITER_FILE.sxw +SETWINDOW 0 0 0 OOWRITER_FILE.odt FOCUSIN 0 0 150 0 PRESSKEY 0 10 150 Down @@ -63,15 +63,13 @@ DELAY 0 0 3000 0 PRESSKEY A 0 1000 f -PRESSKEY 0 4 150 Down +PRESSKEY 0 0 150 s DELAY 0 0 2000 0 -PRESSKEY 0 0 5000 Return PRESSKEY A 0 1000 f -PRESSKEY 0 17 150 Down +PRESSKEY 0 0 150 x DELAY 0 0 3000 0 -PRESSKEY 0 0 6000 Return -ENDWINDOW 0 0 0 OOWRITER_FILE.sxw +ENDWINDOW 0 0 0 OOWRITER_FILE.odt WAITFINISHCMD 0 0 0 soffice.bin @@ -81,9 +79,9 @@ ### CALC ##################################################################### -RUNCMD X 0 0 bltk_wl_office_run_app OOCALC_FILE.sxc +RUNCMD X 0 0 bltk_wl_office_run_app OOCALC_FILE.ods -SETWINDOW 0 0 0 OOCALC_FILE.sxc +SETWINDOW 0 0 0 OOCALC_FILE.ods SENDWORKMSG 0 0 0 calc_open FOCUSIN 0 0 150 0 @@ -156,16 +154,14 @@ DELAY 0 0 3000 0 PRESSKEY A 0 1000 f -PRESSKEY 0 4 150 Down +PRESSKEY 0 0 150 s DELAY 0 0 2000 0 -PRESSKEY 0 0 5000 Return DELAY 0 0 3000 0 PRESSKEY A 0 1000 f -PRESSKEY 0 17 150 Down +PRESSKEY 0 0 150 x DELAY 0 0 3000 0 -PRESSKEY 0 0 5000 Return -ENDWINDOW 0 0 0 OOCALC_FILE.sxc +ENDWINDOW 0 0 0 OOCALC_FILE.ods WAITFINISHCMD 0 0 0 soffice.bin @@ -176,9 +172,9 @@ ### DRAW ##################################################################### -RUNCMD X 0 0 bltk_wl_office_run_app OODRAW_FILE.sxd +RUNCMD X 0 0 bltk_wl_office_run_app OODRAW_FILE.odg -SETWINDOW 0 0 0 OODRAW_FILE.sxd +SETWINDOW 0 0 0 OODRAW_FILE.odg SENDWORKMSG 0 0 0 draw_open FOCUSIN 0 0 150 0 @@ -187,7 +183,7 @@ PRESSKEY 0 0 1000 Tab PRESSKEY A 0 1000 e -PRESSKEY 0 9 150 Down +PRESSKEY 0 0 150 e DELAY 0 0 1000 0 PRESSKEY 0 0 500 Return @@ -201,7 +197,7 @@ ENDWINDOW 0 0 0 Duplicate -SETWINDOW 0 0 0 OODRAW_FILE.sxd +SETWINDOW 0 0 0 OODRAW_FILE.odg FOCUSIN 0 0 150 0 DELAY 0 0 2000 0 @@ -224,7 +220,7 @@ DELAY 0 0 3000 0 PRESSKEY A 0 1000 v -PRESSKEY 0 0 500 Return +PRESSKEY 0 0 500 z SETWINDOW 0 0 0 Zoom @@ -237,98 +233,20 @@ ENDWINDOW 0 0 0 Zoom -SETWINDOW 0 0 0 OODRAW_FILE.sxd +SETWINDOW 0 0 0 OODRAW_FILE.odg FOCUSIN 0 0 150 0 DELAY 0 0 2000 0 -PRESSKEY A 0 1000 i -PRESSKEY 0 8 150 Down -DELAY 0 0 1000 0 -PRESSKEY 0 1 500 Return - -DELAY 0 0 3000 0 - -TYPETEXT 0 0 150 Name -PRESSKEY 0 0 1000 Right -TYPETEXT 0 0 150 Workdays -PRESSKEY 0 0 1000 Right -TYPETEXT 0 0 150 Pay Rate -PRESSKEY 0 0 1000 Right -TYPETEXT 0 0 150 Salary -PRESSKEY 0 0 1000 Down -PRESSKEY 0 3 500 Left - -DELAY 0 0 3000 0 -TYPETEXT 0 0 150 John -PRESSKEY 0 0 1000 Down -TYPETEXT 0 0 150 Jane -PRESSKEY 0 0 1000 Down -TYPETEXT 0 0 150 Sam -PRESSKEY 0 0 1000 Down -TYPETEXT 0 0 150 Sarah -PRESSKEY 0 0 1000 Right -PRESSKEY 0 3 500 Up - -DELAY 0 0 3000 0 -TYPETEXT 0 0 150 12 -PRESSKEY 0 0 1000 Down -TYPETEXT 0 0 150 20 -PRESSKEY 0 0 1000 Down -TYPETEXT 0 0 150 15 -PRESSKEY 0 0 1000 Down -TYPETEXT 0 0 150 10 -PRESSKEY 0 0 1000 Right -PRESSKEY 0 3 500 Up - -DELAY 0 0 3000 0 -TYPETEXT 0 0 150 25 -PRESSKEY 0 0 1000 Down -TYPETEXT 0 0 150 20 -PRESSKEY 0 0 1000 Down -TYPETEXT 0 0 150 25 -PRESSKEY 0 0 1000 Down -TYPETEXT 0 0 150 40 -PRESSKEY 0 0 1000 Right -PRESSKEY 0 3 500 Up - -DELAY 0 0 3000 0 -TYPETEXT 0 0 300 =b2*c2 -DELAY 0 0 1000 0 -PRESSKEY 0 0 1000 Return -PRESSKEY 0 0 1000 Up -PRESSKEY C 0 1000 c -PRESSKEY 0 0 200 Down -PRESSKEY S 2 500 Down -PRESSKEY C 0 1000 v - -DELAY 0 0 3000 0 -PRESSKEY 0 0 1000 Down -TYPETEXT 0 0 300 =sum( -PRESSKEY 0 0 500 Up -PRESSKEY S 3 500 Up -TYPETEXT 0 0 500 ) -DELAY 0 0 1000 0 -PRESSKEY 0 0 1000 Return - -DELAY 0 0 3000 0 -PRESSKEY 0 0 1000 Left -PRESSKEY 0 0 1000 Up -TYPETEXT 0 0 150 Total Pays - -DELAY 0 0 3000 0 -PRESSKEY 0 3 3000 Esc PRESSKEY A 0 1000 f -PRESSKEY 0 4 150 Down +PRESSKEY 0 0 150 s DELAY 0 0 2000 0 -PRESSKEY 0 0 5000 Return PRESSKEY A 0 1000 f -PRESSKEY 0 16 150 Down +PRESSKEY 0 0 150 x DELAY 0 0 3000 0 -PRESSKEY 0 0 5000 Return -ENDWINDOW 0 0 0 OODRAW_FILE.sxd +ENDWINDOW 0 0 0 OODRAW_FILE.odg WAITFINISHCMD 0 0 0 soffice.bin Binary files bltk-1.0.8/wl_office/OODRAW_FILE_SAMPLE.odg and bltk-1.0.9/wl_office/OODRAW_FILE_SAMPLE.odg differ --- bltk-1.0.8/wl_office/bltk_wl_office_run_app.sh 2006-05-03 14:17:44.000000000 +0200 +++ bltk-1.0.9/wl_office/bltk_wl_office_run_app.sh 2009-02-09 14:21:13.000000000 +0100 @@ -38,12 +38,14 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # +. /etc/bltk.conf unalias -a SOFFICE_FLG="-minimized -invisible -norestore -quickstart -nologo -nolockcheck -nodefault" +WL_OFFICE_WORKING_DIR=${WL_OFFICE_WORKING_DIR:-"~/.bltk"} -$SOFFICE_PROG $SOFFICE_FLG $1 & +$SOFFICE_PROG $SOFFICE_FLG $WL_OFFICE_WORKING_DIR/$1 & exit $? Binary files bltk-1.0.8/wl_office/OOWRITER_FILE_SAMPLE.odt and bltk-1.0.9/wl_office/OOWRITER_FILE_SAMPLE.odt differ Binary files bltk-1.0.8/wl_office/OOCALC_FILE_SAMPLE.ods and bltk-1.0.9/wl_office/OOCALC_FILE_SAMPLE.ods differ --- bltk-1.0.8/wl_office/Makefile 2006-03-13 07:48:17.000000000 +0100 +++ bltk-1.0.9/wl_office/Makefile 2009-02-25 11:37:19.000000000 +0100 @@ -1,6 +1,6 @@ CFLAGS = -Wall -pedantic -std=c99 -g -O2 -I../include -LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lxse -L../lib +LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 ../lib/libxse.so.0 -Wl,-rpath,/usr/lib/bltk BIN = bin @@ -18,7 +18,7 @@ DATAFILES = scen_install response_install DATATARGETS = $(DATAFILES:%=$(BIN)/%) -EXTERN_DEPS = $(HIDERS) ../lib/libxse.so +EXTERN_DEPS = $(HIDERS) ../lib/libxse.so.0 all : $(BIN) $(SUBDIRS) $(TARGET) $(TARGET1) $(TARGET2) $(SHTARGETS) $(DATATARGETS) --- bltk-1.0.8/wl_office/bltk_wl_office.sh 2006-05-03 14:17:44.000000000 +0200 +++ bltk-1.0.9/wl_office/bltk_wl_office.sh 2009-02-24 14:31:36.000000000 +0100 @@ -38,11 +38,14 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # +. /etc/bltk.conf source `dirname $0`/../../bin/bltk_wl_common [[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; } XSE_PROG="bltk_wl_office_xse" +WL_OFFICE_WORKING_DIR=${WL_OFFICE_WORKING_DIR:-"~/.bltk"} +export USER_DELAY_TMP=$BLTK_HOME/user_delay.tmp startup() { @@ -56,7 +59,14 @@ wl_check_install office wl_check_error $? - export SOFFICE_PROG=$BLTK_EXTERN_TGT_WL_OFFICE/OOo/soffice + wl_install_file 0644 text1 $WL_OFFICE_WORKING_DIR/text1 + wl_check_error $? + wl_install_file 0644 text2 $WL_OFFICE_WORKING_DIR/text2 + wl_check_error $? + wl_install_file 0644 text3 $WL_OFFICE_WORKING_DIR/text3 + wl_check_error $? + + export SOFFICE_PROG=${SOFFICE_PROG:-"$BLTK_EXTERN_TGT_WL_OFFICE/OOo/soffice"} BLTK_WL_OFFICE_SCEN=$BLTK_WL_FILE @@ -83,29 +93,29 @@ { ST_TIME=`$BLTK_TIME_CMD` - wl_remove_file OOWRITER_FILE.sxw + wl_remove_file $WL_OFFICE_WORKING_DIR/OOWRITER_FILE.odt wl_check_error $? - wl_copy_file OOWRITER_FILE_SAMPLE.sxw OOWRITER_FILE.sxw + wl_install_file 0644 OOWRITER_FILE_SAMPLE.odt $WL_OFFICE_WORKING_DIR/OOWRITER_FILE.odt wl_check_error $? - wl_copy_file OOCALC_FILE_SAMPLE.sxc OOCALC_FILE.sxc + wl_remove_file O$WL_OFFICE_WORKING_DIR/OCALC_FILE.ods wl_check_error $? - wl_remove_file OOCALC_FILE.sxw + wl_install_file 0644 OOCALC_FILE_SAMPLE.ods $WL_OFFICE_WORKING_DIR/OOCALC_FILE.ods wl_check_error $? - wl_copy_file OODRAW_FILE_SAMPLE.sxd OODRAW_FILE.sxd + wl_remove_file $WL_OFFICE_WORKING_DIR/OODRAW_FILE.odg wl_check_error $? - wl_remove_file OODRAW_FILE.sxw + wl_install_file 0644 OODRAW_FILE_SAMPLE.odg $WL_OFFICE_WORKING_DIR/OODRAW_FILE.odg wl_check_error $? - wl_remove_file ./user_delay.tmp + wl_remove_file $USER_DELAY_TMP wl_check_error $? if [[ $BLTK_WL_OFFICE_SCEN = DEBUG ]] then sleep 1 - echo 0.11 > ./user_delay.tmp - wl_check_error $? "echo 1.11 >./user_delay.tmp failed" + echo 0.11 > $USER_DELAY_TMP + wl_check_error $? "echo 1.11 > $USER_DELAY_TMP failed" elif [[ -f "$BLTK_WL_OFFICE_SCEN" ]] then CMD="$BLTK_WL_BIN/$XSE_PROG $BLTK_WL_OFFICE_SCEN" @@ -115,7 +125,7 @@ wl_check_error 1 "Cannot access $BLTK_WL_OFFICE_SCEN" fi - CMD="cat ./user_delay.tmp" + CMD="cat $USER_DELAY_TMP" DELAY_TIME=`$CMD` wl_check_error $? "$CMD failed" @@ -180,7 +190,12 @@ exit $1 } -startup -run -cleanup 0 +if [ "$WL_OFFICE_ENABLED" = "YES" ] +then + startup + run + cleanup 0 +else + exit 0 +fi --- bltk-1.0.8/include/parseconf.h 1970-01-01 01:00:00.000000000 +0100 +++ bltk-1.0.9/include/parseconf.h 2009-02-23 16:38:35.000000000 +0100 @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2009 Red Hat Inc. + * Copyright (c) 2009 Jiri Skala + * All rights reserved. + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * Neither the name of Intel Corporation nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + */ + +#ifndef __PARSECONF_H__ +#define __PARSECONF_H__ + +extern char *bltk_home; +extern char *soffice_prog; +extern char *wl_office_working_dir; +extern char *bltk_player_prog; +extern char *bltk_player_file; +extern char *bltk_reader_prog; + +extern int wl_developer_enabled; +extern int wl_developer_extern; +extern int wl_game_enabled; +extern int wl_game_extern; +extern int wl_office_enabled; +extern int wl_office_extern; +extern int wl_player_enabled; +extern int wl_player_extern; +extern int wl_reader_enabled; +extern int wl_reader_extern; + +#endif + --- bltk-1.0.8/include/xse.h 2007-02-25 08:24:29.000000000 +0100 +++ bltk-1.0.9/include/xse.h 2009-02-11 13:28:43.000000000 +0100 @@ -87,7 +87,8 @@ #define DELAY_1_MIN (1 * 60 * 1000) #define DELAY_2_MIN (2 * 60 * 1000) #define WINDOWID "WINDOWID" -#define DELAY_FILE "./user_delay.tmp" +#define DELAY_FILE "user_delay.tmp" +#define WINID_FILE "winid.tmp" #define VI_CMD "vi" #define CSCOPE_CMD "cscope" #define F4 "F4" --- bltk-1.0.8/wl_player/bltk_wl_player_make_binary.sh 2006-03-08 10:12:07.000000000 +0100 +++ bltk-1.0.9/wl_player/bltk_wl_player_make_binary.sh 2009-02-16 11:25:51.000000000 +0100 @@ -108,9 +108,13 @@ return 0 } -{ -startup -make_mplayer_bin -cleanup 0 -} - +if [[ "$WL_PLAYER_ENABLED" = "YES" && "$WL_PLAYER_EXTERN" = "YES" ]] +then + { + startup + make_mplayer_bin + cleanup 0 + } +else + exit 0 +fi --- bltk-1.0.8/wl_player/bltk_wl_player_install.sh 2006-11-19 03:53:26.000000000 +0100 +++ bltk-1.0.9/wl_player/bltk_wl_player_install.sh 2009-02-04 17:08:00.000000000 +0100 @@ -38,6 +38,7 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # +. /etc/bltk.conf source `dirname $0`/../../bin/bltk_wl_common [[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; } @@ -284,9 +285,14 @@ exit 1 fi -{ -startup -$work -cleanup 0 -} 2>&1 | tee -i $work.log +if [[ "$WL_PLAYER_ENABLED" = "YES" && "$WL_PLAYER_EXTERN" = "YES" ]] +then + { + startup + $work + cleanup 0 + } 2>&1 | tee -i $work.log +else + exit 0 +fi --- bltk-1.0.8/wl_player/bltk_wl_player.sh 2006-11-17 15:16:31.000000000 +0100 +++ bltk-1.0.9/wl_player/bltk_wl_player.sh 2009-02-16 11:22:39.000000000 +0100 @@ -38,6 +38,9 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # +BLTK_PLAYER_PROG_FLG= + +. /etc/bltk.conf source `dirname $0`/../../bin/bltk_wl_common [[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; } @@ -52,22 +55,22 @@ wl_check_install player wl_check_error $? - if [[ $BLTK_WL_FILE = DEBUG ]] + if [[ $BLTK_PLAYER_FILE = DEBUG ]] then - BLTK_WL_FILE= + BLTK_PLAYER_FILE= fi - if [[ -z $BLTK_WL_FILE ]] + if [[ -z $BLTK_PLAYER_FILE ]] then - BLTK_WL_FILE="dvd://" + BLTK_PLAYER_FILE="dvd://" fi - if [[ -z $BLTK_WL_PROG ]] - then - BLTK_WL_PROG=$BLTK_EXTERN_TGT_WL_PLAYER/mplayer/bin/mplayer - fi - if [[ -z $BLTK_WL_PROG_FLG ]] + if [[ -z $BLTK_PLAYER_PROG ]] then - BLTK_WL_PROG_FLG="-fs -quiet" + BLTK_PLAYER_PROG=$BLTK_EXTERN_TGT_WL_PLAYER/mplayer/bin/mplayer + if [[ -z $BLTK_PLAYER_PROG_FLG ]] + then + BLTK_PLAYER_PROG_FLG="-fs -quiet" + fi fi if [[ -z $BLTK_SHOW_DEMO_NUM ]] @@ -79,13 +82,13 @@ export BLTK_SHOW_DEMO_TIME=60 fi - wl_check_prog $BLTK_WL_PROG + wl_check_prog $BLTK_PLAYER_PROG wl_check_error $? - wl_check_run_prog $BLTK_WL_PROG + wl_check_run_prog $BLTK_PLAYER_PROG wl_check_error $? - wl_check_all_run_prog $BLTK_WL_PROG + wl_check_all_run_prog $BLTK_PLAYER_PROG wl_check_error $? set_dvd_config ### env | sort >env.log @@ -116,14 +119,14 @@ { ST_TIME=`$BLTK_TIME_CMD` - CMD="$BLTK_WL_PROG $BLTK_WL_PROG_FLG $BLTK_WL_FILE" + CMD="$BLTK_PLAYER_PROG $BLTK_WL_PROG_FLG $BLTK_PLAYER_FILE" if [[ $BLTK_SHOW_DEMO = TRUE && $BLTK_SHOW_DEMO_TIME != 0 ]] then $CMD & wl_check_error $? "CMD faiuled" pid=$! sleep $BLTK_SHOW_DEMO_TIME - prog=`basename $BLTK_WL_PROG` + prog=`basename $BLTK_PLAYER_PROG` pgrep $prog wl_check_error $? "$prog is not running" /bin/kill -QUIT $pid >/dev/null 2>&1 @@ -174,7 +177,12 @@ exit $1 } -startup -run -cleanup 0 +if [ "$WL_PLAYER_ENABLED" = "YES" ] +then + startup + run + cleanup 0 +else + exit 0 +fi --- bltk-1.0.8/wl_game/bltk_wl_game_install.sh 2006-10-17 15:40:14.000000000 +0200 +++ bltk-1.0.9/wl_game/bltk_wl_game_install.sh 2009-02-04 17:08:00.000000000 +0100 @@ -38,6 +38,7 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # +. /etc/bltk.conf source `dirname $0`/../../bin/bltk_wl_common [[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; } @@ -167,9 +168,14 @@ exit 1 fi -{ -startup -$work -cleanup 0 -} 2>&1 | tee -i $work.log +if [[ "$WL_GAME_ENABLED" = "YES" && "$WL_GAME_EXTERN" = "YES" ]] +then + { + startup + $work + cleanup 0 + } 2>&1 | tee -i $work.log +else + exit 0 +fi --- bltk-1.0.8/wl_game/Makefile 2006-03-13 07:47:42.000000000 +0100 +++ bltk-1.0.9/wl_game/Makefile 2009-02-25 11:36:34.000000000 +0100 @@ -1,6 +1,6 @@ CFLAGS = -Wall -pedantic -std=c99 -g -O2 -I../include -LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lxse -L../lib +LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 ../lib/libxse.so.0 -Wl,-rpath,/usr/lib/bltk BIN = bin @@ -18,7 +18,7 @@ DATAFILES = DATATARGETS = $(DATAFILES:%=$(BIN)/%) -EXTERN_DEPS = $(HIDERS) ../lib/libxse.so +EXTERN_DEPS = $(HIDERS) ../lib/libxse.so.0 all : $(BIN) $(SUBDIRS) $(TARGET) $(TARGET1) $(TARGET2) $(SHTARGETS) $(DATATARGETS) --- bltk-1.0.8/wl_game/bltk_wl_game.sh 2006-05-03 14:17:44.000000000 +0200 +++ bltk-1.0.9/wl_game/bltk_wl_game.sh 2009-02-24 10:48:10.000000000 +0100 @@ -38,6 +38,7 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # +. /etc/bltk.conf source `dirname $0`/../../bin/bltk_wl_common [[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; } @@ -196,7 +197,15 @@ exit $1 } -startup -run -cleanup 0 +if [ $WL_GAME_ENABLED = "YES" ] +then + startup + run + cleanup 0 +else + TTY=`tty` + echo "WARNING!!!" > $TTY 2>&1 + echo "The game workload is disabled. Read manual and use external package." > $TTY 2>&1 + exit 0 +fi --- bltk-1.0.8/wl_reader/bltk_wl_reader_install.sh 2006-05-03 14:17:44.000000000 +0200 +++ bltk-1.0.9/wl_reader/bltk_wl_reader_install.sh 2009-02-04 17:08:00.000000000 +0100 @@ -38,6 +38,7 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # +. /etc/bltk.conf source `dirname $0`/../../bin/bltk_wl_common [[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; } @@ -92,9 +93,14 @@ exit 1 fi -{ -startup -$work -cleanup 0 -} 2>&1 | tee -i $work.log +if [[ "$WL_READER_ENABLED" = "YES" && "$WL_READER_EXTERN" = "YES" ]] +then + { + startup + $work + cleanup 0 + } 2>&1 | tee -i $work.log +else + exit 0 +fi --- bltk-1.0.8/wl_reader/bltk_wl_reader_xse.c 2007-02-25 08:24:29.000000000 +0100 +++ bltk-1.0.9/wl_reader/bltk_wl_reader_xse.c 2009-02-25 09:40:55.000000000 +0100 @@ -60,8 +60,10 @@ static xse_scen_t scen[] = { {SETWINDOWID, 0, 0, 0, WINDOWID}, - {FOCUSIN, 0, 0, DELAY_2_MIN, 0}, /* LINE_FOCUSIN */ - {PRESSKEY, 0, -1, DELAY_2_MIN, Next}, /* LINE_NEXT */ +// {FOCUSIN, 0, 0, DELAY_2_MIN, 0}, /* LINE_FOCUSIN */ +// {PRESSKEY, 0, -1, DELAY_2_MIN, Next}, /* LINE_NEXT */ + {FOCUSIN, 0, 0, 1000, 0}, /* LINE_FOCUSIN */ + {PRESSKEY, 0, -1, 1000, Next}, /* LINE_NEXT */ {DELAY, 0, 0, 1000, 0}, {PRESSKEY, C, 0, 1000, "W"}, /* LINE_QUIT */ {ENDWINDOW, 0, 0, 0, "title_not_set"}, /* LINE_END */ @@ -108,7 +110,7 @@ } } - env = getenv("BLTK_WL_PROG"); + env = getenv("BLTK_READER_PROG"); if (env && strcmp(env, "konqueror") == 0) { scen[LINE_QUIT].string = "Q"; } --- bltk-1.0.8/wl_reader/bltk_wl_reader.sh 2006-05-03 14:17:44.000000000 +0200 +++ bltk-1.0.9/wl_reader/bltk_wl_reader.sh 2009-02-24 10:23:11.000000000 +0100 @@ -38,6 +38,7 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # +. /etc/bltk.conf source `dirname $0`/../../bin/bltk_wl_common [[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; } @@ -47,6 +48,8 @@ DEF_FILE="war_and_peace.html" XSE_PROG="bltk_wl_reader_xse" +WL_READER_WORKING_DIR=${WL_READER_WORKING_DIR:-"~/.bltk"} +export USER_DELAY_TMP=$BLTK_HOME/user_delay.tmp startup() { @@ -58,35 +61,35 @@ ### wl_check_install reader ### wl_check_error $? - if [[ -z $BLTK_WL_PROG ]] + if [[ -z $BLTK_READER_PROG ]] then - export BLTK_WL_PROG=$DEF_BROWSER - export BLTK_WL_PROG_FLG= + export BLTK_READER_PROG=$DEF_BROWSER + export BLTK_READER_PROG_FLG= fi - wl_check_prog $BLTK_WL_PROG + wl_check_prog $BLTK_READER_PROG wl_check_error $? - wl_check_run_prog $BLTK_WL_PROG + wl_check_run_prog $BLTK_READER_PROG wl_check_error $? - echo "Browser $BLTK_WL_PROG" + echo "Browser $BLTK_READER_PROG" - wl_check_all_run_prog $BLTK_WL_PROG + wl_check_all_run_prog $BLTK_READER_PROG wl_check_error $? tmp_reader_file=/tmp/$DEF_FILE - if [[ $BLTK_WL_FILE = DEBUG ]] + if [[ $BLTK_READER_FILE = DEBUG ]] then - BLTK_WL_FILE= + BLTK_READER_FILE= fi - if [[ ! -z $BLTK_WL_FILE ]] + if [[ ! -z $BLTK_READER_FILE ]] then - reader_file=$BLTK_WL_FILE + reader_file=$BLTK_READER_FILE title="$BLTK_WL_TITLE" - flags="$BLTK_WL_PROG_FLG" + flags="$BLTK_READER_PROG_FLG" else default_flg=TRUE reader_file=$DEF_FILE @@ -139,13 +142,13 @@ { ST_TIME=`$BLTK_TIME_CMD` - rm -f ./user_delay.tmp + rm -f $USER_DELAY_TMP - CMD="$BLTK_WL_PROG $BLTK_WL_PROG_FLG $reader_file" + CMD="$BLTK_READER_PROG $BLTK_WL_PROG_FLG $reader_file" $CMD & wl_check_error $? "$CMD failed" - BLTK_WL_ALL_PROC_NAME="$BLTK_WL_ALL_PROC_NAME $BLTK_WL_PROG" + BLTK_WL_ALL_PROC_NAME="$BLTK_WL_ALL_PROC_NAME $BLTK_READER_PROG" windowid=`bltk_winid -S "$title"` wl_check_error $? "Cannot get windowid of $BLTK_WL_PRO" @@ -161,7 +164,7 @@ BLTK_WL_PROC_NAME="$BLTK_WL_PROC_NAME $XSE_PROG" - CMD="cat ./user_delay.tmp" + CMD="cat $USER_DELAY_TMP" DELAY_TIME=`$CMD` wl_check_error $? "$CMD failed" @@ -200,7 +203,12 @@ exit $1 } -startup -run -cleanup 0 +if [ "$WL_READER_ENABLED" = "YES" ] +then + startup + run + cleanup 0 +else + exit 0 +fi --- bltk-1.0.8/wl_reader/Makefile 2006-03-13 07:47:51.000000000 +0100 +++ bltk-1.0.9/wl_reader/Makefile 2009-02-25 11:33:06.000000000 +0100 @@ -1,6 +1,6 @@ CFLAGS = -Wall -pedantic -std=c99 -g -O2 -I../include -LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lxse -L ../lib +LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 ../lib/libxse.so.0 -Wl,-rpath,/usr/lib/bltk BIN = bin @@ -17,7 +17,7 @@ SHFILES_SH = ${SHFILES:=.sh} SHTARGETS = $(SHFILES:%=$(BIN)/%) -EXTERN_DEPS = $(HIDERS) ../lib/libxse.so +EXTERN_DEPS = $(HIDERS) ../lib/libxse.so.0 all : $(BIN) $(SUBDIRS) $(TARGETS) $(SHTARGETS) FORCE --- bltk-1.0.8/tools/xse/Makefile 2006-03-11 11:44:27.000000000 +0100 +++ bltk-1.0.9/tools/xse/Makefile 2009-02-25 10:15:55.000000000 +0100 @@ -1,10 +1,10 @@ CFLAGS = -Wall -pedantic -std=c99 -g -O2 -I ../../include -fPIC -LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 +LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -Wl,-soname -Wl,libxse.so.0 LIB = ../../lib -LIBNAME = libxse.so +LIBNAME = libxse.so.0 TARGET = $(LIB)/$(LIBNAME) FILES = xse OFILES = ${FILES:=.o} --- bltk-1.0.8/tools/xse/xse.c 2007-02-25 08:24:29.000000000 +0100 +++ bltk-1.0.9/tools/xse/xse.c 2009-02-12 13:05:10.000000000 +0100 @@ -62,6 +62,8 @@ int check_delay_time_flg = 0; int correct_delay_time_flg = 0; +char winid_tmp[STR_LEN]; + long double user_delay = 0; static Display *display = NULL; @@ -412,8 +414,10 @@ char string[STR_LEN]; if (fname == 0) { - fname = DELAY_FILE; + snprintf(string, STR_LEN, "%s/%s", getenv("BLTK_HOME"), DELAY_FILE); + fname = strdup(string); } + fprintf(stderr, "user delay file: %s\n", fname); fd = open(fname, O_RDWR | O_TRUNC | O_CREAT, 0666); if (fd < 0) { @@ -504,8 +508,8 @@ int ret = 0; char cmd[STR_LEN]; - (void)sprintf(cmd, "bltk_winid -S -t %d -s %d \"%s\" >./winid.tmp", - wait_time, sleep_time, title); + (void)sprintf(cmd, "bltk_winid -S -t %d -s %d \"%s\" > %s", + wait_time, sleep_time, title, winid_tmp); ret = system(cmd); if (ret != 0) { (void)fprintf(stderr, "%s failed\n", cmd); @@ -519,7 +523,7 @@ int ret = 0; char cmd[STR_LEN]; - (void)sprintf(cmd, "bltk_winid -S \"%s\" >./winid.tmp", title); + (void)sprintf(cmd, "%s/bin/bltk_winid -S \"%s\" > %s", getenv("BLTK_ROOT"), title, winid_tmp); ret = system(cmd); if (ret != 0) { (void)fprintf(stderr, "%s failed\n", cmd); @@ -549,7 +553,7 @@ int ret = 0; char cmd[STR_LEN]; - (void)sprintf(cmd, "bltk_winid -F \"%s\"", title); + (void)sprintf(cmd, "%s/bin/bltk_winid -F \"%s\"", getenv("BLTK_ROOT"), title); ret = system(cmd); if (ret != 0) { (void)fprintf(stderr, "%s failed\n", cmd); @@ -1096,7 +1100,7 @@ } else { get_winid_action(string); } - readf_action("./winid.tmp", count, delay_time); + readf_action(winid_tmp, count, delay_time); setwinid_action(string, xchg_buf, delay_time); delay_time = 0; break; @@ -1194,6 +1198,7 @@ void init_xse() { + snprintf(winid_tmp, sizeof winid_tmp, "%s/%s", getenv("BLTK_HOME"), WINID_FILE); display = XOpenDisplay(NULL); if (display == NULL) { (void)fprintf(stderr, "%s: Cannot open Display\n", progname); --- bltk-1.0.8/tools/bltk/main.c 2007-02-25 08:24:29.000000000 +0100 +++ bltk-1.0.9/tools/bltk/main.c 2009-02-24 11:23:49.000000000 +0100 @@ -57,6 +57,7 @@ #include #include "bltk.h" +#include "parseconf.h" #define OUTPUT_CONSOLE 10 #define OUTPUT_FILE 20 @@ -206,6 +207,7 @@ char *bltk_dirname = NULL; char bltk_root[STR_LEN]; +//char bltk_home[STR_LEN]; char bltk_extern[STR_LEN]; char *workload = NULL; @@ -960,12 +962,13 @@ char str[STR_LEN]; int ret, i; - (void)unlink(LAST_RESULTS); - ret = symlink(results, LAST_RESULTS); + sprintf(str, "%s/%s", bltk_home, LAST_RESULTS); + (void)unlink(str); + ret = symlink(results, str); if (ret != 0) { (void)sprintf(prt_str, "symlink(%s, %s) failed, " "errno %d (%s)\n", - results, LAST_RESULTS, errno, strerror(errno)); + results, str, errno, strerror(errno)); write_to_err_log(prt_str); prog_exit(1); } @@ -1041,10 +1044,12 @@ } (void)strcat(cmdline, "'"); - (void)sprintf(cmd, "%s >>history", cmdline); + sprintf(str, "%s/%s", bltk_home, HISTORY); + (void)sprintf(cmd, "%s >>%s", cmdline, str); (void)prog_system(cmd); - (void)sprintf(cmd, "%s >last_cmd", cmdline); + sprintf(str, "%s/%s", bltk_home, LAST_CMD); + (void)sprintf(cmd, "%s >%s", cmdline, str); (void)prog_system(cmd); (void)sprintf(cmd, "%s >%s/cmd", cmdline, results); @@ -1078,7 +1083,7 @@ set_signal(SIGUSR2); set_signal(SIGHUP); - (void)sprintf(cmd, "mkdir -p -m 0777 %s/tmp", bltk_root); + (void)sprintf(cmd, "mkdir -p -m 0777 %s/tmp", bltk_home); ret = prog_system(cmd); if (ret != 0) { (void)sprintf(prt_str, "%s failed\n", cmd); @@ -1608,6 +1613,28 @@ return (wp1); } +static char *get_bltk_root_by_proc() +{ + char str[256], *path, *ret=NULL; + + snprintf(str, sizeof str, "/proc/%d/exe", getpid()); + if (readlink(str, str, sizeof str) > -1) + { + if ((path = dirname(str))) + { + // take one folder higher + ret = strrchr(path, '/'); + if (ret != NULL) + { + *ret = 0; + ret = path; + } + } + } + + return ret ? strdup(ret) : ret; +} + static char *get_bltk_root_by_path(char *argv0) { char *path, *dpath, *res; @@ -1648,7 +1675,8 @@ int ret; char cwd[STR_LEN]; - wp1 = check_bltk_root("."); + //wp1 = check_bltk_root("."); + wp1 = get_bltk_root_by_proc(); if (wp1 == NULL) { wp1 = get_bltk_root_by_argv0(argv0); } @@ -1792,6 +1820,12 @@ (void)umask(0); (void)set_path(0); + param_init(); + + prog_putenv("BLTK_HOME", bltk_home); + prog_putenv("WL_OFFICE_WORKING_DIR", wl_office_working_dir); + prog_putenv("WL_READER_WORKING_DIR", wl_office_working_dir); + time_start = time_prev = prog_time(); (void)prog_system("xset dpms 0 0 0 >/dev/null 2>&1"); @@ -2125,7 +2159,7 @@ ("getcwd() failed, cannot continue the test\n"); prog_exit(1); } - (void)sprintf(results_str, "%s/%s", results_parent, results); + (void)sprintf(results_str, "%s/%s", bltk_home, results); results = results_str; } --- bltk-1.0.8/tools/bltk/bltk_get_dmidecode.sh 2006-05-16 20:22:49.000000000 +0200 +++ bltk-1.0.9/tools/bltk/bltk_get_dmidecode.sh 2009-02-06 15:35:10.000000000 +0100 @@ -76,7 +76,7 @@ shift $((OPTIND-1)) DMIDECODE=$* - TMP_FILE=$BLTK_ROOT/tmp/dmidecode + TMP_FILE=$BLTK_HOME/tmp/dmidecode if [[ -z $DMIDECODE ]] then --- bltk-1.0.8/tools/bltk/bltk_get_lspci.sh 2006-05-11 15:40:27.000000000 +0200 +++ bltk-1.0.9/tools/bltk/bltk_get_lspci.sh 2009-02-06 15:32:36.000000000 +0100 @@ -56,7 +56,7 @@ echo "$PROG: Warning: $*" >&2 } -TMP_FILE=$BLTK_ROOT/tmp/lspci +TMP_FILE=$BLTK_HOME/tmp/lspci if [[ -z $LSPCI ]] then --- bltk-1.0.8/tools/bltk/parseconf.c 1970-01-01 01:00:00.000000000 +0100 +++ bltk-1.0.9/tools/bltk/parseconf.c 2009-02-24 15:49:36.000000000 +0100 @@ -0,0 +1,299 @@ +/* + * Copyright (c) 2009 Red Hat Inc. + * Copyright (c) 2009 Jiri Skala + * All rights reserved. + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * Neither the name of Intel Corporation nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "bltk.h" + +#define BLTK_CONF "/etc/bltk.conf" + +typedef struct para_item_str_t +{ + const char *name; + char **val; + size_t len; +} para_item_str; + +typedef struct para_item_int_t +{ + const char *name; + int *val; +} para_item_int; + +typedef struct para_item_bool_t +{ + const char *name; + int *val; +} para_item_bool; + +char *bltk_home; +char *soffice_prog; +char *wl_office_working_dir; +char *bltk_player_prog; +char *bltk_player_file; +char *bltk_reader_prog; +char *bltk_reader_file; + +int wl_developer_enabled; +int wl_developer_extern; +int wl_game_enabled; +int wl_game_extern; +int wl_office_enabled; +int wl_office_extern; +int wl_player_enabled; +int wl_player_extern; +int wl_reader_enabled; +int wl_reader_extern; + +static para_item_str params_str[] = +{ + { "BLTK_HOME", &bltk_home, 0 }, + { "SOFFICE_PROG", &soffice_prog, 0 }, + { "WL_OFFICE_WORKING_DIR", &wl_office_working_dir, 0 }, + { "BLTK_PLAYER_PROG", &bltk_player_prog, 0 }, + { "BLTK_PLAYER_FILE", &bltk_player_file, 0 }, + { "BLTK_READER_PROG", &bltk_reader_prog, 0 }, + { "BLTK_READER_FILE", &bltk_reader_file, 0 }, + { NULL, NULL, 0 } +}; + +static para_item_int params_int[] = +{ + { NULL, 0 } +}; + +static para_item_bool params_bool[] = +{ + { "WL_DEVELOPER_ENABLED", &wl_developer_enabled }, + { "WL_DEVELOPER_EXTERN", &wl_developer_extern }, + { "WL_GAME_ENABLED", &wl_game_enabled }, + { "WL_GAME_EXTERN", &wl_game_extern }, + { "WL_OFFICE_ENABLED", &wl_office_enabled }, + { "WL_OFFICE_EXTERN", &wl_office_extern }, + { "WL_PLAYER_ENABLED", &wl_player_enabled }, + { "WL_PLAYER_EXTERN", &wl_player_extern }, + { "WL_READER_ENABLED", &wl_reader_enabled }, + { "WL_READER_EXTERN", &wl_reader_extern }, + { NULL, 0 } +}; + + +char * +strupper(char *str) +{ + int i; + for (i=0; i < strlen(str); i++) + str[i] = (char)toupper(str[i]); + return str; +} + +int +param_find_str(const char *name) +{ + int i; + for (i=0; + params_str[i].name != NULL && strcmp(name, params_str[i].name) != 0; + i++) ; + return params_str[i].name == NULL ? -1 : i; +} + +int +param_find_int(const char *name) +{ + int i; + for (i=0; + params_int[i].name != NULL && strcmp(name, params_int[i].name) != 0; + i++) ; + return params_int[i].name == NULL ? -1 : i; +} + +int +param_find_bool(const char *name) +{ + int i; + for (i=0; + params_bool[i].name != NULL && strcmp(name, params_bool[i].name) != 0; + i++) ; + return params_bool[i].name == NULL ? -1 : i; +} + +int +line_empty_or_spaces(const char *line) +{ + int i; + for (i=0; line[i] > 0 && line[i] <= ' ' && i < strlen(line); i++) ; + return line[i] == 0; +} + +int +line_commented(const char *line) +{ + int i; + for (i=0; line[i] > 0 && line[i] <= ' ' && i < strlen(line); i++) ; + return line[i] == '#'; +} + +int +param_parse_line(const char *line, char *name, char *val) +{ + char *str, *str1; + int ret=-1; + + str = strdup(line); + if ((str1 = strchr(str, '=')) != NULL) + { + *str1 = 0; + str1++; + strcpy(val, str1); + strcpy(name, str); + ret = 0; + } + else + { + fprintf(stderr, "Incorrect line in the %s\n", BLTK_CONF); + } + free (str); + return ret; +} + +void +param_export_value(const char *name) +{ + char expval[STR_LEN]; + int index; + + if ((index = param_find_str(name)) > -1) + snprintf(expval, STR_LEN, "%s=%s", name, *(params_str[index].val)); + else if ((index = param_find_int(name)) > -1) + snprintf(expval, STR_LEN, "%s=%d", name, *(params_int[index].val)); + else if ((index = param_find_bool(name)) > -1) + snprintf(expval, STR_LEN, "%s=%s", name, *(params_bool[index].val) ? "YES": "NO"); + + if (index > -1) + putenv(strdup(expval)); + else + fprintf(stderr, "Undefined parameter (%s)\n", name); +} + +void +param_load_conf() +{ + char str[STR_LEN]; + char name[STR_LEN], val[STR_LEN]; + int index, len; + FILE *f; + + if ((f = fopen(BLTK_CONF, "rt")) != NULL) + { + while (fgets(str, STR_LEN, f) != NULL) + { + if ((len = strlen(str)) > 0 && str[len-1] == '\n') + str[len-1] = 0; + if (line_empty_or_spaces(str) || line_commented(str)) + continue; + + param_parse_line(str, name, val); + + if ((index = param_find_str(name)) > -1) + *(params_str[index].val) = strdup(val); + else if ((index = param_find_int(name)) > -1) + *(params_int[index].val) = atoi(val); + else if ((index = param_find_bool(name)) > -1) + { + if (!strcmp(strupper(val), "YES") || + !strcmp(strupper(val), "TRUE") || + val[0] == '1') + *(params_bool[index].val) = 1; + else if (!strcmp(strupper(val), "NO") || + !strcmp(strupper(val), "FALSE") || + val[0] == '0') + *(params_bool[index].val) = 0; + } + } + + fclose(f); + } +} + +void +param_load_defaults() +{ + char str[STR_LEN]; + + if (bltk_home == NULL) + { + sprintf(str, "%s/.bltk", getenv("HOME")); + bltk_home = strdup(str); + } else if (bltk_home[0] == '~') { + sprintf(str, "%s%s", getenv("HOME"), bltk_home+1); + free(bltk_home); + bltk_home = strdup(str); + } + + if (access(bltk_home, 0) != 0) + mkdir(bltk_home, 0700); + + if (wl_office_working_dir == NULL) + wl_office_working_dir = strdup(bltk_home); + + if (access(wl_office_working_dir, 0) != 0) + { + if (wl_office_working_dir[0] == '~') + { + sprintf(str, "%s%s", getenv("HOME"), wl_office_working_dir+1); + free(wl_office_working_dir); + wl_office_working_dir = strdup(str); + } + mkdir(wl_office_working_dir, 0700); + } +} + +void +param_init() +{ + param_load_conf(); + param_load_defaults(); +} + --- bltk-1.0.8/tools/bltk/bltk_check.sh 2006-09-13 17:39:07.000000000 +0200 +++ bltk-1.0.9/tools/bltk/bltk_check.sh 2009-02-24 15:03:42.000000000 +0100 @@ -38,6 +38,7 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # +. /etc/bltk.conf source `dirname $0`/bltk_wl_common [[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; } @@ -120,7 +121,7 @@ wl=${WLA[wl_cnt]} WL_RES=$RES/$wl.results echo "=== Workload '$wl'" - if [[ ! -f $BLTK_ROOT/wl_$wl/.installed && $wl != idle && $wl != reader ]] + if [[ $CHK_INSTALLED = "YES" && ! -f $BLTK_ROOT/wl_$wl/.installed && $wl != idle && $wl != reader ]] then echo "not installed"; WLR[wl_cnt]="not installed" --- bltk-1.0.8/tools/bltk/bltk_get_user_field.sh 2006-06-13 18:34:07.000000000 +0200 +++ bltk-1.0.9/tools/bltk/bltk_get_user_field.sh 2009-02-06 15:35:45.000000000 +0100 @@ -57,7 +57,7 @@ FIELD_NO=$1 DELIM=$1 -TMP_FILE=$BLTK_ROOT/tmp/hdparm +TMP_FILE=$BLTK_HOME/tmp/hdparm #str=`df -lk / | grep -v ^Filesystem` str=`df -lk / | grep ^/dev/` --- bltk-1.0.8/tools/bltk/bltk_get_hdparm.sh 2006-05-11 15:40:00.000000000 +0200 +++ bltk-1.0.9/tools/bltk/bltk_get_hdparm.sh 2009-02-20 14:21:18.000000000 +0100 @@ -56,13 +56,10 @@ PARTITIONS=$1 -TMP_FILE=$BLTK_ROOT/tmp/hdparm - -#str=`df -lk / | grep -v ^Filesystem` -str=`df -lk / | grep ^/dev/` -DF_DEV_NAME=${str%% *} -DF_NAME=${DF_DEV_NAME#/dev/} +TMP_FILE=$BLTK_HOME/tmp/hdparm +str=`ls -d /sys/block/sd* | sed 's/^.*sd/sd/'` +DF_NAME=${str%% *} HD_NAME=${DF_NAME%%[0-9]*} grep -w "$HD_NAME" "$PARTITIONS" >/dev/null 2>&1 --- bltk-1.0.8/tools/bltk/bltk_wl_common.sh 2007-09-12 16:09:13.000000000 +0200 +++ bltk-1.0.9/tools/bltk/bltk_wl_common.sh 2009-02-24 15:54:59.000000000 +0100 @@ -38,6 +38,7 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # +. /etc/bltk.conf unalias -a @@ -130,7 +131,7 @@ export BLTK_BIN=$BLTK_ROOT/bin export BLTK_LIB=$BLTK_ROOT/lib - export BLTK_TMP=$BLTK_ROOT/tmp + export BLTK_TMP=$HOME/.bltk/tmp [[ -z $BLTK_SUDO_CMD ]] && export BLTK_SUDO_CMD=$BLTK_BIN/bltk_sudo [[ -z $BLTK_CALC_CMD ]] && export BLTK_CALC_CMD=$BLTK_BIN/bltk_calc @@ -180,7 +181,7 @@ export BLTK_BIN=$BLTK_ROOT/bin export BLTK_LIB=$BLTK_ROOT/lib - export BLTK_TMP=$BLTK_ROOT/tmp + export BLTK_TMP=$HOME/.bltk/tmp export BLTK_EXTERN_SRC=$BLTK_ROOT/extern # export BLTK_EXTERN_TGT=$BLTK_ROOT/extern @@ -228,7 +229,7 @@ wl_error_msg "cd $BLTK_WL_ROOT failed" return 1 fi - rm -f fail + rm -f $BLTK_FAIL_NAME RES_SCORE=$BLTK_RESULTS/score [[ -a $RES_SCORE ]] && rm $RES_SCORE @@ -374,7 +375,7 @@ { typeset wl=$1 - if [[ ! -a $BLTK_WL_INSTALL_FILE ]] + if [[ $CHK_INSTALLED = "YES" && ! -a $BLTK_WL_INSTALL_FILE ]] then wl_error_msg "Installation is not completed, perform 'make install-$wl'" return 1 @@ -626,3 +627,20 @@ return 0 } +wl_install_file() +{ + typeset access=$1 + typeset file1=$2 + typeset file2=$3 + + CMD="install -m $access $file1 $file2" + $CMD + if [[ $? != 0 ]] + then + wl_error_msg "$CMD failed" + wl_error_msg "Cannot copy $file1 to $file2" + return 1 + fi + return 0 +} + --- bltk-1.0.8/tools/bltk/Makefile 2006-06-13 18:58:47.000000000 +0200 +++ bltk-1.0.9/tools/bltk/Makefile 2009-02-23 14:56:39.000000000 +0100 @@ -4,12 +4,12 @@ BIN = ../../bin -FILES = main init file stat +FILES = main init file stat parseconf OFILES = ${FILES:=.o} CFILES = ${FILES:=.c} -HIDERS = ../../include/bltk.h +HIDERS = ../../include/bltk.h ../../include/parseconf.h TARGETS = $(BIN)/bltk @@ -38,6 +38,7 @@ init.o : $(HIDERS) init.c file.o : $(HIDERS) file.c stat.o : $(HIDERS) stat.c +parseconf.o : $(HIDERS) parseconf.c $(SHTARGETS) : $(SHFILES_SH) cp $(@:$(BIN)/%=%.sh) $@ --- bltk-1.0.8/tools/bltk/bltk_get_xdpyinfo.sh 2006-05-03 14:17:43.000000000 +0200 +++ bltk-1.0.9/tools/bltk/bltk_get_xdpyinfo.sh 2009-02-06 15:32:10.000000000 +0100 @@ -42,7 +42,7 @@ unalias -a XDPYINFO=$1 -TMP_FILE=$BLTK_ROOT/tmp/xdpyinfo +TMP_FILE=$BLTK_HOME/tmp/xdpyinfo if [[ -z $XDPYINFO ]] then --- bltk-1.0.8/tools/sudo/Makefile 2006-03-08 10:12:07.000000000 +0100 +++ bltk-1.0.9/tools/sudo/Makefile 2009-02-25 13:57:18.000000000 +0100 @@ -34,8 +34,10 @@ install : FORCE +ifndef PACKAGE_BUILD @echo Root password is required @su root -c "chown root:root $(TARGETS); chmod +s $(TARGETS)" +endif clean : @$(RM) $(TARGETS) *.o $(SHTARGETS) *~ --- bltk-1.0.8/tools/analyzer/bltk_report_table.sh 2007-01-29 13:41:32.000000000 +0100 +++ bltk-1.0.9/tools/analyzer/bltk_report_table.sh 2009-02-06 15:38:15.000000000 +0100 @@ -57,7 +57,7 @@ fi export BLTK_ROOT export BLTK_BIN=$BLTK_ROOT/bin - export BLTK_TMP=$BLTK_ROOT/tmp + export BLTK_TMP=$BLTK_HOME/tmp } set_bltk_root --- bltk-1.0.8/tools/analyzer/bltk_report_uncompress.sh 2007-01-29 13:41:32.000000000 +0100 +++ bltk-1.0.9/tools/analyzer/bltk_report_uncompress.sh 2009-02-06 15:38:47.000000000 +0100 @@ -57,7 +57,7 @@ fi export BLTK_ROOT export BLTK_BIN=$BLTK_ROOT/bin - export BLTK_TMP=$BLTK_ROOT/tmp + export BLTK_TMP=$BLTK_HOME/tmp export BLTK_GET_REALPATH=$BLTK_BIN/bltk_get_realpath } --- bltk-1.0.8/tools/analyzer/bltk_plot.sh 2007-01-29 13:41:32.000000000 +0100 +++ bltk-1.0.9/tools/analyzer/bltk_plot.sh 2009-02-06 15:37:03.000000000 +0100 @@ -57,7 +57,7 @@ fi export BLTK_ROOT export BLTK_BIN=$BLTK_ROOT/bin - export BLTK_TMP=$BLTK_ROOT/tmp + export BLTK_TMP=$BLTK_HOME/tmp } set_bltk_root --- bltk-1.0.8/tools/analyzer/bltk_report_compress.sh 2007-01-29 13:41:32.000000000 +0100 +++ bltk-1.0.9/tools/analyzer/bltk_report_compress.sh 2009-02-06 15:38:35.000000000 +0100 @@ -57,7 +57,7 @@ fi export BLTK_ROOT export BLTK_BIN=$BLTK_ROOT/bin - export BLTK_TMP=$BLTK_ROOT/tmp + export BLTK_TMP=$BLTK_HOME/tmp export BLTK_GET_REALPATH=$BLTK_BIN/bltk_get_realpath } --- bltk-1.0.8/tools/analyzer/bltk_report.sh 2007-01-29 13:41:32.000000000 +0100 +++ bltk-1.0.9/tools/analyzer/bltk_report.sh 2009-02-06 15:37:29.000000000 +0100 @@ -57,7 +57,7 @@ fi export BLTK_ROOT export BLTK_BIN=$BLTK_ROOT/bin - export BLTK_TMP=$BLTK_ROOT/tmp + export BLTK_TMP=$BLTK_HOME/tmp } set_bltk_root --- bltk-1.0.8/tools/analyzer/bltk_report_check.sh 2007-01-29 13:41:32.000000000 +0100 +++ bltk-1.0.9/tools/analyzer/bltk_report_check.sh 2009-02-06 15:37:57.000000000 +0100 @@ -57,7 +57,7 @@ fi export BLTK_ROOT export BLTK_BIN=$BLTK_ROOT/bin - export BLTK_TMP=$BLTK_ROOT/tmp + export BLTK_TMP=$BLTK_HOME/tmp } set_bltk_root --- bltk-1.0.8/wl_developer/bltk_wl_developer.sh 2006-10-10 08:57:39.000000000 +0200 +++ bltk-1.0.9/wl_developer/bltk_wl_developer.sh 2009-02-24 10:33:28.000000000 +0100 @@ -38,10 +38,13 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # +. /etc/bltk.conf source `dirname $0`/../../bin/bltk_wl_common [[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; } +export USER_DELAY_TMP=$BLTK_HOME/user_delay.tmp + startup() { trap 'cleanup 1; exit 1' 1 2 3 15 @@ -173,18 +176,18 @@ { ST_TIME=`$BLTK_TIME_CMD` - rm -f ./user_delay.tmp + rm -f $USER_DELAY_TMP if [[ $BLTK_WL_FILE != DEBUG && $BLTK_WL_FILE != DEBUG1 ]] then run_cscope_vi wl_check_error $? else sleep 1 - echo 1.11 >./user_delay.tmp - wl_check_error $? "echo 0.11 >./user_delay.tmp failed" + echo 1.11 > $USER_DELAY_TMP + wl_check_error $? "echo 0.11 > $USER_DELAY_TMP failed" fi - CMD="cat ./user_delay.tmp" + CMD="cat $USER_DELAY_TMP" DELAY_TIME=`$CMD` wl_check_error $? "$CMD failed" @@ -280,7 +283,15 @@ exit $1 } -startup -run -cleanup 0 +if [ $WL_DEVELOPER_ENABLED = "YES" ] +then + startup + run + cleanup 0 +else + TTY=`tty` + echo "WARNING!!!" > $TTY 2>&1 + echo "The developer workload is disabled. See manual and use external package." > $TTY 2>&1 + exit 0 +fi --- bltk-1.0.8/wl_developer/Makefile 2006-03-13 07:47:25.000000000 +0100 +++ bltk-1.0.9/wl_developer/Makefile 2009-02-25 11:36:45.000000000 +0100 @@ -1,6 +1,6 @@ CFLAGS = -Wall -pedantic -std=c99 -g -O2 -I../include -LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lxse -L../lib +LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 ../lib/libxse.so.0 -Wl,-rpath,/usr/lib/bltk BIN = bin @@ -15,7 +15,7 @@ SHFILES_SH = ${SHFILES:=.sh} SHTARGETS = $(SHFILES:%=$(BIN)/%) -EXTERN_DEPS = $(HIDERS) ../lib/libxse.so +EXTERN_DEPS = $(HIDERS) ../lib/libxse.so.0 all : $(BIN) $(SUBDIRS) $(TARGET) $(SHTARGETS) FORCE --- bltk-1.0.8/wl_developer/bltk_wl_developer_install.sh 2006-05-03 14:17:44.000000000 +0200 +++ bltk-1.0.9/wl_developer/bltk_wl_developer_install.sh 2009-02-04 17:08:00.000000000 +0100 @@ -38,6 +38,7 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # +. /etc/bltk.conf source `dirname $0`/../../bin/bltk_wl_common [[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; } @@ -139,9 +140,14 @@ exit 1 fi -{ -startup -$work -cleanup 0 -} 2>&1 | tee -i $work.log +if [[ "$WL_DEVELOPER_ENABLED" = "YES" && "$WL_DEVELOPER_EXTERN" = "YES" ]] +then + { + startup + $work + cleanup 0 + } 2>&1 | tee -i $work.log +else + exit 0 +fi --- NEW FILE bltk.conf --- # *********************************** # BLTK configuration file # # *********************************** BLTK_HOME=~/.bltk CHK_INSTALLED=NO # *********************************** # ***** BLTK_WL_DEVELOPER ***** #************************************ # Enables developer workload WL_DEVELOPER_ENABLED=NO # Enables external downloaded binary used by developer workload WL_DEVELOPER_EXTERN=YES # *********************************** # ***** BLTK_WL_GAME ***** # *********************************** # Enables game workload WL_GAME_ENABLED=NO # Enables external downloaded binary used by game workload WL_GAME_EXTERN=YES # *********************************** # ***** BLTK_WL_OFFICE ***** # *********************************** # Enables developer workload WL_OFFICE_ENABLED=YES # Enables external downloaded binary used by office workload WL_OFFICE_EXTERN=NO # Path to OpenOffice binary SOFFICE_PROG=/usr/lib/openoffice.org3/program/soffice WL_OFFICE_WORKING_DIR=~/.bltk/wl_office # *********************************** # ***** BLTK_WL_PLAYER ***** # *********************************** # Enables player workload WL_PLAYER_ENABLED=YES # Enables external downloaded binary used by player workload WL_PLAYER_EXTERN=NO BLTK_PLAYER_PROG=totem BLTK_PLAYER_FILE=dvd:// # *********************************** # ***** BLTK_WL_READER ***** # *********************************** # Enables reader workload WL_READER_ENABLED=YES # Enables external downloaded binary used by reader workload WL_READER_EXTERN=NO BLTK_READER_PROG=firefox #BLTK_READER_FILE= --- NEW FILE bltk.spec --- Name: bltk Version: 1.0.8 Release: 1%{?dist} Summary: The BLTK measures notebook battery life under any workload Group: Applications/System License: BSD URL: http://www.lesswatts.org/projects/bltk/ Source0: http://www.lesswatts.org/patches/bltk/%{name}-%{version}.tar.gz Source1: bltk.conf Source2: OOCALC_FILE_SAMPLE.ods Source3: OODRAW_FILE_SAMPLE.odg Source4: OOWRITER_FILE_SAMPLE.odt Patch0: bltk-1.0.8-all.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel Requires: openoffice.org-writer openoffice.org-calc openoffice.org-draw %description This tool kit is used to measure battery life and performance under different workloads on Linux. Test can be used with various workloads to simulate different types of laptop usage. The following workloads are currently implemented: a) Idle workload - collect statistics only b) Developer workload - simulates code development in Linux environment c) Reader workload - simulates text reading on laptop d) DVD playback workload - simulates laptop entertaining usage e) 3d game workload - simulates 3D-gaming on laptop f) Office Activity workload - simulates laptop usage for different office activities (based on OpenOffice.org office suit) %prep %setup -q -n %{name} %patch0 -p1 -b .all %build make # make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT PACKAGE_BUILD=y mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_libdir} mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bltk mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bltk/{bin,lib,doc,wl_developer,wl_game,wl_office,wl_player,wl_reader} mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_developer/bin mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_game/bin mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_office/bin mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_player/bin mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_reader/bin mkdir -p ${RPM_BUILD_ROOT}/etc install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/etc install -m 755 bin/bat_drain ${RPM_BUILD_ROOT}%{_libdir}/bltk/bin/bat_drain install -m 755 bin/bat_drain_table ${RPM_BUILD_ROOT}%{_libdir}/bltk/bin/bat_drain_table install -m 755 bin/bltk ${RPM_BUILD_ROOT}%{_libdir}/bltk/bin ln -s %{_libdir}/bltk/bin/bltk ${RPM_BUILD_ROOT}%{_bindir}/bltk ln -s %{_libdir}/bltk/bin/bltk_plot ${RPM_BUILD_ROOT}%{_bindir}/bltk_plot ln -s %{_libdir}/bltk/bin/bltk_report ${RPM_BUILD_ROOT}%{_bindir}/bltk_report ln -s %{_libdir}/bltk/bin/bltk_report_compress ${RPM_BUILD_ROOT}%{_bindir}/bltk_report_compress ln -s %{_libdir}/bltk/bin/bltk_report_table ${RPM_BUILD_ROOT}%{_bindir}/bltk_report_table ln -s %{_libdir}/bltk/bin/bltk_report_uncompress ${RPM_BUILD_ROOT}%{_bindir}/bltk_report_uncompress install -m 755 lib/libxse.so.0 ${RPM_BUILD_ROOT}%{_libdir}/bltk/lib/libxse.so.0 install -m 755 bin/bltk_* ${RPM_BUILD_ROOT}%{_libdir}/bltk/bin/ install -m 755 bin/bat_* ${RPM_BUILD_ROOT}%{_libdir}/bltk/bin/ install -m 755 wl_developer/bin/bltk_wl_developer ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_developer/bin install -m 755 wl_developer/bin/bltk_wl_developer_xse ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_developer/bin install -m 755 wl_developer/bin/bltk_wl_developer_spy ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_developer/bin install -m 755 wl_game/bin/bltk_wl_game ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_game/bin install -m 755 wl_game/bin/bltk_wl_game_xse ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_game/bin install -m 755 wl_office/bin/bltk_wl_office ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_office/bin install -m 755 wl_office/bin/bltk_wl_office_xse ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_office/bin install -m 755 wl_office/bin/bltk_wl_office_run_app ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_office/bin install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_office install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_office install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_office install -m 644 wl_office/scen ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_office install -m 644 wl_office/scen_install ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_office install -m 644 wl_office/response_install ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_office install -m 644 wl_office/text* ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_office install -m 755 wl_player/bin/bltk_wl_player ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_player/bin install -m 755 wl_player/bin/bltk_wl_player_make_binary ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_player/bin install -m 755 wl_reader/bin/bltk_wl_reader ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_reader/bin install -m 755 wl_reader/bin/bltk_wl_reader_xse ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_reader/bin install -m 644 wl_reader/war_and_peace.html ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_reader %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc doc/HOWTO doc/Manual doc/README %config(noreplace) %attr(0644,root,root) /etc/bltk.conf %{_libdir}/bltk/bin/bltk %{_bindir}/bltk %{_bindir}/bltk_plot %{_bindir}/bltk_report %{_bindir}/bltk_report_compress %{_bindir}/bltk_report_table %{_bindir}/bltk_report_uncompress %{_libdir}/bltk/lib/libxse.so.0 %{_libdir}/bltk/bin/bat_drain %{_libdir}/bltk/bin/bat_drain_table %{_libdir}/bltk/bin/bltk_calc %{_libdir}/bltk/bin/bltk_check %{_libdir}/bltk/bin/bltk_display_state %{_libdir}/bltk/bin/bltk_get_ac_adapter %{_libdir}/bltk/bin/bltk_get_bat %{_libdir}/bltk/bin/bltk_get_cpufreq %{_libdir}/bltk/bin/bltk_get_cpuinfo %{_libdir}/bltk/bin/bltk_get_cpustat %{_libdir}/bltk/bin/bltk_get_cpustate %{_libdir}/bltk/bin/bltk_get_dmidecode %{_libdir}/bltk/bin/bltk_get_hdparm %{_libdir}/bltk/bin/bltk_get_hd_rpm %{_libdir}/bltk/bin/bltk_get_info %{_libdir}/bltk/bin/bltk_get_kernel_release %{_libdir}/bltk/bin/bltk_get_lspci %{_libdir}/bltk/bin/bltk_get_meminfo %{_libdir}/bltk/bin/bltk_get_realpath %{_libdir}/bltk/bin/bltk_get_stat %{_libdir}/bltk/bin/bltk_get_system_release %{_libdir}/bltk/bin/bltk_get_timer %{_libdir}/bltk/bin/bltk_get_user_field %{_libdir}/bltk/bin/bltk_get_xdpyinfo %{_libdir}/bltk/bin/bltk_hd_state %{_libdir}/bltk/bin/bltk_install %{_libdir}/bltk/bin/bltk_plot %{_libdir}/bltk/bin/bltk_report %{_libdir}/bltk/bin/bltk_report_check %{_libdir}/bltk/bin/bltk_report_compress %{_libdir}/bltk/bin/bltk_report_table %{_libdir}/bltk/bin/bltk_report_uncompress %{_libdir}/bltk/bin/bltk_save_sys_info %{_libdir}/bltk/bin/bltk_spy %attr(4755, root, root) %{_libdir}/bltk/bin/bltk_sudo %{_libdir}/bltk/bin/bltk_time %{_libdir}/bltk/bin/bltk_type_command %{_libdir}/bltk/bin/bltk_winid %{_libdir}/bltk/bin/bltk_wl_common %{_libdir}/bltk/wl_developer/bin/bltk_wl_developer %{_libdir}/bltk/wl_developer/bin/bltk_wl_developer_spy %{_libdir}/bltk/wl_developer/bin/bltk_wl_developer_xse %{_libdir}/bltk/wl_game/bin/bltk_wl_game %{_libdir}/bltk/wl_game/bin/bltk_wl_game_xse %{_libdir}/bltk/wl_office/bin/bltk_wl_office %{_libdir}/bltk/wl_office/bin/bltk_wl_office_xse %{_libdir}/bltk/wl_office/bin/bltk_wl_office_run_app %{_libdir}/bltk/wl_office/OOCALC_FILE_SAMPLE.ods %{_libdir}/bltk/wl_office/OODRAW_FILE_SAMPLE.odg %{_libdir}/bltk/wl_office/OOWRITER_FILE_SAMPLE.odt %{_libdir}/bltk/wl_office/scen %{_libdir}/bltk/wl_office/scen_install %{_libdir}/bltk/wl_office/response_install %{_libdir}/bltk/wl_office/text1 %{_libdir}/bltk/wl_office/text2 %{_libdir}/bltk/wl_office/text3 %{_libdir}/bltk/wl_player/bin/bltk_wl_player %{_libdir}/bltk/wl_player/bin/bltk_wl_player_make_binary %{_libdir}/bltk/wl_reader/bin/bltk_wl_reader %{_libdir}/bltk/wl_reader/bin/bltk_wl_reader_xse %{_libdir}/bltk/wl_reader/war_and_peace.html %changelog * Thu Jan 29 2009 Jiri Skala 1.0.8-1 - assembling package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bltk/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:38:09 -0000 1.1 +++ .cvsignore 4 Mar 2009 08:51:16 -0000 1.2 @@ -0,0 +1 @@ +bltk-1.0.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/bltk/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:38:09 -0000 1.1 +++ sources 4 Mar 2009 08:51:16 -0000 1.2 @@ -0,0 +1 @@ +790f76ec479abb166b4c5fcb98106d87 bltk-1.0.8.tar.gz From caolanm at fedoraproject.org Wed Mar 4 09:26:21 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Wed, 4 Mar 2009 09:26:21 +0000 (UTC) Subject: rpms/bes/devel bes-3.6.2-includes.patch, NONE, 1.1 bes.spec, 1.12, 1.13 Message-ID: <20090304092621.9D3A670116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/bes/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28231 Modified Files: bes.spec Added Files: bes-3.6.2-includes.patch Log Message: include cstdio for std::snprintf, etc. bes-3.6.2-includes.patch: --- NEW FILE bes-3.6.2-includes.patch --- Only in bes-3.6.2: bes-3.6.2-includes.patch diff -ru bes-3.6.2.orig/dispatch/BESUncompressGZ.cc bes-3.6.2/dispatch/BESUncompressGZ.cc --- bes-3.6.2.orig/dispatch/BESUncompressGZ.cc 2009-03-03 22:51:45.000000000 +0000 +++ bes-3.6.2/dispatch/BESUncompressGZ.cc 2009-03-03 23:08:14.000000000 +0000 @@ -34,9 +34,11 @@ #include #include +#include #include using std::ostringstream ; +using std::fopen ; #include "BESUncompressGZ.h" #include "BESInternalError.h" diff -ru bes-3.6.2.orig/dispatch/BESUncompressZ.cc bes-3.6.2/dispatch/BESUncompressZ.cc --- bes-3.6.2.orig/dispatch/BESUncompressZ.cc 2009-03-03 22:51:45.000000000 +0000 +++ bes-3.6.2/dispatch/BESUncompressZ.cc 2009-03-03 23:22:50.000000000 +0000 @@ -37,6 +37,7 @@ #if HAVE_UNISTD_H #include #endif +#include #include #include diff -ru bes-3.6.2.orig/dispatch/BESUtil.cc bes-3.6.2/dispatch/BESUtil.cc --- bes-3.6.2.orig/dispatch/BESUtil.cc 2009-03-03 22:51:44.000000000 +0000 +++ bes-3.6.2/dispatch/BESUtil.cc 2009-03-04 08:30:15.000000000 +0000 @@ -42,12 +42,14 @@ #include #include #include +#include #include #include using std::istringstream ; using std::cout ; using std::endl ; +using std::snprintf ; #include "BESUtil.h" #include "BESForbiddenError.h" diff -ru bes-3.6.2.orig/ppt/PPTStreamBuf.cc bes-3.6.2/ppt/PPTStreamBuf.cc --- bes-3.6.2.orig/ppt/PPTStreamBuf.cc 2009-03-03 22:51:45.000000000 +0000 +++ bes-3.6.2/ppt/PPTStreamBuf.cc 2009-03-04 09:08:05.000000000 +0000 @@ -33,6 +33,7 @@ #include //#include #include // for sync +#include // for EOF #include #include #include diff -ru bes-3.6.2.orig/ppt/Socket.cc bes-3.6.2/ppt/Socket.cc --- bes-3.6.2.orig/ppt/Socket.cc 2009-03-03 22:51:45.000000000 +0000 +++ bes-3.6.2/ppt/Socket.cc 2009-03-04 08:50:15.000000000 +0000 @@ -45,6 +45,7 @@ #ifdef HAVE_UNISTD_H #include #endif +#include #include "Socket.h" #include "BESInternalError.h" diff -ru bes-3.6.2.orig/ppt/UnixSocket.cc bes-3.6.2/ppt/UnixSocket.cc --- bes-3.6.2.orig/ppt/UnixSocket.cc 2009-03-03 22:51:45.000000000 +0000 +++ bes-3.6.2/ppt/UnixSocket.cc 2009-03-04 08:57:25.000000000 +0000 @@ -32,6 +32,7 @@ // szednik Stephan Zednik #include // for unlink +#include // for remove #include #include #include Index: bes.spec =================================================================== RCS file: /cvs/pkgs/rpms/bes/devel/bes.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- bes.spec 24 Feb 2009 04:31:24 -0000 1.12 +++ bes.spec 4 Mar 2009 09:25:49 -0000 1.13 @@ -6,7 +6,7 @@ Name: bes Version: 3.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Back-end server software framework for OPeNDAP Group: System Environment/Libraries @@ -14,6 +14,7 @@ URL: http://www.opendap.org/download/BES.html Source0: http://www.opendap.org/pub/source/bes-%{version}.tar.gz Patch0: bes-3.6.2-gcc43.patch +Patch1: bes-3.6.2-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -64,6 +65,7 @@ %prep %setup -q %patch0 -p1 -b .gcc43 +%patch1 -p1 -b .includes chmod a-x dispatch/BESStreamResponseHandler* %build @@ -155,6 +157,9 @@ %doc __distribution_docs/api-html/ %changelog +* Wed Mar 04 2009 Caol??n McNamara - 3.6.2-4 +- include cstdio for std::snprintf + * Mon Feb 23 2009 Fedora Release Engineering - 3.6.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From atkac at fedoraproject.org Wed Mar 4 09:28:19 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Wed, 4 Mar 2009 09:28:19 +0000 (UTC) Subject: rpms/bind/devel bind-96-realloc.patch, NONE, 1.1 bind.spec, 1.302, 1.303 Message-ID: <20090304092819.31C6970116@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/bind/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28668 Modified Files: bind.spec Added Files: bind-96-realloc.patch Log Message: - fixed some read buffer overflows (upstream) bind-96-realloc.patch: --- NEW FILE bind-96-realloc.patch --- Index: lib/isc/mem.c =================================================================== RCS file: /var/snap/bind9/lib/isc/mem.c,v retrieving revision 1.145 retrieving revision 1.145.120.4 diff -u -p -r1.145 -r1.145.120.4 --- lib/isc/mem.c 2 Apr 2008 02:37:42 -0000 1.145 +++ lib/isc/mem.c 16 Feb 2009 03:17:05 -0000 1.145.120.4 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1997-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mem.c,v 1.145 2008/04/02 02:37:42 marka Exp $ */ +/* $Id: mem.c,v 1.145.120.4 2009/02/16 03:17:05 marka Exp $ */ /*! \file */ @@ -52,7 +52,7 @@ LIBISC_EXTERNAL_DATA unsigned int isc_me #define DEF_MAX_SIZE 1100 #define DEF_MEM_TARGET 4096 -#define ALIGNMENT_SIZE 8 /*%< must be a power of 2 */ +#define ALIGNMENT_SIZE 8U /*%< must be a power of 2 */ #define NUM_BASIC_BLOCKS 64 /*%< must be > 1 */ #define TABLE_INCREMENT 1024 #define DEBUGLIST_COUNT 1024 @@ -1191,7 +1191,7 @@ print_active(isc_mem_t *mctx, FILE *out) const char *format; isc_boolean_t found; - fprintf(out, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM, + fprintf(out, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM, ISC_MSG_DUMPALLOC, "Dump of all outstanding " "memory allocations:\n")); @@ -1217,7 +1217,7 @@ print_active(isc_mem_t *mctx, FILE *out) } } if (!found) - fprintf(out, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM, + fprintf(out, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM, ISC_MSG_NONE, "\tNone.\n")); } } @@ -1259,7 +1259,7 @@ isc_mem_stats(isc_mem_t *ctx, FILE *out) */ pool = ISC_LIST_HEAD(ctx->pools); if (pool != NULL) { - fprintf(out, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM, + fprintf(out, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM, ISC_MSG_POOLSTATS, "[Pool statistics]\n")); fprintf(out, "%15s %10s %10s %10s %10s %10s %10s %10s %1s\n", @@ -1365,6 +1365,40 @@ isc__mem_allocate(isc_mem_t *ctx, size_t return (si); } +void * +isc__mem_reallocate(isc_mem_t *ctx, void *ptr, size_t size FLARG) { + void *new_ptr = NULL; + size_t oldsize, copysize; + + REQUIRE(VALID_CONTEXT(ctx)); + + /* + * This function emulates the realloc(3) standard library function: + * - if size > 0, allocate new memory; and if ptr is non NULL, copy + * as much of the old contents to the new buffer and free the old one. + * Note that when allocation fails the original pointer is intact; + * the caller must free it. + * - if size is 0 and ptr is non NULL, simply free the given ptr. + * - this function returns: + * pointer to the newly allocated memory, or + * NULL if allocation fails or doesn't happen. + */ + if (size > 0U) { + new_ptr = isc__mem_allocate(ctx, size FLARG_PASS); + if (new_ptr != NULL && ptr != NULL) { + oldsize = (((size_info *)ptr)[-1]).u.size; + INSIST(oldsize >= ALIGNMENT_SIZE); + oldsize -= ALIGNMENT_SIZE; + copysize = oldsize > size ? size : oldsize; + memcpy(new_ptr, ptr, copysize); + isc__mem_free(ctx, ptr FLARG_PASS); + } + } else if (ptr != NULL) + isc__mem_free(ctx, ptr FLARG_PASS); + + return (new_ptr); +} + void isc__mem_free(isc_mem_t *ctx, void *ptr FLARG) { size_info *si; Index: lib/isc/include/isc/mem.h =================================================================== RCS file: /var/snap/bind9/lib/isc/include/isc/mem.h,v retrieving revision 1.78 retrieving revision 1.78.120.3 diff -u -p -r1.78 -r1.78.120.3 --- lib/isc/include/isc/mem.h 31 Mar 2008 05:00:30 -0000 1.78 +++ lib/isc/include/isc/mem.h 11 Feb 2009 03:07:01 -0000 1.78.120.3 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1997-2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mem.h,v 1.78 2008/03/31 05:00:30 marka Exp $ */ +/* $Id: mem.h,v 1.78.120.3 2009/02/11 03:07:01 jinmei Exp $ */ #ifndef ISC_MEM_H #define ISC_MEM_H 1 @@ -94,7 +94,7 @@ LIBISC_EXTERNAL_DATA extern unsigned int /*!< * The variable isc_mem_debugging holds a set of flags for * turning certain memory debugging options on or off at - * runtime. Its is intialized to the value ISC_MEM_DEGBUGGING, + * runtime. It is initialized to the value ISC_MEM_DEGBUGGING, * which is 0 by default but may be overridden at compile time. * The following flags can be specified: * @@ -106,7 +106,7 @@ LIBISC_EXTERNAL_DATA extern unsigned int * Crash if a free doesn't match an allocation. * * \li #ISC_MEM_DEBUGUSAGE - * If a hi_water mark is set, print the maximium inuse memory + * If a hi_water mark is set, print the maximum inuse memory * every time it is raised once it exceeds the hi_water mark. * * \li #ISC_MEM_DEBUGSIZE @@ -154,11 +154,12 @@ LIBISC_EXTERNAL_DATA extern unsigned int #define isc_mem_get(c, s) isc__mem_get((c), (s) _ISC_MEM_FILELINE) #define isc_mem_allocate(c, s) isc__mem_allocate((c), (s) _ISC_MEM_FILELINE) +#define isc_mem_reallocate(c, p, s) isc__mem_reallocate((c), (p), (s) _ISC_MEM_FILELINE) #define isc_mem_strdup(c, p) isc__mem_strdup((c), (p) _ISC_MEM_FILELINE) #define isc_mempool_get(c) isc__mempool_get((c) _ISC_MEM_FILELINE) /*% - * isc_mem_putanddetach() is a convienence function for use where you + * isc_mem_putanddetach() is a convenience function for use where you * have a structure with an attached memory context. * * Given: @@ -341,12 +342,12 @@ isc_mem_setwater(isc_mem_t *mctx, isc_me * * When the memory usage of 'mctx' exceeds 'hiwater', * '(water)(water_arg, #ISC_MEM_HIWATER)' will be called. 'water' needs to - * call isc_mem_waterack() with #ISC_MEM_HIWATER to acknowlege the state + * call isc_mem_waterack() with #ISC_MEM_HIWATER to acknowledge the state * change. 'water' may be called multiple times. * * When the usage drops below 'lowater', 'water' will again be called, this * time with #ISC_MEM_LOWATER. 'water' need to calls isc_mem_waterack() with - * #ISC_MEM_LOWATER to acknowlege the change. + * #ISC_MEM_LOWATER to acknowledge the change. * * static void * water(void *arg, int mark) { @@ -373,7 +374,7 @@ isc_mem_setwater(isc_mem_t *mctx, isc_me void isc_mem_waterack(isc_mem_t *ctx, int mark); /*%< - * Called to acknowledge changes in signalled by calls to 'water'. + * Called to acknowledge changes in signaled by calls to 'water'. */ void @@ -512,7 +513,7 @@ isc_mempool_associatelock(isc_mempool_t * and it is also used to set or get internal state via the isc_mempool_get*() * and isc_mempool_set*() set of functions. * - * Mutiple pools can each share a single lock. For instance, if "manager" + * Multiple pools can each share a single lock. For instance, if "manager" * type object contained pools for various sizes of events, and each of * these pools used a common lock. Note that this lock must NEVER be used * by other than mempool routines once it is given to a pool, since that can @@ -612,6 +613,8 @@ void isc__mem_put(isc_mem_t *, void *, size_t _ISC_MEM_FLARG); void * isc__mem_allocate(isc_mem_t *, size_t _ISC_MEM_FLARG); +void * +isc__mem_reallocate(isc_mem_t *, void *, size_t _ISC_MEM_FLARG); void isc__mem_free(isc_mem_t *, void * _ISC_MEM_FLARG); char * Index: lib/dns/openssl_link.c =================================================================== RCS file: /var/snap/bind9/lib/dns/openssl_link.c,v retrieving revision 1.22 retrieving revision 1.22.112.3 diff -u -p -r1.22 -r1.22.112.3 --- lib/dns/openssl_link.c 5 Apr 2008 23:47:11 -0000 1.22 +++ lib/dns/openssl_link.c 11 Feb 2009 03:07:01 -0000 1.22.112.3 @@ -1,5 +1,5 @@ /* - * Portions Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Portions Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -31,7 +31,7 @@ /* * Principal Author: Brian Wellington - * $Id: openssl_link.c,v 1.22 2008/04/05 23:47:11 tbox Exp $ + * $Id: openssl_link.c,v 1.22.112.3 2009/02/11 03:07:01 jinmei Exp $ */ #ifdef OPENSSL @@ -148,18 +148,8 @@ mem_free(void *ptr) { static void * mem_realloc(void *ptr, size_t size) { - void *p; - INSIST(dst__memory_pool != NULL); - p = NULL; - if (size > 0U) { - p = mem_alloc(size); - if (p != NULL && ptr != NULL) - memcpy(p, ptr, size); - } - if (ptr != NULL) - mem_free(ptr); - return (p); + return (isc_mem_reallocate(dst__memory_pool, ptr, size)); } isc_result_t @@ -252,7 +242,7 @@ dst__openssl_init() { for (e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e)) { /* - * Something wierd here. If we call ENGINE_finish() + * Something weird here. If we call ENGINE_finish() * ENGINE_get_default_RAND() will fail. */ if (ENGINE_init(e)) { @@ -386,7 +376,7 @@ dst__openssl_setdefault(const char *name * * 'engine_id' is the openssl engine name. * - * pre_cmds and post_cmds a sequence if command arguement pairs + * pre_cmds and post_cmds a sequence if command argument pairs * pre_num and post_num are a count of those pairs. * * "SO_PATH", PKCS11_SO_PATH ("/usr/local/lib/engines/engine_pkcs11.so") Index: bind.spec =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- bind.spec 24 Feb 2009 04:40:50 -0000 1.302 +++ bind.spec 4 Mar 2009 09:27:48 -0000 1.303 @@ -21,7 +21,7 @@ Name: bind License: ISC Version: 9.6.0 -Release: 6.%{PATCHVER}%{?dist} +Release: 7.%{PATCHVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,6 +66,7 @@ Patch99: bind-96-libtool2.patch Patch101:bind-96-old-api.patch Patch102:bind-95-rh452060.patch +Patch103:bind-96-realloc.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -246,6 +247,7 @@ %endif %patch102 -p1 -b .rh452060 +%patch103 -p0 -b .realloc # Sparc and s390 arches need to use -fPIE %ifarch sparcv9 sparc64 s390 s390x @@ -604,6 +606,9 @@ %ghost %{chroot_prefix}/etc/localtime %changelog +* Wed Mar 04 2009 Adam Tkac - 32:9.6.0-7.P1 +- fixed some read buffer overflows (upstream) + * Mon Feb 23 2009 Fedora Release Engineering - 32:9.6.0-6.P1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Wed Mar 4 09:50:50 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Wed, 4 Mar 2009 09:50:50 +0000 (UTC) Subject: rpms/sooperlooper/devel sooperlooper-1.6.13-consts.patch, NONE, 1.1 sooperlooper.spec, 1.5, 1.6 Message-ID: <20090304095050.EE6FF70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/sooperlooper/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31480 Modified Files: sooperlooper.spec Added Files: sooperlooper-1.6.13-consts.patch Log Message: constify ret of strchr(const char*) sooperlooper-1.6.13-consts.patch: --- NEW FILE sooperlooper-1.6.13-consts.patch --- diff -ru sooperlooper-1.6.13.orig/libs/midi++/midi.cc sooperlooper-1.6.13/libs/midi++/midi.cc --- sooperlooper-1.6.13.orig/libs/midi++/midi.cc 2009-03-04 09:28:54.000000000 +0000 +++ sooperlooper-1.6.13/libs/midi++/midi.cc 2009-03-04 09:36:18.000000000 +0000 @@ -159,7 +159,7 @@ MIDI::decode_controller_name (const char *name) { - char *lparen; + const char *lparen; size_t len; if ((lparen = strrchr (name, '(')) != 0) { diff -ru sooperlooper-1.6.13.orig/libs/pbd/basename.cc sooperlooper-1.6.13/libs/pbd/basename.cc --- sooperlooper-1.6.13.orig/libs/pbd/basename.cc 2009-03-04 09:28:54.000000000 +0000 +++ sooperlooper-1.6.13/libs/pbd/basename.cc 2009-03-04 09:29:30.000000000 +0000 @@ -6,7 +6,7 @@ PBD::basename (const char *path) { - char *slash; + const char *slash; if ((slash = strrchr (path, '/')) == 0) { return strdup (path); diff -ru sooperlooper-1.6.13.orig/libs/pbd/dirname.cc sooperlooper-1.6.13/libs/pbd/dirname.cc --- sooperlooper-1.6.13.orig/libs/pbd/dirname.cc 2009-03-04 09:28:54.000000000 +0000 +++ sooperlooper-1.6.13/libs/pbd/dirname.cc 2009-03-04 09:29:24.000000000 +0000 @@ -9,7 +9,7 @@ PBD::dirname (const char *path) { - char *slash; + const char *slash; size_t len; char *ret; Index: sooperlooper.spec =================================================================== RCS file: /cvs/pkgs/rpms/sooperlooper/devel/sooperlooper.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sooperlooper.spec 26 Feb 2009 02:03:11 -0000 1.5 +++ sooperlooper.spec 4 Mar 2009 09:50:18 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Realtime software looping sampler Name: sooperlooper Version: 1.6.13 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://essej.net/sooperlooper/ @@ -16,6 +16,8 @@ BuildRequires: libsigc++-devel libsndfile-devel liblo-devel fftw-devel BuildRequires: libsamplerate-devel alsa-lib-devel libxml2-devel +Patch0: sooperlooper-1.6.13-consts.patch + %description SooperLooper is a realtime software looping sampler in the spirit of Gibson's Echoplex Digital Pro. If used with a low-latency kernel and @@ -25,6 +27,7 @@ %prep %setup -q +%patch0 -p1 -b .consts # kill the stubborn overriding of CXXFLAGS sed -i 's/OPT_FLAGS="$OPT_FLAGS -pipe"/OPT_FLAGS=""/g' configure sed -i 's/OPT_FLAGS="$OPT_FLAGS -pipe"/OPT_FLAGS="%{optflags}"/g' \ @@ -82,6 +85,9 @@ %changelog +* Wed Mar 04 2009 Caol??n McNamara - 1.6.13-3 +- constify ret of strchr(const char*) + * Wed Feb 25 2009 Fedora Release Engineering - 1.6.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From thias at fedoraproject.org Wed Mar 4 10:31:28 2009 From: thias at fedoraproject.org (Matthias Saou) Date: Wed, 4 Mar 2009 10:31:28 +0000 (UTC) Subject: rpms/elisa/F-9 elisa-0.5.29-disable-plugin-updates.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 elisa.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <20090304103128.2837770117@cvs1.fedora.phx.redhat.com> Author: thias Update of /cvs/extras/rpms/elisa/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4976/F-9 Modified Files: .cvsignore elisa.spec sources Added Files: elisa-0.5.29-disable-plugin-updates.patch Log Message: Update to 0.5.30 (at last!). elisa-0.5.29-disable-plugin-updates.patch: --- NEW FILE elisa-0.5.29-disable-plugin-updates.patch --- diff -Naupr elisa-0.5.29.orig/elisa/core/plugin_registry.py elisa-0.5.29/elisa/core/plugin_registry.py --- elisa-0.5.29.orig/elisa/core/plugin_registry.py 2009-02-23 16:58:28.000000000 +0100 +++ elisa-0.5.29/elisa/core/plugin_registry.py 2009-02-28 15:38:10.347332907 +0100 @@ -156,8 +156,8 @@ class PluginRegistry(Loggable): default_config = \ {'repository': 'http://elisa-plugins.fluendo.com/plugin_list', 'update_plugin_cache': True, - 'auto_update_plugins': True, - 'auto_install_new_recommended_plugins': True} + 'auto_update_plugins': False, + 'auto_install_new_recommended_plugins': False} config_doc = \ {'repository': 'The plugin repository to query for new plugins and ' \ 'plugin updates.', Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/elisa/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Feb 2008 23:53:30 -0000 1.5 +++ .cvsignore 4 Mar 2009 10:30:57 -0000 1.6 @@ -1 +1 @@ -elisa-0.3.3.tar.gz +elisa-0.5.30.tar.gz Index: elisa.spec =================================================================== RCS file: /cvs/extras/rpms/elisa/F-9/elisa.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- elisa.spec 23 Feb 2008 23:53:30 -0000 1.5 +++ elisa.spec 4 Mar 2009 10:30:57 -0000 1.6 @@ -2,68 +2,57 @@ Summary: Media Center Name: elisa -Version: 0.3.3 +Version: 0.5.30 Release: 1%{?dist} -# Elisa is GPLv3 and plugins are MIT. +# The base of Elisa is GPLv3, some plugins are MIT but are in other packages. # See the included COPYING file for the details. -License: GPLv3 and MIT +License: GPLv3 Group: Applications/Multimedia URL: http://elisa.fluendo.com/ -Source: http://elisa.fluendo.com/static/download/elisa/elisa-%{version}.tar.gz -Patch0: elisa-0.3.2-desktop.patch +Source0: http://elisa.fluendo.com/static/download/elisa/elisa-%{version}.tar.gz +Patch0: elisa-0.5.29-disable-plugin-updates.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -# Mandatory -Requires: python-setuptools -Requires: python-imaging -Requires: python-twisted-core -Requires: gnome-python2-extras -Requires: gstreamer-python -Requires: pigment-python >= 0.3.2 -# For uPnP -Requires: python-Coherence -# For caching -Requires: python-sqlite2 -Requires: python-tag -# Optional, but these are useful to get something useful out of elisa -Requires: gstreamer-plugins-good -#Requires: gstreamer-plugins-bad -#Requires: gstreamer-plugins-ugly -#Requires: gstreamer-ffmpeg -#Requires: libdvdcss -# For lirc -Requires: python-lirc -# For DAAP -Requires: python-daap -Requires: dbus-python -Requires: avahi-tools -# For iPod -Requires: python-gpod -# For weather -Requires: python-metar -# For the "official" default font ("MgOpen Cosmetica") -Requires: mgopen-fonts -# For ... ? (but checked at runtime) -Requires: python-BeautifulSoup -# For the "build" itself, most of the above aren't required +# Our "base" files for building the plugins where the main requirements are +Requires: elisa-base = %{version}-%{release} +# Plugins. The bad are actually mandatory (they contain the GUI for instance) +Requires: elisa-plugins-good >= %{version} +Requires: elisa-plugins-bad >= %{version} +# For the "build" itself, most of the above aren't required, just these BuildRequires: python-devel BuildRequires: python-twisted-core -BuildRequires: gstreamer-python -# Must have setuptools to build the package -# The build portions moved to a subpackage in F-8 -%if 0%{?fedora} >= 8 BuildRequires: python-setuptools-devel -%else -BuildRequires: python-setuptools -%endif Buildarch: noarch %description Media center solution using the GStreamer multimedia framework. +%package base +Summary: Base files for the Elisa Media Center +Group: Applications/Multimedia +# Mandatory +Requires: python-setuptools +Requires: python-imaging +Requires: gnome-python2-extras +# elisa/core/utils/misc.py at least requires this +Requires: python-twisted-core +# elisa/core/applition.py at least requires this (as of 0.5.17, still 0.5.18) +Requires: python-twisted-web +# We used to have a "common" package providing the "devel" +# Then we used to have a "devel" package... but now we just BR "base" +Obsoletes: elisa-common < 0.5.9 +Obsoletes: elisa-devel < 0.5.14 +# The whole point of having this base package is to split off the basic files +# which are required to build the plugins, since those plugins are runtime +# required by the main "elisa" package (avoid a dependency loop). + +%description base +Base files for the Elisa Media Center. + + %prep %setup -q -%patch0 -p1 -b .desktop +%patch0 -p1 %build @@ -76,9 +65,8 @@ --single-version-externally-managed \ -O1 --skip-build --root %{buildroot} -# Remove this i386 only binary plugin... -%{__rm} -f %{buildroot}%{python_sitelib}/elisa/plugins/ugly/youtube/libgstflvdemux.so - +# Create empty plugins directory +%{__mkdir_p} %{buildroot}%{python_sitelib}/elisa/plugins %clean %{__rm} -rf %{buildroot} @@ -86,15 +74,148 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING FAQ* FIRST_RUN LICENSE* NEWS RELEASE docs/*.txt +%doc AUTHORS FAQ FIRST_RUN NEWS README docs/*.txt %{_bindir}/elisa %{_datadir}/applications/elisa.desktop +%exclude %{_datadir}/applications/elisa-mobile.desktop +%{_datadir}/dbus-1/services/com.fluendo.elisa.service +%exclude %{_datadir}/icons/elisa.png %{_datadir}/pixmaps/elisa.png +%{_mandir}/man1/elisa.1* + +%files base +%defattr(-,root,root,-) +%doc COPYING LICENSE* %{python_sitelib}/elisa/ %{python_sitelib}/elisa-*.egg-info/ +%{python_sitelib}/elisa-*-nspkg.pth %changelog +* Tue Mar 3 2009 Matthias Saou 0.5.30-1 +- Update to 0.5.30. + +* Sat Feb 28 2009 Matthias Saou 0.5.29-1 +- Update to 0.5.29. +- Include patch to disable automatic updates, which should better conform with + Fedora packaging policies. + +* Tue Feb 17 2009 Matthias Saou 0.5.28-1 +- Update to 0.5.28. + +* Fri Feb 13 2009 Matthias Saou 0.5.27-1 +- Update to 0.5.27. + +* Sat Feb 7 2009 Matthias Saou 0.5.26-1 +- Update to 0.5.26. + +* Wed Jan 21 2009 Matthias Saou 0.5.24.1-1 +- Update to 0.5.24.1. +- Drop the mgopen-fonts req, it hasn't been the default font for a while. + +* Mon Jan 12 2009 Matthias Saou 0.5.23-1 +- Update to 0.5.23. + +* Thu Dec 18 2008 Matthias Saou 0.5.22-1 +- Update to 0.5.22. + +* Mon Dec 1 2008 Matthias Saou 0.5.20-1 +- Update to 0.5.20. + +* Mon Nov 24 2008 Matthias Saou 0.5.19-1 +- Update to 0.5.19. + +* Mon Nov 17 2008 Matthias Saou 0.5.18-1 +- Update to 0.5.18. + +* Sun Nov 9 2008 Matthias Saou 0.5.17-2 +- Add (now) missing python-twisted-web requirement. + +* Tue Nov 4 2008 Matthias Saou 0.5.17-1 +- Update to 0.5.17. + +* Mon Oct 27 2008 Matthias Saou 0.5.16-1 +- Update to 0.5.16. + +* Tue Oct 21 2008 Matthias Saou 0.5.15-1 +- Update to 0.5.15. + +* Mon Oct 13 2008 Matthias Saou 0.5.14-1 +- Update to 0.5.14. + +* Fri Oct 10 2008 Matthias Saou 0.5.13-2 +- Go back to using an elisa/elisa-base split, we'll just BR elisa-base in + the plugins. + +* Tue Oct 7 2008 Matthias Saou 0.5.13-1 +- Update to 0.5.13. + +* Tue Sep 30 2008 Matthias Saou 0.5.12-1 +- Update to 0.5.12. + +* Tue Sep 23 2008 Matthias Saou 0.5.11-1 +- Update to 0.5.11. + +* Tue Sep 16 2008 Matthias Saou 0.5.10-1 +- Update to 0.5.10. + +* Tue Sep 9 2008 Matthias Saou 0.5.9-1 +- Update to 0.5.9. + +* Mon Sep 2 2008 Matthias Saou 0.5.8-3 +- Update to 0.5.8. +- Replace the "common" package approach with a split out "devel" one which + contains some duplicated files from the main package. + +* Tue Aug 26 2008 Matthias Saou 0.5.7-1 +- Update to 0.5.7. + +* Tue Aug 19 2008 Matthias Saou 0.5.6-1 +- Update to 0.5.6. +- Require the exact same elisa plugins version, as elisa and all plugins are + always released all at once and should always match. + +* Mon Aug 11 2008 Matthias Saou 0.5.5-1 +- Update to 0.5.5. + +* Fri Aug 8 2008 Matthias Saou 0.5.4-1 +- Update to 0.5.4. + +* Tue Jul 29 2008 Matthias Saou 0.5.3-1 +- Update to 0.5.3. + +* Wed Jul 23 2008 Matthias Saou 0.5.2-4 +- Update to 0.5.2. +- Split a "common" sub-package required by the main "elisa" package and + providing a "devel" sub-package. +- Add plugins requirements, made possible thanks to the above hack. +- Update requirements, moving many to the proper plugins sub-packages. + +* Tue Jul 15 2008 Matthias Saou 0.5.1-6 +- Update to the fixed 0.5.1 tarball. +- Remove Windows specific plugins from the default configuration. + +* Mon Jul 14 2008 Matthias Saou 0.5.1-4 +- Use the right 0.5 branch, it's the "upicek" one, not "0.5", go figure... + +* Sat Jul 12 2008 Matthias Saou 0.5.1-3 +- Use a bzr branch as sources, as the 0.5.1 tarball is completely broken. +- Don't exclude the docs. + +* Fri Jul 11 2008 Matthias Saou 0.5.1-1 +- Update to 0.5.1. +- Include as sources the no longer provided elisa.desktop and elisa.png. +- Remove no longer needed desktop file patch. + +* Wed Mar 12 2008 Matthias Saou 0.3.5-1 +- Update to 0.3.5. +- Add new included files. +- Include empty plugins directory. + +* Tue Mar 4 2008 Matthias Saou 0.3.4-1 +- Update to 0.3.4. +- Add new elisa-plugins-* requirements. + * Sun Feb 24 2008 Matthias Saou 0.3.3-2 - Require pigment-python instead of pigment now that it has been split out. Index: sources =================================================================== RCS file: /cvs/extras/rpms/elisa/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Feb 2008 23:53:30 -0000 1.5 +++ sources 4 Mar 2009 10:30:57 -0000 1.6 @@ -1 +1 @@ -44397c8c0c70fcf3eabae5bad9fd514d elisa-0.3.3.tar.gz +e733f377103d2ded6eb4acc16fbf1768 elisa-0.5.30.tar.gz From thias at fedoraproject.org Wed Mar 4 10:31:28 2009 From: thias at fedoraproject.org (Matthias Saou) Date: Wed, 4 Mar 2009 10:31:28 +0000 (UTC) Subject: rpms/elisa/F-10 elisa-0.5.29-disable-plugin-updates.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 elisa.spec, 1.9, 1.10 sources, 1.8, 1.9 Message-ID: <20090304103128.2470870116@cvs1.fedora.phx.redhat.com> Author: thias Update of /cvs/extras/rpms/elisa/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4976/F-10 Modified Files: .cvsignore elisa.spec sources Added Files: elisa-0.5.29-disable-plugin-updates.patch Log Message: Update to 0.5.30 (at last!). elisa-0.5.29-disable-plugin-updates.patch: --- NEW FILE elisa-0.5.29-disable-plugin-updates.patch --- diff -Naupr elisa-0.5.29.orig/elisa/core/plugin_registry.py elisa-0.5.29/elisa/core/plugin_registry.py --- elisa-0.5.29.orig/elisa/core/plugin_registry.py 2009-02-23 16:58:28.000000000 +0100 +++ elisa-0.5.29/elisa/core/plugin_registry.py 2009-02-28 15:38:10.347332907 +0100 @@ -156,8 +156,8 @@ class PluginRegistry(Loggable): default_config = \ {'repository': 'http://elisa-plugins.fluendo.com/plugin_list', 'update_plugin_cache': True, - 'auto_update_plugins': True, - 'auto_install_new_recommended_plugins': True} + 'auto_update_plugins': False, + 'auto_install_new_recommended_plugins': False} config_doc = \ {'repository': 'The plugin repository to query for new plugins and ' \ 'plugin updates.', Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/elisa/F-10/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Oct 2008 19:21:10 -0000 1.8 +++ .cvsignore 4 Mar 2009 10:30:56 -0000 1.9 @@ -1 +1 @@ -elisa-0.5.16.tar.gz +elisa-0.5.30.tar.gz Index: elisa.spec =================================================================== RCS file: /cvs/extras/rpms/elisa/F-10/elisa.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- elisa.spec 27 Oct 2008 19:21:10 -0000 1.9 +++ elisa.spec 4 Mar 2009 10:30:56 -0000 1.10 @@ -2,29 +2,22 @@ Summary: Media Center Name: elisa -Version: 0.5.16 +Version: 0.5.30 Release: 1%{?dist} -# Elisa is GPLv3 and plugins are MIT. +# The base of Elisa is GPLv3, some plugins are MIT but are in other packages. # See the included COPYING file for the details. -License: GPLv3 and MIT +License: GPLv3 Group: Applications/Multimedia URL: http://elisa.fluendo.com/ Source0: http://elisa.fluendo.com/static/download/elisa/elisa-%{version}.tar.gz +Patch0: elisa-0.5.29-disable-plugin-updates.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -# Mandatory -Requires: python-setuptools -Requires: python-imaging -Requires: gnome-python2-extras -# Our split out "base" files used for building the plugins +# Our "base" files for building the plugins where the main requirements are Requires: elisa-base = %{version}-%{release} -# elisa/core/utils/misc.py at least requires this -Requires: python-twisted-core # Plugins. The bad are actually mandatory (they contain the GUI for instance) -Requires: elisa-plugins-good = %{version} -Requires: elisa-plugins-bad = %{version} -# For the "official" default font ("MgOpen Cosmetica") -Requires: mgopen-fonts -# For the "build" itself, most of the above aren't required +Requires: elisa-plugins-good >= %{version} +Requires: elisa-plugins-bad >= %{version} +# For the "build" itself, most of the above aren't required, just these BuildRequires: python-devel BuildRequires: python-twisted-core BuildRequires: python-setuptools-devel @@ -43,6 +36,8 @@ Requires: gnome-python2-extras # elisa/core/utils/misc.py at least requires this Requires: python-twisted-core +# elisa/core/applition.py at least requires this (as of 0.5.17, still 0.5.18) +Requires: python-twisted-web # We used to have a "common" package providing the "devel" # Then we used to have a "devel" package... but now we just BR "base" Obsoletes: elisa-common < 0.5.9 @@ -57,6 +52,7 @@ %prep %setup -q +%patch0 -p1 %build @@ -78,9 +74,8 @@ %files %defattr(-,root,root,-) +%doc AUTHORS FAQ FIRST_RUN NEWS README docs/*.txt %{_bindir}/elisa -# Doesn't work (as of 0.5.2), and not sure what it's used for anyway -%exclude %{_bindir}/elisa-get %{_datadir}/applications/elisa.desktop %exclude %{_datadir}/applications/elisa-mobile.desktop %{_datadir}/dbus-1/services/com.fluendo.elisa.service @@ -90,14 +85,55 @@ %files base %defattr(-,root,root,-) -%doc COPYING FAQ* LICENSE* NEWS RELEASE +%doc COPYING LICENSE* %{python_sitelib}/elisa/ %{python_sitelib}/elisa-*.egg-info/ %{python_sitelib}/elisa-*-nspkg.pth -%{python_sitelib}/elisa_generic_setup.py* %changelog +* Tue Mar 3 2009 Matthias Saou 0.5.30-1 +- Update to 0.5.30. + +* Sat Feb 28 2009 Matthias Saou 0.5.29-1 +- Update to 0.5.29. +- Include patch to disable automatic updates, which should better conform with + Fedora packaging policies. + +* Tue Feb 17 2009 Matthias Saou 0.5.28-1 +- Update to 0.5.28. + +* Fri Feb 13 2009 Matthias Saou 0.5.27-1 +- Update to 0.5.27. + +* Sat Feb 7 2009 Matthias Saou 0.5.26-1 +- Update to 0.5.26. + +* Wed Jan 21 2009 Matthias Saou 0.5.24.1-1 +- Update to 0.5.24.1. +- Drop the mgopen-fonts req, it hasn't been the default font for a while. + +* Mon Jan 12 2009 Matthias Saou 0.5.23-1 +- Update to 0.5.23. + +* Thu Dec 18 2008 Matthias Saou 0.5.22-1 +- Update to 0.5.22. + +* Mon Dec 1 2008 Matthias Saou 0.5.20-1 +- Update to 0.5.20. + +* Mon Nov 24 2008 Matthias Saou 0.5.19-1 +- Update to 0.5.19. + +* Mon Nov 17 2008 Matthias Saou 0.5.18-1 +- Update to 0.5.18. + +* Sun Nov 9 2008 Matthias Saou 0.5.17-2 +- Add (now) missing python-twisted-web requirement. + +* Tue Nov 4 2008 Matthias Saou 0.5.17-1 +- Update to 0.5.17. + * Mon Oct 27 2008 Matthias Saou 0.5.16-1 - Update to 0.5.16. Index: sources =================================================================== RCS file: /cvs/extras/rpms/elisa/F-10/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Oct 2008 19:21:10 -0000 1.8 +++ sources 4 Mar 2009 10:30:56 -0000 1.9 @@ -1 +1 @@ -1ab90d7596bdffb13be3051e9ae997b9 elisa-0.5.16.tar.gz +e733f377103d2ded6eb4acc16fbf1768 elisa-0.5.30.tar.gz From thias at fedoraproject.org Wed Mar 4 10:32:47 2009 From: thias at fedoraproject.org (Matthias Saou) Date: Wed, 4 Mar 2009 10:32:47 +0000 (UTC) Subject: rpms/elisa-plugins-good/F-10 .cvsignore, 1.2, 1.3 elisa-plugins-good.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090304103247.0F2AE70116@cvs1.fedora.phx.redhat.com> Author: thias Update of /cvs/extras/rpms/elisa-plugins-good/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5304/F-10 Modified Files: .cvsignore elisa-plugins-good.spec sources Log Message: Backport 0.5.30 update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/elisa-plugins-good/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Feb 2009 09:55:22 -0000 1.2 +++ .cvsignore 4 Mar 2009 10:32:16 -0000 1.3 @@ -1 +1 @@ -elisa-plugins-good-0.5.28.tar.gz +elisa-plugins-good-0.5.30.tar.gz Index: elisa-plugins-good.spec =================================================================== RCS file: /cvs/extras/rpms/elisa-plugins-good/F-10/elisa-plugins-good.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- elisa-plugins-good.spec 19 Feb 2009 09:55:22 -0000 1.1 +++ elisa-plugins-good.spec 4 Mar 2009 10:32:16 -0000 1.2 @@ -2,7 +2,7 @@ Summary: Good Plugins for the Elisa Media Center Name: elisa-plugins-good -Version: 0.5.28 +Version: 0.5.30 Release: 1%{?dist} License: GPLv3 Group: Applications/Multimedia @@ -58,6 +58,12 @@ %changelog +* Tue Mar 3 2009 Matthias Saou 0.5.30-1 +- Update to 0.5.30. + +* Sat Feb 28 2009 Matthias Saou 0.5.29-1 +- Update to 0.5.29. + * Tue Feb 17 2009 Matthias Saou 0.5.28-1 - Update to 0.5.28. Index: sources =================================================================== RCS file: /cvs/extras/rpms/elisa-plugins-good/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Feb 2009 09:55:22 -0000 1.2 +++ sources 4 Mar 2009 10:32:16 -0000 1.3 @@ -1 +1 @@ -92b6d8fcd4f44370ec86c04ee7c5fba6 elisa-plugins-good-0.5.28.tar.gz +104b35232f7f765cacb4c3220dda8944 elisa-plugins-good-0.5.30.tar.gz From thias at fedoraproject.org Wed Mar 4 10:32:47 2009 From: thias at fedoraproject.org (Matthias Saou) Date: Wed, 4 Mar 2009 10:32:47 +0000 (UTC) Subject: rpms/elisa-plugins-good/F-9 .cvsignore, 1.2, 1.3 elisa-plugins-good.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090304103247.AB9A070116@cvs1.fedora.phx.redhat.com> Author: thias Update of /cvs/extras/rpms/elisa-plugins-good/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5304/F-9 Modified Files: .cvsignore elisa-plugins-good.spec sources Log Message: Backport 0.5.30 update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/elisa-plugins-good/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Feb 2009 09:55:23 -0000 1.2 +++ .cvsignore 4 Mar 2009 10:32:17 -0000 1.3 @@ -1 +1 @@ -elisa-plugins-good-0.5.28.tar.gz +elisa-plugins-good-0.5.30.tar.gz Index: elisa-plugins-good.spec =================================================================== RCS file: /cvs/extras/rpms/elisa-plugins-good/F-9/elisa-plugins-good.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- elisa-plugins-good.spec 19 Feb 2009 09:55:23 -0000 1.1 +++ elisa-plugins-good.spec 4 Mar 2009 10:32:17 -0000 1.2 @@ -2,7 +2,7 @@ Summary: Good Plugins for the Elisa Media Center Name: elisa-plugins-good -Version: 0.5.28 +Version: 0.5.30 Release: 1%{?dist} License: GPLv3 Group: Applications/Multimedia @@ -58,6 +58,12 @@ %changelog +* Tue Mar 3 2009 Matthias Saou 0.5.30-1 +- Update to 0.5.30. + +* Sat Feb 28 2009 Matthias Saou 0.5.29-1 +- Update to 0.5.29. + * Tue Feb 17 2009 Matthias Saou 0.5.28-1 - Update to 0.5.28. Index: sources =================================================================== RCS file: /cvs/extras/rpms/elisa-plugins-good/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Feb 2009 09:55:23 -0000 1.2 +++ sources 4 Mar 2009 10:32:17 -0000 1.3 @@ -1 +1 @@ -92b6d8fcd4f44370ec86c04ee7c5fba6 elisa-plugins-good-0.5.28.tar.gz +104b35232f7f765cacb4c3220dda8944 elisa-plugins-good-0.5.30.tar.gz From thias at fedoraproject.org Wed Mar 4 10:42:42 2009 From: thias at fedoraproject.org (Matthias Saou) Date: Wed, 4 Mar 2009 10:42:42 +0000 (UTC) Subject: rpms/elisa-plugins-bad/F-10 elisa-plugins-bad-0.5.2-install.patch, NONE, 1.1 elisa-plugins-bad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304104242.8876470116@cvs1.fedora.phx.redhat.com> Author: thias Update of /cvs/extras/rpms/elisa-plugins-bad/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6017/F-10 Modified Files: .cvsignore sources Added Files: elisa-plugins-bad-0.5.2-install.patch elisa-plugins-bad.spec Log Message: Backport 0.5.30 update. elisa-plugins-bad-0.5.2-install.patch: --- NEW FILE elisa-plugins-bad-0.5.2-install.patch --- diff -Naupr elisa-plugins-bad-0.5.2.orig/setup_bundle.py elisa-plugins-bad-0.5.2/setup_bundle.py --- elisa-plugins-bad-0.5.2.orig/setup_bundle.py 2008-07-21 19:24:34.000000000 +0200 +++ elisa-plugins-bad-0.5.2/setup_bundle.py 2008-07-23 16:22:10.000000000 +0200 @@ -7,14 +7,10 @@ def setup(args, plugins): if installed: # Run extracted from the tarball to install plugins_dir = os.path.normpath(os.path.join(script_dir, 'elisa', 'plugins')) - if os.path.exists(build_dir): - shutil.rmtree(build_dir) else: # Run from the development branch to create the tarball plugins_dir = os.path.normpath(os.path.join(script_dir, '..', 'elisa-plugins', 'elisa', 'plugins')) for plugin in plugins: - if 'install' in args and installed and os.path.exists(build_dir): - shutil.rmtree(build_dir) script = os.path.join(plugins_dir, plugin, 'setup.py') subprocess.call([sys.executable, script] + args) --- NEW FILE elisa-plugins-bad.spec --- %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Summary: Bad Plugins for the Elisa Media Center Name: elisa-plugins-bad Version: 0.5.30 Release: 1%{?dist} License: GPLv3 Group: Applications/Multimedia URL: http://elisa.fluendo.com/ Source: http://elisa.fluendo.com/static/download/elisa/elisa-plugins-bad-%{version}.tar.gz Patch0: elisa-plugins-bad-0.5.2-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # For the parent directories Requires: elisa >= %{version} # Plugin requirements, in order, only once each # amazon # amp # avahi Requires: dbus-python Requires: avahi-tools # coherence Requires: python-Coherence # daap Requires: python-twisted-web2 # database Requires: python-storm-sqlite # discogs #Requires: python-twisted-web2 # dvd ## elisa_updater # favorites Requires: ipython # filtered_shares # gstreamer Requires: gstreamer-python Requires: gstreamer-plugins-good Requires: python-imaging # http_client #Requires: python-twisted-web2 # ipod Requires: python-gpod # osso #Requires: dbus-python # pigment Requires: pigment-python >= 0.3.8 Requires: pygtk2 Requires: python-cssutils # poblesec (gst.element_factory_make('libvisual_jess')) #Requires: libvisual-plugins #Requires: pygtk2 #Requires: python-dbus # search # shelf ## smbwin32 ## winremote ## wmd # yesfm Requires: python-simplejson #Requires: python-twisted-web2 BuildRequires: elisa-base = %{version} BuildRequires: python-devel BuildArch: noarch %description This package contains the bad set of plugins for the Elisa Media Center, plugins which are not considered feature complete or polished enough to be in the good set of plugins, but do not present any licensing issues. %prep %setup -q %patch0 -p1 %build %{__python} setup.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install \ --single-version-externally-managed \ -O1 --skip-build --root %{buildroot} # Remove Windows only plugins %{__rm} -rf %{buildroot}%{python_sitelib}/elisa/plugins/elisa_updater/ \ %{buildroot}%{python_sitelib}/elisa_plugin_elisa_updater* \ %{buildroot}%{python_sitelib}/elisa/plugins/smbwin32/ \ %{buildroot}%{python_sitelib}/elisa_plugin_smb_win32* \ %{buildroot}%{python_sitelib}/elisa/plugins/winremote/ \ %{buildroot}%{python_sitelib}/elisa_plugin_winremote* \ %{buildroot}%{python_sitelib}/elisa/plugins/wmd/ \ %{buildroot}%{python_sitelib}/elisa_plugin_wmd* %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %{python_sitelib}/elisa/plugins/amazon/ %{python_sitelib}/elisa/plugins/amp/ %{python_sitelib}/elisa/plugins/avahi/ %{python_sitelib}/elisa/plugins/coherence/ %{python_sitelib}/elisa/plugins/daap/ %{python_sitelib}/elisa/plugins/database/ %{python_sitelib}/elisa/plugins/discogs/ %{python_sitelib}/elisa/plugins/dvd/ %{python_sitelib}/elisa/plugins/favorites/ %{python_sitelib}/elisa/plugins/filtered_shares/ %{python_sitelib}/elisa/plugins/gstreamer/ %{python_sitelib}/elisa/plugins/http_client/ %{python_sitelib}/elisa/plugins/ipod/ %{python_sitelib}/elisa/plugins/osso/ %{python_sitelib}/elisa/plugins/pigment/ %{python_sitelib}/elisa/plugins/poblesec/ %{python_sitelib}/elisa/plugins/rss/ %{python_sitelib}/elisa/plugins/search/ %{python_sitelib}/elisa/plugins/shelf/ %{python_sitelib}/elisa/plugins/themoviedb/ %{python_sitelib}/elisa/plugins/thetvdb/ %{python_sitelib}/elisa_plugin_* %changelog * Tue Mar 3 2009 Matthias Saou 0.5.30-1 - Update to 0.5.30. * Sat Feb 28 2009 Matthias Saou 0.5.29-1 - Update to 0.5.29. * Tue Feb 17 2009 Matthias Saou 0.5.28-1 - Update to 0.5.28. * Fri Feb 13 2009 Matthias Saou 0.5.27-1 - Update to 0.5.27. - Remove no longer present yesfm plugin. - Add new thetvdb and themoviedb plugins. * Sat Feb 7 2009 Matthias Saou 0.5.26-1 - Update to 0.5.26. * Mon Jan 26 2009 Matthias Saou 0.5.24.1-1 - Update to 0.5.24.1. * Mon Jan 12 2009 Matthias Saou 0.5.23-1 - Update to 0.5.23. * Sun Dec 28 2008 Matthias Saou 0.5.22-2 - Add missing python-cssutils requirement (used in the pigment plugin). * Thu Dec 18 2008 Matthias Saou 0.5.22-1 - Update to 0.5.22. - Include new rss plugin. * Mon Dec 1 2008 Matthias Saou 0.5.20-1 - Update to 0.5.20. * Mon Nov 24 2008 Matthias Saou 0.5.19-1 - Update to 0.5.19. * Mon Nov 17 2008 Matthias Saou 0.5.18-1 - Update to 0.5.18. * Mon Nov 10 2008 Matthias Saou 0.5.17-2 - Add python-simplejson requirement for the yesfm plugin. * Tue Nov 4 2008 Matthias Saou 0.5.17-1 - Update to 0.5.17. * Tue Oct 28 2008 Matthias Saou 0.5.16.1-1 - Update to 0.5.16.1. * Mon Oct 27 2008 Matthias Saou 0.5.16-1 - Update to 0.5.16. * Tue Oct 21 2008 Matthias Saou 0.5.15-1 - Update to 0.5.15. * Mon Oct 13 2008 Matthias Saou 0.5.14-1 - Update to 0.5.14. * Fri Oct 10 2008 Matthias Saou 0.5.13-2 - Build require elisa-base from now on. - Update description to explain what "bad" plugins are. * Tue Oct 7 2008 Matthias Saou 0.5.13-1 - Update to 0.5.13. * Tue Sep 30 2008 Matthias Saou 0.5.12-1 - Update to 0.5.12. * Tue Sep 23 2008 Matthias Saou 0.5.11-1 - Update to 0.5.11. * Tue Sep 16 2008 Matthias Saou 0.5.10-1 - Update to 0.5.10. * Tue Sep 9 2008 Matthias Saou 0.5.9-1 - Update to 0.5.9. * Mon Sep 2 2008 Matthias Saou 0.5.8-1 - Update to 0.5.8. * Tue Aug 26 2008 Matthias Saou 0.5.7-1 - Update to 0.5.7. * Tue Aug 19 2008 Matthias Saou 0.5.6-1 - Update to 0.5.6. - Require the exact same elisa version, as elisa and all plugins are always released all at once and should always match. * Mon Aug 11 2008 Matthias Saou 0.5.5-1 - Update to 0.5.5. * Fri Aug 8 2008 Matthias Saou 0.5.4-1 - Update to 0.5.4. * Tue Jul 29 2008 Matthias Saou 0.5.3-1 - Update to 0.5.3. - Exclude wmd plugin, the dependency problem should be fixed. - Disable all %%lang translations, they're gone... * Wed Jul 23 2008 Matthias Saou 0.5.2-2 - Update to 0.5.2. - List translations as %%lang. - Update the build patch which is still required. - Now build require the elisa-devel package. - Update requirements. * Tue Jul 15 2008 Matthias Saou 0.5.1-6 - Update to 0.5.1. - Add python-cssutils requirement for the pigment theme plugin. - Include install patch. - Remove winremote plugin, it seems to be Windows specific (win32api req). - Remove smbwin32 plugin, it seems to be Windows specific (win32net req). - Remove wmd plugin, it seems to be Windows specific (win32api req)... NOT! As the poblesec plugin requires it anyway (ugly, should go away). - Remove elisa_updater plugin, as we only want to update elisa with rpms. * Sun Mar 16 2008 Matthias Saou 0.3.5-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/elisa-plugins-bad/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:39:52 -0000 1.1 +++ .cvsignore 4 Mar 2009 10:42:12 -0000 1.2 @@ -0,0 +1 @@ +elisa-plugins-bad-0.5.30.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/elisa-plugins-bad/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:39:53 -0000 1.1 +++ sources 4 Mar 2009 10:42:12 -0000 1.2 @@ -0,0 +1 @@ +dac30feca252a25dd3d7cf147ad0d184 elisa-plugins-bad-0.5.30.tar.gz From thias at fedoraproject.org Wed Mar 4 10:42:42 2009 From: thias at fedoraproject.org (Matthias Saou) Date: Wed, 4 Mar 2009 10:42:42 +0000 (UTC) Subject: rpms/elisa-plugins-bad/F-9 elisa-plugins-bad-0.5.2-install.patch, NONE, 1.1 elisa-plugins-bad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304104242.AFB4570116@cvs1.fedora.phx.redhat.com> Author: thias Update of /cvs/extras/rpms/elisa-plugins-bad/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6017/F-9 Modified Files: .cvsignore sources Added Files: elisa-plugins-bad-0.5.2-install.patch elisa-plugins-bad.spec Log Message: Backport 0.5.30 update. elisa-plugins-bad-0.5.2-install.patch: --- NEW FILE elisa-plugins-bad-0.5.2-install.patch --- diff -Naupr elisa-plugins-bad-0.5.2.orig/setup_bundle.py elisa-plugins-bad-0.5.2/setup_bundle.py --- elisa-plugins-bad-0.5.2.orig/setup_bundle.py 2008-07-21 19:24:34.000000000 +0200 +++ elisa-plugins-bad-0.5.2/setup_bundle.py 2008-07-23 16:22:10.000000000 +0200 @@ -7,14 +7,10 @@ def setup(args, plugins): if installed: # Run extracted from the tarball to install plugins_dir = os.path.normpath(os.path.join(script_dir, 'elisa', 'plugins')) - if os.path.exists(build_dir): - shutil.rmtree(build_dir) else: # Run from the development branch to create the tarball plugins_dir = os.path.normpath(os.path.join(script_dir, '..', 'elisa-plugins', 'elisa', 'plugins')) for plugin in plugins: - if 'install' in args and installed and os.path.exists(build_dir): - shutil.rmtree(build_dir) script = os.path.join(plugins_dir, plugin, 'setup.py') subprocess.call([sys.executable, script] + args) --- NEW FILE elisa-plugins-bad.spec --- %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Summary: Bad Plugins for the Elisa Media Center Name: elisa-plugins-bad Version: 0.5.30 Release: 1%{?dist} License: GPLv3 Group: Applications/Multimedia URL: http://elisa.fluendo.com/ Source: http://elisa.fluendo.com/static/download/elisa/elisa-plugins-bad-%{version}.tar.gz Patch0: elisa-plugins-bad-0.5.2-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # For the parent directories Requires: elisa >= %{version} # Plugin requirements, in order, only once each # amazon # amp # avahi Requires: dbus-python Requires: avahi-tools # coherence Requires: python-Coherence # daap Requires: python-twisted-web2 # database Requires: python-storm-sqlite # discogs #Requires: python-twisted-web2 # dvd ## elisa_updater # favorites Requires: ipython # filtered_shares # gstreamer Requires: gstreamer-python Requires: gstreamer-plugins-good Requires: python-imaging # http_client #Requires: python-twisted-web2 # ipod Requires: python-gpod # osso #Requires: dbus-python # pigment Requires: pigment-python >= 0.3.8 Requires: pygtk2 Requires: python-cssutils # poblesec (gst.element_factory_make('libvisual_jess')) #Requires: libvisual-plugins #Requires: pygtk2 #Requires: python-dbus # search # shelf ## smbwin32 ## winremote ## wmd # yesfm Requires: python-simplejson #Requires: python-twisted-web2 BuildRequires: elisa-base = %{version} BuildRequires: python-devel BuildArch: noarch %description This package contains the bad set of plugins for the Elisa Media Center, plugins which are not considered feature complete or polished enough to be in the good set of plugins, but do not present any licensing issues. %prep %setup -q %patch0 -p1 %build %{__python} setup.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install \ --single-version-externally-managed \ -O1 --skip-build --root %{buildroot} # Remove Windows only plugins %{__rm} -rf %{buildroot}%{python_sitelib}/elisa/plugins/elisa_updater/ \ %{buildroot}%{python_sitelib}/elisa_plugin_elisa_updater* \ %{buildroot}%{python_sitelib}/elisa/plugins/smbwin32/ \ %{buildroot}%{python_sitelib}/elisa_plugin_smb_win32* \ %{buildroot}%{python_sitelib}/elisa/plugins/winremote/ \ %{buildroot}%{python_sitelib}/elisa_plugin_winremote* \ %{buildroot}%{python_sitelib}/elisa/plugins/wmd/ \ %{buildroot}%{python_sitelib}/elisa_plugin_wmd* %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %{python_sitelib}/elisa/plugins/amazon/ %{python_sitelib}/elisa/plugins/amp/ %{python_sitelib}/elisa/plugins/avahi/ %{python_sitelib}/elisa/plugins/coherence/ %{python_sitelib}/elisa/plugins/daap/ %{python_sitelib}/elisa/plugins/database/ %{python_sitelib}/elisa/plugins/discogs/ %{python_sitelib}/elisa/plugins/dvd/ %{python_sitelib}/elisa/plugins/favorites/ %{python_sitelib}/elisa/plugins/filtered_shares/ %{python_sitelib}/elisa/plugins/gstreamer/ %{python_sitelib}/elisa/plugins/http_client/ %{python_sitelib}/elisa/plugins/ipod/ %{python_sitelib}/elisa/plugins/osso/ %{python_sitelib}/elisa/plugins/pigment/ %{python_sitelib}/elisa/plugins/poblesec/ %{python_sitelib}/elisa/plugins/rss/ %{python_sitelib}/elisa/plugins/search/ %{python_sitelib}/elisa/plugins/shelf/ %{python_sitelib}/elisa/plugins/themoviedb/ %{python_sitelib}/elisa/plugins/thetvdb/ %{python_sitelib}/elisa_plugin_* %changelog * Tue Mar 3 2009 Matthias Saou 0.5.30-1 - Update to 0.5.30. * Sat Feb 28 2009 Matthias Saou 0.5.29-1 - Update to 0.5.29. * Tue Feb 17 2009 Matthias Saou 0.5.28-1 - Update to 0.5.28. * Fri Feb 13 2009 Matthias Saou 0.5.27-1 - Update to 0.5.27. - Remove no longer present yesfm plugin. - Add new thetvdb and themoviedb plugins. * Sat Feb 7 2009 Matthias Saou 0.5.26-1 - Update to 0.5.26. * Mon Jan 26 2009 Matthias Saou 0.5.24.1-1 - Update to 0.5.24.1. * Mon Jan 12 2009 Matthias Saou 0.5.23-1 - Update to 0.5.23. * Sun Dec 28 2008 Matthias Saou 0.5.22-2 - Add missing python-cssutils requirement (used in the pigment plugin). * Thu Dec 18 2008 Matthias Saou 0.5.22-1 - Update to 0.5.22. - Include new rss plugin. * Mon Dec 1 2008 Matthias Saou 0.5.20-1 - Update to 0.5.20. * Mon Nov 24 2008 Matthias Saou 0.5.19-1 - Update to 0.5.19. * Mon Nov 17 2008 Matthias Saou 0.5.18-1 - Update to 0.5.18. * Mon Nov 10 2008 Matthias Saou 0.5.17-2 - Add python-simplejson requirement for the yesfm plugin. * Tue Nov 4 2008 Matthias Saou 0.5.17-1 - Update to 0.5.17. * Tue Oct 28 2008 Matthias Saou 0.5.16.1-1 - Update to 0.5.16.1. * Mon Oct 27 2008 Matthias Saou 0.5.16-1 - Update to 0.5.16. * Tue Oct 21 2008 Matthias Saou 0.5.15-1 - Update to 0.5.15. * Mon Oct 13 2008 Matthias Saou 0.5.14-1 - Update to 0.5.14. * Fri Oct 10 2008 Matthias Saou 0.5.13-2 - Build require elisa-base from now on. - Update description to explain what "bad" plugins are. * Tue Oct 7 2008 Matthias Saou 0.5.13-1 - Update to 0.5.13. * Tue Sep 30 2008 Matthias Saou 0.5.12-1 - Update to 0.5.12. * Tue Sep 23 2008 Matthias Saou 0.5.11-1 - Update to 0.5.11. * Tue Sep 16 2008 Matthias Saou 0.5.10-1 - Update to 0.5.10. * Tue Sep 9 2008 Matthias Saou 0.5.9-1 - Update to 0.5.9. * Mon Sep 2 2008 Matthias Saou 0.5.8-1 - Update to 0.5.8. * Tue Aug 26 2008 Matthias Saou 0.5.7-1 - Update to 0.5.7. * Tue Aug 19 2008 Matthias Saou 0.5.6-1 - Update to 0.5.6. - Require the exact same elisa version, as elisa and all plugins are always released all at once and should always match. * Mon Aug 11 2008 Matthias Saou 0.5.5-1 - Update to 0.5.5. * Fri Aug 8 2008 Matthias Saou 0.5.4-1 - Update to 0.5.4. * Tue Jul 29 2008 Matthias Saou 0.5.3-1 - Update to 0.5.3. - Exclude wmd plugin, the dependency problem should be fixed. - Disable all %%lang translations, they're gone... * Wed Jul 23 2008 Matthias Saou 0.5.2-2 - Update to 0.5.2. - List translations as %%lang. - Update the build patch which is still required. - Now build require the elisa-devel package. - Update requirements. * Tue Jul 15 2008 Matthias Saou 0.5.1-6 - Update to 0.5.1. - Add python-cssutils requirement for the pigment theme plugin. - Include install patch. - Remove winremote plugin, it seems to be Windows specific (win32api req). - Remove smbwin32 plugin, it seems to be Windows specific (win32net req). - Remove wmd plugin, it seems to be Windows specific (win32api req)... NOT! As the poblesec plugin requires it anyway (ugly, should go away). - Remove elisa_updater plugin, as we only want to update elisa with rpms. * Sun Mar 16 2008 Matthias Saou 0.3.5-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/elisa-plugins-bad/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:39:52 -0000 1.1 +++ .cvsignore 4 Mar 2009 10:42:12 -0000 1.2 @@ -0,0 +1 @@ +elisa-plugins-bad-0.5.30.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/elisa-plugins-bad/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:39:53 -0000 1.1 +++ sources 4 Mar 2009 10:42:12 -0000 1.2 @@ -0,0 +1 @@ +dac30feca252a25dd3d7cf147ad0d184 elisa-plugins-bad-0.5.30.tar.gz From hadess at fedoraproject.org Wed Mar 4 10:47:15 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 4 Mar 2009 10:47:15 +0000 (UTC) Subject: rpms/rhythmbox/devel .cvsignore, 1.43, 1.44 rhythmbox.spec, 1.229, 1.230 sources, 1.45, 1.46 rb-avahi-assertion.patch, 1.1, NONE rb-mb3-crash.patch, 1.1, NONE rb-set-pulse-prop.patch, 1.1, NONE rb-use-pulsesink-volume.patch, 1.1, NONE Message-ID: <20090304104715.D14F770116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/rhythmbox/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7240 Modified Files: .cvsignore rhythmbox.spec sources Removed Files: rb-avahi-assertion.patch rb-mb3-crash.patch rb-set-pulse-prop.patch rb-use-pulsesink-volume.patch Log Message: * Wed Mar 04 2009 - Bastien Nocera - 0.11.6-29.r6176 - Update to r6176 - Drop upstreamed patches Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 9 Dec 2008 15:10:20 -0000 1.43 +++ .cvsignore 4 Mar 2009 10:46:44 -0000 1.44 @@ -1 +1 @@ -rhythmbox-0.11.6-r6096.tar.gz +rhythmbox-0.11.6-r6176.tar.bz2 Index: rhythmbox.spec =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- rhythmbox.spec 25 Feb 2009 19:56:59 -0000 1.229 +++ rhythmbox.spec 4 Mar 2009 10:46:45 -0000 1.230 @@ -3,12 +3,12 @@ Name: rhythmbox Summary: Music Management Application Version: 0.11.6 -Release: 28.r6096%{?dist} +Release: 29.r6176%{?dist} License: GPLv2+ with exceptions and GFDL Group: Applications/Multimedia URL: http://projects.gnome.org/rhythmbox/ #Source: http://download.gnome.org/sources/rhythmbox/0.11/%{name}-%{version}.tar.bz2 -Source: %{name}-%{version}-r6096.tar.gz +Source: %{name}-%{version}-r6176.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=524079 Source2: rhythmbox.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,17 +53,6 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=428034 Patch0: rb-disable-power-plugin-by-default.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=562188 -Patch1: rb-avahi-assertion.patch - -# http://bugzilla.gnome.org/show_bug.cgi?id=571606 -Patch2: rb-use-pulsesink-volume.patch - -# http://bugzilla.gnome.org/show_bug.cgi?id=565056 -Patch3: rb-mb3-crash.patch - -Patch4: rb-set-pulse-prop.patch - %description Rhythmbox is an integrated music management application based on the powerful GStreamer media framework. It has a number of features, including an easy to @@ -97,12 +86,6 @@ %setup -q %patch0 -p0 -b .dont-disable-suspend -%patch1 -p1 -b .avahi-assertion -%patch2 -p0 -b .pulsesink-volume -pushd plugins/audiocd/ -%patch3 -p1 -b .mb3-crash -popd -%patch4 -p0 # Use the installed louie, not the one in Coherence find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';' @@ -239,6 +222,10 @@ %{_libdir}/rhythmbox/plugins/upnp_coherence %changelog +* Wed Mar 04 2009 - Bastien Nocera - 0.11.6-29.r6176 +- Update to r6176 +- Drop upstreamed patches + * Wed Feb 25 2009 Fedora Release Engineering - 0.11.6-28.r6096 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/devel/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sources 9 Dec 2008 15:10:20 -0000 1.45 +++ sources 4 Mar 2009 10:46:45 -0000 1.46 @@ -1 +1 @@ -ddd2feaf794e5252f917f10b77a805a1 rhythmbox-0.11.6-r6096.tar.gz +cb4cb450f41c9dc8f75eeab48003a076 rhythmbox-0.11.6-r6176.tar.bz2 --- rb-avahi-assertion.patch DELETED --- --- rb-mb3-crash.patch DELETED --- --- rb-set-pulse-prop.patch DELETED --- --- rb-use-pulsesink-volume.patch DELETED --- From rjones at fedoraproject.org Wed Mar 4 10:54:55 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Wed, 4 Mar 2009 10:54:55 +0000 (UTC) Subject: rpms/mingw32-gcc/devel mingw32-gcc.spec,1.3,1.4 Message-ID: <20090304105455.22FFB70116@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-gcc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9048 Modified Files: mingw32-gcc.spec Log Message: Fix libobjc and consequently Objective C and Objective C++ compilers. Index: mingw32-gcc.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gcc/devel/mingw32-gcc.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mingw32-gcc.spec 26 Feb 2009 01:05:01 -0000 1.3 +++ mingw32-gcc.spec 4 Mar 2009 10:54:24 -0000 1.4 @@ -5,7 +5,7 @@ Name: mingw32-gcc Version: 4.4.0 -Release: 0.5%{?dist} +Release: 0.6%{?dist} Summary: MinGW Windows cross-compiler (GCC) for C License: GPLv3+ and GPLv2+ with exceptions @@ -91,7 +91,7 @@ Summary: MinGW Windows cross-compiler support for Objective C Group: Development/Languages Requires: %{name} = %{version}-%{release} -Requires: mingw32-libobjc = %{version}-%{release} +#Requires: mingw32-libobjc = %{version}-%{release} %description objc MinGW Windows cross-compiler support for Objective C. @@ -100,7 +100,7 @@ %package objc++ Summary: MinGW Windows cross-compiler support for Objective C++ Group: Development/Languages -Requires: %{name}-g++ = %{version}-%{release} +Requires: %{name}-c++ = %{version}-%{release} Requires: %{name}-objc = %{version}-%{release} %description objc++ @@ -287,6 +287,9 @@ %changelog +* Wed Mar 4 2009 Richard W.M. Jones - 4.4.0-0.6 +- Fix libobjc and consequently Objective C and Objective C++ compilers. + * Wed Feb 25 2009 Fedora Release Engineering - 4.4.0-0.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From karsten at fedoraproject.org Wed Mar 4 11:06:57 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Wed, 4 Mar 2009 11:06:57 +0000 (UTC) Subject: rpms/vim/devel 7.2.128,NONE,1.1 Message-ID: <20090304110657.A9E9970116@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11103 Added Files: 7.2.128 Log Message: - patchlevel 128 --- NEW FILE 7.2.128 --- To: vim-dev at vim.org Subject: Patch 7.2.128 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.2.128 (after 7.2.055) Problem: Using ":lcd" makes session files not work. Solution: Compare return value of mch_chdir() properly. (Andreas Bernauer) Files: src/ex_docmd.c *** ../vim-7.2.127/src/ex_docmd.c Sat Feb 21 20:36:30 2009 --- src/ex_docmd.c Sun Mar 1 02:39:38 2009 *************** *** 8792,8798 **** else if (*dirnow != NUL && (ssop_flags & SSOP_CURDIR) && globaldir != NULL) { ! if (mch_chdir((char *)globaldir) == OK) shorten_fnames(TRUE); } --- 8799,8805 ---- else if (*dirnow != NUL && (ssop_flags & SSOP_CURDIR) && globaldir != NULL) { ! if (mch_chdir((char *)globaldir) == 0) shorten_fnames(TRUE); } *** ../vim-7.2.127/src/version.c Tue Feb 24 04:36:50 2009 --- src/version.c Sun Mar 1 02:42:47 2009 *************** *** 678,679 **** --- 678,681 ---- { /* Add new patch number below this line */ + /**/ + 128, /**/ -- hundred-and-one symptoms of being an internet addict: 138. You develop a liking for cold coffee. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From karsten at fedoraproject.org Wed Mar 4 11:07:21 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Wed, 4 Mar 2009 11:07:21 +0000 (UTC) Subject: rpms/vim/devel 7.2.129,NONE,1.1 Message-ID: <20090304110721.9B8BE70116@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11208 Added Files: 7.2.129 Log Message: - patchlevel 129 --- NEW FILE 7.2.129 --- To: vim-dev at vim.org Subject: Patch 7.2.129 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.2.129 Problem: When opening a command window from input() it uses the search history. Solution: Use get_cmdline_type(). (James Vega) Files: src/ex_getln.c *** ../vim-7.2.128/src/ex_getln.c Fri Nov 28 10:59:57 2008 --- src/ex_getln.c Mon Mar 2 00:53:39 2009 *************** *** 6047,6055 **** # endif return K_IGNORE; } ! cmdwin_type = ccline.cmdfirstc; ! if (cmdwin_type == NUL) ! cmdwin_type = '-'; /* Create the command-line buffer empty. */ (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL); --- 6062,6068 ---- # endif return K_IGNORE; } ! cmdwin_type = get_cmdline_type(); /* Create the command-line buffer empty. */ (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL); *************** *** 6073,6079 **** /* Showing the prompt may have set need_wait_return, reset it. */ need_wait_return = FALSE; ! histtype = hist_char2type(ccline.cmdfirstc); if (histtype == HIST_CMD || histtype == HIST_DEBUG) { if (p_wc == TAB) --- 6086,6092 ---- /* Showing the prompt may have set need_wait_return, reset it. */ need_wait_return = FALSE; ! histtype = hist_char2type(cmdwin_type); if (histtype == HIST_CMD || histtype == HIST_DEBUG) { if (p_wc == TAB) *** ../vim-7.2.128/src/version.c Sun Mar 1 02:43:50 2009 --- src/version.c Mon Mar 2 02:10:11 2009 *************** *** 678,679 **** --- 678,681 ---- { /* Add new patch number below this line */ + /**/ + 129, /**/ -- hundred-and-one symptoms of being an internet addict: 146. You experience ACTUAL physical withdrawal symptoms when away from your 'puter and the net. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From karsten at fedoraproject.org Wed Mar 4 11:07:44 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Wed, 4 Mar 2009 11:07:44 +0000 (UTC) Subject: rpms/vim/devel 7.2.130,NONE,1.1 Message-ID: <20090304110744.DF6F570116@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11314 Added Files: 7.2.130 Log Message: - patchlevel 130 --- NEW FILE 7.2.130 --- To: vim-dev at vim.org Subject: Patch 7.2.130 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.2.130 Problem: Vim may haing until CTRL-C is typed when using CTRL-Z. Solution: Avoid using pause(). Also use "volatile" for variables used in signal functions. (Dominique Pelle) Files: src/auto/configure, src/configure.in, src/config.h.in, src/globals.h, src/os_unix.c *** ../vim-7.2.129/src/auto/configure Thu Nov 20 10:36:04 2008 --- src/auto/configure Mon Mar 2 02:36:52 2009 *************** *** 11565,11570 **** --- 11565,11631 ---- fi + { $as_echo "$as_me:$LINENO: checking for working volatile" >&5 + $as_echo_n "checking for working volatile... " >&6; } + if test "${ac_cv_c_volatile+set}" = set; then + $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + int + main () + { + + volatile int x; + int * volatile y = (int *) 0; + return !x && !y; + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" + $as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_c_volatile=yes + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_volatile=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + { $as_echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5 + $as_echo "$ac_cv_c_volatile" >&6; } + if test $ac_cv_c_volatile = no; then + + cat >>confdefs.h <<\_ACEOF + #define volatile /**/ + _ACEOF + + fi + { $as_echo "$as_me:$LINENO: checking for mode_t" >&5 $as_echo_n "checking for mode_t... " >&6; } if test "${ac_cv_type_mode_t+set}" = set; then *** ../vim-7.2.129/src/configure.in Thu Nov 20 10:36:04 2008 --- src/configure.in Sun Feb 22 21:47:44 2009 *************** *** 2148,2153 **** --- 2148,2154 ---- dnl Checks for typedefs, structures, and compiler characteristics. AC_PROG_GCC_TRADITIONAL AC_C_CONST + AC_C_VOLATILE AC_TYPE_MODE_T AC_TYPE_OFF_T AC_TYPE_PID_T *** ../vim-7.2.129/src/config.h.in Tue Jun 24 23:47:46 2008 --- src/config.h.in Mon Feb 23 00:13:17 2009 *************** *** 50,55 **** --- 50,58 ---- /* Define to empty if the keyword does not work. */ #undef const + /* Define to empty if the keyword does not work. */ + #undef volatile + /* Define to `int' if doesn't define. */ #undef mode_t *** ../vim-7.2.129/src/globals.h Tue Jan 6 16:13:42 2009 --- src/globals.h Mon Mar 2 02:40:16 2009 *************** *** 482,489 **** /* * While executing external commands or in Ex mode, should not insert GUI * events in the input buffer: Set hold_gui_events to non-zero. */ ! EXTERN int hold_gui_events INIT(= 0); /* * When resizing the shell is postponed, remember the new size, and call --- 482,491 ---- /* * While executing external commands or in Ex mode, should not insert GUI * events in the input buffer: Set hold_gui_events to non-zero. + * + * volatile because it is used in signal handler sig_sysmouse(). */ ! EXTERN volatile int hold_gui_events INIT(= 0); /* * When resizing the shell is postponed, remember the new size, and call *************** *** 597,603 **** EXTERN int really_exiting INIT(= FALSE); /* TRUE when we are sure to exit, e.g., after * a deadly signal */ ! EXTERN int full_screen INIT(= FALSE); /* TRUE when doing full-screen output * otherwise only writing some messages */ --- 599,606 ---- EXTERN int really_exiting INIT(= FALSE); /* TRUE when we are sure to exit, e.g., after * a deadly signal */ ! /* volatile because it is used in signal handler deathtrap(). */ ! EXTERN volatile int full_screen INIT(= FALSE); /* TRUE when doing full-screen output * otherwise only writing some messages */ *************** *** 739,748 **** */ EXTERN JMP_BUF lc_jump_env; /* argument to SETJMP() */ # ifdef SIGHASARG ! EXTERN int lc_signal; /* catched signal number, 0 when no was signal ! catched; used for mch_libcall() */ # endif ! EXTERN int lc_active INIT(= FALSE); /* TRUE when lc_jump_env is valid. */ #endif #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT) --- 747,758 ---- */ EXTERN JMP_BUF lc_jump_env; /* argument to SETJMP() */ # ifdef SIGHASARG ! /* volatile because it is used in signal handlers. */ ! EXTERN volatile int lc_signal; /* caught signal number, 0 when no was signal ! caught; used for mch_libcall() */ # endif ! /* volatile because it is used in signal handler deathtrap(). */ ! EXTERN volatile int lc_active INIT(= FALSE); /* TRUE when lc_jump_env is valid. */ #endif #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT) *************** *** 986,992 **** EXTERN FILE *scriptout INIT(= NULL); /* stream to write script to */ EXTERN int read_cmd_fd INIT(= 0); /* fd to read commands from */ ! EXTERN int got_int INIT(= FALSE); /* set to TRUE when interrupt signal occurred */ #ifdef USE_TERM_CONSOLE EXTERN int term_console INIT(= FALSE); /* set to TRUE when console used */ --- 996,1003 ---- EXTERN FILE *scriptout INIT(= NULL); /* stream to write script to */ EXTERN int read_cmd_fd INIT(= 0); /* fd to read commands from */ ! /* volatile because it is used in signal handler catch_sigint(). */ ! EXTERN volatile int got_int INIT(= FALSE); /* set to TRUE when interrupt signal occurred */ #ifdef USE_TERM_CONSOLE EXTERN int term_console INIT(= FALSE); /* set to TRUE when console used */ *** ../vim-7.2.129/src/os_unix.c Sun Feb 22 02:51:37 2009 --- src/os_unix.c Mon Mar 2 01:05:50 2009 *************** *** 181,187 **** && defined(FEAT_TITLE) && !defined(FEAT_GUI_GTK) # define SET_SIG_ALARM static RETSIGTYPE sig_alarm __ARGS(SIGPROTOARG); ! static int sig_alarm_called; #endif static RETSIGTYPE deathtrap __ARGS(SIGPROTOARG); --- 181,188 ---- && defined(FEAT_TITLE) && !defined(FEAT_GUI_GTK) # define SET_SIG_ALARM static RETSIGTYPE sig_alarm __ARGS(SIGPROTOARG); ! /* volatile because it is used in signal handler sig_alarm(). */ ! static volatile int sig_alarm_called; #endif static RETSIGTYPE deathtrap __ARGS(SIGPROTOARG); *************** *** 201,213 **** # define SIG_ERR ((RETSIGTYPE (*)())-1) #endif ! static int do_resize = FALSE; #ifndef __EMX__ static char_u *extra_shell_arg = NULL; static int show_shell_mess = TRUE; #endif ! static int deadly_signal = 0; /* The signal we caught */ ! static int in_mch_delay = FALSE; /* sleeping in mch_delay() */ static int curr_tmode = TMODE_COOK; /* contains current terminal mode */ --- 202,217 ---- # define SIG_ERR ((RETSIGTYPE (*)())-1) #endif ! /* volatile because it is used in signal handler sig_winch(). */ ! static volatile int do_resize = FALSE; #ifndef __EMX__ static char_u *extra_shell_arg = NULL; static int show_shell_mess = TRUE; #endif ! /* volatile because it is used in signal handler deathtrap(). */ ! static volatile int deadly_signal = 0; /* The signal we caught */ ! /* volatile because it is used in signal handler deathtrap(). */ ! static volatile int in_mch_delay = FALSE; /* sleeping in mch_delay() */ static int curr_tmode = TMODE_COOK; /* contains current terminal mode */ *************** *** 802,808 **** #endif /* ! * We need correct potatotypes for a signal function, otherwise mean compilers * will barf when the second argument to signal() is ``wrong''. * Let me try it with a few tricky defines from my own osdef.h (jw). */ --- 806,812 ---- #endif /* ! * We need correct prototypes for a signal function, otherwise mean compilers * will barf when the second argument to signal() is ``wrong''. * Let me try it with a few tricky defines from my own osdef.h (jw). */ *************** *** 1068,1080 **** SIGRETURN; } ! #ifdef _REENTRANT /* * On Solaris with multi-threading, suspending might not work immediately. * Catch the SIGCONT signal, which will be used as an indication whether the * suspending has been done or not. */ ! static int sigcont_received; static RETSIGTYPE sigcont_handler __ARGS(SIGPROTOARG); /* --- 1072,1089 ---- SIGRETURN; } ! #if defined(_REENTRANT) && defined(SIGCONT) /* * On Solaris with multi-threading, suspending might not work immediately. * Catch the SIGCONT signal, which will be used as an indication whether the * suspending has been done or not. + * + * On Linux, signal is not always handled immediately either. + * See https://bugs.launchpad.net/bugs/291373 + * + * volatile because it is used in in signal handler sigcont_handler(). */ ! static volatile int sigcont_received; static RETSIGTYPE sigcont_handler __ARGS(SIGPROTOARG); /* *************** *** 1118,1132 **** } # endif ! # ifdef _REENTRANT sigcont_received = FALSE; # endif kill(0, SIGTSTP); /* send ourselves a STOP signal */ ! # ifdef _REENTRANT ! /* When we didn't suspend immediately in the kill(), do it now. Happens ! * on multi-threaded Solaris. */ ! if (!sigcont_received) ! pause(); # endif # ifdef FEAT_TITLE --- 1127,1154 ---- } # endif ! # if defined(_REENTRANT) && defined(SIGCONT) sigcont_received = FALSE; # endif kill(0, SIGTSTP); /* send ourselves a STOP signal */ ! # if defined(_REENTRANT) && defined(SIGCONT) ! /* ! * Wait for the SIGCONT signal to be handled. It generally happens ! * immediately, but somehow not all the time. Do not call pause() ! * because there would be race condition which would hang Vim if ! * signal happened in between the test of sigcont_received and the ! * call to pause(). If signal is not yet received, call sleep(0) ! * to just yield CPU. Signal should then be received. If somehow ! * it's still not received, sleep 1, 2, 3 ms. Don't bother waiting ! * further if signal is not received after 1+2+3+4 ms (not expected ! * to happen). ! */ ! { ! long wait; ! for (wait = 0; !sigcont_received && wait <= 3L; wait++) ! /* Loop is not entered most of the time */ ! mch_delay(wait, FALSE); ! } # endif # ifdef FEAT_TITLE *************** *** 1175,1181 **** #ifdef SIGTSTP signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL); #endif ! #ifdef _REENTRANT signal(SIGCONT, sigcont_handler); #endif --- 1197,1203 ---- #ifdef SIGTSTP signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL); #endif ! #if defined(_REENTRANT) && defined(SIGCONT) signal(SIGCONT, sigcont_handler); #endif *************** *** 1234,1240 **** reset_signals() { catch_signals(SIG_DFL, SIG_DFL); ! #ifdef _REENTRANT /* SIGCONT isn't in the list, because its default action is ignore */ signal(SIGCONT, SIG_DFL); #endif --- 1256,1262 ---- reset_signals() { catch_signals(SIG_DFL, SIG_DFL); ! #if defined(_REENTRANT) && defined(SIGCONT) /* SIGCONT isn't in the list, because its default action is ignore */ signal(SIGCONT, SIG_DFL); #endif *************** *** 5899,5905 **** --- 5921,5929 ---- * we are going to suspend or starting an external process * so we shouldn't have problem with this */ + # ifdef SIGTSTP signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL); + # endif return 1; /* succeed */ } if (gpm_fd == -2) *** ../vim-7.2.129/src/version.c Mon Mar 2 02:11:09 2009 --- src/version.c Mon Mar 2 02:36:00 2009 *************** *** 678,679 **** --- 678,681 ---- { /* Add new patch number below this line */ + /**/ + 130, /**/ -- hundred-and-one symptoms of being an internet addict: 148. You find it easier to dial-up the National Weather Service Weather/your_town/now.html than to simply look out the window. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From karsten at fedoraproject.org Wed Mar 4 11:15:11 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Wed, 4 Mar 2009 11:15:11 +0000 (UTC) Subject: rpms/vim/devel 7.2.131, NONE, 1.1 README.patches, 1.119, 1.120 vim.spec, 1.232, 1.233 Message-ID: <20090304111511.CED1970116@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12366 Modified Files: README.patches vim.spec Added Files: 7.2.131 Log Message: - patchlevel 131 --- NEW FILE 7.2.131 --- To: vim-dev at vim.org Subject: Patch 7.2.131 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.2.131 Problem: When 'keymap' is cleared may still use the cursor highlighting for when it's enabled. Solution: Reset 'iminsert' and 'imsearch'. (partly by Dominique Pelle) Also avoid ":setlocal" for these options have a global effect. Files: src/option.c *** ../vim-7.2.130/src/option.c Sat Feb 21 20:27:00 2009 --- src/option.c Wed Mar 4 04:09:51 2009 *************** *** 5797,5810 **** /* load or unload key mapping tables */ errmsg = keymap_init(); ! /* When successfully installed a new keymap switch on using it. */ ! if (*curbuf->b_p_keymap != NUL && errmsg == NULL) { ! curbuf->b_p_iminsert = B_IMODE_LMAP; ! if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT) ! curbuf->b_p_imsearch = B_IMODE_LMAP; ! set_iminsert_global(); ! set_imsearch_global(); # ifdef FEAT_WINDOWS status_redraw_curbuf(); # endif --- 5797,5824 ---- /* load or unload key mapping tables */ errmsg = keymap_init(); ! if (errmsg == NULL) { ! if (*curbuf->b_p_keymap != NUL) ! { ! /* Installed a new keymap, switch on using it. */ ! curbuf->b_p_iminsert = B_IMODE_LMAP; ! if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT) ! curbuf->b_p_imsearch = B_IMODE_LMAP; ! } ! else ! { ! /* Cleared the keymap, may reset 'iminsert' and 'imsearch'. */ ! if (curbuf->b_p_iminsert == B_IMODE_LMAP) ! curbuf->b_p_iminsert = B_IMODE_NONE; ! if (curbuf->b_p_imsearch == B_IMODE_LMAP) ! curbuf->b_p_imsearch = B_IMODE_USE_INSERT; ! } ! if ((opt_flags & OPT_LOCAL) == 0) ! { ! set_iminsert_global(); ! set_imsearch_global(); ! } # ifdef FEAT_WINDOWS status_redraw_curbuf(); # endif *** ../vim-7.2.130/src/version.c Mon Mar 2 02:44:54 2009 --- src/version.c Wed Mar 4 04:10:32 2009 *************** *** 678,679 **** --- 678,681 ---- { /* Add new patch number below this line */ + /**/ + 131, /**/ -- hundred-and-one symptoms of being an internet addict: 157. You fum through a magazine, you first check to see if it has a web address. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// Index: README.patches =================================================================== RCS file: /cvs/extras/rpms/vim/devel/README.patches,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- README.patches 24 Feb 2009 15:15:18 -0000 1.119 +++ README.patches 4 Mar 2009 11:14:39 -0000 1.120 @@ -156,3 +156,7 @@ 3936 7.2.125 leaking memory when reading XPM bitmap for a sign 4326 7.2.126 when EXITFREE is defined signs and keymaps are not freed 1708 7.2.127 get another more prompt after typing 'q' + 1537 7.2.128 (after 7.2.055) ":lcd" causes invalid session file + 2229 7.2.129 opening command window from input() uses the search history + 12852 7.2.130 Vim may haing until CTRL-C is typed when using CTRL-Z + 2612 7.2.131 using wrong cursor highlighting after clearing 'keymap' Index: vim.spec =================================================================== RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v retrieving revision 1.232 retrieving revision 1.233 diff -u -r1.232 -r1.233 --- vim.spec 24 Feb 2009 15:15:18 -0000 1.232 +++ vim.spec 4 Mar 2009 11:14:39 -0000 1.233 @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim72%{?beta} -%define patchlevel 127 +%define patchlevel 131 Summary: The VIM editor URL: http://www.vim.org/ @@ -154,45 +154,49 @@ Patch086: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.086 Patch087: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.087 Patch088: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.088 -Patch089: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.089 -Patch090: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.090 -Patch091: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.091 -Patch092: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.092 -Patch093: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.093 -Patch094: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.094 -Patch095: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.095 -Patch096: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.096 -Patch097: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.097 -Patch098: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.098 -Patch099: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.099 -Patch100: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.100 -Patch101: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.101 -Patch102: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.102 -Patch103: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.103 -Patch104: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.104 -Patch105: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.105 -Patch106: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.106 -Patch107: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.107 -Patch108: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.108 -Patch109: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.109 -Patch110: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.110 -Patch111: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.111 -Patch112: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.112 -Patch113: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.113 -Patch114: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.114 -Patch115: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.115 -Patch116: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.116 -Patch117: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.117 -Patch118: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.118 -Patch119: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.119 -Patch120: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.120 -Patch121: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.121 -Patch122: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.122 -Patch123: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.123 -Patch124: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.124 +Patch089: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.089 +Patch090: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.090 +Patch091: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.091 +Patch092: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.092 +Patch093: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.093 +Patch094: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.094 +Patch095: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.095 +Patch096: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.096 +Patch097: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.097 +Patch098: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.098 +Patch099: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.099 +Patch100: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.100 +Patch101: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.101 +Patch102: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.102 +Patch103: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.103 +Patch104: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.104 +Patch105: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.105 +Patch106: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.106 +Patch107: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.107 +Patch108: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.108 +Patch109: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.109 +Patch110: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.110 +Patch111: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.111 +Patch112: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.112 +Patch113: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.113 +Patch114: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.114 +Patch115: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.115 +Patch116: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.116 +Patch117: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.117 +Patch118: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.118 +Patch119: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.119 +Patch120: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.120 +Patch121: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.121 +Patch122: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.122 +Patch123: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.123 +Patch124: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.124 Patch125: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.125 Patch126: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.126 Patch127: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.127 +Patch128: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.128 +Patch129: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.129 +Patch130: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.130 +Patch131: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.131 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -453,6 +457,10 @@ %patch125 -p0 %patch126 -p0 %patch127 -p0 +%patch128 -p0 +%patch129 -p0 +%patch130 -p0 +%patch131 -p0 # install spell files %if %{withvimspell} @@ -912,7 +920,7 @@ %changelog * Tue Feb 24 2009 Karsten Hopp 7.2.127-1 -- patchlevel 127 +- patchlevel 131 * Mon Feb 23 2009 Karsten Hopp 7.2.124-1 - patchlevel 124 From caolanm at fedoraproject.org Wed Mar 4 11:15:11 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Wed, 4 Mar 2009 11:15:11 +0000 (UTC) Subject: rpms/fltk/devel fltk-1.1.9-consts.patch, NONE, 1.1 fltk.spec, 1.38, 1.39 Message-ID: <20090304111511.CF05E70117@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/fltk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12389 Modified Files: fltk.spec Added Files: fltk-1.1.9-consts.patch Log Message: fix uses of strchr wrt. constness fltk-1.1.9-consts.patch: --- NEW FILE fltk-1.1.9-consts.patch --- diff -ru fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx fltk-1.1.9/src/fl_set_fonts_xft.cxx --- fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx 2009-03-04 10:58:49.000000000 +0000 +++ fltk-1.1.9/src/fl_set_fonts_xft.cxx 2009-03-04 11:01:25.000000000 +0000 @@ -253,13 +253,13 @@ // So the bit we want is up to the first comma - BUT some strings have // more than one name, separated by, guess what?, a comma... stop = start = first = 0; - stop = strchr((const char *)font, ','); - start = strchr((const char *)font, ':'); + stop = strchr((char *)font, ','); + start = strchr((char *)font, ':'); if ((stop) && (start) && (stop < start)) { first = stop + 1; // discard first version of name // find first comma *after* the end of the name - stop = strchr((const char *)start, ','); + stop = strchr((char *)start, ','); } else { Index: fltk.spec =================================================================== RCS file: /cvs/pkgs/rpms/fltk/devel/fltk.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- fltk.spec 24 Feb 2009 17:36:23 -0000 1.38 +++ fltk.spec 4 Mar 2009 11:14:39 -0000 1.39 @@ -6,7 +6,7 @@ Summary: C++ user interface toolkit Name: fltk Version: 1.1.9 -Release: 2%{?dist} +Release: 3%{?dist} # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details License: LGPLv2+ with exceptions @@ -28,6 +28,7 @@ # nuke --rpath (#238284) Patch4: fltk-1.1.x-r5750-rpath.patch Patch5: fltk-1.1.8-fluid_desktop.patch +Patch6: fltk-1.1.9-consts.patch %if 0%{?rhel} > 4 || 0%{?fedora} > 4 BuildRequires: libICE-devel libSM-devel @@ -85,6 +86,7 @@ %patch3 -p1 -b .undefined %patch4 -p1 -b .rpath %patch5 -p1 -b .fluid_desktop +%patch6 -p1 -b .consts %build @@ -206,6 +208,9 @@ %changelog +* Wed Mar 04 2009 Caol??n McNamara - 1.1.9-3 +- fix uses of strchr wrt. constness + * Tue Feb 24 2009 Fedora Release Engineering - 1.1.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From karsten at fedoraproject.org Wed Mar 4 11:17:08 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Wed, 4 Mar 2009 11:17:08 +0000 (UTC) Subject: rpms/vim/devel vim.spec,1.233,1.234 Message-ID: <20090304111708.51F4670116@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12772 Modified Files: vim.spec Log Message: - fix changelog Index: vim.spec =================================================================== RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v retrieving revision 1.233 retrieving revision 1.234 diff -u -r1.233 -r1.234 --- vim.spec 4 Mar 2009 11:14:39 -0000 1.233 +++ vim.spec 4 Mar 2009 11:16:37 -0000 1.234 @@ -919,9 +919,12 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog -* Tue Feb 24 2009 Karsten Hopp 7.2.127-1 +* Wed Mar 04 2009 Karsten Hopp 7.2.131-1 - patchlevel 131 +* Tue Feb 24 2009 Karsten Hopp 7.2.127-1 +- patchlevel 127 + * Mon Feb 23 2009 Karsten Hopp 7.2.124-1 - patchlevel 124 From nbecker at fedoraproject.org Wed Mar 4 11:56:30 2009 From: nbecker at fedoraproject.org (Neal Becker) Date: Wed, 4 Mar 2009 11:56:30 +0000 (UTC) Subject: rpms/kdiff3/devel .cvsignore, 1.7, 1.8 kdiff3.spec, 1.23, 1.24 sources, 1.7, 1.8 Message-ID: <20090304115630.55FF770116@cvs1.fedora.phx.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/kdiff3/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2203 Modified Files: .cvsignore kdiff3.spec sources Log Message: update to 0.9.95 - see http://kdiff3.sourceforge.net/ChangeLog Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdiff3/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 17 Jan 2009 23:48:49 -0000 1.7 +++ .cvsignore 4 Mar 2009 11:55:58 -0000 1.8 @@ -1 +1 @@ -kdiff3-0.9.94.tar.gz +kdiff3-0.9.95.tar.gz Index: kdiff3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- kdiff3.spec 25 Feb 2009 10:58:05 -0000 1.23 +++ kdiff3.spec 4 Mar 2009 11:55:58 -0000 1.24 @@ -1,6 +1,6 @@ Name: kdiff3 -Version: 0.9.94 -Release: 2%{?dist} +Version: 0.9.95 +Release: 1%{?dist} Summary: Compare + merge 2 or 3 files or directories Group: Development/Tools @@ -110,6 +110,12 @@ %changelog +* Wed Mar 4 2009 Neal Becker - 0.9.95-1 +- Update to 0.9.95 + +* Sat Jan 17 2009 Neal Becker - 0.9.94-1 +- Update to 0.9.94 + * Wed Feb 25 2009 Fedora Release Engineering - 0.9.94-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdiff3/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 17 Jan 2009 23:48:49 -0000 1.7 +++ sources 4 Mar 2009 11:55:58 -0000 1.8 @@ -1 +1 @@ -8bf580e53a420b1aa1eca3ea502bbe8b kdiff3-0.9.94.tar.gz +652a98bf79ba762a8a646d4a0fddb323 kdiff3-0.9.95.tar.gz From nbecker at fedoraproject.org Wed Mar 4 11:58:21 2009 From: nbecker at fedoraproject.org (Neal Becker) Date: Wed, 4 Mar 2009 11:58:21 +0000 (UTC) Subject: rpms/kdiff3/devel kdiff3.spec,1.24,1.25 Message-ID: <20090304115821.901C470116@cvs1.fedora.phx.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/kdiff3/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2469 Modified Files: kdiff3.spec Log Message: Fix changelog Index: kdiff3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- kdiff3.spec 4 Mar 2009 11:55:58 -0000 1.24 +++ kdiff3.spec 4 Mar 2009 11:57:51 -0000 1.25 @@ -1,6 +1,6 @@ Name: kdiff3 Version: 0.9.95 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compare + merge 2 or 3 files or directories Group: Development/Tools @@ -110,15 +110,18 @@ %changelog +* Wed Mar 4 2009 Neal Becker - 0.9.95-2 +- Fix Changelog order + * Wed Mar 4 2009 Neal Becker - 0.9.95-1 - Update to 0.9.95 -* Sat Jan 17 2009 Neal Becker - 0.9.94-1 -- Update to 0.9.94 - * Wed Feb 25 2009 Fedora Release Engineering - 0.9.94-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Sat Jan 17 2009 Neal Becker - 0.9.94-1 +- Update to 0.9.94 + * Fri Jan 9 2009 Neal Becker - 0.9.93-1.3%{?dist} - Update to 0.9.93-3 From nbecker at fedoraproject.org Wed Mar 4 12:20:58 2009 From: nbecker at fedoraproject.org (Neal Becker) Date: Wed, 4 Mar 2009 12:20:58 +0000 (UTC) Subject: rpms/kdiff3/F-10 kdiff3.spec,1.13,1.14 sources,1.4,1.5 Message-ID: <20090304122058.D2F4B70116@cvs1.fedora.phx.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/kdiff3/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5264 Modified Files: kdiff3.spec sources Log Message: update to 0.9.95 - see http://kdiff3.sourceforge.net/ChangeLog Index: kdiff3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdiff3/F-10/kdiff3.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kdiff3.spec 18 Jan 2009 00:01:31 -0000 1.13 +++ kdiff3.spec 4 Mar 2009 12:20:28 -0000 1.14 @@ -1,6 +1,6 @@ Name: kdiff3 -Version: 0.9.94 -Release: 1%{?dist} +Version: 0.9.95 +Release: 2%{?dist} Summary: Compare + merge 2 or 3 files or directories Group: Development/Tools @@ -110,6 +110,18 @@ %changelog +* Wed Mar 4 2009 Neal Becker - 0.9.95-2 +- Fix Changelog order + +* Wed Mar 4 2009 Neal Becker - 0.9.95-1 +- Update to 0.9.95 + +* Wed Feb 25 2009 Fedora Release Engineering - 0.9.94-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Jan 17 2009 Neal Becker - 0.9.94-1 +- Update to 0.9.94 + * Fri Jan 9 2009 Neal Becker - 0.9.93-1.3%{?dist} - Update to 0.9.93-3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdiff3/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jan 2009 00:01:31 -0000 1.4 +++ sources 4 Mar 2009 12:20:28 -0000 1.5 @@ -1 +1 @@ -8bf580e53a420b1aa1eca3ea502bbe8b kdiff3-0.9.94.tar.gz +652a98bf79ba762a8a646d4a0fddb323 kdiff3-0.9.95.tar.gz From nbecker at fedoraproject.org Wed Mar 4 12:30:05 2009 From: nbecker at fedoraproject.org (Neal Becker) Date: Wed, 4 Mar 2009 12:30:05 +0000 (UTC) Subject: rpms/kdiff3/F-9 kdiff3.spec,1.10,1.11 sources,1.4,1.5 Message-ID: <20090304123005.F11FD70116@cvs1.fedora.phx.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/kdiff3/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6499 Modified Files: kdiff3.spec sources Log Message: update to 0.9.95 - see http://kdiff3.sourceforge.net/ChangeLog Index: kdiff3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdiff3/F-9/kdiff3.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- kdiff3.spec 18 Jan 2009 00:10:41 -0000 1.10 +++ kdiff3.spec 4 Mar 2009 12:29:35 -0000 1.11 @@ -1,6 +1,6 @@ Name: kdiff3 -Version: 0.9.94 -Release: 1%{?dist} +Version: 0.9.95 +Release: 2%{?dist} Summary: Compare + merge 2 or 3 files or directories Group: Development/Tools @@ -110,6 +110,18 @@ %changelog +* Wed Mar 4 2009 Neal Becker - 0.9.95-2 +- Fix Changelog order + +* Wed Mar 4 2009 Neal Becker - 0.9.95-1 +- Update to 0.9.95 + +* Wed Feb 25 2009 Fedora Release Engineering - 0.9.94-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Jan 17 2009 Neal Becker - 0.9.94-1 +- Update to 0.9.94 + * Fri Jan 9 2009 Neal Becker - 0.9.93-1.3%{?dist} - Update to 0.9.93-3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdiff3/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jan 2009 00:10:41 -0000 1.4 +++ sources 4 Mar 2009 12:29:35 -0000 1.5 @@ -1 +1 @@ -8bf580e53a420b1aa1eca3ea502bbe8b kdiff3-0.9.94.tar.gz +652a98bf79ba762a8a646d4a0fddb323 kdiff3-0.9.95.tar.gz From hadess at fedoraproject.org Wed Mar 4 12:30:54 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 4 Mar 2009 12:30:54 +0000 (UTC) Subject: rpms/shared-mime-info/devel defaults.list, 1.26, 1.27 shared-mime-info.spec, 1.78, 1.79 totem-defaults.list, 1.4, 1.5 Message-ID: <20090304123054.5D7BE70116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/shared-mime-info/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6593 Modified Files: defaults.list shared-mime-info.spec totem-defaults.list Log Message: * Wed Mar 04 2009 - Bastien Nocera - 0.60-3 - Remove Totem as handling Blu-ray and HD-DVD - Use brasero-ncb.desktop instead of nautilus-cd-burner for blank devices - Update media mime-types for Rhythmbox/Totem Index: defaults.list =================================================================== RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/defaults.list,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- defaults.list 26 Nov 2008 19:58:46 -0000 1.26 +++ defaults.list 4 Mar 2009 12:30:23 -0000 1.27 @@ -80,15 +80,15 @@ text/plain=gedit.desktop text/html=mozilla-firefox.desktop inode/directory=gnome-nautilus-folder-handler.desktop -x-content/blank-cd=nautilus-cd-burner.desktop -x-content/blank-dvd=nautilus-cd-burner.desktop -x-content/blank-bd=nautilus-cd-burner.desktop -x-content/blank-hddvd=nautilus-cd-burner.desktop +x-content/blank-cd=brasero-ncb.desktop +x-content/blank-dvd=brasero-ncb.desktop +x-content/blank-bd=brasero-ncb.desktop +x-content/blank-hddvd=brasero-ncb.desktop x-content/video-dvd=totem.desktop x-content/video-vcd=totem.desktop x-content/video-svcd=totem.desktop -x-content/video-blueray=totem.desktop -x-content/video-hddvd=totem.desktop +#x-content/video-blueray=totem.desktop +#x-content/video-hddvd=totem.desktop x-content/audio-cdda=rhythmbox.desktop x-content/audio-dvd=rhythmbox.desktop x-content/audio-player=rhythmbox.desktop Index: shared-mime-info.spec =================================================================== RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/shared-mime-info.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- shared-mime-info.spec 26 Feb 2009 00:48:28 -0000 1.78 +++ shared-mime-info.spec 4 Mar 2009 12:30:24 -0000 1.79 @@ -1,7 +1,7 @@ Summary: Shared MIME information database Name: shared-mime-info Version: 0.60 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://freedesktop.org/Software/shared-mime-info @@ -65,6 +65,11 @@ %{_mandir}/man*/* %changelog +* Wed Mar 04 2009 - Bastien Nocera - 0.60-3 +- Remove Totem as handling Blu-ray and HD-DVD +- Use brasero-ncb.desktop instead of nautilus-cd-burner for blank devices +- Update media mime-types for Rhythmbox/Totem + * Wed Feb 25 2009 Fedora Release Engineering - 0.60-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: totem-defaults.list =================================================================== RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/totem-defaults.list,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- totem-defaults.list 1 Sep 2008 15:22:30 -0000 1.4 +++ totem-defaults.list 4 Mar 2009 12:30:24 -0000 1.5 @@ -1,8 +1,10 @@ +application/mxf=totem.desktop; application/ogg=totem.desktop;rhythmbox.desktop; application/ram=totem.desktop; application/sdp=totem.desktop; application/smil=totem.desktop; application/smil+xml=totem.desktop; +application/vnd.ms-wpl=totem.desktop; application/x-extension-m4a=totem.desktop; application/x-extension-mp4=totem.desktop; application/x-flac=totem.desktop; @@ -25,8 +27,10 @@ audio/mpeg=totem.desktop;rhythmbox.desktop; audio/mpegurl=totem.desktop; audio/ogg=totem.desktop; +audio/prs.sid=totem.desktop; audio/x-ape=totem.desktop; audio/x-flac=totem.desktop;rhythmbox.desktop; +audio/x-gsm=totem.desktop; audio/x-it=totem.desktop; audio/x-m4a=totem.desktop; audio/x-matroska=totem.desktop; @@ -79,6 +83,7 @@ video/x-matroska=totem.desktop; video/x-mpeg=totem.desktop; video/x-ms-asf=totem.desktop; +video/x-ms-asx=totem.desktop; video/x-msvideo=totem.desktop; video/x-ms-wm=totem.desktop; video/x-ms-wmv=totem.desktop; @@ -87,3 +92,4 @@ video/x-nsv=totem.desktop; video/x-ogm+ogg=totem.desktop; video/x-theora+ogg=totem.desktop; +video/x-totem-stream=totem.desktop; From nphilipp at fedoraproject.org Wed Mar 4 12:31:17 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Wed, 4 Mar 2009 12:31:17 +0000 (UTC) Subject: rpms/convmv/devel convmv.spec,1.14,1.15 Message-ID: <20090304123117.372CB70116@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/convmv/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6789 Modified Files: convmv.spec Log Message: fix typo in changelog Index: convmv.spec =================================================================== RCS file: /cvs/pkgs/rpms/convmv/devel/convmv.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- convmv.spec 3 Mar 2009 11:07:13 -0000 1.14 +++ convmv.spec 4 Mar 2009 12:30:46 -0000 1.15 @@ -40,7 +40,7 @@ %changelog * Tue Mar 03 2009 Nils Philippsen - 1.14-1 - version 1.14 -- temporarily disable "make test" to workaround problems in koji +- temporarily disable "make test" to work around problems in koji * Tue Feb 24 2009 Fedora Release Engineering - 1.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From leigh123linux at fedoraproject.org Wed Mar 4 12:32:52 2009 From: leigh123linux at fedoraproject.org (Leigh Scott) Date: Wed, 4 Mar 2009 12:32:52 +0000 (UTC) Subject: rpms/qbittorrent/devel qhostaddress.h.patch,1.1,NONE Message-ID: <20090304123252.E5CEF70116@cvs1.fedora.phx.redhat.com> Author: leigh123linux Update of /cvs/pkgs/rpms/qbittorrent/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7073 Removed Files: qhostaddress.h.patch Log Message: No longer needed --- qhostaddress.h.patch DELETED --- From hadess at fedoraproject.org Wed Mar 4 12:35:43 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 4 Mar 2009 12:35:43 +0000 (UTC) Subject: rpms/shared-mime-info/devel defaults.list,1.27,1.28 Message-ID: <20090304123543.582E970116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/shared-mime-info/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7440 Modified Files: defaults.list Log Message: Fix mime-type typo, it's disabled anyway Index: defaults.list =================================================================== RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/defaults.list,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- defaults.list 4 Mar 2009 12:30:23 -0000 1.27 +++ defaults.list 4 Mar 2009 12:35:12 -0000 1.28 @@ -87,7 +87,7 @@ x-content/video-dvd=totem.desktop x-content/video-vcd=totem.desktop x-content/video-svcd=totem.desktop -#x-content/video-blueray=totem.desktop +#x-content/video-bluray=totem.desktop #x-content/video-hddvd=totem.desktop x-content/audio-cdda=rhythmbox.desktop x-content/audio-dvd=rhythmbox.desktop From leigh123linux at fedoraproject.org Wed Mar 4 12:37:02 2009 From: leigh123linux at fedoraproject.org (Leigh Scott) Date: Wed, 4 Mar 2009 12:37:02 +0000 (UTC) Subject: rpms/qbittorrent/devel qbittorrent.spec,1.4,1.5 Message-ID: <20090304123702.8BC4E70116@cvs1.fedora.phx.redhat.com> Author: leigh123linux Update of /cvs/pkgs/rpms/qbittorrent/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7518 Modified Files: qbittorrent.spec Log Message: Remove qhostaddress.h.patch Index: qbittorrent.spec =================================================================== RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qbittorrent.spec 25 Feb 2009 17:14:42 -0000 1.4 +++ qbittorrent.spec 4 Mar 2009 12:36:32 -0000 1.5 @@ -1,11 +1,10 @@ Name: qbittorrent Summary: A Bittorrent Client Version: 1.3.1 -Release: 10%{dist} +Release: 11%{dist} Source0: http://downloads.sf.net/qbittorrent/qbittorrent-1.3.1.tar.gz Patch0: qbittorrent_flag.patch -# qt-4.5-rc1: qhostaddress.h qpair-related issue Bug 485677 -Patch1: qhostaddress.h.patch + URL: http://sourceforge.net/projects/qbittorrent Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,7 +25,7 @@ %prep %setup -q %patch0 -p1 -b .qbittorrent_flag -%patch1 -p1 -b .qhostaddress.h + %build # use ./configure instead of %%configure as it doesn't work @@ -78,6 +77,9 @@ %changelog +* Wed Mar 4 2009 Fedora Release Engineering - 1.3.1-11 +- Remove qhostaddress.h.patch + * Wed Feb 25 2009 Fedora Release Engineering - 1.3.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From leigh123linux at fedoraproject.org Wed Mar 4 12:40:12 2009 From: leigh123linux at fedoraproject.org (Leigh Scott) Date: Wed, 4 Mar 2009 12:40:12 +0000 (UTC) Subject: rpms/qbittorrent/devel qbittorrent.spec,1.5,1.6 Message-ID: <20090304124012.1CDCB70116@cvs1.fedora.phx.redhat.com> Author: leigh123linux Update of /cvs/pkgs/rpms/qbittorrent/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7848 Modified Files: qbittorrent.spec Log Message: Correct mistake in the changelog. Index: qbittorrent.spec =================================================================== RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qbittorrent.spec 4 Mar 2009 12:36:32 -0000 1.5 +++ qbittorrent.spec 4 Mar 2009 12:39:41 -0000 1.6 @@ -77,7 +77,7 @@ %changelog -* Wed Mar 4 2009 Fedora Release Engineering - 1.3.1-11 +* Wed Mar 4 2009 Leigh Scott - 1.3.1-11 - Remove qhostaddress.h.patch * Wed Feb 25 2009 Fedora Release Engineering - 1.3.1-10 From vcrhonek at fedoraproject.org Wed Mar 4 12:52:55 2009 From: vcrhonek at fedoraproject.org (Vitezslav Crhonek) Date: Wed, 4 Mar 2009 12:52:55 +0000 (UTC) Subject: rpms/yp-tools/devel yp-tools-2.9-sha-2.patch, NONE, 1.1 yp-tools.spec, 1.25, 1.26 Message-ID: <20090304125255.7C19170116@cvs1.fedora.phx.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/yp-tools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9678 Modified Files: yp-tools.spec Added Files: yp-tools-2.9-sha-2.patch Log Message: Add SHA-2 password hashes support yp-tools-2.9-sha-2.patch: --- NEW FILE yp-tools-2.9-sha-2.patch --- diff -up yp-tools-2.9/src/yppasswd.c_old yp-tools-2.9/src/yppasswd.c --- yp-tools-2.9/src/yppasswd.c_old 2009-03-03 15:23:49.000000000 +0100 +++ yp-tools-2.9/src/yppasswd.c 2009-03-04 12:39:34.000000000 +0100 @@ -475,7 +475,8 @@ main (int argc, char **argv) { char *s, *progname, *domainname = NULL, *user = NULL, *master = NULL; int f_flag = 0, l_flag = 0, p_flag = 0, error, status; - int has_md5_passwd = 0; + int hash_id = DES; + char rounds[11] = "\0"; /* max length is '999999999$' */ struct yppasswd yppwd; struct passwd *pwd; CLIENT *clnt; @@ -680,7 +681,18 @@ main (int argc, char **argv) strcpy (cp, pwd->pw_name); if (strncmp(pwd->pw_passwd, "$1$", 3) == 0) - has_md5_passwd = 1; + hash_id = MD5; + + if (strncmp(pwd->pw_passwd, "$5$", 3) == 0) + hash_id = SHA_256; + + if (strncmp(pwd->pw_passwd, "$6$", 3) == 0) + hash_id = SHA_512; + + /* Preserve 'rounds=$' (if present) in case of SHA-2 */ + if (hash_id == SHA_256 || hash_id == SHA_512) + if (strncmp(pwd->pw_passwd + 3, "rounds=", 7) == 0) + strncpy(rounds, pwd->pw_passwd + 10, strcspn(pwd->pw_passwd + 10, "$") + 1); /* We can't check the password with shadow passwords enabled. We * leave the checking to yppasswdd */ @@ -693,15 +705,23 @@ main (int argc, char **argv) /* Some systems (HPU/X) store the password aging info after * the password (with a comma to separate it). To support * this we cut the password after the first invalid char - * after the normal 13 ones. We can't cut at the first - * invalid char, since MD5 uses $ in the first char. + * after the normal 13 ones - in case of MD5 (and DES). + * We can't cut at the first invalid char, since MD5 + * uses $ in the first char. In case of SHA-2 we are looking + * for first invalid char after the 38 ones. */ - if (passwdlen > 13) - passwdlen = 13 + strspn(pwd->pw_passwd + 13, + if (passwdlen > 13 && (hash_id == DES || hash_id == MD5)) + passwdlen = 13 + strspn(pwd->pw_passwd + 13, "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "0123456789./"); + if (passwdlen > 38 && (hash_id == SHA_256 || hash_id == SHA_512)) + passwdlen = 38 + strspn(pwd->pw_passwd + 38, + "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "0123456789./"); + sane_passwd = alloca (passwdlen + 1); strncpy (sane_passwd, pwd->pw_passwd, passwdlen); sane_passwd[passwdlen] = 0; @@ -719,7 +739,7 @@ main (int argc, char **argv) #ifdef USE_CRACKLIB char *error_msg; #endif /* USE_CRACKLIB */ - char *buf, salt[12], *p = NULL; + char *buf, salt[37], *p = NULL; int tries = 0; buf = (char *) malloc (129); @@ -771,15 +791,37 @@ main (int argc, char **argv) } } - if (!has_md5_passwd) - create_random_salt (salt, 2); - else - { - /* The user already had a MD5 password, so it's safe to - * use a MD5 password again */ - strcpy (salt, "$1$"); - create_random_salt (salt+3, 8); - } + switch (hash_id) + { + case DES: + create_random_salt (salt, 2); + break; + + case MD5: + /* The user already had a MD5 password, so it's safe to + * use a MD5 password again */ + strcpy (salt, "$1$"); + create_random_salt (salt+3, 8); + break; + + case SHA_256: + case SHA_512: + /* The user already had a SHA-2 password, so it's safe to + * use a SHA-2 password again */ + snprintf(salt, 4, "$%d$", hash_id); + if (strlen(rounds) != 0) + { + strcpy (salt+3, "rounds="); + strcpy (salt+3+7, rounds); + create_random_salt (salt+3+7+strlen(rounds), 16); + } + else + create_random_salt (salt+3, 16); + + break; + default: + break; + } yppwd.newpw.pw_passwd = strdup (crypt (buf, salt)); } diff -up yp-tools-2.9/src/yppasswd.h_old yp-tools-2.9/src/yppasswd.h --- yp-tools-2.9/src/yppasswd.h_old 2009-03-04 10:49:41.000000000 +0100 +++ yp-tools-2.9/src/yppasswd.h 2009-03-04 11:16:41.000000000 +0100 @@ -46,4 +46,9 @@ typedef struct yppasswd yppasswd; extern bool_t xdr_xpasswd (XDR *, xpasswd*); extern bool_t xdr_yppasswd (XDR *, yppasswd*); +#define DES 0 +#define MD5 1 +#define SHA_256 5 +#define SHA_512 6 + #endif /* !__YPPASSWD_H__ */ Index: yp-tools.spec =================================================================== RCS file: /cvs/extras/rpms/yp-tools/devel/yp-tools.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- yp-tools.spec 25 Feb 2009 18:15:51 -0000 1.25 +++ yp-tools.spec 4 Mar 2009 12:52:24 -0000 1.26 @@ -1,12 +1,13 @@ Summary: NIS (or YP) client programs. Name: yp-tools Version: 2.9 -Release: 5 +Release: 6%{?dist} License: GPLv2 Group: System Environment/Base Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2 Url: http://www.linux-nis.org/nis/yp-tools/index.html Patch1: yp-tools-2.7-md5.patch +Patch2: yp-tools-2.9-sha-2.patch Obsoletes: yppasswd, yp-clients Requires: ypbind Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,6 +35,7 @@ %prep %setup -q %patch1 -p1 -b .md5 +%patch2 -p1 -b .sha-2 %build %configure --disable-domainname @@ -59,6 +61,10 @@ %dir /var/yp %changelog +* Wed Mar 4 2009 Vitezslav Crhonek - 2.9-6 +- Add SHA-2 password hashes support + Resolves: #487607 + * Wed Feb 25 2009 Fedora Release Engineering - 2.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pknirsch at fedoraproject.org Wed Mar 4 13:10:16 2009 From: pknirsch at fedoraproject.org (Phil Knirsch) Date: Wed, 4 Mar 2009 13:10:16 +0000 (UTC) Subject: rpms/filesystem/devel filesystem.spec,1.53,1.54 Message-ID: <20090304131016.2A84370116@cvs1.fedora.phx.redhat.com> Author: pknirsch Update of /cvs/pkgs/rpms/filesystem/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12157 Modified Files: filesystem.spec Log Message: - Added /usr/share/backgrounds (#487957) - Added /usr/share/ghostscript/{conf.d} (#302521) Index: filesystem.spec =================================================================== RCS file: /cvs/pkgs/rpms/filesystem/devel/filesystem.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- filesystem.spec 24 Feb 2009 17:03:26 -0000 1.53 +++ filesystem.spec 4 Mar 2009 13:09:45 -0000 1.54 @@ -1,7 +1,7 @@ Summary: The basic directory layout for a Linux system Name: filesystem -Version: 2.4.20 -Release: 2%{?dist} +Version: 2.4.21 +Release: 1%{?dist} License: Public Domain URL: https://fedorahosted.org/filesystem Group: System Environment/Base @@ -32,7 +32,7 @@ bin boot dev \ etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,xinetd.d,skel,sysconfig,pki} \ home lib/modules %{_lib}/tls media mnt opt proc root sbin selinux srv sys tmp \ - usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11},lib/{games,locale,X11},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{applications,augeas/lenses,desktop-directories,dict,doc,empty,games,gnome,icons,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,themes,xsessions},src,src/kernels} \ + usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11},lib/{games,locale,X11},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,themes,xsessions},src,src/kernels} \ var/{empty,lib/{games,misc},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd},tmp,db,cache,opt,games,yp} ln -snf ../var/tmp usr/tmp @@ -101,11 +101,13 @@ %dir /usr/share /usr/share/applications /usr/share/augeas +/usr/share/backgrounds /usr/share/desktop-directories /usr/share/dict /usr/share/doc %attr(555,root,root) %dir /usr/share/empty /usr/share/games +/usr/share/ghostscript /usr/share/gnome /usr/share/icons /usr/share/info @@ -140,6 +142,10 @@ /var/yp %changelog +* Wed Mar 04 2009 Phil Knirsch - 2.4.21-1 +- Added /usr/share/backgrounds (#487957) +- Added /usr/share/ghostscript/{conf.d} (#302521) + * Tue Feb 24 2009 Fedora Release Engineering - 2.4.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Wed Mar 4 13:17:00 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Wed, 4 Mar 2009 13:17:00 +0000 (UTC) Subject: rpms/xapian-core/devel xapian-core-1.0.9-includes.patch, NONE, 1.1 xapian-core.spec, 1.19, 1.20 Message-ID: <20090304131700.3A6C470116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/xapian-core/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13093 Modified Files: xapian-core.spec Added Files: xapian-core-1.0.9-includes.patch Log Message: include stdio.h for rename, fix bare #elif, EOF -> -1 for getopt xapian-core-1.0.9-includes.patch: --- NEW FILE xapian-core-1.0.9-includes.patch --- diff -ru xapian-core-1.0.9.orig/backends/flint/flint_version.cc xapian-core-1.0.9/backends/flint/flint_version.cc --- xapian-core-1.0.9.orig/backends/flint/flint_version.cc 2009-03-04 12:06:14.000000000 +0000 +++ xapian-core-1.0.9/backends/flint/flint_version.cc 2009-03-04 12:06:34.000000000 +0000 @@ -36,6 +36,7 @@ #include #include // for memcmp +#include // for rename using std::string; diff -ru xapian-core-1.0.9.orig/bin/quartzcompact.cc xapian-core-1.0.9/bin/quartzcompact.cc --- xapian-core-1.0.9.orig/bin/quartzcompact.cc 2009-03-04 12:06:14.000000000 +0000 +++ xapian-core-1.0.9/bin/quartzcompact.cc 2009-03-04 12:48:51.000000000 +0000 @@ -222,7 +222,7 @@ size_t block_size = 8192; int c; - while ((c = gnu_getopt_long(argc, argv, "b:nFhv", long_opts, 0)) != EOF) { + while ((c = gnu_getopt_long(argc, argv, "b:nFhv", long_opts, 0)) != -1) { switch (c) { case 'b': { char *p; diff -ru xapian-core-1.0.9.orig/bin/quartzdump.cc xapian-core-1.0.9/bin/quartzdump.cc --- xapian-core-1.0.9.orig/bin/quartzdump.cc 2009-03-04 12:06:14.000000000 +0000 +++ xapian-core-1.0.9/bin/quartzdump.cc 2009-03-04 12:48:54.000000000 +0000 @@ -91,7 +91,7 @@ }; int c; - while ((c = gnu_getopt_long(argc, argv, "r:s:e:", long_opts, 0)) != EOF) { + while ((c = gnu_getopt_long(argc, argv, "r:s:e:", long_opts, 0)) != -1) { switch (c) { case 'r': revnum = atoi(optarg); diff -ru xapian-core-1.0.9.orig/bin/xapian-compact.cc xapian-core-1.0.9/bin/xapian-compact.cc --- xapian-core-1.0.9.orig/bin/xapian-compact.cc 2009-03-04 12:06:14.000000000 +0000 +++ xapian-core-1.0.9/bin/xapian-compact.cc 2009-03-04 12:49:00.000000000 +0000 @@ -748,7 +748,7 @@ bool renumber = true; int c; - while ((c = gnu_getopt_long(argc, argv, "b:nFm", long_opts, 0)) != EOF) { + while ((c = gnu_getopt_long(argc, argv, "b:nFm", long_opts, 0)) != -1) { switch (c) { case 'b': { char *p; diff -ru xapian-core-1.0.9.orig/bin/xapian-inspect.cc xapian-core-1.0.9/bin/xapian-inspect.cc --- xapian-core-1.0.9.orig/bin/xapian-inspect.cc 2009-03-04 12:06:14.000000000 +0000 +++ xapian-core-1.0.9/bin/xapian-inspect.cc 2009-03-04 12:49:03.000000000 +0000 @@ -94,7 +94,7 @@ }; int c; - while ((c = gnu_getopt_long(argc, argv, "", long_opts, 0)) != EOF) { + while ((c = gnu_getopt_long(argc, argv, "", long_opts, 0)) != -1) { switch (c) { case OPT_HELP: cout << PROG_NAME" - "PROG_DESC"\n\n"; diff -ru xapian-core-1.0.9.orig/bin/xapian-progsrv.cc xapian-core-1.0.9/bin/xapian-progsrv.cc --- xapian-core-1.0.9.orig/bin/xapian-progsrv.cc 2009-03-04 12:06:14.000000000 +0000 +++ xapian-core-1.0.9/bin/xapian-progsrv.cc 2009-03-04 12:49:07.000000000 +0000 @@ -60,7 +60,7 @@ bool syntax_error = false; int c; - while ((c = gnu_getopt_long(argc, argv, "t:", opts, NULL)) != EOF) { + while ((c = gnu_getopt_long(argc, argv, "t:", opts, NULL)) != -1) { switch (c) { case OPT_HELP: cout << PROG_NAME" - "PROG_DESC"\n\n"; diff -ru xapian-core-1.0.9.orig/bin/xapian-tcpsrv.cc xapian-core-1.0.9/bin/xapian-tcpsrv.cc --- xapian-core-1.0.9.orig/bin/xapian-tcpsrv.cc 2009-03-04 12:06:14.000000000 +0000 +++ xapian-core-1.0.9/bin/xapian-tcpsrv.cc 2009-03-04 12:49:12.000000000 +0000 @@ -95,7 +95,7 @@ bool syntax_error = false; int c; - while ((c = gnu_getopt_long(argc, argv, "I:p:a:i:t:oq", opts, NULL)) != EOF) { + while ((c = gnu_getopt_long(argc, argv, "I:p:a:i:t:oq", opts, NULL)) != -1) { switch (c) { case OPT_HELP: cout << PROG_NAME" - "PROG_DESC"\n\n"; diff -ru xapian-core-1.0.9.orig/common/serialise-double.cc xapian-core-1.0.9/common/serialise-double.cc --- xapian-core-1.0.9.orig/common/serialise-double.cc 2009-03-04 12:06:14.000000000 +0000 +++ xapian-core-1.0.9/common/serialise-double.cc 2009-03-04 12:21:40.000000000 +0000 @@ -56,7 +56,7 @@ # define MAX_MANTISSA_BYTES ((DBL_MANT_DIG + 1 + 1) / 2) # define MAX_EXP ((DBL_MAX_EXP + 1) / 2) # define MAX_MANTISSA (1 << ((DBL_MAX_EXP & 1) * 4)) -#elif +#else # error FLT_RADIX is a value not currently handled (not 2 or 16) // # define MAX_MANTISSA_BYTES (sizeof(double) + 1) #endif diff -ru xapian-core-1.0.9.orig/examples/delve.cc xapian-core-1.0.9/examples/delve.cc --- xapian-core-1.0.9.orig/examples/delve.cc 2009-03-04 12:06:14.000000000 +0000 +++ xapian-core-1.0.9/examples/delve.cc 2009-03-04 13:06:01.000000000 +0000 @@ -172,7 +172,7 @@ bool valno_set = false; int c; - while ((c = gnu_getopt(argc, argv, "r:t:s:1vkV::d")) != EOF) { + while ((c = gnu_getopt(argc, argv, "r:t:s:1vkV::d")) != -1) { switch (c) { case 'r': recnos.push_back(atoi(optarg)); diff -ru xapian-core-1.0.9.orig/examples/quest.cc xapian-core-1.0.9/examples/quest.cc --- xapian-core-1.0.9.orig/examples/quest.cc 2009-03-04 12:06:14.000000000 +0000 +++ xapian-core-1.0.9/examples/quest.cc 2009-03-04 13:06:11.000000000 +0000 @@ -80,7 +80,7 @@ Xapian::Database db; int c; - while ((c = gnu_getopt_long(argc, argv, "hvm:d:s:", long_opts, 0)) != EOF) + while ((c = gnu_getopt_long(argc, argv, "hvm:d:s:", long_opts, 0)) != -1) { switch (c) { case 'm': diff -ru xapian-core-1.0.9.orig/tests/harness/testsuite.cc xapian-core-1.0.9/tests/harness/testsuite.cc --- xapian-core-1.0.9.orig/tests/harness/testsuite.cc 2009-03-04 12:06:14.000000000 +0000 +++ xapian-core-1.0.9/tests/harness/testsuite.cc 2009-03-04 13:06:28.000000000 +0000 @@ -648,7 +648,7 @@ } int c; - while ((c = gnu_getopt_long(argc, argv, opts.c_str(), long_opts, 0)) != EOF) + while ((c = gnu_getopt_long(argc, argv, opts.c_str(), long_opts, 0)) != -1) { switch (c) { case 'v': Index: xapian-core.spec =================================================================== RCS file: /cvs/pkgs/rpms/xapian-core/devel/xapian-core.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xapian-core.spec 26 Feb 2009 07:39:03 -0000 1.19 +++ xapian-core.spec 4 Mar 2009 13:16:29 -0000 1.20 @@ -1,13 +1,14 @@ Summary: The Xapian Probabilistic Information Retrieval Library Name: xapian-core Version: 1.0.9 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/Databases URL: http://www.xapian.org/ Requires: %{name}-libs = %{version} Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz Patch0: multilib-devel-conflict-fix.patch +Patch1: xapian-core-1.0.9-includes.patch BuildRequires: autoconf automake libtool BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,6 +43,7 @@ %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .multilibfix +%patch1 -p1 -b .includes %build # FC6 (at least) has a patched libtool which knows not to set rpath for @@ -120,6 +122,9 @@ %{_mandir}/man1/xapian-config.1* %changelog +* Wed Mar 04 2009 Caol??n McNamara - 1.0.9-4 +- include stdio.h for rename, fix bare #elif, EOF -> -1 for getopt + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ivazquez at fedoraproject.org Wed Mar 4 13:29:23 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 13:29:23 +0000 (UTC) Subject: rpms/python-polib/devel import.log, NONE, 1.1 python-polib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304132923.68F4B70116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/python-polib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14825/devel Modified Files: .cvsignore sources Added Files: import.log python-polib.spec Log Message: Initial import --- NEW FILE import.log --- python-polib-0_4_0-1_20080217svnr60:HEAD:python-polib-0.4.0-1.20080217svnr60.src.rpm:1236173174 --- NEW FILE python-polib.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define alphatag r60 Name: python-polib Version: 0.4.0 Release: 1%{?dist}.20080217svn%{alphatag} Summary: A library to parse and manage gettext catalogs Group: Development/Languages License: MIT URL: http://code.google.com/p/polib/ # svn export -r60 http://polib.googlecode.com/svn/trunk/ polib-0.4.0-r60 # tar zcf polib-0.4.0-r60.tar.gz polib-0.4.0-r60 Source0: polib-%{version}-%{alphatag}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel %description polib allows you to manipulate, create, modify gettext files (pot, po and mo files). You can load existing files, iterate through it's entries, add, modify entries, comments or metadata, etc... or create new po files from scratch. polib provides a simple and pythonic API, exporting only three convenience functions 'pofile', 'mofile' and 'detect_encoding', and the 4 core classes: POFile, MOFile, POEntry and MOEntry for creating new files/entries. %prep %setup -q -n polib-%{version}-%{alphatag} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGELOG LICENSE README docs/ %{python_sitelib}/* %changelog * Wed Feb 18 2009 Ignacio Vazquez-Abrams 0.4.0-1.20080217svnr60 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-polib/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:42:00 -0000 1.1 +++ .cvsignore 4 Mar 2009 13:28:52 -0000 1.2 @@ -0,0 +1 @@ +polib-0.4.0-r60.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-polib/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:42:00 -0000 1.1 +++ sources 4 Mar 2009 13:28:53 -0000 1.2 @@ -0,0 +1 @@ +3ccfa697940893f48107689b5f0ddebf polib-0.4.0-r60.tar.gz From ivazquez at fedoraproject.org Wed Mar 4 13:31:51 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 13:31:51 +0000 (UTC) Subject: rpms/django-contact-form/devel django-contact-form.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304133151.C6E9670116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-contact-form/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15517/devel Modified Files: .cvsignore sources Added Files: django-contact-form.spec import.log Log Message: Initial import --- NEW FILE django-contact-form.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: django-contact-form Version: 0.3 Release: 2%{?dist} Summary: An extensible contact-form application for Django Group: Development/Languages License: BSD URL: http://bitbucket.org/ubernostrum/django-contact-form/ Source0: http://django-contact-form.googlecode.com/files/contact_form-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: Django %description An extensible contact-form application for Django %prep %setup -q -n contact_form-%{version} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt docs/ %{python_sitelib}/* %changelog * Mon Mar 02 2009 Ignacio Vazquez-Abrams 0.3-2 - Add Requires: Django * Wed Feb 18 2009 Ignacio Vazquez-Abrams 0.3-1 - Initial RPM release --- NEW FILE import.log --- django-contact-form-0_3-2:HEAD:django-contact-form-0.3-2.src.rpm:1236173442 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:42:59 -0000 1.1 +++ .cvsignore 4 Mar 2009 13:31:21 -0000 1.2 @@ -0,0 +1 @@ +contact_form-0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:42:59 -0000 1.1 +++ sources 4 Mar 2009 13:31:21 -0000 1.2 @@ -0,0 +1 @@ +4192a2d364814f503dde030985208c37 contact_form-0.3.tar.gz From ivazquez at fedoraproject.org Wed Mar 4 13:33:48 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 13:33:48 +0000 (UTC) Subject: rpms/django-notification/devel django-notification.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304133348.7BFFE70116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-notification/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15920/devel Modified Files: .cvsignore sources Added Files: django-notification.spec import.log Log Message: Initial import --- NEW FILE django-notification.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: django-notification Version: 0.1.2 Release: 2%{?dist} Summary: User notification management for the Django web framework Group: Development/Languages License: MIT URL: http://code.google.com/p/django-notification/ Source0: http://pypi.python.org/packages/source/d/django-notification/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel python-setuptools Requires: Django %description Many sites need to notify users when certain events have occurred and to allow configurable options as to how those notifications are to be received. The project aims to provide a Django app for this sort of functionality. This includes: * submission of notification messages by other apps * notification messages on signing in * notification messages via email (configurable by user) * notification messages via feed %prep %setup -q find -name '._*' -exec rm {} \; %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS LICENSE README docs/ %{python_sitelib}/* %changelog * Mon Mar 02 2009 Ignacio Vazquez-Abrams 0.1.2-2 - Add Requires: Django * Wed Feb 18 2009 Ignacio Vazquez-Abrams 0.1.2-1 - Initial RPM release --- NEW FILE import.log --- django-notification-0_1_2-2:HEAD:django-notification-0.1.2-2.src.rpm:1236173561 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-notification/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:43:50 -0000 1.1 +++ .cvsignore 4 Mar 2009 13:33:18 -0000 1.2 @@ -0,0 +1 @@ +django-notification-0.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-notification/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:43:50 -0000 1.1 +++ sources 4 Mar 2009 13:33:18 -0000 1.2 @@ -0,0 +1 @@ +3e485b0e047b70bfb00c783deae9e44b django-notification-0.1.2.tar.gz From veillard at fedoraproject.org Wed Mar 4 13:34:15 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Wed, 4 Mar 2009 13:34:15 +0000 (UTC) Subject: rpms/libvirt/devel .cvsignore, 1.37, 1.38 libvirt.spec, 1.113, 1.114 sources, 1.38, 1.39 Message-ID: <20090304133415.A25FC70116@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15966 Modified Files: .cvsignore libvirt.spec sources Log Message: Upstream release 0.6.1, Daniel Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 9 Feb 2009 08:55:58 -0000 1.37 +++ .cvsignore 4 Mar 2009 13:33:45 -0000 1.38 @@ -4,3 +4,4 @@ x86_64 libvirt-*.tar.gz libvirt-0.6.0.tar.gz +libvirt-0.6.1.tar.gz Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- libvirt.spec 2 Mar 2009 06:07:33 -0000 1.113 +++ libvirt.spec 4 Mar 2009 13:33:45 -0000 1.114 @@ -46,16 +46,11 @@ Summary: Library providing a simple API virtualization Name: libvirt -Version: 0.6.0 -Release: 6%{?dist}%{?extra_release} +Version: 0.6.1 +Release: 1%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz -Patch1: %{name}-%{version}-timeout.patch -Patch2: %{name}-%{version}-rpccall.patch -Patch3: %{name}-%{version}-qemu-startup.patch -Patch4: %{name}-%{version}-dbus-threads.patch -Patch5: %{name}-%{version}-autostart-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -184,11 +179,6 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 mv NEWS NEWS.old iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS @@ -264,7 +254,10 @@ %makeinstall (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in) -(cd docs/examples/python ; rm -f Makefile Makefile.in) +(cd docs/examples/python ; rm -rf .deps Makefile Makefile.in) +(cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in) +(cd examples/domain-events/events-c ; make clean ;rm -rf .deps .libs Makefile Makefile.in) + rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la @@ -462,6 +455,7 @@ %doc docs/*.html docs/html docs/*.gif %doc docs/examples %doc docs/libvirt-api.xml +%doc examples %if %{with_python} %files python @@ -477,6 +471,12 @@ %endif %changelog +* Wed Mar 4 2009 Daniel Veillard - 0.6.1-1.fc11 +- upstream release 0.6.1 +- support for node device detach reattach and reset +- sVirt mandatory access control support +- many bug fixes and small improvements + * Mon Mar 2 2009 Daniel Veillard - 0.6.0-6.fc11 - make sure Xen is handled in i586 new default 32bits x86 packages Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 6 Feb 2009 19:28:21 -0000 1.38 +++ sources 4 Mar 2009 13:33:45 -0000 1.39 @@ -1 +1 @@ -8e0120d5452b37179f682031bf0895ea libvirt-0.6.0.tar.gz +3154ea9d4a0778497dfdf58cb98127c0 libvirt-0.6.1.tar.gz From ivazquez at fedoraproject.org Wed Mar 4 13:35:40 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 13:35:40 +0000 (UTC) Subject: rpms/django-tagging/devel django-tagging.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304133540.C3E2370116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-tagging/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16440/devel Modified Files: .cvsignore sources Added Files: django-tagging.spec import.log Log Message: Initial import --- NEW FILE django-tagging.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define alphatag r154 Name: django-tagging Version: 0.3 Release: 1%{?dist}.20080217svn%{alphatag} Summary: A generic tagging application for Django projects Group: Development/Languages License: MIT URL: http://code.google.com/p/django-tagging/ # svn export -r154 http://django-tagging.googlecode.com/svn/trunk/ django-tagging-0.3-r154 # tar zcf django-tagging-0.3-r154.tar.gz django-tagging-0.3-r154 Source0: %{name}-%{version}-%{alphatag}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: Django %description A generic tagging application for Django projects, which allows association of a number of tags with any Model instance and makes retrieval of tags simple. %prep %setup -q -n %{name}-%{version}-%{alphatag} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGELOG.txt LICENSE.txt README.txt docs/ %{python_sitelib}/* %changelog * Mon Mar 02 2009 Ignacio Vazquez-Abrams 0.3-1.20080217svnr154 - Add Requires: Django * Wed Feb 18 2009 Ignacio Vazquez-Abrams 0.3-0.20080217svnr154 - Initial RPM release --- NEW FILE import.log --- django-tagging-0_3-1_20080217svnr154:HEAD:django-tagging-0.3-1.20080217svnr154.src.rpm:1236173674 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-tagging/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:44:39 -0000 1.1 +++ .cvsignore 4 Mar 2009 13:35:10 -0000 1.2 @@ -0,0 +1 @@ +django-tagging-0.3-r154.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-tagging/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:44:39 -0000 1.1 +++ sources 4 Mar 2009 13:35:10 -0000 1.2 @@ -0,0 +1 @@ +3d155bd09de93ccfd316d382558dc526 django-tagging-0.3-r154.tar.gz From steved at fedoraproject.org Wed Mar 4 13:42:23 2009 From: steved at fedoraproject.org (Steve Dickson) Date: Wed, 4 Mar 2009 13:42:23 +0000 (UTC) Subject: rpms/kernel/devel linux-2.6.29-rc6-nfs41-030408.patch, NONE, 1.1.2.1 config-generic, 1.251, 1.251.2.1 kernel.spec, 1.1378, 1.1378.2.1 Message-ID: <20090304134223.3B0E970116@cvs1.fedora.phx.redhat.com> Author: steved Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17377 Modified Files: Tag: kernel-2_6_29-0_rc7_nfs41_030408 config-generic kernel.spec Added Files: Tag: kernel-2_6_29-0_rc7_nfs41_030408 linux-2.6.29-rc6-nfs41-030408.patch Log Message: Updated to latest NFSv41 patches linux-2.6.29-rc6-nfs41-030408.patch: --- NEW FILE linux-2.6.29-rc6-nfs41-030408.patch --- diff -up linux-2.6.28.noarch/fs/nfs/callback.c.orig linux-2.6.28.noarch/fs/nfs/callback.c --- linux-2.6.28.noarch/fs/nfs/callback.c.orig 2009-03-04 07:30:53.737727000 -0500 +++ linux-2.6.28.noarch/fs/nfs/callback.c 2009-03-04 07:34:33.174052000 -0500 @@ -17,6 +17,9 @@ #include #include #include +#if defined(CONFIG_NFS_V4_1) +#include +#endif #include @@ -28,11 +31,12 @@ struct nfs_callback_data { unsigned int users; + struct svc_serv *serv; struct svc_rqst *rqst; struct task_struct *task; }; -static struct nfs_callback_data nfs_callback_info; +static struct nfs_callback_data nfs_callback_info[NFS4_MAX_MINOR_VERSION + 1]; static DEFINE_MUTEX(nfs_callback_mutex); static struct svc_program nfs4_callback_program; @@ -65,10 +69,10 @@ module_param_call(callback_tcpport, para &nfs_callback_set_tcpport, 0644); /* - * This is the callback kernel thread. + * This is the NFSv4 callback kernel thread. */ static int -nfs_callback_svc(void *vrqstp) +nfs4_callback_svc(void *vrqstp) { int err, preverr = 0; struct svc_rqst *rqstp = vrqstp; @@ -105,48 +109,163 @@ nfs_callback_svc(void *vrqstp) return 0; } + +/* + * Prepare to bring up the NFSv4 callback service + */ +struct svc_rqst * +nfs4_callback_up(struct svc_serv *serv) +{ + int ret; + + ret = svc_create_xprt(serv, "tcp", nfs_callback_set_tcpport, + SVC_SOCK_ANONYMOUS); + if (unlikely(ret <= 0)) { + if (ret == 0) + ret = -EIO; + return ERR_PTR(ret); + } + nfs_callback_tcpport = ret; + dprintk("NFS: Callback listener port = %u (af %u)\n", + nfs_callback_tcpport, nfs_callback_family); + return svc_prepare_thread(serv, &serv->sv_pools[0]); +} + +#if defined(CONFIG_NFS_V4_1) +/* + * The callback service for NFSv4.1 callbacks + */ +static int +nfs41_callback_svc(void *vrqstp) +{ + struct svc_rqst *rqstp = vrqstp; + struct svc_serv *serv = rqstp->rq_server; + struct rpc_rqst *req; + int error; + DEFINE_WAIT(wq); + + set_freezable(); + + /* + * FIXME: do we really need to run this under the BKL? If so, please + * add a comment about what it's intended to protect. + */ + lock_kernel(); + while (!kthread_should_stop()) { + prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_INTERRUPTIBLE); + spin_lock_bh(&serv->sv_cb_lock); + if (!list_empty(&serv->sv_cb_list)) { + req = list_first_entry(&serv->sv_cb_list, + struct rpc_rqst, rq_bc_list); + list_del(&req->rq_bc_list); + spin_unlock_bh(&serv->sv_cb_lock); + dprintk("Invoking bc_svc_process()\n"); + error = bc_svc_process(serv, req, rqstp); + dprintk("bc_svc_process() returned w/ error code= %d\n", + error); + } else { + spin_unlock_bh(&serv->sv_cb_lock); + schedule(); + } + finish_wait(&serv->sv_cb_waitq, &wq); + } + unlock_kernel(); + return 0; +} + +/* + * Bring up the NFSv4.1 callback service + */ +struct svc_rqst * +nfs41_callback_up(struct svc_serv *serv, struct rpc_xprt *xprt) +{ + struct svc_xprt *bc_xprt; + struct svc_rqst *rqstp = ERR_PTR(-ENOMEM); + + dprintk("--> %s\n", __func__); + /* Create a svc_sock for the service */ + bc_xprt = svc_sock_create(serv, xprt->prot); + if (!bc_xprt) + goto out; + + /* + * Save the svc_serv in the transport so that it can + * be referenced when the session backchannel is initialized + */ + serv->bc_xprt = bc_xprt; + xprt->bc_serv = serv; + + INIT_LIST_HEAD(&serv->sv_cb_list); + spin_lock_init(&serv->sv_cb_lock); + init_waitqueue_head(&serv->sv_cb_waitq); + rqstp = svc_prepare_thread(serv, &serv->sv_pools[0]); + if (IS_ERR(rqstp)) + svc_sock_destroy(bc_xprt); +out: + dprintk("--> %s return %p\n", __func__, rqstp); + return rqstp; +} +#endif /* CONFIG_NFS_V4_1 */ + /* * Bring up the callback thread if it is not already up. */ -int nfs_callback_up(void) +int nfs_callback_up(u32 minorversion, void *args) { struct svc_serv *serv = NULL; + struct svc_rqst *rqst; + int (* callback_svc)(void *vrqstp); + struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion]; + char svc_name[12]; int ret = 0; +#if defined(CONFIG_NFS_V4_1) + struct rpc_xprt *xprt = (struct rpc_xprt *)args; +#endif /* CONFIG_NFS_V4_1 */ mutex_lock(&nfs_callback_mutex); - if (nfs_callback_info.users++ || nfs_callback_info.task != NULL) + if (cb_info->users++ || cb_info->task != NULL) { +#if defined(CONFIG_NFS_V4_1) + if (minorversion) + xprt->bc_serv = cb_info->serv; +#endif /* CONFIG_NFS_V4_1 */ goto out; + } serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, nfs_callback_family, NULL); - ret = -ENOMEM; - if (!serv) - goto out_err; - - ret = svc_create_xprt(serv, "tcp", nfs_callback_set_tcpport, - SVC_SOCK_ANONYMOUS); - if (ret <= 0) + if (!serv) { + ret = -ENOMEM; goto out_err; - nfs_callback_tcpport = ret; - dprintk("NFS: Callback listener port = %u (af %u)\n", - nfs_callback_tcpport, nfs_callback_family); + } - nfs_callback_info.rqst = svc_prepare_thread(serv, &serv->sv_pools[0]); - if (IS_ERR(nfs_callback_info.rqst)) { - ret = PTR_ERR(nfs_callback_info.rqst); - nfs_callback_info.rqst = NULL; + /* FIXME: either 4.0 or 4.1 callback service can be up at a time + * need to monitor and control them both */ + if (!minorversion) { + rqst = nfs4_callback_up(serv); + callback_svc = nfs4_callback_svc; + } else { +#if defined(CONFIG_NFS_V4_1) + rqst = nfs41_callback_up(serv, xprt); + callback_svc = nfs41_callback_svc; +#else /* CONFIG_NFS_V4_1 */ + BUG(); [...12206 lines suppressed...] + /* + * send page data + * + * Check the amount of data to be sent. If it is less than the + * remaining page, then send it else send the current page + */ + + size = PAGE_SIZE - base < pglen ? PAGE_SIZE - base : pglen; + while (pglen > 0) { + if (total_len == size) + flags = 0; + result = sock->ops->sendpage(sock, *pages, base, size, flags); + if (result > 0) + len += result; + if (result != size) + goto out; + total_len -= size; + pglen -= size; + size = PAGE_SIZE < pglen ? PAGE_SIZE : pglen; + base = 0; + pages++; + } + /* + * send tail + */ + if (xbufp->tail[0].iov_len) { + result = sock->ops->sendpage(sock, + xbufp->tail[0].iov_base, + (unsigned long)xbufp->tail[0].iov_base & ~PAGE_MASK, + xbufp->tail[0].iov_len, + 0); + + if (result > 0) + len += result; + } +out: + if (len != xbufp->len) + printk(KERN_NOTICE "Error sending entire callback!\n"); + + return len; +} + +/* + * The send routine. Borrows from svc_send + */ +static int bc_send_request(struct rpc_task *task) +{ + struct rpc_rqst *req = task->tk_rqstp; + struct rpc_xprt *bc_xprt = req->rq_xprt; + struct svc_xprt *xprt; + struct svc_sock *svsk; + u32 len; + + dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid)); + /* + * Get the server socket associated with this callback xprt + */ + svsk = bc_xprt->bc_sock; + xprt = &svsk->sk_xprt; + + mutex_lock(&xprt->xpt_mutex); + if (test_bit(XPT_DEAD, &xprt->xpt_flags)) + len = -ENOTCONN; + else + len = bc_sendto(req); + mutex_unlock(&xprt->xpt_mutex); + + return 0; + +} + +/* + * The close routine. Since this is client initiated, we do nothing + */ + +static void bc_close(struct rpc_xprt *xprt) +{ + return; +} + +/* + * The xprt destroy routine. Again, because this connection is client + * initiated, we do nothing + */ + +static void bc_destroy(struct rpc_xprt *xprt) +{ + return; +} +#endif /* CONFIG_NFSD_V4_1 */ + static struct rpc_xprt_ops xs_udp_ops = { .set_buffer_size = xs_udp_set_buffer_size, .reserve_xprt = xprt_reserve_xprt_cong, @@ -1899,11 +2266,34 @@ static struct rpc_xprt_ops xs_tcp_ops = .buf_free = rpc_free, .send_request = xs_tcp_send_request, .set_retrans_timeout = xprt_set_retrans_timeout_def, +#if defined(CONFIG_NFS_V4_1) + .release_request = bc_release_request, +#endif /* CONFIG_NFS_V4_1 */ .close = xs_tcp_shutdown, .destroy = xs_destroy, .print_stats = xs_tcp_print_stats, }; +#if defined(CONFIG_NFSD_V4_1) +/* + * The rpc_xprt_ops for the server backchannel + */ + +static struct rpc_xprt_ops bc_tcp_ops = { + .reserve_xprt = xprt_reserve_xprt, + .release_xprt = xprt_release_xprt, + .set_port = bc_set_port, + .connect = bc_connect, + .buf_alloc = bc_malloc, + .buf_free = bc_free, + .send_request = bc_send_request, + .set_retrans_timeout = xprt_set_retrans_timeout_def, + .close = bc_close, + .destroy = bc_destroy, + .print_stats = xs_tcp_print_stats, +}; +#endif /* CONFIG_NFSD_V4_1 */ + static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args, unsigned int slot_table_size) { @@ -2036,13 +2426,31 @@ static struct rpc_xprt *xs_setup_tcp(str xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32); xprt->max_payload = RPC_MAX_FRAGMENT_SIZE; - xprt->bind_timeout = XS_BIND_TO; - xprt->connect_timeout = XS_TCP_CONN_TO; - xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO; - xprt->idle_timeout = XS_IDLE_DISC_TO; +#ifdef CONFIG_NFSD_V4_1 + if (args->bc_sock) { + /* backchannel */ + xprt_set_bound(xprt); + INIT_DELAYED_WORK(&transport->connect_worker, + bc_connect_worker); + xprt->bind_timeout = 0; + xprt->connect_timeout = 0; + xprt->reestablish_timeout = 0; + xprt->idle_timeout = (~0); - xprt->ops = &xs_tcp_ops; - xprt->timeout = &xs_tcp_default_timeout; + /* + * The backchannel uses the same socket connection as the + * forechannel + */ + xprt->bc_sock = args->bc_sock; + xprt->bc_sock->sk_bc_xprt = xprt; + transport->sock = xprt->bc_sock->sk_sock; + transport->inet = xprt->bc_sock->sk_sk; + + xprt->ops = &bc_tcp_ops; + + goto next; + } +#endif /* CONFIG_NFSD_V4_1 */ switch (addr->sa_family) { case AF_INET: @@ -2050,13 +2458,31 @@ static struct rpc_xprt *xs_setup_tcp(str xprt_set_bound(xprt); INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4); - xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP); break; case AF_INET6: if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0)) xprt_set_bound(xprt); INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker6); + break; + } + xprt->bind_timeout = XS_BIND_TO; + xprt->connect_timeout = XS_TCP_CONN_TO; + xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO; + xprt->idle_timeout = XS_IDLE_DISC_TO; + + xprt->ops = &xs_tcp_ops; + +#ifdef CONFIG_NFSD_V4_1 +next: +#endif /* CONFIG_NFSD_V4_1 */ + xprt->timeout = &xs_tcp_default_timeout; + + switch (addr->sa_family) { + case AF_INET: + xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP); + break; + case AF_INET6: xs_format_ipv6_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6); break; default: Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.251 retrieving revision 1.251.2.1 diff -u -r1.251 -r1.251.2.1 --- config-generic 2 Mar 2009 23:09:52 -0000 1.251 +++ config-generic 4 Mar 2009 13:41:52 -0000 1.251.2.1 @@ -3164,6 +3164,12 @@ CONFIG_SUNRPC_REGISTER_V4=y CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m +# +# Needed of NFSv4.1 +# +CONFIG_NFS_V4_1=y +CONFIG_NFSD_V4_1=y + # CONFIG_SMB_FS is not set # CONFIG_SMB_NLS_DEFAULT is not set CONFIG_CIFS=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1378 retrieving revision 1.1378.2.1 diff -u -r1.1378 -r1.1378.2.1 --- kernel.spec 4 Mar 2009 05:41:36 -0000 1.1378 +++ kernel.spec 4 Mar 2009 13:41:52 -0000 1.1378.2.1 @@ -12,7 +12,7 @@ # that the kernel isn't the stock distribution kernel, for example, # by setting the define to ".local" or ".bz123456" # -# % define buildid .local +%define buildid .nfs41_030408 # fedora_build defines which build revision of this kernel version we're # building. Rather than incrementing forever, as with the prior versioning @@ -86,7 +86,7 @@ # kernel-headers %define with_headers %{?_without_headers: 0} %{?!_without_headers: 1} # kernel-firmware -%define with_firmware %{?_with_firmware: 1} %{?!_with_firmware: 0} +%define with_firmware %{?_with_firmware: 1} %{?!_with_firmware: 1} # kernel-debuginfo %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1} # kernel-bootwrapper (for creating zImages from kernel + initrd) @@ -666,6 +666,8 @@ Patch2300: linux-2.6.28-sunrpc-ipv6-rpcbind.patch Patch2301: linux-2.6.28-lockd-svc-register.patch +Patch2400: linux-2.6.29-rc6-nfs41-030408.patch + # Quiet boot fixes # silence the ACPI blacklist code Patch2802: linux-2.6-silence-acpi-blacklist.patch @@ -1209,6 +1211,7 @@ ApplyPatch linux-2.6.28-lockd-svc-register.patch +ApplyPatch linux-2.6.29-rc6-nfs41-030408.patch # END OF PATCH APPLICATIONS %endif @@ -1792,6 +1795,9 @@ # and build. %changelog +* Wed Mar 4 2009 Steve Dickson 2.6.29-0.197.rc7-nfs41 +- Updated to latest NFSv41 patches + * Wed Mar 04 2009 Ben Skeggs - drm-nouveau.patch: lvds, dpms and gamma_set fixes From simo at fedoraproject.org Wed Mar 4 13:47:17 2009 From: simo at fedoraproject.org (Simo Sorce) Date: Wed, 4 Mar 2009 13:47:17 +0000 (UTC) Subject: rpms/samba4/devel samba4.spec,1.5,1.6 Message-ID: <20090304134717.4E0FF70116@cvs1.fedora.phx.redhat.com> Author: simo Update of /cvs/pkgs/rpms/samba4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18147 Modified Files: samba4.spec Log Message: * Wed Mar 4 2009 Simo Sorce - 4.0.0-8alpha7 - Fix typo in Requires Index: samba4.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba4/devel/samba4.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- samba4.spec 4 Mar 2009 01:52:37 -0000 1.5 +++ samba4.spec 4 Mar 2009 13:46:46 -0000 1.6 @@ -1,4 +1,4 @@ -%define main_release 7 +%define main_release 8 %define samba4_version 4.0.0 %define talloc_version 1.2.0 @@ -231,7 +231,7 @@ Summary: Developer tools for the Talloc library Version: %{talloc_version} Release: %{talloc_release} -Requires: libtalloc = %{talloc_release} +Requires: libtalloc = %{talloc_version}-%{talloc_release} %description -n libtalloc-devel Header files needed to develop programs that link against the Talloc library. @@ -772,6 +772,9 @@ %{_mandir}/man3/ldb.3.gz %changelog +* Wed Mar 4 2009 Simo Sorce - 4.0.0-8alpha7 +- Fix typo in Requires + * Mon Mar 2 2009 Simo Sorce - 4.0.0-7alpha7 - Compile and have separate packages for additional samba libraries Package in their own packages: talloc, tdb, tevent, ldb From ivazquez at fedoraproject.org Wed Mar 4 13:52:36 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 13:52:36 +0000 (UTC) Subject: rpms/django-notification/devel django-notification.spec,1.1,1.2 Message-ID: <20090304135236.7CB7C70117@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-notification/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19173/django-notification/devel Modified Files: django-notification.spec Log Message: A bit of cleanup before build... Index: django-notification.spec =================================================================== RCS file: /cvs/pkgs/rpms/django-notification/devel/django-notification.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- django-notification.spec 4 Mar 2009 13:33:18 -0000 1.1 +++ django-notification.spec 4 Mar 2009 13:52:06 -0000 1.2 @@ -43,7 +43,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS LICENSE README docs/ +%doc AUTHORS LICENSE README docs/* %{python_sitelib}/* %changelog From ivazquez at fedoraproject.org Wed Mar 4 13:52:36 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 13:52:36 +0000 (UTC) Subject: rpms/django-contact-form/devel django-contact-form.spec,1.1,1.2 Message-ID: <20090304135236.5E51F70116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-contact-form/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19173/django-contact-form/devel Modified Files: django-contact-form.spec Log Message: A bit of cleanup before build... Index: django-contact-form.spec =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/devel/django-contact-form.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- django-contact-form.spec 4 Mar 2009 13:31:21 -0000 1.1 +++ django-contact-form.spec 4 Mar 2009 13:52:06 -0000 1.2 @@ -33,7 +33,7 @@ %files %defattr(-,root,root,-) -%doc LICENSE.txt README.txt docs/ +%doc LICENSE.txt README.txt docs/* %{python_sitelib}/* %changelog From ivazquez at fedoraproject.org Wed Mar 4 13:52:36 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 13:52:36 +0000 (UTC) Subject: rpms/django-tagging/devel django-tagging.spec,1.1,1.2 Message-ID: <20090304135236.C495470116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-tagging/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19173/django-tagging/devel Modified Files: django-tagging.spec Log Message: A bit of cleanup before build... Index: django-tagging.spec =================================================================== RCS file: /cvs/pkgs/rpms/django-tagging/devel/django-tagging.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- django-tagging.spec 4 Mar 2009 13:35:10 -0000 1.1 +++ django-tagging.spec 4 Mar 2009 13:52:06 -0000 1.2 @@ -40,7 +40,7 @@ %files %defattr(-,root,root,-) -%doc CHANGELOG.txt LICENSE.txt README.txt docs/ +%doc CHANGELOG.txt LICENSE.txt README.txt docs/* %{python_sitelib}/* %changelog From jakub at fedoraproject.org Wed Mar 4 13:55:39 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Wed, 4 Mar 2009 13:55:39 +0000 (UTC) Subject: rpms/gcc/devel gcc44-atom.patch, NONE, 1.1 gcc44-pr39226.patch, NONE, 1.1 gcc44-pr39358.patch, NONE, 1.1 .cvsignore, 1.257, 1.258 gcc.spec, 1.24, 1.25 sources, 1.260, 1.261 gcc44-pr39240.patch, 1.1, NONE Message-ID: <20090304135539.4671070116@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/gcc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19687 Modified Files: .cvsignore gcc.spec sources Added Files: gcc44-atom.patch gcc44-pr39226.patch gcc44-pr39358.patch Removed Files: gcc44-pr39240.patch Log Message: 4.4.0-0.22 gcc44-atom.patch: --- NEW FILE gcc44-atom.patch --- 2009-02-05 Joey Ye Xuepeng Guo H.J. Lu Atom pipeline model, tuning and insn selection. * rtlanal.c (reg_mentioned_by_mem_p_1): New function. (reg_mentioned_by_mem_p): New function. (reg_dep_by_addr_p): New function. * rtl.h (reg_mentioned_by_mem_p): Declare new function. (reg_dep_by_addr_p): Likewise. * config.gcc (atom): Add atom config options and target. * config/i386/i386.h (TARGET_ATOM): New target macro. (X86_TUNE_OPT_AGU): New tuning flag. (TARGET_OPT_AGU): New target option. (TARGET_CPU_DEFAULT_atom): New CPU default. (PROCESSOR_ATOM): New processor. * config/i386/i386-c.c (ix86_target_macros_internal): New case PROCESSOR_ATOM. (ix86_target_macros_internal): Likewise. * config/i386/i386-protos.h (ix86_lea_for_add_ok): Declare new function. (ix86_dep_by_shift_count): Likewise. (ix86_agi_dependent): Likewise. * config/i386/i386.c (atom_cost): New cost. (m_ATOM): New macro flag. (initial_ix86_tune_fe): Set m_ATOM. (x86_accumulate_outgoing_args): Likewise. (x86_arch_always_fancy_math_387): Likewise. (processor_target): Add Atom cost. (cpu_names): Add Atom cpu name. (override_options): Set Atom ISA. (LEA_SEARCH_THRESHOLD): New macro. (distance_non_agu_define): New function. (distance_agu_use): Likewise. (ix86_lea_for_add_ok): Likewise. (ix86_dep_by_shift_count): Likewise. (ix86_agi_dependent): Make it global. (ix86_issue_rate): New case PROCESSOR_ATOM. (ix86_adjust_cost): Likewise. * config/i386/i386.md (cpu): Add new value "atom". (atom.md): Include atom.md. (use_carry, movu): New attr. (adddi3_carry_rex64): Set attr "use_carry". (addqi3_carry): Likewise. (addhi3_carry): Likewise. (addsi3_carry): Likewise. (*addsi3_carry_zext): Likewise. (subdi3_carry_rex64): Likewise. (subqi3_carry): Likewise. (subhi3_carry): Likewise. (subsi3_carry): Likewise. (x86_movdicc_0_m1_rex64): Likewise. (*x86_movdicc_0_m1_se): Likewise. (x86_movsicc_0_m1): Likewise. (*x86_movsicc_0_m1_se): Likewise. (*adddi_1_rex64): Emit add insn as much as possible. (*addsi_1): Likewise. (return_internal): Set atom_unit. (return_internal_long): Likewise. (return_pop_internal): Likewise. (*rcpsf2_sse): Set atom_sse_attr attr. (*qrt2_sse): Likewise. (*prefetch_sse): Likewise. * config/i386/sse.md (cpu): Set attr "atom_sse_attr". (*prefetch_sse_rex): Likewise. (sse_rcpv4sf2): Likewise. (sse_vmrcpv4sf2): Likewise. (sse_sqrtv4sf2): Likewise. (_vmsqrt2): Likewise. (sse_ldmxcsr): Likewise. (sse_stmxcsr): Likewise. (*sse_sfence): Likewise. (sse2_clflush): Likewise. (*sse2_mfence): Likewise. (*sse2_lfence): Likewise. (avx_movup): Set attr "movu". (_movup): Likewise. (avx_movdqu): Likewise. (avx_lddqu): Likewise. (sse2_movntv2di): Change attr "type" to "ssemov". (sse2_movntsi): Likewise. (rsqrtv8sf2): Change attr "type" to "sseadd". (sse3_addsubv2df3): Set attr "atom_unit". (sse3_hv4sf3): Likewise. (*sse2_pmaddwd): Likewise. (*vec_extractv2di_1_rex64): Likewise. (*vec_extractv2di_1_avx): Likewise. (sse2_psadbw): Likewise. (ssse3_phaddwv8hi3): Likewise. (ssse3_phaddwv4hi3): Likewise. (ssse3_phadddv4si3): Likewise. (ssse3_phadddv2si3): Likewise. (ssse3_phaddswv8hi3): Likewise. (ssse3_phaddswv4hi3): Likewise. (ssse3_phsubwv8hi3): Likewise. (ssse3_phsubwv4hi3): Likewise. (ssse3_phsubdv4si3): Likewise. (ssse3_phsubdv2si3): Likewise. (ssse3_phsubswv8hi3): Likewise. (ssse3_phsubswv4hi3): Likewise. (ssse3_pmaddubsw128): Likewise. (sse3_pmaddubsw: Likewise. (ssse3_palignrti): Likewise. (ssse3_palignrdi): Likewise. * config/i386/atom.md: New. 2009-02-05 H.J. Lu * config/i386/i386.c (ix86_agi_dependent): Remove the third argument. Swap the first 2 arguments. (ix86_adjust_cost): Updated. 2009-01-30 Vladimir Makarov * genautomata.c: Add a new year to the copyright. Add a new reference. (struct insn_reserv_decl): Add comments for member bypass_list. (find_bypass): Remove. (insert_bypass): New. (process_decls): Use insert_bypass. (output_internal_insn_latency_func): Output all bypasses with the same input insn in one switch case. * rtl.def (define_bypass): Describe bypass choice. * doc/md.texi (define_bypass): Ditto. --- gcc/doc/md.texi (.../trunk) (revision 144460) +++ gcc/doc/md.texi (.../branches/ix86/atom) (revision 144601) @@ -7506,6 +7506,11 @@ be ignored for this case. The additiona recognize complicated bypasses, e.g.@: when the consumer is only an address of insn @samp{store} (not a stored value). +If there are more one bypass with the same output and input insns, the +chosen bypass is the first bypass with a guard in description whose +guard function returns nonzero. If there is no such bypass, then +bypass without the guard function is chosen. + @findex exclusion_set @findex presence_set @findex final_presence_set --- gcc/rtlanal.c (.../trunk) (revision 144460) +++ gcc/rtlanal.c (.../branches/ix86/atom) (revision 144601) @@ -728,6 +728,129 @@ reg_mentioned_p (const_rtx reg, const_rt } return 0; } + +static int +reg_mentioned_by_mem_p_1 (const_rtx reg, const_rtx in, + bool *mem_p) +{ + const char *fmt; + int i; + enum rtx_code code; + + if (in == 0) + return 0; + + if (reg == in) + return 1; + + if (GET_CODE (in) == LABEL_REF) + return reg == XEXP (in, 0); + + code = GET_CODE (in); + + switch (code) + { + /* Compare registers by number. */ + case REG: + return REG_P (reg) && REGNO (in) == REGNO (reg); + + /* These codes have no constituent expressions + and are unique. */ + case SCRATCH: + case CC0: + case PC: + return 0; + + case CONST_INT: + case CONST_VECTOR: + case CONST_DOUBLE: + case CONST_FIXED: + /* These are kept unique for a given value. */ + return 0; + + default: + break; + } + [...2433 lines suppressed...] + USE_INSN. */ + +bool +ix86_dep_by_shift_count (const_rtx set_insn, const_rtx use_insn) +{ + rtx set_pattern = PATTERN (set_insn); + rtx set_dest; + rtx shift_rtx; + rtx use_pattern; + + /* Retrieve destination of set_insn */ + switch (GET_CODE (set_pattern)) + { + case SET: + set_dest = SET_DEST (set_pattern); + break; + case PARALLEL: + set_pattern = XVECEXP (set_pattern, 0, 0); + if (GET_CODE (set_pattern ) == SET) + { + set_dest = SET_DEST (set_pattern); + break; + } + default: + set_dest = NULL; + break; + } + if (!set_dest || !REG_P (set_dest)) + return false; + + /* Retrieve shift count of use_insn */ + use_pattern = PATTERN (use_insn); + switch (GET_CODE (use_pattern)) + { + case SET: + shift_rtx = XEXP (use_pattern, 1); + break; + case PARALLEL: + set_pattern = XVECEXP (use_pattern, 0, 0); + if (GET_CODE (set_pattern) == SET) + { + shift_rtx = XEXP (set_pattern, 1); + break; + } + default: + shift_rtx = NULL; + break; + } + + if (shift_rtx + && (GET_CODE (shift_rtx) == ASHIFT + || GET_CODE (shift_rtx) == LSHIFTRT + || GET_CODE (shift_rtx) == ASHIFTRT + || GET_CODE (shift_rtx) == ROTATE + || GET_CODE (shift_rtx) == ROTATERT)) + { + rtx shift_count = XEXP (shift_rtx, 1); + gcc_assert (shift_count); + + /* Return true if shift count is dest of set_insn */ + if (REG_P (shift_count) + && true_regnum (set_dest) == true_regnum (shift_count)) + return true; + } + + return false; +} + /* Return TRUE or FALSE depending on whether the unary operator meets the appropriate constraints. */ @@ -18985,6 +19333,7 @@ ix86_issue_rate (void) switch (ix86_tune) { case PROCESSOR_PENTIUM: + case PROCESSOR_ATOM: case PROCESSOR_K6: return 2; @@ -19051,41 +19400,21 @@ ix86_flags_dependent (rtx insn, rtx dep_ return 1; } -/* A subroutine of ix86_adjust_cost -- return true iff INSN has a memory - address with operands set by DEP_INSN. */ +/* Return true iff USE_INSN has a memory address with operands set by + SET_INSN. */ -static int -ix86_agi_dependent (rtx insn, rtx dep_insn, enum attr_type insn_type) +bool +ix86_agi_dependent (rtx set_insn, rtx use_insn) { - rtx addr; - - if (insn_type == TYPE_LEA - && TARGET_PENTIUM) - { - addr = PATTERN (insn); - - if (GET_CODE (addr) == PARALLEL) - addr = XVECEXP (addr, 0, 0); - - gcc_assert (GET_CODE (addr) == SET); - - addr = SET_SRC (addr); - } - else - { - int i; - extract_insn_cached (insn); - for (i = recog_data.n_operands - 1; i >= 0; --i) - if (MEM_P (recog_data.operand[i])) - { - addr = XEXP (recog_data.operand[i], 0); - goto found; - } - return 0; - found:; - } - - return modified_in_p (addr, dep_insn); + int i; + extract_insn_cached (use_insn); + for (i = recog_data.n_operands - 1; i >= 0; --i) + if (MEM_P (recog_data.operand[i])) + { + rtx addr = XEXP (recog_data.operand[i], 0); + return modified_in_p (addr, set_insn) != 0; + } + return false; } static int @@ -19113,8 +19442,19 @@ ix86_adjust_cost (rtx insn, rtx link, rt { case PROCESSOR_PENTIUM: /* Address Generation Interlock adds a cycle of latency. */ - if (ix86_agi_dependent (insn, dep_insn, insn_type)) - cost += 1; + if (insn_type == TYPE_LEA) + { + rtx addr = PATTERN (insn); + + if (GET_CODE (addr) == PARALLEL) + addr = XVECEXP (addr, 0, 0); + + gcc_assert (GET_CODE (addr) == SET); + + addr = SET_SRC (addr); + if (modified_in_p (addr, dep_insn)) + cost += 1; + } /* ??? Compares pair with jump/setcc. */ if (ix86_flags_dependent (insn, dep_insn, insn_type)) @@ -19123,7 +19463,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt /* Floating point stores require value to be ready one cycle earlier. */ if (insn_type == TYPE_FMOV && get_attr_memory (insn) == MEMORY_STORE - && !ix86_agi_dependent (insn, dep_insn, insn_type)) + && !ix86_agi_dependent (dep_insn, insn)) cost += 1; break; @@ -19146,7 +19486,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt in parallel with previous instruction in case previous instruction is not needed to compute the address. */ if ((memory == MEMORY_LOAD || memory == MEMORY_BOTH) - && !ix86_agi_dependent (insn, dep_insn, insn_type)) + && !ix86_agi_dependent (dep_insn, insn)) { /* Claim moves to take one cycle, as core can issue one load at time and the next load can start cycle later. */ @@ -19175,7 +19515,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt in parallel with previous instruction in case previous instruction is not needed to compute the address. */ if ((memory == MEMORY_LOAD || memory == MEMORY_BOTH) - && !ix86_agi_dependent (insn, dep_insn, insn_type)) + && !ix86_agi_dependent (dep_insn, insn)) { /* Claim moves to take one cycle, as core can issue one load at time and the next load can start cycle later. */ @@ -19192,6 +19532,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt case PROCESSOR_ATHLON: case PROCESSOR_K8: case PROCESSOR_AMDFAM10: + case PROCESSOR_ATOM: case PROCESSOR_GENERIC32: case PROCESSOR_GENERIC64: memory = get_attr_memory (insn); @@ -19200,7 +19541,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt in parallel with previous instruction in case previous instruction is not needed to compute the address. */ if ((memory == MEMORY_LOAD || memory == MEMORY_BOTH) - && !ix86_agi_dependent (insn, dep_insn, insn_type)) + && !ix86_agi_dependent (dep_insn, insn)) { enum attr_unit unit = get_attr_unit (insn); int loadcost = 3; gcc44-pr39226.patch: --- NEW FILE gcc44-pr39226.patch --- 2009-03-03 Jakub Jelinek PR target/39226 * config/rs6000/rs6000.md (andsi3_internal5_nomc, anddi3_internal2_nomc, anddi3_internal3_nomc): Removed. (booldi3_internal3): Use boolean_or_operator instead of boolean_operator. * gcc.dg/pr39226.c: New test. --- gcc/config/rs6000/rs6000.md.jj 2009-03-02 18:09:02.000000000 +0100 +++ gcc/config/rs6000/rs6000.md 2009-03-03 10:02:37.771461086 +0100 @@ -2999,20 +2999,6 @@ [(set_attr "type" "compare,compare,compare,delayed_compare,compare,compare,compare,compare") (set_attr "length" "8,4,4,4,8,8,8,8")]) -(define_insn "*andsi3_internal5_nomc" - [(set (match_operand:CC 3 "cc_reg_operand" "=x,?y,??y,??y,?y") - (compare:CC (and:SI (match_operand:SI 1 "gpc_reg_operand" "%r,r,r,r,r") - (match_operand:SI 2 "and_operand" "r,r,K,L,T")) - (const_int 0))) - (set (match_operand:SI 0 "gpc_reg_operand" "=r,r,r,r,r") - (and:SI (match_dup 1) - (match_dup 2))) - (clobber (match_scratch:CC 4 "=X,X,x,x,X"))] - "TARGET_64BIT && !rs6000_gen_cell_microcode" - "#" - [(set_attr "type" "compare") - (set_attr "length" "8,8,8,8,8")]) - (define_split [(set (match_operand:CC 3 "cc_reg_not_micro_cr0_operand" "") (compare:CC (and:SI (match_operand:SI 1 "gpc_reg_operand" "") @@ -7684,18 +7670,6 @@ [(set_attr "type" "compare,compare,delayed_compare,compare,compare,compare,compare,compare,compare,compare,compare,compare") (set_attr "length" "4,4,4,4,4,8,8,8,8,8,8,12")]) -(define_insn "*anddi3_internal2_nomc" - [(set (match_operand:CC 0 "cc_reg_operand" "=x,?y,?y,??y,??y,?y") - (compare:CC (and:DI (match_operand:DI 1 "gpc_reg_operand" "%r,r,r,r,r,r") - (match_operand:DI 2 "and64_2_operand" "t,r,S,K,J,t")) - (const_int 0))) - (clobber (match_scratch:DI 3 "=r,r,r,r,r,r")) - (clobber (match_scratch:CC 4 "=X,X,X,x,x,X"))] - "TARGET_64BIT && !rs6000_gen_cell_microcode" - "#" - [(set_attr "type" "delayed_compare,compare,compare,compare,compare,compare") - (set_attr "length" "8,8,8,8,8,12")]) - (define_split [(set (match_operand:CC 0 "cc_reg_operand" "") (compare:CC (and:DI (match_operand:DI 1 "gpc_reg_operand" "") @@ -7747,18 +7721,6 @@ [(set_attr "type" "compare,compare,delayed_compare,compare,compare,compare,compare,compare,compare,compare,compare,compare") (set_attr "length" "4,4,4,4,4,8,8,8,8,8,8,12")]) -(define_insn "*anddi3_internal3_nomc" - [(set (match_operand:CC 3 "cc_reg_operand" "=x,?y,?y,??y,??y,?y") - (compare:CC (and:DI (match_operand:DI 1 "gpc_reg_operand" "%r,r,r,r,r,r") - (match_operand:DI 2 "and64_2_operand" "t,r,S,K,J,t")) - (const_int 0))) - (set (match_operand:DI 0 "gpc_reg_operand" "=r,r,r,r,r,r") - (and:DI (match_dup 1) (match_dup 2))) - (clobber (match_scratch:CC 4 "=X,X,X,x,x,X"))] - "TARGET_64BIT && !rs6000_gen_cell_microcode" - "#" - [(set_attr "type" "delayed_compare,compare,compare,compare,compare,compare") - (set_attr "length" "8,8,8,8,8,12")]) (define_split [(set (match_operand:CC 3 "cc_reg_not_micro_cr0_operand" "") (compare:CC (and:DI (match_operand:DI 1 "gpc_reg_operand" "") @@ -7915,7 +7877,7 @@ (define_insn "*booldi3_internal3" [(set (match_operand:CC 3 "cc_reg_operand" "=x,?y") - (compare:CC (match_operator:DI 4 "boolean_operator" + (compare:CC (match_operator:DI 4 "boolean_or_operator" [(match_operand:DI 1 "gpc_reg_operand" "%r,r") (match_operand:DI 2 "gpc_reg_operand" "r,r")]) (const_int 0))) --- gcc/testsuite/gcc.dg/pr39226.c.jj 2009-03-02 23:27:03.398459808 +0100 +++ gcc/testsuite/gcc.dg/pr39226.c 2009-03-02 23:26:19.696462209 +0100 @@ -0,0 +1,25 @@ +/* PR target/39226 */ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ +/* { dg-options "-O2 -mtune=cell -mminimal-toc" { target { powerpc*-*-* && lp64 } } } */ + +struct A +{ + char *a; + unsigned int b : 1; + unsigned int c : 31; +}; + +struct B +{ + struct A *d; +}; + +void +foo (struct B *x, unsigned long y) +{ + if (x->d[y].c) + return; + if (x->d[y].b) + x->d[y].a = 0; +} gcc44-pr39358.patch: --- NEW FILE gcc44-pr39358.patch --- 2009-03-04 Richard Guenther PR tree-optimization/39358 * tree-ssa-structalias.c (do_sd_constraint): Fix check for escaped_id and callused_id. (solve_graph): Likewise. * g++.dg/warn/Wstrict-aliasing-bogus-escape-2.C: New testcase. * g++.dg/warn/Wstrict-aliasing-bogus-escape-3.C: Likewise. --- gcc/tree-ssa-structalias.c (revision 144601) +++ gcc/tree-ssa-structalias.c (revision 144602) @@ -1524,8 +1524,8 @@ do_sd_constraint (constraint_graph_t gra of a variable can also reach all other fields of the variable we simply have to expand the solution to contain all sub-fields if one sub-field is contained. */ - if (c->rhs.var == escaped_id - || c->rhs.var == callused_id) + if (c->rhs.var == find (escaped_id) + || c->rhs.var == find (callused_id)) { bitmap vars = NULL; /* In a first pass record all variables we need to add all @@ -1594,9 +1594,10 @@ do_sd_constraint (constraint_graph_t gra /* Merging the solution from ESCAPED needlessly increases the set. Use ESCAPED as representative instead. Same for CALLUSED. */ - else if (get_varinfo (t)->id == escaped_id - || get_varinfo (t)->id == callused_id) - flag |= bitmap_set_bit (sol, get_varinfo (t)->id); + else if (get_varinfo (t)->id == find (escaped_id)) + flag |= bitmap_set_bit (sol, escaped_id); + else if (get_varinfo (t)->id == find (callused_id)) + flag |= bitmap_set_bit (sol, callused_id); else if (add_graph_edge (graph, lhs, t)) flag |= bitmap_ior_into (sol, get_varinfo (t)->solution); } @@ -2516,8 +2517,8 @@ solve_graph (constraint_graph_t graph) if (!solution_empty /* Do not propagate the ESCAPED/CALLUSED solutions. */ - && i != escaped_id - && i != callused_id) + && i != find (escaped_id) + && i != find (callused_id)) { bitmap_iterator bi; --- gcc/testsuite/g++.dg/warn/Wstrict-aliasing-bogus-escape-2.C (revision 0) +++ gcc/testsuite/g++.dg/warn/Wstrict-aliasing-bogus-escape-2.C (revision 144602) @@ -0,0 +1,19 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -Wstrict-aliasing" } */ + +#include + +struct A +{ + virtual ~A(); +}; + +A* foo(); + +void bar(std::list x) +{ + std::list y = x; + if (*y.rbegin()) + delete foo(); +} + --- gcc/testsuite/g++.dg/warn/Wstrict-aliasing-bogus-escape-3.C (revision 0) +++ gcc/testsuite/g++.dg/warn/Wstrict-aliasing-bogus-escape-3.C (revision 144602) @@ -0,0 +1,35 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -Wstrict-aliasing" } */ + +struct Node_base {}; + +struct Node : Node_base +{ + int data; +}; + +struct List +{ + Node_base node, *prev; + + List() : prev(&node) { xyz(); } + + void xyz(); + + int back() { return static_cast(prev)->data; } +}; + +struct A +{ + virtual ~A(); +}; + +A* foo(); + +void bar() +{ + List y; + if (y.back()) + delete foo(); +} + Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- .cvsignore 19 Feb 2009 16:45:44 -0000 1.257 +++ .cvsignore 4 Mar 2009 13:55:08 -0000 1.258 @@ -1,3 +1,3 @@ fastjar-0.97.tar.gz -gcc-4.4.0-20090219.tar.bz2 +gcc-4.4.0-20090304.tar.bz2 cloog-ppl-0.15.tar.gz Index: gcc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gcc.spec 24 Feb 2009 19:45:36 -0000 1.24 +++ gcc.spec 4 Mar 2009 13:55:08 -0000 1.25 @@ -1,9 +1,9 @@ -%define DATE 20090219 -%define SVNREV 144300 +%define DATE 20090304 +%define SVNREV 144601 %define gcc_version 4.4.0 # Note, gcc_release must be integer, if you want to add suffixes to # %{release}, append them after %{gcc_release} on Release: line. -%define gcc_release 0.21 +%define gcc_release 0.22 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 @@ -35,7 +35,7 @@ Summary: Various compilers (C, C++, Objective-C, Java, ...) Name: gcc Version: %{gcc_version} -Release: %{gcc_release}.1 +Release: %{gcc_release} # libgcc, libgfortran, libmudflap and crtstuff have an exception which allows # linking it into any kind of programs or shared libraries without # restrictions. @@ -144,7 +144,9 @@ Patch21: gcc44-cloog-dl.patch Patch22: gcc44-raw-string.patch Patch23: gcc44-pr39175.patch -Patch24: gcc44-pr39240.patch +Patch24: gcc44-atom.patch +Patch25: gcc44-pr39226.patch +Patch26: gcc44-pr39358.patch Patch1000: fastjar-0.97-segfault.patch @@ -432,7 +434,9 @@ %endif %patch22 -p0 -b .raw-string~ %patch23 -p0 -b .pr39175~ -%patch24 -p0 -b .pr39240~ +%patch24 -p0 -b .atom~ +%patch25 -p0 -b .pr39226~ +%patch26 -p0 -b .pr39358~ # This testcase doesn't compile. rm libjava/testsuite/libjava.lang/PR35020* @@ -1767,8 +1771,27 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog -* Tue Feb 24 2009 Fedora Release Engineering - 4.4.0-0.21.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Wed Mar 4 2009 Jakub Jelinek 4.4.0-0.22 +- update from trunk + - PRs ada/39172, ada/39264, bootstrap/39257, c++/36411, c++/37789, + c++/38880, c++/39225, c++/39242, c/12245, classpath/38417, + classpath/38912, debug/39267, debug/39285, fortran/38914, + fortran/39292, fortran/39295, fortran/39309, fortran/39354, + libgcj/38861, middle-end/10109, middle-end/34443, + middle-end/39157, middle-end/39272, middle-end/39308, + middle-end/39335, middle-end/39345, rtl-optimization/39241, + target/33785, target/35965, target/39256, target/39261, + target/39327, testsuite/38164, tree-optimization/37709, + tree-optimization/39248, tree-optimization/39259, + tree-optimization/39260, tree-optimization/39318, + tree-optimization/39331, tree-optimizations/39259, + tree-optimization/39358 + - fix ivopts (#486088, PR tree-optimization/39233) + - fix SRA (#487795, PR tree-optimization/39339) + - fix __builtin_object_size with unions (#487702, + PR tree-optimization/39343) +- fix ppc -m64 -O2 -mtune=cell and patterns (#485067, PR target/39226) +- -march=atom/-mtune=atom support from ix86/atom branch * Thu Feb 19 2009 Jakub Jelinek 4.4.0-0.21 - update from trunk Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- sources 19 Feb 2009 16:45:44 -0000 1.260 +++ sources 4 Mar 2009 13:55:08 -0000 1.261 @@ -1,3 +1,3 @@ 2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz -67b7f59414d468df2d68a8b6dadd0153 gcc-4.4.0-20090219.tar.bz2 +75f2e4ab9717342f13146245d58fa160 gcc-4.4.0-20090304.tar.bz2 716b7a0823f96c9d02c1703a9c47d387 cloog-ppl-0.15.tar.gz --- gcc44-pr39240.patch DELETED --- From ivazquez at fedoraproject.org Wed Mar 4 13:56:51 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 13:56:51 +0000 (UTC) Subject: rpms/python-polib/F-10 import.log, NONE, 1.1 python-polib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304135651.028BA70116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/python-polib/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19996/F-10 Modified Files: .cvsignore sources Added Files: import.log python-polib.spec Log Message: Initial import --- NEW FILE import.log --- python-polib-0_4_0-1_fc11_20080217svnr60:F-10:python-polib-0.4.0-1.fc11.20080217svnr60.src.rpm:1236174944 --- NEW FILE python-polib.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define alphatag r60 Name: python-polib Version: 0.4.0 Release: 1%{?dist}.20080217svn%{alphatag} Summary: A library to parse and manage gettext catalogs Group: Development/Languages License: MIT URL: http://code.google.com/p/polib/ # svn export -r60 http://polib.googlecode.com/svn/trunk/ polib-0.4.0-r60 # tar zcf polib-0.4.0-r60.tar.gz polib-0.4.0-r60 Source0: polib-%{version}-%{alphatag}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel %description polib allows you to manipulate, create, modify gettext files (pot, po and mo files). You can load existing files, iterate through it's entries, add, modify entries, comments or metadata, etc... or create new po files from scratch. polib provides a simple and pythonic API, exporting only three convenience functions 'pofile', 'mofile' and 'detect_encoding', and the 4 core classes: POFile, MOFile, POEntry and MOEntry for creating new files/entries. %prep %setup -q -n polib-%{version}-%{alphatag} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGELOG LICENSE README docs/ %{python_sitelib}/* %changelog * Wed Feb 18 2009 Ignacio Vazquez-Abrams 0.4.0-1.20080217svnr60 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-polib/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:42:00 -0000 1.1 +++ .cvsignore 4 Mar 2009 13:56:20 -0000 1.2 @@ -0,0 +1 @@ +polib-0.4.0-r60.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-polib/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:42:00 -0000 1.1 +++ sources 4 Mar 2009 13:56:20 -0000 1.2 @@ -0,0 +1 @@ +3ccfa697940893f48107689b5f0ddebf polib-0.4.0-r60.tar.gz From ivazquez at fedoraproject.org Wed Mar 4 13:58:13 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 13:58:13 +0000 (UTC) Subject: rpms/python-polib/F-9 import.log, NONE, 1.1 python-polib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304135813.D295170116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/python-polib/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20367/F-9 Modified Files: .cvsignore sources Added Files: import.log python-polib.spec Log Message: Initial import --- NEW FILE import.log --- python-polib-0_4_0-1_fc11_20080217svnr60:F-9:python-polib-0.4.0-1.fc11.20080217svnr60.src.rpm:1236175024 --- NEW FILE python-polib.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define alphatag r60 Name: python-polib Version: 0.4.0 Release: 1%{?dist}.20080217svn%{alphatag} Summary: A library to parse and manage gettext catalogs Group: Development/Languages License: MIT URL: http://code.google.com/p/polib/ # svn export -r60 http://polib.googlecode.com/svn/trunk/ polib-0.4.0-r60 # tar zcf polib-0.4.0-r60.tar.gz polib-0.4.0-r60 Source0: polib-%{version}-%{alphatag}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel %description polib allows you to manipulate, create, modify gettext files (pot, po and mo files). You can load existing files, iterate through it's entries, add, modify entries, comments or metadata, etc... or create new po files from scratch. polib provides a simple and pythonic API, exporting only three convenience functions 'pofile', 'mofile' and 'detect_encoding', and the 4 core classes: POFile, MOFile, POEntry and MOEntry for creating new files/entries. %prep %setup -q -n polib-%{version}-%{alphatag} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGELOG LICENSE README docs/ %{python_sitelib}/* %changelog * Wed Feb 18 2009 Ignacio Vazquez-Abrams 0.4.0-1.20080217svnr60 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-polib/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:42:00 -0000 1.1 +++ .cvsignore 4 Mar 2009 13:57:43 -0000 1.2 @@ -0,0 +1 @@ +polib-0.4.0-r60.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-polib/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:42:00 -0000 1.1 +++ sources 4 Mar 2009 13:57:43 -0000 1.2 @@ -0,0 +1 @@ +3ccfa697940893f48107689b5f0ddebf polib-0.4.0-r60.tar.gz From ivazquez at fedoraproject.org Wed Mar 4 13:59:34 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 13:59:34 +0000 (UTC) Subject: rpms/python-polib/EL-5 import.log, NONE, 1.1 python-polib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304135934.DF8CC70116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/python-polib/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20686/EL-5 Modified Files: .cvsignore sources Added Files: import.log python-polib.spec Log Message: Initial import --- NEW FILE import.log --- python-polib-0_4_0-1_fc11_20080217svnr60:EL-5:python-polib-0.4.0-1.fc11.20080217svnr60.src.rpm:1236175108 --- NEW FILE python-polib.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define alphatag r60 Name: python-polib Version: 0.4.0 Release: 1%{?dist}.20080217svn%{alphatag} Summary: A library to parse and manage gettext catalogs Group: Development/Languages License: MIT URL: http://code.google.com/p/polib/ # svn export -r60 http://polib.googlecode.com/svn/trunk/ polib-0.4.0-r60 # tar zcf polib-0.4.0-r60.tar.gz polib-0.4.0-r60 Source0: polib-%{version}-%{alphatag}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel %description polib allows you to manipulate, create, modify gettext files (pot, po and mo files). You can load existing files, iterate through it's entries, add, modify entries, comments or metadata, etc... or create new po files from scratch. polib provides a simple and pythonic API, exporting only three convenience functions 'pofile', 'mofile' and 'detect_encoding', and the 4 core classes: POFile, MOFile, POEntry and MOEntry for creating new files/entries. %prep %setup -q -n polib-%{version}-%{alphatag} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGELOG LICENSE README docs/ %{python_sitelib}/* %changelog * Wed Feb 18 2009 Ignacio Vazquez-Abrams 0.4.0-1.20080217svnr60 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-polib/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:42:00 -0000 1.1 +++ .cvsignore 4 Mar 2009 13:59:04 -0000 1.2 @@ -0,0 +1 @@ +polib-0.4.0-r60.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-polib/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:42:00 -0000 1.1 +++ sources 4 Mar 2009 13:59:04 -0000 1.2 @@ -0,0 +1 @@ +3ccfa697940893f48107689b5f0ddebf polib-0.4.0-r60.tar.gz From ivazquez at fedoraproject.org Wed Mar 4 14:00:55 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 14:00:55 +0000 (UTC) Subject: rpms/django-contact-form/F-10 django-contact-form.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304140055.71B8070116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-contact-form/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21076/F-10 Modified Files: .cvsignore sources Added Files: django-contact-form.spec import.log Log Message: Initial import --- NEW FILE django-contact-form.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: django-contact-form Version: 0.3 Release: 2%{?dist} Summary: An extensible contact-form application for Django Group: Development/Languages License: BSD URL: http://bitbucket.org/ubernostrum/django-contact-form/ Source0: http://django-contact-form.googlecode.com/files/contact_form-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: Django %description An extensible contact-form application for Django %prep %setup -q -n contact_form-%{version} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt docs/* %{python_sitelib}/* %changelog * Mon Mar 02 2009 Ignacio Vazquez-Abrams 0.3-2 - Add Requires: Django * Wed Feb 18 2009 Ignacio Vazquez-Abrams 0.3-1 - Initial RPM release --- NEW FILE import.log --- django-contact-form-0_3-2_fc11:F-10:django-contact-form-0.3-2.fc11.src.rpm:1236175188 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:42:59 -0000 1.1 +++ .cvsignore 4 Mar 2009 14:00:25 -0000 1.2 @@ -0,0 +1 @@ +contact_form-0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:42:59 -0000 1.1 +++ sources 4 Mar 2009 14:00:25 -0000 1.2 @@ -0,0 +1 @@ +4192a2d364814f503dde030985208c37 contact_form-0.3.tar.gz From ivazquez at fedoraproject.org Wed Mar 4 14:02:16 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 14:02:16 +0000 (UTC) Subject: rpms/django-contact-form/F-9 django-contact-form.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304140216.1753470116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-contact-form/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21438/F-9 Modified Files: .cvsignore sources Added Files: django-contact-form.spec import.log Log Message: Initial import --- NEW FILE django-contact-form.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: django-contact-form Version: 0.3 Release: 2%{?dist} Summary: An extensible contact-form application for Django Group: Development/Languages License: BSD URL: http://bitbucket.org/ubernostrum/django-contact-form/ Source0: http://django-contact-form.googlecode.com/files/contact_form-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: Django %description An extensible contact-form application for Django %prep %setup -q -n contact_form-%{version} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt docs/* %{python_sitelib}/* %changelog * Mon Mar 02 2009 Ignacio Vazquez-Abrams 0.3-2 - Add Requires: Django * Wed Feb 18 2009 Ignacio Vazquez-Abrams 0.3-1 - Initial RPM release --- NEW FILE import.log --- django-contact-form-0_3-2_fc11:F-9:django-contact-form-0.3-2.fc11.src.rpm:1236175268 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:42:59 -0000 1.1 +++ .cvsignore 4 Mar 2009 14:01:45 -0000 1.2 @@ -0,0 +1 @@ +contact_form-0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:42:59 -0000 1.1 +++ sources 4 Mar 2009 14:01:45 -0000 1.2 @@ -0,0 +1 @@ +4192a2d364814f503dde030985208c37 contact_form-0.3.tar.gz From ivazquez at fedoraproject.org Wed Mar 4 14:03:36 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 14:03:36 +0000 (UTC) Subject: rpms/django-contact-form/EL-5 django-contact-form.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304140336.CB66770116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-contact-form/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21796/EL-5 Modified Files: .cvsignore sources Added Files: django-contact-form.spec import.log Log Message: Initial import --- NEW FILE django-contact-form.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: django-contact-form Version: 0.3 Release: 2%{?dist} Summary: An extensible contact-form application for Django Group: Development/Languages License: BSD URL: http://bitbucket.org/ubernostrum/django-contact-form/ Source0: http://django-contact-form.googlecode.com/files/contact_form-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: Django %description An extensible contact-form application for Django %prep %setup -q -n contact_form-%{version} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt docs/* %{python_sitelib}/* %changelog * Mon Mar 02 2009 Ignacio Vazquez-Abrams 0.3-2 - Add Requires: Django * Wed Feb 18 2009 Ignacio Vazquez-Abrams 0.3-1 - Initial RPM release --- NEW FILE import.log --- django-contact-form-0_3-2_fc11:EL-5:django-contact-form-0.3-2.fc11.src.rpm:1236175351 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:42:59 -0000 1.1 +++ .cvsignore 4 Mar 2009 14:03:06 -0000 1.2 @@ -0,0 +1 @@ +contact_form-0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:42:59 -0000 1.1 +++ sources 4 Mar 2009 14:03:06 -0000 1.2 @@ -0,0 +1 @@ +4192a2d364814f503dde030985208c37 contact_form-0.3.tar.gz From ivazquez at fedoraproject.org Wed Mar 4 14:05:02 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 14:05:02 +0000 (UTC) Subject: rpms/django-notification/F-10 django-notification.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304140502.770C470116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-notification/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22091/F-10 Modified Files: .cvsignore sources Added Files: django-notification.spec import.log Log Message: Initial import --- NEW FILE django-notification.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: django-notification Version: 0.1.2 Release: 2%{?dist} Summary: User notification management for the Django web framework Group: Development/Languages License: MIT URL: http://code.google.com/p/django-notification/ Source0: http://pypi.python.org/packages/source/d/django-notification/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel python-setuptools Requires: Django %description Many sites need to notify users when certain events have occurred and to allow configurable options as to how those notifications are to be received. The project aims to provide a Django app for this sort of functionality. This includes: * submission of notification messages by other apps * notification messages on signing in * notification messages via email (configurable by user) * notification messages via feed %prep %setup -q find -name '._*' -exec rm {} \; %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS LICENSE README docs/* %{python_sitelib}/* %changelog * Mon Mar 02 2009 Ignacio Vazquez-Abrams 0.1.2-2 - Add Requires: Django * Wed Feb 18 2009 Ignacio Vazquez-Abrams 0.1.2-1 - Initial RPM release --- NEW FILE import.log --- django-notification-0_1_2-2_fc11:F-10:django-notification-0.1.2-2.fc11.src.rpm:1236175434 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-notification/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:43:50 -0000 1.1 +++ .cvsignore 4 Mar 2009 14:04:31 -0000 1.2 @@ -0,0 +1 @@ +django-notification-0.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-notification/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:43:50 -0000 1.1 +++ sources 4 Mar 2009 14:04:32 -0000 1.2 @@ -0,0 +1 @@ +3e485b0e047b70bfb00c783deae9e44b django-notification-0.1.2.tar.gz From ivazquez at fedoraproject.org Wed Mar 4 14:19:08 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 14:19:08 +0000 (UTC) Subject: rpms/django-notification/F-9 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304141909.024D070116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-notification/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24108/F-9 Modified Files: .cvsignore sources Added Files: import.log Log Message: Initial import --- NEW FILE import.log --- django-notification-0_1_2-2_fc11:F-9:django-notification-0.1.2-2.fc11.src.rpm:1236176284 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-notification/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:43:50 -0000 1.1 +++ .cvsignore 4 Mar 2009 14:18:38 -0000 1.2 @@ -0,0 +1 @@ +django-notification-0.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-notification/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:43:50 -0000 1.1 +++ sources 4 Mar 2009 14:18:38 -0000 1.2 @@ -0,0 +1 @@ +3e485b0e047b70bfb00c783deae9e44b django-notification-0.1.2.tar.gz From ivazquez at fedoraproject.org Wed Mar 4 14:20:26 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 14:20:26 +0000 (UTC) Subject: rpms/django-notification/EL-5 django-notification.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304142026.1562B70116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-notification/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24465/EL-5 Modified Files: .cvsignore sources Added Files: django-notification.spec import.log Log Message: Initial import --- NEW FILE django-notification.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: django-notification Version: 0.1.2 Release: 2%{?dist} Summary: User notification management for the Django web framework Group: Development/Languages License: MIT URL: http://code.google.com/p/django-notification/ Source0: http://pypi.python.org/packages/source/d/django-notification/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel python-setuptools Requires: Django %description Many sites need to notify users when certain events have occurred and to allow configurable options as to how those notifications are to be received. The project aims to provide a Django app for this sort of functionality. This includes: * submission of notification messages by other apps * notification messages on signing in * notification messages via email (configurable by user) * notification messages via feed %prep %setup -q find -name '._*' -exec rm {} \; %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS LICENSE README docs/* %{python_sitelib}/* %changelog * Mon Mar 02 2009 Ignacio Vazquez-Abrams 0.1.2-2 - Add Requires: Django * Wed Feb 18 2009 Ignacio Vazquez-Abrams 0.1.2-1 - Initial RPM release --- NEW FILE import.log --- django-notification-0_1_2-2_fc11:EL-5:django-notification-0.1.2-2.fc11.src.rpm:1236176362 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-notification/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:43:50 -0000 1.1 +++ .cvsignore 4 Mar 2009 14:19:55 -0000 1.2 @@ -0,0 +1 @@ +django-notification-0.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-notification/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:43:50 -0000 1.1 +++ sources 4 Mar 2009 14:19:55 -0000 1.2 @@ -0,0 +1 @@ +3e485b0e047b70bfb00c783deae9e44b django-notification-0.1.2.tar.gz From ivazquez at fedoraproject.org Wed Mar 4 14:21:46 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 14:21:46 +0000 (UTC) Subject: rpms/django-tagging/F-10 django-tagging.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304142146.8461070116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-tagging/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24780/F-10 Modified Files: .cvsignore sources Added Files: django-tagging.spec import.log Log Message: Initial import --- NEW FILE django-tagging.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define alphatag r154 Name: django-tagging Version: 0.3 Release: 1%{?dist}.20080217svn%{alphatag} Summary: A generic tagging application for Django projects Group: Development/Languages License: MIT URL: http://code.google.com/p/django-tagging/ # svn export -r154 http://django-tagging.googlecode.com/svn/trunk/ django-tagging-0.3-r154 # tar zcf django-tagging-0.3-r154.tar.gz django-tagging-0.3-r154 Source0: %{name}-%{version}-%{alphatag}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: Django %description A generic tagging application for Django projects, which allows association of a number of tags with any Model instance and makes retrieval of tags simple. %prep %setup -q -n %{name}-%{version}-%{alphatag} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGELOG.txt LICENSE.txt README.txt docs/* %{python_sitelib}/* %changelog * Mon Mar 02 2009 Ignacio Vazquez-Abrams 0.3-1.20080217svnr154 - Add Requires: Django * Wed Feb 18 2009 Ignacio Vazquez-Abrams 0.3-0.20080217svnr154 - Initial RPM release --- NEW FILE import.log --- django-tagging-0_3-1_fc11_20080217svnr154:F-10:django-tagging-0.3-1.fc11.20080217svnr154.src.rpm:1236176440 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-tagging/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:44:39 -0000 1.1 +++ .cvsignore 4 Mar 2009 14:21:16 -0000 1.2 @@ -0,0 +1 @@ +django-tagging-0.3-r154.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-tagging/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:44:39 -0000 1.1 +++ sources 4 Mar 2009 14:21:16 -0000 1.2 @@ -0,0 +1 @@ +3d155bd09de93ccfd316d382558dc526 django-tagging-0.3-r154.tar.gz From ivazquez at fedoraproject.org Wed Mar 4 14:22:59 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 14:22:59 +0000 (UTC) Subject: rpms/django-tagging/F-9 django-tagging.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304142259.A5D6870116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-tagging/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25112/F-9 Modified Files: .cvsignore sources Added Files: django-tagging.spec import.log Log Message: Initial import --- NEW FILE django-tagging.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define alphatag r154 Name: django-tagging Version: 0.3 Release: 1%{?dist}.20080217svn%{alphatag} Summary: A generic tagging application for Django projects Group: Development/Languages License: MIT URL: http://code.google.com/p/django-tagging/ # svn export -r154 http://django-tagging.googlecode.com/svn/trunk/ django-tagging-0.3-r154 # tar zcf django-tagging-0.3-r154.tar.gz django-tagging-0.3-r154 Source0: %{name}-%{version}-%{alphatag}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: Django %description A generic tagging application for Django projects, which allows association of a number of tags with any Model instance and makes retrieval of tags simple. %prep %setup -q -n %{name}-%{version}-%{alphatag} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGELOG.txt LICENSE.txt README.txt docs/* %{python_sitelib}/* %changelog * Mon Mar 02 2009 Ignacio Vazquez-Abrams 0.3-1.20080217svnr154 - Add Requires: Django * Wed Feb 18 2009 Ignacio Vazquez-Abrams 0.3-0.20080217svnr154 - Initial RPM release --- NEW FILE import.log --- django-tagging-0_3-1_fc11_20080217svnr154:F-9:django-tagging-0.3-1.fc11.20080217svnr154.src.rpm:1236176515 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-tagging/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:44:39 -0000 1.1 +++ .cvsignore 4 Mar 2009 14:22:29 -0000 1.2 @@ -0,0 +1 @@ +django-tagging-0.3-r154.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-tagging/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:44:39 -0000 1.1 +++ sources 4 Mar 2009 14:22:29 -0000 1.2 @@ -0,0 +1 @@ +3d155bd09de93ccfd316d382558dc526 django-tagging-0.3-r154.tar.gz From ivazquez at fedoraproject.org Wed Mar 4 14:24:12 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Wed, 4 Mar 2009 14:24:12 +0000 (UTC) Subject: rpms/django-tagging/EL-5 django-tagging.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304142412.34AD570116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-tagging/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25452/EL-5 Modified Files: .cvsignore sources Added Files: django-tagging.spec import.log Log Message: Initial import --- NEW FILE django-tagging.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define alphatag r154 Name: django-tagging Version: 0.3 Release: 1%{?dist}.20080217svn%{alphatag} Summary: A generic tagging application for Django projects Group: Development/Languages License: MIT URL: http://code.google.com/p/django-tagging/ # svn export -r154 http://django-tagging.googlecode.com/svn/trunk/ django-tagging-0.3-r154 # tar zcf django-tagging-0.3-r154.tar.gz django-tagging-0.3-r154 Source0: %{name}-%{version}-%{alphatag}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: Django %description A generic tagging application for Django projects, which allows association of a number of tags with any Model instance and makes retrieval of tags simple. %prep %setup -q -n %{name}-%{version}-%{alphatag} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGELOG.txt LICENSE.txt README.txt docs/* %{python_sitelib}/* %changelog * Mon Mar 02 2009 Ignacio Vazquez-Abrams 0.3-1.20080217svnr154 - Add Requires: Django * Wed Feb 18 2009 Ignacio Vazquez-Abrams 0.3-0.20080217svnr154 - Initial RPM release --- NEW FILE import.log --- django-tagging-0_3-1_fc11_20080217svnr154:EL-5:django-tagging-0.3-1.fc11.20080217svnr154.src.rpm:1236176586 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-tagging/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:44:39 -0000 1.1 +++ .cvsignore 4 Mar 2009 14:23:41 -0000 1.2 @@ -0,0 +1 @@ +django-tagging-0.3-r154.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-tagging/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:44:39 -0000 1.1 +++ sources 4 Mar 2009 14:23:41 -0000 1.2 @@ -0,0 +1 @@ +3d155bd09de93ccfd316d382558dc526 django-tagging-0.3-r154.tar.gz From ajax at fedoraproject.org Wed Mar 4 14:33:27 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Wed, 4 Mar 2009 14:33:27 +0000 (UTC) Subject: rpms/linuxwacom/devel 10-linuxwacom.fdi, 1.5, 1.6 linuxwacom.spec, 1.74, 1.75 Message-ID: <20090304143327.8948E70116@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/linuxwacom/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26823 Modified Files: 10-linuxwacom.fdi linuxwacom.spec Log Message: * Wed Mar 04 2009 Adam Jackson 0.8.2.2-7 - 10-linuxwacom.fdi: "info.product", not "info,product". Index: 10-linuxwacom.fdi =================================================================== RCS file: /cvs/pkgs/rpms/linuxwacom/devel/10-linuxwacom.fdi,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- 10-linuxwacom.fdi 16 Feb 2009 16:20:02 -0000 1.5 +++ 10-linuxwacom.fdi 4 Mar 2009 14:32:56 -0000 1.6 @@ -3,7 +3,7 @@ - + wacom + Preferences @@ -37,19 +37,53 @@ 3 3 - + True 0 - samples + Update status every + + + + + True + 0 + Maintain history of - 2 - 3 1 2 + + True + True + 0 0 60 1 5 0 + + + + 1 + 2 + GTK_FILL + + + + + True + True + 0 0 300 5 5 0 + 0.01 + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + True 0 @@ -61,50 +95,18 @@ - + True - True - 0 0 300 5 5 0 - 0.01 + 0 + samples - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - 0 0 60 1 5 0 - - - 1 - 2 - GTK_FILL - - - - - True - 0 - Maintain history of - - + 2 + 3 1 2 - - - True - 0 - Update status every - - @@ -141,18 +143,79 @@ 3 3 - + + True + 0 + CPU Usage + PANGO_ELLIPSIZE_END + + + GTK_FILL + + + + + True + 0 + Memory Usage + + + 1 + 2 + GTK_FILL + + + + + True + 0 + Disk I/O + + + 2 + 3 + GTK_FILL + + + + + True + 0 + Network I/O + + + 3 + 4 + GTK_FILL + + + + True True 0 True - + 1 2 - 3 - 4 + GTK_EXPAND + + + + + True + True + 0 + True + + + + 1 + 2 + 1 + 2 GTK_EXPAND @@ -173,80 +236,19 @@ - + True True 0 True - + 1 2 - 1 - 2 - GTK_EXPAND - - - - - True - True - 0 - True - - - - 1 - 2 - GTK_EXPAND - - - - - True - 0 - Network I/O - - 3 4 - GTK_FILL - - - - - True - 0 - Disk I/O - - - 2 - 3 - GTK_FILL - - - - - True - 0 - Memory Usage - - - 1 - 2 - GTK_FILL - - - - - True - 0 - CPU Usage - PANGO_ELLIPSIZE_END - - - GTK_FILL + GTK_EXPAND @@ -302,19 +304,27 @@ 1 2 - + True Never -When fullscreen -On mouse over +For all new domains +For all domains + - 3 - 4 + 1 + 2 5 + + True + 0 + Automatically open consoles: + + + True 0 @@ -326,22 +336,16 @@ - - True - 0 - Automatically open consoles: - - - - + True Never -For all new domains -For all domains +When fullscreen +On mouse over + - 1 - 2 + 3 + 4 5 @@ -380,6 +384,13 @@ 1 8 + + True + 0 + Install Audio Device: + + + True 12 @@ -417,13 +428,6 @@ 2 - - - True - 0 - Install Audio Device: - - @@ -470,7 +474,7 @@ True True True - gtk-help + gtk-help True 0 @@ -500,7 +504,7 @@ True True True - gtk-close + gtk-close True 0 virt-manager-0.6.1-update-polish.patch: --- NEW FILE virt-manager-0.6.1-update-polish.patch --- # HG changeset patch # User Cole Robinson # Date 1234794921 18000 # Node ID 7238b8b438bc3311b744debfb576849dbc262cda # Parent 9d1aa6fcf42681caba0d9c50e15ffa6d10d9f8af Updated pl translation. diff -r 9d1aa6fcf426 -r 7238b8b438bc po/pl.po --- a/po/pl.po Sun Feb 15 21:40:21 2009 -0500 +++ b/po/pl.po Mon Feb 16 09:35:21 2009 -0500 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-12 20:36+0100\n" -"PO-Revision-Date: 2008-12-12 20:46+0100\n" +"POT-Creation-Date: 2009-02-06 17:03+0100\n" +"PO-Revision-Date: 2009-02-06 20:23+0100\n" "Last-Translator: Piotr Dr??g \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ #. ...the risk is we catch too much though #. Damned if we do, damned if we dont :-)( -#: ../src/virt-manager.py.in:264 +#: ../src/virt-manager.py.in:284 #, python-format msgid "Unable to initialize GTK: %s" msgstr "Nie mo??na zainicjowa?? GTK: %s" @@ -41,99 +41,138 @@ msgstr "Urz??dzenie d??wi??kowe instalacji dla zdalnej maszyny wirtualnej" #: ../src/virt-manager.schemas.in.h:3 +msgid "Poll cpu stats" +msgstr "Sonda?? statystyk procesora" + +#: ../src/virt-manager.schemas.in.h:4 +msgid "Poll disk i/o stats" +msgstr "Sonda?? statystyk wej??cia/wyj??cia dysku" + +#: ../src/virt-manager.schemas.in.h:5 +msgid "Poll memory usage stats" +msgstr "Sonda?? statystyk u??ycia pami??ci" + +#: ../src/virt-manager.schemas.in.h:6 +msgid "Poll net i/o stats" +msgstr "Sonda?? statystyk wej??cia/wyj??cia sieci" + +#: ../src/virt-manager.schemas.in.h:7 msgid "Show VCPU count in summary" msgstr "Wy??wietl podsumowanie licznika wirtualnych procesor??w" -#: ../src/virt-manager.schemas.in.h:4 +#: ../src/virt-manager.schemas.in.h:8 msgid "Show cpu usage in summary" msgstr "Wy??wietl podsumowanie u??ycia procesora" -#: ../src/virt-manager.schemas.in.h:5 +#: ../src/virt-manager.schemas.in.h:9 msgid "Show disk I/O in summary" msgstr "Wy??wietl podsumowanie wej??cia/wyj??cia dysku" -#: ../src/virt-manager.schemas.in.h:6 +#: ../src/virt-manager.schemas.in.h:10 msgid "Show domain id in summary" msgstr "Wy??wietl podsumowanie identyfikatora domeny" -#: ../src/virt-manager.schemas.in.h:7 +#: ../src/virt-manager.schemas.in.h:11 msgid "Show memory usage in summary" msgstr "Wy??wietl podsumowanie u??ycia pami??ci" -#: ../src/virt-manager.schemas.in.h:8 +#: ../src/virt-manager.schemas.in.h:12 msgid "Show network I/O in summary" msgstr "Wy??wietl podsumowanie wej??cia/wyj??cia sieci" -#: ../src/virt-manager.schemas.in.h:9 +#: ../src/virt-manager.schemas.in.h:13 msgid "Show run state in summary" msgstr "Wy??wietl podsumowanie stanu uruchomienia" -#: ../src/virt-manager.schemas.in.h:10 +#: ../src/virt-manager.schemas.in.h:14 msgid "Show the cpu usage field in the domain list summary view" msgstr "Wy??wietl pole u??ycia procesora w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:11 +#: ../src/virt-manager.schemas.in.h:15 msgid "Show the disk I/O field in the domain list summary view" msgstr "Wy??wietl pole wej??cia/wyj??cia dysku w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:12 +#: ../src/virt-manager.schemas.in.h:16 msgid "Show the domain id field in the domain list summary view" msgstr "Wy??wietl pole identyfikatora domeny w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:13 +#: ../src/virt-manager.schemas.in.h:17 msgid "Show the memory usage field in the domain list summary view" msgstr "Wy??wietl pole u??ycia pami??ci w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:14 +#: ../src/virt-manager.schemas.in.h:18 msgid "Show the network I/O field in the domain list summary view" msgstr "Wy??wietl pole wej??cia/wyj??cia sieci w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:15 +#: ../src/virt-manager.schemas.in.h:19 msgid "Show the run state field in the domain list summary view" msgstr "Wy??wietl pole stanu uruchomienia w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:16 +#: ../src/virt-manager.schemas.in.h:20 msgid "Show the virtual CPU count field in the domain list summary view" msgstr "" "Wy??wietl pole licznika wirtualnych procesor??w w widoku podsumowania listy " "domen" -#: ../src/virt-manager.schemas.in.h:17 +#: ../src/virt-manager.schemas.in.h:21 msgid "The length of the list of URLs" msgstr "D??ugo???? listy URL-i" -#: ../src/virt-manager.schemas.in.h:18 +#: ../src/virt-manager.schemas.in.h:22 msgid "The number of samples to keep in the statistics history" msgstr "Liczba przyk??ad??w przechowywanych w historii statystyk" -#: ../src/virt-manager.schemas.in.h:19 +#: ../src/virt-manager.schemas.in.h:23 msgid "" "The number of urls to keep in the history for the install media address page." msgstr "" "Liczba URL-i przechowywanych w historii strony adresowej no??nika " "instalacyjnego." -#: ../src/virt-manager.schemas.in.h:20 +#: ../src/virt-manager.schemas.in.h:24 msgid "The statistics history length" msgstr "D??ugo???? historii statystyk" -#: ../src/virt-manager.schemas.in.h:21 +#: ../src/virt-manager.schemas.in.h:25 msgid "The statistics update interval" msgstr "Cz??sto???? aktualizacji statystyk" -#: ../src/virt-manager.schemas.in.h:22 +#: ../src/virt-manager.schemas.in.h:26 msgid "The statistics update interval in seconds" msgstr "Cz??sto???? aktualizacji statystyk w sekundach" -#: ../src/virt-manager.schemas.in.h:23 +#: ../src/virt-manager.schemas.in.h:27 msgid "When to grab keyboard input for the console" msgstr "Kiedy przechwyci?? wej??cie klawiatury w konsoli" -#: ../src/virt-manager.schemas.in.h:24 +#: ../src/virt-manager.schemas.in.h:28 msgid "When to pop up a console for a guest" msgstr "Kiedy wy??wietli?? konsol?? go??cia" -#: ../src/virt-manager.schemas.in.h:25 +#: ../src/virt-manager.schemas.in.h:29 +msgid "Whether or not the app will poll VM disk i/o statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki wej??cia/wyj??cia dysku maszyny wirtualnej" + +#: ../src/virt-manager.schemas.in.h:30 +msgid "Whether or not the app will poll VM network i/o statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki wej??cia/wyj??cia sieci maszyny wirtualnej" + +#: ../src/virt-manager.schemas.in.h:31 +msgid "Whether or not the app will poll connection and VM cpu usage statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki u??ycia po????czenia i procesora maszyny " +"wirtualnej" + +#: ../src/virt-manager.schemas.in.h:32 +msgid "" +"Whether or not the app will poll connection and VM memory usage statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki u??ycia po????czenia i pami??ci maszyny " +"wirtualnej" + +#: ../src/virt-manager.schemas.in.h:33 msgid "" "Whether to grab keyboard input for a guest console. 0 = never, 1 = only when " "in full screen mode, 2 = when mouse is over console" @@ -141,15 +180,15 @@ "Kiedy przechwyci?? wej??cie klawiatury w konsoli go??cia. 0 = nigdy, 1 = tylko " "w trybie pe??noekranowym, 2 = kiedy mysz jest nad konsol??" -#: ../src/virt-manager.schemas.in.h:26 +#: ../src/virt-manager.schemas.in.h:34 msgid "Whether to install a sound device for local VMs or not" msgstr "Czy instalowa?? urz??dzenie d??wi??kowe dla lokalnej maszyny wirtualnej" [...3161 lines suppressed...] -#: ../src/vmm-details.glade.h:118 +#: ../src/vmm-details.glade.h:103 msgid "_Take Screenshot" msgstr "_Wykonaj zrzut ekranu" -#: ../src/vmm-details.glade.h:119 ../src/vmm-manager.glade.h:22 +#: ../src/vmm-details.glade.h:104 ../src/vmm-manager.glade.h:22 msgid "_View" msgstr "_Widok" -#: ../src/vmm-details.glade.h:120 -msgid "disk\t" -msgstr "dysk\t" - -#: ../src/vmm-details.glade.h:121 -msgid "insert sound model" -msgstr "wstaw model d??wi??ku" - #: ../src/vmm-host.glade.h:2 msgid "IPv4 configuration" msgstr "Konfiguracja IPv4" @@ -3042,7 +3065,7 @@ msgid "Forwarding:" msgstr "Przekazywanie:" -#: ../src/vmm-host.glade.h:21 +#: ../src/vmm-host.glade.h:21 ../src/vmm-manager.glade.h:10 msgid "Host Details" msgstr "Szczeg????y hosta" @@ -3090,18 +3113,10 @@ msgid "Stop Pool" msgstr "Zatrzymaj pul??" -#: ../src/vmm-host.glade.h:39 -msgid "Storage Pools" -msgstr "Pule pami??ci masowej" - #: ../src/vmm-host.glade.h:40 msgid "Virtual Networks" msgstr "Sieci wirtualne" -#: ../src/vmm-host.glade.h:41 -msgid "Xen" -msgstr "Xen" - #: ../src/vmm-manager.glade.h:1 msgid "Add Connection..." msgstr "Dodaj po????czenie..." @@ -3116,21 +3131,21 @@ "Aktywne maszyny wirtualne\n" "Nieaktywne maszyny wirtualne" -#: ../src/vmm-manager.glade.h:6 -msgid "Connection Details..." -msgstr "Szczeg????y po????czenia..." +#: ../src/vmm-manager.glade.h:5 ../src/vmm-preferences.glade.h:6 +msgid "CPU Usage" +msgstr "U??ycie procesora" #: ../src/vmm-manager.glade.h:7 -msgid "Delete Machine" -msgstr "Usu?? maszyn??" +msgid "Delete Virtual Machine" +msgstr "Usu?? maszyn?? wirtualn??" #: ../src/vmm-manager.glade.h:9 msgid "Domain ID" msgstr "Identyfikator domeny" -#: ../src/vmm-manager.glade.h:10 -msgid "Machine Details..." -msgstr "Szczeg????y maszyny..." +#: ../src/vmm-manager.glade.h:11 ../src/vmm-preferences.glade.h:12 +msgid "Memory Usage" +msgstr "U??ycie pami??ci" #: ../src/vmm-manager.glade.h:13 msgid "Restore a saved machine from a filesystem image" @@ -3141,8 +3156,8 @@ msgstr "Przywr???? zapisan?? maszyn??..." #: ../src/vmm-manager.glade.h:16 -msgid "Virtual CPUs" -msgstr "Wirtualne procesory" +msgid "Virtual Machine Details" +msgstr "Szczeg????y maszyny wirtualnej" #: ../src/vmm-manager.glade.h:19 msgid "_Edit" @@ -3205,56 +3220,48 @@ msgstr "Konsole" #: ../src/vmm-preferences.glade.h:2 -msgid "New VM Preferences" -msgstr "Preferencje nowej maszyny wirtualnej" +msgid "Enable Stats Polling" +msgstr "W????cz sonda?? statystyk" #: ../src/vmm-preferences.glade.h:3 -msgid "Status monitoring" -msgstr "Stan monitorowania" +msgid "New VM" +msgstr "Nowa maszyna wirtualna" #: ../src/vmm-preferences.glade.h:4 -msgid "Auto Console" -msgstr "Automatyczna konsola" +msgid "Stats Options" +msgstr "Opcje statystyk" #: ../src/vmm-preferences.glade.h:5 msgid "Automatically open consoles:" msgstr "Automatycznie otw??rz konsole:" -#: ../src/vmm-preferences.glade.h:6 -msgid "Grab Keyboard" -msgstr "Przechwy?? klawiatur??" - -#: ../src/vmm-preferences.glade.h:7 +#: ../src/vmm-preferences.glade.h:8 msgid "Grab keyboard input:" msgstr "Przechwy?? wej??cie klawiatury:" -#: ../src/vmm-preferences.glade.h:8 -msgid "History Samples" -msgstr "Przyk??ady historii" - #: ../src/vmm-preferences.glade.h:9 msgid "Install Audio Device:" msgstr "Urz??dzenie d??wi??kowe instalacji:" #: ../src/vmm-preferences.glade.h:10 -msgid "Local VM" +msgid "Local virtual machine" msgstr "Lokalna maszyna wirtualna" #: ../src/vmm-preferences.glade.h:11 msgid "Maintain history of" msgstr "Zarz??dzaj histori??" -#: ../src/vmm-preferences.glade.h:12 +#: ../src/vmm-preferences.glade.h:14 msgid "" "Never\n" -"For new domains\n" +"For all new domains\n" "For all domains" msgstr "" "Nigdy\n" -"Dla nowych domen\n" +"Dla wszystkich nowych domen\n" "Dla wszystkich domen" -#: ../src/vmm-preferences.glade.h:15 +#: ../src/vmm-preferences.glade.h:17 msgid "" "Never\n" "When fullscreen\n" @@ -3264,26 +3271,30 @@ "Kiedy jest na pe??nym ekranie\n" "Przy najechaniu mysz??" -#: ../src/vmm-preferences.glade.h:18 +#: ../src/vmm-preferences.glade.h:20 msgid "Preferences" msgstr "Preferencje" -#: ../src/vmm-preferences.glade.h:19 -msgid "Remote VM" +#: ../src/vmm-preferences.glade.h:21 +msgid "Remote virtual machine" msgstr "Zdalna maszyna wirtualna" -#: ../src/vmm-preferences.glade.h:20 -msgid "Status Interval" -msgstr "Cz??sto???? stanu" +#: ../src/vmm-preferences.glade.h:22 +msgid "Stats" +msgstr "Statystyki" -#: ../src/vmm-preferences.glade.h:21 +#: ../src/vmm-preferences.glade.h:23 msgid "Update status every" msgstr "Zaktualizuj stan co" -#: ../src/vmm-preferences.glade.h:22 +#: ../src/vmm-preferences.glade.h:24 +msgid "VM Details" +msgstr "Szczeg????y maszyny wirtualnej" + +#: ../src/vmm-preferences.glade.h:25 msgid "samples" msgstr "przyk??ady" -#: ../src/vmm-preferences.glade.h:23 +#: ../src/vmm-preferences.glade.h:26 msgid "seconds" msgstr "sekundy" Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- virt-manager.spec 26 Feb 2009 00:32:18 -0000 1.46 +++ virt-manager.spec 4 Mar 2009 17:53:31 -0000 1.47 @@ -8,13 +8,16 @@ Name: virt-manager Version: 0.6.1 -Release: 3%{_extra_release} +Release: 4%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz +Patch1: %{name}-%{version}-update-polish.patch +Patch2: %{name}-%{version}-fix-cadl.patch +Patch3: %{name}-%{version}-fix-stats-prefs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # These two are just the oldest version tested @@ -53,7 +56,11 @@ # For console widget Requires: gtk-vnc-python >= 0.3.4 # For local authentication against PolicyKit +%if 0%{?fedora} >= 11 +Requires: PolicyKit-authentication-agent +%else if 0%{?fedora} >= 9 Requires: PolicyKit-gnome +%endif BuildRequires: pygtk2-devel BuildRequires: gtk2-devel @@ -82,6 +89,9 @@ %prep %setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %configure @@ -159,6 +169,11 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog +* Wed Mar 4 2009 Cole Robinson - 0.6.1-4.fc11 +- Update polish translation (bz 263301) +- Fix sending ctrl-alt-del to guest +- Fix cpu + mem stats options to remember preference. + * Wed Feb 25 2009 Fedora Release Engineering - 0.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From krh at fedoraproject.org Wed Mar 4 17:56:19 2009 From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=) Date: Wed, 4 Mar 2009 17:56:19 +0000 (UTC) Subject: rpms/kernel/devel kernel.spec,1.1379,1.1380 Message-ID: <20090304175619.5879670116@cvs1.fedora.phx.redhat.com> Author: krh Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31407 Modified Files: kernel.spec Log Message: * Wed Mar 4 2009 - Add fix for deadlock in drm setmaster. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1379 retrieving revision 1.1380 diff -u -r1.1379 -r1.1380 --- kernel.spec 4 Mar 2009 15:34:03 -0000 1.1379 +++ kernel.spec 4 Mar 2009 17:55:48 -0000 1.1380 @@ -649,9 +649,9 @@ Patch1812: drm-modesetting-radeon.patch Patch1813: drm-radeon-pm.patch Patch1814: drm-nouveau.patch -#Patch1815: drm-intel-next.patch Patch1816: drm-no-gem-on-i8xx.patch Patch1818: drm-i915-resume-force-mode.patch +Patch1819: drm-fix-setmaster-deadlock.patch # kludge to make ich9 e1000 work Patch2000: linux-2.6-e1000-ich9.patch @@ -1183,9 +1183,9 @@ ApplyPatch drm-nouveau.patch # pm broken on my thinkpad t60p - airlied #ApplyPatch drm-radeon-pm.patch -#ApplyPatch drm-intel-next.patch ApplyPatch drm-no-gem-on-i8xx.patch ApplyPatch drm-i915-resume-force-mode.patch +ApplyPatch drm-fix-setmaster-deadlock.patch # linux1394 git patches ApplyPatch linux-2.6-firewire-git-update.patch @@ -1792,6 +1792,9 @@ # and build. %changelog +* Wed Mar 4 2009 +- Add fix for deadlock in drm setmaster. + * Wed Mar 04 2009 Kyle McMartin - Rebase git-bluetooth.patch from bluetooth-next-2.6 instead of bluetooth-testing, per Marcel's suggestions. From jeckersb at fedoraproject.org Wed Mar 4 17:56:25 2009 From: jeckersb at fedoraproject.org (John Eckersberg) Date: Wed, 4 Mar 2009 17:56:25 +0000 (UTC) Subject: rpms/PyYAML/EL-5 PyYAML.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <20090304175625.67B8D70116@cvs1.fedora.phx.redhat.com> Author: jeckersb Update of /cvs/pkgs/rpms/PyYAML/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31440 Modified Files: PyYAML.spec sources Log Message: copy spec over from devel and remove old sources line Index: PyYAML.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyYAML/EL-5/PyYAML.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- PyYAML.spec 24 Oct 2008 17:30:42 -0000 1.2 +++ PyYAML.spec 4 Mar 2009 17:55:55 -0000 1.3 @@ -1,8 +1,8 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: PyYAML -Version: 3.06 -Release: 1%{?dist} +Version: 3.08 +Release: 4%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -11,8 +11,7 @@ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: python-devel, python-setuptools +BuildRequires: python-devel, python-setuptools, libyaml-devel %description YAML is a data serialization format designed for human readability and @@ -53,6 +52,21 @@ %changelog +* Tue Mar 3 2009 John Eckersberg - 3.08-4 +- Correction, change libyaml to libyaml-devel in BuildRequires + +* Mon Mar 2 2009 John Eckersberg - 3.08-3 +- Add libyaml to BuildRequires + +* Mon Feb 23 2009 Fedora Release Engineering - 3.08-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 18 2009 John Eckersberg - 3.08-1 +- New upstream release + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 3.06-2 +- Rebuild for Python 2.6 + * Fri Oct 24 2008 John Eckersberg - 3.06-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PyYAML/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Oct 2008 17:30:42 -0000 1.3 +++ sources 4 Mar 2009 17:55:55 -0000 1.4 @@ -1 +1 @@ -3d3c92528f1547756c9e1d80d7d905c7 PyYAML-3.06.tar.gz +a4163a2017fa57f448c66815511fa555 PyYAML-3.08.tar.gz From lkundrak at fedoraproject.org Wed Mar 4 17:57:28 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Wed, 4 Mar 2009 17:57:28 +0000 (UTC) Subject: rpms/inkscape/devel inkscape.spec,1.67,1.68 Message-ID: <20090304175728.88E1970116@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31700 Modified Files: inkscape.spec Log Message: * Wed Mar 04 2009 Lubomir Rintel - 0.47-0.5.20090301svn - Split documentation and inkview into subpackages Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- inkscape.spec 2 Mar 2009 21:34:32 -0000 1.67 +++ inkscape.spec 4 Mar 2009 17:56:58 -0000 1.68 @@ -4,7 +4,7 @@ Name: inkscape Version: 0.47 -Release: 0.4.20090301svn%{?dist} +Release: 0.5.20090301svn%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity @@ -116,6 +116,24 @@ trace bitmaps and much more. +%package view +Summary: Viewing program for SVG files +Group: Applications/Productivity + +%description view +Viewer for files in W3C standard Scalable Vector Graphics (SVG) file +format. + + +%package docs +Summary: Documentation for Inkscape +Group: Documentation + +%description docs +Tutorial and examples for Inkscape, a graphics editor for vector +graphics in W3C standard Scalable Vector Graphics (SVG) file format. + + %prep %setup -q -n %{name} %patch0 -p1 -b .uniconv @@ -193,10 +211,20 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/inkscape -%{_bindir}/inkview -%{_datadir}/inkscape +%dir %{_datadir}/inkscape +%{_datadir}/inkscape/clipart +%{_datadir}/inkscape/extensions +%{_datadir}/inkscape/fonts +%{_datadir}/inkscape/gradients +%{_datadir}/inkscape/icons +%{_datadir}/inkscape/keys +%{_datadir}/inkscape/markers +%{_datadir}/inkscape/palettes +%{_datadir}/inkscape/patterns +%{_datadir}/inkscape/screens +%{_datadir}/inkscape/templates +%{_datadir}/inkscape/ui %{_datadir}/applications/fedora-inkscape.desktop %{_datadir}/icons/hicolor/scalable/apps/inkscape.svg %{_datadir}/pixmaps/inkscape.png @@ -205,7 +233,24 @@ %{_mandir}/fr/man1/inkscape.1* +%files view +%defattr(-,root,root,-) +%dir %{_datadir}/inkscape +%{_datadir}/inkscape/tutorials +%{_datadir}/inkscape/examples +%doc AUTHORS COPYING ChangeLog NEWS README + + +%files docs +%defattr(-,root,root,-) +%{_bindir}/inkview +%doc AUTHORS COPYING ChangeLog NEWS README + + %changelog +* Wed Mar 04 2009 Lubomir Rintel - 0.47-0.5.20090301svn +- Split documentation and inkview into subpackages + * Mon Mar 02 2009 Lubomir Rintel - 0.47-0.4.20090301svn - Bump to later SVN snapshot to fix inkscape/+bug/331864 - Fix a startup crash when compiled with GCC 4.4 From kanarip at fedoraproject.org Wed Mar 4 18:04:39 2009 From: kanarip at fedoraproject.org (Jeroen van Meeuwen) Date: Wed, 4 Mar 2009 18:04:39 +0000 (UTC) Subject: rpms/spin-kickstarts/devel .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.4, 1.5 spin-kickstarts.spec, 1.4, 1.5 Message-ID: <20090304180439.7408970116@cvs1.fedora.phx.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/spin-kickstarts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32676/devel Modified Files: .cvsignore import.log sources spin-kickstarts.spec Log Message: 0.11.1-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/spin-kickstarts/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Nov 2008 14:34:02 -0000 1.4 +++ .cvsignore 4 Mar 2009 18:04:09 -0000 1.5 @@ -1 +1 @@ -spin-kickstarts-0.10.2.tar.gz +spin-kickstarts-0.11.1.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/spin-kickstarts/devel/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 8 Nov 2008 14:34:02 -0000 1.3 +++ import.log 4 Mar 2009 18:04:09 -0000 1.4 @@ -1,3 +1,4 @@ spin-kickstarts-0_2-1_fc9:HEAD:spin-kickstarts-0.2-1.fc9.src.rpm:1223860450 spin-kickstarts-0_10_1-1_fc9:HEAD:spin-kickstarts-0.10.1-1.fc9.src.rpm:1225291015 spin-kickstarts-0_10_2-1_fc9:HEAD:spin-kickstarts-0.10.2-1.fc9.src.rpm:1226154819 +spin-kickstarts-0_11_1-1_fc10:HEAD:spin-kickstarts-0.11.1-1.fc10.src.rpm:1236189829 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/spin-kickstarts/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2008 14:34:02 -0000 1.4 +++ sources 4 Mar 2009 18:04:09 -0000 1.5 @@ -1 +1 @@ -3a4ea6c888c1f34ccf44a8c2df1c2a34 spin-kickstarts-0.10.2.tar.gz +ec2b94d40b1a322ac7f329e79785e884 spin-kickstarts-0.11.1.tar.gz Index: spin-kickstarts.spec =================================================================== RCS file: /cvs/pkgs/rpms/spin-kickstarts/devel/spin-kickstarts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- spin-kickstarts.spec 26 Feb 2009 02:30:14 -0000 1.4 +++ spin-kickstarts.spec 4 Mar 2009 18:04:09 -0000 1.5 @@ -1,6 +1,6 @@ Name: spin-kickstarts -Version: 0.10.2 -Release: 2%{?dist} +Version: 0.11.1 +Release: 1%{?dist} License: GPLv2+ Summary: Kickstart files and templates for creating your own Fedora Spins Group: Applications/System @@ -33,8 +33,16 @@ %{_datadir}/%{name}/* %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 0.10.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Wed Mar 04 2009 Jeroen van Meeuwen 0.11.1-1 +- Added de_CH localized spins + +* Tue Feb 23 2009 Jeroen van Meeuwen 0.11.0-2 +- Remove fedora-livecd-desktop-default.ks + +* Sat Nov 29 2008 Jeroen van Meeuwen 0.11.0-1 +- Point fedora-live-base.ks repos to f-10 +- Remove sysprof from fedora-livedvd-developer.ks +- Latest and final rebuild for Fedora 10 * Sat Nov 08 2008 Jeroen van Meeuwen 0.10.2-1 - Package updates to kickstarts into F-10 package From krh at fedoraproject.org Wed Mar 4 18:07:00 2009 From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=) Date: Wed, 4 Mar 2009 18:07:00 +0000 (UTC) Subject: rpms/kernel/devel drm-fix-setmaster-deadlock.patch, NONE, 1.1 kernel.spec, 1.1380, 1.1381 Message-ID: <20090304180700.8DE8970116@cvs1.fedora.phx.redhat.com> Author: krh Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv769 Modified Files: kernel.spec Added Files: drm-fix-setmaster-deadlock.patch Log Message: * Wed Mar 4 2009 - Add fix for deadlock in drm setmaster. drm-fix-setmaster-deadlock.patch: --- NEW FILE drm-fix-setmaster-deadlock.patch --- >From 3b7d6997b09c2ca5f06e154375aafa92271966c2 Mon Sep 17 00:00:00 2001 From: Helge Bahmann Date: Wed, 4 Mar 2009 09:58:32 +0100 Subject: [PATCH] Fix deadlock in drm_setmaster_ioctl MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kristian H??gsberg --- drivers/gpu/drm/drm_stub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index 46bb923..0823b11 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -176,7 +176,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, file_priv->minor->master != file_priv->master) { mutex_lock(&dev->struct_mutex); file_priv->minor->master = drm_master_get(file_priv->master); - mutex_lock(&dev->struct_mutex); + mutex_unlock(&dev->struct_mutex); } return 0; -- 1.6.1.3 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1380 retrieving revision 1.1381 diff -u -r1.1380 -r1.1381 --- kernel.spec 4 Mar 2009 17:55:48 -0000 1.1380 +++ kernel.spec 4 Mar 2009 18:06:30 -0000 1.1381 @@ -107,6 +107,7 @@ %define with_doc 0 %endif +%define _with_baseonly 1 # Additional options for user-friendly one-off kernel building: # # Only build the base kernel (--with baseonly): From krh at fedoraproject.org Wed Mar 4 18:11:44 2009 From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=) Date: Wed, 4 Mar 2009 18:11:44 +0000 (UTC) Subject: rpms/kernel/devel kernel.spec,1.1381,1.1382 Message-ID: <20090304181144.DBC1D70116@cvs1.fedora.phx.redhat.com> Author: krh Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1545 Modified Files: kernel.spec Log Message: Remove debug build %define. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1381 retrieving revision 1.1382 diff -u -r1.1381 -r1.1382 --- kernel.spec 4 Mar 2009 18:06:30 -0000 1.1381 +++ kernel.spec 4 Mar 2009 18:11:14 -0000 1.1382 @@ -107,7 +107,6 @@ %define with_doc 0 %endif -%define _with_baseonly 1 # Additional options for user-friendly one-off kernel building: # # Only build the base kernel (--with baseonly): From icon at fedoraproject.org Wed Mar 4 18:15:35 2009 From: icon at fedoraproject.org (Konstantin Ryabitsev) Date: Wed, 4 Mar 2009 18:15:35 +0000 (UTC) Subject: rpms/verbiste/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 verbiste.spec, 1.21, 1.22 Message-ID: <20090304181535.74CAF70116@cvs1.fedora.phx.redhat.com> Author: icon Update of /cvs/extras/rpms/verbiste/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2286 Modified Files: .cvsignore sources verbiste.spec Log Message: Upstream 0.1.24. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/verbiste/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 1 Jul 2008 00:52:43 -0000 1.14 +++ .cvsignore 4 Mar 2009 18:15:05 -0000 1.15 @@ -1 +1 @@ -verbiste-0.1.23.tar.gz +verbiste-0.1.24.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/verbiste/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 1 Jul 2008 00:52:43 -0000 1.14 +++ sources 4 Mar 2009 18:15:05 -0000 1.15 @@ -1 +1 @@ -8d978ae48c23295582c2eeec42a3d595 verbiste-0.1.23.tar.gz +bb4aef607fe0798ac33a9cab0e89abaf verbiste-0.1.24.tar.gz Index: verbiste.spec =================================================================== RCS file: /cvs/extras/rpms/verbiste/devel/verbiste.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- verbiste.spec 26 Feb 2009 00:13:27 -0000 1.21 +++ verbiste.spec 4 Mar 2009 18:15:05 -0000 1.22 @@ -1,6 +1,6 @@ Name: verbiste -Version: 0.1.23 -Release: 2%{?dist} +Version: 0.1.24 +Release: 1%{?dist} Summary: French conjugation system Group: Applications/Text @@ -116,6 +116,11 @@ %changelog +* Wed Mar 04 2009 Konstantin Ryabitsev - 0.1.24-1 +- New version 0.1.24 +- About a hundred verbs have been added. +- Small usability fixes. + * Wed Feb 25 2009 Fedora Release Engineering - 0.1.23-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From icon at fedoraproject.org Wed Mar 4 18:20:29 2009 From: icon at fedoraproject.org (Konstantin Ryabitsev) Date: Wed, 4 Mar 2009 18:20:29 +0000 (UTC) Subject: rpms/verbiste/devel verbiste.spec,1.22,1.23 Message-ID: <20090304182029.E021570116@cvs1.fedora.phx.redhat.com> Author: icon Update of /cvs/extras/rpms/verbiste/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3095 Modified Files: verbiste.spec Log Message: Fix source URL. Index: verbiste.spec =================================================================== RCS file: /cvs/extras/rpms/verbiste/devel/verbiste.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- verbiste.spec 4 Mar 2009 18:15:05 -0000 1.22 +++ verbiste.spec 4 Mar 2009 18:19:59 -0000 1.23 @@ -1,12 +1,12 @@ Name: verbiste Version: 0.1.24 -Release: 1%{?dist} +Release: 2%{?dist} Summary: French conjugation system Group: Applications/Text License: GPLv2+ URL: http://sarrazip.com/dev/verbiste.html -Source: http://www3.sympatico.ca/sarrazip/dev/%{name}-%{version}.tar.gz +Source: http://perso.b2b2c.ca/sarrazip/dev/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libxml2-devel, gnome-panel-devel, desktop-file-utils, gettext @@ -116,6 +116,9 @@ %changelog +* Wed Mar 04 2009 Konstantin Ryabitsev - 0.1.24-2 +- Fix source URL. + * Wed Mar 04 2009 Konstantin Ryabitsev - 0.1.24-1 - New version 0.1.24 - About a hundred verbs have been added. From lkundrak at fedoraproject.org Wed Mar 4 18:21:12 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Wed, 4 Mar 2009 18:21:12 +0000 (UTC) Subject: rpms/inkscape/devel inkscape.spec,1.68,1.69 Message-ID: <20090304182112.1AD8670116@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3199 Modified Files: inkscape.spec Log Message: Pack missing directory Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- inkscape.spec 4 Mar 2009 17:56:58 -0000 1.68 +++ inkscape.spec 4 Mar 2009 18:20:41 -0000 1.69 @@ -215,6 +215,7 @@ %dir %{_datadir}/inkscape %{_datadir}/inkscape/clipart %{_datadir}/inkscape/extensions +%{_datadir}/inkscape/filters %{_datadir}/inkscape/fonts %{_datadir}/inkscape/gradients %{_datadir}/inkscape/icons From rdieter at fedoraproject.org Wed Mar 4 18:22:32 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 4 Mar 2009 18:22:32 +0000 (UTC) Subject: rpms/gnupg2/devel .cvsignore, 1.28, 1.29 gnupg2.spec, 1.90, 1.91 sources, 1.30, 1.31 Message-ID: <20090304182232.7634370116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/gnupg2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3405 Modified Files: .cvsignore gnupg2.spec sources Log Message: * Wed Mar 04 2009 Rex Dieter - 2.0.11-1 - gnupg-2.0.11 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnupg2/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 13 Jan 2009 20:54:10 -0000 1.28 +++ .cvsignore 4 Mar 2009 18:22:02 -0000 1.29 @@ -1,2 +1,2 @@ -gnupg-2.0.10.tar.bz2 -gnupg-2.0.10.tar.bz2.sig +gnupg-2.0.11.tar.bz2 +gnupg-2.0.11.tar.bz2.sig Index: gnupg2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- gnupg2.spec 25 Feb 2009 00:06:29 -0000 1.90 +++ gnupg2.spec 4 Mar 2009 18:22:02 -0000 1.91 @@ -1,8 +1,8 @@ Summary: Utility for secure communication and data storage Name: gnupg2 -Version: 2.0.10 -Release: 2%{?dist} +Version: 2.0.11 +Release: 1%{?dist} License: GPLv3+ Group: Applications/System @@ -167,6 +167,9 @@ %changelog +* Wed Mar 04 2009 Rex Dieter - 2.0.11-1 +- gnupg-2.0.11 + * Tue Feb 24 2009 Fedora Release Engineering - 2.0.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnupg2/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 13 Jan 2009 20:54:10 -0000 1.30 +++ sources 4 Mar 2009 18:22:02 -0000 1.31 @@ -1,2 +1,2 @@ -1cb778dd555f87685a8fde2f7113725e gnupg-2.0.10.tar.bz2 -bf002a27b578b229adae914769272b27 gnupg-2.0.10.tar.bz2.sig +a3014f3b3c919662278060f9a4818b89 gnupg-2.0.11.tar.bz2 +39e69b28bc64d284fc5a43ccdf479930 gnupg-2.0.11.tar.bz2.sig From glommer at fedoraproject.org Wed Mar 4 18:23:14 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 4 Mar 2009 18:23:14 +0000 (UTC) Subject: rpms/qemu/devel qemu.spec,1.57,1.58 Message-ID: <20090304182314.E607270116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3428 Modified Files: qemu.spec Log Message: 0.9.2 is the correct number. Missing dot, call me stupid. Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- qemu.spec 4 Mar 2009 17:42:41 -0000 1.57 +++ qemu.spec 4 Mar 2009 18:22:44 -0000 1.58 @@ -1,6 +1,6 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.92 +Version: 0.9.2 Release: 0.1.kvm20090303git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 @@ -422,6 +422,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Wed Mar 04 2009 Glauber Costa - 0.9.2-0.1.kvm20090303git +- missing a dot. shame on me + * Wed Mar 04 2009 Glauber Costa - 0.92-0.1.kvm20090303git - Set Epoch to 2 - Set version to 0.92. It seems upstream keep changing minds here, so pick the lowest From mclasen at fedoraproject.org Wed Mar 4 18:25:30 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Wed, 4 Mar 2009 18:25:30 +0000 (UTC) Subject: rpms/gnome-media/devel gnome-media.spec,1.156,1.157 Message-ID: <20090304182530.EB13370116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-media/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3787 Modified Files: gnome-media.spec Log Message: fix BRs Index: gnome-media.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- gnome-media.spec 4 Mar 2009 01:52:43 -0000 1.156 +++ gnome-media.spec 4 Mar 2009 18:25:00 -0000 1.157 @@ -44,6 +44,7 @@ BuildRequires: pulseaudio-libs-devel BuildRequires: gnome-doc-utils BuildRequires: intltool +BuildRequires: unique-devel %description This package contains a few media utilities for the GNOME desktop, From icon at fedoraproject.org Wed Mar 4 18:28:10 2009 From: icon at fedoraproject.org (Konstantin Ryabitsev) Date: Wed, 4 Mar 2009 18:28:10 +0000 (UTC) Subject: rpms/python-feedparser/devel python-feedparser.spec,1.9,1.10 Message-ID: <20090304182810.8DA7A70116@cvs1.fedora.phx.redhat.com> Author: icon Update of /cvs/extras/rpms/python-feedparser/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3995 Modified Files: python-feedparser.spec Log Message: Fix source URL location (Re: source file audit) Index: python-feedparser.spec =================================================================== RCS file: /cvs/extras/rpms/python-feedparser/devel/python-feedparser.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-feedparser.spec 26 Feb 2009 21:28:24 -0000 1.9 +++ python-feedparser.spec 4 Mar 2009 18:27:40 -0000 1.10 @@ -2,13 +2,13 @@ Name: python-feedparser Version: 4.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Parse RSS and Atom feeds in Python Group: Development/Languages License: BSD URL: http://feedparser.org/ -Source0: http://download.sourceforge.net/feedparser/feedparser-%{version}.zip +Source0: http://feedparser.googlecode.com/files/feedparser-%{version}.zip Patch0: feedparser_utf8_decoding.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +52,9 @@ %changelog +* Wed Mar 04 2009 Konstantin Ryabitsev - 4.1-8 +- Fix source URL (moved to googlecode). + * Thu Feb 26 2009 Fedora Release Engineering - 4.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From crobinso at fedoraproject.org Wed Mar 4 18:28:34 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 4 Mar 2009 18:28:34 +0000 (UTC) Subject: rpms/virt-manager/F-9 virt-manager-0.6.1-fix-cadl.patch, NONE, 1.1 virt-manager-0.6.1-fix-stats-prefs.patch, NONE, 1.1 virt-manager-0.6.1-update-polish.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 virt-manager.spec, 1.39, 1.40 virt-manager-0.6.0-conn-details-sensitivity.patch, 1.1, NONE virt-manager-0.6.0-connect-variable-typo.patch, 1.1, NONE virt-manager-0.6.0-fix-virt-type-desc.patch, 1.2, NONE virt-manager-0.6.0-multiple-sound-dev.patch, 1.1, NONE virt-manager-0.6.0-polkit-root.patch, 1.1, NONE virt-manager-0.6.0-populate-hostinfo-early.patch, 1.1, NONE virt-manager-0.6.0-update-potfiles.patch, 1.1, NONE virt-manager-0.6.0-update-translations.patch, 1.1, NONE virt-manager-0.6.0-vol-copy-popup.patch, 1.1, NONE virt-manager.console, 1.1, NONE virt-manager.pam, 1.1, NONE Message-ID: <20090304182834.B74F570116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/virt-manager/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4020 Modified Files: .cvsignore sources virt-manager.spec Added Files: virt-manager-0.6.1-fix-cadl.patch virt-manager-0.6.1-fix-stats-prefs.patch virt-manager-0.6.1-update-polish.patch Removed Files: virt-manager-0.6.0-conn-details-sensitivity.patch virt-manager-0.6.0-connect-variable-typo.patch virt-manager-0.6.0-fix-virt-type-desc.patch virt-manager-0.6.0-multiple-sound-dev.patch virt-manager-0.6.0-polkit-root.patch virt-manager-0.6.0-populate-hostinfo-early.patch virt-manager-0.6.0-update-potfiles.patch virt-manager-0.6.0-update-translations.patch virt-manager-0.6.0-vol-copy-popup.patch virt-manager.console virt-manager.pam Log Message: Update to 0.6.1 release Disk and Network VM stats reporting VM Migration support Support adding sound devices to existing VMs Allow specifying device model when adding a network device to an existing VM virt-manager-0.6.1-fix-cadl.patch: --- NEW FILE virt-manager-0.6.1-fix-cadl.patch --- diff -rup virt-manager-0.6.1/src/vmm-details.glade new/src/vmm-details.glade --- virt-manager-0.6.1/src/vmm-details.glade 2009-01-26 14:33:33.000000000 -0500 +++ new/src/vmm-details.glade 2009-03-04 12:31:51.000000000 -0500 @@ -218,15 +218,15 @@ - + True Ctrl+Alt+Backspace True - + - + True Ctrl+Alt+Delete True virt-manager-0.6.1-fix-stats-prefs.patch: --- NEW FILE virt-manager-0.6.1-fix-stats-prefs.patch --- # HG changeset patch # User Cole Robinson # Date 1234829084 18000 # Node ID ae434ddf4b7073773347f3d1cc449385db7267fd # Parent 7238b8b438bc3311b744debfb576849dbc262cda Fix regression for pre existing vm and stats preferences not keeping new values. diff -r 7238b8b438bc -r ae434ddf4b70 src/vmm-preferences.glade --- a/src/vmm-preferences.glade Mon Feb 16 09:35:21 2009 -0500 +++ b/src/vmm-preferences.glade Mon Feb 16 19:04:44 2009 -0500 @@ -1,6 +1,6 @@ - + Preferences @@ -37,19 +37,53 @@ 3 3 - + True 0 - samples + Update status every + + + + + True + 0 + Maintain history of - 2 - 3 1 2 + + True + True + 0 0 60 1 5 0 + + + + 1 + 2 + GTK_FILL + + + + + True + True + 0 0 300 5 5 0 + 0.01 + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + True 0 @@ -61,50 +95,18 @@ - + True - True - 0 0 300 5 5 0 - 0.01 + 0 + samples - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - 0 0 60 1 5 0 - - - 1 - 2 - GTK_FILL - - - - - True - 0 - Maintain history of - - + 2 + 3 1 2 - - - True - 0 - Update status every - - @@ -141,18 +143,79 @@ 3 3 - + + True + 0 + CPU Usage + PANGO_ELLIPSIZE_END + + + GTK_FILL + + + + + True + 0 + Memory Usage + + + 1 + 2 + GTK_FILL + + + + + True + 0 + Disk I/O + + + 2 + 3 + GTK_FILL + + + + + True + 0 + Network I/O + + + 3 + 4 + GTK_FILL + + + + True True 0 True - + 1 2 - 3 - 4 + GTK_EXPAND + + + + + True + True + 0 + True + + + + 1 + 2 + 1 + 2 GTK_EXPAND @@ -173,80 +236,19 @@ - + True True 0 True - + 1 2 - 1 - 2 - GTK_EXPAND - - - - - True - True - 0 - True - - - - 1 - 2 - GTK_EXPAND - - - - - True - 0 - Network I/O - - 3 4 - GTK_FILL - - - - - True - 0 - Disk I/O - - - 2 - 3 - GTK_FILL - - - - - True - 0 - Memory Usage - - - 1 - 2 - GTK_FILL - - - - - True - 0 - CPU Usage - PANGO_ELLIPSIZE_END - - - GTK_FILL + GTK_EXPAND @@ -302,19 +304,27 @@ 1 2 - + True Never -When fullscreen -On mouse over +For all new domains +For all domains + - 3 - 4 + 1 + 2 5 + + True + 0 + Automatically open consoles: + + + True 0 @@ -326,22 +336,16 @@ - - True - 0 - Automatically open consoles: - - - - + True Never -For all new domains -For all domains +When fullscreen +On mouse over + - 1 - 2 + 3 + 4 5 @@ -380,6 +384,13 @@ 1 8 + + True + 0 + Install Audio Device: + + + True 12 @@ -417,13 +428,6 @@ 2 - - - True - 0 - Install Audio Device: - - @@ -470,7 +474,7 @@ True True True - gtk-help + gtk-help True 0 @@ -500,7 +504,7 @@ True True True - gtk-close + gtk-close True 0 virt-manager-0.6.1-update-polish.patch: --- NEW FILE virt-manager-0.6.1-update-polish.patch --- # HG changeset patch # User Cole Robinson # Date 1234794921 18000 # Node ID 7238b8b438bc3311b744debfb576849dbc262cda # Parent 9d1aa6fcf42681caba0d9c50e15ffa6d10d9f8af Updated pl translation. diff -r 9d1aa6fcf426 -r 7238b8b438bc po/pl.po --- a/po/pl.po Sun Feb 15 21:40:21 2009 -0500 +++ b/po/pl.po Mon Feb 16 09:35:21 2009 -0500 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-12 20:36+0100\n" -"PO-Revision-Date: 2008-12-12 20:46+0100\n" +"POT-Creation-Date: 2009-02-06 17:03+0100\n" +"PO-Revision-Date: 2009-02-06 20:23+0100\n" "Last-Translator: Piotr Dr??g \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ #. ...the risk is we catch too much though #. Damned if we do, damned if we dont :-)( -#: ../src/virt-manager.py.in:264 +#: ../src/virt-manager.py.in:284 #, python-format msgid "Unable to initialize GTK: %s" msgstr "Nie mo??na zainicjowa?? GTK: %s" @@ -41,99 +41,138 @@ msgstr "Urz??dzenie d??wi??kowe instalacji dla zdalnej maszyny wirtualnej" #: ../src/virt-manager.schemas.in.h:3 +msgid "Poll cpu stats" +msgstr "Sonda?? statystyk procesora" + +#: ../src/virt-manager.schemas.in.h:4 +msgid "Poll disk i/o stats" +msgstr "Sonda?? statystyk wej??cia/wyj??cia dysku" + +#: ../src/virt-manager.schemas.in.h:5 +msgid "Poll memory usage stats" +msgstr "Sonda?? statystyk u??ycia pami??ci" + +#: ../src/virt-manager.schemas.in.h:6 +msgid "Poll net i/o stats" +msgstr "Sonda?? statystyk wej??cia/wyj??cia sieci" + +#: ../src/virt-manager.schemas.in.h:7 msgid "Show VCPU count in summary" msgstr "Wy??wietl podsumowanie licznika wirtualnych procesor??w" -#: ../src/virt-manager.schemas.in.h:4 +#: ../src/virt-manager.schemas.in.h:8 msgid "Show cpu usage in summary" msgstr "Wy??wietl podsumowanie u??ycia procesora" -#: ../src/virt-manager.schemas.in.h:5 +#: ../src/virt-manager.schemas.in.h:9 msgid "Show disk I/O in summary" msgstr "Wy??wietl podsumowanie wej??cia/wyj??cia dysku" -#: ../src/virt-manager.schemas.in.h:6 +#: ../src/virt-manager.schemas.in.h:10 msgid "Show domain id in summary" msgstr "Wy??wietl podsumowanie identyfikatora domeny" -#: ../src/virt-manager.schemas.in.h:7 +#: ../src/virt-manager.schemas.in.h:11 msgid "Show memory usage in summary" msgstr "Wy??wietl podsumowanie u??ycia pami??ci" -#: ../src/virt-manager.schemas.in.h:8 +#: ../src/virt-manager.schemas.in.h:12 msgid "Show network I/O in summary" msgstr "Wy??wietl podsumowanie wej??cia/wyj??cia sieci" -#: ../src/virt-manager.schemas.in.h:9 +#: ../src/virt-manager.schemas.in.h:13 msgid "Show run state in summary" msgstr "Wy??wietl podsumowanie stanu uruchomienia" -#: ../src/virt-manager.schemas.in.h:10 +#: ../src/virt-manager.schemas.in.h:14 msgid "Show the cpu usage field in the domain list summary view" msgstr "Wy??wietl pole u??ycia procesora w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:11 +#: ../src/virt-manager.schemas.in.h:15 msgid "Show the disk I/O field in the domain list summary view" msgstr "Wy??wietl pole wej??cia/wyj??cia dysku w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:12 +#: ../src/virt-manager.schemas.in.h:16 msgid "Show the domain id field in the domain list summary view" msgstr "Wy??wietl pole identyfikatora domeny w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:13 +#: ../src/virt-manager.schemas.in.h:17 msgid "Show the memory usage field in the domain list summary view" msgstr "Wy??wietl pole u??ycia pami??ci w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:14 +#: ../src/virt-manager.schemas.in.h:18 msgid "Show the network I/O field in the domain list summary view" msgstr "Wy??wietl pole wej??cia/wyj??cia sieci w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:15 +#: ../src/virt-manager.schemas.in.h:19 msgid "Show the run state field in the domain list summary view" msgstr "Wy??wietl pole stanu uruchomienia w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:16 +#: ../src/virt-manager.schemas.in.h:20 msgid "Show the virtual CPU count field in the domain list summary view" msgstr "" "Wy??wietl pole licznika wirtualnych procesor??w w widoku podsumowania listy " "domen" -#: ../src/virt-manager.schemas.in.h:17 +#: ../src/virt-manager.schemas.in.h:21 msgid "The length of the list of URLs" msgstr "D??ugo???? listy URL-i" -#: ../src/virt-manager.schemas.in.h:18 +#: ../src/virt-manager.schemas.in.h:22 msgid "The number of samples to keep in the statistics history" msgstr "Liczba przyk??ad??w przechowywanych w historii statystyk" -#: ../src/virt-manager.schemas.in.h:19 +#: ../src/virt-manager.schemas.in.h:23 msgid "" "The number of urls to keep in the history for the install media address page." msgstr "" "Liczba URL-i przechowywanych w historii strony adresowej no??nika " "instalacyjnego." -#: ../src/virt-manager.schemas.in.h:20 +#: ../src/virt-manager.schemas.in.h:24 msgid "The statistics history length" msgstr "D??ugo???? historii statystyk" -#: ../src/virt-manager.schemas.in.h:21 +#: ../src/virt-manager.schemas.in.h:25 msgid "The statistics update interval" msgstr "Cz??sto???? aktualizacji statystyk" -#: ../src/virt-manager.schemas.in.h:22 +#: ../src/virt-manager.schemas.in.h:26 msgid "The statistics update interval in seconds" msgstr "Cz??sto???? aktualizacji statystyk w sekundach" -#: ../src/virt-manager.schemas.in.h:23 +#: ../src/virt-manager.schemas.in.h:27 msgid "When to grab keyboard input for the console" msgstr "Kiedy przechwyci?? wej??cie klawiatury w konsoli" -#: ../src/virt-manager.schemas.in.h:24 +#: ../src/virt-manager.schemas.in.h:28 msgid "When to pop up a console for a guest" msgstr "Kiedy wy??wietli?? konsol?? go??cia" -#: ../src/virt-manager.schemas.in.h:25 +#: ../src/virt-manager.schemas.in.h:29 +msgid "Whether or not the app will poll VM disk i/o statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki wej??cia/wyj??cia dysku maszyny wirtualnej" + +#: ../src/virt-manager.schemas.in.h:30 +msgid "Whether or not the app will poll VM network i/o statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki wej??cia/wyj??cia sieci maszyny wirtualnej" + +#: ../src/virt-manager.schemas.in.h:31 +msgid "Whether or not the app will poll connection and VM cpu usage statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki u??ycia po????czenia i procesora maszyny " +"wirtualnej" + +#: ../src/virt-manager.schemas.in.h:32 +msgid "" +"Whether or not the app will poll connection and VM memory usage statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki u??ycia po????czenia i pami??ci maszyny " +"wirtualnej" + +#: ../src/virt-manager.schemas.in.h:33 msgid "" "Whether to grab keyboard input for a guest console. 0 = never, 1 = only when " "in full screen mode, 2 = when mouse is over console" @@ -141,15 +180,15 @@ "Kiedy przechwyci?? wej??cie klawiatury w konsoli go??cia. 0 = nigdy, 1 = tylko " "w trybie pe??noekranowym, 2 = kiedy mysz jest nad konsol??" -#: ../src/virt-manager.schemas.in.h:26 +#: ../src/virt-manager.schemas.in.h:34 msgid "Whether to install a sound device for local VMs or not" msgstr "Czy instalowa?? urz??dzenie d??wi??kowe dla lokalnej maszyny wirtualnej" [...3161 lines suppressed...] -#: ../src/vmm-details.glade.h:118 +#: ../src/vmm-details.glade.h:103 msgid "_Take Screenshot" msgstr "_Wykonaj zrzut ekranu" -#: ../src/vmm-details.glade.h:119 ../src/vmm-manager.glade.h:22 +#: ../src/vmm-details.glade.h:104 ../src/vmm-manager.glade.h:22 msgid "_View" msgstr "_Widok" -#: ../src/vmm-details.glade.h:120 -msgid "disk\t" -msgstr "dysk\t" - -#: ../src/vmm-details.glade.h:121 -msgid "insert sound model" -msgstr "wstaw model d??wi??ku" - #: ../src/vmm-host.glade.h:2 msgid "IPv4 configuration" msgstr "Konfiguracja IPv4" @@ -3042,7 +3065,7 @@ msgid "Forwarding:" msgstr "Przekazywanie:" -#: ../src/vmm-host.glade.h:21 +#: ../src/vmm-host.glade.h:21 ../src/vmm-manager.glade.h:10 msgid "Host Details" msgstr "Szczeg????y hosta" @@ -3090,18 +3113,10 @@ msgid "Stop Pool" msgstr "Zatrzymaj pul??" -#: ../src/vmm-host.glade.h:39 -msgid "Storage Pools" -msgstr "Pule pami??ci masowej" - #: ../src/vmm-host.glade.h:40 msgid "Virtual Networks" msgstr "Sieci wirtualne" -#: ../src/vmm-host.glade.h:41 -msgid "Xen" -msgstr "Xen" - #: ../src/vmm-manager.glade.h:1 msgid "Add Connection..." msgstr "Dodaj po????czenie..." @@ -3116,21 +3131,21 @@ "Aktywne maszyny wirtualne\n" "Nieaktywne maszyny wirtualne" -#: ../src/vmm-manager.glade.h:6 -msgid "Connection Details..." -msgstr "Szczeg????y po????czenia..." +#: ../src/vmm-manager.glade.h:5 ../src/vmm-preferences.glade.h:6 +msgid "CPU Usage" +msgstr "U??ycie procesora" #: ../src/vmm-manager.glade.h:7 -msgid "Delete Machine" -msgstr "Usu?? maszyn??" +msgid "Delete Virtual Machine" +msgstr "Usu?? maszyn?? wirtualn??" #: ../src/vmm-manager.glade.h:9 msgid "Domain ID" msgstr "Identyfikator domeny" -#: ../src/vmm-manager.glade.h:10 -msgid "Machine Details..." -msgstr "Szczeg????y maszyny..." +#: ../src/vmm-manager.glade.h:11 ../src/vmm-preferences.glade.h:12 +msgid "Memory Usage" +msgstr "U??ycie pami??ci" #: ../src/vmm-manager.glade.h:13 msgid "Restore a saved machine from a filesystem image" @@ -3141,8 +3156,8 @@ msgstr "Przywr???? zapisan?? maszyn??..." #: ../src/vmm-manager.glade.h:16 -msgid "Virtual CPUs" -msgstr "Wirtualne procesory" +msgid "Virtual Machine Details" +msgstr "Szczeg????y maszyny wirtualnej" #: ../src/vmm-manager.glade.h:19 msgid "_Edit" @@ -3205,56 +3220,48 @@ msgstr "Konsole" #: ../src/vmm-preferences.glade.h:2 -msgid "New VM Preferences" -msgstr "Preferencje nowej maszyny wirtualnej" +msgid "Enable Stats Polling" +msgstr "W????cz sonda?? statystyk" #: ../src/vmm-preferences.glade.h:3 -msgid "Status monitoring" -msgstr "Stan monitorowania" +msgid "New VM" +msgstr "Nowa maszyna wirtualna" #: ../src/vmm-preferences.glade.h:4 -msgid "Auto Console" -msgstr "Automatyczna konsola" +msgid "Stats Options" +msgstr "Opcje statystyk" #: ../src/vmm-preferences.glade.h:5 msgid "Automatically open consoles:" msgstr "Automatycznie otw??rz konsole:" -#: ../src/vmm-preferences.glade.h:6 -msgid "Grab Keyboard" -msgstr "Przechwy?? klawiatur??" - -#: ../src/vmm-preferences.glade.h:7 +#: ../src/vmm-preferences.glade.h:8 msgid "Grab keyboard input:" msgstr "Przechwy?? wej??cie klawiatury:" -#: ../src/vmm-preferences.glade.h:8 -msgid "History Samples" -msgstr "Przyk??ady historii" - #: ../src/vmm-preferences.glade.h:9 msgid "Install Audio Device:" msgstr "Urz??dzenie d??wi??kowe instalacji:" #: ../src/vmm-preferences.glade.h:10 -msgid "Local VM" +msgid "Local virtual machine" msgstr "Lokalna maszyna wirtualna" #: ../src/vmm-preferences.glade.h:11 msgid "Maintain history of" msgstr "Zarz??dzaj histori??" -#: ../src/vmm-preferences.glade.h:12 +#: ../src/vmm-preferences.glade.h:14 msgid "" "Never\n" -"For new domains\n" +"For all new domains\n" "For all domains" msgstr "" "Nigdy\n" -"Dla nowych domen\n" +"Dla wszystkich nowych domen\n" "Dla wszystkich domen" -#: ../src/vmm-preferences.glade.h:15 +#: ../src/vmm-preferences.glade.h:17 msgid "" "Never\n" "When fullscreen\n" @@ -3264,26 +3271,30 @@ "Kiedy jest na pe??nym ekranie\n" "Przy najechaniu mysz??" -#: ../src/vmm-preferences.glade.h:18 +#: ../src/vmm-preferences.glade.h:20 msgid "Preferences" msgstr "Preferencje" -#: ../src/vmm-preferences.glade.h:19 -msgid "Remote VM" +#: ../src/vmm-preferences.glade.h:21 +msgid "Remote virtual machine" msgstr "Zdalna maszyna wirtualna" -#: ../src/vmm-preferences.glade.h:20 -msgid "Status Interval" -msgstr "Cz??sto???? stanu" +#: ../src/vmm-preferences.glade.h:22 +msgid "Stats" +msgstr "Statystyki" -#: ../src/vmm-preferences.glade.h:21 +#: ../src/vmm-preferences.glade.h:23 msgid "Update status every" msgstr "Zaktualizuj stan co" -#: ../src/vmm-preferences.glade.h:22 +#: ../src/vmm-preferences.glade.h:24 +msgid "VM Details" +msgstr "Szczeg????y maszyny wirtualnej" + +#: ../src/vmm-preferences.glade.h:25 msgid "samples" msgstr "przyk??ady" -#: ../src/vmm-preferences.glade.h:23 +#: ../src/vmm-preferences.glade.h:26 msgid "seconds" msgstr "sekundy" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/F-9/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 1 Dec 2008 17:37:42 -0000 1.20 +++ .cvsignore 4 Mar 2009 18:28:03 -0000 1.21 @@ -1 +1 @@ -virt-manager-0.6.0.tar.gz +virt-manager-0.6.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/F-9/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 1 Dec 2008 17:37:42 -0000 1.20 +++ sources 4 Mar 2009 18:28:03 -0000 1.21 @@ -1 +1 @@ -fd0acd111f180a0766b08d5f42cf5468 virt-manager-0.6.0.tar.gz +9c4eeaf447919b425f890b6bff715512 virt-manager-0.6.1.tar.gz Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/F-9/virt-manager.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- virt-manager.spec 7 Dec 2008 21:16:11 -0000 1.39 +++ virt-manager.spec 4 Mar 2009 18:28:04 -0000 1.40 @@ -7,7 +7,7 @@ %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}} Name: virt-manager -Version: 0.6.0 +Version: 0.6.1 Release: 1%{_extra_release} Summary: Virtual Machine Manager @@ -15,17 +15,9 @@ License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz -Source1: %{name}.pam -Source2: %{name}.console -Patch1: %{name}-%{version}-polkit-root.patch -Patch2: %{name}-%{version}-conn-details-sensitivity.patch -Patch3: %{name}-%{version}-populate-hostinfo-early.patch -Patch4: %{name}-%{version}-update-potfiles.patch -Patch5: %{name}-%{version}-update-translations.patch -Patch6: %{name}-%{version}-multiple-sound-dev.patch -Patch7: %{name}-%{version}-vol-copy-popup.patch -Patch8: %{name}-%{version}-connect-variable-typo.patch -Patch9: %{name}-%{version}-fix-virt-type-desc.patch +Patch1: %{name}-%{version}-update-polish.patch +Patch2: %{name}-%{version}-fix-cadl.patch +Patch3: %{name}-%{version}-fix-stats-prefs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # These two are just the oldest version tested @@ -59,14 +51,16 @@ Requires: librsvg2 # Earlier vte had broken python binding module Requires: vte >= 0.12.2 -# For the consolehelper PAM stuff -Requires: usermode # For online help Requires: scrollkeeper # For console widget Requires: gtk-vnc-python >= 0.3.4 # For local authentication against PolicyKit +%if 0%{?fedora} >= 11 +Requires: PolicyKit-authentication-agent +%else if 0%{?fedora} >= 9 Requires: PolicyKit-gnome +%endif BuildRequires: pygtk2-devel BuildRequires: gtk2-devel @@ -98,12 +92,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 %build %configure @@ -115,15 +103,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la -# Adjust for console-helper magic -mkdir -p $RPM_BUILD_ROOT%{_sbindir} -mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name} -ln -s ../bin/consolehelper $RPM_BUILD_ROOT%{_bindir}/%{name} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d -cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/%{name} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps -cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/%{name} - %find_lang %{name} %clean @@ -161,10 +140,7 @@ %defattr(-,root,root,-) %doc README COPYING COPYING-DOCS AUTHORS ChangeLog NEWS %{_sysconfdir}/gconf/schemas/%{name}.schemas -%config(noreplace) %{_sysconfdir}/pam.d/%{name} -%{_sysconfdir}/security/console.apps/%{name} %{_bindir}/%{name} -%{_sbindir}/%{name} %{_libexecdir}/%{name}-launch %dir %{_libdir}/%{name}/ %{_libdir}/%{name}/* @@ -193,6 +169,13 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog +* Wed Mar 4 2009 Cole Robinson - 0.6.1-1.fc9 +- Update to 0.6.1 release +- Disk and Network VM stats reporting +- VM Migration support +- Support adding sound devices to existing VMs +- Allow specifying device model when adding a network device to an existing VM + * Mon Dec 1 2008 Cole Robinson - 0.6.0-1.fc9 - Update to 0.6.0 release with additional fixes from rawhide/F10 - Add libvirt storage management support --- virt-manager-0.6.0-conn-details-sensitivity.patch DELETED --- --- virt-manager-0.6.0-connect-variable-typo.patch DELETED --- --- virt-manager-0.6.0-fix-virt-type-desc.patch DELETED --- --- virt-manager-0.6.0-multiple-sound-dev.patch DELETED --- --- virt-manager-0.6.0-polkit-root.patch DELETED --- --- virt-manager-0.6.0-populate-hostinfo-early.patch DELETED --- --- virt-manager-0.6.0-update-potfiles.patch DELETED --- --- virt-manager-0.6.0-update-translations.patch DELETED --- --- virt-manager-0.6.0-vol-copy-popup.patch DELETED --- --- virt-manager.console DELETED --- --- virt-manager.pam DELETED --- From crobinso at fedoraproject.org Wed Mar 4 18:28:54 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 4 Mar 2009 18:28:54 +0000 (UTC) Subject: rpms/virt-manager/F-10 virt-manager-0.6.1-fix-cadl.patch, NONE, 1.1 virt-manager-0.6.1-fix-stats-prefs.patch, NONE, 1.1 virt-manager-0.6.1-update-polish.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 virt-manager.spec, 1.39, 1.40 virt-manager-0.6.0-conn-details-sensitivity.patch, 1.1, NONE virt-manager-0.6.0-connect-variable-typo.patch, 1.1, NONE virt-manager-0.6.0-fix-virt-type-desc.patch, 1.2, NONE virt-manager-0.6.0-multiple-sound-dev.patch, 1.1, NONE virt-manager-0.6.0-polkit-root.patch, 1.2, NONE virt-manager-0.6.0-populate-hostinfo-early.patch, 1.1, NONE virt-manager-0.6.0-update-potfiles.patch, 1.1, NONE virt-manager-0.6.0-update-translations.patch, 1.1, NONE virt-manager-0.6.0-vol-copy-popup.patch, 1.1, NONE virt-manager.console, 1.1, NONE virt-manager.pam, 1.1, NONE Message-ID: <20090304182854.E7FD370116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/virt-manager/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4051 Modified Files: .cvsignore sources virt-manager.spec Added Files: virt-manager-0.6.1-fix-cadl.patch virt-manager-0.6.1-fix-stats-prefs.patch virt-manager-0.6.1-update-polish.patch Removed Files: virt-manager-0.6.0-conn-details-sensitivity.patch virt-manager-0.6.0-connect-variable-typo.patch virt-manager-0.6.0-fix-virt-type-desc.patch virt-manager-0.6.0-multiple-sound-dev.patch virt-manager-0.6.0-polkit-root.patch virt-manager-0.6.0-populate-hostinfo-early.patch virt-manager-0.6.0-update-potfiles.patch virt-manager-0.6.0-update-translations.patch virt-manager-0.6.0-vol-copy-popup.patch virt-manager.console virt-manager.pam Log Message: Update to 0.6.1 release Disk and Network VM stats reporting VM Migration support Support adding sound devices to existing VMs Allow specifying device model when adding a network device to an existing VM virt-manager-0.6.1-fix-cadl.patch: --- NEW FILE virt-manager-0.6.1-fix-cadl.patch --- diff -rup virt-manager-0.6.1/src/vmm-details.glade new/src/vmm-details.glade --- virt-manager-0.6.1/src/vmm-details.glade 2009-01-26 14:33:33.000000000 -0500 +++ new/src/vmm-details.glade 2009-03-04 12:31:51.000000000 -0500 @@ -218,15 +218,15 @@ - + True Ctrl+Alt+Backspace True - + - + True Ctrl+Alt+Delete True virt-manager-0.6.1-fix-stats-prefs.patch: --- NEW FILE virt-manager-0.6.1-fix-stats-prefs.patch --- # HG changeset patch # User Cole Robinson # Date 1234829084 18000 # Node ID ae434ddf4b7073773347f3d1cc449385db7267fd # Parent 7238b8b438bc3311b744debfb576849dbc262cda Fix regression for pre existing vm and stats preferences not keeping new values. diff -r 7238b8b438bc -r ae434ddf4b70 src/vmm-preferences.glade --- a/src/vmm-preferences.glade Mon Feb 16 09:35:21 2009 -0500 +++ b/src/vmm-preferences.glade Mon Feb 16 19:04:44 2009 -0500 @@ -1,6 +1,6 @@ - + Preferences @@ -37,19 +37,53 @@ 3 3 - + True 0 - samples + Update status every + + + + + True + 0 + Maintain history of - 2 - 3 1 2 + + True + True + 0 0 60 1 5 0 + + + + 1 + 2 + GTK_FILL + + + + + True + True + 0 0 300 5 5 0 + 0.01 + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + True 0 @@ -61,50 +95,18 @@ - + True - True - 0 0 300 5 5 0 - 0.01 + 0 + samples - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - 0 0 60 1 5 0 - - - 1 - 2 - GTK_FILL - - - - - True - 0 - Maintain history of - - + 2 + 3 1 2 - - - True - 0 - Update status every - - @@ -141,18 +143,79 @@ 3 3 - + + True + 0 + CPU Usage + PANGO_ELLIPSIZE_END + + + GTK_FILL + + + + + True + 0 + Memory Usage + + + 1 + 2 + GTK_FILL + + + + + True + 0 + Disk I/O + + + 2 + 3 + GTK_FILL + + + + + True + 0 + Network I/O + + + 3 + 4 + GTK_FILL + + + + True True 0 True - + 1 2 - 3 - 4 + GTK_EXPAND + + + + + True + True + 0 + True + + + + 1 + 2 + 1 + 2 GTK_EXPAND @@ -173,80 +236,19 @@ - + True True 0 True - + 1 2 - 1 - 2 - GTK_EXPAND - - - - - True - True - 0 - True - - - - 1 - 2 - GTK_EXPAND - - - - - True - 0 - Network I/O - - 3 4 - GTK_FILL - - - - - True - 0 - Disk I/O - - - 2 - 3 - GTK_FILL - - - - - True - 0 - Memory Usage - - - 1 - 2 - GTK_FILL - - - - - True - 0 - CPU Usage - PANGO_ELLIPSIZE_END - - - GTK_FILL + GTK_EXPAND @@ -302,19 +304,27 @@ 1 2 - + True Never -When fullscreen -On mouse over +For all new domains +For all domains + - 3 - 4 + 1 + 2 5 + + True + 0 + Automatically open consoles: + + + True 0 @@ -326,22 +336,16 @@ - - True - 0 - Automatically open consoles: - - - - + True Never -For all new domains -For all domains +When fullscreen +On mouse over + - 1 - 2 + 3 + 4 5 @@ -380,6 +384,13 @@ 1 8 + + True + 0 + Install Audio Device: + + + True 12 @@ -417,13 +428,6 @@ 2 - - - True - 0 - Install Audio Device: - - @@ -470,7 +474,7 @@ True True True - gtk-help + gtk-help True 0 @@ -500,7 +504,7 @@ True True True - gtk-close + gtk-close True 0 virt-manager-0.6.1-update-polish.patch: --- NEW FILE virt-manager-0.6.1-update-polish.patch --- # HG changeset patch # User Cole Robinson # Date 1234794921 18000 # Node ID 7238b8b438bc3311b744debfb576849dbc262cda # Parent 9d1aa6fcf42681caba0d9c50e15ffa6d10d9f8af Updated pl translation. diff -r 9d1aa6fcf426 -r 7238b8b438bc po/pl.po --- a/po/pl.po Sun Feb 15 21:40:21 2009 -0500 +++ b/po/pl.po Mon Feb 16 09:35:21 2009 -0500 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-12 20:36+0100\n" -"PO-Revision-Date: 2008-12-12 20:46+0100\n" +"POT-Creation-Date: 2009-02-06 17:03+0100\n" +"PO-Revision-Date: 2009-02-06 20:23+0100\n" "Last-Translator: Piotr Dr??g \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ #. ...the risk is we catch too much though #. Damned if we do, damned if we dont :-)( -#: ../src/virt-manager.py.in:264 +#: ../src/virt-manager.py.in:284 #, python-format msgid "Unable to initialize GTK: %s" msgstr "Nie mo??na zainicjowa?? GTK: %s" @@ -41,99 +41,138 @@ msgstr "Urz??dzenie d??wi??kowe instalacji dla zdalnej maszyny wirtualnej" #: ../src/virt-manager.schemas.in.h:3 +msgid "Poll cpu stats" +msgstr "Sonda?? statystyk procesora" + +#: ../src/virt-manager.schemas.in.h:4 +msgid "Poll disk i/o stats" +msgstr "Sonda?? statystyk wej??cia/wyj??cia dysku" + +#: ../src/virt-manager.schemas.in.h:5 +msgid "Poll memory usage stats" +msgstr "Sonda?? statystyk u??ycia pami??ci" + +#: ../src/virt-manager.schemas.in.h:6 +msgid "Poll net i/o stats" +msgstr "Sonda?? statystyk wej??cia/wyj??cia sieci" + +#: ../src/virt-manager.schemas.in.h:7 msgid "Show VCPU count in summary" msgstr "Wy??wietl podsumowanie licznika wirtualnych procesor??w" -#: ../src/virt-manager.schemas.in.h:4 +#: ../src/virt-manager.schemas.in.h:8 msgid "Show cpu usage in summary" msgstr "Wy??wietl podsumowanie u??ycia procesora" -#: ../src/virt-manager.schemas.in.h:5 +#: ../src/virt-manager.schemas.in.h:9 msgid "Show disk I/O in summary" msgstr "Wy??wietl podsumowanie wej??cia/wyj??cia dysku" -#: ../src/virt-manager.schemas.in.h:6 +#: ../src/virt-manager.schemas.in.h:10 msgid "Show domain id in summary" msgstr "Wy??wietl podsumowanie identyfikatora domeny" -#: ../src/virt-manager.schemas.in.h:7 +#: ../src/virt-manager.schemas.in.h:11 msgid "Show memory usage in summary" msgstr "Wy??wietl podsumowanie u??ycia pami??ci" -#: ../src/virt-manager.schemas.in.h:8 +#: ../src/virt-manager.schemas.in.h:12 msgid "Show network I/O in summary" msgstr "Wy??wietl podsumowanie wej??cia/wyj??cia sieci" -#: ../src/virt-manager.schemas.in.h:9 +#: ../src/virt-manager.schemas.in.h:13 msgid "Show run state in summary" msgstr "Wy??wietl podsumowanie stanu uruchomienia" -#: ../src/virt-manager.schemas.in.h:10 +#: ../src/virt-manager.schemas.in.h:14 msgid "Show the cpu usage field in the domain list summary view" msgstr "Wy??wietl pole u??ycia procesora w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:11 +#: ../src/virt-manager.schemas.in.h:15 msgid "Show the disk I/O field in the domain list summary view" msgstr "Wy??wietl pole wej??cia/wyj??cia dysku w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:12 +#: ../src/virt-manager.schemas.in.h:16 msgid "Show the domain id field in the domain list summary view" msgstr "Wy??wietl pole identyfikatora domeny w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:13 +#: ../src/virt-manager.schemas.in.h:17 msgid "Show the memory usage field in the domain list summary view" msgstr "Wy??wietl pole u??ycia pami??ci w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:14 +#: ../src/virt-manager.schemas.in.h:18 msgid "Show the network I/O field in the domain list summary view" msgstr "Wy??wietl pole wej??cia/wyj??cia sieci w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:15 +#: ../src/virt-manager.schemas.in.h:19 msgid "Show the run state field in the domain list summary view" msgstr "Wy??wietl pole stanu uruchomienia w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:16 +#: ../src/virt-manager.schemas.in.h:20 msgid "Show the virtual CPU count field in the domain list summary view" msgstr "" "Wy??wietl pole licznika wirtualnych procesor??w w widoku podsumowania listy " "domen" -#: ../src/virt-manager.schemas.in.h:17 +#: ../src/virt-manager.schemas.in.h:21 msgid "The length of the list of URLs" msgstr "D??ugo???? listy URL-i" -#: ../src/virt-manager.schemas.in.h:18 +#: ../src/virt-manager.schemas.in.h:22 msgid "The number of samples to keep in the statistics history" msgstr "Liczba przyk??ad??w przechowywanych w historii statystyk" -#: ../src/virt-manager.schemas.in.h:19 +#: ../src/virt-manager.schemas.in.h:23 msgid "" "The number of urls to keep in the history for the install media address page." msgstr "" "Liczba URL-i przechowywanych w historii strony adresowej no??nika " "instalacyjnego." -#: ../src/virt-manager.schemas.in.h:20 +#: ../src/virt-manager.schemas.in.h:24 msgid "The statistics history length" msgstr "D??ugo???? historii statystyk" -#: ../src/virt-manager.schemas.in.h:21 +#: ../src/virt-manager.schemas.in.h:25 msgid "The statistics update interval" msgstr "Cz??sto???? aktualizacji statystyk" -#: ../src/virt-manager.schemas.in.h:22 +#: ../src/virt-manager.schemas.in.h:26 msgid "The statistics update interval in seconds" msgstr "Cz??sto???? aktualizacji statystyk w sekundach" -#: ../src/virt-manager.schemas.in.h:23 +#: ../src/virt-manager.schemas.in.h:27 msgid "When to grab keyboard input for the console" msgstr "Kiedy przechwyci?? wej??cie klawiatury w konsoli" -#: ../src/virt-manager.schemas.in.h:24 +#: ../src/virt-manager.schemas.in.h:28 msgid "When to pop up a console for a guest" msgstr "Kiedy wy??wietli?? konsol?? go??cia" -#: ../src/virt-manager.schemas.in.h:25 +#: ../src/virt-manager.schemas.in.h:29 +msgid "Whether or not the app will poll VM disk i/o statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki wej??cia/wyj??cia dysku maszyny wirtualnej" + +#: ../src/virt-manager.schemas.in.h:30 +msgid "Whether or not the app will poll VM network i/o statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki wej??cia/wyj??cia sieci maszyny wirtualnej" + +#: ../src/virt-manager.schemas.in.h:31 +msgid "Whether or not the app will poll connection and VM cpu usage statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki u??ycia po????czenia i procesora maszyny " +"wirtualnej" + +#: ../src/virt-manager.schemas.in.h:32 +msgid "" +"Whether or not the app will poll connection and VM memory usage statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki u??ycia po????czenia i pami??ci maszyny " +"wirtualnej" + +#: ../src/virt-manager.schemas.in.h:33 msgid "" "Whether to grab keyboard input for a guest console. 0 = never, 1 = only when " "in full screen mode, 2 = when mouse is over console" @@ -141,15 +180,15 @@ "Kiedy przechwyci?? wej??cie klawiatury w konsoli go??cia. 0 = nigdy, 1 = tylko " "w trybie pe??noekranowym, 2 = kiedy mysz jest nad konsol??" -#: ../src/virt-manager.schemas.in.h:26 +#: ../src/virt-manager.schemas.in.h:34 msgid "Whether to install a sound device for local VMs or not" msgstr "Czy instalowa?? urz??dzenie d??wi??kowe dla lokalnej maszyny wirtualnej" [...3161 lines suppressed...] -#: ../src/vmm-details.glade.h:118 +#: ../src/vmm-details.glade.h:103 msgid "_Take Screenshot" msgstr "_Wykonaj zrzut ekranu" -#: ../src/vmm-details.glade.h:119 ../src/vmm-manager.glade.h:22 +#: ../src/vmm-details.glade.h:104 ../src/vmm-manager.glade.h:22 msgid "_View" msgstr "_Widok" -#: ../src/vmm-details.glade.h:120 -msgid "disk\t" -msgstr "dysk\t" - -#: ../src/vmm-details.glade.h:121 -msgid "insert sound model" -msgstr "wstaw model d??wi??ku" - #: ../src/vmm-host.glade.h:2 msgid "IPv4 configuration" msgstr "Konfiguracja IPv4" @@ -3042,7 +3065,7 @@ msgid "Forwarding:" msgstr "Przekazywanie:" -#: ../src/vmm-host.glade.h:21 +#: ../src/vmm-host.glade.h:21 ../src/vmm-manager.glade.h:10 msgid "Host Details" msgstr "Szczeg????y hosta" @@ -3090,18 +3113,10 @@ msgid "Stop Pool" msgstr "Zatrzymaj pul??" -#: ../src/vmm-host.glade.h:39 -msgid "Storage Pools" -msgstr "Pule pami??ci masowej" - #: ../src/vmm-host.glade.h:40 msgid "Virtual Networks" msgstr "Sieci wirtualne" -#: ../src/vmm-host.glade.h:41 -msgid "Xen" -msgstr "Xen" - #: ../src/vmm-manager.glade.h:1 msgid "Add Connection..." msgstr "Dodaj po????czenie..." @@ -3116,21 +3131,21 @@ "Aktywne maszyny wirtualne\n" "Nieaktywne maszyny wirtualne" -#: ../src/vmm-manager.glade.h:6 -msgid "Connection Details..." -msgstr "Szczeg????y po????czenia..." +#: ../src/vmm-manager.glade.h:5 ../src/vmm-preferences.glade.h:6 +msgid "CPU Usage" +msgstr "U??ycie procesora" #: ../src/vmm-manager.glade.h:7 -msgid "Delete Machine" -msgstr "Usu?? maszyn??" +msgid "Delete Virtual Machine" +msgstr "Usu?? maszyn?? wirtualn??" #: ../src/vmm-manager.glade.h:9 msgid "Domain ID" msgstr "Identyfikator domeny" -#: ../src/vmm-manager.glade.h:10 -msgid "Machine Details..." -msgstr "Szczeg????y maszyny..." +#: ../src/vmm-manager.glade.h:11 ../src/vmm-preferences.glade.h:12 +msgid "Memory Usage" +msgstr "U??ycie pami??ci" #: ../src/vmm-manager.glade.h:13 msgid "Restore a saved machine from a filesystem image" @@ -3141,8 +3156,8 @@ msgstr "Przywr???? zapisan?? maszyn??..." #: ../src/vmm-manager.glade.h:16 -msgid "Virtual CPUs" -msgstr "Wirtualne procesory" +msgid "Virtual Machine Details" +msgstr "Szczeg????y maszyny wirtualnej" #: ../src/vmm-manager.glade.h:19 msgid "_Edit" @@ -3205,56 +3220,48 @@ msgstr "Konsole" #: ../src/vmm-preferences.glade.h:2 -msgid "New VM Preferences" -msgstr "Preferencje nowej maszyny wirtualnej" +msgid "Enable Stats Polling" +msgstr "W????cz sonda?? statystyk" #: ../src/vmm-preferences.glade.h:3 -msgid "Status monitoring" -msgstr "Stan monitorowania" +msgid "New VM" +msgstr "Nowa maszyna wirtualna" #: ../src/vmm-preferences.glade.h:4 -msgid "Auto Console" -msgstr "Automatyczna konsola" +msgid "Stats Options" +msgstr "Opcje statystyk" #: ../src/vmm-preferences.glade.h:5 msgid "Automatically open consoles:" msgstr "Automatycznie otw??rz konsole:" -#: ../src/vmm-preferences.glade.h:6 -msgid "Grab Keyboard" -msgstr "Przechwy?? klawiatur??" - -#: ../src/vmm-preferences.glade.h:7 +#: ../src/vmm-preferences.glade.h:8 msgid "Grab keyboard input:" msgstr "Przechwy?? wej??cie klawiatury:" -#: ../src/vmm-preferences.glade.h:8 -msgid "History Samples" -msgstr "Przyk??ady historii" - #: ../src/vmm-preferences.glade.h:9 msgid "Install Audio Device:" msgstr "Urz??dzenie d??wi??kowe instalacji:" #: ../src/vmm-preferences.glade.h:10 -msgid "Local VM" +msgid "Local virtual machine" msgstr "Lokalna maszyna wirtualna" #: ../src/vmm-preferences.glade.h:11 msgid "Maintain history of" msgstr "Zarz??dzaj histori??" -#: ../src/vmm-preferences.glade.h:12 +#: ../src/vmm-preferences.glade.h:14 msgid "" "Never\n" -"For new domains\n" +"For all new domains\n" "For all domains" msgstr "" "Nigdy\n" -"Dla nowych domen\n" +"Dla wszystkich nowych domen\n" "Dla wszystkich domen" -#: ../src/vmm-preferences.glade.h:15 +#: ../src/vmm-preferences.glade.h:17 msgid "" "Never\n" "When fullscreen\n" @@ -3264,26 +3271,30 @@ "Kiedy jest na pe??nym ekranie\n" "Przy najechaniu mysz??" -#: ../src/vmm-preferences.glade.h:18 +#: ../src/vmm-preferences.glade.h:20 msgid "Preferences" msgstr "Preferencje" -#: ../src/vmm-preferences.glade.h:19 -msgid "Remote VM" +#: ../src/vmm-preferences.glade.h:21 +msgid "Remote virtual machine" msgstr "Zdalna maszyna wirtualna" -#: ../src/vmm-preferences.glade.h:20 -msgid "Status Interval" -msgstr "Cz??sto???? stanu" +#: ../src/vmm-preferences.glade.h:22 +msgid "Stats" +msgstr "Statystyki" -#: ../src/vmm-preferences.glade.h:21 +#: ../src/vmm-preferences.glade.h:23 msgid "Update status every" msgstr "Zaktualizuj stan co" -#: ../src/vmm-preferences.glade.h:22 +#: ../src/vmm-preferences.glade.h:24 +msgid "VM Details" +msgstr "Szczeg????y maszyny wirtualnej" + +#: ../src/vmm-preferences.glade.h:25 msgid "samples" msgstr "przyk??ady" -#: ../src/vmm-preferences.glade.h:23 +#: ../src/vmm-preferences.glade.h:26 msgid "seconds" msgstr "sekundy" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/F-10/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 10 Sep 2008 23:06:21 -0000 1.20 +++ .cvsignore 4 Mar 2009 18:28:23 -0000 1.21 @@ -1 +1 @@ -virt-manager-0.6.0.tar.gz +virt-manager-0.6.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/F-10/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 10 Sep 2008 23:06:21 -0000 1.20 +++ sources 4 Mar 2009 18:28:23 -0000 1.21 @@ -1 +1 @@ -fd0acd111f180a0766b08d5f42cf5468 virt-manager-0.6.0.tar.gz +9c4eeaf447919b425f890b6bff715512 virt-manager-0.6.1.tar.gz Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/F-10/virt-manager.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- virt-manager.spec 7 Dec 2008 21:22:22 -0000 1.39 +++ virt-manager.spec 4 Mar 2009 18:28:24 -0000 1.40 @@ -7,25 +7,17 @@ %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}} Name: virt-manager -Version: 0.6.0 -Release: 5%{_extra_release} +Version: 0.6.1 +Release: 1%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz -Source1: %{name}.pam -Source2: %{name}.console -Patch1: %{name}-%{version}-polkit-root.patch -Patch2: %{name}-%{version}-conn-details-sensitivity.patch -Patch3: %{name}-%{version}-populate-hostinfo-early.patch -Patch4: %{name}-%{version}-update-potfiles.patch -Patch5: %{name}-%{version}-update-translations.patch -Patch6: %{name}-%{version}-multiple-sound-dev.patch -Patch7: %{name}-%{version}-vol-copy-popup.patch -Patch8: %{name}-%{version}-connect-variable-typo.patch -Patch9: %{name}-%{version}-fix-virt-type-desc.patch +Patch1: %{name}-%{version}-update-polish.patch +Patch2: %{name}-%{version}-fix-cadl.patch +Patch3: %{name}-%{version}-fix-stats-prefs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # These two are just the oldest version tested @@ -59,14 +51,16 @@ Requires: librsvg2 # Earlier vte had broken python binding module Requires: vte >= 0.12.2 -# For the consolehelper PAM stuff -Requires: usermode # For online help Requires: scrollkeeper # For console widget Requires: gtk-vnc-python >= 0.3.4 # For local authentication against PolicyKit +%if 0%{?fedora} >= 11 +Requires: PolicyKit-authentication-agent +%else if 0%{?fedora} >= 9 Requires: PolicyKit-gnome +%endif BuildRequires: pygtk2-devel BuildRequires: gtk2-devel @@ -98,12 +92,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 %build %configure @@ -115,15 +103,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la -# Adjust for console-helper magic -mkdir -p $RPM_BUILD_ROOT%{_sbindir} -mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name} -ln -s ../bin/consolehelper $RPM_BUILD_ROOT%{_bindir}/%{name} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d -cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/%{name} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps -cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/%{name} - %find_lang %{name} %clean @@ -161,10 +140,7 @@ %defattr(-,root,root,-) %doc README COPYING COPYING-DOCS AUTHORS ChangeLog NEWS %{_sysconfdir}/gconf/schemas/%{name}.schemas -%config(noreplace) %{_sysconfdir}/pam.d/%{name} -%{_sysconfdir}/security/console.apps/%{name} %{_bindir}/%{name} -%{_sbindir}/%{name} %{_libexecdir}/%{name}-launch %dir %{_libdir}/%{name}/ %{_libdir}/%{name}/* @@ -193,6 +169,13 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog +* Wed Mar 4 2009 Cole Robinson - 0.6.1-1.fc10 +- Update to 0.6.1 release +- Disk and Network VM stats reporting +- VM Migration support +- Support adding sound devices to existing VMs +- Allow specifying device model when adding a network device to an existing VM + * Sun Dec 7 2008 Cole Robinson - 0.6.0-5.fc10 - Fix a spelling error in virt descriptions - Fix gnome-python2-gnome requires regression (bz 474521) --- virt-manager-0.6.0-conn-details-sensitivity.patch DELETED --- --- virt-manager-0.6.0-connect-variable-typo.patch DELETED --- --- virt-manager-0.6.0-fix-virt-type-desc.patch DELETED --- --- virt-manager-0.6.0-multiple-sound-dev.patch DELETED --- --- virt-manager-0.6.0-polkit-root.patch DELETED --- --- virt-manager-0.6.0-populate-hostinfo-early.patch DELETED --- --- virt-manager-0.6.0-update-potfiles.patch DELETED --- --- virt-manager-0.6.0-update-translations.patch DELETED --- --- virt-manager-0.6.0-vol-copy-popup.patch DELETED --- --- virt-manager.console DELETED --- --- virt-manager.pam DELETED --- From hadess at fedoraproject.org Wed Mar 4 18:32:42 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 4 Mar 2009 18:32:42 +0000 (UTC) Subject: rpms/bluez-gnome/devel bluez-gnome.spec,1.76,1.77 Message-ID: <20090304183242.515A770116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez-gnome/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4596 Modified Files: bluez-gnome.spec Log Message: * Wed Mar 04 2009 - Bastien Nocera - 1.8-15 - Make the analyzer installable without the main package Index: bluez-gnome.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- bluez-gnome.spec 24 Feb 2009 05:16:35 -0000 1.76 +++ bluez-gnome.spec 4 Mar 2009 18:32:11 -0000 1.77 @@ -1,6 +1,6 @@ Name: bluez-gnome Version: 1.8 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Bluetooth pairing and control applet Group: Applications/System @@ -63,7 +63,6 @@ %package analyzer Summary: Bluetooth protocol analyzer Group: Applications/Engineering -Requires: %{name} = %{version}-%{release} %description analyzer The bluez-gnome package contains Bluetooth helper applets and tools for @@ -158,6 +157,12 @@ /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi +%post analyzer +update-desktop-database -q + +%postun analyzer +update-desktop-database -q + %files -f bluetooth-manager.lang %defattr(-,root,root,-) %{_bindir}/bluetooth-applet @@ -184,6 +189,9 @@ %{_mandir}/man1/bluetooth-analyzer.1.gz %changelog +* Wed Mar 04 2009 - Bastien Nocera - 1.8-15 +- Make the analyzer installable without the main package + * Mon Feb 23 2009 Fedora Release Engineering - 1.8-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rdieter at fedoraproject.org Wed Mar 4 18:37:47 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 4 Mar 2009 18:37:47 +0000 (UTC) Subject: rpms/lyx/devel lyx.spec,1.87,1.88 Message-ID: <20090304183747.0E12170116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/lyx/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4900 Modified Files: lyx.spec Log Message: * Wed Mar 04 2009 Rex Dieter - 1.6.1-3 - --without-included-boost (f11+) Index: lyx.spec =================================================================== RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- lyx.spec 25 Feb 2009 22:29:44 -0000 1.87 +++ lyx.spec 4 Mar 2009 18:37:16 -0000 1.88 @@ -1,8 +1,12 @@ +%if 0%{?fedora} > 10 +%define _without_included_boost --without-included-boost +%endif + Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.6.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Publishing @@ -19,7 +23,9 @@ BuildRequires: aiksaurus-devel BuildRequires: aspell-devel -#BuildRequires: boost-devel +%if 0%{?_without_included_boost:1} +BuildRequires: boost-devel +%endif BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: python @@ -91,12 +97,13 @@ %build %configure \ + --disable-dependency-tracking \ --disable-rpath \ --enable-build-type=release \ --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ - --disable-dependency-tracking + %{?_without_included_boost} make %{?_smp_mflags} @@ -182,6 +189,9 @@ %changelog +* Wed Mar 04 2009 Rex Dieter - 1.6.1-3 +- --without-included-boost (f11+) + * Wed Feb 25 2009 Fedora Release Engineering - 1.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rdieter at fedoraproject.org Wed Mar 4 18:40:47 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 4 Mar 2009 18:40:47 +0000 (UTC) Subject: rpms/maxima/devel maxima.spec,1.126,1.127 Message-ID: <20090304184047.3DE4470116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/maxima/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5173 Modified Files: maxima.spec Log Message: * Wed Mar 04 2009 Rex Dieter - 5.17.1-7 - respin (sbcl) Index: maxima.spec =================================================================== RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- maxima.spec 27 Feb 2009 20:02:50 -0000 1.126 +++ maxima.spec 4 Mar 2009 18:40:16 -0000 1.127 @@ -3,7 +3,7 @@ Name: maxima Version: 5.17.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -441,6 +441,9 @@ %changelog +* Wed Mar 04 2009 Rex Dieter - 5.17.1-7 +- respin (sbcl) + * Fri Feb 27 2009 Rex Dieter - 5.17.1-6 - ExclusiveArch: s/i386/%%ix86/ From rdieter at fedoraproject.org Wed Mar 4 18:41:25 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 4 Mar 2009 18:41:25 +0000 (UTC) Subject: rpms/sbcl/devel .cvsignore, 1.45, 1.46 sbcl.spec, 1.104, 1.105 sources, 1.46, 1.47 Message-ID: <20090304184125.4C69270116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/sbcl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5236 Modified Files: .cvsignore sbcl.spec sources Log Message: * Wed Mar 04 2009 Rex Dieter - 1.0.26-1 - sbcl-1.0.26 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sbcl/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 3 Feb 2009 14:35:52 -0000 1.45 +++ .cvsignore 4 Mar 2009 18:40:54 -0000 1.46 @@ -1 +1 @@ -sbcl-1.0.25-source.tar.bz2 +sbcl-1.0.26-source.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- sbcl.spec 27 Feb 2009 20:02:07 -0000 1.104 +++ sbcl.spec 4 Mar 2009 18:40:54 -0000 1.105 @@ -12,8 +12,8 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 1.0.25 -Release: 3%{?dist} +Version: 1.0.26 +Release: 1%{?dist} License: BSD Group: Development/Languages @@ -250,6 +250,9 @@ %changelog +* Wed Mar 04 2009 Rex Dieter - 1.0.26-1 +- sbcl-1.0.26 + * Fri Feb 27 2009 Rex Dieter - 1.0.25-3 - ExclusiveArch: s/i386/%%ix86/ Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sbcl/devel/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 3 Feb 2009 14:35:53 -0000 1.46 +++ sources 4 Mar 2009 18:40:55 -0000 1.47 @@ -1 +1 @@ -676571e0b0d6ad63a1716102ad582afe sbcl-1.0.25-source.tar.bz2 +b3550f4aa2db031b4630129dd0995f1b sbcl-1.0.26-source.tar.bz2 From mclasen at fedoraproject.org Wed Mar 4 18:53:01 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Wed, 4 Mar 2009 18:53:01 +0000 (UTC) Subject: rpms/gnome-media/devel gnome-media.spec,1.157,1.158 Message-ID: <20090304185301.8E57E70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-media/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5914 Modified Files: gnome-media.spec Log Message: fix file lists Index: gnome-media.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- gnome-media.spec 4 Mar 2009 18:25:00 -0000 1.157 +++ gnome-media.spec 4 Mar 2009 18:52:31 -0000 1.158 @@ -224,7 +224,7 @@ %doc AUTHORS COPYING NEWS README %config %{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas -%{_datadir}/gnome/autostart/gnome-volume-control-applet.desktop +%{_sysconfdir}/xdg/autostart/gnome-volume-control-applet.desktop %{_datadir}/applications/* %{_datadir}/icons/hicolor/*/apps/* From orion at fedoraproject.org Wed Mar 4 19:04:14 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Wed, 4 Mar 2009 19:04:14 +0000 (UTC) Subject: rpms/kdesvn/devel .cvsignore, 1.27, 1.28 kdesvn.spec, 1.54, 1.55 sources, 1.26, 1.27 Message-ID: <20090304190414.3A48E70116@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/kdesvn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6491 Modified Files: .cvsignore kdesvn.spec sources Log Message: * Wed Mar 4 2009 - Orion Poplawski - 1.2.4-1 - Update to 1.2.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdesvn/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 2 Feb 2009 23:54:11 -0000 1.27 +++ .cvsignore 4 Mar 2009 19:03:43 -0000 1.28 @@ -1 +1 @@ -kdesvn-1.2.3.tar.bz2 +kdesvn-1.2.4.tar.bz2 Index: kdesvn.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdesvn/devel/kdesvn.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- kdesvn.spec 25 Feb 2009 10:52:36 -0000 1.54 +++ kdesvn.spec 4 Mar 2009 19:03:43 -0000 1.55 @@ -1,6 +1,6 @@ Name: kdesvn -Version: 1.2.3 -Release: 2%{?dist} +Version: 1.2.4 +Release: 1%{?dist} Summary: A subversion client for KDE4 with KIO integration Group: Development/Tools @@ -107,6 +107,9 @@ %changelog +* Wed Mar 4 2009 - Orion Poplawski - 1.2.4-1 +- Update to 1.2.4 + * Wed Feb 25 2009 Fedora Release Engineering - 1.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdesvn/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 2 Feb 2009 23:54:12 -0000 1.26 +++ sources 4 Mar 2009 19:03:43 -0000 1.27 @@ -1 +1 @@ -44f2168d72a82736be8266d9060ede75 kdesvn-1.2.3.tar.bz2 +3e8879d61f59aff0d83c9c5472d64aae kdesvn-1.2.4.tar.bz2 From hadess at fedoraproject.org Wed Mar 4 19:08:08 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 4 Mar 2009 19:08:08 +0000 (UTC) Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.111,1.112 Message-ID: <20090304190808.656A970116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-cd-burner/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6770 Modified Files: nautilus-cd-burner.spec Log Message: * Wed Mar 04 2009 - Bastien Nocera - 2.25.3-5 - Remove stupid requires for the -libs sub package (#488433) Index: nautilus-cd-burner.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- nautilus-cd-burner.spec 2 Mar 2009 17:16:42 -0000 1.111 +++ nautilus-cd-burner.spec 4 Mar 2009 19:07:38 -0000 1.112 @@ -66,10 +66,6 @@ %package libs Summary: The libraries used by nautilus-cd-burner Group: Development/Libraries -Requires: gtk2-devel >= %{gtk_version} -Requires: nautilus-devel >= %{nautilus_version} -Requires: pkgconfig -Requires: gtk-doc %description libs The nautilus-cd-burner-libs package contains the libraries applications @@ -161,6 +157,9 @@ %changelog +* Wed Mar 04 2009 - Bastien Nocera - 2.25.3-5 +- Remove stupid requires for the -libs sub package (#488433) + * Mon Mar 02 2009 - Bastien Nocera - 2.25.3-4 - Add missing ldconfig calls for -libs From rdieter at fedoraproject.org Wed Mar 4 19:08:18 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 4 Mar 2009 19:08:18 +0000 (UTC) Subject: rpms/PyQt4/devel PyQt4.spec,1.20,1.21 Message-ID: <20090304190818.C7B9870116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/PyQt4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6799 Modified Files: PyQt4.spec Log Message: * Wed Mar 05 2009 Rex Dieter - 4.4.4-5 - move designer plugins to main/runtime (#487622) Index: PyQt4.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyQt4/devel/PyQt4.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- PyQt4.spec 23 Feb 2009 22:31:33 -0000 1.20 +++ PyQt4.spec 4 Mar 2009 19:07:48 -0000 1.21 @@ -4,7 +4,7 @@ Summary: Python bindings for Qt4 Name: PyQt4 Version: 4.4.4 -Release: 4%{?dist} +Release: 5%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions @@ -111,6 +111,7 @@ %{python_sitearch}/PyQt4/ # fixme? -> sitearch? -- Rex %{python_sitelib}/dbus/mainloop/qt.so +%{_qt4_plugindir}/designer/* %files devel %defattr(-,root,root,-) @@ -118,10 +119,12 @@ %doc examples/ %{_bindir}/* %{_datadir}/sip/PyQt4/ -%{_qt4_plugindir}/designer/* %changelog +* Wed Mar 05 2009 Rex Dieter - 4.4.4-5 +- move designer plugins to main/runtime (#487622) + * Mon Feb 23 2009 Fedora Release Engineering - 4.4.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Wed Mar 4 19:09:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 19:09:25 +0000 Subject: [pkgdb] gnome-audio ownership updated Message-ID: <20090304190925.EA9112082B2@bastion.fedora.phx.redhat.com> Package gnome-audio in Fedora devel was orphaned by hadess To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-audio From hadess at fedoraproject.org Wed Mar 4 19:10:33 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 4 Mar 2009 19:10:33 +0000 (UTC) Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.112,1.113 Message-ID: <20090304191033.803FD70116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-cd-burner/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7036 Modified Files: nautilus-cd-burner.spec Log Message: Up release Index: nautilus-cd-burner.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- nautilus-cd-burner.spec 4 Mar 2009 19:07:38 -0000 1.112 +++ nautilus-cd-burner.spec 4 Mar 2009 19:10:03 -0000 1.113 @@ -12,7 +12,7 @@ Summary: Easy to use CD burning for Gnome Name: nautilus-cd-burner Version: 2.25.3 -Release: 4%{?dist} +Release: 5%{?dist} Source0: http://download.gnome.org/sources/nautilus-cd-burner/2.25/%{name}-%{version}.tar.bz2 License: GPLv2+ Group: User Interface/Desktops From rdieter at fedoraproject.org Wed Mar 4 19:12:31 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 4 Mar 2009 19:12:31 +0000 (UTC) Subject: rpms/kdelibs/devel kdelibs.spec,1.451,1.452 Message-ID: <20090304191231.B9A3E70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7429 Modified Files: kdelibs.spec Log Message: * Wed Mar 05 2009 Rex Dieter - 4.2.1-4 - move designer plugins to main/runtime (#487622) Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.451 retrieving revision 1.452 diff -u -r1.451 -r1.452 --- kdelibs.spec 3 Mar 2009 22:06:11 -0000 1.451 +++ kdelibs.spec 4 Mar 2009 19:12:01 -0000 1.452 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.1 -Release: 2%{?dist} +Release: 4%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -329,7 +329,6 @@ # kdewidgets %exclude %{_kde4_bindir}/makekdewidgets4 %exclude %{_kde4_appsdir}/kdewidgets/ -%exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.* %exclude %{_kde4_appsdir}/cmake/ %{_kde4_configdir}/* %{_datadir}/dbus-1/interfaces/* @@ -345,9 +344,7 @@ %dir %{_kde4_libdir}/kde4/ %{_kde4_libdir}/kde4/*.so %{_kde4_libexecdir}/* -%dir %{_kde4_libdir}/kde4/plugins/ -%{_kde4_libdir}/kde4/plugins/imageformats/ -%{_kde4_libdir}/kde4/plugins/script/ +%{_kde4_libdir}/kde4/plugins/ %{_kde4_sysconfdir}/xdg/menus/*.menu %doc %{_mandir}/man*/* # kdelibs-common comes from here for fedora >= 9 @@ -390,7 +387,6 @@ %{_kde4_appsdir}/kdewidgets/ %{_kde4_includedir}/* %{_kde4_libdir}/kde4/devel/ -%{_kde4_libdir}/kde4/plugins/designer/ %endif %if 0%{?apidocs} @@ -401,6 +397,9 @@ %changelog +* Wed Mar 05 2009 Rex Dieter - 4.2.1-4 +- move designer plugins to main/runtime (#487622) + * Sun Mar 01 2009 Than Ngo - 4.2.1-2 - respin From rdieter at fedoraproject.org Wed Mar 4 19:16:29 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 4 Mar 2009 19:16:29 +0000 (UTC) Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.196,1.197 Message-ID: <20090304191629.4C55D70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8114 Modified Files: kdebase-workspace.spec Log Message: * Wed Mar 04 2009 Rex Dieter - 4.2.1-3 - move designer plugins to main/runtime (#487622) Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- kdebase-workspace.spec 3 Mar 2009 11:58:52 -0000 1.196 +++ kdebase-workspace.spec 4 Mar 2009 19:15:58 -0000 1.197 @@ -8,7 +8,7 @@ Name: kdebase-workspace Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -297,6 +297,8 @@ %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_iconsdir}/oxygen/*/*/* %{_kde4_libdir}/kde4/*.so +%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so +%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so %{_kde4_libexecdir}/* %{_libdir}/strigi/ %{_kde4_libdir}/libkdeinit*.so @@ -320,8 +322,6 @@ %defattr(-,root,root,-) %{_kde4_includedir}/* %{_kde4_libdir}/lib*.so -%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so -%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so # CMake seems to change behaviour between F11's cmake (2.6.3rc5) # and F10's cmake (2.6.2) -- Lorenzo %if 0%{?fedora} > 10 @@ -370,6 +370,9 @@ %changelog +* Wed Mar 04 2009 Rex Dieter - 4.2.1-3 +- move designer plugins to main/runtime (#487622) + * Tue Mar 03 2009 Than Ngo - 4.2.1-2 - respin From lkundrak at fedoraproject.org Wed Mar 4 19:21:52 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Wed, 4 Mar 2009 19:21:52 +0000 (UTC) Subject: rpms/eboard/devel eboard-1.1.1-gcc44.patch, NONE, 1.1 eboard.spec, 1.2, 1.3 Message-ID: <20090304192152.B674570116@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/eboard/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9117 Modified Files: eboard.spec Added Files: eboard-1.1.1-gcc44.patch Log Message: * Wed Mar 3 2009 Lubomir Rintel - 1.1.1-3 - Fix build with GCC 4.4 eboard-1.1.1-gcc44.patch: --- NEW FILE eboard-1.1.1-gcc44.patch --- Fix build with GCC 4.4 Lubomir Rintel --- eboard-1.1.1/ntext.cc.gcc44 2009-03-04 19:11:34.000000000 +0100 +++ eboard-1.1.1/ntext.cc 2009-03-04 20:04:20.000000000 +0100 @@ -244,8 +244,7 @@ return; } - p = strchr(text, '\n'); - if (p!=NULL) { + if (strchr(text, '\n')) { *p = 0; i = strlen(text); nl = new NLine(text, color); Index: eboard.spec =================================================================== RCS file: /cvs/pkgs/rpms/eboard/devel/eboard.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- eboard.spec 24 Feb 2009 13:27:17 -0000 1.2 +++ eboard.spec 4 Mar 2009 19:21:22 -0000 1.3 @@ -1,6 +1,6 @@ Name: eboard Version: 1.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Chess board interface for ICS Group: Amusements/Games @@ -8,6 +8,7 @@ URL: http://eboard.sourceforge.net/ Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.bz2 Source1: eboard.desktop +Patch0: eboard-1.1.1-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libstdc++-devel @@ -24,6 +25,7 @@ %prep %setup -q +%patch0 -p1 -b .gcc44 %build export EXTRAFLAGS=`echo '%{optflags}' | sed 's/ /:/g'` @@ -51,6 +53,9 @@ %{_mandir}/man1/eboard-config.1* %changelog +* Wed Mar 3 2009 Lubomir Rintel - 1.1.1-3 +- Fix build with GCC 4.4 + * Tue Feb 24 2009 Fedora Release Engineering - 1.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From davidz at fedoraproject.org Wed Mar 4 19:29:56 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Wed, 4 Mar 2009 19:29:56 +0000 (UTC) Subject: rpms/DeviceKit-disks/devel devkit-disks-dump-option.patch, NONE, 1.1 devkit-disks-fstab-unmount.patch, NONE, 1.1 DeviceKit-disks.spec, 1.6, 1.7 Message-ID: <20090304192956.0E75570116@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/DeviceKit-disks/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10594 Modified Files: DeviceKit-disks.spec Added Files: devkit-disks-dump-option.patch devkit-disks-fstab-unmount.patch Log Message: * Wed Mar 04 2009 David Zeuthen - 003-3%{?dist} - Add --dump option to devkit-disks(1) to help with debugging - Allow authorized users to unmount /etc/fstab mounts devkit-disks-dump-option.patch: --- NEW FILE devkit-disks-dump-option.patch --- >From 449994908141e6af9f8f6a5909923ff0d2cf1506 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Wed, 04 Mar 2009 19:23:04 +0000 Subject: add a --dump option to devkit-disks(1) --- diff --git a/doc/man/devkit-disks.xml b/doc/man/devkit-disks.xml index 422ae94..de46bae 100644 --- a/doc/man/devkit-disks.xml +++ b/doc/man/devkit-disks.xml @@ -37,6 +37,15 @@ OPTIONS + + + + Dump all information about all devices. Please include this when filing bugs. + + + + + diff --git a/tools/devkit-disks-bash-completion.sh b/tools/devkit-disks-bash-completion.sh index c163e54..656b91d 100644 --- a/tools/devkit-disks-bash-completion.sh +++ b/tools/devkit-disks-bash-completion.sh @@ -17,7 +17,7 @@ __devkit_disks() { elif [ "${COMP_WORDS[$(($COMP_CWORD - 1))]}" = "--unmount" ] ; then COMPREPLY=($(compgen -W "$(devkit-disks --enumerate)" -- $cur)) else - COMPREPLY=($(IFS=: compgen -S' ' -W "--inhibit-polling:--inhibit-all-polling:--enumerate:--monitor:--monitor-detail:--show-info:--help:--mount:--mount-fstype:--mount-options:--unmount:--unmount-options" -- $cur)) + COMPREPLY=($(IFS=: compgen -S' ' -W "--dump:--inhibit-polling:--inhibit-all-polling:--enumerate:--monitor:--monitor-detail:--show-info:--help:--mount:--mount-fstype:--mount-options:--unmount:--unmount-options" -- $cur)) fi } diff --git a/tools/devkit-disks.c b/tools/devkit-disks.c index 5ad1d78..eb4bc9c 100644 --- a/tools/devkit-disks.c +++ b/tools/devkit-disks.c @@ -53,6 +53,7 @@ static DBusGConnection *bus = NULL; static DBusGProxy *disks_proxy = NULL; static GMainLoop *loop; +static gboolean opt_dump = FALSE; static gboolean opt_enumerate = FALSE; static gboolean opt_monitor = FALSE; static gboolean opt_monitor_detail = FALSE; @@ -1239,6 +1240,12 @@ out: /* ---------------------------------------------------------------------------------------------------- */ +static gint +ptr_str_array_compare (const gchar **a, const gchar **b) +{ + return g_strcmp0 (*a, *b); +} + int main (int argc, char **argv) { @@ -1248,6 +1255,7 @@ main (int argc, char **argv) unsigned int n; static GOptionEntry entries [] = { { "enumerate", 0, 0, G_OPTION_ARG_NONE, &opt_enumerate, "Enumerate objects paths for devices", NULL }, + { "dump", 0, 0, G_OPTION_ARG_NONE, &opt_dump, "Dump all information about all devices", NULL }, { "monitor", 0, 0, G_OPTION_ARG_NONE, &opt_monitor, "Monitor activity from the disk daemon", NULL }, { "monitor-detail", 0, 0, G_OPTION_ARG_NONE, &opt_monitor_detail, "Monitor with detail", NULL }, { "show-info", 0, 0, G_OPTION_ARG_STRING, &opt_show_info, "Show information about object path", NULL }, @@ -1319,7 +1327,24 @@ main (int argc, char **argv) G_TYPE_DOUBLE, G_TYPE_INVALID); - if (opt_enumerate) { + if (opt_dump) { + GPtrArray *devices; + if (!org_freedesktop_DeviceKit_Disks_enumerate_devices (disks_proxy, &devices, &error)) { + g_warning ("Couldn't enumerate devices: %s", error->message); + g_error_free (error); + goto out; + } + g_ptr_array_sort (devices, (GCompareFunc) ptr_str_array_compare); + g_print ("========================================================================\n"); + for (n = 0; n < devices->len; n++) { + char *object_path = devices->pdata[n]; + do_show_info (object_path); + g_print ("\n" + "========================================================================\n"); + } + g_ptr_array_foreach (devices, (GFunc) g_free, NULL); + g_ptr_array_free (devices, TRUE); + } else if (opt_enumerate) { GPtrArray *devices; if (!org_freedesktop_DeviceKit_Disks_enumerate_devices (disks_proxy, &devices, &error)) { g_warning ("Couldn't enumerate devices: %s", error->message); -- cgit v0.8.2 devkit-disks-fstab-unmount.patch: --- NEW FILE devkit-disks-fstab-unmount.patch --- >From aeaba20d8675b42d2704b5f32d5e63574017950e Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Wed, 04 Mar 2009 15:11:08 +0000 Subject: allow users with appropriate authorizations to unmount all fstab mounts --- diff --git a/src/devkit-disks-daemon.c b/src/devkit-disks-daemon.c index 4a2582f..cac5440 100644 --- a/src/devkit-disks-daemon.c +++ b/src/devkit-disks-daemon.c @@ -1225,9 +1225,10 @@ devkit_disks_damon_local_check_auth (DevkitDisksDaemon *daemon, uid = (uid_t) -1; if (!polkit_caller_get_uid (pk_caller, &uid) || uid != 0) { - throw_error (context, - DEVKIT_DISKS_ERROR_INHIBITED, - "Daemon is being inhibited"); + if (context != NULL) + throw_error (context, + DEVKIT_DISKS_ERROR_INHIBITED, + "Daemon is being inhibited"); } goto out; } @@ -1245,10 +1246,12 @@ devkit_disks_damon_local_check_auth (DevkitDisksDaemon *daemon, dbus_error_init (&d_error); polkit_dbus_error_generate (pk_action, pk_result, &d_error); - error = NULL; - dbus_set_g_error (&error, &d_error); - dbus_g_method_return_error (context, error); - g_error_free (error); + if (context != NULL) { + error = NULL; + dbus_set_g_error (&error, &d_error); + dbus_g_method_return_error (context, error); + g_error_free (error); + } dbus_error_free (&d_error); } polkit_action_unref (pk_action); diff --git a/src/devkit-disks-device.c b/src/devkit-disks-device.c index bd2ec7f..c0748fc 100644 --- a/src/devkit-disks-device.c +++ b/src/devkit-disks-device.c @@ -4506,8 +4506,21 @@ devkit_disks_device_filesystem_unmount (DevkitDisksDevice *device, * unmount the device as the user */ if (is_device_in_fstab (device, &mount_path)) { + + /* If the user has the filesystem-unmount-others authorization, unmount + * as root. This is such that /etc/fstab mounts without the "user" option + * (or similar) can be unmounted. + */ + if (devkit_disks_damon_local_check_auth (device->priv->daemon, + pk_caller, + "org.freedesktop.devicekit.disks.filesystem-unmount-others", + NULL)) { + snprintf (uid_buf, sizeof uid_buf, "%d", 0); + } else { + snprintf (uid_buf, sizeof uid_buf, "%d", uid); + } + n = 0; - snprintf (uid_buf, sizeof uid_buf, "%d", uid); argv[n++] = PACKAGE_LIBEXEC_DIR "/devkit-disks-helper-fstab-mounter"; if (force_unmount) argv[n++] = "force_unmount"; -- cgit v0.8.2 Index: DeviceKit-disks.spec =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- DeviceKit-disks.spec 3 Mar 2009 21:33:53 -0000 1.6 +++ DeviceKit-disks.spec 4 Mar 2009 19:29:25 -0000 1.7 @@ -11,7 +11,7 @@ Summary: Disk Management Service Name: DeviceKit-disks Version: 003 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary @@ -38,6 +38,8 @@ Conflicts: kernel < 2.6.25 Patch0: devkit-disks-use-devt-to-identify-mounts.patch +Patch1: devkit-disks-dump-option.patch +Patch2: devkit-disks-fstab-unmount.patch %description DeviceKit-disks provides a daemon, D-Bus API and command line tools @@ -57,6 +59,8 @@ %setup -q %patch0 -p1 -b .use-devt-for-mounts +%patch1 -p1 -b .fstab-unmount +%patch2 -p1 -b .dump-option %build %configure @@ -111,6 +115,10 @@ %{_datadir}/gtk-doc/html/devkit-disks/* %changelog +* Wed Mar 04 2009 David Zeuthen - 003-3%{?dist} +- Add --dump option to devkit-disks(1) to help with debugging +- Allow authorized users to unmount /etc/fstab mounts + * Tue Mar 03 2009 David Zeuthen - 003-2%{?dist} - Identify mounts using dev_t, not device files (#488258) From dwalsh at fedoraproject.org Wed Mar 4 19:41:17 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Wed, 4 Mar 2009 19:41:17 +0000 (UTC) Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.52, 1.53 selinux-policy.spec, 1.799, 1.800 Message-ID: <20090304194117.401E270116@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12606 Modified Files: policy-20090105.patch selinux-policy.spec Log Message: * Wed Mar 4 2009 Dan Walsh 3.6.7-2 - Fixes for libvirt policy-20090105.patch: Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- policy-20090105.patch 3 Mar 2009 23:53:42 -0000 1.52 +++ policy-20090105.patch 4 Mar 2009 19:41:16 -0000 1.53 @@ -5643,7 +5643,7 @@ /var/lib/nfs/rpc_pipefs(/.*)? <> diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.7/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2009-01-05 15:39:38.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/kernel/files.if 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/kernel/files.if 2009-03-04 08:43:36.000000000 -0500 @@ -110,6 +110,11 @@ ## # @@ -9914,7 +9914,7 @@ ## diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.6.7/policy/modules/services/avahi.te --- nsaserefpolicy/policy/modules/services/avahi.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/services/avahi.te 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/services/avahi.te 2009-03-04 14:39:26.000000000 -0500 @@ -33,6 +33,7 @@ allow avahi_t self:tcp_socket create_stream_socket_perms; allow avahi_t self:udp_socket create_socket_perms; @@ -14371,7 +14371,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.te serefpolicy-3.6.7/policy/modules/services/kerneloops.te --- nsaserefpolicy/policy/modules/services/kerneloops.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/services/kerneloops.te 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/services/kerneloops.te 2009-03-04 14:40:13.000000000 -0500 @@ -13,6 +13,9 @@ type kerneloops_initrc_exec_t; init_script_file(kerneloops_initrc_exec_t) @@ -14392,6 +14392,14 @@ kernel_read_ring_buffer(kerneloops_t) # Init script handling +@@ -46,6 +52,5 @@ + sysnet_dns_name_resolve(kerneloops_t) + + optional_policy(` +- dbus_system_bus_client(kerneloops_t) +- dbus_connect_system_bus(kerneloops_t) ++ dbus_system_domain(kerneloops_t, kerneloops_exec_t) + ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-3.6.7/policy/modules/services/ktalk.te --- nsaserefpolicy/policy/modules/services/ktalk.te 2009-01-19 11:06:49.000000000 -0500 +++ serefpolicy-3.6.7/policy/modules/services/ktalk.te 2009-03-03 17:11:59.000000000 -0500 @@ -16728,10 +16736,32 @@ +optional_policy(` + prelude_manage_spool(pads_t) +') +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.fc serefpolicy-3.6.7/policy/modules/services/pcscd.fc +--- nsaserefpolicy/policy/modules/services/pcscd.fc 2008-08-07 11:15:11.000000000 -0400 ++++ serefpolicy-3.6.7/policy/modules/services/pcscd.fc 2009-03-04 08:18:35.000000000 -0500 +@@ -1,5 +1,6 @@ + /var/run/pcscd\.comm -s gen_context(system_u:object_r:pcscd_var_run_t,s0) + /var/run/pcscd\.pid -- gen_context(system_u:object_r:pcscd_var_run_t,s0) + /var/run/pcscd\.pub -- gen_context(system_u:object_r:pcscd_var_run_t,s0) ++/var/run/pcscd\.events(/.*)? gen_context(system_u:object_r:pcscd_var_run_t,s0) + + /usr/sbin/pcscd -- gen_context(system_u:object_r:pcscd_exec_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-3.6.7/policy/modules/services/pcscd.te --- nsaserefpolicy/policy/modules/services/pcscd.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/services/pcscd.te 2009-03-03 17:11:59.000000000 -0500 -@@ -57,6 +57,14 @@ ++++ serefpolicy-3.6.7/policy/modules/services/pcscd.te 2009-03-04 08:18:14.000000000 -0500 +@@ -27,9 +27,10 @@ + allow pcscd_t self:unix_dgram_socket create_socket_perms; + allow pcscd_t self:tcp_socket create_stream_socket_perms; + ++manage_dirs_pattern(pcscd_t, pcscd_var_run_t, pcscd_var_run_t) + manage_files_pattern(pcscd_t, pcscd_var_run_t, pcscd_var_run_t) + manage_sock_files_pattern(pcscd_t, pcscd_var_run_t, pcscd_var_run_t) +-files_pid_filetrans(pcscd_t, pcscd_var_run_t, { file sock_file }) ++files_pid_filetrans(pcscd_t, pcscd_var_run_t, { file sock_file dir }) + + corenet_all_recvfrom_unlabeled(pcscd_t) + corenet_all_recvfrom_netlabel(pcscd_t) +@@ -57,6 +58,14 @@ sysnet_dns_name_resolve(pcscd_t) optional_policy(` @@ -22945,7 +22975,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.6.7/policy/modules/services/ssh.te --- nsaserefpolicy/policy/modules/services/ssh.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/services/ssh.te 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/services/ssh.te 2009-03-04 12:12:58.000000000 -0500 @@ -41,6 +41,9 @@ files_tmp_file(sshd_tmp_t) files_poly_parent(sshd_tmp_t) @@ -23016,7 +23046,7 @@ term_use_all_user_ptys(sshd_t) term_setattr_all_user_ptys(sshd_t) term_relabelto_all_user_ptys(sshd_t) -@@ -318,6 +328,13 @@ +@@ -318,16 +328,30 @@ corenet_tcp_bind_xserver_port(sshd_t) corenet_sendrecv_xserver_server_packets(sshd_t) @@ -23030,22 +23060,26 @@ tunable_policy(`ssh_sysadm_login',` # Relabel and access ptys created by sshd # ioctl is necessary for logout() processing for utmp entry and for w to -@@ -331,6 +348,14 @@ - ') - - optional_policy(` -+ kerberos_keytab_template(sshd, sshd_t) + # display the tty. + # some versions of sshd on the new SE Linux require setattr +- userdom_spec_domtrans_all_users(sshd_t) + userdom_signal_all_users(sshd_t) +-',` +') + + userdom_spec_domtrans_unpriv_users(sshd_t) + userdom_signal_unpriv_users(sshd_t) ++ +optional_policy(` -+ xserver_getattr_xauth(sshd_t) ++ kerberos_keytab_template(sshd, sshd_t) +') + +optional_policy(` - daemontools_service_domain(sshd_t, sshd_exec_t) ++ xserver_getattr_xauth(sshd_t) ') -@@ -349,7 +374,11 @@ + optional_policy(` +@@ -349,7 +373,11 @@ ') optional_policy(` @@ -23058,7 +23092,7 @@ unconfined_shell_domtrans(sshd_t) ') -@@ -408,6 +437,8 @@ +@@ -408,6 +436,8 @@ init_use_fds(ssh_keygen_t) init_use_script_ptys(ssh_keygen_t) @@ -23558,7 +23592,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.7/policy/modules/services/virt.te --- nsaserefpolicy/policy/modules/services/virt.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/services/virt.te 2009-03-03 18:39:13.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/services/virt.te 2009-03-04 07:37:30.000000000 -0500 @@ -8,20 +8,18 @@ ## @@ -23658,7 +23692,7 @@ corenet_tcp_bind_vnc_port(virtd_t) corenet_tcp_connect_vnc_port(virtd_t) corenet_tcp_connect_soundd_port(virtd_t) -@@ -107,18 +132,25 @@ +@@ -107,18 +132,31 @@ # Init script handling domain_use_interactive_fds(virtd_t) @@ -23671,7 +23705,14 @@ +files_read_usr_files(virtd_t) files_read_etc_runtime_files(virtd_t) files_search_all(virtd_t) - files_list_kernel_modules(virtd_t) +-files_list_kernel_modules(virtd_t) ++files_read_kernel_modules(virtd_t) ++files_getattr_usr_src_files(virtd_t) ++ ++# Manages /etc/sysconfig/system-config-firewall ++files_manage_etc_files(virtd_t) ++ ++modutils_read_module_deps(virtd_t) fs_list_auto_mountpoints(virtd_t) +fs_getattr_xattr_fs(virtd_t) @@ -23684,7 +23725,7 @@ term_getattr_pty_fs(virtd_t) term_use_ptmx(virtd_t) -@@ -129,7 +161,11 @@ +@@ -129,7 +167,11 @@ logging_send_syslog_msg(virtd_t) @@ -23696,7 +23737,7 @@ tunable_policy(`virt_use_nfs',` fs_manage_nfs_dirs(virtd_t) -@@ -167,22 +203,25 @@ +@@ -167,22 +209,25 @@ dnsmasq_domtrans(virtd_t) dnsmasq_signal(virtd_t) dnsmasq_kill(virtd_t) @@ -23727,7 +23768,7 @@ ') optional_policy(` -@@ -197,6 +236,69 @@ +@@ -197,6 +242,69 @@ xen_stream_connect_xenstore(virtd_t) ') @@ -29385,8 +29426,8 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.7/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/unconfined.te 2009-03-03 17:11:59.000000000 -0500 -@@ -5,36 +5,86 @@ ++++ serefpolicy-3.6.7/policy/modules/system/unconfined.te 2009-03-04 13:46:08.000000000 -0500 +@@ -5,6 +5,35 @@ # # Declarations # @@ -29422,14 +29463,10 @@ # usage in this module of types created by these # calls is not correct, however we dont currently - # have another method to add access to these types --userdom_base_user_template(unconfined) --userdom_manage_home_role(unconfined_r, unconfined_t) --userdom_manage_tmp_role(unconfined_r, unconfined_t) --userdom_manage_tmpfs_role(unconfined_r, unconfined_t) -+userdom_restricted_user_template(unconfined) -+#userdom_common_user_template(unconfined) -+#userdom_xwindows_client_template(unconfined) +@@ -13,28 +42,50 @@ + userdom_manage_home_role(unconfined_r, unconfined_t) + userdom_manage_tmp_role(unconfined_r, unconfined_t) + userdom_manage_tmpfs_role(unconfined_r, unconfined_t) +userdom_execmod_user_home_files(unconfined_t) type unconfined_exec_t; @@ -29480,7 +29517,7 @@ libs_run_ldconfig(unconfined_t, unconfined_r) -@@ -42,26 +92,46 @@ +@@ -42,26 +93,46 @@ logging_run_auditctl(unconfined_t, unconfined_r) mount_run_unconfined(unconfined_t, unconfined_r) @@ -29529,7 +29566,7 @@ ') optional_policy(` -@@ -102,12 +172,24 @@ +@@ -102,12 +173,24 @@ ') optional_policy(` @@ -29554,7 +29591,7 @@ ') optional_policy(` -@@ -119,31 +201,33 @@ +@@ -119,31 +202,33 @@ ') optional_policy(` @@ -29595,7 +29632,7 @@ ') optional_policy(` -@@ -155,36 +239,38 @@ +@@ -155,36 +240,38 @@ ') optional_policy(` @@ -29646,7 +29683,7 @@ ') optional_policy(` -@@ -192,7 +278,7 @@ +@@ -192,7 +279,7 @@ ') optional_policy(` @@ -29655,7 +29692,7 @@ ') optional_policy(` -@@ -204,11 +290,12 @@ +@@ -204,11 +291,12 @@ ') optional_policy(` @@ -29670,7 +29707,7 @@ ') ######################################## -@@ -218,14 +305,61 @@ +@@ -218,14 +306,61 @@ allow unconfined_execmem_t self:process { execstack execmem }; unconfined_domain_noaudit(unconfined_execmem_t) @@ -29748,7 +29785,7 @@ +/dev/shm/mono.* gen_context(system_u:object_r:user_tmpfs_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.7/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/userdomain.if 2009-03-03 18:02:25.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/userdomain.if 2009-03-04 13:47:45.000000000 -0500 @@ -30,8 +30,9 @@ ') @@ -30457,22 +30494,18 @@ ') ####################################### -@@ -722,15 +736,29 @@ +@@ -722,13 +736,26 @@ userdom_base_user_template($1) - userdom_manage_home_role($1_r, $1_t) -+ userdom_change_password_template($1) -+ + userdom_manage_home_role($1_r, $1_usertype) - -- userdom_manage_tmp_role($1_r, $1_t) -- userdom_manage_tmpfs_role($1_r, $1_t) ++ + userdom_manage_tmp_role($1_r, $1_usertype) + userdom_manage_tmpfs_role($1_r, $1_usertype) -- userdom_exec_user_tmp_files($1_t) -- userdom_exec_user_home_content_files($1_t) +- userdom_manage_tmp_role($1_r, $1_t) +- userdom_manage_tmpfs_role($1_r, $1_t) + ifelse(`$1',`unconfined',`',` + gen_tunable(allow_$1_exec_content, true) + @@ -30483,17 +30516,17 @@ + tunable_policy(`allow_$1_exec_content && use_nfs_home_dirs',` + fs_exec_nfs_files($1_usertype) + ') -+ + +- userdom_exec_user_tmp_files($1_t) +- userdom_exec_user_home_content_files($1_t) + tunable_policy(`allow_$1_exec_content && use_samba_home_dirs',` + fs_exec_cifs_files($1_usertype) + ') + ') -- userdom_change_password_template($1) + userdom_change_password_template($1) - ############################## - # -@@ -746,70 +774,72 @@ +@@ -746,70 +773,71 @@ allow $1_t self:context contains; @@ -30513,6 +30546,8 @@ - files_dontaudit_list_default($1_t) - files_dontaudit_read_default_files($1_t) ++ files_dontaudit_list_default($1_usertype) ++ files_dontaudit_read_default_files($1_usertype) # Stat lost+found. - files_getattr_lost_found_dirs($1_t) + files_getattr_lost_found_dirs($1_usertype) @@ -30523,18 +30558,15 @@ - fs_search_auto_mountpoints($1_t) - fs_list_inotifyfs($1_t) - fs_rw_anon_inodefs_files($1_t) -+ files_dontaudit_list_default($1_usertype) -+ files_dontaudit_read_default_files($1_usertype) - -- auth_dontaudit_write_login_records($1_t) + fs_get_all_fs_quotas($1_usertype) + fs_getattr_all_fs($1_usertype) + fs_search_all($1_usertype) + fs_list_inotifyfs($1_usertype) + fs_rw_anon_inodefs_files($1_usertype) + auth_dontaudit_write_login_records($1_t) +- - application_exec_all($1_t) -+ auth_dontaudit_write_login_records($1_t) + auth_rw_cache($1_t) # The library functions always try to open read-write first, @@ -30599,7 +30631,7 @@ ') ') -@@ -846,6 +876,28 @@ +@@ -846,6 +874,28 @@ # Local policy # @@ -30628,7 +30660,7 @@ optional_policy(` loadkeys_run($1_t,$1_r) ') -@@ -876,7 +928,7 @@ +@@ -876,7 +926,7 @@ userdom_restricted_user_template($1) @@ -30637,7 +30669,7 @@ ############################## # -@@ -884,14 +936,19 @@ +@@ -884,14 +934,19 @@ # auth_role($1_r, $1_t) @@ -30662,7 +30694,7 @@ logging_dontaudit_send_audit_msgs($1_t) # Need to to this just so screensaver will work. Should be moved to screensaver domain -@@ -899,28 +956,29 @@ +@@ -899,28 +954,29 @@ selinux_get_enforce_mode($1_t) optional_policy(` @@ -30700,17 +30732,7 @@ ') ') -@@ -931,8 +989,7 @@ - ## - ## - ##

    --## The template for creating a unprivileged user roughly --## equivalent to a regular linux user. -+## The template containing the most basic rules common to all users. - ##

    - ##

    - ## This template creates a user domain, types, and -@@ -954,8 +1011,8 @@ +@@ -954,8 +1010,8 @@ # Declarations # @@ -30720,7 +30742,7 @@ userdom_common_user_template($1) ############################## -@@ -964,11 +1021,12 @@ +@@ -964,11 +1020,12 @@ # # port access is audited even if dac would not have allowed it, so dontaudit it here @@ -30735,7 +30757,7 @@ # cjp: why? files_read_kernel_symbol_table($1_t) -@@ -986,37 +1044,47 @@ +@@ -986,37 +1043,47 @@ ') ') @@ -30797,7 +30819,7 @@ ') ####################################### -@@ -1050,7 +1118,7 @@ +@@ -1050,7 +1117,7 @@ # template(`userdom_admin_user_template',` gen_require(` @@ -30806,7 +30828,7 @@ ') ############################## -@@ -1059,8 +1127,7 @@ +@@ -1059,8 +1126,7 @@ # # Inherit rules for ordinary users. @@ -30816,7 +30838,7 @@ domain_obj_id_change_exemption($1_t) role system_r types $1_t; -@@ -1083,7 +1150,8 @@ +@@ -1083,7 +1149,8 @@ # Skip authentication when pam_rootok is specified. allow $1_t self:passwd rootok; @@ -30826,7 +30848,7 @@ kernel_read_software_raid_state($1_t) kernel_getattr_core_if($1_t) -@@ -1099,6 +1167,7 @@ +@@ -1099,6 +1166,7 @@ kernel_sigstop_unlabeled($1_t) kernel_signull_unlabeled($1_t) kernel_sigchld_unlabeled($1_t) @@ -30834,7 +30856,7 @@ corenet_tcp_bind_generic_port($1_t) # allow setting up tunnels -@@ -1106,8 +1175,6 @@ +@@ -1106,8 +1174,6 @@ dev_getattr_generic_blk_files($1_t) dev_getattr_generic_chr_files($1_t) @@ -30843,7 +30865,7 @@ # Allow MAKEDEV to work dev_create_all_blk_files($1_t) dev_create_all_chr_files($1_t) -@@ -1162,20 +1229,6 @@ +@@ -1162,20 +1228,6 @@ # But presently necessary for installing the file_contexts file. seutil_manage_bin_policy($1_t) @@ -30864,7 +30886,7 @@ optional_policy(` postgresql_unconfined($1_t) ') -@@ -1221,6 +1274,7 @@ +@@ -1221,6 +1273,7 @@ dev_relabel_all_dev_nodes($1) files_create_boot_flag($1) @@ -30872,7 +30894,7 @@ # Necessary for managing /boot/efi fs_manage_dos_files($1) -@@ -1286,11 +1340,15 @@ +@@ -1286,11 +1339,15 @@ interface(`userdom_user_home_content',` gen_require(` type user_home_t; @@ -30888,7 +30910,7 @@ ') ######################################## -@@ -1387,7 +1445,7 @@ +@@ -1387,7 +1444,7 @@ ######################################## ##

    @@ -30897,7 +30919,7 @@ ## ## ## -@@ -1420,6 +1478,14 @@ +@@ -1420,6 +1477,14 @@ allow $1 user_home_dir_t:dir list_dir_perms; files_search_home($1) @@ -30912,7 +30934,7 @@ ') ######################################## -@@ -1435,9 +1501,11 @@ +@@ -1435,9 +1500,11 @@ interface(`userdom_dontaudit_list_user_home_dirs',` gen_require(` type user_home_dir_t; @@ -30924,7 +30946,7 @@ ') ######################################## -@@ -1494,6 +1562,25 @@ +@@ -1494,6 +1561,25 @@ allow $1 user_home_dir_t:dir relabelto; ') @@ -30950,19 +30972,7 @@ ######################################## ## ## Create directories in the home dir root with -@@ -1547,9 +1634,9 @@ - type user_home_dir_t, user_home_t; - ') - -- domain_auto_trans($1, user_home_t, $2) -- allow $1 user_home_dir_t:dir search_dir_perms; - files_search_home($1) -+ allow $1 user_home_dir_t:dir search_dir_perms; -+ domain_auto_trans($1, user_home_t, $2) - ') - - ######################################## -@@ -1568,6 +1655,8 @@ +@@ -1568,6 +1654,8 @@ ') dontaudit $1 user_home_t:dir search_dir_perms; @@ -30971,7 +30981,7 @@ ') ######################################## -@@ -1643,6 +1732,7 @@ +@@ -1643,6 +1731,7 @@ type user_home_dir_t, user_home_t; ') @@ -30979,7 +30989,7 @@ read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t) files_search_home($1) ') -@@ -1741,6 +1831,62 @@ +@@ -1741,6 +1830,62 @@ ######################################## ## @@ -31042,7 +31052,7 @@ ## Execute user home files. ## ## -@@ -1757,14 +1903,6 @@ +@@ -1757,14 +1902,6 @@ files_search_home($1) exec_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t) @@ -31057,7 +31067,7 @@ ') ######################################## -@@ -1787,6 +1925,46 @@ +@@ -1787,6 +1924,46 @@ ######################################## ## @@ -31104,7 +31114,7 @@ ## Create, read, write, and delete files ## in a user home subdirectory. ## -@@ -1799,6 +1977,7 @@ +@@ -1799,6 +1976,7 @@ interface(`userdom_manage_user_home_content_files',` gen_require(` type user_home_dir_t, user_home_t; @@ -31112,135 +31122,16 @@ ') manage_files_pattern($1, user_home_t, user_home_t) -@@ -1921,7 +2100,7 @@ - - ######################################## - ## --## Create objects in a user home directory -+## Create objects in the /root directory - ## with an automatic type transition to - ## a specified private type. - ## -@@ -1941,28 +2120,58 @@ - ## - ## - # --interface(`userdom_user_home_content_filetrans',` -+interface(`userdom_admin_home_dir_filetrans',` - gen_require(` -- type user_home_dir_t, user_home_t; -+ type admin_home_t; - ') - -- filetrans_pattern($1, user_home_t, $2, $3) -- allow $1 user_home_dir_t:dir search_dir_perms; -- files_search_home($1) -+ filetrans_pattern($1, admin_home_t, $2, $3) - ') +@@ -2328,7 +2506,7 @@ ######################################## ## - ## Create objects in a user home directory - ## with an automatic type transition to --## the user home file type. -+## a specified private type. - ## - ## - ## - ## Domain allowed access. - ## - ## --## -+## -+## -+## The type of the object to create. -+## -+## -+## -+## -+## The class of the object to be created. -+## -+## -+# -+interface(`userdom_user_home_content_filetrans',` -+ gen_require(` -+ type user_home_dir_t, user_home_t; -+ ') -+ -+ filetrans_pattern($1, user_home_t, $2, $3) -+ allow $1 user_home_dir_t:dir search_dir_perms; -+ files_search_home($1) -+') -+ -+######################################## -+## -+## Create objects in a user home directory -+## with an automatic type transition to -+## the user home file type. -+## -+## -+## -+## Domain allowed access. -+## -+## -+## - ## - ## The class of the object to be created. - ## -@@ -2336,6 +2545,27 @@ - ## - ## - # -+interface(`userdom_read_user_tmpfs_files',` -+ gen_require(` -+ type user_tmpfs_t; -+ ') -+ -+ read_files_pattern($1, user_tmpfs_t, user_tmpfs_t) -+ read_lnk_files_pattern($1, user_tmpfs_t, user_tmpfs_t) -+ allow $1 user_tmpfs_t:dir list_dir_perms; -+ fs_search_tmpfs($1) -+') -+ -+######################################## -+## +-## Read user tmpfs files. +## Read/Write user tmpfs files. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# - interface(`userdom_rw_user_tmpfs_files',` - gen_require(` - type user_tmpfs_t; -@@ -2709,6 +2939,24 @@ - - ######################################## - ## -+## Send signull to unprivileged user domains. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`userdom_signull_unpriv_users',` -+ gen_require(` -+ attribute unpriv_userdomain; -+ ') -+ -+ allow $1 unpriv_userdomain:process signull; -+') -+ -+######################################## -+## - ## Inherit the file descriptors from unprivileged user domains. ## ## -@@ -2814,7 +3062,43 @@ + ## +@@ -2814,7 +2992,25 @@ type user_tmp_t; ') @@ -31250,24 +31141,6 @@ + +######################################## +## -+## Write all users files in /tmp -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`userdom_write_user_tmp_dirs',` -+ gen_require(` -+ type user_tmp_t; -+ ') -+ -+ write_files_pattern($1, user_tmp_t, user_tmp_t) -+') -+ -+######################################## -+## +## Delete all users files in /tmp +## +## @@ -31285,7 +31158,7 @@ ') ######################################## -@@ -2851,6 +3135,7 @@ +@@ -2851,6 +3047,7 @@ ') read_files_pattern($1,userdomain,userdomain) @@ -31293,32 +31166,7 @@ kernel_search_proc($1) ') -@@ -2965,6 +3250,24 @@ - - ######################################## - ## -+## Manage keys for all user domains. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`userdom_manage_all_users_keys',` -+ gen_require(` -+ attribute userdomain; -+ ') -+ -+ allow $1 userdomain:key manage_key_perms; -+') -+ -+######################################## -+## - ## Send a dbus message to all user domains. - ## - ## -@@ -2981,3 +3284,338 @@ +@@ -2981,3 +3178,462 @@ allow $1 userdomain:dbus send_msg; ') @@ -31549,6 +31397,24 @@ + +######################################## +## ++## Add attrinute admin domain ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`userdom_admin',` ++ gen_require(` ++ attribute admin_userdomain; ++ ') ++ ++ typeattribute $1 admin_userdomain; ++') ++ ++######################################## ++## +## Send a message to unpriv users over a unix domain +## datagram socket. +## @@ -31657,9 +31523,115 @@ + + type_transition $1 user_home_dir_t:$2 user_home_t; +') ++ ++######################################## ++## ++## Create objects in the /root directory ++## with an automatic type transition to ++## a specified private type. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The type of the object to create. ++## ++## ++## ++## ++## The class of the object to be created. ++## ++## ++# ++interface(`userdom_admin_home_dir_filetrans',` ++ gen_require(` ++ type admin_home_t; ++ ') ++ ++ filetrans_pattern($1, admin_home_t, $2, $3) ++') ++ ++######################################## ++## ++## Send signull to unprivileged user domains. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`userdom_signull_unpriv_users',` ++ gen_require(` ++ attribute unpriv_userdomain; ++ ') ++ ++ allow $1 unpriv_userdomain:process signull; ++') ++ ++######################################## ++## ++## Read user tmpfs files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`userdom_read_user_tmpfs_files',` ++ gen_require(` ++ type user_tmpfs_t; ++ ') ++ ++ read_files_pattern($1, user_tmpfs_t, user_tmpfs_t) ++ read_lnk_files_pattern($1, user_tmpfs_t, user_tmpfs_t) ++ allow $1 user_tmpfs_t:dir list_dir_perms; ++ fs_search_tmpfs($1) ++') ++ ++######################################## ++## ++## Write all users files in /tmp ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`userdom_write_user_tmp_dirs',` ++ gen_require(` ++ type user_tmp_t; ++ ') ++ ++ write_files_pattern($1, user_tmp_t, user_tmp_t) ++') ++ ++######################################## ++## ++## Manage keys for all user domains. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`userdom_manage_all_users_keys',` ++ gen_require(` ++ attribute userdomain; ++ ') ++ ++ allow $1 userdomain:key manage_key_perms; ++') ++ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.7/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/userdomain.te 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.7/policy/modules/system/userdomain.te 2009-03-04 13:46:42.000000000 -0500 @@ -8,13 +8,6 @@ ## Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.799 retrieving revision 1.800 diff -u -r1.799 -r1.800 --- selinux-policy.spec 3 Mar 2009 20:10:30 -0000 1.799 +++ selinux-policy.spec 4 Mar 2009 19:41:16 -0000 1.800 @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.6.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -446,6 +446,9 @@ %endif %changelog +* Wed Mar 4 2009 Dan Walsh 3.6.7-2 +- Fixes for libvirt + * Mon Mar 2 2009 Dan Walsh 3.6.7-1 - Update to Latest upstream From spot at fedoraproject.org Wed Mar 4 19:41:30 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 19:41:30 +0000 (UTC) Subject: rpms/srecord/devel .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 srecord.spec, 1.22, 1.23 Message-ID: <20090304194130.6743C70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/srecord/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12520 Modified Files: .cvsignore sources srecord.spec Log Message: 1.47 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/srecord/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 13 Jan 2009 16:23:36 -0000 1.17 +++ .cvsignore 4 Mar 2009 19:41:00 -0000 1.18 @@ -1 +1 @@ -srecord-1.46.tar.gz +srecord-1.47.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/srecord/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 13 Jan 2009 16:23:36 -0000 1.17 +++ sources 4 Mar 2009 19:41:00 -0000 1.18 @@ -1 +1 @@ -41f5bcf4b41d6234dd3103403aa63806 srecord-1.46.tar.gz +5e79cf13292daa5fa8a01c6737d28fc6 srecord-1.47.tar.gz Index: srecord.spec =================================================================== RCS file: /cvs/pkgs/rpms/srecord/devel/srecord.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- srecord.spec 26 Feb 2009 02:45:34 -0000 1.22 +++ srecord.spec 4 Mar 2009 19:41:00 -0000 1.23 @@ -1,6 +1,6 @@ Name: srecord -Version: 1.46 -Release: 3%{?dist} +Version: 1.47 +Release: 1%{?dist} Summary: Manipulate EPROM load files Group: Development/Tools @@ -68,6 +68,9 @@ %changelog +* Wed Mar 4 2009 Tom "spot" Callaway - 1.47-1 +- update to 1.47 + * Wed Feb 25 2009 Fedora Release Engineering - 1.46-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Wed Mar 4 19:44:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 19:44:17 +0000 Subject: [pkgdb] python-simpletal ownership updated Message-ID: <20090304194456.E9A822082B2@bastion.fedora.phx.redhat.com> Package python-simpletal in Fedora devel is now owned by thm To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-simpletal From chitlesh at fedoraproject.org Wed Mar 4 20:01:32 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Wed, 4 Mar 2009 20:01:32 +0000 (UTC) Subject: rpms/perl-Verilog/F-9 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 perl-Verilog.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090304200132.26ED070116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/perl-Verilog/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16478/F-9 Modified Files: .cvsignore import.log perl-Verilog.spec sources Log Message: 3.120 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Jan 2009 21:24:41 -0000 1.3 +++ .cvsignore 4 Mar 2009 20:01:01 -0000 1.4 @@ -1 +1 @@ -Verilog-Perl-3.110.tar.gz +Verilog-Perl-3.120.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/F-9/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 28 Jan 2009 21:24:41 -0000 1.2 +++ import.log 4 Mar 2009 20:01:01 -0000 1.3 @@ -1,2 +1,3 @@ perl-Verilog-3_100-1_fc10:F-9:perl-Verilog-3.100-1.fc10.src.rpm:1231351418 perl-Verilog-3_110-1_fc10:F-9:perl-Verilog-3.110-1.fc10.src.rpm:1233177799 +perl-Verilog-3_120-1_fc10:F-9:perl-Verilog-3.120-1.fc10.src.rpm:1236196667 Index: perl-Verilog.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/F-9/perl-Verilog.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Verilog.spec 28 Jan 2009 21:24:41 -0000 1.2 +++ perl-Verilog.spec 4 Mar 2009 20:01:01 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Verilog -Version: 3.110 +Version: 3.120 Release: 1%{?dist} Summary: Verilog parsing routines @@ -65,6 +65,12 @@ %changelog +* Wed Mar 04 2009 Chitlesh Goorah 3.120-1 +- upstream v3.120 + +* Thu Feb 26 2009 Fedora Release Engineering - 3.110-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Jan 28 2009 Chitlesh Goorah 3.110-1 - upstream v3.110 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Jan 2009 21:24:41 -0000 1.3 +++ sources 4 Mar 2009 20:01:01 -0000 1.4 @@ -1 +1 @@ -5f5b339d0c73c4e000cffd50a8fd47a2 Verilog-Perl-3.110.tar.gz +eb97995bd610f9c2fce40e9c7056b547 Verilog-Perl-3.120.tar.gz From hadess at fedoraproject.org Wed Mar 4 20:05:19 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 4 Mar 2009 20:05:19 +0000 (UTC) Subject: rpms/bluez/devel bluez.spec,1.42,1.43 Message-ID: <20090304200519.41C2870116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17199 Modified Files: bluez.spec Log Message: * Wed Mar 04 2009 - Bastien Nocera - 4.32-2 - Own /usr/lib*/bluetooth and children (#474632) Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- bluez.spec 2 Mar 2009 06:55:39 -0000 1.42 +++ bluez.spec 4 Mar 2009 20:04:48 -0000 1.43 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez Version: 4.32 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz @@ -156,7 +156,7 @@ %config(noreplace) %{_sysconfdir}/bluetooth/* %config(noreplace) %{_sysconfdir}/sysconfig/* %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf -%{_libdir}/bluetooth/plugins/*.so +%{_libdir}/bluetooth/ /lib/udev/bluetooth_serial %{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules /etc/rc.d/init.d/* @@ -187,6 +187,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Wed Mar 04 2009 - Bastien Nocera - 4.32-2 +- Own /usr/lib*/bluetooth and children (#474632) + * Mon Mar 2 2009 Lennart Poettering - 4.32-1 - Update to 4.32 From chitlesh at fedoraproject.org Wed Mar 4 20:07:55 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Wed, 4 Mar 2009 20:07:55 +0000 (UTC) Subject: rpms/perl-Verilog/F-10 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 perl-Verilog.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090304200755.709AF70116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/perl-Verilog/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18092/F-10 Modified Files: .cvsignore import.log perl-Verilog.spec sources Log Message: 3.120 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Jan 2009 21:26:02 -0000 1.3 +++ .cvsignore 4 Mar 2009 20:07:24 -0000 1.4 @@ -1 +1 @@ -Verilog-Perl-3.110.tar.gz +Verilog-Perl-3.120.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 28 Jan 2009 21:26:02 -0000 1.2 +++ import.log 4 Mar 2009 20:07:24 -0000 1.3 @@ -1,2 +1,3 @@ perl-Verilog-3_100-1_fc10:F-10:perl-Verilog-3.100-1.fc10.src.rpm:1231351547 perl-Verilog-3_110-1_fc10:F-10:perl-Verilog-3.110-1.fc10.src.rpm:1233177883 +perl-Verilog-3_120-1_fc10:F-10:perl-Verilog-3.120-1.fc10.src.rpm:1236197127 Index: perl-Verilog.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/perl-Verilog.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Verilog.spec 28 Jan 2009 21:26:02 -0000 1.2 +++ perl-Verilog.spec 4 Mar 2009 20:07:24 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Verilog -Version: 3.110 +Version: 3.120 Release: 1%{?dist} Summary: Verilog parsing routines @@ -65,6 +65,12 @@ %changelog +* Wed Mar 04 2009 Chitlesh Goorah 3.120-1 +- upstream v3.120 + +* Thu Feb 26 2009 Fedora Release Engineering - 3.110-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Jan 28 2009 Chitlesh Goorah 3.110-1 - upstream v3.110 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Jan 2009 21:26:02 -0000 1.3 +++ sources 4 Mar 2009 20:07:24 -0000 1.4 @@ -1 +1 @@ -5f5b339d0c73c4e000cffd50a8fd47a2 Verilog-Perl-3.110.tar.gz +eb97995bd610f9c2fce40e9c7056b547 Verilog-Perl-3.120.tar.gz From hadess at fedoraproject.org Wed Mar 4 20:08:21 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 4 Mar 2009 20:08:21 +0000 (UTC) Subject: rpms/bluez-gnome/devel bluez-gnome.spec,1.77,1.78 Message-ID: <20090304200821.BA98D70116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez-gnome/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18192 Modified Files: bluez-gnome.spec Log Message: * Wed Mar 04 2009 - Bastien Nocera - 1.8-16 - Fix unowned directory (#474633) Index: bluez-gnome.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- bluez-gnome.spec 4 Mar 2009 18:32:11 -0000 1.77 +++ bluez-gnome.spec 4 Mar 2009 20:07:51 -0000 1.78 @@ -1,6 +1,6 @@ Name: bluez-gnome Version: 1.8 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Bluetooth pairing and control applet Group: Applications/System @@ -175,7 +175,7 @@ %{_datadir}/applications/bluetooth-properties.desktop %{_datadir}/mime/packages/bluetooth-manager.xml %{_datadir}/icons/hicolor/*/apps/* -%{_datadir}/bluez-gnome/pin-code-database.txt +%{_datadir}/bluez-gnome/ %{_mandir}/man1/bluetooth-applet.1.gz %{_mandir}/man1/bluetooth-properties.1.gz %{_mandir}/man1/bluetooth-wizard.1.gz @@ -189,6 +189,9 @@ %{_mandir}/man1/bluetooth-analyzer.1.gz %changelog +* Wed Mar 04 2009 - Bastien Nocera - 1.8-16 +- Fix unowned directory (#474633) + * Wed Mar 04 2009 - Bastien Nocera - 1.8-15 - Make the analyzer installable without the main package From chitlesh at fedoraproject.org Wed Mar 4 20:08:42 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Wed, 4 Mar 2009 20:08:42 +0000 (UTC) Subject: rpms/perl-SystemC-Vregs/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 perl-SystemC-Vregs.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090304200842.D047A70116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/perl-SystemC-Vregs/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18498/F-9 Modified Files: .cvsignore import.log perl-SystemC-Vregs.spec sources Log Message: 1.462 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Feb 2009 21:09:33 -0000 1.2 +++ .cvsignore 4 Mar 2009 20:08:12 -0000 1.3 @@ -1 +1 @@ -SystemC-Vregs-1.461.tar.gz +SystemC-Vregs-1.462.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 Feb 2009 21:09:33 -0000 1.1 +++ import.log 4 Mar 2009 20:08:12 -0000 1.2 @@ -1 +1,2 @@ perl-SystemC-Vregs-1_461-1_fc10:F-9:perl-SystemC-Vregs-1.461-1.fc10.src.rpm:1235509667 +perl-SystemC-Vregs-1_462-1_fc10:F-9:perl-SystemC-Vregs-1.462-1.fc10.src.rpm:1236197161 Index: perl-SystemC-Vregs.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/F-9/perl-SystemC-Vregs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-SystemC-Vregs.spec 24 Feb 2009 21:09:33 -0000 1.1 +++ perl-SystemC-Vregs.spec 4 Mar 2009 20:08:12 -0000 1.2 @@ -11,7 +11,7 @@ %endif Name: perl-SystemC-Vregs -Version: 1.461 +Version: 1.462 Release: 1%{?dist} Summary: Utility routines used by vregs @@ -102,6 +102,9 @@ %changelog +* Wed Mar 04 2009 Chitlesh GOORAH 1.462-1 +- new upstream release + * Fri Jan 09 2009 Chitlesh GOORAH 1.461-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Feb 2009 21:09:33 -0000 1.2 +++ sources 4 Mar 2009 20:08:12 -0000 1.3 @@ -1 +1 @@ -1ff3fbb95a8c5beb92bbfab855f9aa55 SystemC-Vregs-1.461.tar.gz +5af00bba32fdffe7f6ddb99c9bddafb7 SystemC-Vregs-1.462.tar.gz From rdieter at fedoraproject.org Wed Mar 4 20:09:16 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 4 Mar 2009 20:09:16 +0000 (UTC) Subject: rpms/qt/F-10 .cvsignore, 1.45, 1.46 qt-copy-patches-svn_checkout.sh, 1.2, 1.3 qt.spec, 1.220, 1.221 sources, 1.46, 1.47 Message-ID: <20090304200916.B565170116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18888 Modified Files: .cvsignore qt-copy-patches-svn_checkout.sh qt.spec sources Log Message: * Wed Mar 04 2009 Rex Dieter - 4.4.3-15 - move designer plugins to runtime (#487622) - qt-copy-patches-20090304 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-10/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 29 Jan 2009 19:47:56 -0000 1.45 +++ .cvsignore 4 Mar 2009 20:08:46 -0000 1.46 @@ -1,4 +1,4 @@ hi128-app-qt4-logo.png hi48-app-qt4-logo.png qt-x11-opensource-src-4.4.3.tar.bz2 -qt-copy-patches-20090129svn.tar.bz2 +qt-copy-patches-20090304svn.tar.bz2 Index: qt-copy-patches-svn_checkout.sh =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-10/qt-copy-patches-svn_checkout.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qt-copy-patches-svn_checkout.sh 4 Apr 2008 19:55:19 -0000 1.2 +++ qt-copy-patches-svn_checkout.sh 4 Mar 2009 20:08:46 -0000 1.3 @@ -6,9 +6,11 @@ set -x rm -rf $EXPORT_DIR -# app -svn export --non-recursive svn://anonsvn.kde.org/home/kde/trunk/qt-copy $EXPORT_DIR/ -svn export svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches $EXPORT_DIR/patches +# trunk tracking qt-4.5 now +SVN_ROOT=svn://anonsvn.kde.org/home/kde/branches/qt/4.4 + +svn export --non-recursive $SVN_ROOT $EXPORT_DIR/ +svn export $SVN_ROOT/patches $EXPORT_DIR/patches pushd $EXPORT_DIR rm -f ../qt-copy-patches-${DATE}svn.tar.bz2 Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-10/qt.spec,v retrieving revision 1.220 retrieving revision 1.221 diff -u -r1.220 -r1.221 --- qt.spec 29 Jan 2009 19:47:56 -0000 1.220 +++ qt.spec 4 Mar 2009 20:08:46 -0000 1.221 @@ -9,7 +9,7 @@ Name: qt4 %endif Version: 4.4.3 -Release: 14%{?dist} +Release: 15%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 with exceptions or GPLv2 with exceptions @@ -40,7 +40,7 @@ Patch10: qt-x11-opensource-src-4.4.3-im.patch ## qt-copy patches -%define qt_copy 20090129 +%define qt_copy 20090304 Source1: qt-copy-patches-svn_checkout.sh %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2} %{?qt_copy:Provides: qt-copy = %{qt_copy}} @@ -622,7 +622,6 @@ %{_qt4_libdir}/libQtSvg.so.* %{?webkit:%{_qt4_libdir}/libQtWebKit.so.*} %{_qt4_plugindir}/* -%exclude %{_qt4_plugindir}/designer %exclude %{_qt4_plugindir}/sqldrivers %if "%{_qt4_bindir}" != "%{_bindir}" %{_bindir}/assistant* @@ -689,7 +688,6 @@ %{_libdir}/pkgconfig/*.pc # Qt designer %{_qt4_bindir}/designer* -%{_qt4_plugindir}/designer/ %{_datadir}/applications/*designer*.desktop # Qt Linguist %{_qt4_bindir}/linguist* @@ -734,6 +732,10 @@ %changelog +* Wed Mar 04 2009 Rex Dieter - 4.4.3-15 +- move designer plugins to runtime (#487622) +- qt-copy-patches-20090304 + * Thu Jan 29 2009 Rex Dieter - 4.4.3-14 - qt-copy-patches-20090129 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-10/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 29 Jan 2009 19:47:56 -0000 1.46 +++ sources 4 Mar 2009 20:08:46 -0000 1.47 @@ -1,4 +1,4 @@ d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png 6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png 00e00c6324d342a7b0d8653112b4f08c qt-x11-opensource-src-4.4.3.tar.bz2 -9c2c9930560dddd4713aa99af3a5199f qt-copy-patches-20090129svn.tar.bz2 +b91571d22a32437c865ee4848829bebc qt-copy-patches-20090304svn.tar.bz2 From chitlesh at fedoraproject.org Wed Mar 4 20:09:31 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Wed, 4 Mar 2009 20:09:31 +0000 (UTC) Subject: rpms/perl-Verilog/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 perl-Verilog.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090304200931.449EA70116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/perl-Verilog/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19053/EL-5 Modified Files: .cvsignore import.log perl-Verilog.spec sources Log Message: 3.120 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Jan 2009 18:08:35 -0000 1.2 +++ .cvsignore 4 Mar 2009 20:09:00 -0000 1.3 @@ -1 +1 @@ -Verilog-Perl-3.100.tar.gz +Verilog-Perl-3.120.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/EL-5/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jan 2009 18:08:35 -0000 1.1 +++ import.log 4 Mar 2009 20:09:00 -0000 1.2 @@ -1 +1,2 @@ perl-Verilog-3_100-1_fc10:EL-5:perl-Verilog-3.100-1.fc10.src.rpm:1231351639 +perl-Verilog-3_120-1_fc10:EL-5:perl-Verilog-3.120-1.fc10.src.rpm:1236197224 Index: perl-Verilog.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/EL-5/perl-Verilog.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Verilog.spec 7 Jan 2009 18:08:35 -0000 1.1 +++ perl-Verilog.spec 4 Mar 2009 20:09:01 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Verilog -Version: 3.100 +Version: 3.120 Release: 1%{?dist} Summary: Verilog parsing routines @@ -65,6 +65,15 @@ %changelog +* Wed Mar 04 2009 Chitlesh Goorah 3.120-1 +- upstream v3.120 + +* Thu Feb 26 2009 Fedora Release Engineering - 3.110-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jan 28 2009 Chitlesh Goorah 3.110-1 +- upstream v3.110 + * Sat Jan 03 2009 Chitlesh Goorah 3.100-1 - upstream v3.100 - removed patch for rawhide's bison Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Jan 2009 18:08:35 -0000 1.2 +++ sources 4 Mar 2009 20:09:01 -0000 1.3 @@ -1 +1 @@ -d4bf1748258c6df43db91c74a1fc9268 Verilog-Perl-3.100.tar.gz +eb97995bd610f9c2fce40e9c7056b547 Verilog-Perl-3.120.tar.gz From chitlesh at fedoraproject.org Wed Mar 4 20:09:34 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Wed, 4 Mar 2009 20:09:34 +0000 (UTC) Subject: rpms/perl-Verilog-Readmem/F-9 import.log, NONE, 1.1 perl-Verilog-Readmem.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304200934.2A1FB70116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/perl-Verilog-Readmem/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19088/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-Verilog-Readmem.spec Log Message: 0.04 --- NEW FILE import.log --- perl-Verilog-Readmem-0_04-1_fc10:F-9:perl-Verilog-Readmem-0.04-1.fc10.src.rpm:1236197218 --- NEW FILE perl-Verilog-Readmem.spec --- Name: perl-Verilog-Readmem Version: 0.04 Release: 1%{?dist} Summary: Parse Verilog $readmemh or $readmemb text file License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Verilog-Readmem/ Source0: http://www.cpan.org/authors/id/G/GS/GSULLIVAN/Verilog-Readmem-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The Verilog Hardware Description Language (HDL) provides a convenient way to load a memory during logic simulation. The $readmemh() and $readmemb() system tasks are used in the HDL source code to import the contents of a text file into a memory variable. %prep %setup -q -n Verilog-Readmem-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README examples/ %dir %{perl_vendorlib}/Verilog/ %{perl_vendorlib}/Verilog/Readmem.pm %{_mandir}/man3/* %changelog * Tue Feb 24 2009 Chitlesh GOORAH - 0.04-1 - new upstream release * Sun Dec 14 2008 Chitlesh GOORAH - 0.02-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog-Readmem/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:21:52 -0000 1.1 +++ .cvsignore 4 Mar 2009 20:09:03 -0000 1.2 @@ -0,0 +1 @@ +Verilog-Readmem-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog-Readmem/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:21:52 -0000 1.1 +++ sources 4 Mar 2009 20:09:03 -0000 1.2 @@ -0,0 +1 @@ +d4475183debbe6fe0f1e04d4c93b73d4 Verilog-Readmem-0.04.tar.gz From chitlesh at fedoraproject.org Wed Mar 4 20:09:57 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Wed, 4 Mar 2009 20:09:57 +0000 (UTC) Subject: rpms/perl-SystemC-Vregs/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 perl-SystemC-Vregs.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090304200957.7679170116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/perl-SystemC-Vregs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19281/F-10 Modified Files: .cvsignore import.log perl-SystemC-Vregs.spec sources Log Message: 1.462 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Feb 2009 21:18:26 -0000 1.2 +++ .cvsignore 4 Mar 2009 20:09:27 -0000 1.3 @@ -1 +1 @@ -SystemC-Vregs-1.461.tar.gz +SystemC-Vregs-1.462.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 Feb 2009 21:18:26 -0000 1.1 +++ import.log 4 Mar 2009 20:09:27 -0000 1.2 @@ -1 +1,2 @@ perl-SystemC-Vregs-1_461-1_fc10:F-10:perl-SystemC-Vregs-1.461-1.fc10.src.rpm:1235509757 +perl-SystemC-Vregs-1_462-1_fc10:F-10:perl-SystemC-Vregs-1.462-1.fc10.src.rpm:1236197262 Index: perl-SystemC-Vregs.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/F-10/perl-SystemC-Vregs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-SystemC-Vregs.spec 24 Feb 2009 21:18:26 -0000 1.1 +++ perl-SystemC-Vregs.spec 4 Mar 2009 20:09:27 -0000 1.2 @@ -11,7 +11,7 @@ %endif Name: perl-SystemC-Vregs -Version: 1.461 +Version: 1.462 Release: 1%{?dist} Summary: Utility routines used by vregs @@ -102,6 +102,9 @@ %changelog +* Wed Mar 04 2009 Chitlesh GOORAH 1.462-1 +- new upstream release + * Fri Jan 09 2009 Chitlesh GOORAH 1.461-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Feb 2009 21:18:26 -0000 1.2 +++ sources 4 Mar 2009 20:09:27 -0000 1.3 @@ -1 +1 @@ -1ff3fbb95a8c5beb92bbfab855f9aa55 SystemC-Vregs-1.461.tar.gz +5af00bba32fdffe7f6ddb99c9bddafb7 SystemC-Vregs-1.462.tar.gz From chitlesh at fedoraproject.org Wed Mar 4 20:11:12 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Wed, 4 Mar 2009 20:11:12 +0000 (UTC) Subject: rpms/perl-Verilog/devel .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 perl-Verilog.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20090304201112.5DE9970116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/perl-Verilog/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20075/devel Modified Files: .cvsignore import.log perl-Verilog.spec sources Log Message: 3.120 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Jan 2009 21:28:09 -0000 1.3 +++ .cvsignore 4 Mar 2009 20:10:41 -0000 1.4 @@ -1 +1 @@ -Verilog-Perl-3.110.tar.gz +Verilog-Perl-3.120.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 28 Jan 2009 21:28:10 -0000 1.2 +++ import.log 4 Mar 2009 20:10:41 -0000 1.3 @@ -1,2 +1,3 @@ perl-Verilog-3_100-1_fc10:HEAD:perl-Verilog-3.100-1.fc10.src.rpm:1231351758 perl-Verilog-3_110-1_fc10:HEAD:perl-Verilog-3.110-1.fc10.src.rpm:1233177966 +perl-Verilog-3_120-1_fc10:HEAD:perl-Verilog-3.120-1.fc10.src.rpm:1236197317 Index: perl-Verilog.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/perl-Verilog.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Verilog.spec 27 Feb 2009 04:14:25 -0000 1.3 +++ perl-Verilog.spec 4 Mar 2009 20:10:41 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Verilog -Version: 3.110 -Release: 2%{?dist} +Version: 3.120 +Release: 1%{?dist} Summary: Verilog parsing routines License: LGPL+ or Artistic @@ -65,6 +65,9 @@ %changelog +* Wed Mar 04 2009 Chitlesh Goorah 3.120-1 +- upstream v3.120 + * Thu Feb 26 2009 Fedora Release Engineering - 3.110-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Jan 2009 21:28:10 -0000 1.3 +++ sources 4 Mar 2009 20:10:41 -0000 1.4 @@ -1 +1 @@ -5f5b339d0c73c4e000cffd50a8fd47a2 Verilog-Perl-3.110.tar.gz +eb97995bd610f9c2fce40e9c7056b547 Verilog-Perl-3.120.tar.gz From chitlesh at fedoraproject.org Wed Mar 4 20:11:14 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Wed, 4 Mar 2009 20:11:14 +0000 (UTC) Subject: rpms/perl-Verilog-Readmem/F-10 import.log, NONE, 1.1 perl-Verilog-Readmem.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304201114.B5F0970116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/perl-Verilog-Readmem/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20119/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-Verilog-Readmem.spec Log Message: 0.04 --- NEW FILE import.log --- perl-Verilog-Readmem-0_04-1_fc10:F-10:perl-Verilog-Readmem-0.04-1.fc10.src.rpm:1236197333 --- NEW FILE perl-Verilog-Readmem.spec --- Name: perl-Verilog-Readmem Version: 0.04 Release: 1%{?dist} Summary: Parse Verilog $readmemh or $readmemb text file License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Verilog-Readmem/ Source0: http://www.cpan.org/authors/id/G/GS/GSULLIVAN/Verilog-Readmem-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The Verilog Hardware Description Language (HDL) provides a convenient way to load a memory during logic simulation. The $readmemh() and $readmemb() system tasks are used in the HDL source code to import the contents of a text file into a memory variable. %prep %setup -q -n Verilog-Readmem-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README examples/ %dir %{perl_vendorlib}/Verilog/ %{perl_vendorlib}/Verilog/Readmem.pm %{_mandir}/man3/* %changelog * Tue Feb 24 2009 Chitlesh GOORAH - 0.04-1 - new upstream release * Sun Dec 14 2008 Chitlesh GOORAH - 0.02-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog-Readmem/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:21:52 -0000 1.1 +++ .cvsignore 4 Mar 2009 20:10:44 -0000 1.2 @@ -0,0 +1 @@ +Verilog-Readmem-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog-Readmem/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:21:52 -0000 1.1 +++ sources 4 Mar 2009 20:10:44 -0000 1.2 @@ -0,0 +1 @@ +d4475183debbe6fe0f1e04d4c93b73d4 Verilog-Readmem-0.04.tar.gz From chitlesh at fedoraproject.org Wed Mar 4 20:15:27 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Wed, 4 Mar 2009 20:15:27 +0000 (UTC) Subject: rpms/perl-SystemC-Vregs/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 perl-SystemC-Vregs.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090304201527.AA62B70116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/perl-SystemC-Vregs/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21184/EL-5 Modified Files: .cvsignore import.log perl-SystemC-Vregs.spec sources Log Message: 1.462 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Feb 2009 21:29:05 -0000 1.2 +++ .cvsignore 4 Mar 2009 20:14:57 -0000 1.3 @@ -1 +1 @@ -SystemC-Vregs-1.461.tar.gz +SystemC-Vregs-1.462.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/EL-5/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 Feb 2009 21:29:05 -0000 1.1 +++ import.log 4 Mar 2009 20:14:57 -0000 1.2 @@ -1 +1,2 @@ perl-SystemC-Vregs-1_461-1_fc10:EL-5:perl-SystemC-Vregs-1.461-1.fc10.src.rpm:1235510766 +perl-SystemC-Vregs-1_462-1_fc10:EL-5:perl-SystemC-Vregs-1.462-1.fc10.src.rpm:1236197343 Index: perl-SystemC-Vregs.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/EL-5/perl-SystemC-Vregs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-SystemC-Vregs.spec 24 Feb 2009 21:29:05 -0000 1.1 +++ perl-SystemC-Vregs.spec 4 Mar 2009 20:14:57 -0000 1.2 @@ -11,7 +11,7 @@ %endif Name: perl-SystemC-Vregs -Version: 1.461 +Version: 1.462 Release: 1%{?dist} Summary: Utility routines used by vregs @@ -102,6 +102,9 @@ %changelog +* Wed Mar 04 2009 Chitlesh GOORAH 1.462-1 +- new upstream release + * Fri Jan 09 2009 Chitlesh GOORAH 1.461-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Feb 2009 21:29:05 -0000 1.2 +++ sources 4 Mar 2009 20:14:57 -0000 1.3 @@ -1 +1 @@ -1ff3fbb95a8c5beb92bbfab855f9aa55 SystemC-Vregs-1.461.tar.gz +5af00bba32fdffe7f6ddb99c9bddafb7 SystemC-Vregs-1.462.tar.gz From chitlesh at fedoraproject.org Wed Mar 4 20:16:02 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Wed, 4 Mar 2009 20:16:02 +0000 (UTC) Subject: rpms/perl-Verilog-Readmem/EL-5 import.log, NONE, 1.1 perl-Verilog-Readmem.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304201602.265DC70116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/perl-Verilog-Readmem/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21578/EL-5 Modified Files: .cvsignore sources Added Files: import.log perl-Verilog-Readmem.spec Log Message: 0.04 --- NEW FILE import.log --- perl-Verilog-Readmem-0_04-1_fc10:EL-5:perl-Verilog-Readmem-0.04-1.fc10.src.rpm:1236197626 --- NEW FILE perl-Verilog-Readmem.spec --- Name: perl-Verilog-Readmem Version: 0.04 Release: 1%{?dist} Summary: Parse Verilog $readmemh or $readmemb text file License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Verilog-Readmem/ Source0: http://www.cpan.org/authors/id/G/GS/GSULLIVAN/Verilog-Readmem-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The Verilog Hardware Description Language (HDL) provides a convenient way to load a memory during logic simulation. The $readmemh() and $readmemb() system tasks are used in the HDL source code to import the contents of a text file into a memory variable. %prep %setup -q -n Verilog-Readmem-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README examples/ %dir %{perl_vendorlib}/Verilog/ %{perl_vendorlib}/Verilog/Readmem.pm %{_mandir}/man3/* %changelog * Tue Feb 24 2009 Chitlesh GOORAH - 0.04-1 - new upstream release * Sun Dec 14 2008 Chitlesh GOORAH - 0.02-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog-Readmem/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:21:52 -0000 1.1 +++ .cvsignore 4 Mar 2009 20:15:31 -0000 1.2 @@ -0,0 +1 @@ +Verilog-Readmem-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog-Readmem/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:21:52 -0000 1.1 +++ sources 4 Mar 2009 20:15:31 -0000 1.2 @@ -0,0 +1 @@ +d4475183debbe6fe0f1e04d4c93b73d4 Verilog-Readmem-0.04.tar.gz From chitlesh at fedoraproject.org Wed Mar 4 20:21:26 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Wed, 4 Mar 2009 20:21:26 +0000 (UTC) Subject: rpms/perl-SystemC-Vregs/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 perl-SystemC-Vregs.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090304202126.1B25170116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/perl-SystemC-Vregs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23084/devel Modified Files: .cvsignore import.log perl-SystemC-Vregs.spec sources Log Message: 1.462 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Feb 2009 21:22:44 -0000 1.2 +++ .cvsignore 4 Mar 2009 20:20:55 -0000 1.3 @@ -1 +1 @@ -SystemC-Vregs-1.461.tar.gz +SystemC-Vregs-1.462.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 Feb 2009 21:22:44 -0000 1.1 +++ import.log 4 Mar 2009 20:20:55 -0000 1.2 @@ -1 +1,2 @@ perl-SystemC-Vregs-1_461-1_fc10:HEAD:perl-SystemC-Vregs-1.461-1.fc10.src.rpm:1235510432 +perl-SystemC-Vregs-1_462-1_fc10:HEAD:perl-SystemC-Vregs-1.462-1.fc10.src.rpm:1236197710 Index: perl-SystemC-Vregs.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/devel/perl-SystemC-Vregs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-SystemC-Vregs.spec 24 Feb 2009 21:22:44 -0000 1.1 +++ perl-SystemC-Vregs.spec 4 Mar 2009 20:20:55 -0000 1.2 @@ -11,7 +11,7 @@ %endif Name: perl-SystemC-Vregs -Version: 1.461 +Version: 1.462 Release: 1%{?dist} Summary: Utility routines used by vregs @@ -102,6 +102,9 @@ %changelog +* Wed Mar 04 2009 Chitlesh GOORAH 1.462-1 +- new upstream release + * Fri Jan 09 2009 Chitlesh GOORAH 1.461-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Feb 2009 21:22:44 -0000 1.2 +++ sources 4 Mar 2009 20:20:55 -0000 1.3 @@ -1 +1 @@ -1ff3fbb95a8c5beb92bbfab855f9aa55 SystemC-Vregs-1.461.tar.gz +5af00bba32fdffe7f6ddb99c9bddafb7 SystemC-Vregs-1.462.tar.gz From chitlesh at fedoraproject.org Wed Mar 4 20:21:28 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Wed, 4 Mar 2009 20:21:28 +0000 (UTC) Subject: rpms/perl-Verilog-Readmem/devel import.log, NONE, 1.1 perl-Verilog-Readmem.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090304202128.2351570116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/perl-Verilog-Readmem/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23108/devel Modified Files: .cvsignore sources Added Files: import.log perl-Verilog-Readmem.spec Log Message: 0.04 --- NEW FILE import.log --- perl-Verilog-Readmem-0_04-1_fc10:HEAD:perl-Verilog-Readmem-0.04-1.fc10.src.rpm:1236197715 --- NEW FILE perl-Verilog-Readmem.spec --- Name: perl-Verilog-Readmem Version: 0.04 Release: 1%{?dist} Summary: Parse Verilog $readmemh or $readmemb text file License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Verilog-Readmem/ Source0: http://www.cpan.org/authors/id/G/GS/GSULLIVAN/Verilog-Readmem-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The Verilog Hardware Description Language (HDL) provides a convenient way to load a memory during logic simulation. The $readmemh() and $readmemb() system tasks are used in the HDL source code to import the contents of a text file into a memory variable. %prep %setup -q -n Verilog-Readmem-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README examples/ %dir %{perl_vendorlib}/Verilog/ %{perl_vendorlib}/Verilog/Readmem.pm %{_mandir}/man3/* %changelog * Tue Feb 24 2009 Chitlesh GOORAH - 0.04-1 - new upstream release * Sun Dec 14 2008 Chitlesh GOORAH - 0.02-1 - Specfile autogenerated by cpanspec 1.77. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog-Readmem/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:21:52 -0000 1.1 +++ .cvsignore 4 Mar 2009 20:20:57 -0000 1.2 @@ -0,0 +1 @@ +Verilog-Readmem-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog-Readmem/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:21:52 -0000 1.1 +++ sources 4 Mar 2009 20:20:57 -0000 1.2 @@ -0,0 +1 @@ +d4475183debbe6fe0f1e04d4c93b73d4 Verilog-Readmem-0.04.tar.gz From pkgdb at fedoraproject.org Wed Mar 4 20:34:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 20:34:34 +0000 Subject: [pkgdb] bochs: glommer has requested commit Message-ID: <20090304203434.C659520820B@bastion.fedora.phx.redhat.com> glommer has requested the commit acl on bochs (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bochs From pkgdb at fedoraproject.org Wed Mar 4 20:34:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 20:34:41 +0000 Subject: [pkgdb] bochs: glommer has requested watchcommits Message-ID: <20090304203440.A6BBA208544@bastion.fedora.phx.redhat.com> glommer has requested the watchcommits acl on bochs (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bochs From pkgdb at fedoraproject.org Wed Mar 4 20:34:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 20:34:10 +0000 Subject: [pkgdb] bochs: glommer has requested watchbugzilla Message-ID: <20090304203450.26A81208547@bastion.fedora.phx.redhat.com> glommer has requested the watchbugzilla acl on bochs (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bochs From pkgdb at fedoraproject.org Wed Mar 4 20:34:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 20:34:26 +0000 Subject: [pkgdb] bochs: glommer has requested commit Message-ID: <20090304203448.5148D20820B@bastion.fedora.phx.redhat.com> glommer has requested the commit acl on bochs (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bochs From pkgdb at fedoraproject.org Wed Mar 4 20:34:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 20:34:51 +0000 Subject: [pkgdb] bochs: glommer has requested watchcommits Message-ID: <20090304203451.ABF7620854B@bastion.fedora.phx.redhat.com> glommer has requested the watchcommits acl on bochs (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bochs From hadess at fedoraproject.org Wed Mar 4 20:40:49 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 4 Mar 2009 20:40:49 +0000 (UTC) Subject: comps comps-f11.xml.in,1.138,1.139 Message-ID: <20090304204049.B2D3070116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27209 Modified Files: comps-f11.xml.in Log Message: Remove gnome-audio as required Make gnome-vfs2-devel optional And make pulseaudio-esound-compat optional Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- comps-f11.xml.in 4 Mar 2009 15:07:34 -0000 1.138 +++ comps-f11.xml.in 4 Mar 2009 20:40:19 -0000 1.139 @@ -2149,7 +2149,6 @@ gdm gdm-user-switch-applet gedit - gnome-audio gnome-backgrounds gnome-bluetooth gnome-media @@ -2176,7 +2175,6 @@ notification-daemon orca PolicyKit-gnome - pulseaudio-esound-compat pulseaudio-module-gconf pulseaudio-module-x11 tomboy @@ -2226,6 +2224,7 @@ nautilus-sound-converter panelfm pcmanfm + pulseaudio-esound-compat preferences-menus rss-glx-gnome-screensaver sabayon @@ -2275,7 +2274,6 @@ gnome-devel-docs gnome-panel-devel gnome-pilot-devel - gnome-vfs2-devel gtk-doc hal-devel libart_lgpl-devel @@ -2304,6 +2302,7 @@ gnome-common gnome-python2-gda-devel gnome-valgrind-session + gnome-vfs2-devel gnome-vfsmm26-devel gob2 gquilt From sharkcz at fedoraproject.org Wed Mar 4 20:48:15 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Wed, 4 Mar 2009 20:48:15 +0000 (UTC) Subject: rpms/openhpi/devel openhpi.spec,1.71,1.72 Message-ID: <20090304204815.651FD70116@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/openhpi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28278 Modified Files: openhpi.spec Log Message: * Wed Feb 25 2009 Dan Horak - 2.13.3-2 - fix ppc/ppc64 builds Index: openhpi.spec =================================================================== RCS file: /cvs/pkgs/rpms/openhpi/devel/openhpi.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- openhpi.spec 25 Feb 2009 20:28:41 -0000 1.71 +++ openhpi.spec 4 Mar 2009 20:47:45 -0000 1.72 @@ -1,7 +1,7 @@ Summary: Hardware Platform Interface library and tools Name: openhpi Version: 2.13.3 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Base URL: http://www.openhpi.org @@ -73,11 +73,7 @@ # temp hack for glib2 %ifarch ppc ppc64 -sed -i 's/ -Werror//g' utils/Makefile -sed -i 's/ -Werror//g' utils/t/*/Makefile -sed -i 's/ -Werror//g' openhpid/Makefile -sed -i 's/ -Werror//g' src/Makefile -sed -i 's/ -Werror//g' ssl/Makefile +find . -name Makefile | xargs sed -i 's/ -Werror//g' %endif make %{?_smp_mflags} @@ -155,6 +151,9 @@ %changelog +* Wed Feb 25 2009 Dan Horak - 2.13.3-2 +- fix ppc/ppc64 builds + * Wed Feb 25 2009 Dan Horak - 2.13.3-1 - update to 2.13.3 From lmacken at fedoraproject.org Wed Mar 4 20:49:51 2009 From: lmacken at fedoraproject.org (Luke Macken) Date: Wed, 4 Mar 2009 20:49:51 +0000 (UTC) Subject: rpms/python-dbsprockets/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE python-dbsprockets.spec, 1.3, NONE sources, 1.2, NONE Message-ID: <20090304204951.73DDF70116@cvs1.fedora.phx.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-dbsprockets/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28789 Added Files: dead.package Removed Files: Makefile python-dbsprockets.spec sources Log Message: End python-dbsprocket's life. --- NEW FILE dead.package --- Obsoleted by python-sprox --- Makefile DELETED --- --- python-dbsprockets.spec DELETED --- --- sources DELETED --- From spot at fedoraproject.org Wed Mar 4 20:50:41 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 20:50:41 +0000 (UTC) Subject: rpms/R/EL-4 R-make-search-index.sh,1.1,1.2 R.spec,1.25,1.26 Message-ID: <20090304205041.0567C70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28746/EL-4 Modified Files: R-make-search-index.sh R.spec Log Message: fix EPEL R-make-search-index.sh, improve java scriptlet Index: R-make-search-index.sh =================================================================== RCS file: /cvs/pkgs/rpms/R/EL-4/R-make-search-index.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- R-make-search-index.sh 6 Jul 2007 22:07:22 -0000 1.1 +++ R-make-search-index.sh 4 Mar 2009 20:50:10 -0000 1.2 @@ -3,9 +3,19 @@ # Figure out what RHOME is set to TMP_R_HOME=`R RHOME` -# Write out all the contents in arch and noarch library locations -cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null -cat /usr/share/R/library/*/CONTENTS >> $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null +# Figure out what R_DOC_DIR is set to +# Ideally, we could ask R just like we do for RHOME, but we can't yet. +TMP_R_DOC_DIR=`grep "R_DOC_DIR=" /usr/bin/R | cut -d "=" -f 2` + +# Write out all the contents in arch library locations +cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null +# Don't use .. based paths, substitute TMP_R_HOME +sed -i "s!../../..!$TMP_R_HOME!g" $TMP_R_DOC_DIR/html/search/index.txt + +# Write out all the contents in noarch library locations +cat /usr/share/R/library/*/CONTENTS >> $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null +# Don't use .. based paths, substitute /usr/share/R +sed -i "s!../../..!/usr/share/R!g" $TMP_R_DOC_DIR/html/search/index.txt exit 0 Index: R.spec =================================================================== RCS file: /cvs/pkgs/rpms/R/EL-4/R.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- R.spec 22 Dec 2008 16:27:47 -0000 1.25 +++ R.spec 4 Mar 2009 20:50:10 -0000 1.26 @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz @@ -121,7 +121,7 @@ %package -n libRmath-devel Summary: standalone math library from the R project Group: Development/Libraries -Requires: libRmath = %{version}, pkgconfig +Requires: libRmath = %{version}-%{release}, pkgconfig %description -n libRmath-devel A standalone library of mathematical and statistical functions derived @@ -293,19 +293,14 @@ done /sbin/ldconfig R CMD javareconf \ - JAR=%{jar} \ - JAVA=%{java} \ - JAVAC=%{javac} \ - JAVA_HOME=%{java_home}/jre \ - JAVAH=%{java_home}/bin/javah \ - JAVA_CPPFLAGS='-I%{java_home}/include\ -I%{java_home}/include/linux' \ - JAVA_LIBS='-L%{java_home}/jre/lib/%{java_arch}/server \ - -L%{java_home}/jre/lib/%{java_arch}\ -L%{java_home}/lib/%{java_arch} \ + JAVA_HOME=%{_jvmdir}/jre \ + JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ + JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ + -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ - JAVA_LD_LIBRARY_PATH=%{java_home}/jre/lib/%{java_arch}/server:%{java_home}/jre/lib/%{java_arch}:%{java_home}/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \ + JAVA_LD_LIBRARY_PATH=%{_jvmdir}/jre/lib/%{java_arch}/server:%{_jvmdir}/jre/lib/%{java_arch}:%{_jvmdir}/java/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \ > /dev/null 2>&1 || exit 0 - # Update package indices %__cat %{_libdir}/R/library/*/CONTENTS > %{_docdir}/R-%{version}/html/search/index.txt 2>/dev/null # Don't use .. based paths, substitute RHOME @@ -338,6 +333,11 @@ /sbin/ldconfig %changelog +* Wed Mar 4 2009 Tom "spot" Callaway 2.8.1-2 +- fix R-make-search-index.sh (bz 487022) +- fix libRmath requires to need V-R (thanks to Martyn Plummer) +- update post scriptlet (bz 477076) + * Mon Dec 22 2008 Tom "spot" Callaway 2.8.1-1 - update javareconf call in %%post (bz 477076) - 2.8.1 From spot at fedoraproject.org Wed Mar 4 20:50:41 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 20:50:41 +0000 (UTC) Subject: rpms/R/EL-5 R-make-search-index.sh,1.1,1.2 R.spec,1.35,1.36 Message-ID: <20090304205041.5D8A370116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28746/EL-5 Modified Files: R-make-search-index.sh R.spec Log Message: fix EPEL R-make-search-index.sh, improve java scriptlet Index: R-make-search-index.sh =================================================================== RCS file: /cvs/pkgs/rpms/R/EL-5/R-make-search-index.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- R-make-search-index.sh 6 Jul 2007 22:07:28 -0000 1.1 +++ R-make-search-index.sh 4 Mar 2009 20:50:11 -0000 1.2 @@ -3,9 +3,19 @@ # Figure out what RHOME is set to TMP_R_HOME=`R RHOME` -# Write out all the contents in arch and noarch library locations -cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null -cat /usr/share/R/library/*/CONTENTS >> $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null +# Figure out what R_DOC_DIR is set to +# Ideally, we could ask R just like we do for RHOME, but we can't yet. +TMP_R_DOC_DIR=`grep "R_DOC_DIR=" /usr/bin/R | cut -d "=" -f 2` + +# Write out all the contents in arch library locations +cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null +# Don't use .. based paths, substitute TMP_R_HOME +sed -i "s!../../..!$TMP_R_HOME!g" $TMP_R_DOC_DIR/html/search/index.txt + +# Write out all the contents in noarch library locations +cat /usr/share/R/library/*/CONTENTS >> $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null +# Don't use .. based paths, substitute /usr/share/R +sed -i "s!../../..!/usr/share/R!g" $TMP_R_DOC_DIR/html/search/index.txt exit 0 Index: R.spec =================================================================== RCS file: /cvs/pkgs/rpms/R/EL-5/R.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- R.spec 5 Jan 2009 15:11:49 -0000 1.35 +++ R.spec 4 Mar 2009 20:50:11 -0000 1.36 @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 2%{?dist} +Release: 3%{?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 @@ -286,16 +286,12 @@ done /sbin/ldconfig R CMD javareconf \ - JAR=%{jar} \ - JAVA=%{java} \ - JAVAC=%{javac} \ - JAVA_HOME=%{java_home}/jre \ - JAVAH=%{java_home}/bin/javah \ - JAVA_CPPFLAGS='-I%{java_home}/include\ -I%{java_home}/include/linux' \ - JAVA_LIBS='-L%{java_home}/jre/lib/%{java_arch}/server \ - -L%{java_home}/jre/lib/%{java_arch}\ -L%{java_home}/lib/%{java_arch} \ + JAVA_HOME=%{_jvmdir}/jre \ + JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ + JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ + -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ - JAVA_LD_LIBRARY_PATH=%{java_home}/jre/lib/%{java_arch}/server:%{java_home}/jre/lib/%{java_arch}:%{java_home}/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \ + JAVA_LD_LIBRARY_PATH=%{_jvmdir}/jre/lib/%{java_arch}/server:%{_jvmdir}/jre/lib/%{java_arch}:%{_jvmdir}/java/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \ > /dev/null 2>&1 || exit 0 # Update package indices @@ -330,6 +326,10 @@ /sbin/ldconfig %changelog +* Wed Mar 4 2009 Tom "spot" Callaway - 2.8.1-3 +- fix R-make-search-index.sh (bz 487022) +- update post scriptlet (bz 477076) + * Mon Jan 5 2009 Tom "spot" Callaway 2.8.1-2 - add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard) - fix libRmath requires to need V-R (thanks to Martyn Plummer) From spot at fedoraproject.org Wed Mar 4 20:50:41 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 20:50:41 +0000 (UTC) Subject: rpms/R/F-9 R.spec,1.51,1.52 Message-ID: <20090304205041.E75DA70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28746/F-9 Modified Files: R.spec Log Message: fix EPEL R-make-search-index.sh, improve java scriptlet Index: R.spec =================================================================== RCS file: /cvs/pkgs/rpms/R/F-9/R.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- R.spec 5 Jan 2009 15:11:50 -0000 1.51 +++ R.spec 4 Mar 2009 20:50:11 -0000 1.52 @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 2%{?dist} +Release: 4%{?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 @@ -286,16 +286,12 @@ done /sbin/ldconfig R CMD javareconf \ - JAR=%{jar} \ - JAVA=%{java} \ - JAVAC=%{javac} \ - JAVA_HOME=%{java_home}/jre \ - JAVAH=%{java_home}/bin/javah \ - JAVA_CPPFLAGS='-I%{java_home}/include\ -I%{java_home}/include/linux' \ - JAVA_LIBS='-L%{java_home}/jre/lib/%{java_arch}/server \ - -L%{java_home}/jre/lib/%{java_arch}\ -L%{java_home}/lib/%{java_arch} \ + JAVA_HOME=%{_jvmdir}/jre \ + JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ + JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ + -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ - JAVA_LD_LIBRARY_PATH=%{java_home}/jre/lib/%{java_arch}/server:%{java_home}/jre/lib/%{java_arch}:%{java_home}/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \ + JAVA_LD_LIBRARY_PATH=%{_jvmdir}/jre/lib/%{java_arch}/server:%{_jvmdir}/jre/lib/%{java_arch}:%{_jvmdir}/java/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \ > /dev/null 2>&1 || exit 0 # Update package indices @@ -330,6 +326,12 @@ /sbin/ldconfig %changelog +* Wed Mar 4 2009 Tom "spot" Callaway - 2.8.1-4 +- update post scriptlet (bz 477076) + +* Mon Feb 23 2009 Fedora Release Engineering - 2.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Jan 5 2009 Tom "spot" Callaway 2.8.1-2 - add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard) - fix libRmath requires to need V-R (thanks to Martyn Plummer) From spot at fedoraproject.org Wed Mar 4 20:50:42 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 20:50:42 +0000 (UTC) Subject: rpms/R/devel R.spec,1.53,1.54 Message-ID: <20090304205042.3D66B70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28746/devel Modified Files: R.spec Log Message: fix EPEL R-make-search-index.sh, improve java scriptlet Index: R.spec =================================================================== RCS file: /cvs/pkgs/rpms/R/devel/R.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- R.spec 23 Feb 2009 22:44:31 -0000 1.53 +++ R.spec 4 Mar 2009 20:50:11 -0000 1.54 @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 3%{?dist} +Release: 4%{?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 @@ -286,16 +286,12 @@ done /sbin/ldconfig R CMD javareconf \ - JAR=%{jar} \ - JAVA=%{java} \ - JAVAC=%{javac} \ - JAVA_HOME=%{java_home}/jre \ - JAVAH=%{java_home}/bin/javah \ - JAVA_CPPFLAGS='-I%{java_home}/include\ -I%{java_home}/include/linux' \ - JAVA_LIBS='-L%{java_home}/jre/lib/%{java_arch}/server \ - -L%{java_home}/jre/lib/%{java_arch}\ -L%{java_home}/lib/%{java_arch} \ + JAVA_HOME=%{_jvmdir}/jre \ + JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ + JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ + -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ - JAVA_LD_LIBRARY_PATH=%{java_home}/jre/lib/%{java_arch}/server:%{java_home}/jre/lib/%{java_arch}:%{java_home}/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \ + JAVA_LD_LIBRARY_PATH=%{_jvmdir}/jre/lib/%{java_arch}/server:%{_jvmdir}/jre/lib/%{java_arch}:%{_jvmdir}/java/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \ > /dev/null 2>&1 || exit 0 # Update package indices @@ -330,6 +326,9 @@ /sbin/ldconfig %changelog +* Wed Mar 4 2009 Tom "spot" Callaway - 2.8.1-4 +- update post scriptlet (bz 477076) + * Mon Feb 23 2009 Fedora Release Engineering - 2.8.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From spot at fedoraproject.org Wed Mar 4 20:50:41 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 20:50:41 +0000 (UTC) Subject: rpms/R/F-10 R.spec,1.52,1.53 Message-ID: <20090304205041.92EC670116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28746/F-10 Modified Files: R.spec Log Message: fix EPEL R-make-search-index.sh, improve java scriptlet Index: R.spec =================================================================== RCS file: /cvs/pkgs/rpms/R/F-10/R.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- R.spec 5 Jan 2009 15:11:50 -0000 1.52 +++ R.spec 4 Mar 2009 20:50:11 -0000 1.53 @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 2%{?dist} +Release: 4%{?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 @@ -286,16 +286,12 @@ done /sbin/ldconfig R CMD javareconf \ - JAR=%{jar} \ - JAVA=%{java} \ - JAVAC=%{javac} \ - JAVA_HOME=%{java_home}/jre \ - JAVAH=%{java_home}/bin/javah \ - JAVA_CPPFLAGS='-I%{java_home}/include\ -I%{java_home}/include/linux' \ - JAVA_LIBS='-L%{java_home}/jre/lib/%{java_arch}/server \ - -L%{java_home}/jre/lib/%{java_arch}\ -L%{java_home}/lib/%{java_arch} \ + JAVA_HOME=%{_jvmdir}/jre \ + JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ + JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ + -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ - JAVA_LD_LIBRARY_PATH=%{java_home}/jre/lib/%{java_arch}/server:%{java_home}/jre/lib/%{java_arch}:%{java_home}/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \ + JAVA_LD_LIBRARY_PATH=%{_jvmdir}/jre/lib/%{java_arch}/server:%{_jvmdir}/jre/lib/%{java_arch}:%{_jvmdir}/java/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \ > /dev/null 2>&1 || exit 0 # Update package indices @@ -330,6 +326,12 @@ /sbin/ldconfig %changelog +* Wed Mar 4 2009 Tom "spot" Callaway - 2.8.1-4 +- update post scriptlet (bz 477076) + +* Mon Feb 23 2009 Fedora Release Engineering - 2.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Jan 5 2009 Tom "spot" Callaway 2.8.1-2 - add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard) - fix libRmath requires to need V-R (thanks to Martyn Plummer) From than at fedoraproject.org Wed Mar 4 20:56:27 2009 From: than at fedoraproject.org (Than Ngo) Date: Wed, 4 Mar 2009 20:56:27 +0000 (UTC) Subject: rpms/kdebase/devel kdebase-4.2.1-konsole-selection.patch, NONE, 1.1 kdebase.spec, 1.366, 1.367 Message-ID: <20090304205627.BC56B70116@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30083 Modified Files: kdebase.spec Added Files: kdebase-4.2.1-konsole-selection.patch Log Message: apply patch to fix regression in konsole, double-click selection works again kdebase-4.2.1-konsole-selection.patch: --- NEW FILE kdebase-4.2.1-konsole-selection.patch --- diff -up kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp.orig kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp --- kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp.orig 2009-03-04 20:55:02.000000000 +0100 +++ kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp 2009-03-04 20:57:11.000000000 +0100 @@ -2155,11 +2155,12 @@ void TerminalDisplay::mouseDoubleClickEv _wordSelectionMode = true; // find word boundaries... + QChar selClass = charClass(_image[i].character); { // find the start of the word int x = bgnSel.x(); while ( ((x>0) || (bgnSel.y()>0 && (_lineProperties[bgnSel.y()-1] & LINE_WRAPPED) )) - && !isCharBoundary(_image[i-1].character) ) + && charClass(_image[i-1].character) == selClass ) { i--; if (x>0) @@ -2178,7 +2179,7 @@ void TerminalDisplay::mouseDoubleClickEv i = loc( endSel.x(), endSel.y() ); x = endSel.x(); while( ((x<_usedColumns-1) || (endSel.y()<_usedLines-1 && (_lineProperties[endSel.y()] & LINE_WRAPPED) )) - && !isCharBoundary(_image[i+1].character) ) + && charClass(_image[i+1].character) == selClass ) { i++; if (x<_usedColumns-1) @@ -2332,16 +2333,6 @@ bool TerminalDisplay::focusNextPrevChild return QWidget::focusNextPrevChild( next ); } -// Returns true upon a word boundary -// TODO determine if the below charClass() is actually required -bool TerminalDisplay::isCharBoundary(QChar qch) const -{ - if ( _wordCharacters.contains(qch, Qt::CaseInsensitive) ) return true; - if ( qch.isSpace() ) return true; - - return false; -} - QChar TerminalDisplay::charClass(QChar qch) const { if ( qch.isSpace() ) return ' '; diff -up kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h.orig kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h --- kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h.orig 2009-03-04 20:57:23.000000000 +0100 +++ kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h 2009-03-04 20:57:40.000000000 +0100 @@ -563,9 +563,6 @@ protected: // - Other characters (returns the input character) QChar charClass(QChar ch) const; - // Returns true upon a word boundary - bool isCharBoundary(QChar ch) const; - void clearImage(); void mouseTripleClickEvent(QMouseEvent* ev); Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.366 retrieving revision 1.367 diff -u -r1.366 -r1.367 --- kdebase.spec 3 Mar 2009 11:22:48 -0000 1.366 +++ kdebase.spec 4 Mar 2009 20:55:57 -0000 1.367 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Core Files Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdebase @@ -29,6 +29,7 @@ Patch2: kdebase-4.2.1-home-icon.patch ## upstream patches +Patch100: kdebase-4.2.1-konsole-selection.patch %ifnarch s390 s390x Requires: eject @@ -125,6 +126,8 @@ %patch1 -p1 -b .konsole-session %patch2 -p1 -b .home-icon +%patch100 -p1 -b .konsole + # fix incorrect assumption that we're building in a combined kdebase tree sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt @@ -305,6 +308,9 @@ %changelog +* Wed Mar 04 2009 Than Ngo - 4.2.1-2 +- apply patch to fix regression in konsole, double-click selection works again + * Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 From karsten at fedoraproject.org Wed Mar 4 20:56:36 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Wed, 4 Mar 2009 20:56:36 +0000 (UTC) Subject: rpms/hdparm/devel .cvsignore, 1.20, 1.21 hdparm.spec, 1.45, 1.46 sources, 1.21, 1.22 Message-ID: <20090304205636.3DB6970116@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/hdparm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30215 Modified Files: .cvsignore hdparm.spec sources Log Message: - update to 9.12 to fix #488560 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hdparm/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 14 Jan 2009 12:19:08 -0000 1.20 +++ .cvsignore 4 Mar 2009 20:56:05 -0000 1.21 @@ -1 +1 @@ -hdparm-9.8.tar.gz +hdparm-9.12.tar.gz Index: hdparm.spec =================================================================== RCS file: /cvs/extras/rpms/hdparm/devel/hdparm.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- hdparm.spec 25 Feb 2009 03:33:45 -0000 1.45 +++ hdparm.spec 4 Mar 2009 20:56:05 -0000 1.46 @@ -1,7 +1,7 @@ Summary: A utility for displaying and/or setting hard disk parameters Name: hdparm -Version: 9.8 -Release: 2%{?dist} +Version: 9.12 +Release: 1%{?dist} License: BSD Group: Applications/System URL: http://sourceforge.net/projects/hdparm/ @@ -41,6 +41,9 @@ %{_mandir}/man8/hdparm.8* %changelog +* Wed Mar 04 2009 Karsten Hopp 9.12-1 +- update to 9.12 to fix #488560 + * Tue Feb 24 2009 Fedora Release Engineering - 9.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/hdparm/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 14 Jan 2009 12:19:08 -0000 1.21 +++ sources 4 Mar 2009 20:56:05 -0000 1.22 @@ -1 +1 @@ -e393c9d938200b378dfa6a935825329c hdparm-9.8.tar.gz +4064cb2cc60b7bbdcea02ec163631068 hdparm-9.12.tar.gz From mchehab at fedoraproject.org Wed Mar 4 20:58:42 2009 From: mchehab at fedoraproject.org (Mauro Carvalho Chehab) Date: Wed, 4 Mar 2009 20:58:42 +0000 (UTC) Subject: rpms/kernel/devel config-generic, 1.251, 1.252 kernel.spec, 1.1382, 1.1383 linux-2.6-v4l-dvb-update.patch, 1.2, 1.3 Message-ID: <20090304205842.B063970116@cvs1.fedora.phx.redhat.com> Author: mchehab Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29800 Modified Files: config-generic kernel.spec linux-2.6-v4l-dvb-update.patch Log Message: Updated drivers/media with the latest development tree. This time, two new DVB drivers were added, being one for DVB-S and another for DVB-T. Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- config-generic 2 Mar 2009 23:09:52 -0000 1.251 +++ config-generic 4 Mar 2009 20:58:11 -0000 1.252 @@ -2355,6 +2355,8 @@ CONFIG_DVB_LGS8GL5=m # CONFIG_DVB_DUMMY_FE is not set CONFIG_DVB_AF9013=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m # # Supported SAA7146 based PCI Adapters Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1382 retrieving revision 1.1383 diff -u -r1.1382 -r1.1383 --- kernel.spec 4 Mar 2009 18:11:14 -0000 1.1382 +++ kernel.spec 4 Mar 2009 20:58:11 -0000 1.1383 @@ -1792,6 +1792,9 @@ # and build. %changelog +* Wed Mar 4 2009 Mauro Carvalho Chehab +- drivers/media: fixes and improvements on devel tree + * Wed Mar 4 2009 - Add fix for deadlock in drm setmaster. linux-2.6-v4l-dvb-update.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 linux-2.6-v4l-dvb-update.patch Index: linux-2.6-v4l-dvb-update.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-update.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-v4l-dvb-update.patch 28 Feb 2009 03:08:27 -0000 1.2 +++ linux-2.6-v4l-dvb-update.patch 4 Mar 2009 20:58:11 -0000 1.3 @@ -11,25 +11,28 @@ 'f' 00-1F linux/ext2_fs.h 'h' 00-7F Charon filesystem diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv -index 0d93fa1..4dfe626 100644 +index 0d93fa1..1da2c62 100644 --- a/Documentation/video4linux/CARDLIST.bttv +++ b/Documentation/video4linux/CARDLIST.bttv -@@ -154,3 +154,4 @@ +@@ -154,3 +154,6 @@ 153 -> PHYTEC VD-012 (bt878) 154 -> PHYTEC VD-012-X1 (bt878) 155 -> PHYTEC VD-012-X2 (bt878) +156 -> IVCE-8784 [0000:f050,0001:f050,0002:f050,0003:f050] ++157 -> Geovision GV-800(S) (master) [800a:763d] ++158 -> Geovision GV-800(S) (slave) [800b:763d,800c:763d,800d:763d] diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885 -index 35ea130..5937ff9 100644 +index 35ea130..91aa3c0 100644 --- a/Documentation/video4linux/CARDLIST.cx23885 +++ b/Documentation/video4linux/CARDLIST.cx23885 -@@ -12,3 +12,6 @@ +@@ -12,3 +12,7 @@ 11 -> DViCO FusionHDTV DVB-T Dual Express [18ac:db78] 12 -> Leadtek Winfast PxDVR3200 H [107d:6681] 13 -> Compro VideoMate E650F [185b:e800] + 14 -> TurboSight TBS 6920 [6920:8888] + 15 -> TeVii S470 [d470:9022] + 16 -> DVBWorld DVB-S2 2005 [0001:2005] ++ 17 -> NetUP Dual DVB-S2 CI [1b55:2a2c] diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx index 75bded8..78d0a6e 100644 --- a/Documentation/video4linux/CARDLIST.em28xx @@ -854,7 +857,7 @@ i2c_adapter->algo = &saa7146_algo; i2c_adapter->algo_data = NULL; diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c -index 47fee05..8d8cb7f 100644 +index 47fee05..8035285 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c @@ -1,4 +1,5 @@ @@ -1281,7 +1284,7 @@ /********************************************************************************/ /* common pagetable functions */ -@@ -829,231 +497,451 @@ static int video_end(struct saa7146_fh *fh, struct file *file) +@@ -829,231 +497,448 @@ static int video_end(struct saa7146_fh *fh, struct file *file) return 0; } @@ -1384,11 +1387,6 @@ + return 0; +} + -+static int vidioc_enum_fmt_vid_overlay(struct file *file, void *fh, struct v4l2_fmtdesc *f) -+{ -+ return vidioc_enum_fmt_vid_cap(file, fh, f); -+} -+ +static int vidioc_queryctrl(struct file *file, void *fh, struct v4l2_queryctrl *c) +{ + const struct v4l2_queryctrl *ctrl; @@ -1468,11 +1466,7 @@ - /* fixme: add handle "after" case (is it still needed?) */ + mutex_lock(&dev->lock); - -- switch (fh->type) { -- case V4L2_BUF_TYPE_VIDEO_CAPTURE: { -- ops = &saa7146_video_uops; -- q = &fh->video_q; ++ + switch (ctrl->type) { + case V4L2_CTRL_TYPE_BOOLEAN: + case V4L2_CTRL_TYPE_MENU: @@ -1481,11 +1475,15 @@ + c->value = ctrl->minimum; + if (c->value > ctrl->maximum) + c->value = ctrl->maximum; - break; ++ break; + default: + /* nothing */; + } -+ + +- switch (fh->type) { +- case V4L2_BUF_TYPE_VIDEO_CAPTURE: { +- ops = &saa7146_video_uops; +- q = &fh->video_q; + switch (c->id) { + case V4L2_CID_BRIGHTNESS: { + u32 value = saa7146_read(dev, BCS_CTRL); @@ -1493,7 +1491,7 @@ + value |= (c->value << 24); + saa7146_write(dev, BCS_CTRL, value); + saa7146_write(dev, MC2, MASK_22 | MASK_06); -+ break; + break; + } + case V4L2_CID_CONTRAST: { + u32 value = saa7146_read(dev, BCS_CTRL); @@ -1565,19 +1563,8 @@ - case VIDIOC_G_FBUF: - { - struct v4l2_framebuffer *fb = arg; -+ return 0; -+} - +- - DEB_EE(("VIDIOC_G_FBUF\n")); -+static int vidioc_g_parm(struct file *file, void *fh, -+ struct v4l2_streamparm *parm) -+{ -+ if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) -+ return -EINVAL; -+ parm->parm.capture.readbuffers = 1; -+ /* fixme: only for PAL! */ -+ parm->parm.capture.timeperframe.numerator = 1; -+ parm->parm.capture.timeperframe.denominator = 25; + return 0; +} @@ -1589,25 +1576,27 @@ - { - struct v4l2_framebuffer *fb = arg; - struct saa7146_format *fmt; -+static int vidioc_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f) ++static int vidioc_g_parm(struct file *file, void *fh, ++ struct v4l2_streamparm *parm) +{ -+ f->fmt.pix = ((struct saa7146_fh *)fh)->video_fmt; -+ return 0; -+} ++ struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; ++ struct saa7146_vv *vv = dev->vv_data; - DEB_EE(("VIDIOC_S_FBUF\n")); -+static int vidioc_g_fmt_vid_overlay(struct file *file, void *fh, struct v4l2_format *f) -+{ -+ f->fmt.win = ((struct saa7146_fh *)fh)->ov.win; ++ if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) ++ return -EINVAL; ++ parm->parm.capture.readbuffers = 1; ++ v4l2_video_std_frame_period(vv->standard->id, ++ &parm->parm.capture.timeperframe); + return 0; +} - if(!capable(CAP_SYS_ADMIN) && - !capable(CAP_SYS_RAWIO)) - return -EPERM; -+static int vidioc_g_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f) ++static int vidioc_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f) +{ -+ f->fmt.vbi = ((struct saa7146_fh *)fh)->vbi_fmt; ++ f->fmt.pix = ((struct saa7146_fh *)fh)->video_fmt; + return 0; +} @@ -1616,20 +1605,21 @@ - if (NULL == fmt) { - return -EINVAL; - } -+static int vidioc_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f) ++static int vidioc_g_fmt_vid_overlay(struct file *file, void *fh, struct v4l2_format *f) +{ -+ struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; -+ struct saa7146_vv *vv = dev->vv_data; -+ struct saa7146_format *fmt; -+ enum v4l2_field field; -+ int maxw, maxh; -+ int calc_bpl; ++ f->fmt.win = ((struct saa7146_fh *)fh)->ov.win; ++ return 0; ++} - /* planar formats are not allowed for overlay video, clipping and video dma would clash */ - if (0 != (fmt->flags & FORMAT_IS_PLANAR)) { - DEB_S(("planar pixelformat '%4.4s' not allowed for overlay\n",(char *)&fmt->pixelformat)); - } -+ DEB_EE(("V4L2_BUF_TYPE_VIDEO_CAPTURE: dev:%p, fh:%p\n", dev, fh)); ++static int vidioc_g_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f) ++{ ++ f->fmt.vbi = ((struct saa7146_fh *)fh)->vbi_fmt; ++ return 0; ++} - /* check if overlay is running */ - if (IS_OVERLAY_ACTIVE(fh) != 0) { @@ -1638,43 +1628,17 @@ [...16650 lines suppressed...] +- break; +static int zoran_s_ctrl(struct file *file, void *__fh, struct v4l2_control *ctrl) +{ + struct zoran_fh *fh = __fh; + struct zoran *zr = fh->zr; -- dprintk(3, KERN_DEBUG "%s: VIDIOC_S_OUTPUT - output=%d\n", -- ZR_DEVNAME(zr), *output); +- case VIDIOC_S_OUTPUT: +- { +- int *output = arg; + /* we only support hue/saturation/contrast/brightness */ + if (ctrl->id < V4L2_CID_BRIGHTNESS || + ctrl->id > V4L2_CID_HUE) + return -EINVAL; -- if (*output != 0) -- return -EINVAL; +- dprintk(3, KERN_DEBUG "%s: VIDIOC_S_OUTPUT - output=%d\n", +- ZR_DEVNAME(zr), *output); + mutex_lock(&zr->resource_lock); + decoder_call(zr, core, s_ctrl, ctrl); + mutex_unlock(&zr->resource_lock); +- if (*output != 0) +- return -EINVAL; ++ return 0; ++} + - return 0; - } - break; -+ return 0; -+} ++static int zoran_g_std(struct file *file, void *__fh, v4l2_std_id *std) ++{ ++ struct zoran_fh *fh = __fh; ++ struct zoran *zr = fh->zr; - /* cropping (sub-frame capture) */ - case VIDIOC_CROPCAP: - { - struct v4l2_cropcap *cropcap = arg; - int type = cropcap->type, res = 0; -+static int zoran_g_std(struct file *file, void *__fh, v4l2_std_id *std) -+{ -+ struct zoran_fh *fh = __fh; -+ struct zoran *zr = fh->zr; - -- dprintk(3, KERN_ERR "%s: VIDIOC_CROPCAP - type=%d\n", -- ZR_DEVNAME(zr), cropcap->type); + mutex_lock(&zr->resource_lock); + *std = zr->norm; + mutex_unlock(&zr->resource_lock); + return 0; +} -- memset(cropcap, 0, sizeof(*cropcap)); -- cropcap->type = type; +- dprintk(3, KERN_ERR "%s: VIDIOC_CROPCAP - type=%d\n", +- ZR_DEVNAME(zr), cropcap->type); +static int zoran_s_std(struct file *file, void *__fh, v4l2_std_id *std) +{ + struct zoran_fh *fh = __fh; + struct zoran *zr = fh->zr; + int res = 0; -- mutex_lock(&zr->resource_lock); +- memset(cropcap, 0, sizeof(*cropcap)); +- cropcap->type = type; + mutex_lock(&zr->resource_lock); + res = zoran_set_norm(zr, *std); + if (res) + goto sstd_unlock_and_return; +- mutex_lock(&zr->resource_lock); ++ res = wait_grab_pending(zr); ++sstd_unlock_and_return: ++ mutex_unlock(&zr->resource_lock); ++ return res; ++} + - if (cropcap->type != V4L2_BUF_TYPE_VIDEO_OUTPUT && - (cropcap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE || - fh->map_mode == ZORAN_MAP_MODE_RAW)) { @@ -51832,11 +65728,11 @@ - res = -EINVAL; - goto cropcap_unlock_and_return; - } -+ res = wait_grab_pending(zr); -+sstd_unlock_and_return: -+ mutex_unlock(&zr->resource_lock); -+ return res; -+} ++static int zoran_enum_input(struct file *file, void *__fh, ++ struct v4l2_input *inp) ++{ ++ struct zoran_fh *fh = __fh; ++ struct zoran *zr = fh->zr; - cropcap->bounds.top = cropcap->bounds.left = 0; - cropcap->bounds.width = BUZ_MAX_WIDTH; @@ -51847,33 +65743,27 @@ - cropcap_unlock_and_return: - mutex_unlock(&zr->resource_lock); - return res; -- } -- break; -+static int zoran_enum_input(struct file *file, void *__fh, -+ struct v4l2_input *inp) -+{ -+ struct zoran_fh *fh = __fh; -+ struct zoran *zr = fh->zr; - -- case VIDIOC_G_CROP: -- { -- struct v4l2_crop *crop = arg; -- int type = crop->type, res = 0; + if (inp->index < 0 || inp->index >= zr->card.inputs) + return -EINVAL; + else { + int id = inp->index; + memset(inp, 0, sizeof(*inp)); + inp->index = id; -+ } + } +- break; -- dprintk(3, KERN_ERR "%s: VIDIOC_G_CROP - type=%d\n", -- ZR_DEVNAME(zr), crop->type); +- case VIDIOC_G_CROP: +- { +- struct v4l2_crop *crop = arg; +- int type = crop->type, res = 0; + strncpy(inp->name, zr->card.input[inp->index].name, + sizeof(inp->name) - 1); + inp->type = V4L2_INPUT_TYPE_CAMERA; + inp->std = V4L2_STD_ALL; +- dprintk(3, KERN_ERR "%s: VIDIOC_G_CROP - type=%d\n", +- ZR_DEVNAME(zr), crop->type); +- - memset(crop, 0, sizeof(*crop)); - crop->type = type; + /* Get status of video decoder */ @@ -52381,7 +66271,7 @@ } static unsigned int -@@ -4300,10 +3260,7 @@ zoran_vm_close (struct vm_area_struct *vma) +@@ -4300,10 +3255,7 @@ zoran_vm_close (struct vm_area_struct *vma) fh->jpg_buffers.active = ZORAN_FREE; } @@ -52393,7 +66283,7 @@ mutex_unlock(&zr->resource_lock); } -@@ -4340,10 +3297,7 @@ zoran_vm_close (struct vm_area_struct *vma) +@@ -4340,10 +3292,7 @@ zoran_vm_close (struct vm_area_struct *vma) ZORAN_FREE; spin_unlock_irqrestore(&zr->spinlock, flags); } @@ -52405,7 +66295,7 @@ mutex_unlock(&zr->resource_lock); } -@@ -4582,11 +3536,56 @@ zoran_mmap (struct file *file, +@@ -4582,11 +3531,56 @@ zoran_mmap (struct file *file, return 0; } @@ -52463,7 +66353,7 @@ .read = zoran_read, .write = zoran_write, .mmap = zoran_mmap, -@@ -4596,7 +3595,9 @@ static const struct v4l2_file_operations zoran_fops = { +@@ -4596,7 +3590,9 @@ static const struct v4l2_file_operations zoran_fops = { struct video_device zoran_template __devinitdata = { .name = ZORAN_NAME, .fops = &zoran_fops, @@ -53087,6 +66977,18 @@ !(grpid) || sd->grp_id == (grpid), o, f , ##args) #endif +diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h +index b01c044..a8b4c0b 100644 +--- a/include/media/v4l2-ioctl.h ++++ b/include/media/v4l2-ioctl.h +@@ -267,6 +267,7 @@ struct v4l2_ioctl_ops { + + /* Video standard functions */ + extern const char *v4l2_norm_to_name(v4l2_std_id id); ++extern void v4l2_video_std_frame_period(int id, struct v4l2_fract *frameperiod); + extern int v4l2_video_std_construct(struct v4l2_standard *vs, + int id, const char *name); + /* Prints the ioctl in a human-readable format */ diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 37b09e5..05b6965 100644 --- a/include/media/v4l2-subdev.h From than at fedoraproject.org Wed Mar 4 21:00:26 2009 From: than at fedoraproject.org (Than Ngo) Date: Wed, 4 Mar 2009 21:00:26 +0000 (UTC) Subject: rpms/kdebase/F-10 kdebase-4.2.1-konsole-selection.patch, NONE, 1.1 kdebase.spec, 1.359, 1.360 Message-ID: <20090304210026.E726270116@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31411 Modified Files: kdebase.spec Added Files: kdebase-4.2.1-konsole-selection.patch Log Message: apply patch to fix regression in konsole, double-click selection works again kdebase-4.2.1-konsole-selection.patch: --- NEW FILE kdebase-4.2.1-konsole-selection.patch --- diff -up kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp.orig kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp --- kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp.orig 2009-03-04 20:55:02.000000000 +0100 +++ kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp 2009-03-04 20:57:11.000000000 +0100 @@ -2155,11 +2155,12 @@ void TerminalDisplay::mouseDoubleClickEv _wordSelectionMode = true; // find word boundaries... + QChar selClass = charClass(_image[i].character); { // find the start of the word int x = bgnSel.x(); while ( ((x>0) || (bgnSel.y()>0 && (_lineProperties[bgnSel.y()-1] & LINE_WRAPPED) )) - && !isCharBoundary(_image[i-1].character) ) + && charClass(_image[i-1].character) == selClass ) { i--; if (x>0) @@ -2178,7 +2179,7 @@ void TerminalDisplay::mouseDoubleClickEv i = loc( endSel.x(), endSel.y() ); x = endSel.x(); while( ((x<_usedColumns-1) || (endSel.y()<_usedLines-1 && (_lineProperties[endSel.y()] & LINE_WRAPPED) )) - && !isCharBoundary(_image[i+1].character) ) + && charClass(_image[i+1].character) == selClass ) { i++; if (x<_usedColumns-1) @@ -2332,16 +2333,6 @@ bool TerminalDisplay::focusNextPrevChild return QWidget::focusNextPrevChild( next ); } -// Returns true upon a word boundary -// TODO determine if the below charClass() is actually required -bool TerminalDisplay::isCharBoundary(QChar qch) const -{ - if ( _wordCharacters.contains(qch, Qt::CaseInsensitive) ) return true; - if ( qch.isSpace() ) return true; - - return false; -} - QChar TerminalDisplay::charClass(QChar qch) const { if ( qch.isSpace() ) return ' '; diff -up kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h.orig kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h --- kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h.orig 2009-03-04 20:57:23.000000000 +0100 +++ kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h 2009-03-04 20:57:40.000000000 +0100 @@ -563,9 +563,6 @@ protected: // - Other characters (returns the input character) QChar charClass(QChar ch) const; - // Returns true upon a word boundary - bool isCharBoundary(QChar ch) const; - void clearImage(); void mouseTripleClickEvent(QMouseEvent* ev); Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v retrieving revision 1.359 retrieving revision 1.360 diff -u -r1.359 -r1.360 --- kdebase.spec 3 Mar 2009 11:22:47 -0000 1.359 +++ kdebase.spec 4 Mar 2009 20:59:56 -0000 1.360 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Core Files Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdebase @@ -29,6 +29,7 @@ Patch2: kdebase-4.2.1-home-icon.patch ## upstream patches +Patch100: kdebase-4.2.1-konsole-selection.patch %ifnarch s390 s390x Requires: eject @@ -125,6 +126,8 @@ %patch1 -p1 -b .konsole-session %patch2 -p1 -b .home-icon +%patch100 -p1 -b .konsole + # fix incorrect assumption that we're building in a combined kdebase tree sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt @@ -305,6 +308,9 @@ %changelog +* Wed Mar 04 2009 Than Ngo - 4.2.1-2 +- apply patch to fix regression in konsole, double-click selection works again + * Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 From nalin at fedoraproject.org Wed Mar 4 21:02:30 2009 From: nalin at fedoraproject.org (Nalin Dahyabhai) Date: Wed, 4 Mar 2009 21:02:30 +0000 (UTC) Subject: rpms/pam_krb5/devel .cvsignore, 1.54, 1.55 pam_krb5.spec, 1.67, 1.68 sources, 1.54, 1.55 Message-ID: <20090304210230.2935E70116@cvs1.fedora.phx.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/pam_krb5/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31966 Modified Files: .cvsignore pam_krb5.spec sources Log Message: - update to 2.3.4: don't request password-changing credentials with the same options that we use when requesting ticket granting tickets, which might run afoul of KDC policies Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pam_krb5/devel/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 11 Feb 2009 18:35:58 -0000 1.54 +++ .cvsignore 4 Mar 2009 21:01:59 -0000 1.55 @@ -2,3 +2,4 @@ pam_krb5-2.3.1-1.tar.gz pam_krb5-2.3.2-1.tar.gz pam_krb5-2.3.3-1.tar.gz +pam_krb5-2.3.4-1.tar.gz Index: pam_krb5.spec =================================================================== RCS file: /cvs/pkgs/rpms/pam_krb5/devel/pam_krb5.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- pam_krb5.spec 26 Feb 2009 09:34:37 -0000 1.67 +++ pam_krb5.spec 4 Mar 2009 21:01:59 -0000 1.68 @@ -1,7 +1,7 @@ Summary: A Pluggable Authentication Module for Kerberos 5. Name: pam_krb5 -Version: 2.3.3 -Release: 2%{?dist} +Version: 2.3.4 +Release: 1%{?dist} Source0: pam_krb5-%{version}-1.tar.gz License: BSD or LGPLv2+ Group: System Environment/Base @@ -48,8 +48,12 @@ %{_mandir}/man8/* %doc README* COPYING* ChangeLog NEWS -# $Id$ %changelog +* Wed Mar 4 2009 Nalin Dahyabhai - 2.3.4-1 +- don't request password-changing credentials with the same options that we + use when requesting ticket granting tickets, which might run afoul of KDC + policies + * Thu Feb 26 2009 Fedora Release Engineering - 2.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pam_krb5/devel/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 11 Feb 2009 18:35:58 -0000 1.54 +++ sources 4 Mar 2009 21:01:59 -0000 1.55 @@ -1 +1 @@ -854d9cc822f702a52c34a79020f21355 pam_krb5-2.3.3-1.tar.gz +87480e590c31e6b6a0fabc2ba3fbf7ae pam_krb5-2.3.4-1.tar.gz From than at fedoraproject.org Wed Mar 4 21:02:45 2009 From: than at fedoraproject.org (Than Ngo) Date: Wed, 4 Mar 2009 21:02:45 +0000 (UTC) Subject: rpms/kdebase/F-9 kdebase-4.2.1-konsole-selection.patch, NONE, 1.1 kdebase.spec, 1.349, 1.350 Message-ID: <20090304210245.BDE4370116@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31740 Modified Files: kdebase.spec Added Files: kdebase-4.2.1-konsole-selection.patch Log Message: apply patch to fix regression in konsole, double-click selection works again kdebase-4.2.1-konsole-selection.patch: --- NEW FILE kdebase-4.2.1-konsole-selection.patch --- diff -up kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp.orig kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp --- kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp.orig 2009-03-04 20:55:02.000000000 +0100 +++ kdebase-4.2.1/apps/konsole/src/TerminalDisplay.cpp 2009-03-04 20:57:11.000000000 +0100 @@ -2155,11 +2155,12 @@ void TerminalDisplay::mouseDoubleClickEv _wordSelectionMode = true; // find word boundaries... + QChar selClass = charClass(_image[i].character); { // find the start of the word int x = bgnSel.x(); while ( ((x>0) || (bgnSel.y()>0 && (_lineProperties[bgnSel.y()-1] & LINE_WRAPPED) )) - && !isCharBoundary(_image[i-1].character) ) + && charClass(_image[i-1].character) == selClass ) { i--; if (x>0) @@ -2178,7 +2179,7 @@ void TerminalDisplay::mouseDoubleClickEv i = loc( endSel.x(), endSel.y() ); x = endSel.x(); while( ((x<_usedColumns-1) || (endSel.y()<_usedLines-1 && (_lineProperties[endSel.y()] & LINE_WRAPPED) )) - && !isCharBoundary(_image[i+1].character) ) + && charClass(_image[i+1].character) == selClass ) { i++; if (x<_usedColumns-1) @@ -2332,16 +2333,6 @@ bool TerminalDisplay::focusNextPrevChild return QWidget::focusNextPrevChild( next ); } -// Returns true upon a word boundary -// TODO determine if the below charClass() is actually required -bool TerminalDisplay::isCharBoundary(QChar qch) const -{ - if ( _wordCharacters.contains(qch, Qt::CaseInsensitive) ) return true; - if ( qch.isSpace() ) return true; - - return false; -} - QChar TerminalDisplay::charClass(QChar qch) const { if ( qch.isSpace() ) return ' '; diff -up kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h.orig kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h --- kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h.orig 2009-03-04 20:57:23.000000000 +0100 +++ kdebase-4.2.1/apps/konsole/src/TerminalDisplay.h 2009-03-04 20:57:40.000000000 +0100 @@ -563,9 +563,6 @@ protected: // - Other characters (returns the input character) QChar charClass(QChar ch) const; - // Returns true upon a word boundary - bool isCharBoundary(QChar ch) const; - void clearImage(); void mouseTripleClickEvent(QMouseEvent* ev); Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v retrieving revision 1.349 retrieving revision 1.350 diff -u -r1.349 -r1.350 --- kdebase.spec 3 Mar 2009 11:22:47 -0000 1.349 +++ kdebase.spec 4 Mar 2009 21:02:15 -0000 1.350 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Core Files Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdebase @@ -29,6 +29,7 @@ Patch2: kdebase-4.2.1-home-icon.patch ## upstream patches +Patch100: kdebase-4.2.1-konsole-selection.patch %ifnarch s390 s390x Requires: eject @@ -125,6 +126,8 @@ %patch1 -p1 -b .konsole-session %patch2 -p1 -b .home-icon +%patch100 -p1 -b .konsole + # fix incorrect assumption that we're building in a combined kdebase tree sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt @@ -305,6 +308,9 @@ %changelog +* Wed Mar 04 2009 Than Ngo - 4.2.1-2 +- apply patch to fix regression in konsole, double-click selection works again + * Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 From spot at fedoraproject.org Wed Mar 4 21:02:52 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 21:02:52 +0000 (UTC) Subject: rpms/xpdf/F-9 xpdf.spec,1.12,1.13 Message-ID: <20090304210252.EB6AE70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/extras/rpms/xpdf/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32022/F-9 Modified Files: xpdf.spec Log Message: fix missing font dependency Index: xpdf.spec =================================================================== RCS file: /cvs/extras/rpms/xpdf/F-9/xpdf.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xpdf.spec 11 Feb 2009 17:07:50 -0000 1.12 +++ xpdf.spec 4 Mar 2009 21:02:22 -0000 1.13 @@ -1,7 +1,7 @@ Summary: A PDF file viewer for the X Window System Name: xpdf Version: 3.02 -Release: 10%{?dist} +Release: 12%{?dist} License: GPLv2 Epoch: 1 Url: http://www.foolabs.com/xpdf/ @@ -68,6 +68,7 @@ Requires: xdg-utils Requires: poppler-utils Requires: xorg-x11-fonts-ISO8859-1-75dpi +Requires: xorg-x11-fonts-ISO8859-1-100dpi BuildRequires: lesstif-devel BuildRequires: freetype-devel >= 2.1.7 @@ -268,6 +269,12 @@ %{_datadir}/xpdf/latin2 %changelog +* Wed Mar 4 2009 Tom "spot" Callaway - 1:3.02-12 +- add Requires: xorg-x11-fonts-ISO8859-1-100dpi (bz 485404) + +* Thu Feb 26 2009 Fedora Release Engineering - 1:3.02-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Feb 11 2009 Tom "spot" Callaway - 1:3.02-10 - cleanup crash patch a bit (bz 483664) - improve support for more mouse buttons (bz 483669) From spot at fedoraproject.org Wed Mar 4 21:02:52 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 21:02:52 +0000 (UTC) Subject: rpms/xpdf/F-10 xpdf.spec,1.13,1.14 Message-ID: <20090304210252.9889270116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/extras/rpms/xpdf/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32022/F-10 Modified Files: xpdf.spec Log Message: fix missing font dependency Index: xpdf.spec =================================================================== RCS file: /cvs/extras/rpms/xpdf/F-10/xpdf.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xpdf.spec 11 Feb 2009 17:07:50 -0000 1.13 +++ xpdf.spec 4 Mar 2009 21:02:22 -0000 1.14 @@ -1,7 +1,7 @@ Summary: A PDF file viewer for the X Window System Name: xpdf Version: 3.02 -Release: 10%{?dist} +Release: 12%{?dist} License: GPLv2 Epoch: 1 Url: http://www.foolabs.com/xpdf/ @@ -68,6 +68,7 @@ Requires: xdg-utils Requires: poppler-utils Requires: xorg-x11-fonts-ISO8859-1-75dpi +Requires: xorg-x11-fonts-ISO8859-1-100dpi BuildRequires: lesstif-devel BuildRequires: freetype-devel >= 2.1.7 @@ -268,6 +269,12 @@ %{_datadir}/xpdf/latin2 %changelog +* Wed Mar 4 2009 Tom "spot" Callaway - 1:3.02-12 +- add Requires: xorg-x11-fonts-ISO8859-1-100dpi (bz 485404) + +* Thu Feb 26 2009 Fedora Release Engineering - 1:3.02-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Feb 11 2009 Tom "spot" Callaway - 1:3.02-10 - cleanup crash patch a bit (bz 483664) - improve support for more mouse buttons (bz 483669) From spot at fedoraproject.org Wed Mar 4 21:02:53 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 21:02:53 +0000 (UTC) Subject: rpms/xpdf/devel xpdf.spec,1.14,1.15 Message-ID: <20090304210253.3A0E470116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/extras/rpms/xpdf/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32022/devel Modified Files: xpdf.spec Log Message: fix missing font dependency Index: xpdf.spec =================================================================== RCS file: /cvs/extras/rpms/xpdf/devel/xpdf.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xpdf.spec 26 Feb 2009 11:50:24 -0000 1.14 +++ xpdf.spec 4 Mar 2009 21:02:22 -0000 1.15 @@ -1,7 +1,7 @@ Summary: A PDF file viewer for the X Window System Name: xpdf Version: 3.02 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 Epoch: 1 Url: http://www.foolabs.com/xpdf/ @@ -68,6 +68,7 @@ Requires: xdg-utils Requires: poppler-utils Requires: xorg-x11-fonts-ISO8859-1-75dpi +Requires: xorg-x11-fonts-ISO8859-1-100dpi BuildRequires: lesstif-devel BuildRequires: freetype-devel >= 2.1.7 @@ -268,6 +269,9 @@ %{_datadir}/xpdf/latin2 %changelog +* Wed Mar 4 2009 Tom "spot" Callaway - 1:3.02-12 +- add Requires: xorg-x11-fonts-ISO8859-1-100dpi (bz 485404) + * Thu Feb 26 2009 Fedora Release Engineering - 1:3.02-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From steved at fedoraproject.org Wed Mar 4 21:15:21 2009 From: steved at fedoraproject.org (Steve Dickson) Date: Wed, 4 Mar 2009 21:15:21 +0000 (UTC) Subject: rpms/nfs-utils/devel nfs-utils-1.1.4-configure.patch, NONE, 1.1 nfs-utils.spec, 1.215, 1.216 Message-ID: <20090304211521.A42A070116@cvs1.fedora.phx.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2240 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.1.4-configure.patch Log Message: configure: fix AC_CACHE_VAL warnings nfs-utils-1.1.4-configure.patch: --- NEW FILE nfs-utils-1.1.4-configure.patch --- commit 38667906c89d6944faaced7fbcda027643dc10ad Author: Chuck Lever Date: Wed Mar 4 15:54:39 2009 -0500 configure: fix AC_CACHE_VAL warnings on Fedora 10 Autoconf 2.63 (and maybe earlier releases) complains about the cache variable name used in aclocal/libblkid.m4: configure.ac:217: warning: AC_CACHE_VAL(libblkid_is_recent, ...): suspicious cache-id, must contain _cv_ to be cached ../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from... aclocal/libblkid.m4:2: AC_BLKID_VERS is expanded from... configure.ac:217: the top level This addresses https://bugzilla.redhat.com/attachment.cgi?bugid=481386 . Signed-off-by: Chuck Lever Signed-off-by: Steve Dickson diff --git a/aclocal/libblkid.m4 b/aclocal/libblkid.m4 index d751a8c..10824e9 100644 --- a/aclocal/libblkid.m4 +++ b/aclocal/libblkid.m4 @@ -1,7 +1,7 @@ dnl *************************** libblkid needs version 1.40 or later *********************** AC_DEFUN([AC_BLKID_VERS], [ AC_MSG_CHECKING(for suitable libblkid version) - AC_CACHE_VAL(libblkid_is_recent, + AC_CACHE_VAL([libblkid_cv_is_recent], [ saved_LIBS="$LIBS" LIBS=-lblkid @@ -12,9 +12,8 @@ AC_DEFUN([AC_BLKID_VERS], [ int vers = blkid_get_library_version(0, 0); return vers >= 140 ? 0 : 1; } - ], libblkid_is_recent=yes, libblkid_is_recent=no, - libblkid_is_recent=unknown) - LIBS="$saved_LIBS" - ])dnl - AC_MSG_RESULT($libblkid_is_recent) + ], [libblkid_cv_is_recent=yes], [libblkid_cv_is_recent=no], + [libblkid_cv_is_recent=unknown]) + LIBS="$saved_LIBS"]) + AC_MSG_RESULT($libblkid_cv_is_recent) ])dnl diff --git a/configure.ac b/configure.ac index c8508f1..4fd111f 100644 --- a/configure.ac +++ b/configure.ac @@ -219,9 +219,9 @@ if test "$choose_blkid" != no; then AC_BLKID_VERS if test $choose_blkid = yes; then use_blkid=1 - test $libblkid_is_recent = no && AC_MSG_WARN([libblkid is old and may cause mountd to leak memory]) + test $libblkid_cv_is_recent = no && AC_MSG_WARN([libblkid is old and may cause mountd to leak memory]) else - if test $libblkid_is_recent = yes + if test $libblkid_cv_is_recent = yes then use_blkid=1 else use_blkid=0 AC_MSG_WARN([uuid support disabled as libblkid is too old]) Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- nfs-utils.spec 26 Feb 2009 05:32:25 -0000 1.215 +++ nfs-utils.spec 4 Mar 2009 21:14:51 -0000 1.216 @@ -2,7 +2,7 @@ Name: nfs-utils URL: http://sourceforge.net/projects/nfs Version: 1.1.4 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 1 # group all 32bit related archs @@ -52,6 +52,7 @@ Patch123: nfs-utils-1.1.4-mount-udponly.patch Patch124: nfs-utils-1.1.4-umount-ipv6.patch Patch125: nfs-utils-1.1.4-export-hash.patch +Patch126: nfs-utils-1.1.4-configure.patch %if %{enablefscache} Patch90: nfs-utils-1.1.0-mount-fsc.patch @@ -132,6 +133,7 @@ %patch123 -p1 %patch124 -p1 %patch125 -p1 +%patch126 -p1 %if %{enablefscache} %patch90 -p1 @@ -295,6 +297,9 @@ %attr(4755,root,root) /sbin/umount.nfs4 %changelog +* Wed Mar 4 2009 Steve Dickson 1.1.4-21 +- configure: fix AC_CACHE_VAL warnings + * Wed Feb 25 2009 Fedora Release Engineering - 1:1.1.4-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From notting at fedoraproject.org Wed Mar 4 21:23:38 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Wed, 4 Mar 2009 21:23:38 +0000 (UTC) Subject: comps comps-f11.xml.in,1.139,1.140 Message-ID: <20090304212338.752C670116@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3543 Modified Files: comps-f11.xml.in Log Message: Remove now-in-Core packages from other groups. Index: comps-f11.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f11.xml.in,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- comps-f11.xml.in 4 Mar 2009 20:40:19 -0000 1.139 +++ comps-f11.xml.in 4 Mar 2009 21:23:08 -0000 1.140 @@ -180,7 +180,6 @@ bc bind-utils bzip2 - cronie crontabs cyrus-sasl-plain ed @@ -240,7 +239,6 @@ ntfsprogs numactl openssh-clients - openssh-server pam_ccreds pam_krb5 pam_passwdqc @@ -4603,7 +4601,6 @@ arj arptables_jf arpwatch - audit autofs avahi-tools bash-completion From ajax at fedoraproject.org Wed Mar 4 21:26:29 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Wed, 4 Mar 2009 21:26:29 +0000 (UTC) Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.417, 1.418 xserver-1.6.0-primary.patch, 1.1, 1.2 Message-ID: <20090304212629.08FA070116@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4067 Modified Files: xorg-x11-server.spec xserver-1.6.0-primary.patch Log Message: * Wed Mar 04 2009 Adam Jackson 1.6.0-6 - Move fedora-setup-keyboard (and libdrm) Requires to the Xorg subpackage, since they won't do anything at the top level. - Remove BR: freetype freetype-devel. - xserver-1.6.0-primary.patch: Only consider actual VGA devices. Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.417 retrieving revision 1.418 diff -u -r1.417 -r1.418 --- xorg-x11-server.spec 4 Mar 2009 01:14:57 -0000 1.417 +++ xorg-x11-server.spec 4 Mar 2009 21:25:58 -0000 1.418 @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.0 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -45,10 +45,7 @@ # ABI version provides. # XXX don't enable any of this yet. for serious. Source30: find-provides -#{expand:%%define prev__find_provides %{__find_provides}} -#define pc_path %{buildroot}/%{_libdir}/pkgconfig/xorg-server.pc -#define __find_provides %{SOURCE30} %{pc_path} %{prev__find_provides} -#define __find_provides %{nil} +#define __find_provides {nil} # OpenGL compositing manager feature/optimization patches. Patch100: xorg-x11-server-1.1.0-no-move-damage.patch @@ -88,7 +85,7 @@ Patch6015: xserver-1.5.99.902-vnc.patch # Make autoconfiguration chose nouveau driver for NVIDIA GPUs -Patch6017: xserver-1.5.99.902-nouveau.patch +Patch6016: xserver-1.5.99.902-nouveau.patch # from master, may end up in 1.6.1. Patch6018: xserver-1.6.0-XIPropToInt.patch @@ -128,7 +125,6 @@ BuildRequires: libfontenc-devel libXtst-devel libXdmcp-devel BuildRequires: libX11-devel libXext-devel BuildRequires: libXinerama-devel -BuildRequires: freetype freetype-devel # DMX config utils buildreqs. BuildRequires: libXt-devel libdmx-devel libXmu-devel libXrender-devel @@ -144,10 +140,6 @@ # BuildRequires: mesa-source >= 7.1-0.36 # XXX silly... BuildRequires: libdrm-devel >= 2.4.0 kernel-devel -%if %{with_hw_servers} -Requires: libdrm >= 2.4.0 -Requires: fedora-setup-keyboard -%endif BuildRequires: audit-libs-devel libselinux-devel >= 2.0.59-1 BuildRequires: hal-devel dbus-devel @@ -181,6 +173,8 @@ # virtuals. XXX fix the xkbcomp fork() upstream. Requires: xkbdata xkbcomp Requires: xorg-x11-server-common >= %{version}-%{release} +Requires: libdrm >= 2.4.0 +Requires: fedora-setup-keyboard # Dropped from F9 for being broken, uninstall it. Obsoletes: xorg-x11-drv-magictouch <= 1.0.0.5-5.fc8 # Force sufficiently new libpciaccess @@ -513,6 +507,12 @@ %changelog +* Wed Mar 04 2009 Adam Jackson 1.6.0-6 +- Move fedora-setup-keyboard (and libdrm) Requires to the Xorg subpackage, + since they won't do anything at the top level. +- Remove BR: freetype freetype-devel. +- xserver-1.6.0-primary.patch: Only consider actual VGA devices. + * Wed Mar 04 2009 Peter Hutterer 1.6.0-5 - Drop our own fedora-setup-keyboard script, Require: fedora-setup-keyboard package instead. xserver-1.6.0-primary.patch: Index: xserver-1.6.0-primary.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.0-primary.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xserver-1.6.0-primary.patch 3 Mar 2009 19:34:21 -0000 1.1 +++ xserver-1.6.0-primary.patch 4 Mar 2009 21:25:58 -0000 1.2 @@ -1,17 +1,30 @@ -From 9ee22b4f743a2850fed35f179c56f94ce4bb5242 Mon Sep 17 00:00:00 2001 +From 69e53f2493c142ef5569af01ce52565be5b2976e Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 3 Mar 2009 10:58:33 -0500 Subject: [PATCH] Primary video device hack --- - hw/xfree86/common/xf86pciBus.c | 54 ++++++++++++++++++++++++++++++++++----- - 1 files changed, 47 insertions(+), 7 deletions(-) + hw/xfree86/common/xf86pciBus.c | 60 ++++++++++++++++++++++++++++++++-------- + 1 files changed, 48 insertions(+), 12 deletions(-) diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c -index 467a0c3..f9999d8 100644 +index 467a0c3..0d2d01c 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c -@@ -341,6 +341,39 @@ restorePciBusState(BusAccPtr ptr) +@@ -60,11 +60,7 @@ static struct pci_device ** xf86PciVideoInfo = NULL; /* PCI probe for video hw * + /* PCI classes that get included in xf86PciVideoInfo */ + #define PCIINFOCLASSES(c) \ + ( (((c) & 0x00ff0000) == (PCI_CLASS_PREHISTORIC << 16)) \ +- || (((c) & 0x00ff0000) == (PCI_CLASS_DISPLAY << 16)) \ +- || ((((c) & 0x00ffff00) \ +- == ((PCI_CLASS_MULTIMEDIA << 16) | (PCI_SUBCLASS_MULTIMEDIA_VIDEO << 8)))) \ +- || ((((c) & 0x00ffff00) \ +- == ((PCI_CLASS_PROCESSOR << 16) | (PCI_SUBCLASS_PROCESSOR_COPROC << 8)))) ) ++ || (((c) & 0x00ff0000) == (PCI_CLASS_DISPLAY << 16)) ) + + /* + * PCI classes that have messages printed always. The others are only +@@ -341,6 +337,39 @@ restorePciBusState(BusAccPtr ptr) } #undef MASKBITS @@ -51,7 +64,7 @@ /* * xf86Bus.c interface -@@ -375,24 +408,31 @@ xf86PciProbe(void) +@@ -375,24 +404,31 @@ xf86PciProbe(void) } } From pkgdb at fedoraproject.org Wed Mar 4 21:31:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 21:31:55 +0000 Subject: [pkgdb] mingw32-glib2: epienbro has requested commit Message-ID: <20090304213155.E6619208544@bastion.fedora.phx.redhat.com> epienbro has requested the commit acl on mingw32-glib2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2 From pkgdb at fedoraproject.org Wed Mar 4 21:32:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 21:32:06 +0000 Subject: [pkgdb] mingw32-glib2: epienbro has requested watchcommits Message-ID: <20090304213206.504E920854F@bastion.fedora.phx.redhat.com> epienbro has requested the watchcommits acl on mingw32-glib2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2 From pkgdb at fedoraproject.org Wed Mar 4 21:32:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 21:32:28 +0000 Subject: [pkgdb] mingw32-gtk2: epienbro has requested commit Message-ID: <20090304213308.5ECEB208543@bastion.fedora.phx.redhat.com> epienbro has requested the commit acl on mingw32-gtk2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2 From pkgdb at fedoraproject.org Wed Mar 4 21:32:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 21:32:49 +0000 Subject: [pkgdb] mingw32-gtk2: epienbro has requested watchcommits Message-ID: <20090304213310.B672F208547@bastion.fedora.phx.redhat.com> epienbro has requested the watchcommits acl on mingw32-gtk2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2 From than at fedoraproject.org Wed Mar 4 21:33:16 2009 From: than at fedoraproject.org (Than Ngo) Date: Wed, 4 Mar 2009 21:33:16 +0000 (UTC) Subject: rpms/kdepim/devel kdepim-4.2.1-imap.patch, NONE, 1.1 kdepim.spec, 1.208, 1.209 Message-ID: <20090304213316.1B2A170116@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdepim/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5302 Modified Files: kdepim.spec Added Files: kdepim-4.2.1-imap.patch Log Message: upstream patch, speed up folder syncing kdepim-4.2.1-imap.patch: --- NEW FILE kdepim-4.2.1-imap.patch --- Index: kmail/kmfoldercachedimap.cpp =================================================================== --- kmail/kmfoldercachedimap.cpp (Revision 935084) +++ kmail/kmfoldercachedimap.cpp (Revision 935085) @@ -202,7 +202,8 @@ /*mHoldSyncs( false ),*/ mFolderRemoved( false ), mRecurse( true ), - mStatusChangedLocally( false ), mAnnotationFolderTypeChanged( false ), + mStatusChangedLocally( false ), + mAnnotationFolderTypeChanged( false ), mIncidencesForChanged( false ), mPersonalNamespacesCheckDone( true ), mQuotaInfo(), mAlarmsBlocked( false ), mRescueCommandCount( 0 ), @@ -303,18 +304,22 @@ KMFolderMaildir::readConfig(); mStatusChangedLocally = group.readEntry( "StatusChangedLocally", false ); + QStringList uidsChanged = group.readEntry( "UIDStatusChangedLocally", QStringList() ); + foreach( const QString &uid, uidsChanged ) { + mUIDsOfLocallyChangedStatuses.append( uid.toUInt() ); + } mAnnotationFolderTypeChanged = group.readEntry( "AnnotationFolderTypeChanged", false ); mIncidencesForChanged = group.readEntry( "IncidencesForChanged", false ); if ( mImapPath.isEmpty() ) { mImapPathCreation = group.readEntry("ImapPathCreation"); } - QStringList uids = group.readEntry( "UIDSDeletedSinceLastSync", QStringList() ); + QStringList delUids = group.readEntry( "UIDSDeletedSinceLastSync" , QStringList() ); #if MAIL_LOSS_DEBUGGING kDebug( 5006 ) << "READING IN UIDSDeletedSinceLastSync: " << folder()->prettyUrl() << endl << uids; #endif - for ( QStringList::iterator it = uids.begin(); it != uids.end(); ++it ) { - mDeletedUIDsSinceLastSync.insert( (*it).toULong(), 0); + for ( QStringList::iterator it = delUids.begin(); it != delUids.end(); it++ ) { + mDeletedUIDsSinceLastSync.insert( (*it).toULong(), 0); } } @@ -331,7 +336,14 @@ configGroup.writeEntry( "NoContent", mNoContent ); configGroup.writeEntry( "ReadOnly", mReadOnly ); configGroup.writeEntry( "FolderAttributes", mFolderAttributes ); - configGroup.writeEntry( "StatusChangedLocally", mStatusChangedLocally ); + + // StatusChangedLocally is always false, as we use UIDStatusChangedLocally now + configGroup.writeEntry( "StatusChangedLocally", false ); + QStringList uidsToWrite; + foreach( const ulong uid, mUIDsOfLocallyChangedStatuses ) { + uidsToWrite.append( QString::number( uid ) ); + } + configGroup.writeEntry( "UIDStatusChangedLocally", uidsToWrite ); if ( !mImapPathCreation.isEmpty() ) { if ( mImapPath.isEmpty() ) { configGroup.writeEntry( "ImapPathCreation", mImapPathCreation ); @@ -953,12 +965,13 @@ // Upload flags, unless we know from the ACL that we're not allowed // to do that or they did not change locally if ( mUserRights <= 0 || ( mUserRights & KMail::ACLJobs::WriteFlags ) ) { - if ( mStatusChangedLocally ) { + if ( !mUIDsOfLocallyChangedStatuses.isEmpty() || mStatusChangedLocally ) { uploadFlags(); break; } - } else if ( mUserRights & KMail::ACLJobs::WriteSeenFlag ) { - if ( mStatusChangedLocally ) { + } + else if ( mUserRights & KMail::ACLJobs::WriteSeenFlag ) { + if ( !mUIDsOfLocallyChangedStatuses.isEmpty() || mStatusChangedLocally ) { uploadSeenFlags(); break; } @@ -1425,6 +1438,10 @@ // Either not a valid message or not one that is on the server yet continue; } + if ( mUIDsOfLocallyChangedStatuses.indexOf( msg->UID() ) < 0 && !mStatusChangedLocally ) { + // This message has not had its status changed locally + continue; + } QString flags = KMFolderImap::statusToFlags( msg->status(), mPermanentFlags ); // Collect uids for each typem of flags. @@ -1468,6 +1485,11 @@ // Either not a valid message or not one that is on the server yet continue; + if ( mUIDsOfLocallyChangedStatuses.indexOf( msg->UID() ) < 0 && !mStatusChangedLocally ) { + // This message has not had its status changed locally + continue; + } + if ( msg->status().isOld() || msg->status().isRead() ) seenUids.append( msg->UID() ); else @@ -1525,13 +1547,21 @@ void KMFolderCachedImap::setStatus( int idx, const MessageStatus &status, bool toggle ) { KMFolderMaildir::setStatus( idx, status, toggle ); - mStatusChangedLocally = true; + const KMMsgBase *msg = getMsgBase( idx ); + Q_ASSERT( msg ); + if ( msg ) + mUIDsOfLocallyChangedStatuses.append( msg->UID() ); } void KMFolderCachedImap::setStatus( QList &ids, const MessageStatus &status, bool toggle ) { KMFolderMaildir::setStatus( ids, status, toggle ); - mStatusChangedLocally = true; + foreach( const int id, ids ) { + const KMMsgBase *msg = getMsgBase( id ); + Q_ASSERT( msg ); + if ( msg ) + mUIDsOfLocallyChangedStatuses.append( msg->UID() ); + } } /* Upload new folders to server */ @@ -1888,7 +1918,8 @@ } else { if ( lastSet ) { // always true here (this comes from online-imap...) mContentState = imapFinished; - mStatusChangedLocally = false; // we are up to date again + mUIDsOfLocallyChangedStatuses.clear(); // we are up to date again + mStatusChangedLocally = false; } } serverSyncInternal(); Index: kmail/kmfoldercachedimap.h =================================================================== --- kmail/kmfoldercachedimap.h (Revision 935084) +++ kmail/kmfoldercachedimap.h (Revision 935085) @@ -627,12 +627,18 @@ bool mFolderRemoved; bool mRecurse; + /** + * UIDs added by setStatus. Indicates that the client has changed + * the status of those mails. The mail flags for changed mails will be + * uploaded to the server, overwriting the server's notion of the status + * of the mails in this folder. + */ + QList mUIDsOfLocallyChangedStatuses; + /** - Set to true by setStatus. Indicates that the client has changed - the status of at least one mail. The mail flags will therefore be - uploaded to the server, overwriting the server's notion of the status - of the mails in this folder. - */ + * Same as above, but uploads the flags of all mails, even if not all changed. + * Only still here for config compatibility. + */ bool mStatusChangedLocally; /** Index: kdepim.spec =================================================================== RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- kdepim.spec 27 Feb 2009 12:41:03 -0000 1.208 +++ kdepim.spec 4 Mar 2009 21:32:45 -0000 1.209 @@ -6,7 +6,7 @@ Summary: PIM (Personal Information Manager) applications Epoch: 6 Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/Productivity @@ -14,6 +14,8 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Patch0: kdepim-4.1.80-libqgpgme-link-fix.patch # upstream patches +Patch100: kdepim-4.2.1-imap.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: kdepim4 = %{version}-%{release} @@ -92,6 +94,7 @@ %patch0 -p1 -b .libqgpgme-link-fix # upstream patches +%patch100 -p0 -b .imap %build mkdir -p %{_target_platform} @@ -181,6 +184,9 @@ %changelog +* Wed Mar 04 2009 Than Ngo - 4.2.1-2 +- upstream patch, speed up folder syncing + * Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 From davidz at fedoraproject.org Wed Mar 4 21:33:47 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Wed, 4 Mar 2009 21:33:47 +0000 (UTC) Subject: rpms/gvfs/devel gvfs-gdu-volume-monitor-3.patch, NONE, 1.1 gvfs.spec, 1.110, 1.111 gvfs-gdu.patch, 1.1, NONE Message-ID: <20090304213347.E475B70116@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/gvfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5408 Modified Files: gvfs.spec Added Files: gvfs-gdu-volume-monitor-3.patch Removed Files: gvfs-gdu.patch Log Message: * Wed Mar 4 2009 David Zeuthen - 1.1.7-3 - Update GVfs gdu patch to fix mount detection confusion (#488399) gvfs-gdu-volume-monitor-3.patch: --- NEW FILE gvfs-gdu-volume-monitor-3.patch --- Index: configure.ac =================================================================== --- configure.ac (revision 2286) +++ configure.ac (working copy) @@ -198,6 +198,31 @@ AM_CONDITIONAL(USE_GCONF, [test "$msg_gconf" = "yes"]) +dnl ************************************ +dnl *** Check for gnome-disk-utility *** +dnl ************************************ + +dnl TODO: when there is a more stable version of gdu available, turn this on by default +AC_ARG_ENABLE(gdu, [ --enable-gdu build with gdu support]) +msg_gdu=no +GDU_LIBS= +GDU_CFLAGS= +GDU_REQUIRED=0.2 + +if test "x$enable_gdu" = "xyes"; then + PKG_CHECK_EXISTS([gdu >= $GDU_REQUIRED], msg_gdu=yes) + + if test "x$msg_gdu" == "xyes"; then + PKG_CHECK_MODULES([GDU],[gdu >= $GDU_REQUIRED]) + AC_DEFINE(HAVE_GDU, 1, [Define to 1 if gnome-disk-utility is available]) + fi +fi + +AC_SUBST(GDU_LIBS) +AC_SUBST(GDU_CFLAGS) + +AM_CONDITIONAL(USE_GDU, [test "$msg_gdu" = "yes"]) + dnl ********************** dnl *** Check for HAL *** dnl ********************** @@ -558,6 +583,7 @@ monitor/Makefile monitor/proxy/Makefile monitor/hal/Makefile +monitor/gdu/Makefile monitor/gphoto2/Makefile gconf/Makefile programs/Makefile @@ -579,7 +605,8 @@ archive support: $msg_archive GConf support: $msg_gconf DNS-SD support: $msg_avahi - Use HAL for volume monitor: $msg_hal (with fast init path: $have_hal_fast_init) + Build HAL volume monitor: $msg_hal (with fast init path: $have_hal_fast_init) + Build GDU volume monitor: $msg_gdu GNOME Keyring support: $msg_keyring Bash-completion support: $msg_bash_completion " Index: monitor/Makefile.am =================================================================== --- monitor/Makefile.am (revision 2286) +++ monitor/Makefile.am (working copy) @@ -5,6 +5,10 @@ SUBDIRS += hal endif +if USE_GDU +SUBDIRS += gdu +endif + if USE_GPHOTO2 SUBDIRS += gphoto2 endif --- /dev/null 2009-03-04 16:07:30.099029290 -0500 +++ monitor/gdu/gdu-volume-monitor-daemon.c 2009-03-01 23:47:15.000000000 -0500 @@ -0,0 +1,46 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* gvfs - extensions for gio + * + * Copyright (C) 2006-2009 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 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. + * + * Author: David Zeuthen + */ + +#include + +#include +#include +#include +#include + +#include + +#include "ggduvolumemonitor.h" + +int +main (int argc, char *argv[]) +{ + g_vfs_proxy_volume_monitor_daemon_init (); + + g_set_application_name (_("GVfs GDU Volume Monitor")); + + return g_vfs_proxy_volume_monitor_daemon_main (argc, + argv, + "org.gtk.Private.GduVolumeMonitor", + G_TYPE_GDU_VOLUME_MONITOR); +} --- /dev/null 2009-03-04 16:07:30.099029290 -0500 +++ monitor/gdu/ggdudrive.c 2009-03-01 23:48:33.000000000 -0500 @@ -0,0 +1,691 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* gvfs - extensions for gio + * + * Copyright (C) 2006-2009 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 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. + * + * Author: David Zeuthen + */ + +#include + +#include +#include +#include + +#include +#include + +#include "ggduvolumemonitor.h" +#include "ggdudrive.h" +#include "ggduvolume.h" + +struct _GGduDrive { + GObject parent; + + GVolumeMonitor *volume_monitor; /* owned by volume monitor */ + GList *volumes; /* entries in list are owned by volume_monitor */ + + GduPresentable *presentable; + + /* the following members need to be set upon construction */ + GIcon *icon; + gchar *name; + gchar *device_file; + gboolean is_media_removable; + gboolean has_media; + gboolean can_eject; + gboolean can_poll_for_media; + gboolean is_media_check_automatic; + time_t time_of_last_media_insertion; +}; + +static void g_gdu_drive_drive_iface_init (GDriveIface *iface); + +G_DEFINE_TYPE_EXTENDED (GGduDrive, g_gdu_drive, G_TYPE_OBJECT, 0, + G_IMPLEMENT_INTERFACE (G_TYPE_DRIVE, + g_gdu_drive_drive_iface_init)) + +static void presentable_changed (GduPresentable *presentable, + GGduDrive *drive); + +static void presentable_job_changed (GduPresentable *presentable, + GGduDrive *drive); + +static void +g_gdu_drive_finalize (GObject *object) +{ + GList *l; + GGduDrive *drive; + + drive = G_GDU_DRIVE (object); + + for (l = drive->volumes; l != NULL; l = l->next) + { [...4760 lines suppressed...] + "Error parsing reply for ObtainAuthorization(): %s: %s", + derror.name, derror.message); + dbus_error_free (&derror); + goto out; + } + + if (!gained_authz && error == NULL) + { + /* no need to translate, is never shown */ + g_simple_async_result_set_error (simple, + G_IO_ERROR, + G_IO_ERROR_FAILED_HANDLED, + "Didn't obtain authorization (bug in libgio user, it shouldn't display this error)"); + } + + out: + g_simple_async_result_complete (simple); + g_object_unref (simple); +} + + +gboolean +_obtain_authz_finish (GAsyncResult *res, + GError **error) +{ + GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res); + + g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == _obtain_authz); + + if (g_simple_async_result_propagate_error (simple, error)) + return FALSE; + else + return TRUE; +} + +void +_obtain_authz (const gchar *action_id, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + DBusConnection *connection; + DBusMessage *message; + GSimpleAsyncResult *simple; + guint xid; + guint pid; + DBusError derror; + + dbus_error_init (&derror); + + /* this connection is already integrated and guaranteed to exist, see gvfsproxyvolumemonitordaemon.c */ + connection = dbus_bus_get (DBUS_BUS_SESSION, &derror); + + simple = g_simple_async_result_new (NULL, + callback, + user_data, + _obtain_authz); + + message = dbus_message_new_method_call ("org.freedesktop.PolicyKit.AuthenticationAgent", /* bus name */ + "/", /* object */ + "org.freedesktop.PolicyKit.AuthenticationAgent", /* interface */ + "ObtainAuthorization"); + + xid = 0; + pid = getpid (); + + dbus_message_append_args (message, + DBUS_TYPE_STRING, + &(action_id), + DBUS_TYPE_UINT32, + &(xid), + DBUS_TYPE_UINT32, + &(pid), + DBUS_TYPE_INVALID); + + _g_dbus_connection_call_async (connection, + message, + -1, + (GAsyncDBusCallback) _obtain_authz_cb, + simple); + dbus_message_unref (message); + dbus_connection_unref (connection); +} --- /dev/null 2009-03-04 16:07:30.099029290 -0500 +++ monitor/gdu/polkit.h 2009-03-01 23:47:41.000000000 -0500 @@ -0,0 +1,44 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* gvfs - extensions for gio + * + * Copyright (C) 2006-2009 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 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. + * + * Author: David Zeuthen + */ + + +#ifndef __POLKIT_H__ +#define __POLKIT_H__ + +#include +#include +#include + +G_BEGIN_DECLS + +void _obtain_authz (const gchar *action_id, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean _obtain_authz_finish (GAsyncResult *res, + GError **error); + +G_END_DECLS + +#endif /* __POLKIT_H__ */ --- /dev/null 2009-03-04 16:07:30.099029290 -0500 +++ monitor/gdu/Makefile.am 2009-03-01 21:13:46.000000000 -0500 @@ -0,0 +1,53 @@ + +NULL = + +libexec_PROGRAMS = gvfs-gdu-volume-monitor + + +gvfs_gdu_volume_monitor_SOURCES = \ + gdu-volume-monitor-daemon.c \ + ggdudrive.c ggdudrive.h \ + ggduvolume.c ggduvolume.h \ + ggdumount.c ggdumount.h \ + ggduvolumemonitor.c ggduvolumemonitor.h \ + polkit.c polkit.h \ + $(NULL) + +gvfs_gdu_volume_monitor_CFLAGS = \ + -DG_LOG_DOMAIN=\"GVFS-Gdu\" \ + -I$(top_srcdir)/common \ + -I$(top_srcdir)/monitor/proxy \ + $(GLIB_CFLAGS) \ + $(GDU_CFLAGS) \ + $(DBUS_CFLAGS) \ + -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \ + -DGVFS_LOCALEDIR=\""$(localedir)"\" \ + -DG_DISABLE_DEPRECATED \ + -DGDU_API_IS_SUBJECT_TO_CHANGE \ + $(NULL) + +gvfs_gdu_volume_monitor_LDFLAGS = \ + $(NULL) + +gvfs_gdu_volume_monitor_LDADD = \ + $(GLIB_LIBS) \ + $(GDU_LIBS) \ + $(DBUS_LIBS) \ + $(top_builddir)/common/libgvfscommon.la \ + $(top_builddir)/monitor/proxy/libgvfsproxyvolumemonitordaemon-noin.la \ + $(NULL) + +remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors +remote_volume_monitors_DATA = gdu.monitor + +servicedir = $(datadir)/dbus-1/services +service_in_files = org.gtk.Private.GduVolumeMonitor.service.in +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + +clean-local: + rm -f *~ *.loT $(BUILT_SOURCES) $(service_DATA) + +EXTRA_DIST = $(service_in_files) gdu.monitor --- /dev/null 2009-03-04 16:07:30.099029290 -0500 +++ monitor/gdu/gdu.monitor 2009-02-11 06:42:26.000000000 -0500 @@ -0,0 +1,5 @@ +[RemoteVolumeMonitor] +Name=GProxyVolumeMonitorGdu +DBusName=org.gtk.Private.GduVolumeMonitor +IsNative=true +NativePriority=3 --- /dev/null 2009-03-04 16:07:30.099029290 -0500 +++ monitor/gdu/org.gtk.Private.GduVolumeMonitor.service.in 2009-02-19 22:34:26.000000000 -0500 @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.gtk.Private.GduVolumeMonitor +Exec=@libexecdir@/gvfs-gdu-volume-monitor Index: gvfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- gvfs.spec 3 Mar 2009 04:46:29 -0000 1.110 +++ gvfs.spec 4 Mar 2009 21:33:17 -0000 1.111 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.1.7 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -32,7 +32,7 @@ Patch1: gvfs-0.99.2-archive-integration.patch # http://bugzilla.gnome.org/show_bug.cgi?id=573826 -Patch2: gvfs-gdu.patch +Patch2: gvfs-gdu-volume-monitor-3.patch %description The gvfs package provides backend implementations for the gio @@ -259,6 +259,9 @@ %changelog +* Wed Mar 4 2009 David Zeuthen - 1.1.7-3 +- Update GVfs gdu patch to fix mount detection confusion (#488399) + * Mon Mar 2 2009 Matthias Clasen - 1.1.7-2 - Port to DeviceKit-disks --- gvfs-gdu.patch DELETED --- From pkgdb at fedoraproject.org Wed Mar 4 21:34:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 21:34:14 +0000 Subject: [pkgdb] mingw32-glib2 had acl change status Message-ID: <20090304213455.893BC208543@bastion.fedora.phx.redhat.com> rjones has set the watchcommits acl on mingw32-glib2 (Fedora devel) to Approved for epienbro To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2 From pkgdb at fedoraproject.org Wed Mar 4 21:35:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 21:35:00 +0000 Subject: [pkgdb] mingw32-glib2 had acl change status Message-ID: <20090304213459.7F670208549@bastion.fedora.phx.redhat.com> rjones has set the commit acl on mingw32-glib2 (Fedora devel) to Approved for epienbro To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2 From pkgdb at fedoraproject.org Wed Mar 4 21:34:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 21:34:51 +0000 Subject: [pkgdb] mingw32-gtk2 had acl change status Message-ID: <20090304213513.4111C20854C@bastion.fedora.phx.redhat.com> rjones has set the watchcommits acl on mingw32-gtk2 (Fedora devel) to Approved for epienbro To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2 From pkgdb at fedoraproject.org Wed Mar 4 21:35:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 21:35:17 +0000 Subject: [pkgdb] mingw32-gtk2 had acl change status Message-ID: <20090304213516.65BEF208550@bastion.fedora.phx.redhat.com> rjones has set the commit acl on mingw32-gtk2 (Fedora devel) to Approved for epienbro To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtk2 From spot at fedoraproject.org Wed Mar 4 21:43:00 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 21:43:00 +0000 (UTC) Subject: rpms/gambas/devel gambas-1.0.11-desktopfix.patch, 1.1, 1.2 gambas.spec, 1.36, 1.37 Message-ID: <20090304214300.3432870116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gambas/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6886 Modified Files: gambas-1.0.11-desktopfix.patch gambas.spec Log Message: fix desktop file (bz487804) gambas-1.0.11-desktopfix.patch: Index: gambas-1.0.11-desktopfix.patch =================================================================== RCS file: /cvs/pkgs/rpms/gambas/devel/gambas-1.0.11-desktopfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gambas-1.0.11-desktopfix.patch 5 Sep 2005 15:12:33 -0000 1.1 +++ gambas-1.0.11-desktopfix.patch 4 Mar 2009 21:42:29 -0000 1.2 @@ -17,3 +17,22 @@ Comment[es_ES]=Gambas casi es Visual Basic Type=Application Categories=GNOME;Application;Development; +diff -up gambas-1.0.19/debian/gambas.desktop.BAD gambas-1.0.19/debian/gambas.desktop +--- gambas-1.0.19/debian/gambas.desktop.BAD 2009-03-04 16:34:30.000000000 -0500 ++++ gambas-1.0.19/debian/gambas.desktop 2009-03-04 16:35:32.000000000 -0500 +@@ -1,7 +1,7 @@ + [Desktop Entry] + Encoding=UTF-8 + Exec=gambas +-Icon=/usr/share/pixmaps/gambas.png ++Icon=gambas + Terminal=false + Name=Gambas + Name[es_ES]=Gambas +@@ -9,5 +9,5 @@ GenericName=Basic IDE + Comment=IDE based on a Basic interpreter + Comment[es_ES]=Gambas casi es Visual Basic + Type=Application +-Categories=GNOME;Application;Development; ++Categories=GNOME;GTK;Development;IDE; + StartupNotify=true Index: gambas.spec =================================================================== RCS file: /cvs/pkgs/rpms/gambas/devel/gambas.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- gambas.spec 24 Feb 2009 19:25:10 -0000 1.36 +++ gambas.spec 4 Mar 2009 21:42:29 -0000 1.37 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.19 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL+ Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -248,7 +248,6 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ debian/gambas.desktop # Pull buildroot out of the examples files @@ -423,6 +422,9 @@ %{_datadir}/gambas/info/gb.xml.libxml.xslt.* %changelog +* Wed Mar 4 2009 Tom "spot" Callaway - 1.0.19-10 +- fix desktop file + * Tue Feb 24 2009 Fedora Release Engineering - 1.0.19-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From wtogami at fedoraproject.org Wed Mar 4 21:43:40 2009 From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=) Date: Wed, 4 Mar 2009 21:43:40 +0000 (UTC) Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.64,1.65 Message-ID: <20090304214340.30CD870116@cvs1.fedora.phx.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/nautilus-sendto/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7002 Modified Files: nautilus-sendto.spec Log Message: rebuild for libempathy Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- nautilus-sendto.spec 26 Feb 2009 04:25:58 -0000 1.64 +++ nautilus-sendto.spec 4 Mar 2009 21:43:09 -0000 1.65 @@ -1,6 +1,6 @@ Name: nautilus-sendto Version: 1.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Nautilus context menu for sending files Group: User Interface/Desktops @@ -94,6 +94,9 @@ %{_mandir}/man1/nautilus-sendto.1.gz %changelog +* Wed Mar 04 2009 Warren Togami - 1.1.2-3 +- rebuild for libempathy + * Wed Feb 25 2009 Fedora Release Engineering - 1.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From spot at fedoraproject.org Wed Mar 4 21:47:46 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 21:47:46 +0000 (UTC) Subject: rpms/R/EL-4 R.spec,1.26,1.27 Message-ID: <20090304214746.DF4B570116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7710 Modified Files: R.spec Log Message: debugging Index: R.spec =================================================================== RCS file: /cvs/pkgs/rpms/R/EL-4/R.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- R.spec 4 Mar 2009 20:50:10 -0000 1.26 +++ R.spec 4 Mar 2009 21:47:16 -0000 1.27 @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 2%{?dist} +Release: 2%{?dist}.1 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 @@ -198,6 +198,7 @@ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ | grep -A30 'R is now' - > CAPABILITIES +cat config.log make (cd src/nmath/standalone; make) #make check-all From veillard at fedoraproject.org Wed Mar 4 21:49:37 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Wed, 4 Mar 2009 21:49:37 +0000 (UTC) Subject: rpms/libvirt/devel libvirt.spec,1.114,1.115 Message-ID: <20090304214937.448CA70116@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7987 Modified Files: libvirt.spec Log Message: Maybe missing lzo-devel to link with gnulib-tls, Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- libvirt.spec 4 Mar 2009 13:33:45 -0000 1.114 +++ libvirt.spec 4 Mar 2009 21:49:06 -0000 1.115 @@ -102,6 +102,7 @@ BuildRequires: ncurses-devel BuildRequires: gettext BuildRequires: gnutls-devel +BuildRequires: lzo-devel BuildRequires: hal-devel %if %{with_avahi} BuildRequires: avahi-devel From lmacken at fedoraproject.org Wed Mar 4 21:55:47 2009 From: lmacken at fedoraproject.org (Luke Macken) Date: Wed, 4 Mar 2009 21:55:47 +0000 (UTC) Subject: rpms/sobby/F-9 sobby.spec,1.15,1.16 Message-ID: <20090304215547.4D27170116@cvs1.fedora.phx.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/sobby/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8948 Modified Files: sobby.spec Log Message: Rebuild Index: sobby.spec =================================================================== RCS file: /cvs/pkgs/rpms/sobby/F-9/sobby.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sobby.spec 9 Feb 2008 02:25:11 -0000 1.15 +++ sobby.spec 4 Mar 2009 21:55:16 -0000 1.16 @@ -1,6 +1,6 @@ Name: sobby Version: 0.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Standalone obby server Group: Applications/Internet @@ -42,6 +42,9 @@ %changelog +* Wed Mar 04 2009 Luke Macken - 0.4.4-3 +- Rebuild (#487801) + * Fri Feb 8 2008 Luke Macken - 0.4.4-2 - Rebuild for gcc 4.3 From spot at fedoraproject.org Wed Mar 4 21:58:44 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 21:58:44 +0000 (UTC) Subject: rpms/R/EL-4 R.spec,1.27,1.28 Message-ID: <20090304215844.C277A70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9421 Modified Files: R.spec Log Message: debugging Index: R.spec =================================================================== RCS file: /cvs/pkgs/rpms/R/EL-4/R.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- R.spec 4 Mar 2009 21:47:16 -0000 1.27 +++ R.spec 4 Mar 2009 21:58:14 -0000 1.28 @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 2%{?dist}.1 +Release: 2%{?dist}.2 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 @@ -188,7 +188,7 @@ esac export FCFLAGS="%{optflags}" -( %configure \ +%configure \ --with-system-zlib --with-system-bzlib --with-system-pcre \ --with-lapack \ --with-tcl-config=%{_libdir}/tclConfig.sh \ @@ -196,9 +196,11 @@ --enable-R-shlib \ rdocdir=%{_docdir}/R-%{version} \ rincludedir=%{_includedir}/R \ - rsharedir=%{_datadir}/R) \ - | grep -A30 'R is now' - > CAPABILITIES + rsharedir=%{_datadir}/R +# ) \ +# | grep -A30 'R is now' - > CAPABILITIES cat config.log +BARF make (cd src/nmath/standalone; make) #make check-all From than at fedoraproject.org Wed Mar 4 22:03:08 2009 From: than at fedoraproject.org (Than Ngo) Date: Wed, 4 Mar 2009 22:03:08 +0000 (UTC) Subject: rpms/kdepim/F-10 kdepim-4.2.1-imap.patch, NONE, 1.1 kdepim.spec, 1.205, 1.206 Message-ID: <20090304220308.7D2FF70116@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdepim/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10159 Modified Files: kdepim.spec Added Files: kdepim-4.2.1-imap.patch Log Message: upstream patch, speed up folder syncing kdepim-4.2.1-imap.patch: --- NEW FILE kdepim-4.2.1-imap.patch --- Index: kmail/kmfoldercachedimap.cpp =================================================================== --- kmail/kmfoldercachedimap.cpp (Revision 935084) +++ kmail/kmfoldercachedimap.cpp (Revision 935085) @@ -202,7 +202,8 @@ /*mHoldSyncs( false ),*/ mFolderRemoved( false ), mRecurse( true ), - mStatusChangedLocally( false ), mAnnotationFolderTypeChanged( false ), + mStatusChangedLocally( false ), + mAnnotationFolderTypeChanged( false ), mIncidencesForChanged( false ), mPersonalNamespacesCheckDone( true ), mQuotaInfo(), mAlarmsBlocked( false ), mRescueCommandCount( 0 ), @@ -303,18 +304,22 @@ KMFolderMaildir::readConfig(); mStatusChangedLocally = group.readEntry( "StatusChangedLocally", false ); + QStringList uidsChanged = group.readEntry( "UIDStatusChangedLocally", QStringList() ); + foreach( const QString &uid, uidsChanged ) { + mUIDsOfLocallyChangedStatuses.append( uid.toUInt() ); + } mAnnotationFolderTypeChanged = group.readEntry( "AnnotationFolderTypeChanged", false ); mIncidencesForChanged = group.readEntry( "IncidencesForChanged", false ); if ( mImapPath.isEmpty() ) { mImapPathCreation = group.readEntry("ImapPathCreation"); } - QStringList uids = group.readEntry( "UIDSDeletedSinceLastSync", QStringList() ); + QStringList delUids = group.readEntry( "UIDSDeletedSinceLastSync" , QStringList() ); #if MAIL_LOSS_DEBUGGING kDebug( 5006 ) << "READING IN UIDSDeletedSinceLastSync: " << folder()->prettyUrl() << endl << uids; #endif - for ( QStringList::iterator it = uids.begin(); it != uids.end(); ++it ) { - mDeletedUIDsSinceLastSync.insert( (*it).toULong(), 0); + for ( QStringList::iterator it = delUids.begin(); it != delUids.end(); it++ ) { + mDeletedUIDsSinceLastSync.insert( (*it).toULong(), 0); } } @@ -331,7 +336,14 @@ configGroup.writeEntry( "NoContent", mNoContent ); configGroup.writeEntry( "ReadOnly", mReadOnly ); configGroup.writeEntry( "FolderAttributes", mFolderAttributes ); - configGroup.writeEntry( "StatusChangedLocally", mStatusChangedLocally ); + + // StatusChangedLocally is always false, as we use UIDStatusChangedLocally now + configGroup.writeEntry( "StatusChangedLocally", false ); + QStringList uidsToWrite; + foreach( const ulong uid, mUIDsOfLocallyChangedStatuses ) { + uidsToWrite.append( QString::number( uid ) ); + } + configGroup.writeEntry( "UIDStatusChangedLocally", uidsToWrite ); if ( !mImapPathCreation.isEmpty() ) { if ( mImapPath.isEmpty() ) { configGroup.writeEntry( "ImapPathCreation", mImapPathCreation ); @@ -953,12 +965,13 @@ // Upload flags, unless we know from the ACL that we're not allowed // to do that or they did not change locally if ( mUserRights <= 0 || ( mUserRights & KMail::ACLJobs::WriteFlags ) ) { - if ( mStatusChangedLocally ) { + if ( !mUIDsOfLocallyChangedStatuses.isEmpty() || mStatusChangedLocally ) { uploadFlags(); break; } - } else if ( mUserRights & KMail::ACLJobs::WriteSeenFlag ) { - if ( mStatusChangedLocally ) { + } + else if ( mUserRights & KMail::ACLJobs::WriteSeenFlag ) { + if ( !mUIDsOfLocallyChangedStatuses.isEmpty() || mStatusChangedLocally ) { uploadSeenFlags(); break; } @@ -1425,6 +1438,10 @@ // Either not a valid message or not one that is on the server yet continue; } + if ( mUIDsOfLocallyChangedStatuses.indexOf( msg->UID() ) < 0 && !mStatusChangedLocally ) { + // This message has not had its status changed locally + continue; + } QString flags = KMFolderImap::statusToFlags( msg->status(), mPermanentFlags ); // Collect uids for each typem of flags. @@ -1468,6 +1485,11 @@ // Either not a valid message or not one that is on the server yet continue; + if ( mUIDsOfLocallyChangedStatuses.indexOf( msg->UID() ) < 0 && !mStatusChangedLocally ) { + // This message has not had its status changed locally + continue; + } + if ( msg->status().isOld() || msg->status().isRead() ) seenUids.append( msg->UID() ); else @@ -1525,13 +1547,21 @@ void KMFolderCachedImap::setStatus( int idx, const MessageStatus &status, bool toggle ) { KMFolderMaildir::setStatus( idx, status, toggle ); - mStatusChangedLocally = true; + const KMMsgBase *msg = getMsgBase( idx ); + Q_ASSERT( msg ); + if ( msg ) + mUIDsOfLocallyChangedStatuses.append( msg->UID() ); } void KMFolderCachedImap::setStatus( QList &ids, const MessageStatus &status, bool toggle ) { KMFolderMaildir::setStatus( ids, status, toggle ); - mStatusChangedLocally = true; + foreach( const int id, ids ) { + const KMMsgBase *msg = getMsgBase( id ); + Q_ASSERT( msg ); + if ( msg ) + mUIDsOfLocallyChangedStatuses.append( msg->UID() ); + } } /* Upload new folders to server */ @@ -1888,7 +1918,8 @@ } else { if ( lastSet ) { // always true here (this comes from online-imap...) mContentState = imapFinished; - mStatusChangedLocally = false; // we are up to date again + mUIDsOfLocallyChangedStatuses.clear(); // we are up to date again + mStatusChangedLocally = false; } } serverSyncInternal(); Index: kmail/kmfoldercachedimap.h =================================================================== --- kmail/kmfoldercachedimap.h (Revision 935084) +++ kmail/kmfoldercachedimap.h (Revision 935085) @@ -627,12 +627,18 @@ bool mFolderRemoved; bool mRecurse; + /** + * UIDs added by setStatus. Indicates that the client has changed + * the status of those mails. The mail flags for changed mails will be + * uploaded to the server, overwriting the server's notion of the status + * of the mails in this folder. + */ + QList mUIDsOfLocallyChangedStatuses; + /** - Set to true by setStatus. Indicates that the client has changed - the status of at least one mail. The mail flags will therefore be - uploaded to the server, overwriting the server's notion of the status - of the mails in this folder. - */ + * Same as above, but uploads the flags of all mails, even if not all changed. + * Only still here for config compatibility. + */ bool mStatusChangedLocally; /** Index: kdepim.spec =================================================================== RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim.spec,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- kdepim.spec 27 Feb 2009 18:04:35 -0000 1.205 +++ kdepim.spec 4 Mar 2009 22:02:38 -0000 1.206 @@ -6,7 +6,7 @@ Summary: PIM (Personal Information Manager) applications Epoch: 6 Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/Productivity @@ -14,6 +14,8 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Patch0: kdepim-4.1.80-libqgpgme-link-fix.patch # upstream patches +Patch100: kdepim-4.2.1-imap.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: kdepim4 = %{version}-%{release} @@ -92,6 +94,7 @@ %patch0 -p1 -b .libqgpgme-link-fix # upstream patches +%patch100 -p0 -b .imap %build mkdir -p %{_target_platform} @@ -181,7 +184,10 @@ %changelog -* Fri Feb 27 2009 Luk???? Tinkl - 4.2.1-1 +* Wed Mar 04 2009 Than Ngo - 4.2.1-2 +- upstream patch, speed up folder syncing + +* Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 * Wed Feb 25 2009 Fedora Release Engineering - 6:4.2.0-3 From spot at fedoraproject.org Wed Mar 4 22:04:58 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 22:04:58 +0000 (UTC) Subject: rpms/gambas2/devel gambas2.desktop,1.1,1.2 gambas2.spec,1.14,1.15 Message-ID: <20090304220458.81EB470116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gambas2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10562 Modified Files: gambas2.desktop gambas2.spec Log Message: fix desktop file (bz 487805) Index: gambas2.desktop =================================================================== RCS file: /cvs/pkgs/rpms/gambas2/devel/gambas2.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gambas2.desktop 24 Mar 2008 16:02:41 -0000 1.1 +++ gambas2.desktop 4 Mar 2009 22:04:28 -0000 1.2 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Exec=gambas2 -Icon=/usr/share/pixmaps/gambas2.png +Icon=gambas2 Terminal=false Name=Gambas2 Name[es_ES]=Gambas2 @@ -9,6 +9,6 @@ Comment=IDE based on a Basic interpreter Comment[es_ES]=Gambas2 casi es Visual Basic Type=Application -Categories=GNOME;Application;Development; +Categories=GNOME;GTK;Development;IDE; StartupNotify=true X-Desktop-File-Install-Version=0.10 Index: gambas2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gambas2/devel/gambas2.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gambas2.spec 27 Feb 2009 22:05:25 -0000 1.14 +++ gambas2.spec 4 Mar 2009 22:04:28 -0000 1.15 @@ -1,7 +1,7 @@ Name: gambas2 Summary: IDE based on a basic interpreter with object extensions Version: 2.11.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL+ Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -1494,6 +1494,9 @@ %{_datadir}/%{name}/info/gb.xml.xslt.* %changelog +* Wed Mar 4 2009 Tom "spot" Callaway - 2.11.1-4 +- fix desktop file (bz 487805) + * Fri Feb 27 2009 Tom "spot" Callaway - 2.11.1-3 - fix gcc44 compile From rdieter at fedoraproject.org Wed Mar 4 22:07:46 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 4 Mar 2009 22:07:46 +0000 (UTC) Subject: rpms/qt/F-9 .cvsignore, 1.38, 1.39 qt-copy-patches-svn_checkout.sh, 1.2, 1.3 qt.spec, 1.192, 1.193 sources, 1.41, 1.42 Message-ID: <20090304220746.CA07770116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11095 Modified Files: .cvsignore qt-copy-patches-svn_checkout.sh qt.spec sources Log Message: * Wed Mar 04 2009 Rex Dieter - 4.4.3-15 - move designer plugins to runtime (#487622) - qt-copy-patches-20090304 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 29 Jan 2009 19:49:39 -0000 1.38 +++ .cvsignore 4 Mar 2009 22:07:16 -0000 1.39 @@ -1,4 +1,4 @@ hi128-app-qt4-logo.png hi48-app-qt4-logo.png qt-x11-opensource-src-4.4.3.tar.bz2 -qt-copy-patches-20090129svn.tar.bz2 +qt-copy-patches-20090304svn.tar.bz2 Index: qt-copy-patches-svn_checkout.sh =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/qt-copy-patches-svn_checkout.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qt-copy-patches-svn_checkout.sh 17 Jul 2008 12:35:07 -0000 1.2 +++ qt-copy-patches-svn_checkout.sh 4 Mar 2009 22:07:16 -0000 1.3 @@ -6,9 +6,11 @@ set -x rm -rf $EXPORT_DIR -# app -svn export --non-recursive svn://anonsvn.kde.org/home/kde/trunk/qt-copy $EXPORT_DIR/ -svn export svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches $EXPORT_DIR/patches +# trunk tracking qt-4.5 now +SVN_ROOT=svn://anonsvn.kde.org/home/kde/branches/qt/4.4 + +svn export --non-recursive $SVN_ROOT $EXPORT_DIR/ +svn export $SVN_ROOT/patches $EXPORT_DIR/patches pushd $EXPORT_DIR rm -f ../qt-copy-patches-${DATE}svn.tar.bz2 Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- qt.spec 29 Jan 2009 19:49:39 -0000 1.192 +++ qt.spec 4 Mar 2009 22:07:16 -0000 1.193 @@ -9,7 +9,7 @@ Name: qt4 %endif Version: 4.4.3 -Release: 14%{?dist} +Release: 15%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 with exceptions or GPLv2 with exceptions @@ -40,7 +40,7 @@ Patch10: qt-x11-opensource-src-4.4.3-im.patch ## qt-copy patches -%define qt_copy 20090129 +%define qt_copy 20090304 Source1: qt-copy-patches-svn_checkout.sh %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2} %{?qt_copy:Provides: qt-copy = %{qt_copy}} @@ -622,7 +622,6 @@ %{_qt4_libdir}/libQtSvg.so.* %{?webkit:%{_qt4_libdir}/libQtWebKit.so.*} %{_qt4_plugindir}/* -%exclude %{_qt4_plugindir}/designer %exclude %{_qt4_plugindir}/sqldrivers %if "%{_qt4_bindir}" != "%{_bindir}" %{_bindir}/assistant* @@ -689,7 +688,6 @@ %{_libdir}/pkgconfig/*.pc # Qt designer %{_qt4_bindir}/designer* -%{_qt4_plugindir}/designer/ %{_datadir}/applications/*designer*.desktop # Qt Linguist %{_qt4_bindir}/linguist* @@ -734,6 +732,10 @@ %changelog +* Wed Mar 04 2009 Rex Dieter - 4.4.3-15 +- move designer plugins to runtime (#487622) +- qt-copy-patches-20090304 + * Thu Jan 29 2009 Rex Dieter - 4.4.3-14 - qt-copy-patches-20090129 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qt/F-9/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 29 Jan 2009 19:49:39 -0000 1.41 +++ sources 4 Mar 2009 22:07:16 -0000 1.42 @@ -1,4 +1,4 @@ d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png 6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png 00e00c6324d342a7b0d8653112b4f08c qt-x11-opensource-src-4.4.3.tar.bz2 -9c2c9930560dddd4713aa99af3a5199f qt-copy-patches-20090129svn.tar.bz2 +b91571d22a32437c865ee4848829bebc qt-copy-patches-20090304svn.tar.bz2 From davidz at fedoraproject.org Wed Mar 4 22:07:59 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Wed, 4 Mar 2009 22:07:59 +0000 (UTC) Subject: rpms/gnome-disk-utility/devel gdu-0.2-passphrase-change-crash.patch, NONE, 1.1 gnome-disk-utility.spec, 1.5, 1.6 Message-ID: <20090304220759.3BA2270116@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/gnome-disk-utility/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11133 Modified Files: gnome-disk-utility.spec Added Files: gdu-0.2-passphrase-change-crash.patch Log Message: * Wed Mar 04 2009 David Zeuthen - 0.2-2%{?dist} - Don't crash when changing the LUKS passphrase on a device gdu-0.2-passphrase-change-crash.patch: --- NEW FILE gdu-0.2-passphrase-change-crash.patch --- >From 15eda99b58d602119ba9df881595fcbb02853c2a Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Wed, 04 Mar 2009 16:37:56 +0000 Subject: don't use g_free on a GIcon, use g_object_unref instead This fixes a crash when attempting to change the passphrase of a LUKS device. --- diff --git a/src/gdu-gtk/gdu-gtk.c b/src/gdu-gtk/gdu-gtk.c index d86599a..d0a41d4 100644 --- a/src/gdu-gtk/gdu-gtk.c +++ b/src/gdu-gtk/gdu-gtk.c @@ -1057,7 +1057,7 @@ out: g_free (window_title); if (window_icon != NULL) - g_free (window_icon); + g_object_unref (window_icon); if (device != NULL) g_object_unref (device); return ret; -- cgit v0.8.2 Index: gnome-disk-utility.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/gnome-disk-utility.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnome-disk-utility.spec 2 Mar 2009 21:42:15 -0000 1.5 +++ gnome-disk-utility.spec 4 Mar 2009 22:07:28 -0000 1.6 @@ -11,7 +11,7 @@ Summary: Disk management application Name: gnome-disk-utility Version: 0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=users/david/gnome-disk-utility.git;a=summary @@ -34,6 +34,8 @@ Requires(post): scrollkeeper Requires(postun): scrollkeeper +Patch0: gdu-0.2-passphrase-change-crash.patch + %description This package contains the Palimpsest disk management application. Palimpsest supports partitioning, file system creation, encryption, @@ -87,6 +89,7 @@ %prep %setup -q +%patch0 -p1 -b .luks-passphrase-change %build %configure @@ -194,6 +197,9 @@ %{_includedir}/gnome-disk-utility/gdu-gtk/* %changelog +* Wed Mar 04 2009 David Zeuthen - 0.2-2%{?dist} +- Don't crash when changing the LUKS passphrase on a device + * Mon Mar 02 2009 David Zeuthen - 0.2-1%{?dist} - Update to version 0.2 From spot at fedoraproject.org Wed Mar 4 22:21:07 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 22:21:07 +0000 (UTC) Subject: rpms/winpdb/devel winpdb.png, NONE, 1.1 winpdb.desktop, 1.3, 1.4 winpdb.spec, 1.14, 1.15 Message-ID: <20090304222107.9CD3B70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/winpdb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12456 Modified Files: winpdb.desktop winpdb.spec Added Files: winpdb.png Log Message: fix desktop file (bz 487870) Index: winpdb.desktop =================================================================== RCS file: /cvs/pkgs/rpms/winpdb/devel/winpdb.desktop,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- winpdb.desktop 11 Dec 2007 18:10:00 -0000 1.3 +++ winpdb.desktop 4 Mar 2009 22:20:37 -0000 1.4 @@ -4,9 +4,9 @@ GenericName=Python Debugger Comment=Advanced python debugger Exec=winpdb -Icon=gnome-devel +Icon=winpdb StartupNotify=true Terminal=false Type=Application -Categories=GNOME;Development; +Categories=GNOME;GTK;Development;Debugger; X-Desktop-File-Install-Version=0.4 Index: winpdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/winpdb/devel/winpdb.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- winpdb.spec 25 Feb 2009 18:45:11 -0000 1.14 +++ winpdb.spec 4 Mar 2009 22:20:37 -0000 1.15 @@ -2,13 +2,14 @@ Name: winpdb Version: 1.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced python debugger Group: Development/Debuggers License: GPLv2+ URL: http://www.winpdb.org/ Source0: http://winpdb.googlecode.com/files/winpdb-%{version}.tar.gz Source1: %{name}.desktop +Source2: %{name}.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel, wxPython-devel >= 2.6, desktop-file-utils @@ -30,6 +31,9 @@ %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install --skip-build --root=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +install -m0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps + mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ @@ -47,8 +51,12 @@ %{_bindir}/* %{python_sitelib}/* %{_datadir}/applications/*.desktop +{_datadir}/pixmaps/%{name}.png %changelog +* Wed Mar 4 2009 Tom "spot" Callaway - 1.4.4-3 +- add icon, fix desktop file (bz 487870) + * Wed Feb 25 2009 Fedora Release Engineering - 1.4.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From belegdol at fedoraproject.org Wed Mar 4 22:25:46 2009 From: belegdol at fedoraproject.org (Julian Sikorski) Date: Wed, 4 Mar 2009 22:25:46 +0000 (UTC) Subject: rpms/chemical-mime-data/devel chemical-mime-data.spec,1.7,1.8 Message-ID: <20090304222546.1880A70116@cvs1.fedora.phx.redhat.com> Author: belegdol Update of /cvs/extras/rpms/chemical-mime-data/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12902 Modified Files: chemical-mime-data.spec Log Message: * Wed Mar 04 2009 Julian Sikorski - 0.1.94-5 - Dropped the KDE MIME .desktop files Index: chemical-mime-data.spec =================================================================== RCS file: /cvs/extras/rpms/chemical-mime-data/devel/chemical-mime-data.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- chemical-mime-data.spec 23 Feb 2009 21:12:54 -0000 1.7 +++ chemical-mime-data.spec 4 Mar 2009 22:25:15 -0000 1.8 @@ -1,6 +1,6 @@ Name: chemical-mime-data Version: 0.1.94 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Support for chemical/* MIME types Group: System Environment/Libraries @@ -37,7 +37,8 @@ %build %configure --disable-update-database \ --without-gnome-mime \ - --without-pixmaps + --without-pixmaps \ + --without-kde-mime make %{?_smp_mflags} @@ -69,11 +70,13 @@ %{_datadir}/icons/hicolor/*/mimetypes/gnome-mime-chemical.png %{_datadir}/icons/hicolor/scalable/mimetypes/gnome-mime-chemical.svgz %{_datadir}/mime/packages/chemical-mime-data.xml -%{_datadir}/mimelnk %{_datadir}/pkgconfig/chemical-mime-data.pc %changelog +* Wed Mar 04 2009 Julian Sikorski - 0.1.94-5 +- Dropped the KDE MIME .desktop files + * Mon Feb 23 2009 Julian Sikorski - 0.1.94-4 - Convert the ChangeLog to utf-8 From wtogami at fedoraproject.org Wed Mar 4 22:34:21 2009 From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=) Date: Wed, 4 Mar 2009 22:34:21 +0000 (UTC) Subject: rpms/vte/devel vte.spec,1.145,1.146 Message-ID: <20090304223421.8095D70116@cvs1.fedora.phx.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/vte/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14149 Modified Files: vte.spec Log Message: remove workaround after gcc-4.4.0-0.22 Index: vte.spec =================================================================== RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- vte.spec 2 Mar 2009 15:54:32 -0000 1.145 +++ vte.spec 4 Mar 2009 22:33:51 -0000 1.146 @@ -4,14 +4,12 @@ Name: vte Version: 0.19.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A terminal emulator License: LGPLv2+ Group: User Interface/X BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source: http://download.gnome.org/sources/vte/0.19/%{name}-%{version}.tar.bz2 -# https://bugzilla.redhat.com/show_bug.cgi?id=487795 -Patch0: vte-gcc44.patch BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: pango-devel >= %{pango_version} @@ -46,7 +44,6 @@ %prep %setup -q -%patch0 -p1 -b .gcc44 %build PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"` @@ -112,6 +109,9 @@ %doc %{_datadir}/gtk-doc/html/%{name} %changelog +* Wed Mar 4 2009 Warren Togami 0.19.4-6 +- remove workaround after gcc-4.4.0-0.22 + * Mon Mar 2 2009 Matthias Clasen 0.19.4-5 - Work around gcc 4.4 miscompilation From krh at fedoraproject.org Wed Mar 4 22:42:57 2009 From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=) Date: Wed, 4 Mar 2009 22:42:57 +0000 (UTC) Subject: rpms/xorg-x11-drv-intel/devel intel-2.6.0-to-master.patch, 1.1, 1.2 xorg-x11-drv-intel.spec, 1.5, 1.6 intel-2.6.0-kms-dpms.patch, 1.1, NONE Message-ID: <20090304224257.879A270116@cvs1.fedora.phx.redhat.com> Author: krh Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15468 Modified Files: intel-2.6.0-to-master.patch xorg-x11-drv-intel.spec Removed Files: intel-2.6.0-kms-dpms.patch Log Message: * Wed Mar 4 2009 Kristian H??gsberg - 2.6.0-12 - Update to new git snapshot: re-enables multiple X servers, fixes leak on vt switch for 965 type hardware, fold dpms patch into git master patch. intel-2.6.0-to-master.patch: Index: intel-2.6.0-to-master.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/intel-2.6.0-to-master.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- intel-2.6.0-to-master.patch 28 Feb 2009 16:31:43 -0000 1.1 +++ intel-2.6.0-to-master.patch 4 Mar 2009 22:42:27 -0000 1.2 @@ -98,7 +98,7 @@ AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting]) fi diff --git a/man/intel.man b/man/intel.man -index 00aa1be..c7a3c61 100644 +index 00aa1be..e38cc54 100644 --- a/man/intel.man +++ b/man/intel.man @@ -150,26 +150,6 @@ pool. On systems with a working GEM environment, this can be disabled to @@ -141,6 +141,48 @@ .SH OUTPUT CONFIGURATION On 830M and better chipsets, the driver supports runtime configuration of +@@ -299,11 +273,41 @@ Integrated TV output. Available properties include: + Adjusting these properties allows you to control the placement of your TV output buffer on the screen. The options with the same name can also be set in xorg.conf with integer value. + + .PP ++.B BRIGHTNESS ++- TV brightness, range 0-255 ++.TP 2 ++Adjust TV brightness, default value is 128. ++ ++.PP ++.B CONTRAST ++- TV contrast, range 0-255 ++.TP 2 ++Adjust TV contrast, default value is 1.0 in chipset specific format. ++ ++.PP ++.B SATURATION ++- TV saturation, range 0-255 ++.TP 2 ++Adjust TV saturation, default value is 1.0 in chipset specific format. ++ ++.PP ++.B HUE ++- TV hue, range 0-255 ++.TP 2 ++Adjust TV hue, default value is 0. ++ ++.PP + .B TV_FORMAT + - output standard + .TP 2 + This property allows you to control the output standard used on your TV output port. You can select between NTSC-M, NTSC-443, NTSC-J, PAL-M, PAL-N, and PAL. + ++.PP ++.B TV_Connector ++- connector type ++.TP 2 ++This config option should be added to xorg.conf TV monitor's section, it allows you to control the TV output connector type, which bypass load detect. You can select between S-Video, Composite and Component. ++ + .SS "TMDS-1" + First DVI SDVO output + diff --git a/src/Makefile.am b/src/Makefile.am index 3fb30ff..e05dbab 100644 --- a/src/Makefile.am @@ -176,7 +218,7 @@ INTEL_G4A = \ packed_yuv_sf.g4a \ diff --git a/src/bios_reader/bios_reader.c b/src/bios_reader/bios_reader.c -index 717f5bf..41908a3 100644 +index 717f5bf..fc51821 100644 --- a/src/bios_reader/bios_reader.c +++ b/src/bios_reader/bios_reader.c @@ -205,6 +205,7 @@ static void dump_general_definitions(void) @@ -223,7 +265,7 @@ printf("%c\tpanel type %02i: %dx%d clock %d\n", marker, i, lfp_data->fp_timing.x_res, lfp_data->fp_timing.y_res, _PIXEL_CLOCK(timing_data)); -@@ -336,15 +352,69 @@ static void dump_lvds_data(void) +@@ -336,19 +352,77 @@ static void dump_lvds_data(void) (unsigned long)lfp_data->fp_timing.pp_cycle_reg_val); printf("\t\t PFIT: 0x%08lx\n", (unsigned long)lfp_data->fp_timing.pfit_reg_val); @@ -241,10 +283,10 @@ + vdisplay, vsyncstart, vsyncend, vtotal, clock, + (hsyncend > htotal || vsyncend > vtotal) ? + "BAD!" : "good"); -+ } -+ free(block); -+} -+ + } + free(block); + } + +static void dump_driver_feature(void) +{ + struct bdb_block *block; @@ -299,10 +341,18 @@ + case BDB_DRIVER_EDP: + printf("Embedded DisplayPort\n"); + break; - } - free(block); - } -@@ -423,5 +493,7 @@ int main(int argc, char **argv) ++ } ++ printf("\tDefine Display statically: %s\n", YESNO(feature->static_display)); ++ printf("\tLegacy CRT max X: %d\n", feature->legacy_crt_max_x); ++ printf("\tLegacy CRT max Y: %d\n", feature->legacy_crt_max_y); ++ printf("\tLegacy CRT max refresh: %d\n", feature->legacy_crt_max_refresh); ++ free(block); ++} ++ + int main(int argc, char **argv) + { + int fd; +@@ -423,5 +497,7 @@ int main(int argc, char **argv) dump_lvds_data(); dump_lvds_ptr_data(); @@ -363,7 +413,7 @@ #define GTT_PAGE_SIZE KB(4) #define ROUND_TO(x, y) (((x) + (y) - 1) / (y) * (y)) diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index 4994251..8128004 100644 +index 4994251..d9ca16c 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -33,29 +33,35 @@ @@ -618,7 +668,36 @@ drmModeFreePropertyBlob(drmmode_output->edid_blob); drmmode_output->edid_blob = drmModeGetPropertyBlob(drmmode->fd, -@@ -574,24 +603,105 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num) +@@ -477,7 +506,27 @@ drmmode_output_destroy(xf86OutputPtr output) + static void + drmmode_output_dpms(xf86OutputPtr output, int mode) + { +- return; ++ drmmode_output_private_ptr drmmode_output = output->driver_private; ++ drmModeConnectorPtr koutput = drmmode_output->mode_output; ++ drmmode_ptr drmmode = drmmode_output->drmmode; ++ int i; ++ drmModePropertyPtr props; ++ ++ for (i = 0; i < koutput->count_props; i++) { ++ props = drmModeGetProperty(drmmode->fd, koutput->props[i]); ++ if (!props) ++ continue; ++ ++ if (!strcmp(props->name, "DPMS")) { ++ drmModeConnectorSetProperty(drmmode->fd, ++ drmmode_output->output_id, ++ props->prop_id, ++ mode); ++ drmModeFreeProperty(props); ++ return; ++ } ++ drmModeFreeProperty(props); ++ } + } + + static const xf86OutputFuncsRec drmmode_output_funcs = { +@@ -574,24 +623,105 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num) return; } @@ -737,7 +816,7 @@ xf86CrtcConfigInit(pScrn, &drmmode_xf86crtc_config_funcs); xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); -@@ -609,40 +719,10 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, char *busId, +@@ -609,40 +739,10 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, char *busId, for (i = 0; i < drmmode->mode_res->count_connectors; i++) drmmode_output_init(pScrn, drmmode, i); @@ -779,7 +858,7 @@ Bool drmmode_is_rotate_pixmap(ScrnInfoPtr pScrn, pointer pPixData, dri_bo **bo) { -@@ -668,41 +748,4 @@ Bool drmmode_is_rotate_pixmap(ScrnInfoPtr pScrn, pointer pPixData, dri_bo **bo) +@@ -668,41 +768,4 @@ Bool drmmode_is_rotate_pixmap(ScrnInfoPtr pScrn, pointer pPixData, dri_bo **bo) #endif } @@ -1336,7 +1415,7 @@ { assert(pI830->batch_ptr != NULL); diff --git a/src/i830_bios.c b/src/i830_bios.c -index 72408f0..a990ebe 100644 +index 72408f0..7f20553 100644 --- a/src/i830_bios.c +++ b/src/i830_bios.c @@ -135,6 +135,12 @@ parse_panel_data(I830Ptr pI830, struct bdb_header *bdb) @@ -1352,7 +1431,7 @@ xf86SetModeDefaultName(fixed_mode); pI830->lvds_fixed_mode = fixed_mode; -@@ -162,6 +168,23 @@ parse_general_features(I830Ptr pI830, struct bdb_header *bdb) +@@ -162,6 +168,27 @@ parse_general_features(I830Ptr pI830, struct bdb_header *bdb) } } @@ -1362,9 +1441,13 @@ + struct bdb_driver_feature *feature; + + /* For mobile chip, set default as true */ -+ if (IS_MOBILE(pI830)) ++ if (IS_MOBILE(pI830) && !IS_I830(pI830)) + pI830->integrated_lvds = TRUE; + ++ /* skip pre-9xx chips which is broken to parse this block. */ ++ if (!IS_I9XX(pI830)) ++ return; ++ + feature = find_section(bdb, BDB_DRIVER_FEATURES); + if (!feature) + return; @@ -1376,7 +1459,7 @@ #define INTEL_VBIOS_SIZE (64 * 1024) /* XXX */ /** -@@ -240,6 +263,7 @@ i830_bios_init(ScrnInfoPtr pScrn) +@@ -240,6 +267,7 @@ i830_bios_init(ScrnInfoPtr pScrn) parse_general_features(pI830, bdb); parse_panel_data(pI830, bdb); @@ -1385,10 +1468,10 @@ xfree(bios); diff --git a/src/i830_bios.h b/src/i830_bios.h -index 39706ac..ec8bd8f 100644 +index 39706ac..78af830 100644 --- a/src/i830_bios.h +++ b/src/i830_bios.h -@@ -395,6 +395,41 @@ struct vch_bdb_22 { +@@ -395,6 +395,47 @@ struct vch_bdb_22 { struct vch_panel_data panels[16]; } __attribute__((packed)); @@ -1425,6 +1508,12 @@ + uint16_t crt_hotplug:1; + uint16_t lvds_config:2; + uint16_t reserved:3; ++ ++ uint8_t static_display:1; ++ uint8_t reserved2:7; ++ uint16_t legacy_crt_max_x; ++ uint16_t legacy_crt_max_y; ++ uint8_t legacy_crt_max_refresh; +} __attribute__((packed)); + #ifndef REG_DUMPER @@ -2624,7 +2713,7 @@ } if (i == DRM_MAX_MINOR) { diff --git a/src/i830_driver.c b/src/i830_driver.c -index 4c40d40..342a059 100644 +index 4c40d40..f80ca69 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -212,6 +212,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -3187,7 +3276,15 @@ if (crtc && crtc->enabled) { /* Sync the engine before adjust frame */ -@@ -3557,7 +3596,6 @@ I830LeaveVT(int scrnIndex, int flags) +@@ -3497,6 +3536,7 @@ I830LeaveVT(int scrnIndex, int flags) + { + ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + I830Ptr pI830 = I830PTR(pScrn); ++ int ret; + #ifndef HAVE_FREE_SHADOW + xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); + int o; +@@ -3557,7 +3597,6 @@ I830LeaveVT(int scrnIndex, int flags) */ if (!pI830->memory_manager) intel_bufmgr_fake_evict_all(pI830->bufmgr); @@ -3195,7 +3292,7 @@ if (!pI830->memory_manager) i830_stop_ring(pScrn, TRUE); -@@ -3568,6 +3606,8 @@ I830LeaveVT(int scrnIndex, int flags) +@@ -3568,6 +3607,8 @@ I830LeaveVT(int scrnIndex, int flags) } } @@ -3204,7 +3301,39 @@ if (I830IsPrimary(pScrn)) i830_unbind_all_memory(pScrn); -@@ -3614,6 +3654,9 @@ I830EnterVT(int scrnIndex, int flags) +@@ -3589,6 +3630,13 @@ I830LeaveVT(int scrnIndex, int flags) + + if (pI830->AccelInfoRec) + pI830->AccelInfoRec->NeedToSync = FALSE; ++ ++#ifdef XF86DRI ++ ret = drmDropMaster(pI830->drmSubFD); ++ if (ret) ++ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, ++ "drmDropMaster failed: %s\n", strerror(ret)); ++#endif + } + + /* +@@ -3599,9 +3647,17 @@ I830EnterVT(int scrnIndex, int flags) + { + ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + I830Ptr pI830 = I830PTR(pScrn); ++ int ret; + + DPRINTF(PFX, "Enter VT\n"); + ++#ifdef XF86DRI ++ ret = drmSetMaster(pI830->drmSubFD); ++ if (ret) ++ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, ++ "drmDropMaster failed: %s\n", strerror(ret)); ++#endif ++ + /* + * Only save state once per server generation since that's what most + * drivers do. Could change this to save state at each VT enter. +@@ -3614,6 +3670,9 @@ I830EnterVT(int scrnIndex, int flags) pI830->leaving = FALSE; @@ -3214,7 +3343,7 @@ #ifdef XF86DRI if (pI830->memory_manager && !pI830->use_drm_mode) { int ret; -@@ -3816,15 +3859,6 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen) +@@ -3816,15 +3875,6 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen) #ifdef XF86DRI if (pI830->directRenderingOpen && pI830->directRenderingType == DRI_XF86DRI) { @@ -4762,7 +4891,7 @@ }; diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c -index 0750166..4b98a9b 100644 +index 0750166..efdd691 100644 --- a/src/i830_sdvo.c +++ b/src/i830_sdvo.c @@ -594,9 +594,12 @@ i830_sdvo_create_preferred_input_timing(xf86OutputPtr output, uint16_t clock, @@ -5010,7 +5139,7 @@ + /* Check EDID in DVI-I case */ + i830_sdvo_set_control_bus_switch(output, dev_priv->ddc_bus); + edid_mon = xf86OutputGetEDID (output, intel_output->pDDCBus); -+ if (!edid_mon || !DIGITAL(edid_mon->features.input_type)) { ++ if (edid_mon && !DIGITAL(edid_mon->features.input_type)) { + xfree(edid_mon); + return XF86OutputStatusDisconnected; + } @@ -5234,18 +5363,418 @@ #define SDVO_CMD_SET_FLICKER_FILTER 0x4f #define SDVO_CMD_GET_ADAPTIVE_FLICKER_FITER 0x50 diff --git a/src/i830_tv.c b/src/i830_tv.c -index 72d2bd8..b13abd4 100644 +index 72d2bd8..1e3cf7b 100644 --- a/src/i830_tv.c +++ b/src/i830_tv.c -@@ -1606,7 +1606,7 @@ i830_tv_set_property(xf86OutputPtr output, Atom property, +@@ -56,8 +56,13 @@ enum tv_margin { + /** Private structure for the integrated TV support */ + struct i830_tv_priv { + int type; ++ Bool force_type; + char *tv_format; + int margin[4]; ++ uint8_t brightness; ++ uint8_t contrast; ++ uint8_t saturation; ++ uint8_t hue; + uint32_t save_TV_H_CTL_1; + uint32_t save_TV_H_CTL_2; + uint32_t save_TV_H_CTL_3; +@@ -1019,6 +1024,96 @@ i830_float_to_luma (float f) + return ret; + } + ++static uint8_t ++float_to_float_2_6(float fin) ++{ ++ uint8_t exp; ++ uint8_t mant; ++ float f = fin; ++ uint32_t tmp; ++ ++ if (f < 0) f = -f; ++ ++ tmp = f; ++ for (exp = 0; exp <= 3 && tmp > 0; exp++) ++ tmp /= 2; ++ ++ mant = (f * (1 << 6) + 0.5); ++ mant >>= exp; ++ if (mant > (1 << 6)) ++ mant = (1 << 6) - 1; ++ ++ return (exp << 6) | mant; ++} ++ ++static uint8_t ++float_to_fix_2_6(float f) ++{ ++ uint8_t ret; ++ ++ ret = f * (1 << 6); ++ return ret; ++} ++ ++static void ++i830_tv_update_brightness(I830Ptr pI830, uint8_t brightness) ++{ ++ /* brightness in 2's comp value */ ++ uint32_t val = INREG(TV_CLR_KNOBS) & ~TV_BRIGHTNESS_MASK; ++ int8_t bri = brightness - 128; /* remove bias */ ++ ++ val |= (bri << TV_BRIGHTNESS_SHIFT) & TV_BRIGHTNESS_MASK; ++ OUTREG(TV_CLR_KNOBS, val); ++} ++ ++static void ++i830_tv_update_contrast(I830Ptr pI830, uint8_t contrast) ++{ ++ uint32_t val = INREG(TV_CLR_KNOBS) & ~TV_CONTRAST_MASK;; ++ float con; ++ uint8_t c; ++ ++ if (IS_I965G(pI830)) { ++ /* 2.6 fixed point */ ++ con = 3.0 * ((float) contrast / 255); ++ c = float_to_fix_2_6(con); ++ } else { ++ /* 2.6 floating point */ ++ con = 8.875 * ((float) contrast / 255); ++ c = float_to_float_2_6(con); ++ } ++ val |= (c << TV_CONTRAST_SHIFT) & TV_CONTRAST_MASK; ++ OUTREG(TV_CLR_KNOBS, val); ++} ++ ++static void ++i830_tv_update_saturation(I830Ptr pI830, uint8_t saturation) ++{ ++ uint32_t val = INREG(TV_CLR_KNOBS) & ~TV_SATURATION_MASK; ++ float sat; ++ uint8_t s; ++ ++ /* same as contrast */ ++ if (IS_I965G(pI830)) { ++ sat = 3.0 * ((float) saturation / 255); ++ s = float_to_fix_2_6(sat); ++ } else { ++ sat = 8.875 * ((float) saturation / 255); ++ s = float_to_float_2_6(sat); ++ } ++ val |= (s << TV_SATURATION_SHIFT) & TV_SATURATION_MASK; ++ OUTREG(TV_CLR_KNOBS, val); ++} ++ ++static void ++i830_tv_update_hue(I830Ptr pI830, uint8_t hue) ++{ ++ uint32_t val = INREG(TV_CLR_KNOBS) & ~TV_HUE_MASK; ++ ++ val |= (hue << TV_HUE_SHIFT) & TV_HUE_MASK; ++ OUTREG(TV_CLR_KNOBS, val); ++} ++ + static void + i830_tv_mode_set(xf86OutputPtr output, DisplayModePtr mode, + DisplayModePtr adjusted_mode) +@@ -1180,14 +1275,6 @@ i830_tv_mode_set(xf86OutputPtr output, DisplayModePtr mode, + (i830_float_to_csc(color_conversion->bv) << 16) | + (i830_float_to_luma(color_conversion->av))); + +- if (IS_I965G(pI830)) { +- /* 2.6 fixed point value for contrast and saturation modifier, +- use 1 as default */ +- OUTREG(TV_CLR_KNOBS, 0x00404000); +- } else { +- /* 915/945 uses 2 bits exponent and 6 bits mantissa format */ +- OUTREG(TV_CLR_KNOBS, 0x00606000); +- } + OUTREG(TV_CLR_LEVEL, ((video_levels->black << TV_BLACK_LEVEL_SHIFT) | + (video_levels->blank << TV_BLANK_LEVEL_SHIFT))); + { +@@ -1380,6 +1467,13 @@ i830_tv_detect(xf86OutputPtr output) + i830ReleaseLoadDetectPipe (output, dpms_mode); + } + ++ if (dev_priv->force_type) { ++ if (type == TV_TYPE_NONE) ++ return XF86OutputStatusDisconnected; ++ else ++ return XF86OutputStatusConnected; ++ } ++ + if (type != dev_priv->type) + { + dev_priv->type = type; +@@ -1405,10 +1499,10 @@ static struct input_res { + { + {"640x480", 640, 480}, + {"800x600", 800, 600}, +- {"1024x768", 1024, 768}, +- {"1280x1024", 1280, 1024}, + {"848x480", 848, 480}, ++ {"1024x768", 1024, 768}, + {"1280x720", 1280, 720}, ++ {"1280x1024", 1280, 1024}, + {"1920x1080", 1920, 1080}, + }; + +@@ -1488,6 +1582,26 @@ static char *margin_names[4] = { + "LEFT", "TOP", "RIGHT", "BOTTOM" + }; + ++/** ++ * contrast and saturation has different format on 915/945 with 965. ++ * On 915/945, it's 2.6 floating point number. ++ * On 965, it's 2.6 fixed point number. ++ */ ++#define TV_BRIGHTNESS_NAME "BRIGHTNESS" ++#define TV_BRIGHTNESS_DEFAULT 128 /* bias */ ++static Atom brightness_atom; ++#define TV_CONTRAST_NAME "CONTRAST" ++#define TV_CONTRAST_DEFAULT 0x40 ++#define TV_CONTRAST_DEFAULT_945G 0x60 ++static Atom contrast_atom; ++#define TV_SATURATION_NAME "SATURATION" ++#define TV_SATURATION_DEFAULT 0x40 ++#define TV_SATURATION_DEFAULT_945G 0x60 ++static Atom saturation_atom; ++#define TV_HUE_NAME "HUE" ++#define TV_HUE_DEFAULT 0 ++static Atom hue_atom; ++ + static Bool + i830_tv_format_set_property (xf86OutputPtr output) + { +@@ -1533,6 +1647,62 @@ i830_tv_format_configure_property (xf86OutputPtr output) + num_atoms, (INT32 *) current_atoms); + } + ++static void ++i830_tv_color_set_property(xf86OutputPtr output, Atom property, ++ uint8_t val) ++{ ++ ScrnInfoPtr pScrn = output->scrn; ++ I830Ptr pI830 = I830PTR(pScrn); ++ I830OutputPrivatePtr intel_output = output->driver_private; ++ struct i830_tv_priv *dev_priv = intel_output->dev_priv; ++ ++ if (property == brightness_atom) { ++ dev_priv->brightness = val; ++ i830_tv_update_brightness(pI830, val); ++ } else if (property == contrast_atom) { ++ dev_priv->contrast = val; ++ i830_tv_update_contrast(pI830, val); ++ } else if (property == saturation_atom) { ++ dev_priv->saturation = val; ++ i830_tv_update_saturation(pI830, val); ++ } else if (property == hue_atom) { ++ dev_priv->hue = val; ++ i830_tv_update_hue(pI830, val); ++ } ++} ++ ++static void ++i830_tv_color_create_property(xf86OutputPtr output, Atom *property, ++ char *name, int name_len, uint8_t val) ++{ ++ ScrnInfoPtr pScrn = output->scrn; ++ INT32 range[2]; ++ int err = 0; ++ ++ *property = MakeAtom(name, name_len - 1, TRUE); ++ range[0] = 0; ++ range[1] = 255; ++ err = RRConfigureOutputProperty(output->randr_output, *property, ++ FALSE, TRUE, FALSE, 2, range); ++ if (err != 0) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "RRConfigureOutputProperty error, %d\n", err); ++ goto out; ++ } ++ /* Set the current value */ ++ i830_tv_color_set_property(output, *property, val); ++ ++ err = RRChangeOutputProperty(output->randr_output, *property, ++ XA_INTEGER, 32, PropModeReplace, 1, &val, ++ FALSE, FALSE); ++ if (err != 0) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "RRChangeOutputProperty error, %d\n", err); ++ } ++out: ++ return; ++} ++ + #endif /* RANDR_12_INTERFACE */ + + static void +@@ -1540,10 +1710,10 @@ i830_tv_create_resources(xf86OutputPtr output) + { + #ifdef RANDR_12_INTERFACE + ScrnInfoPtr pScrn = output->scrn; ++ I830Ptr pI830 = I830PTR(pScrn); + I830OutputPrivatePtr intel_output = output->driver_private; + struct i830_tv_priv *dev_priv = intel_output->dev_priv; +- int err; +- int i; ++ int err, i; + + /* Set up the tv_format property, which takes effect on mode set + * and accepts strings that match exactly +@@ -1591,6 +1761,23 @@ i830_tv_create_resources(xf86OutputPtr output) + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "RRChangeOutputProperty error, %d\n", err); + } ++ ++ i830_tv_color_create_property(output, &brightness_atom, ++ TV_BRIGHTNESS_NAME, ++ sizeof(TV_BRIGHTNESS_NAME), ++ TV_BRIGHTNESS_DEFAULT); ++ i830_tv_color_create_property(output, &contrast_atom, ++ TV_CONTRAST_NAME, ++ sizeof(TV_CONTRAST_NAME), ++ IS_I965G(pI830) ? TV_CONTRAST_DEFAULT : ++ TV_CONTRAST_DEFAULT_945G); ++ i830_tv_color_create_property(output, &saturation_atom, ++ TV_SATURATION_NAME, ++ sizeof(TV_SATURATION_NAME), ++ IS_I965G(pI830) ? TV_SATURATION_DEFAULT : ++ TV_SATURATION_DEFAULT_945G); ++ i830_tv_color_create_property(output, &hue_atom, TV_HUE_NAME, ++ sizeof(TV_HUE_NAME), TV_HUE_DEFAULT); + #endif /* RANDR_12_INTERFACE */ + } + +@@ -1605,9 +1792,14 @@ i830_tv_set_property(xf86OutputPtr output, Atom property, + { I830OutputPrivatePtr intel_output = output->driver_private; struct i830_tv_priv *dev_priv = intel_output->dev_priv; ++ I830Ptr pI830 = I830PTR(output->scrn); Atom atom; - char *name; + const char *name; char *val; ++ RRCrtcPtr randr_crtc; ++ xRRModeInfo modeinfo; ++ RRModePtr mode; ++ DisplayModePtr crtc_mode; if (value->type != XA_ATOM || value->format != 32 || value->size != 1) + return FALSE; +@@ -1626,6 +1818,51 @@ i830_tv_set_property(xf86OutputPtr output, Atom property, + } + xfree (dev_priv->tv_format); + dev_priv->tv_format = val; ++ ++ if (pI830->starting) ++ return TRUE; ++ ++ /* TV format change will generate new modelines, try ++ to probe them and update outputs. */ ++ xf86ProbeOutputModes(output->scrn, 0, 0); ++ /* Mirror output modes to scrn mode list */ ++ xf86SetScrnInfoModes (output->scrn); ++ ++ for (crtc_mode = output->probed_modes; crtc_mode; ++ crtc_mode = crtc_mode->next) ++ { ++ if (output->crtc->mode.HDisplay == crtc_mode->HDisplay && ++ output->crtc->mode.VDisplay == crtc_mode->VDisplay) ++ break; ++ } ++ if (!crtc_mode) ++ crtc_mode = output->probed_modes; ++ ++ xf86CrtcSetMode(output->crtc, crtc_mode, output->crtc->rotation, ++ output->crtc->x, output->crtc->y); ++ ++ xf86RandR12TellChanged(output->scrn->pScreen); ++ ++ modeinfo.width = crtc_mode->HDisplay; ++ modeinfo.height = crtc_mode->VDisplay; ++ modeinfo.dotClock = crtc_mode->Clock * 1000; ++ modeinfo.hSyncStart = crtc_mode->HSyncStart; ++ modeinfo.hSyncEnd = crtc_mode->HSyncEnd; ++ modeinfo.hTotal = crtc_mode->HTotal; ++ modeinfo.hSkew = crtc_mode->HSkew; ++ modeinfo.vSyncStart = crtc_mode->VSyncStart; ++ modeinfo.vSyncEnd = crtc_mode->VSyncEnd; ++ modeinfo.vTotal = crtc_mode->VTotal; ++ modeinfo.nameLength = strlen(crtc_mode->name); ++ modeinfo.modeFlags = crtc_mode->Flags; ++ ++ mode = RRModeGet(&modeinfo, crtc_mode->name); ++ randr_crtc = output->crtc->randr_crtc; ++ if (mode != randr_crtc->mode) { ++ if (randr_crtc->mode) ++ RRModeDestroy(randr_crtc->mode); ++ randr_crtc->mode = mode; ++ } + return TRUE; + } + for (i = 0; i < 4; i++) +@@ -1645,6 +1882,18 @@ i830_tv_set_property(xf86OutputPtr output, Atom property, + return TRUE; + } + } ++ if (property == brightness_atom || property == contrast_atom || ++ property == saturation_atom || property == hue_atom) { ++ uint8_t val; ++ ++ /* Make sure value is sane */ ++ if (value->type != XA_INTEGER || value->format != 32 || ++ value->size != 1) ++ return FALSE; ++ ++ memcpy (&val, value->data, 1); ++ i830_tv_color_set_property(output, property, val); ++ } + + return TRUE; + } +@@ -1693,6 +1942,7 @@ i830_tv_init(ScrnInfoPtr pScrn) + uint32_t tv_dac_on, tv_dac_off, save_tv_dac; + XF86OptionPtr mon_option_lst = NULL; + char *tv_format = NULL; ++ char *tv_type = NULL; + + if (pI830->quirk_flag & QUIRK_IGNORE_TV) + return; +@@ -1760,12 +2010,32 @@ i830_tv_init(ScrnInfoPtr pScrn) + dev_priv->margin[TV_MARGIN_BOTTOM] = xf86SetIntOption (mon_option_lst, + "Bottom", 37); + +- tv_format = xf86findOptionValue (mon_option_lst, "TV Format"); ++ tv_format = xf86findOptionValue (mon_option_lst, "TV_Format"); + if (tv_format) + dev_priv->tv_format = xstrdup (tv_format); + else + dev_priv->tv_format = xstrdup (tv_modes[0].name); + ++ tv_type = xf86findOptionValue (mon_option_lst, "TV_Connector"); ++ if (tv_type) { ++ dev_priv->force_type = TRUE; ++ if (strcasecmp(tv_type, "S-Video") == 0) ++ dev_priv->type = TV_TYPE_SVIDEO; ++ else if (strcasecmp(tv_type, "Composite") == 0) ++ dev_priv->type = TV_TYPE_COMPOSITE; ++ else if (strcasecmp(tv_type, "Component") == 0) ++ dev_priv->type = TV_TYPE_COMPONENT; ++ else { ++ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, ++ "Unknown TV Connector type %s\n", tv_type); ++ dev_priv->force_type = FALSE; ++ } ++ } ++ ++ if (dev_priv->force_type) ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, ++ "Force TV Connector type as %s\n", tv_type); ++ + output->driver_private = intel_output; + output->interlaceAllowed = FALSE; + output->doubleScanAllowed = FALSE; diff --git a/src/i830_video.c b/src/i830_video.c index 87fa020..cdb1072 100644 --- a/src/i830_video.c @@ -5815,7 +6344,7 @@ return BadAlloc; } diff --git a/src/i965_render.c b/src/i965_render.c -index 00cb051..de1c8b3 100644 +index 00cb051..ab7f7d2 100644 --- a/src/i965_render.c +++ b/src/i965_render.c @@ -315,8 +315,6 @@ static const uint32_t sf_kernel_mask_static[][4] = { @@ -6830,7 +7359,9 @@ + composite_op->binding_table_bo = binding_table_bo; + composite_op->src_filter = + sampler_state_filter_from_picture(pSrcPicture->filter); -+ + +- /* Fallback if we can't make this operation fit. */ +- return _emit_batch_header_for_composite_check_twice (pScrn); + pI830->scale_units[0][0] = pSrc->drawable.width; + pI830->scale_units[0][1] = pSrc->drawable.height; + @@ -6912,9 +7443,7 @@ + 4096); + render_state->vb_offset = 0; + } - -- /* Fallback if we can't make this operation fit. */ -- return _emit_batch_header_for_composite_check_twice (pScrn); ++ + drm_intel_bo_reference(render_state->vertex_buffer_bo); + return render_state->vertex_buffer_bo; } @@ -7111,11 +7640,11 @@ } /** -@@ -1649,21 +1715,25 @@ gen4_render_state_cleanup(ScrnInfoPtr pScrn) +@@ -1649,21 +1715,36 @@ gen4_render_state_cleanup(ScrnInfoPtr pScrn) { I830Ptr pI830 = I830PTR(pScrn); struct gen4_render_state *render_state= pI830->gen4_render_state; -+ int i; ++ int i, j, k, l, m; if (render_state->vertex_buffer_bo) { dri_bo_unreference (render_state->vertex_buffer_bo); @@ -7131,19 +7660,29 @@ + render_state->sf_state_bo = NULL; + drm_intel_bo_unreference(render_state->sf_mask_state_bo); + render_state->sf_mask_state_bo = NULL; -+ drm_intel_bo_unreference(render_state->cc_state_bo); -+ render_state->cc_state_bo = NULL; ++ + for (i = 0; i < WM_KERNEL_COUNT; i++) { + drm_intel_bo_unreference(render_state->wm_kernel_bo[i]); + render_state->wm_kernel_bo[i] = NULL; } - render_state->static_state = NULL; -} -- + -unsigned int -gen4_render_state_size(ScrnInfoPtr pScrn) -{ - return sizeof(gen4_static_state_t); ++ for (i = 0; i < SAMPLER_STATE_FILTER_COUNT; i++) ++ for (j = 0; j < SAMPLER_STATE_EXTEND_COUNT; j++) ++ for (k = 0; k < SAMPLER_STATE_FILTER_COUNT; k++) ++ for (l = 0; l < SAMPLER_STATE_EXTEND_COUNT; l++) ++ for (m = 0; m < WM_KERNEL_COUNT; m++) { ++ drm_intel_bo_unreference(render_state->wm_state_bo[m][i][j][k][l]); ++ render_state->wm_state_bo[m][i][j][k][l] = NULL; ++ } ++ ++ drm_intel_bo_unreference(render_state->cc_state_bo); ++ render_state->cc_state_bo = NULL; + drm_intel_bo_unreference(render_state->sip_kernel_bo); + render_state->sip_kernel_bo = NULL; } Index: xorg-x11-drv-intel.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xorg-x11-drv-intel.spec 2 Mar 2009 15:57:40 -0000 1.5 +++ xorg-x11-drv-intel.spec 4 Mar 2009 22:42:27 -0000 1.6 @@ -8,7 +8,7 @@ Summary: Xorg X11 Intel video driver(s) Name: xorg-x11-drv-intel Version: 2.6.0 -Release: 11%{?dist} +Release: 12%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -26,7 +26,6 @@ Patch6: intel-2.5.0-no-gem-legacy-3d.patch Patch7: kill-svideo.patch Patch8: copy-fb.patch -Patch9: intel-2.6.0-kms-dpms.patch ExclusiveArch: %{ix86} x86_64 ia64 @@ -65,7 +64,6 @@ %patch6 -p1 -b .nogem3d %patch7 -p1 -b .svideo %patch8 -p1 -b .copy-fb -%patch9 -p1 -b .dpms %build @@ -105,6 +103,11 @@ %{_libdir}/libIntelXvMC.so %changelog +* Wed Mar 4 2009 Kristian H??gsberg - 2.6.0-12 +- Update to new git snapshot: re-enables multiple X servers, fixes + leak on vt switch for 965 type hardware, fold dpms patch into git + master patch. + * Mon Mar 02 2009 Adam Jackson 2.6.0-11 - intel-2.6.0-kms-dpms.patch: Enable DPMS on KMS outputs. --- intel-2.6.0-kms-dpms.patch DELETED --- From spot at fedoraproject.org Wed Mar 4 22:43:26 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 22:43:26 +0000 (UTC) Subject: rpms/R/EL-4 R.spec,1.28,1.29 Message-ID: <20090304224326.2886070116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15550 Modified Files: R.spec Log Message: fix fortran compiler error on EL-4 Index: R.spec =================================================================== RCS file: /cvs/pkgs/rpms/R/EL-4/R.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- R.spec 4 Mar 2009 21:58:14 -0000 1.28 +++ R.spec 4 Mar 2009 22:42:55 -0000 1.29 @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 2%{?dist}.2 +Release: 3%{?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 @@ -157,7 +157,6 @@ export R_PDFVIEWER="%{_bindir}/ggv" export R_PRINTCMD="lpr" export R_BROWSER="%{_bindir}/firefox" -export F77="g77" # Only broken on EL-4, ppc %ifarch ppc export CPICFLAGS="-fPIC" @@ -170,25 +169,25 @@ x86_64|mips64|ppc64|powerpc64|sparc64|s390x) export CC="gcc -m64" export CXX="g++ -m64" - export F77="gfortran -m64" - export FC="gfortran -m64" + export F77="g77 -m64" + export FC="g77 -m64" ;; ia64|alpha|sh*) export CC="gcc" export CXX="g++" - export F77="gfortran" - export FC="gfortran" + export F77="g77" + export FC="g77" ;; *) export CC="gcc -m32" export CXX="g++ -m32" - export F77="gfortran -m32" - export FC="gfortran -m32" + export F77="g77 -m32" + export FC="g77 -m32" ;; esac export FCFLAGS="%{optflags}" -%configure \ +( %configure \ --with-system-zlib --with-system-bzlib --with-system-pcre \ --with-lapack \ --with-tcl-config=%{_libdir}/tclConfig.sh \ @@ -196,11 +195,8 @@ --enable-R-shlib \ rdocdir=%{_docdir}/R-%{version} \ rincludedir=%{_includedir}/R \ - rsharedir=%{_datadir}/R -# ) \ -# | grep -A30 'R is now' - > CAPABILITIES -cat config.log -BARF + rsharedir=%{_datadir}/R) \ + | grep -A30 'R is now' - > CAPABILITIES make (cd src/nmath/standalone; make) #make check-all @@ -336,6 +332,9 @@ /sbin/ldconfig %changelog +* Wed Mar 4 2009 Tom "spot" Callaway 2.8.1-3 +- fix fortran compiler error on EL-4 + * Wed Mar 4 2009 Tom "spot" Callaway 2.8.1-2 - fix R-make-search-index.sh (bz 487022) - fix libRmath requires to need V-R (thanks to Martyn Plummer) From pbrobinson at fedoraproject.org Wed Mar 4 22:44:14 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Wed, 4 Mar 2009 22:44:14 +0000 (UTC) Subject: rpms/gssdp/devel gssdp.spec,1.8,1.9 Message-ID: <20090304224414.2EB0E70116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gssdp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15798 Modified Files: gssdp.spec Log Message: - Move docs to noarch subpackage Index: gssdp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gssdp/devel/gssdp.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gssdp.spec 25 Feb 2009 01:26:55 -0000 1.8 +++ gssdp.spec 4 Mar 2009 22:43:43 -0000 1.9 @@ -1,6 +1,6 @@ Name: gssdp Version: 0.6.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Resource discovery and announcement over SSDP Group: System Environment/Libraries @@ -32,13 +32,22 @@ %package devel Summary: Development package for gssdp Group: Development/Libraries -Requires: gssdp = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: gtk-doc %description devel Files for development with gssdp. +%package docs +Summary: Documentation files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description docs +This package contains developer documentation for %{name}. + %prep %setup -q @@ -46,7 +55,6 @@ %configure --disable-static make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -70,12 +78,18 @@ %files devel %defattr(-,root,root,-) -%{_datadir}/gtk-doc/html/gssdp %{_libdir}/libgssdp-1.0.so %{_libdir}/pkgconfig/gssdp-1.0.pc %{_includedir}/gssdp-1.0 +%files docs +%defattr(-,root,root,-) +%{_datadir}/gtk-doc/html/gssdp + %changelog +* Wed Mar 4 2009 Peter Robinson 0.6.4-3 +- Move docs to noarch subpackage + * Tue Feb 24 2009 Fedora Release Engineering - 0.6.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From chkr at fedoraproject.org Wed Mar 4 22:44:39 2009 From: chkr at fedoraproject.org (Christian Krause) Date: Wed, 4 Mar 2009 22:44:39 +0000 (UTC) Subject: rpms/uml_utilities/F-10 uml_utilities.spec,1.1,1.2 Message-ID: <20090304224439.6490070116@cvs1.fedora.phx.redhat.com> Author: chkr Update of /cvs/pkgs/rpms/uml_utilities/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15862 Modified Files: uml_utilities.spec Log Message: * Wed Mar 04 2009 Christian Krause - 20070815-5 - Limited setuid binary to only members of the uml-net group Index: uml_utilities.spec =================================================================== RCS file: /cvs/pkgs/rpms/uml_utilities/F-10/uml_utilities.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- uml_utilities.spec 1 Mar 2009 21:35:47 -0000 1.1 +++ uml_utilities.spec 4 Mar 2009 22:44:09 -0000 1.2 @@ -1,11 +1,12 @@ Name: uml_utilities Version: 20070815 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ URL: http://user-mode-linux.sourceforge.net/index.html Source0: http://user-mode-linux.sourceforge.net/%{name}_%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fuse-devel, readline-devel +Requires(pre): shadow-utils Group: Applications/Internet Summary: Utilities for user-mode linux kernel # installation problem was reported upstream: @@ -37,7 +38,7 @@ %defattr(-,root,root,-) %doc COPYING Changelog %attr(755,root,root) %dir %{_libdir}/uml -%attr(4755,root,root) %{_bindir}/uml_net +%attr(4750,root,uml-net) %{_bindir}/uml_net %{_bindir}/jailtest %{_bindir}/tunctl %{_bindir}/uml_mconsole @@ -57,7 +58,14 @@ %clean rm -rf ${RPM_BUILD_ROOT} +%pre +getent group uml-net >/dev/null || groupadd -r uml-net +exit 0 + %changelog +* Wed Mar 04 2009 Christian Krause - 20070815-5 +- Limited setuid binary to only members of the uml-net group + * Fri Feb 27 2009 Christian Krause - 20070815-4 - use regular version tag - fixed license tag From spot at fedoraproject.org Wed Mar 4 22:45:59 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 4 Mar 2009 22:45:59 +0000 (UTC) Subject: rpms/winpdb/devel winpdb.spec,1.15,1.16 Message-ID: <20090304224559.B6D3570116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/winpdb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16142 Modified Files: winpdb.spec Log Message: fix typo Index: winpdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/winpdb/devel/winpdb.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- winpdb.spec 4 Mar 2009 22:20:37 -0000 1.15 +++ winpdb.spec 4 Mar 2009 22:45:29 -0000 1.16 @@ -2,7 +2,7 @@ Name: winpdb Version: 1.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced python debugger Group: Development/Debuggers License: GPLv2+ @@ -51,9 +51,12 @@ %{_bindir}/* %{python_sitelib}/* %{_datadir}/applications/*.desktop -{_datadir}/pixmaps/%{name}.png +%{_datadir}/pixmaps/%{name}.png %changelog +* Wed Mar 4 2009 Tom "spot" Callaway - 1.4.4-4 +- fix typo + * Wed Mar 4 2009 Tom "spot" Callaway - 1.4.4-3 - add icon, fix desktop file (bz 487870) From pbrobinson at fedoraproject.org Wed Mar 4 22:50:10 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Wed, 4 Mar 2009 22:50:10 +0000 (UTC) Subject: rpms/gupnp/devel gupnp.spec,1.16,1.17 Message-ID: <20090304225010.D06AF70116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gupnp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17043 Modified Files: gupnp.spec Log Message: - Move docs to noarch sub package Index: gupnp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gupnp/devel/gupnp.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gupnp.spec 2 Mar 2009 17:37:05 -0000 1.16 +++ gupnp.spec 4 Mar 2009 22:49:40 -0000 1.17 @@ -1,6 +1,6 @@ Name: gupnp Version: 0.12.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A framework for creating UPnP devices & control points Group: System Environment/Libraries @@ -26,7 +26,7 @@ %package devel Summary: Development package for gupnp Group: Development/Libraries -Requires: gupnp = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: gssdp-devel Requires: pkgconfig Requires: gtk-doc @@ -38,6 +38,15 @@ %description devel Files for development with gupnp. +%package docs +Summary: Documentation files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description docs +This package contains developer documentation for %{name}. + %prep %setup -q @@ -66,12 +75,18 @@ %files devel %defattr(-,root,root,-) -%{_datadir}/gtk-doc/html/gupnp %{_libdir}/pkgconfig/gupnp-1.0.pc %{_libdir}/libgupnp-1.0.so %{_includedir}/gupnp-1.0 +%files docs +%defattr(-,root,root,-) +%{_datadir}/gtk-doc/html/gupnp + %changelog +* Wed Mar 4 2009 Peter Robinson 0.12.6-4 +- Move docs to noarch sub package + * Mon Mar 2 2009 Peter Robinson 0.12.6-3 - Add some extra -devel Requires packages From whot at fedoraproject.org Wed Mar 4 22:52:21 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Wed, 4 Mar 2009 22:52:21 +0000 (UTC) Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.418,1.419 Message-ID: <20090304225221.72F1C70116@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17343 Modified Files: xorg-x11-server.spec Log Message: * Thu Mar 05 2009 Peter Hutterer 1.6.0-7 - Remove 10-x11-keymap.fdi, this is provided by fedora-setup-keyboard now. Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.418 retrieving revision 1.419 diff -u -r1.418 -r1.419 --- xorg-x11-server.spec 4 Mar 2009 21:25:58 -0000 1.418 +++ xorg-x11-server.spec 4 Mar 2009 22:51:51 -0000 1.419 @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.0 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -36,9 +36,6 @@ Source1: gitignore %endif -# keyboard enablement -Source10: 10-x11-keymap.fdi - # "useful" xvfb-run script Source20: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh @@ -338,9 +335,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/xorg install -m 0444 hw/xfree86/common/{vesa,extra}modes $RPM_BUILD_ROOT%{_datadir}/xorg/ -# fedora-isms to slurp keyboard settings out of /etc/sysconfig/keyboard -mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor -install -m 0444 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor %endif # Make the source package @@ -408,7 +402,6 @@ %{_bindir}/cvt %{_bindir}/gtf %dir %{_datadir}/xorg -%{_datadir}/hal/fdi/policy/10osvendor/10-x11-keymap.fdi %{_datadir}/xorg/vesamodes %{_datadir}/xorg/extramodes %dir %{_libdir}/xorg @@ -507,6 +500,9 @@ %changelog +* Thu Mar 05 2009 Peter Hutterer 1.6.0-7 +- Remove 10-x11-keymap.fdi, this is provided by fedora-setup-keyboard now. + * Wed Mar 04 2009 Adam Jackson 1.6.0-6 - Move fedora-setup-keyboard (and libdrm) Requires to the Xorg subpackage, since they won't do anything at the top level. From whot at fedoraproject.org Wed Mar 4 22:54:15 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Wed, 4 Mar 2009 22:54:15 +0000 (UTC) Subject: rpms/fedora-setup-keyboard/devel fedora-setup-keyboard.spec, 1.1, 1.2 Message-ID: <20090304225415.8E9C870116@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/fedora-setup-keyboard/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17849 Modified Files: fedora-setup-keyboard.spec Log Message: * Thu Mar 05 2009 Peter Hutterer 0.3-3 - Conflict xorg-x11-server-Xorg < 1.6.0-7 (10-x11-keymap.fdi and fedora-setup-keyboard up to 1.6.0-5) Index: fedora-setup-keyboard.spec =================================================================== RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/devel/fedora-setup-keyboard.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-setup-keyboard.spec 3 Mar 2009 08:01:47 -0000 1.1 +++ fedora-setup-keyboard.spec 4 Mar 2009 22:53:44 -0000 1.2 @@ -1,6 +1,6 @@ Name: fedora-setup-keyboard Version: 0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Hal keyboard layout callout Group: Applications/System @@ -14,6 +14,7 @@ BuildRequires: rhpl Requires: hal +Conflicts: xorg-x11-server-Xorg < 1.6.0-7 %description %{name} gets invoked by hal to apply the keyboard layout @@ -43,6 +44,10 @@ %doc COPYING %changelog +* Thu Mar 05 2009 Peter Hutterer 0.3-3 +- Conflict xorg-x11-server-Xorg < 1.6.0-7 (10-x11-keymap.fdi and + fedora-setup-keyboard up to 1.6.0-5) + * Mon Mar 02 2009 Adel Gadllah 0.3-2 - Fix license tag From pbrobinson at fedoraproject.org Wed Mar 4 22:54:24 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Wed, 4 Mar 2009 22:54:24 +0000 (UTC) Subject: rpms/gupnp/devel gupnp.spec,1.17,1.18 Message-ID: <20090304225424.7AEC870116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gupnp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17917 Modified Files: gupnp.spec Log Message: - move gtk-doc requirement to docs package Index: gupnp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gupnp/devel/gupnp.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gupnp.spec 4 Mar 2009 22:49:40 -0000 1.17 +++ gupnp.spec 4 Mar 2009 22:53:54 -0000 1.18 @@ -29,7 +29,6 @@ Requires: %{name} = %{version}-%{release} Requires: gssdp-devel Requires: pkgconfig -Requires: gtk-doc Requires: libsoup-devel Requires: libxml2-devel Requires: e2fsprogs-devel @@ -42,6 +41,7 @@ Summary: Documentation files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: gtk-doc BuildArch: noarch %description docs From pbrobinson at fedoraproject.org Wed Mar 4 22:59:51 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Wed, 4 Mar 2009 22:59:51 +0000 (UTC) Subject: rpms/gupnp-av/devel gupnp-av.spec,1.8,1.9 Message-ID: <20090304225951.3318570116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gupnp-av/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18865 Modified Files: gupnp-av.spec Log Message: - Move docs to noarch subpackage Index: gupnp-av.spec =================================================================== RCS file: /cvs/pkgs/rpms/gupnp-av/devel/gupnp-av.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gupnp-av.spec 25 Feb 2009 02:56:05 -0000 1.8 +++ gupnp-av.spec 4 Mar 2009 22:59:20 -0000 1.9 @@ -1,6 +1,6 @@ Name: gupnp-av Version: 0.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A collection of helpers for building UPnP AV applications Group: System Environment/Libraries @@ -27,15 +27,24 @@ %package devel Summary: Development package for gupnp-av Group: Development/Libraries +Requires: %{name} = %{version}-%{release} Requires: gssdp-devel Requires: gupnp-devel -Requires: gupnp-av = %{version}-%{release} Requires: pkgconfig -Requires: gtk-doc %description devel Files for development with gupnp-av. +%package docs +Summary: Documentation files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: gtk-doc +BuildArch: noarch + +%description docs +This package contains developer documentation for %{name}. + %prep %setup -q @@ -63,12 +72,18 @@ %files devel %defattr(-,root,root,-) -%{_datadir}/gtk-doc/html/gupnp-av/ %{_includedir}/gupnp-av-1.0 %{_libdir}/pkgconfig/gupnp-av-1.0.pc %{_libdir}/libgupnp-av-1.0.so +%files docs +%defattr(-,root,root,-) +%{_datadir}/gtk-doc/html/gupnp-av/ + %changelog +* Wed Mar 4 2009 Peter Robinson 0.3.1-3 +- Move docs to noarch subpackage + * Tue Feb 24 2009 Fedora Release Engineering - 0.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pbrobinson at fedoraproject.org Wed Mar 4 23:03:09 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Wed, 4 Mar 2009 23:03:09 +0000 (UTC) Subject: rpms/gssdp/devel gssdp.spec,1.9,1.10 Message-ID: <20090304230309.F185070116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gssdp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19525 Modified Files: gssdp.spec Log Message: Move around some Requires Index: gssdp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gssdp/devel/gssdp.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gssdp.spec 4 Mar 2009 22:43:43 -0000 1.9 +++ gssdp.spec 4 Mar 2009 23:02:39 -0000 1.10 @@ -11,7 +11,6 @@ BuildRequires: pkgconfig BuildRequires: libsoup-devel >= 2.4 - BuildRequires: dbus-glib-devel BuildRequires: glib2-devel >= 2.18 BuildRequires: libxml2-devel @@ -33,8 +32,9 @@ Summary: Development package for gssdp Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: libsoup-devel >= 2.4 +Requires: glib2-devel >= 2.18 Requires: pkgconfig -Requires: gtk-doc %description devel Files for development with gssdp. @@ -43,6 +43,7 @@ Summary: Documentation files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: gtk-doc BuildArch: noarch %description docs From pkgdb at fedoraproject.org Wed Mar 4 23:06:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:06:25 +0000 Subject: [pkgdb] qwtplot3d: tuxmaniac has requested commit Message-ID: <20090304230624.14BC420820B@bastion.fedora.phx.redhat.com> tuxmaniac has requested the commit acl on qwtplot3d (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qwtplot3d From pkgdb at fedoraproject.org Wed Mar 4 23:05:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:05:43 +0000 Subject: [pkgdb] qwtplot3d: tuxmaniac has requested watchbugzilla Message-ID: <20090304230624.31AC8208544@bastion.fedora.phx.redhat.com> tuxmaniac has requested the watchbugzilla acl on qwtplot3d (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qwtplot3d From pkgdb at fedoraproject.org Wed Mar 4 23:06:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:06:03 +0000 Subject: [pkgdb] qwtplot3d: tuxmaniac has requested watchcommits Message-ID: <20090304230624.8586D20854A@bastion.fedora.phx.redhat.com> tuxmaniac has requested the watchcommits acl on qwtplot3d (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qwtplot3d From pkgdb at fedoraproject.org Wed Mar 4 23:06:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:06:24 +0000 Subject: [pkgdb] qwtplot3d: tuxmaniac has requested approveacls Message-ID: <20090304230624.591B8208547@bastion.fedora.phx.redhat.com> tuxmaniac has requested the approveacls acl on qwtplot3d (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qwtplot3d From pkgdb at fedoraproject.org Wed Mar 4 23:06:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:06:38 +0000 Subject: [pkgdb] qwtplot3d had acl change status Message-ID: <20090304230718.E2963208544@bastion.fedora.phx.redhat.com> chitlesh has set the watchbugzilla acl on qwtplot3d (Fedora devel) to Approved for tuxmaniac To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qwtplot3d From pkgdb at fedoraproject.org Wed Mar 4 23:07:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:07:20 +0000 Subject: [pkgdb] qwtplot3d had acl change status Message-ID: <20090304230719.5786020820B@bastion.fedora.phx.redhat.com> chitlesh has set the watchcommits acl on qwtplot3d (Fedora devel) to Approved for tuxmaniac To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qwtplot3d From pkgdb at fedoraproject.org Wed Mar 4 23:06:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:06:59 +0000 Subject: [pkgdb] qwtplot3d had acl change status Message-ID: <20090304230721.08F59208549@bastion.fedora.phx.redhat.com> chitlesh has set the commit acl on qwtplot3d (Fedora devel) to Approved for tuxmaniac To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qwtplot3d From pkgdb at fedoraproject.org Wed Mar 4 23:07:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:07:47 +0000 Subject: [pkgdb] qwtplot3d had acl change status Message-ID: <20090304230746.91B8520820B@bastion.fedora.phx.redhat.com> chitlesh has set the approveacls acl on qwtplot3d (Fedora devel) to Approved for tuxmaniac To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qwtplot3d From pkgdb at fedoraproject.org Wed Mar 4 23:08:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:08:42 +0000 Subject: [pkgdb] kicad: tnorth has requested watchcommits Message-ID: <20090304230843.08DEE208543@bastion.fedora.phx.redhat.com> tnorth has requested the watchcommits acl on kicad (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kicad From pkgdb at fedoraproject.org Wed Mar 4 23:08:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:08:08 +0000 Subject: [pkgdb] kicad: tnorth has requested watchbugzilla Message-ID: <20090304230849.58F9F208548@bastion.fedora.phx.redhat.com> tnorth has requested the watchbugzilla acl on kicad (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kicad From pkgdb at fedoraproject.org Wed Mar 4 23:08:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:08:58 +0000 Subject: [pkgdb] gnome-bluetooth: hadess has requested watchcommits Message-ID: <20090304230858.EBDB2208545@bastion.fedora.phx.redhat.com> hadess has requested the watchcommits acl on gnome-bluetooth (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From pkgdb at fedoraproject.org Wed Mar 4 23:08:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:08:52 +0000 Subject: [pkgdb] kicad: tnorth has requested commit Message-ID: <20090304230851.3F01B20854C@bastion.fedora.phx.redhat.com> tnorth has requested the commit acl on kicad (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kicad From pkgdb at fedoraproject.org Wed Mar 4 23:08:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:08:19 +0000 Subject: [pkgdb] gnome-bluetooth: hadess has requested commit Message-ID: <20090304230859.A7F40208546@bastion.fedora.phx.redhat.com> hadess has requested the commit acl on gnome-bluetooth (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From pkgdb at fedoraproject.org Wed Mar 4 23:08:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:08:41 +0000 Subject: [pkgdb] gnome-bluetooth: hadess has requested approveacls Message-ID: <20090304230902.EAC0C208544@bastion.fedora.phx.redhat.com> hadess has requested the approveacls acl on gnome-bluetooth (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From pkgdb at fedoraproject.org Wed Mar 4 23:09:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:09:06 +0000 Subject: [pkgdb] kicad: tnorth has requested watchbugzilla Message-ID: <20090304230906.E304C208552@bastion.fedora.phx.redhat.com> tnorth has requested the watchbugzilla acl on kicad (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kicad From pkgdb at fedoraproject.org Wed Mar 4 23:08:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:08:26 +0000 Subject: [pkgdb] kicad: tnorth has requested watchcommits Message-ID: <20090304230907.21E2E208555@bastion.fedora.phx.redhat.com> tnorth has requested the watchcommits acl on kicad (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kicad From pkgdb at fedoraproject.org Wed Mar 4 23:08:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:08:47 +0000 Subject: [pkgdb] kicad: tnorth has requested commit Message-ID: <20090304230909.0FB15208603@bastion.fedora.phx.redhat.com> tnorth has requested the commit acl on kicad (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kicad From pkgdb at fedoraproject.org Wed Mar 4 23:09:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:09:09 +0000 Subject: [pkgdb] gnome-bluetooth: hadess has requested watchbugzilla Message-ID: <20090304230909.61476208609@bastion.fedora.phx.redhat.com> hadess has requested the watchbugzilla acl on gnome-bluetooth (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From pkgdb at fedoraproject.org Wed Mar 4 23:08:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:08:40 +0000 Subject: [pkgdb] kicad had acl change status Message-ID: <20090304230921.1721D208549@bastion.fedora.phx.redhat.com> chitlesh has set the watchcommits acl on kicad (Fedora devel) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kicad From pkgdb at fedoraproject.org Wed Mar 4 23:09:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:09:21 +0000 Subject: [pkgdb] kicad had acl change status Message-ID: <20090304230921.8EA1D20860F@bastion.fedora.phx.redhat.com> chitlesh has set the watchbugzilla acl on kicad (Fedora devel) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kicad From pkgdb at fedoraproject.org Wed Mar 4 23:09:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:09:23 +0000 Subject: [pkgdb] kicad had acl change status Message-ID: <20090304230923.39B5C2086F6@bastion.fedora.phx.redhat.com> chitlesh has set the commit acl on kicad (Fedora devel) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kicad From pbrobinson at fedoraproject.org Wed Mar 4 23:09:00 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Wed, 4 Mar 2009 23:09:00 +0000 (UTC) Subject: rpms/gupnp-ui/devel gupnp-ui.spec,1.2,1.3 Message-ID: <20090304230900.9F23670116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gupnp-ui/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20723 Modified Files: gupnp-ui.spec Log Message: - Move docs to noarch subpackage Index: gupnp-ui.spec =================================================================== RCS file: /cvs/pkgs/rpms/gupnp-ui/devel/gupnp-ui.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gupnp-ui.spec 25 Feb 2009 02:58:55 -0000 1.2 +++ gupnp-ui.spec 4 Mar 2009 23:08:30 -0000 1.3 @@ -1,6 +1,6 @@ Name: gupnp-ui Version: 0.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GUPnP-UI is a collection of helpers for adding ui to upnp apps Group: System Environment/Libraries @@ -29,13 +29,23 @@ %package devel Summary: Development package for gupnp-ui Group: Development/Libraries -Requires: gupnp-ui = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +Requires: gtk2-devel Requires: pkgconfig -Requires: gtk-doc %description devel Files for development with gupnp-ui. +%package docs +Summary: Documentation files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: gtk-doc +BuildArch: noarch + +%description docs +This package contains developer documentation for %{name}. + %prep %setup -q %patch0 -p0 -b .testapp @@ -65,12 +75,18 @@ %files devel %defattr(-,root,root,-) %dir %{_includedir}/gupnp-ui-1.0 -%doc %{_datadir}/gtk-doc/html/gupnp-ui %{_includedir}/gupnp-ui-1.0/libgupnp-ui %{_libdir}/pkgconfig/gupnp-ui-1.0.pc %{_libdir}/libgupnp-ui-1.0.so +%files devel +%defattr(-,root,root,-) +%doc %{_datadir}/gtk-doc/html/gupnp-ui + %changelog +* Wed Mar 4 2009 Peter Robinson 0.1.1-4 +- Move docs to noarch subpackage + * Tue Feb 24 2009 Fedora Release Engineering - 0.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Wed Mar 4 23:10:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:10:32 +0000 Subject: [pkgdb] kicad had acl change status Message-ID: <20090304231032.479B420854B@bastion.fedora.phx.redhat.com> chitlesh has set the watchcommits acl on kicad (Fedora 10) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kicad From pkgdb at fedoraproject.org Wed Mar 4 23:10:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:10:03 +0000 Subject: [pkgdb] kicad had acl change status Message-ID: <20090304231043.9CDC5208555@bastion.fedora.phx.redhat.com> chitlesh has set the approveacls acl on kicad (Fedora devel) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kicad From pkgdb at fedoraproject.org Wed Mar 4 23:10:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 04 Mar 2009 23:10:35 +0000 Subject: [pkgdb] kicad had acl change status Message-ID: <20090304231057.164C9208603@bastion.fedora.phx.redhat.com> chitlesh has set the approveacls acl on kicad (Fedora 10) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kicad From hadess at fedoraproject.org Wed Mar 4 23:11:50 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 4 Mar 2009 23:11:50 +0000 (UTC) Subject: rpms/gnome-bluetooth/devel .cvsignore, 1.10, 1.11 gnome-bluetooth.spec, 1.61, 1.62 sources, 1.11, 1.12 Message-ID: <20090304231150.35B1F70116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-bluetooth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21031 Modified Files: .cvsignore gnome-bluetooth.spec sources Log Message: * Wed Mar 04 2009 - Bastien Nocera - 2.27.1-2 - Update to 2.27.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 19 Feb 2009 17:10:52 -0000 1.10 +++ .cvsignore 4 Mar 2009 23:11:19 -0000 1.11 @@ -1 +1 @@ -gnome-bluetooth-0.12.0.tar.bz2 +gnome-bluetooth-2.27.1.tar.bz2 Index: gnome-bluetooth.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- gnome-bluetooth.spec 24 Feb 2009 22:44:45 -0000 1.61 +++ gnome-bluetooth.spec 4 Mar 2009 23:11:19 -0000 1.62 @@ -1,79 +1,98 @@ -Summary: GNOME Bluetooth Subsystem -Name: gnome-bluetooth -Version: 0.12.0 -Release: 2%{?dist} -License: GPLv2 and LGPLv2+ -Group: System Environment/Libraries -URL: http://live.gnome.org/GnomeBluetooth -Source: http://download.gnome.org/sources/gnome-bluetooth/0.11/%{name}-%{version}.tar.bz2 - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf >= 2.57 bluez-libs-devel >= 2.8 bluez-utils -BuildRequires: libgnomeui-devel >= 2.2 libbonobo-devel >= 2.0 -BuildRequires: GConf2-devel >= 2.0 librsvg2-devel -BuildRequires: libbtctl-devel >= 0.9.0 -BuildRequires: gob2 openobex-devel >= 1.0.1 -BuildRequires: pygtk2-devel python-devel -BuildRequires: intltool automake libtool gettext -Requires: %{name}-libs = %{version}-%{release} -Requires(pre): GConf2 -Requires(post): GConf2 -Requires(preun): GConf2 -Requires: bluez-utils -ExcludeArch: s390 s390x +Name: gnome-bluetooth +Version: 2.27.1 +Release: 1%{?dist} +Summary: Bluetooth graphical utilities + +Group: Applications/Communications +License: GPLv2+ +URL: http://live.gnome.org/GnomeBluetooth +Source0: http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2 +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +BuildRequires: gtk2-devel +BuildRequires: GConf2-devel +BuildRequires: dbus-glib-devel +BuildRequires: hal-devel +BuildRequires: unique-devel +BuildRequires: libnotify-devel + +BuildRequires: perl-XML-Parser intltool desktop-file-utils gettext gtk-doc + +Obsoletes: bluez-pin +Provides: dbus-bluez-pin-helper +Conflicts: bluez-gnome +Obsoletes: bluez-gnome + +Requires: gvfs-obexftp +Requires: bluez +Requires: obexd +Requires: notification-daemon + +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils %description -This package contains a library with widgets for Bluetooth applications. +The gnome-bluetooth package contains graphical utilities to setup, +monitor and use Bluetooth devices. %package libs -Summary: Libraries for applications, which use gnome-bluetooth -Group: Development/Libraries +Summary: GTK+ Bluetooth device selection widgets +Group: System Environment/Libraries +License: LGPLv2+ +Requires: %{name} = %{version}-%{release} %description libs -This package contains the libraries for applications, -which use gnome-bluetooth. +This package contains libraries needed for applications that +want to display a Bluetooth device selection widget. -%package devel -Summary: Files for the development of applications, which use gnome-bluetooth -Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} -Requires: glib2-devel -Requires: libbtctl-devel - -%description devel -This package contains the files for the development of applications, -which will use gnome-bluetooth. +%package libs-devel +Summary: Development files for %{name}-libs +Group: Development/Libraries +License: LGPLv2+ +Requires: %{name}-libs = %{version}-%{release} +Requires: gtk-doc + +%description libs-devel +This package contains the libraries amd header files that are needed +for writing applications that require a Bluetooth device selection widget. %prep -%setup -q +%setup -q -n gnome-bluetooth-%{version} + %build -%configure +%configure --disable-desktop-update --disable-icon-update make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -make DESTDIR=$RPM_BUILD_ROOT install - -# we do not want .la files -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/python2.5/site-packages/gnomebt/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/libbluetooth.*a - -# rename the icon file -mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/blueradio-48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/blueradio.png - -# Python's .m4 sucks -if [ $RPM_BUILD_ROOT/usr/lib/ != $RPM_BUILD_ROOT%{_libdir}/ ] ; then - mv $RPM_BUILD_ROOT/usr/lib/* $RPM_BUILD_ROOT%{_libdir}/ - rmdir $RPM_BUILD_ROOT/usr/lib -fi +make install DESTDIR=$RPM_BUILD_ROOT -%find_lang %{name} +rm -f $RPM_BUILD_ROOT%{_libdir}/libgnome-bluetooth.la -%clean -rm -rf $RPM_BUILD_ROOT +desktop-file-install --vendor="" \ + --delete-original \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/bluetooth-properties.desktop + +desktop-file-install --vendor="" \ + --delete-original \ + --dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ \ + $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop + +%find_lang gnome-bluetooth2 + +%post +update-desktop-database -q +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule \ + %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas \ + >& /dev/null || : +if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi %pre if [ "$1" -gt 1 ]; then @@ -82,12 +101,13 @@ gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas >/dev/null || : fi + if [ -f %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas ] ; then + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas \ + >& /dev/null || : + fi fi -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig - %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -95,33 +115,50 @@ gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas > /dev/null || : fi + if [ -f %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas ] ; then + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas \ + >& /dev/null || : + fi +fi + +%postun +update-desktop-database -q +if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi -%files -f %{name}.lang -%defattr(-, root, root) -#GPLv2 -%doc AUTHORS COPYING ChangeLog NEWS README +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%files -f gnome-bluetooth2.lang +%defattr(-,root,root,-) +%doc README NEWS COPYING +%{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas +%{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop +%{_bindir}/bluetooth-* +%{_datadir}/applications/*.desktop %{_datadir}/gnome-bluetooth/ -%{_datadir}/pixmaps/* +%{_datadir}/icons/hicolor/*/apps/* +%{_mandir}/man1/* %files libs -%defattr(-, root, root) -#GPLv2 -%doc AUTHORS COPYING ChangeLog NEWS README -%{_libdir}/python*.*/site-packages/gnomebt/ -#LGPLv2+ -%{_libdir}/libgnomebt.so.* - -%files devel -%defattr(-, root, root) -#GPLv2 -%doc COPYING -%{_libdir}/pkgconfig/gnome-bluetooth.pc -%{_includedir}/gnome-bluetooth/ -#LGPLv2+ -%{_libdir}/libgnomebt.so +%defattr(-,root,root,-) +%doc COPYING.LIB +%{_libdir}/libgnome-bluetooth.so.* + +%files libs-devel +%defattr(-,root,root,-) +%{_includedir}/gnome-bluetooth/*.h +%{_libdir}/libgnome-bluetooth.so +%{_libdir}/pkgconfig/gnome-bluetooth-1.0.pc +%{_datadir}/gtk-doc/html/gnome-bluetooth/ %changelog +* Wed Mar 04 2009 - Bastien Nocera - 2.27.1-2 +- Update to 2.27.1 + * Tue Feb 24 2009 Fedora Release Engineering - 0.12.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 19 Feb 2009 17:10:52 -0000 1.11 +++ sources 4 Mar 2009 23:11:19 -0000 1.12 @@ -1 +1 @@ -881a01ce964b8c02b5d40be8b5aedcaf gnome-bluetooth-0.12.0.tar.bz2 +4a7c977086af47fe43ea08b29ab93503 gnome-bluetooth-2.27.1.tar.bz2 From caolanm at fedoraproject.org Wed Mar 4 23:16:36 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Wed, 4 Mar 2009 23:16:36 +0000 (UTC) Subject: rpms/ekg2/devel ekg2.spec,1.22,1.23 Message-ID: <20090304231636.A06EA70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/ekg2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22065 Modified Files: ekg2.spec Log Message: add BuildRequires to rebuild Index: ekg2.spec =================================================================== RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ekg2.spec 24 Feb 2009 14:20:34 -0000 1.22 +++ ekg2.spec 4 Mar 2009 23:16:06 -0000 1.23 @@ -5,7 +5,7 @@ Summary(pl): Wieloprotoko??owy komunikator internetowy Name: ekg2 Version: 0.2 -Release: 0.8.rc1%{?dist} +Release: 0.9.rc1%{?dist} License: GPLv2 Group: Applications/Internet Source0: http://pl.ekg2.org/%{name}-%{version}-rc1.tar.gz @@ -35,6 +35,7 @@ BuildRequires: ruby ruby-devel BuildRequires: sqlite-devel BuildRequires: xosd-devel +BuildRequires: cvs BuildConflicts: readline-devel Requires: %{name}-core = %{version}-%{release} Requires: %{name}-gadu-gadu = %{version}-%{release} @@ -374,6 +375,9 @@ %{_datadir}/%{name}/plugins/xosd %changelog +* Wed Mar 04 2009 Caol??n McNamara - 0.2-0.9.rc1 +- add BuildRequires to rebuild + * Tue Feb 24 2009 Fedora Release Engineering - 0.2-0.8.rc1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pbrobinson at fedoraproject.org Wed Mar 4 23:16:56 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Wed, 4 Mar 2009 23:16:56 +0000 (UTC) Subject: rpms/geoclue/devel geoclue.spec,1.8,1.9 Message-ID: <20090304231656.85D0270116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/geoclue/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22150 Modified Files: geoclue.spec Log Message: - Move docs to noarch, a few spec file cleanups Index: geoclue.spec =================================================================== RCS file: /cvs/pkgs/rpms/geoclue/devel/geoclue.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- geoclue.spec 24 Feb 2009 20:37:20 -0000 1.8 +++ geoclue.spec 4 Mar 2009 23:16:26 -0000 1.9 @@ -1,6 +1,6 @@ Name: geoclue Version: 0.11.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A modular geoinformation service Group: System Environment/Libraries @@ -29,15 +29,27 @@ %package devel Summary: Development package for geoclue Group: Development/Libraries -Requires: geoclue = %{PACKAGE_VERSION} +Requires: %{name} = %{version}-%{release} +Requires: dbus-devel +Requires: libxml2-devel Requires: pkgconfig %description devel Files for development with geoclue. +%package docs +Summary: Documentation files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: gtk-doc +BuildArch: noarch + +%description docs +This package contains developer documentation for %{name}. + %package gui Summary: Testing gui for geoclue Group: Development/Libraries -Requires: geoclue = %{PACKAGE_VERSION} +Requires: %{name} = %{version}-%{release} %description gui Testing gui for geoclue @@ -45,7 +57,7 @@ %package gpsd Summary: gpsd provider for geoclue Group: Development/Libraries -Requires: geoclue = %{PACKAGE_VERSION} +Requires: %{name} = %{version}-%{release} Requires: gpsd %description gpsd @@ -54,7 +66,7 @@ %package gypsy Summary: gypsy provider for geoclue Group: Development/Libraries -Requires: geoclue = %{PACKAGE_VERSION} +Requires: %{name} = %{version}-%{release} Requires: gypsy %description gypsy @@ -111,13 +123,14 @@ %files devel %defattr(-,root,root,-) -%dir %{_includedir}/geoclue -%dir %{_datadir}/gtk-doc/html/geoclue/ -%doc %{_datadir}/gtk-doc/html/geoclue/* -%{_includedir}/geoclue/* +%{_includedir}/geoclue %{_libdir}/pkgconfig/geoclue.pc %{_libdir}/libgeoclue.so +%files docs +%defattr(-,root,root,-) +%doc %{_datadir}/gtk-doc/html/geoclue + %files gui %{_bindir}/geoclue-test-gui @@ -132,6 +145,9 @@ %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service %changelog +* Wed Mar 4 2009 Peter Robinson 0.11.1-15 +- Move docs to noarch, a few spec file cleanups + * Tue Feb 24 2009 Fedora Release Engineering - 0.11.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From radford at fedoraproject.org Wed Mar 4 23:17:32 2009 From: radford at fedoraproject.org (Jim Radford) Date: Wed, 4 Mar 2009 23:17:32 +0000 (UTC) Subject: rpms/dkim-milter/F-9 .cvsignore, 1.2, 1.3 dkim-milter.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090304231732.A6D2D70116@cvs1.fedora.phx.redhat.com> Author: radford Update of /cvs/pkgs/rpms/dkim-milter/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22246 Modified Files: .cvsignore dkim-milter.spec sources Log Message: updated to 2.8.1 (security fix #488594) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dkim-milter/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Apr 2008 03:34:38 -0000 1.2 +++ .cvsignore 4 Mar 2009 23:17:02 -0000 1.3 @@ -1 +1 @@ -dkim-milter-2.5.1.tar.gz +dkim-milter-2.8.1.tar.gz Index: dkim-milter.spec =================================================================== RCS file: /cvs/pkgs/rpms/dkim-milter/F-9/dkim-milter.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dkim-milter.spec 1 Apr 2008 03:34:38 -0000 1.1 +++ dkim-milter.spec 4 Mar 2009 23:17:02 -0000 1.2 @@ -1,6 +1,6 @@ Name: dkim-milter -Version: 2.5.1 -Release: 5%{?dist} +Version: 2.8.1 +Release: 1%{?dist} Summary: DomainKeys Identified Mail sender authentication sendmail milter Group: System Environment/Daemons License: Sendmail @@ -101,7 +101,7 @@ %files %defattr(-,root,root,-) -%doc README LICENSE RELEASE_NOTES INSTALL +%doc README LICENSE RELEASE_NOTES INSTALL KNOWNBUGS FEATURES %config(noreplace) %{_sysconfdir}/sysconfig/%{name} @@ -124,6 +124,9 @@ %{_mandir}/*/* %changelog +* Thu Feb 12 2009 Jim Radford - 2.8.1-1 +- updated to 2.8.1 (security fix #488594) + * Sun Mar 30 2008 Jim Radford - 2.5.1-5 - Just use the full path explicitly since daemon --user uses -. - Add a %postun to restart on upgrade Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dkim-milter/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Apr 2008 03:34:38 -0000 1.2 +++ sources 4 Mar 2009 23:17:02 -0000 1.3 @@ -1 +1 @@ -591ffca39c0dbdf07bd3491d0da89332 dkim-milter-2.5.1.tar.gz +a822f7f5eb36f15d1377ca534d5d7edf dkim-milter-2.8.1.tar.gz From orion at fedoraproject.org Wed Mar 4 23:18:55 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Wed, 4 Mar 2009 23:18:55 +0000 (UTC) Subject: rpms/kdesvn/F-10 import.log, NONE, 1.1 .cvsignore, 1.25, 1.26 kdesvn.spec, 1.49, 1.50 sources, 1.25, 1.26 Message-ID: <20090304231855.1616270116@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/kdesvn/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22763/F-10 Modified Files: .cvsignore kdesvn.spec sources Added Files: import.log Log Message: Sync to devel - 1.2.4 --- NEW FILE import.log --- kdesvn-1_2_4-1_fc11:F-10:kdesvn-1.2.4-1.fc11.src.rpm:1236208681 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdesvn/F-10/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 24 Nov 2008 19:06:39 -0000 1.25 +++ .cvsignore 4 Mar 2009 23:18:24 -0000 1.26 @@ -1 +1 @@ -kdesvn-1.2.2.tar.bz2 +kdesvn-1.2.4.tar.bz2 Index: kdesvn.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdesvn/F-10/kdesvn.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- kdesvn.spec 30 Nov 2008 05:33:54 -0000 1.49 +++ kdesvn.spec 4 Mar 2009 23:18:24 -0000 1.50 @@ -1,5 +1,5 @@ Name: kdesvn -Version: 1.2.2 +Version: 1.2.4 Release: 1%{?dist} Summary: A subversion client for KDE4 with KIO integration @@ -86,7 +86,7 @@ %{_bindir}/kdesvn %{_bindir}/kdesvnaskpass %{_libdir}/kde4/* -%{_libdir}/libsvnqt4.so.* +%{_libdir}/libsvnqt.so.* %{_datadir}/applications/kde4/fedora-%{name}.desktop %{_datadir}/kde4/apps/kconf_update/ %{_datadir}/kde4/apps/kdesvn/ @@ -102,11 +102,20 @@ %files devel %defattr(-,root,root,-) -%{_includedir}/svnqt/ -%{_libdir}/libsvnqt4.so +%{_libdir}/libsvnqt.so +%{_includedir}/svnqt %changelog +* Wed Mar 4 2009 - Orion Poplawski - 1.2.4-1 +- Update to 1.2.4 + +* Wed Feb 25 2009 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jan 27 2009 - Orion Poplawski - 1.2.3-1 +- Update to 1.2.3 + * Mon Nov 24 2008 - Orion Poplawski - 1.2.2-1 - Update to 1.2.2 - Drop upstreamed patches Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdesvn/F-10/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 24 Nov 2008 19:06:40 -0000 1.25 +++ sources 4 Mar 2009 23:18:24 -0000 1.26 @@ -1 +1 @@ -81ead830747be9c679a03ecd50ce0a44 kdesvn-1.2.2.tar.bz2 +3e8879d61f59aff0d83c9c5472d64aae kdesvn-1.2.4.tar.bz2 From hadess at fedoraproject.org Wed Mar 4 23:19:29 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 4 Mar 2009 23:19:29 +0000 (UTC) Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.62,1.63 Message-ID: <20090304231929.7C56970116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-bluetooth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22664 Modified Files: gnome-bluetooth.spec Log Message: * Wed Mar 04 2009 - Bastien Nocera - 2.27.1-2 - Update to 2.27.1 - Loads of fixes mentioned by Bill Nottingham in bug #488498 Index: gnome-bluetooth.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- gnome-bluetooth.spec 4 Mar 2009 23:11:19 -0000 1.62 +++ gnome-bluetooth.spec 4 Mar 2009 23:18:59 -0000 1.63 @@ -20,8 +20,8 @@ Obsoletes: bluez-pin Provides: dbus-bluez-pin-helper -Conflicts: bluez-gnome -Obsoletes: bluez-gnome +Conflicts: bluez-gnome <= 1.8 +Obsoletes: bluez-gnome <= 1.8 Requires: gvfs-obexftp Requires: bluez @@ -50,7 +50,7 @@ Group: Development/Libraries License: LGPLv2+ Requires: %{name}-libs = %{version}-%{release} -Requires: gtk-doc +Requires: gtk-doc pkgconfig %description libs-devel This package contains the libraries amd header files that are needed @@ -88,44 +88,44 @@ update-desktop-database -q export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas \ + %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas \ >& /dev/null || : if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor + /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi %pre if [ "$1" -gt 1 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas >/dev/null || : - fi - if [ -f %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas ] ; then - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas \ - >& /dev/null || : - fi + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas >/dev/null || : + fi + if [ -f %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas ] ; then + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas \ + >& /dev/null || : + fi fi %preun if [ "$1" -eq 0 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas > /dev/null || : - fi - if [ -f %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas ] ; then - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas \ - >& /dev/null || : - fi + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas > /dev/null || : + fi + if [ -f %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas ] ; then + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas \ + >& /dev/null || : + fi fi %postun update-desktop-database -q if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor + /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi %post libs -p /sbin/ldconfig @@ -150,7 +150,7 @@ %files libs-devel %defattr(-,root,root,-) -%{_includedir}/gnome-bluetooth/*.h +%{_includedir}/gnome-bluetooth/ %{_libdir}/libgnome-bluetooth.so %{_libdir}/pkgconfig/gnome-bluetooth-1.0.pc %{_datadir}/gtk-doc/html/gnome-bluetooth/ @@ -158,6 +158,7 @@ %changelog * Wed Mar 04 2009 - Bastien Nocera - 2.27.1-2 - Update to 2.27.1 +- Loads of fixes mentioned by Bill Nottingham in bug #488498 * Tue Feb 24 2009 Fedora Release Engineering - 0.12.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pbrobinson at fedoraproject.org Wed Mar 4 23:20:41 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Wed, 4 Mar 2009 23:20:41 +0000 (UTC) Subject: rpms/gupnp-tools/devel gupnp-tools-0.6.1-gthreadinit.patch, 1.1, NONE Message-ID: <20090304232041.3B57870116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gupnp-tools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23533 Removed Files: gupnp-tools-0.6.1-gthreadinit.patch Log Message: - remove an old patch --- gupnp-tools-0.6.1-gthreadinit.patch DELETED --- From pbrobinson at fedoraproject.org Wed Mar 4 23:26:33 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Wed, 4 Mar 2009 23:26:33 +0000 (UTC) Subject: rpms/gypsy/devel gypsy.spec,1.5,1.6 Message-ID: <20090304232633.0A5A570116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gypsy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24486 Modified Files: gypsy.spec Log Message: - Move docs to noarch, some spec file updates Index: gypsy.spec =================================================================== RCS file: /cvs/pkgs/rpms/gypsy/devel/gypsy.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gypsy.spec 25 Feb 2009 03:11:55 -0000 1.5 +++ gypsy.spec 4 Mar 2009 23:26:02 -0000 1.6 @@ -1,6 +1,6 @@ Name: gypsy Version: 0.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A GPS multiplexing daemon Group: System Environment/Libraries @@ -26,13 +26,23 @@ %package devel Summary: Development package for gypsy Group: Development/Libraries -Requires: gypsy = %{PACKAGE_VERSION} +Requires: %{name} = %{version}-%{release} +Requires: dbus-glib-devel Requires: pkgconfig -Requires: gtk-doc %description devel Header files for development with gypsy. +%package docs +Summary: Documentation files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: gtk-doc +BuildArch: noarch + +%description docs +This package contains developer documentation for %{name}. + %prep %setup -q @@ -62,15 +72,19 @@ %{_libdir}/libgypsy.so.0.0.0 %files devel -%defattr(-,root,root) -%dir %{_includedir}/gypsy/ -%dir %{_datadir}/gtk-doc/html/gypsy/ -%doc %{_datadir}/gtk-doc/html/gypsy/* +%defattr(-,root,root,-) %{_libdir}/pkgconfig/gypsy.pc -%{_includedir}/gypsy/* +%{_includedir}/gypsy %{_libdir}/libgypsy.so +%files docs +%defattr(-,root,root,-) +%doc %{_datadir}/gtk-doc/html/gypsy + %changelog +* Wed Mar 4 2008 Peter Robinson 0.6-8 +- Move docs to noarch, some spec file updates + * Tue Feb 24 2009 Fedora Release Engineering - 0.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From guthrie at fedoraproject.org Wed Mar 4 23:27:03 2009 From: guthrie at fedoraproject.org (John T. Guthrie III) Date: Wed, 4 Mar 2009 23:27:03 +0000 (UTC) Subject: rpms/simplyhtml/devel simplyhtml.spec,1.3,1.4 Message-ID: <20090304232703.4B16C70116@cvs1.fedora.phx.redhat.com> Author: guthrie Update of /cvs/extras/rpms/simplyhtml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24578 Modified Files: simplyhtml.spec Log Message: Typo fix in spec file. Index: simplyhtml.spec =================================================================== RCS file: /cvs/extras/rpms/simplyhtml/devel/simplyhtml.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- simplyhtml.spec 4 Mar 2009 14:36:09 -0000 1.3 +++ simplyhtml.spec 4 Mar 2009 23:26:32 -0000 1.4 @@ -3,7 +3,7 @@ Name: simplyhtml Version: 0.12.5 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 0 Summary: Application and a java component for rich text processing # All files are GPL except for src/com/sun/demo/ElementTreePanel.java which has @@ -83,7 +83,7 @@ pushd src/com/sun/demo mv ElementTreePanel.java ElementTreePanel.java.BadLicense %ifarch %{multilib_arches} - unzip %{_prefix}/lib/jvm/java-1.6.0-openjdk-1.6.0.0i.%{_arch}/demo/jfc/Notepad/src.zip \ + unzip %{_prefix}/lib/jvm/java-1.6.0-openjdk-1.6.0.0.%{_arch}/demo/jfc/Notepad/src.zip \ ElementTreePanel.java %else unzip %{_prefix}/lib/jvm/java-1.6.0-openjdk-1.6.0.0/demo/jfc/Notepad/src.zip \ @@ -178,15 +178,21 @@ %changelog * Wed Mar 4 2009 John Guthrie 0:0.12.5-7 +- Typo fix in spec file. + +* Wed Mar 4 2009 John Guthrie 0:0.12.5-7 - More 64-bit file location fixes. + * Wed Mar 4 2009 John Guthrie 0:0.12.5-6 - It turns out that the files for the java-1.6.0-openjdk-demo are placed in %%{_prefix}/lib, not %%{_libdir}. (This is significant for 64-bit architectures.) The appropriate line to unzip the ElementTreePanel.java file out of the needed zip file was fixed. + * Wed Feb 25 2009 John Guthrie 0:0.12.5-5 - Fixed the perms on the simplyhtml.sh source file. Allowing the %%attr to take care of the perms. + * Thu Feb 12 2009 John Guthrie 0:0.12.5-4 - Replaced the version of ElementTreePanel.java that came with the source code with a version that has an acceptable license. Added java-1.6.0-openjdk-demo From olea at fedoraproject.org Wed Mar 4 23:27:45 2009 From: olea at fedoraproject.org (Ismael Olea) Date: Wed, 4 Mar 2009 23:27:45 +0000 (UTC) Subject: rpms/purple-microblog/F-10 .cvsignore, 1.3, 1.4 purple-microblog.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <20090304232745.5C54B70116@cvs1.fedora.phx.redhat.com> Author: olea Update of /cvs/pkgs/rpms/purple-microblog/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24736 Modified Files: .cvsignore purple-microblog.spec sources Log Message: * Wed Mar 04 2009 Ismael Olea - 0.2.1-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/purple-microblog/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Oct 2008 15:46:57 -0000 1.3 +++ .cvsignore 4 Mar 2009 23:27:15 -0000 1.4 @@ -1 +1 @@ -mbpurple.tar.bz2 +mbpurple-0.2.1.tar.gz Index: purple-microblog.spec =================================================================== RCS file: /cvs/pkgs/rpms/purple-microblog/F-10/purple-microblog.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- purple-microblog.spec 9 Nov 2008 09:25:48 -0000 1.6 +++ purple-microblog.spec 4 Mar 2009 23:27:15 -0000 1.7 @@ -1,7 +1,7 @@ %define upstream_name mbpurple Name: purple-microblog -Version: 0.2.0 +Version: 0.2.1 Release: 1%{?dist} Summary: Libpurple plug-in supporting microblog services like Twitter @@ -46,6 +46,9 @@ %{_datadir}/pixmaps/pidgin/protocols/*/laconica.png %changelog +* Wed Mar 04 2009 Ismael Olea - 0.2.1-1 +- New upstream release. + * Sun Nov 09 2008 Mat??j Cepl - 0.2.0-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/purple-microblog/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Nov 2008 09:25:48 -0000 1.5 +++ sources 4 Mar 2009 23:27:15 -0000 1.6 @@ -1 +1 @@ -fa1d9a729b78b7a800f2274bfcbcbdd3 mbpurple-0.2.0.tar.gz +10f2fade5af37e72a4379ca49aa20a1b mbpurple-0.2.1.tar.gz From pbrobinson at fedoraproject.org Wed Mar 4 23:28:58 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Wed, 4 Mar 2009 23:28:58 +0000 (UTC) Subject: rpms/gypsy/devel gypsy.spec,1.6,1.7 Message-ID: <20090304232858.38FDE70116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gypsy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25051 Modified Files: gypsy.spec Log Message: - fix changelog Index: gypsy.spec =================================================================== RCS file: /cvs/pkgs/rpms/gypsy/devel/gypsy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gypsy.spec 4 Mar 2009 23:26:02 -0000 1.6 +++ gypsy.spec 4 Mar 2009 23:28:28 -0000 1.7 @@ -82,7 +82,7 @@ %doc %{_datadir}/gtk-doc/html/gypsy %changelog -* Wed Mar 4 2008 Peter Robinson 0.6-8 +* Wed Mar 4 2009 Peter Robinson 0.6-8 - Move docs to noarch, some spec file updates * Tue Feb 24 2009 Fedora Release Engineering - 0.6-7 From caolanm at fedoraproject.org Wed Mar 4 23:30:26 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Wed, 4 Mar 2009 23:30:26 +0000 (UTC) Subject: rpms/procbench/devel procbench-0.8.2a-includes.patch, NONE, 1.1 procbench.spec, 1.2, 1.3 Message-ID: <20090304233026.9026770116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/procbench/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25460 Modified Files: procbench.spec Added Files: procbench-0.8.2a-includes.patch Log Message: include stdio.h for printf procbench-0.8.2a-includes.patch: --- NEW FILE procbench-0.8.2a-includes.patch --- diff -ru procbench-0.8.2a.orig/multi_cpu.cpp procbench-0.8.2a/multi_cpu.cpp --- procbench-0.8.2a.orig/multi_cpu.cpp 2009-03-04 23:18:03.000000000 +0000 +++ procbench-0.8.2a/multi_cpu.cpp 2009-03-04 23:18:19.000000000 +0000 @@ -20,6 +20,7 @@ */ #include +#include #include #include "cross.h" #ifdef __WIN32__ Index: procbench.spec =================================================================== RCS file: /cvs/pkgs/rpms/procbench/devel/procbench.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- procbench.spec 27 Feb 2009 02:23:10 -0000 1.2 +++ procbench.spec 4 Mar 2009 23:29:56 -0000 1.3 @@ -1,6 +1,6 @@ Name: procbench Version: 0.8.2a -Release: 3%{?dist} +Release: 4%{?dist} Summary: Multiplatform information tool and CPU benchmark for x86 procs Group: Applications/Text @@ -10,6 +10,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: i386 x86_64 +Patch0: procbench-0.8.2a-includes.patch + %description Procbench is a multiplatform information tool and CPU benchmark for x86 processors. It tests memory transfer and math capabilities of your x86 @@ -18,6 +20,7 @@ %prep %setup -q +%patch0 -p1 -b .includes %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -40,10 +43,12 @@ %changelog +* Wed Mar 04 2009 Caol??n McNamara - 0.8.2a-4 +- include stdio.h for printf + * Thu Feb 26 2009 Fedora Release Engineering - 0.8.2a-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - * Fri Aug 01 2008 Kairo Araujo - 0.8.2a-2 - Fixed ExclusiveArch, ownership issue and proper CFLAGS From olea at fedoraproject.org Wed Mar 4 23:30:40 2009 From: olea at fedoraproject.org (Ismael Olea) Date: Wed, 4 Mar 2009 23:30:40 +0000 (UTC) Subject: rpms/purple-microblog/F-9 .cvsignore, 1.3, 1.4 purple-microblog.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <20090304233040.CD5D570116@cvs1.fedora.phx.redhat.com> Author: olea Update of /cvs/pkgs/rpms/purple-microblog/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25519 Modified Files: .cvsignore purple-microblog.spec sources Log Message: * Wed Mar 04 2009 Ismael Olea - 0.2.1-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/purple-microblog/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Oct 2008 18:21:49 -0000 1.3 +++ .cvsignore 4 Mar 2009 23:30:10 -0000 1.4 @@ -1 +1 @@ -mbpurple.tar.bz2 +mbpurple-0.2.1.tar.gz Index: purple-microblog.spec =================================================================== RCS file: /cvs/pkgs/rpms/purple-microblog/F-9/purple-microblog.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- purple-microblog.spec 9 Nov 2008 09:10:22 -0000 1.3 +++ purple-microblog.spec 4 Mar 2009 23:30:10 -0000 1.4 @@ -1,7 +1,7 @@ %define upstream_name mbpurple Name: purple-microblog -Version: 0.2.0 +Version: 0.2.1 Release: 1%{?dist} Summary: Libpurple plug-in supporting microblog services like Twitter @@ -46,6 +46,9 @@ %{_datadir}/pixmaps/pidgin/protocols/*/laconica.png %changelog +* Wed Mar 04 2009 Ismael Olea - 0.2.1-1 +- New upstream release. + * Sun Nov 09 2008 Mat??j Cepl - 0.2.0-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/purple-microblog/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Nov 2008 09:10:22 -0000 1.4 +++ sources 4 Mar 2009 23:30:10 -0000 1.5 @@ -1 +1 @@ -fa1d9a729b78b7a800f2274bfcbcbdd3 mbpurple-0.2.0.tar.gz +10f2fade5af37e72a4379ca49aa20a1b mbpurple-0.2.1.tar.gz From olea at fedoraproject.org Wed Mar 4 23:32:48 2009 From: olea at fedoraproject.org (Ismael Olea) Date: Wed, 4 Mar 2009 23:32:48 +0000 (UTC) Subject: rpms/purple-microblog/devel .cvsignore, 1.4, 1.5 purple-microblog.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <20090304233248.9769370116@cvs1.fedora.phx.redhat.com> Author: olea Update of /cvs/pkgs/rpms/purple-microblog/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26035 Modified Files: .cvsignore purple-microblog.spec sources Log Message: * Wed Mar 04 2009 Ismael Olea - 0.2.1-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/purple-microblog/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Nov 2008 09:07:02 -0000 1.4 +++ .cvsignore 4 Mar 2009 23:32:17 -0000 1.5 @@ -1 +1 @@ -mbpurple-0.2.0.tar.gz +mbpurple-0.2.1.tar.gz Index: purple-microblog.spec =================================================================== RCS file: /cvs/pkgs/rpms/purple-microblog/devel/purple-microblog.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- purple-microblog.spec 27 Feb 2009 03:05:16 -0000 1.7 +++ purple-microblog.spec 4 Mar 2009 23:32:18 -0000 1.8 @@ -1,8 +1,8 @@ %define upstream_name mbpurple Name: purple-microblog -Version: 0.2.0 -Release: 2%{?dist} +Version: 0.2.1 +Release: 1%{?dist} Summary: Libpurple plug-in supporting microblog services like Twitter Group: Applications/Internet @@ -46,8 +46,8 @@ %{_datadir}/pixmaps/pidgin/protocols/*/laconica.png %changelog -* Thu Feb 26 2009 Fedora Release Engineering - 0.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Wed Mar 04 2009 Ismael Olea - 0.2.1-1 +- New upstream release. * Sun Nov 09 2008 Mat??j Cepl - 0.2.0-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/purple-microblog/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Nov 2008 09:07:02 -0000 1.5 +++ sources 4 Mar 2009 23:32:18 -0000 1.6 @@ -1 +1 @@ -fa1d9a729b78b7a800f2274bfcbcbdd3 mbpurple-0.2.0.tar.gz +10f2fade5af37e72a4379ca49aa20a1b mbpurple-0.2.1.tar.gz From pbrobinson at fedoraproject.org Wed Mar 4 23:35:52 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Wed, 4 Mar 2009 23:35:52 +0000 (UTC) Subject: rpms/ptlib/devel ptlib.spec,1.12,1.13 Message-ID: <20090304233552.BAD8470116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/ptlib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26664 Modified Files: ptlib.spec Log Message: - remove fix that's upstream Index: ptlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/ptlib/devel/ptlib.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ptlib.spec 3 Mar 2009 21:45:02 -0000 1.12 +++ ptlib.spec 4 Mar 2009 23:35:22 -0000 1.13 @@ -52,8 +52,6 @@ # hack to fixup things for bug 197318 find $RPM_BUILD_ROOT%{_libdir} -name '*.so*' -type f -exec chmod +x {} \; -# Remove empty include file -rm -rf $RPM_BUILD_ROOT%{_includedir}/ptlib/devplugin.h rm -rf $RPM_BUILD_ROOT%{_libdir}/libpt_s.a %clean From jjames at fedoraproject.org Wed Mar 4 23:37:25 2009 From: jjames at fedoraproject.org (Jerry James) Date: Wed, 4 Mar 2009 23:37:25 +0000 (UTC) Subject: rpms/jsr-305/F-10 jsr-305.spec,1.4,1.5 Message-ID: <20090304233725.589EC70116@cvs1.fedora.phx.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/jsr-305/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26820/F-10 Modified Files: jsr-305.spec Log Message: * Wed Mar 4 2009 Jerry James - 0-0.3.20090203svn - Explicitly require OpenJDK to build Index: jsr-305.spec =================================================================== RCS file: /cvs/pkgs/rpms/jsr-305/F-10/jsr-305.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jsr-305.spec 1 Mar 2009 06:19:40 -0000 1.4 +++ jsr-305.spec 4 Mar 2009 23:36:54 -0000 1.5 @@ -2,7 +2,7 @@ Name: jsr-305 Version: 0 -Release: 0.2.20090203svn%{?dist} +Release: 0.3.20090203svn%{?dist} Summary: Correctness annotations for Java code Group: Development/Libraries/Java @@ -16,7 +16,9 @@ Source0: jsr-305-0.2.20090203.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: java-devel >= 1.5, jpackage-utils, maven2 +# We need the OpenJDK javadoc because sinjdoc doesn't grok annotations. +BuildRequires: java-1.6.0-openjdk-devel +BuildRequires: jpackage-utils, maven2 BuildRequires: maven2-plugin-compiler, maven2-plugin-install BuildRequires: maven2-plugin-jar, maven2-plugin-javadoc BuildRequires: maven2-plugin-resources, maven2-plugin-site @@ -114,6 +116,9 @@ %{_javadocdir}/* %changelog +* Wed Mar 4 2009 Jerry James - 0-0.3.20090203svn +- Explicitly require OpenJDK to build + * Sat Feb 28 2009 Jerry James - 0-0.2.20090203svn - Update to 03 Feb 2009 snapshot From jjames at fedoraproject.org Wed Mar 4 23:37:25 2009 From: jjames at fedoraproject.org (Jerry James) Date: Wed, 4 Mar 2009 23:37:25 +0000 (UTC) Subject: rpms/jsr-305/devel jsr-305.spec,1.5,1.6 Message-ID: <20090304233725.CD7D970116@cvs1.fedora.phx.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/jsr-305/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26820/devel Modified Files: jsr-305.spec Log Message: * Wed Mar 4 2009 Jerry James - 0-0.3.20090203svn - Explicitly require OpenJDK to build Index: jsr-305.spec =================================================================== RCS file: /cvs/pkgs/rpms/jsr-305/devel/jsr-305.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jsr-305.spec 1 Mar 2009 06:19:40 -0000 1.5 +++ jsr-305.spec 4 Mar 2009 23:36:55 -0000 1.6 @@ -2,7 +2,7 @@ Name: jsr-305 Version: 0 -Release: 0.2.20090203svn%{?dist} +Release: 0.3.20090203svn%{?dist} Summary: Correctness annotations for Java code Group: Development/Libraries/Java @@ -16,7 +16,9 @@ Source0: jsr-305-0.2.20090203.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: java-devel >= 1.5, jpackage-utils, maven2 +# We need the OpenJDK javadoc because sinjdoc doesn't grok annotations. +BuildRequires: java-1.6.0-openjdk-devel +BuildRequires: jpackage-utils, maven2 BuildRequires: maven2-plugin-compiler, maven2-plugin-install BuildRequires: maven2-plugin-jar, maven2-plugin-javadoc BuildRequires: maven2-plugin-resources, maven2-plugin-site @@ -114,6 +116,9 @@ %{_javadocdir}/* %changelog +* Wed Mar 4 2009 Jerry James - 0-0.3.20090203svn +- Explicitly require OpenJDK to build + * Sat Feb 28 2009 Jerry James - 0-0.2.20090203svn - Update to 03 Feb 2009 snapshot From pbrobinson at fedoraproject.org Wed Mar 4 23:37:34 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Wed, 4 Mar 2009 23:37:34 +0000 (UTC) Subject: rpms/opal/devel opal.spec,1.43,1.44 Message-ID: <20090304233734.A6F2770116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/opal/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26951 Modified Files: opal.spec Log Message: - remove fix that's upstream Index: opal.spec =================================================================== RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- opal.spec 3 Mar 2009 21:43:28 -0000 1.43 +++ opal.spec 4 Mar 2009 23:37:04 -0000 1.44 @@ -47,8 +47,6 @@ make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT/%{_datadir}/opal/opal_inc.mak -# Remove empty header from build -rm -f $RPM_BUILD_ROOT/%{_includedir}/opal/sip/sdpcaps.h rm -f $RPM_BUILD_ROOT/%{_libdir}/libopal_s.a %clean From caolanm at fedoraproject.org Wed Mar 4 23:41:31 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Wed, 4 Mar 2009 23:41:31 +0000 (UTC) Subject: rpms/openoffice.org/devel .cvsignore, 1.209, 1.210 sources, 1.349, 1.350 Message-ID: <20090304234131.3165E70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27681 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.209 retrieving revision 1.210 diff -u -r1.209 -r1.210 --- .cvsignore 3 Mar 2009 12:28:43 -0000 1.209 +++ .cvsignore 4 Mar 2009 23:41:00 -0000 1.210 @@ -7,7 +7,6 @@ redhat-langpacks.tar.gz openoffice.org-javafilter.desktop GSI_fi.sdf.gz -OOO310_m3.tar.bz2 or-IN_DEV300_m40.sdf mr-IN_DEV300_m40.sdf te-IN_DEV300_m40.sdf @@ -16,3 +15,4 @@ Maithili-mai-ooo3.0.sdf.tar.gz as-IN_DEV300_m40.sdf ta-090227.sdf +OOO310_m4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.349 retrieving revision 1.350 diff -u -r1.349 -r1.350 --- sources 3 Mar 2009 12:28:43 -0000 1.349 +++ sources 4 Mar 2009 23:41:00 -0000 1.350 @@ -15,4 +15,4 @@ bdc3b2b8b90ac1879f216cfa3c50d7e1 hi-IN-D300-m40.tar.gz be8d6866609e7aa7282220c0f469b279 as-IN_DEV300_m40.sdf ab6765f3f969e0c676bc13bc9960f60c ta-090227.sdf -f4d811bf2c10fadf34b68805697e2b72 OOO310_m3.tar.bz2 +a133aed113ff6ce82e20583e39140b98 OOO310_m4.tar.bz2 From caolanm at fedoraproject.org Wed Mar 4 23:42:47 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Wed, 4 Mar 2009 23:42:47 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1845, 1.1846 openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch, 1.1, NONE workspace.gfbcrash.patch, 1.1, NONE workspace.ooo31gsl2.patch, 1.1, NONE Message-ID: <20090304234247.D4EDB70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27887 Modified Files: openoffice.org.spec Removed Files: openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch workspace.gfbcrash.patch workspace.ooo31gsl2.patch Log Message: next version Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1845 retrieving revision 1.1846 diff -u -r1.1845 -r1.1846 --- openoffice.org.spec 3 Mar 2009 22:44:48 -0000 1.1845 +++ openoffice.org.spec 4 Mar 2009 23:42:17 -0000 1.1846 @@ -1,6 +1,6 @@ %define oootag OOO310 -%define ooomilestone 3 -%define rh_rpm_release 4 +%define ooomilestone 4 +%define rh_rpm_release 1 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF %define __jar_repack %{nil} @@ -123,20 +123,17 @@ Patch42: workspace.fwk103.patch Patch43: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch Patch44: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch -Patch45: workspace.gfbcrash.patch -Patch46: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch -Patch47: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch -Patch48: workspace.ooo31gsl2.patch -Patch49: workspace.vcl100.patch -Patch50: workspace.xmergeclean.patch -Patch51: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch -Patch52: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch -Patch53: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch -Patch54: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch -Patch55: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch -Patch56: openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch -Patch57: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch -Patch58: workspace.localization35.patch +Patch45: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch +Patch46: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch +Patch47: workspace.vcl100.patch +Patch48: workspace.xmergeclean.patch +Patch49: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch +Patch50: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch +Patch51: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch +Patch52: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch +Patch53: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch +Patch54: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch +Patch55: workspace.localization35.patch %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)") %define instdir %{_libdir} @@ -1596,20 +1593,17 @@ %patch42 -p1 -b .workspace.fwk103.patch %patch43 -p1 -b .ooo98885.sw.safeindex.patch %patch44 -p1 -R -b .ooo99050.sw.htmlload.patch -%patch45 -p0 -b .workspace.gfbcrash.patch -%patch46 -p1 -b .oooXXXXX.gcc44.buildfixes.patch -%patch47 -p0 -b .ooo99250.sc.autooutline-reflists.patch -%patch48 -p0 -b .workspace.ooo31gsl2.patch -%patch49 -p0 -b .workspace.vcl100.patch -%patch50 -p0 -b .workspace.xmergeclean.patch -%patch51 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch -%patch52 -p0 -b .ooo99427.sd.ensure-icons-state.patch -%patch53 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch -%patch54 -p0 -b .ooo99529.sw.notrailingnewline.patch -%patch55 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch -%patch56 -p0 -b .ooo98465.sw.fix-doctables.patch -%patch57 -p1 -b .oooXXXXX.solenv.allowmissing.patch -%patch58 -p0 -b .workspace.localization35.patch +%patch45 -p1 -b .oooXXXXX.gcc44.buildfixes.patch +%patch46 -p0 -b .ooo99250.sc.autooutline-reflists.patch +%patch47 -p0 -b .workspace.vcl100.patch +%patch48 -p0 -b .workspace.xmergeclean.patch +%patch49 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch +%patch50 -p0 -b .ooo99427.sd.ensure-icons-state.patch +%patch51 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch +%patch52 -p0 -b .ooo99529.sw.notrailingnewline.patch +%patch53 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch +%patch54 -p1 -b .oooXXXXX.solenv.allowmissing.patch +%patch55 -p0 -b .workspace.localization35.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -4109,6 +4103,11 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog +* Thu Mar 05 2009 Caol??n McNamara - 1:3.1.0-4.1 +- drop integrated workspace.gfbcrash.patch +- drop integrated workspace.ooo31gsl2.patch +- drop integrated openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch + * Tue Mar 03 2009 Caol??n McNamara - 1:3.1.0-3.4 - Resolves: rhbz#488228 Assamese Translations - Resolves: rhbz#488234 Tamil Translations --- openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch DELETED --- --- workspace.gfbcrash.patch DELETED --- --- workspace.ooo31gsl2.patch DELETED --- From amdunn at fedoraproject.org Wed Mar 4 23:51:33 2009 From: amdunn at fedoraproject.org (Alan Dunn) Date: Wed, 4 Mar 2009 23:51:33 +0000 (UTC) Subject: rpms/coq/F-10 coq-lablgtk-2.12.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 cmxa-install.patch, 1.1, 1.2 coq.spec, 1.5, 1.6 import.log, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <20090304235133.E9D7170116@cvs1.fedora.phx.redhat.com> Author: amdunn Update of /cvs/pkgs/rpms/coq/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29206/F-10 Modified Files: .cvsignore cmxa-install.patch coq.spec import.log sources Added Files: coq-lablgtk-2.12.patch Log Message: F-10 backport of 8.1pl4 from F-11. coq-lablgtk-2.12.patch: --- NEW FILE coq-lablgtk-2.12.patch --- --- ide/undo_lablgtk_ge26.mli 2005-11-18 12:09:10.000000000 -0500 +++ ide/undo_lablgtk_ge26.mli 2009-03-03 21:29:37.000000000 -0500 @@ -24,6 +24,7 @@ ?cursor_visible:bool -> ?justification:GtkEnums.justification -> ?wrap_mode:GtkEnums.wrap_mode -> + ?accepts_tab:bool -> ?border_width:int -> ?width:int -> ?height:int -> Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Jul 2008 18:49:27 -0000 1.2 +++ .cvsignore 4 Mar 2009 23:51:03 -0000 1.3 @@ -2,6 +2,6 @@ Coq-RecTutorial.pdf.gz Coq-Reference-Manual.pdf.gz Coq-Tutorial.v.pdf.gz -coq-8.1pl3.tar.gz coq-refman-html.tar.gz coq-stdlib-html.tar.gz +coq-8.1pl4.tar.gz cmxa-install.patch: Index: cmxa-install.patch =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-10/cmxa-install.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cmxa-install.patch 16 Jul 2008 18:49:27 -0000 1.1 +++ cmxa-install.patch 4 Mar 2009 23:51:03 -0000 1.2 @@ -1,8 +1,8 @@ ---- Makefile 2007-11-12 10:10:25.000000000 -0500 -+++ Makefile 2008-06-16 10:58:38.000000000 -0400 -@@ -1271,7 +1271,12 @@ - parsing/parsing.cma tactics/tactics.cma toplevel/toplevel.cma \ - parsing/highparsing.cma tactics/hightactics.cma contrib/contrib.cma +--- Makefile 2009-03-02 12:14:34.000000000 -0500 ++++ Makefile 2009-03-02 12:16:02.000000000 -0500 +@@ -1274,7 +1274,11 @@ + + OBJECTCMI=$(OBJSCMO:.cmo=.cmi) -OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa) +ifeq ($(BEST),opt) @@ -10,7 +10,6 @@ +else + OBJECTCMXA= +endif -+ install-library: $(MKDIR) $(FULLCOQLIB) Index: coq.spec =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-10/coq.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- coq.spec 22 Oct 2008 19:23:11 -0000 1.5 +++ coq.spec 4 Mar 2009 23:51:03 -0000 1.6 @@ -24,8 +24,8 @@ %define debug_package %{nil} Name: coq -Version: 8.1pl3 -Release: 5%{?dist} +Version: 8.1pl4 +Release: 3%{?dist} Summary: Coq proof management system Group: Applications/Engineering @@ -48,9 +48,11 @@ Patch3: check.patch Patch4: makefile-parser.patch Patch5: parser-man.patch +Patch6: coq-lablgtk-2.12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs, prelink + %if 0%{?fedora} < 9 BuildRequires: tetex, tetex-latex # There's no ocaml-camlp5-devel for ppc64 in Fedora <= 8 @@ -171,6 +173,11 @@ %patch5 mv man/parser.1 man/coq-parser.1 +# Minor fix to accommodate a changed signature in lablgtk 2.12 +if grep accepts_tab %{_libdir}/ocaml/lablgtk2/gText.mli; then +%patch6 +fi + # Fix some files that are not in UTF-8 encoding for f in CHANGES CREDITS COPYRIGHT; do @@ -210,8 +217,8 @@ %define opt_option --byte-only %endif -bash configure -prefix %{_prefix} -libdir %{_datadir}/coq -bindir %{_bindir} -mandir %{_mandir} -emacs %{emacs_lispdir} -coqdocdir %{tex_dir} %{opt_option} -reals all -make world +bash configure -prefix %{_prefix} -libdir %{_datadir}/coq -bindir %{_bindir} -mandir %{_mandir} -emacs %{emacs_lispdir} -coqdocdir %{tex_dir} %{opt_option} -reals all -camlp5dir %{_libdir}/ocaml/camlp5 +make world VERBOSE=1 # Fix permissions in the documentation chmod -R a+rX refman stdlib @@ -325,24 +332,45 @@ %doc refman %doc stdlib + %files emacs %defattr(-,root,root,-) %{_datadir}/emacs/site-lisp/coq* %doc README.coq-emacs + %changelog +* Wed Mar 04 2009 Alan Dunn - 8.1pl4-3 +- Minor change to cmxa-install patch instruction +- Fixed to work with lablgtk 2.12 + +* Tue Feb 24 2009 Fedora Release Engineering - 8.1pl4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Dec 5 2008 Richard W.M. Jones - 8.1pl4-1 +- New upstream version 8.1pl4. +- Attempt to rebuild against OCaml 3.11.0. +- Run make with VERBOSE=1 so we can see the actual commands. +- Pass -camlp5dir to configure so it uses camlp5 (overriding existence + of camlp4 if it happens to be installed). + * Wed Oct 22 2008 Alan Dunn 8.1pl3-5 - Added Coq .v files into the main package at user request. + * Tue Sep 09 2008 Alan Dunn 8.1pl3-4 - Added creation of prelink blacklist for any bytecode files. - Fixed execstack status for binaries. + * Tue Aug 05 2008 Alan Dunn 8.1pl3-3 - Changed parser to coq-parser to avoid name conflict with coda-client. - Made make process noisy again. + * Sun Jul 20 2008 Alan Dunn 8.1pl3-2.1 - Minor bump for Fedora 8 to bring it into line with the rest. + * Thu Jul 17 2008 Alan Dunn 8.1pl3-2 - Added check for Fedora distribution number to allow for Fedora 8 release. + * Wed Jun 14 2008 Alan Dunn 8.1pl3-1 - Initial Fedora RPM version. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-10/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 22 Oct 2008 19:23:11 -0000 1.5 +++ import.log 4 Mar 2009 23:51:03 -0000 1.6 @@ -3,3 +3,4 @@ coq-8_1pl3-3_fc9:HEAD:coq-8.1pl3-3.fc9.src.rpm:1217962473 coq-8_1pl3-4_fc9:HEAD:coq-8.1pl3-4.fc9.src.rpm:1221066400 coq-8_1pl3-5_fc9:HEAD:coq-8.1pl3-5.fc9.src.rpm:1224703139 +coq-8_1pl4-3_fc10:F-10:coq-8.1pl4-3.fc10.src.rpm:1236210257 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Jul 2008 18:49:27 -0000 1.2 +++ sources 4 Mar 2009 23:51:03 -0000 1.3 @@ -2,6 +2,6 @@ 0e3d5eac23416ec75dd59fabdcc1367c Coq-RecTutorial.pdf.gz 021c58a1f2e5d029928ffae0cc9703b0 Coq-Reference-Manual.pdf.gz bcb4d1c4857bfdae5c22f8fc0be6853c Coq-Tutorial.v.pdf.gz -84311faf7865b2eab964990cdb365dca coq-8.1pl3.tar.gz 04285e3a76571db6e1d2fbe198c76120 coq-refman-html.tar.gz 17b1edf9122fd89c8b99d4e047b54fb8 coq-stdlib-html.tar.gz +8fa623538d362d8f48d78e598c43215e coq-8.1pl4.tar.gz From amdunn at fedoraproject.org Wed Mar 4 23:53:52 2009 From: amdunn at fedoraproject.org (Alan Dunn) Date: Wed, 4 Mar 2009 23:53:52 +0000 (UTC) Subject: rpms/coq/F-9 coq-lablgtk-2.12.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 cmxa-install.patch, 1.1, 1.2 coq.spec, 1.5, 1.6 import.log, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <20090304235352.2B13070116@cvs1.fedora.phx.redhat.com> Author: amdunn Update of /cvs/pkgs/rpms/coq/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29902/F-9 Modified Files: .cvsignore cmxa-install.patch coq.spec import.log sources Added Files: coq-lablgtk-2.12.patch Log Message: F-9 backport of 8.1pl4 from F-11. coq-lablgtk-2.12.patch: --- NEW FILE coq-lablgtk-2.12.patch --- --- ide/undo_lablgtk_ge26.mli 2005-11-18 12:09:10.000000000 -0500 +++ ide/undo_lablgtk_ge26.mli 2009-03-03 21:29:37.000000000 -0500 @@ -24,6 +24,7 @@ ?cursor_visible:bool -> ?justification:GtkEnums.justification -> ?wrap_mode:GtkEnums.wrap_mode -> + ?accepts_tab:bool -> ?border_width:int -> ?width:int -> ?height:int -> Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Jul 2008 18:58:22 -0000 1.2 +++ .cvsignore 4 Mar 2009 23:53:21 -0000 1.3 @@ -2,6 +2,6 @@ Coq-RecTutorial.pdf.gz Coq-Reference-Manual.pdf.gz Coq-Tutorial.v.pdf.gz -coq-8.1pl3.tar.gz coq-refman-html.tar.gz coq-stdlib-html.tar.gz +coq-8.1pl4.tar.gz cmxa-install.patch: Index: cmxa-install.patch =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-9/cmxa-install.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cmxa-install.patch 16 Jul 2008 18:58:22 -0000 1.1 +++ cmxa-install.patch 4 Mar 2009 23:53:21 -0000 1.2 @@ -1,8 +1,8 @@ ---- Makefile 2007-11-12 10:10:25.000000000 -0500 -+++ Makefile 2008-06-16 10:58:38.000000000 -0400 -@@ -1271,7 +1271,12 @@ - parsing/parsing.cma tactics/tactics.cma toplevel/toplevel.cma \ - parsing/highparsing.cma tactics/hightactics.cma contrib/contrib.cma +--- Makefile 2009-03-02 12:14:34.000000000 -0500 ++++ Makefile 2009-03-02 12:16:02.000000000 -0500 +@@ -1274,7 +1274,11 @@ + + OBJECTCMI=$(OBJSCMO:.cmo=.cmi) -OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa) +ifeq ($(BEST),opt) @@ -10,7 +10,6 @@ +else + OBJECTCMXA= +endif -+ install-library: $(MKDIR) $(FULLCOQLIB) Index: coq.spec =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-9/coq.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- coq.spec 22 Oct 2008 19:38:36 -0000 1.5 +++ coq.spec 4 Mar 2009 23:53:21 -0000 1.6 @@ -24,8 +24,8 @@ %define debug_package %{nil} Name: coq -Version: 8.1pl3 -Release: 5%{?dist} +Version: 8.1pl4 +Release: 3%{?dist} Summary: Coq proof management system Group: Applications/Engineering @@ -48,9 +48,11 @@ Patch3: check.patch Patch4: makefile-parser.patch Patch5: parser-man.patch +Patch6: coq-lablgtk-2.12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs, prelink + %if 0%{?fedora} < 9 BuildRequires: tetex, tetex-latex # There's no ocaml-camlp5-devel for ppc64 in Fedora <= 8 @@ -171,6 +173,11 @@ %patch5 mv man/parser.1 man/coq-parser.1 +# Minor fix to accommodate a changed signature in lablgtk 2.12 +if grep accepts_tab %{_libdir}/ocaml/lablgtk2/gText.mli; then +%patch6 +fi + # Fix some files that are not in UTF-8 encoding for f in CHANGES CREDITS COPYRIGHT; do @@ -210,8 +217,8 @@ %define opt_option --byte-only %endif -bash configure -prefix %{_prefix} -libdir %{_datadir}/coq -bindir %{_bindir} -mandir %{_mandir} -emacs %{emacs_lispdir} -coqdocdir %{tex_dir} %{opt_option} -reals all -make world +bash configure -prefix %{_prefix} -libdir %{_datadir}/coq -bindir %{_bindir} -mandir %{_mandir} -emacs %{emacs_lispdir} -coqdocdir %{tex_dir} %{opt_option} -reals all -camlp5dir %{_libdir}/ocaml/camlp5 +make world VERBOSE=1 # Fix permissions in the documentation chmod -R a+rX refman stdlib @@ -325,24 +332,45 @@ %doc refman %doc stdlib + %files emacs %defattr(-,root,root,-) %{_datadir}/emacs/site-lisp/coq* %doc README.coq-emacs + %changelog +* Wed Mar 04 2009 Alan Dunn - 8.1pl4-3 +- Minor change to cmxa-install patch instruction +- Fixed to work with lablgtk 2.12 + +* Tue Feb 24 2009 Fedora Release Engineering - 8.1pl4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Dec 5 2008 Richard W.M. Jones - 8.1pl4-1 +- New upstream version 8.1pl4. +- Attempt to rebuild against OCaml 3.11.0. +- Run make with VERBOSE=1 so we can see the actual commands. +- Pass -camlp5dir to configure so it uses camlp5 (overriding existence + of camlp4 if it happens to be installed). + * Wed Oct 22 2008 Alan Dunn 8.1pl3-5 - Added Coq .v files into the main package at user request. + * Tue Sep 09 2008 Alan Dunn 8.1pl3-4 - Added creation of prelink blacklist for any bytecode files. - Fixed execstack status for binaries. + * Tue Aug 05 2008 Alan Dunn 8.1pl3-3 - Changed parser to coq-parser to avoid name conflict with coda-client. - Made make process noisy again. + * Sun Jul 20 2008 Alan Dunn 8.1pl3-2.1 - Minor bump for Fedora 8 to bring it into line with the rest. + * Thu Jul 17 2008 Alan Dunn 8.1pl3-2 - Added check for Fedora distribution number to allow for Fedora 8 release. + * Wed Jun 14 2008 Alan Dunn 8.1pl3-1 - Initial Fedora RPM version. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-9/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 22 Oct 2008 19:38:36 -0000 1.5 +++ import.log 4 Mar 2009 23:53:21 -0000 1.6 @@ -3,3 +3,4 @@ coq-8_1pl3-3_fc9:F-9:coq-8.1pl3-3.fc9.src.rpm:1217987203 coq-8_1pl3-4_fc9:F-9:coq-8.1pl3-4.fc9.src.rpm:1221066514 coq-8_1pl3-5_fc9:F-9:coq-8.1pl3-5.fc9.src.rpm:1224704084 +coq-8_1pl4-3_fc10:F-9:coq-8.1pl4-3.fc10.src.rpm:1236210491 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/coq/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Jul 2008 18:58:22 -0000 1.2 +++ sources 4 Mar 2009 23:53:21 -0000 1.3 @@ -2,6 +2,6 @@ 0e3d5eac23416ec75dd59fabdcc1367c Coq-RecTutorial.pdf.gz 021c58a1f2e5d029928ffae0cc9703b0 Coq-Reference-Manual.pdf.gz bcb4d1c4857bfdae5c22f8fc0be6853c Coq-Tutorial.v.pdf.gz -84311faf7865b2eab964990cdb365dca coq-8.1pl3.tar.gz 04285e3a76571db6e1d2fbe198c76120 coq-refman-html.tar.gz 17b1edf9122fd89c8b99d4e047b54fb8 coq-stdlib-html.tar.gz +8fa623538d362d8f48d78e598c43215e coq-8.1pl4.tar.gz From tadej at fedoraproject.org Thu Mar 5 00:11:22 2009 From: tadej at fedoraproject.org (=?utf-8?q?Tadej_Jane=C5=BE?=) Date: Thu, 5 Mar 2009 00:11:22 +0000 (UTC) Subject: rpms/PyQwt/F-10 PyQwt.spec,1.1,1.2 Message-ID: <20090305001122.D72BF70116@cvs1.fedora.phx.redhat.com> Author: tadej Update of /cvs/pkgs/rpms/PyQwt/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv359 Modified Files: PyQwt.spec Log Message: Rebuild for new qwt (fixes RH bug #487348). Index: PyQwt.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyQwt/F-10/PyQwt.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PyQwt.spec 30 Jan 2009 18:43:02 -0000 1.1 +++ PyQwt.spec 5 Mar 2009 00:10:52 -0000 1.2 @@ -2,7 +2,7 @@ Name: PyQwt Version: 5.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python bindings for Qwt Group: Development/Languages @@ -74,6 +74,9 @@ %{_datadir}/sip/PyQt4/Qwt5/ %changelog +* Sat Mar 5 2009 Tadej Jane?? 5.1.0-4 +- rebuild for new qwt (fixes RH bug #487348) + * Sat Jan 24 2009 Tadej Jane?? 5.1.0-3 - made grace.py executable again From hadess at fedoraproject.org Thu Mar 5 00:21:41 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Thu, 5 Mar 2009 00:21:41 +0000 (UTC) Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.63,1.64 Message-ID: <20090305002141.EEC4170116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-bluetooth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2117 Modified Files: gnome-bluetooth.spec Log Message: * Thu Mar 05 2009 - Bastien Nocera - 2.27.1-3 - Add patch to fix sendto Index: gnome-bluetooth.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- gnome-bluetooth.spec 4 Mar 2009 23:18:59 -0000 1.63 +++ gnome-bluetooth.spec 5 Mar 2009 00:21:11 -0000 1.64 @@ -1,6 +1,6 @@ Name: gnome-bluetooth Version: 2.27.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bluetooth graphical utilities Group: Applications/Communications @@ -28,8 +28,10 @@ Requires: obexd Requires: notification-daemon -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils + +Patch0: sendto-connect-fix.patch %description The gnome-bluetooth package contains graphical utilities to setup, @@ -58,7 +60,7 @@ %prep %setup -q -n gnome-bluetooth-%{version} - +%patch0 -p1 %build %configure --disable-desktop-update --disable-icon-update @@ -156,6 +158,9 @@ %{_datadir}/gtk-doc/html/gnome-bluetooth/ %changelog +* Thu Mar 05 2009 - Bastien Nocera - 2.27.1-3 +- Add patch to fix sendto + * Wed Mar 04 2009 - Bastien Nocera - 2.27.1-2 - Update to 2.27.1 - Loads of fixes mentioned by Bill Nottingham in bug #488498 From dcbw at fedoraproject.org Thu Mar 5 00:22:46 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 00:22:46 +0000 (UTC) Subject: rpms/NetworkManager/devel .cvsignore, 1.97, 1.98 NetworkManager.spec, 1.261, 1.262 nm-applet-internal-buildfixes.patch, 1.4, 1.5 sources, 1.134, 1.135 Message-ID: <20090305002246.765A570116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2493 Modified Files: .cvsignore NetworkManager.spec nm-applet-internal-buildfixes.patch sources Log Message: * Wed Mar 4 2009 Dan Williams - 1:0.7.0.99-1 - nm: make default wired "Auto ethX" connection modifiable if an enabled system settings plugin supports modifying connections (rh #485555) - nm: manpage fixes (rh #447233) - nm: CVE-2009-0365 - GetSecrets disclosure - applet: CVE-2009-0578 - local users can modify the connection settings - applet: fix inability to choose WPA Ad-Hoc networks from the menu - ifcfg-rh: add read-only support for WPA-PSK connections Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- .cvsignore 25 Feb 2009 20:38:29 -0000 1.97 +++ .cvsignore 5 Mar 2009 00:22:15 -0000 1.98 @@ -139,3 +139,5 @@ NetworkManager-0.7.0.97.git20090220.tar.gz NetworkManager-0.7.0.98.git20090225.tar.bz2 network-manager-applet-0.7.0.98.svn1202.tar.bz2 +NetworkManager-0.7.0.99.tar.bz2 +network-manager-applet-0.7.0.99.tar.bz2 Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- NetworkManager.spec 25 Feb 2009 20:38:29 -0000 1.261 +++ NetworkManager.spec 5 Mar 2009 00:22:16 -0000 1.262 @@ -11,13 +11,13 @@ %define libnl_version 1.1 %define ppp_version 2.2.4 -%define snapshot .git20090225 -%define applet_snapshot .svn1202 +%define snapshot %{nil} +%define applet_snapshot %{nil} Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 -Version: 0.7.0.98 +Version: 0.7.0.99 Release: 1%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ @@ -45,9 +45,10 @@ Requires: udev Obsoletes: dhcdbd -Conflicts: NetworkManager-vpnc < 1:0.7.0-1 -Conflicts: NetworkManager-openvpn < 1:0.7.0-17 -Conflicts: NetworkManager-pptp < 1:0.7.0-1 +Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1 +Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1 +Conflicts: NetworkManager-pptp < 1:0.7.0.99-1 +Conflicts: NetworkManager-openconnect < 1:0.7.0.99-1 BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -324,6 +325,15 @@ %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Wed Mar 4 2009 Dan Williams - 1:0.7.0.99-1 +- nm: make default wired "Auto ethX" connection modifiable if an enabled system settings + plugin supports modifying connections (rh #485555) +- nm: manpage fixes (rh #447233) +- nm: CVE-2009-0365 - GetSecrets disclosure +- applet: CVE-2009-0578 - local users can modify the connection settings +- applet: fix inability to choose WPA Ad-Hoc networks from the menu +- ifcfg-rh: add read-only support for WPA-PSK connections + * Wed Feb 25 2009 Dan Williams - 1:0.7.0.98-1.git20090225 - Fix getting secrets for system connections (rh #486696) - More compatible modem autodetection nm-applet-internal-buildfixes.patch: Index: nm-applet-internal-buildfixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/nm-applet-internal-buildfixes.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nm-applet-internal-buildfixes.patch 25 Feb 2009 20:38:29 -0000 1.4 +++ nm-applet-internal-buildfixes.patch 5 Mar 2009 00:22:16 -0000 1.5 @@ -1,6 +1,6 @@ -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac 2008-11-17 18:04:35.000000000 -0500 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.72 @@ -12,9 +12,9 @@ gtk+-2.0 >= 2.10 libglade-2.0 gmodule-export-2.0 -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -2,6 +2,10 @@ NULL= bin_PROGRAMS = nm-connection-editor @@ -38,9 +38,9 @@ if NO_POLKIT_GNOME nm_connection_editor_LDADD += \ -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -58,9 +58,9 @@ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -4,6 +4,10 @@ NULL= bin_PROGRAMS = nm-applet @@ -83,9 +83,9 @@ gladedir = $(datadir)/nm-applet glade_DATA = applet.glade keyring.png -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -103,9 +103,9 @@ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- sources 25 Feb 2009 20:38:29 -0000 1.134 +++ sources 5 Mar 2009 00:22:16 -0000 1.135 @@ -1,2 +1,2 @@ -870f57ad87eafa2ef411b8e71a462e8a NetworkManager-0.7.0.98.git20090225.tar.bz2 -8f8ac796d7c14378cc7d073fdce8470c network-manager-applet-0.7.0.98.svn1202.tar.bz2 +2f3aef00a0cd1a2d32acba880bcca27c NetworkManager-0.7.0.99.tar.bz2 +8670d75dffe0d4fe5a497f0857a5ff00 network-manager-applet-0.7.0.99.tar.bz2 From bskeggs at fedoraproject.org Thu Mar 5 00:27:56 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Thu, 5 Mar 2009 00:27:56 +0000 (UTC) Subject: rpms/kernel/devel drm-nouveau.patch, 1.16, 1.17 kernel.spec, 1.1383, 1.1384 Message-ID: <20090305002756.D498870116@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3344 Modified Files: drm-nouveau.patch kernel.spec Log Message: * Thu Mar 05 2009 Ben Skeggs - drm-nouveau.patch: fix vm_vram_pt[i]->instance | 0x61); + INSTANCE_WR(chan->vm_pd, pde++, 0x00000000); + } -+ } + -+ instmem->finish_access(dev); ++ instmem->finish_access(dev); ++ } + + /* RAMHT */ + if (dev_priv->card_type < NV_50) { @@ -10291,10 +10291,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c new file mode 100644 -index 0000000..19c8861 +index 0000000..6b7fed1 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_state.c -@@ -0,0 +1,935 @@ +@@ -0,0 +1,942 @@ +/* + * Copyright 2005 Stephane Marchesin + * Copyright 2008 Stuart Bennett @@ -10761,25 +10761,6 @@ + nv_wr32(NV03_PMC_BOOT_1,0x00000001); + + DRM_MEMORYBARRIER(); -+ -+ /* if we have an OF card, copy vbios to RAMIN */ -+ dn = pci_device_to_OF_node(dev->pdev); -+ if (dn) -+ { -+ int size; -+ const uint32_t *bios = of_get_property(dn, "NVDA,BMP", &size); -+ if (bios) -+ { -+ int i; -+ for(i=0;ipdev); ++ if (dn) ++ { ++ int size; ++ const uint32_t *bios = of_get_property(dn, "NVDA,BMP", &size); ++ if (bios) ++ { ++ int i; ++ dev_priv->engine.instmem.prepare_access(dev, true); ++ for(i=0;iengine.instmem.finish_access(dev); ++ DRM_INFO("OF bios successfully copied (%d bytes)\n",size); ++ } ++ else ++ DRM_INFO("Unable to get the OF bios\n"); ++ } ++ else ++ DRM_INFO("Unable to get the OF node\n"); ++#endif + + /* For those who think they want to be funny. */ + if (dev_priv->card_type < NV_50) @@ -11160,8 +11163,10 @@ + } + } + ++ dev_priv->engine.instmem.prepare_access(dev, true); + for (i = 0; i < susres->ramin_size / 4; i++) + nv_wi32(i << 2, susres->ramin_copy[i]); ++ dev_priv->engine.instmem.finish_access(dev); + + engine->mc.init(dev); + engine->timer.init(dev); @@ -11180,8 +11185,10 @@ + /* PMC power cycling PFIFO in init clobbers some of the stuff stored in + * PRAMIN (such as NV04_PFIFO_CACHE1_DMA_INSTANCE). this is unhelpful + */ ++ dev_priv->engine.instmem.prepare_access(dev, true); + for (i = 0; i < susres->ramin_size / 4; i++) + nv_wi32(i << 2, susres->ramin_copy[i]); ++ dev_priv->engine.instmem.finish_access(dev); + + engine->fifo.load_context(dev_priv->fifos[0]); + nv_wr32(NV04_PFIFO_MODE, susres->fifo_mode); @@ -12172,10 +12179,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c new file mode 100644 -index 0000000..7d902d8 +index 0000000..33f9214 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv04_instmem.c -@@ -0,0 +1,188 @@ +@@ -0,0 +1,190 @@ +#include "drmP.h" +#include "drm.h" +#include "nouveau_drv.h" @@ -12213,8 +12220,10 @@ + DRM_DEBUG("RAMIN size: %dKiB\n", dev_priv->ramin_rsvd_vram>>10); + + /* Clear all of it, except the BIOS image that's in the first 64KiB */ ++ dev_priv->engine.instmem.prepare_access(dev, true); + for (i=(64*1024); iramin_rsvd_vram; i+=4) + nv_wi32(i, 0x00000000); ++ dev_priv->engine.instmem.finish_access(dev); +} + +static void Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1383 retrieving revision 1.1384 diff -u -r1.1383 -r1.1384 --- kernel.spec 4 Mar 2009 20:58:11 -0000 1.1383 +++ kernel.spec 5 Mar 2009 00:27:56 -0000 1.1384 @@ -1792,6 +1792,9 @@ # and build. %changelog +* Thu Mar 05 2009 Ben Skeggs +- drm-nouveau.patch: fix - drivers/media: fixes and improvements on devel tree From salimma at fedoraproject.org Thu Mar 5 00:28:01 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Thu, 5 Mar 2009 00:28:01 +0000 (UTC) Subject: rpms/llvm/F-10 llvm-build-examples.sh.in, NONE, 1.1 llvm.spec, 1.8, 1.9 Message-ID: <20090305002801.AF9DC70116@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/llvm/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3300/F-10 Modified Files: llvm.spec Added Files: llvm-build-examples.sh.in Log Message: * Wed Mar 4 2009 Michel Salim - 2.5-1 - Update to 2.5 (devel branch) - Package build scripts (bug #457881) --- NEW FILE llvm-build-examples.sh.in --- #!/bin/sh touch ../config.status 2>/dev/null if [ $? != 0 ]; then echo Make sure parent directory is writeable. echo You can fix this by e.g. echo (cd ../ && tar cf - examples) | (cd $HOME && tar xf -) exit $? else chmod +x ../config.status for f in Makefile.{common,config,rules}; do ln -sf LIBDIR/llvm/build/$f .. done make $@ fi Index: llvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/llvm/F-10/llvm.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- llvm.spec 14 Dec 2008 16:01:03 -0000 1.8 +++ llvm.spec 5 Mar 2009 00:27:31 -0000 1.9 @@ -13,34 +13,39 @@ %define debug_package %{nil} -Name: llvm -Version: 2.4 -Release: 2%{?dist} -Summary: The Low Level Virtual Machine - -Group: Development/Languages -License: NCSA -URL: http://llvm.org/ -Source0: http://llvm.org/releases/%{version}/llvm-%{version}.tar.gz +Name: llvm +Version: 2.4 +Release: 3%{?dist} +Summary: The Low Level Virtual Machine + +Group: Development/Languages +License: NCSA +URL: http://llvm.org/ +Source0: http://llvm.org/releases/%{version}/llvm-%{version}.tar.gz %if %{?_with_gcc:1}%{!?_with_gcc:0} -Source1: http://llvm.org/releases/%{version}/llvm-gcc%{lgcc_version}-%{version}.source.tar.gz +Source1: http://llvm.org/releases/%{version}/llvm-gcc%{lgcc_version}-%{version}.source.tar.gz %endif -Patch0: llvm-2.1-fix-sed.patch +Source2: llvm-build-examples.sh.in +Patch0: llvm-2.1-fix-sed.patch Patch1: llvm-2.4-fix-ocaml.patch -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: bison -BuildRequires: chrpath -BuildRequires: flex -BuildRequires: gcc-c++ >= 3.4 -BuildRequires: groff -BuildRequires: libtool-ltdl-devel -BuildRequires: ocaml-ocamldoc +BuildRequires: bison +BuildRequires: chrpath +BuildRequires: flex +BuildRequires: gcc-c++ >= 3.4 +BuildRequires: groff +BuildRequires: libtool-ltdl-devel +BuildRequires: ocaml-ocamldoc %if %{?_with_doxygen:1}%{!?_with_doxygen:0} -BuildRequires: doxygen graphviz +BuildRequires: doxygen graphviz %endif +# LLVM is not supported on PPC64 +# http://llvm.org/bugs/show_bug.cgi?id=3729 +ExcludeArch: ppc64 + %description LLVM is a compiler infrastructure designed for compile-time, link-time, runtime, and idle-time optimization of programs from @@ -55,10 +60,10 @@ %package devel -Summary: Libraries and header files for LLVM -Group: Development/Languages -Requires: %{name} = %{version}-%{release} -Requires: libstdc++-devel >= 3.4 +Summary: Libraries and header files for LLVM +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Requires: libstdc++-devel >= 3.4 %description devel @@ -67,9 +72,10 @@ %package doc -Summary: Documentation for LLVM -Group: Development/Languages -Requires: %{name} = %{version}-%{release} +Summary: Documentation for LLVM +Group: Development/Languages +# depend on devel since the examples require build scripts +Requires: %{name}-devel = %{version}-%{release} %description doc Documentation for the LLVM compiler infrastructure. @@ -78,10 +84,10 @@ %if %{?_with_gcc:1}%{!?_with_gcc:0} %package gcc -Summary: C compiler for LLVM -License: GPL+ -Group: Development/Languages -Requires: %{name} = %{version}-%{release} +Summary: C compiler for LLVM +License: GPL+ +Group: Development/Languages +Requires: %{name} = %{version}-%{release} %description gcc @@ -89,10 +95,10 @@ %package gcc-c++ -Summary: C++ compiler for LLVM -License: GPL+ -Group: Development/Languages -Requires: %{name}-gcc = %{version}-%{release} +Summary: C++ compiler for LLVM +License: GPL+ +Group: Development/Languages +Requires: %{name}-gcc = %{version}-%{release} %description gcc-c++ @@ -103,9 +109,9 @@ %if %{?_with_doxygen:1}%{!?_with_doxygen:0} %package apidoc -Summary: API documentation for LLVM -Group: Development/Languages -Requires: %{name}-docs = %{version}-%{release} +Summary: API documentation for LLVM +Group: Development/Languages +Requires: %{name}-docs = %{version}-%{release} %description apidoc @@ -113,23 +119,23 @@ %endif -%package ocaml -Summary: OCaml binding for LLVM -Group: Development/Libraries +%package ocaml +Summary: OCaml binding for LLVM +Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: ocaml-runtime +Requires: ocaml-runtime -%description ocaml +%description ocaml OCaml binding for LLVM. %package ocaml-devel -Summary: Development files for %{name}-ocaml -Group: Development/Libraries +Summary: Development files for %{name}-ocaml +Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} -Requires: %{name}-ocaml = %{version}-%{release} +Requires: %{name}-ocaml = %{version}-%{release} -%description ocaml-devel +%description ocaml-devel The %{name}-ocaml-devel package contains libraries and signature files for developing applications that use %{name}-ocaml. @@ -141,6 +147,7 @@ %patch1 -p1 -b .fix-ocaml %build +# Note: --enable-pic can be turned off when 2.6 comes out %configure \ --libdir=%{_libdir}/%{name} \ --datadir=%{_datadir}/%{name}-%{version} \ @@ -149,7 +156,7 @@ --enable-debug-runtime \ --enable-jit \ --enable-optimized \ - --enable-shared \ + --enable-pic \ --with-pic # --enable-targets=host-only \ @@ -225,6 +232,14 @@ chmod -x %{buildroot}%{_libdir}/%{name}/*.[oa] +# Install build scripts +mkdir -p %{buildroot}%{_libdir}/llvm/build +chmod -x Makefile{,.common} +for f in Makefile.{common,config,rules}; do + cp -p $f %{buildroot}%{_libdir}/llvm/build/ +done +cat %{SOURCE2} | sed -e "s|LIBDIR|%{_libdir}|g" > examples/build-examples.sh + %if %{?_with_gcc:1}%{!?_with_gcc:0} # Install llvm-gcc. @@ -337,6 +352,9 @@ %changelog +* Wed Mar 4 2009 Michel Salim - 2.4-3 +- Package build scripts (bug #457881) + * Tue Dec 2 2008 Michel Salim - 2.4-2 - Patched build process for the OCaml binding From salimma at fedoraproject.org Thu Mar 5 00:28:02 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Thu, 5 Mar 2009 00:28:02 +0000 (UTC) Subject: rpms/llvm/devel llvm-2.5-gcc44.patch, NONE, 1.1 llvm-build-examples.sh.in, NONE, 1.1 .cvsignore, 1.5, 1.6 llvm.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <20090305002802.10B6D70116@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/llvm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3300/devel Modified Files: .cvsignore llvm.spec sources Added Files: llvm-2.5-gcc44.patch llvm-build-examples.sh.in Log Message: * Wed Mar 4 2009 Michel Salim - 2.5-1 - Update to 2.5 (devel branch) - Package build scripts (bug #457881) llvm-2.5-gcc44.patch: --- NEW FILE llvm-2.5-gcc44.patch --- --- llvm-2.5/lib/System/Unix/Signals.inc.gcc44 2008-12-05 18:39:24.000000000 -0500 +++ llvm-2.5/lib/System/Unix/Signals.inc 2009-03-04 13:56:32.804820443 -0500 @@ -78,7 +78,7 @@ for (int i = 0; i < depth; ++i) { Dl_info dlinfo; dladdr(StackTrace[i], &dlinfo); - char* name = strrchr(dlinfo.dli_fname, '/'); + const char* name = strrchr(dlinfo.dli_fname, '/'); int nwidth; if (name == NULL) nwidth = strlen(dlinfo.dli_fname); @@ -93,7 +93,7 @@ fprintf(stderr, "%-3d", i); - char* name = strrchr(dlinfo.dli_fname, '/'); + const char* name = strrchr(dlinfo.dli_fname, '/'); if (name == NULL) fprintf(stderr, " %-*s", width, dlinfo.dli_fname); else fprintf(stderr, " %-*s", width, name+1); --- NEW FILE llvm-build-examples.sh.in --- #!/bin/sh touch ../config.status 2>/dev/null if [ $? != 0 ]; then echo Make sure parent directory is writeable. echo You can fix this by e.g. echo (cd ../ && tar cf - examples) | (cd $HOME && tar xf -) exit $? else chmod +x ../config.status for f in Makefile.{common,config,rules}; do ln -sf LIBDIR/llvm/build/$f .. done make $@ fi Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/llvm/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Dec 2008 05:46:36 -0000 1.5 +++ .cvsignore 5 Mar 2009 00:27:31 -0000 1.6 @@ -1 +1 @@ -llvm-2.4.tar.gz +llvm-2.5.tar.gz Index: llvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- llvm.spec 25 Feb 2009 20:43:15 -0000 1.9 +++ llvm.spec 5 Mar 2009 00:27:31 -0000 1.10 @@ -13,34 +13,41 @@ %define debug_package %{nil} -Name: llvm -Version: 2.4 -Release: 3%{?dist} -Summary: The Low Level Virtual Machine - -Group: Development/Languages -License: NCSA -URL: http://llvm.org/ -Source0: http://llvm.org/releases/%{version}/llvm-%{version}.tar.gz +Name: llvm +Version: 2.5 +Release: 1%{?dist} +Summary: The Low Level Virtual Machine + +Group: Development/Languages +License: NCSA +URL: http://llvm.org/ +Source0: http://llvm.org/releases/%{version}/llvm-%{version}.tar.gz %if %{?_with_gcc:1}%{!?_with_gcc:0} -Source1: http://llvm.org/releases/%{version}/llvm-gcc%{lgcc_version}-%{version}.source.tar.gz +Source1: http://llvm.org/releases/%{version}/llvm-gcc%{lgcc_version}-%{version}.source.tar.gz %endif -Patch0: llvm-2.1-fix-sed.patch +Source2: llvm-build-examples.sh.in +Patch0: llvm-2.1-fix-sed.patch Patch1: llvm-2.4-fix-ocaml.patch +# http://llvm.org/bugs/show_bug.cgi?id=3726 +Patch2: llvm-2.5-gcc44.patch -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: bison -BuildRequires: chrpath -BuildRequires: flex -BuildRequires: gcc-c++ >= 3.4 -BuildRequires: groff -BuildRequires: libtool-ltdl-devel -BuildRequires: ocaml-ocamldoc +BuildRequires: bison +BuildRequires: chrpath +BuildRequires: flex +BuildRequires: gcc-c++ >= 3.4 +BuildRequires: groff +BuildRequires: libtool-ltdl-devel +BuildRequires: ocaml-ocamldoc %if %{?_with_doxygen:1}%{!?_with_doxygen:0} -BuildRequires: doxygen graphviz +BuildRequires: doxygen graphviz %endif +# LLVM is not supported on PPC64 +# http://llvm.org/bugs/show_bug.cgi?id=3729 +ExcludeArch: ppc64 + %description LLVM is a compiler infrastructure designed for compile-time, link-time, runtime, and idle-time optimization of programs from @@ -55,10 +62,10 @@ %package devel -Summary: Libraries and header files for LLVM -Group: Development/Languages -Requires: %{name} = %{version}-%{release} -Requires: libstdc++-devel >= 3.4 +Summary: Libraries and header files for LLVM +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Requires: libstdc++-devel >= 3.4 %description devel @@ -67,9 +74,10 @@ %package doc -Summary: Documentation for LLVM -Group: Development/Languages -Requires: %{name} = %{version}-%{release} +Summary: Documentation for LLVM +Group: Development/Languages +# depend on devel since the examples require build scripts +Requires: %{name}-devel = %{version}-%{release} %description doc Documentation for the LLVM compiler infrastructure. @@ -78,10 +86,10 @@ %if %{?_with_gcc:1}%{!?_with_gcc:0} %package gcc -Summary: C compiler for LLVM -License: GPL+ -Group: Development/Languages -Requires: %{name} = %{version}-%{release} +Summary: C compiler for LLVM +License: GPL+ +Group: Development/Languages +Requires: %{name} = %{version}-%{release} %description gcc @@ -89,10 +97,10 @@ %package gcc-c++ -Summary: C++ compiler for LLVM -License: GPL+ -Group: Development/Languages -Requires: %{name}-gcc = %{version}-%{release} +Summary: C++ compiler for LLVM +License: GPL+ +Group: Development/Languages +Requires: %{name}-gcc = %{version}-%{release} %description gcc-c++ @@ -103,9 +111,9 @@ %if %{?_with_doxygen:1}%{!?_with_doxygen:0} %package apidoc -Summary: API documentation for LLVM -Group: Development/Languages -Requires: %{name}-docs = %{version}-%{release} +Summary: API documentation for LLVM +Group: Development/Languages +Requires: %{name}-docs = %{version}-%{release} %description apidoc @@ -113,23 +121,23 @@ %endif -%package ocaml -Summary: OCaml binding for LLVM -Group: Development/Libraries +%package ocaml +Summary: OCaml binding for LLVM +Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: ocaml-runtime +Requires: ocaml-runtime -%description ocaml +%description ocaml OCaml binding for LLVM. %package ocaml-devel -Summary: Development files for %{name}-ocaml -Group: Development/Libraries +Summary: Development files for %{name}-ocaml +Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} -Requires: %{name}-ocaml = %{version}-%{release} +Requires: %{name}-ocaml = %{version}-%{release} -%description ocaml-devel +%description ocaml-devel The %{name}-ocaml-devel package contains libraries and signature files for developing applications that use %{name}-ocaml. @@ -139,8 +147,10 @@ %patch0 -p1 -b .fix-sed %patch1 -p1 -b .fix-ocaml +%patch2 -p1 -b .gcc44 %build +# Note: --enable-pic can be turned off when 2.6 comes out %configure \ --libdir=%{_libdir}/%{name} \ --datadir=%{_datadir}/%{name}-%{version} \ @@ -149,7 +159,7 @@ --enable-debug-runtime \ --enable-jit \ --enable-optimized \ - --enable-shared \ + --enable-pic \ --with-pic # --enable-targets=host-only \ @@ -225,6 +235,14 @@ chmod -x %{buildroot}%{_libdir}/%{name}/*.[oa] +# Install build scripts +mkdir -p %{buildroot}%{_libdir}/llvm/build +chmod -x Makefile{,.common} +for f in Makefile.{common,config,rules}; do + cp -p $f %{buildroot}%{_libdir}/llvm/build/ +done +cat %{SOURCE2} | sed -e "s|LIBDIR|%{_libdir}|g" > examples/build-examples.sh + %if %{?_with_gcc:1}%{!?_with_gcc:0} # Install llvm-gcc. @@ -337,8 +355,9 @@ %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 2.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Wed Mar 4 2009 Michel Salim - 2.5-1 +- Update to 2.5 +- Package build scripts (bug #457881) * Tue Dec 2 2008 Michel Salim - 2.4-2 - Patched build process for the OCaml binding Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/llvm/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Dec 2008 05:46:36 -0000 1.5 +++ sources 5 Mar 2009 00:27:31 -0000 1.6 @@ -1 +1 @@ -bf43eee98c364fd79c7d2b72e645a15e llvm-2.4.tar.gz +55df2ea8665c8094ad2ef85187b9fc74 llvm-2.5.tar.gz From hadess at fedoraproject.org Thu Mar 5 00:28:19 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Thu, 5 Mar 2009 00:28:19 +0000 (UTC) Subject: comps comps-f11.xml.in,1.140,1.141 Message-ID: <20090305002819.1C8A470116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3419 Modified Files: comps-f11.xml.in Log Message: Remove bluez-gnome from the default install Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- comps-f11.xml.in 4 Mar 2009 21:23:08 -0000 1.140 +++ comps-f11.xml.in 5 Mar 2009 00:27:48 -0000 1.141 @@ -2134,7 +2134,6 @@ scim-bridge-gtk alacarte at-spi - bluez-gnome bug-buddy compiz-gnome dasher From hadess at fedoraproject.org Thu Mar 5 00:43:48 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Thu, 5 Mar 2009 00:43:48 +0000 (UTC) Subject: rpms/gnome-bluetooth/devel sendto-connect-fix.patch, NONE, 1.1 gnome-bluetooth-0.7.0-path.patch, 1.1, NONE gnome-bluetooth-0.7.0-pydir.patch, 1.3, NONE Message-ID: <20090305004348.7307B70116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-bluetooth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5638 Added Files: sendto-connect-fix.patch Removed Files: gnome-bluetooth-0.7.0-path.patch gnome-bluetooth-0.7.0-pydir.patch Log Message: Add necessary patch, remove obsolete ones sendto-connect-fix.patch: --- NEW FILE sendto-connect-fix.patch --- --- trunk/sendto/main.c 2009/03/04 18:42:45 457 +++ trunk/sendto/main.c 2009/03/05 00:12:12 458 @@ -369,12 +369,12 @@ GTK_RESPONSE_CLOSE, TRUE); } -static void session_connect_error (DBusGProxy *proxy, DBusGProxy *session_obj, const char *error_name, +static void session_connect_error (DBusGProxy *proxy, const char *session_obj, const char *error_name, const char *error_message, gpointer user_data) { gchar *text; - if (session_obj != session_proxy) + if (strcmp (session_obj, dbus_g_proxy_get_path (session_proxy)) != 0) return; gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), @@ -388,9 +388,9 @@ GTK_RESPONSE_CLOSE, TRUE); } -static void session_connected(DBusGProxy *proxy, DBusGProxy *session_obj, gpointer user_data) +static void session_connected(DBusGProxy *proxy, const char *session_obj, gpointer user_data) { - if (session_obj != session_proxy) + if (strcmp (session_obj, dbus_g_proxy_get_path (session_proxy)) != 0) return; gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), NULL); --- gnome-bluetooth-0.7.0-path.patch DELETED --- --- gnome-bluetooth-0.7.0-pydir.patch DELETED --- From hadess at fedoraproject.org Thu Mar 5 00:44:01 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Thu, 5 Mar 2009 00:44:01 +0000 (UTC) Subject: rpms/nautilus-sendto/F-10 .cvsignore, 1.16, 1.17 nautilus-sendto.spec, 1.57, 1.58 sources, 1.16, 1.17 Message-ID: <20090305004401.0BE3270116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-sendto/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5592 Modified Files: .cvsignore nautilus-sendto.spec sources Log Message: * Thu Mar 05 2009 - Bastien Nocera - 1.1.2 - Update to 1.1.2 - Fix problems with sending over Bluetooth (#469939) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-10/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 24 Sep 2008 01:10:10 -0000 1.16 +++ .cvsignore 5 Mar 2009 00:43:30 -0000 1.17 @@ -1 +1 @@ -nautilus-sendto-1.1.0.tar.bz2 +nautilus-sendto-1.1.2.tar.bz2 Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-10/nautilus-sendto.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- nautilus-sendto.spec 24 Sep 2008 01:10:11 -0000 1.57 +++ nautilus-sendto.spec 5 Mar 2009 00:43:30 -0000 1.58 @@ -1,5 +1,5 @@ Name: nautilus-sendto -Version: 1.1.0 +Version: 1.1.2 Release: 1%{?dist} Summary: Nautilus context menu for sending files @@ -84,6 +84,7 @@ %{_libdir}/nautilus-sendto/plugins/*.so %{_datadir}/nautilus-sendto %{_bindir}/nautilus-sendto +%{_libdir}/evolution/*/plugins/* %ifnarch s390 s390x %{_libdir}/pidgin/nautilus.so %endif @@ -91,6 +92,10 @@ %{_mandir}/man1/nautilus-sendto.1.gz %changelog +* Thu Mar 05 2009 - Bastien Nocera - 1.1.2 +- Update to 1.1.2 +- Fix problems with sending over Bluetooth (#469939) + * Tue Sep 23 2008 - Bastien Nocera - 1.1.0 - Update to 1.1.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-10/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 24 Sep 2008 01:10:11 -0000 1.16 +++ sources 5 Mar 2009 00:43:30 -0000 1.17 @@ -1 +1 @@ -fb2e115a33653496416847c61477b857 nautilus-sendto-1.1.0.tar.bz2 +20b5ae02ebc33d443b747b5f309b8e4a nautilus-sendto-1.1.2.tar.bz2 From hadess at fedoraproject.org Thu Mar 5 00:57:21 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Thu, 5 Mar 2009 00:57:21 +0000 (UTC) Subject: rpms/bluez/devel bluez.spec,1.43,1.44 Message-ID: <20090305005721.9137470116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7531 Modified Files: bluez.spec Log Message: * Thu Mar 05 2009 - Bastien Nocera - 4.32-3 - Fix permissions on the udev rules (#479348) Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- bluez.spec 4 Mar 2009 20:04:48 -0000 1.43 +++ bluez.spec 5 Mar 2009 00:56:51 -0000 1.44 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez Version: 4.32 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz @@ -119,7 +119,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_libdir}/cups fi -install -D -m0755 scripts/bluetooth.rules ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules +install -D -m0644 scripts/bluetooth.rules ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules install -D -m0755 scripts/bluetooth_serial ${RPM_BUILD_ROOT}/lib/udev/bluetooth_serial install -D -m0755 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules @@ -187,6 +187,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Thu Mar 05 2009 - Bastien Nocera - 4.32-3 +- Fix permissions on the udev rules (#479348) + * Wed Mar 04 2009 - Bastien Nocera - 4.32-2 - Own /usr/lib*/bluetooth and children (#474632) From nalin at fedoraproject.org Thu Mar 5 00:58:05 2009 From: nalin at fedoraproject.org (Nalin Dahyabhai) Date: Thu, 5 Mar 2009 00:58:05 +0000 (UTC) Subject: rpms/slapi-nis/devel .cvsignore, 1.4, 1.5 slapi-nis.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <20090305005805.C34BB70116@cvs1.fedora.phx.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/slapi-nis/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7850 Modified Files: .cvsignore slapi-nis.spec sources Log Message: update to 0.10 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/slapi-nis/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 7 Nov 2008 17:21:00 -0000 1.4 +++ .cvsignore 5 Mar 2009 00:57:35 -0000 1.5 @@ -1,3 +1,4 @@ slapi-nis-0.8.tar.gz slapi-nis-0.8.1.tar.gz slapi-nis-0.9.tar.gz +slapi-nis-0.10.tar.gz Index: slapi-nis.spec =================================================================== RCS file: /cvs/pkgs/rpms/slapi-nis/devel/slapi-nis.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- slapi-nis.spec 26 Feb 2009 01:28:38 -0000 1.4 +++ slapi-nis.spec 5 Mar 2009 00:57:35 -0000 1.5 @@ -1,6 +1,6 @@ Name: slapi-nis -Version: 0.9 -Release: 2%{?dist} +Version: 0.10 +Release: 1%{?dist} Summary: NIS Server and Schema Compatibility plugins for Directory Server Group: System Environment/Daemons License: GPLv2 @@ -41,11 +41,14 @@ %files %defattr(-,root,root,-) -%doc COPYING STATUS doc/*.txt doc/*.ldif +%doc COPYING NEWS README STATUS doc/*.txt doc/*.ldif %{_libdir}/dirsrv/plugins/*.so %{_sbindir}/nisserver-plugin-defs %changelog +* Wed Mar 4 2009 Nalin Dahyabhai - 0.10-1 +- update to 0.10 + * Wed Feb 25 2009 Fedora Release Engineering - 0.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/slapi-nis/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 Nov 2008 17:21:00 -0000 1.4 +++ sources 5 Mar 2009 00:57:35 -0000 1.5 @@ -1 +1 @@ -df8305ff377de025101511f9ee0eaebe slapi-nis-0.9.tar.gz +9e949c3845e18f71c58499565da6948a slapi-nis-0.10.tar.gz From hadess at fedoraproject.org Thu Mar 5 01:00:36 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Thu, 5 Mar 2009 01:00:36 +0000 (UTC) Subject: rpms/nautilus-sendto/F-10 nautilus-sendto.spec,1.58,1.59 Message-ID: <20090305010036.6749270116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/nautilus-sendto/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8104 Modified Files: nautilus-sendto.spec Log Message: Fix build Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-10/nautilus-sendto.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- nautilus-sendto.spec 5 Mar 2009 00:43:30 -0000 1.58 +++ nautilus-sendto.spec 5 Mar 2009 01:00:06 -0000 1.59 @@ -84,7 +84,6 @@ %{_libdir}/nautilus-sendto/plugins/*.so %{_datadir}/nautilus-sendto %{_bindir}/nautilus-sendto -%{_libdir}/evolution/*/plugins/* %ifnarch s390 s390x %{_libdir}/pidgin/nautilus.so %endif From rdieter at fedoraproject.org Thu Mar 5 01:26:03 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 01:26:03 +0000 (UTC) Subject: rpms/kdelibs/F-10 .cvsignore,1.62,1.63 kdelibs.spec,1.409,1.410 Message-ID: <20090305012603.C0F4470116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11776 Modified Files: .cvsignore kdelibs.spec Log Message: * Wed Mar 05 2009 Rex Dieter - 4.2.1-4 - move designer plugins to main/runtime (#487622) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-10/.cvsignore,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- .cvsignore 23 Jan 2009 18:59:58 -0000 1.62 +++ .cvsignore 5 Mar 2009 01:25:33 -0000 1.63 @@ -1 +1 @@ -kdelibs-4.2.0.tar.bz2 +kdelibs-4.2.1.tar.bz2 Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v retrieving revision 1.409 retrieving revision 1.410 diff -u -r1.409 -r1.410 --- kdelibs.spec 3 Mar 2009 22:06:10 -0000 1.409 +++ kdelibs.spec 5 Mar 2009 01:25:33 -0000 1.410 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.1 -Release: 2%{?dist} +Release: 4%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -329,7 +329,6 @@ # kdewidgets %exclude %{_kde4_bindir}/makekdewidgets4 %exclude %{_kde4_appsdir}/kdewidgets/ -%exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.* %exclude %{_kde4_appsdir}/cmake/ %{_kde4_configdir}/* %{_datadir}/dbus-1/interfaces/* @@ -345,9 +344,7 @@ %dir %{_kde4_libdir}/kde4/ %{_kde4_libdir}/kde4/*.so %{_kde4_libexecdir}/* -%dir %{_kde4_libdir}/kde4/plugins/ -%{_kde4_libdir}/kde4/plugins/imageformats/ -%{_kde4_libdir}/kde4/plugins/script/ +%{_kde4_libdir}/kde4/plugins/ %{_kde4_sysconfdir}/xdg/menus/*.menu %doc %{_mandir}/man*/* # kdelibs-common comes from here for fedora >= 9 @@ -390,7 +387,6 @@ %{_kde4_appsdir}/kdewidgets/ %{_kde4_includedir}/* %{_kde4_libdir}/kde4/devel/ -%{_kde4_libdir}/kde4/plugins/designer/ %endif %if 0%{?apidocs} @@ -401,6 +397,9 @@ %changelog +* Wed Mar 05 2009 Rex Dieter - 4.2.1-4 +- move designer plugins to main/runtime (#487622) + * Sun Mar 01 2009 Than Ngo - 4.2.1-2 - respin From salimma at fedoraproject.org Thu Mar 5 01:26:25 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Thu, 5 Mar 2009 01:26:25 +0000 (UTC) Subject: rpms/llvm/F-10 llvm.spec, 1.9, 1.10 llvm-build-examples.sh.in, 1.1, NONE Message-ID: <20090305012625.9D6A670116@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/llvm/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11848/F-10 Modified Files: llvm.spec Removed Files: llvm-build-examples.sh.in Log Message: * Wed Mar 4 2009 Michel Salim - 2.5-2 - Remove build scripts; they require the build directory to work Index: llvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/llvm/F-10/llvm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- llvm.spec 5 Mar 2009 00:27:31 -0000 1.9 +++ llvm.spec 5 Mar 2009 01:25:55 -0000 1.10 @@ -15,7 +15,7 @@ Name: llvm Version: 2.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Low Level Virtual Machine Group: Development/Languages @@ -25,7 +25,6 @@ %if %{?_with_gcc:1}%{!?_with_gcc:0} Source1: http://llvm.org/releases/%{version}/llvm-gcc%{lgcc_version}-%{version}.source.tar.gz %endif -Source2: llvm-build-examples.sh.in Patch0: llvm-2.1-fix-sed.patch Patch1: llvm-2.4-fix-ocaml.patch @@ -74,8 +73,7 @@ %package doc Summary: Documentation for LLVM Group: Development/Languages -# depend on devel since the examples require build scripts -Requires: %{name}-devel = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description doc Documentation for the LLVM compiler infrastructure. @@ -232,13 +230,9 @@ chmod -x %{buildroot}%{_libdir}/%{name}/*.[oa] -# Install build scripts -mkdir -p %{buildroot}%{_libdir}/llvm/build -chmod -x Makefile{,.common} -for f in Makefile.{common,config,rules}; do - cp -p $f %{buildroot}%{_libdir}/llvm/build/ -done -cat %{SOURCE2} | sed -e "s|LIBDIR|%{_libdir}|g" > examples/build-examples.sh +# remove documentation makefiles: +# they require the build directory to work +find examples -name 'Makefile' %if %{?_with_gcc:1}%{!?_with_gcc:0} # Install llvm-gcc. @@ -352,6 +346,9 @@ %changelog +* Wed Mar 4 2009 Michel Salim - 2.4-4 +- Remove build scripts; they require the build directory to work + * Wed Mar 4 2009 Michel Salim - 2.4-3 - Package build scripts (bug #457881) --- llvm-build-examples.sh.in DELETED --- From salimma at fedoraproject.org Thu Mar 5 01:26:25 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Thu, 5 Mar 2009 01:26:25 +0000 (UTC) Subject: rpms/llvm/devel llvm.spec, 1.10, 1.11 llvm-build-examples.sh.in, 1.1, NONE Message-ID: <20090305012625.DA1D370116@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/llvm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11848/devel Modified Files: llvm.spec Removed Files: llvm-build-examples.sh.in Log Message: * Wed Mar 4 2009 Michel Salim - 2.5-2 - Remove build scripts; they require the build directory to work Index: llvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- llvm.spec 5 Mar 2009 00:27:31 -0000 1.10 +++ llvm.spec 5 Mar 2009 01:25:55 -0000 1.11 @@ -15,7 +15,7 @@ Name: llvm Version: 2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Low Level Virtual Machine Group: Development/Languages @@ -25,7 +25,6 @@ %if %{?_with_gcc:1}%{!?_with_gcc:0} Source1: http://llvm.org/releases/%{version}/llvm-gcc%{lgcc_version}-%{version}.source.tar.gz %endif -Source2: llvm-build-examples.sh.in Patch0: llvm-2.1-fix-sed.patch Patch1: llvm-2.4-fix-ocaml.patch # http://llvm.org/bugs/show_bug.cgi?id=3726 @@ -76,8 +75,7 @@ %package doc Summary: Documentation for LLVM Group: Development/Languages -# depend on devel since the examples require build scripts -Requires: %{name}-devel = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description doc Documentation for the LLVM compiler infrastructure. @@ -235,13 +233,9 @@ chmod -x %{buildroot}%{_libdir}/%{name}/*.[oa] -# Install build scripts -mkdir -p %{buildroot}%{_libdir}/llvm/build -chmod -x Makefile{,.common} -for f in Makefile.{common,config,rules}; do - cp -p $f %{buildroot}%{_libdir}/llvm/build/ -done -cat %{SOURCE2} | sed -e "s|LIBDIR|%{_libdir}|g" > examples/build-examples.sh +# remove documentation makefiles: +# they require the build directory to work +find examples -name 'Makefile' %if %{?_with_gcc:1}%{!?_with_gcc:0} # Install llvm-gcc. @@ -355,6 +349,9 @@ %changelog +* Wed Mar 4 2009 Michel Salim - 2.5-2 +- Remove build scripts; they require the build directory to work + * Wed Mar 4 2009 Michel Salim - 2.5-1 - Update to 2.5 - Package build scripts (bug #457881) --- llvm-build-examples.sh.in DELETED --- From rdieter at fedoraproject.org Thu Mar 5 01:26:50 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 01:26:50 +0000 (UTC) Subject: rpms/kdelibs/F-9 .cvsignore,1.57,1.58 kdelibs.spec,1.384,1.385 Message-ID: <20090305012650.9BA0870116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12036 Modified Files: .cvsignore kdelibs.spec Log Message: * Wed Mar 05 2009 Rex Dieter - 4.2.1-4 - move designer plugins to main/runtime (#487622) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-9/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- .cvsignore 30 Jan 2009 17:25:55 -0000 1.57 +++ .cvsignore 5 Mar 2009 01:26:20 -0000 1.58 @@ -1 +1 @@ -kdelibs-4.2.0.tar.bz2 +kdelibs-4.2.1.tar.bz2 Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v retrieving revision 1.384 retrieving revision 1.385 diff -u -r1.384 -r1.385 --- kdelibs.spec 3 Mar 2009 22:06:10 -0000 1.384 +++ kdelibs.spec 5 Mar 2009 01:26:20 -0000 1.385 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.1 -Release: 2%{?dist} +Release: 4%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -329,7 +329,6 @@ # kdewidgets %exclude %{_kde4_bindir}/makekdewidgets4 %exclude %{_kde4_appsdir}/kdewidgets/ -%exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.* %exclude %{_kde4_appsdir}/cmake/ %{_kde4_configdir}/* %{_datadir}/dbus-1/interfaces/* @@ -345,9 +344,7 @@ %dir %{_kde4_libdir}/kde4/ %{_kde4_libdir}/kde4/*.so %{_kde4_libexecdir}/* -%dir %{_kde4_libdir}/kde4/plugins/ -%{_kde4_libdir}/kde4/plugins/imageformats/ -%{_kde4_libdir}/kde4/plugins/script/ +%{_kde4_libdir}/kde4/plugins/ %{_kde4_sysconfdir}/xdg/menus/*.menu %doc %{_mandir}/man*/* # kdelibs-common comes from here for fedora >= 9 @@ -390,7 +387,6 @@ %{_kde4_appsdir}/kdewidgets/ %{_kde4_includedir}/* %{_kde4_libdir}/kde4/devel/ -%{_kde4_libdir}/kde4/plugins/designer/ %endif %if 0%{?apidocs} @@ -401,6 +397,9 @@ %changelog +* Wed Mar 05 2009 Rex Dieter - 4.2.1-4 +- move designer plugins to main/runtime (#487622) + * Sun Mar 01 2009 Than Ngo - 4.2.1-2 - respin From rdieter at fedoraproject.org Thu Mar 5 01:30:37 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 01:30:37 +0000 (UTC) Subject: rpms/PyQt4/F-10 PyQt4.spec,1.16,1.17 Message-ID: <20090305013037.CD37170116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/PyQt4/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12839 Modified Files: PyQt4.spec Log Message: * Wed Mar 05 2009 Rex Dieter - 4.4.4-5 - move designer plugins to main/runtime (#487622) Index: PyQt4.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyQt4/F-10/PyQt4.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- PyQt4.spec 30 Dec 2008 01:19:49 -0000 1.16 +++ PyQt4.spec 5 Mar 2009 01:30:07 -0000 1.17 @@ -4,7 +4,7 @@ Summary: Python bindings for Qt4 Name: PyQt4 Version: 4.4.4 -Release: 1%{?dist} +Release: 5%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions @@ -111,6 +111,7 @@ %{python_sitearch}/PyQt4/ # fixme? -> sitearch? -- Rex %{python_sitelib}/dbus/mainloop/qt.so +%{_qt4_plugindir}/designer/* %files devel %defattr(-,root,root,-) @@ -118,10 +119,21 @@ %doc examples/ %{_bindir}/* %{_datadir}/sip/PyQt4/ -%{_qt4_plugindir}/designer/* %changelog +* Wed Mar 05 2009 Rex Dieter - 4.4.4-5 +- move designer plugins to main/runtime (#487622) + +* Mon Feb 23 2009 Fedora Release Engineering - 4.4.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Feb 13 2009 Than Ngo - 4.4.4-3 +- rebuild against qt-4.5rc1 + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 4.4.4-2 +- Rebuild for Python 2.6 + * Mon Nov 10 2008 Rex Dieter 4.4.4-1 - PyQt-4.4.4 From myoung at fedoraproject.org Thu Mar 5 01:30:40 2009 From: myoung at fedoraproject.org (Michael Young) Date: Thu, 5 Mar 2009 01:30:40 +0000 (UTC) Subject: rpms/kernel/devel agp-set_memory_ucwb.patch, NONE, 1.1.10.2 drm-fix-setmaster-deadlock.patch, NONE, 1.1.2.2 drm-maybe-fix-nouveau.patch, NONE, 1.1.10.2 drm-next.patch, 1.6.6.1, 1.6.6.2 drm-radeon-pm.patch, NONE, 1.2.6.2 git-bluetooth.patch, NONE, 1.2.2.2 hda_intel-prealloc-4mb-dmabuffer.patch, NONE, 1.1.6.2 linux-2.6-ipw2x00-age-scan-results-on-resume.patch, NONE, 1.1.10.2 linux-2.6-mac80211-age-scan-results-on-resume.patch, NONE, 1.1.10.2 linux-2.6-v4l-dvb-fixes.patch, NONE, 1.2.8.2 patch-2.6.29-rc7.bz2.sign, NONE, 1.1.6.2 .cvsignore, 1.1014.2.4, 1.1014.2.5 config-generic, 1.238.6.6, 1.238.6.7 config-ia64-generic, 1.21, 1.21.6.1 config-powerpc-generic, 1.33.6.2, 1.33.6.3 drm-modesetting-radeon.patch, 1.54.6.2, 1.54.6.3 drm-nouveau.patch, 1.8, 1.8.6.1 kernel.spec, 1.1294.2.8, 1.1294.2.9 linux-2.6-hdpvr.patch, 1.4, 1.4.6.1 linux-2.6-silence-fbcon-logo.patch, 1.1, 1.1.16.1 linux-2.6-v4l-dvb-update.patch, 1.1.2.2, 1.1.2.3 linux-2.6.29-lirc.patch, 1.3, 1.3.6.1 sources, 1.976.2.5, 1.976.2.6 upstream, 1.888.2.4, 1.888.2.5 xen.pvops.patch, 1.1.2.7, 1.1.2.8 xen.pvops.post.patch, 1.1.2.3, 1.1.2.4 xen.pvops.pre.patch, 1.1.2.3, 1.1.2.4 drm-edid-revision-0-should-be-valid.patch, 1.1.2.2, NONE linux-2.6-iwlwifi-dma-direction.patch, 1.1, NONE linux-2.6-libertas-netpriv-fixes.patch, 1.1.2.2, NONE patch-2.6.29-rc6-git2.bz2.sign, 1.1.2.2, NONE patch-2.6.29-rc6.bz2.sign, 1.1.2.2, NONE Message-ID: <20090305013040.8512870116@cvs1.fedora.phx.redhat.com> Author: myoung Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12118 Modified Files: Tag: private-myoung-dom0-branch .cvsignore config-generic config-ia64-generic config-powerpc-generic drm-modesetting-radeon.patch drm-nouveau.patch kernel.spec linux-2.6-hdpvr.patch linux-2.6-silence-fbcon-logo.patch linux-2.6-v4l-dvb-update.patch linux-2.6.29-lirc.patch sources upstream xen.pvops.patch xen.pvops.post.patch xen.pvops.pre.patch Added Files: Tag: private-myoung-dom0-branch agp-set_memory_ucwb.patch drm-fix-setmaster-deadlock.patch drm-maybe-fix-nouveau.patch drm-next.patch drm-radeon-pm.patch git-bluetooth.patch hda_intel-prealloc-4mb-dmabuffer.patch linux-2.6-ipw2x00-age-scan-results-on-resume.patch linux-2.6-mac80211-age-scan-results-on-resume.patch linux-2.6-v4l-dvb-fixes.patch patch-2.6.29-rc7.bz2.sign Removed Files: Tag: private-myoung-dom0-branch drm-edid-revision-0-should-be-valid.patch linux-2.6-iwlwifi-dma-direction.patch linux-2.6-libertas-netpriv-fixes.patch patch-2.6.29-rc6-git2.bz2.sign patch-2.6.29-rc6.bz2.sign Log Message: Update pvops patch agp-set_memory_ucwb.patch: --- NEW FILE agp-set_memory_ucwb.patch --- commit 082dd38cdc63cbee3924806bff5d87b751270747 Author: Pierre Willenbrock Date: Fri Dec 12 01:36:41 2008 +0100 Use set_memory_{uc,wb} instead of set_memory_array_{uc,wb} for CONFIG_HIGHMEM64G set_memory_array_{uc,wb} expects an unsigned long *, but was called with a dma_addr_t *. This optimistically assumes only CONFIG_HIGHMEM64G selects something incompatible with unsigned long for dma_addr_t. Signed-off-by: Pierre Willenbrock diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index 97e8b41..aeeaf68 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c @@ -1240,12 +1240,17 @@ int agp_generic_alloc_pages(struct agp_bridge_data *bridge, struct agp_memory *m } #ifdef CONFIG_X86 +#ifdef CONFIG_HIGHMEM64G + for (i = 0; i < num_pages; i++) + set_memory_uc(mem->memory[i], 1); +#else set_memory_array_uc(mem->memory, num_pages); #endif +#endif ret = 0; out: for (i = 0; i < mem->page_count; i++) - mem->memory[i] = virt_to_gart((void *)mem->memory[i]); + mem->memory[i] = virt_to_gart((void *)(unsigned long)mem->memory[i]); return ret; } EXPORT_SYMBOL(agp_generic_alloc_pages); @@ -1279,11 +1284,16 @@ void agp_generic_destroy_pages(struct agp_memory *mem) mem->memory[i] = (unsigned long)gart_to_virt(mem->memory[i]); #ifdef CONFIG_X86 +#ifdef CONFIG_HIGHMEM64G + for (i = 0; i < mem->page_count; i++) + set_memory_wb(mem->memory[i], 1); +#else set_memory_array_wb(mem->memory, mem->page_count); #endif +#endif for (i = 0; i < mem->page_count; i++) { - addr = (void *)mem->memory[i]; + addr = (void *)(unsigned long)mem->memory[i]; page = virt_to_page(addr); #ifndef CONFIG_X86 diff -up linux-2.6.28.noarch/drivers/gpu/drm/i915/i915_dma.c.dma linux-2.6.28.noarch/drivers/gpu/drm/i915/i915_dma.c --- linux-2.6.28.noarch/drivers/gpu/drm/i915/i915_dma.c.dma 2009-02-27 13:11:03.000000000 +1000 +++ linux-2.6.28.noarch/drivers/gpu/drm/i915/i915_dma.c 2009-02-27 13:11:11.000000000 +1000 @@ -1104,7 +1104,7 @@ int i915_driver_load(struct drm_device * "performance may suffer.\n"); } -#ifdef CONFIG_HIGHMEM64G +#if 0 /* Fedora has AGP workaround patch */ /* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */ dev_priv->has_gem = 0; #else drm-fix-setmaster-deadlock.patch: --- NEW FILE drm-fix-setmaster-deadlock.patch --- >From 3b7d6997b09c2ca5f06e154375aafa92271966c2 Mon Sep 17 00:00:00 2001 From: Helge Bahmann Date: Wed, 4 Mar 2009 09:58:32 +0100 Subject: [PATCH] Fix deadlock in drm_setmaster_ioctl MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kristian H??gsberg --- drivers/gpu/drm/drm_stub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index 46bb923..0823b11 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -176,7 +176,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, file_priv->minor->master != file_priv->master) { mutex_lock(&dev->struct_mutex); file_priv->minor->master = drm_master_get(file_priv->master); - mutex_lock(&dev->struct_mutex); + mutex_unlock(&dev->struct_mutex); } return 0; -- 1.6.1.3 drm-maybe-fix-nouveau.patch: --- NEW FILE drm-maybe-fix-nouveau.patch --- diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index 5b4a646..5574952 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c @@ -309,7 +309,7 @@ nv50_mem_vm_bind_linear(struct drm_device *dev, uint64_t virt, uint32_t size, if (flags & 0x80000000) { while (size) { struct nouveau_gpuobj *pt = pgt[virt / (512*1024*1024)]; - int pte = ((virt % (512*1024*1024)) / psz) * 2; + int pte = ((u32)(virt % (512*1024*1024)) / psz) * 2; INSTANCE_WR(pt, pte++, 0x00000000); INSTANCE_WR(pt, pte++, 0x00000000); @@ -320,7 +320,7 @@ nv50_mem_vm_bind_linear(struct drm_device *dev, uint64_t virt, uint32_t size, } else { while (size) { struct nouveau_gpuobj *pt = pgt[virt / (512*1024*1024)]; - int pte = ((virt % (512*1024*1024)) / psz) * 2; + int pte = ((u32)(virt % (512*1024*1024)) / psz) * 2; INSTANCE_WR(pt, pte++, phys | pfl); INSTANCE_WR(pt, pte++, flags); drm-next.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.6.6.1 -r 1.6.6.2 drm-next.patch Index: drm-next.patch =================================================================== RCS file: drm-next.patch diff -N drm-next.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ drm-next.patch 5 Mar 2009 01:30:22 -0000 1.6.6.2 @@ -0,0 +1,31664 @@ +commit afdecdb151030e719a95896b610fdbde0ad4ca9f +Author: Dave Airlie +Date: Thu Feb 26 10:15:24 2009 +1000 + + drm/r600: fix rptr address along lines of previous fixes to radeon. + + Signed-off-by: Dave Airlie + +commit cc35bf2855020c4067e298cbd50fa5494b82ab7f +Author: Dave Airlie +Date: Thu Feb 26 10:14:40 2009 +1000 + + drm/r600: fixup r600 gart table accessor like ati_pcigart.c + + This attempts to fixup the r600 GART accessors so they work on other arches. + + Signed-off-by: Dave Airlie + +commit 0101c60cfa2d6bd9e86524f267f8ba092bc7b0ae +Author: Dave Airlie +Date: Thu Feb 26 10:13:47 2009 +1000 + + drm/ati_pcigart: use memset_io to reset the memory + + Also don't setup pci_gart if we aren't going to need it. + + Signed-off-by: Dave Airlie + +commit c455abd7d1f5ed1815d692f37b317f8eab358ced +Author: Dave Airlie +Date: Thu Feb 26 10:12:10 2009 +1000 + + drm: add DRM_READ/WRITE64 wrappers around readq/writeq. + + The readq/writeq stuff is from Dave Miller, and he + warns users to be careful about using these. Plans are only + r600 to use it so far. + + Signed-off-by: Dave Airlie + +commit 89de134be815fe9e30ca42aeac8a4ef5c8db8d30 +Author: Alex Deucher +Date: Wed Feb 25 17:02:19 2009 -0500 + + radeon: add RS600 pci ids + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit 8dba4f2bd6d91a38a732dc3417187b75a6607e62 +Author: Alex Deucher +Date: Wed Feb 25 16:57:49 2009 -0500 + + radeon: add support for rs600 GPUs + + RS600s are an AMD IGP for Intel CPUs, that look like RS690s from + a lot of perspectives but look like r600s from a memory controller + point of view. + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit e482e2e2c5dab12db6f1aa032c30993ca36d77b9 +Author: Alex Deucher +Date: Wed Feb 25 15:55:01 2009 -0500 + + radeon: fix r600 AGP support + + This fixes the ioremap issues with r600 AGP. + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit dbcce50efba41272d795b64edd06b1261dbdc5b8 +Author: Alex Deucher +Date: Tue Feb 24 17:13:42 2009 -0500 + + radeon: add R6xx/R7xx pci ids + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit 69184db08c49fd54d4e3a197dae64581c35a144f +Author: Alex Deucher +Date: Tue Feb 24 16:22:29 2009 -0500 + + drm/radeon: add initial support for R6xx/R7xx GPUs + + This adds support for 2D/Xv acceleration in the X.org 2D driver, + to the drm. It doesn't yet provide any 3D support hooks. + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit b95ec10efe0bb8a106c6ab4edc019033c5081d3d +Author: Alex Deucher +Date: Tue Feb 24 14:28:34 2009 -0500 + + drm/radeon: add r6xx/r7xx microcode + + This uses the same microcode system as the current radeon code. + + It should be converted to the new microcode loader I suppose, + though really I need a lot more proof of the worth of me maintaining + firmware blobs externally. + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit 1e7e66e6dce44a77d4042b80de23c8ba4346c459 +Author: Alex Deucher +Date: Tue Feb 24 14:02:13 2009 -0500 + + drm/radeon: prep for r6xx/r7xx support + + - add r6xx/r7xx regs and macros + - add r6xx/r7xx chip families + - fix register access for regs with offsets >= 0x10000 + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit 9cb39ece1f32fe75e7c34b193022650108d4bf0f +Author: Owain G. Ainsworth +Date: Fri Feb 20 08:30:19 2009 +0000 + + i915/drm: Remove two redundant agp_chipset_flushes + + agp_chipset_flush() is for flushing the intel GMCH write cache via the + IFP, these two uses are for when we're getting the object into the cpu + READ domain, and thus should not be needed. This confused me when I was + getting my head around the code. + + With thanks to airlied for helping me check my mental picture of how the + flushes and clflushes are supposed to be used. + + Signed-off-by: Owain G. Ainsworth + Signed-off-by: Eric Anholt + Signed-off-by: Dave Airlie + +commit 5e60aaba5c9d226ec49f4c1030fc871bcea86048 +Author: Chris Wilson +Date: Wed Feb 11 14:26:38 2009 +0000 + + drm/i915: Display fence register state in debugfs i915_gem_fence_regs node. + + Signed-off-by: Chris Wilson + Signed-off-by: Eric Anholt + Signed-off-by: Dave Airlie + +commit 475f933c677b8c59f34744aed2fc3bdcbec24c6e +Author: Eric Anholt +Date: Tue Feb 17 23:53:41 2009 -0800 + + drm/i915: Add information on pinning and fencing to the i915 list debug. + + This was inspired by a patch by Chris Wilson, though none of it applied in any + way due to the debugfs work and I decided to change the formatting of the + new information anyway. + + Signed-off-by: Eric Anholt + Signed-off-by: Dave Airlie + +commit b4212836fef1ef28c6070f43d70fc73f9f5687f6 +Author: Ben Gamari +Date: Tue Feb 17 20:08:51 2009 -0500 + + drm/i915: Consolidate gem object list dumping + + Here we eliminate a few functions in favor of using a single function + to dump from all of the object lists. + + Signed-Off-By: Ben Gamari + Signed-off-by: Eric Anholt + Signed-off-by: Dave Airlie + +commit a584bb1ed4de35a9206a8ed42fc7de18b3d46b5a +Author: Ben Gamari +Date: Tue Feb 17 20:08:49 2009 -0500 + + drm: Convert proc files to seq_file and introduce debugfs + + The old mechanism to formatting proc files is extremely ugly. The + seq_file API was designed specifically for cases like this and greatly + simplifies the process. + + Also, most of the files in /proc really don't belong there. This patch + introduces the infrastructure for putting these into debugfs and exposes + all of the proc files in debugfs as well. + + This contains the i915 hooks rewrite as well, to make bisectability better. + + Signed-off-by: Ben Gamari [...31271 lines suppressed...] + +diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h +index 5ded1ac..33ae98c 100644 +--- a/include/drm/drm_crtc.h ++++ b/include/drm/drm_crtc.h +@@ -550,7 +550,7 @@ struct drm_mode_config { + int min_width, min_height; + int max_width, max_height; + struct drm_mode_config_funcs *funcs; +- unsigned long fb_base; ++ resource_size_t fb_base; + + /* pointers to standard properties */ + struct list_head property_blob_list; +diff --git a/include/drm/drm_os_linux.h b/include/drm/drm_os_linux.h +index 8dbd257..013551d 100644 +--- a/include/drm/drm_os_linux.h ++++ b/include/drm/drm_os_linux.h +@@ -6,6 +6,19 @@ + #include /* For task queue support */ + #include + ++#ifndef readq ++static u64 readq(void __iomem *reg) ++{ ++ return ((u64) readl(reg)) | (((u64) readl(reg + 4UL)) << 32); ++} ++ ++static void writeq(u64 val, void __iomem *reg) ++{ ++ writel(val & 0xffffffff, reg); ++ writel(val >> 32, reg + 0x4UL); ++} ++#endif ++ + /** Current process ID */ + #define DRM_CURRENTPID task_pid_nr(current) + #define DRM_SUSER(p) capable(CAP_SYS_ADMIN) +@@ -23,6 +36,12 @@ + /** Write a dword into a MMIO region */ + #define DRM_WRITE32(map, offset, val) writel(val, ((void __iomem *)(map)->handle) + (offset)) + /** Read memory barrier */ ++ ++/** Read a qword from a MMIO region - be careful using these unless you really understand them */ ++#define DRM_READ64(map, offset) readq(((void __iomem *)(map)->handle) + (offset)) ++/** Write a qword into a MMIO region */ ++#define DRM_WRITE64(map, offset, val) writeq(val, ((void __iomem *)(map)->handle) + (offset)) ++ + #define DRM_READMEMORYBARRIER() rmb() + /** Write memory barrier */ + #define DRM_WRITEMEMORYBARRIER() wmb() +diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h +index 5165f24..c2fd3c5 100644 +--- a/include/drm/drm_pciids.h ++++ b/include/drm/drm_pciids.h +@@ -239,10 +239,121 @@ + {0x1002, 0x7835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x791e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ + {0x1002, 0x791f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ ++ {0x1002, 0x793f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS600|RADEON_IS_IGP|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x7941, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS600|RADEON_IS_IGP|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x7942, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS600|RADEON_IS_IGP|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x796c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ + {0x1002, 0x796d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ + {0x1002, 0x796e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ + {0x1002, 0x796f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ ++ {0x1002, 0x9400, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9401, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9402, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9403, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9405, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x940A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x940B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x940F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9440, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9441, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9442, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9444, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x944A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x944B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x944C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x944E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9450, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9456, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x945A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x945B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x946A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x946B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x947A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x947B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9480, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9487, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9488, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9489, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x948F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9490, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9491, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9498, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x949C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x949E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x949F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94C9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94CC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x94CD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9500, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9501, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9504, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9505, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9506, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9507, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9508, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9509, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x950F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9511, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9515, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9517, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9519, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9540, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9541, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9542, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x954E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x954F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9552, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9553, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9555, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9580, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9581, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9583, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9586, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9587, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9588, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9589, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x958A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x958B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x958C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x958D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x958E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x958F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9590, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9591, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9593, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9595, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9596, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9597, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9598, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9599, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x959B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95C0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95C5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95C6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95C7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95C9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95C2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95C4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95CC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95CD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95CE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x95CF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \ ++ {0x1002, 0x9610, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x9611, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x9612, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x9613, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ ++ {0x1002, 0x9614, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0, 0, 0} + + #define r128_PCI_IDS \ +diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h +index 73ff51f..937a275 100644 +--- a/include/drm/radeon_drm.h ++++ b/include/drm/radeon_drm.h +@@ -304,6 +304,8 @@ typedef union { + + #define RADEON_SCRATCH_REG_OFFSET 32 + ++#define R600_SCRATCH_REG_OFFSET 256 ++ + #define RADEON_NR_SAREA_CLIPRECTS 12 + + /* There are 2 heaps (local/GART). Each region within a heap is a +@@ -526,7 +528,8 @@ typedef struct drm_radeon_init { + RADEON_INIT_CP = 0x01, + RADEON_CLEANUP_CP = 0x02, + RADEON_INIT_R200_CP = 0x03, +- RADEON_INIT_R300_CP = 0x04 ++ RADEON_INIT_R300_CP = 0x04, ++ RADEON_INIT_R600_CP = 0x05 + } func; + unsigned long sarea_priv_offset; + int is_pci; drm-radeon-pm.patch: --- NEW FILE drm-radeon-pm.patch --- diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/atombios_crtc.c.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/atombios_crtc.c --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/atombios_crtc.c.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/atombios_crtc.c 2009-03-03 20:53:05.000000000 +0000 @@ -441,14 +441,23 @@ static bool atombios_crtc_mode_fixup(str static void atombios_crtc_prepare(struct drm_crtc *crtc) { + struct drm_device *dev = crtc->dev; + struct drm_radeon_private *dev_priv = dev->dev_private; + + mutex_lock(&dev_priv->mode_info.power.pll_mutex); + atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); atombios_lock_crtc(crtc, 1); } static void atombios_crtc_commit(struct drm_crtc *crtc) { + struct drm_device *dev = crtc->dev; + struct drm_radeon_private *dev_priv = dev->dev_private; + atombios_crtc_dpms(crtc, DRM_MODE_DPMS_ON); atombios_lock_crtc(crtc, 0); + mutex_unlock(&dev_priv->mode_info.power.pll_mutex); } static const struct drm_crtc_helper_funcs atombios_helper_funcs = { diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_atombios.c.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_atombios.c --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_atombios.c.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_atombios.c 2009-03-03 20:53:05.000000000 +0000 @@ -620,6 +620,34 @@ void radeon_atom_static_pwrmgt_setup(str atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args); } +void radeon_atom_get_mc_arb_info(struct drm_device *dev) +{ + struct drm_radeon_private *dev_priv = dev->dev_private; + struct radeon_mode_info *mode_info = &dev_priv->mode_info; + struct atom_context *ctx = mode_info->atom_context; + int index = GetIndexIntoMasterTable(DATA, MC_InitParameter); + uint8_t frev, crev; + uint16_t size, data_offset; + + atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); + dev_priv->mode_info.power.mc_arb_init_values = + kmalloc(size*sizeof(int), GFP_KERNEL); + memcpy(dev_priv->mode_info.power.mc_arb_init_values, + ctx->bios + data_offset, size * sizeof(int)); +} + +void radeon_atom_get_engine_clock(struct drm_device *dev, int *engine_clock) +{ + struct drm_radeon_private *dev_priv = dev->dev_private; + struct radeon_mode_info *mode_info = &dev_priv->mode_info; + struct atom_context *ctx = mode_info->atom_context; + GET_ENGINE_CLOCK_PS_ALLOCATION args; + int index = GetIndexIntoMasterTable(COMMAND, GetEngineClock); + + atom_execute_table(ctx, index, (uint32_t *)&args); + *engine_clock = args.ulReturnEngineClock; +} + void radeon_atom_set_engine_clock(struct drm_device *dev, int eng_clock) { struct drm_radeon_private *dev_priv = dev->dev_private; @@ -633,6 +661,18 @@ void radeon_atom_set_engine_clock(struct atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args); } +void radeon_atom_get_memory_clock(struct drm_device *dev, int *mem_clock) +{ + struct drm_radeon_private *dev_priv = dev->dev_private; + struct radeon_mode_info *mode_info = &dev_priv->mode_info; + struct atom_context *ctx = mode_info->atom_context; + GET_MEMORY_CLOCK_PS_ALLOCATION args; + int index = GetIndexIntoMasterTable(COMMAND, GetMemoryClock); + + atom_execute_table(ctx, index, (uint32_t *)&args); + *mem_clock = args.ulReturnMemoryClock; +} + void radeon_atom_set_memory_clock(struct drm_device *dev, int mem_clock) { struct drm_radeon_private *dev_priv = dev->dev_private; @@ -646,6 +686,16 @@ void radeon_atom_set_memory_clock(struct atom_execute_table(dev_priv->mode_info.atom_context, index, (uint32_t *)&args); } +void radeon_atom_initialize_memory_controller(struct drm_device *dev) +{ + struct drm_radeon_private *dev_priv = dev->dev_private; + struct atom_context *ctx = dev_priv->mode_info.atom_context; + int index = GetIndexIntoMasterTable(COMMAND, MemoryDeviceInit); + MEMORY_PLLINIT_PS_ALLOCATION args; + + atom_execute_table(ctx, index, (uint32_t *)&args); +} + void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev) { struct drm_radeon_private *dev_priv = dev->dev_private; diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cp.c.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cp.c --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cp.c.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cp.c 2009-03-03 20:53:05.000000000 +0000 @@ -3223,6 +3223,8 @@ int radeon_driver_load(struct drm_device if (ret) goto modeset_fail; + mutex_init(&dev_priv->mode_info.power.pll_mutex); + radeon_modeset_init(dev); radeon_modeset_cp_init(dev); @@ -3231,7 +3233,7 @@ int radeon_driver_load(struct drm_device drm_irq_install(dev); } - + radeon_pm_init(dev); return ret; modeset_fail: dev->driver->driver_features &= ~DRIVER_MODESET; @@ -3303,6 +3305,8 @@ int radeon_driver_unload(struct drm_devi { drm_radeon_private_t *dev_priv = dev->dev_private; + radeon_pm_exit(dev); + if (drm_core_check_feature(dev, DRIVER_MODESET)) { drm_irq_uninstall(dev); radeon_modeset_cleanup(dev); diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cs.c.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cs.c --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cs.c.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_cs.c 2009-03-03 20:53:05.000000000 +0000 @@ -41,6 +41,8 @@ int radeon_cs_ioctl(struct drm_device *d long size; int r, i; + radeon_pm_timer_reset(dev); + mutex_lock(&dev_priv->cs.cs_mutex); /* set command stream id to 0 which is fake id */ cs_id = 0; diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_drv.h.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_drv.h --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_drv.h.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_drv.h 2009-03-03 20:53:05.000000000 +0000 @@ -612,6 +612,9 @@ extern int radeon_modeset_cp_resume(stru /* radeon_pm.c */ int radeon_suspend(struct drm_device *dev, pm_message_t state); int radeon_resume(struct drm_device *dev); +void radeon_pm_init(struct drm_device *dev); +void radeon_pm_exit(struct drm_device *dev); +void radeon_pm_timer_reset(struct drm_device *dev); /* Flags for stats.boxes */ diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_irq.c.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_irq.c --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_irq.c.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_irq.c 2009-03-03 20:53:05.000000000 +0000 @@ -185,8 +185,10 @@ irqreturn_t radeon_driver_irq_handler(DR struct drm_device *dev = (struct drm_device *) arg; drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; + struct radeon_powermanagement_info *power = &dev_priv->mode_info.power; u32 stat; u32 r500_disp_int; + unsigned long flags; /* Only consider the bits we're interested in - others could be used * outside the DRM @@ -206,15 +208,47 @@ irqreturn_t radeon_driver_irq_handler(DR /* VBLANK interrupt */ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) { - if (r500_disp_int & R500_D1_VBLANK_INTERRUPT) + if (r500_disp_int & R500_D1_VBLANK_INTERRUPT) { + spin_lock_irqsave(&power->power_lock, flags); + if (power->reclock_head & 1) { + power->reclock_head &= ~1; + schedule_work(&power->reclock_work); + drm_vblank_put(dev, 0); + } + spin_unlock_irqrestore(&power->power_lock, flags); drm_handle_vblank(dev, 0); - if (r500_disp_int & R500_D2_VBLANK_INTERRUPT) + } + if (r500_disp_int & R500_D2_VBLANK_INTERRUPT) { + spin_lock_irqsave(&power->power_lock, flags); + if (power->reclock_head & 2) { + power->reclock_head &= ~2; + schedule_work(&power->reclock_work); + drm_vblank_put(dev, 1); + } + spin_unlock_irqrestore(&power->power_lock, flags); drm_handle_vblank(dev, 1); + } } else { - if (stat & RADEON_CRTC_VBLANK_STAT) + if (stat & RADEON_CRTC_VBLANK_STAT) { + spin_lock_irqsave(&power->power_lock, flags); + if (power->reclock_head & 1) { + power->reclock_head &= ~1; + schedule_work(&power->reclock_work); + drm_vblank_put(dev, 0); + } + spin_unlock_irqrestore(&power->power_lock, flags); drm_handle_vblank(dev, 0); - if (stat & RADEON_CRTC2_VBLANK_STAT) + } + if (stat & RADEON_CRTC2_VBLANK_STAT) { + spin_lock_irqsave(&power->power_lock, flags); + if (power->reclock_head & 2) { + power->reclock_head &= ~2; + schedule_work(&power->reclock_work); + drm_vblank_put(dev, 1); + } + spin_unlock_irqrestore(&power->power_lock, flags); drm_handle_vblank(dev, 1); + } } return IRQ_HANDLED; } diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_mode.h.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_mode.h --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_mode.h.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_mode.h 2009-03-03 20:53:05.000000000 +0000 @@ -173,6 +173,22 @@ struct radeon_i2c_chan { struct radeon_i2c_bus_rec rec; }; +struct radeon_powermanagement_info { + struct timer_list idle_power_timer; + struct work_struct reclock_work; + struct drm_device *dev; + uint32_t orig_memory_clock; + uint32_t orig_engine_clock; + uint32_t *mc_arb_init_values; + uint8_t orig_fbdiv; + int new_mem_clock; + int new_engine_clock; + int current_clock_state; + int reclock_head; + struct mutex pll_mutex; + spinlock_t power_lock; +}; + struct radeon_mode_info { struct atom_context *atom_context; struct radeon_bios_connector bios_connector[RADEON_MAX_BIOS_CONNECTOR]; @@ -182,6 +198,9 @@ struct radeon_mode_info { struct radeon_pll mpll; uint32_t mclk; uint32_t sclk; + + /* power management */ + struct radeon_powermanagement_info power; }; struct radeon_crtc { @@ -307,6 +326,12 @@ extern int radeon_crtc_cursor_move(struc extern bool radeon_atom_get_clock_info(struct drm_device *dev); extern bool radeon_combios_get_clock_info(struct drm_device *dev); +extern void radeon_atom_get_engine_clock(struct drm_device *dev, int *engine_clock); +extern void radeon_atom_get_memory_clock(struct drm_device *dev, int *memory_clock); +extern void radeon_atom_set_engine_clock(struct drm_device *dev, int engine_clock); +extern void radeon_atom_set_memory_clock(struct drm_device *dev, int memory_clock); +extern void radeon_atom_initialize_memory_controller(struct drm_device *dev); +extern void radeon_atom_get_mc_arb_info(struct drm_device *dev); extern void radeon_atombios_get_lvds_info(struct radeon_encoder *encoder); extern void radeon_atombios_get_tmds_info(struct radeon_encoder *encoder); extern bool radeon_combios_get_lvds_info(struct radeon_encoder *encoder); diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_pm.c.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_pm.c --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_pm.c.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_pm.c 2009-03-03 20:53:05.000000000 +0000 @@ -31,6 +31,8 @@ #include "drm_crtc_helper.h" +#define RADEON_DOWNCLOCK_IDLE_MS 30 + int radeon_suspend(struct drm_device *dev, pm_message_t state) { struct drm_radeon_private *dev_priv = dev->dev_private; @@ -255,3 +257,214 @@ bool radeon_set_pcie_lanes(struct drm_de return false; } +static void radeon_pm_set_engine_clock(struct drm_device *dev, int freq) +{ + drm_radeon_private_t *dev_priv = dev->dev_private; + + if (dev_priv->is_atom_bios) + radeon_atom_set_engine_clock(dev, freq); +} + +static void radeon_pm_set_memory_clock(struct drm_device *dev, int freq) +{ + drm_radeon_private_t *dev_priv = dev->dev_private; + struct radeon_powermanagement_info *power = &dev_priv->mode_info.power; + + mutex_lock(&power->pll_mutex); + radeon_do_cp_idle(dev_priv); + if (dev_priv->is_atom_bios) { + int mpll, spll, hclk, sclk, fbdiv, index, factor; + switch (dev_priv->chip_family) { + case CHIP_R520: + case CHIP_RV530: + case CHIP_RV560: + case CHIP_RV570: + case CHIP_R580: + mpll = RADEON_READ_PLL(dev_priv, MPLL_FUNC_CNTL); + fbdiv = (mpll & 0x1fe0) >> 5; + + /* Set new fbdiv */ + factor = power->orig_memory_clock / freq; + fbdiv = power->orig_fbdiv / factor; + + mpll &= ~0x1fe0; + mpll |= ((fbdiv << 5) | (1 << 24)); + mpll &= ~(1 << 25); + + spll = RADEON_READ_PLL(dev_priv, SPLL_FUNC_CNTL); + + hclk = fbdiv << 5; + hclk += 0x20; + hclk *= 8; + + sclk = spll & 0x1fe0; + sclk += 0x20; + sclk *= 6; + sclk = sclk >> 5; + + index = (hclk/sclk); + + R500_WRITE_MCIND(R530_MC_ARB_RATIO_CLK_SEQ, + power->mc_arb_init_values[index]); + RADEON_WRITE_PLL(dev_priv, MPLL_FUNC_CNTL, mpll); + radeon_atom_initialize_memory_controller(dev); + break; + } + } + + mutex_unlock(&power->pll_mutex); +} + +static int radeon_pm_get_active_crtcs(struct drm_device *dev, int *crtcs) +{ + struct drm_crtc *crtc; + int count = 0; + struct radeon_crtc *radeon_crtc; + + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + radeon_crtc = to_radeon_crtc(crtc); + if (crtc->enabled) { + count++; + *crtcs |= (1 << radeon_crtc->crtc_id); + } + } + return count; +} + + +static void radeon_pm_perform_transition(struct drm_device *dev) +{ + drm_radeon_private_t *dev_priv = dev->dev_private; + struct radeon_powermanagement_info *power = &dev_priv->mode_info.power; + int crtcs = 0, count; + unsigned long flags; + + count = radeon_pm_get_active_crtcs(dev, &crtcs); + + spin_lock_irqsave(&power->power_lock, flags); + switch (count) { + case 0: + schedule_work(&power->reclock_work); + break; + case 1: + if (power->reclock_head) + break; + if (crtcs & 1) { + power->reclock_head |= 1; + drm_vblank_get(dev, 0); + } else { + power->reclock_head |= 2; + drm_vblank_get(dev, 1); + } + break; + default: + /* Too many active heads */ + break; + } + spin_unlock_irqrestore(&power->power_lock, flags); +} + + +static int radeon_pm_set_runtime_power(struct drm_device *dev, int value) +{ + drm_radeon_private_t *dev_priv = dev->dev_private; + struct radeon_powermanagement_info *power = &dev_priv->mode_info.power; + + if (power->current_clock_state == value) + return 1; + + switch (value) { + case 0: + power->new_engine_clock = 100*100; + power->new_mem_clock = 100*100; + break; + case 1: + power->new_engine_clock = power->orig_engine_clock; + power->new_mem_clock = power->orig_memory_clock; + break; + } + + power->current_clock_state = value; + radeon_pm_perform_transition(dev); + + return 0; +} + +static void radeon_pm_idle_timeout(unsigned long d) +{ + struct drm_device *dev = (struct drm_device *)d; + drm_radeon_private_t *dev_priv = dev->dev_private; + + radeon_pm_set_runtime_power(dev, 0); +} + +static void radeon_pm_reclock_callback(struct work_struct *work) +{ + struct radeon_powermanagement_info *power = + container_of(work, struct radeon_powermanagement_info, + reclock_work); + struct drm_device *dev = power->dev; + drm_radeon_private_t *dev_priv = dev->dev_private; + + mutex_lock(&dev_priv->cs.cs_mutex); + radeon_pm_set_memory_clock(dev, power->new_mem_clock); + radeon_pm_set_engine_clock(dev, power->new_engine_clock); + mutex_unlock(&dev_priv->cs.cs_mutex); +} + +void radeon_pm_timer_reset(struct drm_device *dev) +{ + drm_radeon_private_t *dev_priv = dev->dev_private; + struct radeon_powermanagement_info *power = &dev_priv->mode_info.power; + + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return; + + radeon_pm_set_runtime_power(dev, 1); + + mod_timer(&power->idle_power_timer, + jiffies + msecs_to_jiffies(RADEON_DOWNCLOCK_IDLE_MS)); +} + +void radeon_pm_init(struct drm_device *dev) +{ + drm_radeon_private_t *dev_priv = dev->dev_private; + struct radeon_powermanagement_info *power = &dev_priv->mode_info.power; + + power->dev = dev; + + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return; + + if (dev_priv->is_atom_bios) { + int mpll; + radeon_atom_get_mc_arb_info(dev); + radeon_atom_get_engine_clock(dev, &power->orig_engine_clock); + radeon_atom_get_memory_clock(dev, &power->orig_memory_clock); + + mpll = RADEON_READ_PLL(dev_priv, MPLL_FUNC_CNTL); + dev_priv->mode_info.power.orig_fbdiv = (mpll & 0x1fe0) >> 5; + } + + setup_timer(&power->idle_power_timer, radeon_pm_idle_timeout, + (unsigned long)dev); + INIT_WORK(&power->reclock_work, radeon_pm_reclock_callback); + + spin_lock_init(&power->power_lock); + + power->current_clock_state = 1; + power->reclock_head = 0; + + radeon_pm_timer_reset(dev); +} + +void radeon_pm_exit(struct drm_device *dev) +{ + drm_radeon_private_t *dev_priv = dev->dev_private; + struct radeon_powermanagement_info *power = &dev_priv->mode_info.power; + + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + return; + + del_timer_sync(&power->idle_power_timer); +} diff -up linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_reg.h.mjg linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_reg.h --- linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_reg.h.mjg 2009-03-03 19:41:48.000000000 +0000 +++ linux-2.6.28.x86_64/drivers/gpu/drm/radeon/radeon_reg.h 2009-03-03 20:53:05.000000000 +0000 @@ -303,6 +303,28 @@ # define RADEON_PLL_WR_EN (1 << 7) # define RADEON_PLL_DIV_SEL (3 << 8) # define RADEON_PLL2_DIV_SEL_MASK ~(3 << 8) +#define SPLL_FUNC_CNTL 0x0000 +#define MPLL_FUNC_CNTL 0x0004 +#define GENERAL_PWRMGT 0x0008 +# define RADEON_GLOBAL_PWRMGT_EN (1 << 0) +#define SCLK_PWRMGT_CNTL 0x0009 +# define RADEON_SCLK_PWRMGT_OFF (1 << 0) +#define MCLK_PWRMGT_CNTL 0x000a +# define RADEON_MCLK_PWRMGT_OFF (1 << 0) +#define DYN_PWRMGT_SCLK_CNTL 0x000b +# define RADEON_ENGINE_DYNCLK_MODE (1 << 0) +# define RADEON_STATIC_SCREEN_EN (1 << 20) +# define RADEON_CLIENT_SELECT_POWER_EN (1 << 21) +#define DYN_SCLK_PWMEN_PIPE 0x000d +# define RADEON_PIPE_3D_NOT_AUTO (1 << 8) +#define DYN_SCLK_VOL_CNTL 0x000e +# define RADEON_IO_CG_VOLTAGE_DROP (1 << 0) +# define RADEON_VOLTAGE_DROP_SYNC (1 << 2) +#define CP_DYN_CNTL 0x000f +# define RADEON_CP_FORCEON (1 << 0) +# define RADEON_CP_LOWER_POWER_IGNORE (1 << 20) +# define RADEON_CP_NORMAL_POWER_IGNORE (1 << 21) +# define RADEON_CP_NORMAL_POWER_BUSY (1 << 24) #define RADEON_CLK_PWRMGT_CNTL 0x0014 # define RADEON_ENGIN_DYNCLK_MODE (1 << 12) # define RADEON_ACTIVE_HILO_LAT_MASK (3 << 13) @@ -3961,7 +3983,48 @@ # define AVIVO_I2C_RESET (1 << 8) #define R600_GENERAL_PWRMGT 0x618 +# define R600_GLOBAL_PWRMGT_EN (1 << 0) +# define R600_STATIC_PM_EN (1 << 1) +# define R600_MOBILE_SU (1 << 2) +# define R600_THERMAL_PROTECTION_DIS (1 << 3) +# define R600_THERMAL_PROTECTION_TYPE (1 << 4) +# define R600_ENABLE_GEN2PCIE (1 << 5) +# define R600_SW_GPIO_INDEX (1 << 6) +# define R600_LOW_VOLT_D2_ACPI (1 << 8) +# define R600_LOW_VOLT_D3_ACPI (1 << 9) +# define R600_VOLT_PWRMGT_EN (1 << 10) # define R600_OPEN_DRAIN_PADS (1 << 11) +# define R600_AVP_SCLK_EN (1 << 12) +# define R600_IDCT_SCLK_EN (1 << 13) +# define R600_GPU_COUNTER_ACPI (1 << 14) +# define R600_COUNTER_CLK (1 << 15) +# define R600_BACKBIAS_PAD_EN (1 << 16) +# define R600_BACKBIAS_VALUE (1 << 17) +# define R600_BACKBIAS_DPM_CNTL (1 << 18) +# define R600_SPREAD_SPECTRUM_INDEX (1 << 19) +# define R600_DYN_SPREAD_SPECTRUM_EN (1 << 21) + +#define R600_SCLK_PWRMGT_CNTL 0x620 +# define R600_SCLK_PWRMGT_OFF (1 << 0) +# define R600_SCLK_TURNOFF (1 << 1) +# define R600_SPLL_TURNOFF (1 << 2) +# define R600_SU_SCLK_USE_BCLK (1 << 3) +# define R600_DYNAMIC_GFX_ISLAND_PWR_DOWN (1 << 4) +# define R600_DYNAMIC_GFX_ISLAND_LP (1 << 5) +# define R600_CLK_TURN_ON_STAGGER (1 << 6) +# define R600_CLK_TURN_OFF_STAGGER (1 << 7) +# define R600_FIR_FORCE_TREND_SEL (1 << 8) +# define R600_FIR_TREND_MODE (1 << 9) +# define R600_DYN_GFX_CLK_OFF_EN (1 << 10) +# define R600_VDDC3D_TURNOFF_D1 (1 << 11) +# define R600_VDDC3D_TURNOFF_D2 (1 << 12) +# define R600_VDDC3D_TURNOFF_D3 (1 << 13) +# define R600_SPLL_TURNOFF_D2 (1 << 14) +# define R600_SCLK_LOW_D1 (1 << 15) +# define R600_DYN_GFX_CLK_OFF_MC_EN (1 << 16) + +#define R600_MCLK_PWRMGT_CNTL 0x624 +# define R600_MPLL_PWRMGT_OFF (1 << 0) #define R600_LOWER_GPIO_ENABLE 0x710 #define R600_CTXSW_VID_LOWER_GPIO_CNTL 0x718 @@ -5331,5 +5394,6 @@ # define R500_RS_IP_OFFSET_EN (1 << 31) #define R500_DYN_SCLK_PWMEM_PIPE 0x000d /* PLL */ +#define R530_MC_ARB_RATIO_CLK_SEQ 0x0016 /* MC */ #endif git-bluetooth.patch: --- NEW FILE git-bluetooth.patch --- commit b1fb06830dc870d862f7f80e276130c0ab84d59f Author: Wei Yongjun Date: Wed Feb 25 18:09:33 2009 +0800 Bluetooth: Remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: Marcel Holtmann commit 7585b97a48180f754ebdade1be94092e36bef365 Author: Wei Yongjun Date: Wed Feb 25 18:29:52 2009 +0800 Bluetooth: Remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: Marcel Holtmann commit 2ae9a6be5f476f3512839a4d11a8f432bfd2914c Author: Dave Young Date: Sat Feb 21 16:13:34 2009 +0800 Bluetooth: Move hci_conn_del_sysfs() back to avoid device destruct too early The following commit introduce a regression: commit 7d0db0a373195385a2e0b19d1f5e4b186fdcffac Author: Marcel Holtmann Date: Mon Jul 14 20:13:51 2008 +0200 [Bluetooth] Use a more unique bus name for connections I get panic as following (by netconsole): [ 2709.344034] usb 5-1: new full speed USB device using uhci_hcd and address 4 [ 2709.505776] usb 5-1: configuration #1 chosen from 1 choice [ 2709.569207] Bluetooth: Generic Bluetooth USB driver ver 0.4 [ 2709.570169] usbcore: registered new interface driver btusb [ 2845.742781] BUG: unable to handle kernel paging request at 6b6b6c2f [ 2845.742958] IP: [] __lock_acquire+0x6c/0xa80 [ 2845.743087] *pde = 00000000 [ 2845.743206] Oops: 0002 [#1] SMP [ 2845.743377] last sysfs file: /sys/class/bluetooth/hci0/hci0:6/type [ 2845.743742] Modules linked in: btusb netconsole snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss rfcomm l2cap bluetooth vfat fuse snd_hda_codec_idt snd_hda_intel snd_hda_codec snd_hwdep snd_pcm pl2303 snd_timer psmouse usbserial snd 3c59x e100 serio_raw soundcore i2c_i801 intel_agp mii agpgart snd_page_alloc rtc_cmos rtc_core thermal processor rtc_lib button thermal_sys sg evdev [ 2845.743742] [ 2845.743742] Pid: 0, comm: swapper Not tainted (2.6.29-rc5-smp #54) Dell DM051 [ 2845.743742] EIP: 0060:[] EFLAGS: 00010002 CPU: 0 [ 2845.743742] EIP is at __lock_acquire+0x6c/0xa80 [ 2845.743742] EAX: 00000046 EBX: 00000046 ECX: 6b6b6b6b EDX: 00000002 [ 2845.743742] ESI: 6b6b6b6b EDI: 00000000 EBP: c064fd14 ESP: c064fcc8 [ 2845.743742] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 [ 2845.743742] Process swapper (pid: 0, ti=c064e000 task=c05d1400 task.ti=c064e000) [ 2845.743742] Stack: [ 2845.743742] c05d1400 00000002 c05d1400 00000001 00000002 00000000 f65388dc c05d1400 [ 2845.743742] 6b6b6b6b 00000292 c064fd0c c0153732 00000000 00000000 00000001 f700fa50 [ 2845.743742] 00000046 00000000 00000000 c064fd40 c0155be6 00000000 00000002 00000001 [ 2845.743742] Call Trace: [ 2845.743742] [] ? trace_hardirqs_on_caller+0x72/0x1c0 [ 2845.743742] [] ? lock_acquire+0x76/0xa0 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] ? _spin_lock_irqsave+0x45/0x80 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] ? skb_queue_purge+0x14/0x20 [ 2845.743742] [] ? hci_conn_del+0x10a/0x1c0 [bluetooth] [ 2845.743742] [] ? l2cap_disconn_ind+0x59/0xb0 [l2cap] [ 2845.743742] [] ? hci_conn_del_sysfs+0x8e/0xd0 [bluetooth] [ 2845.743742] [] ? hci_event_packet+0x5f8/0x31c0 [bluetooth] [ 2845.743742] [] ? sock_def_readable+0x59/0x80 [ 2845.743742] [] ? _read_unlock+0x1d/0x20 [ 2845.743742] [] ? hci_send_to_sock+0xe9/0x1d0 [bluetooth] [ 2845.743742] [] ? trace_hardirqs_on+0xb/0x10 [ 2845.743742] [] ? hci_rx_task+0x2ba/0x490 [bluetooth] [ 2845.743742] [] ? tasklet_action+0x31/0xc0 [ 2845.743742] [] ? tasklet_action+0x4c/0xc0 [ 2845.743742] [] ? __do_softirq+0xa7/0x170 [ 2845.743742] [] ? ack_apic_level+0x5c/0x1c0 [ 2845.743742] [] ? do_softirq+0x57/0x60 [ 2845.743742] [] ? irq_exit+0x7c/0x90 [ 2845.743742] [] ? do_IRQ+0x4b/0x90 [ 2845.743742] [] ? irq_exit+0x75/0x90 [ 2845.743742] [] ? common_interrupt+0x2c/0x34 [ 2845.743742] [] ? mwait_idle+0x4f/0x70 [ 2845.743742] [] ? cpu_idle+0x65/0xb0 [ 2845.743742] [] ? rest_init+0x4e/0x60 [ 2845.743742] Code: 0f 84 69 02 00 00 83 ff 07 0f 87 1e 06 00 00 85 ff 0f 85 08 05 00 00 8b 4d cc 8b 49 04 85 c9 89 4d d4 0f 84 f7 04 00 00 8b 75 d4 ff 86 c4 00 00 00 89 f0 e8 56 a9 ff ff 85 c0 0f 85 6e 03 00 [ 2845.743742] EIP: [] __lock_acquire+0x6c/0xa80 SS:ESP 0068:c064fcc8 [ 2845.743742] ---[ end trace 4c985b38f022279f ]--- [ 2845.743742] Kernel panic - not syncing: Fatal exception in interrupt [ 2845.743742] ------------[ cut here ]------------ [ 2845.743742] WARNING: at kernel/smp.c:329 smp_call_function_many+0x151/0x200() [ 2845.743742] Hardware name: Dell DM051 [ 2845.743742] Modules linked in: btusb netconsole snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss rfcomm l2cap bluetooth vfat fuse snd_hda_codec_idt snd_hda_intel snd_hda_codec snd_hwdep snd_pcm pl2303 snd_timer psmouse usbserial snd 3c59x e100 serio_raw soundcore i2c_i801 intel_agp mii agpgart snd_page_alloc rtc_cmos rtc_core thermal processor rtc_lib button thermal_sys sg evdev [ 2845.743742] Pid: 0, comm: swapper Tainted: G D 2.6.29-rc5-smp #54 [ 2845.743742] Call Trace: [ 2845.743742] [] warn_slowpath+0x86/0xa0 [ 2845.743742] [] ? trace_hardirqs_off+0xb/0x10 [ 2845.743742] [] ? up+0x14/0x40 [ 2845.743742] [] ? release_console_sem+0x31/0x1e0 [ 2845.743742] [] ? _spin_lock_irqsave+0x6b/0x80 [ 2845.743742] [] ? trace_hardirqs_off+0xb/0x10 [ 2845.743742] [] ? _read_lock_irqsave+0x40/0x80 [ 2845.743742] [] ? release_console_sem+0x1c2/0x1e0 [ 2845.743742] [] ? up+0x14/0x40 [ 2845.743742] [] ? trace_hardirqs_off+0xb/0x10 [ 2845.743742] [] ? __mutex_unlock_slowpath+0x97/0x160 [ 2845.743742] [] ? mutex_trylock+0xb3/0x180 [ 2845.743742] [] ? mutex_unlock+0x8/0x10 [ 2845.743742] [] smp_call_function_many+0x151/0x200 [ 2845.743742] [] ? stop_this_cpu+0x0/0x40 [ 2845.743742] [] smp_call_function+0x21/0x30 [ 2845.743742] [] native_smp_send_stop+0x1e/0x50 [ 2845.743742] [] panic+0x55/0x110 [ 2845.743742] [] oops_end+0xb8/0xc0 [ 2845.743742] [] die+0x4f/0x70 [ 2845.743742] [] do_page_fault+0x269/0x610 [ 2845.743742] [] ? do_page_fault+0x0/0x610 [ 2845.743742] [] error_code+0x77/0x7c [ 2845.743742] [] ? __lock_acquire+0x6c/0xa80 [ 2845.743742] [] ? trace_hardirqs_on_caller+0x72/0x1c0 [ 2845.743742] [] lock_acquire+0x76/0xa0 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] _spin_lock_irqsave+0x45/0x80 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] skb_dequeue+0x1d/0x70 [ 2845.743742] [] skb_queue_purge+0x14/0x20 [ 2845.743742] [] hci_conn_del+0x10a/0x1c0 [bluetooth] [ 2845.743742] [] ? l2cap_disconn_ind+0x59/0xb0 [l2cap] [ 2845.743742] [] ? hci_conn_del_sysfs+0x8e/0xd0 [bluetooth] [ 2845.743742] [] hci_event_packet+0x5f8/0x31c0 [bluetooth] [ 2845.743742] [] ? sock_def_readable+0x59/0x80 [ 2845.743742] [] ? _read_unlock+0x1d/0x20 [ 2845.743742] [] ? hci_send_to_sock+0xe9/0x1d0 [bluetooth] [ 2845.743742] [] ? trace_hardirqs_on+0xb/0x10 [ 2845.743742] [] hci_rx_task+0x2ba/0x490 [bluetooth] [ 2845.743742] [] ? tasklet_action+0x31/0xc0 [ 2845.743742] [] tasklet_action+0x4c/0xc0 [ 2845.743742] [] __do_softirq+0xa7/0x170 [ 2845.743742] [] ? ack_apic_level+0x5c/0x1c0 [ 2845.743742] [] do_softirq+0x57/0x60 [ 2845.743742] [] irq_exit+0x7c/0x90 [ 2845.743742] [] do_IRQ+0x4b/0x90 [ 2845.743742] [] ? irq_exit+0x75/0x90 [ 2845.743742] [] common_interrupt+0x2c/0x34 [ 2845.743742] [] ? mwait_idle+0x4f/0x70 [ 2845.743742] [] cpu_idle+0x65/0xb0 [ 2845.743742] [] rest_init+0x4e/0x60 [ 2845.743742] ---[ end trace 4c985b38f02227a0 ]--- [ 2845.743742] ------------[ cut here ]------------ [ 2845.743742] WARNING: at kernel/smp.c:226 smp_call_function_single+0x8e/0x110() [ 2845.743742] Hardware name: Dell DM051 [ 2845.743742] Modules linked in: btusb netconsole snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss rfcomm l2cap bluetooth vfat fuse snd_hda_codec_idt snd_hda_intel snd_hda_codec snd_hwdep snd_pcm pl2303 snd_timer psmouse usbserial snd 3c59x e100 serio_raw soundcore i2c_i801 intel_agp mii agpgart snd_page_alloc rtc_cmos rtc_core thermal processor rtc_lib button thermal_sys sg evdev [ 2845.743742] Pid: 0, comm: swapper Tainted: G D W 2.6.29-rc5-smp #54 [ 2845.743742] Call Trace: [ 2845.743742] [] warn_slowpath+0x86/0xa0 [ 2845.743742] [] ? warn_slowpath+0x10/0xa0 [ 2845.743742] [] ? trace_hardirqs_off+0xb/0x10 [ 2845.743742] [] ? up+0x14/0x40 [ 2845.743742] [] ? release_console_sem+0x31/0x1e0 [ 2845.743742] [] ? _spin_lock_irqsave+0x6b/0x80 [ 2845.743742] [] ? trace_hardirqs_off+0xb/0x10 [ 2845.743742] [] ? _read_lock_irqsave+0x40/0x80 [ 2845.743742] [] ? release_console_sem+0x1c2/0x1e0 [ 2845.743742] [] ? up+0x14/0x40 [ 2845.743742] [] smp_call_function_single+0x8e/0x110 [ 2845.743742] [] ? stop_this_cpu+0x0/0x40 [ 2845.743742] [] ? cpumask_next_and+0x1f/0x40 [ 2845.743742] [] smp_call_function_many+0x11a/0x200 [ 2845.743742] [] ? stop_this_cpu+0x0/0x40 [ 2845.743742] [] smp_call_function+0x21/0x30 [ 2845.743742] [] native_smp_send_stop+0x1e/0x50 [ 2845.743742] [] panic+0x55/0x110 [ 2845.743742] [] oops_end+0xb8/0xc0 [ 2845.743742] [] die+0x4f/0x70 [ 2845.743742] [] do_page_fault+0x269/0x610 [ 2845.743742] [] ? do_page_fault+0x0/0x610 [ 2845.743742] [] error_code+0x77/0x7c [ 2845.743742] [] ? __lock_acquire+0x6c/0xa80 [ 2845.743742] [] ? trace_hardirqs_on_caller+0x72/0x1c0 [ 2845.743742] [] lock_acquire+0x76/0xa0 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] _spin_lock_irqsave+0x45/0x80 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] skb_dequeue+0x1d/0x70 [ 2845.743742] [] skb_queue_purge+0x14/0x20 [ 2845.743742] [] hci_conn_del+0x10a/0x1c0 [bluetooth] [ 2845.743742] [] ? l2cap_disconn_ind+0x59/0xb0 [l2cap] [ 2845.743742] [] ? hci_conn_del_sysfs+0x8e/0xd0 [bluetooth] [ 2845.743742] [] hci_event_packet+0x5f8/0x31c0 [bluetooth] [ 2845.743742] [] ? sock_def_readable+0x59/0x80 [ 2845.743742] [] ? _read_unlock+0x1d/0x20 [ 2845.743742] [] ? hci_send_to_sock+0xe9/0x1d0 [bluetooth] [ 2845.743742] [] ? trace_hardirqs_on+0xb/0x10 [ 2845.743742] [] hci_rx_task+0x2ba/0x490 [bluetooth] [ 2845.743742] [] ? tasklet_action+0x31/0xc0 [...2945 lines suppressed...] + case BT_SECURITY_HIGH: + opt = RFCOMM_LM_AUTH | RFCOMM_LM_ENCRYPT | + RFCOMM_LM_SECURE; + break; + default: + opt = 0; + break; + } + + if (rfcomm_pi(sk)->role_switch) + opt |= RFCOMM_LM_MASTER; + + if (put_user(opt, (u32 __user *) optval)) err = -EFAULT; break; case RFCOMM_CONNINFO: - if (sk->sk_state != BT_CONNECTED) { + if (sk->sk_state != BT_CONNECTED && + !rfcomm_pi(sk)->dlc->defer_setup) { err = -ENOTCONN; break; } @@ -785,6 +896,60 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c return err; } +static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen) +{ + struct sock *sk = sock->sk; + struct bt_security sec; + int len, err = 0; + + BT_DBG("sk %p", sk); + + if (level == SOL_RFCOMM) + return rfcomm_sock_getsockopt_old(sock, optname, optval, optlen); + + if (level != SOL_BLUETOOTH) + return -ENOPROTOOPT; + + if (get_user(len, optlen)) + return -EFAULT; + + lock_sock(sk); + + switch (optname) { + case BT_SECURITY: + if (sk->sk_type != SOCK_STREAM) { + err = -EINVAL; + break; + } + + sec.level = rfcomm_pi(sk)->sec_level; + + len = min_t(unsigned int, len, sizeof(sec)); + if (copy_to_user(optval, (char *) &sec, len)) + err = -EFAULT; + + break; + + case BT_DEFER_SETUP: + if (sk->sk_state != BT_BOUND && sk->sk_state != BT_LISTEN) { + err = -EINVAL; + break; + } + + if (put_user(bt_sk(sk)->defer_setup, (u32 __user *) optval)) + err = -EFAULT; + + break; + + default: + err = -ENOPROTOOPT; + break; + } + + release_sock(sk); + return err; +} + static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) { struct sock *sk __maybe_unused = sock->sk; @@ -888,6 +1053,10 @@ int rfcomm_connect_ind(struct rfcomm_session *s, u8 channel, struct rfcomm_dlc * done: bh_unlock_sock(parent); + + if (bt_sk(parent)->defer_setup) + parent->sk_state_change(parent); + return result; } diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 46fd8bf..51ae0c3 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -195,7 +195,7 @@ static int sco_connect(struct sock *sk) else type = SCO_LINK; - hcon = hci_connect(hdev, type, dst, HCI_AT_NO_BONDING); + hcon = hci_connect(hdev, type, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING); if (!hcon) goto done; @@ -668,7 +668,7 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, char return err; } -static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen) +static int sco_sock_getsockopt_old(struct socket *sock, int optname, char __user *optval, int __user *optlen) { struct sock *sk = sock->sk; struct sco_options opts; @@ -723,6 +723,31 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char return err; } +static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen) +{ + struct sock *sk = sock->sk; + int len, err = 0; + + BT_DBG("sk %p", sk); + + if (level == SOL_SCO) + return sco_sock_getsockopt_old(sock, optname, optval, optlen); + + if (get_user(len, optlen)) + return -EFAULT; + + lock_sock(sk); + + switch (optname) { + default: + err = -ENOPROTOOPT; + break; + } + + release_sock(sk); + return err; +} + static int sco_sock_release(struct socket *sock) { struct sock *sk = sock->sk; @@ -832,10 +857,30 @@ done: /* ----- SCO interface with lower layer (HCI) ----- */ static int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 type) { + register struct sock *sk; + struct hlist_node *node; + int lm = 0; + + if (type != SCO_LINK && type != ESCO_LINK) + return 0; + BT_DBG("hdev %s, bdaddr %s", hdev->name, batostr(bdaddr)); - /* Always accept connection */ - return HCI_LM_ACCEPT; + /* Find listening sockets */ + read_lock(&sco_sk_list.lock); + sk_for_each(sk, node, &sco_sk_list.head) { + if (sk->sk_state != BT_LISTEN) + continue; + + if (!bacmp(&bt_sk(sk)->src, &hdev->bdaddr) || + !bacmp(&bt_sk(sk)->src, BDADDR_ANY)) { + lm |= HCI_LM_ACCEPT; + break; + } + } + read_unlock(&sco_sk_list.lock); + + return lm; } static int sco_connect_cfm(struct hci_conn *hcon, __u8 status) @@ -857,7 +902,7 @@ static int sco_connect_cfm(struct hci_conn *hcon, __u8 status) return 0; } -static int sco_disconn_ind(struct hci_conn *hcon, __u8 reason) +static int sco_disconn_cfm(struct hci_conn *hcon, __u8 reason) { BT_DBG("hcon %p reason %d", hcon, reason); @@ -940,7 +985,7 @@ static struct hci_proto sco_hci_proto = { .id = HCI_PROTO_SCO, .connect_ind = sco_connect_ind, .connect_cfm = sco_connect_cfm, - .disconn_ind = sco_disconn_ind, + .disconn_cfm = sco_disconn_cfm, .recv_scodata = sco_recv_scodata }; hda_intel-prealloc-4mb-dmabuffer.patch: --- NEW FILE hda_intel-prealloc-4mb-dmabuffer.patch --- diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index c8d9178..7d3bb15 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1774,6 +1774,7 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec, struct azx_pcm *apcm; int pcm_dev = cpcm->device; int s, err; + size_t prealloc_min = 64*1024; /* 64KB */ if (pcm_dev >= AZX_MAX_PCMS) { snd_printk(KERN_ERR SFX "Invalid PCM device number %d\n", @@ -1807,10 +1808,21 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec, if (cpcm->stream[s].substreams) snd_pcm_set_ops(pcm, s, &azx_pcm_ops); } + /* buffer pre-allocation */ + + /* subtle, don't allocate a big buffer for modems... + * also, don't just test 32BIT_MASK, since azx supports + * 64-bit DMA in some cases. + */ + /* lennart wants a 2.2MB buffer for 2sec of 48khz */ + if (pcm->dev_class == SNDRV_PCM_CLASS_GENERIC && + chip->pci->dma_mask >= DMA_32BIT_MASK) + prealloc_min = 4 * 1024 * 1024; /* 4MB */ + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(chip->pci), - 1024 * 64, 32 * 1024 * 1024); + prealloc_min, 32 * 1024 * 1024); return 0; } linux-2.6-ipw2x00-age-scan-results-on-resume.patch: --- NEW FILE linux-2.6-ipw2x00-age-scan-results-on-resume.patch --- diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 823c2bf..2d7e32c 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c @@ -1692,7 +1692,13 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred) u32 lock; u32 ord_len = sizeof(lock); - /* Quite if manually disabled. */ + /* Age scan list entries found before suspend */ + if (priv->suspend_time) { + ieee80211_networks_age(priv->ieee, priv->suspend_time); + priv->suspend_time = 0; + } + + /* Quiet if manually disabled. */ if (priv->status & STATUS_RF_KILL_SW) { IPW_DEBUG_INFO("%s: Radio is disabled by Manual Disable " "switch\n", priv->net_dev->name); @@ -6414,6 +6420,8 @@ static int ipw2100_suspend(struct pci_dev *pci_dev, pm_message_t state) pci_disable_device(pci_dev); pci_set_power_state(pci_dev, PCI_D3hot); + priv->suspend_at = get_seconds(); + mutex_unlock(&priv->action_mutex); return 0; @@ -6457,6 +6465,8 @@ static int ipw2100_resume(struct pci_dev *pci_dev) * the queue of needed */ netif_device_attach(dev); + priv->suspend_time = get_seconds() - priv->suspend_at; + /* Bring the device back up */ if (!(priv->status & STATUS_RF_KILL_SW)) ipw2100_up(priv, 0); diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h index bbf1ddc..3a65e8a 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.h +++ b/drivers/net/wireless/ipw2x00/ipw2100.h @@ -591,6 +591,10 @@ struct ipw2100_priv { int user_requested_scan; + /* Track time in suspend */ + unsigned long suspend_at; + unsigned long suspend_time; + u32 interrupts; int tx_interrupts; int rx_interrupts; diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 625f2cf..90cc346 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c @@ -11224,6 +11224,12 @@ static int ipw_up(struct ipw_priv *priv) { int rc, i, j; + /* Age scan list entries found before suspend */ + if (priv->suspend_time) { + ieee80211_networks_age(priv->ieee, priv->suspend_time); + priv->suspend_time = 0; + } + if (priv->status & STATUS_EXIT_PENDING) return -EIO; @@ -11824,6 +11830,8 @@ static int ipw_pci_suspend(struct pci_dev *pdev, pm_message_t state) pci_disable_device(pdev); pci_set_power_state(pdev, pci_choose_state(pdev, state)); + priv->suspend_at = get_seconds(); + return 0; } @@ -11859,6 +11867,8 @@ static int ipw_pci_resume(struct pci_dev *pdev) * the queue of needed */ netif_device_attach(dev); + priv->suspend_time = get_seconds() - priv->suspend_at; + /* Bring the device back up */ queue_work(priv->workqueue, &priv->up); diff --git a/drivers/net/wireless/ipw2x00/ipw2200.h b/drivers/net/wireless/ipw2x00/ipw2200.h index 277b274..9e156b9 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.h +++ b/drivers/net/wireless/ipw2x00/ipw2200.h @@ -1346,6 +1346,10 @@ struct ipw_priv { s8 tx_power; + /* Track time in suspend */ + unsigned long suspend_at; + unsigned long suspend_time; + #ifdef CONFIG_PM u32 pm_state[16]; #endif diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c index a2f5616..e062edc 100644 --- a/drivers/net/wireless/ipw2x00/libipw_module.c +++ b/drivers/net/wireless/ipw2x00/libipw_module.c @@ -105,6 +105,21 @@ static inline void ieee80211_networks_free(struct ieee80211_device *ieee) ieee->networks = NULL; } +void ieee80211_networks_age(struct ieee80211_device *ieee, + unsigned long age_secs) +{ + struct ieee80211_network *network = NULL; + unsigned long flags; + unsigned long age_jiffies = msecs_to_jiffies(age_secs * MSEC_PER_SEC); + + spin_lock_irqsave(&ieee->lock, flags); + list_for_each_entry(network, &ieee->network_list, list) { + network->last_scanned -= age_jiffies; + } + spin_unlock_irqrestore(&ieee->lock, flags); +} +EXPORT_SYMBOL(ieee80211_networks_age); + static void ieee80211_networks_initialize(struct ieee80211_device *ieee) { int i; diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c index 9c67dfa..cbdfca8 100644 --- a/drivers/net/wireless/ipw2x00/libipw_rx.c +++ b/drivers/net/wireless/ipw2x00/libipw_rx.c @@ -1615,7 +1615,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device break; if ((oldest == NULL) || - (target->last_scanned < oldest->last_scanned)) + time_before(target->last_scanned, oldest->last_scanned)) oldest = target; } diff --git a/drivers/net/wireless/ipw2x00/libipw_wx.c b/drivers/net/wireless/ipw2x00/libipw_wx.c index 31ea3ab..4528649 100644 --- a/drivers/net/wireless/ipw2x00/libipw_wx.c +++ b/drivers/net/wireless/ipw2x00/libipw_wx.c @@ -42,6 +42,16 @@ static const char *ieee80211_modes[] = { "?", "a", "b", "ab", "g", "ag", "bg", "abg" }; +static inline unsigned int elapsed_jiffies_msecs(unsigned long start) +{ + unsigned long end = jiffies; + + if (end >= start) + return jiffies_to_msecs(end - start); + + return jiffies_to_msecs(end + (MAX_JIFFY_OFFSET - start) + 1); +} + #define MAX_CUSTOM_LEN 64 static char *ieee80211_translate_scan(struct ieee80211_device *ieee, char *start, char *stop, @@ -215,8 +225,8 @@ static char *ieee80211_translate_scan(struct ieee80211_device *ieee, iwe.cmd = IWEVCUSTOM; p = custom; p += snprintf(p, MAX_CUSTOM_LEN - (p - custom), - " Last beacon: %dms ago", - jiffies_to_msecs(jiffies - network->last_scanned)); + " Last beacon: %ums ago", + elapsed_jiffies_msecs(network->last_scanned)); iwe.u.data.length = p - custom; if (iwe.u.data.length) start = iwe_stream_add_point(info, start, stop, &iwe, custom); @@ -276,15 +286,15 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee, time_after(network->last_scanned + ieee->scan_age, jiffies)) ev = ieee80211_translate_scan(ieee, ev, stop, network, info); - else + else { IEEE80211_DEBUG_SCAN("Not showing network '%s (" - "%pM)' due to age (%dms).\n", + "%pM)' due to age (%ums).\n", print_ssid(ssid, network->ssid, network->ssid_len), network->bssid, - jiffies_to_msecs(jiffies - - network-> - last_scanned)); + elapsed_jiffies_msecs( + network->last_scanned)); + } } spin_unlock_irqrestore(&ieee->lock, flags); diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index adb7cf3..7515fad 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -1119,6 +1119,9 @@ static inline int ieee80211_is_cck_rate(u8 rate) extern void free_ieee80211(struct net_device *dev); extern struct net_device *alloc_ieee80211(int sizeof_priv); +extern void ieee80211_networks_age(struct ieee80211_device *ieee, + unsigned long age_secs); + extern int ieee80211_set_encryption(struct ieee80211_device *ieee); /* ieee80211_tx.c */ linux-2.6-mac80211-age-scan-results-on-resume.patch: --- NEW FILE linux-2.6-mac80211-age-scan-results-on-resume.patch --- Backport of "cfg80211: age scan results on resume" by Dan Williams. diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 23c0ab7..0432eb6 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -450,6 +450,9 @@ struct ieee80211_channel; * wireless extensions but this is subject to reevaluation as soon as this * code is used more widely and we have a first user without wext. * + * @suspend: wiphy device needs to be suspended + * @resume: wiphy device needs to be resumed + * * @add_virtual_intf: create a new virtual interface with the given name, * must set the struct wireless_dev's iftype. * @@ -499,6 +502,9 @@ struct ieee80211_channel; * @set_channel: Set channel */ struct cfg80211_ops { + int (*suspend)(struct wiphy *wiphy); + int (*resume)(struct wiphy *wiphy); + int (*add_virtual_intf)(struct wiphy *wiphy, char *name, enum nl80211_iftype type, u32 *flags, struct vif_params *params); diff --git a/include/net/wireless.h b/include/net/wireless.h index 21c5d96..ae2d34d 100644 --- a/include/net/wireless.h +++ b/include/net/wireless.h @@ -220,6 +220,9 @@ struct wiphy { /* dir in debugfs: ieee80211/ */ struct dentry *debugfsdir; + /* time spent in suspend, in seconds */ + unsigned long suspend_duration; + char priv[0] __attribute__((__aligned__(NETDEV_ALIGN))); }; diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 9d4e4d8..691183e 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1141,6 +1141,32 @@ static int ieee80211_set_channel(struct wiphy *wiphy, return ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL); } +#ifdef CONFIG_PM +static int ieee80211_suspend(struct wiphy *wiphy) +{ + return 0; +} + +static int ieee80211_resume(struct wiphy *wiphy) +{ + struct ieee80211_local *local = wiphy_priv(wiphy); + unsigned long age_jiffies; + struct ieee80211_bss *bss; + + age_jiffies = msecs_to_jiffies(wiphy->suspend_duration * MSEC_PER_SEC); + spin_lock_bh(&local->bss_lock); + list_for_each_entry(bss, &local->bss_list, list) { + bss->last_update -= age_jiffies; + } + spin_unlock_bh(&local->bss_lock); + + return 0; +} +#else +#define ieee80211_suspend NULL +#define ieee80211_resume NULL +#endif + struct cfg80211_ops mac80211_config_ops = { .add_virtual_intf = ieee80211_add_iface, .del_virtual_intf = ieee80211_del_iface, @@ -1169,4 +1195,6 @@ struct cfg80211_ops mac80211_config_ops = { .change_bss = ieee80211_change_bss, .set_txq_params = ieee80211_set_txq_params, .set_channel = ieee80211_set_channel, + .suspend = ieee80211_suspend, + .resume = ieee80211_resume, }; diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index f5c7c33..eb43ff5 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -745,6 +745,15 @@ static void ieee80211_scan_add_ies(struct iw_request_info *info, } } +static inline unsigned int elapsed_jiffies_msecs(unsigned long start) +{ + unsigned long end = jiffies; + + if (end >= start) + return jiffies_to_msecs(end - start); + + return jiffies_to_msecs(end + (MAX_JIFFY_OFFSET - start) + 1); +} static char * ieee80211_scan_result(struct ieee80211_local *local, @@ -857,8 +866,8 @@ ieee80211_scan_result(struct ieee80211_local *local, &iwe, buf); memset(&iwe, 0, sizeof(iwe)); iwe.cmd = IWEVCUSTOM; - sprintf(buf, " Last beacon: %dms ago", - jiffies_to_msecs(jiffies - bss->last_update)); + sprintf(buf, " Last beacon: %ums ago", + elapsed_jiffies_msecs(bss->last_update)); iwe.u.data.length = strlen(buf); current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, buf); diff --git a/net/wireless/core.h b/net/wireless/core.h index f7fb9f4..a4031a9 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -41,6 +41,8 @@ struct cfg80211_registered_device { struct mutex devlist_mtx; struct list_head netdev_list; + unsigned long suspend_at; + /* must be last because of the way we do wiphy_priv(), * and it should at least be aligned to NETDEV_ALIGN */ struct wiphy wiphy __attribute__((__aligned__(NETDEV_ALIGN))); diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c index 79a3828..dc92564 100644 --- a/net/wireless/sysfs.c +++ b/net/wireless/sysfs.c @@ -55,6 +55,39 @@ static int wiphy_uevent(struct device *dev, struct kobj_uevent_env *env) } #endif +static int wiphy_suspend(struct device *dev, pm_message_t state) +{ + struct cfg80211_registered_device *rdev = dev_to_rdev(dev); + int ret = 0; + + rdev->wiphy.suspend_duration = 0; + rdev->suspend_at = get_seconds(); + + if (rdev->ops->suspend) { + rtnl_lock(); + ret = rdev->ops->suspend(&rdev->wiphy); + rtnl_unlock(); + } + + return ret; +} + +static int wiphy_resume(struct device *dev) +{ + struct cfg80211_registered_device *rdev = dev_to_rdev(dev); + int ret = 0; + + rdev->wiphy.suspend_duration = get_seconds() - rdev->suspend_at; + + if (rdev->ops->resume) { + rtnl_lock(); + ret = rdev->ops->resume(&rdev->wiphy); + rtnl_unlock(); + } + + return ret; +} + struct class ieee80211_class = { .name = "ieee80211", .owner = THIS_MODULE, @@ -63,6 +96,8 @@ struct class ieee80211_class = { #ifdef CONFIG_HOTPLUG .dev_uevent = wiphy_uevent, #endif + .suspend = wiphy_suspend, + .resume = wiphy_resume, }; int wiphy_sysfs_init(void) linux-2.6-v4l-dvb-fixes.patch: --- NEW FILE linux-2.6-v4l-dvb-fixes.patch --- diff -upr drivers/media/video/v4l2-common.c /home/v4l/tokernel/wrk/linux-2.6/drivers/media/video/v4l2-common.c --- a/drivers/media/video/v4l2-common.c 2009-02-27 22:44:26.000000000 -0300 +++ b/drivers/media/video/v4l2-common.c 2009-01-06 22:29:51.000000000 -0200 @@ -547,7 +547,6 @@ int v4l2_ctrl_query_fill(struct v4l2_que case V4L2_CID_CONTRAST: case V4L2_CID_SATURATION: case V4L2_CID_HUE: - case V4L2_CID_SHARPNESS: qctrl->flags |= V4L2_CTRL_FLAG_SLIDER; break; } @@ -586,8 +585,6 @@ int v4l2_ctrl_query_fill_std(struct v4l2 return v4l2_ctrl_query_fill(qctrl, 0, 127, 1, 64); case V4L2_CID_HUE: return v4l2_ctrl_query_fill(qctrl, -128, 127, 1, 0); - case V4L2_CID_SHARPNESS: - return v4l2_ctrl_query_fill(qctrl, 0, 255, 1, 0); /* MPEG controls */ case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ: --- NEW FILE patch-2.6.29-rc7.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBJrdg9yGugalF9Dw4RAkFfAJ4xnteJus29MN1bxtl2e2Jth3eD9gCfSg+B 7+Al92iS+MSQAiNKlvYD9Ps= =d3rT -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.1014.2.4 retrieving revision 1.1014.2.5 diff -u -r1.1014.2.4 -r1.1014.2.5 --- .cvsignore 25 Feb 2009 21:25:59 -0000 1.1014.2.4 +++ .cvsignore 5 Mar 2009 01:30:21 -0000 1.1014.2.5 @@ -1,8 +1,8 @@ clog +.shared-srctree GNUmakefile kernel-2.6.*.config temp-* kernel-2.6.28 linux-2.6.28.tar.bz2 -patch-2.6.29-rc6.bz2 -patch-2.6.29-rc6-git2.bz2 +patch-2.6.29-rc7.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.238.6.6 retrieving revision 1.238.6.7 diff -u -r1.238.6.6 -r1.238.6.7 --- config-generic 25 Feb 2009 23:14:05 -0000 1.238.6.6 +++ config-generic 5 Mar 2009 01:30:21 -0000 1.238.6.7 @@ -2044,10 +2044,10 @@ CONFIG_W1_MASTER_DS1WM=m CONFIG_W1_SLAVE_THERM=m CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2431=m CONFIG_W1_SLAVE_DS2433=m CONFIG_W1_SLAVE_DS2433_CRC=y CONFIG_W1_SLAVE_DS2760=m - # # Mice # @@ -2174,6 +2174,7 @@ CONFIG_DRM_I915_KMS=y CONFIG_DRM_VIA=m CONFIG_DRM_NOUVEAU=m +# CONFIG_DRM_NOUVEAU_KMS is not set # # PCMCIA character devices @@ -2808,6 +2809,7 @@ CONFIG_USB_GSPCA_TV8532=m CONFIG_USB_GSPCA_VC032X=m CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_GSPCA_SQ905=m CONFIG_USB_IBMCAM=m CONFIG_USB_KONICAWC=m CONFIG_USB_OV511=m @@ -3946,3 +3948,8 @@ CONFIG_XEN_NETDEV_BACKEND=y # CONFIG_CC_STACKPROTECTOR is not set # CONFIG_X86_X2APIC is not set +# CONFIG_RD_GZIP is not set +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_XEN_GNTDEV is not set +# CONFIG_EVENT_TRACER is not set Index: config-ia64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v retrieving revision 1.21 retrieving revision 1.21.6.1 diff -u -r1.21 -r1.21.6.1 --- config-ia64-generic 7 Jan 2009 18:29:22 -0000 1.21 +++ config-ia64-generic 5 Mar 2009 01:30:21 -0000 1.21.6.1 @@ -211,3 +211,4 @@ CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT=y +CONFIG_DMAR_DEFAULT_ON=y Index: config-powerpc-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v retrieving revision 1.33.6.2 retrieving revision 1.33.6.3 diff -u -r1.33.6.2 -r1.33.6.3 --- config-powerpc-generic 25 Feb 2009 21:25:59 -0000 1.33.6.2 +++ config-powerpc-generic 5 Mar 2009 01:30:21 -0000 1.33.6.3 @@ -256,7 +256,8 @@ # CONFIG_PPC_SMLPAR is not set CONFIG_MGCOGE=y -CONFIG_GEF_SBC610=y +### breaks usb on mac...? #486511 +# CONFIG_GEF_SBC610 is not set CONFIG_QUICC_ENGINE=y CONFIG_QE_GPIO=y CONFIG_MPC8xxx_GPIO=y drm-modesetting-radeon.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.54.6.2 -r 1.54.6.3 drm-modesetting-radeon.patch Index: drm-modesetting-radeon.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v retrieving revision 1.54.6.2 retrieving revision 1.54.6.3 diff -u -r1.54.6.2 -r1.54.6.3 --- drm-modesetting-radeon.patch 25 Feb 2009 21:26:00 -0000 1.54.6.2 +++ drm-modesetting-radeon.patch 5 Mar 2009 01:30:21 -0000 1.54.6.3 @@ -1,23 +1,116 @@ -commit 0f6053741411f3ab78a99470523175f20c56b256 -Author: David Miller -Date: Thu Feb 12 02:15:39 2009 -0800 +commit 530ebda60cb7270795b7edd72930ab2d0e4db102 +Author: Dave Airlie +Date: Tue Mar 3 18:23:22 2009 +1000 + + radeon: port proc debug files to new debugfs interface + +commit 94137dff359fc70b51bdf035f97cfbab7424a5ce +Author: Dave Airlie +Date: Tue Mar 3 15:33:52 2009 +1000 + + radeon: pin framebuffer and cursors dynamically + +commit 90a014f6d04548790dbcef1932ad3d89ff12aa32 +Author: Alex Deucher +Date: Fri Feb 27 20:25:36 2009 -0500 + + radeon: fix MC setup on systems with more than 512 MB of VRAM + + Signed-off-by: Alex Deucher + +commit 9e3775d3fe8677b2f995230521fd93cd9ef69327 +Author: Alex Deucher +Date: Fri Feb 27 20:18:20 2009 -0500 + + radeon: leave the MC_FB_LOCATION alone on RS780 + + Signed-off-by: Alex Deucher + +commit b3c52a1d083b846541e2b6d78c917ae00e9f04c1 +Author: Alex Deucher +Date: Fri Feb 27 20:15:04 2009 -0500 - drm: radeon: Fix RADEON_*_EMITED defines. + radeon: wait for MC idle on r6xx/r7xx chips - These are not supposed to be booleans, they are - supposed to be bit masks. + Signed-off-by: Alex Deucher + +commit b077cde9a296856bcadb3003e746950034e929bb +Author: Alex Deucher +Date: Fri Feb 27 20:07:13 2009 -0500 + + radeon: fix up RS600 mc setup and unify mc reg access - Signed-off-by: David S. Miller - Signed-off-by: Dave Airlie - (cherry picked from commit c88605574cafb3883011c898d21309b5d93d0d09) + Signed-off-by: Alex Deucher + +commit 85a3e7390f17ba442c020dda1a47e6b6b1ce0588 +Author: Dave Airlie +Date: Mon Mar 2 23:51:30 2009 +1100 + + radeon: fixup suspend/resume hooks + +commit 1467208a03bb127c3882c59cbcc2818fb1076b8d +Author: Dave Airlie +Date: Sun Mar 1 18:25:07 2009 +1100 + + radeon: fix rs480 gart size + +commit f3812bb92e9900be559d5d4b2098b8dcef01cce9 +Author: Dave Airlie +Date: Fri Feb 27 15:37:14 2009 +1000 + + radeon: disable kms by default for r600 + +commit 924db462f118847e313a1a185e93e58016866da4 +Author: Dave Airlie +Date: Fri Feb 27 11:51:22 2009 +1000 + + radeon: fixup proc hacks + +commit 59883501a17405b6db133066d41309db083eb722 +Author: Dave Airlie +Date: Fri Feb 27 11:51:08 2009 +1000 + + radeon: fixup module load + +commit 0b8ecbca3940dc13b163ab2c46f633625d52aa72 +Author: Dave Airlie +Date: Fri Feb 27 11:50:50 2009 +1000 + + radeon: fix up ring read/write for new drm-next code + +commit 6bffd54b50ca1889aea58454e39edf23e3c4ec50 +Author: Dave Airlie +Date: Fri Feb 27 11:50:24 2009 +1000 + + ati_pcigart: update pcigart for changes in drm-next + +commit ddd936403f8c89d85a6407809e93e32b050b09b0 +Author: Dave Airlie +Date: Thu Feb 26 22:27:21 2009 +1000 + + radeon: fixup writeback/ring ptrs for Kms + +commit b245e49600fe885e376150d9e8adc6308408c70f +Author: Dave Airlie +Date: Thu Feb 26 22:00:59 2009 +1000 + + radeon: fixup after rebase so it builds + + lots more to do + +commit c2181284133a30bd1355b9f9463710f9ec43ccaa +Author: Dave Airlie +Date: Thu Feb 26 12:03:55 2009 +1000 + + drm/radeno: add support for r100 cp type 3 packets -commit d5315273951332ebc92d0a0a32412c98fc3b6bec +commit 62fb97e2a2e71f83c2c6c783f95a36ba19ec468f Author: Dave Airlie Date: Wed Feb 25 16:07:15 2009 +1000 radeon: fixup cs buffer re-use code to not block straight away -commit da53c6edb0b09776687bbf37796b3db3a47192af +commit 7da8970a24bad69684fba5713106b3c7ab69c858 Author: Dave Airlie Date: Wed Feb 25 16:06:30 2009 +1000 @@ -25,37 +118,37 @@ Totally missed this before - really helps stability -commit 5d2a309e5f10266667bc733b884198a2f51cf845 +commit 97c941152f9ebf9e8554d5fc9810a48c722e0c9b Author: Dave Airlie Date: Wed Feb 25 13:03:47 2009 +1000 radeon: fix IB dump end -commit 57f22b7e9781a6d0894af48369c75b0caa6d9a8b +commit 7ce614a4e8d2c1f184de524eb5185fa0004328c5 Author: Thomas Hellstrom Date: Tue Feb 24 20:26:53 2009 +1000 drm/ttm: work around some x86 pat oddities by using mixedmap instead of pfnmap -commit 465937aec83364d3cf516bc8b6c2ca7f785892d9 +commit a7b9422d556ac958d4a13fc03f83be4cfa39b46a Author: Dave Airlie Date: Sun Feb 22 08:22:14 2009 +1000 radeon: add module IDs -commit dd6dc3d83534ae6ae908629cfe0d1a784e073102 +commit 9a51f123fcf038946ee12626b2b43c51aa83ce6c Author: Dave Airlie Date: Sun Feb 22 08:19:33 2009 +1000 radeon: fixup for new APIs -commit a93e118253bdf74092233dbc21d3e257688f39c8 +commit 60f38523ede4949f2b45ca50965b63a32d7a55ba Author: Dave Airlie Date: Sun Feb 22 08:11:33 2009 +1000 drm: fix parmeter passed to fb_release -commit 2b6628ce5e481e1ff5a30d8957d7b32fd5b4d1e1 +commit fb9c478ac883cbff1c1dc749c375fb530516e37e Author: Dave Airlie Date: Wed Feb 18 17:36:33 2009 +1000 @@ -63,13 +156,13 @@ this adds basic IB dumping and cleans up some code around it. -commit cb1fedbb2df6da2f104a026c7846dfc91564e2f7 +commit c7c57bbbc13a80bfd5eec9a52111f354871d6416 Author: Dave Airlie Date: Wed Feb 18 11:12:19 2009 +1000 radeon: fix packet2 parsing + enhance debug -commit c3e00f3af01659590ef278d822ef0a727faf4f71 +commit 7970531e80133bae363d81d2da4b71b8b058a9eb Author: Dave Airlie Date: Wed Feb 18 11:11:39 2009 +1000 @@ -80,37 +173,37 @@ It also doesn't or in the table values but sets them [...4821 lines suppressed...] } break; case RADEON_SETPARAM_PCIGART_LOCATION: @@ -35150,7 +35295,7 @@ dev_priv->gart_info.table_size = sp->value; if (dev_priv->gart_info.table_size < RADEON_PCIGART_TABLE_SIZE) dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE; -@@ -3127,6 +3153,14 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil +@@ -3137,6 +3163,14 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil case RADEON_SETPARAM_VBLANK_CRTC: return radeon_vblank_crtc_set(dev, sp->value); break; @@ -35165,7 +35310,7 @@ default: DRM_DEBUG("Invalid parameter %d\n", sp->param); return -EINVAL; -@@ -3215,7 +3249,19 @@ struct drm_ioctl_desc radeon_ioctls[] = { +@@ -3226,7 +3260,19 @@ struct drm_ioctl_desc radeon_ioctls[] = { DRM_IOCTL_DEF(DRM_RADEON_IRQ_WAIT, radeon_irq_wait, DRM_AUTH), DRM_IOCTL_DEF(DRM_RADEON_SETPARAM, radeon_cp_setparam, DRM_AUTH), DRM_IOCTL_DEF(DRM_RADEON_SURF_ALLOC, radeon_surface_alloc, DRM_AUTH), @@ -35199,7 +35344,7 @@ /** diff --git a/include/drm/drmP.h b/include/drm/drmP.h -index e5f4ae9..c963f25 100644 +index ccbcd13..99e348d 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -147,9 +147,23 @@ struct drm_device; @@ -35226,7 +35371,7 @@ /*@}*/ -@@ -652,6 +666,8 @@ struct drm_master { +@@ -665,6 +679,8 @@ struct drm_master { void *driver_priv; /**< Private structure for driver to use */ }; @@ -35235,7 +35380,7 @@ /** * DRM driver structure. This structure represent the common code for * a family of cards. There will one drm_device for each card present -@@ -770,6 +786,8 @@ struct drm_driver { +@@ -784,6 +800,8 @@ struct drm_driver { /* Driver private ops for this object */ struct vm_operations_struct *gem_vm_ops; @@ -35244,7 +35389,7 @@ int major; int minor; -@@ -845,7 +863,10 @@ struct drm_device { +@@ -906,7 +924,10 @@ struct drm_device { /*@{ */ struct list_head maplist; /**< Linked list of regions */ int map_count; /**< Number of mappable regions */ @@ -35256,7 +35401,7 @@ /** \name Context handle management */ /*@{ */ -@@ -856,6 +877,7 @@ struct drm_device { +@@ -917,6 +938,7 @@ struct drm_device { struct idr ctx_idr; struct list_head vmalist; /**< List of vmas (for debugging) */ @@ -35264,7 +35409,7 @@ /*@} */ -@@ -927,7 +949,6 @@ struct drm_device { +@@ -988,7 +1010,6 @@ struct drm_device { int num_crtcs; /**< Number of CRTCs on this device */ void *dev_private; /**< device private data */ void *mm_private; @@ -35272,7 +35417,7 @@ struct drm_sigdata sigdata; /**< For block_all_signals */ sigset_t sigmask; -@@ -937,6 +958,9 @@ struct drm_device { +@@ -998,6 +1019,9 @@ struct drm_device { struct drm_minor *control; /**< Control node for card */ struct drm_minor *primary; /**< render type primary screen head */ @@ -35282,7 +35427,7 @@ /** \name Drawable information */ /*@{ */ spinlock_t drw_lock; -@@ -959,8 +983,28 @@ struct drm_device { +@@ -1020,8 +1044,28 @@ struct drm_device { uint32_t invalidate_domains; /* domains pending invalidation */ uint32_t flush_domains; /* domains pending flush */ /*@} */ @@ -35311,7 +35456,7 @@ static inline int drm_dev_to_irq(struct drm_device *dev) { -@@ -1070,6 +1114,17 @@ extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev, +@@ -1131,6 +1175,17 @@ extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev, uint32_t type); extern int drm_unbind_agp(DRM_AGP_MEM * handle); @@ -35329,7 +35474,7 @@ /* Misc. IOCTL support (drm_ioctl.h) */ extern int drm_irq_by_busid(struct drm_device *dev, void *data, struct drm_file *file_priv); -@@ -1240,6 +1295,7 @@ extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size +@@ -1301,6 +1356,7 @@ extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size extern int drm_agp_free_memory(DRM_AGP_MEM * handle); extern int drm_agp_bind_memory(DRM_AGP_MEM * handle, off_t start); extern int drm_agp_unbind_memory(DRM_AGP_MEM * handle); @@ -35337,7 +35482,7 @@ extern void drm_agp_chipset_flush(struct drm_device *dev); /* Stub support (drm_stub.h) */ -@@ -1281,6 +1337,8 @@ extern int drm_ati_pcigart_init(struct drm_device *dev, +@@ -1368,6 +1424,8 @@ extern int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info * gart_info); extern int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info * gart_info); @@ -35346,7 +35491,7 @@ extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size, size_t align, dma_addr_t maxaddr); -@@ -1438,6 +1496,39 @@ extern void drm_free(void *pt, size_t size, int area); +@@ -1525,6 +1583,39 @@ extern void drm_free(void *pt, size_t size, int area); extern void *drm_calloc(size_t nmemb, size_t size, int area); #endif @@ -35387,10 +35532,10 @@ #endif /* __KERNEL__ */ diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h -index 0b0d236..cb3952c 100644 +index c7d4b2e..3091fc3 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h -@@ -121,4 +121,6 @@ static inline void drm_connector_helper_add(struct drm_connector *connector, +@@ -122,4 +122,6 @@ static inline void drm_connector_helper_add(struct drm_connector *connector, } extern int drm_helper_resume_force_mode(struct drm_device *dev); @@ -36349,10 +36494,10 @@ * on the security mechanisms provided by hardware. */ diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h -index 73ff51f..1f67a11 100644 +index 937a275..f716e0a 100644 --- a/include/drm/radeon_drm.h +++ b/include/drm/radeon_drm.h -@@ -453,6 +453,15 @@ typedef struct { +@@ -455,6 +455,15 @@ typedef struct { int pfCurrentPage; /* which buffer is being displayed? */ int crtc2_base; /* CRTC2 frame offset */ int tiling_enabled; /* set by drm, read by 2d + 3d clients */ @@ -36368,7 +36513,7 @@ } drm_radeon_sarea_t; /* WARNING: If you change any of these defines, make sure to change the -@@ -493,6 +502,18 @@ typedef struct { +@@ -495,6 +504,18 @@ typedef struct { #define DRM_RADEON_SURF_ALLOC 0x1a #define DRM_RADEON_SURF_FREE 0x1b @@ -36387,7 +36532,7 @@ #define DRM_IOCTL_RADEON_CP_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t) #define DRM_IOCTL_RADEON_CP_START DRM_IO( DRM_COMMAND_BASE + DRM_RADEON_CP_START) #define DRM_IOCTL_RADEON_CP_STOP DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_STOP, drm_radeon_cp_stop_t) -@@ -521,6 +542,18 @@ typedef struct { +@@ -523,6 +544,18 @@ typedef struct { #define DRM_IOCTL_RADEON_SURF_ALLOC DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_ALLOC, drm_radeon_surface_alloc_t) #define DRM_IOCTL_RADEON_SURF_FREE DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_FREE, drm_radeon_surface_free_t) @@ -36406,7 +36551,7 @@ typedef struct drm_radeon_init { enum { RADEON_INIT_CP = 0x01, -@@ -677,6 +710,8 @@ typedef struct drm_radeon_indirect { +@@ -680,6 +713,8 @@ typedef struct drm_radeon_indirect { #define RADEON_PARAM_VBLANK_CRTC 13 /* VBLANK CRTC */ #define RADEON_PARAM_FB_LOCATION 14 /* FB location */ #define RADEON_PARAM_NUM_GB_PIPES 15 /* num GB pipes */ @@ -36415,7 +36560,7 @@ typedef struct drm_radeon_getparam { int param; -@@ -731,6 +766,7 @@ typedef struct drm_radeon_setparam { +@@ -734,6 +769,7 @@ typedef struct drm_radeon_setparam { #define RADEON_SETPARAM_NEW_MEMMAP 4 /* Use new memory map */ #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5 /* PCI GART Table Size */ #define RADEON_SETPARAM_VBLANK_CRTC 6 /* VBLANK CRTC */ @@ -36423,7 +36568,7 @@ /* 1.14: Clients can allocate/free a surface */ typedef struct drm_radeon_surface_alloc { -@@ -746,4 +782,106 @@ typedef struct drm_radeon_surface_free { +@@ -749,4 +785,106 @@ typedef struct drm_radeon_surface_free { #define DRM_RADEON_VBLANK_CRTC1 1 #define DRM_RADEON_VBLANK_CRTC2 2 drm-nouveau.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.8.6.1 drm-nouveau.patch Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v retrieving revision 1.8 retrieving revision 1.8.6.1 diff -u -r1.8 -r1.8.6.1 --- drm-nouveau.patch 11 Feb 2009 04:35:13 -0000 1.8 +++ drm-nouveau.patch 5 Mar 2009 01:30:22 -0000 1.8.6.1 @@ -1,8 +1,8 @@ diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig -index 0d87bfc..433bd8b 100644 +index a74980b..36582ff 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig -@@ -134,3 +134,9 @@ config DRM_SAVAGE +@@ -133,3 +133,18 @@ config DRM_SAVAGE help Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister chipset. If M is selected the module will be called savage. @@ -12,44 +12,131 @@ + depends on DRM + help + Choose this option for open-source nVidia support. ++ ++config DRM_NOUVEAU_KMS ++ bool "Enable modesetting on nouveau by default" ++ depends on DRM_NOUVEAU ++ help ++ Choose this option if you want kernel modesetting enabled by default, ++ and you have a new enough userspace to support this. Running old ++ userspaces with this enabled will cause pain. ++ diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile -index 9aba961..954fd51 100644 +index 03ceb3e..3df55d7 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile -@@ -26,4 +26,5 @@ obj-$(CONFIG_DRM_I915) += i915/ +@@ -27,4 +27,5 @@ obj-$(CONFIG_DRM_I915) += i915/ obj-$(CONFIG_DRM_SIS) += sis/ obj-$(CONFIG_DRM_SAVAGE)+= savage/ obj-$(CONFIG_DRM_VIA) +=via/ +obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/ diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c -index 19039d8..d5718bb 100644 +index 325b4aa..05e928f 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c -@@ -49,8 +49,8 @@ unsigned long drm_get_resource_len(struct drm_device *dev, unsigned int resource +@@ -51,38 +51,24 @@ resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resour EXPORT_SYMBOL(drm_get_resource_len); -static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, -- drm_local_map_t *map) +- struct drm_local_map *map) +struct drm_map_list *drm_find_matching_map(struct drm_device *dev, -+ drm_local_map_t *map) ++ struct drm_local_map *map) { struct drm_map_list *entry; list_for_each_entry(entry, &dev->maplist, head) { -@@ -63,6 +63,7 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, +- /* +- * Because the kernel-userspace ABI is fixed at a 32-bit offset +- * while PCI resources may live above that, we ignore the map +- * offset for maps of type _DRM_FRAMEBUFFER or _DRM_REGISTERS. +- * It is assumed that each driver will have only one resource of +- * each type. +- */ + if (!entry->map || + map->type != entry->map->type || + entry->master != dev->primary->master) + continue; +- switch (map->type) { +- case _DRM_SHM: +- if (map->flags != _DRM_CONTAINS_LOCK) +- break; +- case _DRM_REGISTERS: +- case _DRM_FRAME_BUFFER: +- return entry; +- default: /* Make gcc happy */ +- ; +- } +- if (entry->map->offset == map->offset) ++ ++ if (entry->map->offset == map->offset || ++ (map->type == _DRM_SHM && map->flags & _DRM_CONTAINS_LOCK)) + return entry; + } return NULL; } +EXPORT_SYMBOL(drm_find_matching_map); static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash, - unsigned long user_token, int hashed_handle) -diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c -index c6ade45..969b372 100644 ---- a/drivers/gpu/drm/drm_drv.c -+++ b/drivers/gpu/drm/drm_drv.c -@@ -327,11 +327,10 @@ static void drm_cleanup(struct drm_device * dev) + unsigned long user_token, int hashed_handle, int shm) +@@ -349,7 +335,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, + /* We do it here so that dev->struct_mutex protects the increment */ + user_token = (map->type == _DRM_SHM) ? (unsigned long)map->handle : + map->offset; +- ret = drm_map_handle(dev, &list->hash, user_token, 0, ++ ret = drm_map_handle(dev, &list->hash, user_token, 1, + (map->type == _DRM_SHM)); + if (ret) { + if (map->type == _DRM_REGISTERS) +diff --git a/drivers/gpu/drm/drm_fence.c b/drivers/gpu/drm/drm_fence.c +index f1c386c..fd62fd9 100644 +--- a/drivers/gpu/drm/drm_fence.c ++++ b/drivers/gpu/drm/drm_fence.c +@@ -369,7 +369,7 @@ int drm_fence_object_wait(struct drm_fence_object *fence, + struct drm_fence_manager *fm = &dev->fm; + struct drm_fence_class_manager *fc = &fm->fence_class[fence->fence_class]; + int ret = 0; +- unsigned long _end = 3 * DRM_HZ; ++ unsigned long _end = jiffies + 3 * DRM_HZ; + + if (mask & ~fence->type) { + DRM_ERROR("Wait trying to extend fence type" +diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c +index 7e277c7..e5efd4a 100644 +--- a/drivers/gpu/drm/drm_stub.c ++++ b/drivers/gpu/drm/drm_stub.c +@@ -414,14 +414,14 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, + if (dev->driver->load) { + ret = dev->driver->load(dev, ent->driver_data); + if (ret) +- goto err_g3; ++ goto err_g4; + } + + /* setup the grouping for the legacy output */ + if (drm_core_check_feature(dev, DRIVER_MODESET)) { + ret = drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group); + if (ret) +- goto err_g3; ++ goto err_g4; + } + + list_add_tail(&dev->driver_item, &driver->device_list); +@@ -432,8 +432,11 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, + + return 0; + +-err_g3: ++err_g4: + drm_put_minor(&dev->primary); ++err_g3: ++ if (drm_core_check_feature(dev, DRIVER_MODESET)) ++ drm_put_minor(&dev->control); + err_g2: + pci_disable_device(pdev); + err_g1: +@@ -515,11 +518,11 @@ void drm_put_dev(struct drm_device *dev) dev->agp = NULL; } @@ -59,13 +146,14 @@ list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) drm_rmmap(dev, r_list->map); + drm_ht_remove(&dev->map_hash); ++ + drm_ctxbitmap_cleanup(dev); if (drm_core_check_feature(dev, DRIVER_MODESET)) drm_put_minor(&dev->control); diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile new file mode 100644 -index 0000000..d8a32e0 +index 0000000..12af41b --- /dev/null +++ b/drivers/gpu/drm/nouveau/Makefile @@ -0,0 +1,24 @@ @@ -78,7 +166,8 @@ + nouveau_object.o nouveau_irq.o nouveau_notifier.o \ + nouveau_swmthd.o nouveau_sgdma.o nouveau_dma.o \ + nouveau_bo.o nouveau_fence.o nouveau_gem.o \ -+ nouveau_bios.o \ ++ nouveau_bios.o nouveau_display.o nouveau_fbcon.o \ ++ nouveau_backlight.o \ + nv04_timer.o \ + nv04_mc.o nv40_mc.o nv50_mc.o \ + nv04_fb.o nv10_fb.o nv40_fb.o \ @@ -87,12 +176,173 @@ + nv40_graph.o nv50_graph.o \ + nv04_instmem.o nv50_instmem.o \ + nv50_crtc.o nv50_dac.o nv50_sor.o nv50_connector.o \ -+ nv50_lut.o nv50_cursor.o nv50_i2c.o nv50_display.o \ -+ nv50_fbcon.o nv50_fbcon_accel.o ++ nv50_cursor.o nv50_i2c.o nv50_display.o nv50_fbcon.o + +nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o + [...51941 lines suppressed...] -+ struct drm_display_mode *mode; ++ struct nouveau_encoder *encoder = to_nouveau_encoder(drm_encoder); ++ struct nouveau_connector *connector; + -+ DRM_DEBUG("or %d\n", output->or); ++ connector = nouveau_encoder_connector_get(encoder); ++ if (!connector) ++ return false; + -+ /* We don't yet know what to do, if anything at all. */ -+ if (output->base.encoder_type == DRM_MODE_ENCODER_LVDS) -+ return 0; ++ if ((connector->scaling_mode != DRM_MODE_SCALE_NON_GPU && ++ connector->scaling_mode != DRM_MODE_SCALE_NO_SCALE) && ++ connector->native_mode) { ++ int id = adjusted_mode->base.id; ++ *adjusted_mode = *connector->native_mode; ++ adjusted_mode->base.id = id; ++ } + -+ if (crtc->use_native_mode) -+ mode = crtc->native_mode; -+ else -+ mode = crtc->mode; ++ return true; ++} + -+ /* 0x70000 was a late addition to nv, mentioned as fixing tmds initialisation on certain gpu's. */ -+ /* I presume it's some kind of clock setting, but what precisely i do not know. */ -+ nv_wr32(NV50_PDISPLAY_SOR_CLK_CLK_CTRL2(output->or), 0x70000 | ((mode->clock > limit) ? 0x101 : 0)); ++static void nv50_sor_prepare(struct drm_encoder *drm_encoder) ++{ ++ struct nouveau_encoder *encoder = to_nouveau_encoder(drm_encoder); + -+ return 0; ++ nv50_sor_dpms(drm_encoder, DRM_MODE_DPMS_OFF); ++ nv50_sor_disconnect(encoder); +} + -+static int nv50_sor_set_power_mode(struct nv50_output *output, int mode) ++static void nv50_sor_commit(struct drm_encoder *drm_encoder) +{ -+ struct drm_nouveau_private *dev_priv = output->base.dev->dev_private; -+ uint32_t val; -+ int or = output->or; ++ nv50_sor_dpms(drm_encoder, DRM_MODE_DPMS_ON); ++} + -+ DRM_DEBUG("or %d\n", output->or); ++static void nv50_sor_mode_set(struct drm_encoder *drm_encoder, ++ struct drm_display_mode *mode, ++ struct drm_display_mode *adjusted_mode) ++{ ++ struct nouveau_encoder *encoder = to_nouveau_encoder(drm_encoder); ++ struct drm_device *dev = drm_encoder->dev; ++ struct nouveau_crtc *crtc = to_nouveau_crtc(drm_encoder->crtc); ++ uint32_t offset = encoder->or * 0x40; ++ uint32_t mode_ctl = NV50_SOR_MODE_CTRL_OFF; + -+ /* wait for it to be done */ -+ while (nv_rd32(NV50_PDISPLAY_SOR_REGS_DPMS_CTRL(or)) & NV50_PDISPLAY_SOR_REGS_DPMS_CTRL_PENDING); ++ DRM_DEBUG("or %d\n", encoder->or); + -+ val = nv_rd32(NV50_PDISPLAY_SOR_REGS_DPMS_CTRL(or)); ++ if (encoder->base.encoder_type == DRM_MODE_ENCODER_LVDS) { ++ mode_ctl |= NV50_SOR_MODE_CTRL_LVDS; ++ } else { ++ mode_ctl |= NV50_SOR_MODE_CTRL_TMDS; ++ if (mode->clock > 165000) ++ mode_ctl |= NV50_SOR_MODE_CTRL_TMDS_DUAL_LINK; ++ } + -+ if (mode == DRM_MODE_DPMS_ON) -+ val |= NV50_PDISPLAY_SOR_REGS_DPMS_CTRL_ON; ++ if (crtc->index == 1) ++ mode_ctl |= NV50_SOR_MODE_CTRL_CRTC1; + else -+ val &= ~NV50_PDISPLAY_SOR_REGS_DPMS_CTRL_ON; ++ mode_ctl |= NV50_SOR_MODE_CTRL_CRTC0; + -+ nv_wr32(NV50_PDISPLAY_SOR_REGS_DPMS_CTRL(or), val | NV50_PDISPLAY_SOR_REGS_DPMS_CTRL_PENDING); ++ if (mode->flags & DRM_MODE_FLAG_NHSYNC) ++ mode_ctl |= NV50_SOR_MODE_CTRL_NHSYNC; + -+ return 0; ++ if (mode->flags & DRM_MODE_FLAG_NVSYNC) ++ mode_ctl |= NV50_SOR_MODE_CTRL_NVSYNC; ++ ++ OUT_MODE(NV50_SOR0_MODE_CTRL + offset, mode_ctl); ++ OUT_MODE(NV50_UPDATE_DISPLAY, 0); +} + ++static const struct drm_encoder_helper_funcs nv50_sor_helper_funcs = { ++ .dpms = nv50_sor_dpms, ++ .save = nv50_sor_save, ++ .restore = nv50_sor_restore, ++ .mode_fixup = nv50_sor_mode_fixup, ++ .prepare = nv50_sor_prepare, ++ .commit = nv50_sor_commit, ++ .mode_set = nv50_sor_mode_set, ++ .detect = NULL ++}; ++ +static void nv50_sor_destroy(struct drm_encoder *drm_encoder) +{ -+ struct nv50_output *output = to_nv50_output(drm_encoder); ++ struct nouveau_encoder *encoder = to_nouveau_encoder(drm_encoder); + + DRM_DEBUG("\n"); + + if (!drm_encoder) + return; + -+ drm_encoder_cleanup(&output->base); ++ drm_encoder_cleanup(&encoder->base); + -+ kfree(output->native_mode); -+ kfree(output); ++ kfree(encoder); +} + +static const struct drm_encoder_funcs nv50_sor_encoder_funcs = { @@ -35910,7 +42651,7 @@ +int nv50_sor_create(struct drm_device *dev, struct dcb_entry *entry) +{ + struct drm_nouveau_private *dev_priv = dev->dev_private; -+ struct nv50_output *output = NULL; ++ struct nouveau_encoder *encoder = NULL; + int type; + + DRM_DEBUG("\n"); @@ -35928,35 +42669,26 @@ + return -EINVAL; + } + -+ output = kzalloc(sizeof(*output), GFP_KERNEL); -+ if (!output) -+ return -ENOMEM; -+ -+ output->native_mode = kzalloc(sizeof(*output->native_mode), GFP_KERNEL); -+ if (!output->native_mode) { -+ kfree(output); ++ encoder = kzalloc(sizeof(*encoder), GFP_KERNEL); ++ if (!encoder) + return -ENOMEM; -+ } + -+ output->dcb_entry = entry; -+ output->or = ffs(entry->or) - 1; ++ encoder->dcb_entry = entry; ++ encoder->or = ffs(entry->or) - 1; + + /* Set function pointers. */ -+ output->validate_mode = nv50_sor_validate_mode; -+ output->execute_mode = nv50_sor_execute_mode; -+ output->set_clock_mode = nv50_sor_set_clock_mode; -+ output->set_power_mode = nv50_sor_set_power_mode; -+ output->detect = NULL; ++ encoder->set_clock_mode = nv50_sor_set_clock_mode; + -+ drm_encoder_init(dev, &output->base, &nv50_sor_encoder_funcs, type); ++ drm_encoder_init(dev, &encoder->base, &nv50_sor_encoder_funcs, type); ++ drm_encoder_helper_add(&encoder->base, &nv50_sor_helper_funcs); + + /* I've never seen possible crtc's restricted. */ -+ output->base.possible_crtcs = 3; -+ output->base.possible_clones = 0; ++ encoder->base.possible_crtcs = 3; ++ encoder->base.possible_clones = 0; + + /* Some default state, unknown what it precisely means. */ -+ if (output->base.encoder_type == DRM_MODE_ENCODER_TMDS) { -+ int or = output->or; ++ if (encoder->base.encoder_type == DRM_MODE_ENCODER_TMDS) { ++ int or = encoder->or; + + nv_wr32(NV50_PDISPLAY_SOR_REGS_UNK_00C(or), 0x03010700); + nv_wr32(NV50_PDISPLAY_SOR_REGS_UNK_010(or), 0x0000152f); @@ -35976,10 +42708,10 @@ unifdef-y += via_drm.h +unifdef-y += nouveau_drm.h diff --git a/include/drm/drmP.h b/include/drm/drmP.h -index 67cadab..4e2c0c8 100644 +index 99e348d..e57c98f 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h -@@ -1206,6 +1206,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data); +@@ -1267,6 +1267,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data); extern int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv); /* Buffer management support (drm_bufs.h) */ @@ -35987,7 +42719,7 @@ + drm_local_map_t *map); extern int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc * request); extern int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc * request); - extern int drm_addmap(struct drm_device *dev, unsigned int offset, + extern int drm_addmap(struct drm_device *dev, resource_size_t offset, diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h new file mode 100644 index 0000000..4147f35 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1294.2.8 retrieving revision 1.1294.2.9 diff -u -r1.1294.2.8 -r1.1294.2.9 --- kernel.spec 25 Feb 2009 23:14:05 -0000 1.1294.2.8 +++ kernel.spec 5 Mar 2009 01:30:23 -0000 1.1294.2.9 @@ -56,9 +56,9 @@ # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%define rcrev 6 +%define rcrev 7 # The git snapshot level -%define gitrev 2 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -246,7 +246,7 @@ # no need to build headers again for these arches, # they can just use i586 and ppc64 headers -%ifarch i686 ppc64iseries +%ifarch i686 ppc64iseries ppc ppc64 %define with_headers 0 %endif @@ -259,9 +259,9 @@ %endif # bootwrapper is only on ppc -%ifnarch ppc ppc64 +#%ifnarch ppc ppc64 %define with_bootwrapper 0 -%endif +#%endif # sparse blows up on ppc64 alpha and sparc64 %ifarch ppc64 ppc alpha sparc64 @@ -312,7 +312,7 @@ %define asmarch sparc %define all_arch_configs kernel-%{version}-sparc64*.config %define make_target image -%define kernel_image arch/sparc64/boot/image +%define kernel_image arch/sparc/boot/image %define image_install_path boot %endif @@ -588,6 +588,7 @@ Patch09: linux-2.6-upstream-reverts.patch # Git trees. Patch10: git-cpufreq.patch +Patch11: git-bluetooth.patch # Standalone patches Patch20: linux-2.6-hotfixes.patch @@ -627,12 +628,13 @@ Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch +Patch610: hda_intel-prealloc-4mb-dmabuffer.patch Patch670: linux-2.6-ata-quirk.patch Patch680: linux-2.6-rt2x00-asus-leds.patch - -Patch690: linux-2.6-iwlwifi-dma-direction.patch +Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch +Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch Patch1515: linux-2.6.29-lirc.patch Patch1520: linux-2.6-hdpvr.patch @@ -641,13 +643,15 @@ # but the drive isn't yet ready. Patch1550: linux-2.6-cdrom-door-status.patch +Patch1700: agp-set_memory_ucwb.patch # nouveau + drm fixes +Patch1811: drm-next.patch Patch1812: drm-modesetting-radeon.patch +Patch1813: drm-radeon-pm.patch Patch1814: drm-nouveau.patch -Patch1815: drm-intel-next.patch Patch1816: drm-no-gem-on-i8xx.patch Patch1818: drm-i915-resume-force-mode.patch -Patch1819: drm-edid-revision-0-should-be-valid.patch +Patch1819: drm-fix-setmaster-deadlock.patch # kludge to make ich9 e1000 work Patch2000: linux-2.6-e1000-ich9.patch @@ -662,15 +666,13 @@ Patch2300: linux-2.6.28-sunrpc-ipv6-rpcbind.patch Patch2301: linux-2.6.28-lockd-svc-register.patch -# fix libertas problem for olpc (http://lists.infradead.org/pipermail/libertas-dev/2009-February/002297.html) -Patch2400: linux-2.6-libertas-netpriv-fixes.patch - # Quiet boot fixes # silence the ACPI blacklist code Patch2802: linux-2.6-silence-acpi-blacklist.patch -# Updates V4L/DVB to the latest development tree -Patch 2900: linux-2.6-v4l-dvb-update.patch +# Updates/Fixes on V4L/DVB to the latest development tree +Patch2899: linux-2.6-v4l-dvb-fixes.patch +Patch2900: linux-2.6-v4l-dvb-update.patch Patch9001: revert-fix-modules_install-via-nfs.patch @@ -907,6 +909,11 @@ %endif %endif +# We can share hardlinked source trees by putting the +# directory name of the CVS checkout that we want to share +# with in .shared-srctree. (Full pathname is required.) +[ -f .shared-srctree ] && sharedir=$(cat .shared-srctree) + if [ ! -d kernel-%{kversion}/vanilla-%{vanillaversion} ]; then if [ -d kernel-%{kversion}/vanilla-%{kversion} ]; then @@ -922,31 +929,46 @@ # Ok, first time we do a make prep. rm -f pax_global_header + if [[ ! -z $sharedir && -d $sharedir/kernel-%{kversion}/vanilla-%{kversion} ]] ; then +%setup -q -n kernel-%{kversion} -c -T + cp -rl $sharedir/kernel-%{kversion}/vanilla-%{kversion} . + else %setup -q -n kernel-%{kversion} -c - mv linux-%{kversion} vanilla-%{kversion} + mv linux-%{kversion} vanilla-%{kversion} + fi fi %if "%{kversion}" != "%{vanillaversion}" - cp -rl vanilla-%{kversion} vanilla-%{vanillaversion} -%endif - cd vanilla-%{vanillaversion} + + if [[ ! -z $sharedir && -d $sharedir/kernel-%{kversion}/vanilla-%{vanillaversion} ]] ; then + + cp -rl $sharedir/kernel-%{kversion}/vanilla-%{vanillaversion} . + + else + + cp -rl vanilla-%{kversion} vanilla-%{vanillaversion} + cd vanilla-%{vanillaversion} # Update vanilla to the latest upstream. # (non-released_kernel case only) %if 0%{?rcrev} -ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2 + ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2 %if 0%{?gitrev} -ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.bz2 + ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.bz2 %endif %else # pre-{base_sublevel+1}-rc1 case %if 0%{?gitrev} -ApplyPatch patch-2.6.%{base_sublevel}-git%{gitrev}.bz2 + ApplyPatch patch-2.6.%{base_sublevel}-git%{gitrev}.bz2 %endif %endif - cd .. + cd .. + + fi + +%endif else # We already have a vanilla dir. @@ -1022,6 +1044,7 @@ fi #ApplyPatch git-cpufreq.patch +ApplyPatch git-bluetooth.patch ApplyPatch linux-2.6-hotfixes.patch @@ -1131,6 +1154,7 @@ # squelch hda_beep by default ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch +ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch # ia64 ata quirk ApplyPatch linux-2.6-ata-quirk.patch @@ -1138,8 +1162,9 @@ # rt2x00: back-port activity LED init patches ApplyPatch linux-2.6-rt2x00-asus-leds.patch -# Intel wireless DMA fix -ApplyPatch linux-2.6-iwlwifi-dma-direction.patch +# back-port scan result aging patches +ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch +ApplyPatch linux-2.6-ipw2x00-age-scan-results-on-resume.patch # http://www.lirc.org/ ApplyPatch linux-2.6.29-lirc.patch @@ -1154,16 +1179,16 @@ ApplyPatch linux-2.6-net-tulip-interrupt.patch -ApplyPatch linux-2.6-libertas-netpriv-fixes.patch - +ApplyPatch agp-set_memory_ucwb.patch # Nouveau DRM + drm fixes -#ApplyPatch drm-next.patch +ApplyPatch drm-next.patch ApplyPatch drm-modesetting-radeon.patch ApplyPatch drm-nouveau.patch -#ApplyPatch drm-intel-next.patch +# pm broken on my thinkpad t60p - airlied +#ApplyPatch drm-radeon-pm.patch ApplyPatch drm-no-gem-on-i8xx.patch ApplyPatch drm-i915-resume-force-mode.patch -ApplyPatch drm-edid-revision-0-should-be-valid.patch +ApplyPatch drm-fix-setmaster-deadlock.patch # linux1394 git patches ApplyPatch linux-2.6-firewire-git-update.patch @@ -1178,7 +1203,8 @@ # silence the ACPI blacklist code ApplyPatch linux-2.6-silence-acpi-blacklist.patch -# V4L/DVB updates +# V4L/DVB updates/fixes +ApplyPatch linux-2.6-v4l-dvb-fixes.patch ApplyPatch linux-2.6-v4l-dvb-update.patch # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6 @@ -1425,6 +1451,8 @@ 'ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register' collect_modules_list drm \ 'drm_open|drm_init' + collect_modules_list modesetting \ + 'drm_crtc_init' # detect missing or incorrect license tags rm -f modinfo @@ -1735,6 +1763,7 @@ %ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\ %{expand:%%files %{?2:%{2}-}devel}\ %defattr(-,root,root)\ +%dir /usr/src/kernels\ %verify(not mtime) /usr/src/kernels/%{KVERREL}%{?2:.%{2}}\ /usr/src/kernels/%{KVERREL}%{?2:.%{2}}\ %if %{with_debuginfo}\ @@ -1765,11 +1794,144 @@ %kernel_variant_files %{with_pae_debug} PAEdebug %kernel_variant_files -k vmlinux %{with_kdump} kdump +# plz don't put in a version string unless you're going to tag +# and build. + %changelog -* Wed Feb 25 2009 Jeremy Katz -- add dcbw's patch to fix wireless problems on the OLPC (from cjb, should be up -stream "soon" but is - currently blocking OLPC testing) +* Wed Mar 4 2009 +- update to latest pvops patch +- merge conflict from drm-next.patch +- disable ppc and ppc64 packages + +* Wed Mar 4 2009 +- Add fix for deadlock in drm setmaster. + +* Wed Mar 04 2009 Kyle McMartin +- Rebase git-bluetooth.patch from bluetooth-next-2.6 instead of + bluetooth-testing, per Marcel's suggestions. + +* Wed Mar 04 2009 Ben Skeggs +- drm-nouveau.patch: lvds, dpms and gamma_set fixes + +* Wed Mar 04 2009 Dave Jones 2.6.29-0.197.rc7 +- 2.6.29-rc7 + +* Wed Mar 04 2009 Dennis Gilmore - 2.6.29-0.195.rc6.git7 +- sparc kernel is now in arch/sparc/boot/image + +* Wed Mar 04 2009 Ben Skeggs +- drm: fix bustage of _DRM_SHM maps + +* Wed Mar 04 2009 Kyle McMartin +- Tony Breeds says CONFIG_GEF_SBC610 breaks USB. I, for one, believe + him. Looks to be fairly useless anyway... (#486511) + +* Wed Mar 04 2009 Dave Airlie +- rebase drm properly kill -pm it breaks my laptop + +* Wed Mar 04 2009 Dave Airlie 2.6.29-0.185.rc6.git7 +- rebase drm patches on git7 + +* Tue Mar 03 2009 Dave Jones 2.6.29-0.184.rc6.git7 +- 2.6.29-rc6-git7 + +* Tue Mar 03 2009 Matthew Garrett +- Add dynamic power management for later r500-based Radeons + +* Tue Mar 03 2009 Kyle McMartin +- Allocate a bigger default DMA buffer for snd-hda_intel. Azalia uses a + 32-bit or wider DMA mask, so this is fine. + +* Tue Mar 03 2009 Kyle McMartin +- Add bluetooth-testing git tree. Mostly bugfixes... + +* Tue Mar 03 2009 Dave Airlie +- pull patch from Linus to fix build + +* Tue Mar 03 2009 Ben Skeggs +- nouveau: some gf8/9 and kms fixes + +* Tue Mar 03 2009 Dave Airlie 2.6.29-0.184.rc6.git6 +- drm-modesetting-radeon.patch: fix suspend/resume, proc->debugfs + +* Mon Mar 02 2009 Dave Jones 2.6.29-0.183.rc6.git6 +- 2.6.29-rc6-git6 + +* Mon Mar 02 2009 Ben Skeggs +- CONFIG_DRM_NOUVEAU_KMS got enabled somewhere, lets not do that yet + +* Mon Mar 02 2009 Kyle McMartin 2.6.29-0.179.rc6.git5 +- fix oops in ipv6 when NET_NS is enabled. + +* Mon Mar 02 2009 Ben Skeggs +- nouveau fixes for recent drm-next changes, and various kms issues + +* Sat Feb 28 2009 Chuck Ebbert 2.6.29-0.176.rc6.git5 +- Linux 2.6.29-rc6-git5 +- Removed parts of v4l-fixes patch that were merged upstream. +- Added hotfix from lkml to export symbols needed by i915. +- New driver: CONFIG_W1_SLAVE_DS2431=m + +* Fri Feb 27 2009 Mauro Carvalho Chehab +- Update V4L/DVB to the latest development tree (fixes and updates for linux-next) + +* Fri Feb 27 2009 Jarod Wilson +- minor lirc and hdpvr patch updates from respective upstreams + +* Fri Feb 27 2009 Kyle McMartin 2.6.29-0.172.rc6.git4 +- avoid a 64-bit divide which generates a libgcc __udivdi3 call + in drm-nouveau. maybe. + +* Fri Feb 27 2009 Kyle McMartin 2.6.29-0.171.rc6.git4 +- fixt drm-nouveau for drm-next. + +* Fri Feb 27 2009 Chuck Ebbert +- Linux 2.6.29-rc6-git4 + +* Fri Feb 27 2009 Ben Skeggs +- nouveau/kms: hopefully fix dac outputs + +* Fri Feb 27 2009 Dave Airlie +- radeon: disable r600 kms by default - we want accel to work + +* Fri Feb 27 2009 Ben Skeggs +- Bring in nouveau update + - "getting there" nv50 modesetting rework + - nv50 stability improvements + - support for >512MiB VRAM on nv50 + - nv40/nv50 backlight support + +* Fri Feb 27 2009 Dave Airlie +- agp-set_memory_ucwb.patch - enable GEM/KMS on PAE hopefully + +* Fri Feb 27 2009 Dave Airlie +- drm-next.patch: bring in drm-next tree for r600 support +- rebased drm-modesetting-radeon.patch and drm-nouveau.patch + +* Thu Feb 26 2009 Chuck Ebbert 2.6.29-0.163.rc6.git3 +- Add support for sharing source trees between CVS checkouts. + +* Thu Feb 26 2009 Dave Jones 2.6.29-0.162.rc6.git3 +- Own the /usr/src/kernels dir in devel packages. + +* Thu Feb 26 2009 Kyle McMartin +- myoung points out we're not returning a value in the fbcon quiet patch. + +* Thu Feb 26 2009 John W. Linville +- Add dcbw's back-port patches to age scan results on resume + +* Thu Feb 26 2009 Kyle McMartin 2.6.29-0.159.rc6.git3 +- Update to -git3. +- drm-edid-revision-0-should-be-valid.patch: merged upstream +- linux-2.6-iwlwifi-dma-direction.patch: merged upstream +- CONFIG_DMAR_DEFAULT_ON: enable on ia64 + +* Wed Feb 25 2009 Chuck Ebbert 2.6.29-0.158.rc6.git2 +- re-add modules.modesetting list. + +* Wed Feb 25 2009 Jeremy Katz 2.6.29-0.157.rc6.git2 +- add dcbw's patch to fix wireless problems on the OLPC (from cjb, should + be upstream "soon" but is currently blocking OLPC testing) * Wed Feb 25 2009 Michael Young - update pvops patch (x2) which fixes an smp mtrr bug linux-2.6-hdpvr.patch: Index: linux-2.6-hdpvr.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-hdpvr.patch,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -r1.4 -r1.4.6.1 --- linux-2.6-hdpvr.patch 27 Jan 2009 02:39:42 -0000 1.4 +++ linux-2.6-hdpvr.patch 5 Mar 2009 01:30:24 -0000 1.4.6.1 @@ -1,3 +1,24 @@ +Video capture driver for the Hauppauge HD PVR + +upstream: http://hg.jannau.net/hdpvr/ +product info: http://hauppauge.com/site/products/data_hdpvr.html + +Signed-off-by: Jarod Wilson + +--- + drivers/media/video/Kconfig | 2 + + drivers/media/video/Makefile | 2 + + drivers/media/video/hdpvr/Kconfig | 10 + + drivers/media/video/hdpvr/Makefile | 7 + + drivers/media/video/hdpvr/hdpvr-control.c | 212 +++++ + drivers/media/video/hdpvr/hdpvr-core.c | 461 +++++++++++ + drivers/media/video/hdpvr/hdpvr-i2c.c | 145 ++++ + drivers/media/video/hdpvr/hdpvr-video.c | 1258 +++++++++++++++++++++++++++++ + drivers/media/video/hdpvr/hdpvr.h | 326 ++++++++ + drivers/media/video/v4l2-common.c | 3 + + include/linux/i2c-id.h | 1 + + 11 files changed, 2427 insertions(+), 0 deletions(-) + diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 19cf3b8..4f29e1a 100644 --- a/drivers/media/video/Kconfig @@ -12,18 +33,18 @@ source "drivers/media/video/usbvision/Kconfig" diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile -index 72f6d03..35ff442 100644 +index 72f6d03..e7e4508 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile -@@ -122,6 +122,8 @@ obj-$(CONFIG_USB_PWC) += pwc/ - obj-$(CONFIG_USB_ZC0301) += zc0301/ - obj-$(CONFIG_USB_GSPCA) += gspca/ +@@ -128,6 +128,8 @@ obj-$(CONFIG_USB_VICAM) += usbvideo/ + obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/ + obj-$(CONFIG_USB_S2255) += s2255drv.o -+obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/ ++obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/ + - obj-$(CONFIG_USB_IBMCAM) += usbvideo/ - obj-$(CONFIG_USB_KONICAWC) += usbvideo/ - obj-$(CONFIG_USB_VICAM) += usbvideo/ + obj-$(CONFIG_VIDEO_IVTV) += ivtv/ + obj-$(CONFIG_VIDEO_CX18) += cx18/ + diff --git a/drivers/media/video/hdpvr/Kconfig b/drivers/media/video/hdpvr/Kconfig new file mode 100644 index 0000000..de247f3 @@ -273,10 +294,10 @@ +} diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c new file mode 100644 -index 0000000..19e5282 +index 0000000..394309a --- /dev/null +++ b/drivers/media/video/hdpvr/hdpvr-core.c -@@ -0,0 +1,455 @@ +@@ -0,0 +1,461 @@ +/* + * Hauppage HD PVR USB driver + * @@ -336,6 +357,8 @@ +/* table of devices that work with this driver */ +static struct usb_device_id hdpvr_table [] = { + { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID) }, ++ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID1) }, ++ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID2) }, + { } /* Terminating entry */ +}; +MODULE_DEVICE_TABLE(usb, hdpvr_table); @@ -452,6 +475,10 @@ + dev->flags &= ~HDPVR_FLAG_AC3_CAP; + } else if (buf[1] == HDPVR_FIRMWARE_VERSION_AC3) { + dev->flags |= HDPVR_FLAG_AC3_CAP; ++ } else if (buf[1] > HDPVR_FIRMWARE_VERSION_AC3) { ++ hdpvr_print("untested firmware version 0x%x, the driver might " ++ "not work", buf[1]); ++ dev->flags |= HDPVR_FLAG_AC3_CAP; + } else { + hdpvr_err("unknown firmware version 0x%x", buf[1]); + ret = -EINVAL; @@ -885,7 +912,7 @@ +} diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c new file mode 100644 -index 0000000..0297f91 +index 0000000..33788d0 --- /dev/null +++ b/drivers/media/video/hdpvr/hdpvr-video.c @@ -0,0 +1,1258 @@ @@ -1253,7 +1280,7 @@ + return retval; +} + -+#if 0 ++ +static void hdpvr_draw_down(struct hdpvr_device *dev) +{ + hdpvr_trace("status = %d", dev->status); @@ -1279,7 +1306,6 @@ + + return 0; +} -+#endif + +static int hdpvr_release(struct file *file) +{ @@ -1456,8 +1482,7 @@ +} + + -+static long hdpvr_ioctl(struct file *filp, unsigned int cmd, -+ unsigned long arg) ++static long hdpvr_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ + struct hdpvr_fh *fh = (struct hdpvr_fh *)filp->private_data; + struct hdpvr_device *dev = fh->dev; @@ -1501,10 +1526,9 @@ + .owner = THIS_MODULE, + .open = hdpvr_open, + .release = hdpvr_release, -+/* .flush = hdpvr_flush, */ + .read = hdpvr_read, + .poll = hdpvr_poll, -+ .ioctl = hdpvr_ioctl, ++ .unlocked_ioctl = hdpvr_ioctl, +}; + +/*=======================================================================*/ @@ -1515,8 +1539,11 @@ +static int vidioc_querycap(struct file *file, void *priv, + struct v4l2_capability *cap) +{ ++ struct hdpvr_device *dev = video_drvdata(file); ++ + strcpy(cap->driver, "hdpvr"); + strcpy(cap->card, "Haupauge HD PVR"); ++ usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); + cap->version = HDPVR_VERSION; + cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | + V4L2_CAP_AUDIO | @@ -2149,10 +2176,10 @@ +} diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h new file mode 100644 -index 0000000..ffe3a36 +index 0000000..1514742 --- /dev/null +++ b/drivers/media/video/hdpvr/hdpvr.h -@@ -0,0 +1,324 @@ +@@ -0,0 +1,326 @@ +/* + * Hauppage HD PVR USB driver + * @@ -2180,6 +2207,8 @@ +/* Define these values to match your devices */ +#define HD_PVR_VENDOR_ID 0x2040 +#define HD_PVR_PRODUCT_ID 0x4900 ++#define HD_PVR_PRODUCT_ID1 0x4901 ++#define HD_PVR_PRODUCT_ID2 0x4902 + +#define UNSET (-1U) + linux-2.6-silence-fbcon-logo.patch: Index: linux-2.6-silence-fbcon-logo.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-silence-fbcon-logo.patch,v retrieving revision 1.1 retrieving revision 1.1.16.1 diff -u -r1.1 -r1.1.16.1 --- linux-2.6-silence-fbcon-logo.patch 11 Jun 2008 20:16:39 -0000 1.1 +++ linux-2.6-silence-fbcon-logo.patch 5 Mar 2009 01:30:24 -0000 1.1.16.1 @@ -1,8 +1,8 @@ diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c -index 97aff8d..5e230b6 100644 +index 1657b96..4c5c2be 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c -@@ -674,13 +674,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, +@@ -631,13 +631,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, kfree(save); } @@ -25,13 +25,14 @@ } } #endif /* MODULE */ -@@ -3604,6 +3606,13 @@ static int __init fb_console_init(void) +@@ -3489,6 +3491,14 @@ static int __init fb_console_init(void) return 0; } +static int __init quiet_logo(char *str) +{ + logo_shown = FBCON_LOGO_DONTSHOW; ++ return 0; +} + +early_param("quiet", quiet_logo); linux-2.6-v4l-dvb-update.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1.2.2 -r 1.1.2.3 linux-2.6-v4l-dvb-update.patch Index: linux-2.6-v4l-dvb-update.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-update.patch,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- linux-2.6-v4l-dvb-update.patch 25 Feb 2009 21:26:01 -0000 1.1.2.2 +++ linux-2.6-v4l-dvb-update.patch 5 Mar 2009 01:30:24 -0000 1.1.2.3 @@ -1,3 +1,15 @@ +diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt +index f1d6399..3a311fe 100644 +--- a/Documentation/ioctl/ioctl-number.txt ++++ b/Documentation/ioctl/ioctl-number.txt +@@ -125,7 +125,6 @@ Code Seq# Include File Comments + 'd' 00-DF linux/video_decoder.h conflict! + 'd' F0-FF linux/digi1.h + 'e' all linux/digi1.h conflict! +-'e' 00-1F linux/video_encoder.h conflict! + 'e' 00-1F net/irda/irtty.h conflict! + 'f' 00-1F linux/ext2_fs.h + 'h' 00-7F Charon filesystem diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv index 0d93fa1..4dfe626 100644 --- a/Documentation/video4linux/CARDLIST.bttv @@ -19,19 +31,33 @@ + 15 -> TeVii S470 [d470:9022] + 16 -> DVBWorld DVB-S2 2005 [0001:2005] diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx -index 75bded8..77874bd 100644 +index 75bded8..78d0a6e 100644 --- a/Documentation/video4linux/CARDLIST.em28xx +++ b/Documentation/video4linux/CARDLIST.em28xx -@@ -7,7 +7,7 @@ +@@ -7,12 +7,12 @@ 6 -> Terratec Cinergy 200 USB (em2800) 7 -> Leadtek Winfast USB II (em2800) [0413:6023] 8 -> Kworld USB2800 (em2800) - 9 -> Pinnacle Dazzle DVC 90/DVC 100 (em2820/em2840) [2304:0207,2304:021a] -+ 9 -> Pinnacle Dazzle DVC 90/DVC 100/DVC 101/DVC 107 (em2820/em2840) [2304:0207,2304:021a] ++ 9 -> Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker (em2820/em2840) [1b80:e302,2304:0207,2304:021a] 10 -> Hauppauge WinTV HVR 900 (em2880) [2040:6500] 11 -> Terratec Hybrid XS (em2880) [0ccd:0042] 12 -> Kworld PVR TV 2800 RF (em2820/em2840) -@@ -58,3 +58,7 @@ + 13 -> Terratec Prodigy XS (em2880) [0ccd:0047] +- 14 -> Pixelview Prolink PlayTV USB 2.0 (em2820/em2840) ++ 14 -> SIIG AVTuner-PVR / Pixelview Prolink PlayTV USB 2.0 (em2820/em2840) + 15 -> V-Gear PocketTV (em2800) + 16 -> Hauppauge WinTV HVR 950 (em2883) [2040:6513,2040:6517,2040:651b] + 17 -> Pinnacle PCTV HD Pro Stick (em2880) [2304:0227] +@@ -30,7 +30,6 @@ + 30 -> Videology 20K14XUSB USB2.0 (em2820/em2840) + 31 -> Usbgear VD204v9 (em2821) + 32 -> Supercomp USB 2.0 TV (em2821) +- 33 -> SIIG AVTuner-PVR/Prolink PlayTV USB 2.0 (em2821) + 34 -> Terratec Cinergy A Hybrid XS (em2860) [0ccd:004f] + 35 -> Typhoon DVD Maker (em2860) + 36 -> NetGMBH Cam (em2860) +@@ -58,3 +57,7 @@ 58 -> Compro VideoMate ForYou/Stereo (em2820/em2840) [185b:2041] 60 -> Hauppauge WinTV HVR 850 (em2883) [2040:651f] 61 -> Pixelview PlayTV Box 4 USB 2.0 (em2820/em2840) @@ -132,7 +158,7 @@ Module Parameters ================= diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt -index ff12437..48cdf86 100644 +index ff12437..accc376 100644 --- a/Documentation/video4linux/v4l2-framework.txt +++ b/Documentation/video4linux/v4l2-framework.txt @@ -47,7 +47,9 @@ All drivers have the following structure: @@ -146,7 +172,26 @@ This is a rough schematic of how it all relates: -@@ -134,7 +136,7 @@ The recommended approach is as follows: +@@ -82,12 +84,14 @@ You must register the device instance: + v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev); + + Registration will initialize the v4l2_device struct and link dev->driver_data +-to v4l2_dev. Registration will also set v4l2_dev->name to a value derived from +-dev (driver name followed by the bus_id, to be precise). You may change the +-name after registration if you want. ++to v4l2_dev. If v4l2_dev->name is empty then it will be set to a value derived ++from dev (driver name followed by the bus_id, to be precise). If you set it ++up before calling v4l2_device_register then it will be untouched. If dev is ++NULL, then you *must* setup v4l2_dev->name before calling v4l2_device_register. + + The first 'dev' argument is normally the struct device pointer of a pci_dev, +-usb_device or platform_device. ++usb_device or platform_device. It is rare for dev to be NULL, but it happens ++with ISA devices, for example. + + You unregister with: + +@@ -134,7 +138,7 @@ The recommended approach is as follows: static atomic_t drv_instance = ATOMIC_INIT(0); @@ -155,7 +200,7 @@ const struct pci_device_id *pci_id) { ... -@@ -218,7 +220,7 @@ to add new ops and categories. +@@ -218,7 +222,7 @@ to add new ops and categories. A sub-device driver initializes the v4l2_subdev struct using: @@ -164,7 +209,7 @@ Afterwards you need to initialize subdev->name with a unique name and set the module owner. This is done for you if you use the i2c helper functions. -@@ -226,7 +228,7 @@ module owner. This is done for you if you use the i2c helper functions. +@@ -226,7 +230,7 @@ module owner. This is done for you if you use the i2c helper functions. A device (bridge) driver needs to register the v4l2_subdev with the v4l2_device: @@ -173,7 +218,7 @@ This can fail if the subdev module disappeared before it could be registered. After this function was called successfully the subdev->dev field points to -@@ -234,17 +236,17 @@ the v4l2_device. +@@ -234,17 +238,17 @@ the v4l2_device. You can unregister a sub-device using: @@ -195,7 +240,7 @@ The macro will to the right NULL pointer checks and returns -ENODEV if subdev is NULL, -ENOIOCTLCMD if either subdev->core or subdev->core->g_chip_ident is -@@ -252,12 +254,12 @@ NULL, or the actual result of the subdev->ops->core->g_chip_ident ops. +@@ -252,19 +256,19 @@ NULL, or the actual result of the subdev->ops->core->g_chip_ident ops. It is also possible to call all or a subset of the sub-devices: @@ -210,7 +255,15 @@ Any error except -ENOIOCTLCMD will exit the loop with that error. If no errors (except -ENOIOCTLCMD) occured, then 0 is returned. -@@ -340,6 +342,12 @@ Make sure to call v4l2_device_unregister_subdev(sd) when the remove() callback + + The second argument to both calls is a group ID. If 0, then all subdevs are + called. If non-zero, then only those whose group ID match that value will +-be called. Before a bridge driver registers a subdev it can set subdev->grp_id ++be called. Before a bridge driver registers a subdev it can set sd->grp_id + to whatever value it wants (it's 0 by default). This value is owned by the + bridge driver and the sub-device driver will never modify or use it. + +@@ -340,6 +344,12 @@ Make sure to call v4l2_device_unregister_subdev(sd) when the remove() callback is called. This will unregister the sub-device from the bridge driver. It is safe to call this even if the sub-device was never registered. @@ -223,7 +276,7 @@ The bridge driver also has some helper functions it can use: -@@ -499,8 +507,8 @@ There are a few useful helper functions: +@@ -499,8 +509,8 @@ There are a few useful helper functions: You can set/get driver private data in the video_device struct using: @@ -234,7 +287,7 @@ Note that you can safely call video_set_drvdata() before calling video_register_device(). -@@ -519,3 +527,103 @@ void *video_drvdata(struct file *file); +@@ -519,3 +529,103 @@ void *video_drvdata(struct file *file); You can go from a video_device struct to the v4l2_device struct using: struct v4l2_device *v4l2_dev = vdev->v4l2_dev; @@ -347,6 +400,94 @@ 0x0a17 0x004e Pentax Optio 50 0x041e 0x405d Creative DiVi CAM 516 +0x08ca 0x2102 Aiptek DV T300 +diff --git a/arch/arm/plat-mxc/include/mach/mx3_camera.h b/arch/arm/plat-mxc/include/mach/mx3_camera.h +new file mode 100644 +index 0000000..36d7ff2 +--- /dev/null ++++ b/arch/arm/plat-mxc/include/mach/mx3_camera.h +@@ -0,0 +1,52 @@ ++/* ++ * mx3_camera.h - i.MX3x camera driver header file ++ * ++ * Copyright (C) 2008, Guennadi Liakhovetski, DENX Software Engineering, ++ * ++ * 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. ++ */ ++ [...70905 lines suppressed...] +- return 0; +- case VIDIOCSFREQ: +- if(copy_from_user(&tea->freq, arg, sizeof(tea->freq))) +- return -EFAULT; +- snd_tea575x_set_freq(tea); +- return 0; +- case VIDIOCGAUDIO: +- { +- struct video_audio v; +- memset(&v, 0, sizeof(v)); +- strcpy(v.name, "Radio"); +- if(copy_to_user(arg,&v, sizeof(v))) +- return -EFAULT; ++ } ++ return -EINVAL; ++} ++ ++static int vidioc_g_ctrl(struct file *file, void *priv, ++ struct v4l2_control *ctrl) ++{ ++ struct snd_tea575x *tea = video_drvdata(file); ++ ++ switch (ctrl->id) { ++ case V4L2_CID_AUDIO_MUTE: ++ if (tea->ops->mute) { ++ ctrl->value = tea->mute; + return 0; + } +- case VIDIOCSAUDIO: +- { +- struct video_audio v; +- if(copy_from_user(&v, arg, sizeof(v))) +- return -EFAULT; +- if (tea->ops->mute) +- tea->ops->mute(tea, +- (v.flags & +- VIDEO_AUDIO_MUTE) ? 1 : 0); +- if(v.audio) +- return -EINVAL; ++ } ++ return -EINVAL; ++} ++ ++static int vidioc_s_ctrl(struct file *file, void *priv, ++ struct v4l2_control *ctrl) ++{ ++ struct snd_tea575x *tea = video_drvdata(file); ++ ++ switch (ctrl->id) { ++ case V4L2_CID_AUDIO_MUTE: ++ if (tea->ops->mute) { ++ tea->ops->mute(tea, ctrl->value); ++ tea->mute = 1; + return 0; + } +- default: +- return -ENOIOCTLCMD; + } ++ return -EINVAL; ++} ++ ++static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i) ++{ ++ *i = 0; ++ return 0; + } + +-static void snd_tea575x_release(struct video_device *vfd) ++static int vidioc_s_input(struct file *filp, void *priv, unsigned int i) + { ++ if (i != 0) ++ return -EINVAL; ++ return 0; + } + + static int snd_tea575x_exclusive_open(struct file *file) +@@ -189,50 +260,91 @@ static int snd_tea575x_exclusive_release(struct file *file) + return 0; + } + ++static const struct v4l2_file_operations tea575x_fops = { ++ .owner = THIS_MODULE, ++ .open = snd_tea575x_exclusive_open, ++ .release = snd_tea575x_exclusive_release, ++ .ioctl = video_ioctl2, ++}; ++ ++static const struct v4l2_ioctl_ops tea575x_ioctl_ops = { ++ .vidioc_querycap = vidioc_querycap, ++ .vidioc_g_tuner = vidioc_g_tuner, ++ .vidioc_s_tuner = vidioc_s_tuner, ++ .vidioc_g_audio = vidioc_g_audio, ++ .vidioc_s_audio = vidioc_s_audio, ++ .vidioc_g_input = vidioc_g_input, ++ .vidioc_s_input = vidioc_s_input, ++ .vidioc_g_frequency = vidioc_g_frequency, ++ .vidioc_s_frequency = vidioc_s_frequency, ++ .vidioc_queryctrl = vidioc_queryctrl, ++ .vidioc_g_ctrl = vidioc_g_ctrl, ++ .vidioc_s_ctrl = vidioc_s_ctrl, ++}; ++ ++static struct video_device tea575x_radio = { ++ .name = "tea575x-tuner", ++ .fops = &tea575x_fops, ++ .ioctl_ops = &tea575x_ioctl_ops, ++ .release = video_device_release, ++}; ++ + /* + * initialize all the tea575x chips + */ + void snd_tea575x_init(struct snd_tea575x *tea) + { ++ int retval; + unsigned int val; ++ struct video_device *tea575x_radio_inst; + + val = tea->ops->read(tea); + if (val == 0x1ffffff || val == 0) { +- snd_printk(KERN_ERR "Cannot find TEA575x chip\n"); ++ snd_printk(KERN_ERR ++ "tea575x-tuner: Cannot find TEA575x chip\n"); + return; + } + +- memset(&tea->vd, 0, sizeof(tea->vd)); +- strcpy(tea->vd.name, tea->tea5759 ? "TEA5759 radio" : "TEA5757 radio"); +- tea->vd.release = snd_tea575x_release; +- video_set_drvdata(&tea->vd, tea); +- tea->vd.fops = &tea->fops; + tea->in_use = 0; +- tea->fops.owner = tea->card->module; +- tea->fops.open = snd_tea575x_exclusive_open; +- tea->fops.release = snd_tea575x_exclusive_release; +- tea->fops.ioctl = snd_tea575x_ioctl; +- if (video_register_device(&tea->vd, VFL_TYPE_RADIO, tea->dev_nr - 1) < 0) { +- snd_printk(KERN_ERR "unable to register tea575x tuner\n"); ++ tea->val = TEA575X_BIT_BAND_FM | TEA575X_BIT_SEARCH_10_40; ++ tea->freq = 90500 * 16; /* 90.5Mhz default */ ++ ++ tea575x_radio_inst = video_device_alloc(); ++ if (tea575x_radio_inst == NULL) { ++ printk(KERN_ERR "tea575x-tuner: not enough memory\n"); + return; + } +- tea->vd_registered = 1; + +- tea->val = TEA575X_BIT_BAND_FM | TEA575X_BIT_SEARCH_10_40; +- tea->freq = 90500 * 16; /* 90.5Mhz default */ ++ memcpy(tea575x_radio_inst, &tea575x_radio, sizeof(tea575x_radio)); ++ ++ strcpy(tea575x_radio.name, tea->tea5759 ? ++ "TEA5759 radio" : "TEA5757 radio"); ++ ++ video_set_drvdata(tea575x_radio_inst, tea); ++ ++ retval = video_register_device(tea575x_radio_inst, ++ VFL_TYPE_RADIO, radio_nr); ++ if (retval) { ++ printk(KERN_ERR "tea575x-tuner: can't register video device!\n"); ++ kfree(tea575x_radio_inst); ++ return; ++ } + + snd_tea575x_set_freq(tea); + + /* mute on init */ +- if (tea->ops->mute) ++ if (tea->ops->mute) { + tea->ops->mute(tea, 1); ++ tea->mute = 1; ++ } ++ tea->vd = tea575x_radio_inst; + } + + void snd_tea575x_exit(struct snd_tea575x *tea) + { +- if (tea->vd_registered) { +- video_unregister_device(&tea->vd); +- tea->vd_registered = 0; ++ if (tea->vd) { ++ video_unregister_device(tea->vd); ++ tea->vd = NULL; + } + } + +diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig +index 82b9bdd..6cc18bf 100644 +--- a/sound/pci/Kconfig ++++ b/sound/pci/Kconfig +@@ -487,7 +487,7 @@ config SND_FM801 + config SND_FM801_TEA575X_BOOL + bool "ForteMedia FM801 + TEA5757 tuner" + depends on SND_FM801 +- depends on VIDEO_V4L1=y || VIDEO_V4L1=SND_FM801 ++ depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801 + help + Say Y here to include support for soundcards based on the ForteMedia + FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media linux-2.6.29-lirc.patch: Index: linux-2.6.29-lirc.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.29-lirc.patch,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -r1.3 -r1.3.6.1 --- linux-2.6.29-lirc.patch 30 Jan 2009 19:15:58 -0000 1.3 +++ linux-2.6.29-lirc.patch 5 Mar 2009 01:30:25 -0000 1.3.6.1 @@ -1,30 +1,57 @@ +Linux Infrared Remote Control drivers -- http://www.lirc.org + +From http://git.wilsonet.com/linux-2.6-lirc.git/ + +Signed-off-by: Jarod Wilson + +--- + MAINTAINERS | 9 + drivers/input/Kconfig | 2 + drivers/input/Makefile | 2 + drivers/input/lirc/Kconfig | 118 +++ drivers/input/lirc/Makefile | 21 + drivers/input/lirc/lirc.h | 100 +++ - drivers/input/lirc/lirc_bt829.c | 381 +++++++++ - drivers/input/lirc/lirc_dev.c | 754 ++++++++++++++++++ - drivers/input/lirc/lirc_dev.h | 178 +++++ - drivers/input/lirc/lirc_i2c.c | 649 ++++++++++++++++ - drivers/input/lirc/lirc_igorplugusb.c | 554 +++++++++++++ - drivers/input/lirc/lirc_imon.c | 1369 ++++++++++++++++++++++++++++++++ - drivers/input/lirc/lirc_it87.c | 984 +++++++++++++++++++++++ + drivers/input/lirc/lirc_bt829.c | 383 +++++++++ + drivers/input/lirc/lirc_dev.c | 853 +++++++++++++++++++ + drivers/input/lirc/lirc_dev.h | 180 ++++ + drivers/input/lirc/lirc_i2c.c | 649 ++++++++++++++ + drivers/input/lirc/lirc_igorplugusb.c | 556 ++++++++++++ + drivers/input/lirc/lirc_imon.c | 1487 +++++++++++++++++++++++++++++++++ + drivers/input/lirc/lirc_it87.c | 984 ++++++++++++++++++++++ drivers/input/lirc/lirc_it87.h | 116 +++ - drivers/input/lirc/lirc_ite8709.c | 539 +++++++++++++ - drivers/input/lirc/lirc_mceusb.c | 784 +++++++++++++++++++ - drivers/input/lirc/lirc_mceusb2.c | 1119 ++++++++++++++++++++++++++ - drivers/input/lirc/lirc_parallel.c | 709 +++++++++++++++++ + drivers/input/lirc/lirc_ite8709.c | 539 ++++++++++++ + drivers/input/lirc/lirc_mceusb.c | 747 +++++++++++++++++ + drivers/input/lirc/lirc_mceusb2.c | 1099 ++++++++++++++++++++++++ + drivers/input/lirc/lirc_parallel.c | 709 ++++++++++++++++ drivers/input/lirc/lirc_parallel.h | 26 + - drivers/input/lirc/lirc_sasem.c | 933 ++++++++++++++++++++++ - drivers/input/lirc/lirc_serial.c | 1321 +++++++++++++++++++++++++++++++ - drivers/input/lirc/lirc_sir.c | 1294 ++++++++++++++++++++++++++++++ - drivers/input/lirc/lirc_streamzap.c | 772 ++++++++++++++++++ - drivers/input/lirc/lirc_ttusbir.c | 396 ++++++++++ - drivers/input/lirc/lirc_zilog.c | 1382 +++++++++++++++++++++++++++++++++ - - 24 files changed, 14503 insertions(+), 0 deletions(-) + drivers/input/lirc/lirc_sasem.c | 931 +++++++++++++++++++++ + drivers/input/lirc/lirc_serial.c | 1321 +++++++++++++++++++++++++++++ + drivers/input/lirc/lirc_sir.c | 1294 ++++++++++++++++++++++++++++ + drivers/input/lirc/lirc_streamzap.c | 775 +++++++++++++++++ + drivers/input/lirc/lirc_ttusbir.c | 398 +++++++++ + drivers/input/lirc/lirc_zilog.c | 1382 ++++++++++++++++++++++++++++++ + 25 files changed, 14681 insertions(+), 0 deletions(-) +diff --git a/MAINTAINERS b/MAINTAINERS +index 59fd2d1..ad1b16c 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -2749,6 +2749,15 @@ W: http://www.pasemi.com/ + L: linuxppc-dev at ozlabs.org + S: Supported + ++LINUX INFRARED REMOTE CONTROL DRIVERS (LIRC) ++P: Jarod Wilson ++M: jarod at redhat.com ++P: Christoph Bartelmus ++M: lirc at bartelmus.de ++W: http://www.lirc.org/ ++L: lirc-list at lists.sourceforge.net ++S: Maintained ++ + LINUX SECURITY MODULE (LSM) FRAMEWORK + P: Chris Wright + M: chrisw at sous-sol.org diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 5f9d860..2ba0904 100644 --- a/drivers/input/Kconfig @@ -39,7 +66,7 @@ endif diff --git a/drivers/input/Makefile b/drivers/input/Makefile -index 98c4f9a..6a1049b 100644 +index 4c9c745..99e2b5e 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC) += misc/ @@ -201,7 +228,7 @@ +obj-$(CONFIG_LIRC_ZILOG) += lirc_zilog.o diff --git a/drivers/input/lirc/lirc.h b/drivers/input/lirc/lirc.h new file mode 100644 -index 0000000..b6d124e +index 0000000..599b21c --- /dev/null +++ b/drivers/input/lirc/lirc.h @@ -0,0 +1,100 @@ @@ -270,27 +297,27 @@ + +/*** IOCTL commands for lirc driver ***/ + -+#define LIRC_GET_FEATURES _IOR('i', 0x00000000, __u32) ++#define LIRC_GET_FEATURES _IOR('i', 0x00000000, unsigned long) + -+#define LIRC_GET_SEND_MODE _IOR('i', 0x00000001, __u32) -+#define LIRC_GET_REC_MODE _IOR('i', 0x00000002, __u32) -+#define LIRC_GET_SEND_CARRIER _IOR('i', 0x00000003, __u32) -+#define LIRC_GET_REC_CARRIER _IOR('i', 0x00000004, __u32) -+#define LIRC_GET_SEND_DUTY_CYCLE _IOR('i', 0x00000005, __u32) -+#define LIRC_GET_REC_DUTY_CYCLE _IOR('i', 0x00000006, __u32) -+#define LIRC_GET_REC_RESOLUTION _IOR('i', 0x00000007, __u32) ++#define LIRC_GET_SEND_MODE _IOR('i', 0x00000001, unsigned long) ++#define LIRC_GET_REC_MODE _IOR('i', 0x00000002, unsigned long) ++#define LIRC_GET_SEND_CARRIER _IOR('i', 0x00000003, unsigned int) ++#define LIRC_GET_REC_CARRIER _IOR('i', 0x00000004, unsigned int) ++#define LIRC_GET_SEND_DUTY_CYCLE _IOR('i', 0x00000005, unsigned int) ++#define LIRC_GET_REC_DUTY_CYCLE _IOR('i', 0x00000006, unsigned int) ++#define LIRC_GET_REC_RESOLUTION _IOR('i', 0x00000007, unsigned int) + +/* code length in bits, currently only for LIRC_MODE_LIRCCODE */ -+#define LIRC_GET_LENGTH _IOR('i', 0x0000000f, __u32) ++#define LIRC_GET_LENGTH _IOR('i', 0x0000000f, unsigned long) + -+#define LIRC_SET_SEND_MODE _IOW('i', 0x00000011, __u32) -+#define LIRC_SET_REC_MODE _IOW('i', 0x00000012, __u32) ++#define LIRC_SET_SEND_MODE _IOW('i', 0x00000011, unsigned long) ++#define LIRC_SET_REC_MODE _IOW('i', 0x00000012, unsigned long) +/* Note: these can reset the according pulse_width */ -+#define LIRC_SET_SEND_CARRIER _IOW('i', 0x00000013, __u32) -+#define LIRC_SET_REC_CARRIER _IOW('i', 0x00000014, __u32) -+#define LIRC_SET_SEND_DUTY_CYCLE _IOW('i', 0x00000015, __u32) -+#define LIRC_SET_REC_DUTY_CYCLE _IOW('i', 0x00000016, __u32) -+#define LIRC_SET_TRANSMITTER_MASK _IOW('i', 0x00000017, __u32) ++#define LIRC_SET_SEND_CARRIER _IOW('i', 0x00000013, unsigned int) ++#define LIRC_SET_REC_CARRIER _IOW('i', 0x00000014, unsigned int) ++#define LIRC_SET_SEND_DUTY_CYCLE _IOW('i', 0x00000015, unsigned int) ++#define LIRC_SET_REC_DUTY_CYCLE _IOW('i', 0x00000016, unsigned int) ++#define LIRC_SET_TRANSMITTER_MASK _IOW('i', 0x00000017, unsigned int) + +/* + * to set a range use @@ -299,18 +326,18 @@ + * LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER with the upper bound + */ + -+#define LIRC_SET_REC_DUTY_CYCLE_RANGE _IOW('i', 0x0000001e, __u32) -+#define LIRC_SET_REC_CARRIER_RANGE _IOW('i', 0x0000001f, __u32) ++#define LIRC_SET_REC_DUTY_CYCLE_RANGE _IOW('i', 0x0000001e, unsigned int) ++#define LIRC_SET_REC_CARRIER_RANGE _IOW('i', 0x0000001f, unsigned int) + +#define LIRC_NOTIFY_DECODE _IO('i', 0x00000020) + +#endif diff --git a/drivers/input/lirc/lirc_bt829.c b/drivers/input/lirc/lirc_bt829.c new file mode 100644 -index 0000000..581f6e2 +index 0000000..c3852f2 --- /dev/null +++ b/drivers/input/lirc/lirc_bt829.c -@@ -0,0 +1,381 @@ +@@ -0,0 +1,383 @@ +/* + * Remote control driver for the TV-card based on bt829 + * @@ -364,11 +391,13 @@ +#define DATA_PCI_OFF 0x7FFC00 +#define WAIT_CYCLE 20 + ++#define DRIVER_NAME "lirc_bt829" ++ +static int debug; -+#define dprintk(fmt, args...) \ -+ do { \ -+ if (debug) \ -+ printk(KERN_DEBUG fmt, ## args); \ ++#define dprintk(fmt, args...) \ ++ do { \ ++ if (debug) \ ++ printk(KERN_DEBUG DRIVER_NAME ": "fmt, ## args); \ + } while (0) + +static int atir_minor; @@ -383,20 +412,20 @@ + my_dev = pci_get_device(PCI_VENDOR_ID_ATI, + PCI_DEVICE_ID_ATI_264VT, NULL); + if (my_dev) { -+ printk(KERN_ERR "ATIR: Using device: %s\n", ++ printk(KERN_ERR DRIVER_NAME "Using device: %s\n", + pci_name(my_dev)); + pci_addr_phys = 0; + if (my_dev->resource[0].flags & IORESOURCE_MEM) { + pci_addr_phys = my_dev->resource[0].start; -+ printk(KERN_INFO "ATIR memory at 0x%08X \n", ++ printk(KERN_INFO DRIVER_NAME "memory at 0x%08X \n", + (unsigned int)pci_addr_phys); + } + if (pci_addr_phys == 0) { -+ printk(KERN_ERR "ATIR no memory resource ?\n"); ++ printk(KERN_ERR DRIVER_NAME "no memory resource ?\n"); + return NULL; + } + } else { -+ printk(KERN_ERR "ATIR: pci_prob failed\n"); ++ printk(KERN_ERR DRIVER_NAME "pci_probe failed\n"); + return NULL; + } + return my_dev; @@ -409,7 +438,7 @@ + status = poll_main(); + key = (status >> 8) & 0xFF; + if (status & 0xFF) { -+ dprintk("ATIR reading key %02X\n", key); ++ dprintk("reading key %02X\n", key); + lirc_buffer_write(buf, &key); + return 0; + } @@ -418,13 +447,13 @@ + +static int atir_set_use_inc(void *data) +{ -+ dprintk("ATIR driver is opened\n"); ++ dprintk("driver is opened\n"); + return 0; +} + +static void atir_set_use_dec(void *data) +{ -+ dprintk("ATIR driver is closed\n"); ++ dprintk("driver is closed\n"); +} + +int init_module(void) @@ -451,10 +480,10 @@ + + atir_minor = lirc_register_driver(&atir_driver); + if (atir_minor < 0) { -+ printk(KERN_ERR "lirc_bt829: failed to register driver!\n"); ++ printk(KERN_ERR DRIVER_NAME "failed to register driver!\n"); + return atir_minor; + } -+ dprintk("ATIR driver is registered on minor %d\n", atir_minor); ++ dprintk("driver is registered on minor %d\n", atir_minor); + + return 0; +} @@ -470,7 +499,7 @@ +{ + pci_addr_lin = ioremap(pci_addr_phys + DATA_PCI_OFF, 0x400); + if (pci_addr_lin == 0) { -+ printk(KERN_INFO "atir: pci mem must be mapped\n"); ++ printk(KERN_INFO DRIVER_NAME "pci mem must be mapped\n"); + return 0; + } + return 1; @@ -690,14 +719,14 @@ +MODULE_DESCRIPTION("IR remote driver for bt829 based TV cards"); +MODULE_LICENSE("GPL"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Debug enabled or not"); diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c new file mode 100644 -index 0000000..e7b52c4 +index 0000000..dddd999 --- /dev/null +++ b/drivers/input/lirc/lirc_dev.c -@@ -0,0 +1,754 @@ +@@ -0,0 +1,853 @@ +/* + * LIRC base driver + * @@ -735,6 +764,10 @@ +#include +#include +#include ++#include ++#ifdef CONFIG_COMPAT ++#include ++#endif + +#include "lirc.h" +#include "lirc_dev.h" @@ -861,6 +894,9 @@ + .write = lirc_dev_fop_write, + .poll = lirc_dev_fop_poll, + .ioctl = lirc_dev_fop_ioctl, ++#ifdef CONFIG_COMPAT ++ .compat_ioctl = lirc_dev_fop_compat_ioctl, ++#endif + .open = lirc_dev_fop_open, + .release = lirc_dev_fop_close, + .owner = THIS_MODULE, @@ -1000,9 +1036,8 @@ + d->name[sizeof(d->name)-1] = '\0'; + + bytes_in_key = BITS_TO_LONGS(d->code_length); -+ -+ chunk_size = d->chunk_size ? d->chunk_size : bytes_in_key; + buffer_size = d->buffer_size ? d->buffer_size : BUFLEN / bytes_in_key; ++ chunk_size = d->chunk_size ? d->chunk_size : bytes_in_key; + + if (d->rbuf) { + ir->buf = d->rbuf; @@ -1277,8 +1312,7 @@ + */ + break; + case LIRC_GET_LENGTH: -+ result = put_user((unsigned long)ir->d.code_length, -+ (unsigned long *)arg); ++ result = put_user(ir->d.code_length, (unsigned long *)arg); + break; + default: + result = -EINVAL; @@ -1291,6 +1325,100 @@ +} +EXPORT_SYMBOL(lirc_dev_fop_ioctl); + ++#ifdef CONFIG_COMPAT ++#define LIRC_GET_FEATURES_COMPAT32 _IOR('i', 0x00000000, __u32) ++ ++#define LIRC_GET_SEND_MODE_COMPAT32 _IOR('i', 0x00000001, __u32) ++#define LIRC_GET_REC_MODE_COMPAT32 _IOR('i', 0x00000002, __u32) ++ ++#define LIRC_GET_LENGTH_COMPAT32 _IOR('i', 0x0000000f, __u32) ++ ++#define LIRC_SET_SEND_MODE_COMPAT32 _IOW('i', 0x00000011, __u32) ++#define LIRC_SET_REC_MODE_COMPAT32 _IOW('i', 0x00000012, __u32) ++ ++long lirc_dev_fop_compat_ioctl(struct file *file, ++ unsigned int cmd32, ++ unsigned long arg) ++{ ++ mm_segment_t old_fs; ++ int ret; ++ unsigned long val; ++ unsigned int cmd; ++ ++ switch (cmd32) { ++ case LIRC_GET_FEATURES_COMPAT32: ++ case LIRC_GET_SEND_MODE_COMPAT32: ++ case LIRC_GET_REC_MODE_COMPAT32: ++ case LIRC_GET_LENGTH_COMPAT32: ++ case LIRC_SET_SEND_MODE_COMPAT32: ++ case LIRC_SET_REC_MODE_COMPAT32: ++ /* ++ * These commands expect (unsigned long *) arg ++ * but the 32-bit app supplied (__u32 *). ++ * Conversion is required. ++ */ ++ if (get_user(val, (__u32 *)compat_ptr(arg))) ++ return -EFAULT; ++ lock_kernel(); ++ /* ++ * tell lirc_dev_fop_ioctl that it's safe to use the pointer ++ * to val which is in kernel address space and not in ++ * user address space. ++ */ ++ old_fs = get_fs(); ++ set_fs(KERNEL_DS); ++ ++ cmd = _IOC(_IOC_DIR(cmd32), _IOC_TYPE(cmd32), _IOC_NR(cmd32), ++ (_IOC_TYPECHECK(unsigned long))); ++ ret = lirc_dev_fop_ioctl(file->f_path.dentry->d_inode, file, ++ cmd, (unsigned long)(&val)); ++ ++ set_fs(old_fs); ++ unlock_kernel(); ++ switch (cmd) { ++ case LIRC_GET_FEATURES: ++ case LIRC_GET_SEND_MODE: ++ case LIRC_GET_REC_MODE: ++ case LIRC_GET_LENGTH: ++ if (!ret && put_user(val, (__u32 *)compat_ptr(arg))) ++ return -EFAULT; ++ break; ++ } ++ return ret; ++ ++ case LIRC_GET_SEND_CARRIER: ++ case LIRC_GET_REC_CARRIER: ++ case LIRC_GET_SEND_DUTY_CYCLE: ++ case LIRC_GET_REC_DUTY_CYCLE: ++ case LIRC_GET_REC_RESOLUTION: ++ case LIRC_SET_SEND_CARRIER: ++ case LIRC_SET_REC_CARRIER: ++ case LIRC_SET_SEND_DUTY_CYCLE: ++ case LIRC_SET_REC_DUTY_CYCLE: ++ case LIRC_SET_TRANSMITTER_MASK: ++ case LIRC_SET_REC_DUTY_CYCLE_RANGE: ++ case LIRC_SET_REC_CARRIER_RANGE: ++ /* ++ * These commands expect (unsigned int *)arg ++ * so no problems here. Just handle the locking. ++ */ ++ lock_kernel(); ++ cmd = cmd32; ++ ret = lirc_dev_fop_ioctl(file->f_path.dentry->d_inode, ++ file, cmd, arg); ++ unlock_kernel(); ++ return ret; ++ default: ++ /* unknown */ ++ printk(KERN_ERR "lirc_dev: %s(%s:%d): Unknown cmd %08x\n", ++ __func__, current->comm, current->pid, cmd32); ++ return -ENOIOCTLCMD; ++ } ++} ++EXPORT_SYMBOL(lirc_dev_fop_compat_ioctl); ++#endif ++ ++ +ssize_t lirc_dev_fop_read(struct file *file, + char *buffer, + size_t length, @@ -1450,14 +1578,14 @@ +MODULE_AUTHOR("Artur Lipowski"); +MODULE_LICENSE("GPL"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); diff --git a/drivers/input/lirc/lirc_dev.h b/drivers/input/lirc/lirc_dev.h new file mode 100644 -index 0000000..bf05a7c +index 0000000..b12d519 --- /dev/null +++ b/drivers/input/lirc/lirc_dev.h -@@ -0,0 +1,178 @@ +@@ -0,0 +1,180 @@ +/* + * LIRC base driver + * @@ -1544,12 +1672,12 @@ +struct lirc_driver { + char name[40]; + int minor; -+ int code_length; ++ unsigned long code_length; ++ unsigned int buffer_size; /* in chunks holding one code each */ + int sample_rate; + unsigned long features; + + unsigned int chunk_size; -+ unsigned int buffer_size; /* in chunks */ + + void *data; + int (*add_to_buf) (void *data, struct lirc_buffer *buf); @@ -1634,11 +1762,13 @@ + loff_t *ppos); +ssize_t lirc_dev_fop_write(struct file *file, const char *buffer, size_t length, + loff_t *ppos); ++long lirc_dev_fop_compat_ioctl(struct file *file, unsigned int cmd32, ++ unsigned long arg); + +#endif diff --git a/drivers/input/lirc/lirc_i2c.c b/drivers/input/lirc/lirc_i2c.c new file mode 100644 -index 0000000..01a4ced +index 0000000..dedf415 --- /dev/null +++ b/drivers/input/lirc/lirc_i2c.c @@ -0,0 +1,649 @@ @@ -2283,20 +2413,20 @@ + "Ulrich Mueller, Stefan Jahn, Jerome Brock"); +MODULE_LICENSE("GPL"); + -+module_param(minor, int, 0444); ++module_param(minor, int, S_IRUGO); +MODULE_PARM_DESC(minor, "Preferred minor device number"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); + +module_init(lirc_i2c_init); +module_exit(lirc_i2c_exit); diff --git a/drivers/input/lirc/lirc_igorplugusb.c b/drivers/input/lirc/lirc_igorplugusb.c new file mode 100644 -index 0000000..7dd8844 +index 0000000..ff49bdd --- /dev/null +++ b/drivers/input/lirc/lirc_igorplugusb.c -@@ -0,0 +1,554 @@ +@@ -0,0 +1,556 @@ +/* + * lirc_igorplugusb - USB remote support for LIRC + * @@ -2725,7 +2855,7 @@ + driver->set_use_dec = &set_use_dec; + driver->sample_rate = sample_rate; /* per second */ + driver->add_to_buf = &usb_remote_poll; -+ driver->dev = &dev->dev; ++ driver->dev = &intf->dev; + driver->owner = THIS_MODULE; + + init_waitqueue_head(&ir->wait_out); @@ -2759,11 +2889,13 @@ + do_gettimeofday(&ir->last_time); + + if (dev->descriptor.iManufacturer -+ && usb_string(dev, dev->descriptor.iManufacturer, buf, 63) > 0) -+ strncpy(name, buf, 128); ++ && usb_string(dev, dev->descriptor.iManufacturer, ++ buf, sizeof(buf)) > 0) ++ strlcpy(name, buf, sizeof(name)); + if (dev->descriptor.iProduct -+ && usb_string(dev, dev->descriptor.iProduct, buf, 63) > 0) -+ snprintf(name, 128, "%s %s", name, buf); ++ && usb_string(dev, dev->descriptor.iProduct, buf, sizeof(buf)) > 0) ++ snprintf(name + strlen(name), sizeof(name) - strlen(name), ++ " %s", buf); + printk(DRIVER_NAME "[%d]: %s on usb%d:%d\n", devnum, name, + dev->bus->busnum, devnum); + @@ -2848,17 +2980,17 @@ +MODULE_LICENSE("GPL"); +MODULE_DEVICE_TABLE(usb, usb_remote_id_table); + -+module_param(sample_rate, int, 0644); ++module_param(sample_rate, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(sample_rate, "Sampling rate in Hz (default: 100)"); + diff --git a/drivers/input/lirc/lirc_imon.c b/drivers/input/lirc/lirc_imon.c new file mode 100644 -index 0000000..a0d052a +index 0000000..05cb293 --- /dev/null +++ b/drivers/input/lirc/lirc_imon.c -@@ -0,0 +1,1369 @@ +@@ -0,0 +1,1487 @@ +/* -+ * lirc_imon.c: LIRC/VFD/LCD driver for Ahanix/Soundgraph IMON IR/VFD/LCD ++ * lirc_imon.c: LIRC/VFD/LCD driver for Ahanix/Soundgraph iMON IR/VFD/LCD + * including the iMON PAD model + * + * Copyright(C) 2004 Venky Raju(dev at venky.ws) @@ -2885,6 +3017,7 @@ +#include +#include +#include ++#include + +#include "lirc.h" +#include "lirc_dev.h" @@ -2912,7 +3045,11 @@ +static void usb_rx_callback(struct urb *urb); +static void usb_tx_callback(struct urb *urb); + -+/* Display file_operations function prototypes */ ++/* suspend/resume support */ ++static int imon_resume(struct usb_interface *intf); ++static int imon_suspend(struct usb_interface *intf, pm_message_t message); ++ ++/* display file_operations function prototypes */ +static int display_open(struct inode *inode, struct file *file); +static int display_close(struct inode *inode, struct file *file); + @@ -2937,14 +3074,14 @@ +struct imon_context { + struct usb_device *usbdev; + int display_supported; /* not all controllers do */ -+ int display_isopen; /* Display port has been opened */ ++ int display_isopen; /* display port has been opened */ + int ir_isopen; /* IR port open */ + int ir_isassociating; /* IR port open for association */ + int dev_present; /* USB device presence */ + struct mutex lock; /* to lock this object */ + wait_queue_head_t remove_ok; /* For unexpected USB disconnects */ + -+ int display_proto_6p; /* Display requires 6th packet */ ++ int display_proto_6p; /* display requires 6th packet */ + int ir_onboard_decode; /* IR signals decoded onboard */ + + struct lirc_driver *driver; @@ -2970,7 +3107,7 @@ + } tx; +}; + -+/* Display file operations. Nb: lcd_write will be subbed in as needed later */ ++/* display file operations. Nb: lcd_write will be subbed in as needed later */ +static struct file_operations display_fops = { + .owner = THIS_MODULE, + .open = &display_open, @@ -2985,7 +3122,7 @@ + IMON_DISPLAY_TYPE_NONE, +}; + -+/* USB Device ID for IMON USB Control Board */ ++/* USB Device ID for iMON USB Control Board */ +static struct usb_device_id imon_usb_id_table[] = { + /* iMON USB Control Board (IR & VFD) */ + { USB_DEVICE(0x0aa8, 0xffda) }, @@ -2995,7 +3132,7 @@ + { USB_DEVICE(0x04e8, 0xff30) }, + /* iMON USB Control Board (IR & VFD) */ + { USB_DEVICE(0x15c2, 0xffda) }, -+ /* iMON USB Control Board (IR & LCD) *and* iMon Knob (IR only) */ ++ /* iMON USB Control Board (IR & LCD) *and* iMON Knob (IR only) */ + { USB_DEVICE(0x15c2, 0xffdc) }, + /* iMON USB Control Board (IR & LCD) */ + { USB_DEVICE(0x15c2, 0x0034) }, @@ -3033,7 +3170,7 @@ +static unsigned char display_packet6[] = { + 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF }; + -+/* newer iMon models use control endpoints */ ++/* newer iMON models use control endpoints */ +static struct usb_device_id ctl_ep_device_list[] = { + { USB_DEVICE(0x15c2, 0x0034) }, + { USB_DEVICE(0x15c2, 0x0036) }, @@ -3046,7 +3183,7 @@ + {} +}; + -+/* iMon LCD models user a different write op */ ++/* iMON LCD models user a different write op */ +static struct usb_device_id lcd_device_list[] = { + { USB_DEVICE(0x15c2, 0xffdc) }, + { USB_DEVICE(0x15c2, 0x0034) }, @@ -3055,7 +3192,7 @@ + {} +}; + -+/* iMon devices with front panel buttons need a larger buffer */ ++/* iMON devices with front panel buttons need a larger buffer */ +static struct usb_device_id large_buffer_list[] = { + { USB_DEVICE(0x15c2, 0x0038) }, + { USB_DEVICE(0x15c2, 0x0045) }, @@ -3075,7 +3212,7 @@ + {} +}; + -+/* Some iMon devices have no lcd/vfd, don't set one up */ ++/* Some iMON devices have no lcd/vfd, don't set one up */ +static struct usb_device_id ir_only_list[] = { + { USB_DEVICE(0x0aa8, 0x8001) }, + { USB_DEVICE(0x04e8, 0xff30) }, @@ -3092,6 +3229,8 @@ + .name = MOD_NAME, + .probe = imon_probe, + .disconnect = imon_disconnect, ++ .suspend = imon_suspend, ++ .resume = imon_resume, + .id_table = imon_usb_id_table, +}; + @@ -3117,9 +3256,9 @@ +MODULE_VERSION(MOD_VERSION); +MODULE_LICENSE("GPL"); +MODULE_DEVICE_TABLE(usb, imon_usb_id_table); -+module_param(debug, int, 0); ++module_param(debug, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes(default: no)"); -+module_param(display_type, int, 0); ++module_param(display_type, int, S_IRUGO); +MODULE_PARM_DESC(display_type, "Type of attached display. 0=autodetect, " + "1=vfd, 2=lcd, 3=none (default: autodetect)"); + @@ -3152,7 +3291,7 @@ +} + +/** -+ * Called when the Display device (e.g. /dev/lcd0) ++ * Called when the display device (e.g. /dev/lcd0) + * is opened by the application. + */ +static int display_open(struct inode *inode, struct file *file) @@ -3185,15 +3324,15 @@ + mutex_lock(&context->lock); + + if (!context->display_supported) { -+ err("%s: Display not supported by device", __func__); ++ err("%s: display not supported by device", __func__); + retval = -ENODEV; + } else if (context->display_isopen) { -+ err("%s: Display port is already open", __func__); ++ err("%s: display port is already open", __func__); + retval = -EBUSY; + } else { + context->display_isopen = 1; + file->private_data = context; -+ printk(KERN_INFO "Display port opened\n"); ++ printk(KERN_INFO "display port opened\n"); + } + + mutex_unlock(&context->lock); @@ -3204,7 +3343,7 @@ +} + +/** -+ * Called when the Display device (e.g. /dev/lcd0) ++ * Called when the display device (e.g. /dev/lcd0) + * is closed by the application. + */ +static int display_close(struct inode *inode, struct file *file) @@ -3222,14 +3361,14 @@ + mutex_lock(&context->lock); + + if (!context->display_supported) { -+ err("%s: Display not supported by device", __func__); ++ err("%s: display not supported by device", __func__); + retval = -ENODEV; + } else if (!context->display_isopen) { -+ err("%s: Display is not open", __func__); ++ err("%s: display is not open", __func__); + retval = -EIO; + } else { + context->display_isopen = 0; -+ printk(KERN_INFO "Display port closed\n"); ++ printk(KERN_INFO "display port closed\n"); + if (!context->dev_present && !context->ir_isopen) { + /* + * Device disconnected before close and IR port is not @@ -3247,7 +3386,7 @@ +} + +/** -+ * Sends a packet to the Display. ++ * Sends a packet to the display. + */ +static int send_packet(struct imon_context *context) +{ @@ -3426,7 +3565,7 @@ + + +/** -+ * Writes data to the VFD. The IMON VFD is 2x16 characters ++ * Writes data to the VFD. The iMON VFD is 2x16 characters + * and requires data in 5 consecutive USB interrupt packets, + * each packet but the last carrying 7 bytes. + * @@ -3698,18 +3837,113 @@ + return; +} + ++static inline int tv2int(const struct timeval *a, const struct timeval *b) ++{ ++ int usecs = 0; ++ int sec = 0; ++ ++ if (b->tv_usec > a->tv_usec) { ++ usecs = 1000000; ++ sec--; ++ } ++ ++ usecs += a->tv_usec - b->tv_usec; ++ ++ sec += a->tv_sec - b->tv_sec; ++ sec *= 1000; ++ usecs /= 1000; ++ sec += usecs; ++ ++ if (sec < 0) ++ sec = 1000; ++ ++ return sec; ++} ++ ++/** ++ * The directional pad is overly sensitive in keyboard mode, so we do some ++ * interesting contortions to make it less touchy. ++ */ ++#define IMON_PAD_TIMEOUT 1000 /* in msecs */ ++#define IMON_PAD_THRESHOLD 80 /* 160x160 square */ ++static int stabilize(int a, int b) ++{ ++ struct timeval ct; ++ static struct timeval prev_time = {0, 0}; ++ static struct timeval hit_time = {0, 0}; ++ static int x, y, prev_result, hits; ++ int result = 0; ++ int msec, msec_hit; ++ ++ do_gettimeofday(&ct); ++ msec = tv2int(&ct, &prev_time); ++ msec_hit = tv2int(&ct, &hit_time); ++ ++ if (msec > 100) { ++ x = 0; ++ y = 0; ++ hits = 0; ++ } ++ ++ x += a; ++ y += b; ++ ++ prev_time = ct; ++ ++ if (abs(x) > IMON_PAD_THRESHOLD || abs(y) > IMON_PAD_THRESHOLD) { ++ if (abs(y) > abs(x)) ++ result = (y > 0) ? 0x7F : 0x80; ++ else ++ result = (x > 0) ? 0x7F00 : 0x8000; ++ ++ x = 0; ++ y = 0; ++ ++ if (result == prev_result) { ++ hits++; ++ ++ if (hits > 3) { ++ switch (result) { ++ case 0x7F: ++ y = 17 * IMON_PAD_THRESHOLD / 30; ++ break; ++ case 0x80: ++ y -= 17 * IMON_PAD_THRESHOLD / 30; ++ break; ++ case 0x7F00: ++ x = 17 * IMON_PAD_THRESHOLD / 30; ++ break; ++ case 0x8000: ++ x -= 17 * IMON_PAD_THRESHOLD / 30; ++ break; ++ } ++ } ++ ++ if (hits == 2 && msec_hit < IMON_PAD_TIMEOUT) { ++ result = 0; ++ hits = 1; ++ } ++ } else { ++ prev_result = result; ++ hits = 1; ++ hit_time = ct; ++ } ++ } ++ ++ return result; ++} ++ +/** + * Process the incoming packet + */ +static void incoming_packet(struct imon_context *context, -+ struct urb *urb) ++ struct urb *urb) +{ + int len = urb->actual_length; + unsigned char *buf = urb->transfer_buffer; + int octet, bit; + unsigned char mask; -+ int chunk_num; -+ int i; ++ int i, chunk_num, dir; + + /* + * we need to add some special handling for @@ -3731,17 +3965,11 @@ + * try to ignore when they get too close + */ + if ((buf[1] == 0) && ((buf[2] != 0) || (buf[3] != 0))) { -+ int y = (int)(char)buf[2]; -+ int x = (int)(char)buf[3]; -+ if (abs(abs(x) - abs(y)) < 3) { ++ dir = stabilize((int)(char)buf[2], (int)(char)buf[3]); ++ if (!dir) + return; -+ } else if (abs(y) > abs(x)) { -+ buf[2] = 0x00; -+ buf[3] = (y > 0) ? 0x7f : 0x80; -+ } else { -+ buf[3] = 0x00; -+ buf[2] = (x > 0) ? 0x7f : 0x80; -+ } ++ buf[2] = dir & 0xFF; ++ buf[3] = (dir >> 8) & 0xFF; + } + } + @@ -3903,7 +4131,7 @@ + struct imon_context *context = NULL; + int i; + -+ printk(KERN_INFO "%s: found IMON device\n", __func__); ++ printk(KERN_INFO "%s: found iMON device\n", __func__); + + /* + * If it's the LCD, as opposed to the VFD, we just need to replace @@ -3930,7 +4158,7 @@ + /* + * Scan the endpoint list and set: + * first input endpoint = IR endpoint -+ * first output endpoint = Display endpoint ++ * first output endpoint = display endpoint + */ + for (i = 0; i < num_endpts && !(ir_ep_found && display_ep_found); ++i) { + struct usb_endpoint_descriptor *ep; @@ -3963,7 +4191,7 @@ + + /* + * If we didn't find a display endpoint, this is probably one of the -+ * newer iMon devices that use control urb instead of interrupt ++ * newer iMON devices that use control urb instead of interrupt + */ + if (!display_ep_found) { + if (usb_match_id(interface, ctl_ep_device_list)) { @@ -3977,7 +4205,7 @@ + } + + /* -+ * Some iMon receivers have no display. Unfortunately, it seems ++ * Some iMON receivers have no display. Unfortunately, it seems + * that SoundGraph recycles device IDs between devices both with + * and without... :\ + */ @@ -4006,7 +4234,7 @@ + ir_onboard_decode); + } + -+ /* Determine if Display requires 6 packets */ ++ /* Determine if display requires 6 packets */ + if (display_ep_found) { + if (usb_match_id(interface, display_proto_6p_list)) + display_proto_6p = 1; @@ -4020,13 +4248,13 @@ + + context = kzalloc(sizeof(struct imon_context), GFP_KERNEL); + if (!context) { -+ err("%s: kmalloc failed for context", __func__); ++ err("%s: kzalloc failed for context", __func__); + alloc_status = 1; + goto alloc_status_switch; + } + driver = kzalloc(sizeof(struct lirc_driver), GFP_KERNEL); + if (!driver) { -+ err("%s: kmalloc failed for lirc_driver", __func__); ++ err("%s: kzalloc failed for lirc_driver", __func__); + alloc_status = 2; + goto alloc_status_switch; + } @@ -4050,7 +4278,7 @@ + if (display_ep_found) { + tx_urb = usb_alloc_urb(0, GFP_KERNEL); + if (!tx_urb) { -+ err("%s: usb_alloc_urb failed for Display urb", ++ err("%s: usb_alloc_urb failed for display urb", + __func__); + alloc_status = 6; + goto alloc_status_switch; @@ -4071,7 +4299,7 @@ + driver->rbuf = rbuf; + driver->set_use_inc = ir_open; + driver->set_use_dec = ir_close; -+ driver->dev = &usbdev->dev; ++ driver->dev = &interface->dev; + driver->owner = THIS_MODULE; + + mutex_lock(&context->lock); @@ -4115,11 +4343,11 @@ + + if (display_ep_found && context->display_supported) { + if (debug) -+ printk(KERN_INFO "Registering Display with sysfs\n"); ++ printk(KERN_INFO "Registering display with sysfs\n"); + if (usb_register_dev(interface, &imon_class)) { + /* Not a fatal error, so ignore */ + printk(KERN_INFO "%s: could not get a minor number for " -+ "Display\n", __func__); ++ "display\n", __func__); + } + } + @@ -4203,6 +4431,27 @@ + printk(KERN_INFO "%s: iMON device disconnected\n", __func__); +} + ++static int imon_suspend(struct usb_interface *intf, pm_message_t message) ++{ ++ struct imon_context *context = usb_get_intfdata(intf); ++ ++ if (context->ir_isopen) ++ usb_kill_urb(context->rx_urb); ++ ++ return 0; ++} ++ ++static int imon_resume(struct usb_interface *intf) ++{ ++ int rc = 0; ++ struct imon_context *context = usb_get_intfdata(intf); ++ ++ if (context->ir_isopen) ++ rc = usb_submit_urb(context->rx_urb, GFP_ATOMIC); ++ ++ return rc; ++} ++ +static int __init imon_init(void) +{ + int rc; @@ -4215,6 +4464,7 @@ + err("%s: usb register failed(%d)", __func__, rc); + return -ENODEV; + } ++ + return 0; +} + @@ -4228,7 +4478,7 @@ +module_exit(imon_exit); diff --git a/drivers/input/lirc/lirc_it87.c b/drivers/input/lirc/lirc_it87.c new file mode 100644 -index 0000000..3a3484c +index 0000000..232ba97 --- /dev/null +++ b/drivers/input/lirc/lirc_it87.c @@ -0,0 +1,984 @@ @@ -5181,24 +5431,24 @@ +MODULE_AUTHOR("Hans-Gunter Lutke Uphues"); +MODULE_LICENSE("GPL"); + -+module_param(io, int, 0444); ++module_param(io, int, S_IRUGO); +MODULE_PARM_DESC(io, "I/O base address (default: 0x310)"); + -+module_param(irq, int, 0444); ++module_param(irq, int, S_IRUGO); +#ifdef LIRC_IT87_DIGIMATRIX +MODULE_PARM_DESC(irq, "Interrupt (1,3-12) (default: 9)"); +#else +MODULE_PARM_DESC(irq, "Interrupt (1,3-12) (default: 7)"); +#endif + -+module_param(it87_enable_demodulator, bool, 0444); ++module_param(it87_enable_demodulator, bool, S_IRUGO); +MODULE_PARM_DESC(it87_enable_demodulator, + "Receiver demodulator enable/disable (1/0), default: 0"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); + -+module_param(digimatrix, bool, 0644); ++module_param(digimatrix, bool, S_IRUGO | S_IWUSR); +#ifdef LIRC_IT87_DIGIMATRIX +MODULE_PARM_DESC(digimatrix, + "Asus Digimatrix it87 compat. enable/disable (1/0), default: 1"); @@ -5208,7 +5458,7 @@ +#endif + + -+module_param(it87_freq, int, 0444); ++module_param(it87_freq, int, S_IRUGO); +#ifdef LIRC_IT87_DIGIMATRIX +MODULE_PARM_DESC(it87_freq, + "Carrier demodulator frequency (kHz), (default: 36)"); @@ -5340,7 +5590,7 @@ +/********************************* ITE IT87xx ************************/ diff --git a/drivers/input/lirc/lirc_ite8709.c b/drivers/input/lirc/lirc_ite8709.c new file mode 100644 -index 0000000..6a544ec +index 0000000..3d53181 --- /dev/null +++ b/drivers/input/lirc/lirc_ite8709.c @@ -0,0 +1,539 @@ @@ -5881,14 +6131,14 @@ +MODULE_AUTHOR("Gr??gory Lardi??re"); +MODULE_LICENSE("GPL"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); diff --git a/drivers/input/lirc/lirc_mceusb.c b/drivers/input/lirc/lirc_mceusb.c new file mode 100644 -index 0000000..16f9757 +index 0000000..2e94699 --- /dev/null +++ b/drivers/input/lirc/lirc_mceusb.c -@@ -0,0 +1,784 @@ +@@ -0,0 +1,747 @@ +/* + * USB Microsoft IR Transceiver driver - 0.2 + * @@ -5980,15 +6230,9 @@ + struct urb *write_urb; /* the urb used to send data */ + __u8 bulk_out_endpointAddr; /* the address of bulk out endpoint */ + -+ atomic_t write_busy; /* true iff write urb is busy */ -+ struct completion write_finished; /* wait for the write to finish */ -+ + wait_queue_head_t wait_q; /* for timeouts */ -+ int open_count; /* number of times this port has been opened */ + struct mutex lock; /* locks this structure */ + -+ int present; /* if the device is not disconnected */ -+ + struct lirc_driver *driver; + + int lircdata[256]; /* place to store data until lirc processes it */ @@ -6037,21 +6281,6 @@ + .id_table = mceusb_table, +}; + -+ -+static void usb_mceusb_debug_data(const char *function, int size, -+ const unsigned char *data) -+{ -+ int i; -+ if (!debug) -+ return; -+ -+ printk(KERN_DEBUG __FILE__": %s - length = %d, data = ", -+ function, size); -+ for (i = 0; i < size; ++i) -+ printk(KERN_DEBUG "%.2x ", data[i]); -+ printk(KERN_DEBUG "\n"); -+} -+ +static void mceusb_delete(struct mceusb_device *dev) +{ + dprintk("%s", __func__); @@ -6193,8 +6422,6 @@ + /* handle signals and USB disconnects */ + if (signal_pending(current)) + return dev->lirccnt ? dev->lirccnt : -EINTR; -+ if (!dev->udev) -+ return -ENODEV; + + bulkidx = 0; + @@ -6375,12 +6602,6 @@ + + mutex_lock(&dev->lock); + -+ /* verify device still present */ -+ if (dev->udev == NULL) { -+ mutex_unlock(&dev->lock); -+ return -ENODEV; -+ } -+ + if (!dev->lirccnt) { + int res; + dev->lircidx = 0; @@ -6561,7 +6782,7 @@ + driver->set_use_dec = &set_use_dec; + driver->sample_rate = 80; /* sample at 100hz (10ms) */ + driver->add_to_buf = &mceusb_add_to_buf; -+ driver->dev = &udev->dev; ++ driver->dev = &interface->dev; + driver->owner = THIS_MODULE; + if (lirc_register_driver(driver) < 0) { + kfree(driver); @@ -6623,14 +6844,6 @@ + /* unhook lirc things */ + lirc_unregister_driver(minor); + kfree(dev->driver); -+ /* terminate an ongoing write */ -+ if (atomic_read(&dev->write_busy)) { -+ usb_kill_urb(dev->write_urb); -+ wait_for_completion(&dev->write_finished); -+ } -+ -+ /* prevent device read, write and ioctl */ -+ dev->present = 0; + + mutex_unlock(&dev->lock); + mceusb_delete(dev); @@ -6671,14 +6884,14 @@ +MODULE_LICENSE("GPL"); +MODULE_DEVICE_TABLE(usb, mceusb_table); + -+module_param(debug, int, 0644); ++module_param(debug, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Debug enabled or not"); diff --git a/drivers/input/lirc/lirc_mceusb2.c b/drivers/input/lirc/lirc_mceusb2.c new file mode 100644 -index 0000000..8bc9263 +index 0000000..0551adf --- /dev/null +++ b/drivers/input/lirc/lirc_mceusb2.c -@@ -0,0 +1,1119 @@ +@@ -0,0 +1,1099 @@ +/* + * LIRC driver for Philips eHome USB Infrared Transceiver + * and the Microsoft MCE 2005 Remote Control @@ -6733,7 +6946,7 @@ + "MCE 2005 Remote Control driver for LIRC" +#define DRIVER_NAME "lirc_mceusb2" + -+#define USB_BUFLEN 16 /* USB reception buffer length */ ++#define USB_BUFLEN 32 /* USB reception buffer length */ +#define LIRCBUF_SIZE 256 /* LIRC work buffer length */ + +/* MCE constants */ @@ -6794,8 +7007,6 @@ +#define VENDOR_COMPRO 0x185b + +static struct usb_device_id mceusb_dev_table[] = { -+ /* Philips eHome Infrared Transceiver */ -+ { USB_DEVICE(VENDOR_PHILIPS, 0x0815) }, + /* Philips Infrared Transceiver - Sahara branded */ + { USB_DEVICE(VENDOR_PHILIPS, 0x0608) }, + /* Philips Infrared Transceiver - HP branded */ @@ -6806,6 +7017,8 @@ + { USB_DEVICE(VENDOR_PHILIPS, 0x060f) }, + /* Philips Infrared Transceiver - Spinel plus */ + { USB_DEVICE(VENDOR_PHILIPS, 0x0613) }, ++ /* Philips eHome Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_PHILIPS, 0x0815) }, + /* SMK/Toshiba G83C0004D410 */ + { USB_DEVICE(VENDOR_SMK, 0x031d) }, + /* SMK eHome Infrared Transceiver (Sony VAIO) */ @@ -7145,26 +7358,8 @@ + case 0: + for (i = 0; i < buf_len; i++) { + /* decode mce packets of the form (84),AA,BB,CC,DD */ -+ switch (ir->buf_in[i]) { -+ ++ if (ir->buf_in[i] >= 0x80 && ir->buf_in[i] <= 0x9e) { + /* data headers */ -+ case 0x90: /* used Pinnacle Remote Kit */ -+ case 0x8F: -+ case 0x8E: -+ case 0x8D: -+ case 0x8C: -+ case 0x8B: -+ case 0x8A: -+ case 0x89: -+ case 0x88: -+ case 0x87: -+ case 0x86: -+ case 0x85: -+ case 0x84: -+ case 0x83: -+ case 0x82: -+ case 0x81: -+ case 0x80: + /* decode packet data */ + packet_len = ir->buf_in[i] & + MCE_PACKET_LENGTH_MASK; @@ -7190,10 +7385,8 @@ + } + + i += packet_len; -+ break; -+ ++ } else if (ir->buf_in[i] == MCE_CONTROL_HEADER) { + /* status header (0x9F) */ -+ case MCE_CONTROL_HEADER: + /* + * A transmission containing one or + * more consecutive ir commands always @@ -7215,9 +7408,6 @@ + + /* end decode loop */ + i = buf_len; -+ break; -+ default: -+ break; + } + } + @@ -7596,7 +7786,7 @@ + driver->set_use_dec = &set_use_dec; + driver->code_length = sizeof(int) * 8; + driver->fops = &lirc_fops; -+ driver->dev = &dev->dev; ++ driver->dev = &intf->dev; + driver->owner = THIS_MODULE; + + mutex_init(&ir->lock); @@ -7647,11 +7837,14 @@ + ir->usb_ep_out = ep_out; + + if (dev->descriptor.iManufacturer -+ && usb_string(dev, dev->descriptor.iManufacturer, buf, 63) > 0) -+ strncpy(name, buf, 128); ++ && usb_string(dev, dev->descriptor.iManufacturer, ++ buf, sizeof(buf)) > 0) ++ strlcpy(name, buf, sizeof(name)); + if (dev->descriptor.iProduct -+ && usb_string(dev, dev->descriptor.iProduct, buf, 63) > 0) -+ snprintf(name, 128, "%s %s", name, buf); ++ && usb_string(dev, dev->descriptor.iProduct, ++ buf, sizeof(buf)) > 0) ++ snprintf(name + strlen(name), sizeof(name) - strlen(name), ++ " %s", buf); + printk(DRIVER_NAME "[%d]: %s on usb%d:%d\n", devnum, name, + dev->bus->busnum, devnum); + @@ -7796,11 +7989,11 @@ +MODULE_LICENSE("GPL"); +MODULE_DEVICE_TABLE(usb, mceusb_dev_table); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Debug enabled or not"); diff --git a/drivers/input/lirc/lirc_parallel.c b/drivers/input/lirc/lirc_parallel.c new file mode 100644 -index 0000000..b66c57f +index 0000000..07d0d02 --- /dev/null +++ b/drivers/input/lirc/lirc_parallel.c @@ -0,0 +1,709 @@ @@ -8499,19 +8692,19 @@ +MODULE_AUTHOR("Christoph Bartelmus"); +MODULE_LICENSE("GPL"); + -+module_param(io, int, 0444); ++module_param(io, int, S_IRUGO); +MODULE_PARM_DESC(io, "I/O address base (0x3bc, 0x378 or 0x278)"); + -+module_param(irq, int, 0444); ++module_param(irq, int, S_IRUGO); +MODULE_PARM_DESC(irq, "Interrupt (7 or 5)"); + -+module_param(tx_mask, int, 0444); ++module_param(tx_mask, int, S_IRUGO); +MODULE_PARM_DESC(tx_maxk, "Transmitter mask (default: 0x01)"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); + -+module_param(check_pselecd, bool, 0644); ++module_param(check_pselecd, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Check for printer (default: 0)"); diff --git a/drivers/input/lirc/lirc_parallel.h b/drivers/input/lirc/lirc_parallel.h new file mode 100644 @@ -8547,10 +8740,10 @@ +#endif diff --git a/drivers/input/lirc/lirc_sasem.c b/drivers/input/lirc/lirc_sasem.c new file mode 100644 -index 0000000..e26cda2 +index 0000000..270f8ff --- /dev/null +++ b/drivers/input/lirc/lirc_sasem.c -@@ -0,0 +1,933 @@ +@@ -0,0 +1,931 @@ +/* + * lirc_sasem.c - USB remote support for LIRC + * Version 0.5 @@ -8678,8 +8871,6 @@ + .write = &vfd_write, + .ioctl = &vfd_ioctl, + .release = &vfd_close, -+ .read = lirc_dev_fop_read, -+ .poll = lirc_dev_fop_poll, +}; + +/* USB Device ID for Sasem USB Control Board */ @@ -8715,7 +8906,7 @@ +MODULE_AUTHOR(MOD_AUTHOR); +MODULE_DESCRIPTION(MOD_DESC); +MODULE_LICENSE("GPL"); -+module_param(debug, int, 0); ++module_param(debug, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes (default: no)"); + +static void delete_context(struct sasem_context *context) @@ -9299,13 +9490,13 @@ + + context = kzalloc(sizeof(struct sasem_context), GFP_KERNEL); + if (!context) { -+ err("%s: kmalloc failed for context", __func__); ++ err("%s: kzalloc failed for context", __func__); + alloc_status = 1; + goto alloc_status_switch; + } + driver = kzalloc(sizeof(struct lirc_driver), GFP_KERNEL); + if (!driver) { -+ err("%s: kmalloc failed for lirc_driver", __func__); ++ err("%s: kzalloc failed for lirc_driver", __func__); + alloc_status = 2; + goto alloc_status_switch; + } @@ -9347,7 +9538,7 @@ + driver->rbuf = rbuf; + driver->set_use_inc = ir_open; + driver->set_use_dec = ir_close; -+ driver->dev = &dev->dev; ++ driver->dev = &interface->dev; + driver->owner = THIS_MODULE; + + mutex_lock(&context->lock); @@ -9486,7 +9677,7 @@ +module_exit(sasem_exit); diff --git a/drivers/input/lirc/lirc_serial.c b/drivers/input/lirc/lirc_serial.c new file mode 100644 -index 0000000..643c762 +index 0000000..3e9292e --- /dev/null +++ b/drivers/input/lirc/lirc_serial.c @@ -0,0 +1,1321 @@ @@ -10371,7 +10562,7 @@ + /* If pin is high, then this must be an active low receiver. */ + if (sense == -1) { + /* wait 1/2 sec for the power supply */ -+ msleep(HZ/2); ++ msleep(jiffies_to_msecs(HZ/2)); + + /* + * probe 9 times every 0.04s, collect "votes" for @@ -10384,13 +10575,13 @@ + nlow++; + else + nhigh++; -+ msleep(HZ/25); ++ msleep(jiffies_to_msecs(HZ/25)); + } + sense = (nlow >= nhigh ? 1 : 0); -+ printk(KERN_INFO LIRC_DRIVER_NAME ": auto-detected active " ++ printk(KERN_INFO LIRC_DRIVER_NAME ": auto-detected active " + "%s receiver\n", sense ? "low" : "high"); + } else -+ printk(KERN_INFO LIRC_DRIVER_NAME ": Manually using active " ++ printk(KERN_INFO LIRC_DRIVER_NAME ": Manually using active " + "%s receiver\n", sense ? "low" : "high"); + + return 0; @@ -10769,16 +10960,16 @@ + "Christoph Bartelmus, Andrei Tanas"); +MODULE_LICENSE("GPL"); + -+module_param(type, int, 0444); ++module_param(type, int, S_IRUGO); +MODULE_PARM_DESC(type, "Hardware type (0 = home-brew, 1 = IRdeo," + " 2 = IRdeo Remote, 3 = AnimaX, 4 = IgorPlug," + " 5 = NSLU2 RX:CTS2/TX:GreenLED)"); + -+module_param(io, int, 0444); ++module_param(io, int, S_IRUGO); +MODULE_PARM_DESC(io, "I/O address base (0x3f8 or 0x2f8)"); + +/* some architectures (e.g. intel xscale) have memory mapped registers */ -+module_param(iommap, bool, 0444); ++module_param(iommap, bool, S_IRUGO); +MODULE_PARM_DESC(iommap, "physical base for memory mapped I/O" + " (0 = no memory mapped io)"); + @@ -10787,33 +10978,33 @@ + * on 32bit word boundaries. + * See linux-kernel/serial/8250.c serial_in()/out() + */ -+module_param(ioshift, int, 0444); ++module_param(ioshift, int, S_IRUGO); +MODULE_PARM_DESC(ioshift, "shift I/O register offset (0 = no shift)"); + -+module_param(irq, int, 0444); ++module_param(irq, int, S_IRUGO); +MODULE_PARM_DESC(irq, "Interrupt (4 or 3)"); + -+module_param(share_irq, bool, 0444); ++module_param(share_irq, bool, S_IRUGO); +MODULE_PARM_DESC(share_irq, "Share interrupts (0 = off, 1 = on)"); + -+module_param(sense, bool, 0444); ++module_param(sense, bool, S_IRUGO); +MODULE_PARM_DESC(sense, "Override autodetection of IR receiver circuit" + " (0 = active high, 1 = active low )"); + +#ifdef CONFIG_LIRC_SERIAL_TRANSMITTER -+module_param(txsense, bool, 0444); ++module_param(txsense, bool, S_IRUGO); +MODULE_PARM_DESC(txsense, "Sense of transmitter circuit" + " (0 = active high, 1 = active low )"); +#endif + -+module_param(softcarrier, bool, 0444); ++module_param(softcarrier, bool, S_IRUGO); +MODULE_PARM_DESC(softcarrier, "Software carrier (0 = off, 1 = on, default on)"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); diff --git a/drivers/input/lirc/lirc_sir.c b/drivers/input/lirc/lirc_sir.c new file mode 100644 -index 0000000..093cfd2 +index 0000000..306c77a --- /dev/null +++ b/drivers/input/lirc/lirc_sir.c @@ -0,0 +1,1294 @@ @@ -12096,27 +12287,27 @@ +MODULE_LICENSE("GPL"); + +#ifdef LIRC_ON_SA1100 -+module_param(irq, int, 0444); ++module_param(irq, int, S_IRUGO); +MODULE_PARM_DESC(irq, "Interrupt (16)"); +#else -+module_param(io, int, 0444); ++module_param(io, int, S_IRUGO); +MODULE_PARM_DESC(io, "I/O address base (0x3f8 or 0x2f8)"); + -+module_param(irq, int, 0444); ++module_param(irq, int, S_IRUGO); +MODULE_PARM_DESC(irq, "Interrupt (4 or 3)"); + -+module_param(threshold, int, 0444); ++module_param(threshold, int, S_IRUGO); +MODULE_PARM_DESC(threshold, "space detection threshold (3)"); +#endif + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); diff --git a/drivers/input/lirc/lirc_streamzap.c b/drivers/input/lirc/lirc_streamzap.c new file mode 100644 -index 0000000..cb05b58 +index 0000000..6db4310 --- /dev/null +++ b/drivers/input/lirc/lirc_streamzap.c -@@ -0,0 +1,772 @@ +@@ -0,0 +1,775 @@ +/* + * Streamzap Remote Control driver + * @@ -12333,7 +12524,7 @@ + (unsigned char *) &data); + } + if (sz->timer_running) { -+ sz->delay_timer.expires += timer_inc; ++ sz->delay_timer.expires = jiffies + timer_inc; + add_timer(&sz->delay_timer); + } + } else { @@ -12358,7 +12549,7 @@ + lirc_buffer_write(&sz->lirc_buf, + (unsigned char *) &data); + } else { -+ dprintk("buffer overflow\n", sz->driver.minor); ++ dprintk("buffer overflow", sz->driver.minor); + } + } + if (!empty) @@ -12395,7 +12586,7 @@ +} + +static void push_full_pulse(struct usb_streamzap *sz, -+ unsigned char value) ++ unsigned char value) +{ + int pulse; + @@ -12422,23 +12613,23 @@ + sz->sum = 0; + } + -+ pulse = ((int) value)*STREAMZAP_RESOLUTION; -+ pulse += STREAMZAP_RESOLUTION/2; ++ pulse = ((int) value) * STREAMZAP_RESOLUTION; ++ pulse += STREAMZAP_RESOLUTION / 2; + sz->sum += pulse; + pulse |= PULSE_BIT; + -+ dprintk("p %u", sz->driver.minor, pulse&PULSE_MASK); ++ dprintk("p %u", sz->driver.minor, pulse & PULSE_MASK); + push(sz, (char *)&pulse); +} + +static void push_half_pulse(struct usb_streamzap *sz, -+ unsigned char value) ++ unsigned char value) +{ + push_full_pulse(sz, (value & STREAMZAP_PULSE_MASK)>>4); +} + +static void push_full_space(struct usb_streamzap *sz, -+ unsigned char value) ++ unsigned char value) +{ + int space; + @@ -12450,7 +12641,7 @@ +} + +static void push_half_space(struct usb_streamzap *sz, -+ unsigned char value) ++ unsigned char value) +{ + push_full_space(sz, value & STREAMZAP_SPACE_MASK); +} @@ -12641,7 +12832,7 @@ + sz->driver.set_use_inc = &streamzap_use_inc; + sz->driver.set_use_dec = &streamzap_use_dec; + sz->driver.fops = &streamzap_fops; -+ sz->driver.dev = &udev->dev; ++ sz->driver.dev = &interface->dev; + sz->driver.owner = THIS_MODULE; + + sz->idle = 1; @@ -12663,12 +12854,15 @@ + sz->endpoint->bInterval); + + if (udev->descriptor.iManufacturer -+ && usb_string(udev, udev->descriptor.iManufacturer, buf, 63) > 0) -+ strncpy(name, buf, 128); ++ && usb_string(udev, udev->descriptor.iManufacturer, ++ buf, sizeof(buf)) > 0) ++ strlcpy(name, buf, sizeof(name)); + + if (udev->descriptor.iProduct -+ && usb_string(udev, udev->descriptor.iProduct, buf, 63) > 0) -+ snprintf(name, 128, "%s %s", name, buf); ++ && usb_string(udev, udev->descriptor.iProduct, ++ buf, sizeof(buf)) > 0) ++ snprintf(name + strlen(name), sizeof(name) - strlen(name), ++ " %s", buf); + + printk(KERN_INFO DRIVER_NAME "[%d]: %s on usb%d:%d attached\n", + sz->driver.minor, name, @@ -12761,7 +12955,7 @@ + + switch (cmd) { + case LIRC_GET_REC_RESOLUTION: -+ result = put_user(STREAMZAP_RESOLUTION, (unsigned long *) arg); ++ result = put_user(STREAMZAP_RESOLUTION, (unsigned int *) arg); + if (result) + return result; + break; @@ -12815,7 +13009,7 @@ +{ + struct usb_streamzap *sz = usb_get_intfdata(intf); + -+ printk(DRIVER_NAME "[%d]: suspend\n", sz->driver.minor); ++ printk(KERN_INFO DRIVER_NAME "[%d]: suspend\n", sz->driver.minor); + if (sz->in_use) { + if (sz->flush) { + sz->flush = 0; @@ -12887,14 +13081,14 @@ +MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_LICENSE("GPL"); + -+module_param(debug, bool, 0644); ++module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); diff --git a/drivers/input/lirc/lirc_ttusbir.c b/drivers/input/lirc/lirc_ttusbir.c new file mode 100644 -index 0000000..8e65ee7 +index 0000000..4d18084 --- /dev/null +++ b/drivers/input/lirc/lirc_ttusbir.c -@@ -0,0 +1,396 @@ +@@ -0,0 +1,398 @@ +/* + * lirc_ttusbir.c + * @@ -12957,7 +13151,7 @@ +static void set_use_dec(void *data); + +static int num_urbs = 2; -+module_param(num_urbs, int, 0444); ++module_param(num_urbs, int, S_IRUGO); +MODULE_PARM_DESC(num_urbs, + "Number of URBs in queue. Try to increase to 4 in case " + "of problems (default: 2; minimum: 2)"); @@ -13204,6 +13398,8 @@ + ttusbir->driver.rbuf = &ttusbir->rbuf; + ttusbir->driver.set_use_inc = set_use_inc; + ttusbir->driver.set_use_dec = set_use_dec; ++ ttusbir->driver.fops = NULL; ++ ttusbir->driver.dev = &intf->dev; + ttusbir->driver.owner = THIS_MODULE; + ttusbir->driver.features = LIRC_CAN_REC_MODE2; + ttusbir->minor = lirc_register_driver(&ttusbir->driver); Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.976.2.5 retrieving revision 1.976.2.6 diff -u -r1.976.2.5 -r1.976.2.6 --- sources 25 Feb 2009 21:26:01 -0000 1.976.2.5 +++ sources 5 Mar 2009 01:30:25 -0000 1.976.2.6 @@ -1,3 +1,2 @@ d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2 -26f67d99666834cc579094619821d3c8 patch-2.6.29-rc6.bz2 -d693f91cabf1acbd4dd6b737bf72351e patch-2.6.29-rc6-git2.bz2 +9404c2ead603a80a3aad6361b5fc5413 patch-2.6.29-rc7.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.888.2.4 retrieving revision 1.888.2.5 diff -u -r1.888.2.4 -r1.888.2.5 --- upstream 25 Feb 2009 21:26:01 -0000 1.888.2.4 +++ upstream 5 Mar 2009 01:30:25 -0000 1.888.2.5 @@ -1,3 +1,2 @@ linux-2.6.28.tar.bz2 -patch-2.6.29-rc6.bz2 -patch-2.6.29-rc6-git2.bz2 +patch-2.6.29-rc7.bz2 xen.pvops.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1.2.7 -r 1.1.2.8 xen.pvops.patch Index: xen.pvops.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- xen.pvops.patch 25 Feb 2009 23:14:05 -0000 1.1.2.7 +++ xen.pvops.patch 5 Mar 2009 01:30:26 -0000 1.1.2.8 @@ -1601,7 +1601,7 @@ +More details can be found in the source code, in the +kernel/tracing/*.c files. diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt -index 319785b..5e7b9e4 100644 +index 54f21a5..dd35cb7 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -49,6 +49,7 @@ parameter is applicable: @@ -1626,7 +1626,17 @@ com20020= [HW,NET] ARCnet - COM20020 chipset Format: -@@ -1045,6 +1048,15 @@ and is between 256 and 4096 characters. It is defined in the file +@@ -604,6 +607,9 @@ and is between 256 and 4096 characters. It is defined in the file + + debug_objects [KNL] Enable object debugging + ++ no_debug_objects ++ [KNL] Disable object debugging ++ + debugpat [X86] Enable PAT debugging + + decnet.addr= [HW,NET] +@@ -1047,6 +1053,15 @@ and is between 256 and 4096 characters. It is defined in the file use the HighMem zone if it exists, and the Normal zone if it does not. @@ -1642,6 +1652,21 @@ movablecore=nn[KMG] [KNL,X86-32,IA-64,PPC,X86-64] This parameter is similar to kernelcore except it specifies the amount of memory used for migratable allocations. +@@ -1310,8 +1325,13 @@ and is between 256 and 4096 characters. It is defined in the file + + memtest= [KNL,X86] Enable memtest + Format: +- range: 0,4 : pattern number + default : 0 ++ Specifies the number of memtest passes to be ++ performed. Each pass selects another test ++ pattern from a given set of patterns. Memtest ++ fills the memory with this pattern, validates ++ memory contents and reserves bad memory ++ regions that are detected. + + meye.*= [HW] Set MotionEye Camera parameters + See Documentation/video4linux/meye.txt. diff --git a/Documentation/kmemcheck.txt b/Documentation/kmemcheck.txt new file mode 100644 index 0000000..a848d49 @@ -2002,6 +2027,151 @@ +Groups are scheduled at once and can be used with PERF_RECORD_GROUP +to record multi-dimensional timestamps. + +diff --git a/Documentation/scheduler/00-INDEX b/Documentation/scheduler/00-INDEX +index aabcc3a..3c00c9c 100644 +--- a/Documentation/scheduler/00-INDEX ++++ b/Documentation/scheduler/00-INDEX +@@ -2,8 +2,6 @@ + - this file. + sched-arch.txt + - CPU Scheduler implementation hints for architecture specific code. +-sched-coding.txt +- - reference for various scheduler-related methods in the O(1) scheduler. + sched-design-CFS.txt + - goals, design and implementation of the Complete Fair Scheduler. + sched-domains.txt +diff --git a/Documentation/scheduler/sched-coding.txt b/Documentation/scheduler/sched-coding.txt +deleted file mode 100644 +index cbd8db7..0000000 +--- a/Documentation/scheduler/sched-coding.txt ++++ /dev/null +@@ -1,126 +0,0 @@ +- Reference for various scheduler-related methods in the O(1) scheduler +- Robert Love , MontaVista Software +- +- +-Note most of these methods are local to kernel/sched.c - this is by design. +-The scheduler is meant to be self-contained and abstracted away. This document +-is primarily for understanding the scheduler, not interfacing to it. Some of +-the discussed interfaces, however, are general process/scheduling methods. +-They are typically defined in include/linux/sched.h. +- +- +-Main Scheduling Methods +------------------------ +- +-void load_balance(runqueue_t *this_rq, int idle) +- Attempts to pull tasks from one cpu to another to balance cpu usage, +- if needed. This method is called explicitly if the runqueues are +- imbalanced or periodically by the timer tick. Prior to calling, +- the current runqueue must be locked and interrupts disabled. +- +-void schedule() +- The main scheduling function. Upon return, the highest priority +- process will be active. +- +- +-Locking +-------- +- +-Each runqueue has its own lock, rq->lock. When multiple runqueues need +-to be locked, lock acquires must be ordered by ascending &runqueue value. +- +-A specific runqueue is locked via +- +- task_rq_lock(task_t pid, unsigned long *flags) +- +-which disables preemption, disables interrupts, and locks the runqueue pid is +-running on. Likewise, +- +- task_rq_unlock(task_t pid, unsigned long *flags) +- +-unlocks the runqueue pid is running on, restores interrupts to their previous +-state, and reenables preemption. +- +-The routines +- +- double_rq_lock(runqueue_t *rq1, runqueue_t *rq2) +- +-and +- +- double_rq_unlock(runqueue_t *rq1, runqueue_t *rq2) +- +-safely lock and unlock, respectively, the two specified runqueues. They do +-not, however, disable and restore interrupts. Users are required to do so +-manually before and after calls. +- +- +-Values +------- +- +-MAX_PRIO +- The maximum priority of the system, stored in the task as task->prio. +- Lower priorities are higher. Normal (non-RT) priorities range from +- MAX_RT_PRIO to (MAX_PRIO - 1). +-MAX_RT_PRIO +- The maximum real-time priority of the system. Valid RT priorities +- range from 0 to (MAX_RT_PRIO - 1). +-MAX_USER_RT_PRIO +- The maximum real-time priority that is exported to user-space. Should +- always be equal to or less than MAX_RT_PRIO. Setting it less allows +- kernel threads to have higher priorities than any user-space task. +-MIN_TIMESLICE +-MAX_TIMESLICE +- Respectively, the minimum and maximum timeslices (quanta) of a process. +- +-Data +----- +- +-struct runqueue +- The main per-CPU runqueue data structure. +-struct task_struct +- The main per-process data structure. +- +- +-General Methods +---------------- +- +-cpu_rq(cpu) +- Returns the runqueue of the specified cpu. +-this_rq() +- Returns the runqueue of the current cpu. +-task_rq(pid) +- Returns the runqueue which holds the specified pid. +-cpu_curr(cpu) +- Returns the task currently running on the given cpu. +-rt_task(pid) +- Returns true if pid is real-time, false if not. +- +- +-Process Control Methods +------------------------ +- +-void set_user_nice(task_t *p, long nice) +- Sets the "nice" value of task p to the given value. +-int setscheduler(pid_t pid, int policy, struct sched_param *param) +- Sets the scheduling policy and parameters for the given pid. +-int set_cpus_allowed(task_t *p, unsigned long new_mask) +- Sets a given task's CPU affinity and migrates it to a proper cpu. +- Callers must have a valid reference to the task and assure the +- task not exit prematurely. No locks can be held during the call. +-set_task_state(tsk, state_value) +- Sets the given task's state to the given value. +-set_current_state(state_value) +- Sets the current task's state to the given value. +-void set_tsk_need_resched(struct task_struct *tsk) +- Sets need_resched in the given task. +-void clear_tsk_need_resched(struct task_struct *tsk) +- Clears need_resched in the given task. +-void set_need_resched() +- Sets need_resched in the current task. [...29195 lines suppressed...] ++ Bzip2 uses a large amount of memory. For modern kernels you ++ will need at least 8MB RAM or more for booting. ++ ++config INITRAMFS_COMPRESSION_LZMA ++ bool "LZMA" ++ depends on RD_LZMA ++ help ++ The most recent compression algorithm. ++ Its ratio is best, decompression speed is between the other ++ two. Compression is slowest. The initramfs size is about 33% ++ smaller with LZMA in comparison to gzip. ++ ++endchoice +diff --git a/usr/Makefile b/usr/Makefile +index 201f27f..b84894b 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -6,13 +6,25 @@ klibcdirs:; + PHONY += klibcdirs + + ++# No compression ++suffix_$(CONFIG_INITRAMFS_COMPRESSION_NONE) = ++ ++# Gzip, but no bzip2 ++suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP) = .gz ++ ++# Bzip2 ++suffix_$(CONFIG_INITRAMFS_COMPRESSION_BZIP2) = .bz2 ++ ++# Lzma ++suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZMA) = .lzma ++ + # Generate builtin.o based on initramfs_data.o +-obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data.o ++obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data$(suffix_y).o + +-# initramfs_data.o contains the initramfs_data.cpio.gz image. ++# initramfs_data.o contains the compressed initramfs_data.cpio image. + # The image is included using .incbin, a dependency which is not + # tracked automatically. +-$(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio.gz FORCE ++$(obj)/initramfs_data$(suffix_y).o: $(obj)/initramfs_data.cpio$(suffix_y) FORCE + + ##### + # Generate the initramfs cpio archive +@@ -25,28 +37,28 @@ ramfs-args := \ + $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \ + $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID)) + +-# .initramfs_data.cpio.gz.d is used to identify all files included ++# .initramfs_data.cpio.d is used to identify all files included + # in initramfs and to detect if any files are added/removed. + # Removed files are identified by directory timestamp being updated + # The dependency list is generated by gen_initramfs.sh -l +-ifneq ($(wildcard $(obj)/.initramfs_data.cpio.gz.d),) +- include $(obj)/.initramfs_data.cpio.gz.d ++ifneq ($(wildcard $(obj)/.initramfs_data.cpio.d),) ++ include $(obj)/.initramfs_data.cpio.d + endif + + quiet_cmd_initfs = GEN $@ + cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input) + +-targets := initramfs_data.cpio.gz ++targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 initramfs_data.cpio.lzma initramfs_data.cpio + # do not try to update files included in initramfs + $(deps_initramfs): ; + + $(deps_initramfs): klibcdirs +-# We rebuild initramfs_data.cpio.gz if: +-# 1) Any included file is newer then initramfs_data.cpio.gz ++# We rebuild initramfs_data.cpio if: ++# 1) Any included file is newer then initramfs_data.cpio + # 2) There are changes in which files are included (added or deleted) +-# 3) If gen_init_cpio are newer than initramfs_data.cpio.gz ++# 3) If gen_init_cpio are newer than initramfs_data.cpio + # 4) arguments to gen_initramfs.sh changes +-$(obj)/initramfs_data.cpio.gz: $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs +- $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.gz.d ++$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs ++ $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d + $(call if_changed,initfs) + +diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S +index c2e1ad4..7c6973d 100644 +--- a/usr/initramfs_data.S ++++ b/usr/initramfs_data.S +@@ -26,5 +26,5 @@ SECTIONS + */ + + .section .init.ramfs,"a" +-.incbin "usr/initramfs_data.cpio.gz" ++.incbin "usr/initramfs_data.cpio" + +diff --git a/usr/initramfs_data.bz2.S b/usr/initramfs_data.bz2.S +new file mode 100644 +index 0000000..bc54d09 +--- /dev/null ++++ b/usr/initramfs_data.bz2.S +@@ -0,0 +1,29 @@ ++/* ++ initramfs_data includes the compressed binary that is the ++ filesystem used for early user space. ++ Note: Older versions of "as" (prior to binutils 2.11.90.0.23 ++ released on 2001-07-14) dit not support .incbin. ++ If you are forced to use older binutils than that then the ++ following trick can be applied to create the resulting binary: ++ ++ ++ ld -m elf_i386 --format binary --oformat elf32-i386 -r \ ++ -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o ++ ld -m elf_i386 -r -o built-in.o initramfs_data.o ++ ++ initramfs_data.scr looks like this: ++SECTIONS ++{ ++ .init.ramfs : { *(.data) } ++} ++ ++ The above example is for i386 - the parameters vary from architectures. ++ Eventually look up LDFLAGS_BLOB in an older version of the ++ arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced. ++ ++ Using .incbin has the advantage over ld that the correct flags are set ++ in the ELF header, as required by certain architectures. ++*/ ++ ++.section .init.ramfs,"a" ++.incbin "usr/initramfs_data.cpio.bz2" +diff --git a/usr/initramfs_data.gz.S b/usr/initramfs_data.gz.S +new file mode 100644 +index 0000000..890c8dd +--- /dev/null ++++ b/usr/initramfs_data.gz.S +@@ -0,0 +1,29 @@ ++/* ++ initramfs_data includes the compressed binary that is the ++ filesystem used for early user space. ++ Note: Older versions of "as" (prior to binutils 2.11.90.0.23 ++ released on 2001-07-14) dit not support .incbin. ++ If you are forced to use older binutils than that then the ++ following trick can be applied to create the resulting binary: ++ ++ ++ ld -m elf_i386 --format binary --oformat elf32-i386 -r \ ++ -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o ++ ld -m elf_i386 -r -o built-in.o initramfs_data.o ++ ++ initramfs_data.scr looks like this: ++SECTIONS ++{ ++ .init.ramfs : { *(.data) } ++} ++ ++ The above example is for i386 - the parameters vary from architectures. ++ Eventually look up LDFLAGS_BLOB in an older version of the ++ arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced. ++ ++ Using .incbin has the advantage over ld that the correct flags are set ++ in the ELF header, as required by certain architectures. ++*/ ++ ++.section .init.ramfs,"a" ++.incbin "usr/initramfs_data.cpio.gz" +diff --git a/usr/initramfs_data.lzma.S b/usr/initramfs_data.lzma.S +new file mode 100644 +index 0000000..e11469e +--- /dev/null ++++ b/usr/initramfs_data.lzma.S +@@ -0,0 +1,29 @@ ++/* ++ initramfs_data includes the compressed binary that is the ++ filesystem used for early user space. ++ Note: Older versions of "as" (prior to binutils 2.11.90.0.23 ++ released on 2001-07-14) dit not support .incbin. ++ If you are forced to use older binutils than that then the ++ following trick can be applied to create the resulting binary: ++ ++ ++ ld -m elf_i386 --format binary --oformat elf32-i386 -r \ ++ -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o ++ ld -m elf_i386 -r -o built-in.o initramfs_data.o ++ ++ initramfs_data.scr looks like this: ++SECTIONS ++{ ++ .init.ramfs : { *(.data) } ++} ++ ++ The above example is for i386 - the parameters vary from architectures. ++ Eventually look up LDFLAGS_BLOB in an older version of the ++ arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced. ++ ++ Using .incbin has the advantage over ld that the correct flags are set ++ in the ELF header, as required by certain architectures. ++*/ ++ ++.section .init.ramfs,"a" ++.incbin "usr/initramfs_data.cpio.lzma" xen.pvops.post.patch: Index: xen.pvops.post.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- xen.pvops.post.patch 25 Feb 2009 21:26:02 -0000 1.1.2.3 +++ xen.pvops.post.patch 5 Mar 2009 01:30:27 -0000 1.1.2.4 @@ -35,6 +35,815 @@ static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { } #endif +--- a/drivers/gpu/drm/drm_proc.c 2009-03-04 21:07:25.000000000 +0000 ++++ b/drivers/gpu/drm/drm_proc.c 2009-03-04 21:20:20.000000000 +0000 +@@ -37,697 +37,195 @@ + * OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include + #include "drmP.h" + +-static int drm_name_info(char *buf, char **start, off_t offset, +- int request, int *eof, void *data); +-static int drm_vm_info(char *buf, char **start, off_t offset, +- int request, int *eof, void *data); +-static int drm_clients_info(char *buf, char **start, off_t offset, +- int request, int *eof, void *data); +-static int drm_queues_info(char *buf, char **start, off_t offset, +- int request, int *eof, void *data); +-static int drm_bufs_info(char *buf, char **start, off_t offset, +- int request, int *eof, void *data); +-static int drm_vblank_info(char *buf, char **start, off_t offset, +- int request, int *eof, void *data); +-static int drm_gem_name_info(char *buf, char **start, off_t offset, +- int request, int *eof, void *data); +-static int drm_gem_object_info(char *buf, char **start, off_t offset, +- int request, int *eof, void *data); +-#if DRM_DEBUG_CODE +-static int drm_vma_info(char *buf, char **start, off_t offset, +- int request, int *eof, void *data); +-#endif ++/*************************************************** ++ * Initialization, etc. ++ **************************************************/ + + /** + * Proc file list. + */ +-static struct drm_proc_list { +- const char *name; /**< file name */ +- int (*f) (char *, char **, off_t, int, int *, void *); /**< proc callback*/ +- u32 driver_features; /**< Required driver features for this entry */ +-} drm_proc_list[] = { ++static struct drm_info_list drm_proc_list[] = { + {"name", drm_name_info, 0}, +- {"mem", drm_mem_info, 0}, + {"vm", drm_vm_info, 0}, + {"clients", drm_clients_info, 0}, + {"queues", drm_queues_info, 0}, + {"bufs", drm_bufs_info, 0}, +- {"vblank", drm_vblank_info, 0}, + {"gem_names", drm_gem_name_info, DRIVER_GEM}, + {"gem_objects", drm_gem_object_info, DRIVER_GEM}, + #if DRM_DEBUG_CODE +- {"vma", drm_vma_info}, ++ {"vma", drm_vma_info, 0}, + #endif + }; +- + #define DRM_PROC_ENTRIES ARRAY_SIZE(drm_proc_list) + ++static int drm_proc_open(struct inode *inode, struct file *file) ++{ ++ struct drm_info_node* node = PDE(inode)->data; ++ ++ return single_open(file, node->info_ent->show, node); ++} ++ ++static const struct file_operations drm_proc_fops = { ++ .owner = THIS_MODULE, ++ .open = drm_proc_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++ ++ + /** +- * Initialize the DRI proc filesystem for a device. ++ * Initialize a given set of proc files for a device + * +- * \param dev DRM device. +- * \param minor device minor number. ++ * \param files The array of files to create ++ * \param count The number of files given + * \param root DRI proc dir entry. +- * \param dev_root resulting DRI device proc dir entry. +- * \return root entry pointer on success, or NULL on failure. ++ * \param minor device minor number ++ * \return Zero on success, non-zero on failure + * +- * Create the DRI proc root entry "/proc/dri", the device proc root entry +- * "/proc/dri/%minor%/", and each entry in proc_list as +- * "/proc/dri/%minor%/%name%". ++ * Create a given set of proc files represented by an array of ++ * gdm_proc_lists in the given root directory. + */ +-int drm_proc_init(struct drm_minor *minor, int minor_id, +- struct proc_dir_entry *root) ++int drm_proc_create_files(struct drm_info_list *files, int count, ++ struct proc_dir_entry *root, struct drm_minor *minor) + { + struct drm_device *dev = minor->dev; + struct proc_dir_entry *ent; +- int i, j, ret; ++ struct drm_info_node *tmp; + char name[64]; ++ int i, ret; + +- sprintf(name, "%d", minor_id); +- minor->dev_root = proc_mkdir(name, root); +- if (!minor->dev_root) { +- DRM_ERROR("Cannot create /proc/dri/%s\n", name); +- return -1; +- } +- +- for (i = 0; i < DRM_PROC_ENTRIES; i++) { +- u32 features = drm_proc_list[i].driver_features; ++ for (i = 0; i < count; i++) { ++ u32 features = files[i].driver_features; + + if (features != 0 && + (dev->driver->driver_features & features) != features) + continue; + +- ent = create_proc_entry(drm_proc_list[i].name, +- S_IFREG | S_IRUGO, minor->dev_root); ++ tmp = drm_alloc(sizeof(struct drm_info_node), _DRM_DRIVER); ++ ent = create_proc_entry(files[i].name, S_IFREG | S_IRUGO, root); + if (!ent) { + DRM_ERROR("Cannot create /proc/dri/%s/%s\n", +- name, drm_proc_list[i].name); ++ name, files[i].name); ++ drm_free(tmp, sizeof(struct drm_info_node), ++ _DRM_DRIVER); + ret = -1; + goto fail; + } +- ent->read_proc = drm_proc_list[i].f; +- ent->data = minor; +- } + +- if (dev->driver->proc_init) { +- ret = dev->driver->proc_init(minor); +- if (ret) { +- DRM_ERROR("DRM: Driver failed to initialize " +- "/proc/dri.\n"); +- goto fail; +- } ++ ent->proc_fops = &drm_proc_fops; ++ ent->data = tmp; ++ tmp->minor = minor; ++ tmp->info_ent = &files[i]; ++ list_add(&(tmp->list), &(minor->proc_nodes.list)); + } +- + return 0; +- fail: + +- for (j = 0; j < i; j++) +- remove_proc_entry(drm_proc_list[i].name, +- minor->dev_root); +- remove_proc_entry(name, root); +- minor->dev_root = NULL; ++fail: ++ for (i = 0; i < count; i++) ++ remove_proc_entry(drm_proc_list[i].name, minor->proc_root); + return ret; + } + + /** +- * Cleanup the proc filesystem resources. ++ * Initialize the DRI proc filesystem for a device + * +- * \param minor device minor number. ++ * \param dev DRM device ++ * \param minor device minor number + * \param root DRI proc dir entry. +- * \param dev_root DRI device proc dir entry. +- * \return always zero. ++ * \param dev_root resulting DRI device proc dir entry. ++ * \return root entry pointer on success, or NULL on failure. + * +- * Remove all proc entries created by proc_init(). ++ * Create the DRI proc root entry "/proc/dri", the device proc root entry ++ * "/proc/dri/%minor%/", and each entry in proc_list as ++ * "/proc/dri/%minor%/%name%". + */ +-int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root) ++int drm_proc_init(struct drm_minor *minor, int minor_id, ++ struct proc_dir_entry *root) + { + struct drm_device *dev = minor->dev; +- int i; + char name[64]; ++ int ret; + +- if (!root || !minor->dev_root) +- return 0; +- +- if (dev->driver->proc_cleanup) +- dev->driver->proc_cleanup(minor); +- +- for (i = 0; i < DRM_PROC_ENTRIES; i++) +- remove_proc_entry(drm_proc_list[i].name, minor->dev_root); +- sprintf(name, "%d", minor->index); +- remove_proc_entry(name, root); +- +- return 0; +-} +- +-/** +- * Called when "/proc/dri/.../name" is read. +- * +- * \param buf output buffer. +- * \param start start of output data. +- * \param offset requested start offset. +- * \param request requested number of bytes. +- * \param eof whether there is no more data to return. +- * \param data private data. +- * \return number of written bytes. +- * +- * Prints the device name together with the bus id if available. +- */ +-static int drm_name_info(char *buf, char **start, off_t offset, int request, +- int *eof, void *data) +-{ +- struct drm_minor *minor = (struct drm_minor *) data; +- struct drm_master *master = minor->master; +- struct drm_device *dev = minor->dev; +- int len = 0; +- +- if (offset > DRM_PROC_LIMIT) { +- *eof = 1; +- return 0; +- } +- +- if (!master) +- return 0; +- +- *start = &buf[offset]; +- *eof = 0; +- +- if (master->unique) { +- DRM_PROC_PRINT("%s %s %s\n", +- dev->driver->pci_driver.name, +- pci_name(dev->pdev), master->unique); +- } else { +- DRM_PROC_PRINT("%s %s\n", dev->driver->pci_driver.name, +- pci_name(dev->pdev)); ++ INIT_LIST_HEAD(&minor->proc_nodes.list); ++ sprintf(name, "%d", minor_id); ++ minor->proc_root = proc_mkdir(name, root); ++ if (!minor->proc_root) { ++ DRM_ERROR("Cannot create /proc/dri/%s\n", name); ++ return -1; + } + +- if (len > request + offset) +- return request; +- *eof = 1; +- return len - offset; +-} +- +-/** +- * Called when "/proc/dri/.../vm" is read. +- * +- * \param buf output buffer. +- * \param start start of output data. +- * \param offset requested start offset. +- * \param request requested number of bytes. +- * \param eof whether there is no more data to return. +- * \param data private data. +- * \return number of written bytes. +- * +- * Prints information about all mappings in drm_device::maplist. +- */ +-static int drm__vm_info(char *buf, char **start, off_t offset, int request, +- int *eof, void *data) +-{ +- struct drm_minor *minor = (struct drm_minor *) data; +- struct drm_device *dev = minor->dev; +- int len = 0; +- struct drm_map *map; +- struct drm_map_list *r_list; +- +- /* Hardcoded from _DRM_FRAME_BUFFER, +- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and +- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */ +- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" }; +- const char *type; +- int i; +- +- if (offset > DRM_PROC_LIMIT) { +- *eof = 1; +- return 0; ++ ret = drm_proc_create_files(drm_proc_list, DRM_PROC_ENTRIES, ++ minor->proc_root, minor); ++ if (ret) { ++ remove_proc_entry(name, root); ++ minor->proc_root = NULL; ++ DRM_ERROR("Failed to create core drm proc files\n"); ++ return ret; + } + +- *start = &buf[offset]; +- *eof = 0; +- +- DRM_PROC_PRINT("slot offset size type flags " +- "address mtrr\n\n"); +- i = 0; +- list_for_each_entry(r_list, &dev->maplist, head) { +- map = r_list->map; +- if (!map) +- continue; +- if (map->type < 0 || map->type > 5) +- type = "??"; +- else +- type = types[map->type]; +- DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx ", +- i, +- map->offset, +- map->size, type, map->flags, +- (unsigned long) r_list->user_token); +- if (map->mtrr < 0) { +- DRM_PROC_PRINT("none\n"); +- } else { +- DRM_PROC_PRINT("%4d\n", map->mtrr); ++ if (dev->driver->proc_init) { ++ ret = dev->driver->proc_init(minor); ++ if (ret) { ++ DRM_ERROR("DRM: Driver failed to initialize " ++ "/proc/dri.\n"); ++ return ret; + } +- i++; +- } +- +- if (len > request + offset) +- return request; +- *eof = 1; +- return len - offset; +-} +- +-/** +- * Simply calls _vm_info() while holding the drm_device::struct_mutex lock. +- */ +-static int drm_vm_info(char *buf, char **start, off_t offset, int request, +- int *eof, void *data) +-{ +- struct drm_minor *minor = (struct drm_minor *) data; +- struct drm_device *dev = minor->dev; +- int ret; +- +- mutex_lock(&dev->struct_mutex); +- ret = drm__vm_info(buf, start, offset, request, eof, data); +- mutex_unlock(&dev->struct_mutex); +- return ret; +-} +- +-/** +- * Called when "/proc/dri/.../queues" is read. +- * +- * \param buf output buffer. +- * \param start start of output data. +- * \param offset requested start offset. +- * \param request requested number of bytes. +- * \param eof whether there is no more data to return. +- * \param data private data. +- * \return number of written bytes. +- */ +-static int drm__queues_info(char *buf, char **start, off_t offset, +- int request, int *eof, void *data) +-{ +- struct drm_minor *minor = (struct drm_minor *) data; +- struct drm_device *dev = minor->dev; +- int len = 0; +- int i; +- struct drm_queue *q; +- +- if (offset > DRM_PROC_LIMIT) { +- *eof = 1; +- return 0; + } +- +- *start = &buf[offset]; +- *eof = 0; +- +- DRM_PROC_PRINT(" ctx/flags use fin" +- " blk/rw/rwf wait flushed queued" +- " locks\n\n"); +- for (i = 0; i < dev->queue_count; i++) { +- q = dev->queuelist[i]; +- atomic_inc(&q->use_count); +- DRM_PROC_PRINT_RET(atomic_dec(&q->use_count), +- "%5d/0x%03x %5d %5d" +- " %5d/%c%c/%c%c%c %5Zd\n", +- i, +- q->flags, +- atomic_read(&q->use_count), +- atomic_read(&q->finalization), +- atomic_read(&q->block_count), +- atomic_read(&q->block_read) ? 'r' : '-', +- atomic_read(&q->block_write) ? 'w' : '-', +- waitqueue_active(&q->read_queue) ? 'r' : '-', +- waitqueue_active(&q-> +- write_queue) ? 'w' : '-', +- waitqueue_active(&q-> +- flush_queue) ? 'f' : '-', +- DRM_BUFCOUNT(&q->waitlist)); +- atomic_dec(&q->use_count); +- } +- +- if (len > request + offset) +- return request; +- *eof = 1; +- return len - offset; +-} +- +-/** +- * Simply calls _queues_info() while holding the drm_device::struct_mutex lock. +- */ +-static int drm_queues_info(char *buf, char **start, off_t offset, int request, +- int *eof, void *data) +-{ +- struct drm_minor *minor = (struct drm_minor *) data; +- struct drm_device *dev = minor->dev; +- int ret; +- +- mutex_lock(&dev->struct_mutex); +- ret = drm__queues_info(buf, start, offset, request, eof, data); +- mutex_unlock(&dev->struct_mutex); +- return ret; ++ return 0; + } + +-/** +- * Called when "/proc/dri/.../bufs" is read. +- * +- * \param buf output buffer. +- * \param start start of output data. +- * \param offset requested start offset. +- * \param request requested number of bytes. +- * \param eof whether there is no more data to return. +- * \param data private data. +- * \return number of written bytes. +- */ +-static int drm__bufs_info(char *buf, char **start, off_t offset, int request, +- int *eof, void *data) ++int drm_proc_remove_files(struct drm_info_list *files, int count, ++ struct drm_minor *minor) + { +- struct drm_minor *minor = (struct drm_minor *) data; +- struct drm_device *dev = minor->dev; +- int len = 0; +- struct drm_device_dma *dma = dev->dma; ++ struct list_head *pos, *q; ++ struct drm_info_node *tmp; + int i; + +- if (!dma || offset > DRM_PROC_LIMIT) { +- *eof = 1; +- return 0; +- } +- +- *start = &buf[offset]; +- *eof = 0; +- +- DRM_PROC_PRINT(" o size count free segs pages kB\n\n"); +- for (i = 0; i <= DRM_MAX_ORDER; i++) { +- if (dma->bufs[i].buf_count) +- DRM_PROC_PRINT("%2d %8d %5d %5d %5d %5d %5ld\n", +- i, +- dma->bufs[i].buf_size, +- dma->bufs[i].buf_count, +- atomic_read(&dma->bufs[i] +- .freelist.count), +- dma->bufs[i].seg_count, +- dma->bufs[i].seg_count +- * (1 << dma->bufs[i].page_order), +- (dma->bufs[i].seg_count +- * (1 << dma->bufs[i].page_order)) +- * PAGE_SIZE / 1024); +- } +- DRM_PROC_PRINT("\n"); +- for (i = 0; i < dma->buf_count; i++) { +- if (i && !(i % 32)) +- DRM_PROC_PRINT("\n"); +- DRM_PROC_PRINT(" %d", dma->buflist[i]->list); ++ for (i = 0; i < count; i++) { ++ list_for_each_safe(pos, q, &minor->proc_nodes.list) { ++ tmp = list_entry(pos, struct drm_info_node, list); ++ if (tmp->info_ent == &files[i]) { ++ remove_proc_entry(files[i].name, ++ minor->proc_root); ++ list_del(pos); ++ drm_free(tmp, sizeof(struct drm_info_node), ++ _DRM_DRIVER); ++ } ++ } + } +- DRM_PROC_PRINT("\n"); +- +- if (len > request + offset) +- return request; +- *eof = 1; +- return len - offset; +-} +- +-/** +- * Simply calls _bufs_info() while holding the drm_device::struct_mutex lock. +- */ +-static int drm_bufs_info(char *buf, char **start, off_t offset, int request, +- int *eof, void *data) +-{ +- struct drm_minor *minor = (struct drm_minor *) data; +- struct drm_device *dev = minor->dev; +- int ret; +- +- mutex_lock(&dev->struct_mutex); +- ret = drm__bufs_info(buf, start, offset, request, eof, data); +- mutex_unlock(&dev->struct_mutex); +- return ret; ++ return 0; + } + + /** +- * Called when "/proc/dri/.../vblank" is read. ++ * Cleanup the proc filesystem resources. + * +- * \param buf output buffer. +- * \param start start of output data. +- * \param offset requested start offset. +- * \param request requested number of bytes. +- * \param eof whether there is no more data to return. +- * \param data private data. +- * \return number of written bytes. +- */ +-static int drm__vblank_info(char *buf, char **start, off_t offset, int request, +- int *eof, void *data) +-{ +- struct drm_minor *minor = (struct drm_minor *) data; +- struct drm_device *dev = minor->dev; +- int len = 0; +- int crtc; +- +- if (offset > DRM_PROC_LIMIT) { +- *eof = 1; +- return 0; +- } +- +- *start = &buf[offset]; +- *eof = 0; +- +- for (crtc = 0; crtc < dev->num_crtcs; crtc++) { +- DRM_PROC_PRINT("CRTC %d enable: %d\n", +- crtc, atomic_read(&dev->vblank_refcount[crtc])); +- DRM_PROC_PRINT("CRTC %d counter: %d\n", +- crtc, drm_vblank_count(dev, crtc)); +- DRM_PROC_PRINT("CRTC %d last wait: %d\n", +- crtc, dev->last_vblank_wait[crtc]); +- DRM_PROC_PRINT("CRTC %d in modeset: %d\n", +- crtc, dev->vblank_inmodeset[crtc]); +- } +- +- if (len > request + offset) +- return request; +- *eof = 1; +- return len - offset; +-} +- +-/** +- * Simply calls _vblank_info() while holding the drm_device::struct_mutex lock. +- */ +-static int drm_vblank_info(char *buf, char **start, off_t offset, int request, +- int *eof, void *data) +-{ +- struct drm_minor *minor = (struct drm_minor *) data; +- struct drm_device *dev = minor->dev; +- int ret; +- +- mutex_lock(&dev->struct_mutex); +- ret = drm__vblank_info(buf, start, offset, request, eof, data); +- mutex_unlock(&dev->struct_mutex); +- return ret; +-} +- +-/** +- * Called when "/proc/dri/.../clients" is read. ++ * \param minor device minor number. ++ * \param root DRI proc dir entry. ++ * \param dev_root DRI device proc dir entry. ++ * \return always zero. + * +- * \param buf output buffer. +- * \param start start of output data. +- * \param offset requested start offset. +- * \param request requested number of bytes. +- * \param eof whether there is no more data to return. +- * \param data private data. +- * \return number of written bytes. ++ * Remove all proc entries created by proc_init(). + */ +-static int drm__clients_info(char *buf, char **start, off_t offset, +- int request, int *eof, void *data) ++int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root) + { +- struct drm_minor *minor = (struct drm_minor *) data; + struct drm_device *dev = minor->dev; +- int len = 0; +- struct drm_file *priv; ++ char name[64]; + +- if (offset > DRM_PROC_LIMIT) { +- *eof = 1; ++ if (!root || !minor->proc_root) + return 0; +- } +- +- *start = &buf[offset]; +- *eof = 0; + +- DRM_PROC_PRINT("a dev pid uid magic ioctls\n\n"); +- list_for_each_entry(priv, &dev->filelist, lhead) { +- DRM_PROC_PRINT("%c %3d %5d %5d %10u %10lu\n", +- priv->authenticated ? 'y' : 'n', +- priv->minor->index, +- priv->pid, +- priv->uid, priv->magic, priv->ioctl_count); +- } +- +- if (len > request + offset) +- return request; +- *eof = 1; +- return len - offset; +-} +- +-/** +- * Simply calls _clients_info() while holding the drm_device::struct_mutex lock. +- */ +-static int drm_clients_info(char *buf, char **start, off_t offset, +- int request, int *eof, void *data) +-{ +- struct drm_minor *minor = (struct drm_minor *) data; +- struct drm_device *dev = minor->dev; +- int ret; +- +- mutex_lock(&dev->struct_mutex); +- ret = drm__clients_info(buf, start, offset, request, eof, data); +- mutex_unlock(&dev->struct_mutex); +- return ret; +-} +- +-struct drm_gem_name_info_data { +- int len; +- char *buf; +- int eof; +-}; ++ if (dev->driver->proc_cleanup) ++ dev->driver->proc_cleanup(minor); + +-static int drm_gem_one_name_info(int id, void *ptr, void *data) +-{ +- struct drm_gem_object *obj = ptr; +- struct drm_gem_name_info_data *nid = data; ++ drm_proc_remove_files(drm_proc_list, DRM_PROC_ENTRIES, minor); + +- DRM_INFO("name %d size %zd\n", obj->name, obj->size); +- if (nid->eof) +- return 0; ++ sprintf(name, "%d", minor->index); ++ remove_proc_entry(name, root); + +- nid->len += sprintf(&nid->buf[nid->len], +- "%6d %8zd %7d %8d\n", +- obj->name, obj->size, +- atomic_read(&obj->handlecount.refcount), +- atomic_read(&obj->refcount.refcount)); +- if (nid->len > DRM_PROC_LIMIT) { +- nid->eof = 1; +- return 0; +- } + return 0; + } + +-static int drm_gem_name_info(char *buf, char **start, off_t offset, +- int request, int *eof, void *data) +-{ +- struct drm_minor *minor = (struct drm_minor *) data; +- struct drm_device *dev = minor->dev; +- struct drm_gem_name_info_data nid; +- +- if (offset > DRM_PROC_LIMIT) { +- *eof = 1; +- return 0; +- } +- +- nid.len = sprintf(buf, " name size handles refcount\n"); +- nid.buf = buf; +- nid.eof = 0; +- idr_for_each(&dev->object_name_idr, drm_gem_one_name_info, &nid); +- +- *start = &buf[offset]; +- *eof = 0; +- if (nid.len > request + offset) +- return request; +- *eof = 1; +- return nid.len - offset; +-} +- +-static int drm_gem_object_info(char *buf, char **start, off_t offset, +- int request, int *eof, void *data) +-{ +- struct drm_minor *minor = (struct drm_minor *) data; +- struct drm_device *dev = minor->dev; +- int len = 0; +- +- if (offset > DRM_PROC_LIMIT) { +- *eof = 1; +- return 0; +- } +- +- *start = &buf[offset]; +- *eof = 0; +- DRM_PROC_PRINT("%d objects\n", atomic_read(&dev->object_count)); +- DRM_PROC_PRINT("%d object bytes\n", atomic_read(&dev->object_memory)); +- DRM_PROC_PRINT("%d pinned\n", atomic_read(&dev->pin_count)); +- DRM_PROC_PRINT("%d pin bytes\n", atomic_read(&dev->pin_memory)); +- DRM_PROC_PRINT("%d gtt bytes\n", atomic_read(&dev->gtt_memory)); +- DRM_PROC_PRINT("%d gtt total\n", dev->gtt_total); +- if (len > request + offset) +- return request; +- *eof = 1; +- return len - offset; +-} +- +-#if DRM_DEBUG_CODE +- +-static int drm__vma_info(char *buf, char **start, off_t offset, int request, +- int *eof, void *data) +-{ +- struct drm_minor *minor = (struct drm_minor *) data; +- struct drm_device *dev = minor->dev; +- int len = 0; +- struct drm_vma_entry *pt; +- struct vm_area_struct *vma; +-#if defined(__i386__) +- unsigned int pgprot; +-#endif +- +- if (offset > DRM_PROC_LIMIT) { +- *eof = 1; +- return 0; +- } +- +- *start = &buf[offset]; +- *eof = 0; +- +- DRM_PROC_PRINT("vma use count: %d, high_memory = %p, 0x%llx\n", +- atomic_read(&dev->vma_count), +- high_memory, (u64)virt_to_phys(high_memory)); +- list_for_each_entry(pt, &dev->vmalist, head) { +- if (!(vma = pt->vma)) +- continue; +- DRM_PROC_PRINT("\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx000", +- pt->pid, +- vma->vm_start, +- vma->vm_end, +- vma->vm_flags & VM_READ ? 'r' : '-', +- vma->vm_flags & VM_WRITE ? 'w' : '-', +- vma->vm_flags & VM_EXEC ? 'x' : '-', +- vma->vm_flags & VM_MAYSHARE ? 's' : 'p', +- vma->vm_flags & VM_LOCKED ? 'l' : '-', +- vma->vm_flags & VM_IO ? 'i' : '-', +- vma->vm_pgoff); +- +-#if defined(__i386__) +- pgprot = pgprot_val(vma->vm_page_prot); +- DRM_PROC_PRINT(" %c%c%c%c%c%c%c%c%c", +- pgprot & _PAGE_PRESENT ? 'p' : '-', +- pgprot & _PAGE_RW ? 'w' : 'r', +- pgprot & _PAGE_USER ? 'u' : 's', +- pgprot & _PAGE_PWT ? 't' : 'b', +- pgprot & _PAGE_PCD ? 'u' : 'c', +- pgprot & _PAGE_ACCESSED ? 'a' : '-', +- pgprot & _PAGE_DIRTY ? 'd' : '-', +- pgprot & _PAGE_PSE ? 'm' : 'k', +- pgprot & _PAGE_GLOBAL ? 'g' : 'l'); +-#endif +- DRM_PROC_PRINT("\n"); +- } +- +- if (len > request + offset) +- return request; +- *eof = 1; +- return len - offset; +-} +- +-static int drm_vma_info(char *buf, char **start, off_t offset, int request, +- int *eof, void *data) +-{ +- struct drm_minor *minor = (struct drm_minor *) data; +- struct drm_device *dev = minor->dev; +- int ret; +- +- mutex_lock(&dev->struct_mutex); +- ret = drm__vma_info(buf, start, offset, request, eof, data); +- mutex_unlock(&dev->struct_mutex); +- return ret; +-} +-#endif --- a/localversion-tip 2009-02-17 19:49:34.000000000 +0000 +++ /dev/null 2009-02-17 18:08:14.005240123 +0000 @@ -1 +0,0 @@ xen.pvops.pre.patch: Index: xen.pvops.pre.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.pre.patch,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- xen.pvops.pre.patch 25 Feb 2009 21:26:02 -0000 1.1.2.3 +++ xen.pvops.pre.patch 5 Mar 2009 01:30:27 -0000 1.1.2.4 @@ -2,6 +2,8 @@ Affected patches; drm-modesetting-radeon.patch - arch/x86/mm/pat.c linux-2.6-debug-nmi-timeout.patch - arch/x86/kernel/nmi.c (moved to arch/x86/kernel/apic/nmi.c) +linux-2.6-defaults-pci_no_msi.patch - drivers/pci/pci.h +drm-next.patch - drivers/gpu/drm/drm_proc.c --- a/arch/x86/mm/pat.c 2009-02-14 12:49:46.000000000 +0000 +++ b/arch/x86/mm/pat.c 2009-02-14 09:16:34.000000000 +0000 @@ -38,3 +40,812 @@ static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { } #endif +--- a/drivers/gpu/drm/drm_proc.c 2009-03-04 18:43:07.000000000 +0000 ++++ b/drivers/gpu/drm/drm_proc.c 2009-03-04 18:35:48.000000000 +0000 +@@ -37,195 +37,697 @@ + * OTHER DEALINGS IN THE SOFTWARE. + */ + +-#include + #include "drmP.h" + +-/*************************************************** +- * Initialization, etc. +- **************************************************/ ++static int drm_name_info(char *buf, char **start, off_t offset, ++ int request, int *eof, void *data); ++static int drm_vm_info(char *buf, char **start, off_t offset, ++ int request, int *eof, void *data); ++static int drm_clients_info(char *buf, char **start, off_t offset, ++ int request, int *eof, void *data); ++static int drm_queues_info(char *buf, char **start, off_t offset, ++ int request, int *eof, void *data); ++static int drm_bufs_info(char *buf, char **start, off_t offset, ++ int request, int *eof, void *data); ++static int drm_vblank_info(char *buf, char **start, off_t offset, ++ int request, int *eof, void *data); ++static int drm_gem_name_info(char *buf, char **start, off_t offset, ++ int request, int *eof, void *data); ++static int drm_gem_object_info(char *buf, char **start, off_t offset, ++ int request, int *eof, void *data); ++#if DRM_DEBUG_CODE ++static int drm_vma_info(char *buf, char **start, off_t offset, ++ int request, int *eof, void *data); ++#endif + + /** + * Proc file list. + */ +-static struct drm_info_list drm_proc_list[] = { ++static struct drm_proc_list { ++ const char *name; /**< file name */ ++ int (*f) (char *, char **, off_t, int, int *, void *); /**< proc callback*/ ++ u32 driver_features; /**< Required driver features for this entry */ ++} drm_proc_list[] = { + {"name", drm_name_info, 0}, ++ {"mem", drm_mem_info, 0}, + {"vm", drm_vm_info, 0}, + {"clients", drm_clients_info, 0}, + {"queues", drm_queues_info, 0}, + {"bufs", drm_bufs_info, 0}, ++ {"vblank", drm_vblank_info, 0}, + {"gem_names", drm_gem_name_info, DRIVER_GEM}, + {"gem_objects", drm_gem_object_info, DRIVER_GEM}, + #if DRM_DEBUG_CODE +- {"vma", drm_vma_info, 0}, ++ {"vma", drm_vma_info}, + #endif + }; +-#define DRM_PROC_ENTRIES ARRAY_SIZE(drm_proc_list) +- +-static int drm_proc_open(struct inode *inode, struct file *file) +-{ +- struct drm_info_node* node = PDE(inode)->data; +- +- return single_open(file, node->info_ent->show, node); +-} +- +-static const struct file_operations drm_proc_fops = { +- .owner = THIS_MODULE, +- .open = drm_proc_open, +- .read = seq_read, +- .llseek = seq_lseek, +- .release = single_release, +-}; + ++#define DRM_PROC_ENTRIES ARRAY_SIZE(drm_proc_list) + + /** +- * Initialize a given set of proc files for a device ++ * Initialize the DRI proc filesystem for a device. + * +- * \param files The array of files to create +- * \param count The number of files given ++ * \param dev DRM device. ++ * \param minor device minor number. + * \param root DRI proc dir entry. +- * \param minor device minor number +- * \return Zero on success, non-zero on failure ++ * \param dev_root resulting DRI device proc dir entry. ++ * \return root entry pointer on success, or NULL on failure. + * +- * Create a given set of proc files represented by an array of +- * gdm_proc_lists in the given root directory. ++ * Create the DRI proc root entry "/proc/dri", the device proc root entry ++ * "/proc/dri/%minor%/", and each entry in proc_list as ++ * "/proc/dri/%minor%/%name%". + */ +-int drm_proc_create_files(struct drm_info_list *files, int count, +- struct proc_dir_entry *root, struct drm_minor *minor) ++int drm_proc_init(struct drm_minor *minor, int minor_id, ++ struct proc_dir_entry *root) + { + struct drm_device *dev = minor->dev; + struct proc_dir_entry *ent; +- struct drm_info_node *tmp; ++ int i, j, ret; + char name[64]; +- int i, ret; + +- for (i = 0; i < count; i++) { +- u32 features = files[i].driver_features; ++ sprintf(name, "%d", minor_id); ++ minor->dev_root = proc_mkdir(name, root); ++ if (!minor->dev_root) { ++ DRM_ERROR("Cannot create /proc/dri/%s\n", name); ++ return -1; ++ } ++ ++ for (i = 0; i < DRM_PROC_ENTRIES; i++) { ++ u32 features = drm_proc_list[i].driver_features; + + if (features != 0 && + (dev->driver->driver_features & features) != features) + continue; + +- tmp = drm_alloc(sizeof(struct drm_info_node), _DRM_DRIVER); +- ent = create_proc_entry(files[i].name, S_IFREG | S_IRUGO, root); ++ ent = create_proc_entry(drm_proc_list[i].name, ++ S_IFREG | S_IRUGO, minor->dev_root); + if (!ent) { + DRM_ERROR("Cannot create /proc/dri/%s/%s\n", +- name, files[i].name); +- drm_free(tmp, sizeof(struct drm_info_node), +- _DRM_DRIVER); ++ name, drm_proc_list[i].name); + ret = -1; + goto fail; + } ++ ent->read_proc = drm_proc_list[i].f; ++ ent->data = minor; ++ } + +- ent->proc_fops = &drm_proc_fops; +- ent->data = tmp; +- tmp->minor = minor; +- tmp->info_ent = &files[i]; +- list_add(&(tmp->list), &(minor->proc_nodes.list)); ++ if (dev->driver->proc_init) { ++ ret = dev->driver->proc_init(minor); ++ if (ret) { ++ DRM_ERROR("DRM: Driver failed to initialize " ++ "/proc/dri.\n"); ++ goto fail; ++ } + } ++ + return 0; ++ fail: + +-fail: +- for (i = 0; i < count; i++) +- remove_proc_entry(drm_proc_list[i].name, minor->proc_root); ++ for (j = 0; j < i; j++) ++ remove_proc_entry(drm_proc_list[i].name, ++ minor->dev_root); ++ remove_proc_entry(name, root); ++ minor->dev_root = NULL; + return ret; + } + + /** +- * Initialize the DRI proc filesystem for a device ++ * Cleanup the proc filesystem resources. + * +- * \param dev DRM device +- * \param minor device minor number ++ * \param minor device minor number. + * \param root DRI proc dir entry. +- * \param dev_root resulting DRI device proc dir entry. +- * \return root entry pointer on success, or NULL on failure. ++ * \param dev_root DRI device proc dir entry. ++ * \return always zero. + * +- * Create the DRI proc root entry "/proc/dri", the device proc root entry +- * "/proc/dri/%minor%/", and each entry in proc_list as +- * "/proc/dri/%minor%/%name%". ++ * Remove all proc entries created by proc_init(). + */ +-int drm_proc_init(struct drm_minor *minor, int minor_id, +- struct proc_dir_entry *root) ++int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root) + { + struct drm_device *dev = minor->dev; ++ int i; + char name[64]; +- int ret; + +- INIT_LIST_HEAD(&minor->proc_nodes.list); +- sprintf(name, "%d", minor_id); +- minor->proc_root = proc_mkdir(name, root); +- if (!minor->proc_root) { +- DRM_ERROR("Cannot create /proc/dri/%s\n", name); +- return -1; ++ if (!root || !minor->dev_root) ++ return 0; ++ ++ if (dev->driver->proc_cleanup) ++ dev->driver->proc_cleanup(minor); ++ ++ for (i = 0; i < DRM_PROC_ENTRIES; i++) ++ remove_proc_entry(drm_proc_list[i].name, minor->dev_root); ++ sprintf(name, "%d", minor->index); ++ remove_proc_entry(name, root); ++ ++ return 0; ++} ++ ++/** ++ * Called when "/proc/dri/.../name" is read. ++ * ++ * \param buf output buffer. ++ * \param start start of output data. ++ * \param offset requested start offset. ++ * \param request requested number of bytes. ++ * \param eof whether there is no more data to return. ++ * \param data private data. ++ * \return number of written bytes. ++ * ++ * Prints the device name together with the bus id if available. ++ */ ++static int drm_name_info(char *buf, char **start, off_t offset, int request, ++ int *eof, void *data) ++{ ++ struct drm_minor *minor = (struct drm_minor *) data; ++ struct drm_master *master = minor->master; ++ struct drm_device *dev = minor->dev; ++ int len = 0; ++ ++ if (offset > DRM_PROC_LIMIT) { ++ *eof = 1; ++ return 0; + } + +- ret = drm_proc_create_files(drm_proc_list, DRM_PROC_ENTRIES, +- minor->proc_root, minor); +- if (ret) { +- remove_proc_entry(name, root); +- minor->proc_root = NULL; +- DRM_ERROR("Failed to create core drm proc files\n"); +- return ret; ++ if (!master) ++ return 0; ++ ++ *start = &buf[offset]; ++ *eof = 0; ++ ++ if (master->unique) { ++ DRM_PROC_PRINT("%s %s %s\n", ++ dev->driver->pci_driver.name, ++ pci_name(dev->pdev), master->unique); ++ } else { ++ DRM_PROC_PRINT("%s %s\n", dev->driver->pci_driver.name, ++ pci_name(dev->pdev)); + } + +- if (dev->driver->proc_init) { +- ret = dev->driver->proc_init(minor); +- if (ret) { +- DRM_ERROR("DRM: Driver failed to initialize " +- "/proc/dri.\n"); +- return ret; ++ if (len > request + offset) ++ return request; ++ *eof = 1; ++ return len - offset; ++} ++ ++/** ++ * Called when "/proc/dri/.../vm" is read. ++ * ++ * \param buf output buffer. ++ * \param start start of output data. ++ * \param offset requested start offset. ++ * \param request requested number of bytes. ++ * \param eof whether there is no more data to return. ++ * \param data private data. ++ * \return number of written bytes. ++ * ++ * Prints information about all mappings in drm_device::maplist. ++ */ ++static int drm__vm_info(char *buf, char **start, off_t offset, int request, ++ int *eof, void *data) ++{ ++ struct drm_minor *minor = (struct drm_minor *) data; ++ struct drm_device *dev = minor->dev; ++ int len = 0; ++ struct drm_map *map; ++ struct drm_map_list *r_list; ++ ++ /* Hardcoded from _DRM_FRAME_BUFFER, ++ _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and ++ _DRM_SCATTER_GATHER and _DRM_CONSISTENT */ ++ const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" }; ++ const char *type; ++ int i; ++ ++ if (offset > DRM_PROC_LIMIT) { ++ *eof = 1; ++ return 0; ++ } ++ ++ *start = &buf[offset]; ++ *eof = 0; ++ ++ DRM_PROC_PRINT("slot offset size type flags " ++ "address mtrr\n\n"); ++ i = 0; ++ list_for_each_entry(r_list, &dev->maplist, head) { ++ map = r_list->map; ++ if (!map) ++ continue; ++ if (map->type < 0 || map->type > 5) ++ type = "??"; ++ else ++ type = types[map->type]; ++ DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx ", ++ i, ++ map->offset, ++ map->size, type, map->flags, ++ (unsigned long) r_list->user_token); ++ if (map->mtrr < 0) { ++ DRM_PROC_PRINT("none\n"); ++ } else { ++ DRM_PROC_PRINT("%4d\n", map->mtrr); + } ++ i++; + } +- return 0; ++ ++ if (len > request + offset) ++ return request; ++ *eof = 1; ++ return len - offset; + } + +-int drm_proc_remove_files(struct drm_info_list *files, int count, +- struct drm_minor *minor) ++/** ++ * Simply calls _vm_info() while holding the drm_device::struct_mutex lock. ++ */ ++static int drm_vm_info(char *buf, char **start, off_t offset, int request, ++ int *eof, void *data) ++{ ++ struct drm_minor *minor = (struct drm_minor *) data; ++ struct drm_device *dev = minor->dev; ++ int ret; ++ ++ mutex_lock(&dev->struct_mutex); ++ ret = drm__vm_info(buf, start, offset, request, eof, data); ++ mutex_unlock(&dev->struct_mutex); ++ return ret; ++} ++ ++/** ++ * Called when "/proc/dri/.../queues" is read. ++ * ++ * \param buf output buffer. ++ * \param start start of output data. ++ * \param offset requested start offset. ++ * \param request requested number of bytes. ++ * \param eof whether there is no more data to return. ++ * \param data private data. ++ * \return number of written bytes. ++ */ ++static int drm__queues_info(char *buf, char **start, off_t offset, ++ int request, int *eof, void *data) + { +- struct list_head *pos, *q; +- struct drm_info_node *tmp; ++ struct drm_minor *minor = (struct drm_minor *) data; ++ struct drm_device *dev = minor->dev; ++ int len = 0; + int i; ++ struct drm_queue *q; + +- for (i = 0; i < count; i++) { +- list_for_each_safe(pos, q, &minor->proc_nodes.list) { +- tmp = list_entry(pos, struct drm_info_node, list); +- if (tmp->info_ent == &files[i]) { +- remove_proc_entry(files[i].name, +- minor->proc_root); +- list_del(pos); +- drm_free(tmp, sizeof(struct drm_info_node), +- _DRM_DRIVER); +- } +- } ++ if (offset > DRM_PROC_LIMIT) { ++ *eof = 1; ++ return 0; + } +- return 0; ++ ++ *start = &buf[offset]; ++ *eof = 0; ++ ++ DRM_PROC_PRINT(" ctx/flags use fin" ++ " blk/rw/rwf wait flushed queued" ++ " locks\n\n"); ++ for (i = 0; i < dev->queue_count; i++) { ++ q = dev->queuelist[i]; ++ atomic_inc(&q->use_count); ++ DRM_PROC_PRINT_RET(atomic_dec(&q->use_count), ++ "%5d/0x%03x %5d %5d" ++ " %5d/%c%c/%c%c%c %5Zd\n", ++ i, ++ q->flags, ++ atomic_read(&q->use_count), ++ atomic_read(&q->finalization), ++ atomic_read(&q->block_count), ++ atomic_read(&q->block_read) ? 'r' : '-', ++ atomic_read(&q->block_write) ? 'w' : '-', ++ waitqueue_active(&q->read_queue) ? 'r' : '-', ++ waitqueue_active(&q-> ++ write_queue) ? 'w' : '-', ++ waitqueue_active(&q-> ++ flush_queue) ? 'f' : '-', ++ DRM_BUFCOUNT(&q->waitlist)); ++ atomic_dec(&q->use_count); ++ } ++ ++ if (len > request + offset) ++ return request; ++ *eof = 1; ++ return len - offset; + } + + /** +- * Cleanup the proc filesystem resources. ++ * Simply calls _queues_info() while holding the drm_device::struct_mutex lock. ++ */ ++static int drm_queues_info(char *buf, char **start, off_t offset, int request, ++ int *eof, void *data) ++{ ++ struct drm_minor *minor = (struct drm_minor *) data; ++ struct drm_device *dev = minor->dev; ++ int ret; ++ ++ mutex_lock(&dev->struct_mutex); ++ ret = drm__queues_info(buf, start, offset, request, eof, data); ++ mutex_unlock(&dev->struct_mutex); ++ return ret; ++} ++ ++/** ++ * Called when "/proc/dri/.../bufs" is read. + * +- * \param minor device minor number. +- * \param root DRI proc dir entry. +- * \param dev_root DRI device proc dir entry. +- * \return always zero. ++ * \param buf output buffer. ++ * \param start start of output data. ++ * \param offset requested start offset. ++ * \param request requested number of bytes. ++ * \param eof whether there is no more data to return. ++ * \param data private data. ++ * \return number of written bytes. ++ */ ++static int drm__bufs_info(char *buf, char **start, off_t offset, int request, ++ int *eof, void *data) ++{ ++ struct drm_minor *minor = (struct drm_minor *) data; ++ struct drm_device *dev = minor->dev; ++ int len = 0; ++ struct drm_device_dma *dma = dev->dma; ++ int i; ++ ++ if (!dma || offset > DRM_PROC_LIMIT) { ++ *eof = 1; ++ return 0; ++ } ++ ++ *start = &buf[offset]; ++ *eof = 0; ++ ++ DRM_PROC_PRINT(" o size count free segs pages kB\n\n"); ++ for (i = 0; i <= DRM_MAX_ORDER; i++) { ++ if (dma->bufs[i].buf_count) ++ DRM_PROC_PRINT("%2d %8d %5d %5d %5d %5d %5ld\n", ++ i, ++ dma->bufs[i].buf_size, ++ dma->bufs[i].buf_count, ++ atomic_read(&dma->bufs[i] ++ .freelist.count), ++ dma->bufs[i].seg_count, ++ dma->bufs[i].seg_count ++ * (1 << dma->bufs[i].page_order), ++ (dma->bufs[i].seg_count ++ * (1 << dma->bufs[i].page_order)) ++ * PAGE_SIZE / 1024); ++ } ++ DRM_PROC_PRINT("\n"); ++ for (i = 0; i < dma->buf_count; i++) { ++ if (i && !(i % 32)) ++ DRM_PROC_PRINT("\n"); ++ DRM_PROC_PRINT(" %d", dma->buflist[i]->list); ++ } ++ DRM_PROC_PRINT("\n"); ++ ++ if (len > request + offset) ++ return request; ++ *eof = 1; ++ return len - offset; ++} ++ ++/** ++ * Simply calls _bufs_info() while holding the drm_device::struct_mutex lock. ++ */ ++static int drm_bufs_info(char *buf, char **start, off_t offset, int request, ++ int *eof, void *data) ++{ ++ struct drm_minor *minor = (struct drm_minor *) data; ++ struct drm_device *dev = minor->dev; ++ int ret; ++ ++ mutex_lock(&dev->struct_mutex); ++ ret = drm__bufs_info(buf, start, offset, request, eof, data); ++ mutex_unlock(&dev->struct_mutex); ++ return ret; ++} ++ ++/** ++ * Called when "/proc/dri/.../vblank" is read. + * +- * Remove all proc entries created by proc_init(). ++ * \param buf output buffer. ++ * \param start start of output data. ++ * \param offset requested start offset. ++ * \param request requested number of bytes. ++ * \param eof whether there is no more data to return. ++ * \param data private data. ++ * \return number of written bytes. + */ +-int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root) ++static int drm__vblank_info(char *buf, char **start, off_t offset, int request, ++ int *eof, void *data) + { ++ struct drm_minor *minor = (struct drm_minor *) data; + struct drm_device *dev = minor->dev; +- char name[64]; ++ int len = 0; ++ int crtc; + +- if (!root || !minor->proc_root) ++ if (offset > DRM_PROC_LIMIT) { ++ *eof = 1; + return 0; ++ } + +- if (dev->driver->proc_cleanup) +- dev->driver->proc_cleanup(minor); ++ *start = &buf[offset]; ++ *eof = 0; + +- drm_proc_remove_files(drm_proc_list, DRM_PROC_ENTRIES, minor); ++ for (crtc = 0; crtc < dev->num_crtcs; crtc++) { ++ DRM_PROC_PRINT("CRTC %d enable: %d\n", ++ crtc, atomic_read(&dev->vblank_refcount[crtc])); ++ DRM_PROC_PRINT("CRTC %d counter: %d\n", ++ crtc, drm_vblank_count(dev, crtc)); ++ DRM_PROC_PRINT("CRTC %d last wait: %d\n", ++ crtc, dev->last_vblank_wait[crtc]); ++ DRM_PROC_PRINT("CRTC %d in modeset: %d\n", ++ crtc, dev->vblank_inmodeset[crtc]); ++ } + +- sprintf(name, "%d", minor->index); +- remove_proc_entry(name, root); ++ if (len > request + offset) ++ return request; ++ *eof = 1; ++ return len - offset; ++} ++ ++/** ++ * Simply calls _vblank_info() while holding the drm_device::struct_mutex lock. ++ */ ++static int drm_vblank_info(char *buf, char **start, off_t offset, int request, ++ int *eof, void *data) ++{ ++ struct drm_minor *minor = (struct drm_minor *) data; ++ struct drm_device *dev = minor->dev; ++ int ret; ++ ++ mutex_lock(&dev->struct_mutex); ++ ret = drm__vblank_info(buf, start, offset, request, eof, data); ++ mutex_unlock(&dev->struct_mutex); ++ return ret; ++} ++ ++/** ++ * Called when "/proc/dri/.../clients" is read. ++ * ++ * \param buf output buffer. ++ * \param start start of output data. ++ * \param offset requested start offset. ++ * \param request requested number of bytes. ++ * \param eof whether there is no more data to return. ++ * \param data private data. ++ * \return number of written bytes. ++ */ ++static int drm__clients_info(char *buf, char **start, off_t offset, ++ int request, int *eof, void *data) ++{ ++ struct drm_minor *minor = (struct drm_minor *) data; ++ struct drm_device *dev = minor->dev; ++ int len = 0; ++ struct drm_file *priv; ++ ++ if (offset > DRM_PROC_LIMIT) { ++ *eof = 1; ++ return 0; ++ } ++ ++ *start = &buf[offset]; ++ *eof = 0; + ++ DRM_PROC_PRINT("a dev pid uid magic ioctls\n\n"); ++ list_for_each_entry(priv, &dev->filelist, lhead) { ++ DRM_PROC_PRINT("%c %3d %5d %5d %10u %10lu\n", ++ priv->authenticated ? 'y' : 'n', ++ priv->minor->index, ++ priv->pid, ++ priv->uid, priv->magic, priv->ioctl_count); ++ } ++ ++ if (len > request + offset) ++ return request; ++ *eof = 1; ++ return len - offset; ++} ++ ++/** ++ * Simply calls _clients_info() while holding the drm_device::struct_mutex lock. ++ */ ++static int drm_clients_info(char *buf, char **start, off_t offset, ++ int request, int *eof, void *data) ++{ ++ struct drm_minor *minor = (struct drm_minor *) data; ++ struct drm_device *dev = minor->dev; ++ int ret; ++ ++ mutex_lock(&dev->struct_mutex); ++ ret = drm__clients_info(buf, start, offset, request, eof, data); ++ mutex_unlock(&dev->struct_mutex); ++ return ret; ++} ++ ++struct drm_gem_name_info_data { ++ int len; ++ char *buf; ++ int eof; ++}; ++ ++static int drm_gem_one_name_info(int id, void *ptr, void *data) ++{ ++ struct drm_gem_object *obj = ptr; ++ struct drm_gem_name_info_data *nid = data; ++ ++ DRM_INFO("name %d size %zd\n", obj->name, obj->size); ++ if (nid->eof) ++ return 0; ++ ++ nid->len += sprintf(&nid->buf[nid->len], ++ "%6d %8zd %7d %8d\n", ++ obj->name, obj->size, ++ atomic_read(&obj->handlecount.refcount), ++ atomic_read(&obj->refcount.refcount)); ++ if (nid->len > DRM_PROC_LIMIT) { ++ nid->eof = 1; ++ return 0; ++ } + return 0; + } + ++static int drm_gem_name_info(char *buf, char **start, off_t offset, ++ int request, int *eof, void *data) ++{ ++ struct drm_minor *minor = (struct drm_minor *) data; ++ struct drm_device *dev = minor->dev; ++ struct drm_gem_name_info_data nid; ++ ++ if (offset > DRM_PROC_LIMIT) { ++ *eof = 1; ++ return 0; ++ } ++ ++ nid.len = sprintf(buf, " name size handles refcount\n"); ++ nid.buf = buf; ++ nid.eof = 0; ++ idr_for_each(&dev->object_name_idr, drm_gem_one_name_info, &nid); ++ ++ *start = &buf[offset]; ++ *eof = 0; ++ if (nid.len > request + offset) ++ return request; ++ *eof = 1; ++ return nid.len - offset; ++} ++ ++static int drm_gem_object_info(char *buf, char **start, off_t offset, ++ int request, int *eof, void *data) ++{ ++ struct drm_minor *minor = (struct drm_minor *) data; ++ struct drm_device *dev = minor->dev; ++ int len = 0; ++ ++ if (offset > DRM_PROC_LIMIT) { ++ *eof = 1; ++ return 0; ++ } ++ ++ *start = &buf[offset]; ++ *eof = 0; ++ DRM_PROC_PRINT("%d objects\n", atomic_read(&dev->object_count)); ++ DRM_PROC_PRINT("%d object bytes\n", atomic_read(&dev->object_memory)); ++ DRM_PROC_PRINT("%d pinned\n", atomic_read(&dev->pin_count)); ++ DRM_PROC_PRINT("%d pin bytes\n", atomic_read(&dev->pin_memory)); ++ DRM_PROC_PRINT("%d gtt bytes\n", atomic_read(&dev->gtt_memory)); ++ DRM_PROC_PRINT("%d gtt total\n", dev->gtt_total); ++ if (len > request + offset) ++ return request; ++ *eof = 1; ++ return len - offset; ++} ++ ++#if DRM_DEBUG_CODE ++ ++static int drm__vma_info(char *buf, char **start, off_t offset, int request, ++ int *eof, void *data) ++{ ++ struct drm_minor *minor = (struct drm_minor *) data; ++ struct drm_device *dev = minor->dev; ++ int len = 0; ++ struct drm_vma_entry *pt; ++ struct vm_area_struct *vma; ++#if defined(__i386__) ++ unsigned int pgprot; ++#endif ++ ++ if (offset > DRM_PROC_LIMIT) { ++ *eof = 1; ++ return 0; ++ } ++ ++ *start = &buf[offset]; ++ *eof = 0; ++ ++ DRM_PROC_PRINT("vma use count: %d, high_memory = %p, 0x%08lx\n", ++ atomic_read(&dev->vma_count), ++ high_memory, virt_to_phys(high_memory)); ++ list_for_each_entry(pt, &dev->vmalist, head) { ++ if (!(vma = pt->vma)) ++ continue; ++ DRM_PROC_PRINT("\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx000", ++ pt->pid, ++ vma->vm_start, ++ vma->vm_end, ++ vma->vm_flags & VM_READ ? 'r' : '-', ++ vma->vm_flags & VM_WRITE ? 'w' : '-', ++ vma->vm_flags & VM_EXEC ? 'x' : '-', ++ vma->vm_flags & VM_MAYSHARE ? 's' : 'p', ++ vma->vm_flags & VM_LOCKED ? 'l' : '-', ++ vma->vm_flags & VM_IO ? 'i' : '-', ++ vma->vm_pgoff); ++ ++#if defined(__i386__) ++ pgprot = pgprot_val(vma->vm_page_prot); ++ DRM_PROC_PRINT(" %c%c%c%c%c%c%c%c%c", ++ pgprot & _PAGE_PRESENT ? 'p' : '-', ++ pgprot & _PAGE_RW ? 'w' : 'r', ++ pgprot & _PAGE_USER ? 'u' : 's', ++ pgprot & _PAGE_PWT ? 't' : 'b', ++ pgprot & _PAGE_PCD ? 'u' : 'c', ++ pgprot & _PAGE_ACCESSED ? 'a' : '-', ++ pgprot & _PAGE_DIRTY ? 'd' : '-', ++ pgprot & _PAGE_PSE ? 'm' : 'k', ++ pgprot & _PAGE_GLOBAL ? 'g' : 'l'); ++#endif ++ DRM_PROC_PRINT("\n"); ++ } ++ ++ if (len > request + offset) ++ return request; ++ *eof = 1; ++ return len - offset; ++} ++ ++static int drm_vma_info(char *buf, char **start, off_t offset, int request, ++ int *eof, void *data) ++{ ++ struct drm_minor *minor = (struct drm_minor *) data; ++ struct drm_device *dev = minor->dev; ++ int ret; ++ ++ mutex_lock(&dev->struct_mutex); ++ ret = drm__vma_info(buf, start, offset, request, eof, data); ++ mutex_unlock(&dev->struct_mutex); ++ return ret; ++} ++#endif --- drm-edid-revision-0-should-be-valid.patch DELETED --- --- linux-2.6-iwlwifi-dma-direction.patch DELETED --- --- linux-2.6-libertas-netpriv-fixes.patch DELETED --- --- patch-2.6.29-rc6-git2.bz2.sign DELETED --- --- patch-2.6.29-rc6.bz2.sign DELETED --- From rdieter at fedoraproject.org Thu Mar 5 01:31:03 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 01:31:03 +0000 (UTC) Subject: rpms/PyQt4/F-9 PyQt4.spec,1.10,1.11 Message-ID: <20090305013103.37A5970116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/PyQt4/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12958 Modified Files: PyQt4.spec Log Message: * Wed Mar 05 2009 Rex Dieter - 4.4.4-5 - move designer plugins to main/runtime (#487622) Index: PyQt4.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyQt4/F-9/PyQt4.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- PyQt4.spec 30 Dec 2008 01:22:02 -0000 1.10 +++ PyQt4.spec 5 Mar 2009 01:30:32 -0000 1.11 @@ -4,7 +4,7 @@ Summary: Python bindings for Qt4 Name: PyQt4 Version: 4.4.4 -Release: 1%{?dist} +Release: 5%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions @@ -111,6 +111,7 @@ %{python_sitearch}/PyQt4/ # fixme? -> sitearch? -- Rex %{python_sitelib}/dbus/mainloop/qt.so +%{_qt4_plugindir}/designer/* %files devel %defattr(-,root,root,-) @@ -118,10 +119,21 @@ %doc examples/ %{_bindir}/* %{_datadir}/sip/PyQt4/ -%{_qt4_plugindir}/designer/* %changelog +* Wed Mar 05 2009 Rex Dieter - 4.4.4-5 +- move designer plugins to main/runtime (#487622) + +* Mon Feb 23 2009 Fedora Release Engineering - 4.4.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Feb 13 2009 Than Ngo - 4.4.4-3 +- rebuild against qt-4.5rc1 + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 4.4.4-2 +- Rebuild for Python 2.6 + * Mon Nov 10 2008 Rex Dieter 4.4.4-1 - PyQt-4.4.4 From rdieter at fedoraproject.org Thu Mar 5 01:32:45 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 01:32:45 +0000 (UTC) Subject: rpms/kdebase-workspace/F-9 .cvsignore, 1.16, 1.17 kdebase-workspace.spec, 1.137, 1.138 Message-ID: <20090305013245.CA62070116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13589 Modified Files: .cvsignore kdebase-workspace.spec Log Message: * Wed Mar 04 2009 Rex Dieter - 4.2.1-3 - move designer plugins to main/runtime (#487622) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 8 Jan 2009 11:50:15 -0000 1.16 +++ .cvsignore 5 Mar 2009 01:32:15 -0000 1.17 @@ -1 +1 @@ -kdebase-workspace-4.1.4.tar.bz2 +kdebase-workspace-4.2.1.tar.bz2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- kdebase-workspace.spec 3 Mar 2009 12:24:24 -0000 1.137 +++ kdebase-workspace.spec 5 Mar 2009 01:32:15 -0000 1.138 @@ -8,7 +8,7 @@ Name: kdebase-workspace Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -297,6 +297,8 @@ %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_iconsdir}/oxygen/*/*/* %{_kde4_libdir}/kde4/*.so +%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so +%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so %{_kde4_libexecdir}/* %{_libdir}/strigi/ %{_kde4_libdir}/libkdeinit*.so @@ -320,8 +322,6 @@ %defattr(-,root,root,-) %{_kde4_includedir}/* %{_kde4_libdir}/lib*.so -%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so -%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so # CMake seems to change behaviour between F11's cmake (2.6.3rc5) # and F10's cmake (2.6.2) -- Lorenzo %if 0%{?fedora} > 10 @@ -370,6 +370,9 @@ %changelog +* Wed Mar 04 2009 Rex Dieter - 4.2.1-3 +- move designer plugins to main/runtime (#487622) + * Tue Mar 03 2009 Than Ngo - 4.2.1-2 - respin From rdieter at fedoraproject.org Thu Mar 5 01:33:01 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 01:33:01 +0000 (UTC) Subject: rpms/kdebase-workspace/F-10 .cvsignore, 1.22, 1.23 kdebase-workspace.spec, 1.164, 1.165 Message-ID: <20090305013301.AD9D270116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13647 Modified Files: .cvsignore kdebase-workspace.spec Log Message: * Wed Mar 04 2009 Rex Dieter - 4.2.1-3 - move designer plugins to main/runtime (#487622) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 24 Jan 2009 06:17:58 -0000 1.22 +++ .cvsignore 5 Mar 2009 01:32:31 -0000 1.23 @@ -1,3 +1 @@ -kdebase-workspace-4.1.85.tar.bz2 -kdebase-workspace-4.1.96.tar.bz2 -kdebase-workspace-4.2.0.tar.bz2 +kdebase-workspace-4.2.1.tar.bz2 Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- kdebase-workspace.spec 3 Mar 2009 12:22:04 -0000 1.164 +++ kdebase-workspace.spec 5 Mar 2009 01:32:31 -0000 1.165 @@ -8,7 +8,7 @@ Name: kdebase-workspace Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -297,6 +297,8 @@ %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_iconsdir}/oxygen/*/*/* %{_kde4_libdir}/kde4/*.so +%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so +%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so %{_kde4_libexecdir}/* %{_libdir}/strigi/ %{_kde4_libdir}/libkdeinit*.so @@ -320,8 +322,6 @@ %defattr(-,root,root,-) %{_kde4_includedir}/* %{_kde4_libdir}/lib*.so -%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so -%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so # CMake seems to change behaviour between F11's cmake (2.6.3rc5) # and F10's cmake (2.6.2) -- Lorenzo %if 0%{?fedora} > 10 @@ -370,6 +370,9 @@ %changelog +* Wed Mar 04 2009 Rex Dieter - 4.2.1-3 +- move designer plugins to main/runtime (#487622) + * Tue Mar 03 2009 Than Ngo - 4.2.1-2 - respin From tibbs at fedoraproject.org Thu Mar 5 01:36:49 2009 From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=) Date: Thu, 5 Mar 2009 01:36:49 +0000 (UTC) Subject: rpms/denyhosts/devel denyhosts-2.6-selinux.patch, NONE, 1.1 denyhosts.spec, 1.56, 1.57 Message-ID: <20090305013649.3C86470116@cvs1.fedora.phx.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14385 Modified Files: denyhosts.spec Added Files: denyhosts-2.6-selinux.patch Log Message: * Wed Mar 04 2009 Jason L Tibbitts III - 2.6-18 - Add patch to keep proper file context on the hosts.deny file. denyhosts-2.6-selinux.patch: --- NEW FILE denyhosts-2.6-selinux.patch --- --- DenyHosts-2.6/DenyHosts/denyfileutil.py.orig 2009-03-04 19:21:28.000000000 -0600 +++ DenyHosts-2.6/DenyHosts/denyfileutil.py 2009-03-04 19:23:45.000000000 -0600 @@ -8,6 +8,7 @@ from util import parse_host import plugin from purgecounter import PurgeCounter +import selinux debug = logging.getLogger("denyfileutil").debug info = logging.getLogger("denyfileutil").info @@ -166,6 +167,10 @@ try: fp = open(self.temp_file, "w") os.chmod(self.temp_file, 0644) + # Fedora patch - create the temp file with the proper context, so + # we don't hose the context on the hosts.deny file. + if selinux.is_seliux_enabled(): + selinux.restorecon(self.temp_file) offset = 0 num_lines = len(data) while offset < num_lines: Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- denyhosts.spec 24 Feb 2009 11:26:47 -0000 1.56 +++ denyhosts.spec 5 Mar 2009 01:36:18 -0000 1.57 @@ -1,6 +1,6 @@ Name: denyhosts Version: 2.6 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -19,13 +19,15 @@ Patch2: denyhosts-2.6-daemon-control.patch Patch3: denyhosts-2.6-defconffile.patch Patch4: denyhosts-2.6-commandlinesync.patch +Patch5: denyhosts-2.6-selinux.patch # Patch10 is a security fix Patch10: denyhosts-2.6-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel -Requires: openssh-server +# libselinux-python is necessary due to Patch5. +Requires: openssh-server libselinux-python %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -163,6 +165,9 @@ %changelog +* Wed Mar 04 2009 Jason L Tibbitts III - 2.6-18 +- Add patch to keep proper file context on the hosts.deny file. + * Tue Feb 24 2009 Fedora Release Engineering - 2.6-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From nbecker at fedoraproject.org Thu Mar 5 01:42:58 2009 From: nbecker at fedoraproject.org (Neal Becker) Date: Thu, 5 Mar 2009 01:42:58 +0000 (UTC) Subject: rpms/mercurial/devel .cvsignore, 1.23, 1.24 mercurial.spec, 1.66, 1.67 sources, 1.25, 1.26 Message-ID: <20090305014259.03DF370116@cvs1.fedora.phx.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/mercurial/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15241 Modified Files: .cvsignore mercurial.spec sources Log Message: update to 1.2 see http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mercurial/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 1 Jan 2009 17:40:35 -0000 1.23 +++ .cvsignore 5 Mar 2009 01:42:28 -0000 1.24 @@ -1 +1 @@ -mercurial-1.1.2.tar.gz +mercurial-1.2.tar.gz Index: mercurial.spec =================================================================== RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- mercurial.spec 24 Feb 2009 19:24:04 -0000 1.66 +++ mercurial.spec 5 Mar 2009 01:42:28 -0000 1.67 @@ -2,8 +2,8 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.1.2 -Release: 7%{?dist} +Version: 1.2 +Release: 1%{?dist} License: GPLv2 Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -170,6 +170,9 @@ #cd tests && %{__python} run-tests.py %changelog +* Wed Mar 4 2009 Neal Becker - 1.2-1 +- Update to 1.2 + * Tue Feb 24 2009 Neal Becker - 1.1.2-7 - Use noreplace option on config Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mercurial/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 1 Jan 2009 17:40:35 -0000 1.25 +++ sources 5 Mar 2009 01:42:28 -0000 1.26 @@ -1 +1 @@ -4fd3b9a2e5dcd025840c3849b136bec8 mercurial-1.1.2.tar.gz +ac9d16b078f99f7a89d6865421570f05 mercurial-1.2.tar.gz From nbecker at fedoraproject.org Thu Mar 5 01:53:00 2009 From: nbecker at fedoraproject.org (Neal Becker) Date: Thu, 5 Mar 2009 01:53:00 +0000 (UTC) Subject: rpms/mercurial/devel mercurial.spec,1.67,1.68 Message-ID: <20090305015300.2A67D70116@cvs1.fedora.phx.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/mercurial/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16575 Modified Files: mercurial.spec Log Message: patch for filemerge bug should (hopefully) not be needed Index: mercurial.spec =================================================================== RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- mercurial.spec 5 Mar 2009 01:42:28 -0000 1.67 +++ mercurial.spec 5 Mar 2009 01:52:29 -0000 1.68 @@ -3,14 +3,14 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial Version: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Development/Tools URL: http://www.selenic.com/mercurial/ Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz Source1: mercurial-site-start.el # temporary fix for filemerge bug -Patch0: mercurial-mergetools.hgrc.patch +#Patch0: mercurial-mergetools.hgrc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: python python-devel BuildRequires: emacs emacs-el pkgconfig @@ -79,7 +79,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %build make all @@ -170,6 +170,9 @@ #cd tests && %{__python} run-tests.py %changelog +* Wed Mar 4 2009 Neal Becker - 1.2-2 +- patch0 for filemerge bug should not be needed + * Wed Mar 4 2009 Neal Becker - 1.2-1 - Update to 1.2 From rdieter at fedoraproject.org Thu Mar 5 01:55:34 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 01:55:34 +0000 (UTC) Subject: rpms/kdepimlibs/devel .cvsignore,1.33,1.34 Message-ID: <20090305015535.0CC8770116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepimlibs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17025 Modified Files: .cvsignore Log Message: cleanup Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 27 Feb 2009 12:44:16 -0000 1.33 +++ .cvsignore 5 Mar 2009 01:55:04 -0000 1.34 @@ -1,4 +1 @@ -kdepimlibs-4.1.85.tar.bz2 -kdepimlibs-4.1.96.tar.bz2 -kdepimlibs-4.2.0.tar.bz2 kdepimlibs-4.2.1.tar.bz2 From rdieter at fedoraproject.org Thu Mar 5 02:00:12 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 02:00:12 +0000 (UTC) Subject: rpms/kdepimlibs/F-10 .cvsignore,1.29,1.30 Message-ID: <20090305020012.5BAC270116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepimlibs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18050 Modified Files: .cvsignore Log Message: cleanup Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 23 Jan 2009 20:39:54 -0000 1.29 +++ .cvsignore 5 Mar 2009 01:59:42 -0000 1.30 @@ -1,3 +1 @@ -kdepimlibs-4.1.85.tar.bz2 -kdepimlibs-4.1.96.tar.bz2 -kdepimlibs-4.2.0.tar.bz2 +kdepimlibs-4.2.1.tar.bz2 From nbecker at fedoraproject.org Thu Mar 5 02:06:28 2009 From: nbecker at fedoraproject.org (Neal Becker) Date: Thu, 5 Mar 2009 02:06:28 +0000 (UTC) Subject: rpms/mercurial/F-10 mercurial.spec,1.59,1.60 sources,1.25,1.26 Message-ID: <20090305020628.3654670116@cvs1.fedora.phx.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/mercurial/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19118 Modified Files: mercurial.spec sources Log Message: update to 1.2: see http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew Index: mercurial.spec =================================================================== RCS file: /cvs/pkgs/rpms/mercurial/F-10/mercurial.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- mercurial.spec 27 Feb 2009 16:27:06 -0000 1.59 +++ mercurial.spec 5 Mar 2009 02:05:57 -0000 1.60 @@ -2,15 +2,15 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.1.2 -Release: 7%{?dist} +Version: 1.2 +Release: 2%{?dist} License: GPLv2 Group: Development/Tools URL: http://www.selenic.com/mercurial/ Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz Source1: mercurial-site-start.el # temporary fix for filemerge bug -Patch0: mercurial-mergetools.hgrc.patch +#Patch0: mercurial-mergetools.hgrc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: python python-devel BuildRequires: emacs emacs-el pkgconfig @@ -79,7 +79,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %build make all @@ -170,6 +170,12 @@ #cd tests && %{__python} run-tests.py %changelog +* Wed Mar 4 2009 Neal Becker - 1.2-2 +- patch0 for filemerge bug should not be needed + +* Wed Mar 4 2009 Neal Becker - 1.2-1 +- Update to 1.2 + * Tue Feb 24 2009 Neal Becker - 1.1.2-7 - Use noreplace option on config Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mercurial/F-10/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 1 Jan 2009 18:06:28 -0000 1.25 +++ sources 5 Mar 2009 02:05:57 -0000 1.26 @@ -1 +1 @@ -4fd3b9a2e5dcd025840c3849b136bec8 mercurial-1.1.2.tar.gz +ac9d16b078f99f7a89d6865421570f05 mercurial-1.2.tar.gz From whot at fedoraproject.org Thu Mar 5 02:18:19 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Thu, 5 Mar 2009 02:18:19 +0000 (UTC) Subject: rpms/xorg-x11-drv-synaptics/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 xorg-x11-drv-synaptics.spec, 1.24, 1.25 Message-ID: <20090305021819.2AC1E70116@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20848 Modified Files: .cvsignore sources xorg-x11-drv-synaptics.spec Log Message: * Thu Mar 05 2009 Peter Hutterer 1.0.99.4-1 - synaptics 1.1, snapshot 4 (fix for 64 bit crashes) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 4 Mar 2009 06:59:47 -0000 1.11 +++ .cvsignore 5 Mar 2009 02:17:48 -0000 1.12 @@ -1 +1 @@ -xf86-input-synaptics-1.0.99.3.tar.bz2 +xf86-input-synaptics-1.0.99.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 4 Mar 2009 06:59:48 -0000 1.11 +++ sources 5 Mar 2009 02:17:48 -0000 1.12 @@ -1 +1 @@ -f871992caa9fb32e2992bdaadd27041c xf86-input-synaptics-1.0.99.3.tar.bz2 +5fd30e63296d7845274525571508fbc9 xf86-input-synaptics-1.0.99.4.tar.bz2 Index: xorg-x11-drv-synaptics.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xorg-x11-drv-synaptics.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- xorg-x11-drv-synaptics.spec 4 Mar 2009 06:59:48 -0000 1.24 +++ xorg-x11-drv-synaptics.spec 5 Mar 2009 02:17:48 -0000 1.25 @@ -6,7 +6,7 @@ Name: xorg-x11-drv-synaptics Summary: Xorg X11 Synaptics touchpad input driver -Version: 1.0.99.3 +Version: 1.0.99.4 Release: 1%{?dist} URL: http://www.x.org License: MIT @@ -121,6 +121,9 @@ %changelog +* Thu Mar 05 2009 Peter Hutterer 1.0.99.4-1 +- synaptics 1.1, snapshot 4 (fix for 64 bit crashes) + * Wed Mar 04 2009 Peter Hutterer 1.0.99.3-1 - synaptics 1.1, snapshot 3 From rdieter at fedoraproject.org Thu Mar 5 02:39:47 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 02:39:47 +0000 (UTC) Subject: rpms/kdegraphics/devel .cvsignore,1.57,1.58 Message-ID: <20090305023947.B104270116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegraphics/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23836 Modified Files: .cvsignore Log Message: cleanup Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/devel/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- .cvsignore 1 Mar 2009 21:06:58 -0000 1.57 +++ .cvsignore 5 Mar 2009 02:39:17 -0000 1.58 @@ -1,7 +1 @@ -kdegraphics-4.1.2.tar.bz2 -kdegraphics-4.1.80.tar.bz2 -kdegraphics-4.1.85.tar.bz2 -kdegraphics-4.1.96.tar.bz2 -kdegraphics-4.2.0.tar.bz2 -kdelibs-4.2.1.tar.bz2 kdegraphics-4.2.1.tar.bz2 From rdieter at fedoraproject.org Thu Mar 5 02:48:03 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 02:48:03 +0000 (UTC) Subject: rpms/kdegraphics/F-9 .cvsignore,1.47,1.48 Message-ID: <20090305024803.7592F70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegraphics/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24725/F-9 Modified Files: .cvsignore Log Message: cleanup/sync w/devel Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 9 Jan 2009 00:41:29 -0000 1.47 +++ .cvsignore 5 Mar 2009 02:47:33 -0000 1.48 @@ -1 +1 @@ -kdegraphics-4.1.4.tar.bz2 +kdegraphics-4.2.1.tar.bz2 From rdieter at fedoraproject.org Thu Mar 5 02:48:03 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 02:48:03 +0000 (UTC) Subject: rpms/kdegraphics/F-10 .cvsignore,1.53,1.54 Message-ID: <20090305024803.9FD9D70117@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegraphics/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24725/F-10 Modified Files: .cvsignore Log Message: cleanup/sync w/devel Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 23 Jan 2009 22:36:34 -0000 1.53 +++ .cvsignore 5 Mar 2009 02:47:33 -0000 1.54 @@ -1,5 +1 @@ -kdegraphics-4.1.2.tar.bz2 -kdegraphics-4.1.80.tar.bz2 -kdegraphics-4.1.85.tar.bz2 -kdegraphics-4.1.96.tar.bz2 -kdegraphics-4.2.0.tar.bz2 +kdegraphics-4.2.1.tar.bz2 From tgl at fedoraproject.org Thu Mar 5 02:50:38 2009 From: tgl at fedoraproject.org (Tom Lane) Date: Thu, 5 Mar 2009 02:50:38 +0000 (UTC) Subject: rpms/mysql/devel .cvsignore, 1.35, 1.36 filter-requires-mysql.sh, 1.4, 1.5 mysql-errno.patch, 1.5, 1.6 mysql-install-test.patch, 1.7, 1.8 mysql-plugin-bug.patch, 1.3, 1.4 mysql-testing.patch, 1.12, 1.13 mysql.spec, 1.115, 1.116 sources, 1.35, 1.36 mysql-expired-certs.patch, 1.3, NONE Message-ID: <20090305025038.4CFBF70116@cvs1.fedora.phx.redhat.com> Author: tgl Update of /cvs/pkgs/rpms/mysql/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25668 Modified Files: .cvsignore filter-requires-mysql.sh mysql-errno.patch mysql-install-test.patch mysql-plugin-bug.patch mysql-testing.patch mysql.spec sources Removed Files: mysql-expired-certs.patch Log Message: Update to MySQL 5.1.32 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 13 Feb 2009 21:22:22 -0000 1.35 +++ .cvsignore 5 Mar 2009 02:50:07 -0000 1.36 @@ -1 +1 @@ -mysql-5.1.31.tar.gz +mysql-5.1.32.tar.gz Index: filter-requires-mysql.sh =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/filter-requires-mysql.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- filter-requires-mysql.sh 3 May 2006 03:36:47 -0000 1.4 +++ filter-requires-mysql.sh 5 Mar 2009 02:50:07 -0000 1.5 @@ -1,3 +1,3 @@ #!/bin/sh -/usr/lib/rpm/perl.req $* | grep -v -e "perl(th" -e "perl(lib::mtr" +/usr/lib/rpm/perl.req $* | grep -v -e "perl(th" -e "perl(lib::mtr" -e "perl(mtr" mysql-errno.patch: Index: mysql-errno.patch =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-errno.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mysql-errno.patch 14 Jan 2009 17:10:05 -0000 1.5 +++ mysql-errno.patch 5 Mar 2009 02:50:07 -0000 1.6 @@ -1,10 +1,10 @@ "extern int errno" is just a really bad idea. -diff -Naur mysql-5.1.30.orig/include/my_sys.h mysql-5.1.30/include/my_sys.h ---- mysql-5.1.30.orig/include/my_sys.h 2008-11-14 11:34:35.000000000 -0500 -+++ mysql-5.1.30/include/my_sys.h 2009-01-13 11:04:15.000000000 -0500 -@@ -201,13 +201,8 @@ +diff -Naur mysql-5.1.32.orig/include/my_sys.h mysql-5.1.32/include/my_sys.h +--- mysql-5.1.32.orig/include/my_sys.h 2009-02-13 19:52:19.000000000 -0500 ++++ mysql-5.1.32/include/my_sys.h 2009-03-04 18:08:40.000000000 -0500 +@@ -199,13 +199,8 @@ #define my_afree(PTR) my_free(PTR,MYF(MY_WME)) #endif /* HAVE_ALLOCA */ @@ -16,6 +16,6 @@ -#endif -#endif /* #ifndef errno */ + - extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE]; extern char *home_dir; /* Home directory for user */ extern const char *my_progname; /* program-name (printed in errors) */ + extern char NEAR curr_dir[]; /* Current directory for user */ mysql-install-test.patch: Index: mysql-install-test.patch =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-install-test.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mysql-install-test.patch 14 Jan 2009 17:10:05 -0000 1.7 +++ mysql-install-test.patch 5 Mar 2009 02:50:07 -0000 1.8 @@ -1,6 +1,6 @@ mysql's idea of a suitable place to install the regression tests is /usr/mysql-test. To relocate this to a reasonably FHS-compliant place -like /usr/share/mysql-test, we have to hack up the paths in install_test_db. +like /usr/share/mysql-test, we have to hack up the paths in mtr_cases.pm. This patch also improves the documentation a tad. @@ -37,41 +37,17 @@ You can create your own test cases. To create a test case, create a new -diff -Naur mysql-5.1.30.orig/mysql-test/install_test_db.sh mysql-5.1.30/mysql-test/install_test_db.sh ---- mysql-5.1.30.orig/mysql-test/install_test_db.sh 2008-11-14 11:34:47.000000000 -0500 -+++ mysql-5.1.30/mysql-test/install_test_db.sh 2009-01-13 11:30:00.000000000 -0500 -@@ -26,18 +26,15 @@ - libexecdir=../libexec - - # Check if it's a binary distribution or a 'make install' -- if test -x ../libexec/mysqld -+ if test -x /usr/libexec/mysqld - then -- execdir=../libexec -- elif test -x ../../sbin/mysqld # RPM installation -- then -- execdir=../../sbin -- bindir=../../bin -- scriptdir=../bin -- libexecdir=../../libexec -+ execdir=/usr/libexec - else -- execdir=../bin -+ execdir=/usr/bin - fi -+ bindir=/usr/bin -+ scriptdir=/usr/bin -+ libexecdir=/usr/libexec - fix_bin=mysql-test - else - execdir=../sql -@@ -96,7 +93,8 @@ - - #for error messages - if [ x$BINARY_DIST = x1 ] ; then --basedir=.. -+basedir=/usr/share -+EXTRA_ARG="--language=/usr/share/mysql/english/ --character-sets-dir=/usr/share/mysql/charsets/" - else - basedir=. - EXTRA_ARG="--windows" +diff -Naur mysql-5.1.32.orig/mysql-test/lib/mtr_cases.pm mysql-5.1.32/mysql-test/lib/mtr_cases.pm +--- mysql-5.1.32.orig/mysql-test/lib/mtr_cases.pm 2009-02-13 19:52:34.000000000 -0500 ++++ mysql-5.1.32/mysql-test/lib/mtr_cases.pm 2009-03-04 20:34:23.000000000 -0500 +@@ -228,7 +228,9 @@ + else + { + $suitedir= my_find_dir($::basedir, +- ["mysql-test/suite", ++ ["share/mysql-test/suite", ++ "share/mysql-test", ++ "mysql-test/suite", + "mysql-test", + # Look in storage engine specific suite dirs + "storage/*/mysql-test-suites" mysql-plugin-bug.patch: Index: mysql-plugin-bug.patch =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-plugin-bug.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mysql-plugin-bug.patch 13 Feb 2009 21:22:22 -0000 1.3 +++ mysql-plugin-bug.patch 5 Mar 2009 02:50:07 -0000 1.4 @@ -7,12 +7,12 @@ For the moment, just disable this test. -diff -Naur mysql-5.1.31.orig/mysql-test/t/disabled.def mysql-5.1.31/mysql-test/t/disabled.def ---- mysql-5.1.31.orig/mysql-test/t/disabled.def 2009-01-19 12:11:19.000000000 -0500 -+++ mysql-5.1.31/mysql-test/t/disabled.def 2009-02-13 14:23:55.000000000 -0500 -@@ -14,3 +14,5 @@ - wait_timeout_func : Bug #41225 joro wait_timeout_func fails +diff -Naur mysql-5.1.32.orig/mysql-test/t/disabled.def mysql-5.1.32/mysql-test/t/disabled.def +--- mysql-5.1.32.orig/mysql-test/t/disabled.def 2009-02-13 20:34:40.000000000 -0500 ++++ mysql-5.1.32/mysql-test/t/disabled.def 2009-03-04 18:48:34.000000000 -0500 +@@ -12,3 +12,5 @@ kill : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild. query_cache_28249 : Bug#41098 Query Cache returns wrong result with concurrent insert + innodb_bug39438 : BUG#42383 2009-01-28 lsoares "This fails in embedded and on windows. Note that this test is not run on windows and on embedded in PB for main trees currently" +# +plugin_load : gives wrong answer on PPC64 mysql-testing.patch: Index: mysql-testing.patch =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-testing.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mysql-testing.patch 14 Jan 2009 17:10:05 -0000 1.12 +++ mysql-testing.patch 5 Mar 2009 02:50:07 -0000 1.13 @@ -1,14 +1,10 @@ Hack the top-level Makefile to enable the openssl regression tests. (Why doesn't this happen automatically given the configure option??) -Also, tweak the Perl test script so that the mysqld daemon gets detached -from the calling terminal session. Without this, the ssl_des test hangs up -because OpenSSL tries to read a PEM key from /dev/tty. - -diff -Naur mysql-5.1.30.orig/Makefile.am mysql-5.1.30/Makefile.am ---- mysql-5.1.30.orig/Makefile.am 2008-11-14 11:34:15.000000000 -0500 -+++ mysql-5.1.30/Makefile.am 2009-01-13 11:13:12.000000000 -0500 +diff -Naur mysql-5.1.32.orig/Makefile.am mysql-5.1.32/Makefile.am +--- mysql-5.1.32.orig/Makefile.am 2009-02-13 19:51:56.000000000 -0500 ++++ mysql-5.1.32/Makefile.am 2009-03-04 18:12:36.000000000 -0500 @@ -98,7 +98,7 @@ test-ns: @@ -18,28 +14,3 @@ test-binlog-statement: cd mysql-test ; \ -diff -Naur mysql-5.1.30.orig/mysql-test/lib/mtr_process.pl mysql-5.1.30/mysql-test/lib/mtr_process.pl ---- mysql-5.1.30.orig/mysql-test/lib/mtr_process.pl 2008-11-14 12:31:10.000000000 -0500 -+++ mysql-5.1.30/mysql-test/lib/mtr_process.pl 2009-01-13 11:14:25.000000000 -0500 -@@ -150,6 +150,9 @@ - { - # Child, redirect output and exec - -+ # Needed to become detached from terminal session -+ POSIX::setsid(); -+ - $SIG{INT}= 'DEFAULT'; # Parent do some stuff, we don't - - my $log_file_open_mode = '>'; -diff -Naur mysql-5.1.30.orig/mysql-test/mysql-test-run.pl mysql-5.1.30/mysql-test/mysql-test-run.pl ---- mysql-5.1.30.orig/mysql-test/mysql-test-run.pl 2008-11-14 11:34:48.000000000 -0500 -+++ mysql-5.1.30/mysql-test/mysql-test-run.pl 2009-01-13 11:17:52.000000000 -0500 -@@ -4204,7 +4204,7 @@ - - if ( defined $exe ) - { -- $pid= mtr_spawn($exe, $args, "", -+ $pid= mtr_spawn($exe, $args, '/dev/null', - $mysqld->{'path_myerr'}, - $mysqld->{'path_myerr'}, - "", Index: mysql.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- mysql.spec 26 Feb 2009 03:36:50 -0000 1.115 +++ mysql.spec 5 Mar 2009 02:50:07 -0000 1.116 @@ -1,6 +1,6 @@ Name: mysql -Version: 5.1.31 -Release: 2%{?dist} +Version: 5.1.32 +Release: 1%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases URL: http://www.mysql.com @@ -29,8 +29,7 @@ Patch4: mysql-testing.patch Patch5: mysql-install-test.patch Patch6: mysql-stack-guard.patch -Patch7: mysql-expired-certs.patch -Patch8: mysql-plugin-bug.patch +Patch7: mysql-plugin-bug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gperf, perl, readline-devel, openssl-devel @@ -171,7 +170,6 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 libtoolize --force aclocal @@ -287,6 +285,8 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir* mv $RPM_BUILD_ROOT/usr/sql-bench $RPM_BUILD_ROOT%{_datadir}/sql-bench mv $RPM_BUILD_ROOT/usr/mysql-test $RPM_BUILD_ROOT%{_datadir}/mysql-test +# 5.1.32 forgets to install the mysql-test README file +install -m 0644 mysql-test/README $RPM_BUILD_ROOT%{_datadir}/mysql-test/README mv ${RPM_BUILD_ROOT}%{_bindir}/mysqlbug ${RPM_BUILD_ROOT}%{_libdir}/mysql/mysqlbug install -m 0755 scriptstub ${RPM_BUILD_ROOT}%{_bindir}/mysqlbug @@ -635,6 +635,9 @@ %{_mandir}/man1/mysql_client_test.1* %changelog +* Wed Mar 4 2009 Tom Lane 5.1.32-1 +- Update to MySQL 5.1.32. + * Wed Feb 25 2009 Fedora Release Engineering - 5.1.31-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 13 Feb 2009 21:22:22 -0000 1.35 +++ sources 5 Mar 2009 02:50:07 -0000 1.36 @@ -1 +1 @@ -a077387e04ea24e67a93cff5f05bc3ba mysql-5.1.31.tar.gz +f2d14b5e3b9d50b809c9b9985e4513b7 mysql-5.1.32.tar.gz --- mysql-expired-certs.patch DELETED --- From rdieter at fedoraproject.org Thu Mar 5 02:51:44 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 02:51:44 +0000 (UTC) Subject: rpms/kdemultimedia/F-9 .cvsignore,1.51,1.52 Message-ID: <20090305025144.8EF7A70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdemultimedia/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26009/F-9 Modified Files: .cvsignore Log Message: cleanup Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdemultimedia/F-9/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 9 Jan 2009 01:03:28 -0000 1.51 +++ .cvsignore 5 Mar 2009 02:51:14 -0000 1.52 @@ -1 +1 @@ -kdemultimedia-4.1.4.tar.bz2 +kdemultimedia-4.2.1.tar.bz2 From rdieter at fedoraproject.org Thu Mar 5 02:51:44 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 02:51:44 +0000 (UTC) Subject: rpms/kdemultimedia/F-10 .cvsignore,1.57,1.58 Message-ID: <20090305025144.C28F570116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdemultimedia/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26009/F-10 Modified Files: .cvsignore Log Message: cleanup Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- .cvsignore 24 Jan 2009 14:46:53 -0000 1.57 +++ .cvsignore 5 Mar 2009 02:51:14 -0000 1.58 @@ -1,5 +1 @@ -kdemultimedia-4.1.2.tar.bz2 -kdemultimedia-4.1.80.tar.bz2 -kdemultimedia-4.1.85.tar.bz2 -kdemultimedia-4.1.96.tar.bz2 -kdemultimedia-4.2.0.tar.bz2 +kdemultimedia-4.2.1.tar.bz2 From rdieter at fedoraproject.org Thu Mar 5 02:55:17 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 02:55:17 +0000 (UTC) Subject: rpms/kdepimlibs/F-10 kdepimlibs.spec,1.61,1.62 Message-ID: <20090305025517.9397A70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepimlibs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26781 Modified Files: kdepimlibs.spec Log Message: * Tue Mar 03 2009 Rex Dieter - 4.2.1-2 - avoid libkcal conflict with kdepim3 Index: kdepimlibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/kdepimlibs.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- kdepimlibs.spec 27 Feb 2009 18:08:09 -0000 1.61 +++ kdepimlibs.spec 5 Mar 2009 02:54:47 -0000 1.62 @@ -17,7 +17,7 @@ Name: kdepimlibs Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: K Desktop Environment 4 - PIM Libraries License: LGPLv2 @@ -139,9 +139,14 @@ rm -f "$i" ln -sf "../../$linktarget" "kde4/devel/$i" ;; +# conflicts with kdepim3 (compat) + libkcal.so) + rm -f "$i" + ln -sf "../../$linktarget" "kde4/devel/$i" + ;; %if 0%{?fedora} < 10 -# conflicts with kdepim3 - libgpgme++.so | libkcal.so | libkmime.so | libkpimidentities.so | libktnef.so | libqgpgme.so) +# conflicts with kdepim(3) + libgpgme++.so | libkmime.so | libkpimidentities.so | libktnef.so | libqgpgme.so) linktarget=`readlink "$i"` rm -f "$i" ln -sf "../../$linktarget" "kde4/devel/$i" @@ -215,7 +220,10 @@ %changelog -* Fri Feb 27 2009 Luk???? Tinkl - 4.2.1-1 +* Tue Mar 03 2009 Rex Dieter - 4.2.1-2 +- avoid libkcal conflict with kdepim3 + +* Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 * Wed Feb 25 2009 Fedora Release Engineering - 4.2.0-5 From rdieter at fedoraproject.org Thu Mar 5 02:56:38 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 02:56:38 +0000 (UTC) Subject: rpms/kdepimlibs/F-10 kdepimlibs.spec,1.62,1.63 Message-ID: <20090305025638.C591970116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepimlibs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26992 Modified Files: kdepimlibs.spec Log Message: workaround botched tag Index: kdepimlibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/kdepimlibs.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- kdepimlibs.spec 5 Mar 2009 02:54:47 -0000 1.62 +++ kdepimlibs.spec 5 Mar 2009 02:56:08 -0000 1.63 @@ -17,7 +17,7 @@ Name: kdepimlibs Version: 4.2.1 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: K Desktop Environment 4 - PIM Libraries License: LGPLv2 From rstrode at fedoraproject.org Thu Mar 5 03:02:22 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Thu, 5 Mar 2009 03:02:22 +0000 (UTC) Subject: rpms/gdm/devel gdm-2.25.2-multistack-but-boring.patch, 1.2, 1.3 gdm.spec, 1.443, 1.444 Message-ID: <20090305030222.2E95B70116@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gdm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28042 Modified Files: gdm-2.25.2-multistack-but-boring.patch gdm.spec Log Message: - Add some fixes for autologin gdm-2.25.2-multistack-but-boring.patch: Index: gdm-2.25.2-multistack-but-boring.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.25.2-multistack-but-boring.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdm-2.25.2-multistack-but-boring.patch 3 Mar 2009 23:05:34 -0000 1.2 +++ gdm-2.25.2-multistack-but-boring.patch 5 Mar 2009 03:02:21 -0000 1.3 @@ -1,14 +1,14 @@ diff -up gdm-2.25.2/common/gdm-marshal.list.multistack-but-boring gdm-2.25.2/common/gdm-marshal.list --- gdm-2.25.2/common/gdm-marshal.list.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/common/gdm-marshal.list 2009-03-03 17:45:05.814016242 -0500 ++++ gdm-2.25.2/common/gdm-marshal.list 2009-03-04 21:03:53.097681845 -0500 @@ -5,3 +5,4 @@ VOID:STRING,STRING VOID:UINT,UINT VOID:STRING,INT VOID:DOUBLE +BOOLEAN:STRING diff -up gdm-2.25.2/configure.ac.multistack-but-boring gdm-2.25.2/configure.ac ---- gdm-2.25.2/configure.ac.multistack-but-boring 2009-03-03 17:45:05.512009633 -0500 -+++ gdm-2.25.2/configure.ac 2009-03-03 17:45:05.748016423 -0500 +--- gdm-2.25.2/configure.ac.multistack-but-boring 2009-03-04 21:03:53.075443680 -0500 ++++ gdm-2.25.2/configure.ac 2009-03-04 21:03:53.099711915 -0500 @@ -18,6 +18,22 @@ AC_PROG_CXX AM_PROG_CC_C_O AC_PROG_LIBTOOL() @@ -107,7 +107,7 @@ utils/Makefile diff -up gdm-2.25.2/daemon/gdm-factory-slave.c.multistack-but-boring gdm-2.25.2/daemon/gdm-factory-slave.c --- gdm-2.25.2/daemon/gdm-factory-slave.c.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/daemon/gdm-factory-slave.c 2009-03-03 17:45:05.618017661 -0500 ++++ gdm-2.25.2/daemon/gdm-factory-slave.c 2009-03-04 21:03:53.101710418 -0500 @@ -144,63 +144,71 @@ on_greeter_session_died (GdmGreeterSessi static void @@ -343,7 +343,7 @@ "setup-complete", diff -up gdm-2.25.2/daemon/gdm-greeter-server.c.multistack-but-boring gdm-2.25.2/daemon/gdm-greeter-server.c --- gdm-2.25.2/daemon/gdm-greeter-server.c.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/daemon/gdm-greeter-server.c 2009-03-03 17:45:05.783016614 -0500 ++++ gdm-2.25.2/daemon/gdm-greeter-server.c 2009-03-04 21:03:53.104432962 -0500 @@ -43,6 +43,7 @@ #include #include @@ -793,7 +793,7 @@ static void diff -up gdm-2.25.2/daemon/gdm-greeter-server.h.multistack-but-boring gdm-2.25.2/daemon/gdm-greeter-server.h --- gdm-2.25.2/daemon/gdm-greeter-server.h.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/daemon/gdm-greeter-server.h 2009-03-03 17:45:05.699016255 -0500 ++++ gdm-2.25.2/daemon/gdm-greeter-server.h 2009-03-04 21:03:53.105432039 -0500 @@ -45,11 +45,16 @@ typedef struct { GObjectClass parent_class; @@ -861,7 +861,7 @@ diff -up gdm-2.25.2/daemon/gdm-product-slave.c.multistack-but-boring gdm-2.25.2/daemon/gdm-product-slave.c --- gdm-2.25.2/daemon/gdm-product-slave.c.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/daemon/gdm-product-slave.c 2009-03-03 17:45:05.585016670 -0500 ++++ gdm-2.25.2/daemon/gdm-product-slave.c 2009-03-04 21:03:53.107432008 -0500 @@ -79,6 +79,8 @@ struct GdmProductSlavePrivate DBusGProxy *product_display_proxy; @@ -1321,7 +1321,7 @@ } else { diff -up gdm-2.25.2/daemon/gdm-session.c.multistack-but-boring gdm-2.25.2/daemon/gdm-session.c --- gdm-2.25.2/daemon/gdm-session.c.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/daemon/gdm-session.c 2009-03-03 17:45:05.704022039 -0500 ++++ gdm-2.25.2/daemon/gdm-session.c 2009-03-04 21:03:53.110432729 -0500 @@ -24,11 +24,13 @@ #include #include @@ -1820,8 +1820,8 @@ void diff -up gdm-2.25.2/daemon/gdm-session-direct.c.multistack-but-boring gdm-2.25.2/daemon/gdm-session-direct.c ---- gdm-2.25.2/daemon/gdm-session-direct.c.multistack-but-boring 2009-03-03 17:45:05.519009518 -0500 -+++ gdm-2.25.2/daemon/gdm-session-direct.c 2009-03-03 17:45:05.702016205 -0500 +--- gdm-2.25.2/daemon/gdm-session-direct.c.multistack-but-boring 2009-03-04 21:03:53.078442376 -0500 ++++ gdm-2.25.2/daemon/gdm-session-direct.c 2009-03-04 21:03:53.115432163 -0500 @@ -63,6 +63,16 @@ #define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin" #endif @@ -3472,7 +3472,7 @@ iface->authenticate = gdm_session_direct_authenticate; diff -up gdm-2.25.2/daemon/gdm-session.h.multistack-but-boring gdm-2.25.2/daemon/gdm-session.h --- gdm-2.25.2/daemon/gdm-session.h.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/daemon/gdm-session.h 2009-03-03 17:45:05.705018251 -0500 ++++ gdm-2.25.2/daemon/gdm-session.h 2009-03-04 21:03:53.116432427 -0500 @@ -45,18 +45,25 @@ struct _GdmSessionIface GTypeInterface base_iface; @@ -3607,7 +3607,7 @@ const char *session_name); diff -up gdm-2.25.2/daemon/gdm-session-private.h.multistack-but-boring gdm-2.25.2/daemon/gdm-session-private.h --- gdm-2.25.2/daemon/gdm-session-private.h.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/daemon/gdm-session-private.h 2009-03-03 17:45:05.703022544 -0500 ++++ gdm-2.25.2/daemon/gdm-session-private.h 2009-03-04 21:03:53.118432814 -0500 @@ -27,25 +27,38 @@ G_BEGIN_DECLS @@ -3671,7 +3671,7 @@ G_END_DECLS diff -up gdm-2.25.2/daemon/gdm-session-relay.c.multistack-but-boring gdm-2.25.2/daemon/gdm-session-relay.c --- gdm-2.25.2/daemon/gdm-session-relay.c.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/daemon/gdm-session-relay.c 2009-03-03 17:45:05.612016364 -0500 ++++ gdm-2.25.2/daemon/gdm-session-relay.c 2009-03-04 21:03:53.120433133 -0500 @@ -180,10 +180,11 @@ send_dbus_void_signal (GdmSessionRelay * } @@ -4151,7 +4151,7 @@ iface->authenticate = gdm_session_relay_authenticate; diff -up gdm-2.25.2/daemon/gdm-session-worker.c.multistack-but-boring gdm-2.25.2/daemon/gdm-session-worker.c --- gdm-2.25.2/daemon/gdm-session-worker.c.multistack-but-boring 2008-11-18 17:19:05.000000000 -0500 -+++ gdm-2.25.2/daemon/gdm-session-worker.c 2009-03-03 17:45:05.594019175 -0500 ++++ gdm-2.25.2/daemon/gdm-session-worker.c 2009-03-04 21:03:53.123432737 -0500 @@ -2568,6 +2568,28 @@ worker_dbus_filter_function (DBusConnect return DBUS_HANDLER_RESULT_HANDLED; } @@ -4195,7 +4195,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-worker-job.c.multistack-but-boring gdm-2.25.2/daemon/gdm-session-worker-job.c --- gdm-2.25.2/daemon/gdm-session-worker-job.c.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/daemon/gdm-session-worker-job.c 2009-03-03 17:45:05.650016435 -0500 ++++ gdm-2.25.2/daemon/gdm-session-worker-job.c 2009-03-04 21:03:53.125433055 -0500 @@ -68,7 +68,6 @@ enum { enum { @@ -4361,7 +4361,7 @@ G_OBJECT_CLASS_TYPE (object_class), diff -up gdm-2.25.2/daemon/gdm-session-worker-job.h.multistack-but-boring gdm-2.25.2/daemon/gdm-session-worker-job.h --- gdm-2.25.2/daemon/gdm-session-worker-job.h.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/daemon/gdm-session-worker-job.h 2009-03-03 17:45:05.651016418 -0500 ++++ gdm-2.25.2/daemon/gdm-session-worker-job.h 2009-03-04 21:03:53.126432201 -0500 @@ -46,7 +46,6 @@ typedef struct GObjectClass parent_class; @@ -4385,8 +4385,8 @@ #endif /* __GDM_SESSION_WORKER_JOB_H */ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/daemon/gdm-simple-slave.c ---- gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring 2009-03-03 17:45:05.485038503 -0500 -+++ gdm-2.25.2/daemon/gdm-simple-slave.c 2009-03-03 17:45:05.707017170 -0500 +--- gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring 2009-03-04 21:03:53.057442982 -0500 ++++ gdm-2.25.2/daemon/gdm-simple-slave.c 2009-03-04 21:31:35.494441901 -0500 @@ -68,6 +68,8 @@ struct GdmSimpleSlavePrivate guint greeter_reset_id; guint start_session_id; @@ -4886,9 +4886,21 @@ "begin-auto-login", G_CALLBACK (on_greeter_begin_auto_login), slave); +@@ -1017,6 +1126,11 @@ idle_connect_to_display (GdmSimpleSlave + if (! enabled || delay > 0) { + start_greeter (slave); + create_new_session (slave); ++ ++ if (enabled) { ++ gdm_session_start_conversation (GDM_SESSION (slave->priv->session), ++ "gdm-autologin"); ++ } + } else { + reset_session (slave); + } diff -up gdm-2.25.2/daemon/test-session.c.multistack-but-boring gdm-2.25.2/daemon/test-session.c --- gdm-2.25.2/daemon/test-session.c.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/daemon/test-session.c 2009-03-03 17:45:05.601017034 -0500 ++++ gdm-2.25.2/daemon/test-session.c 2009-03-04 21:03:53.130431720 -0500 @@ -33,20 +33,22 @@ static GMainLoop *loop; @@ -5035,7 +5047,7 @@ "setup-complete", diff -up gdm-2.25.2/gui/simple-greeter/gdm-chooser-widget.c.multistack-but-boring gdm-2.25.2/gui/simple-greeter/gdm-chooser-widget.c --- gdm-2.25.2/gui/simple-greeter/gdm-chooser-widget.c.multistack-but-boring 2008-09-08 20:53:24.000000000 -0400 -+++ gdm-2.25.2/gui/simple-greeter/gdm-chooser-widget.c 2009-03-03 17:45:05.794016293 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-chooser-widget.c 2009-03-04 21:03:53.133449134 -0500 @@ -93,6 +93,7 @@ struct GdmChooserWidgetPrivate guint32 should_hide_inactive_items : 1; guint32 emit_activated_after_resize_animation : 1; @@ -5101,7 +5113,7 @@ } diff -up gdm-2.25.2/gui/simple-greeter/gdm-chooser-widget.h.multistack-but-boring gdm-2.25.2/gui/simple-greeter/gdm-chooser-widget.h --- gdm-2.25.2/gui/simple-greeter/gdm-chooser-widget.h.multistack-but-boring 2008-09-08 20:36:20.000000000 -0400 -+++ gdm-2.25.2/gui/simple-greeter/gdm-chooser-widget.h 2009-03-03 17:45:05.760016365 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-chooser-widget.h 2009-03-04 21:03:53.134447581 -0500 @@ -136,6 +136,10 @@ int gdm_chooser_widget_get_nu void gdm_chooser_widget_activate_if_one_item (GdmChooserWidget *widget); void gdm_chooser_widget_propagate_pending_key_events (GdmChooserWidget *widget); @@ -5115,7 +5127,7 @@ G_END_DECLS diff -up gdm-2.25.2/gui/simple-greeter/gdm-greeter-client.c.multistack-but-boring gdm-2.25.2/gui/simple-greeter/gdm-greeter-client.c --- gdm-2.25.2/gui/simple-greeter/gdm-greeter-client.c.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-client.c 2009-03-03 17:45:05.709016229 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-client.c 2009-03-04 21:03:53.136447620 -0500 @@ -64,6 +64,7 @@ enum { INFO_QUERY, SECRET_INFO_QUERY, @@ -5502,7 +5514,7 @@ static void diff -up gdm-2.25.2/gui/simple-greeter/gdm-greeter-client.h.multistack-but-boring gdm-2.25.2/gui/simple-greeter/gdm-greeter-client.h --- gdm-2.25.2/gui/simple-greeter/gdm-greeter-client.h.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-client.h 2009-03-03 17:45:05.710016213 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-client.h 2009-03-04 21:03:53.137433986 -0500 @@ -45,17 +45,24 @@ typedef struct GObjectClass parent_class; @@ -5577,7 +5589,7 @@ diff -up gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.c.multistack-but-boring gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.c --- gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.c.multistack-but-boring 2008-11-18 17:19:05.000000000 -0500 -+++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.c 2009-03-03 17:45:05.816016419 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.c 2009-03-04 21:03:53.141431898 -0500 @@ -1,7 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- * @@ -6895,7 +6907,7 @@ GdkEventWindowState *event, diff -up gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.glade.multistack-but-boring gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.glade --- gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.glade.multistack-but-boring 2008-11-18 17:34:37.000000000 -0500 -+++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.glade 2009-03-03 17:45:05.661016533 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.glade 2009-03-04 21:03:53.143431937 -0500 @@ -611,30 +611,29 @@ @@ -7084,7 +7096,7 @@ diff -up gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.h.multistack-but-boring gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.h --- gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.h.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.h 2009-03-03 17:45:05.713016373 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.h 2009-03-04 21:03:53.144432201 -0500 @@ -23,6 +23,9 @@ #define __GDM_GREETER_LOGIN_WINDOW_H @@ -7168,8 +7180,8 @@ G_END_DECLS diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c 2009-03-03 17:45:05.729023372 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c 2009-03-04 21:03:53.146447953 -0500 @@ -0,0 +1,255 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -7427,8 +7439,8 @@ +} + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h 2009-03-03 17:45:05.664034851 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h 2009-03-04 21:03:53.147432504 -0500 @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -7493,7 +7505,7 @@ +#endif diff -up gdm-2.25.2/gui/simple-greeter/gdm-greeter-session.c.multistack-but-boring gdm-2.25.2/gui/simple-greeter/gdm-greeter-session.c --- gdm-2.25.2/gui/simple-greeter/gdm-greeter-session.c.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-session.c 2009-03-03 17:45:05.714016287 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-session.c 2009-03-04 21:03:53.149435615 -0500 @@ -38,6 +38,8 @@ #include "gdm-greeter-panel.h" #include "gdm-greeter-login-window.h" @@ -7757,8 +7769,8 @@ } diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c 2009-03-03 17:45:05.667016434 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c 2009-03-04 21:03:53.151447317 -0500 @@ -0,0 +1,478 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -8239,8 +8251,8 @@ + return g_hash_table_lookup (manager->priv->plugins, name); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h 2009-03-03 17:45:05.668022004 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h 2009-03-04 21:03:53.152449048 -0500 @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -8309,8 +8321,8 @@ + +#endif /* __GDM_PLUGIN_MANAGER_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.c ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.c 2009-03-03 17:45:05.799016489 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.c 2009-03-04 21:03:53.153442188 -0500 @@ -0,0 +1,329 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -8642,8 +8654,8 @@ + return g_list_length (widget->priv->tasks); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.h ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.h 2009-03-03 17:45:05.731016704 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.h 2009-03-04 21:03:53.154446921 -0500 @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -8727,7 +8739,7 @@ +#endif /* __GDM_TASK_LIST_H */ diff -up gdm-2.25.2/gui/simple-greeter/gdm-user-chooser-widget.c.multistack-but-boring gdm-2.25.2/gui/simple-greeter/gdm-user-chooser-widget.c --- gdm-2.25.2/gui/simple-greeter/gdm-user-chooser-widget.c.multistack-but-boring 2008-09-24 10:05:37.000000000 -0400 -+++ gdm-2.25.2/gui/simple-greeter/gdm-user-chooser-widget.c 2009-03-03 17:45:05.795016346 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-user-chooser-widget.c 2009-03-04 21:03:53.156448217 -0500 @@ -233,9 +233,30 @@ gdm_user_chooser_widget_set_show_user_au char * gdm_user_chooser_widget_get_chosen_user_name (GdmUserChooserWidget *widget) @@ -8788,8 +8800,8 @@ pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme, "emblem-default", diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c 2009-03-03 17:45:05.818018271 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c 2009-03-04 21:03:53.157442475 -0500 @@ -0,0 +1,186 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -8978,8 +8990,8 @@ + return was_chosen; +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h 2009-03-03 17:45:05.819016578 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h 2009-03-04 21:03:53.158446161 -0500 @@ -0,0 +1,93 @@ +/* + * Copyright (C) Red Hat, Inc. @@ -9075,8 +9087,8 @@ + +#endif /* __GDM_CONVERSATION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c 2009-03-03 17:45:05.675017070 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c 2009-03-04 21:03:53.159446844 -0500 @@ -0,0 +1,93 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -9172,8 +9184,8 @@ + g_signal_emit (extension, signals [LOAD_FAILED], 0, error); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h 2009-03-03 17:45:05.676019847 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h 2009-03-04 21:03:53.160442079 -0500 @@ -0,0 +1,55 @@ +/* + * Copyright 2009 Red Hat, Inc. * @@ -9231,8 +9243,8 @@ +G_END_DECLS +#endif /* __GDM_GREETER_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in 2009-03-03 17:45:05.679016166 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in 2009-03-04 21:03:53.161442133 -0500 @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -9246,8 +9258,8 @@ +Libs: -L${libdir} -lgdmsimplegreeter +Cflags: -I${includedir}/gdm/simple-greeter diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c 2009-03-03 17:45:05.772006668 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c 2009-03-04 21:03:53.162442257 -0500 @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -9373,8 +9385,8 @@ + 0); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h 2009-03-03 17:45:05.773013916 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h 2009-03-04 21:03:53.163442172 -0500 @@ -0,0 +1,64 @@ +/* + * Copyright (C) Red Hat, Inc. @@ -9441,8 +9453,8 @@ + +#endif /* __GDM_TASK_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am 2009-03-03 17:45:05.817016611 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am 2009-03-04 21:03:53.164444252 -0500 @@ -0,0 +1,48 @@ +NULL = + @@ -9494,7 +9506,7 @@ +MAINTAINERCLEANFILES = Makefile.in diff -up gdm-2.25.2/gui/simple-greeter/Makefile.am.multistack-but-boring gdm-2.25.2/gui/simple-greeter/Makefile.am --- gdm-2.25.2/gui/simple-greeter/Makefile.am.multistack-but-boring 2008-12-03 00:22:20.000000000 -0500 -+++ gdm-2.25.2/gui/simple-greeter/Makefile.am 2009-03-03 17:45:05.656016685 -0500 ++++ gdm-2.25.2/gui/simple-greeter/Makefile.am 2009-03-04 21:03:53.165451360 -0500 @@ -2,11 +2,14 @@ NULL = SUBDIRS = \ @@ -9571,8 +9583,8 @@ $(EXTRA_GREETER_LIBS) \ $(SIMPLE_GREETER_LIBS) \ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c 2009-03-03 17:45:05.781018672 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c 2009-03-04 21:03:53.167443367 -0500 @@ -0,0 +1,304 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -9879,8 +9891,8 @@ + gdm_fingerprint_extension_reset (GDM_CONVERSATION (extension)); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h 2009-03-03 17:45:05.691016317 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h 2009-03-04 21:03:53.168442094 -0500 @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -9939,8 +9951,8 @@ + +#endif /* GDM_FINGERPRINT_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint 2009-03-03 17:45:05.749021505 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint 2009-03-04 21:03:53.169450949 -0500 @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth required pam_fprintd.so @@ -9953,8 +9965,8 @@ +session required pam_namespace.so +session include system-auth diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am 2009-03-03 17:45:05.748016423 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am 2009-03-04 21:03:53.170444507 -0500 @@ -0,0 +1,50 @@ +NULL = + @@ -10007,8 +10019,8 @@ + *~ \ + Makefile.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui 2009-03-03 17:45:05.692016370 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui 2009-03-04 21:03:53.171445819 -0500 @@ -0,0 +1,56 @@ + + @@ -10067,8 +10079,8 @@ + + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c 2009-03-03 17:45:05.693016982 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c 2009-03-04 21:03:53.172450483 -0500 @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -10111,13 +10123,13 @@ + return GDM_GREETER_EXTENSION (extension); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am 2009-03-03 17:45:05.820018029 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am 2009-03-04 21:03:53.173442226 -0500 @@ -0,0 +1 @@ +SUBDIRS = password diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c 2009-03-03 17:45:05.775006759 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c 2009-03-04 21:03:53.174446121 -0500 @@ -0,0 +1,323 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -10443,8 +10455,8 @@ + gdm_password_extension_reset (GDM_CONVERSATION (extension)); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h 2009-03-03 17:45:05.683016309 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h 2009-03-04 21:03:53.175446036 -0500 @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -10503,8 +10515,8 @@ + +#endif /* GDM_PASSWORD_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password 2009-03-03 17:45:05.786023548 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password 2009-03-04 21:03:53.176442109 -0500 @@ -0,0 +1,13 @@ +#%PAM-1.0 +auth required pam_env.so @@ -10520,8 +10532,8 @@ +session optional pam_gnome_keyring.so auto_start +session include system-auth diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am 2009-03-03 17:45:05.821018082 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am 2009-03-04 21:03:53.177442234 -0500 @@ -0,0 +1,44 @@ +NULL = + @@ -10568,8 +10580,8 @@ + *~ \ + Makefile.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui 2009-03-03 17:45:05.684016293 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui 2009-03-04 21:03:53.178442358 -0500 @@ -0,0 +1,56 @@ + + @@ -10628,8 +10640,8 @@ + + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c 2009-03-03 17:45:05.685016276 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c 2009-03-04 21:03:53.179446254 -0500 @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -10672,8 +10684,8 @@ + return GDM_GREETER_EXTENSION (extension); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c 2009-03-03 17:45:05.745016473 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c 2009-03-04 21:03:53.181445175 -0500 @@ -0,0 +1,558 @@ +/* gdm-smartcard.c - smartcard object + * @@ -11234,8 +11246,8 @@ + return NULL; +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c 2009-03-03 17:45:05.820018029 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c 2009-03-04 21:03:53.182438804 -0500 @@ -0,0 +1,440 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -11678,8 +11690,8 @@ + gdm_smartcard_extension_reset (GDM_CONVERSATION (extension)); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h 2009-03-03 17:45:05.726016228 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h 2009-03-04 21:03:53.184436468 -0500 @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. @@ -11738,8 +11750,8 @@ + +#endif /* GDM_SMARTCARD_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h 2009-03-03 17:45:05.746016526 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h 2009-03-04 21:03:53.185432192 -0500 @@ -0,0 +1,94 @@ +/* securitycard.h - api for reading and writing data to a security card + * @@ -11836,8 +11848,8 @@ +G_END_DECLS +#endif /* GDM_SMARTCARD_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c 2009-03-03 17:45:05.741016399 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c 2009-03-04 21:03:53.188432285 -0500 @@ -0,0 +1,1394 @@ +/* gdm-smartcard-manager.c - object for monitoring smartcard insertion and + * removal events @@ -13234,8 +13246,8 @@ +} +#endif diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h 2009-03-03 17:45:05.742019456 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h 2009-03-04 21:03:53.189434924 -0500 @@ -0,0 +1,86 @@ +/* gdm-smartcard-manager.h - object for monitoring smartcard insertion and + * removal events @@ -13324,8 +13336,8 @@ +G_END_DECLS +#endif /* GDM_SMARTCARD_MANAGER_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard 2009-03-03 17:45:05.755021895 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard 2009-03-04 21:03:53.190448876 -0500 @@ -0,0 +1,11 @@ +#%PAM-1.0 +auth required pam_env.so @@ -13339,8 +13351,8 @@ +session required pam_namespace.so +session include system-auth diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c 2009-03-03 17:45:05.785021051 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c 2009-03-04 21:03:53.191446556 -0500 @@ -0,0 +1,167 @@ +#include "config.h" + @@ -13510,8 +13522,8 @@ + return 0; +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am 2009-03-03 17:45:05.754016464 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am 2009-03-04 21:03:53.192442070 -0500 @@ -0,0 +1,71 @@ +NULL = + @@ -13585,8 +13597,8 @@ + *~ \ + Makefile.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui 2009-03-03 17:45:05.727017538 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui 2009-03-04 21:03:53.193451204 -0500 @@ -0,0 +1,56 @@ + + @@ -13645,8 +13657,8 @@ + + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c ---- /dev/null 2009-03-03 12:39:28.547009636 -0500 -+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c 2009-03-03 17:45:05.728011655 -0500 +--- /dev/null 2009-03-04 12:14:59.552269004 -0500 ++++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c 2009-03-04 21:03:53.194449722 -0500 @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.443 retrieving revision 1.444 diff -u -r1.443 -r1.444 --- gdm.spec 3 Mar 2009 22:46:51 -0000 1.443 +++ gdm.spec 5 Mar 2009 03:02:21 -0000 1.444 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.25.2 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -341,6 +341,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Wed Mar 4 2009 Ray Strode - 1:2.25.2-10 +- Add some fixes for autologin + * Tue Mar 3 2009 Ray Strode - 1:2.25.2-9 - Add limited 'one-stack-only' version of multistack patch (See https://fedoraproject.org/wiki/Features/MultiplePAMStacksInGDM) From whot at fedoraproject.org Thu Mar 5 03:20:24 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Thu, 5 Mar 2009 03:20:24 +0000 (UTC) Subject: rpms/xkeyboard-config/devel xkeyboard-config-1.5-suspend-hibernate.patch, NONE, 1.1 xkeyboard-config.spec, 1.35, 1.36 Message-ID: <20090305032024.8199170116@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/xkeyboard-config/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30756 Modified Files: xkeyboard-config.spec Added Files: xkeyboard-config-1.5-suspend-hibernate.patch Log Message: * Thu Mar 05 2009 Peter Hutterer - 1.5-4 - xkeyboard-config-1.5-suspend-hibernate.patch: Map I213 to XF86Suspend, and I255 to XF86Hibernate. xkeyboard-config-1.5-suspend-hibernate.patch: --- NEW FILE xkeyboard-config-1.5-suspend-hibernate.patch --- >From 3b0326435e6f02c0d1c92b1c7f9902d81f1245aa Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 5 Mar 2009 13:01:20 +1000 Subject: [PATCH] Map I213 to XF86Suspend, and I255 to XF86Hibernate. Signed-off-by: Peter Hutterer --- symbols/inet | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/symbols/inet b/symbols/inet index ba55f43..dafb406 100644 --- a/symbols/inet +++ b/symbols/inet @@ -165,7 +165,7 @@ xkb_symbols "evdev" { key { [ XF86AudioPause ] }; key { [ XF86Launch3 ] }; key { [ XF86Launch4 ] }; - key { [ XF86Standby ] }; + key { [ XF86Suspend ] }; key { [ XF86Close ] }; key { [ XF86AudioPlay ] }; key { [ XF86Forward ] }; @@ -205,6 +205,8 @@ xkb_symbols "evdev" { // key { [ ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min // key { [ ] }; // KEY_BRIGHTNESS_ZERO -- brightness off // key { [ ] }; // KEY_DISPLAY_OFF -- turn off display +// key { [ ] }; // KEY_WIMAX + key { [ XF86Hibernate ] }; // KEY_HIBERNATE }; -- 1.6.0.6 Index: xkeyboard-config.spec =================================================================== RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- xkeyboard-config.spec 26 Feb 2009 09:45:42 -0000 1.35 +++ xkeyboard-config.spec 5 Mar 2009 03:19:54 -0000 1.36 @@ -4,7 +4,7 @@ Summary: X Keyboard Extension configuration data Name: xkeyboard-config Version: 1.5 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Group: User Interface/X URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig @@ -18,6 +18,7 @@ Patch5: xkeyboard-config-1.4-jp-tilde.patch # Taken from upstream, remove with 1.6 Patch6: xkeyboard-config-1.5-evdevkbds.patch +Patch7: xkeyboard-config-1.5-suspend-hibernate.patch BuildArch: noarch @@ -99,6 +100,10 @@ %{_datadir}/X11/xkb/rules/xorg.xml %changelog +* Thu Mar 05 2009 Peter Hutterer - 1.5-4 +- xkeyboard-config-1.5-suspend-hibernate.patch: Map I213 to XF86Suspend, and + I255 to XF86Hibernate. + * Thu Feb 26 2009 Fedora Release Engineering - 1.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jkeating at fedoraproject.org Thu Mar 5 03:36:05 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Thu, 5 Mar 2009 03:36:05 +0000 (UTC) Subject: rpms/fedora-release/devel fedora-release.spec, 1.71, 1.72 sources, 1.58, 1.59 Message-ID: <20090305033605.E4B5470116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/fedora-release/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1217 Modified Files: fedora-release.spec sources Log Message: new release for cpe and metalink fixes Index: fedora-release.spec =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release/devel/fedora-release.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- fedora-release.spec 24 Feb 2009 16:37:18 -0000 1.71 +++ fedora-release.spec 5 Mar 2009 03:35:34 -0000 1.72 @@ -4,7 +4,7 @@ Summary: Fedora release files Name: fedora-release Version: 10.91 -Release: 2 +Release: 3 License: GPLv2 Group: System Environment/Base URL: http://fedoraproject.org @@ -32,7 +32,7 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc echo "Fedora release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release -echo "cpe://o:fedora_project:fedora:%{version}" > $RPM_BUILD_ROOT/etc/system-release-cpe +echo "cpe:/o:fedoraproject:fedora:%{version}" > $RPM_BUILD_ROOT/etc/system-release-cpe cp -p $RPM_BUILD_ROOT/etc/fedora-release $RPM_BUILD_ROOT/etc/issue echo "Kernel \r on an \m (\l)" >> $RPM_BUILD_ROOT/etc/issue cp -p $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net @@ -97,9 +97,15 @@ /etc/pki/rpm-gpg/* %changelog +* Tue Mar 03 2009 Jesse Keating - 10.91-3 +- Move metalink urls to mirrorlist for helping anaconda + * Tue Feb 24 2009 Fedora Release Engineering - 10.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Wed Feb 04 2009 Jesse Keating - 10.91-1 +- Use the correct CPE name (#481287) + * Wed Jan 21 2009 Jesse Keating - 10.91-1 - Update for Fedora 11 Alpha - Use metalink urls to get mirror information Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release/devel/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- sources 21 Jan 2009 23:49:57 -0000 1.58 +++ sources 5 Mar 2009 03:35:34 -0000 1.59 @@ -1 +1 @@ -d042c02fb14dfd77da65c907eec5062a fedora-release-10.91.tar.gz +74545fcd708991f8e762d8239e223239 fedora-release-10.91.tar.gz From simo at fedoraproject.org Thu Mar 5 03:44:50 2009 From: simo at fedoraproject.org (Simo Sorce) Date: Thu, 5 Mar 2009 03:44:50 +0000 (UTC) Subject: rpms/samba4/devel samba4.spec,1.6,1.7 Message-ID: <20090305034450.B998D70116@cvs1.fedora.phx.redhat.com> Author: simo Update of /cvs/pkgs/rpms/samba4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2516 Modified Files: samba4.spec Log Message: * Wed Mar 4 2009 Simo Sorce - 4.0.0-9alpha7 - Make talloc,tdb,tevent,ldb easy to exclude using defines - Fix package for non-mock "dirty" systems by deleting additional files we are not interested in atm Index: samba4.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba4/devel/samba4.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- samba4.spec 4 Mar 2009 13:46:46 -0000 1.6 +++ samba4.spec 5 Mar 2009 03:44:20 -0000 1.7 @@ -1,4 +1,4 @@ -%define main_release 8 +%define main_release 9 %define samba4_version 4.0.0 %define talloc_version 1.2.0 @@ -25,6 +25,10 @@ %define enable_common 0 %define enable_python 0 %define enable_winbind 0 +%define enable_talloc 1 +%define enable_tdb 1 +%define enable_tevent 1 +%define enable_ldb 1 # Install libraries not needed by OpenChange. %define all_libraries 0 @@ -164,6 +168,7 @@ domains and to use Windows user and group accounts on Linux. %endif +%if %enable_talloc %package -n libtalloc Group: Development/Libraries Summary: A hierarchical allocator @@ -173,6 +178,18 @@ %description -n libtalloc A library that implements a hierarchical allocator with destructors. +%package -n libtalloc-devel +Group: Development/Libraries +Summary: Developer tools for the Talloc library +Version: %{talloc_version} +Release: %{talloc_release} +Requires: libtalloc = %{talloc_version}-%{talloc_release} + +%description -n libtalloc-devel +Header files needed to develop programs that link against the Talloc library. +%endif + +%if %enable_tdb %package -n libtdb Group: Development/Libraries Summary: A bdb like database engine @@ -192,6 +209,18 @@ %description -n tdb-tools Tools to manage TDB files +%package -n libtdb-devel +Group: Development/Libraries +Summary: Developer tools for the TDB library +Version: %{tdb_version} +Release: %{tdb_release} +Requires: libtdb = %{tdb_version}-%{tdb_release} + +%description -n libtdb-devel +Header files needed to develop programs that link against the TDB library. +%endif + +%if %enable_tevent %package -n libtevent Group: Development/Libraries Summary: An event system library @@ -203,6 +232,19 @@ A library that implements an event driven system, that uses epoll/select to fire events when file status changes, supports also timer events. +%package -n libtevent-devel +Group: Development/Libraries +Summary: Developer tools for the tevent library +Version: %{tevent_version} +Release: %{tevent_release} +Requires: libtevent = %{tevent_version}-%{tevent_release} +Requires: libtalloc-devel >= %{talloc_version} + +%description -n libtevent-devel +Header files needed to develop programs that link against the tevent library. +%endif + +%if %enable_ldb %package -n libldb Group: Development/Libraries Summary: A schema-less, ldap like, API and database @@ -226,37 +268,6 @@ %description -n ldb-tools Tools to manage LDB files -%package -n libtalloc-devel -Group: Development/Libraries -Summary: Developer tools for the Talloc library -Version: %{talloc_version} -Release: %{talloc_release} -Requires: libtalloc = %{talloc_version}-%{talloc_release} - -%description -n libtalloc-devel -Header files needed to develop programs that link against the Talloc library. - -%package -n libtdb-devel -Group: Development/Libraries -Summary: Developer tools for the TDB library -Version: %{tdb_version} -Release: %{tdb_release} -Requires: libtdb = %{tdb_version}-%{tdb_release} - -%description -n libtdb-devel -Header files needed to develop programs that link against the TDB library. - -%package -n libtevent-devel -Group: Development/Libraries -Summary: Developer tools for the tevent library -Version: %{tevent_version} -Release: %{tevent_release} -Requires: libtevent = %{tevent_version}-%{tevent_release} -Requires: libtalloc-devel >= %{talloc_version} - -%description -n libtevent-devel -Header files needed to develop programs that link against the tevent library. - %package -n libldb-devel Group: Development/Libraries Summary: Developer tools for the LDB library @@ -269,6 +280,7 @@ %description -n libldb-devel Header files needed to develop programs that link against the LDB library. +%endif %prep %setup -q -n %{tarball_name} @@ -287,10 +299,18 @@ # build would fail if it finds standalone bits already built mkdir -p standalone/lib cp -a lib/replace standalone/lib/replace +%if %enable_talloc cp -a lib/talloc standalone/lib/talloc +%endif +%if %enable_tdb cp -a lib/tdb standalone/lib/tdb +%endif +%if %enable_tevent cp -a lib/tevent standalone/lib/tevent +%endif +%if %enable_ldb cp -a source4/lib/ldb standalone/lib/ldb +%endif %build %define shared_build_dir %{_sourcedir}/standalone/sbtmp @@ -300,32 +320,40 @@ export CFLAGS="$CFLAGS -I%{shared_build_dir}/include" # talloc +%if %enable_talloc pushd standalone/lib/talloc ./autogen.sh %configure --with-shared-build-dir=%{shared_build_dir} make shared-build %{?_smp_mflags} popd +%endif # tdb +%if %enable_tdb pushd standalone/lib/tdb ./autogen.sh %configure --with-shared-build-dir=%{shared_build_dir} make shared-build %{?_smp_mflags} popd +%endif # tevent +%if %enable_tevent pushd standalone/lib/tevent ./autogen.sh %configure --with-shared-build-dir=%{shared_build_dir} make shared-build %{?_smp_mflags} popd +%endif # ldb +%if %enable_ldb pushd standalone/lib/ldb ./autogen.sh %configure --with-shared-build-dir=%{shared_build_dir} make shared-build # %{?_smp_mflags} XXX Causes build failure on F10 popd +%endif export LD_LIBRARY_PATH=$SAVE_LDLPATH export CFLAGS=$SAVE_CFLAGS @@ -428,7 +456,8 @@ rm $RPM_BUILD_ROOT%{_bindir}/setnttoken rm $RPM_BUILD_ROOT%{_bindir}/smbtorture rm $RPM_BUILD_ROOT%{_bindir}/subunitrun -rm $RPM_BUILD_ROOT%{_bindir}/tdbtorture +#depending on the environemnt this file might or might not be generated +rm -f $RPM_BUILD_ROOT%{_bindir}/tdbtorture # Avoids a file conflict with perl-Parse-Yapp. rm -rf $RPM_BUILD_ROOT%{perl_vendorlib}/Parse/Yapp @@ -446,15 +475,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/cifsdd %endif %if ! %enable_common -rm $RPM_BUILD_ROOT%{_bindir}/ad2oLschema rm $RPM_BUILD_ROOT%{_bindir}/net -rm $RPM_BUILD_ROOT%{_bindir}/ldbadd -rm $RPM_BUILD_ROOT%{_bindir}/ldbdel -rm $RPM_BUILD_ROOT%{_bindir}/ldbedit -rm $RPM_BUILD_ROOT%{_bindir}/ldbmodify -rm $RPM_BUILD_ROOT%{_bindir}/ldbrename -rm $RPM_BUILD_ROOT%{_bindir}/ldbsearch -rm $RPM_BUILD_ROOT%{_bindir}/oLschema2ldif rm $RPM_BUILD_ROOT%{_bindir}/regdiff rm $RPM_BUILD_ROOT%{_bindir}/regpatch rm $RPM_BUILD_ROOT%{_bindir}/regshell @@ -470,7 +491,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/libregistry.so.* rm $RPM_BUILD_ROOT%{_libdir}/libtorture.so rm $RPM_BUILD_ROOT%{_libdir}/libtorture.so.* -rm $RPM_BUILD_ROOT%{_libdir}/libldb.so.* rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/dcerpc_atsvc.pc rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gensec.pc rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/registry.pc @@ -479,31 +499,54 @@ rm $RPM_BUILD_ROOT%{_includedir}/samba-4.0/registry.h %endif +# the samba4 build process rebuilds libraries internally, +# but we want to use the standalone build for now. +rm $RPM_BUILD_ROOT%{_libdir}/libldb.so* +rm $RPM_BUILD_ROOT%{_bindir}/ad2oLschema +rm $RPM_BUILD_ROOT%{_bindir}/ldbadd +rm $RPM_BUILD_ROOT%{_bindir}/ldbdel +rm $RPM_BUILD_ROOT%{_bindir}/ldbedit +rm $RPM_BUILD_ROOT%{_bindir}/ldbmodify +rm $RPM_BUILD_ROOT%{_bindir}/ldbrename +rm $RPM_BUILD_ROOT%{_bindir}/ldbsearch +rm $RPM_BUILD_ROOT%{_bindir}/oLschema2ldif +rm -f $RPM_BUILD_ROOT%{_bindir}/tdbbackup +rm -f $RPM_BUILD_ROOT%{_bindir}/tdbdump +rm -f $RPM_BUILD_ROOT%{_bindir}/tdbtool + + # talloc +%if %enable_talloc pushd standalone/lib/talloc make install DESTDIR=$RPM_BUILD_ROOT ln -s libtalloc.so.%{talloc_version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so -#rm -f $RPM_BUILD_ROOT/usr/share/swig/*/talloc.i || : popd +%endif # tdb +%if %enable_tdb pushd standalone/lib/tdb make install DESTDIR=$RPM_BUILD_ROOT ln -s libtdb.so.%{tdb_version} $RPM_BUILD_ROOT%{_libdir}/libtdb.so popd +%endif # tevent +%if %enable_tevent pushd standalone/lib/tevent make install DESTDIR=$RPM_BUILD_ROOT ln -s libtevent.so.%{tevent_version} $RPM_BUILD_ROOT%{_libdir}/libtevent.so popd +%endif # ldb +%if %enable_ldb pushd standalone/lib/ldb make install DESTDIR=$RPM_BUILD_ROOT ln -s -f libldb.so.%{ldb_version} $RPM_BUILD_ROOT%{_libdir}/libldb.so mkdir $RPM_BUILD_ROOT%{_libdir}/ldb popd +%endif rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a @@ -512,6 +555,12 @@ rm -r $RPM_BUILD_ROOT%{python_libdir}/lib %endif +# These may be created in non mock systems, but we do not want to package them +# for now +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/ad2oLschema.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/oLschema2ldif.1 +rm -f $RPM_BUILD_ROOT/usr/share/swig/*/talloc.i + # This makes the right links, as rpmlint requires that # the ldconfig-created links be recorded in the RPM. /sbin/ldconfig -N -n $RPM_BUILD_ROOT%{_libdir} @@ -554,29 +603,37 @@ %postun libs -p /sbin/ldconfig +%if %enable_talloc %post -n libtalloc /sbin/ldconfig %postun -n libtalloc /sbin/ldconfig +%endif +%if %enable_tdb %post -n libtdb /sbin/ldconfig %postun -n libtdb /sbin/ldconfig +%endif +%if %enable_tevent %post -n libtevent /sbin/ldconfig %postun -n libtevent /sbin/ldconfig +%endif +%if %enable_ldb %post -n libldb /sbin/ldconfig %postun -n libldb /sbin/ldconfig +%endif %files @@ -586,9 +643,6 @@ %{_sbindir}/samba %{_bindir}/mymachinepw %{_bindir}/smbstatus -%{_bindir}/tdbbackup -%{_bindir}/tdbdump -%{_bindir}/tdbtool %{_datadir}/samba/setup %dir /var/lib/%{name}/sysvol %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} @@ -696,23 +750,23 @@ #%config(noreplace) %{_sysconfdir}/%{name}/smb.conf %endif +%if %enable_talloc %files -n libtalloc %defattr(-,root,root,-) %{_libdir}/libtalloc.so.* -%files -n libtdb -%defattr(-,root,root,-) -%{_libdir}/libtdb.so.* - -%files -n libtevent +%files -n libtalloc-devel %defattr(-,root,root,-) -%{_libdir}/libtevent.so.* +%{_includedir}/talloc.h +%{_libdir}/libtalloc.so +%{_libdir}/pkgconfig/talloc.pc +%{_mandir}/man3/talloc.3.gz +%endif -%files -n libldb +%if %enable_tdb +%files -n libtdb %defattr(-,root,root,-) -%{_libdir}/libldb.so.* -%dir %{_libdir}/ldb -#%{_libdir}/ldb/* +%{_libdir}/libtdb.so.* %files -n tdb-tools %defattr(-,root,root,-) @@ -724,6 +778,32 @@ #%{_mandir}/man8/tdbdump.8* #%{_mandir}/man8/tdbtool.8* +%files -n libtdb-devel +%defattr(-,root,root,-) +%{_includedir}/tdb.h +%{_libdir}/libtdb.so +%{_libdir}/pkgconfig/tdb.pc +%endif + +%if %enable_tevent +%files -n libtevent +%defattr(-,root,root,-) +%{_libdir}/libtevent.so.* + +%files -n libtevent-devel +%defattr(-,root,root,-) +%{_includedir}/tevent.h +%{_libdir}/libtevent.so +%{_libdir}/pkgconfig/tevent.pc +%endif + +%if %enable_ldb +%files -n libldb +%defattr(-,root,root,-) +%{_libdir}/libldb.so.* +%dir %{_libdir}/ldb +#%{_libdir}/ldb/* + %files -n ldb-tools %defattr(-,root,root,-) %{_bindir}/ldbadd @@ -742,25 +822,6 @@ #%{_mandir}/man1/ad2oLschema.1.gz #%{_mandir}/man1/oLschema2ldif.1.gz -%files -n libtalloc-devel -%defattr(-,root,root,-) -%{_includedir}/talloc.h -%{_libdir}/libtalloc.so -%{_libdir}/pkgconfig/talloc.pc -%{_mandir}/man3/talloc.3.gz - -%files -n libtdb-devel -%defattr(-,root,root,-) -%{_includedir}/tdb.h -%{_libdir}/libtdb.so -%{_libdir}/pkgconfig/tdb.pc - -%files -n libtevent-devel -%defattr(-,root,root,-) -%{_includedir}/tevent.h -%{_libdir}/libtevent.so -%{_libdir}/pkgconfig/tevent.pc - %files -n libldb-devel %defattr(-,root,root,-) %{_includedir}/ldb_module.h @@ -770,8 +831,14 @@ %{_libdir}/libldb.so %{_libdir}/pkgconfig/ldb.pc %{_mandir}/man3/ldb.3.gz +%endif %changelog +* Wed Mar 4 2009 Simo Sorce - 4.0.0-9alpha7 +- Make talloc,tdb,tevent,ldb easy to exclude using defines +- Fix package for non-mock "dirty" systems by deleting additional + files we are not interested in atm + * Wed Mar 4 2009 Simo Sorce - 4.0.0-8alpha7 - Fix typo in Requires From pkgdb at fedoraproject.org Thu Mar 5 03:46:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 03:46:34 +0000 Subject: [pkgdb] anaconda: dlehman has requested commit Message-ID: <20090305034716.4BA8120820B@bastion.fedora.phx.redhat.com> dlehman has requested the commit acl on anaconda (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 03:47:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 03:47:04 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305034746.0F90620820B@bastion.fedora.phx.redhat.com> dcantrel has set the commit acl on anaconda (Fedora devel) to Approved for dlehman To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 03:48:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 03:48:23 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305034845.152F62082B2@bastion.fedora.phx.redhat.com> dcantrel has set the watchbugzilla acl on anaconda (Fedora devel) to Denied for nearthelake To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 03:48:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 03:48:47 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305034847.5473E208548@bastion.fedora.phx.redhat.com> dcantrel has set the watchcommits acl on anaconda (Fedora devel) to Denied for nearthelake To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 03:48:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 03:48:46 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305034907.5DF06208544@bastion.fedora.phx.redhat.com> dcantrel has set the watchcommits acl on anaconda (Fedora 9) to Approved for rmaximo To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 03:49:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 03:49:21 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305034921.E6E08208547@bastion.fedora.phx.redhat.com> dcantrel has set the watchbugzilla acl on anaconda (Fedora 8) to Approved for kanarip To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 03:48:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 03:48:41 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305034922.E90EA208551@bastion.fedora.phx.redhat.com> dcantrel has set the watchcommits acl on anaconda (Fedora 8) to Approved for kanarip To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 03:49:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 03:49:07 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305034928.84763208602@bastion.fedora.phx.redhat.com> dcantrel has set the watchcommits acl on anaconda (Fedora 9) to Approved for kanarip To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 03:49:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 03:49:44 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305034943.05E642082B2@bastion.fedora.phx.redhat.com> dcantrel has set the watchcommits acl on anaconda (Fedora 10) to Approved for nearthelake To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 03:49:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 03:49:48 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305034948.6D50E208550@bastion.fedora.phx.redhat.com> dcantrel has set the watchbugzilla acl on anaconda (Fedora 10) to Denied for nearthelake To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 03:49:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 03:49:08 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305034949.636172086F3@bastion.fedora.phx.redhat.com> dcantrel has set the watchcommits acl on anaconda (Fedora 10) to Denied for nearthelake To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 03:50:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 03:50:28 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305035029.104F2208549@bastion.fedora.phx.redhat.com> dcantrel has set the watchbugzilla acl on anaconda (Fedora 9) to Approved for kanarip To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 03:49:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 03:49:52 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305035033.A1CCC208552@bastion.fedora.phx.redhat.com> dcantrel has set the watchbugzilla acl on anaconda (Fedora 9) to Approved for rmaximo To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From dlehman at fedoraproject.org Thu Mar 5 03:51:38 2009 From: dlehman at fedoraproject.org (David Lehman) Date: Thu, 5 Mar 2009 03:51:38 +0000 (UTC) Subject: rpms/anaconda/devel .cvsignore, 1.614, 1.615 anaconda.spec, 1.759, 1.760 sources, 1.748, 1.749 Message-ID: <20090305035138.C040570116@cvs1.fedora.phx.redhat.com> Author: dlehman Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3381 Modified Files: .cvsignore anaconda.spec sources Log Message: * Wed Mar 4 2009 Dave Lehman - 11.5.0.24-1 - Storage test day. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.614 retrieving revision 1.615 diff -u -r1.614 -r1.615 --- .cvsignore 3 Mar 2009 16:25:26 -0000 1.614 +++ .cvsignore 5 Mar 2009 03:51:07 -0000 1.615 @@ -1,2 +1,2 @@ -anaconda-11.5.0.23.tar.bz2 +anaconda-11.5.0.24.tar.bz2 clog Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.759 retrieving revision 1.760 diff -u -r1.759 -r1.760 --- anaconda.spec 3 Mar 2009 21:05:41 -0000 1.759 +++ anaconda.spec 5 Mar 2009 03:51:07 -0000 1.760 @@ -2,8 +2,8 @@ Summary: Graphical system installer Name: anaconda -Version: 11.5.0.23 -Release: 3 +Version: 11.5.0.24 +Release: 1 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -20,6 +20,7 @@ # match the requires versions of things). %define dmver 1.02.17-6 %define gettextver 0.11 +%define genisoimagever 1.1.9-4 %define intltoolver 0.31.2-3 %define libnlver 1.0 %define libselinuxver 1.6 @@ -40,9 +41,9 @@ %define createrepover 0.4.7 %define yumutilsver 1.1.11-3 %define iscsiver 6.2.0.870-3 +%define pythoncryptsetupver 0.0.6 BuildRequires: audit-libs-devel -BuildRequires: booty BuildRequires: bzip2-devel BuildRequires: device-mapper-devel >= %{dmver} BuildRequires: e2fsprogs-devel >= %{e2fsver} @@ -83,7 +84,6 @@ Requires: rpm-python >= %{rpmpythonver} Requires: comps-extras Requires: rhpl >= %{rhplver} -Requires: booty Requires: parted >= %{partedver} Requires: pyparted >= %{pypartedver} Requires: yum >= %{yumver} @@ -109,6 +109,7 @@ Requires: gnome-python2-gtkhtml2 Requires: system-config-firewall Requires: cryptsetup-luks +Requires: python-cryptsetup >= %{pythoncryptsetupver} Requires: mdadm Requires: lvm2 Requires: util-linux-ng @@ -124,9 +125,9 @@ %endif Requires: createrepo >= %{createrepover} Requires: squashfs-tools -Requires: mkisofs +Requires: genisoimage >= %{genisoimagever} %ifarch %{ix86} x86_64 -Requires: syslinux +Requires: syslinux >= 3.73 Requires: makebootfat Requires: device-mapper %endif @@ -144,8 +145,7 @@ Provides: anaconda-images = %{version}-%{release} Obsoletes: anaconda-runtime < %{version}-%{release} Provides: anaconda-runtime = %{version}-%{release} - -Patch0: anaconda-tigervnc.patch +Obsoletes: booty %description The anaconda package contains the program which was used to install your @@ -154,8 +154,6 @@ %prep %setup -q -%patch0 -p1 -b .tigervnc - %build %{__make} depend %{__make} %{?_smp_mflags} @@ -211,11 +209,8 @@ %endif %changelog -* Tue Mar 03 2009 Adam Tkac - 11.5.0.23-3 -- use tigervnc* packages instead of tightvnc* - -* Mon Feb 23 2009 Fedora Release Engineering - 11.5.0.23-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Wed Mar 4 2009 Dave Lehman - 11.5.0.24-1 +- Storage test day. * Fri Feb 20 2009 David Cantrell - 11.5.0.23-1 - Remove old content from utils/ (dcantrell) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.748 retrieving revision 1.749 diff -u -r1.748 -r1.749 --- sources 20 Feb 2009 23:14:07 -0000 1.748 +++ sources 5 Mar 2009 03:51:08 -0000 1.749 @@ -1 +1 @@ -65e77d8add5480a2772a75dac975e29d anaconda-11.5.0.23.tar.bz2 +678a5343092b3adee1aeaa0369df9b41 anaconda-11.5.0.24.tar.bz2 From dlehman at fedoraproject.org Thu Mar 5 03:56:14 2009 From: dlehman at fedoraproject.org (David Lehman) Date: Thu, 5 Mar 2009 03:56:14 +0000 (UTC) Subject: rpms/anaconda/devel anaconda-tigervnc.patch,1.1,NONE Message-ID: <20090305035614.74AA370116@cvs1.fedora.phx.redhat.com> Author: dlehman Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4058 Removed Files: anaconda-tigervnc.patch Log Message: Remove unused patch. --- anaconda-tigervnc.patch DELETED --- From paragn at fedoraproject.org Thu Mar 5 04:01:04 2009 From: paragn at fedoraproject.org (Parag Ashok Nemade) Date: Thu, 5 Mar 2009 04:01:04 +0000 (UTC) Subject: rpms/iok/devel .cvsignore,1.8,1.9 iok.spec,1.8,1.9 sources,1.8,1.9 Message-ID: <20090305040104.A931070116@cvs1.fedora.phx.redhat.com> Author: paragn Update of /cvs/pkgs/rpms/iok/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4483 Modified Files: .cvsignore iok.spec sources Log Message: * Thu Mar 05 2009 Parag Nemade - 1.3.2-1 - Update to Next release 1.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/iok/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Feb 2009 06:36:21 -0000 1.8 +++ .cvsignore 5 Mar 2009 04:00:34 -0000 1.9 @@ -1 +1 @@ -iok-1.3.1.tar.gz +iok-1.3.2.tar.gz Index: iok.spec =================================================================== RCS file: /cvs/pkgs/rpms/iok/devel/iok.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- iok.spec 27 Feb 2009 06:36:21 -0000 1.8 +++ iok.spec 5 Mar 2009 04:00:34 -0000 1.9 @@ -1,5 +1,5 @@ Name: iok -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} Summary: Indic Onscreen Virtual Keyboard Group: Applications/System @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils libXtst-devel BuildRequires: gtk2-devel gettext +Requires: xkeyboard-config %description iok is Indic Onscreen Keyboard. It provides virtual Keyboard functionality. @@ -45,12 +46,13 @@ %{_datadir}/applications/fedora-iok.desktop %{_datadir}/pixmaps/iok.xpm + %changelog -* Fri Feb 27 2009 Parag Nemade - 1.3.1-1 -- Update to Next release 1.3.1 +* Thu Mar 05 2009 Parag Nemade - 1.3.2-1 +- Update to Next release 1.3.2 -* Tue Feb 24 2009 Fedora Release Engineering - 1.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Thu Feb 26 2009 Parag Nemade - 1.3.1-1 +- Update to Next release 1.3.1 * Thu Feb 19 2009 Parag Nemade - 1.2.1-1 - Update to Next release 1.2.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iok/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Feb 2009 06:36:22 -0000 1.8 +++ sources 5 Mar 2009 04:00:34 -0000 1.9 @@ -1 +1 @@ -9682116f61764ab3be2a9b7bdc147a54 iok-1.3.1.tar.gz +dc4ba2428c10fbd868f8aba9b31ee3a4 iok-1.3.2.tar.gz From pkgdb at fedoraproject.org Thu Mar 5 04:33:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 04:33:17 +0000 Subject: [pkgdb] ghc-X11 was added for ynemoy Message-ID: <20090305043317.9F53620820B@bastion.fedora.phx.redhat.com> petersen has added Package ghc-X11 with summary Haskell binding to the X11 graphics library petersen has approved Package ghc-X11 petersen has added a Fedora devel branch for ghc-X11 with an owner of ynemoy petersen has approved ghc-X11 in Fedora devel petersen has approved Package ghc-X11 petersen has set commit to Approved for provenpackager on ghc-X11 (Fedora devel) petersen has set build to Approved for provenpackager on ghc-X11 (Fedora devel) petersen has set checkout to Approved for provenpackager on ghc-X11 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ghc-X11 From pkgdb at fedoraproject.org Thu Mar 5 04:32:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 04:32:37 +0000 Subject: [pkgdb] ghc-X11 (Fedora, 10) updated by petersen Message-ID: <20090305043319.5ABB9208544@bastion.fedora.phx.redhat.com> petersen added a Fedora 10 branch for ghc-X11 petersen has set commit to Approved for provenpackager on ghc-X11 (Fedora 10) petersen has set build to Approved for provenpackager on ghc-X11 (Fedora 10) petersen has set checkout to Approved for provenpackager on ghc-X11 (Fedora 10) petersen approved watchbugzilla on ghc-X11 (Fedora 10) for haskell-sig petersen approved watchcommits on ghc-X11 (Fedora 10) for haskell-sig petersen approved watchbugzilla on ghc-X11 (Fedora 10) for petersen petersen approved watchcommits on ghc-X11 (Fedora 10) for petersen petersen approved commit on ghc-X11 (Fedora 10) for petersen petersen approved build on ghc-X11 (Fedora 10) for petersen petersen approved approveacls on ghc-X11 (Fedora 10) for petersen To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ghc-X11 From pkgdb at fedoraproject.org Thu Mar 5 04:32:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 04:32:37 +0000 Subject: [pkgdb] ghc-X11 (Fedora, 9) updated by petersen Message-ID: <20090305043319.7299220854A@bastion.fedora.phx.redhat.com> petersen added a Fedora 9 branch for ghc-X11 petersen has set commit to Approved for provenpackager on ghc-X11 (Fedora 9) petersen has set build to Approved for provenpackager on ghc-X11 (Fedora 9) petersen has set checkout to Approved for provenpackager on ghc-X11 (Fedora 9) petersen approved watchbugzilla on ghc-X11 (Fedora 9) for haskell-sig petersen approved watchcommits on ghc-X11 (Fedora 9) for haskell-sig petersen approved watchbugzilla on ghc-X11 (Fedora 9) for petersen petersen approved watchcommits on ghc-X11 (Fedora 9) for petersen petersen approved commit on ghc-X11 (Fedora 9) for petersen petersen approved build on ghc-X11 (Fedora 9) for petersen petersen approved approveacls on ghc-X11 (Fedora 9) for petersen To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ghc-X11 From pkgdb at fedoraproject.org Thu Mar 5 04:32:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 04:32:37 +0000 Subject: [pkgdb] ghc-X11 (Fedora, devel) updated by petersen Message-ID: <20090305043319.6AB8E208547@bastion.fedora.phx.redhat.com> petersen approved watchbugzilla on ghc-X11 (Fedora devel) for haskell-sig petersen approved watchcommits on ghc-X11 (Fedora devel) for haskell-sig petersen approved watchbugzilla on ghc-X11 (Fedora devel) for petersen petersen approved watchcommits on ghc-X11 (Fedora devel) for petersen petersen approved commit on ghc-X11 (Fedora devel) for petersen petersen approved build on ghc-X11 (Fedora devel) for petersen petersen approved approveacls on ghc-X11 (Fedora devel) for petersen To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ghc-X11 From paragn at fedoraproject.org Thu Mar 5 04:35:11 2009 From: paragn at fedoraproject.org (Parag Ashok Nemade) Date: Thu, 5 Mar 2009 04:35:11 +0000 (UTC) Subject: rpms/ibus-m17n/devel ibus-m17n-iok.patch, NONE, 1.1 ibus-m17n.spec, 1.14, 1.15 Message-ID: <20090305043511.8830670116@cvs1.fedora.phx.redhat.com> Author: paragn Update of /cvs/pkgs/rpms/ibus-m17n/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9255 Modified Files: ibus-m17n.spec Added Files: ibus-m17n-iok.patch Log Message: * Thu Mar 05 2009 Parag - 1.1.0.20090211-4 - Add iok support to ibus-m17n. ibus-m17n-iok.patch: --- NEW FILE ibus-m17n-iok.patch --- --- src/engine.c.orig 2009-03-02 10:54:14.000000000 +0530 +++ src/engine.c 2009-03-02 13:12:42.000000000 +0530 @@ -17,6 +17,8 @@ IBusLookupTable *table; IBusProperty *status_prop; IBusPropList *prop_list; + IBusProperty *show_iok_prop; + gchar *keymap_name; }; struct _IBusM17NEngineClass { @@ -127,12 +129,14 @@ engine_class->cursor_up = ibus_m17n_engine_cursor_up; engine_class->cursor_down = ibus_m17n_engine_cursor_down; - // engine_class->property_activate = ibus_m17n_engine_property_activate; + engine_class->property_activate = ibus_m17n_engine_property_activate; } static void ibus_m17n_engine_init (IBusM17NEngine *m17n) { + IBusText *text; + m17n->status_prop = ibus_property_new ("status", PROP_TYPE_NORMAL, NULL, @@ -143,8 +147,21 @@ 0, NULL); + text = ibus_text_new_from_string ("iok"); + m17n->show_iok_prop = ibus_property_new ("iok", + PROP_TYPE_NORMAL, + text, + "/usr/share/pixmaps/iok.xpm", + text, + TRUE, + FALSE, + 0, + NULL); + g_object_unref (text); + m17n->prop_list = ibus_prop_list_new (); ibus_prop_list_append (m17n->prop_list, m17n->status_prop); + ibus_prop_list_append (m17n->prop_list, m17n->show_iok_prop); m17n->table = ibus_lookup_table_new (9, 0, TRUE, TRUE); m17n->context = NULL; @@ -165,6 +182,7 @@ engine_name = ibus_engine_get_name ((IBusEngine *) m17n); g_assert (engine_name); + m17n->keymap_name = g_strdup (engine_name); if (im_table == NULL) { im_table = g_hash_table_new_full (g_str_hash, @@ -185,7 +203,9 @@ lang = strv[0]; name = strv[1]; - + + if(strcmp(name,"inscript")==0) + ibus_property_set_visible(m17n->show_iok_prop,TRUE); im = minput_open_im (msymbol (lang), msymbol (name), NULL); if (im != NULL) { mplist_put (im->driver.callback_list, Minput_preedit_start, ibus_m17n_engine_callback); @@ -247,6 +267,7 @@ m17n->prop_list = NULL; } + if (m17n->status_prop) { g_object_unref (m17n->status_prop); m17n->status_prop = NULL; @@ -398,6 +419,7 @@ IBusM17NEngine *m17n = (IBusM17NEngine *) engine; ibus_engine_register_properties (engine, m17n->prop_list); + ibus_m17n_engine_process_key (m17n, msymbol ("input-focus-in")); parent_class->focus_in (engine); @@ -483,7 +505,20 @@ const gchar *prop_name, guint prop_state) { - g_debug ("prop_name=%s, prop_state=%d", prop_name, prop_state); + gchar *langi; + gchar **strv; + gchar cmd[80]; + + IBusM17NEngine *m17n = (IBusM17NEngine *) engine; + + strv = g_strsplit (m17n->keymap_name, ":", 2); + g_assert (g_strv_length (strv) == 2); + langi = strv[0]; + + sprintf(cmd,"/usr/bin/iok -n %s",langi); + g_debug ("keymap name = %s,prop_name=%s, prop_state=%d",m17n->keymap_name, prop_name, prop_state); + + g_spawn_command_line_async(cmd, NULL ); parent_class->property_activate (engine, prop_name, prop_state); } Index: ibus-m17n.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus-m17n/devel/ibus-m17n.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ibus-m17n.spec 25 Feb 2009 06:32:37 -0000 1.14 +++ ibus-m17n.spec 5 Mar 2009 04:34:40 -0000 1.15 @@ -1,8 +1,6 @@ -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define mod_path ibus-1.1 Name: ibus-m17n Version: 1.1.0.20090211 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The M17N engine for IBus platform License: GPLv2+ Group: System Environment/Libraries @@ -10,6 +8,7 @@ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz Patch0: ibus-m17n-HEAD.patch +Patch1: ibus-m17n-iok.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext-devel @@ -20,6 +19,7 @@ Requires: ibus Requires: m17n-lib +Requires: iok > 1.3.1 %description M17N engine for IBus input platform. It allows input of many launguaes using @@ -28,6 +28,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p0 %build %configure --disable-static @@ -37,7 +38,6 @@ %install rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install -rm -f $RPM_BUILD_ROOT%{python_sitearch}/_m17n.la %find_lang %{name} @@ -52,6 +52,9 @@ %{_datadir}/ibus/component/* %changelog +* Thu Mar 05 2009 Parag - 1.1.0.20090211-4 +- Add iok support to ibus-m17n. + * Tue Feb 24 2009 Fedora Release Engineering - 1.1.0.20090211-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From petersen at fedoraproject.org Thu Mar 5 04:38:43 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Thu, 5 Mar 2009 04:38:43 +0000 (UTC) Subject: rpms/ghc-X11 - New directory Message-ID: <20090305043843.3CAD870116@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ghc-X11 In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsk10048/rpms/ghc-X11 Log Message: Directory /cvs/pkgs/rpms/ghc-X11 added to the repository From petersen at fedoraproject.org Thu Mar 5 04:38:43 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Thu, 5 Mar 2009 04:38:43 +0000 (UTC) Subject: rpms/ghc-X11/devel - New directory Message-ID: <20090305043843.7D4A570119@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ghc-X11/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsk10048/rpms/ghc-X11/devel Log Message: Directory /cvs/pkgs/rpms/ghc-X11/devel added to the repository From petersen at fedoraproject.org Thu Mar 5 04:39:02 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Thu, 5 Mar 2009 04:39:02 +0000 (UTC) Subject: rpms/ghc-X11 Makefile,NONE,1.1 Message-ID: <20090305043902.A1FB670116@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ghc-X11 In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsk10048/rpms/ghc-X11 Added Files: Makefile Log Message: Setup of module ghc-X11 --- NEW FILE Makefile --- # Top level Makefile for module ghc-X11 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From petersen at fedoraproject.org Thu Mar 5 04:39:03 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Thu, 5 Mar 2009 04:39:03 +0000 (UTC) Subject: rpms/ghc-X11/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305043903.3D31870116@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ghc-X11/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsk10048/rpms/ghc-X11/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ghc-X11 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ghc-X11 # $Id: Makefile,v 1.1 2009/03/05 04:39:02 petersen Exp $ NAME := ghc-X11 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From corsepiu at fedoraproject.org Thu Mar 5 05:18:06 2009 From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=) Date: Thu, 5 Mar 2009 05:18:06 +0000 (UTC) Subject: rpms/perl-Verilog/devel Verilog-Perl-3.120-gcc44.diff, NONE, 1.1 perl-Verilog.spec, 1.4, 1.5 Message-ID: <20090305051806.D997570116@cvs1.fedora.phx.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Verilog/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16215 Modified Files: perl-Verilog.spec Added Files: Verilog-Perl-3.120-gcc44.diff Log Message: * Thu Mar 05 2009 Ralf Cors??pius - 3.120-2 - Fix rebuild breakdown (Add Verilog-Perl-3.120-gcc44.diff). Verilog-Perl-3.120-gcc44.diff: --- NEW FILE Verilog-Perl-3.120-gcc44.diff --- diff -Naur Verilog-Perl-3.120.orig/Preproc/VPreproc.cpp Verilog-Perl-3.120/Preproc/VPreproc.cpp --- Verilog-Perl-3.120.orig/Preproc/VPreproc.cpp 2009-01-23 01:05:42.000000000 +0100 +++ Verilog-Perl-3.120/Preproc/VPreproc.cpp 2009-03-05 06:02:17.000000000 +0100 @@ -813,7 +813,7 @@ // Get a single line from the parse stream. Buffer unreturned text until the newline. if (isEof()) return ""; while (1) { - char* rtnp; + const char* rtnp; bool gotEof = false; while (NULL==(rtnp=strchr(m_lineChars.c_str(),'\n')) && !gotEof) { int tok = getToken(); Index: perl-Verilog.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/perl-Verilog.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Verilog.spec 4 Mar 2009 20:10:41 -0000 1.4 +++ perl-Verilog.spec 5 Mar 2009 05:17:36 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Verilog Version: 3.120 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Verilog parsing routines License: LGPL+ or Artistic @@ -8,6 +8,7 @@ Url: http://www.veripool.org/wiki/verilog-perl Source0: http://search.cpan.org/CPAN/authors/id/W/WS/WSNYDER/Verilog-Perl-%{version}.tar.gz +Patch0: Verilog-Perl-%{version}-gcc44.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -25,6 +26,7 @@ %prep %setup -q -n Verilog-Perl-%{version} +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor \ @@ -65,6 +67,9 @@ %changelog +* Thu Mar 05 2009 Ralf Cors??pius - 3.120-2 +- Fix rebuild breakdown (Add Verilog-Perl-3.120-gcc44.diff). + * Wed Mar 04 2009 Chitlesh Goorah 3.120-1 - upstream v3.120 From sandeen at fedoraproject.org Thu Mar 5 05:23:58 2009 From: sandeen at fedoraproject.org (Eric Sandeen) Date: Thu, 5 Mar 2009 05:23:58 +0000 (UTC) Subject: rpms/kernel/devel linux-2.6-ext4-inode-alloc-race.patch, NONE, 1.1 kernel.spec, 1.1384, 1.1385 Message-ID: <20090305052358.355D470116@cvs1.fedora.phx.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17165 Modified Files: kernel.spec Added Files: linux-2.6-ext4-inode-alloc-race.patch Log Message: * Thu Mar 05 2009 Eric Sandeen - Fix ext4 race between inode bitmap set/clear linux-2.6-ext4-inode-alloc-race.patch: --- NEW FILE linux-2.6-ext4-inode-alloc-race.patch --- Date: Tue, 03 Mar 2009 22:38:41 -0600 From: Eric Sandeen To: ext4 development CC: "Aneesh Kumar K.V" Subject: [PATCH] fix ext4_free_inode vs. ext4_claim_inode race I was seeing fsck errors on inode bitmaps after a 4 thread dbench run on a 4 cpu machine: Inode bitmap differences: -50736 -(50752--50753) etc... I believe that this is because ext4_free_inode() uses atomic bitops, and although ext4_new_inode() *used* to also use atomic bitops for synchronization, commit 393418676a7602e1d7d3f6e560159c65c8cbd50e changed this to use the sb_bgl_lock, so that we could also synchronize against read_inode_bitmap and initialization of uninit inode tables. However, that change left ext4_free_inode using atomic bitops, which I think leaves no synchronization between setting & unsetting bits in the inode table. The below patch fixes it for me, although I wonder if we're getting at all heavy-handed with this spinlock... Signed-off-by: Eric Sandeen --- Index: linux-2.6/fs/ext4/ialloc.c =================================================================== --- linux-2.6.orig/fs/ext4/ialloc.c +++ linux-2.6/fs/ext4/ialloc.c @@ -188,7 +188,7 @@ void ext4_free_inode(handle_t *handle, s struct ext4_group_desc *gdp; struct ext4_super_block *es; struct ext4_sb_info *sbi; - int fatal = 0, err, count; + int fatal = 0, err, count, cleared; ext4_group_t flex_group; if (atomic_read(&inode->i_count) > 1) { @@ -248,8 +248,10 @@ void ext4_free_inode(handle_t *handle, s goto error_return; /* Ok, now we can actually update the inode bitmaps.. */ - if (!ext4_clear_bit_atomic(sb_bgl_lock(sbi, block_group), - bit, bitmap_bh->b_data)) + spin_lock(sb_bgl_lock(sbi, block_group)); + cleared = ext4_clear_bit(bit, bitmap_bh->b_data); + spin_unlock(sb_bgl_lock(sbi, block_group)); + if (!cleared) ext4_error(sb, "ext4_free_inode", "bit already cleared for inode %lu", ino); else { Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1384 retrieving revision 1.1385 diff -u -r1.1384 -r1.1385 --- kernel.spec 5 Mar 2009 00:27:56 -0000 1.1384 +++ kernel.spec 5 Mar 2009 05:23:27 -0000 1.1385 @@ -674,6 +674,9 @@ Patch2899: linux-2.6-v4l-dvb-fixes.patch Patch2900: linux-2.6-v4l-dvb-update.patch +# ext4 fixes +Patch2910: linux-2.6-ext4-inode-alloc-race.patch + Patch9001: revert-fix-modules_install-via-nfs.patch %endif @@ -1086,6 +1089,7 @@ # # ext4 +ApplyPatch linux-2.6-ext4-inode-alloc-race.patch # xfs @@ -1792,6 +1796,9 @@ # and build. %changelog +* Thu Mar 05 2009 Eric Sandeen +- Fix ext4 race between inode bitmap set/clear + * Thu Mar 05 2009 Ben Skeggs - drm-nouveau.patch: fix Author: ravenoak Update of /cvs/pkgs/rpms/pysvn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17442 Modified Files: .cvsignore pysvn.spec sources Log Message: Update to 1.6.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pysvn/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Oct 2008 18:16:53 -0000 1.4 +++ .cvsignore 5 Mar 2009 05:26:27 -0000 1.5 @@ -1 +1 @@ -pysvn-1.6.2.tar.gz +pysvn-1.6.3.tar.gz Index: pysvn.spec =================================================================== RCS file: /cvs/pkgs/rpms/pysvn/devel/pysvn.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pysvn.spec 26 Feb 2009 20:27:19 -0000 1.7 +++ pysvn.spec 5 Mar 2009 05:26:27 -0000 1.8 @@ -1,8 +1,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: pysvn -Version: 1.6.2 -Release: 4%{dist} +Version: 1.6.3 +Release: 1%{dist} Summary: Pythonic style bindings for Subversion Group: Development/Languages License: ASL 1.1 @@ -54,6 +54,9 @@ %{python_sitearch}/%{name} %changelog +* Tue Mar 03 2009 Caitlyn O'Hanna - 1.6.3-1 +- Update to 1.6.3 + * Thu Feb 26 2009 Fedora Release Engineering - 1.6.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pysvn/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Oct 2008 18:16:53 -0000 1.4 +++ sources 5 Mar 2009 05:26:27 -0000 1.5 @@ -1 +1 @@ -58bb216b815f3c05ed77f70708515355 pysvn-1.6.2.tar.gz +41d312ff09b05f7b53d3641a82c64c93 pysvn-1.6.3.tar.gz From ravenoak at fedoraproject.org Thu Mar 5 05:45:50 2009 From: ravenoak at fedoraproject.org (Caitlyn O'Hanna) Date: Thu, 5 Mar 2009 05:45:50 +0000 (UTC) Subject: rpms/pysvn/devel pysvn.spec,1.8,1.9 Message-ID: <20090305054550.727C570116@cvs1.fedora.phx.redhat.com> Author: ravenoak Update of /cvs/pkgs/rpms/pysvn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20309 Modified Files: pysvn.spec Log Message: Removed benchmark test. Index: pysvn.spec =================================================================== RCS file: /cvs/pkgs/rpms/pysvn/devel/pysvn.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pysvn.spec 5 Mar 2009 05:26:27 -0000 1.8 +++ pysvn.spec 5 Mar 2009 05:45:19 -0000 1.9 @@ -2,13 +2,13 @@ Name: pysvn Version: 1.6.3 -Release: 1%{dist} +Release: 2%{dist} Summary: Pythonic style bindings for Subversion Group: Development/Languages License: ASL 1.1 URL: http://pysvn.tigris.org/ Source0: http://pysvn.barrys-emacs.org/source_kits/%{name}-%{version}.tar.gz -Patch0: pysvn-1.6.2-fix-benchmark.patch +#Patch0: pysvn-1.6.2-fix-benchmark.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildRequires: PyXML @@ -23,7 +23,7 @@ %prep %setup -q -n %{name}-%{version} -%patch0 +#%patch0 %build pushd Source @@ -54,6 +54,9 @@ %{python_sitearch}/%{name} %changelog +* Wed Mer 04 2009 Caitlyn O'Hanna - 1.6.3-2 +- Remove the benchmark patch. Changes included in this release. + * Tue Mar 03 2009 Caitlyn O'Hanna - 1.6.3-1 - Update to 1.6.3 From ravenoak at fedoraproject.org Thu Mar 5 05:47:42 2009 From: ravenoak at fedoraproject.org (Caitlyn O'Hanna) Date: Thu, 5 Mar 2009 05:47:42 +0000 (UTC) Subject: rpms/pysvn/devel pysvn.spec,1.9,1.10 Message-ID: <20090305054742.EF40070116@cvs1.fedora.phx.redhat.com> Author: ravenoak Update of /cvs/pkgs/rpms/pysvn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20747 Modified Files: pysvn.spec Log Message: Grrr. Stupid typo... Index: pysvn.spec =================================================================== RCS file: /cvs/pkgs/rpms/pysvn/devel/pysvn.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pysvn.spec 5 Mar 2009 05:45:19 -0000 1.9 +++ pysvn.spec 5 Mar 2009 05:47:12 -0000 1.10 @@ -54,7 +54,7 @@ %{python_sitearch}/%{name} %changelog -* Wed Mer 04 2009 Caitlyn O'Hanna - 1.6.3-2 +* Wed Mar 04 2009 Caitlyn O'Hanna - 1.6.3-2 - Remove the benchmark patch. Changes included in this release. * Tue Mar 03 2009 Caitlyn O'Hanna - 1.6.3-1 From bskeggs at fedoraproject.org Thu Mar 5 05:52:06 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Thu, 5 Mar 2009 05:52:06 +0000 (UTC) Subject: rpms/kernel/devel drm-nouveau.patch, 1.17, 1.18 kernel.spec, 1.1385, 1.1386 Message-ID: <20090305055206.CB08070116@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21479 Modified Files: drm-nouveau.patch kernel.spec Log Message: * Thu Mar 05 2009 Ben Skeggs - drm-nouveau.patch: fix some issues mainly seen on earlier chipsets drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- drm-nouveau.patch 5 Mar 2009 00:27:55 -0000 1.17 +++ drm-nouveau.patch 5 Mar 2009 05:52:05 -0000 1.18 @@ -2355,10 +2355,10 @@ +#endif diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c new file mode 100644 -index 0000000..f5adfef +index 0000000..7147114 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c -@@ -0,0 +1,160 @@ +@@ -0,0 +1,163 @@ +/* + * Copyright 2005 Stephane Marchesin. + * All Rights Reserved. @@ -2398,6 +2398,9 @@ +int nouveau_fbpercrtc = 0; +module_param_named(fbpercrtc, nouveau_fbpercrtc, int, 0400); + ++int nouveau_noagp = 0; ++module_param_named(noagp, nouveau_noagp, int, 0400); ++ +static struct pci_device_id pciidlist[] = { + { + PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID), @@ -6593,10 +6596,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c new file mode 100644 -index 0000000..abc00ec +index 0000000..a15a106 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c -@@ -0,0 +1,1067 @@ +@@ -0,0 +1,1073 @@ +/* + * Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. + * Copyright 2005 Stephane Marchesin @@ -6634,6 +6637,8 @@ +#include "drm_sarea.h" +#include "nouveau_drv.h" + ++extern int nouveau_noagp; ++ +static struct mem_block * +split_block(struct mem_block *p, uint64_t start, uint64_t size, + struct drm_file *file_priv) @@ -7093,6 +7098,9 @@ + struct drm_agp_mode mode; + int ret; + ++ if (nouveau_noagp) ++ return 0; ++ + nouveau_mem_reset_agp(dev); + + ret = drm_agp_acquire(dev); @@ -7244,10 +7252,7 @@ + /* Init FB */ + dev_priv->fb_phys=drm_get_resource_start(dev,1); + fb_size = nouveau_mem_fb_amount(dev); -+ /* On at least NV40, RAMIN is actually at the end of vram. -+ * We don't want to allocate this... */ -+ if (dev_priv->card_type >= NV_40) -+ fb_size -= dev_priv->ramin_rsvd_vram; ++ fb_size -= dev_priv->ramin_rsvd_vram; + dev_priv->fb_available_size = fb_size; + DRM_DEBUG("Available VRAM: %dKiB\n", fb_size>>10); + @@ -7606,14 +7611,18 @@ + NOUVEAU_CHECK_MM_DISABLED_WITH_RETURN; + + block=NULL; -+ if (memfree->flags & NOUVEAU_MEM_FB) ++ if (dev_priv->fb_heap && memfree->flags & NOUVEAU_MEM_FB) + block = find_block(dev_priv->fb_heap, memfree->offset); -+ else if (memfree->flags & NOUVEAU_MEM_AGP) ++ else ++ if (dev_priv->agp_heap && memfree->flags & NOUVEAU_MEM_AGP) + block = find_block(dev_priv->agp_heap, memfree->offset); -+ else if (memfree->flags & NOUVEAU_MEM_PCI) ++ else ++ if (dev_priv->pci_heap && memfree->flags & NOUVEAU_MEM_PCI) + block = find_block(dev_priv->pci_heap, memfree->offset); ++ + if (!block) + return -EFAULT; ++ + if (block->file_priv != file_priv) + return -EPERM; + @@ -7848,10 +7857,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c new file mode 100644 -index 0000000..b70eb9f +index 0000000..48ff77e --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_object.c -@@ -0,0 +1,1228 @@ +@@ -0,0 +1,1229 @@ +/* + * Copyright (C) 2006 Ben Skeggs. + * @@ -8046,6 +8055,7 @@ + if (co >= dev_priv->ramht_size) + co = 0; + } while (co != ho); ++ list_del(&ref->list); + instmem->finish_access(dev); + + DRM_ERROR("RAMHT entry not found. ch=%d, handle=0x%08x\n", @@ -12179,10 +12189,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c new file mode 100644 -index 0000000..33f9214 +index 0000000..a83d271 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv04_instmem.c -@@ -0,0 +1,190 @@ +@@ -0,0 +1,189 @@ +#include "drmP.h" +#include "drm.h" +#include "nouveau_drv.h" @@ -12212,8 +12222,7 @@ + break; + } + } else { -+ /*XXX: what *are* the limits on ramin_rsvd_vram = (512*1024); + } Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1385 retrieving revision 1.1386 diff -u -r1.1385 -r1.1386 --- kernel.spec 5 Mar 2009 05:23:27 -0000 1.1385 +++ kernel.spec 5 Mar 2009 05:52:06 -0000 1.1386 @@ -1796,6 +1796,9 @@ # and build. %changelog +* Thu Mar 05 2009 Ben Skeggs +- drm-nouveau.patch: fix some issues mainly seen on earlier chipsets + * Thu Mar 05 2009 Eric Sandeen - Fix ext4 race between inode bitmap set/clear From bskeggs at fedoraproject.org Thu Mar 5 06:08:26 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Thu, 5 Mar 2009 06:08:26 +0000 (UTC) Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.13, 1.14 nouveau-fedora.patch, 1.3, 1.4 sources, 1.14, 1.15 xorg-x11-drv-nouveau.spec, 1.19, 1.20 Message-ID: <20090305060826.5CBDC70116@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23833 Modified Files: .cvsignore nouveau-fedora.patch sources xorg-x11-drv-nouveau.spec Log Message: * Thu Mar 05 2009 Ben Skeggs 0.0.12-8.20090305git42f99e6 - upstream update, fixes - kms: support gamma and dpms calls - kms: nicer transition to gdm from plymouth Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 2 Mar 2009 06:05:37 -0000 1.13 +++ .cvsignore 5 Mar 2009 06:07:55 -0000 1.14 @@ -1 +1 @@ -xf86-video-nouveau-0.0.12-20090302gite6c3b98.tar.bz2 +xf86-video-nouveau-0.0.12-20090305git42f99e6.tar.bz2 nouveau-fedora.patch: Index: nouveau-fedora.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fedora.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nouveau-fedora.patch 2 Mar 2009 06:05:37 -0000 1.3 +++ nouveau-fedora.patch 5 Mar 2009 06:07:55 -0000 1.4 @@ -11,10 +11,61 @@ nouveau_output.h \ nouveau_connector.h \ diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index ddb6aef..2dbc5a3 100644 +index ddb6aef..ca229db 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c -@@ -151,7 +151,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, +@@ -127,6 +127,50 @@ drmmode_crtc_dpms(xf86CrtcPtr drmmode_crtc, int mode) + + } + ++static void ++drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id, ++ int x, int y) ++{ ++ drmModeFBPtr fb; ++ NVPtr pNv = NVPTR(pScrn); ++ char *dst = NULL, *src = NULL; ++ struct drm_nouveau_gem_mmap req; ++ int ret, h; ++ ++ /* This is not what this should look like. Until we can do driver ++ * pixmaps, this will be a nasty hack! ++ */ ++ ++ fb = drmModeGetFB(nouveau_device(pNv->dev)->fd, src_id); ++ if (!fb) { ++ ErrorF("src fb\n"); ++ return; ++ } ++ ++ req.handle = fb->handle; ++ ret = drmCommandWriteRead(nouveau_device(pNv->dev)->fd, ++ DRM_NOUVEAU_GEM_MMAP, &req, sizeof(req)); ++ if (ret) { ++ ErrorF("src bo map: %d\n", ret); ++ drmFree(fb); ++ return; ++ } ++ src = (void *)req.vaddr; ++ ++ nouveau_bo_map(pNv->scanout, NOUVEAU_BO_WR); ++ dst = pNv->scanout->map; ++ ++ h = fb->height; ++ while (h--) { ++ memcpy(dst, src, fb->width * (fb->bpp >> 3)); ++ src += fb->pitch; ++ dst += fb->pitch; ++ } ++ ++ nouveau_bo_unmap(pNv->scanout); ++ drmFree(fb); ++} ++ + static Bool + drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, + Rotation rotation, int x, int y) +@@ -151,7 +195,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, ret = drmModeAddFB(drmmode->fd, pScrn->virtualX, pScrn->virtualY, pScrn->depth, pScrn->bitsPerPixel, @@ -23,6 +74,62 @@ if (ret < 0) { ErrorF("failed to add fb\n"); return FALSE; +@@ -204,6 +248,12 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, + fb_id = drmmode->fb_id; + if (drmmode_crtc->rotate_fb_id) + fb_id = drmmode_crtc->rotate_fb_id; ++ else ++ if (fb_id != drmmode_crtc->mode_crtc->buffer_id) { ++ drmmode_fb_copy(pScrn, drmmode, fb_id, ++ drmmode_crtc->mode_crtc->buffer_id, x, y); ++ } ++ + ret = drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, + fb_id, x, y, output_ids, output_count, &kmode); + if (ret) +@@ -370,8 +420,6 @@ drmmode_gamma_set(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue, + drmmode_ptr drmmode = drmmode_crtc->drmmode; + int ret; + +- return; +- + ret = drmModeCrtcSetGamma(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, + size, red, green, blue); + if (ret != 0) { +@@ -519,7 +567,32 @@ drmmode_output_destroy(xf86OutputPtr output) + static void + drmmode_output_dpms(xf86OutputPtr output, int mode) + { +- return; ++ drmmode_output_private_ptr drmmode_output = output->driver_private; ++ drmModeConnectorPtr koutput = drmmode_output->mode_output; ++ drmModePropertyPtr props; ++ drmmode_ptr drmmode = drmmode_output->drmmode; ++ int mode_id = -1, i; ++ ++ if (!NVPTR(output->scrn)->allow_dpms) ++ return; ++ ++ for (i = 0; i < koutput->count_props; i++) { ++ props = drmModeGetProperty(drmmode->fd, koutput->props[i]); ++ if (props && (props->flags && DRM_MODE_PROP_ENUM)) { ++ if (!strcmp(props->name, "DPMS")) { ++ mode_id = koutput->props[i]; ++ drmModeFreeProperty(props); ++ break; ++ } ++ drmModeFreeProperty(props); ++ } ++ } ++ ++ if (mode_id < 0) ++ return; ++ ++ drmModeConnectorSetProperty(drmmode->fd, koutput->connector_id, ++ mode_id, mode); + } + + /* diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c index 93fc3c5..6854b68 100644 --- a/src/nouveau_exa.c @@ -99,7 +206,7 @@ exa->WaitMarker = nouveau_exa_wait_marker; diff --git a/src/nv50_randr.c b/src/nv50_randr.c -index f1cca0c..fcf5d7f 100644 +index 6fbba6b..5ce1e64 100644 --- a/src/nv50_randr.c +++ b/src/nv50_randr.c @@ -99,7 +99,7 @@ nv50_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, DisplayModePtr adjuste @@ -407,7 +514,7 @@ /* back/depth buffers will likely be allocated on a per-drawable * basis, but these may be useful if we want to support shared back diff --git a/src/nv_driver.c b/src/nv_driver.c -index 97a5aa8..1e6f0e1 100644 +index d7e8025..42df24a 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -1583,6 +1583,8 @@ NVMapMemSW(ScrnInfoPtr pScrn) @@ -474,21 +581,33 @@ nouveau_bo_ref(NULL, &pNv->GART); nouveau_bo_ref(NULL, &pNv->Cursor); nouveau_bo_ref(NULL, &pNv->Cursor2); -@@ -2058,10 +2083,10 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -2082,10 +2107,11 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) * up until X decides to draw something */ if (!pNv->kms_enable) { - nouveau_bo_map(pNv->FB, NOUVEAU_BO_WR); - memset(pNv->FB->map, 0, NOUVEAU_ALIGN(pScrn->virtualX, 64) * + nouveau_bo_map(pNv->scanout, NOUVEAU_BO_WR); -+ memset(pNv->scanout->map, 0, NOUVEAU_ALIGN(pScrn->virtualX, 64) * ++ memset(pNv->scanout->map, 0, ++ NOUVEAU_ALIGN(pScrn->virtualX, 64) * pScrn->virtualY * (pScrn->bitsPerPixel >> 3)); - nouveau_bo_unmap(pNv->FB); + nouveau_bo_unmap(pNv->scanout); } - if (!pNv->NoAccel) { -@@ -2295,6 +2320,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode) + if (!pNv->randr12_enable) { +@@ -2099,8 +2125,10 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + if (!NV50AcquireDisplay(pScrn)) + return FALSE; + ++ pNv->allow_dpms = FALSE; + if (!xf86SetDesiredModes(pScrn)) + return FALSE; ++ pNv->allow_dpms = TRUE; + } + + /* Darken the screen for aesthetic reasons */ +@@ -2295,6 +2323,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode) bool on = xf86IsUnblank(mode); int i; @@ -505,10 +624,10 @@ return vgaHWSaveScreen(pScreen, mode); diff --git a/src/nv_proto.h b/src/nv_proto.h -index baa531d..8451283 100644 +index 28605a8..dd2be16 100644 --- a/src/nv_proto.h +++ b/src/nv_proto.h -@@ -278,6 +278,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool); +@@ -280,6 +280,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool); int nv50_xv_port_attribute_set(ScrnInfoPtr, Atom, INT32, pointer); int nv50_xv_port_attribute_get(ScrnInfoPtr, Atom, INT32 *, pointer); @@ -520,10 +639,10 @@ #ifndef exaMoveInPixmap extern void exaMoveInPixmap(PixmapPtr pPixmap); diff --git a/src/nv_type.h b/src/nv_type.h -index d363984..79df562 100644 +index db5023f..70b806b 100644 --- a/src/nv_type.h +++ b/src/nv_type.h -@@ -268,12 +268,15 @@ typedef struct _NVRec { +@@ -269,6 +269,7 @@ typedef struct _NVRec { /* Various pinned memory regions */ struct nouveau_bo * FB; void * FBMap; @@ -531,11 +650,21 @@ //struct nouveau_bo * FB_old; /* for KMS */ struct nouveau_bo * shadow[2]; /* for easy acces by exa */ struct nouveau_bo * Cursor; - struct nouveau_bo * Cursor2; - struct nouveau_bo * GART; +@@ -277,6 +278,9 @@ typedef struct _NVRec { + struct nvbios VBIOS; + struct nouveau_bios_info *vbios; ++ + DamagePtr screen_damage; /* for NV50+ */ + - struct nouveau_bios VBIOS; Bool NoAccel; Bool HWCursor; + Bool FpScale; +@@ -355,6 +359,7 @@ typedef struct _NVRec { + + #ifdef XF86DRM_MODE + void *drmmode; /* for KMS */ ++ Bool allow_dpms; + #endif + + nouveauCrtcPtr crtc[2]; Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 2 Mar 2009 06:05:37 -0000 1.14 +++ sources 5 Mar 2009 06:07:55 -0000 1.15 @@ -1 +1 @@ -4c235d75393cac02d46caa984eeb22bf xf86-video-nouveau-0.0.12-20090302gite6c3b98.tar.bz2 +062620c6fa226f2515dbd75d38f67c8c xf86-video-nouveau-0.0.12-20090305git42f99e6.tar.bz2 Index: xorg-x11-drv-nouveau.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xorg-x11-drv-nouveau.spec 2 Mar 2009 06:05:37 -0000 1.19 +++ xorg-x11-drv-nouveau.spec 5 Mar 2009 06:07:55 -0000 1.20 @@ -7,8 +7,8 @@ # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2 -%define gitdate 20090302 -%define git_version e6c3b98 +%define gitdate 20090305 +%define git_version 42f99e6 %define snapshot %{gitdate}git%{git_version} @@ -19,7 +19,7 @@ # need to set an epoch to get version number in sync with upstream Epoch: 1 Version: %{nouveau_version} -Release: 7.%{snapshot}%{?dist} +Release: 8.%{snapshot}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -75,6 +75,11 @@ %{_mandir}/man4/nouveau.4* %changelog +* Thu Mar 05 2009 Ben Skeggs 0.0.12-8.20090305git42f99e6 +- upstream update, fixes +- kms: support gamma and dpms calls +- kms: nicer transition to gdm from plymouth + * Mon Mar 02 2009 Ben Skeggs 0.0.12-7.20090302gite6c3b98 - upstream update, fixes From corsepiu at fedoraproject.org Thu Mar 5 06:10:01 2009 From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=) Date: Thu, 5 Mar 2009 06:10:01 +0000 (UTC) Subject: rpms/perl-Verilog/devel perl-Verilog.spec,1.5,1.6 Message-ID: <20090305061001.A54BC70116@cvs1.fedora.phx.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Verilog/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24216 Modified Files: perl-Verilog.spec Log Message: * Thu Mar 05 2009 Ralf Cors??pius - 3.120-3 - Filter out bogus provides: perl(mypackage). - Pass OPTIMIZE, remove PREFIX when setting up Makefile. Index: perl-Verilog.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/perl-Verilog.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Verilog.spec 5 Mar 2009 05:17:36 -0000 1.5 +++ perl-Verilog.spec 5 Mar 2009 06:10:01 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Verilog Version: 3.120 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Verilog parsing routines License: LGPL+ or Artistic @@ -29,8 +29,17 @@ %patch0 -p1 %build -%{__perl} Makefile.PL INSTALLDIRS=vendor \ - PREFIX=%{_prefix} + +# Filter out bogus Provides +cat << \EOF > %{name}-prov +#!/bin/sh +%{__perl_provides} $* |\ + sed -e '/^perl(mypackage)$/d' +EOF +%global __perl_provides %{_builddir}/Verilog-Perl-%{version}/%{name}-prov +chmod +x %{__perl_provides} + +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags} @@ -67,6 +76,10 @@ %changelog +* Thu Mar 05 2009 Ralf Cors??pius - 3.120-3 +- Filter out bogus provides: perl(mypackage). +- Pass OPTIMIZE, remove PREFIX when setting up Makefile. + * Thu Mar 05 2009 Ralf Cors??pius - 3.120-2 - Fix rebuild breakdown (Add Verilog-Perl-3.120-gcc44.diff). From petersen at fedoraproject.org Thu Mar 5 06:19:49 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Thu, 5 Mar 2009 06:19:49 +0000 (UTC) Subject: comps comps-f11.xml.in,1.141,1.142 Message-ID: <20090305061949.5EB6C70116@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/extras/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25304 Modified Files: comps-f11.xml.in Log Message: add cabal2spec add ibus-rawcode Index: comps-f11.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f11.xml.in,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- comps-f11.xml.in 5 Mar 2009 00:27:48 -0000 1.141 +++ comps-f11.xml.in 5 Mar 2009 06:19:18 -0000 1.142 @@ -2612,6 +2612,7 @@ true alex + cabal2spec cabal-install darcs ghc @@ -2745,6 +2746,7 @@ ibus-hangul ibus-m17n ibus-pinyin + ibus-rawcode m17n-contrib-assamese m17n-contrib-bengali m17n-contrib-gujarati From pjones at fedoraproject.org Thu Mar 5 06:22:53 2009 From: pjones at fedoraproject.org (Peter Jones) Date: Thu, 5 Mar 2009 06:22:53 +0000 (UTC) Subject: rpms/anaconda/devel anaconda-11.5.0.23-efi-cds.patch, NONE, 1.1 anaconda.spec, 1.760, 1.761 Message-ID: <20090305062253.AFA1770116@cvs1.fedora.phx.redhat.com> Author: pjones Update of /cvs/extras/rpms/anaconda/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26010 Modified Files: anaconda.spec Added Files: anaconda-11.5.0.23-efi-cds.patch Log Message: * Thu Mar 05 2009 Peter Jones - 11.5.0.24-2 - Add EFI boot.iso generation. anaconda-11.5.0.23-efi-cds.patch: --- NEW FILE anaconda-11.5.0.23-efi-cds.patch --- diff --git a/scripts/mk-images.efi b/scripts/mk-images.efi index 687d76c..7c25950 100644 --- a/scripts/mk-images.efi +++ b/scripts/mk-images.efi @@ -53,25 +53,25 @@ makeefibootimage() { MBD_BOOTTREE=${TMPDIR:-/tmp}/makebootdisk.tree.$$ MBD_BOOTTREE_TMP=$MBD_BOOTTREE'_tmp' while [ x$(echo $1 | cut -c1-2) = x"--" ]; do - if [ $1 = "--kernel" ]; then - KERNELFILE=$2 - shift; shift - continue - elif [ $1 = "--initrd" ]; then - INITRDFILE=$2 - shift; shift - continue - elif [ $1 = "--imagename" ]; then - MBD_FILENAME=$IMAGEPATH/$2 - shift; shift - continue - elif [ $1 = "--grubpkg" ]; then - grubpkg=$2 - shift; shift - continue - fi - echo "Unknown option passed to makebootdisk" - exit 1 + if [ $1 = "--kernel" ]; then + KERNELFILE=$2 + shift; shift + continue + elif [ $1 = "--initrd" ]; then + INITRDFILE=$2 + shift; shift + continue + elif [ $1 = "--imagename" ]; then + MBD_FILENAME=$IMAGEPATH/$2 + shift; shift + continue + elif [ $1 = "--grubpkg" ]; then + grubpkg=$2 + shift; shift + continue + fi + echo "Unknown option passed to makebootdisk" + exit 1 done if [ -z "$MBD_FILENAME" ]; then @@ -79,15 +79,6 @@ makeefibootimage() { exit 1 fi - if [ -z "$KERNELFILE" ]; then - echo "No kernel file passed" - exit 1 - fi - - if [ -z "$INITRDFILE" ]; then - echo "No initrd file passed" - exit 1 - fi MBD_FSIMAGE="$INITRDFILE" mkdir -p $MBD_BOOTTREE @@ -110,7 +101,7 @@ makeefibootimage() { mkdir -p `dirname $MBD_FILENAME` rm -rf $MBD_TMPIMAGE $MBD_MNTPOINT $MBD_BOOTTREE - if [ -z "$INITRDFILE" ]; then + if [ -z "$INITRDFILE" -a -n "$MBD_FSIMAGE" ]; then rm -f $MBD_FSIMAGE fi @@ -137,8 +128,8 @@ prepareEfiTree() { mkdir -p $MBD_BOOTTREE_TMP/EFI/boot cp -a $BOOTDISKDIR/* $MBD_BOOTTREE_TMP/EFI/boot/ - cp $INITRDFILE $MBD_BOOTTREE_TMP/EFI/boot/initrd.img - cp $KERNELFILE $MBD_BOOTTREE_TMP/EFI/boot/vmlinuz + [ -n "$INITRDFILE" ] && cp $INITRDFILE $MBD_BOOTTREE_TMP/EFI/boot/initrd.img + [ -n "$KERNELFILE" ] && cp $KERNELFILE $MBD_BOOTTREE_TMP/EFI/boot/vmlinuz sed -i "s/@PRODUCT@/$PRODUCT/g" $MBD_BOOTTREE_TMP/EFI/boot/grub.conf sed -i "s/@VERSION@/$VERSION/g" $MBD_BOOTTREE_TMP/EFI/boot/grub.conf @@ -165,10 +156,18 @@ prepareEfiTree() { yumdownloader -c ${yumconf} ${artpkg} rpm2cpio ${artpkg}.rpm | (cd $KERNELROOT; cpio --quiet -iumd) cp $KERNELROOT/boot/grub/splash.xpm.gz $MBD_BOOTTREE_TMP/EFI/boot/splash.xpm.gz + + # if we don't have a kernel or initrd, we're making a CD image and we need + # to mirror EFI/ to the cd. + if [ -z "$KERNELFILE" -a -z "$INITRDFILE" ]; then + cp -av $MBD_BOOTTREE_TMP/EFI/ $TOPDESTPATH/EFI/ + rm -f $TOPDESTPATH/EFI/boot/*.efi + fi } makeEfiImages() { yumconf="$1" + echo "Making EFI images ($PWD)" if [ "$kernelvers" != "$kernelxen" ]; then local grubarch=${efiarch} case ${efiarch} in @@ -190,10 +189,24 @@ makeEfiImages() { --initrd $TOPDESTPATH/images/pxeboot/initrd.img \ --grubpkg ${grubpkg} local ret=$? - [ $ret -eq 0 ] || return $ret + if [ $ret -ne 0 ]; then + echo "makeefibootimage (1) failed" >&2 + return $ret + fi makeefibootdisk $TOPDESTPATH/images/pxeboot/efiboot.img $TOPDESTPATH/images/efidisk.img - return $? + [ $ret -eq 0 ] || return $ret + local ret=$? + + # make a boot image with just boot*.efi in it... + makeefibootimage \ + --imagename pxeboot/efiboot.img \ + --grubpkg ${grubpkg} + local ret=$? + if [ $ret -ne 0 ]; then + echo "makeefibootimage (2) failed" >&2 + fi + return $ret fi - return 1 + return 0 } diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86 index 813d941..fe7a978 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -158,11 +158,16 @@ __EOT__ doPostImages() { if [ -n "$BOOTISO" ]; then EFIARGS="" - if [ -f isolinux/efiboot.img ]; then + EFIGRAFT="" + if [ -f $TOPDESTPATH/images/pxeboot/efiboot.img ]; then + cp $TOPDESTPATH/images/pxeboot/efiboot.img $TOPDESTPATH/isolinux/efiboot.img EFIARGS="-eltorito-alt-boot -e isolinux/efiboot.img -no-emul-boot" + EFIGRAFT="EFI/boot=$TOPDESTPATH/EFI/boot" fi - mkisofs -o $TOPDESTPATH/images/$BOOTISO -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images/install.img=$TOPDESTPATH/images/install.img - implantisomd5 $TOPDESTPATH/images/$BOOTISO + BIOSARGS="-b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table" + echo $PWD:\$ mkisofs -o $TOPDESTPATH/images/$BOOTISO $BIOSARGS $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images/install.img=$TOPDESTPATH/images/install.img $EFIGRAFT + mkisofs -o $TOPDESTPATH/images/$BOOTISO $BIOSARGS $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images/install.img=$TOPDESTPATH/images/install.img $EFIGRAFT + implantisomd5 $TOPDESTPATH/images/$BOOTISO fi } Index: anaconda.spec =================================================================== RCS file: /cvs/extras/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.760 retrieving revision 1.761 diff -u -r1.760 -r1.761 --- anaconda.spec 5 Mar 2009 03:51:07 -0000 1.760 +++ anaconda.spec 5 Mar 2009 06:22:22 -0000 1.761 @@ -3,7 +3,7 @@ Summary: Graphical system installer Name: anaconda Version: 11.5.0.24 -Release: 1 +Release: 2 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -14,6 +14,9 @@ # make archive-no-tag Source0: %{name}-%{version}.tar.bz2 +# Patch for EFI CDs +Patch0: anaconda-11.5.0.23-efi-cds.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Versions of required components (done so we make sure the buildrequires @@ -153,6 +156,7 @@ %prep %setup -q +%patch0 -p1 %build %{__make} depend @@ -209,6 +213,9 @@ %endif %changelog +* Thu Mar 05 2009 Peter Jones - 11.5.0.24-2 +- Add EFI boot.iso generation. + * Wed Mar 4 2009 Dave Lehman - 11.5.0.24-1 - Storage test day. From lkundrak at fedoraproject.org Thu Mar 5 06:28:49 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Thu, 5 Mar 2009 06:28:49 +0000 (UTC) Subject: rpms/gnuradio/devel gnuradio-3.1.3-gcc44.patch, NONE, 1.1 gnuradio.spec, 1.11, 1.12 Message-ID: <20090305062849.5C11970116@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/gnuradio/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26754 Modified Files: gnuradio.spec Added Files: gnuradio-3.1.3-gcc44.patch Log Message: * Thu Mar 4 2009 Lubomir Rintel - 3.1.3-5 - Fix build with GCC 4.4 Not building yet, pending wxPython rebuild gnuradio-3.1.3-gcc44.patch: --- NEW FILE gnuradio-3.1.3-gcc44.patch --- Fix build with GCC 4.4 Lubomir Rintel diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc --- gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2008-05-09 08:35:18.000000000 +0200 +++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2009-03-04 20:48:25.000000000 +0100 @@ -39,6 +39,7 @@ #include #include +#include gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector &taps) { diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc --- gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2008-05-09 08:35:16.000000000 +0200 +++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2009-03-04 20:49:07.000000000 +0100 @@ -34,6 +34,7 @@ #include #include +#include gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector &taps) { diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc --- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2008-05-09 08:35:40.000000000 +0200 +++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2009-03-04 20:49:45.000000000 +0100 @@ -29,6 +29,7 @@ #include #include #include +#include //define ALIGN_ADVANCED_IMPLEMENTATION to have an alternative implementation of the align algoritm which exactly follows the align_interval spec. //It is more resource intensive, less tested and probably not needed diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc --- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc 2008-03-05 22:13:04.000000000 +0100 +++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc 2009-03-04 21:01:08.000000000 +0100 @@ -29,6 +29,7 @@ #include #include #include +#include // Public constructor diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc --- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc 2008-03-05 22:13:04.000000000 +0100 +++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc 2009-03-04 20:55:42.000000000 +0100 @@ -28,6 +28,7 @@ #include #include +#include #include using std::cout; using std::endl; diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc --- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc 2008-03-05 22:13:04.000000000 +0100 +++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc 2009-03-04 20:56:30.000000000 +0100 @@ -27,6 +27,7 @@ #include #include #include +#include #include #define VERBOSE 0 diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc --- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc 2008-03-05 22:13:04.000000000 +0100 +++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc 2009-03-04 20:57:47.000000000 +0100 @@ -30,6 +30,7 @@ #include #include #include +#include #include diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc --- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc 2008-06-25 20:57:48.000000000 +0200 +++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc 2009-03-04 21:00:57.000000000 +0100 @@ -24,6 +24,7 @@ #include #include +#include gr_decode_ccsds_27_fb_sptr gr_make_decode_ccsds_27_fb() diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dpll_bb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dpll_bb.cc --- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dpll_bb.cc 2008-03-05 22:13:04.000000000 +0100 +++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dpll_bb.cc 2009-03-04 20:58:56.000000000 +0100 @@ -26,6 +26,7 @@ #include #include +#include gr_dpll_bb_sptr gr_make_dpll_bb (float period, float gain) diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_fft_vfc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_fft_vfc.cc --- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2008-05-09 08:35:29.000000000 +0200 +++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2009-03-04 22:35:36.000000000 +0100 @@ -29,6 +29,7 @@ #include #include #include +#include #include diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc --- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc 2008-03-05 22:13:04.000000000 +0100 +++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc 2009-03-04 21:00:40.000000000 +0100 @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_simple_correlator.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_simple_correlator.cc --- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2008-05-09 08:35:37.000000000 +0200 +++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2009-03-04 21:00:35.000000000 +0100 @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_stream_mux.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_stream_mux.cc --- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_stream_mux.cc 2008-05-09 08:35:36.000000000 +0200 +++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_stream_mux.cc 2009-03-04 21:01:02.000000000 +0100 @@ -27,6 +27,7 @@ #include #include #include +#include #define VERBOSE 0 diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/io/gr_wavfile_sink.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/io/gr_wavfile_sink.cc --- gnuradio-3.1.3/gnuradio-core/src/lib/io/gr_wavfile_sink.cc 2008-03-05 22:12:53.000000000 +0100 +++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/io/gr_wavfile_sink.cc 2009-03-04 22:41:30.000000000 +0100 @@ -30,6 +30,7 @@ #include #include #include +#include #include #include diff -urp gnuradio-3.1.3/gr-atsc/src/lib/atsc_bit_timing_loop.cc gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_bit_timing_loop.cc --- gnuradio-3.1.3/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2008-05-09 08:36:02.000000000 +0200 +++ gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2009-03-04 22:41:18.000000000 +0100 @@ -28,6 +28,7 @@ #include #include #include +#include // Input rate changed from 20MHz to 19.2 to support usrp at 3 * 6.4MHz float input_rate = 19.2e6; diff -urp gnuradio-3.1.3/gr-atsc/src/lib/atsc_fpll.cc gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_fpll.cc --- gnuradio-3.1.3/gr-atsc/src/lib/atsc_fpll.cc 2008-03-05 22:13:10.000000000 +0100 +++ gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_fpll.cc 2009-03-04 21:00:28.000000000 +0100 @@ -28,6 +28,7 @@ #include #include #include +#include #include "fpll_btloop_coupling.h" diff -urp gnuradio-3.1.3/gr-atsc/src/lib/qa_atsci_data_interleaver.cc gnuradio-3.1.3.gcc44/gr-atsc/src/lib/qa_atsci_data_interleaver.cc --- gnuradio-3.1.3/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2008-05-09 08:35:59.000000000 +0200 +++ gnuradio-3.1.3.gcc44/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2009-03-04 22:41:12.000000000 +0100 @@ -23,7 +23,7 @@ #include #include #include - +#include /*! * write an easy to identify pattern into the packet diff -urp gnuradio-3.1.3/gr-audio-alsa/src/gri_alsa.cc gnuradio-3.1.3.gcc44/gr-audio-alsa/src/gri_alsa.cc --- gnuradio-3.1.3/gr-audio-alsa/src/gri_alsa.cc 2008-03-05 22:12:16.000000000 +0100 +++ gnuradio-3.1.3.gcc44/gr-audio-alsa/src/gri_alsa.cc 2009-03-04 22:41:36.000000000 +0100 @@ -26,6 +26,7 @@ #include #include +#include static snd_pcm_access_t access_types[] = { SND_PCM_ACCESS_MMAP_INTERLEAVED, diff -urp gnuradio-3.1.3/gr-audio-osx/src/audio_osx_sink.cc gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_sink.cc --- gnuradio-3.1.3/gr-audio-osx/src/audio_osx_sink.cc 2008-03-05 22:12:12.000000000 +0100 +++ gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_sink.cc 2009-03-04 22:41:26.000000000 +0100 @@ -29,6 +29,7 @@ #include #include #include +#include #include #define _OSX_AU_DEBUG_ 0 diff -urp gnuradio-3.1.3/gr-audio-osx/src/audio_osx_source.cc gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_source.cc --- gnuradio-3.1.3/gr-audio-osx/src/audio_osx_source.cc 2008-03-05 22:12:12.000000000 +0100 +++ gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_source.cc 2009-03-04 22:41:22.000000000 +0100 @@ -30,6 +30,7 @@ #include #include #include +#include #define _OSX_AU_DEBUG_ 0 #define _OSX_DO_LISTENERS_ 0 diff -urp gnuradio-3.1.3/gr-audio-portaudio/src/gri_portaudio.cc gnuradio-3.1.3.gcc44/gr-audio-portaudio/src/gri_portaudio.cc --- gnuradio-3.1.3/gr-audio-portaudio/src/gri_portaudio.cc 2008-03-05 22:12:12.000000000 +0100 +++ gnuradio-3.1.3.gcc44/gr-audio-portaudio/src/gri_portaudio.cc 2009-03-04 21:01:15.000000000 +0100 @@ -27,6 +27,7 @@ #include #include #include +#include PaDeviceIndex diff -urp gnuradio-3.1.3/gr-pager/src/pager_flex_sync.cc gnuradio-3.1.3.gcc44/gr-pager/src/pager_flex_sync.cc --- gnuradio-3.1.3/gr-pager/src/pager_flex_sync.cc 2008-03-05 22:12:08.000000000 +0100 +++ gnuradio-3.1.3.gcc44/gr-pager/src/pager_flex_sync.cc 2009-03-04 22:40:40.000000000 +0100 @@ -23,6 +23,7 @@ #include "config.h" #endif +#include #include #include #include diff -urp gnuradio-3.1.3/gr-usrp/src/usrp1_sink_base.cc gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_sink_base.cc --- gnuradio-3.1.3/gr-usrp/src/usrp1_sink_base.cc 2008-03-05 22:13:05.000000000 +0100 +++ gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_sink_base.cc 2009-03-04 22:40:50.000000000 +0100 @@ -24,6 +24,7 @@ #include "config.h" #endif +#include #include #include #include diff -urp gnuradio-3.1.3/gr-usrp/src/usrp1_source_base.cc gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_source_base.cc --- gnuradio-3.1.3/gr-usrp/src/usrp1_source_base.cc 2008-03-05 22:13:05.000000000 +0100 +++ gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_source_base.cc 2009-03-04 22:40:45.000000000 +0100 @@ -24,6 +24,7 @@ #include "config.h" #endif +#include #include #include #include diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/fusb_darwin.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_darwin.cc --- gnuradio-3.1.3/usrp/host/lib/legacy/fusb_darwin.cc 2008-03-05 22:12:38.000000000 +0100 +++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_darwin.cc 2009-03-04 22:41:08.000000000 +0100 @@ -29,6 +29,7 @@ #define _USE_OMNI_THREADS_ #define DO_DEBUG 0 +#include #include #include "fusb.h" #include "fusb_darwin.h" diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/fusb_linux.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_linux.cc --- gnuradio-3.1.3/usrp/host/lib/legacy/fusb_linux.cc 2008-05-09 08:53:09.000000000 +0200 +++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_linux.cc 2009-03-04 22:36:59.000000000 +0100 @@ -35,6 +35,7 @@ #include #include #include +#include #include #include diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/fusb_win32.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_win32.cc --- gnuradio-3.1.3/usrp/host/lib/legacy/fusb_win32.cc 2008-05-09 08:34:46.000000000 +0200 +++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_win32.cc 2009-03-04 22:40:59.000000000 +0100 @@ -24,6 +24,7 @@ #include "config.h" #endif +#include #include #include #include diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/usrp_basic.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_basic.cc --- gnuradio-3.1.3/usrp/host/lib/legacy/usrp_basic.cc 2008-05-09 08:34:47.000000000 +0200 +++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_basic.cc 2009-03-04 22:36:12.000000000 +0100 @@ -31,6 +31,7 @@ #include "fusb.h" #include #include +#include #include #include #include diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/usrp_standard.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_standard.cc --- gnuradio-3.1.3/usrp/host/lib/legacy/usrp_standard.cc 2008-08-01 21:45:09.000000000 +0200 +++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_standard.cc 2009-03-04 22:40:54.000000000 +0100 @@ -22,6 +22,7 @@ #include +#include #include "usrp_prims.h" #include "fpga_regs_common.h" #include "fpga_regs_standard.h" Index: gnuradio.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnuradio/devel/gnuradio.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gnuradio.spec 25 Feb 2009 00:09:12 -0000 1.11 +++ gnuradio.spec 5 Mar 2009 06:28:18 -0000 1.12 @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.1.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -14,6 +14,7 @@ Patch0: gnuradio-3.1.3-libtool.bug.patch Patch1: gnuradio-3.1.3-werror.patch Patch2: gnuradio-3.1.3-comedilib0.8.patch +Patch3: gnuradio-3.1.3-gcc44.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -91,6 +92,7 @@ %patch0 -p1 -b .libtool %patch1 -p1 -b .werror %patch2 -p1 -b .comedilib +%patch3 -p1 -b .gcc44 %build export PATH=%{_libexecdir}/sdcc:$PATH @@ -198,6 +200,9 @@ %{_includedir}/usrp_* %changelog +* Thu Mar 4 2009 Lubomir Rintel - 3.1.3-5 +- Fix build with GCC 4.4 + * Tue Feb 24 2009 Fedora Release Engineering - 3.1.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From petersen at fedoraproject.org Thu Mar 5 06:55:16 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Thu, 5 Mar 2009 06:55:16 +0000 (UTC) Subject: rpms/ghc/devel cabal-bin-template.spec.in, 1.2, NONE cabal-binlib-template.spec.in, 1.4, NONE cabal-lib-template.spec.in, 1.4, NONE cabal2spec, 1.5, NONE Message-ID: <20090305065516.0CEF970116@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29869 Removed Files: cabal-bin-template.spec.in cabal-binlib-template.spec.in cabal-lib-template.spec.in cabal2spec Log Message: cabal2spec and templates now live in cabal2spec package --- cabal-bin-template.spec.in DELETED --- --- cabal-binlib-template.spec.in DELETED --- --- cabal-lib-template.spec.in DELETED --- --- cabal2spec DELETED --- From pkgdb at fedoraproject.org Thu Mar 5 07:17:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 07:17:09 +0000 Subject: [pkgdb] bochs had acl change status Message-ID: <20090305071734.1A807208546@bastion.fedora.phx.redhat.com> jwrdegoede has set the watchcommits acl on bochs (Fedora devel) to Approved for glommer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bochs From pkgdb at fedoraproject.org Thu Mar 5 07:17:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 07:17:33 +0000 Subject: [pkgdb] bochs had acl change status Message-ID: <20090305071734.DBA3F208543@bastion.fedora.phx.redhat.com> jwrdegoede has set the commit acl on bochs (Fedora devel) to Approved for glommer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bochs From pkgdb at fedoraproject.org Thu Mar 5 07:17:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 07:17:08 +0000 Subject: [pkgdb] bochs had acl change status Message-ID: <20090305071752.BCFC920820B@bastion.fedora.phx.redhat.com> jwrdegoede has set the commit acl on bochs (Fedora 10) to Approved for glommer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bochs From pkgdb at fedoraproject.org Thu Mar 5 07:17:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 07:17:46 +0000 Subject: [pkgdb] bochs had acl change status Message-ID: <20090305071751.1145F20854F@bastion.fedora.phx.redhat.com> jwrdegoede has set the watchcommits acl on bochs (Fedora 10) to Approved for glommer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bochs From pkgdb at fedoraproject.org Thu Mar 5 07:18:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 07:18:04 +0000 Subject: [pkgdb] bochs had acl change status Message-ID: <20090305071805.7EF8D208603@bastion.fedora.phx.redhat.com> jwrdegoede has set the watchbugzilla acl on bochs (Fedora 10) to Approved for glommer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bochs From guthrie at fedoraproject.org Thu Mar 5 07:19:19 2009 From: guthrie at fedoraproject.org (John T. Guthrie III) Date: Thu, 5 Mar 2009 07:19:19 +0000 (UTC) Subject: rpms/simplyhtml/devel simplyhtml.spec,1.4,1.5 Message-ID: <20090305071919.CE57170116@cvs1.fedora.phx.redhat.com> Author: guthrie Update of /cvs/extras/rpms/simplyhtml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32743 Modified Files: simplyhtml.spec Log Message: Adding version requirement to the java-devel BuildRequirement. Index: simplyhtml.spec =================================================================== RCS file: /cvs/extras/rpms/simplyhtml/devel/simplyhtml.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- simplyhtml.spec 4 Mar 2009 23:26:32 -0000 1.4 +++ simplyhtml.spec 5 Mar 2009 07:18:49 -0000 1.5 @@ -3,7 +3,7 @@ Name: simplyhtml Version: 0.12.5 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 0 Summary: Application and a java component for rich text processing # All files are GPL except for src/com/sun/demo/ElementTreePanel.java which has @@ -28,7 +28,7 @@ BuildRequires: ant BuildRequires: gnu-regexp BuildRequires: javahelp2 -BuildRequires: java-devel +BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 @@ -177,7 +177,11 @@ %changelog -* Wed Mar 4 2009 John Guthrie 0:0.12.5-7 +* Wed Mar 5 2009 John Guthrie 0:0.12.5-9 +- Adding a version specification to the java-devel BuildRequirement so that + java-1.6.0-openjdk-devel-1.6.0.0 will get included in the build environment. + +* Wed Mar 4 2009 John Guthrie 0:0.12.5-8 - Typo fix in spec file. * Wed Mar 4 2009 John Guthrie 0:0.12.5-7 From airlied at fedoraproject.org Thu Mar 5 07:26:22 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Thu, 5 Mar 2009 07:26:22 +0000 (UTC) Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.61, 1.62 kernel.spec, 1.1386, 1.1387 Message-ID: <20090305072622.ED38270116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1345 Modified Files: drm-modesetting-radeon.patch kernel.spec Log Message: * Thu Mar 05 2009 Dave Airlie - drm-radeon-modesetting.patch: add new relocation for Xv sync drm-modesetting-radeon.patch: Index: drm-modesetting-radeon.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- drm-modesetting-radeon.patch 3 Mar 2009 22:04:06 -0000 1.61 +++ drm-modesetting-radeon.patch 5 Mar 2009 07:26:21 -0000 1.62 @@ -1,3 +1,11 @@ +commit fef48d5013f761faec24ee1044282b6098318237 +Author: Dave Airlie +Date: Thu Mar 5 15:57:18 2009 +1000 + + radeon: add special relocation for WAIT_VLINE + + This is half ways between a hack and really neat. + commit 530ebda60cb7270795b7edd72930ab2d0e4db102 Author: Dave Airlie Date: Tue Mar 3 18:23:22 2009 +1000 @@ -14369,7 +14377,7 @@ + drm_crtc_helper_add(&radeon_crtc->base, &atombios_helper_funcs); +} diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c -index 3efa633..c97d529 100644 +index 3efa633..54ecf36 100644 --- a/drivers/gpu/drm/radeon/r300_cmdbuf.c +++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c @@ -35,6 +35,7 @@ @@ -14450,20 +14458,24 @@ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) { ADD_RANGE(R500_VAP_INDEX_OFFSET, 1); ADD_RANGE(R500_US_CONFIG, 2); -@@ -258,7 +265,8 @@ void r300_init_reg_flags(struct drm_device *dev) +@@ -258,7 +265,10 @@ void r300_init_reg_flags(struct drm_device *dev) ADD_RANGE(R500_RS_INST_0, 16); ADD_RANGE(R500_RB3D_COLOR_CLEAR_VALUE_AR, 2); ADD_RANGE(R500_RB3D_CONSTANT_COLOR_AR, 2); - ADD_RANGE(R500_ZB_FIFO_SIZE, 2); +// ADD_RANGE(R500_ZB_FIFO_SIZE 2); + ADD_RANGE(R500_GA_US_VECTOR_INDEX, 2); ++ ++ ADD_RANGE_MARK(AVIVO_D1MODE_VLINE_START_END, 1, MARK_CHECK_WAIT_VLINE); } else { ADD_RANGE(R300_PFS_CNTL_0, 3); ADD_RANGE(R300_PFS_NODE_0, 4); -@@ -271,9 +279,122 @@ void r300_init_reg_flags(struct drm_device *dev) +@@ -270,10 +280,124 @@ void r300_init_reg_flags(struct drm_device *dev) + ADD_RANGE(R300_RS_INTERP_0, 8); ADD_RANGE(R300_RS_ROUTE_0, 8); - } ++ ADD_RANGE_MARK(RADEON_CRTC_GUI_TRIG_VLINE, 1, MARK_CHECK_WAIT_VLINE); ++ } + + /* add 2d blit engine registers for DDX */ + ADD_RANGE(RADEON_SRC_Y_X, 3); /* 1434, 1438, 143c, @@ -14576,7 +14588,7 @@ + ADD_RANGE_MARK(RADEON_PP_TXOFFSET_1, 1, MARK_CHECK_OFFSET); + ADD_RANGE_MARK(RADEON_PP_TXOFFSET_2, 1, MARK_CHECK_OFFSET); + } -+ } + } } -static __inline__ int r300_check_range(unsigned reg, int count) @@ -14584,7 +14596,7 @@ { int i; if (reg & ~0xffff) -@@ -284,6 +405,13 @@ static __inline__ int r300_check_range(unsigned reg, int count) +@@ -284,6 +408,13 @@ static __inline__ int r300_check_range(unsigned reg, int count) return 0; } @@ -19946,10 +19958,10 @@ +} diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c new file mode 100644 -index 0000000..3084639 +index 0000000..823b82f --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_cs.c -@@ -0,0 +1,593 @@ +@@ -0,0 +1,667 @@ +/* + * Copyright 2008 Jerome Glisse. + * All Rights Reserved. @@ -20142,6 +20154,71 @@ + *offset = reloc[1]; + return 0; +} ++ ++/* special case CRTC relocation for vline waits ++ * userspace doesn't know which CRTC it controls so we have a special sequence ++ * packet0 VLINE_START_END, value ++ * packet0 WAIT_UNTIL, crtc line | crtc_num ++ * packet0 NOP, crtc_id ++ * we relocate the vline register and the wait until crtc_num bit ++ */ ++static int radeon_cs_relocate_crtc(struct drm_radeon_cs_parser *parser, uint32_t offset_dw) ++{ ++ struct drm_device *dev = parser->dev; ++ struct drm_mode_object *obj; ++ struct drm_crtc *crtc; ++ struct radeon_crtc *radeon_crtc; ++ uint32_t hdr, reg, val, packet3_hdr; ++ int ret = 0; ++ int crtc_id; ++ struct drm_radeon_kernel_chunk *ib_chunk; ++ ++ ib_chunk = &parser->chunks[parser->ib_index]; ++ ++ hdr = ib_chunk->kdata[offset_dw]; ++ reg = (hdr & R300_CP_PACKET0_REG_MASK) << 2; ++ val = ib_chunk->kdata[offset_dw + 1]; ++ packet3_hdr = ib_chunk->kdata[offset_dw + 4]; ++ ++ mutex_lock(&dev->mode_config.mutex); ++ obj = drm_mode_object_find(parser->dev, ib_chunk->kdata[offset_dw + 5], DRM_MODE_OBJECT_CRTC); ++ if (!obj) { ++ ret = -EINVAL; ++ goto out; ++ } ++ crtc = obj_to_crtc(obj); ++ radeon_crtc = to_radeon_crtc(crtc); ++ ++ crtc_id = radeon_crtc->crtc_id; ++ ++ /* ++ * need to edit both packets ++ */ ++ /* vline start end - for crtc0 no work to do */ ++ if (crtc_id == 1) { ++ switch (reg) { ++ case AVIVO_D1MODE_VLINE_START_END: ++ hdr &= R300_CP_PACKET0_REG_MASK; ++ hdr |= AVIVO_D2MODE_VLINE_START_END >> 2; ++ break; ++ case RADEON_CRTC_GUI_TRIG_VLINE: ++ hdr &= R300_CP_PACKET0_REG_MASK; ++ hdr |= RADEON_CRTC2_GUI_TRIG_VLINE >> 2; ++ break; ++ default: ++ DRM_ERROR("unknown CRTC relocation\n"); ++ ret = -EINVAL; ++ goto out; ++ } ++ /* relocate the WAIT_UNTIL */ ++ ib_chunk->kdata[offset_dw] = hdr; ++ ib_chunk->kdata[offset_dw + 3] |= RADEON_ENG_DISPLAY_SELECT_CRTC1; ++ } ++out: ++ mutex_unlock(&dev->mode_config.mutex); ++ return ret; ++} ++ +#define RELOC_SIZE 2 +#define RELOC_SIZE_NEW 0 +#define RADEON_2D_OFFSET_MASK 0x3fffff @@ -20304,12 +20381,14 @@ + return 0; +} + -+int radeon_cs_packet0(struct drm_radeon_cs_parser *parser, uint32_t offset_dw) ++int radeon_cs_packet0(struct drm_radeon_cs_parser *parser, uint32_t *offset_dw_p) +{ + uint32_t hdr, num_dw, reg; + int count_dw = 1; + int ret; + bool one_reg; ++ uint32_t offset_dw = *offset_dw_p; ++ int incr = 2; + + hdr = parser->chunks[parser->ib_index].kdata[offset_dw]; + num_dw = ((hdr & RADEON_CP_PACKET_COUNT_MASK) >> 16) + 2; @@ -20345,6 +20424,13 @@ + /* okay it should be followed by a NOP */ + } else if (flags == MARK_CHECK_SCISSOR) { + DRM_DEBUG("need to validate scissor %x %d\n", reg, flags); ++ } else if (flags == MARK_CHECK_WAIT_VLINE) { ++ ret = radeon_cs_relocate_crtc(parser, offset_dw); ++ if (ret) { ++ DRM_ERROR("failed to relocate packet\n"); ++ return ret; ++ } ++ incr = 4; + } else { + DRM_ERROR("illegal register %x %d %d\n", reg, flags, offset_dw); + return -EINVAL; @@ -20357,6 +20443,7 @@ + count_dw++; + reg += 4; + } ++ *offset_dw_p += incr; + return 0; +} + @@ -20378,8 +20465,7 @@ + + switch (hdr & RADEON_CP_PACKET_MASK) { + case RADEON_CP_PACKET0: -+ ret = radeon_cs_packet0(parser, count_dw); -+ num_dw += 2; ++ ret = radeon_cs_packet0(parser, &count_dw); + break; + case RADEON_CP_PACKET1: + case RADEON_CP_PACKET2: @@ -21725,7 +21811,7 @@ } diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h -index 7091aaf..44acdd7 100644 +index 7091aaf..e2b94a4 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h @@ -34,6 +34,8 @@ @@ -22327,7 +22413,7 @@ } while (0) #define RADEON_WAIT_UNTIL_3D_IDLE() do { \ -@@ -2036,4 +2203,158 @@ extern void radeon_commit_ring(drm_radeon_private_t *dev_priv); +@@ -2036,4 +2203,159 @@ extern void radeon_commit_ring(drm_radeon_private_t *dev_priv); write &= mask; \ } while (0) @@ -22473,6 +22559,7 @@ +#define MARK_SAFE 1 +#define MARK_CHECK_OFFSET 2 +#define MARK_CHECK_SCISSOR 3 ++#define MARK_CHECK_WAIT_VLINE 4 /* VLINE on a crtc relocation */ + +struct _radeon_pkt_s { + int start; @@ -29766,10 +29853,10 @@ + diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h new file mode 100644 -index 0000000..bb9ad4a +index 0000000..9ccf839 --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_reg.h -@@ -0,0 +1,5335 @@ +@@ -0,0 +1,5337 @@ +/* + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and + * VA Linux Systems Inc., Fremont, California. @@ -33431,6 +33518,7 @@ +#define AVIVO_D1MODE_DATA_FORMAT 0x6528 +# define AVIVO_D1MODE_INTERLEAVE_EN (1 << 0) +#define AVIVO_D1MODE_DESKTOP_HEIGHT 0x652C ++#define AVIVO_D1MODE_VLINE_START_END 0x6538 +#define AVIVO_D1MODE_VIEWPORT_START 0x6580 +#define AVIVO_D1MODE_VIEWPORT_SIZE 0x6584 +#define AVIVO_D1MODE_EXT_OVERSCAN_LEFT_RIGHT 0x6588 @@ -33482,6 +33570,7 @@ +#define AVIVO_D2CUR_SIZE 0x6c10 +#define AVIVO_D2CUR_POSITION 0x6c14 + ++#define AVIVO_D2MODE_VLINE_START_END 0x6d38 +#define AVIVO_D2MODE_VIEWPORT_START 0x6d80 +#define AVIVO_D2MODE_VIEWPORT_SIZE 0x6d84 +#define AVIVO_D2MODE_EXT_OVERSCAN_LEFT_RIGHT 0x6d88 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1386 retrieving revision 1.1387 diff -u -r1.1386 -r1.1387 --- kernel.spec 5 Mar 2009 05:52:06 -0000 1.1386 +++ kernel.spec 5 Mar 2009 07:26:22 -0000 1.1387 @@ -1796,6 +1796,9 @@ # and build. %changelog +* Thu Mar 05 2009 Dave Airlie +- drm-radeon-modesetting.patch: add new relocation for Xv sync + * Thu Mar 05 2009 Ben Skeggs - drm-nouveau.patch: fix some issues mainly seen on earlier chipsets From airlied at fedoraproject.org Thu Mar 5 07:29:21 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Thu, 5 Mar 2009 07:29:21 +0000 (UTC) Subject: rpms/xorg-x11-drv-ati/devel radeon-modeset.patch, 1.34, 1.35 xorg-x11-drv-ati.spec, 1.152, 1.153 Message-ID: <20090305072921.4E01970116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1904 Modified Files: radeon-modeset.patch xorg-x11-drv-ati.spec Log Message: * Thu Mar 05 2009 Dave Airlie 6.11.0-4 - modeset: fixup radeon Xv with latest kernel radeon-modeset.patch: Index: radeon-modeset.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- radeon-modeset.patch 3 Mar 2009 09:20:16 -0000 1.34 +++ radeon-modeset.patch 5 Mar 2009 07:28:48 -0000 1.35 @@ -1,3 +1,12 @@ +commit e66aba3c88e6bbd8abe0f481da28872fa17a4f57 +Author: Dave Airlie +Date: Thu Mar 5 16:05:41 2009 +1000 + + radeon: add support for relocatable CRTC inside VLINE + + We cannot let userspace decide which CRTC it wants because its userspace + and might not own the crtc, so we need to provide a way to relocate it + commit 00c0032dac820986b84effdb37c5cc1884eabcaf Author: Dave Airlie Date: Tue Mar 3 15:30:21 2009 +1000 @@ -3278,7 +3287,7 @@ +int radeon_bo_gem_name_buffer(dri_bo *bo, uint32_t *name); +#endif diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c -index eabd87d..582b80f 100644 +index eabd87d..8712a74 100644 --- a/src/radeon_commonfuncs.c +++ b/src/radeon_commonfuncs.c @@ -62,12 +62,15 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn) @@ -3317,7 +3326,89 @@ OUT_ACCEL_REG(R300_GB_SELECT, 0); OUT_ACCEL_REG(R300_GB_ENABLE, 0); FINISH_ACCEL(); -@@ -712,7 +717,7 @@ void FUNC_NAME(RADEONWaitForIdle)(ScrnInfoPtr pScrn) +@@ -626,6 +631,39 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn) + + } + ++#if defined(ACCEL_CP) && defined(XF86DRM_MODE) ++void drmmode_wait_for_vline(ScrnInfoPtr pScrn, PixmapPtr pPix, ++ int crtc, int start, int stop) ++{ ++ RADEONInfoPtr info = RADEONPTR(pScrn); ++ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); ++ uint32_t offset; ++ drmmode_crtc_private_ptr drmmode_crtc = xf86_config->crtc[crtc]->driver_private; ++ ACCEL_PREAMBLE(); ++ ++ BEGIN_ACCEL(3); ++ ++ if (IS_AVIVO_VARIANT) { ++ uint32_t reg = AVIVO_D1MODE_VLINE_START_END; /* this is just a marker */ ++ OUT_ACCEL_REG(reg, ++ ((start << AVIVO_D1MODE_VLINE_START_SHIFT) | ++ (stop << AVIVO_D1MODE_VLINE_END_SHIFT) | ++ AVIVO_D1MODE_VLINE_INV)); ++ } else { ++ OUT_ACCEL_REG(RADEON_CRTC_GUI_TRIG_VLINE, /* another placeholder */ ++ ((start << RADEON_CRTC_GUI_TRIG_VLINE_START_SHIFT) | ++ (stop << RADEON_CRTC_GUI_TRIG_VLINE_END_SHIFT) | ++ RADEON_CRTC_GUI_TRIG_VLINE_INV)); ++ } ++ OUT_ACCEL_REG(RADEON_WAIT_UNTIL, (RADEON_WAIT_CRTC_VLINE | ++ RADEON_ENG_DISPLAY_SELECT_CRTC0)); ++ ++ OUT_RING(CP_PACKET3(RADEON_CP_PACKET3_NOP, 0)); ++ OUT_RING(drmmode_crtc->mode_crtc->crtc_id); ++ FINISH_ACCEL(); ++} ++#endif ++ + /* inserts a wait for vline in the command stream */ + void FUNC_NAME(RADEONWaitForVLine)(ScrnInfoPtr pScrn, PixmapPtr pPix, + int crtc, int start, int stop) +@@ -644,16 +682,19 @@ void FUNC_NAME(RADEONWaitForVLine)(ScrnInfoPtr pScrn, PixmapPtr pPix, + if (!xf86_config->crtc[crtc]->enabled) + return; + ++ if (info->drm_mode_setting) { ++ if (pPix != pScrn->pScreen->GetScreenPixmap(pScrn->pScreen)) ++ return; ++ } else { ++ if (info->useEXA) + #ifdef USE_EXA +- if (info->useEXA) +- offset = exaGetPixmapOffset(pPix); +- else ++ offset = exaGetPixmapOffset(pPix); ++ else + #endif +- offset = pPix->devPrivate.ptr - info->FB; +- +- /* if drawing to front buffer */ +- if (offset != 0) +- return; ++ offset = pPix->devPrivate.ptr - info->FB; ++ if (offset != 0) ++ return; ++ } + + start = max(start, 0); + stop = min(stop, xf86_config->crtc[crtc]->mode.VDisplay); +@@ -661,6 +702,13 @@ void FUNC_NAME(RADEONWaitForVLine)(ScrnInfoPtr pScrn, PixmapPtr pPix, + if (start > xf86_config->crtc[crtc]->mode.VDisplay) + return; + ++#if defined(ACCEL_CP) && defined(XF86DRM_MODE) ++ if (info->drm_mode_setting) { ++ drmmode_wait_for_vline(pScrn, pPix, crtc, start, stop); ++ return; ++ } ++#endif ++ + BEGIN_ACCEL(2); + + if (IS_AVIVO_VARIANT) { +@@ -712,7 +760,7 @@ void FUNC_NAME(RADEONWaitForIdle)(ScrnInfoPtr pScrn) #ifdef ACCEL_CP /* Make sure the CP is idle first */ Index: xorg-x11-drv-ati.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- xorg-x11-drv-ati.spec 3 Mar 2009 09:20:16 -0000 1.152 +++ xorg-x11-drv-ati.spec 5 Mar 2009 07:28:50 -0000 1.153 @@ -5,7 +5,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.11.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -76,6 +76,9 @@ %{_mandir}/man4/radeon.4* %changelog +* Thu Mar 05 2009 Dave Airlie 6.11.0-4 +- modeset: fixup radeon Xv with latest kernel + * Tue Mar 03 2009 Dave Airlie 6.11.0-3 - initial support for dynamic fb resize From guthrie at fedoraproject.org Thu Mar 5 07:35:37 2009 From: guthrie at fedoraproject.org (John T. Guthrie III) Date: Thu, 5 Mar 2009 07:35:37 +0000 (UTC) Subject: rpms/simplyhtml/F-10 simplyhtml.spec,1.2,1.3 Message-ID: <20090305073537.D803F70116@cvs1.fedora.phx.redhat.com> Author: guthrie Update of /cvs/extras/rpms/simplyhtml/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2771 Modified Files: simplyhtml.spec Log Message: Importing spec file from devel. Index: simplyhtml.spec =================================================================== RCS file: /cvs/extras/rpms/simplyhtml/F-10/simplyhtml.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- simplyhtml.spec 4 Mar 2009 06:24:20 -0000 1.2 +++ simplyhtml.spec 5 Mar 2009 07:35:07 -0000 1.3 @@ -1,8 +1,9 @@ %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} +%define multilib_arches ppc64 sparc64 x86_64 Name: simplyhtml Version: 0.12.5 -Release: 6%{?dist} +Release: 9%{?dist} Epoch: 0 Summary: Application and a java component for rich text processing # All files are GPL except for src/com/sun/demo/ElementTreePanel.java which has @@ -27,7 +28,7 @@ BuildRequires: ant BuildRequires: gnu-regexp BuildRequires: javahelp2 -BuildRequires: java-devel +BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 @@ -81,8 +82,13 @@ # clause in its license pushd src/com/sun/demo mv ElementTreePanel.java ElementTreePanel.java.BadLicense -unzip %{_prefix}/lib/jvm/java-1.6.0-openjdk-1.6.0.0/demo/jfc/Notepad/src.zip \ - ElementTreePanel.java +%ifarch %{multilib_arches} + unzip %{_prefix}/lib/jvm/java-1.6.0-openjdk-1.6.0.0.%{_arch}/demo/jfc/Notepad/src.zip \ + ElementTreePanel.java +%else + unzip %{_prefix}/lib/jvm/java-1.6.0-openjdk-1.6.0.0/demo/jfc/Notepad/src.zip \ + ElementTreePanel.java +%endif sed -i -e '33 i\ /* for use in SimplyHTML */\ package com.sun.demo;' ElementTreePanel.java @@ -171,14 +177,26 @@ %changelog +* Wed Mar 5 2009 John Guthrie 0:0.12.5-9 +- Adding a version specification to the java-devel BuildRequirement so that + java-1.6.0-openjdk-devel-1.6.0.0 will get included in the build environment. + +* Wed Mar 4 2009 John Guthrie 0:0.12.5-8 +- Typo fix in spec file. + +* Wed Mar 4 2009 John Guthrie 0:0.12.5-7 +- More 64-bit file location fixes. + * Wed Mar 4 2009 John Guthrie 0:0.12.5-6 - It turns out that the files for the java-1.6.0-openjdk-demo are placed in %%{_prefix}/lib, not %%{_libdir}. (This is significant for 64-bit architectures.) The appropriate line to unzip the ElementTreePanel.java file out of the needed zip file was fixed. + * Wed Feb 25 2009 John Guthrie 0:0.12.5-5 - Fixed the perms on the simplyhtml.sh source file. Allowing the %%attr to take care of the perms. + * Thu Feb 12 2009 John Guthrie 0:0.12.5-4 - Replaced the version of ElementTreePanel.java that came with the source code with a version that has an acceptable license. Added java-1.6.0-openjdk-demo From sbose at fedoraproject.org Thu Mar 5 08:12:49 2009 From: sbose at fedoraproject.org (Sumit Bose) Date: Thu, 5 Mar 2009 08:12:49 +0000 (UTC) Subject: rpms/ctdb/devel .cvsignore, 1.2, 1.3 ctdb.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <20090305081249.CE07970116@cvs1.fedora.phx.redhat.com> Author: sbose Update of /cvs/pkgs/rpms/ctdb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7551 Modified Files: .cvsignore ctdb.spec sources Log Message: Update to ctdb version 1.0.73 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ctdb/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2009 10:36:12 -0000 1.2 +++ .cvsignore 5 Mar 2009 08:12:19 -0000 1.3 @@ -1 +1 @@ -ctdb-1.0.72.tar.bz2 +ctdb-1.0.73.tar.bz2 Index: ctdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/ctdb/devel/ctdb.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ctdb.spec 24 Feb 2009 13:45:47 -0000 1.3 +++ ctdb.spec 5 Mar 2009 08:12:19 -0000 1.4 @@ -2,8 +2,8 @@ Summary: A Clustered Database based on Samba's Trivial Database (TDB) Name: ctdb -Version: 1.0.72 -Release: 3%{?dist} +Version: 1.0.73 +Release: 1%{?dist} License: GPLv3+ Group: System Environment/Daemons URL: http://ctdb.samba.org/ @@ -17,10 +17,6 @@ # Fedora specific patch, ctdb should not be enabled by default in the runlevels Patch1: ctdb-no_default_runlevel.patch -# the patch fixes a dendency problem with make -j, sent to samba-technical: -# http://lists.samba.org/archive/samba-technical/2009-February/063359.html -Patch2: 0001-added-a-prerequisite-to-make-it-safe-to-use-make-j.patch - Requires: chkconfig coreutils psmisc Requires: fileutils sed Requires(preun): chkconfig initscripts @@ -55,7 +51,6 @@ # setup the init script and sysconfig file %setup -T -D -n ctdb-%{version} -q %patch1 -p1 -%patch2 -p1 %build @@ -135,28 +130,43 @@ %{_includedir}/ctdb_private.h %changelog +* Thu Mar 05 2009 Sumit Bose - 1.0.73-1 + - Update to ctdb version 1.0.73 + +* Wed Mar 4 2009 : Version 1.0.73 + - Add possibility to disable the check of shares for NFS and Samba + - From Sumit Bose, fix dependencies so make -j works + * Tue Feb 24 2009 Sumit Bose - 1.0.72-3 -- fix a make -j dependency problem +- fix a make -j dependency problem + * Tue Feb 24 2009 Fedora Release Engineering - 1.0.72-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Wed Feb 18 2009 Sumit Bose - 1.0.72-1 - Update to ctdb version 1.0.72 + * Wed Feb 18 2009 : Version 1.0.72 - Updates to test scripts by martin s - Adding a COPYING file - Use netstat to check for services and ports and fallback to netcat only if netstat is unavailable. + * Thu Feb 17 2009 Sumit Bose - 1.0.71-5 - more fixed according to https://bugzilla.redhat.com/show_bug.cgi?id=459444 + * Thu Feb 8 2009 Sumit Bose - 1.0.71-4 - added upstream patch with license file + * Thu Feb 6 2009 Sumit Bose - 1.0.71-3 - fixed package according to https://bugzilla.redhat.com/show_bug.cgi?id=459444 + * Thu Feb 5 2009 Guenther Deschner - 1.0.71-2 - Update to ctdb version 1.0.71 + * Sun Feb 01 2009 : Version 1.0.71 - Additional ipv6 fixes from Michael Adams + * Thu Jan 15 2009 : Version 1.0.70 - IPv6 support is completed. this is backward compatible with ipv4-only systems. To use IPv6 with samba and ctdb you need current GIT of samba 3.3 @@ -167,9 +177,11 @@ using "1.0.70" as a release and "-1" as the revision instead of as previously using "1.0" as release and ".70" as the revision. By Michael Adams. + * Wed Dec 17 2008 : Version 1.0.69 - Various fixes to scripts by M Adam - Dont call ctdb_fatal() when the transport is down during shutdown + * Thu Dec 11 2008 : Version 1.0.68 - Fixes for monitoring of interfaces status from Michael Adam. - Use -q instead of >/dev/null for grep to enhance readability of the @@ -209,6 +221,7 @@ - Update "ctdb ping" to return an error code if the ping fail so that it can be used in scripts. - Update to how to synchronize management of node flags across the cluster. + * Tue Dec 02 2008 : Version 1.0.67 - Add a document describing the recovery process. - Fix a bug in "ctdb setdebug" where it would refuse to set a negative @@ -219,6 +232,7 @@ used during this event. - Make it possible to delete a public ip from all nodes at once using "ctdb delip -n all" + * Sun Nov 23 2008 : Version 1.0.66 - Allow to change the recmaster even when we are not frozen. - Remove two redundant SAMBA_CHECK variables from the sysconf example @@ -230,6 +244,7 @@ - Rewrite the disable/enable flag update logic to prevent a race between "ctdb disable/enable" and the recovery daemon when updating the flags to all nodes. + * Wed Nov 12 2008 : Version 1.0.65 - Update the sysconfig example: The default debug level is 2 (NOTICE) and not 0 (ERROR) @@ -237,17 +252,21 @@ line tool. If set, this overrides the default socket the ctdb tool will use. - Add logging of high latency operations. + * Tue Oct 21 2008 : Version 1.0.64 - Add a context and a timed event so that once we have been in recovery for too long we drop all public addresses. + * Sun Oct 19 2008 : Version 1.0.63 - Remove logging of "periodic cleanup ..." in 50.samba - When we reload a nodes file, we must detect this and reload the file also in the recovery daemon before we try to dereference somethoung beyond the end of the nodes array. + * Wed Oct 15 2008 : Version 1.0.62 - Allow multiple eventscritps using the same prefix number. It is undefined which order scripts with the same prefix will execute in. + * Tue Oct 14 2008 : Version 1.0.61 - Use "route add -net" instead of "ip route add" when adding routes in 99.routing - lower the loglevel os several debug statements @@ -255,6 +274,7 @@ print them out to the screen. - install a new eventscript 20.multipathd whoich can be used to monitor that multipath devices are healthy + * Tue Oct 14 2008 : Version 1.0.60 - Verify that nodes we try to ban/unban are reachable and print an error othervise. - Update the client and server sides of TAKEIP/RELEASEIP/GETPUBLICIPS and @@ -266,6 +286,7 @@ - From Mathieu Parent : specify logdir location for debian (this patch was later reversed) - From Michael Adams : allow # comments in nodes/public_addresses files + * Mon Oct 06 2008 : Version 1.0.59 - Updated "reloadnodes" logic. Instead of bouncing the entire tcp layer it is sufficient to just close and reopen all outgoing tcp connections. @@ -285,31 +306,40 @@ recovery daemon. - From C Cowan : patches to compile ipv6 under AIX - zero out some structs to keep valgrind happy + * Mon Sep 8 2008 Abhijith Das - 1.0.58-1 - This release repackages upstream's version 1.0.58 for fedora + * Wed Aug 27 2008 : Version 1.0.58 - revert the name change tcp_tcp_client back to tcp_control_tcp so samba can build. - Updates to the init script from Abhijith Das + * Mon Aug 25 2008 : Version 1.0.57 - initial support for IPv6 + * Mon Aug 11 2008 : Version 1.0.56 - fix a memory leak in the recovery daemon. + * Mon Aug 11 2008 : Version 1.0.55 - Fix the releaseip message we seond to samba. + * Fri Aug 8 2008 : Version 1.0.54 - fix a looping error in the transaction code - provide a more detailed error code for persistent store errors so clients can make more intelligent choices on how to try to recover + * Thu Aug 7 2008 : Version 1.0.53 - Remove the reclock.pnn file it can cause gpfs to fail to umount - New transaction code + * Mon Aug 4 2008 : Version 1.0.52 - Send an explicit gratious arp when starting sending the tcp tickles. - When doing failover, issue a killtcp to non-NFS/non-CIFS clients so that they fail quickly. NFS and CIFS already fail and recover quickly. - Update the test scripts to handle CTRL-C to kill off the test. + * Mon Jul 28 2008 : Version 1.0.51 - Strip off the vlan tag from bond devices before we check in /proc if the interface is up or not. @@ -317,6 +347,7 @@ that the shares do exist. - Fix a bug in the logging code to handle multiline entries better - Rename private elements from private to private_data + * Fri Jul 18 2008 : Version 1.0.50 - Dont assume that just because we can establish a TCP connection that we are actually talking to a functioning ctdb daemon. @@ -327,9 +358,11 @@ looking entries from the log. - Bugfix for eventsystem for signal handling that could cause a node to hang. + * Thu Jul 17 2008 : Version 1.0.49 - Update the safe persistent update fix to work with unpatched samba servers. + * Thu Jul 17 2008 : Version 1.0.48 - Update the spec file. - Do not start new user-triggered eventscripts if we are already @@ -346,11 +379,13 @@ We can no longer use the smbstatus, net or testparm commands to check if samba or its config is healthy since these commands may block indefinitely and thus can not be used in scripts. + * Fri Jul 11 2008 : Version 1.0.47 - Fix a double free bug where if a user striggered (ctdb eventscript) hung and while the timeout handler was being processed a new user triggered eventscript was started we would free state twice. - Rewrite of onnode and associated documentation. + * Thu Jul 10 2008 : Version 1.0.46 - Document both the LVS:cingle-ip-address and the REMOTE-NODE:wan-accelerator capabilities. @@ -364,6 +399,7 @@ failed services. - Rewrite of the waitpid() patch to use the eventsystem for handling signals. + * Tue Jul 8 2008 : Version 1.0.45 - Try to restart the nfs service if it has failed to respond 3 times in a row. - waitpid() can block if the child does not respond promptly to SIGTERM. @@ -373,6 +409,7 @@ only consider the script to have failed and making the node unhealthy IF the eventscript terminated wiht an error OR the eventscript hung 5 or more times in a row + * Mon Jul 7 2008 : Version 1.0.44 - Add a CTDB_VALGRIND option to /etc/sysconfig/ctdb to make it start ctdb under valgrind. Logs go to /var/log/ctdb_valgrind.PID @@ -404,6 +441,7 @@ Check that the write is successful and try the write again if it failed. - In each node, verify that the recmaster have the right node flags for us and force a push of our flags to the recmaster if wrong. + * Tue Jul 1 2008 : Version 1.0.43 - Updates and bugfixes to the specfile to keep rpmlint happy - Force a global flags update after each recovery event. @@ -414,22 +452,27 @@ the parent will never be notified tha the child has completed the operation. - Automatically thaw all databases when recmaster marks us as being in normal mode instead of recovery mode. + * Fri Jun 13 2008 : Version 1.0.42 - When event scripts have hung/timedout more than EventScriptBanCount times in a row the node will ban itself. - Many updates to persistent write tests and the test scripts. + * Wed May 28 2008 : Version 1.0.41 - Reactivate the safe writes to persistent databases and solve the locking issues. Locking issues are solved the only possible way, by using a child process to do the writes. Expensive and slow but... . + * Tue May 27 2008 : Version 1.0.40 - Read the samba sysconfig file from the 50.samba eventscript - Fix some emmory hierarchical bugs in the persistent write handling + * Thu May 22 2008 : Version 1.0.39 - Moved a CTDB_MANAGES_NFS, CTDB_MANAGES_ISCSI and CTDB_MANAGES_CSFTPD into /etc/sysconfig/ctdb - Lowered some debug messages to not fill the logfile with entries that normally occur in the default configuration. + * Fri May 16 2008 : Version 1.0.38 - Add machine readable output support to "ctdb getmonmode" - Lots of tweaks and enhancements if the event scripts are "slow" @@ -443,6 +486,7 @@ - Try to use "safe transactions" when writing to a persistent database that was opened with the TDB_NOSYNC flag. If we can get the transaction thats great, if we cant we have to write anyway since we cant block here. + * Mon May 12 2008 : Version 1.0.37 - When we shutdown ctdb we close the transport down before we run the "shutdown" eventscripts. If ctdb decides to send a packet to a remote node @@ -452,12 +496,14 @@ to monitor, exportfs violates the "principle of least surprise" and sometimes report a single export line as two lines of text output causing the monitoring to fail. + * Fri May 9 2008 : Version 1.0.36 - fix a memory corruption bug that could cause the recovery daemon to crash. - fix a bug with distributing public ip addresses during recovery. If the node that is the recovery master did NOT use public addresses, then it assumed that no other node in the cluster used them either and thus skipped the entire step of reallocating public addresses. + * Wed May 7 2008 : Version 1.0.35 - During recovery, when we define the new set of lmasters (vnnmap) only consider those nodes that have the can-be-lmaster capability @@ -478,6 +524,7 @@ - Define two new capabilities : can be recmaster and can be lmaster and default both capabilities to YES. - Log denied tcp connection attempts with DEBUG_ERR and not DEBUG_WARNING + * Thu Apr 24 2008 : Version 1.0.34 - When deleting a public ip from a node, try to migrate the ip to a different node first. @@ -488,25 +535,28 @@ mark that node as a recovery culprit so it will eventually become banned. - Make ctdb eventscript support the -n all argument. + * Thu Apr 10 2008 : Version 1.0.33 - Add facilities to include site local adaptations to the eventscript by /etc/ctdb/rc.local which will be read by all eventscripts. - Add a "ctdb version" command. - Secure the domain socket with proper permissions from Chris Cowan - Bugfixes for AIX from Chris Cowan + * Wed Apr 02 2008 : Version 1.0.32 - Add a control to have a node execute the eventscripts with arbitrary command line arguments. - Add a control "rddumpmemory" that will dump the talloc memory allocations for the recovery daemon. - Decorate the talloc memdump to produce better and easier memory leak - tracking. + tracking. - Update the RHEL5 iscsi tgtd scripts to allow one iscsi target for each public address. - Add two new controls "addip/delip" that can be used to add/remove public addresses to a node at runtime. After using these controls a "ctdb recover" ir required to make the changes take. - Fix a couple of slow memory leaks. + * Tue Mar 25 2008 : Version 1.0.31 - Add back controls to disable/enable monitoring on a node. - Fix a memory leak where we used to attach CALL data to the ctdb structure @@ -517,6 +567,7 @@ - Redo and optimize the vacuuming process to send only one control to each other node containing all records to be vacuumed instead of one control per node per record. + * Tue Mar 04 2008 : Version 1.0.30 - Update documentation cor new commands and tuneables - Add machinereadable output to the ip,uptime and getdebug commands @@ -528,6 +579,7 @@ - Add CTDB_START_AS_DISABLED sysconfig param - Add --start-as-disabled flag to ctdb - Add ability to monitor for OOM condition + * Thu Feb 21 2008 : Version 1.0.29 - Add a new command to make expansion of an existing cluster easier - Fix bug with references to freed objects in the ctdb structure @@ -536,15 +588,19 @@ - MP: Simulate "service" on systems which do not provide this tool - MP: Set correct permissions for events.d/README - Add nice helper functions to start/stop nfs from the event scripts + * Fri Feb 08 2008 : Version 1.0.28 - Fix a problem where we tried to use ethtool on non-ethernet interfaces - Warn if the ipvsadm packege is missing when LVS is used - Dont use absolute pathnames in some of the event scripts - Fix for persistent tdbs growing inifinitely. + * Wed Feb 06 2008 : Version 1.0.27 - Add eventscript for iscsi + * Thu Jan 31 2008 : Version 1.0.26 - Fix crashbug in tdb transaction code + * Tue Jan 29 2008 : Version 1.0.25 - added async recovery code - make event scripts more portable @@ -552,27 +608,35 @@ - more efficient tdb allocation code - improved machine readable ctdb status output - added ctdb uptime + * Wed Jan 16 2008 : Version 1.0.24 - added syslog support - documentation updates + * Wed Jan 16 2008 : Version 1.0.23 - fixed a memory leak in the recoveryd - fixed a corruption bug in the new transaction code - fixed a case where an packet for a disconnected client could be processed - added http event script - updated documentation + * Thu Jan 10 2008 : Version 1.0.22 - auto-run vacuum and repack ops + * Wed Jan 09 2008 : Version 1.0.21 - added ctdb vacuum and ctdb repack code + * Sun Jan 06 2008 : Version 1.0.20 - new transaction based recovery code + * Sat Jan 05 2008 : Version 1.0.19 - fixed non-master bug - big speedup in recovery for large databases - lots of changes to improve tdb and ctdb for high churn databases + * Thu Dec 27 2007 : Version 1.0.18 - fixed crash bug in monitor_handler + * Tue Dec 04 2007 : Version 1.0.17 - fixed bugs related to ban/unban of nodes - fixed a race condition that could lead to monitoring being permanently disabled, Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ctdb/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2009 10:36:12 -0000 1.2 +++ sources 5 Mar 2009 08:12:19 -0000 1.3 @@ -1 +1 @@ -8a86d4bfa6b4abbbbda2d4878d414cfd ctdb-1.0.72.tar.bz2 +6965ff03986860c4a49bea985f900226 ctdb-1.0.73.tar.bz2 From airlied at fedoraproject.org Thu Mar 5 08:20:05 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Thu, 5 Mar 2009 08:20:05 +0000 (UTC) Subject: rpms/mesa/devel mesa.spec,1.226,1.227 radeon-rewrite.patch,1.4,1.5 Message-ID: <20090305082005.0B11C70116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/mesa/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8714 Modified Files: mesa.spec radeon-rewrite.patch Log Message: * Thu Mar 05 2009 Dave Airlie 7.3-10 - radeon-rewrite.patch: fixup link against libdrm_radeon Index: mesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v retrieving revision 1.226 retrieving revision 1.227 diff -u -r1.226 -r1.227 --- mesa.spec 4 Mar 2009 07:00:36 -0000 1.226 +++ mesa.spec 5 Mar 2009 08:19:34 -0000 1.227 @@ -20,7 +20,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 7.3 -Release: 9%{?dist} +Release: 10%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -427,6 +427,9 @@ %{_libdir}/mesa-demos-data %changelog +* Thu Mar 05 2009 Dave Airlie 7.3-10 +- radeon-rewrite.patch: fixup link against libdrm_radeon + * Wed Mar 04 2009 Dave Airlie 7.3-9 - try again: pull in 7.4 fixes, dri configs changes, new radeon-rewrite radeon-rewrite.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 radeon-rewrite.patch Index: radeon-rewrite.patch =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/radeon-rewrite.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- radeon-rewrite.patch 4 Mar 2009 07:00:36 -0000 1.4 +++ radeon-rewrite.patch 5 Mar 2009 08:19:34 -0000 1.5 @@ -1,47 +1,19513 @@ -From c4030c794274b22ba6ccb7c919900b41f5c723f2 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Wed, 4 Mar 2009 16:51:14 +1000 -Subject: [PATCH] radeon/r100/r200: import latest merge +commit 263b887d85e3eac9a32673c8ed3004c3129ce997 +Author: Dave Airlie +Date: Sun Feb 15 17:03:47 2009 +1000 ---- - src/mesa/drivers/dri/radeon/radeon_bo_drm.h | 182 ++++ - src/mesa/drivers/dri/radeon/radeon_bo_legacy.c | 825 +++++++++++++++++ - src/mesa/drivers/dri/radeon/radeon_bo_legacy.h | 47 + - src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h | 67 ++ - src/mesa/drivers/dri/radeon/radeon_cmdbuf.h | 143 +++ - src/mesa/drivers/dri/radeon/radeon_common.c | 849 +++++++++++++++++ - src/mesa/drivers/dri/radeon/radeon_common.h | 55 ++ - .../drivers/dri/radeon/radeon_common_context.c | 589 ++++++++++++ - .../drivers/dri/radeon/radeon_common_context.h | 508 ++++++++++ - src/mesa/drivers/dri/radeon/radeon_cs_drm.h | 207 +++++ - src/mesa/drivers/dri/radeon/radeon_cs_legacy.c | 504 ++++++++++ - src/mesa/drivers/dri/radeon/radeon_cs_legacy.h | 40 + - src/mesa/drivers/dri/radeon/radeon_dma.c | 323 +++++++ - src/mesa/drivers/dri/radeon/radeon_dma.h | 51 + - src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c | 360 ++++++++ - src/mesa/drivers/dri/radeon/radeon_mipmap_tree.h | 97 ++ - src/mesa/drivers/dri/radeon/radeon_texture.c | 966 ++++++++++++++++++++ - src/mesa/drivers/dri/radeon/radeon_texture.h | 118 +++ - 18 files changed, 5931 insertions(+), 0 deletions(-) - create mode 100644 src/mesa/drivers/dri/radeon/radeon_bo_drm.h - create mode 100644 src/mesa/drivers/dri/radeon/radeon_bo_legacy.c - create mode 100644 src/mesa/drivers/dri/radeon/radeon_bo_legacy.h - create mode 100644 src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h - create mode 100644 src/mesa/drivers/dri/radeon/radeon_cmdbuf.h - create mode 100644 src/mesa/drivers/dri/radeon/radeon_common.c - create mode 100644 src/mesa/drivers/dri/radeon/radeon_common.h - create mode 100644 src/mesa/drivers/dri/radeon/radeon_common_context.c - create mode 100644 src/mesa/drivers/dri/radeon/radeon_common_context.h - create mode 100644 src/mesa/drivers/dri/radeon/radeon_cs_drm.h - create mode 100644 src/mesa/drivers/dri/radeon/radeon_cs_legacy.c - create mode 100644 src/mesa/drivers/dri/radeon/radeon_cs_legacy.h - create mode 100644 src/mesa/drivers/dri/radeon/radeon_dma.c - create mode 100644 src/mesa/drivers/dri/radeon/radeon_dma.h - create mode 100644 src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c - create mode 100644 src/mesa/drivers/dri/radeon/radeon_mipmap_tree.h - create mode 100644 src/mesa/drivers/dri/radeon/radeon_texture.c - create mode 100644 src/mesa/drivers/dri/radeon/radeon_texture.h + radeon: add cflags to decide whether to link libdrm_radeon or not. + + You don't need libdrm_radeon for the legacy driver to build, + only for the experimental mm/cs paths. +commit 61e6b2aee3069700db397f26d7ae1384641367ff +Author: Ian Romanick +Date: Fri Jan 9 15:43:17 2009 -0800 + + Track two sets of back-face stencil state + + Track separate back-face stencil state for OpenGL 2.0 / + GL_ATI_separate_stencil and GL_EXT_stencil_two_side. This allows all + three to be enabled in a driver. One set of state is set via the 2.0 + or ATI functions and is used when STENCIL_TEST_TWO_SIDE_EXT is + disabled. The other is set by StencilFunc and StencilOp when the + active stencil face is set to BACK. The GL_EXT_stencil_two_side spec has + more details. + + http://opengl.org/registry/specs/EXT/stencil_two_side.txt + +commit 86691da4b5f43be625ec510b7fe40657b9985783 +Author: Dave Airlie +Date: Wed Mar 4 16:51:14 2009 +1000 + + radeon/r100/r200: import latest merge +diff --git a/configs/autoconf.in b/configs/autoconf.in +index 4a89716..f18d119 100644 +--- a/configs/autoconf.in ++++ b/configs/autoconf.in +@@ -20,6 +20,8 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ \ + $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) + LDFLAGS = @LDFLAGS@ + EXTRA_LIB_PATH = @EXTRA_LIB_PATH@ ++RADEON_CFLAGS = @RADEON_CFLAGS@ ++RADEON_LDFLAGS = @RADEON_LDFLAGS@ + + # Assembler + ASM_SOURCES = @ASM_SOURCES@ +diff --git a/configure.ac b/configure.ac +index 73caf00..48f4eac 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -413,6 +413,8 @@ AC_SUBST([SRC_DIRS]) + AC_SUBST([GLU_DIRS]) + AC_SUBST([DRIVER_DIRS]) + AC_SUBST([WINDOW_SYSTEM]) ++AC_SUBST([RADEON_CFLAGS]) ++AC_SUBST([RADEON_LDFLAGS]) + + dnl + dnl User supplied program configuration +@@ -540,6 +542,13 @@ dri) + GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED" + DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED" + ++ PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon], HAVE_LIBDRM_RADEON=yes, HAVE_LIBDRM_RADEON=no) ++ ++ if test "$HAVE_LIBDRM_RADEON" = yes; then ++ RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS" ++ RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS ++ fi ++ + # find the DRI deps for libGL + if test "$x11_pkgconfig" = yes; then + # add xcb modules if necessary +diff --git a/src/mesa/drivers/dri/i965/brw_cc.c b/src/mesa/drivers/dri/i965/brw_cc.c +index fa8121e..abae4b3 100644 +--- a/src/mesa/drivers/dri/i965/brw_cc.c ++++ b/src/mesa/drivers/dri/i965/brw_cc.c +@@ -84,6 +84,7 @@ static void + cc_unit_populate_key(struct brw_context *brw, struct brw_cc_unit_key *key) + { + struct gl_stencil_attrib *stencil = brw->attribs.Stencil; ++ const unsigned back = stencil->_BackFace; + + memset(key, 0, sizeof(*key)); + +@@ -100,13 +101,13 @@ cc_unit_populate_key(struct brw_context *brw, struct brw_cc_unit_key *key) + key->stencil_test_mask[0] = stencil->ValueMask[0]; + } + if (key->stencil_two_side) { +- key->stencil_func[1] = stencil->Function[1]; +- key->stencil_fail_op[1] = stencil->FailFunc[1]; +- key->stencil_pass_depth_fail_op[1] = stencil->ZFailFunc[1]; +- key->stencil_pass_depth_pass_op[1] = stencil->ZPassFunc[1]; +- key->stencil_ref[1] = stencil->Ref[1]; +- key->stencil_write_mask[1] = stencil->WriteMask[1]; +- key->stencil_test_mask[1] = stencil->ValueMask[1]; ++ key->stencil_func[1] = stencil->Function[back]; ++ key->stencil_fail_op[1] = stencil->FailFunc[back]; ++ key->stencil_pass_depth_fail_op[1] = stencil->ZFailFunc[back]; ++ key->stencil_pass_depth_pass_op[1] = stencil->ZPassFunc[back]; ++ key->stencil_ref[1] = stencil->Ref[back]; ++ key->stencil_write_mask[1] = stencil->WriteMask[back]; ++ key->stencil_test_mask[1] = stencil->ValueMask[back]; + } + + if (brw->attribs.Color->_LogicOpEnabled) +diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c +index c50b0d2..24149cf 100644 +--- a/src/mesa/drivers/dri/i965/brw_wm.c ++++ b/src/mesa/drivers/dri/i965/brw_wm.c +@@ -189,8 +189,7 @@ static void brw_wm_populate_key( struct brw_context *brw, + lookup |= IZ_STENCIL_TEST_ENABLE_BIT; + + if (brw->attribs.Stencil->WriteMask[0] || +- (brw->attribs.Stencil->_TestTwoSide && +- brw->attribs.Stencil->WriteMask[1])) ++ brw->attribs.Stencil->WriteMask[brw->attribs.Stencil->_BackFace]) + lookup |= IZ_STENCIL_WRITE_ENABLE_BIT; + } + +diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile +index e9144ac..e593ed9 100644 +--- a/src/mesa/drivers/dri/r200/Makefile ++++ b/src/mesa/drivers/dri/r200/Makefile +@@ -3,6 +3,8 @@ + TOP = ../../../../.. + include $(TOP)/configs/current + ++CFLAGS += $(RADEON_CFLAGS) ++ + LIBNAME = r200_dri.so + + MINIGLX_SOURCES = server/radeon_dri.c +@@ -11,25 +13,35 @@ ifeq ($(USING_EGL), 1) + EGL_SOURCES = server/radeon_egl.c + endif + ++RADEON_COMMON_SOURCES = \ ++ radeon_texture.c \ ++ radeon_common_context.c \ ++ radeon_common.c \ ++ radeon_dma.c \ ++ radeon_lock.c \ ++ radeon_bo_legacy.c \ ++ radeon_cs_legacy.c \ ++ radeon_mipmap_tree.c \ ++ radeon_span.c ++ ++ + DRIVER_SOURCES = r200_context.c \ + r200_ioctl.c \ +- r200_lock.c \ [...29303 lines suppressed...] + ctx->Stencil.ValueMask[face] == mask && + ctx->Stencil.Ref[face] == ref) +@@ -218,9 +202,12 @@ _mesa_StencilFunc( GLenum func, GLint ref, GLuint mask ) + ctx->Stencil.Function[face] = func; + ctx->Stencil.Ref[face] = ref; + ctx->Stencil.ValueMask[face] = mask; +- if (ctx->Driver.StencilFuncSeparate) { +- ctx->Driver.StencilFuncSeparate(ctx, face ? GL_BACK : GL_FRONT, +- func, ref, mask); ++ ++ /* Only propagate the change to the driver if EXT_stencil_two_side ++ * is enabled. ++ */ ++ if (ctx->Driver.StencilFuncSeparate && ctx->Stencil.TestTwoSide) { ++ ctx->Driver.StencilFuncSeparate(ctx, GL_BACK, func, ref, mask); + } + } + else { +@@ -237,7 +224,9 @@ _mesa_StencilFunc( GLenum func, GLint ref, GLuint mask ) + ctx->Stencil.Ref[0] = ctx->Stencil.Ref[1] = ref; + ctx->Stencil.ValueMask[0] = ctx->Stencil.ValueMask[1] = mask; + if (ctx->Driver.StencilFuncSeparate) { +- ctx->Driver.StencilFuncSeparate(ctx, GL_FRONT_AND_BACK, ++ ctx->Driver.StencilFuncSeparate(ctx, ++ ((ctx->Stencil.TestTwoSide) ++ ? GL_FRONT : GL_FRONT_AND_BACK), + func, ref, mask); + } + } +@@ -259,17 +248,23 @@ void GLAPIENTRY + _mesa_StencilMask( GLuint mask ) + { + GET_CURRENT_CONTEXT(ctx); ++ const GLint face = ctx->Stencil.ActiveFace; ++ + ASSERT_OUTSIDE_BEGIN_END(ctx); + +- if (ctx->Extensions.EXT_stencil_two_side) { +- /* only set active face state */ +- const GLint face = ctx->Stencil.ActiveFace; ++ if (face != 0) { ++ /* Only modify the EXT_stencil_two_side back-face state. ++ */ + if (ctx->Stencil.WriteMask[face] == mask) + return; + FLUSH_VERTICES(ctx, _NEW_STENCIL); + ctx->Stencil.WriteMask[face] = mask; +- if (ctx->Driver.StencilMaskSeparate) { +- ctx->Driver.StencilMaskSeparate(ctx, face ? GL_BACK : GL_FRONT, mask); ++ ++ /* Only propagate the change to the driver if EXT_stencil_two_side ++ * is enabled. ++ */ ++ if (ctx->Driver.StencilMaskSeparate && ctx->Stencil.TestTwoSide) { ++ ctx->Driver.StencilMaskSeparate(ctx, GL_BACK, mask); + } + } + else { +@@ -280,7 +275,10 @@ _mesa_StencilMask( GLuint mask ) + FLUSH_VERTICES(ctx, _NEW_STENCIL); + ctx->Stencil.WriteMask[0] = ctx->Stencil.WriteMask[1] = mask; + if (ctx->Driver.StencilMaskSeparate) { +- ctx->Driver.StencilMaskSeparate(ctx, GL_FRONT_AND_BACK, mask); ++ ctx->Driver.StencilMaskSeparate(ctx, ++ ((ctx->Stencil.TestTwoSide) ++ ? GL_FRONT : GL_FRONT_AND_BACK), ++ mask); + } + } + } +@@ -304,6 +302,8 @@ void GLAPIENTRY + _mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass) + { + GET_CURRENT_CONTEXT(ctx); ++ const GLint face = ctx->Stencil.ActiveFace; ++ + ASSERT_OUTSIDE_BEGIN_END(ctx); + + if (!validate_stencil_op(ctx, fail)) { +@@ -319,9 +319,8 @@ _mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass) + return; + } + +- if (ctx->Extensions.EXT_stencil_two_side) { ++ if (face != 0) { + /* only set active face state */ +- const GLint face = ctx->Stencil.ActiveFace; + if (ctx->Stencil.ZFailFunc[face] == zfail && + ctx->Stencil.ZPassFunc[face] == zpass && + ctx->Stencil.FailFunc[face] == fail) +@@ -330,9 +329,12 @@ _mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass) + ctx->Stencil.ZFailFunc[face] = zfail; + ctx->Stencil.ZPassFunc[face] = zpass; + ctx->Stencil.FailFunc[face] = fail; +- if (ctx->Driver.StencilOpSeparate) { +- ctx->Driver.StencilOpSeparate(ctx, face ? GL_BACK : GL_FRONT, +- fail, zfail, zpass); ++ ++ /* Only propagate the change to the driver if EXT_stencil_two_side ++ * is enabled. ++ */ ++ if (ctx->Driver.StencilOpSeparate && ctx->Stencil.TestTwoSide) { ++ ctx->Driver.StencilOpSeparate(ctx, GL_BACK, fail, zfail, zpass); + } + } + else { +@@ -349,7 +351,9 @@ _mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass) + ctx->Stencil.ZPassFunc[0] = ctx->Stencil.ZPassFunc[1] = zpass; + ctx->Stencil.FailFunc[0] = ctx->Stencil.FailFunc[1] = fail; + if (ctx->Driver.StencilOpSeparate) { +- ctx->Driver.StencilOpSeparate(ctx, GL_FRONT_AND_BACK, ++ ctx->Driver.StencilOpSeparate(ctx, ++ ((ctx->Stencil.TestTwoSide) ++ ? GL_FRONT : GL_FRONT_AND_BACK), + fail, zfail, zpass); + } + } +@@ -372,7 +376,7 @@ _mesa_ActiveStencilFaceEXT(GLenum face) + + if (face == GL_FRONT || face == GL_BACK) { + FLUSH_VERTICES(ctx, _NEW_STENCIL); +- ctx->Stencil.ActiveFace = (face == GL_FRONT) ? 0 : 1; ++ ctx->Stencil.ActiveFace = (face == GL_FRONT) ? 0 : 2; + } + else { + _mesa_error(ctx, GL_INVALID_ENUM, "glActiveStencilFaceEXT(face)"); +@@ -513,19 +517,16 @@ _mesa_StencilMaskSeparate(GLenum face, GLuint mask) + void + _mesa_update_stencil(GLcontext *ctx) + { +- if (ctx->Extensions.EXT_stencil_two_side) { +- ctx->Stencil._TestTwoSide = ctx->Stencil.TestTwoSide; +- } +- else { +- ctx->Stencil._TestTwoSide = +- (ctx->Stencil.Function[0] != ctx->Stencil.Function[1] || +- ctx->Stencil.FailFunc[0] != ctx->Stencil.FailFunc[1] || +- ctx->Stencil.ZPassFunc[0] != ctx->Stencil.ZPassFunc[1] || +- ctx->Stencil.ZFailFunc[0] != ctx->Stencil.ZFailFunc[1] || +- ctx->Stencil.Ref[0] != ctx->Stencil.Ref[1] || +- ctx->Stencil.ValueMask[0] != ctx->Stencil.ValueMask[1] || +- ctx->Stencil.WriteMask[0] != ctx->Stencil.WriteMask[1]); +- } ++ const GLint face = ctx->Stencil._BackFace; ++ ++ ctx->Stencil._TestTwoSide = ++ (ctx->Stencil.Function[0] != ctx->Stencil.Function[face] || ++ ctx->Stencil.FailFunc[0] != ctx->Stencil.FailFunc[face] || ++ ctx->Stencil.ZPassFunc[0] != ctx->Stencil.ZPassFunc[face] || ++ ctx->Stencil.ZFailFunc[0] != ctx->Stencil.ZFailFunc[face] || ++ ctx->Stencil.Ref[0] != ctx->Stencil.Ref[face] || ++ ctx->Stencil.ValueMask[0] != ctx->Stencil.ValueMask[face] || ++ ctx->Stencil.WriteMask[0] != ctx->Stencil.WriteMask[face]); + } + + +@@ -544,17 +545,24 @@ _mesa_init_stencil(GLcontext *ctx) + ctx->Stencil.ActiveFace = 0; /* 0 = GL_FRONT, 1 = GL_BACK */ + ctx->Stencil.Function[0] = GL_ALWAYS; + ctx->Stencil.Function[1] = GL_ALWAYS; ++ ctx->Stencil.Function[2] = GL_ALWAYS; + ctx->Stencil.FailFunc[0] = GL_KEEP; + ctx->Stencil.FailFunc[1] = GL_KEEP; ++ ctx->Stencil.FailFunc[2] = GL_KEEP; + ctx->Stencil.ZPassFunc[0] = GL_KEEP; + ctx->Stencil.ZPassFunc[1] = GL_KEEP; ++ ctx->Stencil.ZPassFunc[2] = GL_KEEP; + ctx->Stencil.ZFailFunc[0] = GL_KEEP; + ctx->Stencil.ZFailFunc[1] = GL_KEEP; ++ ctx->Stencil.ZFailFunc[2] = GL_KEEP; + ctx->Stencil.Ref[0] = 0; + ctx->Stencil.Ref[1] = 0; ++ ctx->Stencil.Ref[2] = 0; + ctx->Stencil.ValueMask[0] = ~0U; + ctx->Stencil.ValueMask[1] = ~0U; ++ ctx->Stencil.ValueMask[2] = ~0U; + ctx->Stencil.WriteMask[0] = ~0U; + ctx->Stencil.WriteMask[1] = ~0U; ++ ctx->Stencil.WriteMask[2] = ~0U; + ctx->Stencil.Clear = 0; + } +diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c +index c925922..2e84dde 100644 +--- a/src/mesa/swrast/s_stencil.c ++++ b/src/mesa/swrast/s_stencil.c +@@ -997,10 +997,12 @@ stencil_and_ztest_pixels( GLcontext *ctx, SWspan *span, GLuint face ) + GLboolean + _swrast_stencil_and_ztest_span(GLcontext *ctx, SWspan *span) + { ++ const GLuint face = (span->facing == 0) ? 0 : ctx->Stencil._BackFace; ++ + if (span->arrayMask & SPAN_XY) +- return stencil_and_ztest_pixels(ctx, span, span->facing); ++ return stencil_and_ztest_pixels(ctx, span, face); + else +- return stencil_and_ztest_span(ctx, span, span->facing); ++ return stencil_and_ztest_span(ctx, span, face); + } + + From cheese at fedoraproject.org Thu Mar 5 08:29:38 2009 From: cheese at fedoraproject.org (josef radinger) Date: Thu, 5 Mar 2009 08:29:38 +0000 (UTC) Subject: rpms/bmpx/F-10 bmpx.spec,1.15,1.16 Message-ID: <20090305082938.8AB8B70116@cvs1.fedora.phx.redhat.com> Author: cheese Update of /cvs/pkgs/rpms/bmpx/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10283 Modified Files: bmpx.spec Log Message: reenable cdparanoia Index: bmpx.spec =================================================================== RCS file: /cvs/pkgs/rpms/bmpx/F-10/bmpx.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- bmpx.spec 14 Sep 2008 08:07:17 -0000 1.15 +++ bmpx.spec 5 Mar 2009 08:29:08 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Beep Media Player eXperimental Name: bmpx Version: 0.40.14 -Release: 7%{?dist} +Release: 9%{?dist} License: GPLv2 Group: Applications/Multimedia @@ -30,7 +30,7 @@ # BuildRequires: libsidplay-devel BuildRequires: startup-notification-devel BuildRequires: libofa-devel -##BuildRequires: cdparanoia-devel +BuildRequires: cdparanoia-devel BuildRequires: alsa-lib-devel BuildRequires: libmodplug-devel BuildRequires: gettext @@ -41,7 +41,7 @@ BuildRequires: dbus-glib-devel BuildRequires: libSM-devel BuildRequires: intltool -BuildRequires: libcdio-devel +#BuildRequires: libcdio-devel %description BMPx is an audio player that features support for specifications like XDS DnD, @@ -87,7 +87,7 @@ --enable-mp4v2 \ --disable-sid \ --enable-modplug \ - --without-cdparanoia + --with-cdparanoia # --enable-sid \ %{__make} %{?_smp_mflags} @@ -179,6 +179,12 @@ %changelog +* Tue Feb 24 2009 josef radinger - 0.40.14-9 +- cleanup + +* Mon Feb 23 2009 josef radinger - 0.40.14-8 +- reenable cdparanoia + * Sun Sep 14 2008 josef radinger - 0.40.14-7 - cvs problems From ovasik at fedoraproject.org Thu Mar 5 08:34:42 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Thu, 5 Mar 2009 08:34:42 +0000 (UTC) Subject: rpms/tar/devel .cvsignore, 1.15, 1.16 sources, 1.17, 1.18 tar-1.19-xattrs-conf.patch, 1.4, 1.5 tar.spec, 1.77, 1.78 Message-ID: <20090305083442.E233470116@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/tar/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11175 Modified Files: .cvsignore sources tar-1.19-xattrs-conf.patch tar.spec Log Message: New upstream release 1.22, removed applied patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tar/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 5 Jan 2009 14:19:38 -0000 1.15 +++ .cvsignore 5 Mar 2009 08:34:11 -0000 1.16 @@ -1,2 +1,2 @@ -tar-1.21.tar.gz -tar-1.21.tar.gz.sig +tar-1.22.tar.bz2 +tar-1.22.tar.bz2.sig Index: sources =================================================================== RCS file: /cvs/extras/rpms/tar/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 5 Jan 2009 14:19:38 -0000 1.17 +++ sources 5 Mar 2009 08:34:12 -0000 1.18 @@ -1,2 +1,2 @@ -e7ae56b3bf924d5108b57b544b247c50 tar-1.21.tar.gz -cceab48ed4cdd0c5e2de825e59797820 tar-1.21.tar.gz.sig +07fa517027f426bb80f5f5ff91b63585 tar-1.22.tar.bz2 +f6398627528d2a8c458cc422cccaeea1 tar-1.22.tar.bz2.sig tar-1.19-xattrs-conf.patch: Index: tar-1.19-xattrs-conf.patch =================================================================== RCS file: /cvs/extras/rpms/tar/devel/tar-1.19-xattrs-conf.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tar-1.19-xattrs-conf.patch 5 Jan 2009 16:13:30 -0000 1.4 +++ tar-1.19-xattrs-conf.patch 5 Mar 2009 08:34:12 -0000 1.5 @@ -1,75 +1,3 @@ -diff -up /dev/null tar-1.19/m4/size_max.m4 ---- /dev/null 2007-12-17 10:53:34.527001576 +0100 -+++ tar-1.19/m4/size_max.m4 2007-12-17 11:46:35.000000000 +0100 -@@ -0,0 +1,68 @@ -+# size_max.m4 serial 6 -+dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Bruno Haible. -+ -+AC_DEFUN([gl_SIZE_MAX], -+[ -+ AC_CHECK_HEADERS(stdint.h) -+ dnl First test whether the system already has SIZE_MAX. -+ AC_MSG_CHECKING([for SIZE_MAX]) -+ AC_CACHE_VAL([gl_cv_size_max], [ -+ gl_cv_size_max= -+ AC_EGREP_CPP([Found it], [ -+#include -+#if HAVE_STDINT_H -+#include -+#endif -+#ifdef SIZE_MAX -+Found it -+#endif -+], gl_cv_size_max=yes) -+ if test -z "$gl_cv_size_max"; then -+ dnl Define it ourselves. Here we assume that the type 'size_t' is not wider -+ dnl than the type 'unsigned long'. Try hard to find a definition that can -+ dnl be used in a preprocessor #if, i.e. doesn't contain a cast. -+ AC_COMPUTE_INT([size_t_bits_minus_1], [sizeof (size_t) * CHAR_BIT - 1], -+ [#include -+#include ], size_t_bits_minus_1=) -+ AC_COMPUTE_INT([fits_in_uint], [sizeof (size_t) <= sizeof (unsigned int)], -+ [#include ], fits_in_uint=) -+ if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then -+ if test $fits_in_uint = 1; then -+ dnl Even though SIZE_MAX fits in an unsigned int, it must be of type -+ dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. -+ AC_TRY_COMPILE([#include -+ extern size_t foo; -+ extern unsigned long foo; -+ ], [], fits_in_uint=0) -+ fi -+ dnl We cannot use 'expr' to simplify this expression, because 'expr' -+ dnl works only with 'long' integers in the host environment, while we -+ dnl might be cross-compiling from a 32-bit platform to a 64-bit platform. -+ if test $fits_in_uint = 1; then -+ gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)" -+ else -+ gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)" -+ fi -+ else -+ dnl Shouldn't happen, but who knows... -+ gl_cv_size_max='((size_t)~(size_t)0)' -+ fi -+ fi -+ ]) -+ AC_MSG_RESULT([$gl_cv_size_max]) -+ if test "$gl_cv_size_max" != yes; then -+ AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max], -+ [Define as the maximum value of type 'size_t', if the system doesn't define it.]) -+ fi -+]) -+ -+dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in. -+dnl Remove this when we can assume autoconf >= 2.61. -+m4_ifdef([AC_COMPUTE_INT], [], [ -+ AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])]) -+]) diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin --- tar-1.19/config.hin.xattrs-conf 2007-10-10 13:01:17.000000000 +0200 +++ tar-1.19/config.hin 2007-12-17 11:47:38.000000000 +0100 @@ -80,8 +8,8 @@ +/* Define to 1 if you have the header file. */ +#undef HAVE_ATTR_XATTR_H + - /* Define to 1 if you have the header file. */ - #undef HAVE_BP_SYM_H + /* Define to 1 if you have the `btowc' function. */ + #undef HAVE_BTOWC @@ -354,12 +357,21 @@ /* Define to 1 if you have the header file. */ Index: tar.spec =================================================================== RCS file: /cvs/extras/rpms/tar/devel/tar.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- tar.spec 25 Feb 2009 18:30:02 -0000 1.77 +++ tar.spec 5 Mar 2009 08:34:12 -0000 1.78 @@ -1,20 +1,19 @@ Summary: A GNU file archiving program Name: tar Epoch: 2 -Version: 1.21 -Release: 2%{?dist} +Version: 1.22 +Release: 1%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.gnu.org/software/tar/ -Source0: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.gz -Source1: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.gz.sig +Source0: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.bz2 +Source1: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.bz2.sig Source2: tar.1 Patch1: tar-1.14-loneZeroWarning.patch Patch2: tar-1.15.1-vfatTruncate.patch Patch3: tar-1.19-xattrs.patch Patch4: tar-1.19-xattrs-conf.patch Patch5: tar-1.17-wildcards.patch -Patch6: tar-1.21-testsuite.patch Prereq: info BuildRequires: autoconf automake gzip texinfo gettext libacl-devel libselinux-devel gawk rsh Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,7 +39,6 @@ %patch3 -p1 -b .xattrs %patch4 -p1 -b .xattrs-conf %patch5 -p1 -b .wildcards -%patch6 -p1 -b .testsuite %build %configure --bindir=/bin --libexecdir=/sbin @@ -91,6 +89,9 @@ %{_infodir}/tar.info* %changelog +* Mon Mar 02 2009 Ondrej Vasik 2:1.22-1 +- New upstream release 1.22, removed applied patch + * Wed Feb 25 2009 Fedora Release Engineering - 2:1.21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From cheese at fedoraproject.org Thu Mar 5 08:36:04 2009 From: cheese at fedoraproject.org (josef radinger) Date: Thu, 5 Mar 2009 08:36:04 +0000 (UTC) Subject: rpms/bmpx/F-9 bmpx.spec,1.14,1.15 Message-ID: <20090305083604.CC2E770116@cvs1.fedora.phx.redhat.com> Author: cheese Update of /cvs/pkgs/rpms/bmpx/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11529 Modified Files: bmpx.spec Log Message: reenable cdparanoia Index: bmpx.spec =================================================================== RCS file: /cvs/pkgs/rpms/bmpx/F-9/bmpx.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- bmpx.spec 14 Sep 2008 12:44:39 -0000 1.14 +++ bmpx.spec 5 Mar 2009 08:35:34 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Beep Media Player eXperimental Name: bmpx Version: 0.40.14 -Release: 8%{?dist} +Release: 10%{?dist} License: GPLv2 Group: Applications/Multimedia @@ -31,8 +31,7 @@ # BuildRequires: libsidplay-devel BuildRequires: startup-notification-devel BuildRequires: libofa-devel -# disabled for now -#BuildRequires: cdparanoia-devel +BuildRequires: cdparanoia-devel BuildRequires: alsa-lib-devel BuildRequires: libmodplug-devel BuildRequires: gettext @@ -43,7 +42,8 @@ BuildRequires: libSM-devel BuildRequires: libtool BuildRequires: intltool -BuildRequires: libcdio-devel +#BuildRequires: libcdio-devel + %description BMPx is an audio player that features support for specifications like XDS DnD, XSPF and DBus. BMPx is highly interoperable and integrates well with other @@ -87,7 +87,7 @@ --disable-hal \ --enable-mp4v2 \ --enable-modplug \ - --without-cdparanoia + --with-cdparanoia # --enable-sid \ @@ -180,6 +180,12 @@ %changelog +* Tue Feb 24 2009 josef radinger - 0.40.14-10 +- cleanup + +* Mon Feb 23 2009 josef radinger - 0.40.14-9 +- reenable cdparanoia + * Sun Sep 14 2008 josef radinger - 0.40.14-8 - fix typo From caolanm at fedoraproject.org Thu Mar 5 08:40:54 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 08:40:54 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.14, 1.15 Message-ID: <20090305084054.AF99270116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12304 Modified Files: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch Log Message: defuzz patches openoffice.org-2.2.0.ooo68717.gstreamer.video.patch: Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 12 Feb 2009 14:25:02 -0000 1.14 +++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 5 Mar 2009 08:40:23 -0000 1.15 @@ -223,8 +223,8 @@ test_kde=yes test_cups=yes test_randr=yes -@@ -5688,6 +5689,26 @@ - AC_SUBST(JCOMMON_SERIALIZER_JAR) +@@ -5695,6 +5696,26 @@ + AC_SUBST(COMMONS_LOGGING_JAR) dnl =================================================================== +dnl Check whether the GStreamer libraries are available. From cheese at fedoraproject.org Thu Mar 5 08:42:37 2009 From: cheese at fedoraproject.org (josef radinger) Date: Thu, 5 Mar 2009 08:42:37 +0000 (UTC) Subject: rpms/bmpx/devel bmpx.spec,1.17,1.18 Message-ID: <20090305084237.EAF0370116@cvs1.fedora.phx.redhat.com> Author: cheese Update of /cvs/pkgs/rpms/bmpx/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12574 Modified Files: bmpx.spec Log Message: reenable cdparanoia Index: bmpx.spec =================================================================== RCS file: /cvs/pkgs/rpms/bmpx/devel/bmpx.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- bmpx.spec 24 Feb 2009 05:19:30 -0000 1.17 +++ bmpx.spec 5 Mar 2009 08:42:07 -0000 1.18 @@ -1,7 +1,7 @@ Summary: Beep Media Player eXperimental Name: bmpx Version: 0.40.14 -Release: 9%{?dist} +Release: 12%{?dist} License: GPLv2 Group: Applications/Multimedia @@ -9,6 +9,7 @@ Source: http://files.beep-media-player.org/releases/0.40/%{name}-%{version}.tar.bz2 Patch0: bmpx-libsoup24.patch Patch1: bmpx-hostnotfound.patch +Patch2: bmpx-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-c++ @@ -30,7 +31,7 @@ # BuildRequires: libsidplay-devel BuildRequires: startup-notification-devel BuildRequires: libofa-devel -##BuildRequires: cdparanoia-devel +BuildRequires: cdparanoia-devel BuildRequires: alsa-lib-devel BuildRequires: libmodplug-devel BuildRequires: gettext @@ -41,7 +42,7 @@ BuildRequires: dbus-glib-devel BuildRequires: libSM-devel BuildRequires: intltool -BuildRequires: libcdio-devel +#BuildRequires: libcdio-devel %description BMPx is an audio player that features support for specifications like XDS DnD, @@ -80,6 +81,7 @@ %setup -q %patch0 -p1 -b .libsoup24 %patch1 -p1 -b .hostnotfound +%patch2 -p1 -b .compile %build autoreconf -i -f @@ -88,7 +90,8 @@ --enable-mp4v2 \ --disable-sid \ --enable-modplug \ - --without-cdparanoia + --with-cdparanoia +# --without-cdparanoia # --enable-sid \ %{__make} %{?_smp_mflags} @@ -180,6 +183,16 @@ %changelog +* Tue Feb 24 2009 josef radinger - 0.40.14-12 +- fix compile error because of missing header-file +- but needs more + +* Tue Feb 24 2009 josef radinger - 0.40.14-11 +- specfile merge + +* Mon Feb 23 2009 josef radinger - 0.40.14-10 +- reenable cdparanoia + * Mon Feb 23 2009 Fedora Release Engineering - 0.40.14-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From xhorak at fedoraproject.org Thu Mar 5 08:43:32 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Thu, 5 Mar 2009 08:43:32 +0000 (UTC) Subject: rpms/xulrunner/F-10 .cvsignore, 1.65, 1.66 sources, 1.68, 1.69 xulrunner.spec, 1.142, 1.143 Message-ID: <20090305084332.6D47B70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/xulrunner/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12884 Modified Files: .cvsignore sources xulrunner.spec Log Message: Update to 1.9.0.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xulrunner/F-10/.cvsignore,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- .cvsignore 4 Feb 2009 15:41:07 -0000 1.65 +++ .cvsignore 5 Mar 2009 08:43:01 -0000 1.66 @@ -1 +1 @@ -xulrunner-1.9.0.6-source.tar.bz2 +xulrunner-1.9.0.7-source.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xulrunner/F-10/sources,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- sources 4 Feb 2009 15:41:07 -0000 1.68 +++ sources 5 Mar 2009 08:43:01 -0000 1.69 @@ -1 +1 @@ -1b6063d29fe9785b929a36f249866360 xulrunner-1.9.0.6-source.tar.bz2 +9875c9237b532009df8e91c3785539a3 xulrunner-1.9.0.7-source.tar.bz2 Index: xulrunner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xulrunner/F-10/xulrunner.spec,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- xulrunner.spec 26 Feb 2009 14:54:20 -0000 1.142 +++ xulrunner.spec 5 Mar 2009 08:43:01 -0000 1.143 @@ -7,8 +7,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.0.6 -Release: 2%{?dist} +Version: 1.9.0.7 +Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -423,6 +423,9 @@ #--------------------------------------------------------------------- %changelog +* Tue Mar 3 2009 Jan Horak - 1.9.0.7-1 +- Update to 1.9.0.7 + * Thu Feb 26 2009 Jan Horak - 1.9.0.6-2 - Fixed wrong version of Firefox when loading 'about:' as location (#453980). From xhorak at fedoraproject.org Thu Mar 5 08:45:54 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Thu, 5 Mar 2009 08:45:54 +0000 (UTC) Subject: rpms/xulrunner/F-9 .cvsignore, 1.54, 1.55 sources, 1.56, 1.57 xulrunner.spec, 1.136, 1.137 Message-ID: <20090305084554.8B3CC70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/xulrunner/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13489 Modified Files: .cvsignore sources xulrunner.spec Log Message: Update to 1.9.0.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xulrunner/F-9/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 4 Feb 2009 15:41:12 -0000 1.54 +++ .cvsignore 5 Mar 2009 08:45:23 -0000 1.55 @@ -1 +1 @@ -xulrunner-1.9.0.6-source.tar.bz2 +xulrunner-1.9.0.7-source.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xulrunner/F-9/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 4 Feb 2009 15:41:12 -0000 1.56 +++ sources 5 Mar 2009 08:45:24 -0000 1.57 @@ -1 +1 @@ -1b6063d29fe9785b929a36f249866360 xulrunner-1.9.0.6-source.tar.bz2 +9875c9237b532009df8e91c3785539a3 xulrunner-1.9.0.7-source.tar.bz2 Index: xulrunner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xulrunner/F-9/xulrunner.spec,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- xulrunner.spec 26 Feb 2009 14:50:16 -0000 1.136 +++ xulrunner.spec 5 Mar 2009 08:45:24 -0000 1.137 @@ -7,8 +7,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.0.6 -Release: 2%{?dist} +Version: 1.9.0.7 +Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -381,6 +381,9 @@ #--------------------------------------------------------------------- %changelog +* Tue Mar 3 2009 Jan Horak - 1.9.0.7-1 +- Update to 1.9.0.7 + * Thu Feb 26 2009 Jan Horak - 1.9.0.6-2 - Fixed wrong version of Firefox when loading 'about:' as location (#453980). From cheese at fedoraproject.org Thu Mar 5 08:45:59 2009 From: cheese at fedoraproject.org (josef radinger) Date: Thu, 5 Mar 2009 08:45:59 +0000 (UTC) Subject: rpms/bmpx/devel bmpx-compile.patch,NONE,1.1 Message-ID: <20090305084559.99BD270116@cvs1.fedora.phx.redhat.com> Author: cheese Update of /cvs/pkgs/rpms/bmpx/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13655 Added Files: bmpx-compile.patch Log Message: fix compile error bmpx-compile.patch: --- NEW FILE bmpx-compile.patch --- --- bmpx-0.40.14/src/uri.cc.orig 2008-04-06 01:49:24.000000000 +0200 +++ bmpx-0.40.14/src/uri.cc 2009-02-23 19:23:56.000000000 +0100 @@ -35,6 +35,7 @@ // BMPx is covered by. #include +#include #include #include #include From cheese at fedoraproject.org Thu Mar 5 08:47:54 2009 From: cheese at fedoraproject.org (josef radinger) Date: Thu, 5 Mar 2009 08:47:54 +0000 (UTC) Subject: rpms/bmpx/devel bmpx.spec,1.18,1.19 Message-ID: <20090305084754.B1DB670116@cvs1.fedora.phx.redhat.com> Author: cheese Update of /cvs/pkgs/rpms/bmpx/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14016 Modified Files: bmpx.spec Log Message: fix compile error Index: bmpx.spec =================================================================== RCS file: /cvs/pkgs/rpms/bmpx/devel/bmpx.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- bmpx.spec 5 Mar 2009 08:42:07 -0000 1.18 +++ bmpx.spec 5 Mar 2009 08:47:24 -0000 1.19 @@ -183,6 +183,9 @@ %changelog +* Thu Mar 5 2009 josef radinger - 0.40.14-13 +- needs even more + * Tue Feb 24 2009 josef radinger - 0.40.14-12 - fix compile error because of missing header-file - but needs more From cheese at fedoraproject.org Thu Mar 5 08:49:55 2009 From: cheese at fedoraproject.org (josef radinger) Date: Thu, 5 Mar 2009 08:49:55 +0000 (UTC) Subject: rpms/bmpx/devel bmpx.spec,1.19,1.20 Message-ID: <20090305084955.3394070116@cvs1.fedora.phx.redhat.com> Author: cheese Update of /cvs/pkgs/rpms/bmpx/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14392 Modified Files: bmpx.spec Log Message: update version number Index: bmpx.spec =================================================================== RCS file: /cvs/pkgs/rpms/bmpx/devel/bmpx.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- bmpx.spec 5 Mar 2009 08:47:24 -0000 1.19 +++ bmpx.spec 5 Mar 2009 08:49:24 -0000 1.20 @@ -1,7 +1,7 @@ Summary: Beep Media Player eXperimental Name: bmpx Version: 0.40.14 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2 Group: Applications/Multimedia @@ -185,6 +185,7 @@ %changelog * Thu Mar 5 2009 josef radinger - 0.40.14-13 - needs even more +- and i forgot to update the version-number * Tue Feb 24 2009 josef radinger - 0.40.14-12 - fix compile error because of missing header-file From caolanm at fedoraproject.org Thu Mar 5 08:51:42 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 08:51:42 +0000 (UTC) Subject: rpms/openoffice.org/devel .cvsignore, 1.210, 1.211 sources, 1.350, 1.351 Message-ID: <20090305085142.5DC6070116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14772 Modified Files: .cvsignore sources Log Message: Resolves: rhbz#488688 Punjabi Translations Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- .cvsignore 4 Mar 2009 23:41:00 -0000 1.210 +++ .cvsignore 5 Mar 2009 08:51:12 -0000 1.211 @@ -16,3 +16,4 @@ as-IN_DEV300_m40.sdf ta-090227.sdf OOO310_m4.tar.bz2 +Openoffice3.1-300m40-100per.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.350 retrieving revision 1.351 diff -u -r1.350 -r1.351 --- sources 4 Mar 2009 23:41:00 -0000 1.350 +++ sources 5 Mar 2009 08:51:12 -0000 1.351 @@ -15,4 +15,5 @@ bdc3b2b8b90ac1879f216cfa3c50d7e1 hi-IN-D300-m40.tar.gz be8d6866609e7aa7282220c0f469b279 as-IN_DEV300_m40.sdf ab6765f3f969e0c676bc13bc9960f60c ta-090227.sdf +09f5e89995521ea566a6d44dd521ff55 Openoffice3.1-300m40-100per.tar.bz2 a133aed113ff6ce82e20583e39140b98 OOO310_m4.tar.bz2 From dlehman at fedoraproject.org Thu Mar 5 08:54:52 2009 From: dlehman at fedoraproject.org (David Lehman) Date: Thu, 5 Mar 2009 08:54:52 +0000 (UTC) Subject: rpms/anaconda/devel late.patch,NONE,1.1 anaconda.spec,1.761,1.762 Message-ID: <20090305085452.365A370116@cvs1.fedora.phx.redhat.com> Author: dlehman Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15340 Modified Files: anaconda.spec Added Files: late.patch Log Message: * Thu Mar 5 2009 Dave Lehman - 11.5.0.24-3 - Fix booty's desire to import fsset. - Fix attempt to set read-only attr "removable" in DiskDevice.__init__ late.patch: --- NEW FILE late.patch --- diff -uN playpen/booty/alpha.py anaconda/booty/alpha.py --- playpen/booty/alpha.py 2009-03-04 20:44:42.000000000 -0600 +++ anaconda/booty/alpha.py 2009-03-05 02:00:39.000000000 -0600 @@ -3,11 +3,11 @@ from booty import BootyNoKernelWarning from bootloaderInfo import * -import fsset +from util import getDiskPart class alphaBootloaderInfo(bootloaderInfo): def wholeDevice (self, path): - (device, foo) = fsset.getDiskPart(path) + (device, foo) = getDiskPart(path) return device def partitionNum (self, path): diff -uN playpen/booty/bootloaderInfo.py anaconda/booty/bootloaderInfo.py --- playpen/booty/bootloaderInfo.py 2009-03-04 20:44:42.000000000 -0600 +++ anaconda/booty/bootloaderInfo.py 2009-03-05 02:00:00.000000000 -0600 @@ -29,13 +29,13 @@ from rhpl.translate import _, N_ from flags import flags -from fsset import getDiskPart import iutil import isys from product import * import booty import checkbootloader +from util import getDiskPart if rhpl.getArch() not in ("s390", "s390x"): import block diff -uN playpen/booty/checkbootloader.py anaconda/booty/checkbootloader.py --- playpen/booty/checkbootloader.py 2009-03-04 20:44:42.000000000 -0600 +++ anaconda/booty/checkbootloader.py 2009-03-05 02:00:08.000000000 -0600 @@ -19,7 +19,7 @@ import string import rhpl -from fsset import getDiskPart +from util import getDiskPart import iutil grubConfigFile = "/etc/grub.conf" diff -uN playpen/booty/ppc.py anaconda/booty/ppc.py --- playpen/booty/ppc.py 2009-03-04 20:44:42.000000000 -0600 +++ anaconda/booty/ppc.py 2009-03-05 01:59:34.000000000 -0600 @@ -2,8 +2,8 @@ import os from booty import BootyNoKernelWarning +from util import getDiskPart from bootloaderInfo import * -import fsset import iutil import rhpl diff -uN playpen/booty/util.py anaconda/booty/util.py --- playpen/booty/util.py 1969-12-31 18:00:00.000000000 -0600 +++ anaconda/booty/util.py 2009-03-05 02:29:57.000000000 -0600 @@ -0,0 +1,33 @@ +import string + +def getDiskPart(dev): + cut = len(dev) + if (dev.startswith('rd/') or dev.startswith('ida/') or + dev.startswith('cciss/') or dev.startswith('sx8/') or + dev.startswith('mapper/') or dev.startswith('mmcblk')): + if dev[-2] == 'p': + cut = -1 + elif dev[-3] == 'p': + cut = -2 + else: + if dev[-2] in string.digits: + cut = -2 + elif dev[-1] in string.digits: + cut = -1 + + name = dev[:cut] + + # hack off the trailing 'p' from /dev/cciss/*, for example + if name[-1] == 'p': + for letter in name: + if letter not in string.letters and letter != "/": + name = name[:-1] + break + + if cut < 0: + partNum = int(dev[cut:]) - 1 + else: + partNum = None + + return (name, partNum) + diff -uN playpen/booty/x86.py anaconda/booty/x86.py --- playpen/booty/x86.py 2009-03-04 20:44:42.000000000 -0600 +++ anaconda/booty/x86.py 2009-03-05 01:59:24.000000000 -0600 @@ -2,9 +2,9 @@ import string from booty import BootyNoKernelWarning +from util import getDiskPart from bootloaderInfo import * import checkbootloader -import fsset import iutil import rhpl @@ -107,7 +107,7 @@ cmds = [] for bootDev in bootDevs: gtPart = self.getMatchingPart(bootDev, grubTarget) - gtDisk = self.grubbyPartitionName(fsset.getDiskPart(gtPart)[0]) + gtDisk = self.grubbyPartitionName(getDiskPart(gtPart)[0]) bPart = self.grubbyPartitionName(bootDev) cmd = "root %s\n" % (bPart,) @@ -316,7 +316,7 @@ devs = usedDevs.keys() usedDevs = {} for dev in devs: - drive = fsset.getDiskPart(dev)[0] + drive = getDiskPart(dev)[0] if usedDevs.has_key(drive): continue usedDevs[drive] = 1 @@ -356,10 +356,10 @@ return "" def getMatchingPart(self, bootDev, target): - bootName, bootPartNum = fsset.getDiskPart(bootDev) + bootName, bootPartNum = getDiskPart(bootDev) devices = self.getPhysicalDevices(target) for device in devices: - name, partNum = fsset.getDiskPart(device) + name, partNum = getDiskPart(device) if name == bootName: return device return devices[0] @@ -368,7 +368,7 @@ return "hd%d" % self.drivelist.index(name) def grubbyPartitionName(self, dev): - (name, partNum) = fsset.getDiskPart(dev) + (name, partNum) = getDiskPart(dev) if partNum != None: return "(%s,%d)" % (self.grubbyDiskName(name), partNum) else: @@ -478,7 +478,7 @@ grubbyRootPart = self.grubbyPartitionName(rootDevs[0]) for rootDev in rootDevs: - testGrubbyRootDev = fsset.getDiskPart(rootDev)[0] + testGrubbyRootDev = getDiskPart(rootDev)[0] testGrubbyRootDev = self.grubbyPartitionName(testGrubbyRootDev) if grubbyStage1Dev == testGrubbyRootDev: diff --git a/storage/devices.py b/storage/devices.py index 27d9a1f..14fbb11 100644 --- a/storage/devices.py +++ b/storage/devices.py @@ -594,7 +594,6 @@ class DiskDevice(StorageDevice): self.partedDevice = None self.partedDisk = None - self.removable = False log.debug("looking up parted Device: %s" % self.path) self.partedDevice = parted.Device(path=self.path) if not self.partedDevice: Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.761 retrieving revision 1.762 diff -u -r1.761 -r1.762 --- anaconda.spec 5 Mar 2009 06:22:22 -0000 1.761 +++ anaconda.spec 5 Mar 2009 08:54:21 -0000 1.762 @@ -3,7 +3,7 @@ Summary: Graphical system installer Name: anaconda Version: 11.5.0.24 -Release: 2 +Release: 3 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -16,6 +16,7 @@ # Patch for EFI CDs Patch0: anaconda-11.5.0.23-efi-cds.patch +Patch1: late.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -157,6 +158,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 -b .late %build %{__make} depend @@ -213,6 +215,10 @@ %endif %changelog +* Thu Mar 5 2009 Dave Lehman - 11.5.0.24-3 +- Fix booty's desire to import fsset. +- Fix attempt to set read-only attr "removable" in DiskDevice.__init__ + * Thu Mar 05 2009 Peter Jones - 11.5.0.24-2 - Add EFI boot.iso generation. From caolanm at fedoraproject.org Thu Mar 5 08:59:53 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 08:59:53 +0000 (UTC) Subject: rpms/openoffice.org/devel workspace.transogl03redux.patch,1.2,1.3 Message-ID: <20090305085953.6729470116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16160 Modified Files: workspace.transogl03redux.patch Log Message: defuzz patches workspace.transogl03redux.patch: Index: workspace.transogl03redux.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.transogl03redux.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- workspace.transogl03redux.patch 12 Feb 2009 16:33:31 -0000 1.2 +++ workspace.transogl03redux.patch 5 Mar 2009 08:59:22 -0000 1.3 @@ -3028,7 +3028,7 @@ -[ --enable-ogltrans enables the build of the OGLTrans extension -],,) AC_ARG_ENABLE(report-builder, - [ --enable-report-builder disables the build of the Report Builder extension + [ --enable-report-builder enables the build of the Report Builder extension ],,) @@ -5331,7 +5327,7 @@ dnl Check whether the OpenGL libraries are available @@ -3632,8 +3632,8 @@ =================================================================== --- setup_native/source/packinfo/packinfo_office.txt (.../tags/DEV300_m41) (revision 267662) +++ setup_native/source/packinfo/packinfo_office.txt (.../cws/transogl03redux) (revision 267662) -@@ -875,3 +875,17 @@ - packageversion = "0.5.0.2" +@@ -906,3 +906,17 @@ + packageversion = "0.5.2" End +Start From ovasik at fedoraproject.org Thu Mar 5 09:07:33 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Thu, 5 Mar 2009 09:07:33 +0000 (UTC) Subject: rpms/tar/devel tar-1.19-xattrs-conf.patch, 1.5, 1.6 tar-1.19-xattrs.patch, 1.8, 1.9 tar-1.21-testsuite.patch, 1.1, NONE Message-ID: <20090305090733.A209670116@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/tar/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17373 Modified Files: tar-1.19-xattrs-conf.patch tar-1.19-xattrs.patch Removed Files: tar-1.21-testsuite.patch Log Message: rediffed to defuzz :( tar-1.19-xattrs-conf.patch: Index: tar-1.19-xattrs-conf.patch =================================================================== RCS file: /cvs/extras/rpms/tar/devel/tar-1.19-xattrs-conf.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tar-1.19-xattrs-conf.patch 5 Mar 2009 08:34:12 -0000 1.5 +++ tar-1.19-xattrs-conf.patch 5 Mar 2009 09:07:03 -0000 1.6 @@ -1,7 +1,7 @@ -diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin ---- tar-1.19/config.hin.xattrs-conf 2007-10-10 13:01:17.000000000 +0200 -+++ tar-1.19/config.hin 2007-12-17 11:47:38.000000000 +0100 -@@ -121,6 +121,9 @@ +diff -urNp tar-1.22-orig/config.hin tar-1.22/config.hin +--- tar-1.22-orig/config.hin 2009-03-05 08:08:07.000000000 +0100 ++++ tar-1.22/config.hin 2009-03-05 09:57:06.000000000 +0100 +@@ -131,6 +131,9 @@ */ #undef HAVE_ALLOCA_H @@ -11,7 +11,7 @@ /* Define to 1 if you have the `btowc' function. */ #undef HAVE_BTOWC -@@ -354,12 +357,21 @@ +@@ -372,12 +375,21 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FEATURES_H @@ -33,7 +33,7 @@ /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ #undef HAVE_FSEEKO -@@ -399,6 +411,9 @@ +@@ -423,6 +435,9 @@ /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY @@ -43,7 +43,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_GRP_H -@@ -444,15 +459,30 @@ +@@ -468,15 +483,30 @@ /* Define to 1 if you have the `lchown' function. */ #undef HAVE_LCHOWN @@ -55,10 +55,10 @@ + /* Define to 1 if you have the header file. */ #undef HAVE_LIBINTL_H -+ + +/* Define to 1 if you have the `selinux' library (-lselinux). */ +#undef HAVE_LIBSELINUX - ++ /* Define to 1 if you have the header file. */ #undef HAVE_LINEWRAP_H @@ -74,7 +74,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H -@@ -462,6 +492,9 @@ +@@ -486,6 +516,9 @@ /* Define to 1 if the system has the type `long long int'. */ #undef HAVE_LONG_LONG_INT @@ -84,7 +84,7 @@ /* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT -@@ -568,12 +601,18 @@ +@@ -589,12 +622,18 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SEARCH_H @@ -103,7 +103,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SGTTY_H -@@ -713,6 +752,9 @@ +@@ -734,6 +773,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYSEXITS_H @@ -113,7 +113,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_BITYPES_H -@@ -861,6 +903,9 @@ +@@ -891,6 +933,9 @@ /* Define if utimes works properly. */ #undef HAVE_WORKING_UTIMES @@ -123,10 +123,10 @@ /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL -diff -up tar-1.19/configure.xattrs-conf tar-1.19/configure ---- tar-1.19/configure.xattrs-conf 2007-10-10 13:00:16.000000000 +0200 -+++ tar-1.19/configure 2007-12-17 11:47:14.000000000 +0100 -@@ -1963,6 +1964,9 @@ ac_header_list="$ac_header_list sys/tpri +diff -urNp tar-1.22-orig/configure tar-1.22/configure +--- tar-1.22-orig/configure 2009-03-05 08:05:20.000000000 +0100 ++++ tar-1.22/configure 2009-03-05 09:57:06.000000000 +0100 +@@ -2127,6 +2127,9 @@ ac_header_list="$ac_header_list sys/tpri ac_header_list="$ac_header_list sys/tape.h" ac_header_list="$ac_header_list unistd.h" ac_header_list="$ac_header_list locale.h" @@ -136,7 +136,7 @@ ac_func_list="$ac_func_list flockfile" ac_func_list="$ac_func_list funlockfile" ac_header_list="$ac_header_list features.h" -@@ -5614,7 +5633,14 @@ return strerror (); +@@ -6022,7 +6025,14 @@ return strerror (); return 0; } _ACEOF @@ -152,7 +152,7 @@ if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -@@ -5632,25 +5658,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec +@@ -6040,25 +6050,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then @@ -197,7 +197,7 @@ { echo "$as_me:$LINENO: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6; } -@@ -32646,6 +32690,257 @@ _ACEOF +@@ -38773,6 +38793,257 @@ _ACEOF fi done @@ -455,7 +455,7 @@ { echo "$as_me:$LINENO: checking whether getgrgid is declared" >&5 echo $ECHO_N "checking whether getgrgid is declared... $ECHO_C" >&6; } if test "${ac_cv_have_decl_getgrgid+set}" = set; then -@@ -34374,6 +34669,296 @@ fi +@@ -40571,6 +40842,296 @@ fi done @@ -752,10 +752,10 @@ { echo "$as_me:$LINENO: checking for iconv_t" >&5 echo $ECHO_N "checking for iconv_t... $ECHO_C" >&6; } if test "${ac_cv_type_iconv_t+set}" = set; then -diff -urNp tar-1.20-orig/src/Makefile.in tar-1.20/src/Makefile.in ---- tar-1.20-orig/src/Makefile.in 2008-04-14 14:04:00.000000000 +0200 -+++ tar-1.20/src/Makefile.in 2008-05-26 18:18:42.000000000 +0200 -@@ -137,7 +137,8 @@ am_tar_OBJECTS = buffer.$(OBJEXT) checkp +diff -urNp tar-1.22-orig/src/Makefile.in tar-1.22/src/Makefile.in +--- tar-1.22-orig/src/Makefile.in 2009-03-05 08:05:26.000000000 +0100 ++++ tar-1.22/src/Makefile.in 2009-03-05 09:57:06.000000000 +0100 +@@ -143,7 +143,8 @@ am_tar_OBJECTS = buffer.$(OBJEXT) checkp extract.$(OBJEXT) xheader.$(OBJEXT) incremen.$(OBJEXT) \ list.$(OBJEXT) misc.$(OBJEXT) names.$(OBJEXT) sparse.$(OBJEXT) \ suffix.$(OBJEXT) system.$(OBJEXT) tar.$(OBJEXT) \ @@ -765,7 +765,7 @@ tar_OBJECTS = $(am_tar_OBJECTS) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = ../lib/libtar.a $(am__DEPENDENCIES_1) \ -@@ -526,7 +527,7 @@ sysconfdir = @sysconfdir@ +@@ -653,7 +654,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -774,7 +774,7 @@ tar_SOURCES = \ buffer.c\ checkpoint.c\ -@@ -545,11 +546,12 @@ tar_SOURCES = \ +@@ -672,11 +673,12 @@ tar_SOURCES = \ tar.c\ transform.c\ update.c\ @@ -789,7 +789,7 @@ all: all-am .SUFFIXES: -@@ -649,6 +651,7 @@ distclean-compile: +@@ -776,6 +778,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/transform.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/update.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/utf8.Po at am__quote@ tar-1.19-xattrs.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 tar-1.19-xattrs.patch Index: tar-1.19-xattrs.patch =================================================================== RCS file: /cvs/extras/rpms/tar/devel/tar-1.19-xattrs.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- tar-1.19-xattrs.patch 5 Jan 2009 16:13:30 -0000 1.8 +++ tar-1.19-xattrs.patch 5 Mar 2009 09:07:03 -0000 1.9 @@ -1,6 +1,6 @@ -diff -up tar-1.17/configure.ac.xattrs tar-1.17/configure.ac ---- tar-1.17/configure.ac.xattrs 2007-06-08 10:28:04.000000000 +0200 -+++ tar-1.17/configure.ac 2007-12-10 15:31:54.000000000 +0100 +diff -urp tar-1.22-orig/configure.ac tar-1.22/configure.ac +--- tar-1.22-orig/configure.ac 2009-03-05 08:01:58.000000000 +0100 ++++ tar-1.22/configure.ac 2009-03-05 09:45:42.000000000 +0100 @@ -40,7 +40,7 @@ AC_CHECK_HEADERS_ONCE(fcntl.h linux/fd.h sys/param.h sys/device.h sys/filio.h sys/gentape.h \ sys/inet.h sys/io/trioctl.h \ @@ -33,9 +33,9 @@ AC_CHECK_TYPE(iconv_t,:, AC_DEFINE(iconv_t, int, [Conversion descriptor type]), -diff -up tar-1.17/doc/tar.texi.xattrs tar-1.17/doc/tar.texi ---- tar-1.17/doc/tar.texi.xattrs 2007-06-08 10:25:19.000000000 +0200 -+++ tar-1.17/doc/tar.texi 2007-12-10 15:31:54.000000000 +0100 +diff -urp tar-1.22-orig/doc/tar.texi tar-1.22/doc/tar.texi +--- tar-1.22-orig/doc/tar.texi 2009-03-05 08:04:13.000000000 +0100 ++++ tar-1.22/doc/tar.texi 2009-03-05 09:45:42.000000000 +0100 @@ -2345,6 +2345,10 @@ Normally when creating an archive, @comm @samp{/} from member names. This option disables that behavior. @xref{absolute}. @@ -47,7 +47,7 @@ @opsummary{after-date} @item --after-date -@@ -2838,6 +2842,10 @@ contents have changed (as opposed to jus +@@ -2844,6 +2848,10 @@ contents have changed (as opposed to jus also back up files for which any status information has changed). @xref{after}. @@ -58,7 +58,7 @@ @opsummary{no-anchored} @item --no-anchored An exclude pattern can match any subsequence of the name's components. -@@ -2900,11 +2908,21 @@ When extracting an archive, subtract the +@@ -2919,11 +2927,21 @@ When extracting an archive, subtract the the permissions specified in the archive. This is the default behavior for ordinary users. @@ -80,7 +80,7 @@ @opsummary{no-wildcards} @item --no-wildcards Do not use wildcards. -@@ -3132,6 +3150,11 @@ locations. Usually @command{tar} determ +@@ -3151,6 +3169,11 @@ locations. Usually @command{tar} determ the archive can be seeked or not. This option is intended for use in cases when such recognition fails. @@ -92,7 +92,7 @@ @opsummary{show-defaults} @item --show-defaults -@@ -3328,6 +3351,11 @@ Used in conjunction with @option{--multi +@@ -3349,6 +3372,11 @@ Used in conjunction with @option{--multi keep track of which volume of a multi-volume archive it is working in @var{file}. @xref{volno-file}. @@ -104,7 +104,7 @@ @opsummary{wildcards} @item --wildcards Use wildcards when matching member names with patterns. -@@ -7845,6 +7845,8 @@ implementation able to read @samp{ustar} +@@ -8350,6 +8378,8 @@ implementation able to read @samp{ustar} most @samp{posix} archives as well, with the only exception that any additional information (such as long file names etc.) will in such case be extracted as plain text files along with the files it refers to. @@ -113,9 +113,9 @@ This archive format will be the default format for future versions of @GNUTAR{}. -@@ -8333,6 +8335,51 @@ It is equivalent to @option{--same-permi - @FIXME{I do not see the purpose of such an option. (Neither I. FP.) - Neither do I. --Sergey} +@@ -8902,6 +8932,51 @@ Same as both @option{--same-permissions} + + This option is deprecated, and will be removed in @GNUTAR{} version 1.23. + at opindex acls + at item --acls @@ -165,10 +165,10 @@ @end table @node Portability -diff -up tar-1.17/src/common.h.xattrs tar-1.17/src/common.h ---- tar-1.17/src/common.h.xattrs 2007-06-08 10:14:42.000000000 +0200 -+++ tar-1.17/src/common.h 2007-12-10 15:31:54.000000000 +0100 -@@ -255,6 +255,15 @@ GLOBAL int same_owner_option; +diff -urp tar-1.22-orig/src/common.h tar-1.22/src/common.h +--- tar-1.22-orig/src/common.h 2008-11-30 13:30:29.000000000 +0100 ++++ tar-1.22/src/common.h 2009-03-05 09:45:42.000000000 +0100 +@@ -248,6 +248,15 @@ GLOBAL int same_owner_option; /* If positive, preserve permissions when extracting. */ GLOBAL int same_permissions_option; @@ -184,7 +184,7 @@ /* When set, strip the given number of file name components from the file name before extracting */ GLOBAL size_t strip_name_components; -@@ -666,6 +675,9 @@ extern char *output_start; +@@ -673,6 +682,9 @@ extern char *output_start; void update_archive (void); @@ -194,7 +194,7 @@ /* Module xheader.c. */ void xheader_init (struct xheader *xhdr); -@@ -687,6 +699,12 @@ bool xheader_string_end (struct xheader +@@ -694,6 +706,12 @@ bool xheader_string_end (struct xheader bool xheader_keyword_deleted_p (const char *kw); char *xheader_format_name (struct tar_stat_info *st, const char *fmt, size_t n); @@ -207,1061 +207,1233 @@ /* Module system.c */ -diff -up /dev/null tar-1.17/src/xattrs.c ---- /dev/null 2007-12-10 11:30:31.504001819 +0100 -+++ tar-1.17/src/xattrs.c 2007-12-10 15:31:54.000000000 +0100 -@@ -0,0 +1,491 @@ -+/* Create a tar archive. -+ -+ Copyright (C) 2006 Free Software Foundation, Inc. -+ -+ Written by James Antill, on 2006-07-27. -+ -+ This program is free software; you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published by the -+ Free Software Foundation; either version 2, or (at your option) any later -+ version. -+ -+ This program is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -+ Public License for more details. -+ -+ You should have received a copy of the GNU General Public License along -+ with this program; if not, write to the Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -+ -+#include -+ -+#include -+ -+#include "common.h" -+ -+ -+#ifndef HAVE_SELINUX_SELINUX_H -+# undef HAVE_LIBSELINUX -+#endif -+ -+#ifndef HAVE_ATTR_XATTR_H -+# undef HAVE_XATTRS -+#endif -+ -+#ifndef HAVE_SYS_ACL_H -+# undef HAVE_LIBACL -+#endif -+ -+#ifdef HAVE_SELINUX_SELINUX_H -+# include -+#endif +diff -urp tar-1.22-orig/src/create.c tar-1.22/src/create.c +--- tar-1.22-orig/src/create.c 2008-10-30 11:58:04.000000000 +0100 ++++ tar-1.22/src/create.c 2009-03-05 09:45:42.000000000 +0100 +@@ -24,6 +24,7 @@ + #include + + #include "common.h" + -+#ifdef HAVE_ATTR_XATTR_H -+# include -+#endif + #include + + struct link +@@ -944,6 +945,30 @@ start_header (struct tar_stat_info *st) + GNAME_TO_CHARS (st->gname, header->header.gname); + } + ++ if (archive_format == POSIX_FORMAT) ++ { ++ if (acls_option > 0) ++ { ++ if (st->acls_a_ptr) ++ xheader_store ("SCHILY.acl.access", st, NULL); ++ if (st->acls_d_ptr) ++ xheader_store ("SCHILY.acl.default", st, NULL); ++ } ++ if ((selinux_context_option > 0) && st->cntx_name) [...2069 lines suppressed...] ++ st->xattr_map[scan].xval_len); ++ ++ ++scan; + } ++#endif + } ++} + - return header; - } - -@@ -1572,6 +1597,10 @@ dump_file0 (struct tar_stat_info *st, co - } - } - -+ xattrs_acls_get(st, p, fd, !is_dir); -+ xattrs_selinux_get(st, p, fd); -+ xattrs_xattrs_get(st, p, fd); -+ - if (is_dir) - { - const char *tag_file_name; diff -up /dev/null tar-1.17/src/xattrs.h --- /dev/null 2007-12-10 11:30:31.504001819 +0100 +++ tar-1.17/src/xattrs.h 2007-12-10 15:31:54.000000000 +0100 @@ -1280,174 +1452,3 @@ + char const *file_name, char typeflag); +extern void xattrs_xattrs_set(struct tar_stat_info const *st, + char const *file_name, char typeflag); -diff -up tar-1.17/src/tar.h.xattrs tar-1.17/src/tar.h ---- tar-1.17/src/tar.h.xattrs 2007-06-01 12:17:10.000000000 +0200 -+++ tar-1.17/src/tar.h 2007-12-10 15:31:54.000000000 +0100 -@@ -276,6 +276,14 @@ struct xheader - uintmax_t string_length; - }; - -+/* Information about xattrs for a file. */ -+struct xattr_array -+ { -+ char *xkey; -+ char *xval_ptr; -+ size_t xval_len; -+ }; -+ - struct tar_stat_info - { - char *orig_file_name; /* name of file read from the archive header */ -@@ -287,6 +295,15 @@ struct tar_stat_info - - char *uname; /* user name of owner */ - char *gname; /* group name of owner */ -+ -+ char *cntx_name; /* SELinux context for the current archive entry. */ -+ -+ char *acls_a_ptr; /* Access ACLs for the current archive entry. */ -+ size_t acls_a_len; /* Access ACLs for the current archive entry. */ -+ -+ char *acls_d_ptr; /* Default ACLs for the current archive entry. */ -+ size_t acls_d_len; /* Default ACLs for the current archive entry. */ -+ - struct stat stat; /* regular filesystem stat */ - - /* STAT doesn't always have access, data modification, and status -@@ -309,6 +326,9 @@ struct tar_stat_info - size_t sparse_map_size; /* Size of the sparse map */ - struct sp_array *sparse_map; - -+ size_t xattr_map_size; /* Size of the xattr map */ -+ struct xattr_array *xattr_map; -+ - /* Extended headers */ - struct xheader xhdr; - ---- tar-1.19/src/extract.c.xattrs 2007-08-26 10:56:55.000000000 +0200 -+++ tar-1.19/src/extract.c 2007-12-17 10:32:56.000000000 +0100 -@@ -69,6 +69,13 @@ struct delayed_set_stat - mode_t invert_permissions; - enum permstatus permstatus; - bool after_links; -+ char *cntx_name; -+ char *acls_a_ptr; -+ size_t acls_a_len; -+ char *acls_d_ptr; -+ size_t acls_d_len; -+ size_t xattr_map_size; /* Size of the xattr map */ -+ struct xattr_array *xattr_map; - char file_name[1]; - }; - -@@ -96,6 +103,18 @@ struct delayed_link - hard-linked together. */ - struct string_list *sources; - -+ /* SELinux context */ -+ char *cntx_name; -+ -+ /* ACLs */ -+ char *acls_a_ptr; -+ size_t acls_a_len; -+ char *acls_d_ptr; -+ size_t acls_d_len; -+ -+ size_t xattr_map_size; /* Size of the xattr map */ -+ struct xattr_array *xattr_map; -+ - /* The desired target of the desired link. */ - char target[1]; - }; -@@ -276,6 +295,10 @@ set_stat (char const *file_name, - give files away. */ - } - -+ xattrs_acls_set(st, file_name, typeflag); -+ xattrs_selinux_set(st, file_name, typeflag); -+ xattrs_xattrs_set(st, file_name, typeflag); -+ - if (0 < same_owner_option && permstatus != INTERDIR_PERMSTATUS) - { - /* When lchown exists, it should be used to change the attributes of -@@ -352,6 +375,29 @@ delay_set_stat (char const *file_name, s - data->invert_permissions = invert_permissions; - data->permstatus = permstatus; - data->after_links = 0; -+ data->cntx_name = NULL; -+ assign_string (&data->cntx_name, st->cntx_name); -+ if (st->acls_a_ptr) -+ { -+ data->acls_a_ptr = xmemdup(st->acls_a_ptr, st->acls_a_len + 1); -+ data->acls_a_len = st->acls_a_len; -+ } -+ else -+ { -+ data->acls_a_ptr = NULL; -+ data->acls_a_len = 0; -+ } -+ if (st->acls_d_ptr) -+ { -+ data->acls_d_ptr = xmemdup(st->acls_d_ptr, st->acls_d_len + 1); -+ data->acls_d_len = st->acls_d_len; -+ } -+ else -+ { -+ data->acls_d_ptr = NULL; -+ data->acls_d_len = 0; -+ } -+ xheader_xattr_copy (st, &data->xattr_map, &data->xattr_map_size); - strcpy (data->file_name, file_name); - delayed_set_stat_head = data; - } -@@ -599,11 +639,22 @@ apply_nonancestor_delayed_set_stat (char - sb.stat.st_gid = data->gid; - sb.atime = data->atime; - sb.mtime = data->mtime; -+ sb.cntx_name = data->cntx_name; -+ sb.acls_a_ptr = data->acls_a_ptr; -+ sb.acls_a_len = data->acls_a_len; -+ sb.acls_d_ptr = data->acls_d_ptr; -+ sb.acls_d_len = data->acls_d_len; -+ sb.xattr_map = data->xattr_map; -+ sb.xattr_map_size = data->xattr_map_size; - set_stat (data->file_name, &sb, cur_info, - data->invert_permissions, data->permstatus, DIRTYPE); - } - - delayed_set_stat_head = data->next; -+ xheader_xattr_free (data->xattr_map, data->xattr_map_size); -+ free (data->cntx_name); -+ free (data->acls_a_ptr); -+ free (data->acls_d_ptr); - free (data); - } - } -@@ -882,6 +933,13 @@ create_placeholder_file (char *file_name - + strlen (file_name) + 1); - p->sources->next = 0; - strcpy (p->sources->string, file_name); -+ p->cntx_name = NULL; -+ p->acls_a_ptr = NULL; -+ p->acls_a_len = 0; -+ p->acls_d_ptr = NULL; -+ p->acls_d_len = 0; -+ p->xattr_map = NULL; -+ p->xattr_map_size = 0; - strcpy (p->target, current_stat_info.link_name); - - h = delayed_set_stat_head; -@@ -1291,6 +1349,13 @@ apply_delayed_links (void) - struct tar_stat_info st1; - st1.stat.st_uid = ds->uid; - st1.stat.st_gid = ds->gid; -+ st1.cntx_name = ds->cntx_name; -+ st1.acls_a_ptr = ds->acls_a_ptr; -+ st1.acls_a_len = ds->acls_a_len; -+ st1.acls_d_ptr = ds->acls_d_ptr; -+ st1.acls_d_len = ds->acls_d_len; -+ st1.xattr_map = ds->xattr_map; -+ st1.xattr_map_size = ds->xattr_map_size; - set_stat (source, &st1, NULL, 0, 0, SYMTYPE); - valid_source = source; - } --- tar-1.21-testsuite.patch DELETED --- From mmaslano at fedoraproject.org Thu Mar 5 09:11:04 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Thu, 5 Mar 2009 09:11:04 +0000 (UTC) Subject: rpms/tk/F-10 tk-8.5.6-segv_due_XCreateIC.patch, NONE, 1.1 tk.spec, 1.57, 1.58 Message-ID: <20090305091104.76E9A70116@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/tk/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17991 Modified Files: tk.spec Added Files: tk-8.5.6-segv_due_XCreateIC.patch Log Message: * Thu Mar 5 2009 Marcela Ma??l????ov?? - 1:8.5.3-5 - 488453 fix XGetICValues. Visible only in Gnome. tk-8.5.6-segv_due_XCreateIC.patch: --- NEW FILE tk-8.5.6-segv_due_XCreateIC.patch --- diff -up tk8.5.6/generic/tkEvent.c.seg tk8.5.6/generic/tkEvent.c --- tk8.5.6/generic/tkEvent.c.seg 2008-08-05 22:31:53.000000000 +0200 +++ tk8.5.6/generic/tkEvent.c 2009-02-23 08:14:02.000000000 +0100 @@ -359,6 +359,11 @@ CreateXIC( XFree(preedit_attlist); } + if (winPtr->inputContext == NULL) { + /* XCreateIC failed. */ + return; + } + /* * Adjust the window's event mask if the IM requires it. */ Index: tk.spec =================================================================== RCS file: /cvs/pkgs/rpms/tk/F-10/tk.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- tk.spec 6 Aug 2008 07:50:19 -0000 1.57 +++ tk.spec 5 Mar 2009 09:10:33 -0000 1.58 @@ -4,7 +4,7 @@ Summary: The graphical toolkit for the Tcl scripting language Name: tk Version: %{vers} -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 License: TCL Group: Development/Languages @@ -24,6 +24,7 @@ Patch1: tk8.5-make.patch Patch2: tk8.5-conf.patch Patch3: genericevent.patch +Patch4: tk-8.5.6-segv_due_XCreateIC.patch %description When paired with the Tcl scripting language, Tk provides a fast and powerful @@ -48,6 +49,7 @@ %patch1 -p1 -b .make %patch2 -p1 -b .conf %patch3 -p1 -b .crash1 +%patch4 -p1 -b .crash2 %build cd unix @@ -115,6 +117,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 5 2009 Marcela Ma??l????ov?? - 1:8.5.3-5 +- 488453 fix XGetICValues. Visible only in Gnome. + * Wed Aug 6 2008 Marcela Maslanova - 1:8.5.3-4 - rewrite patch once more - the same way how upstream fix it From caolanm at fedoraproject.org Thu Mar 5 09:14:44 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 09:14:44 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1846,1.1847 Message-ID: <20090305091444.7134F70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18534 Modified Files: openoffice.org.spec Log Message: report-builder will be broken until rhbz#474391 is resolved Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1846 retrieving revision 1.1847 diff -u -r1.1846 -r1.1847 --- openoffice.org.spec 4 Mar 2009 23:42:17 -0000 1.1846 +++ openoffice.org.spec 5 Mar 2009 09:14:13 -0000 1.1847 @@ -1618,7 +1618,10 @@ --enable-gio --enable-gstreamer --enable-symbols --enable-lockdown \ --enable-evolution2 --enable-cairo --enable-dbus --enable-opengl \ --enable-minimizer --enable-presenter-console --enable-pdfimport \ - --enable-wiki-publisher --enable-report-builder --enable-vba \ + --enable-wiki-publisher --enable-vba --enable-report-builder \ + --with-jfreereport-jar=/usr/share/java/pentaho-reporting-flow-engine.jar \ + --with-libserializer-jar=/usr/share/java/jcommon-serializer.jar \ + --with-libbase-jar=/dev/null \ --with-vba-package-format="builtin" --with-system-libs \ --with-system-headers --with-system-jfreereport --with-system-apache-commons \ --with-system-mozilla --with-system-libtextcat --with-system-redland \ @@ -4107,6 +4110,7 @@ - drop integrated workspace.gfbcrash.patch - drop integrated workspace.ooo31gsl2.patch - drop integrated openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch +- report-builder will be broken until rhbz#474391 is resolved * Tue Mar 03 2009 Caol??n McNamara - 1:3.1.0-3.4 - Resolves: rhbz#488228 Assamese Translations From kwizart at fedoraproject.org Thu Mar 5 09:19:26 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Thu, 5 Mar 2009 09:19:26 +0000 (UTC) Subject: rpms/elektra/devel elektra.spec, 1.8, 1.9 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 Message-ID: <20090305091926.B946470116@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/elektra/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19228 Modified Files: elektra.spec sources .cvsignore Log Message: - Update to 0.7.0 Index: elektra.spec =================================================================== RCS file: /cvs/pkgs/rpms/elektra/devel/elektra.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- elektra.spec 24 Feb 2009 14:24:21 -0000 1.8 +++ elektra.spec 5 Mar 2009 09:18:56 -0000 1.9 @@ -1,13 +1,11 @@ Summary: A key/value pair database to store software configurations Name: elektra -Version: 0.6.10 -Release: 9%{?dist} +Version: 0.7.0 +Release: 1%{?dist} Group: System Environment/Libraries License: BSD URL: http://www.libelektra.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: elektra-0.6.10-nostart.patch -Patch1: elektra-0.6.10-open.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # doxygen: to build the API documentation # libxslt, docbook-style-xsl: to build man pages from docbook with xsltproc program @@ -17,10 +15,15 @@ # gawk is used in src/libelektra/exportobjects.sh BuildRequires: gawk # gettext-devel: for the autoconf ICONV macro only +# GConf2-devel: for the testing GConf2 backend for Elektra +BuildRequires: GConf2-devel +BuildRequires: libtool-ltdl-devel +BuildRequires: libtool, gettext-devel +%if 0%{?fedora} > 10 +BuildRequires: glibc-static +%endif Requires(post): /sbin/ldconfig -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig, /sbin/service %description @@ -63,39 +66,49 @@ %prep %setup -q -%patch0 -p1 -b .nostart -%patch1 -p1 -b .open + + %build -CFLAGS="%{optflags} -D_GNU_SOURCE" -export CFLAGS -CXXFLAGS="%{optflags} -D_GNU_SOURCE" -export CXXFLAGS +export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" +export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %configure \ --includedir=%{_includedir}/elektra \ --program-prefix=%{name}- \ --disable-static \ --disable-rpath \ --with-ulibdir=%{_libdir} \ - --with-docbook=%{_datadir}/sgml/docbook/xsl-stylesheets -make %{?_smp_mflags} + --with-docbook=%{_datadir}/sgml/docbook/xsl-stylesheets \ + --with-kdbschemadir=%{_datadir}/sgml/%{name}-%{version} \ + --enable-iconv + +# remove rpath from libtool +sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # Not used for now # --disable-xmltest # --with-hlvl-backenddir -# --with-kdbschemadir # --with-default-backend # --with-default-dbackend +# --enable-ini \ +# --enable-berkeleydb \ +# --enable-gconf \ +# --enable-daemon \ +# --enable-python + +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install INSTALL='install -p' +find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec rm {} \; # Remove statically linked kdb - lib -rm $RPM_BUILD_ROOT%{_bindir}/elektra-kdb_static -rm $RPM_BUILD_ROOT%{_libdir}/libelektra.a +rm $RPM_BUILD_ROOT%{_bindir}/*_static +rm $RPM_BUILD_ROOT%{_libdir}/*.a # file in profile.d is sourced, remove shebang and execute bits, # while keeping timestamps @@ -106,7 +119,7 @@ rm __elektra-elektraenv_timestamp #Fix symlink should be relative - Be aware of SONAME changes! -ln -fs ../libelektratools.so.1 $RPM_BUILD_ROOT%{_libdir}/elektra/libelektratools.so +ln -fs ../libelektratools.so.2 $RPM_BUILD_ROOT%{_libdir}/elektra/libelektratools.so ## doc fixes rm -rf __doc __doc-devel @@ -115,18 +128,19 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/elektra mkdir __doc-devel mv $RPM_BUILD_ROOT%{_datadir}/doc/elektra-devel/* __doc-devel +touch -r ChangeLog __doc-devel/api-html/* rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/elektra-devel + ## man fixes (from program prefix) mv $RPM_BUILD_ROOT%{_mandir}/man5/elektra-elektra.5 $RPM_BUILD_ROOT%{_mandir}/man5/elektra.5 mv $RPM_BUILD_ROOT%{_mandir}/man7/elektra-elektra.7 $RPM_BUILD_ROOT%{_mandir}/man7/elektra.7 -mkdir -p $RPM_BUILD_ROOT%{_initrddir} -mv $RPM_BUILD_ROOT%{_sysconfdir}/init.d/elektra-kdbd $RPM_BUILD_ROOT%{_initrddir} -rmdir $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ +# The init-script is disabled for now +rm -rf $RPM_BUILD_ROOT/etc/init.d/elektra-kdbd +#Own the directory where configuration will be stored. +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kdb -# for the socket and the pidfile -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/elektra-kdbd/ %clean rm -rf $RPM_BUILD_ROOT @@ -134,19 +148,9 @@ %post /sbin/ldconfig -if [ "$1" -eq "1" ]; then - # Create basic key structure for apps - elektra-kdb set -t dir system/sw - elektra-kdb set system/sw/kdb/schemapath "%{_datadir}/sgml/elektra-0.1.1/elektra.xsd" -fi - -/sbin/chkconfig --add elektra-kdbd - -%preun -if [ $1 = 0 ]; then - /sbin/service elektra-kdbd stop >/dev/null 2>&1 || : - /sbin/chkconfig --del elektra-kdbd -fi +# Create basic key structure for apps +elektra-kdb set -t dir system/sw > /dev/null 2>&1 +elektra-kdb set system/sw/kdb/schemapath "%{_datadir}/sgml/elektra-%{version}/elektra.xsd" > /dev/null 2>&1 || : %postun -p /sbin/ldconfig @@ -155,11 +159,11 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README INSTALL %doc __doc/* -%{_initrddir}/elektra-kdbd +#{_initrddir}/elektra-kdbd +%dir %{_sysconfdir}/kdb %{_bindir}/elektra-kdb -%{_sbindir}/elektra-kdbd -%exclude %{_libdir}/*.la -%exclude %{_libdir}/elektra/*.la +%{_bindir}/elektra-preload +#{_sbindir}/elektra-kdbd %{_libdir}/elektra %{_libdir}/libelektra*.so.* # Do not use (noreplace) for this config file. @@ -167,21 +171,25 @@ %{_mandir}/man1/* %{_mandir}/man7/* %{_mandir}/man5/* -%{_datadir}/sgml/ -%dir %{_localstatedir}/run/elektra-kdbd/ +%{_datadir}/sgml/elektra-%{version}/ + %files devel %defattr(-,root,root,-) %doc __doc-devel/* -%{_includedir}/elektra +%{_includedir}/elektra/ %{_libdir}/libelektra.so +%{_libdir}/libelektra-cpp.so %{_libdir}/libelektratools.so -%{_libdir}/pkgconfig/* +%{_libdir}/pkgconfig/*.pc %{_mandir}/man3/* %changelog +* Thu Mar 5 2009 kwizart < kwizart at gmail.com > - 0.7.0-1 +- Update to 0.7.0 + * Tue Feb 24 2009 Fedora Release Engineering - 0.6.10-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/elektra/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Mar 2007 01:26:26 -0000 1.2 +++ sources 5 Mar 2009 09:18:56 -0000 1.3 @@ -1 +1 @@ -dc8b22ac8eddecd7d0b32d13fde4a2e0 elektra-0.6.10.tar.gz +febdf1276bc7ba91636731f73a30f756 elektra-0.7.0.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/elektra/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Mar 2007 01:26:26 -0000 1.2 +++ .cvsignore 5 Mar 2009 09:18:56 -0000 1.3 @@ -1 +1 @@ -elektra-0.6.10.tar.gz +elektra-0.7.0.tar.gz From pkgdb at fedoraproject.org Thu Mar 5 09:33:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:33:30 +0000 Subject: [pkgdb] gnash: jreznik has requested watchcommits Message-ID: <20090305093329.9F24F208543@bastion.fedora.phx.redhat.com> jreznik has requested the watchcommits acl on gnash (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:33:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:33:31 +0000 Subject: [pkgdb] gnash: jreznik has requested commit Message-ID: <20090305093352.356E5208543@bastion.fedora.phx.redhat.com> jreznik has requested the commit acl on gnash (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:33:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:33:34 +0000 Subject: [pkgdb] gnash: jreznik has requested approveacls Message-ID: <20090305093356.CC9EE208547@bastion.fedora.phx.redhat.com> jreznik has requested the approveacls acl on gnash (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:33:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:33:57 +0000 Subject: [pkgdb] gnash: jreznik has requested watchcommits Message-ID: <20090305093419.26ADB208546@bastion.fedora.phx.redhat.com> jreznik has requested the watchcommits acl on gnash (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:35:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:35:08 +0000 Subject: [pkgdb] gnash: jreznik has requested watchcommits Message-ID: <20090305093509.1ECA7208544@bastion.fedora.phx.redhat.com> jreznik has requested the watchcommits acl on gnash (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:35:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:35:10 +0000 Subject: [pkgdb] gnash: jreznik has requested commit Message-ID: <20090305093510.BEC30208548@bastion.fedora.phx.redhat.com> jreznik has requested the commit acl on gnash (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:35:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:35:18 +0000 Subject: [pkgdb] gnash: jreznik has requested commit Message-ID: <20090305093517.7C6FC208550@bastion.fedora.phx.redhat.com> jreznik has requested the commit acl on gnash (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:34:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:34:32 +0000 Subject: [pkgdb] gnash: jreznik has requested approveacls Message-ID: <20090305093514.6C10E20854C@bastion.fedora.phx.redhat.com> jreznik has requested the approveacls acl on gnash (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:35:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:35:18 +0000 Subject: [pkgdb] gnash: jreznik has requested approveacls Message-ID: <20090305093517.9C9DF208554@bastion.fedora.phx.redhat.com> jreznik has requested the approveacls acl on gnash (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From kwizart at fedoraproject.org Thu Mar 5 09:42:06 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Thu, 5 Mar 2009 09:42:06 +0000 (UTC) Subject: rpms/lcdproc/devel lcdproc-0.5.2-initscripts.patch, 1.3, 1.4 lcdproc.spec, 1.11, 1.12 Message-ID: <20090305094206.0DF4C70116@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/lcdproc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22288 Modified Files: lcdproc-0.5.2-initscripts.patch lcdproc.spec Log Message: Fix iniscript enabled by default lcdproc-0.5.2-initscripts.patch: Index: lcdproc-0.5.2-initscripts.patch =================================================================== RCS file: /cvs/pkgs/rpms/lcdproc/devel/lcdproc-0.5.2-initscripts.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lcdproc-0.5.2-initscripts.patch 4 Mar 2009 17:26:05 -0000 1.3 +++ lcdproc-0.5.2-initscripts.patch 5 Mar 2009 09:41:35 -0000 1.4 @@ -4,7 +4,7 @@ @@ -1,6 +1,14 @@ #! /bin/sh +# -+# chkconfig: 345 70 21 ++# chkconfig: - 70 21 +# description: LCDd(8) is the LCDproc server used for displaying text and other data to LCDs. \ +# Apart from the main client lcdproc(1) there are various clients. \ +# See http://lcdproc.omnipotent.net for details. @@ -123,7 +123,7 @@ @@ -1,9 +1,18 @@ #! /bin/sh +# -+# chkconfig: 345 71 20 ++# chkconfig: - 71 20 +# description: LCDd(8) is the LCDproc server used for displaying text and other data to LCDs. \ +# Apart from the main client lcdproc(1) there are various clients. \ +# See http://lcdproc.omnipotent.net for details. Index: lcdproc.spec =================================================================== RCS file: /cvs/pkgs/rpms/lcdproc/devel/lcdproc.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- lcdproc.spec 4 Mar 2009 17:26:05 -0000 1.11 +++ lcdproc.spec 5 Mar 2009 09:41:35 -0000 1.12 @@ -1,7 +1,7 @@ Summary: LCDproc displays real-time system information on a 20x4 backlit LCD Name: lcdproc Version: 0.5.2 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 URL: http://lcdproc.omnipotent.net Group: System Environment/Libraries @@ -136,6 +136,10 @@ %changelog +* Thu Mar 5 2009 kwizart < kwizart at gmail.com > - 0.5.2-10 +- Disable LCDd lcdproc initscript by default. + (It needs to be configured first). + * Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 0.5.2-9 - re-enable patch0 - Prevent some timestamps changes. From pkgdb at fedoraproject.org Thu Mar 5 09:44:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:44:13 +0000 Subject: [pkgdb] gcc: palir1927 has requested watchcommits Message-ID: <20090305094412.6C1E7208543@bastion.fedora.phx.redhat.com> palir1927 has requested the watchcommits acl on gcc (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gcc From pkgdb at fedoraproject.org Thu Mar 5 09:43:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:43:48 +0000 Subject: [pkgdb] gcc: palir1927 has given up watchcommits Message-ID: <20090305094432.05DA6208543@bastion.fedora.phx.redhat.com> palir1927 has given up the watchcommits acl on gcc (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gcc From pkgdb at fedoraproject.org Thu Mar 5 09:46:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:46:30 +0000 Subject: [pkgdb] gcc: palir1927 has requested watchcommits Message-ID: <20090305094651.9CEC0208543@bastion.fedora.phx.redhat.com> palir1927 has requested the watchcommits acl on gcc (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gcc From thm at fedoraproject.org Thu Mar 5 09:53:36 2009 From: thm at fedoraproject.org (Thomas Moschny) Date: Thu, 5 Mar 2009 09:53:36 +0000 (UTC) Subject: rpms/ikiwiki/devel .cvsignore, 1.16, 1.17 ikiwiki.spec, 1.18, 1.19 import.log, 1.16, 1.17 sources, 1.16, 1.17 Message-ID: <20090305095337.063DF70116@cvs1.fedora.phx.redhat.com> Author: thm Update of /cvs/pkgs/rpms/ikiwiki/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23922/devel Modified Files: .cvsignore ikiwiki.spec import.log sources Log Message: Update to 3.06. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 18 Feb 2009 09:18:28 -0000 1.16 +++ .cvsignore 5 Mar 2009 09:53:06 -0000 1.17 @@ -1 +1 @@ -ikiwiki_3.04.tar.gz +ikiwiki_3.06.tar.gz Index: ikiwiki.spec =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ikiwiki.spec 25 Feb 2009 06:59:19 -0000 1.18 +++ ikiwiki.spec 5 Mar 2009 09:53:06 -0000 1.19 @@ -1,6 +1,6 @@ Name: ikiwiki -Version: 3.04 -Release: 2%{?dist} +Version: 3.06 +Release: 1%{?dist} Summary: A wiki compiler Group: Applications/Internet @@ -143,6 +143,9 @@ %changelog +* Thu Mar 5 2009 Thomas Moschny - 3.06-1 +- Update to 3.06. + * Tue Feb 24 2009 Fedora Release Engineering - 3.04-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- import.log 18 Feb 2009 09:18:28 -0000 1.16 +++ import.log 5 Mar 2009 09:53:06 -0000 1.17 @@ -14,3 +14,4 @@ ikiwiki-3_01-1_fc10:HEAD:ikiwiki-3.01-1.fc10.src.rpm:1231599610 ikiwiki-3_03-1_fc10:HEAD:ikiwiki-3.03-1.fc10.src.rpm:1234219058 ikiwiki-3_04-1_fc10:HEAD:ikiwiki-3.04-1.fc10.src.rpm:1234948680 +ikiwiki-3_06-1_fc10:HEAD:ikiwiki-3.06-1.fc10.src.rpm:1236246745 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 18 Feb 2009 09:18:28 -0000 1.16 +++ sources 5 Mar 2009 09:53:06 -0000 1.17 @@ -1 +1 @@ -a087e0314c5ca1c930588e5df2321062 ikiwiki_3.04.tar.gz +256888a241cb2dc704539ae31a81b2c9 ikiwiki_3.06.tar.gz From pkgdb at fedoraproject.org Thu Mar 5 09:55:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:55:08 +0000 Subject: [pkgdb] gnash had acl change status Message-ID: <20090305095509.2DF22208546@bastion.fedora.phx.redhat.com> kkofler has set the watchcommits acl on gnash (Fedora devel) to Approved for jreznik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:55:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:55:12 +0000 Subject: [pkgdb] gnash had acl change status Message-ID: <20090305095512.75B9E20854C@bastion.fedora.phx.redhat.com> kkofler has set the commit acl on gnash (Fedora devel) to Approved for jreznik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:54:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:54:54 +0000 Subject: [pkgdb] gnash had acl change status Message-ID: <20090305095515.228ED208550@bastion.fedora.phx.redhat.com> kkofler has set the approveacls acl on gnash (Fedora devel) to Approved for jreznik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:54:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:54:38 +0000 Subject: [pkgdb] gnash had acl change status Message-ID: <20090305095520.B71C0208553@bastion.fedora.phx.redhat.com> kkofler has set the watchcommits acl on gnash (Fedora 10) to Approved for jreznik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:55:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:55:25 +0000 Subject: [pkgdb] gnash had acl change status Message-ID: <20090305095524.B18FF208543@bastion.fedora.phx.redhat.com> kkofler has set the commit acl on gnash (Fedora 10) to Approved for jreznik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:55:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:55:26 +0000 Subject: [pkgdb] gnash had acl change status Message-ID: <20090305095526.D0BF6208555@bastion.fedora.phx.redhat.com> kkofler has set the approveacls acl on gnash (Fedora 10) to Approved for jreznik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:55:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:55:08 +0000 Subject: [pkgdb] gnash had acl change status Message-ID: <20090305095529.6FED8208604@bastion.fedora.phx.redhat.com> kkofler has set the watchcommits acl on gnash (Fedora 9) to Approved for jreznik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:54:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:54:49 +0000 Subject: [pkgdb] gnash had acl change status Message-ID: <20090305095532.505FA20860F@bastion.fedora.phx.redhat.com> kkofler has set the commit acl on gnash (Fedora 9) to Approved for jreznik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:55:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:55:37 +0000 Subject: [pkgdb] gnash had acl change status Message-ID: <20090305095536.4CDE92086EF@bastion.fedora.phx.redhat.com> kkofler has set the approveacls acl on gnash (Fedora 9) to Approved for jreznik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:56:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:56:12 +0000 Subject: [pkgdb] gnash had acl change status Message-ID: <20090305095614.02D0D208550@bastion.fedora.phx.redhat.com> kkofler has set the watchbugzilla acl on gnash (Fedora 10) to Approved for jreznik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:56:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:56:40 +0000 Subject: [pkgdb] gnash had acl change status Message-ID: <20090305095722.80151208549@bastion.fedora.phx.redhat.com> kkofler has set the watchbugzilla acl on gnash (Fedora devel) to Approved for jreznik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From pkgdb at fedoraproject.org Thu Mar 5 09:57:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 09:57:30 +0000 Subject: [pkgdb] gnash had acl change status Message-ID: <20090305095730.5159020854C@bastion.fedora.phx.redhat.com> kkofler has set the watchbugzilla acl on gnash (Fedora 9) to Approved for jreznik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnash From veillard at fedoraproject.org Thu Mar 5 10:04:54 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Thu, 5 Mar 2009 10:04:54 +0000 (UTC) Subject: rpms/libvirt/F-9 libvirt.spec, 1.100, 1.101 sources, 1.37, 1.38 libvirt-0.6.0-autostart-timeout.patch, 1.1, NONE libvirt-0.6.0-dbus-threads.patch, 1.1, NONE libvirt-0.6.0-qemu-startup.patch, 1.1, NONE libvirt-0.6.0-rpccall.patch, 1.1, NONE libvirt-0.6.0-timeout.patch, 1.1, NONE Message-ID: <20090305100454.EEFCF70116@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25668 Modified Files: libvirt.spec sources Removed Files: libvirt-0.6.0-autostart-timeout.patch libvirt-0.6.0-dbus-threads.patch libvirt-0.6.0-qemu-startup.patch libvirt-0.6.0-rpccall.patch libvirt-0.6.0-timeout.patch Log Message: 0.6.1 upstream release, Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-9/libvirt.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- libvirt.spec 18 Feb 2009 14:15:19 -0000 1.100 +++ libvirt.spec 5 Mar 2009 10:04:24 -0000 1.101 @@ -46,16 +46,11 @@ Summary: Library providing a simple API virtualization Name: libvirt -Version: 0.6.0 -Release: 3%{?dist}%{?extra_release} +Version: 0.6.1 +Release: 1%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz -Patch1: %{name}-%{version}-timeout.patch -Patch2: %{name}-%{version}-rpccall.patch -Patch3: %{name}-%{version}-qemu-startup.patch -Patch4: %{name}-%{version}-dbus-threads.patch -Patch5: %{name}-%{version}-autostart-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -182,11 +177,6 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build %if ! %{with_xen} @@ -259,7 +249,9 @@ %makeinstall (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in) -(cd docs/examples/python ; rm -f Makefile Makefile.in) +(cd docs/examples/python ; rm -rf .deps Makefile Makefile.in) +(cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in) +(cd examples/domain-events/events-c ; make clean ;rm -rf .deps .libs Makefile Makefile.in) rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la @@ -454,6 +446,7 @@ %doc docs/*.html docs/html docs/*.gif %doc docs/examples %doc docs/libvirt-api.xml +%doc examples %if %{with_python} %files python @@ -469,6 +462,12 @@ %endif %changelog +* Wed Mar 4 2009 Daniel Veillard - 0.6.1-1.fc9 +- upstream release 0.6.1 +- support for node device detach reattach and reset +- sVirt mandatory access control support +- many bug fixes and small improvements + * Wed Feb 18 2009 Daniel P. Berrange - 0.6.0-3.fc9 - Fix QEMU startup timeout/race (rhbz #484649) - Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-9/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 6 Feb 2009 20:01:02 -0000 1.37 +++ sources 5 Mar 2009 10:04:24 -0000 1.38 @@ -1 +1 @@ -8e0120d5452b37179f682031bf0895ea libvirt-0.6.0.tar.gz +3154ea9d4a0778497dfdf58cb98127c0 libvirt-0.6.1.tar.gz --- libvirt-0.6.0-autostart-timeout.patch DELETED --- --- libvirt-0.6.0-dbus-threads.patch DELETED --- --- libvirt-0.6.0-qemu-startup.patch DELETED --- --- libvirt-0.6.0-rpccall.patch DELETED --- --- libvirt-0.6.0-timeout.patch DELETED --- From caolanm at fedoraproject.org Thu Mar 5 10:10:20 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 10:10:20 +0000 (UTC) Subject: rpms/openoffice.org/devel .cvsignore, 1.211, 1.212 openoffice.org.spec, 1.1847, 1.1848 sources, 1.351, 1.352 Message-ID: <20090305101020.3F5CF70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26435 Modified Files: .cvsignore openoffice.org.spec sources Log Message: yet more Indic translations Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.211 retrieving revision 1.212 diff -u -r1.211 -r1.212 --- .cvsignore 5 Mar 2009 08:51:12 -0000 1.211 +++ .cvsignore 5 Mar 2009 10:09:49 -0000 1.212 @@ -17,3 +17,4 @@ ta-090227.sdf OOO310_m4.tar.bz2 Openoffice3.1-300m40-100per.tar.bz2 +ml-IN_DEV300_m40.sdf Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1847 retrieving revision 1.1848 diff -u -r1.1847 -r1.1848 --- openoffice.org.spec 5 Mar 2009 09:14:13 -0000 1.1847 +++ openoffice.org.spec 5 Mar 2009 10:09:49 -0000 1.1848 @@ -1,6 +1,6 @@ %define oootag OOO310 %define ooomilestone 4 -%define rh_rpm_release 1 +%define rh_rpm_release 2 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF %define __jar_repack %{nil} @@ -60,6 +60,8 @@ Source16: http://www.openoffice.org/nonav/issues/showattachment.cgi/57666/Maithili-mai-ooo3.0.sdf.tar.gz Source17: http://www.openoffice.org/nonav/issues/showattachment.cgi/60530/as-IN_DEV300_m40.sdf Source18: http://sunvirtuallab.com:32305/sdf/090209/ta-090227.sdf +Source19: http://indian.googlecode.com/files/Openoffice3.1-300m40-100per.tar.bz2 +Source20: http://www.openoffice.org/nonav/issues/showattachment.cgi/60733/ml-IN_DEV300_m40.sdf BuildRequires: zip, findutils, autoconf, flex, bison, icu, gcc-c++ BuildRequires: binutils, java-devel, boost-devel, zlib-devel, vigra-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc @@ -1707,6 +1709,12 @@ # i99663 cp %{SOURCE18} . localize -m -x -l ta-IN -f ta-090227.sdf +# i98746 +tar xjf %{SOURCE19} +localize -m -x -l pa-IN -f Openoffice3.1-300m40-100per/pa-IN.sdf +# i99907 +cp %{SOURCE20} . +localize -m -x -l ml-IN -f ml-IN_DEV300_m40.sdf cd ../.. #build OOo, on failure make a stab at debugging the crash if any, and @@ -4106,6 +4114,10 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog +* Thu Mar 05 2009 Caol??n McNamara - 1:3.1.0-4.2 +- Resolves: rhbz#488688 / ooo#98746 merge Punjabi Translations +- Resolves: rhbz#488700 / ooo#99907 merge Malayalam Translations + * Thu Mar 05 2009 Caol??n McNamara - 1:3.1.0-4.1 - drop integrated workspace.gfbcrash.patch - drop integrated workspace.ooo31gsl2.patch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.351 retrieving revision 1.352 diff -u -r1.351 -r1.352 --- sources 5 Mar 2009 08:51:12 -0000 1.351 +++ sources 5 Mar 2009 10:09:49 -0000 1.352 @@ -7,6 +7,8 @@ eaf47e2e3d3586f6156c61379cc34df9 redhat-langpacks.tar.gz 6c28507e29056a3afb4baffdadab8499 openoffice.org-javafilter.desktop d4cd987dca2f091c888d95d5aef19f46 GSI_fi.sdf.gz +ab6765f3f969e0c676bc13bc9960f60c ta-090227.sdf +09f5e89995521ea566a6d44dd521ff55 Openoffice3.1-300m40-100per.tar.bz2 0835c667327f7ffa5d7eed61b47d681e Maithili-mai-ooo3.0.sdf.tar.gz 7d7eb194a61b3b1c59e3c82da889ac27 or-IN_DEV300_m40.sdf b6558e6e74c60dfd9fcd15a722188d45 mr-IN_DEV300_m40.sdf @@ -14,6 +16,5 @@ f457cdd91857701b1282bfffb0ec5e8a kn-IN_DEV300_m40.sdf bdc3b2b8b90ac1879f216cfa3c50d7e1 hi-IN-D300-m40.tar.gz be8d6866609e7aa7282220c0f469b279 as-IN_DEV300_m40.sdf -ab6765f3f969e0c676bc13bc9960f60c ta-090227.sdf -09f5e89995521ea566a6d44dd521ff55 Openoffice3.1-300m40-100per.tar.bz2 +d185576d40f1157cc1d25e8f72d5017a ml-IN_DEV300_m40.sdf a133aed113ff6ce82e20583e39140b98 OOO310_m4.tar.bz2 From veillard at fedoraproject.org Thu Mar 5 10:10:49 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Thu, 5 Mar 2009 10:10:49 +0000 (UTC) Subject: rpms/libvirt/devel libvirt.spec,1.115,1.116 Message-ID: <20090305101049.BF4A870116@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26497 Modified Files: libvirt.spec Log Message: Not related to lzo-devel, Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- libvirt.spec 4 Mar 2009 21:49:06 -0000 1.115 +++ libvirt.spec 5 Mar 2009 10:10:19 -0000 1.116 @@ -102,7 +102,6 @@ BuildRequires: ncurses-devel BuildRequires: gettext BuildRequires: gnutls-devel -BuildRequires: lzo-devel BuildRequires: hal-devel %if %{with_avahi} BuildRequires: avahi-devel From kwizart at fedoraproject.org Thu Mar 5 10:16:20 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Thu, 5 Mar 2009 10:16:20 +0000 (UTC) Subject: rpms/lcdproc/devel lcdproc-0.5.2-initscripts.patch,1.4,1.5 Message-ID: <20090305101620.0ABD970116@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/lcdproc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27305 Modified Files: lcdproc-0.5.2-initscripts.patch Log Message: Default off for the LSB side lcdproc-0.5.2-initscripts.patch: Index: lcdproc-0.5.2-initscripts.patch =================================================================== RCS file: /cvs/pkgs/rpms/lcdproc/devel/lcdproc-0.5.2-initscripts.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lcdproc-0.5.2-initscripts.patch 5 Mar 2009 09:41:35 -0000 1.4 +++ lcdproc-0.5.2-initscripts.patch 5 Mar 2009 10:15:49 -0000 1.5 @@ -1,7 +1,7 @@ diff -up lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts lcdproc-0.5.2/scripts/init-LCDd.LSB.in --- lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts 2007-04-14 16:41:20.000000000 +0200 -+++ lcdproc-0.5.2/scripts/init-LCDd.LSB.in 2009-03-03 17:06:11.000000000 +0100 -@@ -1,6 +1,14 @@ ++++ lcdproc-0.5.2/scripts/init-LCDd.LSB.in 2009-03-05 11:11:24.000000000 +0100 +@@ -1,10 +1,18 @@ #! /bin/sh +# +# chkconfig: - 70 21 @@ -17,6 +17,11 @@ # Provides: LCDd # Required-Start: $syslog $local_fs $network $remote_fs # Required-Stop: $syslog $local_fs $network $remote_fs +-# Default-Start: 2 3 4 5 ++# Default-Start: + # Default-Stop: S 0 1 6 + # Short-Description: LCDproc Server Daemon + # Description: LSB init script for LCDd, the display @@ -12,57 +20,59 @@ ### END INIT INFO @@ -119,8 +124,8 @@ +exit $RETVAL diff -up lcdproc-0.5.2/scripts/init-lcdproc.LSB.in.initscripts lcdproc-0.5.2/scripts/init-lcdproc.LSB.in --- lcdproc-0.5.2/scripts/init-lcdproc.LSB.in.initscripts 2007-04-14 16:41:20.000000000 +0200 -+++ lcdproc-0.5.2/scripts/init-lcdproc.LSB.in 2009-03-03 17:09:51.000000000 +0100 -@@ -1,9 +1,18 @@ ++++ lcdproc-0.5.2/scripts/init-lcdproc.LSB.in 2009-03-05 11:12:01.000000000 +0100 +@@ -1,10 +1,19 @@ #! /bin/sh +# +# chkconfig: - 71 20 @@ -136,10 +141,12 @@ # Provides: lcdproc # Required-Start: $syslog $local_fs $network $remote_fs # Required-Stop: $syslog $local_fs $network $remote_fs +-# Default-Start: 2 3 4 5 +# Should-Start: LCDd - # Default-Start: 2 3 4 5 ++# Default-Start: # Default-Stop: S 0 1 6 # Short-Description: LCDproc system status information viewer + # Description: LSB init script for lcdproc, the system @@ -12,57 +21,58 @@ ### END INIT INFO From tmraz at fedoraproject.org Thu Mar 5 10:25:20 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Thu, 5 Mar 2009 10:25:20 +0000 (UTC) Subject: rpms/libgcrypt/devel libgcrypt-1.4.4-use-fipscheck.patch, 1.1, 1.2 libgcrypt.spec, 1.35, 1.36 Message-ID: <20090305102520.5AEE870116@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/libgcrypt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28651 Modified Files: libgcrypt-1.4.4-use-fipscheck.patch libgcrypt.spec Log Message: * Thu Mar 5 2009 Tomas Mraz 1.4.4-4 - with the integrity verification check the library needs to link to libdl (#488702) libgcrypt-1.4.4-use-fipscheck.patch: Index: libgcrypt-1.4.4-use-fipscheck.patch =================================================================== RCS file: /cvs/pkgs/rpms/libgcrypt/devel/libgcrypt-1.4.4-use-fipscheck.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libgcrypt-1.4.4-use-fipscheck.patch 3 Mar 2009 20:32:37 -0000 1.1 +++ libgcrypt-1.4.4-use-fipscheck.patch 5 Mar 2009 10:25:19 -0000 1.2 @@ -1,6 +1,6 @@ diff -up libgcrypt-1.4.4/src/fips.c.use-fipscheck libgcrypt-1.4.4/src/fips.c ---- libgcrypt-1.4.4/src/fips.c.use-fipscheck 2009-03-03 18:10:49.000000000 +0100 -+++ libgcrypt-1.4.4/src/fips.c 2009-03-03 18:51:31.000000000 +0100 +--- libgcrypt-1.4.4/src/fips.c.use-fipscheck 2009-03-03 21:09:27.000000000 +0100 ++++ libgcrypt-1.4.4/src/fips.c 2009-03-05 11:20:48.000000000 +0100 @@ -570,23 +570,48 @@ run_random_selftests (void) return !!err; } @@ -72,3 +72,15 @@ p = strrchr (fname, '/'); if (p) p++; +diff -up libgcrypt-1.4.4/src/Makefile.use-fipscheck libgcrypt-1.4.4/src/Makefile +--- libgcrypt-1.4.4/src/Makefile.use-fipscheck 2009-03-03 21:09:41.000000000 +0100 ++++ libgcrypt-1.4.4/src/Makefile 2009-03-05 11:20:40.000000000 +0100 +@@ -337,7 +337,7 @@ libgcrypt_la_LIBADD = \ + ../cipher/libcipher.la \ + ../random/librandom.la \ + ../mpi/libmpi.la \ +- -lgpg-error ++ -lgpg-error -ldl + + dumpsexp_SOURCES = dumpsexp.c + dumpsexp_LDADD = Index: libgcrypt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgcrypt/devel/libgcrypt.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- libgcrypt.spec 3 Mar 2009 20:32:37 -0000 1.35 +++ libgcrypt.spec 5 Mar 2009 10:25:19 -0000 1.36 @@ -1,6 +1,6 @@ Name: libgcrypt Version: 1.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Source0: libgcrypt-%{version}-hobbled.tar.bz2 # The original libgcrypt sources now contain potentially patented ECC # cipher support. We have to remove it in the tarball we ship with @@ -145,6 +145,10 @@ %{_infodir}/gcrypt.info* %changelog +* Thu Mar 5 2009 Tomas Mraz 1.4.4-4 +- with the integrity verification check the library needs to link to libdl + (#488702) + * Tue Mar 3 2009 Tomas Mraz 1.4.4-3 - add hmac FIPS integrity verification check From rrankin at fedoraproject.org Thu Mar 5 10:25:40 2009 From: rrankin at fedoraproject.org (Roy Rankin) Date: Thu, 5 Mar 2009 10:25:40 +0000 (UTC) Subject: rpms/gpsim/devel .cvsignore, 1.6, 1.7 gpsim.spec, 1.23, 1.24 sources, 1.6, 1.7 Message-ID: <20090305102540.4896670116@cvs1.fedora.phx.redhat.com> Author: rrankin Update of /cvs/pkgs/rpms/gpsim/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28539 Modified Files: .cvsignore gpsim.spec sources Log Message: RC1 of gpsim-0.23.0 see ANNOUNCE file for new features Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gpsim/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 15 Feb 2009 03:43:03 -0000 1.6 +++ .cvsignore 5 Mar 2009 10:25:09 -0000 1.7 @@ -1 +1 @@ -gpsim-20080215svn2034.tar.gz +gpsim-20090302svn2042.tar.gz Index: gpsim.spec =================================================================== RCS file: /cvs/pkgs/rpms/gpsim/devel/gpsim.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gpsim.spec 25 Feb 2009 00:45:16 -0000 1.23 +++ gpsim.spec 5 Mar 2009 10:25:09 -0000 1.24 @@ -1,6 +1,6 @@ Name: gpsim Version: 0.23.0 -Release: 2.20090215svn2034%{?dist} +Release: 3.20090302svn2042%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) @@ -9,12 +9,13 @@ URL: http://www.dattalo.com/gnupic/gpsim.html #Source: http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz # svn checkout -r 2034 https://gpsim.svn.sourceforge.net/svnroot/gpsim/trunk . -Source: gpsim-20080215svn2034.tar.gz +Source: gpsim-20090302svn2042.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+extra-devel, flex, readline-devel, popt-devel BuildRequires: autoconf + %description gpsim is a simulator for Microchip (TM) PIC (TM) microcontrollers. It supports most devices in Microchip's 12-bit, 14bit, and 16-bit @@ -46,10 +47,11 @@ %prep %setup -q -cat AUTHORS | iconv -f ISO88592 -t UTF8 > AUTHORS +mv AUTHORS AUTHORS.raw mv ChangeLog ChangeLog.raw +iconv -f ISO88592 -t UTF8 AUTHORS.raw -o AUTHORS iconv -f ISO88592 -t UTF8 ChangeLog.raw -o ChangeLog -rm -f ChangeLog.raw +rm -f AUTHORS.raw ChangeLog.raw autoconf %build @@ -89,6 +91,9 @@ %{_includedir}/* %changelog +* Thu Mar 05 2009 Roy Rankin 0.23.0-3.20090302svn2042 +- RC1 of gpsim-0.23.0 see ANNOUNCE file for new features + * Tue Feb 24 2009 Fedora Release Engineering - 0.23.0-2.20090215svn2034 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -110,8 +115,8 @@ - Licence tag clarification * Tue Feb 13 2007 Alain Portal 0.22.0-3 - - Remove Makefiles that are in conflict between i386 and x86_64 arch - Fix #228362 +- Remove Makefiles that are in conflict between i386 and x86_64 arch + Fix #228362 * Mon Feb 5 2007 Alain Portal 0.22.0-2 - FE7 rebuild @@ -124,10 +129,10 @@ - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Sat Sep 23 2006 Alain Portal 0.21.11-8 - - Add patch to fix a ktechlab crash, a ktechlab upstream contribution - See http://ktechlab.org/download/gpsim.php - - Use macros for rm and make - - Use macro style instead of variable style +- Add patch to fix a ktechlab crash, a ktechlab upstream contribution + See http://ktechlab.org/download/gpsim.php +- Use macros for rm and make +- Use macro style instead of variable style * Fri Sep 1 2006 Alain Portal 0.21.11-7 - FE6 rebuild @@ -152,16 +157,16 @@ - Improve download url * Fri Sep 30 2005 Alain Portal 0.21.4-5 - - Improve prep section to make rpmlint happy - - Contributions of Jose Pedro Oliveira - Thanks to him. +- Improve prep section to make rpmlint happy +- Contributions of Jose Pedro Oliveira + Thanks to him. * Mon Sep 19 2005 Alain Portal 0.21.4-4 - Add missing a rm -rf RPM_BUILD_ROOT statement in the install section * Thu Sep 15 2005 Alain Portal 0.21.4-3 - Exclude .la file - - Add examples + - Add examples * Tue Sep 13 2005 Alain Portal 0.21.4-2 - License is GPL Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gpsim/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 15 Feb 2009 03:43:03 -0000 1.6 +++ sources 5 Mar 2009 10:25:09 -0000 1.7 @@ -1 +1 @@ -bb7b18929dccb03d193418b21c7c5c5c gpsim-20080215svn2034.tar.gz +f24c368f45c1118639e365250350a12a gpsim-20090302svn2042.tar.gz From caolanm at fedoraproject.org Thu Mar 5 10:25:41 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 10:25:41 +0000 (UTC) Subject: rpms/qedje/devel qedje.spec,1.2,1.3 Message-ID: <20090305102541.7AB1770116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/qedje/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28617 Modified Files: qedje.spec Log Message: BR: phonon-devel Index: qedje.spec =================================================================== RCS file: /cvs/pkgs/rpms/qedje/devel/qedje.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qedje.spec 25 Feb 2009 17:25:22 -0000 1.2 +++ qedje.spec 5 Mar 2009 10:25:11 -0000 1.3 @@ -1,6 +1,6 @@ Name: qedje Version: 0.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A library combining the benefits of Edje and Qt Group: System Environment/Libraries @@ -14,6 +14,7 @@ BuildRequires: pkgconfig BuildRequires: eet-devel BuildRequires: qzion-devel +BuildRequires: phonon-devel %description The main purpose of the QEdje project is to build a bridge among components @@ -75,6 +76,9 @@ %changelog +* Wed Mar 05 2009 Caol??n McNamara - 0.3.0-4 +- BR: phonon-devel + * Wed Feb 25 2009 Fedora Release Engineering - 0.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From tmraz at fedoraproject.org Thu Mar 5 10:32:47 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Thu, 5 Mar 2009 10:32:47 +0000 (UTC) Subject: rpms/libgcrypt/devel libgcrypt-1.4.4-use-fipscheck.patch,1.2,1.3 Message-ID: <20090305103247.5BA0C70116@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/libgcrypt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29798 Modified Files: libgcrypt-1.4.4-use-fipscheck.patch Log Message: - we need to patch Makefile.in of course libgcrypt-1.4.4-use-fipscheck.patch: Index: libgcrypt-1.4.4-use-fipscheck.patch =================================================================== RCS file: /cvs/pkgs/rpms/libgcrypt/devel/libgcrypt-1.4.4-use-fipscheck.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libgcrypt-1.4.4-use-fipscheck.patch 5 Mar 2009 10:25:19 -0000 1.2 +++ libgcrypt-1.4.4-use-fipscheck.patch 5 Mar 2009 10:32:46 -0000 1.3 @@ -72,15 +72,15 @@ p = strrchr (fname, '/'); if (p) p++; -diff -up libgcrypt-1.4.4/src/Makefile.use-fipscheck libgcrypt-1.4.4/src/Makefile ---- libgcrypt-1.4.4/src/Makefile.use-fipscheck 2009-03-03 21:09:41.000000000 +0100 -+++ libgcrypt-1.4.4/src/Makefile 2009-03-05 11:20:40.000000000 +0100 +diff -up libgcrypt-1.4.4/src/Makefile.in.use-fipscheck libgcrypt-1.4.4/src/Makefile.in +--- libgcrypt-1.4.4/src/Makefile.in.use-fipscheck 2009-01-22 19:16:51.000000000 +0100 ++++ libgcrypt-1.4.4/src/Makefile.in 2009-03-05 11:31:57.000000000 +0100 @@ -337,7 +337,7 @@ libgcrypt_la_LIBADD = \ ../cipher/libcipher.la \ ../random/librandom.la \ ../mpi/libmpi.la \ -- -lgpg-error -+ -lgpg-error -ldl +- @LTLIBOBJS@ @GPG_ERROR_LIBS@ ++ @LTLIBOBJS@ @GPG_ERROR_LIBS@ -ldl dumpsexp_SOURCES = dumpsexp.c dumpsexp_LDADD = From lkundrak at fedoraproject.org Thu Mar 5 10:35:02 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Thu, 5 Mar 2009 10:35:02 +0000 (UTC) Subject: rpms/wxPython/devel wxPython.spec,1.31,1.32 Message-ID: <20090305103502.0C87C70116@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/wxPython/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30085 Modified Files: wxPython.spec Log Message: * Thu Mar 5 2009 Lubomir Rintel - 2.8.9.1-4 - Rebuilt for newer wxgtk package Index: wxPython.spec =================================================================== RCS file: /cvs/pkgs/rpms/wxPython/devel/wxPython.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- wxPython.spec 26 Feb 2009 07:27:27 -0000 1.31 +++ wxPython.spec 5 Mar 2009 10:34:31 -0000 1.32 @@ -5,7 +5,7 @@ Name: wxPython Version: 2.8.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GUI toolkit for the Python programming language @@ -104,6 +104,9 @@ %changelog +* Thu Mar 5 2009 Lubomir Rintel - 2.8.9.1-4 +- Rebuilt for newer wxgtk package + * Wed Feb 25 2009 Fedora Release Engineering - 2.8.9.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Thu Mar 5 10:36:36 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 10:36:36 +0000 (UTC) Subject: rpms/teckit/devel TECkit_2_5_1-includes.patch, NONE, 1.1 teckit.spec, 1.6, 1.7 Message-ID: <20090305103636.7479D70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/teckit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30405 Modified Files: teckit.spec Added Files: TECkit_2_5_1-includes.patch Log Message: include stdio.h for sprintf TECkit_2_5_1-includes.patch: --- NEW FILE TECkit_2_5_1-includes.patch --- diff -ru TECkit_2_5_1.orig/source/Compiler.cpp TECkit_2_5_1/source/Compiler.cpp --- TECkit_2_5_1.orig/source/Compiler.cpp 2009-03-05 10:29:22.000000000 +0000 +++ TECkit_2_5_1/source/Compiler.cpp 2009-03-05 10:29:50.000000000 +0000 @@ -33,6 +33,7 @@ #include #include #include +#include #include "zlib.h" Index: teckit.spec =================================================================== RCS file: /cvs/pkgs/rpms/teckit/devel/teckit.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- teckit.spec 25 Feb 2009 19:28:52 -0000 1.6 +++ teckit.spec 5 Mar 2009 10:36:06 -0000 1.7 @@ -1,6 +1,6 @@ Name: teckit Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Conversion library and mapping compiler License: LGPLv2+ or CPL Group: Development/Libraries @@ -9,6 +9,8 @@ BuildRequires: expat-devel zlib-devel libtool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: TECkit_2_5_1-includes.patch + %description TECkit is a low-level toolkit intended to be used by other applications that need to perform encoding conversions (e.g., when @@ -37,6 +39,7 @@ %prep %setup -q -n TECkit_2_5_1 +%patch0 -p1 -b .includes %{__chmod} 0755 ./autogen.sh %{__chmod} 0755 ./configure @@ -84,6 +87,9 @@ %{_libdir}/libTECkit_Compiler.so %changelog +* Wed Mar 05 2009 Caol??n McNamara - 2.5.1-3 +- include stdio.h for sprintf + * Wed Feb 25 2009 Fedora Release Engineering - 2.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Thu Mar 5 10:43:42 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 10:43:42 +0000 (UTC) Subject: rpms/libgphoto2/devel libgphoto2.spec,1.17,1.18 Message-ID: <20090305104342.F27AA70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/libgphoto2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31478 Modified Files: libgphoto2.spec Log Message: tweak BR to get to build Index: libgphoto2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgphoto2/devel/libgphoto2.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libgphoto2.spec 25 Feb 2009 15:25:52 -0000 1.17 +++ libgphoto2.spec 5 Mar 2009 10:43:12 -0000 1.18 @@ -1,7 +1,7 @@ Summary: Library for accessing digital cameras Name: libgphoto2 Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2 License: GPLv2+ and GPLv2 Group: Development/Libraries @@ -20,7 +20,7 @@ BuildRequires: pkgconfig, sharutils BuildRequires: libtool-ltdl-devel, popt-devel # we run autoreconf: -BuildRequires: autoconf, automake, libtool, gettext-devel +BuildRequires: autoconf, automake, libtool, gettext-devel, cvs Obsoletes: gphoto2 < 2.4.0-11 Obsoletes: gphoto2-devel < 2.4.0-11 @@ -151,6 +151,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 05 2009 Caol??n McNamara - 2.4.4-3 +- tweak BR to get to build + * Wed Feb 25 2009 Fedora Release Engineering - 2.4.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From dcbw at fedoraproject.org Thu Mar 5 10:54:11 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 10:54:11 +0000 (UTC) Subject: rpms/NetworkManager/F-10 NetworkManager-0.7.1-localhost-localdomain.patch, NONE, 1.1 NetworkManager.spec, 1.257, 1.258 nm-applet-internal-buildfixes.patch, 1.4, 1.5 sources, 1.133, 1.134 Message-ID: <20090305105411.6B4F870116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32746 Modified Files: NetworkManager.spec nm-applet-internal-buildfixes.patch sources Added Files: NetworkManager-0.7.1-localhost-localdomain.patch Log Message: * Wed Mar 4 2009 Dan Williams - 1:0.7.0.99-1 - nm: make default wired "Auto ethX" connection modifiable if an enabled system settings plugin supports modifying connections (rh #485555) - nm: manpage fixes (rh #447233) - nm: CVE-2009-0365 - GetSecrets disclosure - applet: CVE-2009-0578 - local users can modify the connection settings - applet: fix inability to choose WPA Ad-Hoc networks from the menu - ifcfg-rh: add read-only support for WPA-PSK connections - ifcfg-rh: revert fix for #441453 (honor localhost) until gdm gets fixed NetworkManager-0.7.1-localhost-localdomain.patch: --- NEW FILE NetworkManager-0.7.1-localhost-localdomain.patch --- commit 671c232544e109ab0289b6e099274fda54a35dbf Author: Dan Williams Date: Thu Feb 19 15:49:37 2009 -0500 ifcfg-rh: ignore explicitly set 'localhost' hostnames (rh #441453) To match 'network' service behavior, which would perform reverse address lookups when the HOSTNAME from /etc/sysconfig/network was 'localhost' or 'localhost.localdomain'. Just name your machine already. diff --git a/system-settings/plugins/ifcfg-rh/plugin.c b/system-settings/plugins/ifcfg-rh/plugin.c index e4f5bcf..b673615 100644 --- a/system-settings/plugins/ifcfg-rh/plugin.c +++ b/system-settings/plugins/ifcfg-rh/plugin.c @@ -499,6 +499,15 @@ plugin_get_hostname (SCPluginIfcfg *plugin) hostname = svGetValue (network, "HOSTNAME"); svCloseFile (network); + + /* Ignore a hostname of 'localhost' or 'localhost.localdomain' to preserve + * 'network' service behavior. + */ + if (hostname && (!strcmp (hostname, "localhost") || !strcmp (hostname, "localhost.localdomain"))) { + g_free (hostname); + hostname = NULL; + } + return hostname; } Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager.spec,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- NetworkManager.spec 25 Feb 2009 20:40:44 -0000 1.257 +++ NetworkManager.spec 5 Mar 2009 10:53:40 -0000 1.258 @@ -11,13 +11,13 @@ %define libnl_version 1.1 %define ppp_version 2.2.4 -%define snapshot .git20090225 -%define applet_snapshot .svn1202 +%define snapshot %{nil} +%define applet_snapshot %{nil} Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 -Version: 0.7.0.98 +Version: 0.7.0.99 Release: 1%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ @@ -28,6 +28,7 @@ Source2: nm-system-settings.conf Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch +Patch3: NetworkManager-0.7.1-localhost-localdomain.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig @@ -45,9 +46,10 @@ Requires: udev Obsoletes: dhcdbd -Conflicts: NetworkManager-vpnc < 1:0.7.0-1 -Conflicts: NetworkManager-openvpn < 1:0.7.0-17 -Conflicts: NetworkManager-pptp < 1:0.7.0-1 +Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1 +Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1 +Conflicts: NetworkManager-pptp < 1:0.7.0.99-1 +Conflicts: NetworkManager-openconnect < 1:0.7.0.99-1 BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -144,6 +146,7 @@ tar -xjf %{SOURCE1} %patch1 -p1 -b .buildfix %patch2 -p1 -b .explain-dns1-dns2 +%patch3 -p1 -R -b .keep-localhost-localdomain %build @@ -324,6 +327,16 @@ %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Wed Mar 4 2009 Dan Williams - 1:0.7.0.99-1 +- nm: make default wired "Auto ethX" connection modifiable if an enabled system settings + plugin supports modifying connections (rh #485555) +- nm: manpage fixes (rh #447233) +- nm: CVE-2009-0365 - GetSecrets disclosure +- applet: CVE-2009-0578 - local users can modify the connection settings +- applet: fix inability to choose WPA Ad-Hoc networks from the menu +- ifcfg-rh: add read-only support for WPA-PSK connections +- ifcfg-rh: revert fix for #441453 (honor localhost) until gdm gets fixed + * Wed Feb 25 2009 Dan Williams - 1:0.7.0.98-1.git20090225 - Fix getting secrets for system connections (rh #486696) - More compatible modem autodetection nm-applet-internal-buildfixes.patch: Index: nm-applet-internal-buildfixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/nm-applet-internal-buildfixes.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nm-applet-internal-buildfixes.patch 25 Feb 2009 20:40:44 -0000 1.4 +++ nm-applet-internal-buildfixes.patch 5 Mar 2009 10:53:40 -0000 1.5 @@ -1,6 +1,6 @@ -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac 2008-11-17 18:04:35.000000000 -0500 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.72 @@ -12,9 +12,9 @@ gtk+-2.0 >= 2.10 libglade-2.0 gmodule-export-2.0 -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -2,6 +2,10 @@ NULL= bin_PROGRAMS = nm-connection-editor @@ -38,9 +38,9 @@ if NO_POLKIT_GNOME nm_connection_editor_LDADD += \ -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -58,9 +58,9 @@ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -4,6 +4,10 @@ NULL= bin_PROGRAMS = nm-applet @@ -83,9 +83,9 @@ gladedir = $(datadir)/nm-applet glade_DATA = applet.glade keyring.png -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -103,9 +103,9 @@ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/sources,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- sources 25 Feb 2009 20:40:44 -0000 1.133 +++ sources 5 Mar 2009 10:53:40 -0000 1.134 @@ -1,2 +1,2 @@ -870f57ad87eafa2ef411b8e71a462e8a NetworkManager-0.7.0.98.git20090225.tar.bz2 -8f8ac796d7c14378cc7d073fdce8470c network-manager-applet-0.7.0.98.svn1202.tar.bz2 +2f3aef00a0cd1a2d32acba880bcca27c NetworkManager-0.7.0.99.tar.bz2 +8670d75dffe0d4fe5a497f0857a5ff00 network-manager-applet-0.7.0.99.tar.bz2 From dcbw at fedoraproject.org Thu Mar 5 11:03:05 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 11:03:05 +0000 (UTC) Subject: rpms/NetworkManager/F-10 NetworkManager-0.7.1-localhost-localdomain.patch, 1.1, 1.2 NetworkManager.spec, 1.258, 1.259 Message-ID: <20090305110305.9A19770116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1852 Modified Files: NetworkManager-0.7.1-localhost-localdomain.patch NetworkManager.spec Log Message: Fix patch fuzz NetworkManager-0.7.1-localhost-localdomain.patch: Index: NetworkManager-0.7.1-localhost-localdomain.patch =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager-0.7.1-localhost-localdomain.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NetworkManager-0.7.1-localhost-localdomain.patch 5 Mar 2009 10:53:40 -0000 1.1 +++ NetworkManager-0.7.1-localhost-localdomain.patch 5 Mar 2009 11:03:04 -0000 1.2 @@ -1,31 +1,19 @@ -commit 671c232544e109ab0289b6e099274fda54a35dbf -Author: Dan Williams -Date: Thu Feb 19 15:49:37 2009 -0500 - - ifcfg-rh: ignore explicitly set 'localhost' hostnames (rh #441453) - - To match 'network' service behavior, which would perform reverse - address lookups when the HOSTNAME from /etc/sysconfig/network - was 'localhost' or 'localhost.localdomain'. Just name your machine - already. - -diff --git a/system-settings/plugins/ifcfg-rh/plugin.c b/system-settings/plugins/ifcfg-rh/plugin.c -index e4f5bcf..b673615 100644 ---- a/system-settings/plugins/ifcfg-rh/plugin.c -+++ b/system-settings/plugins/ifcfg-rh/plugin.c -@@ -499,6 +499,15 @@ plugin_get_hostname (SCPluginIfcfg *plugin) +diff -up NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/plugin.c.keep-localhost-localdomain NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/plugin.c +--- NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/plugin.c.keep-localhost-localdomain 2009-03-03 20:13:20.000000000 -0500 ++++ NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/plugin.c 2009-03-05 05:59:54.000000000 -0500 +@@ -488,15 +488,6 @@ plugin_get_hostname (SCPluginIfcfg *plug - hostname = svGetValue (network, "HOSTNAME"); + hostname = svGetValue (network, "HOSTNAME", FALSE); svCloseFile (network); -+ -+ /* Ignore a hostname of 'localhost' or 'localhost.localdomain' to preserve -+ * 'network' service behavior. -+ */ -+ if (hostname && (!strcmp (hostname, "localhost") || !strcmp (hostname, "localhost.localdomain"))) { -+ g_free (hostname); -+ hostname = NULL; -+ } -+ +- +- /* Ignore a hostname of 'localhost' or 'localhost.localdomain' to preserve +- * 'network' service behavior. +- */ +- if (hostname && (!strcmp (hostname, "localhost") || !strcmp (hostname, "localhost.localdomain"))) { +- g_free (hostname); +- hostname = NULL; +- } +- return hostname; } Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager.spec,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- NetworkManager.spec 5 Mar 2009 10:53:40 -0000 1.258 +++ NetworkManager.spec 5 Mar 2009 11:03:04 -0000 1.259 @@ -72,7 +72,7 @@ BuildRequires: PolicyKit-devel PolicyKit-gnome-devel BuildRequires: dhclient BuildRequires: gtk-doc -BuildRequires: libudev-devel +#BuildRequires: libudev-devel %description NetworkManager attempts to keep an active network connection available at all @@ -146,7 +146,7 @@ tar -xjf %{SOURCE1} %patch1 -p1 -b .buildfix %patch2 -p1 -b .explain-dns1-dns2 -%patch3 -p1 -R -b .keep-localhost-localdomain +%patch3 -p1 -b .keep-localhost-localdomain %build From dnielsen at fedoraproject.org Thu Mar 5 11:04:28 2009 From: dnielsen at fedoraproject.org (David Nielsen) Date: Thu, 5 Mar 2009 11:04:28 +0000 (UTC) Subject: rpms/banshee/devel .cvsignore, 1.24, 1.25 banshee.spec, 1.72, 1.73 import.log, 1.2, 1.3 sources, 1.24, 1.25 banshee-1-1.4.2-podcast.patch, 1.1, NONE Message-ID: <20090305110428.A4D9670116@cvs1.fedora.phx.redhat.com> Author: dnielsen Update of /cvs/pkgs/rpms/banshee/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2095/devel Modified Files: .cvsignore banshee.spec import.log sources Removed Files: banshee-1-1.4.2-podcast.patch Log Message: Update to 1.4.3 Remove upstreamed patch Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/banshee/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 23 Jan 2009 18:58:19 -0000 1.24 +++ .cvsignore 5 Mar 2009 11:03:57 -0000 1.25 @@ -1 +1 @@ -banshee-1-1.4.2.tar.bz2 +banshee-1-1.4.3.tar.bz2 Index: banshee.spec =================================================================== RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- banshee.spec 25 Feb 2009 17:18:53 -0000 1.72 +++ banshee.spec 5 Mar 2009 11:03:58 -0000 1.73 @@ -1,15 +1,14 @@ %define mono_shared %{_builddir}/%{?buildsubdir} Name: banshee -Version: 1.4.2 -Release: 6%{?dist} +Version: 1.4.3 +Release: 1%{?dist} Summary: Easily import, manage, and play selections from your music collection Group: Applications/Multimedia License: MIT URL: http://banshee-project.org/ Source0: http://banshee-project.org/files/banshee/banshee-1-%{version}.tar.bz2 Source1: README.Fedora -Patch0: banshee-1-1.4.2-podcast.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # We only have mono on these arches: @@ -111,7 +110,6 @@ %prep %setup -q -n %{name}-1-%{version} -%patch0 -p0 -b .podcast cp -p %{SOURCE1} . %build @@ -120,7 +118,7 @@ %ifnarch %ix86 x86_64 sparc --disable-boo \ %endif - --with-vendor-build-id=Fedora%{?fedora}-%{version}-revision-%{release} + --with-vendor-build-id=Fedora%{?fedora}-%{version}-%{release} make %{?_smp_mflags} @@ -197,6 +195,10 @@ %changelog +* Thu Mar 05 2009 David Nielsen - 1.4.3-1 +- Update to 1.4.3 +- Remove upstreamed patch + * Wed Feb 25 2009 David Nielsen - 1.4.2-6 - Rebuilt for updated taglib-sharp Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/banshee/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 25 Feb 2009 17:18:54 -0000 1.2 +++ import.log 5 Mar 2009 11:03:58 -0000 1.3 @@ -1,2 +1,3 @@ banshee-1_4_2-5_fc11:HEAD:banshee-1.4.2-5.fc11.src.rpm:1235468555 banshee-1_4_2-6_fc11:HEAD:banshee-1.4.2-6.fc11.src.rpm:1235582276 +banshee-1_4_3-1_fc11:HEAD:banshee-1.4.3-1.fc11.src.rpm:1236250928 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/banshee/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 23 Jan 2009 18:58:19 -0000 1.24 +++ sources 5 Mar 2009 11:03:58 -0000 1.25 @@ -1 +1 @@ -ddee6b6c66aabb2c5a91c753ad5de498 banshee-1-1.4.2.tar.bz2 +880dee65d2bfe62be711a8edfe4d737f banshee-1-1.4.3.tar.bz2 --- banshee-1-1.4.2-podcast.patch DELETED --- From dcbw at fedoraproject.org Thu Mar 5 11:05:48 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 11:05:48 +0000 (UTC) Subject: rpms/NetworkManager/F-9 NetworkManager-0.7.1-localhost-localdomain.patch, NONE, 1.1 .cvsignore, 1.89, 1.90 NetworkManager.spec, 1.252, 1.253 nm-applet-internal-buildfixes.patch, 1.4, 1.5 sources, 1.131, 1.132 Message-ID: <20090305110548.646B170116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2421 Modified Files: .cvsignore NetworkManager.spec nm-applet-internal-buildfixes.patch sources Added Files: NetworkManager-0.7.1-localhost-localdomain.patch Log Message: * Wed Mar 4 2009 Dan Williams - 1:0.7.0.99-1 - nm: make default wired "Auto ethX" connection modifiable if an enabled system settings plugin supports modifying connections (rh #485555) - nm: manpage fixes (rh #447233) - nm: CVE-2009-0365 - GetSecrets disclosure - applet: CVE-2009-0578 - local users can modify the connection settings - applet: fix inability to choose WPA Ad-Hoc networks from the menu - ifcfg-rh: add read-only support for WPA-PSK connections - ifcfg-rh: revert fix for #441453 (honor localhost) until gdm gets fixed NetworkManager-0.7.1-localhost-localdomain.patch: --- NEW FILE NetworkManager-0.7.1-localhost-localdomain.patch --- diff -up NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/plugin.c.keep-localhost-localdomain NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/plugin.c --- NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/plugin.c.keep-localhost-localdomain 2009-03-03 20:13:20.000000000 -0500 +++ NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/plugin.c 2009-03-05 05:59:54.000000000 -0500 @@ -488,15 +488,6 @@ plugin_get_hostname (SCPluginIfcfg *plug hostname = svGetValue (network, "HOSTNAME", FALSE); svCloseFile (network); - - /* Ignore a hostname of 'localhost' or 'localhost.localdomain' to preserve - * 'network' service behavior. - */ - if (hostname && (!strcmp (hostname, "localhost") || !strcmp (hostname, "localhost.localdomain"))) { - g_free (hostname); - hostname = NULL; - } - return hostname; } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/.cvsignore,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- .cvsignore 20 Feb 2009 20:20:56 -0000 1.89 +++ .cvsignore 5 Mar 2009 11:05:17 -0000 1.90 @@ -137,3 +137,7 @@ NetworkManager-0.7.0.97.git20090219.tar.gz network-manager-applet-0.7.0.97.svn1189.tar.gz NetworkManager-0.7.0.97.git20090220.tar.gz +NetworkManager-0.7.0.98.git20090225.tar.bz2 +network-manager-applet-0.7.0.98.svn1202.tar.bz2 +NetworkManager-0.7.0.99.tar.bz2 +network-manager-applet-0.7.0.99.tar.bz2 Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- NetworkManager.spec 25 Feb 2009 20:48:37 -0000 1.252 +++ NetworkManager.spec 5 Mar 2009 11:05:17 -0000 1.253 @@ -11,13 +11,13 @@ %define libnl_version 1.1 %define ppp_version 2.2.4 -%define snapshot .git20090225 -%define applet_snapshot .svn1202 +%define snapshot %{nil} +%define applet_snapshot %{nil} Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 -Version: 0.7.0.98 +Version: 0.7.0.99 Release: 1%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ @@ -28,6 +28,7 @@ Source2: nm-system-settings.conf Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch +Patch3: NetworkManager-0.7.1-localhost-localdomain.patch Patch10: old-dbus-glib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,9 +47,10 @@ Requires: udev Obsoletes: dhcdbd -Conflicts: NetworkManager-vpnc < 1:0.7.0-1 -Conflicts: NetworkManager-openvpn < 1:0.7.0-17 -Conflicts: NetworkManager-pptp < 1:0.7.0-1 +Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1 +Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1 +Conflicts: NetworkManager-pptp < 1:0.7.0.99-1 +Conflicts: NetworkManager-openconnect < 1:0.7.0.99-1 BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -147,6 +149,7 @@ tar -xjf %{SOURCE1} %patch1 -p1 -b .buildfix %patch2 -p1 -b .explain-dns1-dns2 +%patch3 -p1 -b .keep-localhost-localdomain %patch10 -p1 -b .old-dbus-glib %build @@ -331,6 +334,16 @@ %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Wed Mar 4 2009 Dan Williams - 1:0.7.0.99-1 +- nm: make default wired "Auto ethX" connection modifiable if an enabled system settings + plugin supports modifying connections (rh #485555) +- nm: manpage fixes (rh #447233) +- nm: CVE-2009-0365 - GetSecrets disclosure +- applet: CVE-2009-0578 - local users can modify the connection settings +- applet: fix inability to choose WPA Ad-Hoc networks from the menu +- ifcfg-rh: add read-only support for WPA-PSK connections +- ifcfg-rh: revert fix for #441453 (honor localhost) until gdm gets fixed + * Wed Feb 25 2009 Dan Williams - 1:0.7.0.98-1.git20090225 - Fix getting secrets for system connections (rh #486696) - More compatible modem autodetection nm-applet-internal-buildfixes.patch: Index: nm-applet-internal-buildfixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/nm-applet-internal-buildfixes.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nm-applet-internal-buildfixes.patch 25 Feb 2009 20:48:37 -0000 1.4 +++ nm-applet-internal-buildfixes.patch 5 Mar 2009 11:05:17 -0000 1.5 @@ -1,6 +1,6 @@ -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac 2008-11-17 18:04:35.000000000 -0500 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.72 @@ -12,9 +12,9 @@ gtk+-2.0 >= 2.10 libglade-2.0 gmodule-export-2.0 -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -2,6 +2,10 @@ NULL= bin_PROGRAMS = nm-connection-editor @@ -38,9 +38,9 @@ if NO_POLKIT_GNOME nm_connection_editor_LDADD += \ -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -58,9 +58,9 @@ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -4,6 +4,10 @@ NULL= bin_PROGRAMS = nm-applet @@ -83,9 +83,9 @@ gladedir = $(datadir)/nm-applet glade_DATA = applet.glade keyring.png -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -103,9 +103,9 @@ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/sources,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- sources 25 Feb 2009 20:48:37 -0000 1.131 +++ sources 5 Mar 2009 11:05:17 -0000 1.132 @@ -1,2 +1,2 @@ -870f57ad87eafa2ef411b8e71a462e8a NetworkManager-0.7.0.98.git20090225.tar.bz2 -8f8ac796d7c14378cc7d073fdce8470c network-manager-applet-0.7.0.98.svn1202.tar.bz2 +2f3aef00a0cd1a2d32acba880bcca27c NetworkManager-0.7.0.99.tar.bz2 +8670d75dffe0d4fe5a497f0857a5ff00 network-manager-applet-0.7.0.99.tar.bz2 From alexlan at fedoraproject.org Thu Mar 5 11:09:09 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Thu, 5 Mar 2009 11:09:09 +0000 (UTC) Subject: rpms/tellico/devel tellico-1.3.5-gcc44.patch, NONE, 1.1 tellico.spec, 1.34, 1.35 sources, 1.16, 1.17 .cvsignore, 1.16, 1.17 Message-ID: <20090305110909.AAD8A70116@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/pkgs/rpms/tellico/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3120 Modified Files: tellico.spec sources .cvsignore Added Files: tellico-1.3.5-gcc44.patch Log Message: * Thu Mar 5 2009 Alex Lancaster - 1.3.5-1 - Update to latest upstream (1.3.5) - Add a patch from upstream SVN r3410 which fixes build with GCC 4.4 tellico-1.3.5-gcc44.patch: --- NEW FILE tellico-1.3.5-gcc44.patch --- diff -u -r tellico-1.3.5.orig/src/translators/pilotdb/libflatfile/DB.cpp tellico-1.3.5/src/translators/pilotdb/libflatfile/DB.cpp --- tellico-1.3.5.orig/src/translators/pilotdb/libflatfile/DB.cpp 2009-02-14 13:24:52.000000000 -0700 +++ tellico-1.3.5/src/translators/pilotdb/libflatfile/DB.cpp 2009-03-05 03:54:57.000000000 -0700 @@ -242,7 +242,7 @@ kdDebug() << "list view is corrupt" << endl; } // Determine the length of the name string. - pi_char_t* null_ptr = reinterpret_cast + const pi_char_t* null_ptr = reinterpret_cast (memchr(chunk.data() + 4, 0, 32)); if (null_ptr) lv.name = std::string((char *) (chunk.data() + 4), Only in tellico-1.3.5/src/translators/pilotdb/libflatfile: DB.cpp.orig Index: tellico.spec =================================================================== RCS file: /cvs/pkgs/rpms/tellico/devel/tellico.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- tellico.spec 25 Feb 2009 19:50:58 -0000 1.34 +++ tellico.spec 5 Mar 2009 11:08:38 -0000 1.35 @@ -1,12 +1,13 @@ Name: tellico -Version: 1.3.4 -Release: 4%{?dist} +Version: 1.3.5 +Release: 1%{?dist} Summary: A collection manager Group: Applications/Multimedia License: GPLv2 URL: http://www.periapsis.org/tellico/ Source0: http://www.periapsis.org/tellico/download/%{name}-%{version}.tar.gz +Patch0: %{name}-1.3.5-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -52,6 +53,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --disable-rpath --enable-webcam @@ -111,6 +113,10 @@ %changelog +* Thu Mar 5 2009 Alex Lancaster - 1.3.5-1 +- Update to latest upstream (1.3.5) +- Add a patch from upstream SVN r3410 which fixes build with GCC 4.4 + * Wed Feb 25 2009 Fedora Release Engineering - 1.3.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tellico/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 18 Sep 2008 14:00:11 -0000 1.16 +++ sources 5 Mar 2009 11:08:38 -0000 1.17 @@ -1 +1 @@ -d6531a9731cc50c59cd2588e7af22ff8 tellico-1.3.4.tar.gz +ca5d9db11fa1dd33dfe317ffe095435c tellico-1.3.5.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tellico/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 18 Sep 2008 14:00:11 -0000 1.16 +++ .cvsignore 5 Mar 2009 11:08:38 -0000 1.17 @@ -1 +1 @@ -tellico-1.3.4.tar.gz +tellico-1.3.5.tar.gz From dcbw at fedoraproject.org Thu Mar 5 11:09:50 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 11:09:50 +0000 (UTC) Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.26, 1.27 NetworkManager-vpnc.spec, 1.51, 1.52 sources, 1.32, 1.33 Message-ID: <20090305110950.7DD5270116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager-vpnc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3222 Modified Files: .cvsignore NetworkManager-vpnc.spec sources Log Message: * Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 - Update to 0.7.1rc3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 19 Feb 2009 13:41:48 -0000 1.26 +++ .cvsignore 5 Mar 2009 11:09:19 -0000 1.27 @@ -22,3 +22,4 @@ NetworkManager-vpnc-0.7.0.svn4326.tar.gz NetworkManager-vpnc-0.7.0.svn13.tar.gz NetworkManager-vpnc-0.7.0.97.tar.gz +NetworkManager-vpnc-0.7.0.99.tar.gz Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- NetworkManager-vpnc.spec 23 Feb 2009 22:10:02 -0000 1.51 +++ NetworkManager-vpnc.spec 5 Mar 2009 11:09:20 -0000 1.52 @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.0-1 +%define nm_version 1:0.7.0.99-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define vpnc_version 0.4 @@ -9,8 +9,8 @@ Summary: NetworkManager VPN plugin for vpnc Name: NetworkManager-vpnc Epoch: 1 -Version: 0.7.0.97 -Release: 2%{svn_snapshot}%{?dist} +Version: 0.7.0.99 +Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -97,6 +97,9 @@ %dir %{_datadir}/gnome-vpn-properties/vpnc %changelog +* Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 +- Update to 0.7.1rc3 + * Mon Feb 23 2009 Fedora Release Engineering - 1:0.7.0.97-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 19 Feb 2009 13:41:48 -0000 1.32 +++ sources 5 Mar 2009 11:09:20 -0000 1.33 @@ -1 +1 @@ -a68cb9592c426ec95ac1bd8783fc46f5 NetworkManager-vpnc-0.7.0.97.tar.gz +70c57da49eaa10baad6dc765d2ffed1c NetworkManager-vpnc-0.7.0.99.tar.gz From gd at fedoraproject.org Thu Mar 5 11:30:53 2009 From: gd at fedoraproject.org (Guenther Deschner) Date: Thu, 5 Mar 2009 11:30:53 +0000 (UTC) Subject: rpms/samba/devel samba.spec,1.175,1.176 Message-ID: <20090305113053.C9E8C70116@cvs1.fedora.phx.redhat.com> Author: gd Update of /cvs/pkgs/rpms/samba/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6141 Modified Files: samba.spec Log Message: Add libcap-devel to requires list (resolves: #488559) Guenther Index: samba.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- samba.spec 4 Mar 2009 05:29:53 -0000 1.175 +++ samba.spec 5 Mar 2009 11:30:20 -0000 1.176 @@ -1,4 +1,4 @@ -%define main_release 29 +%define main_release 30 %define samba_version 3.3.1 %define tdb_version 1.1.2 %define talloc_version 1.2.0 @@ -54,7 +54,7 @@ Requires(post): /sbin/chkconfig, /sbin/service Requires(preun): /sbin/chkconfig, /sbin/service BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel, krb5-devel, openldap-devel, openssl-devel, cups-devel, ctdb-devel -BuildRequires: autoconf, gawk, popt-devel, gtk2-devel +BuildRequires: autoconf, gawk, popt-devel, gtk2-devel, libcap-devel # Working around perl dependency problem from docs %define __perl_requires %{SOURCE999} @@ -879,6 +879,9 @@ %{_datadir}/pixmaps/samba/logo-small.png %changelog +* Thu Mar 25 2009 Guenther Deschner - 3.3.1-0.30 +- Add libcap-devel to requires list (resolves: #488559) + * Tue Mar 3 2009 Simo Sorce - 3.3.1-0.29 - Make the talloc and ldb packages optionsl and disable their build within the samba3 package, they are now built as part of the samba4 package From gd at fedoraproject.org Thu Mar 5 11:33:51 2009 From: gd at fedoraproject.org (Guenther Deschner) Date: Thu, 5 Mar 2009 11:33:51 +0000 (UTC) Subject: rpms/samba/F-10 samba.spec,1.168,1.169 Message-ID: <20090305113351.D416F70116@cvs1.fedora.phx.redhat.com> Author: gd Update of /cvs/pkgs/rpms/samba/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6955 Modified Files: samba.spec Log Message: Add libcap-devel to requires list (resolves: #488559). Guenther Index: samba.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba/F-10/samba.spec,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- samba.spec 3 Feb 2009 18:32:24 -0000 1.168 +++ samba.spec 5 Mar 2009 11:33:21 -0000 1.169 @@ -1,4 +1,4 @@ -%define main_release 26 +%define main_release 27 %define samba_version 3.2.8 %define tdb_version 1.1.1 %define talloc_version 1.2.0 @@ -54,7 +54,7 @@ Requires(post): /sbin/chkconfig, /sbin/service Requires(preun): /sbin/chkconfig, /sbin/service BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel, krb5-devel, openldap-devel, openssl-devel, cups-devel -BuildRequires: autoconf, gawk, popt-devel, gtk2-devel +BuildRequires: autoconf, gawk, popt-devel, gtk2-devel, libcap-devel # Working around perl dependency problem from docs %define __perl_requires %{SOURCE999} @@ -824,6 +824,9 @@ %{_datadir}/pixmaps/samba/logo-small.png %changelog +* Thu Mar 5 2009 Guenther Deschner - 3.2.8-0.27 +- Add libcap-devel to requires list (resolves: #488559) + * Tue Feb 3 2009 Guenther Deschner - 3.2.8-0.26 - Update to 3.2.8 - Fix cups connections (resolves: #479743) From gd at fedoraproject.org Thu Mar 5 11:37:06 2009 From: gd at fedoraproject.org (Guenther Deschner) Date: Thu, 5 Mar 2009 11:37:06 +0000 (UTC) Subject: rpms/samba/F-9 samba.spec,1.167,1.168 Message-ID: <20090305113706.A478570116@cvs1.fedora.phx.redhat.com> Author: gd Update of /cvs/pkgs/rpms/samba/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7523 Modified Files: samba.spec Log Message: Add libcap-devel to requires list (resolves: #488559). Guenther Index: samba.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba/F-9/samba.spec,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- samba.spec 3 Feb 2009 18:33:11 -0000 1.167 +++ samba.spec 5 Mar 2009 11:36:35 -0000 1.168 @@ -1,4 +1,4 @@ -%define main_release 25 +%define main_release 26 %define samba_version 3.2.8 %define tdb_version 1.1.1 %define talloc_version 1.2.0 @@ -54,7 +54,7 @@ Requires(post): /sbin/chkconfig, /sbin/service Requires(preun): /sbin/chkconfig, /sbin/service BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel, krb5-devel, openldap-devel, openssl-devel, cups-devel -BuildRequires: autoconf, gawk, popt-devel, gtk2-devel +BuildRequires: autoconf, gawk, popt-devel, gtk2-devel, libcap-devel # Working around perl dependency problem from docs %define __perl_requires %{SOURCE999} @@ -824,6 +824,9 @@ %{_datadir}/pixmaps/samba/logo-small.png %changelog +* Thu Mar 5 2009 Guenther Deschner - 3.2.8-0.26 +- Add libcap-devel to requires list (resolves: #488559) + * Tue Feb 3 2009 Guenther Deschner - 3.2.8-0.24 - Update to 3.2.8 - Fix cups connections (resolves: #479743) From arbiter at fedoraproject.org Thu Mar 5 11:58:49 2009 From: arbiter at fedoraproject.org (Lorenzo Villani) Date: Thu, 5 Mar 2009 11:58:49 +0000 (UTC) Subject: rpms/bip/devel bip.spec,1.7,1.8 Message-ID: <20090305115849.5A67570116@cvs1.fedora.phx.redhat.com> Author: arbiter Update of /cvs/pkgs/rpms/bip/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28169 Modified Files: bip.spec Log Message: 0.8.0 Index: bip.spec =================================================================== RCS file: /cvs/pkgs/rpms/bip/devel/bip.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bip.spec 24 Feb 2009 04:47:26 -0000 1.7 +++ bip.spec 5 Mar 2009 11:58:16 -0000 1.8 @@ -1,6 +1,6 @@ Name: bip -Version: 0.7.5 -Release: 4%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: IRC Bouncer Group: Applications/Internet License: GPLv2+ @@ -83,6 +83,9 @@ %attr(-,bip,bip) %dir %{_localstatedir}/log/bip %changelog +* Thu Mar 05 2009 Lorenzo Villani - 0.8.0-1 +- 0.8.0 + * Mon Feb 23 2009 Fedora Release Engineering - 0.7.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From than at fedoraproject.org Thu Mar 5 11:59:46 2009 From: than at fedoraproject.org (Than Ngo) Date: Thu, 5 Mar 2009 11:59:46 +0000 (UTC) Subject: rpms/kdeutils/F-9 .cvsignore,1.54,1.55 Message-ID: <20090305115946.956D470116@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdeutils/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28356 Modified Files: .cvsignore Log Message: upload tar file again Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdeutils/F-9/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 28 Jan 2009 16:52:13 -0000 1.54 +++ .cvsignore 5 Mar 2009 11:59:16 -0000 1.55 @@ -1,2 +1,3 @@ kdeutils-4.2.0.tar.bz2 kdepim-4.2.0.tar.bz2 +kdepim-4.2.1.tar.bz2 From pvrabec at fedoraproject.org Thu Mar 5 12:00:14 2009 From: pvrabec at fedoraproject.org (Peter Vrabec) Date: Thu, 5 Mar 2009 12:00:14 +0000 (UTC) Subject: rpms/ntop/devel ntop-geoip.patch,NONE,1.1 ntop.spec,1.6,1.7 Message-ID: <20090305120014.8811B70116@cvs1.fedora.phx.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/ntop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28539 Modified Files: ntop.spec Added Files: ntop-geoip.patch Log Message: build against existing package (#488419) ntop-geoip.patch: --- NEW FILE ntop-geoip.patch --- diff -up ntop-3.3.9/configure.in.geo ntop-3.3.9/configure.in --- ntop-3.3.9/configure.in.geo 2009-03-05 11:30:53.000000000 +0100 +++ ntop-3.3.9/configure.in 2009-03-05 11:30:53.000000000 +0100 @@ -1890,40 +1890,23 @@ else }'` fi -dnl> GeoIP (http://www.maxmind.com/) -if test -f "GeoIP.tar.gz"; then - echo "GeoIP already present on this machine" -else - wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz - tar xvfz GeoIP.tar.gz - GEO_DIR=`find $PWD -type d -name "GeoIP-*"` - cd $GEO_DIR; ./configure; make; cd .. - # OSX Fix - GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib" - if test -f $GEO_DYLIB; then - ln -s $GEO_DYLIB . - fi -fi - -if test -f "GeoLiteCity.dat"; then - echo "GeoLiteCity.dat already present" -else - wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz - gunzip GeoLiteCity.dat.gz -fi - -if test -f "GeoIPASNum.dat"; then - echo "GeoIPASNum.dat already present" -else - wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz - gunzip GeoIPASNum.dat.gz +# +#GeoIP +# +AC_CHECK_HEADERS( + [GeoIP.h], + [geoip_header="yes"], + [AC_MSG_FAILURE([GeoIP header file is missing])] +) +if test "$geoip_header" = "yes"; then + AC_CHECK_LIB(GeoIP, GeoIP_open, + [geoip_libs="yes"], + [AC_MSG_FAILURE([GeoIP library is missing])] + ) +fi +if test "$geoip_libs" = "yes"; then + LDFLAGS="${LDFLAGS} -lGeoIP" fi - - -GEO_DIR=`find $PWD -type d -name "GeoIP-*"` -GEO_IP="$GEO_DIR/libGeoIP/" -CFLAGS="$CFLAGS -I$GEO_IP" -LDFLAGS="$LDFLAGS -L$GEO_IP.libs/ -lGeoIP" dnl> NTOPCONFIGDEBUG_SETTINGS([precet]) diff -up ntop-3.3.9/Makefile.am.geo ntop-3.3.9/Makefile.am --- ntop-3.3.9/Makefile.am.geo 2009-03-05 11:39:26.000000000 +0100 +++ ntop-3.3.9/Makefile.am 2009-03-05 12:20:11.000000000 +0100 @@ -262,8 +262,6 @@ libclean: install: install-recursive - cd @GEO_DIR@; make install - @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR) @echo "" Index: ntop.spec =================================================================== RCS file: /cvs/extras/rpms/ntop/devel/ntop.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ntop.spec 3 Mar 2009 09:14:00 -0000 1.6 +++ ntop.spec 5 Mar 2009 11:59:44 -0000 1.7 @@ -1,6 +1,6 @@ Name: ntop Version: 3.3.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A network traffic probe similar to the UNIX top command Group: Applications/Internet License: GPLv2 @@ -8,18 +8,19 @@ Source0: http://downloads.sourceforge.net/ntop/ntop-%{version}.tar.gz Source1: ntop.init Source2: ntop.conf -Source3: GeoIP.tar.gz -Source4: GeoLiteCity.dat.gz -Source5: GeoIPASNum.dat.gz +Source3: GeoLiteCity.dat.gz +Source4: GeoIPASNum.dat.gz Patch1: ntop-am.patch Patch2: ntop-running-user.patch Patch3: ntop-dbfile-default-dir.patch Patch4: ntop-enable-sslv3.patch +Patch5: ntop-geoip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake, pkgconfig, libtool, groff, libpcap-devel wget BuildRequires: gdbm-devel, gd-devel, rrdtool-devel, openssl-devel BuildRequires: net-snmp-devel, lm_sensors-devel, pcre-devel, mysql-devel BuildRequires: tcp_wrappers-devel, perl(ExtUtils::Embed) +BuildRequires: GeoIP-devel Requires: initscripts, graphviz Requires(post): /sbin/chkconfig Requires(post): openssl >= 0.9.7f-4, /bin/cat @@ -50,10 +51,8 @@ %prep %setup -q -n ntop-%{version} -#this looks stupid, ask upstream -cp %SOURCE3 ./ && tar xvfz GeoIP.tar.gz -cp %SOURCE4 ./ && gunzip GeoLiteCity.dat.gz -cp %SOURCE5 ./ && gunzip GeoIPASNum.dat.gz +cp %SOURCE3 ./ && gunzip GeoLiteCity.dat.gz +cp %SOURCE4 ./ && gunzip GeoIPASNum.dat.gz # executable bits are set on some config files and docs that go into # %%{_sysconfdir}/ntop and %%{_datadir}, and some debug source files. Remove @@ -66,22 +65,9 @@ %patch2 -p1 -b .user %patch3 -p1 -b .dbfile-default-dir %patch4 -p1 -b .sslv3 - -#fix files not in UTF-8 -for file in {geoiplookup.1.in,geoiplookup6.1.in,geoipupdate.1.in} -do - mv GeoIP-1.4.6/man/"$file" GeoIP-1.4.6/man/"$file".ISO; - iconv -f ISO_8859-1 -t UTF8 GeoIP-1.4.6/man/"$file".ISO > GeoIP-1.4.6/man/"$file"; -done +%patch5 -p1 -b .geo %build -#take care of GeoIP -cd GeoIP-1.4.6 -%{configure} --disable-static --libdir=/usr/%{_lib} -#rpath problem -sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -cd .. - #run ntop own autoconf wrapper ./autogen.sh --noconfig @@ -94,9 +80,6 @@ #rpath problem sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -#take care of GeoIP -cd GeoIP-1.4.6 && make %{?_smp_mflags} && cd .. - make %{?_smp_mflags} %install @@ -124,10 +107,6 @@ #remove expired certificate rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/ntop/ntop-cert.pem -#get a rid of GeoIP devel stuff -rm -rf $RPM_BUILD_ROOT/%{_includedir} -rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib{GeoIP,GeoIPUpdate}.so - %clean rm -rf $RPM_BUILD_ROOT @@ -185,16 +164,11 @@ %doc docs/1STRUN.txt NEWS README SUPPORT_NTOP.txt THANKS %config(noreplace) %{_sysconfdir}/ntop.conf %config(noreplace) %{_sysconfdir}/ntop -%config(noreplace) %{_sysconfdir}/GeoIP.conf -%config(noreplace) %{_sysconfdir}/GeoIP.conf.default %{_initrddir}/ntop %{_sbindir}/* -%{_bindir}/* %{_libdir}/* -%{_mandir}/man1/* %{_mandir}/man8/* %{_datadir}/ntop -%{_datadir}/GeoIP %dir %{_localstatedir}/lib/ntop %defattr(0644,root,root,-) %ghost %{_localstatedir}/lib/ntop/addressQueue.db @@ -211,6 +185,9 @@ %{_localstatedir}/lib/ntop/rrd %changelog +* Thu Mar 05 2009 Peter Vrabec - 3.3.9-3 +- build against existing package (#488419) + * Tue Mar 03 2009 Peter Vrabec - 3.3.9-2 - do not create new certificate if there is already one installed From pkgdb at fedoraproject.org Thu Mar 5 12:02:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 12:02:12 +0000 Subject: [pkgdb] gnome-bluetooth ownership updated Message-ID: <20090305120233.B824620820B@bastion.fedora.phx.redhat.com> Package gnome-bluetooth in Fedora 8 was orphaned by jmoskovc To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From pkgdb at fedoraproject.org Thu Mar 5 12:02:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 12:02:40 +0000 Subject: [pkgdb] gnome-bluetooth ownership updated Message-ID: <20090305120240.0C7F5208543@bastion.fedora.phx.redhat.com> Package gnome-bluetooth in Fedora devel was orphaned by jmoskovc To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From pkgdb at fedoraproject.org Thu Mar 5 12:01:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 12:01:59 +0000 Subject: [pkgdb] gnome-bluetooth ownership updated Message-ID: <20090305120242.09D4C208545@bastion.fedora.phx.redhat.com> Package gnome-bluetooth in Fedora 10 was orphaned by jmoskovc To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From nbecker at fedoraproject.org Thu Mar 5 12:04:28 2009 From: nbecker at fedoraproject.org (Neal Becker) Date: Thu, 5 Mar 2009 12:04:28 +0000 (UTC) Subject: rpms/mercurial/F-9 mercurial.spec,1.55,1.56 sources,1.23,1.24 Message-ID: <20090305120429.1C86E70116@cvs1.fedora.phx.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/mercurial/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29521 Modified Files: mercurial.spec sources Log Message: update to 1.2 Index: mercurial.spec =================================================================== RCS file: /cvs/pkgs/rpms/mercurial/F-9/mercurial.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- mercurial.spec 27 Feb 2009 16:28:21 -0000 1.55 +++ mercurial.spec 5 Mar 2009 12:03:58 -0000 1.56 @@ -2,15 +2,15 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.1.2 -Release: 7%{?dist} +Version: 1.2 +Release: 2%{?dist} License: GPLv2 Group: Development/Tools URL: http://www.selenic.com/mercurial/ Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz Source1: mercurial-site-start.el # temporary fix for filemerge bug -Patch0: mercurial-mergetools.hgrc.patch +#Patch0: mercurial-mergetools.hgrc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: python python-devel BuildRequires: emacs emacs-el pkgconfig @@ -79,7 +79,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %build make all @@ -170,6 +170,12 @@ #cd tests && %{__python} run-tests.py %changelog +* Wed Mar 4 2009 Neal Becker - 1.2-2 +- patch0 for filemerge bug should not be needed + +* Wed Mar 4 2009 Neal Becker - 1.2-1 +- Update to 1.2 + * Tue Feb 24 2009 Neal Becker - 1.1.2-7 - Use noreplace option on config Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mercurial/F-9/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 1 Jan 2009 18:13:06 -0000 1.23 +++ sources 5 Mar 2009 12:03:58 -0000 1.24 @@ -1 +1 @@ -4fd3b9a2e5dcd025840c3849b136bec8 mercurial-1.1.2.tar.gz +ac9d16b078f99f7a89d6865421570f05 mercurial-1.2.tar.gz From lennart at fedoraproject.org Thu Mar 5 12:07:20 2009 From: lennart at fedoraproject.org (Lennart Poettering) Date: Thu, 5 Mar 2009 12:07:20 +0000 (UTC) Subject: rpms/pulseaudio/devel .cvsignore, 1.28, 1.29 pulseaudio.spec, 1.71, 1.72 sources, 1.29, 1.30 116b38c972942ccbbb8dae5dc0181da98096a0ce.patch, 1.1, NONE Message-ID: <20090305120720.8413370116@cvs1.fedora.phx.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/pulseaudio/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30256 Modified Files: .cvsignore pulseaudio.spec sources Removed Files: 116b38c972942ccbbb8dae5dc0181da98096a0ce.patch Log Message: New test release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 24 Feb 2009 23:00:49 -0000 1.28 +++ .cvsignore 5 Mar 2009 12:06:49 -0000 1.29 @@ -1 +1 @@ -pulseaudio-0.9.15-test3.tar.gz +pulseaudio-0.9.15-test4.tar.gz Index: pulseaudio.spec =================================================================== RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- pulseaudio.spec 27 Feb 2009 00:24:35 -0000 1.71 +++ pulseaudio.spec 5 Mar 2009 12:06:49 -0000 1.72 @@ -3,10 +3,10 @@ Name: pulseaudio Summary: Improved Linux sound server Version: 0.9.15 -Release: 3.test3%{?dist} +Release: 3.test4%{?dist} License: GPLv2+ Group: System Environment/Daemons -Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test3.tar.gz +Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test4.tar.gz URL: http://pulseaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: m4 @@ -44,10 +44,11 @@ BuildRequires: gdbm-devel BuildRequires: speex-devel >= 1.2 BuildRequires: libasyncns-devel +BuildRequires: libudev-devel Obsoletes: pulseaudio-devel Obsoletes: pulseaudio-core-libs Provides: pulseaudio-core-libs -Patch0: 116b38c972942ccbbb8dae5dc0181da98096a0ce.patch +Requires: udev-extras %description PulseAudio is a sound server for Linux and other Unix like operating @@ -184,8 +185,7 @@ This package contains command line utilities for the PulseAudio sound server. %prep -%setup -q -T -b0 -n pulseaudio-0.9.15-test3 -%patch0 -p1 -b .116b38c972942ccbbb8dae5dc0181da98096a0ce +%setup -q -T -b0 -n pulseaudio-0.9.15-test4 %build CFLAGS="-ggdb" %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access @@ -407,6 +407,9 @@ %{_mandir}/man1/pax11publish.1.gz %changelog +* Thu Mar 5 2009 Lennart Poettering 0.9.15-3.test4 +- New test release + * Fri Feb 27 2009 Lennart Poettering 0.9.15-3.test3 - Steal patch from git master to fix .so dependencies Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 24 Feb 2009 23:00:49 -0000 1.29 +++ sources 5 Mar 2009 12:06:50 -0000 1.30 @@ -1 +1 @@ -131d231b6c9cc2eea59183d643dc831a pulseaudio-0.9.15-test3.tar.gz +ccaea6a47e3f488db430c6f7854b3a58 pulseaudio-0.9.15-test4.tar.gz --- 116b38c972942ccbbb8dae5dc0181da98096a0ce.patch DELETED --- From msivak at fedoraproject.org Thu Mar 5 12:08:46 2009 From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=) Date: Thu, 5 Mar 2009 12:08:46 +0000 (UTC) Subject: rpms/python-cryptsetup/devel .cvsignore, 1.7, 1.8 python-cryptsetup.spec, 1.6, 1.7 sources, 1.7, 1.8 Message-ID: <20090305120846.58B2270116@cvs1.fedora.phx.redhat.com> Author: msivak Update of /cvs/extras/rpms/python-cryptsetup/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30556 Modified Files: .cvsignore python-cryptsetup.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 2 Mar 2009 14:09:30 -0000 1.7 +++ .cvsignore 5 Mar 2009 12:08:15 -0000 1.8 @@ -1 +1 @@ -python-cryptsetup-0.0.6.tar.bz2 +python-cryptsetup-0.0.7.tar.bz2 Index: python-cryptsetup.spec =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/python-cryptsetup.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-cryptsetup.spec 2 Mar 2009 14:09:30 -0000 1.6 +++ python-cryptsetup.spec 5 Mar 2009 12:08:15 -0000 1.7 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-cryptsetup -Version: 0.0.6 +Version: 0.0.7 Release: 1%{?dist} Summary: Python bindings for cryptsetup @@ -42,17 +42,20 @@ %doc selftest.py %changelog -* Mon Mar 01 2009 Martin Sivak - 0.0.5-1 +* Wed Mar 05 2209 Martin Sivak - 0.0.7-1 +- add default cipher mode and key to luksFormat + +* Mon Mar 02 2009 Martin Sivak - 0.0.6-1 - fix the UUID extraction logic - fix the key manipulation -* Mon Mar 01 2009 Martin Sivak - 0.0.5-1 +* Mon Mar 02 2009 Martin Sivak - 0.0.5-1 - fix the luksUUID -* Mon Mar 01 2009 Martin Sivak - 0.0.4-1 +* Mon Mar 02 2009 Martin Sivak - 0.0.4-1 - add prepare_passphrase_file method -* Mon Mar 01 2009 Martin Sivak - 0.0.3-1 +* Mon Mar 02 2009 Martin Sivak - 0.0.3-1 - Improve documentation - luksFormat now accepts keyfile argument Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 2 Mar 2009 14:09:30 -0000 1.7 +++ sources 5 Mar 2009 12:08:16 -0000 1.8 @@ -1 +1 @@ -8bdd2ba915a1c11a50385359d0a0ea22 python-cryptsetup-0.0.6.tar.bz2 +b8fcb282df2592532c9bf35913a4488a python-cryptsetup-0.0.7.tar.bz2 From msivak at fedoraproject.org Thu Mar 5 12:13:51 2009 From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=) Date: Thu, 5 Mar 2009 12:13:51 +0000 (UTC) Subject: rpms/python-cryptsetup/devel python-cryptsetup.spec,1.7,1.8 Message-ID: <20090305121351.8D60B70116@cvs1.fedora.phx.redhat.com> Author: msivak Update of /cvs/extras/rpms/python-cryptsetup/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31641 Modified Files: python-cryptsetup.spec Log Message: fix date in changelog Index: python-cryptsetup.spec =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/python-cryptsetup.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-cryptsetup.spec 5 Mar 2009 12:08:15 -0000 1.7 +++ python-cryptsetup.spec 5 Mar 2009 12:13:21 -0000 1.8 @@ -42,7 +42,7 @@ %doc selftest.py %changelog -* Wed Mar 05 2209 Martin Sivak - 0.0.7-1 +* Wed Thu 05 2209 Martin Sivak - 0.0.7-1 - add default cipher mode and key to luksFormat * Mon Mar 02 2009 Martin Sivak - 0.0.6-1 From msivak at fedoraproject.org Thu Mar 5 12:15:45 2009 From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=) Date: Thu, 5 Mar 2009 12:15:45 +0000 (UTC) Subject: rpms/python-cryptsetup/devel python-cryptsetup.spec,1.8,1.9 Message-ID: <20090305121545.E8ED470116@cvs1.fedora.phx.redhat.com> Author: msivak Update of /cvs/extras/rpms/python-cryptsetup/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31992 Modified Files: python-cryptsetup.spec Log Message: Fix the date again Index: python-cryptsetup.spec =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/python-cryptsetup.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-cryptsetup.spec 5 Mar 2009 12:13:21 -0000 1.8 +++ python-cryptsetup.spec 5 Mar 2009 12:15:15 -0000 1.9 @@ -42,7 +42,7 @@ %doc selftest.py %changelog -* Wed Thu 05 2209 Martin Sivak - 0.0.7-1 +* Thu Mar 05 2209 Martin Sivak - 0.0.7-1 - add default cipher mode and key to luksFormat * Mon Mar 02 2009 Martin Sivak - 0.0.6-1 From caolanm at fedoraproject.org Thu Mar 5 12:16:11 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 12:16:11 +0000 (UTC) Subject: rpms/perl-Proc-ProcessTable/devel perl-Proc-ProcessTable-ARG_MAX.patch, 1.1, 1.2 perl-Proc-ProcessTable.spec, 1.7, 1.8 Message-ID: <20090305121611.D8D1170116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/perl-Proc-ProcessTable/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32084 Modified Files: perl-Proc-ProcessTable-ARG_MAX.patch perl-Proc-ProcessTable.spec Log Message: defuzz patches to build perl-Proc-ProcessTable-ARG_MAX.patch: Index: perl-Proc-ProcessTable-ARG_MAX.patch =================================================================== RCS file: /cvs/pkgs/rpms/perl-Proc-ProcessTable/devel/perl-Proc-ProcessTable-ARG_MAX.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Proc-ProcessTable-ARG_MAX.patch 5 Apr 2008 23:26:17 -0000 1.1 +++ perl-Proc-ProcessTable-ARG_MAX.patch 5 Mar 2009 12:15:41 -0000 1.2 @@ -2,9 +2,9 @@ diff -up Proc-ProcessTable-0.42/os/Linux.h.BAD Proc-ProcessTable-0.42/os/Linux.h --- Proc-ProcessTable-0.42/os/Linux.h.BAD 2008-04-05 19:24:02.000000000 -0400 +++ Proc-ProcessTable-0.42/os/Linux.h 2008-04-05 19:24:20.000000000 -0400 -@@ -14,6 +14,10 @@ - #include - #include +@@ -17,6 +17,10 @@ + #define ARG_MAX sysconf(_SC_ARG_MAX) + #endif +#ifndef ARG_MAX +#define ARG_MAX _POSIX_ARG_MAX Index: perl-Proc-ProcessTable.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Proc-ProcessTable/devel/perl-Proc-ProcessTable.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Proc-ProcessTable.spec 27 Feb 2009 00:48:44 -0000 1.7 +++ perl-Proc-ProcessTable.spec 5 Mar 2009 12:15:41 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Proc-ProcessTable Version: 0.44 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl extension to access the unix process table License: GPL+ or Artistic Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 05 2009 Caol??n McNamara - 0.44-3 +- defuzz patches to build + * Thu Feb 26 2009 Fedora Release Engineering - 0.44-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Thu Mar 5 12:20:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 12:20:40 +0000 Subject: [pkgdb] ntop had acl change status Message-ID: <20090305122039.4B38A208545@bastion.fedora.phx.redhat.com> rakesh has set the approveacls acl on ntop (Fedora devel) to Denied for pvrabec To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ntop From pkgdb at fedoraproject.org Thu Mar 5 12:19:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 12:19:52 +0000 Subject: [pkgdb] ntop had acl change status Message-ID: <20090305122034.E915B2082B2@bastion.fedora.phx.redhat.com> rakesh has set the commit acl on ntop (Fedora devel) to Denied for pvrabec To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ntop From pkgdb at fedoraproject.org Thu Mar 5 12:20:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 12:20:45 +0000 Subject: [pkgdb] ntop had acl change status Message-ID: <20090305122045.6F84820854A@bastion.fedora.phx.redhat.com> rakesh has set the commit acl on ntop (Fedora 9) to Denied for pvrabec To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ntop From pkgdb at fedoraproject.org Thu Mar 5 12:20:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 12:20:29 +0000 Subject: [pkgdb] ntop had acl change status Message-ID: <20090305122050.8D63A20854C@bastion.fedora.phx.redhat.com> rakesh has set the approveacls acl on ntop (Fedora 9) to Denied for pvrabec To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ntop From pkgdb at fedoraproject.org Thu Mar 5 12:20:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 12:20:09 +0000 Subject: [pkgdb] ntop had acl change status Message-ID: <20090305122052.4A08020854F@bastion.fedora.phx.redhat.com> rakesh has set the commit acl on ntop (Fedora 10) to Denied for pvrabec To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ntop From pkgdb at fedoraproject.org Thu Mar 5 12:20:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 12:20:57 +0000 Subject: [pkgdb] ntop had acl change status Message-ID: <20090305122056.3ADCE208553@bastion.fedora.phx.redhat.com> rakesh has set the approveacls acl on ntop (Fedora 10) to Denied for pvrabec To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ntop From msivak at fedoraproject.org Thu Mar 5 12:21:00 2009 From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=) Date: Thu, 5 Mar 2009 12:21:00 +0000 (UTC) Subject: rpms/python-cryptsetup/devel python-cryptsetup.spec,1.9,1.10 Message-ID: <20090305122100.4B60770116@cvs1.fedora.phx.redhat.com> Author: msivak Update of /cvs/extras/rpms/python-cryptsetup/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv476 Modified Files: python-cryptsetup.spec Log Message: Fix the year in changelog Index: python-cryptsetup.spec =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/python-cryptsetup.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-cryptsetup.spec 5 Mar 2009 12:15:15 -0000 1.9 +++ python-cryptsetup.spec 5 Mar 2009 12:20:29 -0000 1.10 @@ -42,7 +42,7 @@ %doc selftest.py %changelog -* Thu Mar 05 2209 Martin Sivak - 0.0.7-1 +* Thu Mar 05 2009 Martin Sivak - 0.0.7-1 - add default cipher mode and key to luksFormat * Mon Mar 02 2009 Martin Sivak - 0.0.6-1 From caolanm at fedoraproject.org Thu Mar 5 12:38:20 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 12:38:20 +0000 (UTC) Subject: rpms/lordsawar/devel lordsawar-0.1.4-includes.patch, NONE, 1.1 lordsawar.spec, 1.4, 1.5 Message-ID: <20090305123820.7A9C970116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/lordsawar/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3092 Modified Files: lordsawar.spec Added Files: lordsawar-0.1.4-includes.patch Log Message: include stdio.h for printf lordsawar-0.1.4-includes.patch: --- NEW FILE lordsawar-0.1.4-includes.patch --- diff -ru lordsawar-0.1.4.orig/src/network-connection.cpp lordsawar-0.1.4/src/network-connection.cpp --- lordsawar-0.1.4.orig/src/network-connection.cpp 2009-03-05 12:12:40.000000000 +0000 +++ lordsawar-0.1.4/src/network-connection.cpp 2009-03-05 12:13:46.000000000 +0000 @@ -20,6 +20,7 @@ #include #include #include +#include #include #include "network-common.h" Index: lordsawar.spec =================================================================== RCS file: /cvs/pkgs/rpms/lordsawar/devel/lordsawar.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lordsawar.spec 25 Feb 2009 20:59:33 -0000 1.4 +++ lordsawar.spec 5 Mar 2009 12:37:50 -0000 1.5 @@ -1,6 +1,6 @@ Name: lordsawar Version: 0.1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Turn-based strategy game in a fantasy setting Group: Amusements/Games @@ -15,12 +15,15 @@ BuildRequires: libjpeg-devel BuildRequires: intltool >= 0.35.0 +Patch0: lordsawar-0.1.4-includes.patch + %description LordsAWar! is a turn-based strategy game set in a fantasy setting. %prep %setup -q +%patch0 -p1 -b .includes sed -i.orig -e "s/Comment=Play a clone of Warlords II/Comment=Play a turn-based strategy game/" dat/lordsawar.desktop @@ -57,6 +60,9 @@ %changelog +* Thu Mar 05 2009 Caol??n McNamara - 0.1.4-4 +- include stdio.h for printf + * Wed Feb 25 2009 Fedora Release Engineering - 0.1.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From berrange at fedoraproject.org Thu Mar 5 12:38:31 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Thu, 5 Mar 2009 12:38:31 +0000 (UTC) Subject: rpms/qemu/devel qemu.spec,1.58,1.59 Message-ID: <20090305123831.ED43870116@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3132 Modified Files: qemu.spec Log Message: Added BSD to license list Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- qemu.spec 4 Mar 2009 18:22:44 -0000 1.58 +++ qemu.spec 5 Mar 2009 12:38:01 -0000 1.59 @@ -1,11 +1,11 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.9.2 -Release: 0.1.kvm20090303git%{?dist} +Release: 0.2.kvm20090303git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 -License: GPLv2+ and LGPLv2+ +License: GPLv2+ and LGPLv2+ and BSD Group: Development/Tools URL: http://www.qemu.org/ #Source0: http://www.qemu.org/%{name}-%{version}.tar.gz @@ -422,6 +422,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Thu Mar 5 2009 Daniel P. Berrange - 2:0.9.2-0.2.kvm20090303git +- Added BSD to license list, since many files are covered by BSD + * Wed Mar 04 2009 Glauber Costa - 0.9.2-0.1.kvm20090303git - missing a dot. shame on me From ltinkl at fedoraproject.org Thu Mar 5 12:43:35 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Thu, 5 Mar 2009 12:43:35 +0000 (UTC) Subject: rpms/strigi/F-9 strigi-gcc44.patch, NONE, 1.1 sources, 1.10, 1.11 strigi-daemon.desktop, 1.1, 1.2 strigi.spec, 1.19, 1.20 strigiclient.desktop, 1.1, 1.2 Message-ID: <20090305124335.DCCE470117@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/strigi/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3886/F-9 Modified Files: sources strigi-daemon.desktop strigi.spec strigiclient.desktop Added Files: strigi-gcc44.patch Log Message: Strigi 0.6.4 (sync with devel) strigi-gcc44.patch: --- NEW FILE strigi-gcc44.patch --- --- src/luceneindexer/jsgzipcompressstream.h 2009-02-01 14:55:38.000000000 -0500 +++ src/luceneindexer/jsgzipcompressstream.h.new 2009-02-04 15:59:47.853800775 -0500 @@ -20,6 +20,7 @@ #ifndef GZIPCOMPRESSSTREAM_H #define GZIPCOMPRESSSTREAM_H +#include #include // (u)int64_t #include #include --- src/daemon/strigithread.cpp 2009-02-01 14:56:01.000000000 -0500 +++ src/daemon/strigithread.cpp.new 2009-02-04 15:10:27.600054542 -0500 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include Index: sources =================================================================== RCS file: /cvs/extras/rpms/strigi/F-9/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 26 Jan 2009 11:24:03 -0000 1.10 +++ sources 5 Mar 2009 12:43:05 -0000 1.11 @@ -1 +1 @@ -52787a80278d24b0ee552b81bbf547aa strigi-0.6.3.tar.bz2 +324fd9606ac77765501717ff92c04f9a strigi-0.6.4.tar.bz2 Index: strigi-daemon.desktop =================================================================== RCS file: /cvs/extras/rpms/strigi/F-9/strigi-daemon.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- strigi-daemon.desktop 17 May 2007 01:54:05 -0000 1.1 +++ strigi-daemon.desktop 5 Mar 2009 12:43:05 -0000 1.2 @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=Strigi Comment=strigi search engine daemon Icon= @@ -10,4 +9,4 @@ X-KDE-autostart-after=panel X-KDE-StartupNotify=false X-KDE-UniqueApplet=true -NoDisplay=true +#NoDisplay=true Index: strigi.spec =================================================================== RCS file: /cvs/extras/rpms/strigi/F-9/strigi.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- strigi.spec 26 Jan 2009 11:24:04 -0000 1.19 +++ strigi.spec 5 Mar 2009 12:43:05 -0000 1.20 @@ -1,7 +1,7 @@ Name: strigi -Version: 0.6.3 -Release: 1%{?dist} -Summary: A desktop search program for KDE +Version: 0.6.4 +Release: 3%{?dist} +Summary: A desktop search program Group: Applications/Productivity License: LGPLv2+ URL: http://www.vandenoever.info/software/strigi @@ -9,6 +9,7 @@ Source1: strigiclient.desktop Source2: strigi-daemon.desktop Patch0: strigi-0.6.2-multilib.patch +Patch1: strigi-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake >= 2.4.5 @@ -52,6 +53,7 @@ %prep %setup -q %patch0 -p1 -b .multilib +%patch1 -p0 -b .gcc44 %build mkdir -p %{_target_platform} @@ -93,20 +95,34 @@ %{_datadir}/applications/*strigiclient.desktop %{_datadir}/dbus-1/services/*.service %{_sysconfdir}/xdg/autostart/strigi-daemon.desktop -%{_datadir}/strigi/ %files devel %defattr(-,root,root,-) -%{_libdir}/*.so +%{_libdir}/lib*.so %{_libdir}/pkgconfig/libstream*.pc +%{_libdir}/strigi/*.cmake %{_includedir}/strigi/ %files libs %defattr(-,root,root,-) -%{_libdir}/*.so.* +%{_datadir}/strigi/ +%{_libdir}/lib*.so.* %{_libdir}/strigi/ +%exclude %{_libdir}/strigi/*.cmake %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 04 2009 Deji Akingunola - 0.6.4-2 +- Add patch to build with gcc-4.4 + +* Mon Feb 02 2009 Rex Dieter - 0.6.4-1 +- strigi-0.6.4 +- Summary: s/for KDE// +- *.desktop: validate, remove OnlyShowIn=KDE +- -devel: move *.cmake here + * Mon Jan 12 2009 Rex Dieter - 0.6.3-1 - strigi-0.6.3 Index: strigiclient.desktop =================================================================== RCS file: /cvs/extras/rpms/strigi/F-9/strigiclient.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- strigiclient.desktop 5 May 2007 16:21:53 -0000 1.1 +++ strigiclient.desktop 5 Mar 2009 12:43:05 -0000 1.2 @@ -1,9 +1,7 @@ [Desktop Entry] -Encoding=UTF-8 Type=Application Icon= Exec=/usr/bin/strigiclient Name=strigi client Comment=Strigi daemon configuration tool Categories=Qt;KDE;Settings; -OnlyShowIn=KDE; From ltinkl at fedoraproject.org Thu Mar 5 12:43:35 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Thu, 5 Mar 2009 12:43:35 +0000 (UTC) Subject: rpms/strigi/F-10 strigi-gcc44.patch, NONE, 1.1 sources, 1.12, 1.13 strigi-daemon.desktop, 1.1, 1.2 strigi.spec, 1.23, 1.24 strigiclient.desktop, 1.1, 1.2 Message-ID: <20090305124335.B20BE70116@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/strigi/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3886/F-10 Modified Files: sources strigi-daemon.desktop strigi.spec strigiclient.desktop Added Files: strigi-gcc44.patch Log Message: Strigi 0.6.4 (sync with devel) strigi-gcc44.patch: --- NEW FILE strigi-gcc44.patch --- --- src/luceneindexer/jsgzipcompressstream.h 2009-02-01 14:55:38.000000000 -0500 +++ src/luceneindexer/jsgzipcompressstream.h.new 2009-02-04 15:59:47.853800775 -0500 @@ -20,6 +20,7 @@ #ifndef GZIPCOMPRESSSTREAM_H #define GZIPCOMPRESSSTREAM_H +#include #include // (u)int64_t #include #include --- src/daemon/strigithread.cpp 2009-02-01 14:56:01.000000000 -0500 +++ src/daemon/strigithread.cpp.new 2009-02-04 15:10:27.600054542 -0500 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include Index: sources =================================================================== RCS file: /cvs/extras/rpms/strigi/F-10/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 23 Jan 2009 16:50:46 -0000 1.12 +++ sources 5 Mar 2009 12:43:05 -0000 1.13 @@ -1 +1 @@ -52787a80278d24b0ee552b81bbf547aa strigi-0.6.3.tar.bz2 +324fd9606ac77765501717ff92c04f9a strigi-0.6.4.tar.bz2 Index: strigi-daemon.desktop =================================================================== RCS file: /cvs/extras/rpms/strigi/F-10/strigi-daemon.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- strigi-daemon.desktop 17 May 2007 01:54:05 -0000 1.1 +++ strigi-daemon.desktop 5 Mar 2009 12:43:05 -0000 1.2 @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=Strigi Comment=strigi search engine daemon Icon= @@ -10,4 +9,4 @@ X-KDE-autostart-after=panel X-KDE-StartupNotify=false X-KDE-UniqueApplet=true -NoDisplay=true +#NoDisplay=true Index: strigi.spec =================================================================== RCS file: /cvs/extras/rpms/strigi/F-10/strigi.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- strigi.spec 23 Jan 2009 16:50:46 -0000 1.23 +++ strigi.spec 5 Mar 2009 12:43:05 -0000 1.24 @@ -1,7 +1,7 @@ Name: strigi -Version: 0.6.3 -Release: 1%{?dist} -Summary: A desktop search program for KDE +Version: 0.6.4 +Release: 3%{?dist} +Summary: A desktop search program Group: Applications/Productivity License: LGPLv2+ URL: http://www.vandenoever.info/software/strigi @@ -9,6 +9,7 @@ Source1: strigiclient.desktop Source2: strigi-daemon.desktop Patch0: strigi-0.6.2-multilib.patch +Patch1: strigi-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake >= 2.4.5 @@ -52,6 +53,7 @@ %prep %setup -q %patch0 -p1 -b .multilib +%patch1 -p0 -b .gcc44 %build mkdir -p %{_target_platform} @@ -93,20 +95,34 @@ %{_datadir}/applications/*strigiclient.desktop %{_datadir}/dbus-1/services/*.service %{_sysconfdir}/xdg/autostart/strigi-daemon.desktop -%{_datadir}/strigi/ %files devel %defattr(-,root,root,-) -%{_libdir}/*.so +%{_libdir}/lib*.so %{_libdir}/pkgconfig/libstream*.pc +%{_libdir}/strigi/*.cmake %{_includedir}/strigi/ %files libs %defattr(-,root,root,-) -%{_libdir}/*.so.* +%{_datadir}/strigi/ +%{_libdir}/lib*.so.* %{_libdir}/strigi/ +%exclude %{_libdir}/strigi/*.cmake %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 04 2009 Deji Akingunola - 0.6.4-2 +- Add patch to build with gcc-4.4 + +* Mon Feb 02 2009 Rex Dieter - 0.6.4-1 +- strigi-0.6.4 +- Summary: s/for KDE// +- *.desktop: validate, remove OnlyShowIn=KDE +- -devel: move *.cmake here + * Mon Jan 12 2009 Rex Dieter - 0.6.3-1 - strigi-0.6.3 Index: strigiclient.desktop =================================================================== RCS file: /cvs/extras/rpms/strigi/F-10/strigiclient.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- strigiclient.desktop 5 May 2007 16:21:53 -0000 1.1 +++ strigiclient.desktop 5 Mar 2009 12:43:05 -0000 1.2 @@ -1,9 +1,7 @@ [Desktop Entry] -Encoding=UTF-8 Type=Application Icon= Exec=/usr/bin/strigiclient Name=strigi client Comment=Strigi daemon configuration tool Categories=Qt;KDE;Settings; -OnlyShowIn=KDE; From rdieter at fedoraproject.org Thu Mar 5 12:49:51 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 12:49:51 +0000 (UTC) Subject: rpms/amarok/devel .cvsignore, 1.42, 1.43 amarok.spec, 1.137, 1.138 sources, 1.43, 1.44 Message-ID: <20090305124951.4BF5E70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/amarok/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5028 Modified Files: .cvsignore amarok.spec sources Log Message: * Wed Mar 04 2009 Rex Dieter 2.0.2-1 - amarok-2.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 9 Jan 2009 21:14:10 -0000 1.42 +++ .cvsignore 5 Mar 2009 12:49:20 -0000 1.43 @@ -1 +1 @@ -amarok-2.0.1.1.tar.bz2 +amarok-2.0.2.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- amarok.spec 25 Feb 2009 15:56:56 -0000 1.137 +++ amarok.spec 5 Mar 2009 12:49:20 -0000 1.138 @@ -1,8 +1,8 @@ Name: amarok Summary: Media player -Version: 2.0.1.1 -Release: 6%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -121,6 +121,9 @@ %changelog +* Wed Mar 04 2009 Rex Dieter 2.0.2-1 +- amarok-2.0.2 + * Tue Feb 24 2009 Than Ngo 2.0.1.1-6 - fix build issue against gcc-4.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 9 Jan 2009 21:14:10 -0000 1.43 +++ sources 5 Mar 2009 12:49:20 -0000 1.44 @@ -1 +1 @@ -818bc2b0350f35cba0fff0a72b9ffd22 amarok-2.0.1.1.tar.bz2 +98b78372ec6ea3432faba356c90c6dbe amarok-2.0.2.tar.bz2 From vcrhonek at fedoraproject.org Thu Mar 5 12:52:42 2009 From: vcrhonek at fedoraproject.org (Vitezslav Crhonek) Date: Thu, 5 Mar 2009 12:52:42 +0000 (UTC) Subject: rpms/kbd/devel kbd-1.15-quiet_doc.patch, NONE, 1.1 kbd.spec, 1.62, 1.63 Message-ID: <20090305125242.E20EF70116@cvs1.fedora.phx.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/kbd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5452 Modified Files: kbd.spec Added Files: kbd-1.15-quiet_doc.patch Log Message: Add loadkeys 'q' option to loadkeys manpage and --help kbd-1.15-quiet_doc.patch: --- NEW FILE kbd-1.15-quiet_doc.patch --- diff -up kbd-1.15/man/man1/loadkeys.1.in_old kbd-1.15/man/man1/loadkeys.1.in --- kbd-1.15/man/man1/loadkeys.1.in_old 2008-10-23 21:03:59.000000000 +0200 +++ kbd-1.15/man/man1/loadkeys.1.in 2009-03-05 13:11:08.000000000 +0100 @@ -19,6 +19,8 @@ loadkeys \- load keyboard translation ta ] [ .I -m --mktable ] [ +.I -q --quiet +] [ .I -s --clearstrings ] [ .I -v --verbose @@ -148,6 +150,10 @@ command (and does not modify the current .B loadkeys prints its version number and a short usage message to the programs standard error output and exits. +.TP +.B \-q \-\-quiet +.B loadkeys +suppresses all normal output. .SH WARNING Note that anyone having read access to .B /dev/console diff -up kbd-1.15/src/loadkeys.c_old kbd-1.15/src/loadkeys.c --- kbd-1.15/src/loadkeys.c_old 2008-10-23 21:03:59.000000000 +0200 +++ kbd-1.15/src/loadkeys.c 2009-03-05 13:09:00.000000000 +0100 @@ -1966,6 +1966,7 @@ usage(void) { " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" +" -q --quiet suppress all normal output\n" " -s --clearstrings clear kernel string table\n" " -u --unicode implicit conversion to Unicode\n" " -v --verbose report the changes\n"), PACKAGE_VERSION, DEFMAP); Index: kbd.spec =================================================================== RCS file: /cvs/extras/rpms/kbd/devel/kbd.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- kbd.spec 2 Mar 2009 16:23:31 -0000 1.62 +++ kbd.spec 5 Mar 2009 12:52:12 -0000 1.63 @@ -1,6 +1,6 @@ Name: kbd Version: 1.15 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) Group: System Environment/Base @@ -16,6 +16,7 @@ Patch2: kbd-1.15-sparc.patch Patch3: kbd-1.15-unicode_start.patch Patch4: kbd-1.15-resizecon-x86_64.patch +Patch5: kbd-1.15-quiet_doc.patch BuildRequires: bison, flex, gettext Conflicts: util-linux < 2.11r-9 @@ -34,6 +35,7 @@ %patch2 -p1 -b .sparc %patch3 -p1 -b .unicode_start %patch4 -p1 -b .resizecon_x86_64 +%patch5 -p1 -b .quiet_doc # 7-bit maps are obsolete; so are non-euro maps pushd data/keymaps/i386 @@ -104,6 +106,10 @@ /lib/kbd %changelog +* Thu Mar 5 2009 Vitezslav Crhonek - 1.15-7 +- Add loadkeys 'q' option to loadkeys manpage and --help + Resolves: #487538 + * Mon Mar 2 2009 Vitezslav Crhonek - 1.15-6 - Remove static loadkeys binary (it's not needed anymore) From veillard at fedoraproject.org Thu Mar 5 12:55:06 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Thu, 5 Mar 2009 12:55:06 +0000 (UTC) Subject: rpms/libvirt/devel libvirt-0.6.0-autostart-timeout.patch, 1.1, NONE libvirt-0.6.0-dbus-threads.patch, 1.1, NONE libvirt-0.6.0-qemu-startup.patch, 1.1, NONE libvirt-0.6.0-rpccall.patch, 1.2, NONE libvirt-0.6.0-timeout.patch, 1.2, NONE Message-ID: <20090305125506.687C470116@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5988 Removed Files: libvirt-0.6.0-autostart-timeout.patch libvirt-0.6.0-dbus-threads.patch libvirt-0.6.0-qemu-startup.patch libvirt-0.6.0-rpccall.patch libvirt-0.6.0-timeout.patch Log Message: Just removing the old 0.6.0 set of patches, Daniel --- libvirt-0.6.0-autostart-timeout.patch DELETED --- --- libvirt-0.6.0-dbus-threads.patch DELETED --- --- libvirt-0.6.0-qemu-startup.patch DELETED --- --- libvirt-0.6.0-rpccall.patch DELETED --- --- libvirt-0.6.0-timeout.patch DELETED --- From steved at fedoraproject.org Thu Mar 5 12:57:32 2009 From: steved at fedoraproject.org (Steve Dickson) Date: Thu, 5 Mar 2009 12:57:32 +0000 (UTC) Subject: rpms/nfs-utils/devel .cvsignore, 1.24, 1.25 nfs-utils.spec, 1.216, 1.217 sources, 1.25, 1.26 nfs-utils-1.1.4-configure-tirpc.patch, 1.1, NONE nfs-utils-1.1.4-configure-uuid.patch, 1.1, NONE nfs-utils-1.1.4-configure.patch, 1.1, NONE nfs-utils-1.1.4-export-hash.patch, 1.1, NONE nfs-utils-1.1.4-gssd-dnotify.patch, 1.1, NONE nfs-utils-1.1.4-gssd-verbosity.patch, 1.1, NONE nfs-utils-1.1.4-inet6-capable-api.patch, 1.1, NONE nfs-utils-1.1.4-inet6-rpcbind-util-funcs.patch, 1.1, NONE nfs-utils-1.1.4-mount-addrconfig.patch, 1.1, NONE nfs-utils-1.1.4-mount-inet6-support.patch, 1.1, NONE nfs-utils-1.1.4-mount-nfs_getport.patch, 1.1, NONE nfs-utils-1.1.4-mount-nolock.patch, 1.1, NONE nfs-utils-1.1.4-mount-po_get_numeric.patch, 1.1, NONE nfs-utils-1.1.4-mount-textbased.patch, 1.3, NONE nfs-utils-1.1.4-mount-udponly.patch, 1.1, NONE nfs-utils-1.1.4-showmount-rpcbind.patch, 1.1, NONE nfs-utils-1.1.4-sm-notify-freeaddrinfo.patch, 1.1, NONE nfs-utils-1.1.4-sm-notify-typo.patch, 1.1, NONE nfs-utils-1.1.4-statd-setuid.patch, 1.1, NONE nfs-utils-1.1.4-statd-xunlink.patch, 1.1, NONE nfs-utils-1.1.4-svcgssd-expiration.patch, 1.1, NONE nfs-utils-1.1.4-tcpwrap-cleanup.patch, 1.1, NONE nfs-utils-1.1.4-tcpwrap-hash.patch, 1.1, NONE nfs-utils-1.1.4-tcpwrap-newrules.patch, 1.1, NONE nfs-utils-1.1.4-tcpwrap-warn.patch, 1.1, NONE nfs-utils-1.1.4-tcpwrapper-update.patch, 1.1, NONE nfs-utils-1.1.4-umount-ipv6.patch, 1.1, NONE Message-ID: <20090305125732.D77C070116@cvs1.fedora.phx.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6403 Modified Files: .cvsignore nfs-utils.spec sources Removed Files: nfs-utils-1.1.4-configure-tirpc.patch nfs-utils-1.1.4-configure-uuid.patch nfs-utils-1.1.4-configure.patch nfs-utils-1.1.4-export-hash.patch nfs-utils-1.1.4-gssd-dnotify.patch nfs-utils-1.1.4-gssd-verbosity.patch nfs-utils-1.1.4-inet6-capable-api.patch nfs-utils-1.1.4-inet6-rpcbind-util-funcs.patch nfs-utils-1.1.4-mount-addrconfig.patch nfs-utils-1.1.4-mount-inet6-support.patch nfs-utils-1.1.4-mount-nfs_getport.patch nfs-utils-1.1.4-mount-nolock.patch nfs-utils-1.1.4-mount-po_get_numeric.patch nfs-utils-1.1.4-mount-textbased.patch nfs-utils-1.1.4-mount-udponly.patch nfs-utils-1.1.4-showmount-rpcbind.patch nfs-utils-1.1.4-sm-notify-freeaddrinfo.patch nfs-utils-1.1.4-sm-notify-typo.patch nfs-utils-1.1.4-statd-setuid.patch nfs-utils-1.1.4-statd-xunlink.patch nfs-utils-1.1.4-svcgssd-expiration.patch nfs-utils-1.1.4-tcpwrap-cleanup.patch nfs-utils-1.1.4-tcpwrap-hash.patch nfs-utils-1.1.4-tcpwrap-newrules.patch nfs-utils-1.1.4-tcpwrap-warn.patch nfs-utils-1.1.4-tcpwrapper-update.patch nfs-utils-1.1.4-umount-ipv6.patch Log Message: Updated to latest upstream version: 1.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 18 Oct 2008 14:01:23 -0000 1.24 +++ .cvsignore 5 Mar 2009 12:57:00 -0000 1.25 @@ -14,3 +14,4 @@ nfs-utils-1.1.2.tar.bz2 nfs-utils-1.1.3.tar.bz2 nfs-utils-1.1.4.tar.bz2 +nfs-utils-1.1.5.tar.bz2 Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.216 retrieving revision 1.217 diff -u -r1.216 -r1.217 --- nfs-utils.spec 4 Mar 2009 21:14:51 -0000 1.216 +++ nfs-utils.spec 5 Mar 2009 12:57:02 -0000 1.217 @@ -1,8 +1,8 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS server Name: nfs-utils URL: http://sourceforge.net/projects/nfs -Version: 1.1.4 -Release: 21%{?dist} +Version: 1.1.5 +Release: 1%{?dist} Epoch: 1 # group all 32bit related archs @@ -26,34 +26,6 @@ Patch01: nfs-utils-1.1.0-smnotify-path.patch Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch -Patch100: nfs-utils-1.1.4-inet6-capable-api.patch -Patch101: nfs-utils-1.1.4-inet6-rpcbind-util-funcs.patch -Patch102: nfs-utils-1.1.4-showmount-rpcbind.patch -Patch103: nfs-utils-1.1.4-gssd-dnotify.patch -Patch104: nfs-utils-1.1.4-statd-setuid.patch -Patch105: nfs-utils-1.1.4-mount-nfs_getport.patch -Patch106: nfs-utils-1.1.4-sm-notify-typo.patch -Patch107: nfs-utils-1.1.4-mount-inet6-support.patch -Patch108: nfs-utils-1.1.4-svcgssd-expiration.patch -Patch109: nfs-utils-1.1.4-mount-po_get_numeric.patch -Patch110: nfs-utils-1.1.4-sm-notify-freeaddrinfo.patch -Patch111: nfs-utils-1.1.4-statd-xunlink.patch -Patch112: nfs-utils-1.1.4-tcpwrapper-update.patch -Patch113: nfs-utils-1.1.4-tcpwrap-warn.patch -Patch114: nfs-utils-1.1.4-gssd-verbosity.patch -Patch115: nfs-utils-1.1.4-mount-addrconfig.patch -Patch116: nfs-utils-1.1.4-configure-uuid.patch -Patch117: nfs-utils-1.1.4-configure-tirpc.patch -Patch118: nfs-utils-1.1.4-tcpwrap-hash.patch -Patch119: nfs-utils-1.1.4-tcpwrap-newrules.patch -Patch120: nfs-utils-1.1.4-tcpwrap-cleanup.patch -Patch121: nfs-utils-1.1.4-mount-textbased.patch -Patch122: nfs-utils-1.1.4-mount-nolock.patch -Patch123: nfs-utils-1.1.4-mount-udponly.patch -Patch124: nfs-utils-1.1.4-umount-ipv6.patch -Patch125: nfs-utils-1.1.4-export-hash.patch -Patch126: nfs-utils-1.1.4-configure.patch - %if %{enablefscache} Patch90: nfs-utils-1.1.0-mount-fsc.patch %endif @@ -107,34 +79,6 @@ %patch01 -p1 %patch02 -p1 -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 -%patch110 -p1 -%patch111 -p1 -%patch112 -p1 -%patch113 -p1 -%patch114 -p1 -%patch115 -p1 -%patch116 -p1 -%patch117 -p1 -%patch118 -p1 -%patch119 -p1 -%patch120 -p1 -%patch121 -p1 -%patch122 -p1 -%patch123 -p1 -%patch124 -p1 -%patch125 -p1 -%patch126 -p1 - %if %{enablefscache} %patch90 -p1 %endif @@ -297,6 +241,9 @@ %attr(4755,root,root) /sbin/umount.nfs4 %changelog +* Thu Mar 5 2009 Steve Dickson 1.1.5-1 +- Updated to latest upstream version: 1.1.5 + * Wed Mar 4 2009 Steve Dickson 1.1.4-21 - configure: fix AC_CACHE_VAL warnings Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 18 Oct 2008 14:01:23 -0000 1.25 +++ sources 5 Mar 2009 12:57:02 -0000 1.26 @@ -1,2 +1,2 @@ ae7db9c61c5ad04f83bb99e5caed73da nfs.doc.tar.gz -3ed5b9cb73fd1c9b358c7bfa7a6ae150 nfs-utils-1.1.4.tar.bz2 +2848072a5e53840b9bc520fbb6782b57 nfs-utils-1.1.5.tar.bz2 --- nfs-utils-1.1.4-configure-tirpc.patch DELETED --- --- nfs-utils-1.1.4-configure-uuid.patch DELETED --- --- nfs-utils-1.1.4-configure.patch DELETED --- --- nfs-utils-1.1.4-export-hash.patch DELETED --- --- nfs-utils-1.1.4-gssd-dnotify.patch DELETED --- --- nfs-utils-1.1.4-gssd-verbosity.patch DELETED --- --- nfs-utils-1.1.4-inet6-capable-api.patch DELETED --- --- nfs-utils-1.1.4-inet6-rpcbind-util-funcs.patch DELETED --- --- nfs-utils-1.1.4-mount-addrconfig.patch DELETED --- --- nfs-utils-1.1.4-mount-inet6-support.patch DELETED --- --- nfs-utils-1.1.4-mount-nfs_getport.patch DELETED --- --- nfs-utils-1.1.4-mount-nolock.patch DELETED --- --- nfs-utils-1.1.4-mount-po_get_numeric.patch DELETED --- --- nfs-utils-1.1.4-mount-textbased.patch DELETED --- --- nfs-utils-1.1.4-mount-udponly.patch DELETED --- --- nfs-utils-1.1.4-showmount-rpcbind.patch DELETED --- --- nfs-utils-1.1.4-sm-notify-freeaddrinfo.patch DELETED --- --- nfs-utils-1.1.4-sm-notify-typo.patch DELETED --- --- nfs-utils-1.1.4-statd-setuid.patch DELETED --- --- nfs-utils-1.1.4-statd-xunlink.patch DELETED --- --- nfs-utils-1.1.4-svcgssd-expiration.patch DELETED --- --- nfs-utils-1.1.4-tcpwrap-cleanup.patch DELETED --- --- nfs-utils-1.1.4-tcpwrap-hash.patch DELETED --- --- nfs-utils-1.1.4-tcpwrap-newrules.patch DELETED --- --- nfs-utils-1.1.4-tcpwrap-warn.patch DELETED --- --- nfs-utils-1.1.4-tcpwrapper-update.patch DELETED --- --- nfs-utils-1.1.4-umount-ipv6.patch DELETED --- From limb at fedoraproject.org Thu Mar 5 12:57:33 2009 From: limb at fedoraproject.org (Jon Ciesla) Date: Thu, 5 Mar 2009 12:57:33 +0000 (UTC) Subject: rpms/wesnoth/devel .cvsignore, 1.32, 1.33 sources, 1.32, 1.33 wesnoth.spec, 1.70, 1.71 Message-ID: <20090305125733.AEF7570116@cvs1.fedora.phx.redhat.com> Author: limb Update of /cvs/pkgs/rpms/wesnoth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6445 Modified Files: .cvsignore sources wesnoth.spec Log Message: 1.5.12. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wesnoth/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 25 Feb 2009 16:07:54 -0000 1.32 +++ .cvsignore 5 Mar 2009 12:57:03 -0000 1.33 @@ -1 +1 @@ -wesnoth-1.5.11.tar.bz2 +wesnoth-1.5.12.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wesnoth/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 25 Feb 2009 16:07:54 -0000 1.32 +++ sources 5 Mar 2009 12:57:03 -0000 1.33 @@ -1 +1 @@ -1ff0c080dc83621f78fd65e942cc64a4 wesnoth-1.5.11.tar.bz2 +5dcac766ade0806e8d0b5e5ce020a1e0 wesnoth-1.5.12.tar.bz2 Index: wesnoth.spec =================================================================== RCS file: /cvs/pkgs/rpms/wesnoth/devel/wesnoth.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- wesnoth.spec 26 Feb 2009 18:58:33 -0000 1.70 +++ wesnoth.spec 5 Mar 2009 12:57:03 -0000 1.71 @@ -1,6 +1,6 @@ Name: wesnoth -Version: 1.5.11 -Release: 5%{?dist} +Version: 1.5.12 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme Group: Amusements/Games @@ -247,6 +247,9 @@ #%endif %changelog +* Wed Mar 04 2009 Jon Ciesla - 1.5.12-1 +- Update to 1.5.12. + * Wed Feb 25 2009 Jon Ciesla - 1.5.11-5 - Drop -Werror. From xhorak at fedoraproject.org Thu Mar 5 12:57:46 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Thu, 5 Mar 2009 12:57:46 +0000 (UTC) Subject: rpms/firefox/F-10 .cvsignore, 1.95, 1.96 firefox.sh.in, 1.33, 1.34 firefox.spec, 1.320, 1.321 sources, 1.109, 1.110 Message-ID: <20090305125746.3F79070116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/firefox/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6508 Modified Files: .cvsignore firefox.sh.in firefox.spec sources Log Message: Update to version 3.0.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/firefox/F-10/.cvsignore,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- .cvsignore 4 Feb 2009 18:24:11 -0000 1.95 +++ .cvsignore 5 Mar 2009 12:57:15 -0000 1.96 @@ -1,2 +1,2 @@ -firefox-3.0.6-source.tar.bz2 -firefox-langpacks-3.0.6-20090204.tar.bz2 +firefox-3.0.7-source.tar.bz2 +firefox-langpacks-3.0.7-20090220.tar.bz2 Index: firefox.sh.in =================================================================== RCS file: /cvs/pkgs/rpms/firefox/F-10/firefox.sh.in,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- firefox.sh.in 7 Jan 2009 15:47:47 -0000 1.33 +++ firefox.sh.in 5 Mar 2009 12:57:15 -0000 1.34 @@ -61,7 +61,7 @@ MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION" MOZ_EXTENSIONS_DIR="$MOZ_DIST_BIN/extensions" MOZ_PROGRAM="$MOZ_DIST_BIN/firefox" -MOZ_LAUCHER="$MOZ_DIST_BIN/run-mozilla.sh" +MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh" ## ## Set MOZ_GRE_CONF @@ -179,7 +179,7 @@ debugging=0 if [ $debugging = 1 ] then - echo $MOZ_LAUCHER $script_args $MOZ_PROGRAM $MOZARGS "$@" + echo $MOZ_LAUNCHER $script_args $MOZ_PROGRAM $MOZARGS "$@" fi -exec $MOZ_LAUCHER $script_args $MOZ_PROGRAM $MOZARGS "$@" +exec $MOZ_LAUNCHER $script_args $MOZ_PROGRAM $MOZARGS "$@" Index: firefox.spec =================================================================== RCS file: /cvs/pkgs/rpms/firefox/F-10/firefox.spec,v retrieving revision 1.320 retrieving revision 1.321 diff -u -r1.320 -r1.321 --- firefox.spec 4 Feb 2009 18:26:52 -0000 1.320 +++ firefox.spec 5 Mar 2009 12:57:15 -0000 1.321 @@ -5,7 +5,7 @@ %define mozappdir %{_libdir}/%{name}-%{version} -%define gecko_version 1.9.0.6 +%define gecko_version 1.9.0.7 %define official_branding 1 %define build_langpacks 1 @@ -17,7 +17,7 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 3.0.6 +Version: 3.0.7 Release: 1%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -29,7 +29,7 @@ %endif Source0: %{tarball} %if %{build_langpacks} -Source2: firefox-langpacks-%{version}-20090204.tar.bz2 +Source2: firefox-langpacks-%{version}-20090220.tar.bz2 %endif Source10: firefox-mozconfig Source11: firefox-mozconfig-branded @@ -322,6 +322,12 @@ #--------------------------------------------------------------------- %changelog +* Wed Mar 4 2009 Jan Horak - 3.0.7-1 +- Update to 3.0.7 + +* Thu Feb 26 2009 Jan Horak - 3.0.6-2 +- Fixed spelling mistake in firefox.sh.in + * Wed Feb 4 2009 Christopher Aillon - 3.0.6-1 - Update to 3.0.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/firefox/F-10/sources,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- sources 4 Feb 2009 18:24:11 -0000 1.109 +++ sources 5 Mar 2009 12:57:15 -0000 1.110 @@ -1,2 +1,2 @@ -1b6063d29fe9785b929a36f249866360 firefox-3.0.6-source.tar.bz2 -e73ad9312fe7c15ff37efb4ac205bf2a firefox-langpacks-3.0.6-20090204.tar.bz2 +9875c9237b532009df8e91c3785539a3 firefox-3.0.7-source.tar.bz2 +ea05697bfde0bc5092f2d17d20135260 firefox-langpacks-3.0.7-20090220.tar.bz2 From xhorak at fedoraproject.org Thu Mar 5 13:00:58 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Thu, 5 Mar 2009 13:00:58 +0000 (UTC) Subject: rpms/firefox/F-9 .cvsignore, 1.86, 1.87 firefox.sh.in, 1.33, 1.34 firefox.spec, 1.311, 1.312 sources, 1.99, 1.100 Message-ID: <20090305130058.2875670116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/firefox/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7237 Modified Files: .cvsignore firefox.sh.in firefox.spec sources Log Message: Update to version 3.0.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/firefox/F-9/.cvsignore,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- .cvsignore 4 Feb 2009 18:24:19 -0000 1.86 +++ .cvsignore 5 Mar 2009 13:00:27 -0000 1.87 @@ -1,2 +1,2 @@ -firefox-3.0.6-source.tar.bz2 -firefox-langpacks-3.0.6-20090204.tar.bz2 +firefox-3.0.7-source.tar.bz2 +firefox-langpacks-3.0.7-20090220.tar.bz2 Index: firefox.sh.in =================================================================== RCS file: /cvs/pkgs/rpms/firefox/F-9/firefox.sh.in,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- firefox.sh.in 7 Jan 2009 15:02:25 -0000 1.33 +++ firefox.sh.in 5 Mar 2009 13:00:27 -0000 1.34 @@ -61,7 +61,7 @@ MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION" MOZ_EXTENSIONS_DIR="$MOZ_DIST_BIN/extensions" MOZ_PROGRAM="$MOZ_DIST_BIN/firefox" -MOZ_LAUCHER="$MOZ_DIST_BIN/run-mozilla.sh" +MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh" ## ## Set MOZ_GRE_CONF @@ -179,7 +179,7 @@ debugging=0 if [ $debugging = 1 ] then - echo $MOZ_LAUCHER $script_args $MOZ_PROGRAM $MOZARGS "$@" + echo $MOZ_LAUNCHER $script_args $MOZ_PROGRAM $MOZARGS "$@" fi -exec $MOZ_LAUCHER $script_args $MOZ_PROGRAM $MOZARGS "$@" +exec $MOZ_LAUNCHER $script_args $MOZ_PROGRAM $MOZARGS "$@" Index: firefox.spec =================================================================== RCS file: /cvs/pkgs/rpms/firefox/F-9/firefox.spec,v retrieving revision 1.311 retrieving revision 1.312 diff -u -r1.311 -r1.312 --- firefox.spec 4 Feb 2009 18:26:09 -0000 1.311 +++ firefox.spec 5 Mar 2009 13:00:27 -0000 1.312 @@ -5,7 +5,7 @@ %define mozappdir %{_libdir}/%{name}-%{version} -%define gecko_version 1.9.0.6 +%define gecko_version 1.9.0.7 %define official_branding 1 %define build_langpacks 1 @@ -17,7 +17,7 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 3.0.6 +Version: 3.0.7 Release: 1%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -29,7 +29,7 @@ %endif Source0: %{tarball} %if %{build_langpacks} -Source2: firefox-langpacks-%{version}-20090204.tar.bz2 +Source2: firefox-langpacks-%{version}-20090220.tar.bz2 %endif Source10: firefox-mozconfig Source11: firefox-mozconfig-branded @@ -322,6 +322,12 @@ #--------------------------------------------------------------------- %changelog +* Wed Mar 4 2009 Jan Horak - 3.0.7-1 +- Update to 3.0.7 + +* Thu Feb 26 2009 Jan Horak - 3.0.6-2 +- Fixed spelling mistake in firefox.sh.in + * Wed Feb 4 2009 Christopher Aillon - 3.0.6-1 - Update to 3.0.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/firefox/F-9/sources,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- sources 4 Feb 2009 18:24:20 -0000 1.99 +++ sources 5 Mar 2009 13:00:27 -0000 1.100 @@ -1,2 +1,2 @@ -1b6063d29fe9785b929a36f249866360 firefox-3.0.6-source.tar.bz2 -e73ad9312fe7c15ff37efb4ac205bf2a firefox-langpacks-3.0.6-20090204.tar.bz2 +9875c9237b532009df8e91c3785539a3 firefox-3.0.7-source.tar.bz2 +ea05697bfde0bc5092f2d17d20135260 firefox-langpacks-3.0.7-20090220.tar.bz2 From nickc at fedoraproject.org Thu Mar 5 13:10:24 2009 From: nickc at fedoraproject.org (Nicholas Clifton) Date: Thu, 5 Mar 2009 13:10:24 +0000 (UTC) Subject: rpms/binutils/devel binutils-2.19.51.0.2-IBM.patch, NONE, 1.1 binutils.spec, 1.157, 1.158 Message-ID: <20090305131024.6452570116@cvs1.fedora.phx.redhat.com> Author: nickc Update of /cvs/pkgs/rpms/binutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8587 Modified Files: binutils.spec Added Files: binutils-2.19.51.0.2-IBM.patch Log Message: Add Power7 support (BZ 487887) binutils-2.19.51.0.2-IBM.patch: --- NEW FILE binutils-2.19.51.0.2-IBM.patch --- diff -rcp ../binutils-2.19.51.0.2.15/bfd/elf32-lm32.c ./bfd/elf32-lm32.c *** ../binutils-2.19.51.0.2.15/bfd/elf32-lm32.c 2009-03-02 14:05:10.000000000 +0000 --- ./bfd/elf32-lm32.c 2009-03-05 12:12:25.000000000 +0000 *************** lm32_elf_relocate_section (bfd *output_b *** 888,898 **** /* It's a global symbol. */ bfd_boolean unresolved_reloc; bfd_boolean warned; RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel, r_symndx, symtab_hdr, sym_hashes, h, sec, relocation, ! unresolved_reloc, warned); osec = sec; name = h->root.root.string; } --- 888,899 ---- /* It's a global symbol. */ bfd_boolean unresolved_reloc; bfd_boolean warned; + bfd_boolean ignored; RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel, r_symndx, symtab_hdr, sym_hashes, h, sec, relocation, ! unresolved_reloc, warned, ignored); osec = sec; name = h->root.root.string; } diff -rcp ../binutils-2.19.51.0.2.15/bfd/elf32-ppc.c ./bfd/elf32-ppc.c *** ../binutils-2.19.51.0.2.15/bfd/elf32-ppc.c 2009-03-02 14:05:10.000000000 +0000 --- ./bfd/elf32-ppc.c 2009-03-05 12:20:26.000000000 +0000 *************** *** 1,6 **** /* PowerPC-specific support for 32-bit ELF Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, ! 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support. This file is part of BFD, the Binary File Descriptor library. --- 1,6 ---- /* PowerPC-specific support for 32-bit ELF Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, ! 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support. This file is part of BFD, the Binary File Descriptor library. *************** ppc_elf_gc_sweep_hook (bfd *abfd, *** 4301,4307 **** return TRUE; } ! /* Set htab->tls_get_addr and call the generic ELF tls_setup function. */ asection * ppc_elf_tls_setup (bfd *obfd, struct bfd_link_info *info) --- 4301,4308 ---- return TRUE; } ! /* Set plt output section type, htab->tls_get_addr, and call the ! generic ELF tls_setup function. */ asection * ppc_elf_tls_setup (bfd *obfd, struct bfd_link_info *info) *************** ppc_elf_tls_setup (bfd *obfd, struct bfd *** 4322,4327 **** --- 4323,4365 ---- return _bfd_elf_tls_setup (obfd, info); } + /* Return TRUE iff REL is a branch reloc with a global symbol matching + HASH. */ + + static bfd_boolean + branch_reloc_hash_match (const bfd *ibfd, + const Elf_Internal_Rela *rel, + const struct elf_link_hash_entry *hash) + { + Elf_Internal_Shdr *symtab_hdr = &elf_symtab_hdr (ibfd); + enum elf_ppc_reloc_type r_type = ELF32_R_TYPE (rel->r_info); + unsigned int r_symndx = ELF32_R_SYM (rel->r_info); + + if (r_symndx >= symtab_hdr->sh_info + && (r_type == R_PPC_PLTREL24 + || r_type == R_PPC_LOCAL24PC + || r_type == R_PPC_REL14 + || r_type == R_PPC_REL14_BRTAKEN + || r_type == R_PPC_REL14_BRNTAKEN + || r_type == R_PPC_REL24 + || r_type == R_PPC_ADDR24 + || r_type == R_PPC_ADDR14 + || r_type == R_PPC_ADDR14_BRTAKEN + || r_type == R_PPC_ADDR14_BRNTAKEN)) + { + struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (ibfd); + struct elf_link_hash_entry *h; + + h = sym_hashes[r_symndx - symtab_hdr->sh_info]; + while (h->root.type == bfd_link_hash_indirect + || h->root.type == bfd_link_hash_warning) + h = (struct elf_link_hash_entry *) h->root.u.i.link; + if (h == hash) + return TRUE; + } + return FALSE; + } + /* Run through all the TLS relocs looking for optimization opportunities. */ *************** ppc_elf_tls_optimize (bfd *obfd ATTRIBUT *** 4449,4483 **** if (!expecting_tls_get_addr) continue; ! if (rel + 1 < relend) ! { ! enum elf_ppc_reloc_type r_type2; ! unsigned long r_symndx2; ! struct elf_link_hash_entry *h2; ! ! /* The next instruction should be a call to ! __tls_get_addr. Peek at the reloc to be sure. */ ! r_type2 = ELF32_R_TYPE (rel[1].r_info); ! r_symndx2 = ELF32_R_SYM (rel[1].r_info); ! if (r_symndx2 >= symtab_hdr->sh_info ! && (r_type2 == R_PPC_REL14 ! || r_type2 == R_PPC_REL14_BRTAKEN ! || r_type2 == R_PPC_REL14_BRNTAKEN ! || r_type2 == R_PPC_REL24 ! || r_type2 == R_PPC_PLTREL24)) ! { ! struct elf_link_hash_entry **sym_hashes; ! ! sym_hashes = elf_sym_hashes (ibfd); ! h2 = sym_hashes[r_symndx2 - symtab_hdr->sh_info]; ! while (h2->root.type == bfd_link_hash_indirect ! || h2->root.type == bfd_link_hash_warning) ! h2 = ((struct elf_link_hash_entry *) ! h2->root.u.i.link); ! if (h2 == htab->tls_get_addr) ! continue; ! } ! } /* Uh oh, we didn't find the expected call. We could just mark this symbol to exclude it --- 4487,4496 ---- if (!expecting_tls_get_addr) continue; ! if (rel + 1 < relend ! && branch_reloc_hash_match (ibfd, rel + 1, ! htab->tls_get_addr)) ! continue; /* Uh oh, we didn't find the expected call. We could just mark this symbol to exclude it *************** ppc_elf_relocate_section (bfd *output_bf *** 6346,6367 **** case R_PPC_GOT_TLSLD16_LO: if (tls_mask != 0 && (tls_mask & TLS_LD) == 0) { ! bfd_vma insn1, insn2; bfd_vma offset; tls_ldgd_opt: offset = rel[1].r_offset; - insn1 = bfd_get_32 (output_bfd, - contents + rel->r_offset - d_offset); if ((tls_mask & tls_gd) != 0) { /* IE */ insn1 &= (1 << 26) - 1; insn1 |= 32 << 26; /* lwz */ insn2 = 0x7c631214; /* add 3,3,2 */ rel[1].r_info = ELF32_R_INFO (ELF32_R_SYM (rel[1].r_info), R_PPC_NONE); - rel[1].r_addend = 0; r_type = (((r_type - (R_PPC_GOT_TLSGD16 & 3)) & 3) + R_PPC_GOT_TPREL16); rel->r_info = ELF32_R_INFO (r_symndx, r_type); --- 6359,6379 ---- case R_PPC_GOT_TLSLD16_LO: if (tls_mask != 0 && (tls_mask & TLS_LD) == 0) { ! unsigned int insn1, insn2; bfd_vma offset; tls_ldgd_opt: offset = rel[1].r_offset; if ((tls_mask & tls_gd) != 0) { /* IE */ + insn1 = bfd_get_32 (output_bfd, + contents + rel->r_offset - d_offset); insn1 &= (1 << 26) - 1; insn1 |= 32 << 26; /* lwz */ [...2901 lines suppressed...] + {"xvmsubmsp", XX3(60,89), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xsrdpiz", XX2(60,89), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xsredp", XX2(60,90), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvtdivsp", XX3(60,93), XX3BF_MASK, PPCVSX, PPCNONE, {BF, XA6, XB6}}, + {"xvadddp", XX3(60,96), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvmaddadp", XX3(60,97), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvcmpeqdp", XX3RC(60,99,0), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvcmpeqdp.", XX3RC(60,99,1), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvsubdp", XX3(60,104), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvmaddmdp", XX3(60,105), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xsrdpip", XX2(60,105), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xstsqrtdp", XX2(60,106), XX2BF_MASK, PPCVSX, PPCNONE, {BF, XB6}}, + {"xsrdpic", XX2(60,107), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvcmpgtdp", XX3RC(60,107,0), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvcmpgtdp.", XX3RC(60,107,1), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvmuldp", XX3(60,112), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvmsubadp", XX3(60,113), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvcmpgedp", XX3RC(60,115,0), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvcmpgedp.", XX3RC(60,115,1), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvdivdp", XX3(60,120), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvmsubmdp", XX3(60,121), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xsrdpim", XX2(60,121), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvtdivdp", XX3(60,125), XX3BF_MASK, PPCVSX, PPCNONE, {BF, XA6, XB6}}, + {"xxland", XX3(60,130), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvcvspuxws", XX2(60,136), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvrspi", XX2(60,137), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xxlandc", XX3(60,138), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvrsqrtesp", XX2(60,138), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvsqrtsp", XX2(60,139), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xxlor", XX3(60,146), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvcvspsxws", XX2(60,152), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvrspiz", XX2(60,153), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xxlxor", XX3(60,154), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvresp", XX2(60,154), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xsmaxdp", XX3(60,160), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xsnmaddadp", XX3(60,161), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xxlnor", XX3(60,162), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xxspltw", XX2(60,164), XX2UIM_MASK, PPCVSX, PPCNONE, {XT6, XB6, UIM}}, + {"xsmindp", XX3(60,168), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvcvuxwsp", XX2(60,168), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xsnmaddmdp", XX3(60,169), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvrspip", XX2(60,169), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvtsqrtsp", XX2(60,170), XX2BF_MASK, PPCVSX, PPCNONE, {BF, XB6}}, + {"xvrspic", XX2(60,171), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xscpsgndp", XX3(60,176), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xsnmsubadp", XX3(60,177), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvcvsxwsp", XX2(60,184), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xsnmsubmdp", XX3(60,185), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvrspim", XX2(60,185), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvmaxsp", XX3(60,192), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvnmaddasp", XX3(60,193), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvminsp", XX3(60,200), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvcvdpuxws", XX2(60,200), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvnmaddmsp", XX3(60,201), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvrdpi", XX2(60,201), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvrsqrtedp", XX2(60,202), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvsqrtdp", XX2(60,203), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvmovsp", XX3(60,208), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6S}}, + {"xvcpsgnsp", XX3(60,208), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvnmsubasp", XX3(60,209), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvcvdpsxws", XX2(60,216), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvnmsubmsp", XX3(60,217), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvrdpiz", XX2(60,217), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvredp", XX2(60,218), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvmaxdp", XX3(60,224), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvnmaddadp", XX3(60,225), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvmindp", XX3(60,232), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvnmaddmdp", XX3(60,233), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvcvuxwdp", XX2(60,232), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvrdpip", XX2(60,233), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvtsqrtdp", XX2(60,234), XX2BF_MASK, PPCVSX, PPCNONE, {BF, XB6}}, + {"xvrdpic", XX2(60,235), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, {"xvmovdp", XX3(60,240), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6S}}, {"xvcpsgndp", XX3(60,240), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvnmsubadp", XX3(60,241), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvcvsxwdp", XX2(60,248), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvnmsubmdp", XX3(60,249), XX3_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6}}, + {"xvrdpim", XX2(60,249), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xscvdpsp", XX2(60,265), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xscvdpuxds", XX2(60,328), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xscvspdp", XX2(60,329), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xscvdpsxds", XX2(60,344), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xsabsdp", XX2(60,345), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xscvuxddp", XX2(60,360), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xsnabsdp", XX2(60,361), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xscvsxddp", XX2(60,376), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xsnegdp", XX2(60,377), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvcvspuxds", XX2(60,392), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvcvdpsp", XX2(60,393), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvcvspsxds", XX2(60,408), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvabssp", XX2(60,409), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvcvuxdsp", XX2(60,424), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvnabssp", XX2(60,425), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvcvsxdsp", XX2(60,440), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvnegsp", XX2(60,441), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvcvdpuxds", XX2(60,456), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvcvspdp", XX2(60,457), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvcvdpsxds", XX2(60,472), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvabsdp", XX2(60,473), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvcvuxddp", XX2(60,488), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvnabsdp", XX2(60,489), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvcvsxddp", XX2(60,504), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvnegdp", XX2(60,505), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, ! {"stfq", OP(60), OP_MASK, POWER2, PPCNONE, {FRS, D, RA}}, ! {"psq_st", OP(60), OP_MASK, PPCPS, PPCNONE, {FRS,PSD,RA,PSW,PSQ}}, {"stfdp", OP(61), OP_MASK, POWER6, PPCNONE, {FRT, D, RA0}}, + {"stfqu", OP(61), OP_MASK, POWER2, PPCNONE, {FRS, D, RA}}, + + {"psq_stu", OP(61), OP_MASK, PPCPS, PPCNONE, {FRS,PSD,RA,PSW,PSQ}}, + {"std", DSO(62,0), DS_MASK, PPC64, PPCNONE, {RS, DS, RA0}}, {"stdu", DSO(62,1), DS_MASK, PPC64, PPCNONE, {RS, DS, RAS}}, {"stq", DSO(62,2), DS_MASK, POWER4, PPCNONE, {RSQ, DS, RA0}}, *************** const struct powerpc_opcode powerpc_opco *** 4820,4835 **** {"fsel", A(63,23,0), A_MASK, PPC, PPCNONE, {FRT, FRA, FRC, FRB}}, {"fsel.", A(63,23,1), A_MASK, PPC, PPCNONE, {FRT, FRA, FRC, FRB}}, ! {"fre", A(63,24,0), AFRALFRC_MASK, POWER5, PPCNONE, {FRT, FRB, A_L}}, ! {"fre.", A(63,24,1), AFRALFRC_MASK, POWER5, PPCNONE, {FRT, FRB, A_L}}, {"fmul", A(63,25,0), AFRB_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC}}, {"fm", A(63,25,0), AFRB_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC}}, {"fmul.", A(63,25,1), AFRB_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC}}, {"fm.", A(63,25,1), AFRB_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC}}, ! {"frsqrte", A(63,26,0), AFRALFRC_MASK, PPC, PPCNONE, {FRT, FRB, A_L}}, ! {"frsqrte.", A(63,26,1), AFRALFRC_MASK, PPC, PPCNONE, {FRT, FRB, A_L}}, {"fmsub", A(63,28,0), A_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, {"fms", A(63,28,0), A_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, --- 5122,5141 ---- {"fsel", A(63,23,0), A_MASK, PPC, PPCNONE, {FRT, FRA, FRC, FRB}}, {"fsel.", A(63,23,1), A_MASK, PPC, PPCNONE, {FRT, FRA, FRC, FRB}}, ! {"fre", A(63,24,0), AFRALFRC_MASK, POWER5, POWER7, {FRT, FRB, A_L}}, ! {"fre.", A(63,24,1), AFRALFRC_MASK, POWER5, POWER7, {FRT, FRB, A_L}}, ! {"fre", A(63,24,0), AFRAFRC_MASK, POWER7, PPCNONE, {FRT, FRB}}, ! {"fre.", A(63,24,1), AFRAFRC_MASK, POWER7, PPCNONE, {FRT, FRB}}, {"fmul", A(63,25,0), AFRB_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC}}, {"fm", A(63,25,0), AFRB_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC}}, {"fmul.", A(63,25,1), AFRB_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC}}, {"fm.", A(63,25,1), AFRB_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC}}, ! {"frsqrte", A(63,26,0), AFRALFRC_MASK, PPC, POWER7, {FRT, FRB, A_L}}, ! {"frsqrte.", A(63,26,1), AFRALFRC_MASK, PPC, POWER7, {FRT, FRB, A_L}}, ! {"frsqrte", A(63,26,0), AFRAFRC_MASK, POWER7, PPCNONE, {FRT, FRB}}, ! {"frsqrte.", A(63,26,1), AFRAFRC_MASK, POWER7, PPCNONE, {FRT, FRB}}, {"fmsub", A(63,28,0), A_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, {"fms", A(63,28,0), A_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, *************** const struct powerpc_opcode powerpc_opco *** 4885,4890 **** --- 5191,5198 ---- {"drintxq", ZRC(63,99,0), Z2_MASK, POWER6, PPCNONE, {R, FRT, FRB, RMC}}, {"drintxq.", ZRC(63,99,1), Z2_MASK, POWER6, PPCNONE, {R, FRT, FRB, RMC}}, + {"ftdiv", X(63,128), X_MASK|(3<<21), POWER7, PPCNONE, {BF, FRA, FRB}}, + {"dcmpoq", X(63,130), X_MASK, POWER6, PPCNONE, {BF, FRA, FRB}}, {"mtfsfi", XRC(63,134,0), XRA_MASK|(3<<21)|(1<<11), COM, POWER6, {BFF, U}}, *************** const struct powerpc_opcode powerpc_opco *** 4895,4900 **** --- 5203,5215 ---- {"fnabs", XRC(63,136,0), XRA_MASK, COM, PPCNONE, {FRT, FRB}}, {"fnabs.", XRC(63,136,1), XRA_MASK, COM, PPCNONE, {FRT, FRB}}, + {"fctiwu", XRC(63,142,0), XRA_MASK, POWER7, PPCNONE, {FRT, FRB}}, + {"fctiwu.", XRC(63,142,1), XRA_MASK, POWER7, PPCNONE, {FRT, FRB}}, + {"fctiwuz", XRC(63,143,0), XRA_MASK, POWER7, PPCNONE, {FRT, FRB}}, + {"fctiwuz.", XRC(63,143,1), XRA_MASK, POWER7, PPCNONE, {FRT, FRB}}, + + {"ftsqrt", X(63,160), X_MASK|(3<<21|FRA_MASK), POWER7, PPCNONE, {BF, FRB}}, + {"dtstexq", X(63,162), X_MASK, POWER6, PPCNONE, {BF, FRA, FRB}}, {"dtstdcq", Z(63,194), Z_MASK, POWER6, PPCNONE, {BF, FRA, DCM}}, {"dtstdgq", Z(63,226), Z_MASK, POWER6, PPCNONE, {BF, FRA, DGM}}, *************** const struct powerpc_opcode powerpc_opco *** 4965,4970 **** --- 5280,5293 ---- {"diexq", XRC(63,866,0), X_MASK, POWER6, PPCNONE, {FRT, FRA, FRB}}, {"diexq.", XRC(63,866,1), X_MASK, POWER6, PPCNONE, {FRT, FRA, FRB}}, + {"fctidu", XRC(63,942,0), XRA_MASK, POWER7, PPCNONE, {FRT, FRB}}, + {"fctidu.", XRC(63,942,1), XRA_MASK, POWER7, PPCNONE, {FRT, FRB}}, + + {"fctiduz", XRC(63,943,0), XRA_MASK, POWER7, PPCNONE, {FRT, FRB}}, + {"fctiduz.", XRC(63,943,1), XRA_MASK, POWER7, PPCNONE, {FRT, FRB}}, + + {"fcfidu", XRC(63,974,0), XRA_MASK, POWER7, PPCNONE, {FRT, FRB}}, + {"fcfidu.", XRC(63,974,1), XRA_MASK, POWER7, PPCNONE, {FRT, FRB}}, }; const int powerpc_num_opcodes = Index: binutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- binutils.spec 2 Mar 2009 14:08:56 -0000 1.157 +++ binutils.spec 5 Mar 2009 13:09:53 -0000 1.158 @@ -17,7 +17,7 @@ Summary: A GNU collection of binary utilities Name: %{?cross}binutils%{?_with_debug:-debug} Version: 2.19.51.0.2 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -31,6 +31,7 @@ Patch06: binutils-2.19.50.0.1-set-long-long.patch Patch07: binutils-2.19.50.0.1-build-id.patch Patch08: binutils-2.19.51.0.2-ifunc.patch +Patch09: binutils-2.19.51.0.2-IBM.patch %if 0%{?_with_debug:1} # Define this if you want to skip the strip step and preserve debug info. @@ -102,6 +103,7 @@ %patch06 -p0 -b .set-long-long~ %patch07 -p0 -b .build-id~ %patch08 -p1 -b .ifunc~ +%patch09 -p0 -b .IBM~ # We cannot run autotools as there is an exact requirement of autoconf-2.59. @@ -345,6 +347,9 @@ %endif # %{isnative} %changelog +* Thu Mar 05 2009 Nick Clifton 2.19.51.0.2-16 +- Add IBM Power7 support. (BZ 487887) + * Mon Mar 02 2009 Nick Clifton 2.19.51.0.2-15 - Add IFUNC support. (BZ 465302) From pkgdb at fedoraproject.org Thu Mar 5 13:14:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 13:14:13 +0000 Subject: [pkgdb] ntop had acl change status Message-ID: <20090305131413.3E478208545@bastion.fedora.phx.redhat.com> rakesh has set the approveacls acl on ntop (Fedora devel) to Approved for pvrabec To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ntop From pkgdb at fedoraproject.org Thu Mar 5 13:13:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 13:13:26 +0000 Subject: [pkgdb] ntop had acl change status Message-ID: <20090305131410.245AC2082B2@bastion.fedora.phx.redhat.com> rakesh has set the commit acl on ntop (Fedora devel) to Approved for pvrabec To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ntop From pkgdb at fedoraproject.org Thu Mar 5 13:14:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 13:14:01 +0000 Subject: [pkgdb] ntop had acl change status Message-ID: <20090305131422.502D2208548@bastion.fedora.phx.redhat.com> rakesh has set the commit acl on ntop (Fedora 9) to Approved for pvrabec To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ntop From pkgdb at fedoraproject.org Thu Mar 5 13:13:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 13:13:41 +0000 Subject: [pkgdb] ntop had acl change status Message-ID: <20090305131424.9D5AD20854A@bastion.fedora.phx.redhat.com> rakesh has set the approveacls acl on ntop (Fedora 9) to Approved for pvrabec To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ntop From pkgdb at fedoraproject.org Thu Mar 5 13:14:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 13:14:31 +0000 Subject: [pkgdb] ntop had acl change status Message-ID: <20090305131430.2E70520854C@bastion.fedora.phx.redhat.com> rakesh has set the commit acl on ntop (Fedora 10) to Approved for pvrabec To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ntop From pkgdb at fedoraproject.org Thu Mar 5 13:14:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 13:14:32 +0000 Subject: [pkgdb] ntop had acl change status Message-ID: <20090305131433.633732082B2@bastion.fedora.phx.redhat.com> rakesh has set the approveacls acl on ntop (Fedora 10) to Approved for pvrabec To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ntop From caolanm at fedoraproject.org Thu Mar 5 13:24:56 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 13:24:56 +0000 (UTC) Subject: rpms/rudeconfig/devel rudeconfig-5.0.5-includes.patch, NONE, 1.1 rudeconfig.spec, 1.6, 1.7 Message-ID: <20090305132456.B2F7270116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/rudeconfig/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10768 Modified Files: rudeconfig.spec Added Files: rudeconfig-5.0.5-includes.patch Log Message: include cstdio for EOF rudeconfig-5.0.5-includes.patch: --- NEW FILE rudeconfig-5.0.5-includes.patch --- diff -ru rudeconfig-5.0.5.orig/src/ParserJuly2004.cpp rudeconfig-5.0.5/src/ParserJuly2004.cpp --- rudeconfig-5.0.5.orig/src/ParserJuly2004.cpp 2009-03-05 13:06:36.000000000 +0000 +++ rudeconfig-5.0.5/src/ParserJuly2004.cpp 2009-03-05 13:11:52.000000000 +0000 @@ -37,6 +37,8 @@ #define INCLUDED_IOSTREAM #endif +#include + using namespace rude::config; using namespace std; Index: rudeconfig.spec =================================================================== RCS file: /cvs/pkgs/rpms/rudeconfig/devel/rudeconfig.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rudeconfig.spec 25 Feb 2009 22:10:50 -0000 1.6 +++ rudeconfig.spec 5 Mar 2009 13:24:26 -0000 1.7 @@ -1,6 +1,6 @@ Name: rudeconfig Version: 5.0.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library (C++ API) for reading and writing configuration/.ini files Group: System Environment/Libraries @@ -9,6 +9,7 @@ Source0: http://www.rudeserver.com/config/download/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: rudeconfig-5.0.5-gcc43.patch +Patch1: rudeconfig-5.0.5-includes.patch #BuildRequires: #Requires: @@ -31,6 +32,7 @@ %prep %setup -q %patch0 -p1 -b .gcc43 +%patch1 -p1 -b .includes %build %configure --disable-static @@ -62,6 +64,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 5 2009 Caol??n McNamara - 5.0.5-6 +- include cstdio for EOF + * Wed Feb 25 2009 Fedora Release Engineering - 5.0.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From anithra at fedoraproject.org Thu Mar 5 13:27:02 2009 From: anithra at fedoraproject.org (Anithra P Janakiraman) Date: Thu, 5 Mar 2009 13:27:02 +0000 (UTC) Subject: rpms/eclipse-systemtapgui/devel eclipse-systemtapgui.spec, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090305132702.B8FCA70116@cvs1.fedora.phx.redhat.com> Author: anithra Update of /cvs/pkgs/rpms/eclipse-systemtapgui/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11038/devel Modified Files: eclipse-systemtapgui.spec import.log sources Log Message: * Thu Mar 05 2009 Anithra P Janakiraman - Bug Fix. Index: eclipse-systemtapgui.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-systemtapgui/devel/eclipse-systemtapgui.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- eclipse-systemtapgui.spec 24 Feb 2009 13:57:13 -0000 1.2 +++ eclipse-systemtapgui.spec 5 Mar 2009 13:26:32 -0000 1.3 @@ -45,9 +45,8 @@ %doc com.ibm.systemtapgui.systemtap.feature/epl-v10.html %changelog -* Tue Feb 24 2009 Fedora Release Engineering - 1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - +* Thu Mar 05 2009 Anithra P Janakiraman 1.0-6 +- Bug Fix. * Mon Feb 10 2009 Anithra P Janakiraman 1.0-5 - Modified spec file. * Fri Feb 06 2009 Anithra P Janakiraman 1.0-4 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-systemtapgui/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 Feb 2009 10:14:16 -0000 1.1 +++ import.log 5 Mar 2009 13:26:32 -0000 1.2 @@ -1 +1,2 @@ eclipse-systemtapgui-1_0-5_fc11:HEAD:eclipse-systemtapgui-1.0-5.fc11.src.rpm:1234777853 +eclipse-systemtapgui-1_0-6_fc11:HEAD:eclipse-systemtapgui-1.0-6.fc11.src.rpm:1236257037 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-systemtapgui/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Feb 2009 10:14:16 -0000 1.2 +++ sources 5 Mar 2009 13:26:32 -0000 1.3 @@ -1 +1 @@ -25dd9eda7eeb55c4387d789d68c0e3d1 com.ibm.systemtapgui.src.tar.gz +b5a89fdd268f7345e2a16d1fe6ba230d com.ibm.systemtapgui.src.tar.gz From lennart at fedoraproject.org Thu Mar 5 13:29:51 2009 From: lennart at fedoraproject.org (Lennart Poettering) Date: Thu, 5 Mar 2009 13:29:51 +0000 (UTC) Subject: rpms/pulseaudio/devel .cvsignore, 1.29, 1.30 pulseaudio.spec, 1.72, 1.73 sources, 1.30, 1.31 Message-ID: <20090305132951.A9D5570116@cvs1.fedora.phx.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/pulseaudio/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11704 Modified Files: .cvsignore pulseaudio.spec sources Log Message: New test release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 5 Mar 2009 12:06:49 -0000 1.29 +++ .cvsignore 5 Mar 2009 13:29:21 -0000 1.30 @@ -1 +1 @@ -pulseaudio-0.9.15-test4.tar.gz +pulseaudio-0.9.15-test5.tar.gz Index: pulseaudio.spec =================================================================== RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- pulseaudio.spec 5 Mar 2009 12:06:49 -0000 1.72 +++ pulseaudio.spec 5 Mar 2009 13:29:21 -0000 1.73 @@ -3,10 +3,10 @@ Name: pulseaudio Summary: Improved Linux sound server Version: 0.9.15 -Release: 3.test4%{?dist} +Release: 3.test5%{?dist} License: GPLv2+ Group: System Environment/Daemons -Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test4.tar.gz +Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test5.tar.gz URL: http://pulseaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: m4 @@ -185,7 +185,7 @@ This package contains command line utilities for the PulseAudio sound server. %prep -%setup -q -T -b0 -n pulseaudio-0.9.15-test4 +%setup -q -T -b0 -n pulseaudio-0.9.15-test5 %build CFLAGS="-ggdb" %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access @@ -407,6 +407,9 @@ %{_mandir}/man1/pax11publish.1.gz %changelog +* Thu Mar 5 2009 Lennart Poettering 0.9.15-3.test5 +- New test release + * Thu Mar 5 2009 Lennart Poettering 0.9.15-3.test4 - New test release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 5 Mar 2009 12:06:50 -0000 1.30 +++ sources 5 Mar 2009 13:29:21 -0000 1.31 @@ -1 +1 @@ -ccaea6a47e3f488db430c6f7854b3a58 pulseaudio-0.9.15-test4.tar.gz +dad9384a37c7c9468cc6a5178286db0f pulseaudio-0.9.15-test5.tar.gz From twaugh at fedoraproject.org Thu Mar 5 13:32:01 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Thu, 5 Mar 2009 13:32:01 +0000 (UTC) Subject: rpms/cups/devel .cvsignore, 1.44, 1.45 cups-avahi.patch, 1.3, 1.4 cups-lspp.patch, 1.40, 1.41 cups-no-export-ssllibs.patch, 1.1, 1.2 cups-no-gzip-man.patch, 1.1, 1.2 cups-serverbin-compat.patch, 1.5, 1.6 cups.spec, 1.463, 1.464 sources, 1.47, 1.48 cups-local-protocols.patch, 1.1, NONE cups-str3059.patch, 1.1, NONE cups-str3077.patch, 1.1, NONE cups-str3078.patch, 1.1, NONE Message-ID: <20090305133201.83B2170116@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12129 Modified Files: .cvsignore cups-avahi.patch cups-lspp.patch cups-no-export-ssllibs.patch cups-no-gzip-man.patch cups-serverbin-compat.patch cups.spec sources Removed Files: cups-local-protocols.patch cups-str3059.patch cups-str3077.patch cups-str3078.patch Log Message: * Thu Mar 5 2009 Tim Waugh 1:1.4-0.b2.8 - Updated to svn8404. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 16 Dec 2008 12:31:52 -0000 1.44 +++ .cvsignore 5 Mar 2009 13:31:30 -0000 1.45 @@ -36,3 +36,4 @@ cups-1.3.9-source.tar.bz2 cups-1.4b1-source.tar.bz2 cups-1.4b2-source.tar.bz2 +cups-1.4b2-svn8404-source.tar.bz2 cups-avahi.patch: Index: cups-avahi.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups-avahi.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cups-avahi.patch 12 Feb 2009 14:33:59 -0000 1.3 +++ cups-avahi.patch 5 Mar 2009 13:31:30 -0000 1.4 @@ -1,9 +1,9 @@ -diff -up cups-1.4b2/backend/dnssd.c.avahi cups-1.4b2/backend/dnssd.c ---- cups-1.4b2/backend/dnssd.c.avahi 2008-10-07 20:10:35.000000000 +0100 -+++ cups-1.4b2/backend/dnssd.c 2009-02-12 13:14:34.000000000 +0000 -@@ -20,7 +20,8 @@ - * browse_local_callback() - Browse local devices. - * compare_devices() - Compare two devices. +diff -up cups-1.4b2-svn8404/backend/dnssd.c.avahi cups-1.4b2-svn8404/backend/dnssd.c +--- cups-1.4b2-svn8404/backend/dnssd.c.avahi 2009-03-05 10:54:00.000000000 +0000 ++++ cups-1.4b2-svn8404/backend/dnssd.c 2009-03-05 11:15:28.000000000 +0000 +@@ -22,7 +22,8 @@ + * exec_backend() - Execute the backend that corresponds to the + * resolved service name. * get_device() - Create or update a device. - * query_callback() - Process query data. + * query_callback() - Process query data from DNS-SD @@ -11,7 +11,7 @@ * unquote() - Unquote a name string. */ -@@ -30,7 +31,16 @@ +@@ -32,7 +33,16 @@ #include "backend-private.h" #include @@ -29,7 +29,7 @@ /* -@@ -49,7 +59,9 @@ typedef enum +@@ -51,7 +61,9 @@ typedef enum typedef struct { @@ -39,7 +39,7 @@ char *name, /* Service name */ *domain, /* Domain name */ *fullName, /* Full name */ -@@ -65,6 +77,26 @@ typedef struct +@@ -67,6 +79,26 @@ typedef struct * Local functions... */ @@ -66,7 +66,7 @@ static void browse_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, -@@ -80,12 +112,6 @@ static void browse_local_callback(DNSSe +@@ -82,12 +114,6 @@ static void browse_local_callback(DNSSe const char *regtype, const char *replyDomain, void *context); @@ -79,7 +79,7 @@ static void query_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, -@@ -94,7 +120,31 @@ static void query_callback(DNSServiceRe +@@ -96,7 +122,31 @@ static void query_callback(DNSServiceRe uint16_t rrclass, uint16_t rdlen, const void *rdata, uint32_t ttl, void *context); @@ -111,7 +111,7 @@ /* -@@ -106,6 +156,16 @@ main(int argc, /* I - Number of comm +@@ -108,6 +158,16 @@ main(int argc, /* I - Number of comm char *argv[]) /* I - Command-line arguments */ { const char *name; /* Backend name */ @@ -128,7 +128,7 @@ DNSServiceRef main_ref, /* Main service reference */ fax_ipp_ref, /* IPP fax service reference */ ipp_ref, /* IPP service reference */ -@@ -117,11 +177,7 @@ main(int argc, /* I - Number of comm +@@ -119,12 +179,7 @@ main(int argc, /* I - Number of comm pdl_datastream_ref, /* AppSocket service reference */ printer_ref, /* LPD service reference */ riousbprint_ref; /* Remote IO service reference */ @@ -137,11 +137,12 @@ - struct timeval timeout; /* Timeout for select() */ - cups_array_t *devices; /* Device array */ - cups_device_t *device; /* Current device */ +- char uriName[1024]; /* Unquoted fullName for URI */ +#endif /* !HAVE_AVAHI */ /* -@@ -161,6 +217,48 @@ main(int argc, /* I - Number of comm +@@ -164,6 +219,48 @@ main(int argc, /* I - Number of comm * Browse for different kinds of printers... */ @@ -190,7 +191,7 @@ if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError) { perror("ERROR: Unable to create service connection"); -@@ -212,6 +310,7 @@ main(int argc, /* I - Number of comm +@@ -215,6 +312,7 @@ main(int argc, /* I - Number of comm riousbprint_ref = main_ref; DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0, "_riousbprint._tcp", NULL, browse_callback, devices); @@ -198,7 +199,7 @@ /* * Loop until we are killed... -@@ -219,6 +318,25 @@ main(int argc, /* I - Number of comm +@@ -222,6 +320,25 @@ main(int argc, /* I - Number of comm for (;;) { @@ -224,7 +225,7 @@ FD_ZERO(&input); FD_SET(fd, &input); -@@ -238,11 +356,19 @@ main(int argc, /* I - Number of comm +@@ -241,11 +358,19 @@ main(int argc, /* I - Number of comm } else { @@ -244,7 +245,7 @@ cups_device_t *best; /* Best matching device */ char device_uri[1024]; /* Device URI */ int count; /* Number of queries */ -@@ -255,6 +381,7 @@ main(int argc, /* I - Number of comm +@@ -258,6 +383,7 @@ main(int argc, /* I - Number of comm best = NULL, count = 0; device; device = (cups_device_t *)cupsArrayNext(devices)) @@ -252,7 +253,7 @@ if (!device->ref && !device->sent) { /* -@@ -283,14 +410,19 @@ main(int argc, /* I - Number of comm +@@ -286,14 +412,19 @@ main(int argc, /* I - Number of comm count ++; } } @@ -273,7 +274,31 @@ if (!best) best = device; -@@ -332,6 +464,204 @@ main(int argc, /* I - Number of comm +@@ -301,11 +432,9 @@ main(int argc, /* I - Number of comm + strcasecmp(best->domain, device->domain)) + { + unquote(uriName, best->fullName, sizeof(uriName)); +- + httpAssembleURI(HTTP_URI_CODING_ALL, device_uri, sizeof(device_uri), + schemes[best->type], NULL, uriName, 0, + best->cups_shared ? "/cups" : "/"); +- + cupsBackendReport("network", device_uri, best->make_and_model, + best->name, NULL, NULL); + best->sent = 1; +@@ -325,11 +454,9 @@ main(int argc, /* I - Number of comm + if (best) + { + unquote(uriName, best->fullName, sizeof(uriName)); +- + httpAssembleURI(HTTP_URI_CODING_ALL, device_uri, sizeof(device_uri), + schemes[best->type], NULL, uriName, 0, + best->cups_shared ? "/cups" : "/"); +- + cupsBackendReport("network", device_uri, best->make_and_model, + best->name, NULL, NULL); + best->sent = 1; +@@ -339,6 +466,204 @@ main(int argc, /* I - Number of comm } @@ -478,7 +503,7 @@ /* * 'browse_callback()' - Browse devices. */ -@@ -420,6 +750,7 @@ browse_local_callback( +@@ -427,6 +752,7 @@ browse_local_callback( device->fullName); device->sent = 1; } @@ -486,7 +511,7 @@ /* -@@ -518,18 +849,7 @@ get_device(cups_array_t *devices, /* I - +@@ -525,18 +851,7 @@ get_device(cups_array_t *devices, /* I - key.name = (char *)serviceName; key.domain = (char *)replyDomain; @@ -506,7 +531,7 @@ for (device = cupsArrayFind(devices, &key); device; -@@ -559,13 +879,20 @@ get_device(cups_array_t *devices, /* I - +@@ -566,13 +881,20 @@ get_device(cups_array_t *devices, /* I - * Set the "full name" of this service, which is used for queries... */ @@ -527,7 +552,7 @@ /* * 'query_callback()' - Process query data. */ -@@ -584,12 +911,21 @@ query_callback( +@@ -591,12 +913,21 @@ query_callback( uint32_t ttl, /* I - Time-to-live */ void *context) /* I - Devices array */ { @@ -553,7 +578,7 @@ fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, " "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", " -@@ -610,7 +946,6 @@ query_callback( +@@ -617,7 +948,6 @@ query_callback( * Lookup the service in the devices array. */ @@ -561,7 +586,7 @@ key.name = name; unquote(name, fullName, sizeof(name)); -@@ -635,88 +970,111 @@ query_callback( +@@ -642,88 +972,111 @@ query_callback( else key.type = CUPS_DEVICE_RIOUSBPRINT; @@ -712,7 +737,7 @@ if ((ptr = strchr(model, ',')) != NULL) *ptr = '\0'; -@@ -742,7 +1100,7 @@ query_callback( +@@ -749,7 +1102,7 @@ query_callback( if ((device->type == CUPS_DEVICE_IPP || device->type == CUPS_DEVICE_PRINTER) && @@ -721,7 +746,7 @@ { /* * This is a CUPS printer! -@@ -758,8 +1116,7 @@ query_callback( +@@ -765,8 +1118,7 @@ query_callback( } } @@ -731,7 +756,7 @@ } -@@ -797,6 +1154,35 @@ unquote(char *dst, /* I - Destina +@@ -804,6 +1156,35 @@ unquote(char *dst, /* I - Destina } @@ -767,9 +792,9 @@ /* * End of "$Id$". */ -diff -up cups-1.4b2/config.h.in.avahi cups-1.4b2/config.h.in ---- cups-1.4b2/config.h.in.avahi 2008-09-08 23:03:01.000000000 +0100 -+++ cups-1.4b2/config.h.in 2009-02-12 13:13:51.000000000 +0000 +diff -up cups-1.4b2-svn8404/config.h.in.avahi cups-1.4b2-svn8404/config.h.in +--- cups-1.4b2-svn8404/config.h.in.avahi 2009-02-19 17:56:47.000000000 +0000 ++++ cups-1.4b2-svn8404/config.h.in 2009-03-05 11:15:28.000000000 +0000 @@ -344,6 +344,13 @@ @@ -784,9 +809,9 @@ * Do we have ? */ -diff -up cups-1.4b2/config-scripts/cups-dnssd.m4.avahi cups-1.4b2/config-scripts/cups-dnssd.m4 ---- cups-1.4b2/config-scripts/cups-dnssd.m4.avahi 2008-08-29 23:19:39.000000000 +0100 -+++ cups-1.4b2/config-scripts/cups-dnssd.m4 2009-02-12 13:13:51.000000000 +0000 +diff -up cups-1.4b2-svn8404/config-scripts/cups-dnssd.m4.avahi cups-1.4b2-svn8404/config-scripts/cups-dnssd.m4 +--- cups-1.4b2-svn8404/config-scripts/cups-dnssd.m4.avahi 2009-02-19 17:56:46.000000000 +0000 ++++ cups-1.4b2-svn8404/config-scripts/cups-dnssd.m4 2009-03-05 11:15:28.000000000 +0000 @@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn DNSSDLIBS="" DNSSD_BACKEND="" @@ -809,9 +834,9 @@ if test x$enable_dnssd != xno; then AC_CHECK_HEADER(dns_sd.h, [ case "$uname" in -diff -up cups-1.4b2/cups/http-support.c.avahi cups-1.4b2/cups/http-support.c ---- cups-1.4b2/cups/http-support.c.avahi 2008-12-10 05:03:11.000000000 +0000 -+++ cups-1.4b2/cups/http-support.c 2009-02-12 13:18:24.000000000 +0000 +diff -up cups-1.4b2-svn8404/cups/http-support.c.avahi cups-1.4b2-svn8404/cups/http-support.c +--- cups-1.4b2-svn8404/cups/http-support.c.avahi 2009-02-19 17:56:46.000000000 +0000 ++++ cups-1.4b2-svn8404/cups/http-support.c 2009-03-05 11:15:28.000000000 +0000 @@ -53,6 +53,11 @@ #ifdef HAVE_DNSSD # include @@ -852,7 +877,7 @@ /* * 'httpAssembleURI()' - Assemble a uniform resource identifier from its -@@ -1337,11 +1363,22 @@ _httpResolveURI( +@@ -1343,11 +1369,22 @@ _httpResolveURI( if (strstr(hostname, "._tcp")) { @@ -876,7 +901,7 @@ /* * Separate the hostname into service name, registration type, and domain... -@@ -1379,8 +1416,13 @@ _httpResolveURI( +@@ -1385,8 +1422,13 @@ _httpResolveURI( if (domain) *domain++ = '\0'; @@ -890,7 +915,7 @@ resolved_uri[0] = '\0'; -@@ -1394,6 +1436,7 @@ _httpResolveURI( +@@ -1400,6 +1442,7 @@ _httpResolveURI( _cupsLangPuts(stderr, _("INFO: Looking for printer...\n")); } @@ -898,10 +923,10 @@ if (DNSServiceResolve(&ref, 0, 0, hostname, regtype, domain, resolve_callback, &uribuf) == kDNSServiceErr_NoError) -@@ -1409,16 +1452,49 @@ _httpResolveURI( +@@ -1414,17 +1457,49 @@ _httpResolveURI( + } else uri = NULL; - +#else + if ((simple_poll = avahi_simple_poll_new ()) != NULL) + { @@ -934,27 +959,23 @@ + avahi_simple_poll_free (simple_poll); + } +#endif -+ - if (log) + + if (logit) fputs("STATE: -connecting-to-device\n", stderr); -#else -- /* -- * No DNS-SD support... -- */ -- +#else /* HAVE_DNSSD || HAVE_AVAHI */ -+ /* -+ * No DNS-SD support... -+ */ -+ + /* + * No DNS-SD support... + */ + uri = NULL; -#endif /* HAVE_DNSSD */ +#endif /* HAVE_DNSSD || HAVE_AVAHI */ - if (log && !uri) + if (logit && !uri) _cupsLangPuts(stderr, _("Unable to find printer!\n")); -@@ -1623,6 +1699,105 @@ resolve_callback( +@@ -1629,6 +1704,105 @@ resolve_callback( } #endif /* HAVE_DNSSD */ cups-lspp.patch: Index: cups-lspp.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups-lspp.patch,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- cups-lspp.patch 28 Jan 2009 17:17:46 -0000 1.40 +++ cups-lspp.patch 5 Mar 2009 13:31:30 -0000 1.41 @@ -1,7 +1,7 @@ -diff -up cups-1.4b2/config.h.in.lspp cups-1.4b2/config.h.in ---- cups-1.4b2/config.h.in.lspp 2008-09-08 23:03:01.000000000 +0100 -+++ cups-1.4b2/config.h.in 2009-01-28 17:09:48.000000000 +0000 -@@ -619,6 +619,13 @@ +diff -up cups-1.4b2-svn8404/config.h.in.lspp cups-1.4b2-svn8404/config.h.in +--- cups-1.4b2-svn8404/config.h.in.lspp 2009-03-05 11:40:03.000000000 +0000 ++++ cups-1.4b2-svn8404/config.h.in 2009-03-05 11:40:03.000000000 +0000 +@@ -626,6 +626,13 @@ #undef HAVE_TCPD_H @@ -15,9 +15,9 @@ #endif /* !_CUPS_CONFIG_H_ */ /* -diff -up /dev/null cups-1.4b2/config-scripts/cups-lspp.m4 ---- /dev/null 2009-01-28 08:58:18.489189414 +0000 -+++ cups-1.4b2/config-scripts/cups-lspp.m4 2009-01-28 17:09:48.000000000 +0000 +diff -up /dev/null cups-1.4b2-svn8404/config-scripts/cups-lspp.m4 +--- /dev/null 2009-03-05 08:48:03.067001897 +0000 ++++ cups-1.4b2-svn8404/config-scripts/cups-lspp.m4 2009-03-05 11:40:03.000000000 +0000 @@ -0,0 +1,36 @@ +dnl +dnl LSPP code for the Common UNIX Printing System (CUPS). @@ -55,9 +55,9 @@ + ;; + esac +fi -diff -up cups-1.4b2/configure.in.lspp cups-1.4b2/configure.in ---- cups-1.4b2/configure.in.lspp 2008-11-14 19:32:22.000000000 +0000 -+++ cups-1.4b2/configure.in 2009-01-28 17:09:48.000000000 +0000 +diff -up cups-1.4b2-svn8404/configure.in.lspp cups-1.4b2-svn8404/configure.in +--- cups-1.4b2-svn8404/configure.in.lspp 2009-02-17 17:45:27.000000000 +0000 ++++ cups-1.4b2-svn8404/configure.in 2009-03-05 11:40:03.000000000 +0000 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4) sinclude(config-scripts/cups-pdf.m4) sinclude(config-scripts/cups-scripting.m4) @@ -67,510 +67,9 @@ INSTALL_LANGUAGES="" UNINSTALL_LANGUAGES="" LANGFILES="" -diff -up cups-1.4b2/configure.lspp cups-1.4b2/configure ---- cups-1.4b2/configure.lspp 2009-01-28 17:09:48.000000000 +0000 -+++ cups-1.4b2/configure 2009-01-28 17:09:48.000000000 +0000 -@@ -829,6 +829,8 @@ PHP - PHPCONFIG - PHPDIR - PYTHON -+LIBAUDIT -+LIBSELINUX - INSTALL_LANGUAGES - UNINSTALL_LANGUAGES - LIBOBJS -@@ -1459,6 +1461,7 @@ Optional Features: - --enable-texttops build with default text filter, default=auto - --enable-pap build with AppleTalk support, default=auto - --enable-pdftops build pdftops filter, default=auto -+ --enable-lspp turn on auditing and label support, default=no - - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -4651,7 +4654,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& - else - ac_cv_header_stdc=no - fi --rm -f -r conftest* -+rm -f conftest* - - fi - -@@ -4672,7 +4675,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& - else - ac_cv_header_stdc=no - fi --rm -f -r conftest* -+rm -f conftest* - - fi - -@@ -10327,10 +10330,10 @@ case "$uname" in - ;; - Linux* | GNU*) - # Linux and GNU Hurd -- MAN1EXT=1.gz -- MAN5EXT=5.gz -- MAN7EXT=7.gz -- MAN8EXT=8.gz -+ MAN1EXT=1 -+ MAN5EXT=5 -+ MAN7EXT=7 -+ MAN8EXT=8 - MAN8DIR=8 - ;; - *) -@@ -18309,7 +18312,7 @@ cat >>confdefs.h <<_ACEOF - _ACEOF - ;; - esac --rm -f -r conftest* -+rm -f conftest* - if test $ac_cv_sys_file_offset_bits = unknown; then - { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 - echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; } -@@ -18430,7 +18433,7 @@ cat >>confdefs.h <<_ACEOF - _ACEOF - ;; - esac --rm -f -r conftest* -+rm -f conftest* - fi - fi - -@@ -20495,6 +20498,412 @@ fi - - - -+ -+# Check whether --enable-lspp was given. -+if test "${enable_lspp+set}" = set; then -+ enableval=$enable_lspp; -+fi -+ -+ -+if test x"$enable_lspp" != xno; then -+ case "$uname" in -+ Linux) -+ { echo "$as_me:$LINENO: checking for audit_log_user_message in -laudit" >&5 -+echo $ECHO_N "checking for audit_log_user_message in -laudit... $ECHO_C" >&6; } -+if test "${ac_cv_lib_audit_audit_log_user_message+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-laudit $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char audit_log_user_message (); -+int -+main () -+{ -+return audit_log_user_message (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_audit_audit_log_user_message=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_audit_audit_log_user_message=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_audit_audit_log_user_message" >&5 -+echo "${ECHO_T}$ac_cv_lib_audit_audit_log_user_message" >&6; } -+if test $ac_cv_lib_audit_audit_log_user_message = yes; then -+ LIBAUDIT="-laudit" -+fi -+ -+ if test "${ac_cv_header_libaudit_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for libaudit.h" >&5 -+echo $ECHO_N "checking for libaudit.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_libaudit_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_libaudit_h" >&5 -+echo "${ECHO_T}$ac_cv_header_libaudit_h" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking libaudit.h usability" >&5 -+echo $ECHO_N "checking libaudit.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ echo "$as_me:$LINENO: checking libaudit.h presence" >&5 -+echo $ECHO_N "checking libaudit.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: libaudit.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: libaudit.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libaudit.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: libaudit.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: libaudit.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: libaudit.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libaudit.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: libaudit.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libaudit.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: libaudit.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libaudit.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: libaudit.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libaudit.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: libaudit.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libaudit.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: libaudit.h: in the future, the compiler will take precedence" >&2;} -+ -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for libaudit.h" >&5 -+echo $ECHO_N "checking for libaudit.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_libaudit_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_header_libaudit_h=$ac_header_preproc -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_libaudit_h" >&5 -+echo "${ECHO_T}$ac_cv_header_libaudit_h" >&6; } -+ -+fi -+ -+ -+ { echo "$as_me:$LINENO: checking for getpeercon in -lselinux" >&5 -+echo $ECHO_N "checking for getpeercon in -lselinux... $ECHO_C" >&6; } -+if test "${ac_cv_lib_selinux_getpeercon+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lselinux $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char getpeercon (); -+int -+main () -+{ -+return getpeercon (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_selinux_getpeercon=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_selinux_getpeercon=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_getpeercon" >&5 -+echo "${ECHO_T}$ac_cv_lib_selinux_getpeercon" >&6; } -+if test $ac_cv_lib_selinux_getpeercon = yes; then -+ LIBSELINUX="-lselinux" -+fi -+ -+ if test "${ac_cv_header_selinux_selinux_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for selinux/selinux.h" >&5 -+echo $ECHO_N "checking for selinux/selinux.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_selinux_selinux_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_selinux_selinux_h" >&5 -+echo "${ECHO_T}$ac_cv_header_selinux_selinux_h" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking selinux/selinux.h usability" >&5 -+echo $ECHO_N "checking selinux/selinux.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ echo "$as_me:$LINENO: checking selinux/selinux.h presence" >&5 -+echo $ECHO_N "checking selinux/selinux.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: selinux/selinux.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: selinux/selinux.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: selinux/selinux.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: selinux/selinux.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: selinux/selinux.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: selinux/selinux.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: selinux/selinux.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: selinux/selinux.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: selinux/selinux.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: selinux/selinux.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: selinux/selinux.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: selinux/selinux.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: selinux/selinux.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: selinux/selinux.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: selinux/selinux.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: selinux/selinux.h: in the future, the compiler will take precedence" >&2;} -+ -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for selinux/selinux.h" >&5 -+echo $ECHO_N "checking for selinux/selinux.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_selinux_selinux_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_header_selinux_selinux_h=$ac_header_preproc -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_selinux_selinux_h" >&5 -+echo "${ECHO_T}$ac_cv_header_selinux_selinux_h" >&6; } -+ -+fi -+ -+ -+ cat >>confdefs.h <<\_ACEOF -+#define WITH_LSPP 1 -+_ACEOF -+ -+ ;; -+ *) -+ # All others -+ ;; -+ esac -+fi -+ -+ - INSTALL_LANGUAGES="" - UNINSTALL_LANGUAGES="" - LANGFILES="" -@@ -21455,13 +21864,15 @@ PHP!$PHP$ac_delim - PHPCONFIG!$PHPCONFIG$ac_delim - PHPDIR!$PHPDIR$ac_delim - PYTHON!$PYTHON$ac_delim -+LIBAUDIT!$LIBAUDIT$ac_delim -+LIBSELINUX!$LIBSELINUX$ac_delim - INSTALL_LANGUAGES!$INSTALL_LANGUAGES$ac_delim - UNINSTALL_LANGUAGES!$UNINSTALL_LANGUAGES$ac_delim - LIBOBJS!$LIBOBJS$ac_delim - LTLIBOBJS!$LTLIBOBJS$ac_delim - _ACEOF - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 25; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -diff -up cups-1.4b2/cups/cups.h.lspp cups-1.4b2/cups/cups.h ---- cups-1.4b2/cups/cups.h.lspp 2008-12-10 05:03:11.000000000 +0000 -+++ cups-1.4b2/cups/cups.h 2009-01-28 17:09:48.000000000 +0000 +diff -up cups-1.4b2-svn8404/cups/cups.h.lspp cups-1.4b2-svn8404/cups/cups.h +--- cups-1.4b2-svn8404/cups/cups.h.lspp 2009-03-05 10:54:00.000000000 +0000 ++++ cups-1.4b2-svn8404/cups/cups.h 2009-03-05 11:40:03.000000000 +0000 @@ -15,6 +15,9 @@ * This file is subject to the Apple OS-Developed Software exception. */ @@ -594,9 +93,9 @@ /* * Types and structures... */ -diff -up cups-1.4b2/data/Makefile.lspp cups-1.4b2/data/Makefile ---- cups-1.4b2/data/Makefile.lspp 2008-11-12 19:30:57.000000000 +0000 -+++ cups-1.4b2/data/Makefile 2009-01-28 17:09:48.000000000 +0000 +diff -up cups-1.4b2-svn8404/data/Makefile.lspp cups-1.4b2-svn8404/data/Makefile +--- cups-1.4b2-svn8404/data/Makefile.lspp 2009-02-17 17:45:27.000000000 +0000 ++++ cups-1.4b2-svn8404/data/Makefile 2009-03-05 11:40:03.000000000 +0000 @@ -25,7 +25,10 @@ BANNERS = \ secret \ standard \ @@ -609,9 +108,9 @@ CHARMAPS = \ euc-cn.txt \ -diff -up /dev/null cups-1.4b2/data/mls ---- /dev/null 2009-01-28 08:58:18.489189414 +0000 -+++ cups-1.4b2/data/mls 2009-01-28 17:09:48.000000000 +0000 +diff -up /dev/null cups-1.4b2-svn8404/data/mls +--- /dev/null 2009-03-05 08:48:03.067001897 +0000 ++++ cups-1.4b2-svn8404/data/mls 2009-03-05 11:40:03.000000000 +0000 @@ -0,0 +1,261 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -874,9 +373,9 @@ +% End of "$Id$". +% +%%EOF -diff -up /dev/null cups-1.4b2/data/selinux ---- /dev/null 2009-01-28 08:58:18.489189414 +0000 -+++ cups-1.4b2/data/selinux 2009-01-28 17:09:48.000000000 +0000 +diff -up /dev/null cups-1.4b2-svn8404/data/selinux +--- /dev/null 2009-03-05 08:48:03.067001897 +0000 ++++ cups-1.4b2-svn8404/data/selinux 2009-03-05 11:40:03.000000000 +0000 @@ -0,0 +1,261 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -1139,9 +638,9 @@ +% End of "$Id$". +% +%%EOF -diff -up /dev/null cups-1.4b2/data/te ---- /dev/null 2009-01-28 08:58:18.489189414 +0000 -+++ cups-1.4b2/data/te 2009-01-28 17:09:48.000000000 +0000 +diff -up /dev/null cups-1.4b2-svn8404/data/te +--- /dev/null 2009-03-05 08:48:03.067001897 +0000 ++++ cups-1.4b2-svn8404/data/te 2009-03-05 11:40:03.000000000 +0000 @@ -0,0 +1,261 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -1404,9 +903,9 @@ +% End of "$Id$". +% +%%EOF -diff -up cups-1.4b2/filter/common.c.lspp cups-1.4b2/filter/common.c ---- cups-1.4b2/filter/common.c.lspp 2007-07-11 22:46:42.000000000 +0100 -+++ cups-1.4b2/filter/common.c 2009-01-28 17:09:48.000000000 +0000 +diff -up cups-1.4b2-svn8404/filter/common.c.lspp cups-1.4b2-svn8404/filter/common.c +--- cups-1.4b2-svn8404/filter/common.c.lspp 2008-12-03 15:39:53.000000000 +0000 ++++ cups-1.4b2-svn8404/filter/common.c 2009-03-05 11:40:03.000000000 +0000 @@ -30,6 +30,12 @@ * Include necessary headers... */ @@ -1575,10 +1074,10 @@ /* -diff -up cups-1.4b2/filter/pstops.c.lspp cups-1.4b2/filter/pstops.c ---- cups-1.4b2/filter/pstops.c.lspp 2009-01-28 17:09:48.000000000 +0000 -+++ cups-1.4b2/filter/pstops.c 2009-01-28 17:09:48.000000000 +0000 -@@ -3232,6 +3232,18 @@ write_label_prolog(pstops_doc_t *doc, /* +diff -up cups-1.4b2-svn8404/filter/pstops.c.lspp cups-1.4b2-svn8404/filter/pstops.c +--- cups-1.4b2-svn8404/filter/pstops.c.lspp 2009-03-05 11:40:03.000000000 +0000 ++++ cups-1.4b2-svn8404/filter/pstops.c 2009-03-05 11:40:03.000000000 +0000 +@@ -3239,6 +3239,18 @@ write_label_prolog(pstops_doc_t *doc, /* { const char *classification; /* CLASSIFICATION environment variable */ const char *ptr; /* Temporary string pointer */ @@ -1597,7 +1096,7 @@ /* -@@ -3254,6 +3266,124 @@ write_label_prolog(pstops_doc_t *doc, /* +@@ -3261,6 +3273,124 @@ write_label_prolog(pstops_doc_t *doc, /* return; } @@ -1722,7 +1221,7 @@ /* * Set the classification + page label string... */ -@@ -3332,7 +3462,10 @@ write_label_prolog(pstops_doc_t *doc, /* +@@ -3339,7 +3469,10 @@ write_label_prolog(pstops_doc_t *doc, /* doc_printf(doc, " %.0f moveto ESPpl show\n", top - 14.0); doc_puts(doc, "pop\n"); doc_puts(doc, "}bind put\n"); @@ -1733,12 +1232,12 @@ /* -diff -up cups-1.4b2/Makedefs.in.lspp cups-1.4b2/Makedefs.in ---- cups-1.4b2/Makedefs.in.lspp 2009-01-28 17:09:48.000000000 +0000 -+++ cups-1.4b2/Makedefs.in 2009-01-28 17:09:48.000000000 +0000 +diff -up cups-1.4b2-svn8404/Makedefs.in.lspp cups-1.4b2-svn8404/Makedefs.in +--- cups-1.4b2-svn8404/Makedefs.in.lspp 2009-03-05 11:40:03.000000000 +0000 ++++ cups-1.4b2-svn8404/Makedefs.in 2009-03-05 11:40:03.000000000 +0000 @@ -146,7 +146,7 @@ LIBCUPSORDER = @LIBCUPSORDER@ LIBCUPSIMAGEORDER = @LIBCUPSIMAGEORDER@ - LINKCUPS = @LINKCUPS@ $(SSLLIBS) + LINKCUPS = @LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS) LINKCUPSIMAGE = @LINKCUPSIMAGE@ -LIBS = $(LINKCUPS) $(COMMONLIBS) +LIBS = $(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@ @@ -1754,9 +1253,9 @@ .SUFFIXES: .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz .c.o: -diff -up cups-1.4b2/scheduler/client.c.lspp cups-1.4b2/scheduler/client.c ---- cups-1.4b2/scheduler/client.c.lspp 2008-11-17 16:29:05.000000000 +0000 -+++ cups-1.4b2/scheduler/client.c 2009-01-28 17:09:48.000000000 +0000 +diff -up cups-1.4b2-svn8404/scheduler/client.c.lspp cups-1.4b2-svn8404/scheduler/client.c +--- cups-1.4b2-svn8404/scheduler/client.c.lspp 2009-03-05 10:54:00.000000000 +0000 ++++ cups-1.4b2-svn8404/scheduler/client.c 2009-03-05 11:40:03.000000000 +0000 @@ -41,6 +41,7 @@ * pipe_command() - Pipe the output of a command to the remote client. * write_file() - Send a file via HTTP. @@ -1786,7 +1285,7 @@ /* * Local functions... -@@ -402,6 +410,57 @@ cupsdAcceptClient(cupsd_listener_t *lis) +@@ -381,6 +389,57 @@ cupsdAcceptClient(cupsd_listener_t *lis) } #endif /* HAVE_TCPD_H */ @@ -1844,7 +1343,7 @@ #ifdef AF_INET6 if (con->http.hostaddr->addr.sa_family == AF_INET6) cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)", -@@ -801,6 +860,13 @@ cupsdReadClient(cupsd_client_t *con) /* +@@ -772,6 +831,13 @@ cupsdReadClient(cupsd_client_t *con) /* mime_type_t *type; /* MIME type of file */ cupsd_printer_t *p; /* Printer */ static unsigned request_id = 0; /* Request ID for temp files */ @@ -1858,7 +1357,7 @@ status = HTTP_CONTINUE; -@@ -2125,6 +2191,67 @@ cupsdReadClient(cupsd_client_t *con) /* +@@ -2054,6 +2120,67 @@ cupsdReadClient(cupsd_client_t *con) /* fchmod(con->file, 0640); fchown(con->file, RunUser, Group); fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC); @@ -1926,7 +1425,7 @@ } if (con->http.state != HTTP_POST_SEND) -@@ -4436,6 +4563,50 @@ make_certificate(cupsd_client_t *con) /* +@@ -4330,6 +4457,50 @@ make_certificate(cupsd_client_t *con) /* #endif /* HAVE_SSL */ @@ -1977,9 +1476,9 @@ /* * 'pipe_command()' - Pipe the output of a command to the remote client. */ -diff -up cups-1.4b2/scheduler/client.h.lspp cups-1.4b2/scheduler/client.h ---- cups-1.4b2/scheduler/client.h.lspp 2008-09-11 02:54:11.000000000 +0100 -+++ cups-1.4b2/scheduler/client.h 2009-01-28 17:09:48.000000000 +0000 +diff -up cups-1.4b2-svn8404/scheduler/client.h.lspp cups-1.4b2-svn8404/scheduler/client.h +--- cups-1.4b2-svn8404/scheduler/client.h.lspp 2009-02-17 17:45:27.000000000 +0000 ++++ cups-1.4b2-svn8404/scheduler/client.h 2009-03-05 11:40:03.000000000 +0000 @@ -18,6 +18,13 @@ #endif /* HAVE_AUTHORIZATION_H */ @@ -2005,7 +1504,7 @@ }; #define HTTP(con) &((con)->http) -@@ -132,6 +143,9 @@ extern void cupsdStartListening(void); +@@ -130,6 +141,9 @@ extern void cupsdStartListening(void); extern void cupsdStopListening(void); extern void cupsdUpdateCGI(void); extern void cupsdWriteClient(cupsd_client_t *con); @@ -2015,9 +1514,9 @@ /* -diff -up cups-1.4b2/scheduler/conf.c.lspp cups-1.4b2/scheduler/conf.c ---- cups-1.4b2/scheduler/conf.c.lspp 2009-01-28 17:09:48.000000000 +0000 -+++ cups-1.4b2/scheduler/conf.c 2009-01-28 17:09:48.000000000 +0000 +diff -up cups-1.4b2-svn8404/scheduler/conf.c.lspp cups-1.4b2-svn8404/scheduler/conf.c +--- cups-1.4b2-svn8404/scheduler/conf.c.lspp 2009-03-05 11:40:03.000000000 +0000 ++++ cups-1.4b2-svn8404/scheduler/conf.c 2009-03-05 11:40:03.000000000 +0000 @@ -27,6 +27,7 @@ * read_configuration() - Read a configuration file. * read_location() - Read a definition. @@ -2036,7 +1535,7 @@ /* * Configuration variable structure... -@@ -168,6 +172,10 @@ static const cupsd_var_t variables[] = +@@ -169,6 +173,10 @@ static const cupsd_var_t variables[] = # if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS) { "ServerKey", &ServerKey, CUPSD_VARTYPE_PATHNAME }, # endif /* HAVE_LIBSSL || HAVE_GNUTLS */ @@ -2047,7 +1546,7 @@ #endif /* HAVE_SSL */ { "ServerName", &ServerName, CUPSD_VARTYPE_STRING }, { "ServerRoot", &ServerRoot, CUPSD_VARTYPE_PATHNAME }, -@@ -380,6 +388,9 @@ cupsdReadConfiguration(void) +@@ -382,6 +390,9 @@ cupsdReadConfiguration(void) const char *tmpdir; /* TMPDIR environment variable */ struct stat tmpinfo; /* Temporary directory info */ cupsd_policy_t *p; /* Policy */ @@ -2057,7 +1556,7 @@ /* -@@ -659,6 +670,25 @@ cupsdReadConfiguration(void) +@@ -665,6 +676,25 @@ cupsdReadConfiguration(void) RunUser = getuid(); @@ -2080,10 +1579,10 @@ + } +#endif /* WITH_LSPP */ + - /* - * See if the ServerName is an IP address... - */ -@@ -951,11 +981,23 @@ cupsdReadConfiguration(void) + cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.", + RemoteAccessEnabled ? "enabled" : "disabled"); + +@@ -981,11 +1011,23 @@ cupsdReadConfiguration(void) * Update classification setting as needed... */ @@ -2108,7 +1607,7 @@ /* * Check the MaxClients setting, and then allocate memory for it... -@@ -3489,6 +3531,18 @@ read_location(cups_file_t *fp, /* I - C +@@ -3536,6 +3578,18 @@ read_location(cups_file_t *fp, /* I - C return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum); } @@ -2127,10 +1626,10 @@ /* * 'read_policy()' - Read a definition. -diff -up cups-1.4b2/scheduler/conf.h.lspp cups-1.4b2/scheduler/conf.h ---- cups-1.4b2/scheduler/conf.h.lspp 2009-01-28 17:09:48.000000000 +0000 -+++ cups-1.4b2/scheduler/conf.h 2009-01-28 17:09:48.000000000 +0000 -@@ -233,6 +233,12 @@ VAR char *ServerKey VALUE(NULL); +diff -up cups-1.4b2-svn8404/scheduler/conf.h.lspp cups-1.4b2-svn8404/scheduler/conf.h +--- cups-1.4b2-svn8404/scheduler/conf.h.lspp 2009-03-05 11:40:03.000000000 +0000 ++++ cups-1.4b2-svn8404/scheduler/conf.h 2009-03-05 11:40:03.000000000 +0000 +@@ -246,6 +246,12 @@ VAR char *ServerKey VALUE(NULL); VAR int SSLOptions VALUE(CUPSD_SSL_NONE); /* SSL/TLS options */ #endif /* HAVE_SSL */ @@ -2143,7 +1642,7 @@ #ifdef HAVE_LAUNCHD VAR int LaunchdTimeout VALUE(DEFAULT_KEEPALIVE); -@@ -251,6 +257,9 @@ VAR char *SystemGroupAuthKey VALUE(NULL +@@ -264,6 +270,9 @@ VAR char *SystemGroupAuthKey VALUE(NULL /* System group auth key */ #endif /* HAVE_AUTHORIZATION_H */ @@ -2153,9 +1652,9 @@ /* * Prototypes... -diff -up cups-1.4b2/scheduler/ipp.c.lspp cups-1.4b2/scheduler/ipp.c ---- cups-1.4b2/scheduler/ipp.c.lspp 2009-01-28 17:09:48.000000000 +0000 -+++ cups-1.4b2/scheduler/ipp.c 2009-01-28 17:09:48.000000000 +0000 +diff -up cups-1.4b2-svn8404/scheduler/ipp.c.lspp cups-1.4b2-svn8404/scheduler/ipp.c +--- cups-1.4b2-svn8404/scheduler/ipp.c.lspp 2009-03-05 11:40:03.000000000 +0000 ++++ cups-1.4b2-svn8404/scheduler/ipp.c 2009-03-05 11:40:03.000000000 +0000 @@ -41,6 +41,7 @@ * cancel_all_jobs() - Cancel all print jobs. * cancel_job() - Cancel a print job. @@ -2164,7 +1663,7 @@ * check_quotas() - Check quotas for a printer and user. * check_rss_recipient() - Check that we do not have a duplicate RSS * feed URI. -@@ -101,6 +102,9 @@ +@@ -102,6 +103,9 @@ * validate_user() - Validate the user for the request. */ @@ -2174,7 +1673,7 @@ /* * Include necessary headers... */ -@@ -127,6 +131,14 @@ extern int mbr_check_membership_by_id(uu +@@ -128,6 +132,14 @@ extern int mbr_check_membership_by_id(uu # endif /* HAVE_MEMBERSHIPPRIV_H */ #endif /* __APPLE__ */ @@ -2189,7 +1688,7 @@ /* * Local functions... -@@ -160,6 +172,9 @@ static void cancel_all_jobs(cupsd_client +@@ -161,6 +173,9 @@ static void cancel_all_jobs(cupsd_client static void cancel_job(cupsd_client_t *con, ipp_attribute_t *uri); static void cancel_subscription(cupsd_client_t *con, int id); static int check_rss_recipient(const char *recipient); @@ -2199,7 +1698,7 @@ static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p); static ipp_attribute_t *copy_attribute(ipp_t *to, ipp_attribute_t *attr, int quickcopy); -@@ -1311,6 +1326,21 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1334,6 +1349,21 @@ add_job(cupsd_client_t *con, /* I - Cl int kbytes; /* Size of print file */ int i; /* Looping var */ int lowerpagerange; /* Page range bound */ @@ -2221,7 +1720,7 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))", -@@ -1527,6 +1557,104 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1550,6 +1580,104 @@ add_job(cupsd_client_t *con, /* I - Cl ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, title = "Untitled"); @@ -2326,7 +1825,7 @@ if ((job = cupsdAddJob(priority, printer->name)) == NULL) { send_ipp_status(con, IPP_INTERNAL_ERROR, -@@ -1535,6 +1663,32 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1558,6 +1686,32 @@ add_job(cupsd_client_t *con, /* I - Cl return (NULL); } @@ -2359,7 +1858,7 @@ job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT | CUPS_PRINTER_REMOTE); job->attrs = con->request; -@@ -1743,6 +1897,29 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1766,6 +1920,29 @@ add_job(cupsd_client_t *con, /* I - Cl attr->values[0].string.text = _cupsStrRetain(printer->job_sheets[0]); attr->values[1].string.text = _cupsStrRetain(printer->job_sheets[1]); } @@ -2389,7 +1888,7 @@ job->job_sheets = attr; -@@ -1773,6 +1950,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1796,6 +1973,9 @@ add_job(cupsd_client_t *con, /* I - Cl "job-sheets=\"%s,none\", " "job-originating-user-name=\"%s\"", Classification, job->username); @@ -2399,7 +1898,7 @@ } else if (attr->num_values == 2 && strcmp(attr->values[0].string.text, -@@ -1791,6 +1971,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1814,6 +1994,9 @@ add_job(cupsd_client_t *con, /* I - Cl "job-originating-user-name=\"%s\"", attr->values[0].string.text, attr->values[1].string.text, job->username); @@ -2409,7 +1908,7 @@ } else if (strcmp(attr->values[0].string.text, Classification) && strcmp(attr->values[0].string.text, "none") && -@@ -1811,6 +1994,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1834,6 +2017,9 @@ add_job(cupsd_client_t *con, /* I - Cl "job-originating-user-name=\"%s\"", attr->values[0].string.text, attr->values[1].string.text, job->username); @@ -2419,7 +1918,7 @@ } } else if (strcmp(attr->values[0].string.text, Classification) && -@@ -1851,8 +2037,52 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1874,8 +2060,52 @@ add_job(cupsd_client_t *con, /* I - Cl "job-sheets=\"%s\", " "job-originating-user-name=\"%s\"", Classification, job->username); @@ -2472,7 +1971,7 @@ /* * See if we need to add the starting sheet... -@@ -4187,6 +4417,103 @@ check_rss_recipient( +@@ -4202,6 +4432,103 @@ check_rss_recipient( } @@ -2576,7 +2075,7 @@ /* * 'check_quotas()' - Check quotas for a printer and user. */ -@@ -4736,6 +5063,15 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -4753,6 +5080,15 @@ copy_banner(cupsd_client_t *con, /* I - char attrname[255], /* Name of attribute */ *s; /* Pointer into name */ ipp_attribute_t *attr; /* Attribute */ @@ -2592,7 +2091,7 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, -@@ -4771,6 +5107,82 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -4788,6 +5124,82 @@ copy_banner(cupsd_client_t *con, /* I - fchmod(cupsFileNumber(out), 0640); fchown(cupsFileNumber(out), RunUser, Group); @@ -2675,7 +2174,7 @@ /* * Try the localized banner file under the subdirectory... -@@ -4865,6 +5277,24 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -4882,6 +5294,24 @@ copy_banner(cupsd_client_t *con, /* I - else s = attrname; @@ -2700,7 +2199,7 @@ if (!strcmp(s, "printer-name")) { cupsFilePuts(out, job->dest); -@@ -6782,6 +7212,22 @@ get_job_attrs(cupsd_client_t *con, /* I +@@ -6802,6 +7232,22 @@ get_job_attrs(cupsd_client_t *con, /* I return; } @@ -2723,19 +2222,19 @@ /* * Copy attributes... */ -@@ -6997,6 +7443,11 @@ get_jobs(cupsd_client_t *con, /* I - C - if (count > 0) - ippAddSeparator(con->response); +@@ -7021,6 +7467,11 @@ get_jobs(cupsd_client_t *con, /* I - C + if (username[0] && strcasecmp(username, job->username)) + continue; +#ifdef WITH_LSPP + if (is_lspp_config() && check_context(con, job) != 1) + continue; +#endif /* WITH_LSPP */ + - count ++; + if (count > 0) + ippAddSeparator(con->response); - cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count); -@@ -11314,6 +11765,11 @@ validate_user(cupsd_job_t *job, /* I +@@ -11454,6 +11905,11 @@ validate_user(cupsd_job_t *job, /* I strlcpy(username, get_username(con), userlen); @@ -2747,10 +2246,10 @@ /* * Check the username against the owner... */ -diff -up cups-1.4b2/scheduler/job.c.lspp cups-1.4b2/scheduler/job.c ---- cups-1.4b2/scheduler/job.c.lspp 2009-01-28 17:09:48.000000000 +0000 -+++ cups-1.4b2/scheduler/job.c 2009-01-28 17:11:11.000000000 +0000 -@@ -62,6 +62,9 @@ +diff -up cups-1.4b2-svn8404/scheduler/job.c.lspp cups-1.4b2-svn8404/scheduler/job.c +--- cups-1.4b2-svn8404/scheduler/job.c.lspp 2009-03-05 11:40:03.000000000 +0000 ++++ cups-1.4b2-svn8404/scheduler/job.c 2009-03-05 12:07:09.000000000 +0000 +@@ -65,6 +65,9 @@ * update_job_attrs() - Update the job-printer-* attributes. */ @@ -2760,7 +2259,7 @@ /* * Include necessary headers... */ -@@ -71,6 +74,14 @@ +@@ -74,6 +77,14 @@ #include #include @@ -2774,8 +2273,116 @@ +#endif /* WITH_LSPP */ /* - * Local globals... -@@ -1156,6 +1167,20 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J + * Design Notes for Job Management +@@ -478,6 +489,14 @@ cupsdContinueJob(cupsd_job_t *job) /* I + /* PRINTER env variable */ + rip_max_cache[255]; + /* RIP_MAX_CACHE env variable */ ++#ifdef WITH_LSPP ++ char *audit_message = NULL; /* Audit message string */ ++ context_t jobcon; /* SELinux context of the job */ ++ char *label_template = NULL; /* SL to put in classification ++ env var */ ++ const char *mls_label = NULL; /* SL to put in classification ++ env var */ ++#endif /* WITH_LSPP */ + + + cupsdLogMessage(CUPSD_LOG_DEBUG2, +@@ -898,6 +917,67 @@ cupsdContinueJob(cupsd_job_t *job) /* I + } + } + ++#ifdef WITH_LSPP ++ if (is_lspp_config()) ++ { ++ if (!job->scon || strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0) ++ { ++ if (AuditLog != -1) ++ { ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s", ++ job->id, job->auid, job->username, job->printer->name, title); ++ audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message, ++ ServerName, NULL, NULL, 1); ++ cupsdClearString(&audit_message); ++ } ++ } ++ else ++ { ++ jobcon = context_new(job->scon); ++ ++ if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME)) == NULL) ++ label_template = strdup(Classification); ++ else if (attr->num_values > 1 && ++ strcmp(attr->values[1].string.text, "none") != 0) ++ label_template = strdup(attr->values[1].string.text); ++ else ++ label_template = strdup(attr->values[0].string.text); ++ ++ if (strcasecmp(label_template, MLS_CONFIG) == 0) ++ mls_label = context_range_get(jobcon); ++ else if (strcasecmp(label_template, TE_CONFIG) == 0) ++ mls_label = context_type_get(jobcon); ++ else if (strcasecmp(label_template, SELINUX_CONFIG) == 0) ++ mls_label = context_str(jobcon); ++ else ++ mls_label = label_template; ++ ++ if (mls_label && (PerPageLabels || banner_page)) ++ { ++ snprintf(classification, sizeof(classification), "CLASSIFICATION=LSPP:%s", mls_label); ++ envp[envc ++] = classification; ++ } ++ ++ if ((AuditLog != -1) && !banner_page) ++ { ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s" ++ " obj=%s label=%s", job->id, job->auid, job->username, ++ job->printer->name, title, job->scon, mls_label?mls_label:"none"); ++ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, ++ ServerName, NULL, NULL, 1); ++ cupsdClearString(&audit_message); ++ } ++ context_free(jobcon); ++ free(label_template); ++ } ++ } ++ else ++ /* ++ * Fall through to the non-LSPP behavior ++ */ ++#endif /* WITH_LSPP */ + if (Classification && !banner_page) + { + if ((attr = ippFindAttribute(job->attrs, "job-sheets", +@@ -1141,13 +1221,13 @@ cupsdContinueJob(cupsd_job_t *job) /* I + if (access(command, F_OK)) + { + snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat, +- method); ++ scheme); + if (!access(command, F_OK)) + { + /* Not in the correct directory, but we found it in the compat + * directory. Issue a warning. */ + cupsdLogMessage(CUPSD_LOG_INFO, +- "Backend '%s' not in %s/backend!", method, ++ "Backend '%s' not in %s/backend!", scheme, + ServerBin); + } + else +@@ -1155,7 +1235,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I + /* Not in the compat directory either; make any error + messages use the correct directory name then. */ + snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, +- method); ++ scheme); + } + } + #endif /* __x86_64__ */ +@@ -1561,6 +1641,20 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J goto error; } @@ -2796,7 +2403,7 @@ job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed", IPP_TAG_INTEGER); job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME); -@@ -1523,6 +1548,13 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J +@@ -1909,6 +2003,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J { char filename[1024]; /* Job control filename */ cups_file_t *fp; /* Job file */ @@ -2804,13 +2411,14 @@ + security_context_t spoolcon; /* context of the job control file */ + context_t jobcon; /* contex_t container for job->scon */ + context_t tmpcon; /* Temp context to swap the level */ -+ char *jobclearance; /* SELinux low end clearance */ -+ char *jobrange; /* SELinux sensitivity range */ ++ char *jobclearance; /* SELinux low end clearance */ ++ const char *jobrange; /* SELinux sensitivity range */ ++ char *jobrange_copy; /* SELinux sensitivity range */ +#endif /* WITH_LSPP */ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p", -@@ -1541,6 +1573,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J +@@ -1927,6 +2029,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J fchmod(cupsFileNumber(fp), 0600); fchown(cupsFileNumber(fp), RunUser, Group); @@ -2839,15 +2447,15 @@ + jobrange = context_range_get(jobcon); + if (jobrange) + { -+ jobrange = strdup(jobrange); -+ if ((jobclearance = strtok(jobrange, "-")) != NULL) ++ jobrange_copy = strdup(jobrange); ++ if ((jobclearance = strtok(jobrange_copy, "-")) != NULL) + { + if (context_range_set(tmpcon, jobclearance) == -1) + { + cupsdLogMessage(CUPSD_LOG_ERROR, + "Unable to set the range for job control file \"%s\" - %s.", + filename, strerror(errno)); -+ free(jobrange); ++ free(jobrange_copy); + context_free(tmpcon); + context_free(jobcon); + return; @@ -2860,13 +2468,13 @@ + cupsdLogMessage(CUPSD_LOG_ERROR, + "Unable to set the range for job control file \"%s\" - %s.", + filename, strerror(errno)); -+ free(jobrange); ++ free(jobrange_copy); + context_free(tmpcon); + context_free(jobcon); + return; + } + } -+ free(jobrange); ++ free(jobrange_copy); + } + if (setfilecon(filename, context_str(tmpcon)) == -1) + { @@ -2887,16 +2495,32 @@ job->attrs->state = IPP_IDLE; if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL, -@@ -2531,6 +2633,21 @@ start_job(cupsd_job_t *job, /* I - - /* RIP_MAX_CACHE env variable */ - static char *options = NULL;/* Full list of options */ - static int optlength = 0; /* Length of option buffer */ +@@ -2846,6 +3018,18 @@ get_options(cupsd_job_t *job, /* I - Jo + banner_page) + continue; + ++#ifdef WITH_LSPP ++ /* ++ * In LSPP mode refuse to honor the page-label ++ */ ++ if (is_lspp_config() && ++ !strcmp(attr->name, "page-label")) ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "Ignoring page-label option due to LSPP mode"); ++ continue; ++ } ++#endif /* WITH_LSPP */ ++ + /* + * Otherwise add them to the list... + */ +@@ -3516,6 +3700,19 @@ static void + start_job(cupsd_job_t *job, /* I - Job ID */ + cupsd_printer_t *printer) /* I - Printer to print job */ + { +#ifdef WITH_LSPP -+ const char *mls_label = NULL; /* SL to put in classification env var */ -+ char *label_template = NULL; /* SL to put in classification env var */ + char *audit_message = NULL; /* Audit message string */ + char *printerfile = NULL; /* Device file pointed to by the printer */ -+ context_t jobcon; /* SELinux context of the job */ + security_id_t clisid; /* SELinux SID for the client */ + security_id_t psid; /* SELinux SID for the printer */ + context_t printercon; /* Printer's context string */ @@ -2906,12 +2530,13 @@ + security_class_t tclass; /* Object class for the SELinux check */ + access_vector_t avr; /* Access method being requested */ +#endif /* WITH_LSPP */ ++ + cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job(job=%p(%d), printer=%p(%s))", + job, job->id, printer, printer->name); - - cupsdLogJob(job, CUPSD_LOG_DEBUG2, "start_job: file = %d/%d", -@@ -2803,6 +2920,106 @@ start_job(cupsd_job_t *job, /* I - - fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK); - } +@@ -3629,6 +3826,106 @@ start_job(cupsd_job_t *job, /* I - + fcntl(job->side_pipes[1], F_SETFL, + fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK); +#ifdef WITH_LSPP + if (is_lspp_config()) @@ -2932,7 +2557,7 @@ + if (errno != ENOENT) + { + cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to stat the printer"); -+ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); ++ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); + return ; + } + /* @@ -2955,7 +2580,7 @@ + { + cupsdLogMessage(CUPSD_LOG_ERROR, + "StartJob: Printer is not a character device or regular file"); -+ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); ++ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); + return ; + } + avc_init("cupsd_dequeue_", NULL, NULL, NULL, NULL); @@ -2964,14 +2589,14 @@ + { + cupsdLogMessage(CUPSD_LOG_ERROR, + "StartJob: Unable to determine the SELinux sid for the job"); -+ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); ++ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); + return ; + } + if (getfilecon(printerfile, &devcon) == -1) + { + cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to get the SELinux context of %s", + printerfile); -+ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); ++ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); + return ; + } + printercon = context_new(devcon); @@ -2984,7 +2609,7 @@ + cupsdLogMessage(CUPSD_LOG_ERROR, + "StartJob: Unable to determine the SELinux sid for the printer"); + freecon(devcon); -+ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); ++ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); + return ; + } + freecon(devcon); @@ -3005,7 +2630,7 @@ + cupsdClearString(&audit_message); + } + -+ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); ++ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); + + return ; + } @@ -3014,98 +2639,11 @@ +#endif /* WITH_LSPP */ + /* - * Determine if we are printing a banner page or not... + * Now start the first file in the job... */ -@@ -2940,6 +3157,18 @@ start_job(cupsd_job_t *job, /* I - - banner_page) - continue; - -+#ifdef WITH_LSPP -+ /* -+ * In LSPP mode refuse to honor the page-label -+ */ -+ if (is_lspp_config() && -+ !strcmp(attr->name, "page-label")) -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Ignoring page-label option due to LSPP mode"); -+ continue; -+ } -+#endif /* WITH_LSPP */ -+ - /* - * Otherwise add them to the list... - */ -@@ -3189,6 +3418,67 @@ start_job(cupsd_job_t *job, /* I - - } - } - -+#ifdef WITH_LSPP -+ if (is_lspp_config()) -+ { -+ if (!job->scon || strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0) -+ { -+ if (AuditLog != -1) -+ { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s", -+ job->id, job->auid, job->username, printer->name, title); -+ audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message, -+ ServerName, NULL, NULL, 1); -+ cupsdClearString(&audit_message); -+ } -+ } -+ else -+ { -+ jobcon = context_new(job->scon); -+ -+ if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME)) == NULL) -+ label_template = strdup(Classification); -+ else if (attr->num_values > 1 && -+ strcmp(attr->values[1].string.text, "none") != 0) -+ label_template = strdup(attr->values[1].string.text); -+ else -+ label_template = strdup(attr->values[0].string.text); -+ -+ if (strcasecmp(label_template, MLS_CONFIG) == 0) -+ mls_label = context_range_get(jobcon); -+ else if (strcasecmp(label_template, TE_CONFIG) == 0) -+ mls_label = context_type_get(jobcon); -+ else if (strcasecmp(label_template, SELINUX_CONFIG) == 0) -+ mls_label = context_str(jobcon); -+ else -+ mls_label = label_template; -+ -+ if (mls_label && (PerPageLabels || banner_page)) -+ { -+ snprintf(classification, sizeof(classification), "CLASSIFICATION=LSPP:%s", mls_label); -+ envp[envc ++] = classification; -+ } -+ -+ if ((AuditLog != -1) && !banner_page) -+ { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s" -+ " obj=%s label=%s", job->id, job->auid, job->username, -+ printer->name, title, job->scon, mls_label?mls_label:"none"); -+ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, -+ ServerName, NULL, NULL, 1); -+ cupsdClearString(&audit_message); -+ } -+ context_free(jobcon); -+ free(label_template); -+ } -+ } -+ else -+ /* -+ * Fall through to the non-LSPP behavior -+ */ -+#endif /* WITH_LSPP */ - if (Classification && !banner_page) - { - if ((attr = ippFindAttribute(job->attrs, "job-sheets", -diff -up cups-1.4b2/scheduler/job.h.lspp cups-1.4b2/scheduler/job.h ---- cups-1.4b2/scheduler/job.h.lspp 2009-01-28 17:09:48.000000000 +0000 -+++ cups-1.4b2/scheduler/job.h 2009-01-28 17:09:48.000000000 +0000 +diff -up cups-1.4b2-svn8404/scheduler/job.h.lspp cups-1.4b2-svn8404/scheduler/job.h +--- cups-1.4b2-svn8404/scheduler/job.h.lspp 2009-03-05 10:54:00.000000000 +0000 ++++ cups-1.4b2-svn8404/scheduler/job.h 2009-03-05 11:40:03.000000000 +0000 @@ -13,6 +13,13 @@ * file is missing or damaged, see the license at "http://www.cups.org/". */ @@ -3118,9 +2656,9 @@ +#endif /* WITH_LSPP */ + /* - * Job request structure... + * Constants... */ -@@ -63,6 +70,10 @@ typedef struct cupsd_job_s +@@ -80,6 +87,10 @@ typedef struct cupsd_job_s krb5_ccache ccache; /* Kerberos credential cache */ char *ccname; /* KRB5CCNAME environment variable */ #endif /* HAVE_GSSAPI */ @@ -3131,9 +2669,9 @@ } cupsd_job_t; -diff -up cups-1.4b2/scheduler/main.c.lspp cups-1.4b2/scheduler/main.c ---- cups-1.4b2/scheduler/main.c.lspp 2009-01-28 17:09:48.000000000 +0000 -+++ cups-1.4b2/scheduler/main.c 2009-01-28 17:09:48.000000000 +0000 +diff -up cups-1.4b2-svn8404/scheduler/main.c.lspp cups-1.4b2-svn8404/scheduler/main.c +--- cups-1.4b2-svn8404/scheduler/main.c.lspp 2009-03-05 11:40:03.000000000 +0000 ++++ cups-1.4b2-svn8404/scheduler/main.c 2009-03-05 11:40:03.000000000 +0000 @@ -35,6 +35,8 @@ * usage() - Show scheduler usage. */ @@ -3189,7 +2727,7 @@ /* * Set the timezone info... */ -@@ -1212,6 +1239,11 @@ main(int argc, /* I - Number of comm +@@ -1206,6 +1233,11 @@ main(int argc, /* I - Number of comm cupsdStopSelect(); @@ -3201,11 +2739,11 @@ return (!stop_scheduler); } -diff -up cups-1.4b2/scheduler/printers.c.lspp cups-1.4b2/scheduler/printers.c ---- cups-1.4b2/scheduler/printers.c.lspp 2009-01-28 17:09:48.000000000 +0000 -+++ cups-1.4b2/scheduler/printers.c 2009-01-28 17:09:48.000000000 +0000 -@@ -52,6 +52,8 @@ - * write_xml_string() - Write a string with XML escaping. +diff -up cups-1.4b2-svn8404/scheduler/printers.c.lspp cups-1.4b2-svn8404/scheduler/printers.c +--- cups-1.4b2-svn8404/scheduler/printers.c.lspp 2009-03-05 11:40:03.000000000 +0000 ++++ cups-1.4b2-svn8404/scheduler/printers.c 2009-03-05 11:40:03.000000000 +0000 +@@ -58,6 +58,8 @@ + * write_xml_string() - Write a string with XML escaping. */ +/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ @@ -3213,7 +2751,7 @@ /* * Include necessary headers... */ -@@ -79,6 +81,10 @@ static void write_irix_state(cupsd_print +@@ -86,6 +88,10 @@ static void write_irix_state(cupsd_print #endif /* __sgi */ static void write_xml_string(cups_file_t *fp, const char *s); @@ -3224,7 +2762,7 @@ /* * 'cupsdAddPrinter()' - Add a printer to the system. -@@ -2115,6 +2121,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) +@@ -2168,6 +2174,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) { /* No authentication */ "none" }; @@ -3238,7 +2776,7 @@ DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, -@@ -2260,6 +2273,42 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) +@@ -2313,6 +2326,42 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) attr->values[1].string.text = _cupsStrAlloc(Classification ? Classification : p->job_sheets[1]); } @@ -3281,7 +2819,7 @@ } p->raw = 0; -@@ -4650,7 +4699,6 @@ write_irix_state(cupsd_printer_t *p) /* +@@ -4865,7 +4914,6 @@ write_irix_state(cupsd_printer_t *p) /* } #endif /* __sgi */ cups-no-export-ssllibs.patch: Index: cups-no-export-ssllibs.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups-no-export-ssllibs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-no-export-ssllibs.patch 15 Jun 2006 12:16:06 -0000 1.1 +++ cups-no-export-ssllibs.patch 5 Mar 2009 13:31:30 -0000 1.2 @@ -1,22 +1,12 @@ ---- cups-1.2.1/config-scripts/cups-ssl.m4.no-export-ssllibs 2006-06-15 13:12:59.000000000 +0100 -+++ cups-1.2.1/config-scripts/cups-ssl.m4 2006-06-15 13:13:09.000000000 +0100 -@@ -109,7 +109,7 @@ +diff -up cups-1.4b2-svn8404/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.4b2-svn8404/config-scripts/cups-ssl.m4 +--- cups-1.4b2-svn8404/config-scripts/cups-ssl.m4.no-export-ssllibs 2009-02-17 17:45:27.000000000 +0000 ++++ cups-1.4b2-svn8404/config-scripts/cups-ssl.m4 2009-03-05 11:12:59.000000000 +0000 +@@ -110,7 +110,7 @@ fi + AC_SUBST(SSLFLAGS) AC_SUBST(SSLLIBS) - AC_SUBST(ENCRYPTION_REQUIRED) -EXPORT_SSLLIBS="$SSLLIBS" +EXPORT_SSLLIBS="" AC_SUBST(EXPORT_SSLLIBS) ---- cups-1.2.1/configure.no-export-ssllibs 2006-06-15 13:13:42.000000000 +0100 -+++ cups-1.2.1/configure 2006-06-15 13:13:48.000000000 +0100 -@@ -12343,7 +12343,7 @@ - - - --EXPORT_SSLLIBS="$SSLLIBS" -+EXPORT_SSLLIBS="" - - - cups-no-gzip-man.patch: Index: cups-no-gzip-man.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups-no-gzip-man.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-no-gzip-man.patch 17 Mar 2006 12:10:57 -0000 1.1 +++ cups-no-gzip-man.patch 5 Mar 2009 13:31:30 -0000 1.2 @@ -1,9 +1,10 @@ ---- cups-1.2svn-r5102/config-scripts/cups-manpages.m4.no-gzip-man 2006-02-13 02:46:10.000000000 +0000 -+++ cups-1.2svn-r5102/config-scripts/cups-manpages.m4 2006-02-17 09:55:45.000000000 +0000 -@@ -80,10 +80,10 @@ +diff -up cups-1.4b2-svn8404/config-scripts/cups-manpages.m4.no-gzip-man cups-1.4b2-svn8404/config-scripts/cups-manpages.m4 +--- cups-1.4b2-svn8404/config-scripts/cups-manpages.m4.no-gzip-man 2009-01-16 08:58:42.000000000 +0000 ++++ cups-1.4b2-svn8404/config-scripts/cups-manpages.m4 2009-03-05 11:11:12.000000000 +0000 +@@ -69,10 +69,10 @@ case "$uname" in ;; - Linux* | GNU*) - # Linux and GNU Hurd + Linux* | GNU* | Darwin*) + # Linux, GNU Hurd, and Mac OS X - MAN1EXT=1.gz - MAN5EXT=5.gz - MAN7EXT=7.gz cups-serverbin-compat.patch: Index: cups-serverbin-compat.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups-serverbin-compat.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cups-serverbin-compat.patch 12 Nov 2008 16:09:54 -0000 1.5 +++ cups-serverbin-compat.patch 5 Mar 2009 13:31:30 -0000 1.6 @@ -1,9 +1,9 @@ -diff -up cups-1.4b1/scheduler/conf.c.serverbin-compat cups-1.4b1/scheduler/conf.c ---- cups-1.4b1/scheduler/conf.c.serverbin-compat 2008-10-08 17:34:03.000000000 +0100 -+++ cups-1.4b1/scheduler/conf.c 2008-11-11 15:39:11.000000000 +0000 -@@ -432,6 +432,9 @@ cupsdReadConfiguration(void) - cupsdSetString(&ServerName, httpGetHostname(NULL, temp, sizeof(temp))); - cupsdSetStringf(&ServerAdmin, "root@%s", temp); +diff -up cups-1.4b2-svn8404/scheduler/conf.c.serverbin-compat cups-1.4b2-svn8404/scheduler/conf.c +--- cups-1.4b2-svn8404/scheduler/conf.c.serverbin-compat 2009-02-17 17:45:27.000000000 +0000 ++++ cups-1.4b2-svn8404/scheduler/conf.c 2009-03-05 11:08:57.000000000 +0000 +@@ -436,6 +436,9 @@ cupsdReadConfiguration(void) + cupsdClearString(&ServerName); + cupsdClearString(&ServerAdmin); cupsdSetString(&ServerBin, CUPS_SERVERBIN); +#ifdef __x86_64__ + cupsdSetString(&ServerBin_compat, "/usr/lib64/cups"); @@ -11,7 +11,7 @@ cupsdSetString(&RequestRoot, CUPS_REQUESTS); cupsdSetString(&CacheDir, CUPS_CACHEDIR); cupsdSetString(&DataDir, CUPS_DATADIR); -@@ -1187,7 +1190,12 @@ cupsdReadConfiguration(void) +@@ -1217,7 +1220,12 @@ cupsdReadConfiguration(void) * Read the MIME type and conversion database... */ @@ -24,10 +24,10 @@ snprintf(mimedir, sizeof(mimedir), "%s/mime", DataDir); MimeDatabase = mimeLoadTypes(NULL, mimedir); -diff -up cups-1.4b1/scheduler/conf.h.serverbin-compat cups-1.4b1/scheduler/conf.h ---- cups-1.4b1/scheduler/conf.h.serverbin-compat 2008-09-19 21:03:36.000000000 +0100 -+++ cups-1.4b1/scheduler/conf.h 2008-11-11 15:35:13.000000000 +0000 -@@ -89,6 +89,10 @@ VAR char *ConfigurationFile VALUE(NULL) +diff -up cups-1.4b2-svn8404/scheduler/conf.h.serverbin-compat cups-1.4b2-svn8404/scheduler/conf.h +--- cups-1.4b2-svn8404/scheduler/conf.h.serverbin-compat 2009-02-17 17:45:27.000000000 +0000 ++++ cups-1.4b2-svn8404/scheduler/conf.h 2009-03-05 11:08:57.000000000 +0000 +@@ -95,6 +95,10 @@ VAR char *ConfigurationFile VALUE(NULL) /* Root directory for scheduler */ *ServerBin VALUE(NULL), /* Root directory for binaries */ @@ -38,9 +38,9 @@ *StateDir VALUE(NULL), /* Root directory for state data */ *RequestRoot VALUE(NULL), -diff -up cups-1.4b1/scheduler/env.c.serverbin-compat cups-1.4b1/scheduler/env.c ---- cups-1.4b1/scheduler/env.c.serverbin-compat 2008-06-18 23:31:26.000000000 +0100 -+++ cups-1.4b1/scheduler/env.c 2008-11-11 15:35:13.000000000 +0000 +diff -up cups-1.4b2-svn8404/scheduler/env.c.serverbin-compat cups-1.4b2-svn8404/scheduler/env.c +--- cups-1.4b2-svn8404/scheduler/env.c.serverbin-compat 2009-02-17 17:45:27.000000000 +0000 ++++ cups-1.4b2-svn8404/scheduler/env.c 2009-03-05 11:08:57.000000000 +0000 @@ -86,8 +86,13 @@ cupsdInitEnv(void) cupsdSetEnv("LD_LIBRARY_PATH", NULL); cupsdSetEnv("LD_PRELOAD", NULL); @@ -55,10 +55,10 @@ cupsdSetEnv("SERVER_ADMIN", ServerAdmin); cupsdSetEnv("SHLIB_PATH", NULL); cupsdSetEnv("SOFTWARE", CUPS_MINIMAL); -diff -up cups-1.4b1/scheduler/ipp.c.serverbin-compat cups-1.4b1/scheduler/ipp.c ---- cups-1.4b1/scheduler/ipp.c.serverbin-compat 2008-10-27 21:54:12.000000000 +0000 -+++ cups-1.4b1/scheduler/ipp.c 2008-11-11 15:41:25.000000000 +0000 -@@ -2515,9 +2515,18 @@ add_printer(cupsd_client_t *con, /* I - +diff -up cups-1.4b2-svn8404/scheduler/ipp.c.serverbin-compat cups-1.4b2-svn8404/scheduler/ipp.c +--- cups-1.4b2-svn8404/scheduler/ipp.c.serverbin-compat 2009-03-05 10:54:00.000000000 +0000 ++++ cups-1.4b2-svn8404/scheduler/ipp.c 2009-03-05 11:08:57.000000000 +0000 +@@ -2541,9 +2541,18 @@ add_printer(cupsd_client_t *con, /* I - * Could not find device in list! */ @@ -77,10 +77,10 @@ } } -diff -up cups-1.4b1/scheduler/job.c.serverbin-compat cups-1.4b1/scheduler/job.c ---- cups-1.4b1/scheduler/job.c.serverbin-compat 2008-10-21 01:02:45.000000000 +0100 -+++ cups-1.4b1/scheduler/job.c 2008-11-11 15:35:13.000000000 +0000 -@@ -3267,8 +3267,32 @@ start_job(cupsd_job_t *job, /* I - +diff -up cups-1.4b2-svn8404/scheduler/job.c.serverbin-compat cups-1.4b2-svn8404/scheduler/job.c +--- cups-1.4b2-svn8404/scheduler/job.c.serverbin-compat 2009-03-05 10:54:00.000000000 +0000 ++++ cups-1.4b2-svn8404/scheduler/job.c 2009-03-05 11:08:57.000000000 +0000 +@@ -966,8 +966,32 @@ cupsdContinueJob(cupsd_job_t *job) /* I i ++, filter = (mime_filter_t *)cupsArrayNext(filters)) { if (filter->filter[0] != '/') @@ -115,10 +115,10 @@ else strlcpy(command, filter->filter, sizeof(command)); -@@ -3414,6 +3438,28 @@ start_job(cupsd_job_t *job, /* I - - { - sscanf(printer->device_uri, "%254[^:]", method); - snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, method); +@@ -1113,6 +1137,28 @@ cupsdContinueJob(cupsd_job_t *job) /* I + cupsdClosePipe(job->print_pipes); + cupsdClosePipe(job->back_pipes); + cupsdClosePipe(job->side_pipes); +#ifdef __x86_64__ + if (access(command, F_OK)) + { @@ -142,12 +142,12 @@ + } +#endif /* __x86_64__ */ - /* - * See if the backend needs to run as root... -diff -up cups-1.4b1/scheduler/printers.c.serverbin-compat cups-1.4b1/scheduler/printers.c ---- cups-1.4b1/scheduler/printers.c.serverbin-compat 2008-10-10 06:28:15.000000000 +0100 -+++ cups-1.4b1/scheduler/printers.c 2008-11-11 15:35:13.000000000 +0000 -@@ -985,9 +985,19 @@ cupsdLoadAllPrinters(void) + close(job->status_pipes[1]); + job->status_pipes[1] = -1; +diff -up cups-1.4b2-svn8404/scheduler/printers.c.serverbin-compat cups-1.4b2-svn8404/scheduler/printers.c +--- cups-1.4b2-svn8404/scheduler/printers.c.serverbin-compat 2009-03-05 10:54:00.000000000 +0000 ++++ cups-1.4b2-svn8404/scheduler/printers.c 2009-03-05 11:09:46.000000000 +0000 +@@ -1021,9 +1021,19 @@ cupsdLoadAllPrinters(void) * Backend does not exist, stop printer... */ @@ -167,9 +167,9 @@ } } -@@ -3448,6 +3458,12 @@ add_printer_filter( +@@ -3580,6 +3590,12 @@ add_printer_filter( - if (access(filename, X_OK)) + if (stat(filename, &fileinfo)) { +#ifdef __x86_64__ + snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin_compat, @@ -179,14 +179,14 @@ +#endif /* __x86_64__ */ snprintf(p->state_message, sizeof(p->state_message), "Filter \"%s\" for printer \"%s\" not available: %s", - program, p->name, strerror(errno)); -@@ -3455,6 +3471,9 @@ add_printer_filter( - cupsdSetPrinterState(p, IPP_PRINTER_STOPPED, 0); + filename, p->name, strerror(errno)); +@@ -3587,6 +3603,9 @@ add_printer_filter( cupsdLogMessage(CUPSD_LOG_ERROR, "%s", p->state_message); + return; +#ifdef __x86_64__ + } +#endif /* __x86_64__ */ } - } + /* Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.463 retrieving revision 1.464 diff -u -r1.463 -r1.464 --- cups.spec 25 Feb 2009 11:27:37 -0000 1.463 +++ cups.spec 5 Mar 2009 13:31:30 -0000 1.464 @@ -1,4 +1,5 @@ %define pre b2 +%define svn -svn8404 %define initdir /etc/rc.d/init.d %define use_alternatives 1 %define lspp 1 @@ -7,10 +8,10 @@ Summary: Common Unix Printing System Name: cups Version: 1.4 -Release: 0.%{pre}.7%{?dist}.1 +Release: 0.%{pre}.8%{?dist} License: GPLv2 Group: System Environment/Daemons -Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}-source.tar.bz2 +Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2 Source1: cups.init Source2: cupsprinter.png Source4: pstopdf @@ -37,7 +38,6 @@ Patch12: cups-lpr-help.patch Patch13: cups-peercred.patch Patch14: cups-pid.patch -Patch15: cups-local-protocols.patch Patch16: cups-eggcups.patch Patch17: cups-getpass.patch Patch18: cups-driverd-timeout.patch @@ -45,9 +45,6 @@ Patch20: cups-logrotate.patch Patch21: cups-usb-paperout.patch Patch22: cups-build.patch -Patch23: cups-str3077.patch -Patch24: cups-str3078.patch -Patch25: cups-str3059.patch Patch26: cups-avahi.patch Patch27: cups-missing-devices.patch Patch100: cups-lspp.patch @@ -166,7 +163,7 @@ module. %prep -%setup -q -n %{name}-%{version}%{?pre} +%setup -q -n %{name}-%{version}%{?pre}%{?svn} %patch1 -p1 -b .no-gzip-man %patch2 -p1 -b .system-auth %patch3 -p1 -b .multilib @@ -181,7 +178,6 @@ %patch12 -p1 -b .lpr-help %patch13 -p1 -b .peercred %patch14 -p1 -b .pid -%patch15 -p1 -b .local-protocols %patch16 -p1 -b .eggcups %patch17 -p1 -b .getpass %patch18 -p1 -b .driverd-timeout @@ -189,9 +185,6 @@ %patch20 -p1 -b .logrotate %patch21 -p1 -b .usb-paperout %patch22 -p1 -b .build -%patch23 -p1 -b .str3077 -%patch24 -p1 -b .str3078 -%patch25 -p1 -b .str3059 %patch26 -p1 -b .avahi %patch27 -p1 -b .missing-devices @@ -384,12 +377,20 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/cups %config(noreplace) %{_sysconfdir}/portreserve/%{name} %dir %{_datadir}/%{name}/www +%dir %{_datadir}/%{name}/www/es +%dir %{_datadir}/%{name}/www/ja +%dir %{_datadir}/%{name}/www/pl +%dir %{_datadir}/%{name}/www/ru %config(noreplace) %{_datadir}/%{name}/www/favicon.* %config(noreplace) %{_datadir}/%{name}/www/images %config(noreplace) %{_datadir}/%{name}/www/*.css %config(noreplace) %doc %{_datadir}/%{name}/www/index.html %config(noreplace) %doc %{_datadir}/%{name}/www/help %config(noreplace) %doc %{_datadir}/%{name}/www/robots.txt +%config(noreplace) %doc %{_datadir}/%{name}/www/es/index.html +%config(noreplace) %doc %{_datadir}/%{name}/www/ja/index.html +%config(noreplace) %doc %{_datadir}/%{name}/www/pl/index.html +%config(noreplace) %doc %{_datadir}/%{name}/www/ru/index.html %config(noreplace) %{initdir}/cups %{_bindir}/cupstestppd %{_bindir}/cupstestdsc @@ -420,6 +421,9 @@ %dir %{_datadir}/cups/templates %config(noreplace) %{_datadir}/cups/templates/*.tmpl %config(noreplace) %{_datadir}/cups/templates/es/*.tmpl +%config(noreplace) %{_datadir}/cups/templates/ja/*.tmpl +%config(noreplace) %{_datadir}/cups/templates/pl/*.tmpl +%config(noreplace) %{_datadir}/cups/templates/ru/*.tmpl %{_datadir}/locale/* %{_datadir}/ppd %dir %attr(1770,root,lp) /var/spool/cups/tmp @@ -461,6 +465,9 @@ %{_libdir}/php/modules/*.so %changelog +* Thu Mar 5 2009 Tim Waugh 1:1.4-0.b2.8 +- Updated to svn8404. + * Wed Feb 25 2009 Tim Waugh - Added 'Should-Start: portreserve' to the initscript (part of bug #487250). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 16 Dec 2008 12:31:53 -0000 1.47 +++ sources 5 Mar 2009 13:31:30 -0000 1.48 @@ -1,2 +1,2 @@ b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz -23f540e6145e4ab3298700d9f496bcd1 cups-1.4b2-source.tar.bz2 +f520304d497111b8421e12a408a8bcda cups-1.4b2-svn8404-source.tar.bz2 --- cups-local-protocols.patch DELETED --- --- cups-str3059.patch DELETED --- --- cups-str3077.patch DELETED --- --- cups-str3078.patch DELETED --- From mgrepl at fedoraproject.org Thu Mar 5 13:36:31 2009 From: mgrepl at fedoraproject.org (Miroslav Grepl) Date: Thu, 5 Mar 2009 13:36:31 +0000 (UTC) Subject: rpms/selinux-policy/F-10 policy-20080710.patch,1.142,1.143 Message-ID: <20090305133631.90FFE70116@cvs1.fedora.phx.redhat.com> Author: mgrepl Update of /cvs/extras/rpms/selinux-policy/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12476 Modified Files: policy-20080710.patch Log Message: - Fix pcscd policy - Allow alsa to read hardware state information policy-20080710.patch: Index: policy-20080710.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- policy-20080710.patch 26 Feb 2009 15:04:20 -0000 1.142 +++ policy-20080710.patch 5 Mar 2009 13:35:59 -0000 1.143 @@ -492,6 +492,17 @@ # No MLS restrictions: x_drawable { show hide override } +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.5.13/policy/modules/admin/alsa.te +--- nsaserefpolicy/policy/modules/admin/alsa.te 2008-10-17 14:49:14.000000000 +0200 ++++ serefpolicy-3.5.13/policy/modules/admin/alsa.te 2009-03-05 13:26:46.000000000 +0100 +@@ -43,6 +43,7 @@ + + dev_read_sound(alsa_t) + dev_write_sound(alsa_t) ++dev_read_sysfs(alsa_t) + + corecmd_exec_bin(alsa_t) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.5.13/policy/modules/admin/anaconda.te --- nsaserefpolicy/policy/modules/admin/anaconda.te 2008-10-17 14:49:14.000000000 +0200 +++ serefpolicy-3.5.13/policy/modules/admin/anaconda.te 2009-02-10 15:07:15.000000000 +0100 @@ -10816,7 +10827,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.5.13/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2008-10-17 14:49:13.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/services/apache.fc 2009-02-26 15:55:33.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/services/apache.fc 2009-02-27 09:31:08.000000000 +0100 @@ -1,16 +1,18 @@ -HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_ROLE_content_t,s0) +HOME_DIR/((www)|(web)|(public_html)|(public_git))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0) @@ -14198,7 +14209,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.5.13/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2008-10-17 14:49:13.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/services/cron.te 2009-02-10 15:07:15.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/services/cron.te 2009-03-05 13:23:48.000000000 +0100 @@ -12,14 +12,6 @@ ## @@ -14284,11 +14295,12 @@ files_read_etc_files(crond_t) files_read_generic_spool(crond_t) -@@ -142,13 +147,16 @@ +@@ -142,13 +147,17 @@ files_search_default(crond_t) init_rw_utmp(crond_t) -+init_spec_domtrans_script(crond_t) ++#init_spec_domtrans_script(crond_t) ++init_domtrans_script(system_crond_t) auth_use_nsswitch(crond_t) @@ -14301,7 +14313,7 @@ seutil_read_config(crond_t) seutil_read_default_contexts(crond_t) -@@ -161,6 +169,7 @@ +@@ -161,6 +170,7 @@ userdom_list_all_users_home_dirs(crond_t) mta_send_mail(crond_t) @@ -14309,7 +14321,7 @@ ifdef(`distro_debian',` # pam_limits is used -@@ -180,21 +189,45 @@ +@@ -180,21 +190,45 @@ ') ') @@ -14356,7 +14368,7 @@ ') optional_policy(` -@@ -236,6 +269,9 @@ +@@ -236,6 +270,9 @@ allow system_crond_t cron_var_lib_t:file manage_file_perms; files_var_lib_filetrans(system_crond_t, cron_var_lib_t, file) @@ -14366,7 +14378,7 @@ allow system_crond_t system_cron_spool_t:file read_file_perms; # The entrypoint interface is not used as this is not # a regular entrypoint. Since crontab files are -@@ -267,9 +303,13 @@ +@@ -267,9 +304,13 @@ filetrans_pattern(system_crond_t, crond_tmp_t, system_crond_tmp_t, { file lnk_file }) files_tmp_filetrans(system_crond_t, system_crond_tmp_t, file) @@ -14381,7 +14393,7 @@ kernel_read_kernel_sysctls(system_crond_t) kernel_read_system_state(system_crond_t) -@@ -323,7 +363,8 @@ +@@ -323,7 +364,8 @@ init_read_utmp(system_crond_t) init_dontaudit_rw_utmp(system_crond_t) # prelink tells init to restart it self, we either need to allow or dontaudit @@ -14391,7 +14403,7 @@ auth_use_nsswitch(system_crond_t) -@@ -333,6 +374,7 @@ +@@ -333,6 +375,7 @@ libs_exec_ld_so(system_crond_t) logging_read_generic_logs(system_crond_t) @@ -14399,7 +14411,7 @@ logging_send_syslog_msg(system_crond_t) miscfiles_read_localization(system_crond_t) -@@ -348,18 +390,6 @@ +@@ -348,18 +391,6 @@ ') ') @@ -14418,7 +14430,7 @@ optional_policy(` # Needed for certwatch apache_exec_modules(system_crond_t) -@@ -383,11 +413,20 @@ +@@ -383,11 +414,20 @@ ') optional_policy(` @@ -14439,7 +14451,7 @@ ') optional_policy(` -@@ -415,8 +454,7 @@ +@@ -415,8 +455,7 @@ ') optional_policy(` @@ -14449,7 +14461,7 @@ ') optional_policy(` -@@ -424,15 +462,12 @@ +@@ -424,15 +463,12 @@ ') optional_policy(` @@ -16809,7 +16821,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.5.13/policy/modules/services/ftp.te --- nsaserefpolicy/policy/modules/services/ftp.te 2008-10-17 14:49:13.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/services/ftp.te 2009-02-18 14:36:11.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/services/ftp.te 2009-03-05 13:32:40.000000000 +0100 @@ -26,7 +26,7 @@ ## ##

    @@ -16854,7 +16866,7 @@ auth_use_nsswitch(ftpd_t) auth_domtrans_chk_passwd(ftpd_t) -@@ -226,8 +236,15 @@ +@@ -226,8 +236,16 @@ userdom_manage_all_users_home_content_dirs(ftpd_t) userdom_manage_all_users_home_content_files(ftpd_t) userdom_manage_all_users_home_content_symlinks(ftpd_t) @@ -16865,12 +16877,13 @@ + auth_read_all_symlinks_except_shadow(ftpd_t) ') -+unprivuser_home_dir_filetrans_home_content(ftpd_t, { file dir lnk_file }) ++# Needed for permissive mode, to make sure everything gets labeled correctly ++userdom_user_home_dir_filetrans_pattern(ftpd_t, { dir file lnk_file }) + tunable_policy(`ftp_home_dir && use_nfs_home_dirs',` fs_manage_nfs_files(ftpd_t) fs_read_nfs_symlinks(ftpd_t) -@@ -238,6 +255,11 @@ +@@ -238,6 +256,11 @@ fs_read_cifs_symlinks(ftpd_t) ') @@ -16882,7 +16895,7 @@ optional_policy(` tunable_policy(`ftp_home_dir',` apache_search_sys_content(ftpd_t) -@@ -245,6 +267,18 @@ +@@ -245,6 +268,18 @@ ') optional_policy(` @@ -16901,7 +16914,7 @@ corecmd_exec_shell(ftpd_t) files_read_usr_files(ftpd_t) -@@ -261,7 +295,9 @@ +@@ -261,7 +296,9 @@ ') optional_policy(` @@ -16912,7 +16925,7 @@ ') optional_policy(` -@@ -273,6 +309,14 @@ +@@ -273,6 +310,14 @@ ') optional_policy(` @@ -20351,9 +20364,18 @@ +optional_policy(` + prelude_manage_spool(pads_t) +') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.fc serefpolicy-3.5.13/policy/modules/services/pcscd.fc +--- nsaserefpolicy/policy/modules/services/pcscd.fc 2008-10-17 14:49:11.000000000 +0200 ++++ serefpolicy-3.5.13/policy/modules/services/pcscd.fc 2009-03-05 13:06:23.000000000 +0100 +@@ -1,4 +1,5 @@ + /var/run/pcscd\.comm -s gen_context(system_u:object_r:pcscd_var_run_t,s0) ++/var/run/pcscd\.events(/.*)? gen_context(system_u:object_r:pcscd_var_run_t,s0) + /var/run/pcscd\.pid -- gen_context(system_u:object_r:pcscd_var_run_t,s0) + /var/run/pcscd\.pub -- gen_context(system_u:object_r:pcscd_var_run_t,s0) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-3.5.13/policy/modules/services/pcscd.te --- nsaserefpolicy/policy/modules/services/pcscd.te 2008-10-17 14:49:11.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/services/pcscd.te 2009-02-10 15:07:15.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/services/pcscd.te 2009-03-05 13:00:11.000000000 +0100 @@ -10,6 +10,7 @@ type pcscd_exec_t; domain_type(pcscd_t) @@ -20362,7 +20384,19 @@ # pid files type pcscd_var_run_t; -@@ -60,6 +61,14 @@ +@@ -27,9 +28,10 @@ + allow pcscd_t self:unix_dgram_socket create_socket_perms; + allow pcscd_t self:tcp_socket create_stream_socket_perms; + ++manage_dirs_pattern(pcscd_t, pcscd_var_run_t, pcscd_var_run_t) + manage_files_pattern(pcscd_t, pcscd_var_run_t, pcscd_var_run_t) + manage_sock_files_pattern(pcscd_t, pcscd_var_run_t, pcscd_var_run_t) +-files_pid_filetrans(pcscd_t, pcscd_var_run_t, { file sock_file }) ++files_pid_filetrans(pcscd_t, pcscd_var_run_t, { file dir sock_file }) + + corenet_all_recvfrom_unlabeled(pcscd_t) + corenet_all_recvfrom_netlabel(pcscd_t) +@@ -60,6 +62,14 @@ sysnet_dns_name_resolve(pcscd_t) optional_policy(` @@ -22097,7 +22131,7 @@ /var/spool/postfix/private(/.*)? gen_context(system_u:object_r:postfix_private_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.5.13/policy/modules/services/postfix.if --- nsaserefpolicy/policy/modules/services/postfix.if 2008-10-17 14:49:13.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/services/postfix.if 2009-02-10 15:07:15.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/services/postfix.if 2009-03-05 13:42:04.000000000 +0100 @@ -46,6 +46,7 @@ allow postfix_$1_t postfix_etc_t:dir list_dir_perms; @@ -22106,7 +22140,15 @@ can_exec(postfix_$1_t, postfix_$1_exec_t) -@@ -211,9 +212,8 @@ +@@ -78,6 +79,7 @@ + files_read_etc_runtime_files(postfix_$1_t) + files_read_usr_symlinks(postfix_$1_t) + files_search_spool(postfix_$1_t) ++ files_search_all_mountpoints(postfix_$1_t) + files_getattr_tmp_dirs(postfix_$1_t) + + init_dontaudit_use_fds(postfix_$1_t) +@@ -211,9 +213,8 @@ type postfix_etc_t; ') @@ -22118,7 +22160,7 @@ files_search_etc($1) ') -@@ -267,6 +267,25 @@ +@@ -267,6 +268,25 @@ dontaudit $1 postfix_local_t:tcp_socket { read write }; ') @@ -22144,7 +22186,7 @@ ######################################## ##

    ## Allow domain to read postfix local process state -@@ -421,7 +440,7 @@ +@@ -421,7 +441,7 @@ ## ## # @@ -22153,7 +22195,7 @@ gen_require(` type postfix_private_t; ') -@@ -432,6 +451,25 @@ +@@ -432,6 +452,25 @@ ######################################## ## @@ -22179,7 +22221,7 @@ ## Execute the master postfix program in the ## postfix_master domain. ## -@@ -461,10 +499,10 @@ +@@ -461,10 +500,10 @@ # interface(`postfix_search_spool',` gen_require(` @@ -22192,7 +22234,7 @@ files_search_spool($1) ') -@@ -480,15 +518,34 @@ +@@ -480,15 +519,34 @@ # interface(`postfix_list_spool',` gen_require(` @@ -22229,7 +22271,7 @@ ## Read postfix mail spool files. ## ## -@@ -499,11 +556,30 @@ +@@ -499,11 +557,30 @@ # interface(`postfix_read_spool_files',` gen_require(` @@ -22262,7 +22304,7 @@ ') ######################################## -@@ -524,3 +600,23 @@ +@@ -524,3 +601,23 @@ typeattribute $1 postfix_user_domtrans; ') @@ -23023,7 +23065,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.5.13/policy/modules/services/ppp.te --- nsaserefpolicy/policy/modules/services/ppp.te 2008-10-17 14:49:11.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/services/ppp.te 2009-02-10 15:07:15.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/services/ppp.te 2009-03-05 13:10:12.000000000 +0100 @@ -37,8 +37,8 @@ type pppd_etc_rw_t; files_type(pppd_etc_rw_t) @@ -23044,7 +23086,15 @@ kernel_read_kernel_sysctls(pppd_t) kernel_read_system_state(pppd_t) kernel_rw_net_sysctls(pppd_t) -@@ -197,6 +199,8 @@ +@@ -161,6 +163,7 @@ + + init_read_utmp(pppd_t) + init_dontaudit_write_utmp(pppd_t) ++init_signal_script(pppd_t) + + auth_use_nsswitch(pppd_t) + +@@ -197,6 +200,8 @@ optional_policy(` mta_send_mail(pppd_t) @@ -23053,7 +23103,7 @@ ') optional_policy(` -@@ -220,7 +224,7 @@ +@@ -220,7 +225,7 @@ # PPTP Local policy # @@ -23062,7 +23112,7 @@ dontaudit pptp_t self:capability sys_tty_config; allow pptp_t self:process signal; allow pptp_t self:fifo_file rw_fifo_file_perms; -@@ -228,14 +232,16 @@ +@@ -228,14 +233,16 @@ allow pptp_t self:unix_stream_socket { connectto create_stream_socket_perms }; allow pptp_t self:rawip_socket create_socket_perms; allow pptp_t self:tcp_socket create_socket_perms; @@ -23081,7 +23131,7 @@ can_exec(pptp_t, pppd_etc_rw_t) # Allow pptp to append to pppd log files -@@ -251,9 +257,13 @@ +@@ -251,9 +258,13 @@ kernel_list_proc(pptp_t) kernel_read_kernel_sysctls(pptp_t) kernel_read_proc_symlinks(pptp_t) @@ -23095,7 +23145,7 @@ corenet_all_recvfrom_unlabeled(pptp_t) corenet_all_recvfrom_netlabel(pptp_t) corenet_tcp_sendrecv_all_if(pptp_t) -@@ -269,12 +279,16 @@ +@@ -269,12 +280,16 @@ fs_getattr_all_fs(pptp_t) fs_search_auto_mountpoints(pptp_t) @@ -23112,7 +23162,7 @@ libs_use_ld_so(pptp_t) libs_use_shared_libs(pptp_t) -@@ -282,7 +296,7 @@ +@@ -282,7 +297,7 @@ miscfiles_read_localization(pptp_t) @@ -23121,7 +23171,7 @@ userdom_dontaudit_use_unpriv_user_fds(pptp_t) -@@ -293,11 +307,15 @@ +@@ -293,11 +308,15 @@ ') optional_policy(` @@ -23139,7 +23189,7 @@ ') optional_policy(` -@@ -311,6 +329,3 @@ +@@ -311,6 +330,3 @@ optional_policy(` postfix_read_config(pppd_t) ') @@ -32215,7 +32265,7 @@ allow iscsid_t iscsi_tmp_t:dir manage_dir_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.5.13/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2008-10-17 14:49:13.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/system/libraries.fc 2009-02-19 09:45:25.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/system/libraries.fc 2009-03-05 13:40:41.000000000 +0100 @@ -60,12 +60,15 @@ # # /opt @@ -32361,7 +32411,7 @@ ') dnl end distro_redhat # -@@ -307,6 +333,28 @@ +@@ -307,6 +333,33 @@ /var/lib/samba/bin/.+\.so(\.[^/]*)* -l gen_context(system_u:object_r:lib_t,s0) ') @@ -32390,6 +32440,11 @@ +/opt/google-earth/.*\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + +/opt/(.*/)?oracle/(.*/)?libnnz.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++ ++/opt/Komodo/lib/python/lib/python2.6/lib-dynload/.*\.so(\.[^/]*)* gen_context(system_u:object_r:textrel_shlib_t,s0) ++ ++ ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.5.13/policy/modules/system/libraries.te --- nsaserefpolicy/policy/modules/system/libraries.te 2008-10-17 14:49:13.000000000 +0200 +++ serefpolicy-3.5.13/policy/modules/system/libraries.te 2009-02-10 15:07:15.000000000 +0100 @@ -35403,7 +35458,7 @@ +/root(/.*)? gen_context(system_u:object_r:admin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.13/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2008-10-17 14:49:13.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/system/userdomain.if 2009-02-18 10:13:15.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/system/userdomain.if 2009-03-05 13:30:03.000000000 +0100 @@ -28,10 +28,14 @@ class context contains; ') @@ -36796,7 +36851,7 @@ ') ######################################## -@@ -1993,11 +1994,47 @@ +@@ -1993,11 +1994,72 @@ # template(`userdom_manage_user_home_content_dirs',` gen_require(` @@ -36812,6 +36867,31 @@ + +######################################## +## ++## Create objects in a user home directory ++## with an automatic type transition to ++## the user home file type. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The class of the object to be created. ++## ++## ++# ++interface(`userdom_user_home_dir_filetrans_pattern',` ++ gen_require(` ++ type user_home_dir_t, user_home_t; ++ ') ++ ++ type_transition $1 user_home_dir_t:$2 user_home_t; ++') ++ ++######################################## ++## +## dontaudit attemps to Create files +## in a user home subdirectory. +## @@ -36846,7 +36926,7 @@ ') ######################################## -@@ -2029,10 +2066,10 @@ +@@ -2029,10 +2091,10 @@ # template(`userdom_dontaudit_setattr_user_home_content_files',` gen_require(` @@ -36859,7 +36939,7 @@ ') ######################################## -@@ -2062,11 +2099,11 @@ +@@ -2062,11 +2124,11 @@ # template(`userdom_read_user_home_content_files',` gen_require(` @@ -36873,7 +36953,7 @@ ') ######################################## -@@ -2096,11 +2133,11 @@ +@@ -2096,11 +2158,11 @@ # template(`userdom_dontaudit_read_user_home_content_files',` gen_require(` @@ -36888,7 +36968,7 @@ ') ######################################## -@@ -2130,10 +2167,14 @@ +@@ -2130,10 +2192,14 @@ # template(`userdom_dontaudit_write_user_home_content_files',` gen_require(` @@ -36905,7 +36985,7 @@ ') ######################################## -@@ -2163,11 +2204,11 @@ +@@ -2163,11 +2229,11 @@ # template(`userdom_read_user_home_content_symlinks',` gen_require(` @@ -36919,7 +36999,7 @@ ') ######################################## -@@ -2197,11 +2238,11 @@ +@@ -2197,11 +2263,11 @@ # template(`userdom_exec_user_home_content_files',` gen_require(` @@ -36933,7 +37013,7 @@ ') ######################################## -@@ -2231,10 +2272,37 @@ +@@ -2231,10 +2297,37 @@ # template(`userdom_dontaudit_exec_user_home_content_files',` gen_require(` @@ -36973,7 +37053,7 @@ ') ######################################## -@@ -2266,12 +2334,12 @@ +@@ -2266,12 +2359,12 @@ # template(`userdom_manage_user_home_content_files',` gen_require(` @@ -36989,7 +37069,7 @@ ') ######################################## -@@ -2303,10 +2371,10 @@ +@@ -2303,10 +2396,10 @@ # template(`userdom_dontaudit_manage_user_home_content_dirs',` gen_require(` @@ -37002,7 +37082,7 @@ ') ######################################## -@@ -2338,12 +2406,12 @@ +@@ -2338,12 +2431,12 @@ # template(`userdom_manage_user_home_content_symlinks',` gen_require(` @@ -37018,7 +37098,7 @@ ') ######################################## -@@ -2375,12 +2443,12 @@ +@@ -2375,12 +2468,12 @@ # template(`userdom_manage_user_home_content_pipes',` gen_require(` @@ -37034,7 +37114,7 @@ ') ######################################## -@@ -2412,12 +2480,12 @@ +@@ -2412,12 +2505,12 @@ # template(`userdom_manage_user_home_content_sockets',` gen_require(` @@ -37050,7 +37130,7 @@ ') ######################################## -@@ -2462,11 +2530,11 @@ +@@ -2462,11 +2555,11 @@ # template(`userdom_user_home_dir_filetrans',` gen_require(` @@ -37064,7 +37144,7 @@ ') ######################################## -@@ -2511,11 +2579,11 @@ +@@ -2511,11 +2604,11 @@ # template(`userdom_user_home_content_filetrans',` gen_require(` @@ -37078,7 +37158,7 @@ ') ######################################## -@@ -2555,11 +2623,11 @@ +@@ -2555,11 +2648,11 @@ # template(`userdom_user_home_dir_filetrans_user_home_content',` gen_require(` @@ -37092,7 +37172,7 @@ ') ######################################## -@@ -2589,11 +2657,11 @@ +@@ -2589,11 +2682,11 @@ # template(`userdom_write_user_tmp_sockets',` gen_require(` @@ -37106,7 +37186,7 @@ ') ######################################## -@@ -2623,11 +2691,11 @@ +@@ -2623,11 +2716,11 @@ # template(`userdom_list_user_tmp',` gen_require(` @@ -37120,7 +37200,7 @@ ') ######################################## -@@ -2659,10 +2727,10 @@ +@@ -2659,10 +2752,10 @@ # template(`userdom_dontaudit_list_user_tmp',` gen_require(` @@ -37133,7 +37213,7 @@ ') ######################################## -@@ -2694,10 +2762,10 @@ +@@ -2694,10 +2787,10 @@ # template(`userdom_dontaudit_manage_user_tmp_dirs',` gen_require(` @@ -37146,7 +37226,7 @@ ') ######################################## -@@ -2727,12 +2795,12 @@ +@@ -2727,12 +2820,12 @@ # template(`userdom_read_user_tmp_files',` gen_require(` @@ -37162,7 +37242,7 @@ ') ######################################## -@@ -2764,10 +2832,10 @@ +@@ -2764,10 +2857,10 @@ # template(`userdom_dontaudit_read_user_tmp_files',` gen_require(` @@ -37175,7 +37255,7 @@ ') ######################################## -@@ -2799,10 +2867,10 @@ +@@ -2799,10 +2892,10 @@ # template(`userdom_dontaudit_append_user_tmp_files',` gen_require(` @@ -37188,7 +37268,7 @@ ') ######################################## -@@ -2832,12 +2900,12 @@ +@@ -2832,12 +2925,12 @@ # template(`userdom_rw_user_tmp_files',` gen_require(` @@ -37204,7 +37284,7 @@ ') ######################################## -@@ -2869,10 +2937,10 @@ +@@ -2869,10 +2962,10 @@ # template(`userdom_dontaudit_manage_user_tmp_files',` gen_require(` @@ -37217,7 +37297,7 @@ ') ######################################## -@@ -2904,12 +2972,12 @@ +@@ -2904,12 +2997,12 @@ # template(`userdom_read_user_tmp_symlinks',` gen_require(` @@ -37233,7 +37313,7 @@ ') ######################################## -@@ -2941,11 +3009,11 @@ +@@ -2941,11 +3034,11 @@ # template(`userdom_manage_user_tmp_dirs',` gen_require(` @@ -37247,7 +37327,7 @@ ') ######################################## -@@ -2977,11 +3045,11 @@ +@@ -2977,11 +3070,11 @@ # template(`userdom_manage_user_tmp_files',` gen_require(` @@ -37261,7 +37341,7 @@ ') ######################################## -@@ -3013,11 +3081,11 @@ +@@ -3013,11 +3106,11 @@ # template(`userdom_manage_user_tmp_symlinks',` gen_require(` @@ -37275,7 +37355,7 @@ ') ######################################## -@@ -3049,11 +3117,11 @@ +@@ -3049,11 +3142,11 @@ # template(`userdom_manage_user_tmp_pipes',` gen_require(` @@ -37289,7 +37369,7 @@ ') ######################################## -@@ -3085,11 +3153,11 @@ +@@ -3085,11 +3178,11 @@ # template(`userdom_manage_user_tmp_sockets',` gen_require(` @@ -37303,7 +37383,7 @@ ') ######################################## -@@ -3134,10 +3202,10 @@ +@@ -3134,10 +3227,10 @@ # template(`userdom_user_tmp_filetrans',` gen_require(` @@ -37316,7 +37396,7 @@ files_search_tmp($2) ') -@@ -3178,19 +3246,19 @@ +@@ -3178,19 +3271,19 @@ # template(`userdom_tmp_filetrans_user_tmp',` gen_require(` @@ -37340,7 +37420,7 @@ ##

    ##

    ## This is a templated interface, and should only -@@ -3211,13 +3279,13 @@ +@@ -3211,13 +3304,13 @@ # template(`userdom_rw_user_tmpfs_files',` gen_require(` @@ -37358,7 +37438,7 @@ ') ######################################## -@@ -4616,11 +4684,11 @@ +@@ -4616,11 +4709,11 @@ # interface(`userdom_search_all_users_home_dirs',` gen_require(` @@ -37372,7 +37452,7 @@ ') ######################################## -@@ -4640,6 +4708,14 @@ +@@ -4640,6 +4733,14 @@ files_list_home($1) allow $1 home_dir_type:dir list_dir_perms; @@ -37387,7 +37467,7 @@ ') ######################################## -@@ -4677,6 +4753,8 @@ +@@ -4677,6 +4778,8 @@ ') dontaudit $1 { home_dir_type home_type }:dir search_dir_perms; @@ -37396,7 +37476,7 @@ ') ######################################## -@@ -4721,6 +4799,25 @@ +@@ -4721,6 +4824,25 @@ ######################################## ##

    @@ -37422,7 +37502,7 @@ ## Create, read, write, and delete all files ## in all users home directories. ## -@@ -4946,7 +5043,7 @@ +@@ -4946,7 +5068,7 @@ ######################################## ## @@ -37431,7 +37511,7 @@ ## ## ## -@@ -5318,7 +5415,7 @@ +@@ -5318,7 +5440,7 @@ ######################################## ## @@ -37440,7 +37520,7 @@ ## ## ## -@@ -5326,18 +5423,17 @@ +@@ -5326,18 +5448,17 @@ ## ## # @@ -37463,7 +37543,7 @@ ## ## ## -@@ -5345,17 +5441,17 @@ +@@ -5345,17 +5466,54 @@ ## ## # @@ -37482,49 +37562,25 @@ ## -## Read the process state of all user domains. +## Read and write unprivileged user ttys. - ## - ## - ## -@@ -5363,18 +5459,18 @@ - ## - ## - # --interface(`userdom_read_all_users_state',` ++## ++## ++## ++## Domain allowed access. ++## ++## ++# +interface(`userdom_use_unpriv_users_ttys',` - gen_require(` -- attribute userdomain; -+ attribute user_ttynode; - ') - -- read_files_pattern($1,userdomain,userdomain) -- kernel_search_proc($1) -+ allow $1 user_ttynode:chr_file rw_term_perms; - ') - - ######################################## - ## --## Get the attributes of all user domains. -+## Do not audit attempts to use unprivileged -+## user ttys. - ## - ## - ## -@@ -5382,7 +5478,44 @@ - ## - ## - # --interface(`userdom_getattr_all_users',` -+interface(`userdom_dontaudit_use_unpriv_users_ttys',` + gen_require(` + attribute user_ttynode; + ') + -+ dontaudit $1 user_ttynode:chr_file rw_file_perms; ++ allow $1 user_ttynode:chr_file rw_term_perms; +') + +######################################## +## -+## Read the process state of all user domains. ++## Do not audit attempts to use unprivileged ++## user ttys. +## +## +## @@ -37532,30 +37588,30 @@ +## +## +# -+interface(`userdom_read_all_users_state',` ++interface(`userdom_dontaudit_use_unpriv_users_ttys',` + gen_require(` -+ attribute userdomain; ++ attribute user_ttynode; + ') + -+ ps_process_pattern($1, userdomain) -+ kernel_search_proc($1) ++ dontaudit $1 user_ttynode:chr_file rw_file_perms; +') + +######################################## +## -+## Get the attributes of all user domains. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`userdom_getattr_all_users',` - gen_require(` ++## Read the process state of all user domains. + ## + ## + ## +@@ -5368,7 +5526,7 @@ attribute userdomain; ') -@@ -5447,6 +5580,24 @@ + +- read_files_pattern($1,userdomain,userdomain) ++ ps_process_pattern($1, userdomain) + kernel_search_proc($1) + ') + +@@ -5447,6 +5605,24 @@ ######################################## ## @@ -37580,7 +37636,7 @@ ## Send a SIGCHLD signal to all user domains. ## ## -@@ -5483,6 +5634,42 @@ +@@ -5483,6 +5659,42 @@ ######################################## ## @@ -37623,7 +37679,7 @@ ## Send a dbus message to all user domains. ## ## -@@ -5513,3 +5700,622 @@ +@@ -5513,3 +5725,622 @@ interface(`userdom_unconfined',` refpolicywarn(`$0($*) has been deprecated.') ') From anithra at fedoraproject.org Thu Mar 5 13:45:20 2009 From: anithra at fedoraproject.org (Anithra P Janakiraman) Date: Thu, 5 Mar 2009 13:45:20 +0000 (UTC) Subject: rpms/eclipse-systemtapgui/devel eclipse-systemtapgui.spec, 1.3, 1.4 import.log, 1.2, 1.3 Message-ID: <20090305134520.E694670116@cvs1.fedora.phx.redhat.com> Author: anithra Update of /cvs/pkgs/rpms/eclipse-systemtapgui/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14004/devel Modified Files: eclipse-systemtapgui.spec import.log Log Message: * Thu Mar 05 2009 Anithra P Janakiraman - Bumping release to avoid tag problems Index: eclipse-systemtapgui.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-systemtapgui/devel/eclipse-systemtapgui.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- eclipse-systemtapgui.spec 5 Mar 2009 13:26:32 -0000 1.3 +++ eclipse-systemtapgui.spec 5 Mar 2009 13:44:50 -0000 1.4 @@ -2,7 +2,7 @@ Name: eclipse-systemtapgui Version: 1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Eclipse plugins for SystemTap Group: Development/Tools @@ -45,6 +45,8 @@ %doc com.ibm.systemtapgui.systemtap.feature/epl-v10.html %changelog +* Thu Mar 05 2009 Anithra P Janakiraman 1.0-7 +- Bumping release to get rid of tag problems * Thu Mar 05 2009 Anithra P Janakiraman 1.0-6 - Bug Fix. * Mon Feb 10 2009 Anithra P Janakiraman 1.0-5 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-systemtapgui/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 5 Mar 2009 13:26:32 -0000 1.2 +++ import.log 5 Mar 2009 13:44:50 -0000 1.3 @@ -1,2 +1,3 @@ eclipse-systemtapgui-1_0-5_fc11:HEAD:eclipse-systemtapgui-1.0-5.fc11.src.rpm:1234777853 eclipse-systemtapgui-1_0-6_fc11:HEAD:eclipse-systemtapgui-1.0-6.fc11.src.rpm:1236257037 +eclipse-systemtapgui-1_0-7_fc11:HEAD:eclipse-systemtapgui-1.0-7.fc11.src.rpm:1236258193 From lennart at fedoraproject.org Thu Mar 5 13:50:16 2009 From: lennart at fedoraproject.org (Lennart Poettering) Date: Thu, 5 Mar 2009 13:50:16 +0000 (UTC) Subject: rpms/pavucontrol/devel .cvsignore, 1.9, 1.10 pavucontrol.spec, 1.15, 1.16 sources, 1.9, 1.10 01e4826b653065268e7a4b8d57e528836e167a23.patch, 1.1, NONE Message-ID: <20090305135016.5377E70116@cvs1.fedora.phx.redhat.com> Author: lennart Update of /cvs/pkgs/rpms/pavucontrol/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15066 Modified Files: .cvsignore pavucontrol.spec sources Removed Files: 01e4826b653065268e7a4b8d57e528836e167a23.patch Log Message: Second preview of upcoming 0.9.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pavucontrol/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 9 Sep 2008 13:18:38 -0000 1.9 +++ .cvsignore 5 Mar 2009 13:49:45 -0000 1.10 @@ -1 +1 @@ -pavucontrol-0.9.7.tar.gz +pavucontrol-0.9.7.git20090305.tar.gz Index: pavucontrol.spec =================================================================== RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- pavucontrol.spec 25 Feb 2009 02:37:40 -0000 1.15 +++ pavucontrol.spec 5 Mar 2009 13:49:45 -0000 1.16 @@ -1,22 +1,21 @@ Name: pavucontrol Version: 0.9.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Volume control for PulseAudio Group: Applications/Multimedia License: GPLv2+ URL: http://0pointer.de/lennart/projects/pavucontrol -Source0: http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.tar.gz +Source0: http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.git20090305.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pulseaudio-lib-devel >= 0.9.12 +BuildRequires: pulseaudio-libs-devel >= 0.9.15-3.test4 BuildRequires: gtkmm24-devel libglademm24-devel BuildRequires: libsigc++20-devel lynx BuildRequires: desktop-file-utils BuildRequires: libcanberra-devel BuildRequires: intltool -Requires: pulseaudio-lib >= 0.9.15 -Patch0: 01e4826b653065268e7a4b8d57e528836e167a23.patch +Requires: pulseaudio-libs >= 0.9.15-3.test5 %description PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control @@ -26,7 +25,6 @@ %prep %setup -q -%patch0 -p1 -b .01e4826b653065268e7a4b8d57e528836e167a23 %build %configure @@ -36,6 +34,10 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT/usr/share/doc/pavucontrol/README +rm $RPM_BUILD_ROOT/usr/share/doc/pavucontrol/README.html +rm $RPM_BUILD_ROOT/usr/share/doc/pavucontrol/style.css + desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category="X-Fedora" --vendor="" \ @@ -54,6 +56,9 @@ %{_datadir}/applications/pavucontrol.desktop %changelog +* Thu Mar 5 2009 Lennart Poettering 0.9.7-5 +- Second preview of upcoming 0.9.8 + * Wed Feb 25 2009 Lennart Poettering 0.9.7-4 - Preview of upcoming 0.9.8 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pavucontrol/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 9 Sep 2008 13:18:38 -0000 1.9 +++ sources 5 Mar 2009 13:49:45 -0000 1.10 @@ -1 +1 @@ -ec5ebdc2cf7155719b7be95c3f3b7d4c pavucontrol-0.9.7.tar.gz +cd1f5d470972a0bc45ca1a6595d05557 pavucontrol-0.9.7.git20090305.tar.gz --- 01e4826b653065268e7a4b8d57e528836e167a23.patch DELETED --- From mgrepl at fedoraproject.org Thu Mar 5 13:53:50 2009 From: mgrepl at fedoraproject.org (Miroslav Grepl) Date: Thu, 5 Mar 2009 13:53:50 +0000 (UTC) Subject: rpms/selinux-policy/F-9 policy-20071130.patch,1.257,1.258 Message-ID: <20090305135350.ABE1B70116@cvs1.fedora.phx.redhat.com> Author: mgrepl Update of /cvs/extras/rpms/selinux-policy/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15678 Modified Files: policy-20071130.patch Log Message: - Fix pcscd policy - Allow alsa to read hardware state information policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- policy-20071130.patch 27 Feb 2009 09:12:21 -0000 1.257 +++ policy-20071130.patch 5 Mar 2009 13:53:45 -0000 1.258 @@ -572657,8 +572657,14 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.3.1/policy/modules/admin/alsa.te --- nsaserefpolicy/policy/modules/admin/alsa.te 2008-02-26 14:23:10.000000000 +0100 -+++ serefpolicy-3.3.1/policy/modules/admin/alsa.te 2009-02-12 22:21:57.000000000 +0100 -@@ -48,6 +48,7 @@ ++++ serefpolicy-3.3.1/policy/modules/admin/alsa.te 2009-03-05 13:27:01.000000000 +0100 +@@ -43,11 +43,13 @@ + + dev_read_sound(alsa_t) + dev_write_sound(alsa_t) ++dev_read_sysfs(alsa_t) + + corecmd_exec_bin(alsa_t) files_search_home(alsa_t) files_read_etc_files(alsa_t) @@ -648218,7 +648224,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.3.1/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2008-02-26 14:23:10.000000000 +0100 -+++ serefpolicy-3.3.1/policy/modules/services/cron.te 2009-02-12 22:21:57.000000000 +0100 ++++ serefpolicy-3.3.1/policy/modules/services/cron.te 2009-03-05 13:23:46.000000000 +0100 @@ -12,14 +12,6 @@ ## @@ -648303,11 +648309,12 @@ files_read_etc_files(crond_t) files_read_generic_spool(crond_t) -@@ -142,13 +146,16 @@ +@@ -142,13 +146,17 @@ files_search_default(crond_t) init_rw_utmp(crond_t) -+init_spec_domtrans_script(crond_t) ++#init_spec_domtrans_script(crond_t) ++init_domtrans_script(system_crond_t) auth_use_nsswitch(crond_t) @@ -648320,7 +648327,7 @@ seutil_read_config(crond_t) seutil_read_default_contexts(crond_t) -@@ -161,11 +168,9 @@ +@@ -161,11 +169,9 @@ userdom_list_all_users_home_dirs(crond_t) mta_send_mail(crond_t) @@ -648333,7 +648340,7 @@ optional_policy(` # Debian logcheck has the home dir set to its cache logwatch_search_cache_dir(crond_t) -@@ -180,21 +185,45 @@ +@@ -180,21 +186,45 @@ ') ') @@ -648380,7 +648387,7 @@ ') optional_policy(` -@@ -236,6 +265,9 @@ +@@ -236,6 +266,9 @@ allow system_crond_t cron_var_lib_t:file manage_file_perms; files_var_lib_filetrans(system_crond_t,cron_var_lib_t,file) @@ -648390,7 +648397,7 @@ allow system_crond_t system_cron_spool_t:file read_file_perms; # The entrypoint interface is not used as this is not # a regular entrypoint. Since crontab files are -@@ -267,9 +299,13 @@ +@@ -267,9 +300,13 @@ filetrans_pattern(system_crond_t,crond_tmp_t,system_crond_tmp_t,{ file lnk_file }) files_tmp_filetrans(system_crond_t,system_crond_tmp_t,file) @@ -648405,7 +648412,7 @@ kernel_read_kernel_sysctls(system_crond_t) kernel_read_system_state(system_crond_t) -@@ -323,7 +359,8 @@ +@@ -323,7 +360,8 @@ init_read_utmp(system_crond_t) init_dontaudit_rw_utmp(system_crond_t) # prelink tells init to restart it self, we either need to allow or dontaudit @@ -648415,7 +648422,7 @@ auth_use_nsswitch(system_crond_t) -@@ -333,6 +370,7 @@ +@@ -333,6 +371,7 @@ libs_exec_ld_so(system_crond_t) logging_read_generic_logs(system_crond_t) @@ -648423,7 +648430,7 @@ logging_send_syslog_msg(system_crond_t) miscfiles_read_localization(system_crond_t) -@@ -348,18 +386,6 @@ +@@ -348,18 +387,6 @@ ') ') @@ -648442,7 +648449,7 @@ optional_policy(` # Needed for certwatch apache_exec_modules(system_crond_t) -@@ -383,11 +409,20 @@ +@@ -383,11 +410,20 @@ ') optional_policy(` @@ -648463,7 +648470,7 @@ ') optional_policy(` -@@ -415,8 +450,7 @@ +@@ -415,8 +451,7 @@ ') optional_policy(` @@ -648473,7 +648480,7 @@ ') optional_policy(` -@@ -424,15 +458,12 @@ +@@ -424,15 +459,12 @@ ') optional_policy(` @@ -651642,7 +651649,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.3.1/policy/modules/services/ftp.te --- nsaserefpolicy/policy/modules/services/ftp.te 2008-02-26 14:23:10.000000000 +0100 -+++ serefpolicy-3.3.1/policy/modules/services/ftp.te 2009-02-13 10:49:16.000000000 +0100 ++++ serefpolicy-3.3.1/policy/modules/services/ftp.te 2009-03-05 13:36:02.000000000 +0100 @@ -26,7 +26,7 @@ ## ##

    @@ -651727,7 +651734,7 @@ tunable_policy(`ftp_home_dir',` allow ftpd_t self:capability { dac_override dac_read_search }; -@@ -218,7 +237,13 @@ +@@ -218,8 +237,16 @@ userdom_manage_all_users_home_content_dirs(ftpd_t) userdom_manage_all_users_home_content_files(ftpd_t) userdom_manage_all_users_home_content_symlinks(ftpd_t) @@ -651737,11 +651744,14 @@ + auth_read_all_files_except_shadow(ftpd_t) + auth_read_all_symlinks_except_shadow(ftpd_t) ') -+userdom_generic_user_home_dir_filetrans_generic_user_home_content(ftpd_t, { dir file lnk_file }) ++#Needed for permissive mode, to make sure everything gets labeled correctly ++userdom_user_home_dir_filetrans_pattern(ftpd_t, { dir file lnk_file }) ++ tunable_policy(`ftp_home_dir && use_nfs_home_dirs',` fs_manage_nfs_files(ftpd_t) -@@ -237,6 +262,18 @@ + fs_read_nfs_symlinks(ftpd_t) +@@ -237,6 +264,18 @@ ') optional_policy(` @@ -651760,7 +651770,7 @@ corecmd_exec_shell(ftpd_t) files_read_usr_files(ftpd_t) -@@ -253,7 +290,9 @@ +@@ -253,7 +292,9 @@ ') optional_policy(` @@ -651771,7 +651781,7 @@ ') optional_policy(` -@@ -265,6 +304,14 @@ +@@ -265,6 +306,14 @@ ') optional_policy(` @@ -656513,10 +656523,32 @@ + unconfined_use_terminals(openvpn_t) +') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.fc serefpolicy-3.3.1/policy/modules/services/pcscd.fc +--- nsaserefpolicy/policy/modules/services/pcscd.fc 2008-02-26 14:23:10.000000000 +0100 ++++ serefpolicy-3.3.1/policy/modules/services/pcscd.fc 2009-03-05 13:07:09.000000000 +0100 +@@ -1,5 +1,6 @@ + /var/run/pcscd\.comm -s gen_context(system_u:object_r:pcscd_var_run_t,s0) + /var/run/pcscd\.pid -- gen_context(system_u:object_r:pcscd_var_run_t,s0) + /var/run/pcscd\.pub -- gen_context(system_u:object_r:pcscd_var_run_t,s0) ++/var/run/pcscd\.events(/.*)? gen_context(system_u:object_r:pcscd_var_run_t,s0) + + /usr/sbin/pcscd -- gen_context(system_u:object_r:pcscd_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-3.3.1/policy/modules/services/pcscd.te --- nsaserefpolicy/policy/modules/services/pcscd.te 2008-02-26 14:23:10.000000000 +0100 -+++ serefpolicy-3.3.1/policy/modules/services/pcscd.te 2009-02-12 22:21:57.000000000 +0100 -@@ -45,6 +45,7 @@ ++++ serefpolicy-3.3.1/policy/modules/services/pcscd.te 2009-03-05 13:06:58.000000000 +0100 +@@ -27,9 +27,10 @@ + allow pcscd_t self:unix_dgram_socket create_socket_perms; + allow pcscd_t self:tcp_socket create_stream_socket_perms; + ++manage_dirs_pattern(pcscd_t, pcscd_var_run_t, pcscd_var_run_t) + manage_files_pattern(pcscd_t,pcscd_var_run_t,pcscd_var_run_t) + manage_sock_files_pattern(pcscd_t,pcscd_var_run_t,pcscd_var_run_t) +-files_pid_filetrans(pcscd_t,pcscd_var_run_t, { file sock_file }) ++files_pid_filetrans(pcscd_t,pcscd_var_run_t, { file dir sock_file }) + + corenet_all_recvfrom_unlabeled(pcscd_t) + corenet_all_recvfrom_netlabel(pcscd_t) +@@ -45,6 +46,7 @@ files_read_etc_files(pcscd_t) files_read_etc_runtime_files(pcscd_t) @@ -658016,7 +658048,7 @@ /var/spool/postfix/pid/.* gen_context(system_u:object_r:postfix_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.3.1/policy/modules/services/postfix.if --- nsaserefpolicy/policy/modules/services/postfix.if 2008-02-26 14:23:10.000000000 +0100 -+++ serefpolicy-3.3.1/policy/modules/services/postfix.if 2009-02-12 22:21:57.000000000 +0100 ++++ serefpolicy-3.3.1/policy/modules/services/postfix.if 2009-03-05 13:43:11.000000000 +0100 @@ -46,6 +46,7 @@ allow postfix_$1_t postfix_etc_t:dir list_dir_perms; @@ -658025,7 +658057,15 @@ can_exec(postfix_$1_t, postfix_$1_exec_t) -@@ -206,9 +207,8 @@ +@@ -78,6 +79,7 @@ + files_read_etc_runtime_files(postfix_$1_t) + files_read_usr_symlinks(postfix_$1_t) + files_search_spool(postfix_$1_t) ++ files_search_all_mountpoints(postfix_$1_t) + files_getattr_tmp_dirs(postfix_$1_t) + + init_dontaudit_use_fds(postfix_$1_t) +@@ -206,9 +208,8 @@ type postfix_etc_t; ') @@ -658037,7 +658077,7 @@ files_search_etc($1) ') -@@ -416,7 +416,7 @@ +@@ -416,7 +417,7 @@ ##

    ## # @@ -658046,7 +658086,7 @@ gen_require(` type postfix_private_t; ') -@@ -427,6 +427,26 @@ +@@ -427,6 +428,26 @@ ######################################## ## @@ -658073,7 +658113,7 @@ ## Execute the master postfix program in the ## postfix_master domain. ## -@@ -482,6 +502,24 @@ +@@ -482,6 +503,24 @@ files_search_spool($1) ') @@ -658098,7 +658138,7 @@ ######################################## ## ## Read postfix mail spool files. -@@ -503,6 +541,44 @@ +@@ -503,6 +542,44 @@ ######################################## ## @@ -658143,7 +658183,7 @@ ## Execute postfix user mail programs ## in their respective domains. ## -@@ -519,3 +595,22 @@ +@@ -519,3 +596,22 @@ typeattribute $1 postfix_user_domtrans; ') @@ -659587,7 +659627,7 @@ -') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.3.1/policy/modules/services/ppp.te --- nsaserefpolicy/policy/modules/services/ppp.te 2008-02-26 14:23:10.000000000 +0100 -+++ serefpolicy-3.3.1/policy/modules/services/ppp.te 2009-02-12 22:21:57.000000000 +0100 ++++ serefpolicy-3.3.1/policy/modules/services/ppp.te 2009-03-05 13:10:40.000000000 +0100 @@ -71,7 +71,7 @@ # PPPD Local policy # @@ -659606,7 +659646,15 @@ kernel_read_network_state(pppd_t) kernel_load_module(pppd_t) -@@ -176,10 +176,9 @@ +@@ -161,6 +161,7 @@ + + init_read_utmp(pppd_t) + init_dontaudit_write_utmp(pppd_t) ++init_signal_script(pppd_t) + + auth_use_nsswitch(pppd_t) + +@@ -176,10 +177,9 @@ sysnet_etc_filetrans_config(pppd_t) userdom_dontaudit_use_unpriv_user_fds(pppd_t) @@ -659618,7 +659666,7 @@ userdom_search_unpriv_users_home_dirs(pppd_t) ppp_exec(pppd_t) -@@ -196,6 +195,12 @@ +@@ -196,6 +196,12 @@ optional_policy(` mta_send_mail(pppd_t) @@ -659631,7 +659679,7 @@ ') optional_policy(` -@@ -215,14 +220,16 @@ +@@ -215,14 +221,16 @@ # PPTP Local policy # @@ -659651,7 +659699,7 @@ allow pptp_t pppd_etc_t:dir { getattr read search }; allow pptp_t pppd_etc_t:file { read getattr }; -@@ -246,9 +253,13 @@ +@@ -246,9 +254,13 @@ kernel_list_proc(pptp_t) kernel_read_kernel_sysctls(pptp_t) kernel_read_proc_symlinks(pptp_t) @@ -659665,7 +659713,7 @@ corenet_all_recvfrom_unlabeled(pptp_t) corenet_all_recvfrom_netlabel(pptp_t) corenet_tcp_sendrecv_all_if(pptp_t) -@@ -264,12 +275,16 @@ +@@ -264,12 +276,16 @@ fs_getattr_all_fs(pptp_t) fs_search_auto_mountpoints(pptp_t) @@ -659682,7 +659730,7 @@ libs_use_ld_so(pptp_t) libs_use_shared_libs(pptp_t) -@@ -278,6 +293,7 @@ +@@ -278,6 +294,7 @@ miscfiles_read_localization(pptp_t) sysnet_read_config(pptp_t) @@ -659690,7 +659738,7 @@ userdom_dontaudit_use_unpriv_user_fds(pptp_t) userdom_dontaudit_search_sysadm_home_dirs(pptp_t) -@@ -287,6 +303,14 @@ +@@ -287,6 +304,14 @@ ') optional_policy(` @@ -669882,7 +669930,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.3.1/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2008-02-26 14:23:09.000000000 +0100 -+++ serefpolicy-3.3.1/policy/modules/system/libraries.fc 2009-02-19 13:58:47.000000000 +0100 ++++ serefpolicy-3.3.1/policy/modules/system/libraries.fc 2009-03-05 13:40:29.000000000 +0100 @@ -69,8 +69,10 @@ ifdef(`distro_gentoo',` # despite the extensions, they are actually libs @@ -669998,7 +670046,7 @@ /var/ftp/lib(64)?(/.*)? gen_context(system_u:object_r:lib_t,s0) /var/ftp/lib(64)?/ld[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:ld_so_t,s0) -@@ -301,6 +318,23 @@ +@@ -301,6 +318,28 @@ /var/lib/samba/bin/.+\.so(\.[^/]*)* -l gen_context(system_u:object_r:lib_t,s0) ') @@ -670022,6 +670070,11 @@ +/usr/lib/sse2/libav.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib(64)?/sse2/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) + ++/opt/google-earth/.*\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++ ++/opt/Komodo/lib/python/lib/python2.6/lib-dynload/.*\.so(\.[^/]*)* gen_context(system_u:object_r:textrel_shlib_t,s0) ++ ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.3.1/policy/modules/system/libraries.te --- nsaserefpolicy/policy/modules/system/libraries.te 2008-02-26 14:23:09.000000000 +0100 +++ serefpolicy-3.3.1/policy/modules/system/libraries.te 2009-02-12 22:21:57.000000000 +0100 @@ -674071,7 +674124,7 @@ +/root(/.*)? gen_context(system_u:object_r:admin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.3.1/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2008-02-26 14:23:09.000000000 +0100 -+++ serefpolicy-3.3.1/policy/modules/system/userdomain.if 2009-02-19 11:21:16.000000000 +0100 ++++ serefpolicy-3.3.1/policy/modules/system/userdomain.if 2009-03-05 13:35:19.000000000 +0100 @@ -29,9 +29,14 @@ ') @@ -675399,7 +675452,7 @@ ') ######################################## -@@ -2038,11 +2097,67 @@ +@@ -2038,11 +2097,92 @@ # template(`userdom_manage_user_home_content_dirs',` gen_require(` @@ -675414,6 +675467,31 @@ + +') + ++####################################### ++## ++## Create objects in a user home directory ++## with an automatic type transition to ++## the user home file type. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The class of the object to be created. ++## ++## ++# ++interface(`userdom_user_home_dir_filetrans_pattern',` ++ gen_require(` ++ type user_home_dir_t, user_home_t; ++ ') ++ ++ type_transition $1 user_home_dir_t:$2 user_home_t; ++') ++ +######################################## +## +## dontaudit attemps to Create files @@ -675469,7 +675547,7 @@ ') ######################################## -@@ -2074,10 +2189,10 @@ +@@ -2074,10 +2214,10 @@ # template(`userdom_dontaudit_setattr_user_home_content_files',` gen_require(` @@ -675482,7 +675560,7 @@ ') ######################################## -@@ -2107,11 +2222,11 @@ +@@ -2107,11 +2247,11 @@ # template(`userdom_read_user_home_content_files',` gen_require(` @@ -675496,7 +675574,7 @@ ') ######################################## -@@ -2141,11 +2256,11 @@ +@@ -2141,11 +2281,11 @@ # template(`userdom_dontaudit_read_user_home_content_files',` gen_require(` @@ -675511,7 +675589,7 @@ ') ######################################## -@@ -2175,10 +2290,14 @@ +@@ -2175,10 +2315,14 @@ # template(`userdom_dontaudit_write_user_home_content_files',` gen_require(` @@ -675528,7 +675606,7 @@ ') ######################################## -@@ -2208,11 +2327,11 @@ +@@ -2208,11 +2352,11 @@ # template(`userdom_read_user_home_content_symlinks',` gen_require(` @@ -675542,7 +675620,7 @@ ') ######################################## -@@ -2242,11 +2361,11 @@ +@@ -2242,11 +2386,11 @@ # template(`userdom_exec_user_home_content_files',` gen_require(` @@ -675556,7 +675634,7 @@ ') ######################################## -@@ -2276,10 +2395,37 @@ +@@ -2276,10 +2420,37 @@ # template(`userdom_dontaudit_exec_user_home_content_files',` gen_require(` @@ -675596,7 +675674,7 @@ ') ######################################## -@@ -2311,12 +2457,12 @@ +@@ -2311,12 +2482,12 @@ # template(`userdom_manage_user_home_content_files',` gen_require(` @@ -675612,7 +675690,7 @@ ') ######################################## -@@ -2348,10 +2494,10 @@ +@@ -2348,10 +2519,10 @@ # template(`userdom_dontaudit_manage_user_home_content_dirs',` gen_require(` @@ -675625,7 +675703,7 @@ ') ######################################## -@@ -2383,12 +2529,12 @@ +@@ -2383,12 +2554,12 @@ # template(`userdom_manage_user_home_content_symlinks',` gen_require(` @@ -675641,7 +675719,7 @@ ') ######################################## -@@ -2420,12 +2566,12 @@ +@@ -2420,12 +2591,12 @@ # template(`userdom_manage_user_home_content_pipes',` gen_require(` @@ -675657,7 +675735,7 @@ ') ######################################## -@@ -2457,12 +2603,12 @@ +@@ -2457,12 +2628,12 @@ # template(`userdom_manage_user_home_content_sockets',` gen_require(` @@ -675673,7 +675751,7 @@ ') ######################################## -@@ -2507,11 +2653,11 @@ +@@ -2507,11 +2678,11 @@ # template(`userdom_user_home_dir_filetrans',` gen_require(` @@ -675687,7 +675765,7 @@ ') ######################################## -@@ -2556,11 +2702,11 @@ +@@ -2556,11 +2727,11 @@ # template(`userdom_user_home_content_filetrans',` gen_require(` @@ -675701,7 +675779,7 @@ ') ######################################## -@@ -2600,11 +2746,11 @@ +@@ -2600,11 +2771,11 @@ # template(`userdom_user_home_dir_filetrans_user_home_content',` gen_require(` @@ -675715,7 +675793,7 @@ ') ######################################## -@@ -2634,11 +2780,11 @@ +@@ -2634,11 +2805,11 @@ # template(`userdom_write_user_tmp_sockets',` gen_require(` @@ -675729,7 +675807,7 @@ ') ######################################## -@@ -2668,11 +2814,11 @@ +@@ -2668,11 +2839,11 @@ # template(`userdom_list_user_tmp',` gen_require(` @@ -675743,7 +675821,7 @@ ') ######################################## -@@ -2704,10 +2850,10 @@ +@@ -2704,10 +2875,10 @@ # template(`userdom_dontaudit_list_user_tmp',` gen_require(` @@ -675756,7 +675834,7 @@ ') ######################################## -@@ -2739,10 +2885,10 @@ +@@ -2739,10 +2910,10 @@ # template(`userdom_dontaudit_manage_user_tmp_dirs',` gen_require(` @@ -675769,7 +675847,7 @@ ') ######################################## -@@ -2772,12 +2918,12 @@ +@@ -2772,12 +2943,12 @@ # template(`userdom_read_user_tmp_files',` gen_require(` @@ -675785,55 +675863,25 @@ ') ######################################## -@@ -2809,20 +2955,20 @@ +@@ -2809,10 +2980,45 @@ # template(`userdom_dontaudit_read_user_tmp_files',` gen_require(` - type $1_tmp_t; + type user_tmp_t; - ') - -- dontaudit $2 $1_tmp_t:file read_file_perms; ++ ') ++ + dontaudit $2 user_tmp_t:file read_file_perms; - ') - - ######################################## - ## --## Do not audit attempts to append users -+## Do not audit attempts to write users - ## temporary files. - ## - ## - ##

    --## Do not audit attempts to append users ++') ++ ++######################################## ++##

    +## Do not audit attempts to write users - ## temporary files. - ##

    - ##

    -@@ -2842,17 +2988,90 @@ - ##

    - ## - # --template(`userdom_dontaudit_append_user_tmp_files',` -+template(`userdom_dontaudit_write_user_tmp_files',` - gen_require(` -- type $1_tmp_t; -+ type user_tmp_t; - ') - -- dontaudit $2 $1_tmp_t:file append; -+ dontaudit $2 user_tmp_t:file write; - ') - - ######################################## - ## --## Read and write user temporary files. -+## Do not audit attempts to append users +## temporary files. +## +## +##

    -+## Do not audit attempts to append users ++## Do not audit attempts to write users +## temporary files. +##

    +##

    @@ -675853,9 +675901,22 @@ +##

    +## +# -+template(`userdom_dontaudit_append_user_tmp_files',` ++template(`userdom_dontaudit_write_user_tmp_files',` + gen_require(` + type user_tmp_t; + ') + +- dontaudit $2 $1_tmp_t:file read_file_perms; ++ dontaudit $2 user_tmp_t:file write; + ') + + ######################################## +@@ -2844,10 +3050,48 @@ + # + template(`userdom_dontaudit_append_user_tmp_files',` + gen_require(` +- type $1_tmp_t; ++ type user_tmp_t; + ') + + dontaudit $2 user_tmp_t:file append; @@ -675894,18 +675955,14 @@ + gen_require(` + attribute user_tmpfile; + attribute userdomain; -+ ') -+ + ') + +- dontaudit $2 $1_tmp_t:file append; + stream_connect_pattern($1, user_tmpfile, user_tmpfile, userdomain) -+') -+ -+######################################## -+## -+## Read and write user temporary files. - ## - ## - ##

    -@@ -2877,12 +3096,12 @@ + ') + + ######################################## +@@ -2877,12 +3121,12 @@ # template(`userdom_rw_user_tmp_files',` gen_require(` @@ -675921,7 +675978,7 @@ ') ######################################## -@@ -2914,10 +3133,10 @@ +@@ -2914,10 +3158,10 @@ # template(`userdom_dontaudit_manage_user_tmp_files',` gen_require(` @@ -675934,7 +675991,7 @@ ') ######################################## -@@ -2949,12 +3168,12 @@ +@@ -2949,12 +3193,12 @@ # template(`userdom_read_user_tmp_symlinks',` gen_require(` @@ -675950,7 +676007,7 @@ ') ######################################## -@@ -2986,11 +3205,11 @@ +@@ -2986,11 +3230,11 @@ # template(`userdom_manage_user_tmp_dirs',` gen_require(` @@ -675964,7 +676021,7 @@ ') ######################################## -@@ -3022,11 +3241,11 @@ +@@ -3022,11 +3266,11 @@ # template(`userdom_manage_user_tmp_files',` gen_require(` @@ -675978,7 +676035,7 @@ ') ######################################## -@@ -3058,11 +3277,11 @@ +@@ -3058,11 +3302,11 @@ # template(`userdom_manage_user_tmp_symlinks',` gen_require(` @@ -675992,7 +676049,7 @@ ') ######################################## -@@ -3094,11 +3313,11 @@ +@@ -3094,11 +3338,11 @@ # template(`userdom_manage_user_tmp_pipes',` gen_require(` @@ -676006,7 +676063,7 @@ ') ######################################## -@@ -3130,11 +3349,11 @@ +@@ -3130,11 +3374,11 @@ # template(`userdom_manage_user_tmp_sockets',` gen_require(` @@ -676020,7 +676077,7 @@ ') ######################################## -@@ -3179,10 +3398,10 @@ +@@ -3179,10 +3423,10 @@ # template(`userdom_user_tmp_filetrans',` gen_require(` @@ -676033,7 +676090,7 @@ files_search_tmp($2) ') -@@ -3223,10 +3442,10 @@ +@@ -3223,10 +3467,10 @@ # template(`userdom_tmp_filetrans_user_tmp',` gen_require(` @@ -676046,7 +676103,7 @@ ') ######################################## -@@ -3254,6 +3473,63 @@ +@@ -3254,6 +3498,63 @@ ##

    ## # @@ -676110,7 +676167,7 @@ template(`userdom_rw_user_tmpfs_files',` gen_require(` type $1_tmpfs_t; -@@ -3267,6 +3543,42 @@ +@@ -3267,6 +3568,42 @@ ######################################## ## @@ -676153,7 +676210,7 @@ ## List users untrusted directories. ## ## -@@ -3962,6 +4274,24 @@ +@@ -3962,6 +4299,24 @@ ######################################## ## @@ -676178,7 +676235,7 @@ ## Manage unpriviledged user SysV shared ## memory segments. ## -@@ -4231,11 +4561,11 @@ +@@ -4231,11 +4586,11 @@ # interface(`userdom_search_staff_home_dirs',` gen_require(` @@ -676192,7 +676249,7 @@ ') ######################################## -@@ -4251,10 +4581,10 @@ +@@ -4251,10 +4606,10 @@ # interface(`userdom_dontaudit_search_staff_home_dirs',` gen_require(` @@ -676205,7 +676262,7 @@ ') ######################################## -@@ -4270,11 +4600,11 @@ +@@ -4270,11 +4625,11 @@ # interface(`userdom_manage_staff_home_dirs',` gen_require(` @@ -676219,7 +676276,7 @@ ') ######################################## -@@ -4289,16 +4619,16 @@ +@@ -4289,16 +4644,16 @@ # interface(`userdom_relabelto_staff_home_dirs',` gen_require(` @@ -676239,7 +676296,7 @@ ## users home directory. ## ## -@@ -4307,12 +4637,54 @@ +@@ -4307,12 +4662,54 @@ ## ## # @@ -676297,7 +676354,7 @@ ') ######################################## -@@ -4327,13 +4699,13 @@ +@@ -4327,13 +4724,13 @@ # interface(`userdom_read_staff_home_content_files',` gen_require(` @@ -676315,7 +676372,7 @@ ') ######################################## -@@ -4531,10 +4903,10 @@ +@@ -4531,10 +4928,10 @@ # interface(`userdom_getattr_sysadm_home_dirs',` gen_require(` @@ -676328,7 +676385,7 @@ ') ######################################## -@@ -4551,10 +4923,10 @@ +@@ -4551,10 +4948,10 @@ # interface(`userdom_dontaudit_getattr_sysadm_home_dirs',` gen_require(` @@ -676341,7 +676398,7 @@ ') ######################################## -@@ -4569,10 +4941,10 @@ +@@ -4569,10 +4966,10 @@ # interface(`userdom_search_sysadm_home_dirs',` gen_require(` @@ -676354,7 +676411,7 @@ ') ######################################## -@@ -4588,10 +4960,10 @@ +@@ -4588,10 +4985,10 @@ # interface(`userdom_dontaudit_search_sysadm_home_dirs',` gen_require(` @@ -676367,7 +676424,7 @@ ') ######################################## -@@ -4606,10 +4978,10 @@ +@@ -4606,10 +5003,10 @@ # interface(`userdom_list_sysadm_home_dirs',` gen_require(` @@ -676380,7 +676437,7 @@ ') ######################################## -@@ -4625,10 +4997,10 @@ +@@ -4625,10 +5022,10 @@ # interface(`userdom_dontaudit_list_sysadm_home_dirs',` gen_require(` @@ -676393,7 +676450,7 @@ ') ######################################## -@@ -4644,14 +5016,53 @@ +@@ -4644,14 +5041,53 @@ # interface(`userdom_dontaudit_read_sysadm_home_content_files',` gen_require(` @@ -676451,7 +676508,7 @@ ######################################## ## ## Create objects in sysadm home directories -@@ -4676,10 +5087,10 @@ +@@ -4676,10 +5112,10 @@ # interface(`userdom_sysadm_home_dir_filetrans',` gen_require(` @@ -676464,7 +676521,7 @@ ') ######################################## -@@ -4694,10 +5105,10 @@ +@@ -4694,10 +5130,10 @@ # interface(`userdom_search_sysadm_home_content_dirs',` gen_require(` @@ -676477,7 +676534,7 @@ ') ######################################## -@@ -4712,13 +5123,13 @@ +@@ -4712,13 +5148,13 @@ # interface(`userdom_read_sysadm_home_content_files',` gen_require(` @@ -676495,7 +676552,7 @@ ') ######################################## -@@ -4754,16 +5165,16 @@ +@@ -4754,16 +5190,16 @@ # interface(`userdom_search_all_users_home_dirs',` gen_require(` @@ -676515,7 +676572,7 @@ ## ## ## -@@ -4771,18 +5182,18 @@ +@@ -4771,18 +5207,18 @@ ## ## # @@ -676537,7 +676594,7 @@ ## ## ## -@@ -4790,36 +5201,45 @@ +@@ -4790,31 +5226,79 @@ ## ## # @@ -676583,20 +676640,18 @@ + tunable_policy(`use_samba_home_dirs',` + fs_list_cifs($1) + ') - ') - - ######################################## - ## --## Read all files in all users home directories. ++') ++ ++######################################## ++## +## Search all users home directories. - ## - ## - ## -@@ -4827,7 +5247,46 @@ - ## - ## - # --interface(`userdom_read_all_users_home_content_files',` ++## ++## ++## ++## Domain allowed access. ++## ++## ++# +interface(`userdom_search_all_users_home_content',` + gen_require(` + attribute home_dir_type, home_type; @@ -676624,23 +676679,10 @@ + dontaudit $1 { home_dir_type home_type }:dir search_dir_perms; + fs_dontaudit_list_nfs($1) + fs_dontaudit_list_cifs($1) -+') -+ -+######################################## -+## -+## Read all files in all users home directories. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`userdom_read_all_users_home_content_files',` - gen_require(` - attribute home_type; - ') -@@ -4839,6 +5298,26 @@ + ') + + ######################################## +@@ -4839,6 +5323,26 @@ ######################################## ## @@ -676667,7 +676709,7 @@ ## Create, read, write, and delete all directories ## in all users home directories. ## -@@ -4859,6 +5338,25 @@ +@@ -4859,6 +5363,25 @@ ######################################## ## @@ -676693,7 +676735,7 @@ ## Create, read, write, and delete all files ## in all users home directories. ## -@@ -4879,6 +5377,26 @@ +@@ -4879,6 +5402,26 @@ ######################################## ## @@ -676720,7 +676762,7 @@ ## Create, read, write, and delete all symlinks ## in all users home directories. ## -@@ -5115,7 +5633,7 @@ +@@ -5115,7 +5658,7 @@ # interface(`userdom_relabelto_generic_user_home_dirs',` gen_require(` @@ -676729,7 +676771,7 @@ ') files_search_home($1) -@@ -5304,6 +5822,63 @@ +@@ -5304,6 +5847,63 @@ ######################################## ## @@ -676793,7 +676835,7 @@ ## Create, read, write, and delete directories in ## unprivileged users home directories. ## -@@ -5509,6 +6084,43 @@ +@@ -5509,6 +6109,43 @@ ######################################## ## @@ -676837,7 +676879,7 @@ ## Read and write unprivileged user ttys. ## ## -@@ -5559,7 +6171,7 @@ +@@ -5559,7 +6196,7 @@ attribute userdomain; ') @@ -676846,7 +676888,7 @@ kernel_search_proc($1) ') -@@ -5674,6 +6286,42 @@ +@@ -5674,6 +6311,42 @@ ######################################## ## @@ -676889,7 +676931,7 @@ ## Send a dbus message to all user domains. ## ## -@@ -5704,3 +6352,408 @@ +@@ -5704,3 +6377,408 @@ interface(`userdom_unconfined',` refpolicywarn(`$0($*) has been deprecated.') ') From caolanm at fedoraproject.org Thu Mar 5 14:00:03 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 14:00:03 +0000 (UTC) Subject: rpms/quickfix/devel quickfix-cstring.patch, 1.1, 1.2 quickfix.spec, 1.2, 1.3 Message-ID: <20090305140003.B617970116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/quickfix/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16792 Modified Files: quickfix-cstring.patch quickfix.spec Log Message: include cstdio for std::sprintf, etc quickfix-cstring.patch: Index: quickfix-cstring.patch =================================================================== RCS file: /cvs/pkgs/rpms/quickfix/devel/quickfix-cstring.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- quickfix-cstring.patch 16 Nov 2008 22:21:11 -0000 1.1 +++ quickfix-cstring.patch 5 Mar 2009 13:59:33 -0000 1.2 @@ -1,11 +1,23 @@ diff -ru quickfix.orig/src/C++/Utility.h quickfix/src/C++/Utility.h --- quickfix.orig/src/C++/Utility.h 2006-09-13 19:23:18.000000000 -0400 +++ quickfix/src/C++/Utility.h 2008-10-29 07:35:37.000000000 -0400 -@@ -87,6 +87,7 @@ +@@ -87,6 +87,8 @@ #include #include #include +#include ++#include namespace FIX { +diff -ru quickfix.orig/src/C++/ConfigLexer.cpp quickfix/src/C++/ConfigLexer.cpp +--- quickfix.orig/src/C++/ConfigLexer.cpp 2009-03-05 13:36:28.000000000 +0000 ++++ quickfix/src/C++/ConfigLexer.cpp 2009-03-05 13:47:36.000000000 +0000 +@@ -21,6 +21,7 @@ + #ifdef __cplusplus + + #include ++#include + #ifndef _MSC_VER + #include + #endif Index: quickfix.spec =================================================================== RCS file: /cvs/pkgs/rpms/quickfix/devel/quickfix.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- quickfix.spec 25 Feb 2009 18:26:23 -0000 1.2 +++ quickfix.spec 5 Mar 2009 13:59:33 -0000 1.3 @@ -1,6 +1,6 @@ Name: quickfix Version: 1.12.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: QuickFIX is a full-featured open source FIX engine Group: Development/Libraries @@ -66,6 +66,9 @@ %{_libdir}/pkgconfig/quickfix.pc %changelog +* Thu Mar 05 2009 Caol??n McNamara - 1.12.4-8 +- include cstdio for std::sprintf, etc. + * Wed Feb 25 2009 Fedora Release Engineering - 1.12.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From anithra at fedoraproject.org Thu Mar 5 14:05:09 2009 From: anithra at fedoraproject.org (Anithra P Janakiraman) Date: Thu, 5 Mar 2009 14:05:09 +0000 (UTC) Subject: rpms/eclipse-systemtapgui/F-10 eclipse-systemtapgui.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090305140509.E893C70116@cvs1.fedora.phx.redhat.com> Author: anithra Update of /cvs/pkgs/rpms/eclipse-systemtapgui/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17461/F-10 Modified Files: eclipse-systemtapgui.spec import.log sources Log Message: * Thu Mar 05 2009 Anithra P Janakiraman - Bumping release to get rid of tag problems Index: eclipse-systemtapgui.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-systemtapgui/F-10/eclipse-systemtapgui.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eclipse-systemtapgui.spec 16 Feb 2009 11:09:43 -0000 1.1 +++ eclipse-systemtapgui.spec 5 Mar 2009 14:04:39 -0000 1.2 @@ -2,7 +2,7 @@ Name: eclipse-systemtapgui Version: 1.0 -Release: 5%{?dist} +Release: 7%{?dist} Summary: Eclipse plugins for SystemTap Group: Development/Tools @@ -45,6 +45,10 @@ %doc com.ibm.systemtapgui.systemtap.feature/epl-v10.html %changelog +* Thu Mar 05 2009 Anithra P Janakiraman 1.0-7 +- Bumping release to get rid of tag problems +* Thu Mar 05 2009 Anithra P Janakiraman 1.0-6 +- Bug Fix. * Mon Feb 10 2009 Anithra P Janakiraman 1.0-5 - Modified spec file. * Fri Feb 06 2009 Anithra P Janakiraman 1.0-4 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-systemtapgui/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 Feb 2009 11:09:43 -0000 1.1 +++ import.log 5 Mar 2009 14:04:39 -0000 1.2 @@ -1 +1,2 @@ eclipse-systemtapgui-1_0-5_fc11:F-10:eclipse-systemtapgui-1.0-5.fc11.src.rpm:1234781205 +eclipse-systemtapgui-1_0-7_fc11:F-10:eclipse-systemtapgui-1.0-7.fc11.src.rpm:1236259284 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-systemtapgui/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Feb 2009 11:09:43 -0000 1.2 +++ sources 5 Mar 2009 14:04:39 -0000 1.3 @@ -1 +1 @@ -25dd9eda7eeb55c4387d789d68c0e3d1 com.ibm.systemtapgui.src.tar.gz +b5a89fdd268f7345e2a16d1fe6ba230d com.ibm.systemtapgui.src.tar.gz From twoerner at fedoraproject.org Thu Mar 5 14:07:07 2009 From: twoerner at fedoraproject.org (Thomas Woerner) Date: Thu, 5 Mar 2009 14:07:07 +0000 (UTC) Subject: rpms/iptables/devel iptables.spec,1.74,1.75 Message-ID: <20090305140707.BD84A70116@cvs1.fedora.phx.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/iptables/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18323 Modified Files: iptables.spec Log Message: - still more review fixes (rhbz#225906) - consistent macro usage - use sed instead of perl for rpath removal - use standard RPM CFLAGS, but also -fno-strict-aliasing (needed for libiptc*) Index: iptables.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- iptables.spec 25 Feb 2009 07:47:47 -0000 1.74 +++ iptables.spec 5 Mar 2009 14:06:37 -0000 1.75 @@ -1,7 +1,7 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities Version: 1.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2 Source1: iptables.init Source2: iptables-config @@ -56,11 +56,12 @@ %patch5 -p1 -b .cloexec %build +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ ./configure --enable-devel --enable-libipq --bindir=/bin --sbindir=/sbin --sysconfdir=/etc --libdir=/%{_libdir} --libexecdir=/%{_lib} --mandir=%{_mandir} --includedir=%{_includedir} --with-kernel=/usr --with-kbuild=/usr --with-ksource=/usr # do not use rpath -perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$li -bdir\"|g;' libtool +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make @@ -84,17 +85,17 @@ install -m 644 include/libipulog/*.h %{buildroot}%{_includedir}/libipulog/ # install init scripts and configuration files -install -d -m 755 $RPM_BUILD_ROOT/etc/rc.d/init.d -install -c -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iptables +install -d -m 755 %{buildroot}/etc/rc.d/init.d +install -c -m 755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/iptables sed -e 's;iptables;ip6tables;g' -e 's;IPTABLES;IP6TABLES;g' < %{SOURCE1} > ip6tables.init -install -c -m 755 ip6tables.init $RPM_BUILD_ROOT/etc/rc.d/init.d/ip6tables -install -d -m 755 $RPM_BUILD_ROOT/etc/sysconfig -install -c -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/iptables-config +install -c -m 755 ip6tables.init %{buildroot}/etc/rc.d/init.d/ip6tables +install -d -m 755 %{buildroot}/etc/sysconfig +install -c -m 755 %{SOURCE2} %{buildroot}/etc/sysconfig/iptables-config sed -e 's;iptables;ip6tables;g' -e 's;IPTABLES;IP6TABLES;g' < %{SOURCE2} > ip6tables-config -install -c -m 755 ip6tables-config $RPM_BUILD_ROOT/etc/sysconfig/ip6tables-config +install -c -m 755 ip6tables-config %{buildroot}/etc/sysconfig/ip6tables-config %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post /sbin/ldconfig @@ -150,6 +151,12 @@ %{_libdir}/pkgconfig/xtables.pc %changelog +* Thu Mar 5 2009 Thomas Woerner 1.4.2-3 +- still more review fixes (rhbz#225906) + - consistent macro usage + - use sed instead of perl for rpath removal + - use standard RPM CFLAGS, but also -fno-strict-aliasing (needed for libiptc*) + * Wed Feb 25 2009 Fedora Release Engineering - 1.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Thu Mar 5 14:12:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 14:12:02 +0000 Subject: [pkgdb] gnome-bluetooth ownership updated Message-ID: <20090305141223.F3499208201@bastion.fedora.phx.redhat.com> Package gnome-bluetooth in Fedora devel is now owned by hadess To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From pkgdb at fedoraproject.org Thu Mar 5 14:12:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 14:12:32 +0000 Subject: [pkgdb] gnome-bluetooth had acl change status Message-ID: <20090305141232.43A16208543@bastion.fedora.phx.redhat.com> hadess has set the watchcommits acl on gnome-bluetooth (Fedora devel) to Approved for hadess To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From pkgdb at fedoraproject.org Thu Mar 5 14:12:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 14:12:43 +0000 Subject: [pkgdb] gnome-bluetooth had acl change status Message-ID: <20090305141243.53309208201@bastion.fedora.phx.redhat.com> hadess has set the approveacls acl on gnome-bluetooth (Fedora devel) to Approved for hadess To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From pkgdb at fedoraproject.org Thu Mar 5 14:12:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 14:12:26 +0000 Subject: [pkgdb] gnome-bluetooth had acl change status Message-ID: <20090305141247.319BA20820B@bastion.fedora.phx.redhat.com> hadess has set the commit acl on gnome-bluetooth (Fedora devel) to Approved for hadess To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From pkgdb at fedoraproject.org Thu Mar 5 14:12:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 14:12:12 +0000 Subject: [pkgdb] gnome-bluetooth had acl change status Message-ID: <20090305141255.B3860208546@bastion.fedora.phx.redhat.com> hadess has set the watchbugzilla acl on gnome-bluetooth (Fedora devel) to Approved for hadess To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-bluetooth From jcollie at fedoraproject.org Thu Mar 5 14:12:53 2009 From: jcollie at fedoraproject.org (Jeffrey C. Ollie) Date: Thu, 5 Mar 2009 14:12:53 +0000 (UTC) Subject: rpms/asterisk/devel .cvsignore, 1.20, 1.21 asterisk-strip.sh, 1.4, 1.5 asterisk.spec, 1.50, 1.51 sources, 1.20, 1.21 Message-ID: <20090305141253.46B5270116@cvs1.fedora.phx.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19387 Modified Files: .cvsignore asterisk-strip.sh asterisk.spec sources Log Message: * Thu Mar 5 2009 Jeffrey C. Ollie - 1.6.1-0.23.rc1 - Rebuild to pick up new AIS and ODBC deps. - Update script that strips out bad content from tarball to do the download and to check the GPG signature. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 9 Feb 2009 05:54:21 -0000 1.20 +++ .cvsignore 5 Mar 2009 14:12:22 -0000 1.21 @@ -1 +1,3 @@ asterisk-1.6.1-rc1-stripped.tar.gz +asterisk-1.6.1-rc1.tar.gz.asc +asterisk-developer-pubring.gpg Index: asterisk-strip.sh =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk-strip.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- asterisk-strip.sh 10 Oct 2008 17:16:34 -0000 1.4 +++ asterisk-strip.sh 5 Mar 2009 14:12:22 -0000 1.5 @@ -1,11 +1,45 @@ #!/bin/sh version=$1 + +if [ -z $version ]; then + echo "Please specify a version!" + exit 1 +fi + +wget --continue --timestamping http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-$version.tar.gz \ + http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-$version.tar.gz.asc + +if [ ! $? ]; then + echo "Unable to download!" + exit 1 +fi + if [ ! -f asterisk-$version.tar.gz ]; then echo "Can't find asterisk-$version.tar.gz!" exit 1 fi +if [ ! -f asterisk-$version.tar.gz.asc ]; then + echo "Can't find asterisk-$version.tar.gz.asc!" + exit 1 +fi + +gpg --keyring=$(pwd)/asterisk-developer-pubring.gpg --verify asterisk-$version.tar.gz.asc asterisk-$version.tar.gz + +if [ ! $? ]; then + echo "Bad signature!!!!" + exit 1 +fi + +echo +read -p "Does the GPG signature look OK? " -n 1 +echo + +if [ $REPLY != "Y" -a $REPLY != "y" ]; then + exit 1 +fi + tar xf asterisk-$version.tar.gz rm asterisk-$version/sounds/*.tar.gz tar czf asterisk-$version-stripped.tar.gz asterisk-$version @@ -18,5 +52,9 @@ echo "# SHA1 Sums" echo "# =========" sha1sum asterisk-$version.tar.gz asterisk-$version-stripped.tar.gz | sed -e 's/^/# /' +echo "#" +echo "# SHA256 Sums" +echo "# =========" +sha256sum asterisk-$version.tar.gz asterisk-$version-stripped.tar.gz | sed -e 's/^/# /' - +make new-sources FILES="asterisk-$version-stripped.tar.gz asterisk-$version.tar.gz.asc asterisk-developer-pubring.gpg" Index: asterisk.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- asterisk.spec 24 Feb 2009 02:42:52 -0000 1.50 +++ asterisk.spec 5 Mar 2009 14:12:22 -0000 1.51 @@ -3,7 +3,7 @@ Summary: The Open Source PBX Name: asterisk Version: 1.6.1 -Release: 0.22.%{?_rc:rc%{_rc}}%{?dist} +Release: 0.23.%{?_rc:rc%{_rc}}%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.asterisk.org/ @@ -20,18 +20,25 @@ # MD5 Sums # ======== # 29f7285b673d52b49d91c8e797acbbb0 asterisk-1.6.1-rc1.tar.gz -# 077741b7f993925f61bb50ab29b49063 asterisk-1.6.1-rc1-stripped.tar.gz +# d77d5521c9e742c81356f49ebcf6051a asterisk-1.6.1-rc1-stripped.tar.gz # # SHA1 Sums # ========= # 517176cad6ecf1e223749ae927a5989f2d2c0c29 asterisk-1.6.1-rc1.tar.gz -# 3e22952202fafc49f13addaf8852cfa3ebc05fc2 asterisk-1.6.1-rc1-stripped.tar.gz +# 1fe8c924945ff04acd7883f086cf7f1ce0fc8d88 asterisk-1.6.1-rc1-stripped.tar.gz +# +# SHA256 Sums +# ========= +# 730dea578f72b51ff13f21320ff81f06e1c10a02a0f723b61c5bf8e47bee5e3b asterisk-1.6.1-rc1.tar.gz +# 93b2635208318c834917fad0a75fd59d04c282ca15d7dba2ba494cee22e88b73 asterisk-1.6.1-rc1-stripped.tar.gz Source0: asterisk-%{version}%{?_rc:-rc%{_rc}}-stripped.tar.gz Source1: asterisk-logrotate Source2: menuselect.makedeps Source3: menuselect.makeopts Source4: asterisk-strip.sh +Source5: asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz.asc +Source6: asterisk-developer-pubring.gpg Patch1: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch Patch2: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch @@ -1092,6 +1099,11 @@ %{_libdir}/asterisk/modules/app_voicemail_plain.so %changelog +* Thu Mar 5 2009 Jeffrey C. Ollie - 1.6.1-0.23.rc1 +- Rebuild to pick up new AIS and ODBC deps. +- Update script that strips out bad content from tarball to do the + download and to check the GPG signature. + * Mon Feb 23 2009 Fedora Release Engineering - 1.6.1-0.22.rc1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 9 Feb 2009 05:54:22 -0000 1.20 +++ sources 5 Mar 2009 14:12:22 -0000 1.21 @@ -1 +1,3 @@ -077741b7f993925f61bb50ab29b49063 asterisk-1.6.1-rc1-stripped.tar.gz +d77d5521c9e742c81356f49ebcf6051a asterisk-1.6.1-rc1-stripped.tar.gz +2ed78cc8eae3b293c5295444e891462e asterisk-1.6.1-rc1.tar.gz.asc +4c2feab99acb254a49048b93da97ad42 asterisk-developer-pubring.gpg From rbhalera at fedoraproject.org Thu Mar 5 14:13:18 2009 From: rbhalera at fedoraproject.org (Rahul Bhalerao) Date: Thu, 5 Mar 2009 14:13:18 +0000 (UTC) Subject: rpms/lohit-fonts/devel .cvsignore, 1.9, 1.10 lohit-fonts.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <20090305141318.E057C70116@cvs1.fedora.phx.redhat.com> Author: rbhalera Update of /cvs/pkgs/rpms/lohit-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19490 Modified Files: .cvsignore lohit-fonts.spec sources Log Message: New bugfixed version: lohit-fonts-2.3.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 9 Sep 2008 12:08:11 -0000 1.9 +++ .cvsignore 5 Mar 2009 14:12:48 -0000 1.10 @@ -1 +1 @@ -lohit-fonts-2.3.1.tar.gz +lohit-fonts-2.3.8.tar.gz Index: lohit-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/lohit-fonts.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- lohit-fonts.spec 25 Feb 2009 20:57:00 -0000 1.11 +++ lohit-fonts.spec 5 Mar 2009 14:12:48 -0000 1.12 @@ -7,8 +7,8 @@ Name: %{fontname}-fonts -Version: 2.3.1 -Release: 3%{?dist} +Version: 2.3.8 +Release: 1%{?dist} Summary: Free Indian truetype/opentype fonts Group: User Interface/X @@ -33,6 +33,17 @@ This package consists of files used by other %{name} packages. +%package -n %{fontname}-assamese-fonts +Summary: Free Assamese font +Group: User Interface/X +Requires: %{name}-common = %{version}-%{release} + +%description -n %{fontname}-assamese-fonts +%common_desc +This package provides a free Assamese truetype/opentype font. + +%_font_pkg -n assamese lohit_as.ttf + %package -n %{fontname}-bengali-fonts Summary: Free Bengali font Group: User Interface/X @@ -256,6 +267,16 @@ %changelog + +* Thu Mar 05 2009 Rahul Bhalerao - 2.3.8-1.fc11 +- Bug 428427 - [kn_IN][fonts-indic] - 0CB5+0CCA is wrongly rendering +- Bug 450699 - [ta_IN]Errors in "sh" and "shrI" in Lohit Tamil font (fixed in font, needs rendering update) +- Bug 476427 - [te_IN] - Consonant+Virama+Consonant+Virama+space renders the second virama as a separate glyph in + lohit-telugu font +- Bug 479100 - [kn_IN] Conjunct combination of U0C9D with U0CCA/U0CCB is rendering wrongly +- Bug 483530 - [bn_IN]Lohit Bengali font cheating about character support +- Added Lohit-Assamese + * Wed Feb 25 2009 Fedora Release Engineering - 2.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 9 Sep 2008 12:08:11 -0000 1.9 +++ sources 5 Mar 2009 14:12:48 -0000 1.10 @@ -1 +1 @@ -ca26218fc6323633210c674fe9e2f9d2 lohit-fonts-2.3.1.tar.gz +f3b5c3cd8e370f1669d44cec3eab1f2b lohit-fonts-2.3.8.tar.gz From limb at fedoraproject.org Thu Mar 5 14:14:03 2009 From: limb at fedoraproject.org (Jon Ciesla) Date: Thu, 5 Mar 2009 14:14:03 +0000 (UTC) Subject: rpms/numpy/devel numpy.spec,1.30,1.31 Message-ID: <20090305141403.3C30F70116@cvs1.fedora.phx.redhat.com> Author: limb Update of /cvs/pkgs/rpms/numpy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19749 Modified Files: numpy.spec Log Message: Require python-devel, BZ 488464 Index: numpy.spec =================================================================== RCS file: /cvs/pkgs/rpms/numpy/devel/numpy.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- numpy.spec 26 Feb 2009 06:25:40 -0000 1.30 +++ numpy.spec 5 Mar 2009 14:13:32 -0000 1.31 @@ -4,7 +4,7 @@ Name: numpy Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A fast multidimensional array facility for Python Group: Development/Languages @@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel lapack-devel python-setuptools gcc-gfortran atlas python-nose -Requires: python-nose +Requires: python-nose python-devel Provides: f2py Obsoletes: f2py <= 2.45.241_1927 @@ -76,6 +76,9 @@ %endif %changelog +* Thu Mar 05 2009 Jon Ciesla 1.2.1-3 +- Require python-devel, BZ 488464. + * Wed Feb 25 2009 Fedora Release Engineering - 1.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Thu Mar 5 14:22:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 14:22:09 +0000 Subject: [pkgdb] bluez-gnome ownership updated Message-ID: <20090305142208.32775208201@bastion.fedora.phx.redhat.com> Package bluez-gnome in Fedora devel was orphaned by hadess To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome From limb at fedoraproject.org Thu Mar 5 14:28:00 2009 From: limb at fedoraproject.org (Jon Ciesla) Date: Thu, 5 Mar 2009 14:28:00 +0000 (UTC) Subject: rpms/numpy/F-10 numpy.spec,1.26,1.27 Message-ID: <20090305142800.A0CF270116@cvs1.fedora.phx.redhat.com> Author: limb Update of /cvs/pkgs/rpms/numpy/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21924 Modified Files: numpy.spec Log Message: Requries python-devel, BZ 488464. Index: numpy.spec =================================================================== RCS file: /cvs/pkgs/rpms/numpy/F-10/numpy.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- numpy.spec 8 Oct 2008 13:50:24 -0000 1.26 +++ numpy.spec 5 Mar 2009 14:27:30 -0000 1.27 @@ -4,7 +4,7 @@ Name: numpy Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A fast multidimensional array facility for Python Group: Development/Languages @@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel lapack-devel python-setuptools gcc-gfortran atlas python-nose -Requires: python-nose +Requires: python-nose python-devel Provides: f2py Obsoletes: f2py <= 2.45.241_1927 @@ -76,6 +76,9 @@ %endif %changelog +* Thu Mar 05 2009 Jon Ciesla 1.2.0-2 +- Requires python-devel, BZ 488464. + * Tue Oct 07 2008 Jon Ciesla 1.2.0-1 - New upstream release, added python-nose BR. BZ 465999. - Using atlas blas, not blas-devel. BZ 461472. From caolanm at fedoraproject.org Thu Mar 5 14:32:04 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 14:32:04 +0000 (UTC) Subject: rpms/openoffice.org/devel sources,1.352,1.353 Message-ID: <20090305143204.1B9CD70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22643 Modified Files: sources Log Message: jfreereport needs libbase which we don't have yet, so hackaround Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.352 retrieving revision 1.353 diff -u -r1.352 -r1.353 --- sources 5 Mar 2009 10:09:49 -0000 1.352 +++ sources 5 Mar 2009 14:31:33 -0000 1.353 @@ -17,4 +17,4 @@ bdc3b2b8b90ac1879f216cfa3c50d7e1 hi-IN-D300-m40.tar.gz be8d6866609e7aa7282220c0f469b279 as-IN_DEV300_m40.sdf d185576d40f1157cc1d25e8f72d5017a ml-IN_DEV300_m40.sdf -a133aed113ff6ce82e20583e39140b98 OOO310_m4.tar.bz2 +4a49ac21575a610ab190fdd13a4dc8b8 OOO310_m4.tar.bz2 From caolanm at fedoraproject.org Thu Mar 5 14:33:50 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 14:33:50 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1848,1.1849 Message-ID: <20090305143350.251AD70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22882 Modified Files: openoffice.org.spec Log Message: butcher things to get report-builder building Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1848 retrieving revision 1.1849 diff -u -r1.1848 -r1.1849 --- openoffice.org.spec 5 Mar 2009 10:09:49 -0000 1.1848 +++ openoffice.org.spec 5 Mar 2009 14:33:19 -0000 1.1849 @@ -1,6 +1,6 @@ %define oootag OOO310 %define ooomilestone 4 -%define rh_rpm_release 2 +%define rh_rpm_release 1 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF %define __jar_repack %{nil} @@ -1621,17 +1621,21 @@ --enable-evolution2 --enable-cairo --enable-dbus --enable-opengl \ --enable-minimizer --enable-presenter-console --enable-pdfimport \ --enable-wiki-publisher --enable-vba --enable-report-builder \ - --with-jfreereport-jar=/usr/share/java/pentaho-reporting-flow-engine.jar \ - --with-libserializer-jar=/usr/share/java/jcommon-serializer.jar \ - --with-libbase-jar=/dev/null \ --with-vba-package-format="builtin" --with-system-libs \ - --with-system-headers --with-system-jfreereport --with-system-apache-commons \ + --with-system-headers --with-system-apache-commons \ --with-system-mozilla --with-system-libtextcat --with-system-redland \ --with-system-dicts --with-external-dict-dir=/usr/share/myspell \ --without-myspell-dicts --without-system-mspack --without-fonts --without-gpc \ --without-agg --without-ppds --without-afms --without-writer2latex \ %{stlflags} --with-lang="%{langpack_langs}" \ --with-poor-help-localizations="$POORHELPS" + +# awaiting review of libbase +# --with-system-jfreereport +# --with-jfreereport-jar=/usr/share/java/pentaho-reporting-flow-engine.jar \ +# --with-libserializer-jar=/usr/share/java/jcommon-serializer.jar \ +# --with-libbase-jar=/dev/null \ + ./bootstrap source ./Linux*Env.Set.sh #unneccessary to build for both hash types @@ -4114,15 +4118,13 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog -* Thu Mar 05 2009 Caol??n McNamara - 1:3.1.0-4.2 -- Resolves: rhbz#488688 / ooo#98746 merge Punjabi Translations -- Resolves: rhbz#488700 / ooo#99907 merge Malayalam Translations - * Thu Mar 05 2009 Caol??n McNamara - 1:3.1.0-4.1 +- report-builder will be broken until rhbz#474391 is resolved - drop integrated workspace.gfbcrash.patch - drop integrated workspace.ooo31gsl2.patch - drop integrated openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch -- report-builder will be broken until rhbz#474391 is resolved +- Resolves: rhbz#488688 / ooo#98746 merge Punjabi Translations +- Resolves: rhbz#488700 / ooo#99907 merge Malayalam Translations * Tue Mar 03 2009 Caol??n McNamara - 1:3.1.0-3.4 - Resolves: rhbz#488228 Assamese Translations From limb at fedoraproject.org Thu Mar 5 14:39:44 2009 From: limb at fedoraproject.org (Jon Ciesla) Date: Thu, 5 Mar 2009 14:39:44 +0000 (UTC) Subject: rpms/numpy/F-9 numpy.spec,1.24,1.25 Message-ID: <20090305143944.75A5170116@cvs1.fedora.phx.redhat.com> Author: limb Update of /cvs/pkgs/rpms/numpy/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23553 Modified Files: numpy.spec Log Message: Requires python-devel, BZ 488464 Index: numpy.spec =================================================================== RCS file: /cvs/pkgs/rpms/numpy/F-9/numpy.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- numpy.spec 9 Oct 2008 13:32:03 -0000 1.24 +++ numpy.spec 5 Mar 2009 14:39:14 -0000 1.25 @@ -4,7 +4,7 @@ Name: numpy Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A fast multidimensional array facility for Python Group: Development/Languages @@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel lapack-devel python-setuptools gcc-gfortran atlas python-nose -Requires: python-nose +Requires: python-nose python-devel Provides: f2py Obsoletes: f2py <= 2.45.241_1927 @@ -76,6 +76,9 @@ %endif %changelog +* Thu Mar 05 2009 Jon Ciesla 1.2.0-2 +- Requires python-devel, BZ 488464. + * Tue Oct 07 2008 Jon Ciesla 1.2.0-1 - New upstream release, added python-nose BR. BZ 465999. - Using atlas blas, not blas-devel. BZ 461472. From rstrode at fedoraproject.org Thu Mar 5 14:40:38 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Thu, 5 Mar 2009 14:40:38 +0000 (UTC) Subject: rpms/gdm/devel gdm-2.25.2-multistack-but-boring.patch, 1.3, 1.4 gdm.spec, 1.444, 1.445 Message-ID: <20090305144038.C0C1470116@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gdm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23486 Modified Files: gdm-2.25.2-multistack-but-boring.patch gdm.spec Log Message: - Bring back language/session/layout selector for autologin gdm-2.25.2-multistack-but-boring.patch: Index: gdm-2.25.2-multistack-but-boring.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.25.2-multistack-but-boring.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdm-2.25.2-multistack-but-boring.patch 5 Mar 2009 03:02:21 -0000 1.3 +++ gdm-2.25.2-multistack-but-boring.patch 5 Mar 2009 14:40:08 -0000 1.4 @@ -5589,7 +5589,7 @@ diff -up gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.c.multistack-but-boring gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.c --- gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.c.multistack-but-boring 2008-11-18 17:19:05.000000000 -0500 -+++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.c 2009-03-04 21:03:53.141431898 -0500 ++++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.c 2009-03-05 09:33:10.435596361 -0500 @@ -1,7 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- * @@ -5746,7 +5746,8 @@ - set_busy (login_window); - set_sensitive (login_window, FALSE); + GtkActionGroup *actions; -+ + +- _gdm_greeter_login_window_set_interactive (login_window, TRUE); + actions = gdm_conversation_get_actions (GDM_CONVERSATION (task)); + + if (actions != NULL) { @@ -5788,8 +5789,7 @@ + break; + } + } - -- _gdm_greeter_login_window_set_interactive (login_window, TRUE); ++ +} + +static void @@ -5900,14 +5900,21 @@ +GdmTask * +find_task_with_service_name (GdmGreeterLoginWindow *login_window, + const char *service_name) -+{ + { +- const char *typed_text; +- char *null_text; + GdmTask *task; + + task = gdm_task_list_foreach_task (GDM_TASK_LIST (login_window->priv->conversation_list), + (GdmTaskListForeachFunc) + task_has_service_name, + (gpointer) service_name); -+ + +- /* try to scrub out any secret info */ +- typed_text = gtk_entry_get_text (GTK_ENTRY (entry)); +- null_text = g_strnfill (strlen (typed_text) + 1, '\b'); +- gtk_entry_set_text (GTK_ENTRY (entry), null_text); +- gtk_entry_set_text (GTK_ENTRY (entry), ""); + return task; +} + @@ -5915,16 +5922,9 @@ +reset_task (GdmTaskList *task_list, + GdmTask *task, + GdmGreeterLoginWindow *login_window) - { -- const char *typed_text; -- char *null_text; ++{ + char *name; - -- /* try to scrub out any secret info */ -- typed_text = gtk_entry_get_text (GTK_ENTRY (entry)); -- null_text = g_strnfill (strlen (typed_text) + 1, '\b'); -- gtk_entry_set_text (GTK_ENTRY (entry), null_text); -- gtk_entry_set_text (GTK_ENTRY (entry), ""); ++ + name = gdm_task_get_name (task); + g_debug ("Resetting task '%s'", name); + g_free (name); @@ -5947,13 +5947,13 @@ } - entry = glade_xml_get_widget (GDM_GREETER_LOGIN_WINDOW (login_window)->priv->xml, "auth-prompt-entry"); +- +- delete_entry_text (entry); + gdm_task_list_foreach_task (GDM_TASK_LIST (login_window->priv->conversation_list), + (GdmTaskListForeachFunc) + reset_task, + login_window); -- delete_entry_text (entry); -- - gtk_entry_set_visibility (GTK_ENTRY (entry), TRUE); set_message (login_window, ""); - @@ -6274,7 +6274,7 @@ } static void -@@ -1330,43 +1579,180 @@ on_users_loaded (GdmUserChooserWidget * +@@ -1330,43 +1579,183 @@ on_users_loaded (GdmUserChooserWidget * gdm_chooser_widget_activate_if_one_item (GDM_CHOOSER_WIDGET (login_window->priv->user_chooser)); } @@ -6375,6 +6375,9 @@ +static void +begin_auto_login (GdmGreeterLoginWindow *login_window) +{ ++ g_signal_emit (G_OBJECT (login_window), signals[USER_SELECTED], ++ 0, GDM_USER_CHOOSER_USER_AUTO); ++ + g_signal_emit (login_window, signals[BEGIN_AUTO_LOGIN], 0, + login_window->priv->timed_login_username); + @@ -6476,7 +6479,7 @@ } static void -@@ -1505,6 +1891,69 @@ create_computer_info (GdmGreeterLoginWin +@@ -1505,6 +1894,69 @@ create_computer_info (GdmGreeterLoginWin #define INVISIBLE_CHAR_BULLET 0x2022 #define INVISIBLE_CHAR_NONE 0 @@ -6546,7 +6549,7 @@ static GtkWidget * custom_widget_constructor (GladeXML *xml, char *func_name, -@@ -1527,6 +1976,8 @@ custom_widget_constructor (GladeXML +@@ -1527,6 +1979,8 @@ custom_widget_constructor (GladeXML if (strcmp (name, "user-chooser") == 0) { widget = gdm_user_chooser_widget_new (); @@ -6555,7 +6558,7 @@ } gdm_profile_end (NULL); -@@ -1537,7 +1988,6 @@ custom_widget_constructor (GladeXML +@@ -1537,7 +1991,6 @@ custom_widget_constructor (GladeXML static void load_theme (GdmGreeterLoginWindow *login_window) { @@ -6563,7 +6566,7 @@ GtkWidget *button; GtkWidget *box; GtkWidget *image; -@@ -1591,7 +2041,7 @@ load_theme (GdmGreeterLoginWindow *login +@@ -1591,7 +2044,7 @@ load_theme (GdmGreeterLoginWindow *login login_window); g_signal_connect (login_window->priv->user_chooser, "activated", @@ -6572,7 +6575,7 @@ login_window); g_signal_connect (login_window->priv->user_chooser, "deactivated", -@@ -1600,8 +2050,20 @@ load_theme (GdmGreeterLoginWindow *login +@@ -1600,8 +2053,20 @@ load_theme (GdmGreeterLoginWindow *login gtk_widget_show (login_window->priv->user_chooser); @@ -6593,7 +6596,7 @@ button = glade_xml_get_widget (login_window->priv->xml, "suspend-button"); g_signal_connect (button, "clicked", G_CALLBACK (suspend_button_clicked), login_window); -@@ -1617,14 +2079,6 @@ load_theme (GdmGreeterLoginWindow *login +@@ -1617,14 +2082,6 @@ load_theme (GdmGreeterLoginWindow *login button = glade_xml_get_widget (login_window->priv->xml, "shutdown-button"); g_signal_connect (button, "clicked", G_CALLBACK (shutdown_button_clicked), login_window); @@ -6608,7 +6611,7 @@ create_computer_info (login_window); box = glade_xml_get_widget (login_window->priv->xml, "computer-info-event-box"); -@@ -1757,6 +2211,15 @@ gdm_greeter_login_window_class_init (Gdm +@@ -1757,6 +2214,15 @@ gdm_greeter_login_window_class_init (Gdm widget_class->key_press_event = gdm_greeter_login_window_key_press_event; widget_class->size_request = gdm_greeter_login_window_size_request; @@ -6624,7 +6627,7 @@ signals [BEGIN_AUTO_LOGIN] = g_signal_new ("begin-auto-login", G_TYPE_FROM_CLASS (object_class), -@@ -1773,9 +2236,9 @@ gdm_greeter_login_window_class_init (Gdm +@@ -1773,9 +2239,9 @@ gdm_greeter_login_window_class_init (Gdm G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, begin_verification), NULL, NULL, @@ -6636,7 +6639,7 @@ signals [BEGIN_VERIFICATION_FOR_USER] = g_signal_new ("begin-verification-for-user", G_TYPE_FROM_CLASS (object_class), -@@ -1783,9 +2246,9 @@ gdm_greeter_login_window_class_init (Gdm +@@ -1783,9 +2249,9 @@ gdm_greeter_login_window_class_init (Gdm G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, begin_verification_for_user), NULL, NULL, @@ -6648,7 +6651,7 @@ signals [QUERY_ANSWER] = g_signal_new ("query-answer", G_TYPE_FROM_CLASS (object_class), -@@ -1793,9 +2256,9 @@ gdm_greeter_login_window_class_init (Gdm +@@ -1793,9 +2259,9 @@ gdm_greeter_login_window_class_init (Gdm G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, query_answer), NULL, NULL, @@ -6660,7 +6663,7 @@ signals [USER_SELECTED] = g_signal_new ("user-selected", G_TYPE_FROM_CLASS (object_class), -@@ -1833,9 +2296,9 @@ gdm_greeter_login_window_class_init (Gdm +@@ -1833,9 +2299,9 @@ gdm_greeter_login_window_class_init (Gdm G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, start_session), NULL, NULL, @@ -6672,7 +6675,7 @@ g_object_class_install_property (object_class, PROP_DISPLAY_IS_LOCAL, -@@ -1888,6 +2351,232 @@ on_gconf_key_changed (GConfClient +@@ -1888,6 +2354,232 @@ on_gconf_key_changed (GConfClient } } @@ -7180,7 +7183,7 @@ G_END_DECLS diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c 2009-03-04 21:03:53.146447953 -0500 @@ -0,0 +1,255 @@ +/* @@ -7439,7 +7442,7 @@ +} + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h 2009-03-04 21:03:53.147432504 -0500 @@ -0,0 +1,61 @@ +/* @@ -7769,7 +7772,7 @@ } diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c 2009-03-04 21:03:53.151447317 -0500 @@ -0,0 +1,478 @@ +/* @@ -8251,7 +8254,7 @@ + return g_hash_table_lookup (manager->priv->plugins, name); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h 2009-03-04 21:03:53.152449048 -0500 @@ -0,0 +1,66 @@ +/* @@ -8321,7 +8324,7 @@ + +#endif /* __GDM_PLUGIN_MANAGER_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.c ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.c 2009-03-04 21:03:53.153442188 -0500 @@ -0,0 +1,329 @@ +/* @@ -8654,7 +8657,7 @@ + return g_list_length (widget->priv->tasks); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.h ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.h 2009-03-04 21:03:53.154446921 -0500 @@ -0,0 +1,80 @@ +/* @@ -8800,7 +8803,7 @@ pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme, "emblem-default", diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c 2009-03-04 21:03:53.157442475 -0500 @@ -0,0 +1,186 @@ +/* @@ -8990,7 +8993,7 @@ + return was_chosen; +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h 2009-03-04 21:03:53.158446161 -0500 @@ -0,0 +1,93 @@ +/* @@ -9087,7 +9090,7 @@ + +#endif /* __GDM_CONVERSATION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c 2009-03-04 21:03:53.159446844 -0500 @@ -0,0 +1,93 @@ +/* @@ -9184,7 +9187,7 @@ + g_signal_emit (extension, signals [LOAD_FAILED], 0, error); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h 2009-03-04 21:03:53.160442079 -0500 @@ -0,0 +1,55 @@ +/* @@ -9243,7 +9246,7 @@ +G_END_DECLS +#endif /* __GDM_GREETER_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in 2009-03-04 21:03:53.161442133 -0500 @@ -0,0 +1,11 @@ +prefix=@prefix@ @@ -9258,7 +9261,7 @@ +Libs: -L${libdir} -lgdmsimplegreeter +Cflags: -I${includedir}/gdm/simple-greeter diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c 2009-03-04 21:03:53.162442257 -0500 @@ -0,0 +1,123 @@ +/* @@ -9385,7 +9388,7 @@ + 0); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h 2009-03-04 21:03:53.163442172 -0500 @@ -0,0 +1,64 @@ +/* @@ -9453,7 +9456,7 @@ + +#endif /* __GDM_TASK_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am 2009-03-04 21:03:53.164444252 -0500 @@ -0,0 +1,48 @@ +NULL = @@ -9583,7 +9586,7 @@ $(EXTRA_GREETER_LIBS) \ $(SIMPLE_GREETER_LIBS) \ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c 2009-03-04 21:03:53.167443367 -0500 @@ -0,0 +1,304 @@ +/* @@ -9891,7 +9894,7 @@ + gdm_fingerprint_extension_reset (GDM_CONVERSATION (extension)); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h 2009-03-04 21:03:53.168442094 -0500 @@ -0,0 +1,56 @@ +/* @@ -9951,7 +9954,7 @@ + +#endif /* GDM_FINGERPRINT_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint 2009-03-04 21:03:53.169450949 -0500 @@ -0,0 +1,10 @@ +#%PAM-1.0 @@ -9965,7 +9968,7 @@ +session required pam_namespace.so +session include system-auth diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am 2009-03-04 21:03:53.170444507 -0500 @@ -0,0 +1,50 @@ +NULL = @@ -10019,7 +10022,7 @@ + *~ \ + Makefile.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui 2009-03-04 21:03:53.171445819 -0500 @@ -0,0 +1,56 @@ + @@ -10079,7 +10082,7 @@ + + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c 2009-03-04 21:03:53.172450483 -0500 @@ -0,0 +1,40 @@ +/* @@ -10123,12 +10126,12 @@ + return GDM_GREETER_EXTENSION (extension); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am 2009-03-04 21:03:53.173442226 -0500 @@ -0,0 +1 @@ +SUBDIRS = password diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c 2009-03-04 21:03:53.174446121 -0500 @@ -0,0 +1,323 @@ +/* @@ -10455,7 +10458,7 @@ + gdm_password_extension_reset (GDM_CONVERSATION (extension)); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h 2009-03-04 21:03:53.175446036 -0500 @@ -0,0 +1,56 @@ +/* @@ -10515,7 +10518,7 @@ + +#endif /* GDM_PASSWORD_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password 2009-03-04 21:03:53.176442109 -0500 @@ -0,0 +1,13 @@ +#%PAM-1.0 @@ -10532,7 +10535,7 @@ +session optional pam_gnome_keyring.so auto_start +session include system-auth diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am 2009-03-04 21:03:53.177442234 -0500 @@ -0,0 +1,44 @@ +NULL = @@ -10580,7 +10583,7 @@ + *~ \ + Makefile.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui 2009-03-04 21:03:53.178442358 -0500 @@ -0,0 +1,56 @@ + @@ -10640,7 +10643,7 @@ + + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c 2009-03-04 21:03:53.179446254 -0500 @@ -0,0 +1,40 @@ +/* @@ -10684,7 +10687,7 @@ + return GDM_GREETER_EXTENSION (extension); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c 2009-03-04 21:03:53.181445175 -0500 @@ -0,0 +1,558 @@ +/* gdm-smartcard.c - smartcard object @@ -11246,7 +11249,7 @@ + return NULL; +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c 2009-03-04 21:03:53.182438804 -0500 @@ -0,0 +1,440 @@ +/* @@ -11690,7 +11693,7 @@ + gdm_smartcard_extension_reset (GDM_CONVERSATION (extension)); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h 2009-03-04 21:03:53.184436468 -0500 @@ -0,0 +1,56 @@ +/* @@ -11750,7 +11753,7 @@ + +#endif /* GDM_SMARTCARD_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h 2009-03-04 21:03:53.185432192 -0500 @@ -0,0 +1,94 @@ +/* securitycard.h - api for reading and writing data to a security card @@ -11848,7 +11851,7 @@ +G_END_DECLS +#endif /* GDM_SMARTCARD_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c 2009-03-04 21:03:53.188432285 -0500 @@ -0,0 +1,1394 @@ +/* gdm-smartcard-manager.c - object for monitoring smartcard insertion and @@ -13246,7 +13249,7 @@ +} +#endif diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h 2009-03-04 21:03:53.189434924 -0500 @@ -0,0 +1,86 @@ +/* gdm-smartcard-manager.h - object for monitoring smartcard insertion and @@ -13336,7 +13339,7 @@ +G_END_DECLS +#endif /* GDM_SMARTCARD_MANAGER_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard 2009-03-04 21:03:53.190448876 -0500 @@ -0,0 +1,11 @@ +#%PAM-1.0 @@ -13351,7 +13354,7 @@ +session required pam_namespace.so +session include system-auth diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c 2009-03-04 21:03:53.191446556 -0500 @@ -0,0 +1,167 @@ +#include "config.h" @@ -13522,7 +13525,7 @@ + return 0; +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am 2009-03-04 21:03:53.192442070 -0500 @@ -0,0 +1,71 @@ +NULL = @@ -13597,7 +13600,7 @@ + *~ \ + Makefile.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui 2009-03-04 21:03:53.193451204 -0500 @@ -0,0 +1,56 @@ + @@ -13657,7 +13660,7 @@ + + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c ---- /dev/null 2009-03-04 12:14:59.552269004 -0500 +--- /dev/null 2009-03-05 04:25:32.556261885 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c 2009-03-04 21:03:53.194449722 -0500 @@ -0,0 +1,40 @@ +/* Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.444 retrieving revision 1.445 diff -u -r1.444 -r1.445 --- gdm.spec 5 Mar 2009 03:02:21 -0000 1.444 +++ gdm.spec 5 Mar 2009 14:40:08 -0000 1.445 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.25.2 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -341,6 +341,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Wed Mar 4 2009 Ray Strode - 1:2.25.2-11 +- Bring back language/session/layout selector for autologin + * Wed Mar 4 2009 Ray Strode - 1:2.25.2-10 - Add some fixes for autologin From krh at fedoraproject.org Thu Mar 5 14:45:46 2009 From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=) Date: Thu, 5 Mar 2009 14:45:46 +0000 (UTC) Subject: rpms/xorg-x11-drv-intel/devel xorg-x11-drv-intel.spec,1.6,1.7 Message-ID: <20090305144546.825D070116@cvs1.fedora.phx.redhat.com> Author: krh Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24342 Modified Files: xorg-x11-drv-intel.spec Log Message: * Thu Mar 5 2009 Kristian H??gsberg - 2.6.0-13 - Add conflicts to make sure we have a new enough kernel that drmSetMaster() doesn't deadlock. Index: xorg-x11-drv-intel.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xorg-x11-drv-intel.spec 4 Mar 2009 22:42:27 -0000 1.6 +++ xorg-x11-drv-intel.spec 5 Mar 2009 14:45:16 -0000 1.7 @@ -8,7 +8,7 @@ Summary: Xorg X11 Intel video driver(s) Name: xorg-x11-drv-intel Version: 2.6.0 -Release: 12%{?dist} +Release: 13%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -33,13 +33,15 @@ BuildRequires: xorg-x11-server-devel >= 1.4.99.1 BuildRequires: libXvMC-devel BuildRequires: mesa-libGL-devel >= 6.5-9 -BuildRequires: libdrm-devel >= 2.4.3 +BuildRequires: libdrm-devel >= 2.4.5 BuildRequires: kernel-headers Requires: hwdata Requires: xorg-x11-server-Xorg >= 1.4.99.1 Conflicts: kudzu < 1.2.42-1 +Conflicts: kernel < 2.6.29-0.207.rc7.fc11 +Conflicts: kernel-PAE < 2.6.29-0.207.rc7.fc11 Provides: %{legacyname} = %{legacyver} Obsoletes: %{legacyname} < %{legacyver} @@ -103,6 +105,10 @@ %{_libdir}/libIntelXvMC.so %changelog +* Thu Mar 5 2009 Kristian H??gsberg - 2.6.0-13 +- Add conflicts to make sure we have a new enough kernel that + drmSetMaster() doesn't deadlock. + * Wed Mar 4 2009 Kristian H??gsberg - 2.6.0-12 - Update to new git snapshot: re-enables multiple X servers, fixes leak on vt switch for 965 type hardware, fold dpms patch into git From caolanm at fedoraproject.org Thu Mar 5 15:07:33 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 15:07:33 +0000 (UTC) Subject: rpms/multiget/devel multiget-1.2-includes.patch, NONE, 1.1 multiget.spec, 1.4, 1.5 Message-ID: <20090305150733.DF41670116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/multiget/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27339 Modified Files: multiget.spec Added Files: multiget-1.2-includes.patch Log Message: include cstdio for sprintf multiget-1.2-includes.patch: --- NEW FILE multiget-1.2-includes.patch --- diff -ru multiget.orig/src/batch.cpp multiget/src/batch.cpp --- multiget.orig/src/batch.cpp 2009-03-05 14:03:18.000000000 +0000 +++ multiget/src/batch.cpp 2009-03-05 14:03:36.000000000 +0000 @@ -25,6 +25,7 @@ #include "batch.h" #include "common.h" #include +#include CBatch::CBatch( std::string str ) { diff -ru multiget.orig/src/mgftpbase.cpp multiget/src/mgftpbase.cpp --- multiget.orig/src/mgftpbase.cpp 2009-03-05 14:03:18.000000000 +0000 +++ multiget/src/mgftpbase.cpp 2009-03-05 14:12:25.000000000 +0000 @@ -25,6 +25,7 @@ #ifdef WIN32 #include #endif +#include #include "mgftpbase.h" /* the UTF-8 Chinese char will break vc6 compile diff -ru multiget.orig/src/mghttpbase.cpp multiget/src/mghttpbase.cpp --- multiget.orig/src/mghttpbase.cpp 2009-03-05 14:03:18.000000000 +0000 +++ multiget/src/mghttpbase.cpp 2009-03-05 14:31:45.000000000 +0000 @@ -48,6 +48,7 @@ #include "mghttpbase.h" #include +#include using namespace std; Index: multiget.spec =================================================================== RCS file: /cvs/pkgs/rpms/multiget/devel/multiget.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- multiget.spec 26 Feb 2009 03:22:27 -0000 1.4 +++ multiget.spec 5 Mar 2009 15:07:03 -0000 1.5 @@ -1,6 +1,6 @@ Name: multiget Version: 1.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An easy-to-use GUI file downloader Group: Applications/Internet @@ -13,6 +13,7 @@ # so I decided to use the one from 1.1.4. Source3: MultiGet.png Patch0: multiget-1.2-fix-gcc43.patch +Patch1: multiget-1.2-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel desktop-file-utils >= 0.9 perl(XML::Parser) libglade2-devel automake >= 1.10 @@ -29,6 +30,7 @@ %prep %setup -qn multiget %patch0 -p1 -b .good +%patch1 -p1 -b .includes chmod 644 icons/*.xpm # fix dead symbolic links @@ -76,6 +78,9 @@ %{_datadir}/pixmaps/MultiGet.png %changelog +* Thu Mar 05 2009 Caol??n McNamara - 1.2.0-5 +- include cstdio for sprintf + * Wed Feb 25 2009 Fedora Release Engineering - 1.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rcritten at fedoraproject.org Thu Mar 5 15:12:37 2009 From: rcritten at fedoraproject.org (Robert Crittenden) Date: Thu, 5 Mar 2009 15:12:37 +0000 (UTC) Subject: rpms/mod_nss/F-10 mod_nss-wouldblock.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 mod_nss.spec, 1.14, 1.15 sources, 1.6, 1.7 mod_nss-fips.patch, 1.2, NONE mod_nss-inherit.patch, 1.1, NONE mod_nss-kill.patch, 1.1, NONE mod_nss-nofork.patch, 1.1, NONE Message-ID: <20090305151237.2C90770116@cvs1.fedora.phx.redhat.com> Author: rcritten Update of /cvs/extras/rpms/mod_nss/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28128 Modified Files: .cvsignore mod_nss.spec sources Added Files: mod_nss-wouldblock.patch Removed Files: mod_nss-fips.patch mod_nss-inherit.patch mod_nss-kill.patch mod_nss-nofork.patch Log Message: Update to 1.0.8 Add patch that fixes NSPR layer bug mod_nss-wouldblock.patch: --- NEW FILE mod_nss-wouldblock.patch --- --- mod_nss-1.0.3.orig/nss_engine_io.c 2006-04-07 16:17:12.000000000 -0400 +++ mod_nss-1.0.3/nss_engine_io.c 2009-02-17 22:51:44.000000000 -0500 @@ -259,7 +259,8 @@ */ if (APR_STATUS_IS_EAGAIN(inctx->rc) || APR_STATUS_IS_EINTR(inctx->rc) || (inctx->rc == APR_SUCCESS && APR_BRIGADE_EMPTY(inctx->bb))) { - return 0; + PR_SetError(PR_WOULD_BLOCK_ERROR, 0); + return -1; } if (inctx->rc != APR_SUCCESS) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_nss/F-10/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Oct 2007 18:57:58 -0000 1.6 +++ .cvsignore 5 Mar 2009 15:12:06 -0000 1.7 @@ -1,2 +1 @@ -mod_nss-1.0.7.tar.gz -mod_nss-proxy.patch +mod_nss-1.0.8.tar.gz Index: mod_nss.spec =================================================================== RCS file: /cvs/extras/rpms/mod_nss/F-10/mod_nss.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mod_nss.spec 11 Aug 2008 15:16:59 -0000 1.14 +++ mod_nss.spec 5 Mar 2009 15:12:06 -0000 1.15 @@ -1,8 +1,8 @@ %define _default_patch_fuzz 2 Name: mod_nss -Version: 1.0.7 -Release: 10%{?dist} +Version: 1.0.8 +Release: 1%{?dist} Summary: SSL/TLS module for the Apache HTTP server Group: System Environment/Daemons License: ASL 2.0 @@ -15,11 +15,7 @@ Requires: httpd >= 0:2.0.52 Patch1: mod_nss-conf.patch Patch2: mod_nss-gencert.patch -Patch3: mod_nss-proxy.patch -Patch4: mod_nss-nofork.patch -Patch5: mod_nss-fips.patch -Patch6: mod_nss-inherit.patch -Patch7: mod_nss-kill.patch +Patch3: mod_nss-wouldblock.patch %description The mod_nss module provides strong cryptography for the Apache Web @@ -31,11 +27,7 @@ %setup -q %patch1 -p1 -b .conf %patch2 -p1 -b .gencert -%patch3 -p1 -b .proxy -%patch4 -p1 -b .nofork -%patch5 -p1 -b .fips -%patch6 -p1 -b .inherit -%patch7 -p1 -b .kill +%patch3 -p1 -b .wouldblock # Touch expression parser sources to prevent regenerating it touch nss_expr_*.[chyl] @@ -120,6 +112,10 @@ %{_sbindir}/gencert %changelog +* Mon Mar 2 2009 Rob Crittenden - 1.0.8-1 +- Update to 1.0.8 +- Add patch that fixes NSPR layer bug + * Mon Aug 11 2008 Tom "spot" Callaway - 1.0.7-10 - fix license tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_nss/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Oct 2007 18:57:58 -0000 1.6 +++ sources 5 Mar 2009 15:12:06 -0000 1.7 @@ -1,2 +1 @@ -71107cbc702bf07c6c79843aa92a0e09 mod_nss-1.0.7.tar.gz -d822102fe6b4a76beeb81e86c4ce2f80 mod_nss-proxy.patch +32458d91ce909260a6081cce58004e2f mod_nss-1.0.8.tar.gz --- mod_nss-fips.patch DELETED --- --- mod_nss-inherit.patch DELETED --- --- mod_nss-kill.patch DELETED --- --- mod_nss-nofork.patch DELETED --- From crobinso at fedoraproject.org Thu Mar 5 15:14:51 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Thu, 5 Mar 2009 15:14:51 +0000 (UTC) Subject: rpms/python-virtinst/devel virtinst-0.400.2-fix-file.patch, NONE, 1.1 python-virtinst.spec, 1.57, 1.58 Message-ID: <20090305151451.6F27270116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28502 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.2-fix-file.patch Log Message: Fix virt-install --file option (bz 488731) virtinst-0.400.2-fix-file.patch: --- NEW FILE virtinst-0.400.2-fix-file.patch --- # HG changeset patch # User Cole Robinson # Date 1236265193 18000 # Node ID eae3579380dd2112393e0011c1b3212243c39d94 # Parent 8a1d27ec3458e1639f01d05a5d5d691f7e83baeb Fix using virt-install --file (it's outright broken) diff -r 8a1d27ec3458 -r eae3579380dd virt-install --- a/virt-install Thu Mar 05 09:58:15 2009 -0500 +++ b/virt-install Thu Mar 05 09:59:53 2009 -0500 @@ -168,7 +168,8 @@ if not devtype: devtype = virtinst.VirtualDisk.DEVICE_DISK - ret = (abspath, voltuple, volinst, devtype, bus, ro, shared, size, sparse, cache) + ret = (abspath, voltuple, volinst, devtype, bus, ro, shared, size, sparse, + cache) logging.debug("parse_disk: returning %s" % str(ret)) return ret @@ -178,9 +179,9 @@ # Get disk parameters if is_file_path: (path, voltuple, volinst, device, bus, readOnly, shared, size, - sparse) = \ + sparse, cache) = \ (disk, None, None, virtinst.VirtualDisk.DEVICE_DISK, None, False, - False, size, sparse) + False, size, sparse, None) else: (path, voltuple, volinst, device, bus, readOnly, shared, Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- python-virtinst.spec 4 Mar 2009 16:26:36 -0000 1.57 +++ python-virtinst.spec 5 Mar 2009 15:14:20 -0000 1.58 @@ -11,9 +11,10 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.2 -Release: 2%{_extra_release} +Release: 3%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-update-polish-trans.patch +Patch2: %{appname}-%{version}-fix-file.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,6 +41,7 @@ %prep %setup -q -n %{appname}-%{version} %patch1 -p1 +%patch2 -p1 %build python setup.py build @@ -73,6 +75,9 @@ %{_bindir}/virt-convert %changelog +* Thu Mar 5 2009 Cole Robinson - 0.400.2-3.fc11 +- Fix virt-install --file option (bz 488731) + * Wed Mar 4 2009 Cole Robinson - 0.400.2-2.fc11 - Update polish translation (bz 310781) From itamarjp at fedoraproject.org Thu Mar 5 15:15:42 2009 From: itamarjp at fedoraproject.org (Itamar Reis Peixoto) Date: Thu, 5 Mar 2009 15:15:42 +0000 (UTC) Subject: rpms/bugzilla/devel maxpacket-mysql-3.2.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 bugzilla-rw-paths.patch, 1.2, 1.3 bugzilla.spec, 1.23, 1.24 import.log, 1.1, 1.2 sources, 1.9, 1.10 Message-ID: <20090305151542.21AB770116@cvs1.fedora.phx.redhat.com> Author: itamarjp Update of /cvs/pkgs/rpms/bugzilla/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28703/devel Modified Files: .cvsignore bugzilla-rw-paths.patch bugzilla.spec import.log sources Added Files: maxpacket-mysql-3.2.patch Log Message: bugzilla 3.2.2 maxpacket-mysql-3.2.patch: --- NEW FILE maxpacket-mysql-3.2.patch --- Index: Bugzilla/Config/Attachment.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Config/Attachment.pm,v retrieving revision 1.3.4.2 diff -u -r1.3.4.2 Attachment.pm --- Bugzilla/Config/Attachment.pm 2 Feb 2009 19:12:15 -0000 1.3.4.2 +++ Bugzilla/Config/Attachment.pm 1 Mar 2009 23:56:15 -0000 @@ -74,7 +74,7 @@ name => 'maxattachmentsize', type => 't', default => '1000', - checker => \&check_numeric + checker => \&check_maxattachmentsize }, # The maximum size (in bytes) for patches and non-patch attachments. Index: Bugzilla/Config/Common.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Config/Common.pm,v retrieving revision 1.21 diff -u -r1.21 Common.pm --- Bugzilla/Config/Common.pm 27 Mar 2008 00:23:41 -0000 1.21 +++ Bugzilla/Config/Common.pm 1 Mar 2009 23:56:15 -0000 @@ -50,7 +50,8 @@ check_opsys check_shadowdb check_urlbase check_webdotbase check_netmask check_user_verify_class check_image_converter check_mail_delivery_method check_notification check_timezone check_utf8 - check_bug_status check_smtp_auth + check_bug_status check_smtp_auth + check_maxattachmentsize ); # Checking functions for the various values @@ -320,6 +321,24 @@ return ""; } +sub check_maxattachmentsize { + my $check = check_numeric(@_); + return $check if $check; + my $size = shift; + my $dbh = Bugzilla->dbh; + if ($dbh->isa('Bugzilla::DB::Mysql')) { + my (undef, $max_packet) = $dbh->selectrow_array( + q{SHOW VARIABLES LIKE 'max\_allowed\_packet'}); + my $byte_size = $size * 1024; + if ($max_packet < $byte_size) { + return "You asked for a maxattachmentsize of $byte_size bytes," + . " but the max_allowed_packet setting in MySQL currently" + . " only allows packets up to $max_packet bytes"; + } + } + return ""; +} + sub check_notification { my $option = shift; my @current_version = Index: Bugzilla/DB/Mysql.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/DB/Mysql.pm,v retrieving revision 1.60.2.7 diff -u -r1.60.2.7 Mysql.pm --- Bugzilla/DB/Mysql.pm 7 Nov 2008 00:10:15 -0000 1.60.2.7 +++ Bugzilla/DB/Mysql.pm 1 Mar 2009 23:56:15 -0000 @@ -44,6 +44,7 @@ use strict; use Bugzilla::Constants; +use Bugzilla::Install::Util qw(install_string); use Bugzilla::Util; use Bugzilla::Error; use Bugzilla::DB::Schema::Mysql; @@ -97,20 +98,9 @@ } } - # The "comments" field of the bugs_fulltext table could easily exceed - # MySQL's default max_allowed_packet. Also, MySQL should never have - # a max_allowed_packet smaller than our max_attachment_size. However, - # if we've already set a max_allowed_packet in MySQL bigger than all - # of those, we should keep it. - my (undef, $current_max_allowed) = $self->selectrow_array( - q{SHOW VARIABLES LIKE 'max\_allowed\_packet'}); - my $min_max_allowed_packet = MAX_COMMENTS * MAX_COMMENT_LENGTH; - my $max_allowed_packet = max($min_max_allowed_packet, - $current_max_allowed, - # This parameter is not yet defined when the DB - # is being built for the very first time. - Bugzilla->params->{'maxattachmentsize'} || 0); - $self->do("SET SESSION max_allowed_packet = $max_allowed_packet"); + # Allow large GROUP_CONCATs (largely for inserting comments + # into bugs_fulltext). + $self->do('SET SESSION group_concat_max_len = 128000000'); return $self; } @@ -244,6 +234,24 @@ sub bz_setup_database { my ($self) = @_; + # The "comments" field of the bugs_fulltext table could easily exceed + # MySQL's default max_allowed_packet. Also, MySQL should never have + # a max_allowed_packet smaller than our max_attachment_size. So, we + # warn the user here if max_allowed_packet is too small. + my $min_max_allowed = MAX_COMMENTS * MAX_COMMENT_LENGTH; + my (undef, $current_max_allowed) = $self->selectrow_array( + q{SHOW VARIABLES LIKE 'max\_allowed\_packet'}); + # This parameter is not yet defined when the DB is being built for + # the very first time. The code below still works properly, however, + # because the default maxattachmentsize is smaller than $min_max_allowed. + my $max_attachment = (Bugzilla->params->{'maxattachmentsize'} || 0) * 1024; + my $needed_max_allowed = max($min_max_allowed, $max_attachment); + if ($current_max_allowed < $needed_max_allowed) { + warn install_string('max_allowed_packet', + { current => $current_max_allowed, + needed => $needed_max_allowed }) . "\n"; + } + # Make sure the installation has InnoDB turned on, or we're going to be # doing silly things like making foreign keys on MyISAM tables, which is # hard to fix later. We do this up here because none of the code below Index: Bugzilla/Install/DB.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm,v retrieving revision 1.51.2.2 diff -u -r1.51.2.2 DB.pm --- Bugzilla/Install/DB.pm 27 Aug 2008 15:22:10 -0000 1.51.2.2 +++ Bugzilla/Install/DB.pm 1 Mar 2009 23:56:15 -0000 @@ -3009,11 +3009,6 @@ if (UNIVERSAL::can($dbh, 'sql_group_concat')) { print "Populating bugs_fulltext..."; print " (this can take a long time.)\n"; - # XXX This hack should probably be moved elsewhere. - if ($dbh->isa('Bugzilla::DB::Mysql')) { - $dbh->do('SET SESSION group_concat_max_len = 128000000'); - $dbh->do('SET SESSION max_allowed_packet = 128000000'); - } $dbh->do( q{INSERT INTO bugs_fulltext (bug_id, short_desc, comments, comments_noprivate) Index: docs/en/xml/installation.xml =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/docs/en/xml/installation.xml,v retrieving revision 1.157.2.6 diff -u -r1.157.2.6 installation.xml --- docs/en/xml/installation.xml 8 Jan 2009 23:44:22 -0000 1.157.2.6 +++ docs/en/xml/installation.xml 1 Mar 2009 23:56:15 -0000 @@ -778,6 +778,28 @@ improving your installation's security.     + +
    + Allow large attachments and many comments + + By default, MySQL will only allow you to insert things + into the database that are smaller than 64KB. Attachments + may be larger than this. Also, Bugzilla combines all comments + on a single bug into one field for full-text searching, and the + combination of all comments on a single bug are very likely to + be larger than 64KB. + + To change MySQL's default, you need to edit your MySQL + configuration file, which is usually /etc/my.cnf + on Linux. We recommend that you allow at least 4MB packets by + adding the "max_allowed_packet" parameter to your MySQL + configuration in the "[mysqld]" section, like this: + + [mysqld] +# Allow packets up to 4MB +max_allowed_packet=4M + +
    Allow small words in full-text indexes Index: template/en/default/setup/strings.txt.pl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/setup/strings.txt.pl,v retrieving revision 1.8 diff -u -r1.8 strings.txt.pl --- template/en/default/setup/strings.txt.pl 28 Jan 2008 00:54:59 -0000 1.8 +++ template/en/default/setup/strings.txt.pl 1 Mar 2009 23:56:15 -0000 @@ -52,6 +52,12 @@ EOT install_module => 'Installing ##module## version ##version##...', + max_allowed_packet => < "found v##ver##", module_not_found => "not found", module_ok => 'ok', Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 1 Mar 2009 03:29:19 -0000 1.9 +++ .cvsignore 5 Mar 2009 15:15:11 -0000 1.10 @@ -1 +1 @@ -bugzilla-3.0.8.tar.gz +bugzilla-3.2.2.tar.gz bugzilla-rw-paths.patch: Index: bugzilla-rw-paths.patch =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/devel/bugzilla-rw-paths.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bugzilla-rw-paths.patch 27 Aug 2007 13:17:11 -0000 1.2 +++ bugzilla-rw-paths.patch 5 Mar 2009 15:15:11 -0000 1.3 @@ -1,7 +1,6 @@ -diff -ru bugzilla-orig/Bugzilla/Constants.pm bugzilla-3.0.1/Bugzilla/Constants.pm ---- bugzilla-orig/Bugzilla/Constants.pm 2007-08-23 14:42:23.000000000 -0400 -+++ bugzilla-3.0.1/Bugzilla/Constants.pm 2007-08-27 08:50:50.000000000 -0400 -@@ -423,9 +423,9 @@ +--- bugzilla-3.2.2/Bugzilla/Constants.pm 2009-02-03 10:02:53.000000000 +0000 ++++ bugzilla-3.2.2-rw/Bugzilla/Constants.pm 2009-02-18 17:59:52.000000000 +0000 +@@ -465,9 +465,9 @@ 'cgi_path' => $libpath, 'templatedir' => "$libpath/template", 'project' => $project, @@ -12,9 +11,9 @@ + 'datadir' => "/var/lib/bugzilla/$datadir", + 'attachdir' => "/var/lib/bugzilla/$datadir/attachments", 'skinsdir' => "$libpath/skins", - # $webdotdir must be in the webtree somewhere. Even if you use a + # $webdotdir must be in the web server's tree somewhere. Even if you use a # local dot, we output images to there. Also, if $webdotdir is -@@ -433,8 +433,8 @@ +@@ -475,8 +475,8 @@ # change showdependencygraph.cgi to set image_url to the correct # location. # The script should really generate these graphs directly... @@ -24,4 +23,4 @@ + 'extensionsdir' => "/var/lib/bugzilla/extensions", }; } - + Index: bugzilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/devel/bugzilla.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- bugzilla.spec 1 Mar 2009 03:29:19 -0000 1.23 +++ bugzilla.spec 5 Mar 2009 15:15:11 -0000 1.24 @@ -4,17 +4,19 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.0.8 +Version: 3.2.2 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf Source2: README.fedora.bugzilla Patch0: bugzilla-rw-paths.patch +Patch1: maxpacket-mysql-3.2.patch +# patch1 from https://bugzilla.mozilla.org/show_bug.cgi?id=480001 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: webserver, patchutils, mod_perl, perl-SOAP-Lite, which +Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), which %package doc Summary: Bugzilla documentation @@ -23,11 +25,13 @@ %package contrib Summary: Bugzilla contributed scripts Group: Applications/Publishing +BuildRequires: python %description -Bugzilla is a popular bug tracking system used by multiple open source -projects. It requires a database engine installed - either MySQL or -PostgreSQL. Without one of these database engines, Bugzilla will not work. +Bugzilla is a popular bug tracking system used by multiple open source projects +It requires a database engine installed - either MySQL, PostgreSQL or Oracle. +Without one of these database engines (local or remote), Bugzilla will not work +- see the Release Notes for details. %description doc Documentation distributed with the Bugzilla bug tracking system @@ -38,14 +42,18 @@ %prep %setup -q -n %{name}-%{version} %patch0 -p1 +%patch1 -p0 -# Filter unwanted Requires: +# Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl: +# create a wrapper script which runs the original perl_requires +# command and strips some of the output cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ - sed -e '/perl(globals.pl)/d;/perl(BugzillaEmail)/d' +sed -e '/perl(Authen::Radius)/d;/perl(DBD::Pg)/d;/perl(DBD::Oracle)/d;/perl(sanitycheck.cgi)/d' EOF +# use that wrapper script instead of the original perl_requires script %define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req chmod +x %{__perl_requires} @@ -101,7 +109,6 @@ %defattr(-,root,root,-) %dir %{bzinstallprefix}/bugzilla %{bzinstallprefix}/bugzilla/*.cgi -%{bzinstallprefix}/bugzilla/*.js %{bzinstallprefix}/bugzilla/*.pl %{bzinstallprefix}/bugzilla/Bugzilla.pm %{bzinstallprefix}/bugzilla/bugzilla.dtd @@ -113,6 +120,8 @@ %{bzinstallprefix}/bugzilla/skins %{bzinstallprefix}/bugzilla/t %{bzinstallprefix}/bugzilla/template +%{bzinstallprefix}/bugzilla/extensions/example +%{bzinstallprefix}/bugzilla/lib/README %{bzinstallprefix}/bugzilla/cron.daily %{bzinstallprefix}/bugzilla/cron.whine %ghost %{bzinstallprefix}/bugzilla/bugzilla-req @@ -136,11 +145,24 @@ %{bzinstallprefix}/bugzilla/contrib %changelog +* Thu Mar 05 2009 Itamar Reis Peixoto 3.2.2-2 +- fix from BZ #474250 Comment #16, from Chris Eveleigh --> +- add python BR for contrib subpackage +- fix description +- change Requires perl-SOAP-Lite to perl(SOAP::Lite) according guidelines + +* Sun Mar 01 2009 Itamar Reis Peixoto 3.2.2-1 +- thanks to Chris Eveleigh +- for contributing with patches :-) +- Upgrade to upstream 3.2.2 to fix multiple security vulns +- Removed old perl_requires exclusions, added new ones for RADIUS, Oracle and sanitycheck.cgi +- Added Oracle to supported DBs in description (and moved line breaks) +- Include a patch to fix max_allowed_packet warnin when using with mysql + * Sat Feb 28 2009 Itamar Reis Peixoto 3.0.8-1 - Upgrade to 3.0.8, fix #466077 #438080 - fix macro in changelog rpmlint warning -- fix files-attr-not-set rpmlint warning for doc and contrib sub-packages - +- fix files-attr-not-set rpmlint warning for doc and contrib sub-packages * Mon Feb 23 2009 Fedora Release Engineering - 3.0.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -155,7 +177,7 @@ * Fri May 9 2008 John Berninger - 3.0.4-1 - Update to upstream 3.0.4 to fix multiple security vulns -- Change perms on /etc/bugzilla for bz 427981 +- Change perms on /etc/bugzilla for bz 427981 * Sun May 4 2008 John Berninger - 3.0.3-0 - Update to upstream 3.0.3 - bz 444669 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Mar 2009 03:29:19 -0000 1.1 +++ import.log 5 Mar 2009 15:15:11 -0000 1.2 @@ -1 +1,2 @@ bugzilla-3_0_8-1_fc11:HEAD:bugzilla-3.0.8-1.fc11.src.rpm:1235878106 +bugzilla-3_2_2-2_fc10:HEAD:bugzilla-3.2.2-2.fc10.src.rpm:1236265998 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 1 Mar 2009 03:29:19 -0000 1.9 +++ sources 5 Mar 2009 15:15:11 -0000 1.10 @@ -1 +1 @@ -fff5060b85bc50a40ea5f5de0f7b17b0 bugzilla-3.0.8.tar.gz +ad9eca21b6bafdd7a9a34e4c1b55281e bugzilla-3.2.2.tar.gz From rcritten at fedoraproject.org Thu Mar 5 15:22:50 2009 From: rcritten at fedoraproject.org (Robert Crittenden) Date: Thu, 5 Mar 2009 15:22:50 +0000 (UTC) Subject: rpms/mod_nss/devel mod_nss-wouldblock.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 mod_nss.spec, 1.15, 1.16 sources, 1.6, 1.7 mod_nss-fips.patch, 1.2, NONE mod_nss-inherit.patch, 1.1, NONE mod_nss-kill.patch, 1.1, NONE mod_nss-nofork.patch, 1.1, NONE Message-ID: <20090305152250.7113B70116@cvs1.fedora.phx.redhat.com> Author: rcritten Update of /cvs/extras/rpms/mod_nss/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29957 Modified Files: .cvsignore mod_nss.spec sources Added Files: mod_nss-wouldblock.patch Removed Files: mod_nss-fips.patch mod_nss-inherit.patch mod_nss-kill.patch mod_nss-nofork.patch Log Message: Update to 1.0.8 Add patch that fixes NSPR layer bug mod_nss-wouldblock.patch: --- NEW FILE mod_nss-wouldblock.patch --- --- mod_nss-1.0.3.orig/nss_engine_io.c 2006-04-07 16:17:12.000000000 -0400 +++ mod_nss-1.0.3/nss_engine_io.c 2009-02-17 22:51:44.000000000 -0500 @@ -259,7 +259,8 @@ */ if (APR_STATUS_IS_EAGAIN(inctx->rc) || APR_STATUS_IS_EINTR(inctx->rc) || (inctx->rc == APR_SUCCESS && APR_BRIGADE_EMPTY(inctx->bb))) { - return 0; + PR_SetError(PR_WOULD_BLOCK_ERROR, 0); + return -1; } if (inctx->rc != APR_SUCCESS) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_nss/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Oct 2007 18:57:58 -0000 1.6 +++ .cvsignore 5 Mar 2009 15:22:19 -0000 1.7 @@ -1,2 +1 @@ -mod_nss-1.0.7.tar.gz -mod_nss-proxy.patch +mod_nss-1.0.8.tar.gz Index: mod_nss.spec =================================================================== RCS file: /cvs/extras/rpms/mod_nss/devel/mod_nss.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mod_nss.spec 26 Feb 2009 02:08:54 -0000 1.15 +++ mod_nss.spec 5 Mar 2009 15:22:20 -0000 1.16 @@ -1,8 +1,6 @@ -%define _default_patch_fuzz 2 - Name: mod_nss -Version: 1.0.7 -Release: 11%{?dist} +Version: 1.0.8 +Release: 1%{?dist} Summary: SSL/TLS module for the Apache HTTP server Group: System Environment/Daemons License: ASL 2.0 @@ -15,11 +13,7 @@ Requires: httpd >= 0:2.0.52 Patch1: mod_nss-conf.patch Patch2: mod_nss-gencert.patch -Patch3: mod_nss-proxy.patch -Patch4: mod_nss-nofork.patch -Patch5: mod_nss-fips.patch -Patch6: mod_nss-inherit.patch -Patch7: mod_nss-kill.patch +Patch3: mod_nss-wouldblock.patch %description The mod_nss module provides strong cryptography for the Apache Web @@ -31,11 +25,7 @@ %setup -q %patch1 -p1 -b .conf %patch2 -p1 -b .gencert -%patch3 -p1 -b .proxy -%patch4 -p1 -b .nofork -%patch5 -p1 -b .fips -%patch6 -p1 -b .inherit -%patch7 -p1 -b .kill +%patch3 -p1 -b .wouldblock # Touch expression parser sources to prevent regenerating it touch nss_expr_*.[chyl] @@ -120,6 +110,10 @@ %{_sbindir}/gencert %changelog +* Mon Mar 2 2009 Rob Crittenden - 1.0.8-1 +- Update to 1.0.8 +- Add patch that fixes NSPR layer bug + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.7-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_nss/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Oct 2007 18:57:58 -0000 1.6 +++ sources 5 Mar 2009 15:22:20 -0000 1.7 @@ -1,2 +1 @@ -71107cbc702bf07c6c79843aa92a0e09 mod_nss-1.0.7.tar.gz -d822102fe6b4a76beeb81e86c4ce2f80 mod_nss-proxy.patch +32458d91ce909260a6081cce58004e2f mod_nss-1.0.8.tar.gz --- mod_nss-fips.patch DELETED --- --- mod_nss-inherit.patch DELETED --- --- mod_nss-kill.patch DELETED --- --- mod_nss-nofork.patch DELETED --- From itamarjp at fedoraproject.org Thu Mar 5 15:23:16 2009 From: itamarjp at fedoraproject.org (Itamar Reis Peixoto) Date: Thu, 5 Mar 2009 15:23:16 +0000 (UTC) Subject: rpms/bugzilla/F-10 maxpacket-mysql-3.2.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 bugzilla-rw-paths.patch, 1.2, 1.3 bugzilla.spec, 1.21, 1.22 import.log, 1.1, 1.2 sources, 1.9, 1.10 Message-ID: <20090305152316.5501970116@cvs1.fedora.phx.redhat.com> Author: itamarjp Update of /cvs/pkgs/rpms/bugzilla/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29938/F-10 Modified Files: .cvsignore bugzilla-rw-paths.patch bugzilla.spec import.log sources Added Files: maxpacket-mysql-3.2.patch Log Message: bugzilla version 3.2.2bugzilla version 3.2.2bugzilla version 3.2.2 maxpacket-mysql-3.2.patch: --- NEW FILE maxpacket-mysql-3.2.patch --- Index: Bugzilla/Config/Attachment.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Config/Attachment.pm,v retrieving revision 1.3.4.2 diff -u -r1.3.4.2 Attachment.pm --- Bugzilla/Config/Attachment.pm 2 Feb 2009 19:12:15 -0000 1.3.4.2 +++ Bugzilla/Config/Attachment.pm 1 Mar 2009 23:56:15 -0000 @@ -74,7 +74,7 @@ name => 'maxattachmentsize', type => 't', default => '1000', - checker => \&check_numeric + checker => \&check_maxattachmentsize }, # The maximum size (in bytes) for patches and non-patch attachments. Index: Bugzilla/Config/Common.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Config/Common.pm,v retrieving revision 1.21 diff -u -r1.21 Common.pm --- Bugzilla/Config/Common.pm 27 Mar 2008 00:23:41 -0000 1.21 +++ Bugzilla/Config/Common.pm 1 Mar 2009 23:56:15 -0000 @@ -50,7 +50,8 @@ check_opsys check_shadowdb check_urlbase check_webdotbase check_netmask check_user_verify_class check_image_converter check_mail_delivery_method check_notification check_timezone check_utf8 - check_bug_status check_smtp_auth + check_bug_status check_smtp_auth + check_maxattachmentsize ); # Checking functions for the various values @@ -320,6 +321,24 @@ return ""; } +sub check_maxattachmentsize { + my $check = check_numeric(@_); + return $check if $check; + my $size = shift; + my $dbh = Bugzilla->dbh; + if ($dbh->isa('Bugzilla::DB::Mysql')) { + my (undef, $max_packet) = $dbh->selectrow_array( + q{SHOW VARIABLES LIKE 'max\_allowed\_packet'}); + my $byte_size = $size * 1024; + if ($max_packet < $byte_size) { + return "You asked for a maxattachmentsize of $byte_size bytes," + . " but the max_allowed_packet setting in MySQL currently" + . " only allows packets up to $max_packet bytes"; + } + } + return ""; +} + sub check_notification { my $option = shift; my @current_version = Index: Bugzilla/DB/Mysql.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/DB/Mysql.pm,v retrieving revision 1.60.2.7 diff -u -r1.60.2.7 Mysql.pm --- Bugzilla/DB/Mysql.pm 7 Nov 2008 00:10:15 -0000 1.60.2.7 +++ Bugzilla/DB/Mysql.pm 1 Mar 2009 23:56:15 -0000 @@ -44,6 +44,7 @@ use strict; use Bugzilla::Constants; +use Bugzilla::Install::Util qw(install_string); use Bugzilla::Util; use Bugzilla::Error; use Bugzilla::DB::Schema::Mysql; @@ -97,20 +98,9 @@ } } - # The "comments" field of the bugs_fulltext table could easily exceed - # MySQL's default max_allowed_packet. Also, MySQL should never have - # a max_allowed_packet smaller than our max_attachment_size. However, - # if we've already set a max_allowed_packet in MySQL bigger than all - # of those, we should keep it. - my (undef, $current_max_allowed) = $self->selectrow_array( - q{SHOW VARIABLES LIKE 'max\_allowed\_packet'}); - my $min_max_allowed_packet = MAX_COMMENTS * MAX_COMMENT_LENGTH; - my $max_allowed_packet = max($min_max_allowed_packet, - $current_max_allowed, - # This parameter is not yet defined when the DB - # is being built for the very first time. - Bugzilla->params->{'maxattachmentsize'} || 0); - $self->do("SET SESSION max_allowed_packet = $max_allowed_packet"); + # Allow large GROUP_CONCATs (largely for inserting comments + # into bugs_fulltext). + $self->do('SET SESSION group_concat_max_len = 128000000'); return $self; } @@ -244,6 +234,24 @@ sub bz_setup_database { my ($self) = @_; + # The "comments" field of the bugs_fulltext table could easily exceed + # MySQL's default max_allowed_packet. Also, MySQL should never have + # a max_allowed_packet smaller than our max_attachment_size. So, we + # warn the user here if max_allowed_packet is too small. + my $min_max_allowed = MAX_COMMENTS * MAX_COMMENT_LENGTH; + my (undef, $current_max_allowed) = $self->selectrow_array( + q{SHOW VARIABLES LIKE 'max\_allowed\_packet'}); + # This parameter is not yet defined when the DB is being built for + # the very first time. The code below still works properly, however, + # because the default maxattachmentsize is smaller than $min_max_allowed. + my $max_attachment = (Bugzilla->params->{'maxattachmentsize'} || 0) * 1024; + my $needed_max_allowed = max($min_max_allowed, $max_attachment); + if ($current_max_allowed < $needed_max_allowed) { + warn install_string('max_allowed_packet', + { current => $current_max_allowed, + needed => $needed_max_allowed }) . "\n"; + } + # Make sure the installation has InnoDB turned on, or we're going to be # doing silly things like making foreign keys on MyISAM tables, which is # hard to fix later. We do this up here because none of the code below Index: Bugzilla/Install/DB.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm,v retrieving revision 1.51.2.2 diff -u -r1.51.2.2 DB.pm --- Bugzilla/Install/DB.pm 27 Aug 2008 15:22:10 -0000 1.51.2.2 +++ Bugzilla/Install/DB.pm 1 Mar 2009 23:56:15 -0000 @@ -3009,11 +3009,6 @@ if (UNIVERSAL::can($dbh, 'sql_group_concat')) { print "Populating bugs_fulltext..."; print " (this can take a long time.)\n"; - # XXX This hack should probably be moved elsewhere. - if ($dbh->isa('Bugzilla::DB::Mysql')) { - $dbh->do('SET SESSION group_concat_max_len = 128000000'); - $dbh->do('SET SESSION max_allowed_packet = 128000000'); - } $dbh->do( q{INSERT INTO bugs_fulltext (bug_id, short_desc, comments, comments_noprivate) Index: docs/en/xml/installation.xml =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/docs/en/xml/installation.xml,v retrieving revision 1.157.2.6 diff -u -r1.157.2.6 installation.xml --- docs/en/xml/installation.xml 8 Jan 2009 23:44:22 -0000 1.157.2.6 +++ docs/en/xml/installation.xml 1 Mar 2009 23:56:15 -0000 @@ -778,6 +778,28 @@ improving your installation's security. + +
    + Allow large attachments and many comments + + By default, MySQL will only allow you to insert things + into the database that are smaller than 64KB. Attachments + may be larger than this. Also, Bugzilla combines all comments + on a single bug into one field for full-text searching, and the + combination of all comments on a single bug are very likely to + be larger than 64KB. + + To change MySQL's default, you need to edit your MySQL + configuration file, which is usually /etc/my.cnf + on Linux. We recommend that you allow at least 4MB packets by + adding the "max_allowed_packet" parameter to your MySQL + configuration in the "[mysqld]" section, like this: + + [mysqld] +# Allow packets up to 4MB +max_allowed_packet=4M + +
    Allow small words in full-text indexes Index: template/en/default/setup/strings.txt.pl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/setup/strings.txt.pl,v retrieving revision 1.8 diff -u -r1.8 strings.txt.pl --- template/en/default/setup/strings.txt.pl 28 Jan 2008 00:54:59 -0000 1.8 +++ template/en/default/setup/strings.txt.pl 1 Mar 2009 23:56:15 -0000 @@ -52,6 +52,12 @@ EOT install_module => 'Installing ##module## version ##version##...', + max_allowed_packet => < "found v##ver##", module_not_found => "not found", module_ok => 'ok', Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-10/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 1 Mar 2009 03:31:42 -0000 1.9 +++ .cvsignore 5 Mar 2009 15:22:45 -0000 1.10 @@ -1 +1 @@ -bugzilla-3.0.8.tar.gz +bugzilla-3.2.2.tar.gz bugzilla-rw-paths.patch: Index: bugzilla-rw-paths.patch =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-10/bugzilla-rw-paths.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bugzilla-rw-paths.patch 27 Aug 2007 13:17:11 -0000 1.2 +++ bugzilla-rw-paths.patch 5 Mar 2009 15:22:45 -0000 1.3 @@ -1,7 +1,6 @@ -diff -ru bugzilla-orig/Bugzilla/Constants.pm bugzilla-3.0.1/Bugzilla/Constants.pm ---- bugzilla-orig/Bugzilla/Constants.pm 2007-08-23 14:42:23.000000000 -0400 -+++ bugzilla-3.0.1/Bugzilla/Constants.pm 2007-08-27 08:50:50.000000000 -0400 -@@ -423,9 +423,9 @@ +--- bugzilla-3.2.2/Bugzilla/Constants.pm 2009-02-03 10:02:53.000000000 +0000 ++++ bugzilla-3.2.2-rw/Bugzilla/Constants.pm 2009-02-18 17:59:52.000000000 +0000 +@@ -465,9 +465,9 @@ 'cgi_path' => $libpath, 'templatedir' => "$libpath/template", 'project' => $project, @@ -12,9 +11,9 @@ + 'datadir' => "/var/lib/bugzilla/$datadir", + 'attachdir' => "/var/lib/bugzilla/$datadir/attachments", 'skinsdir' => "$libpath/skins", - # $webdotdir must be in the webtree somewhere. Even if you use a + # $webdotdir must be in the web server's tree somewhere. Even if you use a # local dot, we output images to there. Also, if $webdotdir is -@@ -433,8 +433,8 @@ +@@ -475,8 +475,8 @@ # change showdependencygraph.cgi to set image_url to the correct # location. # The script should really generate these graphs directly... @@ -24,4 +23,4 @@ + 'extensionsdir' => "/var/lib/bugzilla/extensions", }; } - + Index: bugzilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-10/bugzilla.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- bugzilla.spec 1 Mar 2009 03:31:42 -0000 1.21 +++ bugzilla.spec 5 Mar 2009 15:22:45 -0000 1.22 @@ -4,17 +4,19 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.0.8 +Version: 3.2.2 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf Source2: README.fedora.bugzilla Patch0: bugzilla-rw-paths.patch +Patch1: maxpacket-mysql-3.2.patch +# patch1 from https://bugzilla.mozilla.org/show_bug.cgi?id=480001 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: webserver, patchutils, mod_perl, perl-SOAP-Lite, which +Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), which %package doc Summary: Bugzilla documentation @@ -23,11 +25,13 @@ %package contrib Summary: Bugzilla contributed scripts Group: Applications/Publishing +BuildRequires: python %description -Bugzilla is a popular bug tracking system used by multiple open source -projects. It requires a database engine installed - either MySQL or -PostgreSQL. Without one of these database engines, Bugzilla will not work. +Bugzilla is a popular bug tracking system used by multiple open source projects +It requires a database engine installed - either MySQL, PostgreSQL or Oracle. +Without one of these database engines (local or remote), Bugzilla will not work +- see the Release Notes for details. %description doc Documentation distributed with the Bugzilla bug tracking system @@ -38,14 +42,18 @@ %prep %setup -q -n %{name}-%{version} %patch0 -p1 +%patch1 -p0 -# Filter unwanted Requires: +# Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl: +# create a wrapper script which runs the original perl_requires +# command and strips some of the output cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ - sed -e '/perl(globals.pl)/d;/perl(BugzillaEmail)/d' +sed -e '/perl(Authen::Radius)/d;/perl(DBD::Pg)/d;/perl(DBD::Oracle)/d;/perl(sanitycheck.cgi)/d' EOF +# use that wrapper script instead of the original perl_requires script %define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req chmod +x %{__perl_requires} @@ -101,7 +109,6 @@ %defattr(-,root,root,-) %dir %{bzinstallprefix}/bugzilla %{bzinstallprefix}/bugzilla/*.cgi -%{bzinstallprefix}/bugzilla/*.js %{bzinstallprefix}/bugzilla/*.pl %{bzinstallprefix}/bugzilla/Bugzilla.pm %{bzinstallprefix}/bugzilla/bugzilla.dtd @@ -113,6 +120,8 @@ %{bzinstallprefix}/bugzilla/skins %{bzinstallprefix}/bugzilla/t %{bzinstallprefix}/bugzilla/template +%{bzinstallprefix}/bugzilla/extensions/example +%{bzinstallprefix}/bugzilla/lib/README %{bzinstallprefix}/bugzilla/cron.daily %{bzinstallprefix}/bugzilla/cron.whine %ghost %{bzinstallprefix}/bugzilla/bugzilla-req @@ -136,11 +145,24 @@ %{bzinstallprefix}/bugzilla/contrib %changelog +* Thu Mar 05 2009 Itamar Reis Peixoto 3.2.2-2 +- fix from BZ #474250 Comment #16, from Chris Eveleigh --> +- add python BR for contrib subpackage +- fix description +- change Requires perl-SOAP-Lite to perl(SOAP::Lite) according guidelines + +* Sun Mar 01 2009 Itamar Reis Peixoto 3.2.2-1 +- thanks to Chris Eveleigh +- for contributing with patches :-) +- Upgrade to upstream 3.2.2 to fix multiple security vulns +- Removed old perl_requires exclusions, added new ones for RADIUS, Oracle and sanitycheck.cgi +- Added Oracle to supported DBs in description (and moved line breaks) +- Include a patch to fix max_allowed_packet warnin when using with mysql + * Sat Feb 28 2009 Itamar Reis Peixoto 3.0.8-1 - Upgrade to 3.0.8, fix #466077 #438080 - fix macro in changelog rpmlint warning -- fix files-attr-not-set rpmlint warning for doc and contrib sub-packages - +- fix files-attr-not-set rpmlint warning for doc and contrib sub-packages * Mon Feb 23 2009 Fedora Release Engineering - 3.0.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -155,7 +177,7 @@ * Fri May 9 2008 John Berninger - 3.0.4-1 - Update to upstream 3.0.4 to fix multiple security vulns -- Change perms on /etc/bugzilla for bz 427981 +- Change perms on /etc/bugzilla for bz 427981 * Sun May 4 2008 John Berninger - 3.0.3-0 - Update to upstream 3.0.3 - bz 444669 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Mar 2009 03:31:42 -0000 1.1 +++ import.log 5 Mar 2009 15:22:45 -0000 1.2 @@ -1 +1,2 @@ bugzilla-3_0_8-1_fc11:F-10:bugzilla-3.0.8-1.fc11.src.rpm:1235878257 +bugzilla-3_2_2-2_fc10:F-10:bugzilla-3.2.2-2.fc10.src.rpm:1236266484 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-10/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 1 Mar 2009 03:31:42 -0000 1.9 +++ sources 5 Mar 2009 15:22:45 -0000 1.10 @@ -1 +1 @@ -fff5060b85bc50a40ea5f5de0f7b17b0 bugzilla-3.0.8.tar.gz +ad9eca21b6bafdd7a9a34e4c1b55281e bugzilla-3.2.2.tar.gz From crobinso at fedoraproject.org Thu Mar 5 15:25:17 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Thu, 5 Mar 2009 15:25:17 +0000 (UTC) Subject: rpms/python-virtinst/F-9 virtinst-0.400.2-fix-file.patch, NONE, 1.1 python-virtinst.spec, 1.46, 1.47 Message-ID: <20090305152517.3919070116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30413 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.2-fix-file.patch Log Message: Fix virt-install --file option (bz 488731) virtinst-0.400.2-fix-file.patch: --- NEW FILE virtinst-0.400.2-fix-file.patch --- # HG changeset patch # User Cole Robinson # Date 1236265193 18000 # Node ID eae3579380dd2112393e0011c1b3212243c39d94 # Parent 8a1d27ec3458e1639f01d05a5d5d691f7e83baeb Fix using virt-install --file (it's outright broken) diff -r 8a1d27ec3458 -r eae3579380dd virt-install --- a/virt-install Thu Mar 05 09:58:15 2009 -0500 +++ b/virt-install Thu Mar 05 09:59:53 2009 -0500 @@ -168,7 +168,8 @@ if not devtype: devtype = virtinst.VirtualDisk.DEVICE_DISK - ret = (abspath, voltuple, volinst, devtype, bus, ro, shared, size, sparse, cache) + ret = (abspath, voltuple, volinst, devtype, bus, ro, shared, size, sparse, + cache) logging.debug("parse_disk: returning %s" % str(ret)) return ret @@ -178,9 +179,9 @@ # Get disk parameters if is_file_path: (path, voltuple, volinst, device, bus, readOnly, shared, size, - sparse) = \ + sparse, cache) = \ (disk, None, None, virtinst.VirtualDisk.DEVICE_DISK, None, False, - False, size, sparse) + False, size, sparse, None) else: (path, voltuple, volinst, device, bus, readOnly, shared, Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-9/python-virtinst.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- python-virtinst.spec 4 Mar 2009 17:44:06 -0000 1.46 +++ python-virtinst.spec 5 Mar 2009 15:24:46 -0000 1.47 @@ -11,9 +11,10 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.2 -Release: 1%{_extra_release} +Release: 2%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-update-polish-trans.patch +Patch2: %{appname}-%{version}-fix-file.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,6 +41,7 @@ %prep %setup -q -n %{appname}-%{version} %patch1 -p1 +%patch2 -p1 %build python setup.py build @@ -73,6 +75,9 @@ %{_bindir}/virt-convert %changelog +* Thu Mar 5 2009 Cole Robinson - 0.400.2-2.fc9 +- Fix virt-install --file option (bz 488731) + * Wed Mar 4 2009 Cole Robinson - 0.400.2-1.fc9 - Update to version 0.400.2 - virt-install --import option for creating a guest from an existing disk From crobinso at fedoraproject.org Thu Mar 5 15:26:43 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Thu, 5 Mar 2009 15:26:43 +0000 (UTC) Subject: rpms/python-virtinst/F-10 virtinst-0.400.2-fix-file.patch, NONE, 1.1 python-virtinst.spec, 1.51, 1.52 Message-ID: <20090305152643.B207E70116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30862 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.2-fix-file.patch Log Message: Fix virt-install --file option (bz 488731) virtinst-0.400.2-fix-file.patch: --- NEW FILE virtinst-0.400.2-fix-file.patch --- # HG changeset patch # User Cole Robinson # Date 1236265193 18000 # Node ID eae3579380dd2112393e0011c1b3212243c39d94 # Parent 8a1d27ec3458e1639f01d05a5d5d691f7e83baeb Fix using virt-install --file (it's outright broken) diff -r 8a1d27ec3458 -r eae3579380dd virt-install --- a/virt-install Thu Mar 05 09:58:15 2009 -0500 +++ b/virt-install Thu Mar 05 09:59:53 2009 -0500 @@ -168,7 +168,8 @@ if not devtype: devtype = virtinst.VirtualDisk.DEVICE_DISK - ret = (abspath, voltuple, volinst, devtype, bus, ro, shared, size, sparse, cache) + ret = (abspath, voltuple, volinst, devtype, bus, ro, shared, size, sparse, + cache) logging.debug("parse_disk: returning %s" % str(ret)) return ret @@ -178,9 +179,9 @@ # Get disk parameters if is_file_path: (path, voltuple, volinst, device, bus, readOnly, shared, size, - sparse) = \ + sparse, cache) = \ (disk, None, None, virtinst.VirtualDisk.DEVICE_DISK, None, False, - False, size, sparse) + False, size, sparse, None) else: (path, voltuple, volinst, device, bus, readOnly, shared, Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/python-virtinst.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- python-virtinst.spec 4 Mar 2009 16:28:31 -0000 1.51 +++ python-virtinst.spec 5 Mar 2009 15:26:13 -0000 1.52 @@ -11,9 +11,10 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.2 -Release: 1%{_extra_release} +Release: 2%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-update-polish-trans.patch +Patch2: %{appname}-%{version}-fix-file.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,6 +41,7 @@ %prep %setup -q -n %{appname}-%{version} %patch1 -p1 +%patch2 -p1 %build python setup.py build @@ -73,6 +75,9 @@ %{_bindir}/virt-convert %changelog +* Thu Mar 5 2009 Cole Robinson - 0.400.2-2.fc10 +- Fix virt-install --file option (bz 488731) + * Wed Mar 4 2009 Cole Robinson - 0.400.2-1.fc10 - Update to version 0.400.2 - virt-install --import option for creating a guest from an existing disk From itamarjp at fedoraproject.org Thu Mar 5 15:26:52 2009 From: itamarjp at fedoraproject.org (Itamar Reis Peixoto) Date: Thu, 5 Mar 2009 15:26:52 +0000 (UTC) Subject: rpms/bugzilla/F-9 maxpacket-mysql-3.2.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 bugzilla-rw-paths.patch, 1.2, 1.3 bugzilla.spec, 1.19, 1.20 import.log, 1.1, 1.2 sources, 1.8, 1.9 Message-ID: <20090305152652.6695570116@cvs1.fedora.phx.redhat.com> Author: itamarjp Update of /cvs/pkgs/rpms/bugzilla/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30837/F-9 Modified Files: .cvsignore bugzilla-rw-paths.patch bugzilla.spec import.log sources Added Files: maxpacket-mysql-3.2.patch Log Message: bugzilla 3.2.2 maxpacket-mysql-3.2.patch: --- NEW FILE maxpacket-mysql-3.2.patch --- Index: Bugzilla/Config/Attachment.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Config/Attachment.pm,v retrieving revision 1.3.4.2 diff -u -r1.3.4.2 Attachment.pm --- Bugzilla/Config/Attachment.pm 2 Feb 2009 19:12:15 -0000 1.3.4.2 +++ Bugzilla/Config/Attachment.pm 1 Mar 2009 23:56:15 -0000 @@ -74,7 +74,7 @@ name => 'maxattachmentsize', type => 't', default => '1000', - checker => \&check_numeric + checker => \&check_maxattachmentsize }, # The maximum size (in bytes) for patches and non-patch attachments. Index: Bugzilla/Config/Common.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Config/Common.pm,v retrieving revision 1.21 diff -u -r1.21 Common.pm --- Bugzilla/Config/Common.pm 27 Mar 2008 00:23:41 -0000 1.21 +++ Bugzilla/Config/Common.pm 1 Mar 2009 23:56:15 -0000 @@ -50,7 +50,8 @@ check_opsys check_shadowdb check_urlbase check_webdotbase check_netmask check_user_verify_class check_image_converter check_mail_delivery_method check_notification check_timezone check_utf8 - check_bug_status check_smtp_auth + check_bug_status check_smtp_auth + check_maxattachmentsize ); # Checking functions for the various values @@ -320,6 +321,24 @@ return ""; } +sub check_maxattachmentsize { + my $check = check_numeric(@_); + return $check if $check; + my $size = shift; + my $dbh = Bugzilla->dbh; + if ($dbh->isa('Bugzilla::DB::Mysql')) { + my (undef, $max_packet) = $dbh->selectrow_array( + q{SHOW VARIABLES LIKE 'max\_allowed\_packet'}); + my $byte_size = $size * 1024; + if ($max_packet < $byte_size) { + return "You asked for a maxattachmentsize of $byte_size bytes," + . " but the max_allowed_packet setting in MySQL currently" + . " only allows packets up to $max_packet bytes"; + } + } + return ""; +} + sub check_notification { my $option = shift; my @current_version = Index: Bugzilla/DB/Mysql.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/DB/Mysql.pm,v retrieving revision 1.60.2.7 diff -u -r1.60.2.7 Mysql.pm --- Bugzilla/DB/Mysql.pm 7 Nov 2008 00:10:15 -0000 1.60.2.7 +++ Bugzilla/DB/Mysql.pm 1 Mar 2009 23:56:15 -0000 @@ -44,6 +44,7 @@ use strict; use Bugzilla::Constants; +use Bugzilla::Install::Util qw(install_string); use Bugzilla::Util; use Bugzilla::Error; use Bugzilla::DB::Schema::Mysql; @@ -97,20 +98,9 @@ } } - # The "comments" field of the bugs_fulltext table could easily exceed - # MySQL's default max_allowed_packet. Also, MySQL should never have - # a max_allowed_packet smaller than our max_attachment_size. However, - # if we've already set a max_allowed_packet in MySQL bigger than all - # of those, we should keep it. - my (undef, $current_max_allowed) = $self->selectrow_array( - q{SHOW VARIABLES LIKE 'max\_allowed\_packet'}); - my $min_max_allowed_packet = MAX_COMMENTS * MAX_COMMENT_LENGTH; - my $max_allowed_packet = max($min_max_allowed_packet, - $current_max_allowed, - # This parameter is not yet defined when the DB - # is being built for the very first time. - Bugzilla->params->{'maxattachmentsize'} || 0); - $self->do("SET SESSION max_allowed_packet = $max_allowed_packet"); + # Allow large GROUP_CONCATs (largely for inserting comments + # into bugs_fulltext). + $self->do('SET SESSION group_concat_max_len = 128000000'); return $self; } @@ -244,6 +234,24 @@ sub bz_setup_database { my ($self) = @_; + # The "comments" field of the bugs_fulltext table could easily exceed + # MySQL's default max_allowed_packet. Also, MySQL should never have + # a max_allowed_packet smaller than our max_attachment_size. So, we + # warn the user here if max_allowed_packet is too small. + my $min_max_allowed = MAX_COMMENTS * MAX_COMMENT_LENGTH; + my (undef, $current_max_allowed) = $self->selectrow_array( + q{SHOW VARIABLES LIKE 'max\_allowed\_packet'}); + # This parameter is not yet defined when the DB is being built for + # the very first time. The code below still works properly, however, + # because the default maxattachmentsize is smaller than $min_max_allowed. + my $max_attachment = (Bugzilla->params->{'maxattachmentsize'} || 0) * 1024; + my $needed_max_allowed = max($min_max_allowed, $max_attachment); + if ($current_max_allowed < $needed_max_allowed) { + warn install_string('max_allowed_packet', + { current => $current_max_allowed, + needed => $needed_max_allowed }) . "\n"; + } + # Make sure the installation has InnoDB turned on, or we're going to be # doing silly things like making foreign keys on MyISAM tables, which is # hard to fix later. We do this up here because none of the code below Index: Bugzilla/Install/DB.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm,v retrieving revision 1.51.2.2 diff -u -r1.51.2.2 DB.pm --- Bugzilla/Install/DB.pm 27 Aug 2008 15:22:10 -0000 1.51.2.2 +++ Bugzilla/Install/DB.pm 1 Mar 2009 23:56:15 -0000 @@ -3009,11 +3009,6 @@ if (UNIVERSAL::can($dbh, 'sql_group_concat')) { print "Populating bugs_fulltext..."; print " (this can take a long time.)\n"; - # XXX This hack should probably be moved elsewhere. - if ($dbh->isa('Bugzilla::DB::Mysql')) { - $dbh->do('SET SESSION group_concat_max_len = 128000000'); - $dbh->do('SET SESSION max_allowed_packet = 128000000'); - } $dbh->do( q{INSERT INTO bugs_fulltext (bug_id, short_desc, comments, comments_noprivate) Index: docs/en/xml/installation.xml =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/docs/en/xml/installation.xml,v retrieving revision 1.157.2.6 diff -u -r1.157.2.6 installation.xml --- docs/en/xml/installation.xml 8 Jan 2009 23:44:22 -0000 1.157.2.6 +++ docs/en/xml/installation.xml 1 Mar 2009 23:56:15 -0000 @@ -778,6 +778,28 @@ improving your installation's security. + +
    + Allow large attachments and many comments + + By default, MySQL will only allow you to insert things + into the database that are smaller than 64KB. Attachments + may be larger than this. Also, Bugzilla combines all comments + on a single bug into one field for full-text searching, and the + combination of all comments on a single bug are very likely to + be larger than 64KB. + + To change MySQL's default, you need to edit your MySQL + configuration file, which is usually /etc/my.cnf + on Linux. We recommend that you allow at least 4MB packets by + adding the "max_allowed_packet" parameter to your MySQL + configuration in the "[mysqld]" section, like this: + + [mysqld] +# Allow packets up to 4MB +max_allowed_packet=4M + +
    Allow small words in full-text indexes Index: template/en/default/setup/strings.txt.pl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/setup/strings.txt.pl,v retrieving revision 1.8 diff -u -r1.8 strings.txt.pl --- template/en/default/setup/strings.txt.pl 28 Jan 2008 00:54:59 -0000 1.8 +++ template/en/default/setup/strings.txt.pl 1 Mar 2009 23:56:15 -0000 @@ -52,6 +52,12 @@ EOT install_module => 'Installing ##module## version ##version##...', + max_allowed_packet => < "found v##ver##", module_not_found => "not found", module_ok => 'ok', Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 1 Mar 2009 03:33:48 -0000 1.8 +++ .cvsignore 5 Mar 2009 15:26:21 -0000 1.9 @@ -1 +1 @@ -bugzilla-3.0.8.tar.gz +bugzilla-3.2.2.tar.gz bugzilla-rw-paths.patch: Index: bugzilla-rw-paths.patch =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-9/bugzilla-rw-paths.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bugzilla-rw-paths.patch 27 Aug 2007 13:17:11 -0000 1.2 +++ bugzilla-rw-paths.patch 5 Mar 2009 15:26:21 -0000 1.3 @@ -1,7 +1,6 @@ -diff -ru bugzilla-orig/Bugzilla/Constants.pm bugzilla-3.0.1/Bugzilla/Constants.pm ---- bugzilla-orig/Bugzilla/Constants.pm 2007-08-23 14:42:23.000000000 -0400 -+++ bugzilla-3.0.1/Bugzilla/Constants.pm 2007-08-27 08:50:50.000000000 -0400 -@@ -423,9 +423,9 @@ +--- bugzilla-3.2.2/Bugzilla/Constants.pm 2009-02-03 10:02:53.000000000 +0000 ++++ bugzilla-3.2.2-rw/Bugzilla/Constants.pm 2009-02-18 17:59:52.000000000 +0000 +@@ -465,9 +465,9 @@ 'cgi_path' => $libpath, 'templatedir' => "$libpath/template", 'project' => $project, @@ -12,9 +11,9 @@ + 'datadir' => "/var/lib/bugzilla/$datadir", + 'attachdir' => "/var/lib/bugzilla/$datadir/attachments", 'skinsdir' => "$libpath/skins", - # $webdotdir must be in the webtree somewhere. Even if you use a + # $webdotdir must be in the web server's tree somewhere. Even if you use a # local dot, we output images to there. Also, if $webdotdir is -@@ -433,8 +433,8 @@ +@@ -475,8 +475,8 @@ # change showdependencygraph.cgi to set image_url to the correct # location. # The script should really generate these graphs directly... @@ -24,4 +23,4 @@ + 'extensionsdir' => "/var/lib/bugzilla/extensions", }; } - + Index: bugzilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-9/bugzilla.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- bugzilla.spec 1 Mar 2009 03:33:48 -0000 1.19 +++ bugzilla.spec 5 Mar 2009 15:26:21 -0000 1.20 @@ -4,17 +4,19 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.0.8 +Version: 3.2.2 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf Source2: README.fedora.bugzilla Patch0: bugzilla-rw-paths.patch +Patch1: maxpacket-mysql-3.2.patch +# patch1 from https://bugzilla.mozilla.org/show_bug.cgi?id=480001 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: webserver, patchutils, mod_perl, perl-SOAP-Lite, which +Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), which %package doc Summary: Bugzilla documentation @@ -23,11 +25,13 @@ %package contrib Summary: Bugzilla contributed scripts Group: Applications/Publishing +BuildRequires: python %description -Bugzilla is a popular bug tracking system used by multiple open source -projects. It requires a database engine installed - either MySQL or -PostgreSQL. Without one of these database engines, Bugzilla will not work. +Bugzilla is a popular bug tracking system used by multiple open source projects +It requires a database engine installed - either MySQL, PostgreSQL or Oracle. +Without one of these database engines (local or remote), Bugzilla will not work +- see the Release Notes for details. %description doc Documentation distributed with the Bugzilla bug tracking system @@ -38,14 +42,18 @@ %prep %setup -q -n %{name}-%{version} %patch0 -p1 +%patch1 -p0 -# Filter unwanted Requires: +# Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl: +# create a wrapper script which runs the original perl_requires +# command and strips some of the output cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ - sed -e '/perl(globals.pl)/d;/perl(BugzillaEmail)/d' +sed -e '/perl(Authen::Radius)/d;/perl(DBD::Pg)/d;/perl(DBD::Oracle)/d;/perl(sanitycheck.cgi)/d' EOF +# use that wrapper script instead of the original perl_requires script %define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req chmod +x %{__perl_requires} @@ -101,7 +109,6 @@ %defattr(-,root,root,-) %dir %{bzinstallprefix}/bugzilla %{bzinstallprefix}/bugzilla/*.cgi -%{bzinstallprefix}/bugzilla/*.js %{bzinstallprefix}/bugzilla/*.pl %{bzinstallprefix}/bugzilla/Bugzilla.pm %{bzinstallprefix}/bugzilla/bugzilla.dtd @@ -113,6 +120,8 @@ %{bzinstallprefix}/bugzilla/skins %{bzinstallprefix}/bugzilla/t %{bzinstallprefix}/bugzilla/template +%{bzinstallprefix}/bugzilla/extensions/example +%{bzinstallprefix}/bugzilla/lib/README %{bzinstallprefix}/bugzilla/cron.daily %{bzinstallprefix}/bugzilla/cron.whine %ghost %{bzinstallprefix}/bugzilla/bugzilla-req @@ -136,11 +145,24 @@ %{bzinstallprefix}/bugzilla/contrib %changelog +* Thu Mar 05 2009 Itamar Reis Peixoto 3.2.2-2 +- fix from BZ #474250 Comment #16, from Chris Eveleigh --> +- add python BR for contrib subpackage +- fix description +- change Requires perl-SOAP-Lite to perl(SOAP::Lite) according guidelines + +* Sun Mar 01 2009 Itamar Reis Peixoto 3.2.2-1 +- thanks to Chris Eveleigh +- for contributing with patches :-) +- Upgrade to upstream 3.2.2 to fix multiple security vulns +- Removed old perl_requires exclusions, added new ones for RADIUS, Oracle and sanitycheck.cgi +- Added Oracle to supported DBs in description (and moved line breaks) +- Include a patch to fix max_allowed_packet warnin when using with mysql + * Sat Feb 28 2009 Itamar Reis Peixoto 3.0.8-1 - Upgrade to 3.0.8, fix #466077 #438080 - fix macro in changelog rpmlint warning -- fix files-attr-not-set rpmlint warning for doc and contrib sub-packages - +- fix files-attr-not-set rpmlint warning for doc and contrib sub-packages * Mon Feb 23 2009 Fedora Release Engineering - 3.0.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -155,7 +177,7 @@ * Fri May 9 2008 John Berninger - 3.0.4-1 - Update to upstream 3.0.4 to fix multiple security vulns -- Change perms on /etc/bugzilla for bz 427981 +- Change perms on /etc/bugzilla for bz 427981 * Sun May 4 2008 John Berninger - 3.0.3-0 - Update to upstream 3.0.3 - bz 444669 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Mar 2009 03:33:48 -0000 1.1 +++ import.log 5 Mar 2009 15:26:21 -0000 1.2 @@ -1 +1,2 @@ bugzilla-3_0_8-1_fc11:F-9:bugzilla-3.0.8-1.fc11.src.rpm:1235878378 +bugzilla-3_2_2-2_fc10:F-9:bugzilla-3.2.2-2.fc10.src.rpm:1236266726 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bugzilla/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 1 Mar 2009 03:33:48 -0000 1.8 +++ sources 5 Mar 2009 15:26:22 -0000 1.9 @@ -1 +1 @@ -fff5060b85bc50a40ea5f5de0f7b17b0 bugzilla-3.0.8.tar.gz +ad9eca21b6bafdd7a9a34e4c1b55281e bugzilla-3.2.2.tar.gz From rcritten at fedoraproject.org Thu Mar 5 15:38:32 2009 From: rcritten at fedoraproject.org (Robert Crittenden) Date: Thu, 5 Mar 2009 15:38:32 +0000 (UTC) Subject: rpms/mod_nss/F-9 mod_nss-wouldblock.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 mod_nss.spec, 1.13, 1.14 sources, 1.6, 1.7 mod_nss-fips.patch, 1.2, NONE mod_nss-inherit.patch, 1.1, NONE mod_nss-kill.patch, 1.1, NONE mod_nss-nofork.patch, 1.2, NONE Message-ID: <20090305153832.E11AD70116@cvs1.fedora.phx.redhat.com> Author: rcritten Update of /cvs/extras/rpms/mod_nss/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32725 Modified Files: .cvsignore mod_nss.spec sources Added Files: mod_nss-wouldblock.patch Removed Files: mod_nss-fips.patch mod_nss-inherit.patch mod_nss-kill.patch mod_nss-nofork.patch Log Message: Update to 1.0.8 Add patch that fixes NSPR layer bug mod_nss-wouldblock.patch: --- NEW FILE mod_nss-wouldblock.patch --- --- mod_nss-1.0.3.orig/nss_engine_io.c 2006-04-07 16:17:12.000000000 -0400 +++ mod_nss-1.0.3/nss_engine_io.c 2009-02-17 22:51:44.000000000 -0500 @@ -259,7 +259,8 @@ */ if (APR_STATUS_IS_EAGAIN(inctx->rc) || APR_STATUS_IS_EINTR(inctx->rc) || (inctx->rc == APR_SUCCESS && APR_BRIGADE_EMPTY(inctx->bb))) { - return 0; + PR_SetError(PR_WOULD_BLOCK_ERROR, 0); + return -1; } if (inctx->rc != APR_SUCCESS) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_nss/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Oct 2007 18:57:58 -0000 1.6 +++ .cvsignore 5 Mar 2009 15:38:02 -0000 1.7 @@ -1,2 +1 @@ -mod_nss-1.0.7.tar.gz -mod_nss-proxy.patch +mod_nss-1.0.8.tar.gz Index: mod_nss.spec =================================================================== RCS file: /cvs/extras/rpms/mod_nss/F-9/mod_nss.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mod_nss.spec 16 Jul 2008 15:54:56 -0000 1.13 +++ mod_nss.spec 5 Mar 2009 15:38:02 -0000 1.14 @@ -1,6 +1,6 @@ Name: mod_nss -Version: 1.0.7 -Release: 9%{?dist} +Version: 1.0.8 +Release: 1%{?dist} Summary: SSL/TLS module for the Apache HTTP server Group: System Environment/Daemons License: Apache Software License @@ -13,11 +13,7 @@ Requires: httpd >= 0:2.0.52 Patch1: mod_nss-conf.patch Patch2: mod_nss-gencert.patch -Patch3: mod_nss-proxy.patch -Patch4: mod_nss-nofork.patch -Patch5: mod_nss-fips.patch -Patch6: mod_nss-inherit.patch -Patch7: mod_nss-kill.patch +Patch3: mod_nss-wouldblock.patch %description The mod_nss module provides strong cryptography for the Apache Web @@ -29,11 +25,7 @@ %setup -q %patch1 -p1 -b .conf %patch2 -p1 -b .gencert -%patch3 -p1 -b .proxy -%patch4 -p1 -b .nofork -%patch5 -p1 -b .fips -%patch6 -p1 -b .inherit -%patch7 -p1 -b .kill +%patch3 -p1 -b .wouldblock # Touch expression parser sources to prevent regenerating it touch nss_expr_*.[chyl] @@ -118,6 +110,10 @@ %{_sbindir}/gencert %changelog +* Mon Mar 2 2009 Rob Crittenden - 1.0.8-1 +- Update to 1.0.8 +- Add patch that fixes NSPR layer bug + * Mon Jul 14 2008 Rob Crittenden - 1.0.7-9 - Don't force module de-init during the configuration stage (453508) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_nss/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Oct 2007 18:57:58 -0000 1.6 +++ sources 5 Mar 2009 15:38:02 -0000 1.7 @@ -1,2 +1 @@ -71107cbc702bf07c6c79843aa92a0e09 mod_nss-1.0.7.tar.gz -d822102fe6b4a76beeb81e86c4ce2f80 mod_nss-proxy.patch +32458d91ce909260a6081cce58004e2f mod_nss-1.0.8.tar.gz --- mod_nss-fips.patch DELETED --- --- mod_nss-inherit.patch DELETED --- --- mod_nss-kill.patch DELETED --- --- mod_nss-nofork.patch DELETED --- From rdieter at fedoraproject.org Thu Mar 5 16:00:27 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 16:00:27 +0000 (UTC) Subject: rpms/amarok/devel amarok.spec,1.138,1.139 Message-ID: <20090305160027.4C59270116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/amarok/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2946 Modified Files: amarok.spec Log Message: only apply libgpod-0.7.0 where needed Index: amarok.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- amarok.spec 5 Mar 2009 12:49:20 -0000 1.138 +++ amarok.spec 5 Mar 2009 15:59:56 -0000 1.139 @@ -52,7 +52,10 @@ %prep %setup -q + +%if 0%{?fedora} > 10 %patch0 -p0 -b .libgpod-0.7.0 +%endif %patch1 -p1 -b .gcc4 %patch100 -p0 -b .qt45 From pkgdb at fedoraproject.org Thu Mar 5 16:01:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 16:01:51 +0000 Subject: [pkgdb] anaconda: pjones has requested watchcommits Message-ID: <20090305160212.C1B4D20820B@bastion.fedora.phx.redhat.com> pjones has requested the watchcommits acl on anaconda (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 16:01:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 16:01:36 +0000 Subject: [pkgdb] anaconda: pjones has requested commit Message-ID: <20090305160220.045B0208547@bastion.fedora.phx.redhat.com> pjones has requested the commit acl on anaconda (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 16:02:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 16:02:02 +0000 Subject: [pkgdb] anaconda: pjones has requested watchbugzilla Message-ID: <20090305160223.2EC4420854D@bastion.fedora.phx.redhat.com> pjones has requested the watchbugzilla acl on anaconda (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 16:02:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 16:02:26 +0000 Subject: [pkgdb] anaconda: pjones has requested approveacls Message-ID: <20090305160227.5D80220820B@bastion.fedora.phx.redhat.com> pjones has requested the approveacls acl on anaconda (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 16:03:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 16:03:20 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305160341.439FA208543@bastion.fedora.phx.redhat.com> clumens has set the watchbugzilla acl on anaconda (Fedora devel) to Approved for pjones To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 16:03:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 16:03:46 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305160345.7D6262082B2@bastion.fedora.phx.redhat.com> clumens has set the watchcommits acl on anaconda (Fedora devel) to Approved for pjones To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 16:03:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 16:03:24 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305160345.9F38C20854C@bastion.fedora.phx.redhat.com> clumens has set the commit acl on anaconda (Fedora devel) to Approved for pjones To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From pkgdb at fedoraproject.org Thu Mar 5 16:03:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 16:03:04 +0000 Subject: [pkgdb] anaconda had acl change status Message-ID: <20090305160348.39DBF208554@bastion.fedora.phx.redhat.com> clumens has set the approveacls acl on anaconda (Fedora devel) to Approved for pjones To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/anaconda From berrange at fedoraproject.org Thu Mar 5 16:11:09 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Thu, 5 Mar 2009 16:11:09 +0000 (UTC) Subject: rpms/gtk-vnc/devel gtk-vnc-0.3.8-sasl-auth-tunnel.patch, NONE, 1.1 gtk-vnc.spec, 1.31, 1.32 Message-ID: <20090305161110.0BED370116@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/gtk-vnc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4319 Modified Files: gtk-vnc.spec Added Files: gtk-vnc-0.3.8-sasl-auth-tunnel.patch Log Message: Fix generation of SASL address when using AF_UNIX gtk-vnc-0.3.8-sasl-auth-tunnel.patch: --- NEW FILE gtk-vnc-0.3.8-sasl-auth-tunnel.patch --- diff -rup gtk-vnc-0.3.8.orig/src/gvnc.c gtk-vnc-0.3.8.new/src/gvnc.c --- gtk-vnc-0.3.8.orig/src/gvnc.c 2009-03-05 15:35:33.000000000 +0000 +++ gtk-vnc-0.3.8.new/src/gvnc.c 2009-03-05 15:57:58.000000000 +0000 @@ -2579,7 +2579,9 @@ static gboolean gvnc_perform_auth_sasl(s errno, strerror(errno)); goto error; } - if ((localAddr = gvnc_addr_to_string(&sa, salen)) == NULL) + if ((sa.ss_family == AF_INET || + sa.ss_family == AF_INET6) && + (localAddr = gvnc_addr_to_string(&sa, salen)) == NULL) goto error; /* Get remote address in form IPADDR:PORT */ @@ -2590,7 +2592,9 @@ static gboolean gvnc_perform_auth_sasl(s g_free(localAddr); goto error; } - if ((remoteAddr = gvnc_addr_to_string(&sa, salen)) == NULL) { + if ((sa.ss_family == AF_INET || + sa.ss_family == AF_INET6) && + (remoteAddr = gvnc_addr_to_string(&sa, salen)) == NULL) { g_free(localAddr); goto error; } Index: gtk-vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gtk-vnc.spec 3 Mar 2009 12:56:33 -0000 1.31 +++ gtk-vnc.spec 5 Mar 2009 16:10:38 -0000 1.32 @@ -7,12 +7,13 @@ Summary: A GTK widget for VNC clients Name: gtk-vnc Version: 0.3.8 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ Group: Development/Libraries Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.gz Patch1: %{name}-%{version}-relative-mouse.patch Patch2: %{name}-%{version}-sasl-auth.patch +Patch3: %{name}-%{version}-sasl-auth-tunnel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://live.gnome.org/gtk-vnc BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel @@ -73,6 +74,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # Temp hack for patch2 @@ -132,6 +134,9 @@ %endif %changelog +* Thu Mar 5 2009 Daniel P. Berrange - 0.3.8-6.fc11 +- Fix SASL address generation when using AF_UNIX sockets + * Tue Mar 3 2009 Daniel P. Berrange - 0.3.8-5.fc11 - Support SASL authentication extension From caolanm at fedoraproject.org Thu Mar 5 16:19:31 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 16:19:31 +0000 (UTC) Subject: rpms/ladspa-swh-plugins/devel ladspa-swh-plugins.spec,1.8,1.9 Message-ID: <20090305161931.5072B70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/ladspa-swh-plugins/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5407 Modified Files: ladspa-swh-plugins.spec Log Message: make it build Index: ladspa-swh-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/ladspa-swh-plugins/devel/ladspa-swh-plugins.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ladspa-swh-plugins.spec 25 Feb 2009 12:26:40 -0000 1.8 +++ ladspa-swh-plugins.spec 5 Mar 2009 16:19:00 -0000 1.9 @@ -3,7 +3,7 @@ Summary: A set of audio plugins for LADSPA Name: ladspa-%{pkgname} Version: 0.4.15 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ Group: Applications/Multimedia Source: http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz @@ -28,7 +28,7 @@ %patch1 -p0 %build -autoreconf +autoreconf -f -i CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %configure --disable-static %{__make} %{?_smp_mflags} static @@ -47,6 +47,9 @@ %{_datadir}/ladspa/rdf/* %changelog +* Thu Mar 05 2009 Caol??n McNamara - 0.4.15-14 +- make it build + * Wed Feb 25 2009 Fedora Release Engineering - 0.4.15-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pghmcfc at fedoraproject.org Thu Mar 5 16:20:22 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Thu, 5 Mar 2009 16:20:22 +0000 (UTC) Subject: rpms/gnome-libs/devel gnome-libs.spec,1.13,1.14 Message-ID: <20090305162022.4D2D570116@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/gnome-libs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5501 Modified Files: gnome-libs.spec Log Message: - Provide pkgconfig(gnomeui) needed to satisfy autogenerated dependency in libglade and possibly other packages built on gnome-libs; an actual .pc file isn't needed because pkg-config knows to use gnome-config for this - Weed out redundant -L%%{_libdir} options from gnome-config output Index: gnome-libs.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-libs/devel/gnome-libs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gnome-libs.spec 24 Feb 2009 23:02:04 -0000 1.13 +++ gnome-libs.spec 5 Mar 2009 16:19:51 -0000 1.14 @@ -5,7 +5,7 @@ Name: gnome-libs Epoch: 1 Version: 1.4.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: The main GNOME1 libraries License: LGPLv2+ and BSD with advertising and (LGPLv2+ and BSD with advertising) Group: System Environment/Libraries @@ -74,6 +74,7 @@ Patch104: gnome-libs-1.4.2-xdg-open.patch Patch105: gnome-libs-1.4.2-popthelp-format.patch Patch106: gnome-libs-1.4.2-norecurse.patch +Patch107: gnome-libs-1.4.2-gnome-config-no-Llibdir.patch %description GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI @@ -94,12 +95,17 @@ Requires: libSM-devel%{?_isa} Requires: pkgconfig +# pkg-config knows to use gnome-config when asked about libgnomeui +Provides: pkgconfig(gnomeui) = %{version} + # For ownership of %{_datadir}/aclocal Requires: automake # Make sure we have the same-arch glib-devel package (#445981) # Needed where %{_isa} isn't yet supported +%if "%{?_isa}" == "" Requires: %{_libdir}/pkgconfig/glib.pc +%endif %description devel GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI @@ -149,6 +155,7 @@ %endif %patch105 -p1 -b .popthelp-format %patch106 -p1 -b .norecurse +%patch107 -p1 -b .nolibdir /usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8 %{__mv} -f ChangeLog.utf-8 ChangeLog @@ -303,7 +310,13 @@ %{_libdir}/libgnomeui.so %changelog -* Tue Feb 24 2009 Fedora Release Engineering - 1:1.4.2-12 +* Thu Mar 5 2009 Paul Howarth 1:1.4.2-13 +- Provide pkgconfig(gnomeui) needed to satisfy autogenerated dependency in + libglade and possibly other packages built on gnome-libs; an actual .pc file + isn't needed because pkg-config knows to use gnome-config for this +- Weed out redundant -L%%{_libdir} options from gnome-config output + +* Tue Feb 24 2009 Fedora Release Engineering 1:1.4.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Wed Nov 20 2008 Paul Howarth 1:1.4.2-11 From pghmcfc at fedoraproject.org Thu Mar 5 16:20:57 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Thu, 5 Mar 2009 16:20:57 +0000 (UTC) Subject: rpms/gnome-libs/devel gnome-libs-1.4.2-gnome-config-no-Llibdir.patch, NONE, 1.1 Message-ID: <20090305162057.142F470116@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/gnome-libs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5793 Added Files: gnome-libs-1.4.2-gnome-config-no-Llibdir.patch Log Message: Weed out redundant -L%{_libdir} options from gnome-config output gnome-libs-1.4.2-gnome-config-no-Llibdir.patch: --- NEW FILE gnome-libs-1.4.2-gnome-config-no-Llibdir.patch --- --- gnome-libs-1.4.2/gnome-config.in 2009-03-05 13:31:05.000000000 +0000 +++ gnome-libs-1.4.2/gnome-config.in 2009-03-05 13:34:09.000000000 +0000 @@ -274,6 +274,7 @@ case "$i" in # a library, save it for later, in reverse order -l*) rev_libs="$i $rev_libs" ;; + -L${libdir}) ;; # redundant -L*|-R*) if $libs_L; then case " $lib_L_flags " in From caolanm at fedoraproject.org Thu Mar 5 16:42:10 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 16:42:10 +0000 (UTC) Subject: rpms/q/devel q-7.11-AcquireOnePixel.patch, NONE, 1.1 q.spec, 1.15, 1.16 Message-ID: <20090305164211.0054870116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/q/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7992 Modified Files: q.spec Added Files: q-7.11-AcquireOnePixel.patch Log Message: adapt AcquireOnePixel usage for current ImageMagick api q-7.11-AcquireOnePixel.patch: --- NEW FILE q-7.11-AcquireOnePixel.patch --- diff -ru q-7.11.orig/modules/magick/magick.c q-7.11/modules/magick/magick.c --- q-7.11.orig/modules/magick/magick.c 2009-03-05 16:21:46.000000000 +0000 +++ q-7.11/modules/magick/magick.c 2009-03-05 16:24:48.000000000 +0000 @@ -2861,7 +2861,7 @@ if (m2) set_pixels(&target, m2->v, 1, 1); else { - target = AcquireOnePixel(img, x, y, &exception); + AcquireOnePixel(img, x, y, &target, &exception); if (check_exception(&exception)) { DestroyDrawInfo(draw_info); return mkapp(mksym(sym(magick_error)), mkstr(sys_to_utf8(msg))); @@ -2898,7 +2898,7 @@ if (m2) set_pixels(&target, m2->v, 1, 1); else { - target = AcquireOnePixel(img, x, y, &exception); + AcquireOnePixel(img, x, y, &target, &exception); if (check_exception(&exception)) return mkapp(mksym(sym(magick_error)), mkstr(sys_to_utf8(msg))); } Index: q.spec =================================================================== RCS file: /cvs/pkgs/rpms/q/devel/q.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- q.spec 25 Feb 2009 17:10:51 -0000 1.15 +++ q.spec 5 Mar 2009 16:41:40 -0000 1.16 @@ -1,6 +1,6 @@ Name: q Version: 7.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Equational programming language Group: Development/Languages @@ -28,6 +28,8 @@ Requires(post): /sbin/ldconfig /sbin/install-info Requires(postun): /sbin/ldconfig /sbin/install-info +Patch0: q-7.11-AcquireOnePixel.patch + %description Q is a powerful and extensible functional programming language based @@ -89,6 +91,7 @@ %prep %setup -q +%patch0 -p1 -b .AcquireOnePixel sed -i 's|@libtool@|libtool|' src/Makefile.in %define _use_internal_dependency_generator 0 @@ -192,6 +195,9 @@ %changelog +* Thu Mar 05 2009 Caol??n McNamara - 7.11-4 +- adapt AcquireOnePixel usage for current ImageMagick api + * Wed Feb 25 2009 Fedora Release Engineering - 7.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Thu Mar 5 16:43:42 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 16:43:42 +0000 (UTC) Subject: rpms/libfreebob/devel libfreebob-1.0.11-includes.patch, NONE, 1.1 libfreebob.spec, 1.13, 1.14 libfreebob-1.0.3-cstdlib.patch, 1.1, NONE libfreebob-1.0.3-gcc43.patch, 1.4, NONE Message-ID: <20090305164342.3222370116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/libfreebob/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8360 Modified Files: libfreebob.spec Added Files: libfreebob-1.0.11-includes.patch Removed Files: libfreebob-1.0.3-cstdlib.patch libfreebob-1.0.3-gcc43.patch Log Message: fix up includes for gcc44 libfreebob-1.0.11-includes.patch: --- NEW FILE libfreebob-1.0.11-includes.patch --- diff -ru libfreebob-1.0.11.orig/src/debugmodule/debugmodule.cpp libfreebob-1.0.11/src/debugmodule/debugmodule.cpp --- libfreebob-1.0.11.orig/src/debugmodule/debugmodule.cpp 2009-03-05 15:31:17.000000000 +0000 +++ libfreebob-1.0.11/src/debugmodule/debugmodule.cpp 2009-03-05 16:19:27.000000000 +0000 @@ -24,6 +24,7 @@ #include #include +#include using namespace std; diff -ru libfreebob-1.0.11.orig/src/libfreebobavc/avc_extended_plug_info.cpp libfreebob-1.0.11/src/libfreebobavc/avc_extended_plug_info.cpp --- libfreebob-1.0.11.orig/src/libfreebobavc/avc_extended_plug_info.cpp 2009-03-05 15:31:17.000000000 +0000 +++ libfreebob-1.0.11/src/libfreebobavc/avc_extended_plug_info.cpp 2009-03-05 15:52:09.000000000 +0000 @@ -23,6 +23,8 @@ #include "ieee1394service.h" #include +#include +#include #include #include Only in libfreebob-1.0.11/src/libfreebobavc: avc_extended_plug_info.cpp.orig Only in libfreebob-1.0.11/src/libfreebobavc: avc_extended_plug_info.cpp.rej diff -ru libfreebob-1.0.11.orig/src/libfreebobavc/avc_extended_stream_format.cpp libfreebob-1.0.11/src/libfreebobavc/avc_extended_stream_format.cpp --- libfreebob-1.0.11.orig/src/libfreebobavc/avc_extended_stream_format.cpp 2009-03-05 15:31:17.000000000 +0000 +++ libfreebob-1.0.11/src/libfreebobavc/avc_extended_stream_format.cpp 2009-03-05 15:51:53.000000000 +0000 @@ -23,6 +23,7 @@ #include "ieee1394service.h" #include +#include /////////////////////////////////////////////////////////// std::ostream& operator<<( std::ostream& stream, StreamFormatInfo info ) diff -ru libfreebob-1.0.11.orig/src/libfreebobavc/avc_generic.cpp libfreebob-1.0.11/src/libfreebobavc/avc_generic.cpp --- libfreebob-1.0.11.orig/src/libfreebobavc/avc_generic.cpp 2009-03-05 15:31:17.000000000 +0000 +++ libfreebob-1.0.11/src/libfreebobavc/avc_generic.cpp 2009-03-05 16:10:32.000000000 +0000 @@ -24,6 +24,8 @@ #include #include +#include +#include #define DEBUG_EXTRA_VERBOSE 2 diff -ru libfreebob-1.0.11.orig/src/libfreebobavc/ieee1394service.cpp libfreebob-1.0.11/src/libfreebobavc/ieee1394service.cpp --- libfreebob-1.0.11.orig/src/libfreebobavc/ieee1394service.cpp 2009-03-05 15:31:17.000000000 +0000 +++ libfreebob-1.0.11/src/libfreebobavc/ieee1394service.cpp 2009-03-05 16:13:59.000000000 +0000 @@ -25,6 +25,7 @@ #include #include +#include using namespace std; diff -ru libfreebob-1.0.11.orig/src/libfreebobavc/serialize.cpp libfreebob-1.0.11/src/libfreebobavc/serialize.cpp --- libfreebob-1.0.11.orig/src/libfreebobavc/serialize.cpp 2009-03-05 15:31:17.000000000 +0000 +++ libfreebob-1.0.11/src/libfreebobavc/serialize.cpp 2009-03-05 16:14:22.000000000 +0000 @@ -22,6 +22,7 @@ #include #include +#include #include diff -ru libfreebob-1.0.11.orig/tests/test-extplugcmd.cpp libfreebob-1.0.11/tests/test-extplugcmd.cpp --- libfreebob-1.0.11.orig/tests/test-extplugcmd.cpp 2009-03-05 15:31:17.000000000 +0000 +++ libfreebob-1.0.11/tests/test-extplugcmd.cpp 2009-03-05 15:51:53.000000000 +0000 @@ -24,6 +24,7 @@ #include "libfreebobavc/ieee1394service.h" #include +#include using namespace std; diff -ru libfreebob-1.0.11.orig/tests/test-volume.cpp libfreebob-1.0.11/tests/test-volume.cpp --- libfreebob-1.0.11.orig/tests/test-volume.cpp 2009-03-05 15:31:17.000000000 +0000 +++ libfreebob-1.0.11/tests/test-volume.cpp 2009-03-05 16:28:29.000000000 +0000 @@ -22,6 +22,9 @@ #include "libfreebobavc/serialize.h" #include "libfreebobavc/ieee1394service.h" +#include +#include + const bool bVerbose = false; short int Index: libfreebob.spec =================================================================== RCS file: /cvs/pkgs/rpms/libfreebob/devel/libfreebob.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libfreebob.spec 25 Feb 2009 14:51:50 -0000 1.13 +++ libfreebob.spec 5 Mar 2009 16:43:11 -0000 1.14 @@ -1,12 +1,11 @@ Summary: FreeBoB firewire audio driver library Name: libfreebob Version: 1.0.11 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Libraries Source0: http://surfnet.dl.sourceforge.net/sourceforge/freebob/libfreebob-%{version}.tar.gz -Patch0: libfreebob-1.0.3-cstdlib.patch -Patch1: libfreebob-1.0.3-gcc43.patch +Patch1: libfreebob-1.0.11-includes.patch URL: http://freebob.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libavc1394-devel >= 0.5.3, libiec61883-devel, libraw1394-devel @@ -27,7 +26,7 @@ %prep %setup -q -%patch1 -p0 +%patch1 -p1 # Tweak libiec61883 build requirements. perl -pi -e 's/1.1.0/1.0.0/' configure @@ -59,6 +58,9 @@ %{_includedir}/* %changelog +* Thu Mar 5 2009 Caol??n McNamara - 1.0.11-5 +- fix up includes for gcc44 + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- libfreebob-1.0.3-cstdlib.patch DELETED --- --- libfreebob-1.0.3-gcc43.patch DELETED --- From jcollie at fedoraproject.org Thu Mar 5 16:45:01 2009 From: jcollie at fedoraproject.org (Jeffrey C. Ollie) Date: Thu, 5 Mar 2009 16:45:01 +0000 (UTC) Subject: rpms/python-pycurl/devel .cvsignore, 1.7, 1.8 python-pycurl.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <20090305164501.0C36470116@cvs1.fedora.phx.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-pycurl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8623 Modified Files: .cvsignore python-pycurl.spec sources Log Message: * Thu Mar 5 2009 Jeffrey C. Ollie - 7.19.0-1 - Update to 7.19.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-pycurl/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Jul 2008 21:22:10 -0000 1.7 +++ .cvsignore 5 Mar 2009 16:44:30 -0000 1.8 @@ -1 +1 @@ -pycurl-7.18.2.tar.gz +pycurl-7.19.0.tar.gz Index: python-pycurl.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-pycurl/devel/python-pycurl.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- python-pycurl.spec 26 Feb 2009 23:08:03 -0000 1.11 +++ python-pycurl.spec 5 Mar 2009 16:44:30 -0000 1.12 @@ -1,8 +1,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-pycurl -Version: 7.18.2 -Release: 3%{?dist} +Version: 7.19.0 +Release: 1%{?dist} Summary: A Python interface to libcurl Group: Development/Languages @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel -BuildRequires: curl-devel >= 7.18.1 +BuildRequires: curl-devel >= 7.19.0 BuildRequires: openssl-devel Provides: pycurl = %{version}-%{release} @@ -51,6 +51,9 @@ %{python_sitearch}/* %changelog +* Thu Mar 5 2009 Jeffrey C. Ollie - 7.19.0-1 +- Update to 7.19.0 + * Thu Feb 26 2009 Fedora Release Engineering - 7.18.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-pycurl/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Jul 2008 21:22:10 -0000 1.7 +++ sources 5 Mar 2009 16:44:30 -0000 1.8 @@ -1 +1 @@ -39210d56f1d5a75ac8dd6a2866a93dd5 pycurl-7.18.2.tar.gz +919d58fe37e69fe87ce4534d8b6a1c7b pycurl-7.19.0.tar.gz From rdieter at fedoraproject.org Thu Mar 5 16:50:01 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Thu, 5 Mar 2009 16:50:01 +0000 (UTC) Subject: rpms/amarok/F-10 amarok-2.0.1.1-gcc44.patch, NONE, 1.1 amarok-2.0.1.1-qt45.patch, NONE, 1.1 amarok-libgpod-0.7.0.patch, NONE, 1.1 .cvsignore, 1.42, 1.43 amarok.spec, 1.130, 1.131 sources, 1.43, 1.44 Message-ID: <20090305165001.9478C70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/amarok/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9386 Modified Files: .cvsignore amarok.spec sources Added Files: amarok-2.0.1.1-gcc44.patch amarok-2.0.1.1-qt45.patch amarok-libgpod-0.7.0.patch Log Message: * Wed Mar 04 2009 Rex Dieter 2.0.2-1 - amarok-2.0.2 amarok-2.0.1.1-gcc44.patch: --- NEW FILE amarok-2.0.1.1-gcc44.patch --- diff -up amarok-2.0.1.1/src/metadata/audible/audibletag.cpp.orig amarok-2.0.1.1/src/metadata/audible/audibletag.cpp --- amarok-2.0.1.1/src/metadata/audible/audibletag.cpp.orig 2009-02-24 17:53:43.000000000 +0100 +++ amarok-2.0.1.1/src/metadata/audible/audibletag.cpp 2009-02-24 17:54:03.000000000 +0100 @@ -25,6 +25,7 @@ #include "audibletag.h" +#include #include #include #include diff -up amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp.orig amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp --- amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp.orig 2009-02-24 18:22:41.000000000 +0100 +++ amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp 2009-02-24 18:23:05.000000000 +0100 @@ -28,6 +28,7 @@ #include "audibletag.h" #include "../tfile_helper.h" #include +#include #include namespace TagLib { diff -up amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp.orig amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp --- amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp.orig 2009-02-24 18:23:44.000000000 +0100 +++ amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp 2009-02-24 18:23:57.000000000 +0100 @@ -22,6 +22,7 @@ #include "taglib_audiblefiletyperesolver.h" #include "taglib_audiblefile.h" +#include #include TagLib::File *AudibleFileTypeResolver::createFile(TagLib::FileName fileName, diff -up amarok-2.0.1.1/src/metadata/wav/wavfile.cpp.orig amarok-2.0.1.1/src/metadata/wav/wavfile.cpp --- amarok-2.0.1.1/src/metadata/wav/wavfile.cpp.orig 2009-02-24 18:24:38.000000000 +0100 +++ amarok-2.0.1.1/src/metadata/wav/wavfile.cpp 2009-02-24 18:25:01.000000000 +0100 @@ -27,6 +27,7 @@ #include "../tfile_helper.h" #include +#include #include namespace TagLib { diff -up amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp.orig amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp --- amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp.orig 2009-02-24 18:26:23.000000000 +0100 +++ amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp 2009-02-24 18:26:36.000000000 +0100 @@ -22,6 +22,7 @@ #include "wavfiletyperesolver.h" #include "wavfile.h" +#include #include TagLib::File *WavFileTypeResolver::createFile(TagLib::FileName fileName, diff -up amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp.orig amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp --- amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp.orig 2009-02-24 18:25:40.000000000 +0100 +++ amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp 2009-02-24 18:25:52.000000000 +0100 @@ -25,6 +25,7 @@ #include "wavproperties.h" +#include #include #include diff -up amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp.gcc4 amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp --- amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp.gcc4 2009-01-06 13:49:08.000000000 +0100 +++ amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp 2009-02-24 16:33:55.000000000 +0100 @@ -22,6 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * * MA 02110-1301 USA * ***************************************************************************/ +#include #include "audibleproperties.h" diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h.gcc4 amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h --- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h.gcc4 2009-02-24 16:41:44.000000000 +0100 +++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h 2009-02-24 16:42:48.000000000 +0100 @@ -15,6 +15,7 @@ #ifndef PP_INTERNAL_H #define PP_INTERNAL_H +#include #include namespace rpp { diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp.gcc4 amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp --- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp.gcc4 2009-01-06 13:50:11.000000000 +0100 +++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp 2009-02-24 16:33:55.000000000 +0100 @@ -14,6 +14,7 @@ #include "preprocessor.h" +#include #include // register callback for include hooks amarok-2.0.1.1-qt45.patch: --- NEW FILE amarok-2.0.1.1-qt45.patch --- Index: src/scriptengine/generator/generator/typesystem_gui.xml =================================================================== --- src/scriptengine/generator/generator/typesystem_gui.xml (revision 926173) +++ src/scriptengine/generator/generator/typesystem_gui.xml (working copy) @@ -5389,8 +5389,13 @@ - - + + + +Q_DECLARE_METATYPE(QList<int>) + + + Index: src/scriptengine/generator/generator/shellimplgenerator.cpp =================================================================== --- src/scriptengine/generator/generator/shellimplgenerator.cpp (revision 926173) +++ src/scriptengine/generator/generator/shellimplgenerator.cpp (working copy) @@ -105,6 +105,7 @@ declareFunctionMetaTypes(s, functions, registeredTypeNames); s << endl; } + writeInjectedCode(s, meta_class); // write constructors foreach (const AbstractMetaFunction *ctor, ctors) { amarok-libgpod-0.7.0.patch: --- NEW FILE amarok-libgpod-0.7.0.patch --- Index: src/collection/ipodcollection/handler/IpodHandler.cpp =================================================================== --- src/collection/ipodcollection/handler/IpodHandler.cpp (revision 871432) +++ src/collection/ipodcollection/handler/IpodHandler.cpp (revision 871434) @@ -1025,12 +1025,17 @@ QFileInfo tempImageFileInfo( tempImageFile ); // get info for path QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path +#ifdef ITDB_THUMB_COVER_SMALL Itdb_Thumb *thumb = NULL; +#endif GdkPixbuf *gpixbuf = NULL; QString thumbPath; // pull image out of ipod +#ifdef ITDB_THUMB_COVER_SMALL + // we've got libgpod 0.6.0 here + if( ipodtrack->has_artwork == 0x01 ) { // try small first @@ -1115,7 +1120,15 @@ } } } +#else + // libgpod 0.7.0 + if( itdb_track_has_thumbnails ( ipodtrack ) ) + { + gpixbuf = (GdkPixbuf*) itdb_track_get_thumbnail (ipodtrack, -1, -1 ); + } +#endif + if(gpixbuf != NULL) { // temporarily save to file Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/amarok/F-10/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 10 Jan 2009 23:14:08 -0000 1.42 +++ .cvsignore 5 Mar 2009 16:49:30 -0000 1.43 @@ -1 +1 @@ -amarok-2.0.1.1.tar.bz2 +amarok-2.0.2.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- amarok.spec 10 Jan 2009 23:14:08 -0000 1.130 +++ amarok.spec 5 Mar 2009 16:49:30 -0000 1.131 @@ -1,7 +1,7 @@ Name: amarok Summary: Media player -Version: 2.0.1.1 +Version: 2.0.2 Release: 1%{?dist} Group: Applications/Multimedia @@ -10,14 +10,19 @@ Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# From amarok svn, r871433 (Note that this was reverted later, I believe the +# reasoning for reverting was incorrect. -- tmz :) +Patch0: amarok-libgpod-0.7.0.patch +Patch1: amarok-2.0.1.1-gcc44.patch + +Patch100: amarok-2.0.1.1-qt45.patch + BuildRequires: curl-devel BuildRequires: desktop-file-utils BuildRequires: gettext -# FIXME: bogus deps, from where? -BuildRequires: giflib-devel pcre-devel -BuildRequires: kdelibs4-devel >= 4.1.0 +BuildRequires: kdelibs4-devel BuildRequires: libifp-devel -BuildRequires: libgpod-devel gtk2-devel +BuildRequires: libgpod-devel BuildRequires: libmp4v2-devel %if 0%{?fedora} > 9 BuildRequires: libmtp-devel >= 0.3.0 @@ -46,7 +51,14 @@ - nice GUI, integrates into the KDE look, but with a unique touch %prep -%setup -q +%setup -q + +%if 0%{?fedora} > 10 +%patch0 -p0 -b .libgpod-0.7.0 +%endif +%patch1 -p1 -b .gcc4 + +%patch100 -p0 -b .qt45 %build @@ -54,7 +66,6 @@ pushd %{_target_platform} %{cmake_kde4} .. popd - make %{?_smp_mflags} -C %{_target_platform} @@ -113,6 +124,25 @@ %changelog +* Wed Mar 04 2009 Rex Dieter 2.0.2-1 +- amarok-2.0.2 + +* Tue Feb 24 2009 Than Ngo 2.0.1.1-6 +- fix build issue against gcc-4.4 + +* Mon Feb 23 2009 Fedora Release Engineering - 2.0.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 23 2009 Rex Dieter - 2.0.1.1-4 +- qt45 patch + +* Fri Feb 20 2009 Todd Zullinger - 2.0.1.1-3 +- Rebuild against libgpod-0.7.0 +- Drop gtk2-devel BR, libgpod properly requires that now + +* Thu Jan 22 2009 Rex Dieter - 2.0.1.1-2 +- respin (mysql) + * Fri Jan 09 2009 Rex Dieter - 2.0.1.1-1 - amarok-2.0.1.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/amarok/F-10/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 10 Jan 2009 23:14:08 -0000 1.43 +++ sources 5 Mar 2009 16:49:30 -0000 1.44 @@ -1 +1 @@ -818bc2b0350f35cba0fff0a72b9ffd22 amarok-2.0.1.1.tar.bz2 +98b78372ec6ea3432faba356c90c6dbe amarok-2.0.2.tar.bz2 From kwizart at fedoraproject.org Thu Mar 5 17:20:49 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Thu, 5 Mar 2009 17:20:49 +0000 (UTC) Subject: rpms/perl-AnyEvent/devel perl-AnyEvent.spec, 1.9, 1.10 sources, 1.7, 1.8 .cvsignore, 1.7, 1.8 Message-ID: <20090305172049.688E670116@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/perl-AnyEvent/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13225 Modified Files: perl-AnyEvent.spec sources .cvsignore Log Message: Update to 4.34 Index: perl-AnyEvent.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/perl-AnyEvent.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-AnyEvent.spec 26 Feb 2009 10:49:32 -0000 1.9 +++ perl-AnyEvent.spec 5 Mar 2009 17:20:18 -0000 1.10 @@ -1,8 +1,8 @@ -%define version_anyevent 4.331 +%define version_anyevent 4.34 Name: perl-AnyEvent -Version: 4.331 -Release: 2%{?dist} +Version: 4.340 +Release: 1%{?dist} Summary: Framework for multiple event loops Group: Development/Libraries @@ -77,6 +77,9 @@ %changelog +* Thu Mar 5 2009 kwizart < kwizart at gmail.com > - 4.340-1 +- Update to 4.34 (rpm version : 4.340 ) + * Thu Feb 26 2009 Fedora Release Engineering - 4.331-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 12 Jan 2009 21:26:28 -0000 1.7 +++ sources 5 Mar 2009 17:20:18 -0000 1.8 @@ -1 +1 @@ -e4e560095dec173b89362232d03ab7fa AnyEvent-4.331.tar.gz +1413b299f4124feebb7be7508b84fc91 AnyEvent-4.34.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 12 Jan 2009 21:26:28 -0000 1.7 +++ .cvsignore 5 Mar 2009 17:20:19 -0000 1.8 @@ -1 +1 @@ -AnyEvent-4.331.tar.gz +AnyEvent-4.34.tar.gz From dcbw at fedoraproject.org Thu Mar 5 17:28:04 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 17:28:04 +0000 (UTC) Subject: rpms/NetworkManager-vpnc/F-10 .cvsignore, 1.24, 1.25 NetworkManager-vpnc.spec, 1.50, 1.51 sources, 1.32, 1.33 Message-ID: <20090305172805.0315570116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager-vpnc/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14181 Modified Files: .cvsignore NetworkManager-vpnc.spec sources Log Message: * Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 - Update to 0.7.1rc3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/F-10/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 19 Feb 2009 13:43:47 -0000 1.24 +++ .cvsignore 5 Mar 2009 17:27:34 -0000 1.25 @@ -22,3 +22,4 @@ NetworkManager-vpnc-0.7.0.svn4326.tar.gz NetworkManager-vpnc-0.7.0.svn13.tar.gz NetworkManager-vpnc-0.7.0.97.tar.gz +NetworkManager-vpnc-0.7.0.99.tar.gz Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/F-10/NetworkManager-vpnc.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- NetworkManager-vpnc.spec 19 Feb 2009 13:43:47 -0000 1.50 +++ NetworkManager-vpnc.spec 5 Mar 2009 17:27:34 -0000 1.51 @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.0-1 +%define nm_version 1:0.7.0.99-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define vpnc_version 0.4 @@ -9,7 +9,7 @@ Summary: NetworkManager VPN plugin for vpnc Name: NetworkManager-vpnc Epoch: 1 -Version: 0.7.0.97 +Version: 0.7.0.99 Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base @@ -97,6 +97,12 @@ %dir %{_datadir}/gnome-vpn-properties/vpnc %changelog +* Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 +- Update to 0.7.1rc3 + +* Mon Feb 23 2009 Fedora Release Engineering - 1:0.7.0.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Feb 19 2009 Dan Williams 1:0.7.0.97-1 - Update to 0.7.1rc1 - Handle import/export of "EnableNat", "DHGroup", "SaveUserPassword", and "EnableLocalLAN" Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/F-10/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 19 Feb 2009 13:43:47 -0000 1.32 +++ sources 5 Mar 2009 17:27:34 -0000 1.33 @@ -1 +1 @@ -a68cb9592c426ec95ac1bd8783fc46f5 NetworkManager-vpnc-0.7.0.97.tar.gz +70c57da49eaa10baad6dc765d2ffed1c NetworkManager-vpnc-0.7.0.99.tar.gz From glommer at fedoraproject.org Thu Mar 5 17:28:51 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Thu, 5 Mar 2009 17:28:51 +0000 (UTC) Subject: rpms/bochs/devel bochs.spec,1.36,1.37 Message-ID: <20090305172851.B895A70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/bochs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14301 Modified Files: bochs.spec Log Message: updated to git 04387139e3b, and applied qemu's patch ontop. Index: bochs.spec =================================================================== RCS file: /cvs/pkgs/rpms/bochs/devel/bochs.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- bochs.spec 24 Feb 2009 05:21:28 -0000 1.36 +++ bochs.spec 5 Mar 2009 17:28:21 -0000 1.37 @@ -1,26 +1,41 @@ +%define githead 04387139e3b Name: bochs -Version: 2.3.7 -Release: 3%{?dist} +Version: 2.3.8 +Release: 0.1.git%{githead}%{?dist} Summary: Portable x86 PC emulator Group: Applications/Emulators License: LGPLv2+ URL: http://bochs.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-nonet-build.patch -Patch1: %{name}-wx28.patch -Patch2: bochs-2.3.6-gcc43.patch -# from upstream CVS -Patch3: bochs-2.3.7-3dnow-compile-fix.patch -# submitted upstream: -# http://sourceforge.net/tracker/index.php?func=detail&aid=1992322&group_id=12580&atid=312580 -Patch4: bochs-2.3.7-big-endian.patch +#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +# git clone git://git.kernel.org/pub/scm/virt/bochs/bochs.git +# cd bochs +# git archive --format=tar --prefix=%{name}-%{version}/ %{githead} | gzip > ../%{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz + +Patch0: %{name}-0001_bx-qemu.patch +Patch1: %{name}-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch +Patch2: %{name}-0003_kvm-bios-generate-mptable-unconditionally.patch +Patch3: %{name}-0004_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch +Patch4: %{name}-0005_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch +Patch5: %{name}-0006_qemu-bios-use-preprocessor-for-pci-link-routing.patch +Patch6: %{name}-0007_bios-add-26-pci-slots,-bringing-the-total-to-32.patch +Patch7: %{name}-0008_qemu-bios-provide-gpe-_l0x-methods.patch +Patch8: %{name}-0009_qemu-bios-pci-hotplug-support.patch +Patch9: %{name}-0010_bios-mark-the-acpi-sci-interrupt-as-connected-to-irq-9.patch +Patch10: %{name}-0011_read-additional-acpi-tables-from-a-vm.patch +Patch11: %{name}-nonet-build.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libXt-devel libXpm-devel SDL-devel readline-devel byacc BuildRequires: docbook-utils +BuildRequires: gtk2-devel #BuildRequires: wxGTK-devel %ifarch %{ix86} x86_64 BuildRequires: svgalib-devel +BuildRequires: dev86 %endif +Requires: %{name}-bios = %{version}-%{release} +Requires: vgabios %description Bochs is a portable x86 PC emulation software package that emulates @@ -46,14 +61,42 @@ Special version of bochs compiled with a gdb stub so that the software running inside the emulator can be debugged with gdb. +%ifarch %{ix86} x86_64 +# building firmwares are quite tricky, because they often has to be built on +# their native architecture (or in a cross-capable compiler, that we lack in +# koji), and deployed everywhere. Recent koji builders support a feature +# that allow us to build packages in a single architecture, and create noarch +# subpackages that will be deployed everywhere. Because the package can only +# be built in certain architectures, the main package has to use +# BuildArch: , or something like that. +# Note that using ExclusiveArch is _wrong_, because it will prevent the noarch +# packages from getting into the excluded repositories. +%package bios +Summary: Bochs bios +Group: Applications/Emulators +BuildArch: noarch + + +%description bios +Bochs BIOS is a free implementation of a x86 BIOS provided by the Bochs projects. +It can also be used in other emulators, such as QEMU +%endif %prep %setup -q -%patch0 -p0 -z .nonet +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p0 -z .nonet + # Fix up some man page paths. sed -i \ -e 's|/usr/local/share/doc/bochs/|%{_docdir}/%{name}-%{version}/|' \ @@ -105,10 +148,18 @@ %configure $CONFIGURE_FLAGS make %{?_smp_mflags} +%ifarch %{ix86} x86_64 +cd bios +make bios +%endif %install rm -rf $RPM_BUILD_ROOT _installed-docs make install DESTDIR=$RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS* +%ifnarch %{ix86} x86_64 +rm -rf $RPM_BUILD_ROOT%{_prefix}/share/bochs/*BIOS* +%endif install -m 755 bochs-debugger bochs-gdb $RPM_BUILD_ROOT%{_bindir} mv $RPM_BUILD_ROOT%{_docdir}/bochs _installed-docs rm $RPM_BUILD_ROOT%{_mandir}/man1/bochs-dlx.1* @@ -131,9 +182,15 @@ %{_mandir}/man1/bximage.1* %{_mandir}/man5/bochsrc.5* %dir %{_datadir}/bochs/ -%{_datadir}/bochs/*BIOS* %{_datadir}/bochs/keymaps/ +%ifarch %{ix86} x86_64 +%files bios +%defattr(-,root,root,-) +%{_datadir}/bochs/BIOS* +%endif + + %files debugger %defattr(-,root,root,-) %{_bindir}/bochs-debugger @@ -144,6 +201,9 @@ %changelog +* Thu Mar 05 2009 Glauber Costa 2.3.8-0.1.git04387139e3b +- updated to git 04387139e3b, and applied qemu's patch ontop. + * Mon Feb 23 2009 Fedora Release Engineering - 2.3.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From dcbw at fedoraproject.org Thu Mar 5 17:29:04 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 17:29:04 +0000 (UTC) Subject: rpms/NetworkManager-vpnc/F-9 .cvsignore, 1.20, 1.21 NetworkManager-vpnc.spec, 1.44, 1.45 sources, 1.27, 1.28 Message-ID: <20090305172904.08B1770116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager-vpnc/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14457 Modified Files: .cvsignore NetworkManager-vpnc.spec sources Log Message: * Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 - Update to 0.7.1rc3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/F-9/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 19 Feb 2009 13:44:56 -0000 1.20 +++ .cvsignore 5 Mar 2009 17:28:33 -0000 1.21 @@ -22,3 +22,4 @@ NetworkManager-vpnc-0.7.0.svn4326.tar.gz NetworkManager-vpnc-0.7.0.svn13.tar.gz NetworkManager-vpnc-0.7.0.97.tar.gz +NetworkManager-vpnc-0.7.0.99.tar.gz Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/F-9/NetworkManager-vpnc.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- NetworkManager-vpnc.spec 19 Feb 2009 13:44:56 -0000 1.44 +++ NetworkManager-vpnc.spec 5 Mar 2009 17:28:33 -0000 1.45 @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.0-1 +%define nm_version 1:0.7.0.99-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define vpnc_version 0.4 @@ -9,7 +9,7 @@ Summary: NetworkManager VPN plugin for vpnc Name: NetworkManager-vpnc Epoch: 1 -Version: 0.7.0.97 +Version: 0.7.0.99 Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base @@ -97,6 +97,12 @@ %dir %{_datadir}/gnome-vpn-properties/vpnc %changelog +* Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 +- Update to 0.7.1rc3 + +* Mon Feb 23 2009 Fedora Release Engineering - 1:0.7.0.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Feb 19 2009 Dan Williams 1:0.7.0.97-1 - Update to 0.7.1rc1 - Handle import/export of "EnableNat", "DHGroup", "SaveUserPassword", and "EnableLocalLAN" Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/F-9/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 19 Feb 2009 13:44:56 -0000 1.27 +++ sources 5 Mar 2009 17:28:33 -0000 1.28 @@ -1 +1 @@ -a68cb9592c426ec95ac1bd8783fc46f5 NetworkManager-vpnc-0.7.0.97.tar.gz +70c57da49eaa10baad6dc765d2ffed1c NetworkManager-vpnc-0.7.0.99.tar.gz From glommer at fedoraproject.org Thu Mar 5 17:34:16 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Thu, 5 Mar 2009 17:34:16 +0000 (UTC) Subject: rpms/bochs/devel .cvsignore, 1.13, 1.14 bochs.spec, 1.37, 1.38 sources, 1.13, 1.14 Message-ID: <20090305173416.7A3C870116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/bochs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15311 Modified Files: .cvsignore bochs.spec sources Log Message: added sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bochs/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 18 Dec 2008 11:11:53 -0000 1.13 +++ .cvsignore 5 Mar 2009 17:33:46 -0000 1.14 @@ -1 +1 @@ -bochs-2.3.7.tar.gz +bochs-2.3.8.tar.gz Index: bochs.spec =================================================================== RCS file: /cvs/pkgs/rpms/bochs/devel/bochs.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- bochs.spec 5 Mar 2009 17:28:21 -0000 1.37 +++ bochs.spec 5 Mar 2009 17:33:46 -0000 1.38 @@ -1,7 +1,7 @@ %define githead 04387139e3b Name: bochs Version: 2.3.8 -Release: 0.1.git%{githead}%{?dist} +Release: 0.2.git%{githead}%{?dist} Summary: Portable x86 PC emulator Group: Applications/Emulators License: LGPLv2+ @@ -201,6 +201,9 @@ %changelog +* Thu Mar 05 2009 Glauber Costa 2.3.8-0.2.git04387139e3b +- this time with sources added. + * Thu Mar 05 2009 Glauber Costa 2.3.8-0.1.git04387139e3b - updated to git 04387139e3b, and applied qemu's patch ontop. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bochs/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 18 Dec 2008 11:11:53 -0000 1.13 +++ sources 5 Mar 2009 17:33:46 -0000 1.14 @@ -1 +1 @@ -a2e5f922505bf16cabd36bb9d571a2c4 bochs-2.3.7.tar.gz +a360358375ad00487f0f26dcc667a4a4 bochs-2.3.8.tar.gz From vpv at fedoraproject.org Thu Mar 5 17:41:27 2009 From: vpv at fedoraproject.org (Ville-Pekka Vainio) Date: Thu, 5 Mar 2009 17:41:27 +0000 (UTC) Subject: rpms/malaga-suomi-voikko/devel .cvsignore, 1.8, 1.9 malaga-suomi-voikko.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <20090305174127.E59A470116@cvs1.fedora.phx.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/malaga-suomi-voikko/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16416 Modified Files: .cvsignore malaga-suomi-voikko.spec sources Log Message: * Thu Mar 05 2009 - Ville-Pekka Vainio 1.3-1 - Suomi-malaga 1.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 2 Oct 2008 18:50:58 -0000 1.8 +++ .cvsignore 5 Mar 2009 17:40:57 -0000 1.9 @@ -1 +1 @@ -suomi-malaga-1.2.tar.gz +suomi-malaga-1.3.tar.gz Index: malaga-suomi-voikko.spec =================================================================== RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/malaga-suomi-voikko.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- malaga-suomi-voikko.spec 25 Feb 2009 23:05:04 -0000 1.8 +++ malaga-suomi-voikko.spec 5 Mar 2009 17:40:57 -0000 1.9 @@ -1,6 +1,6 @@ Name: malaga-suomi-voikko -Version: 1.2 -Release: 2%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: A description of Finnish morphology written in Malaga (Voikko edition) Group: Applications/Text @@ -51,6 +51,9 @@ %changelog +* Thu Mar 05 2009 - Ville-Pekka Vainio 1.3-1 +- Suomi-malaga 1.3 + * Wed Feb 25 2009 Fedora Release Engineering - 1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 Oct 2008 18:50:58 -0000 1.8 +++ sources 5 Mar 2009 17:40:57 -0000 1.9 @@ -1 +1 @@ -5439a6547feb94f277f18dc573254535 suomi-malaga-1.2.tar.gz +fbe33195df95e79faee1a4262b445cf0 suomi-malaga-1.3.tar.gz From glommer at fedoraproject.org Thu Mar 5 17:42:27 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Thu, 5 Mar 2009 17:42:27 +0000 (UTC) Subject: rpms/bochs/devel bochs-0001_bx-qemu.patch, NONE, 1.1 bochs-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch, NONE, 1.1 bochs-0003_kvm-bios-generate-mptable-unconditionally.patch, NONE, 1.1 bochs-0004_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch, NONE, 1.1 bochs-0005_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch, NONE, 1.1 bochs-0006_qemu-bios-use-preprocessor-for-pci-link-routing.patch, NONE, 1.1 bochs-0007_bios-add-26-pci-slots, -bringing-the-total-to-32.patch, NONE, 1.1 bochs-0008_qemu-bios-provide-gpe-_l0x-methods.patch, NONE, 1.1 bochs-0009_qemu-bios-pci-hotplug-support.patch, NONE, 1.1 bochs-0010_bios-mark-the-acpi-sci-interrupt-as-connected-to-irq-9.patch, NONE, 1.1 bochs-0011_read-additional-acpi-tables-from-a-vm.patch, NONE, 1.1 bochs.spec, 1.38, 1.39 bochs-2.3.6-gcc43.patch, 1.1, NONE bochs-2.3.7-3dnow-compile-fix.patch, 1.1, NONE bochs-2.3.7-big-endian.patch, 1.1, NONE bochs-wx28.patch, 1.1, NONE Message-ID: <20090305174227.9EF8170116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/bochs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16988 Modified Files: bochs.spec Added Files: bochs-0001_bx-qemu.patch bochs-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch bochs-0003_kvm-bios-generate-mptable-unconditionally.patch bochs-0004_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch bochs-0005_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch bochs-0006_qemu-bios-use-preprocessor-for-pci-link-routing.patch bochs-0007_bios-add-26-pci-slots,-bringing-the-total-to-32.patch bochs-0008_qemu-bios-provide-gpe-_l0x-methods.patch bochs-0009_qemu-bios-pci-hotplug-support.patch bochs-0010_bios-mark-the-acpi-sci-interrupt-as-connected-to-irq-9.patch bochs-0011_read-additional-acpi-tables-from-a-vm.patch Removed Files: bochs-2.3.6-gcc43.patch bochs-2.3.7-3dnow-compile-fix.patch bochs-2.3.7-big-endian.patch bochs-wx28.patch Log Message: added patches bochs-0001_bx-qemu.patch: --- NEW FILE bochs-0001_bx-qemu.patch --- --- bochs-2.3.7.orig/bios/rombios.h +++ bochs-2.3.7/bios/rombios.h @@ -19,7 +19,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA /* define it to include QEMU specific code */ -//#define BX_QEMU +#define BX_QEMU #ifndef LEGACY # define BX_ROMBIOS32 1 bochs-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch: --- NEW FILE bochs-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch --- update SMBIOS table to report memory above 4G (Alex Williamson) Signed-off-by: Alex Williamson Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/rombios32.c =================================================================== diff --git a/bios/rombios32.c b/bios/rombios32.c index 3269be5..9587288 100644 --- a/bios/rombios32.c +++ b/bios/rombios32.c @@ -429,6 +429,7 @@ uint32_t cpuid_signature; uint32_t cpuid_features; uint32_t cpuid_ext_features; unsigned long ram_size; +uint64_t ram_end; uint8_t bios_uuid[16]; #ifdef BX_USE_EBDA_TABLES unsigned long ebda_cur_addr; @@ -571,6 +572,13 @@ void ram_probe(void) ram_size = (cmos_readb(0x30) | (cmos_readb(0x31) << 8)) * 1024 + 1 * 1024 * 1024; BX_INFO("ram_size=0x%08lx\n", ram_size); + if (cmos_readb(0x5b) | cmos_readb(0x5c) | cmos_readb(0x5d)) + ram_end = (((uint64_t)cmos_readb(0x5b) << 16) | + ((uint64_t)cmos_readb(0x5c) << 24) | + ((uint64_t)cmos_readb(0x5d) << 32)) + (1ull << 32); + else + ram_end = ram_size; + BX_INFO("end of ram=%ldMB\n", ram_end >> 20); #ifdef BX_USE_EBDA_TABLES ebda_cur_addr = ((*(uint16_t *)(0x40e)) << 4) + 0x380; BX_INFO("ebda_cur_addr: 0x%08lx\n", ebda_cur_addr); @@ -2174,7 +2182,8 @@ void smbios_init(void) { unsigned cpu_num, nr_structs = 0, max_struct_size = 0; char *start, *p, *q; - int memsize = ram_size / (1024 * 1024); + int memsize = (ram_end == ram_size) ? ram_size / (1024 * 1024) : + (ram_end - (1ull << 32) + ram_size) / (1024 * 1024); #ifdef BX_USE_EBDA_TABLES ebda_cur_addr = align(ebda_cur_addr, 16); @@ -2201,8 +2210,8 @@ void smbios_init(void) add_struct(smbios_type_4_init(p, cpu_num)); add_struct(smbios_type_16_init(p, memsize)); add_struct(smbios_type_17_init(p, memsize)); - add_struct(smbios_type_19_init(p, memsize)); - add_struct(smbios_type_20_init(p, memsize)); + add_struct(smbios_type_19_init(p, ram_end / (1024 * 1024))); + add_struct(smbios_type_20_init(p, ram_end / (1024 * 1024))); add_struct(smbios_type_32_init(p)); add_struct(smbios_type_127_init(p)); bochs-0003_kvm-bios-generate-mptable-unconditionally.patch: --- NEW FILE bochs-0003_kvm-bios-generate-mptable-unconditionally.patch --- generate mptable unconditionally (Avi Kivity) VMware ESX requires an mptable even for uniprocessor guests. Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/rombios32.c =================================================================== --- bochs.orig/bios/rombios32.c +++ bochs/bios/rombios32.c @@ -970,11 +970,6 @@ static void mptable_init(void) int ioapic_id, i, len; int mp_config_table_size; -#ifdef BX_QEMU - if (smp_cpus <= 1) - return; -#endif - #ifdef BX_USE_EBDA_TABLES mp_config_table = (uint8_t *)(ram_size - ACPI_DATA_SIZE - MPTABLE_MAX_SIZE); #else bochs-0004_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch: --- NEW FILE bochs-0004_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch --- resolve memory device roll over reporting issues with >32G guests (Bill Rieske) The field within the Memory Device type 17 is only a word with the MSB being used to report MB/KB. Thereby, a guest with 32G and greater would report incorrect memory device information rolling over to 0. This presents more than one memory device and associated memory structures if the memory is larger than 16G Signed-off-by: Bill Rieske Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/rombios32.c =================================================================== --- bochs.orig/bios/rombios32.c +++ bochs/bios/rombios32.c @@ -381,6 +381,17 @@ int vsnprintf(char *buf, int buflen, con return buf - buf0; } +int snprintf(char * buf, size_t size, const char *fmt, ...) +{ + va_list args; + int i; + + va_start(args, fmt); + i=vsnprintf(buf,size,fmt,args); + va_end(args); + return i; +} + void bios_printf(int flags, const char *fmt, ...) { va_list ap; @@ -2039,7 +2050,7 @@ smbios_type_4_init(void *start, unsigned /* Type 16 -- Physical Memory Array */ static void * -smbios_type_16_init(void *start, uint32_t memsize) +smbios_type_16_init(void *start, uint32_t memsize, int nr_mem_devs) { struct smbios_type_16 *p = (struct smbios_type_16*)start; @@ -2052,7 +2063,7 @@ smbios_type_16_init(void *start, uint32_ p->error_correction = 0x01; /* other */ p->maximum_capacity = memsize * 1024; p->memory_error_information_handle = 0xfffe; /* none provided */ - p->number_of_memory_devices = 1; + p->number_of_memory_devices = nr_mem_devs; start += sizeof(struct smbios_type_16); *((uint16_t *)start) = 0; @@ -2062,20 +2073,19 @@ smbios_type_16_init(void *start, uint32_ /* Type 17 -- Memory Device */ static void * -smbios_type_17_init(void *start, uint32_t memory_size_mb) +smbios_type_17_init(void *start, uint32_t memory_size_mb, int instance) { struct smbios_type_17 *p = (struct smbios_type_17 *)start; p->header.type = 17; p->header.length = sizeof(struct smbios_type_17); - p->header.handle = 0x1100; + p->header.handle = 0x1100 + instance; p->physical_memory_array_handle = 0x1000; p->total_width = 64; p->data_width = 64; - /* truncate memory_size_mb to 16 bits and clear most significant - bit [indicates size in MB] */ - p->size = (uint16_t) memory_size_mb & 0x7fff; +/* TODO: should assert in case something is wrong ASSERT((memory_size_mb & ~0x7fff) == 0); */ + p->size = memory_size_mb; p->form_factor = 0x09; /* DIMM */ p->device_set = 0; p->device_locator_str = 1; @@ -2084,8 +2094,8 @@ smbios_type_17_init(void *start, uint32_ p->type_detail = 0; start += sizeof(struct smbios_type_17); - memcpy((char *)start, "DIMM 1", 7); - start += 7; + snprintf(start, 8, "DIMM %d", instance); + start += strlen(start) + 1; *((uint8_t *)start) = 0; return start+1; @@ -2093,16 +2103,16 @@ smbios_type_17_init(void *start, uint32_ /* Type 19 -- Memory Array Mapped Address */ static void * -smbios_type_19_init(void *start, uint32_t memory_size_mb) +smbios_type_19_init(void *start, uint32_t memory_size_mb, int instance) { struct smbios_type_19 *p = (struct smbios_type_19 *)start; p->header.type = 19; p->header.length = sizeof(struct smbios_type_19); - p->header.handle = 0x1300; + p->header.handle = 0x1300 + instance; - p->starting_address = 0; - p->ending_address = (memory_size_mb * 1024) - 1; + p->starting_address = instance << 24; + p->ending_address = p->starting_address + (memory_size_mb << 10) - 1; p->memory_array_handle = 0x1000; p->partition_width = 1; @@ -2114,18 +2124,18 @@ smbios_type_19_init(void *start, uint32_ /* Type 20 -- Memory Device Mapped Address */ static void * -smbios_type_20_init(void *start, uint32_t memory_size_mb) +smbios_type_20_init(void *start, uint32_t memory_size_mb, int instance) { struct smbios_type_20 *p = (struct smbios_type_20 *)start; p->header.type = 20; p->header.length = sizeof(struct smbios_type_20); - p->header.handle = 0x1400; + p->header.handle = 0x1400 + instance; - p->starting_address = 0; - p->ending_address = (memory_size_mb * 1024) - 1; - p->memory_device_handle = 0x1100; - p->memory_array_mapped_address_handle = 0x1300; + p->starting_address = instance << 24; + p->ending_address = p->starting_address + (memory_size_mb << 10) - 1; + p->memory_device_handle = 0x1100 + instance; + p->memory_array_mapped_address_handle = 0x1300 + instance; p->partition_row_position = 1; p->interleave_position = 0; p->interleaved_data_depth = 0; @@ -2176,6 +2186,7 @@ void smbios_init(void) char *start, *p, *q; int memsize = (ram_end == ram_size) ? ram_size / (1024 * 1024) : (ram_end - (1ull << 32) + ram_size) / (1024 * 1024); + int i, nr_mem_devs; #ifdef BX_USE_EBDA_TABLES ebda_cur_addr = align(ebda_cur_addr, 16); @@ -2187,23 +2198,32 @@ void smbios_init(void) p = (char *)start + sizeof(struct smbios_entry_point); -#define add_struct(fn) { \ +#define add_struct(fn) do{ \ q = (fn); \ nr_structs++; \ if ((q - p) > max_struct_size) \ max_struct_size = q - p; \ p = q; \ -} +}while (0) add_struct(smbios_type_0_init(p)); add_struct(smbios_type_1_init(p)); add_struct(smbios_type_3_init(p)); for (cpu_num = 1; cpu_num <= smp_cpus; cpu_num++) add_struct(smbios_type_4_init(p, cpu_num)); - add_struct(smbios_type_16_init(p, memsize)); - add_struct(smbios_type_17_init(p, memsize)); - add_struct(smbios_type_19_init(p, ram_end / (1024 * 1024))); - add_struct(smbios_type_20_init(p, ram_end / (1024 * 1024))); + + /* Each 'memory device' covers up to 16GB of address space. */ + nr_mem_devs = (memsize + 0x3fff) >> 14; + add_struct(smbios_type_16_init(p, memsize, nr_mem_devs)); + for ( i = 0; i < nr_mem_devs; i++ ) + { + uint32_t dev_memsize = ((i == (nr_mem_devs - 1)) + ? (memsize & 0x3fff) : 0x4000); + add_struct(smbios_type_17_init(p, dev_memsize, i)); + add_struct(smbios_type_19_init(p, dev_memsize, i)); + add_struct(smbios_type_20_init(p, dev_memsize, i)); + } + add_struct(smbios_type_32_init(p)); add_struct(smbios_type_127_init(p)); bochs-0005_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch: --- NEW FILE bochs-0005_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch --- fix smbios memory device length boundary condition (Bill Rieske) dev_memsize ends up 0 when it shouldn't be on 16G boundary conditions. Signed-off-by: Bill Rieske Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/rombios32.c =================================================================== --- bochs.orig/bios/rombios32.c +++ bochs/bios/rombios32.c @@ -2218,7 +2218,7 @@ void smbios_init(void) for ( i = 0; i < nr_mem_devs; i++ ) { uint32_t dev_memsize = ((i == (nr_mem_devs - 1)) - ? (memsize & 0x3fff) : 0x4000); + ? (((memsize-1) & 0x3fff)+1) : 0x4000); add_struct(smbios_type_17_init(p, dev_memsize, i)); add_struct(smbios_type_19_init(p, dev_memsize, i)); add_struct(smbios_type_20_init(p, dev_memsize, i)); bochs-0006_qemu-bios-use-preprocessor-for-pci-link-routing.patch: --- NEW FILE bochs-0006_qemu-bios-use-preprocessor-for-pci-link-routing.patch --- qemu: bios: use preprocessor for pci link routing (Avi Kivity) Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/acpi-dsdt.dsl =================================================================== --- bochs.orig/bios/acpi-dsdt.dsl +++ bochs/bios/acpi-dsdt.dsl @@ -47,42 +47,22 @@ DefinitionBlock ( section 6.2.8.1 */ /* Note: we provide the same info as the PCI routing table of the Bochs BIOS */ - - // PCI Slot 0 - Package() {0x0000ffff, 0, LNKD, 0}, - Package() {0x0000ffff, 1, LNKA, 0}, - Package() {0x0000ffff, 2, LNKB, 0}, - Package() {0x0000ffff, 3, LNKC, 0}, - - // PCI Slot 1 - Package() {0x0001ffff, 0, LNKA, 0}, - Package() {0x0001ffff, 1, LNKB, 0}, - Package() {0x0001ffff, 2, LNKC, 0}, - Package() {0x0001ffff, 3, LNKD, 0}, - - // PCI Slot 2 - Package() {0x0002ffff, 0, LNKB, 0}, - Package() {0x0002ffff, 1, LNKC, 0}, - Package() {0x0002ffff, 2, LNKD, 0}, - Package() {0x0002ffff, 3, LNKA, 0}, - - // PCI Slot 3 - Package() {0x0003ffff, 0, LNKC, 0}, - Package() {0x0003ffff, 1, LNKD, 0}, - Package() {0x0003ffff, 2, LNKA, 0}, - Package() {0x0003ffff, 3, LNKB, 0}, - - // PCI Slot 4 - Package() {0x0004ffff, 0, LNKD, 0}, - Package() {0x0004ffff, 1, LNKA, 0}, - Package() {0x0004ffff, 2, LNKB, 0}, - Package() {0x0004ffff, 3, LNKC, 0}, - - // PCI Slot 5 - Package() {0x0005ffff, 0, LNKA, 0}, - Package() {0x0005ffff, 1, LNKB, 0}, - Package() {0x0005ffff, 2, LNKC, 0}, - Package() {0x0005ffff, 3, LNKD, 0}, +#define prt_slot(nr, lnk0, lnk1, lnk2, lnk3) \ + Package() { nr##ffff, 0, lnk0, 0 }, \ + Package() { nr##ffff, 1, lnk1, 0 }, \ + Package() { nr##ffff, 2, lnk2, 0 }, \ + Package() { nr##ffff, 3, lnk3, 0 } + +#define prt_slot0(nr) prt_slot(nr, LNKD, LNKA, LNKB, LNKC) +#define prt_slot1(nr) prt_slot(nr, LNKA, LNKB, LNKC, LNKD) +#define prt_slot2(nr) prt_slot(nr, LNKB, LNKC, LNKD, LNKA) +#define prt_slot3(nr) prt_slot(nr, LNKC, LNKD, LNKA, LNKB) + prt_slot0(0x0000), + prt_slot1(0x0001), + prt_slot2(0x0002), + prt_slot3(0x0003), + prt_slot0(0x0004), + prt_slot1(0x0005), }) Name (_CRS, ResourceTemplate () -- ***** Not enough context to create diffstat for file: bochs-0007_bios-add-26-pci-slots,-bringing-the-total-to-32.patch,NONE,1.1 ***** Not enough context to create diff for file: bochs-0007_bios-add-26-pci-slots,-bringing-the-total-to-32.patch,NONE,1.1 bochs-0008_qemu-bios-provide-gpe-_l0x-methods.patch: --- NEW FILE bochs-0008_qemu-bios-provide-gpe-_l0x-methods.patch --- qemu: bios: provide gpe _L0x methods (Glauber Costa) provide methods for gpe blk 0, even though they do nothing atm Signed-off-by: Glauber Costa Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/acpi-dsdt.dsl =================================================================== --- bochs.orig/bios/acpi-dsdt.dsl +++ bochs/bios/acpi-dsdt.dsl @@ -597,4 +597,59 @@ DefinitionBlock ( Zero, /* reserved */ Zero /* reserved */ }) + + Scope (\_GPE) + { + Name(_HID, "ACPI0006") + + Method(_L00) { + Return(0x01) + } + Method(_L01) { + Return(0x01) + } + Method(_L02) { + Return(0x01) + } + Method(_L03) { + Return(0x01) + } + Method(_L04) { + Return(0x01) + } + Method(_L05) { + Return(0x01) + } + Method(_L06) { + Return(0x01) + } + Method(_L07) { + Return(0x01) + } + Method(_L08) { + Return(0x01) + } + Method(_L09) { + Return(0x01) + } + Method(_L0A) { + Return(0x01) + } + Method(_L0B) { + Return(0x01) + } + Method(_L0C) { + Return(0x01) + } + Method(_L0D) { + Return(0x01) + } + Method(_L0E) { + Return(0x01) + } + Method(_L0F) { + Return(0x01) + } + } + } Index: bochs/bios/rombios32.c =================================================================== --- bochs.orig/bios/rombios32.c +++ bochs/bios/rombios32.c @@ -1647,6 +1647,8 @@ void acpi_bios_init(void) fadt->pm_tmr_len = 4; fadt->plvl2_lat = cpu_to_le16(0xfff); // C2 state not supported fadt->plvl3_lat = cpu_to_le16(0xfff); // C3 state not supported + fadt->gpe0_blk = cpu_to_le32(0xafe0); + fadt->gpe0_blk_len = 4; /* WBINVD + PROC_C1 + PWR_BUTTON + SLP_BUTTON + FIX_RTC */ fadt->flags = cpu_to_le32((1 << 0) | (1 << 2) | (1 << 4) | (1 << 5) | (1 << 6)); acpi_build_table_header((struct acpi_table_header *)fadt, "FACP", -- bochs-0009_qemu-bios-pci-hotplug-support.patch: --- NEW FILE bochs-0009_qemu-bios-pci-hotplug-support.patch --- qemu: bios: pci hotplug support (Marcelo Tosatti) Signed-off-by: Marcelo Tosatti Signed-off-by: Anthony Liguori Index: bochs/bios/acpi-dsdt.dsl =================================================================== --- bochs.orig/bios/acpi-dsdt.dsl +++ bochs/bios/acpi-dsdt.dsl @@ -91,6 +91,61 @@ DefinitionBlock ( prt_slot3(0x001f), }) + OperationRegion(PCST, SystemIO, 0xae00, 0x08) + Field (PCST, DWordAcc, NoLock, WriteAsZeros) + { + PCIU, 32, + PCID, 32, + } + + OperationRegion(SEJ, SystemIO, 0xae08, 0x04) + Field (SEJ, DWordAcc, NoLock, WriteAsZeros) + { + B0EJ, 32, + } + +#define hotplug_slot(name, nr) \ + Device (S##name) { \ + Name (_ADR, nr##0000) \ + Method (_EJ0,1) { \ + Store(ShiftLeft(1, nr), B0EJ) \ + Return (0x0) \ + } \ + Name (_SUN, name) \ + } + + hotplug_slot(1, 0x0001) + hotplug_slot(2, 0x0002) + hotplug_slot(3, 0x0003) + hotplug_slot(4, 0x0004) + hotplug_slot(5, 0x0005) + hotplug_slot(6, 0x0006) + hotplug_slot(7, 0x0007) + hotplug_slot(8, 0x0008) + hotplug_slot(9, 0x0009) + hotplug_slot(10, 0x000a) + hotplug_slot(11, 0x000b) + hotplug_slot(12, 0x000c) + hotplug_slot(13, 0x000d) + hotplug_slot(14, 0x000e) + hotplug_slot(15, 0x000f) + hotplug_slot(16, 0x0010) + hotplug_slot(17, 0x0011) + hotplug_slot(18, 0x0012) + hotplug_slot(19, 0x0013) + hotplug_slot(20, 0x0014) + hotplug_slot(21, 0x0015) + hotplug_slot(22, 0x0016) + hotplug_slot(23, 0x0017) + hotplug_slot(24, 0x0018) + hotplug_slot(25, 0x0019) + hotplug_slot(26, 0x001a) + hotplug_slot(27, 0x001b) + hotplug_slot(28, 0x001c) + hotplug_slot(29, 0x001d) + hotplug_slot(30, 0x001e) + hotplug_slot(31, 0x001f) + Name (_CRS, ResourceTemplate () { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode, @@ -605,8 +660,50 @@ DefinitionBlock ( Method(_L00) { Return(0x01) } + +#define gen_pci_hotplug(nr) \ + If (And(\_SB.PCI0.PCIU, ShiftLeft(1, nr))) { \ + Notify(\_SB.PCI0.S##nr, 1) \ + } \ + If (And(\_SB.PCI0.PCID, ShiftLeft(1, nr))) { \ + Notify(\_SB.PCI0.S##nr, 3) \ + } + Method(_L01) { - Return(0x01) + gen_pci_hotplug(1) + gen_pci_hotplug(2) + gen_pci_hotplug(3) + gen_pci_hotplug(4) + gen_pci_hotplug(5) + gen_pci_hotplug(6) + gen_pci_hotplug(7) + gen_pci_hotplug(8) + gen_pci_hotplug(9) + gen_pci_hotplug(10) + gen_pci_hotplug(11) + gen_pci_hotplug(12) + gen_pci_hotplug(13) + gen_pci_hotplug(14) + gen_pci_hotplug(15) + gen_pci_hotplug(16) + gen_pci_hotplug(17) + gen_pci_hotplug(18) + gen_pci_hotplug(19) + gen_pci_hotplug(20) + gen_pci_hotplug(21) + gen_pci_hotplug(22) + gen_pci_hotplug(23) + gen_pci_hotplug(24) + gen_pci_hotplug(25) + gen_pci_hotplug(26) + gen_pci_hotplug(27) + gen_pci_hotplug(28) + gen_pci_hotplug(29) + gen_pci_hotplug(30) + gen_pci_hotplug(31) + + Return (0x01) + } Method(_L02) { Return(0x01) -- bochs-0010_bios-mark-the-acpi-sci-interrupt-as-connected-to-irq-9.patch: --- NEW FILE bochs-0010_bios-mark-the-acpi-sci-interrupt-as-connected-to-irq-9.patch --- bios: mark the acpi sci interrupt as connected to irq 9 (Avi Kivity) Due to a chipset bug, the sci interrupt is hardwired to irq 9. Set the pci interrupt line register accordingly. Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Index: bochs/bios/rombios32.c =================================================================== --- bochs.orig/bios/rombios32.c +++ bochs/bios/rombios32.c @@ -981,6 +981,8 @@ static void pci_bios_init_device(PCIDevi /* PIIX4 Power Management device (for ACPI) */ pm_io_base = PM_IO_BASE; smb_io_base = SMB_IO_BASE; + // acpi sci is hardwired to 9 + pci_config_writeb(d, PCI_INTERRUPT_LINE, 9); pm_sci_int = pci_config_readb(d, PCI_INTERRUPT_LINE); piix4_pm_enable(d); acpi_enabled = 1; -- bochs-0011_read-additional-acpi-tables-from-a-vm.patch: --- NEW FILE bochs-0011_read-additional-acpi-tables-from-a-vm.patch --- Read additional ACPI tables from a VM (Gleb Natapov) Signed-off-by: Gleb Natapov Signed-off-by: Anthony Liguori diff --git a/bios/rombios32.c b/bios/rombios32.c index 3269be5..191707d 100644 --- a/bios/rombios32.c +++ b/bios/rombios32.c @@ -457,6 +457,8 @@ void wrmsr_smp(uint32_t index, uint64_t val) #define QEMU_CFG_SIGNATURE 0x00 #define QEMU_CFG_ID 0x01 #define QEMU_CFG_UUID 0x02 +#define QEMU_CFG_ARCH_LOCAL 0x8000 +#define QEMU_CFG_ACPI_TABLES (QEMU_CFG_ARCH_LOCAL + 0) int qemu_cfg_port; @@ -484,6 +486,27 @@ void qemu_cfg_read(uint8_t *buf, int len) while (len--) *(buf++) = inb(QEMU_CFG_DATA_PORT); } + +static uint16_t acpi_additional_tables(void) +{ + uint16_t cnt; + + qemu_cfg_select(QEMU_CFG_ACPI_TABLES); + qemu_cfg_read((uint8_t*)&cnt, sizeof(cnt)); + + return cnt; +} + +static int acpi_load_table(int i, uint32_t addr, uint16_t *len) +{ + qemu_cfg_read((uint8_t*)len, sizeof(*len)); + + if (!*len) + return -1; + + qemu_cfg_read((uint8_t*)addr, *len); + return 0; +} #endif void uuid_probe(void) @@ -1534,8 +1557,8 @@ void acpi_bios_init(void) uint32_t hpet_addr; #endif uint32_t base_addr, rsdt_addr, fadt_addr, addr, facs_addr, dsdt_addr, ssdt_addr; - uint32_t acpi_tables_size, madt_addr, madt_size; - int i; + uint32_t acpi_tables_size, madt_addr, madt_size, rsdt_size; + uint16_t i, external_tables; /* reserve memory space for tables */ #ifdef BX_USE_EBDA_TABLES @@ -1548,10 +1571,17 @@ void acpi_bios_init(void) bios_table_cur_addr += sizeof(*rsdp); #endif +#ifdef BX_QEMU + external_tables = acpi_additional_tables(); +#else + external_tables = 0; +#endif + addr = base_addr = ram_size - ACPI_DATA_SIZE; rsdt_addr = addr; rsdt = (void *)(addr); - addr += sizeof(*rsdt); + rsdt_size = sizeof(*rsdt) + external_tables * 4; + addr += rsdt_size; fadt_addr = addr; fadt = (void *)(addr); @@ -1590,12 +1620,6 @@ void acpi_bios_init(void) addr += sizeof(*hpet); #endif - acpi_tables_size = addr - base_addr; - - BX_INFO("ACPI tables: RSDP addr=0x%08lx ACPI DATA addr=0x%08lx size=0x%x\n", - (unsigned long)rsdp, - (unsigned long)rsdt, acpi_tables_size); - /* RSDP */ memset(rsdp, 0, sizeof(*rsdp)); memcpy(rsdp->signature, "RSD PTR ", 8); @@ -1607,17 +1631,6 @@ void acpi_bios_init(void) rsdp->rsdt_physical_address = cpu_to_le32(rsdt_addr); rsdp->checksum = acpi_checksum((void *)rsdp, 20); - /* RSDT */ - memset(rsdt, 0, sizeof(*rsdt)); - rsdt->table_offset_entry[0] = cpu_to_le32(fadt_addr); - rsdt->table_offset_entry[1] = cpu_to_le32(madt_addr); - rsdt->table_offset_entry[2] = cpu_to_le32(ssdt_addr); -#ifdef BX_QEMU - rsdt->table_offset_entry[3] = cpu_to_le32(hpet_addr); -#endif - acpi_build_table_header((struct acpi_table_header *)rsdt, - "RSDT", sizeof(*rsdt), 1); - /* FADT */ memset(fadt, 0, sizeof(*fadt)); fadt->firmware_ctrl = cpu_to_le32(facs_addr); @@ -1692,6 +1705,7 @@ void acpi_bios_init(void) "APIC", madt_size, 1); } + memset(rsdt, 0, rsdt_size); #ifdef BX_QEMU /* HPET */ memset(hpet, 0, sizeof(*hpet)); @@ -1702,7 +1716,34 @@ void acpi_bios_init(void) hpet->addr.address = cpu_to_le32(ACPI_HPET_ADDRESS); acpi_build_table_header((struct acpi_table_header *)hpet, "HPET", sizeof(*hpet), 1); + + acpi_additional_tables(); /* resets cfg to required entry */ + for(i = 0; i < external_tables; i++) { + uint16_t len; + if(acpi_load_table(i, addr, &len) < 0) + BX_PANIC("Failed to load ACPI table from QEMU\n"); + rsdt->table_offset_entry[i+4] = cpu_to_le32(addr); + addr += len; + if(addr >= ram_size) + BX_PANIC("ACPI table overflow\n"); + } +#endif + + /* RSDT */ + rsdt->table_offset_entry[0] = cpu_to_le32(fadt_addr); + rsdt->table_offset_entry[1] = cpu_to_le32(madt_addr); + rsdt->table_offset_entry[2] = cpu_to_le32(ssdt_addr); +#ifdef BX_QEMU + rsdt->table_offset_entry[3] = cpu_to_le32(hpet_addr); #endif + acpi_build_table_header((struct acpi_table_header *)rsdt, + "RSDT", rsdt_size, 1); + + acpi_tables_size = addr - base_addr; + + BX_INFO("ACPI tables: RSDP addr=0x%08lx ACPI DATA addr=0x%08lx size=0x%x\n", + (unsigned long)rsdp, + (unsigned long)rsdt, acpi_tables_size); } -- Gleb. Index: bochs.spec =================================================================== RCS file: /cvs/pkgs/rpms/bochs/devel/bochs.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- bochs.spec 5 Mar 2009 17:33:46 -0000 1.38 +++ bochs.spec 5 Mar 2009 17:42:27 -0000 1.39 @@ -1,7 +1,7 @@ %define githead 04387139e3b Name: bochs Version: 2.3.8 -Release: 0.2.git%{githead}%{?dist} +Release: 0.3.git%{githead}%{?dist} Summary: Portable x86 PC emulator Group: Applications/Emulators License: LGPLv2+ @@ -201,6 +201,9 @@ %changelog +* Thu Mar 05 2009 Glauber Costa 2.3.8-0.3.git04387139e3b +- added patches ;-) + * Thu Mar 05 2009 Glauber Costa 2.3.8-0.2.git04387139e3b - this time with sources added. --- bochs-2.3.6-gcc43.patch DELETED --- --- bochs-2.3.7-3dnow-compile-fix.patch DELETED --- --- bochs-2.3.7-big-endian.patch DELETED --- --- bochs-wx28.patch DELETED --- From jkeating at fedoraproject.org Thu Mar 5 17:55:37 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Thu, 5 Mar 2009 17:55:37 +0000 (UTC) Subject: fedora-release fedora-release.spec,1.70,1.71 Message-ID: <20090305175537.4319470116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18966 Modified Files: fedora-release.spec Log Message: Drop req on fedora-release Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- fedora-release.spec 4 Mar 2009 04:46:04 -0000 1.70 +++ fedora-release.spec 5 Mar 2009 17:55:36 -0000 1.71 @@ -4,7 +4,7 @@ Summary: Fedora release files Name: fedora-release Version: 10.91 -Release: 3 +Release: 4 License: GPLv2 Group: System Environment/Base URL: http://fedoraproject.org @@ -12,10 +12,6 @@ Obsoletes: redhat-release Provides: redhat-release Provides: system-release = %{version}-%{release} -Requires: fedora-release-notes >= 10 -# We require release notes to make sure that they don't get dropped during -# upgrades, and just because we always want the release notes available -# instead of explicitly asked for BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -97,6 +93,9 @@ /etc/pki/rpm-gpg/* %changelog +* Thu Mar 05 2009 Jesse Keating - 10.91-4 +- Drop req on fedora-release-notes (#483018) + * Tue Mar 03 2009 Jesse Keating - 10.91-3 - Move metalink urls to mirrorlist for helping anaconda From jkeating at fedoraproject.org Thu Mar 5 17:57:43 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Thu, 5 Mar 2009 17:57:43 +0000 (UTC) Subject: rpms/fedora-release/devel fedora-release.spec, 1.72, 1.73 sources, 1.59, 1.60 Message-ID: <20090305175743.5DDAF70116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/fedora-release/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19220 Modified Files: fedora-release.spec sources Log Message: * Thu Mar 05 2009 Jesse Keating - 10.91-4 - Drop req on fedora-release-notes (#483018) Index: fedora-release.spec =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release/devel/fedora-release.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- fedora-release.spec 5 Mar 2009 03:35:34 -0000 1.72 +++ fedora-release.spec 5 Mar 2009 17:57:12 -0000 1.73 @@ -4,7 +4,7 @@ Summary: Fedora release files Name: fedora-release Version: 10.91 -Release: 3 +Release: 4 License: GPLv2 Group: System Environment/Base URL: http://fedoraproject.org @@ -12,10 +12,6 @@ Obsoletes: redhat-release Provides: redhat-release Provides: system-release = %{version}-%{release} -Requires: fedora-release-notes >= 10 -# We require release notes to make sure that they don't get dropped during -# upgrades, and just because we always want the release notes available -# instead of explicitly asked for BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -97,6 +93,9 @@ /etc/pki/rpm-gpg/* %changelog +* Thu Mar 05 2009 Jesse Keating - 10.91-4 +- Drop req on fedora-release-notes (#483018) + * Tue Mar 03 2009 Jesse Keating - 10.91-3 - Move metalink urls to mirrorlist for helping anaconda Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release/devel/sources,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- sources 5 Mar 2009 03:35:34 -0000 1.59 +++ sources 5 Mar 2009 17:57:12 -0000 1.60 @@ -1 +1 @@ -74545fcd708991f8e762d8239e223239 fedora-release-10.91.tar.gz +57da332eedd24e0fc8dc325aa54e440c fedora-release-10.91.tar.gz From harald at fedoraproject.org Thu Mar 5 18:00:40 2009 From: harald at fedoraproject.org (Harald Hoyer) Date: Thu, 5 Mar 2009 18:00:40 +0000 (UTC) Subject: rpms/readahead/devel .cvsignore, 1.10, 1.11 readahead.spec, 1.54, 1.55 sources, 1.14, 1.15 Message-ID: <20090305180040.1FFCA70116@cvs1.fedora.phx.redhat.com> Author: harald Update of /cvs/pkgs/rpms/readahead/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19691 Modified Files: .cvsignore readahead.spec sources Log Message: * Thu Mar 05 2009 Harald Hoyer 1.4.9-1 - version 1.4.9 - readahead-collector is now triggered by rpm database changes Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/readahead/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 20 Feb 2009 09:45:33 -0000 1.10 +++ .cvsignore 5 Mar 2009 18:00:09 -0000 1.11 @@ -1 +1 @@ -readahead-1.4.8.tar.bz2 +readahead-1.4.9.tar.bz2 Index: readahead.spec =================================================================== RCS file: /cvs/pkgs/rpms/readahead/devel/readahead.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- readahead.spec 25 Feb 2009 19:20:01 -0000 1.54 +++ readahead.spec 5 Mar 2009 18:00:09 -0000 1.55 @@ -1,7 +1,7 @@ Summary: Read a preset list of files into memory Name: readahead -Version: 1.4.8 -Release: 2%{?dist} +Version: 1.4.9 +Release: 1%{?dist} Epoch: 1 Group: System Environment/Base License: GPLv2+ @@ -68,6 +68,10 @@ /sbin/readahead-collector %changelog +* Thu Mar 05 2009 Harald Hoyer 1.4.9-1 +- version 1.4.9 +- readahead-collector is now triggered by rpm database changes + * Wed Feb 25 2009 Fedora Release Engineering - 1:1.4.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/readahead/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 20 Feb 2009 09:45:33 -0000 1.14 +++ sources 5 Mar 2009 18:00:09 -0000 1.15 @@ -1 +1 @@ -e249a7c6d4aebea77412ffa3e2b8a570 readahead-1.4.8.tar.bz2 +f0f4b5259aebb62c83c4079b977464e7 readahead-1.4.9.tar.bz2 From trasher at fedoraproject.org Thu Mar 5 18:03:09 2009 From: trasher at fedoraproject.org (Johan Cwiklinski) Date: Thu, 5 Mar 2009 18:03:09 +0000 (UTC) Subject: rpms/eric/devel eric.spec,1.38,1.39 Message-ID: <20090305180309.E719770116@cvs1.fedora.phx.redhat.com> Author: trasher Update of /cvs/extras/rpms/eric/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20092 Modified Files: eric.spec Log Message: Fixed bad 'full_python_ver' Index: eric.spec =================================================================== RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- eric.spec 24 Feb 2009 15:19:31 -0000 1.38 +++ eric.spec 5 Mar 2009 18:02:39 -0000 1.39 @@ -8,7 +8,7 @@ Name: eric Summary: Python IDE Version: 4.3.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ Group: Development/Tools @@ -43,7 +43,7 @@ #Requires(hint): qt4-doc %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]") -%global full_python_ver %(%{__python} -c "import sys ; print sys.version[:5]") +%global full_python_ver %(%{__python} -c "import sys ; print sys.version[:3]") %global python_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") %global pyqt_ver %(%{__python} -c "from PyQt4 import QtCore; print QtCore.PYQT_VERSION_STR") %global qt_ver %(%{__python} -c "from PyQt4 import QtCore; print QtCore.QT_VERSION_STR") @@ -145,6 +145,9 @@ %changelog +* Thu Mar 5 2009 Johan Cwiklinski - 4.3.0-3 +- Fixed bad 'full_python_ver' + * Tue Feb 24 2009 Fedora Release Engineering - 4.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From maxx at fedoraproject.org Thu Mar 5 18:25:52 2009 From: maxx at fedoraproject.org (Mads Villadsen) Date: Thu, 5 Mar 2009 18:25:52 +0000 (UTC) Subject: rpms/hamster-applet/devel .cvsignore, 1.16, 1.17 hamster-applet.spec, 1.24, 1.25 sources, 1.16, 1.17 Message-ID: <20090305182552.6D57A70116@cvs1.fedora.phx.redhat.com> Author: maxx Update of /cvs/pkgs/rpms/hamster-applet/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22537 Modified Files: .cvsignore hamster-applet.spec sources Log Message: * Thu Mar 5 2009 Mads Villadsen - 2.25.92-1 - Update to latest upstream release - Better statistics - Better keyboard support - Improved python 2.6 support Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hamster-applet/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 5 Feb 2009 21:34:38 -0000 1.16 +++ .cvsignore 5 Mar 2009 18:25:21 -0000 1.17 @@ -1 +1 @@ -hamster-applet-2.25.90.tar.bz2 +hamster-applet-2.25.92.tar.bz2 Index: hamster-applet.spec =================================================================== RCS file: /cvs/pkgs/rpms/hamster-applet/devel/hamster-applet.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- hamster-applet.spec 25 Feb 2009 03:22:02 -0000 1.24 +++ hamster-applet.spec 5 Mar 2009 18:25:22 -0000 1.25 @@ -2,8 +2,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: hamster-applet -Version: 2.25.90 -Release: 2%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Summary: Time tracking applet Group: Development/Languages @@ -98,6 +98,12 @@ %changelog +* Thu Mar 5 2009 Mads Villadsen - 2.25.92-1 +- Update to latest upstream release +- Better statistics +- Better keyboard support +- Improved python 2.6 support + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.90-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hamster-applet/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 5 Feb 2009 21:34:38 -0000 1.16 +++ sources 5 Mar 2009 18:25:22 -0000 1.17 @@ -1 +1 @@ -97e2986f23cddc64e2219f938f7784cf hamster-applet-2.25.90.tar.bz2 +748d4a0f4593914b1cf1a3c11dd39cc5 hamster-applet-2.25.92.tar.bz2 From pkgdb at fedoraproject.org Thu Mar 5 18:39:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 18:39:49 +0000 Subject: [pkgdb] esperanza was added for spot Message-ID: <20090305183949.E570E2082B2@bastion.fedora.phx.redhat.com> spot has added Package esperanza with summary A graphical audio player spot has approved Package esperanza spot has added a Fedora devel branch for esperanza with an owner of spot spot has approved esperanza in Fedora devel spot has approved Package esperanza spot has set commit to Approved for provenpackager on esperanza (Fedora devel) spot has set build to Approved for provenpackager on esperanza (Fedora devel) spot has set checkout to Approved for provenpackager on esperanza (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/esperanza From spot at fedoraproject.org Thu Mar 5 18:39:19 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Thu, 5 Mar 2009 18:39:19 +0000 (UTC) Subject: rpms/esperanza - New directory Message-ID: <20090305183919.3CBCC70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/esperanza In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvss24408/rpms/esperanza Log Message: Directory /cvs/pkgs/rpms/esperanza added to the repository From spot at fedoraproject.org Thu Mar 5 18:39:19 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Thu, 5 Mar 2009 18:39:19 +0000 (UTC) Subject: rpms/esperanza/devel - New directory Message-ID: <20090305183919.8A60170117@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/esperanza/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvss24408/rpms/esperanza/devel Log Message: Directory /cvs/pkgs/rpms/esperanza/devel added to the repository From pkgdb at fedoraproject.org Thu Mar 5 18:39:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 18:39:52 +0000 Subject: [pkgdb] esperanza (Fedora, 10) updated by spot Message-ID: <20090305183951.14D11208543@bastion.fedora.phx.redhat.com> spot added a Fedora 10 branch for esperanza spot has set commit to Approved for provenpackager on esperanza (Fedora 10) spot has set build to Approved for provenpackager on esperanza (Fedora 10) spot has set checkout to Approved for provenpackager on esperanza (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/esperanza From pkgdb at fedoraproject.org Thu Mar 5 18:39:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 18:39:52 +0000 Subject: [pkgdb] esperanza (Fedora, 9) updated by spot Message-ID: <20090305183951.1D750208545@bastion.fedora.phx.redhat.com> spot added a Fedora 9 branch for esperanza spot has set commit to Approved for provenpackager on esperanza (Fedora 9) spot has set build to Approved for provenpackager on esperanza (Fedora 9) spot has set checkout to Approved for provenpackager on esperanza (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/esperanza From spot at fedoraproject.org Thu Mar 5 18:39:38 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Thu, 5 Mar 2009 18:39:38 +0000 (UTC) Subject: rpms/esperanza Makefile,NONE,1.1 Message-ID: <20090305183938.5A8BA70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/esperanza In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvss24408/rpms/esperanza Added Files: Makefile Log Message: Setup of module esperanza --- NEW FILE Makefile --- # Top level Makefile for module esperanza all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From spot at fedoraproject.org Thu Mar 5 18:39:38 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Thu, 5 Mar 2009 18:39:38 +0000 (UTC) Subject: rpms/esperanza/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305183938.C69EE70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/esperanza/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvss24408/rpms/esperanza/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module esperanza --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: esperanza # $Id: Makefile,v 1.1 2009/03/05 18:39:38 spot Exp $ NAME := esperanza SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From notting at fedoraproject.org Thu Mar 5 18:51:16 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Thu, 5 Mar 2009 18:51:16 +0000 (UTC) Subject: rpms/libofx/devel libofx.spec, 1.35, 1.36 libofx-0.8.3-xml++.patch, 1.1, NONE libofx-account-type.patch, 1.1, NONE Message-ID: <20090305185116.6C65170116@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/rpms/libofx/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26408 Modified Files: libofx.spec Removed Files: libofx-0.8.3-xml++.patch libofx-account-type.patch Log Message: Update to 0.9.1 Take out xml++ conditionals Index: libofx.spec =================================================================== RCS file: /cvs/extras/rpms/libofx/devel/libofx.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- libofx.spec 25 Feb 2009 16:48:31 -0000 1.35 +++ libofx.spec 5 Mar 2009 18:50:45 -0000 1.36 @@ -1,22 +1,15 @@ -%define with_xml 0 - Summary: A library for supporting Open Financial Exchange (OFX) Name: libofx -Version: 0.9.0 -Release: 2 +Version: 0.9.1 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/libofx/%{name}-%{version}.tar.gz URL: http://libofx.sourceforge.net/ Group: System Environment/Libraries License: GPLv2+ -Patch1: libofx-0.8.3-xml++.patch -Patch2: libofx-assorted-c++-fu.patch +Patch1: libofx-assorted-c++-fu.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: opensp-devel BuildRequires: curl-devel -%if %{with_xml} -BuildRequires: libxml++-devel -BuildRequires: autoconf -%endif Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -48,11 +41,7 @@ %prep %setup -q -%if %{with_xml} -%patch1 -p1 -autoconf -%endif -%patch2 -p1 -b .c++-fu +%patch1 -p1 -b .c++-fu rm -rf ./doc/ofx_sample_files/CVS chmod 644 ./doc/ofx_sample_files/* @@ -95,6 +84,10 @@ %{_libdir}/*.so %changelog +* Thu Mar 5 2009 Bill Nottingham - 0.9.1-1 +- update to 0.9.1 +- remove xml++ support - we've never built it + * Wed Feb 25 2009 Fedora Release Engineering - 0.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- libofx-0.8.3-xml++.patch DELETED --- --- libofx-account-type.patch DELETED --- From spot at fedoraproject.org Thu Mar 5 18:51:52 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Thu, 5 Mar 2009 18:51:52 +0000 (UTC) Subject: rpms/esperanza/devel esperanza-0.4.0-gitfixes20081204.patch, NONE, 1.1 esperanza.desktop, NONE, 1.1 esperanza.png, NONE, 1.1 esperanza.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305185152.4A62270116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/esperanza/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26539/devel Modified Files: .cvsignore sources Added Files: esperanza-0.4.0-gitfixes20081204.patch esperanza.desktop esperanza.png esperanza.spec import.log Log Message: initial commit esperanza-0.4.0-gitfixes20081204.patch: --- NEW FILE esperanza-0.4.0-gitfixes20081204.patch --- diff -urP esperanza-0.4.0.OLD/config.pri esperanza-0.4.0/config.pri --- esperanza-0.4.0.OLD/config.pri 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/config.pri 2008-12-04 18:25:09.000000000 -0500 @@ -7,6 +7,7 @@ INCLUDEPATH += /opt/local/include # ugly DEFINES += HAVE_DNSSD LIBS += -lboost_signals + QMAKE_LFLAGS_SHAPP += -bind_at_load } !win32 { diff -urP esperanza-0.4.0.OLD/data/text/about.html esperanza-0.4.0/data/text/about.html --- esperanza-0.4.0.OLD/data/text/about.html 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/data/text/about.html 2008-12-04 18:25:09.000000000 -0500 @@ -6,7 +6,7 @@

    Frequent Contributor: Thilo Cestonaro <c.thilo at gmx.de>

    Contributor: Gianluca Romanin <j_zar at openjay.org>

    Contributor: Auke Schrijnen <auke at schrijnen.nl>

    -

    Contributor: Anders Gustafsson <andersg at xmms.org>

    +

    Contributor: Anders Waldenborg <andersg at xmms.org>

    Contributor: Sebastien Cevey <seb at cine7.net>

    Contributor: Georg Schild <dangertools at gmx.at>

    Contributor: Dan Chokola <dan at chokola.com>

    diff -urP esperanza-0.4.0.OLD/esperanza.tmproj esperanza-0.4.0/esperanza.tmproj --- esperanza-0.4.0.OLD/esperanza.tmproj 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/esperanza.tmproj 2008-12-04 18:25:09.000000000 -0500 @@ -3,7 +3,7 @@ currentDocument - src/ui/playerwidget.cpp + src/lib/collectioninfomodel.cpp documents @@ -18,7 +18,7 @@ fileHierarchyDrawerWidth - 224 + 295 metaData ChangeLog @@ -35,88 +35,162 @@ firstVisibleLine 0 - src/dialogs/lastfm/plugin.h + src/dialogs/medialibdialog/medialibdialog.cpp caret column - 49 + 37 line - 26 + 39 + + firstVisibleColumn + 0 + firstVisibleLine + 185 + + src/dialogs/medialibdialog/medialibdialog.pro + + caret + + column + 112 + line + 4 firstVisibleColumn 0 firstVisibleLine 0 - src/ui/esperanza_plugin.h + src/dialogs/medialibdialog/medialibpanebrowser.cpp caret column - 18 + 56 line - 38 + 39 firstVisibleColumn 0 firstVisibleLine - 2 + 5 + + src/dialogs/medialibdialog/medialibview.cpp + + caret + + column + 0 + line + 36 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + src/dialogs/medialibdialog/panebrowserview.cpp + + caret + + column + 4 + line + 85 + + firstVisibleColumn + 0 + firstVisibleLine + 47 + + src/dialogs/medialibdialog/panebrowserview.h + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 4 - src/ui/main.cpp + src/lib/collectioninfomodel.cpp caret column - 2 + 0 line - 34 + 44 firstVisibleColumn 0 firstVisibleLine - 73 + 23 - src/ui/playerwidget.cpp + src/lib/collectionmodel.cpp caret column - 2 + 20 line - 209 + 72 firstVisibleColumn 0 firstVisibleLine - 176 + 39 - src/ui/playerwidget.h + src/ui/esperanza_plugin.h caret column - 27 + 18 line - 32 + 38 firstVisibleColumn 0 firstVisibleLine + 2 + + src/ui/ui.pro + + caret + + column + 0 + line [...1797 lines suppressed...] void gotConnection (XClient *); Only in esperanza-0.4.0.OLD/src/ui: growl.cpp Only in esperanza-0.4.0.OLD/src/ui: growl.h Only in esperanza-0.4.0.OLD/src/ui: mac_growl.h Only in esperanza-0.4.0.OLD/src/ui: mac_growl.mm diff -urP esperanza-0.4.0.OLD/src/ui/main.cpp esperanza-0.4.0/src/ui/main.cpp --- esperanza-0.4.0.OLD/src/ui/main.cpp 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/main.cpp 2008-12-04 18:25:09.000000000 -0500 @@ -40,6 +40,7 @@ Q_IMPORT_PLUGIN(aboutdialog) Q_IMPORT_PLUGIN(preferencesdialog) Q_IMPORT_PLUGIN(xmms2dpreferences) +Q_IMPORT_PLUGIN(equalizerdialog) int main (int argc, char **argv) Only in esperanza-0.4.0.OLD/src/ui: panebrowserview.cpp Only in esperanza-0.4.0.OLD/src/ui: panebrowserview.h diff -urP esperanza-0.4.0.OLD/src/ui/playerwidget.cpp esperanza-0.4.0/src/ui/playerwidget.cpp --- esperanza-0.4.0.OLD/src/ui/playerwidget.cpp 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/playerwidget.cpp 2008-12-04 18:25:09.000000000 -0500 @@ -46,7 +46,11 @@ #include "shortcutmanager.h" #include "esperanza_plugin.h" + PlayerWidget::PlayerWidget (QWidget *parent, XClient *client) : QMainWindow (parent) +#ifdef Q_WS_MAC +, macMenuBar(0) +#endif { QSettings s; @@ -54,7 +58,6 @@ setWindowTitle ("Esperanza"); setFocusPolicy (Qt::StrongFocus); - setAttribute (Qt::WA_DeleteOnClose); QWidget *main_w = new QWidget (this); setCentralWidget (main_w); @@ -194,6 +197,16 @@ /* Process the plugins ... */ process_dialog_plugin (); + + #ifdef Q_WS_MAC + m_infomenu.setTitle(tr("Info")); + // m_playlistmenu.setTitle(tr("Playlist")); + m_settingsmenu.setTitle(tr("Extras")); + + macMenuBar.addMenu(&m_infomenu); + // macMenuBar.addMenu(&m_playlistmenu); + macMenuBar.addMenu(&m_settingsmenu); + #endif } void diff -urP esperanza-0.4.0.OLD/src/ui/playerwidget.h esperanza-0.4.0/src/ui/playerwidget.h --- esperanza-0.4.0.OLD/src/ui/playerwidget.h 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/playerwidget.h 2008-12-04 18:25:09.000000000 -0500 @@ -116,6 +116,9 @@ SystemTray *m_systray; MiniMode *m_mini; + #ifdef Q_WS_MAC + QMenuBar macMenuBar; + #endif QMenu m_infomenu; QMenu m_playlistmenu; QMenu m_settingsmenu; diff -urP esperanza-0.4.0.OLD/src/ui/progressframe.cpp esperanza-0.4.0/src/ui/progressframe.cpp --- esperanza-0.4.0.OLD/src/ui/progressframe.cpp 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/progressframe.cpp 2008-12-04 18:25:09.000000000 -0500 @@ -41,7 +41,8 @@ ProgressFrame::ProgressFrame (QWidget *parent, XClient *client, bool seek) : QFrame( parent ), - m_reverse( false ) + m_reverse( false ), + m_move( false ) { m_client = client; m_maxValue = 0; diff -urP esperanza-0.4.0.OLD/src/ui/systemtray.cpp esperanza-0.4.0/src/ui/systemtray.cpp --- esperanza-0.4.0.OLD/src/ui/systemtray.cpp 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/systemtray.cpp 2008-12-04 18:25:09.000000000 -0500 @@ -64,12 +64,6 @@ setContextMenu (systray_menu); connect (client, SIGNAL (gotConnection (XClient *)), this, SLOT (got_connection (XClient *))); -#ifdef Q_WS_MACX - m_growl = new GrowlNotifier (this, "Esperanza", QStringList ("New song")); - m_growl->do_registration (); -#else - m_growl = NULL; -#endif } @@ -138,14 +132,11 @@ if (m_display_action) { m_display_action->setText (message); } + setToolTip(message); if (s.value ("core/donotification").toBool ()) { - if (m_growl) { - m_growl->do_notification ("New song", title, message, img); - } else { - showMessage (title, message, icon, milliseconds); - } + showMessage (title, message, icon, milliseconds); } } } diff -urP esperanza-0.4.0.OLD/src/ui/systemtray.h esperanza-0.4.0/src/ui/systemtray.h --- esperanza-0.4.0.OLD/src/ui/systemtray.h 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/systemtray.h 2008-12-04 18:25:09.000000000 -0500 @@ -23,8 +23,6 @@ #include #include -#include "growl.h" - class SystemTray : public QSystemTrayIcon { Q_OBJECT @@ -45,7 +43,6 @@ QAction *m_display_action; QAction *m_hide_action; QAction *m_play_action; - GrowlNotifier *m_growl; QString m_last_notif_str; XClient *m_client; }; diff -urP esperanza-0.4.0.OLD/src/ui/ui.pro esperanza-0.4.0/src/ui/ui.pro --- esperanza-0.4.0.OLD/src/ui/ui.pro 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/ui.pro 2008-12-04 18:25:09.000000000 -0500 @@ -6,7 +6,7 @@ DIALOGS += lastfm medialibdialog \ streamingdialog firsttimewizard \ preferencesdialog aboutdialog \ - xmms2dpreferences + xmms2dpreferences equalizer TOOLS += grepshortcutkeydlg globalshortcut @@ -41,8 +41,6 @@ macx { TARGET = Esperanza - SOURCES += mac_growl.mm - HEADERS += mac_growl.h } @@ -50,9 +48,7 @@ minimode.cpp \ shortcutmanager.cpp \ filedialog.cpp \ - panebrowserview.cpp \ systemtray.cpp \ - growl.cpp \ playerbutton.cpp \ progressframe.cpp \ volumebar.cpp \ @@ -66,10 +62,8 @@ HEADERS += esperanza_plugin.h \ fancyplaylistview.h \ filedialog.h \ - growl.h \ mdns.h \ minimode.h \ - panebrowserview.h \ playerbutton.h \ playerwidget.h \ playlistview.h \ diff -urP esperanza-0.4.0.OLD/src/ui/volumebar.cpp esperanza-0.4.0/src/ui/volumebar.cpp --- esperanza-0.4.0.OLD/src/ui/volumebar.cpp 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/volumebar.cpp 2008-12-04 18:25:09.000000000 -0500 @@ -24,7 +24,7 @@ #include #include -VolumeButton::VolumeButton (QWidget *parent, XClient *client) : QWidget (parent) +VolumeButton::VolumeButton (QWidget *parent, XClient *client) : QWidget (parent), m_channels (0) { m_client = client; @@ -121,7 +121,7 @@ { if (m_channels == 1) { m_client->playback ()->volumeSet ("master", vol) (); - } else { + } else if (m_channels == 2) { m_client->playback ()->volumeSet ("left", vol) (); m_client->playback ()->volumeSet ("right", vol) (); } --- NEW FILE esperanza.desktop --- [Desktop Entry] Version=1.0 Name=Esperanza GenericName=Audio Player Comment=Play and organize your audio collection Exec=xmms2-client-launcher.sh esperanza Icon=esperanza StartupNotify=false Terminal=false Type=Application Categories=Audio;Music;Player;AudioVideo; X-Desktop-File-Install-Version=0.15 --- NEW FILE esperanza.spec --- Name: esperanza Summary: A graphical audio player Version: 0.4.0 Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia Source0: http://exodus.xmms.se/~tru/esperanza/0.4/%{name}-%{version}.tar.gz Source1: %{name}.desktop # Derived from the included image in data/images Source2: %{name}.png Patch0: esperanza-0.4.0-gitfixes20081204.patch URL: http://wiki.xmms2.xmms.se/wiki/Client:Esperanza BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xmms2-devel, qt-devel BuildRequires: desktop-file-utils %description Esperanza is an audio player for the XMMS2 framework written with C++ and QT4. It has a sleek, uncomplicated UI, and supports album art in the playlist. %prep %setup -q %patch0 -p1 -b .gitfixes # Don't need exec perms here chmod -x src/dialogs/xmms2dpreferences/xmms2dprefmodel* %build ./configure --prefix=%{_prefix} # Rebuild translation files pushd data/translations rm -rf *.qm for i in *.ts; do lrelease-qt4 $i done popd make %{?_smp_mflags} %install rm -rf %{buildroot} make INSTALL_ROOT=%{buildroot} install mkdir -p %{buildroot}%{_datadir}/pixmaps install -m0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog COPYING COPYING.GPL data/text/*.html %{_bindir}/%{name}* %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/*.desktop %changelog * Thu Mar 5 2009 Tom "spot" Callaway 0.4.0-2 - rebuild translations from source * Thu Dec 4 2008 Tom "spot" Callaway 0.4.0-1 - Initial package for Fedora --- NEW FILE import.log --- esperanza-0_4_0-2_fc11:HEAD:esperanza-0.4.0-2.fc11.src.rpm:1236278352 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/esperanza/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 18:39:38 -0000 1.1 +++ .cvsignore 5 Mar 2009 18:51:21 -0000 1.2 @@ -0,0 +1 @@ +esperanza-0.4.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/esperanza/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 18:39:38 -0000 1.1 +++ sources 5 Mar 2009 18:51:22 -0000 1.2 @@ -0,0 +1 @@ +0b97576cee5d89a58aef9a6754d3fb00 esperanza-0.4.0.tar.gz From hadess at fedoraproject.org Thu Mar 5 18:53:43 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Thu, 5 Mar 2009 18:53:43 +0000 (UTC) Subject: rpms/bluez/devel bluez-try-utf8-harder.patch, NONE, 1.1 bluez.spec, 1.44, 1.45 Message-ID: <20090305185343.DF83F70116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26897 Modified Files: bluez.spec Added Files: bluez-try-utf8-harder.patch Log Message: * Thu Mar 05 2009 - Bastien Nocera - 4.32-4 - Work-around broken devices that export their names in ISO-8859-1 (#450081) bluez-try-utf8-harder.patch: --- NEW FILE bluez-try-utf8-harder.patch --- diff --git a/src/security.c b/src/security.c index a61d75f..75908ba 100644 --- a/src/security.c +++ b/src/security.c @@ -600,8 +600,16 @@ static inline void remote_name_information(int dev, bdaddr_t *sba, void *ptr) memcpy(name, evt->name, 248); /* It's ok to cast end between const and non-const since * we know it points to inside of name which is non-const */ - if (!g_utf8_validate(name, -1, (const char **) &end)) - *end = '\0'; + if (!g_utf8_validate(name, -1, (const char **) &end)) { + char *utf8_name; + + utf8_name = g_convert(name, -1, "UTF-8", "ISO-8859-1", NULL, NULL, NULL); + if (utf8_name) { + memcpy(name, utf8_name, 248); + g_free(utf8_name); + } else + *end = '\0'; + } write_device_name(sba, &dba, name); } Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- bluez.spec 5 Mar 2009 00:56:51 -0000 1.44 +++ bluez.spec 5 Mar 2009 18:53:13 -0000 1.45 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez Version: 4.32 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz @@ -9,6 +9,9 @@ Source2: bluetooth.conf Source3: bluez-uinput.modules Patch1: bluez-utils-oui-usage.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=450081 +# http://thread.gmane.org/gmane.linux.bluez.kernel/1687 +Patch2: bluez-try-utf8-harder.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.bluez.org/ @@ -95,6 +98,7 @@ %setup -q %patch1 -p0 -b .oui +%patch2 -p1 -b .non-utf8-name %build %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund @@ -187,6 +191,10 @@ %{_libdir}/alsa-lib/*.so %changelog +* Thu Mar 05 2009 - Bastien Nocera - 4.32-4 +- Work-around broken devices that export their names in ISO-8859-1 + (#450081) + * Thu Mar 05 2009 - Bastien Nocera - 4.32-3 - Fix permissions on the udev rules (#479348) From spot at fedoraproject.org Thu Mar 5 18:54:10 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Thu, 5 Mar 2009 18:54:10 +0000 (UTC) Subject: rpms/esperanza/F-10 esperanza-0.4.0-gitfixes20081204.patch, NONE, 1.1 esperanza.desktop, NONE, 1.1 esperanza.png, NONE, 1.1 esperanza.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090305185410.DC1D270116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/esperanza/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27163/F-10 Modified Files: sources Added Files: esperanza-0.4.0-gitfixes20081204.patch esperanza.desktop esperanza.png esperanza.spec Log Message: initial branching esperanza-0.4.0-gitfixes20081204.patch: --- NEW FILE esperanza-0.4.0-gitfixes20081204.patch --- diff -urP esperanza-0.4.0.OLD/config.pri esperanza-0.4.0/config.pri --- esperanza-0.4.0.OLD/config.pri 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/config.pri 2008-12-04 18:25:09.000000000 -0500 @@ -7,6 +7,7 @@ INCLUDEPATH += /opt/local/include # ugly DEFINES += HAVE_DNSSD LIBS += -lboost_signals + QMAKE_LFLAGS_SHAPP += -bind_at_load } !win32 { diff -urP esperanza-0.4.0.OLD/data/text/about.html esperanza-0.4.0/data/text/about.html --- esperanza-0.4.0.OLD/data/text/about.html 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/data/text/about.html 2008-12-04 18:25:09.000000000 -0500 @@ -6,7 +6,7 @@

    Frequent Contributor: Thilo Cestonaro <c.thilo at gmx.de>

    Contributor: Gianluca Romanin <j_zar at openjay.org>

    Contributor: Auke Schrijnen <auke at schrijnen.nl>

    -

    Contributor: Anders Gustafsson <andersg at xmms.org>

    +

    Contributor: Anders Waldenborg <andersg at xmms.org>

    Contributor: Sebastien Cevey <seb at cine7.net>

    Contributor: Georg Schild <dangertools at gmx.at>

    Contributor: Dan Chokola <dan at chokola.com>

    diff -urP esperanza-0.4.0.OLD/esperanza.tmproj esperanza-0.4.0/esperanza.tmproj --- esperanza-0.4.0.OLD/esperanza.tmproj 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/esperanza.tmproj 2008-12-04 18:25:09.000000000 -0500 @@ -3,7 +3,7 @@ currentDocument - src/ui/playerwidget.cpp + src/lib/collectioninfomodel.cpp documents @@ -18,7 +18,7 @@ fileHierarchyDrawerWidth - 224 + 295 metaData ChangeLog @@ -35,88 +35,162 @@ firstVisibleLine 0 - src/dialogs/lastfm/plugin.h + src/dialogs/medialibdialog/medialibdialog.cpp caret column - 49 + 37 line - 26 + 39 + + firstVisibleColumn + 0 + firstVisibleLine + 185 + + src/dialogs/medialibdialog/medialibdialog.pro + + caret + + column + 112 + line + 4 firstVisibleColumn 0 firstVisibleLine 0 - src/ui/esperanza_plugin.h + src/dialogs/medialibdialog/medialibpanebrowser.cpp caret column - 18 + 56 line - 38 + 39 firstVisibleColumn 0 firstVisibleLine - 2 + 5 + + src/dialogs/medialibdialog/medialibview.cpp + + caret + + column + 0 + line + 36 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + src/dialogs/medialibdialog/panebrowserview.cpp + + caret + + column + 4 + line + 85 + + firstVisibleColumn + 0 + firstVisibleLine + 47 + + src/dialogs/medialibdialog/panebrowserview.h + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 4 - src/ui/main.cpp + src/lib/collectioninfomodel.cpp caret column - 2 + 0 line - 34 + 44 firstVisibleColumn 0 firstVisibleLine - 73 + 23 - src/ui/playerwidget.cpp + src/lib/collectionmodel.cpp caret column - 2 + 20 line - 209 + 72 firstVisibleColumn 0 firstVisibleLine - 176 + 39 - src/ui/playerwidget.h + src/ui/esperanza_plugin.h caret column - 27 + 18 line - 32 + 38 firstVisibleColumn 0 firstVisibleLine + 2 + + src/ui/ui.pro + + caret + + column + 0 + line [...1797 lines suppressed...] void gotConnection (XClient *); Only in esperanza-0.4.0.OLD/src/ui: growl.cpp Only in esperanza-0.4.0.OLD/src/ui: growl.h Only in esperanza-0.4.0.OLD/src/ui: mac_growl.h Only in esperanza-0.4.0.OLD/src/ui: mac_growl.mm diff -urP esperanza-0.4.0.OLD/src/ui/main.cpp esperanza-0.4.0/src/ui/main.cpp --- esperanza-0.4.0.OLD/src/ui/main.cpp 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/main.cpp 2008-12-04 18:25:09.000000000 -0500 @@ -40,6 +40,7 @@ Q_IMPORT_PLUGIN(aboutdialog) Q_IMPORT_PLUGIN(preferencesdialog) Q_IMPORT_PLUGIN(xmms2dpreferences) +Q_IMPORT_PLUGIN(equalizerdialog) int main (int argc, char **argv) Only in esperanza-0.4.0.OLD/src/ui: panebrowserview.cpp Only in esperanza-0.4.0.OLD/src/ui: panebrowserview.h diff -urP esperanza-0.4.0.OLD/src/ui/playerwidget.cpp esperanza-0.4.0/src/ui/playerwidget.cpp --- esperanza-0.4.0.OLD/src/ui/playerwidget.cpp 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/playerwidget.cpp 2008-12-04 18:25:09.000000000 -0500 @@ -46,7 +46,11 @@ #include "shortcutmanager.h" #include "esperanza_plugin.h" + PlayerWidget::PlayerWidget (QWidget *parent, XClient *client) : QMainWindow (parent) +#ifdef Q_WS_MAC +, macMenuBar(0) +#endif { QSettings s; @@ -54,7 +58,6 @@ setWindowTitle ("Esperanza"); setFocusPolicy (Qt::StrongFocus); - setAttribute (Qt::WA_DeleteOnClose); QWidget *main_w = new QWidget (this); setCentralWidget (main_w); @@ -194,6 +197,16 @@ /* Process the plugins ... */ process_dialog_plugin (); + + #ifdef Q_WS_MAC + m_infomenu.setTitle(tr("Info")); + // m_playlistmenu.setTitle(tr("Playlist")); + m_settingsmenu.setTitle(tr("Extras")); + + macMenuBar.addMenu(&m_infomenu); + // macMenuBar.addMenu(&m_playlistmenu); + macMenuBar.addMenu(&m_settingsmenu); + #endif } void diff -urP esperanza-0.4.0.OLD/src/ui/playerwidget.h esperanza-0.4.0/src/ui/playerwidget.h --- esperanza-0.4.0.OLD/src/ui/playerwidget.h 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/playerwidget.h 2008-12-04 18:25:09.000000000 -0500 @@ -116,6 +116,9 @@ SystemTray *m_systray; MiniMode *m_mini; + #ifdef Q_WS_MAC + QMenuBar macMenuBar; + #endif QMenu m_infomenu; QMenu m_playlistmenu; QMenu m_settingsmenu; diff -urP esperanza-0.4.0.OLD/src/ui/progressframe.cpp esperanza-0.4.0/src/ui/progressframe.cpp --- esperanza-0.4.0.OLD/src/ui/progressframe.cpp 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/progressframe.cpp 2008-12-04 18:25:09.000000000 -0500 @@ -41,7 +41,8 @@ ProgressFrame::ProgressFrame (QWidget *parent, XClient *client, bool seek) : QFrame( parent ), - m_reverse( false ) + m_reverse( false ), + m_move( false ) { m_client = client; m_maxValue = 0; diff -urP esperanza-0.4.0.OLD/src/ui/systemtray.cpp esperanza-0.4.0/src/ui/systemtray.cpp --- esperanza-0.4.0.OLD/src/ui/systemtray.cpp 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/systemtray.cpp 2008-12-04 18:25:09.000000000 -0500 @@ -64,12 +64,6 @@ setContextMenu (systray_menu); connect (client, SIGNAL (gotConnection (XClient *)), this, SLOT (got_connection (XClient *))); -#ifdef Q_WS_MACX - m_growl = new GrowlNotifier (this, "Esperanza", QStringList ("New song")); - m_growl->do_registration (); -#else - m_growl = NULL; -#endif } @@ -138,14 +132,11 @@ if (m_display_action) { m_display_action->setText (message); } + setToolTip(message); if (s.value ("core/donotification").toBool ()) { - if (m_growl) { - m_growl->do_notification ("New song", title, message, img); - } else { - showMessage (title, message, icon, milliseconds); - } + showMessage (title, message, icon, milliseconds); } } } diff -urP esperanza-0.4.0.OLD/src/ui/systemtray.h esperanza-0.4.0/src/ui/systemtray.h --- esperanza-0.4.0.OLD/src/ui/systemtray.h 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/systemtray.h 2008-12-04 18:25:09.000000000 -0500 @@ -23,8 +23,6 @@ #include #include -#include "growl.h" - class SystemTray : public QSystemTrayIcon { Q_OBJECT @@ -45,7 +43,6 @@ QAction *m_display_action; QAction *m_hide_action; QAction *m_play_action; - GrowlNotifier *m_growl; QString m_last_notif_str; XClient *m_client; }; diff -urP esperanza-0.4.0.OLD/src/ui/ui.pro esperanza-0.4.0/src/ui/ui.pro --- esperanza-0.4.0.OLD/src/ui/ui.pro 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/ui.pro 2008-12-04 18:25:09.000000000 -0500 @@ -6,7 +6,7 @@ DIALOGS += lastfm medialibdialog \ streamingdialog firsttimewizard \ preferencesdialog aboutdialog \ - xmms2dpreferences + xmms2dpreferences equalizer TOOLS += grepshortcutkeydlg globalshortcut @@ -41,8 +41,6 @@ macx { TARGET = Esperanza - SOURCES += mac_growl.mm - HEADERS += mac_growl.h } @@ -50,9 +48,7 @@ minimode.cpp \ shortcutmanager.cpp \ filedialog.cpp \ - panebrowserview.cpp \ systemtray.cpp \ - growl.cpp \ playerbutton.cpp \ progressframe.cpp \ volumebar.cpp \ @@ -66,10 +62,8 @@ HEADERS += esperanza_plugin.h \ fancyplaylistview.h \ filedialog.h \ - growl.h \ mdns.h \ minimode.h \ - panebrowserview.h \ playerbutton.h \ playerwidget.h \ playlistview.h \ diff -urP esperanza-0.4.0.OLD/src/ui/volumebar.cpp esperanza-0.4.0/src/ui/volumebar.cpp --- esperanza-0.4.0.OLD/src/ui/volumebar.cpp 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/volumebar.cpp 2008-12-04 18:25:09.000000000 -0500 @@ -24,7 +24,7 @@ #include #include -VolumeButton::VolumeButton (QWidget *parent, XClient *client) : QWidget (parent) +VolumeButton::VolumeButton (QWidget *parent, XClient *client) : QWidget (parent), m_channels (0) { m_client = client; @@ -121,7 +121,7 @@ { if (m_channels == 1) { m_client->playback ()->volumeSet ("master", vol) (); - } else { + } else if (m_channels == 2) { m_client->playback ()->volumeSet ("left", vol) (); m_client->playback ()->volumeSet ("right", vol) (); } --- NEW FILE esperanza.desktop --- [Desktop Entry] Version=1.0 Name=Esperanza GenericName=Audio Player Comment=Play and organize your audio collection Exec=xmms2-client-launcher.sh esperanza Icon=esperanza StartupNotify=false Terminal=false Type=Application Categories=Audio;Music;Player;AudioVideo; X-Desktop-File-Install-Version=0.15 --- NEW FILE esperanza.spec --- Name: esperanza Summary: A graphical audio player Version: 0.4.0 Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia Source0: http://exodus.xmms.se/~tru/esperanza/0.4/%{name}-%{version}.tar.gz Source1: %{name}.desktop # Derived from the included image in data/images Source2: %{name}.png Patch0: esperanza-0.4.0-gitfixes20081204.patch URL: http://wiki.xmms2.xmms.se/wiki/Client:Esperanza BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xmms2-devel, qt-devel BuildRequires: desktop-file-utils %description Esperanza is an audio player for the XMMS2 framework written with C++ and QT4. It has a sleek, uncomplicated UI, and supports album art in the playlist. %prep %setup -q %patch0 -p1 -b .gitfixes # Don't need exec perms here chmod -x src/dialogs/xmms2dpreferences/xmms2dprefmodel* %build ./configure --prefix=%{_prefix} # Rebuild translation files pushd data/translations rm -rf *.qm for i in *.ts; do lrelease-qt4 $i done popd make %{?_smp_mflags} %install rm -rf %{buildroot} make INSTALL_ROOT=%{buildroot} install mkdir -p %{buildroot}%{_datadir}/pixmaps install -m0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog COPYING COPYING.GPL data/text/*.html %{_bindir}/%{name}* %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/*.desktop %changelog * Thu Mar 5 2009 Tom "spot" Callaway 0.4.0-2 - rebuild translations from source * Thu Dec 4 2008 Tom "spot" Callaway 0.4.0-1 - Initial package for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/esperanza/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 18:39:38 -0000 1.1 +++ sources 5 Mar 2009 18:53:40 -0000 1.2 @@ -0,0 +1 @@ +0b97576cee5d89a58aef9a6754d3fb00 esperanza-0.4.0.tar.gz From spot at fedoraproject.org Thu Mar 5 18:54:11 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Thu, 5 Mar 2009 18:54:11 +0000 (UTC) Subject: rpms/esperanza/F-9 esperanza-0.4.0-gitfixes20081204.patch, NONE, 1.1 esperanza.desktop, NONE, 1.1 esperanza.png, NONE, 1.1 esperanza.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090305185411.7555270116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/esperanza/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27163/F-9 Modified Files: sources Added Files: esperanza-0.4.0-gitfixes20081204.patch esperanza.desktop esperanza.png esperanza.spec Log Message: initial branching esperanza-0.4.0-gitfixes20081204.patch: --- NEW FILE esperanza-0.4.0-gitfixes20081204.patch --- diff -urP esperanza-0.4.0.OLD/config.pri esperanza-0.4.0/config.pri --- esperanza-0.4.0.OLD/config.pri 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/config.pri 2008-12-04 18:25:09.000000000 -0500 @@ -7,6 +7,7 @@ INCLUDEPATH += /opt/local/include # ugly DEFINES += HAVE_DNSSD LIBS += -lboost_signals + QMAKE_LFLAGS_SHAPP += -bind_at_load } !win32 { diff -urP esperanza-0.4.0.OLD/data/text/about.html esperanza-0.4.0/data/text/about.html --- esperanza-0.4.0.OLD/data/text/about.html 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/data/text/about.html 2008-12-04 18:25:09.000000000 -0500 @@ -6,7 +6,7 @@

    Frequent Contributor: Thilo Cestonaro <c.thilo at gmx.de>

    Contributor: Gianluca Romanin <j_zar at openjay.org>

    Contributor: Auke Schrijnen <auke at schrijnen.nl>

    -

    Contributor: Anders Gustafsson <andersg at xmms.org>

    +

    Contributor: Anders Waldenborg <andersg at xmms.org>

    Contributor: Sebastien Cevey <seb at cine7.net>

    Contributor: Georg Schild <dangertools at gmx.at>

    Contributor: Dan Chokola <dan at chokola.com>

    diff -urP esperanza-0.4.0.OLD/esperanza.tmproj esperanza-0.4.0/esperanza.tmproj --- esperanza-0.4.0.OLD/esperanza.tmproj 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/esperanza.tmproj 2008-12-04 18:25:09.000000000 -0500 @@ -3,7 +3,7 @@ currentDocument - src/ui/playerwidget.cpp + src/lib/collectioninfomodel.cpp documents @@ -18,7 +18,7 @@ fileHierarchyDrawerWidth - 224 + 295 metaData ChangeLog @@ -35,88 +35,162 @@ firstVisibleLine 0 - src/dialogs/lastfm/plugin.h + src/dialogs/medialibdialog/medialibdialog.cpp caret column - 49 + 37 line - 26 + 39 + + firstVisibleColumn + 0 + firstVisibleLine + 185 + + src/dialogs/medialibdialog/medialibdialog.pro + + caret + + column + 112 + line + 4 firstVisibleColumn 0 firstVisibleLine 0 - src/ui/esperanza_plugin.h + src/dialogs/medialibdialog/medialibpanebrowser.cpp caret column - 18 + 56 line - 38 + 39 firstVisibleColumn 0 firstVisibleLine - 2 + 5 + + src/dialogs/medialibdialog/medialibview.cpp + + caret + + column + 0 + line + 36 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + src/dialogs/medialibdialog/panebrowserview.cpp + + caret + + column + 4 + line + 85 + + firstVisibleColumn + 0 + firstVisibleLine + 47 + + src/dialogs/medialibdialog/panebrowserview.h + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 4 - src/ui/main.cpp + src/lib/collectioninfomodel.cpp caret column - 2 + 0 line - 34 + 44 firstVisibleColumn 0 firstVisibleLine - 73 + 23 - src/ui/playerwidget.cpp + src/lib/collectionmodel.cpp caret column - 2 + 20 line - 209 + 72 firstVisibleColumn 0 firstVisibleLine - 176 + 39 - src/ui/playerwidget.h + src/ui/esperanza_plugin.h caret column - 27 + 18 line - 32 + 38 firstVisibleColumn 0 firstVisibleLine + 2 + + src/ui/ui.pro + + caret + + column + 0 + line [...1797 lines suppressed...] void gotConnection (XClient *); Only in esperanza-0.4.0.OLD/src/ui: growl.cpp Only in esperanza-0.4.0.OLD/src/ui: growl.h Only in esperanza-0.4.0.OLD/src/ui: mac_growl.h Only in esperanza-0.4.0.OLD/src/ui: mac_growl.mm diff -urP esperanza-0.4.0.OLD/src/ui/main.cpp esperanza-0.4.0/src/ui/main.cpp --- esperanza-0.4.0.OLD/src/ui/main.cpp 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/main.cpp 2008-12-04 18:25:09.000000000 -0500 @@ -40,6 +40,7 @@ Q_IMPORT_PLUGIN(aboutdialog) Q_IMPORT_PLUGIN(preferencesdialog) Q_IMPORT_PLUGIN(xmms2dpreferences) +Q_IMPORT_PLUGIN(equalizerdialog) int main (int argc, char **argv) Only in esperanza-0.4.0.OLD/src/ui: panebrowserview.cpp Only in esperanza-0.4.0.OLD/src/ui: panebrowserview.h diff -urP esperanza-0.4.0.OLD/src/ui/playerwidget.cpp esperanza-0.4.0/src/ui/playerwidget.cpp --- esperanza-0.4.0.OLD/src/ui/playerwidget.cpp 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/playerwidget.cpp 2008-12-04 18:25:09.000000000 -0500 @@ -46,7 +46,11 @@ #include "shortcutmanager.h" #include "esperanza_plugin.h" + PlayerWidget::PlayerWidget (QWidget *parent, XClient *client) : QMainWindow (parent) +#ifdef Q_WS_MAC +, macMenuBar(0) +#endif { QSettings s; @@ -54,7 +58,6 @@ setWindowTitle ("Esperanza"); setFocusPolicy (Qt::StrongFocus); - setAttribute (Qt::WA_DeleteOnClose); QWidget *main_w = new QWidget (this); setCentralWidget (main_w); @@ -194,6 +197,16 @@ /* Process the plugins ... */ process_dialog_plugin (); + + #ifdef Q_WS_MAC + m_infomenu.setTitle(tr("Info")); + // m_playlistmenu.setTitle(tr("Playlist")); + m_settingsmenu.setTitle(tr("Extras")); + + macMenuBar.addMenu(&m_infomenu); + // macMenuBar.addMenu(&m_playlistmenu); + macMenuBar.addMenu(&m_settingsmenu); + #endif } void diff -urP esperanza-0.4.0.OLD/src/ui/playerwidget.h esperanza-0.4.0/src/ui/playerwidget.h --- esperanza-0.4.0.OLD/src/ui/playerwidget.h 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/playerwidget.h 2008-12-04 18:25:09.000000000 -0500 @@ -116,6 +116,9 @@ SystemTray *m_systray; MiniMode *m_mini; + #ifdef Q_WS_MAC + QMenuBar macMenuBar; + #endif QMenu m_infomenu; QMenu m_playlistmenu; QMenu m_settingsmenu; diff -urP esperanza-0.4.0.OLD/src/ui/progressframe.cpp esperanza-0.4.0/src/ui/progressframe.cpp --- esperanza-0.4.0.OLD/src/ui/progressframe.cpp 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/progressframe.cpp 2008-12-04 18:25:09.000000000 -0500 @@ -41,7 +41,8 @@ ProgressFrame::ProgressFrame (QWidget *parent, XClient *client, bool seek) : QFrame( parent ), - m_reverse( false ) + m_reverse( false ), + m_move( false ) { m_client = client; m_maxValue = 0; diff -urP esperanza-0.4.0.OLD/src/ui/systemtray.cpp esperanza-0.4.0/src/ui/systemtray.cpp --- esperanza-0.4.0.OLD/src/ui/systemtray.cpp 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/systemtray.cpp 2008-12-04 18:25:09.000000000 -0500 @@ -64,12 +64,6 @@ setContextMenu (systray_menu); connect (client, SIGNAL (gotConnection (XClient *)), this, SLOT (got_connection (XClient *))); -#ifdef Q_WS_MACX - m_growl = new GrowlNotifier (this, "Esperanza", QStringList ("New song")); - m_growl->do_registration (); -#else - m_growl = NULL; -#endif } @@ -138,14 +132,11 @@ if (m_display_action) { m_display_action->setText (message); } + setToolTip(message); if (s.value ("core/donotification").toBool ()) { - if (m_growl) { - m_growl->do_notification ("New song", title, message, img); - } else { - showMessage (title, message, icon, milliseconds); - } + showMessage (title, message, icon, milliseconds); } } } diff -urP esperanza-0.4.0.OLD/src/ui/systemtray.h esperanza-0.4.0/src/ui/systemtray.h --- esperanza-0.4.0.OLD/src/ui/systemtray.h 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/systemtray.h 2008-12-04 18:25:09.000000000 -0500 @@ -23,8 +23,6 @@ #include #include -#include "growl.h" - class SystemTray : public QSystemTrayIcon { Q_OBJECT @@ -45,7 +43,6 @@ QAction *m_display_action; QAction *m_hide_action; QAction *m_play_action; - GrowlNotifier *m_growl; QString m_last_notif_str; XClient *m_client; }; diff -urP esperanza-0.4.0.OLD/src/ui/ui.pro esperanza-0.4.0/src/ui/ui.pro --- esperanza-0.4.0.OLD/src/ui/ui.pro 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/ui.pro 2008-12-04 18:25:09.000000000 -0500 @@ -6,7 +6,7 @@ DIALOGS += lastfm medialibdialog \ streamingdialog firsttimewizard \ preferencesdialog aboutdialog \ - xmms2dpreferences + xmms2dpreferences equalizer TOOLS += grepshortcutkeydlg globalshortcut @@ -41,8 +41,6 @@ macx { TARGET = Esperanza - SOURCES += mac_growl.mm - HEADERS += mac_growl.h } @@ -50,9 +48,7 @@ minimode.cpp \ shortcutmanager.cpp \ filedialog.cpp \ - panebrowserview.cpp \ systemtray.cpp \ - growl.cpp \ playerbutton.cpp \ progressframe.cpp \ volumebar.cpp \ @@ -66,10 +62,8 @@ HEADERS += esperanza_plugin.h \ fancyplaylistview.h \ filedialog.h \ - growl.h \ mdns.h \ minimode.h \ - panebrowserview.h \ playerbutton.h \ playerwidget.h \ playlistview.h \ diff -urP esperanza-0.4.0.OLD/src/ui/volumebar.cpp esperanza-0.4.0/src/ui/volumebar.cpp --- esperanza-0.4.0.OLD/src/ui/volumebar.cpp 2007-08-13 06:00:40.000000000 -0400 +++ esperanza-0.4.0/src/ui/volumebar.cpp 2008-12-04 18:25:09.000000000 -0500 @@ -24,7 +24,7 @@ #include #include -VolumeButton::VolumeButton (QWidget *parent, XClient *client) : QWidget (parent) +VolumeButton::VolumeButton (QWidget *parent, XClient *client) : QWidget (parent), m_channels (0) { m_client = client; @@ -121,7 +121,7 @@ { if (m_channels == 1) { m_client->playback ()->volumeSet ("master", vol) (); - } else { + } else if (m_channels == 2) { m_client->playback ()->volumeSet ("left", vol) (); m_client->playback ()->volumeSet ("right", vol) (); } --- NEW FILE esperanza.desktop --- [Desktop Entry] Version=1.0 Name=Esperanza GenericName=Audio Player Comment=Play and organize your audio collection Exec=xmms2-client-launcher.sh esperanza Icon=esperanza StartupNotify=false Terminal=false Type=Application Categories=Audio;Music;Player;AudioVideo; X-Desktop-File-Install-Version=0.15 --- NEW FILE esperanza.spec --- Name: esperanza Summary: A graphical audio player Version: 0.4.0 Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia Source0: http://exodus.xmms.se/~tru/esperanza/0.4/%{name}-%{version}.tar.gz Source1: %{name}.desktop # Derived from the included image in data/images Source2: %{name}.png Patch0: esperanza-0.4.0-gitfixes20081204.patch URL: http://wiki.xmms2.xmms.se/wiki/Client:Esperanza BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xmms2-devel, qt-devel BuildRequires: desktop-file-utils %description Esperanza is an audio player for the XMMS2 framework written with C++ and QT4. It has a sleek, uncomplicated UI, and supports album art in the playlist. %prep %setup -q %patch0 -p1 -b .gitfixes # Don't need exec perms here chmod -x src/dialogs/xmms2dpreferences/xmms2dprefmodel* %build ./configure --prefix=%{_prefix} # Rebuild translation files pushd data/translations rm -rf *.qm for i in *.ts; do lrelease-qt4 $i done popd make %{?_smp_mflags} %install rm -rf %{buildroot} make INSTALL_ROOT=%{buildroot} install mkdir -p %{buildroot}%{_datadir}/pixmaps install -m0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog COPYING COPYING.GPL data/text/*.html %{_bindir}/%{name}* %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/*.desktop %changelog * Thu Mar 5 2009 Tom "spot" Callaway 0.4.0-2 - rebuild translations from source * Thu Dec 4 2008 Tom "spot" Callaway 0.4.0-1 - Initial package for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/esperanza/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 18:39:38 -0000 1.1 +++ sources 5 Mar 2009 18:53:41 -0000 1.2 @@ -0,0 +1 @@ +0b97576cee5d89a58aef9a6754d3fb00 esperanza-0.4.0.tar.gz From cebbert at fedoraproject.org Thu Mar 5 18:54:37 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Thu, 5 Mar 2009 18:54:37 +0000 (UTC) Subject: rpms/kernel/F-9 linux-2.6-alsa-hda-probe-mask-quirks.patch, NONE, 1.1.2.1 kernel.spec, 1.891.2.32, 1.891.2.33 Message-ID: <20090305185437.A6AB470116@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27394 Modified Files: Tag: private-fedora-9-2_6_27-branch kernel.spec Added Files: Tag: private-fedora-9-2_6_27-branch linux-2.6-alsa-hda-probe-mask-quirks.patch Log Message: Add ALSA HDA probe_mask quirks from 2.6.29-rc7 linux-2.6-alsa-hda-probe-mask-quirks.patch: --- NEW FILE linux-2.6-alsa-hda-probe-mask-quirks.patch --- Rollup of the these upstream ALSA commits: 0edb94543092535a2c6ef33e7285004168ca73d7 ALSA: hda - Fix probe errors on Dell Studio Desktop ef1681d82f4bc2d9e023519f0bedb86519d10c43 ALSA: hda - Add probe_mask quirk for Medion MD96630 38f1df27e3191d76e983cb9c6b4392582fd32fda ALSA: hda - Add probe_mask default for Toshiba laptop with ALC268 --- vanilla-2.6.27.19.orig/sound/pci/hda/hda_intel.c +++ vanilla-2.6.27.19/sound/pci/hda/hda_intel.c @@ -1967,6 +1967,12 @@ static struct snd_pci_quirk position_fix SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB), SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB), SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB), + /* broken BIOS */ + SND_PCI_QUIRK(0x1028, 0x20ac, "Dell Studio Desktop", 0x01), + /* including bogus ALC268 in slot#2 that conflicts with ALC888 */ + SND_PCI_QUIRK(0x17c0, 0x4085, "Medion MD96630", 0x01), + /* conflict of ALC268 in slot#3 (digital I/O); a temporary fix */ + SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba laptop", 0x03), {} }; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.891.2.32 retrieving revision 1.891.2.33 diff -u -r1.891.2.32 -r1.891.2.33 --- kernel.spec 27 Feb 2009 07:27:24 -0000 1.891.2.32 +++ kernel.spec 5 Mar 2009 18:54:06 -0000 1.891.2.33 @@ -645,6 +645,8 @@ Patch400: linux-2.6-scsi-cpqarray-set-master.patch Patch402: linux-2.6-scsi-mpt-vmware-fix.patch +Patch410: linux-2.6-alsa-hda-probe-mask-quirks.patch + # filesystem patches Patch421: linux-2.6-squashfs.patch @@ -1220,6 +1222,7 @@ # ALSA # +ApplyPatch linux-2.6-alsa-hda-probe-mask-quirks.patch # block/bio # @@ -1955,6 +1958,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Mar 05 2009 Chuck Ebbert 2.6.27.19-78.2.33 +- Add ALSA HDA probe_mask quirks from 2.6.29-rc7 + * Fri Feb 27 2009 Chuck Ebbert 2.6.27.19-78.2.32 - Add debug patch to try and track down #483532. From notting at fedoraproject.org Thu Mar 5 18:55:37 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Thu, 5 Mar 2009 18:55:37 +0000 (UTC) Subject: rpms/libofx/devel .cvsignore,1.7,1.8 sources,1.7,1.8 Message-ID: <20090305185537.CA3B770116@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/rpms/libofx/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27659 Modified Files: .cvsignore sources Log Message: Upload 0.9.1 tarball Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libofx/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 9 Sep 2008 16:59:55 -0000 1.7 +++ .cvsignore 5 Mar 2009 18:55:07 -0000 1.8 @@ -1 +1 @@ -libofx-0.9.0.tar.gz +libofx-0.9.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libofx/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 9 Sep 2008 16:59:55 -0000 1.7 +++ sources 5 Mar 2009 18:55:07 -0000 1.8 @@ -1 +1 @@ -6e2172f0117f90805590bf755190b79e libofx-0.9.0.tar.gz +e634f47ca12e82d860912d48c93b8e50 libofx-0.9.1.tar.gz From cebbert at fedoraproject.org Thu Mar 5 19:07:14 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Thu, 5 Mar 2009 19:07:14 +0000 (UTC) Subject: rpms/kernel/F-10 linux-2.6-alsa-hda-probe-mask-quirks.patch, NONE, 1.1.2.1 kernel.spec, 1.1206.2.38, 1.1206.2.39 Message-ID: <20090305190714.8EBD370116@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29339 Modified Files: Tag: private-fedora-10-2_6_27 kernel.spec Added Files: Tag: private-fedora-10-2_6_27 linux-2.6-alsa-hda-probe-mask-quirks.patch Log Message: Add ALSA HDA probe_mask quirks from 2.6.29-rc7 (F11#485295) linux-2.6-alsa-hda-probe-mask-quirks.patch: --- NEW FILE linux-2.6-alsa-hda-probe-mask-quirks.patch --- Rollup of the these upstream ALSA commits: 0edb94543092535a2c6ef33e7285004168ca73d7 ALSA: hda - Fix probe errors on Dell Studio Desktop ef1681d82f4bc2d9e023519f0bedb86519d10c43 ALSA: hda - Add probe_mask quirk for Medion MD96630 38f1df27e3191d76e983cb9c6b4392582fd32fda ALSA: hda - Add probe_mask default for Toshiba laptop with ALC268 --- vanilla-2.6.27.19.orig/sound/pci/hda/hda_intel.c +++ vanilla-2.6.27.19/sound/pci/hda/hda_intel.c @@ -1967,6 +1967,12 @@ static struct snd_pci_quirk position_fix SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB), SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB), SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB), + /* broken BIOS */ + SND_PCI_QUIRK(0x1028, 0x20ac, "Dell Studio Desktop", 0x01), + /* including bogus ALC268 in slot#2 that conflicts with ALC888 */ + SND_PCI_QUIRK(0x17c0, 0x4085, "Medion MD96630", 0x01), + /* conflict of ALC268 in slot#3 (digital I/O); a temporary fix */ + SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba laptop", 0x03), {} }; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v retrieving revision 1.1206.2.38 retrieving revision 1.1206.2.39 diff -u -r1.1206.2.38 -r1.1206.2.39 --- kernel.spec 26 Feb 2009 19:48:09 -0000 1.1206.2.38 +++ kernel.spec 5 Mar 2009 19:06:43 -0000 1.1206.2.39 @@ -625,6 +625,8 @@ Patch400: linux-2.6-scsi-cpqarray-set-master.patch +Patch410: linux-2.6-alsa-hda-probe-mask-quirks.patch + Patch429: linux-2.6-squashfs.patch Patch430: linux-2.6-net-silence-noisy-printks.patch Patch450: linux-2.6-input-kill-stupid-messages.patch @@ -1249,6 +1251,7 @@ ApplyPatch linux-2.6-scsi-cpqarray-set-master.patch # ALSA +ApplyPatch linux-2.6-alsa-hda-probe-mask-quirks.patch # Filesystem patches. # Squashfs @@ -1976,6 +1979,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Thu Mar 05 2009 Chuck Ebbert 2.6.27.19-170.2.39 +- Add ALSA HDA probe_mask quirks from 2.6.29-rc7 (F11#485295) + * Thu Feb 26 2009 John W. Linville - Add dcbw's back-port patches to age scan results on resume From pkgdb at fedoraproject.org Thu Mar 5 19:12:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 19:12:16 +0000 Subject: [pkgdb] openbios was added for glommer Message-ID: <20090305191300.6650E20820B@bastion.fedora.phx.redhat.com> kevin has added Package openbios with summary OpenBios implementation of IEEE 1275-1994 kevin has approved Package openbios kevin has added a Fedora devel branch for openbios with an owner of glommer kevin has approved openbios in Fedora devel kevin has approved Package openbios kevin has set commit to Approved for provenpackager on openbios (Fedora devel) kevin has set build to Approved for provenpackager on openbios (Fedora devel) kevin has set checkout to Approved for provenpackager on openbios (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openbios From pkgdb at fedoraproject.org Thu Mar 5 19:13:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 19:13:01 +0000 Subject: [pkgdb] openbios (Fedora, devel) updated by kevin Message-ID: <20090305191303.661DF208544@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on openbios (Fedora devel) for virtmaint kevin approved watchcommits on openbios (Fedora devel) for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openbios From kevin at fedoraproject.org Thu Mar 5 19:12:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 19:12:47 +0000 (UTC) Subject: rpms/openbios - New directory Message-ID: <20090305191247.2FA5370116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/openbios In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso30158/rpms/openbios Log Message: Directory /cvs/pkgs/rpms/openbios added to the repository From kevin at fedoraproject.org Thu Mar 5 19:12:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 19:12:47 +0000 (UTC) Subject: rpms/openbios/devel - New directory Message-ID: <20090305191247.79DD870116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/openbios/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso30158/rpms/openbios/devel Log Message: Directory /cvs/pkgs/rpms/openbios/devel added to the repository From kevin at fedoraproject.org Thu Mar 5 19:13:05 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 19:13:05 +0000 (UTC) Subject: rpms/openbios Makefile,NONE,1.1 Message-ID: <20090305191305.343A470116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/openbios In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso30158/rpms/openbios Added Files: Makefile Log Message: Setup of module openbios --- NEW FILE Makefile --- # Top level Makefile for module openbios all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Thu Mar 5 19:13:05 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 19:13:05 +0000 (UTC) Subject: rpms/openbios/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305191305.91E1E70118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/openbios/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso30158/rpms/openbios/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module openbios --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: openbios # $Id: Makefile,v 1.1 2009/03/05 19:13:05 kevin Exp $ NAME := openbios SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From dcbw at fedoraproject.org Thu Mar 5 19:21:16 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 19:21:16 +0000 (UTC) Subject: rpms/NetworkManager-openvpn/devel .cvsignore, 1.14, 1.15 NetworkManager-openvpn.spec, 1.31, 1.32 sources, 1.18, 1.19 Message-ID: <20090305192116.C7F2F70116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager-openvpn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31232 Modified Files: .cvsignore NetworkManager-openvpn.spec sources Log Message: * Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 - Update to 0.7.1rc3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 19 Feb 2009 14:12:49 -0000 1.14 +++ .cvsignore 5 Mar 2009 19:20:46 -0000 1.15 @@ -9,3 +9,4 @@ NetworkManager-openvpn-0.7.0.svn4326.tar.gz NetworkManager-openvpn-0.7.0.svn11.tar.gz NetworkManager-openvpn-0.7.0.97.tar.gz +NetworkManager-openvpn-0.7.0.99.tar.gz Index: NetworkManager-openvpn.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/NetworkManager-openvpn.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- NetworkManager-openvpn.spec 23 Feb 2009 22:08:08 -0000 1.31 +++ NetworkManager-openvpn.spec 5 Mar 2009 19:20:46 -0000 1.32 @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.0-1 +%define nm_version 1:0.7.0.99-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 @@ -9,8 +9,8 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.7.0.97 -Release: 2%{svn_snapshot}%{?dist} +Version: 0.7.0.99 +Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -105,6 +105,9 @@ %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 +- Update to 0.7.1rc3 + * Mon Feb 23 2009 Fedora Release Engineering - 1:0.7.0.97-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 19 Feb 2009 14:12:49 -0000 1.18 +++ sources 5 Mar 2009 19:20:46 -0000 1.19 @@ -1 +1 @@ -bfd6c097c9987cf8ae46b42bc05cd067 NetworkManager-openvpn-0.7.0.97.tar.gz +b38bf19fb7b7cd62ea7ed9143ea02233 NetworkManager-openvpn-0.7.0.99.tar.gz From dcbw at fedoraproject.org Thu Mar 5 19:26:19 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 19:26:19 +0000 (UTC) Subject: rpms/NetworkManager-openvpn/F-10 .cvsignore, 1.12, 1.13 NetworkManager-openvpn.spec, 1.31, 1.32 sources, 1.18, 1.19 Message-ID: <20090305192619.A2A2A70116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager-openvpn/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32027 Modified Files: .cvsignore NetworkManager-openvpn.spec sources Log Message: * Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 - Update to 0.7.1rc3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-10/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 19 Feb 2009 14:13:47 -0000 1.12 +++ .cvsignore 5 Mar 2009 19:25:49 -0000 1.13 @@ -9,3 +9,4 @@ NetworkManager-openvpn-0.7.0.svn4326.tar.gz NetworkManager-openvpn-0.7.0.svn11.tar.gz NetworkManager-openvpn-0.7.0.97.tar.gz +NetworkManager-openvpn-0.7.0.99.tar.gz Index: NetworkManager-openvpn.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-10/NetworkManager-openvpn.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- NetworkManager-openvpn.spec 19 Feb 2009 14:13:47 -0000 1.31 +++ NetworkManager-openvpn.spec 5 Mar 2009 19:25:49 -0000 1.32 @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.0-1 +%define nm_version 1:0.7.0.99-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 @@ -9,7 +9,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.7.0.97 +Version: 0.7.0.99 Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -105,6 +105,12 @@ %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 +- Update to 0.7.1rc3 + +* Mon Feb 23 2009 Fedora Release Engineering - 1:0.7.0.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Feb 19 2009 Dan Williams 1:0.7.0.97-1 - Update to 0.7.1rc1 - Handle HMAC Authentication (--auth) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-10/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 19 Feb 2009 14:13:47 -0000 1.18 +++ sources 5 Mar 2009 19:25:49 -0000 1.19 @@ -1 +1 @@ -bfd6c097c9987cf8ae46b42bc05cd067 NetworkManager-openvpn-0.7.0.97.tar.gz +b38bf19fb7b7cd62ea7ed9143ea02233 NetworkManager-openvpn-0.7.0.99.tar.gz From glommer at fedoraproject.org Thu Mar 5 19:35:31 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Thu, 5 Mar 2009 19:35:31 +0000 (UTC) Subject: rpms/openbios/devel import.log, NONE, 1.1 openbios-noerror.patch, NONE, 1.1 openbios.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305193531.A461970116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/openbios/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv873/devel Modified Files: .cvsignore sources Added Files: import.log openbios-noerror.patch openbios.spec Log Message: initial openbios commit --- NEW FILE import.log --- openbios-1_0-0_5_svn463_fc11:HEAD:openbios-1.0-0.5.svn463.fc11.src.rpm:1236281781 openbios-noerror.patch: --- NEW FILE openbios-noerror.patch --- --- a/config/examples/ppc_rules.xml 2009-03-02 19:02:44.000000000 -0300 +++ b/config/examples/ppc_rules.xml 2009-03-02 19:02:50.000000000 -0300 @@ -30,7 +30,7 @@ RANLIB := ranlib CFLAGS := -Os -Wall -msoft-float -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Werror +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include M4 := m4 --- NEW FILE openbios.spec --- Name: openbios Version: 1.0 Release: 0.5.svn463%{?dist} Summary: OpenBios implementation of IEEE 1275-1994 Group: Applications/Emulators License: GPLv2 URL: http://www.openfirmware.info/OpenBIOS # Getting openbios tarball: # svn export -r463 svn://openbios.org/openbios/openbios-devel openbios-1.0 # tar czvf openbios-1.0.tar.gz openbios-1.0 Source0: %{name}/%{name}-%{version}.tar.gz Patch0: openbios-noerror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxslt # debugging firmwares does not goes the same way as a normal program. # moreover, all architectures providing debuginfo for a single noarch # package is currently clashing in koji, so don't bother. %global debug_package %{nil} %define _binaries_in_noarch_packages_terminate_build 0 %define ob_desc \ The OpenBIOS project provides you with most free and open source Open Firmware \ implementations available. Here you find several implementations of \ IEEE 1275-1994 (Referred to as Open Firmware) compliant firmware. Among its \ features, Open Firmware provides an instruction set independent device \ interface. This can be used to boot the operating system from expansion cards \ without native initialization code. \ \ It is Open Firmware's goal to work on all common platforms, like x86, AMD64, \ PowerPC, ARM and Mips. With its flexible and modular design, Open Firmware \ targets servers, workstations and embedded systems, where a sane and unified \ firmware is a crucial design goal and reduces porting efforts noticably. \ \ Open Firmware is found on many servers and workstations and there are sever \ commercial implementations from SUN, Firmworks, CodeGen, Apple, IBM and others. \ \ In most cases, the Open Firmware implementations provided on this site rely on \ an additional low-level firmware for hardware initialization, such as coreboot \ or U-Boot. \ \ %description %{ob_desc} # building firmwares are quite tricky, because they often has to be built on # their native architecture (or in a cross-capable compiler, that we lack in # koji), and deployed everywhere. Recent koji builders support a feature # that allow us to build packages in a single architecture, and create noarch # subpackages that will be deployed everywhere. Because the package can only # be built in certain architectures, the main package has to use # BuildArch: , or something like that. # Note that using ExclusiveArch is _wrong_, because it will prevent the noarch # packages from getting into the excluded repositories. # # Openbios is even trickier compared to other firmwares, because the same # source must originate firmwares for multiple architectures. The magic here # is to only create the subpackages in the architectures that can build it. %ifarch sparcv9 %package sparc Summary: OpenBIOS for sparc BuildArch: noarch Requires: %{name}-common = %{version}-%{release} %description sparc %{ob_desc} %endif %ifarch sparc64 %package sparc64 Summary: OpenBIOS for sparc64 BuildArch: noarch Requires: %{name}-common = %{version}-%{release} %description sparc64 %{ob_desc} %endif %ifarch ppc ppc64 %package ppc Summary: OpenBIOS for ppc BuildArch: noarch Requires: %{name}-common = %{version}-%{release} %description ppc %{ob_desc} %endif %package common Summary: Common files for OpenBIOS BuildArch: noarch %description common %{ob_desc} %prep %setup -q %patch0 -p1 %build CFLAGS="%{optflags}" %ifarch ppc /bin/sh ./config/scripts/switch-arch ppc make build-verbose %{?_smp_mflags} %endif %ifarch sparcv9 /bin/sh ./config/scripts/switch-arch sparc32 make build-verbose %{?_smp_mflags} %endif %ifarch sparc64 /bin/sh ./config/scripts/switch-arch sparc64 make build-verbose %{?_smp_mflags} %endif %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/openbios %ifarch sparcv9 install -p -m 0644 obj-sparc32/openbios-builtin.elf $RPM_BUILD_ROOT%{_datadir}/openbios/openbios-sparc32 %endif %ifarch sparc64 install -p -m 0644 obj-sparc64/openbios-builtin.elf $RPM_BUILD_ROOT%{_datadir}/openbios/openbios-sparc64 %endif %ifarch ppc install -p -m 0644 obj-ppc/openbios-qemu.elf $RPM_BUILD_ROOT%{_datadir}/openbios/openbios-ppc %endif %clean rm -rf $RPM_BUILD_ROOT %ifarch sparcv9 %files sparc %defattr(-,root,root,-) %{_datadir}/openbios/openbios-sparc32 %endif %ifarch sparc64 %files sparc64 %defattr(-,root,root,-) %{_datadir}/openbios/openbios-sparc64 %endif %ifarch ppc %files ppc %defattr(-,root,root,-) %{_datadir}/openbios/openbios-ppc %endif %files common %defattr(-,root,root,-) %dir %{_datadir}/openbios/ %doc COPYING README %changelog * Wed Mar 04 2009 Glauber Costa - 1.0.0.5 - created openbios-common instead of openbios-doc. It owns the directories and everybody depends on it. * Wed Mar 04 2009 Glauber Costa - 1.0.0.4 - Addressed comments on BZ 485420. rpmlint provides no error for me, added comentaries, and tell how to get the source. * Tue Mar 03 2009 Glauber Costa - 1.0.0.3 - Don't use prebuilt binaries anywhere. * Fri Feb 13 2009 Glauber Costa - 1.0.0.2 - Addressed comments on BZ 485420: clean build environment, own directories we create. * Fri Feb 13 2009 Glauber Costa - 1.0.0.1 - Created initial build for sparc32/sparc64 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openbios/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 19:13:05 -0000 1.1 +++ .cvsignore 5 Mar 2009 19:35:01 -0000 1.2 @@ -0,0 +1 @@ +openbios-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openbios/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 19:13:05 -0000 1.1 +++ sources 5 Mar 2009 19:35:01 -0000 1.2 @@ -0,0 +1 @@ +a8c020255bd18a3b7ae901a658d0191c openbios-1.0.tar.gz From dcbw at fedoraproject.org Thu Mar 5 19:48:04 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 19:48:04 +0000 (UTC) Subject: rpms/NetworkManager-openvpn/F-9 .cvsignore, 1.9, 1.10 NetworkManager-openvpn.spec, 1.29, 1.30 sources, 1.14, 1.15 Message-ID: <20090305194804.5691870116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager-openvpn/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2733 Modified Files: .cvsignore NetworkManager-openvpn.spec sources Log Message: * Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 - Update to 0.7.1rc3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-9/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 19 Feb 2009 14:15:30 -0000 1.9 +++ .cvsignore 5 Mar 2009 19:47:33 -0000 1.10 @@ -9,3 +9,4 @@ NetworkManager-openvpn-0.7.0.svn4326.tar.gz NetworkManager-openvpn-0.7.0.svn11.tar.gz NetworkManager-openvpn-0.7.0.97.tar.gz +NetworkManager-openvpn-0.7.0.99.tar.gz Index: NetworkManager-openvpn.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-9/NetworkManager-openvpn.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- NetworkManager-openvpn.spec 19 Feb 2009 14:15:30 -0000 1.29 +++ NetworkManager-openvpn.spec 5 Mar 2009 19:47:33 -0000 1.30 @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.0-1 +%define nm_version 1:0.7.0.99-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 @@ -9,7 +9,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.7.0.97 +Version: 0.7.0.99 Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -105,6 +105,12 @@ %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 +- Update to 0.7.1rc3 + +* Mon Feb 23 2009 Fedora Release Engineering - 1:0.7.0.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Feb 19 2009 Dan Williams 1:0.7.0.97-1 - Update to 0.7.1rc1 - Handle HMAC Authentication (--auth) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-9/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 19 Feb 2009 14:15:30 -0000 1.14 +++ sources 5 Mar 2009 19:47:33 -0000 1.15 @@ -1 +1 @@ -bfd6c097c9987cf8ae46b42bc05cd067 NetworkManager-openvpn-0.7.0.97.tar.gz +b38bf19fb7b7cd62ea7ed9143ea02233 NetworkManager-openvpn-0.7.0.99.tar.gz From caolanm at fedoraproject.org Thu Mar 5 19:51:59 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Thu, 5 Mar 2009 19:51:59 +0000 (UTC) Subject: rpms/xca/devel xca-0.6.4-includes.patch, NONE, 1.1 xca.spec, 1.26, 1.27 Message-ID: <20090305195159.B293670116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/xca/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3465 Modified Files: xca.spec Added Files: xca-0.6.4-includes.patch Log Message: include stdint.h for uint32_t xca-0.6.4-includes.patch: --- NEW FILE xca-0.6.4-includes.patch --- diff -ru xca-0.6.4.orig/lib/db.h xca-0.6.4/lib/db.h --- xca-0.6.4.orig/lib/db.h 2009-03-05 17:19:23.000000000 +0000 +++ xca-0.6.4/lib/db.h 2009-03-05 17:19:41.000000000 +0000 @@ -13,6 +13,7 @@ #include #include #include +#include #define XCA_MAGIC 0xcadb1969 #define NAMELEN 80 Index: xca.spec =================================================================== RCS file: /cvs/pkgs/rpms/xca/devel/xca.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- xca.spec 26 Feb 2009 07:55:58 -0000 1.26 +++ xca.spec 5 Mar 2009 19:51:29 -0000 1.27 @@ -3,7 +3,7 @@ Summary: Graphical X.509 certificate management tool Name: xca Version: 0.6.4 -Release: %release_func 6 +Release: %release_func 7 License: BSD Group: Applications/Productivity @@ -13,6 +13,7 @@ Source4: xca.xml Patch0: xca-0.6.3-locale.patch Patch1: xca-0.6.4-newopenssl.patch +Patch2: xca-0.6.4-includes.patch BuildRoot: %_tmppath/%name-%version-%release-buildroot BuildRequires: qt4-devel openssl-devel BuildRequires: db4-devel @@ -39,6 +40,7 @@ %setup -q %patch0 -p1 -b .locale %patch1 -p1 -b .newopenssl +%patch2 -p1 -b .includes mkdir -p _tmp_root/usr ln -s /usr/%_lib _tmp_root/usr/lib @@ -128,6 +130,9 @@ %changelog +* Thu Mar 05 2009 Caol??n McNamara - 0.6.4-7 +- include stdint.h for uint32_t + * Thu Feb 26 2009 Fedora Release Engineering - 0.6.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From dcbw at fedoraproject.org Thu Mar 5 19:52:54 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 19:52:54 +0000 (UTC) Subject: rpms/NetworkManager-pptp/devel .cvsignore, 1.7, 1.8 NetworkManager-pptp.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <20090305195254.3BA4F70116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager-pptp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3691 Modified Files: .cvsignore NetworkManager-pptp.spec sources Log Message: * Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 - Update to 0.7.1rc3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 19 Feb 2009 14:44:02 -0000 1.7 +++ .cvsignore 5 Mar 2009 19:52:23 -0000 1.8 @@ -4,3 +4,4 @@ NetworkManager-pptp-0.7.0.svn4326.tar.bz2 NetworkManager-pptp-0.7.0.svn16.tar.bz2 NetworkManager-pptp-0.7.0.97.tar.bz2 +NetworkManager-pptp-0.7.0.99.tar.bz2 Index: NetworkManager-pptp.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/NetworkManager-pptp.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- NetworkManager-pptp.spec 23 Feb 2009 22:09:03 -0000 1.10 +++ NetworkManager-pptp.spec 5 Mar 2009 19:52:23 -0000 1.11 @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.0-1 +%define nm_version 1:0.7.0.99-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define ppp_version 2.2.4 @@ -9,8 +9,8 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 -Version: 0.7.0.97 -Release: 2%{svn_snapshot}%{?dist} +Version: 0.7.0.99 +Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -103,6 +103,9 @@ %dir %{_datadir}/gnome-vpn-properties/pptp %changelog +* Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 +- Update to 0.7.1rc3 + * Mon Feb 23 2009 Fedora Release Engineering - 1:0.7.0.97-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Feb 2009 14:44:02 -0000 1.7 +++ sources 5 Mar 2009 19:52:23 -0000 1.8 @@ -1 +1 @@ -83e0464fc59748a2708db5f0ed8e3c74 NetworkManager-pptp-0.7.0.97.tar.bz2 +97fcd56217476b951ec7fa91e4245d75 NetworkManager-pptp-0.7.0.99.tar.bz2 From vpv at fedoraproject.org Thu Mar 5 19:53:20 2009 From: vpv at fedoraproject.org (Ville-Pekka Vainio) Date: Thu, 5 Mar 2009 19:53:20 +0000 (UTC) Subject: rpms/malaga-suomi-voikko/F-10 .cvsignore, 1.8, 1.9 malaga-suomi-voikko.spec, 1.7, 1.8 sources, 1.8, 1.9 Message-ID: <20090305195320.7022570116@cvs1.fedora.phx.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/malaga-suomi-voikko/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3866 Modified Files: .cvsignore malaga-suomi-voikko.spec sources Log Message: * Thu Mar 05 2009 - Ville-Pekka Vainio 1.3-1 - Suomi-malaga 1.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/F-10/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 2 Oct 2008 18:50:58 -0000 1.8 +++ .cvsignore 5 Mar 2009 19:52:50 -0000 1.9 @@ -1 +1 @@ -suomi-malaga-1.2.tar.gz +suomi-malaga-1.3.tar.gz Index: malaga-suomi-voikko.spec =================================================================== RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/F-10/malaga-suomi-voikko.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- malaga-suomi-voikko.spec 2 Oct 2008 18:50:58 -0000 1.7 +++ malaga-suomi-voikko.spec 5 Mar 2009 19:52:50 -0000 1.8 @@ -1,5 +1,5 @@ Name: malaga-suomi-voikko -Version: 1.2 +Version: 1.3 Release: 1%{?dist} Summary: A description of Finnish morphology written in Malaga (Voikko edition) @@ -51,6 +51,9 @@ %changelog +* Thu Mar 05 2009 - Ville-Pekka Vainio 1.3-1 +- Suomi-malaga 1.3 + * Thu Oct 02 2008 - Ville-Pekka Vainio 1.2-1 - Suomi-malaga 1.2 - RC1 released as stable Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/F-10/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 Oct 2008 18:50:58 -0000 1.8 +++ sources 5 Mar 2009 19:52:50 -0000 1.9 @@ -1 +1 @@ -5439a6547feb94f277f18dc573254535 suomi-malaga-1.2.tar.gz +fbe33195df95e79faee1a4262b445cf0 suomi-malaga-1.3.tar.gz From dcbw at fedoraproject.org Thu Mar 5 19:57:19 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 19:57:19 +0000 (UTC) Subject: rpms/NetworkManager-pptp/F-10 .cvsignore, 1.5, 1.6 NetworkManager-pptp.spec, 1.8, 1.9 sources, 1.7, 1.8 Message-ID: <20090305195719.B324570116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager-pptp/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4642 Modified Files: .cvsignore NetworkManager-pptp.spec sources Log Message: * Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 - Update to 0.7.1rc3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-10/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Feb 2009 14:44:57 -0000 1.5 +++ .cvsignore 5 Mar 2009 19:56:49 -0000 1.6 @@ -4,3 +4,4 @@ NetworkManager-pptp-0.7.0.svn4326.tar.bz2 NetworkManager-pptp-0.7.0.svn16.tar.bz2 NetworkManager-pptp-0.7.0.97.tar.bz2 +NetworkManager-pptp-0.7.0.99.tar.bz2 Index: NetworkManager-pptp.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-10/NetworkManager-pptp.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- NetworkManager-pptp.spec 19 Feb 2009 14:44:57 -0000 1.8 +++ NetworkManager-pptp.spec 5 Mar 2009 19:56:49 -0000 1.9 @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.0-1 +%define nm_version 1:0.7.0.99-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define ppp_version 2.2.4 @@ -9,7 +9,7 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 -Version: 0.7.0.97 +Version: 0.7.0.99 Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base @@ -103,6 +103,12 @@ %dir %{_datadir}/gnome-vpn-properties/pptp %changelog +* Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 +- Update to 0.7.1rc3 + +* Mon Feb 23 2009 Fedora Release Engineering - 1:0.7.0.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Feb 19 2009 Dan Williams 1:0.7.0.97-1 - Update to 0.7.1rc1 - Set a reasonable MTU Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-10/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Feb 2009 14:44:57 -0000 1.7 +++ sources 5 Mar 2009 19:56:49 -0000 1.8 @@ -1 +1 @@ -83e0464fc59748a2708db5f0ed8e3c74 NetworkManager-pptp-0.7.0.97.tar.bz2 +97fcd56217476b951ec7fa91e4245d75 NetworkManager-pptp-0.7.0.99.tar.bz2 From dcbw at fedoraproject.org Thu Mar 5 19:58:04 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 19:58:04 +0000 (UTC) Subject: rpms/NetworkManager-pptp/F-9 .cvsignore, 1.2, 1.3 NetworkManager-pptp.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <20090305195804.7065070116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager-pptp/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4776 Modified Files: .cvsignore NetworkManager-pptp.spec sources Log Message: * Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 - Update to 0.7.1rc3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Feb 2009 14:45:52 -0000 1.2 +++ .cvsignore 5 Mar 2009 19:57:34 -0000 1.3 @@ -4,3 +4,4 @@ NetworkManager-pptp-0.7.0.svn4326.tar.bz2 NetworkManager-pptp-0.7.0.svn16.tar.bz2 NetworkManager-pptp-0.7.0.97.tar.bz2 +NetworkManager-pptp-0.7.0.99.tar.bz2 Index: NetworkManager-pptp.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-9/NetworkManager-pptp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- NetworkManager-pptp.spec 19 Feb 2009 14:45:52 -0000 1.4 +++ NetworkManager-pptp.spec 5 Mar 2009 19:57:34 -0000 1.5 @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.0-1 +%define nm_version 1:0.7.0.99-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define ppp_version 2.2.4 @@ -9,7 +9,7 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 -Version: 0.7.0.97 +Version: 0.7.0.99 Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base @@ -103,6 +103,12 @@ %dir %{_datadir}/gnome-vpn-properties/pptp %changelog +* Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 +- Update to 0.7.1rc3 + +* Mon Feb 23 2009 Fedora Release Engineering - 1:0.7.0.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Feb 19 2009 Dan Williams 1:0.7.0.97-1 - Update to 0.7.1rc1 - Set a reasonable MTU Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Feb 2009 14:45:52 -0000 1.5 +++ sources 5 Mar 2009 19:57:34 -0000 1.6 @@ -1 +1 @@ -83e0464fc59748a2708db5f0ed8e3c74 NetworkManager-pptp-0.7.0.97.tar.bz2 +97fcd56217476b951ec7fa91e4245d75 NetworkManager-pptp-0.7.0.99.tar.bz2 From limb at fedoraproject.org Thu Mar 5 19:58:23 2009 From: limb at fedoraproject.org (Jon Ciesla) Date: Thu, 5 Mar 2009 19:58:23 +0000 (UTC) Subject: rpms/squidGuard/devel squidGuard.spec,1.17,1.18 squidguard,1.1,1.2 Message-ID: <20090305195823.0315C70116@cvs1.fedora.phx.redhat.com> Author: limb Update of /cvs/pkgs/rpms/squidGuard/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4858 Modified Files: squidGuard.spec squidguard Log Message: Initscript cleanup. Index: squidGuard.spec =================================================================== RCS file: /cvs/pkgs/rpms/squidGuard/devel/squidGuard.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- squidGuard.spec 24 Feb 2009 16:33:55 -0000 1.17 +++ squidGuard.spec 5 Mar 2009 19:57:52 -0000 1.18 @@ -7,7 +7,7 @@ Name: squidGuard Version: 1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Filter, redirector and access controller plugin for squid Group: System Environment/Daemons @@ -186,6 +186,9 @@ %{_initrddir}/transparent-proxying %changelog +* Thu Mar 05 2009 Jon Ciesla - 1.4-4 +- Initscript cleanup, BZ 247065. + * Tue Feb 24 2009 Jon Ciesla - 1.4-3 - Drop chcon Req. Index: squidguard =================================================================== RCS file: /cvs/pkgs/rpms/squidGuard/devel/squidguard,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- squidguard 9 Sep 2005 12:16:10 -0000 1.1 +++ squidguard 5 Mar 2009 19:57:52 -0000 1.2 @@ -13,6 +13,16 @@ # pidfile: /var/run/squid.pid # config: /etc/squid/squid-squidGuard.conf +### BEGIN INIT INFO +# Provides: lsb-squidguard +# Required-Start: $local_fs $network $remote_fs $squid +# Required-Stop: $local_fs $network $remote_fs +# Default-Start: +# Default-Stop: 0 1 6 +# Short-Description: start and stop squidGuard +# Description: SquidGuard - web filtering system for the Squid proxy server. +### END INIT INFO + PATH=/usr/bin:/sbin:/bin:/usr/sbin export PATH From glommer at fedoraproject.org Thu Mar 5 20:01:26 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Thu, 5 Mar 2009 20:01:26 +0000 (UTC) Subject: rpms/kvm/devel dead.package, NONE, 1.1 kvm-62-block-rw-range-check.patch, 1.9, NONE kvm-83-compile-fixes.patch, 1.1, NONE kvm.modules, 1.1, NONE kvm.spec, 1.90, NONE sources, 1.43, NONE Message-ID: <20090305200126.43B1570116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/kvm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5715 Added Files: dead.package Removed Files: kvm-62-block-rw-range-check.patch kvm-83-compile-fixes.patch kvm.modules kvm.spec sources Log Message: dead package: obsoleted in favour of qemu --- NEW FILE dead.package --- Obsoleted by qemu --- kvm-62-block-rw-range-check.patch DELETED --- --- kvm-83-compile-fixes.patch DELETED --- --- kvm.modules DELETED --- --- kvm.spec DELETED --- --- sources DELETED --- From glommer at fedoraproject.org Thu Mar 5 20:03:43 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Thu, 5 Mar 2009 20:03:43 +0000 (UTC) Subject: rpms/qemu/devel qemu.spec,1.59,1.60 Message-ID: <20090305200343.C643370116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5964 Modified Files: qemu.spec Log Message: Use bochs-bios instead of bochs-bios-data It's official: upstream set on 0.10 Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- qemu.spec 5 Mar 2009 12:38:01 -0000 1.59 +++ qemu.spec 5 Mar 2009 20:03:13 -0000 1.60 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.9.2 -Release: 0.2.kvm20090303git%{?dist} +Version: 0.10 +Release: 0.1.kvm20090303git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -99,7 +99,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: etherboot-zroms-kvm Requires: vgabios -Requires: bochs-bios-data +Requires: bochs-bios Provides: kvm >= 84 Obsoletes: kvm < 85 @@ -422,6 +422,10 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Thu Mar 05 2009 Glauber Costa - 2:0.10-0.1.kvm20090303git +- Use bochs-bios instead of bochs-bios-data +- It's official: upstream set on 0.10 + * Thu Mar 5 2009 Daniel P. Berrange - 2:0.9.2-0.2.kvm20090303git - Added BSD to license list, since many files are covered by BSD From pkgdb at fedoraproject.org Thu Mar 5 20:06:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:06:30 +0000 Subject: [pkgdb] perl-Gtk2-MozEmbed was added for remi Message-ID: <20090305200714.538B02082B2@bastion.fedora.phx.redhat.com> kevin has added Package perl-Gtk2-MozEmbed with summary Interface to the Mozilla embedding widget kevin has approved Package perl-Gtk2-MozEmbed kevin has added a Fedora devel branch for perl-Gtk2-MozEmbed with an owner of remi kevin has approved perl-Gtk2-MozEmbed in Fedora devel kevin has approved Package perl-Gtk2-MozEmbed kevin has set commit to Approved for provenpackager on perl-Gtk2-MozEmbed (Fedora devel) kevin has set build to Approved for provenpackager on perl-Gtk2-MozEmbed (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Gtk2-MozEmbed (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Gtk2-MozEmbed From pkgdb at fedoraproject.org Thu Mar 5 20:07:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:07:15 +0000 Subject: [pkgdb] perl-Gtk2-MozEmbed (Fedora, 10) updated by kevin Message-ID: <20090305200715.0C591208545@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Gtk2-MozEmbed kevin has set commit to Approved for provenpackager on perl-Gtk2-MozEmbed (Fedora 10) kevin has set build to Approved for provenpackager on perl-Gtk2-MozEmbed (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Gtk2-MozEmbed (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Gtk2-MozEmbed From kevin at fedoraproject.org Thu Mar 5 20:06:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:06:47 +0000 (UTC) Subject: rpms/perl-Gtk2-MozEmbed - New directory Message-ID: <20090305200647.3030B70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Gtk2-MozEmbed In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstc6723/rpms/perl-Gtk2-MozEmbed Log Message: Directory /cvs/pkgs/rpms/perl-Gtk2-MozEmbed added to the repository From kevin at fedoraproject.org Thu Mar 5 20:06:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:06:47 +0000 (UTC) Subject: rpms/perl-Gtk2-MozEmbed/devel - New directory Message-ID: <20090305200647.730EF70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstc6723/rpms/perl-Gtk2-MozEmbed/devel Log Message: Directory /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/devel added to the repository From glommer at fedoraproject.org Thu Mar 5 20:06:59 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Thu, 5 Mar 2009 20:06:59 +0000 (UTC) Subject: rpms/qemu/devel qemu.spec,1.60,1.61 Message-ID: <20090305200659.9713170116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6488 Modified Files: qemu.spec Log Message: tag adjustment Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- qemu.spec 5 Mar 2009 20:03:13 -0000 1.60 +++ qemu.spec 5 Mar 2009 20:06:29 -0000 1.61 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.1.kvm20090303git%{?dist} +Release: 0.4.kvm20090303git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -422,6 +422,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Thu Mar 05 2009 Glauber Costa - 2:0.10-0.4.kvm20090303git +- seems Epoch does not go into the tags. So start back here. + * Thu Mar 05 2009 Glauber Costa - 2:0.10-0.1.kvm20090303git - Use bochs-bios instead of bochs-bios-data - It's official: upstream set on 0.10 From dcbw at fedoraproject.org Thu Mar 5 20:06:48 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 20:06:48 +0000 (UTC) Subject: rpms/NetworkManager-openconnect/devel .cvsignore, 1.5, 1.6 NetworkManager-openconnect.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <20090305200648.1DDC770116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager-openconnect/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6606 Modified Files: .cvsignore NetworkManager-openconnect.spec sources Log Message: * Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 - Update to 0.7.1rc3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Feb 2009 14:59:35 -0000 1.5 +++ .cvsignore 5 Mar 2009 20:06:17 -0000 1.6 @@ -1,2 +1,3 @@ NetworkManager-openconnect-0.7.0.svn14.tar.gz NetworkManager-openconnect-0.7.0.97.tar.gz +NetworkManager-openconnect-0.7.0.99.tar.gz Index: NetworkManager-openconnect.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/NetworkManager-openconnect.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- NetworkManager-openconnect.spec 23 Feb 2009 22:07:15 -0000 1.6 +++ NetworkManager-openconnect.spec 5 Mar 2009 20:06:17 -0000 1.7 @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.0-0.11.svn4229 +%define nm_version 1:0.7.0.99-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openconnect_version 0.99 @@ -7,8 +7,8 @@ Summary: NetworkManager VPN integration for openconnect Name: NetworkManager-openconnect -Version: 0.7.0.97 -Release: 2%{svn_snapshot}%{?dist} +Version: 0.7.0.99 +Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -101,6 +101,9 @@ %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.glade %changelog +* Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 +- Update to 0.7.1rc3 + * Mon Feb 23 2009 Fedora Release Engineering - 0.7.0.97-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Feb 2009 14:59:35 -0000 1.5 +++ sources 5 Mar 2009 20:06:17 -0000 1.6 @@ -1 +1 @@ -94bf5f0e7e81ddd22c9e2dab8d2e6ba2 NetworkManager-openconnect-0.7.0.97.tar.gz +c56a82bd7697d7d35f11159883cabe88 NetworkManager-openconnect-0.7.0.99.tar.gz From kevin at fedoraproject.org Thu Mar 5 20:07:05 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:07:05 +0000 (UTC) Subject: rpms/perl-Gtk2-MozEmbed Makefile,NONE,1.1 Message-ID: <20090305200705.7F7E770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Gtk2-MozEmbed In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstc6723/rpms/perl-Gtk2-MozEmbed Added Files: Makefile Log Message: Setup of module perl-Gtk2-MozEmbed --- NEW FILE Makefile --- # Top level Makefile for module perl-Gtk2-MozEmbed all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Thu Mar 5 20:07:05 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:07:05 +0000 (UTC) Subject: rpms/perl-Gtk2-MozEmbed/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305200705.CCE2370116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstc6723/rpms/perl-Gtk2-MozEmbed/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Gtk2-MozEmbed --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Gtk2-MozEmbed # $Id: Makefile,v 1.1 2009/03/05 20:07:05 kevin Exp $ NAME := perl-Gtk2-MozEmbed SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From dcbw at fedoraproject.org Thu Mar 5 20:08:08 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 20:08:08 +0000 (UTC) Subject: rpms/NetworkManager-openconnect/F-10 .cvsignore, 1.5, 1.6 NetworkManager-openconnect.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <20090305200808.E6B5070116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager-openconnect/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6974 Modified Files: .cvsignore NetworkManager-openconnect.spec sources Log Message: * Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 - Update to 0.7.1rc3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/F-10/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Feb 2009 15:25:32 -0000 1.5 +++ .cvsignore 5 Mar 2009 20:07:38 -0000 1.6 @@ -1,2 +1,3 @@ NetworkManager-openconnect-0.7.0.svn14.tar.gz NetworkManager-openconnect-0.7.0.97.tar.gz +NetworkManager-openconnect-0.7.0.99.tar.gz Index: NetworkManager-openconnect.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/F-10/NetworkManager-openconnect.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- NetworkManager-openconnect.spec 19 Feb 2009 15:25:32 -0000 1.5 +++ NetworkManager-openconnect.spec 5 Mar 2009 20:07:38 -0000 1.6 @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.0-0.11.svn4229 +%define nm_version 1:0.7.0.99-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openconnect_version 0.99 @@ -7,7 +7,7 @@ Summary: NetworkManager VPN integration for openconnect Name: NetworkManager-openconnect -Version: 0.7.0.97 +Version: 0.7.0.99 Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base @@ -101,6 +101,12 @@ %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.glade %changelog +* Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 +- Update to 0.7.1rc3 + +* Mon Feb 23 2009 Fedora Release Engineering - 0.7.0.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Feb 19 2009 Dan Williams 0.7.0.97-1 - Update to 0.7.1rc1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Feb 2009 15:25:32 -0000 1.5 +++ sources 5 Mar 2009 20:07:38 -0000 1.6 @@ -1 +1 @@ -94bf5f0e7e81ddd22c9e2dab8d2e6ba2 NetworkManager-openconnect-0.7.0.97.tar.gz +c56a82bd7697d7d35f11159883cabe88 NetworkManager-openconnect-0.7.0.99.tar.gz From pkgdb at fedoraproject.org Thu Mar 5 20:08:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:08:12 +0000 Subject: [pkgdb] meshmagick was added for atorkhov Message-ID: <20090305200856.D29D72082B2@bastion.fedora.phx.redhat.com> kevin has added Package meshmagick with summary Command line manipulation tool for Ogre meshes kevin has approved Package meshmagick kevin has added a Fedora devel branch for meshmagick with an owner of atorkhov kevin has approved meshmagick in Fedora devel kevin has approved Package meshmagick kevin has set commit to Approved for provenpackager on meshmagick (Fedora devel) kevin has set build to Approved for provenpackager on meshmagick (Fedora devel) kevin has set checkout to Approved for provenpackager on meshmagick (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/meshmagick From pkgdb at fedoraproject.org Thu Mar 5 20:08:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:08:57 +0000 Subject: [pkgdb] meshmagick (Fedora, 9) updated by kevin Message-ID: <20090305200858.2261F208545@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for meshmagick kevin has set commit to Approved for provenpackager on meshmagick (Fedora 9) kevin has set build to Approved for provenpackager on meshmagick (Fedora 9) kevin has set checkout to Approved for provenpackager on meshmagick (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/meshmagick From dcbw at fedoraproject.org Thu Mar 5 20:08:15 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Thu, 5 Mar 2009 20:08:15 +0000 (UTC) Subject: rpms/NetworkManager-openconnect/F-9 .cvsignore, 1.5, 1.6 NetworkManager-openconnect.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <20090305200815.D696770116@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager-openconnect/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7016 Modified Files: .cvsignore NetworkManager-openconnect.spec sources Log Message: * Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 - Update to 0.7.1rc3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Feb 2009 15:25:30 -0000 1.5 +++ .cvsignore 5 Mar 2009 20:07:45 -0000 1.6 @@ -1,2 +1,3 @@ NetworkManager-openconnect-0.7.0.svn14.tar.gz NetworkManager-openconnect-0.7.0.97.tar.gz +NetworkManager-openconnect-0.7.0.99.tar.gz Index: NetworkManager-openconnect.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/F-9/NetworkManager-openconnect.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- NetworkManager-openconnect.spec 19 Feb 2009 15:25:30 -0000 1.5 +++ NetworkManager-openconnect.spec 5 Mar 2009 20:07:45 -0000 1.6 @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.0-0.11.svn4229 +%define nm_version 1:0.7.0.99-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openconnect_version 0.99 @@ -7,7 +7,7 @@ Summary: NetworkManager VPN integration for openconnect Name: NetworkManager-openconnect -Version: 0.7.0.97 +Version: 0.7.0.99 Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base @@ -101,6 +101,12 @@ %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.glade %changelog +* Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 +- Update to 0.7.1rc3 + +* Mon Feb 23 2009 Fedora Release Engineering - 0.7.0.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Feb 19 2009 Dan Williams 0.7.0.97-1 - Update to 0.7.1rc1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Feb 2009 15:25:30 -0000 1.5 +++ sources 5 Mar 2009 20:07:45 -0000 1.6 @@ -1 +1 @@ -94bf5f0e7e81ddd22c9e2dab8d2e6ba2 NetworkManager-openconnect-0.7.0.97.tar.gz +c56a82bd7697d7d35f11159883cabe88 NetworkManager-openconnect-0.7.0.99.tar.gz From pkgdb at fedoraproject.org Thu Mar 5 20:08:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:08:57 +0000 Subject: [pkgdb] meshmagick (Fedora, 10) updated by kevin Message-ID: <20090305200858.5CD24208548@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for meshmagick kevin has set commit to Approved for provenpackager on meshmagick (Fedora 10) kevin has set build to Approved for provenpackager on meshmagick (Fedora 10) kevin has set checkout to Approved for provenpackager on meshmagick (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/meshmagick From kevin at fedoraproject.org Thu Mar 5 20:08:33 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:08:33 +0000 (UTC) Subject: rpms/meshmagick - New directory Message-ID: <20090305200833.2BE7E70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/meshmagick In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstk7233/rpms/meshmagick Log Message: Directory /cvs/pkgs/rpms/meshmagick added to the repository From kevin at fedoraproject.org Thu Mar 5 20:08:33 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:08:33 +0000 (UTC) Subject: rpms/meshmagick/devel - New directory Message-ID: <20090305200833.63D8170118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/meshmagick/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstk7233/rpms/meshmagick/devel Log Message: Directory /cvs/pkgs/rpms/meshmagick/devel added to the repository From kevin at fedoraproject.org Thu Mar 5 20:08:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:08:52 +0000 (UTC) Subject: rpms/meshmagick Makefile,NONE,1.1 Message-ID: <20090305200852.01C2A70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/meshmagick In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstk7233/rpms/meshmagick Added Files: Makefile Log Message: Setup of module meshmagick --- NEW FILE Makefile --- # Top level Makefile for module meshmagick all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Thu Mar 5 20:08:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:08:52 +0000 (UTC) Subject: rpms/meshmagick/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305200852.4CA3670116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/meshmagick/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstk7233/rpms/meshmagick/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module meshmagick --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: meshmagick # $Id: Makefile,v 1.1 2009/03/05 20:08:52 kevin Exp $ NAME := meshmagick SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Thu Mar 5 20:10:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:10:27 +0000 Subject: [pkgdb] libbind was added for atkac Message-ID: <20090305201111.58B1A2082B2@bastion.fedora.phx.redhat.com> kevin has added Package libbind with summary ISC's standard resolver library kevin has approved Package libbind kevin has added a Fedora devel branch for libbind with an owner of atkac kevin has approved libbind in Fedora devel kevin has approved Package libbind kevin has set commit to Approved for provenpackager on libbind (Fedora devel) kevin has set build to Approved for provenpackager on libbind (Fedora devel) kevin has set checkout to Approved for provenpackager on libbind (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libbind From kevin at fedoraproject.org Thu Mar 5 20:10:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:10:47 +0000 (UTC) Subject: rpms/libbind - New directory Message-ID: <20090305201047.2E95870117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libbind In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsek7795/rpms/libbind Log Message: Directory /cvs/pkgs/rpms/libbind added to the repository From kevin at fedoraproject.org Thu Mar 5 20:10:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:10:47 +0000 (UTC) Subject: rpms/libbind/devel - New directory Message-ID: <20090305201047.6C5A970117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libbind/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsek7795/rpms/libbind/devel Log Message: Directory /cvs/pkgs/rpms/libbind/devel added to the repository From kevin at fedoraproject.org Thu Mar 5 20:11:06 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:11:06 +0000 (UTC) Subject: rpms/libbind Makefile,NONE,1.1 Message-ID: <20090305201106.CDA5870116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libbind In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsek7795/rpms/libbind Added Files: Makefile Log Message: Setup of module libbind --- NEW FILE Makefile --- # Top level Makefile for module libbind all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Thu Mar 5 20:11:07 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:11:07 +0000 (UTC) Subject: rpms/libbind/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305201107.2BABD70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libbind/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsek7795/rpms/libbind/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libbind --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libbind # $Id: Makefile,v 1.1 2009/03/05 20:11:06 kevin Exp $ NAME := libbind SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Thu Mar 5 20:13:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:13:11 +0000 Subject: [pkgdb] stp was added for dwheeler Message-ID: <20090305201312.0C8E8208543@bastion.fedora.phx.redhat.com> kevin has added Package stp with summary Constraint solver/decision procedure kevin has approved Package stp kevin has added a Fedora devel branch for stp with an owner of dwheeler kevin has approved stp in Fedora devel kevin has approved Package stp kevin has set commit to Approved for provenpackager on stp (Fedora devel) kevin has set build to Approved for provenpackager on stp (Fedora devel) kevin has set checkout to Approved for provenpackager on stp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/stp From pkgdb at fedoraproject.org Thu Mar 5 20:13:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:13:15 +0000 Subject: [pkgdb] stp (Fedora, devel) updated by kevin Message-ID: <20090305201314.54C10208546@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on stp (Fedora devel) for amdunn kevin approved watchcommits on stp (Fedora devel) for amdunn To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/stp From pkgdb at fedoraproject.org Thu Mar 5 20:13:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:13:15 +0000 Subject: [pkgdb] stp (Fedora, 10) updated by kevin Message-ID: <20090305201314.615E8208549@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for stp kevin has set commit to Approved for provenpackager on stp (Fedora 10) kevin has set build to Approved for provenpackager on stp (Fedora 10) kevin has set checkout to Approved for provenpackager on stp (Fedora 10) kevin approved watchbugzilla on stp (Fedora 10) for amdunn kevin approved watchcommits on stp (Fedora 10) for amdunn To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/stp From pkgdb at fedoraproject.org Thu Mar 5 20:13:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:13:50 +0000 Subject: [pkgdb] stp (Fedora, 10) updated by kevin Message-ID: <20090305201350.B587B208545@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on stp (Fedora 10) for amdunn kevin approved watchcommits on stp (Fedora 10) for amdunn kevin approved commit on stp (Fedora 10) for amdunn kevin approved build on stp (Fedora 10) for amdunn kevin approved approveacls on stp (Fedora 10) for amdunn To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/stp From limb at fedoraproject.org Thu Mar 5 20:13:25 2009 From: limb at fedoraproject.org (Jon Ciesla) Date: Thu, 5 Mar 2009 20:13:25 +0000 (UTC) Subject: comps comps-f11.xml.in,1.142,1.143 Message-ID: <20090305201325.04D2870116@cvs1.fedora.phx.redhat.com> Author: limb Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8226 Modified Files: comps-f11.xml.in Log Message: More lilypond fonts. Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- comps-f11.xml.in 5 Mar 2009 06:19:18 -0000 1.142 +++ comps-f11.xml.in 5 Mar 2009 20:12:54 -0000 1.143 @@ -1642,6 +1642,10 @@ lilypond-aybabtu-fonts lilypond-century-schoolbook-l-fonts lilypond-emmentaler-fonts + lilypond-feta-fonts + lilypond-feta-alphabet-fonts + lilypond-feta-braces-fonts + lilypond-parmesan-fonts linux-libertine-fonts lohit-kashmiri-fonts lohit-konkani-fonts From pkgdb at fedoraproject.org Thu Mar 5 20:13:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:13:50 +0000 Subject: [pkgdb] stp (Fedora, devel) updated by kevin Message-ID: <20090305201351.0014F208549@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on stp (Fedora devel) for amdunn kevin approved watchcommits on stp (Fedora devel) for amdunn kevin approved commit on stp (Fedora devel) for amdunn kevin approved build on stp (Fedora devel) for amdunn kevin approved approveacls on stp (Fedora devel) for amdunn To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/stp From atorkhov at fedoraproject.org Thu Mar 5 20:14:15 2009 From: atorkhov at fedoraproject.org (Alexey Torkhov) Date: Thu, 5 Mar 2009 20:14:15 +0000 (UTC) Subject: rpms/meshmagick/devel import.log, NONE, 1.1 meshmagick-0.5.2-debuginfo.patch, NONE, 1.1 meshmagick.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305201415.597AE70116@cvs1.fedora.phx.redhat.com> Author: atorkhov Update of /cvs/pkgs/rpms/meshmagick/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8435/devel Modified Files: .cvsignore sources Added Files: import.log meshmagick-0.5.2-debuginfo.patch meshmagick.spec Log Message: Import. --- NEW FILE import.log --- meshmagick-0_5_2-4_20090124svn2618_fc10:HEAD:meshmagick-0.5.2-4.20090124svn2618.fc10.src.rpm:1236283972 meshmagick-0.5.2-debuginfo.patch: --- NEW FILE meshmagick-0.5.2-debuginfo.patch --- diff -ur meshmagick-0.5.2.orig/configure meshmagick-0.5.2/configure --- meshmagick-0.5.2.orig/configure 2009-02-28 23:01:53.000000000 +0300 +++ meshmagick-0.5.2/configure 2009-03-04 19:20:08.000000000 +0300 @@ -20055,7 +20055,7 @@ if test "$enable_debug" = "yes"; then CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG" else - CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -s" + CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG" fi # Pthreads --- NEW FILE meshmagick.spec --- Name: meshmagick Version: 0.5.2 Release: 4.20090124svn2618%{?dist} Summary: Command line manipulation tool for Ogre meshes Group: Applications/Multimedia License: LGPLv2+ URL: http://www.ogre3d.org/wiki/index.php/MeshMagick # The source for this package was pulled from upstream's svn. Use the # following commands to generate the tarball: # svn export -r 2618 https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/meshmagick meshmagick # cd meshmagick # ./bootstrap && ./configure && make dist-bzip2 Source0: %{name}-%{version}.tar.bz2 Patch0: meshmagick-0.5.2-debuginfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ogre-devel %description MeshMagick is a manipulation tool for Ogre meshes (and skeletons). It allows the user to query interesting information and to transform binary meshes (and skeletons) in many ways. %package libs Summary: Libraries for %{name} Group: System Environment/Libraries %description libs The %{name}-libs package contains libraries that are needed for running applications that use %{name}. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} pkgconfig ogre-devel %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q %patch0 -p1 chmod -x include/{EditableMesh.h,EditableSkeleton.h,RenameToolFactory.h,RenameTool.h} src/{EditableMesh.cpp,EditableSkeleton.cpp,RenameToolFactory.cpp,RenameTool.cpp} %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la %clean rm -rf $RPM_BUILD_ROOT %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/%{name} %files libs %defattr(-,root,root,-) %{_libdir}/lib%{name}.so.* %files devel %defattr(-,root,root,-) %{_libdir}/lib%{name}.so %{_includedir}/%{name} %{_libdir}/pkgconfig/%{name}.pc %changelog * Wed Mar 04 2009 Alexey Torkhov - 0.5.2-4.20090124svn2618 - Polishing the Requires * Wed Mar 04 2009 Alexey Torkhov - 0.5.2-3.20090124svn2618 - Split shared library to -libs subpackage for correct work in multilib environment - Add patch for generating full debuginfo * Tue Mar 03 2009 Alexey Torkhov - 0.5.2-2.20090124svn2618 - Renamed package to simply "meshmagick" - Clarified commands to get source - Minor fixes * Sat Feb 28 2009 Alexey Torkhov - 0.5.2-1.20090124svn2618 - Update to post 0.5.2 * Mon Nov 03 2008 Alexey Torkhov - 0.4.0-0.1.20080731svn2488 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/meshmagick/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:08:52 -0000 1.1 +++ .cvsignore 5 Mar 2009 20:13:45 -0000 1.2 @@ -0,0 +1 @@ +meshmagick-0.5.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/meshmagick/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:08:52 -0000 1.1 +++ sources 5 Mar 2009 20:13:45 -0000 1.2 @@ -0,0 +1 @@ +aa2e668e74259b16d4d46596b566c306 meshmagick-0.5.2.tar.bz2 From kevin at fedoraproject.org Thu Mar 5 20:16:06 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:16:06 +0000 (UTC) Subject: rpms/stp - New directory Message-ID: <20090305201606.2BB0370116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/stp In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrc9051/rpms/stp Log Message: Directory /cvs/pkgs/rpms/stp added to the repository From kevin at fedoraproject.org Thu Mar 5 20:16:06 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:16:06 +0000 (UTC) Subject: rpms/stp/devel - New directory Message-ID: <20090305201606.6C25670116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/stp/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrc9051/rpms/stp/devel Log Message: Directory /cvs/pkgs/rpms/stp/devel added to the repository From kevin at fedoraproject.org Thu Mar 5 20:16:24 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:16:24 +0000 (UTC) Subject: rpms/stp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305201624.6C30C70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/stp/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrc9051/rpms/stp/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module stp --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: stp # $Id: Makefile,v 1.1 2009/03/05 20:16:24 kevin Exp $ NAME := stp SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Thu Mar 5 20:16:24 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:16:24 +0000 (UTC) Subject: rpms/stp Makefile,NONE,1.1 Message-ID: <20090305201624.14F0770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/stp In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrc9051/rpms/stp Added Files: Makefile Log Message: Setup of module stp --- NEW FILE Makefile --- # Top level Makefile for module stp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From atorkhov at fedoraproject.org Thu Mar 5 20:17:23 2009 From: atorkhov at fedoraproject.org (Alexey Torkhov) Date: Thu, 5 Mar 2009 20:17:23 +0000 (UTC) Subject: rpms/meshmagick/F-10 import.log, NONE, 1.1 meshmagick-0.5.2-debuginfo.patch, NONE, 1.1 meshmagick.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305201723.11BD270116@cvs1.fedora.phx.redhat.com> Author: atorkhov Update of /cvs/pkgs/rpms/meshmagick/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9394/F-10 Modified Files: .cvsignore sources Added Files: import.log meshmagick-0.5.2-debuginfo.patch meshmagick.spec Log Message: Import. --- NEW FILE import.log --- meshmagick-0_5_2-4_20090124svn2618_fc10:F-10:meshmagick-0.5.2-4.20090124svn2618.fc10.src.rpm:1236284146 meshmagick-0.5.2-debuginfo.patch: --- NEW FILE meshmagick-0.5.2-debuginfo.patch --- diff -ur meshmagick-0.5.2.orig/configure meshmagick-0.5.2/configure --- meshmagick-0.5.2.orig/configure 2009-02-28 23:01:53.000000000 +0300 +++ meshmagick-0.5.2/configure 2009-03-04 19:20:08.000000000 +0300 @@ -20055,7 +20055,7 @@ if test "$enable_debug" = "yes"; then CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG" else - CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -s" + CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG" fi # Pthreads --- NEW FILE meshmagick.spec --- Name: meshmagick Version: 0.5.2 Release: 4.20090124svn2618%{?dist} Summary: Command line manipulation tool for Ogre meshes Group: Applications/Multimedia License: LGPLv2+ URL: http://www.ogre3d.org/wiki/index.php/MeshMagick # The source for this package was pulled from upstream's svn. Use the # following commands to generate the tarball: # svn export -r 2618 https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/meshmagick meshmagick # cd meshmagick # ./bootstrap && ./configure && make dist-bzip2 Source0: %{name}-%{version}.tar.bz2 Patch0: meshmagick-0.5.2-debuginfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ogre-devel %description MeshMagick is a manipulation tool for Ogre meshes (and skeletons). It allows the user to query interesting information and to transform binary meshes (and skeletons) in many ways. %package libs Summary: Libraries for %{name} Group: System Environment/Libraries %description libs The %{name}-libs package contains libraries that are needed for running applications that use %{name}. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} pkgconfig ogre-devel %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q %patch0 -p1 chmod -x include/{EditableMesh.h,EditableSkeleton.h,RenameToolFactory.h,RenameTool.h} src/{EditableMesh.cpp,EditableSkeleton.cpp,RenameToolFactory.cpp,RenameTool.cpp} %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la %clean rm -rf $RPM_BUILD_ROOT %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/%{name} %files libs %defattr(-,root,root,-) %{_libdir}/lib%{name}.so.* %files devel %defattr(-,root,root,-) %{_libdir}/lib%{name}.so %{_includedir}/%{name} %{_libdir}/pkgconfig/%{name}.pc %changelog * Wed Mar 04 2009 Alexey Torkhov - 0.5.2-4.20090124svn2618 - Polishing the Requires * Wed Mar 04 2009 Alexey Torkhov - 0.5.2-3.20090124svn2618 - Split shared library to -libs subpackage for correct work in multilib environment - Add patch for generating full debuginfo * Tue Mar 03 2009 Alexey Torkhov - 0.5.2-2.20090124svn2618 - Renamed package to simply "meshmagick" - Clarified commands to get source - Minor fixes * Sat Feb 28 2009 Alexey Torkhov - 0.5.2-1.20090124svn2618 - Update to post 0.5.2 * Mon Nov 03 2008 Alexey Torkhov - 0.4.0-0.1.20080731svn2488 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/meshmagick/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:08:52 -0000 1.1 +++ .cvsignore 5 Mar 2009 20:16:52 -0000 1.2 @@ -0,0 +1 @@ +meshmagick-0.5.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/meshmagick/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:08:52 -0000 1.1 +++ sources 5 Mar 2009 20:16:52 -0000 1.2 @@ -0,0 +1 @@ +aa2e668e74259b16d4d46596b566c306 meshmagick-0.5.2.tar.bz2 From pkgdb at fedoraproject.org Thu Mar 5 20:17:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:17:30 +0000 Subject: [pkgdb] armstrong was added for oget Message-ID: <20090305201814.929AA208545@bastion.fedora.phx.redhat.com> kevin has added Package armstrong with summary Powerful music sequencing library kevin has approved Package armstrong kevin has added a Fedora devel branch for armstrong with an owner of oget kevin has approved armstrong in Fedora devel kevin has approved Package armstrong kevin has set commit to Approved for provenpackager on armstrong (Fedora devel) kevin has set build to Approved for provenpackager on armstrong (Fedora devel) kevin has set checkout to Approved for provenpackager on armstrong (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/armstrong From kevin at fedoraproject.org Thu Mar 5 20:17:49 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:17:49 +0000 (UTC) Subject: rpms/armstrong - New directory Message-ID: <20090305201749.2BBDE70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/armstrong In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssh9636/rpms/armstrong Log Message: Directory /cvs/pkgs/rpms/armstrong added to the repository From pkgdb at fedoraproject.org Thu Mar 5 20:18:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:18:17 +0000 Subject: [pkgdb] armstrong (Fedora, 10) updated by kevin Message-ID: <20090305201815.BC9B5208548@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for armstrong kevin has set commit to Approved for provenpackager on armstrong (Fedora 10) kevin has set build to Approved for provenpackager on armstrong (Fedora 10) kevin has set checkout to Approved for provenpackager on armstrong (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/armstrong From kevin at fedoraproject.org Thu Mar 5 20:17:49 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:17:49 +0000 (UTC) Subject: rpms/armstrong/devel - New directory Message-ID: <20090305201749.67F3570118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/armstrong/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssh9636/rpms/armstrong/devel Log Message: Directory /cvs/pkgs/rpms/armstrong/devel added to the repository From dwalsh at fedoraproject.org Thu Mar 5 20:17:42 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Thu, 5 Mar 2009 20:17:42 +0000 (UTC) Subject: rpms/libsepol/devel libsepol.spec,1.189,1.190 Message-ID: <20090305201742.60F9870116@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libsepol/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9502 Modified Files: libsepol.spec Log Message: * Thu Mar 5 2009 Dan Walsh 2.0.35-3 - Fix license specification to be LGPL instead of GPL Index: libsepol.spec =================================================================== RCS file: /cvs/extras/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- libsepol.spec 25 Feb 2009 18:02:46 -0000 1.189 +++ libsepol.spec 5 Mar 2009 20:17:12 -0000 1.190 @@ -1,8 +1,8 @@ Summary: SELinux binary policy manipulation library Name: libsepol Version: 2.0.35 -Release: 2%{?dist} -License: GPLv2+ +Release: 3%{?dist} +License: LGPLv2+ Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz URL: http://www.selinuxproject.org @@ -96,8 +96,10 @@ /%{_lib}/libsepol.so.1 %changelog +* Thu Mar 5 2009 Dan Walsh 2.0.35-3 +- Fix license specification to be LGPL instead of GPL + * Wed Feb 25 2009 Fedora Release Engineering - 2.0.35-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Wed Feb 18 2009 Dan Walsh 2.0.35-1 - Upgrade to latest from NSA From kevin at fedoraproject.org Thu Mar 5 20:18:11 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:18:11 +0000 (UTC) Subject: rpms/armstrong Makefile,NONE,1.1 Message-ID: <20090305201811.DF54270116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/armstrong In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssh9636/rpms/armstrong Added Files: Makefile Log Message: Setup of module armstrong --- NEW FILE Makefile --- # Top level Makefile for module armstrong all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Thu Mar 5 20:18:12 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:18:12 +0000 (UTC) Subject: rpms/armstrong/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305201812.6DF1B70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/armstrong/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssh9636/rpms/armstrong/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module armstrong --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: armstrong # $Id: Makefile,v 1.1 2009/03/05 20:18:12 kevin Exp $ NAME := armstrong SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Thu Mar 5 20:22:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:22:53 +0000 Subject: [pkgdb] dc3dd was added for maxamillion Message-ID: <20090305202315.37A0A2082B2@bastion.fedora.phx.redhat.com> toshio has added Package dc3dd with summary Patched version of GNU dd for use in computer forensics toshio has approved Package dc3dd toshio has added a Fedora devel branch for dc3dd with an owner of maxamillion toshio has approved dc3dd in Fedora devel toshio has approved Package dc3dd toshio has set commit to Approved for provenpackager on dc3dd (Fedora devel) toshio has set build to Approved for provenpackager on dc3dd (Fedora devel) toshio has set checkout to Approved for provenpackager on dc3dd (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dc3dd From pkgdb at fedoraproject.org Thu Mar 5 20:22:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:22:32 +0000 Subject: [pkgdb] dc3dd (Fedora, 9) updated by toshio Message-ID: <20090305202316.F06CE208545@bastion.fedora.phx.redhat.com> toshio added a Fedora 9 branch for dc3dd toshio has set commit to Approved for provenpackager on dc3dd (Fedora 9) toshio has set build to Approved for provenpackager on dc3dd (Fedora 9) toshio has set checkout to Approved for provenpackager on dc3dd (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dc3dd From pkgdb at fedoraproject.org Thu Mar 5 20:22:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:22:32 +0000 Subject: [pkgdb] dc3dd (Fedora, 10) updated by toshio Message-ID: <20090305202317.1A8B8208549@bastion.fedora.phx.redhat.com> toshio added a Fedora 10 branch for dc3dd toshio has set commit to Approved for provenpackager on dc3dd (Fedora 10) toshio has set build to Approved for provenpackager on dc3dd (Fedora 10) toshio has set checkout to Approved for provenpackager on dc3dd (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dc3dd From pkgdb at fedoraproject.org Thu Mar 5 20:22:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:22:32 +0000 Subject: [pkgdb] dc3dd (Fedora EPEL, 5) updated by toshio Message-ID: <20090305202317.2A51B20854B@bastion.fedora.phx.redhat.com> toshio added a Fedora EPEL 5 branch for dc3dd toshio has set commit to Approved for provenpackager on dc3dd (Fedora EPEL 5) toshio has set build to Approved for provenpackager on dc3dd (Fedora EPEL 5) toshio has set checkout to Approved for provenpackager on dc3dd (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dc3dd From pkgdb at fedoraproject.org Thu Mar 5 20:22:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:22:32 +0000 Subject: [pkgdb] dc3dd (Fedora EPEL, 4) updated by toshio Message-ID: <20090305202317.7FC8020854E@bastion.fedora.phx.redhat.com> toshio added a Fedora EPEL 4 branch for dc3dd toshio has set commit to Approved for provenpackager on dc3dd (Fedora EPEL 4) toshio has set build to Approved for provenpackager on dc3dd (Fedora EPEL 4) toshio has set checkout to Approved for provenpackager on dc3dd (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dc3dd From kevin at fedoraproject.org Thu Mar 5 20:24:11 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:24:11 +0000 (UTC) Subject: rpms/dc3dd - New directory Message-ID: <20090305202411.358D070116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/dc3dd In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy10851/rpms/dc3dd Log Message: Directory /cvs/pkgs/rpms/dc3dd added to the repository From kevin at fedoraproject.org Thu Mar 5 20:24:11 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:24:11 +0000 (UTC) Subject: rpms/dc3dd/devel - New directory Message-ID: <20090305202411.74B3770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/dc3dd/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy10851/rpms/dc3dd/devel Log Message: Directory /cvs/pkgs/rpms/dc3dd/devel added to the repository From kevin at fedoraproject.org Thu Mar 5 20:24:27 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:24:27 +0000 (UTC) Subject: rpms/dc3dd Makefile,NONE,1.1 Message-ID: <20090305202427.83DED70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/dc3dd In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy10851/rpms/dc3dd Added Files: Makefile Log Message: Setup of module dc3dd --- NEW FILE Makefile --- # Top level Makefile for module dc3dd all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Thu Mar 5 20:24:27 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:24:27 +0000 (UTC) Subject: rpms/dc3dd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305202427.BCC6770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/dc3dd/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy10851/rpms/dc3dd/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dc3dd --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: dc3dd # $Id: Makefile,v 1.1 2009/03/05 20:24:27 kevin Exp $ NAME := dc3dd SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Thu Mar 5 20:25:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:25:41 +0000 Subject: [pkgdb] rubygem-htmlentities was added for mtasaka Message-ID: <20090305202629.27A192082B2@bastion.fedora.phx.redhat.com> kevin has added Package rubygem-htmlentities with summary A module for encoding and decoding (X)HTML entities kevin has approved Package rubygem-htmlentities kevin has added a Fedora devel branch for rubygem-htmlentities with an owner of mtasaka kevin has approved rubygem-htmlentities in Fedora devel kevin has approved Package rubygem-htmlentities kevin has set commit to Approved for provenpackager on rubygem-htmlentities (Fedora devel) kevin has set build to Approved for provenpackager on rubygem-htmlentities (Fedora devel) kevin has set checkout to Approved for provenpackager on rubygem-htmlentities (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-htmlentities From pkgdb at fedoraproject.org Thu Mar 5 20:26:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:26:29 +0000 Subject: [pkgdb] rubygem-htmlentities (Fedora, 9) updated by kevin Message-ID: <20090305202629.7E0BE20854B@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for rubygem-htmlentities kevin has set commit to Approved for provenpackager on rubygem-htmlentities (Fedora 9) kevin has set build to Approved for provenpackager on rubygem-htmlentities (Fedora 9) kevin has set checkout to Approved for provenpackager on rubygem-htmlentities (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-htmlentities From pkgdb at fedoraproject.org Thu Mar 5 20:26:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:26:29 +0000 Subject: [pkgdb] rubygem-htmlentities (Fedora, 10) updated by kevin Message-ID: <20090305202629.903F5208549@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for rubygem-htmlentities kevin has set commit to Approved for provenpackager on rubygem-htmlentities (Fedora 10) kevin has set build to Approved for provenpackager on rubygem-htmlentities (Fedora 10) kevin has set checkout to Approved for provenpackager on rubygem-htmlentities (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-htmlentities From kevin at fedoraproject.org Thu Mar 5 20:26:09 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:26:09 +0000 (UTC) Subject: rpms/rubygem-htmlentities/devel - New directory Message-ID: <20090305202609.795CA70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rubygem-htmlentities/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp11347/rpms/rubygem-htmlentities/devel Log Message: Directory /cvs/pkgs/rpms/rubygem-htmlentities/devel added to the repository From kevin at fedoraproject.org Thu Mar 5 20:26:09 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:26:09 +0000 (UTC) Subject: rpms/rubygem-htmlentities - New directory Message-ID: <20090305202609.30C6470116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rubygem-htmlentities In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp11347/rpms/rubygem-htmlentities Log Message: Directory /cvs/pkgs/rpms/rubygem-htmlentities added to the repository From kevin at fedoraproject.org Thu Mar 5 20:26:28 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:26:28 +0000 (UTC) Subject: rpms/rubygem-htmlentities Makefile,NONE,1.1 Message-ID: <20090305202628.47B7E70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rubygem-htmlentities In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp11347/rpms/rubygem-htmlentities Added Files: Makefile Log Message: Setup of module rubygem-htmlentities --- NEW FILE Makefile --- # Top level Makefile for module rubygem-htmlentities all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Thu Mar 5 20:26:28 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:26:28 +0000 (UTC) Subject: rpms/rubygem-htmlentities/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305202628.9022D70118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rubygem-htmlentities/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp11347/rpms/rubygem-htmlentities/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rubygem-htmlentities --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: rubygem-htmlentities # $Id: Makefile,v 1.1 2009/03/05 20:26:28 kevin Exp $ NAME := rubygem-htmlentities SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From cassmodiah at fedoraproject.org Thu Mar 5 20:28:50 2009 From: cassmodiah at fedoraproject.org (Simon Wesp) Date: Thu, 5 Mar 2009 20:28:50 +0000 (UTC) Subject: rpms/sbackup/devel sbackup-0.10.5-deactivate_dpkg.patch, NONE, 1.1 sbackup-0.10.5-save_on_backup.patch, NONE, 1.1 import.log, 1.1, 1.2 sbackup.spec, 1.2, 1.3 Message-ID: <20090305202850.F0D0B70116@cvs1.fedora.phx.redhat.com> Author: cassmodiah Update of /cvs/pkgs/rpms/sbackup/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11968/devel Modified Files: import.log sbackup.spec Added Files: sbackup-0.10.5-deactivate_dpkg.patch sbackup-0.10.5-save_on_backup.patch Log Message: sbackup-0.10.5-deactivate_dpkg.patch: --- NEW FILE sbackup-0.10.5-deactivate_dpkg.patch --- --- sbackup-0.10.5.orig/sbackupd.py 2008-06-15 17:39:25.000000000 +0200 +++ sbackup-0.10.5/sbackupd.py 2009-03-05 20:02:54.000000000 +0100 @@ -562,17 +562,17 @@ pickle.dump( gexclude, gnomevfs.create(tdir+"excludes", 2) ) # Backup list of installed packages (Debian only part) -try: - command = "dpkg --get-selections" - s = os.popen( command ) - if local: - d = open( tdir+"packages", "w" ) - else: - d = gnomevfs.create( tdir+"packages", 2 ) - shutil.copyfileobj( s, d ) - s.close() -except: - pass +#try: +# command = "dpkg --get-selections" +# s = os.popen( command ) +# if local: +# d = open( tdir+"packages", "w" ) +# else: +# d = gnomevfs.create( tdir+"packages", 2 ) +# shutil.copyfileobj( s, d ) +# s.close() +#except: +# pass # End of Debian only part # Backup disk table of present block devices sbackup-0.10.5-save_on_backup.patch: --- NEW FILE sbackup-0.10.5-save_on_backup.patch --- --- sbackup-0.10.5.orig/simple-backup-config.py 2008-06-15 17:39:25.000000000 +0200 +++ sbackup-0.10.5.orig/simple-backup-config.py 2009-03-04 21:18:41.000000000 +0100 @@ -453,6 +453,7 @@ def on_backupnow_clicked(self, *args): + self.on_save_clicked(*args) pid = os.spawnl( os.P_NOWAIT, self.conf.get("places", "prefix") + "/sbin/sbackupd" ) dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, buttons=gtk.BUTTONS_CLOSE, message_format=_("A backup run is initiated in the background. The process id is: ")+str(pid)+".") dialog.run() Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/sbackup/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Jan 2009 14:17:37 -0000 1.1 +++ import.log 5 Mar 2009 20:28:20 -0000 1.2 @@ -1 +1,2 @@ sbackup-0_10_5-5_fc10:HEAD:sbackup-0.10.5-5.fc10.src.rpm:1232374701 +sbackup-0_10_5-7_fc10:HEAD:sbackup-0.10.5-7.fc10.src.rpm:1236284867 Index: sbackup.spec =================================================================== RCS file: /cvs/pkgs/rpms/sbackup/devel/sbackup.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sbackup.spec 25 Feb 2009 22:39:42 -0000 1.2 +++ sbackup.spec 5 Mar 2009 20:28:20 -0000 1.3 @@ -3,7 +3,7 @@ Name: sbackup Version: 0.10.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Simple Backup Suite for desktop use Group: Applications/Archiving @@ -14,6 +14,8 @@ Source2: %{name}-restore.desktop Patch0: %{name}-0.10.5-locales.patch Patch1: %{name}-0.10.5-prefix.patch +Patch2: %{name}-0.10.5-save_on_backup.patch +Patch3: %{name}-0.10.5-deactivate_dpkg.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,12 +41,19 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %install rm -rf %{buildroot} -make install -p DESTDIR=%{buildroot} PREFIX=%{_prefix} +make install \ + DESTDIR=%{buildroot} \ + PREFIX=%{_prefix} + +#make install -p DESTDIR=%{buildroot} PREFIX=%{_prefix} + mkdir -p %{buildroot}%{_mandir}/man8/ cat simple-backup.8 | gzip -9 -c > %{name}.8.gz @@ -99,8 +108,8 @@ SESSION=true EOF -mkdir -p %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/ -touch %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/%{name} +mkdir -p %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/ +touch %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/%{name} %find_lang %{name} @@ -129,10 +138,14 @@ %config %{_sysconfdir}/security/console.apps/%{srg} %exclude %{_sbindir}/srestore.* %exclude %{_sbindir}/upgrade_backups.* -%ghost %{_sysconfdir}/cron*/%{name} +%ghost %{_sysconfdir}/cron.*/%{name} %changelog +* Thu Mar 05 2009 Simon Wesp - 0.10.5-7 +- Add patch2 to save on backup - Close RHBZ: #486079 +- Add patch3 to deactivate dpkg queries + * Wed Feb 25 2009 Fedora Release Engineering - 0.10.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From cassmodiah at fedoraproject.org Thu Mar 5 20:30:45 2009 From: cassmodiah at fedoraproject.org (Simon Wesp) Date: Thu, 5 Mar 2009 20:30:45 +0000 (UTC) Subject: rpms/sbackup/F-10 sbackup-0.10.5-deactivate_dpkg.patch, NONE, 1.1 sbackup-0.10.5-save_on_backup.patch, NONE, 1.1 import.log, 1.1, 1.2 sbackup.spec, 1.1, 1.2 Message-ID: <20090305203045.5C29870116@cvs1.fedora.phx.redhat.com> Author: cassmodiah Update of /cvs/pkgs/rpms/sbackup/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12375/F-10 Modified Files: import.log sbackup.spec Added Files: sbackup-0.10.5-deactivate_dpkg.patch sbackup-0.10.5-save_on_backup.patch Log Message: sbackup-0.10.5-deactivate_dpkg.patch: --- NEW FILE sbackup-0.10.5-deactivate_dpkg.patch --- --- sbackup-0.10.5.orig/sbackupd.py 2008-06-15 17:39:25.000000000 +0200 +++ sbackup-0.10.5/sbackupd.py 2009-03-05 20:02:54.000000000 +0100 @@ -562,17 +562,17 @@ pickle.dump( gexclude, gnomevfs.create(tdir+"excludes", 2) ) # Backup list of installed packages (Debian only part) -try: - command = "dpkg --get-selections" - s = os.popen( command ) - if local: - d = open( tdir+"packages", "w" ) - else: - d = gnomevfs.create( tdir+"packages", 2 ) - shutil.copyfileobj( s, d ) - s.close() -except: - pass +#try: +# command = "dpkg --get-selections" +# s = os.popen( command ) +# if local: +# d = open( tdir+"packages", "w" ) +# else: +# d = gnomevfs.create( tdir+"packages", 2 ) +# shutil.copyfileobj( s, d ) +# s.close() +#except: +# pass # End of Debian only part # Backup disk table of present block devices sbackup-0.10.5-save_on_backup.patch: --- NEW FILE sbackup-0.10.5-save_on_backup.patch --- --- sbackup-0.10.5.orig/simple-backup-config.py 2008-06-15 17:39:25.000000000 +0200 +++ sbackup-0.10.5.orig/simple-backup-config.py 2009-03-04 21:18:41.000000000 +0100 @@ -453,6 +453,7 @@ def on_backupnow_clicked(self, *args): + self.on_save_clicked(*args) pid = os.spawnl( os.P_NOWAIT, self.conf.get("places", "prefix") + "/sbin/sbackupd" ) dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, buttons=gtk.BUTTONS_CLOSE, message_format=_("A backup run is initiated in the background. The process id is: ")+str(pid)+".") dialog.run() Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/sbackup/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Jan 2009 14:24:34 -0000 1.1 +++ import.log 5 Mar 2009 20:30:14 -0000 1.2 @@ -1 +1,2 @@ sbackup-0_10_5-5_fc10:F-10:sbackup-0.10.5-5.fc10.src.rpm:1232374996 +sbackup-0_10_5-7_fc10:F-10:sbackup-0.10.5-7.fc10.src.rpm:1236284971 Index: sbackup.spec =================================================================== RCS file: /cvs/pkgs/rpms/sbackup/F-10/sbackup.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sbackup.spec 19 Jan 2009 14:24:34 -0000 1.1 +++ sbackup.spec 5 Mar 2009 20:30:14 -0000 1.2 @@ -3,7 +3,7 @@ Name: sbackup Version: 0.10.5 -Release: 5%{?dist} +Release: 7%{?dist} Summary: Simple Backup Suite for desktop use Group: Applications/Archiving @@ -14,6 +14,8 @@ Source2: %{name}-restore.desktop Patch0: %{name}-0.10.5-locales.patch Patch1: %{name}-0.10.5-prefix.patch +Patch2: %{name}-0.10.5-save_on_backup.patch +Patch3: %{name}-0.10.5-deactivate_dpkg.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,12 +41,19 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %install rm -rf %{buildroot} -make install -p DESTDIR=%{buildroot} PREFIX=%{_prefix} +make install \ + DESTDIR=%{buildroot} \ + PREFIX=%{_prefix} + +#make install -p DESTDIR=%{buildroot} PREFIX=%{_prefix} + mkdir -p %{buildroot}%{_mandir}/man8/ cat simple-backup.8 | gzip -9 -c > %{name}.8.gz @@ -99,8 +108,8 @@ SESSION=true EOF -mkdir -p %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/ -touch %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/%{name} +mkdir -p %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/ +touch %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/%{name} %find_lang %{name} @@ -129,10 +138,17 @@ %config %{_sysconfdir}/security/console.apps/%{srg} %exclude %{_sbindir}/srestore.* %exclude %{_sbindir}/upgrade_backups.* -%ghost %{_sysconfdir}/cron*/%{name} +%ghost %{_sysconfdir}/cron.*/%{name} %changelog +* Thu Mar 05 2009 Simon Wesp - 0.10.5-7 +- Add patch2 to save on backup - Close RHBZ: #486079 +- Add patch3 to deactivate dpkg queries + +* Wed Feb 25 2009 Fedora Release Engineering - 0.10.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Jan 16 2009 Simon Wesp - 0.10.5-5 - Add ownage for cron-files - Correct patch0 From cassmodiah at fedoraproject.org Thu Mar 5 20:32:51 2009 From: cassmodiah at fedoraproject.org (Simon Wesp) Date: Thu, 5 Mar 2009 20:32:51 +0000 (UTC) Subject: rpms/sbackup/F-9 sbackup-0.10.5-deactivate_dpkg.patch, NONE, 1.1 sbackup-0.10.5-save_on_backup.patch, NONE, 1.1 import.log, 1.1, 1.2 sbackup.spec, 1.1, 1.2 Message-ID: <20090305203251.62FF970116@cvs1.fedora.phx.redhat.com> Author: cassmodiah Update of /cvs/pkgs/rpms/sbackup/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12860/F-9 Modified Files: import.log sbackup.spec Added Files: sbackup-0.10.5-deactivate_dpkg.patch sbackup-0.10.5-save_on_backup.patch Log Message: sbackup-0.10.5-deactivate_dpkg.patch: --- NEW FILE sbackup-0.10.5-deactivate_dpkg.patch --- --- sbackup-0.10.5.orig/sbackupd.py 2008-06-15 17:39:25.000000000 +0200 +++ sbackup-0.10.5/sbackupd.py 2009-03-05 20:02:54.000000000 +0100 @@ -562,17 +562,17 @@ pickle.dump( gexclude, gnomevfs.create(tdir+"excludes", 2) ) # Backup list of installed packages (Debian only part) -try: - command = "dpkg --get-selections" - s = os.popen( command ) - if local: - d = open( tdir+"packages", "w" ) - else: - d = gnomevfs.create( tdir+"packages", 2 ) - shutil.copyfileobj( s, d ) - s.close() -except: - pass +#try: +# command = "dpkg --get-selections" +# s = os.popen( command ) +# if local: +# d = open( tdir+"packages", "w" ) +# else: +# d = gnomevfs.create( tdir+"packages", 2 ) +# shutil.copyfileobj( s, d ) +# s.close() +#except: +# pass # End of Debian only part # Backup disk table of present block devices sbackup-0.10.5-save_on_backup.patch: --- NEW FILE sbackup-0.10.5-save_on_backup.patch --- --- sbackup-0.10.5.orig/simple-backup-config.py 2008-06-15 17:39:25.000000000 +0200 +++ sbackup-0.10.5.orig/simple-backup-config.py 2009-03-04 21:18:41.000000000 +0100 @@ -453,6 +453,7 @@ def on_backupnow_clicked(self, *args): + self.on_save_clicked(*args) pid = os.spawnl( os.P_NOWAIT, self.conf.get("places", "prefix") + "/sbin/sbackupd" ) dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, buttons=gtk.BUTTONS_CLOSE, message_format=_("A backup run is initiated in the background. The process id is: ")+str(pid)+".") dialog.run() Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/sbackup/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Jan 2009 14:30:01 -0000 1.1 +++ import.log 5 Mar 2009 20:32:21 -0000 1.2 @@ -1 +1,2 @@ sbackup-0_10_5-5_fc10:F-9:sbackup-0.10.5-5.fc10.src.rpm:1232375421 +sbackup-0_10_5-7_fc10:F-9:sbackup-0.10.5-7.fc10.src.rpm:1236285080 Index: sbackup.spec =================================================================== RCS file: /cvs/pkgs/rpms/sbackup/F-9/sbackup.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sbackup.spec 19 Jan 2009 14:30:01 -0000 1.1 +++ sbackup.spec 5 Mar 2009 20:32:21 -0000 1.2 @@ -3,7 +3,7 @@ Name: sbackup Version: 0.10.5 -Release: 5%{?dist} +Release: 7%{?dist} Summary: Simple Backup Suite for desktop use Group: Applications/Archiving @@ -14,6 +14,8 @@ Source2: %{name}-restore.desktop Patch0: %{name}-0.10.5-locales.patch Patch1: %{name}-0.10.5-prefix.patch +Patch2: %{name}-0.10.5-save_on_backup.patch +Patch3: %{name}-0.10.5-deactivate_dpkg.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,12 +41,19 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %install rm -rf %{buildroot} -make install -p DESTDIR=%{buildroot} PREFIX=%{_prefix} +make install \ + DESTDIR=%{buildroot} \ + PREFIX=%{_prefix} + +#make install -p DESTDIR=%{buildroot} PREFIX=%{_prefix} + mkdir -p %{buildroot}%{_mandir}/man8/ cat simple-backup.8 | gzip -9 -c > %{name}.8.gz @@ -99,8 +108,8 @@ SESSION=true EOF -mkdir -p %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/ -touch %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/%{name} +mkdir -p %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/ +touch %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/%{name} %find_lang %{name} @@ -129,10 +138,17 @@ %config %{_sysconfdir}/security/console.apps/%{srg} %exclude %{_sbindir}/srestore.* %exclude %{_sbindir}/upgrade_backups.* -%ghost %{_sysconfdir}/cron*/%{name} +%ghost %{_sysconfdir}/cron.*/%{name} %changelog +* Thu Mar 05 2009 Simon Wesp - 0.10.5-7 +- Add patch2 to save on backup - Close RHBZ: #486079 +- Add patch3 to deactivate dpkg queries + +* Wed Feb 25 2009 Fedora Release Engineering - 0.10.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Jan 16 2009 Simon Wesp - 0.10.5-5 - Add ownage for cron-files - Correct patch0 From pkgdb at fedoraproject.org Thu Mar 5 20:34:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:34:05 +0000 Subject: [pkgdb] jFormatString was added for jjames Message-ID: <20090305203450.5AB732082B2@bastion.fedora.phx.redhat.com> kevin has added Package jFormatString with summary Java format string compile-time checker kevin has approved Package jFormatString kevin has added a Fedora devel branch for jFormatString with an owner of jjames kevin has approved jFormatString in Fedora devel kevin has approved Package jFormatString kevin has set commit to Approved for provenpackager on jFormatString (Fedora devel) kevin has set build to Approved for provenpackager on jFormatString (Fedora devel) kevin has set checkout to Approved for provenpackager on jFormatString (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jFormatString From pkgdb at fedoraproject.org Thu Mar 5 20:34:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:34:50 +0000 Subject: [pkgdb] jFormatString (Fedora, 9) updated by kevin Message-ID: <20090305203451.049A9208545@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for jFormatString kevin has set commit to Approved for provenpackager on jFormatString (Fedora 9) kevin has set build to Approved for provenpackager on jFormatString (Fedora 9) kevin has set checkout to Approved for provenpackager on jFormatString (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jFormatString From kevin at fedoraproject.org Thu Mar 5 20:34:30 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:34:30 +0000 (UTC) Subject: rpms/jFormatString - New directory Message-ID: <20090305203430.2568D70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/jFormatString In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg13402/rpms/jFormatString Log Message: Directory /cvs/pkgs/rpms/jFormatString added to the repository From kevin at fedoraproject.org Thu Mar 5 20:34:30 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:34:30 +0000 (UTC) Subject: rpms/jFormatString/devel - New directory Message-ID: <20090305203430.5EF5470116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/jFormatString/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg13402/rpms/jFormatString/devel Log Message: Directory /cvs/pkgs/rpms/jFormatString/devel added to the repository From pkgdb at fedoraproject.org Thu Mar 5 20:34:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:34:50 +0000 Subject: [pkgdb] jFormatString (Fedora, 10) updated by kevin Message-ID: <20090305203451.0E8E2208549@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for jFormatString kevin has set commit to Approved for provenpackager on jFormatString (Fedora 10) kevin has set build to Approved for provenpackager on jFormatString (Fedora 10) kevin has set checkout to Approved for provenpackager on jFormatString (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jFormatString From kevin at fedoraproject.org Thu Mar 5 20:34:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:34:47 +0000 (UTC) Subject: rpms/jFormatString/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305203447.D692D70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/jFormatString/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg13402/rpms/jFormatString/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module jFormatString --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: jFormatString # $Id: Makefile,v 1.1 2009/03/05 20:34:47 kevin Exp $ NAME := jFormatString SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Thu Mar 5 20:34:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:34:47 +0000 (UTC) Subject: rpms/jFormatString Makefile,NONE,1.1 Message-ID: <20090305203447.87BBC70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/jFormatString In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg13402/rpms/jFormatString Added Files: Makefile Log Message: Setup of module jFormatString --- NEW FILE Makefile --- # Top level Makefile for module jFormatString all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From glommer at fedoraproject.org Thu Mar 5 20:36:00 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Thu, 5 Mar 2009 20:36:00 +0000 (UTC) Subject: comps comps-f11.xml.in,1.143,1.144 Message-ID: <20090305203600.109BB70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13488 Modified Files: comps-f11.xml.in Log Message: replaced kvm with qemu-system-x86 and qemu-system-ppc in Virtualization group Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- comps-f11.xml.in 5 Mar 2009 20:12:54 -0000 1.143 +++ comps-f11.xml.in 5 Mar 2009 20:35:29 -0000 1.144 @@ -5081,7 +5081,8 @@ true python-virtinst - kvm + qemu-system-x86 + qemu-system-ppc virt-manager virt-viewer gnome-applet-vm From hardaker at fedoraproject.org Thu Mar 5 20:36:02 2009 From: hardaker at fedoraproject.org (Wes Hardaker) Date: Thu, 5 Mar 2009 20:36:02 +0000 (UTC) Subject: rpms/perl-Getopt-GUI-Long/devel perl-Getopt-GUI-Long.spec,1.3,1.4 Message-ID: <20090305203602.C041F70116@cvs1.fedora.phx.redhat.com> Author: hardaker Update of /cvs/extras/rpms/perl-Getopt-GUI-Long/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13774 Modified Files: perl-Getopt-GUI-Long.spec Log Message: update for 0.91 Index: perl-Getopt-GUI-Long.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Getopt-GUI-Long/devel/perl-Getopt-GUI-Long.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Getopt-GUI-Long.spec 26 Feb 2009 17:07:34 -0000 1.3 +++ perl-Getopt-GUI-Long.spec 5 Mar 2009 20:35:32 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Getopt-GUI-Long -Version: 0.8 -Release: 3%{?dist} +Version: 0.91 +Release: 1%{?dist} Summary: A wrapper around Getopt::Long to provide a GUI to applications License: GPL+ or Artistic Group: Development/Libraries @@ -22,13 +22,13 @@ This module is a wrapper around Getopt::Long that extends the value of the original Getopt::Long module to: -1) add a simple graphical user interface option screen if no - arguments are passed to the program. Thus, the arguments to - actually use are built based on the results of the user - interface. If arguments were passed to the program, the user - interface is not shown and the program executes as it normally - would and acts just as if Getopt::Long::GetOptions had been - called instead. +1) add a simple graphical user interface option screen if no arguments + are passed to the program. Thus, the arguments to actually use are + built based on the results of the user interface. If arguments were + passed to the program, the user interface is not shown and the + program executes as it normally would and acts just as if + Getopt::Long::GetOptions had been called instead. This requires + the QWizard and Gtk2 or Tk interfaces to be installed too. 2) provide an auto-help mechanism such that -h and --help are handled automatically. In fact, calling your program with -h @@ -73,6 +73,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 5 2009 Wes Hardaker - 0.91-1 +- Update to 0.91 + * Thu Feb 26 2009 Fedora Release Engineering - 0.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From cassmodiah at fedoraproject.org Thu Mar 5 20:36:06 2009 From: cassmodiah at fedoraproject.org (Simon Wesp) Date: Thu, 5 Mar 2009 20:36:06 +0000 (UTC) Subject: rpms/sbackup/EL-5 sbackup-0.10.5-deactivate_dpkg.patch, NONE, 1.1 sbackup-0.10.5-save_on_backup.patch, NONE, 1.1 import.log, 1.1, 1.2 sbackup.spec, 1.1, 1.2 Message-ID: <20090305203606.153CE70116@cvs1.fedora.phx.redhat.com> Author: cassmodiah Update of /cvs/pkgs/rpms/sbackup/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13741/EL-5 Modified Files: import.log sbackup.spec Added Files: sbackup-0.10.5-deactivate_dpkg.patch sbackup-0.10.5-save_on_backup.patch Log Message: sbackup-0.10.5-deactivate_dpkg.patch: --- NEW FILE sbackup-0.10.5-deactivate_dpkg.patch --- --- sbackup-0.10.5.orig/sbackupd.py 2008-06-15 17:39:25.000000000 +0200 +++ sbackup-0.10.5/sbackupd.py 2009-03-05 20:02:54.000000000 +0100 @@ -562,17 +562,17 @@ pickle.dump( gexclude, gnomevfs.create(tdir+"excludes", 2) ) # Backup list of installed packages (Debian only part) -try: - command = "dpkg --get-selections" - s = os.popen( command ) - if local: - d = open( tdir+"packages", "w" ) - else: - d = gnomevfs.create( tdir+"packages", 2 ) - shutil.copyfileobj( s, d ) - s.close() -except: - pass +#try: +# command = "dpkg --get-selections" +# s = os.popen( command ) +# if local: +# d = open( tdir+"packages", "w" ) +# else: +# d = gnomevfs.create( tdir+"packages", 2 ) +# shutil.copyfileobj( s, d ) +# s.close() +#except: +# pass # End of Debian only part # Backup disk table of present block devices sbackup-0.10.5-save_on_backup.patch: --- NEW FILE sbackup-0.10.5-save_on_backup.patch --- --- sbackup-0.10.5.orig/simple-backup-config.py 2008-06-15 17:39:25.000000000 +0200 +++ sbackup-0.10.5.orig/simple-backup-config.py 2009-03-04 21:18:41.000000000 +0100 @@ -453,6 +453,7 @@ def on_backupnow_clicked(self, *args): + self.on_save_clicked(*args) pid = os.spawnl( os.P_NOWAIT, self.conf.get("places", "prefix") + "/sbin/sbackupd" ) dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, buttons=gtk.BUTTONS_CLOSE, message_format=_("A backup run is initiated in the background. The process id is: ")+str(pid)+".") dialog.run() Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/sbackup/EL-5/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Jan 2009 14:44:48 -0000 1.1 +++ import.log 5 Mar 2009 20:35:35 -0000 1.2 @@ -1 +1,2 @@ sbackup-0_10_5-5_fc10:EL-5:sbackup-0.10.5-5.fc10.src.rpm:1232376306 +sbackup-0_10_5-7_fc10:EL-5:sbackup-0.10.5-7.fc10.src.rpm:1236285252 Index: sbackup.spec =================================================================== RCS file: /cvs/pkgs/rpms/sbackup/EL-5/sbackup.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sbackup.spec 19 Jan 2009 14:44:48 -0000 1.1 +++ sbackup.spec 5 Mar 2009 20:35:35 -0000 1.2 @@ -3,7 +3,7 @@ Name: sbackup Version: 0.10.5 -Release: 5%{?dist} +Release: 7%{?dist} Summary: Simple Backup Suite for desktop use Group: Applications/Archiving @@ -14,6 +14,8 @@ Source2: %{name}-restore.desktop Patch0: %{name}-0.10.5-locales.patch Patch1: %{name}-0.10.5-prefix.patch +Patch2: %{name}-0.10.5-save_on_backup.patch +Patch3: %{name}-0.10.5-deactivate_dpkg.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +24,7 @@ Requires: usermode-gtk Requires: pygtk2-libglade Requires: gettext -Requires: gnome-vfs2 +Requires: gvfs %description Simple Backup Suite is a set of backend backup daemon and GNOME @@ -39,12 +41,19 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %install rm -rf %{buildroot} -make install -p DESTDIR=%{buildroot} PREFIX=%{_prefix} +make install \ + DESTDIR=%{buildroot} \ + PREFIX=%{_prefix} + +#make install -p DESTDIR=%{buildroot} PREFIX=%{_prefix} + mkdir -p %{buildroot}%{_mandir}/man8/ cat simple-backup.8 | gzip -9 -c > %{name}.8.gz @@ -99,8 +108,8 @@ SESSION=true EOF -mkdir -p %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/ -touch %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/%{name} +mkdir -p %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/ +touch %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/%{name} %find_lang %{name} @@ -129,10 +138,17 @@ %config %{_sysconfdir}/security/console.apps/%{srg} %exclude %{_sbindir}/srestore.* %exclude %{_sbindir}/upgrade_backups.* -%ghost %{_sysconfdir}/cron*/%{name} +%ghost %{_sysconfdir}/cron.*/%{name} %changelog +* Thu Mar 05 2009 Simon Wesp - 0.10.5-7 +- Add patch2 to save on backup - Close RHBZ: #486079 +- Add patch3 to deactivate dpkg queries + +* Wed Feb 25 2009 Fedora Release Engineering - 0.10.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Jan 16 2009 Simon Wesp - 0.10.5-5 - Add ownage for cron-files - Correct patch0 From pkgdb at fedoraproject.org Thu Mar 5 20:36:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:36:36 +0000 Subject: [pkgdb] perl-Class-XSAccessor-Array was added for mmaslano Message-ID: <20090305203720.649BD208543@bastion.fedora.phx.redhat.com> kevin has added Package perl-Class-XSAccessor-Array with summary Generate fast XS accessors without runtime compilation kevin has approved Package perl-Class-XSAccessor-Array kevin has added a Fedora devel branch for perl-Class-XSAccessor-Array with an owner of mmaslano kevin has approved perl-Class-XSAccessor-Array in Fedora devel kevin has approved Package perl-Class-XSAccessor-Array kevin has set commit to Approved for provenpackager on perl-Class-XSAccessor-Array (Fedora devel) kevin has set build to Approved for provenpackager on perl-Class-XSAccessor-Array (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Class-XSAccessor-Array (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-XSAccessor-Array From pkgdb at fedoraproject.org Thu Mar 5 20:37:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:37:21 +0000 Subject: [pkgdb] perl-Class-XSAccessor-Array (Fedora, devel) updated by kevin Message-ID: <20090305203721.12A51208547@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Class-XSAccessor-Array (Fedora devel) for perl-sig kevin approved watchcommits on perl-Class-XSAccessor-Array (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-XSAccessor-Array From kevin at fedoraproject.org Thu Mar 5 20:36:56 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:36:56 +0000 (UTC) Subject: rpms/perl-Class-XSAccessor-Array - New directory Message-ID: <20090305203656.24F9A70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Class-XSAccessor-Array In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP14161/rpms/perl-Class-XSAccessor-Array Log Message: Directory /cvs/pkgs/rpms/perl-Class-XSAccessor-Array added to the repository From kevin at fedoraproject.org Thu Mar 5 20:36:56 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:36:56 +0000 (UTC) Subject: rpms/perl-Class-XSAccessor-Array/devel - New directory Message-ID: <20090305203656.5F32D70117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Class-XSAccessor-Array/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP14161/rpms/perl-Class-XSAccessor-Array/devel Log Message: Directory /cvs/pkgs/rpms/perl-Class-XSAccessor-Array/devel added to the repository From kevin at fedoraproject.org Thu Mar 5 20:37:12 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:37:12 +0000 (UTC) Subject: rpms/perl-Class-XSAccessor-Array/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305203712.B0CB270116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Class-XSAccessor-Array/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP14161/rpms/perl-Class-XSAccessor-Array/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Class-XSAccessor-Array --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Class-XSAccessor-Array # $Id: Makefile,v 1.1 2009/03/05 20:37:12 kevin Exp $ NAME := perl-Class-XSAccessor-Array SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Thu Mar 5 20:37:12 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:37:12 +0000 (UTC) Subject: rpms/perl-Class-XSAccessor-Array Makefile,NONE,1.1 Message-ID: <20090305203712.71BF170116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Class-XSAccessor-Array In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP14161/rpms/perl-Class-XSAccessor-Array Added Files: Makefile Log Message: Setup of module perl-Class-XSAccessor-Array --- NEW FILE Makefile --- # Top level Makefile for module perl-Class-XSAccessor-Array all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From maxamillion at fedoraproject.org Thu Mar 5 20:39:50 2009 From: maxamillion at fedoraproject.org (Adam Miller) Date: Thu, 5 Mar 2009 20:39:50 +0000 (UTC) Subject: rpms/dc3dd/devel dc3dd.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305203950.C942670116@cvs1.fedora.phx.redhat.com> Author: maxamillion Update of /cvs/extras/rpms/dc3dd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14605/devel Modified Files: .cvsignore sources Added Files: dc3dd.spec import.log Log Message: Initial cvs-import of dc3dd package. --- NEW FILE dc3dd.spec --- Name: dc3dd Version: 6.12.2 Release: 3%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors License: GPLv2+ and GPLv3+ URL: http://dc3dd.sourceforge.net/ Source0: http://master.dl.sourceforge.net/dc3dd/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gettext %description dc3dd is a patched version of GNU dd to include a number of features useful for computer forensics. Many of these features were inspired by dcfldd, but were rewritten for dc3dd. * Pattern writes. The program can write a single hexadecimal value or a text string to the output device for wiping purposes. * Piecewise and overall hashing with multiple algorithms and variable size windows. Supports MD5, SHA-1, SHA-256, and SHA-512. Hashes can be computed before or after conversions are made. * Progress meter with automatic input/output file size probing * Combined log for hashes and errors * Error grouping. Produces one error message for identical sequential errors * Verify mode. Able to repeat any transformations done to the input file and compare it to an output. * Ability to split the output into chunks with numerical or alphabetic extensions %prep %setup -q for file in README Sample_Commands.txt Options_Reference.txt; do sed 's|\r||' $file > $file.tmp touch -r $file $file.tmp mv -f $file.tmp $file done rm po/*.gmo %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc ABOUT-NLS AUTHORS COPYING ChangeLog README README.coreutils THANKS THANKS-to-translators TODO Sample_Commands.txt NEWS Options_Reference.txt %{_bindir}/%{name} %{_mandir}/man1/%{name}.* %changelog * Thu Mar 05 2009 Adam Miller - 6.12.2-3 - Cleaned up the .spec by looping through files needing EOF encoding fix * Mon Mar 02 2009 Adam Miller - 6.12.2-2 - Removed .gmo binaries, fixed source0, added doc items, fixed EOF encoding - fixed licencing listing * Mon Feb 23 2009 Adam Miller - 6.12.2-1 - First build of dc3dd for fedora --- NEW FILE import.log --- dc3dd-6_12_2-3:HEAD:dc3dd-6.12.2-3.src.rpm:1236285513 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dc3dd/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:24:27 -0000 1.1 +++ .cvsignore 5 Mar 2009 20:39:20 -0000 1.2 @@ -0,0 +1 @@ +dc3dd-6.12.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/dc3dd/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:24:27 -0000 1.1 +++ sources 5 Mar 2009 20:39:20 -0000 1.2 @@ -0,0 +1 @@ +97cc4421e18156890d53803cacf9180c dc3dd-6.12.2.tar.gz From pkgdb at fedoraproject.org Thu Mar 5 20:42:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:42:28 +0000 Subject: [pkgdb] django-pagination was added for ivazquez Message-ID: <20090305204228.79C642082B2@bastion.fedora.phx.redhat.com> kevin has added Package django-pagination with summary Django pagination tools kevin has approved Package django-pagination kevin has added a Fedora devel branch for django-pagination with an owner of ivazquez kevin has approved django-pagination in Fedora devel kevin has approved Package django-pagination kevin has set commit to Approved for provenpackager on django-pagination (Fedora devel) kevin has set build to Approved for provenpackager on django-pagination (Fedora devel) kevin has set checkout to Approved for provenpackager on django-pagination (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination From pkgdb at fedoraproject.org Thu Mar 5 20:42:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:42:31 +0000 Subject: [pkgdb] django-pagination (Fedora, 9) updated by kevin Message-ID: <20090305204230.D0E90208546@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for django-pagination kevin has set commit to Approved for provenpackager on django-pagination (Fedora 9) kevin has set build to Approved for provenpackager on django-pagination (Fedora 9) kevin has set checkout to Approved for provenpackager on django-pagination (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination From pkgdb at fedoraproject.org Thu Mar 5 20:42:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:42:31 +0000 Subject: [pkgdb] django-pagination (Fedora EPEL, 5) updated by kevin Message-ID: <20090305204232.D7D7A20854A@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for django-pagination kevin has set commit to Approved for provenpackager on django-pagination (Fedora EPEL 5) kevin has set build to Approved for provenpackager on django-pagination (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on django-pagination (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination From kevin at fedoraproject.org Thu Mar 5 20:42:06 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:42:06 +0000 (UTC) Subject: rpms/django-pagination - New directory Message-ID: <20090305204206.2BE5270116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-pagination In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI15188/rpms/django-pagination Log Message: Directory /cvs/pkgs/rpms/django-pagination added to the repository From kevin at fedoraproject.org Thu Mar 5 20:42:06 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:42:06 +0000 (UTC) Subject: rpms/django-pagination/devel - New directory Message-ID: <20090305204206.7141470118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-pagination/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI15188/rpms/django-pagination/devel Log Message: Directory /cvs/pkgs/rpms/django-pagination/devel added to the repository From kevin at fedoraproject.org Thu Mar 5 20:42:23 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:42:23 +0000 (UTC) Subject: rpms/django-pagination Makefile,NONE,1.1 Message-ID: <20090305204223.052A470116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-pagination In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI15188/rpms/django-pagination Added Files: Makefile Log Message: Setup of module django-pagination --- NEW FILE Makefile --- # Top level Makefile for module django-pagination all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Thu Mar 5 20:42:24 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:42:24 +0000 (UTC) Subject: rpms/django-pagination/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305204224.4538170116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/django-pagination/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI15188/rpms/django-pagination/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module django-pagination --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: django-pagination # $Id: Makefile,v 1.1 2009/03/05 20:42:23 kevin Exp $ NAME := django-pagination SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Thu Mar 5 20:42:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:42:31 +0000 Subject: [pkgdb] django-pagination (Fedora, 10) updated by kevin Message-ID: <20090305204232.ED22F20854D@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for django-pagination kevin has set commit to Approved for provenpackager on django-pagination (Fedora 10) kevin has set build to Approved for provenpackager on django-pagination (Fedora 10) kevin has set checkout to Approved for provenpackager on django-pagination (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination From pkgdb at fedoraproject.org Thu Mar 5 20:43:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:43:30 +0000 Subject: [pkgdb] perl-MooseX-Singleton was added for allisson Message-ID: <20090305204414.99EF02082B2@bastion.fedora.phx.redhat.com> kevin has added Package perl-MooseX-Singleton with summary Turn your Moose class into a singleton kevin has approved Package perl-MooseX-Singleton kevin has added a Fedora devel branch for perl-MooseX-Singleton with an owner of allisson kevin has approved perl-MooseX-Singleton in Fedora devel kevin has approved Package perl-MooseX-Singleton kevin has set commit to Approved for provenpackager on perl-MooseX-Singleton (Fedora devel) kevin has set build to Approved for provenpackager on perl-MooseX-Singleton (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-MooseX-Singleton (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Singleton From pkgdb at fedoraproject.org Thu Mar 5 20:44:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:44:15 +0000 Subject: [pkgdb] perl-MooseX-Singleton (Fedora, 9) updated by kevin Message-ID: <20090305204415.A08C9208545@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-MooseX-Singleton kevin has set commit to Approved for provenpackager on perl-MooseX-Singleton (Fedora 9) kevin has set build to Approved for provenpackager on perl-MooseX-Singleton (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-MooseX-Singleton (Fedora 9) kevin approved watchbugzilla on perl-MooseX-Singleton (Fedora 9) for perl-sig kevin approved watchcommits on perl-MooseX-Singleton (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Singleton From pkgdb at fedoraproject.org Thu Mar 5 20:44:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:44:15 +0000 Subject: [pkgdb] perl-MooseX-Singleton (Fedora, devel) updated by kevin Message-ID: <20090305204415.A9F22208549@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-MooseX-Singleton (Fedora devel) for perl-sig kevin approved watchcommits on perl-MooseX-Singleton (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Singleton From kevin at fedoraproject.org Thu Mar 5 20:43:56 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:43:56 +0000 (UTC) Subject: rpms/perl-MooseX-Singleton - New directory Message-ID: <20090305204356.4034C70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-MooseX-Singleton In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR15719/rpms/perl-MooseX-Singleton Log Message: Directory /cvs/pkgs/rpms/perl-MooseX-Singleton added to the repository From pkgdb at fedoraproject.org Thu Mar 5 20:44:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:44:15 +0000 Subject: [pkgdb] perl-MooseX-Singleton (Fedora, 10) updated by kevin Message-ID: <20090305204415.B638520854C@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-MooseX-Singleton kevin has set commit to Approved for provenpackager on perl-MooseX-Singleton (Fedora 10) kevin has set build to Approved for provenpackager on perl-MooseX-Singleton (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-MooseX-Singleton (Fedora 10) kevin approved watchbugzilla on perl-MooseX-Singleton (Fedora 10) for perl-sig kevin approved watchcommits on perl-MooseX-Singleton (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Singleton From kevin at fedoraproject.org Thu Mar 5 20:43:56 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:43:56 +0000 (UTC) Subject: rpms/perl-MooseX-Singleton/devel - New directory Message-ID: <20090305204356.8080270119@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-MooseX-Singleton/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR15719/rpms/perl-MooseX-Singleton/devel Log Message: Directory /cvs/pkgs/rpms/perl-MooseX-Singleton/devel added to the repository From kevin at fedoraproject.org Thu Mar 5 20:44:13 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:44:13 +0000 (UTC) Subject: rpms/perl-MooseX-Singleton Makefile,NONE,1.1 Message-ID: <20090305204413.CADC570116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-MooseX-Singleton In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR15719/rpms/perl-MooseX-Singleton Added Files: Makefile Log Message: Setup of module perl-MooseX-Singleton --- NEW FILE Makefile --- # Top level Makefile for module perl-MooseX-Singleton all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Thu Mar 5 20:44:14 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:44:14 +0000 (UTC) Subject: rpms/perl-MooseX-Singleton/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305204414.1DACA70118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-MooseX-Singleton/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR15719/rpms/perl-MooseX-Singleton/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-MooseX-Singleton --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-MooseX-Singleton # $Id: Makefile,v 1.1 2009/03/05 20:44:13 kevin Exp $ NAME := perl-MooseX-Singleton SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From chitlesh at fedoraproject.org Thu Mar 5 20:44:05 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Thu, 5 Mar 2009 20:44:05 +0000 (UTC) Subject: rpms/qwtplot3d/devel import.log,NONE,1.1 qwtplot3d.spec,1.7,1.8 Message-ID: <20090305204405.B27EB70116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/qwtplot3d/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15635/devel Modified Files: qwtplot3d.spec Added Files: import.log Log Message: fixed gcc 4.4 build --- NEW FILE import.log --- qwtplot3d-0_2_7-8_fc10:HEAD:qwtplot3d-0.2.7-8.fc10.src.rpm:1236285651 Index: qwtplot3d.spec =================================================================== RCS file: /cvs/pkgs/rpms/qwtplot3d/devel/qwtplot3d.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- qwtplot3d.spec 25 Feb 2009 18:33:08 -0000 1.7 +++ qwtplot3d.spec 5 Mar 2009 20:43:35 -0000 1.8 @@ -3,7 +3,7 @@ Name: qwtplot3d Version: 0.2.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Qt/OpenGL-based C++ library providing a bunch of 3D-widgets Group: System Environment/Libraries @@ -70,6 +70,8 @@ # treating soname %{__sed} -i "s|TARGET *= qwtplot3d|TARGET = qwtplot3d-qt4|" qwtplot3d.pro +# fixing gcc4.4 build +%{__sed} -i "4i\#include " src/qwt3d_function.cpp %{__mkdir} qt4 @@ -158,6 +160,9 @@ %changelog +* Thu Mar 05 2009 Chitlesh Goorah - 0.2.7-8 +- fixed failed build on gcc 4.4 + * Wed Feb 25 2009 Fedora Release Engineering - 0.2.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Thu Mar 5 20:45:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:45:02 +0000 Subject: [pkgdb] python-ptrace was added for terjeros Message-ID: <20090305204546.7644E208545@bastion.fedora.phx.redhat.com> kevin has added Package python-ptrace with summary Debugger using ptrace written in Python kevin has approved Package python-ptrace kevin has added a Fedora devel branch for python-ptrace with an owner of terjeros kevin has approved python-ptrace in Fedora devel kevin has approved Package python-ptrace kevin has set commit to Approved for provenpackager on python-ptrace (Fedora devel) kevin has set build to Approved for provenpackager on python-ptrace (Fedora devel) kevin has set checkout to Approved for provenpackager on python-ptrace (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-ptrace From pkgdb at fedoraproject.org Thu Mar 5 20:45:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:45:47 +0000 Subject: [pkgdb] python-ptrace (Fedora, 9) updated by kevin Message-ID: <20090305204548.60A31208549@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for python-ptrace kevin has set commit to Approved for provenpackager on python-ptrace (Fedora 9) kevin has set build to Approved for provenpackager on python-ptrace (Fedora 9) kevin has set checkout to Approved for provenpackager on python-ptrace (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-ptrace From pkgdb at fedoraproject.org Thu Mar 5 20:45:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:45:47 +0000 Subject: [pkgdb] python-ptrace (Fedora, 10) updated by kevin Message-ID: <20090305204548.C6FE120854A@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for python-ptrace kevin has set commit to Approved for provenpackager on python-ptrace (Fedora 10) kevin has set build to Approved for provenpackager on python-ptrace (Fedora 10) kevin has set checkout to Approved for provenpackager on python-ptrace (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-ptrace From kevin at fedoraproject.org Thu Mar 5 20:45:24 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:45:24 +0000 (UTC) Subject: rpms/python-ptrace/devel - New directory Message-ID: <20090305204524.6BFA970117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/python-ptrace/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV16137/rpms/python-ptrace/devel Log Message: Directory /cvs/pkgs/rpms/python-ptrace/devel added to the repository From kevin at fedoraproject.org Thu Mar 5 20:45:24 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:45:24 +0000 (UTC) Subject: rpms/python-ptrace - New directory Message-ID: <20090305204524.31E6B70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/python-ptrace In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV16137/rpms/python-ptrace Log Message: Directory /cvs/pkgs/rpms/python-ptrace added to the repository From kevin at fedoraproject.org Thu Mar 5 20:45:44 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:45:44 +0000 (UTC) Subject: rpms/python-ptrace Makefile,NONE,1.1 Message-ID: <20090305204544.974A670116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/python-ptrace In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV16137/rpms/python-ptrace Added Files: Makefile Log Message: Setup of module python-ptrace --- NEW FILE Makefile --- # Top level Makefile for module python-ptrace all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Thu Mar 5 20:45:45 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:45:45 +0000 (UTC) Subject: rpms/python-ptrace/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305204545.2668470116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/python-ptrace/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV16137/rpms/python-ptrace/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-ptrace --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: python-ptrace # $Id: Makefile,v 1.1 2009/03/05 20:45:44 kevin Exp $ NAME := python-ptrace SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Thu Mar 5 20:46:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:46:35 +0000 Subject: [pkgdb] sugar-read was added for erikos Message-ID: <20090305204719.C359B2082B2@bastion.fedora.phx.redhat.com> kevin has added Package sugar-read with summary A document reader for Sugar kevin has approved Package sugar-read kevin has added a Fedora devel branch for sugar-read with an owner of erikos kevin has approved sugar-read in Fedora devel kevin has approved Package sugar-read kevin has set commit to Approved for provenpackager on sugar-read (Fedora devel) kevin has set build to Approved for provenpackager on sugar-read (Fedora devel) kevin has set checkout to Approved for provenpackager on sugar-read (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read From pkgdb at fedoraproject.org Thu Mar 5 20:47:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:47:21 +0000 Subject: [pkgdb] sugar-read (Fedora, devel) updated by kevin Message-ID: <20090305204721.E0F16208545@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on sugar-read (Fedora devel) for sdz kevin approved watchcommits on sugar-read (Fedora devel) for sdz kevin approved commit on sugar-read (Fedora devel) for sdz kevin approved build on sugar-read (Fedora devel) for sdz kevin approved approveacls on sugar-read (Fedora devel) for sdz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-read From kevin at fedoraproject.org Thu Mar 5 20:46:59 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:46:59 +0000 (UTC) Subject: rpms/sugar-read - New directory Message-ID: <20090305204659.45EC170116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/sugar-read In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16612/rpms/sugar-read Log Message: Directory /cvs/pkgs/rpms/sugar-read added to the repository From kevin at fedoraproject.org Thu Mar 5 20:46:59 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:46:59 +0000 (UTC) Subject: rpms/sugar-read/devel - New directory Message-ID: <20090305204659.9AB7170116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/sugar-read/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16612/rpms/sugar-read/devel Log Message: Directory /cvs/pkgs/rpms/sugar-read/devel added to the repository From epienbro at fedoraproject.org Thu Mar 5 20:47:01 2009 From: epienbro at fedoraproject.org (Erik van Pienbroek) Date: Thu, 5 Mar 2009 20:47:01 +0000 (UTC) Subject: rpms/mingw32-glib2/devel .cvsignore, 1.2, 1.3 mingw32-glib2.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <20090305204701.6D30370116@cvs1.fedora.phx.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/mingw32-glib2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16460 Modified Files: .cvsignore mingw32-glib2.spec sources Log Message: - Update to 2.19.10 - Dropped the gtk-doc documentation as it's identical to the base glib2 package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Jan 2009 11:49:11 -0000 1.2 +++ .cvsignore 5 Mar 2009 20:46:31 -0000 1.3 @@ -1 +1 @@ -glib-2.19.5.tar.bz2 +glib-2.19.10.tar.bz2 Index: mingw32-glib2.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mingw32-glib2.spec 26 Feb 2009 01:08:12 -0000 1.4 +++ mingw32-glib2.spec 5 Mar 2009 20:46:31 -0000 1.5 @@ -5,8 +5,8 @@ %define __find_provides %{_mingw32_findprovides} Name: mingw32-glib2 -Version: 2.19.5 -Release: 5%{?dist} +Version: 2.19.10 +Release: 1%{?dist} Summary: MinGW Windows GLib2 library License: LGPLv2+ @@ -117,8 +117,9 @@ rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias -# Remove manpages which duplicate Fedora native. +# Remove the gtk-doc documentation and manpages which duplicate Fedora native rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} +rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc %find_lang glib20 @@ -168,9 +169,6 @@ %{_mingw32_datadir}/aclocal/glib-2.0.m4 %{_mingw32_datadir}/aclocal/glib-gettext.m4 %{_mingw32_datadir}/glib-2.0/ -%{_mingw32_datadir}/gtk-doc/html/gio/ -%{_mingw32_datadir}/gtk-doc/html/glib/ -%{_mingw32_datadir}/gtk-doc/html/gobject/ %files static %defattr(-,root,root,-) @@ -181,6 +179,10 @@ %{_mingw32_libdir}/libgthread-2.0.a %changelog +* Thu Mar 5 2009 Erik van Pienbroek - 2.19.10-1 +- Update to 2.19.10 +- Dropped the gtk-doc documentation as it's identical to the base glib2 package + * Wed Feb 25 2009 Fedora Release Engineering - 2.19.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Jan 2009 11:49:11 -0000 1.2 +++ sources 5 Mar 2009 20:46:31 -0000 1.3 @@ -1 +1 @@ -b9f8453dd38266108641c448ea8d5bee glib-2.19.5.tar.bz2 +2cec449d5593835b6080d662a17078ca glib-2.19.10.tar.bz2 From kevin at fedoraproject.org Thu Mar 5 20:47:20 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:47:20 +0000 (UTC) Subject: rpms/sugar-read Makefile,NONE,1.1 Message-ID: <20090305204720.7EF6D70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/sugar-read In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16612/rpms/sugar-read Added Files: Makefile Log Message: Setup of module sugar-read --- NEW FILE Makefile --- # Top level Makefile for module sugar-read all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Thu Mar 5 20:47:20 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:47:20 +0000 (UTC) Subject: rpms/sugar-read/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305204720.C6BF770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/sugar-read/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16612/rpms/sugar-read/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module sugar-read --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: sugar-read # $Id: Makefile,v 1.1 2009/03/05 20:47:20 kevin Exp $ NAME := sugar-read SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Thu Mar 5 20:50:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:50:55 +0000 Subject: [pkgdb] kdepim3 was added for rdieter Message-ID: <20090305205140.337CB2082B2@bastion.fedora.phx.redhat.com> kevin has added Package kdepim3 with summary Compatibility support for kdepim3 kevin has approved Package kdepim3 kevin has added a Fedora devel branch for kdepim3 with an owner of rdieter kevin has approved kdepim3 in Fedora devel kevin has approved Package kdepim3 kevin has set commit to Approved for provenpackager on kdepim3 (Fedora devel) kevin has set build to Approved for provenpackager on kdepim3 (Fedora devel) kevin has set checkout to Approved for provenpackager on kdepim3 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepim3 From pkgdb at fedoraproject.org Thu Mar 5 20:51:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:51:43 +0000 Subject: [pkgdb] kdepim3 (Fedora, 10) updated by kevin Message-ID: <20090305205141.CEF3D208545@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for kdepim3 kevin has set commit to Approved for provenpackager on kdepim3 (Fedora 10) kevin has set build to Approved for provenpackager on kdepim3 (Fedora 10) kevin has set checkout to Approved for provenpackager on kdepim3 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepim3 From kevin at fedoraproject.org Thu Mar 5 20:51:18 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:51:18 +0000 (UTC) Subject: rpms/kdepim3 - New directory Message-ID: <20090305205118.396E970116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/kdepim3 In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB17430/rpms/kdepim3 Log Message: Directory /cvs/pkgs/rpms/kdepim3 added to the repository From kevin at fedoraproject.org Thu Mar 5 20:51:18 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:51:18 +0000 (UTC) Subject: rpms/kdepim3/devel - New directory Message-ID: <20090305205118.79B8770118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/kdepim3/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB17430/rpms/kdepim3/devel Log Message: Directory /cvs/pkgs/rpms/kdepim3/devel added to the repository From s4504kr at fedoraproject.org Thu Mar 5 20:51:25 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Thu, 5 Mar 2009 20:51:25 +0000 (UTC) Subject: rpms/gprolog/devel gprolog.spec,1.23,1.24 Message-ID: <20090305205125.B4F3D70116@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gprolog/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17341 Modified Files: gprolog.spec Log Message: Supporting noarch subpackages Index: gprolog.spec =================================================================== RCS file: /cvs/extras/rpms/gprolog/devel/gprolog.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gprolog.spec 25 Feb 2009 00:40:24 -0000 1.23 +++ gprolog.spec 5 Mar 2009 20:50:55 -0000 1.24 @@ -1,6 +1,6 @@ Name: gprolog Version: 1.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNU Prolog is a free Prolog compiler Group: Development/Languages @@ -45,6 +45,7 @@ Group: Documentation Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description docs Documentation for GNU Prolog. @@ -130,6 +131,9 @@ %changelog +* Thu Mar 5 2009 Jochen Schmitt 1.3.1-3 +- Supporting noarch subpackages + * Tue Feb 24 2009 Fedora Release Engineering - 1.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kevin at fedoraproject.org Thu Mar 5 20:51:38 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:51:38 +0000 (UTC) Subject: rpms/kdepim3 Makefile,NONE,1.1 Message-ID: <20090305205138.5E3E570116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/kdepim3 In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB17430/rpms/kdepim3 Added Files: Makefile Log Message: Setup of module kdepim3 --- NEW FILE Makefile --- # Top level Makefile for module kdepim3 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Thu Mar 5 20:51:38 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:51:38 +0000 (UTC) Subject: rpms/kdepim3/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305205138.F291770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/kdepim3/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB17430/rpms/kdepim3/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kdepim3 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: kdepim3 # $Id: Makefile,v 1.1 2009/03/05 20:51:38 kevin Exp $ NAME := kdepim3 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Thu Mar 5 20:53:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:53:23 +0000 Subject: [pkgdb] txt2man was added for sindrepb Message-ID: <20090305205323.A074F20820B@bastion.fedora.phx.redhat.com> kevin has added Package txt2man with summary Convert flat ASCII text to man page format kevin has approved Package txt2man kevin has added a Fedora devel branch for txt2man with an owner of sindrepb kevin has approved txt2man in Fedora devel kevin has approved Package txt2man kevin has set commit to Approved for provenpackager on txt2man (Fedora devel) kevin has set build to Approved for provenpackager on txt2man (Fedora devel) kevin has set checkout to Approved for provenpackager on txt2man (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/txt2man From pkgdb at fedoraproject.org Thu Mar 5 20:53:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:53:28 +0000 Subject: [pkgdb] txt2man (Fedora, 9) updated by kevin Message-ID: <20090305205326.A8BE7208545@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for txt2man kevin has set commit to Approved for provenpackager on txt2man (Fedora 9) kevin has set build to Approved for provenpackager on txt2man (Fedora 9) kevin has set checkout to Approved for provenpackager on txt2man (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/txt2man From pkgdb at fedoraproject.org Thu Mar 5 20:53:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:53:28 +0000 Subject: [pkgdb] txt2man (Fedora EPEL, 4) updated by kevin Message-ID: <20090305205326.AE1F5208547@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for txt2man kevin has set commit to Approved for provenpackager on txt2man (Fedora EPEL 4) kevin has set build to Approved for provenpackager on txt2man (Fedora EPEL 4) kevin has set checkout to Approved for provenpackager on txt2man (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/txt2man From pkgdb at fedoraproject.org Thu Mar 5 20:53:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:53:28 +0000 Subject: [pkgdb] txt2man (Fedora, 10) updated by kevin Message-ID: <20090305205326.B4EE820854B@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for txt2man kevin has set commit to Approved for provenpackager on txt2man (Fedora 10) kevin has set build to Approved for provenpackager on txt2man (Fedora 10) kevin has set checkout to Approved for provenpackager on txt2man (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/txt2man From kevin at fedoraproject.org Thu Mar 5 20:53:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:53:00 +0000 (UTC) Subject: rpms/txt2man/devel - New directory Message-ID: <20090305205300.7171270118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/txt2man/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH17940/rpms/txt2man/devel Log Message: Directory /cvs/pkgs/rpms/txt2man/devel added to the repository From kevin at fedoraproject.org Thu Mar 5 20:53:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:53:00 +0000 (UTC) Subject: rpms/txt2man - New directory Message-ID: <20090305205300.3154370116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/txt2man In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH17940/rpms/txt2man Log Message: Directory /cvs/pkgs/rpms/txt2man added to the repository From pkgdb at fedoraproject.org Thu Mar 5 20:53:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:53:28 +0000 Subject: [pkgdb] txt2man (Fedora EPEL, 5) updated by kevin Message-ID: <20090305205326.CAE3120854E@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for txt2man kevin has set commit to Approved for provenpackager on txt2man (Fedora EPEL 5) kevin has set build to Approved for provenpackager on txt2man (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on txt2man (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/txt2man From kevin at fedoraproject.org Thu Mar 5 20:53:20 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:53:20 +0000 (UTC) Subject: rpms/txt2man Makefile,NONE,1.1 Message-ID: <20090305205320.4308870116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/txt2man In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH17940/rpms/txt2man Added Files: Makefile Log Message: Setup of module txt2man --- NEW FILE Makefile --- # Top level Makefile for module txt2man all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Thu Mar 5 20:53:20 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:53:20 +0000 (UTC) Subject: rpms/txt2man/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305205320.B1C3E70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/txt2man/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH17940/rpms/txt2man/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module txt2man --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: txt2man # $Id: Makefile,v 1.1 2009/03/05 20:53:20 kevin Exp $ NAME := txt2man SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Thu Mar 5 20:54:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:54:29 +0000 (UTC) Subject: rpms/mythes-sv - New directory Message-ID: <20090305205429.3656E70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mythes-sv In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN18451/rpms/mythes-sv Log Message: Directory /cvs/pkgs/rpms/mythes-sv added to the repository From pkgdb at fedoraproject.org Thu Mar 5 20:54:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:54:10 +0000 Subject: [pkgdb] mythes-sv was added for caolanm Message-ID: <20090305205455.7B5AE2082B2@bastion.fedora.phx.redhat.com> kevin has added Package mythes-sv with summary Swedish thesaurus kevin has approved Package mythes-sv kevin has added a Fedora devel branch for mythes-sv with an owner of caolanm kevin has approved mythes-sv in Fedora devel kevin has approved Package mythes-sv kevin has set commit to Approved for provenpackager on mythes-sv (Fedora devel) kevin has set build to Approved for provenpackager on mythes-sv (Fedora devel) kevin has set checkout to Approved for provenpackager on mythes-sv (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mythes-sv From kevin at fedoraproject.org Thu Mar 5 20:54:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:54:29 +0000 (UTC) Subject: rpms/mythes-sv/devel - New directory Message-ID: <20090305205429.7F0B570116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mythes-sv/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN18451/rpms/mythes-sv/devel Log Message: Directory /cvs/pkgs/rpms/mythes-sv/devel added to the repository From kevin at fedoraproject.org Thu Mar 5 20:54:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:54:47 +0000 (UTC) Subject: rpms/mythes-sv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305205447.CCC2470116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mythes-sv/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN18451/rpms/mythes-sv/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mythes-sv --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: mythes-sv # $Id: Makefile,v 1.1 2009/03/05 20:54:47 kevin Exp $ NAME := mythes-sv SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From s4504kr at fedoraproject.org Thu Mar 5 20:54:39 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Thu, 5 Mar 2009 20:54:39 +0000 (UTC) Subject: rpms/gnu-smalltalk/devel gnu-smalltalk.spec,1.45,1.46 Message-ID: <20090305205439.89DE870116@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gnu-smalltalk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18373 Modified Files: gnu-smalltalk.spec Log Message: Suppporting noarch subpackages Index: gnu-smalltalk.spec =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- gnu-smalltalk.spec 3 Mar 2009 18:43:12 -0000 1.45 +++ gnu-smalltalk.spec 5 Mar 2009 20:54:09 -0000 1.46 @@ -1,7 +1,7 @@ Summary: GNU Smalltalk Name: gnu-smalltalk Version: 3.1 -Release: 3%{?dist} +Release: 4%{?dist} Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz Patch1: gst-3.1-am.patch Patch2: gst-3.1-tst.patch @@ -55,6 +55,7 @@ Summary: Emacs mode for GNU Smalltalk Group: Applications/Editors Requires: %{name} = %{version}, emacs +BuildArch: noarch %description emacs This Package contains the Smalltalk mode for Emacs. @@ -180,6 +181,9 @@ %{_datadir}/emacs/site-lisp/* %changelog +* Thu Mar 5 2009 Jochen Schmitt 3.1-4 +- Supporting noarch subpackages + * Tue Mar 3 2009 Jochen Schmitt 3.1-3 - Fix retcode source issue From kevin at fedoraproject.org Thu Mar 5 20:54:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:54:47 +0000 (UTC) Subject: rpms/mythes-sv Makefile,NONE,1.1 Message-ID: <20090305205447.7392970116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mythes-sv In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN18451/rpms/mythes-sv Added Files: Makefile Log Message: Setup of module mythes-sv --- NEW FILE Makefile --- # Top level Makefile for module mythes-sv all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From pkgdb at fedoraproject.org Thu Mar 5 20:55:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:55:34 +0000 Subject: [pkgdb] perl-HTML-TagCloud was added for cweyl Message-ID: <20090305205619.105D32082B2@bastion.fedora.phx.redhat.com> kevin has added Package perl-HTML-TagCloud with summary Generate An HTML Tag Cloud kevin has approved Package perl-HTML-TagCloud kevin has added a Fedora devel branch for perl-HTML-TagCloud with an owner of cweyl kevin has approved perl-HTML-TagCloud in Fedora devel kevin has approved Package perl-HTML-TagCloud kevin has set commit to Approved for provenpackager on perl-HTML-TagCloud (Fedora devel) kevin has set build to Approved for provenpackager on perl-HTML-TagCloud (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-HTML-TagCloud (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-TagCloud From pkgdb at fedoraproject.org Thu Mar 5 20:56:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:56:20 +0000 Subject: [pkgdb] perl-HTML-TagCloud (Fedora, 9) updated by kevin Message-ID: <20090305205620.1F10420854E@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-HTML-TagCloud kevin has set commit to Approved for provenpackager on perl-HTML-TagCloud (Fedora 9) kevin has set build to Approved for provenpackager on perl-HTML-TagCloud (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-HTML-TagCloud (Fedora 9) kevin approved watchbugzilla on perl-HTML-TagCloud (Fedora 9) for perl-sig kevin approved watchcommits on perl-HTML-TagCloud (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-TagCloud From pkgdb at fedoraproject.org Thu Mar 5 20:56:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:56:20 +0000 Subject: [pkgdb] perl-HTML-TagCloud (Fedora, 10) updated by kevin Message-ID: <20090305205620.378EB208201@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-HTML-TagCloud kevin has set commit to Approved for provenpackager on perl-HTML-TagCloud (Fedora 10) kevin has set build to Approved for provenpackager on perl-HTML-TagCloud (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-HTML-TagCloud (Fedora 10) kevin approved watchbugzilla on perl-HTML-TagCloud (Fedora 10) for perl-sig kevin approved watchcommits on perl-HTML-TagCloud (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-TagCloud From kevin at fedoraproject.org Thu Mar 5 20:55:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:55:55 +0000 (UTC) Subject: rpms/perl-HTML-TagCloud - New directory Message-ID: <20090305205555.315E170116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-TagCloud In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA18763/rpms/perl-HTML-TagCloud Log Message: Directory /cvs/pkgs/rpms/perl-HTML-TagCloud added to the repository From pkgdb at fedoraproject.org Thu Mar 5 20:56:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:56:20 +0000 Subject: [pkgdb] perl-HTML-TagCloud (Fedora, devel) updated by kevin Message-ID: <20090305205620.4ED32208549@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-HTML-TagCloud (Fedora devel) for perl-sig kevin approved watchcommits on perl-HTML-TagCloud (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-TagCloud From kevin at fedoraproject.org Thu Mar 5 20:55:56 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:55:56 +0000 (UTC) Subject: rpms/perl-HTML-TagCloud/devel - New directory Message-ID: <20090305205556.6C1F170116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-TagCloud/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA18763/rpms/perl-HTML-TagCloud/devel Log Message: Directory /cvs/pkgs/rpms/perl-HTML-TagCloud/devel added to the repository From kevin at fedoraproject.org Thu Mar 5 20:56:13 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:56:13 +0000 (UTC) Subject: rpms/perl-HTML-TagCloud Makefile,NONE,1.1 Message-ID: <20090305205613.D50D170116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-TagCloud In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA18763/rpms/perl-HTML-TagCloud Added Files: Makefile Log Message: Setup of module perl-HTML-TagCloud --- NEW FILE Makefile --- # Top level Makefile for module perl-HTML-TagCloud all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Thu Mar 5 20:56:14 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:56:14 +0000 (UTC) Subject: rpms/perl-HTML-TagCloud/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305205614.377E970116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-HTML-TagCloud/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA18763/rpms/perl-HTML-TagCloud/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTML-TagCloud --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-HTML-TagCloud # $Id: Makefile,v 1.1 2009/03/05 20:56:14 kevin Exp $ NAME := perl-HTML-TagCloud SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Thu Mar 5 20:56:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:56:55 +0000 Subject: [pkgdb] perl-Text-Password-Pronounceable was added for cweyl Message-ID: <20090305205740.36B9720820B@bastion.fedora.phx.redhat.com> kevin has added Package perl-Text-Password-Pronounceable with summary Generate pronounceable passwords kevin has approved Package perl-Text-Password-Pronounceable kevin has added a Fedora devel branch for perl-Text-Password-Pronounceable with an owner of cweyl kevin has approved perl-Text-Password-Pronounceable in Fedora devel kevin has approved Package perl-Text-Password-Pronounceable kevin has set commit to Approved for provenpackager on perl-Text-Password-Pronounceable (Fedora devel) kevin has set build to Approved for provenpackager on perl-Text-Password-Pronounceable (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Text-Password-Pronounceable (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Password-Pronounceable From pkgdb at fedoraproject.org Thu Mar 5 20:57:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:57:41 +0000 Subject: [pkgdb] perl-Text-Password-Pronounceable (Fedora, 9) updated by kevin Message-ID: <20090305205741.3441E208544@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-Text-Password-Pronounceable kevin has set commit to Approved for provenpackager on perl-Text-Password-Pronounceable (Fedora 9) kevin has set build to Approved for provenpackager on perl-Text-Password-Pronounceable (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-Text-Password-Pronounceable (Fedora 9) kevin approved watchbugzilla on perl-Text-Password-Pronounceable (Fedora 9) for perl-sig kevin approved watchcommits on perl-Text-Password-Pronounceable (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Password-Pronounceable From pkgdb at fedoraproject.org Thu Mar 5 20:57:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:57:41 +0000 Subject: [pkgdb] perl-Text-Password-Pronounceable (Fedora, 10) updated by kevin Message-ID: <20090305205741.4837A208547@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Text-Password-Pronounceable kevin has set commit to Approved for provenpackager on perl-Text-Password-Pronounceable (Fedora 10) kevin has set build to Approved for provenpackager on perl-Text-Password-Pronounceable (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Text-Password-Pronounceable (Fedora 10) kevin approved watchbugzilla on perl-Text-Password-Pronounceable (Fedora 10) for perl-sig kevin approved watchcommits on perl-Text-Password-Pronounceable (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Password-Pronounceable From pkgdb at fedoraproject.org Thu Mar 5 20:57:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:57:41 +0000 Subject: [pkgdb] perl-Text-Password-Pronounceable (Fedora, devel) updated by kevin Message-ID: <20090305205741.53F1B20854B@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Text-Password-Pronounceable (Fedora devel) for perl-sig kevin approved watchcommits on perl-Text-Password-Pronounceable (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Password-Pronounceable From kevin at fedoraproject.org Thu Mar 5 20:57:18 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:57:18 +0000 (UTC) Subject: rpms/perl-Text-Password-Pronounceable - New directory Message-ID: <20090305205718.29A5570116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Password-Pronounceable In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc19284/rpms/perl-Text-Password-Pronounceable Log Message: Directory /cvs/pkgs/rpms/perl-Text-Password-Pronounceable added to the repository From kevin at fedoraproject.org Thu Mar 5 20:57:18 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:57:18 +0000 (UTC) Subject: rpms/perl-Text-Password-Pronounceable/devel - New directory Message-ID: <20090305205718.6316670118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Password-Pronounceable/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc19284/rpms/perl-Text-Password-Pronounceable/devel Log Message: Directory /cvs/pkgs/rpms/perl-Text-Password-Pronounceable/devel added to the repository From kevin at fedoraproject.org Thu Mar 5 20:57:34 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:57:34 +0000 (UTC) Subject: rpms/perl-Text-Password-Pronounceable Makefile,NONE,1.1 Message-ID: <20090305205734.F15C970116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Password-Pronounceable In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc19284/rpms/perl-Text-Password-Pronounceable Added Files: Makefile Log Message: Setup of module perl-Text-Password-Pronounceable --- NEW FILE Makefile --- # Top level Makefile for module perl-Text-Password-Pronounceable all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Thu Mar 5 20:57:35 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 20:57:35 +0000 (UTC) Subject: rpms/perl-Text-Password-Pronounceable/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090305205735.61F9370116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Text-Password-Pronounceable/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc19284/rpms/perl-Text-Password-Pronounceable/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Text-Password-Pronounceable --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Text-Password-Pronounceable # $Id: Makefile,v 1.1 2009/03/05 20:57:35 kevin Exp $ NAME := perl-Text-Password-Pronounceable SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Thu Mar 5 20:57:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:57:59 +0000 Subject: [pkgdb] grace (Fedora EPEL, 4) updated by kevin Message-ID: <20090305205843.96DA7208543@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for grace kevin has set commit to Approved for provenpackager on grace (Fedora EPEL 4) kevin has set build to Approved for provenpackager on grace (Fedora EPEL 4) kevin has set checkout to Approved for provenpackager on grace (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/grace From notting at fedoraproject.org Thu Mar 5 20:58:32 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Thu, 5 Mar 2009 20:58:32 +0000 (UTC) Subject: rpms/gwenhywfar/devel .cvsignore, 1.9, 1.10 gwenhywfar.spec, 1.31, 1.32 sources, 1.9, 1.10 Message-ID: <20090305205832.E541B70116@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/rpms/gwenhywfar/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19549 Modified Files: .cvsignore gwenhywfar.spec sources Log Message: update to 3.7.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gwenhywfar/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 9 Sep 2008 17:01:51 -0000 1.9 +++ .cvsignore 5 Mar 2009 20:58:02 -0000 1.10 @@ -1 +1 @@ -gwenhywfar-3.4.1.tar.gz +gwenhywfar-3.7.2.tar.gz Index: gwenhywfar.spec =================================================================== RCS file: /cvs/extras/rpms/gwenhywfar/devel/gwenhywfar.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gwenhywfar.spec 25 Feb 2009 03:05:30 -0000 1.31 +++ gwenhywfar.spec 5 Mar 2009 20:58:02 -0000 1.32 @@ -1,7 +1,7 @@ Summary: A multi-platform helper library for other libraries Name: gwenhywfar -Version: 3.4.1 -Release: 2%{?dist} +Version: 3.7.2 +Release: 1%{?dist} # Download is PHP form at http://www.aquamaniac.de/sites/download/packages.php Source: %{name}-%{version}.tar.gz Group: System Environment/Libraries @@ -71,6 +71,9 @@ %{_datadir}/aclocal/gwenhywfar.m4 %changelog +* Thu Mar 5 2009 Bill Nottingham - 3.7.2-1 +- update to 3.7.2 + * Tue Feb 24 2009 Fedora Release Engineering - 3.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/gwenhywfar/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 9 Sep 2008 17:01:51 -0000 1.9 +++ sources 5 Mar 2009 20:58:02 -0000 1.10 @@ -1 +1 @@ -c1bee825e06cf81e6811b3e788f67b44 gwenhywfar-3.4.1.tar.gz +5eb9f615c30fb9ec4709253b0c2ac631 gwenhywfar-3.7.2.tar.gz From pkgdb at fedoraproject.org Thu Mar 5 20:59:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:59:19 +0000 Subject: [pkgdb] html2text (Fedora EPEL, 4) updated by kevin Message-ID: <20090305205940.7F4272082B2@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for html2text kevin has set commit to Approved for provenpackager on html2text (Fedora EPEL 4) kevin has set build to Approved for provenpackager on html2text (Fedora EPEL 4) kevin has set checkout to Approved for provenpackager on html2text (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/html2text From pkgdb at fedoraproject.org Thu Mar 5 20:59:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 20:59:19 +0000 Subject: [pkgdb] html2text (Fedora EPEL, 5) updated by kevin Message-ID: <20090305205940.8A48A208545@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for html2text kevin has set commit to Approved for provenpackager on html2text (Fedora EPEL 5) kevin has set build to Approved for provenpackager on html2text (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on html2text (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/html2text From ivazquez at fedoraproject.org Thu Mar 5 20:58:56 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Thu, 5 Mar 2009 20:58:56 +0000 (UTC) Subject: rpms/django-pagination/devel django-pagination.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305205856.5F63970117@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-pagination/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19748/devel Modified Files: .cvsignore sources Added Files: django-pagination.spec import.log Log Message: Initial import --- NEW FILE django-pagination.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: django-pagination Version: 1.0.5 Release: 3%{?dist} Summary: Django pagination tools Group: Development/Languages License: BSD URL: http://code.google.com/p/django-pagination/ Source0: http://django-pagination.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel python-setuptools Requires: Django %description A set of utilities for creating robust pagination tools throughout a Django application. %prep %setup -q find -name '._*' -exec rm {} \; rm -rf pagination/locale %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CONTRIBUTORS.txt LICENSE.txt docs/* %{python_sitelib}/* %changelog * Wed Mar 04 2009 Ignacio Vazquez-Abrams 1.0.5-3 - Remove translation files for now * Mon Mar 02 2009 Ignacio Vazquez-Abrams 1.0.5-2 - Add Requires: Django * Wed Feb 18 2009 Ignacio Vazquez-Abrams 1.0.5-1 - Initial RPM release --- NEW FILE import.log --- django-pagination-1_0_5-3:HEAD:django-pagination-1.0.5-3.src.rpm:1236286672 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-pagination/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:42:23 -0000 1.1 +++ .cvsignore 5 Mar 2009 20:58:26 -0000 1.2 @@ -0,0 +1 @@ +django-pagination-1.0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-pagination/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:42:23 -0000 1.1 +++ sources 5 Mar 2009 20:58:26 -0000 1.2 @@ -0,0 +1 @@ +7c5d5d017c83685065d864565089cc35 django-pagination-1.0.5.tar.gz From ivazquez at fedoraproject.org Thu Mar 5 21:00:10 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Thu, 5 Mar 2009 21:00:10 +0000 (UTC) Subject: rpms/django-pagination/F-9 django-pagination.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305210010.34A2870116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-pagination/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20274/F-9 Modified Files: .cvsignore sources Added Files: django-pagination.spec import.log Log Message: Initial import --- NEW FILE django-pagination.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: django-pagination Version: 1.0.5 Release: 3%{?dist} Summary: Django pagination tools Group: Development/Languages License: BSD URL: http://code.google.com/p/django-pagination/ Source0: http://django-pagination.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel python-setuptools Requires: Django %description A set of utilities for creating robust pagination tools throughout a Django application. %prep %setup -q find -name '._*' -exec rm {} \; rm -rf pagination/locale %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CONTRIBUTORS.txt LICENSE.txt docs/* %{python_sitelib}/* %changelog * Wed Mar 04 2009 Ignacio Vazquez-Abrams 1.0.5-3 - Remove translation files for now * Mon Mar 02 2009 Ignacio Vazquez-Abrams 1.0.5-2 - Add Requires: Django * Wed Feb 18 2009 Ignacio Vazquez-Abrams 1.0.5-1 - Initial RPM release --- NEW FILE import.log --- django-pagination-1_0_5-3:F-9:django-pagination-1.0.5-3.src.rpm:1236286746 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-pagination/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:42:23 -0000 1.1 +++ .cvsignore 5 Mar 2009 20:59:39 -0000 1.2 @@ -0,0 +1 @@ +django-pagination-1.0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-pagination/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:42:23 -0000 1.1 +++ sources 5 Mar 2009 20:59:39 -0000 1.2 @@ -0,0 +1 @@ +7c5d5d017c83685065d864565089cc35 django-pagination-1.0.5.tar.gz From ivazquez at fedoraproject.org Thu Mar 5 21:01:22 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Thu, 5 Mar 2009 21:01:22 +0000 (UTC) Subject: rpms/django-pagination/F-10 django-pagination.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305210122.8816470116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-pagination/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20605/F-10 Modified Files: .cvsignore sources Added Files: django-pagination.spec import.log Log Message: Initial import --- NEW FILE django-pagination.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: django-pagination Version: 1.0.5 Release: 3%{?dist} Summary: Django pagination tools Group: Development/Languages License: BSD URL: http://code.google.com/p/django-pagination/ Source0: http://django-pagination.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel python-setuptools Requires: Django %description A set of utilities for creating robust pagination tools throughout a Django application. %prep %setup -q find -name '._*' -exec rm {} \; rm -rf pagination/locale %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CONTRIBUTORS.txt LICENSE.txt docs/* %{python_sitelib}/* %changelog * Wed Mar 04 2009 Ignacio Vazquez-Abrams 1.0.5-3 - Remove translation files for now * Mon Mar 02 2009 Ignacio Vazquez-Abrams 1.0.5-2 - Add Requires: Django * Wed Feb 18 2009 Ignacio Vazquez-Abrams 1.0.5-1 - Initial RPM release --- NEW FILE import.log --- django-pagination-1_0_5-3:F-10:django-pagination-1.0.5-3.src.rpm:1236286817 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-pagination/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:42:23 -0000 1.1 +++ .cvsignore 5 Mar 2009 21:00:52 -0000 1.2 @@ -0,0 +1 @@ +django-pagination-1.0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-pagination/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:42:23 -0000 1.1 +++ sources 5 Mar 2009 21:00:52 -0000 1.2 @@ -0,0 +1 @@ +7c5d5d017c83685065d864565089cc35 django-pagination-1.0.5.tar.gz From rvinyard at fedoraproject.org Thu Mar 5 21:02:24 2009 From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.) Date: Thu, 5 Mar 2009 21:02:24 +0000 (UTC) Subject: rpms/papyrus/devel .cvsignore, 1.14, 1.15 papyrus.spec, 1.21, 1.22 sources, 1.14, 1.15 Message-ID: <20090305210224.6D24470116@cvs1.fedora.phx.redhat.com> Author: rvinyard Update of /cvs/pkgs/rpms/papyrus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20923 Modified Files: .cvsignore papyrus.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/papyrus/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 25 Feb 2009 22:08:36 -0000 1.14 +++ .cvsignore 5 Mar 2009 21:01:54 -0000 1.15 @@ -1 +1 @@ -papyrus-0.10.0.tar.bz2 +papyrus-0.10.1.tar.bz2 Index: papyrus.spec =================================================================== RCS file: /cvs/pkgs/rpms/papyrus/devel/papyrus.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- papyrus.spec 2 Mar 2009 23:33:12 -0000 1.21 +++ papyrus.spec 5 Mar 2009 21:01:54 -0000 1.22 @@ -1,11 +1,11 @@ Summary: Cairo based C++ scenegraph library Name: papyrus -Version: 0.10.0 -Release: 2%{?dist} +Version: 0.10.1 +Release: 1%{?dist} License: LGPLv3 URL: http://libpapyrus.sourceforge.net/ Group: System Environment/Libraries -Source: http://downloads.sourceforge.net/libpapyrus/papyrus-0.10.0.tar.bz2 +Source: http://downloads.sourceforge.net/libpapyrus/papyrus-0.10.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.10 BuildRequires: cairomm-devel >= 1.2 @@ -117,7 +117,7 @@ %{_includedir}/papyrus-0.10/papyrus/ %dir %{_includedir}/papyrus-0.10/ %{_bindir}/papyrus-demo -%{_datadir}/papyrus-0.10.0/ +%{_datadir}/papyrus-0.10.1/ %doc ChangeLog %doc %{_datadir}/gtk-doc/html/papyrus-0.10/ @@ -147,11 +147,14 @@ %{_includedir}/papyrus-0.10/papyrus-gtkmm.h %{_includedir}/papyrus-0.10/papyrus-gtkmm/ %{_bindir}/papyrus-gtkmm-demo -%{_datadir}/papyrus-gtkmm-0.10.0/ +%{_datadir}/papyrus-gtkmm-0.10.1/ %doc AUTHORS COPYING %changelog +* Thu Mar 05 2009 Rick L Vinyard Jr - 0.10.1-1 +- New release + * Mon Mar 02 2009 Rick L Vinyard Jr - 0.10.0-2 - Changed papyrus-gtkmm dependency from papyrus to papyrus-extras - Changed Sourceforge url to downloads.sf.net from download.sf.net Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/papyrus/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 25 Feb 2009 22:08:36 -0000 1.14 +++ sources 5 Mar 2009 21:01:54 -0000 1.15 @@ -1 +1 @@ -2a1ace8023496560aebdc82d32ab89a7 papyrus-0.10.0.tar.bz2 +ed440115cf33551c533ad075058e58b2 papyrus-0.10.1.tar.bz2 From s4504kr at fedoraproject.org Thu Mar 5 21:02:23 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Thu, 5 Mar 2009 21:02:23 +0000 (UTC) Subject: rpms/stellarium/devel stellarium.desktop, 1.4, 1.5 stellarium.spec, 1.54, 1.55 Message-ID: <20090305210223.9DFA870116@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20969 Modified Files: stellarium.desktop stellarium.spec Log Message: Support noarch subpackages Index: stellarium.desktop =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.desktop,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- stellarium.desktop 24 Sep 2008 19:57:45 -0000 1.4 +++ stellarium.desktop 5 Mar 2009 21:01:53 -0000 1.5 @@ -7,4 +7,4 @@ Exec=stellarium-wrapper Terminal=false Type=Application -Encoding=UTF-8 + Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- stellarium.spec 26 Feb 2009 03:11:32 -0000 1.54 +++ stellarium.spec 5 Mar 2009 21:01:53 -0000 1.55 @@ -2,7 +2,7 @@ Name: stellarium Version: 0.10.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -41,6 +41,7 @@ Summary: The user guide about Stellarium Group: Documentation License: GFDL +Buildarch: noarch %description doc The user guide for stellarium writeen by Matthew Gates. It shouuld contains everythings you want to know about Stellarium. @@ -100,6 +101,9 @@ %doc COPYING stellarium_user_guide-%{guidever}.pdf %changelog +* Thu Mar 5 2009 Jochen Schmitt 0.10.1-4 +- Support noarch subpackates + * Wed Feb 25 2009 Fedora Release Engineering - 0.10.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ivazquez at fedoraproject.org Thu Mar 5 21:02:34 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Thu, 5 Mar 2009 21:02:34 +0000 (UTC) Subject: rpms/django-pagination/EL-5 django-pagination.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305210234.091E970116@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-pagination/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21095/EL-5 Modified Files: .cvsignore sources Added Files: django-pagination.spec import.log Log Message: Initial import --- NEW FILE django-pagination.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: django-pagination Version: 1.0.5 Release: 3%{?dist} Summary: Django pagination tools Group: Development/Languages License: BSD URL: http://code.google.com/p/django-pagination/ Source0: http://django-pagination.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel python-setuptools Requires: Django %description A set of utilities for creating robust pagination tools throughout a Django application. %prep %setup -q find -name '._*' -exec rm {} \; rm -rf pagination/locale %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CONTRIBUTORS.txt LICENSE.txt docs/* %{python_sitelib}/* %changelog * Wed Mar 04 2009 Ignacio Vazquez-Abrams 1.0.5-3 - Remove translation files for now * Mon Mar 02 2009 Ignacio Vazquez-Abrams 1.0.5-2 - Add Requires: Django * Wed Feb 18 2009 Ignacio Vazquez-Abrams 1.0.5-1 - Initial RPM release --- NEW FILE import.log --- django-pagination-1_0_5-3:EL-5:django-pagination-1.0.5-3.src.rpm:1236286889 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-pagination/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:42:23 -0000 1.1 +++ .cvsignore 5 Mar 2009 21:02:03 -0000 1.2 @@ -0,0 +1 @@ +django-pagination-1.0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-pagination/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:42:23 -0000 1.1 +++ sources 5 Mar 2009 21:02:03 -0000 1.2 @@ -0,0 +1 @@ +7c5d5d017c83685065d864565089cc35 django-pagination-1.0.5.tar.gz From rvinyard at fedoraproject.org Thu Mar 5 21:02:53 2009 From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.) Date: Thu, 5 Mar 2009 21:02:53 +0000 (UTC) Subject: rpms/papyrus/F-10 .cvsignore, 1.14, 1.15 papyrus.spec, 1.24, 1.25 sources, 1.14, 1.15 Message-ID: <20090305210253.5E70D70116@cvs1.fedora.phx.redhat.com> Author: rvinyard Update of /cvs/pkgs/rpms/papyrus/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21183 Modified Files: .cvsignore papyrus.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/papyrus/F-10/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 25 Feb 2009 22:54:49 -0000 1.14 +++ .cvsignore 5 Mar 2009 21:02:23 -0000 1.15 @@ -1 +1 @@ -papyrus-0.10.0.tar.bz2 +papyrus-0.10.1.tar.bz2 Index: papyrus.spec =================================================================== RCS file: /cvs/pkgs/rpms/papyrus/F-10/papyrus.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- papyrus.spec 2 Mar 2009 23:34:30 -0000 1.24 +++ papyrus.spec 5 Mar 2009 21:02:23 -0000 1.25 @@ -1,11 +1,11 @@ Summary: Cairo based C++ scenegraph library Name: papyrus -Version: 0.10.0 -Release: 2%{?dist} +Version: 0.10.1 +Release: 1%{?dist} License: LGPLv3 URL: http://libpapyrus.sourceforge.net/ Group: System Environment/Libraries -Source: http://downloads.sourceforge.net/libpapyrus/papyrus-0.10.0.tar.bz2 +Source: http://downloads.sourceforge.net/libpapyrus/papyrus-0.10.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.10 BuildRequires: cairomm-devel >= 1.2 @@ -117,7 +117,7 @@ %{_includedir}/papyrus-0.10/papyrus/ %dir %{_includedir}/papyrus-0.10/ %{_bindir}/papyrus-demo -%{_datadir}/papyrus-0.10.0/ +%{_datadir}/papyrus-0.10.1/ %doc ChangeLog %doc %{_datadir}/gtk-doc/html/papyrus-0.10/ @@ -147,11 +147,14 @@ %{_includedir}/papyrus-0.10/papyrus-gtkmm.h %{_includedir}/papyrus-0.10/papyrus-gtkmm/ %{_bindir}/papyrus-gtkmm-demo -%{_datadir}/papyrus-gtkmm-0.10.0/ +%{_datadir}/papyrus-gtkmm-0.10.1/ %doc AUTHORS COPYING %changelog +* Thu Mar 05 2009 Rick L Vinyard Jr - 0.10.1-1 +- New release + * Mon Mar 02 2009 Rick L Vinyard Jr - 0.10.0-2 - Changed papyrus-gtkmm dependency from papyrus to papyrus-extras - Changed Sourceforge url to downloads.sf.net from download.sf.net Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/papyrus/F-10/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 25 Feb 2009 22:54:49 -0000 1.14 +++ sources 5 Mar 2009 21:02:23 -0000 1.15 @@ -1 +1 @@ -2a1ace8023496560aebdc82d32ab89a7 papyrus-0.10.0.tar.bz2 +ed440115cf33551c533ad075058e58b2 papyrus-0.10.1.tar.bz2 From s4504kr at fedoraproject.org Thu Mar 5 21:06:17 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Thu, 5 Mar 2009 21:06:17 +0000 (UTC) Subject: rpms/kaya/devel kaya.spec,1.5,1.6 Message-ID: <20090305210617.0F99170116@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/kaya/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22128 Modified Files: kaya.spec Log Message: Supporting noarch subpackages Index: kaya.spec =================================================================== RCS file: /cvs/extras/rpms/kaya/devel/kaya.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kaya.spec 3 Mar 2009 18:15:25 -0000 1.5 +++ kaya.spec 5 Mar 2009 21:05:46 -0000 1.6 @@ -4,7 +4,7 @@ Name: kaya Version: 0.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Statically typed, imperative programming-language Group: Development/Languages @@ -44,6 +44,7 @@ %package doc Summary: Documentation and Samples for the Kaya Language Group: Documentation +BuildArch: noarch %description doc This package contains the documentation for the kaya language. @@ -98,6 +99,9 @@ %doc examples/ docs/ %changelog +* Thu Mar 5 2009 Jochen Schmitt 0.5.1-4 +- Supporting noarch subpackages + * Tue Mar 3 2009 Jochen Schmitt 0.5.1-3 - Fix ghc-6.10 releated issues From dwalsh at fedoraproject.org Thu Mar 5 21:06:17 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Thu, 5 Mar 2009 21:06:17 +0000 (UTC) Subject: rpms/selinux-policy/devel .cvsignore, 1.160, 1.161 modules-minimum.conf, 1.14, 1.15 modules-mls.conf, 1.48, 1.49 modules-targeted.conf, 1.116, 1.117 policy-20090105.patch, 1.53, 1.54 selinux-policy.spec, 1.800, 1.801 sources, 1.179, 1.180 Message-ID: <20090305210617.BB92A70116@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22108 Modified Files: .cvsignore modules-minimum.conf modules-mls.conf modules-targeted.conf policy-20090105.patch selinux-policy.spec sources Log Message: * Thu Mar 4 2009 Dan Walsh 3.6.8-1 - Upgrade to latest patches Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- .cvsignore 3 Mar 2009 20:10:30 -0000 1.160 +++ .cvsignore 5 Mar 2009 21:05:46 -0000 1.161 @@ -162,3 +162,4 @@ serefpolicy-3.6.5.tgz serefpolicy-3.6.6.tgz serefpolicy-3.6.7.tgz +serefpolicy-3.6.8.tgz Index: modules-minimum.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- modules-minimum.conf 27 Feb 2009 21:22:47 -0000 1.14 +++ modules-minimum.conf 5 Mar 2009 21:05:46 -0000 1.15 @@ -749,13 +749,6 @@ # mailman = module -# Layer: services -# Module: mailscanner -# -# Anti-Virus and Anti-Spam Filter -# -mailscanner = module - # Layer: kernel # Module: mcs # Required in base Index: modules-mls.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- modules-mls.conf 27 Feb 2009 21:22:47 -0000 1.48 +++ modules-mls.conf 5 Mar 2009 21:05:46 -0000 1.49 @@ -742,13 +742,6 @@ # mailman = module -# Layer: services -# Module: mailscanner -# -# Anti-Virus and Anti-Spam Filter -# -mailscanner = module - # Layer: kernel # Module: mcs # Required in base Index: modules-targeted.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- modules-targeted.conf 27 Feb 2009 21:22:47 -0000 1.116 +++ modules-targeted.conf 5 Mar 2009 21:05:46 -0000 1.117 @@ -749,13 +749,6 @@ # mailman = module -# Layer: services -# Module: mailscanner -# -# Anti-Virus and Anti-Spam Filter -# -mailscanner = module - # Layer: kernel # Module: mcs # Required in base policy-20090105.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.53 -r 1.54 policy-20090105.patch Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- policy-20090105.patch 4 Mar 2009 19:41:16 -0000 1.53 +++ policy-20090105.patch 5 Mar 2009 21:05:46 -0000 1.54 @@ -1,6 +1,6 @@ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.7/config/appconfig-mcs/default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.8/config/appconfig-mcs/default_contexts --- nsaserefpolicy/config/appconfig-mcs/default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/default_contexts 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/default_contexts 2009-03-05 15:25:24.000000000 -0500 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -22,15 +22,15 @@ -user_r:user_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 -user_r:user_sudo_t:s0 sysadm_r:sysadm_t:s0 user_r:user_t:s0 +system_r:xdm_t:s0 user_r:user_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.7/config/appconfig-mcs/failsafe_context +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.8/config/appconfig-mcs/failsafe_context --- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.7/config/appconfig-mcs/failsafe_context 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/failsafe_context 2009-03-05 15:25:24.000000000 -0500 @@ -1 +1 @@ -sysadm_r:sysadm_t:s0 +system_r:unconfined_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/guest_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/guest_u_default_contexts 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/guest_u_default_contexts 2009-03-05 15:25:24.000000000 -0500 @@ -0,0 +1,6 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -38,9 +38,9 @@ +system_r:crond_t:s0 guest_r:guest_t:s0 +system_r:initrc_su_t:s0 guest_r:guest_t:s0 +guest_r:guest_t:s0 guest_r:guest_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/root_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/root_default_contexts --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/root_default_contexts 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/root_default_contexts 2009-03-05 15:25:24.000000000 -0500 @@ -1,11 +1,7 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0 +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -55,18 +55,18 @@ # -#system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.7/config/appconfig-mcs/seusers +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.8/config/appconfig-mcs/seusers --- nsaserefpolicy/config/appconfig-mcs/seusers 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.7/config/appconfig-mcs/seusers 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/seusers 2009-03-05 15:25:24.000000000 -0500 @@ -1,3 +1,3 @@ system_u:system_u:s0-mcs_systemhigh -root:root:s0-mcs_systemhigh -__default__:user_u:s0 +root:unconfined_u:s0-mcs_systemhigh +__default__:unconfined_u:s0-mcs_systemhigh -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/staff_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/staff_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/staff_u_default_contexts 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/staff_u_default_contexts 2009-03-05 15:25:24.000000000 -0500 @@ -1,10 +1,12 @@ system_r:local_login_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 system_r:remote_login_t:s0 staff_r:staff_t:s0 @@ -81,9 +81,9 @@ sysadm_r:sysadm_su_t:s0 sysadm_r:sysadm_t:s0 sysadm_r:sysadm_sudo_t:s0 sysadm_r:sysadm_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/unconfined_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/unconfined_u_default_contexts 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/unconfined_u_default_contexts 2009-03-05 15:25:24.000000000 -0500 @@ -1,4 +1,4 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0 +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 @@ -97,15 +97,15 @@ +system_r:initrc_su_t:s0 unconfined_r:unconfined_t:s0 +unconfined_r:unconfined_t:s0 unconfined_r:unconfined_t:s0 system_r:xdm_t:s0 unconfined_r:unconfined_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.7/config/appconfig-mcs/userhelper_context +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.8/config/appconfig-mcs/userhelper_context --- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.7/config/appconfig-mcs/userhelper_context 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/userhelper_context 2009-03-05 15:25:24.000000000 -0500 @@ -1 +1 @@ -system_u:sysadm_r:sysadm_t:s0 +system_u:system_r:unconfined_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/user_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/user_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/user_u_default_contexts 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/user_u_default_contexts 2009-03-05 15:25:24.000000000 -0500 @@ -1,8 +1,9 @@ system_r:local_login_t:s0 user_r:user_t:s0 system_r:remote_login_t:s0 user_r:user_t:s0 @@ -118,19 +118,19 @@ - +system_r:initrc_su_t:s0 user_r:user_t:s0 +user_r:user_t:s0 user_r:user_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.7/config/appconfig-mcs/virtual_domain_context +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.8/config/appconfig-mcs/virtual_domain_context --- nsaserefpolicy/config/appconfig-mcs/virtual_domain_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/virtual_domain_context 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/virtual_domain_context 2009-03-05 15:25:24.000000000 -0500 @@ -0,0 +1 @@ +system_u:system_r:svirt_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.7/config/appconfig-mcs/virtual_image_context +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.8/config/appconfig-mcs/virtual_image_context --- nsaserefpolicy/config/appconfig-mcs/virtual_image_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/virtual_image_context 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/virtual_image_context 2009-03-05 15:25:24.000000000 -0500 @@ -0,0 +1 @@ +system_u:object_r:virt_image_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mcs/xguest_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mcs/xguest_u_default_contexts 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/xguest_u_default_contexts 2009-03-05 15:25:24.000000000 -0500 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -139,9 +139,9 @@ +system_r:xdm_t xguest_r:xguest_t:s0 +system_r:initrc_su_t:s0 xguest_r:xguest_t:s0 +xguest_r:xguest_t:s0 xguest_r:xguest_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.7/config/appconfig-mls/default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.8/config/appconfig-mls/default_contexts --- nsaserefpolicy/config/appconfig-mls/default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/default_contexts 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/default_contexts 2009-03-05 15:25:24.000000000 -0500 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -163,17 +163,17 @@ -user_r:user_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 -user_r:user_sudo_t:s0 sysadm_r:sysadm_t:s0 user_r:user_t:s0 +system_r:xdm_t:s0 user_r:user_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mls/guest_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/guest_u_default_contexts 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/guest_u_default_contexts 2009-03-05 15:25:24.000000000 -0500 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 +system_r:sshd_t:s0 guest_r:guest_t:s0 +system_r:crond_t:s0 guest_r:guest_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.7/config/appconfig-mls/root_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.8/config/appconfig-mls/root_default_contexts --- nsaserefpolicy/config/appconfig-mls/root_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/root_default_contexts 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/root_default_contexts 2009-03-05 15:25:24.000000000 -0500 @@ -1,11 +1,11 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0 -system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -192,19 +192,19 @@ # -#system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 +#system_r:sshd_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.7/config/appconfig-mls/virtual_domain_context +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.8/config/appconfig-mls/virtual_domain_context --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/virtual_domain_context 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/virtual_domain_context 2009-03-05 15:25:24.000000000 -0500 @@ -0,0 +1 @@ +system_u:system_r:qemu_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.7/config/appconfig-mls/virtual_image_context +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.8/config/appconfig-mls/virtual_image_context --- nsaserefpolicy/config/appconfig-mls/virtual_image_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/virtual_image_context 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/virtual_image_context 2009-03-05 15:25:24.000000000 -0500 @@ -0,0 +1 @@ +system_u:object_r:virt_image_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.6.7/config/appconfig-mls/xguest_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mls/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/config/appconfig-mls/xguest_u_default_contexts 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/xguest_u_default_contexts 2009-03-05 15:25:24.000000000 -0500 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -213,9 +213,9 @@ +system_r:xdm_t xguest_r:xguest_t:s0 +system_r:initrc_su_t:s0 xguest_r:xguest_t:s0 +xguest_r:xguest_t:s0 xguest_r:xguest_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.7/Makefile +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.8/Makefile --- nsaserefpolicy/Makefile 2009-01-19 11:07:35.000000000 -0500 -+++ serefpolicy-3.6.7/Makefile 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/Makefile 2009-03-05 15:25:24.000000000 -0500 @@ -241,7 +241,7 @@ [...9203 lines suppressed...] +/usr/lib(64)?/ghc-[^/]+/ghc-.* -- gen_context(system_u:object_r:execmem_exec_t,s0) + +/opt/real/(.*/)?realplay\.bin -- gen_context(system_u:object_r:execmem_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.7/policy/modules/system/unconfined.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.8/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/unconfined.if 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/unconfined.if 2009-03-05 15:25:24.000000000 -0500 @@ -12,14 +12,13 @@ # interface(`unconfined_domain_noaudit',` @@ -29424,9 +27152,9 @@ + + allow $1 unconfined_r; +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.7/policy/modules/system/unconfined.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.8/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/unconfined.te 2009-03-04 13:46:08.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/unconfined.te 2009-03-05 15:25:24.000000000 -0500 @@ -5,6 +5,35 @@ # # Declarations @@ -29771,9 +27499,9 @@ + +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats) + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.7/policy/modules/system/userdomain.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.8/policy/modules/system/userdomain.fc --- nsaserefpolicy/policy/modules/system/userdomain.fc 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/userdomain.fc 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/userdomain.fc 2009-03-05 15:25:24.000000000 -0500 @@ -1,4 +1,7 @@ HOME_DIR -d gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh) +HOME_DIR -l gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh) @@ -29783,9 +27511,9 @@ +/root(/.*)? gen_context(system_u:object_r:admin_home_t,s0) +/dev/shm/pulse-shm.* gen_context(system_u:object_r:user_tmpfs_t,s0) +/dev/shm/mono.* gen_context(system_u:object_r:user_tmpfs_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.7/policy/modules/system/userdomain.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.8/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/userdomain.if 2009-03-04 13:47:45.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/userdomain.if 2009-03-05 15:25:24.000000000 -0500 @@ -30,8 +30,9 @@ ') @@ -31629,9 +29357,9 @@ + allow $1 userdomain:key manage_key_perms; +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.7/policy/modules/system/userdomain.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.8/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/userdomain.te 2009-03-04 13:46:42.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/userdomain.te 2009-03-05 15:25:24.000000000 -0500 @@ -8,13 +8,6 @@ ## @@ -31715,14 +29443,14 @@ + fs_read_cifs_named_sockets(userhomereader) + fs_read_cifs_named_pipes(userhomereader) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.7/policy/modules/system/virtual.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.8/policy/modules/system/virtual.fc --- nsaserefpolicy/policy/modules/system/virtual.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/virtual.fc 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/virtual.fc 2009-03-05 15:25:24.000000000 -0500 @@ -0,0 +1 @@ +# No application file contexts. -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.7/policy/modules/system/virtual.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.8/policy/modules/system/virtual.if --- nsaserefpolicy/policy/modules/system/virtual.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/virtual.if 2009-03-03 17:46:59.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/virtual.if 2009-03-05 15:25:24.000000000 -0500 @@ -0,0 +1,99 @@ +## Virtual machine emulator and virtualizer + @@ -31823,9 +29551,9 @@ + manage_lnk_files_pattern($1, virtual_image_type, virtual_image_type) + rw_blk_files_pattern($1, virtual_image_type, virtual_image_type) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.7/policy/modules/system/virtual.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.8/policy/modules/system/virtual.te --- nsaserefpolicy/policy/modules/system/virtual.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/virtual.te 2009-03-03 17:13:55.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/virtual.te 2009-03-05 15:25:24.000000000 -0500 @@ -0,0 +1,78 @@ + +policy_module(virtualization, 1.1.2) @@ -31905,9 +29633,9 @@ + xserver_read_xdm_pid(virtualdomain) + xserver_rw_shm(virtualdomain) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.7/policy/modules/system/xen.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.8/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/xen.fc 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/xen.fc 2009-03-05 15:25:24.000000000 -0500 @@ -2,17 +2,10 @@ /usr/bin/virsh -- gen_context(system_u:object_r:xm_exec_t,s0) @@ -31934,9 +29662,9 @@ /var/run/xenstore\.pid -- gen_context(system_u:object_r:xenstored_var_run_t,s0) /var/run/xenstored(/.*)? gen_context(system_u:object_r:xenstored_var_run_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.7/policy/modules/system/xen.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.8/policy/modules/system/xen.if --- nsaserefpolicy/policy/modules/system/xen.if 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/xen.if 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/xen.if 2009-03-05 15:25:24.000000000 -0500 @@ -167,11 +167,14 @@ # interface(`xen_stream_connect',` @@ -31978,9 +29706,9 @@ + allow $1 xend_var_lib_t:dir search_dir_perms; + rw_files_pattern($1, xen_image_t, xen_image_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.7/policy/modules/system/xen.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.8/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.7/policy/modules/system/xen.te 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/xen.te 2009-03-05 15:25:24.000000000 -0500 @@ -6,6 +6,13 @@ # Declarations # @@ -32202,9 +29930,9 @@ +optional_policy(` + unconfined_domain(xend_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.7/policy/support/obj_perm_sets.spt +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.8/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-10-16 17:21:16.000000000 -0400 -+++ serefpolicy-3.6.7/policy/support/obj_perm_sets.spt 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/policy/support/obj_perm_sets.spt 2009-03-05 15:27:08.000000000 -0500 @@ -179,20 +179,20 @@ # # Directory (dir) @@ -32244,6 +29972,25 @@ define(`relabelfrom_lnk_file_perms',`{ getattr relabelfrom }') define(`relabelto_lnk_file_perms',`{ getattr relabelto }') define(`relabel_lnk_file_perms',`{ getattr relabelfrom relabelto }') +@@ -252,13 +252,13 @@ + # + define(`getattr_sock_file_perms',`{ getattr }') + define(`setattr_sock_file_perms',`{ setattr }') +-define(`read_sock_file_perms',`{ getattr read }') +-define(`write_sock_file_perms',`{ getattr write append }') +-define(`rw_sock_file_perms',`{ getattr read write append }') +-define(`create_sock_file_perms',`{ getattr create }') ++define(`read_sock_file_perms',`{ getattr open read }') ++define(`write_sock_file_perms',`{ getattr write open append }') ++define(`rw_sock_file_perms',`{ getattr open read write append }') ++define(`create_sock_file_perms',`{ getattr create open }') + define(`rename_sock_file_perms',`{ getattr rename }') + define(`delete_sock_file_perms',`{ getattr unlink }') +-define(`manage_sock_file_perms',`{ create getattr setattr read write rename link unlink ioctl lock append }') ++define(`manage_sock_file_perms',`{ create open getattr setattr read write rename link unlink ioctl lock append }') + define(`relabelfrom_sock_file_perms',`{ getattr relabelfrom }') + define(`relabelto_sock_file_perms',`{ getattr relabelto }') + define(`relabel_sock_file_perms',`{ getattr relabelfrom relabelto }') @@ -312,3 +312,13 @@ # define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') @@ -32258,9 +30005,9 @@ +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ') + +define(`manage_key_perms', `{ create link read search setattr view write } ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.7/policy/users +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.8/policy/users --- nsaserefpolicy/policy/users 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.6.7/policy/users 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/policy/users 2009-03-05 15:25:24.000000000 -0500 @@ -25,11 +25,8 @@ # permit any access to such users, then remove this entry. # @@ -32285,9 +30032,9 @@ - gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats) -') +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.7/Rules.modular +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.8/Rules.modular --- nsaserefpolicy/Rules.modular 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/Rules.modular 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/Rules.modular 2009-03-05 15:25:24.000000000 -0500 @@ -73,8 +73,8 @@ $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te @echo "Compliling $(NAME) $(@F) module" @@ -32317,9 +30064,9 @@ $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.7/support/Makefile.devel +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.8/support/Makefile.devel --- nsaserefpolicy/support/Makefile.devel 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.7/support/Makefile.devel 2009-03-03 17:11:59.000000000 -0500 ++++ serefpolicy-3.6.8/support/Makefile.devel 2009-03-05 15:25:24.000000000 -0500 @@ -185,8 +185,7 @@ tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te @$(EINFO) "Compiling $(NAME) $(basename $(@F)) module" Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.800 retrieving revision 1.801 diff -u -r1.800 -r1.801 --- selinux-policy.spec 4 Mar 2009 19:41:16 -0000 1.800 +++ selinux-policy.spec 5 Mar 2009 21:05:47 -0000 1.801 @@ -19,8 +19,8 @@ %define CHECKPOLICYVER 2.0.16-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 3.6.7 -Release: 2%{?dist} +Version: 3.6.8 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -186,7 +186,7 @@ %description SELinux Reference Policy - modular. -Based off of reference policy: Checked out revision 2913. +Based off of reference policy: Checked out revision 2920. %build @@ -319,7 +319,7 @@ #__eof restorecon -R /root /var/log /var/run 2> /dev/null else -semodule -n -s targeted -r moilscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null +semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null %loadpolicy targeted %relabel targeted fi @@ -432,6 +432,7 @@ %saveFileContext mls %post mls +semodule -n -s mls -r mailscanner 2>/dev/null %loadpolicy mls if [ $1 != 1 ]; then @@ -446,6 +447,9 @@ %endif %changelog +* Thu Mar 4 2009 Dan Walsh 3.6.8-1 +- Upgrade to latest patches + * Wed Mar 4 2009 Dan Walsh 3.6.7-2 - Fixes for libvirt Index: sources =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- sources 3 Mar 2009 20:10:30 -0000 1.179 +++ sources 5 Mar 2009 21:05:47 -0000 1.180 @@ -1 +1 @@ -1ba196a49315403311352d577c40fced serefpolicy-3.6.7.tgz +d68d01d807cbfcdf83ace30919af3172 serefpolicy-3.6.8.tgz From sindrepb at fedoraproject.org Thu Mar 5 21:09:52 2009 From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=) Date: Thu, 5 Mar 2009 21:09:52 +0000 (UTC) Subject: rpms/txt2man/devel import.log, NONE, 1.1 txt2man-1.5.5-fixbashisms.patch, NONE, 1.1 txt2man.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305210952.11B8370116@cvs1.fedora.phx.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/txt2man/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21815/devel Modified Files: .cvsignore sources Added Files: import.log txt2man-1.5.5-fixbashisms.patch txt2man.spec Log Message: adding txt2man, maintained by me --- NEW FILE import.log --- txt2man-1_5_5-1_fc10:HEAD:txt2man-1.5.5-1.fc10.src.rpm:1236287080 txt2man-1.5.5-fixbashisms.patch: --- NEW FILE txt2man-1.5.5-fixbashisms.patch --- diff -Nru txt2man-1.5.5/bookman txt2man-1.5.5/bookman --- txt2man-1.5.5/bookman 2007-03-21 11:07:24.000000000 +0000 +++ txt2man-1.5.5/bookman 2008-04-12 03:29:07.000000000 +0100 @@ -83,16 +83,16 @@ shift $(($OPTIND - 1)) date=${date:-$(date +'%d %B %Y')} -[[ $1 ]] || set -- $(while read; do echo $REPLY; done) +[ $1 ] || set -- $(while read REPLY; do echo $REPLY; done) -[[ $outfile ]] && post="$post >$outfile" +[ $outfile ] && post="$post >$outfile" { # Compute table of content from postscript output. # Generate output in gtroff intermediate format, so # it can be merged with content. { - [[ -f $cover ]] && cat $cover || { + [ -f $cover ] && cat $cover || { printf ".af %% i\n.P1\n" printf ".OH ||%s||\n" "$volume" printf ".EH ||%s||\n" "$volume" --- NEW FILE txt2man.spec --- Name: txt2man Version: 1.5.5 Release: 1%{?dist} Summary: Convert flat ASCII text to man page format Group: Applications/Text License: GPLv2+ URL: http://mvertes.free.fr/txt2man/ Source0: http://mvertes.free.fr/download/%{name}-%{version}.tar.gz #Fixes bug with bashisms in /bin/sh script, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473696 Patch0: txt2man-1.5.5-fixbashisms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: gawk %description tx2man is a shell script using gnu awk, that should run on any Unix-like system. The syntax of the ASCII text is very straightforward and looks very much like the output of the man(1) program. %prep %setup -q %patch0 -p1 %build #no build needed %install rm -rf $RPM_BUILD_ROOT #manual install install -p -m 0755 -D bookman $RPM_BUILD_ROOT%{_bindir}/bookman install -p -m 0755 -D src2man $RPM_BUILD_ROOT%{_bindir}/src2man install -p -m 0755 -D txt2man $RPM_BUILD_ROOT%{_bindir}/txt2man install -p -m 0644 -D bookman.1 $RPM_BUILD_ROOT%{_mandir}/man1/bookman.1 install -p -m 0644 -D src2man.1 $RPM_BUILD_ROOT%{_mandir}/man1/src2man.1 install -p -m 0644 -D txt2man.1 $RPM_BUILD_ROOT%{_mandir}/man1/txt2man.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING Changelog README %{_bindir}/* %{_mandir}/man?/* %changelog * Tue Mar 04 2009 Sindre Pedersen Bjordal - 1.5.5-1 - Initial build - Include debian patch to fix bashisms Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/txt2man/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:53:20 -0000 1.1 +++ .cvsignore 5 Mar 2009 21:09:21 -0000 1.2 @@ -0,0 +1 @@ +txt2man-1.5.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/txt2man/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:53:20 -0000 1.1 +++ sources 5 Mar 2009 21:09:21 -0000 1.2 @@ -0,0 +1 @@ +d10fe6e9876a2969201ea4d75ac9ea48 txt2man-1.5.5.tar.gz From notting at fedoraproject.org Thu Mar 5 21:18:48 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Thu, 5 Mar 2009 21:18:48 +0000 (UTC) Subject: rpms/aqbanking/devel aqbanking-3.8.2-c++.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 aqbanking.spec, 1.58, 1.59 sources, 1.8, 1.9 Message-ID: <20090305211848.7A57F70116@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/rpms/aqbanking/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24614 Modified Files: .cvsignore aqbanking.spec sources Added Files: aqbanking-3.8.2-c++.patch Log Message: update to 3.8.2 aqbanking-3.8.2-c++.patch: --- NEW FILE aqbanking-3.8.2-c++.patch --- diff -up aqbanking-3.8.2/src/plugins/backends/aqhbci/ui/qt3/libs/logmanager/error.cpp.foo aqbanking-3.8.2/src/plugins/backends/aqhbci/ui/qt3/libs/logmanager/error.cpp --- aqbanking-3.8.2/src/plugins/backends/aqhbci/ui/qt3/libs/logmanager/error.cpp.foo 2009-03-05 15:45:22.000000000 -0500 +++ aqbanking-3.8.2/src/plugins/backends/aqhbci/ui/qt3/libs/logmanager/error.cpp 2009-03-05 15:46:09.000000000 -0500 @@ -32,6 +32,7 @@ #include "assert.h" #include "error.h" +#include namespace HBCI { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/aqbanking/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 9 Sep 2008 19:53:31 -0000 1.8 +++ .cvsignore 5 Mar 2009 21:18:17 -0000 1.9 @@ -1 +1 @@ -aqbanking-3.7.2.tar.gz +aqbanking-3.8.2.tar.gz Index: aqbanking.spec =================================================================== RCS file: /cvs/extras/rpms/aqbanking/devel/aqbanking.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- aqbanking.spec 24 Feb 2009 01:35:28 -0000 1.58 +++ aqbanking.spec 5 Mar 2009 21:18:18 -0000 1.59 @@ -7,13 +7,14 @@ Name: aqbanking Summary: A library for online banking functions and financial data import/export -Version: 3.7.2 -Release: 3%{?dist} +Version: 3.8.2 +Release: 1%{?dist} # Download is PHP form at http://www.aquamaniac.de/sites/download/packages.php Source: %{name}-%{version}.tar.gz Group: System Environment/Libraries License: GPLv2+ URL: http://www.aquamaniac.de/aqbanking/ +Patch1: aqbanking-3.8.2-c++.patch Patch2: aqbanking-3.7.2-pkgconfig.patch Patch3: aqbanking-2.1.0-conflict.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -87,6 +88,7 @@ %prep %setup -q +%patch1 -p1 -b .c++ %patch2 -p1 -b .pkgconfig %patch3 -p1 -b .conflict @@ -155,7 +157,7 @@ %files -n qbanking %defattr(-,root,root) -%{_bindir}/qb-help5 +%{_bindir}/qb-help6 %{_libdir}/libqbanking.so.* %{_libdir}/aqbanking/plugins/*/debugger %{_libdir}/aqbanking/plugins/*/frontends/qbanking @@ -173,6 +175,9 @@ %{python_sitelib}/%{name} %changelog +* Thu Mar 5 2009 Bill Nottingham - 3.8.2-1 +- update to 3.8.2-1 + * Mon Feb 23 2009 Fedora Release Engineering - 3.7.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/aqbanking/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 9 Sep 2008 19:53:31 -0000 1.8 +++ sources 5 Mar 2009 21:18:18 -0000 1.9 @@ -1 +1 @@ -5b0aef92808dcb48c375b8958e1c4808 aqbanking-3.7.2.tar.gz +195d3835f48cc54d59091e5c14a0eb86 aqbanking-3.8.2.tar.gz From allisson at fedoraproject.org Thu Mar 5 21:21:26 2009 From: allisson at fedoraproject.org (Allisson Azevedo) Date: Thu, 5 Mar 2009 21:21:26 +0000 (UTC) Subject: rpms/perl-MooseX-Singleton/devel import.log, NONE, 1.1 perl-MooseX-Singleton.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305212126.5D37F70116@cvs1.fedora.phx.redhat.com> Author: allisson Update of /cvs/pkgs/rpms/perl-MooseX-Singleton/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24485/devel Modified Files: .cvsignore sources Added Files: import.log perl-MooseX-Singleton.spec Log Message: First import --- NEW FILE import.log --- perl-MooseX-Singleton-0_14-1_fc10:HEAD:perl-MooseX-Singleton-0.14-1.fc10.src.rpm:1236287799 --- NEW FILE perl-MooseX-Singleton.spec --- Name: perl-MooseX-Singleton Version: 0.14 Release: 1%{?dist} Summary: Turn your Moose class into a singleton License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MooseX-Singleton/ Source0: http://www.cpan.org/authors/id/D/DR/DROLSKY/MooseX-Singleton-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Moose) >= 0.65 BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Warn) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description A singleton is a class that has only one instance in an application. MooseX::Singleton lets you easily upgrade (or downgrade, as it were) your Moose class to a singleton. %prep %setup -q -n MooseX-Singleton-%{version} # Filter requires cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ sed -e '/perl(MooseX::Singleton::Meta::Class)/d' |\ sed -e '/perl(MooseX::Singleton::Meta::Instance)/d' |\ sed -e '/perl(MooseX::Singleton::Meta::Method::Constructor)/d' |\ sed -e '/perl(MooseX::Singleton::Object)/d' EOF %define __perl_requires %{_builddir}/MooseX-Singleton-%{version}/%{name}-req chmod +x %{__perl_requires} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Wed Mar 04 2009 Allisson Azevedo 0.14-1 - Initial rpm release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-MooseX-Singleton/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:44:13 -0000 1.1 +++ .cvsignore 5 Mar 2009 21:20:55 -0000 1.2 @@ -0,0 +1 @@ +MooseX-Singleton-0.14.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-MooseX-Singleton/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:44:13 -0000 1.1 +++ sources 5 Mar 2009 21:20:55 -0000 1.2 @@ -0,0 +1 @@ +2e1aefa342d4d73bd8ff6fe2ab0ab34e MooseX-Singleton-0.14.tar.gz From pkgdb at fedoraproject.org Thu Mar 5 21:28:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 21:28:30 +0000 Subject: [pkgdb] libzzub ownership updated Message-ID: <20090305212830.AD006208543@bastion.fedora.phx.redhat.com> Package libzzub in Fedora 9 is now owned by oget To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libzzub From notting at fedoraproject.org Thu Mar 5 21:29:24 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Thu, 5 Mar 2009 21:29:24 +0000 (UTC) Subject: rpms/gnucash/devel .cvsignore, 1.36, 1.37 gnucash.spec, 1.98, 1.99 sources, 1.38, 1.39 Message-ID: <20090305212924.5257F70116@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/rpms/gnucash/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26584 Modified Files: .cvsignore gnucash.spec sources Log Message: 2.2.9-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnucash/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 16 Dec 2008 15:37:34 -0000 1.36 +++ .cvsignore 5 Mar 2009 21:28:53 -0000 1.37 @@ -1 +1 @@ -gnucash-2.2.8.tar.bz2 +gnucash-2.2.9.tar.bz2 Index: gnucash.spec =================================================================== RCS file: /cvs/extras/rpms/gnucash/devel/gnucash.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- gnucash.spec 25 Feb 2009 00:00:04 -0000 1.98 +++ gnucash.spec 5 Mar 2009 21:28:53 -0000 1.99 @@ -2,9 +2,9 @@ Name: gnucash Summary: Finance management application -Version: 2.2.8 +Version: 2.2.9 URL: http://gnucash.org/ -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.bz2 @@ -130,6 +130,9 @@ %doc doc/README.german doc/README.francais doc/guile-hackers.txt %changelog +* Thu Mar 5 2009 Bill Nottingham - 2.2.9-1 +- update to 2.2.9 + * Tue Feb 24 2009 Fedora Release Engineering - 2.2.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnucash/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 16 Dec 2008 15:37:34 -0000 1.38 +++ sources 5 Mar 2009 21:28:53 -0000 1.39 @@ -1 +1 @@ -79d37e4fa0c71722e093136655698924 gnucash-2.2.8.tar.bz2 +1d814de8673b4760045bf51b72924d04 gnucash-2.2.9.tar.bz2 From chitlesh at fedoraproject.org Thu Mar 5 21:30:12 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Thu, 5 Mar 2009 21:30:12 +0000 (UTC) Subject: rpms/ktechlab/F-10 ktechlab-detect_gpsim.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 import.log, 1.2, 1.3 ktechlab.spec, 1.23, 1.24 sources, 1.6, 1.7 Message-ID: <20090305213012.8631B70116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/ktechlab/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26750/F-10 Modified Files: .cvsignore import.log ktechlab.spec sources Added Files: ktechlab-detect_gpsim.patch Log Message: 0.3.7 entry fixing bugs on 0.3.6 ktechlab-detect_gpsim.patch: --- NEW FILE ktechlab-detect_gpsim.patch --- Index: configure.in.in =================================================================== --- configure.in.in (revision 239) +++ configure.in.in (working copy) @@ -30,7 +30,7 @@ #include #include #include -void func() { (void)cycles; (void)initialize_gpsim_core(); (void)load_symbol_file(0,0); } +void func() { (void)cycles; (void)initialize_gpsim_core(); (void)load_symbol_file(0,0); exit_gpsim(0); } ], [], AC_MSG_RESULT( yes ) @@ -47,7 +47,7 @@ #include #include #include -void func() { (void)cycles; (void)initialize_gpsim_core(); } +void func() { (void)cycles; (void)initialize_gpsim_core(); exit_gpsim(0); } ], [], AC_MSG_RESULT( yes ) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ktechlab/F-10/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Nov 2008 07:58:15 -0000 1.5 +++ .cvsignore 5 Mar 2009 21:29:42 -0000 1.6 @@ -1 +1 @@ -ktechlab-svn20081031.tar.bz2 +ktechlab-0.3.7.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ktechlab/F-10/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 3 Nov 2008 19:18:14 -0000 1.2 +++ import.log 5 Mar 2009 21:29:42 -0000 1.3 @@ -1,2 +1,3 @@ ktechlab-0_3_69-9_20081031svn_fc9:HEAD:ktechlab-0.3.69-9.20081031svn.fc9.src.rpm:1225612333 ktechlab-0_3_69-10_20081031svn_fc9:HEAD:ktechlab-0.3.69-10.20081031svn.fc9.src.rpm:1225739868 +ktechlab-0_3_70-1_20090304svn_fc10:F-10:ktechlab-0.3.70-1.20090304svn.fc10.src.rpm:1236288430 Index: ktechlab.spec =================================================================== RCS file: /cvs/pkgs/rpms/ktechlab/F-10/ktechlab.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ktechlab.spec 3 Nov 2008 19:18:14 -0000 1.23 +++ ktechlab.spec 5 Mar 2009 21:29:42 -0000 1.24 @@ -1,7 +1,7 @@ Name: ktechlab -Version: 0.3.69 -Release: 10.20081031svn%{?dist} -# revision checkout 150 +Version: 0.3.70 +Release: 1.20090304svn%{?dist} +# revision checkout 238 Summary: Development and simulation of microcontrollers and electronic circuits @@ -9,9 +9,10 @@ Group: Applications/Engineering URL: http://sourceforge.net/projects/ktechlab/ -Source: %{name}-svn20081031.tar.bz2 +Source: %{name}-0.3.7.tar.gz Patch0: ktechlab-0.3.6-multilib.patch +Patch1: ktechlab-detect_gpsim.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -38,12 +39,14 @@ * Integrated assembler and disassembler via gpasm and gpdasm. %prep -%setup -q -n %{name}-svn20081031 +%setup -q -n %{name}-0.3.7 + chmod +x ./admin/detect-autoconf.pl %{__rm} -rf autom4te.cache %patch0 -p0 -b .multilib +%patch1 -p0 -b .gpsim %build @@ -75,10 +78,6 @@ # Fix absolute symlink %{__rm} -f %{buildroot}%{_docdir}/HTML/en/%{name}/common -#fixing missing icon -%{__cp} -p icons/pics/bar_graph_display.png %{buildroot}%{_datadir}/apps/%{name}/icons/ - - %find_lang %{name} %clean @@ -111,6 +110,13 @@ %Changelog +* Wed Mar 04 2009 Chitlesh Goorah - 0.3.70-1.200900403svn +- new svn checkout 238 +- included patch from upstream, Julian B??ume, to build on gpsim 0.23 + +* Sat Jan 31 2009 Chitlesh Goorah - 0.3.69-11.20090131svn +- new svn checkout 175 + * Mon Nov 03 2008 Chitlesh Goorah - 0.3.69-10.20081031svn - added sdcc as Requires Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ktechlab/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Nov 2008 07:58:16 -0000 1.6 +++ sources 5 Mar 2009 21:29:42 -0000 1.7 @@ -1 +1 @@ -79f08b90fc086520094f9086ae3aed1f ktechlab-svn20081031.tar.bz2 +328bb07a777241a1ccb54162eea5de6f ktechlab-0.3.7.tar.gz From allisson at fedoraproject.org Thu Mar 5 21:30:22 2009 From: allisson at fedoraproject.org (Allisson Azevedo) Date: Thu, 5 Mar 2009 21:30:22 +0000 (UTC) Subject: rpms/perl-MooseX-Singleton/F-10 import.log, NONE, 1.1 perl-MooseX-Singleton.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305213022.9913670116@cvs1.fedora.phx.redhat.com> Author: allisson Update of /cvs/pkgs/rpms/perl-MooseX-Singleton/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26340/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-MooseX-Singleton.spec Log Message: First import --- NEW FILE import.log --- perl-MooseX-Singleton-0_14-1_fc10:F-10:perl-MooseX-Singleton-0.14-1.fc10.src.rpm:1236288213 --- NEW FILE perl-MooseX-Singleton.spec --- Name: perl-MooseX-Singleton Version: 0.14 Release: 1%{?dist} Summary: Turn your Moose class into a singleton License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MooseX-Singleton/ Source0: http://www.cpan.org/authors/id/D/DR/DROLSKY/MooseX-Singleton-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Moose) >= 0.65 BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Warn) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description A singleton is a class that has only one instance in an application. MooseX::Singleton lets you easily upgrade (or downgrade, as it were) your Moose class to a singleton. %prep %setup -q -n MooseX-Singleton-%{version} # Filter requires cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ sed -e '/perl(MooseX::Singleton::Meta::Class)/d' |\ sed -e '/perl(MooseX::Singleton::Meta::Instance)/d' |\ sed -e '/perl(MooseX::Singleton::Meta::Method::Constructor)/d' |\ sed -e '/perl(MooseX::Singleton::Object)/d' EOF %define __perl_requires %{_builddir}/MooseX-Singleton-%{version}/%{name}-req chmod +x %{__perl_requires} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Wed Mar 04 2009 Allisson Azevedo 0.14-1 - Initial rpm release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-MooseX-Singleton/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:44:13 -0000 1.1 +++ .cvsignore 5 Mar 2009 21:29:52 -0000 1.2 @@ -0,0 +1 @@ +MooseX-Singleton-0.14.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-MooseX-Singleton/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:44:13 -0000 1.1 +++ sources 5 Mar 2009 21:29:52 -0000 1.2 @@ -0,0 +1 @@ +2e1aefa342d4d73bd8ff6fe2ab0ab34e MooseX-Singleton-0.14.tar.gz From allisson at fedoraproject.org Thu Mar 5 21:34:08 2009 From: allisson at fedoraproject.org (Allisson Azevedo) Date: Thu, 5 Mar 2009 21:34:08 +0000 (UTC) Subject: rpms/perl-MooseX-Singleton/F-9 import.log, NONE, 1.1 perl-MooseX-Singleton.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305213408.5781B70116@cvs1.fedora.phx.redhat.com> Author: allisson Update of /cvs/pkgs/rpms/perl-MooseX-Singleton/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27588/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-MooseX-Singleton.spec Log Message: First import --- NEW FILE import.log --- perl-MooseX-Singleton-0_14-1_fc10:F-9:perl-MooseX-Singleton-0.14-1.fc10.src.rpm:1236288672 --- NEW FILE perl-MooseX-Singleton.spec --- Name: perl-MooseX-Singleton Version: 0.14 Release: 1%{?dist} Summary: Turn your Moose class into a singleton License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MooseX-Singleton/ Source0: http://www.cpan.org/authors/id/D/DR/DROLSKY/MooseX-Singleton-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Moose) >= 0.65 BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Warn) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description A singleton is a class that has only one instance in an application. MooseX::Singleton lets you easily upgrade (or downgrade, as it were) your Moose class to a singleton. %prep %setup -q -n MooseX-Singleton-%{version} # Filter requires cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ sed -e '/perl(MooseX::Singleton::Meta::Class)/d' |\ sed -e '/perl(MooseX::Singleton::Meta::Instance)/d' |\ sed -e '/perl(MooseX::Singleton::Meta::Method::Constructor)/d' |\ sed -e '/perl(MooseX::Singleton::Object)/d' EOF %define __perl_requires %{_builddir}/MooseX-Singleton-%{version}/%{name}-req chmod +x %{__perl_requires} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Wed Mar 04 2009 Allisson Azevedo 0.14-1 - Initial rpm release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-MooseX-Singleton/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:44:13 -0000 1.1 +++ .cvsignore 5 Mar 2009 21:33:37 -0000 1.2 @@ -0,0 +1 @@ +MooseX-Singleton-0.14.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-MooseX-Singleton/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:44:13 -0000 1.1 +++ sources 5 Mar 2009 21:33:37 -0000 1.2 @@ -0,0 +1 @@ +2e1aefa342d4d73bd8ff6fe2ab0ab34e MooseX-Singleton-0.14.tar.gz From chitlesh at fedoraproject.org Thu Mar 5 21:34:24 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Thu, 5 Mar 2009 21:34:24 +0000 (UTC) Subject: rpms/ktechlab/devel ktechlab-detect_gpsim.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 import.log, 1.2, 1.3 ktechlab.spec, 1.24, 1.25 sources, 1.6, 1.7 Message-ID: <20090305213424.4560970116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/ktechlab/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27683/devel Modified Files: .cvsignore import.log ktechlab.spec sources Added Files: ktechlab-detect_gpsim.patch Log Message: 0.3.7 entry fixing bugs on 0.3.6 ktechlab-detect_gpsim.patch: --- NEW FILE ktechlab-detect_gpsim.patch --- Index: configure.in.in =================================================================== --- configure.in.in (revision 239) +++ configure.in.in (working copy) @@ -30,7 +30,7 @@ #include #include #include -void func() { (void)cycles; (void)initialize_gpsim_core(); (void)load_symbol_file(0,0); } +void func() { (void)cycles; (void)initialize_gpsim_core(); (void)load_symbol_file(0,0); exit_gpsim(0); } ], [], AC_MSG_RESULT( yes ) @@ -47,7 +47,7 @@ #include #include #include -void func() { (void)cycles; (void)initialize_gpsim_core(); } +void func() { (void)cycles; (void)initialize_gpsim_core(); exit_gpsim(0); } ], [], AC_MSG_RESULT( yes ) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ktechlab/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Nov 2008 07:58:15 -0000 1.5 +++ .cvsignore 5 Mar 2009 21:33:53 -0000 1.6 @@ -1 +1 @@ -ktechlab-svn20081031.tar.bz2 +ktechlab-0.3.7.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ktechlab/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 3 Nov 2008 19:18:14 -0000 1.2 +++ import.log 5 Mar 2009 21:33:53 -0000 1.3 @@ -1,2 +1,3 @@ ktechlab-0_3_69-9_20081031svn_fc9:HEAD:ktechlab-0.3.69-9.20081031svn.fc9.src.rpm:1225612333 ktechlab-0_3_69-10_20081031svn_fc9:HEAD:ktechlab-0.3.69-10.20081031svn.fc9.src.rpm:1225739868 +ktechlab-0_3_70-1_20090304svn_fc10:HEAD:ktechlab-0.3.70-1.20090304svn.fc10.src.rpm:1236288682 Index: ktechlab.spec =================================================================== RCS file: /cvs/pkgs/rpms/ktechlab/devel/ktechlab.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ktechlab.spec 25 Feb 2009 12:12:00 -0000 1.24 +++ ktechlab.spec 5 Mar 2009 21:33:53 -0000 1.25 @@ -1,7 +1,7 @@ Name: ktechlab -Version: 0.3.69 -Release: 11.20081031svn%{?dist} -# revision checkout 150 +Version: 0.3.70 +Release: 1.20090304svn%{?dist} +# revision checkout 238 Summary: Development and simulation of microcontrollers and electronic circuits @@ -9,9 +9,10 @@ Group: Applications/Engineering URL: http://sourceforge.net/projects/ktechlab/ -Source: %{name}-svn20081031.tar.bz2 +Source: %{name}-0.3.7.tar.gz Patch0: ktechlab-0.3.6-multilib.patch +Patch1: ktechlab-detect_gpsim.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -38,12 +39,14 @@ * Integrated assembler and disassembler via gpasm and gpdasm. %prep -%setup -q -n %{name}-svn20081031 +%setup -q -n %{name}-0.3.7 + chmod +x ./admin/detect-autoconf.pl %{__rm} -rf autom4te.cache %patch0 -p0 -b .multilib +%patch1 -p0 -b .gpsim %build @@ -75,10 +78,6 @@ # Fix absolute symlink %{__rm} -f %{buildroot}%{_docdir}/HTML/en/%{name}/common -#fixing missing icon -%{__cp} -p icons/pics/bar_graph_display.png %{buildroot}%{_datadir}/apps/%{name}/icons/ - - %find_lang %{name} %clean @@ -111,6 +110,13 @@ %Changelog +* Wed Mar 04 2009 Chitlesh Goorah - 0.3.70-1.200900403svn +- new svn checkout 238 +- included patch from upstream, Julian B??ume, to build on gpsim 0.23 + +* Sat Jan 31 2009 Chitlesh Goorah - 0.3.69-11.20090131svn +- new svn checkout 175 + * Mon Nov 03 2008 Chitlesh Goorah - 0.3.69-10.20081031svn - added sdcc as Requires Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ktechlab/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Nov 2008 07:58:16 -0000 1.6 +++ sources 5 Mar 2009 21:33:53 -0000 1.7 @@ -1 +1 @@ -79f08b90fc086520094f9086ae3aed1f ktechlab-svn20081031.tar.bz2 +328bb07a777241a1ccb54162eea5de6f ktechlab-0.3.7.tar.gz From notting at fedoraproject.org Thu Mar 5 21:40:50 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Thu, 5 Mar 2009 21:40:50 +0000 (UTC) Subject: rpms/gnucash/devel gnucash.spec, 1.99, 1.100 changeset_r17783.diff, 1.1, NONE Message-ID: <20090305214050.7BB3270116@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/rpms/gnucash/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28701 Modified Files: gnucash.spec Removed Files: changeset_r17783.diff Log Message: Remove dead patch Index: gnucash.spec =================================================================== RCS file: /cvs/extras/rpms/gnucash/devel/gnucash.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- gnucash.spec 5 Mar 2009 21:28:53 -0000 1.99 +++ gnucash.spec 5 Mar 2009 21:40:20 -0000 1.100 @@ -16,7 +16,6 @@ BuildRequires: desktop-file-utils, texinfo BuildRequires: gettext, slib >= 3a1-5, libtool, intltool Patch0: gnucash-quiet.patch -Patch1: changeset_r17783.diff Requires: gnucash-docs >= 2.2.0 Requires: slib >= 3a1-5 Requires: perl(Finance::Quote) @@ -38,7 +37,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p4 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \; %build --- changeset_r17783.diff DELETED --- From snirkel at fedoraproject.org Thu Mar 5 21:47:04 2009 From: snirkel at fedoraproject.org (Linus Walleij) Date: Thu, 5 Mar 2009 21:47:04 +0000 (UTC) Subject: rpms/gnome-phone-manager/devel gnome-phone-manager.spec,1.29,1.30 Message-ID: <20090305214704.BA8C670116@cvs1.fedora.phx.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnome-phone-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29501 Modified Files: gnome-phone-manager.spec Log Message: Rebuild to pick up libgnomebt bump. Index: gnome-phone-manager.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gnome-phone-manager.spec 24 Feb 2009 23:13:23 -0000 1.29 +++ gnome-phone-manager.spec 5 Mar 2009 21:46:34 -0000 1.30 @@ -1,7 +1,7 @@ Name: gnome-phone-manager Summary: Gnome Phone Manager Version: 0.60 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Applications/System Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2 @@ -109,6 +109,9 @@ %{_datadir}/mission-control/profiles/* %changelog +* Thu Mar 5 2009 Linus Walleij 0.60-6 +- Rebuild hoping to pick up libgnomebt i/f bump. + * Tue Feb 24 2009 Fedora Release Engineering - 0.60-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rstrode at fedoraproject.org Thu Mar 5 21:54:47 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Thu, 5 Mar 2009 21:54:47 +0000 (UTC) Subject: rpms/gdm/devel gdm-2.25.2-multistack-but-boring.patch, 1.4, 1.5 gdm.spec, 1.445, 1.446 Message-ID: <20090305215447.6A0B170116@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gdm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30853 Modified Files: gdm-2.25.2-multistack-but-boring.patch gdm.spec Log Message: - Create settings object early to prevent assertion failures when one pam conversation completes before another starts. gdm-2.25.2-multistack-but-boring.patch: Index: gdm-2.25.2-multistack-but-boring.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.25.2-multistack-but-boring.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gdm-2.25.2-multistack-but-boring.patch 5 Mar 2009 14:40:08 -0000 1.4 +++ gdm-2.25.2-multistack-but-boring.patch 5 Mar 2009 21:54:46 -0000 1.5 @@ -4151,8 +4151,17 @@ iface->authenticate = gdm_session_relay_authenticate; diff -up gdm-2.25.2/daemon/gdm-session-worker.c.multistack-but-boring gdm-2.25.2/daemon/gdm-session-worker.c --- gdm-2.25.2/daemon/gdm-session-worker.c.multistack-but-boring 2008-11-18 17:19:05.000000000 -0500 -+++ gdm-2.25.2/daemon/gdm-session-worker.c 2009-03-04 21:03:53.123432737 -0500 -@@ -2568,6 +2568,28 @@ worker_dbus_filter_function (DBusConnect ++++ gdm-2.25.2/daemon/gdm-session-worker.c 2009-03-05 16:51:38.010621245 -0500 +@@ -2054,8 +2054,6 @@ do_setup (GdmSessionWorker *worker) + GError *error; + gboolean res; + +- worker->priv->user_settings = gdm_session_settings_new (); +- + g_signal_connect_swapped (worker->priv->user_settings, + "notify::language-name", + G_CALLBACK (on_saved_language_name_read), +@@ -2568,6 +2566,28 @@ worker_dbus_filter_function (DBusConnect return DBUS_HANDLER_RESULT_HANDLED; } @@ -4181,7 +4190,7 @@ static GObject * gdm_session_worker_constructor (GType type, guint n_construct_properties, -@@ -2594,6 +2616,11 @@ gdm_session_worker_constructor (GType +@@ -2594,6 +2614,11 @@ gdm_session_worker_constructor (GType exit (1); } @@ -4193,6 +4202,14 @@ dbus_connection_setup_with_g_main (worker->priv->connection, NULL); dbus_connection_set_exit_on_disconnect (worker->priv->connection, TRUE); +@@ -2635,6 +2660,7 @@ gdm_session_worker_init (GdmSessionWorke + g_str_equal, + (GDestroyNotify) g_free, + (GDestroyNotify) g_free); ++ worker->priv->user_settings = gdm_session_settings_new (); + } + + static void diff -up gdm-2.25.2/daemon/gdm-session-worker-job.c.multistack-but-boring gdm-2.25.2/daemon/gdm-session-worker-job.c --- gdm-2.25.2/daemon/gdm-session-worker-job.c.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 +++ gdm-2.25.2/daemon/gdm-session-worker-job.c 2009-03-04 21:03:53.125433055 -0500 @@ -7183,7 +7200,7 @@ G_END_DECLS diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c 2009-03-04 21:03:53.146447953 -0500 @@ -0,0 +1,255 @@ +/* @@ -7442,7 +7459,7 @@ +} + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h 2009-03-04 21:03:53.147432504 -0500 @@ -0,0 +1,61 @@ +/* @@ -7772,7 +7789,7 @@ } diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c 2009-03-04 21:03:53.151447317 -0500 @@ -0,0 +1,478 @@ +/* @@ -8254,7 +8271,7 @@ + return g_hash_table_lookup (manager->priv->plugins, name); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h 2009-03-04 21:03:53.152449048 -0500 @@ -0,0 +1,66 @@ +/* @@ -8324,7 +8341,7 @@ + +#endif /* __GDM_PLUGIN_MANAGER_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.c ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.c 2009-03-04 21:03:53.153442188 -0500 @@ -0,0 +1,329 @@ +/* @@ -8657,7 +8674,7 @@ + return g_list_length (widget->priv->tasks); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.h ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.h 2009-03-04 21:03:53.154446921 -0500 @@ -0,0 +1,80 @@ +/* @@ -8803,7 +8820,7 @@ pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme, "emblem-default", diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c 2009-03-04 21:03:53.157442475 -0500 @@ -0,0 +1,186 @@ +/* @@ -8993,7 +9010,7 @@ + return was_chosen; +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h 2009-03-04 21:03:53.158446161 -0500 @@ -0,0 +1,93 @@ +/* @@ -9090,7 +9107,7 @@ + +#endif /* __GDM_CONVERSATION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c 2009-03-04 21:03:53.159446844 -0500 @@ -0,0 +1,93 @@ +/* @@ -9187,7 +9204,7 @@ + g_signal_emit (extension, signals [LOAD_FAILED], 0, error); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h 2009-03-04 21:03:53.160442079 -0500 @@ -0,0 +1,55 @@ +/* @@ -9246,7 +9263,7 @@ +G_END_DECLS +#endif /* __GDM_GREETER_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in 2009-03-04 21:03:53.161442133 -0500 @@ -0,0 +1,11 @@ +prefix=@prefix@ @@ -9261,7 +9278,7 @@ +Libs: -L${libdir} -lgdmsimplegreeter +Cflags: -I${includedir}/gdm/simple-greeter diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c 2009-03-04 21:03:53.162442257 -0500 @@ -0,0 +1,123 @@ +/* @@ -9388,7 +9405,7 @@ + 0); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h 2009-03-04 21:03:53.163442172 -0500 @@ -0,0 +1,64 @@ +/* @@ -9456,7 +9473,7 @@ + +#endif /* __GDM_TASK_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am 2009-03-04 21:03:53.164444252 -0500 @@ -0,0 +1,48 @@ +NULL = @@ -9586,7 +9603,7 @@ $(EXTRA_GREETER_LIBS) \ $(SIMPLE_GREETER_LIBS) \ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c 2009-03-04 21:03:53.167443367 -0500 @@ -0,0 +1,304 @@ +/* @@ -9894,7 +9911,7 @@ + gdm_fingerprint_extension_reset (GDM_CONVERSATION (extension)); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h 2009-03-04 21:03:53.168442094 -0500 @@ -0,0 +1,56 @@ +/* @@ -9954,7 +9971,7 @@ + +#endif /* GDM_FINGERPRINT_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint 2009-03-04 21:03:53.169450949 -0500 @@ -0,0 +1,10 @@ +#%PAM-1.0 @@ -9968,7 +9985,7 @@ +session required pam_namespace.so +session include system-auth diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am 2009-03-04 21:03:53.170444507 -0500 @@ -0,0 +1,50 @@ +NULL = @@ -10022,7 +10039,7 @@ + *~ \ + Makefile.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui 2009-03-04 21:03:53.171445819 -0500 @@ -0,0 +1,56 @@ + @@ -10082,7 +10099,7 @@ + + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c 2009-03-04 21:03:53.172450483 -0500 @@ -0,0 +1,40 @@ +/* @@ -10126,12 +10143,12 @@ + return GDM_GREETER_EXTENSION (extension); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am 2009-03-04 21:03:53.173442226 -0500 @@ -0,0 +1 @@ +SUBDIRS = password diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c 2009-03-04 21:03:53.174446121 -0500 @@ -0,0 +1,323 @@ +/* @@ -10458,7 +10475,7 @@ + gdm_password_extension_reset (GDM_CONVERSATION (extension)); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h 2009-03-04 21:03:53.175446036 -0500 @@ -0,0 +1,56 @@ +/* @@ -10518,7 +10535,7 @@ + +#endif /* GDM_PASSWORD_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password 2009-03-04 21:03:53.176442109 -0500 @@ -0,0 +1,13 @@ +#%PAM-1.0 @@ -10535,7 +10552,7 @@ +session optional pam_gnome_keyring.so auto_start +session include system-auth diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am 2009-03-04 21:03:53.177442234 -0500 @@ -0,0 +1,44 @@ +NULL = @@ -10583,7 +10600,7 @@ + *~ \ + Makefile.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui 2009-03-04 21:03:53.178442358 -0500 @@ -0,0 +1,56 @@ + @@ -10643,7 +10660,7 @@ + + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c 2009-03-04 21:03:53.179446254 -0500 @@ -0,0 +1,40 @@ +/* @@ -10687,7 +10704,7 @@ + return GDM_GREETER_EXTENSION (extension); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c 2009-03-04 21:03:53.181445175 -0500 @@ -0,0 +1,558 @@ +/* gdm-smartcard.c - smartcard object @@ -11249,7 +11266,7 @@ + return NULL; +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c 2009-03-04 21:03:53.182438804 -0500 @@ -0,0 +1,440 @@ +/* @@ -11693,7 +11710,7 @@ + gdm_smartcard_extension_reset (GDM_CONVERSATION (extension)); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h 2009-03-04 21:03:53.184436468 -0500 @@ -0,0 +1,56 @@ +/* @@ -11753,7 +11770,7 @@ + +#endif /* GDM_SMARTCARD_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h 2009-03-04 21:03:53.185432192 -0500 @@ -0,0 +1,94 @@ +/* securitycard.h - api for reading and writing data to a security card @@ -11851,7 +11868,7 @@ +G_END_DECLS +#endif /* GDM_SMARTCARD_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c 2009-03-04 21:03:53.188432285 -0500 @@ -0,0 +1,1394 @@ +/* gdm-smartcard-manager.c - object for monitoring smartcard insertion and @@ -13249,7 +13266,7 @@ +} +#endif diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h 2009-03-04 21:03:53.189434924 -0500 @@ -0,0 +1,86 @@ +/* gdm-smartcard-manager.h - object for monitoring smartcard insertion and @@ -13339,7 +13356,7 @@ +G_END_DECLS +#endif /* GDM_SMARTCARD_MANAGER_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard 2009-03-04 21:03:53.190448876 -0500 @@ -0,0 +1,11 @@ +#%PAM-1.0 @@ -13354,7 +13371,7 @@ +session required pam_namespace.so +session include system-auth diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c 2009-03-04 21:03:53.191446556 -0500 @@ -0,0 +1,167 @@ +#include "config.h" @@ -13525,7 +13542,7 @@ + return 0; +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am 2009-03-04 21:03:53.192442070 -0500 @@ -0,0 +1,71 @@ +NULL = @@ -13600,7 +13617,7 @@ + *~ \ + Makefile.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui 2009-03-04 21:03:53.193451204 -0500 @@ -0,0 +1,56 @@ + @@ -13660,7 +13677,7 @@ + + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c ---- /dev/null 2009-03-05 04:25:32.556261885 -0500 +--- /dev/null 2009-03-05 05:52:53.556012017 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c 2009-03-04 21:03:53.194449722 -0500 @@ -0,0 +1,40 @@ +/* Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.445 retrieving revision 1.446 diff -u -r1.445 -r1.446 --- gdm.spec 5 Mar 2009 14:40:08 -0000 1.445 +++ gdm.spec 5 Mar 2009 21:54:46 -0000 1.446 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.25.2 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -341,6 +341,10 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Thu Mar 5 2009 Ray Strode - 1:2.25.2-12 +- Create settings object early to prevent assertion failures + when one pam conversation completes before another starts. + * Wed Mar 4 2009 Ray Strode - 1:2.25.2-11 - Bring back language/session/layout selector for autologin From oget at fedoraproject.org Thu Mar 5 22:01:00 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Thu, 5 Mar 2009 22:01:00 +0000 (UTC) Subject: rpms/armstrong/devel armstrong-buildfix.patch, NONE, 1.1 armstrong-gcc44.patch, NONE, 1.1 armstrong-size_t.patch, NONE, 1.1 armstrong-sonamefix.patch, NONE, 1.1 armstrong-use-system-libs.patch, NONE, 1.1 armstrong.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305220100.7BDED70116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/armstrong/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31934/devel Modified Files: .cvsignore sources Added Files: armstrong-buildfix.patch armstrong-gcc44.patch armstrong-size_t.patch armstrong-sonamefix.patch armstrong-use-system-libs.patch armstrong.spec import.log Log Message: * Thu Mar 05 2009 Orcan Ogetbil 0.2.6-4 - Update the size_t patch to fix compilation on ppc64 - Remove some proprietary code from the tarball (src/rtaudio/include) * Sat Feb 28 2009 Orcan Ogetbil 0.2.6-3 - License for -devel and pyzzub packages is GPLv2+ - Clarify system-wide library usage - Fix sonames - Don't package the empty directory %%_defaultdocdir/zzub * Fri Feb 27 2009 Orcan Ogetbil 0.2.6-2 - BR: rtaudio-static instead of rtaudio-devel * Fri Feb 27 2009 Orcan Ogetbil 0.2.6-1 - name changed from libzzub to armstrong - update to 0.2.6 * Wed Jan 7 2009 Caol??n McNamara - 0.2.3-14 - defuzz patches and extend buildfix to get building again * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.2.3-13 - Rebuild for Python 2.6 * Sun Mar 2 2008 Alexander Kahl - 0.2.3-12 - patch for missing explicit gcc 4.3 includes - pyzzub %%files also seizes the python egg now * Mon Feb 18 2008 Fedora Release Engineering - 0.2.3-11 - Autorebuild for GCC 4.3 * Tue Nov 20 2007 Alexander Kahl - 0.2.3-10 - updated buildfix patch to drop explicit sse optimizations - removed JOBS option again since scons supports -j build option * Thu Oct 25 2007 Alexander Kahl - 0.2.3-9 - fixed multiarch conflict * Thu Sep 20 2007 Alexander Kahl - 0.2.3-8 - included patch to install missing documentation to the right place - removed move macro instead - moved all plugin files *.{cpp,h,xml} back to get the lunar plugin loading right * Mon Sep 17 2007 Alexander Kahl - 0.2.3-7 - re-added pyzzub python-devel build requirement - explicitly nailed the name of pyzzub * Mon Sep 17 2007 Alexander Kahl - 0.2.3-6 - added pyzzub as an internal extra package * Thu Sep 13 2007 Alexander Kahl - 0.2.3-5 - removed redundant explicit flac requirement * Mon Sep 10 2007 Alexander Kahl - 0.2.3-4 - fixed double source definition - adapted modified source tarball w/ mp3 support removed - added patch to use internal flac support - removed INSTALL from %%doc - removed explicit python requirement - replaced static rm commands with macros * Mon Sep 10 2007 Alexander Kahl - 0.2.3-3 - fixed redundant dependencies - replaced occurence of /usr with prefix macro - removed manual stripping of binaries - fixed directory ownership issue - fixed encoding of CREDITS file - excluded arch ppc64 due to build failure - replaced all space occurences with tabs * Mon Sep 3 2007 Alexander Kahl - 0.2.3-2 - added flag to remove mp3 support * Sun Sep 2 2007 Alexander Kahl - 0.2.3-1 - initial release armstrong-buildfix.patch: --- NEW FILE armstrong-buildfix.patch --- --- armstrong.old/SConstruct 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/SConstruct 2009-02-26 19:54:31.000000000 -0500 @@ -89,6 +89,7 @@ opts.Add("JOBS", "Number of threads to c opts.Add("PYZZUB", "Support pyzzub",True,None,bool_converter) opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0'))) +opts.Add("optflags",'Default: none',"") env = Environment(ENV = os.environ, options = opts) @@ -130,9 +131,7 @@ SetOption('num_jobs', env['JOBS'].replac if posix: env.Append(CCFLAGS=[ '-DPOSIX', - ]) - env.Append(LINKFLAGS=[ - '--rpath%s' % str(env.Dir('${PREFIX}${LIBDIR}')), + '-fPIC', ]) if os.uname()[0] == 'FreeBSD': env.Append(CCFLAGS=[ '-I/usr/local/include' ]) @@ -173,38 +172,15 @@ cl = env['CC'] == 'cl' if gcc: #env['CXXFLAGS'] += ['--no-rtti'] if env['DEBUG'] == False: - env.Append(CCFLAGS=[ - '-O1', # O2 O3 break infector and a few others - '-fomit-frame-pointer', - '-funroll-loops', - '-DNDEBUG', - ]) env.Append(CCFLAGS=ARGUMENTS.get('CCFLAGS')) + env.Append(CCFLAGS=['-DNDEBUG']) else: env.Append(CCFLAGS=[ '-g', '-DDEBUG', '-D_DEBUG', ]) - if env['SSE2'] == True: - if not x86_64: - env.Append(CCFLAGS=[ - '-march=i686', - ]) - env.Append(CCFLAGS=[ - '-mfpmath=sse', - '-msse2', - ]) - elif env['SSE'] == True: - if not x86_64: - env.Append(CCFLAGS=[ - '-march=i686', - ]) - env.Append(CCFLAGS=[ - '-mfpmath=sse', - '-msse', - ]) - + if cl: env.Append(CCFLAGS=[ '-nologo', @@ -219,6 +195,13 @@ if cl: env.Append(CCFLAGS=['-MT', '-O2' ]) else: env.Append(CCFLAGS=['-MTd', '-Zi' ]) + +for flag in env["optflags"].split(" "): + env.Append(CCFLAGS=flag) + +for flag in env["optflags"].split(" "): + env.Append(LINKFLAGS=flag) + ###################################### # 64-bit fixes @@ -393,10 +376,8 @@ if env['LUNARTARGET'] == '': env['CONFIGURED'] = '' def is_cleaning(): - import SCons.Script.Main - try: return SCons.Script.Main.GetOption('clean') - except: return SCons.Script.Main.options.clean - + return False + if (not is_cleaning()) and ('configure' in COMMAND_LINE_TARGETS): import os @@ -679,7 +660,7 @@ env.Signature(target='include/zzub/signa env.SConscript('${LIBZZUB_SRC_PATH}/SConscript') env.SConscript('${PLUGINS_SRC_PATH}/SConscript') -env.SConscript('${CCMPLAYER_SRC_PATH}/SConscript') +#env.SConscript('${CCMPLAYER_SRC_PATH}/SConscript') env.SConscript('${BMPCCM_SRC_PATH}/SConscript') env.SConscript('${PYZZUB_SRC_PATH}/SConscript') armstrong-gcc44.patch: --- NEW FILE armstrong-gcc44.patch --- diff -rupN armstrong.old/src/libzzub/archive.h armstrong/src/libzzub/archive.h --- armstrong.old/src/libzzub/archive.h 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/archive.h 2009-02-26 17:25:03.000000000 -0500 @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fi */ #pragma once - +#include #include #include diff -rupN armstrong.old/src/libzzub/bmxreader.cpp armstrong/src/libzzub/bmxreader.cpp --- armstrong.old/src/libzzub/bmxreader.cpp 2009-02-26 17:23:25.000000000 -0500 +++ armstrong/src/libzzub/bmxreader.cpp 2009-02-26 17:24:24.000000000 -0500 @@ -15,7 +15,7 @@ You should have received a copy of the G License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - +#include #include "common.h" #include #include "archive.h" diff -rupN armstrong.old/src/libzzub/host.cpp armstrong/src/libzzub/host.cpp --- armstrong.old/src/libzzub/host.cpp 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/host.cpp 2009-02-26 17:27:47.000000000 -0500 @@ -15,7 +15,7 @@ You should have received a copy of the G License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - +#include #include "common.h" using namespace std; diff -rupN armstrong.old/src/libzzub/pluginloader.cpp armstrong/src/libzzub/pluginloader.cpp --- armstrong.old/src/libzzub/pluginloader.cpp 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/pluginloader.cpp 2009-02-26 17:30:48.000000000 -0500 @@ -16,7 +16,7 @@ You should have received a copy of the G License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - +#include #include #include #include "common.h" diff -rupN armstrong.old/src/libzzub/tools.cpp armstrong/src/libzzub/tools.cpp --- armstrong.old/src/libzzub/tools.cpp 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/tools.cpp 2009-02-26 17:33:27.000000000 -0500 @@ -15,7 +15,7 @@ You should have received a copy of the G License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - +#include #include #if defined(POSIX) diff -rupN armstrong.old/src/plugins/bigyo_frequencyshifter/Bigyo_FrequencyShifter.cpp armstrong/src/plugins/bigyo_frequencyshifter/Bigyo_FrequencyShifter.cpp --- armstrong.old/src/plugins/bigyo_frequencyshifter/Bigyo_FrequencyShifter.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/bigyo_frequencyshifter/Bigyo_FrequencyShifter.cpp 2009-02-26 17:45:09.000000000 -0500 @@ -16,6 +16,7 @@ License along with this library; if not, Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #define _USE_MATH_DEFINES +#include #include #include #include diff -rupN armstrong.old/src/plugins/btdsys_ringmod/ringmod.cpp armstrong/src/plugins/btdsys_ringmod/ringmod.cpp --- armstrong.old/src/plugins/btdsys_ringmod/ringmod.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/btdsys_ringmod/ringmod.cpp 2009-02-26 17:47:29.000000000 -0500 @@ -27,7 +27,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - +#include #include #include diff -rupN armstrong.old/src/plugins/CyanPhase_DTMF-1/CyanPhase_DTMF-1.cpp armstrong/src/plugins/CyanPhase_DTMF-1/CyanPhase_DTMF-1.cpp --- armstrong.old/src/plugins/CyanPhase_DTMF-1/CyanPhase_DTMF-1.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/CyanPhase_DTMF-1/CyanPhase_DTMF-1.cpp 2009-02-26 17:39:51.000000000 -0500 @@ -4,7 +4,7 @@ // CyanPhase DTMF-1 // Copyright 2000 CyanPhase aka Edward L. Blake // Enjoy - +#include #include #include diff -rupN armstrong.old/src/plugins/Intoxicat_ACloud/Cloud.cpp armstrong/src/plugins/Intoxicat_ACloud/Cloud.cpp --- armstrong.old/src/plugins/Intoxicat_ACloud/Cloud.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/Intoxicat_ACloud/Cloud.cpp 2009-02-26 17:42:22.000000000 -0500 @@ -1,6 +1,6 @@ #include #include - +#include #include #include #include diff -rupN armstrong.old/src/plugins/jmmcd_Crossfade/crossfade.cpp armstrong/src/plugins/jmmcd_Crossfade/crossfade.cpp --- armstrong.old/src/plugins/jmmcd_Crossfade/crossfade.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/jmmcd_Crossfade/crossfade.cpp 2009-02-26 17:51:20.000000000 -0500 @@ -4,7 +4,7 @@ // Lots of code from BTDSys RingMod -- thanks! - +#include #include #include //#include "../buzz2zzub/mdk.h" diff -rupN armstrong.old/src/plugins/jmmcd_Note_Pool/jmmcd_Note_Pool.cpp armstrong/src/plugins/jmmcd_Note_Pool/jmmcd_Note_Pool.cpp --- armstrong.old/src/plugins/jmmcd_Note_Pool/jmmcd_Note_Pool.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/jmmcd_Note_Pool/jmmcd_Note_Pool.cpp 2009-02-26 17:52:03.000000000 -0500 @@ -6,7 +6,7 @@ // thanks to btdsys, 7900, and usr for answering questions, but especially btdsys // for making peerlib, without which this wouldn't be possible. - +#include #define MACHINE_NAME "Peer Note-Pool" #define AUTHOR "jmmcd" #define FULL_NAME AUTHOR " " MACHINE_NAME diff -rupN armstrong.old/src/plugins/ladspadapter/ladspadapter.cpp armstrong/src/plugins/ladspadapter/ladspadapter.cpp --- armstrong.old/src/plugins/ladspadapter/ladspadapter.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/ladspadapter/ladspadapter.cpp 2009-02-26 17:55:34.000000000 -0500 @@ -17,7 +17,7 @@ // ladspadapter allows running LADSPA plugins as zzub plugins - +#include #include #include #include "zzub/plugin.h" diff -rupN armstrong.old/src/plugins/ladspadapter/paramtools.h armstrong/src/plugins/ladspadapter/paramtools.h --- armstrong.old/src/plugins/ladspadapter/paramtools.h 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/ladspadapter/paramtools.h 2009-02-26 17:54:52.000000000 -0500 @@ -17,7 +17,7 @@ #if !defined(__LADSPA_PARAMTOOLS_H__) #define __LADSPA_PARAMTOOLS_H__ - +#include #include #include diff -rupN armstrong.old/src/plugins/lunar/pugxml.h armstrong/src/plugins/lunar/pugxml.h --- armstrong.old/src/plugins/lunar/pugxml.h 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/lunar/pugxml.h 2009-02-26 18:00:33.000000000 -0500 @@ -24,7 +24,7 @@ # endif #endif - +#include #define TCHAR char #define _T(x) x diff -rupN armstrong.old/src/plugins/zzub_miditracker/miditracker.cpp armstrong/src/plugins/zzub_miditracker/miditracker.cpp --- armstrong.old/src/plugins/zzub_miditracker/miditracker.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/zzub_miditracker/miditracker.cpp 2009-02-26 18:03:39.000000000 -0500 @@ -7,7 +7,7 @@ #include #include #include "miditracker.h" - +#include using namespace std; namespace miditracker { armstrong-size_t.patch: --- NEW FILE armstrong-size_t.patch --- diff -rupN armstrong.old/src/libzzub/ccm.cpp armstrong/src/libzzub/ccm.cpp --- armstrong.old/src/libzzub/ccm.cpp 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/ccm.cpp 2009-03-04 11:09:35.000000000 -0500 @@ -378,7 +378,7 @@ std::string paramtype_to_string(int para std::string id_from_ptr(const void *p) { char id[64]; - sprintf(id, "%x", p); + sprintf(id, "%p", p); return id; } diff -rupN armstrong.old/src/plugins/btdsys_ringmod/ringmod.cpp armstrong/src/plugins/btdsys_ringmod/ringmod.cpp --- armstrong.old/src/plugins/btdsys_ringmod/ringmod.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/btdsys_ringmod/ringmod.cpp 2009-03-04 11:09:35.000000000 -0500 @@ -324,7 +324,7 @@ void ringmod::command(const int i) "BTDSys RingMod v1.0\n" "?2002 Ed Powley (BTDSys)\n\n" "Comments/suggestions/bug reports to e at btd2001.freeserve.co.uk\n\n"); - sprintf(txt,"%s%i inputs", txt, Inputs.size()); + sprintf(txt,"%s%zi inputs", txt, Inputs.size()); for (int j=0; jregister_info(infos[i]); } - printf("ladspadapter: enumerated %i plugin(s).\n", infos.size()); + printf("ladspadapter: enumerated %zi plugin(s).\n", infos.size()); } // Called by the host upon song loading. If the collection diff -rupN armstrong.old/src/plugins/lunar/include/lunar/fx.h armstrong/src/plugins/lunar/include/lunar/fx.h --- armstrong.old/src/plugins/lunar/include/lunar/fx.h 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/lunar/include/lunar/fx.h 2009-03-04 11:10:37.000000000 -0500 @@ -12,7 +12,7 @@ extern "C" { // at build time stating the platform, // catch it here with an ifdef and have different // typedefs per platform. -#if defined(__X86_64__) || defined(CONFIG_X86_64) || defined(__APPLE__) +#if defined(__X86_64__) || defined(CONFIG_X86_64) || defined(__APPLE__) || defined(__powerpc64__) typedef long unsigned int lunar_size_t; #else typedef unsigned int lunar_size_t; armstrong-sonamefix.patch: --- NEW FILE armstrong-sonamefix.patch --- diff -rupN armstrong.old/src/libzzub/SConscript armstrong/src/libzzub/SConscript --- armstrong.old/src/libzzub/SConscript 2009-02-26 23:27:36.000000000 -0500 +++ armstrong/src/libzzub/SConscript 2009-02-26 23:25:18.000000000 -0500 @@ -151,6 +151,10 @@ if posix: localenv.Append(LIBS=[ 'asound', ]) localenv.Append(CCFLAGS=[ '-DPMALSA', ]) + localenv.Append(LINKFLAGS=[ + '-Wl,-soname,libzzub.so.0' + ]) + elif win32: if cl: localenv.Append(LIBS=[ diff -rupN armstrong.old/src/plugins/lunar/SConscript armstrong/src/plugins/lunar/SConscript --- armstrong.old/src/plugins/lunar/SConscript 2009-02-26 23:29:42.000000000 -0500 +++ armstrong/src/plugins/lunar/SConscript 2009-02-26 23:25:18.000000000 -0500 @@ -28,13 +28,21 @@ import os if pluginenv["LUNAR"] == True: lunarstdenv = env.Copy() + shlibsuffix = lunarstdenv['SHLIBSUFFIX'] + lunarstdenv['SHLIBSUFFIX'] += '.0' + lunarstdenv.Append(LINKFLAGS=[ + '-Wl,-soname,liblunarstd.so.0' + ]) lunarstdfiles = [ 'lunarstd.cpp', ] if win32: lunarstdfiles.append('lunarstd.def') lunarstd = lunarstdenv.SharedLibrary('${LIB_BUILD_PATH}/lunarstd', lunarstdfiles)[0] - install_lib(lunarstd) + installed_lunarstd = install_lib(lunarstd) + symlinkcmd = 'cd $TARGET.dir && rm -f $TARGET.name && ln -s $SOURCE.name $TARGET.name' + lunarstdenv.Command('${LIB_BUILD_PATH}/liblunarstd'+shlibsuffix, lunarstd, symlinkcmd) + lunarstdenv.Command('${DESTDIR}${PREFIX}${LIBDIR}/liblunarstd'+shlibsuffix, installed_lunarstd, symlinkcmd) pluginenv.Append(LIBS=[ 'lunarstd' armstrong-use-system-libs.patch: --- NEW FILE armstrong-use-system-libs.patch --- diff -rupN armstrong.old/src/libzzub/ccm.cpp armstrong/src/libzzub/ccm.cpp --- armstrong.old/src/libzzub/ccm.cpp 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/ccm.cpp 2009-02-26 23:33:28.000000000 -0500 @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fi #include #include #include -#include "../minizip/unzip.h" -#include "../minizip/zip.h" +#include +#include #include "FLAC/all.h" #include "ccm.h" @@ -1049,7 +1049,7 @@ bool CcmWriter::save(std::string fileNam } -static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) { +static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) { zzub::outstream* writer=(zzub::outstream*)client_data; writer->write((void*)buffer, sizeof(FLAC__byte)*bytes); @@ -1086,7 +1086,7 @@ struct DecoderInfo { // buffer can hold. The callback may choose to supply less data and modify the byte count // but must be careful not to overflow the buffer. The callback then returns a status code // chosen from FLAC__StreamDecoderReadStatus. -static FLAC__StreamDecoderReadStatus flac_stream_decoder_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) { +static FLAC__StreamDecoderReadStatus flac_stream_decoder_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) { DecoderInfo* info = (DecoderInfo*)client_data; if (info->reader->position() >= info->reader->size()-1) return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM; @@ -1139,19 +1139,20 @@ void flac_stream_decoder_error_callback( void decodeFLAC(zzub::instream* reader, zzub::player& player, int wave, int level) { FLAC__StreamDecoder* stream=FLAC__stream_decoder_new(); - FLAC__stream_decoder_set_read_callback(stream, flac_stream_decoder_read_callback); - FLAC__stream_decoder_set_write_callback(stream, flac_stream_decoder_write_callback); - FLAC__stream_decoder_set_metadata_callback(stream, flac_stream_decoder_metadata_callback); - FLAC__stream_decoder_set_error_callback(stream, flac_stream_decoder_error_callback); DecoderInfo decoder_info; decoder_info.reader = reader; - FLAC__stream_decoder_set_client_data(stream, &decoder_info); // we're not intersted in meitadeita FLAC__stream_decoder_set_metadata_ignore_all(stream); - FLAC__stream_decoder_init(stream); + FLAC__stream_decoder_init_stream(stream, + flac_stream_decoder_read_callback, + NULL, NULL, NULL, NULL, + flac_stream_decoder_write_callback, + flac_stream_decoder_metadata_callback, + flac_stream_decoder_error_callback, + &decoder_info); // FLAC__stream_decoder_process_single(stream); FLAC__stream_decoder_process_until_end_of_stream(stream); @@ -1216,11 +1217,12 @@ bool encodeFLAC(zzub::outstream* writer, FLAC__stream_encoder_set_bits_per_sample(stream, bps); FLAC__stream_encoder_set_sample_rate(stream, sample_rate); FLAC__stream_encoder_set_total_samples_estimate(stream, num_samples); - FLAC__stream_encoder_set_write_callback(stream, flac_stream_encoder_write_callback); - FLAC__stream_encoder_set_metadata_callback(stream, flac_stream_encoder_metadata_callback); - FLAC__stream_encoder_set_client_data(stream, writer); + int result = FLAC__stream_encoder_init_stream(stream, + flac_stream_encoder_write_callback, + NULL, + NULL, + flac_stream_encoder_metadata_callback, writer); - int result = FLAC__stream_encoder_init(stream); // if this fails, we want it to crash hard - or else will cause dataloss assert(result == FLAC__STREAM_ENCODER_OK); diff -rupN armstrong.old/src/libzzub/ccm.h armstrong/src/libzzub/ccm.h --- armstrong.old/src/libzzub/ccm.h 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/ccm.h 2009-02-26 23:33:28.000000000 -0500 @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fi #pragma once -#include "../minizip/unzip.h" -#include "../minizip/zip.h" +#include +#include #include "pugixml.hpp" diff -rupN armstrong.old/src/libzzub/SConscript armstrong/src/libzzub/SConscript --- armstrong.old/src/libzzub/SConscript 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/SConscript 2009-02-26 23:34:07.000000000 -0500 @@ -57,24 +57,15 @@ files = [ 'thread_id.cpp', ] -# we build from our private flac, -# since some are using 1.1.3, and that -# one breaks a few things. +# use internal flac support +localenv.ParseConfig('pkg-config --libs flac') + +# minizip, zlib and flac dependencies +localenv.ParseConfig('pkg-config --libs minizip') localenv.Append(CPPPATH=[ - "${ROOTPATH}/src/flac/include" + '${PREFIX}/include/minizip' ]) -localenv.Append(CCFLAGS=[ - '-DFLAC__NO_DLL', -]) -env.SConscript("${ROOTPATH}/src/flac/src/libFLAC/SConscript") -# minizip, zlib and flac dependencies -files += [ - '${MINIZIP_SRC_PATH}/ioapi.c', - '${MINIZIP_SRC_PATH}/mztools.c', - '${MINIZIP_SRC_PATH}/unzip.c', - '${MINIZIP_SRC_PATH}/zip.c', -] if win32: # build from our private zlib localenv.Append(CPPPATH=["${ROOTPATH}/src/zlib"]) @@ -90,8 +81,10 @@ if mac: ]) localenv.Append(LIBS=[ - 'FLAC', 'z', + 'c', + 'portmidi', + 'porttime', ]) localenv.Append(CCFLAGS=['-D_LIB','-D_LIBZZUB']) @@ -126,19 +119,7 @@ if localenv['SNDFILE']: ]) if localenv['RUBBERBAND']: - localenv.SConscript('../rubberband/SConscript') - localenv.Append(LIBS=[ - 'rubberband_static', - 'fftw3', - 'samplerate', - 'fftw3f', - ]) - localenv.Append(CPPPATH=[ - '../rubberband', - ]) - localenv.Append(CCFLAGS=[ - '-DUSE_RUBBERBAND', - ]) + localenv.ParseConfig('pkg-config --libs rubberband') if localenv['BUZZ2ZZUB'] == True: localenv.Append(CCFLAGS=[ @@ -146,25 +127,11 @@ if localenv['BUZZ2ZZUB'] == True: ]) # portmidi support -localenv.Append(CPPPATH=[ - '${PORTMIDI_SRC_PATH}/pm_common', - '${PORTMIDI_SRC_PATH}/porttime' -]) if posix: # porttime and portmidi - files += [ - '${PORTMIDI_SRC_PATH}/porttime/porttime.c', - '${PORTMIDI_SRC_PATH}/pm_common/pmutil.c', - '${PORTMIDI_SRC_PATH}/pm_common/portmidi.c', - ] - + if localenv['COREAUDIO'] == True: - files += [ - '${PORTMIDI_SRC_PATH}/pm_mac/pmmac.c', - '${PORTMIDI_SRC_PATH}/pm_mac/pmmacosxcm.c', - '${PORTMIDI_SRC_PATH}/porttime/ptmacosx_cf.c', - ] localenv.Append(LINKFLAGS=[ '-framework', 'CoreMIDI', '-framework', 'CoreFoundation', @@ -175,16 +142,12 @@ if posix: '-DNEWBUFFER' ]) else: - files += [ - '${PORTMIDI_SRC_PATH}/porttime/ptlinux.c', - '${PORTMIDI_SRC_PATH}/pm_linux/pmlinux.c', - ] localenv.Append(CCFLAGS=[ '-DPM_CHECK_ERRORS', '-DNEWBUFFER' ]) if localenv["ALSA"] == True: - files += [ '${PORTMIDI_SRC_PATH}/pm_linux/pmlinuxalsa.c' ] + #files += [ '${PORTMIDI_SRC_PATH}/pm_linux/pmlinuxalsa.c' ] localenv.Append(LIBS=[ 'asound', ]) localenv.Append(CCFLAGS=[ '-DPMALSA', ]) @@ -326,26 +289,14 @@ if localenv['AUDIOENGINE'] == 'rtaudio': '-DUSE_RTAUDIO', ]) - localenv.SConscript('../rtaudio/SConscript') localenv.Append(LIBS=[ - 'rtaudio_static', + 'rtaudio', ]) + localenv.Append(CPPPATH=[ - '../rtaudio', + '${PREFIX}/include', ]) - if env['MP3'] == True: - localenv.SConscript('../libmad/SConscript') - localenv.Append(LIBS=[ - 'libmad_static', - ]) - localenv.Append(CPPPATH=[ - '../libmad', - ]) - localenv.Append(CCFLAGS=[ - '-DUSE_LIBMAD', - ]) - if win32: localenv.Append(CCFLAGS=[ '-D__WINDOWS_ASIO__', @@ -373,6 +324,7 @@ if localenv['AUDIOENGINE'] == 'rtaudio': localenv.Append(LIBS=[ 'pthread', 'm', + 'rtaudio', ]) ####################################### diff -rupN armstrong.old/src/plugins/lunar/SConscript armstrong/src/plugins/lunar/SConscript --- armstrong.old/src/plugins/lunar/SConscript 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/lunar/SConscript 2009-02-26 23:35:01.000000000 -0500 @@ -57,8 +57,8 @@ if pluginenv["LUNAR"] == True: pluginenv['LIB_COMPAT'], ]) pluginenv.Append(CCFLAGS=[ - '-DZZUB_SHARE_DIR_PATH="\\"%s\\""' % str(pluginenv.Dir("${DESTDIR}${PREFIX}/share/zzub")), - '-DZZUB_LIB_DIR_PATH="\\"%s\\""' % str(pluginenv.Dir("${DESTDIR}${PREFIX}${LIBDIR}/zzub")), + '-DZZUB_SHARE_DIR_PATH="\\"%s\\""' % str(pluginenv.Dir("${PREFIX}/share/zzub")), + '-DZZUB_LIB_DIR_PATH="\\"%s\\""' % str(pluginenv.Dir("${PREFIX}${LIBDIR}/zzub")), '-DSHLIBSUFFIX="\\"%s\\""' % pluginenv['SHLIBSUFFIX'], '-DUSE_LUNAR', ]) diff -rupN armstrong.old/src/plugins/zzub_stream/SConscript armstrong/src/plugins/zzub_stream/SConscript --- armstrong.old/src/plugins/zzub_stream/SConscript 2009-02-25 00:50:05.000000000 -0500 +++ armstrong/src/plugins/zzub_stream/SConscript 2009-02-26 23:33:28.000000000 -0500 @@ -22,8 +22,8 @@ Import('pluginenv', 'build_plugin', 'win if pluginenv['ZZUB_STREAM']: # make sure libmad.lib is in - pluginenv.Append(LIBS = [ "libmad_static", "sndfile" ] ); - pluginenv.Append(CPPPATH = [ "../../libmad", "resampler" ] ); + pluginenv.Append(LIBS = [ "sndfile" ] ); + pluginenv.Append(CPPPATH = [ "${PREFIX}/include", "resampler" ] ); build_plugin(pluginenv, 'zzub_stream', files=[ 'main.cpp', --- NEW FILE armstrong.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: armstrong Version: 0.2.6 Release: 4%{?dist} Summary: Powerful music sequencing library Group: System Environment/Libraries # src/plugins/Geonik is GPL+ # src/plugins/fft is BSD # src/plugins/btdsys_ringmod is BSD # src/plugins/firesledge_parameq is LGPLv2+ # src/plugins/zzub_stream/resampler is LGPLv2+ # src/plugins/bigyo_frequencyshifter is LGPLv2+ # src/plugins/buzz2zzub is LGPLv2+ and GPLv2+ # src/plugins/graue_softsat is Public Domain # src/plugins/zzub_stream is LGPLv2+ # The core part of the library is LGPLv2+ # The rest is GPL+ or GPLv2+ License: GPLv2+ and GPL+ and BSD and LGPLv2+ URL: http://code.google.com/p/armstrong/ # The original source tarball # http://armstrong.googlecode.com/files/armstrong-0.2.6.tar.gz # contains libmad, which is a MP3 decoder/encoder, that cannot be # included in Fedora because it is patent encumbered. We remove # src/libmad # src/plugins/zzub_stream/stream_mp3.* # from the tarball and remove the MP3 related bits from # src/libzzub/import.h # src/libzzub/player.cpp # src/plugins/zzub_stream/main.h # src/plugins/zzub_stream/SConscript # and we also remove a directory that has some proprietary code # src/rtaudio/include # to produce the following file: Source0: %{name}-%{version}-fe.tar.gz # Fix build issues (optflags, drop sse optimizations). Also # disable compilation of ccmplayer, which is not ready for # this release # Since these (except the last one) are Fedora-specific, and ccmplayer # non-compilation is very obivous, they are not sent upstream. Patch0: armstrong-buildfix.patch # armstrong comes with bunch of libraries built in statically # we modify the sources to link to system libraries # http://bitbucket.org/paniq/armstrong/issue/6/link-armstrong-to-internal-libraries Patch1: armstrong-use-system-libs.patch # Fix gcc-4.4 issues # http://bitbucket.org/paniq/armstrong/issue/7/build-with-gcc-44 Patch2: armstrong-gcc44.patch # Fix size_t issues for 64bit systems and maybe others # http://bitbucket.org/paniq/armstrong/issue/8/size_t-issue Patch3: armstrong-size_t.patch # Build shared libraries with proper sonames # http://bitbucket.org/paniq/armstrong/issue/9/build-libraries-with-sonames Patch4: armstrong-sonamefix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel boost-devel doxygen epydoc fftw-devel flac-devel BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel libsndfile-devel BuildRequires: minizip-devel portaudio-devel portmidi-devel python-setuptools-devel BuildRequires: rtaudio-static rubberband-devel scons zlib-devel Obsoletes: libzzub <= 0.2.5 Provides: libzzub = %{version}-%{release} %description If you are searching for a foundation for your next soundtracker, armstrong is what you want. armstrong provides an extensible DSP plugin system, a wavetable, instruments, a multitrack sequencer and support for major soundcard APIs. armstrong includes zzub and lunar libraries. %package devel Summary: Development files for %{name} Group: Development/Libraries License: GPLv2+ Requires: %{name} = %{version}-%{release} Obsoletes: libzzub-devel <= 0.2.5 Provides: libzzub-devel = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications and plugins that use %{name}. %package -n pyzzub Summary: Python Bindings For libzzub Group: System Environment/Libraries License: GPLv2+ Requires: %{name} = %{version}-%{release} %description -n pyzzub These are the Python bindings for armstrong, allowing you to use it from within Python scripts. %prep %setup -q -n %{name} %patch0 -p1 -b .buildfix %patch1 -p1 -b .internallibs %patch2 -p1 -b .gcc44 %patch3 -p1 -b .size_t %patch4 -p1 -b .soname # Remove the binded libraries. We'll use the system-wide ones pushd src rm -fr libsndfile flac rubberband zlib bmp-ccm \ portmidi portaudio rtaudio minizip popd # Remove the precompiled binaries for ext in aps bc dll exe lib ncb zip; do find . -name "*.$ext" | xargs rm -f -- || : done # There are many source files with wrong permissions and EOL encodings. Fix these pushd src/plugins for ext in cpp h hpp; do find . -name "*.$ext" \ -exec chmod 0644 '{}' \; \ -exec sed -i "s|\r||" '{}' \; done popd # Fix the encoding issues with text files for ext in txt ini; do for file in $(find . -name "*.$ext"); do sed 's|\r||' $file > tmpfile iconv --from-code=ISO-8859-1 --to-code=UTF-8 tmpfile > tmpfile2 touch -r $file tmpfile2 mv -f tmpfile2 $file done done %build scons configure \ PREFIX=%{_prefix} \ LIBDIR=/%{_lib} \ CCFLAGS="%{optflags}" \ CXXFLAGS="%{optflags}" \ optflags="%{optflags}" \ MP3="False" scons %{?_smp_mflags} # Build the documentation: # (REMINDER: There is an incomplete docbook documentation that we might want # to replace with the doxygen documentation in a future release) pushd share/doc ./make_pyzzub_doc mv pyzzub html doxygen libzzub.dox doxygen libzzub-cpp.dox doxygen libzzub-plugin.dox popd %install rm -rf $RPM_BUILD_ROOT scons install DESTDIR=$RPM_BUILD_ROOT # signature.h differs per build host, circumvent multiarch conflicts mv $RPM_BUILD_ROOT%{_includedir}/zzub/signature.h \ %ifarch x86_64 ppc64 $RPM_BUILD_ROOT%{_includedir}/zzub/signature-64.h %else $RPM_BUILD_ROOT%{_includedir}/zzub/signature-32.h %endif cat > $RPM_BUILD_ROOT%{_includedir}/zzub/signature.h << EOF #include #if __WORDSIZE == 32 #include "signature-32.h" #elseif __WORDSIZE == 64 #include "signature-64.h" #else #error "Unknown word size" #endif EOF # We want to install docs to the proper location: mkdir -p installed_docs mv $RPM_BUILD_ROOT%{_docdir}/zzub/* installed_docs/ # Collect the doc files scattered around the source tree: cp -a CREDITS.txt ChangeLog LICENCE installed_docs/ cp -a share/zzub installed_docs/ mkdir -p installed_docs/plugins/lad2zzub cp -a src/plugins/lad2zzub/gpl.txt installed_docs/plugins/lad2zzub/ mkdir -p installed_docs/plugins/Geonik cp -a src/plugins/Geonik/readme.txt installed_docs/plugins/Geonik/ mkdir -p installed_docs/plugins/buzz2zzub cp -a src/plugins/buzz2zzub/buzz2zzub.ini installed_docs/plugins/buzz2zzub mkdir -p installed_docs/plugins/jmmcd_Note_Pool cp -a src/plugins/jmmcd_Note_Pool/{index.html,note-pool-test.ccm} installed_docs/plugins/jmmcd_Note_Pool mkdir -p installed_docs/plugins/Intoxicat_ACloud cp -a src/plugins/Intoxicat_ACloud/Intoxicat\ ACloud.htm installed_docs/plugins/Intoxicat_ACloud mkdir -p installed_docs/plugins/fft cp -a src/plugins/fft/{test/tailscrap.m,CHANGELOG,COPYING,TIPS,README} installed_docs/plugins/fft mkdir -p installed_docs/plugins/MadBrain_Dynamite6 cp -a src/plugins/MadBrain_Dynamite6/MadBrains_Dynamite6*.{bmx,prs} installed_docs/plugins/MadBrain_Dynamite6 mkdir -p installed_docs/plugins/CyanPhase_DTMF-1 cp -a src/plugins/CyanPhase_DTMF-1/CyanPhase_DTMF-1.{txt,bmx} installed_docs/plugins/CyanPhase_DTMF-1 cp -a src/plugins/firesledge_parameq/license.txt installed_docs/plugins/firesledge_parameq mkdir -p installed_docs/plugins/fsm_infector/ cp -a src/plugins/fsm_infector/todo.txt installed_docs/plugins/fsm_infector/ mkdir -p installed_docs/plugins/psy2zzub cp -a src/plugins/psy2zzub/gpl.txt installed_docs/plugins/psy2zzub mkdir -p installed_docs/plugins/matilde_tracker cp -a src/plugins/matilde_tracker/Matilde\ Tracker.html installed_docs/plugins/matilde_tracker mkdir -p installed_docs/plugins/zzub_stream/resampler cp -a src/plugins/zzub_stream/resampler/{license,readme}.txt installed_docs/plugins/zzub_stream/resampler mkdir -p installed_docs/plugins/dssidapter cp -a src/plugins/dssidapter/README.txt installed_docs/plugins/dssidapter mkdir -p installed_docs/plugins/zzub_module cp -a src/plugins/zzub_module/libmodfile/readme.txt installed_docs/plugins/zzub_module cp -a src/plugins/green_milk/{about_te.bin,LICENSE} installed_docs/plugins/green_milk mkdir -p installed_docs/plugins/Elenzil_Modulator cp -a src/plugins/Elenzil_Modulator/elenziltest.bmx installed_docs/plugins/Elenzil_Modulator # Remove the shebang from the python library sed -i '\|^#!/usr/bin/env python|d' $RPM_BUILD_ROOT%{python_sitelib}/zzub/__init__.py # Install the python egg properly pushd src/pyzzub python -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT popd %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc installed_docs/* %{_libdir}/*.so.* %{_libdir}/zzub %{_libdir}/lunar %files devel %defattr(-,root,root,-) %doc share/doc/zzub/api* %{_includedir}/* %{_libdir}/*.so %files -n pyzzub %defattr(-,root,root,-) %doc src/pyzzub/testzzub.py share/doc/html %{python_sitelib}/* %changelog * Thu Mar 05 2009 Orcan Ogetbil 0.2.6-4 - Update the size_t patch to fix compilation on ppc64 - Remove some proprietary code from the tarball (src/rtaudio/include) * Sat Feb 28 2009 Orcan Ogetbil 0.2.6-3 - License for -devel and pyzzub packages is GPLv2+ - Clarify system-wide library usage - Fix sonames - Don't package the empty directory %%_defaultdocdir/zzub * Fri Feb 27 2009 Orcan Ogetbil 0.2.6-2 - BR: rtaudio-static instead of rtaudio-devel * Fri Feb 27 2009 Orcan Ogetbil 0.2.6-1 - name changed from libzzub to armstrong - update to 0.2.6 * Wed Jan 7 2009 Caol??n McNamara - 0.2.3-14 - defuzz patches and extend buildfix to get building again * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.2.3-13 - Rebuild for Python 2.6 * Sun Mar 2 2008 Alexander Kahl - 0.2.3-12 - patch for missing explicit gcc 4.3 includes - pyzzub %%files also seizes the python egg now * Mon Feb 18 2008 Fedora Release Engineering - 0.2.3-11 - Autorebuild for GCC 4.3 * Tue Nov 20 2007 Alexander Kahl - 0.2.3-10 - updated buildfix patch to drop explicit sse optimizations - removed JOBS option again since scons supports -j build option * Thu Oct 25 2007 Alexander Kahl - 0.2.3-9 - fixed multiarch conflict * Thu Sep 20 2007 Alexander Kahl - 0.2.3-8 - included patch to install missing documentation to the right place - removed move macro instead - moved all plugin files *.{cpp,h,xml} back to get the lunar plugin loading right * Mon Sep 17 2007 Alexander Kahl - 0.2.3-7 - re-added pyzzub python-devel build requirement - explicitly nailed the name of pyzzub * Mon Sep 17 2007 Alexander Kahl - 0.2.3-6 - added pyzzub as an internal extra package * Thu Sep 13 2007 Alexander Kahl - 0.2.3-5 - removed redundant explicit flac requirement * Mon Sep 10 2007 Alexander Kahl - 0.2.3-4 - fixed double source definition - adapted modified source tarball w/ mp3 support removed - added patch to use internal flac support - removed INSTALL from %%doc - removed explicit python requirement - replaced static rm commands with macros * Mon Sep 10 2007 Alexander Kahl - 0.2.3-3 - fixed redundant dependencies - replaced occurence of /usr with prefix macro - removed manual stripping of binaries - fixed directory ownership issue - fixed encoding of CREDITS file - excluded arch ppc64 due to build failure - replaced all space occurences with tabs * Mon Sep 3 2007 Alexander Kahl - 0.2.3-2 - added flag to remove mp3 support * Sun Sep 2 2007 Alexander Kahl - 0.2.3-1 - initial release --- NEW FILE import.log --- armstrong-0_2_6-4_fc10:HEAD:armstrong-0.2.6-4.fc10.src.rpm:1236290347 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/armstrong/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:18:12 -0000 1.1 +++ .cvsignore 5 Mar 2009 22:00:30 -0000 1.2 @@ -0,0 +1 @@ +armstrong-0.2.6-fe.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/armstrong/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:18:12 -0000 1.1 +++ sources 5 Mar 2009 22:00:30 -0000 1.2 @@ -0,0 +1 @@ +fde539f563b85cc73077924f146c9135 armstrong-0.2.6-fe.tar.gz From oget at fedoraproject.org Thu Mar 5 22:04:05 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Thu, 5 Mar 2009 22:04:05 +0000 (UTC) Subject: rpms/armstrong/F-10 armstrong-buildfix.patch, NONE, 1.1 armstrong-gcc44.patch, NONE, 1.1 armstrong-size_t.patch, NONE, 1.1 armstrong-sonamefix.patch, NONE, 1.1 armstrong-use-system-libs.patch, NONE, 1.1 armstrong.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305220405.092A870116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/armstrong/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32716/F-10 Modified Files: .cvsignore sources Added Files: armstrong-buildfix.patch armstrong-gcc44.patch armstrong-size_t.patch armstrong-sonamefix.patch armstrong-use-system-libs.patch armstrong.spec import.log Log Message: * Thu Mar 05 2009 Orcan Ogetbil 0.2.6-4 - Update the size_t patch to fix compilation on ppc64 - Remove some proprietary code from the tarball (src/rtaudio/include) * Sat Feb 28 2009 Orcan Ogetbil 0.2.6-3 - License for -devel and pyzzub packages is GPLv2+ - Clarify system-wide library usage - Fix sonames - Don't package the empty directory %%_defaultdocdir/zzub * Fri Feb 27 2009 Orcan Ogetbil 0.2.6-2 - BR: rtaudio-static instead of rtaudio-devel * Fri Feb 27 2009 Orcan Ogetbil 0.2.6-1 - name changed from libzzub to armstrong - update to 0.2.6 * Wed Jan 7 2009 Caol??n McNamara - 0.2.3-14 - defuzz patches and extend buildfix to get building again * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.2.3-13 - Rebuild for Python 2.6 * Sun Mar 2 2008 Alexander Kahl - 0.2.3-12 - patch for missing explicit gcc 4.3 includes - pyzzub %%files also seizes the python egg now * Mon Feb 18 2008 Fedora Release Engineering - 0.2.3-11 - Autorebuild for GCC 4.3 * Tue Nov 20 2007 Alexander Kahl - 0.2.3-10 - updated buildfix patch to drop explicit sse optimizations - removed JOBS option again since scons supports -j build option * Thu Oct 25 2007 Alexander Kahl - 0.2.3-9 - fixed multiarch conflict * Thu Sep 20 2007 Alexander Kahl - 0.2.3-8 - included patch to install missing documentation to the right place - removed move macro instead - moved all plugin files *.{cpp,h,xml} back to get the lunar plugin loading right * Mon Sep 17 2007 Alexander Kahl - 0.2.3-7 - re-added pyzzub python-devel build requirement - explicitly nailed the name of pyzzub * Mon Sep 17 2007 Alexander Kahl - 0.2.3-6 - added pyzzub as an internal extra package * Thu Sep 13 2007 Alexander Kahl - 0.2.3-5 - removed redundant explicit flac requirement * Mon Sep 10 2007 Alexander Kahl - 0.2.3-4 - fixed double source definition - adapted modified source tarball w/ mp3 support removed - added patch to use internal flac support - removed INSTALL from %%doc - removed explicit python requirement - replaced static rm commands with macros * Mon Sep 10 2007 Alexander Kahl - 0.2.3-3 - fixed redundant dependencies - replaced occurence of /usr with prefix macro - removed manual stripping of binaries - fixed directory ownership issue - fixed encoding of CREDITS file - excluded arch ppc64 due to build failure - replaced all space occurences with tabs * Mon Sep 3 2007 Alexander Kahl - 0.2.3-2 - added flag to remove mp3 support * Sun Sep 2 2007 Alexander Kahl - 0.2.3-1 - initial release armstrong-buildfix.patch: --- NEW FILE armstrong-buildfix.patch --- --- armstrong.old/SConstruct 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/SConstruct 2009-02-26 19:54:31.000000000 -0500 @@ -89,6 +89,7 @@ opts.Add("JOBS", "Number of threads to c opts.Add("PYZZUB", "Support pyzzub",True,None,bool_converter) opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0'))) +opts.Add("optflags",'Default: none',"") env = Environment(ENV = os.environ, options = opts) @@ -130,9 +131,7 @@ SetOption('num_jobs', env['JOBS'].replac if posix: env.Append(CCFLAGS=[ '-DPOSIX', - ]) - env.Append(LINKFLAGS=[ - '--rpath%s' % str(env.Dir('${PREFIX}${LIBDIR}')), + '-fPIC', ]) if os.uname()[0] == 'FreeBSD': env.Append(CCFLAGS=[ '-I/usr/local/include' ]) @@ -173,38 +172,15 @@ cl = env['CC'] == 'cl' if gcc: #env['CXXFLAGS'] += ['--no-rtti'] if env['DEBUG'] == False: - env.Append(CCFLAGS=[ - '-O1', # O2 O3 break infector and a few others - '-fomit-frame-pointer', - '-funroll-loops', - '-DNDEBUG', - ]) env.Append(CCFLAGS=ARGUMENTS.get('CCFLAGS')) + env.Append(CCFLAGS=['-DNDEBUG']) else: env.Append(CCFLAGS=[ '-g', '-DDEBUG', '-D_DEBUG', ]) - if env['SSE2'] == True: - if not x86_64: - env.Append(CCFLAGS=[ - '-march=i686', - ]) - env.Append(CCFLAGS=[ - '-mfpmath=sse', - '-msse2', - ]) - elif env['SSE'] == True: - if not x86_64: - env.Append(CCFLAGS=[ - '-march=i686', - ]) - env.Append(CCFLAGS=[ - '-mfpmath=sse', - '-msse', - ]) - + if cl: env.Append(CCFLAGS=[ '-nologo', @@ -219,6 +195,13 @@ if cl: env.Append(CCFLAGS=['-MT', '-O2' ]) else: env.Append(CCFLAGS=['-MTd', '-Zi' ]) + +for flag in env["optflags"].split(" "): + env.Append(CCFLAGS=flag) + +for flag in env["optflags"].split(" "): + env.Append(LINKFLAGS=flag) + ###################################### # 64-bit fixes @@ -393,10 +376,8 @@ if env['LUNARTARGET'] == '': env['CONFIGURED'] = '' def is_cleaning(): - import SCons.Script.Main - try: return SCons.Script.Main.GetOption('clean') - except: return SCons.Script.Main.options.clean - + return False + if (not is_cleaning()) and ('configure' in COMMAND_LINE_TARGETS): import os @@ -679,7 +660,7 @@ env.Signature(target='include/zzub/signa env.SConscript('${LIBZZUB_SRC_PATH}/SConscript') env.SConscript('${PLUGINS_SRC_PATH}/SConscript') -env.SConscript('${CCMPLAYER_SRC_PATH}/SConscript') +#env.SConscript('${CCMPLAYER_SRC_PATH}/SConscript') env.SConscript('${BMPCCM_SRC_PATH}/SConscript') env.SConscript('${PYZZUB_SRC_PATH}/SConscript') armstrong-gcc44.patch: --- NEW FILE armstrong-gcc44.patch --- diff -rupN armstrong.old/src/libzzub/archive.h armstrong/src/libzzub/archive.h --- armstrong.old/src/libzzub/archive.h 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/archive.h 2009-02-26 17:25:03.000000000 -0500 @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fi */ #pragma once - +#include #include #include diff -rupN armstrong.old/src/libzzub/bmxreader.cpp armstrong/src/libzzub/bmxreader.cpp --- armstrong.old/src/libzzub/bmxreader.cpp 2009-02-26 17:23:25.000000000 -0500 +++ armstrong/src/libzzub/bmxreader.cpp 2009-02-26 17:24:24.000000000 -0500 @@ -15,7 +15,7 @@ You should have received a copy of the G License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - +#include #include "common.h" #include #include "archive.h" diff -rupN armstrong.old/src/libzzub/host.cpp armstrong/src/libzzub/host.cpp --- armstrong.old/src/libzzub/host.cpp 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/host.cpp 2009-02-26 17:27:47.000000000 -0500 @@ -15,7 +15,7 @@ You should have received a copy of the G License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - +#include #include "common.h" using namespace std; diff -rupN armstrong.old/src/libzzub/pluginloader.cpp armstrong/src/libzzub/pluginloader.cpp --- armstrong.old/src/libzzub/pluginloader.cpp 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/pluginloader.cpp 2009-02-26 17:30:48.000000000 -0500 @@ -16,7 +16,7 @@ You should have received a copy of the G License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - +#include #include #include #include "common.h" diff -rupN armstrong.old/src/libzzub/tools.cpp armstrong/src/libzzub/tools.cpp --- armstrong.old/src/libzzub/tools.cpp 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/tools.cpp 2009-02-26 17:33:27.000000000 -0500 @@ -15,7 +15,7 @@ You should have received a copy of the G License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - +#include #include #if defined(POSIX) diff -rupN armstrong.old/src/plugins/bigyo_frequencyshifter/Bigyo_FrequencyShifter.cpp armstrong/src/plugins/bigyo_frequencyshifter/Bigyo_FrequencyShifter.cpp --- armstrong.old/src/plugins/bigyo_frequencyshifter/Bigyo_FrequencyShifter.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/bigyo_frequencyshifter/Bigyo_FrequencyShifter.cpp 2009-02-26 17:45:09.000000000 -0500 @@ -16,6 +16,7 @@ License along with this library; if not, Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #define _USE_MATH_DEFINES +#include #include #include #include diff -rupN armstrong.old/src/plugins/btdsys_ringmod/ringmod.cpp armstrong/src/plugins/btdsys_ringmod/ringmod.cpp --- armstrong.old/src/plugins/btdsys_ringmod/ringmod.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/btdsys_ringmod/ringmod.cpp 2009-02-26 17:47:29.000000000 -0500 @@ -27,7 +27,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - +#include #include #include diff -rupN armstrong.old/src/plugins/CyanPhase_DTMF-1/CyanPhase_DTMF-1.cpp armstrong/src/plugins/CyanPhase_DTMF-1/CyanPhase_DTMF-1.cpp --- armstrong.old/src/plugins/CyanPhase_DTMF-1/CyanPhase_DTMF-1.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/CyanPhase_DTMF-1/CyanPhase_DTMF-1.cpp 2009-02-26 17:39:51.000000000 -0500 @@ -4,7 +4,7 @@ // CyanPhase DTMF-1 // Copyright 2000 CyanPhase aka Edward L. Blake // Enjoy - +#include #include #include diff -rupN armstrong.old/src/plugins/Intoxicat_ACloud/Cloud.cpp armstrong/src/plugins/Intoxicat_ACloud/Cloud.cpp --- armstrong.old/src/plugins/Intoxicat_ACloud/Cloud.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/Intoxicat_ACloud/Cloud.cpp 2009-02-26 17:42:22.000000000 -0500 @@ -1,6 +1,6 @@ #include #include - +#include #include #include #include diff -rupN armstrong.old/src/plugins/jmmcd_Crossfade/crossfade.cpp armstrong/src/plugins/jmmcd_Crossfade/crossfade.cpp --- armstrong.old/src/plugins/jmmcd_Crossfade/crossfade.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/jmmcd_Crossfade/crossfade.cpp 2009-02-26 17:51:20.000000000 -0500 @@ -4,7 +4,7 @@ // Lots of code from BTDSys RingMod -- thanks! - +#include #include #include //#include "../buzz2zzub/mdk.h" diff -rupN armstrong.old/src/plugins/jmmcd_Note_Pool/jmmcd_Note_Pool.cpp armstrong/src/plugins/jmmcd_Note_Pool/jmmcd_Note_Pool.cpp --- armstrong.old/src/plugins/jmmcd_Note_Pool/jmmcd_Note_Pool.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/jmmcd_Note_Pool/jmmcd_Note_Pool.cpp 2009-02-26 17:52:03.000000000 -0500 @@ -6,7 +6,7 @@ // thanks to btdsys, 7900, and usr for answering questions, but especially btdsys // for making peerlib, without which this wouldn't be possible. - +#include #define MACHINE_NAME "Peer Note-Pool" #define AUTHOR "jmmcd" #define FULL_NAME AUTHOR " " MACHINE_NAME diff -rupN armstrong.old/src/plugins/ladspadapter/ladspadapter.cpp armstrong/src/plugins/ladspadapter/ladspadapter.cpp --- armstrong.old/src/plugins/ladspadapter/ladspadapter.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/ladspadapter/ladspadapter.cpp 2009-02-26 17:55:34.000000000 -0500 @@ -17,7 +17,7 @@ // ladspadapter allows running LADSPA plugins as zzub plugins - +#include #include #include #include "zzub/plugin.h" diff -rupN armstrong.old/src/plugins/ladspadapter/paramtools.h armstrong/src/plugins/ladspadapter/paramtools.h --- armstrong.old/src/plugins/ladspadapter/paramtools.h 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/ladspadapter/paramtools.h 2009-02-26 17:54:52.000000000 -0500 @@ -17,7 +17,7 @@ #if !defined(__LADSPA_PARAMTOOLS_H__) #define __LADSPA_PARAMTOOLS_H__ - +#include #include #include diff -rupN armstrong.old/src/plugins/lunar/pugxml.h armstrong/src/plugins/lunar/pugxml.h --- armstrong.old/src/plugins/lunar/pugxml.h 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/lunar/pugxml.h 2009-02-26 18:00:33.000000000 -0500 @@ -24,7 +24,7 @@ # endif #endif - +#include #define TCHAR char #define _T(x) x diff -rupN armstrong.old/src/plugins/zzub_miditracker/miditracker.cpp armstrong/src/plugins/zzub_miditracker/miditracker.cpp --- armstrong.old/src/plugins/zzub_miditracker/miditracker.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/zzub_miditracker/miditracker.cpp 2009-02-26 18:03:39.000000000 -0500 @@ -7,7 +7,7 @@ #include #include #include "miditracker.h" - +#include using namespace std; namespace miditracker { armstrong-size_t.patch: --- NEW FILE armstrong-size_t.patch --- diff -rupN armstrong.old/src/libzzub/ccm.cpp armstrong/src/libzzub/ccm.cpp --- armstrong.old/src/libzzub/ccm.cpp 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/ccm.cpp 2009-03-04 11:09:35.000000000 -0500 @@ -378,7 +378,7 @@ std::string paramtype_to_string(int para std::string id_from_ptr(const void *p) { char id[64]; - sprintf(id, "%x", p); + sprintf(id, "%p", p); return id; } diff -rupN armstrong.old/src/plugins/btdsys_ringmod/ringmod.cpp armstrong/src/plugins/btdsys_ringmod/ringmod.cpp --- armstrong.old/src/plugins/btdsys_ringmod/ringmod.cpp 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/btdsys_ringmod/ringmod.cpp 2009-03-04 11:09:35.000000000 -0500 @@ -324,7 +324,7 @@ void ringmod::command(const int i) "BTDSys RingMod v1.0\n" "?2002 Ed Powley (BTDSys)\n\n" "Comments/suggestions/bug reports to e at btd2001.freeserve.co.uk\n\n"); - sprintf(txt,"%s%i inputs", txt, Inputs.size()); + sprintf(txt,"%s%zi inputs", txt, Inputs.size()); for (int j=0; jregister_info(infos[i]); } - printf("ladspadapter: enumerated %i plugin(s).\n", infos.size()); + printf("ladspadapter: enumerated %zi plugin(s).\n", infos.size()); } // Called by the host upon song loading. If the collection diff -rupN armstrong.old/src/plugins/lunar/include/lunar/fx.h armstrong/src/plugins/lunar/include/lunar/fx.h --- armstrong.old/src/plugins/lunar/include/lunar/fx.h 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/lunar/include/lunar/fx.h 2009-03-04 11:10:37.000000000 -0500 @@ -12,7 +12,7 @@ extern "C" { // at build time stating the platform, // catch it here with an ifdef and have different // typedefs per platform. -#if defined(__X86_64__) || defined(CONFIG_X86_64) || defined(__APPLE__) +#if defined(__X86_64__) || defined(CONFIG_X86_64) || defined(__APPLE__) || defined(__powerpc64__) typedef long unsigned int lunar_size_t; #else typedef unsigned int lunar_size_t; armstrong-sonamefix.patch: --- NEW FILE armstrong-sonamefix.patch --- diff -rupN armstrong.old/src/libzzub/SConscript armstrong/src/libzzub/SConscript --- armstrong.old/src/libzzub/SConscript 2009-02-26 23:27:36.000000000 -0500 +++ armstrong/src/libzzub/SConscript 2009-02-26 23:25:18.000000000 -0500 @@ -151,6 +151,10 @@ if posix: localenv.Append(LIBS=[ 'asound', ]) localenv.Append(CCFLAGS=[ '-DPMALSA', ]) + localenv.Append(LINKFLAGS=[ + '-Wl,-soname,libzzub.so.0' + ]) + elif win32: if cl: localenv.Append(LIBS=[ diff -rupN armstrong.old/src/plugins/lunar/SConscript armstrong/src/plugins/lunar/SConscript --- armstrong.old/src/plugins/lunar/SConscript 2009-02-26 23:29:42.000000000 -0500 +++ armstrong/src/plugins/lunar/SConscript 2009-02-26 23:25:18.000000000 -0500 @@ -28,13 +28,21 @@ import os if pluginenv["LUNAR"] == True: lunarstdenv = env.Copy() + shlibsuffix = lunarstdenv['SHLIBSUFFIX'] + lunarstdenv['SHLIBSUFFIX'] += '.0' + lunarstdenv.Append(LINKFLAGS=[ + '-Wl,-soname,liblunarstd.so.0' + ]) lunarstdfiles = [ 'lunarstd.cpp', ] if win32: lunarstdfiles.append('lunarstd.def') lunarstd = lunarstdenv.SharedLibrary('${LIB_BUILD_PATH}/lunarstd', lunarstdfiles)[0] - install_lib(lunarstd) + installed_lunarstd = install_lib(lunarstd) + symlinkcmd = 'cd $TARGET.dir && rm -f $TARGET.name && ln -s $SOURCE.name $TARGET.name' + lunarstdenv.Command('${LIB_BUILD_PATH}/liblunarstd'+shlibsuffix, lunarstd, symlinkcmd) + lunarstdenv.Command('${DESTDIR}${PREFIX}${LIBDIR}/liblunarstd'+shlibsuffix, installed_lunarstd, symlinkcmd) pluginenv.Append(LIBS=[ 'lunarstd' armstrong-use-system-libs.patch: --- NEW FILE armstrong-use-system-libs.patch --- diff -rupN armstrong.old/src/libzzub/ccm.cpp armstrong/src/libzzub/ccm.cpp --- armstrong.old/src/libzzub/ccm.cpp 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/ccm.cpp 2009-02-26 23:33:28.000000000 -0500 @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fi #include #include #include -#include "../minizip/unzip.h" -#include "../minizip/zip.h" +#include +#include #include "FLAC/all.h" #include "ccm.h" @@ -1049,7 +1049,7 @@ bool CcmWriter::save(std::string fileNam } -static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) { +static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) { zzub::outstream* writer=(zzub::outstream*)client_data; writer->write((void*)buffer, sizeof(FLAC__byte)*bytes); @@ -1086,7 +1086,7 @@ struct DecoderInfo { // buffer can hold. The callback may choose to supply less data and modify the byte count // but must be careful not to overflow the buffer. The callback then returns a status code // chosen from FLAC__StreamDecoderReadStatus. -static FLAC__StreamDecoderReadStatus flac_stream_decoder_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) { +static FLAC__StreamDecoderReadStatus flac_stream_decoder_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) { DecoderInfo* info = (DecoderInfo*)client_data; if (info->reader->position() >= info->reader->size()-1) return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM; @@ -1139,19 +1139,20 @@ void flac_stream_decoder_error_callback( void decodeFLAC(zzub::instream* reader, zzub::player& player, int wave, int level) { FLAC__StreamDecoder* stream=FLAC__stream_decoder_new(); - FLAC__stream_decoder_set_read_callback(stream, flac_stream_decoder_read_callback); - FLAC__stream_decoder_set_write_callback(stream, flac_stream_decoder_write_callback); - FLAC__stream_decoder_set_metadata_callback(stream, flac_stream_decoder_metadata_callback); - FLAC__stream_decoder_set_error_callback(stream, flac_stream_decoder_error_callback); DecoderInfo decoder_info; decoder_info.reader = reader; - FLAC__stream_decoder_set_client_data(stream, &decoder_info); // we're not intersted in meitadeita FLAC__stream_decoder_set_metadata_ignore_all(stream); - FLAC__stream_decoder_init(stream); + FLAC__stream_decoder_init_stream(stream, + flac_stream_decoder_read_callback, + NULL, NULL, NULL, NULL, + flac_stream_decoder_write_callback, + flac_stream_decoder_metadata_callback, + flac_stream_decoder_error_callback, + &decoder_info); // FLAC__stream_decoder_process_single(stream); FLAC__stream_decoder_process_until_end_of_stream(stream); @@ -1216,11 +1217,12 @@ bool encodeFLAC(zzub::outstream* writer, FLAC__stream_encoder_set_bits_per_sample(stream, bps); FLAC__stream_encoder_set_sample_rate(stream, sample_rate); FLAC__stream_encoder_set_total_samples_estimate(stream, num_samples); - FLAC__stream_encoder_set_write_callback(stream, flac_stream_encoder_write_callback); - FLAC__stream_encoder_set_metadata_callback(stream, flac_stream_encoder_metadata_callback); - FLAC__stream_encoder_set_client_data(stream, writer); + int result = FLAC__stream_encoder_init_stream(stream, + flac_stream_encoder_write_callback, + NULL, + NULL, + flac_stream_encoder_metadata_callback, writer); - int result = FLAC__stream_encoder_init(stream); // if this fails, we want it to crash hard - or else will cause dataloss assert(result == FLAC__STREAM_ENCODER_OK); diff -rupN armstrong.old/src/libzzub/ccm.h armstrong/src/libzzub/ccm.h --- armstrong.old/src/libzzub/ccm.h 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/ccm.h 2009-02-26 23:33:28.000000000 -0500 @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fi #pragma once -#include "../minizip/unzip.h" -#include "../minizip/zip.h" +#include +#include #include "pugixml.hpp" diff -rupN armstrong.old/src/libzzub/SConscript armstrong/src/libzzub/SConscript --- armstrong.old/src/libzzub/SConscript 2009-01-09 16:17:44.000000000 -0500 +++ armstrong/src/libzzub/SConscript 2009-02-26 23:34:07.000000000 -0500 @@ -57,24 +57,15 @@ files = [ 'thread_id.cpp', ] -# we build from our private flac, -# since some are using 1.1.3, and that -# one breaks a few things. +# use internal flac support +localenv.ParseConfig('pkg-config --libs flac') + +# minizip, zlib and flac dependencies +localenv.ParseConfig('pkg-config --libs minizip') localenv.Append(CPPPATH=[ - "${ROOTPATH}/src/flac/include" + '${PREFIX}/include/minizip' ]) -localenv.Append(CCFLAGS=[ - '-DFLAC__NO_DLL', -]) -env.SConscript("${ROOTPATH}/src/flac/src/libFLAC/SConscript") -# minizip, zlib and flac dependencies -files += [ - '${MINIZIP_SRC_PATH}/ioapi.c', - '${MINIZIP_SRC_PATH}/mztools.c', - '${MINIZIP_SRC_PATH}/unzip.c', - '${MINIZIP_SRC_PATH}/zip.c', -] if win32: # build from our private zlib localenv.Append(CPPPATH=["${ROOTPATH}/src/zlib"]) @@ -90,8 +81,10 @@ if mac: ]) localenv.Append(LIBS=[ - 'FLAC', 'z', + 'c', + 'portmidi', + 'porttime', ]) localenv.Append(CCFLAGS=['-D_LIB','-D_LIBZZUB']) @@ -126,19 +119,7 @@ if localenv['SNDFILE']: ]) if localenv['RUBBERBAND']: - localenv.SConscript('../rubberband/SConscript') - localenv.Append(LIBS=[ - 'rubberband_static', - 'fftw3', - 'samplerate', - 'fftw3f', - ]) - localenv.Append(CPPPATH=[ - '../rubberband', - ]) - localenv.Append(CCFLAGS=[ - '-DUSE_RUBBERBAND', - ]) + localenv.ParseConfig('pkg-config --libs rubberband') if localenv['BUZZ2ZZUB'] == True: localenv.Append(CCFLAGS=[ @@ -146,25 +127,11 @@ if localenv['BUZZ2ZZUB'] == True: ]) # portmidi support -localenv.Append(CPPPATH=[ - '${PORTMIDI_SRC_PATH}/pm_common', - '${PORTMIDI_SRC_PATH}/porttime' -]) if posix: # porttime and portmidi - files += [ - '${PORTMIDI_SRC_PATH}/porttime/porttime.c', - '${PORTMIDI_SRC_PATH}/pm_common/pmutil.c', - '${PORTMIDI_SRC_PATH}/pm_common/portmidi.c', - ] - + if localenv['COREAUDIO'] == True: - files += [ - '${PORTMIDI_SRC_PATH}/pm_mac/pmmac.c', - '${PORTMIDI_SRC_PATH}/pm_mac/pmmacosxcm.c', - '${PORTMIDI_SRC_PATH}/porttime/ptmacosx_cf.c', - ] localenv.Append(LINKFLAGS=[ '-framework', 'CoreMIDI', '-framework', 'CoreFoundation', @@ -175,16 +142,12 @@ if posix: '-DNEWBUFFER' ]) else: - files += [ - '${PORTMIDI_SRC_PATH}/porttime/ptlinux.c', - '${PORTMIDI_SRC_PATH}/pm_linux/pmlinux.c', - ] localenv.Append(CCFLAGS=[ '-DPM_CHECK_ERRORS', '-DNEWBUFFER' ]) if localenv["ALSA"] == True: - files += [ '${PORTMIDI_SRC_PATH}/pm_linux/pmlinuxalsa.c' ] + #files += [ '${PORTMIDI_SRC_PATH}/pm_linux/pmlinuxalsa.c' ] localenv.Append(LIBS=[ 'asound', ]) localenv.Append(CCFLAGS=[ '-DPMALSA', ]) @@ -326,26 +289,14 @@ if localenv['AUDIOENGINE'] == 'rtaudio': '-DUSE_RTAUDIO', ]) - localenv.SConscript('../rtaudio/SConscript') localenv.Append(LIBS=[ - 'rtaudio_static', + 'rtaudio', ]) + localenv.Append(CPPPATH=[ - '../rtaudio', + '${PREFIX}/include', ]) - if env['MP3'] == True: - localenv.SConscript('../libmad/SConscript') - localenv.Append(LIBS=[ - 'libmad_static', - ]) - localenv.Append(CPPPATH=[ - '../libmad', - ]) - localenv.Append(CCFLAGS=[ - '-DUSE_LIBMAD', - ]) - if win32: localenv.Append(CCFLAGS=[ '-D__WINDOWS_ASIO__', @@ -373,6 +324,7 @@ if localenv['AUDIOENGINE'] == 'rtaudio': localenv.Append(LIBS=[ 'pthread', 'm', + 'rtaudio', ]) ####################################### diff -rupN armstrong.old/src/plugins/lunar/SConscript armstrong/src/plugins/lunar/SConscript --- armstrong.old/src/plugins/lunar/SConscript 2009-01-09 16:17:45.000000000 -0500 +++ armstrong/src/plugins/lunar/SConscript 2009-02-26 23:35:01.000000000 -0500 @@ -57,8 +57,8 @@ if pluginenv["LUNAR"] == True: pluginenv['LIB_COMPAT'], ]) pluginenv.Append(CCFLAGS=[ - '-DZZUB_SHARE_DIR_PATH="\\"%s\\""' % str(pluginenv.Dir("${DESTDIR}${PREFIX}/share/zzub")), - '-DZZUB_LIB_DIR_PATH="\\"%s\\""' % str(pluginenv.Dir("${DESTDIR}${PREFIX}${LIBDIR}/zzub")), + '-DZZUB_SHARE_DIR_PATH="\\"%s\\""' % str(pluginenv.Dir("${PREFIX}/share/zzub")), + '-DZZUB_LIB_DIR_PATH="\\"%s\\""' % str(pluginenv.Dir("${PREFIX}${LIBDIR}/zzub")), '-DSHLIBSUFFIX="\\"%s\\""' % pluginenv['SHLIBSUFFIX'], '-DUSE_LUNAR', ]) diff -rupN armstrong.old/src/plugins/zzub_stream/SConscript armstrong/src/plugins/zzub_stream/SConscript --- armstrong.old/src/plugins/zzub_stream/SConscript 2009-02-25 00:50:05.000000000 -0500 +++ armstrong/src/plugins/zzub_stream/SConscript 2009-02-26 23:33:28.000000000 -0500 @@ -22,8 +22,8 @@ Import('pluginenv', 'build_plugin', 'win if pluginenv['ZZUB_STREAM']: # make sure libmad.lib is in - pluginenv.Append(LIBS = [ "libmad_static", "sndfile" ] ); - pluginenv.Append(CPPPATH = [ "../../libmad", "resampler" ] ); + pluginenv.Append(LIBS = [ "sndfile" ] ); + pluginenv.Append(CPPPATH = [ "${PREFIX}/include", "resampler" ] ); build_plugin(pluginenv, 'zzub_stream', files=[ 'main.cpp', --- NEW FILE armstrong.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: armstrong Version: 0.2.6 Release: 4%{?dist} Summary: Powerful music sequencing library Group: System Environment/Libraries # src/plugins/Geonik is GPL+ # src/plugins/fft is BSD # src/plugins/btdsys_ringmod is BSD # src/plugins/firesledge_parameq is LGPLv2+ # src/plugins/zzub_stream/resampler is LGPLv2+ # src/plugins/bigyo_frequencyshifter is LGPLv2+ # src/plugins/buzz2zzub is LGPLv2+ and GPLv2+ # src/plugins/graue_softsat is Public Domain # src/plugins/zzub_stream is LGPLv2+ # The core part of the library is LGPLv2+ # The rest is GPL+ or GPLv2+ License: GPLv2+ and GPL+ and BSD and LGPLv2+ URL: http://code.google.com/p/armstrong/ # The original source tarball # http://armstrong.googlecode.com/files/armstrong-0.2.6.tar.gz # contains libmad, which is a MP3 decoder/encoder, that cannot be # included in Fedora because it is patent encumbered. We remove # src/libmad # src/plugins/zzub_stream/stream_mp3.* # from the tarball and remove the MP3 related bits from # src/libzzub/import.h # src/libzzub/player.cpp # src/plugins/zzub_stream/main.h # src/plugins/zzub_stream/SConscript # and we also remove a directory that has some proprietary code # src/rtaudio/include # to produce the following file: Source0: %{name}-%{version}-fe.tar.gz # Fix build issues (optflags, drop sse optimizations). Also # disable compilation of ccmplayer, which is not ready for # this release # Since these (except the last one) are Fedora-specific, and ccmplayer # non-compilation is very obivous, they are not sent upstream. Patch0: armstrong-buildfix.patch # armstrong comes with bunch of libraries built in statically # we modify the sources to link to system libraries # http://bitbucket.org/paniq/armstrong/issue/6/link-armstrong-to-internal-libraries Patch1: armstrong-use-system-libs.patch # Fix gcc-4.4 issues # http://bitbucket.org/paniq/armstrong/issue/7/build-with-gcc-44 Patch2: armstrong-gcc44.patch # Fix size_t issues for 64bit systems and maybe others # http://bitbucket.org/paniq/armstrong/issue/8/size_t-issue Patch3: armstrong-size_t.patch # Build shared libraries with proper sonames # http://bitbucket.org/paniq/armstrong/issue/9/build-libraries-with-sonames Patch4: armstrong-sonamefix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel boost-devel doxygen epydoc fftw-devel flac-devel BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel libsndfile-devel BuildRequires: minizip-devel portaudio-devel portmidi-devel python-setuptools-devel BuildRequires: rtaudio-static rubberband-devel scons zlib-devel Obsoletes: libzzub <= 0.2.5 Provides: libzzub = %{version}-%{release} %description If you are searching for a foundation for your next soundtracker, armstrong is what you want. armstrong provides an extensible DSP plugin system, a wavetable, instruments, a multitrack sequencer and support for major soundcard APIs. armstrong includes zzub and lunar libraries. %package devel Summary: Development files for %{name} Group: Development/Libraries License: GPLv2+ Requires: %{name} = %{version}-%{release} Obsoletes: libzzub-devel <= 0.2.5 Provides: libzzub-devel = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications and plugins that use %{name}. %package -n pyzzub Summary: Python Bindings For libzzub Group: System Environment/Libraries License: GPLv2+ Requires: %{name} = %{version}-%{release} %description -n pyzzub These are the Python bindings for armstrong, allowing you to use it from within Python scripts. %prep %setup -q -n %{name} %patch0 -p1 -b .buildfix %patch1 -p1 -b .internallibs %patch2 -p1 -b .gcc44 %patch3 -p1 -b .size_t %patch4 -p1 -b .soname # Remove the binded libraries. We'll use the system-wide ones pushd src rm -fr libsndfile flac rubberband zlib bmp-ccm \ portmidi portaudio rtaudio minizip popd # Remove the precompiled binaries for ext in aps bc dll exe lib ncb zip; do find . -name "*.$ext" | xargs rm -f -- || : done # There are many source files with wrong permissions and EOL encodings. Fix these pushd src/plugins for ext in cpp h hpp; do find . -name "*.$ext" \ -exec chmod 0644 '{}' \; \ -exec sed -i "s|\r||" '{}' \; done popd # Fix the encoding issues with text files for ext in txt ini; do for file in $(find . -name "*.$ext"); do sed 's|\r||' $file > tmpfile iconv --from-code=ISO-8859-1 --to-code=UTF-8 tmpfile > tmpfile2 touch -r $file tmpfile2 mv -f tmpfile2 $file done done %build scons configure \ PREFIX=%{_prefix} \ LIBDIR=/%{_lib} \ CCFLAGS="%{optflags}" \ CXXFLAGS="%{optflags}" \ optflags="%{optflags}" \ MP3="False" scons %{?_smp_mflags} # Build the documentation: # (REMINDER: There is an incomplete docbook documentation that we might want # to replace with the doxygen documentation in a future release) pushd share/doc ./make_pyzzub_doc mv pyzzub html doxygen libzzub.dox doxygen libzzub-cpp.dox doxygen libzzub-plugin.dox popd %install rm -rf $RPM_BUILD_ROOT scons install DESTDIR=$RPM_BUILD_ROOT # signature.h differs per build host, circumvent multiarch conflicts mv $RPM_BUILD_ROOT%{_includedir}/zzub/signature.h \ %ifarch x86_64 ppc64 $RPM_BUILD_ROOT%{_includedir}/zzub/signature-64.h %else $RPM_BUILD_ROOT%{_includedir}/zzub/signature-32.h %endif cat > $RPM_BUILD_ROOT%{_includedir}/zzub/signature.h << EOF #include #if __WORDSIZE == 32 #include "signature-32.h" #elseif __WORDSIZE == 64 #include "signature-64.h" #else #error "Unknown word size" #endif EOF # We want to install docs to the proper location: mkdir -p installed_docs mv $RPM_BUILD_ROOT%{_docdir}/zzub/* installed_docs/ # Collect the doc files scattered around the source tree: cp -a CREDITS.txt ChangeLog LICENCE installed_docs/ cp -a share/zzub installed_docs/ mkdir -p installed_docs/plugins/lad2zzub cp -a src/plugins/lad2zzub/gpl.txt installed_docs/plugins/lad2zzub/ mkdir -p installed_docs/plugins/Geonik cp -a src/plugins/Geonik/readme.txt installed_docs/plugins/Geonik/ mkdir -p installed_docs/plugins/buzz2zzub cp -a src/plugins/buzz2zzub/buzz2zzub.ini installed_docs/plugins/buzz2zzub mkdir -p installed_docs/plugins/jmmcd_Note_Pool cp -a src/plugins/jmmcd_Note_Pool/{index.html,note-pool-test.ccm} installed_docs/plugins/jmmcd_Note_Pool mkdir -p installed_docs/plugins/Intoxicat_ACloud cp -a src/plugins/Intoxicat_ACloud/Intoxicat\ ACloud.htm installed_docs/plugins/Intoxicat_ACloud mkdir -p installed_docs/plugins/fft cp -a src/plugins/fft/{test/tailscrap.m,CHANGELOG,COPYING,TIPS,README} installed_docs/plugins/fft mkdir -p installed_docs/plugins/MadBrain_Dynamite6 cp -a src/plugins/MadBrain_Dynamite6/MadBrains_Dynamite6*.{bmx,prs} installed_docs/plugins/MadBrain_Dynamite6 mkdir -p installed_docs/plugins/CyanPhase_DTMF-1 cp -a src/plugins/CyanPhase_DTMF-1/CyanPhase_DTMF-1.{txt,bmx} installed_docs/plugins/CyanPhase_DTMF-1 cp -a src/plugins/firesledge_parameq/license.txt installed_docs/plugins/firesledge_parameq mkdir -p installed_docs/plugins/fsm_infector/ cp -a src/plugins/fsm_infector/todo.txt installed_docs/plugins/fsm_infector/ mkdir -p installed_docs/plugins/psy2zzub cp -a src/plugins/psy2zzub/gpl.txt installed_docs/plugins/psy2zzub mkdir -p installed_docs/plugins/matilde_tracker cp -a src/plugins/matilde_tracker/Matilde\ Tracker.html installed_docs/plugins/matilde_tracker mkdir -p installed_docs/plugins/zzub_stream/resampler cp -a src/plugins/zzub_stream/resampler/{license,readme}.txt installed_docs/plugins/zzub_stream/resampler mkdir -p installed_docs/plugins/dssidapter cp -a src/plugins/dssidapter/README.txt installed_docs/plugins/dssidapter mkdir -p installed_docs/plugins/zzub_module cp -a src/plugins/zzub_module/libmodfile/readme.txt installed_docs/plugins/zzub_module cp -a src/plugins/green_milk/{about_te.bin,LICENSE} installed_docs/plugins/green_milk mkdir -p installed_docs/plugins/Elenzil_Modulator cp -a src/plugins/Elenzil_Modulator/elenziltest.bmx installed_docs/plugins/Elenzil_Modulator # Remove the shebang from the python library sed -i '\|^#!/usr/bin/env python|d' $RPM_BUILD_ROOT%{python_sitelib}/zzub/__init__.py # Install the python egg properly pushd src/pyzzub python -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT popd %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc installed_docs/* %{_libdir}/*.so.* %{_libdir}/zzub %{_libdir}/lunar %files devel %defattr(-,root,root,-) %doc share/doc/zzub/api* %{_includedir}/* %{_libdir}/*.so %files -n pyzzub %defattr(-,root,root,-) %doc src/pyzzub/testzzub.py share/doc/html %{python_sitelib}/* %changelog * Thu Mar 05 2009 Orcan Ogetbil 0.2.6-4 - Update the size_t patch to fix compilation on ppc64 - Remove some proprietary code from the tarball (src/rtaudio/include) * Sat Feb 28 2009 Orcan Ogetbil 0.2.6-3 - License for -devel and pyzzub packages is GPLv2+ - Clarify system-wide library usage - Fix sonames - Don't package the empty directory %%_defaultdocdir/zzub * Fri Feb 27 2009 Orcan Ogetbil 0.2.6-2 - BR: rtaudio-static instead of rtaudio-devel * Fri Feb 27 2009 Orcan Ogetbil 0.2.6-1 - name changed from libzzub to armstrong - update to 0.2.6 * Wed Jan 7 2009 Caol??n McNamara - 0.2.3-14 - defuzz patches and extend buildfix to get building again * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.2.3-13 - Rebuild for Python 2.6 * Sun Mar 2 2008 Alexander Kahl - 0.2.3-12 - patch for missing explicit gcc 4.3 includes - pyzzub %%files also seizes the python egg now * Mon Feb 18 2008 Fedora Release Engineering - 0.2.3-11 - Autorebuild for GCC 4.3 * Tue Nov 20 2007 Alexander Kahl - 0.2.3-10 - updated buildfix patch to drop explicit sse optimizations - removed JOBS option again since scons supports -j build option * Thu Oct 25 2007 Alexander Kahl - 0.2.3-9 - fixed multiarch conflict * Thu Sep 20 2007 Alexander Kahl - 0.2.3-8 - included patch to install missing documentation to the right place - removed move macro instead - moved all plugin files *.{cpp,h,xml} back to get the lunar plugin loading right * Mon Sep 17 2007 Alexander Kahl - 0.2.3-7 - re-added pyzzub python-devel build requirement - explicitly nailed the name of pyzzub * Mon Sep 17 2007 Alexander Kahl - 0.2.3-6 - added pyzzub as an internal extra package * Thu Sep 13 2007 Alexander Kahl - 0.2.3-5 - removed redundant explicit flac requirement * Mon Sep 10 2007 Alexander Kahl - 0.2.3-4 - fixed double source definition - adapted modified source tarball w/ mp3 support removed - added patch to use internal flac support - removed INSTALL from %%doc - removed explicit python requirement - replaced static rm commands with macros * Mon Sep 10 2007 Alexander Kahl - 0.2.3-3 - fixed redundant dependencies - replaced occurence of /usr with prefix macro - removed manual stripping of binaries - fixed directory ownership issue - fixed encoding of CREDITS file - excluded arch ppc64 due to build failure - replaced all space occurences with tabs * Mon Sep 3 2007 Alexander Kahl - 0.2.3-2 - added flag to remove mp3 support * Sun Sep 2 2007 Alexander Kahl - 0.2.3-1 - initial release --- NEW FILE import.log --- armstrong-0_2_6-4_fc10:F-10:armstrong-0.2.6-4.fc10.src.rpm:1236290556 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/armstrong/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:18:12 -0000 1.1 +++ .cvsignore 5 Mar 2009 22:03:34 -0000 1.2 @@ -0,0 +1 @@ +armstrong-0.2.6-fe.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/armstrong/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:18:12 -0000 1.1 +++ sources 5 Mar 2009 22:03:34 -0000 1.2 @@ -0,0 +1 @@ +fde539f563b85cc73077924f146c9135 armstrong-0.2.6-fe.tar.gz From eponyme at fedoraproject.org Thu Mar 5 22:09:50 2009 From: eponyme at fedoraproject.org (Nicoleau Fabien) Date: Thu, 5 Mar 2009 22:09:50 +0000 (UTC) Subject: rpms/qdevelop/devel .cvsignore, 1.3, 1.4 qdevelop.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <20090305220950.6201D70116@cvs1.fedora.phx.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/qdevelop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1260 Modified Files: .cvsignore qdevelop.spec sources Log Message: Update to 0.27.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qdevelop/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Feb 2009 20:16:25 -0000 1.3 +++ .cvsignore 5 Mar 2009 22:09:19 -0000 1.4 @@ -1 +1 @@ -qdevelop-0.27.2.tar.gz +qdevelop-0.27.4.tar.gz Index: qdevelop.spec =================================================================== RCS file: /cvs/pkgs/rpms/qdevelop/devel/qdevelop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qdevelop.spec 28 Feb 2009 18:16:24 -0000 1.5 +++ qdevelop.spec 5 Mar 2009 22:09:19 -0000 1.6 @@ -1,6 +1,6 @@ Name: qdevelop -Version: 0.27.2 -Release: 2%{?dist} +Version: 0.27.4 +Release: 1%{?dist} Summary: Development environment dedicated to Qt4 Group: Development/Tools @@ -55,6 +55,8 @@ %changelog +* Thu Mar 5 2009 Nicoleau Fabien - 0.27.4-1 +- Rebuild for 0.27.4 * Sat Feb 28 2009 Nicoleau Fabien - 0.27.2-2 - Fix desktop file * Fri Feb 27 2009 Nicoleau Fabien - 0.27.2-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qdevelop/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Feb 2009 20:16:25 -0000 1.3 +++ sources 5 Mar 2009 22:09:20 -0000 1.4 @@ -1 +1 @@ -7874ce0cd271027d38094b5ed6de6cbd qdevelop-0.27.2.tar.gz +0ea8b3b2ed15bfa275d5c03f40cb871b qdevelop-0.27.4.tar.gz From eponyme at fedoraproject.org Thu Mar 5 22:12:26 2009 From: eponyme at fedoraproject.org (Nicoleau Fabien) Date: Thu, 5 Mar 2009 22:12:26 +0000 (UTC) Subject: rpms/qdevelop/F-10 .cvsignore, 1.3, 1.4 qdevelop.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <20090305221226.8DFC970116@cvs1.fedora.phx.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/qdevelop/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1751 Modified Files: .cvsignore qdevelop.spec sources Log Message: Update to 0.27.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qdevelop/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Feb 2009 20:20:15 -0000 1.3 +++ .cvsignore 5 Mar 2009 22:11:56 -0000 1.4 @@ -1 +1 @@ -qdevelop-0.27.2.tar.gz +qdevelop-0.27.4.tar.gz Index: qdevelop.spec =================================================================== RCS file: /cvs/pkgs/rpms/qdevelop/F-10/qdevelop.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qdevelop.spec 28 Feb 2009 18:21:17 -0000 1.4 +++ qdevelop.spec 5 Mar 2009 22:11:56 -0000 1.5 @@ -1,6 +1,6 @@ Name: qdevelop -Version: 0.27.2 -Release: 2%{?dist} +Version: 0.27.4 +Release: 1%{?dist} Summary: Development environment dedicated to Qt4 Group: Development/Tools @@ -55,6 +55,8 @@ %changelog +* Thu Mar 5 2009 Nicoleau Fabien - 0.27.4-1 +- Rebuild for 0.27.4 * Sat Feb 28 2009 Nicoleau Fabien - 0.27.2-2 - Fix desktop file * Fri Feb 27 2009 Nicoleau Fabien - 0.27.2-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qdevelop/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Feb 2009 20:20:15 -0000 1.3 +++ sources 5 Mar 2009 22:11:56 -0000 1.4 @@ -1 +1 @@ -7874ce0cd271027d38094b5ed6de6cbd qdevelop-0.27.2.tar.gz +0ea8b3b2ed15bfa275d5c03f40cb871b qdevelop-0.27.4.tar.gz From pkgdb at fedoraproject.org Thu Mar 5 22:14:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 22:14:00 +0000 Subject: [pkgdb] uml_utilities: chkr has requested watchbugzilla Message-ID: <20090305221400.E368520820B@bastion.fedora.phx.redhat.com> chkr has requested the watchbugzilla acl on uml_utilities (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From pkgdb at fedoraproject.org Thu Mar 5 22:14:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 22:14:02 +0000 Subject: [pkgdb] uml_utilities: chkr has requested commit Message-ID: <20090305221401.96F22208544@bastion.fedora.phx.redhat.com> chkr has requested the commit acl on uml_utilities (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From pkgdb at fedoraproject.org Thu Mar 5 22:14:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 05 Mar 2009 22:14:14 +0000 Subject: [pkgdb] uml_utilities: chkr has requested watchcommits Message-ID: <20090305221415.3877620820B@bastion.fedora.phx.redhat.com> chkr has requested the watchcommits acl on uml_utilities (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From eponyme at fedoraproject.org Thu Mar 5 22:14:16 2009 From: eponyme at fedoraproject.org (Nicoleau Fabien) Date: Thu, 5 Mar 2009 22:14:16 +0000 (UTC) Subject: rpms/qdevelop/F-9 .cvsignore, 1.3, 1.4 qdevelop.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <20090305221416.D79E870116@cvs1.fedora.phx.redhat.com> Author: eponyme Update of /cvs/pkgs/rpms/qdevelop/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2121 Modified Files: .cvsignore qdevelop.spec sources Log Message: Update to 0.27.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qdevelop/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Feb 2009 20:22:45 -0000 1.3 +++ .cvsignore 5 Mar 2009 22:13:46 -0000 1.4 @@ -1 +1 @@ -qdevelop-0.27.2.tar.gz +qdevelop-0.27.4.tar.gz Index: qdevelop.spec =================================================================== RCS file: /cvs/pkgs/rpms/qdevelop/F-9/qdevelop.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qdevelop.spec 28 Feb 2009 18:23:15 -0000 1.4 +++ qdevelop.spec 5 Mar 2009 22:13:46 -0000 1.5 @@ -1,6 +1,6 @@ Name: qdevelop -Version: 0.27.2 -Release: 2%{?dist} +Version: 0.27.4 +Release: 1%{?dist} Summary: Development environment dedicated to Qt4 Group: Development/Tools @@ -55,6 +55,8 @@ %changelog +* Thu Mar 5 2009 Nicoleau Fabien - 0.27.4-1 +- Rebuild for 0.27.4 * Sat Feb 28 2009 Nicoleau Fabien - 0.27.2-2 - Fix desktop file * Fri Feb 27 2009 Nicoleau Fabien - 0.27.2-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qdevelop/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Feb 2009 20:22:45 -0000 1.3 +++ sources 5 Mar 2009 22:13:46 -0000 1.4 @@ -1 +1 @@ -7874ce0cd271027d38094b5ed6de6cbd qdevelop-0.27.2.tar.gz +0ea8b3b2ed15bfa275d5c03f40cb871b qdevelop-0.27.4.tar.gz From maxamillion at fedoraproject.org Thu Mar 5 22:18:43 2009 From: maxamillion at fedoraproject.org (Adam Miller) Date: Thu, 5 Mar 2009 22:18:43 +0000 (UTC) Subject: rpms/dc3dd/F-10 dc3dd.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305221843.4D85C70116@cvs1.fedora.phx.redhat.com> Author: maxamillion Update of /cvs/extras/rpms/dc3dd/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2987/F-10 Modified Files: .cvsignore sources Added Files: dc3dd.spec import.log Log Message: Initial cvs-import of dc3dd package. --- NEW FILE dc3dd.spec --- Name: dc3dd Version: 6.12.2 Release: 3%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors License: GPLv2+ and GPLv3+ URL: http://dc3dd.sourceforge.net/ Source0: http://master.dl.sourceforge.net/dc3dd/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gettext %description dc3dd is a patched version of GNU dd to include a number of features useful for computer forensics. Many of these features were inspired by dcfldd, but were rewritten for dc3dd. * Pattern writes. The program can write a single hexadecimal value or a text string to the output device for wiping purposes. * Piecewise and overall hashing with multiple algorithms and variable size windows. Supports MD5, SHA-1, SHA-256, and SHA-512. Hashes can be computed before or after conversions are made. * Progress meter with automatic input/output file size probing * Combined log for hashes and errors * Error grouping. Produces one error message for identical sequential errors * Verify mode. Able to repeat any transformations done to the input file and compare it to an output. * Ability to split the output into chunks with numerical or alphabetic extensions %prep %setup -q for file in README Sample_Commands.txt Options_Reference.txt; do sed 's|\r||' $file > $file.tmp touch -r $file $file.tmp mv -f $file.tmp $file done rm po/*.gmo %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc ABOUT-NLS AUTHORS COPYING ChangeLog README README.coreutils THANKS THANKS-to-translators TODO Sample_Commands.txt NEWS Options_Reference.txt %{_bindir}/%{name} %{_mandir}/man1/%{name}.* %changelog * Thu Mar 05 2009 Adam Miller - 6.12.2-3 - Cleaned up the .spec by looping through files needing EOF encoding fix * Mon Mar 02 2009 Adam Miller - 6.12.2-2 - Removed .gmo binaries, fixed source0, added doc items, fixed EOF encoding - fixed licencing listing * Mon Feb 23 2009 Adam Miller - 6.12.2-1 - First build of dc3dd for fedora --- NEW FILE import.log --- dc3dd-6_12_2-3:F-10:dc3dd-6.12.2-3.src.rpm:1236291330 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dc3dd/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:24:27 -0000 1.1 +++ .cvsignore 5 Mar 2009 22:18:12 -0000 1.2 @@ -0,0 +1 @@ +dc3dd-6.12.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/dc3dd/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:24:27 -0000 1.1 +++ sources 5 Mar 2009 22:18:12 -0000 1.2 @@ -0,0 +1 @@ +97cc4421e18156890d53803cacf9180c dc3dd-6.12.2.tar.gz From cebbert at fedoraproject.org Thu Mar 5 22:23:00 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Thu, 5 Mar 2009 22:23:00 +0000 (UTC) Subject: rpms/kernel/F-10 linux-2.6-libata-make-sure-port-is-thawed.patch, NONE, 1.1.2.1 TODO, 1.46.2.4, 1.46.2.5 kernel.spec, 1.1206.2.39, 1.1206.2.40 Message-ID: <20090305222300.6394D70116@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3676 Modified Files: Tag: private-fedora-10-2_6_27 TODO kernel.spec Added Files: Tag: private-fedora-10-2_6_27 linux-2.6-libata-make-sure-port-is-thawed.patch Log Message: Fix endless error message spew from sata_nv in 2.6.27.19 (#488371) linux-2.6-libata-make-sure-port-is-thawed.patch: --- NEW FILE linux-2.6-libata-make-sure-port-is-thawed.patch --- From: Tejun Heo Date: Wed, 4 Mar 2009 06:59:30 +0000 (+0900) Subject: libata: make sure port is thawed when skipping resets X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjgarzik%2Flibata-dev.git;a=commitdiff_plain;h=d6515e6ff4ad3db4bd5ef2dd4e1026a7aca2482e libata: make sure port is thawed when skipping resets When SCR access is available and the link is offline, softreset is skipped as it only wastes time and some controllers don't respond very well. However, the skip path forgot to thaw the port, which not only blocks further event notification from the port but also causes repeated EH invocations on the same event on drivers which rely on ->thaw() to clear events if the IRQ is shared with another device or port. This problem has always been there but is uncovered by recent sata_nv nf2/3 change which dropped hardreset support while maintaining SCR access. nf2/3 doesn't clear hotplug event mask from the interrupt handler but relies on ->thaw() to clear them. When the hardreset was there, the reset action was never skipped and the port was always thawed but, with the hardreset gone, ->prereset() determines that there's no need for softreset and both ->softreset() and ->thaw() are skipped. This leads to stuck hotplug event in the IRQ status register triggering hotplug event whenever IRQ is delieverd on the same IRQ. As the controller shares the same IRQ for both ports, this happens on every IO if one port is occpupied and the other isn't. This patch fixes the problem by making sure that the port is thawed on reset-skip path. bko#11615 reports this problem. Signed-off-by: Tejun Heo Cc: Robert Hancock Reported-by: Dan Andresan Reported-by: Arne Woerner Reported-by: Stefan Lippers-Hollmann Signed-off-by: Jeff Garzik --- diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 009ccc7..ea89091 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -2272,11 +2272,14 @@ int ata_eh_reset(struct ata_link *link, int classify, } /* prereset() might have cleared ATA_EH_RESET. If so, - * bang classes and return. + * bang classes, thaw and return. */ if (reset && !(ehc->i.action & ATA_EH_RESET)) { ata_link_for_each_dev(dev, link) classes[dev->devno] = ATA_DEV_NONE; + if ((ap->pflags & ATA_PFLAG_FROZEN) && + ata_is_host_link(link)) + ata_eh_thaw_port(ap); rc = 0; goto out; } Index: TODO =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/TODO,v retrieving revision 1.46.2.4 retrieving revision 1.46.2.5 diff -u -r1.46.2.4 -r1.46.2.5 --- TODO 23 Feb 2009 13:49:25 -0000 1.46.2.4 +++ TODO 5 Mar 2009 22:22:29 -0000 1.46.2.5 @@ -196,4 +196,6 @@ sent for -stable selinux-netlabel_setsockopt_fix.patch - todo: send for -stable + sent for -stable + + Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v retrieving revision 1.1206.2.39 retrieving revision 1.1206.2.40 diff -u -r1.1206.2.39 -r1.1206.2.40 --- kernel.spec 5 Mar 2009 19:06:43 -0000 1.1206.2.39 +++ kernel.spec 5 Mar 2009 22:22:29 -0000 1.1206.2.40 @@ -645,6 +645,7 @@ Patch600: sparc-2.6.git-aae7fb87ec4d2df6cb551670b1765cf4e5795a3b.patch Patch670: linux-2.6-ata-quirk.patch +Patch671: linux-2.6-libata-make-sure-port-is-thawed.patch Patch673: linux-2.6-libata-pata-sch-notice-attached-slave-devices.patch Patch681: linux-2.6-iwl3945-ibss-tsf-fix.patch @@ -1291,6 +1292,8 @@ # ia64 ata quirk ApplyPatch linux-2.6-ata-quirk.patch +# fix sata_nv broken by 2.6.27.19 update +ApplyPatch linux-2.6-libata-make-sure-port-is-thawed.patch # fix detection of slave device on pata_sch (#467457) ApplyPatch linux-2.6-libata-pata-sch-notice-attached-slave-devices.patch @@ -1979,6 +1982,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Thu Mar 05 2009 Chuck Ebbert 2.6.27.19-170.2.40 +- Fix endless error message spew from sata_nv in 2.6.27.19 (#488371) + * Thu Mar 05 2009 Chuck Ebbert 2.6.27.19-170.2.39 - Add ALSA HDA probe_mask quirks from 2.6.29-rc7 (F11#485295) From maxamillion at fedoraproject.org Thu Mar 5 22:36:12 2009 From: maxamillion at fedoraproject.org (Adam Miller) Date: Thu, 5 Mar 2009 22:36:12 +0000 (UTC) Subject: rpms/dc3dd/F-9 dc3dd.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305223612.A6C6470116@cvs1.fedora.phx.redhat.com> Author: maxamillion Update of /cvs/extras/rpms/dc3dd/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5795/F-9 Modified Files: .cvsignore sources Added Files: dc3dd.spec import.log Log Message: Initial cvs-import of dc3dd package. --- NEW FILE dc3dd.spec --- Name: dc3dd Version: 6.12.2 Release: 3%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors License: GPLv2+ and GPLv3+ URL: http://dc3dd.sourceforge.net/ Source0: http://master.dl.sourceforge.net/dc3dd/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gettext %description dc3dd is a patched version of GNU dd to include a number of features useful for computer forensics. Many of these features were inspired by dcfldd, but were rewritten for dc3dd. * Pattern writes. The program can write a single hexadecimal value or a text string to the output device for wiping purposes. * Piecewise and overall hashing with multiple algorithms and variable size windows. Supports MD5, SHA-1, SHA-256, and SHA-512. Hashes can be computed before or after conversions are made. * Progress meter with automatic input/output file size probing * Combined log for hashes and errors * Error grouping. Produces one error message for identical sequential errors * Verify mode. Able to repeat any transformations done to the input file and compare it to an output. * Ability to split the output into chunks with numerical or alphabetic extensions %prep %setup -q for file in README Sample_Commands.txt Options_Reference.txt; do sed 's|\r||' $file > $file.tmp touch -r $file $file.tmp mv -f $file.tmp $file done rm po/*.gmo %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc ABOUT-NLS AUTHORS COPYING ChangeLog README README.coreutils THANKS THANKS-to-translators TODO Sample_Commands.txt NEWS Options_Reference.txt %{_bindir}/%{name} %{_mandir}/man1/%{name}.* %changelog * Thu Mar 05 2009 Adam Miller - 6.12.2-3 - Cleaned up the .spec by looping through files needing EOF encoding fix * Mon Mar 02 2009 Adam Miller - 6.12.2-2 - Removed .gmo binaries, fixed source0, added doc items, fixed EOF encoding - fixed licencing listing * Mon Feb 23 2009 Adam Miller - 6.12.2-1 - First build of dc3dd for fedora --- NEW FILE import.log --- dc3dd-6_12_2-3:F-9:dc3dd-6.12.2-3.src.rpm:1236291890 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dc3dd/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:24:27 -0000 1.1 +++ .cvsignore 5 Mar 2009 22:35:42 -0000 1.2 @@ -0,0 +1 @@ +dc3dd-6.12.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/dc3dd/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:24:27 -0000 1.1 +++ sources 5 Mar 2009 22:35:42 -0000 1.2 @@ -0,0 +1 @@ +97cc4421e18156890d53803cacf9180c dc3dd-6.12.2.tar.gz From maxamillion at fedoraproject.org Thu Mar 5 22:37:27 2009 From: maxamillion at fedoraproject.org (Adam Miller) Date: Thu, 5 Mar 2009 22:37:27 +0000 (UTC) Subject: rpms/dc3dd/EL-5 dc3dd.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305223727.18DFA70116@cvs1.fedora.phx.redhat.com> Author: maxamillion Update of /cvs/extras/rpms/dc3dd/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6222/EL-5 Modified Files: .cvsignore sources Added Files: dc3dd.spec import.log Log Message: Initial cvs-import of dc3dd package. --- NEW FILE dc3dd.spec --- Name: dc3dd Version: 6.12.2 Release: 3%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors License: GPLv2+ and GPLv3+ URL: http://dc3dd.sourceforge.net/ Source0: http://master.dl.sourceforge.net/dc3dd/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gettext %description dc3dd is a patched version of GNU dd to include a number of features useful for computer forensics. Many of these features were inspired by dcfldd, but were rewritten for dc3dd. * Pattern writes. The program can write a single hexadecimal value or a text string to the output device for wiping purposes. * Piecewise and overall hashing with multiple algorithms and variable size windows. Supports MD5, SHA-1, SHA-256, and SHA-512. Hashes can be computed before or after conversions are made. * Progress meter with automatic input/output file size probing * Combined log for hashes and errors * Error grouping. Produces one error message for identical sequential errors * Verify mode. Able to repeat any transformations done to the input file and compare it to an output. * Ability to split the output into chunks with numerical or alphabetic extensions %prep %setup -q for file in README Sample_Commands.txt Options_Reference.txt; do sed 's|\r||' $file > $file.tmp touch -r $file $file.tmp mv -f $file.tmp $file done rm po/*.gmo %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc ABOUT-NLS AUTHORS COPYING ChangeLog README README.coreutils THANKS THANKS-to-translators TODO Sample_Commands.txt NEWS Options_Reference.txt %{_bindir}/%{name} %{_mandir}/man1/%{name}.* %changelog * Thu Mar 05 2009 Adam Miller - 6.12.2-3 - Cleaned up the .spec by looping through files needing EOF encoding fix * Mon Mar 02 2009 Adam Miller - 6.12.2-2 - Removed .gmo binaries, fixed source0, added doc items, fixed EOF encoding - fixed licencing listing * Mon Feb 23 2009 Adam Miller - 6.12.2-1 - First build of dc3dd for fedora --- NEW FILE import.log --- dc3dd-6_12_2-3:EL-5:dc3dd-6.12.2-3.src.rpm:1236292595 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dc3dd/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:24:27 -0000 1.1 +++ .cvsignore 5 Mar 2009 22:36:56 -0000 1.2 @@ -0,0 +1 @@ +dc3dd-6.12.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/dc3dd/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:24:27 -0000 1.1 +++ sources 5 Mar 2009 22:36:56 -0000 1.2 @@ -0,0 +1 @@ +97cc4421e18156890d53803cacf9180c dc3dd-6.12.2.tar.gz From maxamillion at fedoraproject.org Thu Mar 5 22:38:37 2009 From: maxamillion at fedoraproject.org (Adam Miller) Date: Thu, 5 Mar 2009 22:38:37 +0000 (UTC) Subject: rpms/dc3dd/EL-4 dc3dd.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305223837.DD6A170116@cvs1.fedora.phx.redhat.com> Author: maxamillion Update of /cvs/extras/rpms/dc3dd/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6635/EL-4 Modified Files: .cvsignore sources Added Files: dc3dd.spec import.log Log Message: Initial cvs-import of dc3dd package. --- NEW FILE dc3dd.spec --- Name: dc3dd Version: 6.12.2 Release: 3%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors License: GPLv2+ and GPLv3+ URL: http://dc3dd.sourceforge.net/ Source0: http://master.dl.sourceforge.net/dc3dd/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gettext %description dc3dd is a patched version of GNU dd to include a number of features useful for computer forensics. Many of these features were inspired by dcfldd, but were rewritten for dc3dd. * Pattern writes. The program can write a single hexadecimal value or a text string to the output device for wiping purposes. * Piecewise and overall hashing with multiple algorithms and variable size windows. Supports MD5, SHA-1, SHA-256, and SHA-512. Hashes can be computed before or after conversions are made. * Progress meter with automatic input/output file size probing * Combined log for hashes and errors * Error grouping. Produces one error message for identical sequential errors * Verify mode. Able to repeat any transformations done to the input file and compare it to an output. * Ability to split the output into chunks with numerical or alphabetic extensions %prep %setup -q for file in README Sample_Commands.txt Options_Reference.txt; do sed 's|\r||' $file > $file.tmp touch -r $file $file.tmp mv -f $file.tmp $file done rm po/*.gmo %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc ABOUT-NLS AUTHORS COPYING ChangeLog README README.coreutils THANKS THANKS-to-translators TODO Sample_Commands.txt NEWS Options_Reference.txt %{_bindir}/%{name} %{_mandir}/man1/%{name}.* %changelog * Thu Mar 05 2009 Adam Miller - 6.12.2-3 - Cleaned up the .spec by looping through files needing EOF encoding fix * Mon Mar 02 2009 Adam Miller - 6.12.2-2 - Removed .gmo binaries, fixed source0, added doc items, fixed EOF encoding - fixed licencing listing * Mon Feb 23 2009 Adam Miller - 6.12.2-1 - First build of dc3dd for fedora --- NEW FILE import.log --- dc3dd-6_12_2-3:EL-4:dc3dd-6.12.2-3.src.rpm:1236292666 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dc3dd/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:24:27 -0000 1.1 +++ .cvsignore 5 Mar 2009 22:38:07 -0000 1.2 @@ -0,0 +1 @@ +dc3dd-6.12.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/dc3dd/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:24:27 -0000 1.1 +++ sources 5 Mar 2009 22:38:07 -0000 1.2 @@ -0,0 +1 @@ +97cc4421e18156890d53803cacf9180c dc3dd-6.12.2.tar.gz From rstrode at fedoraproject.org Thu Mar 5 22:44:47 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Thu, 5 Mar 2009 22:44:47 +0000 (UTC) Subject: rpms/gdm/devel gdm-2.25.2-multistack-but-boring.patch, 1.5, 1.6 gdm.spec, 1.446, 1.447 Message-ID: <20090305224447.7CCE070116@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gdm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7580 Modified Files: gdm-2.25.2-multistack-but-boring.patch gdm.spec Log Message: - 2.25.2-10 fixes were actually only for timed login. Add same fix for auto login gdm-2.25.2-multistack-but-boring.patch: Index: gdm-2.25.2-multistack-but-boring.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.25.2-multistack-but-boring.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gdm-2.25.2-multistack-but-boring.patch 5 Mar 2009 21:54:46 -0000 1.5 +++ gdm-2.25.2-multistack-but-boring.patch 5 Mar 2009 22:44:16 -0000 1.6 @@ -4403,7 +4403,7 @@ #endif /* __GDM_SESSION_WORKER_JOB_H */ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/daemon/gdm-simple-slave.c --- gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring 2009-03-04 21:03:53.057442982 -0500 -+++ gdm-2.25.2/daemon/gdm-simple-slave.c 2009-03-04 21:31:35.494441901 -0500 ++++ gdm-2.25.2/daemon/gdm-simple-slave.c 2009-03-05 17:39:40.008530152 -0500 @@ -68,6 +68,8 @@ struct GdmSimpleSlavePrivate guint greeter_reset_id; guint start_session_id; @@ -4903,18 +4903,24 @@ "begin-auto-login", G_CALLBACK (on_greeter_begin_auto_login), slave); -@@ -1017,6 +1126,11 @@ idle_connect_to_display (GdmSimpleSlave +@@ -1017,8 +1126,17 @@ idle_connect_to_display (GdmSimpleSlave if (! enabled || delay > 0) { start_greeter (slave); create_new_session (slave); + + if (enabled) { ++ g_debug ("GdmSimpleSlave: timed login enabled, starting autologin pam conversation\n"); + gdm_session_start_conversation (GDM_SESSION (slave->priv->session), + "gdm-autologin"); + } } else { reset_session (slave); ++ g_debug ("GdmSimpleSlave: autologin enabled, starting autologin pam conversation\n"); ++ gdm_session_start_conversation (GDM_SESSION (slave->priv->session), ++ "gdm-autologin"); } + } else { + if (slave->priv->connection_attempts >= MAX_CONNECT_ATTEMPTS) { diff -up gdm-2.25.2/daemon/test-session.c.multistack-but-boring gdm-2.25.2/daemon/test-session.c --- gdm-2.25.2/daemon/test-session.c.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 +++ gdm-2.25.2/daemon/test-session.c 2009-03-04 21:03:53.130431720 -0500 @@ -7200,7 +7206,7 @@ G_END_DECLS diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c 2009-03-04 21:03:53.146447953 -0500 @@ -0,0 +1,255 @@ +/* @@ -7459,7 +7465,7 @@ +} + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h 2009-03-04 21:03:53.147432504 -0500 @@ -0,0 +1,61 @@ +/* @@ -7789,7 +7795,7 @@ } diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c 2009-03-04 21:03:53.151447317 -0500 @@ -0,0 +1,478 @@ +/* @@ -8271,7 +8277,7 @@ + return g_hash_table_lookup (manager->priv->plugins, name); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h 2009-03-04 21:03:53.152449048 -0500 @@ -0,0 +1,66 @@ +/* @@ -8341,7 +8347,7 @@ + +#endif /* __GDM_PLUGIN_MANAGER_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.c ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.c 2009-03-04 21:03:53.153442188 -0500 @@ -0,0 +1,329 @@ +/* @@ -8674,7 +8680,7 @@ + return g_list_length (widget->priv->tasks); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.h ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.h 2009-03-04 21:03:53.154446921 -0500 @@ -0,0 +1,80 @@ +/* @@ -8820,7 +8826,7 @@ pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme, "emblem-default", diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c 2009-03-04 21:03:53.157442475 -0500 @@ -0,0 +1,186 @@ +/* @@ -9010,7 +9016,7 @@ + return was_chosen; +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h 2009-03-04 21:03:53.158446161 -0500 @@ -0,0 +1,93 @@ +/* @@ -9107,7 +9113,7 @@ + +#endif /* __GDM_CONVERSATION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c 2009-03-04 21:03:53.159446844 -0500 @@ -0,0 +1,93 @@ +/* @@ -9204,7 +9210,7 @@ + g_signal_emit (extension, signals [LOAD_FAILED], 0, error); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h 2009-03-04 21:03:53.160442079 -0500 @@ -0,0 +1,55 @@ +/* @@ -9263,7 +9269,7 @@ +G_END_DECLS +#endif /* __GDM_GREETER_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in 2009-03-04 21:03:53.161442133 -0500 @@ -0,0 +1,11 @@ +prefix=@prefix@ @@ -9278,7 +9284,7 @@ +Libs: -L${libdir} -lgdmsimplegreeter +Cflags: -I${includedir}/gdm/simple-greeter diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c 2009-03-04 21:03:53.162442257 -0500 @@ -0,0 +1,123 @@ +/* @@ -9405,7 +9411,7 @@ + 0); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h 2009-03-04 21:03:53.163442172 -0500 @@ -0,0 +1,64 @@ +/* @@ -9473,7 +9479,7 @@ + +#endif /* __GDM_TASK_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am 2009-03-04 21:03:53.164444252 -0500 @@ -0,0 +1,48 @@ +NULL = @@ -9603,7 +9609,7 @@ $(EXTRA_GREETER_LIBS) \ $(SIMPLE_GREETER_LIBS) \ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c 2009-03-04 21:03:53.167443367 -0500 @@ -0,0 +1,304 @@ +/* @@ -9911,7 +9917,7 @@ + gdm_fingerprint_extension_reset (GDM_CONVERSATION (extension)); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h 2009-03-04 21:03:53.168442094 -0500 @@ -0,0 +1,56 @@ +/* @@ -9971,7 +9977,7 @@ + +#endif /* GDM_FINGERPRINT_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint 2009-03-04 21:03:53.169450949 -0500 @@ -0,0 +1,10 @@ +#%PAM-1.0 @@ -9985,7 +9991,7 @@ +session required pam_namespace.so +session include system-auth diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am 2009-03-04 21:03:53.170444507 -0500 @@ -0,0 +1,50 @@ +NULL = @@ -10039,7 +10045,7 @@ + *~ \ + Makefile.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui 2009-03-04 21:03:53.171445819 -0500 @@ -0,0 +1,56 @@ + @@ -10099,7 +10105,7 @@ + + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c 2009-03-04 21:03:53.172450483 -0500 @@ -0,0 +1,40 @@ +/* @@ -10143,12 +10149,12 @@ + return GDM_GREETER_EXTENSION (extension); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am 2009-03-04 21:03:53.173442226 -0500 @@ -0,0 +1 @@ +SUBDIRS = password diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c 2009-03-04 21:03:53.174446121 -0500 @@ -0,0 +1,323 @@ +/* @@ -10475,7 +10481,7 @@ + gdm_password_extension_reset (GDM_CONVERSATION (extension)); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h 2009-03-04 21:03:53.175446036 -0500 @@ -0,0 +1,56 @@ +/* @@ -10535,7 +10541,7 @@ + +#endif /* GDM_PASSWORD_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password 2009-03-04 21:03:53.176442109 -0500 @@ -0,0 +1,13 @@ +#%PAM-1.0 @@ -10552,7 +10558,7 @@ +session optional pam_gnome_keyring.so auto_start +session include system-auth diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am 2009-03-04 21:03:53.177442234 -0500 @@ -0,0 +1,44 @@ +NULL = @@ -10600,7 +10606,7 @@ + *~ \ + Makefile.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui 2009-03-04 21:03:53.178442358 -0500 @@ -0,0 +1,56 @@ + @@ -10660,7 +10666,7 @@ + + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c 2009-03-04 21:03:53.179446254 -0500 @@ -0,0 +1,40 @@ +/* @@ -10704,7 +10710,7 @@ + return GDM_GREETER_EXTENSION (extension); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c 2009-03-04 21:03:53.181445175 -0500 @@ -0,0 +1,558 @@ +/* gdm-smartcard.c - smartcard object @@ -11266,7 +11272,7 @@ + return NULL; +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c 2009-03-04 21:03:53.182438804 -0500 @@ -0,0 +1,440 @@ +/* @@ -11710,7 +11716,7 @@ + gdm_smartcard_extension_reset (GDM_CONVERSATION (extension)); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h 2009-03-04 21:03:53.184436468 -0500 @@ -0,0 +1,56 @@ +/* @@ -11770,7 +11776,7 @@ + +#endif /* GDM_SMARTCARD_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h 2009-03-04 21:03:53.185432192 -0500 @@ -0,0 +1,94 @@ +/* securitycard.h - api for reading and writing data to a security card @@ -11868,7 +11874,7 @@ +G_END_DECLS +#endif /* GDM_SMARTCARD_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c 2009-03-04 21:03:53.188432285 -0500 @@ -0,0 +1,1394 @@ +/* gdm-smartcard-manager.c - object for monitoring smartcard insertion and @@ -13266,7 +13272,7 @@ +} +#endif diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h 2009-03-04 21:03:53.189434924 -0500 @@ -0,0 +1,86 @@ +/* gdm-smartcard-manager.h - object for monitoring smartcard insertion and @@ -13356,7 +13362,7 @@ +G_END_DECLS +#endif /* GDM_SMARTCARD_MANAGER_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard 2009-03-04 21:03:53.190448876 -0500 @@ -0,0 +1,11 @@ +#%PAM-1.0 @@ -13371,7 +13377,7 @@ +session required pam_namespace.so +session include system-auth diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c 2009-03-04 21:03:53.191446556 -0500 @@ -0,0 +1,167 @@ +#include "config.h" @@ -13542,7 +13548,7 @@ + return 0; +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am 2009-03-04 21:03:53.192442070 -0500 @@ -0,0 +1,71 @@ +NULL = @@ -13617,7 +13623,7 @@ + *~ \ + Makefile.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui 2009-03-04 21:03:53.193451204 -0500 @@ -0,0 +1,56 @@ + @@ -13677,7 +13683,7 @@ + + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c ---- /dev/null 2009-03-05 05:52:53.556012017 -0500 +--- /dev/null 2009-03-05 12:25:58.550012246 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c 2009-03-04 21:03:53.194449722 -0500 @@ -0,0 +1,40 @@ +/* Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.446 retrieving revision 1.447 diff -u -r1.446 -r1.447 --- gdm.spec 5 Mar 2009 21:54:46 -0000 1.446 +++ gdm.spec 5 Mar 2009 22:44:16 -0000 1.447 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.25.2 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -341,6 +341,10 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Thu Mar 5 2009 Ray Strode - 1:2.25.2-13 +- 2.25.2-10 fixes were actually only for timed login. + Add same fix for auto login + * Thu Mar 5 2009 Ray Strode - 1:2.25.2-12 - Create settings object early to prevent assertion failures when one pam conversation completes before another starts. From myoung at fedoraproject.org Thu Mar 5 22:45:54 2009 From: myoung at fedoraproject.org (Michael Young) Date: Thu, 5 Mar 2009 22:45:54 +0000 (UTC) Subject: rpms/kernel/devel linux-2.6-ext4-inode-alloc-race.patch, NONE, 1.1.2.2 config-generic, 1.238.6.7, 1.238.6.8 drm-modesetting-radeon.patch, 1.54.6.3, 1.54.6.4 drm-nouveau.patch, 1.8.6.1, 1.8.6.2 kernel.spec, 1.1294.2.9, 1.1294.2.10 linux-2.6-v4l-dvb-update.patch, 1.1.2.3, 1.1.2.4 xen.pvops.patch, 1.1.2.8, 1.1.2.9 Message-ID: <20090305224554.6510470116@cvs1.fedora.phx.redhat.com> Author: myoung Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7176 Modified Files: Tag: private-myoung-dom0-branch config-generic drm-modesetting-radeon.patch drm-nouveau.patch kernel.spec linux-2.6-v4l-dvb-update.patch xen.pvops.patch Added Files: Tag: private-myoung-dom0-branch linux-2.6-ext4-inode-alloc-race.patch Log Message: Another pvops update linux-2.6-ext4-inode-alloc-race.patch: --- NEW FILE linux-2.6-ext4-inode-alloc-race.patch --- Date: Tue, 03 Mar 2009 22:38:41 -0600 From: Eric Sandeen To: ext4 development CC: "Aneesh Kumar K.V" Subject: [PATCH] fix ext4_free_inode vs. ext4_claim_inode race I was seeing fsck errors on inode bitmaps after a 4 thread dbench run on a 4 cpu machine: Inode bitmap differences: -50736 -(50752--50753) etc... I believe that this is because ext4_free_inode() uses atomic bitops, and although ext4_new_inode() *used* to also use atomic bitops for synchronization, commit 393418676a7602e1d7d3f6e560159c65c8cbd50e changed this to use the sb_bgl_lock, so that we could also synchronize against read_inode_bitmap and initialization of uninit inode tables. However, that change left ext4_free_inode using atomic bitops, which I think leaves no synchronization between setting & unsetting bits in the inode table. The below patch fixes it for me, although I wonder if we're getting at all heavy-handed with this spinlock... Signed-off-by: Eric Sandeen --- Index: linux-2.6/fs/ext4/ialloc.c =================================================================== --- linux-2.6.orig/fs/ext4/ialloc.c +++ linux-2.6/fs/ext4/ialloc.c @@ -188,7 +188,7 @@ void ext4_free_inode(handle_t *handle, s struct ext4_group_desc *gdp; struct ext4_super_block *es; struct ext4_sb_info *sbi; - int fatal = 0, err, count; + int fatal = 0, err, count, cleared; ext4_group_t flex_group; if (atomic_read(&inode->i_count) > 1) { @@ -248,8 +248,10 @@ void ext4_free_inode(handle_t *handle, s goto error_return; /* Ok, now we can actually update the inode bitmaps.. */ - if (!ext4_clear_bit_atomic(sb_bgl_lock(sbi, block_group), - bit, bitmap_bh->b_data)) + spin_lock(sb_bgl_lock(sbi, block_group)); + cleared = ext4_clear_bit(bit, bitmap_bh->b_data); + spin_unlock(sb_bgl_lock(sbi, block_group)); + if (!cleared) ext4_error(sb, "ext4_free_inode", "bit already cleared for inode %lu", ino); else { Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.238.6.7 retrieving revision 1.238.6.8 diff -u -r1.238.6.7 -r1.238.6.8 --- config-generic 5 Mar 2009 01:30:21 -0000 1.238.6.7 +++ config-generic 5 Mar 2009 22:45:07 -0000 1.238.6.8 @@ -2355,6 +2355,8 @@ CONFIG_DVB_LGS8GL5=m # CONFIG_DVB_DUMMY_FE is not set CONFIG_DVB_AF9013=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m # # Supported SAA7146 based PCI Adapters @@ -3948,7 +3950,7 @@ CONFIG_XEN_NETDEV_BACKEND=y # CONFIG_CC_STACKPROTECTOR is not set # CONFIG_X86_X2APIC is not set -# CONFIG_RD_GZIP is not set +CONFIG_RD_GZIP=y # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_XEN_GNTDEV is not set drm-modesetting-radeon.patch: Index: drm-modesetting-radeon.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v retrieving revision 1.54.6.3 retrieving revision 1.54.6.4 diff -u -r1.54.6.3 -r1.54.6.4 --- drm-modesetting-radeon.patch 5 Mar 2009 01:30:21 -0000 1.54.6.3 +++ drm-modesetting-radeon.patch 5 Mar 2009 22:45:08 -0000 1.54.6.4 @@ -1,3 +1,11 @@ +commit fef48d5013f761faec24ee1044282b6098318237 +Author: Dave Airlie +Date: Thu Mar 5 15:57:18 2009 +1000 + + radeon: add special relocation for WAIT_VLINE + + This is half ways between a hack and really neat. + commit 530ebda60cb7270795b7edd72930ab2d0e4db102 Author: Dave Airlie Date: Tue Mar 3 18:23:22 2009 +1000 @@ -14369,7 +14377,7 @@ + drm_crtc_helper_add(&radeon_crtc->base, &atombios_helper_funcs); +} diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c -index 3efa633..c97d529 100644 +index 3efa633..54ecf36 100644 --- a/drivers/gpu/drm/radeon/r300_cmdbuf.c +++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c @@ -35,6 +35,7 @@ @@ -14450,20 +14458,24 @@ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) { ADD_RANGE(R500_VAP_INDEX_OFFSET, 1); ADD_RANGE(R500_US_CONFIG, 2); -@@ -258,7 +265,8 @@ void r300_init_reg_flags(struct drm_device *dev) +@@ -258,7 +265,10 @@ void r300_init_reg_flags(struct drm_device *dev) ADD_RANGE(R500_RS_INST_0, 16); ADD_RANGE(R500_RB3D_COLOR_CLEAR_VALUE_AR, 2); ADD_RANGE(R500_RB3D_CONSTANT_COLOR_AR, 2); - ADD_RANGE(R500_ZB_FIFO_SIZE, 2); +// ADD_RANGE(R500_ZB_FIFO_SIZE 2); + ADD_RANGE(R500_GA_US_VECTOR_INDEX, 2); ++ ++ ADD_RANGE_MARK(AVIVO_D1MODE_VLINE_START_END, 1, MARK_CHECK_WAIT_VLINE); } else { ADD_RANGE(R300_PFS_CNTL_0, 3); ADD_RANGE(R300_PFS_NODE_0, 4); -@@ -271,9 +279,122 @@ void r300_init_reg_flags(struct drm_device *dev) +@@ -270,10 +280,124 @@ void r300_init_reg_flags(struct drm_device *dev) + ADD_RANGE(R300_RS_INTERP_0, 8); ADD_RANGE(R300_RS_ROUTE_0, 8); - } ++ ADD_RANGE_MARK(RADEON_CRTC_GUI_TRIG_VLINE, 1, MARK_CHECK_WAIT_VLINE); ++ } + + /* add 2d blit engine registers for DDX */ + ADD_RANGE(RADEON_SRC_Y_X, 3); /* 1434, 1438, 143c, @@ -14576,7 +14588,7 @@ + ADD_RANGE_MARK(RADEON_PP_TXOFFSET_1, 1, MARK_CHECK_OFFSET); + ADD_RANGE_MARK(RADEON_PP_TXOFFSET_2, 1, MARK_CHECK_OFFSET); + } -+ } + } } -static __inline__ int r300_check_range(unsigned reg, int count) @@ -14584,7 +14596,7 @@ { int i; if (reg & ~0xffff) -@@ -284,6 +405,13 @@ static __inline__ int r300_check_range(unsigned reg, int count) +@@ -284,6 +408,13 @@ static __inline__ int r300_check_range(unsigned reg, int count) return 0; } @@ -19946,10 +19958,10 @@ +} diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c new file mode 100644 -index 0000000..3084639 +index 0000000..823b82f --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_cs.c -@@ -0,0 +1,593 @@ +@@ -0,0 +1,667 @@ +/* + * Copyright 2008 Jerome Glisse. + * All Rights Reserved. @@ -20142,6 +20154,71 @@ + *offset = reloc[1]; + return 0; +} ++ ++/* special case CRTC relocation for vline waits ++ * userspace doesn't know which CRTC it controls so we have a special sequence ++ * packet0 VLINE_START_END, value ++ * packet0 WAIT_UNTIL, crtc line | crtc_num ++ * packet0 NOP, crtc_id ++ * we relocate the vline register and the wait until crtc_num bit ++ */ ++static int radeon_cs_relocate_crtc(struct drm_radeon_cs_parser *parser, uint32_t offset_dw) ++{ ++ struct drm_device *dev = parser->dev; ++ struct drm_mode_object *obj; ++ struct drm_crtc *crtc; ++ struct radeon_crtc *radeon_crtc; ++ uint32_t hdr, reg, val, packet3_hdr; ++ int ret = 0; ++ int crtc_id; ++ struct drm_radeon_kernel_chunk *ib_chunk; ++ ++ ib_chunk = &parser->chunks[parser->ib_index]; ++ ++ hdr = ib_chunk->kdata[offset_dw]; ++ reg = (hdr & R300_CP_PACKET0_REG_MASK) << 2; ++ val = ib_chunk->kdata[offset_dw + 1]; ++ packet3_hdr = ib_chunk->kdata[offset_dw + 4]; ++ ++ mutex_lock(&dev->mode_config.mutex); ++ obj = drm_mode_object_find(parser->dev, ib_chunk->kdata[offset_dw + 5], DRM_MODE_OBJECT_CRTC); ++ if (!obj) { ++ ret = -EINVAL; ++ goto out; ++ } ++ crtc = obj_to_crtc(obj); ++ radeon_crtc = to_radeon_crtc(crtc); ++ ++ crtc_id = radeon_crtc->crtc_id; ++ ++ /* ++ * need to edit both packets ++ */ ++ /* vline start end - for crtc0 no work to do */ ++ if (crtc_id == 1) { ++ switch (reg) { ++ case AVIVO_D1MODE_VLINE_START_END: ++ hdr &= R300_CP_PACKET0_REG_MASK; ++ hdr |= AVIVO_D2MODE_VLINE_START_END >> 2; ++ break; ++ case RADEON_CRTC_GUI_TRIG_VLINE: ++ hdr &= R300_CP_PACKET0_REG_MASK; ++ hdr |= RADEON_CRTC2_GUI_TRIG_VLINE >> 2; ++ break; ++ default: ++ DRM_ERROR("unknown CRTC relocation\n"); ++ ret = -EINVAL; ++ goto out; ++ } ++ /* relocate the WAIT_UNTIL */ ++ ib_chunk->kdata[offset_dw] = hdr; ++ ib_chunk->kdata[offset_dw + 3] |= RADEON_ENG_DISPLAY_SELECT_CRTC1; ++ } ++out: ++ mutex_unlock(&dev->mode_config.mutex); ++ return ret; ++} ++ +#define RELOC_SIZE 2 +#define RELOC_SIZE_NEW 0 +#define RADEON_2D_OFFSET_MASK 0x3fffff @@ -20304,12 +20381,14 @@ + return 0; +} + -+int radeon_cs_packet0(struct drm_radeon_cs_parser *parser, uint32_t offset_dw) ++int radeon_cs_packet0(struct drm_radeon_cs_parser *parser, uint32_t *offset_dw_p) +{ + uint32_t hdr, num_dw, reg; + int count_dw = 1; + int ret; + bool one_reg; ++ uint32_t offset_dw = *offset_dw_p; ++ int incr = 2; + + hdr = parser->chunks[parser->ib_index].kdata[offset_dw]; + num_dw = ((hdr & RADEON_CP_PACKET_COUNT_MASK) >> 16) + 2; @@ -20345,6 +20424,13 @@ + /* okay it should be followed by a NOP */ + } else if (flags == MARK_CHECK_SCISSOR) { + DRM_DEBUG("need to validate scissor %x %d\n", reg, flags); ++ } else if (flags == MARK_CHECK_WAIT_VLINE) { ++ ret = radeon_cs_relocate_crtc(parser, offset_dw); ++ if (ret) { ++ DRM_ERROR("failed to relocate packet\n"); ++ return ret; ++ } ++ incr = 4; + } else { + DRM_ERROR("illegal register %x %d %d\n", reg, flags, offset_dw); + return -EINVAL; @@ -20357,6 +20443,7 @@ + count_dw++; + reg += 4; + } ++ *offset_dw_p += incr; + return 0; +} + @@ -20378,8 +20465,7 @@ + + switch (hdr & RADEON_CP_PACKET_MASK) { + case RADEON_CP_PACKET0: -+ ret = radeon_cs_packet0(parser, count_dw); -+ num_dw += 2; ++ ret = radeon_cs_packet0(parser, &count_dw); + break; + case RADEON_CP_PACKET1: + case RADEON_CP_PACKET2: @@ -21725,7 +21811,7 @@ } diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h -index 7091aaf..44acdd7 100644 +index 7091aaf..e2b94a4 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h @@ -34,6 +34,8 @@ @@ -22327,7 +22413,7 @@ } while (0) #define RADEON_WAIT_UNTIL_3D_IDLE() do { \ -@@ -2036,4 +2203,158 @@ extern void radeon_commit_ring(drm_radeon_private_t *dev_priv); +@@ -2036,4 +2203,159 @@ extern void radeon_commit_ring(drm_radeon_private_t *dev_priv); write &= mask; \ } while (0) @@ -22473,6 +22559,7 @@ +#define MARK_SAFE 1 +#define MARK_CHECK_OFFSET 2 +#define MARK_CHECK_SCISSOR 3 ++#define MARK_CHECK_WAIT_VLINE 4 /* VLINE on a crtc relocation */ + +struct _radeon_pkt_s { + int start; @@ -29766,10 +29853,10 @@ + diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h new file mode 100644 -index 0000000..bb9ad4a +index 0000000..9ccf839 --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_reg.h -@@ -0,0 +1,5335 @@ +@@ -0,0 +1,5337 @@ +/* + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and + * VA Linux Systems Inc., Fremont, California. @@ -33431,6 +33518,7 @@ +#define AVIVO_D1MODE_DATA_FORMAT 0x6528 +# define AVIVO_D1MODE_INTERLEAVE_EN (1 << 0) +#define AVIVO_D1MODE_DESKTOP_HEIGHT 0x652C ++#define AVIVO_D1MODE_VLINE_START_END 0x6538 +#define AVIVO_D1MODE_VIEWPORT_START 0x6580 +#define AVIVO_D1MODE_VIEWPORT_SIZE 0x6584 +#define AVIVO_D1MODE_EXT_OVERSCAN_LEFT_RIGHT 0x6588 @@ -33482,6 +33570,7 @@ +#define AVIVO_D2CUR_SIZE 0x6c10 +#define AVIVO_D2CUR_POSITION 0x6c14 + ++#define AVIVO_D2MODE_VLINE_START_END 0x6d38 +#define AVIVO_D2MODE_VIEWPORT_START 0x6d80 +#define AVIVO_D2MODE_VIEWPORT_SIZE 0x6d84 +#define AVIVO_D2MODE_EXT_OVERSCAN_LEFT_RIGHT 0x6d88 drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v retrieving revision 1.8.6.1 retrieving revision 1.8.6.2 diff -u -r1.8.6.1 -r1.8.6.2 --- drm-nouveau.patch 5 Mar 2009 01:30:22 -0000 1.8.6.1 +++ drm-nouveau.patch 5 Mar 2009 22:45:08 -0000 1.8.6.2 @@ -2355,10 +2355,10 @@ +#endif diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c new file mode 100644 -index 0000000..f5adfef +index 0000000..7147114 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c -@@ -0,0 +1,160 @@ +@@ -0,0 +1,163 @@ +/* + * Copyright 2005 Stephane Marchesin. + * All Rights Reserved. @@ -2398,6 +2398,9 @@ +int nouveau_fbpercrtc = 0; +module_param_named(fbpercrtc, nouveau_fbpercrtc, int, 0400); + ++int nouveau_noagp = 0; ++module_param_named(noagp, nouveau_noagp, int, 0400); ++ +static struct pci_device_id pciidlist[] = { + { + PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID), @@ -6593,10 +6596,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c new file mode 100644 -index 0000000..abc00ec +index 0000000..a15a106 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c -@@ -0,0 +1,1067 @@ +@@ -0,0 +1,1073 @@ +/* + * Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. + * Copyright 2005 Stephane Marchesin @@ -6634,6 +6637,8 @@ +#include "drm_sarea.h" +#include "nouveau_drv.h" + ++extern int nouveau_noagp; ++ +static struct mem_block * +split_block(struct mem_block *p, uint64_t start, uint64_t size, + struct drm_file *file_priv) @@ -7093,6 +7098,9 @@ + struct drm_agp_mode mode; + int ret; + ++ if (nouveau_noagp) ++ return 0; ++ + nouveau_mem_reset_agp(dev); + + ret = drm_agp_acquire(dev); @@ -7244,10 +7252,7 @@ + /* Init FB */ + dev_priv->fb_phys=drm_get_resource_start(dev,1); + fb_size = nouveau_mem_fb_amount(dev); -+ /* On at least NV40, RAMIN is actually at the end of vram. -+ * We don't want to allocate this... */ -+ if (dev_priv->card_type >= NV_40) -+ fb_size -= dev_priv->ramin_rsvd_vram; ++ fb_size -= dev_priv->ramin_rsvd_vram; + dev_priv->fb_available_size = fb_size; + DRM_DEBUG("Available VRAM: %dKiB\n", fb_size>>10); + @@ -7606,14 +7611,18 @@ + NOUVEAU_CHECK_MM_DISABLED_WITH_RETURN; + + block=NULL; -+ if (memfree->flags & NOUVEAU_MEM_FB) ++ if (dev_priv->fb_heap && memfree->flags & NOUVEAU_MEM_FB) + block = find_block(dev_priv->fb_heap, memfree->offset); -+ else if (memfree->flags & NOUVEAU_MEM_AGP) ++ else ++ if (dev_priv->agp_heap && memfree->flags & NOUVEAU_MEM_AGP) + block = find_block(dev_priv->agp_heap, memfree->offset); -+ else if (memfree->flags & NOUVEAU_MEM_PCI) ++ else ++ if (dev_priv->pci_heap && memfree->flags & NOUVEAU_MEM_PCI) + block = find_block(dev_priv->pci_heap, memfree->offset); ++ + if (!block) + return -EFAULT; ++ + if (block->file_priv != file_priv) + return -EPERM; + @@ -7848,10 +7857,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c new file mode 100644 -index 0000000..5bbcc59 +index 0000000..48ff77e --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_object.c -@@ -0,0 +1,1228 @@ +@@ -0,0 +1,1229 @@ +/* + * Copyright (C) 2006 Ben Skeggs. + * @@ -8046,6 +8055,7 @@ + if (co >= dev_priv->ramht_size) + co = 0; + } while (co != ho); ++ list_del(&ref->list); + instmem->finish_access(dev); + + DRM_ERROR("RAMHT entry not found. ch=%d, handle=0x%08x\n", @@ -8916,9 +8926,9 @@ + chan->vm_vram_pt[i]->instance | 0x61); + INSTANCE_WR(chan->vm_pd, pde++, 0x00000000); + } -+ } + -+ instmem->finish_access(dev); ++ instmem->finish_access(dev); ++ } + + /* RAMHT */ + if (dev_priv->card_type < NV_50) { @@ -10291,10 +10301,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c new file mode 100644 -index 0000000..19c8861 +index 0000000..6b7fed1 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_state.c -@@ -0,0 +1,935 @@ +@@ -0,0 +1,942 @@ +/* + * Copyright 2005 Stephane Marchesin + * Copyright 2008 Stuart Bennett @@ -10761,25 +10771,6 @@ + nv_wr32(NV03_PMC_BOOT_1,0x00000001); + + DRM_MEMORYBARRIER(); -+ -+ /* if we have an OF card, copy vbios to RAMIN */ -+ dn = pci_device_to_OF_node(dev->pdev); -+ if (dn) -+ { -+ int size; -+ const uint32_t *bios = of_get_property(dn, "NVDA,BMP", &size); -+ if (bios) -+ { -+ int i; -+ for(i=0;ipdev); ++ if (dn) ++ { ++ int size; ++ const uint32_t *bios = of_get_property(dn, "NVDA,BMP", &size); ++ if (bios) ++ { ++ int i; ++ dev_priv->engine.instmem.prepare_access(dev, true); ++ for(i=0;iengine.instmem.finish_access(dev); ++ DRM_INFO("OF bios successfully copied (%d bytes)\n",size); ++ } ++ else ++ DRM_INFO("Unable to get the OF bios\n"); ++ } ++ else ++ DRM_INFO("Unable to get the OF node\n"); ++#endif + + /* For those who think they want to be funny. */ + if (dev_priv->card_type < NV_50) @@ -11160,8 +11173,10 @@ + } + } + ++ dev_priv->engine.instmem.prepare_access(dev, true); + for (i = 0; i < susres->ramin_size / 4; i++) + nv_wi32(i << 2, susres->ramin_copy[i]); ++ dev_priv->engine.instmem.finish_access(dev); + + engine->mc.init(dev); + engine->timer.init(dev); @@ -11180,8 +11195,10 @@ + /* PMC power cycling PFIFO in init clobbers some of the stuff stored in + * PRAMIN (such as NV04_PFIFO_CACHE1_DMA_INSTANCE). this is unhelpful + */ ++ dev_priv->engine.instmem.prepare_access(dev, true); + for (i = 0; i < susres->ramin_size / 4; i++) + nv_wi32(i << 2, susres->ramin_copy[i]); ++ dev_priv->engine.instmem.finish_access(dev); + + engine->fifo.load_context(dev_priv->fifos[0]); + nv_wr32(NV04_PFIFO_MODE, susres->fifo_mode); @@ -12172,10 +12189,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c new file mode 100644 -index 0000000..7d902d8 +index 0000000..a83d271 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv04_instmem.c -@@ -0,0 +1,188 @@ +@@ -0,0 +1,189 @@ +#include "drmP.h" +#include "drm.h" +#include "nouveau_drv.h" @@ -12205,16 +12222,17 @@ + break; + } + } else { -+ /*XXX: what *are* the limits on ramin_rsvd_vram = (512*1024); + } + DRM_DEBUG("RAMIN size: %dKiB\n", dev_priv->ramin_rsvd_vram>>10); + + /* Clear all of it, except the BIOS image that's in the first 64KiB */ ++ dev_priv->engine.instmem.prepare_access(dev, true); + for (i=(64*1024); iramin_rsvd_vram; i+=4) + nv_wi32(i, 0x00000000); ++ dev_priv->engine.instmem.finish_access(dev); +} + +static void Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1294.2.9 retrieving revision 1.1294.2.10 diff -u -r1.1294.2.9 -r1.1294.2.10 --- kernel.spec 5 Mar 2009 01:30:23 -0000 1.1294.2.9 +++ kernel.spec 5 Mar 2009 22:45:09 -0000 1.1294.2.10 @@ -246,7 +246,7 @@ # no need to build headers again for these arches, # they can just use i586 and ppc64 headers -%ifarch i686 ppc64iseries ppc ppc64 +%ifarch i686 ppc64iseries %define with_headers 0 %endif @@ -259,9 +259,9 @@ %endif # bootwrapper is only on ppc -#%ifnarch ppc ppc64 +%ifnarch ppc ppc64 %define with_bootwrapper 0 -#%endif +%endif # sparse blows up on ppc64 alpha and sparc64 %ifarch ppc64 ppc alpha sparc64 @@ -464,7 +464,7 @@ Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390x alpha alphaev56 %{arm} +ExclusiveArch: noarch %{all_x86} x86_64 ia64 sparc sparc64 s390x alpha alphaev56 %{arm} ExclusiveOS: Linux %kernel_reqprovconf @@ -674,6 +674,9 @@ Patch2899: linux-2.6-v4l-dvb-fixes.patch Patch2900: linux-2.6-v4l-dvb-update.patch +# ext4 fixes +Patch2910: linux-2.6-ext4-inode-alloc-race.patch + Patch9001: revert-fix-modules_install-via-nfs.patch Patch9997: xen.pvops.pre.patch @@ -1089,6 +1092,7 @@ # # ext4 +ApplyPatch linux-2.6-ext4-inode-alloc-race.patch # xfs @@ -1188,7 +1192,7 @@ #ApplyPatch drm-radeon-pm.patch ApplyPatch drm-no-gem-on-i8xx.patch ApplyPatch drm-i915-resume-force-mode.patch -ApplyPatch drm-fix-setmaster-deadlock.patch +#ApplyPatch drm-fix-setmaster-deadlock.patch # linux1394 git patches ApplyPatch linux-2.6-firewire-git-update.patch @@ -1798,7 +1802,28 @@ # and build. %changelog -* Wed Mar 4 2009 +* Wed Mar 05 2009 Michael Young +- update pvops patch +- disable drm-fix-setmaster-deadlock.patch as included in pvops patch +- set CONFIG_RD_GZIP for non-xen boot +- take ppc and ppc64 out of ExclusiveArch and hope it doesn't break anything + +* Thu Mar 05 2009 Dave Airlie +- drm-radeon-modesetting.patch: add new relocation for Xv sync + +* Thu Mar 05 2009 Ben Skeggs +- drm-nouveau.patch: fix some issues mainly seen on earlier chipsets + +* Thu Mar 05 2009 Eric Sandeen +- Fix ext4 race between inode bitmap set/clear + +* Thu Mar 05 2009 Ben Skeggs +- drm-nouveau.patch: fix +- drivers/media: fixes and improvements on devel tree + +* Wed Mar 4 2009 Michael Young - update to latest pvops patch - merge conflict from drm-next.patch - disable ppc and ppc64 packages linux-2.6-v4l-dvb-update.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1.2.3 -r 1.1.2.4 linux-2.6-v4l-dvb-update.patch Index: linux-2.6-v4l-dvb-update.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-update.patch,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- linux-2.6-v4l-dvb-update.patch 5 Mar 2009 01:30:24 -0000 1.1.2.3 +++ linux-2.6-v4l-dvb-update.patch 5 Mar 2009 22:45:10 -0000 1.1.2.4 @@ -11,25 +11,28 @@ 'f' 00-1F linux/ext2_fs.h 'h' 00-7F Charon filesystem diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv -index 0d93fa1..4dfe626 100644 +index 0d93fa1..1da2c62 100644 --- a/Documentation/video4linux/CARDLIST.bttv +++ b/Documentation/video4linux/CARDLIST.bttv -@@ -154,3 +154,4 @@ +@@ -154,3 +154,6 @@ 153 -> PHYTEC VD-012 (bt878) 154 -> PHYTEC VD-012-X1 (bt878) 155 -> PHYTEC VD-012-X2 (bt878) +156 -> IVCE-8784 [0000:f050,0001:f050,0002:f050,0003:f050] ++157 -> Geovision GV-800(S) (master) [800a:763d] ++158 -> Geovision GV-800(S) (slave) [800b:763d,800c:763d,800d:763d] diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885 -index 35ea130..5937ff9 100644 +index 35ea130..91aa3c0 100644 --- a/Documentation/video4linux/CARDLIST.cx23885 +++ b/Documentation/video4linux/CARDLIST.cx23885 -@@ -12,3 +12,6 @@ +@@ -12,3 +12,7 @@ 11 -> DViCO FusionHDTV DVB-T Dual Express [18ac:db78] 12 -> Leadtek Winfast PxDVR3200 H [107d:6681] 13 -> Compro VideoMate E650F [185b:e800] + 14 -> TurboSight TBS 6920 [6920:8888] + 15 -> TeVii S470 [d470:9022] + 16 -> DVBWorld DVB-S2 2005 [0001:2005] ++ 17 -> NetUP Dual DVB-S2 CI [1b55:2a2c] diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx index 75bded8..78d0a6e 100644 --- a/Documentation/video4linux/CARDLIST.em28xx @@ -854,7 +857,7 @@ i2c_adapter->algo = &saa7146_algo; i2c_adapter->algo_data = NULL; diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c -index 47fee05..8d8cb7f 100644 +index 47fee05..8035285 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c @@ -1,4 +1,5 @@ @@ -1281,7 +1284,7 @@ /********************************************************************************/ /* common pagetable functions */ -@@ -829,231 +497,451 @@ static int video_end(struct saa7146_fh *fh, struct file *file) +@@ -829,231 +497,448 @@ static int video_end(struct saa7146_fh *fh, struct file *file) return 0; } @@ -1384,11 +1387,6 @@ + return 0; +} + -+static int vidioc_enum_fmt_vid_overlay(struct file *file, void *fh, struct v4l2_fmtdesc *f) -+{ -+ return vidioc_enum_fmt_vid_cap(file, fh, f); -+} -+ +static int vidioc_queryctrl(struct file *file, void *fh, struct v4l2_queryctrl *c) +{ + const struct v4l2_queryctrl *ctrl; @@ -1468,11 +1466,7 @@ - /* fixme: add handle "after" case (is it still needed?) */ + mutex_lock(&dev->lock); - -- switch (fh->type) { -- case V4L2_BUF_TYPE_VIDEO_CAPTURE: { -- ops = &saa7146_video_uops; -- q = &fh->video_q; ++ + switch (ctrl->type) { + case V4L2_CTRL_TYPE_BOOLEAN: + case V4L2_CTRL_TYPE_MENU: @@ -1481,11 +1475,15 @@ + c->value = ctrl->minimum; + if (c->value > ctrl->maximum) + c->value = ctrl->maximum; - break; ++ break; + default: + /* nothing */; + } -+ + +- switch (fh->type) { +- case V4L2_BUF_TYPE_VIDEO_CAPTURE: { +- ops = &saa7146_video_uops; +- q = &fh->video_q; + switch (c->id) { + case V4L2_CID_BRIGHTNESS: { + u32 value = saa7146_read(dev, BCS_CTRL); @@ -1493,7 +1491,7 @@ + value |= (c->value << 24); + saa7146_write(dev, BCS_CTRL, value); + saa7146_write(dev, MC2, MASK_22 | MASK_06); -+ break; + break; + } + case V4L2_CID_CONTRAST: { + u32 value = saa7146_read(dev, BCS_CTRL); @@ -1565,19 +1563,8 @@ - case VIDIOC_G_FBUF: - { - struct v4l2_framebuffer *fb = arg; -+ return 0; -+} - +- - DEB_EE(("VIDIOC_G_FBUF\n")); -+static int vidioc_g_parm(struct file *file, void *fh, -+ struct v4l2_streamparm *parm) -+{ -+ if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) -+ return -EINVAL; -+ parm->parm.capture.readbuffers = 1; -+ /* fixme: only for PAL! */ -+ parm->parm.capture.timeperframe.numerator = 1; -+ parm->parm.capture.timeperframe.denominator = 25; + return 0; +} @@ -1589,25 +1576,27 @@ - { - struct v4l2_framebuffer *fb = arg; - struct saa7146_format *fmt; -+static int vidioc_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f) ++static int vidioc_g_parm(struct file *file, void *fh, ++ struct v4l2_streamparm *parm) +{ -+ f->fmt.pix = ((struct saa7146_fh *)fh)->video_fmt; -+ return 0; -+} ++ struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; ++ struct saa7146_vv *vv = dev->vv_data; - DEB_EE(("VIDIOC_S_FBUF\n")); -+static int vidioc_g_fmt_vid_overlay(struct file *file, void *fh, struct v4l2_format *f) -+{ -+ f->fmt.win = ((struct saa7146_fh *)fh)->ov.win; ++ if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) ++ return -EINVAL; ++ parm->parm.capture.readbuffers = 1; ++ v4l2_video_std_frame_period(vv->standard->id, ++ &parm->parm.capture.timeperframe); + return 0; +} - if(!capable(CAP_SYS_ADMIN) && - !capable(CAP_SYS_RAWIO)) - return -EPERM; -+static int vidioc_g_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f) ++static int vidioc_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f) +{ -+ f->fmt.vbi = ((struct saa7146_fh *)fh)->vbi_fmt; ++ f->fmt.pix = ((struct saa7146_fh *)fh)->video_fmt; + return 0; +} @@ -1616,20 +1605,21 @@ - if (NULL == fmt) { - return -EINVAL; - } -+static int vidioc_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f) ++static int vidioc_g_fmt_vid_overlay(struct file *file, void *fh, struct v4l2_format *f) +{ -+ struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; -+ struct saa7146_vv *vv = dev->vv_data; -+ struct saa7146_format *fmt; -+ enum v4l2_field field; -+ int maxw, maxh; -+ int calc_bpl; ++ f->fmt.win = ((struct saa7146_fh *)fh)->ov.win; ++ return 0; ++} - /* planar formats are not allowed for overlay video, clipping and video dma would clash */ - if (0 != (fmt->flags & FORMAT_IS_PLANAR)) { - DEB_S(("planar pixelformat '%4.4s' not allowed for overlay\n",(char *)&fmt->pixelformat)); - } -+ DEB_EE(("V4L2_BUF_TYPE_VIDEO_CAPTURE: dev:%p, fh:%p\n", dev, fh)); ++static int vidioc_g_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f) ++{ ++ f->fmt.vbi = ((struct saa7146_fh *)fh)->vbi_fmt; ++ return 0; ++} - /* check if overlay is running */ - if (IS_OVERLAY_ACTIVE(fh) != 0) { @@ -1638,43 +1628,17 @@ [...16650 lines suppressed...] +- break; +static int zoran_s_ctrl(struct file *file, void *__fh, struct v4l2_control *ctrl) +{ + struct zoran_fh *fh = __fh; + struct zoran *zr = fh->zr; -- dprintk(3, KERN_DEBUG "%s: VIDIOC_S_OUTPUT - output=%d\n", -- ZR_DEVNAME(zr), *output); +- case VIDIOC_S_OUTPUT: +- { +- int *output = arg; + /* we only support hue/saturation/contrast/brightness */ + if (ctrl->id < V4L2_CID_BRIGHTNESS || + ctrl->id > V4L2_CID_HUE) + return -EINVAL; -- if (*output != 0) -- return -EINVAL; +- dprintk(3, KERN_DEBUG "%s: VIDIOC_S_OUTPUT - output=%d\n", +- ZR_DEVNAME(zr), *output); + mutex_lock(&zr->resource_lock); + decoder_call(zr, core, s_ctrl, ctrl); + mutex_unlock(&zr->resource_lock); +- if (*output != 0) +- return -EINVAL; ++ return 0; ++} + - return 0; - } - break; -+ return 0; -+} ++static int zoran_g_std(struct file *file, void *__fh, v4l2_std_id *std) ++{ ++ struct zoran_fh *fh = __fh; ++ struct zoran *zr = fh->zr; - /* cropping (sub-frame capture) */ - case VIDIOC_CROPCAP: - { - struct v4l2_cropcap *cropcap = arg; - int type = cropcap->type, res = 0; -+static int zoran_g_std(struct file *file, void *__fh, v4l2_std_id *std) -+{ -+ struct zoran_fh *fh = __fh; -+ struct zoran *zr = fh->zr; - -- dprintk(3, KERN_ERR "%s: VIDIOC_CROPCAP - type=%d\n", -- ZR_DEVNAME(zr), cropcap->type); + mutex_lock(&zr->resource_lock); + *std = zr->norm; + mutex_unlock(&zr->resource_lock); + return 0; +} -- memset(cropcap, 0, sizeof(*cropcap)); -- cropcap->type = type; +- dprintk(3, KERN_ERR "%s: VIDIOC_CROPCAP - type=%d\n", +- ZR_DEVNAME(zr), cropcap->type); +static int zoran_s_std(struct file *file, void *__fh, v4l2_std_id *std) +{ + struct zoran_fh *fh = __fh; + struct zoran *zr = fh->zr; + int res = 0; -- mutex_lock(&zr->resource_lock); +- memset(cropcap, 0, sizeof(*cropcap)); +- cropcap->type = type; + mutex_lock(&zr->resource_lock); + res = zoran_set_norm(zr, *std); + if (res) + goto sstd_unlock_and_return; +- mutex_lock(&zr->resource_lock); ++ res = wait_grab_pending(zr); ++sstd_unlock_and_return: ++ mutex_unlock(&zr->resource_lock); ++ return res; ++} + - if (cropcap->type != V4L2_BUF_TYPE_VIDEO_OUTPUT && - (cropcap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE || - fh->map_mode == ZORAN_MAP_MODE_RAW)) { @@ -51832,11 +65728,11 @@ - res = -EINVAL; - goto cropcap_unlock_and_return; - } -+ res = wait_grab_pending(zr); -+sstd_unlock_and_return: -+ mutex_unlock(&zr->resource_lock); -+ return res; -+} ++static int zoran_enum_input(struct file *file, void *__fh, ++ struct v4l2_input *inp) ++{ ++ struct zoran_fh *fh = __fh; ++ struct zoran *zr = fh->zr; - cropcap->bounds.top = cropcap->bounds.left = 0; - cropcap->bounds.width = BUZ_MAX_WIDTH; @@ -51847,33 +65743,27 @@ - cropcap_unlock_and_return: - mutex_unlock(&zr->resource_lock); - return res; -- } -- break; -+static int zoran_enum_input(struct file *file, void *__fh, -+ struct v4l2_input *inp) -+{ -+ struct zoran_fh *fh = __fh; -+ struct zoran *zr = fh->zr; - -- case VIDIOC_G_CROP: -- { -- struct v4l2_crop *crop = arg; -- int type = crop->type, res = 0; + if (inp->index < 0 || inp->index >= zr->card.inputs) + return -EINVAL; + else { + int id = inp->index; + memset(inp, 0, sizeof(*inp)); + inp->index = id; -+ } + } +- break; -- dprintk(3, KERN_ERR "%s: VIDIOC_G_CROP - type=%d\n", -- ZR_DEVNAME(zr), crop->type); +- case VIDIOC_G_CROP: +- { +- struct v4l2_crop *crop = arg; +- int type = crop->type, res = 0; + strncpy(inp->name, zr->card.input[inp->index].name, + sizeof(inp->name) - 1); + inp->type = V4L2_INPUT_TYPE_CAMERA; + inp->std = V4L2_STD_ALL; +- dprintk(3, KERN_ERR "%s: VIDIOC_G_CROP - type=%d\n", +- ZR_DEVNAME(zr), crop->type); +- - memset(crop, 0, sizeof(*crop)); - crop->type = type; + /* Get status of video decoder */ @@ -52381,7 +66271,7 @@ } static unsigned int -@@ -4300,10 +3260,7 @@ zoran_vm_close (struct vm_area_struct *vma) +@@ -4300,10 +3255,7 @@ zoran_vm_close (struct vm_area_struct *vma) fh->jpg_buffers.active = ZORAN_FREE; } @@ -52393,7 +66283,7 @@ mutex_unlock(&zr->resource_lock); } -@@ -4340,10 +3297,7 @@ zoran_vm_close (struct vm_area_struct *vma) +@@ -4340,10 +3292,7 @@ zoran_vm_close (struct vm_area_struct *vma) ZORAN_FREE; spin_unlock_irqrestore(&zr->spinlock, flags); } @@ -52405,7 +66295,7 @@ mutex_unlock(&zr->resource_lock); } -@@ -4582,11 +3536,56 @@ zoran_mmap (struct file *file, +@@ -4582,11 +3531,56 @@ zoran_mmap (struct file *file, return 0; } @@ -52463,7 +66353,7 @@ .read = zoran_read, .write = zoran_write, .mmap = zoran_mmap, -@@ -4596,7 +3595,9 @@ static const struct v4l2_file_operations zoran_fops = { +@@ -4596,7 +3590,9 @@ static const struct v4l2_file_operations zoran_fops = { struct video_device zoran_template __devinitdata = { .name = ZORAN_NAME, .fops = &zoran_fops, @@ -53087,6 +66977,18 @@ !(grpid) || sd->grp_id == (grpid), o, f , ##args) #endif +diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h +index b01c044..a8b4c0b 100644 +--- a/include/media/v4l2-ioctl.h ++++ b/include/media/v4l2-ioctl.h +@@ -267,6 +267,7 @@ struct v4l2_ioctl_ops { + + /* Video standard functions */ + extern const char *v4l2_norm_to_name(v4l2_std_id id); ++extern void v4l2_video_std_frame_period(int id, struct v4l2_fract *frameperiod); + extern int v4l2_video_std_construct(struct v4l2_standard *vs, + int id, const char *name); + /* Prints the ioctl in a human-readable format */ diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 37b09e5..05b6965 100644 --- a/include/media/v4l2-subdev.h xen.pvops.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1.2.8 -r 1.1.2.9 xen.pvops.patch Index: xen.pvops.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -r1.1.2.8 -r1.1.2.9 --- xen.pvops.patch 5 Mar 2009 01:30:26 -0000 1.1.2.8 +++ xen.pvops.patch 5 Mar 2009 22:45:11 -0000 1.1.2.9 @@ -7768,6 +7768,21 @@ *(.data.percpu) *(.data.percpu.shared_aligned) __per_cpu_end = .; +diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c +index fb371f5..d6b772b 100644 +--- a/arch/powerpc/platforms/86xx/gef_sbc610.c ++++ b/arch/powerpc/platforms/86xx/gef_sbc610.c +@@ -142,6 +142,10 @@ static void __init gef_sbc610_nec_fixup(struct pci_dev *pdev) + { + unsigned int val; + ++ /* Do not do the fixup on other platforms! */ ++ if (!machine_is(gef_sbc610)) ++ return; ++ + printk(KERN_INFO "Running NEC uPD720101 Fixup\n"); + + /* Ensure ports 1, 2, 3, 4 & 5 are enabled */ diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index e868b5c..dc0f3c9 100644 --- a/arch/powerpc/platforms/Kconfig.cputype @@ -7940,7 +7955,7 @@ seq_printf(p, " %14s", irq_desc[i].chip->typename); seq_printf(p, " %s", action->name); diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index bc2fbad..a866e76 100644 +index bc2fbad..2030a80 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -5,7 +5,7 @@ mainmenu "Linux Kernel Configuration for x86" @@ -8595,7 +8610,7 @@ Additional support for intel specific MCE features such as the thermal monitor. -@@ -747,14 +782,14 @@ config X86_MCE_AMD +@@ -747,14 +782,19 @@ config X86_MCE_AMD def_bool y prompt "AMD MCE features" depends on X86_64 && X86_MCE && X86_LOCAL_APIC @@ -8604,6 +8619,11 @@ Additional support for AMD specific MCE features such as the DRAM Error Threshold. ++config X86_MCE_THRESHOLD ++ depends on X86_MCE_AMD || X86_MCE_INTEL ++ bool ++ default y ++ config X86_MCE_NONFATAL tristate "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4" depends on X86_32 && X86_MCE @@ -8612,7 +8632,7 @@ Enabling this feature starts a timer that triggers every 5 seconds which will look at the machine check registers to see if anything happened. Non-fatal problems automatically get corrected (but still logged). -@@ -767,7 +802,7 @@ config X86_MCE_NONFATAL +@@ -767,7 +807,7 @@ config X86_MCE_NONFATAL config X86_MCE_P4THERMAL bool "check for P4 thermal throttling interrupt." depends on X86_32 && X86_MCE && (X86_UP_APIC || SMP) @@ -8621,7 +8641,7 @@ Enabling this feature will cause a message to be printed when the P4 enters thermal throttling. -@@ -775,11 +810,11 @@ config VM86 +@@ -775,11 +815,11 @@ config VM86 bool "Enable VM86 support" if EMBEDDED default y depends on X86_32 @@ -8637,7 +8657,7 @@ config TOSHIBA tristate "Toshiba Laptop support" -@@ -853,33 +888,33 @@ config MICROCODE +@@ -853,33 +893,33 @@ config MICROCODE module will be called microcode. config MICROCODE_INTEL @@ -8690,7 +8710,7 @@ This device gives privileged processes access to the x86 Model-Specific Registers (MSRs). It is a character device with major 202 and minors 0 to 31 for /dev/cpu/0/msr to /dev/cpu/31/msr. -@@ -888,7 +923,7 @@ config X86_MSR +@@ -888,7 +928,7 @@ config X86_MSR config X86_CPUID tristate "/dev/cpu/*/cpuid - CPU information support" @@ -8699,7 +8719,7 @@ This device gives processes access to the x86 CPUID instruction to be executed on a specific processor. It is a character device with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to -@@ -940,7 +975,7 @@ config NOHIGHMEM +@@ -940,7 +980,7 @@ config NOHIGHMEM config HIGHMEM4G bool "4GB" depends on !X86_NUMAQ @@ -8708,7 +8728,7 @@ Select this if you have a 32-bit processor and between 1 and 4 gigabytes of physical RAM. -@@ -948,7 +983,7 @@ config HIGHMEM64G +@@ -948,7 +988,7 @@ config HIGHMEM64G bool "64GB" depends on !M386 && !M486 select X86_PAE @@ -8717,7 +8737,7 @@ Select this if you have a 32-bit processor and more than 4 gigabytes of physical RAM. -@@ -959,7 +994,7 @@ choice +@@ -959,7 +999,7 @@ choice prompt "Memory split" if EMBEDDED default VMSPLIT_3G depends on X86_32 @@ -8726,7 +8746,7 @@ Select the desired split between kernel and user memory. If the address range available to the kernel is less than the -@@ -1005,20 +1040,20 @@ config HIGHMEM +@@ -1005,20 +1045,20 @@ config HIGHMEM config X86_PAE bool "PAE (Physical Address Extension) Support" depends on X86_32 && !HIGHMEM4G @@ -8750,7 +8770,7 @@ Allow the kernel linear mapping to use 1GB pages on CPUs that support it. This can improve the kernel's performance a tiny bit by reducing TLB pressure. If in doubt, say "Y". -@@ -1028,9 +1063,8 @@ config NUMA +@@ -1028,9 +1068,8 @@ config NUMA bool "Numa Memory Allocation and Scheduler Support" depends on SMP depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL) @@ -8761,7 +8781,7 @@ Enable NUMA (Non Uniform Memory Access) support. The kernel will try to allocate memory used by a CPU on the -@@ -1053,19 +1087,19 @@ config K8_NUMA +@@ -1053,19 +1092,19 @@ config K8_NUMA def_bool y prompt "Old style AMD Opteron NUMA detection" depends on X86_64 && NUMA && PCI @@ -8788,7 +8808,7 @@ Enable ACPI SRAT based node topology detection. # Some NUMA nodes have memory ranges that span -@@ -1080,7 +1114,7 @@ config NODES_SPAN_OTHER_NODES +@@ -1080,7 +1119,7 @@ config NODES_SPAN_OTHER_NODES config NUMA_EMU bool "NUMA emulation" depends on X86_64 && NUMA @@ -8797,7 +8817,7 @@ Enable NUMA emulation. A flat machine will be split into virtual nodes when booted with "numa=fake=N", where N is the number of nodes. This is only useful for debugging. -@@ -1093,11 +1127,11 @@ config NODES_SHIFT +@@ -1093,11 +1132,11 @@ config NODES_SHIFT default "4" if X86_NUMAQ default "3" depends on NEED_MULTIPLE_NODES @@ -8811,7 +8831,7 @@ def_bool y depends on X86_32 && NUMA -@@ -1131,7 +1165,7 @@ config ARCH_SPARSEMEM_DEFAULT +@@ -1131,7 +1170,7 @@ config ARCH_SPARSEMEM_DEFAULT config ARCH_SPARSEMEM_ENABLE def_bool y @@ -8820,7 +8840,7 @@ select SPARSEMEM_STATIC if X86_32 select SPARSEMEM_VMEMMAP_ENABLE if X86_64 -@@ -1143,66 +1177,71 @@ config ARCH_MEMORY_PROBE +@@ -1143,66 +1182,71 @@ config ARCH_MEMORY_PROBE def_bool X86_64 depends on MEMORY_HOTPLUG @@ -8931,7 +8951,7 @@ config MATH_EMULATION bool -@@ -1268,7 +1307,7 @@ config MTRR_SANITIZER +@@ -1268,7 +1312,7 @@ config MTRR_SANITIZER def_bool y prompt "MTRR cleanup support" depends on MTRR @@ -8940,7 +8960,7 @@ Convert MTRR layout from continuous to discrete, so X drivers can add writeback entries. -@@ -1283,7 +1322,7 @@ config MTRR_SANITIZER_ENABLE_DEFAULT [...5797 lines suppressed...] +@@ -280,6 +299,10 @@ extern void __ftrace_bad_type(void); TRACE_GRAPH_RET); \ IF_ASSIGN(var, ent, struct hw_branch_entry, TRACE_HW_BRANCHES);\ IF_ASSIGN(var, ent, struct trace_power, TRACE_POWER); \ @@ -115431,7 +117663,7 @@ __ftrace_bad_type(); \ } while (0) -@@ -287,7 +309,8 @@ extern void __ftrace_bad_type(void); +@@ -287,7 +310,8 @@ extern void __ftrace_bad_type(void); enum print_line_t { TRACE_TYPE_PARTIAL_LINE = 0, /* Retry after flushing the seq */ TRACE_TYPE_HANDLED = 1, @@ -115441,7 +117673,7 @@ }; -@@ -313,22 +336,45 @@ struct tracer_flags { +@@ -313,22 +337,45 @@ struct tracer_flags { /* Makes more easy to define a tracer opt */ #define TRACER_OPT(s, b) .name = #s, .bit = b @@ -115490,7 +117722,7 @@ #ifdef CONFIG_FTRACE_STARTUP_TEST int (*selftest)(struct tracer *trace, struct trace_array *tr); -@@ -340,6 +386,7 @@ struct tracer { +@@ -340,6 +387,7 @@ struct tracer { struct tracer *next; int print_max; struct tracer_flags *flags; @@ -115498,7 +117730,7 @@ }; struct trace_seq { -@@ -348,6 +395,16 @@ struct trace_seq { +@@ -348,6 +396,16 @@ struct trace_seq { unsigned int readpos; }; @@ -115515,7 +117747,7 @@ /* * Trace iterator - used by printout routines who present trace * results to users and which routines might sleep, etc: -@@ -356,6 +413,8 @@ struct trace_iterator { +@@ -356,6 +414,8 @@ struct trace_iterator { struct trace_array *tr; struct tracer *trace; void *private; @@ -115524,7 +117756,7 @@ struct ring_buffer_iter *buffer_iter[NR_CPUS]; /* The below is zeroed out in pipe_read */ -@@ -371,6 +430,7 @@ struct trace_iterator { +@@ -371,6 +431,7 @@ struct trace_iterator { cpumask_var_t started; }; @@ -115532,7 +117764,7 @@ int tracing_is_enabled(void); void trace_wake_up(void); void tracing_reset(struct trace_array *tr, int cpu); -@@ -379,26 +439,48 @@ int tracing_open_generic(struct inode *inode, struct file *filp); +@@ -379,26 +440,48 @@ int tracing_open_generic(struct inode *inode, struct file *filp); struct dentry *tracing_init_dentry(void); void init_tracer_sysprof_debugfs(struct dentry *d_tracer); @@ -115583,7 +117815,7 @@ struct task_struct *wakee, struct task_struct *cur, unsigned long flags, int pc); -@@ -408,14 +490,12 @@ void trace_special(struct trace_array *tr, +@@ -408,14 +491,12 @@ void trace_special(struct trace_array *tr, unsigned long arg2, unsigned long arg3, int pc); void trace_function(struct trace_array *tr, @@ -115598,7 +117830,7 @@ void tracing_start_cmdline_record(void); void tracing_stop_cmdline_record(void); -@@ -434,15 +514,11 @@ void update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu); +@@ -434,15 +515,11 @@ void update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu); void update_max_tr_single(struct trace_array *tr, struct task_struct *tsk, int cpu); @@ -115618,7 +117850,7 @@ #ifdef CONFIG_CONTEXT_SWITCH_TRACER typedef void -@@ -456,10 +532,10 @@ struct tracer_switch_ops { +@@ -456,10 +533,10 @@ struct tracer_switch_ops { void *private; struct tracer_switch_ops *next; }; @@ -115631,7 +117863,7 @@ #ifdef CONFIG_DYNAMIC_FTRACE extern unsigned long ftrace_update_tot_cnt; #define DYN_FTRACE_TEST_NAME trace_selftest_dynamic_test_func -@@ -469,6 +545,8 @@ extern int DYN_FTRACE_TEST_NAME(void); +@@ -469,6 +546,8 @@ extern int DYN_FTRACE_TEST_NAME(void); #ifdef CONFIG_FTRACE_STARTUP_TEST extern int trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr); @@ -115640,7 +117872,7 @@ extern int trace_selftest_startup_irqsoff(struct tracer *trace, struct trace_array *tr); extern int trace_selftest_startup_preemptoff(struct tracer *trace, -@@ -488,15 +566,6 @@ extern int trace_selftest_startup_branch(struct tracer *trace, +@@ -488,15 +567,6 @@ extern int trace_selftest_startup_branch(struct tracer *trace, #endif /* CONFIG_FTRACE_STARTUP_TEST */ extern void *head_page(struct trace_array_cpu *data); @@ -115656,7 +117888,7 @@ extern long ns2usecs(cycle_t nsec); extern int trace_vprintk(unsigned long ip, int depth, const char *fmt, va_list args); -@@ -580,7 +649,8 @@ enum trace_iterator_flags { +@@ -580,7 +650,8 @@ enum trace_iterator_flags { TRACE_ITER_ANNOTATE = 0x2000, TRACE_ITER_USERSTACKTRACE = 0x4000, TRACE_ITER_SYM_USEROBJ = 0x8000, @@ -115666,7 +117898,7 @@ }; /* -@@ -601,12 +671,12 @@ extern struct tracer nop_trace; +@@ -601,12 +672,12 @@ extern struct tracer nop_trace; * preempt_enable (after a disable), a schedule might take place * causing an infinite recursion. * @@ -115681,7 +117913,7 @@ * and we have yet to reschedule, we are either in an atomic location * (where we do not need to check for scheduling) or we are inside * the scheduler and do not want to resched. -@@ -627,7 +697,7 @@ static inline int ftrace_preempt_disable(void) +@@ -627,7 +698,7 @@ static inline int ftrace_preempt_disable(void) * * This is a scheduler safe way to enable preemption and not miss * any preemption checks. The disabled saved the state of preemption. @@ -115690,7 +117922,7 @@ * are inside the scheduler (we would have already scheduled * otherwise). In this case, we do not want to call normal * preempt_enable, but preempt_enable_no_resched instead. -@@ -664,4 +734,31 @@ static inline void trace_branch_disable(void) +@@ -664,4 +735,31 @@ static inline void trace_branch_disable(void) } #endif /* CONFIG_BRANCH_TRACER */ @@ -117266,7 +119498,7 @@ +#include diff --git a/kernel/trace/trace_events_stage_3.h b/kernel/trace/trace_events_stage_3.h new file mode 100644 -index 0000000..041789f +index 0000000..2c8d76c --- /dev/null +++ b/kernel/trace/trace_events_stage_3.h @@ -0,0 +1,235 @@ @@ -117277,7 +119509,7 @@ + * + * static void ftrace_event_(proto) + * { -+ * event_trace_printk(_RET_IP_, "() " ); ++ * event_trace_printk(_RET_IP_, ": " ); + * } + * + * static int ftrace_reg_event_(void) @@ -117384,7 +119616,7 @@ +#define _TRACE_FORMAT(call, proto, args, fmt) \ +static void ftrace_event_##call(proto) \ +{ \ -+ event_trace_printk(_RET_IP_, "(" #call ") " fmt); \ ++ event_trace_printk(_RET_IP_, #call ": " fmt); \ +} \ + \ +static int ftrace_reg_event_##call(void) \ @@ -121791,7 +124023,7 @@ boolean depends on !NO_IOMEM diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug -index 1bcf9cd..e57f8e7 100644 +index 1bcf9cd..86c9ba0 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -9,8 +9,20 @@ config PRINTK_TIME @@ -121901,6 +124133,15 @@ default n help Boot with debugging on by default. SLUB boots by default with +@@ -402,7 +452,7 @@ config LOCKDEP + bool + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT + select STACKTRACE +- select FRAME_POINTER if !X86 && !MIPS && !PPC ++ select FRAME_POINTER if !MIPS && !PPC + select KALLSYMS + select KALLSYMS_ALL + @@ -905,3 +955,5 @@ config DYNAMIC_PRINTK_DEBUG source "samples/Kconfig" From kevin at fedoraproject.org Thu Mar 5 22:56:02 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 22:56:02 +0000 (UTC) Subject: rpms/rkhunter/devel rkhunter-1.3.4-fedoraconfig.patch, NONE, 1.1 rkhunter.spec, 1.20, 1.21 01-rkhunter, 1.5, 1.6 Message-ID: <20090305225602.1549D70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/extras/rpms/rkhunter/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9230 Modified Files: rkhunter.spec 01-rkhunter Added Files: rkhunter-1.3.4-fedoraconfig.patch Log Message: Rework spec file Add check for the new hmac ssh files Update cron job to include hostname (thanks Manuel Wolfshant) rkhunter-1.3.4-fedoraconfig.patch: --- NEW FILE rkhunter-1.3.4-fedoraconfig.patch --- diff -Nur rkhunter-1.3.4.orig/files/rkhunter.conf rkhunter-1.3.4/files/rkhunter.conf --- rkhunter-1.3.4.orig/files/rkhunter.conf 2008-12-30 14:23:00.000000000 -0700 +++ rkhunter-1.3.4/files/rkhunter.conf 2009-03-04 22:09:48.000000000 -0700 @@ -68,7 +68,7 @@ # NOTE: This option should be present in the configuration file. # #MAIL-ON-WARNING=me at mydomain root at mydomain -MAIL-ON-WARNING="" +MAIL-ON-WARNING="root at localhost" # # Specify the mail command to use if MAIL-ON-WARNING is set. @@ -84,17 +84,17 @@ # important files will be written to this directory, so be # sure that the directory permissions are tight. # -#TMPDIR=/var/lib/rkhunter/tmp +TMPDIR=/var/lib/rkhunter/ # # Specify the database directory to use. # -#DBDIR=/var/lib/rkhunter/db +DBDIR=/var/lib/rkhunter/db # # Specify the script directory to use. # -#SCRIPTDIR=/usr/local/lib/rkhunter/scripts +SCRIPTDIR=/usr/share/rkhunter/scripts # # Specify the root directory to use. @@ -123,13 +123,13 @@ # # NOTE: This option should be present in the configuration file. # -LOGFILE=/var/log/rkhunter.log +LOGFILE=/var/log/rkhunter/rkhunter.log # # Set the following option to 1 if the log file is to be appended to # whenever rkhunter is run. # -APPEND_LOG=0 +APPEND_LOG=1 # # Set the following option to enable the rkhunter check start and finish @@ -165,7 +165,7 @@ # file, then a value here of 'yes' or 'unset' will not cause a warning. # This option has a default value of 'no'. # -ALLOW_SSH_ROOT_USER=no +ALLOW_SSH_ROOT_USER=yes # # Set this option to '1' to allow the use of the SSH-1 protocol, but note @@ -205,7 +205,7 @@ # tests, the test names, and how rkhunter behaves when these options are used. # ENABLE_TESTS="all" -DISABLE_TESTS="suspscan hidden_procs deleted_files packet_cap_apps" +DISABLE_TESTS="additional_rkts suspscan hidden_procs deleted_files packet_cap_apps" # # The HASH_FUNC option can be used to specify the command to use @@ -260,7 +260,7 @@ # For any file not part of a package, rkhunter will revert to using # the HASH_FUNC hash function instead. # -#PKGMGR=NONE +PKGMGR=RPM # # Whitelist the hash (content) for the specified files. Only useful @@ -298,6 +298,12 @@ #SCRIPTWHITELIST=/sbin/ifup #SCRIPTWHITELIST=/sbin/ifdown #SCRIPTWHITELIST=/usr/bin/groups +SCRIPTWHITELIST=/usr/bin/whatis +SCRIPTWHITELIST=/usr/bin/ldd +SCRIPTWHITELIST=/usr/bin/groups +SCRIPTWHITELIST=/usr/bin/GET +SCRIPTWHITELIST=/sbin/ifup +SCRIPTWHITELIST=/sbin/ifdown # # Allow the specified commands to have the immutable attribute set. @@ -310,7 +316,7 @@ # One directory per line (use multiple ALLOWHIDDENDIR lines). # #ALLOWHIDDENDIR=/etc/.java -#ALLOWHIDDENDIR=/dev/.udev +ALLOWHIDDENDIR=/dev/.udev #ALLOWHIDDENDIR=/dev/.udevdb #ALLOWHIDDENDIR=/dev/.udev.tdb #ALLOWHIDDENDIR=/dev/.static @@ -322,9 +328,18 @@ # One file per line (use multiple ALLOWHIDDENFILE lines). # #ALLOWHIDDENFILE=/etc/.java -#ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz +ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz #ALLOWHIDDENFILE=/etc/.pwd.lock #ALLOWHIDDENFILE=/etc/.init.state +# +# Allow hmac ssh files for Fedora +# +ALLOWHIDDENFILE=/usr/bin/.ssh.hmac +ALLOWHIDDENFILE=/usr/bin/.ssh-keyscan.hmac +ALLOWHIDDENFILE=/usr/bin/.ssh-keygen.hmac +ALLOWHIDDENFILE=/usr/bin/.ssh-add.hmac +ALLOWHIDDENFILE=/usr/bin/.ssh-agent.hmac +ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac # # Allow the specified processes to use deleted files. @@ -367,7 +382,7 @@ # ALLOWDEVFILE lines). # #ALLOWDEVFILE=/dev/abc -#ALLOWDEVFILE=/dev/shm/pulse-shm-* +ALLOWDEVFILE=/dev/shm/pulse-shm-* # # This setting tells rkhunter where the inetd configuration @@ -460,7 +475,7 @@ # file. This setting will be worked out by rkhunter, and so should not # usually need to be set. # -#SYSLOG_CONFIG_FILE=/etc/syslog.conf +SYSLOG_CONFIG_FILE=/etc/rsyslog.conf # # This option permits the use of syslog remote logging. @@ -549,7 +564,7 @@ # specified, then RKH will assume the O/S release information is on the # first non-blank line of the file. # -#OS_VERSION_FILE="/etc/release" +OS_VERSION_FILE="/etc/redhat-release" # # The following two options can be used to whitelist files and directories @@ -578,3 +593,4 @@ # #MODULES_DIR="" +INSTALLDIR="/usr" Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- rkhunter.spec 25 Feb 2009 20:02:58 -0000 1.20 +++ rkhunter.spec 5 Mar 2009 22:55:31 -0000 1.21 @@ -1,6 +1,6 @@ Name: rkhunter Version: 1.3.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A host-based tool to scan for rootkits, backdoors and local exploits Group: Applications/System @@ -10,6 +10,7 @@ Source1: http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz.sha1.txt Source2: 01-rkhunter Source3: rkhunter.sysconfig +Patch0: rkhunter-1.3.4-fedoraconfig.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,40 +27,7 @@ %setup -q -%{__perl} -pi.0001 -e ' - s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|; - s|^#(TMPDIR=).+$|$1%{_var}/lib/%{name}|; - s|^#(DBDIR=).+$|$1%{_var}/lib/%{name}/db|; - s|^#(SCRIPTDIR=).+$|$1%{_datadir}/%{name}/scripts|; - s|^#(PKGMGR=).+$|$1RPM|; -%if 0%{?el4}%{?el5} - s|^#(OS_VERSION_FILE=).+$|$1/etc/redhat-release|; -%else - s|^#(OS_VERSION_FILE=).+$|$1/etc/fedora-release|; -%endif - s|^#(ALLOWHIDDENDIR=).+$|$1/dev/.udev|; - s|^#(ALLOWHIDDENFILE=).+$|$1/usr/share/man/man1/..1.gz|; - s|^(APPEND_LOG=).+$|$11|; - s|^(LOGFILE=).+$|$1/var/log/rkhunter/rkhunter.log|; - s|^(ALLOW_SSH_ROOT_USER=).+$|$1yes|; - s|^(DISABLE_TESTS=).+$|$1"additional_rkts suspscan hidden_procs deleted_files packet_cap_apps"|; - ' files/%{name}.conf - -# Add Fedora specific configs -echo "INSTALLDIR=%{_prefix}" >> files/%{name}.conf -echo "SCRIPTWHITELIST=/usr/bin/whatis" >> files/%name.conf -echo "SCRIPTWHITELIST=/usr/bin/ldd" >> files/%name.conf -echo "SCRIPTWHITELIST=/usr/bin/groups" >> files/%name.conf -echo "SCRIPTWHITELIST=/usr/bin/GET" >> files/%name.conf -echo "SCRIPTWHITELIST=/sbin/ifup" >> files/%name.conf -echo "SCRIPTWHITELIST=/sbin/ifdown" >> files/%name.conf -# in f8/f9/f10 -%if 0%{?fc8}%{?fc9}%{?fc10} -echo "SYSLOG_CONFIG_FILE=/etc/rsyslog.conf" >> files/%name.conf -echo "ALLOWDEVFILE=/dev/shm/pulse-shm-*" >> files/%name.conf -%else -echo "SYSLOG_CONFIG_FILE=/etc/syslog.conf" >> files/%name.conf -%endif +%patch0 -p1 %{__cat} <<'EOF' >%{name}.logrotate %{_localstatedir}/log/%{name}/%{name}.log { @@ -136,6 +104,13 @@ %{_mandir}/man8/* %changelog +* Wed Mar 04 2009 Kevin Fenzi - 1.3.4-4 +- Rework spec file +- Add check for the new hmac ssh files + +* Thu Feb 26 2009 Kevin Fenzi - 1.3.4-3 +- Update cron job to include hostname (thanks Manuel Wolfshant) + * Wed Feb 25 2009 Fedora Release Engineering - 1.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: 01-rkhunter =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/01-rkhunter,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- 01-rkhunter 14 Dec 2008 01:20:11 -0000 1.5 +++ 01-rkhunter 5 Mar 2009 22:55:31 -0000 1.6 @@ -42,7 +42,7 @@ >> $TMPFILE1 if [ $XITVAL != 0 ]; then - /bin/cat $TMPFILE1 | /bin/mail -s 'rkhunter Daily Run' $MAILTO + /bin/cat $TMPFILE1 | /bin/mail -s "rkhunter Daily Run on $(hostname)" $MAILTO fi /bin/cat $TMPFILE1 >> $LOGFILE fi From apevec at fedoraproject.org Thu Mar 5 22:58:49 2009 From: apevec at fedoraproject.org (Alan Pevec) Date: Thu, 5 Mar 2009 22:58:49 +0000 (UTC) Subject: rpms/perl-Config-Augeas/F-10 perl-Config-Augeas.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <20090305225849.319AE70116@cvs1.fedora.phx.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/perl-Config-Augeas/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9827 Modified Files: perl-Config-Augeas.spec sources Log Message: * Thu Feb 26 2009 Alan Pevec - 0.400-1 - new upstream release 0.400 Index: perl-Config-Augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Augeas/F-10/perl-Config-Augeas.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Config-Augeas.spec 25 Nov 2008 08:22:06 -0000 1.5 +++ perl-Config-Augeas.spec 5 Mar 2009 22:58:18 -0000 1.6 @@ -1,5 +1,5 @@ Name: perl-Config-Augeas -Version: 0.304 +Version: 0.400 Release: 1%{?dist} Summary: Edit configuration files through Augeas C library License: LGPLv2+ @@ -47,6 +47,19 @@ %{_mandir}/man3/* %changelog +* Thu Feb 26 2009 Alan Pevec - 0.400-1 +- new upstream release 0.400 + * lib/Config/Augeas.xs (match): dies if aug_match returns -1. Perl + programmer can choose to trap this failure with eval or Error + module. + * lib/Config/Augeas.pm (match): cleanup trailing slashes in + path (required by new behavior of Augeas 0.4.0) + +- new upstream release 0.305 + * t/Config-AugeasC.t: Removed test involving AUGROOT environment + variable (Lead to FTBS on Debian amd64). The removed tests are + already performed passing augeas root through aug_init. + * Tue Nov 25 2008 Alan Pevec 0.304-1 - new upstream release 0.304 * lib/Config/Augeas.pm (print): Improved print method. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Augeas/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 Nov 2008 08:22:07 -0000 1.6 +++ sources 5 Mar 2009 22:58:18 -0000 1.7 @@ -1 +1 @@ -7f5557d700f3715b401558ae676d737c Config-Augeas-0.304.tar.gz +04313b664977ef556f8c0dcf91d571a5 Config-Augeas-0.400.tar.gz From krh at fedoraproject.org Thu Mar 5 22:59:28 2009 From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=) Date: Thu, 5 Mar 2009 22:59:28 +0000 (UTC) Subject: rpms/xorg-x11-drv-intel/devel copy-fb.patch, 1.2, 1.3 xorg-x11-drv-intel.spec, 1.7, 1.8 Message-ID: <20090305225928.3636970116@cvs1.fedora.phx.redhat.com> Author: krh Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9951 Modified Files: copy-fb.patch xorg-x11-drv-intel.spec Log Message: * Thu Mar 5 2009 Kristian H??gsberg - 2.6.0-14 - Fix copy-fb patch to skip dpms off on initial modeset. - Downgrade the conflicts to a requires. copy-fb.patch: Index: copy-fb.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/copy-fb.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- copy-fb.patch 25 Feb 2009 03:43:11 -0000 1.2 +++ copy-fb.patch 5 Mar 2009 22:58:57 -0000 1.3 @@ -1,6 +1,13 @@ -diff -up xf86-video-intel-2.6.0/src/drmmode_display.c.copy-fb xf86-video-intel-2.6.0/src/drmmode_display.c ---- xf86-video-intel-2.6.0/src/drmmode_display.c.copy-fb 2009-02-24 21:43:59.000000000 -0500 -+++ xf86-video-intel-2.6.0/src/drmmode_display.c 2009-02-24 22:10:51.000000000 -0500 +commit b209cbc72f8d524b2c4c6d0e6e6acf8385e96062 +Author: Kristian H??gsberg +Date: Tue Feb 24 10:49:45 2009 -0500 + + Copy initial framebuffer contents when starting with -br. + +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index df0f1a2..35dc24c 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c @@ -29,6 +29,8 @@ #include "config.h" #endif @@ -10,7 +17,7 @@ #include "xorgVersion.h" #ifdef XF86DRM_MODE -@@ -145,7 +147,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, +@@ -145,7 +147,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, unsigned int pitch = pScrn->displayWidth * pI830->cpp; if (drmmode->fb_id == 0) { @@ -19,7 +26,21 @@ pScrn->virtualX, pScrn->virtualY, pScrn->depth, pScrn->bitsPerPixel, pitch, pI830->front_buffer->bo->handle, -@@ -733,6 +735,8 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, +@@ -523,6 +525,13 @@ drmmode_output_dpms(xf86OutputPtr output, int mode) + drmmode_ptr drmmode = drmmode_output->drmmode; + int i; + drmModePropertyPtr props; ++ I830Ptr pI830 = I830PTR(output->scrn); ++ ++ /* xf86Crtc.c calls dpms off in set desired modes, so ignore ++ * the request if we're starting up. */ ++ ++ if (pI830->starting) ++ return; + + for (i = 0; i < koutput->count_props; i++) { + props = drmModeGetProperty(drmmode->fd, koutput->props[i]); +@@ -753,6 +762,8 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp) xf86InitialConfiguration(pScrn, pI830->can_resize); @@ -28,7 +49,7 @@ return TRUE; } -@@ -760,4 +764,96 @@ Bool drmmode_is_rotate_pixmap(ScrnInfoPt +@@ -780,4 +791,97 @@ Bool drmmode_is_rotate_pixmap(ScrnInfoPtr pScrn, pointer pPixData, dri_bo **bo) #endif } @@ -48,9 +69,10 @@ + + for (i = 0; i < drmmode->mode_res->count_crtcs; i++) { + drmmode_crtc = xf86_config->crtc[i]->driver_private; -+ fbcon = drmModeGetFB(drmmode->fd, drmmode_crtc->mode_crtc->buffer_id); -+ ErrorF("buffer_id: %d, fbcon: %p\n", -+ drmmode_crtc->mode_crtc->buffer_id, fbcon); ++ if (drmmode_crtc->mode_crtc->buffer_id == 0) ++ continue; ++ fbcon = drmModeGetFB(drmmode->fd, ++ drmmode_crtc->mode_crtc->buffer_id); + if (fbcon != NULL) + break; + } @@ -125,10 +147,23 @@ +} + #endif -diff -up xf86-video-intel-2.6.0/src/i830_driver.c.copy-fb xf86-video-intel-2.6.0/src/i830_driver.c ---- xf86-video-intel-2.6.0/src/i830_driver.c.copy-fb 2009-02-24 21:43:59.000000000 -0500 -+++ xf86-video-intel-2.6.0/src/i830_driver.c 2009-02-24 21:43:59.000000000 -0500 -@@ -3690,6 +3690,8 @@ I830EnterVT(int scrnIndex, int flags) +diff --git a/src/i830.h b/src/i830.h +index cd9c38a..8651169 100644 +--- a/src/i830.h ++++ b/src/i830.h +@@ -835,6 +835,7 @@ void I830DRI2CloseScreen(ScreenPtr pScreen); + extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp); + extern Bool drmmode_is_rotate_pixmap(ScrnInfoPtr pScrn, pointer pPixData, + dri_bo **bo); ++extern void drmmode_copy_fb(ScrnInfoPtr pScrn); + #endif + + extern Bool I830AccelInit(ScreenPtr pScreen); +diff --git a/src/i830_driver.c b/src/i830_driver.c +index f80ca69..0591db9 100644 +--- a/src/i830_driver.c ++++ b/src/i830_driver.c +@@ -3725,6 +3725,8 @@ I830EnterVT(int scrnIndex, int flags) /* Clear the framebuffer */ memset(pI830->FbBase + pScrn->fbOffset, 0, pScrn->virtualY * pScrn->displayWidth * pI830->cpp); @@ -137,14 +172,3 @@ } if (!xf86SetDesiredModes (pScrn)) -diff -up xf86-video-intel-2.6.0/src/i830.h.copy-fb xf86-video-intel-2.6.0/src/i830.h ---- xf86-video-intel-2.6.0/src/i830.h.copy-fb 2009-02-24 21:43:59.000000000 -0500 -+++ xf86-video-intel-2.6.0/src/i830.h 2009-02-24 21:43:59.000000000 -0500 -@@ -832,6 +832,7 @@ void I830DRI2CloseScreen(ScreenPtr pScre - extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp); - extern Bool drmmode_is_rotate_pixmap(ScrnInfoPtr pScrn, pointer pPixData, - dri_bo **bo); -+extern void drmmode_copy_fb(ScrnInfoPtr pScrn); - #endif - - extern Bool I830AccelInit(ScreenPtr pScreen); Index: xorg-x11-drv-intel.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xorg-x11-drv-intel.spec 5 Mar 2009 14:45:16 -0000 1.7 +++ xorg-x11-drv-intel.spec 5 Mar 2009 22:58:57 -0000 1.8 @@ -8,7 +8,7 @@ Summary: Xorg X11 Intel video driver(s) Name: xorg-x11-drv-intel Version: 2.6.0 -Release: 13%{?dist} +Release: 14%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -40,8 +40,7 @@ Requires: xorg-x11-server-Xorg >= 1.4.99.1 Conflicts: kudzu < 1.2.42-1 -Conflicts: kernel < 2.6.29-0.207.rc7.fc11 -Conflicts: kernel-PAE < 2.6.29-0.207.rc7.fc11 +Requires: kernel >= 2.6.29-0.203.rc7.fc11 Provides: %{legacyname} = %{legacyver} Obsoletes: %{legacyname} < %{legacyver} @@ -105,6 +104,10 @@ %{_libdir}/libIntelXvMC.so %changelog +* Thu Mar 5 2009 Kristian H??gsberg - 2.6.0-14 +- Fix copy-fb patch to skip dpms off on initial modeset. +- Downgrade the conflicts to a requires. + * Thu Mar 5 2009 Kristian H??gsberg - 2.6.0-13 - Add conflicts to make sure we have a new enough kernel that drmSetMaster() doesn't deadlock. From mathstuf at fedoraproject.org Thu Mar 5 22:59:51 2009 From: mathstuf at fedoraproject.org (Ben Boeckel) Date: Thu, 5 Mar 2009 22:59:51 +0000 (UTC) Subject: rpms/sigen/devel .cvsignore, 1.2, 1.3 sigen.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <20090305225951.C32E570116@cvs1.fedora.phx.redhat.com> Author: mathstuf Update of /cvs/pkgs/rpms/sigen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10116 Modified Files: .cvsignore sigen.spec sources Log Message: Update to 0.1.1, fix requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sigen/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Sep 2008 04:33:31 -0000 1.2 +++ .cvsignore 5 Mar 2009 22:59:21 -0000 1.3 @@ -1 +1 @@ -sigen-0.0.2.tar.bz2 +sigen-0.1.1.tar.bz2 Index: sigen.spec =================================================================== RCS file: /cvs/pkgs/rpms/sigen/devel/sigen.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sigen.spec 28 Feb 2009 06:25:51 -0000 1.8 +++ sigen.spec 5 Mar 2009 22:59:21 -0000 1.9 @@ -1,17 +1,12 @@ Name: sigen -Version: 0.0.2 -Release: 0.29.20090228git%{?dist} +Version: 0.1.1 +Release: 1%{?dist} Summary: An RPG/strategy engine Group: Amusements/Games License: GPLv3+ URL: http://www.sourceforge.net/projects/sigen -# The source for this package was pulled from upstream's vcs. Use the -# following commands to generate the tarball: -# git clone git://fedorapeople.org/~mathstuf/sigen.git -# cd sigen -# git archive --format=tar --prefix=sigen-0.0.2/ c81259d | bzip2 --best > ../sigen-0.0.2.tar.bz2 -Source0: %{name}-%{version}.tar.bz2 +Source0: http://benboeckel.net/sigen/src/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -26,6 +21,10 @@ # May use this to link to documentation in the future # BuildRequires: kdelibs4-apidocs # BuildRequires: qt-doc +# The following are necessary due to designer plugins +# being included in -devel packages until these releases +Requires: qt4-x11 >= 4.5.0-3 +Requires: kdelibs4 >= 4.2.1-4 %description The Sigma Game Engine is an RPG/strategy game engine. @@ -54,14 +53,23 @@ %build -%{cmake_kde4} -DBUILD_sigbattle=OFF -DBUILD_sigencore=OFF -DBUILD_signet=OFF -DBUILD_sigscript=OFF -DBUILD_sigworld=OFF -make VERBOSE=1 %{?_smp_mflags} +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake_kde4} \ + -DBUILD_sigbattle=OFF \ + -DBUILD_sigencore=OFF \ + -DBUILD_signet=OFF \ + -DBUILD_sigscript=OFF \ + -DBUILD_sigworld=OFF \ + .. +popd +make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} mkdir -p %{buildroot} -make DESTDIR=%{buildroot} PREFIX=%{_prefix} install +make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C %{_target_platform} install/fast %clean @@ -86,17 +94,16 @@ %{_docdir}/%{name}-%{version} %{_bindir}/sigmodr %{_libdir}/libsigcore.so.0 -%{_libdir}/libsigcore.so.0.0.2 +%{_libdir}/libsigcore.so.0.1.1 %{_libdir}/libsigmod.so.0 -%{_libdir}/libsigmod.so.0.0.2 +%{_libdir}/libsigmod.so.0.1.1 %{_libdir}/libsigmodrcorewidgets.so.0 -%{_libdir}/libsigmodrcorewidgets.so.0.0.2 +%{_libdir}/libsigmodrcorewidgets.so.0.1.1 %{_libdir}/libsigmodrwidgets.so.0 -%{_libdir}/libsigmodrwidgets.so.0.0.2 +%{_libdir}/libsigmodrwidgets.so.0.1.1 %{_libdir}/libsigmodrtree.so.0 -%{_libdir}/libsigmodrtree.so.0.0.2 +%{_libdir}/libsigmodrtree.so.0.1.1 %{_datadir}/mime/packages/ -%{_datadir}/mimelnk/application/ %{_datadir}/applications/ %{_kde4_appsdir}/sigmodr/ %{_kde4_configdir}.kcfg/sigmodr.kcfg @@ -117,6 +124,10 @@ %changelog +* Thu Mar 5 2009 Ben Boeckel 0.1.1-1 +- Update to release 0.1.1 +- Fix Requires + * Sat Feb 28 2009 Ben Boeckel 0.0.2-0.29.20090228git - Update to newer snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sigen/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Feb 2009 06:25:51 -0000 1.6 +++ sources 5 Mar 2009 22:59:21 -0000 1.7 @@ -1 +1 @@ -66ca6911fa1a880e8aa45ef51b762d9c sigen-0.0.2.tar.bz2 +590232eb83f60618b5b17092a8d00582 sigen-0.1.1.tar.bz2 From kevin at fedoraproject.org Thu Mar 5 23:01:35 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Thu, 5 Mar 2009 23:01:35 +0000 (UTC) Subject: rpms/rkhunter/devel rkhunter.spec,1.21,1.22 Message-ID: <20090305230135.9597570116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/extras/rpms/rkhunter/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10299 Modified Files: rkhunter.spec Log Message: use proper release Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- rkhunter.spec 5 Mar 2009 22:55:31 -0000 1.21 +++ rkhunter.spec 5 Mar 2009 23:01:05 -0000 1.22 @@ -1,6 +1,6 @@ Name: rkhunter Version: 1.3.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A host-based tool to scan for rootkits, backdoors and local exploits Group: Applications/System From oget at fedoraproject.org Thu Mar 5 23:07:32 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Thu, 5 Mar 2009 23:07:32 +0000 (UTC) Subject: rpms/libzzub/F-9 libzzub.spec,1.7,1.8 sources,1.2,1.3 Message-ID: <20090305230732.6437C70116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/libzzub/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11445 Modified Files: libzzub.spec sources Log Message: * Thu Mar 5 2009 Orcan Ogetbil - 0.2.3-13 - removed some proprietary code from the tarball (src/rtaudio/asio) Index: libzzub.spec =================================================================== RCS file: /cvs/pkgs/rpms/libzzub/F-9/libzzub.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libzzub.spec 2 Mar 2008 14:13:32 -0000 1.7 +++ libzzub.spec 5 Mar 2009 23:07:01 -0000 1.8 @@ -1,6 +1,6 @@ Name: libzzub Version: 0.2.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Powerful music sequencing library Group: System Environment/Libraries @@ -14,7 +14,8 @@ # removed: # - src/libmad: completely removed # - src/libzzub/libzzub.cpp: removed MP3 support part - +# Also, the Steinberg's nonfree asio driver code is removed: +# - src/rtaudio/asio: completely removed Patch0: libzzub-buildfix.patch Patch1: libzzub-sonamefix.patch Patch2: libzzub-internalflacfix.patch @@ -157,6 +158,9 @@ %{python_sitelib}/* %changelog +* Thu Mar 5 2009 Orcan Ogetbil - 0.2.3-13 +- removed some proprietary code from the tarball (src/rtaudio/asio) + * Sun Mar 2 2008 Alexander Kahl - 0.2.3-12 - patch for missing explicit gcc 4.3 includes - pyzzub %%files also seizes the python egg now Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libzzub/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Sep 2007 07:41:51 -0000 1.2 +++ sources 5 Mar 2009 23:07:01 -0000 1.3 @@ -1 +1 @@ -e524a3cf16500849c988a702918fe33e libzzub-0.2.3-fe.tar.bz2 +9867d96ddf36299f17266de6f4c56c7a libzzub-0.2.3-fe.tar.bz2 From jjames at fedoraproject.org Thu Mar 5 23:15:30 2009 From: jjames at fedoraproject.org (Jerry James) Date: Thu, 5 Mar 2009 23:15:30 +0000 (UTC) Subject: rpms/jFormatString/devel import.log, NONE, 1.1 jFormatString-build.patch, NONE, 1.1 jFormatString.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305231530.2942370116@cvs1.fedora.phx.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/jFormatString/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12872/devel Modified Files: .cvsignore sources Added Files: import.log jFormatString-build.patch jFormatString.spec Log Message: Initial import. --- NEW FILE import.log --- jFormatString-0-0_2_20081016svn_fc10:HEAD:jFormatString-0-0.2.20081016svn.fc10.src.rpm:1236294788 jFormatString-build.patch: --- NEW FILE jFormatString-build.patch --- diff -dur jformatstring.ORIG/jFormatString/build.xml jformatstring/jFormatString/build.xml --- jformatstring.ORIG/jFormatString/build.xml 2008-10-15 23:22:04.000000000 -0600 +++ jformatstring/jFormatString/build.xml 2008-12-09 11:02:19.000000000 -0700 @@ -2,9 +2,7 @@ - - - + --- NEW FILE jFormatString.spec --- %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: jFormatString Version: 0 Release: 0.2.20081016svn%{?dist} Summary: Java format string compile-time checker Group: Development/Libraries/Java License: GPLv2 with exceptions URL: https://jformatstring.dev.java.net/ # There has been no official release yet. This is a snapshot of the Subversion # repository as of 16 Oct 2008. Use the following commands to generate the # tarball: # svn export -r 8 https://jformatstring.dev.java.net/svn/jformatstring/trunk \ # jformatstring --username guest # (The password is "guest".) # tar -cjvf jFormatString-0.tar.bz2 jformatstring Source0: %{name}-%{version}.tar.bz2 # This patch has not been sent upstream, since it is Fedora specific. This # gives the build system the path to the appropriate junit jar. Patch0: %{name}-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant, java-devel, java-javadoc, jpackage-utils, junit4 Requires: java, jpackage-utils %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description This project is derived from Sun's implementation of java.util.Formatter. It is designed to allow compile time checks as to whether or not a use of a format string will be erroneous when executed at runtime. %package javadoc Summary: Javadoc documentation for %{name} Group: Development/Documentation Requires: %{name} = %{version}-%{release}, java-javadoc %description javadoc This package contains the API documentation for %{name}. %prep %setup -q -n jformatstring %patch0 -p1 %build # Build the JAR cd jFormatString ant cd .. # Create the javadocs mkdir docs javadoc -d docs -source 1.5 -sourcepath jFormatString/src/java \ -classpath jFormatString/build/classes:%{_javadir}/junit4.jar \ -link file://%{_javadocdir}/java edu.umd.cs.findbugs.formatStringChecker %install rm -rf $RPM_BUILD_ROOT # JAR files mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p %{name}/build/%{name}.jar \ $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # Javadocs mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -rp docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # Precompiled bits %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %clean rm -rf $RPM_BUILD_ROOT %post %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db fi %endif %postun %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db fi %endif %files %defattr(-,root,root,-) %doc www/index.html jFormatString/LICENSE %{_javadir}/%{name}* %if %{with_gcj} %{_libdir}/gcj/%{name} %endif %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name}* %changelog * Thu Mar 5 2009 Jerry James - 0-0.2.20081016svn - Clean up minor issues raised in package review * Tue Dec 9 2008 Jerry James - 0-0.1.20081016svn - Initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jFormatString/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:34:47 -0000 1.1 +++ .cvsignore 5 Mar 2009 23:14:59 -0000 1.2 @@ -0,0 +1 @@ +jFormatString-0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jFormatString/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:34:47 -0000 1.1 +++ sources 5 Mar 2009 23:14:59 -0000 1.2 @@ -0,0 +1 @@ +0bd082f8d7000eeb5634fa7d63b34ee0 jFormatString-0.tar.bz2 From gavin at fedoraproject.org Thu Mar 5 23:15:49 2009 From: gavin at fedoraproject.org (Gavin Romig-Koch) Date: Thu, 5 Mar 2009 23:15:49 +0000 (UTC) Subject: rpms/etoys/devel .cvsignore, 1.2, 1.3 etoys.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090305231549.299DE70116@cvs1.fedora.phx.redhat.com> Author: gavin Update of /cvs/pkgs/rpms/etoys/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12709 Modified Files: .cvsignore etoys.spec sources Log Message: * Thu Mar 6 2009 Gavin Romig-Koch - 4.0.2206-3 - added files necessary for EToys to work as a Sugar activity. - pulled in latest upstream release 4.0.2206 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/etoys/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Feb 2009 04:24:02 -0000 1.2 +++ .cvsignore 5 Mar 2009 23:15:18 -0000 1.3 @@ -1 +1 @@ -etoys-4.0.2201.tar.gz +etoys-4.0.2206.tar.gz Index: etoys.spec =================================================================== RCS file: /cvs/pkgs/rpms/etoys/devel/etoys.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- etoys.spec 24 Feb 2009 15:34:32 -0000 1.2 +++ etoys.spec 5 Mar 2009 23:15:18 -0000 1.3 @@ -1,6 +1,6 @@ %define name etoys -%define version 4.0.2201 -%define release 2%{?dist} +%define version 4.0.2206 +%define release 3%{?dist} %define source %{name}-%{version} Name: %{name} @@ -51,7 +51,13 @@ %install [ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && rm -rf "%{buildroot}" -make install-etoys ROOT=%{buildroot} +make install-etoys install-activity ROOT=%{buildroot} + +# FIXME: +# according to my reading of the sugar activity doc, this shouldn't +# be necessary. The bin/ directory of the activity should be added to +# the PATH. But it doesn't seem to be for F-10. +cp %{buildroot}%{_datadir}/sugar/activities/Etoys.activity/bin/etoys-activity %{buildroot}%{_bindir}/ # these files will be put in std RPM doc location rm -rf %{buildroot}%{_datadir}/doc/etoys @@ -83,7 +89,7 @@ %endif %doc ChangeLog LICENSE NOTICE README %dir %{_datadir}/etoys -%{_datadir}/etoys/EtoysActivity.004.pr +%{_datadir}/etoys/EtoysActivity.007.pr %{_datadir}/etoys/EtoysV4.sources %{_datadir}/etoys/ExampleEtoys %{_datadir}/etoys/Gallery.020.pr @@ -92,9 +98,11 @@ %{_datadir}/etoys/etoys.changes %{_datadir}/etoys/etoys.image %{_bindir}/etoys -%{_datadir}/mime/packages/etoys.xml +%{_bindir}/etoys-activity +%{_datadir}/mime/* %{_datadir}/applications/* %{_datadir}/pixmaps/* +%{_datadir}/sugar/* %if 0%{?localebug} %lang(bn) %{_datadir}/etoys/locale/bn %lang(ru) %{_datadir}/etoys/locale/ru @@ -124,9 +132,14 @@ %lang(bg) %{_datadir}/etoys/locale/bg %lang(ps) %{_datadir}/etoys/locale/ps %lang(sv) %{_datadir}/etoys/locale/sv +%lang(vi) %{_datadir}/etoys/locale/vi %endif %changelog +* Thu Mar 6 2009 Gavin Romig-Koch - 4.0.2206-3 +- added files necessary for EToys to work as a Sugar activity. +- pulled in latest upstream release 4.0.2206 + * Tue Feb 24 2009 Fedora Release Engineering - 4.0.2201-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/etoys/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Feb 2009 04:24:02 -0000 1.2 +++ sources 5 Mar 2009 23:15:18 -0000 1.3 @@ -1 +1 @@ -dd26fa6e8eb5d430723b5787719b8fa7 etoys-4.0.2201.tar.gz +5242e9fcd22af18399501b4313ad5c83 etoys-4.0.2206.tar.gz From jjames at fedoraproject.org Thu Mar 5 23:18:20 2009 From: jjames at fedoraproject.org (Jerry James) Date: Thu, 5 Mar 2009 23:18:20 +0000 (UTC) Subject: rpms/jFormatString/F-10 jFormatString-build.patch, NONE, 1.1 jFormatString.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090305231820.64CDC70116@cvs1.fedora.phx.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/jFormatString/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13520/F-10 Modified Files: .cvsignore sources Added Files: jFormatString-build.patch jFormatString.spec Log Message: Initial import. jFormatString-build.patch: --- NEW FILE jFormatString-build.patch --- diff -dur jformatstring.ORIG/jFormatString/build.xml jformatstring/jFormatString/build.xml --- jformatstring.ORIG/jFormatString/build.xml 2008-10-15 23:22:04.000000000 -0600 +++ jformatstring/jFormatString/build.xml 2008-12-09 11:02:19.000000000 -0700 @@ -2,9 +2,7 @@ - - - + --- NEW FILE jFormatString.spec --- %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: jFormatString Version: 0 Release: 0.2.20081016svn%{?dist} Summary: Java format string compile-time checker Group: Development/Libraries/Java License: GPLv2 with exceptions URL: https://jformatstring.dev.java.net/ # There has been no official release yet. This is a snapshot of the Subversion # repository as of 16 Oct 2008. Use the following commands to generate the # tarball: # svn export -r 8 https://jformatstring.dev.java.net/svn/jformatstring/trunk \ # jformatstring --username guest # (The password is "guest".) # tar -cjvf jFormatString-0.tar.bz2 jformatstring Source0: %{name}-%{version}.tar.bz2 # This patch has not been sent upstream, since it is Fedora specific. This # gives the build system the path to the appropriate junit jar. Patch0: %{name}-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant, java-devel, java-javadoc, jpackage-utils, junit4 Requires: java, jpackage-utils %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description This project is derived from Sun's implementation of java.util.Formatter. It is designed to allow compile time checks as to whether or not a use of a format string will be erroneous when executed at runtime. %package javadoc Summary: Javadoc documentation for %{name} Group: Development/Documentation Requires: %{name} = %{version}-%{release}, java-javadoc %description javadoc This package contains the API documentation for %{name}. %prep %setup -q -n jformatstring %patch0 -p1 %build # Build the JAR cd jFormatString ant cd .. # Create the javadocs mkdir docs javadoc -d docs -source 1.5 -sourcepath jFormatString/src/java \ -classpath jFormatString/build/classes:%{_javadir}/junit4.jar \ -link file://%{_javadocdir}/java edu.umd.cs.findbugs.formatStringChecker %install rm -rf $RPM_BUILD_ROOT # JAR files mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p %{name}/build/%{name}.jar \ $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # Javadocs mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -rp docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # Precompiled bits %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %clean rm -rf $RPM_BUILD_ROOT %post %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db fi %endif %postun %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db fi %endif %files %defattr(-,root,root,-) %doc www/index.html jFormatString/LICENSE %{_javadir}/%{name}* %if %{with_gcj} %{_libdir}/gcj/%{name} %endif %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name}* %changelog * Thu Mar 5 2009 Jerry James - 0-0.2.20081016svn - Clean up minor issues raised in package review * Tue Dec 9 2008 Jerry James - 0-0.1.20081016svn - Initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jFormatString/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:34:47 -0000 1.1 +++ .cvsignore 5 Mar 2009 23:17:50 -0000 1.2 @@ -0,0 +1 @@ +jFormatString-0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jFormatString/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:34:47 -0000 1.1 +++ sources 5 Mar 2009 23:17:50 -0000 1.2 @@ -0,0 +1 @@ +0bd082f8d7000eeb5634fa7d63b34ee0 jFormatString-0.tar.bz2 From gavin at fedoraproject.org Thu Mar 5 23:19:16 2009 From: gavin at fedoraproject.org (Gavin Romig-Koch) Date: Thu, 5 Mar 2009 23:19:16 +0000 (UTC) Subject: rpms/etoys/F-10 .cvsignore, 1.2, 1.3 etoys.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090305231916.202C670116@cvs1.fedora.phx.redhat.com> Author: gavin Update of /cvs/pkgs/rpms/etoys/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13615 Modified Files: .cvsignore etoys.spec sources Log Message: * Thu Mar 6 2009 Gavin Romig-Koch - 4.0.2206-3 - added files necessary for EToys to work as a Sugar activity. - pulled in latest upstream release 4.0.2206 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/etoys/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Feb 2009 04:32:58 -0000 1.2 +++ .cvsignore 5 Mar 2009 23:18:45 -0000 1.3 @@ -1 +1 @@ -etoys-4.0.2201.tar.gz +etoys-4.0.2206.tar.gz Index: etoys.spec =================================================================== RCS file: /cvs/pkgs/rpms/etoys/F-10/etoys.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- etoys.spec 21 Feb 2009 04:32:58 -0000 1.1 +++ etoys.spec 5 Mar 2009 23:18:45 -0000 1.2 @@ -1,6 +1,6 @@ %define name etoys -%define version 4.0.2201 -%define release 1%{?dist} +%define version 4.0.2206 +%define release 3%{?dist} %define source %{name}-%{version} Name: %{name} @@ -51,7 +51,13 @@ %install [ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && rm -rf "%{buildroot}" -make install-etoys ROOT=%{buildroot} +make install-etoys install-activity ROOT=%{buildroot} + +# FIXME: +# according to my reading of the sugar activity doc, this shouldn't +# be necessary. The bin/ directory of the activity should be added to +# the PATH. But it doesn't seem to be for F-10. +cp %{buildroot}%{_datadir}/sugar/activities/Etoys.activity/bin/etoys-activity %{buildroot}%{_bindir}/ # these files will be put in std RPM doc location rm -rf %{buildroot}%{_datadir}/doc/etoys @@ -83,7 +89,7 @@ %endif %doc ChangeLog LICENSE NOTICE README %dir %{_datadir}/etoys -%{_datadir}/etoys/EtoysActivity.004.pr +%{_datadir}/etoys/EtoysActivity.007.pr %{_datadir}/etoys/EtoysV4.sources %{_datadir}/etoys/ExampleEtoys %{_datadir}/etoys/Gallery.020.pr @@ -92,9 +98,11 @@ %{_datadir}/etoys/etoys.changes %{_datadir}/etoys/etoys.image %{_bindir}/etoys -%{_datadir}/mime/packages/etoys.xml +%{_bindir}/etoys-activity +%{_datadir}/mime/* %{_datadir}/applications/* %{_datadir}/pixmaps/* +%{_datadir}/sugar/* %if 0%{?localebug} %lang(bn) %{_datadir}/etoys/locale/bn %lang(ru) %{_datadir}/etoys/locale/ru @@ -124,9 +132,14 @@ %lang(bg) %{_datadir}/etoys/locale/bg %lang(ps) %{_datadir}/etoys/locale/ps %lang(sv) %{_datadir}/etoys/locale/sv +%lang(vi) %{_datadir}/etoys/locale/vi %endif %changelog +* Thu Mar 6 2009 Gavin Romig-Koch - 4.0.2206-3 +- added files necessary for EToys to work as a Sugar activity. +- pulled in latest upstream release 4.0.2206 + * Mon Jan 19 2009 Gavin Romig-Koch - 4.0.2201-1 - Switch to using the full color icon for Etoys. - correct the name to Etoys in places where the letter case was non-standard. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/etoys/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Feb 2009 04:32:58 -0000 1.2 +++ sources 5 Mar 2009 23:18:45 -0000 1.3 @@ -1 +1 @@ -dd26fa6e8eb5d430723b5787719b8fa7 etoys-4.0.2201.tar.gz +5242e9fcd22af18399501b4313ad5c83 etoys-4.0.2206.tar.gz From gavin at fedoraproject.org Thu Mar 5 23:21:10 2009 From: gavin at fedoraproject.org (Gavin Romig-Koch) Date: Thu, 5 Mar 2009 23:21:10 +0000 (UTC) Subject: rpms/etoys/F-9 .cvsignore, 1.2, 1.3 etoys.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090305232110.1821E70116@cvs1.fedora.phx.redhat.com> Author: gavin Update of /cvs/pkgs/rpms/etoys/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13992 Modified Files: .cvsignore etoys.spec sources Log Message: * Thu Mar 6 2009 Gavin Romig-Koch - 4.0.2206-3 - added files necessary for EToys to work as a Sugar activity. - pulled in latest upstream release 4.0.2206 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/etoys/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Feb 2009 04:38:18 -0000 1.2 +++ .cvsignore 5 Mar 2009 23:20:39 -0000 1.3 @@ -1 +1 @@ -etoys-4.0.2201.tar.gz +etoys-4.0.2206.tar.gz Index: etoys.spec =================================================================== RCS file: /cvs/pkgs/rpms/etoys/F-9/etoys.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- etoys.spec 21 Feb 2009 04:38:18 -0000 1.1 +++ etoys.spec 5 Mar 2009 23:20:39 -0000 1.2 @@ -1,6 +1,6 @@ %define name etoys -%define version 4.0.2201 -%define release 1%{?dist} +%define version 4.0.2206 +%define release 3%{?dist} %define source %{name}-%{version} Name: %{name} @@ -51,7 +51,13 @@ %install [ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && rm -rf "%{buildroot}" -make install-etoys ROOT=%{buildroot} +make install-etoys install-activity ROOT=%{buildroot} + +# FIXME: +# according to my reading of the sugar activity doc, this shouldn't +# be necessary. The bin/ directory of the activity should be added to +# the PATH. But it doesn't seem to be for F-10. +cp %{buildroot}%{_datadir}/sugar/activities/Etoys.activity/bin/etoys-activity %{buildroot}%{_bindir}/ # these files will be put in std RPM doc location rm -rf %{buildroot}%{_datadir}/doc/etoys @@ -83,7 +89,7 @@ %endif %doc ChangeLog LICENSE NOTICE README %dir %{_datadir}/etoys -%{_datadir}/etoys/EtoysActivity.004.pr +%{_datadir}/etoys/EtoysActivity.007.pr %{_datadir}/etoys/EtoysV4.sources %{_datadir}/etoys/ExampleEtoys %{_datadir}/etoys/Gallery.020.pr @@ -92,9 +98,11 @@ %{_datadir}/etoys/etoys.changes %{_datadir}/etoys/etoys.image %{_bindir}/etoys -%{_datadir}/mime/packages/etoys.xml +%{_bindir}/etoys-activity +%{_datadir}/mime/* %{_datadir}/applications/* %{_datadir}/pixmaps/* +%{_datadir}/sugar/* %if 0%{?localebug} %lang(bn) %{_datadir}/etoys/locale/bn %lang(ru) %{_datadir}/etoys/locale/ru @@ -124,9 +132,14 @@ %lang(bg) %{_datadir}/etoys/locale/bg %lang(ps) %{_datadir}/etoys/locale/ps %lang(sv) %{_datadir}/etoys/locale/sv +%lang(vi) %{_datadir}/etoys/locale/vi %endif %changelog +* Thu Mar 6 2009 Gavin Romig-Koch - 4.0.2206-3 +- added files necessary for EToys to work as a Sugar activity. +- pulled in latest upstream release 4.0.2206 + * Mon Jan 19 2009 Gavin Romig-Koch - 4.0.2201-1 - Switch to using the full color icon for Etoys. - correct the name to Etoys in places where the letter case was non-standard. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/etoys/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Feb 2009 04:38:18 -0000 1.2 +++ sources 5 Mar 2009 23:20:39 -0000 1.3 @@ -1 +1 @@ -dd26fa6e8eb5d430723b5787719b8fa7 etoys-4.0.2201.tar.gz +5242e9fcd22af18399501b4313ad5c83 etoys-4.0.2206.tar.gz From bpepple at fedoraproject.org Thu Mar 5 23:25:15 2009 From: bpepple at fedoraproject.org (Brian Pepple) Date: Thu, 5 Mar 2009 23:25:15 +0000 (UTC) Subject: rpms/bigboard/devel bigboard.spec,1.73,1.74 Message-ID: <20090305232515.9E08470116@cvs1.fedora.phx.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/bigboard/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14893 Modified Files: bigboard.spec Log Message: * Thu Mar 05 2009 Brian Pepple - 0.6.4-8 - Rebuild for new libempathy Index: bigboard.spec =================================================================== RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- bigboard.spec 24 Feb 2009 04:36:49 -0000 1.73 +++ bigboard.spec 5 Mar 2009 23:24:45 -0000 1.74 @@ -3,7 +3,7 @@ Name: bigboard Version: 0.6.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Sidebar application launcher using mugshot.org Group: Applications/Internet @@ -128,6 +128,9 @@ killall -HUP gconfd-2 || : %changelog +* Thu Mar 05 2009 Brian Pepple - 0.6.4-8 +- Rebuild for new libempathy + * Mon Feb 23 2009 Fedora Release Engineering - 0.6.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kkofler at fedoraproject.org Thu Mar 5 23:37:20 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Thu, 5 Mar 2009 23:37:20 +0000 (UTC) Subject: rpms/kde-plasma-weather/devel kde-plasma-weather-1.0.0-rev924102-qt45.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev924804-qt45-clip.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev926205-no-update-now.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev930258-wind-gust.patch, NONE, 1.1 kde-plasma-weather.spec, 1.2, 1.3 Message-ID: <20090305233720.C8A4D70116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-plasma-weather/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16845/devel Modified Files: kde-plasma-weather.spec Added Files: kde-plasma-weather-1.0.0-rev924102-qt45.patch kde-plasma-weather-1.0.0-rev924804-qt45-clip.patch kde-plasma-weather-1.0.0-rev926205-no-update-now.patch kde-plasma-weather-1.0.0-rev930258-wind-gust.patch Log Message: * Thu Mar 05 2009 Kevin Kofler 1.0.0-3 - backport 2 fixes for rendering issues with Qt 4.5 from trunk - don't show the non-functional "Update now" menu entry (backported from trunk) - use only 1 decimal place for the wind gust (backported from trunk) kde-plasma-weather-1.0.0-rev924102-qt45.patch: --- NEW FILE kde-plasma-weather-1.0.0-rev924102-qt45.patch --- diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev924102-qt45/weatherapplet.cpp --- plasma-applet-weather-1.0.0/weatherapplet.cpp 2009-02-03 07:20:28.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev924102-qt45/weatherapplet.cpp 2009-03-06 00:08:37.000000000 +0100 @@ -166,7 +166,7 @@ m_titlePanel->addItem(m_locationLabel, 0, 0, 1, 3); m_titlePanel->addItem(m_tempLabel, 0, 3); - m_titlePanel->addItem(m_conditionsLabel, 1, 1); + m_titlePanel->addItem(m_conditionsLabel, 1, 0); m_titlePanel->addItem(m_windIcon, 1, 2); m_titlePanel->addItem(m_forecastTemps, 1, 3); @@ -209,6 +209,8 @@ if (m_addDialog) { delete m_addDialog; } + + destroyLayout(); } void WeatherApplet::toolTipAboutToShow() @@ -295,7 +297,7 @@ return actions; } -void WeatherApplet::clearLayout() +void WeatherApplet::destroyLayout() { if (m_bottomLayout) { if (m_fiveDaysModel) { @@ -312,17 +314,17 @@ } if (m_fiveDaysView) { - kDebug() << "Delete the Plasma::WeatherView"; + kDebug() << "Delete the Plasma::m_fiveDaysView"; delete m_fiveDaysView; m_fiveDaysView = 0; - kDebug() << "Finished deleting Plasma::WeatherView"; + kDebug() << "Finished deleting Plasma::m_fiveDaysView"; } if (m_detailsView) { - kDebug() << "Delete the Plasma::WeatherView"; + kDebug() << "Delete the Plasma::m_detailsView"; delete m_detailsView; m_detailsView = 0; - kDebug() << "Finished dleeting Plasma::WeatherView"; + kDebug() << "Finished dleeting Plasma::m_detailsView"; } kDebug() << "Deleting Plasma::TabBar"; @@ -701,8 +703,6 @@ void WeatherApplet::weatherContent(const Plasma::DataEngine::Data &data) { - clearLayout(); - m_locationLabel->setText(data["Place"].toString()); QStringList fiveDayTokens = data["Short Forecast Day 0"].toString().split("|"); // Get current time period of day @@ -791,12 +791,17 @@ if (m_tabBar->count() > 0) { // If we have items in tab clean it up first - for (int i = 0; i < m_tabBar->count(); i++) { - kDebug() << "Destroying Tab: " << i; - m_tabBar->removeTab(i); + while (m_tabBar->count()) { + m_tabBar->removeTab(0); } } + // Do some cleanup on WeatherView + if (m_fiveDaysView) { + delete m_fiveDaysView; + m_fiveDaysView = 0; + } + // If we have a 5 day forecast, display it if (data["Total Weather Days"].toInt() > 0) { if (!m_fiveDaysView) { @@ -853,7 +858,7 @@ fiveDayIcon->setIcon(KIcon(fiveDayTokens[1])); fiveDayIcon->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); fiveDayIcon->setDrawBackground(false); - + fiveDayIcon->hide(); QStandardItem *iconItem = new QStandardItem(fiveDayIcon->icon(), NULL); if (fiveDayTokens[5] != "N/U") { @@ -894,6 +899,7 @@ } + if (dayItems.count() > 0) { m_fiveDaysModel->appendRow(dayItems); } @@ -1210,7 +1216,6 @@ validate(source, data["validate"]); if (isBusy()) { setVisibleLayout(false); - clearLayout(); setBusy(false); setConfigurationRequired(true); } @@ -1266,7 +1271,6 @@ getWeather(); } else { setVisibleLayout(false); - clearLayout(); setConfigurationRequired(true); } } diff -ur plasma-applet-weather-1.0.0/weatherapplet.h plasma-applet-weather-1.0.0-rev924102-qt45/weatherapplet.h --- plasma-applet-weather-1.0.0/weatherapplet.h 2009-01-25 18:54:53.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev924102-qt45/weatherapplet.h 2009-03-06 00:06:21.000000000 +0100 @@ -132,7 +132,7 @@ Plasma::Frame *m_titleFrame; void setVisibleLayout(bool val); - void clearLayout(void); + void destroyLayout(void); QString convertTemperature(int format, QString value, int type, bool rounded); }; kde-plasma-weather-1.0.0-rev924804-qt45-clip.patch: --- NEW FILE kde-plasma-weather-1.0.0-rev924804-qt45-clip.patch --- diff -ur plasma-applet-weather-1.0.0/weatherdelegate.cpp plasma-applet-weather-1.0.0-rev924804-qt45-clip/weatherdelegate.cpp --- plasma-applet-weather-1.0.0/weatherdelegate.cpp 2009-01-29 08:41:30.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev924804-qt45-clip/weatherdelegate.cpp 2009-03-06 00:10:47.000000000 +0100 @@ -144,17 +144,14 @@ path = Plasma::PaintUtils::roundedRectangle(backgroundRectToClip, radius); - painter->save(); - - - painter->setClipRect(backgroundRect); + QPainterPath clipPath; + clipPath.addRect(backgroundRect); + path = path.intersected(clipPath); painter->setRenderHint(QPainter::Antialiasing); painter->setPen(Qt::NoPen); painter->setBrush(backgroundColor); painter->drawPath(path); - - painter->restore(); } if (index.row() == 0 && d->hasHeader) { kde-plasma-weather-1.0.0-rev926205-no-update-now.patch: --- NEW FILE kde-plasma-weather-1.0.0-rev926205-no-update-now.patch --- diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev926205-no-update-now/weatherapplet.cpp --- plasma-applet-weather-1.0.0/weatherapplet.cpp 2009-02-03 07:20:28.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev926205-no-update-now/weatherapplet.cpp 2009-03-06 00:12:06.000000000 +0100 @@ -25,7 +25,7 @@ #include #include #include -#include +//#include #include #include #include @@ -105,8 +105,8 @@ m_weatherUpdateTime = generalConfig.readEntry("updateWeather", 30); // "Update Now" contextual action - m_actionUpdateNow = new KAction(i18n("&Update Now"), this); - connect(m_actionUpdateNow, SIGNAL(triggered()), this, SLOT(getWeather())); + //m_actionUpdateNow = new KAction(i18n("&Update Now"), this); + //connect(m_actionUpdateNow, SIGNAL(triggered()), this, SLOT(getWeather())); // Connect to weather engine. weatherEngine = dataEngine("weather"); @@ -282,6 +282,7 @@ KRun::runUrl(KUrl(url), "text/html", 0); } +/* QList WeatherApplet::contextualActions() { QList actions; @@ -294,6 +295,7 @@ return actions; } +*/ void WeatherApplet::destroyLayout() { diff -ur plasma-applet-weather-1.0.0/weatherapplet.h plasma-applet-weather-1.0.0-rev926205-no-update-now/weatherapplet.h --- plasma-applet-weather-1.0.0/weatherapplet.h 2009-01-25 18:54:53.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev926205-no-update-now/weatherapplet.h 2009-03-06 00:12:06.000000000 +0100 @@ -29,7 +29,7 @@ #include "ui_weatherAddPlace.h" class KDialog; -class KAction; +//class KAction; class QStandardItemModel; class QStandardItem; class QGraphicsLinearLayout; @@ -77,7 +77,7 @@ protected: void constraintsEvent(Plasma::Constraints constraints); - QList contextualActions(); + //QList contextualActions(); private: Plasma::DataEngine *weatherEngine; @@ -120,7 +120,7 @@ Plasma::WeatherView *m_fiveDaysView; Plasma::WeatherView *m_detailsView; - KAction *m_actionUpdateNow; + //KAction *m_actionUpdateNow; // Layout int m_setupLayout; kde-plasma-weather-1.0.0-rev930258-wind-gust.patch: --- NEW FILE kde-plasma-weather-1.0.0-rev930258-wind-gust.patch --- diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev930258-wind-gust/weatherapplet.cpp --- plasma-applet-weather-1.0.0/weatherapplet.cpp 2009-02-03 07:20:28.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev930258-wind-gust/weatherapplet.cpp 2009-03-06 00:20:07.000000000 +0100 @@ -1071,7 +1071,7 @@ QStandardItem *dataGust = new QStandardItem(); switch (m_weatherWindFormat) { case WeatherUtils::MetersPerSecond: - dataGust->setText(i18n("Wind Gust: %1%2", QString::number(WeatherUtils::convert(data["Wind Gust"].toDouble(), data["Wind Gust Unit"].toInt(), WeatherUtils::MetersPerSecond), 'f', 2), "m/s")); + dataGust->setText(i18n("Wind Gust: %1%2", QString::number(WeatherUtils::convert(data["Wind Gust"].toDouble(), data["Wind Gust Unit"].toInt(), WeatherUtils::MetersPerSecond), 'f', 1), "m/s")); break; case WeatherUtils::Knots: dataGust->setText(i18n("Wind Gust: %1%2", QString::number(WeatherUtils::convert(data["Wind Gust"].toDouble(), data["Wind Gust Unit"].toInt(), WeatherUtils::Knots), 'f', 1), "kt")); Index: kde-plasma-weather.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-weather/devel/kde-plasma-weather.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kde-plasma-weather.spec 25 Feb 2009 10:32:31 -0000 1.2 +++ kde-plasma-weather.spec 5 Mar 2009 23:36:50 -0000 1.3 @@ -1,6 +1,6 @@ Name: kde-plasma-weather Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Plasma applet for weather forecasts Group: User Interface/Desktops @@ -8,6 +8,15 @@ URL: http://www.kdedevelopers.org/blog/4267 Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.0/src/extragear/plasma-applet-weather-%{version}.tar.bz2 +# backports from trunk: +# fix rendering issues with Qt 4.5, in particular a bogus icon at the top left +Patch100: kde-plasma-weather-1.0.0-rev924102-qt45.patch +# fix clipping issue with Qt 4.5 +Patch101: kde-plasma-weather-1.0.0-rev924804-qt45-clip.patch +# don't show the non-functional "Update now" menu entry +Patch102: kde-plasma-weather-1.0.0-rev926205-no-update-now.patch +# use only 1 decimal place for the wind gust +Patch103: kde-plasma-weather-1.0.0-rev930258-wind-gust.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # The weather dataengine is in kdebase-workspace. @@ -20,6 +29,10 @@ %prep %setup -qn plasma-applet-weather-%{version} +%patch100 -p1 -b .qt45 +%patch101 -p1 -b .qt45-clip +%patch102 -p1 -b .no-update-now +%patch103 -p1 -b .wind-gust %build mkdir -p %{_target_platform} @@ -43,7 +56,12 @@ %{_kde4_appsdir}/desktoptheme/default/weather/ %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 1.0.0-2 +* Thu Mar 05 2009 Kevin Kofler 1.0.0-3 +- backport 2 fixes for rendering issues with Qt 4.5 from trunk +- don't show the non-functional "Update now" menu entry (backported from trunk) +- use only 1 decimal place for the wind gust (backported from trunk) + +* Wed Feb 25 2009 Fedora Release Engineering 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Tue Feb 03 2009 Shawn Starr 1.0.0-1 From bpepple at fedoraproject.org Thu Mar 5 23:40:29 2009 From: bpepple at fedoraproject.org (Brian Pepple) Date: Thu, 5 Mar 2009 23:40:29 +0000 (UTC) Subject: rpms/desktop-data-model/devel desktop-data-model.spec,1.13,1.14 Message-ID: <20090305234029.0B53B70116@cvs1.fedora.phx.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/desktop-data-model/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17372 Modified Files: desktop-data-model.spec Log Message: * Thu Mar 05 2009 Brian Pepple - 1.2.5-8 - Rebuild for new libempathy Index: desktop-data-model.spec =================================================================== RCS file: /cvs/pkgs/rpms/desktop-data-model/devel/desktop-data-model.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- desktop-data-model.spec 24 Feb 2009 11:29:43 -0000 1.13 +++ desktop-data-model.spec 5 Mar 2009 23:39:58 -0000 1.14 @@ -1,6 +1,6 @@ Name: desktop-data-model Version: 1.2.5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Engine providing live updates of online data to the desktop Group: System Environment/Libraries @@ -82,6 +82,9 @@ %{_libdir}/*.so %changelog +* Thu Mar 05 2009 Brian Pepple - 1.2.5-8 +- Rebuild for new libempathy + * Tue Feb 24 2009 Fedora Release Engineering - 1.2.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From oget at fedoraproject.org Thu Mar 5 23:44:07 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Thu, 5 Mar 2009 23:44:07 +0000 (UTC) Subject: rpms/libzzub/F-9 libzzub.spec,1.8,1.9 Message-ID: <20090305234407.58A6F70116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/libzzub/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17927 Modified Files: libzzub.spec Log Message: * Thu Mar 5 2009 Orcan Ogetbil - 0.2.3-14 - Fix compilation against newer scons Index: libzzub.spec =================================================================== RCS file: /cvs/pkgs/rpms/libzzub/F-9/libzzub.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libzzub.spec 5 Mar 2009 23:07:01 -0000 1.8 +++ libzzub.spec 5 Mar 2009 23:43:37 -0000 1.9 @@ -1,6 +1,6 @@ Name: libzzub Version: 0.2.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Powerful music sequencing library Group: System Environment/Libraries @@ -80,6 +80,8 @@ src/plugins/lunar/lunar.cpp %patch4 -p1 -b .gcc43 +# Fix compilation against newer scons +sed -i 's|SCons\.Script\.Main\.options\.clean|False|' SConstruct %build find \ @@ -158,6 +160,9 @@ %{python_sitelib}/* %changelog +* Thu Mar 5 2009 Orcan Ogetbil - 0.2.3-14 +- Fix compilation against newer scons + * Thu Mar 5 2009 Orcan Ogetbil - 0.2.3-13 - removed some proprietary code from the tarball (src/rtaudio/asio) From airlied at fedoraproject.org Thu Mar 5 23:47:04 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Thu, 5 Mar 2009 23:47:04 +0000 (UTC) Subject: rpms/mesa/devel radeon-rewrite.patch,1.5,1.6 Message-ID: <20090305234704.A76D270116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/mesa/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18518 Modified Files: radeon-rewrite.patch Log Message: fix rewrite patch radeon-rewrite.patch: Index: radeon-rewrite.patch =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/radeon-rewrite.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- radeon-rewrite.patch 5 Mar 2009 08:19:34 -0000 1.5 +++ radeon-rewrite.patch 5 Mar 2009 23:47:03 -0000 1.6 @@ -18771,14 +18771,6 @@ - } while (0) - -#endif /* __RADEON_LOCK_H__ */ -diff --git a/src/mesa/drivers/dri/r300/radeon_lock.h b/src/mesa/drivers/dri/r300/radeon_lock.h -new file mode 120000 -index a344837..64bdf94 ---- /dev/null -+++ b/src/mesa/drivers/dri/r300/radeon_lock.h -@@ -0,0 +1 @@ -+../radeon/radeon_lock.h -\ No newline at end of file diff --git a/src/mesa/drivers/dri/r300/radeon_program_pair.c b/src/mesa/drivers/dri/r300/radeon_program_pair.c index 58bc0d5..8a945d8 100644 --- a/src/mesa/drivers/dri/r300/radeon_program_pair.c From kkofler at fedoraproject.org Thu Mar 5 23:47:31 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Thu, 5 Mar 2009 23:47:31 +0000 (UTC) Subject: rpms/kde-plasma-weather/F-10 kde-plasma-weather-1.0.0-rev924102-qt45.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev924804-qt45-clip.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev926205-no-update-now.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev930258-wind-gust.patch, NONE, 1.1 kde-plasma-weather.spec, 1.1, 1.2 Message-ID: <20090305234731.5FAD370116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-plasma-weather/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18543/F-10 Modified Files: kde-plasma-weather.spec Added Files: kde-plasma-weather-1.0.0-rev924102-qt45.patch kde-plasma-weather-1.0.0-rev924804-qt45-clip.patch kde-plasma-weather-1.0.0-rev926205-no-update-now.patch kde-plasma-weather-1.0.0-rev930258-wind-gust.patch Log Message: Sync from devel: * Thu Mar 05 2009 Kevin Kofler 1.0.0-3 - backport 2 fixes for rendering issues with Qt 4.5 from trunk - don't show the non-functional "Update now" menu entry (backported from trunk) - use only 1 decimal place for the wind gust (backported from trunk) kde-plasma-weather-1.0.0-rev924102-qt45.patch: --- NEW FILE kde-plasma-weather-1.0.0-rev924102-qt45.patch --- diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev924102-qt45/weatherapplet.cpp --- plasma-applet-weather-1.0.0/weatherapplet.cpp 2009-02-03 07:20:28.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev924102-qt45/weatherapplet.cpp 2009-03-06 00:08:37.000000000 +0100 @@ -166,7 +166,7 @@ m_titlePanel->addItem(m_locationLabel, 0, 0, 1, 3); m_titlePanel->addItem(m_tempLabel, 0, 3); - m_titlePanel->addItem(m_conditionsLabel, 1, 1); + m_titlePanel->addItem(m_conditionsLabel, 1, 0); m_titlePanel->addItem(m_windIcon, 1, 2); m_titlePanel->addItem(m_forecastTemps, 1, 3); @@ -209,6 +209,8 @@ if (m_addDialog) { delete m_addDialog; } + + destroyLayout(); } void WeatherApplet::toolTipAboutToShow() @@ -295,7 +297,7 @@ return actions; } -void WeatherApplet::clearLayout() +void WeatherApplet::destroyLayout() { if (m_bottomLayout) { if (m_fiveDaysModel) { @@ -312,17 +314,17 @@ } if (m_fiveDaysView) { - kDebug() << "Delete the Plasma::WeatherView"; + kDebug() << "Delete the Plasma::m_fiveDaysView"; delete m_fiveDaysView; m_fiveDaysView = 0; - kDebug() << "Finished deleting Plasma::WeatherView"; + kDebug() << "Finished deleting Plasma::m_fiveDaysView"; } if (m_detailsView) { - kDebug() << "Delete the Plasma::WeatherView"; + kDebug() << "Delete the Plasma::m_detailsView"; delete m_detailsView; m_detailsView = 0; - kDebug() << "Finished dleeting Plasma::WeatherView"; + kDebug() << "Finished dleeting Plasma::m_detailsView"; } kDebug() << "Deleting Plasma::TabBar"; @@ -701,8 +703,6 @@ void WeatherApplet::weatherContent(const Plasma::DataEngine::Data &data) { - clearLayout(); - m_locationLabel->setText(data["Place"].toString()); QStringList fiveDayTokens = data["Short Forecast Day 0"].toString().split("|"); // Get current time period of day @@ -791,12 +791,17 @@ if (m_tabBar->count() > 0) { // If we have items in tab clean it up first - for (int i = 0; i < m_tabBar->count(); i++) { - kDebug() << "Destroying Tab: " << i; - m_tabBar->removeTab(i); + while (m_tabBar->count()) { + m_tabBar->removeTab(0); } } + // Do some cleanup on WeatherView + if (m_fiveDaysView) { + delete m_fiveDaysView; + m_fiveDaysView = 0; + } + // If we have a 5 day forecast, display it if (data["Total Weather Days"].toInt() > 0) { if (!m_fiveDaysView) { @@ -853,7 +858,7 @@ fiveDayIcon->setIcon(KIcon(fiveDayTokens[1])); fiveDayIcon->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); fiveDayIcon->setDrawBackground(false); - + fiveDayIcon->hide(); QStandardItem *iconItem = new QStandardItem(fiveDayIcon->icon(), NULL); if (fiveDayTokens[5] != "N/U") { @@ -894,6 +899,7 @@ } + if (dayItems.count() > 0) { m_fiveDaysModel->appendRow(dayItems); } @@ -1210,7 +1216,6 @@ validate(source, data["validate"]); if (isBusy()) { setVisibleLayout(false); - clearLayout(); setBusy(false); setConfigurationRequired(true); } @@ -1266,7 +1271,6 @@ getWeather(); } else { setVisibleLayout(false); - clearLayout(); setConfigurationRequired(true); } } diff -ur plasma-applet-weather-1.0.0/weatherapplet.h plasma-applet-weather-1.0.0-rev924102-qt45/weatherapplet.h --- plasma-applet-weather-1.0.0/weatherapplet.h 2009-01-25 18:54:53.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev924102-qt45/weatherapplet.h 2009-03-06 00:06:21.000000000 +0100 @@ -132,7 +132,7 @@ Plasma::Frame *m_titleFrame; void setVisibleLayout(bool val); - void clearLayout(void); + void destroyLayout(void); QString convertTemperature(int format, QString value, int type, bool rounded); }; kde-plasma-weather-1.0.0-rev924804-qt45-clip.patch: --- NEW FILE kde-plasma-weather-1.0.0-rev924804-qt45-clip.patch --- diff -ur plasma-applet-weather-1.0.0/weatherdelegate.cpp plasma-applet-weather-1.0.0-rev924804-qt45-clip/weatherdelegate.cpp --- plasma-applet-weather-1.0.0/weatherdelegate.cpp 2009-01-29 08:41:30.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev924804-qt45-clip/weatherdelegate.cpp 2009-03-06 00:10:47.000000000 +0100 @@ -144,17 +144,14 @@ path = Plasma::PaintUtils::roundedRectangle(backgroundRectToClip, radius); - painter->save(); - - - painter->setClipRect(backgroundRect); + QPainterPath clipPath; + clipPath.addRect(backgroundRect); + path = path.intersected(clipPath); painter->setRenderHint(QPainter::Antialiasing); painter->setPen(Qt::NoPen); painter->setBrush(backgroundColor); painter->drawPath(path); - - painter->restore(); } if (index.row() == 0 && d->hasHeader) { kde-plasma-weather-1.0.0-rev926205-no-update-now.patch: --- NEW FILE kde-plasma-weather-1.0.0-rev926205-no-update-now.patch --- diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev926205-no-update-now/weatherapplet.cpp --- plasma-applet-weather-1.0.0/weatherapplet.cpp 2009-02-03 07:20:28.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev926205-no-update-now/weatherapplet.cpp 2009-03-06 00:12:06.000000000 +0100 @@ -25,7 +25,7 @@ #include #include #include -#include +//#include #include #include #include @@ -105,8 +105,8 @@ m_weatherUpdateTime = generalConfig.readEntry("updateWeather", 30); // "Update Now" contextual action - m_actionUpdateNow = new KAction(i18n("&Update Now"), this); - connect(m_actionUpdateNow, SIGNAL(triggered()), this, SLOT(getWeather())); + //m_actionUpdateNow = new KAction(i18n("&Update Now"), this); + //connect(m_actionUpdateNow, SIGNAL(triggered()), this, SLOT(getWeather())); // Connect to weather engine. weatherEngine = dataEngine("weather"); @@ -282,6 +282,7 @@ KRun::runUrl(KUrl(url), "text/html", 0); } +/* QList WeatherApplet::contextualActions() { QList actions; @@ -294,6 +295,7 @@ return actions; } +*/ void WeatherApplet::destroyLayout() { diff -ur plasma-applet-weather-1.0.0/weatherapplet.h plasma-applet-weather-1.0.0-rev926205-no-update-now/weatherapplet.h --- plasma-applet-weather-1.0.0/weatherapplet.h 2009-01-25 18:54:53.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev926205-no-update-now/weatherapplet.h 2009-03-06 00:12:06.000000000 +0100 @@ -29,7 +29,7 @@ #include "ui_weatherAddPlace.h" class KDialog; -class KAction; +//class KAction; class QStandardItemModel; class QStandardItem; class QGraphicsLinearLayout; @@ -77,7 +77,7 @@ protected: void constraintsEvent(Plasma::Constraints constraints); - QList contextualActions(); + //QList contextualActions(); private: Plasma::DataEngine *weatherEngine; @@ -120,7 +120,7 @@ Plasma::WeatherView *m_fiveDaysView; Plasma::WeatherView *m_detailsView; - KAction *m_actionUpdateNow; + //KAction *m_actionUpdateNow; // Layout int m_setupLayout; kde-plasma-weather-1.0.0-rev930258-wind-gust.patch: --- NEW FILE kde-plasma-weather-1.0.0-rev930258-wind-gust.patch --- diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev930258-wind-gust/weatherapplet.cpp --- plasma-applet-weather-1.0.0/weatherapplet.cpp 2009-02-03 07:20:28.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev930258-wind-gust/weatherapplet.cpp 2009-03-06 00:20:07.000000000 +0100 @@ -1071,7 +1071,7 @@ QStandardItem *dataGust = new QStandardItem(); switch (m_weatherWindFormat) { case WeatherUtils::MetersPerSecond: - dataGust->setText(i18n("Wind Gust: %1%2", QString::number(WeatherUtils::convert(data["Wind Gust"].toDouble(), data["Wind Gust Unit"].toInt(), WeatherUtils::MetersPerSecond), 'f', 2), "m/s")); + dataGust->setText(i18n("Wind Gust: %1%2", QString::number(WeatherUtils::convert(data["Wind Gust"].toDouble(), data["Wind Gust Unit"].toInt(), WeatherUtils::MetersPerSecond), 'f', 1), "m/s")); break; case WeatherUtils::Knots: dataGust->setText(i18n("Wind Gust: %1%2", QString::number(WeatherUtils::convert(data["Wind Gust"].toDouble(), data["Wind Gust Unit"].toInt(), WeatherUtils::Knots), 'f', 1), "kt")); Index: kde-plasma-weather.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-10/kde-plasma-weather.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kde-plasma-weather.spec 5 Feb 2009 11:16:29 -0000 1.1 +++ kde-plasma-weather.spec 5 Mar 2009 23:47:01 -0000 1.2 @@ -1,6 +1,6 @@ Name: kde-plasma-weather Version: 1.0.0 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Plasma applet for weather forecasts Group: User Interface/Desktops @@ -8,6 +8,15 @@ URL: http://www.kdedevelopers.org/blog/4267 Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.0/src/extragear/plasma-applet-weather-%{version}.tar.bz2 +# backports from trunk: +# fix rendering issues with Qt 4.5, in particular a bogus icon at the top left +Patch100: kde-plasma-weather-1.0.0-rev924102-qt45.patch +# fix clipping issue with Qt 4.5 +Patch101: kde-plasma-weather-1.0.0-rev924804-qt45-clip.patch +# don't show the non-functional "Update now" menu entry +Patch102: kde-plasma-weather-1.0.0-rev926205-no-update-now.patch +# use only 1 decimal place for the wind gust +Patch103: kde-plasma-weather-1.0.0-rev930258-wind-gust.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # The weather dataengine is in kdebase-workspace. @@ -20,6 +29,10 @@ %prep %setup -qn plasma-applet-weather-%{version} +%patch100 -p1 -b .qt45 +%patch101 -p1 -b .qt45-clip +%patch102 -p1 -b .no-update-now +%patch103 -p1 -b .wind-gust %build mkdir -p %{_target_platform} @@ -43,6 +56,14 @@ %{_kde4_appsdir}/desktoptheme/default/weather/ %changelog +* Thu Mar 05 2009 Kevin Kofler 1.0.0-3 +- backport 2 fixes for rendering issues with Qt 4.5 from trunk +- don't show the non-functional "Update now" menu entry (backported from trunk) +- use only 1 decimal place for the wind gust (backported from trunk) + +* Wed Feb 25 2009 Fedora Release Engineering 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Feb 03 2009 Shawn Starr 1.0.0-1 - First release. From kkofler at fedoraproject.org Thu Mar 5 23:47:31 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Thu, 5 Mar 2009 23:47:31 +0000 (UTC) Subject: rpms/kde-plasma-weather/F-9 kde-plasma-weather-1.0.0-rev924102-qt45.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev924804-qt45-clip.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev926205-no-update-now.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev930258-wind-gust.patch, NONE, 1.1 kde-plasma-weather.spec, 1.1, 1.2 Message-ID: <20090305234731.ABB4E70116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kde-plasma-weather/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18543/F-9 Modified Files: kde-plasma-weather.spec Added Files: kde-plasma-weather-1.0.0-rev924102-qt45.patch kde-plasma-weather-1.0.0-rev924804-qt45-clip.patch kde-plasma-weather-1.0.0-rev926205-no-update-now.patch kde-plasma-weather-1.0.0-rev930258-wind-gust.patch Log Message: Sync from devel: * Thu Mar 05 2009 Kevin Kofler 1.0.0-3 - backport 2 fixes for rendering issues with Qt 4.5 from trunk - don't show the non-functional "Update now" menu entry (backported from trunk) - use only 1 decimal place for the wind gust (backported from trunk) kde-plasma-weather-1.0.0-rev924102-qt45.patch: --- NEW FILE kde-plasma-weather-1.0.0-rev924102-qt45.patch --- diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev924102-qt45/weatherapplet.cpp --- plasma-applet-weather-1.0.0/weatherapplet.cpp 2009-02-03 07:20:28.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev924102-qt45/weatherapplet.cpp 2009-03-06 00:08:37.000000000 +0100 @@ -166,7 +166,7 @@ m_titlePanel->addItem(m_locationLabel, 0, 0, 1, 3); m_titlePanel->addItem(m_tempLabel, 0, 3); - m_titlePanel->addItem(m_conditionsLabel, 1, 1); + m_titlePanel->addItem(m_conditionsLabel, 1, 0); m_titlePanel->addItem(m_windIcon, 1, 2); m_titlePanel->addItem(m_forecastTemps, 1, 3); @@ -209,6 +209,8 @@ if (m_addDialog) { delete m_addDialog; } + + destroyLayout(); } void WeatherApplet::toolTipAboutToShow() @@ -295,7 +297,7 @@ return actions; } -void WeatherApplet::clearLayout() +void WeatherApplet::destroyLayout() { if (m_bottomLayout) { if (m_fiveDaysModel) { @@ -312,17 +314,17 @@ } if (m_fiveDaysView) { - kDebug() << "Delete the Plasma::WeatherView"; + kDebug() << "Delete the Plasma::m_fiveDaysView"; delete m_fiveDaysView; m_fiveDaysView = 0; - kDebug() << "Finished deleting Plasma::WeatherView"; + kDebug() << "Finished deleting Plasma::m_fiveDaysView"; } if (m_detailsView) { - kDebug() << "Delete the Plasma::WeatherView"; + kDebug() << "Delete the Plasma::m_detailsView"; delete m_detailsView; m_detailsView = 0; - kDebug() << "Finished dleeting Plasma::WeatherView"; + kDebug() << "Finished dleeting Plasma::m_detailsView"; } kDebug() << "Deleting Plasma::TabBar"; @@ -701,8 +703,6 @@ void WeatherApplet::weatherContent(const Plasma::DataEngine::Data &data) { - clearLayout(); - m_locationLabel->setText(data["Place"].toString()); QStringList fiveDayTokens = data["Short Forecast Day 0"].toString().split("|"); // Get current time period of day @@ -791,12 +791,17 @@ if (m_tabBar->count() > 0) { // If we have items in tab clean it up first - for (int i = 0; i < m_tabBar->count(); i++) { - kDebug() << "Destroying Tab: " << i; - m_tabBar->removeTab(i); + while (m_tabBar->count()) { + m_tabBar->removeTab(0); } } + // Do some cleanup on WeatherView + if (m_fiveDaysView) { + delete m_fiveDaysView; + m_fiveDaysView = 0; + } + // If we have a 5 day forecast, display it if (data["Total Weather Days"].toInt() > 0) { if (!m_fiveDaysView) { @@ -853,7 +858,7 @@ fiveDayIcon->setIcon(KIcon(fiveDayTokens[1])); fiveDayIcon->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); fiveDayIcon->setDrawBackground(false); - + fiveDayIcon->hide(); QStandardItem *iconItem = new QStandardItem(fiveDayIcon->icon(), NULL); if (fiveDayTokens[5] != "N/U") { @@ -894,6 +899,7 @@ } + if (dayItems.count() > 0) { m_fiveDaysModel->appendRow(dayItems); } @@ -1210,7 +1216,6 @@ validate(source, data["validate"]); if (isBusy()) { setVisibleLayout(false); - clearLayout(); setBusy(false); setConfigurationRequired(true); } @@ -1266,7 +1271,6 @@ getWeather(); } else { setVisibleLayout(false); - clearLayout(); setConfigurationRequired(true); } } diff -ur plasma-applet-weather-1.0.0/weatherapplet.h plasma-applet-weather-1.0.0-rev924102-qt45/weatherapplet.h --- plasma-applet-weather-1.0.0/weatherapplet.h 2009-01-25 18:54:53.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev924102-qt45/weatherapplet.h 2009-03-06 00:06:21.000000000 +0100 @@ -132,7 +132,7 @@ Plasma::Frame *m_titleFrame; void setVisibleLayout(bool val); - void clearLayout(void); + void destroyLayout(void); QString convertTemperature(int format, QString value, int type, bool rounded); }; kde-plasma-weather-1.0.0-rev924804-qt45-clip.patch: --- NEW FILE kde-plasma-weather-1.0.0-rev924804-qt45-clip.patch --- diff -ur plasma-applet-weather-1.0.0/weatherdelegate.cpp plasma-applet-weather-1.0.0-rev924804-qt45-clip/weatherdelegate.cpp --- plasma-applet-weather-1.0.0/weatherdelegate.cpp 2009-01-29 08:41:30.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev924804-qt45-clip/weatherdelegate.cpp 2009-03-06 00:10:47.000000000 +0100 @@ -144,17 +144,14 @@ path = Plasma::PaintUtils::roundedRectangle(backgroundRectToClip, radius); - painter->save(); - - - painter->setClipRect(backgroundRect); + QPainterPath clipPath; + clipPath.addRect(backgroundRect); + path = path.intersected(clipPath); painter->setRenderHint(QPainter::Antialiasing); painter->setPen(Qt::NoPen); painter->setBrush(backgroundColor); painter->drawPath(path); - - painter->restore(); } if (index.row() == 0 && d->hasHeader) { kde-plasma-weather-1.0.0-rev926205-no-update-now.patch: --- NEW FILE kde-plasma-weather-1.0.0-rev926205-no-update-now.patch --- diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev926205-no-update-now/weatherapplet.cpp --- plasma-applet-weather-1.0.0/weatherapplet.cpp 2009-02-03 07:20:28.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev926205-no-update-now/weatherapplet.cpp 2009-03-06 00:12:06.000000000 +0100 @@ -25,7 +25,7 @@ #include #include #include -#include +//#include #include #include #include @@ -105,8 +105,8 @@ m_weatherUpdateTime = generalConfig.readEntry("updateWeather", 30); // "Update Now" contextual action - m_actionUpdateNow = new KAction(i18n("&Update Now"), this); - connect(m_actionUpdateNow, SIGNAL(triggered()), this, SLOT(getWeather())); + //m_actionUpdateNow = new KAction(i18n("&Update Now"), this); + //connect(m_actionUpdateNow, SIGNAL(triggered()), this, SLOT(getWeather())); // Connect to weather engine. weatherEngine = dataEngine("weather"); @@ -282,6 +282,7 @@ KRun::runUrl(KUrl(url), "text/html", 0); } +/* QList WeatherApplet::contextualActions() { QList actions; @@ -294,6 +295,7 @@ return actions; } +*/ void WeatherApplet::destroyLayout() { diff -ur plasma-applet-weather-1.0.0/weatherapplet.h plasma-applet-weather-1.0.0-rev926205-no-update-now/weatherapplet.h --- plasma-applet-weather-1.0.0/weatherapplet.h 2009-01-25 18:54:53.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev926205-no-update-now/weatherapplet.h 2009-03-06 00:12:06.000000000 +0100 @@ -29,7 +29,7 @@ #include "ui_weatherAddPlace.h" class KDialog; -class KAction; +//class KAction; class QStandardItemModel; class QStandardItem; class QGraphicsLinearLayout; @@ -77,7 +77,7 @@ protected: void constraintsEvent(Plasma::Constraints constraints); - QList contextualActions(); + //QList contextualActions(); private: Plasma::DataEngine *weatherEngine; @@ -120,7 +120,7 @@ Plasma::WeatherView *m_fiveDaysView; Plasma::WeatherView *m_detailsView; - KAction *m_actionUpdateNow; + //KAction *m_actionUpdateNow; // Layout int m_setupLayout; kde-plasma-weather-1.0.0-rev930258-wind-gust.patch: --- NEW FILE kde-plasma-weather-1.0.0-rev930258-wind-gust.patch --- diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev930258-wind-gust/weatherapplet.cpp --- plasma-applet-weather-1.0.0/weatherapplet.cpp 2009-02-03 07:20:28.000000000 +0100 +++ plasma-applet-weather-1.0.0-rev930258-wind-gust/weatherapplet.cpp 2009-03-06 00:20:07.000000000 +0100 @@ -1071,7 +1071,7 @@ QStandardItem *dataGust = new QStandardItem(); switch (m_weatherWindFormat) { case WeatherUtils::MetersPerSecond: - dataGust->setText(i18n("Wind Gust: %1%2", QString::number(WeatherUtils::convert(data["Wind Gust"].toDouble(), data["Wind Gust Unit"].toInt(), WeatherUtils::MetersPerSecond), 'f', 2), "m/s")); + dataGust->setText(i18n("Wind Gust: %1%2", QString::number(WeatherUtils::convert(data["Wind Gust"].toDouble(), data["Wind Gust Unit"].toInt(), WeatherUtils::MetersPerSecond), 'f', 1), "m/s")); break; case WeatherUtils::Knots: dataGust->setText(i18n("Wind Gust: %1%2", QString::number(WeatherUtils::convert(data["Wind Gust"].toDouble(), data["Wind Gust Unit"].toInt(), WeatherUtils::Knots), 'f', 1), "kt")); Index: kde-plasma-weather.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-9/kde-plasma-weather.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kde-plasma-weather.spec 5 Feb 2009 11:16:29 -0000 1.1 +++ kde-plasma-weather.spec 5 Mar 2009 23:47:01 -0000 1.2 @@ -1,6 +1,6 @@ Name: kde-plasma-weather Version: 1.0.0 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Plasma applet for weather forecasts Group: User Interface/Desktops @@ -8,6 +8,15 @@ URL: http://www.kdedevelopers.org/blog/4267 Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.0/src/extragear/plasma-applet-weather-%{version}.tar.bz2 +# backports from trunk: +# fix rendering issues with Qt 4.5, in particular a bogus icon at the top left +Patch100: kde-plasma-weather-1.0.0-rev924102-qt45.patch +# fix clipping issue with Qt 4.5 +Patch101: kde-plasma-weather-1.0.0-rev924804-qt45-clip.patch +# don't show the non-functional "Update now" menu entry +Patch102: kde-plasma-weather-1.0.0-rev926205-no-update-now.patch +# use only 1 decimal place for the wind gust +Patch103: kde-plasma-weather-1.0.0-rev930258-wind-gust.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # The weather dataengine is in kdebase-workspace. @@ -20,6 +29,10 @@ %prep %setup -qn plasma-applet-weather-%{version} +%patch100 -p1 -b .qt45 +%patch101 -p1 -b .qt45-clip +%patch102 -p1 -b .no-update-now +%patch103 -p1 -b .wind-gust %build mkdir -p %{_target_platform} @@ -43,6 +56,14 @@ %{_kde4_appsdir}/desktoptheme/default/weather/ %changelog +* Thu Mar 05 2009 Kevin Kofler 1.0.0-3 +- backport 2 fixes for rendering issues with Qt 4.5 from trunk +- don't show the non-functional "Update now" menu entry (backported from trunk) +- use only 1 decimal place for the wind gust (backported from trunk) + +* Wed Feb 25 2009 Fedora Release Engineering 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Feb 03 2009 Shawn Starr 1.0.0-1 - First release. From airlied at fedoraproject.org Fri Mar 6 00:07:47 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Fri, 6 Mar 2009 00:07:47 +0000 (UTC) Subject: rpms/mesa/devel radeon-rewrite.patch,1.6,1.7 Message-ID: <20090306000747.C074770116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/mesa/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21285 Modified Files: radeon-rewrite.patch Log Message: this time I mean it radeon-rewrite.patch: Index: radeon-rewrite.patch =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/radeon-rewrite.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- radeon-rewrite.patch 5 Mar 2009 23:47:03 -0000 1.6 +++ radeon-rewrite.patch 6 Mar 2009 00:07:16 -0000 1.7 @@ -18642,14 +18642,6 @@ - - rmesa->lost_context = GL_TRUE; -} -diff --git a/src/mesa/drivers/dri/r300/radeon_lock.c b/src/mesa/drivers/dri/r300/radeon_lock.c -new file mode 120000 -index 4f47afd..af4108a ---- /dev/null -+++ b/src/mesa/drivers/dri/r300/radeon_lock.c -@@ -0,0 +1 @@ -+../radeon/radeon_lock.c -\ No newline at end of file diff --git a/src/mesa/drivers/dri/r300/radeon_lock.h b/src/mesa/drivers/dri/r300/radeon_lock.h deleted file mode 100644 index a344837..64bdf94 @@ -19139,14 +19131,6 @@ - radeonInitStencilPointers_z24_s8(&drb->Base); - } -} -diff --git a/src/mesa/drivers/dri/r300/radeon_span.c b/src/mesa/drivers/dri/r300/radeon_span.c -new file mode 120000 -index 16f9fb9..232868c ---- /dev/null -+++ b/src/mesa/drivers/dri/r300/radeon_span.c -@@ -0,0 +1 @@ -+../radeon/radeon_span.c -\ No newline at end of file diff --git a/src/mesa/drivers/dri/r300/radeon_state.c b/src/mesa/drivers/dri/r300/radeon_state.c deleted file mode 100644 index c401da6..0000000 From hardaker at fedoraproject.org Fri Mar 6 00:14:28 2009 From: hardaker at fedoraproject.org (Wes Hardaker) Date: Fri, 6 Mar 2009 00:14:28 +0000 (UTC) Subject: rpms/perl-Getopt-GUI-Long/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <20090306001428.60CC570116@cvs1.fedora.phx.redhat.com> Author: hardaker Update of /cvs/extras/rpms/perl-Getopt-GUI-Long/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22264 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Getopt-GUI-Long/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Dec 2007 19:12:09 -0000 1.2 +++ .cvsignore 6 Mar 2009 00:13:57 -0000 1.3 @@ -1 +1 @@ -Getopt-GUI-Long-0.8.tar.gz +Getopt-GUI-Long-0.91.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Getopt-GUI-Long/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Dec 2007 19:12:09 -0000 1.2 +++ sources 6 Mar 2009 00:13:58 -0000 1.3 @@ -1 +1 @@ -6af40f2c03fa898b4c22a96eabfb7a85 Getopt-GUI-Long-0.8.tar.gz +b77e9516c8cf9593fa108a2eca61bb5b Getopt-GUI-Long-0.91.tar.gz From cwickert at fedoraproject.org Fri Mar 6 00:37:14 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Fri, 6 Mar 2009 00:37:14 +0000 (UTC) Subject: rpms/lxde-common/devel lxde-common-0.3.2.1-openbox.patch, NONE, 1.1 lxde-common-0.3.2.1-pcmanfm.patch, NONE, 1.1 lxde-common-0.3.2.1-pulseaudio.patch, NONE, 1.1 lxde-common-0.3.2.1-vendor.patch, NONE, 1.1 lxde-common-0.3.2.1-lxpanel-config.patch, 1.1, 1.2 lxde-common.spec, 1.2, 1.3 lxde-common-0.3.0.1-default-wallpaper.patch, 1.1, NONE lxde-common-0.3.2.1-lxpanel-mixer.patch, 1.1, NONE lxde-common-0.3.2.1-lxpanel-no-background-by-default.patch, 1.1, NONE lxde-common-0.3.2.1-lxpanel-starthere.patch, 1.1, NONE lxde-common-0.3.2.1-lxterminal.patch, 1.1, NONE lxde-common-0.3.2.1-vendor-artwork.patch, 1.1, NONE noautobuild, 1.1, NONE Message-ID: <20090306003714.323FF70116@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/lxde-common/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25317 Modified Files: lxde-common-0.3.2.1-lxpanel-config.patch lxde-common.spec Added Files: lxde-common-0.3.2.1-openbox.patch lxde-common-0.3.2.1-pcmanfm.patch lxde-common-0.3.2.1-pulseaudio.patch lxde-common-0.3.2.1-vendor.patch Removed Files: lxde-common-0.3.0.1-default-wallpaper.patch lxde-common-0.3.2.1-lxpanel-mixer.patch lxde-common-0.3.2.1-lxpanel-no-background-by-default.patch lxde-common-0.3.2.1-lxpanel-starthere.patch lxde-common-0.3.2.1-lxterminal.patch lxde-common-0.3.2.1-vendor-artwork.patch noautobuild Log Message: * Fri Mar 06 2009 Christoph Wickert - 0.3.2.1-4 - Workaround for new gdm - Addd Pulseaudio support - Add mixer plugin to the panel - Require xdg-utils lxde-common-0.3.2.1-openbox.patch: --- NEW FILE lxde-common-0.3.2.1-openbox.patch --- --- lxde-common-0.3.2.1.orig/openbox/menu.xml 2008-04-20 10:26:09.000000000 +0200 +++ lxde-common-0.3.2.1/openbox/menu.xml 2008-11-30 16:42:01.000000000 +0100 @@ -2,36 +2,52 @@ - + + + + + + + yespcmanfm pcmanfm - - xterm + + lxterminal firefox - - - - - - + - + + + + + + + yesgtk-run + lxpanelctl run + + + + + yesgtk-find + pcmanfm -f + + - lxde-logout lxde-common-0.3.2.1-pcmanfm.patch: --- NEW FILE lxde-common-0.3.2.1-pcmanfm.patch --- diff -dur lxde-common-0.3.2.1.orig/pcmanfm/main.lxde.in lxde-common-0.3.2.1/pcmanfm/main.lxde.in --- lxde-common-0.3.2.1.orig/pcmanfm/main.lxde.in 2008-04-20 10:24:58.000000000 +0200 +++ lxde-common-0.3.2.1/pcmanfm/main.lxde.in 2008-05-06 02:13:16.000000000 +0200 @@ -1,3 +1,6 @@ [Desktop] show_wallpaper=1 wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg + +[General] +terminal=lxterminal lxde-common-0.3.2.1-pulseaudio.patch: --- NEW FILE lxde-common-0.3.2.1-pulseaudio.patch --- --- lxde-common-0.3.2.1.orig/autostart 2008-04-20 10:26:19.000000000 +0200 +++ lxde-common-0.3.2.1/autostart 2008-11-30 19:03:47.000000000 +0100 @@ -1,4 +1,5 @@ @lxde-settings + at pulseaudio -D @xscreensaver -no-splash @lxpanel --profile LXDE @pcmanfm -d --- lxde-common-0.3.2.1.orig/default 2008-04-20 13:20:53.000000000 +0200 +++ lxde-common-0.3.2.1/default 2008-11-30 19:04:34.000000000 +0100 @@ -1,4 +1,5 @@ lxde-settings +pulseaudio -D smproxy xscreensaver -no-splash openbox --config-file $XDG_CONFIG_HOME/openbox/lxde-rc.xml --- lxde-common-0.3.2.1.orig/default.in 2008-04-20 10:26:19.000000000 +0200 +++ lxde-common-0.3.2.1/default.in 2008-11-30 19:04:52.000000000 +0100 @@ -1,4 +1,5 @@ lxde-settings +pulseaudio -D smproxy xscreensaver -no-splash openbox --config-file $XDG_CONFIG_HOME/openbox/lxde-rc.xml lxde-common-0.3.2.1-vendor.patch: --- NEW FILE lxde-common-0.3.2.1-vendor.patch --- --- lxde-common-0.3.2.1.orig/lxde-logout.in 2008-04-20 10:26:19.000000000 +0200 +++ lxde-common-0.3.2.1/lxde-logout.in 2008-11-30 17:08:25.000000000 +0100 @@ -1,2 +1,2 @@ #!/bin/sh -lxsession-logout --banner "@prefix@/share/lxde/images/logout-banner.png" --side=top +lxsession-logout --banner "@prefix@/share/pixmaps/fedora-logo-small.png" --side=top --- lxde-common-0.3.2.1.orig/lxde-settings/config 2008-04-20 10:26:08.000000000 +0200 +++ lxde-common-0.3.2.1/lxde-settings/config 2008-10-10 00:25:20.000000000 +0200 @@ -4,8 +4,8 @@ #iNet/DndDragThreshold #iNet/CursorBlink #iNet/CursorBlinkTime -sNet/ThemeName=Clearlooks -sNet/IconThemeName=nuoveXT2 +sNet/ThemeName=Nodoka +sNet/IconThemeName=Fedora #iGtk/CanChangeAccels=0 #cGtk/ColorPalette sGtk/FontName=Sans 10 --- lxde-common-0.3.2.1.orig/lxpanel/panel.in 2008-04-20 12:09:34.000000000 +0200 +++ lxde-common-0.3.2.1/lxpanel/panel.in 2008-05-06 02:52:48.000000000 +0200 @@ -29,7 +29,7 @@ Plugin { type = menu Config { - image=@prefix@/share/lxpanel/images/my-computer.png + image=@prefix@/share/icons/Fedora/24x24/places/start-here.png system { } separator { --- lxde-common-0.3.2.1.orig/pcmanfm/main.lxde.in 2008-03-19 07:36:29.000000000 +0100 +++ lxde-common-0.3.2.1/pcmanfm/main.lxde.in 2008-04-13 05:25:51.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop] show_wallpaper=1 -wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg +wallpaper=@prefix@/share/backgrounds/images/default.png [General] terminal=lxterminal lxde-common-0.3.2.1-lxpanel-config.patch: Index: lxde-common-0.3.2.1-lxpanel-config.patch =================================================================== RCS file: /cvs/pkgs/rpms/lxde-common/devel/lxde-common-0.3.2.1-lxpanel-config.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lxde-common-0.3.2.1-lxpanel-config.patch 10 Oct 2008 23:51:57 -0000 1.1 +++ lxde-common-0.3.2.1-lxpanel-config.patch 6 Mar 2009 00:37:13 -0000 1.2 @@ -1,5 +1,25 @@ +--- lxde-common-0.3.2.1.orig/lxpanel/config 2008-04-20 11:25:36.000000000 +0200 ++++ lxde-common-0.3.2.1/lxpanel/config 2008-05-06 02:03:45.000000000 +0200 +@@ -1,4 +1,4 @@ + [Command] + FileManager=pcmanfm %s +-Terminal=xterm -e ++Terminal=lxterminal -e + --- lxde-common-0.3.2.1.orig/lxpanel/panel.in 2008-04-20 12:09:34.000000000 +0200 -+++ lxde-common-0.3.2.1/lxpanel/panel.in 2008-05-06 02:55:12.000000000 +0200 ++++ lxde-common-0.3.2.1/lxpanel/panel.in 2008-10-10 01:11:31.000000000 +0200 +@@ -13,9 +13,9 @@ + alpha=0 + setdocktype=1 + setpartialstrut=1 +- usefontcolor=1 ++ usefontcolor=0 + fontcolor=#ffffff +- background=1 ++ background=0 + backgroundfile=@prefix@/share/lxpanel/images/background.png + } + @@ -35,6 +35,7 @@ separator { } @@ -8,7 +28,7 @@ command=run } separator { -@@ -50,13 +50,13 @@ +@@ -50,13 +51,13 @@ type = launchbar Config { Button { @@ -16,7 +36,8 @@ + id=fedora-pcmanfm.desktop } Button { - id=gnome-terminal.desktop +- id=gnome-terminal.desktop ++ id=fedora-lxterminal.desktop } Button { - id=firefox.desktop @@ -24,3 +45,11 @@ } } } +@@ -133,3 +134,7 @@ + } + } + ++Plugin { ++ type = volumealsa ++} ++ Index: lxde-common.spec =================================================================== RCS file: /cvs/pkgs/rpms/lxde-common/devel/lxde-common.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lxde-common.spec 1 Nov 2008 02:53:36 -0000 1.2 +++ lxde-common.spec 6 Mar 2009 00:37:13 -0000 1.3 @@ -1,30 +1,29 @@ Name: lxde-common Version: 0.3.2.1 Release: 4%{?dist} -Summary: Default configuration files for LXDE -Summary(de): Konfigurationsdateien f??r LXDE +Summary: Settings manager for LXDE Group: User Interface/Desktops License: GPLv2+ URL: http://lxde.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.bz2 Patch0: %{name}-0.3.2.1-lxpanel-config.patch -Patch1: %{name}-0.3.2.1-lxpanel-mixer.patch -Patch2: %{name}-0.3.2.1-lxterminal.patch -Patch3: %{name}-0.3.2.1-lxpanel-no-background-by-default.patch +Patch1: %{name}-0.3.2.1-openbox.patch +Patch2: %{name}-0.3.2.1-pcmanfm.patch # Because of new gdm # http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?24:mss:5608:200804:keopkmedognljeggknac Patch4: %{name}-0.3.2.1-gdm-number-of-desktops.patch # Vendor specific patches -Patch10: %{name}-0.3.0.1-default-wallpaper.patch -Patch11: %{name}-0.3.2.1-vendor-artwork.patch -Patch12: %{name}-0.3.2.1-lxpanel-starthere.patch +Patch10: %{name}-0.3.2.1-vendor.patch +# Pulseaudio +Patch11: %{name}-0.3.2.1-pulseaudio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig glib2-devel libX11-devel -Requires: lxsession lxpanel pcmanfm openbox +Requires: lxsession lxpanel pcmanfm openbox xdg-utils +Requires: %{name}-data = %{version}-%{release} # Use vendor's artwork -Requires: gtk-nodoka-engine fedora-icon-theme +Requires: gtk-nodoka-engine fedora-icon-theme system-logos %if 0%{?fedora} < 9 Requires: desktop-backgrounds-basic %else @@ -35,26 +34,29 @@ %description -This package contains the configuration files for LXDE, the Lightweight X11 -Desktop Environment. +This package the settings-manger for LXDE, the Lightweight X11 Desktop +Environment. -%description -l de -Dieses Paket enth??lt die Konfigurationsdateien f??r LXDE, die leichtgewichtige -X11 Desktop Umgebung. +%package data +Summary: Default configuration files for LXDE +Group: User Interface/Desktops +Requires: %{name} = %{version}-%{release} +BuildArch: noarch +%description data +This package contains the configuration files for LXDE, the Lightweight X11 +Desktop Environment. %prep %setup -q -%patch0 -p1 -b .panel-config -%patch1 -p1 -b .mixer -%patch2 -p1 -b .lxterminal -%patch3 -p1 -b .no-background -%if 0%{?fedora} < 9 +%patch0 -p1 -b .orig +%patch1 -p1 -b .orig +%patch2 -p1 -b .orig +%if 0%{?fedora} > 8 %patch4 -p1 -b .gdm-desktops %endif -%patch10 -p1 -b .default-wallpaper -%patch11 -p1 -b .vendor -%patch12 -p1 -b .starthere +%patch10 -p1 -b .vendor +%patch11 -p1 -b .pulseaudio %build @@ -77,13 +79,17 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING %dir %{_sysconfdir}/xdg/lxsession/LXDE/ +%{_bindir}/lxde-settings + +%files data +%defattr(-,root,root,-) +%dir %{_sysconfdir}/xdg/lxsession/LXDE/ %config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/default %config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/autostart %config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/config %{_bindir}/startlxde %{_bindir}/lxde-logout -%{_bindir}/lxde-settings %{_bindir}/openbox-lxde %{_datadir}/lxde/ @@ -92,12 +98,16 @@ %{_usr}/share/xsessions/LXDE.desktop + %changelog -* Sat Nov 01 2008 Christoph Wickert - 0.3.2.1-4 +* Fri Mar 06 2009 Christoph Wickert - 0.3.2.1-4 - Workaround for new gdm +- Addd Pulseaudio support +- Add mixer plugin to the panel +- Require xdg-utils * Fri Oct 10 2008 Christoph Wickert - 0.3.2.1-3 -- Require fedora-icon-theme and fedora-logos +- Require fedora-icon-theme and system-logos * Thu Oct 09 2008 Christoph Wickert - 0.3.2.1-2 - Rebase patches for rpm's new fuzz=0 behaviour --- lxde-common-0.3.0.1-default-wallpaper.patch DELETED --- --- lxde-common-0.3.2.1-lxpanel-mixer.patch DELETED --- --- lxde-common-0.3.2.1-lxpanel-no-background-by-default.patch DELETED --- --- lxde-common-0.3.2.1-lxpanel-starthere.patch DELETED --- --- lxde-common-0.3.2.1-lxterminal.patch DELETED --- --- lxde-common-0.3.2.1-vendor-artwork.patch DELETED --- --- noautobuild DELETED --- From rrelyea at fedoraproject.org Fri Mar 6 00:37:36 2009 From: rrelyea at fedoraproject.org (Robert Relyea) Date: Fri, 6 Mar 2009 00:37:36 +0000 (UTC) Subject: rpms/pcsc-lite/devel pcsc-lite-close_on_exec.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 import.log, 1.1, 1.2 pcsc-lite.spec, 1.19, 1.20 sources, 1.6, 1.7 Message-ID: <20090306003736.47A2A70116@cvs1.fedora.phx.redhat.com> Author: rrelyea Update of /cvs/extras/rpms/pcsc-lite/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25234/devel Modified Files: .cvsignore import.log pcsc-lite.spec sources Added Files: pcsc-lite-close_on_exec.patch Log Message: upgrade to 1.5.2 fix close on exec issue pcsc-lite-close_on_exec.patch: --- NEW FILE pcsc-lite-close_on_exec.patch --- diff -up ./src/sys_unix.c.close_on_exec ./src/sys_unix.c --- ./src/sys_unix.c.close_on_exec 2009-02-24 16:02:47.641288000 -0800 +++ ./src/sys_unix.c 2009-02-24 16:10:25.774746000 -0800 @@ -123,9 +123,12 @@ INTERNAL int SYS_USleep(int iTimeVal) * @retval >0 The file descriptor. * @retval -1 An error ocurred. */ + INTERNAL int SYS_OpenFile(const char *pcFile, int flags, int mode) { - return open(pcFile, flags, mode); + int fd = open(pcFile, flags, mode); + fcntl(fd, F_SETFD, FD_CLOEXEC); + return fd; } /** Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Aug 2008 00:31:35 -0000 1.6 +++ .cvsignore 6 Mar 2009 00:37:05 -0000 1.7 @@ -1 +1 @@ -pcsc-lite-1.4.102.tar.bz2 +pcsc-lite-1.5.2.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Aug 2008 00:31:36 -0000 1.1 +++ import.log 6 Mar 2009 00:37:05 -0000 1.2 @@ -1 +1,2 @@ pcsc-lite-1_4_102-1_rhel5_bob:HEAD:pcsc-lite-1.4.102-1.rhel5_bob.src.rpm:1219883684 +pcsc-lite-1_5_2-1_fc10_bob:HEAD:pcsc-lite-1.5.2-1.fc10_bob.src.rpm:1236299703 Index: pcsc-lite.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/devel/pcsc-lite.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- pcsc-lite.spec 26 Feb 2009 10:14:06 -0000 1.19 +++ pcsc-lite.spec 6 Mar 2009 00:37:05 -0000 1.20 @@ -1,14 +1,16 @@ Name: pcsc-lite -Version: 1.4.102 -Release: 5%{?dist} +Version: 1.5.2 +Release: 1%{?dist} Summary: PC/SC Lite smart card framework and applications +%define upstream_build 2795 Group: System Environment/Daemons License: BSD URL: http://pcsclite.alioth.debian.org/ -Source0: http://alioth.debian.org/download.php/2106/%{name}-%{version}.tar.bz2 +Source0: http://alioth.debian.org/download.php/%{upstream_build}/%{name}-%{version}.tar.bz2 Patch0: %{name}-1.4-docinst.patch Patch1: %{name}-1.4.100-rpath64.patch +Patch2: %{name}-close_on_exec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,6 +63,7 @@ %setup -q %patch0 -p0 -b .docinst %patch1 -p1 -b .rpath64 +%patch2 -p1 -b .close_on_exec %build %configure \ @@ -122,7 +125,7 @@ %doc AUTHORS ChangeLog* COPYING DRIVERS HELP README SECURITY TODO %dir %{_sysconfdir}/reader.conf.d/ %doc %{_sysconfdir}/reader.conf.d/README -%ghost %config %{_sysconfdir}/reader.conf +%ghost %config(noreplace) %{_sysconfdir}/reader.conf %{_initrddir}/pcscd %{_sbindir}/pcscd %{_sbindir}/update-reader.conf @@ -147,6 +150,11 @@ %changelog +* Fri Feb 27 2009 Bob Relyea - 1.5.2-1 +- Pick up 1.5.2 +- Add FD_CLOEXEC flag +- make reader.conf a noreplace config file + * Thu Feb 26 2009 Fedora Release Engineering - 1.4.102-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Aug 2008 00:31:36 -0000 1.6 +++ sources 6 Mar 2009 00:37:05 -0000 1.7 @@ -1 +1 @@ -b97d3a725ab93662adf09acfbc49efeb pcsc-lite-1.4.102.tar.bz2 +d7d466621bec39354351f09349f6374c pcsc-lite-1.5.2.tar.bz2 From geofflevand at fedoraproject.org Fri Mar 6 00:40:48 2009 From: geofflevand at fedoraproject.org (Geoff Levand) Date: Fri, 6 Mar 2009 00:40:48 +0000 (UTC) Subject: rpms/ps3-utils/F-10 ps3-utils.spec,1.2,1.3 Message-ID: <20090306004048.C91B470116@cvs1.fedora.phx.redhat.com> Author: geofflevand Update of /cvs/pkgs/rpms/ps3-utils/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25722/F-10 Modified Files: ps3-utils.spec Log Message: Fix Obsoletes line to account for disttag in older pacakges Index: ps3-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/ps3-utils/F-10/ps3-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ps3-utils.spec 25 Feb 2009 01:54:15 -0000 1.2 +++ ps3-utils.spec 6 Mar 2009 00:40:18 -0000 1.3 @@ -1,6 +1,6 @@ Name: ps3-utils Version: 2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utilities for Sony PlayStation 3 Group: System Environment/Base @@ -11,7 +11,7 @@ BuildRequires: autoconf automake groff libtool Provides: ps3pf-utils = 2.1-3 -Obsoletes: ps3pf-utils <= 2.1-2 +Obsoletes: ps3pf-utils < 0:2.1-3 ExclusiveArch: ppc ppc64 %description @@ -84,6 +84,9 @@ %doc COPYING %changelog +* Thu Feb 26 2009 Josh Boyer 2.3-3 +- Fix Obsoletes line to account for disttag in older pacakges + * Tue Feb 24 2009 Geoff Levand 2.3-2 - Add groff to BuildRequires From dcantrel at fedoraproject.org Fri Mar 6 00:57:34 2009 From: dcantrel at fedoraproject.org (David Cantrell) Date: Fri, 6 Mar 2009 00:57:34 +0000 (UTC) Subject: rpms/dhcp/devel dhclient-script,1.6,1.7 dhcp.spec,1.243,1.244 Message-ID: <20090306005734.EEC9270116@cvs1.fedora.phx.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/dhcp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28281 Modified Files: dhclient-script dhcp.spec Log Message: * Thu Mar 05 2009 David Cantrell - 12:4.1.0-10 - restorecon fixes for /etc/localtime and /etc/resolv.conf (#488470) Index: dhclient-script =================================================================== RCS file: /cvs/pkgs/rpms/dhcp/devel/dhclient-script,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dhclient-script 19 Feb 2009 03:23:10 -0000 1.6 +++ dhclient-script 6 Mar 2009 00:57:04 -0000 1.7 @@ -40,6 +40,12 @@ logger -p ${LOGFACILITY}.${LOGLEVEL} -t "NET" "dhclient: ${msg}" } +fix_context() { + if [ -x /sbin/restorecon ]; then + /sbin/restorecon ${1} >/dev/null 2>&1 + fi +} + save_previous() { origfile="${1}" savefile="${SAVEDIR}/${origfile##*/}.predhclient.${interface}" @@ -54,7 +60,7 @@ echo > ${savefile} fi - restorecon ${savefile} >/dev/null 2>&1 + fix_context ${savefile} } make_resolv_conf() { @@ -94,9 +100,7 @@ change_resolv_conf ${rscf} rm -f ${rscf} - if [ -x /sbin/restorecon ]; then - /sbin/restorecon /etc/resolv.conf >/dev/null 2>&1 - fi + fix_context /etc/resolv.conf fi } @@ -350,6 +354,7 @@ save_previous /etc/localtime cp -fp ${tzfile} /etc/localtime touch /etc/localtime + fix_context /etc/localtime fi fi fi @@ -475,22 +480,19 @@ rm -f /etc/localtime mv ${SAVEDIR}/localtime.predhclient.${interface} /etc/localtime touch /etc/localtime + fix_context /etc/localtime fi fi + fi - if [ -f ${SAVEDIR}/ntp.conf.predhclient.${interface} ]; then - rm -f /etc/ntp.conf - mv -f ${SAVEDIR}/ntp.conf.predhclient.${interface} /etc/ntp.conf - service ntpd condrestart >/dev/null 2>&1 - fi - - if [ -f ${SAVEDIR}/yp.conf.predhclient.${interface} ]; then - rm -f /etc/yp.conf - mv -f ${SAVEDIR}/yp.conf.predhclient.${interface} /etc/yp.conf - if [ -x /etc/rc.d/init.d/ypbind ] && [ -r /var/run/ypbind.pid ]; then - service ypbind restart >/dev/null 2>&1 + # execute any additional client side configuration scripts we have + if [ -d /etc/dhcp/dhclient.d ]; then + for f in /etc/dhcp/dhclient.d/*.sh ; do + if [ -x ${f} ]; then + subsystem="${f%.sh}" + . ${f} "${subsystem}_restore" fi - fi + done fi if [ -x /etc/dhclient-${interface}-down-hooks ]; then Index: dhcp.spec =================================================================== RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.243 retrieving revision 1.244 diff -u -r1.243 -r1.244 --- dhcp.spec 24 Feb 2009 11:39:09 -0000 1.243 +++ dhcp.spec 6 Mar 2009 00:57:04 -0000 1.244 @@ -4,7 +4,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.1.0 -Release: 9%{?dist} +Release: 10%{?dist} # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # dcantrell maintaining the package) made incorrect use of the epoch and # that's why it is at 12 now. It should have never been used, but it was. @@ -419,6 +419,9 @@ %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz %changelog +* Thu Mar 05 2009 David Cantrell - 12:4.1.0-10 +- restorecon fixes for /etc/localtime and /etc/resolv.conf (#488470) + * Tue Feb 24 2009 Fedora Release Engineering - 12:4.1.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mjg59 at fedoraproject.org Fri Mar 6 00:58:33 2009 From: mjg59 at fedoraproject.org (Matthew Garrett) Date: Fri, 6 Mar 2009 00:58:33 +0000 (UTC) Subject: rpms/kernel/devel linux-2.6-input-fix-toshiba-hotkeys.patch, NONE, 1.1 kernel.spec, 1.1387, 1.1388 Message-ID: <20090306005833.1E6DC70116@cvs1.fedora.phx.redhat.com> Author: mjg59 Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28509 Modified Files: kernel.spec Added Files: linux-2.6-input-fix-toshiba-hotkeys.patch Log Message: * Fri Mar 06 2009 Matthew Garrett - linux-2.6-input-fix-toshiba-hotkeys.patch: Avoid polling for hotkey events on Toshibas linux-2.6-input-fix-toshiba-hotkeys.patch: --- NEW FILE linux-2.6-input-fix-toshiba-hotkeys.patch --- commit 61a2aa30877a6e2be1d3fb3a71385e1f741819d7 Author: Matthew Garrett Date: Fri Mar 6 00:25:45 2009 +0000 toshiba-acpi: Add support for hotkey notifications Calling the ENAB method on Toshiba laptops results in notifications being sent when laptop hotkeys are pressed. This patch simply calls that method and sets up an input device if it's successful. Signed-off-by: Matthew Garrett diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index 40e60fc..604f9fa 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -46,6 +46,7 @@ #include #include #include +#include #include @@ -62,9 +63,10 @@ MODULE_LICENSE("GPL"); /* Toshiba ACPI method paths */ #define METHOD_LCD_BRIGHTNESS "\\_SB_.PCI0.VGA_.LCD_._BCM" -#define METHOD_HCI_1 "\\_SB_.VALD.GHCI" -#define METHOD_HCI_2 "\\_SB_.VALZ.GHCI" +#define TOSH_INTERFACE_1 "\\_SB_.VALD" +#define TOSH_INTERFACE_2 "\\_SB_.VALZ" #define METHOD_VIDEO_OUT "\\_SB_.VALX.DSSX" +#define GHCI_METHOD ".GHCI" /* Toshiba HCI interface definitions * @@ -116,6 +118,36 @@ static const struct acpi_device_id toshiba_device_ids[] = { }; MODULE_DEVICE_TABLE(acpi, toshiba_device_ids); +struct key_entry { + char type; + u16 code; + u16 keycode; +}; + +enum {KE_KEY, KE_END}; + +static struct key_entry toshiba_acpi_keymap[] = { + {KE_KEY, 0x101, KEY_MUTE}, + {KE_KEY, 0x13b, KEY_COFFEE}, + {KE_KEY, 0x13c, KEY_BATTERY}, + {KE_KEY, 0x13d, KEY_SLEEP}, + {KE_KEY, 0x13e, KEY_SUSPEND}, + {KE_KEY, 0x13f, KEY_SWITCHVIDEOMODE}, + {KE_KEY, 0x140, KEY_BRIGHTNESSDOWN}, + {KE_KEY, 0x141, KEY_BRIGHTNESSUP}, + {KE_KEY, 0x142, KEY_WLAN}, + {KE_KEY, 0x143, KEY_PROG1}, + {KE_KEY, 0xb05, KEY_PROG2}, + {KE_KEY, 0xb06, KEY_WWW}, + {KE_KEY, 0xb07, KEY_MAIL}, + {KE_KEY, 0xb30, KEY_STOP}, + {KE_KEY, 0xb31, KEY_PREVIOUSSONG}, + {KE_KEY, 0xb32, KEY_NEXTSONG}, + {KE_KEY, 0xb33, KEY_PLAYPAUSE}, + {KE_KEY, 0xb5a, KEY_MEDIA}, + {KE_END, 0, 0}, +}; + /* utility */ @@ -252,6 +284,8 @@ struct toshiba_acpi_dev { struct platform_device *p_dev; struct rfkill *rfk_dev; struct input_polled_dev *poll_dev; + struct input_dev *hotkey_dev; + acpi_handle handle; const char *bt_name; const char *rfk_name; @@ -702,6 +736,154 @@ static struct backlight_ops toshiba_backlight_data = { .update_status = set_lcd_status, }; +static struct key_entry *toshiba_acpi_get_entry_by_scancode(int code) +{ + struct key_entry *key; + + for (key = toshiba_acpi_keymap; key->type != KE_END; key++) + if (code == key->code) + return key; + + return NULL; +} + +static struct key_entry *toshiba_acpi_get_entry_by_keycode(int code) +{ + struct key_entry *key; + + for (key = toshiba_acpi_keymap; key->type != KE_END; key++) + if (code == key->keycode && key->type == KE_KEY) + return key; + + return NULL; +} + +static int toshiba_acpi_getkeycode(struct input_dev *dev, int scancode, + int *keycode) +{ + struct key_entry *key = toshiba_acpi_get_entry_by_scancode(scancode); + + if (key && key->type == KE_KEY) { + *keycode = key->keycode; + return 0; + } + + return -EINVAL; +} + +static int toshiba_acpi_setkeycode(struct input_dev *dev, int scancode, + int keycode) +{ + struct key_entry *key; + int old_keycode; + + if (keycode < 0 || keycode > KEY_MAX) + return -EINVAL; + + key = toshiba_acpi_get_entry_by_scancode(scancode); + if (key && key->type == KE_KEY) { + old_keycode = key->keycode; + key->keycode = keycode; + set_bit(keycode, dev->keybit); + if (!toshiba_acpi_get_entry_by_keycode(old_keycode)) + clear_bit(old_keycode, dev->keybit); + return 0; + } + + return -EINVAL; +} + +static void toshiba_acpi_notify(acpi_handle handle, u32 event, void *data) +{ + u32 hci_result, value; + struct key_entry *key; + + if (event != 0x80) + return; + do { + hci_read1(HCI_SYSTEM_EVENT, &value, &hci_result); + if (hci_result == HCI_SUCCESS) { + if (value == 0x100) + continue; + else if (value & 0x80) { + key = toshiba_acpi_get_entry_by_scancode + (value & ~0x80); + if (!key) { + printk(MY_INFO "Unknown key %x\n", + value & ~0x80); + continue; + } + input_report_key(toshiba_acpi.hotkey_dev, + key->keycode, 1); + input_sync(toshiba_acpi.hotkey_dev); + input_report_key(toshiba_acpi.hotkey_dev, + key->keycode, 0); + input_sync(toshiba_acpi.hotkey_dev); + } + } else if (hci_result == HCI_NOT_SUPPORTED) { + /* This is a workaround for an unresolved issue on + * some machines where system events sporadically + * become disabled. */ + hci_write1(HCI_SYSTEM_EVENT, 1, &hci_result); + printk(MY_NOTICE "Re-enabled hotkeys\n"); + } + } while (hci_result != HCI_EMPTY); +} + +static int toshiba_acpi_setup_keyboard(char *device) +{ + acpi_status status; + acpi_handle handle; + int result; + const struct key_entry *key; + + status = acpi_get_handle(NULL, device, &handle); + if (ACPI_FAILURE(status)) { + printk(MY_INFO "Unable to get notification device\n"); + return -ENODEV; + } + + toshiba_acpi.handle = handle; + + status = acpi_evaluate_object(handle, "ENAB", NULL, NULL); + if (ACPI_FAILURE(status)) { + printk(MY_INFO "Unable to enable hotkeys\n"); + return -ENODEV; + } + + status = acpi_install_notify_handler (handle, ACPI_DEVICE_NOTIFY, + toshiba_acpi_notify, NULL); + if (ACPI_FAILURE(status)) { + printk(MY_INFO "Unable to install hotkey notification\n"); + return -ENODEV; + } + + toshiba_acpi.hotkey_dev = input_allocate_device(); + if (!toshiba_acpi.hotkey_dev) { + printk(MY_INFO "Unable to register input device\n"); + return -ENOMEM; + } + + toshiba_acpi.hotkey_dev->name = "Toshiba input device"; + toshiba_acpi.hotkey_dev->phys = device; + toshiba_acpi.hotkey_dev->id.bustype = BUS_HOST; + toshiba_acpi.hotkey_dev->getkeycode = toshiba_acpi_getkeycode; + toshiba_acpi.hotkey_dev->setkeycode = toshiba_acpi_setkeycode; + + for (key = toshiba_acpi_keymap; key->type != KE_END; key++) { + set_bit(EV_KEY, toshiba_acpi.hotkey_dev->evbit); + set_bit(key->keycode, toshiba_acpi.hotkey_dev->keybit); + } + + result = input_register_device(toshiba_acpi.hotkey_dev); + if (result) { + printk(MY_INFO "Unable to register input device\n"); + return result; + } + + return 0; +} + static void toshiba_acpi_exit(void) { if (toshiba_acpi.poll_dev) { @@ -709,12 +891,18 @@ static void toshiba_acpi_exit(void) input_free_polled_device(toshiba_acpi.poll_dev); } + if (toshiba_acpi.hotkey_dev) + input_unregister_device(toshiba_acpi.hotkey_dev); + if (toshiba_acpi.rfk_dev) rfkill_unregister(toshiba_acpi.rfk_dev); if (toshiba_backlight_device) backlight_device_unregister(toshiba_backlight_device); + acpi_remove_notify_handler(toshiba_acpi.handle, ACPI_DEVICE_NOTIFY, + toshiba_acpi_notify); + remove_device(); if (toshiba_proc_dir) @@ -738,11 +926,15 @@ static int __init toshiba_acpi_init(void) return -ENODEV; /* simple device detection: look for HCI method */ - if (is_valid_acpi_path(METHOD_HCI_1)) - method_hci = METHOD_HCI_1; - else if (is_valid_acpi_path(METHOD_HCI_2)) - method_hci = METHOD_HCI_2; - else + if (is_valid_acpi_path(TOSH_INTERFACE_1 GHCI_METHOD)) { + method_hci = TOSH_INTERFACE_1 GHCI_METHOD; + if (toshiba_acpi_setup_keyboard(TOSH_INTERFACE_1)) + printk(MY_INFO "Unable to activate hotkeys\n"); + } else if (is_valid_acpi_path(TOSH_INTERFACE_2 GHCI_METHOD)) { + method_hci = TOSH_INTERFACE_2 GHCI_METHOD; + if (toshiba_acpi_setup_keyboard(TOSH_INTERFACE_2)) + printk(MY_INFO "Unable to activate hotkeys\n"); + } else return -ENODEV; printk(MY_INFO "Toshiba Laptop ACPI Extras version %s\n", Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1387 retrieving revision 1.1388 diff -u -r1.1387 -r1.1388 --- kernel.spec 5 Mar 2009 07:26:22 -0000 1.1387 +++ kernel.spec 6 Mar 2009 00:58:02 -0000 1.1388 @@ -621,6 +621,7 @@ Patch393: linux-2.6-hwmon-atk0110.patch Patch400: linux-2.6-scsi-cpqarray-set-master.patch Patch450: linux-2.6-input-kill-stupid-messages.patch +Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch Patch460: linux-2.6-serial-460800.patch Patch510: linux-2.6-silence-noise.patch Patch530: linux-2.6-silence-fbcon-logo.patch @@ -1138,6 +1139,9 @@ # The input layer spews crap no-one cares about. ApplyPatch linux-2.6-input-kill-stupid-messages.patch +# Get away from having to poll Toshibas +ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch + # Allow to use 480600 baud on 16C950 UARTs ApplyPatch linux-2.6-serial-460800.patch # Silence some useless messages that still get printed with 'quiet' @@ -1796,6 +1800,10 @@ # and build. %changelog +* Fri Mar 06 2009 Matthew Garrett +- linux-2.6-input-fix-toshiba-hotkeys.patch: Avoid polling for hotkey events + on Toshibas + * Thu Mar 05 2009 Dave Airlie - drm-radeon-modesetting.patch: add new relocation for Xv sync From hadess at fedoraproject.org Fri Mar 6 01:06:37 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Fri, 6 Mar 2009 01:06:37 +0000 (UTC) Subject: rpms/bluez/devel bluez-sdp-xml-with-nulls.patch, NONE, 1.1 bluez.spec, 1.45, 1.46 Message-ID: <20090306010637.5D7FB70116@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30201 Modified Files: bluez.spec Added Files: bluez-sdp-xml-with-nulls.patch Log Message: * Fri Mar 06 2009 - Bastien Nocera - 4.32-5 - Fix SDP parsing to XML when it contains NULLs bluez-sdp-xml-with-nulls.patch: --- NEW FILE bluez-sdp-xml-with-nulls.patch --- diff --git a/common/sdp-xml.c b/common/sdp-xml.c index 0403dcd..5f314b7 100644 --- a/common/sdp-xml.c +++ b/common/sdp-xml.c @@ -239,9 +239,7 @@ static void convert_raw_data_to_xml(sdp_data_t *value, int indent_level, hex = 0; for (i = 0; i < length; i++) { - if (value->val.str[i] == '\0') - break; - if (!isprint(value->val.str[i])) { + if (!isprint(value->val.str[i]) && value->val.str[i] != '\0') { hex = 1; break; } @@ -250,7 +248,8 @@ static void convert_raw_data_to_xml(sdp_data_t *value, int indent_level, if ((value->val.str[i] == '<') || (value->val.str[i] == '>') || (value->val.str[i] == '"') || - (value->val.str[i] == '&')) + (value->val.str[i] == '&') || + (value->val.str[i] == '\0')) num_chars_to_escape++; } @@ -304,7 +303,13 @@ static void convert_raw_data_to_xml(sdp_data_t *value, int indent_level, strBuf[j++] = 'o'; strBuf[j++] = 't'; } - else { + else if (value->val.str[i] == '\0') { + strBuf[j++] = '&'; + strBuf[j++] = '#'; + strBuf[j++] = '0'; + strBuf[j++] = '0'; + strBuf[j++] = ';'; + } else { strBuf[j++] = value->val.str[i]; } } Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- bluez.spec 5 Mar 2009 18:53:13 -0000 1.45 +++ bluez.spec 6 Mar 2009 01:06:07 -0000 1.46 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez Version: 4.32 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz @@ -12,6 +12,8 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=450081 # http://thread.gmane.org/gmane.linux.bluez.kernel/1687 Patch2: bluez-try-utf8-harder.patch +# http://thread.gmane.org/gmane.linux.bluez.kernel/1688 +Patch3: bluez-sdp-xml-with-nulls.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.bluez.org/ @@ -99,6 +101,7 @@ %setup -q %patch1 -p0 -b .oui %patch2 -p1 -b .non-utf8-name +%patch3 -p1 -b .nulls-in-sdp-text %build %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund @@ -191,6 +194,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Fri Mar 06 2009 - Bastien Nocera - 4.32-5 +- Fix SDP parsing to XML when it contains NULLs + * Thu Mar 05 2009 - Bastien Nocera - 4.32-4 - Work-around broken devices that export their names in ISO-8859-1 (#450081) From dcantrel at fedoraproject.org Fri Mar 6 01:09:03 2009 From: dcantrel at fedoraproject.org (David Cantrell) Date: Fri, 6 Mar 2009 01:09:03 +0000 (UTC) Subject: rpms/pyparted/devel .cvsignore, 1.25, 1.26 pyparted.spec, 1.53, 1.54 sources, 1.30, 1.31 Message-ID: <20090306010903.4F2FB70116@cvs1.fedora.phx.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/pyparted/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30861 Modified Files: .cvsignore pyparted.spec sources Log Message: * Thu Mar 05 2009 David Cantrell - 2.0.5-1 - Upgrade to pyparted-2.0.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pyparted/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 1 Mar 2009 04:52:04 -0000 1.25 +++ .cvsignore 6 Mar 2009 01:08:32 -0000 1.26 @@ -1 +1 @@ -pyparted-2.0.4.tar.gz +pyparted-2.0.5.tar.gz Index: pyparted.spec =================================================================== RCS file: /cvs/pkgs/rpms/pyparted/devel/pyparted.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- pyparted.spec 1 Mar 2009 04:52:04 -0000 1.53 +++ pyparted.spec 6 Mar 2009 01:08:32 -0000 1.54 @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted -Version: 2.0.4 +Version: 2.0.5 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -41,6 +41,9 @@ %{python_sitearch}/parted %changelog +* Thu Mar 05 2009 David Cantrell - 2.0.5-1 +- Upgrade to pyparted-2.0.5 + * Sat Feb 28 2009 David Cantrell - 2.0.4-1 - Upgrade to pyparted-2.0.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pyparted/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 1 Mar 2009 04:52:04 -0000 1.30 +++ sources 6 Mar 2009 01:08:32 -0000 1.31 @@ -1 +1 @@ -be612c7e1e6559814afead6b0b42d7c3 pyparted-2.0.4.tar.gz +1a75fd87384806853895c6f1a23f39e7 pyparted-2.0.5.tar.gz From mjg59 at fedoraproject.org Fri Mar 6 01:15:19 2009 From: mjg59 at fedoraproject.org (Matthew Garrett) Date: Fri, 6 Mar 2009 01:15:19 +0000 (UTC) Subject: rpms/hal/devel hal.spec,1.186,1.187 Message-ID: <20090306011519.A83A170116@cvs1.fedora.phx.redhat.com> Author: mjg59 Update of /cvs/pkgs/rpms/hal/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32132 Modified Files: hal.spec Log Message: * Fri Mar 06 2009 - Matthew Garrett - 0.5.12-24.20090226git - Remove Toshiba hotkey support. toshiba_acpi can handle them now. Index: hal.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- hal.spec 3 Mar 2009 10:54:43 -0000 1.186 +++ hal.spec 6 Mar 2009 01:14:49 -0000 1.187 @@ -28,7 +28,7 @@ Name: hal Version: 0.5.12 #Release: 14%{?dist} -Release: 23.%{?alphatag}%{?dist} +Release: 24.%{?alphatag}%{?dist} URL: http://www.freedesktop.org/Software/hal #Source0: http://hal.freedesktop.org/releases/%{name}-%{version}rc1.tar.bz2 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz @@ -158,7 +158,6 @@ --enable-acl-management \ --enable-umount-helper \ --enable-acpi-ibm \ - --enable-acpi-toshiba \ --with-eject=%{_sbindir}/eject # because of patch8 @@ -296,6 +295,9 @@ %{_datadir}/gtk-doc/html/libhal-storage/* %changelog +* Fri Mar 06 2009 - Matthew Garrett - 0.5.12-24.20090226git +- Remove Toshiba hotkey support. toshiba_acpi can handle them now. + * Tue Mar 03 2009 - Bastien Nocera - 0.5.12-23.20090226git - Remove Dell killswitches support, they're handled through the kernel's dell_laptop module instead now (#488177), removes requires for smbios-utils From mtasaka at fedoraproject.org Fri Mar 6 01:19:25 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Fri, 6 Mar 2009 01:19:25 +0000 (UTC) Subject: rpms/rubygem-htmlentities/F-9 rubygem-htmlentities.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306011925.6E36770116@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/rubygem-htmlentities/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv606/F-9 Modified Files: .cvsignore sources Added Files: rubygem-htmlentities.spec Log Message: Initial import --- NEW FILE rubygem-htmlentities.spec --- # Generated from htmlentities-4.0.0.gem by gem2rpm -*- rpm-spec -*- %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %global gemname htmlentities %global geminstdir %{gemdir}/gems/%{gemname}-%{version} %global rubyabi 1.8 Summary: A module for encoding and decoding (X)HTML entities Name: rubygem-%{gemname} Version: 4.0.0 Release: 2%{?dist} Group: Development/Languages License: MIT URL: http://htmlentities.rubyforge.org/ Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ruby(abi) = %{rubyabi} BuildRequires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} Requires: ruby(rubygems) BuildArch: noarch Provides: rubygem(%{gemname}) = %{version}-%{release} %description HTMLEntities is a simple library to facilitate encoding and decoding of named (ý and so on) or numerical ({ or Ī) entities in HTML and XHTML documents. %package -n ruby-%{gemname} Summary: Non-Gem support for %{gemname} Group: Development/Languages Requires: %{name} = %{version}-%{release} Provides: ruby(%{gemname}) = %{version}-%{release} %description -n ruby-%{gemname} This package provides non-Gem support for %{gemname}. %prep # First install rubygems under %%_builddir to execute some # tests %setup -q -c -T mkdir -p ./%{geminstdir} gem install \ -V \ --local --install-dir ./%{gemdir} \ --force \ --rdoc \ %{SOURCE0} %build %install rm -rf %{buildroot} mkdir -p %{buildroot}%{gemdir} cp -a ./%{gemdir}/* %{buildroot}%{gemdir}/ # Create symlinks for ruby-%%{gemname} # Copied from rubygem-gettext.spec create_symlink_rec(){ ORIGBASEDIR=$1 TARGETBASEDIR=$2 ## First calculate relative path of ORIGBASEDIR ## from TARGETBASEDIR TMPDIR=$TARGETBASEDIR BACKDIR= DOWNDIR= num=0 nnum=0 while true do num=$((num+1)) TMPDIR=$(echo $TMPDIR | %{__sed} -e 's|/[^/][^/]*$||') DOWNDIR=$(echo $ORIGBASEDIR | %{__sed} -e "s|^$TMPDIR||") if [ x$DOWNDIR != x$ORIGBASEDIR ] then nnum=0 while [ $nnum -lt $num ] do BACKDIR="../$BACKDIR" nnum=$((nnum+1)) done break fi done RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | %{__sed} -e 's|//*|/|g' ) ## Next actually create symlink pushd %{buildroot}/$ORIGBASEDIR find . -type f | while read f do DIRNAME=$(dirname $f) BACK2DIR=$(echo $DIRNAME | %{__sed} -e 's|/[^/][^/]*|/..|g') %{__mkdir_p} %{buildroot}${TARGETBASEDIR}/$DIRNAME LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \ %{__sed} -e 's|^\./||' | %{__sed} -e 's|//|/|g' | \ %{__sed} -e 's|/\./|/|' ) %{__ln_s} -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f done popd } create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} %check pushd ./%{geminstdir}/test/ ruby test_all.rb %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc %{gemdir}/doc/%{gemname}-%{version}/ %dir %{geminstdir} %doc %{geminstdir}/[A-Z]* %{geminstdir}/lib/ %doc %{geminstdir}/test/ %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %files -n ruby-%{gemname} %defattr(-,root,root,-) %{ruby_sitelib}/%{gemname}.rb %{ruby_sitelib}/%{gemname}/ %changelog * Fri Mar 6 2009 Mamoru Tasaka - Cleanups * Tue Mar 03 2009 Mamoru Tasaka - 4.0.0-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:26:28 -0000 1.1 +++ .cvsignore 6 Mar 2009 01:18:55 -0000 1.2 @@ -0,0 +1 @@ +htmlentities-4.0.0.gem Index: sources =================================================================== RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:26:28 -0000 1.1 +++ sources 6 Mar 2009 01:18:55 -0000 1.2 @@ -0,0 +1 @@ +8490050367c95d63f83049852f7e93a8 htmlentities-4.0.0.gem From mtasaka at fedoraproject.org Fri Mar 6 01:19:25 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Fri, 6 Mar 2009 01:19:25 +0000 (UTC) Subject: rpms/rubygem-htmlentities/F-10 rubygem-htmlentities.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306011925.3AB5370116@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/rubygem-htmlentities/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv606/F-10 Modified Files: .cvsignore sources Added Files: rubygem-htmlentities.spec Log Message: Initial import --- NEW FILE rubygem-htmlentities.spec --- # Generated from htmlentities-4.0.0.gem by gem2rpm -*- rpm-spec -*- %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %global gemname htmlentities %global geminstdir %{gemdir}/gems/%{gemname}-%{version} %global rubyabi 1.8 Summary: A module for encoding and decoding (X)HTML entities Name: rubygem-%{gemname} Version: 4.0.0 Release: 2%{?dist} Group: Development/Languages License: MIT URL: http://htmlentities.rubyforge.org/ Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ruby(abi) = %{rubyabi} BuildRequires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} Requires: ruby(rubygems) BuildArch: noarch Provides: rubygem(%{gemname}) = %{version}-%{release} %description HTMLEntities is a simple library to facilitate encoding and decoding of named (ý and so on) or numerical ({ or Ī) entities in HTML and XHTML documents. %package -n ruby-%{gemname} Summary: Non-Gem support for %{gemname} Group: Development/Languages Requires: %{name} = %{version}-%{release} Provides: ruby(%{gemname}) = %{version}-%{release} %description -n ruby-%{gemname} This package provides non-Gem support for %{gemname}. %prep # First install rubygems under %%_builddir to execute some # tests %setup -q -c -T mkdir -p ./%{geminstdir} gem install \ -V \ --local --install-dir ./%{gemdir} \ --force \ --rdoc \ %{SOURCE0} %build %install rm -rf %{buildroot} mkdir -p %{buildroot}%{gemdir} cp -a ./%{gemdir}/* %{buildroot}%{gemdir}/ # Create symlinks for ruby-%%{gemname} # Copied from rubygem-gettext.spec create_symlink_rec(){ ORIGBASEDIR=$1 TARGETBASEDIR=$2 ## First calculate relative path of ORIGBASEDIR ## from TARGETBASEDIR TMPDIR=$TARGETBASEDIR BACKDIR= DOWNDIR= num=0 nnum=0 while true do num=$((num+1)) TMPDIR=$(echo $TMPDIR | %{__sed} -e 's|/[^/][^/]*$||') DOWNDIR=$(echo $ORIGBASEDIR | %{__sed} -e "s|^$TMPDIR||") if [ x$DOWNDIR != x$ORIGBASEDIR ] then nnum=0 while [ $nnum -lt $num ] do BACKDIR="../$BACKDIR" nnum=$((nnum+1)) done break fi done RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | %{__sed} -e 's|//*|/|g' ) ## Next actually create symlink pushd %{buildroot}/$ORIGBASEDIR find . -type f | while read f do DIRNAME=$(dirname $f) BACK2DIR=$(echo $DIRNAME | %{__sed} -e 's|/[^/][^/]*|/..|g') %{__mkdir_p} %{buildroot}${TARGETBASEDIR}/$DIRNAME LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \ %{__sed} -e 's|^\./||' | %{__sed} -e 's|//|/|g' | \ %{__sed} -e 's|/\./|/|' ) %{__ln_s} -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f done popd } create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} %check pushd ./%{geminstdir}/test/ ruby test_all.rb %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc %{gemdir}/doc/%{gemname}-%{version}/ %dir %{geminstdir} %doc %{geminstdir}/[A-Z]* %{geminstdir}/lib/ %doc %{geminstdir}/test/ %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %files -n ruby-%{gemname} %defattr(-,root,root,-) %{ruby_sitelib}/%{gemname}.rb %{ruby_sitelib}/%{gemname}/ %changelog * Fri Mar 6 2009 Mamoru Tasaka - Cleanups * Tue Mar 03 2009 Mamoru Tasaka - 4.0.0-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:26:28 -0000 1.1 +++ .cvsignore 6 Mar 2009 01:18:54 -0000 1.2 @@ -0,0 +1 @@ +htmlentities-4.0.0.gem Index: sources =================================================================== RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:26:28 -0000 1.1 +++ sources 6 Mar 2009 01:18:54 -0000 1.2 @@ -0,0 +1 @@ +8490050367c95d63f83049852f7e93a8 htmlentities-4.0.0.gem From mtasaka at fedoraproject.org Fri Mar 6 01:19:25 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Fri, 6 Mar 2009 01:19:25 +0000 (UTC) Subject: rpms/rubygem-htmlentities/devel rubygem-htmlentities.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306011925.CC66470116@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/rubygem-htmlentities/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv606/devel Modified Files: .cvsignore sources Added Files: rubygem-htmlentities.spec Log Message: Initial import --- NEW FILE rubygem-htmlentities.spec --- # Generated from htmlentities-4.0.0.gem by gem2rpm -*- rpm-spec -*- %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %global gemname htmlentities %global geminstdir %{gemdir}/gems/%{gemname}-%{version} %global rubyabi 1.8 Summary: A module for encoding and decoding (X)HTML entities Name: rubygem-%{gemname} Version: 4.0.0 Release: 2%{?dist} Group: Development/Languages License: MIT URL: http://htmlentities.rubyforge.org/ Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ruby(abi) = %{rubyabi} BuildRequires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} Requires: ruby(rubygems) BuildArch: noarch Provides: rubygem(%{gemname}) = %{version}-%{release} %description HTMLEntities is a simple library to facilitate encoding and decoding of named (ý and so on) or numerical ({ or Ī) entities in HTML and XHTML documents. %package -n ruby-%{gemname} Summary: Non-Gem support for %{gemname} Group: Development/Languages Requires: %{name} = %{version}-%{release} Provides: ruby(%{gemname}) = %{version}-%{release} %description -n ruby-%{gemname} This package provides non-Gem support for %{gemname}. %prep # First install rubygems under %%_builddir to execute some # tests %setup -q -c -T mkdir -p ./%{geminstdir} gem install \ -V \ --local --install-dir ./%{gemdir} \ --force \ --rdoc \ %{SOURCE0} %build %install rm -rf %{buildroot} mkdir -p %{buildroot}%{gemdir} cp -a ./%{gemdir}/* %{buildroot}%{gemdir}/ # Create symlinks for ruby-%%{gemname} # Copied from rubygem-gettext.spec create_symlink_rec(){ ORIGBASEDIR=$1 TARGETBASEDIR=$2 ## First calculate relative path of ORIGBASEDIR ## from TARGETBASEDIR TMPDIR=$TARGETBASEDIR BACKDIR= DOWNDIR= num=0 nnum=0 while true do num=$((num+1)) TMPDIR=$(echo $TMPDIR | %{__sed} -e 's|/[^/][^/]*$||') DOWNDIR=$(echo $ORIGBASEDIR | %{__sed} -e "s|^$TMPDIR||") if [ x$DOWNDIR != x$ORIGBASEDIR ] then nnum=0 while [ $nnum -lt $num ] do BACKDIR="../$BACKDIR" nnum=$((nnum+1)) done break fi done RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | %{__sed} -e 's|//*|/|g' ) ## Next actually create symlink pushd %{buildroot}/$ORIGBASEDIR find . -type f | while read f do DIRNAME=$(dirname $f) BACK2DIR=$(echo $DIRNAME | %{__sed} -e 's|/[^/][^/]*|/..|g') %{__mkdir_p} %{buildroot}${TARGETBASEDIR}/$DIRNAME LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \ %{__sed} -e 's|^\./||' | %{__sed} -e 's|//|/|g' | \ %{__sed} -e 's|/\./|/|' ) %{__ln_s} -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f done popd } create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} %check pushd ./%{geminstdir}/test/ ruby test_all.rb %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc %{gemdir}/doc/%{gemname}-%{version}/ %dir %{geminstdir} %doc %{geminstdir}/[A-Z]* %{geminstdir}/lib/ %doc %{geminstdir}/test/ %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %files -n ruby-%{gemname} %defattr(-,root,root,-) %{ruby_sitelib}/%{gemname}.rb %{ruby_sitelib}/%{gemname}/ %changelog * Fri Mar 6 2009 Mamoru Tasaka - Cleanups * Tue Mar 03 2009 Mamoru Tasaka - 4.0.0-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rubygem-htmlentities/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:26:28 -0000 1.1 +++ .cvsignore 6 Mar 2009 01:18:55 -0000 1.2 @@ -0,0 +1 @@ +htmlentities-4.0.0.gem Index: sources =================================================================== RCS file: /cvs/extras/rpms/rubygem-htmlentities/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:26:28 -0000 1.1 +++ sources 6 Mar 2009 01:18:55 -0000 1.2 @@ -0,0 +1 @@ +8490050367c95d63f83049852f7e93a8 htmlentities-4.0.0.gem From mtasaka at fedoraproject.org Fri Mar 6 01:35:51 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Fri, 6 Mar 2009 01:35:51 +0000 (UTC) Subject: rpms/alexandria/F-9 alexandria.spec,1.18,1.19 Message-ID: <20090306013551.753F070117@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/alexandria/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4153/F-9 Modified Files: alexandria.spec Log Message: * Fri Mar 6 2009 Mamoru Tasaka - 0.6.4-0.2.b1 - Add ruby(htmlentities) dependency Index: alexandria.spec =================================================================== RCS file: /cvs/extras/rpms/alexandria/F-9/alexandria.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- alexandria.spec 2 Mar 2009 16:12:35 -0000 1.18 +++ alexandria.spec 6 Mar 2009 01:35:21 -0000 1.19 @@ -5,7 +5,7 @@ %define majorver 0.6.4 %define minorver b1 -%define fedorarel 1 +%define fedorarel 2 %define rel %{?minorver:0.}%{fedorarel}%{?minorver:.%minorver} @@ -40,8 +40,7 @@ #Requires: ruby(amazon) Requires: ruby(gettext-package) Requires: ruby(hpricot) -# Not available on Fedora yet -#Requires: ruby(htmlentities) +Requires: ruby(htmlentities) Requires: ruby(imagesize) # Dependency removed on 0.6.4b1 #Requires: ruby(mechanize) @@ -188,7 +187,10 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog -* Thu Mar 2 2009 Mamoru Tasaka - 0.6.4-0.1.b1 +* Fri Mar 6 2009 Mamoru Tasaka - 0.6.4-0.2.b1 +- Add ruby(htmlentities) dependency + +* Tue Mar 3 2009 Mamoru Tasaka - 0.6.4-0.1.b1 - Update to 0.6.4 beta 1 - Drop all patches, merged into upstream From mtasaka at fedoraproject.org Fri Mar 6 01:35:51 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Fri, 6 Mar 2009 01:35:51 +0000 (UTC) Subject: rpms/alexandria/F-10 alexandria.spec,1.18,1.19 Message-ID: <20090306013551.4A66170116@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/alexandria/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4153/F-10 Modified Files: alexandria.spec Log Message: * Fri Mar 6 2009 Mamoru Tasaka - 0.6.4-0.2.b1 - Add ruby(htmlentities) dependency Index: alexandria.spec =================================================================== RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- alexandria.spec 2 Mar 2009 16:12:35 -0000 1.18 +++ alexandria.spec 6 Mar 2009 01:35:20 -0000 1.19 @@ -5,7 +5,7 @@ %define majorver 0.6.4 %define minorver b1 -%define fedorarel 1 +%define fedorarel 2 %define rel %{?minorver:0.}%{fedorarel}%{?minorver:.%minorver} @@ -40,8 +40,7 @@ #Requires: ruby(amazon) Requires: ruby(gettext-package) Requires: ruby(hpricot) -# Not available on Fedora yet -#Requires: ruby(htmlentities) +Requires: ruby(htmlentities) Requires: ruby(imagesize) # Dependency removed on 0.6.4b1 #Requires: ruby(mechanize) @@ -188,7 +187,10 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog -* Thu Mar 2 2009 Mamoru Tasaka - 0.6.4-0.1.b1 +* Fri Mar 6 2009 Mamoru Tasaka - 0.6.4-0.2.b1 +- Add ruby(htmlentities) dependency + +* Tue Mar 3 2009 Mamoru Tasaka - 0.6.4-0.1.b1 - Update to 0.6.4 beta 1 - Drop all patches, merged into upstream From mtasaka at fedoraproject.org Fri Mar 6 01:35:51 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Fri, 6 Mar 2009 01:35:51 +0000 (UTC) Subject: rpms/alexandria/devel alexandria.spec,1.24,1.25 Message-ID: <20090306013551.BE41A70116@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/alexandria/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4153/devel Modified Files: alexandria.spec Log Message: * Fri Mar 6 2009 Mamoru Tasaka - 0.6.4-0.2.b1 - Add ruby(htmlentities) dependency Index: alexandria.spec =================================================================== RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- alexandria.spec 2 Mar 2009 16:12:36 -0000 1.24 +++ alexandria.spec 6 Mar 2009 01:35:21 -0000 1.25 @@ -5,7 +5,7 @@ %define majorver 0.6.4 %define minorver b1 -%define fedorarel 1 +%define fedorarel 2 %define rel %{?minorver:0.}%{fedorarel}%{?minorver:.%minorver} @@ -40,8 +40,7 @@ #Requires: ruby(amazon) Requires: ruby(gettext-package) Requires: ruby(hpricot) -# Not available on Fedora yet -#Requires: ruby(htmlentities) +Requires: ruby(htmlentities) Requires: ruby(imagesize) # Dependency removed on 0.6.4b1 #Requires: ruby(mechanize) @@ -188,7 +187,10 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog -* Thu Mar 2 2009 Mamoru Tasaka - 0.6.4-0.1.b1 +* Fri Mar 6 2009 Mamoru Tasaka - 0.6.4-0.2.b1 +- Add ruby(htmlentities) dependency + +* Tue Mar 3 2009 Mamoru Tasaka - 0.6.4-0.1.b1 - Update to 0.6.4 beta 1 - Drop all patches, merged into upstream From dcantrel at fedoraproject.org Fri Mar 6 01:45:14 2009 From: dcantrel at fedoraproject.org (David Cantrell) Date: Fri, 6 Mar 2009 01:45:14 +0000 (UTC) Subject: rpms/anaconda/devel .cvsignore, 1.615, 1.616 anaconda.spec, 1.762, 1.763 sources, 1.749, 1.750 anaconda-11.5.0.23-efi-cds.patch, 1.1, NONE late.patch, 1.1, NONE Message-ID: <20090306014514.B95A170116@cvs1.fedora.phx.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6206 Modified Files: .cvsignore anaconda.spec sources Removed Files: anaconda-11.5.0.23-efi-cds.patch late.patch Log Message: * Thu Mar 05 2009 David Cantrell - 11.5.0.25-1 - Schedule device destroy actions for partitions last. (dlehman) - Pass storage.disks, not storage, to createAllowed.... (#488860) (dlehman) - Nodev filesystems always exist. And the device is arbitrary. (dlehman) - Include proc, &c filesystems in fstab and FSSet.{mount/umount}Filesystems. (dlehman) - Remove FSSet.writeFSTab. That job is handled elsewhere. (dlehman) - Add properties to FSSet to provide the nodev entries. (dlehman) - Fix incomplete format in Storage.deviceImmutable. (dlehman) - Make sure we use the same disk the free space is on. (#488807) (dlehman) - Prevent clobbering of name 'mdraid' by qualifying it. (dlehman) - Handle unformatted disks and cdroms in Storage.exceptionDisks. (dlehman) - Add resizeArgs property for resizable filesystems. (dcantrell) - Fill out class NTFS a bit more. (dcantrell) - Add fsckProg property to class FS. (dcantrell) - Ext2FS.migratable(self) -> Ext2FS.migratable (dcantrell) - Fix StorageDevice.minSize() and PartitionDevice.maxSize() (dcantrell) - Center resize window on the screen. (dcantrell) - Do not raise DeviceError if not bootable device is found. (dcantrell) - Do an even more thorough job of ignoring disks libparted doesn't like. (clumens) - Fix a couple problems on the "Change device" bootloader dialog. (clumens) - Fix a typo when writing out the mdadm config file. (clumens) - Remove all uses of isys.cdromList, which no longer exists. (clumens) - Check to see if we're on S390 on the congrats screen (#488747). (clumens) - Handle non-fatal errors more gracefully in addUdevDevice. (dlehman) - partRequests no longer exists, so don't try to import it (#488743). (clumens) - When building the exceptionDisks list, skip devices libparted doesn't like. (clumens) - Iterate over devicetree.devices.values, not devicetree. (dlehman) - Add a get() method to Flags, since it pretends to be a dictionary. (clumens) - Stop with the fsset usage. (dlehman) - Format message string after translation not before (msivak) - We need newer python-cryptsetup because of the default values for cipher and keysize for luskFormat (msivak) - If a drive is not initialized, offer reinitialization or ignoring the drive to the user (msivak) - More syntax errors / traceback fixes (hdegoede) - Fix syntax errors (rvykydal) - Implement Storage.sanityCheck, mostly from old partitions code. (dlehman) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.615 retrieving revision 1.616 diff -u -r1.615 -r1.616 --- .cvsignore 5 Mar 2009 03:51:07 -0000 1.615 +++ .cvsignore 6 Mar 2009 01:44:43 -0000 1.616 @@ -1,2 +1,2 @@ -anaconda-11.5.0.24.tar.bz2 clog +anaconda-11.5.0.25.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.762 retrieving revision 1.763 diff -u -r1.762 -r1.763 --- anaconda.spec 5 Mar 2009 08:54:21 -0000 1.762 +++ anaconda.spec 6 Mar 2009 01:44:44 -0000 1.763 @@ -2,8 +2,8 @@ Summary: Graphical system installer Name: anaconda -Version: 11.5.0.24 -Release: 3 +Version: 11.5.0.25 +Release: 1 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -14,10 +14,6 @@ # make archive-no-tag Source0: %{name}-%{version}.tar.bz2 -# Patch for EFI CDs -Patch0: anaconda-11.5.0.23-efi-cds.patch -Patch1: late.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Versions of required components (done so we make sure the buildrequires @@ -157,8 +153,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -b .late %build %{__make} depend @@ -215,6 +209,49 @@ %endif %changelog +* Thu Mar 05 2009 David Cantrell - 11.5.0.25-1 +- Schedule device destroy actions for partitions last. (dlehman) +- Pass storage.disks, not storage, to createAllowed.... (#488860) (dlehman) +- Nodev filesystems always exist. And the device is arbitrary. (dlehman) +- Include proc, &c filesystems in fstab and FSSet.{mount/umount}Filesystems. + (dlehman) +- Remove FSSet.writeFSTab. That job is handled elsewhere. (dlehman) +- Add properties to FSSet to provide the nodev entries. (dlehman) +- Fix incomplete format in Storage.deviceImmutable. (dlehman) +- Make sure we use the same disk the free space is on. (#488807) (dlehman) +- Prevent clobbering of name 'mdraid' by qualifying it. (dlehman) +- Handle unformatted disks and cdroms in Storage.exceptionDisks. (dlehman) +- Add resizeArgs property for resizable filesystems. (dcantrell) +- Fill out class NTFS a bit more. (dcantrell) +- Add fsckProg property to class FS. (dcantrell) +- Ext2FS.migratable(self) -> Ext2FS.migratable (dcantrell) +- Fix StorageDevice.minSize() and PartitionDevice.maxSize() (dcantrell) +- Center resize window on the screen. (dcantrell) +- Do not raise DeviceError if not bootable device is found. (dcantrell) +- Do an even more thorough job of ignoring disks libparted doesn't like. + (clumens) +- Fix a couple problems on the "Change device" bootloader dialog. (clumens) +- Fix a typo when writing out the mdadm config file. (clumens) +- Remove all uses of isys.cdromList, which no longer exists. (clumens) +- Check to see if we're on S390 on the congrats screen (#488747). (clumens) +- Handle non-fatal errors more gracefully in addUdevDevice. (dlehman) +- partRequests no longer exists, so don't try to import it (#488743). + (clumens) +- When building the exceptionDisks list, skip devices libparted doesn't + like. (clumens) +- Iterate over devicetree.devices.values, not devicetree. (dlehman) +- Add a get() method to Flags, since it pretends to be a dictionary. + (clumens) +- Stop with the fsset usage. (dlehman) +- Format message string after translation not before (msivak) +- We need newer python-cryptsetup because of the default values for cipher + and keysize for luskFormat (msivak) +- If a drive is not initialized, offer reinitialization or ignoring the + drive to the user (msivak) +- More syntax errors / traceback fixes (hdegoede) +- Fix syntax errors (rvykydal) +- Implement Storage.sanityCheck, mostly from old partitions code. (dlehman) + * Thu Mar 5 2009 Dave Lehman - 11.5.0.24-3 - Fix booty's desire to import fsset. - Fix attempt to set read-only attr "removable" in DiskDevice.__init__ Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.749 retrieving revision 1.750 diff -u -r1.749 -r1.750 --- sources 5 Mar 2009 03:51:08 -0000 1.749 +++ sources 6 Mar 2009 01:44:44 -0000 1.750 @@ -1 +1 @@ -678a5343092b3adee1aeaa0369df9b41 anaconda-11.5.0.24.tar.bz2 +1b28850bf72438f98f3c3334f9467f7e anaconda-11.5.0.25.tar.bz2 --- anaconda-11.5.0.23-efi-cds.patch DELETED --- --- late.patch DELETED --- From mchehab at fedoraproject.org Fri Mar 6 01:45:34 2009 From: mchehab at fedoraproject.org (Mauro Carvalho Chehab) Date: Fri, 6 Mar 2009 01:45:34 +0000 (UTC) Subject: rpms/kernel/devel linux-2.6-hdpvr-fix.patch, NONE, 1.1 config-generic, 1.252, 1.253 kernel.spec, 1.1388, 1.1389 linux-2.6-v4l-dvb-fixes.patch, 1.2, 1.3 linux-2.6-v4l-dvb-update.patch, 1.3, 1.4 Message-ID: <20090306014534.9335870116@cvs1.fedora.phx.redhat.com> Author: mchehab Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5744 Modified Files: config-generic kernel.spec linux-2.6-v4l-dvb-fixes.patch linux-2.6-v4l-dvb-update.patch Added Files: linux-2.6-hdpvr-fix.patch Log Message: Updates to the latest linux-next tree and cleans config-generic vars for V4L/DVB There were some changes on linux-next fixing a few bugs on Kconfig and on a few drivers. Adds a patch to fix a merge conflict with the out-of-tree hdpvr driver. Also, config-generic were manually specifying the helper drivers. That's bad, since it will compile some drivers that aren't used at all. Instead, let's enable VIDEO_HELPER_CHIPS_AUTO and remove the manual settings. This will disable a few drivers that don't make sense on fedora: CONFIG_VIDEO_TLV320AIC23B Never used by any driver. It was meant for a board that were never produced CONFIG_VIDEO_OV7670 Only used on OLPC (autoselected when cafe-ccic driver is selected) CONFIG_VIDEO_SAA7191 Only seen on Vino a driver specific for SGI architecture CONFIG_VIDEO_TVP514X CONFIG_VIDEO_TCM825X Only seen on some embedded devices (OMAP platform) linux-2.6-hdpvr-fix.patch: --- NEW FILE linux-2.6-hdpvr-fix.patch --- diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index b8f2be8..0e8bd98 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c @@ -547,7 +547,6 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste case V4L2_CID_CONTRAST: case V4L2_CID_SATURATION: case V4L2_CID_HUE: - case V4L2_CID_SHARPNESS: qctrl->flags |= V4L2_CTRL_FLAG_SLIDER; break; } @@ -585,8 +586,6 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl) return v4l2_ctrl_query_fill(qctrl, 0, 127, 1, 64); case V4L2_CID_HUE: return v4l2_ctrl_query_fill(qctrl, -128, 127, 1, 0); - case V4L2_CID_SHARPNESS: - return v4l2_ctrl_query_fill(qctrl, 0, 255, 1, 0); /* MPEG controls */ case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ: Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- config-generic 4 Mar 2009 20:58:11 -0000 1.252 +++ config-generic 6 Mar 2009 01:45:01 -0000 1.253 @@ -2194,7 +2194,7 @@ # CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_ALLOW_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y @@ -2209,14 +2209,9 @@ # CONFIG_V4L_USB_DRIVERS=y CONFIG_VIDEO_CAPTURE_DRIVERS=y -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m CONFIG_VIDEO_AU0828=m -CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT848=m CONFIG_VIDEO_BT848_DVB=y -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m CONFIG_VIDEO_BWQCAM=m # CONFIG_VIDEO_CAFE_CCIC is not set CONFIG_VIDEO_CPIA=m @@ -2224,10 +2219,6 @@ CONFIG_VIDEO_CPIA_USB=m CONFIG_VIDEO_CPIA2=m CONFIG_VIDEO_CQCAM=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_CX25840=m -CONFIG_VIDEO_CX2341X=m CONFIG_VIDEO_CX23885=m CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX88=m @@ -2242,12 +2233,9 @@ CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_MXB=m CONFIG_VIDEO_OVCAMCHIP=m -CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_PVRUSB2_DVB=y CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR=y CONFIG_VIDEO_PVRUSB2_ONAIR_USB2=y @@ -2255,33 +2243,12 @@ CONFIG_VIDEO_SAA5246A=m CONFIG_VIDEO_SAA5249=m CONFIG_VIDEO_SAA6588=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA7111=m -CONFIG_VIDEO_SAA7114=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA7127=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_SAA7191=m CONFIG_VIDEO_STRADIS=m -CONFIG_VIDEO_TCM825X=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TDA9875=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_TLV320AIC23B=m -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m CONFIG_VIDEO_USBVISION=m -CONFIG_VIDEO_VPX3220=m CONFIG_VIDEO_W9966=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m CONFIG_VIDEO_ZORAN=m CONFIG_VIDEO_ZORAN_AVS6EYES=m CONFIG_VIDEO_ZORAN_BUZ=m @@ -2291,8 +2258,6 @@ CONFIG_VIDEO_ZORAN_LML33R10=m CONFIG_VIDEO_ZORAN_ZR36060=m CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_M52790=m -CONFIG_VIDEO_VP27SMPX=m CONFIG_TUNER_3036=m # CONFIG_TUNER_TEA5761 is not set @@ -2429,7 +2394,6 @@ CONFIG_VIDEO_PVRUSB2_29XXX=y CONFIG_VIDEO_PVRUSB2_SYSFS=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_IR_I2C=m # # Graphics support @@ -3925,7 +3889,6 @@ CONFIG_LIBFC=m CONFIG_FCOE=m # CONFIG_SCSI_LPFC_DEBUG_FS is not set -CONFIG_VIDEO_TVP514X=m CONFIG_DVB_DYNAMIC_MINORS=y CONFIG_DVB_LGDT3304=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1388 retrieving revision 1.1389 diff -u -r1.1388 -r1.1389 --- kernel.spec 6 Mar 2009 00:58:02 -0000 1.1388 +++ kernel.spec 6 Mar 2009 01:45:03 -0000 1.1389 @@ -638,7 +638,6 @@ Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch Patch1515: linux-2.6.29-lirc.patch -Patch1520: linux-2.6-hdpvr.patch # Fix the return code CD accesses when the CDROM drive door is closed # but the drive isn't yet ready. @@ -671,7 +670,12 @@ # silence the ACPI blacklist code Patch2802: linux-2.6-silence-acpi-blacklist.patch +Patch2897: linux-2.6-hdpvr.patch + # Updates/Fixes on V4L/DVB to the latest development tree +# hdpvr is patching a function that were removed on linux-next +Patch2898: linux-2.6-hdpvr-fix.patch + Patch2899: linux-2.6-v4l-dvb-fixes.patch Patch2900: linux-2.6-v4l-dvb-update.patch @@ -1175,6 +1179,8 @@ ApplyPatch linux-2.6.29-lirc.patch # http://hg.jannau.net/hdpvr/ ApplyPatch linux-2.6-hdpvr.patch +# Revert a change on v4l2-common on a function that will be removed by V4L/DVB patches +ApplyPatch linux-2.6-hdpvr-fix.patch # Fix the return code CD accesses when the CDROM drive door is closed # but the drive isn't yet ready. @@ -1800,6 +1806,9 @@ # and build. %changelog +* Wed Mar 06 2009 Mauro Carvalho Chehab +- drivers/media: Some fixes and a cleanup on F11 v4l/dvb config.generic + * Fri Mar 06 2009 Matthew Garrett - linux-2.6-input-fix-toshiba-hotkeys.patch: Avoid polling for hotkey events on Toshibas linux-2.6-v4l-dvb-fixes.patch: Index: linux-2.6-v4l-dvb-fixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-fixes.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-v4l-dvb-fixes.patch 28 Feb 2009 15:35:26 -0000 1.2 +++ linux-2.6-v4l-dvb-fixes.patch 6 Mar 2009 01:45:03 -0000 1.3 @@ -1,20 +1,42 @@ -diff -upr drivers/media/video/v4l2-common.c /home/v4l/tokernel/wrk/linux-2.6/drivers/media/video/v4l2-common.c ---- a/drivers/media/video/v4l2-common.c 2009-02-27 22:44:26.000000000 -0300 -+++ b/drivers/media/video/v4l2-common.c 2009-01-06 22:29:51.000000000 -0200 -@@ -547,7 +547,6 @@ int v4l2_ctrl_query_fill(struct v4l2_que - case V4L2_CID_CONTRAST: - case V4L2_CID_SATURATION: - case V4L2_CID_HUE: -- case V4L2_CID_SHARPNESS: - qctrl->flags |= V4L2_CTRL_FLAG_SLIDER; - break; +diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c +index e564a61..48892b5 100644 +--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c ++++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c +@@ -102,7 +102,11 @@ int s5k4aa_probe(struct sd *sd) } -@@ -586,8 +585,6 @@ int v4l2_ctrl_query_fill_std(struct v4l2 - return v4l2_ctrl_query_fill(qctrl, 0, 127, 1, 64); - case V4L2_CID_HUE: - return v4l2_ctrl_query_fill(qctrl, -128, 127, 1, 0); -- case V4L2_CID_SHARPNESS: -- return v4l2_ctrl_query_fill(qctrl, 0, 255, 1, 0); - /* MPEG controls */ - case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ: + /* Test some registers, but we don't know their exact meaning yet */ +- if (m5602_read_sensor(sd, 0x00, prod_id, sizeof(prod_id))) ++ if (m5602_read_sensor(sd, 0x00, prod_id, 2)) ++ return -ENODEV; ++ if (m5602_read_sensor(sd, 0x02, prod_id+2, 2)) ++ return -ENODEV; ++ if (m5602_read_sensor(sd, 0x04, prod_id+4, 2)) + return -ENODEV; + + if (memcmp(prod_id, expected_prod_id, sizeof(prod_id))) +diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c +index 5aeccb3..076ed5b 100644 +--- a/drivers/media/video/tvaudio.c ++++ b/drivers/media/video/tvaudio.c +@@ -54,7 +54,7 @@ MODULE_LICENSE("GPL"); + /* ---------------------------------------------------------------------- */ + /* our structs */ + +-#define MAXREGS 64 ++#define MAXREGS 256 + + struct CHIPSTATE; + typedef int (*getvalue)(int); +diff --git a/drivers/media/video/zoran/Kconfig b/drivers/media/video/zoran/Kconfig +index 4ea5fa7..8666e19 100644 +--- a/drivers/media/video/zoran/Kconfig ++++ b/drivers/media/video/zoran/Kconfig +@@ -68,6 +68,7 @@ config VIDEO_ZORAN_AVS6EYES + tristate "AverMedia 6 Eyes support (EXPERIMENTAL)" + depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1 + select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO ++ select VIDEO_BT866 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO + help + Support for the AverMedia 6 Eyes video surveillance card. linux-2.6-v4l-dvb-update.patch: Index: linux-2.6-v4l-dvb-update.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-update.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-v4l-dvb-update.patch 4 Mar 2009 20:58:11 -0000 1.3 +++ linux-2.6-v4l-dvb-update.patch 6 Mar 2009 01:45:03 -0000 1.4 @@ -462,10 +462,10 @@ + +#endif diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c -index 7c35787..78a9395 100644 +index 72da416..3bdf199 100644 --- a/arch/sh/boards/board-ap325rxa.c +++ b/arch/sh/boards/board-ap325rxa.c -@@ -344,7 +344,8 @@ static struct ov772x_camera_info ov7725_info = { +@@ -298,7 +298,8 @@ static struct platform_device camera_device = { static struct sh_mobile_ceu_info sh_mobile_ceu_info = { .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | @@ -4853,7 +4853,7 @@ } diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c -index 635d30a..80744f4 100644 +index 635d30a..8877215 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c @@ -262,7 +262,12 @@ static int stk7700P2_frontend_attach(struct dvb_usb_adapter *adap) @@ -4951,7 +4951,7 @@ { NULL }, }, + { "Yuan PD378S", -+ { &dib0700_usb_id_table[44], NULL }, ++ { &dib0700_usb_id_table[45], NULL }, + { NULL }, + }, }, @@ -32660,10 +32660,33 @@ return hwptr_done; } diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c -index 3b3ca3f..f7c8177 100644 +index 3b3ca3f..650ccfd 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c -@@ -183,6 +183,25 @@ struct em28xx_board em28xx_boards[] = { +@@ -122,6 +122,22 @@ static struct em28xx_reg_seq default_tuner_gpio[] = { + { -1, -1, -1, -1}, + }; + ++/* Mute/unmute */ ++static struct em28xx_reg_seq compro_unmute_tv_gpio[] = { ++ {EM28XX_R08_GPIO, 5, 7, 10}, ++ { -1, -1, -1, -1}, ++}; ++ ++static struct em28xx_reg_seq compro_unmute_svid_gpio[] = { ++ {EM28XX_R08_GPIO, 4, 7, 10}, ++ { -1, -1, -1, -1}, ++}; ++ ++static struct em28xx_reg_seq compro_mute_gpio[] = { ++ {EM28XX_R08_GPIO, 6, 7, 10}, ++ { -1, -1, -1, -1}, ++}; ++ + /* + * Board definitions + */ +@@ -183,6 +199,25 @@ struct em28xx_board em28xx_boards[] = { .amux = EM28XX_AMUX_LINE_IN, } }, }, @@ -32689,7 +32712,7 @@ [EM2820_BOARD_TERRATEC_CINERGY_250] = { .name = "Terratec Cinergy 250 USB", .tuner_type = TUNER_LG_PAL_NEW_TAPC, -@@ -225,7 +244,7 @@ struct em28xx_board em28xx_boards[] = { +@@ -225,7 +260,7 @@ struct em28xx_board em28xx_boards[] = { .name = "Hauppauge WinTV USB 2", .tuner_type = TUNER_PHILIPS_FM1236_MK3, .tda9887_conf = TDA9887_PRESENT | @@ -32698,7 +32721,7 @@ TDA9887_PORT2_ACTIVE, .decoder = EM28XX_TVP5150, .has_msp34xx = 1, -@@ -350,26 +369,6 @@ struct em28xx_board em28xx_boards[] = { +@@ -350,26 +385,6 @@ struct em28xx_board em28xx_boards[] = { .amux = EM28XX_AMUX_VIDEO, } }, }, @@ -32725,7 +32748,7 @@ [EM2821_BOARD_SUPERCOMP_USB_2] = { .name = "Supercomp USB 2.0 TV", .valid = EM28XX_BOARD_NOT_VALIDATED, -@@ -498,7 +497,7 @@ struct em28xx_board em28xx_boards[] = { +@@ -498,7 +513,7 @@ struct em28xx_board em28xx_boards[] = { }, [EM2861_BOARD_YAKUMO_MOVIE_MIXER] = { .name = "Yakumo MovieMixer", @@ -32734,7 +32757,7 @@ .decoder = EM28XX_TVP5150, .input = { { .type = EM28XX_VMUX_TELEVISION, -@@ -842,11 +841,11 @@ struct em28xx_board em28xx_boards[] = { +@@ -842,11 +857,11 @@ struct em28xx_board em28xx_boards[] = { } }, }, [EM2800_BOARD_GRABBEEX_USB2800] = { @@ -32751,7 +32774,7 @@ .type = EM28XX_VMUX_COMPOSITE1, .vmux = SAA7115_COMPOSITE0, .amux = EM28XX_AMUX_LINE_IN, -@@ -897,7 +896,7 @@ struct em28xx_board em28xx_boards[] = { +@@ -897,7 +912,7 @@ struct em28xx_board em28xx_boards[] = { } }, }, [EM2820_BOARD_PINNACLE_DVC_90] = { @@ -32760,7 +32783,7 @@ .tuner_type = TUNER_ABSENT, /* capture only board */ .decoder = EM28XX_SAA711X, .input = { { -@@ -952,7 +951,7 @@ struct em28xx_board em28xx_boards[] = { +@@ -952,7 +967,7 @@ struct em28xx_board em28xx_boards[] = { } }, }, [EM2820_BOARD_PROLINK_PLAYTV_USB2] = { @@ -32769,7 +32792,7 @@ .has_snapshot_button = 1, .tda9887_conf = TDA9887_PRESENT, .tuner_type = TUNER_YMEC_TVF_5533MF, -@@ -1198,7 +1197,9 @@ struct em28xx_board em28xx_boards[] = { +@@ -1198,7 +1213,9 @@ struct em28xx_board em28xx_boards[] = { .has_dvb = 1, .dvb_gpio = kworld_330u_digital, .xclk = EM28XX_XCLK_FREQUENCY_12MHZ, @@ -32780,18 +32803,24 @@ .input = { { .type = EM28XX_VMUX_TELEVISION, .vmux = TVP5150_COMPOSITE0, -@@ -1223,6 +1224,7 @@ struct em28xx_board em28xx_boards[] = { +@@ -1223,21 +1240,88 @@ struct em28xx_board em28xx_boards[] = { .tuner_type = TUNER_LG_PAL_NEW_TAPC, .tda9887_conf = TDA9887_PRESENT, .decoder = EM28XX_TVP5150, + .adecoder = EM28XX_TVAUDIO, ++ .mute_gpio = compro_mute_gpio, .input = { { .type = EM28XX_VMUX_TELEVISION, .vmux = TVP5150_COMPOSITE0, -@@ -1233,11 +1235,74 @@ struct em28xx_board em28xx_boards[] = { - .amux = EM28XX_AMUX_LINE_IN, - } }, - }, ++ .amux = EM28XX_AMUX_VIDEO, ++ .gpio = compro_unmute_tv_gpio, ++ }, { ++ .type = EM28XX_VMUX_SVIDEO, ++ .vmux = TVP5150_SVIDEO, ++ .amux = EM28XX_AMUX_LINE_IN, ++ .gpio = compro_unmute_svid_gpio, ++ } }, ++ }, + [EM2860_BOARD_KAIOMY_TVNPC_U2] = { + .name = "Kaiomy TVnPC U2", + .vchannels = 3, @@ -32809,12 +32838,12 @@ + }, { + .type = EM28XX_VMUX_COMPOSITE1, + .vmux = TVP5150_COMPOSITE1, -+ .amux = EM28XX_AMUX_LINE_IN, -+ }, { -+ .type = EM28XX_VMUX_SVIDEO, -+ .vmux = TVP5150_SVIDEO, -+ .amux = EM28XX_AMUX_LINE_IN, -+ } }, + .amux = EM28XX_AMUX_LINE_IN, + }, { + .type = EM28XX_VMUX_SVIDEO, + .vmux = TVP5150_SVIDEO, + .amux = EM28XX_AMUX_LINE_IN, + } }, + .radio = { + .type = EM28XX_RADIO, + .amux = EM28XX_AMUX_LINE_IN, @@ -32854,7 +32883,7 @@ + .vmux = TVP5150_SVIDEO, + .amux = EM28XX_AMUX_VIDEO, + } }, -+ }, + }, }; const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards); @@ -32864,7 +32893,7 @@ { USB_DEVICE(0xeb1a, 0x2750), .driver_info = EM2750_BOARD_UNKNOWN }, { USB_DEVICE(0xeb1a, 0x2751), -@@ -1260,6 +1325,8 @@ struct usb_device_id em28xx_id_table [] = { +@@ -1260,6 +1344,8 @@ struct usb_device_id em28xx_id_table [] = { .driver_info = EM2820_BOARD_UNKNOWN }, { USB_DEVICE(0xeb1a, 0xe300), .driver_info = EM2861_BOARD_KWORLD_PVRTV_300U }, @@ -32873,7 +32902,7 @@ { USB_DEVICE(0xeb1a, 0xe305), .driver_info = EM2880_BOARD_KWORLD_DVB_305U }, { USB_DEVICE(0xeb1a, 0xe310), -@@ -1278,6 +1345,8 @@ struct usb_device_id em28xx_id_table [] = { +@@ -1278,6 +1364,8 @@ struct usb_device_id em28xx_id_table [] = { .driver_info = EM2800_BOARD_GRABBEEX_USB2800 }, { USB_DEVICE(0xeb1a, 0xe357), .driver_info = EM2870_BOARD_KWORLD_355U }, @@ -32882,7 +32911,7 @@ { USB_DEVICE(0x0ccd, 0x0036), .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 }, { USB_DEVICE(0x0ccd, 0x004c), -@@ -1330,6 +1399,8 @@ struct usb_device_id em28xx_id_table [] = { +@@ -1330,6 +1418,8 @@ struct usb_device_id em28xx_id_table [] = { .driver_info = EM2800_BOARD_LEADTEK_WINFAST_USBII }, { USB_DEVICE(0x093b, 0xa005), .driver_info = EM2861_BOARD_PLEXTOR_PX_TV100U }, @@ -32891,7 +32920,7 @@ { }, }; MODULE_DEVICE_TABLE(usb, em28xx_id_table); -@@ -1337,7 +1408,7 @@ MODULE_DEVICE_TABLE(usb, em28xx_id_table); +@@ -1337,7 +1427,7 @@ MODULE_DEVICE_TABLE(usb, em28xx_id_table); /* * EEPROM hash table for devices with generic USB IDs */ @@ -32900,7 +32929,7 @@ /* P/N: SA 60002070465 Tuner: TVF7533-MF */ {0x6ce05a8f, EM2820_BOARD_PROLINK_PLAYTV_USB2, TUNER_YMEC_TVF_5533MF}, {0x72cc5a8b, EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2, TUNER_YMEC_TVF_5533MF}, -@@ -1349,6 +1420,7 @@ static struct em28xx_hash_table em28xx_i2c_hash[] = { +@@ -1349,6 +1439,7 @@ static struct em28xx_hash_table em28xx_i2c_hash[] = { {0xb06a32c3, EM2800_BOARD_TERRATEC_CINERGY_200, TUNER_LG_PAL_NEW_TAPC}, {0xf51200e3, EM2800_BOARD_VGEAR_POCKETTV, TUNER_LG_PAL_NEW_TAPC}, {0x1ba50080, EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA, TUNER_ABSENT}, @@ -32908,7 +32937,7 @@ }; int em28xx_tuner_callback(void *ptr, int component, int command, int arg) -@@ -1368,7 +1440,7 @@ int em28xx_tuner_callback(void *ptr, int component, int command, int arg) +@@ -1368,7 +1459,7 @@ int em28xx_tuner_callback(void *ptr, int component, int command, int arg) } EXPORT_SYMBOL_GPL(em28xx_tuner_callback); @@ -32917,7 +32946,7 @@ { memcpy(&dev->board, &em28xx_boards[dev->model], sizeof(dev->board)); -@@ -1504,6 +1576,34 @@ void em28xx_pre_card_setup(struct em28xx *dev) +@@ -1504,6 +1595,34 @@ void em28xx_pre_card_setup(struct em28xx *dev) /* enables audio for that devices */ em28xx_write_reg(dev, EM28XX_R08_GPIO, 0xfd); break; @@ -32952,7 +32981,7 @@ } em28xx_gpio_set(dev, dev->board.tuner_gpio); -@@ -1610,7 +1710,7 @@ static int em28xx_hint_board(struct em28xx *dev) +@@ -1610,7 +1729,7 @@ static int em28xx_hint_board(struct em28xx *dev) em28xx_errdev("If the board were missdetected, " "please email this log to:\n"); em28xx_errdev("\tV4L Mailing List " @@ -32961,7 +32990,7 @@ em28xx_errdev("Board detected as %s\n", em28xx_boards[dev->model].name); -@@ -1642,7 +1742,7 @@ static int em28xx_hint_board(struct em28xx *dev) +@@ -1642,7 +1761,7 @@ static int em28xx_hint_board(struct em28xx *dev) em28xx_errdev("If the board were missdetected, " "please email this log to:\n"); em28xx_errdev("\tV4L Mailing List " @@ -32970,7 +32999,7 @@ em28xx_errdev("Board detected as %s\n", em28xx_boards[dev->model].name); -@@ -1655,7 +1755,7 @@ static int em28xx_hint_board(struct em28xx *dev) +@@ -1655,7 +1774,7 @@ static int em28xx_hint_board(struct em28xx *dev) em28xx_errdev("You may try to use card= insmod option to " "workaround that.\n"); em28xx_errdev("Please send an email with this log to:\n"); @@ -32979,7 +33008,7 @@ em28xx_errdev("Board eeprom hash is 0x%08lx\n", dev->hash); em28xx_errdev("Board i2c devicelist hash is 0x%08lx\n", dev->i2c_hash); -@@ -1800,6 +1900,8 @@ void em28xx_card_setup(struct em28xx *dev) +@@ -1800,6 +1919,8 @@ void em28xx_card_setup(struct em28xx *dev) request_module("tvp5150"); if (dev->board.tuner_type != TUNER_ABSENT) request_module("tuner"); @@ -32989,7 +33018,7 @@ em28xx_config_tuner(dev); diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c -index 94fb1b6..eee8d01 100644 +index 94fb1b6..c896d24 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c @@ -33,8 +33,8 @@ @@ -33032,7 +33061,19 @@ "OUT: %02x %02x %02x %02x %02x %02x %02x %02x >>>", pipe, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, -@@ -424,7 +424,7 @@ int em28xx_audio_analog_set(struct em28xx *dev) +@@ -378,6 +378,11 @@ static int em28xx_set_audio_source(struct em28xx *dev) + } + } + ++ if (dev->board.mute_gpio && dev->mute) ++ em28xx_gpio_set(dev, dev->board.mute_gpio); ++ else ++ em28xx_gpio_set(dev, INPUT(dev->ctl_input)->gpio); ++ + ret = em28xx_write_reg_bits(dev, EM28XX_R0E_AUDIOSRC, input, 0xc0); + if (ret < 0) + return ret; +@@ -424,7 +429,7 @@ int em28xx_audio_analog_set(struct em28xx *dev) xclk = dev->board.xclk & 0x7f; if (!dev->mute) @@ -33041,7 +33082,7 @@ ret = em28xx_write_reg(dev, EM28XX_R0F_XCLK, xclk); if (ret < 0) -@@ -462,7 +462,8 @@ int em28xx_audio_analog_set(struct em28xx *dev) +@@ -462,7 +467,8 @@ int em28xx_audio_analog_set(struct em28xx *dev) if (dev->ctl_aoutput & EM28XX_AOUT_PCM_IN) { int sel = ac97_return_record_select(dev->ctl_aoutput); @@ -33051,7 +33092,7 @@ sel |= (sel << 8); em28xx_write_ac97(dev, AC97_RECORD_SELECT, sel); -@@ -698,7 +699,7 @@ static int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v) +@@ -698,7 +704,7 @@ static int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v) em28xx_write_regs(dev, EM28XX_R32_VSCALELOW, (char *)buf, 2); /* it seems that both H and V scalers must be active to work correctly */ @@ -33060,7 +33101,7 @@ } return em28xx_write_reg_bits(dev, EM28XX_R26_COMPR, mode, 0x30); } -@@ -827,6 +828,19 @@ static void em28xx_irq_callback(struct urb *urb) +@@ -827,6 +833,19 @@ static void em28xx_irq_callback(struct urb *urb) struct em28xx *dev = container_of(dma_q, struct em28xx, vidq); int rc, i; @@ -33080,7 +33121,7 @@ /* Copy data from URB */ spin_lock(&dev->slock); rc = dev->isoc_ctl.isoc_copy(dev, urb); -@@ -945,7 +959,7 @@ int em28xx_init_isoc(struct em28xx *dev, int max_packets, +@@ -945,7 +964,7 @@ int em28xx_init_isoc(struct em28xx *dev, int max_packets, em28xx_err("unable to allocate %i bytes for transfer" " buffer %i%s\n", sb_size, i, @@ -33090,7 +33131,7 @@ return -ENOMEM; } diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c -index d69f0ef..2dab43d 100644 +index d69f0ef..02c12fe 100644 --- a/drivers/media/video/em28xx/em28xx-i2c.c +++ b/drivers/media/video/em28xx/em28xx-i2c.c @@ -402,10 +402,12 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len) @@ -33108,8 +33149,34 @@ break; } +@@ -508,12 +510,17 @@ static int attach_inform(struct i2c_client *client) + dprintk1(1, "attach_inform: tvp5150 detected.\n"); + break; + ++ case 0xb0: ++ dprintk1(1, "attach_inform: tda9874 detected\n"); ++ break; ++ + default: + if (!dev->tuner_addr) + dev->tuner_addr = client->addr; + + dprintk1(1, "attach inform: detected I2C address %x\n", + client->addr << 1); ++ dprintk1(1, "driver id %d\n", client->driver->id); + + } + +@@ -552,6 +559,7 @@ static char *i2c_devs[128] = { + [0x80 >> 1] = "msp34xx", + [0x88 >> 1] = "msp34xx", + [0xa0 >> 1] = "eeprom", ++ [0xb0 >> 1] = "tda9874", + [0xb8 >> 1] = "tvp5150a", + [0xba >> 1] = "tvp5150a", + [0xc0 >> 1] = "tuner (analog)", diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c -index 8e61b2c..efd6415 100644 +index 8e61b2c..575472f 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c @@ -186,7 +186,8 @@ static void em28xx_copy_video(struct em28xx *dev, @@ -33163,7 +33230,21 @@ struct em28xx_fh *fh = vq->priv_data; struct em28xx *dev = (struct em28xx *)fh->dev; -@@ -557,7 +563,7 @@ static int res_get(struct em28xx_fh *fh) +@@ -534,6 +540,13 @@ static void video_mux(struct em28xx *dev, int index) + &route); + } + ++ if (dev->board.adecoder != EM28XX_NOADECODER) { ++ route.input = dev->ctl_ainput; ++ route.output = dev->ctl_aoutput; ++ em28xx_i2c_call_clients(dev, VIDIOC_INT_S_AUDIO_ROUTING, ++ &route); ++ } ++ + em28xx_audio_analog_set(dev); + } + +@@ -557,7 +570,7 @@ static int res_get(struct em28xx_fh *fh) static int res_check(struct em28xx_fh *fh) { @@ -33172,7 +33253,7 @@ } static void res_free(struct em28xx_fh *fh) -@@ -791,7 +797,7 @@ out: +@@ -791,7 +804,7 @@ out: return rc; } @@ -33181,7 +33262,7 @@ { struct em28xx_fh *fh = priv; struct em28xx *dev = fh->dev; -@@ -1008,8 +1014,13 @@ static int vidioc_g_ctrl(struct file *file, void *priv, +@@ -1008,8 +1021,13 @@ static int vidioc_g_ctrl(struct file *file, void *priv, if (dev->board.has_msp34xx) em28xx_i2c_call_clients(dev, VIDIOC_G_CTRL, ctrl); @@ -33196,7 +33277,7 @@ mutex_unlock(&dev->lock); return rc; -@@ -1345,7 +1356,7 @@ static int vidioc_querycap(struct file *file, void *priv, +@@ -1345,7 +1363,7 @@ static int vidioc_querycap(struct file *file, void *priv, strlcpy(cap->driver, "em28xx", sizeof(cap->driver)); strlcpy(cap->card, em28xx_boards[dev->model].name, sizeof(cap->card)); @@ -33205,7 +33286,7 @@ cap->version = EM28XX_VERSION_CODE; -@@ -1431,7 +1442,7 @@ static int vidioc_reqbufs(struct file *file, void *priv, +@@ -1431,7 +1449,7 @@ static int vidioc_reqbufs(struct file *file, void *priv, if (rc < 0) return rc; @@ -33214,7 +33295,7 @@ } static int vidioc_querybuf(struct file *file, void *priv, -@@ -1445,7 +1456,7 @@ static int vidioc_querybuf(struct file *file, void *priv, +@@ -1445,7 +1463,7 @@ static int vidioc_querybuf(struct file *file, void *priv, if (rc < 0) return rc; @@ -33223,7 +33304,7 @@ } static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *b) -@@ -1458,7 +1469,7 @@ static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *b) +@@ -1458,7 +1476,7 @@ static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *b) if (rc < 0) return rc; @@ -33232,7 +33313,7 @@ } static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b) -@@ -1471,8 +1482,7 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b) +@@ -1471,8 +1489,7 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b) if (rc < 0) return rc; @@ -33242,7 +33323,7 @@ } #ifdef CONFIG_VIDEO_V4L1_COMPAT -@@ -1496,7 +1506,7 @@ static int radio_querycap(struct file *file, void *priv, +@@ -1496,7 +1513,7 @@ static int radio_querycap(struct file *file, void *priv, strlcpy(cap->driver, "em28xx", sizeof(cap->driver)); strlcpy(cap->card, em28xx_boards[dev->model].name, sizeof(cap->card)); @@ -33251,7 +33332,7 @@ cap->version = EM28XX_VERSION_CODE; cap->capabilities = V4L2_CAP_TUNER; -@@ -1781,7 +1791,7 @@ em28xx_v4l2_read(struct file *filp, char __user *buf, size_t count, +@@ -1781,7 +1798,7 @@ em28xx_v4l2_read(struct file *filp, char __user *buf, size_t count, * em28xx_v4l2_poll() * will allocate buffers when called for the first time */ @@ -33260,7 +33341,7 @@ { struct em28xx_fh *fh = filp->private_data; struct em28xx *dev = fh->dev; -@@ -1934,8 +1944,8 @@ static struct video_device em28xx_radio_template = { +@@ -1934,8 +1951,8 @@ static struct video_device em28xx_radio_template = { static struct video_device *em28xx_vdev_init(struct em28xx *dev, @@ -33271,7 +33352,7 @@ { struct video_device *vfd; -@@ -1984,8 +1994,9 @@ int em28xx_register_analog_devices(struct em28xx *dev) +@@ -1984,8 +2001,9 @@ int em28xx_register_analog_devices(struct em28xx *dev) /* enable vbi capturing */ /* em28xx_write_reg(dev, EM28XX_R0E_AUDIOSRC, 0xc0); audio register */ @@ -33283,7 +33364,7 @@ em28xx_write_reg(dev, EM28XX_R11_VINCTRL, 0x51); em28xx_set_outfmt(dev); -@@ -2020,7 +2031,8 @@ int em28xx_register_analog_devices(struct em28xx *dev) +@@ -2020,7 +2038,8 @@ int em28xx_register_analog_devices(struct em28xx *dev) } if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) { @@ -33294,7 +33375,7 @@ em28xx_errdev("cannot allocate video_device.\n"); return -ENODEV; diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h -index dd2cd36..57a4084 100644 +index dd2cd36..a33a58d 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h @@ -70,7 +70,6 @@ @@ -33349,7 +33430,15 @@ struct em28xx_board { char *name; int vchannels; -@@ -373,6 +386,7 @@ struct em28xx_board { +@@ -361,6 +374,7 @@ struct em28xx_board { + struct em28xx_reg_seq *dvb_gpio; + struct em28xx_reg_seq *suspend_gpio; + struct em28xx_reg_seq *tuner_gpio; ++ struct em28xx_reg_seq *mute_gpio; + + unsigned int is_em2800:1; + unsigned int has_msp34xx:1; +@@ -373,6 +387,7 @@ struct em28xx_board { unsigned char xclk, i2c_speed; enum em28xx_decoder decoder; @@ -33357,7 +33446,7 @@ struct em28xx_input input[MAX_EM28XX_INPUT]; struct em28xx_input radio; -@@ -420,7 +434,7 @@ struct em28xx_audio { +@@ -420,7 +435,7 @@ struct em28xx_audio { unsigned int hwptr_done_capture; struct snd_card *sndcard; @@ -33366,7 +33455,7 @@ enum em28xx_stream_state capture_stream; spinlock_t slock; }; -@@ -523,7 +537,8 @@ struct em28xx { +@@ -523,7 +538,8 @@ struct em28xx { int num_alt; /* Number of alternative settings */ unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */ struct urb *urb[EM28XX_NUM_BUFS]; /* urb for isoc transfers */ @@ -56213,7 +56302,7 @@ .probe = tlv320aic23b_probe, .remove = tlv320aic23b_remove, diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c -index 5aeccb3..6f03d95 100644 +index 076ed5b..e8ab285 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c @@ -26,7 +26,7 @@ @@ -57577,7 +57666,7 @@ | USB_DEVICE_ID_MATCH_INT_INFO, .idVendor = 0x174f, diff --git a/drivers/media/video/uvc/uvc_status.c b/drivers/media/video/uvc/uvc_status.c -index c1e4ae2..b20d0b9 100644 +index c705f24..21d8712 100644 --- a/drivers/media/video/uvc/uvc_status.c +++ b/drivers/media/video/uvc/uvc_status.c @@ -24,26 +24,19 @@ @@ -57610,7 +57699,7 @@ + usb_to_input_id(dev->udev, &input->id); input->dev.parent = &dev->intf->dev; - set_bit(EV_KEY, input->evbit); + __set_bit(EV_KEY, input->evbit); @@ -57,7 +50,6 @@ static int uvc_input_init(struct uvc_device *dev) error: @@ -60419,7 +60508,7 @@ /*****************************************************************************/ diff --git a/drivers/media/video/zoran/Kconfig b/drivers/media/video/zoran/Kconfig -index 4ea5fa7..925fb51 100644 +index 8666e19..fd4120e 100644 --- a/drivers/media/video/zoran/Kconfig +++ b/drivers/media/video/zoran/Kconfig @@ -1,6 +1,6 @@ @@ -60455,8 +60544,8 @@ - depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1 + depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_BT866 if VIDEO_HELPER_CHIPS_AUTO select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO - help diff --git a/drivers/media/video/zoran/videocodec.h b/drivers/media/video/zoran/videocodec.h index 97a3bbe..5c27b25 100644 --- a/drivers/media/video/zoran/videocodec.h @@ -66443,10 +66532,10 @@ }; diff --git a/include/linux/Kbuild b/include/linux/Kbuild -index b97cdc5..e6bfd4d 100644 +index 106c3ba..d97133d 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild -@@ -157,7 +157,6 @@ header-y += un.h +@@ -158,7 +158,6 @@ header-y += un.h header-y += utime.h header-y += veth.h header-y += video_decoder.h From notting at fedoraproject.org Fri Mar 6 01:47:28 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Fri, 6 Mar 2009 01:47:28 +0000 (UTC) Subject: rpms/gnucash/F-10 .cvsignore, 1.36, 1.37 gnucash.spec, 1.94, 1.95 sources, 1.38, 1.39 Message-ID: <20090306014728.DE56C70116@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/rpms/gnucash/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6823 Modified Files: .cvsignore gnucash.spec sources Log Message: 2.2.9-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnucash/F-10/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 16 Dec 2008 15:38:09 -0000 1.36 +++ .cvsignore 6 Mar 2009 01:46:58 -0000 1.37 @@ -1 +1 @@ -gnucash-2.2.8.tar.bz2 +gnucash-2.2.9.tar.bz2 Index: gnucash.spec =================================================================== RCS file: /cvs/extras/rpms/gnucash/F-10/gnucash.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- gnucash.spec 22 Dec 2008 16:02:11 -0000 1.94 +++ gnucash.spec 6 Mar 2009 01:46:58 -0000 1.95 @@ -2,9 +2,9 @@ Name: gnucash Summary: Finance management application -Version: 2.2.8 +Version: 2.2.9 URL: http://gnucash.org/ -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.bz2 @@ -16,7 +16,6 @@ BuildRequires: desktop-file-utils, texinfo BuildRequires: gettext, slib >= 3a1-5, libtool, intltool Patch0: gnucash-quiet.patch -Patch1: changeset_r17783.diff Requires: gnucash-docs >= 2.2.0 Requires: slib >= 3a1-5 Requires: perl(Finance::Quote) @@ -38,7 +37,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p4 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \; %build @@ -130,6 +128,12 @@ %doc doc/README.german doc/README.francais doc/guile-hackers.txt %changelog +* Thu Mar 5 2009 Bill Nottingham - 2.2.9-1 +- update to 2.2.9 + +* Tue Feb 24 2009 Fedora Release Engineering - 2.2.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Dec 22 2008 Bill Nottingham - 2.2.8-2 - fix crash resulting from earlier crash fix (#474511, ) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnucash/F-10/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 16 Dec 2008 15:38:09 -0000 1.38 +++ sources 6 Mar 2009 01:46:58 -0000 1.39 @@ -1 +1 @@ -79d37e4fa0c71722e093136655698924 gnucash-2.2.8.tar.bz2 +1d814de8673b4760045bf51b72924d04 gnucash-2.2.9.tar.bz2 From oget at fedoraproject.org Fri Mar 6 01:57:31 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Fri, 6 Mar 2009 01:57:31 +0000 (UTC) Subject: rpms/aldrin/devel .cvsignore, 1.2, 1.3 aldrin-docfix.patch, 1.1, 1.2 aldrin.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <20090306015731.09BE670116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/aldrin/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8675 Modified Files: .cvsignore aldrin-docfix.patch aldrin.spec sources Log Message: * Fri Feb 27 2009 Orcan Ogetbil - 0.13-1 - Update to version 0.13 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/aldrin/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Sep 2007 19:16:12 -0000 1.2 +++ .cvsignore 6 Mar 2009 01:57:00 -0000 1.3 @@ -1 +1 @@ -aldrin-0.11.tar.bz2 +aldrin-0.13.tar.gz aldrin-docfix.patch: Index: aldrin-docfix.patch =================================================================== RCS file: /cvs/pkgs/rpms/aldrin/devel/aldrin-docfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- aldrin-docfix.patch 27 Sep 2007 19:16:12 -0000 1.1 +++ aldrin-docfix.patch 6 Mar 2009 01:57:00 -0000 1.2 @@ -1,46 +1,68 @@ -diff -up aldrin-0.11/SConstruct.docfix aldrin-0.11/SConstruct ---- aldrin-0.11/SConstruct.docfix 2007-09-25 20:55:58.000000000 +0200 -+++ aldrin-0.11/SConstruct 2007-09-25 20:55:58.000000000 +0200 -@@ -127,12 +127,14 @@ if win32: - install('${DESTDIR}${PREFIX}', 'aldrin.bat') - - # docs --install('${DOC_INSTALL_PATH}/aldrin/html', -+install('${DOC_INSTALL_PATH}/aldrin-%s/html' % VERSION, - glob.glob('share/doc/aldrin/html/*.html') - + glob.glob('share/doc/aldrin/html/*.css')) --install('${DOC_INSTALL_PATH}/aldrin/images', -+install('${DOC_INSTALL_PATH}/aldrin-%s/images' % VERSION, - glob.glob('share/doc/aldrin/images/*.gif') - + glob.glob('share/doc/aldrin/images/*.png')) -+install('${DOC_INSTALL_PATH}/aldrin-%s' % VERSION, -+ ['ChangeLog', 'CREDITS', 'LICENCE']) +diff -rupN aldrin.old/doc/SConscript aldrin/doc/SConscript +--- aldrin.old/doc/SConscript 2009-01-09 16:25:21.000000000 -0500 ++++ aldrin/doc/SConscript 2009-02-23 16:22:46.000000000 -0500 +@@ -31,4 +31,5 @@ install('${DOC_PATH}/images', + glob.glob('aldrin/images/*.gif') + + glob.glob('aldrin/images/*.png')) - # icon theme - install(iconpath + '/16x16/apps', 'share/icons/hicolor/16x16/apps/aldrin.png') -diff -up aldrin-0.11/share/aldrin/router.py.docfix aldrin-0.11/share/aldrin/router.py ---- aldrin-0.11/share/aldrin/router.py.docfix 2007-09-25 21:16:54.000000000 +0200 -+++ aldrin-0.11/share/aldrin/router.py 2007-09-25 21:17:19.000000000 +0200 -@@ -698,8 +698,8 @@ class ParameterDialog(gtk.Dialog): +- ++install('${DOC_PATH}', ++ ['../ChangeLog', '../CREDITS', '../LICENCE']) +diff -rupN aldrin.old/SConstruct aldrin/SConstruct +--- aldrin.old/SConstruct 2009-01-09 16:25:21.000000000 -0500 ++++ aldrin/SConstruct 2009-02-23 16:20:14.000000000 -0500 +@@ -61,7 +61,7 @@ env['SITE_PACKAGE_PATH'] = distutils.sys + env['APPLICATIONS_PATH'] = '${DESTDIR}${PREFIX}/share/applications' + env['BIN_PATH'] = '${DESTDIR}${PREFIX}/bin' + env['SHARE_PATH'] = '${DESTDIR}${PREFIX}/share/aldrin' +-env['DOC_PATH'] = '${DESTDIR}${PREFIX}/share/doc/aldrin' ++env['DOC_PATH'] = '${DESTDIR}${PREFIX}/share/doc/aldrin-' + VERSION + env['ETC_PATH'] = '${DESTDIR}${ETCDIR}/aldrin' + env['ICONS_ALDRIN_PATH'] = '${DESTDIR}${PREFIX}/share/icons/aldrin' + env['ICONS_HICOLOR_PATH'] = '${DESTDIR}${PREFIX}/share/icons/hicolor' +diff -rupN aldrin.old/src/components/mainwindow.py aldrin/src/components/mainwindow.py +--- aldrin.old/src/components/mainwindow.py 2009-01-09 16:25:22.000000000 -0500 ++++ aldrin/src/components/mainwindow.py 2009-02-23 16:33:44.000000000 -0500 +@@ -44,7 +44,7 @@ show_preferences = preferences.show_pref + from aldrin.utils import CancelException + + import aldrin.com as com +- ++from about import VERSION + def cmp_view(a,b): + a_order = (hasattr(a, '__view__') and a.__view__.get('order',0)) or 0 + b_order = (hasattr(b, '__view__') and b.__view__.get('order',0)) or 0 +@@ -551,7 +551,7 @@ class AldrinFrame(gtk.Window): + @type event: MenuEvent + """ + import webbrowser +- webbrowser.open_new(filepath('../doc/aldrin/html/index.html')) ++ webbrowser.open_new(filepath('../doc/aldrin'+VERSION.split(" ")[0]+'/html/index.html')) + + def on_about(self, *args): + """ +diff -rupN aldrin.old/src/components/rack.py aldrin/src/components/rack.py +--- aldrin.old/src/components/rack.py 2009-01-09 16:25:22.000000000 -0500 ++++ aldrin/src/components/rack.py 2009-02-23 17:08:46.000000000 -0500 +@@ -30,7 +30,7 @@ from aldrin.utils import prepstr, filepa + get_item_count, question, error, new_listview, add_scrollbars, get_clipboard_text, set_clipboard_text, \ + gettext, new_stock_image_button, diff + import zzub +-import sys,os ++import sys,os,glob + import fnmatch + import ctypes + import time +@@ -728,9 +728,10 @@ class ParameterView(gtk.VBox): + """ uri = filenameify(self.pluginloader.get_uri()) name = filenameify(self.pluginloader.get_name()) ++ zzubdocpath = glob.glob("../doc/libzzub-*")[0] helpfilepaths = [ - filepath('../doc/zzub/plugins/' + uri + '/index.html'), - filepath('../doc/zzub/plugins/' + name + '/index.html'), -+ filepath('../doc/libzzub-0.2.3/plugins/' + uri + '/index.html'), -+ filepath('../doc/libzzub-0.2.3/plugins/' + name + '/index.html'), ++ filepath(zzubdocpath + '/plugins/' + uri + '/index.html'), ++ filepath(zzubdocpath + '/plugins/' + name + '/index.html'), ] for path in helpfilepaths: print "searching for '%s'..." % path -diff -up aldrin-0.11/share/aldrin/main.py.docfix aldrin-0.11/share/aldrin/main.py ---- aldrin-0.11/share/aldrin/main.py.docfix 2007-09-25 21:14:29.000000000 +0200 -+++ aldrin-0.11/share/aldrin/main.py 2007-09-25 21:16:17.000000000 +0200 -@@ -856,7 +856,7 @@ class AldrinFrame(gtk.Window): - @type event: wx.MenuEvent - """ - import webbrowser -- webbrowser.open_new(filepath('../doc/aldrin/html/index.html')) -+ webbrowser.open_new(filepath('../doc/aldrin-0.11/html/index.html')) - - def on_about(self, event): - """ Index: aldrin.spec =================================================================== RCS file: /cvs/pkgs/rpms/aldrin/devel/aldrin.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aldrin.spec 24 Feb 2009 00:28:14 -0000 1.4 +++ aldrin.spec 6 Mar 2009 01:57:00 -0000 1.5 @@ -1,21 +1,19 @@ +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + Name: aldrin -Version: 0.11 -Release: 8%{?dist} +Version: 0.13 +Release: 1%{?dist} Summary: Modular music sequencer/tracker - Group: Applications/Multimedia License: GPLv2+ -URL: http://trac.zeitherrschaft.org/aldrin/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +URL: http://code.google.com/p/aldrin-sequencer/ +Source0: http://aldrin-sequencer.googlecode.com/files/%{name}-%{version}.tar.gz Patch0: aldrin-docfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch -ExcludeArch: ppc64 -BuildRequires: scons >= 0.96.92 -BuildRequires: dos2unix +BuildRequires: scons BuildRequires: desktop-file-utils -Requires: pyzzub = 0.2.3 +Requires: pyzzub >= 0.2.6 Requires: pygtk2 %description @@ -26,31 +24,28 @@ %prep -%setup -q -mac2unix SConstruct -%patch0 -p1 -b docfix +%setup -q -n %{name} +%patch0 -p1 -b .docfix %build -find share/aldrin share/doc \ - -regextype posix-egrep \ - -regex '.+\.(py|html|xml|prs|col|css)' \ - -exec mac2unix '{}' \; \ - -exec chmod 644 '{}' \; - +# Fix encoding iconv --from-code=ISO-8859-1 --to-code=UTF-8 CREDITS > CREDITS~ +touch -r CREDITS CREDITS~ %{__mv} CREDITS~ CREDITS +# Fix permission +%{__chmod} 644 src/components/player.py + %install %{__rm} -rf $RPM_BUILD_ROOT -scons install PREFIX=$RPM_BUILD_ROOT%{_prefix} +scons install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT -desktop-file-install \ - --vendor="fedora" \ - --remove-category="Application" \ - --delete-original \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +desktop-file-install --vendor="fedora" \ + --remove-category="Application" \ + --delete-original \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -58,30 +53,35 @@ %post update-desktop-database &> /dev/null || : - -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun update-desktop-database &> /dev/null || : - -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %files %defattr(-,root,root,-) -%{_bindir}/aldrin +%{_bindir}/aldrin* +%config(noreplace) %{_sysconfdir}/%{name} +%{python_sitelib}/%{name} %{_defaultdocdir}/%{name}-%{version} %{_datadir}/%{name} +%{_datadir}/icons/%{name} +%{_datadir}/pixmaps/%{name} %{_datadir}/applications/* %{_datadir}/icons/hicolor/*/apps/* %changelog +* Fri Feb 27 2009 Orcan Ogetbil - 0.13-1 +- Update to version 0.13 + * Mon Feb 23 2009 Fedora Release Engineering - 0.11-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/aldrin/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Sep 2007 19:16:12 -0000 1.2 +++ sources 6 Mar 2009 01:57:00 -0000 1.3 @@ -1 +1 @@ -1a40ea5852e34b69abc55e12d049aef8 aldrin-0.11.tar.bz2 +6bdbd4a48883cc7d4734fef3055947b2 aldrin-0.13.tar.gz From petersen at fedoraproject.org Fri Mar 6 02:08:25 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Fri, 6 Mar 2009 02:08:25 +0000 (UTC) Subject: rpms/ibus-table/devel ibus-table-pkgconfig-noarch.patch, NONE, 1.1 ibus-table.spec, 1.14, 1.15 sources, 1.6, 1.7 ibus-table-0.1.1.20081014-4a.rhbz466430.patch, 1.1, NONE ibus-table-0.1.1.20081014-4b.rhbz466844.patch, 1.1, NONE Message-ID: <20090306020825.6174170116@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ibus-table/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10714 Modified Files: ibus-table.spec sources Added Files: ibus-table-pkgconfig-noarch.patch Removed Files: ibus-table-0.1.1.20081014-4a.rhbz466430.patch ibus-table-0.1.1.20081014-4b.rhbz466844.patch Log Message: - make pkgconfig noarch with ibus-table-pkgconfig-noarch.patch - fix license field: actually LGPL - drop gettext-devel BR - require ibus > 1.1.0 ibus-table-pkgconfig-noarch.patch: --- NEW FILE ibus-table-pkgconfig-noarch.patch --- diff -u ibus-table-1.1.0.20090220/ibus-table.pc.in\~ ibus-table-1.1.0.20090220/ibus-table.pc.in --- ibus-table-1.1.0.20090220/ibus-table.pc.in~ 2009-02-20 11:42:40.000000000 +1000 +++ ibus-table-1.1.0.20090220/ibus-table.pc.in 2009-03-06 11:45:18.001898774 +1000 @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ +libdir=@datadir@ datarootdir=@datarootdir@ datadir=@datadir@ Diff finished. Fri Mar 6 11:46:24 2009 Index: ibus-table.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ibus-table.spec 4 Mar 2009 04:40:59 -0000 1.14 +++ ibus-table.spec 6 Mar 2009 02:07:54 -0000 1.15 @@ -1,19 +1,16 @@ Name: ibus-table Version: 1.1.0.20090220 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Table engine for IBus platform -License: GPLv2+ +License: LGPLv2+ Group: System Environment/Libraries URL: http://code.google.com/p/ibus/ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch - -BuildRequires: gettext-devel -BuildRequires: ibus-devel - -Requires: ibus +BuildRequires: ibus-devel > 1.1.0 +Requires: ibus > 1.1.0 +Patch1: ibus-table-pkgconfig-noarch.patch %description The package contains general Table engine for IBus platform. @@ -27,17 +24,16 @@ This package contains additional tables. %prep -%setup -b0 -q +%setup -q +%patch1 -p1 -b .orig %build -cd ../%{name}-%{version} %configure --disable-static --enable-additional - make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install +make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install pkgconfigdir=%{_datadir}/pkgconfig %find_lang %{name} @@ -57,7 +53,7 @@ %dir %{_datadir}/%{name}/icons %dir %{_datadir}/%{name}/data %{_datadir}/ibus/component/table.xml -%{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/pkgconfig/%{name}.pc %{_libexecdir}/ibus-engine-table %{_bindir}/%{name}-createdb %{_datadir}/%{name}/tables/template.txt @@ -110,6 +106,12 @@ %{_datadir}/%{name}/icons/latex.svg %changelog +* Fri Mar 6 2009 Jens Petersen - 1.1.0.20090220-5 +- make pkgconfig noarch with ibus-table-pkgconfig-noarch.patch +- fix license field: actually LGPL +- drop gettext-devel BR +- require ibus > 1.1.0 + * Mon Mar 02 2009 Caius Chance - 1.1.0.20090220-4.fc11 - Rebuilt. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ibus-table/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 4 Mar 2009 04:23:05 -0000 1.6 +++ sources 6 Mar 2009 02:07:54 -0000 1.7 @@ -1,2 +1 @@ -8c72c6ec97a0dcc822784e42ed6625c8 ibus-table-0.1.1.20081014.tar.gz 8949db247404207879183915e04cf602 ibus-table-1.1.0.20090220.tar.gz --- ibus-table-0.1.1.20081014-4a.rhbz466430.patch DELETED --- --- ibus-table-0.1.1.20081014-4b.rhbz466844.patch DELETED --- From davej at fedoraproject.org Fri Mar 6 03:38:13 2009 From: davej at fedoraproject.org (Dave Jones) Date: Fri, 6 Mar 2009 03:38:13 +0000 (UTC) Subject: rpms/kernel/devel kernel.spec,1.1389,1.1390 Message-ID: <20090306033813.38D6270116@cvs1.fedora.phx.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26926 Modified Files: kernel.spec Log Message: kernel-devel needs include/trace headers. (Josh Stone ) Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1389 retrieving revision 1.1390 diff -u -r1.1389 -r1.1390 --- kernel.spec 6 Mar 2009 01:45:03 -0000 1.1389 +++ kernel.spec 6 Mar 2009 03:37:42 -0000 1.1390 @@ -1415,7 +1415,7 @@ fi mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cd include - cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video drm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include + cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound trace video drm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include asmdir=$(readlink asm) cp -a $asmdir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/ pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include @@ -1806,6 +1806,9 @@ # and build. %changelog +* Thu Mar 06 2009 Dave Jones +- kernel-devel needs include/trace headers. (Josh Stone ) + * Wed Mar 06 2009 Mauro Carvalho Chehab - drivers/media: Some fixes and a cleanup on F11 v4l/dvb config.generic From oget at fedoraproject.org Fri Mar 6 03:41:12 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Fri, 6 Mar 2009 03:41:12 +0000 (UTC) Subject: rpms/aldrin/F-10 .cvsignore, 1.2, 1.3 aldrin-docfix.patch, 1.1, 1.2 aldrin.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090306034112.E817070116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/aldrin/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27491 Modified Files: .cvsignore aldrin-docfix.patch aldrin.spec sources Log Message: * Fri Feb 27 2009 Orcan Ogetbil - 0.13-1 - Update to version 0.13 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/aldrin/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Sep 2007 19:16:12 -0000 1.2 +++ .cvsignore 6 Mar 2009 03:40:42 -0000 1.3 @@ -1 +1 @@ -aldrin-0.11.tar.bz2 +aldrin-0.13.tar.gz aldrin-docfix.patch: Index: aldrin-docfix.patch =================================================================== RCS file: /cvs/pkgs/rpms/aldrin/F-10/aldrin-docfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- aldrin-docfix.patch 27 Sep 2007 19:16:12 -0000 1.1 +++ aldrin-docfix.patch 6 Mar 2009 03:40:42 -0000 1.2 @@ -1,46 +1,68 @@ -diff -up aldrin-0.11/SConstruct.docfix aldrin-0.11/SConstruct ---- aldrin-0.11/SConstruct.docfix 2007-09-25 20:55:58.000000000 +0200 -+++ aldrin-0.11/SConstruct 2007-09-25 20:55:58.000000000 +0200 -@@ -127,12 +127,14 @@ if win32: - install('${DESTDIR}${PREFIX}', 'aldrin.bat') - - # docs --install('${DOC_INSTALL_PATH}/aldrin/html', -+install('${DOC_INSTALL_PATH}/aldrin-%s/html' % VERSION, - glob.glob('share/doc/aldrin/html/*.html') - + glob.glob('share/doc/aldrin/html/*.css')) --install('${DOC_INSTALL_PATH}/aldrin/images', -+install('${DOC_INSTALL_PATH}/aldrin-%s/images' % VERSION, - glob.glob('share/doc/aldrin/images/*.gif') - + glob.glob('share/doc/aldrin/images/*.png')) -+install('${DOC_INSTALL_PATH}/aldrin-%s' % VERSION, -+ ['ChangeLog', 'CREDITS', 'LICENCE']) +diff -rupN aldrin.old/doc/SConscript aldrin/doc/SConscript +--- aldrin.old/doc/SConscript 2009-01-09 16:25:21.000000000 -0500 ++++ aldrin/doc/SConscript 2009-02-23 16:22:46.000000000 -0500 +@@ -31,4 +31,5 @@ install('${DOC_PATH}/images', + glob.glob('aldrin/images/*.gif') + + glob.glob('aldrin/images/*.png')) - # icon theme - install(iconpath + '/16x16/apps', 'share/icons/hicolor/16x16/apps/aldrin.png') -diff -up aldrin-0.11/share/aldrin/router.py.docfix aldrin-0.11/share/aldrin/router.py ---- aldrin-0.11/share/aldrin/router.py.docfix 2007-09-25 21:16:54.000000000 +0200 -+++ aldrin-0.11/share/aldrin/router.py 2007-09-25 21:17:19.000000000 +0200 -@@ -698,8 +698,8 @@ class ParameterDialog(gtk.Dialog): +- ++install('${DOC_PATH}', ++ ['../ChangeLog', '../CREDITS', '../LICENCE']) +diff -rupN aldrin.old/SConstruct aldrin/SConstruct +--- aldrin.old/SConstruct 2009-01-09 16:25:21.000000000 -0500 ++++ aldrin/SConstruct 2009-02-23 16:20:14.000000000 -0500 +@@ -61,7 +61,7 @@ env['SITE_PACKAGE_PATH'] = distutils.sys + env['APPLICATIONS_PATH'] = '${DESTDIR}${PREFIX}/share/applications' + env['BIN_PATH'] = '${DESTDIR}${PREFIX}/bin' + env['SHARE_PATH'] = '${DESTDIR}${PREFIX}/share/aldrin' +-env['DOC_PATH'] = '${DESTDIR}${PREFIX}/share/doc/aldrin' ++env['DOC_PATH'] = '${DESTDIR}${PREFIX}/share/doc/aldrin-' + VERSION + env['ETC_PATH'] = '${DESTDIR}${ETCDIR}/aldrin' + env['ICONS_ALDRIN_PATH'] = '${DESTDIR}${PREFIX}/share/icons/aldrin' + env['ICONS_HICOLOR_PATH'] = '${DESTDIR}${PREFIX}/share/icons/hicolor' +diff -rupN aldrin.old/src/components/mainwindow.py aldrin/src/components/mainwindow.py +--- aldrin.old/src/components/mainwindow.py 2009-01-09 16:25:22.000000000 -0500 ++++ aldrin/src/components/mainwindow.py 2009-02-23 16:33:44.000000000 -0500 +@@ -44,7 +44,7 @@ show_preferences = preferences.show_pref + from aldrin.utils import CancelException + + import aldrin.com as com +- ++from about import VERSION + def cmp_view(a,b): + a_order = (hasattr(a, '__view__') and a.__view__.get('order',0)) or 0 + b_order = (hasattr(b, '__view__') and b.__view__.get('order',0)) or 0 +@@ -551,7 +551,7 @@ class AldrinFrame(gtk.Window): + @type event: MenuEvent + """ + import webbrowser +- webbrowser.open_new(filepath('../doc/aldrin/html/index.html')) ++ webbrowser.open_new(filepath('../doc/aldrin'+VERSION.split(" ")[0]+'/html/index.html')) + + def on_about(self, *args): + """ +diff -rupN aldrin.old/src/components/rack.py aldrin/src/components/rack.py +--- aldrin.old/src/components/rack.py 2009-01-09 16:25:22.000000000 -0500 ++++ aldrin/src/components/rack.py 2009-02-23 17:08:46.000000000 -0500 +@@ -30,7 +30,7 @@ from aldrin.utils import prepstr, filepa + get_item_count, question, error, new_listview, add_scrollbars, get_clipboard_text, set_clipboard_text, \ + gettext, new_stock_image_button, diff + import zzub +-import sys,os ++import sys,os,glob + import fnmatch + import ctypes + import time +@@ -728,9 +728,10 @@ class ParameterView(gtk.VBox): + """ uri = filenameify(self.pluginloader.get_uri()) name = filenameify(self.pluginloader.get_name()) ++ zzubdocpath = glob.glob("../doc/libzzub-*")[0] helpfilepaths = [ - filepath('../doc/zzub/plugins/' + uri + '/index.html'), - filepath('../doc/zzub/plugins/' + name + '/index.html'), -+ filepath('../doc/libzzub-0.2.3/plugins/' + uri + '/index.html'), -+ filepath('../doc/libzzub-0.2.3/plugins/' + name + '/index.html'), ++ filepath(zzubdocpath + '/plugins/' + uri + '/index.html'), ++ filepath(zzubdocpath + '/plugins/' + name + '/index.html'), ] for path in helpfilepaths: print "searching for '%s'..." % path -diff -up aldrin-0.11/share/aldrin/main.py.docfix aldrin-0.11/share/aldrin/main.py ---- aldrin-0.11/share/aldrin/main.py.docfix 2007-09-25 21:14:29.000000000 +0200 -+++ aldrin-0.11/share/aldrin/main.py 2007-09-25 21:16:17.000000000 +0200 -@@ -856,7 +856,7 @@ class AldrinFrame(gtk.Window): - @type event: wx.MenuEvent - """ - import webbrowser -- webbrowser.open_new(filepath('../doc/aldrin/html/index.html')) -+ webbrowser.open_new(filepath('../doc/aldrin-0.11/html/index.html')) - - def on_about(self, event): - """ Index: aldrin.spec =================================================================== RCS file: /cvs/pkgs/rpms/aldrin/F-10/aldrin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- aldrin.spec 5 Oct 2007 14:20:46 -0000 1.2 +++ aldrin.spec 6 Mar 2009 03:40:42 -0000 1.3 @@ -1,21 +1,19 @@ +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + Name: aldrin -Version: 0.11 -Release: 6%{?dist} +Version: 0.13 +Release: 1%{?dist} Summary: Modular music sequencer/tracker - Group: Applications/Multimedia License: GPLv2+ -URL: http://trac.zeitherrschaft.org/aldrin/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +URL: http://code.google.com/p/aldrin-sequencer/ +Source0: http://aldrin-sequencer.googlecode.com/files/%{name}-%{version}.tar.gz Patch0: aldrin-docfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch -ExcludeArch: ppc64 -BuildRequires: scons >= 0.96.92 -BuildRequires: dos2unix +BuildRequires: scons BuildRequires: desktop-file-utils -Requires: pyzzub = 0.2.3 +Requires: pyzzub >= 0.2.6 Requires: pygtk2 %description @@ -26,31 +24,28 @@ %prep -%setup -q -mac2unix SConstruct -%patch0 -p1 -b docfix +%setup -q -n %{name} +%patch0 -p1 -b .docfix %build -find share/aldrin share/doc \ - -regextype posix-egrep \ - -regex '.+\.(py|html|xml|prs|col|css)' \ - -exec mac2unix '{}' \; \ - -exec chmod 644 '{}' \; - +# Fix encoding iconv --from-code=ISO-8859-1 --to-code=UTF-8 CREDITS > CREDITS~ +touch -r CREDITS CREDITS~ %{__mv} CREDITS~ CREDITS +# Fix permission +%{__chmod} 644 src/components/player.py + %install %{__rm} -rf $RPM_BUILD_ROOT -scons install PREFIX=$RPM_BUILD_ROOT%{_prefix} +scons install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT -desktop-file-install \ - --vendor="fedora" \ - --remove-category="Application" \ - --delete-original \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +desktop-file-install --vendor="fedora" \ + --remove-category="Application" \ + --delete-original \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -58,30 +53,35 @@ %post update-desktop-database &> /dev/null || : - -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun update-desktop-database &> /dev/null || : - -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %files %defattr(-,root,root,-) -%{_bindir}/aldrin +%{_bindir}/aldrin* +%config(noreplace) %{_sysconfdir}/%{name} +%{python_sitelib}/%{name} %{_defaultdocdir}/%{name}-%{version} %{_datadir}/%{name} +%{_datadir}/icons/%{name} +%{_datadir}/pixmaps/%{name} %{_datadir}/applications/* %{_datadir}/icons/hicolor/*/apps/* %changelog +* Fri Feb 27 2009 Orcan Ogetbil - 0.13-1 +- Update to version 0.13 + * Fri Oct 5 2007 Alexander Kahl - 0.11-6 - added ExludeArch for ppc64 to reflect libzzub unavailability on that arch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/aldrin/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Sep 2007 19:16:12 -0000 1.2 +++ sources 6 Mar 2009 03:40:42 -0000 1.3 @@ -1 +1 @@ -1a40ea5852e34b69abc55e12d049aef8 aldrin-0.11.tar.bz2 +6bdbd4a48883cc7d4734fef3055947b2 aldrin-0.13.tar.gz From cebbert at fedoraproject.org Fri Mar 6 04:16:29 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Fri, 6 Mar 2009 04:16:29 +0000 (UTC) Subject: rpms/kernel/F-10 ext4.git-025ef246287da1d16ac091fd65af58a496a3553b.patch, NONE, 1.1.2.1 ext4.git-a2e750f32230c9babd0ddf2c9d0b5aafd19a1447.patch, NONE, 1.1.2.1 kernel.spec, 1.1206.2.40, 1.1206.2.41 linux-2.6-ext4-ENOSPC-debug.patch, 1.1.2.2, NONE Message-ID: <20090306041629.6449B70116@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1503 Modified Files: Tag: private-fedora-10-2_6_27 kernel.spec Added Files: Tag: private-fedora-10-2_6_27 ext4.git-025ef246287da1d16ac091fd65af58a496a3553b.patch ext4.git-a2e750f32230c9babd0ddf2c9d0b5aafd19a1447.patch Removed Files: Tag: private-fedora-10-2_6_27 linux-2.6-ext4-ENOSPC-debug.patch Log Message: Add ext4 stable patch queue. Drop linux-2.6-ext4-ENOSPC-debug.patch, replaced by upstream stable patch. ext4.git-025ef246287da1d16ac091fd65af58a496a3553b.patch: --- NEW FILE ext4.git-025ef246287da1d16ac091fd65af58a496a3553b.patch --- From: Theodore Ts'o Date: Sat, 21 Feb 2009 17:13:24 +0000 (-0500) Subject: ext4: Add fallback for find_group_flex X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftytso%2Fext4.git;a=commitdiff_plain;h=025ef246287da1d16ac091fd65af58a496a3553b ext4: Add fallback for find_group_flex This is a workaround for find_group_flex() which badly needs to be replaced. One of its problems (besides ignoring the Orlov algorithm) is that it is a bit hyperactive about returning failure under suspicious circumstances. This can lead to spurious ENOSPC failures even when there are inodes still available. Work around this for now by retrying the search using find_group_other() if find_group_flex() returns -1. If find_group_other() succeeds when find_group_flex() has failed, log a warning message. A better block/inode allocator that will fix this problem for real has been queued up for the next merge window. Signed-off-by: "Theodore Ts'o" (cherry picked from commit 05bf9e839d9de4e8a094274a0a2fd07beb47eaf1) --- diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index b994854..cce841f 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c @@ -702,6 +702,13 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode * dir, int mode) if (sbi->s_log_groups_per_flex) { ret2 = find_group_flex(sb, dir, &group); + if (ret2 == -1) { + ret2 = find_group_other(sb, dir, &group); + if (ret2 == 0 && printk_ratelimit()) + printk(KERN_NOTICE "ext4: find_group_flex " + "failed, fallback succeeded dir %lu\n", + dir->i_ino); + } goto got_group; } ext4.git-a2e750f32230c9babd0ddf2c9d0b5aafd19a1447.patch: --- NEW FILE ext4.git-a2e750f32230c9babd0ddf2c9d0b5aafd19a1447.patch --- From: Jan Kara Date: Mon, 23 Feb 2009 02:09:59 +0000 (-0500) Subject: ext4: Fix deadlock in ext4_write_begin() and ext4_da_write_begin() X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftytso%2Fext4.git;a=commitdiff_plain;h=a2e750f32230c9babd0ddf2c9d0b5aafd19a1447 ext4: Fix deadlock in ext4_write_begin() and ext4_da_write_begin() Functions ext4_write_begin() and ext4_da_write_begin() call grab_cache_page_write_begin() without AOP_FLAG_NOFS. Thus it can happen that page reclaim is triggered in that function and it recurses back into the filesystem (or some other filesystem). But this can lead to various problems as a transaction is already started at that point. Add the necessary flag. http://bugzilla.kernel.org/show_bug.cgi?id=11688 Signed-off-by: Jan Kara Signed-off-by: "Theodore Ts'o" (cherry picked from commit ebd3610b110bbb18ea6f9f2aeed1e1068c537227) --- diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 7b063d4..b233ade 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1372,6 +1372,10 @@ retry: goto out; } + /* We cannot recurse into the filesystem as the transaction is already + * started */ + flags |= AOP_FLAG_NOFS; + page = grab_cache_page_write_begin(mapping, index, flags); if (!page) { ext4_journal_stop(handle); @@ -1381,7 +1385,7 @@ retry: *pagep = page; ret = block_write_begin(file, mapping, pos, len, flags, pagep, fsdata, - ext4_get_block); + ext4_get_block); if (!ret && ext4_should_journal_data(inode)) { ret = walk_page_buffers(handle, page_buffers(page), @@ -2465,6 +2469,9 @@ retry: ret = PTR_ERR(handle); goto out; } + /* We cannot recurse into the filesystem as the transaction is already + * started */ + flags |= AOP_FLAG_NOFS; page = grab_cache_page_write_begin(mapping, index, flags); if (!page) { Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v retrieving revision 1.1206.2.40 retrieving revision 1.1206.2.41 diff -u -r1.1206.2.40 -r1.1206.2.41 --- kernel.spec 5 Mar 2009 22:22:29 -0000 1.1206.2.40 +++ kernel.spec 6 Mar 2009 04:15:58 -0000 1.1206.2.41 @@ -750,7 +750,6 @@ Patch2900: linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch # Delay capable check to avoid most AVCs (#478299) Patch2901: linux-2.6.27.9-ext4-cap-check-delay.patch -Patch2904: linux-2.6-ext4-ENOSPC-debug.patch # next round of ext4 patches for -stable Patch2910: ext4.git-765ba56963fc62e060678a4c2e788ca46722bf6a.patch @@ -764,6 +763,10 @@ # fix problems(s) in ext4 queue Patch2920: ext4.git-fixes.patch +# more ext4 patches for stable +Patch2930: ext4.git-025ef246287da1d16ac091fd65af58a496a3553b.patch +Patch2931: ext4.git-a2e750f32230c9babd0ddf2c9d0b5aafd19a1447.patch + # Add better support for DMI-based autoloading Patch3110: linux-2.6-dmi-autoload.patch @@ -1188,7 +1191,6 @@ # ext4 ApplyPatch linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch ApplyPatch linux-2.6.27.9-ext4-cap-check-delay.patch -ApplyPatch linux-2.6-ext4-ENOSPC-debug.patch ApplyPatch ext4.git-765ba56963fc62e060678a4c2e788ca46722bf6a.patch ApplyPatch ext4.git-b9eab5ac8eeff5be74ceed5cda3ab590399d89ef.patch @@ -1200,6 +1202,9 @@ ApplyPatch ext4.git-fixes.patch +ApplyPatch ext4.git-025ef246287da1d16ac091fd65af58a496a3553b.patch +ApplyPatch ext4.git-a2e750f32230c9babd0ddf2c9d0b5aafd19a1447.patch + # xfs # USB @@ -1982,6 +1987,10 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Thu Mar 05 2009 Chuck Ebbert 2.6.27.19-170.2.41 +- Add ext4 stable patch queue. +- Drop linux-2.6-ext4-ENOSPC-debug.patch, replaced by upstream stable patch. + * Thu Mar 05 2009 Chuck Ebbert 2.6.27.19-170.2.40 - Fix endless error message spew from sata_nv in 2.6.27.19 (#488371) --- linux-2.6-ext4-ENOSPC-debug.patch DELETED --- From icon at fedoraproject.org Fri Mar 6 04:17:18 2009 From: icon at fedoraproject.org (Konstantin Ryabitsev) Date: Fri, 6 Mar 2009 04:17:18 +0000 (UTC) Subject: rpms/php-pear-PHP-CodeSniffer/devel .cvsignore, 1.9, 1.10 php-pear-PHP-CodeSniffer.spec, 1.9, 1.10 sources, 1.9, 1.10 Message-ID: <20090306041718.C256170116@cvs1.fedora.phx.redhat.com> Author: icon Update of /cvs/extras/rpms/php-pear-PHP-CodeSniffer/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1667 Modified Files: .cvsignore php-pear-PHP-CodeSniffer.spec sources Log Message: Belatedly update to 1.1.0 final. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHP-CodeSniffer/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 30 Jun 2008 16:35:55 -0000 1.9 +++ .cvsignore 6 Mar 2009 04:16:48 -0000 1.10 @@ -1 +1 @@ -PHP_CodeSniffer-1.1.0RC2.tgz +PHP_CodeSniffer-1.1.0.tgz Index: php-pear-PHP-CodeSniffer.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHP-CodeSniffer/devel/php-pear-PHP-CodeSniffer.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- php-pear-PHP-CodeSniffer.spec 26 Feb 2009 22:01:15 -0000 1.9 +++ php-pear-PHP-CodeSniffer.spec 6 Mar 2009 04:16:48 -0000 1.10 @@ -1,16 +1,15 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name PHP_CodeSniffer -%define rctag RC2 Name: php-pear-PHP-CodeSniffer Version: 1.1.0 -Release: 0.2.%{rctag}%{?dist} +Release: 1%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools License: BSD URL: http://pear.php.net/package/PHP_CodeSniffer -Source0: http://pear.php.net/get/PHP_CodeSniffer-%{version}%{rctag}.tgz +Source0: http://pear.php.net/get/PHP_CodeSniffer-%{version}.tgz Source1: PHP_CodeSniffer-licence.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,7 +38,7 @@ %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml -mv package2.xml %{pear_name}-%{version}%{rctag}/%{pear_name}.xml +mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml %build @@ -47,7 +46,7 @@ %install -cd %{pear_name}-%{version}%{rctag} +cd %{pear_name}-%{version} rm -rf $RPM_BUILD_ROOT docdir %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml @@ -87,8 +86,8 @@ %files %defattr(-,root,root,-) -%doc %{pear_name}-%{version}%{rctag}/PHP_CodeSniffer-licence.txt -%doc %{pear_name}-%{version}%{rctag}/docdir/* +%doc %{pear_name}-%{version}/PHP_CodeSniffer-licence.txt +%doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{pear_name}.xml %{pear_testdir}/%{pear_name} %dir %{pear_phpdir}/PHP @@ -97,12 +96,15 @@ %files -n phpcs %defattr(-,root,root,-) -%doc %{pear_name}-%{version}%{rctag}/PHP_CodeSniffer-licence.txt -%doc %{pear_name}-%{version}%{rctag}/phpcs-svn-pre-commit +%doc %{pear_name}-%{version}/PHP_CodeSniffer-licence.txt +%doc %{pear_name}-%{version}/phpcs-svn-pre-commit %{_bindir}/phpcs %changelog +* Thu Mar 05 2009 Konstantin Ryabitsev - 1.1.0-1 +- Belatedly update to 1.1.0 final. + * Thu Feb 26 2009 Fedora Release Engineering - 1.1.0-0.2.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHP-CodeSniffer/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 30 Jun 2008 16:35:55 -0000 1.9 +++ sources 6 Mar 2009 04:16:48 -0000 1.10 @@ -1 +1 @@ -c7b10489c21b73e56b67cfa967eb1672 PHP_CodeSniffer-1.1.0RC2.tgz +b5f727311b091ee6b6edf8ffcc411e71 PHP_CodeSniffer-1.1.0.tgz From icon at fedoraproject.org Fri Mar 6 04:20:14 2009 From: icon at fedoraproject.org (Konstantin Ryabitsev) Date: Fri, 6 Mar 2009 04:20:14 +0000 (UTC) Subject: rpms/php-pear-PHP-CodeSniffer/F-10 .cvsignore, 1.9, 1.10 php-pear-PHP-CodeSniffer.spec, 1.8, 1.9 sources, 1.9, 1.10 Message-ID: <20090306042014.68F7F70116@cvs1.fedora.phx.redhat.com> Author: icon Update of /cvs/extras/rpms/php-pear-PHP-CodeSniffer/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2301 Modified Files: .cvsignore php-pear-PHP-CodeSniffer.spec sources Log Message: Belatedly update to 1.1.0 final. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHP-CodeSniffer/F-10/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 30 Jun 2008 16:35:55 -0000 1.9 +++ .cvsignore 6 Mar 2009 04:19:43 -0000 1.10 @@ -1 +1 @@ -PHP_CodeSniffer-1.1.0RC2.tgz +PHP_CodeSniffer-1.1.0.tgz Index: php-pear-PHP-CodeSniffer.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHP-CodeSniffer/F-10/php-pear-PHP-CodeSniffer.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- php-pear-PHP-CodeSniffer.spec 30 Jun 2008 16:35:55 -0000 1.8 +++ php-pear-PHP-CodeSniffer.spec 6 Mar 2009 04:19:44 -0000 1.9 @@ -1,16 +1,15 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name PHP_CodeSniffer -%define rctag RC2 Name: php-pear-PHP-CodeSniffer Version: 1.1.0 -Release: 0.1.%{rctag}%{?dist} +Release: 1%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools License: BSD URL: http://pear.php.net/package/PHP_CodeSniffer -Source0: http://pear.php.net/get/PHP_CodeSniffer-%{version}%{rctag}.tgz +Source0: http://pear.php.net/get/PHP_CodeSniffer-%{version}.tgz Source1: PHP_CodeSniffer-licence.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,7 +38,7 @@ %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml -mv package2.xml %{pear_name}-%{version}%{rctag}/%{pear_name}.xml +mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml %build @@ -47,7 +46,7 @@ %install -cd %{pear_name}-%{version}%{rctag} +cd %{pear_name}-%{version} rm -rf $RPM_BUILD_ROOT docdir %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml @@ -87,8 +86,8 @@ %files %defattr(-,root,root,-) -%doc %{pear_name}-%{version}%{rctag}/PHP_CodeSniffer-licence.txt -%doc %{pear_name}-%{version}%{rctag}/docdir/* +%doc %{pear_name}-%{version}/PHP_CodeSniffer-licence.txt +%doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{pear_name}.xml %{pear_testdir}/%{pear_name} %dir %{pear_phpdir}/PHP @@ -97,12 +96,18 @@ %files -n phpcs %defattr(-,root,root,-) -%doc %{pear_name}-%{version}%{rctag}/PHP_CodeSniffer-licence.txt -%doc %{pear_name}-%{version}%{rctag}/phpcs-svn-pre-commit +%doc %{pear_name}-%{version}/PHP_CodeSniffer-licence.txt +%doc %{pear_name}-%{version}/phpcs-svn-pre-commit %{_bindir}/phpcs %changelog +* Thu Mar 05 2009 Konstantin Ryabitsev - 1.1.0-1 +- Belatedly update to 1.1.0 final. + +* Thu Feb 26 2009 Fedora Release Engineering - 1.1.0-0.2.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Jun 30 2008 Konstantin Ryabitsev - 1.1.0-0.1.RC2 - Upstream 1.1.0RC2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHP-CodeSniffer/F-10/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 30 Jun 2008 16:35:55 -0000 1.9 +++ sources 6 Mar 2009 04:19:44 -0000 1.10 @@ -1 +1 @@ -c7b10489c21b73e56b67cfa967eb1672 PHP_CodeSniffer-1.1.0RC2.tgz +b5f727311b091ee6b6edf8ffcc411e71 PHP_CodeSniffer-1.1.0.tgz From cebbert at fedoraproject.org Fri Mar 6 04:22:07 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Fri, 6 Mar 2009 04:22:07 +0000 (UTC) Subject: rpms/kernel/F-9 ext4.git-025ef246287da1d16ac091fd65af58a496a3553b.patch, NONE, 1.1.2.1 ext4.git-a2e750f32230c9babd0ddf2c9d0b5aafd19a1447.patch, NONE, 1.1.2.1 kernel.spec, 1.891.2.33, 1.891.2.34 linux-2.6-ext4-ENOSPC-debug.patch, 1.1.2.1, NONE Message-ID: <20090306042207.2121870116@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2746 Modified Files: Tag: private-fedora-9-2_6_27-branch kernel.spec Added Files: Tag: private-fedora-9-2_6_27-branch ext4.git-025ef246287da1d16ac091fd65af58a496a3553b.patch ext4.git-a2e750f32230c9babd0ddf2c9d0b5aafd19a1447.patch Removed Files: Tag: private-fedora-9-2_6_27-branch linux-2.6-ext4-ENOSPC-debug.patch Log Message: Add ext4 stable patch queue. Drop linux-2.6-ext4-ENOSPC-debug.patch, replaced by upstream stable patch. ext4.git-025ef246287da1d16ac091fd65af58a496a3553b.patch: --- NEW FILE ext4.git-025ef246287da1d16ac091fd65af58a496a3553b.patch --- From: Theodore Ts'o Date: Sat, 21 Feb 2009 17:13:24 +0000 (-0500) Subject: ext4: Add fallback for find_group_flex X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftytso%2Fext4.git;a=commitdiff_plain;h=025ef246287da1d16ac091fd65af58a496a3553b ext4: Add fallback for find_group_flex This is a workaround for find_group_flex() which badly needs to be replaced. One of its problems (besides ignoring the Orlov algorithm) is that it is a bit hyperactive about returning failure under suspicious circumstances. This can lead to spurious ENOSPC failures even when there are inodes still available. Work around this for now by retrying the search using find_group_other() if find_group_flex() returns -1. If find_group_other() succeeds when find_group_flex() has failed, log a warning message. A better block/inode allocator that will fix this problem for real has been queued up for the next merge window. Signed-off-by: "Theodore Ts'o" (cherry picked from commit 05bf9e839d9de4e8a094274a0a2fd07beb47eaf1) --- diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index b994854..cce841f 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c @@ -702,6 +702,13 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode * dir, int mode) if (sbi->s_log_groups_per_flex) { ret2 = find_group_flex(sb, dir, &group); + if (ret2 == -1) { + ret2 = find_group_other(sb, dir, &group); + if (ret2 == 0 && printk_ratelimit()) + printk(KERN_NOTICE "ext4: find_group_flex " + "failed, fallback succeeded dir %lu\n", + dir->i_ino); + } goto got_group; } ext4.git-a2e750f32230c9babd0ddf2c9d0b5aafd19a1447.patch: --- NEW FILE ext4.git-a2e750f32230c9babd0ddf2c9d0b5aafd19a1447.patch --- From: Jan Kara Date: Mon, 23 Feb 2009 02:09:59 +0000 (-0500) Subject: ext4: Fix deadlock in ext4_write_begin() and ext4_da_write_begin() X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftytso%2Fext4.git;a=commitdiff_plain;h=a2e750f32230c9babd0ddf2c9d0b5aafd19a1447 ext4: Fix deadlock in ext4_write_begin() and ext4_da_write_begin() Functions ext4_write_begin() and ext4_da_write_begin() call grab_cache_page_write_begin() without AOP_FLAG_NOFS. Thus it can happen that page reclaim is triggered in that function and it recurses back into the filesystem (or some other filesystem). But this can lead to various problems as a transaction is already started at that point. Add the necessary flag. http://bugzilla.kernel.org/show_bug.cgi?id=11688 Signed-off-by: Jan Kara Signed-off-by: "Theodore Ts'o" (cherry picked from commit ebd3610b110bbb18ea6f9f2aeed1e1068c537227) --- diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 7b063d4..b233ade 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1372,6 +1372,10 @@ retry: goto out; } + /* We cannot recurse into the filesystem as the transaction is already + * started */ + flags |= AOP_FLAG_NOFS; + page = grab_cache_page_write_begin(mapping, index, flags); if (!page) { ext4_journal_stop(handle); @@ -1381,7 +1385,7 @@ retry: *pagep = page; ret = block_write_begin(file, mapping, pos, len, flags, pagep, fsdata, - ext4_get_block); + ext4_get_block); if (!ret && ext4_should_journal_data(inode)) { ret = walk_page_buffers(handle, page_buffers(page), @@ -2465,6 +2469,9 @@ retry: ret = PTR_ERR(handle); goto out; } + /* We cannot recurse into the filesystem as the transaction is already + * started */ + flags |= AOP_FLAG_NOFS; page = grab_cache_page_write_begin(mapping, index, flags); if (!page) { Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.891.2.33 retrieving revision 1.891.2.34 diff -u -r1.891.2.33 -r1.891.2.34 --- kernel.spec 5 Mar 2009 18:54:06 -0000 1.891.2.33 +++ kernel.spec 6 Mar 2009 04:21:36 -0000 1.891.2.34 @@ -739,7 +739,6 @@ Patch2902: linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch Patch2903: linux-2.6.27.9-ext4-cap-check-delay.patch -Patch2904: linux-2.6-ext4-ENOSPC-debug.patch # next round of ext4 patches for -stable Patch2910: ext4.git-765ba56963fc62e060678a4c2e788ca46722bf6a.patch @@ -752,6 +751,10 @@ # fix problems(s) in ext4 queue Patch2920: ext4.git-fixes.patch +# more ext4 patches for stable +Patch2930: ext4.git-025ef246287da1d16ac091fd65af58a496a3553b.patch +Patch2931: ext4.git-a2e750f32230c9babd0ddf2c9d0b5aafd19a1447.patch + # Add better support for DMI-based autoloading Patch3110: linux-2.6-dmi-autoload.patch @@ -1332,7 +1335,6 @@ # Filesystem patches ApplyPatch linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch ApplyPatch linux-2.6.27.9-ext4-cap-check-delay.patch -ApplyPatch linux-2.6-ext4-ENOSPC-debug.patch ApplyPatch ext4.git-765ba56963fc62e060678a4c2e788ca46722bf6a.patch ApplyPatch ext4.git-b9eab5ac8eeff5be74ceed5cda3ab590399d89ef.patch @@ -1344,6 +1346,9 @@ ApplyPatch ext4.git-fixes.patch +ApplyPatch ext4.git-025ef246287da1d16ac091fd65af58a496a3553b.patch +ApplyPatch ext4.git-a2e750f32230c9babd0ddf2c9d0b5aafd19a1447.patch + # linux1394 git patches ApplyPatch linux-2.6-firewire-git-update.patch @@ -1958,6 +1963,10 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Thu Mar 05 2009 Chuck Ebbert 2.6.27.19-78.2.34 +- Add ext4 stable patch queue. +- Drop linux-2.6-ext4-ENOSPC-debug.patch, replaced by upstream stable patch. + * Thu Mar 05 2009 Chuck Ebbert 2.6.27.19-78.2.33 - Add ALSA HDA probe_mask quirks from 2.6.29-rc7 --- linux-2.6-ext4-ENOSPC-debug.patch DELETED --- From ravenoak at fedoraproject.org Fri Mar 6 04:58:48 2009 From: ravenoak at fedoraproject.org (Caitlyn O'Hanna) Date: Fri, 6 Mar 2009 04:58:48 +0000 (UTC) Subject: rpms/pysvn/F-9 pysvn.spec, 1.4, 1.5 sources, 1.4, 1.5 pysvn-1.6.2-fix-benchmark.patch, 1.1, NONE Message-ID: <20090306045848.ADD5270116@cvs1.fedora.phx.redhat.com> Author: ravenoak Update of /cvs/pkgs/rpms/pysvn/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9442 Modified Files: pysvn.spec sources Removed Files: pysvn-1.6.2-fix-benchmark.patch Log Message: Update to 1.6.3, remove benchmark patch Index: pysvn.spec =================================================================== RCS file: /cvs/pkgs/rpms/pysvn/F-9/pysvn.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pysvn.spec 28 Oct 2008 18:41:45 -0000 1.4 +++ pysvn.spec 6 Mar 2009 04:58:18 -0000 1.5 @@ -1,14 +1,13 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: pysvn -Version: 1.6.2 +Version: 1.6.3 Release: 1%{dist} Summary: Pythonic style bindings for Subversion Group: Development/Languages License: ASL 1.1 URL: http://pysvn.tigris.org/ Source0: http://pysvn.barrys-emacs.org/source_kits/%{name}-%{version}.tar.gz -Patch0: pysvn-1.6.2-fix-benchmark.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildRequires: PyXML @@ -23,7 +22,6 @@ %prep %setup -q -n %{name}-%{version} -%patch0 %build pushd Source @@ -54,6 +52,9 @@ %{python_sitearch}/%{name} %changelog +* Thu Mar 05 2009 Caitlyn O'Hanna - 1.6.3-1 +- Update to 1.6.3, removed need of benchmark patch + * Tue Oct 28 2008 Caitlyn O'Hanna - 1.6.2-1 - Upstream to 1.6.2, upstream provided some build fixes to remove patches - (Thanks Barry!). Re-enabled testing with provided patch to fix whitespace Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pysvn/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Oct 2008 18:41:45 -0000 1.4 +++ sources 6 Mar 2009 04:58:18 -0000 1.5 @@ -1 +1 @@ -58bb216b815f3c05ed77f70708515355 pysvn-1.6.2.tar.gz +41d312ff09b05f7b53d3641a82c64c93 pysvn-1.6.3.tar.gz --- pysvn-1.6.2-fix-benchmark.patch DELETED --- From ravenoak at fedoraproject.org Fri Mar 6 05:19:10 2009 From: ravenoak at fedoraproject.org (Caitlyn O'Hanna) Date: Fri, 6 Mar 2009 05:19:10 +0000 (UTC) Subject: rpms/pysvn/F-9 pysvn.spec,1.5,1.6 Message-ID: <20090306051910.53F8370116@cvs1.fedora.phx.redhat.com> Author: ravenoak Update of /cvs/pkgs/rpms/pysvn/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13664 Modified Files: pysvn.spec Log Message: backport Index: pysvn.spec =================================================================== RCS file: /cvs/pkgs/rpms/pysvn/F-9/pysvn.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pysvn.spec 6 Mar 2009 04:58:18 -0000 1.5 +++ pysvn.spec 6 Mar 2009 05:18:39 -0000 1.6 @@ -2,7 +2,7 @@ Name: pysvn Version: 1.6.3 -Release: 1%{dist} +Release: 2%{dist} Summary: Pythonic style bindings for Subversion Group: Development/Languages License: ASL 1.1 @@ -25,6 +25,7 @@ %build pushd Source +%{__python} setup.py backport CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py configure --enable-debug --verbose --norpath --fixed-module-name # Set correct build flags %{__sed} -i -e 's/-Wall -fPIC -fexceptions -frtti/%{optflags} -fPIC -frtti/' Makefile @@ -52,6 +53,9 @@ %{python_sitearch}/%{name} %changelog +* Thu Mar 05 2009 Caitlyn O'Hanna - 1.6.3-2 +- added 'backport' command to setup + * Thu Mar 05 2009 Caitlyn O'Hanna - 1.6.3-1 - Update to 1.6.3, removed need of benchmark patch From dwheeler at fedoraproject.org Fri Mar 6 05:21:44 2009 From: dwheeler at fedoraproject.org (David A. Wheeler) Date: Fri, 6 Mar 2009 05:21:44 +0000 (UTC) Subject: rpms/stp/devel import.log, NONE, 1.1 stp-strcmp.patch, NONE, 1.1 stp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306052144.C052B70116@cvs1.fedora.phx.redhat.com> Author: dwheeler Update of /cvs/pkgs/rpms/stp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14180/devel Modified Files: .cvsignore sources Added Files: import.log stp-strcmp.patch stp.spec Log Message: * Mon Mar 3 2009 David A. Wheeler 0.1-2 - Fixed comments by Marcela Maslanova, mmaslano (at) redhat*DOT*com 2009-02-26 - Moved definitions of subpackages to "top" of spec before prep. - moved "check" before "files". - Use macro for release version 0.1-11-18-2008 for future updates. - No doc for -devel package; it's already in the base. - CPPFLAGS now includes optflags. * Mon Feb 23 2009 David A. Wheeler 0.1-1 - Initial packaging --- NEW FILE import.log --- stp-0_1-2_fc10:HEAD:stp-0.1-2.fc10.src.rpm:1236316519 stp-strcmp.patch: --- NEW FILE stp-strcmp.patch --- --- AST/ASTUtil.h.orig 2008-11-18 13:37:02.000000000 -0500 +++ AST/ASTUtil.h 2009-02-21 23:00:46.000000000 -0500 @@ -20,6 +20,8 @@ #include #endif +#include + using namespace std; namespace BEEV { #ifdef EXT_HASH_MAP --- NEW FILE stp.spec --- %global timestamp 11-18-2008 Name: stp Version: 0.1 Release: 2%{?dist} Summary: Constraint solver/decision procedure Group: Applications/Engineering License: MIT URL: http://sourceforge.net/projects/stp-fast-prover/ Source0: http://downloads.sourceforge.net/stp-fast-prover/stp-ver-%{version}-%{timestamp}.tgz # Minor patch to fix a missing #include for strcmp (modern g++ requires it) Patch1: stp-strcmp.patch # Note: This version does not support the SMT-LIB input format (the code # is not complete). The SourceForge SVN contains patches that # add SMT-LIB support. BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: bison BuildRequires: flex # Requires: %description STP (Simple Theorem Prover) is a constraint solver (also referred to as a decision procedure or automated prover) aimed at solving constraints generated by program analysis tools, theorem provers, automated bug finders, intelligent fuzzers and model checkers. STP has been used in many research projects at Stanford, Berkeley, MIT, CMU and other universities, as well as companies and government agencies. The input to STP are formulas over the theory of bit-vectors and arrays (This theory captures most expressions from languages like C/C++/Java and Verilog), and the output of STP is a single bit of information that indicates whether the formula is satisfiable or not. If the input is satisfiable, then it also generates a variable assignment to satisfy the input formula. Additional information can be found at: http://people.csail.mit.edu/vganesh/STP_files/stp.html %package devel Summary: Development files for STP constraint solver/decision procedure Group: Applications/Engineering Requires: %{name} = %{version}-%{release} Provides: %{name}-static = %{version}-%{release} # This "devel" package provides a static (not dynamic) library because: # 1. This is the normal usage mode when linking this as a library; # it's what upstream and existing programs that use this program expect. # 2. This speeds execution. In this library, speed matters. # There's a speed penalty for .so files, and this program is much # like a chess program - it's essentially an inner loop that searches # a massive space of possibilities. # A dynamic .so version could be create using: # gcc -shared -Wl,-soname,libstp.so.1 -o libstp.so.1.0.1 libstp.a # but this would require -fpic to compile (slowing the results). # See my document: # http://www.dwheeler.com/program-library/Program-Library-HOWTO/ %description devel Development files for the STP (Simple Theorem Prover), a constraint solver (also referred to as a decision procedure or automated prover). Provides a static library.>>>>>> 1.84 %prep %setup -q -n stp-ver-%{version}-%{timestamp} %patch1 %build # The true --libdir hack works around an rpmlint bug; this configure # doesn't accept a --libdir argument. We'll override LIB_DIR instead. ./configure --with-prefix=%{_prefix} ; true --libdir=%{_libdir} # DO NOT use _smp_mflags; build will fail. make -k CPPFLAGS="%{optflags} -Wno-deprecated" LIB_DIR=%{_libdir} all %check make regressall %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_includedir}/stp mkdir -p %{buildroot}%{_libdir} # This "make install" doesn't support DESTDIR=%{buildroot}. # We'll rig PREFIX/LIB_DIR, since that happens to work for this makefile. make install PREFIX=%{buildroot}%{_prefix} LIB_DIR=%{buildroot}%{_libdir} %clean rm -rf %{buildroot} # Note: Limit the files included in _libdir, or we'll accidentally # include the optional debugging files into the main package: # In the future, perhaps create a "-devel" package with: %files %defattr(-,root,root,-) %{_bindir}/* %doc README LICENSE %doc TALKS/* %doc PAPERS/* %doc web/* %files devel %defattr(-,root,root,-) %{_libdir}/libstp*.a %{_includedir}/stp/ %changelog * Mon Mar 3 2009 David A. Wheeler 0.1-2 - Fixed comments by Marcela Maslanova, mmaslano (at) redhat*DOT*com 2009-02-26 - Moved definitions of subpackages to "top" of spec before prep. - moved "check" before "files". - Use macro for release version 0.1-11-18-2008 for future updates. - No doc for -devel package; it's already in the base. - CPPFLAGS now includes optflags. * Mon Feb 23 2009 David A. Wheeler 0.1-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/stp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:16:24 -0000 1.1 +++ .cvsignore 6 Mar 2009 05:21:13 -0000 1.2 @@ -0,0 +1 @@ +stp-ver-0.1-11-18-2008.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/stp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:16:24 -0000 1.1 +++ sources 6 Mar 2009 05:21:13 -0000 1.2 @@ -0,0 +1 @@ +940fd698173a5a09ad0d15abdda083dd stp-ver-0.1-11-18-2008.tgz From ravenoak at fedoraproject.org Fri Mar 6 05:22:20 2009 From: ravenoak at fedoraproject.org (Caitlyn O'Hanna) Date: Fri, 6 Mar 2009 05:22:20 +0000 (UTC) Subject: rpms/pysvn/F-9 pysvn.spec,1.6,1.7 Message-ID: <20090306052220.E501270116@cvs1.fedora.phx.redhat.com> Author: ravenoak Update of /cvs/pkgs/rpms/pysvn/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14509 Modified Files: pysvn.spec Log Message: bump Index: pysvn.spec =================================================================== RCS file: /cvs/pkgs/rpms/pysvn/F-9/pysvn.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pysvn.spec 6 Mar 2009 05:18:39 -0000 1.6 +++ pysvn.spec 6 Mar 2009 05:21:50 -0000 1.7 @@ -2,7 +2,7 @@ Name: pysvn Version: 1.6.3 -Release: 2%{dist} +Release: 3%{dist} Summary: Pythonic style bindings for Subversion Group: Development/Languages License: ASL 1.1 @@ -53,6 +53,9 @@ %{python_sitearch}/%{name} %changelog +* Thu Mar 05 2009 Caitlyn O'Hanna - 1.6.3-3 +- Bump + * Thu Mar 05 2009 Caitlyn O'Hanna - 1.6.3-2 - added 'backport' command to setup From dwheeler at fedoraproject.org Fri Mar 6 05:24:55 2009 From: dwheeler at fedoraproject.org (David A. Wheeler) Date: Fri, 6 Mar 2009 05:24:55 +0000 (UTC) Subject: rpms/stp/F-10 import.log, NONE, 1.1 stp-strcmp.patch, NONE, 1.1 stp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306052455.E0CF970116@cvs1.fedora.phx.redhat.com> Author: dwheeler Update of /cvs/pkgs/rpms/stp/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15199/F-10 Modified Files: .cvsignore sources Added Files: import.log stp-strcmp.patch stp.spec Log Message: * Mon Mar 3 2009 David A. Wheeler 0.1-2 - Fixed comments by Marcela Maslanova, mmaslano (at) redhat*DOT*com 2009-02-26 - Moved definitions of subpackages to "top" of spec before prep. - moved "check" before "files". - Use macro for release version 0.1-11-18-2008 for future updates. - No doc for -devel package; it's already in the base. - CPPFLAGS now includes optflags. * Mon Feb 23 2009 David A. Wheeler 0.1-1 - Initial packaging --- NEW FILE import.log --- stp-0_1-2_fc10:F-10:stp-0.1-2.fc10.src.rpm:1236316685 stp-strcmp.patch: --- NEW FILE stp-strcmp.patch --- --- AST/ASTUtil.h.orig 2008-11-18 13:37:02.000000000 -0500 +++ AST/ASTUtil.h 2009-02-21 23:00:46.000000000 -0500 @@ -20,6 +20,8 @@ #include #endif +#include + using namespace std; namespace BEEV { #ifdef EXT_HASH_MAP --- NEW FILE stp.spec --- %global timestamp 11-18-2008 Name: stp Version: 0.1 Release: 2%{?dist} Summary: Constraint solver/decision procedure Group: Applications/Engineering License: MIT URL: http://sourceforge.net/projects/stp-fast-prover/ Source0: http://downloads.sourceforge.net/stp-fast-prover/stp-ver-%{version}-%{timestamp}.tgz # Minor patch to fix a missing #include for strcmp (modern g++ requires it) Patch1: stp-strcmp.patch # Note: This version does not support the SMT-LIB input format (the code # is not complete). The SourceForge SVN contains patches that # add SMT-LIB support. BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: bison BuildRequires: flex # Requires: %description STP (Simple Theorem Prover) is a constraint solver (also referred to as a decision procedure or automated prover) aimed at solving constraints generated by program analysis tools, theorem provers, automated bug finders, intelligent fuzzers and model checkers. STP has been used in many research projects at Stanford, Berkeley, MIT, CMU and other universities, as well as companies and government agencies. The input to STP are formulas over the theory of bit-vectors and arrays (This theory captures most expressions from languages like C/C++/Java and Verilog), and the output of STP is a single bit of information that indicates whether the formula is satisfiable or not. If the input is satisfiable, then it also generates a variable assignment to satisfy the input formula. Additional information can be found at: http://people.csail.mit.edu/vganesh/STP_files/stp.html %package devel Summary: Development files for STP constraint solver/decision procedure Group: Applications/Engineering Requires: %{name} = %{version}-%{release} Provides: %{name}-static = %{version}-%{release} # This "devel" package provides a static (not dynamic) library because: # 1. This is the normal usage mode when linking this as a library; # it's what upstream and existing programs that use this program expect. # 2. This speeds execution. In this library, speed matters. # There's a speed penalty for .so files, and this program is much # like a chess program - it's essentially an inner loop that searches # a massive space of possibilities. # A dynamic .so version could be create using: # gcc -shared -Wl,-soname,libstp.so.1 -o libstp.so.1.0.1 libstp.a # but this would require -fpic to compile (slowing the results). # See my document: # http://www.dwheeler.com/program-library/Program-Library-HOWTO/ %description devel Development files for the STP (Simple Theorem Prover), a constraint solver (also referred to as a decision procedure or automated prover). Provides a static library.>>>>>> 1.84 %prep %setup -q -n stp-ver-%{version}-%{timestamp} %patch1 %build # The true --libdir hack works around an rpmlint bug; this configure # doesn't accept a --libdir argument. We'll override LIB_DIR instead. ./configure --with-prefix=%{_prefix} ; true --libdir=%{_libdir} # DO NOT use _smp_mflags; build will fail. make -k CPPFLAGS="%{optflags} -Wno-deprecated" LIB_DIR=%{_libdir} all %check make regressall %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_includedir}/stp mkdir -p %{buildroot}%{_libdir} # This "make install" doesn't support DESTDIR=%{buildroot}. # We'll rig PREFIX/LIB_DIR, since that happens to work for this makefile. make install PREFIX=%{buildroot}%{_prefix} LIB_DIR=%{buildroot}%{_libdir} %clean rm -rf %{buildroot} # Note: Limit the files included in _libdir, or we'll accidentally # include the optional debugging files into the main package: # In the future, perhaps create a "-devel" package with: %files %defattr(-,root,root,-) %{_bindir}/* %doc README LICENSE %doc TALKS/* %doc PAPERS/* %doc web/* %files devel %defattr(-,root,root,-) %{_libdir}/libstp*.a %{_includedir}/stp/ %changelog * Mon Mar 3 2009 David A. Wheeler 0.1-2 - Fixed comments by Marcela Maslanova, mmaslano (at) redhat*DOT*com 2009-02-26 - Moved definitions of subpackages to "top" of spec before prep. - moved "check" before "files". - Use macro for release version 0.1-11-18-2008 for future updates. - No doc for -devel package; it's already in the base. - CPPFLAGS now includes optflags. * Mon Feb 23 2009 David A. Wheeler 0.1-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/stp/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:16:24 -0000 1.1 +++ .cvsignore 6 Mar 2009 05:24:25 -0000 1.2 @@ -0,0 +1 @@ +stp-ver-0.1-11-18-2008.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/stp/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:16:24 -0000 1.1 +++ sources 6 Mar 2009 05:24:25 -0000 1.2 @@ -0,0 +1 @@ +940fd698173a5a09ad0d15abdda083dd stp-ver-0.1-11-18-2008.tgz From cweyl at fedoraproject.org Fri Mar 6 05:35:05 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Fri, 6 Mar 2009 05:35:05 +0000 (UTC) Subject: rpms/perl-HTML-TagCloud/devel import.log, NONE, 1.1 perl-HTML-TagCloud.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306053505.0A5B570116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-HTML-TagCloud/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17448/devel Modified Files: .cvsignore sources Added Files: import.log perl-HTML-TagCloud.spec Log Message: initial import --- NEW FILE import.log --- perl-HTML-TagCloud-0_34-1_fc10:HEAD:perl-HTML-TagCloud-0.34-1.fc10.src.rpm:1236317663 --- NEW FILE perl-HTML-TagCloud.spec --- Name: perl-HTML-TagCloud Version: 0.34 Release: 1%{?dist} # lib/HTML/TagCloud.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Generate An HTML Tag Cloud Source: http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/HTML-TagCloud-%{version}.tar.gz Url: http://search.cpan.org/dist/HTML-TagCloud BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Module::Build::Compat) BuildRequires: perl(Test::More) # optional tests BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) %description The HTML::TagCloud module enables you to generate "tag clouds" in HTML. Tag clouds serve as a textual way to visualize terms and topics that are used most frequently. The tags are sorted alphabetically and a larger font is used to indicate more frequent term usage. This module provides a simple interface to generating a CSS-based HTML tag cloud. You simply pass in a set of tags, their URL and their count. This module outputs stylesheet-based HTML. You may use the included CSS or use your own. %prep %setup -q -n HTML-TagCloud-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Tue Mar 03 2009 Chris Weyl 0.34-1 - submission * Tue Mar 03 2009 Chris Weyl 0.34-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-TagCloud/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:56:14 -0000 1.1 +++ .cvsignore 6 Mar 2009 05:34:34 -0000 1.2 @@ -0,0 +1 @@ +HTML-TagCloud-0.34.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-TagCloud/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:56:14 -0000 1.1 +++ sources 6 Mar 2009 05:34:34 -0000 1.2 @@ -0,0 +1 @@ +095f3b1d5159cd1ef1d3dd240f566bb3 HTML-TagCloud-0.34.tar.gz From cweyl at fedoraproject.org Fri Mar 6 05:35:57 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Fri, 6 Mar 2009 05:35:57 +0000 (UTC) Subject: rpms/perl-HTML-TagCloud/F-10 import.log, NONE, 1.1 perl-HTML-TagCloud.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306053557.B311470116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-HTML-TagCloud/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17842/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-HTML-TagCloud.spec Log Message: initial import --- NEW FILE import.log --- perl-HTML-TagCloud-0_34-1_fc10:F-10:perl-HTML-TagCloud-0.34-1.fc10.src.rpm:1236317719 --- NEW FILE perl-HTML-TagCloud.spec --- Name: perl-HTML-TagCloud Version: 0.34 Release: 1%{?dist} # lib/HTML/TagCloud.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Generate An HTML Tag Cloud Source: http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/HTML-TagCloud-%{version}.tar.gz Url: http://search.cpan.org/dist/HTML-TagCloud BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Module::Build::Compat) BuildRequires: perl(Test::More) # optional tests BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) %description The HTML::TagCloud module enables you to generate "tag clouds" in HTML. Tag clouds serve as a textual way to visualize terms and topics that are used most frequently. The tags are sorted alphabetically and a larger font is used to indicate more frequent term usage. This module provides a simple interface to generating a CSS-based HTML tag cloud. You simply pass in a set of tags, their URL and their count. This module outputs stylesheet-based HTML. You may use the included CSS or use your own. %prep %setup -q -n HTML-TagCloud-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Tue Mar 03 2009 Chris Weyl 0.34-1 - submission * Tue Mar 03 2009 Chris Weyl 0.34-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-TagCloud/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:56:14 -0000 1.1 +++ .cvsignore 6 Mar 2009 05:35:27 -0000 1.2 @@ -0,0 +1 @@ +HTML-TagCloud-0.34.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-TagCloud/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:56:14 -0000 1.1 +++ sources 6 Mar 2009 05:35:27 -0000 1.2 @@ -0,0 +1 @@ +095f3b1d5159cd1ef1d3dd240f566bb3 HTML-TagCloud-0.34.tar.gz From ravenoak at fedoraproject.org Fri Mar 6 05:36:03 2009 From: ravenoak at fedoraproject.org (Caitlyn O'Hanna) Date: Fri, 6 Mar 2009 05:36:03 +0000 (UTC) Subject: rpms/pysvn/F-10 pysvn.spec, 1.4, 1.5 sources, 1.4, 1.5 pysvn-1.6.2-fix-benchmark.patch, 1.1, NONE Message-ID: <20090306053603.92AB070116@cvs1.fedora.phx.redhat.com> Author: ravenoak Update of /cvs/pkgs/rpms/pysvn/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17698 Modified Files: pysvn.spec sources Removed Files: pysvn-1.6.2-fix-benchmark.patch Log Message: Update to 1.6.3 Index: pysvn.spec =================================================================== RCS file: /cvs/pkgs/rpms/pysvn/F-10/pysvn.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pysvn.spec 28 Oct 2008 18:16:53 -0000 1.4 +++ pysvn.spec 6 Mar 2009 05:35:33 -0000 1.5 @@ -1,14 +1,13 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: pysvn -Version: 1.6.2 +Version: 1.6.3 Release: 1%{dist} Summary: Pythonic style bindings for Subversion Group: Development/Languages License: ASL 1.1 URL: http://pysvn.tigris.org/ Source0: http://pysvn.barrys-emacs.org/source_kits/%{name}-%{version}.tar.gz -Patch0: pysvn-1.6.2-fix-benchmark.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildRequires: PyXML @@ -23,10 +22,10 @@ %prep %setup -q -n %{name}-%{version} -%patch0 %build pushd Source +%{__python} setup.py backport CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py configure --enable-debug --verbose --norpath --fixed-module-name # Set correct build flags %{__sed} -i -e 's/-Wall -fPIC -fexceptions -frtti/%{optflags} -fPIC -frtti/' Makefile @@ -54,6 +53,9 @@ %{python_sitearch}/%{name} %changelog +* Thu Mar 05 2009 Caitlyn O'Hanna - 1.6.3-1 +- Update to 1.6.3, removed benchmark patch + * Tue Oct 28 2008 Caitlyn O'Hanna - 1.6.2-1 - Upstream to 1.6.2, upstream provided some build fixes to remove patches - (Thanks Barry!). Re-enabled testing with provided patch to fix whitespace Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pysvn/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Oct 2008 18:16:53 -0000 1.4 +++ sources 6 Mar 2009 05:35:33 -0000 1.5 @@ -1 +1 @@ -58bb216b815f3c05ed77f70708515355 pysvn-1.6.2.tar.gz +41d312ff09b05f7b53d3641a82c64c93 pysvn-1.6.3.tar.gz --- pysvn-1.6.2-fix-benchmark.patch DELETED --- From cweyl at fedoraproject.org Fri Mar 6 05:36:46 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Fri, 6 Mar 2009 05:36:46 +0000 (UTC) Subject: rpms/perl-HTML-TagCloud/F-9 import.log, NONE, 1.1 perl-HTML-TagCloud.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306053646.094E370116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-HTML-TagCloud/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18144/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-HTML-TagCloud.spec Log Message: initial import --- NEW FILE import.log --- perl-HTML-TagCloud-0_34-1_fc10:F-9:perl-HTML-TagCloud-0.34-1.fc10.src.rpm:1236317767 --- NEW FILE perl-HTML-TagCloud.spec --- Name: perl-HTML-TagCloud Version: 0.34 Release: 1%{?dist} # lib/HTML/TagCloud.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Generate An HTML Tag Cloud Source: http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/HTML-TagCloud-%{version}.tar.gz Url: http://search.cpan.org/dist/HTML-TagCloud BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Module::Build::Compat) BuildRequires: perl(Test::More) # optional tests BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) %description The HTML::TagCloud module enables you to generate "tag clouds" in HTML. Tag clouds serve as a textual way to visualize terms and topics that are used most frequently. The tags are sorted alphabetically and a larger font is used to indicate more frequent term usage. This module provides a simple interface to generating a CSS-based HTML tag cloud. You simply pass in a set of tags, their URL and their count. This module outputs stylesheet-based HTML. You may use the included CSS or use your own. %prep %setup -q -n HTML-TagCloud-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Tue Mar 03 2009 Chris Weyl 0.34-1 - submission * Tue Mar 03 2009 Chris Weyl 0.34-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-TagCloud/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:56:14 -0000 1.1 +++ .cvsignore 6 Mar 2009 05:36:15 -0000 1.2 @@ -0,0 +1 @@ +HTML-TagCloud-0.34.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-TagCloud/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:56:14 -0000 1.1 +++ sources 6 Mar 2009 05:36:15 -0000 1.2 @@ -0,0 +1 @@ +095f3b1d5159cd1ef1d3dd240f566bb3 HTML-TagCloud-0.34.tar.gz From cweyl at fedoraproject.org Fri Mar 6 05:37:29 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Fri, 6 Mar 2009 05:37:29 +0000 (UTC) Subject: rpms/perl-Text-Password-Pronounceable/devel import.log, NONE, 1.1 perl-Text-Password-Pronounceable.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306053729.A712270116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Text-Password-Pronounceable/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18505/devel Modified Files: .cvsignore sources Added Files: import.log perl-Text-Password-Pronounceable.spec Log Message: initial import --- NEW FILE import.log --- perl-Text-Password-Pronounceable-0_28-1_fc10:HEAD:perl-Text-Password-Pronounceable-0.28-1.fc10.src.rpm:1236317810 --- NEW FILE perl-Text-Password-Pronounceable.spec --- Name: perl-Text-Password-Pronounceable Version: 0.28 Release: 1%{?dist} # lib/Text/Password/Pronounceable.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Generate pronounceable passwords Source: http://search.cpan.org/CPAN/authors/id/C/CL/CLKAO/Text-Password-Pronounceable-%{version}.tar.gz Url: http://search.cpan.org/dist/Text-Password-Pronounceable BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) # testing BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) %description This module generates pronuceable passwords, based the the English digraphs by D. Edwards. %prep %setup -q -n Text-Password-Pronounceable-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Wed Mar 04 2009 Chris Weyl 0.28-1 - submission * Wed Mar 04 2009 Chris Weyl 0.28-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Password-Pronounceable/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:57:35 -0000 1.1 +++ .cvsignore 6 Mar 2009 05:36:58 -0000 1.2 @@ -0,0 +1 @@ +Text-Password-Pronounceable-0.28.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Password-Pronounceable/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:57:35 -0000 1.1 +++ sources 6 Mar 2009 05:36:59 -0000 1.2 @@ -0,0 +1 @@ +d6db4130b2c8e66f5d18f2c79af9ff31 Text-Password-Pronounceable-0.28.tar.gz From cweyl at fedoraproject.org Fri Mar 6 05:38:17 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Fri, 6 Mar 2009 05:38:17 +0000 (UTC) Subject: rpms/perl-Text-Password-Pronounceable/F-10 import.log, NONE, 1.1 perl-Text-Password-Pronounceable.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306053817.72AD070116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Text-Password-Pronounceable/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18940/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-Text-Password-Pronounceable.spec Log Message: initial import --- NEW FILE import.log --- perl-Text-Password-Pronounceable-0_28-1_fc10:F-10:perl-Text-Password-Pronounceable-0.28-1.fc10.src.rpm:1236317859 --- NEW FILE perl-Text-Password-Pronounceable.spec --- Name: perl-Text-Password-Pronounceable Version: 0.28 Release: 1%{?dist} # lib/Text/Password/Pronounceable.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Generate pronounceable passwords Source: http://search.cpan.org/CPAN/authors/id/C/CL/CLKAO/Text-Password-Pronounceable-%{version}.tar.gz Url: http://search.cpan.org/dist/Text-Password-Pronounceable BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) # testing BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) %description This module generates pronuceable passwords, based the the English digraphs by D. Edwards. %prep %setup -q -n Text-Password-Pronounceable-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Wed Mar 04 2009 Chris Weyl 0.28-1 - submission * Wed Mar 04 2009 Chris Weyl 0.28-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Password-Pronounceable/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:57:35 -0000 1.1 +++ .cvsignore 6 Mar 2009 05:37:46 -0000 1.2 @@ -0,0 +1 @@ +Text-Password-Pronounceable-0.28.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Password-Pronounceable/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:57:35 -0000 1.1 +++ sources 6 Mar 2009 05:37:47 -0000 1.2 @@ -0,0 +1 @@ +d6db4130b2c8e66f5d18f2c79af9ff31 Text-Password-Pronounceable-0.28.tar.gz From cweyl at fedoraproject.org Fri Mar 6 05:39:06 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Fri, 6 Mar 2009 05:39:06 +0000 (UTC) Subject: rpms/perl-Text-Password-Pronounceable/F-9 import.log, NONE, 1.1 perl-Text-Password-Pronounceable.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306053906.2DF6C70116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Text-Password-Pronounceable/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19345/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-Text-Password-Pronounceable.spec Log Message: initial import --- NEW FILE import.log --- perl-Text-Password-Pronounceable-0_28-1_fc10:F-9:perl-Text-Password-Pronounceable-0.28-1.fc10.src.rpm:1236317907 --- NEW FILE perl-Text-Password-Pronounceable.spec --- Name: perl-Text-Password-Pronounceable Version: 0.28 Release: 1%{?dist} # lib/Text/Password/Pronounceable.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Generate pronounceable passwords Source: http://search.cpan.org/CPAN/authors/id/C/CL/CLKAO/Text-Password-Pronounceable-%{version}.tar.gz Url: http://search.cpan.org/dist/Text-Password-Pronounceable BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) # testing BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) %description This module generates pronuceable passwords, based the the English digraphs by D. Edwards. %prep %setup -q -n Text-Password-Pronounceable-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Wed Mar 04 2009 Chris Weyl 0.28-1 - submission * Wed Mar 04 2009 Chris Weyl 0.28-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Password-Pronounceable/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:57:35 -0000 1.1 +++ .cvsignore 6 Mar 2009 05:38:35 -0000 1.2 @@ -0,0 +1 @@ +Text-Password-Pronounceable-0.28.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Password-Pronounceable/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:57:35 -0000 1.1 +++ sources 6 Mar 2009 05:38:35 -0000 1.2 @@ -0,0 +1 @@ +d6db4130b2c8e66f5d18f2c79af9ff31 Text-Password-Pronounceable-0.28.tar.gz From dwheeler at fedoraproject.org Fri Mar 6 05:41:38 2009 From: dwheeler at fedoraproject.org (David A. Wheeler) Date: Fri, 6 Mar 2009 05:41:38 +0000 (UTC) Subject: rpms/stp/devel stp.spec,1.1,1.2 Message-ID: <20090306054138.5AE6570116@cvs1.fedora.phx.redhat.com> Author: dwheeler Update of /cvs/pkgs/rpms/stp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20105 Modified Files: stp.spec Log Message: Modified spec so can rebuild in proper order on Fedora Index: stp.spec =================================================================== RCS file: /cvs/pkgs/rpms/stp/devel/stp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- stp.spec 6 Mar 2009 05:21:14 -0000 1.1 +++ stp.spec 6 Mar 2009 05:41:07 -0000 1.2 @@ -2,7 +2,7 @@ Name: stp Version: 0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Constraint solver/decision procedure Group: Applications/Engineering @@ -111,6 +111,9 @@ %{_includedir}/stp/ %changelog +* Mon Mar 6 2009 David A. Wheeler 0.1-3 +- Modified spec so can rebuild in proper order on Fedora + * Mon Mar 3 2009 David A. Wheeler 0.1-2 - Fixed comments by Marcela Maslanova, mmaslano (at) redhat*DOT*com 2009-02-26 - Moved definitions of subpackages to "top" of spec before prep. From glommer at fedoraproject.org Fri Mar 6 05:45:13 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Fri, 6 Mar 2009 05:45:13 +0000 (UTC) Subject: rpms/bochs-bios/devel dead.package, NONE, 1.1 bochs-bios-0001_bx-qemu.patch, 1.1, NONE bochs-bios-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch, 1.1, NONE bochs-bios-0003_kvm-bios-generate-mptable-unconditionally.patch, 1.1, NONE bochs-bios-0004_kvm-bios-add-mtrr-support.patch, 1.1, NONE bochs-bios-0005_kvm-bios-smp-mtrr-support.patch, 1.1, NONE bochs-bios-0006_kvm-bios-extend-mtrrs-to-above-4g.patch, 1.1, NONE bochs-bios-0007_kvm-bios-cleanup-consolidate-above-4g-memory-parsing.patch, 1.1, NONE bochs-bios-0008_kvm-bios-switch-mtrrs-to-cover-only-the-pci-range-and--default-to-wb.patch, 1.1, NONE bochs-bios-0009_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch, 1.1, NONE bochs-bios-0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch, 1.1, NONE bochs-bios.spec, 1.3, NONE sources, 1.2, NONE Message-ID: <20090306054513.498D570116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/bochs-bios/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21152 Added Files: dead.package Removed Files: bochs-bios-0001_bx-qemu.patch bochs-bios-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch bochs-bios-0003_kvm-bios-generate-mptable-unconditionally.patch bochs-bios-0004_kvm-bios-add-mtrr-support.patch bochs-bios-0005_kvm-bios-smp-mtrr-support.patch bochs-bios-0006_kvm-bios-extend-mtrrs-to-above-4g.patch bochs-bios-0007_kvm-bios-cleanup-consolidate-above-4g-memory-parsing.patch bochs-bios-0008_kvm-bios-switch-mtrrs-to-cover-only-the-pci-range-and--default-to-wb.patch bochs-bios-0009_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch bochs-bios-0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch bochs-bios.spec sources Log Message: bochs now provides this. --- NEW FILE dead.package --- due to koji's recent noarch subpackage feature, we can now build this from the bochs package. --- bochs-bios-0001_bx-qemu.patch DELETED --- --- bochs-bios-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch DELETED --- --- bochs-bios-0003_kvm-bios-generate-mptable-unconditionally.patch DELETED --- --- bochs-bios-0004_kvm-bios-add-mtrr-support.patch DELETED --- --- bochs-bios-0005_kvm-bios-smp-mtrr-support.patch DELETED --- --- bochs-bios-0006_kvm-bios-extend-mtrrs-to-above-4g.patch DELETED --- --- bochs-bios-0007_kvm-bios-cleanup-consolidate-above-4g-memory-parsing.patch DELETED --- --- bochs-bios-0008_kvm-bios-switch-mtrrs-to-cover-only-the-pci-range-and--default-to-wb.patch DELETED --- --- bochs-bios-0009_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch DELETED --- --- bochs-bios-0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch DELETED --- --- bochs-bios.spec DELETED --- --- sources DELETED --- From dwheeler at fedoraproject.org Fri Mar 6 05:45:17 2009 From: dwheeler at fedoraproject.org (David A. Wheeler) Date: Fri, 6 Mar 2009 05:45:17 +0000 (UTC) Subject: rpms/stp/devel stp.spec,1.2,1.3 Message-ID: <20090306054517.D504D70116@cvs1.fedora.phx.redhat.com> Author: dwheeler Update of /cvs/pkgs/rpms/stp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21114 Modified Files: stp.spec Log Message: Re-sync with CVS Index: stp.spec =================================================================== RCS file: /cvs/pkgs/rpms/stp/devel/stp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stp.spec 6 Mar 2009 05:41:07 -0000 1.2 +++ stp.spec 6 Mar 2009 05:44:47 -0000 1.3 @@ -111,6 +111,9 @@ %{_includedir}/stp/ %changelog +* Mon Mar 6 2009 David A. Wheeler 0.1-4 +- Re-sync with CVS + * Mon Mar 6 2009 David A. Wheeler 0.1-3 - Modified spec so can rebuild in proper order on Fedora From dwheeler at fedoraproject.org Fri Mar 6 05:46:29 2009 From: dwheeler at fedoraproject.org (David A. Wheeler) Date: Fri, 6 Mar 2009 05:46:29 +0000 (UTC) Subject: rpms/stp/devel stp.spec,1.3,1.4 Message-ID: <20090306054629.1E8D670116@cvs1.fedora.phx.redhat.com> Author: dwheeler Update of /cvs/pkgs/rpms/stp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21362 Modified Files: stp.spec Log Message: Re-sync with CVS Index: stp.spec =================================================================== RCS file: /cvs/pkgs/rpms/stp/devel/stp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- stp.spec 6 Mar 2009 05:44:47 -0000 1.3 +++ stp.spec 6 Mar 2009 05:45:58 -0000 1.4 @@ -2,7 +2,7 @@ Name: stp Version: 0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Constraint solver/decision procedure Group: Applications/Engineering From glommer at fedoraproject.org Fri Mar 6 05:49:22 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Fri, 6 Mar 2009 05:49:22 +0000 (UTC) Subject: rpms/bochs/devel bochs.spec,1.39,1.40 Message-ID: <20090306054922.E96E370116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/bochs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21949 Modified Files: bochs.spec Log Message: provides/obsoletes bochs-bios data. Index: bochs.spec =================================================================== RCS file: /cvs/pkgs/rpms/bochs/devel/bochs.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- bochs.spec 5 Mar 2009 17:42:27 -0000 1.39 +++ bochs.spec 6 Mar 2009 05:48:52 -0000 1.40 @@ -1,7 +1,7 @@ %define githead 04387139e3b Name: bochs Version: 2.3.8 -Release: 0.3.git%{githead}%{?dist} +Release: 0.4.git%{githead}%{?dist} Summary: Portable x86 PC emulator Group: Applications/Emulators License: LGPLv2+ @@ -75,6 +75,8 @@ Summary: Bochs bios Group: Applications/Emulators BuildArch: noarch +Provides: bochs-bios-data >= 2.3.8 +Obsoletes: bochs-bios-data < 2.3.9 %description bios @@ -201,6 +203,10 @@ %changelog +* Fri Mar 06 2009 Glauber Costa 2.3.8-0.4.git04387139e3b +- Provide and Obsolete bochs-bios-data to make sure no one is harmed during + updates. + * Thu Mar 05 2009 Glauber Costa 2.3.8-0.3.git04387139e3b - added patches ;-) From ravenoak at fedoraproject.org Fri Mar 6 05:53:02 2009 From: ravenoak at fedoraproject.org (Caitlyn O'Hanna) Date: Fri, 6 Mar 2009 05:53:02 +0000 (UTC) Subject: rpms/pysvn/F-10 pysvn.spec,1.5,1.6 Message-ID: <20090306055302.24C1870116@cvs1.fedora.phx.redhat.com> Author: ravenoak Update of /cvs/pkgs/rpms/pysvn/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22756 Modified Files: pysvn.spec Log Message: Hmmm...why is this failing the tests? Index: pysvn.spec =================================================================== RCS file: /cvs/pkgs/rpms/pysvn/F-10/pysvn.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pysvn.spec 6 Mar 2009 05:35:33 -0000 1.5 +++ pysvn.spec 6 Mar 2009 05:52:31 -0000 1.6 @@ -2,7 +2,7 @@ Name: pysvn Version: 1.6.3 -Release: 1%{dist} +Release: 2%{dist} Summary: Pythonic style bindings for Subversion Group: Development/Languages License: ASL 1.1 @@ -25,7 +25,7 @@ %build pushd Source -%{__python} setup.py backport +#%{__python} setup.py backport CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py configure --enable-debug --verbose --norpath --fixed-module-name # Set correct build flags %{__sed} -i -e 's/-Wall -fPIC -fexceptions -frtti/%{optflags} -fPIC -frtti/' Makefile @@ -53,7 +53,7 @@ %{python_sitearch}/%{name} %changelog -* Thu Mar 05 2009 Caitlyn O'Hanna - 1.6.3-1 +* Thu Mar 05 2009 Caitlyn O'Hanna - 1.6.3-2 - Update to 1.6.3, removed benchmark patch * Tue Oct 28 2008 Caitlyn O'Hanna - 1.6.2-1 From pkgdb at fedoraproject.org Fri Mar 6 05:53:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 05:53:50 +0000 Subject: [pkgdb] rosegarden4: oget has requested watchbugzilla Message-ID: <20090306055412.40239208543@bastion.fedora.phx.redhat.com> oget has requested the watchbugzilla acl on rosegarden4 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 05:54:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 05:54:13 +0000 Subject: [pkgdb] rosegarden4: oget has requested commit Message-ID: <20090306055413.48C39208546@bastion.fedora.phx.redhat.com> oget has requested the commit acl on rosegarden4 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 05:53:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 05:53:29 +0000 Subject: [pkgdb] rosegarden4: oget has requested approveacls Message-ID: <20090306055415.CCF49208548@bastion.fedora.phx.redhat.com> oget has requested the approveacls acl on rosegarden4 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 05:54:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 05:54:18 +0000 Subject: [pkgdb] rosegarden4: oget has requested watchcommits Message-ID: <20090306055418.437F420854B@bastion.fedora.phx.redhat.com> oget has requested the watchcommits acl on rosegarden4 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 05:54:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 05:54:04 +0000 Subject: [pkgdb] rosegarden4: oget has requested watchbugzilla Message-ID: <20090306055425.8428320854E@bastion.fedora.phx.redhat.com> oget has requested the watchbugzilla acl on rosegarden4 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 05:53:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 05:53:40 +0000 Subject: [pkgdb] rosegarden4: oget has requested watchcommits Message-ID: <20090306055426.3E7A1208550@bastion.fedora.phx.redhat.com> oget has requested the watchcommits acl on rosegarden4 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 05:54:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 05:54:27 +0000 Subject: [pkgdb] rosegarden4: oget has requested commit Message-ID: <20090306055427.17061208551@bastion.fedora.phx.redhat.com> oget has requested the commit acl on rosegarden4 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 05:54:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 05:54:31 +0000 Subject: [pkgdb] rosegarden4: oget has requested approveacls Message-ID: <20090306055429.B86F8208554@bastion.fedora.phx.redhat.com> oget has requested the approveacls acl on rosegarden4 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From dwheeler at fedoraproject.org Fri Mar 6 05:56:28 2009 From: dwheeler at fedoraproject.org (David A. Wheeler) Date: Fri, 6 Mar 2009 05:56:28 +0000 (UTC) Subject: rpms/stp/F-10 stp.spec,1.1,1.2 Message-ID: <20090306055628.16EF470116@cvs1.fedora.phx.redhat.com> Author: dwheeler Update of /cvs/pkgs/rpms/stp/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23642 Modified Files: stp.spec Log Message: Modified spec so can rebuild in proper order on Fedora Index: stp.spec =================================================================== RCS file: /cvs/pkgs/rpms/stp/F-10/stp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- stp.spec 6 Mar 2009 05:24:25 -0000 1.1 +++ stp.spec 6 Mar 2009 05:55:57 -0000 1.2 @@ -2,7 +2,7 @@ Name: stp Version: 0.1 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Constraint solver/decision procedure Group: Applications/Engineering @@ -111,6 +111,12 @@ %{_includedir}/stp/ %changelog +* Mon Mar 6 2009 David A. Wheeler 0.1-4 +- Re-sync with CVS + +* Mon Mar 6 2009 David A. Wheeler 0.1-3 +- Modified spec so can rebuild in proper order on Fedora + * Mon Mar 3 2009 David A. Wheeler 0.1-2 - Fixed comments by Marcela Maslanova, mmaslano (at) redhat*DOT*com 2009-02-26 - Moved definitions of subpackages to "top" of spec before prep. From phuang at fedoraproject.org Fri Mar 6 06:28:41 2009 From: phuang at fedoraproject.org (Huang Peng) Date: Fri, 6 Mar 2009 06:28:41 +0000 (UTC) Subject: rpms/ibus/devel ibus.spec,1.51,1.52 Message-ID: <20090306062841.4650370116@cvs1.fedora.phx.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/ibus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29893 Modified Files: ibus.spec Log Message: Update to 1.1.0.20090306 Index: ibus.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- ibus.spec 2 Mar 2009 23:52:37 -0000 1.51 +++ ibus.spec 6 Mar 2009 06:28:10 -0000 1.52 @@ -1,9 +1,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?gtk_binary_version: %define gtk_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0)} -%define mod_path ibus-1.1 + +%define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999") +%define gconf2_version 2.12.0 +%define dbus_version 0.83.0 +%define im_chooser_version 1.2.5 + Name: ibus -Version: 1.1.0.20090225 -Release: 2%{?dist} +Version: 1.1.0.20090306 +Release: 1%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPLv2+ Group: System Environment/Libraries @@ -14,13 +19,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999") BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: python BuildRequires: gtk2-devel -BuildRequires: dbus-devel +BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils BuildRequires: gtk-doc @@ -30,17 +34,23 @@ Requires: %{name}-libs = %{version}-%{release} -Requires(post): desktop-file-utils -Requires(post): %{_sbindir}/alternatives -Requires(postun): desktop-file-utils -Requires(postun): %{_sbindir}/alternatives - Requires: pygtk2 -Requires: dbus-python >= 0.83.0 Requires: notification-daemon Requires: pyxdg Requires: iso-codes -Requires: im-chooser >= 1.2.5 +Requires: dbus-python >= %{dbus_version} +Requires: im-chooser >= %{im_chooser_version} +Requires: GConf2 >= %{gconf2_version} + +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils + +Requires(pre): GConf2 >= %{gconf2_version} +Requires(post): GConf2 >= %{gconf2_version} +Requires(preun): GConf2 >= %{gconf2_version} + +Requires(post): %{_sbindir}/alternatives +Requires(postun): %{_sbindir}/alternatives Obsoletes: ibus-qt < 1.1.0 @@ -55,6 +65,9 @@ Summary: IBus libraries Group: System Environment/Libraries +Requires: glib2 >= %{glib_ver} +Requires: dbus >= 1.2.4 + %description libs This package contains the libraries for IBus @@ -128,11 +141,20 @@ update-desktop-database -q %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 83 || : -%post libs -/sbin/ldconfig +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || : -%post gtk -%{_bindir}/update-gtk-immodules %{_host} || : +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || : +fi + +%preun +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || : +fi %postun update-desktop-database -q @@ -142,9 +164,15 @@ [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || : fi +%post libs +/sbin/ldconfig + %postun libs /sbin/ldconfig +%post gtk +%{_bindir}/update-gtk-immodules %{_host} || : + %postun gtk %{_bindir}/update-gtk-immodules %{_host} || : @@ -163,6 +191,7 @@ %{_libexecdir}/ibus-ui-gtk %{_libexecdir}/ibus-x11 # %{_sysconfdir}/xdg/autostart/ibus.desktop +%{_sysconfdir}/gconf/schemas/ibus.schemas %config %{_xinputconf} %files libs @@ -185,6 +214,9 @@ %{_libdir}/pkgconfig/* %changelog +* Fri Mar 6 2009 Huang Peng - 1.1.0.20090306-1 +- Update to ibus-1.1.0.20090306. + * Tue Mar 3 2009 Jens Petersen - use post for ibus-gtk requires glib2 From phuang at fedoraproject.org Fri Mar 6 06:34:17 2009 From: phuang at fedoraproject.org (Huang Peng) Date: Fri, 6 Mar 2009 06:34:17 +0000 (UTC) Subject: rpms/ibus/devel .cvsignore,1.24,1.25 sources,1.27,1.28 Message-ID: <20090306063417.D26EF70116@cvs1.fedora.phx.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/ibus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31076 Modified Files: .cvsignore sources Log Message: Upload ibus-1.1.0.20090306.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 25 Feb 2009 05:59:33 -0000 1.24 +++ .cvsignore 6 Mar 2009 06:33:47 -0000 1.25 @@ -1 +1 @@ -ibus-1.1.0.20090225.tar.gz +ibus-1.1.0.20090306.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 25 Feb 2009 05:59:33 -0000 1.27 +++ sources 6 Mar 2009 06:33:47 -0000 1.28 @@ -1 +1 @@ -7598bf629166770e49f89df383923726 ibus-1.1.0.20090225.tar.gz +f110926c2edde0cf4d81aafb75d55c8c ibus-1.1.0.20090306.tar.gz From mmaslano at fedoraproject.org Fri Mar 6 06:48:20 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Fri, 6 Mar 2009 06:48:20 +0000 (UTC) Subject: rpms/perl-Class-XSAccessor-Array/devel perl-Class-XSAccessor-Array.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306064820.DC43070116@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-Class-XSAccessor-Array/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1431 Modified Files: .cvsignore sources Added Files: perl-Class-XSAccessor-Array.spec Log Message: * Mon Mar 2 2009 Marcela Ma??l????ov?? 0.14-2 - add BR --- NEW FILE perl-Class-XSAccessor-Array.spec --- Name: perl-Class-XSAccessor-Array Version: 0.14 Release: 2%{?dist} Summary: Generate fast XS accessors without runtime compilation License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-XSAccessor-Array/ Source0: http://www.cpan.org/authors/id/S/SM/SMUELLER/Class-XSAccessor-Array-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(AutoXS::Header) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The module implements fast XS accessors both for getting at and setting an object attribute. Additionally, the module supports mutators and simple predicates (has_foo() like tests for definedness of an attributes). The module works only with objects that are implemented as arrays. Using it on hash-based objects is bound to make your life miserable. Refer to Class::XSAccessor for an implementation that works with hash-based objects. %prep %setup -q -n Class-XSAccessor-Array-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Class* %{_mandir}/man3/* %changelog * Mon Mar 2 2009 Marcela Ma??l????ov?? 0.14-2 - add BR * Thu Feb 26 2009 Marcela Ma??l????ov?? 0.14-1 - Specfile autogenerated by cpanspec 1.78. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-XSAccessor-Array/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:37:12 -0000 1.1 +++ .cvsignore 6 Mar 2009 06:47:50 -0000 1.2 @@ -0,0 +1 @@ +Class-XSAccessor-Array-0.14.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-XSAccessor-Array/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:37:12 -0000 1.1 +++ sources 6 Mar 2009 06:47:50 -0000 1.2 @@ -0,0 +1 @@ +fe97bdfbfdcfb37260a270d0d8bd4b36 Class-XSAccessor-Array-0.14.tar.gz From phuang at fedoraproject.org Fri Mar 6 06:52:59 2009 From: phuang at fedoraproject.org (Huang Peng) Date: Fri, 6 Mar 2009 06:52:59 +0000 (UTC) Subject: rpms/ibus/devel ibus.spec,1.52,1.53 Message-ID: <20090306065259.B1C1A70116@cvs1.fedora.phx.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/ibus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2548 Modified Files: ibus.spec Log Message: Fix BuildRequires and Requires errors. Index: ibus.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- ibus.spec 6 Mar 2009 06:28:10 -0000 1.52 +++ ibus.spec 6 Mar 2009 06:52:29 -0000 1.53 @@ -3,7 +3,7 @@ %define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999") %define gconf2_version 2.12.0 -%define dbus_version 0.83.0 +%define dbus_python_version 0.83.0 %define im_chooser_version 1.2.5 Name: ibus @@ -24,8 +24,8 @@ BuildRequires: libtool BuildRequires: python BuildRequires: gtk2-devel -BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel +BuildRequires: dbus-python-devel >= %{dbus_python_version} BuildRequires: desktop-file-utils BuildRequires: gtk-doc BuildRequires: GConf2-devel @@ -38,7 +38,7 @@ Requires: notification-daemon Requires: pyxdg Requires: iso-codes -Requires: dbus-python >= %{dbus_version} +Requires: dbus-python >= %{dbus_python_version} Requires: im-chooser >= %{im_chooser_version} Requires: GConf2 >= %{gconf2_version} From transif at fedoraproject.org Fri Mar 6 07:14:59 2009 From: transif at fedoraproject.org (Transifex System User) Date: Fri, 6 Mar 2009 07:14:59 +0000 (UTC) Subject: comps/po hu.po,1.16,1.17 Message-ID: <20090306071459.8F7E070116@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6867/po Modified Files: hu.po Log Message: 2009-03-06 Peter Sulyok (via peti at fedoraproject.org) * po/hu.po: Updated Hungarian translation Index: hu.po =================================================================== RCS file: /cvs/pkgs/comps/po/hu.po,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- hu.po 9 Jan 2009 11:52:37 -0000 1.16 +++ hu.po 6 Mar 2009 07:14:27 -0000 1.17 @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: comps-po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-22 15:50-0500\n" -"PO-Revision-Date: 2008-09-30 22:59+0200\n" +"POT-Creation-Date: 2009-03-06 05:51+0000\n" +"PO-Revision-Date: 2009-03-06 08:12+0100\n" "Last-Translator: Sulyok P??ter \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"Plural-Forms: nplurals=2; plural=(n!=1);" #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 #: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1 @@ -20,192 +20,192 @@ msgstr "K??nny??s??ly?? asztal k??rnyezet, ami gyeng??bb g??peken is j??l haszn??lhat??." #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 -#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1 +#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1 #: ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "Adminisztr??ci??s eszk??z??k" #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 -#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 +#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4 msgid "Afrikaans Support" msgstr "Afrik??n (D??l-Afrika-i holland) t??mogat??s" #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 -#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4 +#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5 msgid "Albanian Support" msgstr "Alb??n t??mogat??s" #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 -#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2 +#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2 #: ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "Alkalmaz??sok" #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 -#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 +#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 msgid "Applications to perform a variety of tasks" msgstr "Alkalmaz??sok sz??mos feladathoz" #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 -#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4 +#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4 #: ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "Arab t??mogat??s" #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 -#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5 +#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5 #: ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "??rm??ny t??mogat??s" #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9 -#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 +#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 msgid "Assamese Support" msgstr "Assz??m (India) t??mogat??s" #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10 -#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6 +#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6 #: ../comps-el5.xml.in.h:6 msgid "Authoring and Publishing" msgstr "??r?? ??s kiad??" #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11 -#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 +#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 msgid "Base" msgstr "Alap" #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12 -#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7 +#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7 #: ../comps-el5.xml.in.h:7 msgid "Base System" msgstr "Alaprendszer" #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13 -#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 +#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15 msgid "Basic support for the Ruby programming language." msgstr "Alapszint?? t??mogat??s a ruby programoz??si nyelvhez." #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14 -#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15 +#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16 msgid "Basque Support" msgstr "Baszk t??mogat??s" #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15 -#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16 +#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17 msgid "Belarusian Support" msgstr "Feh??rorosz t??mogat??s" #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16 -#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17 +#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18 msgid "Bengali Support" msgstr "Beng??li t??mogat??s" #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17 -#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18 +#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19 msgid "Bhutanese Support" msgstr "But??ni t??mogat??s" #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18 -#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19 +#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20 msgid "Bosnian Support" msgstr "Bosny??k t??mogat??s" #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19 -#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20 +#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21 msgid "Brazilian Portuguese Support" msgstr "Braz??liai portug??l t??mogat??s" #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20 -#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21 +#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22 msgid "Breton Support" msgstr "Breton t??mogat??s" #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22 -#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23 +#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24 msgid "Bulgarian Support" msgstr "Bolg??r t??mogat??s" #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23 -#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24 +#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25 msgid "Catalan Support" msgstr "Katal??n t??mogat??s" #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24 -#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25 +#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26 msgid "Chinese Support" msgstr "K??nai t??mogat??s" #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25 -#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26 +#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27 msgid "Clustering" msgstr "F??rt??z??s" #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26 -#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27 +#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28 msgid "Clustering Support" msgstr "F??rt??z??s t??mogat??s" #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27 -#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28 +#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29 msgid "Core" msgstr "Mag" #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28 -#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29 +#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 msgid "Croatian Support" msgstr "Horv??t t??mogat??s" #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29 -#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 ../comps-el5.xml.in.h:8 +#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8 msgid "Czech Support" msgstr "Cseh t??mogat??s" #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30 -#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 +#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32 msgid "DNS Name Server" msgstr "DNS n??vkiszolg??l??" #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31 -#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32 +#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 msgid "Danish Support" msgstr "D??n t??mogat??s" #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32 -#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 ../comps-el4.xml.in.h:8 +#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8 #: ../comps-el5.xml.in.h:9 msgid "Desktop Environments" msgstr "Asztal k??rnyezetek" #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33 -#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:9 +#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9 #: ../comps-el5.xml.in.h:10 msgid "Desktop environments" msgstr "Asztal k??rnyezetek" #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34 -#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:10 +#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10 #: ../comps-el5.xml.in.h:11 msgid "Development" msgstr "Fejleszt??s" #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35 -#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36 +#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38 msgid "Development Libraries" msgstr "Fejleszt?? programk??nyvt??rak" #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36 -#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:11 +#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11 #: ../comps-el5.xml.in.h:12 msgid "Development Tools" msgstr "Fejleszt??eszk??z??k" #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37 -#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38 +#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40 msgid "Dial-up Networking Support" msgstr "Telefonos h??l??zat t??mogat??sa" #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38 -#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39 +#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41 msgid "Dutch Support" msgstr "Holland t??mogat??s" @@ -214,78 +214,78 @@ msgstr "Eclipse" #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39 -#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:13 +#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13 #: ../comps-el5.xml.in.h:14 msgid "Editors" msgstr "Szerkeszt??k" #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40 -#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:14 +#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14 #: ../comps-el5.xml.in.h:15 msgid "Educational Software" msgstr "Oktat??programok" #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41 -#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:15 +#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15 #: ../comps-el5.xml.in.h:16 msgid "Educational software for learning" msgstr "Oktat??programok tanul??shoz" #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42 -#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:16 +#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16 #: ../comps-el5.xml.in.h:17 msgid "Engineering and Scientific" msgstr "Technika ??s tudom??ny" #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43 -#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44 +#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47 msgid "English (UK) Support" msgstr "Angol (UK) t??mogat??s" #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45 -#: ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46 +#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49 msgid "Estonian Support" msgstr "??szt t??mogat??s" #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46 -#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47 +#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50 msgid "Ethiopic Support" msgstr "Eti??p t??mogat??s" #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47 -#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48 ../comps-el4.xml.in.h:17 +#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17 #: ../comps-el5.xml.in.h:18 msgid "FTP Server" msgstr "FTP-kiszolg??l??" #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48 -#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49 +#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52 msgid "Faeroese Support" msgstr "Fer??eri t??mogat??s" #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50 -#: ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:18 +#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18 #: ../comps-el5.xml.in.h:19 msgid "Fedora Packager" msgstr "Fedora csomagol??" #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51 -#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52 +#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55 msgid "Filipino Support" msgstr "Filipin?? (F??l??p-szk.) t??mogat??s" #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52 -#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53 +#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56 msgid "Finnish Support" msgstr "Finn t??mogat??s" #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55 -#: ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:57 +#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 msgid "French Support" msgstr "Francia t??mogat??s" #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56 -#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 ../comps-el4.xml.in.h:19 +#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19 #: ../comps-el5.xml.in.h:20 msgid "" "From CD recording to playing audio CDs and multimedia files, this package " @@ -295,19 +295,19 @@ "csomagcsoport hanggal ??s vide??val kapcsolatos programokat tartalmaz." #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57 -#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:20 +#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20 #: ../comps-el5.xml.in.h:21 msgid "GNOME Desktop Environment" msgstr "GNOME asztal k??rnyezet" #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58 -#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:21 +#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21 #: ../comps-el5.xml.in.h:22 msgid "GNOME Software Development" msgstr "GNOME szoftverfejleszt??s" #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59 -#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63 +#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66 msgid "" "GNOME is a powerful graphical user interface which includes a panel, " "desktop, system icons, and a graphical file manager." @@ -316,86 +316,86 @@ "rendszerikonokkal ??s grafikus f??jlkezel??vel." #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60 -#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64 +#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67 msgid "Gaelic Support" msgstr "G??lik (??ro. ??s Sk??cia) t??mogat??s" #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61 -#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65 +#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68 msgid "Galician Support" msgstr "Gal??ciai (Spanyolo.) t??mogat??s" #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62 -#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66 ../comps-el5.xml.in.h:24 +#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24 msgid "Games and Entertainment" msgstr "J??t??kok ??s sz??rakoz??s" #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63 -#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67 +#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70 msgid "Georgian Support" msgstr "Gr??z t??mogat??s" #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64 -#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68 +#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71 msgid "German Support" msgstr "N??met t??mogat??s" #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65 -#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:23 +#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23 #: ../comps-el5.xml.in.h:25 msgid "Graphical Internet" msgstr "Grafikus Internet" #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66 -#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:24 +#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24 #: ../comps-el5.xml.in.h:26 msgid "Graphics" msgstr "Grafika" #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67 -#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71 +#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74 msgid "Greek Support" msgstr "G??r??g t??mogat??s" #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68 -#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72 +#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75 msgid "Gujarati Support" msgstr "Gudzsarati (India) t??mogat??s" #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69 -#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:25 +#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25 #: ../comps-el5.xml.in.h:27 msgid "Hardware Support" msgstr "Hardvert??mogat??s" #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70 -#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75 ../comps-el4.xml.in.h:26 +#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26 #: ../comps-el5.xml.in.h:28 msgid "Hebrew Support" msgstr "H??ber t??mogat??s" #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71 -#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76 +#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79 msgid "Hindi Support" msgstr "Hindi (India) t??mogat??s" #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72 -#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77 +#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80 msgid "Hungarian Support" msgstr "Magyar t??mogat??s" #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73 -#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78 +#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81 msgid "Icelandic Support" msgstr "Izlandi t??mogat??s" #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74 -#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79 +#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82 msgid "Indonesian Support" msgstr "Indon??z t??mogat??s" #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75 -#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:27 +#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27 #: ../comps-el5.xml.in.h:29 msgid "" "Install these packages in order to develop GTK+ and GNOME graphical " @@ -404,7 +404,7 @@ "Telep??tse e csomagokat GTK+ ??s GNOME grafikus alkalmaz??sok fejleszt??s??hez!" #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76 -#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83 +#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86 msgid "" "Install these packages in order to develop GTK+ and XFCE graphical " "applications." @@ -412,20 +412,20 @@ "Telep??tse e csomagokat GTK+ ??s XFCE grafikus alkalmaz??sok fejleszt??s??hez!" #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77 -#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84 ../comps-el4.xml.in.h:28 +#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28 #: ../comps-el5.xml.in.h:30 msgid "Install these packages to develop QT and KDE graphical applications." msgstr "Telep??tse e csomagokat QT ??s KDE grafikus alkalmaz??sok fejleszt??s??hez!" #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78 -#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85 +#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88 msgid "" "Install these tools to enable the system to print or act as a print server." msgstr "" "Telep??tse e csomagokat nyomtat??shoz ??s nyomtat??kiszolg??l?? kialak??t??s??hoz!" #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79 -#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../comps-el4.xml.in.h:29 +#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29 #: ../comps-el5.xml.in.h:31 msgid "" "Install this group of packages to use the base graphical (X) user interface." @@ -433,50 +433,50 @@ "Telep??tse e csomagok csoportj??t alap grafikus (X) fel??let haszn??lat??hoz!" #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81 -#: ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:88 +#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91 msgid "Inuktitut Support" msgstr "Inuit t??mogat??s" #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82 -#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89 +#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92 msgid "Irish Support" msgstr "??r t??mogat??s" #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83 -#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90 +#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93 msgid "Italian Support" msgstr "Olasz t??mogat??s" #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84 -#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91 ../comps-el4.xml.in.h:30 +#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30 #: ../comps-el5.xml.in.h:32 msgid "Japanese Support" msgstr "Jap??n t??mogat??s" #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85 -#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:31 +#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31 msgid "Java" msgstr "Java" #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86 -#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:32 +#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32 msgid "Java Development" msgstr "Java fejleszt??s" #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87 -#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:33 +#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33 #: ../comps-el5.xml.in.h:33 msgid "KDE (K Desktop Environment)" msgstr "KDE (K asztal k??rnyezet)" #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88 -#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34 +#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34 #: ../comps-el5.xml.in.h:34 msgid "KDE Software Development" msgstr "KDE szoftverfejleszt??s" #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89 -#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96 +#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99 msgid "" "KDE is a powerful graphical user interface which includes a panel, desktop, " "system icons, and a graphical file manager." @@ -485,121 +485,121 @@ "rendszerikonokkal ??s grafikus f??jlkezel??vel." #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90 -#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97 +#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100 msgid "Kannada Support" msgstr "Kanada (India) t??mogat??s" #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92 -#: ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100 +#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103 msgid "Khmer Support" msgstr "Kmer (Kambodzsa) t??mogat??s" #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93 -#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103 +#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106 msgid "Korean Support" msgstr "Koreai t??mogat??s" #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95 -#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106 +#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109 msgid "Languages" msgstr "Nyelvek" #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96 -#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107 +#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110 msgid "Lao Support" msgstr "Laoszi t??mogat??s" #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97 -#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108 +#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111 msgid "Latvian Support" msgstr "Lett t??mogat??s" #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99 -#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110 +#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113 msgid "Legacy Network Server" msgstr "H??l??zat kiszolg??l?? ??r??ks??g" #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100 -#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111 +#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114 msgid "Legacy Software Development" msgstr "Szoftverfejleszt??s ??r??ks??g" #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101 -#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112 +#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115 msgid "Legacy Software Support" msgstr "??r??ks??g szoftvert??mogat??s" #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102 -#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113 +#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116 msgid "Lithuanian Support" msgstr "Litv??n t??mogat??s" #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105 -#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116 +#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36 msgid "Mail Server" msgstr "Levelez?? kiszolg??l??" #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106 -#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119 +#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122 msgid "Malay Support" msgstr "Mal??j t??mogat??s" #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107 -#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120 +#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123 msgid "Malayalam Support" msgstr "Malajalam (India) t??mogat??s" #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108 -#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121 +#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124 msgid "Maori Support" msgstr "Maori t??mogat??s" #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109 -#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122 +#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125 msgid "Marathi Support" msgstr "Marati (India) t??mogat??s" #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111 -#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124 +#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:127 msgid "MySQL Database" msgstr "MySQL adatb??zis" #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113 -#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127 +#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:130 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37 msgid "Network Servers" msgstr "H??l??zat kiszolg??l??k" #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114 -#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128 +#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:131 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38 msgid "News Server" msgstr "H??rkiszolg??l??" #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116 -#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130 +#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:133 msgid "Northern Sotho Support" msgstr "??szak-szot?? (D??l-Afrika) t??mogat??s" #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117 -#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131 +#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:134 msgid "Norwegian Support" msgstr "Norv??g t??mogat??s" #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118 -#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133 +#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:136 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39 msgid "Office/Productivity" msgstr "Iroda/termel??kenys??g" #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120 -#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135 +#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:139 msgid "Oriya Support" msgstr "Orija (India) t??mogat??s" #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121 -#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136 +#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:140 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40 msgid "" "Packages which provide functionality for developing and building " @@ -607,73 +607,73 @@ msgstr "Alkalmaz??sok fejleszt??s??t ??s ??p??t??s??t biztos??t?? csomagok." #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122 -#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137 +#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:141 msgid "Persian Support" msgstr "Perzsa t??mogat??s" #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123 -#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138 +#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:142 msgid "Polish Support" msgstr "Lengyel t??mogat??s" #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124 -#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139 +#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:143 msgid "Portuguese Support" msgstr "Portug??l t??mogat??s" #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125 -#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140 +#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:144 msgid "PostgreSQL Database" msgstr "PostgreSQL adatb??zis" #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126 -#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141 +#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:145 msgid "Printing Support" msgstr "Nyomtat??s t??mogat??s" #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127 -#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142 +#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:146 msgid "Punjabi Support" msgstr "Pandzsab (India/Pakiszt??n) t??mogat??s" #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128 -#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143 +#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:147 msgid "Romanian Support" msgstr "Rom??n t??mogat??s" #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129 -#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144 +#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:148 msgid "Ruby" msgstr "Ruby" #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130 -#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145 +#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:149 msgid "Russian Support" msgstr "Orosz t??mogat??s" #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133 -#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148 +#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:151 msgid "Samoan Support" msgstr "Szamoai t??mogat??s" #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134 -#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149 +#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:152 msgid "Serbian Support" msgstr "Szerb t??mogat??s" #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135 -#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150 +#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:153 msgid "Server Configuration Tools" msgstr "Kiszolg??l??be??ll??t?? eszk??z??k" #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136 -#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151 +#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:154 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41 msgid "Servers" msgstr "Kiszolg??l??k" #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137 -#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152 +#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:155 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42 msgid "" "Simple window managers that aren't part of a larger desktop environment." @@ -681,38 +681,38 @@ "Egyszer?? ablakkezel??k, amelyek nem r??szei egy nagyobb asztali k??rnyezetnek." #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138 -#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154 +#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:157 msgid "Sinhala Support" msgstr "Szinala (Sri Lanka) t??mogat??s" #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139 -#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155 +#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:158 msgid "Slovak Support" msgstr "Szlov??k t??mogat??s" #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140 -#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156 +#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:159 msgid "Slovenian Support" msgstr "Szlov??n t??mogat??s" #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141 -#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157 +#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:160 msgid "Smallest possible installation" msgstr "Lehets??ges legkisebb telep??t??s" #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142 -#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158 +#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:161 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43 msgid "Software used for running network servers" msgstr "H??l??zat kiszolg??l??k futtat??s??hoz haszn??lt szoftver" #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143 -#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159 +#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:162 msgid "Somali Support" msgstr "Szom??li t??mogat??s" #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144 -#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160 +#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:163 msgid "" "Sometimes called text editors, these are programs that allow you to create " "and edit text files. This includes Emacs and Vi." @@ -722,77 +722,77 @@ "??s a Vi is." #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145 -#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161 +#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:164 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45 msgid "Sound and Video" msgstr "Hang ??s vide??" #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146 -#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162 +#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:165 msgid "Southern Ndebele Support" msgstr "D??l-ndebelei (Zimbabve) t??mogat??s" #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147 -#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163 +#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:166 msgid "Southern Sotho Support" msgstr "D??l-szot?? (D??l-Afrika) t??mogat??s" #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148 -#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164 +#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:167 msgid "Spanish Support" msgstr "Spanyol t??mogat??s" #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149 -#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166 +#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:169 #: ../comps-el4.xml.in.h:46 msgid "Support for developing programs in the Java programming language." msgstr "T??mogat??s a Java programnyelven t??rt??n?? programok fejleszt??s??hez." #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150 -#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167 +#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:170 #: ../comps-el4.xml.in.h:47 msgid "Support for running programs written in the Java programming language." msgstr "T??mogat??s a Java programnyelven ??rt programok futtat??s??hoz." #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151 -#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168 +#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:171 msgid "Swati Support" msgstr "Szvati (Pakiszt??n) t??mogat??s" #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152 -#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169 +#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:172 msgid "Swedish Support" msgstr "Sv??d t??mogat??s" #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153 -#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170 +#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:173 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46 msgid "System Tools" msgstr "Rendszereszk??z??k" #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154 -#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171 +#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:174 msgid "Tagalog Support" msgstr "Tagalog (F??l??p-szk.) t??mogat??s" #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155 -#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173 +#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:176 msgid "Tamil Support" msgstr "Tamil (India/Sri Lanka) t??mogat??s" #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156 -#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174 +#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:177 msgid "Telugu Support" msgstr "Telugu (India) t??mogat??s" #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157 -#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175 +#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:178 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47 msgid "Text-based Internet" msgstr "Sz??veg-alap?? internet" #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158 -#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176 +#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:179 msgid "Thai Support" msgstr "T??j t??mogat??s" @@ -801,7 +801,7 @@ msgstr "Az Eclipse integr??lt fejleszt??k??rnyezet." #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159 -#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177 +#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:180 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49 msgid "The applications include office suites, PDF viewers, and more." msgstr "" @@ -809,7 +809,7 @@ "tartalmaznak." #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160 -#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178 +#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:181 msgid "" "The packages in this group are core libraries needed to develop applications." msgstr "" @@ -817,34 +817,34 @@ "tartalmaznak." #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161 -#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179 +#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:182 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50 msgid "These packages allow you to configure an IMAP or SMTP mail server." msgstr "" "Ezek a csomagok IMAP ??s SMTP levelez?? kiszolg??l??k be??ll??t??s??hoz sz??ks??gesek." #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162 -#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180 +#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:183 msgid "" "These packages allow you to develop applications for the X Window System." msgstr "E csomagok X Window System alkalmaz??sok fejleszt??s??hez sz??ks??gesek." #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163 -#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181 +#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:184 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51 msgid "" "These packages are helpful when developing web applications or web pages." msgstr "E csomagok webes alkalmaz??sok ??s weblapok fejleszt??s??hez haszn??lhat??k." #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164 -#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182 +#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:185 msgid "" "These packages include network-based servers such as DHCP, Kerberos and NIS." msgstr "" "E csomagokban h??l??zat kiszolg??l??k vannak (p??ld??ul DHCP, Kerberos ??s NIS)." #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165 -#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183 +#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:186 msgid "" "These packages include servers for old network protocols such as rsh and " "telnet." @@ -853,19 +853,19 @@ "vannak." #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166 -#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184 +#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:187 msgid "These packages provide a virtualization environment." msgstr "E csomagok virtualiz??ci??s k??rnyezetet biztos??tanak." #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167 -#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185 +#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:188 msgid "These packages provide compatibility with previous releases." msgstr "" "E csomagok kor??bbi v??ltozatokkal val?? kompatibilit??s meg??rz??s??hez " "sz??ks??gesek." #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168 -#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186 +#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:189 msgid "" "These packages provide support for various locales including fonts and input " "methods." @@ -874,7 +874,7 @@ "??s beviteli m??dszereket." #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169 -#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187 +#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:190 msgid "" "These tools allow you to create documents in the DocBook format and convert " "them into HTML, PDF, Postscript, and text." @@ -883,19 +883,19 @@ "PDF, PostScript illetve sz??veges form??tumra val?? konvert??l??s??hoz sz??ks??gesek." #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170 -#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188 +#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:191 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53 msgid "These tools allow you to run a Web server on the system." msgstr "Ezek az eszk??z??k webkiszolg??l?? ??zemeltet??s??t teszik lehet??v??." #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171 -#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189 +#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:192 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54 msgid "These tools allow you to run an FTP server on the system." msgstr "Ezek az eszk??z??k FTP kiszolg??l?? ??zemeltet??s??t teszik lehet??v??." #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172 -#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190 +#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:193 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55 msgid "" "These tools include core development tools such as automake, gcc, perl, " @@ -905,19 +905,19 @@ "nyomk??vet??k." #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173 -#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191 +#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:194 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56 msgid "This group allows you to configure the system as a news server." msgstr "Ez a csoport h??rkiszolg??l?? ??zemeltet??s??re val??." #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174 -#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192 +#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:195 msgid "This group contains all of Red Hat's custom server configuration tools." msgstr "" "Ez a csoport a Red Hat saj??t kiszolg??l??be??ll??t??si programjait tartalmazza." #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175 -#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193 +#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:196 msgid "" "This group includes a minimal set of packages. Useful for creating small " "router/firewall boxes, for example." @@ -926,7 +926,7 @@ "egyszer?? ??tv??laszt?? vagy t??zfal doboz kialak??t??s??hoz hasznos." #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176 -#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194 +#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:197 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57 msgid "This group includes graphical email, Web, and chat clients." msgstr "" @@ -934,7 +934,7 @@ "tartalmaz." #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177 -#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195 +#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:198 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58 msgid "" "This group includes packages for performing mathematical and scientific " @@ -945,14 +945,14 @@ "ker??ltek." #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178 -#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196 +#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:199 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59 msgid "This group includes packages to help you manipulate and scan images." msgstr "" "E csoport k??pek beolvas??s??ra ??s feldolgoz??s??ra alkalmas csomagokat tartalmaz." #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179 -#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197 +#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:200 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60 msgid "" "This group includes text-based email, Web, and chat clients. These " @@ -962,7 +962,7 @@ "az X Window System grafikus rendszer n??lk??l is haszn??lhat??k." #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180 -#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198 +#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:201 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61 msgid "" "This group is a collection of graphical administration tools for the system, " @@ -972,7 +972,7 @@ "sz??ml??kat igazgat?? ??s hardverbe??ll??t?? programok ker??ltek." #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181 -#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199 +#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:202 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64 msgid "" "This group is a collection of tools and resources of Armenian environments." @@ -981,7 +981,7 @@ "gy??jtem??nye." #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182 -#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200 +#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:203 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68 msgid "" "This group is a collection of tools for various hardware specific utilities." @@ -990,7 +990,7 @@ "gy??jtem??nye." #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183 -#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202 +#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:205 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69 msgid "" "This group is a collection of various tools for the system, such as the " @@ -1000,7 +1000,7 @@ "a h??l??zati forgalom figyel?? ??? gy??jtem??nye." #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184 -#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203 +#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:206 msgid "" "This package group allows you to run a DNS name server (BIND) on the system." msgstr "" @@ -1008,7 +1008,7 @@ "tartalmaz." #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185 -#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204 +#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:207 msgid "" "This package group allows you to share files between Linux and MS Windows" "(tm) systems." @@ -1017,330 +1017,335 @@ "(tm) rendszerek k??z??tti f??jlmegoszt??sra alkalmasak." #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186 -#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205 +#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:208 msgid "This package group contains packages useful for use with MySQL." msgstr "E csomagcsoport MySQL haszn??lat??hoz tartalmaz hasznos csomagokat." #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187 -#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206 +#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:209 msgid "This package group includes packages useful for use with Postgresql." msgstr "E csomagcsoport PostgreSQL haszn??lat??hoz tartalmaz hasznos csomagokat." #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188 -#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207 +#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:210 msgid "Tibetan Support" msgstr "Tibeti t??mogat??s" #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189 -#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208 +#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:211 msgid "Tonga Support" msgstr "Tongai t??mogat??s" #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190 -#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209 +#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:212 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70 msgid "Tools and Utilities needed by a Fedora Packager" msgstr "Eszk??z??k ??s seg??dprogramok, amik Fedora csomagol??knak kellenek" #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191 -#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210 +#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:213 msgid "Tsonga Support" msgstr "Conga (D??l-Afrika) t??mogat??s" #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192 -#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211 +#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:214 msgid "Tswana Support" msgstr "Cv??na (D??l-Afrika) t??mogat??s" #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193 -#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212 +#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:215 msgid "Turkish Support" msgstr "T??r??k t??mogat??s" #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194 -#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214 +#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:217 msgid "Ukrainian Support" msgstr "Ukr??n t??mogat??s" #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195 -#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216 +#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:219 msgid "Urdu Support" msgstr "Urdu (Pakiszt??n) t??mogat??s" #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196 -#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218 +#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:221 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71 msgid "Various core pieces of the system." msgstr "A rendszer k??l??nb??z?? alapkomponensei" #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197 -#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219 +#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:222 #: ../comps-el5.xml.in.h:72 msgid "Various ways to relax and spend your free time." msgstr "K??l??nf??le programok szabadid?? kellemes elt??lt??s??hez." #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198 -#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220 +#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:223 msgid "Venda Support" msgstr "Venda (D??l-Afrika) t??mogat??s" #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199 -#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221 +#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:224 msgid "Vietnamese Support" msgstr "Vietn??mi t??mogat??s" #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200 -#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222 +#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:225 msgid "Virtualization" msgstr "Virtualiz??ci??" #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202 -#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224 +#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:227 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73 msgid "Web Development" msgstr "Webfejleszt??s" #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203 -#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225 +#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:228 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74 msgid "Web Server" msgstr "Webkiszolg??l??" #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204 -#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226 +#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:229 msgid "Welsh Support" msgstr "Velszi t??mogat??s" #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205 -#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227 +#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:230 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75 msgid "Window Managers" msgstr "Ablakkezel??k" #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206 -#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228 +#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:231 msgid "Windows File Server" msgstr "Windows f??jlkiszolg??l??" #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207 -#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229 +#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:232 msgid "X Software Development" msgstr "X szoftverfejleszt??s" #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208 -#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230 +#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:233 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76 msgid "X Window System" msgstr "X ablakrendszer" #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209 -#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231 +#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:234 msgid "XFCE" msgstr "XFCE" #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210 -#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232 +#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:235 msgid "XFCE Software Development" msgstr "XFCE szoftverfejleszt??s" #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211 -#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233 +#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:236 msgid "Xhosa Support" msgstr "K??za (D??l-Afrika) t??mogat??s" #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212 -#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234 +#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:237 msgid "Zulu Support" msgstr "Zulu (D??l-Afrika) t??mogat??s" -#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21 -#: ../comps-f11.xml.in.h:22 +#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 +#: ../comps-f11.xml.in.h:23 msgid "Buildsystem building group" msgstr "??p??t??rendszer ??p??t?? csoport" -#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49 -#: ../comps-f11.xml.in.h:50 +#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 +#: ../comps-f11.xml.in.h:53 msgid "Fedora Eclipse" msgstr "Fedora Eclipse" -#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53 -#: ../comps-f11.xml.in.h:55 +#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 +#: ../comps-f11.xml.in.h:58 msgid "Fonts" msgstr "Bet??k??szletek" -#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54 -#: ../comps-f11.xml.in.h:56 +#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 +#: ../comps-f11.xml.in.h:59 msgid "Fonts packages for rendering text on the desktop." msgstr "Bet??k??szlet csomagok sz??veg megjelen??t??s??hez az asztalon." -#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83 -#: ../comps-f11.xml.in.h:87 +#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 +#: ../comps-f11.xml.in.h:90 msgid "Integrated Development Environments based on Eclipse." msgstr "Eclipse-re ??p??l?? integr??lt fejleszt??k??rnyezetek." -#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104 -#: ../comps-f11.xml.in.h:109 +#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 +#: ../comps-f11.xml.in.h:112 msgid "Legacy Fonts" msgstr "??r??k??lt bet??k??szletek" -#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109 -#: ../comps-f11.xml.in.h:114 +#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110 +#: ../comps-f11.xml.in.h:117 msgid "Low Saxon Support" msgstr "Als??sz??sz t??mogat??s" -#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117 -#: ../comps-f11.xml.in.h:123 +#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118 +#: ../comps-f11.xml.in.h:126 msgid "Mongolian Support" msgstr "Mongol t??mogat??s" -#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120 -#: ../comps-f11.xml.in.h:126 +#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121 +#: ../comps-f11.xml.in.h:129 msgid "Nepali Support" msgstr "Nep??li t??mogat??s" -#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127 -#: ../comps-f11.xml.in.h:134 +#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128 +#: ../comps-f11.xml.in.h:137 msgid "Older bitmap and vector fonts packages" msgstr "R??gebbi bitt??rk??pes ??s vektoros bet??csomagok" -#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45 +#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48 msgid "Esperanto Support" msgstr "Eszperant?? t??mogat??s" -#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99 +#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102 msgid "Kashubian Support" msgstr "Kasub (Lengyelo.) t??mogat??s" -#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104 -#, fuzzy +#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107 msgid "Kurdish Support" -msgstr "T??r??k t??mogat??s" +msgstr "Kurd t??mogat??s" -#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110 -#: ../comps-f11.xml.in.h:115 +#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111 +#: ../comps-f11.xml.in.h:118 msgid "Macedonian Support" msgstr "Maced??n t??mogat??s" -#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123 -#: ../comps-f11.xml.in.h:129 +#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124 +#: ../comps-f11.xml.in.h:132 msgid "Northern Sami Support" msgstr "??szaksz??mi (??szak-Eur??pa) t??mogat??s" -#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139 -#: ../comps-f11.xml.in.h:146 +#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140 +#: ../comps-f11.xml.in.h:150 msgid "SUGAR Desktop Environment" msgstr "SUGAR asztal k??rnyezet" -#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140 -#: ../comps-f11.xml.in.h:147 +#: ../comps-f9.xml.in.h:132 msgid "SUGAR is the desktop environment developed for the OLPC XO." msgstr "SUGAR az OLPC XO-ra k??sz??tett asztal k??rnyezet" #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213 -#: ../comps-f11.xml.in.h:223 +#: ../comps-f11.xml.in.h:226 msgid "Walloon Support" msgstr "Vallon (Belgium) t??mogat??s" -#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74 +#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 +msgid "A software playground for learning about learning." +msgstr "Szoftver j??tsz??t??r tanul??sra a tanul??sr??l." + +#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77 msgid "Haskell Development" msgstr "Haskell fejleszt??s" -#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80 +#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83 msgid "Input Methods" msgstr "Bevitel elj??r??sok" -#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81 +#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84 msgid "Input method packages for the input of international text." msgstr "Bevitel elj??r??s csomagok nemzetk??zi sz??vegek bevitel??re" -#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98 +#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101 msgid "Kashmiri Support" msgstr "Kasm??r (India) t??mogat??s" -#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102 +#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105 msgid "Konkani Support" msgstr "Konkani (India) t??mogat??s" -#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105 +#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108 msgid "LXDE" -msgstr "" +msgstr "LXDE" -#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117 +#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120 msgid "Maithili Support" msgstr "Maitili (India, Nep??l) t??mogat??s" -#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125 +#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:128 msgid "Myanmar (Burmese) Support" msgstr "Mianmari t??mogat??s" -#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153 +#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:156 msgid "Sindhi Support" msgstr "Szindi (Pakiszt??n) t??mogat??s" -#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165 +#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:168 msgid "Support for developing programs in the Haskell programming language." msgstr "T??mogat??s a haskell programoz??si nyelven t??rt??n?? programfejleszt??shez." -#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172 +#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:175 msgid "Tajik Support" msgstr "T??dzsik t??mogat??s" -#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217 +#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:220 msgid "Uzbek Support" msgstr "??zb??g t??mogat??s" -#: ../comps-f11.xml.in.h:5 -#, fuzzy +#: ../comps-f11.xml.in.h:6 msgid "Amazigh Support" -msgstr "Arab t??mogat??s" +msgstr "Amazig (berber, Marokk??) t??mogat??s" -#: ../comps-f11.xml.in.h:54 +#: ../comps-f11.xml.in.h:34 +msgid "Design and Simulation tools for hardware engineers" +msgstr "Tervez?? ??s szimul??ci??s eszk??z??k hardverm??rn??k??knek" + +#: ../comps-f11.xml.in.h:45 +msgid "Electronic Lab" +msgstr "Elektronika Lab" + +#: ../comps-f11.xml.in.h:57 msgid "Font design and packaging" -msgstr "" +msgstr "Bet?? tervez??s ??s csomagol??s" -#: ../comps-f11.xml.in.h:58 -#, fuzzy +#: ../comps-f11.xml.in.h:61 msgid "Frisian Support" -msgstr "Perzsa t??mogat??s" +msgstr "Fr??z (N??met-??b??l) t??mogat??s" -#: ../comps-f11.xml.in.h:59 -#, fuzzy +#: ../comps-f11.xml.in.h:62 msgid "Friulian Support" -msgstr "Brazil lokaliz??ci??s t??mogat??s" +msgstr "Friuli (r??t??rom??n Sv??jc/Olaszo.) t??mogat??s" -#: ../comps-f11.xml.in.h:101 -#, fuzzy +#: ../comps-f11.xml.in.h:104 msgid "Kinyarwanda Support" -msgstr "Kanada (India) t??mogat??s" +msgstr "Ruandai t??mogat??s" -#: ../comps-f11.xml.in.h:118 -#, fuzzy +#: ../comps-f11.xml.in.h:121 msgid "Malagasy Support" -msgstr "Mal??j t??mogat??s" +msgstr "Madagaszk??ri t??mogat??s" -#: ../comps-f11.xml.in.h:132 -#, fuzzy +#: ../comps-f11.xml.in.h:135 msgid "Occitan Support" -msgstr "Tibeti t??mogat??s" +msgstr "Okszit??n (Provence, Fro.) t??mogat??s" -#: ../comps-f11.xml.in.h:201 -#, fuzzy +#: ../comps-f11.xml.in.h:138 +msgid "Online Help and Documentation" +msgstr "H??l??zati s??g?? ??s iratok" + +#: ../comps-f11.xml.in.h:204 msgid "" "This group is a collection of tools used in the design, modification, " "manipulation, and packaging of fonts." msgstr "" -"E csoport ??rm??ny k??rnyezetekben haszn??lhat?? eszk??z??k ??s er??forr??sok " -"gy??jtem??nye." +"E csoport bet??k??szletek tervez??s??re, v??ltoztat??s??ra ??s csomagol??s??ra " +"haszn??lt eszk??z??k gy??jtem??nye." -#: ../comps-f11.xml.in.h:213 -#, fuzzy +#: ../comps-f11.xml.in.h:216 msgid "Turkmen Support" -msgstr "T??r??k t??mogat??s" +msgstr "T??rkm??n t??mogat??s" -#: ../comps-f11.xml.in.h:215 -#, fuzzy +#: ../comps-f11.xml.in.h:218 msgid "Upper Sorbian Support" -msgstr "Szerb t??mogat??s" +msgstr "Szorb (vend N??meto/Lengyelo.) t??mogat??s" #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" @@ -1691,9 +1696,6 @@ #~ msgid "Punjabi" #~ msgstr "pandzs??bi" -#~ msgid "Red Hat Enterprise Linux 4 Documentation" -#~ msgstr "A Red Hat Enterprise Linux 4 dokument??ci??ja" - #~ msgid "Tamil" #~ msgstr "tamil" From fabbione at fedoraproject.org Fri Mar 6 07:31:15 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Fri, 6 Mar 2009 07:31:15 +0000 (UTC) Subject: rpms/corosync/devel corosync-trunk.diff, 1.2, 1.3 corosync.spec, 1.18, 1.19 Message-ID: <20090306073115.1FB1A70116@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/corosync/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10004 Modified Files: corosync.spec Added Files: corosync-trunk.diff Log Message: Import fixes from upstream corosync-trunk.diff: Index: corosync-trunk.diff =================================================================== RCS file: corosync-trunk.diff diff -N corosync-trunk.diff --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ corosync-trunk.diff 6 Mar 2009 07:30:44 -0000 1.3 @@ -0,0 +1,82 @@ +diff -Naurd corosync-0.94/exec/logsys.c corosync-trunk/exec/logsys.c +--- corosync-0.94/exec/logsys.c 2009-01-23 15:25:30.000000000 +0100 ++++ corosync-trunk/exec/logsys.c 2009-03-05 06:36:07.000000000 +0100 +@@ -112,8 +112,6 @@ + + static int logsys_facility = LOG_DAEMON; + +-static char *logsys_format = NULL; +- + /* + * operating global variables + */ +@@ -139,7 +137,7 @@ + + static int logsys_buffer_full = 0; + +-static char *format_buffer="[%6s] %b"; ++static char *format_buffer=NULL; + + static int log_requests_pending = 0; + +@@ -875,7 +873,10 @@ + { + pthread_mutex_lock (&logsys_config_mutex); + +- logsys_format = format; ++ if (format) ++ format_buffer = format; ++ else ++ format_buffer = "[%6s] %b"; + + pthread_mutex_unlock (&logsys_config_mutex); + } +diff -Naurd corosync-0.94/exec/mainconfig.c corosync-trunk/exec/mainconfig.c +--- corosync-0.94/exec/mainconfig.c 2009-02-25 12:14:47.000000000 +0100 ++++ corosync-trunk/exec/mainconfig.c 2009-03-04 11:14:36.000000000 +0100 +@@ -158,16 +158,14 @@ + } + } + if (!objdb_get_string (objdb,object_service_handle, "timestamp", &value)) { +-/* todo change format string + if (strcmp (value, "on") == 0) { +- main_config->logmode |= LOG_MODE_DISPLAY_TIMESTAMP; ++ logsys_format_set("%t [%6s] %b"); + } else + if (strcmp (value, "off") == 0) { +- main_config->logmode &= ~LOG_MODE_DISPLAY_TIMESTAMP; ++ logsys_format_set("[%6s] %b"); + } else { + goto parse_error; + } +-*/ + } + + /* free old string on reload */ +diff -Naurd corosync-0.94/exec/Makefile corosync-trunk/exec/Makefile +diff -Naurd corosync-0.94/exec/totemip.c corosync-trunk/exec/totemip.c +--- corosync-0.94/exec/totemip.c 2009-01-26 21:46:45.000000000 +0100 ++++ corosync-trunk/exec/totemip.c 2009-03-03 04:57:37.000000000 +0100 +@@ -406,6 +406,7 @@ + memset(&nladdr, 0, sizeof(nladdr)); + nladdr.nl_family = AF_NETLINK; + ++ memset(&req, 0, sizeof(req)); + req.nlh.nlmsg_len = sizeof(req); + req.nlh.nlmsg_type = RTM_GETADDR; + req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST; +diff -Naurd corosync-0.94/lib/Makefile corosync-trunk/lib/Makefile +diff -Naurd corosync-0.94/Makefile corosync-trunk/Makefile +diff -Naurd corosync-0.94/services/cpg.c corosync-trunk/services/cpg.c +--- corosync-0.94/services/cpg.c 2009-03-03 01:57:44.000000000 +0100 ++++ corosync-trunk/services/cpg.c 2009-03-06 03:42:48.000000000 +0100 +@@ -489,8 +489,8 @@ + notify_info.nodeid = api->totem_nodeid_get(); + notify_info.reason = CONFCHG_CPG_REASON_PROCDOWN; + cpg_node_joinleave_send(gi, pi, MESSAGE_REQ_EXEC_CPG_PROCLEAVE, CONFCHG_CPG_REASON_PROCDOWN); +- list_del(&pi->list); + } ++ list_del(&pi->list); + api->ipc_refcnt_dec (conn); + return (0); + } Index: corosync.spec =================================================================== RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- corosync.spec 3 Mar 2009 05:48:35 -0000 1.18 +++ corosync.spec 6 Mar 2009 07:30:44 -0000 1.19 @@ -1,14 +1,15 @@ -## define alphatag svn1756 +%define alphatag svn1792 Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 0.94 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} License: BSD Group: System Environment/Base URL: http://www.openais.org Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz Patch0: corosync-bump-soname.diff +Patch1: corosync-trunk.diff # Runtime bits Requires: corosynclib = %{version}-%{release} @@ -25,6 +26,7 @@ %prep %setup -q -n corosync-%{version} %patch0 -p1 +%patch1 -p1 %build @@ -188,6 +190,14 @@ %{_mandir}/man8/votequorum_overview.8* %changelog +* Fri Mar 6 2009 Fabio M. Di Nitto - 0.94-2.svn1792 +- Import fixes from upstream: + * Fix uninitialized memory. Spotted by valgrind (1788) + * Fix logsys_set_format by updating the right bits (1789) + * logsys: re-add support for timestamp (1790) + * Fix cpg crash (1791) + * Allow logsys_format_set to reset to default (1792) + * Tue Mar 3 2009 Fabio M. Di Nitto - 0.94-1 - New upstream release. - Drop obsolete patches. From jskala at fedoraproject.org Fri Mar 6 07:42:41 2009 From: jskala at fedoraproject.org (Jiri Skala) Date: Fri, 6 Mar 2009 07:42:41 +0000 (UTC) Subject: rpms/ppp/devel ppp.spec,1.48,1.49 Message-ID: <20090306074241.2037170116@cvs1.fedora.phx.redhat.com> Author: jskala Update of /cvs/extras/rpms/ppp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12317 Modified Files: ppp.spec Log Message: * Fri Mar 06 2009 - Jiri Skala 2.4.4-11 - fixed #488764 - package upgrade should not replace configuration files Index: ppp.spec =================================================================== RCS file: /cvs/extras/rpms/ppp/devel/ppp.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- ppp.spec 27 Feb 2009 02:05:45 -0000 1.48 +++ ppp.spec 6 Mar 2009 07:42:10 -0000 1.49 @@ -1,7 +1,7 @@ Summary: The PPP (Point-to-Point Protocol) daemon. Name: ppp Version: 2.4.4 -Release: 10%{?dist} +Release: 11%{?dist} License: BSD and LGPLv2+ and GPLv2+ and Public Domain Group: System Environment/Daemons Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz @@ -123,11 +123,11 @@ %dir /etc/ppp %dir /var/run/ppp %attr(700, root, root) %dir /var/log/ppp -%config /etc/ppp/chap-secrets -%config /etc/ppp/options -%config /etc/ppp/pap-secrets -%config /etc/pam.d/ppp -%config /etc/logrotate.d/ppp +%config(noreplace) /etc/ppp/chap-secrets +%config(noreplace) /etc/ppp/options +%config(noreplace) /etc/ppp/pap-secrets +%config(noreplace) /etc/pam.d/ppp +%config(noreplace) /etc/logrotate.d/ppp %doc FAQ README README.cbcp README.linux README.MPPE README.MSCHAP80 README.MSCHAP81 README.pwfd README.pppoe scripts sample %files devel @@ -136,6 +136,9 @@ %doc PLUGINS %changelog +* Fri Mar 06 2009 - Jiri Skala 2.4.4-11 +- fixed #488764 - package upgrade should not replace configuration files + * Thu Feb 26 2009 Fedora Release Engineering - 2.4.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mmaslano at fedoraproject.org Fri Mar 6 07:49:16 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Fri, 6 Mar 2009 07:49:16 +0000 (UTC) Subject: rpms/perl-Padre/devel .cvsignore, 1.8, 1.9 perl-Padre.spec, 1.5, 1.6 sources, 1.8, 1.9 Message-ID: <20090306074916.DEAD470116@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-Padre/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13776 Modified Files: .cvsignore perl-Padre.spec sources Log Message: * Wed Mar 04 2009 Marcela Ma??l????ov?? 0.28-1 - Specfile autogenerated by cpanspec 1.78 again because Padre was rewritten and many requirement were changed. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Padre/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 18 Dec 2008 11:34:05 -0000 1.8 +++ .cvsignore 6 Mar 2009 07:48:46 -0000 1.9 @@ -1,4 +1 @@ -Padre.desktop -Padre-0.14.tar.gz -Padre-0.16.tar.gz -Padre-0.20.tar.gz +Padre-0.28.tar.gz Index: perl-Padre.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Padre/devel/perl-Padre.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Padre.spec 27 Feb 2009 00:12:19 -0000 1.5 +++ perl-Padre.spec 6 Mar 2009 07:48:46 -0000 1.6 @@ -1,41 +1,90 @@ Name: perl-Padre -Version: 0.20 -Release: 2%{?dist} +Version: 0.28 +Release: 1%{?dist} Summary: Perl Application Development and Refactoring Environment License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Padre/ Source0: http://www.cpan.org/authors/id/S/SZ/SZABGAB/Padre-%{version}.tar.gz Source1: Padre.desktop -Patch0: switchOfCheck.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 0:5.008 -BuildRequires: perl(Class::Accessor) -BuildRequires: perl(DBD::SQLite) -BuildRequires: perl(File::Copy::Recursive) -BuildRequires: perl(File::Which) -BuildRequires: perl(Module::Build) +BuildRequires: perl >= 0:5.008005 +BuildRequires: perl(App::Ack) >= 1.86 +BuildRequires: perl(Class::Adapter) >= 1.05 +BuildRequires: perl(Class::Autouse) >= 1.26 +BuildRequires: perl(Class::Unload) >= 0.03 +BuildRequires: perl(Class::XSAccessor) >= 0.14 +BuildRequires: perl(Class::XSAccessor::Array) >= 0.14 +BuildRequires: perl(DBD::SQLite) >= 1.10 +BuildRequires: perl(DBI) >= 1.58 +BuildRequires: perl(Devel::Dumpvar) >= 0.04 +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(File::Copy::Recursive) >= 0.37 +BuildRequires: perl(File::Find::Rule) >= 0.30 +BuildRequires: perl(File::HomeDir) >= 0.82 +BuildRequires: perl(File::ShareDir) >= 1.00 +BuildRequires: perl(File::ShareDir::PAR) >= 0.03 +BuildRequires: perl(File::Which) >= 0.05 +BuildRequires: perl(HTML::Entities) >= 3.57 +BuildRequires: perl(HTML::Parser) >= 3.58 +BuildRequires: perl(IO::Scalar) >= 2.110 +BuildRequires: perl(IO::String) >= 1.08 +BuildRequires: perl(IPC::Cmd) >= 0.42 +BuildRequires: perl(Module::Inspector) >= 0.04 +BuildRequires: perl(Module::Refresh) >= 0.13 +BuildRequires: perl(Module::Starter) >= 1.50 +BuildRequires: perl(ORLite) >= 1.18 +BuildRequires: perl(ORLite::Migrate) >= 0.01 BuildRequires: perl(PAR) >= 0.970 -BuildRequires: perl(Pod::Simple) +BuildRequires: perl(Params::Util) >= 0.33 +BuildRequires: perl(Parse::ErrorString::Perl) >= 0.11 +BuildRequires: perl(Pod::POM) >= 0.17 +BuildRequires: perl(Pod::Simple) >= 3.07 +BuildRequires: perl(Pod::Simple::XHTML) >= 3.04 +BuildRequires: perl(PPI) >= 1.203 BuildRequires: perl(Probe::Perl) >= 0.01 -BuildRequires: perl(Test::Exception) +BuildRequires: perl(Test::Compile) >= 0.08 +BuildRequires: perl(Test::Exception) >= 0.27 BuildRequires: perl(Test::More) >= 0.47 -BuildRequires: perl(Test::NoWarnings) -BuildRequires: perl(Wx::Perl::Dialog) -#BuildRequires: perl(Test::NeedsDisplay) -BuildRequires: desktop-file-utils -Requires: perl(Class::Accessor) -Requires: perl(DBD::SQLite) -Requires: perl(File::Copy::Recursive) -Requires: perl(File::ShareDir::PAR) +BuildRequires: perl(Test::NoWarnings) >= 0.084 +BuildRequires: perl(Test::Script) >= 1.03 +BuildRequires: perl(Text::Balanced) +BuildRequires: perl(Text::Diff) >= 0.35 +BuildRequires: perl(Text::FindIndent) >= 0.03 +BuildRequires: perl(URI) +BuildRequires: perl(Wx) >= 0.89 +BuildRequires: perl(Wx::Perl::ProcessStream) >= 0.11 +BuildRequires: perl(YAML::Tiny) >= 1.32 +Requires: perl(App::Ack) >= 1.86 +Requires: perl(Class::Adapter) >= 1.05 +Requires: perl(Class::XSAccessor::Array) >= 0.14 +Requires: perl(DBD::SQLite) >= 1.10 +Requires: perl(DBI) >= 1.58 +Requires: perl(Devel::Dumpvar) >= 0.04 +Requires: perl(File::Copy::Recursive) >= 0.37 +Requires: perl(File::Find::Rule) >= 0.30 +Requires: perl(File::ShareDir) >= 1.00 +Requires: perl(File::Which) >= 0.05 +Requires: perl(HTML::Entities) >= 3.57 +Requires: perl(HTML::Parser) >= 3.58 +Requires: perl(IO::Scalar) >= 2.110 +Requires: perl(IPC::Cmd) >= 0.42 +Requires: perl(Module::Inspector) >= 0.04 +Requires: perl(Module::Refresh) >= 0.13 +Requires: perl(Module::Starter) >= 1.50 +Requires: perl(ORLite::Migrate) >= 0.01 Requires: perl(PAR) >= 0.970 -Requires: perl(Pod::Simple) -Requires: perl(PPI) >= 1.203 +Requires: perl(Pod::POM) >= 0.17 +Requires: perl(Pod::Simple) >= 3.07 +Requires: perl(Pod::Simple::XHTML) >= 3.04 Requires: perl(Probe::Perl) >= 0.01 -Requires: perl(Wx::Perl::Dialog) -Requires: perl(Module::Starter) >= 1.50 -Requires: perl(Class::Adapter) +Requires: perl(Text::Balanced) +Requires: perl(Text::Diff) >= 0.35 +Requires: perl(Text::FindIndent) >= 0.03 +Requires: perl(URI) +Requires: perl(Wx::Perl::ProcessStream) >= 0.11 +Requires: perl(YAML::Tiny) >= 1.32 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -45,43 +94,39 @@ %prep %setup -q -n Padre-%{version} -%patch0 -p1 %build -%{__perl} Build.PL installdirs=vendor -./Build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT + +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; -mv $RPM_BUILD_ROOT/%{perl_vendorlib}/auto/share/dist/Padre $RPM_BUILD_ROOT/%{_datadir}/padre -%{_fixperms} $RPM_BUILD_ROOT/* -chmod 644 $RPM_BUILD_ROOT/%{perl_vendorlib}/Padre/Wx/Ack.pm -# there's no desktop file in source, let's create one -desktop-file-install --vendor="fedora" \ ---dir=$RPM_BUILD_ROOT/%{_datadir}/applications \ -%{SOURCE1} +%{_fixperms} $RPM_BUILD_ROOT/* %check -# We don't test GUI tests. -#./Build test +make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc Changes README -/usr/bin/padre +%doc Changes padre.yml README %{perl_vendorlib}/* -%{_datadir}/padre -%{_datadir}/applications/fedora-Padre.desktop +/usr/bin/padre %{_mandir}/man3/* %changelog +* Wed Mar 04 2009 Marcela Ma??l????ov?? 0.28-1 +- Specfile autogenerated by cpanspec 1.78 again because Padre was + rewritten and many requirement were changed. + * Thu Feb 26 2009 Fedora Release Engineering - 0.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Padre/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 18 Dec 2008 11:34:05 -0000 1.8 +++ sources 6 Mar 2009 07:48:46 -0000 1.9 @@ -1,2 +1 @@ -e9457439b1f0c929ab3141197294e061 Padre.desktop -cd91f198508d1756c9cf32736a40f58e Padre-0.20.tar.gz +6a0351313076c42bc6bbb020f61c757b Padre-0.28.tar.gz From mmaslano at fedoraproject.org Fri Mar 6 08:15:28 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Fri, 6 Mar 2009 08:15:28 +0000 (UTC) Subject: rpms/anacron/devel anacron.spec,1.61,1.62 sources,1.5,1.6 Message-ID: <20090306081528.666E070116@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/anacron/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18837 Modified Files: anacron.spec sources Log Message: Fix typo in anacron again. Index: anacron.spec =================================================================== RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- anacron.spec 24 Feb 2009 01:04:09 -0000 1.61 +++ anacron.spec 6 Mar 2009 08:14:57 -0000 1.62 @@ -1,7 +1,7 @@ Summary: A cron-like program that can run jobs lost during downtime Name: anacron Version: 2.3 -Release: 71%{?dist} +Release: 72%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://packages.debian.org/stable/source/anacron @@ -92,6 +92,9 @@ %attr(755,root,root) /etc/cron.hourly/0anacron %changelog +* Fri Mar 6 2009 Marcela Ma??l????ov?? 2.3-72 +- 488916 fix typo in bash script again. + * Mon Feb 23 2009 Fedora Release Engineering - 2.3-71 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anacron/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Feb 2009 14:08:07 -0000 1.5 +++ sources 6 Mar 2009 08:14:58 -0000 1.6 @@ -1,3 +1,3 @@ 9fdfc50f5741643332722a9145146278 anacron_2.3.orig.tar.gz e354dcd88554723abd476f069c90069d 0hourly -489b434e72a434ead53efc941330cb59 anacron +110558bab1719a8b91598fdcfceebed0 anacron From pkgdb at fedoraproject.org Fri Mar 6 08:24:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 08:24:40 +0000 Subject: [pkgdb] uml_utilities had acl change status Message-ID: <20090306082438.C4105208201@bastion.fedora.phx.redhat.com> pwouters has set the watchbugzilla acl on uml_utilities (Fedora 9) to Approved for chkr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From harald at fedoraproject.org Fri Mar 6 08:29:56 2009 From: harald at fedoraproject.org (Harald Hoyer) Date: Fri, 6 Mar 2009 08:29:56 +0000 (UTC) Subject: rpms/pcmciautils/devel .cvsignore, 1.6, 1.7 pcmciautils.spec, 1.30, 1.31 sources, 1.6, 1.7 pcmciautils-014-funcname.patch, 1.1, NONE pcmciautils-014-newrules.patch, 1.5, NONE Message-ID: <20090306082956.EDA6770116@cvs1.fedora.phx.redhat.com> Author: harald Update of /cvs/pkgs/rpms/pcmciautils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21889 Modified Files: .cvsignore pcmciautils.spec sources Removed Files: pcmciautils-014-funcname.patch pcmciautils-014-newrules.patch Log Message: * Fri Mar 06 2009 Harald Hoyer 015-1 - version 015 - added buildarch i586 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pcmciautils/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 6 Jun 2006 06:19:05 -0000 1.6 +++ .cvsignore 6 Mar 2009 08:29:26 -0000 1.7 @@ -1 +1 @@ -pcmciautils-014.tar.bz2 +pcmciautils-015.tar.bz2 Index: pcmciautils.spec =================================================================== RCS file: /cvs/pkgs/rpms/pcmciautils/devel/pcmciautils.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- pcmciautils.spec 26 Feb 2009 10:12:10 -0000 1.30 +++ pcmciautils.spec 6 Mar 2009 08:29:26 -0000 1.31 @@ -1,10 +1,10 @@ Name: pcmciautils Summary: PCMCIA utilities and initialization programs License: GPLv2 -Version: 014 -Release: 13%{?dist} +Version: 015 +Release: 1%{?dist} Group: System Environment/Base -ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm} +ExclusiveArch: i386 i586 x86_64 ia64 ppc ppc64 %{?arm} URL: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2 Obsoletes: pcmcia-cs < 3.2.9 @@ -17,8 +17,6 @@ Requires: udev >= 062, kernel >= 2.6.12-1.1411_FC5 BuildRequires: byacc, flex Patch1: pcmciautils-fedora.patch -Patch2: pcmciautils-014-newrules.patch -Patch3: pcmciautils-014-funcname.patch %description The pcmciautils package contains utilities for initializing and @@ -28,8 +26,6 @@ %setup -q # Fix build peculiarities %patch1 -p1 -%patch2 -p1 -b .newrule -%patch3 -p1 %build make %{?_smp_mflags} @@ -54,6 +50,10 @@ %{_mandir}/man*/pccardctl* %changelog +* Fri Mar 06 2009 Harald Hoyer 015-1 +- version 015 +- added buildarch i586 + * Thu Feb 26 2009 Fedora Release Engineering - 014-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pcmciautils/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 6 Jun 2006 06:19:05 -0000 1.6 +++ sources 6 Mar 2009 08:29:26 -0000 1.7 @@ -1 +1 @@ -3f07c926875f6c5dcb83240f39725177 pcmciautils-014.tar.bz2 +9e12435c8b6cf7bf59894e90e480b4aa pcmciautils-015.tar.bz2 --- pcmciautils-014-funcname.patch DELETED --- --- pcmciautils-014-newrules.patch DELETED --- From xhorak at fedoraproject.org Fri Mar 6 08:33:01 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:33:01 +0000 (UTC) Subject: rpms/epiphany/F-10 epiphany.spec,1.223,1.224 Message-ID: <20090306083301.ED7C570116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/epiphany/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22667 Modified Files: epiphany.spec Log Message: * Fri Mar 06 2009 Jan Horak - 2.24.3-3 - Rebuild against newer gecko Index: epiphany.spec =================================================================== RCS file: /cvs/pkgs/rpms/epiphany/F-10/epiphany.spec,v retrieving revision 1.223 retrieving revision 1.224 diff -u -r1.223 -r1.224 --- epiphany.spec 4 Feb 2009 18:54:23 -0000 1.223 +++ epiphany.spec 6 Mar 2009 08:32:31 -0000 1.224 @@ -1,4 +1,4 @@ -%define gecko_ver 1.9.0.6 +%define gecko_ver 1.9.0.7 %define desktop_file_utils_version 0.9 %define glib2_devel_ver 2.15.2 %define gtk2_devel_ver 2.12.0 @@ -8,7 +8,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany Version: 2.24.3 -Release: 2%{?dist} +Release: 3%{?dist} %define major_version 2.24 Provides: epiphany(abi) = %{major_version} License: GPLv2+ and GFDL @@ -259,6 +259,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Fri Mar 06 2009 Jan Horak - 2.24.3-3 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 2.24.3-2 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 08:33:51 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:33:51 +0000 (UTC) Subject: rpms/blam/F-10 blam.spec,1.28,1.29 Message-ID: <20090306083351.075D170116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/blam/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22897 Modified Files: blam.spec Log Message: * Fri Mar 06 2009 Jan Horak - 1.8.5-7 - Rebuild against newer gecko Index: blam.spec =================================================================== RCS file: /cvs/pkgs/rpms/blam/F-10/blam.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- blam.spec 4 Feb 2009 18:55:18 -0000 1.28 +++ blam.spec 6 Mar 2009 08:33:20 -0000 1.29 @@ -1,11 +1,11 @@ ## XXX: Hopefully Mono, Blam and multilib will play nicely soon... %define _libdir %{_prefix}/lib %define dbus_sharp_min_version 0.60 -%define gecko_version 1.9.0.6 +%define gecko_version 1.9.0.7 Name: blam Version: 1.8.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -138,6 +138,9 @@ %{_mandir}/man?/%{name}.1* %changelog +* Fri Mar 06 2009 Jan Horak - 1.8.5-7 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 1.8.5-6 - Rebuild against newer gecko @@ -155,7 +158,7 @@ * Mon Jul 21 2008 Alex Lancaster - 1.8.5-1 - Update to upstream (1.8.5), fixes FTBS (#434382) -- Set gecko version to new xulrunner: 1.9.0.6 +- Set gecko version to new xulrunner: 1.9.0.7 - BR: gecko-devel-unstable - Drop a number of patches which no longer apply - Add new icons to file list. From xhorak at fedoraproject.org Fri Mar 6 08:34:58 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:34:58 +0000 (UTC) Subject: rpms/devhelp/F-10 devhelp.spec,1.103,1.104 Message-ID: <20090306083458.B906370116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/devhelp/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23268 Modified Files: devhelp.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.22-5 - Rebuild against newer gecko Index: devhelp.spec =================================================================== RCS file: /cvs/pkgs/rpms/devhelp/F-10/devhelp.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- devhelp.spec 16 Feb 2009 15:57:25 -0000 1.103 +++ devhelp.spec 6 Mar 2009 08:34:28 -0000 1.104 @@ -6,7 +6,7 @@ Name: devhelp Version: 0.22 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Development/Tools Summary: API document browser @@ -135,6 +135,9 @@ %{_libdir}/pkgconfig/* %changelog +* Fri Mar 06 2009 Jan Horak - 0.22-5 +- Rebuild against newer gecko + * Mon Feb 16 2009 - Bastien Nocera - 0.22-4 - Remove gecko BRs - Fix displaying web pages, WebKit doesn't like local filenames as URIs From xhorak at fedoraproject.org Fri Mar 6 08:36:05 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:36:05 +0000 (UTC) Subject: rpms/evolution-rss/F-10 evolution-rss.spec,1.24,1.25 Message-ID: <20090306083605.470C770116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/evolution-rss/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23742 Modified Files: evolution-rss.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.1.2-5 - Rebuild against newer gecko Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-10/evolution-rss.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- evolution-rss.spec 4 Feb 2009 18:57:09 -0000 1.24 +++ evolution-rss.spec 6 Mar 2009 08:35:34 -0000 1.25 @@ -1,7 +1,7 @@ Summary: Evolution RSS Reader Name: evolution-rss Version: 0.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz @@ -87,6 +87,9 @@ %doc TODO %changelog +* Fri Mar 06 2009 Jan Horak - 0.1.2-5 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.1.2-4 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 08:37:12 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:37:12 +0000 (UTC) Subject: rpms/galeon/F-10 galeon.spec,1.59,1.60 Message-ID: <20090306083712.338F970116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/galeon/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24048 Modified Files: galeon.spec Log Message: * Fri Mar 06 2009 Jan Horak - 2.0.7-7 - Rebuild against newer gecko Index: galeon.spec =================================================================== RCS file: /cvs/pkgs/rpms/galeon/F-10/galeon.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- galeon.spec 15 Feb 2009 08:52:39 -0000 1.59 +++ galeon.spec 6 Mar 2009 08:36:41 -0000 1.60 @@ -3,7 +3,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.7 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -123,6 +123,9 @@ %changelog +* Fri Mar 06 2009 Jan Horak - 2.0.7-7 +- Rebuild against newer gecko + * Sun Feb 15 2009 Denis Leroy - 2.0.7-6 - Added upstream patch to use Gnome Print From xhorak at fedoraproject.org Fri Mar 6 08:45:33 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:45:33 +0000 (UTC) Subject: rpms/gecko-sharp2/F-10 gecko-sharp2.spec,1.30,1.31 Message-ID: <20090306084533.273A970116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/gecko-sharp2/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25928 Modified Files: gecko-sharp2.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.13-5 - Rebuild against newer gecko Index: gecko-sharp2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gecko-sharp2/F-10/gecko-sharp2.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gecko-sharp2.spec 4 Feb 2009 18:59:01 -0000 1.30 +++ gecko-sharp2.spec 6 Mar 2009 08:45:02 -0000 1.31 @@ -1,6 +1,6 @@ Name: gecko-sharp2 Version: 0.13 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Gecko bindings for Mono Group: System Environment/Libraries @@ -70,6 +70,9 @@ %changelog +* Fri Mar 06 2009 Jan Horak - 0.13-5 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.13-4 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 08:46:36 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:46:36 +0000 (UTC) Subject: rpms/gnome-python2-extras/F-10 gnome-python2-extras.spec,1.37,1.38 Message-ID: <20090306084636.C98F970116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/gnome-python2-extras/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26276 Modified Files: gnome-python2-extras.spec Log Message: * Fri Mar 06 2009 Jan Horak - 2.19.1-27 - Rebuild against newer gecko Index: gnome-python2-extras.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-python2-extras/F-10/gnome-python2-extras.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- gnome-python2-extras.spec 4 Feb 2009 19:00:00 -0000 1.37 +++ gnome-python2-extras.spec 6 Mar 2009 08:46:06 -0000 1.38 @@ -5,7 +5,7 @@ %define gnome_panel_version 2.2.0 %define gnome_python_version 2.10.0 %define gtkhtml2_version 2.3.1 -%define gecko_version 1.9.0.6 +%define gecko_version 1.9.0.7 %define gtkspell_version 2.0.7 %define libgda_version 2.99.6 %define libgdl_version 2.24.0 @@ -14,7 +14,7 @@ Name: gnome-python2-extras Version: 2.19.1 -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Languages Summary: The sources for additional. PyGNOME Python extension modules. @@ -191,6 +191,9 @@ %{_libdir}/pkgconfig/pygda-3.0.pc %changelog +* Fri Mar 06 2009 Jan Horak - 2.19.1-27 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 2.19.1-26 - Rebuild against newer gecko @@ -220,7 +223,7 @@ - Add Requires: gnome-python2-gnome. * Fri Oct 03 2008 Matthew Barnes - 2.19.1-17 -* Rebuild against gecko-devel-unstable-1.9.0.6. +* Rebuild against gecko-devel-unstable-1.9.0.7. * Wed Jul 23 2008 Tom "spot" Callaway - 2.19.1-16 - fix license tag From xhorak at fedoraproject.org Fri Mar 6 08:47:42 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:47:42 +0000 (UTC) Subject: rpms/gnome-web-photo/F-10 gnome-web-photo.spec,1.15,1.16 Message-ID: <20090306084742.8174B70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/gnome-web-photo/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26623 Modified Files: gnome-web-photo.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.3-15 - Rebuild against newer gecko Index: gnome-web-photo.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-web-photo/F-10/gnome-web-photo.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gnome-web-photo.spec 4 Feb 2009 19:00:55 -0000 1.15 +++ gnome-web-photo.spec 6 Mar 2009 08:47:12 -0000 1.16 @@ -1,9 +1,9 @@ -%define gecko_version 1.9.0.6 +%define gecko_version 1.9.0.7 Summary: HTML pages thumbnailer Name: gnome-web-photo Version: 0.3 -Release: 14%{?dist} +Release: 15%{?dist} License: LGPLv2+ Group: Applications/Internet URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/ @@ -80,6 +80,9 @@ %{_datadir}/gnome-web-photo %changelog +* Fri Mar 06 2009 Jan Horak - 0.3-15 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.3-14 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 08:48:45 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:48:45 +0000 (UTC) Subject: rpms/google-gadgets/F-10 google-gadgets.spec,1.9,1.10 Message-ID: <20090306084845.BBB7470116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/google-gadgets/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26944 Modified Files: google-gadgets.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.10.5-3 - Rebuild against newer gecko Index: google-gadgets.spec =================================================================== RCS file: /cvs/pkgs/rpms/google-gadgets/F-10/google-gadgets.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- google-gadgets.spec 4 Feb 2009 19:01:51 -0000 1.9 +++ google-gadgets.spec 6 Mar 2009 08:48:15 -0000 1.10 @@ -1,6 +1,6 @@ Name: google-gadgets Version: 0.10.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Google Gadgets for Linux Group: User Interface/Desktops @@ -189,6 +189,9 @@ %changelog +* Fri Mar 06 2009 Jan Horak - 0.10.5-3 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.10.5-2 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 08:49:49 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:49:49 +0000 (UTC) Subject: rpms/kazehakase/F-10 kazehakase.spec,1.70,1.71 Message-ID: <20090306084949.A6CD670116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/kazehakase/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27247 Modified Files: kazehakase.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.5.6-1.4 - Rebuild against newer gecko Index: kazehakase.spec =================================================================== RCS file: /cvs/pkgs/rpms/kazehakase/F-10/kazehakase.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- kazehakase.spec 4 Feb 2009 19:02:19 -0000 1.70 +++ kazehakase.spec 6 Mar 2009 08:49:19 -0000 1.71 @@ -40,7 +40,7 @@ Name: kazehakase Version: 0.5.6 -Release: %{_release}%{?dist}.3 +Release: %{_release}%{?dist}.4 Summary: Kazehakase browser using Gecko rendering engine Group: Applications/Internet @@ -293,6 +293,9 @@ %endif %changelog +* Fri Mar 06 2009 Jan Horak - 0.5.6-1.4 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.5.6-1.3 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 08:50:54 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:50:54 +0000 (UTC) Subject: rpms/Miro/F-10 Miro.spec,1.47,1.48 Message-ID: <20090306085054.3D94770116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/Miro/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27604 Modified Files: Miro.spec Log Message: * Fri Mar 06 2009 Jan Horak - 2.0-4 - Rebuild against newer gecko Index: Miro.spec =================================================================== RCS file: /cvs/pkgs/rpms/Miro/F-10/Miro.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- Miro.spec 27 Feb 2009 13:39:36 -0000 1.47 +++ Miro.spec 6 Mar 2009 08:50:23 -0000 1.48 @@ -1,11 +1,11 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define gecko_ver 1.9.0.6 +%define gecko_ver 1.9.0.7 Name: Miro Version: 2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Miro - Internet TV Player Group: Applications/Multimedia License: GPLv2+ @@ -92,6 +92,9 @@ %changelog +* Fri Mar 06 2009 Jan Horak - 2.0-4 +- Rebuild against newer gecko + * Fri Feb 27 2009 Alex Lancaster - 2.0-3 - Combine the fhs patches into one, and fix the path to /usr/libexec/xine_extractor (#487442) From xhorak at fedoraproject.org Fri Mar 6 08:52:00 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:52:00 +0000 (UTC) Subject: rpms/mozvoikko/F-10 mozvoikko.spec,1.6,1.7 Message-ID: <20090306085200.CF5FD70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/mozvoikko/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27897 Modified Files: mozvoikko.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.9.5-7 - Rebuild against newer gecko Index: mozvoikko.spec =================================================================== RCS file: /cvs/pkgs/rpms/mozvoikko/F-10/mozvoikko.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mozvoikko.spec 4 Feb 2009 19:04:16 -0000 1.6 +++ mozvoikko.spec 6 Mar 2009 08:51:30 -0000 1.7 @@ -1,5 +1,5 @@ # For the xulrunner unstable requires -%define gecko_ver 1.9.0.6 +%define gecko_ver 1.9.0.7 # These come from install.rdf %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\} @@ -12,7 +12,7 @@ Name: mozvoikko Version: 0.9.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Finnish Voikko spell-checker extension for Mozilla programs Group: Applications/Internet License: GPLv2+ @@ -70,6 +70,9 @@ %changelog +* Fri Mar 06 2009 Jan Horak - 0.9.5-7 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.9.5-6 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 08:53:08 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:53:08 +0000 (UTC) Subject: rpms/mugshot/F-10 mugshot.spec,1.44,1.45 Message-ID: <20090306085308.6DC6870116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/mugshot/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28269 Modified Files: mugshot.spec Log Message: * Fri Mar 06 2009 Jan Horak - 1.2.2-6 - Rebuild against newer gecko Index: mugshot.spec =================================================================== RCS file: /cvs/pkgs/rpms/mugshot/F-10/mugshot.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- mugshot.spec 4 Feb 2009 19:05:11 -0000 1.44 +++ mugshot.spec 6 Mar 2009 08:52:38 -0000 1.45 @@ -3,7 +3,7 @@ Name: mugshot Version: 1.2.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Companion software for mugshot.org Group: Applications/Internet @@ -172,6 +172,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Fri Mar 06 2009 Jan Horak - 1.2.2-6 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 1.2.2-5 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 08:54:16 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:54:16 +0000 (UTC) Subject: rpms/pcmanx-gtk2/F-10 pcmanx-gtk2.spec,1.10,1.11 Message-ID: <20090306085416.DAB9D70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/pcmanx-gtk2/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28625 Modified Files: pcmanx-gtk2.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.3.8-6 - Rebuild against newer gecko Index: pcmanx-gtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/pcmanx-gtk2/F-10/pcmanx-gtk2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- pcmanx-gtk2.spec 4 Feb 2009 19:06:07 -0000 1.10 +++ pcmanx-gtk2.spec 6 Mar 2009 08:53:46 -0000 1.11 @@ -2,12 +2,12 @@ # We hardcode this here because everytime xulrunner increments # it tends to break things that depend on it. %define xulmajorver 1.9 -%define xulver 1.9.0.6 +%define xulver 1.9.0.7 Summary: Telnet client designed for BBS browsing Name: pcmanx-gtk2 Version: 0.3.8 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Applications/Internet Source0: http://pcmanx.csie.net/release/%{name}-%{version}.tar.bz2 @@ -124,6 +124,9 @@ %{_libdir}/mozilla/plugins/ %changelog +* Fri Mar 06 2009 Jan Horak - 0.3.8-6 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.3.8-5 - Rebuild against newer gecko @@ -134,7 +137,7 @@ - Rebuild against newer gecko * Thu Sep 25 2008 Tom "spot" Callaway - 0.3.8-2 -- rebuild against xulrunner 1.9.0.6 +- rebuild against xulrunner 1.9.0.7 * Wed Aug 27 2008 Tom "spot" Callaway - 0.3.8-1 - update to 0.3.8 From xhorak at fedoraproject.org Fri Mar 6 08:55:23 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:55:23 +0000 (UTC) Subject: rpms/ruby-gnome2/F-10 ruby-gnome2.spec,1.36,1.37 Message-ID: <20090306085523.66E1E70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/ruby-gnome2/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28930 Modified Files: ruby-gnome2.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.18.1-4 - Rebuild against newer gecko Index: ruby-gnome2.spec =================================================================== RCS file: /cvs/pkgs/rpms/ruby-gnome2/F-10/ruby-gnome2.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- ruby-gnome2.spec 4 Feb 2009 19:07:02 -0000 1.36 +++ ruby-gnome2.spec 6 Mar 2009 08:54:52 -0000 1.37 @@ -11,7 +11,7 @@ Name: ruby-gnome2 Version: 0.18.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Ruby binding of libgnome/libgnomeui-2.x Group: System Environment/Libraries @@ -739,6 +739,9 @@ %changelog +* Fri Mar 06 2009 Jan Horak - 0.18.1-4 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.18.1-3 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 08:56:35 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 08:56:35 +0000 (UTC) Subject: rpms/yelp/F-10 yelp.spec,1.149,1.150 Message-ID: <20090306085635.1C1E670116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/yelp/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29271 Modified Files: yelp.spec Log Message: * Fri Mar 06 2009 Jan Horak - 2.24.0-6 - Rebuild against newer gecko Index: yelp.spec =================================================================== RCS file: /cvs/pkgs/rpms/yelp/F-10/yelp.spec,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- yelp.spec 4 Feb 2009 19:08:01 -0000 1.149 +++ yelp.spec 6 Mar 2009 08:56:04 -0000 1.150 @@ -12,7 +12,7 @@ %define libxslt_version 1.1.4 %define startup_notification_version 0.8 %define rarian_version 0.7.0 -%define gecko_version 1.9.0.6 +%define gecko_version 1.9.0.7 %define pango_version 1.0.99 %define desktop_file_utils_version 0.3-7 @@ -20,7 +20,7 @@ Summary: A system documentation reader from the Gnome project Name: yelp Version: 2.24.0 -Release: 5%{?dist} +Release: 6%{?dist} Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.24/%{name}-%{version}.tar.bz2 URL: http://live.gnome.org/Yelp # http://bugzilla.gnome.org/show_bug.cgi?id=319096 @@ -157,6 +157,9 @@ %{_datadir}/yelp %changelog +* Fri Mar 06 2009 Jan Horak - 2.24.0-6 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 2.24.0-5 - Rebuild against newer gecko From caolanm at fedoraproject.org Fri Mar 6 08:59:24 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Fri, 6 Mar 2009 08:59:24 +0000 (UTC) Subject: rpms/mythes-sv/devel SwedishThesaurus.oxt, NONE, 1.1 import.log, NONE, 1.1 mythes-sv.spec, NONE, 1.1 Message-ID: <20090306085924.2236C70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/mythes-sv/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30093/devel Added Files: SwedishThesaurus.oxt import.log mythes-sv.spec Log Message: --- NEW FILE SwedishThesaurus.oxt --- PK ???R?B?? ????f6?S#ri?9??? ?i???????? /D????)V??l1?$??j?_Y??#???????*??H"????)$?xx?A+???)?Ye8????{[??z?g????A?B???????=??t??p>??_b?Wg???GO??\?)?FI?+0?>Y???????b?s?.???7`*???[;??>???>????????J????7?'??vK???r??????PK u,???q?e?e ?$$??o?S??r??8?js99r?)??9,XD{???C?N_a?~Z=???????Ixkt.??@?????-??E?;c??,???[?5??????SEA?????W?R?1T???K?,p U???1c????t???VV?r?????Y)J-?g?X=?E$&?7v???*Q????????9(+oI????"G?? J?PK ??q?HU??l?:eH:G~???l???1$??e??????l?7??:?U?7?#P??B]s?}?$x_?2????p ?r9??7)????U%JH??R?=????C???w<:S?/?d??P?O@?uI????n??q??? ?'?p?[6P?(E???H 2?*??%O.?3???k???????39???^?H????(f???*?_??T?{??d??? ?????J?????l?G??M;X?j???3???i?w)Z>??Rn?c?? ? ]??n??????m????:????h?! w?%???6:*?k?l??R?>????{?-????~F5?4???Ug??ul?????IW?5???cv^?jo?B??????*?7??`S?e.??YcW?????????Ue?k???????????NUC???Pe?1??n~??????????7:??????????6?J?X??[}?`???m??sld?rl_? ?^#??O????????U3??e?ts?=wv|???E? {????4??&????- 2?/???sn ?s at n[ ?w?m??Ab?"\n ?]V?`{{??aG??k?P7?mP????CKm???K??n q????+?4,?o?????]?? ????>?????Y??5(???q0Y }?R?y???W0???Q????????????? Z?t??6?j?P??????????????3?b????u1??aghqL???o???? '[?*A?ri1?? ? jg-?s?z?(?6?}??" K????0???4?#gn J6????^??&6jS??y*?bt???W? ??|i?????] 8??rl?_s9\??,?? ?/ ?????I+??N??'/?O??5D??M??q?????z?????r6>9?e]n?y??2-??}? ?d2?={l?H?95????Hv?U???r???O??|E?Ey.m?????Z#???;????*??)yu ?F?!????y?m~?????[??i0??Q,??b????I5???0?1??#?W????[????~F1w0-?NY}!?_?^Bs???K? l$.???=???5?? ?i|??n?`?2??D?c5??q$????Z??^?????}??x?j?q ?^??l?-?2?? !62.??BP?%?%?X*??n?????Oz??????1$g??5????K????? {?:Bfk???N??G??? ?%i?X?`5?{??;?F???? S????H?1$DD?!4z????i?C??? X1?? ?s;??B@?????b???'b??[ M??d?? ??[???)?????B ?????C+9??uK[?7m? ??0M#???H'?n[&???~??wzn??b?yl??????????o~R?Q?L&?Q???? ?????h??>?? f#?uN???=0O\?v?? 3l??x?\B8???O????w)??M?? ??c?v H??\??m=e!Nj?/????at[5,???????????? ??C????4 ; m??w??T24h?VD?T\%?p???"g?C_~?+??yHxi?}??vp?????tz???s??s???iEX????}^?"?!???y?}6Qh???4?,??at+?F???.??2 ?: 7Nn??????I?Z?%?*??8? v`?B????8?5???????0??Z?????z???ZSl????'n?z??????ekL??0?PL3GM??`??g?2?t4w??Q?}:??[,?:?? ??3[#??"?8?a?q??Q`??vTg'????z_???0?\????h????6y?Mm2????K9??)h?v??????lj8H?R?????? ?~??[g?!????j?C,?-$K?D?I?`? x???O4?r ?????m???*????~@?X???? ???? ?d????w?? b?.??lyw?????A ??????2> ??????m???yc ?B5????n??C?.? Fl??????%?E????H >1r?q??????H?Z?'??Qa???t?l ?^;?bY??`?(???{?f?:/`>?#"?6????????1??*??l?????@ ?~?>??X??6M?1?5,Pa??_=???N?|??[zPn?P'J???????]k+k?z?????????m?e/w???0?KU???2T?qFn??l?c???A?????gK8?'Y??????[?bigs B??N@@???a?w??xW???[??-0?Z??G?6????d?`??o?4]??7u??.;?? ?%/,???c??4???lgW????=?4??Y?x?w??k??.Rtm{??O??y??8??FD?v??8?Bb????i)?~?z?? l?|? 1x??  ??D???\?.r??B? #, >+????????$?|???O?Q?;O??F J ???H?t???^U??Y?D??J?j?7?)4?8l???'??' ???Ps??l??e?=vZ`???y?U>*L????,E???L!^`??;6U6?\@??^m?*??^?! ??>??l?^?lW?"?)?????~?k????x?????qTT? ??$ >\??`??u^?t:!.X(???0"?????b???~?YQ??{=R20L$?????[?!2x??. k $G|?&: X????c??=?(g? V~????As?3?????6??`?N???? ???3????i ?g???? V!??I_t???:.??+L?D??V`?:????L??s?{U=L?Q?6^??f?R?8(`???l??? ? U???E8"?????d????wm~??W'??%? .?q?a?C?%w?N?m???????? ? ?l????`=2i"!A?&?#??/?C????|???? ? ?0?A C?????6l-??:?.k?\??9???z??H???>7Ck???zs'v?ev??Ut[??\]???? ??)??T??????^?????~???*??f}?2f^???%_?????$8C:HC?Pvup?7?!????????????????U|????n8?B*??e,V?$b?????6?JX??????!%?3n ]???b'?R?5?r???????A;?]Q??<,A????i?4???qDzO6B???A???^?@a;*?C???>q????????l???eT???kVa*??o?7?E??$p????,h4pG?R;???????!???TP?hy???t&? X?`?????D?py?s??x>|??Uu6Z??D?????E?V??TYpR)?p??^\??!?;?L ?U?8?*??e#?%?!??%?????"? ?? q,?????\?~:D??T2?P(-???Pj??????i)?=??+????cqD??Z!?<\?C???????x?l?????+o?u????F??e"?K??)?[(l<?Z???????n???C\???VgT6?<3B,?0????t@?`?6????n????Em?[R +`?t???t?p???8??g2??j~d??y???@l??l+rG@???[(????y}?H]??????????kb?????l?C?^+(m?#l&?????BL+???]6b??F????t???RR??S????/c?'??b`?CtE^?? M?}EJ???z'x??HvC?aD?????!S?r??F???#n?????s%BPq?XL???|X?A?D?5???\????b?`???????)??vR???XD???P 4V?C_??.B???m`?M=?H? ?)?oj?G??Y??u?? ??jV????u?????????@?GP?;??8U????S?JL'???w??N? ?F?Sp????*?x? ?wA??^?"r?E???)?/,?? s??!QV?Y??/?D?"?[z??A? { ? ,G?p G5d???D|,oK??? b!??q?V?o??!???+!???A|??\I? VSj?(N9?)?=???H?p????????? ?@q)A?~?nG????.l`??i?? s G?[T?i?u?& ????%x???Fb?+?e??1?????0??? _+?w?? ?P??^?ty(??? ???>?0?Q+?Q{'&,?5?]?4????oF ???D?/?S4m?m?????????M?x?????-??7????@?^= ???mLr???*?S??J??????$???????n??V~?{?Cl?8Q?GA???d???3&Q?]N??~?e?l;???C?c????kF?$??b'^??}?? ?&j???A?e?!??h?N?=?????C???? ??%?O??p? )?J?y 77??lYw??)?!,??f??????g??m??DBY???bL?my???7F$>B?!???????EW?g???)????q???? r??n+l??:m?S????Gi??`????????)$W??????Z?B?EPV~?_y??s0??L)?u?6??X?)????V???e????#??Y?????P????a??`?zR? 3?????!?'8???P?L?Gr-???????? W4F?0????H,???"? dxNT6????@?:????????1?????UR?E??31???? 2V ??I?????p??_?????>Ie?#?????h??y*?C?6H?j???@?7y5?F????N2???4 ~)#^??B????oO?{???c EG??Y????}??AGT? g$???J??/???F.v*^ w?8?4z??]??O|RnDl0?WF Wg?????\?w???S????0?s???Ldl?j??B?????K]? ?c|UD?/??/??>JDc(?28???\<\??v-? ?^??'D1A??,?f?C*??z??2$5??%????K? ??pt?????*???????!,QG&?y?Z%?? ??f[?o??,(? ????S??tr_????CPBH9=F????y????a???}"l??,??]?M?=&??fA??? ??!?T???:?Z:23???]? ???D?????}|?>?b???Q?(%??f??V??y?Jz`???u0?C4?'gh?c?bD??Tt????j ?cK?Hm??k^a??_$???????'?C?n$???@???I??&????Qd|1????*a1??c?<3d??I??U0\Y????s????A??g???-?d????HG%???"d&?????Q$:t??D?{??e}0?S(?3A???t??4Z9?2?n???(ZkN???"?2???????Y}????z?|~9*????ID???)?e?v??qA??r????????i??,??j?'????i8)ZW?=?U?^?*?T}_????!T?K???a*]??w?f?0\?.?m?kX?????/?'??@f?H&~??tj?????1?^?2?o?oO!I????? `%D???{?a"?f?E??T?k??5?;??PD?k??j?g4?;-?H?8?????? ???????????? >?aZ2y? R?S? ?? ?[?. /:?a?:??=??? ?}?????yy?4o_??U???_C7??(?l`????0O??52????Q+6k?5??J/???'+`??"?p???? PE??????q?#?[m?Z?P??Q??ZBeM??k?1{4?c`}?1>( ???A??z?????a??-????-?????7??*?????????? :??? H?qu??(P?8??3?~???? X???!A%J?C?kx0??~L???B???1? ??yR?T&?t7W?>Hn???)3!?????ep1???DV?Z?? ?9?????O?@?V?[?I?L9?S;??????i????O?E???????27?* ?2?"$K???????7?W ?&???z????2?dV??>??[??????}?=Nr?#!??7??;v?\l??L???to??pQ?5h??b>|k_k?^??????'?s?0??or????p??nk???T!???(???^]O???G2??n???l???=???????#????c????2#? h;?????5??N??HgWx?P????$8{6??y?n?b??????O??n? ??Mn?n???? ??mq??M???C???P?|?x?(???[K?8?VV??3???&??r?,nd???kY]?F?z?????B???" 9??c?9??>???1?$??? ??????\N???I?~????? ??? ? l1??>????e??????????X??#??$?c{D9?o[o?I?s?????z?j?G?`??G?H??????w?????~J1DM*H?&????g??E??N? ?P????D ?????q?C8?????U[????|?????y5??X%U??<.???W ?yE?`?D ?;?0?~/q ???u??n:9?v???E hZ_? ?--#d{:?B?w?? o??X?,?r????/-{??N?1??->?v:?D #q?? ?*G{%?????????0?d?r9???f`??YO.?OI????]i?hU?*%5dl?DB?$?tB|yG?F? ?g????????W?Q??h?v?????????????mS?CJ?A]???7O?m???.????s???#sX W.?W??R?O7???+R?+G8+??L??????(?q???ES?GWxJ?????C???D???/??'??5???????)@V??P???X???U*?^??4?hOx? ??r?BL~??7??????w?????????=??????2u???2???6ye???A??p???y?%?O??u??I?)?d????W?????????????t???K=?&C?OHc(?g??,???=?~??t?????8?,??L?>??I???Sm_fD??? ???w??? }????T? !??\?)$??;io??Z?????qv???s?`?& ????X?E??a??$? F?S???onCP?pop\?1*+ ?? ? 6?????????&??\??? ?1???????`}??>??gS0??x?81???>U????9? ???ip????F?@?M??}???1mm?'0t??4??Z? ??b*????SL?Sr???Xc?,??\y-???H???s???E?^??`tB?&??{??X!?G8)?%?}????t?q?????????<1Q)? 6n~G?>??>[K%(z?????????o?Flp??;M?9???&??^I?D????F(@?h????Y?/Ct?.??f:???>?=???e??%?G??$???%r/}?? GZ[???s????'?\ih??Z????? ??x?3B??l???f?{?:? ?V???W7 ?=??h??S+`? ????1??~Q??P????E2????nhu?*O?3F???????0????8?;???"?}????0??}??????7??*????@??? ????????r????T???o+?1?f?3Q?xL?? gR-?a?F{????n;??? ??+?Z#:5????????4?? ?g??88?????T?l???Uk????2n?? f9{b?YoB?ac?a??]F {yTO ??Enq,?:??????-A?$?x????;Y?K0q&??c??o?9`??U9?"????e?? ??????t???????t8?? 1j???????p?u???_??????p??????U6M?|??g?qk?/???WB???? ?? ??Xd-??8?e?G???nS ??3???FwE5??q??9k??????c ?[????n?i?jK?G??[?d??-?-O?O\>d\P!?;?D?Y3??/?6? ?#!??B?%7S????@?3???9?f?????v73B?L??l?k?}?????e?Z??'iW?Zc[??{???' ?t|???7=(??f}+O??C?P???{osm ?[i??????_?? y ?Eh?????P+?\5?g?t??.B?? BRvu?????06?w?'W?"?? ;??-???K?s%E???X?Q??.??? C??=ML???????,C ???n"???l]???%#?H??Z?YF ???h??c??????x???`??Y>y3?^j???????>,#? ??T???????Zw ???4Z?};????HMp??a`?c?\?:!??ir????j?F?Wb?Z?(u+??1#7???n????)?? }D>???"??????Oe?~???v??7?(x?Y{c??: `6?7?$Z2 +{?'v??%???Z??q??S??L ???D?]t>??G?5?pE??[}>??!??B????>?[: ????q??Q0? \~?I??????Z?????&m???h??2?C???+???u???0?+y??7V??gb?????=%?*???f?u\??-?I# ??6??I`???i(?F?! g?{>??^?[???????)Z???WE?????k??????`?=?????i????=O_o?Rs???#??U???"???c?????N???O?[rk F?9&:??5?????x?\9?f`?4 ?sV?/???_ 6I`?Z??.???*???B0L?? ?? AHY????B???L?: ??M?????????]v?E??{#???s??ko??{o??>1n????)5??TI?P??t8?J????????:??Sc??: [O???&E??om???G???Cc?/?;??? ???[uy8???fK?o,??G????^??5C??6c?????! ??.2 ??.:T?y??.?k>'???{:.c??> H??99???K?Op?)w??? ? F??c?)Z?`???? ??b{???p????+AnL5F?n???;#h??????4094?F?&p?oF???xHn??'??????XJv??Ca1Q?X???da?p???L??c?)l?`?6R?????g?W???Ef%?8????6???????+? ?M)????:V?!z.????q???B.?4??>6???????????yGg-\???%???_??%?U?Iw?Uh=??\?s? %  ?Q??+ ? h|?{x?NU_????#? ????0.W<[?>@?J????X($???yl??????p!???'?p?P%?&?j$?xHcg?0? a2`?????)???3V????%d????=??G5????:?+$?'???????G??7@???}?h45???????`?I???2????8?????>;b??*s?"?3???C???&???3?U ?k?1]9qd?? ???l??4??????rkQFj??j_J{??e?g??????q?????????FC(B?1?jo?CI? hi???O? ??k?L"D???F??*&;q R??>Zh?:??E??l.?FqF?G?a`?Qx???G???J???I,?h \,v?)??X?-aK??Hu???????:?yG34????%??D??Z?Y; o? ???4oX??3b?|??hj&?kt?$???8?i??G??O?w?????? / )d???I?b^?f?7?}h?? G?+??? >??qL???;a6P??C?u#X6?/:?G[~?_??B)?pv????>???B-??@{??(?{\+?2??}?????g~e 3Z?5K?????-u?z??&?PT5???^B?(??t?09?????;O?y}??+?"??W?-1<|? q?q3??????/?X???o??_?????[?????NLB??n/ ?X2?n?z??;?E??M?}???T'??Y??4G???fQS?^??N 2 ??/lG?P{??a???????E4?0?????+ ?mOt#W!/?S??aK+?J?"Q]??? ??ED???G??<????CA?`$??????9?l?%?K?d?m p?u????69?0?????Kt P?~???P?????c? vE??v? I?vN???ph?7???m???L>????!'h6T??+%d?H??u????a?|p ?5{Z??s|?? ??1a??V??0+???f????w???,?!?? ?f1?fGL???\?J?6???b?[?????????rx? ??('k?????S?????Yrp?????O??#? 9?F?U ?,&???8????NN?d?C?{q????????q????z z???????AQj ?>fC??C?=??c????e|????kh\??3?q???_:r?????:?????|tm????????c??}??\)?x?N?????v(*??Z??B,f?-8??X?????^?? ??Q???? 3?B?~5???29f????W;?]p?)??]?2??t????????????L?|Q? 6????f..?wIR?!??????|3?i,???p?*;(>?`??Ow,d???a????^??? ?5??]'????)?d?-?f?$????F$??@??p????#?b g?5K? ?5s??K,*???????FF?:?jB?Js????A? r?t?6?? ?)??????7?????z?K>y??>???V???@???o?ro???f???y???????S?,]Y{??7k?K& ?H ?7?????/?;g??D?C???S! ?*p???????V??????"_?z?Z?S??*?D??'?N??????{?'9yRz?e?z???j?3??b+?!1???Z?.?{?o( #?M?}W???uh????????Q?!5q?5?F?????P?`(?*?? ??? ??? ?)??&??????|??EHT?m???r????yf?3E????t%)?????o??g??d Oi???8D;N??T???F?5fd?V ??"b?(???l?????\????=!??B*D>z??o?N??`?????]??p?V?? ?p.?C?T???? :)???Z?,??*6??? ?pG??RI3p^?m??M/r|q?????????T????? &$???????5a?(? ??\??#? ?+Q?`??d>d??7?Z??????r????g?\?kW??&?O??D ????Nd?????JL????D????7??n??\?{i?'??#r?????Yg^2$h?~?????W.??Q?p???Zh??d?y0?e????????Z??l?d-M+?? ?@}?????.y$^&?J ???????VqR???xa>M??1???m??}?Q?l?r?C)?_????O?????V ??#S?_e??xTu???h}????????????Ji_??q'G1k?S/?0>^S0?"?0'?if ??%xu?G8s????6Q7M?$??????{ ?i?DF?/??N?*U?? C??'???V?????T??cM???????.r?q???2_a?(0????\ ?D? ?l???m??iL?v@?kp?@?? ?? V?d???????????q~?C???vN?M???(i?Cj????U??l?U?d&?e?u!???????sr$??p????x????????8t? 1.??s??;??N?.?#? ??????Gyz???0???&?????????5?T}?[?_????WV?????pC??y???^m-)?W?j|?2???:?"??tH?)?_2B? ???????<?O?#??TYFY????Q?7??t???:?%?[XL???$!???m???Q?Ba??> {?p?E???f???-??}??~l[??T ?^?~????;??H?X?G#wm????A? j?U|Vl#????? ??????_?f?=? U??D???x?Z???i??|?mb?*?f&??K]F.N??$??r?????z|N?????t?Nl?,X?????7 7?z?*?|??0?8P ??J*??Aw?w???J??j? ?Q`y??v?K-[???????K????7)N??J????U?Z?/l??U??&?1?+??3%??[??fg?7?O?+S?L????<{???c?K5????R???j~?]???7??=?_Q?????;`??????p?8????yyv???b??46-??N>M?? ???;5??A?-qK~+?/1?@:?-d???G??W?O=5?????f?b??t?? MP??`???Ca?)Og?E?>?q9J??T?]?????D??j:b???!??o?7g???"???????B"??[?????????w???F?G?F??]??R?W??n?3??4b??]F??L;?e???U ????ZK?<\?/???,?X ??! ?/??$?_???? ?'?l?8Eb?!A???I*_????x?3??$f?p??9???KE?uj???Xx??? g???b?}`@[?Y'?????$??ENQe O(?q ??%??xyH??????{(?I?p? ?????E*?di4Fz???? ?3?X<`?MA????U?????????? ?V??|?N??]Qs???fdjE???TR?E??>?D?????MY? ?HB?m4??w?.?s???c??XvnY-??o=?A??_??Y?sKq~IW????EShZk?P????e?<68-o????=J???T{a?w|?M?5 ?$*? ?;??????????,?gy??5?]?????|x3????*???]???<]?2?(?p"??G ?c?Y?cf???#;?%??zw???????^Y'????>DY??T,n?????????3???f??c?5j?d?XZY ?K???????k?>???5??[h??? sV???E???i?T?????u?:??P?DR???+?-?[%?? 1?S????t ??q_?m?????????*?f?M?????????#$-AEnG? F??s @??1 ???z??o??|F???[u.*??zv.???6ri3C?@????? ??~? -??b?bzs??`E?\wk?????i???)2?^???8 `?LB? ??e?-???>?s???\?????a:4VHAth?Q??,?04??0?? ?? (4?G?1?l??x?8?????K??(\S??=*a?+??????6??? F??$??n?n?k?k?m:??C}??k??2k?*#??? ?7?pI??}???6??0{-??????i/?????????g?70????}??vu??}??f4|{?????0??(k03?0LS!?G?t????3?O??2??$U%(H ?\?b ???6?????^??r???q?K?$/??`?{???rhc??j0?a1JA????&?????u?F/???w&?9.????1{?y[K?$e???n&3??????.???U?j??hr]? AX+?A???>}U?t A?tt;?r?\q?~!???v~??? ??u?/??b??8?]E??#?,??E?iE&????m????^????J??"m??/i?p?Li3???P???lh?#(????[0 ???q????/??Ng??/ ,???7Up^??5??l??,l?G????U??`1???=?]?{k??M ?J???????????? .????E??? c????nq?????q??@?????58:^?,????????:?E????\??D???? 8??0?v????????????Z???>c???1?Q??/ ???? 1?B{?r=???a ?B?tX?'?m?78 ?? nT????.?Y?g?.N ?|?[x???s ??f???E???????cJ_T?pR ??AZ???2(3???0??????????p?^+ ???-???$z??aD?,?'??? ?q?(e???L?z?35?x???pZ??????s? 'AE???q\???15L0?e*??8B?@??????!J???$ZX? ??? N??:@8$?+???????????VWFw??0:?h?? ?-3 ?i????????6??????r??k??C?A??=?$??????GN?? a??????J?@9?8?P???|?5?X???? '??^?pB? ??"v??????????,z-??j{&??:???1???s??@?D@??b"???xE??? f??l4?R????lAW???!5?v??i?n?X?:??V[???5? ?!??z?uy?PM????d????#?9?? ???^?/}(??$v,=PrOBP? Xo?# ?????0 S????r?ErOp ?;??D??S?A?N??C??Rs????ZO?????5_2?jJ?|??T,?.o?Qu???wB]+(?$_???aK?>???7?????u?????2??0X??8?S??[~?%?7??"?i?X1???MN??Qa?p????k?IW????B$??#???D+wJo???>??Q??'b?bt?????P?J9Tq?,u??fn< ??y? ?=y?X? \u2n?e???2R????"k?.%??k??=??? ?,?BcX?j??/??5??r????J??u????T?i??;??0???"??\?| ?MT????+P???JZ? ???z?]??k?W?? e???????@aLB<Z?m??8w?F9w ?q?W|i^??D? ???+j????t{???Y???7???Y:nM ???)???U?h]?????,V???\????1??z?y?????o???%???U,*F?!i???9-?{*?'?,?????whP????RA ??????,?????mN?/j,-?z?NG?=?Z*??T?e?U??E3Y?M+?????????????????}Q5??ob?z?0??5^ @D;???????u[] r??n???EqK????|q?{{X1?<~kQ?c???????pgk? =??%f??@?`?p?? ??????H?$E? Y?Y]?Kf?H????> ????a(?E????X_c??MO`?? ?oQuLqK??m \???&??4??????` e???t????{?{? >????{3q?? ????1bL^T?D)??~???G;?U`?z .?Dw?????AD9?K??71|?????sH??(-??~??? ??????????XA?=%^~?RX???C? ?i?'??n???????@H?I?l??T}?\f`?f?N???]???n?^?.b???????;[???P??29????9B?????N?A?&1X?0?l?E?cwi?%?J????1uZ) &DPp???y??N??z???k{i?b????I?0???????D???*?z '?=???`8RH%????6?e]???<'??_ ????????????g???N]]i??ds???X??J?#?k?U??????w3??{?J??(??:???q?}???=?e??g??|?????bk??:?????????O>??? ?????????E-Fs?I???j??R?_ ?.L???"?9?D?dl?v3&?-??u??Q0??x??(5r??W)J??,??|r?'?B?k?k?????H????[ ?*?B????p"? Z??M?+???#??W???k??????e????#??['?) 3???????z#U ?PI??j?f?T???A' ???x ???dN%??`??E?&?c???|????F/ zVk ???ZT??i?%d?????[?r+?b;+? ??????m??Uj?>N????A?g?Aj_???????R ?^??t??^?I???t?qc?"? C?4?????3??/BS6?hJ??,? ?C????k????]???_???/?]?Z???|??2???H?I??-!?,?????????Tp??R5? ??!?b??????GGx?4[????O1??#?Jb?AeZ????z?Ox ?)jt? &??????"6????????????G??{.??\?b????????V0??b]??7e??9??gj?-B????/?/?? /????1???6??'?????$?'??N????/?f???k????$QA<;??l?JN?&C?j3??>R8?_??1???,?a[??o?Wp%u-???[?? ??Mj8u?W????Uz?X}? ???HU?|*t?dC??`?zO??pp!????d#?D?? S?k2?x???q????2?a?g?C???n??CR?a?i$?x/???8??2????Tt?rH:???T?????^f'?????@! [c????{???F?F??B??1????!c?E- ? ?H??*v}?d?????"???0+q???h )???????.?3j? ?????!8?M?A0? Ks?Cf3mlY??)U?NH??@-??!Rmh??*A??K??^4???+j??????!:??f??*?????j/{O2??o?? ? I?T???????V_?8y????3%??cv?(_????E(???wkU??4?#????25V???8? N`]??,?+?>Q????k????g???BI?T? ?? ?Sz????{D}?Rwn??e?z??? ?h?Td???G.io ??=M4:q@??R?i???^??L?j?Scn??L?OH?U?8?o??_ ?l?Vj??*???a???I?i?? ??y6u.Q?,?`h`??*??????w?? ?z????????Zk?6zP7?l`?????Nr?*[???1???w???y??L? ?????"? ??x??? ?v?? ?????t$??m?Ck@?hvHOm?P?C+??\?L?_ ?U?`?_?[???6??]??????1?`?K?a????}?=?`I????H'????piV?V????Ke43??y?m?kv?jf>?-%Np?;$?? ^???`???co??zC???_????@Y?!????a?F??B??~?( ???8????????Nn\??1?q???Ln???A??$?7??%???? +?5???d\(v???t6?<|?r;?N?9H1?2>????\??? ????op R?'0;C???.OL!F?????? |M????de??k?*?"?!????VE!~?L?t??3]?V?'6????`???aT)??@??i??'^???go?%?ey??7i??pf??????????RRo?Yl??n|?>?To?8K?p?i??g??b????????/s-~?G?!?"K???.6j?6I???? ??{???y?_Y???????? ??(U?????|`?????^?]4z]3)??y?b8??-?????G?F`?Iq#??qF?C?IV??y 6vC??~E3s?H?R0???(? ?fV??/Z?V?e??M!V?E??\??????XL????>9?i?u0?(1/&5?DM?|uh????Q420u??:X????H?????Q?Ba????m?>?E?!???????????P?6e??? ??!????????T^qUD??;?&?bA?????V ??[;ykb[i??BG?&/???hv??!mx??'?l.?o?f?T?+?0??^?]:??b?t?Ti^5??nC?? ??{x???`T??b?? T ??????B?X;??TX?y*??`???B???Om?NkI??P????2 W?j= ???W??? D)?(??$?!G???F???o?K?"=??P?USC]nT???/ ??R?Ko~?? ?2??g?O&'??? ?v???j??????EN????? _|??? @?!n?q?? N?N?g??%?????+'y???vK ?J?/?M?B0??o|??QW???>AP??8 at v~T?m??v?2'??~\\??????T?s?-??R???`??N???v?|8???@?u?8???m??v???H?%??? 0T????~?JY??=?[.?|=?g^7?? Y2?\?????WL??|??????|7??n????[^YL# ????? ?e???,?-c??G?p????&???=U?s?N?P????~??????@??Lct?l?? O?$ ?@1k?6?????&Tv?'?5c???jl1 V\? h????????????*M?$_??u?m/6????????=`?sl?J?? O&+My????jPP?????L[~%??2??NJ:?`|?'S?rb ?;??? ?q???I5???ic^?T????=??}|d?9j??9; ?O/?D????y?A?? ?wo??)?gcZ]?7 e?(???Cp??]?hX6m? W????3???v???fD?S7???^? ?V6 ?h???t?={ ???s???'?>?V????? ???W?D???????????r??h??i-?bu??? ,????)?|b??????Gne??\??????_??/Bs??UvQ8p;????}?????Vj????[?F`?[U$?t9???)[??,e?SIN;?(???l???[Vd???X????Y?M[?i?!?{?o?u^?p^?? ??44?? ??vV`?9p?3^BY?(!????=9 ???2~q??h?K???|???????>???????/??j?W??5??l????B??Y%T??^H???@_*???????????}???47?D5?y%??O? 2?KK*?j??? XP;g?o????? eR?Y?Z?R?? _-%?T?|??????h?h??M(??X3:?T???A?e?F?Y??????b?L?$???nH??iqN?fn?P??J???3???2????>9m@!nf t????GA??a?????y?4{e,?Do7gv?K|?????W?|09H????z???????? ?z???fY?)?,|???????g?c?N??u???p?? ?R9?H?TtS???ck;????_? ?????2d?6&^c???!d??????J???G??q.???8?Q??????T?u}??d?S?????_B'?l??Bz?)?X??W?!(?MOh?????8??6?/*?????`?? A?=nD?Q?AH?R??1?HK??mo?}?,B?{ W \?0??pQ:??f ????????????$72??$,? P???r???Cd~?1?h?j??????VXr?}4?e???o?????,???X?K? ?Bb{??7??K??K?K0&?:???o?C? ???O{d?p?i??M?Bn8j?t&4?n????+???{$???4%?*?X'?k\? ?:1?????j?"omm Y?3?mn?????N??? 7???Gb=c??? ?H???? ??U?D??=#U????????>4???-_?????s?a?nVOZ]?p\?+???;4?Hi?p?|???????c\z? k??5??A?? ^??>? ?]????m??M?4?????G????_a?^?y?+ Q????q??????????)?Uo????fx ????Ko???n????ylx? ?s=?'s?8q?^u????#R?X-???~????i??W????N? ??EJ???j.+????{?r#?e#?_????y??/V=??????#n?S+??[N?Y6$?!6?????_8??|??/?P??/Y???????\??B?L?oL??M?c???MP????h??-t????6???:u???w0?v?k??D?? ?? ?????fZgG??? ?1?aB??vJf????,?p??==?????F??????B??????64J|???y???[????s?m?????????n???X?f ?-??`|1??z=?????G??????R?2??*??we?9?+?1+??????9.? ?[?]N????????????6?F???A?x?*e%???????f?D?+?????o??3ml7SY?4=aj???I7?O?L?H???m:D?F??? ? ???(?B?i??? b???????o??3GE?4?W??????? ??C???????=?????v4c'?? +?|??T?K?}??e????>??3o???HU????F?? s???W??xW)?? ?)Z??.g?v?j/??.???P7@??=c???l???tu?????h?A]"l?esz?<< ????$0Cph E? h?!?.amA?;?'2s?u??CA?EI????L24?Y??????g???E????zsO?}+? ??}???*G?vAq?(?x????h?k?J?n?0??y,k?m??????? ??=D????w|???:3N??c??;?b6$???????bx????HlxNY???s????/?? ????2?>?>??-???a1!>G?4QGA?R??nO?E7??W?:???Zr ?="?^H??CeD??"???p?b?(?s??w`?{?ZG>?=??M???+??B4?+?0?n \??mf??\)??d??&k5X?6a???u?r???Cm)??????9\?;?h??Q????a&????,?P???[{???w????Dc4????? ???)U?? ?u??????9(o?U????|????CE?K$c  ?????&??w,?;>??s??l?ZUq?i??? ?{?0R"????`???P?140??>Y???d* ?Rx??d?s??????????^?f??gB~|7??Ug1?}2???D???sv??-??(?q??5a@?????qi?D]??#??d????`??$?"???d0?=?2dsy?\????G7{?-?:?$??F??? h#%NF??\?CL?=y)\?uo?-?@{??! ??T??1??X????4????E??On-?F??6`B?~??????'?l???3?&~@?#?t!?cW???Q?? ?+??_?0??_)?/?X?L??{?O??????N?5E}qm??V?)?'*Y&!?????an?f?:N??@?7w?j?Zt?????)=?????k?B?IRw?w??n 5??YW?????? ?Kst?V~-?:?k?`??[???????l]?;/?[?f-??f?p?[??^3?JX????a?gY????? ,l??_f?8_?-??????? ?B??T@???J??J?pp??????r?!/??G?????k?B?G??????h????????I?????K???:C?@0?M??_g?g?????????La'X7@b??3??????????r?Er?B?O?1?????!?Z??J????*`t????kg~`p?6???T??&?????????? ?U?j?????? ?s?????w?r?,?? -(??Z???Rw&c?S?*?4 ?? ?v?L????TJn?`Es??!??eq???MQ?9??????J?C^?9I;D}???????'`9!/?0???!V1?+???~????,[?X??z?C???????8??5'%?Ck?K ??? }3b??`K>??7?}?y????2?(?AN???6??!j???????q?-`?(S?????w????>?? ???3?o ??p????? ?N?????V?,??HT??ww?S??????????F?F?m????T?r Lxk?Q??S?????( ????O[?].= P!?.???c???`I???s?J?<\??????\?.??y??O7????3?q?????-T???a????d? k?^]?Z?td?[E?????p2?M?}??N?? ???w8?O51v?.????r ??????=^Q?8#N? ?|??/???G?????4??T????c8B)???v5E?aL H)?*fa??v? ??}?F???? Z{???b0 7?0?E???????7?8???? 4^#??1???.m?3Avt5?Va?`.?h?Y?N??????6?+ 9d.-??;]*??a'?????x?-?S?nU?!??Cd?&??O??? I'A?}>??z\?}7\y?%?????????_????+????y?D??H????? ????????\???]Kr=???f??7Fm(?*`??QU?W???u?f?/ .???F???Z??????? M8]??C[.??h?????? ? ?r???/??C$i?????&WX?t?4?)??!OC?+?7|??L?|????G,???????g???K?r?????t?:!dsjC`Z?D+:aL?????J~?? ???(?@{?u?d??R?KM ?r?^|????%y8?E3t????EOL.?{???Q'??.a?10?m??h??M?h???_*H?~_?L?6?%odP????s?O!|?o-?cx .mN!??l?-?Q???????!}????0_d?:?\? ?,=?&??9???aB?)??Y?????y?9???[~????????f?4?7d?/k?_?Y????s???Ia?xY ?{y16???6???l??????)?G7+????Rry??YU?F"Q??x?8 \??j?1???? !3{=???v??%???ia?=^k&c????5n?0???!h ?W=~gl?W;??4? :?.GV0Ep?tf??y`dr?Y??????yh???Go?!3}4?1 ???WZ??????????i????W??gU?)J?{??L;8??fY???? ???h ?p \? ^?4?? "?v??$?"???0????? }? 3K???????????|???? ???B?????>?l!????]???e???w??sa>???????U?rR????J???????????I?/?A??QGI??Q????????? ?C/ ???? @ ?j??fn?I?????~C?}$2?*???y?}??L ?????!?,?#!=i? ????????Zn?x HZ??????CMOC????L?>!??????5_?[ ??s??V?????; ?P???? WZw -??uq????g?E?????????????=?????\??,&?#?`?nv$B??p?G90?bh?f???????E?`?????c?r??;?  %@?????????3?vuR??S???=??$y???I???? ???>$???w?D,YKH+0W?iw]??]???\~?]R? ?hK!??51 ???l??? g?Ne ?>~?l|????R????????_??b?I?u( |+=n?}??E?2??>N??!?S??????~ EM???jU????4_-??(???u2?e???????wjz??1??-????x/?Xx?I? ?v0????x?~?!??EH?????$e?????5??R?{@????G9?&??F??????#U1\1?0?c??X+[???{@?d????`???)??J?\?=?????-U{???+w??xWt???D=!/?e[Iz?,0?*%?l?W???N????wC?6?C?V?YrD???(j'????l????5??;? ? ?P?*??M?`??Q'??BFF???J??????????*X?9?'.N??k??O??^w?H{???D??W"6???Tw??,U???EC}??m??e???3+??c?z?>]K?TN +9??c"&?DL?=?;?K?ms?"?&}[/?r??1???+w+??A>?W??3?o?=????m??.8??=??CIO?Ty;? ??|?s W%>8? _????A??? >??? A???,+????????e0?\t?O????./!??'&?q??H??j?cH?????|???1c? &?????% ?RoC????m?1??????-????CHd???? ??xx??9Z e)?r?Z|??c?P???(@? V^???????(??????6 ?????q???rL?y???{?????1??[Lt?r?c\] U`?QK???^????1b?o???a??O??)????_Y?_?u{5-?=???????PAN?????*N???????w??g?? ?r?{E?s]?o]???d???7?9? ?-??R?D??\???a???n?j??w ??????b*?}?|?&???=?O???3?????HM ?z????^?o??????m?????????A?/`???v?VHd*?s??V?2@????? ?? 6xKOo???nn?H?@V?Bj?4???5???4?1??u4??H?V??`??b?W + }??????h?}?64d.6????W?S3'N?/e?+ ? y{U;~?1?}5??qr?????F$d:5f??r???[V`c?U?? X^p?? ?v??u????4??wLu?Wp]?_6Z?2??'?Nq???X????J??X???7??c{?X;m?????V? ??K???/?rLp@?l?W???/??I?@+??23?Q?????????8?^?~?||:pAK4^?Bt??>???*?u?\????Y?0?@??????#?GFk'?????"X?P????????(X?2? b?N7G;/D-??K'?e ???0?^g??+e$??>?(|?z?????=xfQ?o???g??{??j]J:F?b???",?e?'?"?*?[????lI?C??$Q0n,?V?r?[?H}??Ps??-^????}.ur??k?7??\m?}?\??E???V??B??????w?????????7????xU??I?{?C?2 ?({??1)?L???&/?Y???{??? ????\g;?=I???7e?c??N?.?4 )E???J 0!?LY??j??!???OQ^?,??6?U???Sj????Q?d?g?hH?(?e?>?? ??V???????2??)?_?j>?.ipx9`???5??????Rq?rr????O6??+????w;?P6iv?????V,?m7)C??r???*XgYY??w}?) ?A;???l? ? ? ?MG?@???X ,???%n?*??;z????wh?.?I??N%\??$? ??????Z.?@?(?',bW?Js?Po%WG?=?\??x?M2?z*h?z??n???nm?:?v??l_q?{B??mj_???g???????V?r?&??????'Q29?9~P*m?????u????(?X?U$????R?= M???E?y??/J????=*V?o@??V?Uu>??h????? ~??['???r????qs??>T????s\&b?a7XI}?\??E ?C????=?R????U???M? ,???~G?@??e\??b?w?V???????k?????????I?K)Z?N}??K???A????????????Z{?????w???C?????C?l)*AT3_??U}??v?!???6???W?=?l???7??8?T6 E? ?G^=???j?????J?i?k?7H?jJ?Y?c n? ???W X??ak???e x^e?c??'n{|???(X?]???o??!?3??? `J??w?O?V?UQb?????????%D?l9??O?Q?g>4H? [?c bQ"62U????o?\?0?W????5??9, ??{?S1|??R??????;i?*?Fv?? I??S??????w???kE ??5C???lYa?P=??f??????[_ ?u"'??UJ??WQ_]????l???&????>? \H?X?H??"?[N???Qu???P???0o\?;?%A??b?L???????N??2fdw???O?5?????HpwG? ??#qGJ??B&?I?@????9???>=d?F" ???P ?,`?[????w?S????e @C??.CXB?????7l?????{1i?y??[?M???q?.?iQ?Y y8???????J?)%?h?q????Nd?,O#??.????h?7?r???????;????^H xeR???a????????Q??@Z??+9??Q???l?zlc?????_???3???? ?|?????6??Zy????2 ??3?#??G?!,oFjBd5?>?g????{??d?*;?^?kW??2M)g?????K~?lf?????l????7w[#{5u??Lj?????Smmn??4???b,?;??8.dZ?Q?9Yp?????w>Y?}n,????,?3??"Y-??~GhzX?????J/A?/??+?hU~??!??????H$:??]EI)???+'p?? ??[????Z!?u)p????P ?u???+).P+?qmM??????~+a??Bs?F??????gxg???1d?????lh?????E? S???$1rc??m0UXXX?|?S??????~@5jY1?2?A6?? ?? ??bp?J??3 ?n??$,??w???]???AO'??\o???????;?_??I`?d?!?(~????I????w????nH?x!???gW?1?F?%s:hu???c?????A^???V?/w&??x1?$q???n???v"2? ??H&V??R????????b????-???{?Z??x?I?-????D?h??J8:? ?C%&?9??T?Q/??g????hv^u?(gLH???iZ?o5n???????2t?S?|?'???1?FgxT??>q?Ni  ??X?8H??? ???a?d??Dw(??,??wj??6~g?o5FP??RO???????????????Wb; ? ??n;???<:?8??????^?o???????s??VDU????@?6????N????)'*7GqH??dI??"? ?F68?zA?:u????a???Z?? p??X ?%?LQ"9? ?7??j?v?n?-g????*jj?????9????u3?5?:n??T?:?=????R??()o???X?B????e?>?7r}?gK???s?+????? o~?S ???)??u???SY?5?#g`u?G???*jJ?x???6`0?2????? vg????n _?J??%?ZE?oW'????&??E?0=??Z???????????S?/??????}(@q?"g T??l??]H?^f?8??????xd~??? ??KU??Qf?>@???Q) M???9/Nb?Q?slJ)?:??tX?yFx?N`8)?$??:?????&K? v??J8????"u%??? 6?a/?|?m? ????:b??????????qU^?(???3?*/????)????{?k,?c? ?? ???jv??e?L-???6????W9B?R? U?,?4#? ??x??G?vw??V>Sg???3? ?H??Z?3j`FJQ?f+<?m?@8,????\W?X??V??+?p?f?G???E????????H??a?1Us??????V????J?W??m???????Dg?????A ??Z?j??L?????>Yt'????~????}?+?0!u^M=?X??????? ??tuU~m?Jw?c?sqm?Rb??u??D?????6??NH???0??$5S"????_.w???y???d?3??*|?~??????"[?*^??[??f?^????f??aFiC??OrI>??X?Q|??B;???S??D??OC%?`'?]ZS?d???:?????:dK??G??_??q???g?e?'~??P??o`1R?D??? ?k??y????S;????<m????%?#@?E_?? P6?O:5n?=#0??_c?WI??e??6???o?Oq?P???T????#g??Ps??{?+vBrt?b?????L?a???z/?s??@??3|????????G???L?????@?J?A5;h'???K???????1?-??@??8???O?^???o???j??e???\|d?p???>?#????F1??u_7cZ? u?????z?????]n??????{??+h?'??V]??????5`~5?m>P??;?p??oG?!?+W1??*??!8???S?????????A8?l???? 5???S}|??i_????>2l!V?g??`????=?@ ???`?b?tk??? *?&?(?iP R8$???F+'e?(?&8??ZKZW?aw+?lN??s?B[bKd??|??>?&????q?S8?????? *z??????H??????????~l???|F?4?+4???E x Y??*?l^?S?a0s?xQ?}????N?`:??????(?2!???*??.???$?#3F??q?????????"+?a?|eP??9?? o? .?l ????x?b_?N??????d.? ???[??$?=???E?????R??/v?????0y??????c????5?[?=??*J?"G??fn??6?2?H?\?20?Io??? -??????W??R?X?N ?og?v????? \?6c?~a?T4???"E????????W??? ???????jc????X??? ????? ????agp ??????0??x???b?????0{???RR?)?{??4m ?G?-??35?:nZ{?b???$<8"?02C[J??9|????y \?"O???~$????qt {^????6?+QXV?\;?0??KD"?i6q????p??|c?n???V???????z??GC#???????py-???f????0????H?YY6L??rR?q??3uF?????????Kh????6??^????G?_??pc??21?4?MD??T?c& ?Z???????M?N ?oz???'?>T ????_"???????? ;????ys@??O?/??r?k\???E??f?:?9tr?>????K??"???T??V?_?O?h??e??z???k??G??i???m? ??US?h??c+ at RH?F??1?sqc?-Fb %????8???????P?&gFr??????/I9?;y?#? %??I??h??M)T?X+T]????7vh?^??t????4?T"?^?&??SNR?M ???5a?8u0?Z??s?Rb:d}A???'??P?:/?;dKb????8eg|}???????=?S??q<:????????7k?????c??p???????oGZs 4???????$?DV?.????Uy$>??? ??~??{F????@????????^?o>g??ox???RN?????m???Ib?"b*9???[??u???6???? ???( "??????8b2?:@T???K9i]pG?\QC??:;?d? J?x??fnbC ??m?y?/??*????x???,? ??3??,Mw?A??R~"?7z? ??,?ne'd,|5??q?? a ~??_o??????Pp?h?n;?;?l6?}B?Y??K?G?M??M?,????????S?9w?i .?k?8??/?wK??3 ??????/M_,^?P?????P^F?? ???+?]????1TXTT!???]t ???_#4&c ????????????[?T? ? 5????b*???2? ???l??Lz???y?BT?U?4_?}? ?;?P?;???^???q8??U????QD,??J??;+??^???-o?O{?H:?FI? i?r?InvLw??1&?^J*??EUobO?????a?????x??0V?eY???Y??1?M??r?6e,?g???.???G?*?;7 ?????V?????q?!wd n???u??z?? ???y ?X???F??v?????mm?{=???g^? ????Z4??e?????b_K4\????6?dE?v????!!?????Z?J!??R??!?>??c???Rx?{As?lPX?R?cq[?u2|??z;?&?????:?W?}???N?I??OrN?(?l????O?|?F:O?%?J??_??}?L?C? `?M?BZ?nH????Sf,??].??r?h=6??4??b??b?k?(???uE???D?z?J??} #?5) ?_Hn?(;?.??=??? ?3.???I??b?|?jZ { ???????ixh?b?? `!Q?????|?-???D???U??Yza???????*?Wh???@5?V?]? i?r?:L?Ax ,L????S?????h??Z?W9?:??????Z??????&;????*?????? ???0h|e??????zR??? ??q?r???H???*??P?=vw???g?<G?J??4?}?+C,Z??????????9?Mqu(]?}?C>40 ??yr*lA??? b??=??T?f?y?r???`)ek?????a??a\??????w?Z|??y?p?????3?$? ?;zV?????;qf??N?^?Kp]?ewAeI};??e??1!??\???w)??#?????.???'?7??i?L?: ?.F???????F\8?? ??w??a??8??$?l ?B?g\?P?r?(?b?TMXJ;???r??Z????G8?8rO???S?K??8???????? ??B?W??4??i?b??R?2???T????].???????????????^M??a??? ?x,~?i???uk[Hb??{??,??Rrg5??C?1???????\??pb_FN??G????Dx`ia?J?????l"P.,s??a??U ???g?CqW???? _$?I???"+?????`? !???? @???g?+?\$??ii??U??Q?t^??@??:?????J??C"X??VeO???|v?xI?B?-/?????D?R?Z??Lw????[Yh?? :JPA?????T/C??(p???e=??lN?98iv'?&ZW{??u?/R?g??L?????m????? d????h????Aib????9/????????~/???/w?? Y?B?6LP??5b?MI??????????H????>?\f??????]Q'B?$??g?Z?T ????>f??????q???Y????9?6-??bv?)????b#?v??? ???f.`Gl?S????&+???K?V??x????k??=????f?d?*d??C? ?_ ??*7)?T?p???:?%?? Op?w??^???????ih???R`??BKm???_???+}?bD ???N????????3?X????)???O?0T?qA??I6?n)?`u?}=o=v=????J????Q?`?B?#V?K?-hA(m????F?????-VFe?? fn?????tO?m?zU??O= ??b?2E????????^?3*%b??"?h???_f?? ??==??ru?)?+??L??ak?#??^?*????u??t?>?+?????"????,S?@p??w ????t??Y??1 ??O/d???+?U??????f_???r????f?,5?"?E?mi??~?h?"???????@??SP?W?~k??,(HkJ9?{????=V? ???9???7?*f??k?n??Cq#?x?3JM?4????(??~??K???DW-??? ?? ?k?{?????&f? ? ??.??1Y1?4???Pu?(?N1C?|9?A#X?????"kq?(??_]???mx?g??????????6'??c?mL????8?F???j??o?.BY&?,???)??B?`???$?"P?????X??Q??y;b?8 ??? S/???????]?????T+??wbX???gb????3{???1?|?? ?Qv??fvOP1T???? ??J>T?"N???#?}J??????????X???+A?x????1N]5???4?PK?Y9?????+??{??_i?b?????v?a????ED?3Rj??E<6??cGy?????!Z???6??<?????>??[l???-????????P???H?x??Jo?K?J??,nI??x??g??A??G??!????r?/p?????p??? ??V"?J????D?3?? h???n1??B?tz??? <267???UM?YU ? ????$o????9?M?? w??4???L0???L???? 1??|?^??'????5?R)???Y8?L?J?y???}?????????n?|x?D? ?u??`????@A>?2??-?3???0z? W?{pB2??r??^a??R2?q?U??????EP;n??2?R&`e/H?%?XQ?a5K]?R????i"?P??U?r?J4???Pi??9\?q??cy?:q?f????-????<> ????????^+?????~?f 3???X?????q?FP?5!?){8 at 7?o?h?O`???&?O?C? ?>&?????f??ej???Vi??s???j?k??R????A???????????^?qM?p????=?????p???3??f ?u????????:? ???4 ?&???y`&`?@?` ?}???O??A??/bN???5?8c??5??)'?|?Q?UI??_?B???&M?2???x??2?5????'oq??`??*??????1Y??B?t??*?R?n?3 ???fb4??K$????E????V A2?G??K@?]!sl?ss?!wR????l??_I_K?^?=y!???O?????T?+]?U??E??U??~A'??Fh0?]zq8???????M%?-????Jz???N?H??,?T5???o ?;sm????;????nm7?O =??p?? ???\?.?8=R????W7??PU)Y??S1????!?=?w25W???Z?d ??????>m;?j?X?yJ????j?^??*?p??????H??f?9s??w?9?5-/?P???????SQ[ ?4?????%~mc at G@?t??y?@?c????????6?_ ?k?>?9????-@???I????D??|?dI1???k7<=??kX?+???#??%e?k?(?f???f?&=)??IA*?????;aR???|:??? ?Y??[???j= ??'|??d?t?3?????apH??qy?:Y8C??<]??j?,???=C79o?0w???v????7?aK?1h?=???n?l??????+A??c2???R-???????9l???b |R#^?PX??0J???v-?#|\???Xc??????n?????.6???X4>T??????a?g>6????mO[V b??J???????5V?nx?>@_??????uG???????m???? ?????=???r????%?R?I??BC1????q2????ag ?m?????T?d?w?E?l}iHT??\*6?e????.??. <8 (? ?>??????????t)??????J????I?s?d??d?????v???6?x]?? Q????iy?pM??????0~ ?c??F?/????? zP?????B???O??????K??2:Yy?0???????y????F? ???6???>???TW???{???#?#????=?&O#?,? ?e????L???S ????? =?[?1??}??n?????$I?3??m???0?B ???qZP?\?S????&7"?(guJ????m?V???k?y????+- X%H?GZO?$?{ t#a? >?;#Aw??B??????????9??xG|???7$????\?R??/?t??X?Q? ?M?3[?jo ?`?WiF?p? ??A ?zD- Bx???? ?/??NI.G?+??wu? !?S?2?????fNJ_??I?P???? ?K!?|??EK?G?H???rG??? ??{????????{N?? HQ??ib?{?a?U?|P8???G?jsl'??`B??YD??0.?y?4???E????d????gFMe{?v?# ??r??????_???????????O?????ixO?/X??????o???@???#?:?m(?*???z???Q]??r??9](}??2L???????d?V?Y?i@??l?p#],??Ok?/c??p?O??????????????P?r3 ?????????8u?rI? }?SJL?Cu?_??aT???7????1???cq???@-?#mx??$?b?y?=_?R? q;?N??>??????????>|??#?????^???? ? ??????c>??????????.%t?1??{5{Hw7M????vG???}?e?]????I>?? ????b^??h?*bN\F????crG??????\??????"^yC(????S??S ?y K???,??.?x? g??_?#?9?N?7?????V??-?\D? /j???f??!aF?2????&^????>??????}?2b??*puX?w38?`z?|)??? ?x??m?2?g???'?%?*'qeL??B?s??W??}\?y?Of?Z,???U!?+??2??W?ac?H? ??]2y???? A????J{_??m??:m)t??????:)]?Qu'P|??Y??]?#????od5cH\?Z?:?i?+?????8?\? +/0&???*z?2c 7??]R??X?uwg?HZ????m??2?L????}Lwql???4>????? ????X?????e???v ?UB?A+??,}??y^83NP??W+???E?l?? ?w????T\??DW?uU??3Z??v??/@g?'`???@?0?q???U|??p?~(\Cs???8????????IJJ|%8??? ^L|4 g???I?1?3?O???M????? _??4?#?o??????=??I????xT??z?FE1G?y???=???\??u2^D9????>z?????????~?D??D??+?????p?Vi???:s??????????U???|??3_????~???%Jk?p?6e??O:k?W%??bK%??YM???/5?? ?ww`|_??e9M|=-?????a??M????N???wEc?????67?2?t?b????V'??bb?? e ?t=???o?w???? ?:???(?i???')???V??Ko@?Who?2=??I?m p?#?&Eq at y????m?~?? ????Y"'NV'?????????4??????)?y??????jm/#??1????v?F??l????8z_?????.??`???p?g????].!l??5Z?|?E?t???? ???? 7c8U?om?????i?&??\  ?o?????Q??k????????B? e%??????h???????aQ????fz,-?1?ylmC,l ???????Z???????y?I??}?????k.??T9 6PE??I?}< j? #&??x#'?r??k????L????kX?5? HH?e[???ct8?????~84?*#~6dE?? ???U?fN?oE?Bx?j??\??zq ??k?$??u???/%?#?U???tPi?????Mv2W??Q]??m?R?ctc?0??,??h?CvH?????9?,4???s?? ASbkPn?:I???:???? \IO?o???S?? ??^%/?B};??u?$??g????5h??Y??;?f8?_ ??XV???hk_LY??]?-r??6e? hn?p lS1??PP?a??_?]?? +:???>?????q?;??E??,? { iu?????? T?>??/ia/gy???DY???@W>?? J??5?C?-???X^d?F#??? ?????n0?y???d??j??6E???]fG??????s???[????E?}??n, r??:?oqxg?D?? (??N?[3?Na@? {F?g*???|t_?9???]"01?^??????"?E?q~F?#?? &??9???N?.?8?o\E ??????7???!??>>??Z?kdy???*??D?'????*??K=??C?R?@Y???_????J? ?>???? 7?q]?qj75??[h|.jnv??8q?????@E???(??r??? M[?L?#M'?n??%?F?\%???4Z????.????^???H?bf? m?A0??>?? ? ? p?#Q??+!??-o??j??z???F=?$CK>}l?????P??#?[m???2>;@ ? !????ic?}b???pH?H?![A!???2?????tX?U????"?P??s?\?UmD?-??Bz????)?'?pC?1??tU?h?&64v??F4?????p?,(? E`?wI??o??F??2??Z?.???iV??[y???????r2???pc?`??7#?o?.d<?$}? ^??.}ixh?})???;? ?w ???????H?1Det?eDJ? ?*&h9??;??(c??&8)9????|?kN2??"?# ??????lk*?1??????q?;????2|^???)L???/?Z??&??"?I? 6?????w?o?????@V??X\??p+???????g?H?8??I???c?3v=?@????&?5??b&mN?K????/F??t?? ?P?~?&>BB#?}????^?d?]???9???X?? ??Q?.?g??WJ? ?!?g????Q?1???%v??C"??E #?JF??}mhd%?>8d??u?? ?&/????H?_??z????r?T???/O{?JL?a?=?g????h???N?]???D??????? 3(??'????M?U??"? ??7?zj^??E? NHg?????4)}:?? ?!?5?? ??&?Z?? ??4??Z????????????i?M???-?gl??.????@??!??8????'8L?2?c?SU????????&?F9?\??J?J?+;q?g??L2 A?em`a?#??]??:Q??E?????yE????J ?????????{?????X ?t?~5yb???_??? ???????H??b?,.A?????@??h?????#X?U#[??#???*?3??r??]?J~]?F???$?$;?C9??W????D??z?hQ?Sm6 N\?B?fRIW???{??6h?????:c?m?|?4??q???-?N?+???^??/hVA??e?snv ??5???k?(??????P????i:n????z?T ?6????;o?p?0?N(?U&_?v????????-????!pS8v??]? x??? ??W??`? ?rk????G 3??r ?????????;q_????&\? ?7?)?9?V?2??y1?????l??\oz???? B?r'??q?????$?b?}?B????U??]>??k??P"????"??h?N?:?-??"1?0?A???:????/?:??`??`??Y??WA?0?&]???????_l?*:?A????CK? ;????66?? ?PO79?8???,FC?+[V?} ??T?????????t0?M= +?/%1z$9?????!t??7?#?J%Y?Z4Wa?LQ?Zkd00????O3N}????[??y???q`;????S?B?g? ????9'S?RY>??????VGk?c??kG{2??????"7F?C?`r????|???8??%??-? ?Z???:??E???h??ww|N~??va?us???>???q?E(??^??Q??V??;?g? ?h|F!?T?????? ?Cwg?4?VEq??>t+E?(????????G?Q-i{) ??!?}????k???? ?_??k$?Fx7+?>?jR?/>??m^?tH??$?i??r?=???LDd????f?z?M ?:???? -????_???fgVq&?q?Mf??Ine? jc?? (???$?5?_?#q???V?Q(?W??8??f? ?x,??????_?5?N???k5L?:~????]?????????? ,g???????????? ?D~,?????o???????[?????=?????rT???^?&?$??/u??????? F???? pq?&:NK cE[?????n*G?lx'???'?;D?TU????N&^?Y?????2t,????W?]???r$C?P&??;% ?b$? '????pN?????^g/ ?P??_???4?F??????K??/?g????d?1m??q?2v??m???P?^(??Zj?_?v N?u?O?????4A???_U6~ ?k??? ?????ko?#?h? P?? 2??????I[?5e??"?G66F~VX???B???b?7??Y ?y??r????\P??N???f?b| ??kV???E?D ?!?8g??? Q??M?i???+???{?????pZ? ?J?????W.??O?? R?dQX?????N????? ?;??(?u?@,z?Fha?d`??p????-? {0!W???o???uc?v?????&y???3?????g4Y???P'??Y?p??????~`??7??X??l?????????b????hb)?? ??X?P?o?P?? [?f{?L?W?N????!????X????7??????v}?!?!????a???0"?_??8u??H??B2?Z?res?TU?fO0?*hG??%??~?A??LC???o!?? ? ?a}???n?B@?d|>U??tF? n?>Qg??{?L?C??s??%?&j+ke??????;?,/??J??W?^eO?f???"???: ?vj??y??P@????kp???S???6|U?< o??6 ??"????+?l5???kv? ?U3???IL?K????w7???8?? G???a:?????^?r%md?3:???~lRF? Y???1?????'7?????????H~/L?0_??w?????}?;@?`?=??L{???[??????d???T????si2??Z?3 ?? ? ? )^Ke???Q?4????d????V??k???q???,??????IY ?7$" ?EP??"??????????VP1i sR?????'s ??e?r[?F?=?t?c?VL?/?lO??????B??????|?n}?*????????M??Zs;??/???AO???"?kP??{;w????U?????@:l?????s?9??? 6?????? =?k K6i?02??l?|??&U???c???/? j/????.zX????`Iq?e???e?|?????y?C?> ?s:RQ3h?^???? ?0?;@D??%?+??Ca?>Bs?? ??!?C?'?$?V?X_??b? ??;#??C???'?q*?"n?a?-?8\???W?,??3?}??G?%??q?o2?x???Z??,?{??#G4g??/???r?qG'?d?????VS??"~??? ?o/? ??V?JVb?U??) d^?l?????2??????P??X??e=????|???c?%? ???) ?6#?, ?q| ???|???*1??u??:L?S?2?Xf????V3? ???w???????6~k??????EPi???`?!~.?~A?"y@?6?b??2????HI!b???Y????h?7E?D??@??t??"?s?E?W??Tv?J*}???HU??|?S?7h?0?X??+P ??????m?B???P????#l? ?wb?!?|T???> ??2???[C8{N:?N?v???y? ????; ?g ^?}?O????X ,?O?d\MV/??3??Wgy????%2?%?????]??Q?@?+N?J(??qN]?+?f???;??o1????#\= ??fcm??Qa?BI819/LW. ?r??g??{V ??|?w)?ql?e?9.?'?h0*iL???{????x????P????be?z???????????-?kH8????oC&G?~???p?C????//?Q??c?{???2\???>???:???f?{?Xt? ???e5??W?????W??%???QD/5?????Bs\?9???y??o>v=X??x??tL? ?iy Y?l??N?!*[?5????A??[????q?h%?G ??+????`???gR???????"????+7?a???g#0t??1??$B??`@] ?E?j?? ? ?*|3C?"$???8? ?V??{??Ty?_?X? ???"?s< ?v?0+@?Ue????K? t??F???w?[?*? g???)? ?n?Q??#ZW???????L?Y+??K?j?? Y??8?%&???0?q?"?"A6&???^!????J%???3f?j????????????d?s3??v5?@ x??([??Ps?{<\???pQ?z=????q??,?,?Q?JHn? ?y?????????????;mKy??l????=Z^?n?*=? ?YA5??a??e??c?U????? ??????[Cn!wRT?K? ?? f<??????A?mE???5P?fUF??/?F??e?o????A ????7\?e?G??7?TkY???9`?4?????3???s????}j?????H${???gx?c?f?^=3?z^"R????lS??h]7??=???n>?zR?`W8A?????u???v~ ?`????d?"?)??D?V??m \ o??ZjVXO++$h_???zR???E???o?4?e?\??????N?????r/?q Pa?n~O??????????e7??P3?$?%?(??P+pT?>?y#?.>!???????\z?y{>??? ?6e_C ?2&?W???2?lXN,??/Z??? ????~???c???????_?Q???$67?'8D?y? Wg???;??}??n?T???T?+?2??w?(???j?A"t??*?i?rp??#r??????????M????L???ZJ4>??m?i??wd??B?? ????^,i~????B??h?*9?o???9?Q??5~?$?? ???????!J?6??HH?;???E55,??+?zS???a=???~???Y?Z????C??d??rTN??{?_G"?????!?"?O??????R??}?Z?S#V(\?G?&>???C??w@??J???BC?D?XVE??????^?:2z?? ||???5,????%??d#R?E??U???8????[?5C?jY ??R'TN????? ?X?Li?[????S?!??kbh?????v??c_?G0?????SD??s???*?y?+?????????????B????_d?"???3s??RR?p???SA?r???/?9??????0?K=????????q? 1Tx?S??\d???????'?F?p???????jL??U???"???%vX?_? ??qXl# Hm?F? ???}YT??E?????0v{4? ??????0:U??H????????`??V??7A???,????%u????bm?????J??[a??cb??????*z ???U?q?Ib?)\?:????0?4?X??z?+???3f?y?^??J???????D=???e? ????EMu??ug?k.????9G??????T(?;??$c????0???K?.nx??E:??$X`???????n???u?/9 ???^????VC?~?_?K?????W????z???`?1?? ???r??qmGY?Inj?????O??????;?A??????lD??g??9)?_Za?*??=?:?????$???Sgm???{????~>?C? ??%Q?)??8??9??????w?&P?*?N??ct??A?4 ( ?t%We??g|0_^???c?j?`??8??????????????mv?????o??p?;??????`J????&?^????-?????&??:* ?^-???C?????O????????7?H ??????U???V?y?O????o?????K?????????\?~?!??Rr??????6 ????????_?fM?c?y?a?fai ?@?ii?K ?V???Y???????J?P?Kg)B?K??zyC?s?S?????Lb.?l????i3Q?3?9"E?????A??f???"??J?\9r?I?W??"A??????????^v???X?3??????5X2?Q??V????d???v_??Mt4K????^?N??S3f??QU? ?E?????CD????>?;65`S??????_?f0?7%?q?vZ??????0'9??b?k?@?w?{????5??}?:k ??????A?3?p?????L{ ;?naI4\??q?zg????-??8??:ey???????|? ^F+< ??Rx?vj/?6?'?U]?w???Q&[,?Cy???o.X???eqpM?I?Fxb??{??I}P??5w?O??|F????????g<#h???ZO???k???u?????H??R??[?? ?w?W??}? ? N_?c??zT9?q?$????.? _????M??E?S?.??Mma???j?W???!??,??{??%?pl0?m?u^????-H?? ?9?????*?d?J}??????????{G&+?).ZQW????*'X??y?i?]}_????o5c????????D?P?P_?H7N5Gvi<|???|?*_??u ??l??M/g????Zd?89? ???$i,Oq)??????Z?? ??9?g#??????,?#3??N0g ?"Z?KidV1????CCNi?U????0???#???J??1CJ?$k??`#???.r??-B>?]??????G9?A3??d???0G?????ZV RV??3>???G-}???:???????????3uJx6?X????C?}!?9%?jauK ?g??v?p>b??"$0Q%/,M?r??7Ef?t?-Q??/K?@?P/?#?&~.?,??aU??'E$?o?m?/*?&?u???_???]???u;?o??'??????????2R?????^??u%?;h 1KD??????S??,??N???? ??RL???YkU. ? J???J]??5?6??D-?GZ?????z????#?r?????J?`2a[?X??#?K?D?HbW?;?/??83g?KL?????Aj?7??x4M???????g??}00??????E???????@??H?uC+F`????x?P)a_}??G |STIHZZ? ????T?-?=??K0????W???l??b9???Qb??0@???????s????&??t??]??2ES1??R????Sf???K?>V?Q9W?f)?? ???Qi??????tB\ #???"S????kR?FS?I2M?????G????4????sN?QW??I????? ??$fB????????Z??O.ft .O???b3?D?8Bq?0_5#?pCzQ\? ~??}?^~?? ?G|?F????n????????.?!i?3.????"??@V? ???e??'????JO???NI? ???SB?J?RE}?? ?x??D???%?S???? U??'|W??*j?;?z?f????K????#?\????c??????????5?W??k??l06(?_?!????48J???@?????DR+???p+ ?'?r?7??}?`?:m????T>??????'??I?H7tN??~aSv?'???a<.?0< {8??a???q?Xk????CNa???A?z????*OU????\????|?????'?? ?~R????I?????e?yF/ELJ?mLoQ?U??????`!??{??,bJz-???????pK?g\??Y3?[+?T?U?$???g??? ]???>????d???~?{???????????2?d??L????Xm ???[/?n0" u??~?u( ?y???B+G-?h{n r5?=?Cx?,?????Y??`?$???NQ?z????B?]??V?&?????S????G??I!Q??????v??i?P??&??/QS?bE? d???6??Am]d???????>o?3??YC?x??O~d????Pc?Z??\?a_;?"(?????????-??3??As?B???Z???e?/3/^6?te??]W??J_????H??$n3?U/??????.U4????i%??}RPZ?A??M?a?????? ?x??0Ss7;o???f7??1?q???q???)???vU(????E?[?qA?Wc???B?D??IT?([?u?????1-Fw???????G"5vn?p???????????y?JN2??n?B?????3?}:??]???@?7?????????? ?? ?? ?Ut>??yj????O?@???\?\vdo?????fW?4s?j1??$0????TlYqR??+?y|q?G?cEM?Z^g?4~???? ?e8h?}?p?pp??E|Y;?R#lfxn?=?S(?3??AB?1!K'kQ ??X{b?wU????VV??0?5?9???????f??S?vI??F?h?T"|;?h??????????^????=W?K4?}??? Wg????[f??t2*w?????s?yL/=#??J_?-&WVpW??v??b>5D?y??!?o??j=?????"??a3???????v?????6H???F??%~??G??tt?]?.??W???{?? ^x?6??hVch??Q*??P??/?????. .K???Cz??????H??? p ??6o3\\?u ?E"?w??j???4?QO#6??$/????|Fu?????j?u?S7?t6:??u??S????????9??N??- "?????}?<Y-?a????????L^'?????:@l'??5??^[???????:?`???]VZ??Q3?Q??(???????????mz???T??T????p?/h+???G\??m?p??e?N??9??L??@~???@?^?????????j*???????*?L!R??I??N[?????? ???1?h?K8?"?`???}????jj????J+???*]??,'Q?,???h?N??e???@0}?#z?Vi?p?????????%?3\!???????????e?3 ?i?xA?W????N)T??{h?[Z?J?,C?Sx?FK**%h??F????+??G?m+]&?????K??\??JO?? ?4o?N?_??bL??x??\??Qs??????Vy??N??? `??Y ?&?jiRAN??? N?q??????????[ ?? ??<` ?}?P??o`???K@ ?? % ?dB???yz????L~?n?t;?nY?? ????|????*????#c?ByRol/i?x?K?p{}??&W????R???OE?R?????lo:y???0????1??l??-??????Zj?b{^~0z??S????I!??r????H ??U?L??c-0??NE?,?!?4?? CF?>?-??H ???^=2?????f?e40"/???8 ???U??V13?Xkm"?????^??|T?' ,??????? P@?5];r~?s??? ??a??ga??J?]s?????U??Z???cs} T?z??B?@????Z?2?"????i+???E????T?????`*?-?iM?????dK??3??:M???z8?J:?A?15??{G?6?d????N???X??)_u?b?pi?G?"??5?w?c~??????'H???C?q?.?hD}??1?T6Q??kJx\S?????*kt?~?????f?E??n?\??q??-??5L ??I>??kV?Y???C'??O???m?zf?y?h@????o???Ac??&???z?U?????????f??^?z??d??s????(?M((??Ee?< aGM??nx"M\f???34Ya?'?GH??'/\?q?8jv?[W???~????0??a????uD? '?}?F$?-?????r????MZ?A??E?????#/?K6E ?V;C?y????????;?e??%?Z??c?E???%?X5?j??:?d{^?????i??7???VX?z??g?????O?????????? ?????8??X??X?'??L???z?O?q???[???????Fc?j?~???8?#2? ??(?($?%????]?Q???? ??OBZ?2?~?7?%E30???Nw????y????????;DZ=????c? S????c3I? ?!^_ ??_???9????= ZO?????3?gi+?O??W??`! ???C????#?=b???c?1??)???C??8#,?_???O?"/?nf?e 2???????vjP%?????kw?????<(?5????,/X?S??k????X??????H??T?g?#??????x??7??D? ?????1\?c?????J???*_?r???0??bYa:+???trh>?RH??=L~=d????B?JF<$ ??? ???+~Zy!??.V??y?v????x????Dc]K?3A?d???Q*??(#5)????@ X?&8i??p?i??1?:???x??LP?iM!?>??p????{? 5???%????????'?????#??????c??D?KS?M??l ???cU?H??&?5???b7??0?????r??83X? 2?& ????#??)`o*??????????}_?=gr??8v`nD??~?k?zs|+,?y;!c?=?? ,&?;#h%?j???i*??s?????g? ?")Ph$???s?[)J??B????Po?????^#i W?cQ??]??|?/$????cal????V?g2+???A?5??P???D?k???j?}spy??? ???6??n-??Q?v???.??Fc??)$???BM??z????*'?N??? ,?r??z???8??*?jA?$W??1?#??or pIJk??>??????Y?B? $????#{s???_???X?*??#S???]`???? mc?F?E '?+?zWyD????V!o$??L9????1Lov[I7M'6gt?3???q???m|?JP?E???A8Z!?????@ 2 ??ff?v??Y?n?Sf?R?(I???P??7??:c??3??K7?FT? ???0?????C??V?:????)?g??d?e??cjo.????9??/???s??F??xT??^?!m??#O??m9an????$?????m?o???r??T!J??Pb:? ?E2s ??CR??Q?B?Gf!Z???~?\??/.E(???_?m??=????VpsC?UD???fS g?IY?????&?2???:?;/5?=`?;-TM??b .?jLCXE(?D?*???b??Z(?%??T??]?\?}eN?3&???R???R. ?R?w$K?@?D~?.?? ??u?J?????? ?T?)?>?B?P%??w?QB??$r9 U?I????????HKPk???Dr?lp???7?d??.??T#^oC??m????6??????b??$????^)W??k$?y???P????q?m?K???5???B??|Z ??&e??5??:???y??f??.?z??????L???>?: ????A???? ???"?M9???????G??`??@?%?T?(??2?GN??}??N?y?e?E??s?}'??6%t? z;?q??_?????? ??G ?J[?h??_???pC ,?/ ?uK??$"F??7?-O?C??D?o?.n???M?N?E?%? ?q??t??0??|A ?? ??cX?=??????+-9MK????N ?? ? eU?????rq?5?#?GF?hB]?^?i?????? f(|yr???%???gKOS?w??:Fc???GQ?B??F??m??pU^HG'??IP?I`a#?9??1??????S????S????y?0???k??F???B2??*??$ s??1?. ?-??VW?gm{,????)??????*??B ??|??#Se?$R??????QJf??f*%? \?Pc?j??X?????)&????HRP??N???u????FC?B??Mw;}tK?H?9N????l?Cs?+?.?n?? /?'?!?t$.???7????(?????m?/??NZ ????K? ??k?|4o??b?j ??? #;????I????e\??Y?? ?wX\??hf x*n??X?"? ?T at 2{???o??P%?~???~/yh??ht?#S??\?K8???2-??u???/Y?? ???(5?k9???"?x???%u+?~?"mL?8?AL?? -?F%?E?b?? / o??/??`???l?`?@22eKR??e???bO??o???A????-4??p??nK/???`H~?k???? ?&???Glc~?????^?U?*>?o??.?s?.? ??? 2?DS??J{???N??^????????$T?v?e'(N????xio?2S/?%????7`?js?M HS??Y ??3?0?&??;??G2z ?c?J?W???u?G?#?{?+?viN??N&/?Cm??,?c??[?O????1????????/-f???? ??h%?f[?;? ?\?G?x??}??x?????w???H?d at l;4D+G??_??????];?N?vq??"?@?JM?????}????A????? ;?.????z{? ?}?]7??T??4/??>???????s????zDb?'???w{u??v'? ??*x?M????????x??G?*??t????j??agy%?C]*????w??Z????e[Y1?Z?JY??S,WK???^3?w???Ef|???.????'I^?p?9??J?+?????I8Qx`?R$@?;?????{P?:?.?v??C#?49dx|?b?P?Qxn??BO; ?0s???<_?r?5?I?K??????g??WP??x?????(| ?660?I~|m2?????R%n?J??f4? ?@U?j?e^?} 70hm?w?????????kfm????H??Ms =K???=?P?P?BnW?\?  ?>?O??!?R? ?l?i^<? ?>??h?k?? ?a?x/???)???+????? ?tG?l????m? P??????9????9SL4?? ,`X??!?g?3???????;G??N???O?????0??+ ?????IA??_???[?W?sw?u,? ?y5????K???????????Tj??????????RL?kDl?-Y?d??),"B?e??+p??l????4?L$8? ?^?]E0aB? ??ot????)?????o9 X?=?????u??b? ???z??@??????l?D??`:?b)?s?????84???}? ??????;+?h~?????5???? ??e?Cq?13)\??? 0$?s} ???`???iR?:?/?N?< S???)B?$?i&}???Tk?7A??TV1P?@?? /?|?k??S_ x0?M??)b???Bo???|??u?#?????? ??G??? 8?.3??Qk?/??X?x??????????^???J??~??B? [Do?z???N???v?v???k]?W???>}??? \?'_????? ?/?????&?:E?C??;??OT?t???????r??^*??IM`@.??=;??? ?y?[??7?gZk????"x???ASqv?NhK3Ag ??bi(? ??'r?????r`l? *???9C??|??0p?R???????Zy?< M?W /H??????qF?e2? ?H?: ?c????ya??l.? ???W ?y{r?/??I??@??? q?-v??p?? /h=S?*O{%??? ?r{?R??Z???? 5E?6???g? ? ??;?L??> J????f?V?????w????[??????y}??&?????P?g?U?i??? ?Z????8?Ytp?{????8?q{v?$c??4Sud@?7!J?7?-?F?*k? Z W at w????p?EC????e6??m?T?&?X??(("???&J/??vc3_+'J?>UK??E4 N?dD??????? ?P?}S??q???d?bAe???@?bcZ_M?t??HX ????j????L?%?~ ?KMh ?M?B??o???:]l|\6? ?Q??(E??VV?>?>?J?????M??P????+?? ??X???Y? ?|z?X??????Bm?P??x#tKrW??j?$???E?*h3???#f??????n?gL)?^??a??Stp???fb????*?+??K7?i=7?$5D?q??=An???dN0?:??W??????????07?*????VZ?9?????>???i?Z?Q~????H?|???q#??A??sP?9&[?`=^???????Z??l???Z+L??e??Z?t??h?3? u?,a?!?????4P?M??#???i?{??v?m+p8=??M?k?????nn^???B?Xm?(??QgG??O?pc?[??# Q?8???+???m`???~h????c}U???)?u ?? ???q?X?j???B???a?S*p????????????? L]?K?^?W??????6y?????-??^u???VTk#5 ?65???*??q?s????T??L@??R?[Uvn????<2?[?????? 0LH?DE???????NV?????-?mpE?55v????f?f?,?fD??????qV>&???????@J????j?7o???,?X?'???{?X{? ?L??mc?p????^ ?I???S???Z???<%=??y?B????r;???Y?????"??:N???[D??w??+???0?q???$????D?ii.?????????U???L??$?>z????=???*??? ??at@?????Qt^D?)V5G??~>%G???t??`??F??"??m[??}S???y?? ????P ?;;???????J??N U??D?????k6?}??}??%3?????\?M???????e?G:gp?})??X?P$ ?????,????o???z?????H????K?jQs?{_?_o????6?yh??????hL!N%g??????????&2??D?????vt/??5????????"q?.???2t?s?^???????e ?r???R(E??? ??.???!??QU?9?p???p???]? m?0?V??j??G ?????c??'?L?#???b??;???w???z????????Z3?zi??{?4 z???~?? o ?6!????*f??Tz???v?+?S????? Hm???8f??it\n~cRh??tF???~?4o???.5??&ZV?? e??:)?Z=?HU?an?q?h??y\9JiR?je???tW??{??)??????N?????K?????m i?^D?? ????+??\.??Ob???>????a*0 ??`?Q?i?1|Q&??? ????_??p<{l??n?(???k???????>?g??3?X3`?wG7???C???dS?i????]?Qt?????:Q??o63??+???^???x???W???^??0w?P?S(???o[?N? D??0U?QNl??@??GZ???????,k-?(J?=RJ?@??.Q6f?2?D???k??????10?&??]>a!?]?[??aV?K?`?? ??? ?%.=HN?q????`yf?Y??T?x??????????>K?P?#~q???5?;h??K???mqzy???????H???????|?????o???-.u&S? ?p???\???j?5?d????Nuz?2>?If????0<?7r8??? A??|xI?Y0??f??????r?5:?H???? ?0{vRB?? z??ME?????z?Q??,?5?j? ?&%??e ?Dx`E??v???B6??G<"c(?2/?g?H?Z@?*#D!X??H?&?V0?8[??!6??J????????????)x??9? ???iF???^<????}G?AH??P?8A?)????,<?)"?q??d"0?^???p??W?O?;??1!???????n6 ???%??????8S??!#?3}P ?k??n???????? ?|]l9?????d+??_s?g?jw??????Q?"??*p?????g?t???2???%?&???b?v(??? s?????m?X!??zb??0????????sV???????A??G?e??"??f{m??b?1?+E???????) hf*s??wg?d??!^_?P}??Z?eD??????????D?????L???8P??,???>?$J??IF??????u?rO??@??#????8???e??P??h?2?[56x?(=?? 0s???Zey???,???nTsx?G??~ZcB>?u? Z??m????~?gC? ?z??F?? gNwX???v?#V)N?????\sr?f?l???Iw,_+????VE?{???????Qu??q)?i.J?????????(@??P??????B????+? &dj:t??@?? !h'????I;3R!0??A?yW???K??;? a?z??$8' {??5tt|???}?]o?5k????$????% 4?a??B???C????K???B?J?`???}?@}??x-`?Yf?*U?V?????? |????3DD??????????v??(???1???k8 `m??/????#?`&??`?OzN??`?O??T??C?z?R???5?f2-mu??>???????_H????WL?L??1b.?|} ??3\? ??CHJ?;??QM?????0:???4??"c???.?"?et??F???5Q??/ ??Yy????J??LDq_?\?>?<??B????>MPM??s??;jWl???T4?^??????0????i??~.?]??s}?)W???????x?(r#?????Fo?~l?Q?38?2?)?H?-??~??x(??{? ?s??? ?n?l??M06?E???9??1?? ??K{v????e.?????>???$b$?O???S???X???????'?W?J?M? x?[????.w6? ?:b????)RH???.W??=PG?-5rn?P??<-Y?jS????2V^????$d??h?!?G?K' } ["??&?:? ????j9o?gX???0%~?[K?x??!-4?*??/?$_??????a????M?k?n?'????e>???f????&UXgGh@?????=??n? ?'??WM&??+/???????T??Y??R???r??u$W?U\???L??TM?$D?h??Jg:???A?Ak??v'^????????]b?P?;l???1hOY?=z???R??r4I?qjC?c???-?r?Z?j?\?.?L g?9W? ???Q?]?~v??? 1??/@q???t?)? ?Y??c7u,?????[f???/??8-???-?@1~??6?X??>?T?????A?)?Ji"??e)???D??^????C???T?????s?f???*f???lQ:M????HB+????g??C$?jo??Q?y?\*??s.?????GY?V?a?9M????fQ0??$D?G;????o1???{???????????l ???@?\Vl????i8??? ??_ v?"???+??h=???q???`g???E?cb-??k??1@??ab?????????R?{??6??*??#!?>?????? RS????t?. ??[???Kc+?+a?e)??c??&:--S?Hr???M??qh?4A??]???? W?????J?N????!?l???s ?i??r??T???o&r?!?u?f?>9??J?.?Rg.?N?JU????Q?6??;?r??lQ??v??vP?-m?nM??SZ???*??2??I??P?r&Eug_?>?[v? ??%;J/?wi Q?4s+???7G???P???h&+???+????4?V???????????z?S??(?s??????x????.)???lK?0???E?ML}?D c?W?uY?{2?wz)?D??_????BI~P#?>? C?~?&????B?K????????z??u???*?c??wXy?|%??H?Ng????`??)??k? ??#???*?tLLL?$?eE??q??????)??# ^?????e?-?c??=}??]?t1???/??*8?G?? ??&?`g?M????]cu??QX???}??S%??qUTr?J?W_???f q?)u&?Sn?????h? ???e????2Z/Uf? ? ??/???.????p?-???G??=r?n?>p??7??Av??y2??"??c#??k?)?W????| ?)?iH ???L?eqL?T??S'!o???? ????w)??"Q?w?j,?n8????????ND?q?X??cR??E?i??SB????|7?f??D??Ak?m???I???c7???a?%?????76??E??+???~????????>?]???+) ?G??\?7%?p?????????l??J???v?:a??Q?v~?Tk??? ??+D?????$g,????)?cz????????l?'???!?? ?W? ??[t???5+$E????????8???)?c??K3??|+??W?? 2NhlZ??iOk? ?K?>9?'?n?MWm?????0????Q??\[?n?w??s3$G3????/?????t??W??A???q??5AF?D???2mwq;<%?p????u???? ?? ??m ?????}=???????Q&??Z?>}V???J??^? }r{?E)E??W??a~ ? ppP????D;c?"_??J`t??V??_???ex??EV?y?X???y?-??v??f??A???:/dW?<? ????Nh??V??;??Q?Lf????>/????J?O??p??bj??F?S?w?M#??S~|?~??J?|?5??????os)]3t{??|???+?s_??"}?GlK ??`t5e????????????D??4????X?(??$???'???????#w??1?????0?X?a?Ur??P??~?`??D?J????V?s????;?3?u??u?(???[r??=%???B?K?N?? ??????????yH?x*?;c#?t??$??j??pH $b?9K???E??4f Pt$??~+C??hu?R???]???tr#?? ???)?Y???@Y~8p[(?'~v?uP???>W??]sIt?d??g?O?y? K?6 V8?Y`?? ' WZ?p????????????C?-??*? W9#???O G??u?z?~??????b1h??1?x??\^ ?I?8?@?|#??p??s?~????Lf?T?h??v@?o?I?t?????Z????H???(?O?6s2???R??L?2??5? pcr(h???m??4? w??????^???j2?o?<~? ????????sgM??? ??q{?]??k1?s??N?n??K?F??????????0,???nZ?.??8b??zmy?^u1OJj8S??N5S?> \,??????9 ????.;??li?!z|?A?????E???R{?C6?}Q?) ?? _ bBl????b????U??????????0????J ? ???L??????l*??F?d?e???;?d??>w? ??L????????n?t"?????s???P.3/k.sH?Olmx??h????? ??? h8Z?N?K?L???7?W???Q????R???[??.???R????Q????F-0N[???A4?6c??Lo?????07??>??3??hT??aqA?gv ??????7P?r?Z?y? ???V??:*???5??:???:???;?r;??? q'?M2??q?P)?????"]?????n{??c??????&???~Pv???8????)??s????E?`?ni+????>??k???J???????XY??|R???B?????'?nc?x??N??c???t??]?(j#?7*1?b)??o?k?????????x????A?3???????}??ul}`?3Y??evw\?Rq???2?J.2?I{??`v?? B??BL??m?m??? ! ?:Q????J+kt????A?C?Q??3??!f??cMogu?I?;42Ed ~+???R??? ??????????S???]?Q? )qJZ 7?9!R0A????m;???G?Hs??U?m_c??-|???yB???%m???2-??7?????????e?????:"????+P~?U?t??%??lg???WU?@?)????g8??;?X=?????k|???_?;????'????fT 1cW?/?? ??.yaQ?????????????W;5]??W1??{Auw ?J????V6 #???u?L0??c/??e?9?ApT??L?dc?bn????B?:?l????i???67?]?WNO:??HF4r ??Z?h?????wp??&??;c???,???q)V??d?jt;8@? ?d???1H:????L?t>????6???I?vm???(?@??~x??k-??? ?C????D&??qe?RC?W2?]?????Mn?@?X?x1?@?j?k=tD?R?|rP%?!R???>??=&? ?}?3??? :^?T??????:c?'???<^?2?t????yP???y?? ?y???eQ??.????!????????3????I]@?????JU???w?L@} ?????????pA?:?-g? #???????G&?]?_b ??c??T[(?>P ??8X??Sj?D??2??7??D?? ])?????.:i?!w??P??B???.LA??|?[????o??r?_M?W?d: ?-???]fX???? ??!????=??([???|?H??,??????N ?(?/}zqH?'g???0?Z??????%eG?d?aM?$$|J?????$???B??Y?)???SkRsQ?;?ZF???|????L?X?>^bG?L6????'??"?)?;?t???#&3?`v?s??]G?Kw?k??cCuD?5??t~????????qU???4tB?????D\?{?RX?=?5$?I"7??|?1h???N ?????????u!&??L????4F?????0??? ?t?????,??a %?6??=)d???? %??eO??d?%???z?"W?y 9iG3?KKF%???l???????????? *??J? 2?7gYB"?????8??)S??|??i?|iP??r=??8P|????.??7???O??$Y???? ??????9?!b-?r???Rn??G?m$w???`@^-*tf?Op ???k7G??????Y>????]??M?????????]?????%???????'?(? ?????L ?? ?A??9?I??,?Vss Y?)??"$?# 1?.??D??c?#1-???MFcI???U_???f??*=#R????v?????. ZkN??? s????c???|???Z?h???V?-R&d???w?????Y?0N+%?M?_x???>NwZe?R?5??KtG??mM??????~?rJQz+B??:?*?6a/???rF????!?????yuWD???o6????? ]?k??f?A??????F?T??pl??}?l?X??s??-?6b?? ???6?B?a????G?3??]? ????r?GW??*??2Q,TI?????9?Z?'??.?%??????I;h????R??"=?H??? ?h???_C? 1?P[???j?PD??????????^?X???????M%??.????Ef????b????8?@??s?? ??+b ?$? ?J??~W??68 XC??A?i??????9??????P????7??I???%?&???B`v??Zt ??Wn????`??I????????f?v???y????????U???R]QkI??TJ?Y?4??7?B>Y???{??????*???$??Ti9?n????'??al5????I\???@?Es?`U?7?,?_????V????Cbv|2?Rd?p???G??T5?Q?Z?G??x????b?.?J?7???? _S?z???/p??t?K?$=???????????1??c`(??J????~?Y????!>??_-to5???X?z??j?n? ???}?R?t?+???n?%??"7?I+ ??T~?R??Y6??????^?f???7?=9% `?!? ?{ 1?8??0?? ????aP?x(?????????3 1????%?v-??P3?EM+?9?? g?L??w???v?F?~?J?H ????cC?A1Y??>?&7?2 ?+5????^????????)- at GlF???~????Yh?[b? $?T?`a1.+?6? Y?Pt? -$??????? ?d^Y?2?????.???oW ????/??*2?S?t????1S .Hy*4?l??Z????h?]2????|O????pP??vZ??ME?t?c?$u?BY?r[m? ?x 3?.????? ?"??(??????w???_?f?)~????]?????2??V??acf?>#?b?8????N$?#?2? y?V???(&?B@??????W? ?D???????6}V??@?????????7????*???~?H??? ?????2?Xx???>[?????3V???#?xL$????:~ Xf??b??5??hw?c;?'?`^? ??????[??|_G?a??=K?????_???`? ?G??M'?;?^?????????0S6?T?;a?F?B:???/?R???n??????????%?? ?&?c ??g9?1?RG????v??)P ???????-??Th??? |??R?e?g?3(??U?? a?T?iQkb?yP???Qi??? ??? ?Q????.????>e??1?.a?q???S-Z(??U???L?u?@ E3???4???W??^\?6k?????Af?T?v?[?~Py?{_??? ??x?k{??A??? I?F9 ;?p???????g??????tO ?? c??????cj???P??T?Zo?U?4?F at j???"?Vhe?????'[??=??h ???`??&??t???8?0?^???f???P%?8P?????`?????Cd?%pV?(?DF??,??@????H#}5 ???o1??x?????Uj}??=?????* ?????g????D??}J???r???(?p?"O"?A???p_???????????????q?????????@B??mJ[86"r????W?='?b?J?vB???P?ziy??O???)l5yj?PN[ze?????!????8????%7?????+?????m?QZuL????Gc?5HC?? &??g&??r?????xo?z? iV?Ik???UHDKU,| ir49'b+??? y??S???K??Pb????u4?v?X??S??f??????Of>sv??Lt?ZGQ ??s.?^#??H?O??9U???????_c???V?h`?..D???-9???J????J?>???/m??????????7?+???^P.c)?`u???Q????u-a?.?"QP???xpKhb"1????U:???l`???.? ?ZGC????!fOUv???_)???u?3?utsL:>????:1?????b2???8]y?S;]?)?K???][L???].??U?K%??G[??x?I?uB`T????#??o??v?N?A??E?%?d?O(?b??G???>9:?z?1%??u??cfr???z$?L???? ?t??8??p%vq????Yz??e?_3????q?hq?YF???pAJ??L??@QH ?u? y??Rc?????NS??????j>?r?/? ?E????u?+D?&9?x????y?-L??_?3??.p??e???8??[t??.?YQ?[????c???????|????m?nu??.!#Y4Op/?[?.?????/z^{???????,??z?k?[>2??V???EL?d5ff |yT4K5pA?|Y??#bM??*???Q??? SN?N??e '?C?9`?8n0?????????:iB????FJk??k????*?e@o#?F???f |H[&]????XK??Y????LUr]V??}????`S???;"?`+? 1b|1?}n??K;???p:?$+????????? ?/?$????i?T????%>t?y? L?m??z???tW ?7???q??$??k2(26 ???m.S?????j>N??U[k??E??] ??xb??]???_??&{?v+P?7?Kq?? ?G?z????q??x??d??? ????:e?;7+j??A??j?=?Y???\??4N??3????T@????f)?u;???Th2= I0 B??B!lh ?5>?????JX???B? ??+?X#??,z??z?Q=??:>M??ZbH? ??? ? ?E?????OM??X??q???C?[?q?b?MA]??????I!E??ypxb?????Y?????{???:T??8????<"?-?c?E???"??W4i^?~-o????*??G7???"I??hl??@?!k~f-??I??Mx?-%?4??#)?F??~??????? ????????????!?u????~?Sw?;?? ]???fw*6ZL?T\ p???S ??? ?Y???\?.di?R???4?c?1???????K??_~?v???:l4%?????? ??w?$???q?*???>d??Jp??q+?!;jzD~???????0??;?4?TSz??&?HV?pr??8?")? ?????? r?$??_?????sM)X???z?/??W^??H`?f|?5????!P{??7*??E?+E?"c}@??q?c??F??S???? ??^??EG????????Q??T?AV????tu0?=5.a?AG?? ????????l???? q????:?UF.?fY?|]r?S?i??!?Q?^ ??H????? ???C1H???C??|?s???E?T?Xe??? ??FgrUW?]I??_e????V??I?b? rv???(??T??t3???{??? m?//:7?fn?????F???????`?:I??[???x?iY??vI????0#Cq?p?;??>x?M;.??()sQ? ;?2? !_? 9???'?L\ ?????fe?6 ?v]q?`G???x ?|?o?? ?o??????Rf??-8A??N??0????>b?53rk?G?1"???N?F?'Y??m?Q%du?M:? !?4 gck?L0??\???F5??r?????q?4?N???r???$?p?Q????A?? `??!??4#?+??S+~?r?s!??/?=??9?i????????,4T??-???!?;? g,Ma??????[???A 6?E????+-????????|????????"z????.>???7OF|??????Ck????????u?3????xq????j?i2?4]"j?j?:??#? ??t???;????rY????H??t3R?OyU????????qT????G???????j6O?~f ?????KL??X????wO?(p1???|???FJ??Ov?RK?f??Er?x?b???A??????O??&???0??9R?x}@H ???vN?? ??Pp??/>?an?b^S? g?2/L????? E??????QW???L>?????q?)?h?zDw{? ?|Tw(s?j?0???s?G??J???ux?(???=B?|^&}?x???R?q???XWa??~??b??^ f????t??ig?U? ?G????i??r?rwyz?????~ ?\?M? ???RmE(??t ??'v????7??z?8!Z? -er????G?bq???$!?U?r?T?????E 6u??T6S?N?Rr?#s???+?@?-? ??E????.???+?'???M' ?{*Y??!Rc+d6?q ?g??????????=?p?R_?"6R????|O!X?B? ?>?????x?|??????yPC?wXp??????xv?e??x%?????>?7?j!c??R?E??a???ScQ4?????%??*???H+8? ???IQjd0P????6?si?? ??O?b??PY? \??M??%yss?n???V#?w;? ????=????|???uqzL????m5? 1m" CZ?C??W??b?B?_????? ??????\??????.?u o??z??????????M^?????i?W??B\y?@D?????^????7????>?s??y?T?]m?R??}-d?bC"?u%? ??????k`]f???}F??B=?????|?2E??ps?=Z_????w?XS?1?]?'I?+H![????|???,????? c?o+L???>???p??1???????G????'?E?:????e"?Mv?_o??da???%` }[`??l!z?R?p;?????7????v?'??,?2/?w???^ ?` >?U??"'??(????t?z??o???5go???.??zH???M??F???????X??D?%$U?J ??N?LM?hO??}A ? ?"?3?x?mze?n?+$??`??????%*N(???????lL??=?&gs at nB???G?d ???? ?^!>\?5?)???NJ??????Ag??U?W??O????-$????(?+?I??d ???'?cGu0R?w|????R??????5{ ?JQn??_?)OT{??2????? ???????(????? I:??] ????v??Z????v#???5,?r?.-!{:I????{\??1?!???gr?~?|????qV[0S??7?P?C{?0S? ?[??h???,s*?Y! _n,(??#????45?B=b??SQ at d????#?eN9??X?ZV?D??!??????%?U?c?!z'???????????????LY?;???]i5;,?$??L???f???FT???Ns?~?'?)?????2?????e???#????.??WcB??'?(???9\??|?????k-2?~n?`x?h?????t???X?1???y?]eEk@?x??Mi\?y?????J???C?*???5?V"??=& ??m9?E)??C6q?i??}J^Z???T???h?:7?4?M}?????Uo????b???)?? ??f??GtW?}?????vX?3 m=??Or????y 'M??x;L9??7???W?Q???????*A?m2?7??(??V-?n???? ??=$????'???,D?W:?.~?#????p????~???? ??????B????-?????4?????4??C???*???:?? ?+?z?w??O?8#??????q??c?pM?I????zP??t???????zn??UH?d)??eo???g&z????e????A?g???o?f??????'?"?#}????&????Q???1?????%?? `?(?k????$KR??e?e?{?????Cm?N??Q?z??:??;??IPs?D?N? ?? ?n?5m??3?e?????I?? i?????J^e???????s "v?&?????????@t??wK}?M??k??????{??e O}?~;?u1?????5?z"???hvYhvG?$?o?b?IngH?'?U7??s??b??hH>?a???O??zD??m????????C??LN?6Wf?y{o??N??g?\??[?v?YG?f?lj?R?A??2%?7?,A??????? W: ?,O~???A?C?6e?????????@??P]V?(???K;B????b??_y\???/???? `??D?_?1?????r???? ????_ 4C?hc!gP("M? ????;\6*??????+LL????=??sN? Q??????????y&???C?T?NO+ ??0?+??:??D#S????r??[.#?D?P?#?3???xc?\?????x??>?bpU??*c7 ?xBl)^?e%q?Ak?????\??H?D~??????yCTD?U???!V???5???Q?> ?&?wR??i2?,t???Z?@ ??cE????^Pl??)???XP?t??/c??D?\;??PK??;:?G???R??4??RG?????q???ea???9??e??x??????>I p?TK?C?9???????v??OY??? ?>[????a?M????2?y.]???.?s|?@F{?4???q??M;?????????jG?? UJ%s?]???C?v?rJl??L??{l1N?9U??K??7?n???$???H?z????o??j?????+:u??B%?{???A???O???N]??fn?7?????&??\?Q?:E????L+D+O8b???+F??3??$????%?!?wZ?S?????g????+!4??0??WTx ? ?t???K??.??FUD?}JZ???="?Qyl"?fd ????v?6lfBh1??u??A??Z?y??h*Sj?EO ?8???}???;k&{|}G?'??+e_??#?0????`[?o???S?}??Eo?;y??k4?xo ?f>7,<;??k???f?7?7????)v?????@CrzbZl$?*??n??ICe???x+L???$?~?PN@???[????R?x???????o???^??????`Gw?o?o .?????3??????M#^?R??vw ????M??'?h???8e"H?d /#?5;L|M??Q???????|S@ ?}?M?????~??OV???z$??k????i^u??ZCUa^R?T"I Vy?Qt?b?PY%H@????I?C??H?5Fq?[ 6s? 4?9W??????q?:?$??v?!?r!???5??\i???????h?H?v at x??????-???H/?"?,? Rg]r?<gr??2U?1d#l?O]???'z!L[??o9K??M??'???e?V+F??~????2?L`w(?????a??????TD?? ?'>?????3??i?.?]???-?s?a?0-?HIwV.???[P}Hbv?)%??(????<??m2s??{?J?!?T??K9?E??-y?6???g?6??0???Z?G^?=?\??nC?????0?k??ig???/ ?=??V'L-hCP?,?? ?m????pk?zZ1>2- 2Z ??@???|??!;-????>??? ??J?A?`? ????z?1????Z/???/??#v??V??-w?\????9%?u??$Y?????T?? ????_&k]{+O?v ??|w????/c????G?;,? ?????yf?P?(???*????]?"M??*hb?Mn?n?!??E?/c????U? ? ??E??+?6??JY?? u??$??W_S?(???? ???[??M??e?YS3U?m?????&5??G?C?????0A???ftnD????^*?????;,a??;???X??F???MB?-?J???????3~???d????,BP?w;??p8??cYb?????????@k???|??vFp??????`?Ci?a????`?~nI?_?p?Jr 1$J?T????????_?q?????I\|???? ???"t?Og? ???9%[`?W?;??`?j???????/^?8???n?????'28?>g?V?v?]i?????1j??{?????c?2d???=?b? ????q~???>??4?j??X zP?????Nj????s_??? ???V9??Y;_k??????k?d?D?8 P3???!?-?y????{?,???V?n???= ? S1?y?????)?wP???0? ?x??M_???M?8?J?plF???|???/??????3??p? ?y????Qlo3Sc?t?? ? ?R?q^XZ?8D]???d?@????@?@V??:Sz?5???e|r Lw ?????(??l c????mb????4??3A ??3C=???j?"?9MQ?[?k??2???#G??t??H?t?????p?u???? ?f:???)?c???t?+(?&??E???w??N0???1e???f??? ?? h???0??%?????B???]3??(s??=0O????Be/??/k?r??9&??"f??7NY??}?v??+????QGl???p??K?z ??B??p?\w?W?)@?????%??M?????? ??|*x?{??Z?k?????$????)uh??H?r#$*,????V?P?)cxN??5?!?DkM Z?R??~?U????k??@?M??X|8F)9?,\???{%?I(r2"?????????e??2w)??Xh?!?0uQ.?? k??30z?/????????z????F??5?.Q??z?g?T??V"8u??????t??~??,???(?9?g[F>26?{*????????G?e??Hfs0??4?)??????X?D-??]??_????? ???*PLX?w?;&??a&k7?nts]???5Y?Y?:~o,?0????E?j?2? ^1?Tp?m6&??HE?????l????^??)?]?????6?8???BI:??=???S?????n?X???]??MlO?????,+r?U^?X?n????????9o.?0??H?6k?[??_??~?0?9g.D?R??h?_F?G?7Z??LS?W????M?)??l?????@,?z(??z?2???g@??2fr???jK4?V'j\D?.???????i??%??Y?;????S??o&:%?a(]??T2`["w\?xE?z??7Nl??o???X$VB???O?w??J???7?X&?f?x??z| ~}???5f[!&}1?}Q?>??F?t?? [?40B?A??W??v??o^???mw?w????S?i?h?????F2_????R??9T?"???? ?Y?????? ??w????-? ??)?????2??H???HF[??PS???N????3?????R(s?.Z*?d?-?D?p?)f?e?-)???!??C\?;??????*?q?_?M]??-?eF??ZX???H?3?? n?K????3E??r???O?E?????W5?mK?C$????Ut?2?ec?oT(?????y??F???Q????C"<a???~:??QW!?????3??????G??e????? V?j???W8??0x? ???n,??r*.??V9??*:?0?e?????? I?}e?W?41?X?eUY?s???. ?&?N?eA?,?????^7x?J???? R I?gP%5?iO???????w;?z??'??]?W ????7????G?X??;???F 8???_?[?d??a?Z?(u?I#???L!4-?8 ?????? ?`?VpRV&%????R???+?{?f2?le?\?e??&???e?? ?&`Z?T???????????'$ ???5y?=?? ?LqE????O?6i????????T at k?u?:?V??5?? ???cg@??"??? {?~B???WZl?p?= J???u?IU,W8???[?f????p?G~?l???2?^@?&?+]:?[?6J????N?6Z?="vG\l???W?|;??mn7?e%?++?t"8; ??@????X}1?}?:PK} ???C2?9N *D???4?Ex?q?HGp???-|?????~7???????/?mHg+?Hy7???????h+A|?;SM?!????4?G}:3T??3h? Rb# Cm?~?k-?'@E???]??;2????rS?#???q?'???iW?#L? ??A?z????488?4m??'LYT?????n????????I??? p.?6Q8????`o???VxK????[L??? ??*??DS??>8??F?[ ?~?? 3v???P???J???9??G?bD TL?O?F??8??j8C??%L??lp~?L??e?p??*_????{??b:B?7?=?F??f???0??^E?Mq??9T??6C???Vz?TA??~??@K??a??=?????%:??> Y??`?SN)?yH#"??E??S<*???Z+M?{?????_?n??sJn[?D???fk/????}AT7?|????u|?\k9 ?)??:?????q?????],-?&%??V6g2'-?i4C? 1h?: ?j?w???????????o?Nb??@????I@?????? ???j? +?9???B??c??rE?? ?i????m?p%????????x?P?A?? Pe????c????[???%?3K\p29?????? ????8?[#;Wm6gH)???-Xy ?r???_?-}WZI?????????V?tf{??????%? ?K=??e@???A6??2Z??L???*?=bV?^??j??g????`?t????*???$ um?.toz??h?s (?8?8t8??-??d???????9??IURQ?Eo?fvu)ak???+??xW?Kg%?^y??N??e.-?|?~??V?9g??K?9?#?b?Wc??e} V??+'???\[l)????"?;??==R????")?? ?^0???? ?`b???> ?,?,????rS??F[ ej$?OI????D96????? ?s???????D????z?)I?S??J?*?q7).??Qm>l{,J?a???? ??C?B?q ??gpn???L??P?`?t?W??????5???ke?????IP^??M&??????`??`?X@? ?_i?-?3??(`??Tf(??"????[?`?%?Sz???T?W+?RG7???y?8f?~?i??U?&?A4??Zy????????udeB????w?? ?k?? ???(?????Z1?:?????9???E?????Ny?S o?????z`=N???]???!?[????,?????)v???R?un?C?P?M1"RSP(???&?V? ??????U??_(?dGH?o??%e?.?n[???i !????0?hu$X??I?M??????#???????>5q)??B???h?? s Owl?????????/???&%j )W???? ?? &S)f??????\\?rg??????\??p!<???(??J?-???C?I?jokF}??g?n} ???n26j??:?*aP?i??`??$k [/q`3N?y???? }???fW??y?g?|k??k?\ ???"Y?? ??9???a,E???agiK??}???LFe?4?@?qXJ ?[???c?? M??%?{L?9?[MP??@????X??? U?z?4td???Ms?1M?-????2?c??&i??M??:?q??Tb?N??^^?2GM[???]??9?%????8u????????]????z? b?M&???H???????m?Yu?Bb:>???????z ???so?a?????W?' N?1N???m at lA#W +?#V?????2P????MN 6??_??^?w?G%?lA?Z(?7?5l7??/?x??+U?2u9?y!????[o??AO??x???V*????????H?? B?\??24R???????X???bcK????N??T?????1??,?? ????S??{????????z\HO?77 b?? W???~b??i??$.^?@??'.???L????9??^??"??c}X??????6????G?s?\???8???Q;???n??[8?'_7?$?D?t?,t?[?l?L??L???1?6?'?\??=?1P>??,??$)0-?Y7???;?M??\?????)??-j?P?~???C ??()?|??????????T??#w??}?`??[??????vt??U1?m3i?`???Ql??O??k%??F @Sj?e:??8?H???w? ????u?=??c?????$?"a)?????1F???1abG??!s/?d) *A?m+\gj?_??y}v?y??N??`???I) ????U~@??E?D?e?F|=|???Vz?=.V?{??6 O?hC???? i???????I?m?????Z?y?eGP???[-,cWj?^??+??_?l?&?x+?v??~?rKB??@?KQ???CS???p?a?5b???EF??.5????SS?pa???Zw??XQ;?}T[?3Ny2cQ!?b????/"W?\???#\|?vi?C?R???r???IH??R?"??g????+=?JW????K ?^j?wu?S?Ge-??N?vd??;?????????~3f???s ??o?|G7xDI|?r?,_)h?*\????P?6??u?q?=?$u????Q??????&"????%$-f??u??/??yo??5??@?.o?????? \???g`?o??$?????????J? L|?? ??,I ??T???Zi??h"?82?v?9 F?b?0?:I?x??(???!??S?rO^??X???>?~?(F]v,??k?/??K?X??????????r?;H??B8???:?????(?<}???V??g9*#&? ??K??I)??^??{"?%??{?v??????{11?gk+?????n??*C?????O?????d`??M??w????"??]?aq|?T??D?Dq?j??S???F?4?XP;?F???d?b??*?&??????~??{d?)???s?v?Hp _??a????u8????n?9?H?%k??d?????? ?'B~;??n???a3????[ ????#?7???A^K?R$??$??????d T???? ??Ce??????Y????_???m?<M???????gb??????k??r6??:????U.?S?????Lq??8l./G,66??s$?????y?1??????]?????X?E?*????O!?)?????O???}?/????s?U??P?,????,?9????jg??j?w|w?N?o?{???????d O ???m?H -?E??#?HE?????x {?? ?(bmE????+:!Y7js*?V????D??? ?F?R??? hYB;)?Y????J???"(? ?f????????$?s?N 2???4?? ??O??{?J |@?{$P?KV? ??*?g?@??E ?~???u4Lg??/N??:?^????????y???P??,?????2fl??C?RMx????? 7]?C??@;u? ?N??K??'L?#N^??g?&K??%?! ???S?B? ??I6v?$?#i???x)c?V? LA,8s J??HS??R}!???$ +?>nw9?S?^w???R??={?m???!???I???????d???? ??????=???2? ?????CWk??o&k????=?+>? +*[??u??3????Lw0t?kjq:%??iT]iB?o???????aU-??{S?#7d< `Sx?)"???????? ??X???oZ?Y??????G)r?eX??{ ?????x?c?6?$?\?'j?+Y?????uH??I?l????????(??!??tI??i???c??i???B?D?(+?~t?J??????E?=$?dKWj?2?<??\[?Fn?=?:k???%2?4X?!D???????????^???C??$?l?cc?p??l??Q?]??zW???;???0?2???/t?? T?;?U?Qz?G??1??P??{?z???z9?D:Ol?? ???"w????Wq???2?0n?o? 2??sM????g?p??6????L?FpE???{?Z?qS?\??Q????b?????UH???lS?\?s~??+E|}Y?\?/????i????~w?.??R`_?????p??DI??lx???=? ?!?~?zsK??????7?e? ???8eB??t??'???]??G-?F?????PY?Aj??d????IV ?MP???v?~?yr(?`UIZ?p??????? V? 1e?r??I7??&T?Y??VC????^;?^a???J??7????0?? ?~?@??yX??????????lTz[?h?; `c????{?Yc??7L????????o???????{?|-^?]? ??K????_&???3~~w??8Cq( 2x?h?"???2?Y????v9?&o??8?????$?????*Z?M??B????2??N?V??6T????^??w????K????c????9R?f!#??5?i?AxH? :n???gF????D{?/??????>?i???yTV?r?????[???b|??hc"?/???=???``*?.[?0"s'r@"c?z(????XYm\HDD?$?#?Wj???)(RnR??A??9?Z??????5??Y???.???AzO???????Q ??#c\?c?9?K}pif??g*,????, ?x?????o?V#?X@??G?)??????\?@x??? ? ?F ?$b??="???.c????????AZ3??{q?#?????6????k????ouT'??F???hr??7?lN? ?UQJ???!??B?B?uc???y?M?????DJ?*?H??h??6?[???x?????JU|?????y?a?so?60?.J#???v??r=????g??gQ?$" ?3BizD82J?i??SJh???r?Qd'?7? QV? ?????kF??fZE? ???B??+A???2:??4I3d?/5W?_cqEW?s??#??????h_r~? "?fv??K???MD???@??{?J? ??- ?m??????N?m$???"Q7?????@?T??(2?F> ?m%?=f? ydW SXE_?#xH??I??$??e???~A????L.??E.X?cB2r+[/W?l?M????w!H\?eH?? ?8V? ?>?T??8#{m??0??????s?({?l??*??]+v@????voYn??)?]?EfG?????+?y?-??T?;???M??N0?bk????2????-D??:??????S????6???|??g?????p?eE??7>???KAL?????f?B ? :????\$"?Q?)?=3!??J?S?DH?l$?.????????/`?)?s:??!??s???u???\??W?4??b?qH|?v)???'8????????sz?GF713O6?/???q??,8???#???/=?I?"?X??=akOhw?x?H??w??%??bA&?c~?mF???<??????/???l?{{?0?~:??????[?? ????-???t????lca? !?c?y7????K?????q?#WE?y?d4)KB,?????=????4 ?[J?$????????? H?X????"??R ??k?u???? ?mS??f??`???bPS??/- ;O,????9??E?G?Za???a7[??y?s.?*?K?c??????????f?1?M??6?_???9 ?C?p?M?? ?S????b??o?/?0V???g?$U?,j???[9???U???s??? ?S??,??? K???LIV?? 8??8T??m??z??q???;w?iZ?H?(????o???????(=?? i???????D???s?! RoO???( 8???????:?`z~?m?6?D???????????5@? "?W?!????(???e?h]???k x?n??*??(?n?6W??y? k'?I?kW#?3?@ ??? ?4????8n0eE?B?????Re??mx?B??;X???s??????Yg?nJ[o? ????hi? b?pPm`e92??K?FU(=? ????V??i??wk\9?A#@?EP????????D(???????DP?g??GS???A+I???????w?~?e??2 %?"???@?8??XA?u???N???XW?Y?_?Y??????S %j???`???p???????%l?^B?}??l??Y???_??sw???#??????2???j? ?J?>?;????y?x?????5?'?b3i??c??? ?T?<+2???c]??'H? ??????(???/?B>???{???=????x?5g?W???"}??tEG??=???H?? ?d???? l???0?aw}???YN?e?????6Ab??k???~??????Uex0+o?????w.?E?I??n?????c?dK??<???wdo[??????? ? ??????????? ?????w????0%?????g???,??????G??0n??l??G?3???5Do?"?)?6?????q???g?&??hk?f?y??????#??&MZ7q _%??f?M????_k?s7ry?[m*??W%y]??8?K???%?$??%?$??;5v??PE+??>^???S?Xd?n?;W;???-j"??Hy???7?N?L??R8?&q?v???hr?h?????u$l9Rc? M'2???0??\? ]?gC2?j?g??&????/?? ??r?????e?G???a??J?y?B?J"?????????????X? ?g??-$?6?F$?f???>AV?"?{x?r(f?Xp? ?d???q?pJ???w????Z?m?2?????[? ?;?)t???JB?!?????E??x8?B??? ?O???S??Gm???}?@? '????>?~?????9e??^??Pt?V?M~?k??&?G*N?? ??????31;?>rdwT??w?/?e?????;?????-K?R ???[????OnUF?n?c??y1E??P?A ?7?????H???!2+???ijyZQ2D?d???p??c??;?K? k??q?wm] H??*????????Z?2??)???S`??????F?:??2?W???E????L1=??o??J?e?? ??????J'?Ne??CV??"???r?OLM?-}??*????_wdM??"??? ???G?}?G???9"??r????W?9 ????5??Np????g????? ?+???0M?P2???????????TNwt?rZ??{c????? !???)X@-???L-9og????!? ??,? ?h1?n??9??,R?+????(=@Z?????|?$g?}]A?P??f????Q_????O 7?k?\?????5,??'?7????_?2??j??>???w??y????2???Qk???ph??CYt???I?????#VE;?,????9?MVo(???#?uI??x4???~?]?Y?????p???g?? ?#?K?V/? ?n?`<5??NE?W??4??^?????-V?h)? F[??|???ij?k7???T??I,????t?????? ????1?? ??b??U?b?,???fx~?q? MY?H?t????@? =W? ;og???v?TH???V? ???k??9?I?p????F?[?~?k??M?????&????.!?pU?????=S5?T?+ ?|?? 0?????s???j??y???+?????4??P??K.t???????Ba@?'?&?????]0F?????????[?t)??ei?u?????7E??k?T=??S?:?8W?? G??{????3F???4???}??~?????$m?????5???EV???T{u???C??????U? ??.??p?c??Kz???,?U[??>5 ????q@?_?eD?E??*???i?hn2?'???jz\fg??"??S? sx??{??|n?? ?????)P??]?M?????45?????Fm*g??gR?5??@ ?????Qzfij??#??{.? [S?[L??X????????[??4?????-W?W+???? b?r?t#J??9 ?~??b?a??;??6???$?f9Jk??+"^???>?jV?b?a???r?a?2vlJG??k?~=fxECR??e?l?k?i?-??=y???<>-???*??Jz{H?}? c??j?0mGb^z?oWvM?P?r+?????????? ?%]?d:!???\?I6k?? S"????3?bOo>??U??x???????QVLtR???W3???ar??5??<?b?:??}:"?k?aj5`J??5?S K?????y???m???Z? ???Wv,?y??????r?q?*s??\ <@N????s??Z)?????ohF|?1??d???-?.???o?#??????<%???E?"[?????%?N{mw???r??l?sn???????t{?kk??\B???RS?K????y???=-????7?S??`?7??q^??z?Zi?{?p?@??>?0??{o_ ?? 9??b??A??o?io[??y???-?Z????b?{,?]???? ????????n?X????????D????w1??????[Y ?.b`SP?w?(FD??k?P????)????NL?B?Fo>??????}??C??7??_"3e??????Pn ???K?|!d???n?ob?H???j?? ??Bh??b?x?6LEh??-???1!???"Q??????MJ??K>u??#-r???? y3E???"????????& ???y?x^?B5?-?*?????d??n\g??*???????K?#lSB ?=??,g???3??5?;?u?1??73>A{???Go|??????l?????[?Q??_?? (?f<??N? ?/???DK????????; ?h7????F?aX??oP???0l?|P(???_!???? [Vy??(Ur?Qq??e8 " ????u6n????1?1?? X??yN????????h??]"??????O?M???h"?????5q?f?B8?????l??}? N? @k?? ?\V???7?J?~DZR?i????w??V?6?v?-??7"C?A?o?? IB$o?????;???r?O?5?? %=l???0?%%??!???6???.??P????!Y??2?Zv??a???? }??H?ha*??? ???H=??UB??L,Z ?????N??f???]?>? ??w%v?D??l?W?? ?7;?b0????8eW?Ma????{?Y??f??HtM?n^ ?]??;???M+???A?????t??7 ~+Qy???u???3?EF./^??????_?? ???( gD???d?:!???M??2?t?x?.??#?;??hvW?????UK?'????L??yJA??a?E??? k??0????0I????rba&??????99.]?ASLi??8???t???LK??k???um? ?#?:????????*\s??:??j?.?8M?(?e>9??? -????b???A?Bo???rcMxVU?*&PTVe9?=??#?),??=??d????\??[???WG??Rf(?]???=?1:+?????1??qI[`? ?E?G????>??J???su?cB;[w ??&}?H?? ?????cC??3??? ?c????n?=?????b?Dby?*??????ee??MS7???K????????K1? ???LJd]??????t]????ak$???e???????????f?????U?T? ?????_F:R??P? 5???C1mr[??;??+>cB?B?}??K&Lwi?""???`??????gb??#??_(]??+N??,??J?X( }{&?8`  ???9???? Iy?a7?w??0??/?K?i??w??@?5s?F??? ??o??????Ty(@Z)?4???tb"d=`!?0c??B|???i-]?????????|??N?k?~????1 |`*Y ?V??E?x.]???~$?????h??????\9??1w~?\?j?*????9?`?O??q+?Q?7y 5)?t?RB?S?}{yr7???#?LU??g?? G ?????? ??????E?h??????B(TmS???????E_^??:??9?x?)R6??1??E???"?K?u??%T`???uf?Y?&?{*?:V? ??S=??+m? ?????D?ml ?????V????.?pl7/???!??%Fx ??vq??y???? ?~D?m+?4????&?DG?K4??og????O??????T? {?-??????????1pv????(??6"-7?????-; FN?0?.?H??NvJ?????????dGS?>-????????;JO??p???C[???"??|BX????d$A????x"i? ???p?#I/UO?????; +?(??? ????%????X`e??????93t????c?v(5^??s?R???@.??diS?]`N????vc????wt??pOw???Ja????l??m?P??7??????O??x???;???????????.?9???]?*? ???o?N??ihFBa?V?J/r?l?J{????1,??#?t??????A??$????????H??D*KZ?h???v?9?eG?9????40={?????9I+??????4????z?;?B?S?H)??:?'>nX=????b?XtD@??????-~???$K???G??c??Y?h_?}?.?.q?? ??????Mm?3??U?U??h?m???I???At???????}[rJ?/?"/>??/3??2?j ?k? ???>?????]xq=?v??f?H?&1?G???s??????????!?????????????G???o?M??oQ>???G?????\????4?/?k=Q?U ????f ?\t??6????-S?7??N=a=w?N4?zk/o????(??s???????!??u?0?pW?7 ?+??????cv? ^P???w????[0?ms q?E?[???????? ??oq t#??O?"h?^NC:8/??e ??s?.? u????N????x4??? ??h??l??B??Z?9!?5?:bFo?2`????hGc? #`??$??`???S?!g?K&Ri?,?????4?????????H??d??&5????C4n?g?Q?,uP???5???@????l?????(???K?????????x????t??????]??C??y ??H????????*r???$y?????Z????K7????%?R? }C2????R?I???GZ?????O??E??? ?s??? ??n?I?+? iM?6??W?3????Dw??he??6>??H$tx??;?3????6???6????:?y???[???#?'??*????????7???d?]73w????m?Y=?N?U??p???%??A?????????*^4?$an?????????.???H?Kn?1_?3??=?V??????X???#;?Z?!?OK?0kb?FLG????q??i-o?$Qq??+??????st?X???Z? ?!7T?H?????X"%?M[??#?}K?1e ???\?=???I?????e??5?E????q?6~ ??&eh&5{? ?^?y&{\??`????m|Oo??;5??6???.??Y???x??? ?e???%B??P)? ???K?=???h|???f?x>?H??#???$?dCz??v~?2?}k??????=?????????P?h??Fa??~|GK??|G%c????7Fnv6?v?g?]P ?^??a?? #\??]?k??ta+?v $??yY???k??;8?/???lRvw?G????3?u??m&q&???????I??@x????? ??eg???=?|?,8???L9:??v???q???M`??XF ??gO\@?5@???!??i? ??+??{????d??????]???c?[:???ka*??.????v=/4???@o&t?J??f%?2????i?bb??y???s?P??I? oFL?]??S.TQcEd?V?????N2v6??D??WU???]????8W ????;? Nz?aC?G$???lg9 N "- ?? ?dh*??x$ ???8???H!??"Ol8*?d7??ph????+/LR??@;^???????8n?S?<?b$???Y??3Vv??????????V?5 TW?+????V?}???R9??M? ??t?[????h?4???aW ?;? ?@??1=?o??Y^1Eq???? ??6W?+?.|?J?????s?F?d?Sg?????c^5??_??_8????X?^?>{?Y??o*??|$?t??a?P?: ??f ?4{tV???.?"u?#R????xI?8-k?????????]ZH]?W?Y??kb????GV6??/?K?o??$????{J?5 @$-?????m;_??k??5?6V?ImC5XJ=??d???P??l?F?>?c???V?eM>??|q??)??V9.p^???v?*So??&?j\?j???????#??[s???M?n?A!?mK2?y? sS?>?N?b_??t?!?a??r?= 0??????py;G+?D`?? ????**?vr?p?(?H?????bq?Qp?I?h\J?????? O??p?l??ky1????(??be?? ?z??R????sF??;F]?7 ??)??B?#?/!?t?]0???o??(???????????x??.y???x????61???,?? Zm,????;4??M??=uC?-??????{5??1 ?k?????\^8~!*?eA??V?????B???}=?;4?h???oq?\?m???p"j?9j]U???Z?4??-v?t????????Kh?? lU??q???4#???"L~j??fH?x??m??????g#Q?U??d<:R???????q .??? L???:?-???s|L3~R???n??v???????;?(??t??q?8???Ch?+\???9I?:s ??~!N???[?5?t??????*/?9??????MrBRl???@ |???????P)[o??????R??f?LMr_??????qaK??)???01PT??s^@??}\?"w??????A??1sy z?Y?w ?]:???h????pJ?k ????yx????Q? ; ??????~?9?? ??v???'C?=??Z?S????KW9?\h???????????\??0???D??vA????LAdrz???X??fds???????d 0??b???MD?Y, F??)???????{??????????&+??????vd ???}I?5?? ?t??@?z???l?A?6<?k?y7??*???5??)??aT??{?b????jT??\???<g.??16j?u?????_@?[h|]h?q????????T??H?50M?N???-??hp??2E??G ?v?????pfl????2Z?Klf#??+?,????W???^??l%w???|x?4E???&?t?\??!?????%???w?~?#~?45??~q?# ??1?????8?9?U?ic[??? ????F????'????? ?c ?4??$Q??? ?m?'o?7????h?d?????????"?%????:woq^b???b?CH9??>DkJo?c4?V?]?????????+\?qVw4?u???U?V?}???G?K?2?)?/'?V?c??*?a?????r???kL1??`???b?;L~BV?r??>??????z????y??0.?$??[?Nw???0xF?OU?8?????1???]?????%?a?*"X????????????Wb1????$?D?:x"???\B??v?A;?.^??N????h???V??e???????????[c?x~???`%G ????z???a?????? L? ????A?cE?? ??F??z???X? E?q???a1Wa??x???`]bN?^GG?h??????%??? ???? ??fX??zp?<0??2??H???????????? '{B????w??????N??? ?? ????)??>fk?:Z?y?n?$?????z;???$??b?????o?mW+ 8T?9?&?a??$?>??ij?,????O'j???"???>??T??(??W?D]8;h??Y???~z?{ ??m?s]?d5^ jw ?H01???:?M??n??A|f??i8w??Og??W?U_???;?n???????Q?+? ???v? ?"??)??p8?fi- ?????`? ????>&??M?{??)D} ?????sv4??H?c??8??eTB??U???+'[;x?????3??>q???v??V+vg!s?H????tv[F??/k[ O?%c?x?=\?d?&VA?G???_?\Q7pm?K3???+???y???w8x?0???mBJ???;???oY?????????-?????f?Dwl???%]??i?!d??????0[??-? !?ZS???T??p???v?????C???m??:?I[v??( 3?q?"?x?nf?????2?u?1?<1?} y?7+?B??^AN/??-??????w????/??*At???NF??G??K??? e?"?n?k??I????/xEk ? "?rq8?? ? ?xL??H^??-n?????3?B??}?'???T ???????S3X.3 ?#&~???>/4?n????>{j?}?Va?????gWi6B???r8????q ??m?z-!??~S?????? `?T??L????]*?????W??*8??qZ?w? ??u????K\?P+???bR"???f?h???A??? ???? P:????m?U??b???C??zr?h+8???Br?? ??}N?fimj??H??v?????Q???/?.1^5?w??????G?????7??)????a????L??J???-???c8?v&;&q"G?q????? ?? ???.?W??T??WK?*???????p??T[y?????b???l??Y????xl?q2^S?j?m ???s?38?????%>0>??R-?$k??6p 1X?????=]?6???k?/?q?8?K??m???( ??bq?Z?vZ?\??@?a???t???`?%????lt"??'?1??X?-??????r??^???g? ?h????fO??x?t?R,?(??fz?%?|J?@?H?S?i?G?'????? ???`?D at t62I?M?q?"1 ??????l?i?(?J? ?,!P??.?AX??# ??!?8??]D?????????VZ?G??o??M?j"?f??K?t??????J??`?N ')??7???fM???? {??? ~:n??K?????Y?3?g?~???sW?F?9?==#??co?^~w??%?@???9? ?&R?rG?1*<_xZ?ii?2??J'f?`??? g?V?N???d*>?2V??Qg??q?1/?????~8?????g????(??I[????+,R`??7N{wo4u~?~e8???-mOt?.?tn*????bEd????u?f??|'B???u? !B?0?f???? 1j?: I????7??x= "z????x?? t??\?*?,,!a?b???????mv???W?????????;?{??;|??$?6?????U?mn??w?'?l?.????????N2????V&????T?O?V? ?Zn??????]??{T??1??bS? ??/YA?i??]`????L2G??=???o?)(MZE??@????YZTa?1e?)???8????t??$z??Ozca??j?e??????Na???^???M?A??kn?A????g????Sd*?}???aq?????04?7w?????P?[?????(?SM??@ ?vakFuq??7???????zU???7?Ft??5?8U??OA*??X?<\KK ???x????u????*???????A?C?r?5?x??k???cAGZU?""?4t?????re?9?{i?e?/U???p? ?nx??GS?[&G???Z?~?~???????bo??@??=.? e?' ??3?q!T?????_?6b?ti1J???? ?q? |????M?%0?9?s?e??:?5?Fo??,a?=??=Wp??M??>?:????G?????r?o?G?????Uy????V&?/?6k ??????/????~??qe??)??5? ??)#??' ??GQ??8?5????????7?????]?W?+/?? ??r.?4Xr???s_+?K}??bv)?s?o? ?s??%?????~???????U??8?Q? ????{b??h??tTv ?{8!?X???C)??]???k??g>a?sql?I ??E????#????1X ???y? ? ????! H?vMQ????????????w??| ???@,??^Y??w?T?c? d???#?sc ??e&????4?g??!R*?O??:??U?????????????O???? - K/????tV?SF?c?Z??T??t??-]?g???eni????4d{???N?>MD#?*?????](i6????!*GS??????[?ep?'m ? ???D????? p???b?Q?`8T??}m?=i??)[OS?%~?{u??'7???o?2Y?V?x??? ???-?????? Z?w???%??IrA?Z?z?????????o???v?dp;??o???4?,??&G+?????`?? :]???r.???_?????IL?3?og??E?(??????0: ?? ?x????|?m?6%~?;?pP^??q)u???`??9?H??3?c? ?-?T??(1??I???9?HE???r??D ?tB??y*eb?7???G?K??(T?????P?{3?H???p?]??p??O??'&?- ??/v???IJ???n?-k????nks?[?????)??Pm?G? ?Pm[???J?-SE???~?.q????[p";??$FL(???b,??C_?L??k ?????,??5G?????'???e]*?.??{ ^?9???||?\?e6d?z?,,Ro~??&hE??uB3RL??de9?Y???V??^?2pG[??r??M?f5,S??k?f ??<~H???5cIR?V ??????c?x_Hh2?Z?=??\?f?O??N?m??y'a???,???????_A???g?X??E????zc?????????_?>%N??????B???Q?v?? 1f6U?s??j??9)f??r??|? ???????[Y??7?(??$J?d???y?M?s?I?c?7?^???h???}?*?,b2{.??,'r ?}{??3???ph#??Q?Mm?+?K'?????~?f?` x\???\2?????Q?D0|N??l d???wv?>????3???G????D?KJ??h?7??o??t?bP-E?~?P??|?????xb8Pu????.H????tu?????/???.?u??}_?H`?K?If??-?J??rp???5???????J0%?????b??j???D?sm??G.???????"????7?*. ???<4??f?????Xc????jp???fO?;L??z[A#U?b}S?b?t?3aj at P??:&n???A?q =?vlB???????\Wr??4o2y??????%???KR???????Z.?H+??a'?-?O7I???a?????)?????l???o??o)????m?????sS???VR?????3;??5? ?e??E%?5? z??h??1?7???pk??!?(??? d ?????G??=?o??9~??bQ??g?,??P??c??B??!} ??Y?????\P??e?? ?v????s@???sr?8???s???t???\?u???(????7 Y??X$??`0p1??x0?#o/~i?G??k????6O*?h?_????TD??6??X??'6KS&P?w????O5????WAK>????I???c??????/?? ???]?c=?q6}??6Y3?\??N5??/???`????i Y??;???~?w ???}H??|? eU'P??L\???[4#??7?D3?g??p????x.???|???_??/"??6?e?2Q??D??F???csL dx?!@x?i?N?S?i,??92?????:?`B???'9?$??w?T?y??"???%Hu8q??.??|ow??^?????nt\y??M??????zbd?????JH*e?O?%6?}o?x?L*?_\[c?bC??b?4t??-k)?]?R?k??FLeg??rP?e???,?oR;y>??IL????Z???????ko??,?23???~Y??6 Ank????Yk??;??L?n ????'??6???O??u?)!?Nn=?pi??????_??9???? AO/??a'? ????|?2???? <@sSC?OH????!? ??????A?/6nAG??t#$J??.?"V?j9?x?D??r$?E???????z???Y??9??.??????^o??m?%??Dg?=~;??W???????2N(?vxzvjOq2v=F gbr??']=?????=?????A??????=G?:??????f? ?l4p?`?????xq_k*???]??????~?FAF???????1?h]??N???dM??721Z:t?G/U??i-?{??E????@.???_???M}F#??E?/?\??,??m?r?????r?????m?c??|???7??T???dhk???u?xE"/?Y?m??^gk?y?m?{?t?)????[?????V???Q????g8?e?! ;?`??)]?@n??1u) ??W?yh???b???!u???ECjs?N?????kH?&?WLP?Y?0?{???R?%?)n-?z??xZ?z????J?CA S????T^?Y x??9 u??.????G]??????!????!??0O+q?uI??? `??!A?????zh??gK?.;t??s????0?#? _&T ? ?Py?y?26?/&}????????Q??kQ??????v?/?.JP?/???Q?`?w?5~?~?? ?l?7??????%??!??[??????????+7? h?x?? y??????W??~w?? ????Cn?iL? ?u}?c?#???w????d?????J?}Z?s"~??2YDFZ??????????^?O)? ???l????????2????}Ck=OK(???{????z4?l??lc??\0e??l?%????k??s]>? ?S_?bK~S?t?*???E?????}N?????&?????????B?2s?q]5???to?n????IP????9?H"??8)???p??0??0&?????6|?n2?/??f???&?X{??<??M.?Q ??6}?7E?[???????z??_?? ??mss0AS?? QtY_?^?7?T%?X?h??'???42\6???Kx??=??? =?? ?A ??????????i|?2??l??@?4???3?????dLk?y??:N]????f?4z??W8?&??ED?w?>)??????,7`???9k!????x?n6?C?f?m*>j??<E??I????~?5)? ?n??t???8??z?@?'?n??qY6??Y??;?w,f{????CT???@??????<7?m??/A?????}M.??>? ???^?f? "??G???? w???_??wv?&?I?#J??9???????N?!"zC???K?o1wg??`#? R??/?~????u'?? ??~l??=?_ {R?6?*?????+DW" i??????4??o??????M#;?ow???????R?? ?,???a? ??D ???-??^"(?I{?Fl?!??K??6%??4???????P?5G?C??P?? ??r?8?j????I????M{?B?I??f @?F????yMv?w{??$???%i??r-9??????U???H9v??d?q?C??Y?}?5(??????S?9?&b?~???[e|S?-?b??J?vg??(O??!?o???B? ???|??b5??|?F6~??u9 ??????*??sd??E?K????7?T^????NY???????&#Q_???Ysn???p#&?? ?O?pu<#??.pa?H?????????????W?*?-?#??d?Ee?%??T0(?82?~d?K?????F p?av?[]?] ??Tu|??%CY???O??.?Z0??,*??????U_ 4??????|?>?L???OQ??k??>?????L*s????-??zww?V^?~4"????e?9 P3????R?????I?????.??v?x;?L???0?4?E?T?Z?]FDGB)?FW?|#]jCvkZ?o???????J??\?R3??}??[?[??Y?\???7?T??{?m??PB?UX???H?????s?????dJ?'???\y^???_[???iI?7???V :?m3R???U?k????m?d?v??V? ?`]?%o,?? e?X?2?"?og?ane?X,??^?T?_?g??C????])????g?????K?m-l??.~W ?f=iL?k?????9?Y??VVo?'?.5N?I???=3???;9?e?????!e7????p?????&{??/?d?K?%?D^w?]?%s)???? *m$?????(?Z?? #????mF??????*-?d'[?U???h?/?D???t?? Uo?[2?+?D?\B=Ds?c:?????4zg ?r????l ?g#q9_?a?j[?????O?W??-?????l??????r}??dA????b>????~?`??h?i\??Z4?{[?x?%?N??c?????~??/?v??#?&???$???0e?)?X?????q?X??]???hA????%???@??V?o19e#?2?????"g/W?K?Eo???K9N v?)?Cbz??w`?????!pt? ?y_????v?67?Q??2J???n ?.?Qj?0???4C??A??+? !l?????C?C?????N??????H????e,??~r??e?l?yl???Sdl ?hq?a????? ?V?3o#?D??-?@??k?-???5??? u^??h???????|?????Ba???2 LZ%???(??F???'?????? ??,?.?$k??L???rP???? ?(???CZ??;????VX? H?;-??S?2u?kJ? ???*j???Z+?O?=?|?? ???_??wbO?zR??a??v??' ?PHq?X;??-?vi??????^t???????????IS-w???H???? X2??????c?5I?|???v?:????,Z~?????*N?Y?u?3%???;OK?????9???v???/??0???S?<?%???%?G???|?F ??Ki? ????@e??x~^?????%N?Z?????y??)?g???9?a]???K??A.g?4?R????Q2????? (?.??HM/~?jb????K?,Zu???g' ???$?6??k ?gkd ??#?N7w???TK_???w wwMGV+??F??????????#w??0??Z??I"?w??G???wjvv?i&??u???0???7^?%?w????e$????>?????+fJg??????~*?Q????|7V??+?w??Q?O?L?f 4?Z3F?????p?????T,7?P;?$?f??lS%2?%b?/?? ??3?A2?q?????/??u?T?]!?7mQ???V?n?{Z-?? bG??jp@???x ?,?4?J,PL:?(????F?K?4?????? z?p?_?IPim?????7z?x0?????j?i????D~?????g???@'4HuX6? m ???:?|????dc???2s??7R j ?]??IP????r> ??h??Z????? ?[]????D???jYN????XNgi??0???t2?c b ?yk89 ??n???q?Q?wl?t]0????T]???????f?~6!Gmc???AH??x??0zL?R???@? ??I\???.p??D?? \SGG^?Zwb???MRN???????a3???????:?$???7??????e??????=???1?a????Ha?]??r???o??????~??C ??y??????]?w;D?~K?&Z?1F]?VY`5??????????{?l?o????t?????w? ?q* ???Sj??N? ?G??}4???k?b??] Z??O??Io??2?f?%?????? 0????S*Q?4???I~????ww??^D*? ????d?V?{\?%???C??p?{??????M0?e?????1q:C?????N*?X]?!h??S.?U???3?d?r??T_?Y??$z?Z%??7.?4?u?> ??D?;??,??)??iLBC__ ????N????{Y???LH%s~y????{? ?F*bM?TS@?F?'Z?????c??!???;?? ?$?????????~>m????F?e?O????H???JTVwG jA:s????_? ?i??M?@?????j|>???}I?9?g??u???????????%bDX?Y3???Zqjx?Wd?@a??8 E?W??I?,?Nl???????I??<(????[n?m???????U????u???.???R@?3??w{?n???z?~A??z$j]?????????(P?_O??l????L? ?^??j?P???4q'%?7???Um"Vwc???*???)?-? #????????N?.?K??? ?\]??8?^,"=?7???z??????x?5????? Z??5Q??$?mB<*k?|u??t?|??-???????uay?{???\o????-C?u?6?]??o???r??5??P&n??yKt??y\?g??TZPE|?????????X m(???D??z7H2???i?]??5' \U?s?./vz?FP?/?&=??"Lg?N?AL??f??%?V?v????)?????gup?B??????e????e?dKu*V??A??hFPM??I??x????>??u???? ??TpC@?"?+??U???$???J?w at D??KIi??ga?qQJ?"?fX`3????????j 80|Z?????$?=wa??t=?????\?@?83 ???={40?Y??h6^?g?1?N%???dKR??'$i?m??'?r???TF9????j?q???5???e?????,3?D?q?d??? ??le?"??e???? #c????7p????a7?n??T???9??;???x?E???????z qF??M&???%?Q?a???v?&??;??bR???l?]????T?SE???L?????&?2b ?q&??K??2???a^?????I???s?4???- ??)?r-6???U??6?;{\??F;u.>??WH?/_?"5O}~?(7? 1???Q?o E??n%&]?V8W?{-??l?~A?$s??????4?/?I?$`?????f3M??Ge0???=?;??????q??{7??b at L+*HB`????????#"~?6 aX ?T}?????6?7???????%?O6V??c???.?*2????~G#?9? s??a#k?????u??tL???=????Mn??~H?n? ??>?g???";?T7l?d?AHB#???c??^ ??????!???_???a(?q??b`#??a@>???9Y#-s???? 1?8lPS Mw???E?mUZR?6????'? ?????3?A???q?~???F?D???2?OD$?F?4?^??? ??q???E??d?F???1??6b&k????|?L?????~?=??T??IK?????%y?Ii????????? E???v?????A2???3C?"-E(a?E)?(`?_|???VQ&???? G????Im???????o?? g3?A4&?~&?!QQn??P???:r????J&?~Fn? ?????IQ?U^2?a??4l)Yk(???a?$(?V???zH????? ???K=?g%?+[?CpTU??n??!??-????Z??(??????b?6??N*kL?????? ????,w??PS?cfn??m????s ? s?5?*?I?{??Bf?o?????k???-5??g?\Q??9??9 n???~tV5????d?@?%E??{o?0??:???:? B??C`????????????{T'?|?H3t:?S?x-?4?????J5CGk???|Jl?a??Av?^,^/6?L?6?p?;t??! 7;?t??H????`??/&???_???44t2????wF???-???/??+?FF1?b?+?qS87??s??;2H?*???n ?%?:?????<t? /}e??$K;L???<#]???9?fe?n? ??B??iA??l???o??u??U???ni?5p?????x??n?????p{? ?w ???C?+8{??4?/3??d{r???????C,w??? ?>?W h????D,??zm???g0??6 :O8??_L?i????O ?B??D ???%]???(,_e\d?"?+a?????????^]??$pH??Q;???9?MmT???'??(?7?? ? (?~???ah???kBI8s$ f?a??q? ?i???nN?'?$???h????\????61?}??r????nE????2??N??4?y'???????Z??/bS1:$@i& B??Y?l??^E??{P(?s?(???^???fS???? 1???Q>?f??lM???Q????s?sv4?P ?%?(????Xq??t]1Q?l}*???i??V?Ms`??????8j??e?????5KJ???/?h?o??O@?a?#7??T'h??6G@????? ?hcGc?j? k?Y? u?9|?/T??==.,??Eg????Es??"gl,????lG?L ??t=r??:T r???t?tb?o???=c???r? ?(?????x?????81????????#?@K(6????G????FP????8 ?-?O???|@??R[}?i?*???=????qal3%&1r?S????a?#????i?Q?????li???tP?????????!/F?S??zx?2??????????g/?j&?a$?(+?L\*Tn??+s? kN _??=z ??p?3bhTD?T?B????2?]p??b??vn?`d???????? H9????7?]??????E ????x&??[?G?.?????????6?uD??? ?U? 1I8??KV??????????>????O? C?y??[o2?P???`??0?']df???K???E\}??b@1?X?j ????j?6?:????.??+p??r?8?;??ddX\?dCK@c??Y? ???Y?????,yZ?I????????QNnY?5"???1??????{3??!H>? ?I^?E8<8L6?? &??C ?XBlSA?Z]C? M?G????????!???? ?? ??pxT6??),????2???8^8????4 J?'??Y;R?????C~?f??0(???r??Ayu??&2??ZX??Q;???3??P?????v?0 ?Si?`??m??u?'???1C?(???h?????j?9??a^?5??m?{?=?g????9x??9???|???O}?X?K? s[=?????!? ?\2?O????N?? ?'F?*_?V???/??DN???|vM???A?2Fj??????????Yh8?0 ????G\?k???? ???l?O?1????qL?/<? ???6Iaf???????p?? ??u?_l?c?? A?;???Y-q!oh?>????Qs ?YZ ?ZF??#V?g ???) ?????kW"0???? xS??vce@? j??????!x????s?iUI??\] .G?????)D?2?f?*~??d?Z;]alIv??5?I? h???0>?W?b?Xm?e*i???Q?PG??c?c??8f????d??("????#sg ???vc?z?????k???EoY??e?1?G???>MU?7???T=??T??????I??:??5 ??Tw?+s?Y?m?s _W???H???/&z&?????;???Ib,??? F?1my??41???U?`zl?5?7??l?NK??l'??he;!0???h????;?[%p??4t??0????\??7bfvg??O?+??a??LZ:?&i????Q ?>??tm?? x?JD0z?? ???l??? xU?V? ?X????eK???ET?????Ju?J8#? 2>J?h???H??0J??0 ??? )PO??i[@.?[?? ?7d:8???PGD?Kr?#]?A??????? ?x???S??J?G'??/*?b??x'Hq~???5,jo?^??U]U?|?}9@??????!J???J>%a!V?B????A???2]p??s????=w[????X?E?????Y????L?UM?X??OR???V?[??VK?C?J??? e C???? ?t@?]????<I??g??s2????C??(??c??.?lG?????KL???b ?G'??Y? @?B-??d??[??p7_v? |q}9??z??V?? ??F???OKMG?Br7?? ?;??Qy??w 0?x\? I??4 N?uE8??2_/?)o???$7??#?X???|? 5??k?{lX??!?.?u)s??Dl???nC????u???5?>#?7???????????????K????????:??9?%? ??????$???w?%?q????<z?,??XIJ?PX2?????????L?D8?????? b??5>?w????9???????=??t_?'?~?????????#?5'????FN??? Y:????J# [x kz:?b?????h??#????6?=?;????? ??%???? ?P?_=??w|???2???{?????9?!K?m??(??????}xuE??B"?|?&??V?m????t?9rU??7????R?g ????U??+b?Z?/?*Z=?|z)??:???I??CV???H=1E?m?????`???+?R???X'????@???nC?y?Xd?a?cL1??s???9??cqW? ??b4??????E??????Hd55?Z????T??;EX??F["f??]??;T@??w\?Z??]/4v4 at M???-p?????6f?=?c????s+)????????????q_g?Ck?? E???$??r? ?-?????R?|???Y)?C,?n??????????\?g[??k?eR&? ?????????)?%???(??r ?V?,???)?????-???j;?np?E?=?lZ?Xg?o]wA? ,??x?W{N8??????????S~???K!????2??u????"tp??Y????2'c?2^????i?????1??C???v"??-?K???M??&? ??o?8???? ?1C? ?h???m(?4`??d?,??2???3???? gbN?? sU???^ f_?{?(?\??Yb?Vda????????u-C ~??|???E??R^& ??"?kM??p??p=? ??? ?  ?!??)???????9c??3/c???jT ??M??P?/?n??n+?????+??"?,sBY?W?6????????? ?%???MVP^[??X???? ?mA]y???]X? ??????*O?B????z??????E? ?6??K`*7T~?????!)??_Q??:#RW???&J"?? ???2;?n9@??&nR??~+????T???????&?=??C????M ?? P???&l at 5A????7?7?s?????q?h???.???@?Oy?od-?`w??-o??) ??u?#t??(g '~8-l?W??B?E??k?3?'F??S,\?5?:??,????LP? ? Nr??!?"Uq????+jX??WNy??f?????0S???S?????,??\^??1|??????xWnA?S??B???l? T???8P????X???@??g\?N??A??2^n???????? ???N4?Q????? 5?????????|?}>Q? ?Xd?n???e?????DP?W??S#aZ?%?_R;?N-??m?????0??%~|X?1?A??[?HXl?E,0?{?o???????B4?/?PQ??c?&?DR?ID???/?O????%????ya`????%Z^?u]E? V??n???pK.?q???AB?\????5OU=??p)???jMt???}?)? ?\d??*??????Bw?[w# N^B??7???? 2|??|??Fbia?gW??????[?_$=?#???G^y???AH"?~?M???C??M?t>?v??1? ???2Tj`[Olc?^`???? O???&???R?? \?? ??9?1w(?D=????eD^N??\e"^??????+Q?Bg?F{?a?J??6$????(U???????q?%G?4>m??dcKKb??Yj??o?>????4???v???]X??wW?????j ! ????S?D?????ea?c6?o??&Lg??j`?M??ZzZN?[????~5Z_??V???S?_V?{?H??W=A??4?B?cRev???y?????=?Q?6t???C?8u??zd#.('X???0m???= ??$??????~?? ?????U?(????#;??M?QQwG???7?)fG?????Ag?sS????^)()??x?r?I?W?0b2e??)???,??????~??6?j)?????? ?d?p?2???G?c????"?J???????E?M?<L?N)jYP??? ???????D;??'7???t|???$)G?.0??Fw????l?Z?[W?????~??????\?TW???_?? 3?[??EH?$??cw???????I??i?;R*??????????Y+??I?4>O?????.u????K?K$|cr*u?P8??f??y?s5??H?]?H??r\??RD??!(?RWy~83=??????? ?????/?1?]??t> -????-mUr ??1???v at PI??,?eu!0M?`~???\?_Q??h?H??????J?E?W?????`N?P?????n?F??\?yt???W?5G??W?6e????J&Y???.=^???????r??7???e ??4P ?Sx????????BG_F???1??I?&??'?? 8s???????_H?/????v 7 ?????R'JX????E?9u ??wshe??x;?({\???@C???s?4??&f%???F}o??tv5??Q?f????? ?e????Z? ????tJ?v !? H?k??s+??:?2,$?R%?S????????i?eY??A? zg??I???[3N?Mj??*M???s?a?c?g??B???????WM??%?q?$?T_z??$d5???W??"%?V???Q'?'?????IPLe?????,r5?? ??? ??M???r?d,???????? ??:??t2A?%W?35??9?W?J??A# ???SR???6?n??qJ??| ?????!k??>?????? _b???MO?wn?(???r?ds??y?h????"nA??1?L???^W?u8?@/%z?C??l[?????X??????? ?????!?p?DZj???pB? ?4?e???wl???? ?xA??o???lh/?????hy?[%??/P???: ?R??*???? ??-Q?*9AP????NW8h?UEuG???$'t?+?*?d?%(?>s?n???p?r?xr?1???X???e>?fh????v??Z6-^???;?,??~?:?\??;??rA? }?QI??^L???ep??t??5???u S?? ??U??????H?JE??O)%R???????uU?M??4????+????>??? ??? ??I???????6?2eD????k???? ?o^??T4???7~???r\?x?>K0????,?z?????????2r??N>? ?q?????6C'?-???.N?9p]?]????4]??+ B??E?|?O?g?d+?j????Gz?NML8??j>???:?a?}b?Ub?(5?:?1?S>UQ??l F?`??d\?q???Q?%f`YX?F?TG????????R?X???&?_??L?Q?k??bT:5?Gh?5TkI` ?k?57?f???Gt4uC?5P??u?.p ??_D*????e#??e??*??t??(?y?e?:?H?!??4??????k\?D??kdz???Zz???!i`M??|?b??iE?~??8M?cJ|??4? I?K"??:?]?R?bTX????VN??&J??L3?kb?{?ZRc)?K??(?N?/??E?k^???????J&?e~???w????:???????j7/???0k>??(?y-?:a???) %TC??u????nSK?SD??H???>qZ6v? K???C??????o?}????z8?/?b??P?=????@3#?)k.???S,EM?4M ?tD??{??C???V??)?????S??H? ??g????X??r??jm}??Z?^N?;??>]?..?fJ?i?_?1?;?SlDV+?? )?U0\7N??^??^v???,???A????%?? ?? #-? Wk_??$Q???^wr??k{????z??G0?? ?1'?7@2?y{/?S??Xm?2?SK???^fF?? ? ?#?s??Vo?h????2????&???wV?mV,S???@?-_?BA?b??[ ???_?X???^C???Yqno??@l,.? ?^ ????M?'D???l???N??6????????](RM?zh*??=??8N?e????????^????????78?>?????jslky??0? ??Q????RC????49???a7?}?P? ?????L? ?? ?%??[??Xj???+???68??{; W???#???F????'!-~o???C???vp??Yw>???/?????J$?@???????? ??`????? ???koM?=???xd???????[Lyo?i?_???L??#K2?g?\3*d?:_7?g??!?s?;JN-??z?X?A?>\ ?e????h??<"uq?b??? ???$??7Z*??"K\l???y?dg~??????????/????_??????? ?2?iG?`3?=?Bd?m?.Tp??Cc)????]^????'7@Y?0PIr??Rp?????w???hJNG`K??????????e?Y? ?91-5e?a??l?T? ??R6???w?R??S??]B??Q)V??l?#?>?????%???n?(????!??/?n!??lQ?VLj?TD%??AP?A?,#???Nq????c?? ???A&r???&n??(??N?T??7??J?z??|?\?b????N??.?4??????[??JRp??????????????a??????yu)]?? ??0?F??M????T??4??"?%Lo ?????8?6VPPN????J?4?;?keh??<?E??? ??k#?????[+F?TP?????(D7p?^?@E???Zm?#???????L??????Jf???N+KS??~??r????$??| ?|???a?2m?? ?S?????J?=?????"\C{W??X/??g$)??Jq??M?UU:??`L?? y ???nrjd6z?aH?m? t?V?98????NA=??xb?y?&???N??_?N?&g?*????(???7?N?y&.?? $7?:=?{????d???}?D???Z????????K`???X?7?C??] )X ????ZE??X?t?8xy??(n?? ?a????z?#3#?E\? ??KmW:?n,9?o?4MJ?M? X????A,bW Pj?U?x??????y??k????kzhW??`??_?O???+??mQ???I+???a??eNC??N?P???r ?+YaZ?Z???F?]??|??????v??P??S????8b?'p??be^??gb????Z?3+|&G,??S?u????9??^4?Eo+??"\??????uKm?u?l????;Q??P? ]????>?Gn?????,?z??\? ??????|LE ?21#P??????[??"???P?+???b??{??`s?? ??=F~J?-?chQ?$4??e??s?S8?? s ?? ????q+C??H?s?sy9?me?IL???-??????rX=???zn?K?$X???d6??Tt<?^R+???????z??#j???????S?^_R9rEYDL(?h??r=???A??n9??cB??????n*???LW?b??J?0A^w?)??!9?????????.k?F????+??fD??$??7|-??w??{??t??????b?????????>N?n?bh0????????e?m??Er?????u????b?xu??zZ? (?]"r {?)-y[]zH ?? e}?????b?G/\jW??r:??????ZF?EE6^=Y?????r?1F+]? C?p????D?I?j??H?Q??????K ??K?[7 ?~?I[@P?3??W??i?8,?d?$?r?6?LM???????e8-?7)KZ???Y Y?H.MEoI????1=???esd?D`?5HD??????,??LhzjG???????)?q??? c?%R?S??A???h $M,G ????&mM7P???.5?C? K?????2Z??y?hu?&YDm?:?P??%????/5b????V?6?(O??M?OH?i???4??/??X6???? o??H??o?????? n~$M?n??)+??K??zA????[??U??< ???????l?, .:pZ?d???0????[????????l?;A??9M?l&r?c?[????{?????{????ik??40????i?o????5?~.??8F\!v??????:-5?U????+???=?K30???E'/:&??J"???2p???R? tG-??vi??q?????T??????A!??~??_Q?,?.O????_E??.5J3+c??+?F?????+\ ??n???R:?N?G???????%?R???c?A? ????????ZK?????L/]???:?K3[????X/8J??VD0??M?9M(??'!???Y???????????T???????)???I[???v?Z? ???? ??*???)??A??AZe?????????[2R??Y????" ?>(?ZcV???G?2V??_DL=???ih??rv2?%???a$?:v?lA???:?Z ??e?3??????D??? J.?tlE?]]O?C???i?c?????X?T???????? J?h?g?]?l3?p???:Y!HH??uj&Vfy??%B?v'?!?????w|?n??? &J??G??^? v?Z?j??2r+??? ?*bH-?qB???*???pkb???qC?eubsL2???@?D^?e?????[v x?????6G?S*????,???3????||?.? ?`b?????<8??'_????????+F?I>?w?d?~,Y??/??x^b??U>???????e??Q????5?????????????G?;?II/?z???r\h??M :?XA??*I?Xp?????3Wa ?????v~O;?@{?p???????y???Px?9j ?1???|u{??G?1???0??j? ???i?5???M?F2?~??\?L?L?"&?/??Z????TEo?Cj?*1TJ]???;~?.C?+???Kt?Z ??>?UV???O??????u??Xm?>Y????#??????????#?y?l0?/? WP???E??^?T?2XF?? ??? I??e ?}??? ???????$??}?+?A?*6E'E???VL6?K?H??(??NY?&?w??"5vs?)L?M?????z?;$????}???4?b??/p?&L>??3???+\p&?p??s??E2+t?????G:?Yxqfj?Yf?8?q?q?E??Wzm?? ??>?K"'J?w??D ?TM; ?c??1w??"???KZw;????(????3T?YJ?I+;??%i????mI????<8????<?]?>[?0??v??^?]??<0??s? )c????;??~:??I?????!?h?~)bq#???z\ ???{&??nb?m=@M?????, Vf??;G??b???????????9???p???p H[????y?c?/3B@}J??~?_I??r??p??Cz??? ????Ixy??:H- ?Pj?????7????Mk?(?1???0-N????#?,?x[?dA)?? a????c?$????Xd??s?KZ?@?D??8,7???l" ???Y]??/:???{?????b?k?@V$` <???f??e??n?N?E?`J????aI3?2DD??3??a?,?I?????#?G?: TJ?}K?"???/????U(5?{w?jR?H??@??????4??Hq0????RJ?J?c???`t1???||.h??9c????!{??{??"S??2*|?????c??if?q7?Am?F?R?1_???Z???cu??F?/=3??????_r,4??n?Jq?t??Z??G??<oB?>}?U?@??d\Wu\_??????f????Z??g?)?a??C^????E?????B?~jq?d#??Q????cm?Y\dX??S]X??(T????eN?zRD???????~????9^@?y?'????q??????')?i???.L(\I???Hi????>] >????Q5????????????H???Q?g3? H+?XK$S???i?q??`xC&A?0CX?q?~?fK????R?l?YX???)-?<-???;???N???$???pzY?%X?? ?D`d??#L=$%am`?W?Z???MJ1??{??#:?J8??Pa??L?/u?$@?+]??r|l?S??f???$?t@??l???E?!??e?? >?P?wcO???? ?v`???????%??yM?. ???"T?K?? ????????'l?BA??????W?4}x? (=?????S??Qa?N?????Z???? ??????????U???nM????? S?? ?\h??!??4s)D(?ho????pz?qU??3??-[z4)?????/ m?,???+??unNg????? ]???2\?}&?????}?_?G??&?????:?P??~E_W?.????UC[Xv,u?c ?-?_;E??q??t {?h3~??LAr?;?OG???x%??z???M??M????? L??bH0 ?=kQ??????T????|???[?5?%?????B7 ??74U??ud?? _?,^??H???Z???e?J-v9???Z?o??????t at 7?????? D????\K???5?x????6???>?? ?2o%@???jA?????8? ?L,??0E?^!(???(*?JZ???e1^Xi?7??@??z?}6??2P????k?Cj?,?eH??)A?c?z??+??8M????}y??e ??H ??*S????B?q?4??Rhz??C???m?>/??.N3??m{?=_??5?C??-?Q?????e?yS??"c???m?P~?3 ?? ;??;r??o??Q?d?}?!oR??????m?????b2QB??n2?????u ??x]???.? <>?{?G???J-???hPH;?%???????>^?????6????"z??0??Tm?nH I&XMp?u??1f ???%u;???5?????y??4??`???DTFQ1? ?t?6?+?h???5??Hv??? ?IH??p?p? 9?????Q??v?t?Z`\/c??B.fLr$-???????R-?+[a?(?ts#???.+r8?E???A?{??o??[y?'6'>W!fP??_'???2?;?Vq?4d m~??$???%? ??????0?? ?)5A??w????y?2?l#?pq?%ms??g????0#n?? [???:,??eS@e?CP&u????l?pe??7&?y?n)??V?? ???g ???????W"? O?ueK????c??D?E(aR??G?.?b????{-5U???tk??T?8?( (? ?r*???z%g????? ?????????#??OgP?#qt?\w ???????bB?g?s?9g??<-???1?71??????2??WE??G2?O?Z??e"?#rt ?_? 5???BC*[???l[6?%???$/?5??u?+Qyn?T0???????Q?[????U???UZ??_5??^???~?J?????]?$` ?????]?rG?B2?????5=??q?????1=hP%??3?%R}??Y?'?e?#]c ?}??;%L?0?'?????:?%??dj?X???eB??L8"??d?x;:?Dd=??????G?JF!??;`??l~???n??^???????! Q???dmE???l?HO???)?J??b# ?c u?@????????{?n?a??+?%52l????7???????????%~N?d?]P ???J*?S>? X??>?-eY1]?????j?xN.M??6?)??eZ ]m??[z%%???U????U???0??????!?~p'#?t?\R???6W?????J?N?5??g +???~dS%??Z?j-#*?#?5??6???o}???!*@????????Q?D?????$+Mf???i???b???"??.u??m??P??Yx???????b?_U???U]??_???1??}?C???H?Ys?8w5?H??XE?????_?p? #?su?3??h??]???? 7~iE at M???????R\???????;?7AH?s??:/???(~??Ey ???>? ?T??7^7?? ??????D?40?N????lt?m???????D\?b at l??@?%[???L???h??7????(if ??v????D?6?S|?{?h?V ""???MJ?@?????D?k?? ???v???:? P?K?G7??? ???*???*????$e? z>?????/??[?!|e?E?U"O?7?h??V?e?l"???P?[?_?~??=lk/??F????>Y?< ??}&r?9??9????j??_??C?E???G? ???? ?? ???g?? ??u??????We???>O0?????_?u????qJ?{?=?????????R^?b^??????E?ls??? ?%'2w??????1?k?%??~??`??????????((?????)??? ???p??p?R?Iz??L??0?B/??Iij??N??????dD??p??+?b???G=?N{???????fVV T?????0 ??e ????c????I}?w`???^??Fa??i?C:???=R?p??.???M?D*?=)R????tSe???> Y "?p9???/(b?;??|?T??X:?T7?Bv?|?M??[?i? P??K?M?S&4>?C?"[??-?2.?lWR%???,I??^??????????z Ne??q?? ???????Z?9???E"?g9oPU???mo3?A?&EfBG{"??????B?U?!??T8? ?s?:.?N?W%? ??U|[??/?o*o?*??~??%??? ;?O?T?@???(??Ne??C????vT?\U????????^?\??????6f?PV??z??3?9????%????f?w;Z?1t?,? ?h?Crt'?6????u-f?? jU???? ?v]fh??>??rh??3c?~??????`f?e??`? .? ?E??????of?]+,??-Y?'???*qF??$??????H??pM ???S?????p??????6`???e????+|Xp?=?????[bt?Q?;?R~???r-??*???l?J?c?`??? ?=YW?r?Y?^???h?:??81??z???????v???Y*U????5*,??^-?k ???*?????4?? ??`L??????/??] ????????????G???????????W~#?????4?E??\)????"f???????-A?K?`P?n?????O!???L?*??.?n?? ?@X` e?C???C??/ge??D?/L??:?????? ^|>z7??r?!??3??i?6B?DAG????2>q{??O.?q~??b'#??/???? ?&? ????7k???? ?? 85?????w??j?f???Yb??N R?????l ?f2q!?<,?v:???????? ??z?}Mm??I?c]??I????iI??l?}??g?? ?.[??nu?4Q??-?qM???qqi? "?m` ?????#????y?Zu?|k?%?r??b:?? ???^7??Z2???~?a6f:2??2K?Q|???}M????m?5p??? 6?O??? ? ?x??b2)???X? >??-?ow?w?W:?fA;?E4?Zi??Kz?W??0xi?$7?w?[??k???????rO??a?8??\??$?!??;???3??X@??N?w??????i?g?q{??t+???S`???W?????_?8`? ????? W?g?C????????\? +???????????#?c????????E?(?????z?(4(?+*0s?]?? ????3???A?? ??B???>???????? ??????+(@/@?I????Q?? ?~r? ??o?g??Y??v|?,?B?`B??D?f???_1????Y??R #?D??\?}??Xl%???????C??N[V????????;0????vEn????????z????????????D?????n'D?s????;?~?&?W?uf at I???? HB?+r9C?S6 o&??0o???Hk?\1?7??s?????"+U??????f?..?WS ?86???^?$??x?uz?)????\ej?%??0S at r??D?k??N??Mwj??P|???h???U?r0Tx? ?k:?\A?"?o??$??? &?N??????-?B4?V???????`??N?'$ ?????4?{n?? ???[}o? !?#T????0ZB???N? '?j?5????Ei=(?$????p?+f;??hW??Z?[??? `:?`?-?`t?????P?????t? ??6???7?????@??uo???AP?? Z&? X;(???z>?%?O???= ?????:??"???Wtd????@4E???5??I??E?q?Lx?5:?N?iE??~q?|N??? )?.?????]?9$????d?p?+?+?u?.?o?Hsr-)(?P?????|/??i??? ????????S4Rc??"??_JU11???????_M?o??Oc?qxrI?|?)f??s???n??????[??9r?q???F??@<@????E????h@?~?d??N?v>?|?$?)????nI??8(?? $X??-??W ???*??WG? $y????[[c?*????9??P?x??7"?w?pz/???q??7??:?b:??h`>?????o??????G?? ?Z}P8/????|???pLr??~g*??5?;??b??{?9K????x=0?????M&?oxx??????]?7q??EDWc?y??] ?h?(4?7%???.c?N?_5Mw?)?7?A??&[b8????HN at k?u?F?:??a?\???.??????FF?k?K>??,?v?????7!????????+ ?]???S?B.%DU??gM2Y ?O ???q???@Z? ?_??????Ej??HC?ic?????u ?iNn?q??q"l??L?  U??YPi?6??"????????O?wg?m*???????lWXn?? QH`rzj?x???X?????+?,V?'???12??i$?O?wvh??D C??w???(4U??? |???S??P]? ??7??:I ?$?>???:?? y/f%??2??:?x?Z_@??H?wGoyb+6 ?????i?3t???'?hw?b??{?%?d ?a?"???W???? ?aQ?y)????o?Y\,?9s6?33?h?$N????2??Ew?3??fE???)??????1^??.*?~??k.?????o???L????k?????j\??UF?ZL?B?* %p??????= ??&??U?`?3k_?L??N??kiR?t|*M/??H?sX?4z?- ?)? .3?aQ?i???$?1?+ T????;?v[3???A?Q`?W??"?dO?]?d"??V????]?g??t??!T? ? ?????C?w>_9? ??{r???? ???q?5?Fk|z*j+?b\.??I;???+h/?Z???1b??\o?.<0 ??V /???R??N??? &"??W)4???v}wXy? ?C?j???qI????~???????*?\?~?|?????? ???q???,2??????z4?????&???????|0["?`????f"?:?)]??z??????=???????] r??_Df???6x'????6??S????v??&???V6;/pk???>???? ??d?????B???p.?D+H??6?zj;?3?? W??D}??y??=p_sp.?????????J???A? r???s??5?)????j_g??L?? U?d3??.~?????Q?L?????$0?E????h_E8e???Y}??EHm?F?:?'???D??? ?k?m ???,?,2 ??F???8???*?[??af????? ?A???? ???e?a\ ?\at=e????HO*x\?$???) ??A???Qf?t?z<0???yaw??J3??m??L??????bp?E ?w ???ri??uY???$?p??$???? ??Yg3?`?(?? e?.!?Q33?[?????2rI?Ud?f????x???????i(lk?m ??{0X?????W}??fklm??xr!;>G*? ?D ?r??n91?K??|0X?0??h?0j @???4??6???0j??Z?n.??-a???????={?x?1{? ??v??jW >??;? ??????vE ?-?o???|?"0??x;=lt ?v~`. ,R'iY??,h0??9?o?{a4,?LD?*?/^???|n4?LD?{?~H0q??dj&?\?d?x|???????????r6GV?~?W?O??d?P??>w|'???-sU`?M ??? ????;{?L??j? ?QG@|?TH?P??d?? ????'?W)h?_????>,1??+?????s?:H??M?bIDk??????/???F58?? e?????????NI?B ???u?(Y??i? #Zz??/????w?a??zG?uF1 ?w?$~??FA{????r??????7S??#?D??v/??6]}?$?Z???w`?z}?rb?s,??%:??m?rr??C??Y+D$???x????? G??k;? X/f??-????????{$ X?t???? ?"?m???8?c?W;???a??\`f4Q?$8s;??_p??F??{R!???/??C???aI? ?????ek?u??[p?????????2q? ??????O?\tLWN???ug?_? i??rE2?c?5e? ????:m???.????l???????F????q7??5?iG?^?UXn????p??|1t?`???sp?e????I???:$+?V:?(???z????t?H?????g???I?/E:??h???^?N? ? ?T?????5m";ud??Z?(|?I:&*???)?{:??g?h7?C?!q?$?m??????o??=??????H??#6?oxd??6???? ???C?????2 =N?????j????J??$???Fnp?U|D?YU???J=?nhP???U?? ???g??!? ??e? ??????9 ?"g?{???(M99n{?Pf????????XD&?;?^ ????zP?????0??>?????ff??]?L_k?`dX??F????K?bc@!p??[?A#9?&?? I????>?/??af^???%U??ql1?'H?'Z9!???m?r?y????????????\??In?4w?p?'?/?,V#?????+e?????j???????*[???? ???NA)??;*????$??k`?;??p??~?cE ???h?CYr*@.?f??%lR???e???~??&?;o?,%???{ ?????=[e?%? ????QTSA?O.?PN2????|yE????Y ?r?~c?Io???e?m?3*????????q?N??0M??dV?oHNf?G???XA?}??~~?]W42????0??ON? ?C?3PmFp?Y???????j?a?f??w|?MY?$O??v$(Bz?????A??{?{?16n?%E??3?0?? k???F ?3"?????x??t?????G??)?I(???????i??? wO=55??G???O6?QO ???;M??.??kD?o1????]!??????/:???G8?Ap1??????'??FI?BTL['sz?%'~?0??gK8})?E?s???pvO?+O??a???b0Q9?Wr ?g2?????B??G?*D|$<?T ??l??w.2jf????E?J??#?????ks];?N??o4?X0????A???v?%? ??-V?????M|?B?ew& rb?h??a??+?X{[????.\???9??-Q)????????%Gl5 v? S?*r?=?:Whw????E??>???k?i?z<%?VN'&????4??M[?N>???3M??n5 8roP?A?V?NLC?!???NM?? ????L??E_?7??????Hz:U????B????B?~?M??`?Fq-DG????j?kz????N? ??l???|??}&?Ey?????'?j0=%??F???f/Y?O|????? [zAg'jC?CIK?Ws???h;d?v??? y?G?"_?`:??E ???,????????9?&??Qn??%??DY rD)f?3 ????????m??@?????301Cu=Rr??g?????%? -???? ?o9??4?h???m ? zI?? ??H?gSD??????/??5?M??????????H?k?????qm??* ??;????Cz????(Bd???"}?$???j?gTRhz?&#?=?????>??_????DT??M?u2???=???7s??TK+>e??z????)???TPG?Bjf????????????w??R????? ?i?_?\7?Z?0??s? ?J?3HC?g5;0 ???8???Hn?OV?'y0k =?`j?????4???$]S?????"?W?B|???n<4?YVI?j[??o???>#?H??oQr?. o?Do???????M?t@????uBI?z?X??s>?-???????BBg????=??Z??\??R?,`\?A?? R)/^???????g??G????????/?S%???Y????V???3????Y??\?M?/:??(???~???/=g^?f?????K~cR?rW?y{8??????????b9?,9?:.uy4?e???????_? y9?Rq'??X???(y???????/0 at jr???EQLA}??=??RT??\?8t?}?t??3qt?(: <*F^#7%?? E?1^????-?? /???B ?? ????=????F?N? '??>???J????? R?????"SG??x???^?????????~|e.???[??j?c?R ?=?d[\???y1?t??+?]????z???)??_?c?u]?A?U??????:q?=?Rc?O? I$???p?$??:??NnET?$?@???^??"y?ai?_??qet???D>?/j?Y?:c???E?~????v???j|p)????"??6??/?HL?????2??? ??}z!??J?>??5_ 5? ?????????sL??E?`N?}O J????1/;????1???V???]? ?o??O?&????????l?'z??[(?vO??u/?]&?3i#???) v??f8?L???? ?0??+??5(????\8?6 V??-%?x????bmQ?I?? ?>E?9h?????*O????????-Vgjh?J???$?< @???????????? e\?PC???k?k1?"9u? f???m?\x? ??soV??x?D? H?_^BH???Z??*???ki????XvJ^xs?1??SM???2??dm??r:>cY??nJ????>?s???FBp????????sq??,???????BF?r??E}\??+E?I?M-?????* Y????L???? aM????k}W\?`[/Q?i.~?,????K?`???A??L=?X?????tQ?E???l?z?????nXD_???V!?Ma?&[??K0C??????6?Js?a??3?Q+?>KkV?F?Z?(?#????8???C6j(??1??8??V>?????G?????6???[?6?\W%8??6}???a??[?;??1??????ng<?fdy?~??dZ??o??? ? ??G?f??|??.? ????\?E3???zQh??'N??????>|;???yQ?|??63 ??b???VD]j??? ?M????O?Q?z?z???????R4j?N???NP ?????!Et~`}?*x?3??/??{?8S^??C??&T?C?v???V??e??q[?)?/??????,?r4????-z+??%y????^]??i?V???"?F9?m??6CZNCH3??k1?3??t8?? ?????"mx???d????#????#?L]??hG??F???@??J"??8(I"z??O???e????YY?]?o?KI??!o?+??j ?? Cr???RK?-z?b$?????x%????7h.?Z???????=????b[?b??)???P?????vU3??FK??c?u?s?Y?W?h??W???? ?|R at LJk Y;/??%????+?c??E?(??????$???e?&??p?????\\??????M4?Wft???????dH??????HG.%[?y?]??Ey???e??Z???kH?^Q/3??U?c??^s"v]??H??_x!?L'3???k??N?2????Z>_ ??IHF~??????2??2???"??c?? ??????M?Q ??????F?b^?[ ????w???ds??y?????g??GW??0x X?|?3/??vA~`Z?]?$??.?????3:c? b??@?=??:????Y?G?k$?f? AQ/N??|?:??????J?5oY???J???+k??Jr???.G???aw?3t? mz}8???`RM??M????2?;??u`I ????Wd?(??:c@???i??h`???t?P?V?XtnY?O? ?ptU????4??#??? ?ZH?iX???n????? &??g?y?`>?S???????/?>????A???F~?? ^d?bAhR??>P???[??????1?IB?? D??q*?5y o?j:Y@f??B?a?z?C??o??"???s??wz-?? ?b?v??cWS&^??? ??$??????W8????n???)??r at L1x?????`??e?E????1/???'???|??4???d&???I??U:4???M??~r?f?/???????6?Z?pPQ??j??????bRl?;?G???+T?HR???'[ &x{Y????(t??bgq????Bl???rv???m-?????e?vQ??5?"_??n9?B?\t?????'=a<2??????? ?/?D?0M?7?C1?/g?6??y???? s3??tt??q??(????ZcX:?O?d??=+) {g,;C??YY"?:^????V???=Mz?I?* a??????E)??G?<??+?C??p???-?6???lFE?????!,(?C?,R?0???oWL"3??c?#???K????6???????????;$A9?N?G?:?Ho~3???Yi????&???-????i???Ip??k??????G??'i?@?+?t?.~???????8???? ?`^%Z) ???2????u?H?|a?-wIzLr????Q ?? ?w??Zy??:???F~Sae?3K????????j??qe?le2?'???L? ?y?z?|??hZ??7\?"5?????{??D??"|?r?????a?>~[???Z????y L????e*7?IL?>??O ??h???u??B??OI?? ?Vj???C?????i??I?L?,???? }F??SODE??N?=.?'??6?//EsP.??2????8i????RlhK?=J??0x?? ?????[?????'?S6L( W???(Ix,hXM ??~#Iw|?????????a}??V????????;?ob?????UZ??????q??a?AH b?q????????????%??Uh?k"????????%?J?^r z?_$????q ???oZ?w__n??{?pJ??? ?^?*??^???yjf??c?+??co?KY??7??D???~?B???[???SH??X6)??5???%?}>??Nf3??"??V? !??o???YM? ??LN?o?w???V%?I?z???u?^cV?\? ??B?o?M.?#e?"g? ??)k"v?:???????r? ??Q?????????p)?o???0?????z????[w?~y??Z-??s?j???O?C=B?x ??????Y?0?a7?X???|z?? L ??Ye^??????qp ?:???+???????g]?j??U??x:??q??Vb3$?o?j6>E???? ]Gp??????(8?????W?n???l?hv???2?Wm???vcE?]??\E?ok??????*[NE`?MF ????:?+.?? ???)[m`???.???7??b>}Pu??"??????2?????,???G?????Hz????F??@XV?fJ?_??E??/K6Y?A???????D?}b?g???WO?????m{???a?D4E?C? ???g???wYJ??T?0(?f?x??QYAi?$A???MW?? WvU?1????? ???.?o?~?+?x???,?J??}???? qZ?4' ???)A ?F??ha?7?????n?(?'??5^$???W[??H?)P.??}/???6????ljc??????"???h ?@*????????MWx o?)T????S??t??;??o+?6?}F????&??`hS? ???GFQX???#hb??_?????]??K??r/?%??yX?G:f?mjT0?fB?? *?O?????WuZnlzV?gx???????K??'?? Y?T?2 d???|cj?x sQ??8M1?^>????3???????#?'?!???J3?????F'?f??r?? ?:???~?? ?R??5???n???&?^?^0?TZ~?%?f??2B????]???g? ?Yh??????p6?^~???W?KZEf??;???????? `????IG5?{>??$$P/???{?IUA3pg?e^m??n~?vn?q???r???+??s???pc????bI?Nx?g7????????2???2,>?+gF ?E? ????K? ?Q?L?e?3?Z n????"?f?eB2?8?2???} _|????#???yy??S??:T????G?T??D f??m??? qu?CT[?%?T?1? ?O?????0?U???p???5o?6??]^-? ??/?#?t{PL ?)g??&?w?D???????\;??k????M???i?nd??N??y?$oT\?8???qo??h1;R????6"?E:???bZ????? ?????u????.X9?:]?n??FZvS??h s????Y0T?? ?????3r??K?8?g??0??i?????a?@???J2?$??????O?,?U{x?Y???m?????R?N??p?|"N?;q?i,??y?]L?RMh???????}???ZxO?;`???#)\'L)?????l,???-?? e?>??"??h l?D???8?Se?5??q|MT?????9???K??o????a?&?M?a?J??}???K??a?R >p??.i8"&P?h]?.s????????6?X?RA?l/??ScV^???v???Q??|W? ????'?UhU j????i X?4(?????????V???:/}eVk?EUG B???r??H ?4???g?f??eY`???'???????2?o??9???K???\?l?Q7_??Bi?w?1 ?F? )s]??D? ???\T??kp??r ????P??lyHR^g#?98? ?????0"r[???-???y?@Z??P???U~c???,1?F???3n??????N/8?S??G+??D?????*?????BN????A??3???#? ??$??????5????W14LZM?t??????N???oQ?e?9??|j?L6?/1?i?ef1????<?b?.&lT!g?5????\?{?Z?? ?????? lu)<*l???Z?w ? M????u~~?t:???bV ?}???r???aN??-??FP?:?j??\??|????????WP??,J?g?l?????TC??? ?"????Ld???$ ???O??????o???V??B u)dVh? ?%??z??2-?_??b??W?^??f* [IV?0??????A?+??????1??Z%6:??%??.#????|?Z?%??k?C e???S?\?%yE?t?R|???? ?0(R24L??Q??X?T???dz??G?T?????? Z?M???X???D;? s?????'?~?L??M??YMPK??s?L??n?X???K??????@????????]By?3???t?&F???g?k??6q????isC?\????^_?-???s?1??PK --- NEW FILE import.log --- mythes-sv-0_20090225-1_fc10:HEAD:mythes-sv-0.20090225-1.fc10.src.rpm:1236329881 --- NEW FILE mythes-sv.spec --- Name: mythes-sv Summary: Swedish thesaurus %define upstreamid 20090225 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://extensions.services.openoffice.org/files/934/2/SwedishThesaurus.oxt Group: Applications/Text URL: http://extensions.services.openoffice.org/project/SweThes BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: MIT BuildArch: noarch %description Swedish thesaurus. %prep %setup -q -c %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mythes cp -p dictionaries/th_sv_SE.dat $RPM_BUILD_ROOT/%{_datadir}/mythes/th_sv_SE_v2.dat cp -p dictionaries/th_sv_SE.idx $RPM_BUILD_ROOT/%{_datadir}/mythes/th_sv_SE_v2.idx pushd $RPM_BUILD_ROOT/%{_datadir}/mythes/ sv_SE_aliases="sv_FI" for lang in $sv_SE_aliases; do ln -s th_sv_SE_v2.dat "th_"$lang"_v2.dat" ln -s th_sv_SE_v2.idx "th_"$lang"_v2.idx" done popd %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Info-en.txt %dir %{_datadir}/mythes %{_datadir}/mythes/* %changelog * Thu Mar 05 2009 Caolan McNamara - 0.20090225-1 - initial version From caolanm at fedoraproject.org Fri Mar 6 09:09:01 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Fri, 6 Mar 2009 09:09:01 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1849,1.1850 Message-ID: <20090306090901.2399570116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32233 Modified Files: openoffice.org.spec Log Message: add mythes-sv dependency for Swedish langpack Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1849 retrieving revision 1.1850 diff -u -r1.1849 -r1.1850 --- openoffice.org.spec 5 Mar 2009 14:33:19 -0000 1.1849 +++ openoffice.org.spec 6 Mar 2009 09:08:30 -0000 1.1850 @@ -1124,7 +1124,7 @@ Summary: Swedish language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-sv, hyphen-sv, autocorr-sv +Requires: hunspell-sv, hyphen-sv, mythes-sv, autocorr-sv Obsoletes: openoffice.org-i18n < 1.9.0 Obsoletes: openoffice.org2-langpack-sv < 1:3.0.0 @@ -1721,6 +1721,10 @@ localize -m -x -l ml-IN -f ml-IN_DEV300_m40.sdf cd ../.. +pushd solver/%{OFFICEUPD}/unxlng*/bin +ln -s /usr/share/java/commons-logging-1.0.4.jar commons-logging-1.1.1.jar +popd + #build OOo, on failure make a stab at debugging the crash if any, and #rebuild un-parallel cd instsetoo_native/util @@ -4118,13 +4122,14 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog -* Thu Mar 05 2009 Caol??n McNamara - 1:3.1.0-4.1 +* Fri Mar 06 2009 Caol??n McNamara - 1:3.1.0-4.1 - report-builder will be broken until rhbz#474391 is resolved - drop integrated workspace.gfbcrash.patch - drop integrated workspace.ooo31gsl2.patch - drop integrated openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch - Resolves: rhbz#488688 / ooo#98746 merge Punjabi Translations - Resolves: rhbz#488700 / ooo#99907 merge Malayalam Translations +- add mythes-sv dependency for Swedish langpack * Tue Mar 03 2009 Caol??n McNamara - 1:3.1.0-3.4 - Resolves: rhbz#488228 Assamese Translations From erikos at fedoraproject.org Fri Mar 6 09:19:13 2009 From: erikos at fedoraproject.org (Simon Schampijer) Date: Fri, 6 Mar 2009 09:19:13 +0000 (UTC) Subject: rpms/sugar-read/devel sugar-read.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306091913.5919C70116@cvs1.fedora.phx.redhat.com> Author: erikos Update of /cvs/pkgs/rpms/sugar-read/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1861 Modified Files: .cvsignore sources Added Files: sugar-read.spec Log Message: * Fri Mar 06 2009 Simon Schampijer - 65-2 - make dependency only on gnome-python2-evince to not drag in all gnome-python --- NEW FILE sugar-read.spec --- Name: sugar-read Version: 65 Release: 2%{?dist} Summary: A document reader for Sugar Group: Sugar/Activities License: GPLv2+ URL: http://wiki.laptop.org/go/Read Source0: http://download.sugarlabs.org/sources/sucrose/fructose/Read/Read-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python BuildRequires: sugar-toolkit Requires: gnome-python2-evince BuildArch: noarch %description The Read activity allows the laptop to act as a book reader. It has a simple interface, and will view many kinds of text and image-based book- like materials. It will have particular strengths in handheld mode, with extremely low power consumption and simple navigation controls. Read can read PDF files, single-page TIFF files, and also read DJVU files. %prep %setup -q -n Read-%{version} %build python ./setup.py build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{sugaractivitydir} ./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix} %find_lang org.laptop.sugar.ReadActivity %clean rm -rf $RPM_BUILD_ROOT %files -f org.laptop.sugar.ReadActivity.lang %defattr(-,root,root,-) %doc COPYING AUTHORS %{sugaractivitydir}/Read.activity/ %changelog * Fri Mar 06 2009 Simon Schampijer - 65-2 - make dependency only on gnome-python2-evince to not drag in all gnome-python * Wed Mar 04 2009 Simon Schampijer - 65-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-read/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:47:20 -0000 1.1 +++ .cvsignore 6 Mar 2009 09:18:42 -0000 1.2 @@ -0,0 +1 @@ +Read-65.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-read/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:47:20 -0000 1.1 +++ sources 6 Mar 2009 09:18:42 -0000 1.2 @@ -0,0 +1 @@ +3a7c7cc764e139691a7f57c16cd6433c Read-65.tar.bz2 From kraxel at fedoraproject.org Fri Mar 6 09:22:57 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Fri, 6 Mar 2009 09:22:57 +0000 (UTC) Subject: rpms/xen/devel xen.modules,1.1,1.2 xen.spec,1.232,1.233 Message-ID: <20090306092257.6F80D70116@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2845 Modified Files: xen.modules xen.spec Log Message: misc fixes Index: xen.modules =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.modules,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen.modules 12 Jun 2007 13:50:13 -0000 1.1 +++ xen.modules 6 Mar 2009 09:22:26 -0000 1.2 @@ -1,9 +1,11 @@ #!/bin/sh -test -f /proc/xen/capabilities || exit 0 -grep -q "control_d" /proc/xen/capabilities || exit 0 +test -d /proc/xen || exit 0 +test -f /proc/xen/capabilities || mount -t xenfs xen /proc/xen +test -f /proc/xen/capabilities || exit 0 +grep -q "control_d" /proc/xen/capabilities || exit 0 -for m in blkbk netbk blktap xenblktap +for module in evtchn blkbk netbk do - modprobe $m >/dev/null 2>&1 + modprobe $m >/dev/null 2>&1 done Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.232 retrieving revision 1.233 diff -u -r1.232 -r1.233 --- xen.spec 2 Mar 2009 10:51:58 -0000 1.232 +++ xen.spec 6 Mar 2009 09:22:27 -0000 1.233 @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.3.1 -%define base_release 7 +%define base_release 8 # Hypervisor ABI %define hv_abi 3.3 @@ -113,7 +113,7 @@ # installs xen. Requires: kpartx Prereq: chkconfig -ExclusiveArch: i386 i586 i686 x86_64 ia64 +ExclusiveArch: %{ix86} x86_64 ia64 %description This package contains the XenD daemon and xm command line @@ -195,6 +195,7 @@ cp -v %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom %build +export XEN_VENDORVERSION="-%{release_tag}" %if %{hv_build} CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs xen %{__make} stubdom @@ -499,6 +500,11 @@ %{_libdir}/*.a %changelog +* Fri Mar 6 2009 Gerd Hoffmann - 3.3.1-8 +- fix xen.modules init script for pv_ops kernel. +- stick rpm release tag into XEN_VENDORVERSION. +- use %{ix86} macro in ExclusiveArch. + * Mon Mar 2 2009 Gerd Hoffmann - 3.3.1-7 - fix xenstored init script for pv_ops kernel. From sharkcz at fedoraproject.org Fri Mar 6 09:37:13 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Fri, 6 Mar 2009 09:37:13 +0000 (UTC) Subject: rpms/tryton/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tryton.spec, 1.3, 1.4 Message-ID: <20090306093713.9BB6370116@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/tryton/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5777 Modified Files: .cvsignore sources tryton.spec Log Message: * Fri Mar 6 2009 Dan Hor??k 1.0.3-1 - update to upstream version 1.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tryton/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Jan 2009 17:58:44 -0000 1.3 +++ .cvsignore 6 Mar 2009 09:36:43 -0000 1.4 @@ -1 +1 @@ -tryton-1.0.2.tar.gz +tryton-1.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tryton/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Jan 2009 17:58:44 -0000 1.3 +++ sources 6 Mar 2009 09:36:43 -0000 1.4 @@ -1 +1 @@ -4391876eb92b972d0594a48569c38cae tryton-1.0.2.tar.gz +f49cb5c961a9fffb957d09fbf1c4e74c tryton-1.0.3.tar.gz Index: tryton.spec =================================================================== RCS file: /cvs/pkgs/rpms/tryton/devel/tryton.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tryton.spec 25 Feb 2009 22:00:12 -0000 1.3 +++ tryton.spec 6 Mar 2009 09:36:43 -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: tryton -Version: 1.0.2 -Release: 2%{?dist} +Version: 1.0.3 +Release: 1%{?dist} Summary: Client for the Tryton application framework Group: Applications/Productivity @@ -56,6 +56,9 @@ %changelog +* Fri Mar 6 2009 Dan Hor??k 1.0.3-1 +- update to upstream version 1.0.3 + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From sharkcz at fedoraproject.org Fri Mar 6 09:44:32 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Fri, 6 Mar 2009 09:44:32 +0000 (UTC) Subject: rpms/tryton/F-10 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tryton.spec, 1.2, 1.3 Message-ID: <20090306094432.BB98670116@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/tryton/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7295 Modified Files: .cvsignore sources tryton.spec Log Message: * Fri Mar 6 2009 Dan Hor??k 1.0.3-1 - update to upstream version 1.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tryton/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Jan 2009 20:24:58 -0000 1.3 +++ .cvsignore 6 Mar 2009 09:44:02 -0000 1.4 @@ -1 +1 @@ -tryton-1.0.2.tar.gz +tryton-1.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tryton/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Jan 2009 20:24:58 -0000 1.3 +++ sources 6 Mar 2009 09:44:02 -0000 1.4 @@ -1 +1 @@ -4391876eb92b972d0594a48569c38cae tryton-1.0.2.tar.gz +f49cb5c961a9fffb957d09fbf1c4e74c tryton-1.0.3.tar.gz Index: tryton.spec =================================================================== RCS file: /cvs/pkgs/rpms/tryton/F-10/tryton.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tryton.spec 7 Jan 2009 20:24:58 -0000 1.2 +++ tryton.spec 6 Mar 2009 09:44:02 -0000 1.3 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: tryton -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Summary: Client for the Tryton application framework @@ -56,6 +56,9 @@ %changelog +* Fri Mar 6 2009 Dan Hor??k 1.0.3-1 +- update to upstream version 1.0.3 + * Wed Jan 7 2009 Dan Hor??k 1.0.2-1 - update to upstream version 1.0.2 From pknirsch at fedoraproject.org Fri Mar 6 09:45:30 2009 From: pknirsch at fedoraproject.org (Phil Knirsch) Date: Fri, 6 Mar 2009 09:45:30 +0000 (UTC) Subject: rpms/tuned/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tuned.spec, 1.1, 1.2 Message-ID: <20090306094530.1DBEA70116@cvs1.fedora.phx.redhat.com> Author: pknirsch Update of /cvs/pkgs/rpms/tuned/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7579 Modified Files: .cvsignore sources tuned.spec Log Message: - Dropped unecessary kernel-debuginfo requires from tuned-utils Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tuned/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Mar 2009 09:56:17 -0000 1.2 +++ .cvsignore 6 Mar 2009 09:44:59 -0000 1.3 @@ -1 +1 @@ -tuned-0.1.3.tar.bz2 +tuned-0.1.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tuned/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Mar 2009 09:56:17 -0000 1.2 +++ sources 6 Mar 2009 09:44:59 -0000 1.3 @@ -1 +1 @@ -d0ba7818725f5bef65582645aa429dd3 tuned-0.1.3.tar.bz2 +d323a2d126c6d2c0f71274aff38e7d59 tuned-0.1.4.tar.bz2 Index: tuned.spec =================================================================== RCS file: /cvs/pkgs/rpms/tuned/devel/tuned.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tuned.spec 3 Mar 2009 09:56:17 -0000 1.1 +++ tuned.spec 6 Mar 2009 09:44:59 -0000 1.2 @@ -1,6 +1,6 @@ Summary: A dynamic adaptive system tuning daemon Name: tuned -Version: 0.1.3 +Version: 0.1.4 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons @@ -28,7 +28,7 @@ %package utils Summary: Disk and net statistic monitoring systemtap scripts -Requires: systemtap kernel-debuginfo +Requires: systemtap Group: Applications/System %description utils @@ -82,6 +82,9 @@ %changelog +* Fri Mar 06 2009 Phil Knirsch - 0.1.4-1 +- Dropped unecessary kernel-debuginfo requires from tuned-utils + * Mon Mar 02 2009 Phil Knirsch - 0.1.3-1 - Fixed placement of doc entry at tuned-utils package From sharkcz at fedoraproject.org Fri Mar 6 09:47:20 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Fri, 6 Mar 2009 09:47:20 +0000 (UTC) Subject: rpms/tryton/F-9 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tryton.spec, 1.2, 1.3 Message-ID: <20090306094720.3D90970116@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/tryton/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8086 Modified Files: .cvsignore sources tryton.spec Log Message: * Fri Mar 6 2009 Dan Hor??k 1.0.3-1 - update to upstream version 1.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tryton/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Jan 2009 20:27:09 -0000 1.3 +++ .cvsignore 6 Mar 2009 09:46:49 -0000 1.4 @@ -1 +1 @@ -tryton-1.0.2.tar.gz +tryton-1.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tryton/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Jan 2009 20:27:09 -0000 1.3 +++ sources 6 Mar 2009 09:46:49 -0000 1.4 @@ -1 +1 @@ -4391876eb92b972d0594a48569c38cae tryton-1.0.2.tar.gz +f49cb5c961a9fffb957d09fbf1c4e74c tryton-1.0.3.tar.gz Index: tryton.spec =================================================================== RCS file: /cvs/pkgs/rpms/tryton/F-9/tryton.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tryton.spec 7 Jan 2009 20:27:09 -0000 1.2 +++ tryton.spec 6 Mar 2009 09:46:49 -0000 1.3 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: tryton -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Summary: Client for the Tryton application framework @@ -56,6 +56,9 @@ %changelog +* Fri Mar 6 2009 Dan Hor??k 1.0.3-1 +- update to upstream version 1.0.3 + * Wed Jan 7 2009 Dan Hor??k 1.0.2-1 - update to upstream version 1.0.2 From sharkcz at fedoraproject.org Fri Mar 6 09:49:37 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Fri, 6 Mar 2009 09:49:37 +0000 (UTC) Subject: rpms/tryton/EL-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tryton.spec, 1.2, 1.3 Message-ID: <20090306094937.44A4170116@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/tryton/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8650 Modified Files: .cvsignore sources tryton.spec Log Message: * Fri Mar 6 2009 Dan Hor??k 1.0.3-1 - update to upstream version 1.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tryton/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Jan 2009 20:29:32 -0000 1.3 +++ .cvsignore 6 Mar 2009 09:49:06 -0000 1.4 @@ -1 +1 @@ -tryton-1.0.2.tar.gz +tryton-1.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tryton/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Jan 2009 20:29:33 -0000 1.3 +++ sources 6 Mar 2009 09:49:06 -0000 1.4 @@ -1 +1 @@ -4391876eb92b972d0594a48569c38cae tryton-1.0.2.tar.gz +f49cb5c961a9fffb957d09fbf1c4e74c tryton-1.0.3.tar.gz Index: tryton.spec =================================================================== RCS file: /cvs/pkgs/rpms/tryton/EL-5/tryton.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tryton.spec 7 Jan 2009 20:29:33 -0000 1.2 +++ tryton.spec 6 Mar 2009 09:49:06 -0000 1.3 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: tryton -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Summary: Client for the Tryton application framework @@ -56,6 +56,9 @@ %changelog +* Fri Mar 6 2009 Dan Hor??k 1.0.3-1 +- update to upstream version 1.0.3 + * Wed Jan 7 2009 Dan Hor??k 1.0.2-1 - update to upstream version 1.0.2 From xhorak at fedoraproject.org Fri Mar 6 09:49:41 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 09:49:41 +0000 (UTC) Subject: rpms/epiphany/F-9 epiphany.spec,1.196,1.197 Message-ID: <20090306094941.BE3E770116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/epiphany/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8686 Modified Files: epiphany.spec Log Message: * Fri Mar 06 2009 Jan Horak - 2.22.2-8 - Rebuild against newer gecko Index: epiphany.spec =================================================================== RCS file: /cvs/pkgs/rpms/epiphany/F-9/epiphany.spec,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- epiphany.spec 4 Feb 2009 19:09:14 -0000 1.196 +++ epiphany.spec 6 Mar 2009 09:49:11 -0000 1.197 @@ -1,4 +1,4 @@ -%define gecko_ver 1.9.0.6 +%define gecko_ver 1.9.0.7 %define desktop_file_utils_version 0.9 %define glib2_devel_ver 2.15.2 %define gtk2_devel_ver 2.12.0 @@ -8,7 +8,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany Version: 2.22.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ and GFDL+ Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/ @@ -213,6 +213,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Fri Mar 06 2009 Jan Horak - 2.22.2-8 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 2.22.2-7 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 09:50:49 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 09:50:49 +0000 (UTC) Subject: rpms/blam/F-9 blam.spec,1.29,1.30 Message-ID: <20090306095049.184CE70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/blam/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9081 Modified Files: blam.spec Log Message: * Fri Mar 06 2009 Jan Horak - 1.8.5-6.1 - Rebuild against newer gecko Index: blam.spec =================================================================== RCS file: /cvs/pkgs/rpms/blam/F-9/blam.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- blam.spec 4 Feb 2009 19:10:11 -0000 1.29 +++ blam.spec 6 Mar 2009 09:50:18 -0000 1.30 @@ -1,11 +1,11 @@ ## XXX: Hopefully Mono, Blam and multilib will play nicely soon... %define _libdir %{_prefix}/lib %define dbus_sharp_min_version 0.60 -%define gecko_version 1.9.0.6 +%define gecko_version 1.9.0.7 Name: blam Version: 1.8.5 -Release: 5%{?dist}.1 +Release: 6%{?dist}.1 Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -135,6 +135,9 @@ %{_mandir}/man?/%{name}.1* %changelog +* Fri Mar 06 2009 Jan Horak - 1.8.5-6.1 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 1.8.5-5.1 - Rebuild against newer gecko @@ -152,7 +155,7 @@ * Mon Jul 21 2008 Alex Lancaster - 1.8.5-1 - Update to upstream (1.8.5), fixes FTBS (#434382) -- Set gecko version to new xulrunner: 1.9.0.6 +- Set gecko version to new xulrunner: 1.9.0.7 - BR: gecko-devel-unstable - Drop a number of patches which no longer apply - Add new icons to file list. From xhorak at fedoraproject.org Fri Mar 6 09:51:57 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 09:51:57 +0000 (UTC) Subject: rpms/cairo-dock/F-9 cairo-dock.spec,1.28,1.29 Message-ID: <20090306095157.7121870116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/cairo-dock/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9399 Modified Files: cairo-dock.spec Log Message: * Fri Mar 06 2009 Jan Horak - 1.6.3.1-1.4 - Rebuild against newer gecko Index: cairo-dock.spec =================================================================== RCS file: /cvs/pkgs/rpms/cairo-dock/F-9/cairo-dock.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- cairo-dock.spec 4 Feb 2009 19:11:09 -0000 1.28 +++ cairo-dock.spec 6 Mar 2009 09:51:27 -0000 1.29 @@ -38,7 +38,7 @@ Name: cairo-dock Version: %{mainver} -Release: %{fedora_rel}%{?dist}.3 +Release: %{fedora_rel}%{?dist}.4 Summary: Light eye-candy fully themable animated dock Group: User Interface/Desktops @@ -606,6 +606,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Fri Mar 06 2009 Jan Horak - 1.6.3.1-1.4 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 1.6.3.1-1.3 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 09:53:00 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 09:53:00 +0000 (UTC) Subject: rpms/chmsee/F-9 chmsee.spec,1.32,1.33 Message-ID: <20090306095300.4EA8B70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/chmsee/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9743 Modified Files: chmsee.spec Log Message: * Fri Mar 06 2009 Jan Horak - 1.0.1-9 - Rebuild against newer gecko Index: chmsee.spec =================================================================== RCS file: /cvs/pkgs/rpms/chmsee/F-9/chmsee.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- chmsee.spec 4 Feb 2009 19:12:06 -0000 1.32 +++ chmsee.spec 6 Mar 2009 09:52:30 -0000 1.33 @@ -1,6 +1,6 @@ Name: chmsee Version: 1.0.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary(zh_CN): CHM ??????????????????, ?????? Gtk2+ Summary: A Gtk+2 CHM document viewer Group: Applications/Publishing @@ -108,6 +108,9 @@ %{_datadir}/icons/hicolor/*/apps/chmsee.png %changelog +* Fri Mar 06 2009 Jan Horak - 1.0.1-9 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 1.0.1-8 - Rebuild against newer gecko From sharkcz at fedoraproject.org Fri Mar 6 09:53:31 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Fri, 6 Mar 2009 09:53:31 +0000 (UTC) Subject: rpms/trytond/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 trytond.spec, 1.4, 1.5 Message-ID: <20090306095331.2FDC570116@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/trytond/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9885 Modified Files: .cvsignore sources trytond.spec Log Message: * Fri Mar 6 2009 Dan Hor??k 1.0.3-1 - update to upstream version 1.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/trytond/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jan 2009 10:46:11 -0000 1.3 +++ .cvsignore 6 Mar 2009 09:53:00 -0000 1.4 @@ -1 +1 @@ -trytond-1.0.2.tar.gz +trytond-1.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/trytond/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jan 2009 10:46:11 -0000 1.3 +++ sources 6 Mar 2009 09:53:00 -0000 1.4 @@ -1 +1 @@ -e6eed9dbc90961d6ccefb3c70adc47eb trytond-1.0.2.tar.gz +1a66d8676c54d67b66eb7d4bff41b973 trytond-1.0.3.tar.gz Index: trytond.spec =================================================================== RCS file: /cvs/pkgs/rpms/trytond/devel/trytond.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- trytond.spec 25 Feb 2009 22:01:16 -0000 1.4 +++ trytond.spec 6 Mar 2009 09:53:00 -0000 1.5 @@ -3,8 +3,8 @@ %{!?_initddir: %define _initddir %{_initrddir}} Name: trytond -Version: 1.0.2 -Release: 3%{?dist} +Version: 1.0.3 +Release: 1%{?dist} Summary: Server for the Tryton application framework Group: System Environment/Daemons @@ -137,6 +137,9 @@ %changelog +* Fri Mar 6 2009 Dan Hor??k 1.0.3-1 +- update to upstream version 1.0.3 + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -159,4 +162,3 @@ * Fri Nov 28 2008 Dan Hor??k 1.0.0-1 - initial Fedora version - From xhorak at fedoraproject.org Fri Mar 6 09:54:03 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 09:54:03 +0000 (UTC) Subject: rpms/devhelp/F-9 devhelp.spec,1.95,1.96 Message-ID: <20090306095403.CA5E470116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/devhelp/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10091 Modified Files: devhelp.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.19.1-9 - Rebuild against newer gecko Index: devhelp.spec =================================================================== RCS file: /cvs/pkgs/rpms/devhelp/F-9/devhelp.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- devhelp.spec 4 Feb 2009 19:13:06 -0000 1.95 +++ devhelp.spec 6 Mar 2009 09:53:33 -0000 1.96 @@ -1,5 +1,5 @@ # Last updated for 0.17 -%define gecko_version 1.9.0.6 +%define gecko_version 1.9.0.7 %define gtk2_version 2.8.0 %define libwnck_version 2.10.0 @@ -7,7 +7,7 @@ Name: devhelp Version: 0.19.1 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Development/Tools Summary: API document browser @@ -137,6 +137,9 @@ %{_libdir}/pkgconfig/* %changelog +* Fri Mar 06 2009 Jan Horak - 0.19.1-9 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.19.1-8 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 09:55:11 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 09:55:11 +0000 (UTC) Subject: rpms/evolution-rss/F-9 evolution-rss.spec,1.21,1.22 Message-ID: <20090306095511.2078770116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/evolution-rss/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10461 Modified Files: evolution-rss.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.1.0-7 - Rebuild against newer gecko Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-9/evolution-rss.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- evolution-rss.spec 4 Feb 2009 19:14:04 -0000 1.21 +++ evolution-rss.spec 6 Mar 2009 09:54:40 -0000 1.22 @@ -1,7 +1,7 @@ Summary: Evolution RSS Reader Name: evolution-rss Version: 0.1.0 -Release: 6%{?dist} +Release: 7%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz @@ -89,6 +89,9 @@ %doc TODO %changelog +* Fri Mar 06 2009 Jan Horak - 0.1.0-7 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.1.0-6 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 09:56:13 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 09:56:13 +0000 (UTC) Subject: rpms/galeon/F-9 galeon.spec,1.58,1.59 Message-ID: <20090306095613.B537070116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/galeon/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10793 Modified Files: galeon.spec Log Message: * Fri Mar 06 2009 Jan Horak - 2.0.7-7 - Rebuild against newer gecko Index: galeon.spec =================================================================== RCS file: /cvs/pkgs/rpms/galeon/F-9/galeon.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- galeon.spec 15 Feb 2009 09:43:21 -0000 1.58 +++ galeon.spec 6 Mar 2009 09:55:43 -0000 1.59 @@ -3,7 +3,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.7 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -124,6 +124,9 @@ %changelog +* Fri Mar 06 2009 Jan Horak - 2.0.7-7 +- Rebuild against newer gecko + * Sun Feb 15 2009 Denis Leroy - 2.0.7-6 - Added upstream patch to use Gnome print support - Added patch to fix compiler warnings From pbrobinson at fedoraproject.org Fri Mar 6 09:56:27 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Fri, 6 Mar 2009 09:56:27 +0000 (UTC) Subject: rpms/opal/devel opal.spec,1.44,1.45 Message-ID: <20090306095627.97D2C70116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/opal/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10891 Modified Files: opal.spec Log Message: - Remove CELT until the bitstream is stable and can hence intercommunicate between versions Index: opal.spec =================================================================== RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- opal.spec 4 Mar 2009 23:37:04 -0000 1.44 +++ opal.spec 6 Mar 2009 09:55:57 -0000 1.45 @@ -1,7 +1,7 @@ Name: opal Summary: Open Phone Abstraction Library Version: 3.6.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.opalvoip.org/ Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.6/%{name}-%{version}.tar.bz2 License: MPLv1.0 @@ -11,7 +11,6 @@ BuildRequires: openssl-devel BuildRequires: libtheora-devel BuildRequires: speex-devel -BuildRequires: celt-devel BuildRequires: SDL-devel BuildRequires: expat-devel @@ -69,6 +68,9 @@ %{_libdir}/pkgconfig/opal.pc %changelog +* Fri Mar 6 2009 Peter Robinson - 3.6.0-2 +- Remove CELT until the bitstream is stable and can hence intercommunicate between versions + * Tue Mar 3 2009 Peter Robinson - 3.6.0-1 - New release for ekiga 3.1.2 beta From sharkcz at fedoraproject.org Fri Mar 6 09:56:43 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Fri, 6 Mar 2009 09:56:43 +0000 (UTC) Subject: rpms/trytond/F-10 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 trytond.spec, 1.2, 1.3 Message-ID: <20090306095643.489A370116@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/trytond/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10964 Modified Files: .cvsignore sources trytond.spec Log Message: * Fri Mar 6 2009 Dan Hor??k 1.0.3-1 - update to upstream version 1.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/trytond/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jan 2009 11:06:25 -0000 1.3 +++ .cvsignore 6 Mar 2009 09:56:13 -0000 1.4 @@ -1 +1 @@ -trytond-1.0.2.tar.gz +trytond-1.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/trytond/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jan 2009 11:06:25 -0000 1.3 +++ sources 6 Mar 2009 09:56:13 -0000 1.4 @@ -1 +1 @@ -e6eed9dbc90961d6ccefb3c70adc47eb trytond-1.0.2.tar.gz +1a66d8676c54d67b66eb7d4bff41b973 trytond-1.0.3.tar.gz Index: trytond.spec =================================================================== RCS file: /cvs/pkgs/rpms/trytond/F-10/trytond.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- trytond.spec 9 Jan 2009 11:06:25 -0000 1.2 +++ trytond.spec 6 Mar 2009 09:56:13 -0000 1.3 @@ -3,7 +3,7 @@ %{!?_initddir: %define _initddir %{_initrddir}} Name: trytond -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Summary: Server for the Tryton application framework @@ -55,6 +55,16 @@ OpenOffice.org support for Tryton Server. +%package webdav +Summary: WebDAV support for Tryton Server +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pywebdav + +%description webdav +WebDAV support for Tryton Server. + + %prep %setup -q @@ -122,8 +132,17 @@ %files openoffice %defattr(-,root,root,-) +%files webdav +%defattr(-,root,root,-) + %changelog +* Fri Mar 6 2009 Dan Hor??k 1.0.3-1 +- update to upstream version 1.0.3 + +* Wed Jan 21 2009 Dan Hor??k 1.0.2-2 +- add modular support for webdav + * Thu Jan 8 2009 Dan Hor??k 1.0.2-1 - modularize the openoffice.org support - update to upstream version 1.0.2 @@ -140,4 +159,3 @@ * Fri Nov 28 2008 Dan Hor??k 1.0.0-1 - initial Fedora version - From xhorak at fedoraproject.org Fri Mar 6 09:57:20 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 09:57:20 +0000 (UTC) Subject: rpms/gnome-python2-extras/F-9 gnome-python2-extras.spec,1.35,1.36 Message-ID: <20090306095720.5644370116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/gnome-python2-extras/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11172 Modified Files: gnome-python2-extras.spec Log Message: * Fri Mar 06 2009 Jan Horak - 2.19.1-24 - Rebuild against newer gecko Index: gnome-python2-extras.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-python2-extras/F-9/gnome-python2-extras.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- gnome-python2-extras.spec 4 Feb 2009 19:16:03 -0000 1.35 +++ gnome-python2-extras.spec 6 Mar 2009 09:56:49 -0000 1.36 @@ -14,7 +14,7 @@ Name: gnome-python2-extras Version: 2.19.1 -Release: 23%{?dist} +Release: 24%{?dist} License: GPL/LGPL Group: Development/Languages Summary: The sources for additional. PyGNOME Python extension modules. @@ -183,6 +183,9 @@ %{_libdir}/pkgconfig/pygda-3.0.pc %changelog +* Fri Mar 06 2009 Jan Horak - 2.19.1-24 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 2.19.1-23 - Rebuild against newer gecko @@ -202,7 +205,7 @@ - Rebuild against newer gecko * Fri Jul 18 2008 Paul W. Frields - 2.19.1-17.fc9 -- Rebuild against new xulrunner (1.9.0.6) and fix dependencies +- Rebuild against new xulrunner (1.9.0.7) and fix dependencies * Fri Jun 20 2008 Martin Stransky - 2.19.1-16.fc9 - Rebuild against new gecko-libs 1.9 (xulrunner) From caolanm at fedoraproject.org Fri Mar 6 09:57:30 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Fri, 6 Mar 2009 09:57:30 +0000 (UTC) Subject: rpms/openoffice.org/devel workspace.cl12.patch, NONE, 1.1 openoffice.org.spec, 1.1850, 1.1851 Message-ID: <20090306095730.4528E70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11234 Modified Files: openoffice.org.spec Added Files: workspace.cl12.patch Log Message: Resolves: rhbz#488835 backport workspace.cl12 workspace.cl12.patch: --- NEW FILE workspace.cl12.patch --- Index: sc/source/filter/xml/xmlannoi.cxx =================================================================== --- sc/source/filter/xml/xmlannoi.cxx (.../tags/OOO310_m3) (revision 268984) +++ sc/source/filter/xml/xmlannoi.cxx (.../cws/cl12) (revision 268984) @@ -216,8 +216,8 @@ pMyAnnotation->pRect = new Rectangle(aRect); } - if((pSdrObj->GetOutlinerParaObject())) - pMyAnnotation->pOPO = new OutlinerParaObject( *(pSdrObj->GetOutlinerParaObject()) ); + if( OutlinerParaObject* pOPO = pSdrObj->GetOutlinerParaObject() ) + pMyAnnotation->pOPO = new OutlinerParaObject( *pOPO ); xShapes->remove(xShape); } Index: sc/source/filter/xml/xmlcelli.cxx =================================================================== --- sc/source/filter/xml/xmlcelli.cxx (.../tags/OOO310_m3) (revision 268984) +++ sc/source/filter/xml/xmlcelli.cxx (.../cws/cl12) (revision 268984) @@ -644,7 +644,12 @@ if( SdrCaptionObj* pCaption = pNote->GetCaption() ) { if( pMyAnnotation->pOPO ) + { + // transfer outliner object to caption pCaption->SetOutlinerParaObject( pMyAnnotation->pOPO ); + // do not delete the object in ScMyImportAnnotation d'tor + pMyAnnotation->pOPO = 0; + } else pCaption->SetText( pMyAnnotation->sText ); // copy all items and reset shadow items Index: sc/source/core/data/postit.cxx =================================================================== --- sc/source/core/data/postit.cxx (.../tags/OOO310_m3) (revision 268984) +++ sc/source/core/data/postit.cxx (.../cws/cl12) (revision 268984) @@ -504,7 +504,7 @@ { // copy edit text object (object must be inserted into page already) if( OutlinerParaObject* pOPO = pCaption->GetOutlinerParaObject() ) - maNoteData.mpCaption->SetOutlinerParaObject( pOPO ); + maNoteData.mpCaption->SetOutlinerParaObject( new OutlinerParaObject( *pOPO ) ); // copy formatting items (after text has been copied to apply font formatting) maNoteData.mpCaption->SetMergedItemSetAndBroadcast( pCaption->GetMergedItemSet() ); // move textbox position relative to new cell, copy textbox size Index: svx/source/outliner/outlobj.cxx =================================================================== --- svx/source/outliner/outlobj.cxx (.../tags/OOO310_m3) (revision 268984) +++ svx/source/outliner/outlobj.cxx (.../cws/cl12) (revision 268984) @@ -61,6 +61,8 @@ mbIsEditDoc(bIsEditDoc), mnRefCount(0) { + if( (maParagraphDataVector.size() == 0) && (pEditTextObject->GetParagraphCount() != 0) ) + maParagraphDataVector.resize(pEditTextObject->GetParagraphCount()); } // destructor Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1850 retrieving revision 1.1851 diff -u -r1.1850 -r1.1851 --- openoffice.org.spec 6 Mar 2009 09:08:30 -0000 1.1850 +++ openoffice.org.spec 6 Mar 2009 09:56:59 -0000 1.1851 @@ -1,6 +1,6 @@ %define oootag OOO310 %define ooomilestone 4 -%define rh_rpm_release 1 +%define rh_rpm_release 2 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF %define __jar_repack %{nil} @@ -136,6 +136,7 @@ Patch53: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch Patch54: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch Patch55: workspace.localization35.patch +Patch56: workspace.cl12.patch %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)") %define instdir %{_libdir} @@ -1606,6 +1607,7 @@ %patch53 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch %patch54 -p1 -b .oooXXXXX.solenv.allowmissing.patch %patch55 -p0 -b .workspace.localization35.patch +%patch56 -p0 -b .workspace.cl12.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -4122,6 +4124,9 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog +* Fri Mar 06 2009 Caol??n McNamara - 1:3.1.0-4.2 +- Resolves: rhbz#488835 backport workspace.cl12 + * Fri Mar 06 2009 Caol??n McNamara - 1:3.1.0-4.1 - report-builder will be broken until rhbz#474391 is resolved - drop integrated workspace.gfbcrash.patch From xhorak at fedoraproject.org Fri Mar 6 09:58:24 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 09:58:24 +0000 (UTC) Subject: rpms/gnome-web-photo/F-9 gnome-web-photo.spec,1.17,1.18 Message-ID: <20090306095824.2294470116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/gnome-web-photo/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11550 Modified Files: gnome-web-photo.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.3-18 - Rebuild against newer gecko Index: gnome-web-photo.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-web-photo/F-9/gnome-web-photo.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gnome-web-photo.spec 4 Feb 2009 19:16:58 -0000 1.17 +++ gnome-web-photo.spec 6 Mar 2009 09:57:53 -0000 1.18 @@ -3,7 +3,7 @@ Summary: HTML pages thumbnailer Name: gnome-web-photo Version: 0.3 -Release: 17%{?dist} +Release: 18%{?dist} License: LGPLv2+ Group: Applications/Internet URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/ @@ -81,6 +81,9 @@ %{_datadir}/gnome-web-photo %changelog +* Fri Mar 06 2009 Jan Horak - 0.3-18 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.3-17 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 09:59:27 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 09:59:27 +0000 (UTC) Subject: rpms/google-gadgets/F-9 google-gadgets.spec,1.11,1.12 Message-ID: <20090306095927.BC6B270116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/google-gadgets/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11867 Modified Files: google-gadgets.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.10.5-3 - Rebuild against newer gecko Index: google-gadgets.spec =================================================================== RCS file: /cvs/pkgs/rpms/google-gadgets/F-9/google-gadgets.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- google-gadgets.spec 4 Feb 2009 19:17:58 -0000 1.11 +++ google-gadgets.spec 6 Mar 2009 09:58:57 -0000 1.12 @@ -1,6 +1,6 @@ Name: google-gadgets Version: 0.10.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Google Gadgets for Linux Group: User Interface/Desktops @@ -189,6 +189,9 @@ %changelog +* Fri Mar 06 2009 Jan Horak - 0.10.5-3 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.10.5-2 - Rebuild against newer gecko From sharkcz at fedoraproject.org Fri Mar 6 09:59:24 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Fri, 6 Mar 2009 09:59:24 +0000 (UTC) Subject: rpms/trytond/F-9 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 trytond.spec, 1.2, 1.3 Message-ID: <20090306095924.D2DF570116@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/trytond/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11841 Modified Files: .cvsignore sources trytond.spec Log Message: * Fri Mar 6 2009 Dan Hor??k 1.0.3-1 - update to upstream version 1.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/trytond/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jan 2009 11:10:44 -0000 1.3 +++ .cvsignore 6 Mar 2009 09:58:54 -0000 1.4 @@ -1 +1 @@ -trytond-1.0.2.tar.gz +trytond-1.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/trytond/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jan 2009 11:10:44 -0000 1.3 +++ sources 6 Mar 2009 09:58:54 -0000 1.4 @@ -1 +1 @@ -e6eed9dbc90961d6ccefb3c70adc47eb trytond-1.0.2.tar.gz +1a66d8676c54d67b66eb7d4bff41b973 trytond-1.0.3.tar.gz Index: trytond.spec =================================================================== RCS file: /cvs/pkgs/rpms/trytond/F-9/trytond.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- trytond.spec 9 Jan 2009 11:10:44 -0000 1.2 +++ trytond.spec 6 Mar 2009 09:58:54 -0000 1.3 @@ -3,7 +3,7 @@ %{!?_initddir: %define _initddir %{_initrddir}} Name: trytond -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Summary: Server for the Tryton application framework @@ -55,6 +55,16 @@ OpenOffice.org support for Tryton Server. +%package webdav +Summary: WebDAV support for Tryton Server +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pywebdav + +%description webdav +WebDAV support for Tryton Server. + + %prep %setup -q @@ -122,8 +132,17 @@ %files openoffice %defattr(-,root,root,-) +%files webdav +%defattr(-,root,root,-) + %changelog +* Fri Mar 6 2009 Dan Hor??k 1.0.3-1 +- update to upstream version 1.0.3 + +* Wed Jan 21 2009 Dan Hor??k 1.0.2-2 +- add modular support for webdav + * Thu Jan 8 2009 Dan Hor??k 1.0.2-1 - modularize the openoffice.org support - update to upstream version 1.0.2 @@ -140,4 +159,3 @@ * Fri Nov 28 2008 Dan Hor??k 1.0.0-1 - initial Fedora version - From xhorak at fedoraproject.org Fri Mar 6 10:00:36 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:00:36 +0000 (UTC) Subject: rpms/gtkmozembedmm/F-9 gtkmozembedmm.spec,1.33,1.34 Message-ID: <20090306100036.E475C70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/gtkmozembedmm/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12329 Modified Files: gtkmozembedmm.spec Log Message: * Fri Mar 06 2009 Jan Horak - 1.4.2.cvs20060817-26 - Rebuild against newer gecko Index: gtkmozembedmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkmozembedmm/F-9/gtkmozembedmm.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- gtkmozembedmm.spec 4 Feb 2009 19:18:56 -0000 1.33 +++ gtkmozembedmm.spec 6 Mar 2009 10:00:06 -0000 1.34 @@ -1,7 +1,7 @@ -%define gecko_ver 1.9.0.6 +%define gecko_ver 1.9.0.7 Name: gtkmozembedmm Version: 1.4.2.cvs20060817 -Release: 25%{?dist} +Release: 26%{?dist} Summary: C++ wrapper for GtkMozembed @@ -105,6 +105,9 @@ %changelog +* Fri Mar 06 2009 Jan Horak - 1.4.2.cvs20060817-26 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 1.4.2.cvs20060817-25 - Rebuild against newer gecko From sharkcz at fedoraproject.org Fri Mar 6 10:01:06 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Fri, 6 Mar 2009 10:01:06 +0000 (UTC) Subject: rpms/trytond/EL-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 trytond.spec, 1.2, 1.3 Message-ID: <20090306100106.2493970116@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/trytond/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12488 Modified Files: .cvsignore sources trytond.spec Log Message: * Fri Mar 6 2009 Dan Hor??k 1.0.3-1 - update to upstream version 1.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/trytond/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jan 2009 11:58:30 -0000 1.3 +++ .cvsignore 6 Mar 2009 10:00:35 -0000 1.4 @@ -1 +1 @@ -trytond-1.0.2.tar.gz +trytond-1.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/trytond/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jan 2009 11:58:30 -0000 1.3 +++ sources 6 Mar 2009 10:00:35 -0000 1.4 @@ -1 +1 @@ -e6eed9dbc90961d6ccefb3c70adc47eb trytond-1.0.2.tar.gz +1a66d8676c54d67b66eb7d4bff41b973 trytond-1.0.3.tar.gz Index: trytond.spec =================================================================== RCS file: /cvs/pkgs/rpms/trytond/EL-5/trytond.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- trytond.spec 9 Jan 2009 11:58:30 -0000 1.2 +++ trytond.spec 6 Mar 2009 10:00:35 -0000 1.3 @@ -3,7 +3,7 @@ %{!?_initddir: %define _initddir %{_initrddir}} Name: trytond -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Summary: Server for the Tryton application framework @@ -55,6 +55,16 @@ OpenOffice.org support for Tryton Server. +%package webdav +Summary: WebDAV support for Tryton Server +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pywebdav + +%description webdav +WebDAV support for Tryton Server. + + %prep %setup -q @@ -122,8 +132,17 @@ %files openoffice %defattr(-,root,root,-) +%files webdav +%defattr(-,root,root,-) + %changelog +* Fri Mar 6 2009 Dan Hor??k 1.0.3-1 +- update to upstream version 1.0.3 + +* Wed Jan 21 2009 Dan Hor??k 1.0.2-2 +- add modular support for webdav + * Thu Jan 8 2009 Dan Hor??k 1.0.2-1 - modularize the openoffice.org support - update to upstream version 1.0.2 @@ -140,4 +159,3 @@ * Fri Nov 28 2008 Dan Hor??k 1.0.0-1 - initial Fedora version - From xhorak at fedoraproject.org Fri Mar 6 10:01:44 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:01:44 +0000 (UTC) Subject: rpms/hulahop/F-9 hulahop.spec,1.5,1.6 Message-ID: <20090306100144.E20B070116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/hulahop/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12770 Modified Files: hulahop.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.4.4-5 - Rebuild against newer gecko Index: hulahop.spec =================================================================== RCS file: /cvs/pkgs/rpms/hulahop/F-9/hulahop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hulahop.spec 4 Feb 2009 19:20:10 -0000 1.5 +++ hulahop.spec 6 Mar 2009 10:01:14 -0000 1.6 @@ -2,7 +2,7 @@ Name: hulahop Version: 0.4.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A pygtk widget for embedding mozilla Group: System Environment/Libraries @@ -50,6 +50,9 @@ %{python_sitelib}/* %changelog +* Fri Mar 06 2009 Jan Horak - 0.4.4-5 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.4.4-4 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 10:02:56 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:02:56 +0000 (UTC) Subject: rpms/kazehakase/F-9 kazehakase.spec,1.69,1.70 Message-ID: <20090306100256.0FF3770116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/kazehakase/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13178 Modified Files: kazehakase.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.5.6-1.4 - Rebuild against newer gecko Index: kazehakase.spec =================================================================== RCS file: /cvs/pkgs/rpms/kazehakase/F-9/kazehakase.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- kazehakase.spec 4 Feb 2009 19:26:57 -0000 1.69 +++ kazehakase.spec 6 Mar 2009 10:02:25 -0000 1.70 @@ -40,7 +40,7 @@ Name: kazehakase Version: 0.5.6 -Release: %{_release}%{?dist}.3 +Release: %{_release}%{?dist}.4 Summary: Kazehakase browser using Gecko rendering engine Group: Applications/Internet @@ -293,6 +293,9 @@ %endif %changelog +* Fri Mar 06 2009 Jan Horak - 0.5.6-1.4 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.5.6-1.3 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 10:04:05 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:04:05 +0000 (UTC) Subject: rpms/Miro/F-9 Miro.spec,1.38,1.39 Message-ID: <20090306100405.28C3570116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/Miro/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13515 Modified Files: Miro.spec Log Message: * Fri Mar 06 2009 Jan Horak - 1.2.7-5 - Rebuild against newer gecko Index: Miro.spec =================================================================== RCS file: /cvs/pkgs/rpms/Miro/F-9/Miro.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- Miro.spec 4 Feb 2009 19:27:54 -0000 1.38 +++ Miro.spec 6 Mar 2009 10:03:34 -0000 1.39 @@ -1,11 +1,11 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define gecko_ver 1.9.0.6 +%define gecko_ver 1.9.0.7 Name: Miro Version: 1.2.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Miro - Internet TV Player Group: Applications/Multimedia License: GPLv2+ @@ -85,6 +85,9 @@ %changelog +* Fri Mar 06 2009 Jan Horak - 1.2.7-5 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 1.2.7-4 - Rebuild against newer gecko @@ -96,7 +99,7 @@ * Sun Sep 28 2008 Alex Lancaster - 1.2.7-1 - Update to 1.2.7 -- Rebuild against gecko-libs 1.9.0.6 (#464205) +- Rebuild against gecko-libs 1.9.0.7 (#464205) * Fri Aug 22 2008 Michel Alexandre Salim - 1.2.6-3 - Do not create backup files when patching; the backup files get re-added during the build process From jorton at fedoraproject.org Fri Mar 6 10:04:39 2009 From: jorton at fedoraproject.org (Joe Orton) Date: Fri, 6 Mar 2009 10:04:39 +0000 (UTC) Subject: rpms/neon/devel neon-0.28.4.tar.gz.asc, NONE, 1.1 .cvsignore, 1.15, 1.16 neon.spec, 1.48, 1.49 sources, 1.14, 1.15 upstream, 1.8, 1.9 Message-ID: <20090306100439.1C55270116@cvs1.fedora.phx.redhat.com> Author: jorton Update of /cvs/extras/rpms/neon/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13727 Modified Files: .cvsignore neon.spec sources upstream Added Files: neon-0.28.4.tar.gz.asc Log Message: * Fri Mar 6 2009 Joe Orton 0.28.4-1 - update to 0.28.4 --- NEW FILE neon-0.28.4.tar.gz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABECAAYFAkmtlywACgkQR/aWnQ5EzwxomwCeKhQjn5+15d6IQG6KlegOQCYL Y3MAn1hYTDdjehb5WCKGcAB+vJwm8QDC =52IM -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/neon/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 28 Aug 2008 18:20:43 -0000 1.15 +++ .cvsignore 6 Mar 2009 10:04:08 -0000 1.16 @@ -1 +1 @@ -neon-0.28.3.tar.gz +neon-0.28.4.tar.gz Index: neon.spec =================================================================== RCS file: /cvs/extras/rpms/neon/devel/neon.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- neon.spec 26 Feb 2009 04:48:47 -0000 1.48 +++ neon.spec 6 Mar 2009 10:04:08 -0000 1.49 @@ -1,7 +1,7 @@ Summary: An HTTP and WebDAV client library Name: neon -Version: 0.28.3 -Release: 4 +Version: 0.28.4 +Release: 1 License: LGPLv2+ Group: System Environment/Libraries URL: http://www.webdav.org/neon/ @@ -75,6 +75,9 @@ %{_libdir}/*.so %changelog +* Fri Mar 6 2009 Joe Orton 0.28.4-1 +- update to 0.28.4 + * Wed Feb 25 2009 Fedora Release Engineering - 0.28.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/neon/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 28 Aug 2008 18:20:43 -0000 1.14 +++ sources 6 Mar 2009 10:04:08 -0000 1.15 @@ -1 +1 @@ -47599a328862ce64ac3c52726d6daa12 neon-0.28.3.tar.gz +6c3b94362af743d046e198e9fcbe4a85 neon-0.28.4.tar.gz Index: upstream =================================================================== RCS file: /cvs/extras/rpms/neon/devel/upstream,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- upstream 28 Aug 2008 18:20:43 -0000 1.8 +++ upstream 6 Mar 2009 10:04:08 -0000 1.9 @@ -1 +1 @@ -neon-0.28.3.tar.gz +neon-0.28.4.tar.gz From xhorak at fedoraproject.org Fri Mar 6 10:05:12 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:05:12 +0000 (UTC) Subject: rpms/mozvoikko/F-9 mozvoikko.spec,1.6,1.7 Message-ID: <20090306100512.60CB070116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/mozvoikko/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13935 Modified Files: mozvoikko.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.9.5-7 - Rebuild against newer gecko Index: mozvoikko.spec =================================================================== RCS file: /cvs/pkgs/rpms/mozvoikko/F-9/mozvoikko.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mozvoikko.spec 4 Feb 2009 19:28:52 -0000 1.6 +++ mozvoikko.spec 6 Mar 2009 10:04:42 -0000 1.7 @@ -1,5 +1,5 @@ # For the xulrunner unstable requires -%define gecko_ver 1.9.0.6 +%define gecko_ver 1.9.0.7 # These come from install.rdf %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\} @@ -12,7 +12,7 @@ Name: mozvoikko Version: 0.9.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Finnish Voikko spell-checker extension for Mozilla programs Group: Applications/Internet License: GPLv2+ @@ -70,6 +70,9 @@ %changelog +* Fri Mar 06 2009 Jan Horak - 0.9.5-7 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.9.5-6 - Rebuild against newer gecko @@ -84,7 +87,7 @@ * Sat Aug 30 2008 Ville-Pekka Vainio - 0.9.5-2 - Fix the xulrunner requires: - - Add define gecko_ver 1.9.0.6 + - Add define gecko_ver 1.9.0.7 - Add Requires: gecko-libs = gecko_ver - Add BuildRequires: gecko-devel-unstable = gecko_ver - Remove all actual xulrunner requires From xhorak at fedoraproject.org Fri Mar 6 10:06:20 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:06:20 +0000 (UTC) Subject: rpms/mugshot/F-9 mugshot.spec,1.45,1.46 Message-ID: <20090306100620.4B0C570116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/mugshot/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14304 Modified Files: mugshot.spec Log Message: * Fri Mar 06 2009 Jan Horak - 1.2.2-6 - Rebuild against newer gecko Index: mugshot.spec =================================================================== RCS file: /cvs/pkgs/rpms/mugshot/F-9/mugshot.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- mugshot.spec 4 Feb 2009 19:29:46 -0000 1.45 +++ mugshot.spec 6 Mar 2009 10:05:49 -0000 1.46 @@ -3,7 +3,7 @@ Name: mugshot Version: 1.2.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Companion software for mugshot.org Group: Applications/Internet @@ -168,6 +168,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Fri Mar 06 2009 Jan Horak - 1.2.2-6 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 1.2.2-5 - Rebuild against newer gecko From caolanm at fedoraproject.org Fri Mar 6 10:06:23 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Fri, 6 Mar 2009 10:06:23 +0000 (UTC) Subject: rpms/mythes-es/devel mythes-es.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <20090306100623.B930170116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/mythes-es/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14351 Modified Files: mythes-es.spec sources Log Message: latest version Index: mythes-es.spec =================================================================== RCS file: /cvs/pkgs/rpms/mythes-es/devel/mythes-es.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mythes-es.spec 26 Feb 2009 03:51:25 -0000 1.2 +++ mythes-es.spec 6 Mar 2009 10:05:53 -0000 1.3 @@ -1,8 +1,8 @@ Name: mythes-es Summary: Spanish thesaurus -%define upstreamid 20090206 +%define upstreamid 20090306 Version: 0.%{upstreamid} -Release: 2%{?dist} +Release: 1%{?dist} Source: http://openthes-es.berlios.de/download/OOo2-thes_es_ES.tar.bz2 Group: Applications/Text URL: http://openthes-es.berlios.de @@ -43,6 +43,9 @@ %{_datadir}/mythes/* %changelog +* Fri Mar 06 2009 Caol??n McNamara - 0.20090306-1 +- latest version + * Wed Feb 25 2009 Fedora Release Engineering - 0.20090206-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mythes-es/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Feb 2009 23:21:08 -0000 1.2 +++ sources 6 Mar 2009 10:05:53 -0000 1.3 @@ -1 +1 @@ -286b0a85dd41523f07585edf718f76cb OOo2-thes_es_ES.tar.bz2 +4c33ac651ad5fbd71f028dbb2d0c1064 OOo2-thes_es_ES.tar.bz2 From xhorak at fedoraproject.org Fri Mar 6 10:07:28 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:07:28 +0000 (UTC) Subject: rpms/ruby-gnome2/F-9 ruby-gnome2.spec,1.33,1.34 Message-ID: <20090306100728.6880D70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/ruby-gnome2/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14706 Modified Files: ruby-gnome2.spec Log Message: * Fri Mar 06 2009 Jan Horak - 0.17.0-6 - Rebuild against newer gecko Index: ruby-gnome2.spec =================================================================== RCS file: /cvs/pkgs/rpms/ruby-gnome2/F-9/ruby-gnome2.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ruby-gnome2.spec 4 Feb 2009 19:30:44 -0000 1.33 +++ ruby-gnome2.spec 6 Mar 2009 10:06:58 -0000 1.34 @@ -10,7 +10,7 @@ Name: ruby-gnome2 Version: 0.17.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Ruby binding of libgnome/libgnomeui-2.x Group: System Environment/Libraries @@ -700,6 +700,9 @@ %changelog +* Fri Mar 06 2009 Jan Horak - 0.17.0-6 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 0.17.0-5 - Rebuild against newer gecko From xhorak at fedoraproject.org Fri Mar 6 10:08:36 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:08:36 +0000 (UTC) Subject: rpms/totem/F-9 totem.spec,1.195,1.196 Message-ID: <20090306100836.4B78370116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/totem/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14997 Modified Files: totem.spec Log Message: * Fri Mar 06 2009 Jan Horak - 2.23.2-11 - Rebuild against newer gecko Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/F-9/totem.spec,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- totem.spec 4 Feb 2009 19:31:48 -0000 1.195 +++ totem.spec 6 Mar 2009 10:08:05 -0000 1.196 @@ -11,7 +11,7 @@ Summary: Movie player for GNOME Name: totem Version: 2.23.2 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 with exception Group: Applications/Multimedia URL: http://www.gnome.org/projects/totem/ @@ -436,6 +436,9 @@ %endif %changelog +* Fri Mar 06 2009 Jan Horak - 2.23.2-11 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 2.23.2-10 - Rebuild against newer gecko @@ -452,7 +455,7 @@ - Add patch to make FLV videos thumbnail (#449279) * Fri Jul 18 2008 Martin Stransky - 2.23.2-5 -- Rebuild against xulrunner 1.9.0.6 and fixed gecko dependency +- Rebuild against xulrunner 1.9.0.7 and fixed gecko dependency * Wed Jun 18 2008 Owen Taylor - 2.23.2-4 - Rebuild against xulrunner 1.9 final From xhorak at fedoraproject.org Fri Mar 6 10:09:44 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:09:44 +0000 (UTC) Subject: rpms/yelp/F-9 yelp.spec,1.141,1.142 Message-ID: <20090306100944.1BCCD70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/yelp/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15301 Modified Files: yelp.spec Log Message: * Fri Mar 06 2009 Jan Horak - 2.22.1-9 - Rebuild against newer gecko Index: yelp.spec =================================================================== RCS file: /cvs/pkgs/rpms/yelp/F-9/yelp.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- yelp.spec 4 Feb 2009 19:32:47 -0000 1.141 +++ yelp.spec 6 Mar 2009 10:09:13 -0000 1.142 @@ -12,7 +12,7 @@ %define libxslt_version 1.1.4 %define startup_notification_version 0.8 %define rarian_version 0.7.0 -%define gecko_version 1.9.0.6 +%define gecko_version 1.9.0.7 %define pango_version 1.0.99 %define desktop_file_utils_version 0.3-7 @@ -20,7 +20,7 @@ Summary: A system documentation reader from the Gnome project Name: yelp Version: 2.22.1 -Release: 8%{?dist} +Release: 9%{?dist} Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.22/%{name}-%{version}.tar.bz2 URL: http://live.gnome.org/Yelp # http://bugzilla.gnome.org/show_bug.cgi?id=319096 @@ -164,6 +164,9 @@ %{_datadir}/yelp %changelog +* Fri Mar 06 2009 Jan Horak - 2.22.1-9 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 2.22.1-8 - Rebuild against newer gecko From tbzatek at fedoraproject.org Fri Mar 6 10:23:21 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Fri, 6 Mar 2009 10:23:21 +0000 (UTC) Subject: rpms/libarchive/devel .cvsignore, 1.8, 1.9 libarchive.spec, 1.9, 1.10 sources, 1.8, 1.9 Message-ID: <20090306102321.DB6E970116@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/libarchive/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17693 Modified Files: .cvsignore libarchive.spec sources Log Message: * Fri Mar 6 2009 Tomas Bzatek 2.6.2-1 - Update to 2.6.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libarchive/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 16 Feb 2009 14:18:20 -0000 1.8 +++ .cvsignore 6 Mar 2009 10:22:51 -0000 1.9 @@ -1 +1 @@ -libarchive-2.6.1.tar.gz +libarchive-2.6.2.tar.gz Index: libarchive.spec =================================================================== RCS file: /cvs/extras/rpms/libarchive/devel/libarchive.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libarchive.spec 25 Feb 2009 13:41:02 -0000 1.9 +++ libarchive.spec 6 Mar 2009 10:22:51 -0000 1.10 @@ -1,6 +1,6 @@ Name: libarchive -Version: 2.6.1 -Release: 2%{?dist} +Version: 2.6.2 +Release: 1%{?dist} Summary: A library for handling streaming archive formats Group: System Environment/Libraries @@ -76,6 +76,9 @@ %changelog +* Fri Mar 6 2009 Tomas Bzatek 2.6.2-1 +- Update to 2.6.2 + * Wed Feb 25 2009 Fedora Release Engineering - 2.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libarchive/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 16 Feb 2009 14:18:20 -0000 1.8 +++ sources 6 Mar 2009 10:22:51 -0000 1.9 @@ -1 +1 @@ -9d9f83947ee9d5732289ed48d00e3743 libarchive-2.6.1.tar.gz +e31fcacd3f2b996988c0852a5edfc680 libarchive-2.6.2.tar.gz From paragn at fedoraproject.org Fri Mar 6 10:30:53 2009 From: paragn at fedoraproject.org (Parag Ashok Nemade) Date: Fri, 6 Mar 2009 10:30:53 +0000 (UTC) Subject: rpms/iok/devel iok-enable-combo-en-locale.patch, NONE, 1.1 iok.spec, 1.9, 1.10 Message-ID: <20090306103053.F2CA170116@cvs1.fedora.phx.redhat.com> Author: paragn Update of /cvs/pkgs/rpms/iok/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19249 Modified Files: iok.spec Added Files: iok-enable-combo-en-locale.patch Log Message: * Fri Mar 06 2009 Parag - 1.3.2-2 - Resolves: rh#488937:iok should show map list as well as switch button in English locale iok-enable-combo-en-locale.patch: --- NEW FILE iok-enable-combo-en-locale.patch --- --- src/interface.c.orig 2009-03-04 16:43:14.000000000 +0530 +++ src/interface.c 2009-03-06 15:11:00.000000000 +0530 @@ -9839,7 +9839,11 @@ gtk_widget_show (keyswitch_btn); } else + { english_mappings(); + gtk_widget_show (combo_mim); + gtk_widget_show (keyswitch_btn); + } g_signal_connect (G_OBJECT (bt_back_quote), "clicked", G_CALLBACK (on_bt_back_quote_clicked), (gpointer) bt_back_quote); Index: iok.spec =================================================================== RCS file: /cvs/pkgs/rpms/iok/devel/iok.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- iok.spec 5 Mar 2009 04:00:34 -0000 1.9 +++ iok.spec 6 Mar 2009 10:30:23 -0000 1.10 @@ -1,11 +1,12 @@ Name: iok Version: 1.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Indic Onscreen Virtual Keyboard Group: Applications/System License: GPLv2+ URL: https://fedorahosted.org/iok/wiki/ Source0: https://fedorahosted.org/releases/i/o/iok/%{name}-%{version}.tar.gz +Patch0: iok-enable-combo-en-locale.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils libXtst-devel BuildRequires: gtk2-devel gettext @@ -18,6 +19,7 @@ %prep %setup -q +%patch0 -p0 %build %configure @@ -48,6 +50,9 @@ %changelog +* Fri Mar 06 2009 Parag Nemade - 1.3.2-2 +- Resolves: rh#488937:iok should show map list as well as switch button in English locale + * Thu Mar 05 2009 Parag Nemade - 1.3.2-1 - Update to Next release 1.3.2 From sindrepb at fedoraproject.org Fri Mar 6 10:37:13 2009 From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=) Date: Fri, 6 Mar 2009 10:37:13 +0000 (UTC) Subject: rpms/txt2man/F-10 txt2man-1.5.5-fixbashisms.patch, NONE, 1.1 txt2man.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090306103713.9502670116@cvs1.fedora.phx.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/txt2man/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21191 Modified Files: sources Added Files: txt2man-1.5.5-fixbashisms.patch txt2man.spec Log Message: adding files to branch txt2man-1.5.5-fixbashisms.patch: --- NEW FILE txt2man-1.5.5-fixbashisms.patch --- diff -Nru txt2man-1.5.5/bookman txt2man-1.5.5/bookman --- txt2man-1.5.5/bookman 2007-03-21 11:07:24.000000000 +0000 +++ txt2man-1.5.5/bookman 2008-04-12 03:29:07.000000000 +0100 @@ -83,16 +83,16 @@ shift $(($OPTIND - 1)) date=${date:-$(date +'%d %B %Y')} -[[ $1 ]] || set -- $(while read; do echo $REPLY; done) +[ $1 ] || set -- $(while read REPLY; do echo $REPLY; done) -[[ $outfile ]] && post="$post >$outfile" +[ $outfile ] && post="$post >$outfile" { # Compute table of content from postscript output. # Generate output in gtroff intermediate format, so # it can be merged with content. { - [[ -f $cover ]] && cat $cover || { + [ -f $cover ] && cat $cover || { printf ".af %% i\n.P1\n" printf ".OH ||%s||\n" "$volume" printf ".EH ||%s||\n" "$volume" --- NEW FILE txt2man.spec --- Name: txt2man Version: 1.5.5 Release: 1%{?dist} Summary: Convert flat ASCII text to man page format Group: Applications/Text License: GPLv2+ URL: http://mvertes.free.fr/txt2man/ Source0: http://mvertes.free.fr/download/%{name}-%{version}.tar.gz #Fixes bug with bashisms in /bin/sh script, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473696 Patch0: txt2man-1.5.5-fixbashisms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: gawk %description tx2man is a shell script using gnu awk, that should run on any Unix-like system. The syntax of the ASCII text is very straightforward and looks very much like the output of the man(1) program. %prep %setup -q %patch0 -p1 %build #no build needed %install rm -rf $RPM_BUILD_ROOT #manual install install -p -m 0755 -D bookman $RPM_BUILD_ROOT%{_bindir}/bookman install -p -m 0755 -D src2man $RPM_BUILD_ROOT%{_bindir}/src2man install -p -m 0755 -D txt2man $RPM_BUILD_ROOT%{_bindir}/txt2man install -p -m 0644 -D bookman.1 $RPM_BUILD_ROOT%{_mandir}/man1/bookman.1 install -p -m 0644 -D src2man.1 $RPM_BUILD_ROOT%{_mandir}/man1/src2man.1 install -p -m 0644 -D txt2man.1 $RPM_BUILD_ROOT%{_mandir}/man1/txt2man.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING Changelog README %{_bindir}/* %{_mandir}/man?/* %changelog * Tue Mar 04 2009 Sindre Pedersen Bjordal - 1.5.5-1 - Initial build - Include debian patch to fix bashisms Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/txt2man/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:53:20 -0000 1.1 +++ sources 6 Mar 2009 10:36:42 -0000 1.2 @@ -0,0 +1 @@ +d10fe6e9876a2969201ea4d75ac9ea48 txt2man-1.5.5.tar.gz From sindrepb at fedoraproject.org Fri Mar 6 10:39:06 2009 From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=) Date: Fri, 6 Mar 2009 10:39:06 +0000 (UTC) Subject: rpms/txt2man/F-9 txt2man-1.5.5-fixbashisms.patch, NONE, 1.1 txt2man.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090306103906.392BD70116@cvs1.fedora.phx.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/txt2man/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22147 Modified Files: sources Added Files: txt2man-1.5.5-fixbashisms.patch txt2man.spec Log Message: add files to branch txt2man-1.5.5-fixbashisms.patch: --- NEW FILE txt2man-1.5.5-fixbashisms.patch --- diff -Nru txt2man-1.5.5/bookman txt2man-1.5.5/bookman --- txt2man-1.5.5/bookman 2007-03-21 11:07:24.000000000 +0000 +++ txt2man-1.5.5/bookman 2008-04-12 03:29:07.000000000 +0100 @@ -83,16 +83,16 @@ shift $(($OPTIND - 1)) date=${date:-$(date +'%d %B %Y')} -[[ $1 ]] || set -- $(while read; do echo $REPLY; done) +[ $1 ] || set -- $(while read REPLY; do echo $REPLY; done) -[[ $outfile ]] && post="$post >$outfile" +[ $outfile ] && post="$post >$outfile" { # Compute table of content from postscript output. # Generate output in gtroff intermediate format, so # it can be merged with content. { - [[ -f $cover ]] && cat $cover || { + [ -f $cover ] && cat $cover || { printf ".af %% i\n.P1\n" printf ".OH ||%s||\n" "$volume" printf ".EH ||%s||\n" "$volume" --- NEW FILE txt2man.spec --- Name: txt2man Version: 1.5.5 Release: 1%{?dist} Summary: Convert flat ASCII text to man page format Group: Applications/Text License: GPLv2+ URL: http://mvertes.free.fr/txt2man/ Source0: http://mvertes.free.fr/download/%{name}-%{version}.tar.gz #Fixes bug with bashisms in /bin/sh script, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473696 Patch0: txt2man-1.5.5-fixbashisms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: gawk %description tx2man is a shell script using gnu awk, that should run on any Unix-like system. The syntax of the ASCII text is very straightforward and looks very much like the output of the man(1) program. %prep %setup -q %patch0 -p1 %build #no build needed %install rm -rf $RPM_BUILD_ROOT #manual install install -p -m 0755 -D bookman $RPM_BUILD_ROOT%{_bindir}/bookman install -p -m 0755 -D src2man $RPM_BUILD_ROOT%{_bindir}/src2man install -p -m 0755 -D txt2man $RPM_BUILD_ROOT%{_bindir}/txt2man install -p -m 0644 -D bookman.1 $RPM_BUILD_ROOT%{_mandir}/man1/bookman.1 install -p -m 0644 -D src2man.1 $RPM_BUILD_ROOT%{_mandir}/man1/src2man.1 install -p -m 0644 -D txt2man.1 $RPM_BUILD_ROOT%{_mandir}/man1/txt2man.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING Changelog README %{_bindir}/* %{_mandir}/man?/* %changelog * Tue Mar 04 2009 Sindre Pedersen Bjordal - 1.5.5-1 - Initial build - Include debian patch to fix bashisms Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/txt2man/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:53:20 -0000 1.1 +++ sources 6 Mar 2009 10:38:35 -0000 1.2 @@ -0,0 +1 @@ +d10fe6e9876a2969201ea4d75ac9ea48 txt2man-1.5.5.tar.gz From sindrepb at fedoraproject.org Fri Mar 6 10:41:57 2009 From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=) Date: Fri, 6 Mar 2009 10:41:57 +0000 (UTC) Subject: rpms/txt2man/EL-4 txt2man-1.5.5-fixbashisms.patch, NONE, 1.1 txt2man.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090306104157.10C6670116@cvs1.fedora.phx.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/txt2man/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23702 Modified Files: sources Added Files: txt2man-1.5.5-fixbashisms.patch txt2man.spec Log Message: add files to branch txt2man-1.5.5-fixbashisms.patch: --- NEW FILE txt2man-1.5.5-fixbashisms.patch --- diff -Nru txt2man-1.5.5/bookman txt2man-1.5.5/bookman --- txt2man-1.5.5/bookman 2007-03-21 11:07:24.000000000 +0000 +++ txt2man-1.5.5/bookman 2008-04-12 03:29:07.000000000 +0100 @@ -83,16 +83,16 @@ shift $(($OPTIND - 1)) date=${date:-$(date +'%d %B %Y')} -[[ $1 ]] || set -- $(while read; do echo $REPLY; done) +[ $1 ] || set -- $(while read REPLY; do echo $REPLY; done) -[[ $outfile ]] && post="$post >$outfile" +[ $outfile ] && post="$post >$outfile" { # Compute table of content from postscript output. # Generate output in gtroff intermediate format, so # it can be merged with content. { - [[ -f $cover ]] && cat $cover || { + [ -f $cover ] && cat $cover || { printf ".af %% i\n.P1\n" printf ".OH ||%s||\n" "$volume" printf ".EH ||%s||\n" "$volume" --- NEW FILE txt2man.spec --- Name: txt2man Version: 1.5.5 Release: 1%{?dist} Summary: Convert flat ASCII text to man page format Group: Applications/Text License: GPLv2+ URL: http://mvertes.free.fr/txt2man/ Source0: http://mvertes.free.fr/download/%{name}-%{version}.tar.gz #Fixes bug with bashisms in /bin/sh script, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473696 Patch0: txt2man-1.5.5-fixbashisms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: gawk %description tx2man is a shell script using gnu awk, that should run on any Unix-like system. The syntax of the ASCII text is very straightforward and looks very much like the output of the man(1) program. %prep %setup -q %patch0 -p1 %build #no build needed %install rm -rf $RPM_BUILD_ROOT #manual install install -p -m 0755 -D bookman $RPM_BUILD_ROOT%{_bindir}/bookman install -p -m 0755 -D src2man $RPM_BUILD_ROOT%{_bindir}/src2man install -p -m 0755 -D txt2man $RPM_BUILD_ROOT%{_bindir}/txt2man install -p -m 0644 -D bookman.1 $RPM_BUILD_ROOT%{_mandir}/man1/bookman.1 install -p -m 0644 -D src2man.1 $RPM_BUILD_ROOT%{_mandir}/man1/src2man.1 install -p -m 0644 -D txt2man.1 $RPM_BUILD_ROOT%{_mandir}/man1/txt2man.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING Changelog README %{_bindir}/* %{_mandir}/man?/* %changelog * Tue Mar 04 2009 Sindre Pedersen Bjordal - 1.5.5-1 - Initial build - Include debian patch to fix bashisms Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/txt2man/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:53:20 -0000 1.1 +++ sources 6 Mar 2009 10:41:26 -0000 1.2 @@ -0,0 +1 @@ +d10fe6e9876a2969201ea4d75ac9ea48 txt2man-1.5.5.tar.gz From msivak at fedoraproject.org Fri Mar 6 10:42:00 2009 From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=) Date: Fri, 6 Mar 2009 10:42:00 +0000 (UTC) Subject: rpms/python-cryptsetup/devel .cvsignore, 1.8, 1.9 python-cryptsetup.spec, 1.10, 1.11 sources, 1.8, 1.9 Message-ID: <20090306104200.0E63070116@cvs1.fedora.phx.redhat.com> Author: msivak Update of /cvs/extras/rpms/python-cryptsetup/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23675 Modified Files: .cvsignore python-cryptsetup.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 5 Mar 2009 12:08:15 -0000 1.8 +++ .cvsignore 6 Mar 2009 10:41:29 -0000 1.9 @@ -1 +1 @@ -python-cryptsetup-0.0.7.tar.bz2 +python-cryptsetup-0.0.8.tar.bz2 Index: python-cryptsetup.spec =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/python-cryptsetup.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- python-cryptsetup.spec 5 Mar 2009 12:20:29 -0000 1.10 +++ python-cryptsetup.spec 6 Mar 2009 10:41:29 -0000 1.11 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-cryptsetup -Version: 0.0.7 +Version: 0.0.8 Release: 1%{?dist} Summary: Python bindings for cryptsetup @@ -42,6 +42,10 @@ %doc selftest.py %changelog +* Fri Mar 06 2009 Martin Sivak - 0.0.8-1 +- Fix the params for add and remove key routines +- Workaround one SIGSEGV in cryptsetup and change the order of passwords in luksRemoveKey + * Thu Mar 05 2009 Martin Sivak - 0.0.7-1 - add default cipher mode and key to luksFormat Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-cryptsetup/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 5 Mar 2009 12:08:16 -0000 1.8 +++ sources 6 Mar 2009 10:41:29 -0000 1.9 @@ -1 +1 @@ -b8fcb282df2592532c9bf35913a4488a python-cryptsetup-0.0.7.tar.bz2 +5cb68182220343ac03fef60ecafd97e3 python-cryptsetup-0.0.8.tar.bz2 From sindrepb at fedoraproject.org Fri Mar 6 10:44:20 2009 From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=) Date: Fri, 6 Mar 2009 10:44:20 +0000 (UTC) Subject: rpms/txt2man/EL-5 txt2man-1.5.5-fixbashisms.patch, NONE, 1.1 txt2man.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090306104420.12F3370116@cvs1.fedora.phx.redhat.com> Author: sindrepb Update of /cvs/pkgs/rpms/txt2man/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24796 Modified Files: sources Added Files: txt2man-1.5.5-fixbashisms.patch txt2man.spec Log Message: add files to branch txt2man-1.5.5-fixbashisms.patch: --- NEW FILE txt2man-1.5.5-fixbashisms.patch --- diff -Nru txt2man-1.5.5/bookman txt2man-1.5.5/bookman --- txt2man-1.5.5/bookman 2007-03-21 11:07:24.000000000 +0000 +++ txt2man-1.5.5/bookman 2008-04-12 03:29:07.000000000 +0100 @@ -83,16 +83,16 @@ shift $(($OPTIND - 1)) date=${date:-$(date +'%d %B %Y')} -[[ $1 ]] || set -- $(while read; do echo $REPLY; done) +[ $1 ] || set -- $(while read REPLY; do echo $REPLY; done) -[[ $outfile ]] && post="$post >$outfile" +[ $outfile ] && post="$post >$outfile" { # Compute table of content from postscript output. # Generate output in gtroff intermediate format, so # it can be merged with content. { - [[ -f $cover ]] && cat $cover || { + [ -f $cover ] && cat $cover || { printf ".af %% i\n.P1\n" printf ".OH ||%s||\n" "$volume" printf ".EH ||%s||\n" "$volume" --- NEW FILE txt2man.spec --- Name: txt2man Version: 1.5.5 Release: 1%{?dist} Summary: Convert flat ASCII text to man page format Group: Applications/Text License: GPLv2+ URL: http://mvertes.free.fr/txt2man/ Source0: http://mvertes.free.fr/download/%{name}-%{version}.tar.gz #Fixes bug with bashisms in /bin/sh script, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473696 Patch0: txt2man-1.5.5-fixbashisms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: gawk %description tx2man is a shell script using gnu awk, that should run on any Unix-like system. The syntax of the ASCII text is very straightforward and looks very much like the output of the man(1) program. %prep %setup -q %patch0 -p1 %build #no build needed %install rm -rf $RPM_BUILD_ROOT #manual install install -p -m 0755 -D bookman $RPM_BUILD_ROOT%{_bindir}/bookman install -p -m 0755 -D src2man $RPM_BUILD_ROOT%{_bindir}/src2man install -p -m 0755 -D txt2man $RPM_BUILD_ROOT%{_bindir}/txt2man install -p -m 0644 -D bookman.1 $RPM_BUILD_ROOT%{_mandir}/man1/bookman.1 install -p -m 0644 -D src2man.1 $RPM_BUILD_ROOT%{_mandir}/man1/src2man.1 install -p -m 0644 -D txt2man.1 $RPM_BUILD_ROOT%{_mandir}/man1/txt2man.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING Changelog README %{_bindir}/* %{_mandir}/man?/* %changelog * Tue Mar 04 2009 Sindre Pedersen Bjordal - 1.5.5-1 - Initial build - Include debian patch to fix bashisms Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/txt2man/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:53:20 -0000 1.1 +++ sources 6 Mar 2009 10:43:49 -0000 1.2 @@ -0,0 +1 @@ +d10fe6e9876a2969201ea4d75ac9ea48 txt2man-1.5.5.tar.gz From caolanm at fedoraproject.org Fri Mar 6 10:44:33 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Fri, 6 Mar 2009 10:44:33 +0000 (UTC) Subject: rpms/opensm/devel opensm-3.2.1-elif.patch, NONE, 1.1 opensm.spec, 1.3, 1.4 Message-ID: <20090306104433.25B6B70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/opensm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24885 Modified Files: opensm.spec Added Files: opensm-3.2.1-elif.patch Log Message: fix bare elifs to rebuild opensm-3.2.1-elif.patch: --- NEW FILE opensm-3.2.1-elif.patch --- diff -ru opensm-3.2.1.orig/include/vendor/osm_vendor.h opensm-3.2.1/include/vendor/osm_vendor.h --- opensm-3.2.1.orig/include/vendor/osm_vendor.h 2009-03-06 10:34:06.000000000 +0000 +++ opensm-3.2.1/include/vendor/osm_vendor.h 2009-03-06 10:35:10.000000000 +0000 @@ -70,7 +70,7 @@ #include #elif defined( OSM_VENDOR_INTF_AL ) #include -#elif +#else #error No MAD Interface selected! #error Choose an interface in osm_vendor_select.h #endif Index: opensm.spec =================================================================== RCS file: /cvs/pkgs/rpms/opensm/devel/opensm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- opensm.spec 26 Feb 2009 08:46:36 -0000 1.3 +++ opensm.spec 6 Mar 2009 10:44:02 -0000 1.4 @@ -1,6 +1,6 @@ Name: opensm Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OpenIB InfiniBand Subnet Manager and management utilities Group: System Environment/Daemons License: GPLv2 or BSD @@ -10,6 +10,7 @@ Source2: opensm.logrotate Source3: opensm.initd Patch0: opensm-3.2.1-rpath.patch +Patch1: opensm-3.2.1-elif.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libibmad-devel >= 1.2.0, libtool, bison, flex, byacc Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma @@ -47,6 +48,7 @@ %prep %setup -q %patch0 -p1 -b .rpath +%patch1 -p1 -b .elif ./autogen.sh %build @@ -108,6 +110,9 @@ %{_libdir}/lib*.a %changelog +* Fri Mar 06 2009 Caol??n McNamara - 3.2.1-3 +- fix bare elifs to rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 3.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From fabbione at fedoraproject.org Fri Mar 6 10:45:17 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Fri, 6 Mar 2009 10:45:17 +0000 (UTC) Subject: rpms/cluster/devel .cvsignore, 1.20, 1.21 cluster.spec, 1.44, 1.45 sources, 1.20, 1.21 fix-typo.diff, 1.1, NONE Message-ID: <20090306104517.8356B70116@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/cluster/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25062 Modified Files: .cvsignore cluster.spec sources Removed Files: fix-typo.diff Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cluster/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 3 Mar 2009 07:37:01 -0000 1.20 +++ .cvsignore 6 Mar 2009 10:44:47 -0000 1.21 @@ -1 +1 @@ -cluster-3.0.0.alpha6.tar.gz +cluster-3.0.0.alpha7.tar.gz Index: cluster.spec =================================================================== RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- cluster.spec 3 Mar 2009 07:37:01 -0000 1.44 +++ cluster.spec 6 Mar 2009 10:44:47 -0000 1.45 @@ -14,17 +14,16 @@ # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html # keep around ready for later user -%define alphatag alpha6 +%define alphatag alpha7 Name: cluster Summary: Red Hat Cluster Version: 3.0.0 -Release: 12%{?alphatag:.%{alphatag}}%{?dist} +Release: 13%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sources.redhat.com/cluster/wiki/ Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}%{?alphatag:.%{alphatag}}.tar.gz -Patch0: fix-typo.diff ## Setup/build bits @@ -40,7 +39,6 @@ %prep %setup -q -n cluster-%{version}%{?alphatag:.%{alphatag}} -%patch0 -p1 %build ./configure \ @@ -312,6 +310,10 @@ %{_mandir}/man8/*.gfs.* %changelog +* Fri Mar 6 2009 Fabio M. Di Nitto - 3.0.0-13.alpha7 +- New upstream release. +- Drop local build fix patch. + * Tue Mar 3 2009 Fabio M. Di Nitto - 3.0.0-12.alpha6 - New upstream release. - Add missing LICENCE and COPYRIGHT files from clusterlib-devel. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 3 Mar 2009 07:37:01 -0000 1.20 +++ sources 6 Mar 2009 10:44:47 -0000 1.21 @@ -1 +1 @@ -6bedf9e9598ea501db994294c45af522 cluster-3.0.0.alpha6.tar.gz +eb2f94ccca6b07a0beb1e8a55cb5691f cluster-3.0.0.alpha7.tar.gz --- fix-typo.diff DELETED --- From caolanm at fedoraproject.org Fri Mar 6 10:47:24 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Fri, 6 Mar 2009 10:47:24 +0000 (UTC) Subject: rpms/nco/devel nco-3.9.5-includes.patch, NONE, 1.1 nco.spec, 1.15, 1.16 Message-ID: <20090306104724.0E1A770116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/nco/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25947 Modified Files: nco.spec Added Files: nco-3.9.5-includes.patch Log Message: include cstdio for EOF nco-3.9.5-includes.patch: --- NEW FILE nco-3.9.5-includes.patch --- diff -ru nco-3.9.5.orig/src/nco++/ncoLexer.hpp nco-3.9.5/src/nco++/ncoLexer.hpp --- nco-3.9.5.orig/src/nco++/ncoLexer.hpp 2009-03-06 10:29:38.000000000 +0000 +++ nco-3.9.5/src/nco++/ncoLexer.hpp 2009-03-06 10:38:09.000000000 +0000 @@ -7,6 +7,7 @@ #include #include #include "ncoParserTokenTypes.hpp" +#include #include #line 1 "ncoGrammer.g" Index: nco.spec =================================================================== RCS file: /cvs/pkgs/rpms/nco/devel/nco.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- nco.spec 26 Feb 2009 04:37:32 -0000 1.15 +++ nco.spec 6 Mar 2009 10:46:53 -0000 1.16 @@ -1,6 +1,6 @@ Name: nco Version: 3.9.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Suite of programs for manipulating NetCDF/HDF4 files Group: Applications/Engineering License: GPLv3 @@ -14,6 +14,7 @@ # tar -czf nco-%{version}.tar.gz ./nco-%{version} Source0: nco-%{version}.tar.gz Patch0: nco_install_C_headers.patch +Patch1: nco-3.9.5-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison, flex, gawk @@ -58,6 +59,7 @@ %prep %setup -q %patch0 -p1 -b .install_C_headers +%patch1 -p1 -b .includes %build libtoolize --copy @@ -122,6 +124,9 @@ %{_libdir}/libnco*.a %changelog +* Fri Mar 06 2009 - Caol??n McNamara - 3.9.5-5 +- include cstdio for EOF + * Wed Feb 25 2009 Fedora Release Engineering - 3.9.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From xhorak at fedoraproject.org Fri Mar 6 10:49:11 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:49:11 +0000 (UTC) Subject: rpms/pcmanx-gtk2/F-10 pcmanx-gtk2.spec,1.11,1.12 Message-ID: <20090306104911.52D8070116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/pcmanx-gtk2/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26454 Modified Files: pcmanx-gtk2.spec Log Message: Fixed wrongly replaced xulrunner version of older changelog Index: pcmanx-gtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/pcmanx-gtk2/F-10/pcmanx-gtk2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- pcmanx-gtk2.spec 6 Mar 2009 08:53:46 -0000 1.11 +++ pcmanx-gtk2.spec 6 Mar 2009 10:48:40 -0000 1.12 @@ -137,7 +137,7 @@ - Rebuild against newer gecko * Thu Sep 25 2008 Tom "spot" Callaway - 0.3.8-2 -- rebuild against xulrunner 1.9.0.7 +- rebuild against xulrunner 1.9.0.2 * Wed Aug 27 2008 Tom "spot" Callaway - 0.3.8-1 - update to 0.3.8 From xhorak at fedoraproject.org Fri Mar 6 10:50:02 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:50:02 +0000 (UTC) Subject: rpms/Miro/F-9 Miro.spec,1.39,1.40 Message-ID: <20090306105002.99A2970116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/Miro/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26692 Modified Files: Miro.spec Log Message: Fixed wrongly replaced xulrunner version of older changelog Index: Miro.spec =================================================================== RCS file: /cvs/pkgs/rpms/Miro/F-9/Miro.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- Miro.spec 6 Mar 2009 10:03:34 -0000 1.39 +++ Miro.spec 6 Mar 2009 10:49:32 -0000 1.40 @@ -99,7 +99,7 @@ * Sun Sep 28 2008 Alex Lancaster - 1.2.7-1 - Update to 1.2.7 -- Rebuild against gecko-libs 1.9.0.7 (#464205) +- Rebuild against gecko-libs 1.9.0.2 (#464205) * Fri Aug 22 2008 Michel Alexandre Salim - 1.2.6-3 - Do not create backup files when patching; the backup files get re-added during the build process From xhorak at fedoraproject.org Fri Mar 6 10:51:08 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:51:08 +0000 (UTC) Subject: rpms/blam/F-9 blam.spec,1.30,1.31 Message-ID: <20090306105108.54C2270116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/blam/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27095 Modified Files: blam.spec Log Message: Fixed wrongly replaced xulrunner version of older changelog Index: blam.spec =================================================================== RCS file: /cvs/pkgs/rpms/blam/F-9/blam.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- blam.spec 6 Mar 2009 09:50:18 -0000 1.30 +++ blam.spec 6 Mar 2009 10:50:38 -0000 1.31 @@ -155,7 +155,7 @@ * Mon Jul 21 2008 Alex Lancaster - 1.8.5-1 - Update to upstream (1.8.5), fixes FTBS (#434382) -- Set gecko version to new xulrunner: 1.9.0.7 +- Set gecko version to new xulrunner: 1.9.0.1 - BR: gecko-devel-unstable - Drop a number of patches which no longer apply - Add new icons to file list. From pbrobinson at fedoraproject.org Fri Mar 6 10:51:00 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Fri, 6 Mar 2009 10:51:00 +0000 (UTC) Subject: rpms/ekiga/devel ekiga.spec,1.76,1.77 Message-ID: <20090306105100.ECFC770116@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/ekiga/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27053 Modified Files: ekiga.spec Log Message: - Remove CELT until the bitstream is stable and can hence intercommunicate between versions Index: ekiga.spec =================================================================== RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- ekiga.spec 4 Mar 2009 07:44:52 -0000 1.76 +++ ekiga.spec 6 Mar 2009 10:50:30 -0000 1.77 @@ -1,7 +1,7 @@ Summary: A Gnome based SIP/H323 teleconferencing application Name: ekiga Version: 3.1.2 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.ekiga.org/ Source0: ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2 License: GPLv2+ @@ -139,13 +139,16 @@ %{_sysconfdir}/gconf/schemas/ekiga.schemas %changelog -* Mon Mar 3 2009 Peter Robinson - 3.1.2-3 +* Fri Mar 6 2009 Peter Robinson - 3.1.2-4 +- Remove CELT until the bitstream is stable and can hence intercommunicate between versions + +* Tue Mar 3 2009 Peter Robinson - 3.1.2-3 - Remove autoconf bits -* Mon Mar 3 2009 Peter Robinson - 3.1.2-2 +* Tue Mar 3 2009 Peter Robinson - 3.1.2-2 - Disable xcap for the moment so ekiga builds -* Mon Mar 3 2009 Peter Robinson - 3.1.2-1 +* Tue Mar 3 2009 Peter Robinson - 3.1.2-1 - Upgrade to the 3.1.2 beta release, enable celt codec, reinstate proper desktop file now its fixed From fabbione at fedoraproject.org Fri Mar 6 10:51:34 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Fri, 6 Mar 2009 10:51:34 +0000 (UTC) Subject: rpms/fence-agents/devel .cvsignore, 1.3, 1.4 fence-agents.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <20090306105134.BE94370116@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/fence-agents/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27138 Modified Files: .cvsignore fence-agents.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fence-agents/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2009 07:33:44 -0000 1.3 +++ .cvsignore 6 Mar 2009 10:51:04 -0000 1.4 @@ -1 +1 @@ -fence-agents-3.0.0.alpha6.tar.gz +fence-agents-3.0.0.alpha7.tar.gz Index: fence-agents.spec =================================================================== RCS file: /cvs/pkgs/rpms/fence-agents/devel/fence-agents.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fence-agents.spec 3 Mar 2009 07:33:44 -0000 1.4 +++ fence-agents.spec 6 Mar 2009 10:51:04 -0000 1.5 @@ -14,12 +14,12 @@ # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html # keep around ready for later user -%define alphatag alpha6 +%define alphatag alpha7 Name: fence-agents Summary: Fence Agents for Red Hat Cluster Version: 3.0.0 -Release: 6%{?alphatag:.%{alphatag}}%{?dist} +Release: 7%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sources.redhat.com/cluster/wiki/ @@ -87,15 +87,6 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -/sbin/chkconfig --add scsi_reserve - -%preun -if [ "$1" = 0 ]; then - /sbin/service scsi_reserve stop >/dev/null 2>&1 - /sbin/chkconfig --del scsi_reserve -fi - %description Red Hat Fence Agents is a collection of scripts to handle remote power management for several devices. @@ -103,15 +94,16 @@ %files %defattr(-,root,root,-) %doc doc/COPYING.* doc/COPYRIGHT doc/README.licence -%{_sysconfdir}/rc.d/init.d/scsi_reserve -%dir %{_sysconfdir}/cluster/cman-notify.d -%{_sysconfdir}/cluster/cman-notify.d/scsi_reserve_notify %{_sbindir}/fence* %{_datadir}/fence %{_datadir}/snmp/mibs/* %{_mandir}/man8/fence* %changelog +* Fri Mar 6 2009 Fabio M. Di Nitto - 3.0.0-7.alpha7 +- New upstream release. +- Drop fence_scsi init stuff that's not required anylonger. + * Tue Mar 3 2009 Fabio M. Di Nitto - 3.0.0-6.alpha6 - New upstream release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fence-agents/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2009 07:33:44 -0000 1.3 +++ sources 6 Mar 2009 10:51:04 -0000 1.4 @@ -1 +1 @@ -ce58a2548d880d709bc22777179acab5 fence-agents-3.0.0.alpha6.tar.gz +e88f4935e04540bb774b973a90e34d58 fence-agents-3.0.0.alpha7.tar.gz From xhorak at fedoraproject.org Fri Mar 6 10:52:26 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:52:26 +0000 (UTC) Subject: rpms/blam/F-10 blam.spec,1.29,1.30 Message-ID: <20090306105226.5263D70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/blam/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27488 Modified Files: blam.spec Log Message: Fixed wrongly replaced xulrunner version of older changelog Index: blam.spec =================================================================== RCS file: /cvs/pkgs/rpms/blam/F-10/blam.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- blam.spec 6 Mar 2009 08:33:20 -0000 1.29 +++ blam.spec 6 Mar 2009 10:51:56 -0000 1.30 @@ -158,7 +158,7 @@ * Mon Jul 21 2008 Alex Lancaster - 1.8.5-1 - Update to upstream (1.8.5), fixes FTBS (#434382) -- Set gecko version to new xulrunner: 1.9.0.7 +- Set gecko version to new xulrunner: 1.9.0.1 - BR: gecko-devel-unstable - Drop a number of patches which no longer apply - Add new icons to file list. From xhorak at fedoraproject.org Fri Mar 6 10:53:49 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:53:49 +0000 (UTC) Subject: rpms/gnome-python2-extras/F-10 gnome-python2-extras.spec,1.38,1.39 Message-ID: <20090306105349.1BB3570116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/gnome-python2-extras/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27871 Modified Files: gnome-python2-extras.spec Log Message: Fixed wrongly replaced xulrunner version of older changelog Index: gnome-python2-extras.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-python2-extras/F-10/gnome-python2-extras.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- gnome-python2-extras.spec 6 Mar 2009 08:46:06 -0000 1.38 +++ gnome-python2-extras.spec 6 Mar 2009 10:53:18 -0000 1.39 @@ -223,7 +223,7 @@ - Add Requires: gnome-python2-gnome. * Fri Oct 03 2008 Matthew Barnes - 2.19.1-17 -* Rebuild against gecko-devel-unstable-1.9.0.7. +* Rebuild against gecko-devel-unstable-1.9.0.2. * Wed Jul 23 2008 Tom "spot" Callaway - 2.19.1-16 - fix license tag From xhorak at fedoraproject.org Fri Mar 6 10:54:29 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:54:29 +0000 (UTC) Subject: rpms/gnome-python2-extras/F-9 gnome-python2-extras.spec,1.36,1.37 Message-ID: <20090306105429.3305B70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/gnome-python2-extras/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28025 Modified Files: gnome-python2-extras.spec Log Message: Fixed wrongly replaced xulrunner version of older changelog Index: gnome-python2-extras.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-python2-extras/F-9/gnome-python2-extras.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- gnome-python2-extras.spec 6 Mar 2009 09:56:49 -0000 1.36 +++ gnome-python2-extras.spec 6 Mar 2009 10:53:58 -0000 1.37 @@ -205,7 +205,7 @@ - Rebuild against newer gecko * Fri Jul 18 2008 Paul W. Frields - 2.19.1-17.fc9 -- Rebuild against new xulrunner (1.9.0.7) and fix dependencies +- Rebuild against new xulrunner (1.9.0.1) and fix dependencies * Fri Jun 20 2008 Martin Stransky - 2.19.1-16.fc9 - Rebuild against new gecko-libs 1.9 (xulrunner) From xhorak at fedoraproject.org Fri Mar 6 10:55:06 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:55:06 +0000 (UTC) Subject: rpms/mozvoikko/F-9 mozvoikko.spec,1.7,1.8 Message-ID: <20090306105506.89E0870116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/mozvoikko/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28197 Modified Files: mozvoikko.spec Log Message: Fixed wrongly replaced xulrunner version of older changelog Index: mozvoikko.spec =================================================================== RCS file: /cvs/pkgs/rpms/mozvoikko/F-9/mozvoikko.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mozvoikko.spec 6 Mar 2009 10:04:42 -0000 1.7 +++ mozvoikko.spec 6 Mar 2009 10:54:36 -0000 1.8 @@ -87,7 +87,7 @@ * Sat Aug 30 2008 Ville-Pekka Vainio - 0.9.5-2 - Fix the xulrunner requires: - - Add define gecko_ver 1.9.0.7 + - Add define gecko_ver 1.9.0.1 - Add Requires: gecko-libs = gecko_ver - Add BuildRequires: gecko-devel-unstable = gecko_ver - Remove all actual xulrunner requires From xhorak at fedoraproject.org Fri Mar 6 10:55:40 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 10:55:40 +0000 (UTC) Subject: rpms/totem/F-9 totem.spec,1.196,1.197 Message-ID: <20090306105540.A1A9270116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/totem/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28431 Modified Files: totem.spec Log Message: Fixed wrongly replaced xulrunner version of older changelog Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/F-9/totem.spec,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- totem.spec 6 Mar 2009 10:08:05 -0000 1.196 +++ totem.spec 6 Mar 2009 10:55:10 -0000 1.197 @@ -455,7 +455,7 @@ - Add patch to make FLV videos thumbnail (#449279) * Fri Jul 18 2008 Martin Stransky - 2.23.2-5 -- Rebuild against xulrunner 1.9.0.7 and fixed gecko dependency +- Rebuild against xulrunner 1.9.0.1 and fixed gecko dependency * Wed Jun 18 2008 Owen Taylor - 2.23.2-4 - Rebuild against xulrunner 1.9 final From fabbione at fedoraproject.org Fri Mar 6 10:59:39 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Fri, 6 Mar 2009 10:59:39 +0000 (UTC) Subject: rpms/resource-agents/devel .cvsignore, 1.3, 1.4 resource-agents.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20090306105939.E90A570116@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/resource-agents/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29392 Modified Files: .cvsignore resource-agents.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/resource-agents/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2009 06:54:30 -0000 1.3 +++ .cvsignore 6 Mar 2009 10:59:09 -0000 1.4 @@ -1 +1 @@ -resource-agents-3.0.0.alpha6.tar.gz +resource-agents-3.0.0.alpha7.tar.gz Index: resource-agents.spec =================================================================== RCS file: /cvs/pkgs/rpms/resource-agents/devel/resource-agents.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- resource-agents.spec 3 Mar 2009 06:54:30 -0000 1.3 +++ resource-agents.spec 6 Mar 2009 10:59:09 -0000 1.4 @@ -14,12 +14,12 @@ # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html # keep around ready for later user -%define alphatag alpha6 +%define alphatag alpha7 Name: resource-agents Summary: Open Source HA Resource Agents for Red Hat Cluster Version: 3.0.0 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Release: 6%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sources.redhat.com/cluster/wiki/ @@ -72,6 +72,9 @@ %{_datadir}/cluster %changelog +* Fri Mar 6 2009 Fabio M. Di Nitto - 3.0.0-6.alpha7 +- New upstream release. + * Tue Mar 3 2009 Fabio M. Di Nitto - 3.0.0-5.alpha6 - New upstream release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/resource-agents/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2009 06:54:30 -0000 1.3 +++ sources 6 Mar 2009 10:59:09 -0000 1.4 @@ -1 +1 @@ -cc66511f122f21c2936e63ec34fef7b7 resource-agents-3.0.0.alpha6.tar.gz +22fb4ebc6c8360fd5dc74299ee04a903 resource-agents-3.0.0.alpha7.tar.gz From berrange at fedoraproject.org Fri Mar 6 11:02:14 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Fri, 6 Mar 2009 11:02:14 +0000 (UTC) Subject: rpms/mingw32-gtk-vnc/devel gtk-vnc-0.3.8-relative-mouse.patch, NONE, 1.1 mingw32-gtk-vnc.spec, 1.2, 1.3 Message-ID: <20090306110214.2D55870116@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/mingw32-gtk-vnc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30078 Modified Files: mingw32-gtk-vnc.spec Added Files: gtk-vnc-0.3.8-relative-mouse.patch Log Message: Pull in patch for relative mouse handling from native branch gtk-vnc-0.3.8-relative-mouse.patch: --- NEW FILE gtk-vnc-0.3.8-relative-mouse.patch --- commit 85279b75576fcce7465754a8cc7b21cb6db5c355 Author: Daniel P. Berrange Date: Thu Feb 26 13:29:16 2009 +0000 Change pointer grab to allow movement across entire desktop and fix warping of pointer at desktop edges, to make relative mouse mode work correctly. Document what's going on with more comments. diff --git a/src/vncdisplay.c b/src/vncdisplay.c index 5a25b91..f1082da 100644 --- a/src/vncdisplay.c +++ b/src/vncdisplay.c @@ -439,14 +439,22 @@ static void do_pointer_grab(VncDisplay *obj, gboolean quiet) if (!priv->grab_keyboard) do_keyboard_grab(obj, quiet); + /* + * For relative mouse to work correctly when grabbed we need to + * allow the pointer to move anywhere on the local desktop, so + * use NULL for the 'confine_to' argument. Furthermore we need + * the coords to be reported to our VNC window, regardless of + * what window the pointer is actally over, so use 'FALSE' for + * 'owner_events' parameter + */ gdk_pointer_grab(GTK_WIDGET(obj)->window, - TRUE, + FALSE, /* All events to come to our window directly */ GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK | GDK_SCROLL_MASK, - GTK_WIDGET(obj)->window, + NULL, /* Allow cursor to move over entire desktop */ priv->remote_cursor ? priv->remote_cursor : priv->null_cursor, GDK_CURRENT_TIME); priv->in_pointer_grab = TRUE; @@ -551,15 +559,33 @@ static gboolean scroll_event(GtkWidget *widget, GdkEventScroll *scroll) return TRUE; } + +/* + * There are several scenarios to considier when handling client + * mouse motion events: + * + * - Mouse in relative mode + centered rendering of desktop + * - Mouse in relative mode + scaled rendering of desktop + * - Mouse in absolute mode + centered rendering of desktop + * - Mouse in absolute mode + scaled rendering of desktop + * + * Once scaled / offset, absolute mode is easy. + * + * Relative mode has a couple of special complications + * + * - Need to turn client absolute events into a delta + * - Need to warp local pointer to avoid hitting a wall + */ static gboolean motion_event(GtkWidget *widget, GdkEventMotion *motion) { VncDisplayPrivate *priv = VNC_DISPLAY(widget)->priv; - int dx, dy; int ww, wh; if (priv->gvnc == NULL || !gvnc_is_initialized(priv->gvnc)) return FALSE; + /* In relative mode, only move the server mouse pointer + * if the client grab is active */ if (!priv->absolute && !priv->in_pointer_grab) return FALSE; @@ -568,11 +594,14 @@ static gboolean motion_event(GtkWidget *widget, GdkEventMotion *motion) gdk_drawable_get_size(widget->window, &ww, &wh); + /* First apply adjustments to the coords in the motion event */ if (priv->allow_scaling) { double sx, sy; sx = (double)priv->fb.width / (double)ww; sy = (double)priv->fb.height / (double)wh; + /* Scaling the desktop, so scale the mouse coords + * by same ratio */ motion->x *= sx; motion->y *= sy; } else { @@ -583,21 +612,28 @@ static gboolean motion_event(GtkWidget *widget, GdkEventMotion *motion) if (wh > priv->fb.height) mh = (wh - priv->fb.height) / 2; + /* Not scaling, drawing the desktop centered + * in the larger window, so offset the mouse + * coords to match centering */ motion->x -= mw; motion->y -= mh; - - if (motion->x < 0 || motion->x >= priv->fb.width || - motion->y < 0 || motion->y >= priv->fb.height) - return FALSE; } - if (!priv->absolute && priv->in_pointer_grab) { + /* Next adjust the real client pointer */ + if (!priv->absolute) { GdkDrawable *drawable = GDK_DRAWABLE(widget->window); GdkDisplay *display = gdk_drawable_get_display(drawable); GdkScreen *screen = gdk_drawable_get_screen(drawable); int x = (int)motion->x_root; int y = (int)motion->y_root; + /* In relative mode check to see if client pointer hit + * one of the screen edges, and if so move it back by + * 200 pixels. This is important because the pointer + * in the server doesn't correspond 1-for-1, and so + * may still be only half way across the screen. Without + * this warp, the server pointer would thus appear to hit + * an invisible wall */ if (x == 0) x += 200; if (y == 0) y += 200; if (x == (gdk_screen_get_width(screen) - 1)) x -= 200; @@ -611,11 +647,20 @@ static gboolean motion_event(GtkWidget *widget, GdkEventMotion *motion) } } + /* Finally send the event to server */ if (priv->last_x != -1) { + int dx, dy; if (priv->absolute) { dx = (int)motion->x; dy = (int)motion->y; + + /* Drop out of bounds motion to avoid upsetting + * the server */ + if (dx < 0 || dx >= priv->fb.width || + dy < 0 || dy >= priv->fb.height) + return FALSE; } else { + /* Just send the delta since last motion event */ dx = (int)motion->x + 0x7FFF - priv->last_x; dy = (int)motion->y + 0x7FFF - priv->last_y; } Index: mingw32-gtk-vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gtk-vnc/devel/mingw32-gtk-vnc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mingw32-gtk-vnc.spec 26 Feb 2009 01:09:45 -0000 1.2 +++ mingw32-gtk-vnc.spec 6 Mar 2009 11:01:43 -0000 1.3 @@ -8,13 +8,16 @@ Name: mingw32-gtk-vnc Version: 0.3.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows port of VNC client GTK widget License: LGPLv2+ Group: Development/Libraries URL: http://sourceforge.net/projects/gtk-vnc Source0: http://downloads.sourceforge.net/gtk-vnc/gtk-vnc-%{version}.tar.gz +Patch1: gtk-vnc-%{version}-relative-mouse.patch +# XXX need to add the SASL patches too, but this is +# blocking on a mingw32-cyrus-sasl port or equiv BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -41,6 +44,7 @@ %prep %setup -q -n gtk-vnc-%{version} +%patch1 -p1 %build @@ -73,6 +77,9 @@ %changelog +* Fri Mar 6 2009 Daniel P. Berrange - 0.3.8-5 +- Fix relative mouse handling to avoid 'invisible wall' + * Wed Feb 25 2009 Fedora Release Engineering - 0.3.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From sharkcz at fedoraproject.org Fri Mar 6 11:11:37 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Fri, 6 Mar 2009 11:11:37 +0000 (UTC) Subject: rpms/python-openoffice/devel python-openoffice.spec,1.2,1.3 Message-ID: <20090306111137.367C070116@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/python-openoffice/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31883 Modified Files: python-openoffice.spec Log Message: * Fri Mar 6 2009 Dan Hor??k 0.1-0.3.20090228svn34 - check %rhel for the ExcludeArch tag - update to new upstream snapshot Index: python-openoffice.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-openoffice/devel/python-openoffice.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-openoffice.spec 26 Feb 2009 22:42:32 -0000 1.2 +++ python-openoffice.spec 6 Mar 2009 11:11:05 -0000 1.3 @@ -1,21 +1,23 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define svnrev 33 -%define svndate 20080929 +%define svnrev 34 +%define svndate 20090228 %define module openoffice Name: python-%{module} Version: 0.1 -Release: 0.2.%{svndate}svn%{svnrev}%{?dist} +Release: 0.3.%{svndate}svn%{svnrev}%{?dist} Summary: Python libraries for interacting with OpenOffice.org Group: Development/Languages License: GPLv3 URL: http://openoffice-python.origo.ethz.ch/ -Source0: http://download.origo.ethz.ch/openoffice-python/807/%{module}-%{version}-r%{svnrev}-%{svndate}.tar.bz2 -#Source1: http://download.origo.ethz.ch/openoffice-python/807/%{module}.interact-%{version}-r%{svnrev}-%{svndate}.tar.bz2 +Source0: http://download.origo.ethz.ch/openoffice-python/807/%{module}-python-%{version}-r%{svnrev}-%{svndate}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +%if 0%{?rhel} +ExcludeArch: ppc +%endif BuildRequires: python-devel Requires: openoffice.org-pyuno @@ -27,14 +29,14 @@ %prep -%setup -q -n %{module}-%{version}-r%{svnrev}-%{svndate} +%setup -q -n %{module}-python-%{version}-r%{svnrev}-%{svndate} # remove exec perms for docs chmod a-x sample-scripts/* # remove the shebang line sed -i -e '1d' %{module}/streams.py -sed -i -e '1d' %{module}/interact/__init__.py +sed -i -e '1d' %{module}/interact.py %build @@ -57,8 +59,15 @@ %changelog +* Fri Mar 6 2009 Dan Hor??k 0.1-0.3.20090228svn34 +- check %%rhel for the ExcludeArch tag +- update to new upstream snapshot + * Thu Feb 26 2009 Fedora Release Engineering - 0.1-0.2.20080929svn33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Wed Dec 10 2008 Dan Hor??k 0.1-0.1.20080929svn33.1 +- there is no openoffice.org in RHEL 5 on ppc + * Tue Dec 2 2008 Dan Hor??k 0.1-0.1.20080929svn33 - initial Fedora version From sharkcz at fedoraproject.org Fri Mar 6 11:12:54 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Fri, 6 Mar 2009 11:12:54 +0000 (UTC) Subject: rpms/python-openoffice/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <20090306111254.D176C70116@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/python-openoffice/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32216 Modified Files: .cvsignore sources Log Message: * Fri Mar 6 2009 Dan Hor??k 0.1-0.3.20090228svn34 - check %rhel for the ExcludeArch tag - update to new upstream snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-openoffice/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Dec 2008 07:11:21 -0000 1.2 +++ .cvsignore 6 Mar 2009 11:12:24 -0000 1.3 @@ -1 +1 @@ -openoffice-0.1-r33-20080929.tar.bz2 +openoffice-python-0.1-r34-20090228.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-openoffice/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Dec 2008 07:11:21 -0000 1.2 +++ sources 6 Mar 2009 11:12:24 -0000 1.3 @@ -1 +1 @@ -564cbd2305655846e694059ac40e68c2 openoffice-0.1-r33-20080929.tar.bz2 +a93b4fbf8c1338cfb12d59b5fea8e22c openoffice-python-0.1-r34-20090228.tar.bz2 From mgrepl at fedoraproject.org Fri Mar 6 11:17:07 2009 From: mgrepl at fedoraproject.org (Miroslav Grepl) Date: Fri, 6 Mar 2009 11:17:07 +0000 (UTC) Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.143, 1.144 selinux-policy.spec, 1.777, 1.778 Message-ID: <20090306111707.8F36370116@cvs1.fedora.phx.redhat.com> Author: mgrepl Update of /cvs/extras/rpms/selinux-policy/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv610 Modified Files: policy-20080710.patch selinux-policy.spec Log Message: - Fix wine labeling policy-20080710.patch: Index: policy-20080710.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- policy-20080710.patch 5 Mar 2009 13:35:59 -0000 1.143 +++ policy-20080710.patch 6 Mar 2009 11:17:04 -0000 1.144 @@ -6351,8 +6351,8 @@ files_read_etc_runtime_files(webalizer_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-3.5.13/policy/modules/apps/wine.fc --- nsaserefpolicy/policy/modules/apps/wine.fc 2008-10-17 14:49:14.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/apps/wine.fc 2009-02-10 15:07:15.000000000 +0100 -@@ -1,4 +1,8 @@ ++++ serefpolicy-3.5.13/policy/modules/apps/wine.fc 2009-03-06 09:53:41.000000000 +0100 +@@ -1,4 +1,15 @@ -/usr/bin/wine -- gen_context(system_u:object_r:wine_exec_t,s0) +HOME_DIR/cxoffice/bin/wine.+ -- gen_context(system_u:object_r:wine_exec_t,s0) + @@ -6361,6 +6361,13 @@ +/opt/cxoffice/bin/wine.* -- gen_context(system_u:object_r:wine_exec_t,s0) +/opt/picasa/wine/bin/wine.* -- gen_context(system_u:object_r:wine_exec_t,s0) +/opt/google/picasa(/.*)?/bin/wine.* -- gen_context(system_u:object_r:wine_exec_t,s0) ++ ++/usr/bin/msiexec -- gen_context(system_u:object_r:wine_exec_t,s0) ++/usr/bin/notepad -- gen_context(system_u:object_r:wine_exec_t,s0) ++/usr/bin/regsvr32 -- gen_context(system_u:object_r:wine_exec_t,s0) ++/usr/bin/regedit -- gen_context(system_u:object_r:wine_exec_t,s0) ++/usr/bin/uninstaller -- gen_context(system_u:object_r:wine_exec_t,s0) ++/usr/bin/progman -- gen_context(system_u:object_r:wine_exec_t,s0) -/opt/cxoffice/bin/wine -- gen_context(system_u:object_r:wine_exec_t,s0) -/opt/picasa/wine/bin/wine -- gen_context(system_u:object_r:wine_exec_t,s0) @@ -16391,7 +16398,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.5.13/policy/modules/services/dovecot.te --- nsaserefpolicy/policy/modules/services/dovecot.te 2008-10-17 14:49:11.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/services/dovecot.te 2009-02-25 19:29:32.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/services/dovecot.te 2009-03-06 09:53:17.000000000 +0100 @@ -15,12 +15,21 @@ domain_entry_file(dovecot_auth_t, dovecot_auth_exec_t) role system_r types dovecot_auth_t; @@ -16508,7 +16515,7 @@ files_read_usr_symlinks(dovecot_auth_t) files_search_tmp(dovecot_auth_t) files_read_var_lib_files(dovecot_t) -@@ -185,5 +217,55 @@ +@@ -185,5 +217,59 @@ ') optional_policy(` @@ -16524,7 +16531,7 @@ +optional_policy(` + postfix_manage_private_sockets(dovecot_auth_t) + postfix_search_spool(dovecot_auth_t) -+') + ') + +# for gssapi (kerberos) +userdom_list_unpriv_users_tmp(dovecot_auth_t) @@ -16540,6 +16547,10 @@ +allow dovecot_deliver_t dovecot_etc_t:file read_file_perms; +allow dovecot_deliver_t dovecot_var_run_t:dir list_dir_perms; + ++manage_dirs_pattern(dovecot_deliver_t, dovecot_spool_t, dovecot_spool_t) ++manage_files_pattern(dovecot_deliver_t, dovecot_spool_t, dovecot_spool_t) ++manage_lnk_files_pattern(dovecot_deliver_t, dovecot_spool_t, dovecot_spool_t) ++ +kernel_read_all_sysctls(dovecot_deliver_t) +kernel_read_system_state(dovecot_deliver_t) + @@ -16563,7 +16574,7 @@ + +optional_policy(` + mta_manage_spool(dovecot_deliver_t) - ') ++') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.if serefpolicy-3.5.13/policy/modules/services/exim.if --- nsaserefpolicy/policy/modules/services/exim.if 2008-10-17 14:49:11.000000000 +0200 @@ -16788,10 +16799,51 @@ + spamassassin_exec(exim_t) + spamassassin_exec_client(exim_t) ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.fc serefpolicy-3.5.13/policy/modules/services/fetchmail.fc +--- nsaserefpolicy/policy/modules/services/fetchmail.fc 2008-10-17 14:49:11.000000000 +0200 ++++ serefpolicy-3.5.13/policy/modules/services/fetchmail.fc 2009-03-05 15:02:41.000000000 +0100 +@@ -11,9 +11,11 @@ + + /usr/bin/fetchmail -- gen_context(system_u:object_r:fetchmail_exec_t,s0) + ++ + # + # /var + # + ++/var/log/fetchmail\.log -- gen_context(system_u:object_r:fetchmail_log_t,s0) + /var/run/fetchmail/.* -- gen_context(system_u:object_r:fetchmail_var_run_t,s0) + /var/mail/\.fetchmail-UIDL-cache -- gen_context(system_u:object_r:fetchmail_uidl_cache_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.if serefpolicy-3.5.13/policy/modules/services/fetchmail.if --- nsaserefpolicy/policy/modules/services/fetchmail.if 2008-10-17 14:49:11.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/services/fetchmail.if 2009-02-10 15:07:15.000000000 +0100 -@@ -21,10 +21,10 @@ ++++ serefpolicy-3.5.13/policy/modules/services/fetchmail.if 2009-03-05 15:06:34.000000000 +0100 +@@ -1,5 +1,25 @@ + ## Remote-mail retrieval and forwarding utility + ++####################################### ++## ++## Allow the specified domain to append ++## fetchmail log files. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`fetchmail_append_log',` ++ gen_require(` ++ type fetchmail_log_t; ++ ') ++ ++ logging_search_logs($1) ++ append_files_pattern($1, fetchmail_log_t, fetchmail_log_t) ++') ++ + ######################################## + ## + ## All of the rules required to administrate +@@ -21,10 +41,10 @@ ps_process_pattern($1, fetchmail_t) files_list_etc($1) @@ -16807,8 +16859,28 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-3.5.13/policy/modules/services/fetchmail.te --- nsaserefpolicy/policy/modules/services/fetchmail.te 2008-10-17 14:49:13.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/services/fetchmail.te 2009-02-10 15:07:15.000000000 +0100 -@@ -91,6 +91,10 @@ ++++ serefpolicy-3.5.13/policy/modules/services/fetchmail.te 2009-03-05 15:01:19.000000000 +0100 +@@ -19,6 +19,9 @@ + type fetchmail_uidl_cache_t; + files_type(fetchmail_uidl_cache_t) + ++type fetchmail_log_t; ++logging_log_file(fetchmail_log_t) ++ + ######################################## + # + # Local policy +@@ -40,6 +43,9 @@ + manage_files_pattern(fetchmail_t, fetchmail_var_run_t, fetchmail_var_run_t) + files_pid_filetrans(fetchmail_t, fetchmail_var_run_t, file) + ++manage_files_pattern(fetchmail_t, fetchmail_log_t, fetchmail_log_t) ++logging_log_filetrans(fetchmail_t,fetchmail_log_t,file) ++ + kernel_read_kernel_sysctls(fetchmail_t) + kernel_list_proc(fetchmail_t) + kernel_getattr_proc_files(fetchmail_t) +@@ -91,6 +97,10 @@ ') optional_policy(` @@ -23744,7 +23816,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.5.13/policy/modules/services/procmail.te --- nsaserefpolicy/policy/modules/services/procmail.te 2008-10-17 14:49:13.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/services/procmail.te 2009-02-10 15:07:15.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/services/procmail.te 2009-03-05 15:08:42.000000000 +0100 @@ -14,6 +14,10 @@ type procmail_tmp_t; files_tmp_file(procmail_tmp_t) @@ -23789,7 +23861,18 @@ mta_manage_spool(procmail_t) ifdef(`hide_broken_symptoms',` -@@ -117,11 +125,13 @@ +@@ -103,6 +111,10 @@ + ') + + optional_policy(` ++ fetchmail_append_log(procmail_t) ++') ++ ++optional_policy(` + munin_dontaudit_search_lib(procmail_t) + ') + +@@ -117,11 +129,13 @@ optional_policy(` pyzor_domtrans(procmail_t) @@ -23803,7 +23886,7 @@ sendmail_rw_tcp_sockets(procmail_t) sendmail_rw_unix_stream_sockets(procmail_t) ') -@@ -130,7 +140,16 @@ +@@ -130,7 +144,16 @@ corenet_udp_bind_generic_port(procmail_t) corenet_dontaudit_udp_bind_all_ports(procmail_t) Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v retrieving revision 1.777 retrieving revision 1.778 diff -u -r1.777 -r1.778 --- selinux-policy.spec 26 Feb 2009 15:04:21 -0000 1.777 +++ selinux-policy.spec 6 Mar 2009 11:17:06 -0000 1.778 @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.5.13 -Release: 47%{?dist} +Release: 48%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -460,6 +460,10 @@ %endif %changelog +* Fri March 6 2009 Miroslav Grepl 3.5.13-48 +- Fix pcscd policy +- Allow alsa to read hardware state information + * Thu Feb 26 2009 Miroslav Grepl 3.5.13-47 - Allow ktalkd to write to terminals - Fix qemu labeling From mgrepl at fedoraproject.org Fri Mar 6 11:22:55 2009 From: mgrepl at fedoraproject.org (Miroslav Grepl) Date: Fri, 6 Mar 2009 11:22:55 +0000 (UTC) Subject: rpms/selinux-policy/F-10 selinux-policy.spec,1.778,1.779 Message-ID: <20090306112255.CAF1B70116@cvs1.fedora.phx.redhat.com> Author: mgrepl Update of /cvs/extras/rpms/selinux-policy/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1692 Modified Files: selinux-policy.spec Log Message: - New release of selinux-policy Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v retrieving revision 1.778 retrieving revision 1.779 diff -u -r1.778 -r1.779 --- selinux-policy.spec 6 Mar 2009 11:17:06 -0000 1.778 +++ selinux-policy.spec 6 Mar 2009 11:22:25 -0000 1.779 @@ -460,7 +460,7 @@ %endif %changelog -* Fri March 6 2009 Miroslav Grepl 3.5.13-48 +* Fri Mar 6 2009 Miroslav Grepl 3.5.13-48 - Fix pcscd policy - Allow alsa to read hardware state information From sharkcz at fedoraproject.org Fri Mar 6 11:25:05 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Fri, 6 Mar 2009 11:25:05 +0000 (UTC) Subject: rpms/python-openoffice/F-10 .cvsignore, 1.2, 1.3 python-openoffice.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090306112505.6341B70116@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/python-openoffice/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2318 Modified Files: .cvsignore python-openoffice.spec sources Log Message: * Fri Mar 6 2009 Dan Hor??k 0.1-0.2.20090228svn34 - check %rhel for the ExcludeArch tag - update to new upstream snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-openoffice/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Dec 2008 07:23:29 -0000 1.2 +++ .cvsignore 6 Mar 2009 11:24:34 -0000 1.3 @@ -1 +1 @@ -openoffice-0.1-r33-20080929.tar.bz2 +openoffice-python-0.1-r34-20090228.tar.bz2 Index: python-openoffice.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-openoffice/F-10/python-openoffice.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-openoffice.spec 8 Dec 2008 07:23:29 -0000 1.1 +++ python-openoffice.spec 6 Mar 2009 11:24:35 -0000 1.2 @@ -1,21 +1,23 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define svnrev 33 -%define svndate 20080929 +%define svnrev 34 +%define svndate 20090228 %define module openoffice Name: python-%{module} Version: 0.1 -Release: 0.1.%{svndate}svn%{svnrev}%{?dist} +Release: 0.2.%{svndate}svn%{svnrev}%{?dist} Summary: Python libraries for interacting with OpenOffice.org Group: Development/Languages License: GPLv3 URL: http://openoffice-python.origo.ethz.ch/ -Source0: http://download.origo.ethz.ch/openoffice-python/807/%{module}-%{version}-r%{svnrev}-%{svndate}.tar.bz2 -#Source1: http://download.origo.ethz.ch/openoffice-python/807/%{module}.interact-%{version}-r%{svnrev}-%{svndate}.tar.bz2 +Source0: http://download.origo.ethz.ch/openoffice-python/807/%{module}-python-%{version}-r%{svnrev}-%{svndate}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +%if 0%{?rhel} +ExcludeArch: ppc +%endif BuildRequires: python-devel Requires: openoffice.org-pyuno @@ -27,14 +29,14 @@ %prep -%setup -q -n %{module}-%{version}-r%{svnrev}-%{svndate} +%setup -q -n %{module}-python-%{version}-r%{svnrev}-%{svndate} # remove exec perms for docs chmod a-x sample-scripts/* # remove the shebang line sed -i -e '1d' %{module}/streams.py -sed -i -e '1d' %{module}/interact/__init__.py +sed -i -e '1d' %{module}/interact.py %build @@ -57,5 +59,12 @@ %changelog +* Fri Mar 6 2009 Dan Hor??k 0.1-0.2.20090228svn34 +- check %%rhel for the ExcludeArch tag +- update to new upstream snapshot + +* Wed Dec 10 2008 Dan Hor??k 0.1-0.1.20080929svn33.1 +- there is no openoffice.org in RHEL 5 on ppc + * Tue Dec 2 2008 Dan Hor??k 0.1-0.1.20080929svn33 - initial Fedora version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-openoffice/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Dec 2008 07:23:29 -0000 1.2 +++ sources 6 Mar 2009 11:24:35 -0000 1.3 @@ -1 +1 @@ -564cbd2305655846e694059ac40e68c2 openoffice-0.1-r33-20080929.tar.bz2 +a93b4fbf8c1338cfb12d59b5fea8e22c openoffice-python-0.1-r34-20090228.tar.bz2 From kraxel at fedoraproject.org Fri Mar 6 11:27:22 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Fri, 6 Mar 2009 11:27:22 +0000 (UTC) Subject: rpms/xen/devel xen.modules,1.2,1.3 xen.spec,1.233,1.234 Message-ID: <20090306112722.4774770116@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2895 Modified Files: xen.modules xen.spec Log Message: keep blktapctrl turned off by default, fix xen.modules tyops Index: xen.modules =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.modules,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xen.modules 6 Mar 2009 09:22:26 -0000 1.2 +++ xen.modules 6 Mar 2009 11:26:51 -0000 1.3 @@ -5,7 +5,6 @@ test -f /proc/xen/capabilities || exit 0 grep -q "control_d" /proc/xen/capabilities || exit 0 -for module in evtchn blkbk netbk -do - modprobe $m >/dev/null 2>&1 +for module in evtchn blkbk netbk; do + modprobe ${module} >/dev/null 2>&1 done Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.233 retrieving revision 1.234 diff -u -r1.233 -r1.234 --- xen.spec 6 Mar 2009 09:22:27 -0000 1.233 +++ xen.spec 6 Mar 2009 11:26:51 -0000 1.234 @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.3.1 -%define base_release 8 +%define base_release 9 # Hypervisor ABI %define hv_abi 3.3 @@ -315,7 +315,7 @@ %post runtime /sbin/chkconfig --add xenconsoled /sbin/chkconfig --add xenstored -/sbin/chkconfig --add blktapctrl +#/sbin/chkconfig --add blktapctrl if [ $1 != 0 ]; then service xenconsoled condrestart @@ -500,10 +500,11 @@ %{_libdir}/*.a %changelog -* Fri Mar 6 2009 Gerd Hoffmann - 3.3.1-8 +* Fri Mar 6 2009 Gerd Hoffmann - 3.3.1-9 - fix xen.modules init script for pv_ops kernel. - stick rpm release tag into XEN_VENDORVERSION. - use %{ix86} macro in ExclusiveArch. +- keep blktapctrl turned off by default. * Mon Mar 2 2009 Gerd Hoffmann - 3.3.1-7 - fix xenstored init script for pv_ops kernel. From sharkcz at fedoraproject.org Fri Mar 6 11:36:57 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Fri, 6 Mar 2009 11:36:57 +0000 (UTC) Subject: rpms/python-openoffice/F-9 .cvsignore, 1.2, 1.3 python-openoffice.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090306113657.B5BD170116@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/python-openoffice/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4910 Modified Files: .cvsignore python-openoffice.spec sources Log Message: * Fri Mar 6 2009 Dan Hor??k 0.1-0.2.20090228svn34 - check %rhel for the ExcludeArch tag - update to new upstream snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-openoffice/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Dec 2008 07:25:43 -0000 1.2 +++ .cvsignore 6 Mar 2009 11:36:25 -0000 1.3 @@ -1 +1 @@ -openoffice-0.1-r33-20080929.tar.bz2 +openoffice-python-0.1-r34-20090228.tar.bz2 Index: python-openoffice.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-openoffice/F-9/python-openoffice.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-openoffice.spec 8 Dec 2008 07:25:43 -0000 1.1 +++ python-openoffice.spec 6 Mar 2009 11:36:25 -0000 1.2 @@ -1,21 +1,23 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define svnrev 33 -%define svndate 20080929 +%define svnrev 34 +%define svndate 20090228 %define module openoffice Name: python-%{module} Version: 0.1 -Release: 0.1.%{svndate}svn%{svnrev}%{?dist} +Release: 0.2.%{svndate}svn%{svnrev}%{?dist} Summary: Python libraries for interacting with OpenOffice.org Group: Development/Languages License: GPLv3 URL: http://openoffice-python.origo.ethz.ch/ -Source0: http://download.origo.ethz.ch/openoffice-python/807/%{module}-%{version}-r%{svnrev}-%{svndate}.tar.bz2 -#Source1: http://download.origo.ethz.ch/openoffice-python/807/%{module}.interact-%{version}-r%{svnrev}-%{svndate}.tar.bz2 +Source0: http://download.origo.ethz.ch/openoffice-python/807/%{module}-python-%{version}-r%{svnrev}-%{svndate}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +%if 0%{?rhel} +ExcludeArch: ppc +%endif BuildRequires: python-devel Requires: openoffice.org-pyuno @@ -27,14 +29,14 @@ %prep -%setup -q -n %{module}-%{version}-r%{svnrev}-%{svndate} +%setup -q -n %{module}-python-%{version}-r%{svnrev}-%{svndate} # remove exec perms for docs chmod a-x sample-scripts/* # remove the shebang line sed -i -e '1d' %{module}/streams.py -sed -i -e '1d' %{module}/interact/__init__.py +sed -i -e '1d' %{module}/interact.py %build @@ -57,5 +59,12 @@ %changelog +* Fri Mar 6 2009 Dan Hor??k 0.1-0.2.20090228svn34 +- check %%rhel for the ExcludeArch tag +- update to new upstream snapshot + +* Wed Dec 10 2008 Dan Hor??k 0.1-0.1.20080929svn33.1 +- there is no openoffice.org in RHEL 5 on ppc + * Tue Dec 2 2008 Dan Hor??k 0.1-0.1.20080929svn33 - initial Fedora version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-openoffice/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Dec 2008 07:25:43 -0000 1.2 +++ sources 6 Mar 2009 11:36:26 -0000 1.3 @@ -1 +1 @@ -564cbd2305655846e694059ac40e68c2 openoffice-0.1-r33-20080929.tar.bz2 +a93b4fbf8c1338cfb12d59b5fea8e22c openoffice-python-0.1-r34-20090228.tar.bz2 From sharkcz at fedoraproject.org Fri Mar 6 11:39:54 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Fri, 6 Mar 2009 11:39:54 +0000 (UTC) Subject: rpms/python-openoffice/EL-5 .cvsignore, 1.2, 1.3 python-openoffice.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090306113954.406EF70116@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/python-openoffice/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5536 Modified Files: .cvsignore python-openoffice.spec sources Log Message: * Fri Mar 6 2009 Dan Hor??k 0.1-0.2.20090228svn34 - check %rhel for the ExcludeArch tag - update to new upstream snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-openoffice/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Dec 2008 07:27:49 -0000 1.2 +++ .cvsignore 6 Mar 2009 11:39:23 -0000 1.3 @@ -1 +1 @@ -openoffice-0.1-r33-20080929.tar.bz2 +openoffice-python-0.1-r34-20090228.tar.bz2 Index: python-openoffice.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-openoffice/EL-5/python-openoffice.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-openoffice.spec 10 Dec 2008 19:29:59 -0000 1.2 +++ python-openoffice.spec 6 Mar 2009 11:39:23 -0000 1.3 @@ -1,22 +1,23 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define svnrev 33 -%define svndate 20080929 +%define svnrev 34 +%define svndate 20090228 %define module openoffice Name: python-%{module} Version: 0.1 -Release: 0.1.%{svndate}svn%{svnrev}%{?dist}.1 +Release: 0.2.%{svndate}svn%{svnrev}%{?dist} Summary: Python libraries for interacting with OpenOffice.org Group: Development/Languages License: GPLv3 URL: http://openoffice-python.origo.ethz.ch/ -Source0: http://download.origo.ethz.ch/openoffice-python/807/%{module}-%{version}-r%{svnrev}-%{svndate}.tar.bz2 -#Source1: http://download.origo.ethz.ch/openoffice-python/807/%{module}.interact-%{version}-r%{svnrev}-%{svndate}.tar.bz2 +Source0: http://download.origo.ethz.ch/openoffice-python/807/%{module}-python-%{version}-r%{svnrev}-%{svndate}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +%if 0%{?rhel} ExcludeArch: ppc +%endif BuildRequires: python-devel Requires: openoffice.org-pyuno @@ -28,14 +29,14 @@ %prep -%setup -q -n %{module}-%{version}-r%{svnrev}-%{svndate} +%setup -q -n %{module}-python-%{version}-r%{svnrev}-%{svndate} # remove exec perms for docs chmod a-x sample-scripts/* # remove the shebang line sed -i -e '1d' %{module}/streams.py -sed -i -e '1d' %{module}/interact/__init__.py +sed -i -e '1d' %{module}/interact.py %build @@ -58,6 +59,10 @@ %changelog +* Fri Mar 6 2009 Dan Hor??k 0.1-0.2.20090228svn34 +- check %%rhel for the ExcludeArch tag +- update to new upstream snapshot + * Wed Dec 10 2008 Dan Hor??k 0.1-0.1.20080929svn33.1 - there is no openoffice.org in RHEL 5 on ppc Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-openoffice/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Dec 2008 07:27:49 -0000 1.2 +++ sources 6 Mar 2009 11:39:23 -0000 1.3 @@ -1 +1 @@ -564cbd2305655846e694059ac40e68c2 openoffice-0.1-r33-20080929.tar.bz2 +a93b4fbf8c1338cfb12d59b5fea8e22c openoffice-python-0.1-r34-20090228.tar.bz2 From mchehab at fedoraproject.org Fri Mar 6 11:45:54 2009 From: mchehab at fedoraproject.org (Mauro Carvalho Chehab) Date: Fri, 6 Mar 2009 11:45:54 +0000 (UTC) Subject: rpms/kernel/devel kernel.spec, 1.1390, 1.1391 linux-2.6-v4l-dvb-update.patch, 1.4, 1.5 Message-ID: <20090306114554.135BE70116@cvs1.fedora.phx.redhat.com> Author: mchehab Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24678 Modified Files: kernel.spec linux-2.6-v4l-dvb-update.patch Log Message: Cleans and fixes some DVB Kconfigs: instead of opening a customize every time, just open the menu if customize is selected. This will allow a futher cleanup at config-generic, auto-selecting the needed frontends only. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1390 retrieving revision 1.1391 diff -u -r1.1390 -r1.1391 --- kernel.spec 6 Mar 2009 03:37:42 -0000 1.1390 +++ kernel.spec 6 Mar 2009 11:45:21 -0000 1.1391 @@ -1806,6 +1806,9 @@ # and build. %changelog +* Wed Mar 06 2009 Mauro Carvalho Chehab +- drivers/media: Kconfig cleanups and fixes + * Thu Mar 06 2009 Dave Jones - kernel-devel needs include/trace headers. (Josh Stone ) linux-2.6-v4l-dvb-update.patch: Index: linux-2.6-v4l-dvb-update.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-update.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-v4l-dvb-update.patch 6 Mar 2009 01:45:03 -0000 1.4 +++ linux-2.6-v4l-dvb-update.patch 6 Mar 2009 11:45:21 -0000 1.5 @@ -4617,10 +4617,18 @@ int type; int minor; diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig -index 49f7b20..bbddc9f 100644 +index 49f7b20..3e58140 100644 --- a/drivers/media/dvb/dvb-usb/Kconfig +++ b/drivers/media/dvb/dvb-usb/Kconfig -@@ -297,5 +297,6 @@ config DVB_USB_AF9015 +@@ -108,6 +108,7 @@ config DVB_USB_CXUSB + select DVB_MT352 if !DVB_FE_CUSTOMISE + select DVB_ZL10353 if !DVB_FE_CUSTOMISE + select DVB_DIB7000P if !DVB_FE_CUSTOMISE ++ select DVB_LGS8GL5 if !DVB_FE_CUSTOMISE + select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE + select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE + select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE +@@ -297,5 +298,6 @@ config DVB_USB_AF9015 select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE @@ -5030,10 +5038,39 @@ /** diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig -index 0026956..4059d22 100644 +index 0026956..3205e30 100644 --- a/drivers/media/dvb/frontends/Kconfig +++ b/drivers/media/dvb/frontends/Kconfig -@@ -55,6 +55,13 @@ config DVB_MT312 +@@ -1,17 +1,21 @@ +-menu "Customise DVB Frontends" +- depends on DVB_CORE +- + config DVB_FE_CUSTOMISE + bool "Customise the frontend modules to build" ++ depends on DVB_CORE + default N + help +- This allows the user to deselect frontend drivers unnecessary +- for their hardware from the build. Use this option with care +- as deselecting frontends which are in fact necessary will result +- in DVB devices which cannot be tuned due to lack of driver support. ++ This allows the user to select/deselect frontend drivers for their ++ hardware from the build. ++ ++ Use this option with care as deselecting frontends which are in fact ++ necessary will result in DVB devices which cannot be tuned due to lack ++ of driver support. + + If unsure say N. + ++if DVB_FE_CUSTOMISE ++ ++menu "Customise DVB Frontends" ++ + comment "Multistandard (satellite) frontends" + depends on DVB_CORE + +@@ -55,6 +59,13 @@ config DVB_MT312 help A DVB-S tuner module. Say Y when you want to support this frontend. @@ -5047,7 +5084,7 @@ config DVB_S5H1420 tristate "Samsung S5H1420 based" depends on DVB_CORE && I2C -@@ -83,6 +90,20 @@ config DVB_STV0299 +@@ -83,6 +94,20 @@ config DVB_STV0299 help A DVB-S tuner module. Say Y when you want to support this frontend. @@ -5068,7 +5105,7 @@ config DVB_TDA8083 tristate "Philips TDA8083 based" depends on DVB_CORE && I2C -@@ -446,11 +467,11 @@ comment "SEC control devices for DVB-S" +@@ -446,11 +471,11 @@ comment "SEC control devices for DVB-S" depends on DVB_CORE config DVB_LNBP21 @@ -5082,6 +5119,12 @@ config DVB_ISL6405 tristate "ISL6405 SEC controller" +@@ -486,3 +511,5 @@ config DVB_AF9013 + help + Say Y when you want to support this frontend. + endmenu ++ ++endif diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile index af7bdf0..1e3866b 100644 --- a/drivers/media/dvb/frontends/Makefile @@ -19673,6 +19716,19 @@ .probe = adv7175_probe, .remove = adv7175_remove, .id_table = adv7175_id, +diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/video/au0828/Kconfig +index 018f72b..621ec04 100644 +--- a/drivers/media/video/au0828/Kconfig ++++ b/drivers/media/video/au0828/Kconfig +@@ -4,7 +4,7 @@ config VIDEO_AU0828 + depends on I2C && INPUT && DVB_CORE && USB + select I2C_ALGOBIT + select VIDEO_TVEEPROM +- select DVB_AU8522 if !DVB_FE_CUSTOMIZE ++ select DVB_AU8522 if !DVB_FE_CUSTOMISE + select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE + select MEDIA_TUNER_MXL5007T if !DVB_FE_CUSTOMIZE + select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c index a07b7b8..f2ebf84 100644 --- a/drivers/media/video/bt819.c @@ -30770,14 +30826,18 @@ p->audio_mute ? " (muted)" : ""); if (p->audio_mode == V4L2_MPEG_AUDIO_MODE_JOINT_STEREO) diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig -index 00f1e2e..b62f16d 100644 +index 00f1e2e..4066ca6 100644 --- a/drivers/media/video/cx23885/Kconfig +++ b/drivers/media/video/cx23885/Kconfig -@@ -16,6 +16,7 @@ config VIDEO_CX23885 +@@ -15,7 +15,10 @@ config VIDEO_CX23885 + select DVB_S5H1411 if !DVB_FE_CUSTOMISE select DVB_LGDT330X if !DVB_FE_CUSTOMISE select DVB_ZL10353 if !DVB_FE_CUSTOMISE - select DVB_TDA10048 if !DVB_FE_CUSTOMIZE -+ select DVB_LNBP21 if !DVB_FE_CUSTOMIZE +- select DVB_TDA10048 if !DVB_FE_CUSTOMIZE ++ select DVB_TDA10048 if !DVB_FE_CUSTOMISE ++ select DVB_LNBP21 if !DVB_FE_CUSTOMISE ++ select DVB_STV6110 if !DVB_FE_CUSTOMISE ++ select DVB_STV0900 if !DVB_FE_CUSTOMISE select MEDIA_TUNER_MT2131 if !MEDIA_TUNER_CUSTOMIZE select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMIZE select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE @@ -49761,6 +49821,19 @@ .get_chip_id = ov772x_get_chip_id, #ifdef CONFIG_VIDEO_ADV_DEBUG .get_register = ov772x_get_register, +diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig +index 854c2a8..7f7b05c 100644 +--- a/drivers/media/video/pvrusb2/Kconfig ++++ b/drivers/media/video/pvrusb2/Kconfig +@@ -40,7 +40,7 @@ config VIDEO_PVRUSB2_DVB + select DVB_LGDT330X if !DVB_FE_CUSTOMISE + select DVB_S5H1409 if !DVB_FE_CUSTOMISE + select DVB_S5H1411 if !DVB_FE_CUSTOMISE +- select DVB_TDA10048 if !DVB_FE_CUSTOMIZE ++ select DVB_TDA10048 if !DVB_FE_CUSTOMISE + select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE + select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE + select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h index de7ee72..d96f0f5 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h @@ -53382,11 +53455,14 @@ .remove = saa7127_remove, .id_table = saa7127_id, diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig -index fc2164e..a3470eb 100644 +index fc2164e..e69d504 100644 --- a/drivers/media/video/saa7134/Kconfig +++ b/drivers/media/video/saa7134/Kconfig -@@ -37,6 +37,8 @@ config VIDEO_SAA7134_DVB +@@ -35,8 +35,11 @@ config VIDEO_SAA7134_DVB + select DVB_TDA10086 if !DVB_FE_CUSTOMISE + select DVB_TDA826X if !DVB_FE_CUSTOMISE select DVB_ISL6421 if !DVB_FE_CUSTOMISE ++ select DVB_ISL6405 if !DVB_FE_CUSTOMISE select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE + select DVB_ZL10036 if !DVB_FE_CUSTOMISE From mchehab at fedoraproject.org Fri Mar 6 11:54:11 2009 From: mchehab at fedoraproject.org (Mauro Carvalho Chehab) Date: Fri, 6 Mar 2009 11:54:11 +0000 (UTC) Subject: rpms/kernel/devel config-generic, 1.253, 1.254 kernel.spec, 1.1391, 1.1392 Message-ID: <20090306115411.C008370116@cvs1.fedora.phx.redhat.com> Author: mchehab Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11426 Modified Files: config-generic kernel.spec Log Message: Remove all frontend items from config generic, since they are now selected automatically. Due to this change, we get rid of three frontend anciliary drivers that aren't currently being used (CONFIG_DVB_DRX397XD, CONFIG_DVB_LGDT3304, CONFIG_DVB_S921) Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.253 retrieving revision 1.254 diff -u -r1.253 -r1.254 --- config-generic 6 Mar 2009 01:45:01 -0000 1.253 +++ config-generic 6 Mar 2009 11:53:41 -0000 1.254 @@ -2286,42 +2286,18 @@ # # Supported Frontend Modules # -CONFIG_DVB_AU8522=m -CONFIG_DVB_STV0299=m -# CONFIG_DVB_SP887X is not set CONFIG_DVB_BT8XX=m CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_CX24110=m -CONFIG_DVB_DRX397XD=m -CONFIG_DVB_ISL6405=m -CONFIG_DVB_L64781=m -CONFIG_DVB_LGDT330X=m -CONFIG_DVB_MT312=m -CONFIG_DVB_NXT6000=m CONFIG_DVB_PLUTO2=m -CONFIG_DVB_S5H1409=m -CONFIG_DVB_S5H1420=m CONFIG_DVB_SIANO_SMS1XXX=m CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS=y -CONFIG_DVB_SP8870=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_TDA10023=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_TUA6100=m CONFIG_DVB_TTUSB_DEC=m CONFIG_DVB_USB_CINERGY_T2=m CONFIG_DVB_USB_DTV5100=m CONFIG_DVB_USB_AF9015=m CONFIG_DVB_USB_ANYSEE=m CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_VES1820=m -CONFIG_DVB_VES1X93=m CONFIG_DVB_DM1105=m -CONFIG_DVB_LGS8GL5=m -# CONFIG_DVB_DUMMY_FE is not set -CONFIG_DVB_AF9013=m -CONFIG_DVB_STV6110=m -CONFIG_DVB_STV0900=m # # Supported SAA7146 based PCI Adapters @@ -2347,17 +2323,12 @@ CONFIG_DVB_B2C2_FLEXCOP_PCI=m CONFIG_DVB_B2C2_FLEXCOP_USB=m # CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m CONFIG_DVB_CINERGYT2_TUNING=y CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT=32 CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512 CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100 -CONFIG_DVB_OR51132=m CONFIG_DVB_USB=m # CONFIG_DVB_USB_DEBUG is not set CONFIG_DVB_USB_A800=m @@ -3891,5 +3862,3 @@ # CONFIG_SCSI_LPFC_DEBUG_FS is not set CONFIG_DVB_DYNAMIC_MINORS=y -CONFIG_DVB_LGDT3304=m -CONFIG_DVB_S921=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1391 retrieving revision 1.1392 diff -u -r1.1391 -r1.1392 --- kernel.spec 6 Mar 2009 11:45:21 -0000 1.1391 +++ kernel.spec 6 Mar 2009 11:53:41 -0000 1.1392 @@ -1807,6 +1807,9 @@ %changelog * Wed Mar 06 2009 Mauro Carvalho Chehab +- drivers/media: remove frontends from config-generic + +* Wed Mar 06 2009 Mauro Carvalho Chehab - drivers/media: Kconfig cleanups and fixes * Thu Mar 06 2009 Dave Jones From caolanm at fedoraproject.org Fri Mar 6 11:57:04 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Fri, 6 Mar 2009 11:57:04 +0000 (UTC) Subject: rpms/qtoctave/devel qtoctave-includes.patch, NONE, 1.1 qtoctave.spec, 1.3, 1.4 Message-ID: <20090306115704.9ADE470116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/qtoctave/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12054 Modified Files: qtoctave.spec Added Files: qtoctave-includes.patch Log Message: add stdio.h for printf qtoctave-includes.patch: --- NEW FILE qtoctave-includes.patch --- diff -ru qtoctave.orig/src/search_dialog.cpp qtoctave/src/search_dialog.cpp --- qtoctave.orig/src/search_dialog.cpp 2009-03-06 11:24:39.000000000 +0000 +++ qtoctave/src/search_dialog.cpp 2009-03-06 11:25:01.000000000 +0000 @@ -1,4 +1,5 @@ #include "search_dialog.h" +#include SearchDialog::SearchDialog(QWidget *parent): QDialog(parent) { Index: qtoctave.spec =================================================================== RCS file: /cvs/pkgs/rpms/qtoctave/devel/qtoctave.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qtoctave.spec 25 Feb 2009 18:13:57 -0000 1.3 +++ qtoctave.spec 6 Mar 2009 11:56:34 -0000 1.4 @@ -1,6 +1,6 @@ Name: qtoctave Version: 0.8.1 -Release: 0.20080824.svn165%{?dist} +Release: 0.20080825.svn165%{?dist} Summary: Frontend for Octave Group: Applications/Engineering @@ -19,11 +19,14 @@ BuildRequires: cmake Requires: octave +Patch0: qtoctave-includes.patch + %description QtOctave is a frontend for Octave based on Qt4. %prep %setup -q -n %{name} +%patch0 -p1 -b .includes dos2unix readme.txt for SVNDIR in $(find . -type d -name .svn) do rm -rf $SVNDIR @@ -77,6 +80,9 @@ %changelog +* Fri Mar 06 2009 Caol??n McNamara - 0.8.1-0.20080825.svn165 +- add stdio.h for printf + * Wed Feb 25 2009 Fedora Release Engineering - 0.8.1-0.20080824.svn165 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ndim at fedoraproject.org Fri Mar 6 11:57:23 2009 From: ndim at fedoraproject.org (Hans Ulrich Niedermann) Date: Fri, 6 Mar 2009 11:57:23 +0000 (UTC) Subject: rpms/xorg-x11-drv-radeonhd/devel .cvsignore, 1.44, 1.45 sources, 1.44, 1.45 xorg-x11-drv-radeonhd-README.fedora, 1.44, 1.45 xorg-x11-drv-radeonhd-snapshot.sh, 1.12, 1.13 xorg-x11-drv-radeonhd.spec, 1.57, 1.58 Message-ID: <20090306115723.9B57970116@cvs1.fedora.phx.redhat.com> Author: ndim Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12129 Modified Files: .cvsignore sources xorg-x11-drv-radeonhd-README.fedora xorg-x11-drv-radeonhd-snapshot.sh xorg-x11-drv-radeonhd.spec Log Message: * Thu Feb 26 2009 Hans Ulrich Niedermann - 1.2.4-2.3.20090226git.fc10 - Change snapshot compression method to lzma (from bzip2) - New snapshot (upstream commit 047bd7059bcfec55e06a35db4a2b16d52fe8dbf6): - 047bd705: EXA: fix for (incompatible) upstream EXA version 3. - ad6c789a: (Hopefully) fix cursor corruptions, at least on some configs. fdo #13405 - c7735333: Fix some warnings. - a5a7b085: Fix warning: only compile rhdRRCrtcSetOrigin() if required for RandR 1.3. - 368bb0d7: LUT: Fix incorrect shifts and masks for 15- and 16-bit depth - 4d208cdd: Fix LUT precision handling for 8, 24, and 32bit depth - 6e71f01f: rhd_dump: add LUT printing support - ed86b90a: Add missing definition of atom_Panel. - b76bfbd7: Add 'force-shadowfb' AccelMethod. For testing purposes only. - 95aa9113: AtomBIOS: Fix build for build w --disable-atombios-parser. - c349a523: Trivial typo in properties / man page. - 68c317da: Unify and fix quirk table macros. - e216e686: Add quirk table entry for HIS Radeon X1550 PCI. - f45e95cc: build: catch incompatible options in configure - e738e579: Quirk for PowerColor HD 3450. - 127d362c: I2C: Fix NULL pointer deference spotted by Maciej Cencora. - 1652f150: Build: Fix build when AtomBIOS subsystem is disabled. - a981e2d0: Remove xorgconfig & xorgcfg from See Also list in man page - f57a410c: Fix scaling documentation. - 44720209: RS780: set bustype to PCIE - 421edfd7: MC: Fix warnings and streamline naming of MCGetFBLocation. - 28956656: Card quirks: fix warning introduced in b2e2693d - 5eed0c4f: ID: add 0x944C (RV770). - b2e2693d: Add quirk table entry for GeCube Radeon HD 2400PRO - 003325a5: Implement RandR 1.3 mandatory properties. - 33bf07be: Renamed properties according to RandR 1.3 property guideline. - c990d6d7: Typo fix in man page - 107c97a6: Change all gitweb URL references to cgit - 0b47e600: man page: Add R7xx to NAME section - d46d50e6: MC: Pass FbLocation and FbSize to RHDMCFBLocationSetup(). - 0fd284c0: MC/Idle: ASSERT() the right setup order, don't change an unidled MC. - eeb66dc9: MC: Refactor MC code. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 12 Dec 2008 19:43:38 -0000 1.44 +++ .cvsignore 6 Mar 2009 11:56:53 -0000 1.45 @@ -1 +1 @@ -xf86-video-radeonhd-1.2.4-20081212git.tar.bz2 +xf86-video-radeonhd-1.2.4-20090226git.tar.lzma Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 12 Dec 2008 19:43:38 -0000 1.44 +++ sources 6 Mar 2009 11:56:53 -0000 1.45 @@ -1 +1 @@ -c893e9d62aa00ef45da99903ce02a2bd xf86-video-radeonhd-1.2.4-20081212git.tar.bz2 +6e6e0ab8e44796fef865af3eeac6c160 xf86-video-radeonhd-1.2.4-20090226git.tar.lzma Index: xorg-x11-drv-radeonhd-README.fedora =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-README.fedora,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- xorg-x11-drv-radeonhd-README.fedora 22 Dec 2008 18:06:46 -0000 1.44 +++ xorg-x11-drv-radeonhd-README.fedora 6 Mar 2009 11:56:53 -0000 1.45 @@ -11,7 +11,7 @@ package tarball releases. For this reason, we are packaging selected snapshots of upstream's git repository here. -Latest upstream commit: 4e8972638db59d007bc61eb1bef8adb99cc67000 +Latest upstream commit: 047bd7059bcfec55e06a35db4a2b16d52fe8dbf6 Contents Index: xorg-x11-drv-radeonhd-snapshot.sh =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-snapshot.sh,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xorg-x11-drv-radeonhd-snapshot.sh 19 Jul 2008 11:52:02 -0000 1.12 +++ xorg-x11-drv-radeonhd-snapshot.sh 6 Mar 2009 11:56:53 -0000 1.13 @@ -192,7 +192,7 @@ disttarget="distcheck" fi make -C "${builddir}" "${disttarget}" distdir="${tarname}" -mv -f "${builddir}/${tarname}.tar.bz2" "${tarname}.tar.bz2" +bzip2 -c -u "${builddir}/${tarname}.tar.bz2" | lzma -c > "${tarname}.tar.lzma" # Update spec file with the proper timestamp old_git_commit=`$SED -n 's/^%define git_commit \(.*\)/\1/p' < "$specfile"` @@ -213,5 +213,5 @@ echo "Old upstream commit in spec: ${old_git_commit}" echo "Latest upstream commit: ${upstream_commit}" -echo "$ make new-sources FILES=\"${tarname}.tar.bz2\"" +echo "$ make new-sources FILES=\"${tarname}.tar.lzma\"" Index: xorg-x11-drv-radeonhd.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- xorg-x11-drv-radeonhd.spec 26 Feb 2009 11:04:16 -0000 1.57 +++ xorg-x11-drv-radeonhd.spec 6 Mar 2009 11:56:53 -0000 1.58 @@ -20,8 +20,8 @@ %endif %if %{snapshot} -%define date 20081212 -%define git_commit 4e8972638db59d007bc61eb1bef8adb99cc67000 +%define date 20090226 +%define git_commit 047bd7059bcfec55e06a35db4a2b16d52fe8dbf6 %define alphatag .%{date}git %define tarball %{tarname}-%{version}-%{date}git %define ship_utils 1 @@ -33,7 +33,7 @@ Summary: Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets Name: xorg-x11-drv-radeonhd Version: 1.2.4 -Release: 2.2%{?alphatag}%{?dist} +Release: 2.3%{?alphatag}%{?dist} License: MIT Group: User Interface/X Hardware Support @@ -48,7 +48,7 @@ # sh xorg-x11-drv-radeonhd-snapshot.sh --update-config # The latter updates this spec file with the appropriate definition of %date. # This requires git, automake, autoconf, libtool to be installed. -Source0: %{tarball}.tar.bz2 +Source0: %{tarball}.tar.lzma %else Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}.tar.bz2 %endif @@ -164,6 +164,42 @@ %endif %changelog +* Thu Feb 26 2009 Hans Ulrich Niedermann - 1.2.4-2.3.20090226git.fc10 +- Change snapshot compression method to lzma (from bzip2) +- New snapshot (upstream commit 047bd7059bcfec55e06a35db4a2b16d52fe8dbf6): + - 047bd705: EXA: fix for (incompatible) upstream EXA version 3. + - ad6c789a: (Hopefully) fix cursor corruptions, at least on some configs. fdo #13405 + - c7735333: Fix some warnings. + - a5a7b085: Fix warning: only compile rhdRRCrtcSetOrigin() if required for RandR 1.3. + - 368bb0d7: LUT: Fix incorrect shifts and masks for 15- and 16-bit depth + - 4d208cdd: Fix LUT precision handling for 8, 24, and 32bit depth + - 6e71f01f: rhd_dump: add LUT printing support + - ed86b90a: Add missing definition of atom_Panel. + - b76bfbd7: Add 'force-shadowfb' AccelMethod. For testing purposes only. + - 95aa9113: AtomBIOS: Fix build for build w --disable-atombios-parser. + - c349a523: Trivial typo in properties / man page. + - 68c317da: Unify and fix quirk table macros. + - e216e686: Add quirk table entry for HIS Radeon X1550 PCI. + - f45e95cc: build: catch incompatible options in configure + - e738e579: Quirk for PowerColor HD 3450. + - 127d362c: I2C: Fix NULL pointer deference spotted by Maciej Cencora. + - 1652f150: Build: Fix build when AtomBIOS subsystem is disabled. + - a981e2d0: Remove xorgconfig & xorgcfg from See Also list in man page + - f57a410c: Fix scaling documentation. + - 44720209: RS780: set bustype to PCIE + - 421edfd7: MC: Fix warnings and streamline naming of MCGetFBLocation. + - 28956656: Card quirks: fix warning introduced in b2e2693d + - 5eed0c4f: ID: add 0x944C (RV770). + - b2e2693d: Add quirk table entry for GeCube Radeon HD 2400PRO + - 003325a5: Implement RandR 1.3 mandatory properties. + - 33bf07be: Renamed properties according to RandR 1.3 property guideline. + - c990d6d7: Typo fix in man page + - 107c97a6: Change all gitweb URL references to cgit + - 0b47e600: man page: Add R7xx to NAME section + - d46d50e6: MC: Pass FbLocation and FbSize to RHDMCFBLocationSetup(). + - 0fd284c0: MC/Idle: ASSERT() the right setup order, don't change an unidled MC. + - eeb66dc9: MC: Refactor MC code. + * Thu Feb 26 2009 Fedora Release Engineering - 1.2.4-2.2.20081212git - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ndim at fedoraproject.org Fri Mar 6 12:08:19 2009 From: ndim at fedoraproject.org (Hans Ulrich Niedermann) Date: Fri, 6 Mar 2009 12:08:19 +0000 (UTC) Subject: rpms/xorg-x11-drv-radeonhd/devel xorg-x11-drv-radeonhd-snapshot.sh, 1.13, 1.14 Message-ID: <20090306120819.558B470116@cvs1.fedora.phx.redhat.com> Author: ndim Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14180 Modified Files: xorg-x11-drv-radeonhd-snapshot.sh Log Message: Fix changelog generation for two-digit Fedora versions Index: xorg-x11-drv-radeonhd-snapshot.sh =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-snapshot.sh,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xorg-x11-drv-radeonhd-snapshot.sh 6 Mar 2009 11:56:53 -0000 1.13 +++ xorg-x11-drv-radeonhd-snapshot.sh 6 Mar 2009 12:07:49 -0000 1.14 @@ -99,7 +99,7 @@ fullspecfile="$PWD/$specfile" [ -f "$specfile" ] - rpm_version="$($RPM --queryformat "%{VERSION}-%{RELEASE}\n" -q --specfile "${specfile}" | $SED -n 1p | $SED 's/\.fc[0-9]$//')" + rpm_version="$($RPM --queryformat "%{VERSION}-%{RELEASE}\n" -q --specfile "${specfile}" | $SED -n 1p | $SED 's/\.fc[0-9][0-9]*$//')" pre_update_dir=`pwd` cd "$(dirname "$0")/xf86-video-radeonhd.src" From ndim at fedoraproject.org Fri Mar 6 12:12:33 2009 From: ndim at fedoraproject.org (Hans Ulrich Niedermann) Date: Fri, 6 Mar 2009 12:12:33 +0000 (UTC) Subject: rpms/xorg-x11-drv-radeonhd/devel xorg-x11-drv-radeonhd-snapshot.sh, 1.14, 1.15 Message-ID: <20090306121233.2055970116@cvs1.fedora.phx.redhat.com> Author: ndim Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15138 Modified Files: xorg-x11-drv-radeonhd-snapshot.sh Log Message: Fix bz2 -> .lzma conversion param typo Index: xorg-x11-drv-radeonhd-snapshot.sh =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-snapshot.sh,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xorg-x11-drv-radeonhd-snapshot.sh 6 Mar 2009 12:07:49 -0000 1.14 +++ xorg-x11-drv-radeonhd-snapshot.sh 6 Mar 2009 12:12:02 -0000 1.15 @@ -192,7 +192,7 @@ disttarget="distcheck" fi make -C "${builddir}" "${disttarget}" distdir="${tarname}" -bzip2 -c -u "${builddir}/${tarname}.tar.bz2" | lzma -c > "${tarname}.tar.lzma" +bzip2 -c -d "${builddir}/${tarname}.tar.bz2" | lzma -c > "${tarname}.tar.lzma" # Update spec file with the proper timestamp old_git_commit=`$SED -n 's/^%define git_commit \(.*\)/\1/p' < "$specfile"` From ndim at fedoraproject.org Fri Mar 6 12:16:07 2009 From: ndim at fedoraproject.org (Hans Ulrich Niedermann) Date: Fri, 6 Mar 2009 12:16:07 +0000 (UTC) Subject: rpms/xorg-x11-drv-radeonhd/devel .cvsignore, 1.45, 1.46 sources, 1.45, 1.46 xorg-x11-drv-radeonhd-README.fedora, 1.45, 1.46 xorg-x11-drv-radeonhd.spec, 1.58, 1.59 Message-ID: <20090306121607.9367D70116@cvs1.fedora.phx.redhat.com> Author: ndim Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15926 Modified Files: .cvsignore sources xorg-x11-drv-radeonhd-README.fedora xorg-x11-drv-radeonhd.spec Log Message: * Fri Mar 06 2009 Hans Ulrich Niedermann - 1.2.4-2.4.20090306git - New snapshot (upstream commit 093e5934a26f784f70b5febf8ae6d50a3459552c) Mainly includes the R6xx/R7xx acceleration stuff (no 3D, that depends on mesa). Detailed changelong: "git log 047bd705..093e5934" (much too long for here) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 6 Mar 2009 11:56:53 -0000 1.45 +++ .cvsignore 6 Mar 2009 12:15:36 -0000 1.46 @@ -1 +1 @@ -xf86-video-radeonhd-1.2.4-20090226git.tar.lzma +xf86-video-radeonhd-1.2.4-20090306git.tar.lzma Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sources 6 Mar 2009 11:56:53 -0000 1.45 +++ sources 6 Mar 2009 12:15:37 -0000 1.46 @@ -1 +1 @@ -6e6e0ab8e44796fef865af3eeac6c160 xf86-video-radeonhd-1.2.4-20090226git.tar.lzma +31e894377795fcfa21f13a5254657f36 xf86-video-radeonhd-1.2.4-20090306git.tar.lzma Index: xorg-x11-drv-radeonhd-README.fedora =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-README.fedora,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- xorg-x11-drv-radeonhd-README.fedora 6 Mar 2009 11:56:53 -0000 1.45 +++ xorg-x11-drv-radeonhd-README.fedora 6 Mar 2009 12:15:37 -0000 1.46 @@ -11,7 +11,7 @@ package tarball releases. For this reason, we are packaging selected snapshots of upstream's git repository here. -Latest upstream commit: 047bd7059bcfec55e06a35db4a2b16d52fe8dbf6 +Latest upstream commit: 093e5934a26f784f70b5febf8ae6d50a3459552c Contents Index: xorg-x11-drv-radeonhd.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- xorg-x11-drv-radeonhd.spec 6 Mar 2009 11:56:53 -0000 1.58 +++ xorg-x11-drv-radeonhd.spec 6 Mar 2009 12:15:37 -0000 1.59 @@ -20,8 +20,8 @@ %endif %if %{snapshot} -%define date 20090226 -%define git_commit 047bd7059bcfec55e06a35db4a2b16d52fe8dbf6 +%define date 20090306 +%define git_commit 093e5934a26f784f70b5febf8ae6d50a3459552c %define alphatag .%{date}git %define tarball %{tarname}-%{version}-%{date}git %define ship_utils 1 @@ -33,7 +33,7 @@ Summary: Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets Name: xorg-x11-drv-radeonhd Version: 1.2.4 -Release: 2.3%{?alphatag}%{?dist} +Release: 2.4%{?alphatag}%{?dist} License: MIT Group: User Interface/X Hardware Support @@ -164,7 +164,12 @@ %endif %changelog -* Thu Feb 26 2009 Hans Ulrich Niedermann - 1.2.4-2.3.20090226git.fc10 +* Fri Mar 06 2009 Hans Ulrich Niedermann - 1.2.4-2.4.20090306git +- New snapshot (upstream commit 093e5934a26f784f70b5febf8ae6d50a3459552c) + Mainly includes the R6xx/R7xx acceleration stuff (no 3D, that depends on mesa). + Detailed changelong: "git log 047bd705..093e5934" (much too long for here) + +* Thu Feb 26 2009 Hans Ulrich Niedermann - 1.2.4-2.3.20090226git - Change snapshot compression method to lzma (from bzip2) - New snapshot (upstream commit 047bd7059bcfec55e06a35db4a2b16d52fe8dbf6): - 047bd705: EXA: fix for (incompatible) upstream EXA version 3. From jreznik at fedoraproject.org Fri Mar 6 12:25:06 2009 From: jreznik at fedoraproject.org (Jaroslav Reznik) Date: Fri, 6 Mar 2009 12:25:06 +0000 (UTC) Subject: rpms/gnash/devel .cvsignore, 1.9, 1.10 gnash.spec, 1.47, 1.48 sources, 1.9, 1.10 gnash-0.8.4-configure.patch, 1.1, NONE gnash-0.8.4-fix-kde4-port-2.patch, 1.1, NONE gnash-0.8.4-port-to-kde4.patch, 1.2, NONE gnash-kde4-x11embed-resize.patch, 1.1, NONE gnash-kde4-x11embed.patch, 1.1, NONE Message-ID: <20090306122506.B353B70116@cvs1.fedora.phx.redhat.com> Author: jreznik Update of /cvs/pkgs/rpms/gnash/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18055 Modified Files: .cvsignore gnash.spec sources Removed Files: gnash-0.8.4-configure.patch gnash-0.8.4-fix-kde4-port-2.patch gnash-0.8.4-port-to-kde4.patch gnash-kde4-x11embed-resize.patch gnash-kde4-x11embed.patch Log Message: * Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-1 - update to 0.8.5 - remove use_kde3_executable_hack - remove autoreconf Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnash/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Oct 2008 14:06:34 -0000 1.9 +++ .cvsignore 6 Mar 2009 12:24:35 -0000 1.10 @@ -1,2 +1,2 @@ -gnash-0.8.4.tar.gz +gnash-0.8.5.tar.gz gnash-splash.swf Index: gnash.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- gnash.spec 24 Feb 2009 22:30:50 -0000 1.47 +++ gnash.spec 6 Mar 2009 12:24:36 -0000 1.48 @@ -1,11 +1,6 @@ -# The KDE 4 executable should be working now. -# set this to 1 to use the KDE 3 one with the KDE 4 KPart (for use in Konq 4) -# (It uses XEmbed, so it doesn't actually link KDE 3 stuff into Konqueror 4.) -%define use_kde3_executable 0 - Name: gnash -Version: 0.8.4 -Release: 7%{?dist} +Version: 0.8.5 +Release: 1%{?dist} Summary: GNU flash movie player Group: Applications/Multimedia @@ -16,22 +11,12 @@ Source2: gnash.desktop Patch0: gnash-0.8.3-manual.patch -# make autoreconf work -Patch1: gnash-0.8.4-configure.patch -# patch by Benjamin Wolsey and Bernhard Rosenkr??nzer -Patch2: gnash-0.8.4-port-to-kde4.patch # register KComponentData properly in KDE 4 KPart Patch3: gnash-0.8.3-fix-kde4-port.patch # Currently kde4-gnash (from kde4 branch) links against various KDE libraries, # but only needs Qt -- this patch removes the superfluous linkage (from bero) -Patch4: gnash-kde4-no-excessive-linkage.patch -# This patch adds XEmbed support so kde4-gnash can be used in browser plugins -# and the likes) (from bero) -Patch5: gnash-kde4-x11embed.patch -# XEmbed resizing patch (from bero) -Patch6: gnash-kde4-x11embed-resize.patch -# Missing hunks in the port-to-kde4 patch (from the upstream kde4 branch) -Patch7: gnash-0.8.4-fix-kde4-port-2.patch +# TODO: update to 0.8.5? +#Patch4: gnash-kde4-no-excessive-linkage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel libpng-devel libjpeg-devel libogg-devel @@ -44,10 +29,7 @@ BuildRequires: SDL-devel BuildRequires: agg-devel BuildRequires: kde-filesystem -BuildRequires: kdelibs4-devel -%if 0%{?use_kde3_executable} -BuildRequires: kdelibs3-devel -%endif +BuildRequires: kdelibs-devel BuildRequires: gtkglext-devel BuildRequires: docbook2X BuildRequires: %{_bindir}/docbook2pdf @@ -56,8 +38,6 @@ BuildRequires: giflib-devel BuildRequires: gettext BuildRequires: desktop-file-utils -# Need to autoreconf for the KDE 4 patch -BuildRequires: autoconf automake libtool #Requires(post): scrollkeeper #Requires(postun): scrollkeeper @@ -108,24 +88,10 @@ %prep %setup -q %patch0 -p1 -b .manual -%patch1 -p1 -b .configure -%patch2 -p1 -b .kde4 %patch3 -p1 -b .fix-kde4 -%patch4 -p1 -b .kde4-linkage -%patch5 -p1 -b .xembed -%patch6 -p1 -b .xembed-resize -%patch7 -p1 -b .fix-kde4-2 -# handle the /usr/lib(64)/kde4/devel hack -# If only this package used cmake, this wouldn't be necessary... -sed -i -e 's!KDECORE="-lkdecore"!KDECORE="-L$KDE/$LibDir/kde4/devel -lkdecore"!g' macros/kde4.m4 -# Hack so it finds libQtCore.so in /usr on lib64 arches -sed -i -e 's!if test -e $dir/lib/libQtCore.so; then!if test -e $dir/$LibDir/libQtCore.so; then!g' macros/kde4.m4 -# both the kde4 patch and the above sed hacks touched autotools stuff -autoreconf -%if 0%{?use_kde3_executable} -# hack the KDE 4 KPart so it uses the KDE 3 executable -sed -i -e 's/kde4-gnash/kde-gnash/g' plugin/klash4/klash_part.cpp -%endif +# Hack as autoreconf breaks build +sed -i -e 's!kapp.h!kapplication.h!g' configure +sed -i -e 's!libkdeui.la!libkdeui.so!g' configure #chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} @@ -134,35 +100,23 @@ mv AUTHORS.utf8 AUTHORS %build -%if 0%{?use_kde3_executable} -[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh -%endif # --enable-ghelp is disabled # We use /usr (_kde4_prefix) as the Qt prefix because the stuff it's looking for # is actually in /, not in the QT4DIR (_qt4_prefix). -%if 0%{?use_kde3_executable} -%configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \ - --enable-docbook --enable-ghelp --enable-media=GST \ - --disable-dependency-tracking --disable-rpath \ - --enable-cygnal \ - --enable-gui=gtk,kde,kde4,sdl,fb \ - --disable-kparts \ - --with-qt4=%{_kde4_prefix} \ - --with-kde4=%{_kde4_prefix} -%else %configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \ --enable-docbook --enable-ghelp --enable-media=GST \ --disable-dependency-tracking --disable-rpath \ --enable-cygnal \ --enable-gui=gtk,kde4,sdl,fb \ --with-qt4=%{_kde4_prefix} \ - --with-kde4=%{_kde4_prefix} -%endif + --with-kde4-prefix=%{_kde4_prefix} \ + --with-kde4-lib=%{_libdir}/kde4/devel \ + --with-kde4-incl=%{_kde4_includedir} # make sure the Qt 4 moc etc. tools are found export PATH=%{_qt4_prefix}/bin:$PATH #doesn't work currently: %%{?_smp_mflags} -make KDE4_CFLAGS=-I%{_kde4_includedir} - +#make KDE4_CFLAGS=-I%{_kde4_includedir} +make %install rm -rf $RPM_BUILD_ROOT @@ -241,10 +195,6 @@ #chmod a-x $RPM_BUILD_ROOT%{_datadir}/services/klash_part.desktop \ # $RPM_BUILD_ROOT%{_datadir}/apps/klash/pluginsinfo -%if 0%{?use_kde3_executable} -rm $RPM_BUILD_ROOT/%{_kde4_bindir}/kde4-gnash -%endif - %find_lang %{name} %clean @@ -314,6 +264,7 @@ %{_mandir}/man1/dumpshm.1* %{_mandir}/man1/gprocessor.1* %{_mandir}/man1/soldumper.1* +%{_mandir}/man1/flvdumper.1* %{_infodir}/gnash* %{_datadir}/gnash/ %{_datadir}/icons/hicolor/32x32/*.png @@ -327,11 +278,7 @@ %files klash %defattr(-,root,root,-) -%if 0%{?use_kde3_executable} -%{_bindir}/kde-gnash -%else %{_kde4_bindir}/kde4-gnash -%endif %{_kde4_libdir}/kde4/libklashpart.so %{_kde4_appsdir}/klash/ %{_kde4_datadir}/kde4/services/klash_part.desktop @@ -342,6 +289,11 @@ %{_mandir}/man1/cygnal.1* %changelog +* Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-1 +- update to 0.8.5 +- remove use_kde3_executable_hack +- remove autoreconf + * Tue Feb 24 2009 Fedora Release Engineering - 0.8.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnash/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Oct 2008 14:06:34 -0000 1.9 +++ sources 6 Mar 2009 12:24:36 -0000 1.10 @@ -1,2 +1,2 @@ -3100e8d669795c03167a171937897c83 gnash-0.8.4.tar.gz +b54a72a52d2477e65d9029be572789ff gnash-0.8.5.tar.gz 3ba3f30fbcd9ac6458c7d50a33eb933e gnash-splash.swf --- gnash-0.8.4-configure.patch DELETED --- --- gnash-0.8.4-fix-kde4-port-2.patch DELETED --- --- gnash-0.8.4-port-to-kde4.patch DELETED --- --- gnash-kde4-x11embed-resize.patch DELETED --- --- gnash-kde4-x11embed.patch DELETED --- From kdudka at fedoraproject.org Fri Mar 6 12:26:56 2009 From: kdudka at fedoraproject.org (Kamil Dudka) Date: Fri, 6 Mar 2009 12:26:56 +0000 (UTC) Subject: rpms/tar/devel tar-1.14-loneZeroWarning.patch, 1.3, 1.4 tar.spec, 1.78, 1.79 Message-ID: <20090306122656.E98FD70116@cvs1.fedora.phx.redhat.com> Author: kdudka Update of /cvs/extras/rpms/tar/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18679 Modified Files: tar-1.14-loneZeroWarning.patch tar.spec Log Message: improve tar-1.14-loneZeroWarning.patch (#487315) tar-1.14-loneZeroWarning.patch: Index: tar-1.14-loneZeroWarning.patch =================================================================== RCS file: /cvs/extras/rpms/tar/devel/tar-1.14-loneZeroWarning.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tar-1.14-loneZeroWarning.patch 7 Jan 2005 11:04:21 -0000 1.3 +++ tar-1.14-loneZeroWarning.patch 6 Mar 2009 12:26:55 -0000 1.4 @@ -1,6 +1,7 @@ ---- tar-1.15.1/src/list.c.loneZeroWarning 2004-12-21 14:34:05.000000000 +0000 -+++ tar-1.15.1/src/list.c 2005-01-07 11:32:39.348691306 +0000 -@@ -140,6 +140,14 @@ +diff -ruNp tar-1.22.orig/src/list.c tar-1.22/src/list.c +--- tar-1.22.orig/src/list.c 2008-10-30 12:10:04.000000000 +0100 ++++ tar-1.22/src/list.c 2009-03-06 00:03:05.925105425 +0100 +@@ -136,6 +136,14 @@ read_and (void (*do_something) (void)) if (!ignore_zeros_option) { @@ -15,11 +16,12 @@ char buf[UINTMAX_STRSIZE_BOUND]; status = read_header (false); -@@ -147,6 +155,7 @@ +@@ -143,6 +151,8 @@ read_and (void (*do_something) (void)) break; WARN ((0, 0, _("A lone zero block at %s"), STRINGIFY_BIGINT (current_block_ordinal (), buf))); +#endif ++ status = read_header (false); break; } status = prev_status; Index: tar.spec =================================================================== RCS file: /cvs/extras/rpms/tar/devel/tar.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- tar.spec 5 Mar 2009 08:34:12 -0000 1.78 +++ tar.spec 6 Mar 2009 12:26:56 -0000 1.79 @@ -2,7 +2,7 @@ Name: tar Epoch: 2 Version: 1.22 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.gnu.org/software/tar/ @@ -89,6 +89,9 @@ %{_infodir}/tar.info* %changelog +* Fri Mar 06 2009 Kamil Dudka 2:1.22-2 +- improve tar-1.14-loneZeroWarning.patch (#487315) + * Mon Mar 02 2009 Ondrej Vasik 2:1.22-1 - New upstream release 1.22, removed applied patch From steved at fedoraproject.org Fri Mar 6 12:31:36 2009 From: steved at fedoraproject.org (Steve Dickson) Date: Fri, 6 Mar 2009 12:31:36 +0000 (UTC) Subject: rpms/nfs-utils/devel nfs-utils.spec, 1.217, 1.218 nfs.init, 1.32, 1.33 nfslock.init, 1.23, 1.24 Message-ID: <20090306123136.8305C70116@cvs1.fedora.phx.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19561 Modified Files: nfs-utils.spec nfs.init nfslock.init Log Message: Fixed lockd not using settings in sysconfig/nfs (bz 461043) Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- nfs-utils.spec 5 Mar 2009 12:57:02 -0000 1.217 +++ nfs-utils.spec 6 Mar 2009 12:31:05 -0000 1.218 @@ -2,7 +2,7 @@ Name: nfs-utils URL: http://sourceforge.net/projects/nfs Version: 1.1.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 # group all 32bit related archs @@ -241,6 +241,9 @@ %attr(4755,root,root) /sbin/umount.nfs4 %changelog +* Fri Mar 6 2009 Steve Dickson 1.1.5-2 +- Fixed lockd not using settings in sysconfig/nfs (bz 461043) + * Thu Mar 5 2009 Steve Dickson 1.1.5-1 - Updated to latest upstream version: 1.1.5 Index: nfs.init =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs.init,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- nfs.init 1 Dec 2008 14:19:25 -0000 1.32 +++ nfs.init 6 Mar 2009 12:31:05 -0000 1.33 @@ -55,21 +55,21 @@ # Start daemons. [ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd start + # Set the ports lockd should listen on + if [ -n "$LOCKD_TCPPORT" -o -n "$LOCKD_UDPPORT" ]; then + [ -x /sbin/modprobe ] && /sbin/modprobe lockd $LOCKDARG + [ -n "$LOCKD_TCPPORT" ] && \ + /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1 + [ -n "$LOCKD_UDPPORT" ] && \ + /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1 + fi + # Load the nfsd module so /proc/fs/nfsd will exist [ "$NFSD_MODULE" != "noload" ] && { [ -x /sbin/modprobe ] && /sbin/modprobe nfsd } - action $"Starting NFS services: " /usr/sbin/exportfs -r - # Set the ports lockd should listen on - if [ -n "$LOCKD_TCPPORT" ]; then - /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1 - fi - if [ -n "$LOCKD_UDPPORT" ]; then - /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1 - fi - if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then echo -n $"Starting NFS quotas: " [ -n "$RQUOTAD_PORT" ] \ Index: nfslock.init =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfslock.init,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- nfslock.init 16 Sep 2008 20:29:11 -0000 1.23 +++ nfslock.init 6 Mar 2009 12:31:06 -0000 1.24 @@ -44,11 +44,13 @@ # See if the kernel lockd should start up # listening on a particular port # - [ -n "$LOCKD_TCPPORT" ] && \ - /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1 - [ -n "$LOCKD_UDPPORT" ] && \ - /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1 - [ -n "$LOCKDARG" ] && modprobe lockd $LOCKDARG + if [ -n "$LOCKD_TCPPORT" -o -n "$LOCKD_UDPPORT" ]; then + [ -x /sbin/modprobe ] && /sbin/modprobe lockd $LOCKDARG + [ -n "$LOCKD_TCPPORT" ] && \ + /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1 + [ -n "$LOCKD_UDPPORT" ] && \ + /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1 + fi echo -n $"Starting NFS statd: " # Set statd's local hostname if defined From xhorak at fedoraproject.org Fri Mar 6 12:52:00 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 12:52:00 +0000 (UTC) Subject: rpms/epiphany/F-9 epiphany.spec,1.197,1.198 Message-ID: <20090306125200.3FB5870116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/epiphany/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23350 Modified Files: epiphany.spec Log Message: Adding missing build requirement Index: epiphany.spec =================================================================== RCS file: /cvs/pkgs/rpms/epiphany/F-9/epiphany.spec,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- epiphany.spec 6 Mar 2009 09:49:11 -0000 1.197 +++ epiphany.spec 6 Mar 2009 12:51:29 -0000 1.198 @@ -43,6 +43,7 @@ BuildRequires: NetworkManager-devel %endif BuildRequires: pygtk2-devel, gnome-python2-devel +BuildRequires: gail-devel # Patches Patch0: epiphany-1.0.1-home-page.patch From mbroz at fedoraproject.org Fri Mar 6 12:53:45 2009 From: mbroz at fedoraproject.org (Milan Broz) Date: Fri, 6 Mar 2009 12:53:45 +0000 (UTC) Subject: rpms/device-mapper-multipath/devel fix_kpartx.patch, NONE, 1.1 device-mapper-multipath.spec, 1.53, 1.54 Message-ID: <20090306125345.3DD0270116@cvs1.fedora.phx.redhat.com> Author: mbroz Update of /cvs/pkgs/rpms/device-mapper-multipath/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23606 Modified Files: device-mapper-multipath.spec Added Files: fix_kpartx.patch Log Message: Fix kpartx extended partition handling. Resolves: #475283 fix_kpartx.patch: --- NEW FILE fix_kpartx.patch --- --- multipath-tools.old/kpartx/kpartx.c 2008-07-23 22:49:52.000000000 +0200 +++ multipath-tools/kpartx/kpartx.c 2009-03-06 13:32:49.000000000 +0100 @@ -474,6 +474,7 @@ main(int argc, char **argv){ d = c; while (c) { for (j = 0; j < n; j++) { + uint64_t start; int k = slices[j].container - 1; if (slices[j].size == 0) @@ -484,7 +485,7 @@ main(int argc, char **argv){ continue; /* Skip all simple slices */ - if (k < 0) + if (slices[j].container == 0) continue; /* Check container slice */ @@ -499,10 +500,11 @@ main(int argc, char **argv){ } strip_slash(partname); + start = slices[j].start - slices[k].start; if (safe_sprintf(params, "%d:%d %" PRIu64, slices[k].major, slices[k].minor, - slices[j].start)) { + start)) { fprintf(stderr, "params too small\n"); exit(1); } Index: device-mapper-multipath.spec =================================================================== RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- device-mapper-multipath.spec 24 Feb 2009 11:34:23 -0000 1.53 +++ device-mapper-multipath.spec 6 Mar 2009 12:53:14 -0000 1.54 @@ -1,7 +1,7 @@ Summary: Tools to manage multipath devices using device-mapper Name: device-mapper-multipath Version: 0.4.8 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL+ Group: System Environment/Base URL: http://christophe.varoqui.free.fr/ @@ -19,6 +19,7 @@ Patch10: fix_devt.patch Patch11: directio_message_cleanup.patch Patch12: binding_error.patch +Patch13: fix_kpartx.patch Requires: kpartx = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): chkconfig @@ -58,6 +59,7 @@ %patch10 -p1 -b .fix_devt %patch11 -p1 -b .directio_message %patch12 -p1 -b .binding_error +%patch13 -p1 -b .ext_part %build make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT @@ -109,6 +111,9 @@ %{_mandir}/man8/kpartx.8.gz %changelog +* Fri Mar 6 2009 Milan Broz - 0.4.8-9 +- Fix kpartx extended partition handling (475283) + * Tue Feb 24 2009 Fedora Release Engineering - 0.4.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mbarnes at fedoraproject.org Fri Mar 6 12:54:39 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Fri, 6 Mar 2009 12:54:39 +0000 (UTC) Subject: rpms/pygtk2/devel .cvsignore, 1.40, 1.41 pygtk2.spec, 1.22, 1.23 sources, 1.40, 1.41 Message-ID: <20090306125439.68A7E70116@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/pygtk2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24064 Modified Files: .cvsignore pygtk2.spec sources Log Message: * Fri Mar 06 2009 Matthew Barnes - 2.14.1-1.fc11 - Update to 2.14.1 - Bump gtk2_version to 2.9.0 for gtkunixprint requirement. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pygtk2/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 31 Jan 2009 19:54:51 -0000 1.40 +++ .cvsignore 6 Mar 2009 12:54:08 -0000 1.41 @@ -1 +1 @@ -pygtk-2.14.0.tar.bz2 +pygtk-2.14.1.tar.bz2 Index: pygtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/pygtk2/devel/pygtk2.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- pygtk2.spec 25 Feb 2009 03:11:35 -0000 1.22 +++ pygtk2.spec 6 Mar 2009 12:54:08 -0000 1.23 @@ -1,9 +1,9 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# Last updated for version 2.13.0 +# Last updated for version 2.14.1 %define glib2_version 2.8.0 %define pango_version 1.16.0 -%define gtk2_version 2.8.0 +%define gtk2_version 2.9.0 %define libglade2_version 2.5.0 %define pycairo_version 1.0.2 %define pygobject2_version 2.14.0 @@ -14,8 +14,8 @@ ### Abstract ### Name: pygtk2 -Version: 2.14.0 -Release: 2%{?dist} +Version: 2.14.1 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Languages Summary: Python bindings for GTK+ @@ -163,6 +163,10 @@ %{_datadir}/gtk-doc/html/pygtk %changelog +* Fri Mar 06 2009 Matthew Barnes - 2.14.1-1.fc11 +- Update to 2.14.1 +- Bump gtk2_version to 2.9.0 for gtkunixprint requirement. + * Tue Feb 24 2009 Matthias Clasen - 2.14.0-2 - Make -doc noarch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pygtk2/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 31 Jan 2009 19:54:51 -0000 1.40 +++ sources 6 Mar 2009 12:54:09 -0000 1.41 @@ -1 +1 @@ -b5fec3a9493a394d0ba2b8d2b337c4c5 pygtk-2.14.0.tar.bz2 +c27a7d21b87910e80605d9135d220592 pygtk-2.14.1.tar.bz2 From xhorak at fedoraproject.org Fri Mar 6 13:01:25 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 13:01:25 +0000 (UTC) Subject: rpms/blam/F-9 blam.spec,1.31,1.32 Message-ID: <20090306130125.7D15D70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/blam/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25583 Modified Files: blam.spec Log Message: Added missing build requirement: gail-devel Index: blam.spec =================================================================== RCS file: /cvs/pkgs/rpms/blam/F-9/blam.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- blam.spec 6 Mar 2009 10:50:38 -0000 1.31 +++ blam.spec 6 Mar 2009 13:00:55 -0000 1.32 @@ -40,6 +40,7 @@ BuildRequires: mono-devel BuildRequires: perl(XML::Parser) BuildRequires: intltool +BuildRequires: gail-devel Requires: dbus-sharp >= %{dbus_sharp_min_version} Requires: gecko-sharp2 From xhorak at fedoraproject.org Fri Mar 6 13:08:16 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 13:08:16 +0000 (UTC) Subject: rpms/yelp/F-9 yelp.spec,1.142,1.143 Message-ID: <20090306130816.E912E70116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/yelp/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27192 Modified Files: yelp.spec Log Message: Added missing build requirement Index: yelp.spec =================================================================== RCS file: /cvs/pkgs/rpms/yelp/F-9/yelp.spec,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- yelp.spec 6 Mar 2009 10:09:13 -0000 1.142 +++ yelp.spec 6 Mar 2009 13:07:46 -0000 1.143 @@ -79,6 +79,7 @@ BuildRequires: dbus-devel BuildRequires: gettext-devel BuildRequires: rarian-devel >= %{rarian_version} +BuildRequires: gail-devel %if %{WITH_MONO} From caolanm at fedoraproject.org Fri Mar 6 13:20:59 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Fri, 6 Mar 2009 13:20:59 +0000 (UTC) Subject: rpms/vdccm/devel vdccm-includes.patch, NONE, 1.1 vdccm.spec, 1.6, 1.7 vdccm-gcc43.patch, 1.5, NONE Message-ID: <20090306132059.8C4D670116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/vdccm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29919 Modified Files: vdccm.spec Added Files: vdccm-includes.patch Removed Files: vdccm-gcc43.patch Log Message: fix build vdccm-includes.patch: --- NEW FILE vdccm-includes.patch --- diff -ru vdccm-0.10.1.orig/lib/localconnectedsocket.cpp vdccm-0.10.1/lib/localconnectedsocket.cpp --- vdccm-0.10.1.orig/lib/localconnectedsocket.cpp 2009-03-06 12:47:32.000000000 +0000 +++ vdccm-0.10.1/lib/localconnectedsocket.cpp 2009-03-06 13:15:37.000000000 +0000 @@ -22,6 +22,7 @@ ***************************************************************************/ #include "localconnectedsocket.h" #include +#include using namespace std; diff -ru vdccm-0.10.1.orig/lib/tcpclientsocket.cpp vdccm-0.10.1/lib/tcpclientsocket.cpp --- vdccm-0.10.1.orig/lib/tcpclientsocket.cpp 2009-03-06 12:47:32.000000000 +0000 +++ vdccm-0.10.1/lib/tcpclientsocket.cpp 2009-03-06 13:15:37.000000000 +0000 @@ -22,6 +22,7 @@ ***************************************************************************/ #include "tcpclientsocket.h" #include +#include using namespace std; diff -ru vdccm-0.10.1.orig/lib/tcpconnectedsocket.cpp vdccm-0.10.1/lib/tcpconnectedsocket.cpp --- vdccm-0.10.1.orig/lib/tcpconnectedsocket.cpp 2009-03-06 12:47:32.000000000 +0000 +++ vdccm-0.10.1/lib/tcpconnectedsocket.cpp 2009-03-06 13:15:37.000000000 +0000 @@ -23,6 +23,7 @@ #include "tcpconnectedsocket.h" #include #include +#include // Ugly hack - the header could not be included // due to conflicts with other systemheader diff -ru vdccm-0.10.1.orig/lib/tcpsocket.cpp vdccm-0.10.1/lib/tcpsocket.cpp --- vdccm-0.10.1.orig/lib/tcpsocket.cpp 2009-03-06 12:47:32.000000000 +0000 +++ vdccm-0.10.1/lib/tcpsocket.cpp 2009-03-06 13:15:37.000000000 +0000 @@ -23,7 +23,7 @@ #include "tcpsocket.h" #include #include - +#include using namespace std; diff -ru vdccm-0.10.1.orig/lib/udpsocket.cpp vdccm-0.10.1/lib/udpsocket.cpp --- vdccm-0.10.1.orig/lib/udpsocket.cpp 2009-03-06 12:47:32.000000000 +0000 +++ vdccm-0.10.1/lib/udpsocket.cpp 2009-03-06 13:15:37.000000000 +0000 @@ -11,6 +11,7 @@ // #include "udpsocket.h" #include +#include using namespace std; diff -ru vdccm-0.10.1.orig/lib/udpsocket.h vdccm-0.10.1/lib/udpsocket.h --- vdccm-0.10.1.orig/lib/udpsocket.h 2009-03-06 12:47:32.000000000 +0000 +++ vdccm-0.10.1/lib/udpsocket.h 2009-03-06 12:48:21.000000000 +0000 @@ -13,6 +13,7 @@ #define UDPSOCKET_H #include +#include #include /** diff -ru vdccm-0.10.1.orig/src/rapiclient.cpp vdccm-0.10.1/src/rapiclient.cpp --- vdccm-0.10.1.orig/src/rapiclient.cpp 2009-03-06 12:47:32.000000000 +0000 +++ vdccm-0.10.1/src/rapiclient.cpp 2009-03-06 13:15:37.000000000 +0000 @@ -19,6 +19,7 @@ #include #include #include +#include using namespace std; diff -ru vdccm-0.10.1.orig/src/rapiclient.h vdccm-0.10.1/src/rapiclient.h --- vdccm-0.10.1.orig/src/rapiclient.h 2009-03-06 12:47:32.000000000 +0000 +++ vdccm-0.10.1/src/rapiclient.h 2009-03-06 13:15:37.000000000 +0000 @@ -14,6 +14,8 @@ #include +#include + /** @author Volker Christian */ diff -ru vdccm-0.10.1.orig/src/rapiconnection.cpp vdccm-0.10.1/src/rapiconnection.cpp --- vdccm-0.10.1.orig/src/rapiconnection.cpp 2009-03-06 12:47:32.000000000 +0000 +++ vdccm-0.10.1/src/rapiconnection.cpp 2009-03-06 13:15:48.000000000 +0000 @@ -22,6 +22,8 @@ #include "synce_log.h" #include #include +#include +#include using namespace std; Only in vdccm-0.10.1/src: rapiconnection.cpp.orig Only in vdccm-0.10.1/src: rapiconnection.cpp.rej diff -ru vdccm-0.10.1.orig/src/rapiproxyconnection.cpp vdccm-0.10.1/src/rapiproxyconnection.cpp --- vdccm-0.10.1.orig/src/rapiproxyconnection.cpp 2009-03-06 12:47:32.000000000 +0000 +++ vdccm-0.10.1/src/rapiproxyconnection.cpp 2009-03-06 13:15:37.000000000 +0000 @@ -19,6 +19,8 @@ #include +#include + RapiProxyConnection::RapiProxyConnection(RapiConnection *rapiConnection, RapiProxy *rapiProxy, RapiProvisioningClient *rapiProvisioningClient) : rapiConnection(rapiConnection), Index: vdccm.spec =================================================================== RCS file: /cvs/pkgs/rpms/vdccm/devel/vdccm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- vdccm.spec 25 Feb 2009 23:53:50 -0000 1.6 +++ vdccm.spec 6 Mar 2009 13:20:29 -0000 1.7 @@ -1,13 +1,13 @@ Name: vdccm Version: 0.10.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Serial connection daemon for Pocket PC devices Group: Applications/Communications License: MIT URL: http://www.synce.org Source0: http://download.sf.net/synce/vdccm-%{version}.tar.gz -Patch0: %{name}-gcc43.patch +Patch0: %{name}-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsynce-devel >= 0.10.0 @@ -33,7 +33,7 @@ %prep %setup -q sed -i -e "/chown root/d" src/Makefile.in -%patch0 +%patch0 -p1 %build %configure --disable-static @@ -67,6 +67,9 @@ %defattr(-,root,root,-) %changelog +* Fri Mar 05 2009 Caol??n McNamara - 0.10.1-5 +- fix build + * Wed Feb 25 2009 Fedora Release Engineering - 0.10.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- vdccm-gcc43.patch DELETED --- From psklenar at fedoraproject.org Fri Mar 6 13:26:20 2009 From: psklenar at fedoraproject.org (Petr Sklenar) Date: Fri, 6 Mar 2009 13:26:20 +0000 (UTC) Subject: rpms/stardict-dic-cs_CZ/devel import.log, NONE, 1.1 stardict-dic-cs_CZ.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306132620.9CD6170116@cvs1.fedora.phx.redhat.com> Author: psklenar Update of /cvs/pkgs/rpms/stardict-dic-cs_CZ/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31192/devel Modified Files: .cvsignore sources Added Files: import.log stardict-dic-cs_CZ.spec Log Message: --- NEW FILE import.log --- stardict-dic-cs_CZ-20081201-2_fc10:HEAD:stardict-dic-cs_CZ-20081201-2.fc10.src.rpm:1236345882 --- NEW FILE stardict-dic-cs_CZ.spec --- %define dicname stardict-english-czech Name: stardict-dic-cs_CZ Summary: Czech dictionaries for StarDict Version: 20081201 Release: 2%{?dist} Group: Applications/Text License: GFDL URL: http://cihar.com/software/slovnik/ Source0: ftp://dl.cihar.com/slovnik/stable/%{dicname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{dicname}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: stardict >= 2 %description Czech-English and English-Czech translation dictionaries for StarDict, a GUI-based dictionary software. %prep %setup -q -c -n %{dicname}-%{version} %build %install rm -rf ${RPM_BUILD_ROOT} install -m 0755 -p -d ${RPM_BUILD_ROOT}%{_datadir}/stardict/dic install -m 0644 -p %{dicname}-%{version}/cz* ${RPM_BUILD_ROOT}%{_datadir}/stardict/dic/ install -m 0644 -p %{dicname}-%{version}/en* ${RPM_BUILD_ROOT}%{_datadir}/stardict/dic/ %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root,-) %doc %{dicname}-%{version}/README %{_datadir}/stardict/dic/* %changelog * Mon Feb 9 2009 Petr Sklenar - 20081201-2 - editing specfile - name and description * Mon Jan 26 2009 Petr Sklenar - 20081201-1 - Initial build for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/stardict-dic-cs_CZ/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 20:35:14 -0000 1.1 +++ .cvsignore 6 Mar 2009 13:25:49 -0000 1.2 @@ -0,0 +1 @@ +stardict-english-czech-20081201.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/stardict-dic-cs_CZ/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 20:35:14 -0000 1.1 +++ sources 6 Mar 2009 13:25:49 -0000 1.2 @@ -0,0 +1 @@ +99807bb4dd7d65a00334ef12cb6f46aa stardict-english-czech-20081201.tar.gz From transif at fedoraproject.org Fri Mar 6 13:26:49 2009 From: transif at fedoraproject.org (Transifex System User) Date: Fri, 6 Mar 2009 13:26:49 +0000 (UTC) Subject: comps/po it.po,1.28,1.29 Message-ID: <20090306132649.7FA4070116@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31423/po Modified Files: it.po Log Message: 2009-03-06 Mario Santagiuliana (via marionline at fedoraproject.org) * po/it.po: Updated Italian Translation Index: it.po =================================================================== RCS file: /cvs/pkgs/comps/po/it.po,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- it.po 9 Feb 2009 07:04:03 -0000 1.28 +++ it.po 6 Mar 2009 13:26:18 -0000 1.29 @@ -2,23 +2,26 @@ # Copyright (C) 2009 Red Hat, Inc. # This file is distributed under the same license as the comps package. # +# # Francesco Valente , 2002, 2003, 2004. # Lorenzo Stobbione , 2004, 2005. # Francesco Tombolini , 2006, 2007, 2008. # Pierro Silvio , 2009. # Guido Grazioli , 2009. -# +# mario_santagiuliana , 2009. msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-30 13:36+0000\n" -"PO-Revision-Date: 2009-02-08 11:37+0100\n" -"Last-Translator: Pierro Silvio \n" -"Language-Team: Italian\n" +"POT-Creation-Date: 2009-03-06 09:51+0000\n" +"PO-Revision-Date: 2009-03-06 13:20+0100\n" +"Last-Translator: mario_santagiuliana \n" +"Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 0.3\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 #: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1 @@ -26,192 +29,192 @@ msgstr "Un ambiente desktop performante anche su computer meno potenti." #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 -#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 ../comps-el4.xml.in.h:1 +#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1 #: ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "Strumenti di amministrazione" #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 -#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 +#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4 msgid "Afrikaans Support" msgstr "Supporto lingua africana" #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 -#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4 +#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5 msgid "Albanian Support" msgstr "Supporto lingua albanese" #: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 -#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:6 ../comps-el4.xml.in.h:2 +#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2 #: ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "Applicazioni" #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 -#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 +#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 msgid "Applications to perform a variety of tasks" msgstr "Applicazioni generiche per vari compiti" #: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 -#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 ../comps-el4.xml.in.h:4 +#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4 #: ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "Supporto lingua araba" #: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 -#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:5 +#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5 #: ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "Supporto lingua armena" #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9 -#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 +#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 msgid "Assamese Support" msgstr "Supporto lingua assamese" #: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10 -#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 ../comps-el4.xml.in.h:6 +#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6 #: ../comps-el5.xml.in.h:6 msgid "Authoring and Publishing" msgstr "Redazione e publishing" #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11 -#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 +#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 msgid "Base" msgstr "Base" #: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12 -#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 ../comps-el4.xml.in.h:7 +#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7 #: ../comps-el5.xml.in.h:7 msgid "Base System" msgstr "Sistema di base" #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13 -#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 +#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15 msgid "Basic support for the Ruby programming language." msgstr "Supporto di base per il linguaggio di programmazione Ruby." #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14 -#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15 +#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16 msgid "Basque Support" msgstr "Supporto lingua basca" #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15 -#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16 +#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17 msgid "Belarusian Support" msgstr "Supporto lingua bielorussa" #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16 -#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17 +#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18 msgid "Bengali Support" msgstr "Supporto lingua bengalese" #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17 -#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18 +#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19 msgid "Bhutanese Support" msgstr "Supporto lingua bhutanese" #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18 -#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19 +#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20 msgid "Bosnian Support" msgstr "Supporto lingua bosniaca" #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19 -#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20 +#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21 msgid "Brazilian Portuguese Support" msgstr "Supporto lingua portoghese brasiliano" #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20 -#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21 +#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:22 msgid "Breton Support" msgstr "Supporto lingua bretone" #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22 -#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23 +#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24 msgid "Bulgarian Support" msgstr "Supporto lingua bulgara" #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23 -#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:24 +#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25 msgid "Catalan Support" msgstr "Supporto lingua catalana" #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24 -#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:25 +#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26 msgid "Chinese Support" msgstr "Supporto lingua cinese" #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25 -#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:26 +#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27 msgid "Clustering" msgstr "Gestione cluster" #: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26 -#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:27 +#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28 msgid "Clustering Support" msgstr "Supporto a sistemi cluster" #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27 -#: ../comps-f10.xml.in.h:27 ../comps-f11.xml.in.h:28 +#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29 msgid "Core" msgstr "Nucleo" #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28 -#: ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:29 +#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 msgid "Croatian Support" msgstr "Supporto lingua croata" #: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29 -#: ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:30 ../comps-el5.xml.in.h:8 +#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 ../comps-el5.xml.in.h:8 msgid "Czech Support" msgstr "Supporto lingua ceca" #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30 -#: ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:31 +#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32 msgid "DNS Name Server" msgstr "Nome Server DNS" #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31 -#: ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:32 +#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 msgid "Danish Support" msgstr "Supporto lingua danese" #: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32 -#: ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:33 ../comps-el4.xml.in.h:8 +#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:8 #: ../comps-el5.xml.in.h:9 msgid "Desktop Environments" msgstr "Ambienti desktop" #: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33 -#: ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:34 ../comps-el4.xml.in.h:9 +#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:36 ../comps-el4.xml.in.h:9 #: ../comps-el5.xml.in.h:10 msgid "Desktop environments" msgstr "Ambienti desktop" #: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34 -#: ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:35 ../comps-el4.xml.in.h:10 +#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:10 #: ../comps-el5.xml.in.h:11 msgid "Development" msgstr "Programmazione" #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35 -#: ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:36 +#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:38 msgid "Development Libraries" msgstr "Librerie di sviluppo" #: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36 -#: ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:37 ../comps-el4.xml.in.h:11 +#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:39 ../comps-el4.xml.in.h:11 #: ../comps-el5.xml.in.h:12 msgid "Development Tools" msgstr "Strumenti di sviluppo" #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37 -#: ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:38 +#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:40 msgid "Dial-up Networking Support" msgstr "Supporto connesioni remote dial-up" #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38 -#: ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:39 +#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:41 msgid "Dutch Support" msgstr "Supporto lingua olandese" @@ -220,100 +223,101 @@ msgstr "Eclipse" #: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39 -#: ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:40 ../comps-el4.xml.in.h:13 +#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:13 #: ../comps-el5.xml.in.h:14 msgid "Editors" msgstr "Editor di testi" #: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40 -#: ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:41 ../comps-el4.xml.in.h:14 +#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:14 #: ../comps-el5.xml.in.h:15 msgid "Educational Software" msgstr "Programmi educativi" #: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41 -#: ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:42 ../comps-el4.xml.in.h:15 +#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:44 ../comps-el4.xml.in.h:15 #: ../comps-el5.xml.in.h:16 msgid "Educational software for learning" msgstr "Applicativi didattici e ludici per l'apprendimento" #: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42 -#: ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:43 ../comps-el4.xml.in.h:16 +#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:46 ../comps-el4.xml.in.h:16 #: ../comps-el5.xml.in.h:17 msgid "Engineering and Scientific" msgstr "Scientifici e tecnici" #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43 -#: ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:44 +#: ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:47 msgid "English (UK) Support" msgstr "Supporto lingua inglese (gb)" #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:45 -#: ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:46 +#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:49 msgid "Estonian Support" msgstr "Supporto lingua estone" #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:46 -#: ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:47 +#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:50 msgid "Ethiopic Support" msgstr "Supporto lingua etiope" #: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:47 -#: ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:48 ../comps-el4.xml.in.h:17 +#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:17 #: ../comps-el5.xml.in.h:18 msgid "FTP Server" msgstr "Server FTP" #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:48 -#: ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:49 +#: ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:52 msgid "Faeroese Support" msgstr "Supporto lingua faeroese" #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:50 -#: ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:51 ../comps-el4.xml.in.h:18 +#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:54 ../comps-el4.xml.in.h:18 #: ../comps-el5.xml.in.h:19 msgid "Fedora Packager" msgstr "Gestore di pacchetti Fedora" #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:51 -#: ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:52 +#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:55 msgid "Filipino Support" msgstr "Supporto lingua filippina" #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:52 -#: ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:53 +#: ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:56 msgid "Finnish Support" msgstr "Supporto lingua finlandese" #: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:55 -#: ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:57 +#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 msgid "French Support" msgstr "Supporto lingua francese" #: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:56 -#: ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:60 ../comps-el4.xml.in.h:19 +#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:63 ../comps-el4.xml.in.h:19 #: ../comps-el5.xml.in.h:20 msgid "" "From CD recording to playing audio CDs and multimedia files, this package " "group allows you to work with sound and video on the system." msgstr "" -"Questo gruppo di pacchetti contiene strumenti per lavorare con audio e video nel sistema, " -"dalla masterizzazione di CD alla riproduzione di CD audio e file multimediali." +"Questo gruppo di pacchetti contiene strumenti per lavorare con audio e video " +"nel sistema, dalla masterizzazione di CD alla riproduzione di CD audio e " +"file multimediali." #: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:57 -#: ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:61 ../comps-el4.xml.in.h:20 +#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:64 ../comps-el4.xml.in.h:20 #: ../comps-el5.xml.in.h:21 msgid "GNOME Desktop Environment" msgstr "Ambiente desktop GNOME" #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:58 -#: ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:62 ../comps-el4.xml.in.h:21 +#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:65 ../comps-el4.xml.in.h:21 #: ../comps-el5.xml.in.h:22 msgid "GNOME Software Development" msgstr "Sviluppo applicativi GNOME" #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:59 -#: ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:63 +#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:66 msgid "" "GNOME is a powerful graphical user interface which includes a panel, " "desktop, system icons, and a graphical file manager." @@ -322,172 +326,173 @@ "file grafico, di un pannello per gestire il desktop e delle icone di sistema." #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:60 -#: ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:64 +#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:67 msgid "Gaelic Support" msgstr "Supporto lingua gaelica" #: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:61 -#: ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:65 +#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:68 msgid "Galician Support" msgstr "Supporto lingua galiziana" #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:62 -#: ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:66 ../comps-el5.xml.in.h:24 +#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:69 ../comps-el5.xml.in.h:24 msgid "Games and Entertainment" msgstr "Giochi e svago" #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:63 -#: ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:67 +#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:70 msgid "Georgian Support" msgstr "Supporto lingua georgiana" #: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:64 -#: ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:68 +#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:71 msgid "German Support" msgstr "Supporto lingua tedesca" #: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:65 -#: ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:69 ../comps-el4.xml.in.h:23 +#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:72 ../comps-el4.xml.in.h:23 #: ../comps-el5.xml.in.h:25 msgid "Graphical Internet" msgstr "Applicazioni Internet grafiche" #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:66 -#: ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:70 ../comps-el4.xml.in.h:24 +#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:24 #: ../comps-el5.xml.in.h:26 msgid "Graphics" msgstr "Grafica" #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:67 -#: ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:71 +#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:74 msgid "Greek Support" msgstr "Supporto lingua greca" #: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:68 -#: ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:72 +#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:75 msgid "Gujarati Support" msgstr "Supporto lingua gujarati" #: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:69 -#: ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:73 ../comps-el4.xml.in.h:25 +#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:76 ../comps-el4.xml.in.h:25 #: ../comps-el5.xml.in.h:27 msgid "Hardware Support" msgstr "Supporto hardware" #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:70 -#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:75 ../comps-el4.xml.in.h:26 +#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:78 ../comps-el4.xml.in.h:26 #: ../comps-el5.xml.in.h:28 msgid "Hebrew Support" msgstr "Supporto lingua ebraica" #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:71 -#: ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:76 +#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:79 msgid "Hindi Support" msgstr "Supporto lingua hindi" #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:72 -#: ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:77 +#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:80 msgid "Hungarian Support" msgstr "Supporto lingua ungherese" #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:73 -#: ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:78 +#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:81 msgid "Icelandic Support" msgstr "Supporto lingua islandese" #: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:74 -#: ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:79 +#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:82 msgid "Indonesian Support" msgstr "Supporto lingua indonesiana" #: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:75 -#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:82 ../comps-el4.xml.in.h:27 +#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:85 ../comps-el4.xml.in.h:27 #: ../comps-el5.xml.in.h:29 msgid "" "Install these packages in order to develop GTK+ and GNOME graphical " "applications." msgstr "" -"Installare questi pacchetti per sviluppare applicazioni grafiche per " -"GTK+ e GNOME." +"Installare questi pacchetti per sviluppare applicazioni grafiche per GTK+ e " +"GNOME." #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76 -#: ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:83 +#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:86 msgid "" "Install these packages in order to develop GTK+ and XFCE graphical " "applications." msgstr "" -"Installare questi pacchetti per sviluppare applicazioni grafiche per " -"GTK+ e XFCE." +"Installare questi pacchetti per sviluppare applicazioni grafiche per GTK+ e " +"XFCE." #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77 -#: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:84 ../comps-el4.xml.in.h:28 +#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:87 ../comps-el4.xml.in.h:28 #: ../comps-el5.xml.in.h:30 msgid "Install these packages to develop QT and KDE graphical applications." msgstr "" -"Installare questi pacchetti per sviluppare applicazioni grafiche per QT e KDE." +"Installare questi pacchetti per sviluppare applicazioni grafiche per QT e " +"KDE." #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78 -#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85 +#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:88 msgid "" "Install these tools to enable the system to print or act as a print server." msgstr "" -"Installare questi strumenti per abilitare il sistema alla stampa o per " -"farlo operare come server di stampa." +"Installare questi strumenti per abilitare il sistema alla stampa o per farlo " +"operare come server di stampa." #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79 -#: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../comps-el4.xml.in.h:29 +#: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:89 ../comps-el4.xml.in.h:29 #: ../comps-el5.xml.in.h:31 msgid "" "Install this group of packages to use the base graphical (X) user interface." msgstr "" -"Installare questo gruppo di pacchetti per utilizzare l'interfaccia " -"grafica di base (X)." +"Installare questo gruppo di pacchetti per utilizzare l'interfaccia grafica " +"di base (X)." #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81 -#: ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:88 +#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:91 msgid "Inuktitut Support" msgstr "Supporto lingua inuktitut" #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:82 -#: ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:89 +#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:92 msgid "Irish Support" msgstr "Supporto lingua irlandese" #: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:83 -#: ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:90 +#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:93 msgid "Italian Support" msgstr "Supporto lingua italiana" #: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:84 -#: ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:91 ../comps-el4.xml.in.h:30 +#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:30 #: ../comps-el5.xml.in.h:32 msgid "Japanese Support" msgstr "Supporto lingua giapponese" #: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:85 -#: ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:31 +#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:31 msgid "Java" msgstr "Java" #: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:86 -#: ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:93 ../comps-el4.xml.in.h:32 +#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:96 ../comps-el4.xml.in.h:32 msgid "Java Development" msgstr "Programmazione Java" #: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:87 -#: ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:33 +#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:97 ../comps-el4.xml.in.h:33 #: ../comps-el5.xml.in.h:33 msgid "KDE (K Desktop Environment)" msgstr "KDE (K Desktop Environment)" #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:88 -#: ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34 +#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:98 ../comps-el4.xml.in.h:34 #: ../comps-el5.xml.in.h:34 msgid "KDE Software Development" msgstr "Sviluppo applicazioni KDE" #: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:89 -#: ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:96 +#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:99 msgid "" "KDE is a powerful graphical user interface which includes a panel, desktop, " "system icons, and a graphical file manager." @@ -496,235 +501,237 @@ "file grafico, di un pannello desktop e delle icone di sistema." #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:90 -#: ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:97 +#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:100 msgid "Kannada Support" msgstr "Supporto lingua kannada" #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:92 -#: ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:100 +#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:103 msgid "Khmer Support" msgstr "Supporto lingua khmer" #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:93 -#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:103 +#: ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:106 msgid "Korean Support" msgstr "Supporto lingua coreana" #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95 -#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106 +#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:109 msgid "Languages" msgstr "Lingue" #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96 -#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107 +#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:110 msgid "Lao Support" msgstr "Supporto lingua laotiana" #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97 -#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108 +#: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:111 msgid "Latvian Support" msgstr "Supporto lingua latvia" #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99 -#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110 +#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:113 msgid "Legacy Network Server" msgstr "Server di rete legacy" #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100 -#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111 +#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:114 msgid "Legacy Software Development" msgstr "Sviluppo software legacy" #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101 -#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112 +#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:115 msgid "Legacy Software Support" msgstr "Supporto compatibilit?? software" #: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102 -#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113 +#: ../comps-f10.xml.in.h:109 ../comps-f11.xml.in.h:116 msgid "Lithuanian Support" msgstr "Supporto lingua lituana" #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105 -#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116 +#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:119 #: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36 msgid "Mail Server" msgstr "Server mail" #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106 -#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119 +#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:122 msgid "Malay Support" msgstr "Supporto lingua malese" #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107 -#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120 +#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:123 msgid "Malayalam Support" msgstr "Supporto lingua malayalam" #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108 -#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121 +#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:124 msgid "Maori Support" msgstr "Supporto lingua maori" #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109 -#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122 +#: ../comps-f10.xml.in.h:117 ../comps-f11.xml.in.h:125 msgid "Marathi Support" msgstr "Supporto lingua marathi" #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111 -#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124 +#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:127 msgid "MySQL Database" msgstr "Database MySQL" #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113 -#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127 +#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:130 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37 msgid "Network Servers" msgstr "Server di rete" #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114 -#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128 +#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:131 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38 msgid "News Server" msgstr "Server news" #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116 -#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130 +#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:133 msgid "Northern Sotho Support" msgstr "Supporto lingua sotho settentrionale" #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117 -#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131 +#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:134 msgid "Norwegian Support" msgstr "Supporto lingua norvegese" #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118 -#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133 +#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:136 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39 msgid "Office/Productivity" msgstr "Ufficio/Produttivit??" #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120 -#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135 +#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:139 msgid "Oriya Support" msgstr "Supporto lingua oriya" #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121 -#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136 +#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:140 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40 msgid "" "Packages which provide functionality for developing and building " "applications." msgstr "" -"Pacchetti che fornisco funzionalit?? di sviluppo e compilazione di applicazioni." +"Pacchetti che fornisco funzionalit?? di sviluppo e compilazione di " +"applicazioni." #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122 -#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137 +#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:141 msgid "Persian Support" msgstr "Supporto lingua persiana" #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123 -#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138 +#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:142 msgid "Polish Support" msgstr "Supporto lingua polacca" #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124 -#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139 +#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:143 msgid "Portuguese Support" msgstr "Supporto lingua portoghese" #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125 -#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140 +#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:144 msgid "PostgreSQL Database" msgstr "Database PostgreSQL" #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126 -#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141 +#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:145 msgid "Printing Support" msgstr "Supporto stampa" #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127 -#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142 +#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:146 msgid "Punjabi Support" msgstr "Supporto lingua punjabi" #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128 -#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143 +#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:147 msgid "Romanian Support" msgstr "Supporto lingua rumena" #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129 -#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144 +#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:148 msgid "Ruby" msgstr "Ruby" #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130 -#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145 +#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:149 msgid "Russian Support" msgstr "Supporto lingua russa" #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133 -#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148 +#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:151 msgid "Samoan Support" msgstr "Supporto lingua samoana" #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134 -#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149 +#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:152 msgid "Serbian Support" msgstr "Supporto lingua serba" #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135 -#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150 +#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:153 msgid "Server Configuration Tools" msgstr "Strumenti di sistema" #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136 -#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151 +#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:154 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41 msgid "Servers" msgstr "Server" #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137 -#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152 +#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:155 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42 msgid "" "Simple window managers that aren't part of a larger desktop environment." msgstr "" -"Window manager specifici che non fanno parte di ambienti desktop pi?? complessi." +"Window manager specifici che non fanno parte di ambienti desktop pi?? " +"complessi." #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138 -#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154 +#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:157 msgid "Sinhala Support" msgstr "Supporto lingua Sinhala" #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139 -#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155 +#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:158 msgid "Slovak Support" msgstr "Supporto ligua slovacca" #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140 -#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156 +#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:159 msgid "Slovenian Support" msgstr "Supporto lingua slovena" #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141 -#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157 +#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:160 msgid "Smallest possible installation" msgstr "Installazione minima" #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142 -#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158 +#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:161 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43 msgid "Software used for running network servers" msgstr "Applicazioni per l'esecuzione di server di rete" #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143 -#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159 +#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:162 msgid "Somali Support" msgstr "Supporto lingua somala" #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144 -#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160 +#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:163 msgid "" "Sometimes called text editors, these are programs that allow you to create " "and edit text files. This includes Emacs and Vi." @@ -733,77 +740,77 @@ "modificare file di testo. Sono compresi Emacs e Vi." #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145 -#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161 +#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:164 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45 msgid "Sound and Video" msgstr "Audio e video" #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146 -#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162 +#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:165 msgid "Southern Ndebele Support" msgstr "Supporto lingua ndebele meridionale" #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147 -#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163 +#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:166 msgid "Southern Sotho Support" msgstr "Supporto lingua sotho meridionale" #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148 -#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164 +#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:167 msgid "Spanish Support" msgstr "Supporto lingua spagnola" #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149 -#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166 +#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:169 #: ../comps-el4.xml.in.h:46 msgid "Support for developing programs in the Java programming language." msgstr "Supporto per lo sviluppo di programmi in linguaggio Java." #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150 -#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167 +#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:170 #: ../comps-el4.xml.in.h:47 msgid "Support for running programs written in the Java programming language." msgstr "Supporto per l'esecuzione di programmi sviluppati in liguaggio Java." #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151 -#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168 +#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:171 msgid "Swati Support" msgstr "Supporto lingua swati" #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152 -#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169 +#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:172 msgid "Swedish Support" msgstr "Supporto lingua svedese" #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153 -#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170 +#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:173 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46 msgid "System Tools" msgstr "Strumenti di sistema" #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154 -#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171 +#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:174 msgid "Tagalog Support" msgstr "Supporto lingua tagalog" #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155 -#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173 +#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:176 msgid "Tamil Support" msgstr "Supporto lingua tamil" #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156 -#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174 +#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:177 msgid "Telugu Support" msgstr "Supporto lingua telugu" #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157 -#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175 +#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:178 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47 msgid "Text-based Internet" msgstr "Applicazioni Internet in modalit?? testo" #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158 -#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176 +#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:179 msgid "Thai Support" msgstr "Supporto lingua tailandese" @@ -812,15 +819,15 @@ msgstr "L'ambiente integrato di sviluppo Eclipse." #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159 -#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177 +#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:180 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49 msgid "The applications include office suites, PDF viewers, and more." msgstr "" -"In questo pacchetto sono contenute applicazioni per l'ufficio, visualizzatori " -"di file PDF e altro." +"In questo pacchetto sono contenute applicazioni per l'ufficio, " +"visualizzatori di file PDF e altro." #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160 -#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178 +#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:181 msgid "" "The packages in this group are core libraries needed to develop applications." msgstr "" @@ -828,21 +835,21 @@ "sviluppo di applicazioni." #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161 -#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179 +#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:182 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50 msgid "These packages allow you to configure an IMAP or SMTP mail server." -msgstr "" -"Questi pacchetti permettono di configurare server di mail IMAP o SMTP." +msgstr "Questi pacchetti permettono di configurare server di mail IMAP o SMTP." #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162 -#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180 +#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:183 msgid "" "These packages allow you to develop applications for the X Window System." msgstr "" -"Questi pacchetti permettono di sviluppare applicazioni per il sistema X Window." +"Questi pacchetti permettono di sviluppare applicazioni per il sistema X " +"Window." #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163 -#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181 +#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:184 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51 msgid "" "These packages are helpful when developing web applications or web pages." @@ -850,14 +857,13 @@ "Questi pacchetti sono di aiuto per lo sviluppo di applicazioni e pagine web." #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164 -#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182 +#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:185 msgid "" "These packages include network-based servers such as DHCP, Kerberos and NIS." -msgstr "" -"Questi pacchetti includono server di rete come DHCP, Kerberos e NIS." +msgstr "Questi pacchetti includono server di rete come DHCP, Kerberos e NIS." #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165 -#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183 +#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:186 msgid "" "These packages include servers for old network protocols such as rsh and " "telnet." @@ -866,19 +872,19 @@ "rsh e telnet." #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166 -#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184 +#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:187 msgid "These packages provide a virtualization environment." msgstr "Questi pacchetti rendono disponibile un ambiente di virtualizzazione." #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167 -#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185 +#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:188 msgid "These packages provide compatibility with previous releases." msgstr "" "Questi pacchetti permettono di ottenere la compatibilit?? con release meno " "recenti." #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168 -#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186 +#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:189 msgid "" "These packages provide support for various locales including fonts and input " "methods." @@ -887,7 +893,7 @@ "caratteri e metodi di input." #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169 -#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187 +#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:190 msgid "" "These tools allow you to create documents in the DocBook format and convert " "them into HTML, PDF, Postscript, and text." @@ -896,51 +902,51 @@ "di convertirli nei formati HTML, PDF, Postscript e testo." #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170 -#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188 +#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:191 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53 msgid "These tools allow you to run a Web server on the system." msgstr "Questi strumenti permettono di eseguire un server Web nel sistema." #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171 -#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189 +#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:192 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54 msgid "These tools allow you to run an FTP server on the system." msgstr "Questi strumenti permettono di eseguire un server FTP nel sistema." #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172 -#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190 +#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:193 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55 msgid "" "These tools include core development tools such as automake, gcc, perl, " "python, and debuggers." msgstr "" -"Questo gruppo contiene strumenti di base per lo sviluppo di applicazioni, come " -"automake, gcc, perl, python e vari debugger." +"Questo gruppo contiene strumenti di base per lo sviluppo di applicazioni, " +"come automake, gcc, perl, python e vari debugger." #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173 -#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191 +#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:194 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56 msgid "This group allows you to configure the system as a news server." msgstr "Questo gruppo permette di configurare il sistema come server di news." #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174 -#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192 +#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:195 msgid "This group contains all of Red Hat's custom server configuration tools." msgstr "" "Questo gruppo contiene tutti gli strumenti personalizzati da Red Hat per la " "configurazione dei server." #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175 -#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193 +#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:196 msgid "" "This group includes a minimal set of packages. Useful for creating small " "router/firewall boxes, for example." msgstr "" -"Questo gruppo include un insieme minimo di pacchetti. Ad esempio, pu?? risultare " -"utile per implementare piccoli router/firewall." +"Questo gruppo include un insieme minimo di pacchetti. Ad esempio, pu?? " +"risultare utile per implementare piccoli router/firewall." #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176 -#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194 +#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:197 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57 msgid "This group includes graphical email, Web, and chat clients." msgstr "" @@ -948,7 +954,7 @@ "client di mail, browser Web e applicazioni di chat." #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177 -#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195 +#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:198 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58 msgid "" "This group includes packages for performing mathematical and scientific " @@ -959,24 +965,26 @@ "conversioni tra unit?? di misura." #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178 -#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196 +#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:199 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59 msgid "This group includes packages to help you manipulate and scan images." msgstr "" -"Questo gruppo contiene pacchetti per la scansione e l'elaborazione di immagini." +"Questo gruppo contiene pacchetti per la scansione e l'elaborazione di " +"immagini." #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179 -#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197 +#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:200 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60 msgid "" "This group includes text-based email, Web, and chat clients. These " "applications do not require the X Window System." msgstr "" -"Questo gruppo contiene applicazioni Internet testuali che non necessitano del " -"sistema X Window, tra cui browser Web, client di mail e programmi di chat." +"Questo gruppo contiene applicazioni Internet testuali che non necessitano " +"del sistema X Window, tra cui browser Web, client di mail e programmi di " +"chat." #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180 -#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198 +#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:201 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61 msgid "" "This group is a collection of graphical administration tools for the system, " @@ -987,7 +995,7 @@ "periferiche hardware." #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181 -#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199 +#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:202 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64 msgid "" "This group is a collection of tools and resources of Armenian environments." @@ -995,7 +1003,7 @@ "Questo gruppo contiene un insieme di strumenti e risorse per ambienti armeni." #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182 -#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200 +#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:203 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68 msgid "" "This group is a collection of tools for various hardware specific utilities." @@ -1003,18 +1011,18 @@ "Questo gruppo contiene strumenti specifici per vari componenti hardware." #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183 -#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202 +#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:205 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69 msgid "" "This group is a collection of various tools for the system, such as the " "client for connecting to SMB shares and tools to monitor network traffic." msgstr "" -"Questo gruppo contiene un insieme di strumenti di sistema, tra cui un'" -"applicazione per la connessione a condivisioni SMB e un programma per " +"Questo gruppo contiene un insieme di strumenti di sistema, tra cui " +"un'applicazione per la connessione a condivisioni SMB e un programma per " "monitorare il traffico di rete." #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184 -#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203 +#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:206 msgid "" "This package group allows you to run a DNS name server (BIND) on the system." msgstr "" @@ -1022,7 +1030,7 @@ "sistema." #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185 -#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204 +#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:207 msgid "" "This package group allows you to share files between Linux and MS Windows" "(tm) systems." @@ -1031,307 +1039,326 @@ "MS Windows(R)." #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186 -#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205 +#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:208 msgid "This package group contains packages useful for use with MySQL." msgstr "Questo gruppo contiene pacchetti utili per MySQL." #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187 -#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206 +#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:209 msgid "This package group includes packages useful for use with Postgresql." msgstr "Questo gruppo contiene pacchetti utili per PostgreSQL." #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188 -#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207 +#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:210 msgid "Tibetan Support" msgstr "Supporto lingua tibetana" #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189 -#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208 +#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:211 msgid "Tonga Support" msgstr "Supporto lingua tonga" #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190 -#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209 +#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:212 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70 msgid "Tools and Utilities needed by a Fedora Packager" msgstr "Strumenti e accessori necessari per creare e gestire pacchetti Fedora" #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191 -#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210 +#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:213 msgid "Tsonga Support" msgstr "Supporto lingua tsonga" #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192 -#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211 +#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:214 msgid "Tswana Support" msgstr "Supporto lingua tswana" #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193 -#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212 +#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:215 msgid "Turkish Support" msgstr "Supporto lingua turca" #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194 -#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214 +#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:217 msgid "Ukrainian Support" msgstr "Supporto lingua ucraina" #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195 -#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216 +#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:219 msgid "Urdu Support" msgstr "Supporto lingua urdu" #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196 -#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218 +#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:221 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71 msgid "Various core pieces of the system." msgstr "Vari componenti di base del sistema." #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197 -#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219 +#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:222 #: ../comps-el5.xml.in.h:72 msgid "Various ways to relax and spend your free time." msgstr "Vari modi per rilassarsi e intrattenersi nel tempo libero." #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198 -#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220 +#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:223 msgid "Venda Support" msgstr "Supporto lingua venda" #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199 -#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221 +#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:224 msgid "Vietnamese Support" msgstr "Supporto lingua vietnamita" #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200 -#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222 +#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:225 msgid "Virtualization" msgstr "Virtualizzazione" #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202 -#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224 +#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:227 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73 msgid "Web Development" msgstr "Sviluppo Web" #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203 -#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225 +#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:228 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74 msgid "Web Server" msgstr "Server Web" #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204 -#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226 +#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:229 msgid "Welsh Support" msgstr "Supporto lingua gallese" #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205 -#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227 +#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:230 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75 msgid "Window Managers" msgstr "Window manager" #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206 -#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228 +#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:231 msgid "Windows File Server" msgstr "File server Windows" #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207 -#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229 +#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:232 msgid "X Software Development" msgstr "Sviluppo applicazioni X" #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208 -#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230 +#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:233 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76 msgid "X Window System" msgstr "X Window System" #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209 -#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231 +#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:234 msgid "XFCE" msgstr "XFCE" #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210 -#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232 +#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:235 msgid "XFCE Software Development" msgstr "Sviluppo applicazioni XFCE" #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211 -#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233 +#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:236 msgid "Xhosa Support" msgstr "Supporto lingua Xhosa" #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212 -#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234 +#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:237 msgid "Zulu Support" msgstr "Supporto lingua zulu" -#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21 -#: ../comps-f11.xml.in.h:22 +#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 +#: ../comps-f11.xml.in.h:23 msgid "Buildsystem building group" msgstr "Buildsystem building group" -#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49 -#: ../comps-f11.xml.in.h:50 +#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 +#: ../comps-f11.xml.in.h:53 msgid "Fedora Eclipse" msgstr "Fedora Eclipse" -#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:53 -#: ../comps-f11.xml.in.h:55 +#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 +#: ../comps-f11.xml.in.h:58 msgid "Fonts" msgstr "Caratteri" -#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54 -#: ../comps-f11.xml.in.h:56 +#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 +#: ../comps-f11.xml.in.h:59 msgid "Fonts packages for rendering text on the desktop." msgstr "Pacchetti di caratteri per la rappresentazione di testo sul desktop." -#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83 -#: ../comps-f11.xml.in.h:87 +#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 +#: ../comps-f11.xml.in.h:90 msgid "Integrated Development Environments based on Eclipse." msgstr "Ambiente integrato di sviluppo basato su Eclipse." -#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104 -#: ../comps-f11.xml.in.h:109 +#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 +#: ../comps-f11.xml.in.h:112 msgid "Legacy Fonts" msgstr "Caratteri legacy" -#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109 -#: ../comps-f11.xml.in.h:114 +#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110 +#: ../comps-f11.xml.in.h:117 msgid "Low Saxon Support" msgstr "Supporto lingua low saxon" -#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117 -#: ../comps-f11.xml.in.h:123 +#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118 +#: ../comps-f11.xml.in.h:126 msgid "Mongolian Support" msgstr "Supporto lingua mongolese" -#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120 -#: ../comps-f11.xml.in.h:126 +#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121 +#: ../comps-f11.xml.in.h:129 msgid "Nepali Support" msgstr "Supporto lingua nepalese" -#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127 -#: ../comps-f11.xml.in.h:134 +#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128 +#: ../comps-f11.xml.in.h:137 msgid "Older bitmap and vector fonts packages" msgstr "Pacchetti di caratteri bitmap e vettoriali meno recenti" -#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45 +#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:48 msgid "Esperanto Support" msgstr "Supporto lingua esperanto" -#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99 +#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:102 msgid "Kashubian Support" msgstr "Supporto lingua kashubian" -#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104 +#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:107 msgid "Kurdish Support" msgstr "Supporto lingua curda" -#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110 -#: ../comps-f11.xml.in.h:115 +#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111 +#: ../comps-f11.xml.in.h:118 msgid "Macedonian Support" msgstr "Supporto lingua macedone" -#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123 -#: ../comps-f11.xml.in.h:129 +#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124 +#: ../comps-f11.xml.in.h:132 msgid "Northern Sami Support" msgstr "Supporto lingua sami settentrionale" -#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139 -#: ../comps-f11.xml.in.h:146 +#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140 +#: ../comps-f11.xml.in.h:150 msgid "SUGAR Desktop Environment" msgstr "Ambiente desktop SUGAR" -#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140 -#: ../comps-f11.xml.in.h:147 +#: ../comps-f9.xml.in.h:132 msgid "SUGAR is the desktop environment developed for the OLPC XO." msgstr "SUGAR ?? l'ambiente desktop sviluppato dal progetto OLPC XO." #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213 -#: ../comps-f11.xml.in.h:223 +#: ../comps-f11.xml.in.h:226 msgid "Walloon Support" msgstr "Supporto lingua walloon" -#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74 +#: ../comps-f10.xml.in.h:2 ../comps-f11.xml.in.h:2 +#, fuzzy +msgid "A software playground for learning about learning." +msgstr "Un software per apprendere sull'apprendimento." + +#: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:77 msgid "Haskell Development" msgstr "Sviluppo haskell" -#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80 +#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:83 msgid "Input Methods" msgstr "Metodi di input" -#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81 +#: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:84 msgid "Input method packages for the input of international text." msgstr "" "Pacchetti contenenti metodi per l'inserimento internazionalizzato di testi." -#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98 +#: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:101 msgid "Kashmiri Support" msgstr "Supporto lingua kashmiri" -#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102 +#: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:105 msgid "Konkani Support" msgstr "Supporto lingua konkani" -#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105 +#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:108 msgid "LXDE" msgstr "LXDE" -#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117 +#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:120 msgid "Maithili Support" msgstr "Supprto lingua maithili" -#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125 +#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:128 msgid "Myanmar (Burmese) Support" msgstr "Supporto lingua burmese (Myanmar)" -#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153 +#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:156 msgid "Sindhi Support" msgstr "Supporto lingua sindhi" -#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165 +#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:168 msgid "Support for developing programs in the Haskell programming language." msgstr "Supporto per lo sviluppo di programmi nel linguaggio Haskell." -#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172 +#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:175 msgid "Tajik Support" msgstr "Supporto lingua tajika" -#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217 +#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:220 msgid "Uzbek Support" msgstr "Supporto lingua uzbeca" -#: ../comps-f11.xml.in.h:5 +#: ../comps-f11.xml.in.h:6 msgid "Amazigh Support" msgstr "Supporto lingua amazigh" -#: ../comps-f11.xml.in.h:54 +#: ../comps-f11.xml.in.h:34 +#, fuzzy +msgid "Design and Simulation tools for hardware engineers" +msgstr "Strumenti per Progetti e Simulazioni per ingegneri." + +#: ../comps-f11.xml.in.h:45 +#, fuzzy +msgid "Electronic Lab" +msgstr "Electronic Lab" + +#: ../comps-f11.xml.in.h:57 msgid "Font design and packaging" msgstr "Sviluppo e gestione font" -#: ../comps-f11.xml.in.h:58 +#: ../comps-f11.xml.in.h:61 msgid "Frisian Support" msgstr "Supporto lingua frisia" -#: ../comps-f11.xml.in.h:59 +#: ../comps-f11.xml.in.h:62 msgid "Friulian Support" msgstr "Supporto lingua friulana" -#: ../comps-f11.xml.in.h:101 +#: ../comps-f11.xml.in.h:104 msgid "Kinyarwanda Support" msgstr "Supporto lingua kinyarwanda" -#: ../comps-f11.xml.in.h:118 +#: ../comps-f11.xml.in.h:121 msgid "Malagasy Support" msgstr "Supporto lingua malagasy" -#: ../comps-f11.xml.in.h:132 +#: ../comps-f11.xml.in.h:135 msgid "Occitan Support" msgstr "Supporto lingua occitana" -#: ../comps-f11.xml.in.h:201 +#: ../comps-f11.xml.in.h:138 +#, fuzzy +msgid "Online Help and Documentation" +msgstr "Documentazione e Aiuto Online" + +#: ../comps-f11.xml.in.h:204 msgid "" "This group is a collection of tools used in the design, modification, " "manipulation, and packaging of fonts." @@ -1339,11 +1366,11 @@ "Questo gruppo contiene un insieme di strumenti utili per la creazione, la " "modifica, la manipolazione e pacchettizzazione di font." -#: ../comps-f11.xml.in.h:213 +#: ../comps-f11.xml.in.h:216 msgid "Turkmen Support" msgstr "Supporto lingua turkmena" -#: ../comps-f11.xml.in.h:215 +#: ../comps-f11.xml.in.h:218 msgid "Upper Sorbian Support" msgstr "Supporto lingua upper sorbian" @@ -1428,3 +1455,4 @@ "Questo gruppo contiene un insieme di strumenti e risorse per ambienti in " "lingua ceca." + From hno at fedoraproject.org Fri Mar 6 13:27:21 2009 From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=) Date: Fri, 6 Mar 2009 13:27:21 +0000 (UTC) Subject: rpms/bzr/F-10 .cvsignore, 1.32, 1.33 bzr.spec, 1.45, 1.46 sources, 1.32, 1.33 Message-ID: <20090306132721.7A2AF70116@cvs1.fedora.phx.redhat.com> Author: hno Update of /cvs/pkgs/rpms/bzr/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31625 Modified Files: .cvsignore bzr.spec sources Log Message: Update to 1.12 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bzr/F-10/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 19 Jan 2009 13:21:15 -0000 1.32 +++ .cvsignore 6 Mar 2009 13:26:50 -0000 1.33 @@ -1 +1 @@ -bzr-1.11.tar.gz +bzr-1.12.tar.gz Index: bzr.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr/F-10/bzr.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- bzr.spec 19 Jan 2009 13:21:15 -0000 1.45 +++ bzr.spec 6 Mar 2009 13:26:51 -0000 1.46 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} # bzr major versions uses two digits. Specify subreleases if any in Version: -%define bzrver 1.11 +%define bzrver 1.12 Name: bzr Version: %{bzrver} @@ -80,6 +80,9 @@ %endif %changelog +* Fri Mar 06 2009 Henrik Nordstrom - 1.12-1 +- Update to 1.12 + * Mon Jan 19 2009 Henrik Nordstrom - 1.11-1 - Update to 1.11 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bzr/F-10/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 19 Jan 2009 13:21:15 -0000 1.32 +++ sources 6 Mar 2009 13:26:51 -0000 1.33 @@ -1 +1 @@ -08f8e60cfd7a60e8a2552dee0df9a7e8 bzr-1.11.tar.gz +331ceefccbe39ddff610a1a847bd611a bzr-1.12.tar.gz From hno at fedoraproject.org Fri Mar 6 13:31:25 2009 From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=) Date: Fri, 6 Mar 2009 13:31:25 +0000 (UTC) Subject: rpms/bzrtools/F-10 bzrtools.spec,1.37,1.38 Message-ID: <20090306133125.D0B1F70116@cvs1.fedora.phx.redhat.com> Author: hno Update of /cvs/pkgs/rpms/bzrtools/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32703 Modified Files: bzrtools.spec Log Message: Update to 1.12.0 Index: bzrtools.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzrtools/F-10/bzrtools.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- bzrtools.spec 19 Jan 2009 13:23:27 -0000 1.37 +++ bzrtools.spec 6 Mar 2009 13:30:55 -0000 1.38 @@ -5,8 +5,8 @@ # (bzrlib is arch dependent. Thus bzrlib plugins are also arch dependent.) %define debug_package %{nil} -%define bzrver 1.11 -%define bzrnextver 1.12 +%define bzrver 1.12 +%define bzrnextver 1.13 Name: bzrtools Version: %{bzrver}.0 @@ -71,6 +71,9 @@ %endif %changelog +* Fri Mar 06 2009 Henrik Nordstrom - 1.12.0-1 +- Update to 1.12.0 + * Mon Jan 19 2009 Henrik Nordstrom - 1.11.0-1 - Update to 1.11.0 From berrange at fedoraproject.org Fri Mar 6 13:32:09 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Fri, 6 Mar 2009 13:32:09 +0000 (UTC) Subject: rpms/libvirt/devel libvirt-0.6.1-vnc-sasl-auth.patch, NONE, 1.1 libvirt.spec, 1.116, 1.117 Message-ID: <20090306133209.3F45B70116@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv401 Modified Files: libvirt.spec Added Files: libvirt-0.6.1-vnc-sasl-auth.patch Log Message: Fix crash after storage vol deletion fails. Add SASL auth support in QEMU libvirt-0.6.1-vnc-sasl-auth.patch: --- NEW FILE libvirt-0.6.1-vnc-sasl-auth.patch --- diff -r 961d4b1ca1d3 qemud/libvirtd_qemu.aug --- a/qemud/libvirtd_qemu.aug Wed Mar 04 13:17:44 2009 +0000 +++ b/qemud/libvirtd_qemu.aug Thu Mar 05 14:22:50 2009 +0000 @@ -27,6 +27,8 @@ module Libvirtd_qemu = | str_entry "vnc_tls_x509_cert_dir" | bool_entry "vnc_tls_x509_verify" | str_entry "vnc_password" + | bool_entry "vnc_sasl" + | str_entry "vnc_sasl_dir" (* Each enty in the config is one of the following three ... *) let entry = vnc_entry diff -r 961d4b1ca1d3 qemud/test_libvirtd_qemu.aug --- a/qemud/test_libvirtd_qemu.aug Wed Mar 04 13:17:44 2009 +0000 +++ b/qemud/test_libvirtd_qemu.aug Thu Mar 05 14:22:50 2009 +0000 @@ -60,6 +60,25 @@ vnc_tls_x509_verify = 1 # example here before you set this # vnc_password = \"XYZ12345\" + + +# Enable use of SASL encryption on the VNC server. This requires +# a VNC client which supports the SASL protocol extension. +# Examples include vinagre, virt-viewer and virt-manager +# itself. UltraVNC, RealVNC, TightVNC do not support this +# +# It is necessary to configure /etc/sasl2/qemu.conf to choose +# the desired SASL plugin (eg, GSSPI for Kerberos) +# +vnc_sasl = 1 + + +# The default SASL configuration file is located in /etc/sasl2/ +# When running libvirtd unprivileged, it may be desirable to +# override the configs in this location. Set this parameter to +# point to the directory, and create a qemu.conf in that location +# +vnc_sasl_dir = \"/some/directory/sasl2\" " test Libvirtd_qemu.lns get conf = @@ -123,3 +142,22 @@ vnc_password = \"XYZ12345\" { "#comment" = "example here before you set this" } { "#comment" = "" } { "vnc_password" = "XYZ12345" } +{ "#empty" } +{ "#empty" } +{ "#comment" = "Enable use of SASL encryption on the VNC server. This requires" } +{ "#comment" = "a VNC client which supports the SASL protocol extension." } +{ "#comment" = "Examples include vinagre, virt-viewer and virt-manager" } +{ "#comment" = "itself. UltraVNC, RealVNC, TightVNC do not support this" } +{ "#comment" = "" } +{ "#comment" = "It is necessary to configure /etc/sasl2/qemu.conf to choose" } +{ "#comment" = "the desired SASL plugin (eg, GSSPI for Kerberos)" } +{ "#comment" = "" } +{ "vnc_sasl" = "1" } +{ "#empty" } +{ "#empty" } +{ "#comment" = "The default SASL configuration file is located in /etc/sasl2/" } +{ "#comment" = "When running libvirtd unprivileged, it may be desirable to" } +{ "#comment" = "override the configs in this location. Set this parameter to" } +{ "#comment" = "point to the directory, and create a qemu.conf in that location" } +{ "#comment" = "" } +{ "vnc_sasl_dir" = "/some/directory/sasl2" } diff -r 961d4b1ca1d3 src/qemu.conf --- a/src/qemu.conf Wed Mar 04 13:17:44 2009 +0000 +++ b/src/qemu.conf Thu Mar 05 14:22:50 2009 +0000 @@ -60,6 +60,27 @@ # vnc_password = "XYZ12345" +# Enable use of SASL encryption on the VNC server. This requires +# a VNC client which supports the SASL protocol extension. +# Examples include vinagre, virt-viewer and virt-manager +# itself. UltraVNC, RealVNC, TightVNC do not support this +# +# It is necessary to configure /etc/sasl2/qemu.conf to choose +# the desired SASL plugin (eg, GSSPI for Kerberos) +# +# vnc_sasl = 1 + + +# The default SASL configuration file is located in /etc/sasl2/ +# When running libvirtd unprivileged, it may be desirable to +# override the configs in this location. Set this parameter to +# point to the directory, and create a qemu.conf in that location +# +# vnc_sasl_dir = "/some/directory/sasl2" + + + + # The default security driver is SELinux. If SELinux is disabled # on the host, then the security driver will automatically disable # itself. If you wish to disable QEMU SELinux security driver while diff -r 961d4b1ca1d3 src/qemu_conf.c --- a/src/qemu_conf.c Wed Mar 04 13:17:44 2009 +0000 +++ b/src/qemu_conf.c Thu Mar 05 14:22:50 2009 +0000 @@ -161,6 +161,21 @@ int qemudLoadDriverConfig(struct qemud_d } } + p = virConfGetValue (conf, "vnc_sasl"); + CHECK_TYPE ("vnc_sasl", VIR_CONF_LONG); + if (p) driver->vncSASL = p->l; + + p = virConfGetValue (conf, "vnc_sasl_dir"); + CHECK_TYPE ("vnc_sasl_dir", VIR_CONF_STRING); + if (p && p->str) { + VIR_FREE(driver->vncSASLdir); + if (!(driver->vncSASLdir = strdup(p->str))) { + virReportOOMError(NULL); + virConfFree(conf); + return -1; + } + } + virConfFree (conf); return 0; } @@ -838,15 +853,20 @@ int qemudBuildCommandLine(virConnectPtr goto no_memory; \ } while (0) +#define ADD_ENV_PAIR(envname, val) \ + do { \ + char *envval; \ + ADD_ENV_SPACE; \ + if (virAsprintf(&envval, "%s=%s", envname, val) < 0) \ + goto no_memory; \ + qenv[qenvc++] = envval; \ + } while (0) + #define ADD_ENV_COPY(envname) \ do { \ char *val = getenv(envname); \ - char *envval; \ - ADD_ENV_SPACE; \ if (val != NULL) { \ - if (virAsprintf(&envval, "%s=%s", envname, val) < 0) \ - goto no_memory; \ - qenv[qenvc++] = envval; \ + ADD_ENV_PAIR(envname, val); \ } \ } while (0) @@ -1295,6 +1315,15 @@ int qemudBuildCommandLine(virConnectPtr driver->vncTLSx509certdir); } } + + if (driver->vncSASL) { + virBufferAddLit(&opt, ",sasl"); + + if (driver->vncSASLdir) + ADD_ENV_PAIR("SASL_CONF_DIR", driver->vncSASLdir); + + /* TODO: Support ACLs later */ + } } else { virBufferVSprintf(&opt, "%d", vm->def->graphics->data.vnc.port - 5900); diff -r 961d4b1ca1d3 src/qemu_conf.h --- a/src/qemu_conf.h Wed Mar 04 13:17:44 2009 +0000 +++ b/src/qemu_conf.h Thu Mar 05 14:22:50 2009 +0000 @@ -73,9 +73,11 @@ struct qemud_driver { char *stateDir; unsigned int vncTLS : 1; unsigned int vncTLSx509verify : 1; + unsigned int vncSASL : 1; char *vncTLSx509certdir; char *vncListen; char *vncPassword; + char *vncSASLdir; virCapsPtr caps; diff -r 961d4b1ca1d3 src/qemu_driver.c --- a/src/qemu_driver.c Wed Mar 04 13:17:44 2009 +0000 +++ b/src/qemu_driver.c Thu Mar 05 14:22:50 2009 +0000 @@ -620,6 +620,7 @@ qemudShutdown(void) { VIR_FREE(qemu_driver->vncTLSx509certdir); VIR_FREE(qemu_driver->vncListen); VIR_FREE(qemu_driver->vncPassword); + VIR_FREE(qemu_driver->vncSASLdir); /* Free domain callback list */ virDomainEventCallbackListFree(qemu_driver->domainEventCallbacks); diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args Thu Mar 05 14:22:50 2009 +0000 @@ -0,0 +1,1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test SASL_CONF_DIR=/root/.sasl2 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3,sasl diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml Thu Mar 05 14:22:50 2009 +0000 @@ -0,0 +1,24 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219200 + 219200 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + + + + + diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args Thu Mar 05 14:22:50 2009 +0000 @@ -0,0 +1,1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test SASL_CONF_DIR=/root/.sasl2 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3,tls,x509verify=/etc/pki/tls/qemu,sasl diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml Thu Mar 05 14:22:50 2009 +0000 @@ -0,0 +1,24 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219200 + 219200 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + + + + + diff -r 961d4b1ca1d3 tests/qemuxml2argvtest.c --- a/tests/qemuxml2argvtest.c Wed Mar 04 13:17:44 2009 +0000 +++ b/tests/qemuxml2argvtest.c Thu Mar 05 14:22:50 2009 +0000 @@ -213,6 +213,19 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_DRIVE_CACHE_V2); DO_TEST("disk-usb", 0); DO_TEST("graphics-vnc", 0); + + driver.vncSASL = 1; + driver.vncSASLdir = strdup("/root/.sasl2"); + DO_TEST("graphics-vnc-sasl", 0); + driver.vncTLS = 1; + driver.vncTLSx509verify = 1; + driver.vncTLSx509certdir = strdup("/etc/pki/tls/qemu"); + DO_TEST("graphics-vnc-tls", 0); + driver.vncSASL = driver.vncTLSx509verify = driver.vncTLS = 0; + free(driver.vncSASLdir); + free(driver.vncTLSx509certdir); + driver.vncSASLdir = driver.vncTLSx509certdir = NULL; + DO_TEST("graphics-sdl", 0); DO_TEST("graphics-sdl-fullscreen", 0); DO_TEST("input-usbmouse", 0); Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- libvirt.spec 5 Mar 2009 10:10:19 -0000 1.116 +++ libvirt.spec 6 Mar 2009 13:31:38 -0000 1.117 @@ -47,10 +47,14 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.1 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz +Patch1: libvirt-%{version}-storage-delete-fail.patch + +# Not upstream yet - pending QEMU merge +Patch100: libvirt-%{version}-vnc-sasl-auth.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -179,6 +183,9 @@ %prep %setup -q +%patch1 -p1 + +%patch100 -p1 mv NEWS NEWS.old iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS @@ -471,6 +478,10 @@ %endif %changelog +* Fri Mar 6 2009 Daniel P. Berrange - 0.6.1-2.fc11 +- Fix crash after storage vol deletion fails +- Add patch to enable VNC SASL authentication + * Wed Mar 4 2009 Daniel Veillard - 0.6.1-1.fc11 - upstream release 0.6.1 - support for node device detach reattach and reset From mgrepl at fedoraproject.org Fri Mar 6 13:34:28 2009 From: mgrepl at fedoraproject.org (Miroslav Grepl) Date: Fri, 6 Mar 2009 13:34:28 +0000 (UTC) Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.258, 1.259 selinux-policy.spec, 1.741, 1.742 Message-ID: <20090306133428.A578570116@cvs1.fedora.phx.redhat.com> Author: mgrepl Update of /cvs/extras/rpms/selinux-policy/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv793 Modified Files: policy-20071130.patch selinux-policy.spec Log Message: - Fix wine labeling policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- policy-20071130.patch 5 Mar 2009 13:53:45 -0000 1.258 +++ policy-20071130.patch 6 Mar 2009 13:34:25 -0000 1.259 @@ -578584,8 +578584,8 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-3.3.1/policy/modules/apps/wine.fc --- nsaserefpolicy/policy/modules/apps/wine.fc 2008-02-26 14:23:12.000000000 +0100 -+++ serefpolicy-3.3.1/policy/modules/apps/wine.fc 2009-02-12 22:21:57.000000000 +0100 -@@ -1,4 +1,6 @@ ++++ serefpolicy-3.3.1/policy/modules/apps/wine.fc 2009-03-05 19:08:30.000000000 +0100 +@@ -1,4 +1,13 @@ /usr/bin/wine -- gen_context(system_u:object_r:wine_exec_t,s0) -/opt/cxoffice/bin/wine -- gen_context(system_u:object_r:wine_exec_t,s0) @@ -578594,6 +578594,13 @@ +/opt/picasa/wine/bin/wine.* -- gen_context(system_u:object_r:wine_exec_t,s0) +/opt/google/picasa(/.*)?/bin/wine.* -- gen_context(system_u:object_r:wine_exec_t,s0) +HOME_DIR/cxoffice/bin/wine.* -- gen_context(system_u:object_r:wine_exec_t,s0) ++ ++/usr/bin/msiexec -- gen_context(system_u:object_r:wine_exec_t,s0) ++/usr/bin/notepad -- gen_context(system_u:object_r:wine_exec_t,s0) ++/usr/bin/regsvr32 -- gen_context(system_u:object_r:wine_exec_t,s0) ++/usr/bin/regedit -- gen_context(system_u:object_r:wine_exec_t,s0) ++/usr/bin/uninstaller -- gen_context(system_u:object_r:wine_exec_t,s0) ++/usr/bin/progman -- gen_context(system_u:object_r:wine_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.3.1/policy/modules/apps/wine.if --- nsaserefpolicy/policy/modules/apps/wine.if 2008-02-26 14:23:12.000000000 +0100 +++ serefpolicy-3.3.1/policy/modules/apps/wine.if 2009-02-12 22:21:57.000000000 +0100 @@ -650880,7 +650887,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.3.1/policy/modules/services/dovecot.te --- nsaserefpolicy/policy/modules/services/dovecot.te 2008-02-26 14:23:10.000000000 +0100 -+++ serefpolicy-3.3.1/policy/modules/services/dovecot.te 2009-02-27 09:21:55.000000000 +0100 ++++ serefpolicy-3.3.1/policy/modules/services/dovecot.te 2009-03-06 12:34:34.000000000 +0100 @@ -15,6 +15,15 @@ domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t) role system_r types dovecot_auth_t; @@ -650980,7 +650987,7 @@ files_read_usr_symlinks(dovecot_auth_t) files_search_tmp(dovecot_auth_t) files_read_var_lib_files(dovecot_t) -@@ -184,5 +213,55 @@ +@@ -184,5 +213,59 @@ ') optional_policy(` @@ -650996,7 +651003,7 @@ +optional_policy(` + postfix_manage_private_sockets(dovecot_auth_t) + postfix_search_spool(dovecot_auth_t) - ') ++') + +# for gssapi (kerberos) +userdom_list_unpriv_users_tmp(dovecot_auth_t) @@ -651012,6 +651019,10 @@ +allow dovecot_deliver_t dovecot_etc_t:file read_file_perms; +allow dovecot_deliver_t dovecot_var_run_t:dir list_dir_perms; + ++manage_dirs_pattern(dovecot_deliver_t, dovecot_spool_t, dovecot_spool_t) ++manage_files_pattern(dovecot_deliver_t, dovecot_spool_t, dovecot_spool_t) ++manage_lnk_files_pattern(dovecot_deliver_t, dovecot_spool_t, dovecot_spool_t) ++ +kernel_read_all_sysctls(dovecot_deliver_t) +kernel_read_system_state(dovecot_deliver_t) + @@ -651035,7 +651046,7 @@ + +optional_policy(` + mta_manage_spool(dovecot_deliver_t) -+') + ') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.if serefpolicy-3.3.1/policy/modules/services/exim.if --- nsaserefpolicy/policy/modules/services/exim.if 2008-02-26 14:23:10.000000000 +0100 @@ -651441,18 +651452,41 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.fc serefpolicy-3.3.1/policy/modules/services/fetchmail.fc --- nsaserefpolicy/policy/modules/services/fetchmail.fc 2008-02-26 14:23:10.000000000 +0100 -+++ serefpolicy-3.3.1/policy/modules/services/fetchmail.fc 2009-02-12 22:21:57.000000000 +0100 -@@ -17,3 +17,4 @@ ++++ serefpolicy-3.3.1/policy/modules/services/fetchmail.fc 2009-03-06 12:50:36.000000000 +0100 +@@ -15,5 +15,7 @@ + # /var + # ++/var/log/fetchmail\.log -- gen_context(system_u:object_r:fetchmail_log_t,s0) /var/run/fetchmail/.* -- gen_context(system_u:object_r:fetchmail_var_run_t,s0) /var/mail/\.fetchmail-UIDL-cache -- gen_context(system_u:object_r:fetchmail_uidl_cache_t,s0) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.if serefpolicy-3.3.1/policy/modules/services/fetchmail.if --- nsaserefpolicy/policy/modules/services/fetchmail.if 2008-02-26 14:23:10.000000000 +0100 -+++ serefpolicy-3.3.1/policy/modules/services/fetchmail.if 2009-02-12 22:21:57.000000000 +0100 -@@ -1 +1,44 @@ ++++ serefpolicy-3.3.1/policy/modules/services/fetchmail.if 2009-03-06 12:32:36.000000000 +0100 +@@ -1 +1,64 @@ ## Remote-mail retrieval and forwarding utility + ++###################################### ++## ++## Allow the specified domain to append ++## fetchmail log files. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`fetchmail_append_log',` ++ gen_require(` ++ type fetchmail_log_t; ++ ') ++ ++ logging_search_logs($1) ++ append_files_pattern($1, fetchmail_log_t, fetchmail_log_t) ++') ++ +######################################## +## +## All of the rules required to administrate @@ -651497,8 +651531,8 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-3.3.1/policy/modules/services/fetchmail.te --- nsaserefpolicy/policy/modules/services/fetchmail.te 2008-02-26 14:23:10.000000000 +0100 -+++ serefpolicy-3.3.1/policy/modules/services/fetchmail.te 2009-02-12 22:21:57.000000000 +0100 -@@ -14,7 +14,7 @@ ++++ serefpolicy-3.3.1/policy/modules/services/fetchmail.te 2009-03-06 12:32:01.000000000 +0100 +@@ -14,11 +14,14 @@ files_pid_file(fetchmail_var_run_t) type fetchmail_etc_t; @@ -651507,7 +651541,24 @@ type fetchmail_uidl_cache_t; files_type(fetchmail_uidl_cache_t) -@@ -90,6 +90,10 @@ + ++type fetchmail_log_t; ++logging_log_file(fetchmail_log_t) ++ + ######################################## + # + # Local policy +@@ -40,6 +43,9 @@ + manage_files_pattern(fetchmail_t,fetchmail_var_run_t,fetchmail_var_run_t) + files_pid_filetrans(fetchmail_t,fetchmail_var_run_t,file) + ++manage_files_pattern(fetchmail_t, fetchmail_log_t, fetchmail_log_t) ++logging_log_filetrans(fetchmail_t,fetchmail_log_t,file) ++ + kernel_read_kernel_sysctls(fetchmail_t) + kernel_list_proc(fetchmail_t) + kernel_getattr_proc_files(fetchmail_t) +@@ -90,6 +96,10 @@ ') optional_policy(` @@ -660469,7 +660520,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.3.1/policy/modules/services/procmail.te --- nsaserefpolicy/policy/modules/services/procmail.te 2008-02-26 14:23:10.000000000 +0100 -+++ serefpolicy-3.3.1/policy/modules/services/procmail.te 2009-02-12 22:21:57.000000000 +0100 ++++ serefpolicy-3.3.1/policy/modules/services/procmail.te 2009-03-06 12:34:01.000000000 +0100 @@ -14,6 +14,10 @@ type procmail_tmp_t; files_tmp_file(procmail_tmp_t) @@ -660503,10 +660554,14 @@ files_read_etc_files(procmail_t) files_read_etc_runtime_files(procmail_t) -@@ -102,6 +114,15 @@ +@@ -102,6 +114,19 @@ ') optional_policy(` ++ fetchmail_append_log(procmail_t) ++') ++ ++optional_policy(` + cron_read_pipes(procmail_t) +') + @@ -660519,7 +660574,7 @@ munin_dontaudit_search_lib(procmail_t) ') -@@ -116,11 +137,13 @@ +@@ -116,11 +141,13 @@ optional_policy(` pyzor_domtrans(procmail_t) @@ -660533,7 +660588,7 @@ sendmail_rw_tcp_sockets(procmail_t) sendmail_rw_unix_stream_sockets(procmail_t) ') -@@ -129,7 +152,11 @@ +@@ -129,7 +156,11 @@ corenet_udp_bind_generic_port(procmail_t) corenet_dontaudit_udp_bind_all_ports(procmail_t) Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v retrieving revision 1.741 retrieving revision 1.742 diff -u -r1.741 -r1.742 --- selinux-policy.spec 27 Feb 2009 08:50:01 -0000 1.741 +++ selinux-policy.spec 6 Mar 2009 13:34:26 -0000 1.742 @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 125%{?dist} +Release: 126%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -444,6 +444,10 @@ %endif %changelog +* Fri Mar 6 2009 Miroslav Grepl 3.3.1-126 +- Fix pcscd policy +- Allow alsa to read hardware state information + * Thu Feb 27 2009 Miroslav Grepl 3.3.1-125 - Fix qemu labeling - Fix mysqld_safe policy From hno at fedoraproject.org Fri Mar 6 13:34:42 2009 From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=) Date: Fri, 6 Mar 2009 13:34:42 +0000 (UTC) Subject: rpms/bzrtools/F-10 .cvsignore,1.24,1.25 sources,1.26,1.27 Message-ID: <20090306133442.6559070116@cvs1.fedora.phx.redhat.com> Author: hno Update of /cvs/pkgs/rpms/bzrtools/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1126 Modified Files: .cvsignore sources Log Message: Update to 1.12.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bzrtools/F-10/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 11 Dec 2008 22:01:36 -0000 1.24 +++ .cvsignore 6 Mar 2009 13:34:12 -0000 1.25 @@ -1 +1 @@ -bzrtools-1.10.0.tar.gz +bzrtools-1.12.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bzrtools/F-10/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 19 Jan 2009 13:33:08 -0000 1.26 +++ sources 6 Mar 2009 13:34:12 -0000 1.27 @@ -1 +1 @@ -fab16ba04be463fcc1684cc7f5fe0246 bzrtools-1.11.0.tar.gz +3e5b9b090da951205db9608a4091e706 bzrtools-1.12.0.tar.gz From jreznik at fedoraproject.org Fri Mar 6 13:35:26 2009 From: jreznik at fedoraproject.org (Jaroslav Reznik) Date: Fri, 6 Mar 2009 13:35:26 +0000 (UTC) Subject: rpms/gnash/F-10 .cvsignore, 1.9, 1.10 gnash.spec, 1.45, 1.46 sources, 1.9, 1.10 gnash-0.8.4-configure.patch, 1.1, NONE gnash-0.8.4-fix-kde4-port-2.patch, 1.1, NONE gnash-0.8.4-port-to-kde4.patch, 1.2, NONE gnash-kde4-x11embed-resize.patch, 1.1, NONE gnash-kde4-x11embed.patch, 1.1, NONE Message-ID: <20090306133526.5BC9270116@cvs1.fedora.phx.redhat.com> Author: jreznik Update of /cvs/pkgs/rpms/gnash/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1365 Modified Files: .cvsignore gnash.spec sources Removed Files: gnash-0.8.4-configure.patch gnash-0.8.4-fix-kde4-port-2.patch gnash-0.8.4-port-to-kde4.patch gnash-kde4-x11embed-resize.patch gnash-kde4-x11embed.patch Log Message: * Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-1 - update to 0.8.5 - remove use_kde3_executable_hack - remove autoreconf Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnash/F-10/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Oct 2008 14:06:34 -0000 1.9 +++ .cvsignore 6 Mar 2009 13:34:55 -0000 1.10 @@ -1,2 +1,2 @@ -gnash-0.8.4.tar.gz +gnash-0.8.5.tar.gz gnash-splash.swf Index: gnash.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnash/F-10/gnash.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- gnash.spec 13 Nov 2008 21:57:20 -0000 1.45 +++ gnash.spec 6 Mar 2009 13:34:56 -0000 1.46 @@ -1,11 +1,6 @@ -# The KDE 4 executable should be working now. -# set this to 1 to use the KDE 3 one with the KDE 4 KPart (for use in Konq 4) -# (It uses XEmbed, so it doesn't actually link KDE 3 stuff into Konqueror 4.) -%define use_kde3_executable 0 - Name: gnash -Version: 0.8.4 -Release: 5%{?dist} +Version: 0.8.5 +Release: 1%{?dist} Summary: GNU flash movie player Group: Applications/Multimedia @@ -16,22 +11,12 @@ Source2: gnash.desktop Patch0: gnash-0.8.3-manual.patch -# make autoreconf work -Patch1: gnash-0.8.4-configure.patch -# patch by Benjamin Wolsey and Bernhard Rosenkr??nzer -Patch2: gnash-0.8.4-port-to-kde4.patch # register KComponentData properly in KDE 4 KPart Patch3: gnash-0.8.3-fix-kde4-port.patch # Currently kde4-gnash (from kde4 branch) links against various KDE libraries, # but only needs Qt -- this patch removes the superfluous linkage (from bero) -Patch4: gnash-kde4-no-excessive-linkage.patch -# This patch adds XEmbed support so kde4-gnash can be used in browser plugins -# and the likes) (from bero) -Patch5: gnash-kde4-x11embed.patch -# XEmbed resizing patch (from bero) -Patch6: gnash-kde4-x11embed-resize.patch -# Missing hunks in the port-to-kde4 patch (from the upstream kde4 branch) -Patch7: gnash-0.8.4-fix-kde4-port-2.patch +# TODO: update to 0.8.5? +#Patch4: gnash-kde4-no-excessive-linkage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel libpng-devel libjpeg-devel libogg-devel @@ -44,10 +29,7 @@ BuildRequires: SDL-devel BuildRequires: agg-devel BuildRequires: kde-filesystem -BuildRequires: kdelibs4-devel -%if 0%{?use_kde3_executable} -BuildRequires: kdelibs3-devel -%endif +BuildRequires: kdelibs-devel BuildRequires: gtkglext-devel BuildRequires: docbook2X BuildRequires: %{_bindir}/docbook2pdf @@ -56,8 +38,6 @@ BuildRequires: giflib-devel BuildRequires: gettext BuildRequires: desktop-file-utils -# Need to autoreconf for the KDE 4 patch -BuildRequires: autoconf automake libtool #Requires(post): scrollkeeper #Requires(postun): scrollkeeper @@ -108,24 +88,10 @@ %prep %setup -q %patch0 -p1 -b .manual -%patch1 -p1 -b .configure -%patch2 -p1 -b .kde4 %patch3 -p1 -b .fix-kde4 -%patch4 -p1 -b .kde4-linkage -%patch5 -p1 -b .xembed -%patch6 -p1 -b .xembed-resize -%patch7 -p1 -b .fix-kde4-2 -# handle the /usr/lib(64)/kde4/devel hack -# If only this package used cmake, this wouldn't be necessary... -sed -i -e 's!KDECORE="-lkdecore"!KDECORE="-L$KDE/$LibDir/kde4/devel -lkdecore"!g' macros/kde4.m4 -# Hack so it finds libQtCore.so in /usr on lib64 arches -sed -i -e 's!if test -e $dir/lib/libQtCore.so; then!if test -e $dir/$LibDir/libQtCore.so; then!g' macros/kde4.m4 -# both the kde4 patch and the above sed hacks touched autotools stuff -autoreconf -%if 0%{?use_kde3_executable} -# hack the KDE 4 KPart so it uses the KDE 3 executable -sed -i -e 's/kde4-gnash/kde-gnash/g' plugin/klash4/klash_part.cpp -%endif +# Hack as autoreconf breaks build +sed -i -e 's!kapp.h!kapplication.h!g' configure +sed -i -e 's!libkdeui.la!libkdeui.so!g' configure #chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} @@ -134,35 +100,23 @@ mv AUTHORS.utf8 AUTHORS %build -%if 0%{?use_kde3_executable} -[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh -%endif # --enable-ghelp is disabled # We use /usr (_kde4_prefix) as the Qt prefix because the stuff it's looking for # is actually in /, not in the QT4DIR (_qt4_prefix). -%if 0%{?use_kde3_executable} -%configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \ - --enable-docbook --enable-ghelp --enable-media=GST \ - --disable-dependency-tracking --disable-rpath \ - --enable-cygnal \ - --enable-gui=gtk,kde,kde4,sdl,fb \ - --disable-kparts \ - --with-qt4=%{_kde4_prefix} \ - --with-kde4=%{_kde4_prefix} -%else %configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \ --enable-docbook --enable-ghelp --enable-media=GST \ --disable-dependency-tracking --disable-rpath \ --enable-cygnal \ --enable-gui=gtk,kde4,sdl,fb \ --with-qt4=%{_kde4_prefix} \ - --with-kde4=%{_kde4_prefix} -%endif + --with-kde4-prefix=%{_kde4_prefix} \ + --with-kde4-lib=%{_libdir}/kde4/devel \ + --with-kde4-incl=%{_kde4_includedir} # make sure the Qt 4 moc etc. tools are found export PATH=%{_qt4_prefix}/bin:$PATH #doesn't work currently: %%{?_smp_mflags} -make KDE4_CFLAGS=-I%{_kde4_includedir} - +#make KDE4_CFLAGS=-I%{_kde4_includedir} +make %install rm -rf $RPM_BUILD_ROOT @@ -241,10 +195,6 @@ #chmod a-x $RPM_BUILD_ROOT%{_datadir}/services/klash_part.desktop \ # $RPM_BUILD_ROOT%{_datadir}/apps/klash/pluginsinfo -%if 0%{?use_kde3_executable} -rm $RPM_BUILD_ROOT/%{_kde4_bindir}/kde4-gnash -%endif - %find_lang %{name} %clean @@ -314,6 +264,7 @@ %{_mandir}/man1/dumpshm.1* %{_mandir}/man1/gprocessor.1* %{_mandir}/man1/soldumper.1* +%{_mandir}/man1/flvdumper.1* %{_infodir}/gnash* %{_datadir}/gnash/ %{_datadir}/icons/hicolor/32x32/*.png @@ -327,11 +278,7 @@ %files klash %defattr(-,root,root,-) -%if 0%{?use_kde3_executable} -%{_bindir}/kde-gnash -%else %{_kde4_bindir}/kde4-gnash -%endif %{_kde4_libdir}/kde4/libklashpart.so %{_kde4_appsdir}/klash/ %{_kde4_datadir}/kde4/services/klash_part.desktop @@ -342,6 +289,11 @@ %{_mandir}/man1/cygnal.1* %changelog +* Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-1 +- update to 0.8.5 +- remove use_kde3_executable_hack +- remove autoreconf + * Thu Nov 13 2008 Kevin Kofler 0.8.4-5 - add missing portions of KDE 4 port from upstream kde4 branch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnash/F-10/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Oct 2008 14:06:34 -0000 1.9 +++ sources 6 Mar 2009 13:34:56 -0000 1.10 @@ -1,2 +1,2 @@ -3100e8d669795c03167a171937897c83 gnash-0.8.4.tar.gz +b54a72a52d2477e65d9029be572789ff gnash-0.8.5.tar.gz 3ba3f30fbcd9ac6458c7d50a33eb933e gnash-splash.swf --- gnash-0.8.4-configure.patch DELETED --- --- gnash-0.8.4-fix-kde4-port-2.patch DELETED --- --- gnash-0.8.4-port-to-kde4.patch DELETED --- --- gnash-kde4-x11embed-resize.patch DELETED --- --- gnash-kde4-x11embed.patch DELETED --- From berrange at fedoraproject.org Fri Mar 6 13:40:59 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Fri, 6 Mar 2009 13:40:59 +0000 (UTC) Subject: rpms/libvirt/devel libvirt-0.6.1-storage-delete-fail.patch, NONE, 1.1 Message-ID: <20090306134059.1789470116@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3373 Added Files: libvirt-0.6.1-storage-delete-fail.patch Log Message: Actually add the patch this time libvirt-0.6.1-storage-delete-fail.patch: --- NEW FILE libvirt-0.6.1-storage-delete-fail.patch --- diff -rup libvirt-0.6.1.orig/src/storage_driver.c libvirt-0.6.1.new/src/storage_driver.c --- libvirt-0.6.1.orig/src/storage_driver.c 2009-02-16 03:43:41.000000000 -0500 +++ libvirt-0.6.1.new/src/storage_driver.c 2009-03-06 08:02:51.000000000 -0500 @@ -1296,7 +1296,6 @@ storageVolumeDelete(virStorageVolPtr obj ret = 0; cleanup: - virStorageVolDefFree(vol); if (pool) virStoragePoolObjUnlock(pool); return ret; From jreznik at fedoraproject.org Fri Mar 6 13:42:17 2009 From: jreznik at fedoraproject.org (Jaroslav Reznik) Date: Fri, 6 Mar 2009 13:42:17 +0000 (UTC) Subject: rpms/gnash/F-9 .cvsignore, 1.8, 1.9 gnash.spec, 1.29, 1.30 sources, 1.8, 1.9 gnash-0.8.4-configure.patch, 1.1, NONE gnash-0.8.4-fix-kde4-port-2.patch, 1.1, NONE gnash-0.8.4-port-to-kde4.patch, 1.1, NONE gnash-kde4-x11embed-resize.patch, 1.1, NONE gnash-kde4-x11embed.patch, 1.1, NONE Message-ID: <20090306134217.9719C70116@cvs1.fedora.phx.redhat.com> Author: jreznik Update of /cvs/pkgs/rpms/gnash/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3614 Modified Files: .cvsignore gnash.spec sources Removed Files: gnash-0.8.4-configure.patch gnash-0.8.4-fix-kde4-port-2.patch gnash-0.8.4-port-to-kde4.patch gnash-kde4-x11embed-resize.patch gnash-kde4-x11embed.patch Log Message: * Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-1 - update to 0.8.5 - remove use_kde3_executable_hack - remove autoreconf Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnash/F-9/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Oct 2008 19:40:07 -0000 1.8 +++ .cvsignore 6 Mar 2009 13:41:47 -0000 1.9 @@ -1,2 +1,2 @@ -gnash-0.8.4.tar.gz +gnash-0.8.5.tar.gz gnash-splash.swf Index: gnash.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnash/F-9/gnash.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gnash.spec 13 Nov 2008 21:57:21 -0000 1.29 +++ gnash.spec 6 Mar 2009 13:41:47 -0000 1.30 @@ -1,11 +1,6 @@ -# The KDE 4 executable should be working now. -# set this to 1 to use the KDE 3 one with the KDE 4 KPart (for use in Konq 4) -# (It uses XEmbed, so it doesn't actually link KDE 3 stuff into Konqueror 4.) -%define use_kde3_executable 0 - Name: gnash -Version: 0.8.4 -Release: 5%{?dist} +Version: 0.8.5 +Release: 1%{?dist} Summary: GNU flash movie player Group: Applications/Multimedia @@ -16,22 +11,12 @@ Source2: gnash.desktop Patch0: gnash-0.8.3-manual.patch -# make autoreconf work -Patch1: gnash-0.8.4-configure.patch -# patch by Benjamin Wolsey and Bernhard Rosenkr??nzer -Patch2: gnash-0.8.4-port-to-kde4.patch # register KComponentData properly in KDE 4 KPart Patch3: gnash-0.8.3-fix-kde4-port.patch # Currently kde4-gnash (from kde4 branch) links against various KDE libraries, # but only needs Qt -- this patch removes the superfluous linkage (from bero) -Patch4: gnash-kde4-no-excessive-linkage.patch -# This patch adds XEmbed support so kde4-gnash can be used in browser plugins -# and the likes) (from bero) -Patch5: gnash-kde4-x11embed.patch -# XEmbed resizing patch (from bero) -Patch6: gnash-kde4-x11embed-resize.patch -# Missing hunks in the port-to-kde4 patch (from the upstream kde4 branch) -Patch7: gnash-0.8.4-fix-kde4-port-2.patch +# TODO: update to 0.8.5? +#Patch4: gnash-kde4-no-excessive-linkage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel libpng-devel libjpeg-devel libogg-devel @@ -44,10 +29,7 @@ BuildRequires: SDL-devel BuildRequires: agg-devel BuildRequires: kde-filesystem -BuildRequires: kdelibs4-devel -%if 0%{?use_kde3_executable} -BuildRequires: kdelibs3-devel -%endif +BuildRequires: kdelibs-devel BuildRequires: gtkglext-devel BuildRequires: docbook2X BuildRequires: %{_bindir}/docbook2pdf @@ -56,8 +38,6 @@ BuildRequires: giflib-devel BuildRequires: gettext BuildRequires: desktop-file-utils -# Need to autoreconf for the KDE 4 patch -BuildRequires: autoconf automake libtool #Requires(post): scrollkeeper #Requires(postun): scrollkeeper @@ -108,24 +88,10 @@ %prep %setup -q %patch0 -p1 -b .manual -%patch1 -p1 -b .configure -%patch2 -p1 -b .kde4 %patch3 -p1 -b .fix-kde4 -%patch4 -p1 -b .kde4-linkage -%patch5 -p1 -b .xembed -%patch6 -p1 -b .xembed-resize -%patch7 -p1 -b .fix-kde4-2 -# handle the /usr/lib(64)/kde4/devel hack -# If only this package used cmake, this wouldn't be necessary... -sed -i -e 's!KDECORE="-lkdecore"!KDECORE="-L$KDE/$LibDir/kde4/devel -lkdecore"!g' macros/kde4.m4 -# Hack so it finds libQtCore.so in /usr on lib64 arches -sed -i -e 's!if test -e $dir/lib/libQtCore.so; then!if test -e $dir/$LibDir/libQtCore.so; then!g' macros/kde4.m4 -# both the kde4 patch and the above sed hacks touched autotools stuff -autoreconf -%if 0%{?use_kde3_executable} -# hack the KDE 4 KPart so it uses the KDE 3 executable -sed -i -e 's/kde4-gnash/kde-gnash/g' plugin/klash4/klash_part.cpp -%endif +# Hack as autoreconf breaks build +sed -i -e 's!kapp.h!kapplication.h!g' configure +sed -i -e 's!libkdeui.la!libkdeui.so!g' configure #chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} @@ -134,35 +100,23 @@ mv AUTHORS.utf8 AUTHORS %build -%if 0%{?use_kde3_executable} -[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh -%endif # --enable-ghelp is disabled # We use /usr (_kde4_prefix) as the Qt prefix because the stuff it's looking for # is actually in /, not in the QT4DIR (_qt4_prefix). -%if 0%{?use_kde3_executable} -%configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \ - --enable-docbook --enable-ghelp --enable-media=GST \ - --disable-dependency-tracking --disable-rpath \ - --enable-cygnal \ - --enable-gui=gtk,kde,kde4,sdl,fb \ - --disable-kparts \ - --with-qt4=%{_kde4_prefix} \ - --with-kde4=%{_kde4_prefix} -%else %configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \ --enable-docbook --enable-ghelp --enable-media=GST \ --disable-dependency-tracking --disable-rpath \ --enable-cygnal \ --enable-gui=gtk,kde4,sdl,fb \ --with-qt4=%{_kde4_prefix} \ - --with-kde4=%{_kde4_prefix} -%endif + --with-kde4-prefix=%{_kde4_prefix} \ + --with-kde4-lib=%{_libdir}/kde4/devel \ + --with-kde4-incl=%{_kde4_includedir} # make sure the Qt 4 moc etc. tools are found export PATH=%{_qt4_prefix}/bin:$PATH #doesn't work currently: %%{?_smp_mflags} -make KDE4_CFLAGS=-I%{_kde4_includedir} - +#make KDE4_CFLAGS=-I%{_kde4_includedir} +make %install rm -rf $RPM_BUILD_ROOT @@ -241,10 +195,6 @@ #chmod a-x $RPM_BUILD_ROOT%{_datadir}/services/klash_part.desktop \ # $RPM_BUILD_ROOT%{_datadir}/apps/klash/pluginsinfo -%if 0%{?use_kde3_executable} -rm $RPM_BUILD_ROOT/%{_kde4_bindir}/kde4-gnash -%endif - %find_lang %{name} %clean @@ -314,6 +264,7 @@ %{_mandir}/man1/dumpshm.1* %{_mandir}/man1/gprocessor.1* %{_mandir}/man1/soldumper.1* +%{_mandir}/man1/flvdumper.1* %{_infodir}/gnash* %{_datadir}/gnash/ %{_datadir}/icons/hicolor/32x32/*.png @@ -327,11 +278,7 @@ %files klash %defattr(-,root,root,-) -%if 0%{?use_kde3_executable} -%{_bindir}/kde-gnash -%else %{_kde4_bindir}/kde4-gnash -%endif %{_kde4_libdir}/kde4/libklashpart.so %{_kde4_appsdir}/klash/ %{_kde4_datadir}/kde4/services/klash_part.desktop @@ -342,6 +289,11 @@ %{_mandir}/man1/cygnal.1* %changelog +* Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-1 +- update to 0.8.5 +- remove use_kde3_executable_hack +- remove autoreconf + * Thu Nov 13 2008 Kevin Kofler 0.8.4-5 - add missing portions of KDE 4 port from upstream kde4 branch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnash/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 20 Oct 2008 19:40:07 -0000 1.8 +++ sources 6 Mar 2009 13:41:47 -0000 1.9 @@ -1,2 +1,2 @@ -3100e8d669795c03167a171937897c83 gnash-0.8.4.tar.gz +b54a72a52d2477e65d9029be572789ff gnash-0.8.5.tar.gz 3ba3f30fbcd9ac6458c7d50a33eb933e gnash-splash.swf --- gnash-0.8.4-configure.patch DELETED --- --- gnash-0.8.4-fix-kde4-port-2.patch DELETED --- --- gnash-0.8.4-port-to-kde4.patch DELETED --- --- gnash-kde4-x11embed-resize.patch DELETED --- --- gnash-kde4-x11embed.patch DELETED --- From jnovy at fedoraproject.org Fri Mar 6 13:45:33 2009 From: jnovy at fedoraproject.org (Jindrich Novy) Date: Fri, 6 Mar 2009 13:45:33 +0000 (UTC) Subject: rpms/curl/devel curl.spec, 1.87, 1.88 curl-7.19.4-easy-leak.patch, 1.1, NONE Message-ID: <20090306134533.2A0B870116@cvs1.fedora.phx.redhat.com> Author: jnovy Update of /cvs/pkgs/rpms/curl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4556 Modified Files: curl.spec Removed Files: curl-7.19.4-easy-leak.patch Log Message: * Fri Mar 06 2009 Jindrich Novy 7.19.4-2 - drop .easy-leak patch, causes problems in pycurl (#488791) - fix libcurl-devel dependencies (#488895) Index: curl.spec =================================================================== RCS file: /cvs/pkgs/rpms/curl/devel/curl.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- curl.spec 3 Mar 2009 07:08:27 -0000 1.87 +++ curl.spec 6 Mar 2009 13:45:02 -0000 1.88 @@ -1,14 +1,13 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl Version: 7.19.4 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 Patch1: curl-7.15.3-multilib.patch Patch2: curl-7.16.0-privlibs.patch Patch3: curl-7.17.1-badsocket.patch -Patch4: curl-7.19.4-easy-leak.patch Provides: webclient URL: http://curl.haxx.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,6 +34,7 @@ Group: Development/Libraries Requires: libcurl = %{version}-%{release} Requires: libidn-devel, pkgconfig, automake +Requires: libssh2-devel Provides: curl-devel = %{version}-%{release} Obsoletes: curl-devel < %{version}-%{release} @@ -49,7 +49,6 @@ %patch1 -p1 -b .multilib %patch2 -p1 -b .privlibs %patch3 -p1 -b .badsocket -%patch4 -p1 -b .easy-leak # Convert docs to UTF-8 for f in CHANGES README; do @@ -118,6 +117,10 @@ %{_datadir}/aclocal/libcurl.m4 %changelog +* Fri Mar 06 2009 Jindrich Novy 7.19.4-2 +- drop .easy-leak patch, causes problems in pycurl (#488791) +- fix libcurl-devel dependencies (#488895) + * Tue Mar 03 2009 Jindrich Novy 7.19.4-1 - update to 7.19.4 (fixes CVE-2009-0037) - fix leak in curl_easy* functions, thanks to Kamil Dudka --- curl-7.19.4-easy-leak.patch DELETED --- From tbzatek at fedoraproject.org Fri Mar 6 13:57:05 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Fri, 6 Mar 2009 13:57:05 +0000 (UTC) Subject: rpms/gvfs/devel gvfs-1.1.7-gdu-monitor-empty-drives.patch, NONE, 1.1 gvfs.spec, 1.111, 1.112 Message-ID: <20090306135705.7BE9A70116@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7160 Modified Files: gvfs.spec Added Files: gvfs-1.1.7-gdu-monitor-empty-drives.patch Log Message: * Fri Mar 6 2009 Tomas Bzatek - 1.1.7-4 - Fix volume lists not filled correctly gvfs-1.1.7-gdu-monitor-empty-drives.patch: --- NEW FILE gvfs-1.1.7-gdu-monitor-empty-drives.patch --- diff -up gvfs-1.1.7/monitor/gdu/ggduvolumemonitor.c.orig gvfs-1.1.7/monitor/gdu/ggduvolumemonitor.c --- gvfs-1.1.7/monitor/gdu/ggduvolumemonitor.c.orig 2009-03-06 13:24:00.000000000 +0100 +++ gvfs-1.1.7/monitor/gdu/ggduvolumemonitor.c 2009-03-06 14:45:49.000000000 +0100 @@ -617,7 +617,7 @@ get_mount_point_for_device (GduDevice *d for (l = fstab_mount_points; l != NULL; l = l->next) { GUnixMountPoint *mount_point = l->data; - const gchar *device_file; + const gchar *fstab_device_file; const gchar *fstab_mount_path; fstab_mount_path = g_unix_mount_point_get_mount_path (mount_point); @@ -627,18 +627,18 @@ get_mount_point_for_device (GduDevice *d goto out; } - device_file = g_unix_mount_point_get_device_path (mount_point); - if (g_str_has_prefix (device_file, "LABEL=")) + fstab_device_file = g_unix_mount_point_get_device_path (mount_point); + if (g_str_has_prefix (fstab_device_file, "LABEL=")) { - if (g_strcmp0 (device_file + 6, gdu_device_id_get_label (d)) == 0) + if (g_strcmp0 (fstab_device_file + 6, gdu_device_id_get_label (d)) == 0) { ret = mount_point; goto out; } } - else if (g_str_has_prefix (device_file, "UUID=")) + else if (g_str_has_prefix (fstab_device_file, "UUID=")) { - if (g_ascii_strcasecmp (device_file + 5, gdu_device_id_get_uuid (d)) == 0) + if (g_ascii_strcasecmp (fstab_device_file + 5, gdu_device_id_get_uuid (d)) == 0) { ret = mount_point; goto out; @@ -646,11 +646,11 @@ get_mount_point_for_device (GduDevice *d } else { - char resolved_device_file[PATH_MAX]; + char resolved_fstab_device_file[PATH_MAX]; /* handle symlinks such as /dev/disk/by-uuid/47C2-1994 */ - if (realpath (device_file, resolved_device_file) != NULL && - g_strcmp0 (resolved_device_file, device_file) == 0) + if (realpath (fstab_device_file, resolved_fstab_device_file) != NULL && + g_strcmp0 (resolved_fstab_device_file, device_file) == 0) { ret = mount_point; goto out; Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- gvfs.spec 4 Mar 2009 21:33:17 -0000 1.111 +++ gvfs.spec 6 Mar 2009 13:56:35 -0000 1.112 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.1.7 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -34,6 +34,10 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=573826 Patch2: gvfs-gdu-volume-monitor-3.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=573826 +Patch3: gvfs-1.1.7-gdu-monitor-empty-drives.patch + + %description The gvfs package provides backend implementations for the gio framework in GLib. It includes ftp, sftp, cifs. @@ -116,6 +120,7 @@ %setup -q %patch1 -p0 -b .archive-integration %patch2 -p0 -b .gdu +%patch3 -p1 -b .gdu-volumes-typo %build @@ -259,6 +264,9 @@ %changelog +* Fri Mar 6 2009 Tomas Bzatek - 1.1.7-4 +- Fix volume lists not filled correctly + * Wed Mar 4 2009 David Zeuthen - 1.1.7-3 - Update GVfs gdu patch to fix mount detection confusion (#488399) From jnovy at fedoraproject.org Fri Mar 6 14:00:16 2009 From: jnovy at fedoraproject.org (Jindrich Novy) Date: Fri, 6 Mar 2009 14:00:16 +0000 (UTC) Subject: rpms/curl/F-10 curl.spec, 1.85, 1.86 curl-7.19.4-easy-leak.patch, 1.1, NONE Message-ID: <20090306140016.C671570116@cvs1.fedora.phx.redhat.com> Author: jnovy Update of /cvs/pkgs/rpms/curl/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8026 Modified Files: curl.spec Removed Files: curl-7.19.4-easy-leak.patch Log Message: * Fri Mar 06 2009 Jindrich Novy 7.19.4-2 - drop .easy-leak patch, causes problems in pycurl (#488791) - fix libcurl-devel dependencies (#488895) Index: curl.spec =================================================================== RCS file: /cvs/pkgs/rpms/curl/F-10/curl.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- curl.spec 3 Mar 2009 07:29:45 -0000 1.85 +++ curl.spec 6 Mar 2009 13:59:46 -0000 1.86 @@ -1,14 +1,13 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl Version: 7.19.4 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 Patch1: curl-7.15.3-multilib.patch Patch2: curl-7.16.0-privlibs.patch Patch3: curl-7.17.1-badsocket.patch -Patch4: curl-7.19.4-easy-leak.patch Provides: webclient URL: http://curl.haxx.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,6 +34,7 @@ Group: Development/Libraries Requires: libcurl = %{version}-%{release} Requires: libidn-devel, pkgconfig, automake +Requires: libssh2-devel Provides: curl-devel = %{version}-%{release} Obsoletes: curl-devel < %{version}-%{release} @@ -49,7 +49,6 @@ %patch1 -p1 -b .multilib %patch2 -p1 -b .privlibs %patch3 -p1 -b .badsocket -%patch4 -p1 -b .easy-leak # Convert docs to UTF-8 for f in CHANGES README; do @@ -118,6 +117,10 @@ %{_datadir}/aclocal/libcurl.m4 %changelog +* Fri Mar 06 2009 Jindrich Novy 7.19.4-2 +- drop .easy-leak patch, causes problems in pycurl (#488791) +- fix libcurl-devel dependencies (#488895) + * Tue Mar 03 2009 Jindrich Novy 7.19.4-1 - update to 7.19.4 (fixes CVE-2009-0037) - fix leak in curl_easy* functions, thanks to Kamil Dudka --- curl-7.19.4-easy-leak.patch DELETED --- From jorton at fedoraproject.org Fri Mar 6 14:05:11 2009 From: jorton at fedoraproject.org (Joe Orton) Date: Fri, 6 Mar 2009 14:05:11 +0000 (UTC) Subject: rpms/httpd/F-10 .cvsignore, 1.23, 1.24 httpd.spec, 1.127, 1.128 sources, 1.19, 1.20 upstream, 1.12, 1.13 Message-ID: <20090306140511.7E1B370116@cvs1.fedora.phx.redhat.com> Author: jorton Update of /cvs/extras/rpms/httpd/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9494 Modified Files: .cvsignore httpd.spec sources upstream Log Message: * Mon Feb 9 2009 Joe Orton 2.2.11-2 - update to 2.2.11 (#482960) - Require apr-util-ldap (#471898) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/httpd/F-10/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 21 Oct 2008 11:47:47 -0000 1.23 +++ .cvsignore 6 Mar 2009 14:04:40 -0000 1.24 @@ -1 +1,2 @@ -httpd-2.2.10.tar.gz +httpd-2.2.11.tar.gz +httpd-2.2.11 Index: httpd.spec =================================================================== RCS file: /cvs/extras/rpms/httpd/F-10/httpd.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- httpd.spec 21 Oct 2008 11:47:47 -0000 1.127 +++ httpd.spec 6 Mar 2009 14:04:40 -0000 1.128 @@ -8,8 +8,8 @@ Summary: Apache HTTP Server Name: httpd -Version: 2.2.10 -Release: 2 +Version: 2.2.11 +Release: 2%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -56,7 +56,7 @@ Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache Obsoletes: stronghold-htdocs, mod_put, mod_roaming Conflicts: pcre < 4.0 -Requires: httpd-tools = %{version}-%{release} +Requires: httpd-tools = %{version}-%{release}, apr-util-ldap %description The Apache HTTP Server is a powerful, efficient, and extensible @@ -482,6 +482,10 @@ %{_libdir}/httpd/build/*.sh %changelog +* Mon Feb 9 2009 Joe Orton 2.2.11-2 +- update to 2.2.11 (#482960) +- Require apr-util-ldap (#471898) + * Tue Oct 21 2008 Joe Orton 2.2.10-2 - update to 2.2.10 Index: sources =================================================================== RCS file: /cvs/extras/rpms/httpd/F-10/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 21 Oct 2008 11:47:47 -0000 1.19 +++ sources 6 Mar 2009 14:04:40 -0000 1.20 @@ -1 +1 @@ -f611aff3ddba114499e623a5259faa5c httpd-2.2.10.tar.gz +03e0a99a5de0f3f568a0087fb9993af9 httpd-2.2.11.tar.gz Index: upstream =================================================================== RCS file: /cvs/extras/rpms/httpd/F-10/upstream,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- upstream 21 Oct 2008 11:47:47 -0000 1.12 +++ upstream 6 Mar 2009 14:04:40 -0000 1.13 @@ -1 +1 @@ -httpd-2.2.10.tar.gz +httpd-2.2.11.tar.gz From hardaker at fedoraproject.org Fri Mar 6 14:11:20 2009 From: hardaker at fedoraproject.org (Wes Hardaker) Date: Fri, 6 Mar 2009 14:11:20 +0000 (UTC) Subject: rpms/perl-Getopt-GUI-Long/F-10 .cvsignore, 1.2, 1.3 perl-Getopt-GUI-Long.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090306141120.6907B70116@cvs1.fedora.phx.redhat.com> Author: hardaker Update of /cvs/extras/rpms/perl-Getopt-GUI-Long/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10736 Modified Files: .cvsignore perl-Getopt-GUI-Long.spec sources Log Message: update to upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Getopt-GUI-Long/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Dec 2007 19:12:09 -0000 1.2 +++ .cvsignore 6 Mar 2009 14:10:49 -0000 1.3 @@ -1 +1 @@ -Getopt-GUI-Long-0.8.tar.gz +Getopt-GUI-Long-0.91.tar.gz Index: perl-Getopt-GUI-Long.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Getopt-GUI-Long/F-10/perl-Getopt-GUI-Long.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Getopt-GUI-Long.spec 7 Mar 2008 02:02:16 -0000 1.2 +++ perl-Getopt-GUI-Long.spec 6 Mar 2009 14:10:50 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Getopt-GUI-Long -Version: 0.8 -Release: 2%{?dist} +Version: 0.91 +Release: 1%{?dist} Summary: A wrapper around Getopt::Long to provide a GUI to applications License: GPL+ or Artistic Group: Development/Libraries @@ -22,13 +22,13 @@ This module is a wrapper around Getopt::Long that extends the value of the original Getopt::Long module to: -1) add a simple graphical user interface option screen if no - arguments are passed to the program. Thus, the arguments to - actually use are built based on the results of the user - interface. If arguments were passed to the program, the user - interface is not shown and the program executes as it normally - would and acts just as if Getopt::Long::GetOptions had been - called instead. +1) add a simple graphical user interface option screen if no arguments + are passed to the program. Thus, the arguments to actually use are + built based on the results of the user interface. If arguments were + passed to the program, the user interface is not shown and the + program executes as it normally would and acts just as if + Getopt::Long::GetOptions had been called instead. This requires + the QWizard and Gtk2 or Tk interfaces to be installed too. 2) provide an auto-help mechanism such that -h and --help are handled automatically. In fact, calling your program with -h @@ -73,6 +73,12 @@ %{_mandir}/man3/* %changelog +* Thu Mar 5 2009 Wes Hardaker - 0.91-1 +- Update to 0.91 + +* Thu Feb 26 2009 Fedora Release Engineering - 0.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Mar 06 2008 Tom "spot" Callaway - 0.8-2 Rebuild for new perl Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Getopt-GUI-Long/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Dec 2007 19:12:09 -0000 1.2 +++ sources 6 Mar 2009 14:10:50 -0000 1.3 @@ -1 +1 @@ -6af40f2c03fa898b4c22a96eabfb7a85 Getopt-GUI-Long-0.8.tar.gz +b77e9516c8cf9593fa108a2eca61bb5b Getopt-GUI-Long-0.91.tar.gz From jnovy at fedoraproject.org Fri Mar 6 14:20:26 2009 From: jnovy at fedoraproject.org (Jindrich Novy) Date: Fri, 6 Mar 2009 14:20:26 +0000 (UTC) Subject: rpms/curl/F-9 curl.spec, 1.82, 1.83 curl-7.19.4-easy-leak.patch, 1.1, NONE Message-ID: <20090306142026.222E770116@cvs1.fedora.phx.redhat.com> Author: jnovy Update of /cvs/pkgs/rpms/curl/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12516 Modified Files: curl.spec Removed Files: curl-7.19.4-easy-leak.patch Log Message: * Fri Mar 06 2009 Jindrich Novy 7.19.4-2 - drop .easy-leak patch, causes problems in pycurl (#488791) - fix libcurl-devel dependencies (#488895) Index: curl.spec =================================================================== RCS file: /cvs/pkgs/rpms/curl/F-9/curl.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- curl.spec 3 Mar 2009 07:43:22 -0000 1.82 +++ curl.spec 6 Mar 2009 14:19:55 -0000 1.83 @@ -1,14 +1,13 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl Version: 7.19.4 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 Patch1: curl-7.15.3-multilib.patch Patch2: curl-7.16.0-privlibs.patch Patch3: curl-7.17.1-badsocket.patch -Patch4: curl-7.19.4-easy-leak.patch Provides: webclient URL: http://curl.haxx.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,6 +34,7 @@ Group: Development/Libraries Requires: libcurl = %{version}-%{release} Requires: libidn-devel, pkgconfig, automake +Requires: libssh2-devel Provides: curl-devel = %{version}-%{release} Obsoletes: curl-devel < %{version}-%{release} @@ -49,7 +49,6 @@ %patch1 -p1 -b .multilib %patch2 -p1 -b .privlibs %patch3 -p1 -b .badsocket -%patch4 -p1 -b .easy-leak # Convert docs to UTF-8 for f in CHANGES README; do @@ -118,6 +117,10 @@ %{_datadir}/aclocal/libcurl.m4 %changelog +* Fri Mar 06 2009 Jindrich Novy 7.19.4-2 +- drop .easy-leak patch, causes problems in pycurl (#488791) +- fix libcurl-devel dependencies (#488895) + * Tue Mar 03 2009 Jindrich Novy 7.19.4-1 - update to 7.19.4 (fixes CVE-2009-0037) - fix leak in curl_easy* functions, thanks to Kamil Dudka --- curl-7.19.4-easy-leak.patch DELETED --- From hardaker at fedoraproject.org Fri Mar 6 14:21:49 2009 From: hardaker at fedoraproject.org (Wes Hardaker) Date: Fri, 6 Mar 2009 14:21:49 +0000 (UTC) Subject: rpms/perl-Getopt-GUI-Long/F-9 .cvsignore, 1.2, 1.3 perl-Getopt-GUI-Long.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090306142149.90F1370116@cvs1.fedora.phx.redhat.com> Author: hardaker Update of /cvs/extras/rpms/perl-Getopt-GUI-Long/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12882 Modified Files: .cvsignore perl-Getopt-GUI-Long.spec sources Log Message: update to upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Getopt-GUI-Long/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Dec 2007 19:12:09 -0000 1.2 +++ .cvsignore 6 Mar 2009 14:21:19 -0000 1.3 @@ -1 +1 @@ -Getopt-GUI-Long-0.8.tar.gz +Getopt-GUI-Long-0.91.tar.gz Index: perl-Getopt-GUI-Long.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Getopt-GUI-Long/F-9/perl-Getopt-GUI-Long.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Getopt-GUI-Long.spec 7 Mar 2008 02:02:16 -0000 1.2 +++ perl-Getopt-GUI-Long.spec 6 Mar 2009 14:21:19 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Getopt-GUI-Long -Version: 0.8 -Release: 2%{?dist} +Version: 0.91 +Release: 1%{?dist} Summary: A wrapper around Getopt::Long to provide a GUI to applications License: GPL+ or Artistic Group: Development/Libraries @@ -22,13 +22,13 @@ This module is a wrapper around Getopt::Long that extends the value of the original Getopt::Long module to: -1) add a simple graphical user interface option screen if no - arguments are passed to the program. Thus, the arguments to - actually use are built based on the results of the user - interface. If arguments were passed to the program, the user - interface is not shown and the program executes as it normally - would and acts just as if Getopt::Long::GetOptions had been - called instead. +1) add a simple graphical user interface option screen if no arguments + are passed to the program. Thus, the arguments to actually use are + built based on the results of the user interface. If arguments were + passed to the program, the user interface is not shown and the + program executes as it normally would and acts just as if + Getopt::Long::GetOptions had been called instead. This requires + the QWizard and Gtk2 or Tk interfaces to be installed too. 2) provide an auto-help mechanism such that -h and --help are handled automatically. In fact, calling your program with -h @@ -73,6 +73,12 @@ %{_mandir}/man3/* %changelog +* Thu Mar 5 2009 Wes Hardaker - 0.91-1 +- Update to 0.91 + +* Thu Feb 26 2009 Fedora Release Engineering - 0.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Mar 06 2008 Tom "spot" Callaway - 0.8-2 Rebuild for new perl Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Getopt-GUI-Long/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Dec 2007 19:12:09 -0000 1.2 +++ sources 6 Mar 2009 14:21:19 -0000 1.3 @@ -1 +1 @@ -6af40f2c03fa898b4c22a96eabfb7a85 Getopt-GUI-Long-0.8.tar.gz +b77e9516c8cf9593fa108a2eca61bb5b Getopt-GUI-Long-0.91.tar.gz From pkgdb at fedoraproject.org Fri Mar 6 14:26:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 14:26:18 +0000 Subject: [pkgdb] eclipse-linuxprofilingframework had acl change status Message-ID: <20090306142638.D0FBD20820B@bastion.fedora.phx.redhat.com> overholt has set the commit acl on eclipse-linuxprofilingframework (Fedora devel) to Approved for ebaron To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-linuxprofilingframework From pkgdb at fedoraproject.org Fri Mar 6 14:25:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 14:25:55 +0000 Subject: [pkgdb] eclipse-linuxprofilingframework had acl change status Message-ID: <20090306142642.A6BCE208545@bastion.fedora.phx.redhat.com> overholt has set the commit acl on eclipse-linuxprofilingframework (Fedora 10) to Approved for ebaron To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-linuxprofilingframework From caolanm at fedoraproject.org Fri Mar 6 14:33:43 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Fri, 6 Mar 2009 14:33:43 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1851,1.1852 Message-ID: <20090306143343.B685470116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15220 Modified Files: openoffice.org.spec Log Message: Farsi auto correct files Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1851 retrieving revision 1.1852 diff -u -r1.1851 -r1.1852 --- openoffice.org.spec 6 Mar 2009 09:56:59 -0000 1.1851 +++ openoffice.org.spec 6 Mar 2009 14:33:13 -0000 1.1852 @@ -1419,6 +1419,13 @@ %description -n autocorr-eu Rules for autocorrecting common Basque typing errors. +%package -n autocorr-fa +Summary: Farsi autocorrection rules +Group: Applications/Text + +%description -n autocorr-fa +Rules for autocorrecting common Farsi typing errors. + %package -n autocorr-fi Summary: Finnish autocorrection rules Group: Applications/Text @@ -4035,6 +4042,10 @@ %dir %{_datadir}/autocorr %{_datadir}/autocorr/acor_eu.dat +%files -n autocorr-fa +%dir %{_datadir}/autocorr +%{_datadir}/autocorr/acor_fa-* + %files -n autocorr-fi %dir %{_datadir}/autocorr %{_datadir}/autocorr/acor_fi-* From caolanm at fedoraproject.org Fri Mar 6 14:38:32 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Fri, 6 Mar 2009 14:38:32 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1852,1.1853 Message-ID: <20090306143832.4527070116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16504 Modified Files: openoffice.org.spec Log Message: Farsi auto correct files Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1852 retrieving revision 1.1853 diff -u -r1.1852 -r1.1853 --- openoffice.org.spec 6 Mar 2009 14:33:13 -0000 1.1852 +++ openoffice.org.spec 6 Mar 2009 14:38:01 -0000 1.1853 @@ -1,6 +1,6 @@ %define oootag OOO310 %define ooomilestone 4 -%define rh_rpm_release 2 +%define rh_rpm_release 1 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF %define __jar_repack %{nil} @@ -4135,9 +4135,6 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog -* Fri Mar 06 2009 Caol??n McNamara - 1:3.1.0-4.2 -- Resolves: rhbz#488835 backport workspace.cl12 - * Fri Mar 06 2009 Caol??n McNamara - 1:3.1.0-4.1 - report-builder will be broken until rhbz#474391 is resolved - drop integrated workspace.gfbcrash.patch @@ -4146,6 +4143,8 @@ - Resolves: rhbz#488688 / ooo#98746 merge Punjabi Translations - Resolves: rhbz#488700 / ooo#99907 merge Malayalam Translations - add mythes-sv dependency for Swedish langpack +- Resolves: rhbz#488835 backport workspace.cl12 +- Farsi autocorrect files * Tue Mar 03 2009 Caol??n McNamara - 1:3.1.0-3.4 - Resolves: rhbz#488228 Assamese Translations From xhorak at fedoraproject.org Fri Mar 6 14:41:08 2009 From: xhorak at fedoraproject.org (Jan Horak) Date: Fri, 6 Mar 2009 14:41:08 +0000 (UTC) Subject: rpms/devhelp/F-9 devhelp.spec,1.96,1.97 Message-ID: <20090306144108.95CC070116@cvs1.fedora.phx.redhat.com> Author: xhorak Update of /cvs/pkgs/rpms/devhelp/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17247 Modified Files: devhelp.spec Log Message: Adding missing build requirement Index: devhelp.spec =================================================================== RCS file: /cvs/pkgs/rpms/devhelp/F-9/devhelp.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- devhelp.spec 6 Mar 2009 09:53:33 -0000 1.96 +++ devhelp.spec 6 Mar 2009 14:40:37 -0000 1.97 @@ -33,6 +33,7 @@ BuildRequires: intltool BuildRequires: libgnomeui-devel >= 2.2.0 BuildRequires: libwnck-devel >= %{libwnck_version} +BuildRequires: libXres-devel %description An API document browser for GNOME 2. From rdieter at fedoraproject.org Fri Mar 6 14:42:38 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 14:42:38 +0000 (UTC) Subject: rpms/kdeutils/devel kdeutils.spec,1.162,1.163 Message-ID: <20090306144238.9BACE70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17669 Modified Files: kdeutils.spec Log Message: * Fri Mar 06 2009 Rex Dieter - 4.2.1-2 - -printer-applet subpkg - cleanup unused -libs/-devel crud Index: kdeutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- kdeutils.spec 27 Feb 2009 13:04:49 -0000 1.162 +++ kdeutils.spec 6 Mar 2009 14:42:08 -0000 1.163 @@ -39,17 +39,16 @@ %if 0%{?printer_applet} BuildRequires: PyKDE4-devel >= %{version} BuildRequires: system-config-printer-libs -Requires: PyKDE4 >= %{version} -Requires: hal-cups-utils -Requires: system-config-printer-libs +# upgrade path so it doesn't get lost +Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release} %endif Provides: okteta = 0.1.0-1 Obsoletes: okteta < 0.1.0-1 -Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: %{name}-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: kdeutils-extras < 6:4.0.0 +Obsoletes: kdeutils-libs < 6:4.0.0 +Obsoletes: kdeutils-devel < 6:4.0.0 %description Utilities for the K Desktop Environment. @@ -72,18 +71,13 @@ * superkaramba * sweeper (clean unwanted traces the user leaves on the system) -%package libs -Summary: Runtime libraries for %{name} -Group: System Environment/Libraries -%description libs -%{summary}. - -%package devel -Group: Development/Libraries -Summary: Development files for %{name} -Requires: %{name}-libs = %{epoch}:%{version}-%{release} -Requires: kdepimlibs4-devel kdebase-workspace-devel -%description devel +%package printer-applet +Summary: KDE printer applet +Group: Applications/System +Requires: PyKDE4 >= %{version} +Requires: hal-cups-utils +Requires: system-config-printer-libs +%description printer-applet %{summary}. @@ -102,6 +96,7 @@ %patch0 -p1 -b .kjots %endif + %build mkdir -p %{_target_platform} @@ -109,7 +104,7 @@ %{cmake_kde4} .. popd -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %install @@ -131,21 +126,33 @@ %post /sbin/ldconfig ||: -%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : -%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : %postun /sbin/ldconfig ||: -%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : -%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : %files %defattr(-,root,root,-) %doc AUTHORS COPYING README -%{_kde4_bindir}/* +%{_kde4_bindir}/ark +%{_kde4_bindir}/kcalc +%{_kde4_bindir}/kcharselect +%{_kde4_bindir}/kdessh +%{_kde4_bindir}/kdf +%{_kde4_bindir}/kfloppy +%{_kde4_bindir}/kgpg +%{_kde4_bindir}/ktimer +%{_kde4_bindir}/kwalletmanager +%{_kde4_bindir}/kwikdisk +%{_kde4_bindir}/okteta +%{_kde4_bindir}/superkaramba +%{_kde4_bindir}/sweeper %{_kde4_appsdir}/ark/ %{_kde4_appsdir}/kcalc/ %{_kde4_appsdir}/kcharselect/ @@ -155,9 +162,6 @@ %{_kde4_appsdir}/kwalletmanager/ %{_kde4_appsdir}/okteta/ %{_kde4_appsdir}/oktetapart/ -%if 0%{?printer_applet} -%{_kde4_appsdir}/printer-applet/ -%endif %{_kde4_appsdir}/superkaramba/ %{_kde4_appsdir}/sweeper/ %{_kde4_datadir}/kde4/services/* @@ -173,27 +177,25 @@ %{_kde4_libdir}/libkdeinit*.so %{_kde4_libdir}/kde4/* %if 0%{?include_kjots} +%{_kde4_bindir}/kjots %{_kde4_appsdir}/kjots/ %{_kde4_docdir}/HTML/en/kjots/ %endif %{_mandir}/man1/* -%if 0 -%files libs -%defattr(-,root,root,-) -%endif -%{_kde4_libdir}/lib*.so.* - -%if 0 -%files devel +%if 0%{?printer_applet} %defattr(-,root,root,-) -%{_kde4_includedir}/* -%exclude %{_kde4_libdir}/libkdeinit*.so -%{_kde4_libdir}/lib*.so +%{_kde4_bindir}/printer-applet +%{_kde4_datadir}/autostart/printer-applet.desktop +%{_kde4_appsdir}/printer-applet/ %endif %changelog +* Fri Mar 06 2009 Rex Dieter - 4.2.1-2 +- -printer-applet subpkg +- cleanup unused -libs/-devel crud + * Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 From rdieter at fedoraproject.org Fri Mar 6 14:45:00 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 14:45:00 +0000 (UTC) Subject: rpms/kdeutils/devel kdeutils.spec,1.163,1.164 Message-ID: <20090306144500.BB80170116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18271 Modified Files: kdeutils.spec Log Message: Release++ Index: kdeutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- kdeutils.spec 6 Mar 2009 14:42:08 -0000 1.163 +++ kdeutils.spec 6 Mar 2009 14:44:30 -0000 1.164 @@ -11,7 +11,7 @@ Name: kdeutils Epoch: 6 Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: K Desktop Environment - Utilities Group: Applications/System From tmraz at fedoraproject.org Fri Mar 6 14:44:57 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Fri, 6 Mar 2009 14:44:57 +0000 (UTC) Subject: rpms/gnutls/devel .cvsignore, 1.18, 1.19 gnutls.spec, 1.40, 1.41 sources, 1.18, 1.19 Message-ID: <20090306144457.2137370116@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/gnutls/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18248 Modified Files: .cvsignore gnutls.spec sources Log Message: * Fri Mar 6 2009 Tomas Mraz 2.6.4-1 - upgrade to a new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 15 Dec 2008 14:23:08 -0000 1.18 +++ .cvsignore 6 Mar 2009 14:44:26 -0000 1.19 @@ -1 +1 @@ -gnutls-2.6.3-nosrp.tar.bz2 +gnutls-2.6.4-nosrp.tar.bz2 Index: gnutls.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/devel/gnutls.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- gnutls.spec 25 Feb 2009 00:11:54 -0000 1.40 +++ gnutls.spec 6 Mar 2009 14:44:26 -0000 1.41 @@ -1,7 +1,7 @@ Summary: A TLS protocol implementation Name: gnutls -Version: 2.6.3 -Release: 2%{?dist} +Version: 2.6.4 +Release: 1%{?dist} # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+ License: GPLv3+ and LGPLv2+ Group: System Environment/Libraries @@ -149,6 +149,9 @@ %{_datadir}/guile/site/gnutls.scm %changelog +* Fri Mar 6 2009 Tomas Mraz 2.6.4-1 +- upgrade to a new upstream version + * Tue Feb 24 2009 Fedora Release Engineering - 2.6.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 15 Dec 2008 14:23:08 -0000 1.18 +++ sources 6 Mar 2009 14:44:26 -0000 1.19 @@ -1 +1 @@ -4220e4d71c1ce663aa462a0477768a2d gnutls-2.6.3-nosrp.tar.bz2 +ac96cacb84b7dd7483a495d3907e7664 gnutls-2.6.4-nosrp.tar.bz2 From rdieter at fedoraproject.org Fri Mar 6 14:49:25 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 14:49:25 +0000 (UTC) Subject: rpms/amarok/F-10 amarok.spec,1.131,1.132 Message-ID: <20090306144925.5008C70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/amarok/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19386 Modified Files: amarok.spec Log Message: skip qt45 patch on < f11... seems to be mildly broken smp_mflag-wise Index: amarok.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- amarok.spec 5 Mar 2009 16:49:30 -0000 1.131 +++ amarok.spec 6 Mar 2009 14:48:54 -0000 1.132 @@ -55,17 +55,24 @@ %if 0%{?fedora} > 10 %patch0 -p0 -b .libgpod-0.7.0 +%patch100 -p0 -b .qt45 %endif %patch1 -p1 -b .gcc4 -%patch100 -p0 -b .qt45 - %build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. popd + +%if 0 +# hack around qt45 patch-induced(?) smp borkage +pushd src/scriptengine/generator/generator +./generate.sh +popd +%endif + make %{?_smp_mflags} -C %{_target_platform} From rdieter at fedoraproject.org Fri Mar 6 14:50:10 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 14:50:10 +0000 (UTC) Subject: rpms/kdeutils/devel .cvsignore,1.59,1.60 Message-ID: <20090306145010.47D9970116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19629 Modified Files: .cvsignore Log Message: cleanup Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/.cvsignore,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- .cvsignore 27 Feb 2009 13:04:49 -0000 1.59 +++ .cvsignore 6 Mar 2009 14:49:40 -0000 1.60 @@ -1,6 +1 @@ -kdeutils-4.1.2.tar.bz2 -kdeutils-4.1.80.tar.bz2 -kdeutils-4.1.85.tar.bz2 -kdeutils-4.1.96.tar.bz2 -kdeutils-4.2.0.tar.bz2 kdeutils-4.2.1.tar.bz2 From jwilson at fedoraproject.org Fri Mar 6 14:50:32 2009 From: jwilson at fedoraproject.org (Jarod Wilson) Date: Fri, 6 Mar 2009 14:50:32 +0000 (UTC) Subject: rpms/kernel/devel kernel.spec,1.1392,1.1393 Message-ID: <20090306145032.C946270116@cvs1.fedora.phx.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19788 Modified Files: kernel.spec Log Message: * Fri Mar 06 2009 Jarod Wilson - kernel-devel also needs include/crypto headers - fix up some "interesting" dates... :) Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1392 retrieving revision 1.1393 diff -u -r1.1392 -r1.1393 --- kernel.spec 6 Mar 2009 11:53:41 -0000 1.1392 +++ kernel.spec 6 Mar 2009 14:50:02 -0000 1.1393 @@ -1415,7 +1415,7 @@ fi mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cd include - cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound trace video drm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include + cp -a acpi config crypto keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound trace video drm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include asmdir=$(readlink asm) cp -a $asmdir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/ pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include @@ -1806,16 +1806,19 @@ # and build. %changelog -* Wed Mar 06 2009 Mauro Carvalho Chehab +* Fri Mar 06 2009 Jarod Wilson +- kernel-devel also needs include/crypto headers + +* Fri Mar 06 2009 Mauro Carvalho Chehab - drivers/media: remove frontends from config-generic -* Wed Mar 06 2009 Mauro Carvalho Chehab +* Fri Mar 06 2009 Mauro Carvalho Chehab - drivers/media: Kconfig cleanups and fixes -* Thu Mar 06 2009 Dave Jones +* Fri Mar 06 2009 Dave Jones - kernel-devel needs include/trace headers. (Josh Stone ) -* Wed Mar 06 2009 Mauro Carvalho Chehab +* Fri Mar 06 2009 Mauro Carvalho Chehab - drivers/media: Some fixes and a cleanup on F11 v4l/dvb config.generic * Fri Mar 06 2009 Matthew Garrett From ebaron at fedoraproject.org Fri Mar 6 14:52:08 2009 From: ebaron at fedoraproject.org (Elliott Baron) Date: Fri, 6 Mar 2009 14:52:08 +0000 (UTC) Subject: rpms/eclipse-linuxprofilingframework/devel eclipse-linuxprofilingframework-dialog-strings.patch, NONE, 1.1 eclipse-linuxprofilingframework.spec, 1.3, 1.4 Message-ID: <20090306145208.7F54B70116@cvs1.fedora.phx.redhat.com> Author: ebaron Update of /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20122 Modified Files: eclipse-linuxprofilingframework.spec Added Files: eclipse-linuxprofilingframework-dialog-strings.patch Log Message: * Thu Mar 05 2009 Elliott Baron 0.1.0-1 - Final 0.1 upstream release. - Removed "Valgrind" from dialog titles. eclipse-linuxprofilingframework-dialog-strings.patch: --- NEW FILE eclipse-linuxprofilingframework-dialog-strings.patch --- ### Eclipse Workspace Patch 1.0 #P org.eclipse.linuxtools.profiling.launch Index: src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java =================================================================== --- src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java (revision 21641) +++ src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java (working copy) @@ -217,7 +217,7 @@ } protected void handleFail(String message) { - MessageDialog.openError(getActiveWorkbenchShell(), Messages.getString("ProfileLaunchShortcut.Valgrind_Launcher"), message); //$NON-NLS-1$ + MessageDialog.openError(getActiveWorkbenchShell(), Messages.getString("ProfileLaunchShortcut.Launcher"), message); //$NON-NLS-1$ } /** @@ -254,7 +254,7 @@ TwoPaneElementSelector dialog = new TwoPaneElementSelector(getActiveWorkbenchShell(), programLabelProvider, qualifierLabelProvider); dialog.setElements(binList.toArray()); - dialog.setTitle(Messages.getString("ProfileLaunchShortcut.Profile_With_Valgrind")); //$NON-NLS-1$ + dialog.setTitle(Messages.getString("ProfileLaunchShortcut.Profile")); //$NON-NLS-1$ dialog.setMessage(Messages.getString("ProfileLaunchShortcut.Choose_a_local_application")); //$NON-NLS-1$ dialog.setUpperListLabel(Messages.getString("ProfileLaunchShortcut.Binaries")); //$NON-NLS-1$ dialog.setLowerListLabel(Messages.getString("ProfileLaunchShortcut.Qualifier")); //$NON-NLS-1$ Index: src/org/eclipse/linuxtools/profiling/launch/messages.properties =================================================================== --- src/org/eclipse/linuxtools/profiling/launch/messages.properties (revision 21641) +++ src/org/eclipse/linuxtools/profiling/launch/messages.properties (working copy) @@ -5,6 +5,6 @@ ProfileLaunchShortcut.Launch_Configuration_Selection=Launch Configuration Selection ProfileLaunchShortcut.Looking_for_executables=Looking for executables ProfileLaunchShortcut.no_project_selected=Launch failed no project selected -ProfileLaunchShortcut.Profile_With_Valgrind=Profile With Valgrind +ProfileLaunchShortcut.Profile=Profile ProfileLaunchShortcut.Qualifier=Qualifer: -ProfileLaunchShortcut.Valgrind_Launcher=Valgrind Launcher +ProfileLaunchShortcut.Launcher=Profiling Launcher Index: eclipse-linuxprofilingframework.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel/eclipse-linuxprofilingframework.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- eclipse-linuxprofilingframework.spec 24 Feb 2009 13:46:41 -0000 1.3 +++ eclipse-linuxprofilingframework.spec 6 Mar 2009 14:51:38 -0000 1.4 @@ -1,14 +1,10 @@ %define src_repo_tag RELEASE_0_1 %define eclipse_base %{_libdir}/eclipse %define install_loc %{_datadir}/eclipse/dropins/linuxprofilingframework -# When final 0.1 release is tagged upstream, update qualifier to match -%define qualifier 200901131137 Name: eclipse-linuxprofilingframework Version: 0.1.0 -# Including qualifier in release makes the resulting filenames too long. -# It'll be 0.1.0-1 soon enough -Release: 0.3%{?dist} +Release: 1%{?dist} Summary: Eclipse Linux Tools Profiling Framework Group: Development/Tools @@ -16,7 +12,8 @@ URL: http://eclipse.org/linuxtools # sh -x ./eclipse-linuxprofilingframework-fetch-src.sh %{src_repo_tag} Source0: %{name}-fetched-src-%{src_repo_tag}.tar.bz2 -Source1: eclipse-linuxprofilingframework-fetch-src.sh +Source1: %{name}-fetch-src.sh +Patch0: %{name}-dialog-strings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -34,10 +31,13 @@ %prep %setup -q -n %{name}-fetched-src-%{src_repo_tag} +pushd org.eclipse.linuxtools.profiling.launch +%patch0 +popd %build %{eclipse_base}/buildscripts/pdebuild -d cdt -f org.eclipse.linuxtools.profiling.feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \ + -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ %install @@ -56,6 +56,10 @@ %{install_loc} %changelog +* Thu Mar 05 2009 Elliott Baron 0.1.0-1 +- Final 0.1 upstream release. +- Removed "Valgrind" from dialog titles. + * Tue Feb 24 2009 Fedora Release Engineering - 0.1.0-0.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From nhorman at fedoraproject.org Fri Mar 6 14:52:59 2009 From: nhorman at fedoraproject.org (Neil Horman) Date: Fri, 6 Mar 2009 14:52:59 +0000 (UTC) Subject: rpms/irqbalance/devel irqbalance.spec,1.54,1.55 Message-ID: <20090306145259.170ED70116@cvs1.fedora.phx.redhat.com> Author: nhorman Update of /cvs/extras/rpms/irqbalance/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20348 Modified Files: irqbalance.spec Log Message: Resolves: bz488849 Index: irqbalance.spec =================================================================== RCS file: /cvs/extras/rpms/irqbalance/devel/irqbalance.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- irqbalance.spec 25 Feb 2009 08:02:43 -0000 1.54 +++ irqbalance.spec 6 Mar 2009 14:52:28 -0000 1.55 @@ -1,7 +1,7 @@ Summary: IRQ balancing daemon. Name: irqbalance Version: 0.55 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 2 Group: System Environment/Base License: GPLv2 @@ -12,7 +12,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig /sbin/service -ExclusiveArch: i386 x86_64 ia64 ppc ppc64 +ExclusiveArch: i386 i586 x86_64 ia64 ppc ppc64 Obsoletes: kernel-utils BuildRequires: glib2-devel pkgconfig imake Requires: glib2 @@ -78,6 +78,9 @@ %changelog +* Fri Mar 6 2009 Neil Horman +- Update spec file to build for i586 as per new build guidelines (bz 488849) + * Wed Feb 25 2009 Fedora Release Engineering - 2:0.55-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From remi at fedoraproject.org Fri Mar 6 14:53:17 2009 From: remi at fedoraproject.org (Remi Collet) Date: Fri, 6 Mar 2009 14:53:17 +0000 (UTC) Subject: rpms/perl-Gtk2-MozEmbed/devel .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <20090306145317.632BD70116@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Gtk2-MozEmbed/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20424 Modified Files: .cvsignore sources Log Message: new package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2-MozEmbed/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:07:05 -0000 1.1 +++ .cvsignore 6 Mar 2009 14:52:46 -0000 1.2 @@ -0,0 +1 @@ +Gtk2-MozEmbed-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2-MozEmbed/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:07:05 -0000 1.1 +++ sources 6 Mar 2009 14:52:47 -0000 1.2 @@ -0,0 +1 @@ +ddafafa0e2684050a5d8b9f2c15f6dca Gtk2-MozEmbed-0.08.tar.gz From remi at fedoraproject.org Fri Mar 6 14:55:06 2009 From: remi at fedoraproject.org (Remi Collet) Date: Fri, 6 Mar 2009 14:55:06 +0000 (UTC) Subject: rpms/perl-Gtk2-MozEmbed/devel perl-Gtk2-MozEmbed-make.patch, NONE, 1.1 perl-Gtk2-MozEmbed.spec, NONE, 1.1 Message-ID: <20090306145506.E195770116@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Gtk2-MozEmbed/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21044 Added Files: perl-Gtk2-MozEmbed-make.patch perl-Gtk2-MozEmbed.spec Log Message: new package perl-Gtk2-MozEmbed-make.patch: --- NEW FILE perl-Gtk2-MozEmbed-make.patch --- --- Makefile.PL.orig 2009-02-15 10:17:17.000000000 +0100 +++ Makefile.PL 2009-02-15 10:19:18.000000000 +0100 @@ -76,9 +76,9 @@ my $inc = $pkgcfg{cflags}; my $libs = $pkgcfg{libs}; -if ($libs =~ m#xulrunner-devel-([^/]+)#) { +if ($libs =~ m#(lib|lib64)/xulrunner-(devel|sdk)-([^/]+)#) { $inc .= qq( -DGTK_MOZ_EMBED_PERL_XULRUNNER_PATH=) - . qq("\\"/usr/lib/xulrunner-$1\\"" ); + . qq("\\"/usr/$1/xulrunner-$3\\"" ); } my $mozembed = ExtUtils::Depends->new('Gtk2::MozEmbed', 'Gtk2', --- NEW FILE perl-Gtk2-MozEmbed.spec --- %define perlname Gtk2-MozEmbed %if 0%{?fedora} >= 11 %define gecko_version 1.9.1 %else %define gecko_version 1.9.0.6 %endif Summary: Interface to the Mozilla embedding widget Name: perl-Gtk2-MozEmbed Version: 0.08 Release: 3%{?dist} Group: Development/Libraries License: LGPLv2+ URL: http://search.cpan.org/dist/Gtk2-MozEmbed Source0: http://www.cpan.org/authors/id/T/TS/TSCH/%{perlname}-%{version}.tar.gz # See https://rt.cpan.org/Ticket/Display.html?id=43306 Patch0: %{name}-make.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::Depends) >= 0.20 BuildRequires: perl(ExtUtils::PkgConfig) >= 1.03 BuildRequires: perl(Glib) >= 1.180 BuildRequires: perl(Gtk2) >= 1.081 BuildRequires: gtk2-devel BuildRequires: xulrunner-devel-unstable = %{gecko_version} Requires: perl(Glib) >= 1.180 Requires: perl(Gtk2) >= 1.081 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # BR xulrunner-devel-unstable so hard dep. Requires: gecko-libs = %{gecko_version} %description This module allows you to use the Mozilla embedding widget from Perl. %prep %setup -q -n %{perlname}-%{version} %patch0 -p0 iconv -f ISO-8859-15 -t UTF-8 NEWS >NEWS.utf8 touch -r NEWS NEWS.utf8 mv NEWS.utf8 NEWS %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 {} ';' -print find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' -print find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' %{_fixperms} $RPM_BUILD_ROOT%{_prefix} %check # Tests doesn't run in mock nor in rpmbuild (need a display) # Should display : All tests successful. # Files=1, Tests=8, 1 wallclock secs - Result: PASS %{?_with_display_tests: make test} %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog examples/ LICENSE NEWS README %{_mandir}/man3/Gtk2::MozEmbed* %{perl_vendorarch}/auto/Gtk2 %{perl_vendorarch}/Gtk2 %changelog * Tue Mar 03 2009 Remi Collet - 0.08-3 - Fix from review : Gtk2 dir ownership * Tue Mar 03 2009 Remi Collet - 0.08-2 - Fix from review : License, %%check, %%_fixperms * Sat Feb 14 2009 Remi Collet - 0.08-1 - initial Fedora RPM From jreznik at fedoraproject.org Fri Mar 6 14:59:06 2009 From: jreznik at fedoraproject.org (Jaroslav Reznik) Date: Fri, 6 Mar 2009 14:59:06 +0000 (UTC) Subject: rpms/gnash/devel gnash.spec,1.48,1.49 Message-ID: <20090306145906.18B6070116@cvs1.fedora.phx.redhat.com> Author: jreznik Update of /cvs/pkgs/rpms/gnash/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21840 Modified Files: gnash.spec Log Message: * Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-2 - add missing speex-devel and gstreamer-plugins-base-devel BR Index: gnash.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- gnash.spec 6 Mar 2009 12:24:36 -0000 1.48 +++ gnash.spec 6 Mar 2009 14:58:35 -0000 1.49 @@ -1,6 +1,6 @@ Name: gnash Version: 0.8.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNU flash movie player Group: Applications/Multimedia @@ -38,6 +38,8 @@ BuildRequires: giflib-devel BuildRequires: gettext BuildRequires: desktop-file-utils +BuildRequires: speex-devel +BuildRequires: gstreamer-plugins-base-devel #Requires(post): scrollkeeper #Requires(postun): scrollkeeper @@ -289,6 +291,9 @@ %{_mandir}/man1/cygnal.1* %changelog +* Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-2 +- add missing speex-devel and gstreamer-plugins-base-devel BR + * Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-1 - update to 0.8.5 - remove use_kde3_executable_hack From rdieter at fedoraproject.org Fri Mar 6 15:00:11 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 15:00:11 +0000 (UTC) Subject: rpms/kdeutils/devel kdeutils.spec,1.164,1.165 Message-ID: <20090306150011.74C4F70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22076 Modified Files: kdeutils.spec Log Message: fix %%files list Index: kdeutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- kdeutils.spec 6 Mar 2009 14:44:30 -0000 1.164 +++ kdeutils.spec 6 Mar 2009 14:59:41 -0000 1.165 @@ -172,8 +172,9 @@ %{_kde4_iconsdir}/oxygen/*/*/* %{_datadir}/dbus-1/interfaces/* %{_kde4_datadir}/config.kcfg/* -%{_kde4_datadir}/autostart/* +%{_kde4_datadir}/autostart/kgpg.desktop %{_kde4_configdir}/* +%{_kde4_libdir}/lib*.so.* %{_kde4_libdir}/libkdeinit*.so %{_kde4_libdir}/kde4/* %if 0%{?include_kjots} From jreznik at fedoraproject.org Fri Mar 6 15:16:18 2009 From: jreznik at fedoraproject.org (Jaroslav Reznik) Date: Fri, 6 Mar 2009 15:16:18 +0000 (UTC) Subject: rpms/gnash/F-10 gnash.spec,1.46,1.47 Message-ID: <20090306151618.5BC8A70116@cvs1.fedora.phx.redhat.com> Author: jreznik Update of /cvs/pkgs/rpms/gnash/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25219 Modified Files: gnash.spec Log Message: * Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-2 - add missing speex-devel and gstreamer-plugins-base-devel BRs Index: gnash.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnash/F-10/gnash.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- gnash.spec 6 Mar 2009 13:34:56 -0000 1.46 +++ gnash.spec 6 Mar 2009 15:15:48 -0000 1.47 @@ -1,6 +1,6 @@ Name: gnash Version: 0.8.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNU flash movie player Group: Applications/Multimedia @@ -38,6 +38,8 @@ BuildRequires: giflib-devel BuildRequires: gettext BuildRequires: desktop-file-utils +BuildRequires: speex-devel +BuildRequires: gstreamer-plugins-base-devel #Requires(post): scrollkeeper #Requires(postun): scrollkeeper @@ -289,6 +291,9 @@ %{_mandir}/man1/cygnal.1* %changelog +* Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-2 +- add missing speex-devel and gstreamer-plugins-base-devel BRs + * Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-1 - update to 0.8.5 - remove use_kde3_executable_hack From jreznik at fedoraproject.org Fri Mar 6 15:17:05 2009 From: jreznik at fedoraproject.org (Jaroslav Reznik) Date: Fri, 6 Mar 2009 15:17:05 +0000 (UTC) Subject: rpms/gnash/F-9 gnash.spec,1.30,1.31 Message-ID: <20090306151705.6910370116@cvs1.fedora.phx.redhat.com> Author: jreznik Update of /cvs/pkgs/rpms/gnash/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25448 Modified Files: gnash.spec Log Message: * Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-2 - add missing speex-devel and gstreamer-plugins-base-devel BRs Index: gnash.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnash/F-9/gnash.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gnash.spec 6 Mar 2009 13:41:47 -0000 1.30 +++ gnash.spec 6 Mar 2009 15:16:35 -0000 1.31 @@ -1,6 +1,6 @@ Name: gnash Version: 0.8.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNU flash movie player Group: Applications/Multimedia @@ -38,6 +38,8 @@ BuildRequires: giflib-devel BuildRequires: gettext BuildRequires: desktop-file-utils +BuildRequires: speex-devel +BuildRequires: gstreamer-plugins-base-devel #Requires(post): scrollkeeper #Requires(postun): scrollkeeper @@ -289,6 +291,9 @@ %{_mandir}/man1/cygnal.1* %changelog +* Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-2 +- add missing speex-devel and gstreamer-plugins-base-devel BRs + * Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-1 - update to 0.8.5 - remove use_kde3_executable_hack From rdieter at fedoraproject.org Fri Mar 6 15:18:44 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 15:18:44 +0000 (UTC) Subject: rpms/kdeutils/F-10 .cvsignore,1.55,1.56 kdeutils.spec,1.151,1.152 Message-ID: <20090306151844.A710570116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25974 Modified Files: .cvsignore kdeutils.spec Log Message: * Fri Mar 06 2009 Rex Dieter - 4.2.1-2 - -printer-applet subpkg - cleanup unused -libs/-devel crud Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/F-10/.cvsignore,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- .cvsignore 9 Jan 2009 04:51:11 -0000 1.55 +++ .cvsignore 6 Mar 2009 15:18:14 -0000 1.56 @@ -1 +1 @@ -kdeutils-4.1.4.tar.bz2 +kdeutils-4.2.1.tar.bz2 Index: kdeutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/F-10/kdeutils.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- kdeutils.spec 27 Feb 2009 18:53:34 -0000 1.151 +++ kdeutils.spec 6 Mar 2009 15:18:14 -0000 1.152 @@ -11,7 +11,7 @@ Name: kdeutils Epoch: 6 Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: K Desktop Environment - Utilities Group: Applications/System @@ -39,17 +39,16 @@ %if 0%{?printer_applet} BuildRequires: PyKDE4-devel >= %{version} BuildRequires: system-config-printer-libs -Requires: PyKDE4 >= %{version} -Requires: hal-cups-utils -Requires: system-config-printer-libs +# upgrade path so it doesn't get lost +Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release} %endif Provides: okteta = 0.1.0-1 Obsoletes: okteta < 0.1.0-1 -Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: %{name}-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: kdeutils-extras < 6:4.0.0 +Obsoletes: kdeutils-libs < 6:4.0.0 +Obsoletes: kdeutils-devel < 6:4.0.0 %description Utilities for the K Desktop Environment. @@ -72,18 +71,13 @@ * superkaramba * sweeper (clean unwanted traces the user leaves on the system) -%package libs -Summary: Runtime libraries for %{name} -Group: System Environment/Libraries -%description libs -%{summary}. - -%package devel -Group: Development/Libraries -Summary: Development files for %{name} -Requires: %{name}-libs = %{epoch}:%{version}-%{release} -Requires: kdepimlibs4-devel kdebase-workspace-devel -%description devel +%package printer-applet +Summary: KDE printer applet +Group: Applications/System +Requires: PyKDE4 >= %{version} +Requires: hal-cups-utils +Requires: system-config-printer-libs +%description printer-applet %{summary}. @@ -102,6 +96,7 @@ %patch0 -p1 -b .kjots %endif + %build mkdir -p %{_target_platform} @@ -109,7 +104,7 @@ %{cmake_kde4} .. popd -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %install @@ -131,21 +126,33 @@ %post /sbin/ldconfig ||: -%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : -%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : %postun /sbin/ldconfig ||: -%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : -%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : %files %defattr(-,root,root,-) %doc AUTHORS COPYING README -%{_kde4_bindir}/* +%{_kde4_bindir}/ark +%{_kde4_bindir}/kcalc +%{_kde4_bindir}/kcharselect +%{_kde4_bindir}/kdessh +%{_kde4_bindir}/kdf +%{_kde4_bindir}/kfloppy +%{_kde4_bindir}/kgpg +%{_kde4_bindir}/ktimer +%{_kde4_bindir}/kwalletmanager +%{_kde4_bindir}/kwikdisk +%{_kde4_bindir}/okteta +%{_kde4_bindir}/superkaramba +%{_kde4_bindir}/sweeper %{_kde4_appsdir}/ark/ %{_kde4_appsdir}/kcalc/ %{_kde4_appsdir}/kcharselect/ @@ -155,9 +162,6 @@ %{_kde4_appsdir}/kwalletmanager/ %{_kde4_appsdir}/okteta/ %{_kde4_appsdir}/oktetapart/ -%if 0%{?printer_applet} -%{_kde4_appsdir}/printer-applet/ -%endif %{_kde4_appsdir}/superkaramba/ %{_kde4_appsdir}/sweeper/ %{_kde4_datadir}/kde4/services/* @@ -168,33 +172,32 @@ %{_kde4_iconsdir}/oxygen/*/*/* %{_datadir}/dbus-1/interfaces/* %{_kde4_datadir}/config.kcfg/* -%{_kde4_datadir}/autostart/* +%{_kde4_datadir}/autostart/kgpg.desktop %{_kde4_configdir}/* +%{_kde4_libdir}/lib*.so.* %{_kde4_libdir}/libkdeinit*.so %{_kde4_libdir}/kde4/* %if 0%{?include_kjots} +%{_kde4_bindir}/kjots %{_kde4_appsdir}/kjots/ %{_kde4_docdir}/HTML/en/kjots/ %endif %{_mandir}/man1/* -%if 0 -%files libs -%defattr(-,root,root,-) -%endif -%{_kde4_libdir}/lib*.so.* - -%if 0 -%files devel +%if 0%{?printer_applet} %defattr(-,root,root,-) -%{_kde4_includedir}/* -%exclude %{_kde4_libdir}/libkdeinit*.so -%{_kde4_libdir}/lib*.so +%{_kde4_bindir}/printer-applet +%{_kde4_datadir}/autostart/printer-applet.desktop +%{_kde4_appsdir}/printer-applet/ %endif %changelog -* Fri Feb 27 2009 Luk???? Tinkl - 4.2.1-1 +* Fri Mar 06 2009 Rex Dieter - 4.2.1-2 +- -printer-applet subpkg +- cleanup unused -libs/-devel crud + +* Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 * Wed Feb 25 2009 Fedora Release Engineering - 6:4.2.0-2 From rdieter at fedoraproject.org Fri Mar 6 15:42:36 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 15:42:36 +0000 (UTC) Subject: rpms/kdepim3/devel import.log, NONE, 1.1 kdepim3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306154236.DC2B170116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepim3/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29960/devel Modified Files: .cvsignore sources Added Files: import.log kdepim3.spec Log Message: import --- NEW FILE import.log --- kdepim3-3_5_10-1_fc11:HEAD:kdepim3-3.5.10-1.fc11.src.rpm:1236354088 --- NEW FILE kdepim3.spec --- Name: kdepim3 Summary: Compatibility support for kdepim3 Version: 3.5.10 Release: 1%{?dist} License: GPLv2 Group: Applications/Productivity URL: http://www.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2 BuildRequires: bison flex BuildRequires: desktop-file-utils BuildRequires: kdelibs3-devel >= %{version} BuildRequires: zlib-devel BuildRequires: libart_lgpl-devel BuildRequires: cyrus-sasl-devel BuildRequires: lockdev-devel BuildRequires: python-devel ## Crypto Stuff from http://kmail.kde.org/kmail-pgpmime-howto.html BuildRequires: gpgme-devel BuildRequires: libXpm-devel libXScrnSaver-devel %description %{summary}, including libkcal. %package libs Summary: Runtime files for %{name} Group: System Environment/Libraries %description libs %%{summary}, including libkcal. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} Requires: kdelibs3-devel # kdepimlibs will need fixing to avoid conflicts -- Rex Conflicts: kdepimlibs-devel < 4.2.1 %description devel %{summary}. %prep %setup -q -n kdepim-%{version} %build unset QTDIR || : ; . /etc/profile.d/qt.sh %configure \ --enable-new-ldflags \ --disable-dependency-tracking \ --disable-rpath \ --disable-debug --disable-warnings \ --enable-final \ --includedir=%{_includedir}/kde \ --with-gpg=%{_bindir}/gpg \ --with-gpgsm=%{_bindir}/gpgsm \ --with-sasl \ %{?_with_gnokii} %{!?_with_gnokii:--without-gnokii} \ %{?_with_mal} %{!?_with_mal:--without-mal} \ %{?_with_pilot_link} %{!?_with_pilot_link:--without-pilot-link} for lib in ktnef libkmime libemailfunctions libkcal libkdepim; do make %{?_smp_mflags} -C ${lib} done %install rm -rf %{buildroot} for lib in ktnef libkmime libemailfunctions libkcal libkdepim; do make install DESTDIR=%{buildroot} -C $lib done #unpackaged files rm -f %{buildroot}%{_libdir}/lib*.la rm -f %{buildroot}%{_libdir}/libkdepim* rm -rf %{buildroot}%{_datadir}/apps/libkdepim/ rm -rf %{buildroot}%{_datadir}/apps/kdepimwidgets/ rm -f %{buildroot}%{_libdir}/kde3/plugins/designer/* rm -f %{buildroot}%{_libdir}/lib{kmime,ktnef}.so rm -rf %{buildroot}%{_includedir}/kde/ktnef/ rm -rf %{buildroot}%{_datadir}/applications rm -rf %{buildroot}%{_datadir}/icons rm -rf %{buildroot}%{_datadir}/mimelnk rm -rf %{buildroot}%{_datadir}/apps/ktnef rm -f %{buildroot}%{_bindir}/ktnef %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %clean rm -rf %{buildroot} %files libs %defattr(-,root,root,-) %doc README korganizer/COPYING %{_datadir}/config.kcfg/pimemoticons.kcfg %{_datadir}/apps/libical/ %{_datadir}/services/kresources/kcal* %{_libdir}/libkcal.so.2* %{_libdir}/kde3/kcal* %{_libdir}/libkmime.so.2* %{_libdir}/libktnef.so.1* %files devel %defattr(-,root,root,-) %{_includedir}/kde/kdepimmacros.h %{_includedir}/kde/libemailfunctions/ %{_includedir}/kde/libkcal/ %{_libdir}/libkcal.so %changelog * Tue Mar 03 2009 Rex Dieter 3.5.10-1 - first try at kdepim3 compat pkg, including libkcal Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdepim3/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:51:38 -0000 1.1 +++ .cvsignore 6 Mar 2009 15:42:06 -0000 1.2 @@ -0,0 +1 @@ +kdepim-3.5.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdepim3/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:51:38 -0000 1.1 +++ sources 6 Mar 2009 15:42:06 -0000 1.2 @@ -0,0 +1 @@ +fc93e458a8eec8131ede56cff30c28b2 kdepim-3.5.10.tar.bz2 From rdieter at fedoraproject.org Fri Mar 6 15:51:59 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 15:51:59 +0000 (UTC) Subject: rpms/kdepim3/devel kdepim3.spec,1.1,1.2 Message-ID: <20090306155159.24E6A70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepim3/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31902 Modified Files: kdepim3.spec Log Message: make kdepimlibs-devel conflict clearer (we should be able to drop this soon) Index: kdepim3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepim3/devel/kdepim3.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdepim3.spec 6 Mar 2009 15:42:06 -0000 1.1 +++ kdepim3.spec 6 Mar 2009 15:51:28 -0000 1.2 @@ -36,8 +36,8 @@ Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} Requires: kdelibs3-devel -# kdepimlibs will need fixing to avoid conflicts -- Rex -Conflicts: kdepimlibs-devel < 4.2.1 +# kdepimlibs-devel-4.2.1-2 fixed to avoid conflicts -- Rex +Conflicts: kdepimlibs-devel < 4.2.1-2 %description devel %{summary}. From glommer at fedoraproject.org Fri Mar 6 15:52:19 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Fri, 6 Mar 2009 15:52:19 +0000 (UTC) Subject: rpms/qemu/devel qemu.spec,1.61,1.62 Message-ID: <20090306155219.B58CA70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30940 Modified Files: qemu.spec Log Message: kvm.modules being wrongly stated Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- qemu.spec 5 Mar 2009 20:06:29 -0000 1.61 +++ qemu.spec 6 Mar 2009 15:51:49 -0000 1.62 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.4.kvm20090303git%{?dist} +Release: 0.5.kvm20090303git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -267,7 +267,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules mkdir -p $RPM_BUILD_ROOT%{_bindir}/ -install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules +install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules install -m 0755 kvmtrace $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 kvmtrace_format $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 kvm_stat $RPM_BUILD_ROOT%{_bindir}/ @@ -422,6 +422,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Fri Mar 06 2009 Glauber Costa - 2:0.10-0.5.kvm20090303git +- kvm.modules were being wrongly mentioned at %install. + * Thu Mar 05 2009 Glauber Costa - 2:0.10-0.4.kvm20090303git - seems Epoch does not go into the tags. So start back here. From rdieter at fedoraproject.org Fri Mar 6 15:55:48 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 15:55:48 +0000 (UTC) Subject: rpms/kdepim3/F-10 kdepim3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306155548.4C39570116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepim3/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32707 Modified Files: .cvsignore sources Added Files: kdepim3.spec Log Message: import --- NEW FILE kdepim3.spec --- Name: kdepim3 Summary: Compatibility support for kdepim3 Version: 3.5.10 Release: 1%{?dist} License: GPLv2 Group: Applications/Productivity URL: http://www.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2 BuildRequires: bison flex BuildRequires: desktop-file-utils BuildRequires: kdelibs3-devel >= %{version} BuildRequires: zlib-devel BuildRequires: libart_lgpl-devel BuildRequires: cyrus-sasl-devel BuildRequires: lockdev-devel BuildRequires: python-devel ## Crypto Stuff from http://kmail.kde.org/kmail-pgpmime-howto.html BuildRequires: gpgme-devel BuildRequires: libXpm-devel libXScrnSaver-devel %description %{summary}, including libkcal. %package libs Summary: Runtime files for %{name} Group: System Environment/Libraries %description libs %%{summary}, including libkcal. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} Requires: kdelibs3-devel # kdepimlibs-devel-4.2.1-2 fixed to avoid conflicts -- Rex Conflicts: kdepimlibs-devel < 4.2.1-2 %description devel %{summary}. %prep %setup -q -n kdepim-%{version} %build unset QTDIR || : ; . /etc/profile.d/qt.sh %configure \ --enable-new-ldflags \ --disable-dependency-tracking \ --disable-rpath \ --disable-debug --disable-warnings \ --enable-final \ --includedir=%{_includedir}/kde \ --with-gpg=%{_bindir}/gpg \ --with-gpgsm=%{_bindir}/gpgsm \ --with-sasl \ %{?_with_gnokii} %{!?_with_gnokii:--without-gnokii} \ %{?_with_mal} %{!?_with_mal:--without-mal} \ %{?_with_pilot_link} %{!?_with_pilot_link:--without-pilot-link} for lib in ktnef libkmime libemailfunctions libkcal libkdepim; do make %{?_smp_mflags} -C ${lib} done %install rm -rf %{buildroot} for lib in ktnef libkmime libemailfunctions libkcal libkdepim; do make install DESTDIR=%{buildroot} -C $lib done #unpackaged files rm -f %{buildroot}%{_libdir}/lib*.la rm -f %{buildroot}%{_libdir}/libkdepim* rm -rf %{buildroot}%{_datadir}/apps/libkdepim/ rm -rf %{buildroot}%{_datadir}/apps/kdepimwidgets/ rm -f %{buildroot}%{_libdir}/kde3/plugins/designer/* rm -f %{buildroot}%{_libdir}/lib{kmime,ktnef}.so rm -rf %{buildroot}%{_includedir}/kde/ktnef/ rm -rf %{buildroot}%{_datadir}/applications rm -rf %{buildroot}%{_datadir}/icons rm -rf %{buildroot}%{_datadir}/mimelnk rm -rf %{buildroot}%{_datadir}/apps/ktnef rm -f %{buildroot}%{_bindir}/ktnef %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %clean rm -rf %{buildroot} %files libs %defattr(-,root,root,-) %doc README korganizer/COPYING %{_datadir}/config.kcfg/pimemoticons.kcfg %{_datadir}/apps/libical/ %{_datadir}/services/kresources/kcal* %{_libdir}/libkcal.so.2* %{_libdir}/kde3/kcal* %{_libdir}/libkmime.so.2* %{_libdir}/libktnef.so.1* %files devel %defattr(-,root,root,-) %{_includedir}/kde/kdepimmacros.h %{_includedir}/kde/libemailfunctions/ %{_includedir}/kde/libkcal/ %{_libdir}/libkcal.so %changelog * Tue Mar 03 2009 Rex Dieter 3.5.10-1 - first try at kdepim3 compat pkg, including libkcal Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdepim3/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:51:38 -0000 1.1 +++ .cvsignore 6 Mar 2009 15:55:17 -0000 1.2 @@ -0,0 +1 @@ +kdepim-3.5.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdepim3/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:51:38 -0000 1.1 +++ sources 6 Mar 2009 15:55:17 -0000 1.2 @@ -0,0 +1 @@ +fc93e458a8eec8131ede56cff30c28b2 kdepim-3.5.10.tar.bz2 From ebaron at fedoraproject.org Fri Mar 6 16:09:15 2009 From: ebaron at fedoraproject.org (Elliott Baron) Date: Fri, 6 Mar 2009 16:09:15 +0000 (UTC) Subject: rpms/eclipse-linuxprofilingframework/devel eclipse-linuxprofilingframework.spec, 1.4, 1.5 Message-ID: <20090306160915.A580570116@cvs1.fedora.phx.redhat.com> Author: ebaron Update of /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2921/devel Modified Files: eclipse-linuxprofilingframework.spec Log Message: * Fri Mar 6 2009 Elliott Baron 0.1.0-2 - Changing to arch dependent for CDT dependency. - CDT should be >= 5.0.0 Index: eclipse-linuxprofilingframework.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel/eclipse-linuxprofilingframework.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- eclipse-linuxprofilingframework.spec 6 Mar 2009 14:51:38 -0000 1.4 +++ eclipse-linuxprofilingframework.spec 6 Mar 2009 16:08:45 -0000 1.5 @@ -1,10 +1,10 @@ %define src_repo_tag RELEASE_0_1 %define eclipse_base %{_libdir}/eclipse -%define install_loc %{_datadir}/eclipse/dropins/linuxprofilingframework +%define install_loc %{_libdir}/eclipse/dropins/linuxprofilingframework Name: eclipse-linuxprofilingframework Version: 0.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Eclipse Linux Tools Profiling Framework Group: Development/Tools @@ -16,15 +16,13 @@ Patch0: %{name}-dialog-strings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch - # No CDT on ppc64 ExcludeArch: ppc64 BuildRequires: eclipse-pde >= 1:3.4.0 Requires: eclipse-platform >= 1:3.4.0 -BuildRequires: eclipse-cdt >= 1:4.0.0 -Requires: eclipse-cdt >= 1:4.0.0 +BuildRequires: eclipse-cdt >= 1:5.0.0 +Requires: eclipse-cdt >= 1:5.0.0 %description Plugins common to Eclipse Linux Tools profiling tools. @@ -56,7 +54,11 @@ %{install_loc} %changelog -* Thu Mar 05 2009 Elliott Baron 0.1.0-1 +* Fri Mar 6 2009 Elliott Baron 0.1.0-2 +- Changing to arch dependent for CDT dependency. +- CDT should be >= 5.0.0 + +* Thu Mar 5 2009 Elliott Baron 0.1.0-1 - Final 0.1 upstream release. - Removed "Valgrind" from dialog titles. From rdieter at fedoraproject.org Fri Mar 6 16:14:23 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 16:14:23 +0000 (UTC) Subject: rpms/amarok/devel amarok.spec,1.139,1.140 Message-ID: <20090306161424.02C1270116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/amarok/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3879 Modified Files: amarok.spec Log Message: * Fri Mar 06 2009 Rex Dieter 2.0.2-2 - add minimal qt4,kdelibs4 deps Index: amarok.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- amarok.spec 5 Mar 2009 15:59:56 -0000 1.139 +++ amarok.spec 6 Mar 2009 16:13:53 -0000 1.140 @@ -2,7 +2,7 @@ Name: amarok Summary: Media player Version: 2.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -35,6 +35,11 @@ BuildRequires: soprano-devel BuildRequires: taglib-devel +# +%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1) +%{?_qt4_version:Requires: qt4 >= %{_qt4_version}} +%{?_kdelibs4_version:Requires: kdelibs4 >= %{_kdelibs4_version}} + Requires(post): xdg-utils Requires(postun): xdg-utils @@ -55,17 +60,24 @@ %if 0%{?fedora} > 10 %patch0 -p0 -b .libgpod-0.7.0 +%patch100 -p0 -b .qt45 %endif %patch1 -p1 -b .gcc4 -%patch100 -p0 -b .qt45 - %build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. popd + +%if 0 +# hack around qt45 patch-induced(?) smp borkage +pushd src/scriptengine/generator/generator +./generate.sh +popd +%endif + make %{?_smp_mflags} -C %{_target_platform} @@ -117,13 +129,16 @@ %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_libdir}/kde4/*.so %{_kde4_libdir}/kde4/plugins/script/*.so -%{_kde4_libdir}/lib*.so.* +%{_kde4_libdir}/libamarok*.so.* %{_kde4_libdir}/libamarok_service_liblastfm.so %{_kde4_libdir}/strigi/* %{_datadir}/dbus-1/interfaces/*.xml %changelog +* Fri Mar 06 2009 Rex Dieter 2.0.2-2 +- add minimal qt4,kdelibs4 deps + * Wed Mar 04 2009 Rex Dieter 2.0.2-1 - amarok-2.0.2 From rdieter at fedoraproject.org Fri Mar 6 16:16:22 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 16:16:22 +0000 (UTC) Subject: rpms/amarok/F-10 amarok.spec,1.132,1.133 Message-ID: <20090306161622.587F970116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/amarok/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4364 Modified Files: amarok.spec Log Message: * Fri Mar 06 2009 Rex Dieter 2.0.2-2 - add minimal qt4,kdelibs4 deps Index: amarok.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- amarok.spec 6 Mar 2009 14:48:54 -0000 1.132 +++ amarok.spec 6 Mar 2009 16:15:51 -0000 1.133 @@ -2,7 +2,7 @@ Name: amarok Summary: Media player Version: 2.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -35,6 +35,11 @@ BuildRequires: soprano-devel BuildRequires: taglib-devel +# +%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1) +%{?_qt4_version:Requires: qt4 >= %{_qt4_version}} +%{?_kdelibs4_version:Requires: kdelibs4 >= %{_kdelibs4_version}} + Requires(post): xdg-utils Requires(postun): xdg-utils @@ -124,13 +129,16 @@ %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_libdir}/kde4/*.so %{_kde4_libdir}/kde4/plugins/script/*.so -%{_kde4_libdir}/lib*.so.* +%{_kde4_libdir}/libamarok*.so.* %{_kde4_libdir}/libamarok_service_liblastfm.so %{_kde4_libdir}/strigi/* %{_datadir}/dbus-1/interfaces/*.xml %changelog +* Fri Mar 06 2009 Rex Dieter 2.0.2-2 +- add minimal qt4,kdelibs4 deps + * Wed Mar 04 2009 Rex Dieter 2.0.2-1 - amarok-2.0.2 From rdieter at fedoraproject.org Fri Mar 6 16:21:40 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 16:21:40 +0000 (UTC) Subject: rpms/kdeutils/devel kdeutils.spec,1.165,1.166 Message-ID: <20090306162140.BA97C70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5386 Modified Files: kdeutils.spec Log Message: * Fri Mar 06 2009 Rex Dieter - 4.2.1-3 - *really* make a -printer-applet subpkg Index: kdeutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- kdeutils.spec 6 Mar 2009 14:59:41 -0000 1.165 +++ kdeutils.spec 6 Mar 2009 16:21:10 -0000 1.166 @@ -11,7 +11,7 @@ Name: kdeutils Epoch: 6 Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: K Desktop Environment - Utilities Group: Applications/System @@ -185,6 +185,7 @@ %{_mandir}/man1/* %if 0%{?printer_applet} +%files printer-applet %defattr(-,root,root,-) %{_kde4_bindir}/printer-applet %{_kde4_datadir}/autostart/printer-applet.desktop @@ -193,6 +194,9 @@ %changelog +* Fri Mar 06 2009 Rex Dieter - 4.2.1-3 +- *really* make a -printer-applet subpkg + * Fri Mar 06 2009 Rex Dieter - 4.2.1-2 - -printer-applet subpkg - cleanup unused -libs/-devel crud From rdieter at fedoraproject.org Fri Mar 6 16:24:09 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 16:24:09 +0000 (UTC) Subject: rpms/kdeutils/F-10 kdeutils.spec,1.152,1.153 Message-ID: <20090306162409.9174770116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6062 Modified Files: kdeutils.spec Log Message: * Fri Mar 06 2009 Rex Dieter - 4.2.1-3 - *really* make a -printer-applet subpkg Index: kdeutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/F-10/kdeutils.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- kdeutils.spec 6 Mar 2009 15:18:14 -0000 1.152 +++ kdeutils.spec 6 Mar 2009 16:23:39 -0000 1.153 @@ -11,7 +11,7 @@ Name: kdeutils Epoch: 6 Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: K Desktop Environment - Utilities Group: Applications/System @@ -185,6 +185,7 @@ %{_mandir}/man1/* %if 0%{?printer_applet} +%files printer-applet %defattr(-,root,root,-) %{_kde4_bindir}/printer-applet %{_kde4_datadir}/autostart/printer-applet.desktop @@ -193,6 +194,9 @@ %changelog +* Fri Mar 06 2009 Rex Dieter - 4.2.1-3 +- *really* make a -printer-applet subpkg + * Fri Mar 06 2009 Rex Dieter - 4.2.1-2 - -printer-applet subpkg - cleanup unused -libs/-devel crud From mclasen at fedoraproject.org Fri Mar 6 16:25:57 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Fri, 6 Mar 2009 16:25:57 +0000 (UTC) Subject: rpms/DeviceKit-disks/devel devkit-disks-dashdash.patch, NONE, 1.1 DeviceKit-disks.spec, 1.7, 1.8 Message-ID: <20090306162557.40E5B70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/DeviceKit-disks/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6094 Modified Files: DeviceKit-disks.spec Added Files: devkit-disks-dashdash.patch Log Message: fix -- handling devkit-disks-dashdash.patch: --- NEW FILE devkit-disks-dashdash.patch --- diff -up DeviceKit-disks-003/tools/devkit-disks.c.-- DeviceKit-disks-003/tools/devkit-disks.c --- DeviceKit-disks-003/tools/devkit-disks.c.-- 2009-03-06 11:18:51.290041345 -0500 +++ DeviceKit-disks-003/tools/devkit-disks.c 2009-03-06 11:19:49.244044184 -0500 @@ -1056,6 +1056,11 @@ do_inhibit_polling (const char *object_p cookie = NULL; ret = 127; + if (strcmp (argv[0], "--") == 0) { + argv++; + argc--; + } + proxy = dbus_g_proxy_new_for_name (bus, "org.freedesktop.DeviceKit.Disks", object_path, @@ -1123,6 +1128,11 @@ do_inhibit_all_polling (gint arg cookie = NULL; ret = 127; + if (strcmp (argv[0], "--") == 0) { + argv++; + argc--; + } + proxy = dbus_g_proxy_new_for_name (bus, "org.freedesktop.DeviceKit.Disks", "/", @@ -1188,6 +1198,11 @@ do_inhibit (gint argc, cookie = NULL; ret = 127; + if (strcmp (argv[0], "--") == 0) { + argv++; + argc--; + } + proxy = dbus_g_proxy_new_for_name (bus, "org.freedesktop.DeviceKit.Disks", "/", Index: DeviceKit-disks.spec =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- DeviceKit-disks.spec 4 Mar 2009 19:29:25 -0000 1.7 +++ DeviceKit-disks.spec 6 Mar 2009 16:25:26 -0000 1.8 @@ -11,7 +11,7 @@ Summary: Disk Management Service Name: DeviceKit-disks Version: 003 -Release: 3%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary @@ -40,6 +40,8 @@ Patch0: devkit-disks-use-devt-to-identify-mounts.patch Patch1: devkit-disks-dump-option.patch Patch2: devkit-disks-fstab-unmount.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=488850 +Patch3: devkit-disks-dashdash.patch %description DeviceKit-disks provides a daemon, D-Bus API and command line tools @@ -61,6 +63,7 @@ %patch0 -p1 -b .use-devt-for-mounts %patch1 -p1 -b .fstab-unmount %patch2 -p1 -b .dump-option +%patch3 -p1 -b .dashdash %build %configure @@ -115,6 +118,9 @@ %{_datadir}/gtk-doc/html/devkit-disks/* %changelog +* Fri Mar 6 2009 Matthias Clasen - 003-5 +- Handle -- correctly in devkit-disks + * Wed Mar 04 2009 David Zeuthen - 003-3%{?dist} - Add --dump option to devkit-disks(1) to help with debugging - Allow authorized users to unmount /etc/fstab mounts From mdomsch at fedoraproject.org Fri Mar 6 16:28:55 2009 From: mdomsch at fedoraproject.org (Matt Domsch) Date: Fri, 6 Mar 2009 16:28:55 +0000 (UTC) Subject: rpms/efibootmgr/devel efibootmgr.spec,1.6,1.7 Message-ID: <20090306162855.93F1670116@cvs1.fedora.phx.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/efibootmgr/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7302 Modified Files: efibootmgr.spec Log Message: make it ExclusiveArch %{ix86} to allow i586 building Index: efibootmgr.spec =================================================================== RCS file: /cvs/extras/rpms/efibootmgr/devel/efibootmgr.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- efibootmgr.spec 24 Feb 2009 14:08:51 -0000 1.6 +++ efibootmgr.spec 6 Mar 2009 16:28:25 -0000 1.7 @@ -1,14 +1,14 @@ Summary: EFI Boot Manager Name: efibootmgr Version: 0.5.4 -Release: 5%{?dist} +Release: 6%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://linux.dell.com/%{name}/ BuildRequires: pciutils-devel, zlib-devel BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXXX) # EFI/UEFI don't exist on PPC -ExclusiveArch: i386 x86_64 ia64 +ExclusiveArch: %{ix86} x86_64 ia64 # for RHEL / Fedora when efibootmgr was part of the elilo package Conflicts: elilo <= 3.6-5 @@ -46,6 +46,9 @@ %doc README INSTALL COPYING %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 0.5.4-6 +- make ExclusiveArch %%{ix86} now that packages are being built as .i586 + * Tue Feb 24 2009 Fedora Release Engineering - 0.5.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mdomsch at fedoraproject.org Fri Mar 6 16:30:56 2009 From: mdomsch at fedoraproject.org (Matt Domsch) Date: Fri, 6 Mar 2009 16:30:56 +0000 (UTC) Subject: rpms/efibootmgr/devel efibootmgr.spec,1.7,1.8 Message-ID: <20090306163056.B8DAA70116@cvs1.fedora.phx.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/efibootmgr/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7894 Modified Files: efibootmgr.spec Log Message: fix changelog credit Index: efibootmgr.spec =================================================================== RCS file: /cvs/extras/rpms/efibootmgr/devel/efibootmgr.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- efibootmgr.spec 6 Mar 2009 16:28:25 -0000 1.7 +++ efibootmgr.spec 6 Mar 2009 16:30:26 -0000 1.8 @@ -46,7 +46,7 @@ %doc README INSTALL COPYING %changelog -* Tue Feb 24 2009 Fedora Release Engineering - 0.5.4-6 +* Fri Mar 06 2009 Matt Domsch - 0.5.4-6 - make ExclusiveArch %%{ix86} now that packages are being built as .i586 * Tue Feb 24 2009 Fedora Release Engineering - 0.5.4-5 From ebaron at fedoraproject.org Fri Mar 6 16:35:31 2009 From: ebaron at fedoraproject.org (Elliott Baron) Date: Fri, 6 Mar 2009 16:35:31 +0000 (UTC) Subject: rpms/eclipse-valgrind/devel eclipse-valgrind.spec,1.2,1.3 Message-ID: <20090306163531.D69AB70116@cvs1.fedora.phx.redhat.com> Author: ebaron Update of /cvs/pkgs/rpms/eclipse-valgrind/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8835/devel Modified Files: eclipse-valgrind.spec Log Message: * Fri Mar 6 2009 Elliott Baron 0.1.0-3 - Changing to arch dependent for CDT dependency. - Setting minimum Valgrind requirement to 3.3.0. Index: eclipse-valgrind.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-valgrind/devel/eclipse-valgrind.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- eclipse-valgrind.spec 26 Feb 2009 14:48:36 -0000 1.2 +++ eclipse-valgrind.spec 6 Mar 2009 16:35:01 -0000 1.3 @@ -1,10 +1,10 @@ %define src_repo_tag RELEASE_0_1 %define eclipse_base %{_libdir}/eclipse -%define install_loc %{_datadir}/eclipse/dropins/valgrind +%define install_loc %{_libdir}/eclipse/dropins/valgrind Name: eclipse-valgrind Version: 0.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Valgrind Tools Integration for Eclipse Group: Development/Tools @@ -14,7 +14,7 @@ Source1: %{name}-fetch-src.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch +#No CDT on ppc64 ExcludeArch: ppc64 BuildRequires: java-devel >= 1.5.0 @@ -26,7 +26,7 @@ Requires: eclipse-cdt Requires: eclipse-linuxprofilingframework Requires: eclipse-birt -Requires: valgrind +Requires: valgrind >= 3.3.0 %description This package for Eclipse allows users to launch their C/C++ Development Tools @@ -57,6 +57,10 @@ %doc org.eclipse.linuxtools.valgrind-feature/epl-v10.html %changelog +* Fri Mar 6 2009 Elliott Baron 0.1.0-3 +- Changing to arch dependent for CDT dependency. +- Setting minimum Valgrind requirement to 3.3.0. + * Thu Feb 26 2009 Elliott Baron 0.1.0-2 - No eclipse-cdt on ppc64 -> ExcludeArch. From harald at fedoraproject.org Fri Mar 6 16:39:16 2009 From: harald at fedoraproject.org (Harald Hoyer) Date: Fri, 6 Mar 2009 16:39:16 +0000 (UTC) Subject: comps comps-f11.xml.in,1.144,1.145 Message-ID: <20090306163916.691B970116@cvs1.fedora.phx.redhat.com> Author: harald Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9605 Modified Files: comps-f11.xml.in Log Message: add readahead to base Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- comps-f11.xml.in 5 Mar 2009 20:35:29 -0000 1.144 +++ comps-f11.xml.in 6 Mar 2009 16:38:45 -0000 1.145 @@ -249,6 +249,7 @@ pm-utils prctl prelink + readahead rdate rdist redhat-lsb From pghmcfc at fedoraproject.org Fri Mar 6 16:41:12 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Fri, 6 Mar 2009 16:41:12 +0000 (UTC) Subject: rpms/smbldap-tools/devel smbldap-tools-0.9.5-nscd.patch, NONE, 1.1 smbldap-tools.spec, 1.9, 1.10 Message-ID: <20090306164112.A243770116@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/smbldap-tools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10063 Modified Files: smbldap-tools.spec Added Files: smbldap-tools-0.9.5-nscd.patch Log Message: - change dependencies on samba and openldap-clients to samba-common and openldap-servers respectively - invalidate nscd caches rather than restart nscd (#476504) - add descriptions and bugzilla references to patch references in spec smbldap-tools-0.9.5-nscd.patch: --- NEW FILE smbldap-tools-0.9.5-nscd.patch --- --- smbldap-groupadd 2009-03-04 16:46:42.000000000 +0000 +++ smbldap-groupadd 2009-03-06 10:38:36.000000000 +0000 @@ -47,10 +47,11 @@ exit (1); } -my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +my $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ($nscd_status == 0) { - system "/etc/init.d/nscd stop > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } @@ -146,7 +147,8 @@ $ldap_master->unbind; if ($nscd_status == 0) { - system "/etc/init.d/nscd start > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } if ($Options{'p'}) { --- smbldap-groupdel 2009-03-03 21:29:44.000000000 +0000 +++ smbldap-groupdel 2009-03-03 21:32:09.000000000 +0000 @@ -54,10 +54,11 @@ group_del($dn); -my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +my $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ($nscd_status == 0) { - system "/etc/init.d/nscd restart > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } #if (defined($dn_line = get_group_dn($_groupName))) { --- smbldap-groupmod 2009-03-06 10:39:43.000000000 +0000 +++ smbldap-groupmod 2009-03-06 10:41:27.000000000 +0000 @@ -63,10 +63,11 @@ my $newname = $Options{'n'}; -my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +my $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ($nscd_status == 0) { - system "/etc/init.d/nscd restart > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } my $gid=$group_entry->get_value('gidNumber'); @@ -220,10 +221,11 @@ $modify->code && warn "failed to delete entry: ", $modify->error ; } -$nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +$nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ($nscd_status == 0) { - system "/etc/init.d/nscd restart > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } # take down session --- smbldap_tools.pm 2009-03-06 10:44:24.000000000 +0000 +++ smbldap_tools.pm 2009-03-06 10:43:17.000000000 +0000 @@ -742,9 +742,10 @@ # $gid = group_add($groupname, $group_gid, $force_using_existing_gid) sub group_add { my ( $gname, $gid, $force ) = @_; - my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; + my $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd stop > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } if ( !defined($gid) ) { @@ -762,7 +763,8 @@ } } if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd start > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } my $modify = $ldap->add( "cn=$gname,$config{groupsdn}", --- smbldap-useradd 2009-03-03 21:28:00.000000000 +0000 +++ smbldap-useradd 2009-03-06 10:50:08.000000000 +0000 @@ -83,10 +83,11 @@ # cause problems when dealing with getpwuid because of the # negative ttl and ldap modification -my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +my $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd stop > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } # Read only first @ARGV @@ -176,7 +177,8 @@ } if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd start > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } my $createGroup = 0; --- smbldap-userdel 2008-04-22 09:13:29.000000000 +0100 +++ smbldap-userdel 2009-03-06 10:51:31.000000000 +0000 @@ -93,10 +93,11 @@ system('rm', @rmargs, $homedir); } -my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +my $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ($nscd_status == 0) { - system "/etc/init.d/nscd restart > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } $ldap_master->unbind; # take down session --- smbldap-usermod 2009-03-03 21:32:34.000000000 +0000 +++ smbldap-usermod 2009-03-06 10:39:26.000000000 +0000 @@ -237,22 +237,15 @@ if ( defined( $tmp = $Options{'u'} ) ) { if ( !defined( $Options{'o'} ) ) { - $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; + $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd stop > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } - if ( getpwuid($tmp) ) { - if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd start > /dev/null 2>&1"; - } - print "$0: uid number $tmp exists\n"; exit(6); } - if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd start > /dev/null 2>&1"; - } } push( @mods, 'uidNumber', $tmp ); @@ -878,10 +871,11 @@ $ldap_master->unbind; } -$nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +$nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd restart > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } if ( defined( $Options{'P'} ) ) { --- smbldap-usershow 2008-04-22 09:13:29.000000000 +0100 +++ smbldap-usershow 2009-03-06 10:53:36.000000000 +0000 @@ -44,9 +44,10 @@ # Read only first @ARGV my $user = $ARGV[0]; -my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +my $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ($nscd_status == 0) { - system "/etc/init.d/nscd restart > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } my $ldap_slave=connect_ldap_slave(); Index: smbldap-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/smbldap-tools/devel/smbldap-tools.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- smbldap-tools.spec 26 Feb 2009 01:40:41 -0000 1.9 +++ smbldap-tools.spec 6 Mar 2009 16:40:42 -0000 1.10 @@ -1,20 +1,37 @@ Summary: User and group administration tools for Samba/OpenLDAP Name: smbldap-tools Version: 0.9.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base URL: https://gna.org/projects/smbldap-tools/ Source0: http://download.gna.org/smbldap-tools/packages/smbldap-tools-%{version}.tgz -Patch0: smbldap-tools-0.9.5-config.patch -Patch1: smbldap-tools-0.9.5-utf-8.patch -Patch2: smbldap-tools-0.9.5-chown.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: openldap-clients, samba, perl(IO::Socket::SSL) +# Need samba-common for /usr/bin/smbpasswd +Requires: samba-common +# Need openldap-servers for /usr/sbin/slappasswd +Requires: openldap-servers +# Need perl(IO::Socket::SSL) for LDAP over SSL (#122066, #207430) +Requires: perl(IO::Socket::SSL) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: openssl +# Fedora integration +Patch0: smbldap-tools-0.9.5-config.patch + +# Assume UTF-8 locale rather than ISO-8859-1 +# http://bugzilla.redhat.com/441833 https://gna.org/bugs/?11717 +Patch1: smbldap-tools-0.9.5-utf-8.patch + +# Avoid race problems with chown on LDAP slaves +# http://bugzilla.redhat.com/447758 https://gna.org/bugs/?11721 +Patch2: smbldap-tools-0.9.5-chown.patch + +# Don't stop/start nscd, invalidate caches instead +# http://bugzilla.redhat.com/476504 https://gna.org/bugs/?13098 +Patch3: smbldap-tools-0.9.5-nscd.patch + %description In conjunction with OpenLDAP and Samba-LDAP servers, this collection is useful to add, modify and delete users and groups, and to change Unix and Samba @@ -29,6 +46,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p0 # Don't want these in %{_sbindir}... %{__mv} smbldap-tools.spec original-smbldap-tools.spec @@ -90,8 +108,14 @@ %{_mandir}/man8/* %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 0.9.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Fri Mar 6 2009 Paul Howarth 0.9.5-4 +- change dependencies on samba and openldap-clients to samba-common and + openldap-servers respectively +- invalidate nscd caches rather than restart nscd (#476504) +- add descriptions and bugzilla references to patch references in spec + +* Wed Feb 25 2009 Fedora Release Engineering 0.9.5-3 +- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Thu May 22 2008 Paul Howarth 0.9.5-2 - assume the user's locale uses UTF-8 rather than ISO-8859-1 (#441833) From mclasen at fedoraproject.org Fri Mar 6 17:15:05 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Fri, 6 Mar 2009 17:15:05 +0000 (UTC) Subject: rpms/gnome-session/devel gnome-session-debug-spew.patch, NONE, 1.1 gnome-session.spec, 1.228, 1.229 Message-ID: <20090306171505.AE8D570116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-session/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16800 Modified Files: gnome-session.spec Added Files: gnome-session-debug-spew.patch Log Message: Turn off excessive debug spew gnome-session-debug-spew.patch: --- NEW FILE gnome-session-debug-spew.patch --- diff -up gnome-session-2.25.92/gnome-session/main.c.debug-spew gnome-session-2.25.92/gnome-session/main.c --- gnome-session-2.25.92/gnome-session/main.c.debug-spew 2009-03-06 12:10:21.724791954 -0500 +++ gnome-session-2.25.92/gnome-session/main.c 2009-03-06 12:10:46.640936065 -0500 @@ -57,7 +57,7 @@ static gboolean failsafe = FALSE; static gboolean show_version = FALSE; -static gboolean debug = TRUE; +static gboolean debug = FALSE; static void on_bus_name_lost (DBusGProxy *bus_proxy, Index: gnome-session.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- gnome-session.spec 3 Mar 2009 17:35:53 -0000 1.228 +++ gnome-session.spec 6 Mar 2009 17:14:35 -0000 1.229 @@ -10,11 +10,15 @@ Summary: GNOME session manager Name: gnome-session Version: 2.25.92 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-session/2.25/%{name}-%{version}.tar.bz2 Source1: redhat-default-session Source2: gnome.desktop + +# http://bugzilla.gnome.org/show_bug.cgi?id=574399 +Patch0: gnome-session-debug-spew.patch + License: GPLv2+ Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -75,6 +79,7 @@ %prep %setup -q +%patch0 -p1 -b .debug-spew #workaround broken perl-XML-Parser on 64bit arches export PERL5LIB=/usr/lib64/perl5/vendor_perl/5.8.2 perl @@ -173,6 +178,9 @@ %changelog +* Fri Mar 6 2009 Matthias Clasen - 2.25.92-2 +- Turn off excessive debug spew + * Tue Mar 3 2009 Matthias Clasen - 2.25.92-1 - Update to 2.25.92 From jcollie at fedoraproject.org Fri Mar 6 17:28:22 2009 From: jcollie at fedoraproject.org (Jeffrey C. Ollie) Date: Fri, 6 Mar 2009 17:28:22 +0000 (UTC) Subject: rpms/zabbix/devel zabbix-1.6.3-pre.patch, NONE, 1.1 zabbix.spec, 1.33, 1.34 Message-ID: <20090306172822.9C9A270116@cvs1.fedora.phx.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/zabbix/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19927 Modified Files: zabbix.spec Added Files: zabbix-1.6.3-pre.patch Log Message: * Wed Mar 4 2009 Jeffrey C. Ollie - 1.6.2-4 - Update to a SVN snapshot of the upstream 1.6 branch to fix security issue (BZ#488501) zabbix-1.6.3-pre.patch: --- NEW FILE zabbix-1.6.3-pre.patch --- diff --git a/ChangeLog b/ChangeLog index b6ee465..e217193 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,71 @@ +Changes for 1.6.3 + + - [DEV-268] added support of for system.cpu.util under Solaris (Sasha) + - [ZBX-737] the behaviour of the agent's key "vfs.fs.size" improved to be similar to the "df" command (Dmitry) + - [ZBX-599] the purpose of the configuration parameter StartAgents precised (Dmitry) + - [ZBX-756] added tooltip in "status of ZABBIX" report for number of items and triggers parameter (Vedmak) + - [ZBX-740] fixed wrong aggregate graph drawing (Artem) + - [ZBX-747] fixed template linkage not working properly (Vedmak) + - [ZBX-746] fixed incorrect processing of net.tcp.listen (Sasha) + - [ZBX-745] fixed "invalid URL" when use small popup menus like ping etc (Vedmak) + - [ZBX-744] fixed "invalid URL" when add user to user group (Vedmak) + - [ZBX-743] fixed problem with "Too many open files" by agent under Solaris 2.5, 2.6 (Sasha) + - [ZBX-728] fixed displaying "no status update" error for template triggers (Vedmak) + - [ZBX-738] fixed processing of existing data when -n parameter is used for zabbix_server (Sasha) + - [ZBX-736] fixed "Undefined index error" during frontend installation (Vedmak) + - [ZBX-735] fixed filter in audit filtering only logs (Vedmak) + - [ZBX-734] fixed evaluation of {ITEM.LASTVALUE} if the trigger expression consists of several items (Sasha) + - [ZBX-732] fixed wrong action count in audit log (Vedmak) + - [ZBX-731] fixed resetting of web graph periods (Vedmak) + - [ZBX-730] fixed possible Windows agent crash when processing eventlog[] (Sasha) + - [ZBX-555] added entity counts on interfaces (Vedmak) + - [ZBX-724] improved queries in "Graphs" page (Artem) + - [ZBX-725] added new default user group "Disabled" (Vedmak) + - [ZBX-723] fixed Wrong URL when add rights to user group (Vedmak) + - [ZBX-720] edited configure.in file to make some error messages more sensible (Dmitry) + - [ZBX-665] corrected some typos in misc/conf/zabbix_server.conf (Dmitry) + - corrected some typos in test/env/standalone/conf/template_server.conf (Dmitry) + - [ZBX-615] fixed processing of four-character-long item keys (Dmitry) + - [ZBX-697] trigger description in "Last 20 issues" is link to the URL defined in trigger parameters + minor GUI typos fix (Vedmak) + - [ZBX-473] fixed SNMP-related compilation problem with undefined 'localname' under some platforms (Sasha) + - [ZBX-718] fixed web graphs start time not changing (Vedmak) + - [ZBX-699] fixed recursion detection in Include directive for config files (Sasha) + - [ZBX-301] fixed minor GUI text errors (Vedmak) + - [ZBX-716] fixed wrong caption for graph item editing form (Vedmak) + - [ZBX-717] all templates linked to group Templates in default config (Sasha) + - [ZBX-715] fixed "Invalid URL" error when choose History from history submenu (Vedmak) + - [ZBX-713] fixed "values per second" having too many decimal places (Vedmak) + - [ZBX-710] fixed duplicating entries in hosts groups after import (Artem) + - [ZBX-709] improved item graph exporting (Artem) + - [ZBX-712] fixed simple/advanced item filter switch (Vedmak) + - [ZBX-707] fixed sql error when filter items by host group (Vedmak) + - [ZBX-706] fixed element validation in sysmap elements (Artem) + - [ZBX-705] improved {ESC.HISTORY} macro in recovery notifications (Sasha) + - [ZBX-647] fixed audit log record for graph update action "added" -> "updated" (Vedmak) + - [ZBX-700] fixed possible server crash when using {TRIGGER.NAME} for notifications (Sasha) + - [DEV-286] improved zabbix main menu (Artem) + - [ZBX-311] fixed PostgreSQL errors with out of range string data (Sasha) + - [ZBX-696] fixed import of triggers with {HOSTNAME} macro (Sasha) + - [ZBX-677] fixed handling of -c parameter in zabbix_sender. Thanks to Jakov Sosic (Sasha) + - [ZBX-693] fixed timeout handling for SNMP connect (Sasha) + - [ZBX-690] fixed memory leak if trigger evaluation fails (Sasha) + - [DEV-285] added configurable the first dropdown selection (Artem) + - [ZBX-689] allowed processing of non-agent based checks for unreachable hosts (Sasha) + - [ZBX-683] removed "Step" field for recovery messages from Event details (Sasha) + - [ZBX-680] fixed login while entering any page with HTTP auth enabled (Artem) + - [ZBX-678] default number of HTTP pollers was decreased to one (Sasha) + - [ZBX-676] fixed sql problem with deletion of many hosts (Artem) + - [ZBX-675] fixed wrong result of function "nodata" after server restart (Sasha) + - [ZBX-672] added polish locale (Artem) + - [ZBX-671] removed net-snmp debug messages from server logs (Sasha) + - [ZBX-662] fixed support of quotation marks in command in UserParameter's (Sasha) + - [ZBX-658] fixed deadlocks in dbcache module (Sasha) + - [ZBX-659] added define for menu caching (Artem) + - [ZBX-581] fixed latest data auto-refresh cripples filter viewing issue (Artem) + - [ZBX-657] improved performance of the graph related screen due to missing index (Sasha) + - [ZBX-656] fixed warning zbx_malloc: allocating already allocated memory in json.c (Sasha) + - [DEV-282] fixes frontend vulnerabilities (Artem) + Changes for 1.6.2 - [ZBX-653] fixes for postgresql (Artem) diff --git a/bin/win32/zabbix_agentd.exe b/bin/win32/zabbix_agentd.exe index 8ecd516..05560c8 100755 Binary files a/bin/win32/zabbix_agentd.exe and b/bin/win32/zabbix_agentd.exe differ diff --git a/bin/win32/zabbix_get.exe b/bin/win32/zabbix_get.exe index 917209d..61fb39f 100644 Binary files a/bin/win32/zabbix_get.exe and b/bin/win32/zabbix_get.exe differ diff --git a/bin/win32/zabbix_sender.exe b/bin/win32/zabbix_sender.exe index 4cf2486..3a751a0 100644 Binary files a/bin/win32/zabbix_sender.exe and b/bin/win32/zabbix_sender.exe differ diff --git a/bin/win64/zabbix_agentd.exe b/bin/win64/zabbix_agentd.exe index d737133..31ac444 100755 Binary files a/bin/win64/zabbix_agentd.exe and b/bin/win64/zabbix_agentd.exe differ diff --git a/build/win32/project/Makefile_agent b/build/win32/project/Makefile_agent new file mode 100644 index 0000000..38dd8a8 --- /dev/null +++ b/build/win32/project/Makefile_agent @@ -0,0 +1,188 @@ +PROGNAME = ..\..\..\bin\win32\zabbix_agentd.exe +CC = cl.exe /nologo +LINKER = link.exe /NOLOGO +RC = rc.exe +MC = mc.exe +MT = mt.exe +MESSAGES_H = messages.h +INCS = /I .\ /I ..\include /I ..\..\..\include /I ..\..\..\src\zabbix_agent +CFLAGS = $(INCS) /O2 /Ob1 /GF /FD /EHsc /MT /Gy /W3 /c /TC /D _WINDOWS /D _CONSOLE /D _MBCS /D NDEBUG /D WIN32 /D HAVE_WINLDAP_H /D HAVE_ASSERT_H /D ZABBIX_SERVICE /D WITH_COMMON_METRICS /D WITH_SPECIFIC_METRICS /D WITH_SIMPLE_METRICS /D "_VC80_UPGRADE=0x0600" +RESOURCE_H = resource.res +OBJS = ..\..\..\src\libs\zbxcommon\alias.o ..\..\..\src\libs\zbxcommon\comms.o ..\..\..\src\libs\zbxcommon\gnuregex.o ..\..\..\src\libs\zbxcommon\misc.o ..\..\..\src\libs\zbxcommon\regexp.o ..\..\..\src\libs\zbxcommon\str.o ..\..\..\src\libs\zbxcommon\xml.o ..\..\..\src\libs\zbxcommon\zbxgetopt.o ..\..\..\src\libs\zbxcomms\comms.o ..\..\..\src\libs\zbxconf\cfg.o ..\..\..\src\libs\zbxcrypto\base64.o ..\..\..\src\libs\zbxcrypto\md5.o ..\..\..\src\libs\zbxjson\json.o ..\..\..\src\libs\zbxlog\log.o ..\..\..\src\libs\zbxplugin\zbxplugin.o ..\..\..\src\libs\zbxsys\mutexs.o ..\..\..\src\libs\zbxsys\symbols.o ..\..\..\src\libs\zbxsys\threads.o ..\..\..\src\libs\zbxsysinfo\common\common.o ..\..\..\src\libs\zbxsysinfo\common\file.o ..\..\..\src\libs\zbxsysinfo\common\http.o ..\..\..\src\libs\zbxsysinfo\common\net.o ..\..\..\src\libs\zbxsysinfo\common\system.o ..\..\..\src\libs\zbxsysinfo\simple\ntp.o ..\..\..\src\libs\zbxsysinfo\simple\simple.o ..\..\..\src\libs\zbxsysinfo\win32\cpu. o ..\..\..\src\libs\zbxsysinfo\win32\diskio.o ..\..\..\src\libs\zbxsysinfo\win32\diskspace.o ..\..\..\src\libs\zbxsysinfo\win32\inodes.o ..\..\..\src\libs\zbxsysinfo\win32\kernel.o ..\..\..\src\libs\zbxsysinfo\win32\memory.o ..\..\..\src\libs\zbxsysinfo\win32\net.o ..\..\..\src\libs\zbxsysinfo\win32\pdhmon.o ..\..\..\src\libs\zbxsysinfo\win32\proc.o ..\..\..\src\libs\zbxsysinfo\win32\sensors.o ..\..\..\src\libs\zbxsysinfo\win32\services.o ..\..\..\src\libs\zbxsysinfo\win32\swap.o ..\..\..\src\libs\zbxsysinfo\win32\uptime.o ..\..\..\src\libs\zbxsysinfo\win32\win32.o ..\..\..\src\libs\zbxsysinfo\sysinfo.o ..\..\..\src\libs\zbxwin32\perfmon.o ..\..\..\src\libs\zbxwin32\service.o ..\..\..\src\zabbix_agent\active.o ..\..\..\src\zabbix_agent\cpustat.o ..\..\..\src\zabbix_agent\diskdevices.o ..\..\..\src\zabbix_agent\eventlog.o ..\..\..\src\zabbix_agent\interfaces.o ..\..\..\src\zabbix_agent\listener.o ..\..\..\src\zabbix_agent\logfiles.o ..\..\..\src\zabbix_agent\perfstat.o ..\..\ ..\src\zabbix_agent\stats.o ..\..\..\src\zabbix_agent\zabbix_agentd.o ..\..\..\src\zabbix_agent\zbxconf.o +LIBS = ws2_32.lib psapi.lib pdh.lib Wldap32.lib advapi32.lib uuid.lib +LFLAGS = /INCREMENTAL:NO /MANIFEST /MANIFESTFILE:"zabbix_agentd.exe.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /PDB:"zabbix_agentd.pdb" /SUBSYSTEM:CONSOLE /DYNAMICBASE:NO /MACHINE:X86 + +all: $(PROGNAME) + +clean: + del $(OBJS) $(RESOURCE_H) $(MESSAGES_H) $(PROGNAME) messages.rc MSG00001.bin zabbix_agentd.exe.manifest + +$(PROGNAME): $(MESSAGES_H) $(OBJS) $(RESOURCE_H) + $(LINKER) $(OBJS) $(RESOURCE_H) /OUT:$(PROGNAME) $(LFLAGS) $(LIBS) + $(MT) /outputresource:"$(PROGNAME);#1" /manifest zabbix_agentd.exe.manifest /nologo + +$(MESSAGES_H): messages.mc + $(MC) -U -s -h ".\\" -r ".\\" messages.mc + +$(RESOURCE_H): resource.rc + $(RC) /d "NDEBUG" /d "_VC80_UPGRADE=0x0600" /l 0x419 /fo"$(RESOURCE_H)" resource.rc + +..\..\..\src\libs\zbxcommon\alias.o: ..\..\..\src\libs\zbxcommon\alias.c + $(CC) ..\..\..\src\libs\zbxcommon\alias.c /Fo"..\..\..\src\libs\zbxcommon\alias.o" $(CFLAGS) + +..\..\..\src\libs\zbxcommon\comms.o: ..\..\..\src\libs\zbxcommon\comms.c + $(CC) ..\..\..\src\libs\zbxcommon\comms.c /Fo"..\..\..\src\libs\zbxcommon\comms.o" $(CFLAGS) + +..\..\..\src\libs\zbxcommon\gnuregex.o: ..\..\..\src\libs\zbxcommon\gnuregex.c + $(CC) ..\..\..\src\libs\zbxcommon\gnuregex.c /Fo"..\..\..\src\libs\zbxcommon\gnuregex.o" $(CFLAGS) + +..\..\..\src\libs\zbxcommon\misc.o: ..\..\..\src\libs\zbxcommon\misc.c + $(CC) ..\..\..\src\libs\zbxcommon\misc.c /Fo"..\..\..\src\libs\zbxcommon\misc.o" $(CFLAGS) + +..\..\..\src\libs\zbxcommon\regexp.o: ..\..\..\src\libs\zbxcommon\regexp.c + $(CC) ..\..\..\src\libs\zbxcommon\regexp.c /Fo"..\..\..\src\libs\zbxcommon\regexp.o" $(CFLAGS) + +..\..\..\src\libs\zbxcommon\str.o: ..\..\..\src\libs\zbxcommon\str.c + $(CC) ..\..\..\src\libs\zbxcommon\str.c /Fo"..\..\..\src\libs\zbxcommon\str.o" $(CFLAGS) + +..\..\..\src\libs\zbxcommon\xml.o: ..\..\..\src\libs\zbxcommon\xml.c + $(CC) ..\..\..\src\libs\zbxcommon\xml.c /Fo"..\..\..\src\libs\zbxcommon\xml.o" $(CFLAGS) + +..\..\..\src\libs\zbxcommon\zbxgetopt.o: ..\..\..\src\libs\zbxcommon\zbxgetopt.c + $(CC) ..\..\..\src\libs\zbxcommon\zbxgetopt.c /Fo"..\..\..\src\libs\zbxcommon\zbxgetopt.o" $(CFLAGS) + +..\..\..\src\libs\zbxcomms\comms.o: ..\..\..\src\libs\zbxcomms\comms.c + $(CC) ..\..\..\src\libs\zbxcomms\comms.c /Fo"..\..\..\src\libs\zbxcomms\comms.o" $(CFLAGS) + +..\..\..\src\libs\zbxconf\cfg.o: ..\..\..\src\libs\zbxconf\cfg.c + $(CC) ..\..\..\src\libs\zbxconf\cfg.c /Fo"..\..\..\src\libs\zbxconf\cfg.o" $(CFLAGS) + +..\..\..\src\libs\zbxcrypto\base64.o: ..\..\..\src\libs\zbxcrypto\base64.c + $(CC) ..\..\..\src\libs\zbxcrypto\base64.c /Fo"..\..\..\src\libs\zbxcrypto\base64.o" $(CFLAGS) + +..\..\..\src\libs\zbxcrypto\md5.o: ..\..\..\src\libs\zbxcrypto\md5.c + $(CC) ..\..\..\src\libs\zbxcrypto\md5.c /Fo"..\..\..\src\libs\zbxcrypto\md5.o" $(CFLAGS) + +..\..\..\src\libs\zbxjson\json.o: ..\..\..\src\libs\zbxjson\json.c + $(CC) ..\..\..\src\libs\zbxjson\json.c /Fo"..\..\..\src\libs\zbxjson\json.o" $(CFLAGS) + +..\..\..\src\libs\zbxlog\log.o: ..\..\..\src\libs\zbxlog\log.c + $(CC) ..\..\..\src\libs\zbxlog\log.c /Fo"..\..\..\src\libs\zbxlog\log.o" $(CFLAGS) + +..\..\..\src\libs\zbxplugin\zbxplugin.o: ..\..\..\src\libs\zbxplugin\zbxplugin.c + $(CC) ..\..\..\src\libs\zbxplugin\zbxplugin.c /Fo"..\..\..\src\libs\zbxplugin\zbxplugin.o" $(CFLAGS) + +..\..\..\src\libs\zbxsys\mutexs.o: ..\..\..\src\libs\zbxsys\mutexs.c + $(CC) ..\..\..\src\libs\zbxsys\mutexs.c /Fo"..\..\..\src\libs\zbxsys\mutexs.o" $(CFLAGS) + +..\..\..\src\libs\zbxsys\symbols.o: ..\..\..\src\libs\zbxsys\symbols.c + $(CC) ..\..\..\src\libs\zbxsys\symbols.c /Fo"..\..\..\src\libs\zbxsys\symbols.o" $(CFLAGS) + +..\..\..\src\libs\zbxsys\threads.o: ..\..\..\src\libs\zbxsys\threads.c + $(CC) ..\..\..\src\libs\zbxsys\threads.c /Fo"..\..\..\src\libs\zbxsys\threads.o" $(CFLAGS) + +..\..\..\src\libs\zbxsysinfo\common\common.o: ..\..\..\src\libs\zbxsysinfo\common\common.c + $(CC) ..\..\..\src\libs\zbxsysinfo\common\common.c /Fo"..\..\..\src\libs\zbxsysinfo\common\common.o" $(CFLAGS) + +..\..\..\src\libs\zbxsysinfo\common\file.o: ..\..\..\src\libs\zbxsysinfo\common\file.c + $(CC) ..\..\..\src\libs\zbxsysinfo\common\file.c /Fo"..\..\..\src\libs\zbxsysinfo\common\file.o" $(CFLAGS) + +..\..\..\src\libs\zbxsysinfo\common\http.o: ..\..\..\src\libs\zbxsysinfo\common\http.c + $(CC) ..\..\..\src\libs\zbxsysinfo\common\http.c /Fo"..\..\..\src\libs\zbxsysinfo\common\http.o" $(CFLAGS) + +..\..\..\src\libs\zbxsysinfo\common\net.o: ..\..\..\src\libs\zbxsysinfo\common\net.c + $(CC) ..\..\..\src\libs\zbxsysinfo\common\net.c /Fo"..\..\..\src\libs\zbxsysinfo\common\net.o" $(CFLAGS) + +..\..\..\src\libs\zbxsysinfo\common\system.o: ..\..\..\src\libs\zbxsysinfo\common\system.c + $(CC) ..\..\..\src\libs\zbxsysinfo\common\system.c /Fo"..\..\..\src\libs\zbxsysinfo\common\system.o" $(CFLAGS) + +..\..\..\src\libs\zbxsysinfo\simple\ntp.o: ..\..\..\src\libs\zbxsysinfo\simple\ntp.c + $(CC) ..\..\..\src\libs\zbxsysinfo\simple\ntp.c /Fo"..\..\..\src\libs\zbxsysinfo\simple\ntp.o" $(CFLAGS) + +..\..\..\src\libs\zbxsysinfo\simple\simple.o: ..\..\..\src\libs\zbxsysinfo\simple\simple.c + $(CC) ..\..\..\src\libs\zbxsysinfo\simple\simple.c /Fo"..\..\..\src\libs\zbxsysinfo\simple\simple.o" $(CFLAGS) + +..\..\..\src\libs\zbxsysinfo\win32\cpu.o: ..\..\..\src\libs\zbxsysinfo\win32\cpu.c [...26873 lines suppressed...] { - int i,j; - DB_RESULT result; - DB_ROW row; - char new_expression[MAX_STRING_LEN]; - char new_expression_esc[MAX_STRING_LEN]; + struct conv_t + { + char *rel; + int type; + }; + + struct special_conv_t + { + char *table_name, *field_name, *type_field_name; + struct conv_t convs[10]; + }; + + struct special_conv_t special_convs[]= + { + {"sysmaps_elements", "elementid", "elementtype", + { + {"hosts", SYSMAP_ELEMENT_TYPE_HOST}, + {"sysmaps", SYSMAP_ELEMENT_TYPE_MAP}, + {"triggers", SYSMAP_ELEMENT_TYPE_TRIGGER}, + {"groups", SYSMAP_ELEMENT_TYPE_HOST_GROUP}, + {"images", SYSMAP_ELEMENT_TYPE_IMAGE}, + {NULL} + } + }, + {"events", "objectid", "object", + { + {"triggers", EVENT_OBJECT_TRIGGER}, + {"dhosts", EVENT_OBJECT_DHOST}, + {"dservices", EVENT_OBJECT_DSERVICE}, + {NULL} + } + }, + {"operations", "objectid", "object", + { + {"users", OPERATION_OBJECT_USER}, + {"usrgrp", OPERATION_OBJECT_GROUP}, + {NULL} + } + }, + {"ids", "nextid", NULL, + { + {NULL} + } + }, + {"node_cksum", "recordid", NULL, + { + {NULL} + } + }, + {"screens_items", "resourceid", "resourcetype", + { + {"graphs", SCREEN_RESOURCE_GRAPH}, + {"items", SCREEN_RESOURCE_SIMPLE_GRAPH}, + {"sysmaps", SCREEN_RESOURCE_MAP}, + {"items", SCREEN_RESOURCE_PLAIN_TEXT}, + {"groups", SCREEN_RESOURCE_HOSTS_INFO}, +/* {"", SCREEN_RESOURCE_TRIGGERS_INFO}, + {"", SCREEN_RESOURCE_SERVER_INFO}, + {"", SCREEN_RESOURCE_CLOCK},*/ + {"screens", SCREEN_RESOURCE_SCREEN}, + {"groups", SCREEN_RESOURCE_TRIGGERS_OVERVIEW}, + {"groups", SCREEN_RESOURCE_DATA_OVERVIEW}, +/* {"", SCREEN_RESOURCE_URL}, + {"", SCREEN_RESOURCE_ACTIONS}, + {"", SCREEN_RESOURCE_EVENTS},*/ + {NULL} + } + }, + {NULL} + }; + + int i, j, s, t; zbx_uint64_t prefix; + const ZBX_TABLE *r_table; if(old_id!=0) { @@ -135,55 +325,84 @@ int change_nodeid(int old_id, int new_id) printf("Converting tables "); fflush(stdout); - for(i=0;tables[i].table!=0;i++) + for (i = 0; NULL != tables[i].table; i++) { printf("."); fflush(stdout); - prefix = (zbx_uint64_t)__UINT64_C(100000000000000)*(zbx_uint64_t)new_id; - if(tables[i].flags & ZBX_SYNC) + for (j = 0; NULL != tables[i].fields[j].name; j++) { - prefix += (zbx_uint64_t)__UINT64_C(100000000000)*(zbx_uint64_t)new_id; - } + for (s = 0; NULL != special_convs[s].table_name; s++) + if (0 == strcmp(special_convs[s].table_name, tables[i].table) && + 0 == strcmp(special_convs[s].field_name, tables[i].fields[j].name)) + break; - j=0; - while(tables[i].fields[j].name != 0) - { - if(tables[i].fields[j].type == ZBX_TYPE_ID) + if (NULL != special_convs[s].table_name) { - DBexecute("update %s set %s=%s+"ZBX_FS_UI64" where %s>0\n", - tables[i].table, - tables[i].fields[j].name, - tables[i].fields[j].name, - prefix, - tables[i].fields[j].name); + for (t = 0; NULL != special_convs[s].convs[t].rel; t++) + { + convert_special_field(old_id, new_id, special_convs[s].table_name, special_convs[s].field_name, + special_convs[s].type_field_name, special_convs[s].convs[t].rel, + special_convs[s].convs[t].type); + } + continue; } - j++; - } - if(strcmp(tables[i].table, "functions") == 0) - { - /* Special processing for trigger expressions */ - result=DBselect("select expression,triggerid from triggers"); - while((row=DBfetch(result))) + if (tables[i].fields[j].type == ZBX_TYPE_ID) { - memset(new_expression, 0, MAX_STRING_LEN); - convert_trigger_expression(old_id, new_id, prefix, row[0], new_expression); - DBescape_string(new_expression, new_expression_esc,MAX_STRING_LEN); - DBexecute("update triggers set expression='%s' where triggerid=%s", - new_expression_esc, - row[1]); - } - DBfree_result(result); + if (0 == strcmp(tables[i].fields[j].name, tables[i].recid)) /* primaky key */ + { + prefix = (zbx_uint64_t)__UINT64_C(100000000000000)*(zbx_uint64_t)new_id; + + if (tables[i].flags & ZBX_SYNC) + prefix += (zbx_uint64_t)__UINT64_C(100000000000)*(zbx_uint64_t)new_id; + } + else if (NULL != tables[i].fields[j].rel) /* relations */ + { + if (NULL == (r_table = DBget_table(tables[i].fields[j].rel))) + { + printf("%s.%s FAILED\n", tables[i].table, tables[i].fields[j].name); + fflush(stdout); + continue; + } + prefix = (zbx_uint64_t)__UINT64_C(100000000000000)*(zbx_uint64_t)new_id; + + if (r_table->flags & ZBX_SYNC) + prefix += (zbx_uint64_t)__UINT64_C(100000000000)*(zbx_uint64_t)new_id; + } + else if (0 == strcmp("profiles", tables[i].table)) /* special processing for table 'profiles' */ + { + convert_profiles(old_id, new_id, tables[i].fields[j].name); + continue; + } + else + { + printf("%s.%s FAILED\n", tables[i].table, tables[i].fields[j].name); + fflush(stdout); + continue; + } + + DBexecute("update %s set %s=%s+" ZBX_FS_UI64 " where %s>0", + tables[i].table, + tables[i].fields[j].name, + tables[i].fields[j].name, + prefix, + tables[i].fields[j].name); + } } } + + /* Special processing for trigger expressions */ + convert_triggers_expression(old_id, new_id); + DBexecute("insert into nodes (nodeid,name,ip,nodetype) values (%d,'Local node','127.0.0.1',1)", - new_id); + new_id); + DBcommit(); DBclose(); - printf(" done.\n\nConversion completed.\n"); + printf(" done.\nConversion completed.\n"); return SUCCEED; } Index: zabbix.spec =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- zabbix.spec 25 Feb 2009 18:29:30 -0000 1.33 +++ zabbix.spec 6 Mar 2009 17:27:52 -0000 1.34 @@ -1,6 +1,6 @@ Name: zabbix Version: 1.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Open-source monitoring solution for your IT infrastructure Group: Applications/Internet @@ -14,6 +14,7 @@ Source5: zabbix-logrotate.in Patch0: zabbix-1.6.2-cpustats.patch +Patch1: zabbix-1.6.3-pre.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -197,6 +198,7 @@ %prep %setup0 -q %patch0 -p1 -b .cpustats +%patch1 -p1 -b .pre chmod -R a+rX . @@ -463,6 +465,10 @@ %defattr(-,root,root,-) %changelog +* Wed Mar 4 2009 Jeffrey C. Ollie - 1.6.2-4 +- Update to a SVN snapshot of the upstream 1.6 branch to fix security + issue (BZ#488501) + * Wed Feb 25 2009 Fedora Release Engineering - 1.6.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kkofler at fedoraproject.org Fri Mar 6 17:37:58 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Fri, 6 Mar 2009 17:37:58 +0000 (UTC) Subject: rpms/gnash/devel gnash.spec, 1.49, 1.50 gnash-kde4-no-excessive-linkage.patch, 1.1, NONE Message-ID: <20090306173758.A341A70116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/gnash/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22387/devel Modified Files: gnash.spec Removed Files: gnash-kde4-no-excessive-linkage.patch Log Message: * Fri Mar 06 2009 Kevin Kofler 0.8.5-3 - explicitly link the KlashPart against the libraries it uses Index: gnash.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- gnash.spec 6 Mar 2009 14:58:35 -0000 1.49 +++ gnash.spec 6 Mar 2009 17:37:28 -0000 1.50 @@ -1,6 +1,6 @@ Name: gnash Version: 0.8.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNU flash movie player Group: Applications/Multimedia @@ -13,10 +13,6 @@ Patch0: gnash-0.8.3-manual.patch # register KComponentData properly in KDE 4 KPart Patch3: gnash-0.8.3-fix-kde4-port.patch -# Currently kde4-gnash (from kde4 branch) links against various KDE libraries, -# but only needs Qt -- this patch removes the superfluous linkage (from bero) -# TODO: update to 0.8.5? -#Patch4: gnash-kde4-no-excessive-linkage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel libpng-devel libjpeg-devel libogg-devel @@ -94,6 +90,9 @@ # Hack as autoreconf breaks build sed -i -e 's!kapp.h!kapplication.h!g' configure sed -i -e 's!libkdeui.la!libkdeui.so!g' configure +# Currently kde4-gnash (from kde4 branch) links against various KDE libraries, +# but only needs Qt -- remove the superfluous linkage +sed -i -e 's!\$(KDE4_LIBS)!!g' gui/Makefile.in #chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} @@ -112,13 +111,13 @@ --enable-gui=gtk,kde4,sdl,fb \ --with-qt4=%{_kde4_prefix} \ --with-kde4-prefix=%{_kde4_prefix} \ - --with-kde4-lib=%{_libdir}/kde4/devel \ + --with-kde4-lib=%{_kde4_libdir}/kde4/devel \ --with-kde4-incl=%{_kde4_includedir} # make sure the Qt 4 moc etc. tools are found export PATH=%{_qt4_prefix}/bin:$PATH #doesn't work currently: %%{?_smp_mflags} -#make KDE4_CFLAGS=-I%{_kde4_includedir} -make +# override KDE4_LIBS because configure doesn't detect it properly +make KDE4_LIBS='-L%{_kde4_libdir}/kde4/devel -lkparts -lkdeui -lkdecore' %install rm -rf $RPM_BUILD_ROOT @@ -291,15 +290,18 @@ %{_mandir}/man1/cygnal.1* %changelog -* Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-2 +* Fri Mar 06 2009 Kevin Kofler 0.8.5-3 +- explicitly link the KlashPart against the libraries it uses + +* Fri Mar 06 2009 Jaroslav Reznik 0.8.5-2 - add missing speex-devel and gstreamer-plugins-base-devel BR -* Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-1 +* Fri Mar 06 2009 Jaroslav Reznik 0.8.5-1 - update to 0.8.5 - remove use_kde3_executable_hack - remove autoreconf -* Tue Feb 24 2009 Fedora Release Engineering - 0.8.4-7 +* Tue Feb 24 2009 Fedora Release Engineering 0.8.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Thu Dec 18 2008 Kevin Kofler 0.8.4-6 --- gnash-kde4-no-excessive-linkage.patch DELETED --- From hno at fedoraproject.org Fri Mar 6 17:44:41 2009 From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=) Date: Fri, 6 Mar 2009 17:44:41 +0000 (UTC) Subject: rpms/squid/devel squid-3.0.STABLE13-gcc44.patch, NONE, 1.1 squid-3.0.STABLE13-logfile-syslog.patch, NONE, 1.1 squid.spec, 1.116, 1.117 Message-ID: <20090306174441.1535570116@cvs1.fedora.phx.redhat.com> Author: hno Update of /cvs/pkgs/rpms/squid/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24221 Modified Files: squid.spec Added Files: squid-3.0.STABLE13-gcc44.patch squid-3.0.STABLE13-logfile-syslog.patch Log Message: - backported logfile.cc syslog parameters patch from 3.1 (b9443.patch) - GCC-4.4 workaround in src/wccp2.cc squid-3.0.STABLE13-gcc44.patch: --- NEW FILE squid-3.0.STABLE13-gcc44.patch --- diff -ru squid-3.0.STABLE13/src/wccp2.cc squid-3.0.STABLE13.wccp/src/wccp2.cc --- squid-3.0.STABLE13/src/wccp2.cc 2009-02-03 02:36:23.000000000 +0100 +++ squid-3.0.STABLE13.wccp/src/wccp2.cc 2009-03-06 16:04:14.000000000 +0100 @@ -1182,8 +1182,9 @@ /* Go through the data structure */ while (data_length > offset) { + char *data = wccp2_i_see_you.data; - header = (struct wccp2_item_header_t *) &wccp2_i_see_you.data[offset]; + header = (struct wccp2_item_header_t *) &data[offset]; switch (ntohs(header->type)) { squid-3.0.STABLE13-logfile-syslog.patch: --- NEW FILE squid-3.0.STABLE13-logfile-syslog.patch --- diff -up squid-3.0.STABLE13/src/logfile.cc.b9443 squid-3.0.STABLE13/src/logfile.cc --- squid-3.0.STABLE13/src/logfile.cc.b9443 2009-02-03 02:36:22.000000000 +0100 +++ squid-3.0.STABLE13/src/logfile.cc 2009-03-06 15:50:43.000000000 +0100 @@ -102,21 +102,16 @@ logfileOpen(const char *path, size_t buf if (path[6] != '\0') { path += 7; - char* delim = strchr(path, '.'); - - if (!delim) - delim = strchr(path, '|'); - - if (delim != NULL) - *delim = '\0'; - - lf->syslog_priority = syslog_ntoa(path); - - if (delim != NULL) - lf->syslog_priority |= syslog_ntoa(delim+1); - - if (0 == (lf->syslog_priority & PRIORITY_MASK)) - lf->syslog_priority |= LOG_INFO; + char *priority = xstrdup(path); + char *facility = (char *) strchr(priority, '.'); + if (!facility) + facility = (char *) strchr(priority, '|'); + if (facility) { + *facility++ = '\0'; + lf->syslog_priority |= syslog_ntoa(facility); + } + lf->syslog_priority |= syslog_ntoa(priority); + xfree(priority); } } else #endif Index: squid.spec =================================================================== RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- squid.spec 26 Feb 2009 02:42:41 -0000 1.116 +++ squid.spec 6 Mar 2009 17:44:10 -0000 1.117 @@ -4,7 +4,7 @@ Name: squid Version: 3.0.STABLE13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Squid proxy caching server Epoch: 7 License: GPLv2+ @@ -20,7 +20,8 @@ ## Source99: filter-requires-squid.sh # Upstream patches -#Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch +# backport of http://www.squid-cache.org/Versions/v3/3.1/b9443.patch until done upstream +Patch001: squid-3.0.STABLE13-logfile-syslog.patch # External patches @@ -32,8 +33,8 @@ Patch203: squid-3.0.STABLE1-build.patch Patch204: squid-3.0.STABLE1-perlpath.patch Patch205: squid-3.0.STABLE1-smb-path.patch -#Patch207: squid-3.0.STABLE5-configure_netfilter.patch Patch208: squid-3.0.STABLE7-from_manpg.patch +Patch209: squid-3.0.STABLE13-gcc44.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: bash >= 2.0 @@ -59,13 +60,14 @@ %prep %setup -q +%patch001 -p1 -b .logfile %patch201 -p1 -b .config %patch202 -p1 -b .location %patch203 -p1 -b .build %patch204 -p1 -b .perlpath %patch205 -p1 -b .smb-path -#%patch207 -p1 -b .configure_netfilter %patch208 -p1 -b .from_manpg +%patch209 -p1 -b .gcc44 %build export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ; @@ -338,6 +340,10 @@ chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || : %changelog +* Fri Mar 06 2009 Henrik Nordstrom - 7:3.0.STABLE13-2 +- backported logfile.cc syslog parameters patch from 3.1 (b9443.patch) +- GCC-4.4 workaround in src/wccp2.cc + * Wed Feb 25 2009 Fedora Release Engineering - 7:3.0.STABLE13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jkeating at fedoraproject.org Fri Mar 6 17:57:07 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Fri, 6 Mar 2009 17:57:07 +0000 (UTC) Subject: rpms/foobillard/devel foobillard.spec,1.17,1.18 Message-ID: <20090306175707.C3B6870116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/foobillard/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27046 Modified Files: foobillard.spec Log Message: * Fri Mar 06 2009 Jesse Keating - 3.0a-12 - Correct the fonts requires due to package name change Index: foobillard.spec =================================================================== RCS file: /cvs/pkgs/rpms/foobillard/devel/foobillard.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- foobillard.spec 24 Feb 2009 17:56:35 -0000 1.17 +++ foobillard.spec 6 Mar 2009 17:56:37 -0000 1.18 @@ -1,6 +1,6 @@ Name: foobillard Version: 3.0a -Release: 11 +Release: 12 Summary: OpenGL billard game @@ -14,7 +14,7 @@ Patch0: foobillard-3.0a-nonv.patch Patch1: foobillard-3.0a-no-fonts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: dejavu-fonts-sans +Requires: dejavu-sans-fonts BuildRequires: SDL-devel ImageMagick alsa-lib-devel BuildRequires: freetype-devel libpng-devel perl zlib-devel BuildRequires: libGL-devel libGLU-devel libX11-devel libXaw-devel libXi-devel @@ -65,6 +65,9 @@ %changelog +* Fri Mar 06 2009 Jesse Keating - 3.0a-12 +- Correct the fonts requires due to package name change + * Tue Feb 24 2009 Fedora Release Engineering - 3.0a-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From stingray at fedoraproject.org Fri Mar 6 18:01:32 2009 From: stingray at fedoraproject.org (Paul P Komkoff Jr) Date: Fri, 6 Mar 2009 18:01:32 +0000 (UTC) Subject: rpms/libnfnetlink/devel .cvsignore, 1.7, 1.8 libnfnetlink.spec, 1.15, 1.16 sources, 1.7, 1.8 Message-ID: <20090306180132.A10AE70116@cvs1.fedora.phx.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27980 Modified Files: .cvsignore libnfnetlink.spec sources Log Message: libnfnetlink-0.0.41-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 19 Jan 2009 17:01:55 -0000 1.7 +++ .cvsignore 6 Mar 2009 18:01:02 -0000 1.8 @@ -1 +1 @@ -libnfnetlink-0.0.40.tar.bz2 +libnfnetlink-0.0.41.tar.bz2 Index: libnfnetlink.spec =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/devel/libnfnetlink.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libnfnetlink.spec 25 Feb 2009 16:37:31 -0000 1.15 +++ libnfnetlink.spec 6 Mar 2009 18:01:02 -0000 1.16 @@ -2,8 +2,8 @@ # %define basever 0.0.30 Name: libnfnetlink -Version: 0.0.40 -Release: 2%{?dist} +Version: 0.0.41 +Release: 1%{?dist} Summary: Netfilter netlink userspace library Group: System Environment/Libraries License: GPLv2 @@ -69,6 +69,9 @@ %{_includedir}/libnfnetlink/*.h %changelog +* Fri Mar 6 2009 Paul P. Komkoff Jr - 0.0.41-1 +- upstream release + * Wed Feb 25 2009 Fedora Release Engineering - 0.0.40-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Jan 2009 17:01:55 -0000 1.7 +++ sources 6 Mar 2009 18:01:02 -0000 1.8 @@ -1 +1 @@ -3fe19dc4b05ba7e7e6216123097c2819 libnfnetlink-0.0.40.tar.bz2 +5d844ea1f557bad0364d5b85cd10c796 libnfnetlink-0.0.41.tar.bz2 From rjones at fedoraproject.org Fri Mar 6 18:02:07 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 6 Mar 2009 18:02:07 +0000 (UTC) Subject: comps comps-f11.xml.in,1.145,1.146 Message-ID: <20090306180207.98D6C70116@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28152 Modified Files: comps-f11.xml.in Log Message: Added mingw32 group Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- comps-f11.xml.in 6 Mar 2009 16:38:45 -0000 1.145 +++ comps-f11.xml.in 6 Mar 2009 18:01:37 -0000 1.146 @@ -3720,6 +3720,50 @@ + mingw32 + <_name>MinGW cross-compiler + <_description> + Support for cross-compiling programs to 32 bit Windows targets, + testing them, and building installers, all from within Fedora. + + false + true + + mingw32-filesystem + mingw32-binutils + mingw32-gcc + mingw32-w32api + mingw32-runtime + mingw32-crossreport + mingw32-nsis + mingw32-nsiswrapper + wine + mingw32-atk + mingw32-bzip2 + mingw32-cairo + mingw32-dlfcn + mingw32-freetype + mingw32-gdbm + mingw32-gettext + mingw32-glib2 + mingw32-iconv + mingw32-libgcrypt + mingw32-libgpg-error + mingw32-libjpeg + mingw32-libpng + mingw32-libxml2 + mingw32-openssl + mingw32-pdcurses + mingw32-pixman + mingw32-pthreads + mingw32-readline + mingw32-SDL + mingw32-sqlite + mingw32-termcap + mingw32-zlib + + + mongolian-support <_name>Mongolian Support <_description/> @@ -5568,6 +5612,7 @@ java-development kde-software-development legacy-software-development + mingw32 ruby web-development x-software-development From ajax at fedoraproject.org Fri Mar 6 18:03:11 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Fri, 6 Mar 2009 18:03:11 +0000 (UTC) Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.419, 1.420 xserver-1.6.0-primary.patch, 1.2, 1.3 Message-ID: <20090306180311.343E870116@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28360 Modified Files: xorg-x11-server.spec xserver-1.6.0-primary.patch Log Message: * Fri Mar 06 2009 Adam Jackson 1.6.0-8 - xserver-1.6.0-primary.patch: Really, only look at VGA devices. (#488869) Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.419 retrieving revision 1.420 diff -u -r1.419 -r1.420 --- xorg-x11-server.spec 4 Mar 2009 22:51:51 -0000 1.419 +++ xorg-x11-server.spec 6 Mar 2009 18:02:40 -0000 1.420 @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.0 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -500,6 +500,9 @@ %changelog +* Fri Mar 06 2009 Adam Jackson 1.6.0-8 +- xserver-1.6.0-primary.patch: Really, only look at VGA devices. (#488869) + * Thu Mar 05 2009 Peter Hutterer 1.6.0-7 - Remove 10-x11-keymap.fdi, this is provided by fedora-setup-keyboard now. xserver-1.6.0-primary.patch: Index: xserver-1.6.0-primary.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.0-primary.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xserver-1.6.0-primary.patch 4 Mar 2009 21:25:58 -0000 1.2 +++ xserver-1.6.0-primary.patch 6 Mar 2009 18:02:40 -0000 1.3 @@ -20,7 +20,7 @@ - == ((PCI_CLASS_MULTIMEDIA << 16) | (PCI_SUBCLASS_MULTIMEDIA_VIDEO << 8)))) \ - || ((((c) & 0x00ffff00) \ - == ((PCI_CLASS_PROCESSOR << 16) | (PCI_SUBCLASS_PROCESSOR_COPROC << 8)))) ) -+ || (((c) & 0x00ff0000) == (PCI_CLASS_DISPLAY << 16)) ) ++ || (((c) & 0x00ffff00) == (PCI_CLASS_DISPLAY << 16)) ) /* * PCI classes that have messages printed always. The others are only From jgu at fedoraproject.org Fri Mar 6 18:13:53 2009 From: jgu at fedoraproject.org (Jonathan G. Underwood) Date: Fri, 6 Mar 2009 18:13:53 +0000 (UTC) Subject: rpms/shorewall/devel .cvsignore, 1.49, 1.50 shorewall.spec, 1.73, 1.74 sources, 1.49, 1.50 Message-ID: <20090306181353.48DBB70116@cvs1.fedora.phx.redhat.com> Author: jgu Update of /cvs/extras/rpms/shorewall/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30369 Modified Files: .cvsignore shorewall.spec sources Log Message: * Fri Mar 6 2009 Jonathan G. Underwood - 4.2.6-2 - Update shorewall-perl to version 4.6.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 27 Feb 2009 00:33:23 -0000 1.49 +++ .cvsignore 6 Mar 2009 18:13:22 -0000 1.50 @@ -2,5 +2,5 @@ shorewall6-lite-4.2.6.tar.bz2 shorewall-common-4.2.6.tar.bz2 shorewall-lite-4.2.6.tar.bz2 -shorewall-perl-4.2.6.tar.bz2 +shorewall-perl-4.2.6.2.tar.bz2 shorewall-shell-4.2.6.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- shorewall.spec 27 Feb 2009 00:33:23 -0000 1.73 +++ shorewall.spec 6 Mar 2009 18:13:22 -0000 1.74 @@ -3,7 +3,7 @@ %define major_ver 4.2.6 %define common_ver %{major_ver} -%define perl_ver %{major_ver} +%define perl_ver %{major_ver}.2 %define lite_ver %{major_ver} %define shell_ver %{major_ver} %define shorewall6_ver %{major_ver} @@ -11,7 +11,7 @@ Name: shorewall Version: %{major_ver} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An iptables front end for firewall configuration Group: Applications/System License: GPLv2+ @@ -402,6 +402,9 @@ %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup %changelog +* Fri Mar 6 2009 Jonathan G. Underwood - 4.2.6-2 +- Update shorewall-perl to version 4.6.2.2 + * Thu Feb 26 2009 Jonathan G. Underwood - 4.2.6-1 - Update to version 4.2.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 27 Feb 2009 00:33:23 -0000 1.49 +++ sources 6 Mar 2009 18:13:22 -0000 1.50 @@ -2,5 +2,5 @@ fbc29e6af7b2836f61189d5f8813927d shorewall6-lite-4.2.6.tar.bz2 7c17587dba812bb8924e19ee49bccc52 shorewall-common-4.2.6.tar.bz2 8a51bd0508c0682167650ef4e8724cf0 shorewall-lite-4.2.6.tar.bz2 -c815bcb9795c726a46ad673ee0384b3c shorewall-perl-4.2.6.tar.bz2 +56b98aefec97dd71cdc72962daa7525f shorewall-perl-4.2.6.2.tar.bz2 f0bef7f60ddc7d9b58d8e3880965152a shorewall-shell-4.2.6.tar.bz2 From jkeating at fedoraproject.org Fri Mar 6 18:14:41 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Fri, 6 Mar 2009 18:14:41 +0000 (UTC) Subject: rpms/oyranos/devel oyranos.spec,1.4,1.5 Message-ID: <20090306181441.34FEE70116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/oyranos/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30641 Modified Files: oyranos.spec Log Message: * Fri Mar 06 2009 Jesse Keating - 0.1.7-14 - Rebuild for new elektra Index: oyranos.spec =================================================================== RCS file: /cvs/pkgs/rpms/oyranos/devel/oyranos.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- oyranos.spec 26 Feb 2009 09:16:12 -0000 1.4 +++ oyranos.spec 6 Mar 2009 18:14:10 -0000 1.5 @@ -2,7 +2,7 @@ Name: oyranos Version: 0.1.7 -Release: 13%{?dist} +Release: 14%{?dist} Summary: The Oyranos Colour Management System (CMS) Group: Applications/Multimedia @@ -218,6 +218,9 @@ %changelog +* Fri Mar 06 2009 Jesse Keating - 0.1.7-14 +- Rebuild for new elektra + * Thu Feb 26 2009 Fedora Release Engineering - 0.1.7-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jgu at fedoraproject.org Fri Mar 6 18:15:09 2009 From: jgu at fedoraproject.org (Jonathan G. Underwood) Date: Fri, 6 Mar 2009 18:15:09 +0000 (UTC) Subject: rpms/shorewall/F-10 shorewall.spec,1.72,1.73 sources,1.49,1.50 Message-ID: <20090306181509.B43D270116@cvs1.fedora.phx.redhat.com> Author: jgu Update of /cvs/extras/rpms/shorewall/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30769 Modified Files: shorewall.spec sources Log Message: * Fri Mar 6 2009 Jonathan G. Underwood - 4.2.6-2 - Update shorewall-perl to version 4.6.2.2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/F-10/shorewall.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- shorewall.spec 27 Feb 2009 00:34:51 -0000 1.72 +++ shorewall.spec 6 Mar 2009 18:14:39 -0000 1.73 @@ -3,7 +3,7 @@ %define major_ver 4.2.6 %define common_ver %{major_ver} -%define perl_ver %{major_ver} +%define perl_ver %{major_ver}.2 %define lite_ver %{major_ver} %define shell_ver %{major_ver} %define shorewall6_ver %{major_ver} @@ -11,7 +11,7 @@ Name: shorewall Version: %{major_ver} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An iptables front end for firewall configuration Group: Applications/System License: GPLv2+ @@ -402,6 +402,9 @@ %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup %changelog +* Fri Mar 6 2009 Jonathan G. Underwood - 4.2.6-2 +- Update shorewall-perl to version 4.6.2.2 + * Thu Feb 26 2009 Jonathan G. Underwood - 4.2.6-1 - Update to version 4.2.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/F-10/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 27 Feb 2009 00:34:51 -0000 1.49 +++ sources 6 Mar 2009 18:14:39 -0000 1.50 @@ -2,5 +2,5 @@ fbc29e6af7b2836f61189d5f8813927d shorewall6-lite-4.2.6.tar.bz2 7c17587dba812bb8924e19ee49bccc52 shorewall-common-4.2.6.tar.bz2 8a51bd0508c0682167650ef4e8724cf0 shorewall-lite-4.2.6.tar.bz2 -c815bcb9795c726a46ad673ee0384b3c shorewall-perl-4.2.6.tar.bz2 +56b98aefec97dd71cdc72962daa7525f shorewall-perl-4.2.6.2.tar.bz2 f0bef7f60ddc7d9b58d8e3880965152a shorewall-shell-4.2.6.tar.bz2 From remi at fedoraproject.org Fri Mar 6 18:25:06 2009 From: remi at fedoraproject.org (Remi Collet) Date: Fri, 6 Mar 2009 18:25:06 +0000 (UTC) Subject: rpms/perl-Gtk2-MozEmbed/F-10 perl-Gtk2-MozEmbed-make.patch, NONE, 1.1 perl-Gtk2-MozEmbed.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090306182506.DACC570116@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv361 Modified Files: sources Added Files: perl-Gtk2-MozEmbed-make.patch perl-Gtk2-MozEmbed.spec Log Message: new package perl-Gtk2-MozEmbed-make.patch: --- NEW FILE perl-Gtk2-MozEmbed-make.patch --- --- Makefile.PL.orig 2009-02-15 10:17:17.000000000 +0100 +++ Makefile.PL 2009-02-15 10:19:18.000000000 +0100 @@ -76,9 +76,9 @@ my $inc = $pkgcfg{cflags}; my $libs = $pkgcfg{libs}; -if ($libs =~ m#xulrunner-devel-([^/]+)#) { +if ($libs =~ m#(lib|lib64)/xulrunner-(devel|sdk)-([^/]+)#) { $inc .= qq( -DGTK_MOZ_EMBED_PERL_XULRUNNER_PATH=) - . qq("\\"/usr/lib/xulrunner-$1\\"" ); + . qq("\\"/usr/$1/xulrunner-$3\\"" ); } my $mozembed = ExtUtils::Depends->new('Gtk2::MozEmbed', 'Gtk2', --- NEW FILE perl-Gtk2-MozEmbed.spec --- %define perlname Gtk2-MozEmbed %if 0%{?fedora} >= 11 %define gecko_version 1.9.1 %else %define gecko_version 1.9.0.7 %endif Summary: Interface to the Mozilla embedding widget Name: perl-Gtk2-MozEmbed Version: 0.08 Release: 3%{?dist}.1 Group: Development/Libraries License: LGPLv2+ URL: http://search.cpan.org/dist/Gtk2-MozEmbed Source0: http://www.cpan.org/authors/id/T/TS/TSCH/%{perlname}-%{version}.tar.gz # See https://rt.cpan.org/Ticket/Display.html?id=43306 Patch0: %{name}-make.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::Depends) >= 0.20 BuildRequires: perl(ExtUtils::PkgConfig) >= 1.03 BuildRequires: perl(Glib) >= 1.180 BuildRequires: perl(Gtk2) >= 1.081 BuildRequires: gtk2-devel BuildRequires: xulrunner-devel-unstable = %{gecko_version} Requires: perl(Glib) >= 1.180 Requires: perl(Gtk2) >= 1.081 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # BR xulrunner-devel-unstable so hard dep. Requires: gecko-libs = %{gecko_version} %description This module allows you to use the Mozilla embedding widget from Perl. %prep %setup -q -n %{perlname}-%{version} %patch0 -p0 iconv -f ISO-8859-15 -t UTF-8 NEWS >NEWS.utf8 touch -r NEWS NEWS.utf8 mv NEWS.utf8 NEWS %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 {} ';' -print find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' -print find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' %{_fixperms} $RPM_BUILD_ROOT%{_prefix} %check # Tests doesn't run in mock nor in rpmbuild (need a display) # Should display : All tests successful. # Files=1, Tests=8, 1 wallclock secs - Result: PASS %{?_with_display_tests: make test} %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog examples/ LICENSE NEWS README %{_mandir}/man3/Gtk2::MozEmbed* %{perl_vendorarch}/auto/Gtk2 %{perl_vendorarch}/Gtk2 %changelog * Fri Mar 06 2009 Remi Collet - 0.08-3.fc10.1 - Rebuild against xulrunner 1.9.0.7 * Tue Mar 03 2009 Remi Collet - 0.08-3 - Fix from review : Gtk2 dir ownership * Tue Mar 03 2009 Remi Collet - 0.08-2 - Fix from review : License, %%check, %%_fixperms * Sat Feb 14 2009 Remi Collet - 0.08-1 - initial Fedora RPM Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:07:05 -0000 1.1 +++ sources 6 Mar 2009 18:24:36 -0000 1.2 @@ -0,0 +1 @@ +ddafafa0e2684050a5d8b9f2c15f6dca Gtk2-MozEmbed-0.08.tar.gz From pmatilai at fedoraproject.org Fri Mar 6 18:28:51 2009 From: pmatilai at fedoraproject.org (Panu Matilainen) Date: Fri, 6 Mar 2009 18:28:51 +0000 (UTC) Subject: rpms/rpm/devel rpm-4.7.0-devel-autodep.patch, NONE, 1.1 rpm-4.7.0-extra-provides.patch, NONE, 1.1 .cvsignore, 1.33, 1.34 rpm.spec, 1.334, 1.335 sources, 1.139, 1.140 Message-ID: <20090306182851.9758870116@cvs1.fedora.phx.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/rpm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1159 Modified Files: .cvsignore rpm.spec sources Added Files: rpm-4.7.0-devel-autodep.patch rpm-4.7.0-extra-provides.patch Log Message: - update to rpm 4.7.0 beta1 rpm-4.7.0-devel-autodep.patch: --- NEW FILE rpm-4.7.0-devel-autodep.patch --- diff -up rpm-4.7.0-beta1/build/rpmfc.c.devel-autodep rpm-4.7.0-beta1/build/rpmfc.c --- rpm-4.7.0-beta1/build/rpmfc.c.devel-autodep 2009-02-23 09:16:11.000000000 +0200 +++ rpm-4.7.0-beta1/build/rpmfc.c 2009-02-26 17:30:04.000000000 +0200 @@ -506,7 +506,7 @@ static const struct rpmfcTokens_s const { "ASCII text", RPMFC_WHITE|RPMFC_INCLUDE }, { "ISO-8859 text", RPMFC_WHITE|RPMFC_INCLUDE }, - { "symbolic link to", RPMFC_SYMLINK }, + { "symbolic link to", RPMFC_SYMLINK|RPMFC_INCLUDE }, { "socket", RPMFC_DEVICE }, { "special", RPMFC_DEVICE }, @@ -667,6 +667,105 @@ rpmds rpmfcRequires(rpmfc fc) /** + * Ensure that symlinks for shared libs generate a dep on the shared lib + * @param fc file classifier + * @return 0 on success + */ +static int rpmfcSYMLINK(rpmfc fc) +{ + const char * fn = fc->fn[fc->ix]; + struct stat sb; + int fdno; + + if (fc->skipReq) + return 0; + + if (stat(fn, &sb) < 0) + return -1; + if (S_ISLNK(sb.st_mode)) + return -1; + + fdno = open(fn, O_RDONLY); + if (fdno < 0) { + return fdno; + } + +#if HAVE_GELF_H && HAVE_LIBELF + Elf * elf = NULL; + GElf_Ehdr ehdr_mem, * ehdr; + int isElf64 = 0; + int i, cnt; + char * soname = NULL; + rpmds ds; + + (void) elf_version(EV_CURRENT); + elf = NULL; + if ((elf = elf_begin (fdno, ELF_C_READ_MMAP, NULL)) == NULL + || elf_kind(elf) != ELF_K_ELF + || (ehdr = gelf_getehdr(elf, &ehdr_mem)) == NULL + || ehdr->e_type != ET_DYN) + goto exit; + +/* alpha uses /lib, not /lib64 so don't add (64bit) deps */ +#if !defined(__alpha__) + isElf64 = ehdr->e_ident[EI_CLASS] == ELFCLASS64; +#endif + + for (i = 0; i < ehdr->e_phnum; ++i) { + GElf_Phdr phdr_mem; + GElf_Phdr *phdr = gelf_getphdr (elf, i, &phdr_mem); + GElf_Shdr shdr_mem; + Elf_Data * data = NULL; + Elf_Scn * scn; + GElf_Shdr *shdr; + + if (phdr == NULL || phdr->p_type != PT_DYNAMIC) + continue; + + scn = gelf_offscn(elf, phdr->p_offset); + shdr = gelf_getshdr(scn, &shdr_mem); + + if (shdr != NULL && shdr->sh_type == SHT_DYNAMIC) + data = elf_getdata (scn, NULL); + if (data == NULL) + continue; + + for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) { + GElf_Dyn dynmem; + GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dynmem); + char *depname = NULL; + + if (dyn == NULL) + break; + if (dyn->d_tag != DT_SONAME) + continue; + + /* add the soname to package deps */ + soname = elf_strptr(elf, shdr->sh_link, dyn->d_un.d_val); + if (soname == NULL) + break; + + rasprintf(&depname, "%s%s", soname, isElf64 ? "()(64bit)" : ""); + /* Add to package dependencies. */ + ds = rpmdsSingle(RPMTAG_REQUIRENAME, depname, "", + RPMSENSE_FIND_REQUIRES); + free(depname); + + rpmdsMerge(&fc->requires, ds); + rpmfcAddFileDep(&fc->ddict, fc->ix, ds); + ds = rpmdsFree(ds); + break; + } + } +exit: + if (elf) (void) elf_end(elf); + close(fdno); + return 0; +#endif + return -1; +} + +/** * Extract script dependencies. * @param fc file classifier * @return 0 on success @@ -1097,6 +1196,7 @@ static const struct rpmfcApplyTbl_s cons { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_BOURNE| RPMFC_PERL|RPMFC_PYTHON|RPMFC_MONO| RPMFC_PKGCONFIG|RPMFC_LIBTOOL) }, + { rpmfcSYMLINK, RPMFC_SYMLINK }, { NULL, 0 } }; @@ -1117,6 +1217,7 @@ rpmRC rpmfcApply(rpmfc fc) int ix; int i; int xx; + int skipping = 0; /* Generate package and per-file dependencies. */ for (fc->ix = 0; fc->fn[fc->ix] != NULL; fc->ix++) { @@ -1171,11 +1272,13 @@ rpmRC rpmfcApply(rpmfc fc) default: break; case 'P': + skipping = fc->skipProv; ds = rpmdsSingle(RPMTAG_PROVIDENAME, N, EVR, Flags); dix = rpmdsFind(fc->provides, ds); ds = rpmdsFree(ds); break; case 'R': + skipping = fc->skipReq; ds = rpmdsSingle(RPMTAG_REQUIRENAME, N, EVR, Flags); dix = rpmdsFind(fc->requires, ds); ds = rpmdsFree(ds); @@ -1197,7 +1300,7 @@ assert(dix >= 0); previx = ix; xx = argiAdd(&fc->fddictx, ix, argiCount(fc->ddictx)-1); } - if (fc->fddictn && fc->fddictn->vals) + if (fc->fddictn && fc->fddictn->vals && !skipping) fc->fddictn->vals[ix]++; } rpm-4.7.0-extra-provides.patch: --- NEW FILE rpm-4.7.0-extra-provides.patch --- diff -up rpm-4.7.0-beta1/build/rpmfc.c.extra-prov rpm-4.7.0-beta1/build/rpmfc.c --- rpm-4.7.0-beta1/build/rpmfc.c.extra-prov 2009-02-26 17:31:12.000000000 +0200 +++ rpm-4.7.0-beta1/build/rpmfc.c 2009-02-26 17:31:55.000000000 +0200 @@ -485,6 +485,7 @@ static const struct rpmfcTokens_s const { "RPM v4", RPMFC_ARCHIVE|RPMFC_INCLUDE }, { " image", RPMFC_IMAGE|RPMFC_INCLUDE }, + { " font metrics", RPMFC_WHITE|RPMFC_INCLUDE }, { " font", RPMFC_FONT|RPMFC_INCLUDE }, { " Font", RPMFC_FONT|RPMFC_INCLUDE }, @@ -1189,6 +1190,31 @@ exit: #endif } +static int rpmfcMISC(rpmfc fc) +{ + struct stat st; + int rc = -1; + const char *what = NULL; + const char * fn = fc->fn[fc->ix]; + /* this part is enumerated, compare equality not bit flags */ + int ftype = fc->fcolor->vals[fc->ix] & 0x000F0000; + + if (ftype == RPMFC_FONT) { + what = "fontconfig"; + } else if (ftype == RPMFC_TEXT && rpmFileHasSuffix(fn, ".desktop")) { + what = "desktop"; + } + + if (what == NULL || stat(fn, &st) < 0 || !S_ISREG(st.st_mode)) { + goto exit; + } + + (void) rpmfcHelper(fc, 'P', what); + rc = 0; + +exit: + return rc; +} typedef const struct rpmfcApplyTbl_s { int (*func) (rpmfc fc); int colormask; @@ -1201,6 +1227,7 @@ static const struct rpmfcApplyTbl_s cons { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_BOURNE| RPMFC_PERL|RPMFC_PYTHON|RPMFC_MONO| RPMFC_PKGCONFIG|RPMFC_LIBTOOL) }, + { rpmfcMISC, RPMFC_FONT|RPMFC_TEXT }, { rpmfcSYMLINK, RPMFC_SYMLINK }, { NULL, 0 } }; @@ -1320,7 +1347,7 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t arg size_t slen; int fcolor; int xx; - int msflags = MAGIC_CHECK; /* XXX MAGIC_COMPRESS flag? */ + int msflags = MAGIC_CHECK; /* add MAGIC_COMPRESS eventually */ magic_t ms = NULL; if (fc == NULL || argv == NULL) diff -up rpm-4.7.0-beta1/macros.in.extra-prov rpm-4.7.0-beta1/macros.in --- rpm-4.7.0-beta1/macros.in.extra-prov 2009-02-26 17:31:12.000000000 +0200 +++ rpm-4.7.0-beta1/macros.in 2009-02-26 17:32:38.000000000 +0200 @@ -494,6 +494,9 @@ print (t)\ %__pkgconfig_provides %{_rpmconfigdir}/pkgconfigdeps.sh --provides %__pkgconfig_requires %{_rpmconfigdir}/pkgconfigdeps.sh --requires +%__fontconfig_provides %{_rpmconfigdir}/fontconfig.prov +%__desktop_provides %{_rpmconfigdir}/desktop-file.prov + #============================================================================== # ---- Database configuration macros. # Macros used to configure Berkley db parameters. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 6 Feb 2009 13:55:13 -0000 1.33 +++ .cvsignore 6 Mar 2009 18:28:20 -0000 1.34 @@ -1 +1 @@ -rpm-4.6.0.tar.bz2 +rpm-4.7.0-beta1.tar.bz2 Index: rpm.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v retrieving revision 1.334 retrieving revision 1.335 diff -u -r1.334 -r1.335 --- rpm.spec 27 Feb 2009 09:02:57 -0000 1.334 +++ rpm.spec 6 Mar 2009 18:28:20 -0000 1.335 @@ -4,6 +4,8 @@ %bcond_with sqlite # just for giggles, option to build with internal Berkeley DB %bcond_with int_bdb +# not yet, a missing test-data file in beta1 tarball causes two tests to fail +%bcond_with check # switch rpm itself back to md5 file digests until the dust settles a bit %define _source_filedigest_algorithm 0 @@ -13,8 +15,9 @@ %define rpmhome /usr/lib/rpm -%define rpmver 4.6.0 -%define srcver %{rpmver} +%define rpmver 4.7.0 +%define snapver beta1 +%define srcver %{rpmver}-%{snapver} %define bdbver 4.7.25 %define dbprefix db @@ -22,17 +25,17 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: 11%{?dist} +Release: 0.%{snapver}.1%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ -Source0: http://rpm.org/releases/4.6.x/%{name}-%{srcver}.tar.bz2 +Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 %if %{with int_bdb} Source1: db-%{bdbver}.tar.gz %endif Source10: desktop-file.prov Source11: fontconfig.prov -Patch0: rpm-4.5.90-devel-autodep.patch +Patch0: rpm-4.7.0-devel-autodep.patch Patch1: rpm-4.5.90-pkgconfig-path.patch Patch2: rpm-4.5.90-gstreamer-provides.patch # Fedora specspo is setup differently than what rpm expects, considering @@ -40,17 +43,9 @@ Patch3: rpm-4.6.0-fedora-specspo.patch # Patches already in upstream -Patch200: rpm-4.6.0-rc1-defaultdocdir.patch -Patch201: rpm-4.6.0-inherit-group.patch -Patch202: rpm-4.6.0-anyarch-actions-fix.patch -Patch203: rpm-4.6.0-utf-dependencies.patch -Patch204: rpm-4.6.0-noarch-elf-check.patch -Patch205: rpm-4.6.0-pkgconfig-reqs.patch -Patch206: rpm-4.6.0-python-validate.patch -Patch207: rpm-4.6.0-rpmds-null.patch # These are not yet upstream -Patch300: rpm-4.6.0-extra-provides.patch +Patch300: rpm-4.7.0-extra-provides.patch # Partially GPL/LGPL dual-licensed and some bits with BSD # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD @@ -70,6 +65,10 @@ BuildRequires: db4-devel = %{bdbver} %endif +%if %{with check} +BuildRequires: fakechroot +%endif + # XXX generally assumed to be installed but make it explicit as rpm # is a bit special... BuildRequires: redhat-rpm-config @@ -93,6 +92,8 @@ %if %{with sqlite} BuildRequires: sqlite-devel %endif +# Not enabling these yet +# BuildRequires: libcap-devel libacl-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -182,15 +183,6 @@ %patch2 -p1 -b .gstreamer-prov %patch3 -p1 -b .fedora-specspo -%patch200 -p1 -b .defaultdocdir -%patch201 -p1 -b .inherit-group -%patch202 -p1 -b .anyarch-actions-fix -%patch203 -p1 -b .utf-dependencies -%patch204 -p1 -b .noarch-elf-check -%patch205 -p1 -b .pkgconfig-reqs -#%patch206 -p1 -b .python-bytecompile -%patch207 -p1 -b .rpmds-null - %patch300 -p1 -b .extra-prov %if %{with int_bdb} @@ -270,6 +262,11 @@ %clean rm -rf $RPM_BUILD_ROOT +%if %{with check} +%check +make check +%endif + %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -328,7 +325,7 @@ %files libs %defattr(-,root,root) -%{_libdir}/librpm*-*.so +%{_libdir}/librpm*.so.* %files build %defattr(-,root,root) @@ -391,6 +388,9 @@ %doc doc/librpm/html/* %changelog +* Fri Mar 06 2009 Panu Matilainen - 4.7.0-0.beta1.1 +- update to 4.7.0-beta1 (http://rpm.org/wiki/Releases/4.7.0) + * Fri Feb 27 2009 Panu Matilainen - 4.6.0-11 - build rpm itself with md5 file digests for now to ensure upgradability Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- sources 6 Feb 2009 13:55:13 -0000 1.139 +++ sources 6 Mar 2009 18:28:21 -0000 1.140 @@ -1 +1 @@ -77bf389f87f61ff53b068a9870aa91ca rpm-4.6.0.tar.bz2 +ea6cf6444b401ed19f4756a1bc279884 rpm-4.7.0-beta1.tar.bz2 From kkofler at fedoraproject.org Fri Mar 6 18:40:59 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Fri, 6 Mar 2009 18:40:59 +0000 (UTC) Subject: rpms/gnash/F-10 gnash.spec, 1.47, 1.48 gnash-kde4-no-excessive-linkage.patch, 1.1, NONE Message-ID: <20090306184059.A5B1070116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/gnash/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3838/F-10 Modified Files: gnash.spec Removed Files: gnash-kde4-no-excessive-linkage.patch Log Message: Sync from devel: * Fri Mar 06 2009 Kevin Kofler 0.8.5-3 - explicitly link the KlashPart against the libraries it uses Index: gnash.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnash/F-10/gnash.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- gnash.spec 6 Mar 2009 15:15:48 -0000 1.47 +++ gnash.spec 6 Mar 2009 18:40:29 -0000 1.48 @@ -1,6 +1,6 @@ Name: gnash Version: 0.8.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNU flash movie player Group: Applications/Multimedia @@ -13,10 +13,6 @@ Patch0: gnash-0.8.3-manual.patch # register KComponentData properly in KDE 4 KPart Patch3: gnash-0.8.3-fix-kde4-port.patch -# Currently kde4-gnash (from kde4 branch) links against various KDE libraries, -# but only needs Qt -- this patch removes the superfluous linkage (from bero) -# TODO: update to 0.8.5? -#Patch4: gnash-kde4-no-excessive-linkage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel libpng-devel libjpeg-devel libogg-devel @@ -94,6 +90,9 @@ # Hack as autoreconf breaks build sed -i -e 's!kapp.h!kapplication.h!g' configure sed -i -e 's!libkdeui.la!libkdeui.so!g' configure +# Currently kde4-gnash (from kde4 branch) links against various KDE libraries, +# but only needs Qt -- remove the superfluous linkage +sed -i -e 's!\$(KDE4_LIBS)!!g' gui/Makefile.in #chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} @@ -112,13 +111,13 @@ --enable-gui=gtk,kde4,sdl,fb \ --with-qt4=%{_kde4_prefix} \ --with-kde4-prefix=%{_kde4_prefix} \ - --with-kde4-lib=%{_libdir}/kde4/devel \ + --with-kde4-lib=%{_kde4_libdir}/kde4/devel \ --with-kde4-incl=%{_kde4_includedir} # make sure the Qt 4 moc etc. tools are found export PATH=%{_qt4_prefix}/bin:$PATH #doesn't work currently: %%{?_smp_mflags} -#make KDE4_CFLAGS=-I%{_kde4_includedir} -make +# override KDE4_LIBS because configure doesn't detect it properly +make KDE4_LIBS='-L%{_kde4_libdir}/kde4/devel -lkparts -lkdeui -lkdecore' %install rm -rf $RPM_BUILD_ROOT @@ -291,14 +290,23 @@ %{_mandir}/man1/cygnal.1* %changelog -* Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-2 -- add missing speex-devel and gstreamer-plugins-base-devel BRs +* Fri Mar 06 2009 Kevin Kofler 0.8.5-3 +- explicitly link the KlashPart against the libraries it uses -* Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-1 +* Fri Mar 06 2009 Jaroslav Reznik 0.8.5-2 +- add missing speex-devel and gstreamer-plugins-base-devel BR + +* Fri Mar 06 2009 Jaroslav Reznik 0.8.5-1 - update to 0.8.5 - remove use_kde3_executable_hack - remove autoreconf +* Tue Feb 24 2009 Fedora Release Engineering 0.8.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Dec 18 2008 Kevin Kofler 0.8.4-6 +- rebuild for new boost + * Thu Nov 13 2008 Kevin Kofler 0.8.4-5 - add missing portions of KDE 4 port from upstream kde4 branch --- gnash-kde4-no-excessive-linkage.patch DELETED --- From kkofler at fedoraproject.org Fri Mar 6 18:40:59 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Fri, 6 Mar 2009 18:40:59 +0000 (UTC) Subject: rpms/gnash/F-9 gnash.spec, 1.31, 1.32 gnash-kde4-no-excessive-linkage.patch, 1.1, NONE Message-ID: <20090306184059.EA5E270117@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/gnash/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3838/F-9 Modified Files: gnash.spec Removed Files: gnash-kde4-no-excessive-linkage.patch Log Message: Sync from devel: * Fri Mar 06 2009 Kevin Kofler 0.8.5-3 - explicitly link the KlashPart against the libraries it uses Index: gnash.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnash/F-9/gnash.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gnash.spec 6 Mar 2009 15:16:35 -0000 1.31 +++ gnash.spec 6 Mar 2009 18:40:29 -0000 1.32 @@ -1,6 +1,6 @@ Name: gnash Version: 0.8.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNU flash movie player Group: Applications/Multimedia @@ -13,10 +13,6 @@ Patch0: gnash-0.8.3-manual.patch # register KComponentData properly in KDE 4 KPart Patch3: gnash-0.8.3-fix-kde4-port.patch -# Currently kde4-gnash (from kde4 branch) links against various KDE libraries, -# but only needs Qt -- this patch removes the superfluous linkage (from bero) -# TODO: update to 0.8.5? -#Patch4: gnash-kde4-no-excessive-linkage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel libpng-devel libjpeg-devel libogg-devel @@ -94,6 +90,9 @@ # Hack as autoreconf breaks build sed -i -e 's!kapp.h!kapplication.h!g' configure sed -i -e 's!libkdeui.la!libkdeui.so!g' configure +# Currently kde4-gnash (from kde4 branch) links against various KDE libraries, +# but only needs Qt -- remove the superfluous linkage +sed -i -e 's!\$(KDE4_LIBS)!!g' gui/Makefile.in #chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} @@ -112,13 +111,13 @@ --enable-gui=gtk,kde4,sdl,fb \ --with-qt4=%{_kde4_prefix} \ --with-kde4-prefix=%{_kde4_prefix} \ - --with-kde4-lib=%{_libdir}/kde4/devel \ + --with-kde4-lib=%{_kde4_libdir}/kde4/devel \ --with-kde4-incl=%{_kde4_includedir} # make sure the Qt 4 moc etc. tools are found export PATH=%{_qt4_prefix}/bin:$PATH #doesn't work currently: %%{?_smp_mflags} -#make KDE4_CFLAGS=-I%{_kde4_includedir} -make +# override KDE4_LIBS because configure doesn't detect it properly +make KDE4_LIBS='-L%{_kde4_libdir}/kde4/devel -lkparts -lkdeui -lkdecore' %install rm -rf $RPM_BUILD_ROOT @@ -291,14 +290,23 @@ %{_mandir}/man1/cygnal.1* %changelog -* Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-2 -- add missing speex-devel and gstreamer-plugins-base-devel BRs +* Fri Mar 06 2009 Kevin Kofler 0.8.5-3 +- explicitly link the KlashPart against the libraries it uses -* Fri Mar 06 2009 Jaroslav Reznik - 0.8.5-1 +* Fri Mar 06 2009 Jaroslav Reznik 0.8.5-2 +- add missing speex-devel and gstreamer-plugins-base-devel BR + +* Fri Mar 06 2009 Jaroslav Reznik 0.8.5-1 - update to 0.8.5 - remove use_kde3_executable_hack - remove autoreconf +* Tue Feb 24 2009 Fedora Release Engineering 0.8.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Dec 18 2008 Kevin Kofler 0.8.4-6 +- rebuild for new boost + * Thu Nov 13 2008 Kevin Kofler 0.8.4-5 - add missing portions of KDE 4 port from upstream kde4 branch --- gnash-kde4-no-excessive-linkage.patch DELETED --- From rdieter at fedoraproject.org Fri Mar 6 18:41:09 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 18:41:09 +0000 (UTC) Subject: rpms/libopensync/devel libopensync.spec,1.28,1.29 Message-ID: <20090306184109.5E5CD70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libopensync/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3935 Modified Files: libopensync.spec Log Message: * Fri Mar 06 2009 Rex Dieter - 0.36-8 - dynamically set SWIG_DIR Index: libopensync.spec =================================================================== RCS file: /cvs/pkgs/rpms/libopensync/devel/libopensync.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- libopensync.spec 25 Feb 2009 16:54:05 -0000 1.28 +++ libopensync.spec 6 Mar 2009 18:40:39 -0000 1.29 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: libopensync Version: 0.36 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A synchronization framework Group: System Environment/Libraries @@ -19,6 +19,10 @@ BuildRequires: pkgconfig BuildRequires: cmake +# FIXME: make FindSWIG.cmake "just work", +# instead of having to manually specify SWIG_DIR +%global swig_version %((swig -version || echo "SWIG Version" 1.3.35) | grep ^SWIG | cut -d' ' -f3) + %description OpenSync is a synchronization framework that is platform and distribution independent. It consists of several plugins that can be used to connect to @@ -41,25 +45,29 @@ %prep %setup -q -cd cmake +pushd cmake %patch0 -p3 +popd %build mkdir build -cd build -%cmake -DOPENSYNC_LIBEXEC_DIR=%{_libexecdir} \ - -DCMAKE_SKIP_RPATH=YES \ - -DSWIG_DIR=/usr/share/swig/1.3.36/ ../ -make VERBOSE=1 %{?_smp_mflags} +pushd build +%cmake \ + -DOPENSYNC_LIBEXEC_DIR=%{_libexecdir} \ + -DSWIG_DIR=/usr/share/swig/%{swig_version} \ + .. +popd + +make %{?_smp_mflags} -C build + %install rm -rf $RPM_BUILD_ROOT -cd build -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT -C build -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/opensync-1.0 -mkdir -p $RPM_BUILD_ROOT/%{_libdir}/opensync-1.0/formats -mkdir -p $RPM_BUILD_ROOT/%{_libdir}/opensync-1.0/{python-,}plugins +mkdir -p $RPM_BUILD_ROOT%{_datadir}/opensync-1.0 +mkdir -p $RPM_BUILD_ROOT%{_libdir}/opensync-1.0/formats +mkdir -p $RPM_BUILD_ROOT%{_libdir}/opensync-1.0/{python-,}plugins mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ @@ -94,6 +102,9 @@ %{_libdir}/pkgconfig/* %changelog +* Fri Mar 06 2009 Rex Dieter - 0.36-8 +- dynamically set SWIG_DIR + * Wed Feb 25 2009 Fedora Release Engineering - 0.36-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rdieter at fedoraproject.org Fri Mar 6 18:48:32 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 18:48:32 +0000 (UTC) Subject: rpms/qedje/devel qedje.spec,1.3,1.4 Message-ID: <20090306184832.A37DF70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qedje/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5422 Modified Files: qedje.spec Log Message: * Fri Mar 06 2009 Rex Dieter - 0.3.0-5 - revert (previous borkage probably due to qt-4.5-rc1) Index: qedje.spec =================================================================== RCS file: /cvs/pkgs/rpms/qedje/devel/qedje.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qedje.spec 5 Mar 2009 10:25:11 -0000 1.3 +++ qedje.spec 6 Mar 2009 18:48:02 -0000 1.4 @@ -1,6 +1,6 @@ Name: qedje Version: 0.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A library combining the benefits of Edje and Qt Group: System Environment/Libraries @@ -14,7 +14,6 @@ BuildRequires: pkgconfig BuildRequires: eet-devel BuildRequires: qzion-devel -BuildRequires: phonon-devel %description The main purpose of the QEdje project is to build a bridge among components @@ -76,6 +75,9 @@ %changelog +* Fri Mar 06 2009 Rex Dieter - 0.3.0-5 +- revert (previous borkage probably due to qt-4.5-rc1) + * Wed Mar 05 2009 Caol??n McNamara - 0.3.0-4 - BR: phonon-devel From katzj at fedoraproject.org Fri Mar 6 19:00:21 2009 From: katzj at fedoraproject.org (Jeremy Katz) Date: Fri, 6 Mar 2009 19:00:21 +0000 (UTC) Subject: rpms/mkinitrd/devel .cvsignore, 1.218, 1.219 mkinitrd.spec, 1.312, 1.313 sources, 1.260, 1.261 Message-ID: <20090306190021.6204D70116@cvs1.fedora.phx.redhat.com> Author: katzj Update of /cvs/pkgs/rpms/mkinitrd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8207 Modified Files: .cvsignore mkinitrd.spec sources Log Message: * Fri Mar 6 2009 Jeremy Katz - 6.0.79-1 - Fix handling of keymaps which are symlinks (hdegoede, #485615) - Show splash later for live images (mccann) - Make live initrd boot quieter (#488862) - First steps of multiple live medium support (Till Maas) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mkinitrd/devel/.cvsignore,v retrieving revision 1.218 retrieving revision 1.219 diff -u -r1.218 -r1.219 --- .cvsignore 23 Feb 2009 12:45:40 -0000 1.218 +++ .cvsignore 6 Mar 2009 18:59:50 -0000 1.219 @@ -1 +1 @@ -mkinitrd-6.0.78.tar.bz2 +mkinitrd-6.0.79.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/pkgs/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.312 retrieving revision 1.313 diff -u -r1.312 -r1.313 --- mkinitrd.spec 26 Feb 2009 01:40:41 -0000 1.312 +++ mkinitrd.spec 6 Mar 2009 18:59:50 -0000 1.313 @@ -2,8 +2,8 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 6.0.78 -Release: 2%{?dist} +Version: 6.0.79 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source0: mkinitrd-%{version}.tar.bz2 @@ -136,6 +136,12 @@ %dir %{_sysconfdir}/kernel/prerm.d %changelog +* Fri Mar 6 2009 Jeremy Katz - 6.0.79-1 +- Fix handling of keymaps which are symlinks (hdegoede, #485615) +- Show splash later for live images (mccann) +- Make live initrd boot quieter (#488862) +- First steps of multiple live medium support (Till Maas) + * Wed Feb 25 2009 Fedora Release Engineering - 6.0.78-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mkinitrd/devel/sources,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- sources 23 Feb 2009 12:45:41 -0000 1.260 +++ sources 6 Mar 2009 18:59:50 -0000 1.261 @@ -1 +1 @@ -7b311c466228fc74a3b343d42bf5d25c mkinitrd-6.0.78.tar.bz2 +479c6b4c12f2db95472ab625bc9ea74c mkinitrd-6.0.79.tar.bz2 From rdieter at fedoraproject.org Fri Mar 6 19:12:54 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 19:12:54 +0000 (UTC) Subject: rpms/superkaramba/devel .cvsignore, 1.2, NONE sources, 1.2, NONE superkaramba.spec, 1.4, NONE Message-ID: <20090306191254.94E7C70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/superkaramba/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10653 Removed Files: .cvsignore sources superkaramba.spec Log Message: make more dead --- .cvsignore DELETED --- --- sources DELETED --- --- superkaramba.spec DELETED --- From ynemoy at fedoraproject.org Fri Mar 6 19:32:15 2009 From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy) Date: Fri, 6 Mar 2009 19:32:15 +0000 (UTC) Subject: rpms/ghc-X11/devel ghc-X11.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306193215.B99D070116@cvs1.fedora.phx.redhat.com> Author: ynemoy Update of /cvs/pkgs/rpms/ghc-X11/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14494/devel Modified Files: .cvsignore sources Added Files: ghc-X11.spec import.log Log Message: Initial Import --- NEW FILE ghc-X11.spec --- %global pkg_name X11 %global ghc_version 6.10.1 %global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version} %global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version} %bcond_without prof %bcond_without doc # ghc does not emit debug information %global debug_package %{nil} Name: ghc-%{pkg_name} Version: 1.4.5 Release: 3%{?dist} Summary: Haskell %{pkg_name} library with bindings to xlib C functions Group: Development/Libraries License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: %{name}-devel = %{version}-%{release} # ghc has only been bootstrapped on the following archs: ExclusiveArch: i386 x86_64 ppc BuildRequires: ghc = %{ghc_version} %if %{with doc} BuildRequires: ghc-doc = %{ghc_version} %endif %if %{with prof} BuildRequires: ghc-prof = %{ghc_version} %endif BuildRequires: libXinerama-devel, libX11-devel, libXext-devel %description This package provides the Haskell %{pkg_name} library. The library consists of bindings to direct translations of the C bindings; for documentation of these calls, refer to "The Xlib Programming Manual", available online at . %package devel Summary: Haskell %{pkg_name} library Group: Development/Libraries Requires: ghc = %{ghc_version} Requires(post): ghc = %{ghc_version} Requires(preun): ghc = %{ghc_version} Requires: libXinerama-devel, libX11-devel, libXext-devel %description devel This package contains the development files for %{name} built for ghc-%{ghc_version}. %if %{with doc} %package doc Summary: Documentation for %{name} Group: Development/Libraries Requires: ghc-doc = %{ghc_version} Requires(post): ghc-doc = %{ghc_version} Requires(postun): ghc-doc = %{ghc_version} %description doc This package contains development documentation files for the %{name} library. %endif %if %{with prof} %package prof Summary: Profiling libraries for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: ghc-prof = %{ghc_version} %description prof This package contains profiling libraries for %{name}. %endif %prep %setup -q -n %{pkg_name}-%{version} %build %cabal_configure --ghc %{!?without_prof:-p} %cabal build %if %{with doc} %cabal haddock %endif %ghc_gen_scripts %install rm -rf $RPM_BUILD_ROOT %cabal_install %ghc_install_scripts %ghc_gen_filelists %{name} %clean rm -rf $RPM_BUILD_ROOT %post devel %ghc_register_pkg %if %{with doc} %post doc %ghc_reindex_haddock %endif %preun devel if [ "$1" -eq 0 ] ; then %ghc_unregister_pkg fi %if %{with doc} %postun doc if [ "$1" -eq 0 ] ; then %ghc_reindex_haddock fi %endif %files devel -f %{name}-devel.files %defattr(-,root,root,-) %{_docdir}/%{name}-%{version} %if %{with doc} %files doc %defattr(-,root,root,-) %{pkg_docdir} %endif %if %{with prof} %files prof -f %{name}-prof.files %defattr(-,root,root,-) %endif %changelog * Sat Feb 28 2009 Jens Petersen - 1.4.5-3 - sync with cabal2spec-0.12: - improve requires * Mon Feb 23 2009 Yaakov M. Nemoy - 1.4.5-2 - updated template to new guidelines * Mon Jan 5 2009 Yaakov M. Nemoy - 1.4.5-1 - initial packaging for Fedora created by cabal2spec - added description and build requires - altered license from template --- NEW FILE import.log --- ghc-X11-1_4_5-3_fc10:HEAD:ghc-X11-1.4.5-3.fc10.src.rpm:1236367864 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ghc-X11/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 04:39:02 -0000 1.1 +++ .cvsignore 6 Mar 2009 19:31:45 -0000 1.2 @@ -0,0 +1 @@ +X11-1.4.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ghc-X11/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 04:39:02 -0000 1.1 +++ sources 6 Mar 2009 19:31:45 -0000 1.2 @@ -0,0 +1 @@ +73a4ba56b8cef69ce3659ab452e4530b X11-1.4.5.tar.gz From pingou at fedoraproject.org Fri Mar 6 19:42:19 2009 From: pingou at fedoraproject.org (Pierre-YvesChibon) Date: Fri, 6 Mar 2009 19:42:19 +0000 (UTC) Subject: rpms/R-pls/F-10 R-pls.spec,1.3,1.4 Message-ID: <20090306194219.E8D5E70116@cvs1.fedora.phx.redhat.com> Author: pingou Update of /cvs/pkgs/rpms/R-pls/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17098 Modified Files: R-pls.spec Log Message: Fix build Index: R-pls.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-pls/F-10/R-pls.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- R-pls.spec 18 Feb 2008 13:19:37 -0000 1.3 +++ R-pls.spec 6 Mar 2009 19:41:49 -0000 1.4 @@ -2,7 +2,7 @@ Name: R-%{packname} Version: 2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multivariate regression by PLSR and PCR Summary(fr): R??gression multivari??e par PLSR et PCR @@ -28,11 +28,6 @@ %prep %setup -c -q -n %{packname} -for f in %{packname}/man/* - do - iconv -f ISO-8859-1 -t UTF-8 -o $f.temp $f - mv $f.temp $f -done iconv -f ISO-8859-1 -t UTF-8 -o %{packname}/DESCRIPTION.temp %{packname}/DESCRIPTION mv %{packname}/DESCRIPTION.temp %{packname}/DESCRIPTION @@ -51,6 +46,14 @@ install -pm 0644 %{packname}/CHANGES %{buildroot}%{_datadir}/R/library/%{packname} +for f in %{buildroot}/%{_datadir}/R/library/%{packname}/latex/* + do + iconv -f ISO-8859-1 -t UTF-8 -o $f.temp $f + mv $f.temp $f +done + +iconv -f ISO-8859-1 -t UTF-8 -o %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz.temp %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz +mv %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz.temp %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz %check %{_bindir}/R CMD check %{packname} @@ -84,6 +87,9 @@ %changelog +* Fri Mar 06 2009 Pingou 2.1-5 +- Change the iconv from prep to end of install to make it build + * Mon Feb 18 2008 Pingou 2.1-4 - Change the URL (correct typo) From pingou at fedoraproject.org Fri Mar 6 19:43:55 2009 From: pingou at fedoraproject.org (Pierre-YvesChibon) Date: Fri, 6 Mar 2009 19:43:55 +0000 (UTC) Subject: rpms/R-pls/F-9 R-pls.spec,1.3,1.4 Message-ID: <20090306194355.E522470116@cvs1.fedora.phx.redhat.com> Author: pingou Update of /cvs/pkgs/rpms/R-pls/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17467/F-9 Modified Files: R-pls.spec Log Message: Fix build Index: R-pls.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-pls/F-9/R-pls.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- R-pls.spec 18 Feb 2008 13:19:37 -0000 1.3 +++ R-pls.spec 6 Mar 2009 19:43:25 -0000 1.4 @@ -2,7 +2,7 @@ Name: R-%{packname} Version: 2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multivariate regression by PLSR and PCR Summary(fr): R??gression multivari??e par PLSR et PCR @@ -28,11 +28,6 @@ %prep %setup -c -q -n %{packname} -for f in %{packname}/man/* - do - iconv -f ISO-8859-1 -t UTF-8 -o $f.temp $f - mv $f.temp $f -done iconv -f ISO-8859-1 -t UTF-8 -o %{packname}/DESCRIPTION.temp %{packname}/DESCRIPTION mv %{packname}/DESCRIPTION.temp %{packname}/DESCRIPTION @@ -51,6 +46,14 @@ install -pm 0644 %{packname}/CHANGES %{buildroot}%{_datadir}/R/library/%{packname} +for f in %{buildroot}/%{_datadir}/R/library/%{packname}/latex/* + do + iconv -f ISO-8859-1 -t UTF-8 -o $f.temp $f + mv $f.temp $f +done + +iconv -f ISO-8859-1 -t UTF-8 -o %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz.temp %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz +mv %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz.temp %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz %check %{_bindir}/R CMD check %{packname} @@ -84,6 +87,9 @@ %changelog +* Fri Mar 06 2009 Pingou 2.1-5 +- Change the iconv from prep to end of install to make it build + * Mon Feb 18 2008 Pingou 2.1-4 - Change the URL (correct typo) From pingou at fedoraproject.org Fri Mar 6 19:43:56 2009 From: pingou at fedoraproject.org (Pierre-YvesChibon) Date: Fri, 6 Mar 2009 19:43:56 +0000 (UTC) Subject: rpms/R-pls/devel R-pls.spec,1.4,1.5 Message-ID: <20090306194356.7315D70116@cvs1.fedora.phx.redhat.com> Author: pingou Update of /cvs/pkgs/rpms/R-pls/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17467/devel Modified Files: R-pls.spec Log Message: Fix build Index: R-pls.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-pls/devel/R-pls.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- R-pls.spec 23 Feb 2009 23:08:23 -0000 1.4 +++ R-pls.spec 6 Mar 2009 19:43:25 -0000 1.5 @@ -28,11 +28,6 @@ %prep %setup -c -q -n %{packname} -for f in %{packname}/man/* - do - iconv -f ISO-8859-1 -t UTF-8 -o $f.temp $f - mv $f.temp $f -done iconv -f ISO-8859-1 -t UTF-8 -o %{packname}/DESCRIPTION.temp %{packname}/DESCRIPTION mv %{packname}/DESCRIPTION.temp %{packname}/DESCRIPTION @@ -51,6 +46,14 @@ install -pm 0644 %{packname}/CHANGES %{buildroot}%{_datadir}/R/library/%{packname} +for f in %{buildroot}/%{_datadir}/R/library/%{packname}/latex/* + do + iconv -f ISO-8859-1 -t UTF-8 -o $f.temp $f + mv $f.temp $f +done + +iconv -f ISO-8859-1 -t UTF-8 -o %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz.temp %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz +mv %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz.temp %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz %check %{_bindir}/R CMD check %{packname} @@ -84,8 +87,8 @@ %changelog -* Mon Feb 23 2009 Fedora Release Engineering - 2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Fri Mar 06 2009 Pingou 2.1-5 +- Change the iconv from prep to end of install to make it build * Mon Feb 18 2008 Pingou 2.1-4 - Change the URL (correct typo) From rdieter at fedoraproject.org Fri Mar 6 19:44:05 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 19:44:05 +0000 (UTC) Subject: rpms/libtunepimp/devel libtunepimp-0.5.3-glibc210_strrchr.patch, NONE, 1.1 libtunepimp.spec, 1.43, 1.44 Message-ID: <20090306194405.5C72870116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libtunepimp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17601 Modified Files: libtunepimp.spec Added Files: libtunepimp-0.5.3-glibc210_strrchr.patch Log Message: * Fri Mar 06 2009 Rex Dieter - 0.5.3-15 - glibc210_strrchr patch libtunepimp-0.5.3-glibc210_strrchr.patch: --- NEW FILE libtunepimp-0.5.3-glibc210_strrchr.patch --- diff -up libtunepimp-0.5.3/lib/fileio.cpp.gcc44 libtunepimp-0.5.3/lib/fileio.cpp --- libtunepimp-0.5.3/lib/fileio.cpp.gcc44 2006-11-18 04:52:33.000000000 -0600 +++ libtunepimp-0.5.3/lib/fileio.cpp 2009-03-06 13:33:44.000000000 -0600 @@ -122,7 +124,8 @@ int taccess(const char *pathname, int mo void tmktempname(const char *path, char *newPath, int newPathLen) { - char *ptr, *temp; + const char *ptr; + char *temp; temp = (char *)malloc(strlen(path) + 32); ptr = strrchr(path, dirSepChar); Index: libtunepimp.spec =================================================================== RCS file: /cvs/pkgs/rpms/libtunepimp/devel/libtunepimp.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- libtunepimp.spec 27 Feb 2009 23:07:17 -0000 1.43 +++ libtunepimp.spec 6 Mar 2009 19:43:34 -0000 1.44 @@ -6,7 +6,7 @@ Summary: A library for creating MusicBrainz enabled tagging applications Name: libtunepimp Version: 0.5.3 -Release: 14%{?dist} +Release: 15%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -16,6 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: libtunepimp-0.5.3-gcc43.patch +Patch2: libtunepimp-0.5.3-glibc210_strrchr.patch %define pkglibdir %{_libdir}/tunepimp @@ -79,6 +80,7 @@ %setup -q -n libtunepimp-%{version} %patch1 -p1 -b .gcc43 +%patch2 -p1 -b .glibc210_strrchr.patch # nuke rpath -- Rex %if 0%{?use_autofoo} @@ -165,6 +167,9 @@ %changelog +* Fri Mar 06 2009 Rex Dieter - 0.5.3-15 +- glibc210_strrchr patch + * Fri Feb 27 2009 Fedora Release Engineering - 0.5.3-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pingou at fedoraproject.org Fri Mar 6 19:49:38 2009 From: pingou at fedoraproject.org (Pierre-YvesChibon) Date: Fri, 6 Mar 2009 19:49:38 +0000 (UTC) Subject: rpms/R-pls/devel R-pls.spec,1.5,1.6 Message-ID: <20090306194938.7FF2070116@cvs1.fedora.phx.redhat.com> Author: pingou Update of /cvs/pkgs/rpms/R-pls/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18665 Modified Files: R-pls.spec Log Message: Increase release Index: R-pls.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-pls/devel/R-pls.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- R-pls.spec 6 Mar 2009 19:43:25 -0000 1.5 +++ R-pls.spec 6 Mar 2009 19:49:08 -0000 1.6 @@ -2,7 +2,7 @@ Name: R-%{packname} Version: 2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multivariate regression by PLSR and PCR Summary(fr): R??gression multivari??e par PLSR et PCR @@ -87,9 +87,12 @@ %changelog -* Fri Mar 06 2009 Pingou 2.1-5 +* Fri Mar 06 2009 Pingou 2.1-6 - Change the iconv from prep to end of install to make it build +* Mon Feb 23 2009 Fedora Release Engineering - 2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 18 2008 Pingou 2.1-4 - Change the URL (correct typo) From jspaleta at fedoraproject.org Fri Mar 6 19:57:53 2009 From: jspaleta at fedoraproject.org (Jef Spaleta) Date: Fri, 6 Mar 2009 19:57:53 +0000 (UTC) Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.42,1.43 Message-ID: <20090306195753.E382A70116@cvs1.fedora.phx.redhat.com> Author: jspaleta Update of /cvs/pkgs/rpms/python-matplotlib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20396 Modified Files: python-matplotlib.spec Log Message: * Fri Mar 06 2009 Jef Spaleta - 0.98.5-4 - Fixed font dep after font guideline change Index: python-matplotlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- python-matplotlib.spec 26 Feb 2009 22:17:12 -0000 1.42 +++ python-matplotlib.spec 6 Mar 2009 19:57:23 -0000 1.43 @@ -2,7 +2,7 @@ Name: python-matplotlib Version: 0.98.5.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -18,7 +18,7 @@ BuildRequires: pytz, python-dateutil, numpy Requires: numpy, pytz, python-dateutil Requires: pycairo >= 1.2.0 -Requires: dejavu-fonts-sans +Requires: dejavu-sans-fonts %description Matplotlib is a pure python plotting library with the goal of making @@ -78,6 +78,9 @@ %changelog +* Fri Mar 06 2009 Jef Spaleta - 0.98.5-4 +- Fixed font dep after font guideline change + * Thu Feb 26 2009 Fedora Release Engineering - 0.98.5.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From hardaker at fedoraproject.org Fri Mar 6 20:01:17 2009 From: hardaker at fedoraproject.org (Wes Hardaker) Date: Fri, 6 Mar 2009 20:01:17 +0000 (UTC) Subject: rpms/dnssec-tools/devel .cvsignore, 1.7, 1.8 dnssec-tools.spec, 1.23, 1.24 sources, 1.8, 1.9 Message-ID: <20090306200117.B3ED470116@cvs1.fedora.phx.redhat.com> Author: hardaker Update of /cvs/extras/rpms/dnssec-tools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21254 Modified Files: .cvsignore dnssec-tools.spec sources Log Message: 1.5 update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 23 Jul 2008 04:14:37 -0000 1.7 +++ .cvsignore 6 Mar 2009 20:00:47 -0000 1.8 @@ -1 +1 @@ -dnssec-tools-1.4.1.tar.gz +dnssec-tools-1.5.tar.gz Index: dnssec-tools.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/devel/dnssec-tools.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- dnssec-tools.spec 24 Feb 2009 12:15:06 -0000 1.23 +++ dnssec-tools.spec 6 Mar 2009 20:00:47 -0000 1.24 @@ -1,7 +1,7 @@ Summary: A suite of tools for managing dnssec aware DNS usage Name: dnssec-tools -Version: 1.4.1 -Release: 7%{?dist} +Version: 1.5 +Release: 1%{?dist} License: BSD Group: System Environment/Base URL: http://www.dnssec-tools.org/ @@ -18,7 +18,6 @@ BuildRequires: perl(Test) perl(ExtUtils::MakeMaker) Patch4: dnssec-tools-linux-conf-paths-1.2.patch -Patch5: dnssec-tools-arpa-1.4.1.patch %description @@ -57,7 +56,6 @@ %setup -q %patch4 -p0 -%patch5 -p0 %build %configure --with-validator-testcases-file=%{_datadir}/dnssec-tools/validator-testcases --with-perl-build-args="INSTALLDIRS=vendor OPTIMIZE='$RPM_OPT_FLAGS'" --sysconfdir=/etc --with-root-hints=/etc/named.root.hints --with-resolv-conf=/etc/resolv.conf @@ -100,9 +98,9 @@ %defattr(-,root,root,-) %doc README INSTALL COPYING -/etc/dnssec-tools %config(noreplace) /etc/dnssec-tools/dnssec-tools.conf %config(noreplace) /etc/dnssec-tools/dnsval.conf +/etc/dnssec-tools %{_bindir}/dnspktflow %{_bindir}/donuts @@ -111,15 +109,16 @@ %{_bindir}/expchk %{_bindir}/genkrf %{_bindir}/getdnskeys +%{_bindir}/getds %{_bindir}/lskrf %{_bindir}/maketestzone %{_bindir}/mapper %{_bindir}/zonesigner # this doesn't use %{_datadir} because patch6 above uses this exact path /usr/share/dnssec-tools -/usr/share/dnssec-tools/donuts -/usr/share/dnssec-tools/donuts/rules -/usr/share/dnssec-tools/donuts/rules/* +#/usr/share/dnssec-tools/donuts +#/usr/share/dnssec-tools/donuts/rules +#/usr/share/dnssec-tools/donuts/rules/* %{_bindir}/dtck %{_bindir}/dtconfchk @@ -142,7 +141,7 @@ %{_bindir}/libval_check_conf %{_bindir}/validate # configure above -%{_datadir}/dnssec-tools/validator-testcases +#%{_datadir}/dnssec-tools/validator-testcases %{_bindir}/getaddr %{_bindir}/gethost %{_bindir}/getname @@ -157,6 +156,8 @@ %{_bindir}/signset-editor %{_bindir}/rollrec-editor +%{_bindir}/lsdnssec + %{_mandir}/man1/dnssec-tools.1.gz %{_mandir}/man1/dnspktflow.1.gz %{_mandir}/man1/donuts.1.gz @@ -165,6 +166,7 @@ %{_mandir}/man1/expchk.1.gz %{_mandir}/man1/genkrf.1.gz %{_mandir}/man1/getdnskeys.1.gz +%{_mandir}/man1/getds.1.gz %{_mandir}/man1/lskrf.1.gz %{_mandir}/man1/keyarch.1.gz %{_mandir}/man1/maketestzone.1.gz @@ -190,6 +192,7 @@ %{_mandir}/man1/rollerd.1.gz %{_mandir}/man1/rollinit.1.gz %{_mandir}/man1/rollset.1.gz +%{_mandir}/man1/lsdnssec.1.gz %{_mandir}/man1/cleanarch.1.gz %{_mandir}/man1/blinkenlights.1.gz %{_mandir}/man1/cleankrf.1.gz @@ -214,7 +217,8 @@ # but this one is entirely ours: %{perl_vendorarch}/Net/DNS/SEC/Tools %{perl_vendorarch}/Net/addrinfo* -%{perl_vendorarch}/Net/DNS/SEC/* +%{perl_vendorarch}/Net/DNS/SEC/*.pm +%{perl_vendorarch}/Net/DNS/SEC/*.pl %{perl_vendorarch}/auto/Net/DNS/SEC %{perl_vendorarch}/auto/Net/DNS/SEC/Validator %{perl_vendorarch}/auto/Net/addrinfo/ @@ -285,6 +289,9 @@ %{_mandir}/man3/val_freeaddrinfo.3.gz %changelog +* Fri Mar 6 2009 Wes Hardaker - 1.5-1 +- Update to 1.5 + * Tue Feb 24 2009 Fedora Release Engineering - 1.4.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 23 Jul 2008 04:14:37 -0000 1.8 +++ sources 6 Mar 2009 20:00:47 -0000 1.9 @@ -1 +1 @@ -a47cf335e43139476695191fcb005aad dnssec-tools-1.4.1.tar.gz +1063f800c49806bdac2551fcdd76505a dnssec-tools-1.5.tar.gz From mclasen at fedoraproject.org Fri Mar 6 20:03:17 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Fri, 6 Mar 2009 20:03:17 +0000 (UTC) Subject: rpms/gnome-media/devel gvc-log.patch, NONE, 1.1 gnome-media.spec, 1.158, 1.159 Message-ID: <20090306200317.D215E70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-media/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21992 Modified Files: gnome-media.spec Added Files: gvc-log.patch Log Message: turn off debug spew gvc-log.patch: --- NEW FILE gvc-log.patch --- diff -up gnome-media-2.25.92/gnome-volume-control/src/applet-main.c.gvc-log gnome-media-2.25.92/gnome-volume-control/src/applet-main.c --- gnome-media-2.25.92/gnome-volume-control/src/applet-main.c.gvc-log 2009-03-03 12:20:56.000000000 -0500 +++ gnome-media-2.25.92/gnome-volume-control/src/applet-main.c 2009-03-06 14:58:27.015806564 -0500 @@ -32,6 +32,7 @@ #include #include "gvc-applet.h" +#include "gvc-log.h" #define GVCA_DBUS_NAME "org.gnome.VolumeControlApplet" @@ -54,11 +55,14 @@ main (int argc, char **argv) bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); + gvc_log_init (); + error = NULL; gtk_init_with_args (&argc, &argv, (char *) _(" - GNOME Volume Control Applet"), entries, GETTEXT_PACKAGE, &error); + if (error != NULL) { g_warning ("%s", error->message); exit (1); @@ -69,6 +73,8 @@ main (int argc, char **argv) exit (1); } + gvc_log_set_debug (debug); + app = unique_app_new (GVCA_DBUS_NAME, NULL); if (unique_app_is_running (app)) { g_warning ("Applet is already running, exiting"); diff -up gnome-media-2.25.92/gnome-volume-control/src/dialog-main.c.gvc-log gnome-media-2.25.92/gnome-volume-control/src/dialog-main.c --- gnome-media-2.25.92/gnome-volume-control/src/dialog-main.c.gvc-log 2009-03-03 12:20:56.000000000 -0500 +++ gnome-media-2.25.92/gnome-volume-control/src/dialog-main.c 2009-03-06 14:58:35.291048924 -0500 @@ -32,6 +32,7 @@ #include #include "gvc-mixer-dialog.h" +#include "gvc-log.h" #define GVCA_DBUS_NAME "org.gnome.VolumeControl" #define DIALOG_POPUP_TIMEOUT 3 @@ -146,6 +147,8 @@ main (int argc, char **argv) bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); + gvc_log_init (); + error = NULL; gtk_init_with_args (&argc, &argv, (char *) _(" - GNOME Volume Control"), @@ -161,6 +164,8 @@ main (int argc, char **argv) exit (1); } + gvc_log_set_debug (debug); + app = unique_app_new (GVCA_DBUS_NAME, NULL); if (unique_app_is_running (app)) { unique_app_send_message (app, UNIQUE_ACTIVATE, NULL); diff -up /dev/null gnome-media-2.25.92/gnome-volume-control/src/gvc-log.c --- /dev/null 2009-03-06 10:04:35.315275556 -0500 +++ gnome-media-2.25.92/gnome-volume-control/src/gvc-log.c 2009-03-06 14:58:22.624792210 -0500 @@ -0,0 +1,63 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * + * Copyright (C) 2009 Red Hat, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + + +#include "config.h" + +#include +#include + +#include "gvc-log.h" + + +static int log_levels = G_LOG_LEVEL_CRITICAL | + G_LOG_LEVEL_ERROR | + G_LOG_LEVEL_WARNING | + G_LOG_LEVEL_DEBUG; + +static void +gvc_log_default_handler (const gchar *log_domain, + GLogLevelFlags log_level, + const gchar *message, + gpointer unused_data) +{ + if ((log_level & log_levels) == 0) + return; + + g_log_default_handler (log_domain, log_level, message, unused_data); +} + +void +gvc_log_init (void) +{ + g_log_set_default_handler (gvc_log_default_handler, NULL); +} + +void +gvc_log_set_debug (gboolean debug) +{ + if (debug) { + log_levels |= G_LOG_LEVEL_DEBUG; + g_debug ("Enabling debugging"); + } else { + g_debug ("Disabling debugging"); + log_levels &= ~G_LOG_LEVEL_DEBUG; + } +} diff -up /dev/null gnome-media-2.25.92/gnome-volume-control/src/gvc-log.h --- /dev/null 2009-03-06 10:04:35.315275556 -0500 +++ gnome-media-2.25.92/gnome-volume-control/src/gvc-log.h 2009-03-06 14:41:27.870798083 -0500 @@ -0,0 +1,35 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * + * Copyright (C) 2009 Red Hat, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +#ifndef __GVC_LOG_H +#define __GVC_LOG_H + +#include + +G_BEGIN_DECLS + + +void gvc_log_init (void); +void gvc_log_set_debug (gboolean debug); + + +G_END_DECLS + +#endif /* __GVC_LOG_H */ diff -up gnome-media-2.25.92/gnome-volume-control/src/Makefile.am.gvc-log gnome-media-2.25.92/gnome-volume-control/src/Makefile.am --- gnome-media-2.25.92/gnome-volume-control/src/Makefile.am.gvc-log 2009-03-03 12:20:56.000000000 -0500 +++ gnome-media-2.25.92/gnome-volume-control/src/Makefile.am 2009-03-06 14:38:05.977064353 -0500 @@ -45,6 +45,7 @@ gnome_volume_control_applet_SOURCES = \ gvc-stream-status-icon.c \ gvc-applet.h \ gvc-applet.c \ + gvc-log.c \ applet-main.c \ $(NULL) @@ -82,6 +83,7 @@ gnome_volume_control_SOURCES = \ gvc-mixer-dialog.c \ gvc-level-bar.h \ gvc-level-bar.c \ + gvc-log.c \ dialog-main.c \ $(NULL) Index: gnome-media.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- gnome-media.spec 4 Mar 2009 18:52:31 -0000 1.158 +++ gnome-media.spec 6 Mar 2009 20:02:47 -0000 1.159 @@ -14,10 +14,12 @@ Summary: GNOME media programs Name: gnome-media Version: 2.25.92 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and GFDL Group: Applications/Multimedia Source: http://download.gnome.org/sources/gnome-media/2.25/gnome-media-%{version}.tar.bz2 +# fixed in upstream svn +Patch0: gvc-log.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: gnome @@ -45,6 +47,8 @@ BuildRequires: gnome-doc-utils BuildRequires: intltool BuildRequires: unique-devel +# for patch 0 +BuildRequires: autoconf automake libtool %description This package contains a few media utilities for the GNOME desktop, @@ -74,6 +78,9 @@ %prep %setup -q +%patch0 -p1 -b .gvc-log + +autoreconf -f -i %build # try to work around a problem where gst-inspect does @@ -247,6 +254,9 @@ %{_libdir}/pkgconfig/* %changelog +* Fri Mar 6 2009 Matthias Clasen 2.25.92-2 +- Turn off debug spew + * Tue Mar 3 2009 Matthias Clasen 2.25.92-1 - Update to 2.25.92 From rstrode at fedoraproject.org Fri Mar 6 20:05:39 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Fri, 6 Mar 2009 20:05:39 +0000 (UTC) Subject: rpms/gdm/devel gdm-2.25.2-multistack-but-boring.patch, 1.6, 1.7 gdm.spec, 1.447, 1.448 Message-ID: <20090306200539.4BB5370116@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gdm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22637 Modified Files: gdm-2.25.2-multistack-but-boring.patch gdm.spec Log Message: - Reset "start session when ready" state to FALSE when starting new greeter from existing slave. May fix problem Chris Ball is seeing with language selection in autologin the second time after boot up. gdm-2.25.2-multistack-but-boring.patch: Index: gdm-2.25.2-multistack-but-boring.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.25.2-multistack-but-boring.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gdm-2.25.2-multistack-but-boring.patch 5 Mar 2009 22:44:16 -0000 1.6 +++ gdm-2.25.2-multistack-but-boring.patch 6 Mar 2009 20:05:08 -0000 1.7 @@ -4403,7 +4403,7 @@ #endif /* __GDM_SESSION_WORKER_JOB_H */ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/daemon/gdm-simple-slave.c --- gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring 2009-03-04 21:03:53.057442982 -0500 -+++ gdm-2.25.2/daemon/gdm-simple-slave.c 2009-03-05 17:39:40.008530152 -0500 ++++ gdm-2.25.2/daemon/gdm-simple-slave.c 2009-03-06 15:03:10.290300356 -0500 @@ -68,6 +68,8 @@ struct GdmSimpleSlavePrivate guint greeter_reset_id; guint start_session_id; @@ -4421,7 +4421,16 @@ int pid, GdmSimpleSlave *slave) { -@@ -172,7 +175,6 @@ reset_session (GdmSimpleSlave *slave) +@@ -165,6 +168,8 @@ destroy_session (GdmSimpleSlave *slave) + g_object_unref (slave->priv->session); + slave->priv->session = NULL; + } ++ ++ slave->priv->start_session_when_ready = FALSE; + } + + static void +@@ -172,7 +177,6 @@ reset_session (GdmSimpleSlave *slave) { destroy_session (slave); create_new_session (slave); @@ -4429,7 +4438,7 @@ } static gboolean -@@ -203,23 +205,25 @@ queue_greeter_reset (GdmSimpleSlave *sla +@@ -203,23 +207,25 @@ queue_greeter_reset (GdmSimpleSlave *sla static void on_session_setup_complete (GdmSession *session, @@ -4458,7 +4467,7 @@ } static void -@@ -239,26 +243,30 @@ on_session_reset_failed (GdmSession +@@ -239,26 +245,30 @@ on_session_reset_failed (GdmSession static void on_session_authenticated (GdmSession *session, @@ -4493,7 +4502,7 @@ { if (slave->priv->start_session_when_ready) { char *ssid; -@@ -279,7 +287,7 @@ gdm_simple_slave_accredit_when_ready (Gd +@@ -279,7 +289,7 @@ gdm_simple_slave_accredit_when_ready (Gd g_free (ssid); g_free (username); @@ -4502,7 +4511,7 @@ } else { slave->priv->waiting_to_start_session = TRUE; } -@@ -287,29 +295,31 @@ gdm_simple_slave_accredit_when_ready (Gd +@@ -287,29 +297,31 @@ gdm_simple_slave_accredit_when_ready (Gd static void on_session_authorized (GdmSession *session, @@ -4539,7 +4548,7 @@ } static gboolean -@@ -385,31 +395,38 @@ start_session_timeout (GdmSimpleSlave *s +@@ -385,31 +397,38 @@ start_session_timeout (GdmSimpleSlave *s g_free (auth_file); @@ -4581,7 +4590,7 @@ const char *message, GdmSimpleSlave *slave) { -@@ -424,6 +441,7 @@ on_session_accreditation_failed (GdmSess +@@ -424,6 +443,7 @@ on_session_accreditation_failed (GdmSess if (! migrated) { if (slave->priv->greeter_server != NULL) { gdm_greeter_server_problem (slave->priv->greeter_server, @@ -4589,7 +4598,7 @@ _("Unable establish credentials")); } } -@@ -432,62 +450,67 @@ on_session_accreditation_failed (GdmSess +@@ -432,62 +452,67 @@ on_session_accreditation_failed (GdmSess when Xorg exits it switches to the VT it was started from. That interferes with fast user switching. */ @@ -4667,7 +4676,7 @@ if (! res) { g_warning ("Unable to send ready"); } -@@ -503,8 +526,10 @@ on_session_opened (GdmSession *sessi +@@ -503,8 +528,10 @@ on_session_opened (GdmSession *sessi gdm_greeter_server_request_timed_login (slave->priv->greeter_server, username, delay); } else { g_debug ("GdmSimpleSlave: begin auto login for user '%s'", username); @@ -4679,7 +4688,7 @@ username); } -@@ -512,6 +537,23 @@ on_session_opened (GdmSession *sessi +@@ -512,6 +539,23 @@ on_session_opened (GdmSession *sessi } static void @@ -4703,7 +4712,7 @@ on_session_selected_user_changed (GdmSession *session, const char *text, GdmSimpleSlave *slave) -@@ -596,8 +638,12 @@ create_new_session (GdmSimpleSlave *slav +@@ -596,8 +640,12 @@ create_new_session (GdmSimpleSlave *slav g_free (display_hostname); g_signal_connect (slave->priv->session, @@ -4718,7 +4727,7 @@ slave); g_signal_connect (slave->priv->session, "setup-complete", -@@ -728,12 +774,29 @@ on_greeter_session_died (GdmGreeterSessi +@@ -728,12 +776,29 @@ on_greeter_session_died (GdmGreeterSessi } static void @@ -4749,7 +4758,7 @@ } static void -@@ -742,6 +805,9 @@ on_greeter_begin_auto_login (GdmGreeterS +@@ -742,6 +807,9 @@ on_greeter_begin_auto_login (GdmGreeterS GdmSimpleSlave *slave) { g_debug ("GdmSimpleSlave: begin auto login for user '%s'", username); @@ -4759,7 +4768,7 @@ gdm_session_setup_for_user (GDM_SESSION (slave->priv->session), "gdm-autologin", username); -@@ -749,21 +815,29 @@ on_greeter_begin_auto_login (GdmGreeterS +@@ -749,21 +817,29 @@ on_greeter_begin_auto_login (GdmGreeterS static void on_greeter_begin_verification_for_user (GdmGreeterServer *greeter_server, @@ -4791,7 +4800,7 @@ } static void -@@ -771,6 +845,9 @@ on_greeter_session_selected (GdmGreeterS +@@ -771,6 +847,9 @@ on_greeter_session_selected (GdmGreeterS const char *text, GdmSimpleSlave *slave) { @@ -4801,7 +4810,7 @@ gdm_session_select_session (GDM_SESSION (slave->priv->session), text); } -@@ -779,6 +856,9 @@ on_greeter_language_selected (GdmGreeter +@@ -779,6 +858,9 @@ on_greeter_language_selected (GdmGreeter const char *text, GdmSimpleSlave *slave) { @@ -4811,7 +4820,7 @@ gdm_session_select_language (GDM_SESSION (slave->priv->session), text); } -@@ -787,6 +867,9 @@ on_greeter_layout_selected (GdmGreeterSe +@@ -787,6 +869,9 @@ on_greeter_layout_selected (GdmGreeterSe const char *text, GdmSimpleSlave *slave) { @@ -4821,7 +4830,7 @@ gdm_session_select_layout (GDM_SESSION (slave->priv->session), text); } -@@ -803,7 +886,11 @@ on_greeter_cancel (GdmGreeterServer *gre +@@ -803,7 +888,11 @@ on_greeter_cancel (GdmGreeterServer *gre GdmSimpleSlave *slave) { g_debug ("GdmSimpleSlave: Greeter cancelled"); @@ -4833,7 +4842,7 @@ } static void -@@ -813,8 +900,9 @@ on_greeter_connected (GdmGreeterServer * +@@ -813,8 +902,9 @@ on_greeter_connected (GdmGreeterServer * gboolean display_is_local; g_debug ("GdmSimpleSlave: Greeter connected"); @@ -4845,7 +4854,7 @@ g_object_get (slave, "display-is-local", &display_is_local, -@@ -828,21 +916,29 @@ on_greeter_connected (GdmGreeterServer * +@@ -828,21 +918,29 @@ on_greeter_connected (GdmGreeterServer * static void on_start_session_when_ready (GdmGreeterServer *session, @@ -4876,7 +4885,7 @@ slave->priv->start_session_when_ready = FALSE; } -@@ -850,6 +946,15 @@ static void +@@ -850,6 +948,15 @@ static void setup_server (GdmSimpleSlave *slave) { /* Set the busy cursor */ @@ -4892,7 +4901,7 @@ gdm_slave_set_busy_cursor (GDM_SLAVE (slave)); /* The root window has a background that may be useful -@@ -908,6 +1013,10 @@ start_greeter (GdmSimpleSlave *slave) +@@ -908,6 +1015,10 @@ start_greeter (GdmSimpleSlave *slave) slave->priv->greeter_server = gdm_greeter_server_new (display_id); g_signal_connect (slave->priv->greeter_server, @@ -4903,7 +4912,7 @@ "begin-auto-login", G_CALLBACK (on_greeter_begin_auto_login), slave); -@@ -1017,8 +1126,17 @@ idle_connect_to_display (GdmSimpleSlave +@@ -1017,8 +1128,17 @@ idle_connect_to_display (GdmSimpleSlave if (! enabled || delay > 0) { start_greeter (slave); create_new_session (slave); @@ -7206,7 +7215,7 @@ G_END_DECLS diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c 2009-03-04 21:03:53.146447953 -0500 @@ -0,0 +1,255 @@ +/* @@ -7465,7 +7474,7 @@ +} + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h 2009-03-04 21:03:53.147432504 -0500 @@ -0,0 +1,61 @@ +/* @@ -7795,7 +7804,7 @@ } diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c 2009-03-04 21:03:53.151447317 -0500 @@ -0,0 +1,478 @@ +/* @@ -8277,7 +8286,7 @@ + return g_hash_table_lookup (manager->priv->plugins, name); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h 2009-03-04 21:03:53.152449048 -0500 @@ -0,0 +1,66 @@ +/* @@ -8347,7 +8356,7 @@ + +#endif /* __GDM_PLUGIN_MANAGER_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.c ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.c 2009-03-04 21:03:53.153442188 -0500 @@ -0,0 +1,329 @@ +/* @@ -8680,7 +8689,7 @@ + return g_list_length (widget->priv->tasks); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.h ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.h 2009-03-04 21:03:53.154446921 -0500 @@ -0,0 +1,80 @@ +/* @@ -8826,7 +8835,7 @@ pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme, "emblem-default", diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c 2009-03-04 21:03:53.157442475 -0500 @@ -0,0 +1,186 @@ +/* @@ -9016,7 +9025,7 @@ + return was_chosen; +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h 2009-03-04 21:03:53.158446161 -0500 @@ -0,0 +1,93 @@ +/* @@ -9113,7 +9122,7 @@ + +#endif /* __GDM_CONVERSATION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c 2009-03-04 21:03:53.159446844 -0500 @@ -0,0 +1,93 @@ +/* @@ -9210,7 +9219,7 @@ + g_signal_emit (extension, signals [LOAD_FAILED], 0, error); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h 2009-03-04 21:03:53.160442079 -0500 @@ -0,0 +1,55 @@ +/* @@ -9269,7 +9278,7 @@ +G_END_DECLS +#endif /* __GDM_GREETER_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in 2009-03-04 21:03:53.161442133 -0500 @@ -0,0 +1,11 @@ +prefix=@prefix@ @@ -9284,7 +9293,7 @@ +Libs: -L${libdir} -lgdmsimplegreeter +Cflags: -I${includedir}/gdm/simple-greeter diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c 2009-03-04 21:03:53.162442257 -0500 @@ -0,0 +1,123 @@ +/* @@ -9411,7 +9420,7 @@ + 0); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h 2009-03-04 21:03:53.163442172 -0500 @@ -0,0 +1,64 @@ +/* @@ -9479,7 +9488,7 @@ + +#endif /* __GDM_TASK_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am 2009-03-04 21:03:53.164444252 -0500 @@ -0,0 +1,48 @@ +NULL = @@ -9609,7 +9618,7 @@ $(EXTRA_GREETER_LIBS) \ $(SIMPLE_GREETER_LIBS) \ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c 2009-03-04 21:03:53.167443367 -0500 @@ -0,0 +1,304 @@ +/* @@ -9917,7 +9926,7 @@ + gdm_fingerprint_extension_reset (GDM_CONVERSATION (extension)); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h 2009-03-04 21:03:53.168442094 -0500 @@ -0,0 +1,56 @@ +/* @@ -9977,7 +9986,7 @@ + +#endif /* GDM_FINGERPRINT_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint 2009-03-04 21:03:53.169450949 -0500 @@ -0,0 +1,10 @@ +#%PAM-1.0 @@ -9991,7 +10000,7 @@ +session required pam_namespace.so +session include system-auth diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am 2009-03-04 21:03:53.170444507 -0500 @@ -0,0 +1,50 @@ +NULL = @@ -10045,7 +10054,7 @@ + *~ \ + Makefile.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui 2009-03-04 21:03:53.171445819 -0500 @@ -0,0 +1,56 @@ + @@ -10105,7 +10114,7 @@ + + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c 2009-03-04 21:03:53.172450483 -0500 @@ -0,0 +1,40 @@ +/* @@ -10149,12 +10158,12 @@ + return GDM_GREETER_EXTENSION (extension); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am 2009-03-04 21:03:53.173442226 -0500 @@ -0,0 +1 @@ +SUBDIRS = password diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c 2009-03-04 21:03:53.174446121 -0500 @@ -0,0 +1,323 @@ +/* @@ -10481,7 +10490,7 @@ + gdm_password_extension_reset (GDM_CONVERSATION (extension)); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h 2009-03-04 21:03:53.175446036 -0500 @@ -0,0 +1,56 @@ +/* @@ -10541,7 +10550,7 @@ + +#endif /* GDM_PASSWORD_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password 2009-03-04 21:03:53.176442109 -0500 @@ -0,0 +1,13 @@ +#%PAM-1.0 @@ -10558,7 +10567,7 @@ +session optional pam_gnome_keyring.so auto_start +session include system-auth diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am 2009-03-04 21:03:53.177442234 -0500 @@ -0,0 +1,44 @@ +NULL = @@ -10606,7 +10615,7 @@ + *~ \ + Makefile.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui 2009-03-04 21:03:53.178442358 -0500 @@ -0,0 +1,56 @@ + @@ -10666,7 +10675,7 @@ + + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c 2009-03-04 21:03:53.179446254 -0500 @@ -0,0 +1,40 @@ +/* @@ -10710,7 +10719,7 @@ + return GDM_GREETER_EXTENSION (extension); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c 2009-03-04 21:03:53.181445175 -0500 @@ -0,0 +1,558 @@ +/* gdm-smartcard.c - smartcard object @@ -11272,7 +11281,7 @@ + return NULL; +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c 2009-03-04 21:03:53.182438804 -0500 @@ -0,0 +1,440 @@ +/* @@ -11716,7 +11725,7 @@ + gdm_smartcard_extension_reset (GDM_CONVERSATION (extension)); +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h 2009-03-04 21:03:53.184436468 -0500 @@ -0,0 +1,56 @@ +/* @@ -11776,7 +11785,7 @@ + +#endif /* GDM_SMARTCARD_EXTENSION_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h 2009-03-04 21:03:53.185432192 -0500 @@ -0,0 +1,94 @@ +/* securitycard.h - api for reading and writing data to a security card @@ -11874,7 +11883,7 @@ +G_END_DECLS +#endif /* GDM_SMARTCARD_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c 2009-03-04 21:03:53.188432285 -0500 @@ -0,0 +1,1394 @@ +/* gdm-smartcard-manager.c - object for monitoring smartcard insertion and @@ -13272,7 +13281,7 @@ +} +#endif diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h 2009-03-04 21:03:53.189434924 -0500 @@ -0,0 +1,86 @@ +/* gdm-smartcard-manager.h - object for monitoring smartcard insertion and @@ -13362,7 +13371,7 @@ +G_END_DECLS +#endif /* GDM_SMARTCARD_MANAGER_H */ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard 2009-03-04 21:03:53.190448876 -0500 @@ -0,0 +1,11 @@ +#%PAM-1.0 @@ -13377,7 +13386,7 @@ +session required pam_namespace.so +session include system-auth diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c 2009-03-04 21:03:53.191446556 -0500 @@ -0,0 +1,167 @@ +#include "config.h" @@ -13548,7 +13557,7 @@ + return 0; +} diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am 2009-03-04 21:03:53.192442070 -0500 @@ -0,0 +1,71 @@ +NULL = @@ -13623,7 +13632,7 @@ + *~ \ + Makefile.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui 2009-03-04 21:03:53.193451204 -0500 @@ -0,0 +1,56 @@ + @@ -13683,7 +13692,7 @@ + + diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c ---- /dev/null 2009-03-05 12:25:58.550012246 -0500 +--- /dev/null 2009-03-06 04:28:12.547006661 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c 2009-03-04 21:03:53.194449722 -0500 @@ -0,0 +1,40 @@ +/* Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.447 retrieving revision 1.448 diff -u -r1.447 -r1.448 --- gdm.spec 5 Mar 2009 22:44:16 -0000 1.447 +++ gdm.spec 6 Mar 2009 20:05:08 -0000 1.448 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.25.2 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -341,6 +341,12 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Fri Mar 6 2009 Ray Strode - 1:2.25.2-14 +- Reset "start session when ready" state to FALSE when starting + new greeter from existing slave. May fix problem Chris Ball + is seeing with language selection in autologin the second time + after boot up. + * Thu Mar 5 2009 Ray Strode - 1:2.25.2-13 - 2.25.2-10 fixes were actually only for timed login. Add same fix for auto login From caillon at fedoraproject.org Fri Mar 6 20:06:38 2009 From: caillon at fedoraproject.org (Christopher Aillon) Date: Fri, 6 Mar 2009 20:06:38 +0000 (UTC) Subject: rpms/epiphany-extensions/F-9 epiphany-extensions.spec,1.52,1.53 Message-ID: <20090306200638.591F170116@cvs1.fedora.phx.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany-extensions/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23006 Modified Files: epiphany-extensions.spec Log Message: * Fri Mar 06 2009 Christopher Aillon - 2.22.1-8 - Rebuild for newer gecko Index: epiphany-extensions.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/F-9/epiphany-extensions.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- epiphany-extensions.spec 4 Feb 2009 20:55:12 -0000 1.52 +++ epiphany-extensions.spec 6 Mar 2009 20:06:07 -0000 1.53 @@ -4,7 +4,7 @@ Name: epiphany-extensions Version: %{ephy_major}.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Extensions for Epiphany, the GNOME web browser ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is @@ -113,6 +113,9 @@ %changelog +* Fri Mar 06 2009 Christopher Aillon - 2.22.1-8 +- Rebuild for newer gecko + * Wed Feb 04 2009 Christopher Aillon - 2.22.1-7 - Rebuild against newer gecko From caillon at fedoraproject.org Fri Mar 6 20:07:43 2009 From: caillon at fedoraproject.org (Christopher Aillon) Date: Fri, 6 Mar 2009 20:07:43 +0000 (UTC) Subject: rpms/epiphany-extensions/F-10 epiphany-extensions.spec,1.54,1.55 Message-ID: <20090306200743.BD75170116@cvs1.fedora.phx.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany-extensions/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23408 Modified Files: epiphany-extensions.spec Log Message: * Fri Mar 06 2009 Christopher Aillon - 2.24.0-5 - Rebuild against newer gecko Index: epiphany-extensions.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/F-10/epiphany-extensions.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- epiphany-extensions.spec 4 Feb 2009 21:23:47 -0000 1.54 +++ epiphany-extensions.spec 6 Mar 2009 20:07:13 -0000 1.55 @@ -4,7 +4,7 @@ Name: epiphany-extensions Version: %{ephy_major}.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Extensions for Epiphany, the GNOME web browser ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is @@ -113,6 +113,9 @@ %changelog +* Fri Mar 06 2009 Christopher Aillon - 2.24.0-5 +- Rebuild against newer gecko + * Wed Feb 04 2009 Christopher Aillon - 2.24.0-4 - Rebuild against newer gecko From jwilson at fedoraproject.org Fri Mar 6 20:10:06 2009 From: jwilson at fedoraproject.org (Jarod Wilson) Date: Fri, 6 Mar 2009 20:10:06 +0000 (UTC) Subject: rpms/cpuspeed/devel cpuspeed.init, 1.41, 1.42 cpuspeed.spec, 1.74, 1.75 Message-ID: <20090306201006.C7A9970116@cvs1.fedora.phx.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/cpuspeed/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24069 Modified Files: cpuspeed.init cpuspeed.spec Log Message: * Fri Mar 06 2009 Jarod Wilson 1.5-5 - Fix up p4-clockmod support so start/stop/status actually report something sane to the user Index: cpuspeed.init =================================================================== RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.init,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- cpuspeed.init 3 Nov 2008 20:34:41 -0000 1.41 +++ cpuspeed.init 6 Mar 2009 20:09:36 -0000 1.42 @@ -41,6 +41,13 @@ return $? } +is_p4_clockmod() { + if [ `/sbin/lsmod | grep -c -w "p4.clockmod"` -ge 1 -a -d "/sys/devices/system/cpu/cpu0/thermal_throttle" ]; then + return 0 + fi + return 1 +} + governor_module_loaded() { # Check to see if we have a module loaded for # the current cpufreq governor @@ -137,7 +144,13 @@ # last-ditch effort for Intel proc boxes, try our neutered p4-clockmod # to get at least passive cooling support (no clock changes) /sbin/modprobe p4-clockmod 2> /dev/null - [ -d ${cpu0freqd} ] || /sbin/modprobe -r p4-clockmod 2> /dev/null + if [ -d ${cpu0freqd} ]; then + echo -n "Enabling p4-clockmod driver (passive cooling only): " + success; echo + return 0 + else + /sbin/modprobe -r p4-clockmod 2> /dev/null + fi fi fi @@ -153,9 +166,6 @@ centrino|powernow-k8|acpi-cpufreq|e_powersaver) default_governor=ondemand ;; - p4-clockmod) - default_governor=none - ;; *) default_governor=userspace ;; @@ -180,10 +190,6 @@ if [ "${governor}" == "userspace" ]; then start_cpuspeed RETVAL=$? - elif [ "${drv}" == "p4-clockmod" -a "${governor}" == "none" ]; then - echo -n "Enabling p4-clockmod driver (passive cooling only): " - success - RETVAL=0 else if [ -n "$MIN_SPEED" ]; then adjust_cpufreq scaling_min_freq $MIN_SPEED @@ -219,6 +225,10 @@ } stop() { + if [ is_p4_clockmod ]; then + echo "p4-clockmod passive cooling support cannot be stopped" + return 0 + fi [ ! -f ${cpu0freqd}/scaling_driver ] && return 0 drv=`cat ${cpu0freqd}/scaling_driver` governor_module_loaded && module_loaded=true @@ -256,13 +266,20 @@ ;; status) + if [ is_p4_clockmod ]; then + echo "p4-clockmod passive cooling is enabled" + exit 0 + fi governor_module_loaded && module_loaded=true if [ -d "$xendir" ]; then echo "Frequency scaling not supported under xen kernels" + RETVAL=0 elif [ $module_loaded == true -o ${governor} == "performance" ]; then echo "Frequency scaling enabled using ${governor} governor" + RETVAL=0 else status $prog + RETVAL="$?" fi ;; Index: cpuspeed.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- cpuspeed.spec 2 Mar 2009 20:54:35 -0000 1.74 +++ cpuspeed.spec 6 Mar 2009 20:09:36 -0000 1.75 @@ -1,7 +1,7 @@ Summary: CPU frequency adjusting daemon Name: cpuspeed Version: 1.5 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Group: System Environment/Base License: GPLv2+ @@ -81,6 +81,10 @@ exit 0 %changelog +* Fri Mar 06 2009 Jarod Wilson 1.5-5 +- Fix up p4-clockmod support so start/stop/status actually report + something sane to the user + * Mon Mar 02 2009 Jarod Wilson 1.5-4 - Fix up ExclusiveArch, now that 32-bit x86 is built i586 for F11 From rvinyard at fedoraproject.org Fri Mar 6 20:14:55 2009 From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.) Date: Fri, 6 Mar 2009 20:14:55 +0000 (UTC) Subject: rpms/papyrus/devel .cvsignore, 1.15, 1.16 papyrus.spec, 1.22, 1.23 sources, 1.15, 1.16 Message-ID: <20090306201455.A88EA70116@cvs1.fedora.phx.redhat.com> Author: rvinyard Update of /cvs/pkgs/rpms/papyrus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25227 Modified Files: .cvsignore papyrus.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/papyrus/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 5 Mar 2009 21:01:54 -0000 1.15 +++ .cvsignore 6 Mar 2009 20:14:25 -0000 1.16 @@ -1 +1 @@ -papyrus-0.10.1.tar.bz2 +papyrus-0.10.2.tar.bz2 Index: papyrus.spec =================================================================== RCS file: /cvs/pkgs/rpms/papyrus/devel/papyrus.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- papyrus.spec 5 Mar 2009 21:01:54 -0000 1.22 +++ papyrus.spec 6 Mar 2009 20:14:25 -0000 1.23 @@ -1,11 +1,11 @@ Summary: Cairo based C++ scenegraph library Name: papyrus -Version: 0.10.1 +Version: 0.10.2 Release: 1%{?dist} License: LGPLv3 URL: http://libpapyrus.sourceforge.net/ Group: System Environment/Libraries -Source: http://downloads.sourceforge.net/libpapyrus/papyrus-0.10.1.tar.bz2 +Source: http://downloads.sourceforge.net/libpapyrus/papyrus-0.10.2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.10 BuildRequires: cairomm-devel >= 1.2 @@ -117,7 +117,7 @@ %{_includedir}/papyrus-0.10/papyrus/ %dir %{_includedir}/papyrus-0.10/ %{_bindir}/papyrus-demo -%{_datadir}/papyrus-0.10.1/ +%{_datadir}/papyrus-0.10.2/ %doc ChangeLog %doc %{_datadir}/gtk-doc/html/papyrus-0.10/ @@ -147,11 +147,14 @@ %{_includedir}/papyrus-0.10/papyrus-gtkmm.h %{_includedir}/papyrus-0.10/papyrus-gtkmm/ %{_bindir}/papyrus-gtkmm-demo -%{_datadir}/papyrus-gtkmm-0.10.1/ +%{_datadir}/papyrus-gtkmm-0.10.2/ %doc AUTHORS COPYING %changelog +* Fri Mar 06 2009 Rick L Vinyard Jr - 0.10.2-1 +- New release + * Thu Mar 05 2009 Rick L Vinyard Jr - 0.10.1-1 - New release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/papyrus/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 5 Mar 2009 21:01:54 -0000 1.15 +++ sources 6 Mar 2009 20:14:25 -0000 1.16 @@ -1 +1 @@ -ed440115cf33551c533ad075058e58b2 papyrus-0.10.1.tar.bz2 +447725600876b92d509520f7ab4122da papyrus-0.10.2.tar.bz2 From rvinyard at fedoraproject.org Fri Mar 6 20:19:04 2009 From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.) Date: Fri, 6 Mar 2009 20:19:04 +0000 (UTC) Subject: rpms/papyrus/F-10 .cvsignore, 1.15, 1.16 papyrus.spec, 1.25, 1.26 sources, 1.15, 1.16 Message-ID: <20090306201904.C5CA170116@cvs1.fedora.phx.redhat.com> Author: rvinyard Update of /cvs/pkgs/rpms/papyrus/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26180 Modified Files: .cvsignore papyrus.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/papyrus/F-10/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 5 Mar 2009 21:02:23 -0000 1.15 +++ .cvsignore 6 Mar 2009 20:18:34 -0000 1.16 @@ -1 +1 @@ -papyrus-0.10.1.tar.bz2 +papyrus-0.10.2.tar.bz2 Index: papyrus.spec =================================================================== RCS file: /cvs/pkgs/rpms/papyrus/F-10/papyrus.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- papyrus.spec 5 Mar 2009 21:02:23 -0000 1.25 +++ papyrus.spec 6 Mar 2009 20:18:34 -0000 1.26 @@ -1,11 +1,11 @@ Summary: Cairo based C++ scenegraph library Name: papyrus -Version: 0.10.1 +Version: 0.10.2 Release: 1%{?dist} License: LGPLv3 URL: http://libpapyrus.sourceforge.net/ Group: System Environment/Libraries -Source: http://downloads.sourceforge.net/libpapyrus/papyrus-0.10.1.tar.bz2 +Source: http://downloads.sourceforge.net/libpapyrus/papyrus-0.10.2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.10 BuildRequires: cairomm-devel >= 1.2 @@ -117,7 +117,7 @@ %{_includedir}/papyrus-0.10/papyrus/ %dir %{_includedir}/papyrus-0.10/ %{_bindir}/papyrus-demo -%{_datadir}/papyrus-0.10.1/ +%{_datadir}/papyrus-0.10.2/ %doc ChangeLog %doc %{_datadir}/gtk-doc/html/papyrus-0.10/ @@ -147,11 +147,14 @@ %{_includedir}/papyrus-0.10/papyrus-gtkmm.h %{_includedir}/papyrus-0.10/papyrus-gtkmm/ %{_bindir}/papyrus-gtkmm-demo -%{_datadir}/papyrus-gtkmm-0.10.1/ +%{_datadir}/papyrus-gtkmm-0.10.2/ %doc AUTHORS COPYING %changelog +* Fri Mar 06 2009 Rick L Vinyard Jr - 0.10.2-1 +- New release + * Thu Mar 05 2009 Rick L Vinyard Jr - 0.10.1-1 - New release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/papyrus/F-10/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 5 Mar 2009 21:02:23 -0000 1.15 +++ sources 6 Mar 2009 20:18:34 -0000 1.16 @@ -1 +1 @@ -ed440115cf33551c533ad075058e58b2 papyrus-0.10.1.tar.bz2 +447725600876b92d509520f7ab4122da papyrus-0.10.2.tar.bz2 From pkgdb at fedoraproject.org Fri Mar 6 20:20:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:20:32 +0000 Subject: [pkgdb] nwsserver was added for spot Message-ID: <20090306202031.C456A20820B@bastion.fedora.phx.redhat.com> spot has added Package nwsserver with summary NetWorkSpaces Server for clustering of scripting languages spot has approved Package nwsserver spot has added a Fedora devel branch for nwsserver with an owner of spot spot has approved nwsserver in Fedora devel spot has approved Package nwsserver spot has set commit to Approved for provenpackager on nwsserver (Fedora devel) spot has set build to Approved for provenpackager on nwsserver (Fedora devel) spot has set checkout to Approved for provenpackager on nwsserver (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nwsserver From pkgdb at fedoraproject.org Fri Mar 6 20:20:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:20:34 +0000 Subject: [pkgdb] nwsserver (Fedora, 10) updated by spot Message-ID: <20090306202034.EF612208543@bastion.fedora.phx.redhat.com> spot added a Fedora 10 branch for nwsserver spot has set commit to Approved for provenpackager on nwsserver (Fedora 10) spot has set build to Approved for provenpackager on nwsserver (Fedora 10) spot has set checkout to Approved for provenpackager on nwsserver (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nwsserver From pkgdb at fedoraproject.org Fri Mar 6 20:20:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:20:34 +0000 Subject: [pkgdb] nwsserver (Fedora, 9) updated by spot Message-ID: <20090306202035.03FB9208545@bastion.fedora.phx.redhat.com> spot added a Fedora 9 branch for nwsserver spot has set commit to Approved for provenpackager on nwsserver (Fedora 9) spot has set build to Approved for provenpackager on nwsserver (Fedora 9) spot has set checkout to Approved for provenpackager on nwsserver (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nwsserver From spot at fedoraproject.org Fri Mar 6 20:19:59 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Fri, 6 Mar 2009 20:19:59 +0000 (UTC) Subject: rpms/nwsserver - New directory Message-ID: <20090306201959.4AFF970116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nwsserver In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsp26779/rpms/nwsserver Log Message: Directory /cvs/pkgs/rpms/nwsserver added to the repository From spot at fedoraproject.org Fri Mar 6 20:19:59 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Fri, 6 Mar 2009 20:19:59 +0000 (UTC) Subject: rpms/nwsserver/devel - New directory Message-ID: <20090306201959.9B1D270118@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nwsserver/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsp26779/rpms/nwsserver/devel Log Message: Directory /cvs/pkgs/rpms/nwsserver/devel added to the repository From spot at fedoraproject.org Fri Mar 6 20:20:19 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Fri, 6 Mar 2009 20:20:19 +0000 (UTC) Subject: rpms/nwsserver Makefile,NONE,1.1 Message-ID: <20090306202019.08C3B70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nwsserver In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsp26779/rpms/nwsserver Added Files: Makefile Log Message: Setup of module nwsserver --- NEW FILE Makefile --- # Top level Makefile for module nwsserver all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From spot at fedoraproject.org Fri Mar 6 20:20:20 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Fri, 6 Mar 2009 20:20:20 +0000 (UTC) Subject: rpms/nwsserver/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090306202020.B76EA70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nwsserver/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsp26779/rpms/nwsserver/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nwsserver --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: nwsserver # $Id: Makefile,v 1.1 2009/03/06 20:20:20 spot Exp $ NAME := nwsserver SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From rdieter at fedoraproject.org Fri Mar 6 20:22:54 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 20:22:54 +0000 (UTC) Subject: rpms/kaffeine/devel kaffeine.spec,1.21,1.22 Message-ID: <20090306202254.CD7E070116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kaffeine/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27726 Modified Files: kaffeine.spec Log Message: * Fri Mar 06 2009 Rex Dieter - 0.8.7-5 - s/nonfree/freeworld/ - --without-dvb (f11+) Index: kaffeine.spec =================================================================== RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- kaffeine.spec 25 Feb 2009 10:07:50 -0000 1.21 +++ kaffeine.spec 6 Mar 2009 20:22:24 -0000 1.22 @@ -1,25 +1,28 @@ -%if 0%{?fedora} > 4 || 0%{?rhel} > 4 -%define _with_gstreamer --with-gstreamer -BuildRequires: libXext-devel libXinerama-devel libXtst-devel +%if 0%{?fedora} > 6 || 0%{?rhel} > 5 +%define kdelibs3 kdelibs3 +BuildRequires: libxcb-devel +%else +%define kdelibs3 kdelibs +BuildRequires: libutempter-devel %endif -%if 0%{?fedora} > 7 -# make -libs subpkg -%define libs 1 -%endif +## define to build freeworld bits (for that other repo) +#define freeworld 1 -## define to build nonfree bits (for that other repo) -#define nonfree 1 +# FIXME +%if 0%{?fedora} > 10 +%define _without_dvb --without-dvb +%endif Version: 0.8.7 Release: 4%{?dist} -%if 0%{?nonfree:1} == 0 +%if 0%{?freeworld:1} == 0 # Fedora Review: http://bugzilla.redhat.com/213432 Name: kaffeine %else -Name: kaffeine-extras-nonfree +Name: kaffeine-freeworld %endif License: GPLv2+ @@ -35,31 +38,25 @@ BuildRequires: cdparanoia-devel cdparanoia BuildRequires: gettext -# dvb -BuildRequires: glibc-kernheaders -%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10} -%if 0%{?fedora} > 6 || 0%{?rhel} > 5 -BuildRequires: kdelibs3-devel -BuildRequires: libxcb-devel -%else -BuildRequires: kdelibs-devel -%endif +BuildRequires: gstreamer-plugins-base-devel gstreamer-devel +BuildRequires: %{kdelibs3}-devel BuildRequires: libvorbis-devel +BuildRequires: libXext-devel libXinerama-devel libXtst-devel BuildRequires: xine-lib-devel -%if 0%{?nonfree:1} +%if 0%{?freeworld:1} Requires: kaffeine = %{version} %define _with_lame --with-lame %{?_with_lame:BuildRequires: lame-devel} %if 0%{?fedora} > 4 # can view dvd's if libdvdcss is available -Requires(hint): libdvdcss -# extra/nonfree codec support -Requires(hint): xine-lib-extras-nonfree +#Requires(hint): libdvdcss +# extra/freeworld codec support +Requires(hint): xine-lib-extras-freeworld %endif %description -Nonfree support bits for kaffeine, including DVD playback, MP3 +Extra "freeworld" support bits for kaffeine, including DVD playback, MP3 decoding, as well as extended audio/video codec support. %else @@ -83,19 +80,17 @@ Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: kdelibs3-devel +Requires: %{kdelibs3}-devel %description devel %{summary}. -%if 0%{?libs} %package libs -Summary: %{name} runtime libraries +Summary: Runtime libraries for %{name} Group: System Environment/Libraries # include to be paranoid, installing libs-only is still mostly untested -- Rex Requires: %{name} = %{version}-%{release} %description libs %{summary}. -%endif %endif @@ -123,10 +118,11 @@ --disable-debug --disable-warnings \ --disable-dependency-tracking --disable-final \ --with-extra-includes=%{_includedir}/cdda \ - %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \ + --with-gstreamer \ + %{?_without_dvb} %{!?_without_dvb:--with-dvb} \ %{?_with_lame} %{!?_with_lame:--without-lame} -%if 0%{?nonfree:1} +%if 0%{?freeworld:1} make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins %else make %{?_smp_mflags} @@ -136,7 +132,7 @@ %install rm -rf %{buildroot} -%if 0%{?nonfree:1} +%if 0%{?freeworld:1} make install DESTDIR=%{buildroot} -C kaffeine/src/input/disc/plugins/mp3lame %else make install DESTDIR=%{buildroot} @@ -171,7 +167,7 @@ rm -rf %{buildroot} -%if 0%{?nonfree:1} +%if 0%{?freeworld:1} %files %defattr(-,root,root,-) %{_libdir}/kde3/libkaffeinemp3lame.* @@ -204,7 +200,7 @@ %{_libdir}/libkaffeinepart.so %{_libdir}/kde3/lib*.* %{_datadir}/appl*/*/*.desktop -%{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/} +%{_datadir}/apps/gstreamerpart/ %{_datadir}/apps/kaffeine/ %{_datadir}/apps/konqueror/servicemenus/*.desktop %{_datadir}/apps/profiles/ @@ -228,6 +224,10 @@ %changelog +* Fri Mar 06 2009 Rex Dieter - 0.8.7-5 +- s/nonfree/freeworld/ +- --without-dvb (f11+) + * Wed Feb 25 2009 Fedora Release Engineering - 0.8.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caillon at fedoraproject.org Fri Mar 6 20:23:53 2009 From: caillon at fedoraproject.org (Christopher Aillon) Date: Fri, 6 Mar 2009 20:23:53 +0000 (UTC) Subject: rpms/totem/F-9 totem.spec,1.197,1.198 Message-ID: <20090306202353.5D10870116@cvs1.fedora.phx.redhat.com> Author: caillon Update of /cvs/extras/rpms/totem/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28304 Modified Files: totem.spec Log Message: * Fri Mar 06 2009 Christopher Aillon - 2.23.2-12 - BuildRequire: gail-devel Index: totem.spec =================================================================== RCS file: /cvs/extras/rpms/totem/F-9/totem.spec,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- totem.spec 6 Mar 2009 10:55:10 -0000 1.197 +++ totem.spec 6 Mar 2009 20:23:23 -0000 1.198 @@ -11,7 +11,7 @@ Summary: Movie player for GNOME Name: totem Version: 2.23.2 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 with exception Group: Applications/Multimedia URL: http://www.gnome.org/projects/totem/ @@ -56,6 +56,7 @@ BuildRequires: tracker-devel BuildRequires: libepc-devel BuildRequires: totem-pl-parser-devel +BuildRequires: gail-devel # For the xulrunner patch BuildRequires: intltool autoconf automake libtool gettext check-devel @@ -436,6 +437,9 @@ %endif %changelog +* Fri Mar 06 2009 Christopher Aillon - 2.23.2-12 +- BuildRequire: gail-devel + * Fri Mar 06 2009 Jan Horak - 2.23.2-11 - Rebuild against newer gecko From spot at fedoraproject.org Fri Mar 6 20:24:30 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Fri, 6 Mar 2009 20:24:30 +0000 (UTC) Subject: rpms/nwsserver/devel import.log, NONE, 1.1 nwsserver.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306202430.885CF70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nwsserver/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28433/devel Modified Files: .cvsignore sources Added Files: import.log nwsserver.spec Log Message: initial import --- NEW FILE import.log --- nwsserver-1_5_2-1_fc11:HEAD:nwsserver-1.5.2-1.fc11.src.rpm:1236370853 --- NEW FILE nwsserver.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: nwsserver Summary: NetWorkSpaces Server for clustering of scripting languages Version: 1.5.2 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools Source0: http://downloads.sourceforge.net/nws-r/%{name}-%{version}.tar.gz URL: http://www.lindaspaces.com/products/NWS_overview.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: python-twisted >= 2.1 Requires: python-twisted-web >= 0.5 %description NetWorkSpaces (NWS) is a powerful, open-source software package that makes it easy to use clusters from within scripting languages like Python, R, and Matlab. It uses a Space-based approach, similar to JavaSpaces (TM) for example, that makes it easier to write distributed applications. NWS looks and feels like a conventional workspace in the base scripting language, enables network script processes to share data, provides general distributed/parallel script execution, runs network script processes either uncoupled or coordinated, and dramatically increases developer productivity in implementing and maintaining distributed applications because of its anonymous communication. %prep %setup -q %build %{__python} setup.py build %install rm -rf %{buildroot} NWS_TAC_DIR=%{_sysconfdir} %{__python} setup.py install --skip-build --root %{buildroot} rm -rf %{buildroot}%{_prefix}/nws-server %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README PKG-INFO %config(noreplace) %{_sysconfdir}/nws.tac %{python_sitelib}/nwss/ %{python_sitelib}/%{name}-%{version}-py*.egg-info %changelog * Fri Oct 17 2008 Tom "spot" Callaway 1.5.2-1 - initial version for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nwsserver/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Mar 2009 20:20:20 -0000 1.1 +++ .cvsignore 6 Mar 2009 20:24:00 -0000 1.2 @@ -0,0 +1 @@ +nwsserver-1.5.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nwsserver/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Mar 2009 20:20:20 -0000 1.1 +++ sources 6 Mar 2009 20:24:00 -0000 1.2 @@ -0,0 +1 @@ +d321ae5fd3a363167ac27f7959b56c8a nwsserver-1.5.2.tar.gz From pkgdb at fedoraproject.org Fri Mar 6 20:25:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:25:29 +0000 Subject: [pkgdb] uml_utilities had acl change status Message-ID: <20090306202528.1595520820B@bastion.fedora.phx.redhat.com> pwouters has set the watchcommits acl on uml_utilities (Fedora 9) to Approved for chkr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From mdehaan at fedoraproject.org Fri Mar 6 20:24:44 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:24:44 +0000 (UTC) Subject: rpms/cobbler/EL-4 cobbler.spec,1.60,1.61 sources,1.61,1.62 Message-ID: <20090306202444.6417C70116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28107/EL-4 Modified Files: cobbler.spec sources Log Message: This is cobbler 1.4.3 This release is dedicated to all those people who never had a release dedicated to them. What about those people, eh? Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- cobbler.spec 12 Feb 2009 19:00:49 -0000 1.60 +++ cobbler.spec 6 Mar 2009 20:24:14 -0000 1.61 @@ -1,8 +1,9 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%define _binaries_in_noarch_packages_terminate_build 0 Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -21,6 +22,8 @@ Requires: createrepo Requires: python-cheetah Requires: rsync +Requires: PyYAML +Requires: libyaml %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 Requires: genisoimage %else @@ -179,11 +182,9 @@ %config(noreplace) /etc/cobbler/acls.conf %config(noreplace) /etc/cobbler/cheetah_macros %dir %{python_sitelib}/cobbler -%dir %{python_sitelib}/cobbler/yaml %dir %{python_sitelib}/cobbler/modules %dir %{python_sitelib}/cobbler/webui %{python_sitelib}/cobbler/*.py* -%{python_sitelib}/cobbler/yaml/*.py* %{python_sitelib}/cobbler/server/*.py* %{python_sitelib}/cobbler/modules/*.py* %{python_sitelib}/cobbler/webui/*.py* @@ -281,6 +282,10 @@ %changelog +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-1 +- Upstream changes (see CHANGELOG) +- Now requires PyYAML + * Thu Feb 12 2009 Michael DeHaan - 1.4.2-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 12 Feb 2009 19:00:49 -0000 1.61 +++ sources 6 Mar 2009 20:24:14 -0000 1.62 @@ -1,2 +1,2 @@ a85b0ddfb7186f7ea5ed327f1be9c6dc cobbler-1.4.1.tar.gz -08f72c9ed10fe18b414d6a0b7942bc65 cobbler-1.4.2.tar.gz +c01262fa7403643f4b2905ce6fd94030 cobbler-1.4.2.tar.gz From mdehaan at fedoraproject.org Fri Mar 6 20:24:44 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:24:44 +0000 (UTC) Subject: rpms/cobbler/EL-5 cobbler.spec,1.62,1.63 sources,1.64,1.65 Message-ID: <20090306202444.CE40270116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28107/EL-5 Modified Files: cobbler.spec sources Log Message: This is cobbler 1.4.3 This release is dedicated to all those people who never had a release dedicated to them. What about those people, eh? Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- cobbler.spec 12 Feb 2009 19:00:50 -0000 1.62 +++ cobbler.spec 6 Mar 2009 20:24:14 -0000 1.63 @@ -1,8 +1,9 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%define _binaries_in_noarch_packages_terminate_build 0 Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -21,6 +22,8 @@ Requires: createrepo Requires: python-cheetah Requires: rsync +Requires: PyYAML +Requires: libyaml %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 Requires: genisoimage %else @@ -179,11 +182,9 @@ %config(noreplace) /etc/cobbler/acls.conf %config(noreplace) /etc/cobbler/cheetah_macros %dir %{python_sitelib}/cobbler -%dir %{python_sitelib}/cobbler/yaml %dir %{python_sitelib}/cobbler/modules %dir %{python_sitelib}/cobbler/webui %{python_sitelib}/cobbler/*.py* -%{python_sitelib}/cobbler/yaml/*.py* %{python_sitelib}/cobbler/server/*.py* %{python_sitelib}/cobbler/modules/*.py* %{python_sitelib}/cobbler/webui/*.py* @@ -281,6 +282,10 @@ %changelog +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-1 +- Upstream changes (see CHANGELOG) +- Now requires PyYAML + * Thu Feb 12 2009 Michael DeHaan - 1.4.2-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- sources 12 Feb 2009 19:00:50 -0000 1.64 +++ sources 6 Mar 2009 20:24:14 -0000 1.65 @@ -1,2 +1,2 @@ a85b0ddfb7186f7ea5ed327f1be9c6dc cobbler-1.4.1.tar.gz -08f72c9ed10fe18b414d6a0b7942bc65 cobbler-1.4.2.tar.gz +c01262fa7403643f4b2905ce6fd94030 cobbler-1.4.2.tar.gz From mdehaan at fedoraproject.org Fri Mar 6 20:24:45 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:24:45 +0000 (UTC) Subject: rpms/cobbler/F-10 cobbler.spec,1.65,1.66 sources,1.62,1.63 Message-ID: <20090306202445.349FE70116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28107/F-10 Modified Files: cobbler.spec sources Log Message: This is cobbler 1.4.3 This release is dedicated to all those people who never had a release dedicated to them. What about those people, eh? Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-10/cobbler.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- cobbler.spec 12 Feb 2009 19:00:50 -0000 1.65 +++ cobbler.spec 6 Mar 2009 20:24:14 -0000 1.66 @@ -1,8 +1,9 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%define _binaries_in_noarch_packages_terminate_build 0 Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -21,6 +22,8 @@ Requires: createrepo Requires: python-cheetah Requires: rsync +Requires: PyYAML +Requires: libyaml %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 Requires: genisoimage %else @@ -179,11 +182,9 @@ %config(noreplace) /etc/cobbler/acls.conf %config(noreplace) /etc/cobbler/cheetah_macros %dir %{python_sitelib}/cobbler -%dir %{python_sitelib}/cobbler/yaml %dir %{python_sitelib}/cobbler/modules %dir %{python_sitelib}/cobbler/webui %{python_sitelib}/cobbler/*.py* -%{python_sitelib}/cobbler/yaml/*.py* %{python_sitelib}/cobbler/server/*.py* %{python_sitelib}/cobbler/modules/*.py* %{python_sitelib}/cobbler/webui/*.py* @@ -281,6 +282,10 @@ %changelog +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-1 +- Upstream changes (see CHANGELOG) +- Now requires PyYAML + * Thu Feb 12 2009 Michael DeHaan - 1.4.2-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-10/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 12 Feb 2009 19:00:50 -0000 1.62 +++ sources 6 Mar 2009 20:24:14 -0000 1.63 @@ -1,2 +1,2 @@ a85b0ddfb7186f7ea5ed327f1be9c6dc cobbler-1.4.1.tar.gz -08f72c9ed10fe18b414d6a0b7942bc65 cobbler-1.4.2.tar.gz +c01262fa7403643f4b2905ce6fd94030 cobbler-1.4.2.tar.gz From pkgdb at fedoraproject.org Fri Mar 6 20:24:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:24:42 +0000 Subject: [pkgdb] uml_utilities had acl change status Message-ID: <20090306202530.C85AE208201@bastion.fedora.phx.redhat.com> pwouters has set the commit acl on uml_utilities (Fedora 9) to Approved for chkr To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/uml_utilities From mdehaan at fedoraproject.org Fri Mar 6 20:24:45 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:24:45 +0000 (UTC) Subject: rpms/cobbler/F-9 cobbler.spec,1.62,1.63 sources,1.60,1.61 Message-ID: <20090306202445.A9BEC70116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28107/F-9 Modified Files: cobbler.spec sources Log Message: This is cobbler 1.4.3 This release is dedicated to all those people who never had a release dedicated to them. What about those people, eh? Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-9/cobbler.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- cobbler.spec 12 Feb 2009 19:00:50 -0000 1.62 +++ cobbler.spec 6 Mar 2009 20:24:15 -0000 1.63 @@ -1,8 +1,9 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%define _binaries_in_noarch_packages_terminate_build 0 Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -21,6 +22,8 @@ Requires: createrepo Requires: python-cheetah Requires: rsync +Requires: PyYAML +Requires: libyaml %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 Requires: genisoimage %else @@ -179,11 +182,9 @@ %config(noreplace) /etc/cobbler/acls.conf %config(noreplace) /etc/cobbler/cheetah_macros %dir %{python_sitelib}/cobbler -%dir %{python_sitelib}/cobbler/yaml %dir %{python_sitelib}/cobbler/modules %dir %{python_sitelib}/cobbler/webui %{python_sitelib}/cobbler/*.py* -%{python_sitelib}/cobbler/yaml/*.py* %{python_sitelib}/cobbler/server/*.py* %{python_sitelib}/cobbler/modules/*.py* %{python_sitelib}/cobbler/webui/*.py* @@ -281,6 +282,10 @@ %changelog +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-1 +- Upstream changes (see CHANGELOG) +- Now requires PyYAML + * Thu Feb 12 2009 Michael DeHaan - 1.4.2-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-9/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- sources 12 Feb 2009 19:00:50 -0000 1.60 +++ sources 6 Mar 2009 20:24:15 -0000 1.61 @@ -1,2 +1,2 @@ a85b0ddfb7186f7ea5ed327f1be9c6dc cobbler-1.4.1.tar.gz -08f72c9ed10fe18b414d6a0b7942bc65 cobbler-1.4.2.tar.gz +c01262fa7403643f4b2905ce6fd94030 cobbler-1.4.2.tar.gz From jwilson at fedoraproject.org Fri Mar 6 20:24:57 2009 From: jwilson at fedoraproject.org (Jarod Wilson) Date: Fri, 6 Mar 2009 20:24:57 +0000 (UTC) Subject: rpms/kernel/devel cpufreq-add-atom-to-p4-clockmod.patch, NONE, 1.1 kernel.spec, 1.1393, 1.1394 Message-ID: <20090306202457.5B9BF70116@cvs1.fedora.phx.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28679 Modified Files: kernel.spec Added Files: cpufreq-add-atom-to-p4-clockmod.patch Log Message: * Fri Mar 06 2009 Jarod Wilson - add atom to p4-clockmod for thermal mgmt benefits for the atom procs that don't do freq scaling (lookin' at you, atom 330) cpufreq-add-atom-to-p4-clockmod.patch: --- NEW FILE cpufreq-add-atom-to-p4-clockmod.patch --- cpufreq: add atom family to p4-clockmod Some atom procs don't do freq scaling (such as the atom 330 on my own littlefalls2 board). By adding the atom family here, we at least get the benefit of passive cooling in a thermal emergency. Not sure how to see that its actually helping any, but the driver does bind and claim its functioning on my atom 330. Signed-off-by: Jarod Wilson --- arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c index b585e04..b0c02a1 100644 --- a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c +++ b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c @@ -161,6 +161,7 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c) case 0x0E: /* Core */ case 0x0F: /* Core Duo */ case 0x16: /* Celeron Core */ + case 0x1C: /* Atom */ p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS; return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PCORE); case 0x0D: /* Pentium M (Dothan) */ Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1393 retrieving revision 1.1394 diff -u -r1.1393 -r1.1394 --- kernel.spec 6 Mar 2009 14:50:02 -0000 1.1393 +++ kernel.spec 6 Mar 2009 20:24:27 -0000 1.1394 @@ -684,6 +684,8 @@ Patch9001: revert-fix-modules_install-via-nfs.patch +Patch9002: cpufreq-add-atom-to-p4-clockmod.patch + %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1223,6 +1225,8 @@ ApplyPatch linux-2.6.28-lockd-svc-register.patch +ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch + # END OF PATCH APPLICATIONS %endif @@ -1807,6 +1811,10 @@ %changelog * Fri Mar 06 2009 Jarod Wilson +- add atom to p4-clockmod for thermal mgmt benefits for the atom + procs that don't do freq scaling (lookin' at you, atom 330) + +* Fri Mar 06 2009 Jarod Wilson - kernel-devel also needs include/crypto headers * Fri Mar 06 2009 Mauro Carvalho Chehab From mdehaan at fedoraproject.org Fri Mar 6 20:24:45 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:24:45 +0000 (UTC) Subject: rpms/cobbler/devel cobbler.spec,1.72,1.73 sources,1.62,1.63 Message-ID: <20090306202445.EFD3570116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28107/devel Modified Files: cobbler.spec sources Log Message: This is cobbler 1.4.3 This release is dedicated to all those people who never had a release dedicated to them. What about those people, eh? Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- cobbler.spec 26 Feb 2009 16:34:39 -0000 1.72 +++ cobbler.spec 6 Mar 2009 20:24:15 -0000 1.73 @@ -3,8 +3,8 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 1.4.2 -Release: 5%{?dist} +Version: 1.4.3 +Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -22,6 +22,8 @@ Requires: createrepo Requires: python-cheetah Requires: rsync +Requires: PyYAML +Requires: libyaml %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 Requires: genisoimage %else @@ -180,11 +182,9 @@ %config(noreplace) /etc/cobbler/acls.conf %config(noreplace) /etc/cobbler/cheetah_macros %dir %{python_sitelib}/cobbler -%dir %{python_sitelib}/cobbler/yaml %dir %{python_sitelib}/cobbler/modules %dir %{python_sitelib}/cobbler/webui %{python_sitelib}/cobbler/*.py* -%{python_sitelib}/cobbler/yaml/*.py* %{python_sitelib}/cobbler/server/*.py* %{python_sitelib}/cobbler/modules/*.py* %{python_sitelib}/cobbler/webui/*.py* @@ -281,12 +281,10 @@ %changelog -* Thu Feb 26 2009 Michael DeHaan - 1.4.2-5 -- Allow binaries that we serve up to other arches - -* Tue Feb 24 2009 Fedora Release Engineering - 1.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-1 +- Upstream changes (see CHANGELOG) +- Now requires PyYAML * Thu Feb 12 2009 Michael DeHaan - 1.4.2-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 12 Feb 2009 19:00:50 -0000 1.62 +++ sources 6 Mar 2009 20:24:15 -0000 1.63 @@ -1,2 +1,2 @@ a85b0ddfb7186f7ea5ed327f1be9c6dc cobbler-1.4.1.tar.gz -08f72c9ed10fe18b414d6a0b7942bc65 cobbler-1.4.2.tar.gz +c01262fa7403643f4b2905ce6fd94030 cobbler-1.4.2.tar.gz From rdieter at fedoraproject.org Fri Mar 6 20:25:32 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 20:25:32 +0000 (UTC) Subject: rpms/kaffeine/devel kaffeine.spec,1.22,1.23 Message-ID: <20090306202532.A358870116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kaffeine/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28982 Modified Files: kaffeine.spec Log Message: Release++ Index: kaffeine.spec =================================================================== RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- kaffeine.spec 6 Mar 2009 20:22:24 -0000 1.22 +++ kaffeine.spec 6 Mar 2009 20:25:02 -0000 1.23 @@ -16,7 +16,7 @@ %endif Version: 0.8.7 -Release: 4%{?dist} +Release: 5%{?dist} %if 0%{?freeworld:1} == 0 # Fedora Review: http://bugzilla.redhat.com/213432 From caillon at fedoraproject.org Fri Mar 6 20:27:56 2009 From: caillon at fedoraproject.org (Christopher Aillon) Date: Fri, 6 Mar 2009 20:27:56 +0000 (UTC) Subject: rpms/epiphany-extensions/F-9 epiphany-extensions.spec,1.53,1.54 Message-ID: <20090306202756.4FBE270116@cvs1.fedora.phx.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany-extensions/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29876 Modified Files: epiphany-extensions.spec Log Message: * Fri Mar 06 2009 Christopher Aillon - 2.22.1-8 - Rebuild for newer gecko Index: epiphany-extensions.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/F-9/epiphany-extensions.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- epiphany-extensions.spec 6 Mar 2009 20:06:07 -0000 1.53 +++ epiphany-extensions.spec 6 Mar 2009 20:27:25 -0000 1.54 @@ -1,6 +1,6 @@ %global ephy_major 2.22 %global ephy_min_version %{ephy_major}.0 -%global gecko_version 1.9.0.6 +%global gecko_version 1.9.0.7 Name: epiphany-extensions Version: %{ephy_major}.1 From caillon at fedoraproject.org Fri Mar 6 20:28:13 2009 From: caillon at fedoraproject.org (Christopher Aillon) Date: Fri, 6 Mar 2009 20:28:13 +0000 (UTC) Subject: rpms/epiphany-extensions/F-10 epiphany-extensions.spec,1.55,1.56 Message-ID: <20090306202813.4148870116@cvs1.fedora.phx.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany-extensions/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29949 Modified Files: epiphany-extensions.spec Log Message: * Fri Mar 06 2009 Christopher Aillon - 2.24.0-5 - Rebuild against newer gecko Index: epiphany-extensions.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/F-10/epiphany-extensions.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- epiphany-extensions.spec 6 Mar 2009 20:07:13 -0000 1.55 +++ epiphany-extensions.spec 6 Mar 2009 20:27:42 -0000 1.56 @@ -1,6 +1,6 @@ %global ephy_major 2.24 %global ephy_min_version %{ephy_major}.0 -%global gecko_version 1.9.0.6 +%global gecko_version 1.9.0.7 Name: epiphany-extensions Version: %{ephy_major}.0 From spot at fedoraproject.org Fri Mar 6 20:28:58 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Fri, 6 Mar 2009 20:28:58 +0000 (UTC) Subject: rpms/nwsserver/F-9 nwsserver.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090306202858.DB7F970118@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nwsserver/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30058/F-9 Modified Files: sources Added Files: nwsserver.spec Log Message: initial branching --- NEW FILE nwsserver.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: nwsserver Summary: NetWorkSpaces Server for clustering of scripting languages Version: 1.5.2 Release: 2%{?dist} License: GPLv2+ Group: Development/Tools Source0: http://downloads.sourceforge.net/nws-r/%{name}-%{version}.tar.gz URL: http://www.lindaspaces.com/products/NWS_overview.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: python-twisted >= 2.1 Requires: python-twisted-web >= 0.5 %description NetWorkSpaces (NWS) is a powerful, open-source software package that makes it easy to use clusters from within scripting languages like Python, R, and Matlab. It uses a Space-based approach that makes it easier to write distributed applications. NWS looks and feels like a conventional workspace in the base scripting language, enables network script processes to share data, provides general distributed/parallel script execution, runs network script processes either uncoupled or coordinated, and dramatically increases developer productivity in implementing and maintaining distributed applications because of its anonymous communication. %prep %setup -q %build %{__python} setup.py build %install rm -rf %{buildroot} NWS_TAC_DIR=%{_sysconfdir} %{__python} setup.py install --skip-build --root %{buildroot} rm -rf %{buildroot}%{_prefix}/nws-server %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README PKG-INFO %config(noreplace) %{_sysconfdir}/nws.tac %{python_sitelib}/nwss/ %{python_sitelib}/%{name}-%{version}-py*.egg-info %changelog * Fri Mar 6 2009 Tom "spot" Callaway 1.5.2-2 - fix description * Fri Oct 17 2008 Tom "spot" Callaway 1.5.2-1 - initial version for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nwsserver/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Mar 2009 20:20:20 -0000 1.1 +++ sources 6 Mar 2009 20:28:28 -0000 1.2 @@ -0,0 +1 @@ +d321ae5fd3a363167ac27f7959b56c8a nwsserver-1.5.2.tar.gz From spot at fedoraproject.org Fri Mar 6 20:28:58 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Fri, 6 Mar 2009 20:28:58 +0000 (UTC) Subject: rpms/nwsserver/F-10 nwsserver.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090306202858.7833D70116@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nwsserver/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30058/F-10 Modified Files: sources Added Files: nwsserver.spec Log Message: initial branching --- NEW FILE nwsserver.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: nwsserver Summary: NetWorkSpaces Server for clustering of scripting languages Version: 1.5.2 Release: 2%{?dist} License: GPLv2+ Group: Development/Tools Source0: http://downloads.sourceforge.net/nws-r/%{name}-%{version}.tar.gz URL: http://www.lindaspaces.com/products/NWS_overview.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: python-twisted >= 2.1 Requires: python-twisted-web >= 0.5 %description NetWorkSpaces (NWS) is a powerful, open-source software package that makes it easy to use clusters from within scripting languages like Python, R, and Matlab. It uses a Space-based approach that makes it easier to write distributed applications. NWS looks and feels like a conventional workspace in the base scripting language, enables network script processes to share data, provides general distributed/parallel script execution, runs network script processes either uncoupled or coordinated, and dramatically increases developer productivity in implementing and maintaining distributed applications because of its anonymous communication. %prep %setup -q %build %{__python} setup.py build %install rm -rf %{buildroot} NWS_TAC_DIR=%{_sysconfdir} %{__python} setup.py install --skip-build --root %{buildroot} rm -rf %{buildroot}%{_prefix}/nws-server %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README PKG-INFO %config(noreplace) %{_sysconfdir}/nws.tac %{python_sitelib}/nwss/ %{python_sitelib}/%{name}-%{version}-py*.egg-info %changelog * Fri Mar 6 2009 Tom "spot" Callaway 1.5.2-2 - fix description * Fri Oct 17 2008 Tom "spot" Callaway 1.5.2-1 - initial version for Fedora Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nwsserver/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Mar 2009 20:20:20 -0000 1.1 +++ sources 6 Mar 2009 20:28:28 -0000 1.2 @@ -0,0 +1 @@ +d321ae5fd3a363167ac27f7959b56c8a nwsserver-1.5.2.tar.gz From spot at fedoraproject.org Fri Mar 6 20:28:59 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Fri, 6 Mar 2009 20:28:59 +0000 (UTC) Subject: rpms/nwsserver/devel nwsserver.spec,1.1,1.2 Message-ID: <20090306202859.3B65870117@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nwsserver/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30058/devel Modified Files: nwsserver.spec Log Message: initial branching Index: nwsserver.spec =================================================================== RCS file: /cvs/pkgs/rpms/nwsserver/devel/nwsserver.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nwsserver.spec 6 Mar 2009 20:24:00 -0000 1.1 +++ nwsserver.spec 6 Mar 2009 20:28:28 -0000 1.2 @@ -3,7 +3,7 @@ Name: nwsserver Summary: NetWorkSpaces Server for clustering of scripting languages Version: 1.5.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Development/Tools Source0: http://downloads.sourceforge.net/nws-r/%{name}-%{version}.tar.gz @@ -17,14 +17,13 @@ %description NetWorkSpaces (NWS) is a powerful, open-source software package that makes it easy to use clusters from within scripting languages like Python, R, and -Matlab. It uses a Space-based approach, similar to JavaSpaces (TM) for -example, that makes it easier to write distributed applications. NWS looks and -feels like a conventional workspace in the base scripting language, enables -network script processes to share data, provides general distributed/parallel -script execution, runs network script processes either uncoupled or -coordinated, and dramatically increases developer productivity in implementing -and maintaining distributed applications because of its anonymous -communication. +Matlab. It uses a Space-based approach that makes it easier to write +distributed applications. NWS looks and feels like a conventional workspace +in the base scripting language, enables network script processes to share +data, provides general distributed/parallel script execution, runs network +script processes either uncoupled or coordinated, and dramatically increases +developer productivity in implementing and maintaining distributed +applications because of its anonymous communication. %prep %setup -q @@ -49,5 +48,8 @@ %{python_sitelib}/%{name}-%{version}-py*.egg-info %changelog +* Fri Mar 6 2009 Tom "spot" Callaway 1.5.2-2 +- fix description + * Fri Oct 17 2008 Tom "spot" Callaway 1.5.2-1 - initial version for Fedora From john5342 at fedoraproject.org Fri Mar 6 20:29:46 2009 From: john5342 at fedoraproject.org (Adrian John Wilson) Date: Fri, 6 Mar 2009 20:29:46 +0000 (UTC) Subject: rpms/qzion/devel qzion-0.4.0-fix_python_install.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 qzion.spec, 1.2, 1.3 sources, 1.2, 1.3 qzion-0.3.0-rmhardcoded.patch, 1.1, NONE Message-ID: <20090306202946.9732F70116@cvs1.fedora.phx.redhat.com> Author: john5342 Update of /cvs/pkgs/rpms/qzion/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30310/devel Modified Files: .cvsignore import.log qzion.spec sources Added Files: qzion-0.4.0-fix_python_install.patch Removed Files: qzion-0.3.0-rmhardcoded.patch Log Message: * Fri Mar 06 2009 John5342 0.4.0-1 - Updated to new upstream release (0.4.0) qzion-0.4.0-fix_python_install.patch: --- NEW FILE qzion-0.4.0-fix_python_install.patch --- diff -ur qzion-mainline/python/CMakeLists.txt qzion-mainline/python/CMakeLists.txt --- qzion-mainline/python/CMakeLists.txt 2009-02-18 21:38:44.000000000 +0000 +++ qzion-mainline/python/CMakeLists.txt 2009-03-05 20:41:10.159038865 +0000 @@ -16,9 +16,6 @@ set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG}) set(SIP_EXTRA_OPTIONS -g) -set(PYTHON_SITE_PACKAGES_DIR - ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_SHORT_VERSION}/site-packages) - # Putting inside the "concepts" package until we release. file(GLOB qzion_files_sip qzion/*.sip) set(SIP_EXTRA_FILES_DEPEND ${qzion_files_sip}) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qzion/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Dec 2008 14:14:25 -0000 1.2 +++ .cvsignore 6 Mar 2009 20:29:15 -0000 1.3 @@ -1 +1 @@ -qzion-0.3.0.tar.gz +d32223eae1bba7f1b191c334668f3f7dd662f582.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/qzion/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 21 Dec 2008 14:14:26 -0000 1.1 +++ import.log 6 Mar 2009 20:29:15 -0000 1.2 @@ -1 +1,2 @@ qzion-0_3_0-2_fc10:HEAD:qzion-0.3.0-2.fc10.src.rpm:1229868811 +qzion-0_4_0-1_fc10:HEAD:qzion-0.4.0-1.fc10.src.rpm:1236371223 Index: qzion.spec =================================================================== RCS file: /cvs/pkgs/rpms/qzion/devel/qzion.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qzion.spec 25 Feb 2009 18:34:05 -0000 1.2 +++ qzion.spec 6 Mar 2009 20:29:16 -0000 1.3 @@ -1,17 +1,27 @@ + +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + Name: qzion -Version: 0.3.0 -Release: 3%{?dist} +Version: 0.4.0 +Release: 1%{?dist} Summary: A canvas abstraction Group: System Environment/Libraries License: GPLv3+ -URL: http://dev.openbossa.org/trac/qedje/ -Source0: http://dev.openbossa.org/qedje/downloads/source/%{name}/%{name}-%{version}.tar.gz -Patch0: qzion-0.3.0-rmhardcoded.patch +URL: http://code.openbossa.org/projects/qzion +Source0: http://code.openbossa.org/projects/%{name}/repos/mainline/archive/d32223eae1bba7f1b191c334668f3f7dd662f582.tar.gz + +Patch0: qzion-0.4.0-fix_python_install.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel +BuildRequires: PyQt4-devel +BuildRequires: cmake BuildRequires: pkgconfig +BuildRequires: python-devel +BuildRequires: sip-devel %description QZion is an canvas abstraction used by and made for QEdje. @@ -20,6 +30,7 @@ Summary: Development files for %{name} Group: Development/Libraries +Requires: cmake Requires: pkgconfig Requires: %{name} = %{version}-%{release} @@ -27,25 +38,46 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%prep -%setup -q -%patch0 -p1 +%package python + +Summary: Python bindings for %{name} +Group: Development/Libraries +Requires: PyQt4 + +%description python +The %{name}-python package contains python bindings for %{name} + + +%package python-devel -#Support installing in buildroot -sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro */*/*.pro +Summary: Python bindings for %{name} +Group: Development/Libraries +Requires: sip +Requires: PyQt4-devel +Requires: %{name}-python = %{version}-%{release} +%description python-devel +The %{name}-python-devel package contains the development files for +the python bindings for %{name} + +%prep +%setup -q -n %{name}-mainline +%patch0 -p1 %build -%{_qt4_qmake} PREFIX=/usr LIBDIR=%{_libdir} -make %{?_smp_mflags} +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake} \ +-DPYTHON_SITE_PACKAGES_DIR=%{python_sitearch} \ +.. +popd + +make %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} -make install INSTALL_ROOT=%{buildroot} - -#These are apparently only needed for static linking? -find %{buildroot} -name *.prl -print -delete +make install/fast -C %{_target_platform} DESTDIR=%{buildroot} %clean rm -rf %{buildroot} @@ -67,8 +99,18 @@ %{_includedir}/* %{_libdir}/pkgconfig/%{name}.pc +%files python +%defattr(-,root,root,-) +%{python_sitearch}/%{name} + +%files python-devel +%defattr(-,root,root,-) +%{_datadir}/sip/%{name} %changelog +* Fri Mar 06 2009 John5342 0.4.0-1 +- Updated to new upstream release (0.4.0) + * Wed Feb 25 2009 Fedora Release Engineering - 0.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qzion/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Dec 2008 14:14:26 -0000 1.2 +++ sources 6 Mar 2009 20:29:16 -0000 1.3 @@ -1 +1 @@ -293cb0a9783f7111d97838fea8b6970a qzion-0.3.0.tar.gz +a9e6221d98d7abeb5ffb05b57f7d0276 d32223eae1bba7f1b191c334668f3f7dd662f582.tar.gz --- qzion-0.3.0-rmhardcoded.patch DELETED --- From hardaker at fedoraproject.org Fri Mar 6 20:30:01 2009 From: hardaker at fedoraproject.org (Wes Hardaker) Date: Fri, 6 Mar 2009 20:30:01 +0000 (UTC) Subject: rpms/dnssec-tools/F-10 .cvsignore, 1.7, 1.8 dnssec-tools.spec, 1.19, 1.20 sources, 1.8, 1.9 Message-ID: <20090306203001.DF39770116@cvs1.fedora.phx.redhat.com> Author: hardaker Update of /cvs/extras/rpms/dnssec-tools/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30602 Modified Files: .cvsignore dnssec-tools.spec sources Log Message: 1.5 update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/F-10/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 23 Jul 2008 04:14:37 -0000 1.7 +++ .cvsignore 6 Mar 2009 20:29:31 -0000 1.8 @@ -1 +1 @@ -dnssec-tools-1.4.1.tar.gz +dnssec-tools-1.5.tar.gz Index: dnssec-tools.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/F-10/dnssec-tools.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- dnssec-tools.spec 1 Dec 2008 14:57:40 -0000 1.19 +++ dnssec-tools.spec 6 Mar 2009 20:29:31 -0000 1.20 @@ -1,7 +1,7 @@ Summary: A suite of tools for managing dnssec aware DNS usage Name: dnssec-tools -Version: 1.4.1 -Release: 3%{?dist} +Version: 1.5 +Release: 1%{?dist} License: BSD Group: System Environment/Base URL: http://www.dnssec-tools.org/ @@ -28,6 +28,7 @@ %package perlmods Group: System Environment/Libraries Summary: Perl modules supporting DNSSEC (needed by the dnssec-tools) +Requires: perl(Net::DNS), perl(Net::DNS::SEC) %description perlmods @@ -97,9 +98,9 @@ %defattr(-,root,root,-) %doc README INSTALL COPYING -/etc/dnssec-tools %config(noreplace) /etc/dnssec-tools/dnssec-tools.conf %config(noreplace) /etc/dnssec-tools/dnsval.conf +/etc/dnssec-tools %{_bindir}/dnspktflow %{_bindir}/donuts @@ -108,15 +109,16 @@ %{_bindir}/expchk %{_bindir}/genkrf %{_bindir}/getdnskeys +%{_bindir}/getds %{_bindir}/lskrf %{_bindir}/maketestzone %{_bindir}/mapper %{_bindir}/zonesigner # this doesn't use %{_datadir} because patch6 above uses this exact path /usr/share/dnssec-tools -/usr/share/dnssec-tools/donuts -/usr/share/dnssec-tools/donuts/rules -/usr/share/dnssec-tools/donuts/rules/* +#/usr/share/dnssec-tools/donuts +#/usr/share/dnssec-tools/donuts/rules +#/usr/share/dnssec-tools/donuts/rules/* %{_bindir}/dtck %{_bindir}/dtconfchk @@ -139,7 +141,7 @@ %{_bindir}/libval_check_conf %{_bindir}/validate # configure above -%{_datadir}/dnssec-tools/validator-testcases +#%{_datadir}/dnssec-tools/validator-testcases %{_bindir}/getaddr %{_bindir}/gethost %{_bindir}/getname @@ -154,6 +156,8 @@ %{_bindir}/signset-editor %{_bindir}/rollrec-editor +%{_bindir}/lsdnssec + %{_mandir}/man1/dnssec-tools.1.gz %{_mandir}/man1/dnspktflow.1.gz %{_mandir}/man1/donuts.1.gz @@ -162,6 +166,7 @@ %{_mandir}/man1/expchk.1.gz %{_mandir}/man1/genkrf.1.gz %{_mandir}/man1/getdnskeys.1.gz +%{_mandir}/man1/getds.1.gz %{_mandir}/man1/lskrf.1.gz %{_mandir}/man1/keyarch.1.gz %{_mandir}/man1/maketestzone.1.gz @@ -187,6 +192,7 @@ %{_mandir}/man1/rollerd.1.gz %{_mandir}/man1/rollinit.1.gz %{_mandir}/man1/rollset.1.gz +%{_mandir}/man1/lsdnssec.1.gz %{_mandir}/man1/cleanarch.1.gz %{_mandir}/man1/blinkenlights.1.gz %{_mandir}/man1/cleankrf.1.gz @@ -211,7 +217,8 @@ # but this one is entirely ours: %{perl_vendorarch}/Net/DNS/SEC/Tools %{perl_vendorarch}/Net/addrinfo* -%{perl_vendorarch}/Net/DNS/SEC/* +%{perl_vendorarch}/Net/DNS/SEC/*.pm +%{perl_vendorarch}/Net/DNS/SEC/*.pl %{perl_vendorarch}/auto/Net/DNS/SEC %{perl_vendorarch}/auto/Net/DNS/SEC/Validator %{perl_vendorarch}/auto/Net/addrinfo/ @@ -282,6 +289,22 @@ %{_mandir}/man3/val_freeaddrinfo.3.gz %changelog +* Fri Mar 6 2009 Wes Hardaker - 1.5-1 +- Update to 1.5 + +* Tue Feb 24 2009 Fedora Release Engineering - 1.4.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 4 2009 Wes Hardaker - 1.4.1-6 +- make the perlmods module directly require the needed perl mods + mainly for directory ownership. + +* Mon Jan 26 2009 Wes Hardaker - 1.4.1-5 +- Fixed arpa header compile conflict + +* Thu Jan 15 2009 Tomas Mraz - 1.4.1-4 +- rebuild with new openssl + * Mon Dec 1 2008 Wes Hardaker - 1.4.1-3 - Added package directories we own, left out ones we don't. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnssec-tools/F-10/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 23 Jul 2008 04:14:37 -0000 1.8 +++ sources 6 Mar 2009 20:29:31 -0000 1.9 @@ -1 +1 @@ -a47cf335e43139476695191fcb005aad dnssec-tools-1.4.1.tar.gz +1063f800c49806bdac2551fcdd76505a dnssec-tools-1.5.tar.gz From pmatilai at fedoraproject.org Fri Mar 6 20:36:37 2009 From: pmatilai at fedoraproject.org (Panu Matilainen) Date: Fri, 6 Mar 2009 20:36:37 +0000 (UTC) Subject: rpms/apt/devel apt.spec,1.62,1.63 Message-ID: <20090306203637.E1D8470116@cvs1.fedora.phx.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/apt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32464 Modified Files: apt.spec Log Message: - rebuild for rpm 4.7.0 Index: apt.spec =================================================================== RCS file: /cvs/pkgs/rpms/apt/devel/apt.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- apt.spec 24 Feb 2009 01:33:32 -0000 1.62 +++ apt.spec 6 Mar 2009 20:36:07 -0000 1.63 @@ -10,7 +10,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: %{aptver} -Release: 0.%{snapver}.3%{?dist}.1 +Release: 0.%{snapver}.4%{?dist} Group: System Environment/Base URL: http://apt-rpm.org/ # SourceLicense: GPLv2+ except lua/ which is MIT @@ -299,6 +299,9 @@ %changelog +* Fri Mar 06 2009 Panu Matilainen - 0.5.15lorg3.95-0.git416.4 +- rebuild for rpm 4.7.0 + * Mon Feb 23 2009 Fedora Release Engineering - 0.5.15lorg3.95-0.git416.3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From john5342 at fedoraproject.org Fri Mar 6 20:42:18 2009 From: john5342 at fedoraproject.org (Adrian John Wilson) Date: Fri, 6 Mar 2009 20:42:18 +0000 (UTC) Subject: rpms/qedje/devel qedje-0.4.0-fix_python_install.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 qedje.spec, 1.4, 1.5 sources, 1.2, 1.3 qedje-0.3.0-rmhardcoded.patch, 1.1, NONE Message-ID: <20090306204218.AA08270116@cvs1.fedora.phx.redhat.com> Author: john5342 Update of /cvs/pkgs/rpms/qedje/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1875/devel Modified Files: .cvsignore import.log qedje.spec sources Added Files: qedje-0.4.0-fix_python_install.patch Removed Files: qedje-0.3.0-rmhardcoded.patch Log Message: * Fri Mar 06 2009 John5342 0.4.0-1 - Updated to new upstream release (0.4.0) qedje-0.4.0-fix_python_install.patch: --- NEW FILE qedje-0.4.0-fix_python_install.patch --- diff -ur qedje-mainline/python/CMakeLists.txt qedje-mainline/python/CMakeLists.txt --- qedje-mainline/python/CMakeLists.txt 2009-02-19 13:41:36.000000000 +0000 +++ qedje-mainline/python/CMakeLists.txt 2009-03-05 20:02:02.100289653 +0000 @@ -16,9 +16,6 @@ set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG}) set(SIP_EXTRA_OPTIONS -g) -set(PYTHON_SITE_PACKAGES_DIR - ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_SHORT_VERSION}/site-packages) - # Putting inside the "concepts" package until we release. file(GLOB qedje_files_sip qedje/*.sip) set(SIP_EXTRA_FILES_DEPEND ${qedje_files_sip}) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qedje/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Dec 2008 14:24:01 -0000 1.2 +++ .cvsignore 6 Mar 2009 20:41:48 -0000 1.3 @@ -1 +1 @@ -qedje-0.3.0.tar.gz +0206ec8f2a802bf51455179933d8b7ab3e41a38b.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/qedje/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 21 Dec 2008 14:24:01 -0000 1.1 +++ import.log 6 Mar 2009 20:41:48 -0000 1.2 @@ -1 +1,2 @@ qedje-0_3_0-2_fc10:HEAD:qedje-0.3.0-2.fc10.src.rpm:1229869365 +qedje-0_4_0-1_fc10:HEAD:qedje-0.4.0-1.fc10.src.rpm:1236372003 Index: qedje.spec =================================================================== RCS file: /cvs/pkgs/rpms/qedje/devel/qedje.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qedje.spec 6 Mar 2009 18:48:02 -0000 1.4 +++ qedje.spec 6 Mar 2009 20:41:48 -0000 1.5 @@ -1,19 +1,29 @@ + +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + Name: qedje -Version: 0.3.0 -Release: 5%{?dist} +Version: 0.4.0 +Release: 1%{?dist} Summary: A library combining the benefits of Edje and Qt Group: System Environment/Libraries License: GPLv3+ -URL: http://dev.openbossa.org/trac/qedje/ -Source0: http://dev.openbossa.org/qedje/downloads/source/%{name}/%{name}-%{version}.tar.gz -Patch0: qedje-0.3.0-rmhardcoded.patch +URL: http://code.openbossa.org/projects/%{name} +Source0: http://code.openbossa.org/projects/%{name}/repos/mainline/archive/0206ec8f2a802bf51455179933d8b7ab3e41a38b.tar.gz +Patch0: qedje-0.4.0-fix_python_install.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel -BuildRequires: pkgconfig BuildRequires: eet-devel BuildRequires: qzion-devel +BuildRequires: qzion-python-devel +BuildRequires: cmake +BuildRequires: pkgconfig +BuildRequires: python-devel +BuildRequires: sip-devel +BuildRequires: PyQt4-devel %description The main purpose of the QEdje project is to build a bridge among components @@ -25,6 +35,7 @@ Summary: Development files for %{name} Group: Development/Libraries +Requires: cmake Requires: pkgconfig Requires: %{name} = %{version}-%{release} Requires: qzion-devel @@ -34,25 +45,49 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package python + +Summary: Python bindings for %{name} +Group: Development/Libraries +Requires: PyQt4 +Requires: qzion-python + +%description python +The %{name}-python package contains python bindings for %{name} + +%package python-devel + +Summary: Python bindings for %{name} +Group: Development/Libraries +Requires: sip +Requires: PyQt4-devel +Requires: qzion-python-devel +Requires: %{name}-python = %{version}-%{release} + +%description python-devel +The %{name}-python-devel package contains the development files +for the python bindings for %{name} + %prep -%setup -q +%setup -q -n %{name}-mainline %patch0 -p1 -#Support installing in buildroot -sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro */*/*.pro +%build +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake} \ +-DPYTHON_SITE_PACKAGES_DIR=%{python_sitearch} \ +-DQZION_SIP_DIR=%{_datadir}/sip/qzion \ +.. +popd -%build -%{_qt4_qmake} PREFIX=/usr LIBDIR=%{_libdir} -make %{?_smp_mflags} +make %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} -make install INSTALL_ROOT=%{buildroot} - -#These are apparently only needed for static linking? -find %{buildroot} -name *.prl -print -delete +make install/fast -C %{_target_platform} DESTDIR=%{buildroot} %clean rm -rf %{buildroot} @@ -66,6 +101,7 @@ %defattr(-,root,root,-) %doc README COPYING %{_libdir}/*.so.* +%{_bindir}/qedje_viewer %files devel %defattr(-,root,root,-) @@ -73,8 +109,18 @@ %{_includedir}/* %{_libdir}/pkgconfig/%{name}.pc +%files python +%defattr(-,root,root,-) +%{python_sitearch}/%{name} + +%files python-devel +%defattr(-,root,root,-) +%{_datadir}/sip/%{name} %changelog +* Fri Mar 06 2009 John5342 0.4.0-1 +- Updated to new upstream release (0.4.0) + * Fri Mar 06 2009 Rex Dieter - 0.3.0-5 - revert (previous borkage probably due to qt-4.5-rc1) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qedje/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Dec 2008 14:24:02 -0000 1.2 +++ sources 6 Mar 2009 20:41:48 -0000 1.3 @@ -1 +1 @@ -7435e3631fd44dce4086afe8698cdb13 qedje-0.3.0.tar.gz +6d498e98e8e470071c7b6bc6fa6259dc 0206ec8f2a802bf51455179933d8b7ab3e41a38b.tar.gz --- qedje-0.3.0-rmhardcoded.patch DELETED --- From mdehaan at fedoraproject.org Fri Mar 6 20:43:06 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:43:06 +0000 (UTC) Subject: rpms/koan/EL-4 .cvsignore, 1.27, 1.28 koan.spec, 1.32, 1.33 sources, 1.32, 1.33 Message-ID: <20090306204306.01B9670116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/koan/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1776/EL-4 Modified Files: .cvsignore koan.spec sources Log Message: This is koan 1.4.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koan/EL-4/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 12 Feb 2009 19:06:13 -0000 1.27 +++ .cvsignore 6 Mar 2009 20:42:35 -0000 1.28 @@ -24,3 +24,4 @@ koan-1.4.0.tar.gz koan-1.4.1.tar.gz koan-1.4.2.tar.gz +koan-1.4.3.tar.gz Index: koan.spec =================================================================== RCS file: /cvs/extras/rpms/koan/EL-4/koan.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- koan.spec 12 Feb 2009 19:06:13 -0000 1.32 +++ koan.spec 6 Mar 2009 20:42:35 -0000 1.33 @@ -2,13 +2,13 @@ Summary: Network provisioning tool for Xen and Bare Metal Machines Name: koan -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System Requires: mkinitrd -Requires: python >= 2.2 +Requires: python >= 1.5 BuildRequires: python-devel %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)} @@ -21,7 +21,6 @@ %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch -ExcludeArch: ppc64 Url: http://fedorahosted.org/cobbler/ %description @@ -59,6 +58,10 @@ %changelog +* Tue Feb 17 2009 Michael DeHaan - 1.4.3-1 +- Upstream changes (see CHANGELOG) +- Reduce python version requirements + * Fri Feb 12 2009 Michael DeHaan - 1.4.2-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/koan/EL-4/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 12 Feb 2009 19:06:13 -0000 1.32 +++ sources 6 Mar 2009 20:42:35 -0000 1.33 @@ -1,2 +1,3 @@ eb4f0c6990dc295879a952243708fdaa koan-1.4.1.tar.gz ed2c63e8d0acf12f5f1bd40a75402e3d koan-1.4.2.tar.gz +afc42005052ad12f2ec0744b083b260c koan-1.4.3.tar.gz From mdehaan at fedoraproject.org Fri Mar 6 20:43:06 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:43:06 +0000 (UTC) Subject: rpms/koan/EL-5 .cvsignore, 1.29, 1.30 koan.spec, 1.35, 1.36 sources, 1.33, 1.34 Message-ID: <20090306204306.6FE2A70116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/koan/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1776/EL-5 Modified Files: .cvsignore koan.spec sources Log Message: This is koan 1.4.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koan/EL-5/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 12 Feb 2009 19:06:13 -0000 1.29 +++ .cvsignore 6 Mar 2009 20:42:36 -0000 1.30 @@ -26,3 +26,4 @@ koan-1.4.0.tar.gz koan-1.4.1.tar.gz koan-1.4.2.tar.gz +koan-1.4.3.tar.gz Index: koan.spec =================================================================== RCS file: /cvs/extras/rpms/koan/EL-5/koan.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- koan.spec 12 Feb 2009 19:06:13 -0000 1.35 +++ koan.spec 6 Mar 2009 20:42:36 -0000 1.36 @@ -2,13 +2,13 @@ Summary: Network provisioning tool for Xen and Bare Metal Machines Name: koan -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System Requires: mkinitrd -Requires: python >= 2.2 +Requires: python >= 1.5 BuildRequires: python-devel %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)} @@ -21,7 +21,6 @@ %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch -ExcludeArch: ppc64 Url: http://fedorahosted.org/cobbler/ %description @@ -59,6 +58,10 @@ %changelog +* Tue Feb 17 2009 Michael DeHaan - 1.4.3-1 +- Upstream changes (see CHANGELOG) +- Reduce python version requirements + * Fri Feb 12 2009 Michael DeHaan - 1.4.2-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/koan/EL-5/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 12 Feb 2009 19:06:13 -0000 1.33 +++ sources 6 Mar 2009 20:42:36 -0000 1.34 @@ -1,2 +1,3 @@ eb4f0c6990dc295879a952243708fdaa koan-1.4.1.tar.gz ed2c63e8d0acf12f5f1bd40a75402e3d koan-1.4.2.tar.gz +afc42005052ad12f2ec0744b083b260c koan-1.4.3.tar.gz From mdehaan at fedoraproject.org Fri Mar 6 20:43:07 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:43:07 +0000 (UTC) Subject: rpms/koan/devel .cvsignore, 1.27, 1.28 koan.spec, 1.41, 1.42 sources, 1.32, 1.33 Message-ID: <20090306204307.6E6B270118@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/koan/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1776/devel Modified Files: .cvsignore koan.spec sources Log Message: This is koan 1.4.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koan/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 12 Feb 2009 19:06:14 -0000 1.27 +++ .cvsignore 6 Mar 2009 20:42:37 -0000 1.28 @@ -24,3 +24,4 @@ koan-1.4.0.tar.gz koan-1.4.1.tar.gz koan-1.4.2.tar.gz +koan-1.4.3.tar.gz Index: koan.spec =================================================================== RCS file: /cvs/extras/rpms/koan/devel/koan.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- koan.spec 25 Feb 2009 11:41:25 -0000 1.41 +++ koan.spec 6 Mar 2009 20:42:37 -0000 1.42 @@ -2,13 +2,13 @@ Summary: Network provisioning tool for Xen and Bare Metal Machines Name: koan -Version: 1.4.2 -Release: 2%{?dist} +Version: 1.4.3 +Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System Requires: mkinitrd -Requires: python >= 2.2 +Requires: python >= 1.5 BuildRequires: python-devel %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)} @@ -21,7 +21,6 @@ %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch -ExcludeArch: ppc64 Url: http://fedorahosted.org/cobbler/ %description @@ -58,9 +57,10 @@ %doc AUTHORS COPYING CHANGELOG README %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 1.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Tue Feb 17 2009 Michael DeHaan - 1.4.3-1 +- Upstream changes (see CHANGELOG) +- Reduce python version requirements * Fri Feb 12 2009 Michael DeHaan - 1.4.2-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/koan/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 12 Feb 2009 19:06:14 -0000 1.32 +++ sources 6 Mar 2009 20:42:37 -0000 1.33 @@ -1,2 +1,3 @@ eb4f0c6990dc295879a952243708fdaa koan-1.4.1.tar.gz ed2c63e8d0acf12f5f1bd40a75402e3d koan-1.4.2.tar.gz +afc42005052ad12f2ec0744b083b260c koan-1.4.3.tar.gz From mdehaan at fedoraproject.org Fri Mar 6 20:43:06 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:43:06 +0000 (UTC) Subject: rpms/koan/F-10 .cvsignore, 1.27, 1.28 koan.spec, 1.37, 1.38 sources, 1.32, 1.33 Message-ID: <20090306204306.C4F5F70117@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/koan/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1776/F-10 Modified Files: .cvsignore koan.spec sources Log Message: This is koan 1.4.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koan/F-10/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 12 Feb 2009 19:06:14 -0000 1.27 +++ .cvsignore 6 Mar 2009 20:42:36 -0000 1.28 @@ -24,3 +24,4 @@ koan-1.4.0.tar.gz koan-1.4.1.tar.gz koan-1.4.2.tar.gz +koan-1.4.3.tar.gz Index: koan.spec =================================================================== RCS file: /cvs/extras/rpms/koan/F-10/koan.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- koan.spec 12 Feb 2009 19:06:14 -0000 1.37 +++ koan.spec 6 Mar 2009 20:42:36 -0000 1.38 @@ -2,13 +2,13 @@ Summary: Network provisioning tool for Xen and Bare Metal Machines Name: koan -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System Requires: mkinitrd -Requires: python >= 2.2 +Requires: python >= 1.5 BuildRequires: python-devel %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)} @@ -21,7 +21,6 @@ %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch -ExcludeArch: ppc64 Url: http://fedorahosted.org/cobbler/ %description @@ -59,6 +58,10 @@ %changelog +* Tue Feb 17 2009 Michael DeHaan - 1.4.3-1 +- Upstream changes (see CHANGELOG) +- Reduce python version requirements + * Fri Feb 12 2009 Michael DeHaan - 1.4.2-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/koan/F-10/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 12 Feb 2009 19:06:14 -0000 1.32 +++ sources 6 Mar 2009 20:42:36 -0000 1.33 @@ -1,2 +1,3 @@ eb4f0c6990dc295879a952243708fdaa koan-1.4.1.tar.gz ed2c63e8d0acf12f5f1bd40a75402e3d koan-1.4.2.tar.gz +afc42005052ad12f2ec0744b083b260c koan-1.4.3.tar.gz From mdehaan at fedoraproject.org Fri Mar 6 20:43:07 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:43:07 +0000 (UTC) Subject: rpms/koan/F-9 .cvsignore, 1.27, 1.28 koan.spec, 1.36, 1.37 sources, 1.32, 1.33 Message-ID: <20090306204307.234F970116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/koan/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1776/F-9 Modified Files: .cvsignore koan.spec sources Log Message: This is koan 1.4.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koan/F-9/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 12 Feb 2009 19:06:14 -0000 1.27 +++ .cvsignore 6 Mar 2009 20:42:36 -0000 1.28 @@ -24,3 +24,4 @@ koan-1.4.0.tar.gz koan-1.4.1.tar.gz koan-1.4.2.tar.gz +koan-1.4.3.tar.gz Index: koan.spec =================================================================== RCS file: /cvs/extras/rpms/koan/F-9/koan.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- koan.spec 12 Feb 2009 19:06:14 -0000 1.36 +++ koan.spec 6 Mar 2009 20:42:36 -0000 1.37 @@ -2,13 +2,13 @@ Summary: Network provisioning tool for Xen and Bare Metal Machines Name: koan -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System Requires: mkinitrd -Requires: python >= 2.2 +Requires: python >= 1.5 BuildRequires: python-devel %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)} @@ -21,7 +21,6 @@ %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch -ExcludeArch: ppc64 Url: http://fedorahosted.org/cobbler/ %description @@ -59,6 +58,10 @@ %changelog +* Tue Feb 17 2009 Michael DeHaan - 1.4.3-1 +- Upstream changes (see CHANGELOG) +- Reduce python version requirements + * Fri Feb 12 2009 Michael DeHaan - 1.4.2-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/koan/F-9/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 12 Feb 2009 19:06:14 -0000 1.32 +++ sources 6 Mar 2009 20:42:36 -0000 1.33 @@ -1,2 +1,3 @@ eb4f0c6990dc295879a952243708fdaa koan-1.4.1.tar.gz ed2c63e8d0acf12f5f1bd40a75402e3d koan-1.4.2.tar.gz +afc42005052ad12f2ec0744b083b260c koan-1.4.3.tar.gz From chkr at fedoraproject.org Fri Mar 6 20:47:02 2009 From: chkr at fedoraproject.org (Christian Krause) Date: Fri, 6 Mar 2009 20:47:02 +0000 (UTC) Subject: rpms/uml_utilities/F-9 uml_utilities.spec,1.1,1.2 Message-ID: <20090306204702.9693470116@cvs1.fedora.phx.redhat.com> Author: chkr Update of /cvs/pkgs/rpms/uml_utilities/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3668 Modified Files: uml_utilities.spec Log Message: * Thu Mar 05 2009 Christian Krause - 20070815-5 - Limited setuid binary to only members of the uml-net group Index: uml_utilities.spec =================================================================== RCS file: /cvs/pkgs/rpms/uml_utilities/F-9/uml_utilities.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- uml_utilities.spec 1 Mar 2009 21:47:22 -0000 1.1 +++ uml_utilities.spec 6 Mar 2009 20:46:32 -0000 1.2 @@ -1,11 +1,12 @@ Name: uml_utilities Version: 20070815 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ URL: http://user-mode-linux.sourceforge.net/index.html Source0: http://user-mode-linux.sourceforge.net/%{name}_%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fuse-devel, readline-devel +Requires(pre): shadow-utils Group: Applications/Internet Summary: Utilities for user-mode linux kernel # installation problem was reported upstream: @@ -37,7 +38,7 @@ %defattr(-,root,root,-) %doc COPYING Changelog %attr(755,root,root) %dir %{_libdir}/uml -%attr(4755,root,root) %{_bindir}/uml_net +%attr(4750,root,uml-net) %{_bindir}/uml_net %{_bindir}/jailtest %{_bindir}/tunctl %{_bindir}/uml_mconsole @@ -57,7 +58,14 @@ %clean rm -rf ${RPM_BUILD_ROOT} +%pre +getent group uml-net >/dev/null || groupadd -r uml-net +exit 0 + %changelog +* Thu Mar 05 2009 Christian Krause - 20070815-5 +- Limited setuid binary to only members of the uml-net group + * Fri Feb 27 2009 Christian Krause - 20070815-4 - use regular version tag - fixed license tag From mdehaan at fedoraproject.org Fri Mar 6 20:47:45 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:47:45 +0000 (UTC) Subject: rpms/cobbler/EL-4 .cvsignore, 1.50, 1.51 cobbler.spec, 1.61, 1.62 sources, 1.62, 1.63 Message-ID: <20090306204745.455CB70116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3602/EL-4 Modified Files: .cvsignore cobbler.spec sources Log Message: This is 1.4.3, last scripted build left off the tarball. Kind of need that :) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-4/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 12 Feb 2009 19:00:49 -0000 1.50 +++ .cvsignore 6 Mar 2009 20:47:14 -0000 1.51 @@ -47,3 +47,4 @@ cobbler-1.4.0.tar.gz cobbler-1.4.1.tar.gz cobbler-1.4.2.tar.gz +cobbler-1.4.3.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- cobbler.spec 6 Mar 2009 20:24:14 -0000 1.61 +++ cobbler.spec 6 Mar 2009 20:47:15 -0000 1.62 @@ -4,7 +4,7 @@ Name: cobbler AutoReq: no Version: 1.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -282,7 +282,7 @@ %changelog -* Fri Mar 06 2009 Michael DeHaan - 1.4.3-1 +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-2 - Upstream changes (see CHANGELOG) - Now requires PyYAML Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 6 Mar 2009 20:24:14 -0000 1.62 +++ sources 6 Mar 2009 20:47:15 -0000 1.63 @@ -1,2 +1,3 @@ a85b0ddfb7186f7ea5ed327f1be9c6dc cobbler-1.4.1.tar.gz c01262fa7403643f4b2905ce6fd94030 cobbler-1.4.2.tar.gz +d560692f78ca9b60d25c7ef79633fc5e cobbler-1.4.3.tar.gz From mdehaan at fedoraproject.org Fri Mar 6 20:47:45 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:47:45 +0000 (UTC) Subject: rpms/cobbler/EL-5 .cvsignore, 1.54, 1.55 cobbler.spec, 1.63, 1.64 sources, 1.65, 1.66 Message-ID: <20090306204745.8CED370116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3602/EL-5 Modified Files: .cvsignore cobbler.spec sources Log Message: This is 1.4.3, last scripted build left off the tarball. Kind of need that :) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 12 Feb 2009 19:00:50 -0000 1.54 +++ .cvsignore 6 Mar 2009 20:47:15 -0000 1.55 @@ -51,3 +51,4 @@ cobbler-1.4.0.tar.gz cobbler-1.4.1.tar.gz cobbler-1.4.2.tar.gz +cobbler-1.4.3.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- cobbler.spec 6 Mar 2009 20:24:14 -0000 1.63 +++ cobbler.spec 6 Mar 2009 20:47:15 -0000 1.64 @@ -4,7 +4,7 @@ Name: cobbler AutoReq: no Version: 1.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -282,7 +282,7 @@ %changelog -* Fri Mar 06 2009 Michael DeHaan - 1.4.3-1 +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-2 - Upstream changes (see CHANGELOG) - Now requires PyYAML Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sources 6 Mar 2009 20:24:14 -0000 1.65 +++ sources 6 Mar 2009 20:47:15 -0000 1.66 @@ -1,2 +1,3 @@ a85b0ddfb7186f7ea5ed327f1be9c6dc cobbler-1.4.1.tar.gz c01262fa7403643f4b2905ce6fd94030 cobbler-1.4.2.tar.gz +d560692f78ca9b60d25c7ef79633fc5e cobbler-1.4.3.tar.gz From mdehaan at fedoraproject.org Fri Mar 6 20:47:46 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:47:46 +0000 (UTC) Subject: rpms/cobbler/F-9 .cvsignore, 1.50, 1.51 cobbler.spec, 1.63, 1.64 sources, 1.61, 1.62 Message-ID: <20090306204746.2E8EE70116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3602/F-9 Modified Files: .cvsignore cobbler.spec sources Log Message: This is 1.4.3, last scripted build left off the tarball. Kind of need that :) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-9/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 12 Feb 2009 19:00:50 -0000 1.50 +++ .cvsignore 6 Mar 2009 20:47:15 -0000 1.51 @@ -47,3 +47,4 @@ cobbler-1.4.0.tar.gz cobbler-1.4.1.tar.gz cobbler-1.4.2.tar.gz +cobbler-1.4.3.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-9/cobbler.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- cobbler.spec 6 Mar 2009 20:24:15 -0000 1.63 +++ cobbler.spec 6 Mar 2009 20:47:15 -0000 1.64 @@ -4,7 +4,7 @@ Name: cobbler AutoReq: no Version: 1.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -282,7 +282,7 @@ %changelog -* Fri Mar 06 2009 Michael DeHaan - 1.4.3-1 +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-2 - Upstream changes (see CHANGELOG) - Now requires PyYAML Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-9/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 6 Mar 2009 20:24:15 -0000 1.61 +++ sources 6 Mar 2009 20:47:15 -0000 1.62 @@ -1,2 +1,3 @@ a85b0ddfb7186f7ea5ed327f1be9c6dc cobbler-1.4.1.tar.gz c01262fa7403643f4b2905ce6fd94030 cobbler-1.4.2.tar.gz +d560692f78ca9b60d25c7ef79633fc5e cobbler-1.4.3.tar.gz From mdehaan at fedoraproject.org Fri Mar 6 20:47:45 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:47:45 +0000 (UTC) Subject: rpms/cobbler/F-10 .cvsignore, 1.50, 1.51 cobbler.spec, 1.66, 1.67 sources, 1.63, 1.64 Message-ID: <20090306204745.CA2EC70116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3602/F-10 Modified Files: .cvsignore cobbler.spec sources Log Message: This is 1.4.3, last scripted build left off the tarball. Kind of need that :) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-10/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 12 Feb 2009 19:00:50 -0000 1.50 +++ .cvsignore 6 Mar 2009 20:47:15 -0000 1.51 @@ -47,3 +47,4 @@ cobbler-1.4.0.tar.gz cobbler-1.4.1.tar.gz cobbler-1.4.2.tar.gz +cobbler-1.4.3.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-10/cobbler.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- cobbler.spec 6 Mar 2009 20:24:14 -0000 1.66 +++ cobbler.spec 6 Mar 2009 20:47:15 -0000 1.67 @@ -4,7 +4,7 @@ Name: cobbler AutoReq: no Version: 1.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -282,7 +282,7 @@ %changelog -* Fri Mar 06 2009 Michael DeHaan - 1.4.3-1 +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-2 - Upstream changes (see CHANGELOG) - Now requires PyYAML Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-10/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 6 Mar 2009 20:24:14 -0000 1.63 +++ sources 6 Mar 2009 20:47:15 -0000 1.64 @@ -1,2 +1,3 @@ a85b0ddfb7186f7ea5ed327f1be9c6dc cobbler-1.4.1.tar.gz c01262fa7403643f4b2905ce6fd94030 cobbler-1.4.2.tar.gz +d560692f78ca9b60d25c7ef79633fc5e cobbler-1.4.3.tar.gz From mdehaan at fedoraproject.org Fri Mar 6 20:47:46 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:47:46 +0000 (UTC) Subject: rpms/cobbler/devel .cvsignore, 1.50, 1.51 cobbler.spec, 1.73, 1.74 sources, 1.63, 1.64 Message-ID: <20090306204746.7269E70116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3602/devel Modified Files: .cvsignore cobbler.spec sources Log Message: This is 1.4.3, last scripted build left off the tarball. Kind of need that :) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 12 Feb 2009 19:00:50 -0000 1.50 +++ .cvsignore 6 Mar 2009 20:47:16 -0000 1.51 @@ -47,3 +47,4 @@ cobbler-1.4.0.tar.gz cobbler-1.4.1.tar.gz cobbler-1.4.2.tar.gz +cobbler-1.4.3.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- cobbler.spec 6 Mar 2009 20:24:15 -0000 1.73 +++ cobbler.spec 6 Mar 2009 20:47:16 -0000 1.74 @@ -4,7 +4,7 @@ Name: cobbler AutoReq: no Version: 1.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -282,7 +282,7 @@ %changelog -* Fri Mar 06 2009 Michael DeHaan - 1.4.3-1 +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-2 - Upstream changes (see CHANGELOG) - Now requires PyYAML Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 6 Mar 2009 20:24:15 -0000 1.63 +++ sources 6 Mar 2009 20:47:16 -0000 1.64 @@ -1,2 +1,3 @@ a85b0ddfb7186f7ea5ed327f1be9c6dc cobbler-1.4.1.tar.gz c01262fa7403643f4b2905ce6fd94030 cobbler-1.4.2.tar.gz +d560692f78ca9b60d25c7ef79633fc5e cobbler-1.4.3.tar.gz From pmatilai at fedoraproject.org Fri Mar 6 20:49:49 2009 From: pmatilai at fedoraproject.org (Panu Matilainen) Date: Fri, 6 Mar 2009 20:49:49 +0000 (UTC) Subject: rpms/synaptic/devel synaptic.spec,1.37,1.38 Message-ID: <20090306204949.4C20E70116@cvs1.fedora.phx.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/synaptic/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4612 Modified Files: synaptic.spec Log Message: - rebuild for rpm 4.7.0 Index: synaptic.spec =================================================================== RCS file: /cvs/pkgs/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- synaptic.spec 28 Feb 2009 09:46:20 -0000 1.37 +++ synaptic.spec 6 Mar 2009 20:49:18 -0000 1.38 @@ -3,7 +3,7 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2+ Group: Applications/System @@ -116,6 +116,9 @@ %{_mandir}/man8/%{name}.8* %changelog +* Fri Mar 06 2009 Panu Matilainen - 0.57.2-20 +- rebuild for rpm 4.7.0 + * Sat Feb 28 2009 Panu Matilainen - 0.57.2-19 - shutdown rpm crypto after fork to force proper reinitialization (#449168) From mdehaan at fedoraproject.org Fri Mar 6 20:50:31 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:50:31 +0000 (UTC) Subject: rpms/cobbler/EL-5 sources,1.66,1.67 Message-ID: <20090306205031.BBB3170116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4639/EL-5 Modified Files: sources Log Message: Trim sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- sources 6 Mar 2009 20:47:15 -0000 1.66 +++ sources 6 Mar 2009 20:50:01 -0000 1.67 @@ -1,3 +1 @@ -a85b0ddfb7186f7ea5ed327f1be9c6dc cobbler-1.4.1.tar.gz -c01262fa7403643f4b2905ce6fd94030 cobbler-1.4.2.tar.gz d560692f78ca9b60d25c7ef79633fc5e cobbler-1.4.3.tar.gz From mdehaan at fedoraproject.org Fri Mar 6 20:50:31 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:50:31 +0000 (UTC) Subject: rpms/cobbler/EL-4 sources,1.63,1.64 Message-ID: <20090306205031.7A24B70116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4639/EL-4 Modified Files: sources Log Message: Trim sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 6 Mar 2009 20:47:15 -0000 1.63 +++ sources 6 Mar 2009 20:50:01 -0000 1.64 @@ -1,3 +1 @@ -a85b0ddfb7186f7ea5ed327f1be9c6dc cobbler-1.4.1.tar.gz -c01262fa7403643f4b2905ce6fd94030 cobbler-1.4.2.tar.gz d560692f78ca9b60d25c7ef79633fc5e cobbler-1.4.3.tar.gz From mdehaan at fedoraproject.org Fri Mar 6 20:50:32 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:50:32 +0000 (UTC) Subject: rpms/cobbler/F-10 sources,1.64,1.65 Message-ID: <20090306205032.157E970116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4639/F-10 Modified Files: sources Log Message: Trim sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-10/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- sources 6 Mar 2009 20:47:15 -0000 1.64 +++ sources 6 Mar 2009 20:50:01 -0000 1.65 @@ -1,3 +1 @@ -a85b0ddfb7186f7ea5ed327f1be9c6dc cobbler-1.4.1.tar.gz -c01262fa7403643f4b2905ce6fd94030 cobbler-1.4.2.tar.gz d560692f78ca9b60d25c7ef79633fc5e cobbler-1.4.3.tar.gz From mdehaan at fedoraproject.org Fri Mar 6 20:50:32 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:50:32 +0000 (UTC) Subject: rpms/cobbler/devel sources,1.64,1.65 Message-ID: <20090306205032.ADF3070116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4639/devel Modified Files: sources Log Message: Trim sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- sources 6 Mar 2009 20:47:16 -0000 1.64 +++ sources 6 Mar 2009 20:50:02 -0000 1.65 @@ -1,3 +1 @@ -a85b0ddfb7186f7ea5ed327f1be9c6dc cobbler-1.4.1.tar.gz -c01262fa7403643f4b2905ce6fd94030 cobbler-1.4.2.tar.gz d560692f78ca9b60d25c7ef79633fc5e cobbler-1.4.3.tar.gz From mdehaan at fedoraproject.org Fri Mar 6 20:50:32 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:50:32 +0000 (UTC) Subject: rpms/cobbler/F-9 sources,1.62,1.63 Message-ID: <20090306205032.6D7AF70116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4639/F-9 Modified Files: sources Log Message: Trim sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-9/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 6 Mar 2009 20:47:15 -0000 1.62 +++ sources 6 Mar 2009 20:50:02 -0000 1.63 @@ -1,3 +1 @@ -a85b0ddfb7186f7ea5ed327f1be9c6dc cobbler-1.4.1.tar.gz -c01262fa7403643f4b2905ce6fd94030 cobbler-1.4.2.tar.gz d560692f78ca9b60d25c7ef79633fc5e cobbler-1.4.3.tar.gz From pkgdb at fedoraproject.org Fri Mar 6 20:53:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:53:08 +0000 Subject: [pkgdb] rosegarden4 had acl change status Message-ID: <20090306205357.77AF9208547@bastion.fedora.phx.redhat.com> seg has set the watchcommits acl on rosegarden4 (Fedora 10) to Approved for oget To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 20:53:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:53:57 +0000 Subject: [pkgdb] rosegarden4 had acl change status Message-ID: <20090306205357.C5AEA20854A@bastion.fedora.phx.redhat.com> seg has set the watchbugzilla acl on rosegarden4 (Fedora 10) to Approved for oget To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 20:53:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:53:15 +0000 Subject: [pkgdb] rosegarden4 had acl change status Message-ID: <20090306205403.F2F7820854D@bastion.fedora.phx.redhat.com> seg has set the commit acl on rosegarden4 (Fedora 10) to Approved for oget To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 20:54:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:54:08 +0000 Subject: [pkgdb] rosegarden4 had acl change status Message-ID: <20090306205407.3C8B8208552@bastion.fedora.phx.redhat.com> seg has set the approveacls acl on rosegarden4 (Fedora 10) to Approved for oget To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 20:54:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:54:09 +0000 Subject: [pkgdb] rosegarden4: seg has requested watchcommits Message-ID: <20090306205430.5D9BD208549@bastion.fedora.phx.redhat.com> seg has requested the watchcommits acl on rosegarden4 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 20:54:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:54:33 +0000 Subject: [pkgdb] rosegarden4: seg has given up watchcommits Message-ID: <20090306205433.2647920854C@bastion.fedora.phx.redhat.com> seg has given up the watchcommits acl on rosegarden4 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 20:53:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:53:48 +0000 Subject: [pkgdb] rosegarden4: seg has requested watchcommits Message-ID: <20090306205437.64A0820854F@bastion.fedora.phx.redhat.com> seg has requested the watchcommits acl on rosegarden4 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 20:54:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:54:41 +0000 Subject: [pkgdb] rosegarden4: seg has given up watchcommits Message-ID: <20090306205440.15646208553@bastion.fedora.phx.redhat.com> seg has given up the watchcommits acl on rosegarden4 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 20:54:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:54:25 +0000 Subject: [pkgdb] rosegarden4 had acl change status Message-ID: <20090306205514.63E4B20854B@bastion.fedora.phx.redhat.com> seg has set the watchcommits acl on rosegarden4 (Fedora devel) to Approved for oget To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 20:55:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:55:14 +0000 Subject: [pkgdb] rosegarden4 had acl change status Message-ID: <20090306205514.BF00220854D@bastion.fedora.phx.redhat.com> seg has set the watchbugzilla acl on rosegarden4 (Fedora devel) to Approved for oget To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 20:55:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:55:17 +0000 Subject: [pkgdb] rosegarden4 had acl change status Message-ID: <20090306205515.80C48208552@bastion.fedora.phx.redhat.com> seg has set the commit acl on rosegarden4 (Fedora devel) to Approved for oget To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From pkgdb at fedoraproject.org Fri Mar 6 20:54:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Fri, 06 Mar 2009 20:54:55 +0000 Subject: [pkgdb] rosegarden4 had acl change status Message-ID: <20090306205516.B4FE6208555@bastion.fedora.phx.redhat.com> seg has set the approveacls acl on rosegarden4 (Fedora devel) to Approved for oget To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rosegarden4 From mdehaan at fedoraproject.org Fri Mar 6 20:54:35 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:54:35 +0000 (UTC) Subject: rpms/cobbler/EL-4 cobbler.spec,1.62,1.63 Message-ID: <20090306205435.738CE70116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5810/EL-4 Modified Files: cobbler.spec Log Message: Bump spec version for rebuild, build system didn't like locally modified sources at build time. Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- cobbler.spec 6 Mar 2009 20:47:15 -0000 1.62 +++ cobbler.spec 6 Mar 2009 20:54:05 -0000 1.63 @@ -4,7 +4,7 @@ Name: cobbler AutoReq: no Version: 1.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -282,7 +282,7 @@ %changelog -* Fri Mar 06 2009 Michael DeHaan - 1.4.3-2 +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-3 - Upstream changes (see CHANGELOG) - Now requires PyYAML From mdehaan at fedoraproject.org Fri Mar 6 20:54:35 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:54:35 +0000 (UTC) Subject: rpms/cobbler/EL-5 cobbler.spec,1.64,1.65 Message-ID: <20090306205435.9066170116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5810/EL-5 Modified Files: cobbler.spec Log Message: Bump spec version for rebuild, build system didn't like locally modified sources at build time. Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- cobbler.spec 6 Mar 2009 20:47:15 -0000 1.64 +++ cobbler.spec 6 Mar 2009 20:54:05 -0000 1.65 @@ -4,7 +4,7 @@ Name: cobbler AutoReq: no Version: 1.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -282,7 +282,7 @@ %changelog -* Fri Mar 06 2009 Michael DeHaan - 1.4.3-2 +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-3 - Upstream changes (see CHANGELOG) - Now requires PyYAML From mdehaan at fedoraproject.org Fri Mar 6 20:54:35 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:54:35 +0000 (UTC) Subject: rpms/cobbler/F-10 cobbler.spec,1.67,1.68 Message-ID: <20090306205435.D1E8070116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5810/F-10 Modified Files: cobbler.spec Log Message: Bump spec version for rebuild, build system didn't like locally modified sources at build time. Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-10/cobbler.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- cobbler.spec 6 Mar 2009 20:47:15 -0000 1.67 +++ cobbler.spec 6 Mar 2009 20:54:05 -0000 1.68 @@ -4,7 +4,7 @@ Name: cobbler AutoReq: no Version: 1.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -282,7 +282,7 @@ %changelog -* Fri Mar 06 2009 Michael DeHaan - 1.4.3-2 +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-3 - Upstream changes (see CHANGELOG) - Now requires PyYAML From mdehaan at fedoraproject.org Fri Mar 6 20:54:36 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:54:36 +0000 (UTC) Subject: rpms/cobbler/F-9 cobbler.spec,1.64,1.65 Message-ID: <20090306205436.1B69370116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5810/F-9 Modified Files: cobbler.spec Log Message: Bump spec version for rebuild, build system didn't like locally modified sources at build time. Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-9/cobbler.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- cobbler.spec 6 Mar 2009 20:47:15 -0000 1.64 +++ cobbler.spec 6 Mar 2009 20:54:05 -0000 1.65 @@ -4,7 +4,7 @@ Name: cobbler AutoReq: no Version: 1.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -282,7 +282,7 @@ %changelog -* Fri Mar 06 2009 Michael DeHaan - 1.4.3-2 +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-3 - Upstream changes (see CHANGELOG) - Now requires PyYAML From mdehaan at fedoraproject.org Fri Mar 6 20:54:36 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:54:36 +0000 (UTC) Subject: rpms/cobbler/devel cobbler.spec,1.74,1.75 Message-ID: <20090306205436.594A870116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5810/devel Modified Files: cobbler.spec Log Message: Bump spec version for rebuild, build system didn't like locally modified sources at build time. Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- cobbler.spec 6 Mar 2009 20:47:16 -0000 1.74 +++ cobbler.spec 6 Mar 2009 20:54:06 -0000 1.75 @@ -4,7 +4,7 @@ Name: cobbler AutoReq: no Version: 1.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -282,7 +282,7 @@ %changelog -* Fri Mar 06 2009 Michael DeHaan - 1.4.3-2 +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-3 - Upstream changes (see CHANGELOG) - Now requires PyYAML From mdehaan at fedoraproject.org Fri Mar 6 20:59:44 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 20:59:44 +0000 (UTC) Subject: rpms/cobbler/devel cobbler.spec,1.75,1.76 Message-ID: <20090306205944.B0AA370116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7208 Modified Files: cobbler.spec Log Message: Missing buildrequires, testing in devel first Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- cobbler.spec 6 Mar 2009 20:54:06 -0000 1.75 +++ cobbler.spec 6 Mar 2009 20:59:14 -0000 1.76 @@ -22,6 +22,7 @@ Requires: createrepo Requires: python-cheetah Requires: rsync +BuildRequires: PyYAML Requires: PyYAML Requires: libyaml %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 From mdehaan at fedoraproject.org Fri Mar 6 21:00:47 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 21:00:47 +0000 (UTC) Subject: rpms/cobbler/devel cobbler.spec,1.76,1.77 Message-ID: <20090306210047.EA9F570116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7454 Modified Files: cobbler.spec Log Message: Need to bump spec version first, grr Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- cobbler.spec 6 Mar 2009 20:59:14 -0000 1.76 +++ cobbler.spec 6 Mar 2009 21:00:17 -0000 1.77 @@ -4,7 +4,7 @@ Name: cobbler AutoReq: no Version: 1.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -283,7 +283,7 @@ %changelog -* Fri Mar 06 2009 Michael DeHaan - 1.4.3-3 +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-4 - Upstream changes (see CHANGELOG) - Now requires PyYAML From caillon at fedoraproject.org Fri Mar 6 21:03:07 2009 From: caillon at fedoraproject.org (Christopher Aillon) Date: Fri, 6 Mar 2009 21:03:07 +0000 (UTC) Subject: rpms/totem/F-9 totem.spec,1.198,1.199 Message-ID: <20090306210307.B6B3670116@cvs1.fedora.phx.redhat.com> Author: caillon Update of /cvs/extras/rpms/totem/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8160 Modified Files: totem.spec Log Message: * Fri Mar 06 2009 Christopher Aillon - 2.23.2-12 - BuildRequire: gail-devel evolution-data-server-devel Index: totem.spec =================================================================== RCS file: /cvs/extras/rpms/totem/F-9/totem.spec,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- totem.spec 6 Mar 2009 20:23:23 -0000 1.198 +++ totem.spec 6 Mar 2009 21:02:37 -0000 1.199 @@ -57,6 +57,7 @@ BuildRequires: libepc-devel BuildRequires: totem-pl-parser-devel BuildRequires: gail-devel +BuildRequires: evolution-data-server-devel # For the xulrunner patch BuildRequires: intltool autoconf automake libtool gettext check-devel @@ -438,7 +439,7 @@ %changelog * Fri Mar 06 2009 Christopher Aillon - 2.23.2-12 -- BuildRequire: gail-devel +- BuildRequire: gail-devel evolution-data-server-devel * Fri Mar 06 2009 Jan Horak - 2.23.2-11 - Rebuild against newer gecko From mdehaan at fedoraproject.org Fri Mar 6 21:09:22 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 21:09:22 +0000 (UTC) Subject: rpms/cobbler/EL-4 cobbler.spec,1.63,1.64 Message-ID: <20090306210922.477F870116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9391/EL-4 Modified Files: cobbler.spec Log Message: BuildRequires fix worked, so apply to other builds. This should be the last commit on this today, knock on silicon. Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- cobbler.spec 6 Mar 2009 20:54:05 -0000 1.63 +++ cobbler.spec 6 Mar 2009 21:08:51 -0000 1.64 @@ -4,7 +4,7 @@ Name: cobbler AutoReq: no Version: 1.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -22,6 +22,7 @@ Requires: createrepo Requires: python-cheetah Requires: rsync +BuildRequires: PyYAML Requires: PyYAML Requires: libyaml %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 @@ -282,7 +283,7 @@ %changelog -* Fri Mar 06 2009 Michael DeHaan - 1.4.3-3 +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-4 - Upstream changes (see CHANGELOG) - Now requires PyYAML From mdehaan at fedoraproject.org Fri Mar 6 21:09:22 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 21:09:22 +0000 (UTC) Subject: rpms/cobbler/EL-5 cobbler.spec,1.65,1.66 Message-ID: <20090306210922.79B8C70116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9391/EL-5 Modified Files: cobbler.spec Log Message: BuildRequires fix worked, so apply to other builds. This should be the last commit on this today, knock on silicon. Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- cobbler.spec 6 Mar 2009 20:54:05 -0000 1.65 +++ cobbler.spec 6 Mar 2009 21:08:52 -0000 1.66 @@ -4,7 +4,7 @@ Name: cobbler AutoReq: no Version: 1.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -22,6 +22,7 @@ Requires: createrepo Requires: python-cheetah Requires: rsync +BuildRequires: PyYAML Requires: PyYAML Requires: libyaml %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 @@ -282,7 +283,7 @@ %changelog -* Fri Mar 06 2009 Michael DeHaan - 1.4.3-3 +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-4 - Upstream changes (see CHANGELOG) - Now requires PyYAML From mdehaan at fedoraproject.org Fri Mar 6 21:09:23 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 21:09:23 +0000 (UTC) Subject: rpms/cobbler/F-9 cobbler.spec,1.65,1.66 Message-ID: <20090306210923.1438870116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9391/F-9 Modified Files: cobbler.spec Log Message: BuildRequires fix worked, so apply to other builds. This should be the last commit on this today, knock on silicon. Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-9/cobbler.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- cobbler.spec 6 Mar 2009 20:54:05 -0000 1.65 +++ cobbler.spec 6 Mar 2009 21:08:52 -0000 1.66 @@ -4,7 +4,7 @@ Name: cobbler AutoReq: no Version: 1.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -22,6 +22,7 @@ Requires: createrepo Requires: python-cheetah Requires: rsync +BuildRequires: PyYAML Requires: PyYAML Requires: libyaml %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 @@ -282,7 +283,7 @@ %changelog -* Fri Mar 06 2009 Michael DeHaan - 1.4.3-3 +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-4 - Upstream changes (see CHANGELOG) - Now requires PyYAML From mdehaan at fedoraproject.org Fri Mar 6 21:09:22 2009 From: mdehaan at fedoraproject.org (Michael DeHaan) Date: Fri, 6 Mar 2009 21:09:22 +0000 (UTC) Subject: rpms/cobbler/F-10 cobbler.spec,1.68,1.69 Message-ID: <20090306210922.C29CB70116@cvs1.fedora.phx.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9391/F-10 Modified Files: cobbler.spec Log Message: BuildRequires fix worked, so apply to other builds. This should be the last commit on this today, knock on silicon. Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-10/cobbler.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- cobbler.spec 6 Mar 2009 20:54:05 -0000 1.68 +++ cobbler.spec 6 Mar 2009 21:08:52 -0000 1.69 @@ -4,7 +4,7 @@ Name: cobbler AutoReq: no Version: 1.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -22,6 +22,7 @@ Requires: createrepo Requires: python-cheetah Requires: rsync +BuildRequires: PyYAML Requires: PyYAML Requires: libyaml %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 @@ -282,7 +283,7 @@ %changelog -* Fri Mar 06 2009 Michael DeHaan - 1.4.3-3 +* Fri Mar 06 2009 Michael DeHaan - 1.4.3-4 - Upstream changes (see CHANGELOG) - Now requires PyYAML From katzj at fedoraproject.org Fri Mar 6 21:09:33 2009 From: katzj at fedoraproject.org (Jeremy Katz) Date: Fri, 6 Mar 2009 21:09:33 +0000 (UTC) Subject: rpms/mkinitrd/devel .cvsignore, 1.219, 1.220 mkinitrd.spec, 1.313, 1.314 sources, 1.261, 1.262 Message-ID: <20090306210933.7E2FE70116@cvs1.fedora.phx.redhat.com> Author: katzj Update of /cvs/pkgs/rpms/mkinitrd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9701 Modified Files: .cvsignore mkinitrd.spec sources Log Message: * Fri Mar 6 2009 Jeremy Katz - 6.0.80-1 - Fix up a multi live case to work Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mkinitrd/devel/.cvsignore,v retrieving revision 1.219 retrieving revision 1.220 diff -u -r1.219 -r1.220 --- .cvsignore 6 Mar 2009 18:59:50 -0000 1.219 +++ .cvsignore 6 Mar 2009 21:09:02 -0000 1.220 @@ -1 +1 @@ -mkinitrd-6.0.79.tar.bz2 +mkinitrd-6.0.80.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/pkgs/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.313 retrieving revision 1.314 diff -u -r1.313 -r1.314 --- mkinitrd.spec 6 Mar 2009 18:59:50 -0000 1.313 +++ mkinitrd.spec 6 Mar 2009 21:09:03 -0000 1.314 @@ -2,7 +2,7 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 6.0.79 +Version: 6.0.80 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -136,6 +136,9 @@ %dir %{_sysconfdir}/kernel/prerm.d %changelog +* Fri Mar 6 2009 Jeremy Katz - 6.0.80-1 +- Fix up a multi live case to work + * Fri Mar 6 2009 Jeremy Katz - 6.0.79-1 - Fix handling of keymaps which are symlinks (hdegoede, #485615) - Show splash later for live images (mccann) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mkinitrd/devel/sources,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- sources 6 Mar 2009 18:59:50 -0000 1.261 +++ sources 6 Mar 2009 21:09:03 -0000 1.262 @@ -1 +1 @@ -479c6b4c12f2db95472ab625bc9ea74c mkinitrd-6.0.79.tar.bz2 +3dc9ca627c7e2bb9520dc0d5ee1effc0 mkinitrd-6.0.80.tar.bz2 From rdieter at fedoraproject.org Fri Mar 6 21:10:01 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 21:10:01 +0000 (UTC) Subject: rpms/koffice/devel koffice-1.6.3-gcc43.patch, 1.4, 1.5 koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff, 1.4, 1.5 koffice-20090306svn.patch, NONE, 1.1 koffice-svn_checkout.sh, NONE, 1.1 koffice-xpdf-CVE-2007-3387.diff, 1.4, 1.5 .cvsignore, 1.26, 1.27 koffice.spec, 1.97, 1.98 sources, 1.26, 1.27 exiv2-0.18-attempt1.diff, 1.1, NONE Message-ID: <20090306211001.743A970116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/koffice/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10095 Modified Files: .cvsignore koffice.spec sources Added Files: koffice-1.6.3-gcc43.patch koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff koffice-20090306svn.patch koffice-svn_checkout.sh koffice-xpdf-CVE-2007-3387.diff Removed Files: exiv2-0.18-attempt1.diff Log Message: * Fri Mar 06 2009 Rex Dieter 2:1.1.6-19 - revert koffice2 -> koffice1, Epoch bump - 20090306svn koffice-1.6.3-gcc43.patch: Index: koffice-1.6.3-gcc43.patch =================================================================== RCS file: koffice-1.6.3-gcc43.patch diff -N koffice-1.6.3-gcc43.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ koffice-1.6.3-gcc43.patch 6 Mar 2009 21:10:00 -0000 1.5 @@ -0,0 +1,126 @@ +# svn diff -c 729276 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/ +# svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/ + +Index: koffice/krita/core/kis_perspective_math.cpp +=================================================================== +--- koffice/krita/core/kis_perspective_math.cpp (revision 738928) ++++ koffice/krita/core/kis_perspective_math.cpp (revision 738929) +@@ -24,7 +24,7 @@ + + #if 1 + +-#include ++#include + #include + #include + //#define NDEBUG // uncomment to remove checking of assert() +@@ -57,9 +57,9 @@ + void rprint()const; //print entries on a single line + void resize(int n); + int operator==(const vector& v)const; +- friend vector operator*(ElType c,vector& v ); +- friend vector operator*(vector& v,ElType c ); +- friend ostream& operator<<(ostream& s,vector& v); ++ friend vector operator* (ElType c,vector& v ); ++ friend vector operator*(vector& v,ElType c ); ++ friend std::ostream& operator<<(std::ostream& s,vector& v); + }; + template + void vector::zero() +@@ -129,10 +129,10 @@ + void vector::rprint()const //print entries on a single line + { + int i; +- cout << "VECTOR: "; +- cout << "("; +- for(i=0;i +@@ -164,7 +164,7 @@ + return ans; + } + template +- ostream& operator<<(ostream& s,vector& v) ++ std::ostream& operator<<(std::ostream& s,vector& v) + { + s << "("; + for(int i=0;i operator-(const matrix& a); + matrix transpose(); + //matrix inverse(); +- friend ostream& operator<<(ostream& s,matrix& m); ++ friend std::ostream& operator<<(std::ostream& s,matrix& m); + friend void ludcmp(matrix& a,vector& indx,double &d); + friend void lubksb(matrix&a,vector& indx,vector&b); + }; +@@ -357,7 +357,7 @@ + return ans; + } + template +- ostream& operator<<(ostream& s,matrix& m) ++ std::ostream& operator<<(std::ostream& s,matrix& m) + { + for(int i=0; i big) big=temp; + /* kdDebug() << temp << " " << fabs(a[i][j]) << " "<< big <text(); + } + +-bool Cell::setText(const QString& text, bool asString) { +- +- //FIXME: there is some problem with asString parameter, when it's set +- //to true KSpread says: ASSERT: "f" in Dependencies.cpp (621) +- //kspread: Cell at row 6, col 1 marked as formula, but formula is NULL +- ++bool Cell::setText(const QString& text) { + KSpread::ProtectedCheck prot; + prot.setSheet (m_sheet); + prot.add (QPoint (m_col, m_row)); +@@ -189,7 +184,7 @@ + KSpread::DataManipulator *dm = new KSpread::DataManipulator (); + dm->setSheet (m_sheet); + dm->setValue (text); +- dm->setParsing (!asString); ++ dm->setParsing (true); + dm->add (QPoint (m_col, m_row)); + dm->execute (); + +Index: koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h +=================================================================== +--- koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h (revision 729275) ++++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h (revision 729276) +@@ -131,11 +131,10 @@ + */ + const QString text() const; + /** +- * Set the text of the cell. If asString is true, the text +- * will be handled as string else we try to parse the +- * string to the expected value. ++ * Set the text of the cell. the text ++ * will be handled as string + */ +- bool setText(const QString& text, bool asString = false); ++ bool setText(const QString& text); + + /** + * Return the textcolor as RGB-value in the format "#RRGGBB". koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff: Index: koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff =================================================================== RCS file: koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff diff -N koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff 6 Mar 2009 21:10:00 -0000 1.5 @@ -0,0 +1,669 @@ +--- filters/kword/pdf/xpdf/xpdf/Stream.cc ++++ filters/kword/pdf/xpdf/xpdf/Stream.cc +@@ -1239,6 +1239,7 @@ + // CCITTFaxStream + //------------------------------------------------------------------------ + ++#if 0 + CCITTFaxStream::CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA, + GBool byteAlignA, int columnsA, int rowsA, + GBool endOfBlockA, GBool blackA): +@@ -1748,6 +1749,609 @@ + } + return (inputBuf >> (inputBits - n)) & (0xffff >> (16 - n)); + } ++#else // secfix ++CCITTFaxStream::CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA, ++ GBool byteAlignA, int columnsA, int rowsA, ++ GBool endOfBlockA, GBool blackA): ++ FilterStream(strA) { ++ encoding = encodingA; ++ endOfLine = endOfLineA; ++ byteAlign = byteAlignA; ++ columns = columnsA; ++ if (columns < 1) { ++ columns = 1; ++ } else if (columns > (INT_MAX - 2)/sizeof(int)) { ++ columns = (INT_MAX - 2)/sizeof(int); ++ } ++ rows = rowsA; ++ endOfBlock = endOfBlockA; ++ black = blackA; ++ // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = columns ++ // ---> max codingLine size = columns + 1 ++ // refLine has one extra guard entry at the end ++ // ---> max refLine size = columns + 2 ++ codingLine = (int *)gmalloc((columns + 1) * sizeof(int)); ++ refLine = (int *)gmalloc((columns + 2) * sizeof(int)); ++ ++ eof = gFalse; ++ row = 0; ++ nextLine2D = encoding < 0; ++ inputBits = 0; ++ codingLine[0] = columns; ++ a0i = 0; ++ outputBits = 0; ++ ++ buf = EOF; ++} ++ ++CCITTFaxStream::~CCITTFaxStream() { ++ delete str; ++ gfree(refLine); ++ gfree(codingLine); ++} ++ ++void CCITTFaxStream::reset() { ++ short code1; ++ ++ str->reset(); ++ eof = gFalse; ++ row = 0; ++ nextLine2D = encoding < 0; ++ inputBits = 0; ++ codingLine[0] = columns; ++ a0i = 0; ++ outputBits = 0; ++ buf = EOF; ++ ++ // skip any initial zero bits and end-of-line marker, and get the 2D ++ // encoding tag ++ while ((code1 = lookBits(12)) == 0) { ++ eatBits(1); ++ } ++ if (code1 == 0x001) { ++ eatBits(12); ++ } ++ if (encoding > 0) { ++ nextLine2D = !lookBits(1); ++ eatBits(1); ++ } ++} ++ ++inline void CCITTFaxStream::addPixels(int a1, int blackPixels) { ++ if (a1 > codingLine[a0i]) { ++ if (a1 > columns) { ++ error(getPos(), "CCITTFax row is wrong length (%d)", a1); ++ err = gTrue; ++ a1 = columns; ++ } ++ if ((a0i & 1) ^ blackPixels) { ++ ++a0i; ++ } ++ codingLine[a0i] = a1; ++ } ++} ++ ++inline void CCITTFaxStream::addPixelsNeg(int a1, int blackPixels) { ++ if (a1 > codingLine[a0i]) { ++ if (a1 > columns) { ++ error(getPos(), "CCITTFax row is wrong length (%d)", a1); ++ err = gTrue; ++ a1 = columns; ++ } ++ if ((a0i & 1) ^ blackPixels) { ++ ++a0i; ++ } ++ codingLine[a0i] = a1; ++ } else if (a1 < codingLine[a0i]) { ++ if (a1 < 0) { ++ error(getPos(), "Invalid CCITTFax code"); ++ err = gTrue; ++ a1 = 0; ++ } ++ while (a0i > 0 && a1 <= codingLine[a0i - 1]) { ++ --a0i; ++ } ++ codingLine[a0i] = a1; ++ } ++} ++ ++int CCITTFaxStream::lookChar() { ++ short code1, code2, code3; ++ int b1i, blackPixels, i, bits; ++ GBool gotEOL; ++ ++ if (buf != EOF) { ++ return buf; ++ } ++ ++ // read the next row ++ if (outputBits == 0) { ++ ++ // if at eof just return EOF ++ if (eof) { ++ return EOF; ++ } ++ ++ err = gFalse; ++ ++ // 2-D encoding ++ if (nextLine2D) { ++ for (i = 0; codingLine[i] < columns; ++i) { ++ refLine[i] = codingLine[i]; ++ } ++ refLine[i++] = columns; ++ refLine[i] = columns; ++ codingLine[0] = 0; ++ a0i = 0; ++ b1i = 0; ++ blackPixels = 0; ++ // invariant: ++ // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1] ++ // <= columns ++ // exception at left edge: ++ // codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible ++ // exception at right edge: ++ // refLine[b1i] = refLine[b1i+1] = columns is possible ++ while (codingLine[a0i] < columns) { ++ code1 = getTwoDimCode(); ++ switch (code1) { ++ case twoDimPass: ++ addPixels(refLine[b1i + 1], blackPixels); ++ if (refLine[b1i + 1] < columns) { ++ b1i += 2; ++ } ++ break; ++ case twoDimHoriz: ++ code1 = code2 = 0; ++ if (blackPixels) { ++ do { ++ code1 += code3 = getBlackCode(); ++ } while (code3 >= 64); ++ do { ++ code2 += code3 = getWhiteCode(); ++ } while (code3 >= 64); ++ } else { ++ do { ++ code1 += code3 = getWhiteCode(); ++ } while (code3 >= 64); ++ do { ++ code2 += code3 = getBlackCode(); ++ } while (code3 >= 64); ++ } ++ addPixels(codingLine[a0i] + code1, blackPixels); ++ if (codingLine[a0i] < columns) { ++ addPixels(codingLine[a0i] + code2, blackPixels ^ 1); ++ } ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; ++ } ++ break; ++ case twoDimVertR3: ++ addPixels(refLine[b1i] + 3, blackPixels); ++ blackPixels ^= 1; ++ if (codingLine[a0i] < columns) { ++ ++b1i; ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; ++ } ++ } ++ break; ++ case twoDimVertR2: ++ addPixels(refLine[b1i] + 2, blackPixels); ++ blackPixels ^= 1; ++ if (codingLine[a0i] < columns) { ++ ++b1i; ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; ++ } ++ } ++ break; ++ case twoDimVertR1: ++ addPixels(refLine[b1i] + 1, blackPixels); ++ blackPixels ^= 1; ++ if (codingLine[a0i] < columns) { ++ ++b1i; ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; ++ } ++ } ++ break; ++ case twoDimVert0: ++ addPixels(refLine[b1i], blackPixels); ++ blackPixels ^= 1; ++ if (codingLine[a0i] < columns) { ++ ++b1i; ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; ++ } ++ } ++ break; ++ case twoDimVertL3: ++ addPixelsNeg(refLine[b1i] - 3, blackPixels); ++ blackPixels ^= 1; ++ if (codingLine[a0i] < columns) { ++ if (b1i > 0) { ++ --b1i; ++ } else { ++ ++b1i; ++ } ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; ++ } ++ } ++ break; ++ case twoDimVertL2: ++ addPixelsNeg(refLine[b1i] - 2, blackPixels); ++ blackPixels ^= 1; ++ if (codingLine[a0i] < columns) { ++ if (b1i > 0) { ++ --b1i; ++ } else { ++ ++b1i; ++ } ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; ++ } ++ } ++ break; ++ case twoDimVertL1: ++ addPixelsNeg(refLine[b1i] - 1, blackPixels); ++ blackPixels ^= 1; ++ if (codingLine[a0i] < columns) { ++ if (b1i > 0) { ++ --b1i; ++ } else { ++ ++b1i; ++ } ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; ++ } ++ } ++ break; ++ case EOF: ++ addPixels(columns, 0); ++ eof = gTrue; ++ break; ++ default: ++ error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1); ++ addPixels(columns, 0); ++ err = gTrue; ++ break; ++ } ++ } ++ ++ // 1-D encoding ++ } else { ++ codingLine[0] = 0; ++ a0i = 0; ++ blackPixels = 0; ++ while (codingLine[a0i] < columns) { ++ code1 = 0; ++ if (blackPixels) { ++ do { ++ code1 += code3 = getBlackCode(); ++ } while (code3 >= 64); ++ } else { ++ do { ++ code1 += code3 = getWhiteCode(); ++ } while (code3 >= 64); ++ } ++ addPixels(codingLine[a0i] + code1, blackPixels); ++ blackPixels ^= 1; ++ } ++ } ++ ++ // byte-align the row ++ if (byteAlign) { ++ inputBits &= ~7; ++ } ++ ++ // check for end-of-line marker, skipping over any extra zero bits ++ gotEOL = gFalse; ++ if (!endOfBlock && row == rows - 1) { ++ eof = gTrue; ++ } else { ++ code1 = lookBits(12); ++ while (code1 == 0) { ++ eatBits(1); ++ code1 = lookBits(12); ++ } ++ if (code1 == 0x001) { ++ eatBits(12); ++ gotEOL = gTrue; ++ } else if (code1 == EOF) { ++ eof = gTrue; ++ } ++ } ++ ++ // get 2D encoding tag ++ if (!eof && encoding > 0) { ++ nextLine2D = !lookBits(1); ++ eatBits(1); ++ } ++ ++ // check for end-of-block marker ++ if (endOfBlock && gotEOL) { ++ code1 = lookBits(12); ++ if (code1 == 0x001) { ++ eatBits(12); ++ if (encoding > 0) { ++ lookBits(1); ++ eatBits(1); ++ } ++ if (encoding >= 0) { ++ for (i = 0; i < 4; ++i) { ++ code1 = lookBits(12); ++ if (code1 != 0x001) { ++ error(getPos(), "Bad RTC code in CCITTFax stream"); ++ } ++ eatBits(12); ++ if (encoding > 0) { ++ lookBits(1); ++ eatBits(1); ++ } ++ } ++ } ++ eof = gTrue; ++ } ++ ++ // look for an end-of-line marker after an error -- we only do ++ // this if we know the stream contains end-of-line markers because ++ // the "just plow on" technique tends to work better otherwise ++ } else if (err && endOfLine) { ++ while (1) { ++ code1 = lookBits(13); ++ if (code1 == EOF) { ++ eof = gTrue; ++ return EOF; ++ } ++ if ((code1 >> 1) == 0x001) { ++ break; ++ } ++ eatBits(1); ++ } ++ eatBits(12); ++ if (encoding > 0) { ++ eatBits(1); ++ nextLine2D = !(code1 & 1); ++ } ++ } ++ ++ // set up for output ++ if (codingLine[0] > 0) { ++ outputBits = codingLine[a0i = 0]; ++ } else { ++ outputBits = codingLine[a0i = 1]; ++ } ++ ++ ++row; ++ } ++ ++ // get a byte ++ if (outputBits >= 8) { ++ buf = (a0i & 1) ? 0x00 : 0xff; ++ outputBits -= 8; ++ if (outputBits == 0 && codingLine[a0i] < columns) { ++ ++a0i; ++ outputBits = codingLine[a0i] - codingLine[a0i - 1]; ++ } ++ } else { ++ bits = 8; ++ buf = 0; ++ do { ++ if (outputBits > bits) { ++ buf <<= bits; ++ if (!(a0i & 1)) { ++ buf |= 0xff >> (8 - bits); ++ } ++ outputBits -= bits; ++ bits = 0; ++ } else { ++ buf <<= outputBits; ++ if (!(a0i & 1)) { ++ buf |= 0xff >> (8 - outputBits); ++ } ++ bits -= outputBits; ++ outputBits = 0; ++ if (codingLine[a0i] < columns) { ++ ++a0i; ++ outputBits = codingLine[a0i] - codingLine[a0i - 1]; ++ } else if (bits > 0) { ++ buf <<= bits; ++ bits = 0; ++ } ++ } ++ } while (bits); ++ } ++ if (black) { ++ buf ^= 0xff; ++ } ++ return buf; ++} ++ ++short CCITTFaxStream::getTwoDimCode() { ++ short code; ++ CCITTCode *p; ++ int n; ++ ++ code = 0; // make gcc happy ++ if (endOfBlock) { ++ code = lookBits(7); ++ p = &twoDimTab1[code]; ++ if (p->bits > 0) { ++ eatBits(p->bits); ++ return p->n; ++ } ++ } else { ++ for (n = 1; n <= 7; ++n) { ++ code = lookBits(n); ++ if (n < 7) { ++ code <<= 7 - n; ++ } ++ p = &twoDimTab1[code]; ++ if (p->bits == n) { ++ eatBits(n); ++ return p->n; ++ } ++ } ++ } ++ error(getPos(), "Bad two dim code (%04x) in CCITTFax stream", code); ++ return EOF; ++} ++ ++short CCITTFaxStream::getWhiteCode() { ++ short code; ++ CCITTCode *p; ++ int n; ++ ++ code = 0; // make gcc happy ++ if (endOfBlock) { ++ code = lookBits(12); ++ if (code == EOF) { ++ return 1; ++ } ++ if ((code >> 5) == 0) { ++ p = &whiteTab1[code]; ++ } else { ++ p = &whiteTab2[code >> 3]; ++ } ++ if (p->bits > 0) { ++ eatBits(p->bits); ++ return p->n; ++ } ++ } else { ++ for (n = 1; n <= 9; ++n) { ++ code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } ++ if (n < 9) { ++ code <<= 9 - n; ++ } ++ p = &whiteTab2[code]; ++ if (p->bits == n) { ++ eatBits(n); ++ return p->n; ++ } ++ } ++ for (n = 11; n <= 12; ++n) { ++ code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } ++ if (n < 12) { ++ code <<= 12 - n; ++ } ++ p = &whiteTab1[code]; ++ if (p->bits == n) { ++ eatBits(n); ++ return p->n; ++ } ++ } ++ } ++ error(getPos(), "Bad white code (%04x) in CCITTFax stream", code); ++ // eat a bit and return a positive number so that the caller doesn't ++ // go into an infinite loop ++ eatBits(1); ++ return 1; ++} ++ ++short CCITTFaxStream::getBlackCode() { ++ short code; ++ CCITTCode *p; ++ int n; ++ ++ code = 0; // make gcc happy ++ if (endOfBlock) { ++ code = lookBits(13); ++ if (code == EOF) { ++ return 1; ++ } ++ if ((code >> 7) == 0) { ++ p = &blackTab1[code]; ++ } else if ((code >> 9) == 0 && (code >> 7) != 0) { ++ p = &blackTab2[(code >> 1) - 64]; ++ } else { ++ p = &blackTab3[code >> 7]; ++ } ++ if (p->bits > 0) { ++ eatBits(p->bits); ++ return p->n; ++ } ++ } else { ++ for (n = 2; n <= 6; ++n) { ++ code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } ++ if (n < 6) { ++ code <<= 6 - n; ++ } ++ p = &blackTab3[code]; ++ if (p->bits == n) { ++ eatBits(n); ++ return p->n; ++ } ++ } ++ for (n = 7; n <= 12; ++n) { ++ code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } ++ if (n < 12) { ++ code <<= 12 - n; ++ } ++ if (code >= 64) { ++ p = &blackTab2[code - 64]; ++ if (p->bits == n) { ++ eatBits(n); ++ return p->n; ++ } ++ } ++ } ++ for (n = 10; n <= 13; ++n) { ++ code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } ++ if (n < 13) { ++ code <<= 13 - n; ++ } ++ p = &blackTab1[code]; ++ if (p->bits == n) { ++ eatBits(n); ++ return p->n; ++ } ++ } ++ } ++ error(getPos(), "Bad black code (%04x) in CCITTFax stream", code); ++ // eat a bit and return a positive number so that the caller doesn't ++ // go into an infinite loop ++ eatBits(1); ++ return 1; ++} ++ ++short CCITTFaxStream::lookBits(int n) { ++ int c; ++ ++ while (inputBits < n) { ++ if ((c = str->getChar()) == EOF) { ++ if (inputBits == 0) { ++ return EOF; ++ } ++ // near the end of the stream, the caller may ask for more bits ++ // than are available, but there may still be a valid code in ++ // however many bits are available -- we need to return correct ++ // data in this case ++ return (inputBuf << (n - inputBits)) & (0xffff >> (16 - n)); ++ } ++ inputBuf = (inputBuf << 8) + c; ++ inputBits += 8; ++ } ++ return (inputBuf >> (inputBits - n)) & (0xffff >> (16 - n)); ++} ++ ++#endif + + GString *CCITTFaxStream::getPSFilter(const char *indent) { + GString *s; +@@ -1929,6 +2533,12 @@ + // allocate a buffer for the whole image + bufWidth = ((width + mcuWidth - 1) / mcuWidth) * mcuWidth; + bufHeight = ((height + mcuHeight - 1) / mcuHeight) * mcuHeight; ++ if (bufWidth <= 0 || bufHeight <= 0 || ++ bufWidth > INT_MAX / bufWidth / (int)sizeof(int)) { ++ error(getPos(), "Invalid image size in DCT stream"); ++ y = height; ++ return; ++ } + for (i = 0; i < numComps; ++i) { + frameBuf[i] = (int *)gmalloc(bufWidth * bufHeight * sizeof(int)); + memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int)); +@@ -2975,6 +3585,11 @@ + } + scanInfo.firstCoeff = str->getChar(); + scanInfo.lastCoeff = str->getChar(); ++ if (scanInfo.firstCoeff < 0 || scanInfo.lastCoeff > 63 || ++ scanInfo.firstCoeff > scanInfo.lastCoeff) { ++ error(getPos(), "Bad DCT coefficient numbers in scan info block"); ++ return gFalse; ++ } + c = str->getChar(); + scanInfo.ah = (c >> 4) & 0x0f; + scanInfo.al = c & 0x0f; +--- filters/kword/pdf/xpdf/xpdf/Stream.h ++++ filters/kword/pdf/xpdf/xpdf/Stream.h +@@ -513,13 +513,17 @@ + int row; // current row + int inputBuf; // input buffer + int inputBits; // number of bits in input buffer +- short *refLine; // reference line changing elements +- int b1; // index into refLine +- short *codingLine; // coding line changing elements +- int a0; // index into codingLine ++ int *codingLine; // coding line changing elements ++ int *refLine; // reference line changing elements ++ int a0i; // index into codingLine ++ GBool err; // error on current line ++ + int outputBits; // remaining output bits + int buf; // character buffer + ++ void addPixels(int a1, int black); ++ void addPixelsNeg(int a1, int black); ++ + short getTwoDimCode(); + short getWhiteCode(); + short getBlackCode(); koffice-20090306svn.patch: --- NEW FILE koffice-20090306svn.patch --- Only in koffice-1.6.3/: acinclude.m4 Only in koffice-1.6.3/: aclocal.m4 diff -urbB --minimal --exclude=.svn koffice-1.6.3/admin/acinclude.m4.in koffice-1.6-branch/admin/acinclude.m4.in --- koffice-1.6.3/admin/acinclude.m4.in 2007-05-30 16:50:22.000000000 -0500 +++ koffice-1.6-branch/admin/acinclude.m4.in 2008-11-03 12:17:22.000000000 -0600 @@ -1226,7 +1226,15 @@ kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" fi if test $kde_qtver = 3; then - kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" + kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3" + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + if test "$PKG_CONFIG" != "no" ; then + if $PKG_CONFIG --exists qt-mt ; then + kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`" + fi + fi fi if test $kde_qtver = 2; then kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt" @@ -1443,6 +1451,14 @@ for dir in $kde_qt_dirs; do qt_incdirs="$qt_incdirs $dir/include $dir" done +if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +fi +if test "$PKG_CONFIG" != "no" ; then + if $PKG_CONFIG --exists qt-mt ; then + qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`" + fi +fi qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" if test ! "$ac_qt_includes" = "NO"; then qt_incdirs="$ac_qt_includes $qt_incdirs" @@ -1459,8 +1475,16 @@ qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir" done +if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +fi +if test "$PKG_CONFIG" != "no" ; then + if $PKG_CONFIG --exists qt-mt ; then + qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`" + fi +fi qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then qt_libdir=$ac_qt_libraries @@ -2631,6 +2655,7 @@ AC_TRY_LINK(dnl [ #include +#include ], [ char buf[42]; @@ -2638,7 +2663,7 @@ /* this would segfault.. but we only link, don't run */ (void) gzgets(f, buf, sizeof(buf)); - return (zlibVersion() == ZLIB_VERSION); + return (strcmp(zlibVersion(), ZLIB_VERSION) == 0); ], eval "ac_cv_lib_z='-lz'", eval "ac_cv_lib_z=no") @@ -2738,11 +2763,11 @@ echo "*** to the full path to pkg-config." echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." else - if !(`$PKG_CONFIG --exists OpenEXR`) ; then + if ! $PKG_CONFIG --exists OpenEXR ; then AC_MSG_RESULT(no) EXRSTATUS=no else - if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then + if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then AC_MSG_RESULT(no) EXRSTATUS=old else @@ -4624,7 +4649,8 @@ AC_DEFUN([KDE_CHECK_PYTHON], [ - KDE_CHECK_PYTHON_INTERN("2.5", + KDE_CHECK_PYTHON_INTERN("2.6", + [KDE_CHECK_PYTHON_INTERN("2.5", [KDE_CHECK_PYTHON_INTERN("2.4", [KDE_CHECK_PYTHON_INTERN("2.3", [KDE_CHECK_PYTHON_INTERN("2.2", @@ -4636,6 +4662,7 @@ ]) ]) ]) + ]) ]) AC_DEFUN([KDE_CHECK_STL], diff -urbB --minimal --exclude=.svn koffice-1.6.3/admin/cvs.sh koffice-1.6-branch/admin/cvs.sh --- koffice-1.6.3/admin/cvs.sh 2007-05-30 16:50:22.000000000 -0500 +++ koffice-1.6-branch/admin/cvs.sh 2008-11-03 12:17:22.000000000 -0600 @@ -316,7 +316,7 @@ fi fi if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then - VERSION="\"3.5.7\"" + VERSION="\"3.5.10\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then modulename=`pwd`; diff -urbB --minimal --exclude=.svn koffice-1.6.3/admin/detect-autoconf.pl koffice-1.6-branch/admin/detect-autoconf.pl --- koffice-1.6.3/admin/detect-autoconf.pl 2007-05-30 16:50:22.000000000 -0500 +++ koffice-1.6-branch/admin/detect-autoconf.pl 2008-11-03 12:17:22.000000000 -0600 @@ -21,6 +21,73 @@ return ""; } +# Subroutine to lexicographically compare two version strings, a and b. +# If a > b, 1 is returned. +# If a == b, 0 is returned. +# If a < b, -1 is returned. +# +# If the strings are of uneven number length then the shorter string is +# prepended by enough zeroes to make the two string lengths equal in order to +# allow an accurate comparison. Note that the zero-padding only occurs in +# between version separators (i.e. 1.6 and 1.10, results in 1.06 vs. 1.10). +# Parts of the version ending in -foo (or any other text) are not considered +# when doing the compare. (i.e. 2.53a vs 2.53 doesn't end up in 2.53a vs. +# 2.053) +sub compareVersions +{ + my ($a, $b) = @_; + + # Split the strings up by '.' (version separator) and start comparing digit + # length. + + my @aParts = split(/\./, $a); + my @bParts = split(/\./, $b); + + # Make the arrays equal in length by adding missing zeroes to the end of the + # version. + push @aParts, '0' while scalar @aParts < scalar @bParts; + push @bParts, '0' while scalar @bParts < scalar @aParts; + + # Now compare each individual portion. + for (my $i = 0; $i < scalar @aParts; ++$i) + { + # Make sure that any portion that has numbers is contiguous. I'm sure + # there's a technique for saving stuff like 2.52a2 but I don't feel + # like implementing it. + if ($aParts[$i] !~ /^[^\d]*\d+[^\d]*$/ or + $bParts[$i] !~ /^[^\d]*\d+[^\d]*$/) + { + die "Not able to compare $a to $b!\n"; + } + + my ($aDigits) = ($aParts[$i] =~ /(\d+)/); + my ($bDigits) = ($bParts[$i] =~ /(\d+)/); + + # Perl is $MODERATELY_INSULTING_TERM, don't remove the parentheses in + # the delta calculation below. + my $delta = (length $aDigits) - (length $bDigits); + if ($delta < 0) # b is longer + { + my $replacement = ('0' x (-$delta)) . $aDigits; + $aParts[$i] =~ s/$aDigits/$replacement/; + } + elsif ($delta > 0) # a is longer + { + my $replacement = ('0' x $delta) . $bDigits; + $bParts[$i] =~ s/$bDigits/$replacement/; + } + } + + # Arrays now have standardized version components, let's re-merge them + # to strings to do the compare. + my $newA = join('.', @aParts); + my $newB = join('.', @bParts); + + return 1 if ($newA gt $newB); + return -1 if ($newA lt $newB); + return 0; +} + # Subroutine to determine the highest installed version of the given program, # searching from the given paths. sub findBest @@ -32,6 +99,7 @@ 'autoconf' => '2.5', 'automake' => '1.6', ); + my $sgn; # Used for compareVersions results. [...25664 lines suppressed...] +Comment[lt]=Patikrinti ??io ??od??io ra??yb?? Comment[lv]=P??rbaud??t ???? v??rda pareizrakst??bu Comment[ms]=Semak Ejaan Kata ini Comment[mt]=I????ekkja kif tispelli dil-kelma @@ -119,7 +122,8 @@ Comment[th]=??????????????????????????????????????????????????????????????? Comment[tr]=Bu Kelimenin ??mla Denetimini Yap Comment[uk]=???????????????????? ???????????????? ?????????? ?????????? -Comment[uz]=???? ?????????????? ???????????????? ???????????????? +Comment[uz]=Shu so??zning imlosini tekshirish +Comment[uz at cyrillic]=???? ?????????????? ???????????????? ???????????????? Comment[wa]=Coridj?? l'??ortografeye di ??'??mot ci... Comment[xh]=Khangela olu Pelo Magama Comment[zh_CN]=?????????????????? Only in koffice-1.6.3/tools/spell: Makefile.in diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/spell/uninstall.desktop koffice-1.6-branch/tools/spell/uninstall.desktop --- koffice-1.6.3/tools/spell/uninstall.desktop 2007-05-30 16:36:09.000000000 -0500 +++ koffice-1.6-branch/tools/spell/uninstall.desktop 2008-11-03 11:55:08.000000000 -0600 @@ -1,3 +1,2 @@ [Desktop Entry] -Encoding=UTF-8 Hidden=true Only in koffice-1.6.3/tools/thesaurus: Makefile.in diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thesaurus/thesaurustool.desktop koffice-1.6-branch/tools/thesaurus/thesaurustool.desktop --- koffice-1.6.3/tools/thesaurus/thesaurustool.desktop 2007-05-30 16:36:11.000000000 -0500 +++ koffice-1.6-branch/tools/thesaurus/thesaurustool.desktop 2008-11-03 11:55:11.000000000 -0600 @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Icon= Name=Thesaurus Tool Name[af]=Thesaurus Program @@ -14,13 +13,14 @@ Name[da]=Thesaurusv??rkt??j Name[de]=Thesaurus-Werkzeug Name[el]=???????????????? ?????????????????? -Name[eo]=Teza??ro +Name[eo]=Teza??rilo Name[es]=Herramienta de Thesaurus Name[et]=Tesaurus Name[eu]=Thesaurus tresna Name[fa]=?????????? Thesaurus Name[fi]=Synonyymisanakirja Name[fr]=Outil Th??saurus +Name[fy]=Thesaurus ark Name[gl]=Ferramenta de Sin??nimos Name[he]=?????? ?????????? Name[hi]=?????????????????? ????????????????????? ?????? ???????????? @@ -40,7 +40,7 @@ Name[ne]=??????????????????????????? ??????????????? Name[nl]=Thesaurus hulpprogramma Name[nn]=Synonymordbok -Name[pl]=Thesaurus +Name[pl]=Tezaurus Name[pt]=Ferramenta de Sin??nimos Name[pt_BR]=Ferramenta Thesaurus Name[ru]=???????????????? @@ -55,7 +55,8 @@ Name[th]=???????????????????????????????????????????????? Name[tr]=Thesaurus Arac?? Name[uk]=?????????? ?????????????????? -Name[uz]=???????????????? ???????????????? +Name[uz]=Tezaurus vositasi +Name[uz at cyrillic]=???????????????? ???????????????? Name[xh]=Isixhobo se Thesaurus Name[zh_CN]=???????????? Name[zh_TW]=??????????????? @@ -65,7 +66,7 @@ Comment=Show Related Words Comment[af]=Vertoon Verwanter Woorde Comment[ar]=?????????? ?????????????? ?????? ?????????????? -Comment[bg]=?????????????? ???? ???????????????? ???? ???????????? +Comment[bg]=?????????????? ???? ???????????????? Comment[bs]=Prika??i srodne rije??i Comment[ca]=Mostra paraules relacionades Comment[cs]=Zobrazit podobn?? slova @@ -80,6 +81,7 @@ Comment[fa]=?????????? ????????????????? ?????????? Comment[fi]=N??yt?? samankaltaiset sanat Comment[fr]=Afficher les mots li??s +Comment[fy]=Ferlykbere wurden sjen litte Comment[gl]=Mostrar as Palabras Relacionadas Comment[he]=?????? ?????????? ???????????? Comment[hi]=??????????????????????????? ???????????? ?????????????????? @@ -90,11 +92,12 @@ Comment[ja]=?????????????????? Comment[km]=????????????????????????????????????????????????????????????????????? Comment[lo]=???????????????????????????????????????????????????????????? +Comment[lt]=Parodyti susijusius ??od??ius Comment[lv]=R??d??t saist??tos v??rdus Comment[ms]=Tayang Kata Berkaitan Comment[mt]=Uri kliem relatati Comment[nb]=Vis ord som ligner -Comment[nds]=Toh??ren W????r wiesen +Comment[nds]=Lieke W????r wiesen Comment[ne]=??????????????????????????? ????????????????????? ????????????????????????????????? Comment[nl]=Toon gerelateerde woorden Comment[nn]=Vis n??rskylde ord @@ -112,7 +115,8 @@ Comment[th]=???????????????????????????????????????????????????????????? Comment[tr]=??lgili Kelimeleri G??ster Comment[uk]=???????????????? ??????'?????????? ?????????? -Comment[uz]=???????????? ???????????? ???????????????? ???????????????? +Comment[uz]=Bog??liq bo??lgan so??zlarni ko??rsatish +Comment[uz at cyrillic]=???????????? ???????????? ???????????????? ???????????????? Comment[wa]=Mostrer les mots k'??ont-st a vey avou Comment[xh]=Bonisa Amagama Ahlobeneyo Comment[zh_CN]=?????????????????? diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thumbnail/clipartthumbnail.desktop koffice-1.6-branch/tools/thumbnail/clipartthumbnail.desktop --- koffice-1.6.3/tools/thumbnail/clipartthumbnail.desktop 2007-05-30 16:36:12.000000000 -0500 +++ koffice-1.6-branch/tools/thumbnail/clipartthumbnail.desktop 2008-11-03 11:55:13.000000000 -0600 @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Type=Service Name=Clipart Name[af]=Kitskuns @@ -36,7 +35,8 @@ Name[sr at Latn]=Ise??ci Name[th]=??????????????????????????? Name[uk]=???????????????????? -Name[uz]=?????????????? +Name[uz]=Klipart +Name[uz at cyrillic]=?????????????? Name[zh_CN]=????????? Name[zh_TW]=????????? ServiceTypes=ThumbCreator diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thumbnail/kofficethumbnail.desktop koffice-1.6-branch/tools/thumbnail/kofficethumbnail.desktop --- koffice-1.6.3/tools/thumbnail/kofficethumbnail.desktop 2007-05-30 16:36:12.000000000 -0500 +++ koffice-1.6-branch/tools/thumbnail/kofficethumbnail.desktop 2008-11-03 11:55:13.000000000 -0600 @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Type=Service Name=KOffice Files Name[af]=Koffice L??ers @@ -13,7 +12,7 @@ Name[da]=KOffice-filer Name[de]=KOffice-Dateien Name[el]=???????????? KOffice -Name[eo]=KOficejo-dosieroj +Name[eo]=KOffice-dosieroj Name[es]=Archivos de KOffice Name[et]=KOffice'i failid Name[eu]=KOffice-en fitxategiak @@ -21,6 +20,7 @@ Name[fi]=KOffice-tiedostot Name[fo]=KSkrivstovu-f??lir Name[fr]=Fichiers KOffice +Name[fy]=KOffice-triemmen Name[ga]=Comhaid KOffice Name[gl]=Ficheiros de KOffice Name[he]=???????? KOffice @@ -58,7 +58,8 @@ Name[th]=??????????????????????????????????????????????????????????????????????????? K Name[tr]=KOffice Dosyalar?? Name[uk]=?????????? KOffice -Name[uz]=KOffice ???????????????? +Name[uz]=KOffice fayllari +Name[uz at cyrillic]=KOffice ???????????????? Name[wa]=Fitch??s KOffice Name[xh]=Iifayile ze KOffice Name[zh_CN]=KOffice ?????? Only in koffice-1.6.3/tools/thumbnail: Makefile.in diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thumbnail/otherofficethumbnail.desktop koffice-1.6-branch/tools/thumbnail/otherofficethumbnail.desktop --- koffice-1.6.3/tools/thumbnail/otherofficethumbnail.desktop 2007-05-30 16:36:12.000000000 -0500 +++ koffice-1.6-branch/tools/thumbnail/otherofficethumbnail.desktop 2009-03-06 14:55:19.000000000 -0600 @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Type=Service Name=Other Office Files Name[af]=Ander Kantoor L??ers @@ -21,6 +20,7 @@ Name[fi]=Muut toimistotiedostot Name[fo]=A??rar skrivstovuf??lir Name[fr]=Autres documents bureautiques +Name[fy]=Oare office triemmen Name[gl]=Outros Ficheiros de KOffice Name[he]=???????? Office ?????????? Name[hi]=???????????? ??????????????? ????????????????????? @@ -43,7 +43,7 @@ Name[pa]=????????? ??????????????? ?????????????????? Name[pl]=Inne pliki biurowe Name[pt]=Outros Ficheiros de Escrit??rio -Name[pt_BR]=Outros Arquivos Office +Name[pt_BR]=Outros arquivos Office Name[ro]=Alte fi??iere KOffice Name[ru]=???????????? ?????????? Office Name[se]=Ear?? Office-fiillat @@ -57,7 +57,8 @@ Name[th]=?????????????????????????????????????????????????????????????????????????????? Name[tr]=Di??er Ofis Dosyalar?? Name[uk]=???????? ?????????? KOffice -Name[uz]=?????????? ???????? ?????????? ?????????????? +Name[uz]=Idora uchun boshqa fayllar +Name[uz at cyrillic]=?????????? ???????? ?????????? ?????????????? Name[wa]=??tes fitch??s di buro Name[xh]=Ezinye Iifayile ze Office Name[zh_CN]=?????? Office ?????? --- NEW FILE koffice-svn_checkout.sh --- #!/bin/bash DATE=$(date +%Y%m%d) EXPORT_DIR=koffice set -x rm -rf $EXPORT_DIR # app svn export svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/koffice/ $EXPORT_DIR/ tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR # cleanup rm -rf $EXPORT_DIR koffice-xpdf-CVE-2007-3387.diff: Index: koffice-xpdf-CVE-2007-3387.diff =================================================================== RCS file: koffice-xpdf-CVE-2007-3387.diff diff -N koffice-xpdf-CVE-2007-3387.diff --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ koffice-xpdf-CVE-2007-3387.diff 6 Mar 2009 21:10:00 -0000 1.5 @@ -0,0 +1,20 @@ +--- filters/kword/pdf/xpdf/xpdf/Stream.cc ++++ filters/kword/pdf/xpdf/xpdf/Stream.cc +@@ -413,13 +413,11 @@ StreamPredictor::StreamPredictor(Stream + predLine = NULL; + ok = gFalse; + +- if (width <= 0 || nComps <= 0 || nBits <= 0 || +- nComps >= INT_MAX / nBits || +- width >= INT_MAX / nComps / nBits) +- return; +- + nVals = width * nComps; +- if (nVals * nBits + 7 <= 0) ++ if (width <= 0 || nComps <= 0 || nBits <= 0 || ++ nComps >= 4 || nBits > 16 || ++ width >= INT_MAX / nComps || ++ nVals >= (INT_MAX - 7) / nBits) + return; + + pixBytes = (nComps * nBits + 7) >> 3; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 29 Jan 2009 04:15:00 -0000 1.26 +++ .cvsignore 6 Mar 2009 21:10:00 -0000 1.27 @@ -1 +1,5 @@ -koffice-1.9.98.6.tar.bz2 +koffice-1.6.0.tar.bz2 +koffice-1.6.1.tar.bz2 +koshell.png +koffice-1.6.2.tar.bz2 +koffice-1.6.3.tar.bz2 Index: koffice.spec =================================================================== RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- koffice.spec 25 Feb 2009 11:43:19 -0000 1.97 +++ koffice.spec 6 Mar 2009 21:10:00 -0000 1.98 @@ -1,68 +1,93 @@ -#define kchart 1 -#define kexi 1 -#define kformula 1 -#define kivio 1 -#define kugar 1 +%if 0%{?fedora} > 6 +%define kdelibs3 kdelibs3 +%else +%define kdelibs3 kdelibs +BuildRequires: libutempter-devel +%endif + +#define svn 20081103 +%define svn 20090306 Name: koffice -Epoch: 1 -Version: 1.9.98.6 -Release: 2%{?dist} +Epoch: 2 +Version: 1.6.3 +Release: 19.%{svn}svn%{?dist} Summary: An integrated office suite Group: Applications/Productivity -# apps GPLv2+, libs LGPLv2+ License: GPLv2+ URL: http://www.koffice.org/ -Source0: http://download.kde.org/unstable/koffice-%{version}/src/koffice-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: exiv2-0.18-attempt1.diff +Source100: koshell.png -#-- The following OPTIONAL packages could NOT be located on your system. -#-- Consider installing them to enable more features from this software. -#+ OpenCTL, 0.9.2 or higher: OpenCTL is needed for some color spaces (High Dynamic Range Color Spaces, YCbCr and LMS) -#+ Spnav: Spnav is the library which is required by the space navigator device plugin - -BuildRequires: boost-devel -BuildRequires: bzip2-devel -BuildRequires: cmake -BuildRequires: desktop-file-utils -BuildRequires: doxygen -BuildRequires: eigen2-devel -BuildRequires: exiv2-devel -BuildRequires: fontconfig-devel -BuildRequires: freeglut-devel -BuildRequires: freetype-devel -BuildRequires: gettext-devel -BuildRequires: glew-devel -BuildRequires: gmm-devel +## hand-crafted patch, pretty close to: +# LANG=en_US.UTF-8 svn diff \ +# svn://anonsvn.kde.org/home/kde/tags/koffice/1.6.3/koffice \ +# svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/koffice \ +# > koffice-%{svn}svn.patch +Patch100: koffice-%{svn}svn.patch + +# http://www.kde.org/info/security/advisory-20070730-1.txt +Patch1: ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff + +# http://www.kde.org/info/security/advisory-20071107-1.txt +Patch2: ftp://ftp.kde.org/pub/kde/security_patches/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff + +# upstream patch pulled via: svn diff -c 738929 +# svn diff -c 729276 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/ +# svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/ +Patch3: koffice-1.6.3-gcc43.patch + +# BuildRequires: world-devel ;) +BuildRequires: %{kdelibs3}-devel +# See http://bugzilla.redhat.com/244091 +%global kdelibs3_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.10) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1) +BuildRequires: automake libtool +BuildRequires: freetype-devel +BuildRequires: fontconfig-devel +BuildRequires: libart_lgpl-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: libjpeg-devel +BuildRequires: ImageMagick-devel +BuildRequires: bzip2-devel +BuildRequires: zlib-devel +BuildRequires: openssl-devel +BuildRequires: python-devel +BuildRequires: pcre-devel +BuildRequires: lcms-devel +BuildRequires: gettext-devel +BuildRequires: mysql-devel +BuildRequires: desktop-file-utils +BuildRequires: perl +BuildRequires: wv2-devel +BuildRequires: libpqxx-devel +BuildRequires: doxygen +BuildRequires: aspell-devel +BuildRequires: libxslt-devel +BuildRequires: OpenEXR-devel +BuildRequires: libexif-devel +BuildRequires: libGL-devel libGLU-devel +BuildRequires: readline-devel +%if 0%{?fedora} > 4 || 0%{?rhel} > 4 +%define ruby 1 +BuildRequires: ruby ruby-devel >= 1.8.2 +%endif +%if 0%{?fedora} > 4 || 0%{?rhel} > 4 +BuildRequires: libpaper-devel +BuildRequires: libXi-devel +%endif +# FIXME: work to get these into EPEL +%if 0%{?fedora} > 6 BuildRequires: GraphicsMagick-devel -BuildRequires: gsl-devel -BuildRequires: kdelibs4-devel -BuildRequires: kdepimlibs-devel -BuildRequires: lcms-devel -BuildRequires: libGL-devel libGLU-devel -BuildRequires: libjpeg-devel -BuildRequires: libkdcraw-devel >= 0.2.0 -BuildRequires: libpng-devel -BuildRequires: libtiff-devel BuildRequires: libwpd-devel -BuildRequires: libxslt-devel -%if 0%{?kexi} -BuildRequires: mysql-devel -BuildRequires: libpqxx-devel +%define libwpd 1 +BuildRequires: poppler-qt-devel %endif -BuildRequires: OpenEXR-devel -BuildRequires: perl -BuildRequires: poppler-qt4-devel -BuildRequires: python-devel -BuildRequires: qca2-devel -BuildRequires: qimageblitz-devel -BuildRequires: readline-devel -BuildRequires: ruby-devel ruby -BuildRequires: wv2-devel + %description KOffice is an integrated office suite. @@ -72,292 +97,292 @@ Group: Applications/Productivity Obsoletes: koffice <= 4:%{version}-%{release} Obsoletes: koffice-i18n < 4:%{version} -Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: %{name}-kword = %{epoch}:%{version}-%{release} -Requires: %{name}-kspread = %{epoch}:%{version}-%{release} -Requires: %{name}-kpresenter = %{epoch}:%{version}-%{release} -%if 0%{?kivio} -Requires: %{name}-kivio = %{epoch}:%{version}-%{release} -%endif -Requires: %{name}-karbon = %{epoch}:%{version}-%{release} -Requires: %{name}-krita = %{epoch}:%{version}-%{release} -%if 0%{?kugar} -Requires: %{name}-kugar = %{epoch}:%{version}-%{release} -%endif -%if 0%{?kexi} -Requires: %{name}-kexi = %{epoch}:%{version}-%{release} -Requires: %{name}-kexi-driver-mysql = %{epoch}:%{version}-%{release} -Requires: %{name}-kexi-driver-pgsql = %{epoch}:%{version}-%{release} -%endif -%if 0%{?kchart} -Requires: %{name}-kchart = %{epoch}:%{version}-%{release} -%endif -%if 0%{?kformula} -Requires: %{name}-kformula = %{epoch}:%{version}-%{release} -%endif -Requires: %{name}-filters = %{epoch}:%{version}-%{release} -Requires: %{name}-kplato = %{epoch}:%{version}-%{release} +Requires: koffice-core = %{epoch}:%{version}-%{release} +Requires: koffice-kword = %{epoch}:%{version}-%{release} +Requires: koffice-kspread = %{epoch}:%{version}-%{release} +Requires: koffice-kpresenter = %{epoch}:%{version}-%{release} +Requires: koffice-kivio = %{epoch}:%{version}-%{release} +Requires: koffice-karbon = %{epoch}:%{version}-%{release} +Requires: koffice-krita = %{epoch}:%{version}-%{release} +Requires: koffice-kugar = %{epoch}:%{version}-%{release} +Requires: koffice-kexi = %{epoch}:%{version}-%{release} +Requires: koffice-kexi-driver-mysql = %{epoch}:%{version}-%{release} +Requires: koffice-kexi-driver-pgsql = %{epoch}:%{version}-%{release} +Requires: koffice-kchart = %{epoch}:%{version}-%{release} +Requires: koffice-kformula = %{epoch}:%{version}-%{release} +Requires: koffice-filters = %{epoch}:%{version}-%{release} +Requires: koffice-kplato = %{epoch}:%{version}-%{release} %description suite KOffice is an integrated office suite. %package core -Summary: Core support files for koffice +Summary: Core support files for %{name} Group: Applications/Productivity Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires(post): xdg-utils Requires(postun): xdg-utils -%if ! 0%{?kchart} -Obsoletes: koffice-kchart < %{epoch}:%{version}-%{release} -%endif -%if ! 0%{?kexi} -Obsoletes: koffice-kexi < %{epoch}:%{version}-%{release} -Obsoletes: koffice-kexi-driver-mysql < %{epoch}:%{version}-%{release} -Obsoletes: koffice-kexi-driver-pgsql < %{epoch}:%{version}-%{release} -%endif -%if ! 0%{?kivio} -Obsoletes: koffice-kivio < %{epoch}:%{version}-%{release} -%endif -%if ! 0%{?kformula} -Obsoletes: koffice-kformula < %{epoch}:%{version}-%{release} -%endif -%if ! 0%{?kukar} -Obsoletes: koffice-kugar < %{epoch}:%{version}-%{release} -%endif - +Requires: perl +Conflicts: koffice-i18n < 4:%{version} %description core %{summary}. %package libs -Summary: Runtime libraries for koffice +Summary: Runtime libraries for %{name} Group: System Environment/Libraries +Conflicts: koffice <= 4:%{version}-%{release} +Requires: %{kdelibs3} >= %{kdelibs3_ver} +License: LGPLv2+ %description libs %{summary}. %package devel -Summary: Libraries needed for koffice development +Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{epoch}:%{version}-%{release} -Requires: kdelibs4-devel - +License: LGPLv2+ %description devel -%{summary} +%{summary}. %package kword -Summary:A frame-based word processor capable of professional standard documents +Summary: A frame-based word processor capable of professional standard documents Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} - %description kword -%{summary} +%{summary}. %package kspread Summary: A powerful spreadsheet application Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} - %description kspread -%{summary} +%{summary}. %package kpresenter Summary: A full-featured presentation program Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} - %description kpresenter -%{summary} +%{summary}. %package kivio Summary: A flowcharting application Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} Obsoletes: kivio < %{version}-%{release} - %description kivio -%{summary} +%{summary}. %package karbon Summary: A vector drawing application Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} - %description karbon -%{summary} +%{summary}. %package krita Summary: A pixel-based image manipulation program Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: %{name}-filters - %description krita -%{summary} +%{summary}. %package kugar Summary: A tool for generating business quality reports Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} - %description kugar -%{summary} +%{summary}. %package kexi Summary: An integrated environment for managing data Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} - %description kexi -%{summary} +%{summary}. For additional database drivers take a look at %{name}-kexi-driver-* %package kexi-driver-mysql -Summary: mysql-driver for kexi +Summary: Mysql-driver for kexi Group: Applications/Productivity Requires: %{name}-kexi = %{epoch}:%{version}-%{release} - %description kexi-driver-mysql -%{summary} +%{summary}. %package kexi-driver-pgsql -Summary: pgsql-driver for kexi +Summary: Postresql driver for kexi Group: Applications/Productivity Requires: %{name}-kexi = %{epoch}:%{version}-%{release} - %description kexi-driver-pgsql -%{summary} +%{summary}. -%if 0%{?kchart} %package kchart Summary: An integrated graph and chart drawing tool Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} - %description kchart -%{summary} -%endif +%{summary}. %package kformula Summary: A powerful formula editor Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} Requires: mathml-fonts - %description kformula -%{summary} +%{summary}. %package filters Summary: Import and Export Filters for KOffice Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} - %description filters -%{summary} +%{summary}. %package kplato Summary: An integrated project management and planning tool Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} - %description kplato -%{summary} +%{summary}. %prep %setup -q -pushd krita/ui/kisexiv2 -%patch1 -p0 -b .exiv2-0.18 -popd +#patch1 -p0 -b .CVE-2007-3387 +#patch2 -p0 -b .CVE-2007-4352-5392-5393 +#patch3 -p1 -b .gcc43 + +%patch100 -p1 -b .svn + +make -f admin/Makefile.common %build +unset QTDIR || : ; . /etc/profile.d/qt.sh -mkdir -p %{_target_platform} -pushd %{_target_platform} -# SET EIGEN2_INCLUDE_DIR since our kde4_incdir != eigen2_incdir -%{cmake_kde4} \ - -DEIGEN2_INCLUDE_DIR=%{_includedir}/eigen2 \ - .. -popd +%configure \ + --disable-rpath --disable-dependency-tracking \ + --enable-new-ldflags \ + --disable-debug --disable-warnings \ + --with-pic --enable-shared --disable-static \ + --with-extra-libs=%{_libdir} \ + --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \ + --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \ + --disable-final -make %{?_smp_mflags} -C %{_target_platform} +make %{?_smp_mflags} %install rm -rf %{buildroot} +make install DESTDIR=%{buildroot} -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +[ ! -f %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png ] && \ +install -p -D -m644 %{SOURCE100} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png -# unpackaged files -# conflicts with oxygen-icon-theme -rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-justify-{center,fill,left,right}.png -rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-text-{bold,italic,underline}.png -rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-{group,ungroup}.png -rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-order-{back,front,lower,raise}.png -# extraneous stuff we don't want in -devel -rm -fv %{buildroot}%{_kde4_libdir}/lib*common.so -rm -fv %{buildroot}%{_kde4_libdir}/lib*filters.so -rm -fv %{buildroot}%{_kde4_libdir}/lib*private.so -rm -fv %{buildroot}%{_kde4_libdir}/libkarbon*.so -rm -fv %{buildroot}%{_kde4_libdir}/libkexi*.so -rm -fv %{buildroot}%{_kde4_libdir}/libkisexiv2.so -rm -fv %{buildroot}%{_kde4_libdir}/libkformdesigner.so -rm -fv %{buildroot}%{_kde4_libdir}/libkplato*.so -rm -fv %{buildroot}%{_kde4_libdir}/libkword*.so -rm -fv %{buildroot}%{_kde4_libdir}/libkrita*.so -rm -fv %{buildroot}%{_kde4_libdir}/libkross*.so -%if ! 0%{?kchart} -rm -fv %{buildroot}%{_kde4_libdir}/libkchartcommon.so.* -rm -fv %{buildroot}%{_kde4_libdir}/kde4/*kchart*.* -rm -rfv %{buildroot}%{_kde4_appsdir}/kchart/ -rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kchart/ -rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/kchart*.desktop -rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop -%endif -%if ! 0%{?kexi} -rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kexi/ -rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kexi_konqi.desktop -%endif -%if ! 0%{?kformula} -rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kformula/ -rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop -%endif -%if ! 0%{?kivio} -rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kivio/ -rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop -%endif +# Replace absolute symlinks with relative ones +pushd %{buildroot}%{_docdir}/HTML +for lang in *; do + if [ -d $lang ]; then + pushd $lang + for i in */*; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common + done + popd + fi +done +popd + +desktop-file-install \ + --dir=%{buildroot}%{_datadir}/applications/kde \ + --vendor="" \ + --delete-original \ + %{buildroot}%{_datadir}/applnk/Office/*.desktop + +## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061) +## until http://bugzilla.redhat.com/245190 is fixed +for desktop_file in %{buildroot}%{_datadir}/applnk/.hidden/*.desktop ; do + grep "^NoDisplay=" ${desktop_file} || \ + echo "NoDisplay=True" >> ${desktop_file} +done + +## unpackaged files +rm -f %{buildroot}%{_libdir}/lib*.la +# shouldn't these be in koffice-l10n? +rm -f %{buildroot}%{_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh +# -devel symlinks to nuke +rm -f %{buildroot}%{_libdir}/lib*common.so +rm -f %{buildroot}%{_libdir}/lib*filters.so +rm -f %{buildroot}%{_libdir}/lib*private.so +rm -f %{buildroot}%{_libdir}/libkarbon*.so +rm -f %{buildroot}%{_libdir}/libkchart*.so +rm -f %{buildroot}%{_libdir}/libkexi*.so +rm -f %{buildroot}%{_libdir}/libkisexiv2.so +rm -f %{buildroot}%{_libdir}/libkformdesigner.so +rm -f %{buildroot}%{_libdir}/libkplato*.so +rm -f %{buildroot}%{_libdir}/libkpresenter*.so +rm -f %{buildroot}%{_libdir}/libkword*.so +rm -f %{buildroot}%{_libdir}/libkrita*.so +rm -f %{buildroot}%{_libdir}/libkross*.so +rm -f %{buildroot}%{_libdir}/libkugar*.so %clean -rm -rf %{buildroot} +rm -rf %{buildroot} %post core +xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : +xdg-icon-resource forceupdate --theme locolor 2> /dev/null || : xdg-desktop-menu forceupdate 2> /dev/null || : %postun core +xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : +xdg-icon-resource forceupdate --theme locolor 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : + +%post kword +/sbin/ldconfig +xdg-desktop-menu forceupdate 2> /dev/null || : + +%postun kword +/sbin/ldconfig xdg-desktop-menu forceupdate 2> /dev/null || : -%post kword -p /sbin/ldconfig -%postun kword -p /sbin/ldconfig +%post kpresenter +/sbin/ldconfig +xdg-desktop-menu forceupdate 2> /dev/null || : -%post kpresenter -p /sbin/ldconfig -%postun kpresenter -p /sbin/ldconfig +%postun kpresenter +/sbin/ldconfig +xdg-desktop-menu forceupdate 2> /dev/null || : -%post kugar -p /sbin/ldconfig -%postun kugar -p /sbin/ldconfig +%post kugar +/sbin/ldconfig +xdg-desktop-menu forceupdate 2> /dev/null || : -%post kexi -p /sbin/ldconfig -%postun kexi -p /sbin/ldconfig +%postun kugar +/sbin/ldconfig +xdg-desktop-menu forceupdate 2> /dev/null || : -%if 0%{?kchart} -%post kchart -p /sbin/ldconfig -%postun kchart -p /sbin/ldconfig -%endif +%post kexi +/sbin/ldconfig +xdg-desktop-menu forceupdate 2> /dev/null || : + +%postun kexi +/sbin/ldconfig +xdg-desktop-menu forceupdate 2> /dev/null || : + +%post kchart +/sbin/ldconfig +xdg-desktop-menu forceupdate 2> /dev/null || : + +%postun kchart +/sbin/ldconfig +xdg-desktop-menu forceupdate 2> /dev/null || : %post filters -p /sbin/ldconfig %postun filters -p /sbin/ldconfig @@ -370,412 +395,355 @@ %files core %defattr(-,root,root,-) -%doc AUTHORS COPYING COPYING.LIB README -%{_kde4_bindir}/kthesaurus -%{_kde4_bindir}/koconverter -%{_kde4_libdir}/libkdeinit4_kthesaurus.so -%{_kde4_libdir}/kde4/autocorrect.so -%{_kde4_libdir}/kde4/changecase.so -%{_kde4_libdir}/kde4/defaulttools.so -%{_kde4_libdir}/kde4/kodocinfopropspage.* -%{_kde4_libdir}/kde4/kofficescan.* -%{_kde4_libdir}/kde4/kofficethumbnail.* -%{_kde4_libdir}/kde4/kopabackgroundtool.* -%{_kde4_libdir}/kde4/libkounavailpart.* -%{_kde4_libdir}/kde4/clipartthumbnail.* -%{_kde4_libdir}/kde4/thesaurustool.so -%{_kde4_libdir}/kde4/koffice_graya_u16_plugin.so -%{_kde4_libdir}/kde4/kofficegrayau8plugin.so -%{_kde4_libdir}/kde4/kofficedockers.so -%{_kde4_libdir}/kde4/kofficesimpletextedit.so -%{_kde4_libdir}/kde4/spellcheck.so -%{_kde4_libdir}/kde4/textvariables.so -%{_kde4_appsdir}/koffice/ -%{_kde4_docdir}/HTML/en/koffice/ -%{_kde4_docdir}/HTML/en/thesaurus/ -%{_kde4_datadir}/applications/kde4/KThesaurus.desktop -%{_kde4_datadir}/icons/hicolor/*/*/* -%{_kde4_datadir}/icons/oxygen/*/*/* -%{_kde4_datadir}/kde4/services/autocorrect.desktop -%{_kde4_datadir}/kde4/services/changecase.desktop -%{_kde4_datadir}/kde4/services/clipartthumbnail.desktop -%{_kde4_datadir}/kde4/services/defaulttools.desktop -%{_kde4_datadir}/kde4/services/kodocinfopropspage.desktop -%{_kde4_datadir}/kde4/services/kofficethumbnail.desktop -%{_kde4_datadir}/kde4/services/koffice_graya_u16_plugin.desktop -%{_kde4_datadir}/kde4/services/kofficegrayaplugin.desktop -%{_kde4_datadir}/kde4/services/kofficedockers.desktop -%{_kde4_datadir}/kde4/services/kopabackgroundtool.desktop -%{_kde4_datadir}/kde4/services/kounavail.desktop -%{_kde4_datadir}/kde4/services/thesaurustool.desktop -%{_kde4_datadir}/kde4/services/kofficesimpletextedit.desktop -%{_kde4_datadir}/kde4/services/spellcheck.desktop -%{_kde4_datadir}/kde4/services/textvariables.desktop -%{_kde4_datadir}/kde4/servicetypes/kochart.desktop -%{_kde4_datadir}/kde4/servicetypes/kofficedocker.desktop -%{_kde4_datadir}/kde4/servicetypes/kofficepart.desktop -%{_kde4_datadir}/kde4/servicetypes/koplugin.desktop -%{_kde4_datadir}/kde4/servicetypes/inlinetextobject.desktop -%{_kde4_datadir}/kde4/servicetypes/texteditingplugin.desktop -%{_kde4_datadir}/kde4/servicetypes/textvariableplugin.desktop -%{_kde4_datadir}/applications/kde4/*koffice.desktop -%{_kde4_datadir}/kde4/services/*shape.desktop -%if 0%{?kformula} -%{_kde4_appsdir}/formulashape/ -%endif -%{_kde4_appsdir}/musicshape/ -%dir %{_datadir}/color/ -%dir %{_datadir}/color/icc/ -%{_datadir}/color/icc/pigment/ -%{_kde4_datadir}/kde4/servicetypes/pigment*.desktop -%{_kde4_libdir}/kde4/pathshapes.so -%{_kde4_datadir}/kde4/services/pathshapes.desktop +%doc AUTHORS COPYING README +%{_bindir}/koshell +%{_bindir}/kthesaurus +%{_bindir}/koconverter +%{_libdir}/libkdeinit_koshell.so +%{_libdir}/libkdeinit_kthesaurus.so +%{_libdir}/kde3/kfile_koffice.* +%{_libdir}/kde3/kfile_ooo.* +%{_libdir}/kde3/kfile_abiword.* +%{_libdir}/kde3/kfile_gnumeric.* +%{_libdir}/kde3/kodocinfopropspage.* +%{_libdir}/kde3/kofficescan.* +%{_libdir}/kde3/kofficethumbnail.* +%{_libdir}/kde3/koshell.* +%{_libdir}/kde3/kthesaurus.* +%{_libdir}/kde3/kwmailmerge_classic.* +%{_libdir}/kde3/kwmailmerge_kabc.* +%{_libdir}/kde3/kwmailmerge_qtsqldb_power.* +%{_libdir}/kde3/kwmailmerge_qtsqldb.* +%{_libdir}/kde3/libkounavailpart.* +%{_libdir}/kde3/libkprkword.* +%{_libdir}/kde3/libthesaurustool.* +%{_libdir}/kde3/clipartthumbnail.* +%{_datadir}/apps/koffice/ +%{_datadir}/apps/konqueror/servicemenus/* +%{_datadir}/apps/koshell/ +%{_datadir}/apps/thesaurus/ +%{_datadir}/config.kcfg/koshell.kcfg +%{_datadir}/doc/HTML/en/koffice/ +%{_datadir}/doc/HTML/en/koshell/ +%{_datadir}/doc/HTML/en/thesaurus/ +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/locolor/*/*/* +%{_datadir}/services/clipartthumbnail.desktop +%{_datadir}/services/kfile*.desktop +%{_datadir}/services/kwmailmerge*.desktop +%{_datadir}/services/kodocinfopropspage.desktop +%{_datadir}/services/kofficethumbnail.desktop +%{_datadir}/services/kounavail.desktop +%{_datadir}/services/kprkword.desktop +%{_datadir}/services/thesaurustool.desktop +%{_datadir}/servicetypes/kochart.desktop +%{_datadir}/servicetypes/kofficepart.desktop +%{_datadir}/servicetypes/koplugin.desktop +%{_datadir}/servicetypes/kwmailmerge.desktop +%{_datadir}/servicetypes/widgetfactory.desktop +%{_datadir}/applications/kde/*koffice.desktop +%{_datadir}/applications/kde/*KThesaurus.desktop +%{_datadir}/applications/kde/*koshell.desktop +%{_datadir}/apps/kofficewidgets/ +%{_datadir}/apps/kross/ +%{_libdir}/kde3/krosspython.* +%{?ruby:%{_libdir}/kde3/krossruby.*} %files libs %defattr(-,root,root,-) -%{_kde4_datadir}/kde4/servicetypes/flake*.desktop -%{_kde4_libdir}/libflake.so.* -%{_kde4_libdir}/kde4/*shape.so -%if 0%{?kformula} -%exclude %{_kde4_libdir}/kde4/formulashape.* -%endif -%exclude %{_kde4_libdir}/kde4/kritashape.* -%{_kde4_libdir}/libchartshapelib.so.* -%{_kde4_libdir}/libkdchart.so.* -%{_kde4_libdir}/libkochart.so.* -%{_kde4_libdir}/libkotext.so.* -%{_kde4_libdir}/libkowmf.so.* -%{_kde4_libdir}/libkokross.so.* -%{_kde4_libdir}/libkoguiutils.so.* -%{_kde4_libdir}/libkomain.so.* -%{_kde4_libdir}/libkoodf.so.* -%{_kde4_libdir}/libkopageapp.so.* -%{_kde4_libdir}/libkoresources.so.* -%{_kde4_libdir}/libkostore.so.* -%{_kde4_libdir}/libkoffice_graya_u16.so.* -%{_kde4_libdir}/libkofficegrayau8colorspace.so.* -%{_kde4_libdir}/libkspreadcommon.so.* -%{_kde4_libdir}/libkwmf.so.* -%if 0%{?kformula} -%{_kde4_libdir}/libkformulalib.so.* -%endif -%{_kde4_libdir}/libpigmentcms.so.* +%doc COPYING.LIB +#_libdir/libk*common.so.* +%{_libdir}/libkarboncommon.so.* +%{_libdir}/libkspreadcommon.so.* +%{_libdir}/libkdchart.so.* +%{_libdir}/libkochart.so.* +%{_libdir}/libkofficecore.so.* +%{_libdir}/libkofficeui.so.* +%{_libdir}/libkotext.so.* +%{_libdir}/libkowmf.so.* +%{_libdir}/libkopainter.so.* +%{_libdir}/libkstore.so.* +%{_libdir}/libkwmailmerge_interface.so.* +%{_libdir}/libkwmf.so.* +%{_libdir}/libkformulalib.so.* +%{_libdir}/libkopalette.so.* +%{_libdir}/libkoproperty.so.* +%{_libdir}/libkrossapi.so.* +%{_libdir}/libkrossmain.so.* %files devel %defattr(-,root,root,-) +%lang(en) %{_docdir}/HTML/en/koffice-apidocs/ %{_includedir}/* # FIXME: include only shlib symlinks we know/want to export -%{_kde4_libdir}/lib*.so -%exclude %{_kde4_libdir}/libkdeinit4_*.so -%exclude %{_kde4_libdir}/libKrita*.so -%{_kde4_appsdir}/cmake/modules/FindKOfficeLibs.cmake +%{_libdir}/lib*.so +%exclude %{_libdir}/libkdeinit_*.so +%exclude %{_libdir}/libkudesignercore.so + +%files kword +%defattr(-,root,root,-) +%lang(en) %{_docdir}/HTML/en/kword/ +%{_bindir}/kword +%{_libdir}/libkdeinit_kword.so +%{_libdir}/libkwordprivate.so.* +%{_libdir}/kde3/libkwordpart.* +%{_libdir}/kde3/kword.* +%{_datadir}/apps/kword/ +%{_datadir}/services/kword*.desktop +%{_datadir}/services/kwserial*.desktop +%{_datadir}/templates/TextDocument.desktop +%{_datadir}/templates/.source/TextDocument.kwt +%{_datadir}/applications/kde/*kword.desktop %files kspread %defattr(-,root,root,-) -%{_kde4_bindir}/kspread -%{_kde4_libdir}/libkdeinit4_kspread.so -%{_kde4_libdir}/kde4/krossmodulekspread.so -%{_kde4_libdir}/kde4/kspread*.so -%{_kde4_libdir}/kde4/libkspreadpart.* -%{_kde4_libdir}/kde4/libcsvexport.* -%{_kde4_libdir}/kde4/libcsvimport.* -%{_kde4_libdir}/kde4/libgnumericexport.* -%{_kde4_libdir}/kde4/libgnumericimport.* -%{_kde4_libdir}/kde4/libkspreadhtmlexport.* -%{_kde4_libdir}/kde4/libkspreadsolver.so -%{_kde4_libdir}/kde4/libopencalcexport.* -%{_kde4_libdir}/kde4/libopencalcimport.* -%{_kde4_libdir}/kde4/libqproimport.* -%{_kde4_appsdir}/kspread/ -%{_kde4_docdir}/HTML/en/kspread/ -%{_kde4_datadir}/config.kcfg/kspread.kcfg -%{_kde4_datadir}/kde4/services/kspread*.desktop -%{_kde4_datadir}/templates/SpreadSheet.desktop -%{_kde4_datadir}/templates/.source/SpreadSheet.kst -%{_kde4_datadir}/applications/kde4/*kspread.desktop -%{_kde4_datadir}/kde4/services/ServiceMenus/kspread_konqi.desktop -%{_kde4_datadir}/kde4/services/krossmodulekspread.desktop -%{_kde4_datadir}/kde4/servicetypes/kspread_plugin.desktop +%lang(en) %{_docdir}/HTML/en/kspread/ +%{_bindir}/kspread +%{_libdir}/libkdeinit_kspread.so +%{_libdir}/kde3/kspread.* +%{_libdir}/kde3/libkspreadpart.* +%{_libdir}/kde3/kwmailmerge_kspread.* +%{_libdir}/kde3/libcsvexport.* +%{_libdir}/kde3/libcsvimport.* +%{_libdir}/kde3/libgnumericexport.* +%{_libdir}/kde3/libgnumericimport.* +%{_libdir}/kde3/libkspreadhtmlexport.* +%{_libdir}/kde3/libkspreadinsertcalendar.* +%{_libdir}/kde3/libopencalcexport.* +%{_libdir}/kde3/libopencalcimport.* +%{_libdir}/kde3/libqproimport.* +%{_libdir}/kde3/kspreadscripting.* +%{_libdir}/kde3/krosskspreadcore.* +%{_datadir}/apps/kspread/ +%{_datadir}/services/kspread*.desktop +%{_datadir}/templates/SpreadSheet.desktop +%{_datadir}/templates/.source/SpreadSheet.kst +%{_datadir}/applications/kde/*kspread.desktop %files kpresenter %defattr(-,root,root,-) -%{_kde4_bindir}/kpresenter -%{_kde4_libdir}/libkdeinit4_kpresenter.so -%{_kde4_libdir}/libkpresenterprivate.so.* -%{_kde4_libdir}/kde4/*kpresenter*.* -%{_kde4_libdir}/kde4/kpr_*.* -%{_kde4_libdir}/kde4/libFilterkpr2odf.so -%{_kde4_appsdir}/kpresenter/ -%{_kde4_docdir}/HTML/en/kpresenter/ -%{_kde4_datadir}/kde4/services/kpr*.desktop -%{_kde4_datadir}/kde4/servicetypes/kpr*.desktop -%{_kde4_datadir}/kde4/servicetypes/presentationeventaction.desktop -%{_kde4_datadir}/kde4/servicetypes/scripteventaction.desktop -%{_kde4_datadir}/templates/Presentation.desktop -%{_kde4_datadir}/templates/.source/Presentation.kpt -%{_kde4_datadir}/applications/kde4/*kpresenter.desktop -%{_kde4_datadir}/kde4/services/Filterkpr2odf.desktop -%{_kde4_datadir}/kde4/services/ServiceMenus/kpresenter_konqi.desktop +%lang(en) %{_docdir}/HTML/en/kpresenter/ +%{_bindir}/kpresenter +%{_bindir}/kprconverter.pl +%{_libdir}/libkdeinit_kpresenter.so +%{_libdir}/libkpresenterimageexport.so.* +%{_libdir}/libkpresenterprivate.so.* +%{_libdir}/kde3/*kpresenter*.* +%{_datadir}/apps/kpresenter/ +%{_datadir}/services/kpresenter*.desktop +%{_datadir}/templates/Presentation.desktop +%{_datadir}/templates/.source/Presentation.kpt +%{_datadir}/applications/kde/*kpresenter.desktop %files karbon %defattr(-,root,root,-) -%{_kde4_bindir}/karbon -%{_kde4_libdir}/libkdeinit4_karbon.so -%{_kde4_libdir}/libkarboncommon.so.* -%{_kde4_libdir}/libkarbonui.so.* -%{_kde4_libdir}/kde4/*karbon*.* -%{_kde4_libdir}/kde4/libwmfexport.* -%{_kde4_libdir}/kde4/libwmfimport.* -%{_kde4_appsdir}/karbon/ -%{_kde4_datadir}/kde4/services/karbon* -%{_kde4_datadir}/kde4/servicetypes/karbon_module.desktop -%{_kde4_datadir}/templates/Illustration.desktop -%{_kde4_datadir}/templates/.source/Illustration.karbon -%{_kde4_datadir}/applications/kde4/*karbon.desktop -%{_kde4_docdir}/HTML/en/karbon/ -%{_kde4_datadir}/kde4/services/ServiceMenus/karbon_konqi.desktop +%lang(en) %{_docdir}/HTML/en/karbon/ +%{_bindir}/karbon +%{_libdir}/libkdeinit_karbon.so +%{_libdir}/kde3/*karbon*.* +%{_libdir}/kde3/libwmfexport.* +%{_libdir}/kde3/libwmfimport.* +%{_datadir}/apps/karbon/ +%{_datadir}/services/karbon* +%{_datadir}/servicetypes/karbon_module.desktop +%{_datadir}/templates/Illustration.desktop +%{_datadir}/templates/.source/Illustration.karbon +%{_datadir}/applications/kde/*karbon.desktop %files krita %defattr(-,root,root,-) -%{_kde4_bindir}/krita -%{_kde4_libdir}/libkdeinit4_krita.so -%{_kde4_libdir}/libkrita*.so.* -%{_kde4_libdir}/libKrita*.so -%{_kde4_libdir}/libKritaRulerAssistantCommon.so.* -%{_kde4_libdir}/kde4/*krita*.* -%{_kde4_libdir}/libkrossmodulekrita.so.* -%{_kde4_appsdir}/krita/ -%{_kde4_datadir}/kde4/services/krita*.desktop -%{_kde4_datadir}/kde4/servicetypes/krita*.desktop -%{_kde4_datadir}/applications/kde4/*krita*.desktop -# FIXME: add scriptlet -%{_datadir}/mime/packages/krita_ora.xml -%{_kde4_appsdir}/kritaplugins/ -%{_kde4_docdir}/HTML/en/krita/ -%{_datadir}/color/icc/krita/ -%{_kde4_datadir}/kde4/services/ServiceMenus/krita_konqi.desktop +%lang(en) %{_docdir}/HTML/en/krita/ +%{_bindir}/krita +%{_libdir}/libkdeinit_krita.so +%{_libdir}/libkrita*.so.* +%{_libdir}/kde3/*krita*.* +%{_datadir}/apps/krita/ +%{_datadir}/services/krita*.desktop +%{_datadir}/servicetypes/krita*.desktop +%{_datadir}/applications/kde/*krita*.desktop +%{_datadir}/applnk/.hidden/*krita*.desktop +%{_datadir}/apps/kritaplugins/ -%if 0%{?kexi} %files kugar %defattr(-,root,root,-) -%{_kde4_docdir}/HTML/en/kugar/ -%endif +%lang(en) %{_docdir}/HTML/en/kugar/ +%{_bindir}/kugar +%{_bindir}/kudesigner +%{_libdir}/libkdeinit_kugar.so +%{_libdir}/libkdeinit_kudesigner.so +%{_libdir}/libkugarlib.so.* +%{_libdir}/libkudesignercore.so +%{_libdir}/kde3/kudesigner.* +%{_libdir}/kde3/kugar.* +%{_libdir}/kde3/libkudesignerpart.* +%{_libdir}/kde3/libkugarpart.* +%{_datadir}/apps/kudesigner/ +%{_datadir}/apps/kugar/ +%{_datadir}/services/kugar*.desktop +%{_datadir}/applications/kde/*kugar.desktop +%{_datadir}/applications/kde/*kudesigner.desktop -%if 0%{?kexi} %files kexi %defattr(-,root,root,-) -%{_kde4_bindir}/kexi* -%{_kde4_bindir}/ksqlite* -%{_kde4_libdir}/libkexi*.so.* -%{_kde4_libdir}/libkformdesigner.so.* -%{_kde4_libdir}/kde4/kformdesigner_*.* -%{_kde4_libdir}/kde4/kexidb_sqlite3driver.* -%{_kde4_libdir}/kde4/kexihandler_*.* -%{_kde4_libdir}/kde4/krossmodulekexidb.so -%{_kde4_libdir}/kde4/pgzkexireportpart2.so -%{_kde4_datadir}/config/kexirc -%{_kde4_datadir}/kde4/servicetypes/kexi*.desktop -%{_kde4_datadir}/kde4/services/kexi -%{_kde4_appsdir}/kexi/ -%{_kde4_datadir}/kde4/services/kformdesigner/* -%{_kde4_docdir}/HTML/en/kexi/ -%{_kde4_datadir}/applications/kde4/*kexi.desktop -%{_kde4_datadir}/kde4/services/kexidb_sqlite*driver.desktop -%{_kde4_datadir}/kde4/services/ServiceMenus/kexi_konqi.desktop +%lang(en) %{_docdir}/HTML/en/kexi/ +%{_bindir}/kexi* +%{_bindir}/ksqlite* +%{_bindir}/krossrunner +%{_libdir}/libkdeinit_kexi.so +%{_libdir}/libkexi*.so.* +%{_libdir}/libkformdesigner.so.* +%{_libdir}/kde3/kformdesigner_*.* +%{_libdir}/kde3/kexidb_sqlite2driver.* +%{_libdir}/kde3/kexidb_sqlite3driver.* +%{_libdir}/kde3/kexihandler_*.* +%{_libdir}/kde3/kexi.* +%{_libdir}/kde3/krosskexiapp.* +%{_libdir}/kde3/krosskexidb.* +# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs) +%{_libdir}/kde3/libkspreadkexiimport.* +%{_datadir}/config/kexirc +%{_datadir}/config/magic/kexi.magic +%{_datadir}/mimelnk/application/* +%{_datadir}/servicetypes/kexi*.desktop +%{_datadir}/services/kexi/ +%{_datadir}/apps/kexi/ +%{_datadir}/services/kformdesigner/* +%{_datadir}/applications/kde/*kexi.desktop +%{_datadir}/services/kexidb_sqlite*driver.desktop %files kexi-driver-mysql %defattr(-,root,root,-) -%{_kde4_libdir}/kde4/kexidb_mysqldriver.* -%{_kde4_libdir}/kde4/keximigrate_mysql.* -%{_kde4_datadir}/kde4/services/keximigrate_mysql.desktop -%{_kde4_datadir}/kde4/services/kexidb_mysqldriver.desktop +%{_libdir}/kde3/kexidb_mysqldriver.* +%{_libdir}/kde3/keximigrate_mysql.* +%{_datadir}/services/keximigrate_mysql.desktop +%{_datadir}/services/kexidb_mysqldriver.desktop %files kexi-driver-pgsql %defattr(-,root,root,-) -%{_kde4_libdir}/kde4/kexidb_pqxxsqldriver.* -%{_kde4_libdir}/kde4/keximigrate_pqxx.* -%{_kde4_datadir}/kde4/services/kexidb_pqxxsqldriver.desktop -%{_kde4_datadir}/kde4/services/keximigrate_pqxx.desktop -%endif +%{_libdir}/kde3/kexidb_pqxxsqldriver.* +%{_libdir}/kde3/keximigrate_pqxx.* +%{_datadir}/services/kexidb_pqxxsqldriver.desktop +%{_datadir}/services/keximigrate_pqxx.desktop -%if 0%{?kchart} %files kchart %defattr(-,root,root,-) -## Some parts of kchart went awol 1.9.98.1 -> 1.9.98.2, bug? -#{_kde4_bindir}/kchart -%{_kde4_libdir}/libkchartcommon.so.* -#{_kde4_libdir}/libkdeinit4_kchart.so -%{_kde4_libdir}/kde4/*kchart*.* -%{_kde4_appsdir}/kchart/ -%{_kde4_datadir}/config.kcfg/kchart.kcfg -%{_kde4_datadir}/kde4/services/kchart*.desktop -%{_kde4_docdir}/HTML/en/kchart/ -#{_kde4_datadir}/applications/kde4/*kchart.desktop -%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop -%endif +%lang(en) %{_docdir}/HTML/en/kchart/ +%{_bindir}/kchart +%{_libdir}/libkchart*.so.* +%{_libdir}/libkdeinit_kchart.so +%{_libdir}/kde3/*kchart*.* +%{_datadir}/apps/kchart/ +%{_datadir}/services/kchart*.desktop +%{_datadir}/applications/kde/*kchart.desktop -%if 0%{?kformula} %files kformula %defattr(-,root,root,-) -%{_kde4_bindir}/kformula -%{_kde4_libdir}/libkdeinit4_kformula.so -%{_kde4_libdir}/libkformulaprivate.so.* -%{_kde4_libdir}/kde4/*kformula*.* -%{_kde4_libdir}/kde4/formulashape.* -%{_kde4_appsdir}/kformula/ -%{_kde4_datadir}/kde4/services/kformula*.desktop -%{_kde4_datadir}/applications/kde4/*kformula.desktop -%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop -%{_kde4_docdir}/HTML/en/kformula/ -%endif +%lang(en) %{_docdir}/HTML/en/kformula/ +%{_bindir}/kformula +%{_libdir}/libkdeinit_kformula.so +%{_libdir}/kde3/*kformula*.* +%{_datadir}/apps/kformula/ +%{_datadir}/services/kformula*.desktop +%{_datadir}/applications/kde/*kformula.desktop -%if 0%{?kivio} %files kivio %defattr(-,root,root,-) -%{_kde4_bindir}/kivio -%{_kde4_libdir}/libkdeinit4_kivio.so -%{_kde4_libdir}/libkivioprivate.so.* -%{_kde4_libdir}/kde4/*kivio*.* -%{_kde4_appsdir}/kivio/ -%{_kde4_docdir}/HTML/en/kivio/ -%{_kde4_datadir}/kde4/services/kivio*.desktop -%{_kde4_datadir}/applications/kde4/kivio.desktop -%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop -%{_kde4_docdir}/HTML/en/kivio/ -%endif +%lang(en) %{_docdir}/HTML/en/kivio/ +%{_bindir}/kivio +%{_libdir}/libkdeinit_kivio.so +%{_libdir}/libkiviocommon.so.* +%{_libdir}/kde3/*kivio*.* +%{_libdir}/kde3/straight_connector.* +%{_datadir}/apps/kivio/ +%{_datadir}/config.kcfg/kivio.kcfg +%{_datadir}/services/kivio*.desktop +%{_datadir}/applications/kde/*kivio.desktop %files filters %defattr(-,root,root,-) -%{_kde4_libdir}/libkwordexportfilters.so.* -%{_kde4_libdir}/kde4/libabiwordexport.* -%{_kde4_libdir}/kde4/libabiwordimport.* -%{_kde4_libdir}/kde4/libamiproexport.* -%{_kde4_libdir}/kde4/libamiproimport.* -%{_kde4_libdir}/kde4/libapplixspreadimport.* -%{_kde4_libdir}/kde4/libapplixwordimport.* -%{_kde4_libdir}/kde4/libasciiexport.* -%{_kde4_libdir}/kde4/libasciiimport.* -%{_kde4_libdir}/kde4/libdbaseimport.* -%{_kde4_libdir}/kde4/libdocbookexport.* -%{_kde4_libdir}/kde4/libexcelimport.* -%{_kde4_libdir}/kde4/libgenerickofilter.* -%{_kde4_libdir}/kde4/libhtmlexport.* -%{_kde4_libdir}/kde4/libhtmlimport.* -%{_kde4_libdir}/kde4/libkspreadlatexexport.* -%{_kde4_libdir}/kde4/libkwordkword1dot3import.* -%{_kde4_libdir}/kde4/libmswriteexport.* -%{_kde4_libdir}/kde4/libmswriteimport.* -%{_kde4_libdir}/kde4/liboowriterexport.* -%{_kde4_libdir}/kde4/liboowriterimport.* -%{_kde4_libdir}/kde4/libpalmdocexport.* -%{_kde4_libdir}/kde4/libpalmdocimport.* -%{_kde4_libdir}/kde4/librtfexport.* -%{_kde4_libdir}/kde4/librtfimport.* -%{_kde4_libdir}/kde4/libwmlexport.* -%{_kde4_libdir}/kde4/libwmlimport.* -%{_kde4_libdir}/kde4/libwpexport.* -%{_kde4_libdir}/kde4/libwpimport.* -%{_kde4_libdir}/kde4/libmswordimport.* -%{_kde4_libdir}/kde4/libmswordodf_import.* -%{_kde4_libdir}/kde4/libxsltimport.* -%{_kde4_libdir}/kde4/libxsltexport.* -%{_kde4_libdir}/kde4/libhancomwordimport.* -%{_kde4_appsdir}/xsltfilter/ -%{_kde4_datadir}/kde4/services/generic_filter.desktop -%{_kde4_datadir}/kde4/services/xslt*.desktop -%{_kde4_datadir}/kde4/servicetypes/kofilter*.desktop +%{_libdir}/libkwordexportfilters.so.* +%{_libdir}/kde3/libabiwordexport.* +%{_libdir}/kde3/libabiwordimport.* +%{_libdir}/kde3/libamiproexport.* +%{_libdir}/kde3/libamiproimport.* +%{_libdir}/kde3/libapplixspreadimport.* +%{_libdir}/kde3/libapplixwordimport.* +%{_libdir}/kde3/libasciiexport.* +%{_libdir}/kde3/libasciiimport.* +%{_libdir}/kde3/libdbaseimport.* +%{_libdir}/kde3/libdocbookexport.* +%{_libdir}/kde3/libexcelimport.* +%{_libdir}/kde3/libgenerickofilter.* +%{_libdir}/kde3/libhtmlexport.* +%{_libdir}/kde3/libhtmlimport.* +%{_libdir}/kde3/libkarbonepsimport.* +%{_libdir}/kde3/libkfolatexexport.* +%{_libdir}/kde3/libkfomathmlexport.* +%{_libdir}/kde3/libkfomathmlimport.* +%{_libdir}/kde3/libkfopngexport.* +%{_libdir}/kde3/libkspreadlatexexport.* +%{_libdir}/kde3/libkugarnopimport.* +%{_libdir}/kde3/libkwordkword1dot3import.* +%{_libdir}/kde3/libkwordlatexexport.* +%{_libdir}/kde3/libmswriteexport.* +%{_libdir}/kde3/libmswriteimport.* +%{_libdir}/kde3/libooimpressexport.* +%{_libdir}/kde3/libooimpressimport.* +%{_libdir}/kde3/liboowriterexport.* +%{_libdir}/kde3/liboowriterimport.* +%{_libdir}/kde3/libpalmdocexport.* +%{_libdir}/kde3/libpalmdocimport.* +%{_libdir}/kde3/libpdfimport.* +%{_libdir}/kde3/librtfexport.* +%{_libdir}/kde3/librtfimport.* +%{_libdir}/kde3/libwmlexport.* +%{_libdir}/kde3/libwmlimport.* +%{_libdir}/kde3/libwpexport.* +%if 0%{?libwpd} +%{_libdir}/kde3/libwpimport.* +%endif +%{_libdir}/kde3/libmswordimport.* +%{_libdir}/kde3/libxsltimport.* +%{_libdir}/kde3/libxsltexport.* +%{_libdir}/kde3/libhancomwordimport.* +%{_libdir}/kde3/libkfosvgexport.* +%{_libdir}/kde3/liboodrawimport.* +%{_libdir}/kde3/libolefilter.* +%{_datadir}/apps/xsltfilter/ +%{_datadir}/services/generic_filter.desktop +%{_datadir}/services/ole_powerpoint97_import.desktop +%{_datadir}/services/xslt*.desktop +%{_datadir}/servicetypes/kofilter*.desktop %files kplato %defattr(-,root,root,-) -%{_kde4_bindir}/kplato -%{_kde4_configdir}/kplatorc -%{_kde4_libdir}/libkdeinit4_kplato.so -%{_kde4_libdir}/kde4/libkplatopart.* -%{_kde4_libdir}/libkplato*.so.* -%{_kde4_libdir}/kde4/krossmodulekplato.so -%{_kde4_datadir}/kde4/services/krossmodulekplato.desktop -%{_kde4_appsdir}/kplato/ -%{_kde4_docdir}/HTML/en/kplato/ -%{_kde4_datadir}/kde4/services/kplato*.desktop -%{_kde4_datadir}/applications/kde4/kplato.desktop - -%files kword -%defattr(-,root,root,-) -%{_kde4_bindir}/kword -%{_kde4_libdir}/libkdeinit4_kword.so -%{_kde4_libdir}/libkwordprivate.so.* -%{_kde4_libdir}/kde4/krossmodulekword.so -%{_kde4_libdir}/kde4/libkwordpart.* -%{_kde4_appsdir}/kword/ -%{_kde4_docdir}/HTML/en/kword/ -%{_kde4_datadir}/kde4/services/*kword*.desktop -%{_kde4_datadir}/templates/TextDocument.desktop -%{_kde4_datadir}/templates/.source/TextDocument.kwt -%{_kde4_datadir}/applications/kde4/*kword.desktop -%{_kde4_datadir}/kde4/services/ServiceMenus/kword_konqi.desktop - - -%changelog -* Wed Feb 25 2009 Fedora Release Engineering - 1:1.9.98.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Jan 28 2009 Rex Dieter - 1:1.9.98.6-1 -- koffice-1.9.98.6, koffice2 beta 6 - -* Thu Jan 22 2009 Rex Dieter - 1:1.9.98.5-2 -- respin (mysql) - -* Thu Jan 08 2009 Rex Dieter - 1:1.9.98.5-1 -- koffice-1.9.98.5, koffice2 beta 5 (take 2) - -* Wed Dec 31 2008 Rex Dieter - 1:1.9.98.4-1 -- koffice-1.9.98.4 (koffice2 beta5) - -* Sun Dec 21 2008 Rex Dieter - 1:1.9.98.3-2 -- respin (omit broken eviv2 support, for now) - -* Fri Dec 05 2008 Rex Dieter - 1:1.9.98.3-1 -- koffice-1.9.98.3 (koffice2 beta4) - -* Thu Dec 04 2008 Kevin Kofler - 1:1.9.98.2-4 -- Rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths) - -* Wed Dec 03 2008 Rex Dieter - 1:1.9.98.2-3 -- Conflicts with oxygen-icon-theme-4.1.80 (#474268) - -* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 1:1.9.98.2-2 -- Rebuild for Python 2.6 - -* Fri Nov 14 2008 Rex Dieter 1:1.9.98.2-2 -- fix conflicts with oxygen-icon-theme - -* Tue Nov 11 2008 Rex Dieter 1:1.9.98.2-1 -- koffice-1.9.98.2 (koffice2 beta3) -- kchart awol - -* Thu Oct 09 2008 Rex Dieter 1:1.9.98.1-1 -- koffice-1.9.98.1 (koffice2 beta2) - -* Wed Oct 08 2008 Rex Dieter 1:1.9.98.0-2 -- -krita: move %%{_kde4_libdir}/libKrita*.so here -- BR: libkdcraw-devel >= 0.2.0 - -* Thu Sep 25 2008 Rex Dieter 1:1.9.98.0-1 -- koffice-1.9.98.0 (koffice2 beta1) -- Epoch: 1 - -* Wed Aug 20 2008 Rex Dieter 1.9.95.10-1 -- koffice-1.9.95.10 - -* Thu Jul 17 2008 Rex Dieter 1.9.95.9-1 -- koffice-1.9.95.9 -- fix pkg interdependencies, multilib issues - -* Fri Jun 27 2008 Rex Dieter 1.9.95.8.2 -- respin (eviv2) - -* Tue May 27 2008 Rex Dieter 1.9.95.8-1 -- koffice-1.9.95.8 +%lang(en) %{_docdir}/HTML/en/kplato/ +%{_bindir}/kplato +%{_libdir}/libkdeinit_kplato.so +%{_libdir}/kde3/kplato.* +%{_libdir}/kde3/libkplatopart.* +%{_datadir}/apps/kplato/ +%{_datadir}/services/kplatopart.desktop +%{_datadir}/applications/kde/*kplato.desktop + + +%changelog +* Fri Mar 06 2009 Rex Dieter 2:1.1.6-19 +- revert koffice2 -> koffice1, Epoch bump +- 20090306svn + +* Mon Nov 03 2008 Rex Dieter 1:1.6.3-18 +- pull in svn updates + +* Mon Oct 27 2008 Rex Dieter 1:1.6.3-17 +- move libkiviocommon to -kivio (avoids libpython/multilib issues) + +* Thu Sep 18 2008 Rex Dieter 1:1.6.3-16 +- revert koffice2->koffice1, introduce Epoch (F-10) +- fix pkg interdependencies (#394101), multilib issues +- -krita: drop Requires: %%name-filters (#394101) +- cleanup scriptlets * Fri Feb 22 2008 Rex Dieter 1.6.3-15 - upstream gcc43 patch (#433994) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 29 Jan 2009 04:15:00 -0000 1.26 +++ sources 6 Mar 2009 21:10:00 -0000 1.27 @@ -1 +1,2 @@ -00a4a0e9e0cfa60bf02a917e2267948c koffice-1.9.98.6.tar.bz2 +03382edf62db9913b57ad8760c7d5f52 koshell.png +386d388094734f9759977c3267098e30 koffice-1.6.3.tar.bz2 --- exiv2-0.18-attempt1.diff DELETED --- From dwalsh at fedoraproject.org Fri Mar 6 21:11:35 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Fri, 6 Mar 2009 21:11:35 +0000 (UTC) Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.15, 1.16 modules-mls.conf, 1.49, 1.50 modules-targeted.conf, 1.117, 1.118 policy-20090105.patch, 1.54, 1.55 Message-ID: <20090306211135.17BB270116@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10456 Modified Files: modules-minimum.conf modules-mls.conf modules-targeted.conf policy-20090105.patch Log Message: * Thu Mar 4 2009 Dan Walsh 3.6.8-1 - Upgrade to latest patches Index: modules-minimum.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- modules-minimum.conf 5 Mar 2009 21:05:46 -0000 1.15 +++ modules-minimum.conf 6 Mar 2009 21:11:04 -0000 1.16 @@ -412,6 +412,14 @@ # gpg = module +# Layer: services +# Module: gpsd +# +# gpsd monitor daemon +# +# +gpsd = module + # Layer: apps # Module: git # Index: modules-mls.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- modules-mls.conf 5 Mar 2009 21:05:46 -0000 1.49 +++ modules-mls.conf 6 Mar 2009 21:11:04 -0000 1.50 @@ -413,6 +413,14 @@ gpg = off # Layer: services +# Module: gpsd +# +# gpsd monitor daemon +# +# +gpsd = module + +# Layer: services # Module: gpm # # General Purpose Mouse driver Index: modules-targeted.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- modules-targeted.conf 5 Mar 2009 21:05:46 -0000 1.117 +++ modules-targeted.conf 6 Mar 2009 21:11:04 -0000 1.118 @@ -412,6 +412,14 @@ # gpg = module +# Layer: services +# Module: gpsd +# +# gpsd monitor daemon +# +# +gpsd = module + # Layer: apps # Module: git # policy-20090105.patch: Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- policy-20090105.patch 5 Mar 2009 21:05:46 -0000 1.54 +++ policy-20090105.patch 6 Mar 2009 21:11:04 -0000 1.55 @@ -4394,7 +4394,7 @@ ## diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.6.8/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2009-03-02 16:51:45.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/kernel/corenetwork.te.in 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/kernel/corenetwork.te.in 2009-03-06 16:02:17.000000000 -0500 @@ -65,10 +65,12 @@ type server_packet_t, packet_type, server_packet_type; @@ -4408,7 +4408,7 @@ network_port(amanda, udp,10080,s0, tcp,10080,s0, udp,10081,s0, tcp,10081,s0, tcp,10082,s0, tcp,10083,s0) network_port(amavisd_recv, tcp,10024,s0) network_port(amavisd_send, tcp,10025,s0) -@@ -79,26 +81,33 @@ +@@ -79,26 +81,34 @@ network_port(auth, tcp,113,s0) network_port(bgp, tcp,179,s0, udp,179,s0, tcp,2605,s0, udp,2605,s0) type biff_port_t, port_type, reserved_port_type; dnl network_port(biff) # no defined portcon in current strict @@ -4438,12 +4438,13 @@ network_port(gatekeeper, udp,1718,s0, udp,1719,s0, tcp,1721,s0, tcp,7000,s0) network_port(giftd, tcp,1213,s0) network_port(gopher, tcp,70,s0, udp,70,s0) ++network_port(gpsd,tcp,2947,s0) network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy +portcon tcp 10001-10010 gen_context(system_u:object_r:http_cache_port_t, s0) network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp,8009,s0, tcp,8443,s0) #8443 is mod_nss default port network_port(howl, tcp,5335,s0, udp,5353,s0) network_port(hplip, tcp,1782,s0, tcp,2207,s0, tcp,2208,s0, tcp, 8290,s0, tcp,50000,s0, tcp,50002,s0, tcp,8292,s0, tcp,9100,s0, tcp,9101,s0, tcp,9102,s0, tcp,9220,s0, tcp,9221,s0, tcp,9222,s0, tcp,9280,s0, tcp,9281,s0, tcp,9282,s0, tcp,9290,s0, tcp,9291,s0, tcp,9292,s0) -@@ -118,6 +127,8 @@ +@@ -118,6 +128,8 @@ network_port(kerberos_admin, tcp,464,s0, udp,464,s0, tcp,749,s0) network_port(kerberos_master, tcp,4444,s0, udp,4444,s0) network_port(kerberos, tcp,88,s0, udp,88,s0, tcp,750,s0, udp,750,s0) @@ -4452,7 +4453,7 @@ network_port(ktalkd, udp,517,s0, udp,518,s0) network_port(ldap, tcp,389,s0, udp,389,s0, tcp,636,s0, udp,636,s0, tcp,3268,s0) type lrrd_port_t, port_type; dnl network_port(lrrd_port_t) # no defined portcon -@@ -127,6 +138,7 @@ +@@ -127,6 +139,7 @@ network_port(mmcc, tcp,5050,s0, udp,5050,s0) network_port(monopd, tcp,1234,s0) network_port(msnp, tcp,1863,s0, udp,1863,s0) @@ -4460,7 +4461,7 @@ network_port(mysqld, tcp,1186,s0, tcp,3306,s0) portcon tcp 63132-63163 gen_context(system_u:object_r:mysqld_port_t, s0) network_port(nessus, tcp,1241,s0) -@@ -137,12 +149,21 @@ +@@ -137,12 +150,21 @@ network_port(openvpn, tcp,1194,s0, udp,1194,s0) network_port(pegasus_http, tcp,5988,s0) network_port(pegasus_https, tcp,5989,s0) @@ -4482,7 +4483,7 @@ network_port(printer, tcp,515,s0) network_port(ptal, tcp,5703,s0) network_port(pxe, udp,4011,s0) -@@ -161,9 +182,11 @@ +@@ -161,9 +183,11 @@ network_port(rwho, udp,513,s0) network_port(smbd, tcp,137-139,s0, tcp,445,s0) network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0) @@ -4495,7 +4496,7 @@ network_port(soundd, tcp,8000,s0, tcp,9433,s0, tcp, 16001, s0) type socks_port_t, port_type; dnl network_port(socks) # no defined portcon type stunnel_port_t, port_type; dnl network_port(stunnel) # no defined portcon in current strict -@@ -172,14 +195,17 @@ +@@ -172,14 +196,17 @@ network_port(syslogd, udp,514,s0) network_port(telnetd, tcp,23,s0) network_port(tftp, udp,69,s0) @@ -9128,7 +9129,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.6.8/policy/modules/services/clamav.te --- nsaserefpolicy/policy/modules/services/clamav.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/services/clamav.te 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/services/clamav.te 2009-03-06 10:10:40.000000000 -0500 @@ -13,7 +13,10 @@ # configuration files @@ -9205,7 +9206,7 @@ kernel_read_kernel_sysctls(clamscan_t) files_read_etc_files(clamscan_t) -@@ -221,6 +244,12 @@ +@@ -221,6 +244,8 @@ clamav_stream_connect(clamscan_t) @@ -9214,10 +9215,6 @@ optional_policy(` apache_read_sys_content(clamscan_t) ') -+ -+optional_policy(` -+ mailscanner_manage_spool(clamscan_t) -+') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.fc serefpolicy-3.6.8/policy/modules/services/consolekit.fc --- nsaserefpolicy/policy/modules/services/consolekit.fc 2008-08-07 11:15:11.000000000 -0400 +++ serefpolicy-3.6.8/policy/modules/services/consolekit.fc 2009-03-05 15:25:24.000000000 -0500 @@ -12100,7 +12097,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.6.8/policy/modules/services/ftp.te --- nsaserefpolicy/policy/modules/services/ftp.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/services/ftp.te 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/services/ftp.te 2009-03-06 10:14:51.000000000 -0500 @@ -26,7 +26,7 @@ ## ##

    @@ -12144,7 +12141,7 @@ fs_search_auto_mountpoints(ftpd_t) fs_getattr_all_fs(ftpd_t) -+fs_search_fusefs_dirs(ftpd_t) ++fs_search_fusefs(ftpd_t) auth_use_nsswitch(ftpd_t) auth_domtrans_chk_passwd(ftpd_t) @@ -12343,6 +12340,156 @@ + polkit_read_reload(gnomeclock_t) +') + +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.fc serefpolicy-3.6.8/policy/modules/services/gpsd.fc +--- nsaserefpolicy/policy/modules/services/gpsd.fc 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/services/gpsd.fc 2009-03-06 16:02:17.000000000 -0500 +@@ -0,0 +1,3 @@ ++ ++/usr/sbin/gpsd -- gen_context(system_u:object_r:gpsd_exec_t,s0) ++ +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.if serefpolicy-3.6.8/policy/modules/services/gpsd.if +--- nsaserefpolicy/policy/modules/services/gpsd.if 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/services/gpsd.if 2009-03-06 16:03:34.000000000 -0500 +@@ -0,0 +1,83 @@ ++##

    gpsd monitor daemon ++ ++######################################## ++## ++## Execute a domain transition to run gpsd. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`gpsd_domtrans',` ++ gen_require(` ++ type gpsd_t, gpsd_exec_t; ++ ') ++ ++ domtrans_pattern($1, gpsd_exec_t, gpsd_t) ++') ++ ++######################################## ++## ++## Execute gpsd in the gpsd domain, and ++## allow the specified role the gpsd domain. ++## ++## ++## ++## Domain allowed access ++## ++## ++## ++## ++## The role to be allowed the gpsd domain. ++## ++## ++# ++interface(`gpsd_run',` ++ gen_require(` ++ type gpsd_t; ++ ') ++ ++ gpsd_domtrans($1) ++ role $2 types gpsd_t; ++') ++ ++######################################## ++## ++## Read and write to gpsd shared memory. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`gpsd_rw_shm',` ++ gen_require(` ++ type gpsd_t; ++ ') ++ ++ allow $1 gpsd_t:shm rw_shm_perms; ++') ++ ++######################################## ++## ++## Read/write gpsd tmpfs files. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`gpsd_rw_tmpfs_files',` ++ gen_require(` ++ type gpsd_tmpfs_t; ++ ') ++ ++ fs_search_tmpfs($1) ++ allow $1 gpsd_tmpfs_t:dir list_dir_perms; ++ rw_files_pattern($1, gpsd_tmpfs_t, gpsd_tmpfs_t) ++ read_lnk_files_pattern($1, gpsd_tmpfs_t, gpsd_tmpfs_t) ++') +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.te serefpolicy-3.6.8/policy/modules/services/gpsd.te +--- nsaserefpolicy/policy/modules/services/gpsd.te 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/services/gpsd.te 2009-03-06 16:06:45.000000000 -0500 +@@ -0,0 +1,52 @@ ++policy_module(gpsd,1.0.0) ++ ++######################################## ++# ++# Declarations ++# ++ ++type gpsd_t; ++type gpsd_exec_t; ++application_domain(gpsd_t, gpsd_exec_t) ++role system_r types gpsd_t; ++ ++type gpsd_tmpfs_t; ++files_tmpfs_file(gpsd_tmpfs_t) ++ ++######################################## ++# ++# gpsd local policy ++# ++ ++allow gpsd_t self:capability { setuid sys_nice setgid fowner }; ++allow gpsd_t self:process setsched; ++allow gpsd_t self:shm create_shm_perms; ++allow gpsd_t self:unix_dgram_socket { create_socket_perms sendto }; ++allow gpsd_t self:tcp_socket create_stream_socket_perms; ++ ++manage_dirs_pattern(gpsd_t, gpsd_tmpfs_t, gpsd_tmpfs_t) ++manage_files_pattern(gpsd_t, gpsd_tmpfs_t, gpsd_tmpfs_t) ++fs_tmpfs_filetrans(gpsd_t, gpsd_tmpfs_t, { dir file }) ++ ++corenet_tcp_bind_all_nodes(gpsd_t) ++corenet_tcp_bind_gpsd_port(gpsd_t) ++ ++term_use_unallocated_ttys(gpsd_t) ++term_setattr_unallocated_ttys(gpsd_t) ++ ++auth_use_nsswitch(gpsd_t) ++ ++logging_send_syslog_msg(gpsd_t) ++ ++miscfiles_read_localization(gpsd_t) ++ ++optional_policy(` ++ ntpd_rw_shm(gpsd_t) ++ ntpd_rw_tmpfs_files(gpsd_t) ++') ++ ++optional_policy(` ++ dbus_system_bus_client(gpsd_t) ++') ++ ++ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.6.8/policy/modules/services/hal.fc --- nsaserefpolicy/policy/modules/services/hal.fc 2008-11-19 11:51:44.000000000 -0500 +++ serefpolicy-3.6.8/policy/modules/services/hal.fc 2009-03-05 15:25:24.000000000 -0500 @@ -14831,7 +14978,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.if serefpolicy-3.6.8/policy/modules/services/ntp.if --- nsaserefpolicy/policy/modules/services/ntp.if 2008-10-14 11:58:09.000000000 -0400 -+++ serefpolicy-3.6.8/policy/modules/services/ntp.if 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/services/ntp.if 2009-03-06 16:02:17.000000000 -0500 @@ -37,6 +37,32 @@ ######################################## @@ -14865,7 +15012,7 @@ ## Execute ntp server in the ntpd domain. ##     ## -@@ -56,6 +82,24 @@ +@@ -56,6 +82,63 @@ ######################################## ## @@ -14885,6 +15032,45 @@ + init_labeled_script_domtrans($1, ntpd_initrc_exec_t) +') + ++####################################### ++## ++## Read/write ntpdd tmpfs files. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`ntpd_rw_tmpfs_files',` ++ gen_require(` ++ type ntpd_tmpfs_t; ++ ') ++ ++ fs_search_tmpfs($1) ++ list_dirs_pattern($1,ntpd_tmpfs_t,ntpd_tmpfs_t) ++ rw_files_pattern($1, ntpd_tmpfs_t, ntpd_tmpfs_t) ++ read_lnk_files_pattern($1, ntpd_tmpfs_t, ntpd_tmpfs_t) ++') ++ ++######################################## ++## ++## Read and write to ntpd shared memory. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`ntpd_rw_shm',` ++ gen_require(` ++ type ntpd_t; ++ ') ++ ++ allow $1 ntpd_t:shm rw_shm_perms; ++') ++ +######################################## +## ## All of the rules required to administrate @@ -14892,8 +15078,18 @@ ## diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.6.8/policy/modules/services/ntp.te --- nsaserefpolicy/policy/modules/services/ntp.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/services/ntp.te 2009-03-05 15:25:24.000000000 -0500 -@@ -38,10 +38,11 @@ ++++ serefpolicy-3.6.8/policy/modules/services/ntp.te 2009-03-06 16:02:17.000000000 -0500 +@@ -25,6 +25,9 @@ + type ntpd_tmp_t; + files_tmp_file(ntpd_tmp_t) + ++type ntpd_tmpfs_t; ++files_tmpfs_file(ntpd_tmpfs_t) ++ + type ntpd_var_run_t; + files_pid_file(ntpd_var_run_t) + +@@ -38,10 +41,11 @@ # sys_resource and setrlimit is for locking memory # ntpdate wants sys_nice @@ -14906,7 +15102,7 @@ allow ntpd_t self:unix_dgram_socket create_socket_perms; allow ntpd_t self:unix_stream_socket create_socket_perms; allow ntpd_t self:tcp_socket create_stream_socket_perms; -@@ -52,6 +53,7 @@ +@@ -52,6 +56,7 @@ can_exec(ntpd_t,ntpd_exec_t) read_files_pattern(ntpd_t, ntpd_key_t, ntpd_key_t) @@ -14914,7 +15110,18 @@ allow ntpd_t ntpd_log_t:dir setattr; manage_files_pattern(ntpd_t,ntpd_log_t,ntpd_log_t) -@@ -90,6 +92,9 @@ +@@ -62,6 +67,10 @@ + manage_files_pattern(ntpd_t, ntpd_tmp_t, ntpd_tmp_t) + files_tmp_filetrans(ntpd_t, ntpd_tmp_t, { file dir }) + ++manage_dirs_pattern(ntpd_t, ntpd_tmpfs_t, ntpd_tmpfs_t) ++manage_files_pattern(ntpd_t, ntpd_tmpfs_t, ntpd_tmpfs_t) ++fs_tmpfs_filetrans(ntpd_t, ntpd_tmpfs_t, { dir file }) ++ + manage_files_pattern(ntpd_t, ntpd_var_run_t, ntpd_var_run_t) + files_pid_filetrans(ntpd_t, ntpd_var_run_t, file) + +@@ -90,6 +99,9 @@ fs_getattr_all_fs(ntpd_t) fs_search_auto_mountpoints(ntpd_t) @@ -14924,6 +15131,18 @@ term_use_ptmx(ntpd_t) +@@ -121,6 +133,11 @@ + ') + + optional_policy(` ++ gpsd_rw_shm(ntpd_t) ++ gpsd_rw_tmpfs_files(ntpd_t) ++') ++ ++optional_policy(` + firstboot_dontaudit_use_fds(ntpd_t) + firstboot_dontaudit_rw_pipes(ntpd_t) + firstboot_dontaudit_rw_stream_sockets(ntpd_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.te serefpolicy-3.6.8/policy/modules/services/nx.te --- nsaserefpolicy/policy/modules/services/nx.te 2009-01-19 11:07:34.000000000 -0500 +++ serefpolicy-3.6.8/policy/modules/services/nx.te 2009-03-05 15:25:24.000000000 -0500 @@ -18984,7 +19203,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.6.8/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/services/samba.te 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/services/samba.te 2009-03-06 15:54:27.000000000 -0500 @@ -66,6 +66,13 @@ ## gen_tunable(samba_share_nfs, false) @@ -19171,7 +19390,7 @@ + fs_manage_fusefs_dirs(smbd_t) + fs_manage_fusefs_files(smbd_t) +',` -+ fs_search_fusefs_dirs(smbd_t) ++ fs_search_fusefs(smbd_t) ') + @@ -27154,7 +27373,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.8/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/unconfined.te 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/unconfined.te 2009-03-06 16:03:12.000000000 -0500 @@ -5,6 +5,35 @@ # # Declarations @@ -27319,69 +27538,77 @@ ') optional_policy(` -@@ -119,31 +202,33 @@ +@@ -119,72 +202,80 @@ ') optional_policy(` - inn_domtrans(unconfined_t) -+ iptables_run(unconfined_t, unconfined_r) ++ gpsd_run(unconfined_t, unconfined_r) ') optional_policy(` - java_domtrans_unconfined(unconfined_t) -+ java_run_unconfined(unconfined_t, unconfined_r) ++ iptables_run(unconfined_t, unconfined_r) ') optional_policy(` - lpd_run_checkpc(unconfined_t, unconfined_r) -+ kismet_run(unconfined_t, unconfined_r) ++ java_run_unconfined(unconfined_t, unconfined_r) ') optional_policy(` - modutils_run_update_mods(unconfined_t, unconfined_r) -+ livecd_run(unconfined_t, unconfined_r) ++ kismet_run(unconfined_t, unconfined_r) ') optional_policy(` - mono_domtrans(unconfined_t) -+ lpd_run_checkpc(unconfined_t, unconfined_r) ++ livecd_run(unconfined_t, unconfined_r) ') optional_policy(` - mta_role(unconfined_r, unconfined_t) -+ modutils_run_update_mods(unconfined_t, unconfined_r) ++ lpd_run_checkpc(unconfined_t, unconfined_r) ') optional_policy(` - oddjob_domtrans_mkhomedir(unconfined_t) ++ modutils_run_update_mods(unconfined_t, unconfined_r) + ') + + optional_policy(` +- prelink_run(unconfined_t, unconfined_r) + mono_role_template(unconfined, unconfined_r, unconfined_t) + unconfined_domain(unconfined_mono_t) + role system_r types unconfined_mono_t; ') optional_policy(` -@@ -155,36 +240,38 @@ +- portmap_run_helper(unconfined_t, unconfined_r) ++ prelink_run(unconfined_t, unconfined_r) ') optional_policy(` - postfix_run_map(unconfined_t, unconfined_r) - # cjp: this should probably be removed: - postfix_domtrans_master(unconfined_t) ++ portmap_run_helper(unconfined_t, unconfined_r) + ') + + optional_policy(` +- pyzor_role(unconfined_r, unconfined_t) -') + qemu_role_notrans(unconfined_r, unconfined_t) + qemu_unconfined_role(unconfined_r) -optional_policy(` -- pyzor_role(unconfined_r, unconfined_t) +- # cjp: this should probably be removed: +- rpc_domtrans_nfsd(unconfined_t) + tunable_policy(`allow_unconfined_qemu_transition',` + qemu_domtrans(unconfined_t) + ',` + qemu_domtrans_unconfined(unconfined_t) - ') -- --optional_policy(` -- # cjp: this should probably be removed: -- rpc_domtrans_nfsd(unconfined_t) ++') ') optional_policy(` @@ -27411,7 +27638,7 @@ ') optional_policy(` -@@ -192,7 +279,7 @@ +@@ -192,7 +283,7 @@ ') optional_policy(` @@ -27420,7 +27647,7 @@ ') optional_policy(` -@@ -204,11 +291,12 @@ +@@ -204,11 +295,12 @@ ') optional_policy(` @@ -27435,7 +27662,7 @@ ') ######################################## -@@ -218,14 +306,61 @@ +@@ -218,14 +310,61 @@ allow unconfined_execmem_t self:process { execstack execmem }; unconfined_domain_noaudit(unconfined_execmem_t) From jkeating at fedoraproject.org Fri Mar 6 21:27:50 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Fri, 6 Mar 2009 21:27:50 +0000 (UTC) Subject: rpms/vtk/devel vtk.spec,1.16,1.17 Message-ID: <20090306212750.C584070116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/vtk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13981 Modified Files: vtk.spec Log Message: * Fri Mar 06 2009 Jesse Keating - 5.2.0-28 - Remove chmod on examples .so files, none are built. This needs more attention. Index: vtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/vtk/devel/vtk.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- vtk.spec 26 Feb 2009 00:54:40 -0000 1.16 +++ vtk.spec 6 Mar 2009 21:27:20 -0000 1.17 @@ -7,7 +7,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 5.2.0 -Release: 27%{?dist} +Release: 28%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -285,7 +285,7 @@ find Utilities/Upgrading -type f | xargs chmod -x # Add exec bits to shared libs ... -chmod 0755 %{buildroot}%{_libdir}/vtk-5.2/CMake/*.so +#chmod 0755 %{buildroot}%{_libdir}/vtk-5.2/CMake/*.so %check #LD_LIBARARY_PATH=`pwd`/bin ctest -V @@ -369,6 +369,10 @@ %doc vtk-examples-5.2/Examples %changelog +* Fri Mar 06 2009 Jesse Keating - 5.2.0-28 +- Remove chmod on examples .so files, none are built. This needs + more attention. + * Wed Feb 25 2009 Fedora Release Engineering - 5.2.0-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From dwalsh at fedoraproject.org Fri Mar 6 21:31:11 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Fri, 6 Mar 2009 21:31:11 +0000 (UTC) Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.184, 1.185 libselinux.spec, 1.359, 1.360 Message-ID: <20090306213111.6038470116@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libselinux/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14896 Modified Files: libselinux-rhat.patch libselinux.spec Log Message: * Fri Mar 6 2009 Dan Walsh - 2.0.78-2 - Add substitute pattern - matchpathcon output <> on ENOENT libselinux-rhat.patch: Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- libselinux-rhat.patch 2 Mar 2009 18:21:46 -0000 1.184 +++ libselinux-rhat.patch 6 Mar 2009 21:31:09 -0000 1.185 @@ -1,8 +1,11 @@ -diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-2.0.77/include/selinux/selinux.h ---- nsalibselinux/include/selinux/selinux.h 2009-01-05 17:45:35.000000000 -0500 -+++ libselinux-2.0.77/include/selinux/selinux.h 2009-02-18 14:18:54.000000000 -0500 -@@ -459,6 +459,8 @@ +diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-2.0.78/include/selinux/selinux.h +--- nsalibselinux/include/selinux/selinux.h 2009-03-06 14:41:44.000000000 -0500 ++++ libselinux-2.0.78/include/selinux/selinux.h 2009-03-06 16:27:32.000000000 -0500 +@@ -457,8 +457,11 @@ + extern const char *selinux_file_context_path(void); + extern const char *selinux_file_context_homedir_path(void); extern const char *selinux_file_context_local_path(void); ++extern const char *selinux_file_context_subs_path(void); extern const char *selinux_homedir_context_path(void); extern const char *selinux_media_context_path(void); +extern const char *selinux_virtual_domain_context_path(void); @@ -10,7 +13,7 @@ extern const char *selinux_x_context_path(void); extern const char *selinux_contexts_path(void); extern const char *selinux_securetty_types_path(void); -@@ -520,6 +522,14 @@ +@@ -520,6 +523,14 @@ Caller must free the returned strings via free. */ extern int getseuserbyname(const char *linuxuser, char **seuser, char **level); @@ -25,9 +28,9 @@ /* Compare two file contexts, return 0 if equivalent. */ int selinux_file_context_cmp(const security_context_t a, const security_context_t b); -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.77/man/man8/selinuxconlist.8 +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.78/man/man8/selinuxconlist.8 --- nsalibselinux/man/man8/selinuxconlist.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.77/man/man8/selinuxconlist.8 2009-02-18 14:18:54.000000000 -0500 ++++ libselinux-2.0.78/man/man8/selinuxconlist.8 2009-03-06 16:27:32.000000000 -0500 @@ -0,0 +1,18 @@ +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -47,9 +50,9 @@ + +.SH "SEE ALSO" +secon(8), selinuxdefcon(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.77/man/man8/selinuxdefcon.8 +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.78/man/man8/selinuxdefcon.8 --- nsalibselinux/man/man8/selinuxdefcon.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.77/man/man8/selinuxdefcon.8 2009-02-18 14:18:54.000000000 -0500 ++++ libselinux-2.0.78/man/man8/selinuxdefcon.8 2009-03-06 16:27:32.000000000 -0500 @@ -0,0 +1,19 @@ +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -70,9 +73,9 @@ + +.SH "SEE ALSO" +secon(8), selinuxconlist(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.77/src/callbacks.c ---- nsalibselinux/src/callbacks.c 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.77/src/callbacks.c 2009-02-18 14:18:54.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.78/src/callbacks.c +--- nsalibselinux/src/callbacks.c 2009-03-06 14:41:45.000000000 -0500 ++++ libselinux-2.0.78/src/callbacks.c 2009-03-06 16:27:32.000000000 -0500 @@ -16,6 +16,7 @@ { int rc; @@ -81,18 +84,166 @@ va_start(ap, fmt); rc = vfprintf(stderr, fmt, ap); va_end(ap); -diff --exclude-from=exclude -N -u -r nsalibselinux/src/file_path_suffixes.h libselinux-2.0.77/src/file_path_suffixes.h ---- nsalibselinux/src/file_path_suffixes.h 2009-01-05 17:45:35.000000000 -0500 -+++ libselinux-2.0.77/src/file_path_suffixes.h 2009-02-18 14:18:54.000000000 -0500 -@@ -20,3 +20,5 @@ +diff --exclude-from=exclude -N -u -r nsalibselinux/src/file_path_suffixes.h libselinux-2.0.78/src/file_path_suffixes.h +--- nsalibselinux/src/file_path_suffixes.h 2009-03-06 14:41:45.000000000 -0500 ++++ libselinux-2.0.78/src/file_path_suffixes.h 2009-03-06 16:27:32.000000000 -0500 +@@ -20,3 +20,6 @@ S_(FILE_CONTEXTS_LOCAL, "/contexts/files/file_contexts.local") S_(X_CONTEXTS, "/contexts/x_contexts") S_(COLORS, "/secolor.conf") + S_(VIRTUAL_DOMAIN, "/contexts/virtual_domain_context") + S_(VIRTUAL_IMAGE, "/contexts/virtual_image_context") -diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.77/src/matchpathcon.c ---- nsalibselinux/src/matchpathcon.c 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.77/src/matchpathcon.c 2009-02-18 14:18:54.000000000 -0500 ++ S_(FILE_CONTEXT_SUBS, "/contexts/files/file_contexts.subs") +diff --exclude-from=exclude -N -u -r nsalibselinux/src/label.c libselinux-2.0.78/src/label.c +--- nsalibselinux/src/label.c 2009-03-06 14:41:45.000000000 -0500 ++++ libselinux-2.0.78/src/label.c 2009-03-06 16:27:32.000000000 -0500 +@@ -5,10 +5,12 @@ + */ + + #include ++#include + #include + #include + #include + #include ++#include + #include "callbacks.h" + #include "label_internal.h" + +@@ -23,6 +25,96 @@ + &selabel_x_init + }; + ++typedef struct selabel_sub { ++ char *src; ++ int slen; ++ char *dst; ++ struct selabel_sub *next; ++} SELABELSUB; ++ ++SELABELSUB *selabelsublist = NULL; ++ ++static void selabel_subs_fini(void) ++{ ++ SELABELSUB *ptr = selabelsublist; ++ SELABELSUB *next = NULL; ++ while (ptr) { ++ next = ptr->next; ++ free(ptr->src); ++ free(ptr->dst); ++ free(ptr); ++ ptr = next; ++ } ++ selabelsublist = NULL; ++} ++ ++static char *selabel_sub(const char *src) ++{ ++ char *dst = NULL; ++ SELABELSUB *ptr = selabelsublist; ++ while (ptr) { ++ if (strncmp(src, ptr->src, ptr->slen) == 0 ) { ++ if (src[ptr->slen] == '/' || ++ src[ptr->slen] == 0) { ++ asprintf(&dst, "%s%s", ptr->dst, &src[ptr->slen]); ++ return dst; ++ } ++ } ++ ptr = ptr->next; ++ } ++ return NULL; ++} ++ ++static int selabel_subs_init(void) ++{ ++ char buf[1024]; ++ FILE *cfg = fopen(selinux_file_context_subs_path(), "r"); ++ if (cfg) { ++ while (fgets_unlocked(buf, sizeof(buf) - 1, cfg)) { ++ char *ptr = NULL; ++ char *src = buf; ++ char *dst = NULL; ++ ++ while (*src && isspace(*src)) ++ src++; ++ if (src[0] == '#') continue; ++ ptr = src; ++ while (*ptr && ! isspace(*ptr)) ++ ptr++; ++ *ptr++ = 0; ++ if (! *src) continue; ++ ++ dst = ptr; ++ while (*dst && isspace(*dst)) ++ dst++; ++ ptr=dst; ++ while (*ptr && ! isspace(*ptr)) ++ ptr++; ++ *ptr=0; ++ if (! *dst) continue; ++ ++ SELABELSUB *sub = (SELABELSUB*) malloc(sizeof(SELABELSUB)); ++ if (! sub) return -1; ++ sub->src=strdup(src); ++ if (! sub->src) { ++ free(sub); ++ return -1; ++ } ++ sub->dst=strdup(dst); ++ if (! sub->dst) { ++ free(sub); ++ free(sub->src); ++ return -1; ++ } ++ sub->slen = strlen(src); ++ sub->next = selabelsublist; ++ selabelsublist = sub; ++ } ++ fclose(cfg); ++ } ++ return 0; ++} ++ + /* + * Validation functions + */ +@@ -67,6 +159,8 @@ + goto out; + } + ++ selabel_subs_init(); ++ + rec = (struct selabel_handle *)malloc(sizeof(*rec)); + if (!rec) + goto out; +@@ -88,7 +182,14 @@ + selabel_lookup_common(struct selabel_handle *rec, int translating, + const char *key, int type) + { +- struct selabel_lookup_rec *lr = rec->func_lookup(rec, key, type); ++ struct selabel_lookup_rec *lr; ++ char *ptr = selabel_sub(key); ++ if (ptr) { ++ lr = rec->func_lookup(rec, ptr, type); ++ free(ptr); ++ } else { ++ lr = rec->func_lookup(rec, key, type); ++ } + if (!lr) + return NULL; + +@@ -132,6 +233,8 @@ + { + rec->func_close(rec); + free(rec); ++ ++ selabel_subs_fini(); + } + + void selabel_stats(struct selabel_handle *rec) +diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.78/src/matchpathcon.c +--- nsalibselinux/src/matchpathcon.c 2009-03-06 14:41:45.000000000 -0500 ++++ libselinux-2.0.78/src/matchpathcon.c 2009-03-06 16:27:32.000000000 -0500 @@ -2,6 +2,7 @@ #include #include @@ -110,21 +261,22 @@ va_end(ap); } -diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-2.0.77/src/selinux_config.c ---- nsalibselinux/src/selinux_config.c 2009-01-05 17:45:35.000000000 -0500 -+++ libselinux-2.0.77/src/selinux_config.c 2009-02-18 14:18:54.000000000 -0500 -@@ -40,7 +40,9 @@ +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-2.0.78/src/selinux_config.c +--- nsalibselinux/src/selinux_config.c 2009-03-06 14:41:45.000000000 -0500 ++++ libselinux-2.0.78/src/selinux_config.c 2009-03-06 16:27:32.000000000 -0500 +@@ -40,7 +40,10 @@ #define SECURETTY_TYPES 18 #define X_CONTEXTS 19 #define COLORS 20 -#define NEL 21 +#define VIRTUAL_DOMAIN 21 +#define VIRTUAL_IMAGE 22 -+#define NEL 23 ++#define FILE_CONTEXT_SUBS 23 ++#define NEL 24 /* New layout is relative to SELINUXDIR/policytype. */ static char *file_paths[NEL]; -@@ -391,3 +393,17 @@ +@@ -391,3 +394,24 @@ } hidden_def(selinux_x_context_path) @@ -142,10 +294,17 @@ +} + +hidden_def(selinux_virtual_image_context_path) -diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libselinux-2.0.77/src/selinux_internal.h ---- nsalibselinux/src/selinux_internal.h 2009-01-05 17:45:35.000000000 -0500 -+++ libselinux-2.0.77/src/selinux_internal.h 2009-02-18 14:18:54.000000000 -0500 -@@ -56,6 +56,8 @@ ++ ++const char * selinux_file_context_subs_path(void) { ++ return get_path(FILE_CONTEXT_SUBS); ++} ++ ++hidden_def(selinux_file_context_subs_path) ++ +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libselinux-2.0.78/src/selinux_internal.h +--- nsalibselinux/src/selinux_internal.h 2009-03-06 14:41:45.000000000 -0500 ++++ libselinux-2.0.78/src/selinux_internal.h 2009-03-06 16:27:32.000000000 -0500 +@@ -56,9 +56,12 @@ hidden_proto(selinux_securetty_types_path) hidden_proto(selinux_failsafe_context_path) hidden_proto(selinux_removable_context_path) @@ -154,9 +313,13 @@ hidden_proto(selinux_file_context_path) hidden_proto(selinux_file_context_homedir_path) hidden_proto(selinux_file_context_local_path) -diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.77/src/selinux.py ---- nsalibselinux/src/selinux.py 2009-01-13 08:45:35.000000000 -0500 -+++ libselinux-2.0.77/src/selinux.py 2009-02-18 14:18:54.000000000 -0500 ++ hidden_proto(selinux_file_context_subs_path) + hidden_proto(selinux_netfilter_context_path) + hidden_proto(selinux_homedir_context_path) + hidden_proto(selinux_user_contexts_path) +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.78/src/selinux.py +--- nsalibselinux/src/selinux.py 2009-03-06 14:41:45.000000000 -0500 ++++ libselinux-2.0.78/src/selinux.py 2009-03-06 16:27:32.000000000 -0500 @@ -1,5 +1,5 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 1.3.35 @@ -555,9 +718,9 @@ selinux_default_type_path = _selinux.selinux_default_type_path get_default_type = _selinux.get_default_type SELINUX_DEFAULTUSER = _selinux.SELINUX_DEFAULTUSER -diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.77/src/selinuxswig.i ---- nsalibselinux/src/selinuxswig.i 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.77/src/selinuxswig.i 2009-02-18 14:18:54.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.78/src/selinuxswig.i +--- nsalibselinux/src/selinuxswig.i 2009-03-06 14:41:45.000000000 -0500 ++++ libselinux-2.0.78/src/selinuxswig.i 2009-03-06 16:27:32.000000000 -0500 @@ -47,8 +47,36 @@ %ignore set_matchpathcon_printf; %ignore set_matchpathcon_invalidcon; @@ -596,9 +759,9 @@ %include "../include/selinux/selinux.h" %include "../include/selinux/avc.h" -diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libselinux-2.0.77/src/selinuxswig_python.i ---- nsalibselinux/src/selinuxswig_python.i 2009-01-13 08:45:35.000000000 -0500 -+++ libselinux-2.0.77/src/selinuxswig_python.i 2009-02-18 14:18:54.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_python.i libselinux-2.0.78/src/selinuxswig_python.i +--- nsalibselinux/src/selinuxswig_python.i 2009-03-06 14:41:45.000000000 -0500 ++++ libselinux-2.0.78/src/selinuxswig_python.i 2009-03-06 16:27:32.000000000 -0500 @@ -21,6 +21,15 @@ map(restorecon, [os.path.join(dirname, fname) for fname in fnames]), None) @@ -628,9 +791,9 @@ +} + %include "selinuxswig.i" -diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-2.0.77/src/selinuxswig_wrap.c ---- nsalibselinux/src/selinuxswig_wrap.c 2009-01-13 08:45:35.000000000 -0500 -+++ libselinux-2.0.77/src/selinuxswig_wrap.c 2009-02-18 14:18:54.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-2.0.78/src/selinuxswig_wrap.c +--- nsalibselinux/src/selinuxswig_wrap.c 2009-03-06 14:41:45.000000000 -0500 ++++ libselinux-2.0.78/src/selinuxswig_wrap.c 2009-03-06 16:27:32.000000000 -0500 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). @@ -10291,9 +10454,9 @@ _swigc__p_selinux_opt, _swigc__p_unsigned_int, _swigc__p_unsigned_short, -diff --exclude-from=exclude -N -u -r nsalibselinux/src/seusers.c libselinux-2.0.77/src/seusers.c ---- nsalibselinux/src/seusers.c 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.77/src/seusers.c 2009-02-18 14:18:54.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsalibselinux/src/seusers.c libselinux-2.0.78/src/seusers.c +--- nsalibselinux/src/seusers.c 2009-03-06 14:41:45.000000000 -0500 ++++ libselinux-2.0.78/src/seusers.c 2009-03-06 16:27:32.000000000 -0500 @@ -243,3 +243,67 @@ *r_level = NULL; return 0; @@ -10362,9 +10525,9 @@ + + return (ret ? getseuserbyname(username, r_seuser, r_level) : ret); +} -diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getdefaultcon.c libselinux-2.0.77/utils/getdefaultcon.c ---- nsalibselinux/utils/getdefaultcon.c 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.77/utils/getdefaultcon.c 2009-02-18 14:18:54.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getdefaultcon.c libselinux-2.0.78/utils/getdefaultcon.c +--- nsalibselinux/utils/getdefaultcon.c 2009-03-06 14:41:45.000000000 -0500 ++++ libselinux-2.0.78/utils/getdefaultcon.c 2009-03-06 16:27:32.000000000 -0500 @@ -22,8 +22,9 @@ security_context_t usercon = NULL, cur_context = NULL; char *user = NULL, *level = NULL, *role=NULL, *seuser=NULL, *dlevel=NULL; @@ -10410,9 +10573,9 @@ - return 0; + return ret >= 0; } -diff --exclude-from=exclude -N -u -r nsalibselinux/utils/Makefile libselinux-2.0.77/utils/Makefile ---- nsalibselinux/utils/Makefile 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.77/utils/Makefile 2009-02-18 14:18:54.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsalibselinux/utils/Makefile libselinux-2.0.78/utils/Makefile +--- nsalibselinux/utils/Makefile 2009-03-06 14:41:45.000000000 -0500 ++++ libselinux-2.0.78/utils/Makefile 2009-03-06 16:27:32.000000000 -0500 @@ -2,28 +2,33 @@ PREFIX ?= $(DESTDIR)/usr LIBDIR ?= $(PREFIX)/lib @@ -10451,10 +10614,27 @@ indent: ../../scripts/Lindent $(wildcard *.[ch]) -diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.77/utils/matchpathcon.c ---- nsalibselinux/utils/matchpathcon.c 2008-10-28 10:06:51.000000000 -0400 -+++ libselinux-2.0.77/utils/matchpathcon.c 2009-02-18 14:18:54.000000000 -0500 -@@ -101,6 +101,11 @@ +diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.78/utils/matchpathcon.c +--- nsalibselinux/utils/matchpathcon.c 2009-03-06 14:41:45.000000000 -0500 ++++ libselinux-2.0.78/utils/matchpathcon.c 2009-03-06 16:29:27.000000000 -0500 +@@ -22,9 +22,13 @@ + char *buf; + int rc = matchpathcon(path, mode, &buf); + if (rc < 0) { +- fprintf(stderr, "matchpathcon(%s) failed: %s\n", path, +- strerror(errno)); +- return 1; ++ if (errno == ENOENT) { ++ buf=strdup("<>"); ++ } else { ++ fprintf(stderr, "matchpathcon(%s) failed: %s\n", path, ++ strerror(errno)); ++ return 1; ++ } + } + if (header) + printf("%s\t%s\n", path, buf); +@@ -101,6 +105,11 @@ for (i = optind; i < argc; i++) { int mode = 0; struct stat buf; Index: libselinux.spec =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.359 retrieving revision 1.360 diff -u -r1.359 -r1.360 --- libselinux.spec 2 Mar 2009 18:21:46 -0000 1.359 +++ libselinux.spec 6 Mar 2009 21:31:10 -0000 1.360 @@ -5,7 +5,7 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 2.0.78 -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -164,6 +164,10 @@ %{ruby_sitearch}/selinux.so %changelog +* Fri Mar 6 2009 Dan Walsh - 2.0.78-2 +- Add substitute pattern +- matchpathcon output <> on ENOENT + * Mon Mar 2 2009 Dan Walsh - 2.0.78-1 - Update to upstream * Fix incorrect conversion in discover_class code. From amdunn at fedoraproject.org Fri Mar 6 21:34:04 2009 From: amdunn at fedoraproject.org (Alan Dunn) Date: Fri, 6 Mar 2009 21:34:04 +0000 (UTC) Subject: rpms/ocaml-ocamlgraph/F-10 ocamlgraph-1.0-no-view-graph-doc.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 ocaml-ocamlgraph.spec, 1.1, 1.2 sources, 1.2, 1.3 ocamlgraph-makefile.patch, 1.1, NONE Message-ID: <20090306213404.6075D70116@cvs1.fedora.phx.redhat.com> Author: amdunn Update of /cvs/pkgs/rpms/ocaml-ocamlgraph/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15531/F-10 Modified Files: .cvsignore import.log ocaml-ocamlgraph.spec sources Added Files: ocamlgraph-1.0-no-view-graph-doc.patch Removed Files: ocamlgraph-makefile.patch Log Message: Backport of ocaml-ocamlgraph-1.0 to F-10 from F-11. ocamlgraph-1.0-no-view-graph-doc.patch: --- NEW FILE ocamlgraph-1.0-no-view-graph-doc.patch --- --- ocamlgraph-1.0/Makefile.in.orig 2008-11-20 16:38:27.000000000 +0000 +++ ocamlgraph-1.0/Makefile.in 2008-11-20 16:38:42.000000000 +0000 @@ -293,7 +293,7 @@ mkdir -p doc rm -f doc/* $(OCAMLDOC) -d doc -html $(INCLUDES) $(DOC_SRC) - $(MAKE) -C $(VIEWER_DIR) doc +# $(MAKE) -C $(VIEWER_DIR) doc # literate programming $(NAME).tex: $(DOC_SRC) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Aug 2008 20:48:48 -0000 1.2 +++ .cvsignore 6 Mar 2009 21:33:33 -0000 1.3 @@ -1 +1 @@ -ocamlgraph-0.99c.tar.gz +ocamlgraph-1.0.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 Aug 2008 20:48:48 -0000 1.1 +++ import.log 6 Mar 2009 21:33:33 -0000 1.2 @@ -1 +1,2 @@ ocaml-ocamlgraph-0_99c-2_fc9:HEAD:ocaml-ocamlgraph-0.99c-2.fc9.src.rpm:1219524338 +ocaml-ocamlgraph-1_0-4_fc10:F-10:ocaml-ocamlgraph-1.0-4.fc10.src.rpm:1236374907 Index: ocaml-ocamlgraph.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-10/ocaml-ocamlgraph.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-ocamlgraph.spec 23 Aug 2008 20:48:48 -0000 1.1 +++ ocaml-ocamlgraph.spec 6 Mar 2009 21:33:33 -0000 1.2 @@ -18,18 +18,24 @@ %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh Name: ocaml-ocamlgraph -Version: 0.99c -Release: 2%{?dist} +Version: 1.0 +Release: 4%{?dist} Summary: OCaml library for arc and node graphs Group: Development/Libraries License: LGPLv2 with exceptions + URL: http://ocamlgraph.lri.fr/ -Source0: http://ocamlgraph.lri.fr/download/ocamlgraph-0.99c.tar.gz +Source0: http://ocamlgraph.lri.fr/download/ocamlgraph-%{version}.tar.gz Source1: ocamlgraph-test.result -Patch0: ocamlgraph-makefile.patch + +Patch0: ocamlgraph-1.0-no-view-graph-doc.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, ocaml-findlib-devel, ocaml-ocamldoc +BuildRequires: ocaml-lablgtk-devel +BuildRequires: gtk2-devel, libgnomecanvas-devel + %description Ocamlgraph provides several different implementations of graph data @@ -42,23 +48,26 @@ Language file format and Dot and Neato graphviz (graph visualization) tools. + %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} + %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. + %prep %setup -q -n ocamlgraph-%{version} -# Fixes makefile to avoid error during findlib install and properly copy .mli files into devel package -%patch0 +%patch0 -p1 cp %{SOURCE1} . + %build ./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir} @@ -71,9 +80,10 @@ make doc %check -make check >& test +make --no-print-directory check >& test diff test ocamlgraph-test.result + %install rm -rf %{buildroot} @@ -90,9 +100,11 @@ cp -p examples/*.ml %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/examples/ cp -p doc/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/API/ + %clean rm -rf %{buildroot} + %files %defattr(-,root,root,-) %{ocaml_destdir}/ocamlgraph/ @@ -104,6 +116,7 @@ %exclude %{ocaml_destdir}/*/*.mli %{_defaultdocdir}/%{name}-%{version}/LICENSE + %files devel %defattr(-,root,root,-) %if %opt @@ -115,10 +128,26 @@ # Include all code and examples in the doc directory %{_defaultdocdir}/%{name}-%{version}-devel/ + %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Dec 5 2008 Richard W.M. Jones - 1.0-3 +- Rebuild for OCaml 3.11.0. +- Requires lablgtk2. +- Pull in gtk / libgnomecanvas too. + +* Thu Nov 20 2008 Richard W.M. Jones - 1.0-1 +- New upstream release 1.0. +- Patch0 removed - now upstream. +- Added a patch to fix documentation problem. +- Run tests with 'make --no-print-directory'. + * Wed Aug 13 2008 Alan Dunn 0.99c-2 - Incorporates changes suggested during review: - License information was incorrect - rpmlint error now properly justified + * Thu Aug 07 2008 Alan Dunn 0.99c-1 - Initial Fedora RPM release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Aug 2008 20:48:48 -0000 1.2 +++ sources 6 Mar 2009 21:33:33 -0000 1.3 @@ -1 +1 @@ -3aff22a06afaa105ca40e31a5e15cf21 ocamlgraph-0.99c.tar.gz +65dfcab73bc15776f7547860a78d682a ocamlgraph-1.0.tar.gz --- ocamlgraph-makefile.patch DELETED --- From amdunn at fedoraproject.org Fri Mar 6 21:36:59 2009 From: amdunn at fedoraproject.org (Alan Dunn) Date: Fri, 6 Mar 2009 21:36:59 +0000 (UTC) Subject: rpms/ocaml-ocamlgraph/F-9 ocamlgraph-1.0-no-view-graph-doc.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 ocaml-ocamlgraph.spec, 1.1, 1.2 sources, 1.2, 1.3 ocamlgraph-makefile.patch, 1.1, NONE Message-ID: <20090306213659.A41DF70116@cvs1.fedora.phx.redhat.com> Author: amdunn Update of /cvs/pkgs/rpms/ocaml-ocamlgraph/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16339/F-9 Modified Files: .cvsignore import.log ocaml-ocamlgraph.spec sources Added Files: ocamlgraph-1.0-no-view-graph-doc.patch Removed Files: ocamlgraph-makefile.patch Log Message: Backport to F-9 from F-11 of ocaml-ocamlgraph-1.0. ocamlgraph-1.0-no-view-graph-doc.patch: --- NEW FILE ocamlgraph-1.0-no-view-graph-doc.patch --- --- ocamlgraph-1.0/Makefile.in.orig 2008-11-20 16:38:27.000000000 +0000 +++ ocamlgraph-1.0/Makefile.in 2008-11-20 16:38:42.000000000 +0000 @@ -293,7 +293,7 @@ mkdir -p doc rm -f doc/* $(OCAMLDOC) -d doc -html $(INCLUDES) $(DOC_SRC) - $(MAKE) -C $(VIEWER_DIR) doc +# $(MAKE) -C $(VIEWER_DIR) doc # literate programming $(NAME).tex: $(DOC_SRC) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Aug 2008 20:54:11 -0000 1.2 +++ .cvsignore 6 Mar 2009 21:36:28 -0000 1.3 @@ -1 +1 @@ -ocamlgraph-0.99c.tar.gz +ocamlgraph-1.0.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 Aug 2008 20:54:11 -0000 1.1 +++ import.log 6 Mar 2009 21:36:29 -0000 1.2 @@ -1 +1,2 @@ ocaml-ocamlgraph-0_99c-2_fc9:F-9:ocaml-ocamlgraph-0.99c-2.fc9.src.rpm:1219524667 +ocaml-ocamlgraph-1_0-4_fc10:F-9:ocaml-ocamlgraph-1.0-4.fc10.src.rpm:1236375101 Index: ocaml-ocamlgraph.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-9/ocaml-ocamlgraph.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-ocamlgraph.spec 23 Aug 2008 20:54:11 -0000 1.1 +++ ocaml-ocamlgraph.spec 6 Mar 2009 21:36:29 -0000 1.2 @@ -18,18 +18,24 @@ %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh Name: ocaml-ocamlgraph -Version: 0.99c -Release: 2%{?dist} +Version: 1.0 +Release: 4%{?dist} Summary: OCaml library for arc and node graphs Group: Development/Libraries License: LGPLv2 with exceptions + URL: http://ocamlgraph.lri.fr/ -Source0: http://ocamlgraph.lri.fr/download/ocamlgraph-0.99c.tar.gz +Source0: http://ocamlgraph.lri.fr/download/ocamlgraph-%{version}.tar.gz Source1: ocamlgraph-test.result -Patch0: ocamlgraph-makefile.patch + +Patch0: ocamlgraph-1.0-no-view-graph-doc.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, ocaml-findlib-devel, ocaml-ocamldoc +BuildRequires: ocaml-lablgtk-devel +BuildRequires: gtk2-devel, libgnomecanvas-devel + %description Ocamlgraph provides several different implementations of graph data @@ -42,23 +48,26 @@ Language file format and Dot and Neato graphviz (graph visualization) tools. + %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} + %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. + %prep %setup -q -n ocamlgraph-%{version} -# Fixes makefile to avoid error during findlib install and properly copy .mli files into devel package -%patch0 +%patch0 -p1 cp %{SOURCE1} . + %build ./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir} @@ -71,9 +80,10 @@ make doc %check -make check >& test +make --no-print-directory check >& test diff test ocamlgraph-test.result + %install rm -rf %{buildroot} @@ -90,9 +100,11 @@ cp -p examples/*.ml %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/examples/ cp -p doc/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/API/ + %clean rm -rf %{buildroot} + %files %defattr(-,root,root,-) %{ocaml_destdir}/ocamlgraph/ @@ -104,6 +116,7 @@ %exclude %{ocaml_destdir}/*/*.mli %{_defaultdocdir}/%{name}-%{version}/LICENSE + %files devel %defattr(-,root,root,-) %if %opt @@ -115,10 +128,26 @@ # Include all code and examples in the doc directory %{_defaultdocdir}/%{name}-%{version}-devel/ + %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Dec 5 2008 Richard W.M. Jones - 1.0-3 +- Rebuild for OCaml 3.11.0. +- Requires lablgtk2. +- Pull in gtk / libgnomecanvas too. + +* Thu Nov 20 2008 Richard W.M. Jones - 1.0-1 +- New upstream release 1.0. +- Patch0 removed - now upstream. +- Added a patch to fix documentation problem. +- Run tests with 'make --no-print-directory'. + * Wed Aug 13 2008 Alan Dunn 0.99c-2 - Incorporates changes suggested during review: - License information was incorrect - rpmlint error now properly justified + * Thu Aug 07 2008 Alan Dunn 0.99c-1 - Initial Fedora RPM release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Aug 2008 20:54:11 -0000 1.2 +++ sources 6 Mar 2009 21:36:29 -0000 1.3 @@ -1 +1 @@ -3aff22a06afaa105ca40e31a5e15cf21 ocamlgraph-0.99c.tar.gz +65dfcab73bc15776f7547860a78d682a ocamlgraph-1.0.tar.gz --- ocamlgraph-makefile.patch DELETED --- From jkeating at fedoraproject.org Fri Mar 6 21:39:14 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Fri, 6 Mar 2009 21:39:14 +0000 (UTC) Subject: rpms/deltarpm/devel deltarpm.spec,1.14,1.15 Message-ID: <20090306213914.9D05C70116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/deltarpm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16955 Modified Files: deltarpm.spec Log Message: * Fri Mar 06 2009 Jesse Keating - 3.4-13 - rebuild for new rpm libs Index: deltarpm.spec =================================================================== RCS file: /cvs/pkgs/rpms/deltarpm/devel/deltarpm.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- deltarpm.spec 24 Feb 2009 11:23:05 -0000 1.14 +++ deltarpm.spec 6 Mar 2009 21:38:44 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Create deltas between rpms Name: deltarpm Version: 3.4 -Release: 12%{?dist} +Release: 13%{?dist} License: BSD Group: System Environment/Base URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html @@ -55,6 +55,9 @@ %{_bindir}/rpmdumpheader %changelog +* Fri Mar 06 2009 Jesse Keating - 3.4-13 +- rebuild for new rpm libs + * Tue Feb 24 2009 Fedora Release Engineering - 3.4-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From thm at fedoraproject.org Fri Mar 6 21:48:51 2009 From: thm at fedoraproject.org (Thomas Moschny) Date: Fri, 6 Mar 2009 21:48:51 +0000 (UTC) Subject: rpms/monotone/F-10 monotone-0.42-gcc44.patch, NONE, 1.1 monotone-0.42-netsync.patch, NONE, 1.1 monotone-0.42-netsync2.patch, NONE, 1.1 import.log, 1.1, 1.2 monotone.spec, 1.40, 1.41 Message-ID: <20090306214851.2473770116@cvs1.fedora.phx.redhat.com> Author: thm Update of /cvs/pkgs/rpms/monotone/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18977/F-10 Modified Files: import.log monotone.spec Added Files: monotone-0.42-gcc44.patch monotone-0.42-netsync.patch monotone-0.42-netsync2.patch Log Message: Updating from devel. monotone-0.42-gcc44.patch: --- NEW FILE monotone-0.42-gcc44.patch --- diff -up monotone-0.42/key_store.cc.orig monotone-0.42/key_store.cc --- monotone-0.42/key_store.cc.orig 2008-12-14 00:02:12.000000000 +0100 +++ monotone-0.42/key_store.cc 2009-02-07 17:23:27.000000000 +0100 @@ -460,30 +460,30 @@ key_store::cache_decrypted_key(const rsa void key_store::create_key_pair(database & db, - rsa_keypair_id const & id, + rsa_keypair_id const & ident, utf8 const * maybe_passphrase, id * maybe_pubhash, id * maybe_privhash) { conditional_transaction_guard guard(db); - bool exists = key_pair_exists(id); + bool exists = key_pair_exists(ident); if (db.database_specified()) { guard.acquire(); - exists = exists || db.public_key_exists(id); + exists = exists || db.public_key_exists(ident); } - N(!exists, F("key '%s' already exists") % id); + N(!exists, F("key '%s' already exists") % ident); utf8 prompted_passphrase; if (!maybe_passphrase) { - get_passphrase(prompted_passphrase, id, true, true); + get_passphrase(prompted_passphrase, ident, true, true); maybe_passphrase = &prompted_passphrase; } // okay, now we can create the key - P(F("generating key-pair '%s'") % id); + P(F("generating key-pair '%s'") % ident); RSA_PrivateKey priv(*s->rng, static_cast(constants::keylen)); // serialize and maybe encrypt the private key @@ -514,20 +514,20 @@ key_store::create_key_pair(database & db % kp.priv().size()); // and save it. - P(F("storing key-pair '%s' in %s/") % id % get_key_dir()); - put_key_pair(id, kp); + P(F("storing key-pair '%s' in %s/") % ident % get_key_dir()); + put_key_pair(ident, kp); if (db.database_specified()) { - P(F("storing public key '%s' in %s") % id % db.get_filename()); - db.put_key(id, kp.pub); + P(F("storing public key '%s' in %s") % ident % db.get_filename()); + db.put_key(ident, kp.pub); guard.commit(); } if (maybe_pubhash) - key_hash_code(id, kp.pub, *maybe_pubhash); + key_hash_code(ident, kp.pub, *maybe_pubhash); if (maybe_privhash) - key_hash_code(id, kp.priv, *maybe_privhash); + key_hash_code(ident, kp.priv, *maybe_privhash); } void diff -up monotone-0.42/key_store.hh.orig monotone-0.42/key_store.hh --- monotone-0.42/key_store.hh.orig 2008-10-03 15:30:21.000000000 +0200 +++ monotone-0.42/key_store.hh 2009-02-07 17:21:54.000000000 +0100 @@ -64,7 +64,7 @@ public: void cache_decrypted_key(rsa_keypair_id const & id); - void create_key_pair(database & db, rsa_keypair_id const & id, + void create_key_pair(database & db, rsa_keypair_id const & ident, utf8 const * maybe_passphrase = NULL, id * maybe_pubhash = NULL, id * maybe_privhash = NULL); diff -up monotone-0.42/sanity.hh.orig monotone-0.42/sanity.hh --- monotone-0.42/sanity.hh.orig 2008-11-23 22:32:49.000000000 +0100 +++ monotone-0.42/sanity.hh 2009-02-07 17:21:42.000000000 +0100 @@ -12,6 +12,7 @@ #include #include +#include #include "boost/current_function.hpp" monotone-0.42-netsync.patch: --- NEW FILE monotone-0.42-netsync.patch --- diff -up monotone-0.42/netsync.cc.orig monotone-0.42/netsync.cc --- monotone-0.42/netsync.cc.orig 2009-02-04 13:53:00.000000000 +0100 +++ monotone-0.42/netsync.cc 2009-02-04 13:53:49.000000000 +0100 @@ -353,7 +353,7 @@ unsigned int reactable::count = 0; class session_base : public reactable { - bool read_some(); + void read_some(bool & failed, bool & eof); bool write_some(); void mark_recent_io() { @@ -468,10 +468,12 @@ session_base::which_events() return ret; } -bool -session_base::read_some() +void +session_base::read_some(bool & failed, bool & eof) { I(inbuf.size() < constants::netcmd_maxsz); + eof = false; + failed = false; char tmp[constants::bufsz]; Netxx::signed_size_type count = str->read(tmp, sizeof(tmp)); if (count > 0) @@ -479,17 +481,38 @@ session_base::read_some() L(FL("read %d bytes from fd %d (peer %s)") % count % str->get_socketfd() % peer_id); if (encountered_error) - { - L(FL("in error unwind mode, so throwing them into the bit bucket")); - return true; - } + L(FL("in error unwind mode, so throwing them into the bit bucket")); + inbuf.append(tmp,count); mark_recent_io(); note_bytes_in(count); - return true; + } + else if (count == 0) + { + // Returning 0 bytes after select() marks the file descriptor as + // ready for reading signifies EOF. + + switch (protocol_state) + { + case working_state: + P(F("peer %s IO terminated connection in working state (error)") + % peer_id); + break; + + case shutdown_state: + P(F("peer %s IO terminated connection in shutdown state " + "(possibly client misreported error)") + % peer_id); + break; + + case confirmed_state: + break; + } + + eof = true; } else - return false; + failed = true; } bool @@ -531,11 +554,14 @@ bool session_base::do_io(Netxx::Probe::ready_type what) { bool ok = true; + bool eof = false; try { if (what & Netxx::Probe::ready_read) { - if (!read_some()) + bool failed; + read_some(failed, eof); + if (failed) ok = false; } if (what & Netxx::Probe::ready_write) @@ -578,7 +604,11 @@ session_base::do_io(Netxx::Probe::ready_ % peer_id); ok = false; } - return ok; + + // Return false in case we reached EOF, so as to prevent further calls + // to select()s on this stream, as recommended by the select_tut man + // page. + return ok && !eof; } //////////////////////////////////////////////////////////////////////// monotone-0.42-netsync2.patch: --- NEW FILE monotone-0.42-netsync2.patch --- diff -up monotone-0.42/netsync.cc.orig monotone-0.42/netsync.cc --- monotone-0.42/netsync.cc.orig 2008-12-14 00:02:12.000000000 +0100 +++ monotone-0.42/netsync.cc 2009-02-27 19:19:37.000000000 +0100 @@ -374,7 +374,7 @@ protected: } bool output_overfull() const { - return outbuf.size() > constants::bufsz * 10; + return outbuf_size > constants::bufsz * 10; } public: string peer_id; Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/monotone/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Jan 2009 00:53:23 -0000 1.1 +++ import.log 6 Mar 2009 21:48:20 -0000 1.2 @@ -1 +1,2 @@ monotone-0_42-2_fc10:F-10:monotone-0.42-2.fc10.src.rpm:1230943967 +monotone-0_42-5_fc11:F-10:monotone-0.42-5.fc11.src.rpm:1236376035 Index: monotone.spec =================================================================== RCS file: /cvs/pkgs/rpms/monotone/F-10/monotone.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- monotone.spec 3 Jan 2009 00:53:23 -0000 1.40 +++ monotone.spec 6 Mar 2009 21:48:20 -0000 1.41 @@ -1,6 +1,6 @@ Name: monotone Version: 0.42 -Release: 2%{?dist} +Release: 5%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -12,6 +12,13 @@ Source2: monotone.sysconfig Source3: README.monotone-server +# rediffed changeset f18abebd.. from upstream +Patch0: monotone-0.42-netsync.patch +# rediffed changesets 33022690.. and 76e258cb.. from upstream +Patch1: monotone-0.42-gcc44.patch +# rediffed changeset 16184688.. from upstream +Patch2: monotone-0.42-netsync2.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -71,6 +78,9 @@ %prep %setup -q +%patch0 -p1 -b .gcc44 +%patch1 -p1 -b .netsync +%patch2 -p1 -b .netsync2 %build %configure --with-bundled-lua=%{bundled_lua} \ @@ -78,7 +88,8 @@ make %{?_smp_mflags} %check -make %{?_smp_mflags} check || { cat tester_dir/*.log; false; } +# disable parallel runs in the testsuite for now +make check || { cat tester_dir/*.log; false; } %install rm -rf %{buildroot} @@ -197,6 +208,18 @@ %changelog +* Fri Feb 27 2009 Thomas Moschny - 0.42-5 +- Add one more netsync related patch from trunk. + +* Wed Feb 25 2009 Fedora Release Engineering - 0.42-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 9 2009 Thomas Moschny - 0.42-3 +- Disable %%{_smp_mflags} in the testsuite, causes strange errors. +- Fix two issues with gcc44. +- Add patch from upstream fixing netsync printing an error message of + the form "peer [...] IO failed in confirmed state (success)". + * Fri Jan 2 2009 Thomas Moschny - 0.42-2 - Pack Monotone.pm (in a subpackage). (#450267) From scop at fedoraproject.org Fri Mar 6 21:52:45 2009 From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=) Date: Fri, 6 Mar 2009 21:52:45 +0000 (UTC) Subject: rpms/xmms-modplug/devel xmms-modplug.spec,1.18,1.19 Message-ID: <20090306215245.1A77570116@cvs1.fedora.phx.redhat.com> Author: scop Update of /cvs/pkgs/rpms/xmms-modplug/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19805 Modified Files: xmms-modplug.spec Log Message: * Fri Mar 6 2009 Ville Skytt?? - 2.05-15 - Add %{?_isa} to xmms-libs dependency. Index: xmms-modplug.spec =================================================================== RCS file: /cvs/pkgs/rpms/xmms-modplug/devel/xmms-modplug.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xmms-modplug.spec 26 Feb 2009 10:20:11 -0000 1.18 +++ xmms-modplug.spec 6 Mar 2009 21:52:14 -0000 1.19 @@ -2,7 +2,7 @@ Name: xmms-modplug Version: 2.05 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Modplug Plugin for XMMS License: Public Domain @@ -18,7 +18,7 @@ BuildRequires: gettext BuildRequires: libmodplug-devel >= 1:0.7 BuildConflicts: %{name} < 2.0 -Requires: xmms-libs +Requires: xmms-libs%{?_isa} Provides: modplug-xmms = %{version}-%{release} %description @@ -68,6 +68,9 @@ %changelog +* Fri Mar 6 2009 Ville Skytt?? - 2.05-15 +- Add %%{?_isa} to xmms-libs dependency. + * Thu Feb 26 2009 Fedora Release Engineering - 2.05-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rdieter at fedoraproject.org Fri Mar 6 21:58:49 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Fri, 6 Mar 2009 21:58:49 +0000 (UTC) Subject: rpms/koffice/devel koffice-1.6.3-glibc_strrchr.patch, NONE, 1.1 koffice.spec, 1.98, 1.99 Message-ID: <20090306215849.6448870116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/koffice/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20981 Modified Files: koffice.spec Added Files: koffice-1.6.3-glibc_strrchr.patch Log Message: strrchr patch koffice-1.6.3-glibc_strrchr.patch: --- NEW FILE koffice-1.6.3-glibc_strrchr.patch --- diff -up koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc.glibc koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc --- koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc.glibc 2007-05-30 16:39:18.000000000 -0500 +++ koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc 2009-03-06 15:56:35.000000000 -0600 @@ -315,7 +315,7 @@ GString *grabPath(const char *fileName) #else //---------- Unix ---------- - char *p; + const char *p; if ((p = strrchr(fileName, '/'))) return new GString(fileName, p - fileName); Index: koffice.spec =================================================================== RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- koffice.spec 6 Mar 2009 21:10:00 -0000 1.98 +++ koffice.spec 6 Mar 2009 21:58:19 -0000 1.99 @@ -23,6 +23,8 @@ Source100: koshell.png +Patch50: koffice-1.6.3-glibc_strrchr.patch + ## hand-crafted patch, pretty close to: # LANG=en_US.UTF-8 svn diff \ # svn://anonsvn.kde.org/home/kde/tags/koffice/1.6.3/koffice \ @@ -253,6 +255,8 @@ #patch2 -p0 -b .CVE-2007-4352-5392-5393 #patch3 -p1 -b .gcc43 +%patch50 -p1 -b glibc_strrchr + %patch100 -p1 -b .svn make -f admin/Makefile.common From thm at fedoraproject.org Fri Mar 6 22:35:10 2009 From: thm at fedoraproject.org (Thomas Moschny) Date: Fri, 6 Mar 2009 22:35:10 +0000 (UTC) Subject: rpms/monotone/F-9 monotone-0.42-gcc44.patch, NONE, 1.1 monotone-0.42-netsync.patch, NONE, 1.1 monotone-0.42-netsync2.patch, NONE, 1.1 import.log, 1.1, 1.2 monotone.spec, 1.39, 1.40 Message-ID: <20090306223510.D56EE70116@cvs1.fedora.phx.redhat.com> Author: thm Update of /cvs/pkgs/rpms/monotone/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27933/F-9 Modified Files: import.log monotone.spec Added Files: monotone-0.42-gcc44.patch monotone-0.42-netsync.patch monotone-0.42-netsync2.patch Log Message: Updating from devel. monotone-0.42-gcc44.patch: --- NEW FILE monotone-0.42-gcc44.patch --- diff -up monotone-0.42/key_store.cc.orig monotone-0.42/key_store.cc --- monotone-0.42/key_store.cc.orig 2008-12-14 00:02:12.000000000 +0100 +++ monotone-0.42/key_store.cc 2009-02-07 17:23:27.000000000 +0100 @@ -460,30 +460,30 @@ key_store::cache_decrypted_key(const rsa void key_store::create_key_pair(database & db, - rsa_keypair_id const & id, + rsa_keypair_id const & ident, utf8 const * maybe_passphrase, id * maybe_pubhash, id * maybe_privhash) { conditional_transaction_guard guard(db); - bool exists = key_pair_exists(id); + bool exists = key_pair_exists(ident); if (db.database_specified()) { guard.acquire(); - exists = exists || db.public_key_exists(id); + exists = exists || db.public_key_exists(ident); } - N(!exists, F("key '%s' already exists") % id); + N(!exists, F("key '%s' already exists") % ident); utf8 prompted_passphrase; if (!maybe_passphrase) { - get_passphrase(prompted_passphrase, id, true, true); + get_passphrase(prompted_passphrase, ident, true, true); maybe_passphrase = &prompted_passphrase; } // okay, now we can create the key - P(F("generating key-pair '%s'") % id); + P(F("generating key-pair '%s'") % ident); RSA_PrivateKey priv(*s->rng, static_cast(constants::keylen)); // serialize and maybe encrypt the private key @@ -514,20 +514,20 @@ key_store::create_key_pair(database & db % kp.priv().size()); // and save it. - P(F("storing key-pair '%s' in %s/") % id % get_key_dir()); - put_key_pair(id, kp); + P(F("storing key-pair '%s' in %s/") % ident % get_key_dir()); + put_key_pair(ident, kp); if (db.database_specified()) { - P(F("storing public key '%s' in %s") % id % db.get_filename()); - db.put_key(id, kp.pub); + P(F("storing public key '%s' in %s") % ident % db.get_filename()); + db.put_key(ident, kp.pub); guard.commit(); } if (maybe_pubhash) - key_hash_code(id, kp.pub, *maybe_pubhash); + key_hash_code(ident, kp.pub, *maybe_pubhash); if (maybe_privhash) - key_hash_code(id, kp.priv, *maybe_privhash); + key_hash_code(ident, kp.priv, *maybe_privhash); } void diff -up monotone-0.42/key_store.hh.orig monotone-0.42/key_store.hh --- monotone-0.42/key_store.hh.orig 2008-10-03 15:30:21.000000000 +0200 +++ monotone-0.42/key_store.hh 2009-02-07 17:21:54.000000000 +0100 @@ -64,7 +64,7 @@ public: void cache_decrypted_key(rsa_keypair_id const & id); - void create_key_pair(database & db, rsa_keypair_id const & id, + void create_key_pair(database & db, rsa_keypair_id const & ident, utf8 const * maybe_passphrase = NULL, id * maybe_pubhash = NULL, id * maybe_privhash = NULL); diff -up monotone-0.42/sanity.hh.orig monotone-0.42/sanity.hh --- monotone-0.42/sanity.hh.orig 2008-11-23 22:32:49.000000000 +0100 +++ monotone-0.42/sanity.hh 2009-02-07 17:21:42.000000000 +0100 @@ -12,6 +12,7 @@ #include #include +#include #include "boost/current_function.hpp" monotone-0.42-netsync.patch: --- NEW FILE monotone-0.42-netsync.patch --- diff -up monotone-0.42/netsync.cc.orig monotone-0.42/netsync.cc --- monotone-0.42/netsync.cc.orig 2009-02-04 13:53:00.000000000 +0100 +++ monotone-0.42/netsync.cc 2009-02-04 13:53:49.000000000 +0100 @@ -353,7 +353,7 @@ unsigned int reactable::count = 0; class session_base : public reactable { - bool read_some(); + void read_some(bool & failed, bool & eof); bool write_some(); void mark_recent_io() { @@ -468,10 +468,12 @@ session_base::which_events() return ret; } -bool -session_base::read_some() +void +session_base::read_some(bool & failed, bool & eof) { I(inbuf.size() < constants::netcmd_maxsz); + eof = false; + failed = false; char tmp[constants::bufsz]; Netxx::signed_size_type count = str->read(tmp, sizeof(tmp)); if (count > 0) @@ -479,17 +481,38 @@ session_base::read_some() L(FL("read %d bytes from fd %d (peer %s)") % count % str->get_socketfd() % peer_id); if (encountered_error) - { - L(FL("in error unwind mode, so throwing them into the bit bucket")); - return true; - } + L(FL("in error unwind mode, so throwing them into the bit bucket")); + inbuf.append(tmp,count); mark_recent_io(); note_bytes_in(count); - return true; + } + else if (count == 0) + { + // Returning 0 bytes after select() marks the file descriptor as + // ready for reading signifies EOF. + + switch (protocol_state) + { + case working_state: + P(F("peer %s IO terminated connection in working state (error)") + % peer_id); + break; + + case shutdown_state: + P(F("peer %s IO terminated connection in shutdown state " + "(possibly client misreported error)") + % peer_id); + break; + + case confirmed_state: + break; + } + + eof = true; } else - return false; + failed = true; } bool @@ -531,11 +554,14 @@ bool session_base::do_io(Netxx::Probe::ready_type what) { bool ok = true; + bool eof = false; try { if (what & Netxx::Probe::ready_read) { - if (!read_some()) + bool failed; + read_some(failed, eof); + if (failed) ok = false; } if (what & Netxx::Probe::ready_write) @@ -578,7 +604,11 @@ session_base::do_io(Netxx::Probe::ready_ % peer_id); ok = false; } - return ok; + + // Return false in case we reached EOF, so as to prevent further calls + // to select()s on this stream, as recommended by the select_tut man + // page. + return ok && !eof; } //////////////////////////////////////////////////////////////////////// monotone-0.42-netsync2.patch: --- NEW FILE monotone-0.42-netsync2.patch --- diff -up monotone-0.42/netsync.cc.orig monotone-0.42/netsync.cc --- monotone-0.42/netsync.cc.orig 2008-12-14 00:02:12.000000000 +0100 +++ monotone-0.42/netsync.cc 2009-02-27 19:19:37.000000000 +0100 @@ -374,7 +374,7 @@ protected: } bool output_overfull() const { - return outbuf.size() > constants::bufsz * 10; + return outbuf_size > constants::bufsz * 10; } public: string peer_id; Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/monotone/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Jan 2009 01:31:28 -0000 1.1 +++ import.log 6 Mar 2009 22:34:40 -0000 1.2 @@ -1 +1,2 @@ monotone-0_42-2_fc10:F-9:monotone-0.42-2.fc10.src.rpm:1230946242 +monotone-0_42-5_fc11:F-9:monotone-0.42-5.fc11.src.rpm:1236378840 Index: monotone.spec =================================================================== RCS file: /cvs/pkgs/rpms/monotone/F-9/monotone.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- monotone.spec 3 Jan 2009 01:31:28 -0000 1.39 +++ monotone.spec 6 Mar 2009 22:34:40 -0000 1.40 @@ -1,6 +1,6 @@ Name: monotone Version: 0.42 -Release: 2%{?dist} +Release: 5%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -12,6 +12,13 @@ Source2: monotone.sysconfig Source3: README.monotone-server +# rediffed changeset f18abebd.. from upstream +Patch0: monotone-0.42-netsync.patch +# rediffed changesets 33022690.. and 76e258cb.. from upstream +Patch1: monotone-0.42-gcc44.patch +# rediffed changeset 16184688.. from upstream +Patch2: monotone-0.42-netsync2.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -71,6 +78,9 @@ %prep %setup -q +%patch0 -p1 -b .gcc44 +%patch1 -p1 -b .netsync +%patch2 -p1 -b .netsync2 %build %configure --with-bundled-lua=%{bundled_lua} \ @@ -78,7 +88,8 @@ make %{?_smp_mflags} %check -make %{?_smp_mflags} check || { cat tester_dir/*.log; false; } +# disable parallel runs in the testsuite for now +make check || { cat tester_dir/*.log; false; } %install rm -rf %{buildroot} @@ -197,6 +208,18 @@ %changelog +* Fri Feb 27 2009 Thomas Moschny - 0.42-5 +- Add one more netsync related patch from trunk. + +* Wed Feb 25 2009 Fedora Release Engineering - 0.42-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 9 2009 Thomas Moschny - 0.42-3 +- Disable %%{_smp_mflags} in the testsuite, causes strange errors. +- Fix two issues with gcc44. +- Add patch from upstream fixing netsync printing an error message of + the form "peer [...] IO failed in confirmed state (success)". + * Fri Jan 2 2009 Thomas Moschny - 0.42-2 - Pack Monotone.pm (in a subpackage). (#450267) From rstrode at fedoraproject.org Fri Mar 6 22:35:32 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Fri, 6 Mar 2009 22:35:32 +0000 (UTC) Subject: rpms/plymouth/devel .cvsignore, 1.10, 1.11 plymouth.spec, 1.118, 1.119 sources, 1.49, 1.50 plymouth-0.6.0-drop-nash.patch, 1.1, NONE plymouth-0.6.0-fix-heap-corruptor.patch, 1.1, NONE Message-ID: <20090306223532.2DFB770116@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/plymouth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28000 Modified Files: .cvsignore plymouth.spec sources Removed Files: plymouth-0.6.0-drop-nash.patch plymouth-0.6.0-fix-heap-corruptor.patch Log Message: - Updated to development snapshot - Guess progress better on second boot of persistent live images - Drop upstream patches - swap "solar" and "spinfinity" scriptlet behavior Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 22 Aug 2008 21:10:23 -0000 1.10 +++ .cvsignore 6 Mar 2009 22:35:01 -0000 1.11 @@ -1 +1 @@ -plymouth-0.6.0.tar.bz2 +plymouth-0.7.0.tar.bz2 Index: plymouth.spec =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- plymouth.spec 24 Feb 2009 18:45:06 -0000 1.118 +++ plymouth.spec 6 Mar 2009 22:35:01 -0000 1.119 @@ -4,8 +4,8 @@ Summary: Graphical Boot Animation and Logger Name: plymouth -Version: 0.6.0 -Release: 3%{?dist} +Version: 0.7.0 +Release: 0.2009.03.06%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -20,9 +20,6 @@ Obsoletes: plymouth-text-and-details-only < %{version}-%{release} -Patch0: plymouth-0.6.0-drop-nash.patch -Patch1: plymouth-0.6.0-fix-heap-corruptor.patch - %description Plymouth provides an attractive graphical boot animation in place of the text messages that normally get shown. Text @@ -152,8 +149,6 @@ %prep %setup -q -%patch0 -p1 -b .drop-nash -%patch1 -p1 -b .fix-heap-corruptor %build %configure --enable-tracing --disable-tests --without-boot-entry \ @@ -173,6 +168,10 @@ make install DESTDIR=$RPM_BUILD_ROOT +# Glow isn't quite ready for primetime +rm -rf $RPM_BUILD_ROOT%{_datadir}/plymouth/glow/ +rm -f $RPM_BUILD_ROOT%{_libdir}/plymouth/glow.so + find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \; find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \; @@ -201,7 +200,7 @@ export LIB=%{_lib} if [ $1 -eq 0 ]; then if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "spinfinity" ]; then - %{_sbindir}/plymouth-set-default-plugin --reset + %{_sbindir}/plymouth-set-default-plugin text fi fi @@ -223,7 +222,7 @@ export LIB=%{_lib} if [ $1 -eq 0 ]; then if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "solar" ]; then - %{_sbindir}/plymouth-set-default-plugin text + %{_sbindir}/plymouth-set-default-plugin --reset fi fi @@ -316,6 +315,12 @@ %defattr(-, root, root) %changelog +* Fri Mar 6 2009 Ray Strode 0.7.0-0.2009.03.06 +- Updated to development snapshot +- Guess progress better on second boot of persistent live images +- Drop upstream patches +- swap "solar" and "spinfinity" scriptlet behavior + * Tue Feb 24 2009 Ray Strode 0.6.0-3 - Add fix-heap-corruptor patch from master. Problem spotted by Mr. McCann. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 3 Dec 2008 15:16:39 -0000 1.49 +++ sources 6 Mar 2009 22:35:01 -0000 1.50 @@ -1 +1 @@ -e29e754e942e6fcaf5185772d18fd97e plymouth-0.6.0.tar.bz2 +8e0a1cd4e4cf8ada175c763ed23e5a92 plymouth-0.7.0.tar.bz2 --- plymouth-0.6.0-drop-nash.patch DELETED --- --- plymouth-0.6.0-fix-heap-corruptor.patch DELETED --- From jkeating at fedoraproject.org Fri Mar 6 22:50:08 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Fri, 6 Mar 2009 22:50:08 +0000 (UTC) Subject: rpms/gdb/devel gdb.spec,1.325,1.326 Message-ID: <20090306225008.A657770116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/gdb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31399 Modified Files: gdb.spec Log Message: * Fri Mar 06 2009 Jesse Keating - 6.8.50.20090302-2 - Rebuild for new rpm libs Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.325 retrieving revision 1.326 diff -u -r1.325 -r1.326 --- gdb.spec 2 Mar 2009 23:14:15 -0000 1.325 +++ gdb.spec 6 Mar 2009 22:49:37 -0000 1.326 @@ -13,7 +13,7 @@ # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 1%{?_with_upstream:.upstream}%{?dist} +Release: 2%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -830,6 +830,9 @@ %endif %changelog +* Fri Mar 06 2009 Jesse Keating - 6.8.50.20090302-2 +- Rebuild for new rpm libs + * Mon Mar 2 2009 Jan Kratochvil - 6.8.50.20090302-1 - Include the Archer Project: http://sourceware.org/gdb/wiki/ProjectArcher * [python] Python scripting support: http://sourceware.org/gdb/wiki/PythonGdb From scop at fedoraproject.org Fri Mar 6 22:51:51 2009 From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=) Date: Fri, 6 Mar 2009 22:51:51 +0000 (UTC) Subject: rpms/xemacs-packages-base/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xemacs-packages-base-checkout.sh, 1.1, 1.2 xemacs-packages-base.spec, 1.5, 1.6 Message-ID: <20090306225151.D4CD970116@cvs1.fedora.phx.redhat.com> Author: scop Update of /cvs/pkgs/rpms/xemacs-packages-base/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31825 Modified Files: .cvsignore sources xemacs-packages-base-checkout.sh xemacs-packages-base.spec Log Message: * Sat Mar 7 2009 Ville Skytt?? - 20090217-1 - Update to 2009-02-17. - Compress source tarball with lzma. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xemacs-packages-base/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 May 2007 18:15:43 -0000 1.4 +++ .cvsignore 6 Mar 2009 22:51:21 -0000 1.5 @@ -1 +1 @@ -xemacs-packages-base-20070427.tar.bz2 +xemacs-packages-base-20090217.tar.lzma Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xemacs-packages-base/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 May 2007 18:15:43 -0000 1.4 +++ sources 6 Mar 2009 22:51:21 -0000 1.5 @@ -1 +1 @@ -70305f7b4dd8e8e6d1971427398d9df6 xemacs-packages-base-20070427.tar.bz2 +a4105d56f5affe40614070b7f248719d xemacs-packages-base-20090217.tar.lzma Index: xemacs-packages-base-checkout.sh =================================================================== RCS file: /cvs/pkgs/rpms/xemacs-packages-base/devel/xemacs-packages-base-checkout.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xemacs-packages-base-checkout.sh 10 Sep 2006 09:21:06 -0000 1.1 +++ xemacs-packages-base-checkout.sh 6 Mar 2009 22:51:21 -0000 1.2 @@ -40,6 +40,7 @@ popd >/dev/null mv packages $tarball -tar jcf $pwd/$tarball.tar.bz2 $tarball +tar cf $pwd/$tarball.tar $tarball +lzma -f $pwd/$tarball.tar cd $pwd Index: xemacs-packages-base.spec =================================================================== RCS file: /cvs/pkgs/rpms/xemacs-packages-base/devel/xemacs-packages-base.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xemacs-packages-base.spec 26 Feb 2009 08:27:39 -0000 1.5 +++ xemacs-packages-base.spec 6 Mar 2009 22:51:21 -0000 1.6 @@ -2,8 +2,8 @@ %define xemver v=$(rpm -q --qf=%%{VERSION} xemacs-nox) ; case $v in 2*) echo $v ;; *) echo 0 ;; esac Name: xemacs-packages-base -Version: 20070427 -Release: 3%{?dist} +Version: 20090217 +Release: 1%{?dist} Summary: Base lisp packages for XEmacs Group: Applications/Editors @@ -11,13 +11,15 @@ License: GPLv2+ and GPL+ URL: http://www.xemacs.org/Documentation/packageGuide.html # Tarball created with Source99 -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.lzma Source99: %{name}-checkout.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: xemacs-nox BuildRequires: texinfo +# lzma for unpacking Source0 +BuildRequires: lzma Requires: xemacs(bin) >= %(%{xemver}) %description @@ -105,6 +107,10 @@ %changelog +* Sat Mar 7 2009 Ville Skytt?? - 20090217-1 +- Update to 2009-02-17. +- Compress source tarball with lzma. + * Thu Feb 26 2009 Fedora Release Engineering - 20070427-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jkeating at fedoraproject.org Fri Mar 6 22:52:34 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Fri, 6 Mar 2009 22:52:34 +0000 (UTC) Subject: rpms/net-snmp/devel net-snmp.spec,1.178,1.179 Message-ID: <20090306225234.AA57170116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/net-snmp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31956 Modified Files: net-snmp.spec Log Message: * Fri Mar 06 2009 Jesse Keating - 5.4.2.1-10 - Rebuild for new rpm Index: net-snmp.spec =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- net-snmp.spec 26 Feb 2009 04:53:55 -0000 1.178 +++ net-snmp.spec 6 Mar 2009 22:52:04 -0000 1.179 @@ -8,7 +8,7 @@ Summary: A collection of SNMP protocol tools and libraries Name: net-snmp Version: %{major_ver} -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 License: BSD and MIT @@ -421,6 +421,9 @@ %{_datadir}/snmp/mibs %changelog +* Fri Mar 06 2009 Jesse Keating - 5.4.2.1-10 +- Rebuild for new rpm + * Wed Feb 25 2009 Fedora Release Engineering - 1:5.4.2.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rstrode at fedoraproject.org Fri Mar 6 22:56:11 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Fri, 6 Mar 2009 22:56:11 +0000 (UTC) Subject: rpms/plymouth/devel plymouth.spec,1.119,1.120 Message-ID: <20090306225611.B809A70116@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/plymouth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32629 Modified Files: plymouth.spec Log Message: - more scriptlet changes to move from solar to spinfinity Index: plymouth.spec =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- plymouth.spec 6 Mar 2009 22:35:01 -0000 1.119 +++ plymouth.spec 6 Mar 2009 22:55:41 -0000 1.120 @@ -196,6 +196,16 @@ %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig +%post plugin-spinfinity +export LIB=%{_lib} +if [ $1 -eq 1 ]; then + %{_sbindir}/plymouth-set-default-plugin spinfinity +else + if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "solar" ]; then + %{_sbindir}/plymouth-set-default-plugin spinfinity + fi +fi + %postun plugin-spinfinity export LIB=%{_lib} if [ $1 -eq 0 ]; then @@ -212,12 +222,6 @@ fi fi -%post plugin-solar -export LIB=%{_lib} -if [ $1 -eq 1 ]; then - %{_sbindir}/plymouth-set-default-plugin solar -fi - %postun plugin-solar export LIB=%{_lib} if [ $1 -eq 0 ]; then @@ -315,6 +319,9 @@ %defattr(-, root, root) %changelog +* Fri Mar 6 2009 Ray Strode 0.7.0-0.2009.03.06.1 +- more scriptlet changes to move from solar to spinfinity + * Fri Mar 6 2009 Ray Strode 0.7.0-0.2009.03.06 - Updated to development snapshot - Guess progress better on second boot of persistent live images From jkeating at fedoraproject.org Fri Mar 6 22:56:22 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Fri, 6 Mar 2009 22:56:22 +0000 (UTC) Subject: rpms/ovaldi/devel ovaldi.spec,1.12,1.13 Message-ID: <20090306225622.5E98D70116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/ovaldi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32748 Modified Files: ovaldi.spec Log Message: * Fri Mar 06 2009 Jesse Keating - 5.5.4-3 - Rebuild for new rpm Index: ovaldi.spec =================================================================== RCS file: /cvs/pkgs/rpms/ovaldi/devel/ovaldi.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ovaldi.spec 26 Feb 2009 09:13:21 -0000 1.12 +++ ovaldi.spec 6 Mar 2009 22:55:52 -0000 1.13 @@ -1,6 +1,6 @@ Name: ovaldi Version: 5.5.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Reference implementation of the OVAL interpreter Group: Applications/System @@ -68,6 +68,9 @@ %changelog +* Fri Mar 06 2009 Jesse Keating - 5.5.4-3 +- Rebuild for new rpm + * Thu Feb 26 2009 Fedora Release Engineering - 5.5.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jkeating at fedoraproject.org Fri Mar 6 22:57:44 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Fri, 6 Mar 2009 22:57:44 +0000 (UTC) Subject: rpms/perl-RPM2/devel perl-RPM2.spec,1.10,1.11 Message-ID: <20090306225744.9EF4C70116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/perl-RPM2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv671 Modified Files: perl-RPM2.spec Log Message: * Fri Mar 06 2009 Jesse Keating - 0.68-3 - Rebuild for new rpm Index: perl-RPM2.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-RPM2/devel/perl-RPM2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-RPM2.spec 27 Feb 2009 00:54:02 -0000 1.10 +++ perl-RPM2.spec 6 Mar 2009 22:57:14 -0000 1.11 @@ -1,6 +1,6 @@ Name: perl-RPM2 Version: 0.68 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl bindings for the RPM Package Manager API License: GPL+ or Artistic Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Fri Mar 06 2009 Jesse Keating - 0.68-3 +- Rebuild for new rpm + * Thu Feb 26 2009 Fedora Release Engineering - 0.68-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rstrode at fedoraproject.org Fri Mar 6 22:58:38 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Fri, 6 Mar 2009 22:58:38 +0000 (UTC) Subject: rpms/plymouth/devel plymouth.spec,1.120,1.121 Message-ID: <20090306225838.E1B1E70116@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/plymouth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1107 Modified Files: plymouth.spec Log Message: Rev release Index: plymouth.spec =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- plymouth.spec 6 Mar 2009 22:55:41 -0000 1.120 +++ plymouth.spec 6 Mar 2009 22:58:08 -0000 1.121 @@ -5,7 +5,7 @@ Summary: Graphical Boot Animation and Logger Name: plymouth Version: 0.7.0 -Release: 0.2009.03.06%{?dist} +Release: 0.2009.03.06.1%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 From jkeating at fedoraproject.org Fri Mar 6 22:59:15 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Fri, 6 Mar 2009 22:59:15 +0000 (UTC) Subject: rpms/rpmreaper/devel rpmreaper.spec,1.5,1.6 Message-ID: <20090306225915.23DFA70116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/rpmreaper/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1254 Modified Files: rpmreaper.spec Log Message: * Fri Mar 06 2009 Jesse Keating - 0.1.5-3 - Rebuild for new rpm Index: rpmreaper.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpmreaper/devel/rpmreaper.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rpmreaper.spec 25 Feb 2009 20:31:51 -0000 1.5 +++ rpmreaper.spec 6 Mar 2009 22:58:44 -0000 1.6 @@ -1,6 +1,6 @@ Name: rpmreaper Version: 0.1.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A tool for removing packages from system Group: Applications/System @@ -35,6 +35,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Fri Mar 06 2009 Jesse Keating - 0.1.5-3 +- Rebuild for new rpm + * Wed Feb 25 2009 Fedora Release Engineering - 0.1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jkeating at fedoraproject.org Fri Mar 6 23:00:46 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Fri, 6 Mar 2009 23:00:46 +0000 (UTC) Subject: rpms/sectool/devel sectool.spec,1.25,1.26 Message-ID: <20090306230046.4AB0470116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/sectool/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1761 Modified Files: sectool.spec Log Message: * Fri Mar 06 2009 Jesse Keating - 0.9.1-9 - Rebuild for new rpm Index: sectool.spec =================================================================== RCS file: /cvs/pkgs/rpms/sectool/devel/sectool.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sectool.spec 26 Feb 2009 00:22:07 -0000 1.25 +++ sectool.spec 6 Mar 2009 23:00:15 -0000 1.26 @@ -1,7 +1,7 @@ Summary: A security audit system and intrusion detection system Name: sectool Version: 0.9.1 -Release: 8 +Release: 9 URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart Source0: %{name}-%{version}.tar.bz2 Source1: sectool.log @@ -109,6 +109,9 @@ %changelog +* Fri Mar 06 2009 Jesse Keating - 0.9.1-9 +- Rebuild for new rpm + * Wed Feb 25 2009 Fedora Release Engineering - 0.9.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From scop at fedoraproject.org Fri Mar 6 23:08:41 2009 From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=) Date: Fri, 6 Mar 2009 23:08:41 +0000 (UTC) Subject: rpms/xemacs-packages-extra/devel xemacs-packages-extra-20090217-auctex-cvs-keywords.patch, NONE, 1.1 xemacs-packages-extra-20090217-auctex-texjp-platex.patch, NONE, 1.1 xemacs-packages-extra-20090217-browsers.patch, NONE, 1.1 xemacs-packages-extra-20090217-vc-menu.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xemacs-packages-extra-checkout.sh, 1.1, 1.2 xemacs-packages-extra.spec, 1.8, 1.9 xemacs-packages-extra-20060510-auctex-texjp-platex.patch, 1.1, NONE xemacs-packages-extra-20060510-auctex-texsite-jlatex-detect-69129.patch, 1.1, NONE xemacs-packages-extra-20060510-hypb-posix.patch, 1.1, NONE xemacs-packages-extra-20070427-CVE-2008-2142.patch, 1.1, NONE xemacs-packages-extra-20070427-browsers.patch, 1.1, NONE xemacs-packages-extra-20070427-jp-locale-239394.patch, 1.1, NONE xemacs-packages-extra-20070427-rpmspec.patch, 1.1, NONE Message-ID: <20090306230841.6086870116@cvs1.fedora.phx.redhat.com> Author: scop Update of /cvs/pkgs/rpms/xemacs-packages-extra/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3649 Modified Files: .cvsignore sources xemacs-packages-extra-checkout.sh xemacs-packages-extra.spec Added Files: xemacs-packages-extra-20090217-auctex-cvs-keywords.patch xemacs-packages-extra-20090217-auctex-texjp-platex.patch xemacs-packages-extra-20090217-browsers.patch xemacs-packages-extra-20090217-vc-menu.patch Removed Files: xemacs-packages-extra-20060510-auctex-texjp-platex.patch xemacs-packages-extra-20060510-auctex-texsite-jlatex-detect-69129.patch xemacs-packages-extra-20060510-hypb-posix.patch xemacs-packages-extra-20070427-CVE-2008-2142.patch xemacs-packages-extra-20070427-browsers.patch xemacs-packages-extra-20070427-jp-locale-239394.patch xemacs-packages-extra-20070427-rpmspec.patch Log Message: * Sat Mar 7 2009 Ville Skytt?? - 20090217-1 - Update to 2009-02-17, several patches applied/superseded upstream. - Apply upstream patch to fix errors and obsolete code in VC menu. - Drop xemacs-sumo* provides and obsoletes and apel-xemacs obsoletes. - Drop support for building with xemacs < 21.5.28-11. xemacs-packages-extra-20090217-auctex-cvs-keywords.patch: --- NEW FILE xemacs-packages-extra-20090217-auctex-cvs-keywords.patch --- diff -up xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/latex/preview.dtx~ xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/latex/preview.dtx --- xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/latex/preview.dtx~ 2008-09-10 00:47:21.000000000 +0300 +++ xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/latex/preview.dtx 2009-02-26 19:12:22.000000000 +0200 @@ -437,12 +437,12 @@ \NeedsTeXFormat{LaTeX2e} \def\reserved at a #1#2$#3: #4${\xdef#1{\reserved at c #2#4 $}} \def\reserved at c #1 #2${#1} \begingroup \catcode`\_=12 -\reserved at a\pr at version $Name: sumo-2009-02-17 $ \ifx\pr at version\@empty -\reserved at a\pr at version CVS-$Revision: 1.1.2.1 $ \endgroup \else +\reserved at a\pr at version $Name: release_11_84 $ \ifx\pr at version\@empty +\reserved at a\pr at version CVS-$Revision: 1.122 $ \endgroup \else \def\next release_{} \lccode`\_=`. \edef\next{\lowercase{\endgroup \def\noexpand\pr at version{\expandafter\next\pr at version}}} \next \fi -\reserved at a\next $Date: 2008/09/09 21:47:21 $ +\reserved at a\next $Date: 2006/08/25 10:34:36 $ \edef\next{\noexpand\ProvidesPackage{preview}% [\next\space \pr at version\space (AUCTeX/preview-latex)]} \next diff -up xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/preview.el~ xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/preview.el --- xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/preview.el~ 2008-09-10 00:45:58.000000000 +0300 +++ xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/preview.el 2009-02-26 19:14:50.000000000 +0200 @@ -3511,8 +3511,8 @@ internal parameters, STR may be a log to (preview-reraise-error process))))) (defconst preview-version (eval-when-compile - (let ((name "$Name: sumo-2009-02-17 $") - (rev "$Revision: 1.1.2.1 $")) + (let ((name "$Name: release_11_84 $") + (rev "$Revision: 1.279 $")) (or (when (string-match "\\`[$]Name: *release_\\([^ ]+\\) *[$]\\'" name) (setq name (match-string 1 name)) (while (string-match "_" name) @@ -3526,7 +3526,7 @@ If not a regular release, CVS revision o (defconst preview-release-date (eval-when-compile - (let ((date "$Date: 2008/09/09 21:45:58 $")) + (let ((date "$Date: 2006/10/24 16:02:21 $")) (string-match "\\`[$]Date: *\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\)" date) diff -up xemacs-packages-extra-20090217/xemacs-packages/auctex/style/prosper.el~ xemacs-packages-extra-20090217/xemacs-packages/auctex/style/prosper.el --- xemacs-packages-extra-20090217/xemacs-packages/auctex/style/prosper.el~ 2008-09-10 00:55:11.000000000 +0300 +++ xemacs-packages-extra-20090217/xemacs-packages/auctex/style/prosper.el 2009-02-26 19:16:38.000000000 +0200 @@ -62,7 +62,7 @@ (defconst LaTeX-prosper-version - "$Id: prosper.el,v 1.1.2.1 2008/09/09 21:55:11 matsl Exp $" + "$Id: prosper.el,v 1.3 2004/05/10 09:04:14 angeli Exp $" "prosper.el version.") (defconst LaTeX-prosper-transition-styles '("Split" xemacs-packages-extra-20090217-auctex-texjp-platex.patch: --- NEW FILE xemacs-packages-extra-20090217-auctex-texjp-platex.patch --- diff -up xemacs-packages-extra-20090217/xemacs-packages/auctex/tex-jp.el~ xemacs-packages-extra-20090217/xemacs-packages/auctex/tex-jp.el --- xemacs-packages-extra-20090217/xemacs-packages/auctex/tex-jp.el~ 2008-07-23 10:12:18.000000000 +0300 +++ xemacs-packages-extra-20090217/xemacs-packages/auctex/tex-jp.el 2009-02-22 21:30:17.000000000 +0200 @@ -157,7 +157,7 @@ For detail, see `TeX-command-list', whic :type 'string) (make-variable-buffer-local 'japanese-TeX-command-default) -(defcustom japanese-LaTeX-command-default "LaTeX" +(defcustom japanese-LaTeX-command-default "pLaTeX" "*The default command for `TeX-command' in the japanese-LaTeX mode." :group 'AUCTeX-jp :type 'string) xemacs-packages-extra-20090217-browsers.patch: --- NEW FILE xemacs-packages-extra-20090217-browsers.patch --- diff -up xemacs-packages-extra-20090217/xemacs-packages/psgml/psgml-html.el~ xemacs-packages-extra-20090217/xemacs-packages/psgml/psgml-html.el --- xemacs-packages-extra-20090217/xemacs-packages/psgml/psgml-html.el~ 2007-05-29 18:56:55.000000000 +0300 +++ xemacs-packages-extra-20090217/xemacs-packages/psgml/psgml-html.el 2009-02-22 21:27:24.000000000 +0200 @@ -931,25 +931,25 @@ get those characters to appear literally (defvar sgml-html-menu (cons "HTML" - (append '(["View in Netscape" sgml-html-netscape-file - (buffer-file-name - (current-buffer))] - ["View in W3" w3-preview-this-buffer t] - ["View in kfm" sgml-html-kfm-file + (append '(["View in default browser" browse-url-of-buffer t] + ["View in Firefox" sgml-html-netscape-file + (buffer-file-name (current-buffer))] + ["View in Konqueror" sgml-html-kfm-file (buffer-file-name (current-buffer))] + ["View in W3" w3-preview-this-buffer t] "---" ["HTML-Quote Region" html-quote-region t] "---") (cdr sgml-main-menu)))) (defun sgml-html-netscape-file () - "Preview the file for the current buffer in Netscape." + "Preview the file for the current buffer in Firefox." (interactive) - (browse-url-netscape + (browse-url-firefox (concat "file:" (buffer-file-name (current-buffer))))) (defun sgml-html-kfm-file () - "Preview the file for the current buffer in kfm." + "Preview the file for the current buffer in Konqueror." (interactive) (browse-url-kde (concat "file:" (buffer-file-name (current-buffer))))) xemacs-packages-extra-20090217-vc-menu.patch: --- NEW FILE xemacs-packages-extra-20090217-vc-menu.patch --- Index: xemacs-packages/vc/vc-hooks.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vc/vc-hooks.el,v retrieving revision 1.15 diff -u -r1.15 vc-hooks.el --- xemacs-packages/vc/vc-hooks.el 28 Oct 2007 17:46:57 -0000 1.15 +++ xemacs-packages/vc/vc-hooks.el 28 Feb 2009 23:12:02 -0000 @@ -935,7 +935,7 @@ (defconst vc-menu '("Version Control" :filter vc-menu-filter - ["" vc-next-action buffer-file-name nil] + ["Next Action on" vc-next-action buffer-file-name nil] ["Update to Latest Version" vc-update vc-mode] ["Revert to Base Version" vc-revert-buffer vc-mode] ["Undo Last Check-In" vc-cancel-version vc-mode] @@ -956,48 +956,15 @@ (defun vc-menu-filter (menu-items) (let* ((result menu-items) ; modify in-place - (case-fold-search t) - (type (vc-backend buffer-file-name)) ;; VC works with full path! - (file (if buffer-file-name - buffer-file-name - (expand-file-name (buffer-name)))) - op owner item status) - (setq op (cond ((null type) - "Register File") - ((eq type 'CVS) - (setq status - (vc-file-getprop buffer-file-name 'cvs-status)) - (if status - (cdr (assoc status - '(("Locally Modified" . "Commit") - ("Needs Merge" . "Merge with repository") - ("Up-to-date" . "Do nothing to") - ("Needs Checkout" . "Update")))) - ;; #### - we're not gonna call cvs status just to - ;; post a lousy menu...that's insane! - "Next action on" - )) - ;; these are all for RCS and SCCS - ((not (setq owner (vc-locking-user file))) - ;; VC locking user is faster now. vc-file-owner - ;; is superceded by incompatible FSF version (JV). - "Check out File") - ((not (string-equal owner (user-login-name))) - "Steal File Lock") - (t "Check in File"))) + (file (or buffer-file-name (expand-file-name (buffer-name)))) + item) ;; We do not want the full name in the menu (setq file (file-name-nondirectory file)) (while (setq item (pop menu-items)) (and (vectorp item) - (cond ((eq 'vc-next-action (aref item 1)) - (aset item 0 op) - (aset item 3 file)) - ((eq 'vc-file-status (aref item 1)) - (aset item 2 (eq 'CVS type)) - (aset item 3 file)) - ((> (length item) 3) - (aset item 3 file))))) + (> (length item) 3) + (aset item 3 file))) result)) (and (featurep 'menubar) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 May 2007 18:28:32 -0000 1.4 +++ .cvsignore 6 Mar 2009 23:08:10 -0000 1.5 @@ -1 +1 @@ -xemacs-packages-extra-20070427.tar.bz2 +xemacs-packages-extra-20090217.tar.lzma Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 May 2007 18:28:32 -0000 1.4 +++ sources 6 Mar 2009 23:08:10 -0000 1.5 @@ -1 +1 @@ -f5948a3652f58d0234dddba567d9c59a xemacs-packages-extra-20070427.tar.bz2 +8cb0e0bcd7410fadd0384206467581ef xemacs-packages-extra-20090217.tar.lzma Index: xemacs-packages-extra-checkout.sh =================================================================== RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/xemacs-packages-extra-checkout.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xemacs-packages-extra-checkout.sh 10 Sep 2006 09:38:39 -0000 1.1 +++ xemacs-packages-extra-checkout.sh 6 Mar 2009 23:08:10 -0000 1.2 @@ -43,16 +43,13 @@ sed -i -e 's/ tetris.elc//' xemacs-packages/games/Makefile sed -i -e 's/ tetris//' xemacs-packages/games/package-info.in -# Fix up interpreters -sed -i -e 's|/usr/local/bin/perl5\?|/usr/bin/perl|g' \ - xemacs-packages/bbdb/utils/*.pl - # Clean up find . -name "*.jar" -o -name "*.class" -delete find . -name .cvsignore -o -name CVS | xargs rm -rf cd .. mv packages $tarball -tar jcf $pwd/$tarball.tar.bz2 $tarball +tar cf $pwd/$tarball.tar $tarball +lzma -f $pwd/$tarball.tar cd $pwd >/dev/null Index: xemacs-packages-extra.spec =================================================================== RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/xemacs-packages-extra.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xemacs-packages-extra.spec 26 Feb 2009 08:29:30 -0000 1.8 +++ xemacs-packages-extra.spec 6 Mar 2009 23:08:10 -0000 1.9 @@ -1,16 +1,16 @@ -%define pkgdir %{_datadir}/xemacs -%define xemver v=$(rpm -q --qf=%%{VERSION} xemacs) ; case $v in 2*) echo $v ;; *) echo 0 ;; esac +%global pkgdir %{_datadir}/xemacs +%global xemver %(pkg-config --modversion xemacs 2>/dev/null || echo 0) Name: xemacs-packages-extra -Version: 20070427 -Release: 5%{?dist} +Version: 20090217 +Release: 1%{?dist} Summary: Collection of XEmacs lisp packages Group: Applications/Editors License: GPLv2+ URL: http://www.xemacs.org/Documentation/packageGuide.html # Tarball created with Source99 -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.lzma Source10: Emacs.ad.ja_JP.eucJP Source11: Emacs.ad.ko_KR.eucKR Source12: Emacs.ad.zh_CN.GB2312 @@ -21,33 +21,33 @@ Source17: Emacs.ad.zh_TW.UTF-8 Source99: %{name}-checkout.sh -Patch0: %{name}-20060510-hypb-posix.patch +# Upstreamed +Patch0: %{name}-20090217-auctex-cvs-keywords.patch Patch1: %{name}-20060510-aspellenc-190151.patch Patch2: %{name}-20060510-trax.patch -Patch3: %{name}-20060510-auctex-texsite-jlatex-detect-69129.patch -Patch4: %{name}-20060510-auctex-texjp-platex.patch +# Upstreamed +Patch3: %{name}-20090217-vc-menu.patch +Patch4: %{name}-20090217-auctex-texjp-platex.patch Patch5: %{name}-20060510-egg-wnn-host-unix-79826.patch -Patch6: %{name}-20070427-browsers.patch -Patch7: %{name}-20070427-jp-locale-239394.patch +Patch6: %{name}-20090217-browsers.patch Patch8: %{name}-20060510-avoid-catch-error-65346.patch -Patch9: %{name}-20070427-rpmspec.patch -Patch10: %{name}-20070427-CVE-2008-2142.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: xemacs +BuildRequires: xemacs >= 21.5.28-11 BuildRequires: texinfo +# For building auctex docs +BuildRequires: texlive-texmf-latex BuildRequires: tetex BuildRequires: /sbin/install-info BuildRequires: %{__python} BuildRequires: java-devel +# lzma for unpacking Source0 +BuildRequires: lzma Requires: xemacs-packages-base = %{version} -Requires: xemacs(bin) >= %(%{xemver}) -# Fake release in apel provision in order to avoid self-obsoletion (for now). +Requires: xemacs(bin) >= %{xemver} +# Fake release here for historical reasons Provides: apel-xemacs = 10.6-6 -Obsoletes: apel-xemacs < 10.6-6 -Provides: xemacs-sumo = %{version}-%{release} -Obsoletes: xemacs-sumo < 20060510-3 %description XEmacs is a highly customizable open source text editor and @@ -66,8 +66,6 @@ Group: Development/Libraries Requires: xemacs-packages-extra = %{version}-%{release} Requires: xemacs-packages-base-el = %{version} -Provides: xemacs-sumo-el = %{version}-%{release} -Obsoletes: xemacs-sumo-el < 20060510-3 %description el This package is not needed to run XEmacs; it contains the lisp source @@ -78,8 +76,6 @@ Summary: XEmacs packages documentation in GNU texinfo format Group: Documentation Requires: xemacs-packages-extra = %{version}-%{release} -Provides: xemacs-sumo-info = %{version}-%{release} -Obsoletes: xemacs-sumo-info < 20060510-3 %description info This package contains optional documentation for the XEmacs packages @@ -88,45 +84,47 @@ %prep %setup -q -# get rid of csh dependency +# fix keywords inadvertently expanded by XEmacs CVS, failing auctex build %patch0 -p1 # adapt ispell.el to aspell >= 0.60's encoding behaviour, #190151 %patch1 -p1 # use TrAX by default in xslt-process %patch2 -p1 -# fix jlatex autodetection -%patch3 -p1 +# fix/simplify outdated vc menu +%patch3 -p0 # use ptex rather jtex by default for Japanese %patch4 -p1 # make egg-wnn use unix domain socket by default %patch5 -p1 # update browsers in psgml-html %patch6 -p1 -# fix -help and splash screen with ja_JP.UTF-8 -%patch7 -p0 # catch harmless errors in mouse-avoidance-too-close-p (avoid.el) %patch8 -p1 -# rpm-spec-mode improvements -%patch9 -p0 -# CVE-2008-2142 -%patch10 -p0 -[ ! "%(%{xemver})" '<' "21.5" ] && x215="XEMACS_21_5=t" || x215= +chmod -c -x \ + xemacs-packages/auctex/style/babel.el \ + xemacs-packages/ede/ede-proj-comp.el \ + xemacs-packages/vm/lisp/vm-version.el + cat << EOF > make.sh #!/bin/sh make \\ XEMACS_BINARY=%{_bindir}/xemacs \\ XEMACS_INSTALLED_PACKAGES_ROOT=\$RPM_BUILD_ROOT%{pkgdir} \\ - $x215 \\ + XEMACS_21_5=t \\ "\$@" EOF chmod +x make.sh +sed -i -e 's|/usr/local/bin/perl5\?|/usr/bin/perl|g' \ + xemacs-packages/bbdb/utils/*.pl xemacs-packages/hyperbole/file-newer + %build cd xemacs-packages/xslt-process/java javac xslt/TrAX.java && jar cvf xslt.jar xslt/*.class && rm xslt/*.class cd - +./make.sh autoloads ./make.sh @@ -137,14 +135,16 @@ ./make.sh install cd $RPM_BUILD_ROOT%{pkgdir}/mule-packages/etc/app-defaults -mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,zh_CN,zh_TW}.UTF-8 \ +mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,sv_SE,zh_CN,zh_TW}.UTF-8 \ ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5 iconv -f ISO-8859-1 -t UTF-8 de/Emacs > de_DE.UTF-8/Emacs iconv -f ISO-8859-1 -t UTF-8 fr/Emacs > fr_FR.UTF-8/Emacs iconv -f ISO-8859-16 -t UTF-8 ro/Emacs > ro_RO.UTF-8/Emacs +iconv -f ISO-8859-1 -t UTF-8 sv/Emacs > sv_SE.UTF-8/Emacs mv de de_DE mv fr fr_FR mv ro ro_RO +mv sv sv_SE install -pm 644 %{SOURCE10} ja_JP.eucJP/Emacs install -pm 644 %{SOURCE11} ko_KR.eucKR/Emacs install -pm 644 %{SOURCE12} zh_CN.GB2312/Emacs @@ -160,9 +160,6 @@ #ln -s zh_TW.Big5 zh_TW cd - -# Not needed after hypb-posix patch -rm -f $RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/lisp/hyperbole/file-newer - remove_package() { pdir=$RPM_BUILD_ROOT%{pkgdir}/$2 %{_bindir}/xemacs -batch -vanilla -l package-admin -eval \ @@ -184,9 +181,7 @@ done # mule-ucs: not needed (and unusable) with >= 21.5 -if [ ! "%(%{xemver})" '<' "21.5" ] ; then - remove_package mule-ucs mule-packages -fi +remove_package mule-ucs mule-packages # info docs: pre-generate "dir"s and compress files for file in $RPM_BUILD_ROOT%{pkgdir}/*-packages/info/*.info ; do @@ -234,6 +229,12 @@ %changelog +* Sat Mar 7 2009 Ville Skytt?? - 20090217-1 +- Update to 2009-02-17, several patches applied/superseded upstream. +- Apply upstream patch to fix errors and obsolete code in VC menu. +- Drop xemacs-sumo* provides and obsoletes and apel-xemacs obsoletes. +- Drop support for building with xemacs < 21.5.28-11. + * Thu Feb 26 2009 Fedora Release Engineering - 20070427-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xemacs-packages-extra-20060510-auctex-texjp-platex.patch DELETED --- --- xemacs-packages-extra-20060510-auctex-texsite-jlatex-detect-69129.patch DELETED --- --- xemacs-packages-extra-20060510-hypb-posix.patch DELETED --- --- xemacs-packages-extra-20070427-CVE-2008-2142.patch DELETED --- --- xemacs-packages-extra-20070427-browsers.patch DELETED --- --- xemacs-packages-extra-20070427-jp-locale-239394.patch DELETED --- --- xemacs-packages-extra-20070427-rpmspec.patch DELETED --- From rstrode at fedoraproject.org Fri Mar 6 23:08:40 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Fri, 6 Mar 2009 23:08:40 +0000 (UTC) Subject: rpms/plymouth/devel plymouth-0.7.0-fix-set-default.patch, NONE, 1.1 plymouth.spec, 1.121, 1.122 Message-ID: <20090306230840.975D770116@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/plymouth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3592 Modified Files: plymouth.spec Added Files: plymouth-0.7.0-fix-set-default.patch Log Message: - Fix set default script plymouth-0.7.0-fix-set-default.patch: --- NEW FILE plymouth-0.7.0-fix-set-default.patch --- diff -up plymouth-0.7.0/scripts/plymouth-set-default-plugin.fix-set-default plymouth-0.7.0/scripts/plymouth-set-default-plugin --- plymouth-0.7.0/scripts/plymouth-set-default-plugin.fix-set-default 2009-03-06 18:05:04.348305491 -0500 +++ plymouth-0.7.0/scripts/plymouth-set-default-plugin 2009-03-06 18:05:16.368307465 -0500 @@ -139,6 +139,6 @@ fi (cd ${LIBDIR}/plymouth; ln -sf ${PLUGIN_NAME}.so default.so && \ - [ $DO_INITRD_REBUILD -ne 0 ] && \ - $LIBEXECDIR/plymouth/plymouth-update-initrd) + ([ $DO_INITRD_REBUILD -ne 0 ] && \ + $LIBEXECDIR/plymouth/plymouth-update-initrd) || :) diff -up plymouth-0.7.0/scripts/plymouth-set-default-plugin.in.fix-set-default plymouth-0.7.0/scripts/plymouth-set-default-plugin.in --- plymouth-0.7.0/scripts/plymouth-set-default-plugin.in.fix-set-default 2009-03-06 18:04:48.494054716 -0500 +++ plymouth-0.7.0/scripts/plymouth-set-default-plugin.in 2009-03-06 18:04:58.738052455 -0500 @@ -139,6 +139,6 @@ fi (cd ${LIBDIR}/plymouth; ln -sf ${PLUGIN_NAME}.so default.so && \ - [ $DO_INITRD_REBUILD -ne 0 ] && \ - $LIBEXECDIR/plymouth/plymouth-update-initrd) + ([ $DO_INITRD_REBUILD -ne 0 ] && \ + $LIBEXECDIR/plymouth/plymouth-update-initrd) || :) Index: plymouth.spec =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- plymouth.spec 6 Mar 2009 22:58:08 -0000 1.121 +++ plymouth.spec 6 Mar 2009 23:08:10 -0000 1.122 @@ -5,7 +5,7 @@ Summary: Graphical Boot Animation and Logger Name: plymouth Version: 0.7.0 -Release: 0.2009.03.06.1%{?dist} +Release: 0.2009.03.06.2%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -19,6 +19,7 @@ Requires: initscripts >= 8.83-1 Obsoletes: plymouth-text-and-details-only < %{version}-%{release} +Patch0: plymouth-0.7.0-fix-set-default.patch %description Plymouth provides an attractive graphical boot animation in @@ -149,6 +150,7 @@ %prep %setup -q +%patch0 -p1 -b .fix-set-default %build %configure --enable-tracing --disable-tests --without-boot-entry \ @@ -319,6 +321,9 @@ %defattr(-, root, root) %changelog +* Fri Mar 6 2009 Ray Strode 0.7.0-0.2009.03.06.2 +- Fix set default script + * Fri Mar 6 2009 Ray Strode 0.7.0-0.2009.03.06.1 - more scriptlet changes to move from solar to spinfinity From chkr at fedoraproject.org Fri Mar 6 23:16:42 2009 From: chkr at fedoraproject.org (Christian Krause) Date: Fri, 6 Mar 2009 23:16:42 +0000 (UTC) Subject: rpms/anki/F-9 anki-0.9.9.6-noupdate.patch, NONE, 1.1 anki-0.9.9.6-unihaninstall.patch, NONE, 1.1 anki.spec, NONE, 1.1 generate-anki-tarball.sh, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090306231642.500F770116@cvs1.fedora.phx.redhat.com> Author: chkr Update of /cvs/pkgs/rpms/anki/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5504/F-9 Modified Files: .cvsignore sources Added Files: anki-0.9.9.6-noupdate.patch anki-0.9.9.6-unihaninstall.patch anki.spec generate-anki-tarball.sh import.log Log Message: - initial import of anki 0.9.9.6 anki-0.9.9.6-noupdate.patch: --- NEW FILE anki-0.9.9.6-noupdate.patch --- diff -uNr anki-0.9.9.6.old/ankiqt/config.py anki-0.9.9.6/ankiqt/config.py --- anki-0.9.9.6.old/ankiqt/config.py 2009-01-21 14:53:21.000000000 +0100 +++ anki-0.9.9.6/ankiqt/config.py 2009-02-11 23:18:16.000000000 +0100 @@ -44,7 +44,7 @@ 'iconSize': 32, 'syncOnLoad': False, 'syncOnClose': False, - 'checkForUpdates': True, + 'checkForUpdates': False, 'interfaceLang': "", 'syncUsername': "", 'syncPassword': "", anki-0.9.9.6-unihaninstall.patch: --- NEW FILE anki-0.9.9.6-unihaninstall.patch --- diff -uNr anki-0.9.9.6.old/libanki/setup.py anki-0.9.9.6/libanki/setup.py --- anki-0.9.9.6.old/libanki/setup.py 2009-01-21 14:51:33.000000000 +0100 +++ anki-0.9.9.6/libanki/setup.py 2009-02-13 22:14:15.000000000 +0100 @@ -25,8 +25,8 @@ url='http://ichi2.net/anki/index.html', license='GPLv3', packages=["anki", "anki.features", "anki.features.chinese", "anki.importing"], - package_data={'anki': - ['samples/*','locale/*/*/*']}, + package_data={'anki': ['samples/*','locale/*/*/*'], + 'anki.features.chinese': ['unihan.db']}, include_package_data=True, zip_safe=False, install_requires=[ --- NEW FILE anki.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: anki Version: 0.9.9.6 Release: 3%{?dist} Summary: Flashcard program for using space repetition learning Group: Amusements/Games # the file anki-%{version}/libanki/anki/features/chinese/unihan.db # was created out of Unihan.txt from www.unicode.org (MIT license) License: GPLv3+ and MIT URL: http://www.ichi2.net/anki Source0: %{name}-%{version}-nosamples.tgz # anki contains a sample with an unclear license # this script to remove all samples since they are not installed anyway # Download the upstream tarball and invoke this script while in the # tarball's directory: # ./generate-anki-tarball.sh 0.9.9.6 # upstream tarball: http://ichi2.net/anki/download/%{name}-%{version}.tgz Source1: generate-anki-tarball.sh # Config change: don't check for new updates. Patch0: anki-0.9.9.6-noupdate.patch # install issue tracked upstream: # http://code.google.com/p/anki/issues/detail?id=561 Patch1: anki-0.9.9.6-unihaninstall.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, python-setuptools, python-sqlalchemy BuildRequires: PyQt4-devel BuildRequires: desktop-file-utils Requires: qt4, PyQt4 Requires: python-sqlalchemy, python-simplejson, python-sqlite2 Requires: numpy Requires: pygame BuildArch: noarch %description Anki is a program designed to help you remember facts (such as words and phrases in a foreign language) as easily, quickly and efficiently as possible. Anki is based on a theory called spaced repetition. %prep %setup -q %patch0 -p1 -b .noupdate %patch1 -p1 -b .unihaninstall %build pushd libanki %{__python} setup.py build popd %{__python} setup.py build %install rm -rf %{buildroot} pushd libanki %{__python} setup.py install -O1 --skip-build --root %{buildroot} popd %{__python} setup.py install -O1 --skip-build --root %{buildroot} install -d %{buildroot}%{_datadir}/applications desktop-file-install \ --remove-category=KDE \ --dir %{buildroot}%{_datadir}/applications \ %{name}.desktop install -d %{buildroot}%{_datadir}/pixmaps install -m 644 icons/anki.png %{buildroot}%{_datadir}/pixmaps/ %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc COPYING ChangeLog CREDITS README* # libankiqt %dir %{python_sitelib}/ankiqt %{python_sitelib}/ankiqt/*.py* %{python_sitelib}/ankiqt/ui %{python_sitelib}/ankiqt/forms # libanki %dir %{python_sitelib}/anki %{python_sitelib}/anki/*.py* %{python_sitelib}/anki/importing %{python_sitelib}/anki/features # locale %dir %{python_sitelib}/ankiqt/locale/ %dir %{python_sitelib}/anki/locale/ %lang(cs) %{python_sitelib}/*/locale/cs_*/ %lang(de) %{python_sitelib}/*/locale/de_*/ %lang(es) %{python_sitelib}/*/locale/es_*/ %lang(fi) %{python_sitelib}/*/locale/fi_*/ %lang(fr) %{python_sitelib}/*/locale/fr_*/ %lang(it) %{python_sitelib}/*/locale/it_*/ %lang(ja) %{python_sitelib}/*/locale/ja_*/ %lang(ko) %{python_sitelib}/*/locale/ko_*/ %lang(pl) %{python_sitelib}/*/locale/pl_*/ %lang(zh) %{python_sitelib}/anki/locale/zh_*/ %{python_sitelib}/*egg-info %{_bindir}/anki %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog * Fri Feb 27 2009 Christian Krause - 0.9.9.6-3 - proper packaging of locale files * Fri Feb 13 2009 Christian Krause - 0.9.9.6-2 - Fixed license field - Install unihan.db * Wed Feb 11 2009 Christian Krause - 0.9.9.6-1 - First spec file for anki. --- NEW FILE generate-anki-tarball.sh --- #!/bin/sh VERSION=$1 tar -xzvf anki-$VERSION.tgz rm -rf anki-$VERSION/libanki/samples tar -czvf anki-$VERSION-nosamples.tgz anki-$VERSION --- NEW FILE import.log --- anki-0_9_9_6-3_fc10:F-9:anki-0.9.9.6-3.fc10.src.rpm:1236381285 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anki/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2009 00:28:33 -0000 1.1 +++ .cvsignore 6 Mar 2009 23:16:11 -0000 1.2 @@ -0,0 +1 @@ +anki-0.9.9.6-nosamples.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anki/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2009 00:28:33 -0000 1.1 +++ sources 6 Mar 2009 23:16:11 -0000 1.2 @@ -0,0 +1 @@ +0f029c744c849a5e2ca7f95df119c59f anki-0.9.9.6-nosamples.tgz From chkr at fedoraproject.org Fri Mar 6 23:23:34 2009 From: chkr at fedoraproject.org (Christian Krause) Date: Fri, 6 Mar 2009 23:23:34 +0000 (UTC) Subject: rpms/anki/F-9 anki.spec,1.1,1.2 Message-ID: <20090306232334.F024070116@cvs1.fedora.phx.redhat.com> Author: chkr Update of /cvs/pkgs/rpms/anki/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7156 Modified Files: anki.spec Log Message: change email address and bump release Index: anki.spec =================================================================== RCS file: /cvs/pkgs/rpms/anki/F-9/anki.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- anki.spec 6 Mar 2009 23:16:11 -0000 1.1 +++ anki.spec 6 Mar 2009 23:23:04 -0000 1.2 @@ -2,7 +2,7 @@ Name: anki Version: 0.9.9.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Flashcard program for using space repetition learning Group: Amusements/Games @@ -107,12 +107,15 @@ %{_datadir}/pixmaps/%{name}.png %changelog -* Fri Feb 27 2009 Christian Krause - 0.9.9.6-3 -- proper packaging of locale files +* Sat Mar 07 2009 Christian Krause - 0.9.9.6-4 +- Bump release -* Fri Feb 13 2009 Christian Krause - 0.9.9.6-2 +* Fri Feb 27 2009 Christian Krause - 0.9.9.6-3 +- Proper packaging of locale files + +* Fri Feb 13 2009 Christian Krause - 0.9.9.6-2 - Fixed license field - Install unihan.db -* Wed Feb 11 2009 Christian Krause - 0.9.9.6-1 -- First spec file for anki. +* Wed Feb 11 2009 Christian Krause - 0.9.9.6-1 +- First spec file for anki From dnielsen at fedoraproject.org Fri Mar 6 23:37:01 2009 From: dnielsen at fedoraproject.org (David Nielsen) Date: Fri, 6 Mar 2009 23:37:01 +0000 (UTC) Subject: rpms/banshee/devel banshee-1.4.3-podcast_download.patch, NONE, 1.1 banshee.spec, 1.73, 1.74 import.log, 1.3, 1.4 Message-ID: <20090306233701.24C5F70116@cvs1.fedora.phx.redhat.com> Author: dnielsen Update of /cvs/pkgs/rpms/banshee/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9779/devel Modified Files: banshee.spec import.log Added Files: banshee-1.4.3-podcast_download.patch Log Message: Apply patch for gnomebz #536047 banshee-1.4.3-podcast_download.patch: --- NEW FILE banshee-1.4.3-podcast_download.patch --- # http://bugzilla.gnome.org/show_bug.cgi?id=536047 Index: src/Libraries/Migo/Migo.Net/AsyncWebClient.cs =================================================================== --- src/Libraries/Migo/Migo.Net/AsyncWebClient.cs (revision 5091) +++ src/Libraries/Migo/Migo.Net/AsyncWebClient.cs (working copy) @@ -687,22 +687,20 @@ while (nread != 0) { - try { - readTimeoutHandle.Reset (); - - // - // Yeah, Yeah, Yeah, I'll change this later, - // it's here to get around abort issues. - - ar = st.BeginRead (buffer, offset, length, null, null); - nread = st.EndRead (ar); - - // need an auxiliary downloader class to replace this. - // - - readTimeoutHandle.Set (); - } catch { return; } + readTimeoutHandle.Reset (); + // + // Yeah, Yeah, Yeah, I'll change this later, + // it's here to get around abort issues. + + ar = st.BeginRead (buffer, offset, length, null, null); + nread = st.EndRead (ar); + + // need an auxiliary downloader class to replace this. + // + + readTimeoutHandle.Set (); + if (writeToStream) { dest.Write (buffer, 0, nread); } else { Index: src/Libraries/Migo/Migo.DownloadCore/HttpFileDownloadTask.cs =================================================================== --- src/Libraries/Migo/Migo.DownloadCore/HttpFileDownloadTask.cs (revision 5091) +++ src/Libraries/Migo/Migo.DownloadCore/HttpFileDownloadTask.cs (working copy) @@ -419,7 +419,7 @@ try { if (e.Error != null) { - //Console.WriteLine ("DT {1} Error: {0}", e.Error, this.Name); + Hyena.Log.WarningFormat ("HttpDownloadTask {1} Error: {0}", e.Error, this.Name); WebException we = e.Error as WebException; if (we != null) { Index: banshee.spec =================================================================== RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- banshee.spec 5 Mar 2009 11:03:58 -0000 1.73 +++ banshee.spec 6 Mar 2009 23:36:30 -0000 1.74 @@ -2,13 +2,14 @@ Name: banshee Version: 1.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easily import, manage, and play selections from your music collection Group: Applications/Multimedia License: MIT URL: http://banshee-project.org/ Source0: http://banshee-project.org/files/banshee/banshee-1-%{version}.tar.bz2 Source1: README.Fedora +Patch0: banshee-1.4.3-podcast_download.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # We only have mono on these arches: @@ -111,6 +112,7 @@ %prep %setup -q -n %{name}-1-%{version} cp -p %{SOURCE1} . +%patch0 -p0 -b .patch %build export MONO_SHARED_DIR=%mono_shared @@ -195,6 +197,9 @@ %changelog +* Sat Mar 07 2009 David Nielsen - 1.4.3-2 +- add patch for gnomebz #536047 + * Thu Mar 05 2009 David Nielsen - 1.4.3-1 - Update to 1.4.3 - Remove upstreamed patch Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/banshee/devel/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 5 Mar 2009 11:03:58 -0000 1.3 +++ import.log 6 Mar 2009 23:36:30 -0000 1.4 @@ -1,3 +1,4 @@ banshee-1_4_2-5_fc11:HEAD:banshee-1.4.2-5.fc11.src.rpm:1235468555 banshee-1_4_2-6_fc11:HEAD:banshee-1.4.2-6.fc11.src.rpm:1235582276 banshee-1_4_3-1_fc11:HEAD:banshee-1.4.3-1.fc11.src.rpm:1236250928 +banshee-1_4_3-2_fc11:HEAD:banshee-1.4.3-2.fc11.src.rpm:1236382488 From sandeen at fedoraproject.org Fri Mar 6 23:39:54 2009 From: sandeen at fedoraproject.org (Eric Sandeen) Date: Fri, 6 Mar 2009 23:39:54 +0000 (UTC) Subject: rpms/fio/devel .cvsignore,1.7,1.8 fio.spec,1.7,1.8 sources,1.7,1.8 Message-ID: <20090306233954.9FAA670116@cvs1.fedora.phx.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/fio/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10980 Modified Files: .cvsignore fio.spec sources Log Message: * Fri Mar 06 2009 Eric Sandeen 1.24-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fio/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 20 Nov 2008 18:01:39 -0000 1.7 +++ .cvsignore 6 Mar 2009 23:39:23 -0000 1.8 @@ -1 +1 @@ -fio-1.23.tar.bz2 +fio-1.24.tar.bz2 Index: fio.spec =================================================================== RCS file: /cvs/pkgs/rpms/fio/devel/fio.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fio.spec 24 Feb 2009 17:10:02 -0000 1.7 +++ fio.spec 6 Mar 2009 23:39:23 -0000 1.8 @@ -1,6 +1,6 @@ Name: fio -Version: 1.23 -Release: 2%{?dist} +Version: 1.24 +Release: 1%{?dist} Summary: Multithreaded IO generation tool Group: Applications/System @@ -40,6 +40,9 @@ %{_mandir}/man1/* %changelog +* Fri Mar 06 2009 Eric Sandeen 1.24-1 +- New upstream version + * Tue Feb 24 2009 Fedora Release Engineering - 1.23-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fio/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 20 Nov 2008 18:01:39 -0000 1.7 +++ sources 6 Mar 2009 23:39:23 -0000 1.8 @@ -1 +1 @@ -8ca601d5f65bfc6a2d835f0936b49ce5 fio-1.23.tar.bz2 +aa1f38c61ff957f89004f02a76deb524 fio-1.24.tar.bz2 From ausil at fedoraproject.org Fri Mar 6 23:40:40 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Fri, 6 Mar 2009 23:40:40 +0000 (UTC) Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.420,1.421 Message-ID: <20090306234040.12EE170116@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/extras/rpms/xorg-x11-server/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11188 Modified Files: xorg-x11-server.spec Log Message: BR kernel-headers not kernel-devel Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/extras/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.420 retrieving revision 1.421 diff -u -r1.420 -r1.421 --- xorg-x11-server.spec 6 Mar 2009 18:02:40 -0000 1.420 +++ xorg-x11-server.spec 6 Mar 2009 23:40:09 -0000 1.421 @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.0 -Release: 8%{?dist} +Release: 9%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -136,7 +136,7 @@ # should be useless now... # BuildRequires: mesa-source >= 7.1-0.36 # XXX silly... -BuildRequires: libdrm-devel >= 2.4.0 kernel-devel +BuildRequires: libdrm-devel >= 2.4.0 kernel-headers BuildRequires: audit-libs-devel libselinux-devel >= 2.0.59-1 BuildRequires: hal-devel dbus-devel @@ -500,6 +500,9 @@ %changelog +* Fri Mar 06 2009 Dennis Gilmore 1.6.0-9 +- BR kernel-headers not kernel-devel + * Fri Mar 06 2009 Adam Jackson 1.6.0-8 - xserver-1.6.0-primary.patch: Really, only look at VGA devices. (#488869) From konradm at fedoraproject.org Fri Mar 6 23:41:58 2009 From: konradm at fedoraproject.org (Conrad Meyer) Date: Fri, 6 Mar 2009 23:41:58 +0000 (UTC) Subject: rpms/jruby/devel jruby.spec,1.15,1.16 Message-ID: <20090306234158.AE75970116@cvs1.fedora.phx.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/jruby/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11761 Modified Files: jruby.spec Log Message: * Fri Mar 6 2009 Conrad Meyer - 1.1.6-3 - debug_package nil, as this is a pure-java package (that can't be built with gcj). Index: jruby.spec =================================================================== RCS file: /cvs/pkgs/rpms/jruby/devel/jruby.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- jruby.spec 25 Feb 2009 09:47:04 -0000 1.15 +++ jruby.spec 6 Mar 2009 23:41:28 -0000 1.16 @@ -1,6 +1,8 @@ +%define debug_package %{nil} + Name: jruby Version: 1.1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Pure Java implementation of the Ruby interpreter Group: Development/Languages License: (CPL or GPLv2+ or LGPLv2+) and ASL 1.1 and MIT and Ruby @@ -163,6 +165,10 @@ %changelog +* Fri Mar 6 2009 Conrad Meyer - 1.1.6-3 +- debug_package nil, as this is a pure-java package (that can't + be built with gcj). + * Wed Feb 25 2009 Fedora Release Engineering - 1.1.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From bojan at fedoraproject.org Fri Mar 6 23:46:09 2009 From: bojan at fedoraproject.org (Bojan Smojver) Date: Fri, 6 Mar 2009 23:46:09 +0000 (UTC) Subject: rpms/libapreq2/devel .cvsignore, 1.17, 1.18 libapreq2-build.patch, 1.1, 1.2 libapreq2.spec, 1.45, 1.46 sources, 1.17, 1.18 Message-ID: <20090306234609.841F870116@cvs1.fedora.phx.redhat.com> Author: bojan Update of /cvs/pkgs/rpms/libapreq2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12729 Modified Files: .cvsignore libapreq2-build.patch libapreq2.spec sources Log Message: Bump up to 2.12-RC2. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libapreq2/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 13 Nov 2008 07:17:11 -0000 1.17 +++ .cvsignore 6 Mar 2009 23:45:38 -0000 1.18 @@ -1 +1 @@ -libapreq2-2.10-RC1.tar.gz +libapreq2-2.12-RC2.tar.gz libapreq2-build.patch: Index: libapreq2-build.patch =================================================================== RCS file: /cvs/pkgs/rpms/libapreq2/devel/libapreq2-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libapreq2-build.patch 10 Jul 2005 14:22:45 -0000 1.1 +++ libapreq2-build.patch 6 Mar 2009 23:45:39 -0000 1.2 @@ -1,9 +1,9 @@ --- glue/Makefile.am~ 2005-04-16 05:19:36.000000000 +0300 +++ glue/Makefile.am 2005-05-05 12:14:29.000000000 +0300 @@ -15,7 +15,7 @@ - cd perl; $(MAKE) test perl_install: + cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@ - cd perl; $(MAKE) install + cd perl; $(MAKE) pure_install Index: libapreq2.spec =================================================================== RCS file: /cvs/pkgs/rpms/libapreq2/devel/libapreq2.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- libapreq2.spec 25 Feb 2009 13:40:08 -0000 1.45 +++ libapreq2.spec 6 Mar 2009 23:45:39 -0000 1.46 @@ -1,14 +1,14 @@ %{!?apxs: %{expand:%%define apxs %{_sbindir}/apxs}} Name: libapreq2 -Version: 2.10 -Release: 0.rc1.3%{?dist}.1 +Version: 2.12 +Release: 0.rc2.1%{?dist} Summary: Apache HTTP request library Group: System Environment/Libraries License: ASL 2.0 URL: http://httpd.apache.org/apreq/ -Source0: http://people.apache.org/~pgollucci/apreq2/libapreq2-2.10-RC1.tar.gz +Source0: http://people.apache.org/~joes/libapreq2-2.12-RC2.tar.gz Source1: %{name}-httpd.conf Source2: %{name}.pc.in Patch0: %{name}-build.patch @@ -170,6 +170,9 @@ %changelog +* Sat Mar 7 2009 Bojan Smojver - 2.12-0.rc2.1 +- bump up to 2.12-RC2 + * Wed Feb 25 2009 Fedora Release Engineering - 2.10-0.rc1.3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libapreq2/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 13 Nov 2008 07:17:11 -0000 1.17 +++ sources 6 Mar 2009 23:45:39 -0000 1.18 @@ -1 +1 @@ -1cb9f90308c7ce69383843d14498197f libapreq2-2.10-RC1.tar.gz +76e2acde0d82246dea6f2565f3746eec libapreq2-2.12-RC2.tar.gz From oget at fedoraproject.org Fri Mar 6 23:48:00 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Fri, 6 Mar 2009 23:48:00 +0000 (UTC) Subject: rpms/rosegarden4/devel .cvsignore, 1.6, 1.7 rosegarden4.spec, 1.10, 1.11 sources, 1.6, 1.7 rosegarden-1.5.1-desktop-file.patch, 1.1, NONE rosegarden-1.6.0-fix-cmake-optflags.patch, 1.1, NONE rosegarden-1.6.1-gcc43.patch, 1.1, NONE Message-ID: <20090306234800.DBF9170116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/rosegarden4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13457 Modified Files: .cvsignore rosegarden4.spec sources Removed Files: rosegarden-1.5.1-desktop-file.patch rosegarden-1.6.0-fix-cmake-optflags.patch rosegarden-1.6.1-gcc43.patch Log Message: * Fri Mar 06 2009 Orcan Ogetbil - 1.7.3-1 - New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rosegarden4/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Feb 2008 00:18:49 -0000 1.6 +++ .cvsignore 6 Mar 2009 23:47:30 -0000 1.7 @@ -1 +1 @@ -rosegarden-1.6.1.tar.bz2 +rosegarden-1.7.3.tar.bz2 Index: rosegarden4.spec =================================================================== RCS file: /cvs/pkgs/rpms/rosegarden4/devel/rosegarden4.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rosegarden4.spec 25 Feb 2009 20:18:57 -0000 1.10 +++ rosegarden4.spec 6 Mar 2009 23:47:30 -0000 1.11 @@ -1,6 +1,6 @@ Name: rosegarden4 -Version: 1.6.1 -Release: 3%{?dist} +Version: 1.7.3 +Release: 1%{?dist} Summary: MIDI, audio and notation editor Group: Applications/Multimedia License: GPLv2+ @@ -8,10 +8,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://downloads.sourceforge.net/sourceforge/rosegarden/rosegarden-%{version}.tar.bz2 -Patch0: rosegarden-1.6.0-fix-cmake-optflags.patch -Patch1: rosegarden-1.5.1-desktop-file.patch Patch2: rosegarden-1.5.1-lib64.patch -Patch3: rosegarden-1.6.1-gcc43.patch BuildRequires: cmake BuildRequires: gettext @@ -34,26 +31,34 @@ %prep %setup -q -n rosegarden-%{version} -%patch0 -p1 -%patch1 -p1 # Look for LADSPA/DSSI plugins in the correct place on 64bit platforms %if "%{_lib}" == "lib64" %patch2 -p1 %endif -%patch3 -p1 -b .gcc43 + +# Fix permissions: +chmod 644 src/commands/segment/SegmentSplitTwiceCommand.* + +# Add GenericName to the desktop file: +echo "GenericName=Audio and MIDI Sequencer" >> data/desktop/rosegarden.desktop %build -%cmake . +%cmake . -DCMAKE_CXX_FLAGS="%{optflags}" make VERBOSE=1 %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} +mv %{buildroot}%{_datadir}/applications/kde/rosegarden.desktop \ + %{buildroot}%{_datadir}/applications/ + desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ --delete-original \ - %{buildroot}%{_datadir}/applications/kde/rosegarden.desktop + --remove-category X-SuSE-Sequencer \ + --remove-category X-Red-Hat-Base \ + %{buildroot}%{_datadir}/applications/rosegarden.desktop %find_lang rosegarden @@ -65,23 +70,23 @@ %post update-desktop-database &> /dev/null ||: -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi -# locolor seems to be a KDE thing? -touch --no-create %{_datadir}/icons/locolor || : +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +touch --no-create %{_datadir}/icons/locolor &>/dev/null || : %postun update-desktop-database &> /dev/null ||: -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/locolor &>/dev/null || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -touch --no-create %{_datadir}/icons/locolor || : + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files -f rosegarden.lang -%defattr(-,root,root) +%defattr(-,root,root,-) %doc AUTHORS COPYING %{_bindir}/rosegarden %{_bindir}/rosegarden-audiofile-importer @@ -109,6 +114,9 @@ %{_datadir}/mimelnk/audio/x-soundfont.desktop %changelog +* Fri Mar 06 2009 Orcan Ogetbil - 1.7.3-1 +- New upstream version. + * Wed Feb 25 2009 Fedora Release Engineering - 1.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rosegarden4/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Feb 2008 00:18:49 -0000 1.6 +++ sources 6 Mar 2009 23:47:30 -0000 1.7 @@ -1 +1 @@ -60efd0d0afcb3632d8188ef25082bcf9 rosegarden-1.6.1.tar.bz2 +122eab42e375d2f3b009c8540ae8069c rosegarden-1.7.3.tar.bz2 --- rosegarden-1.5.1-desktop-file.patch DELETED --- --- rosegarden-1.6.0-fix-cmake-optflags.patch DELETED --- --- rosegarden-1.6.1-gcc43.patch DELETED --- From airlied at fedoraproject.org Fri Mar 6 23:50:37 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Fri, 6 Mar 2009 23:50:37 +0000 (UTC) Subject: rpms/xorg-x11-drv-ati/devel radeon-6.11.0-git.patch, 1.2, 1.3 radeon-modeset.patch, 1.35, 1.36 xorg-x11-drv-ati.spec, 1.153, 1.154 Message-ID: <20090306235037.ED44570116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14532 Modified Files: radeon-6.11.0-git.patch radeon-modeset.patch xorg-x11-drv-ati.spec Log Message: * Sat Mar 07 2009 Dave Airlie 6.11.0-5 - pull in more fixes from master radeon-6.11.0-git.patch: Index: radeon-6.11.0-git.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-6.11.0-git.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- radeon-6.11.0-git.patch 2 Mar 2009 23:42:19 -0000 1.2 +++ radeon-6.11.0-git.patch 6 Mar 2009 23:50:06 -0000 1.3 @@ -49,6 +49,160 @@ #define PCI_VENDOR_ATI 0x1002 #define PCI_VENDOR_IBM 0x1014 #define PCI_VENDOR_AMD 0x1022 +diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c +index 5c26ef8..bf207bf 100644 +--- a/src/atombios_crtc.c ++++ b/src/atombios_crtc.c +@@ -186,7 +186,7 @@ atombios_set_crtc_timing(atomBiosHandlePtr atomBIOS, SET_CRTC_TIMING_PARAMETERS_ + conv_param.ucOverscanRight = crtc_param->ucOverscanRight; + conv_param.ucOverscanLeft = crtc_param->ucOverscanLeft; + conv_param.ucOverscanBottom = crtc_param->ucOverscanBottom; +- conv_param.ucOverscanTop = crtc_param->ucOverscanTop; ++ conv_param.ucOverscanTop = crtc_param->ucOverscanTop; + conv_param.ucReserved = crtc_param->ucReserved; + + data.exec.index = GetIndexIntoMasterTable(COMMAND, SetCRTC_Timing); +@@ -203,7 +203,7 @@ atombios_set_crtc_timing(atomBiosHandlePtr atomBIOS, SET_CRTC_TIMING_PARAMETERS_ + } + + void +-atombios_crtc_set_pll(xf86CrtcPtr crtc, DisplayModePtr mode, int pll_flags) ++atombios_crtc_set_pll(xf86CrtcPtr crtc, DisplayModePtr mode) + { + RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private; + RADEONInfoPtr info = RADEONPTR(crtc->scrn); +@@ -219,6 +219,7 @@ atombios_crtc_set_pll(xf86CrtcPtr crtc, DisplayModePtr mode, int pll_flags) + xf86OutputPtr output; + RADEONOutputPrivatePtr radeon_output = NULL; + radeon_encoder_ptr radeon_encoder = NULL; ++ int pll_flags = 0; + + void *ptr; + AtomBiosArgRec data; +@@ -350,7 +351,6 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc, + int i, ret; + SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION crtc_timing; + Bool tilingChanged = FALSE; +- int pll_flags = 0; + memset(&crtc_timing, 0, sizeof(crtc_timing)); + + if (info->allowColorTiling) { +@@ -373,9 +373,6 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc, + need_tv_timings = 2; + + } +- +- if (radeon_output->MonType == MT_LCD) +- pll_flags |= RADEON_PLL_USE_REF_DIV; + } + } + +@@ -484,7 +481,7 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc, + 0); + } + +- atombios_crtc_set_pll(crtc, adjusted_mode, pll_flags); ++ atombios_crtc_set_pll(crtc, adjusted_mode); + + atombios_set_crtc_timing(info->atomBIOS, &crtc_timing); + +diff --git a/src/atombios_output.c b/src/atombios_output.c +index c4baa13..613f729 100644 +--- a/src/atombios_output.c ++++ b/src/atombios_output.c +@@ -430,7 +430,10 @@ atombios_get_encoder_mode(xf86OutputPtr output) + return ATOM_ENCODER_MODE_LVDS; + break; + case CONNECTOR_DISPLAY_PORT: +- return ATOM_ENCODER_MODE_DP; ++ if (radeon_output->MonType == MT_DP) ++ return ATOM_ENCODER_MODE_DP; ++ else ++ return atombios_maybe_hdmi_mode(output); + break; + case CONNECTOR_DVI_A: + case CONNECTOR_VGA: +@@ -995,6 +998,61 @@ atombios_output_yuv_setup(xf86OutputPtr output, Bool enable) + } + + static int ++atombios_output_overscan_setup(xf86OutputPtr output, DisplayModePtr mode, DisplayModePtr adjusted_mode) ++{ ++ RADEONOutputPrivatePtr radeon_output = output->driver_private; ++ RADEONCrtcPrivatePtr radeon_crtc = output->crtc->driver_private; ++ RADEONInfoPtr info = RADEONPTR(output->scrn); ++ SET_CRTC_OVERSCAN_PS_ALLOCATION overscan_param; ++ AtomBiosArgRec data; ++ unsigned char *space; ++ memset(&overscan_param, 0, sizeof(overscan_param)); ++ ++ overscan_param.usOverscanRight = 0; ++ overscan_param.usOverscanLeft = 0; ++ overscan_param.usOverscanBottom = 0; ++ overscan_param.usOverscanTop = 0; ++ overscan_param.ucCRTC = radeon_crtc->crtc_id; ++ ++ if (radeon_output->Flags & RADEON_USE_RMX) { ++ if (radeon_output->rmx_type == RMX_FULL) { ++ overscan_param.usOverscanRight = 0; ++ overscan_param.usOverscanLeft = 0; ++ overscan_param.usOverscanBottom = 0; ++ overscan_param.usOverscanTop = 0; ++ } else if (radeon_output->rmx_type == RMX_CENTER) { ++ overscan_param.usOverscanTop = (adjusted_mode->CrtcVDisplay - mode->CrtcVDisplay) / 2; ++ overscan_param.usOverscanBottom = (adjusted_mode->CrtcVDisplay - mode->CrtcVDisplay) / 2; ++ overscan_param.usOverscanLeft = (adjusted_mode->CrtcHDisplay - mode->CrtcHDisplay) / 2; ++ overscan_param.usOverscanRight = (adjusted_mode->CrtcHDisplay - mode->CrtcHDisplay) / 2; ++ } else if (radeon_output->rmx_type == RMX_ASPECT) { ++ int a1 = mode->CrtcVDisplay * adjusted_mode->CrtcHDisplay; ++ int a2 = adjusted_mode->CrtcVDisplay * mode->CrtcHDisplay; ++ ++ if (a1 > a2) { ++ overscan_param.usOverscanLeft = (adjusted_mode->CrtcHDisplay - (a2 / mode->CrtcVDisplay)) / 2; ++ overscan_param.usOverscanRight = (adjusted_mode->CrtcHDisplay - (a2 / mode->CrtcVDisplay)) / 2; ++ } else if (a2 > a1) { ++ overscan_param.usOverscanLeft = (adjusted_mode->CrtcVDisplay - (a1 / mode->CrtcHDisplay)) / 2; ++ overscan_param.usOverscanRight = (adjusted_mode->CrtcVDisplay - (a1 / mode->CrtcHDisplay)) / 2; ++ } ++ } ++ } ++ ++ data.exec.index = GetIndexIntoMasterTable(COMMAND, SetCRTC_OverScan); ++ data.exec.dataSpace = (void *)&space; ++ data.exec.pspace = &overscan_param; ++ ++ if (RHDAtomBiosFunc(info->atomBIOS->scrnIndex, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) { ++ ErrorF("Set CRTC %d Overscan success\n", radeon_crtc->crtc_id); ++ return ATOM_SUCCESS ; ++ } ++ ++ ErrorF("Set CRTC %d Overscan failed\n", radeon_crtc->crtc_id); ++ return ATOM_NOT_IMPLEMENTED; ++} ++ ++static int + atombios_output_scaler_setup(xf86OutputPtr output, DisplayModePtr mode) + { + RADEONInfoPtr info = RADEONPTR(output->scrn); +@@ -1051,6 +1109,8 @@ atombios_output_scaler_setup(xf86OutputPtr output, DisplayModePtr mode) + disp_data.ucEnable = ATOM_SCALER_EXPANSION; + else if (radeon_output->rmx_type == RMX_CENTER) + disp_data.ucEnable = ATOM_SCALER_CENTER; ++ else if (radeon_output->rmx_type == RMX_ASPECT) ++ disp_data.ucEnable = ATOM_SCALER_EXPANSION; + } else { + ErrorF("Not using RMX\n"); + disp_data.ucEnable = ATOM_SCALER_DISABLE; +@@ -1423,7 +1483,8 @@ atombios_output_mode_set(xf86OutputPtr output, + if (radeon_encoder == NULL) + return; + +- atombios_output_scaler_setup(output, mode); ++ atombios_output_overscan_setup(output, mode, adjusted_mode); ++ atombios_output_scaler_setup(output, adjusted_mode); + atombios_set_output_crtc_source(output); + if (radeon_output->active_device & (ATOM_DEVICE_CV_SUPPORT | ATOM_DEVICE_TV_SUPPORT)) + atombios_output_yuv_setup(output, TRUE); diff --git a/src/r600_exa.c b/src/r600_exa.c new file mode 100644 index 0000000..3a4dc8d @@ -10793,10 +10947,34 @@ } } diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c -index 5a7c730..60140d6 100644 +index 5a7c730..a87e99b 100644 --- a/src/radeon_crtc.c +++ b/src/radeon_crtc.c -@@ -587,8 +587,7 @@ Bool RADEONAllocateControllers(ScrnInfoPtr pScrn, int mask) +@@ -410,6 +410,14 @@ radeon_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height) + int align = 4096, size; + int cpp = pScrn->bitsPerPixel / 8; + ++ /* No rotation without accel */ ++ if (((info->ChipFamily >= CHIP_FAMILY_R600) && !info->directRenderingEnabled) || ++ xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Acceleration required for rotation\n"); ++ return NULL; ++ } ++ + rotate_pitch = pScrn->displayWidth * cpp; + size = rotate_pitch * height; + +@@ -424,7 +432,7 @@ radeon_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height) + + return info->FB + rotate_offset; + } +- ++ + /** + * Creates a pixmap for this CRTC's rotated shadow framebuffer. + */ +@@ -587,8 +595,7 @@ Bool RADEONAllocateControllers(ScrnInfoPtr pScrn, int mask) RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); RADEONInfoPtr info = RADEONPTR(pScrn); @@ -10807,7 +10985,7 @@ radeon_crtc_funcs.shadow_allocate = radeon_crtc_shadow_allocate; radeon_crtc_funcs.shadow_destroy = radeon_crtc_shadow_destroy; diff --git a/src/radeon_dri.c b/src/radeon_dri.c -index 59d9a83..45f79ed 100644 +index 59d9a83..2b7540c 100644 --- a/src/radeon_dri.c +++ b/src/radeon_dri.c @@ -45,11 +45,14 @@ @@ -10834,7 +11012,7 @@ typedef struct { unsigned int hostbridgeVendor; unsigned int hostbridgeDevice; -@@ -737,48 +740,55 @@ typedef struct { +@@ -737,48 +740,57 @@ typedef struct { static radeon_agpmode_quirk radeon_agpmode_quirk_list[] = { /* Intel E7505 Memory Controller Hub / RV350 AR [Radeon 9600XT] Needs AGPMode 4 (deb #515326) */ @@ -10847,6 +11025,8 @@ /* Intel 82855PM Processor to I/O Controller / Mobility M6 LY Needs AGPMode 1 (deb #467235) */ - { PCI_VENDOR_INTEL,0x3340, PCI_VENDOR_ATI,0x4c59, 0x1014,0x052f, 1 }, + { PCI_VENDOR_INTEL,0x3340, PCI_VENDOR_ATI,0x4c59, PCI_VENDOR_IBM,0x052f, 1 }, ++ /* Intel 82855PM host bridge / Mobility 9600 M10 RV350 Needs AGPMode 1 (lp #195051) */ ++ { PCI_VENDOR_INTEL,0x3340, PCI_VENDOR_ATI,0x4e50, PCI_VENDOR_IBM,0x0550, 1 }, + /* Intel 82855PM host bridge / Mobility M9+ / VaioPCG-V505DX Needs AGPMode 2 (fdo #17928) */ + { PCI_VENDOR_INTEL,0x3340, PCI_VENDOR_ATI,0x5c61, PCI_VENDOR_SONY,0x816b, 2 }, /* Intel 82855PM Processor to I/O Controller / Mobility M9+ Needs AGPMode 8 (phoronix forum) */ @@ -10914,7 +11094,7 @@ { 0, 0, 0, 0, 0, 0, 0 }, }; -@@ -790,92 +800,96 @@ static Bool RADEONSetAgpMode(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -790,92 +802,96 @@ static Bool RADEONSetAgpMode(RADEONInfoPtr info, ScreenPtr pScreen) unsigned long mode = drmAgpGetMode(info->dri->drmFD); /* Default mode */ unsigned int vendor = drmAgpVendorId(info->dri->drmFD); unsigned int device = drmAgpDeviceId(info->dri->drmFD); @@ -11089,7 +11269,7 @@ xf86DrvMsg(pScreen->myNum, X_INFO, "[agp] Mode 0x%08lx [AGP 0x%04x/0x%04x; Card 0x%04x/0x%04x 0x%04x/0x%04x]\n", -@@ -910,6 +924,9 @@ static void RADEONSetAgpBase(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -910,6 +926,9 @@ static void RADEONSetAgpBase(RADEONInfoPtr info, ScreenPtr pScreen) ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; unsigned char *RADEONMMIO = info->MMIO; @@ -11099,7 +11279,7 @@ /* drm already does this, so we can probably remove this. * agp_base_2 ? */ -@@ -1183,13 +1200,14 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1183,13 +1202,14 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) drm_radeon_init_t drmInfo; memset(&drmInfo, 0, sizeof(drm_radeon_init_t)); @@ -11120,7 +11300,7 @@ drmInfo.sarea_priv_offset = sizeof(XF86DRISAREARec); drmInfo.is_pci = (info->cardType!=CARD_AGP); -@@ -1223,7 +1241,8 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1223,7 +1243,8 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) * registers back to their default values, so we need to restore * those engine register here. */ @@ -11130,7 +11310,7 @@ return TRUE; } -@@ -1299,14 +1318,16 @@ static void RADEONDRIIrqInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1299,14 +1320,16 @@ static void RADEONDRIIrqInit(RADEONInfoPtr info, ScreenPtr pScreen) "[drm] falling back to irq-free operation\n"); info->dri->irq = 0; } else { @@ -11155,7 +11335,7 @@ } } -@@ -1840,7 +1861,8 @@ void RADEONDRIResume(ScreenPtr pScreen) +@@ -1840,7 +1863,8 @@ void RADEONDRIResume(ScreenPtr pScreen) /* FIXME: return? */ } @@ -11166,7 +11346,7 @@ RADEONDRICPInit(pScrn); } diff --git a/src/radeon_driver.c b/src/radeon_driver.c -index 32cb307..7cac321 100644 +index 32cb307..0842164 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -578,7 +578,7 @@ unsigned RADEONINMC(ScrnInfoPtr pScrn, int addr) @@ -11432,19 +11612,32 @@ return FALSE; } } -@@ -2336,7 +2345,10 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn) - xf86DrvMsg(pScrn->scrnIndex, from, "Page Flipping %sabled%s\n", - info->dri->allowPageFlip ? "en" : "dis", reason); +@@ -2952,6 +2961,24 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) + goto fail; + } + ++ /* fix up cloning on rn50 cards ++ * since they only have one crtc sometimes the xserver doesn't assign ++ * a crtc to one of the outputs even though both outputs have common modes ++ * which results in only one monitor being enabled. Assign a crtc here so ++ * that both outputs light up. ++ */ ++ if (info->ChipFamily == CHIP_FAMILY_RV100 && !pRADEONEnt->HasCRTC2) { ++ int i; ++ ++ for (i = 0; i < xf86_config->num_output; i++) { ++ xf86OutputPtr output = xf86_config->output[i]; ++ ++ /* XXX: double check crtc mode */ ++ if ((output->probed_modes != NULL) && (output->crtc == NULL)) ++ output->crtc = xf86_config->crtc[0]; ++ } ++ } ++ + ErrorF("after xf86InitialConfiguration\n"); -- info->DMAForXv = TRUE; -+ if (info->ChipFamily >= CHIP_FAMILY_R600) -+ info->DMAForXv = FALSE; -+ else -+ info->DMAForXv = TRUE; - from = xf86GetOptValBool(info->Options, OPTION_XV_DMA, &info->DMAForXv) - ? X_CONFIG : X_INFO; - xf86DrvMsg(pScrn->scrnIndex, from, -@@ -3644,11 +3656,9 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, + RADEONSetPitch(pScrn); +@@ -3644,11 +3671,9 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, RADEONDGAInit(pScreen); /* Init Xv */ @@ -11459,7 +11652,7 @@ if (info->r600_shadow_fb == TRUE) { if (!shadowSetup(pScreen)) { -@@ -3771,9 +3781,10 @@ void RADEONRestoreMemMapRegisters(ScrnInfoPtr pScrn, +@@ -3771,9 +3796,10 @@ void RADEONRestoreMemMapRegisters(ScrnInfoPtr pScrn, } else { OUTREG(R600_HDP_NONSURFACE_BASE, (restore->mc_fb_location << 16) & 0xff0000); } @@ -11472,7 +11665,7 @@ } } else { -@@ -3958,7 +3969,7 @@ static void RADEONAdjustMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save) +@@ -3958,7 +3984,7 @@ static void RADEONAdjustMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save) } #ifdef USE_EXA @@ -11481,7 +11674,7 @@ { drm_radeon_getparam_t gp; int gart_base; -@@ -4419,15 +4430,40 @@ avivo_save(ScrnInfoPtr pScrn, RADEONSavePtr save) +@@ -4419,15 +4445,40 @@ avivo_save(ScrnInfoPtr pScrn, RADEONSavePtr save) state->aux_cntl2[j] = INREG(i + 0x040); state->aux_cntl3[j] = INREG(i + 0x400); state->aux_cntl4[j] = INREG(i + 0x440); @@ -11526,7 +11719,7 @@ } j = 0; /* save PHY,LINK regs */ -@@ -4770,15 +4806,40 @@ avivo_restore(ScrnInfoPtr pScrn, RADEONSavePtr restore) +@@ -4770,15 +4821,40 @@ avivo_restore(ScrnInfoPtr pScrn, RADEONSavePtr restore) OUTREG((i + 0x040), state->aux_cntl2[j]); OUTREG((i + 0x400), state->aux_cntl3[j]); OUTREG((i + 0x440), state->aux_cntl4[j]); @@ -11571,7 +11764,7 @@ } j = 0; /* save PHY,LINK regs */ -@@ -5046,8 +5107,10 @@ static void RADEONRestore(ScrnInfoPtr pScrn) +@@ -5046,8 +5122,10 @@ static void RADEONRestore(ScrnInfoPtr pScrn) "RADEONRestore\n"); #if X_BYTE_ORDER == X_BIG_ENDIAN @@ -11584,7 +11777,7 @@ #endif RADEONBlank(pScrn); -@@ -5220,7 +5283,8 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +@@ -5220,7 +5298,8 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) if (info->accelOn) { RADEON_SYNC(info, pScrn); @@ -11594,7 +11787,7 @@ } #ifdef XF86DRI -@@ -5424,6 +5488,10 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags) +@@ -5424,6 +5503,10 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags) xf86OutputPtr output = config->output[config->compat_output]; xf86CrtcPtr crtc = output->crtc; @@ -11605,7 +11798,7 @@ #ifdef XF86DRI if (info->cp->CPStarted && pScrn->pScreen) DRILock(pScrn->pScreen, 0); #endif -@@ -5536,9 +5604,12 @@ Bool RADEONEnterVT(int scrnIndex, int flags) +@@ -5536,9 +5619,12 @@ Bool RADEONEnterVT(int scrnIndex, int flags) if (info->adaptor) RADEONResetVideo(pScrn); @@ -11764,7 +11957,7 @@ ExaOffscreenArea *area = mem_struct; diff --git a/src/radeon_modes.c b/src/radeon_modes.c -index e06f8dd..0a8fa00 100644 +index e06f8dd..ec60cc9 100644 --- a/src/radeon_modes.c +++ b/src/radeon_modes.c @@ -65,15 +65,19 @@ void RADEONSetPitch (ScrnInfoPtr pScrn) @@ -11796,11 +11989,113 @@ dummy = (pScrn->virtualX + pitch_mask) & ~pitch_mask; pScrn->displayWidth = dummy; info->CurrentLayout.displayWidth = pScrn->displayWidth; +@@ -411,6 +415,56 @@ RADEONUpdatePanelSize(xf86OutputPtr output) + } + } + ++static void ++radeon_add_common_modes(xf86OutputPtr output, DisplayModePtr modes) ++{ ++ RADEONOutputPrivatePtr radeon_output = output->driver_private; ++ radeon_native_mode_ptr native_mode = &radeon_output->native_mode; ++ DisplayModePtr last = NULL; ++ DisplayModePtr new = NULL; ++ DisplayModePtr first = NULL; ++ int i; ++ /* Add some common sizes */ ++ int widths[15] = {640, 800, 1024, 1152, 1280, 1280, 1280, 1280, 1280, 1440, 1400, 1680, 1600, 1920, 1920}; ++ int heights[15] = {480, 600, 768, 768, 720, 800, 854, 960, 1024, 900, 1050, 1050, 1200, 1080, 1200}; ++ ++ for (i = 0; i < 15; i++) { ++ if (radeon_output->active_device & (ATOM_DEVICE_LCD_SUPPORT)) { ++ /* already added the native mode */ ++ if (widths[i] == native_mode->PanelXRes && heights[i] == native_mode->PanelYRes) ++ continue; ++ ++ /* Note: We allow all non-standard modes as long as they do not ++ * exceed the native resolution of the panel. Since these modes ++ * need the internal RMX unit in the video chips (and there is ++ * only one per card), this will only apply to the primary head. ++ */ ++ if (widths[i] < 320 || widths[i] > native_mode->PanelXRes || ++ heights[i] < 200 || heights[i] > native_mode->PanelYRes) ++ continue; ++ } ++ ++ new = xf86CVTMode(widths[i], heights[i], 60.0, FALSE, FALSE); ++ ++ new->type = M_T_DRIVER; ++ ++ new->next = NULL; ++ new->prev = last; ++ ++ if (last) last->next = new; ++ last = new; ++ if (!first) first = new; ++ } ++ ++ if (last) { ++ last->next = NULL; //first; ++ first->prev = NULL; //last; ++ } ++ ++ xf86ModesAdd(modes, first); ++ ++} ++ + DisplayModePtr + RADEONProbeOutputModes(xf86OutputPtr output) + { +@@ -459,12 +513,16 @@ RADEONProbeOutputModes(xf86OutputPtr output) + if (radeon_output->active_device & (ATOM_DEVICE_LCD_SUPPORT)) + modes = RADEONFPNativeMode(output); + /* add the screen modes */ +- RADEONAddScreenModes(output, &modes); ++ if (modes == NULL) ++ RADEONAddScreenModes(output, &modes); + } + } + } + } + ++ if (radeon_output->active_device & (ATOM_DEVICE_LCD_SUPPORT)) ++ radeon_add_common_modes(output, modes); ++ + return modes; + } + diff --git a/src/radeon_output.c b/src/radeon_output.c -index 352519f..897c6a2 100644 +index 352519f..fcf22ef 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c -@@ -1147,7 +1147,7 @@ radeon_create_resources(xf86OutputPtr output) +@@ -255,7 +255,11 @@ radeon_ddc_connected(xf86OutputPtr output) + MonType = MT_DFP; + break; + case CONNECTOR_DISPLAY_PORT: +- MonType = MT_DP; ++ /* ++ * XXX wrong. need to infer based on whether we got DDC from I2C ++ * or AUXCH. ++ */ ++ MonType = MT_DFP; + case CONNECTOR_DVI_I: + if (MonInfo->rawData[0x14] & 0x80) /* if it's digital and DVI */ + MonType = MT_DFP; +@@ -399,6 +403,13 @@ radeon_mode_valid(xf86OutputPtr output, DisplayModePtr pMode) + } + } + ++ if (radeon_output->ConnectorType == CONNECTOR_DISPLAY_PORT && ++ radeon_output->MonType == MT_DFP) { ++ /* DP to DVI converter, single-link only */ ++ if (pMode->Clock > 165000) ++ return MODE_CLOCK_HIGH; ++ } ++ + if (radeon_output->active_device & (ATOM_DEVICE_LCD_SUPPORT)) { + if (radeon_output->rmx_type == RMX_OFF) { + if (pMode->HDisplay != native_mode->PanelXRes || +@@ -1147,7 +1158,7 @@ radeon_create_resources(xf86OutputPtr output) } #endif @@ -11809,11 +12104,150 @@ load_detection_atom = MAKE_ATOM("load_detection"); range[0] = 0; /* off */ +@@ -1465,6 +1476,11 @@ radeon_set_property(xf86OutputPtr output, Atom property, + radeon_output->rmx_type = RMX_FULL; + } else if (value->size == strlen("center") && !strncmp("center", s, strlen("center"))) { + radeon_output->rmx_type = RMX_CENTER; ++ } else if (value->size == strlen("aspect") && !strncmp("aspect", s, strlen("aspect"))) { ++ if (IS_AVIVO_VARIANT) ++ radeon_output->rmx_type = RMX_ASPECT; ++ else ++ return FALSE; + } else if (value->size == strlen("off") && !strncmp("off", s, strlen("off"))) { + radeon_output->rmx_type = RMX_OFF; + } else +@@ -2500,6 +2516,14 @@ radeon_output_clones (ScrnInfoPtr pScrn, xf86OutputPtr output) + return index_mask; + } + ++static xf86OutputPtr ++RADEONOutputCreate(ScrnInfoPtr pScrn, const char *name, int i) ++{ ++ char buf[32]; ++ sprintf(buf, name, i); ++ return xf86OutputCreate(pScrn, &radeon_output_funcs, buf); ++} ++ + /* + * initialise the static data sos we don't have to re-do at randr change */ + Bool RADEONSetupConnectors(ScrnInfoPtr pScrn) +@@ -2512,6 +2536,7 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn) + int num_vga = 0; + int num_dvi = 0; + int num_hdmi = 0; ++ int num_dp = 0; + + /* We first get the information about all connectors from BIOS. + * This is how the card is phyiscally wired up. +@@ -2648,15 +2673,18 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn) + + for (i = 0; i < RADEON_MAX_BIOS_CONNECTOR; i++) { + if (info->BiosConnector[i].valid) { +- if ((info->BiosConnector[i].ConnectorType == CONNECTOR_DVI_D) || +- (info->BiosConnector[i].ConnectorType == CONNECTOR_DVI_I) || +- (info->BiosConnector[i].ConnectorType == CONNECTOR_DVI_A)) { ++ RADEONConnectorType conntype = info->BiosConnector[i].ConnectorType; ++ if ((conntype == CONNECTOR_DVI_D) || ++ (conntype == CONNECTOR_DVI_I) || ++ (conntype == CONNECTOR_DVI_A)) { + num_dvi++; +- } else if (info->BiosConnector[i].ConnectorType == CONNECTOR_VGA) { ++ } else if (conntype == CONNECTOR_VGA) { + num_vga++; +- } else if ((info->BiosConnector[i].ConnectorType == CONNECTOR_HDMI_TYPE_A) || +- (info->BiosConnector[i].ConnectorType == CONNECTOR_HDMI_TYPE_B)) { ++ } else if ((conntype == CONNECTOR_HDMI_TYPE_A) || ++ (conntype == CONNECTOR_HDMI_TYPE_B)) { + num_hdmi++; ++ } else if (conntype == CONNECTOR_DISPLAY_PORT) { ++ num_dp++; + } + } + } +@@ -2664,8 +2692,9 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn) + for (i = 0 ; i < RADEON_MAX_BIOS_CONNECTOR; i++) { + if (info->BiosConnector[i].valid) { + RADEONOutputPrivatePtr radeon_output; ++ RADEONConnectorType conntype = info->BiosConnector[i].ConnectorType; + +- if (info->BiosConnector[i].ConnectorType == CONNECTOR_NONE) ++ if (conntype == CONNECTOR_NONE) + continue; + + radeon_output = xnfcalloc(sizeof(RADEONOutputPrivateRec), 1); +@@ -2673,7 +2702,7 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn) + return FALSE; + } + radeon_output->MonType = MT_UNKNOWN; +- radeon_output->ConnectorType = info->BiosConnector[i].ConnectorType; ++ radeon_output->ConnectorType = conntype; + radeon_output->devices = info->BiosConnector[i].devices; + radeon_output->ddc_i2c = info->BiosConnector[i].ddc_i2c; + radeon_output->igp_lane_info = info->BiosConnector[i].igp_lane_info; +@@ -2682,33 +2711,21 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn) + radeon_output->linkb = info->BiosConnector[i].linkb; + radeon_output->connector_id = info->BiosConnector[i].connector_object; + +- if ((info->BiosConnector[i].ConnectorType == CONNECTOR_DVI_D) || +- (info->BiosConnector[i].ConnectorType == CONNECTOR_DVI_I) || +- (info->BiosConnector[i].ConnectorType == CONNECTOR_DVI_A)) { +- if (num_dvi > 1) { +- output = xf86OutputCreate(pScrn, &radeon_output_funcs, "DVI-1"); +- num_dvi--; +- } else { +- output = xf86OutputCreate(pScrn, &radeon_output_funcs, "DVI-0"); +- } +- } else if (info->BiosConnector[i].ConnectorType == CONNECTOR_VGA) { +- if (num_vga > 1) { +- output = xf86OutputCreate(pScrn, &radeon_output_funcs, "VGA-1"); +- num_vga--; +- } else { +- output = xf86OutputCreate(pScrn, &radeon_output_funcs, "VGA-0"); +- } +- } else if ((info->BiosConnector[i].ConnectorType == CONNECTOR_HDMI_TYPE_A) || +- (info->BiosConnector[i].ConnectorType == CONNECTOR_HDMI_TYPE_B)) { +- if (num_hdmi > 1) { +- output = xf86OutputCreate(pScrn, &radeon_output_funcs, "HDMI-1"); +- num_hdmi--; +- } else { +- output = xf86OutputCreate(pScrn, &radeon_output_funcs, "HDMI-0"); +- } +- } else +- output = xf86OutputCreate(pScrn, &radeon_output_funcs, +- ConnectorTypeName[radeon_output->ConnectorType]); ++ if ((conntype == CONNECTOR_DVI_D) || ++ (conntype == CONNECTOR_DVI_I) || ++ (conntype == CONNECTOR_DVI_A)) { ++ output = RADEONOutputCreate(pScrn, "DVI-%d", --num_dvi); ++ } else if (conntype == CONNECTOR_VGA) { ++ output = RADEONOutputCreate(pScrn, "VGA-%d", --num_vga); ++ } else if ((conntype == CONNECTOR_HDMI_TYPE_A) || ++ (conntype == CONNECTOR_HDMI_TYPE_B)) { ++ output = RADEONOutputCreate(pScrn, "HDMI-%d", --num_hdmi); ++ } else if (conntype == CONNECTOR_DISPLAY_PORT) { ++ output = RADEONOutputCreate(pScrn, "DisplayPort-%d", --num_dp); ++ } else { ++ output = RADEONOutputCreate(pScrn, ++ ConnectorTypeName[conntype], 0); ++ } + + if (!output) { + return FALSE; diff --git a/src/radeon_probe.h b/src/radeon_probe.h -index 447ef57..f072b9c 100644 +index 447ef57..afc8e21 100644 --- a/src/radeon_probe.h +++ b/src/radeon_probe.h -@@ -373,7 +373,7 @@ struct avivo_state +@@ -101,7 +101,8 @@ typedef enum + { + RMX_OFF, + RMX_FULL, +- RMX_CENTER ++ RMX_CENTER, ++ RMX_ASPECT + } RADEONRMXType; + + typedef struct { +@@ -373,7 +374,7 @@ struct avivo_state /* dvoa */ uint32_t dvoa[16]; @@ -11822,7 +12256,7 @@ uint32_t fmt1[18]; uint32_t fmt2[18]; uint32_t dig1[19]; -@@ -384,9 +384,15 @@ struct avivo_state +@@ -384,9 +385,15 @@ struct avivo_state uint32_t aux_cntl2[14]; uint32_t aux_cntl3[14]; uint32_t aux_cntl4[14]; @@ -11938,7 +12372,7 @@ + #endif diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c -index 7712344..cbedb7e 100644 +index 7712344..2df299f 100644 --- a/src/radeon_textured_video.c +++ b/src/radeon_textured_video.c @@ -36,6 +36,7 @@ @@ -11974,16 +12408,16 @@ static Bool RADEONTilingEnabled(ScrnInfoPtr pScrn, PixmapPtr pPix) { -@@ -146,6 +159,56 @@ static __inline__ uint32_t F_TO_24(float val) +@@ -146,6 +159,132 @@ static __inline__ uint32_t F_TO_24(float val) #endif /* XF86DRI */ +static void -+R600CopyPlanar(ScrnInfoPtr pScrn, -+ unsigned char *y_src, unsigned char *u_src, unsigned char *v_src, -+ uint32_t dst_mc_addr, -+ int srcPitch, int srcPitch2, int dstPitch, -+ int w, int h) ++R600CopyPlanarHW(ScrnInfoPtr pScrn, ++ unsigned char *y_src, unsigned char *u_src, unsigned char *v_src, ++ uint32_t dst_mc_addr, ++ int srcPitch, int srcPitch2, int dstPitch, ++ int w, int h) +{ + int dstPitch2 = dstPitch >> 1; + int h2 = h >> 1; @@ -12014,10 +12448,10 @@ +} + +static void -+R600CopyPacked(ScrnInfoPtr pScrn, -+ unsigned char *src, uint32_t dst_mc_addr, -+ int srcPitch, int dstPitch, -+ int w, int h) ++R600CopyPackedHW(ScrnInfoPtr pScrn, ++ unsigned char *src, uint32_t dst_mc_addr, ++ int srcPitch, int dstPitch, ++ int w, int h) +{ + + /* YUV */ @@ -12028,10 +12462,86 @@ + +} + ++static void ++R600CopyPlanarSW(ScrnInfoPtr pScrn, ++ unsigned char *y_src, unsigned char *u_src, unsigned char *v_src, ++ unsigned char *dst, ++ int srcPitch, int srcPitch2, int dstPitch, ++ int w, int h) ++{ ++ int i; ++ int dstPitch2 = dstPitch >> 1; ++ int h2 = h >> 1; ++ ++ /* Y */ ++ if (srcPitch == dstPitch) { ++ memcpy(dst, y_src, srcPitch * h); ++ dst += (dstPitch * h); ++ } else { ++ for (i = 0; i < h; i++) { ++ memcpy(dst, y_src, srcPitch); ++ y_src += srcPitch; ++ dst += dstPitch; ++ } ++ } ++ ++ /* tex base need 256B alignment */ ++ if (h & 1) ++ dst += dstPitch; ++ ++ /* V */ ++ if (srcPitch2 == dstPitch2) { ++ memcpy(dst, v_src, srcPitch2 * h2); ++ dst += (dstPitch2 * h2); ++ } else { ++ for (i = 0; i < h2; i++) { ++ memcpy(dst, v_src, srcPitch2); ++ v_src += srcPitch2; ++ dst += dstPitch2; ++ } ++ } ++ ++ /* tex base need 256B alignment */ ++ if (h2 & 1) ++ dst += dstPitch2; ++ ++ /* U */ ++ if (srcPitch2 == dstPitch2) { ++ memcpy(dst, u_src, srcPitch2 * h2); ++ dst += (dstPitch2 * h2); ++ } else { ++ for (i = 0; i < h2; i++) { ++ memcpy(dst, u_src, srcPitch2); ++ u_src += srcPitch2; ++ dst += dstPitch2; ++ } ++ } ++} ++ ++static void ++R600CopyPackedSW(ScrnInfoPtr pScrn, ++ unsigned char *src, unsigned char *dst, ++ int srcPitch, int dstPitch, ++ int w, int h) ++{ ++ int i; ++ ++ if (srcPitch == dstPitch) { ++ memcpy(dst, src, srcPitch * h); ++ dst += (dstPitch * h); ++ } else { ++ for (i = 0; i < h; i++) { ++ memcpy(dst, src, srcPitch); ++ src += srcPitch; ++ dst += dstPitch; ++ } ++ } ++} ++ static int RADEONPutImageTextured(ScrnInfoPtr pScrn, short src_x, short src_y, -@@ -214,7 +277,10 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, +@@ -214,7 +353,10 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, break; } @@ -12043,7 +12553,7 @@ if (pPriv->video_memory != NULL && size != pPriv->size) { radeon_legacy_free_memory(pScrn, pPriv->video_memory); -@@ -222,16 +288,21 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, +@@ -222,16 +364,21 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, } if (pPriv->video_memory == NULL) { @@ -12069,7 +12579,7 @@ pPriv->bicubic_enabled = FALSE; if (pPriv->bicubic_enabled && (pPriv->bicubic_state == BICUBIC_AUTO)) { /* -@@ -280,7 +351,10 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, +@@ -280,7 +427,10 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left; pPriv->src_offset = pPriv->video_offset + info->fbLocation + pScrn->fbOffset; @@ -12081,7 +12591,7 @@ pPriv->src_pitch = dstPitch; pPriv->size = size; pPriv->pDraw = pDraw; -@@ -294,29 +368,51 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, +@@ -294,35 +444,77 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, switch(id) { case FOURCC_YV12: case FOURCC_I420: @@ -12101,17 +12611,29 @@ + if (info->ChipFamily >= CHIP_FAMILY_R600) { + s2offset = srcPitch * height; + s3offset = (srcPitch2 * (height >> 1)) + s2offset; -+ if (id == FOURCC_YV12) -+ R600CopyPlanar(pScrn, buf, buf + s3offset, buf + s2offset, -+ pPriv->src_offset, -+ srcPitch, srcPitch2, pPriv->src_pitch, -+ width, height); -+ else -+ R600CopyPlanar(pScrn, buf, buf + s2offset, buf + s3offset, -+ pPriv->src_offset, -+ srcPitch, srcPitch2, pPriv->src_pitch, -+ width, height); -+ ++ if (info->DMAForXv) { ++ if (id == FOURCC_YV12) ++ R600CopyPlanarHW(pScrn, buf, buf + s3offset, buf + s2offset, ++ pPriv->src_offset, ++ srcPitch, srcPitch2, pPriv->src_pitch, ++ width, height); ++ else ++ R600CopyPlanarHW(pScrn, buf, buf + s2offset, buf + s3offset, ++ pPriv->src_offset, ++ srcPitch, srcPitch2, pPriv->src_pitch, ++ width, height); ++ } else { ++ if (id == FOURCC_YV12) ++ R600CopyPlanarSW(pScrn, buf, buf + s3offset, buf + s2offset, ++ pPriv->src_addr, ++ srcPitch, srcPitch2, pPriv->src_pitch, ++ width, height); ++ else ++ R600CopyPlanarSW(pScrn, buf, buf + s2offset, buf + s3offset, ++ pPriv->src_addr, ++ srcPitch, srcPitch2, pPriv->src_pitch, ++ width, height); ++ } + } else { + top &= ~1; + nlines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top; @@ -12141,9 +12663,14 @@ - nlines = ((y2 + 0xffff) >> 16) - top; - RADEONCopyData(pScrn, buf, pPriv->src_addr, srcPitch, dstPitch, nlines, npixels, 2); + if (info->ChipFamily >= CHIP_FAMILY_R600) { -+ R600CopyPacked(pScrn, buf, pPriv->src_offset, -+ 2 * width, pPriv->src_pitch, -+ width, height); ++ if (info->DMAForXv) ++ R600CopyPackedHW(pScrn, buf, pPriv->src_offset, ++ 2 * width, pPriv->src_pitch, ++ width, height); ++ else ++ R600CopyPackedSW(pScrn, buf, pPriv->src_addr, ++ 2 * width, pPriv->src_pitch, ++ width, height); + } else { + nlines = ((y2 + 0xffff) >> 16) - top; + RADEONCopyData(pScrn, buf, pPriv->src_addr, srcPitch, dstPitch, nlines, npixels, 2); @@ -12151,7 +12678,18 @@ break; } -@@ -340,7 +436,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, + /* Upload bicubic filter tex */ +- if (pPriv->bicubic_enabled) +- RADEONCopyData(pScrn, (uint8_t *)bicubic_tex_512, (uint8_t *)(info->FB + pPriv->bicubic_offset), 1024, 1024, 1, 512, 2); ++ if (pPriv->bicubic_enabled) { ++ if (info->ChipFamily < CHIP_FAMILY_R600) ++ RADEONCopyData(pScrn, (uint8_t *)bicubic_tex_512, ++ (uint8_t *)(info->FB + pPriv->bicubic_offset), 1024, 1024, 1, 512, 2); ++ } + + /* update cliplist */ + if (!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) { +@@ -340,7 +532,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, pPriv->h = height; #ifdef XF86DRI @@ -12162,7 +12700,7 @@ RADEONDisplayTexturedVideoCP(pScrn, pPriv); else #endif -@@ -370,6 +468,16 @@ static XF86VideoEncodingRec DummyEncodingR500[1] = +@@ -370,6 +564,16 @@ static XF86VideoEncodingRec DummyEncodingR500[1] = } }; @@ -12179,7 +12717,7 @@ #define NUM_FORMATS 3 static XF86VideoFormatRec Formats[NUM_FORMATS] = -@@ -471,7 +579,9 @@ RADEONSetupImageTexturedVideo(ScreenPtr pScreen) +@@ -471,7 +675,9 @@ RADEONSetupImageTexturedVideo(ScreenPtr pScreen) adapt->flags = 0; adapt->name = "Radeon Textured Video"; adapt->nEncodings = 1; @@ -12190,15 +12728,6 @@ adapt->pEncodings = DummyEncodingR500; else adapt->pEncodings = DummyEncoding; -@@ -483,7 +593,7 @@ RADEONSetupImageTexturedVideo(ScreenPtr pScreen) - pPortPriv = - (RADEONPortPrivPtr)(&adapt->pPortPrivates[num_texture_ports]); - -- if (IS_R300_3D || IS_R500_3D) { -+ if (IS_R300_3D || IS_R500_3D || IS_R600_3D) { - adapt->pAttributes = Attributes_r300; - adapt->nAttributes = NUM_ATTRIBUTES_R300; - } else { diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c index c6ed472..f55ae12 100644 --- a/src/radeon_textured_videofuncs.c @@ -12230,3 +12759,16 @@ /* * Rendering of the actual polygon is done in two different +diff --git a/src/radeon_video.c b/src/radeon_video.c +index 2fb5fcc..92d1a71 100644 +--- a/src/radeon_video.c ++++ b/src/radeon_video.c +@@ -310,7 +310,7 @@ void RADEONInitVideo(ScreenPtr pScreen) + } else + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to set up textured video\n"); + } else +- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Textured video requires CP on R5xx/IGP\n"); ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Textured video requires CP on R5xx/R6xx/R7xx/IGP\n"); + } else + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Textured video disabled on RV250 due to HW bug\n"); + radeon-modeset.patch: Index: radeon-modeset.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- radeon-modeset.patch 5 Mar 2009 07:28:48 -0000 1.35 +++ radeon-modeset.patch 6 Mar 2009 23:50:06 -0000 1.36 @@ -1,904 +1,3 @@ -commit e66aba3c88e6bbd8abe0f481da28872fa17a4f57 -Author: Dave Airlie -Date: Thu Mar 5 16:05:41 2009 +1000 - - radeon: add support for relocatable CRTC inside VLINE - - We cannot let userspace decide which CRTC it wants because its userspace - and might not own the crtc, so we need to provide a way to relocate it - -commit 00c0032dac820986b84effdb37c5cc1884eabcaf -Author: Dave Airlie -Date: Tue Mar 3 15:30:21 2009 +1000 - - radeon: initial framebuffer resize support - - This relies on the kernel pinning everything which the latest - rawhide kernel should do fine - -commit 354303071be3e40e5cffb97e61d1ec6475ea4685 -Author: Dave Airlie -Date: Tue Mar 3 09:20:30 2009 +1000 - - radeon: do get sarea until we know we aren't DRI2 - -commit 908f5308463b69b89d8b7ff34b2f534fddf0fd77 -Author: Dave Airlie -Date: Tue Mar 3 09:12:30 2009 +1000 - - radeon: no need to do any of this for DRI2 - -commit 0b144608c88ce2dfc265873cd55608f5fbd179bd -Author: Dave Airlie -Date: Fri Feb 27 12:00:29 2009 +1000 - - fixup issues post rebase - -commit d6801eeb38720a7aec7c6392136382a006561a15 -Author: Dave Airlie -Date: Thu Feb 26 10:47:42 2009 +1000 - - radeon: don't init 3d engine in Xv path for drm mm - -commit f49b3d2a3b523cfc0ea3ec10ee1bdfdea0da9423 -Author: Dave Airlie -Date: Tue Feb 17 19:14:27 2009 +1000 - - radeon: fix vt switch for legacy paths - -commit cd0fd2b14d6b732e2852bf93cd4bd4cce79936bf -Author: Dave Airlie -Date: Tue Feb 17 19:13:05 2009 +1000 - - radeon: only init gart heap for non-kms - -commit 6d5fc6d6ca642ceda1351b941955614a792fc5ec -Author: Dave Airlie -Date: Sun Jan 11 09:29:44 2009 +1000 - - radeon: drop CS1 - -commit c1a806452b802f5284a113908109cf810d3b33be -Author: Jerome Glisse -Date: Wed Nov 12 14:36:52 2008 +0100 - - radeon: enable dri2 only if memory manager is present - (cherry picked from commit fd4bb9b7b639befd63e7acd37254011b9e46732d) - -commit 48c2d0902416bfed8a5d768ea1e923b5d34c6320 -Author: Jerome Glisse -Date: Mon Nov 10 22:16:57 2008 +0100 - - radeon: flush command stream in block handler and in dri2 copy callback - (cherry picked from commit 13fa5ab73a707af52e71af400ea186073022f8b7) - -commit 2ea27ca1bf6fa9e96703932981e57b11e653d6a3 -Author: Jerome Glisse -Date: Fri Nov 14 12:44:29 2008 +0100 - - radeon: bufmgr exa doesn't exist - (cherry picked from commit 8a00de47a186db1707b82a5977da8cbf2e8e0c80) - -commit 68b3becc0620c4357872ca034fc6ae5b41432591 -Author: Jerome Glisse -Date: Thu Nov 6 00:25:18 2008 +0100 - - radeon: initial dri2 support - -commit 1190226af0c2685557fe90cb0a5fd3446f31c672 -Author: Dave Airlie -Date: Mon Dec 1 19:15:41 2008 +1000 - - radeno: fixup unpinned buffers - (cherry picked from commit d9759ca976cad48e6c8fd3c7d17ce38588522c34) - -commit eb09bc9aaee774acff6d07cae0018d020ad3ec44 -Author: Dave Airlie -Date: Mon Dec 22 16:16:16 2008 +1000 - - radeon: fix for 1.6 server - -commit 068107ac540d8e7bd1781799fb2b3268f3d9fe34 -Author: Dave Airlie -Date: Fri Dec 19 12:37:01 2008 +1100 - - radeon: only do mappings if direct rendering is enabled - -commit fa8b8dc164393bc43c6f6273aeed50924bc1d6c1 -Author: Dave Airlie -Date: Tue Dec 9 13:29:18 2008 +1000 - - radeon: upstream fix for Init3D vs switch to/from 2d/3d - -commit 77034ccc327b54f2f6c643e3baa9f42477fa221c -Author: Dave Airlie -Date: Mon Dec 8 14:19:47 2008 +1000 - - radeon: only update dri buffers if DRI enabled - -commit 400bc21d00dfe433c3341f8c3be87f15c1b52fae -Author: Dave Airlie -Date: Mon Dec 1 15:31:08 2008 +1100 - - radeon: don't have 2D and 3D in one CS buffer - -commit c25a72d143129b4cd4c8a6c16c27d13b9b173e74 -Author: Dave Airlie -Date: Wed Nov 26 16:09:29 2008 +1100 - - radeon: set touched flag on pinned buffers - -commit 1d2a6732029a80e8c47fc1420186941eb8f210dc -Author: Dave Airlie -Date: Wed Nov 26 16:04:35 2008 +1100 - - radeon: fix up some of the touched by gpu handling and force gtt handling - - this fixes DFS on the rs690 - -commit 434c9f580cb7350510997070b191f3202e88d24b -Author: Dave Airlie -Date: Wed Nov 26 12:52:24 2008 +1100 - - radeon: brutal attempt to fix RS4xx and RS6xx by flushing more often - - this might take more CPU but hopefully leads to stabler GPU - -commit e6b95cd6c312e3ea785956f1d26f65724f66af46 -Author: Dave Airlie -Date: Sun Nov 23 17:56:02 2008 +1000 - - radeon: wait for rendering before doing UTS - -commit a80b03a333c17334400abe0ad65c8eacf203e4e7 -Author: Dave Airlie -Date: Sun Nov 23 17:54:27 2008 +1000 - - radeon: stop this_op_read from going negative - -commit d802c2d18b877b4f45057d550bf8e72136ca6143 -Author: Dave Airlie -Date: Sun Nov 23 17:52:42 2008 +1000 - - radeon: return flush for conflicting domains - -commit c96555c16890ccdb148fb3b84c7544786418a599 -Author: Dave Airlie -Date: Sun Nov 23 17:50:47 2008 +1000 - - radeon: only reset state2d before emitting cache flush - -commit 1c00a7c0b71cbf0161c21f3eab01670717b6fd81 -Author: Dave Airlie -Date: Thu Nov 20 16:48:33 2008 +1000 - - flush on UTS if any references - -commit 77cb0c5b5a1c0c4bcffbcfc0a0c55facdc0aa451 -Author: Dave Airlie -Date: Thu Nov 20 16:44:40 2008 +1000 - - radeon: add gart vs vram writes - -commit cdc160b2aa809f7c6cb6dd47083ea4ca0857eeac -Author: Dave Airlie -Date: Thu Nov 20 16:37:07 2008 +1000 - - radeon: improve DFS performance for non-vram objects - -commit 2ff1aa8bdd2f54b46291ce8b3b9683e01f959c7d -Author: Dave Airlie -Date: Wed Nov 19 14:49:44 2008 +1000 - - radeon: scrap state on LeaveVT not EnterVT - -commit a6023c6f60cb49db2479c9bd9ae1b09cfb5edf0d -Author: Dave Airlie -Date: Wed Nov 19 11:08:34 2008 +1000 - - radeon: even more typos - -commit 754d9743cafbae194e2060e1b119c3b78d0f66e5 -Author: Dave Airlie -Date: Wed Nov 19 07:51:03 2008 +1000 - - radeon: oops bad typo - -commit fb033bc3e6fe02dc98209efef3e5d21c7b885f89 -Author: Dave Airlie -Date: Tue Nov 18 16:09:10 2008 +1000 - - radeon: even if kernels fails, struggle onwards - - try and keep the session going even if visual glitches happen - -commit 5a444b214dc743e6e9eeceb30394a97ed2580cbc -Author: Dave Airlie -Date: Tue Nov 18 15:46:46 2008 +1000 - - radeon_bufmgr: much more complete size check functionality - -commit b64bca1a42abeff57e565f14fbf904329da9ebb5 -Author: Dave Airlie -Date: Tue Nov 18 14:33:44 2008 +1000 - - radeon: I fail at uint32_t division - -commit 551600d7f262f8e6b28d44f8682f2c20e856bc3f -Author: Dave Airlie -Date: Tue Nov 18 12:06:02 2008 +1000 - - radeon: workaround O(wtf) logic in post_submit bufmgr - -commit 960d79a125e983bc547fb308cc200246b20ffeb9 -Author: Dave Airlie -Date: Mon Nov 17 19:19:43 2008 +1000 - - radeon: set emit limit to 90% VRAM - -commit 0906e781b9cdbe6b6aac9e1331c10b258c495768 -Author: Dave Airlie -Date: Mon Nov 17 16:16:51 2008 +1000 - - radeon: use get/set master ioctls - -commit 10dfd9b73060daff0d5a63d108b3bb636d706e50 -Author: Dave Airlie -Date: Fri Nov 14 15:56:16 2008 +1000 - - radeon: make space accounting a lot smarter - -commit 4ea0d643a90c9ad6b9dfc52c3633101c0c1404be -Author: Dave Airlie -Date: Fri Nov 14 15:55:12 2008 +1000 - - radeon: retry on CS2 EAGAIN - -commit 156750c19cbebfde006c6025cee834021b0d591f -Author: Dave Airlie -Date: Fri Nov 14 15:20:59 2008 +1000 - - radeon: add src/mask/dest to fallbacks - -commit fa717f5f9c30af039eb5f6b47f26f63c0942156b -Author: Dave Airlie -Date: Fri Nov 14 15:20:37 2008 +1000 - - radeon_memory: align all allocations - -commit 24f17583021515c6d81d4009f84539a90a491195 -Author: Dave Airlie -Date: Fri Nov 14 11:03:34 2008 +1000 - - radeon: force gtt for mmap after fallbacks - -commit ed019780b9ef897f32d834b12c183d6734d4ecf7 -Author: Dave Airlie -Date: Mon Nov 10 14:18:17 2008 +1000 - - radeon: add more buffer info + fix read objects too big fallback - -commit 76154a56db2c4f86e61bf4310d6ea9bdb0f21ff0 -Author: Dave Airlie -Date: Mon Nov 10 11:47:02 2008 +1000 - - radeon: remove old exa bufmgr not used anymore code - -commit 140f511b2183ead469b61d3ffa71284fdc71b713 -Author: Dave Airlie -Date: Mon Nov 10 11:18:27 2008 +1000 - - radeon: fix crtc dpms - - need to find a better way to switch displays off - -commit 836e48ae2d8a53293d9d687724c0a25c9c5d50b5 -Author: Dave Airlie -Date: Sat Nov 8 14:48:29 2008 +1000 - - radeon: add DPMS support for connectors - -commit 2ffbd858a1f8d9906836ff5c5cdb922910e5c522 -Author: Dave Airlie -Date: Fri Nov 7 16:20:09 2008 +1000 - - radeon: fix rotation of right-of heads - -commit 66e6d3d4f16b10c1b1a1301874a95eefa0a95cbf -Author: Dave Airlie -Date: Mon Nov 3 14:51:43 2008 +1000 - - radeon: respect fb tex percent + trust kernel values - -commit bb967f80e260d5ba84b700cbebdfe83c882e4074 -Author: Dave Airlie -Date: Fri Oct 31 15:05:14 2008 +1000 - - radeon: remove workaround hack since kernel is hopefully fixed - -commit f2ea624ac7f8e397ebb8c2164edf77b90b14f583 -Author: Dave Airlie -Date: Fri Oct 31 15:04:31 2008 +1000 - - radeon: workaround use after free - -commit c39f256cb3f55b8856ff7a0cbbf425340694982f -Author: Dave Airlie -Date: Thu Oct 30 13:53:02 2008 +1000 - - radeon: setup accel dfs for PCIE cards only if drm_mm - -commit 55c6ca51207871f1a713f890b1d9eca0950699ca -Author: Dave Airlie -Date: Thu Oct 30 10:00:10 2008 +1000 - - radeon: fixup name handling for bufmgr - -commit a53e9ae9fdba42ee6d4ea8a8868fe94da5839ed0 -Author: Dave Airlie -Date: Thu Oct 30 09:59:11 2008 +1000 - - radeon: fix memory leak in CS2 code - -commit ffdb167bc74b6fdf1775e04c524d927bd248cac0 -Author: Dave Airlie -Date: Tue Oct 28 20:35:19 2008 +1000 - - return on empty IBs, flush happen in the kernel - -commit da8f605d63de37e7469d25afd3fa3a9f8d1f54b8 -Author: Dave Airlie -Date: Tue Oct 28 10:16:09 2008 +1000 - - radeon: remove some debugging - -commit c98d54139e40bcbe077be5096ef5cc8a9dbf03e7 -Author: Dave Airlie -Date: Tue Oct 28 06:40:31 2008 +1000 - - radeon: enable gem wait rendering. - -commit 3ae5a806eb8e7c4bcc08e214d3fdbdf4386304b6 -Author: Dave Airlie -Date: Mon Oct 27 16:51:00 2008 +1000 - - radeon: add new CS submission scheme - -commit 728361aa97b7fa6c7ca7f6ded9c9bb0b02d2782c -Author: Dave Airlie -Date: Thu Oct 23 17:05:12 2008 +1000 - - radeon: really rough effort at vram limit setting - -commit 03a1797d90ce550a2d5195dcd3a58abff8c7aebb -Author: Dave Airlie -Date: Thu Oct 23 17:04:51 2008 +1000 - - radeon: this shouldn't fail but it did once while debugging so patch up - -commit a0e577f5ab128b310ae00f0cabf072fc067d62b5 -Author: Dave Airlie -Date: Thu Oct 23 10:43:09 2008 +1000 - - radeon: fixup some memory allocation issues - - hopefully since the alignment got fixed this doesn't break anything - -commit e21dcdbeacf60bfebfc82c4119f2ad62e6b94c2f -Author: Dave Airlie -Date: Tue Oct 21 15:50:17 2008 +1000 - - radeon: cleanup reserved space calcs - -commit 37a44646ee3fca050fec56ee6cb6ccd7c3181673 -Author: Dave Airlie -Date: Tue Oct 21 15:49:48 2008 +1000 - - radeon: fixup Owen's optimisation - this fixes corruption - - I haven't a good explaination why mapping the buffer twice in a row - seems to cause this failure. but I probably don't have time to track - it down before release. - -commit e04c58e4f1b5fece2601603dd5d14fdfe92727d2 -Author: Dave Airlie -Date: Sun Oct 19 18:27:53 2008 +1000 - - radeon: fixup tex offset for no modeset - -commit 20521bd438fa3bbc00cc7c131ad143353c922d3d -Author: Dave Airlie -Date: Wed Oct 15 17:01:34 2008 +1000 - - radeon: add DFS support for CS - -commit a72197efa5acb5086ef1aad5596276addefe08ba -Author: airlied -Date: Wed Oct 15 23:55:13 2008 +1000 - - radeon: add r100/r200 support for EXA render - -commit b0afa63afc461fb61fc9a545ad7b31c4bdca28a5 -Author: Dave Airlie -Date: Mon Oct 13 16:59:02 2008 +1000 - - radeon: fix switch mode path so nexuiz starts - -commit 70ef5d335475b1bbab524a842a202b9776051921 -Author: Dave Airlie -Date: Fri Oct 10 15:29:24 2008 +1000 - - remove gem buf caching useless on radeon - -commit a433033f8c6d6d0b9a34689c0387e3043067535f -Author: Dave Airlie -Date: Fri Oct 10 15:18:41 2008 +1000 - - radeon: drmmode make names same as for non-kms drivers - -commit 4b8c3d5cedb4fc1f9872d35ab0b2fc462488e6a3 -Author: Dave Airlie -Date: Fri Oct 10 15:10:28 2008 +1000 - - radeon: fix rotation under kms - -commit 8f68fe2151503466e0e27b1d84c22f445952313e -Author: Dave Airlie -Date: Fri Oct 10 14:44:39 2008 +1000 - - radeon: remove testing fallback - -commit b656b31ac14003b1925656ab4941baff850b37dd -Author: Kristian H??gsberg -Date: Fri Oct 10 10:57:47 2008 +1100 - - radeon: add copy fb contents patch - -commit 5b30500df1595ac9fd4a4ebc555536a3736dc2a0 -Author: Dave Airlie -Date: Fri Oct 10 10:57:20 2008 +1100 - - bufmgr: turn off debug - -commit 15ebeac41bdf7a24389634db16284a0f0e0ff537 -Author: Dave Airlie -Date: Fri Oct 10 10:38:38 2008 +1100 - - radeon: fixup modesetting code after rebasing to master - -commit 8cad0abd7717e4d24201a19dd9921f8a28f8176d -Author: Dave Airlie -Date: Thu Oct 9 16:34:52 2008 +1100 - - radeon: misc cleanups in exa - -commit 4da0198297cd08d7c723a23c7c13beeccbb4d07f -Author: Dave Airlie -Date: Thu Oct 9 16:34:23 2008 +1100 - - radeon: fix UTS for non-modesetting - -commit 4d713860077916e547cec30441766aedd0ec54e5 -Author: Dave Airlie -Date: Thu Oct 9 16:33:59 2008 +1100 - - radeon: fix exa limits problem - shouldn't have been resetting scissor - -commit f4dcb33ab67d884a6cd2e6ad08e7a25870ff4b3a -Author: Dave Airlie -Date: Wed Oct 1 11:21:53 2008 +1000 - - radeon: fixup for latest libdrm changes - -commit 08139fafdc537de8d83054c7e63767b161016f5d -Author: Owen Taylor -Date: Fri Sep 26 16:17:49 2008 -0400 - - Don't flush when mapping a newly created pixmap into system ram If we have a pixmap that has never been mapped into vram (and thus never written to by the GPU), there is no need to flush the graphics pipeline and wait for idle before starting to write to it. - -commit c05eddc144ebc7187417ffa30927f9f1b116b2eb -Author: Dave Airlie -Date: Mon Sep 29 16:32:51 2008 +1000 - - radeon: hopefully fix textured xv - -commit 308d3c763e3e805fc06e4f83aaf6115c4c547b09 -Author: Dave Airlie -Date: Fri Sep 26 11:38:36 2008 +1000 - - radeon: fix the offset checks for command submission - - since we are relocating in the kernel we don't need these - -commit 5b6c1015fbe516d2581a2337e07e0e9b8412746b -Author: Dave Airlie -Date: Fri Sep 26 10:46:20 2008 +1000 - - radeon: fixup after mertge - -commit 5192b6bed534056d160341684b53cec6880eedf5 -Author: Dave Airlie -Date: Fri Sep 26 10:34:41 2008 +1000 - - radeon: fix issues with emitting DST PIPE on cards that don't use it - -commit 7741152ce929278f5768cbafcd3eeb22be84d36d -Author: Dave Airlie -Date: Wed Sep 24 17:12:19 2008 +1000 - - modesetting: fixup bits of drmmode_display.c - -commit 519250b04b5eccd42ac977052f16d29477b6fe45 -Author: Dave Airlie -Date: Wed Sep 24 15:42:01 2008 +1000 - - r600: fixup for kms - -commit a50fc6c938ec6774ce5eb901f957304b792456a4 -Author: Dave Airlie -Date: Sun Sep 7 08:01:56 2008 +1000 - - modeset: fix AddFB for current tree - -commit 1acfa20073823b399d72ab58d69f32b4d4ec2297 -Author: Dave Airlie -Date: Thu Aug 14 10:52:52 2008 +1000 - - radeon: disable overlay for modesetting for now - -commit c981de57577f6ea57ba455a414fc7eb015acfcbf -Author: Dave Airlie -Date: Thu Aug 14 10:52:42 2008 +1000 - - radeon: no need for this anymore - -commit 773fd7a81cd7404c4adcf0f549e710fcc03fca9f -Author: Dave Airlie -Date: Fri Sep 5 16:32:01 2008 +1000 - - radeon: fix up for suspend/resume - uses new API - -commit bbb87f49273cc12f366506ba52d976eefd4690f5 -Author: Dave Airlie -Date: Wed Aug 27 13:09:55 2008 +1000 - - radeon: update to proper domain - - this should fix 3d again for now at least - -commit 0dd982c1e3263a8e39c5ea9a6fe254275217725c -Author: Dave Airlie -Date: Tue Aug 26 18:29:23 2008 +1000 - - ddx: move to using new gem interface - - add a GEM bufmgr backend along the lines of Intels one. - - The buffer reuse is disabled and I'll probably rip it out for radeon - as we can't just re-use buffers that might have ended up in VRAM etc. - - Probably need some sort of in-kernel re-use. - -commit 0cc73177663be1897fbdaab57d6903dae7f6df1b -Author: Dave Airlie -Date: Mon Aug 25 11:37:48 2008 +1000 - - radeon: add an initial GEM bufmgr - -commit 5fef64ad52b7e91ea0e416b9d4e6d2c829ae8f07 -Author: Dave Airlie -Date: Mon Aug 25 11:37:20 2008 +1000 - - radeon: implement simple UTS - -commit 55565e480631ce30e1abfaf6e3220001006383fb -Author: Dave Airlie -Date: Fri Aug 22 15:34:58 2008 +1000 - - radeon: add read/write domains properly - -commit 5d318501c57643513a95622a6e795f0e305d7b48 -Author: Dave Airlie -Date: Fri Aug 15 11:25:31 2008 +1000 - - radeon: fix some rotate bugs - -commit 6671103f8e609d608c882c27de26b2f803c8edc2 -Author: Dave Airlie -Date: Fri Aug 15 11:16:18 2008 +1000 - - radeon: when create fake bos, they are already mapped - -commit 77b2173406ed875e8196fb734c2d1cdce582af1c -Author: Dave Airlie -Date: Fri Aug 15 11:15:58 2008 +1000 - - exa: remove wrong assert - -commit 750aca4cdc9f2d324a5d23c350a217261d3f5d84 -Author: Dave Airlie -Date: Tue Aug 12 19:27:44 2008 +1000 - - radeon: start to work on rotate pixmap support - -commit 927b541d3ef8c01887677dda54689ea2c38872bd -Author: Dave Airlie -Date: Tue Aug 12 18:28:23 2008 +1000 - - radeon: port simple exa bufmgr - - exa pixmaps work now but they are slow - -commit 09472769aa55bda09be76afd0fda1b1eb713a95c -Author: Dave Airlie -Date: Thu Aug 7 17:52:04 2008 +1000 - - further pixmaps on EXA - -commit 0c2079cc5c3ecdbd9a2b77103546540b22ad581e -Author: Dave Airlie -Date: Thu Aug 7 11:22:46 2008 +1000 - - initial exa on gem hackx - - Conflicts: - - src/radeon_exa.c - src/radeon_memory.c - -commit 77d86019b6881ac49c2a3397aaf6ff13ceae8f3d -Author: Dave Airlie -Date: Tue Aug 12 15:31:03 2008 +1000 - - radeon: initial rotate pixmap - - This doesn't work, we really need EXA pixmaps for this stuff - -commit aa89d1e78d34f4d9f86442135ebaa8b1b353b000 -Author: Dave Airlie -Date: Tue Aug 12 14:40:18 2008 +1000 - - radeon: use buffer names - -commit 47b650b53ca9cbf1298717ea49849a98f75ada55 -Author: Dave Airlie -Date: Tue Aug 12 14:38:56 2008 +1000 - - ati: fix do adjust mode - -commit 9aa2c37674e7e92a590f55f671aebf969b5a2653 -Author: Dave Airlie -Date: Tue Aug 12 09:38:48 2008 +1000 - - FEDORA: update offsets in DRI private - -commit 4a803ac551df2c84174faeaf45d9fcb35215dc95 -Author: Dave Airlie -Date: Tue Aug 12 09:10:18 2008 +1000 - - radeon: add vt bind flag - -commit 2dc1897cf0cf90ea7eea39ee70f10b0fccfef0a2 -Author: Dave Airlie -Date: Wed Aug 6 13:30:54 2008 +1000 - - radeon: warning cleanups - -commit f25d18044a08ecd451585162fe8d51129cbd65c8 -Author: Dave Airlie -Date: Wed Aug 6 13:18:52 2008 +1000 - - radeon: remove debugging - -commit 963d1a62cf51b834183dab1d3312ef20262c2ec4 -Author: Dave Airlie -Date: Wed Aug 6 13:17:31 2008 +1000 - - radeon: add code to set memory map and not futz with mappings - -commit 03c3c7aeff5108917a2d4283c1715f03c3f3b41d -Author: Dave Airlie -Date: Wed Aug 6 13:16:56 2008 +1000 - - drm: don't futz with framebuffer when no drm_mm - -commit 3b5773862110a7513801d1cd8929f5c33cb44208 -Author: Dave Airlie -Date: Tue Aug 5 16:47:21 2008 +1000 - - radeon: undef OUT_RELOC - -commit 55b5e2297b40ad4b296d91ce7d8520ec19cedbea -Author: Dave Airlie -Date: Tue Aug 5 16:37:52 2008 +1000 - - radeon: add stdint/lib to check for modesetting - -commit 0b515d8f217583ce432715b5d3abc8468597f60c -Author: Dave Airlie -Date: Tue Aug 5 16:07:31 2008 +1000 - - fix whitespace - -commit 6b492d113905257a1b12586eafb93a1c21649dfd -Author: Dave Airlie -Date: Tue Aug 5 16:07:07 2008 +1000 - - radeon: fix build issue - -commit c9ff3947e40716847fe1ce0187c83c073ba4d9c8 -Author: Dave Airlie -Date: Mon Aug 4 16:27:55 2008 +1000 - - radeon: free all pinned memory on server shutdown - -commit 8872b1bdc623eaccb746862d4e2d881afb1c3923 -Author: Dave Airlie -Date: Mon Aug 4 16:11:30 2008 +1000 - - radeon: get textured video working on the memory manager - -commit bf51c8f1d2023eec5ce9b621c3c2caf6ffc11cc8 -Author: Dave Airlie -Date: Mon Aug 4 16:11:18 2008 +1000 - - radeon: convert bus addr to void pointer - -commit e616681225088fdb6784c1df4cbbfa63b4d3bc1d -Author: Dave Airlie -Date: Mon Aug 4 15:11:13 2008 +1000 - - radeon: avoid z cache flushes if not needed - -commit efec614d5a5cab051968810a10f5dc1620a42146 -Author: Dave Airlie -Date: Wed Jul 30 17:04:22 2008 +1000 - - radeon: update DRI support, so mappings get added - - We only add fake frontbuffer mapping as DRI clients expect one. - -commit 23c37b78d7af1874e5a63251eb44231e91b8300c -Author: Dave Airlie -Date: Tue Jul 29 16:50:03 2008 +1000 - - radeon: exa through the handle relocation function - -commit d0527a52ee83562b442b006a59eb03f41c4889a5 -Author: Dave Airlie -Date: Tue Jul 29 14:58:22 2008 +1000 - - radeon: keep track of 2D state - - This lets the kernel use the 2D blit engine in theory - -commit 0d9dcbc26f04a606c498b47d1c0228a6906b9518 -Author: Dave Airlie -Date: Mon Jul 28 17:48:59 2008 +1000 - - new command submission attempt - -commit 69ce5d53c186bbd3dce93909e94f12855e6b296e -Author: Dave Airlie -Date: Mon Jul 28 17:48:08 2008 +1000 - - radeon: fixup over fluishing problem - -commit d92685f8f9bb7e240822bbdd1a1d2424542b7d50 -Author: Dave Airlie -Date: Mon Jul 28 17:44:51 2008 +1000 - - hack for now: divide texture size by 2 - -commit 2c0ce08b8e2e32e4cbaf6f4271ab95369da73954 -Author: Dave Airlie -Date: Fri Jul 25 17:07:20 2008 +1000 - - radeon: fix dri message - -commit 769fdab086f42d64cacf73fc07175a6811d6e3dd -Author: Dave Airlie -Date: Fri Jul 25 15:11:58 2008 +1000 - - radeon: fix pool which caused memory corruption - -commit 79ae58c84558ef4ad3c021f842b16c8621eb7d20 -Author: Dave Airlie -Date: Fri Jul 25 14:59:07 2008 +1000 - - radeon: get DRI to attempt to start up - -commit 80fae5b9af8b8d7a4907fae2d607668170de8d85 -Author: Dave Airlie -Date: Fri Jul 25 14:58:23 2008 +1000 - - radeon: call the right sync function - -commit 50497f43feb52ffc0cfa1420a6509e15b0bd2a82 -Author: Dave Airlie -Date: Fri Jul 25 14:57:21 2008 +1000 - - radeon: unmap memory from objects - -commit 02e4a3ab2f955415ca1b52f0c860d54edb60d99e -Author: Dave Airlie -Date: Wed Jul 23 10:59:16 2008 +1000 - - use CP for 3D engine with modeset - -commit b7c23b09e1ced1b36cafeb150c58605a4c7699c4 -Author: Dave Airlie -Date: Wed Jul 23 10:59:04 2008 +1000 - - radeon: fix DFS - -commit e3a5ff240714ea5871e95f2a8ba74c3419cf6bb7 -Author: Dave Airlie -Date: Wed Jul 23 10:48:45 2008 +1000 - - radeon: get the fb location right - -commit 2cb38725c09f6c80cdf7ef0db95e065f74a57cf4 -Author: Dave Airlie -Date: Tue Jul 22 18:08:25 2008 +1000 - - radeon: make at least the EXA stipple work.. - -commit bcf36a6c8360fcec90d2430d58b6ac8e282b57f8 -Author: Dave Airlie -Date: Tue Jul 22 18:07:15 2008 +1000 - - radeon: disable debugging for now - -commit 2598b49272cffc937bb2c449868d2e0dd2c4d719 -Author: Dave Airlie -Date: Mon Jul 21 18:40:14 2008 +1000 - - radeon: initial indirect buffer use. - - Move EXA and front allocation into one big buffer to workaround - EXA issues - need to move to driver pixmap hooks. - - Add new indirect GEM to take indirect buffers. - - doesn't work think the offsets are all wrong. - -commit 4a91206107a218747bea080f721dce253638eac4 -Author: Dave Airlie -Date: Fri Jul 18 13:46:41 2008 +1000 - - modesetting step 1: have X and a cursor - -commit 9a7fbdd2ccb4073f7cbcc48e8d65d430cbb08b3a -Author: Dave Airlie -Date: Thu Jul 17 09:59:19 2008 +1000 - - radeon: add radeon_memory.c - -commit e516b7612d2fcfe115306f8de049feebe463a0fd -Author: Dave Airlie -Date: Tue Jul 8 16:55:27 2008 +1000 - - remove mappings of some buffers. - - use drm gart code if available - -commit 2e0da77a17f9c6767a602e09ed60a5de91f3e5cb -Author: Dave Airlie -Date: Mon Jul 7 16:54:35 2008 +1000 - - add initial support for a kernel memory manager - - This just pins all the current allocations via the kernel memory manager - instead of trying to do them all in userspace. - - useful steps towards getting kernel modesetting - -commit a4a1143fbfd783a9278c8b9aa7997011c9f4852f -Author: Dave Airlie -Date: Fri Jul 4 10:39:34 2008 +1000 - - port to using drm header files diff --git a/configure.ac b/configure.ac index b094a50..29a19e3 100644 --- a/configure.ac @@ -3506,7 +2605,7 @@ xf86CrtcPtr crtc = xf86_config->crtc[c]; RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private; diff --git a/src/radeon_dri.c b/src/radeon_dri.c -index 45f79ed..318ebc0 100644 +index 2b7540c..6a24ae2 100644 --- a/src/radeon_dri.c +++ b/src/radeon_dri.c @@ -40,6 +40,8 @@ @@ -3750,7 +2849,7 @@ } /* AGP Mode Quirk List - Certain hostbridge/gfx-card combos don't work with -@@ -988,6 +1144,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -990,6 +1146,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) "[agp] ring handle = 0x%08x\n", (unsigned int)info->dri->ringHandle); @@ -3759,7 +2858,7 @@ if (drmMap(info->dri->drmFD, info->dri->ringHandle, info->dri->ringMapSize, &info->dri->ring) < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[agp] Could not map ring\n"); -@@ -996,9 +1154,10 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -998,9 +1156,10 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) xf86DrvMsg(pScreen->myNum, X_INFO, "[agp] Ring mapped at 0x%08lx\n", (unsigned long)info->dri->ring); @@ -3771,7 +2870,7 @@ xf86DrvMsg(pScreen->myNum, X_ERROR, "[agp] Could not add ring read ptr mapping\n"); return FALSE; -@@ -1007,6 +1166,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1009,6 +1168,8 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) "[agp] ring read ptr handle = 0x%08x\n", (unsigned int)info->dri->ringReadPtrHandle); @@ -3780,7 +2879,7 @@ if (drmMap(info->dri->drmFD, info->dri->ringReadPtrHandle, info->dri->ringReadMapSize, &info->dri->ringReadPtr) < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, -@@ -1016,6 +1177,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1018,6 +1179,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoPtr info, ScreenPtr pScreen) xf86DrvMsg(pScreen->myNum, X_INFO, "[agp] Ring read ptr mapped at 0x%08lx\n", (unsigned long)info->dri->ringReadPtr); @@ -3788,7 +2887,7 @@ if (drmAddMap(info->dri->drmFD, info->dri->bufStart, info->dri->bufMapSize, DRM_AGP, 0, &info->dri->bufHandle) < 0) { -@@ -1093,6 +1255,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1095,6 +1257,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) "[pci] ring handle = 0x%08x\n", (unsigned int)info->dri->ringHandle); @@ -3796,7 +2895,7 @@ if (drmMap(info->dri->drmFD, info->dri->ringHandle, info->dri->ringMapSize, &info->dri->ring) < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[pci] Could not map ring\n"); -@@ -1104,6 +1267,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1106,6 +1269,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) xf86DrvMsg(pScreen->myNum, X_INFO, "[pci] Ring contents 0x%08lx\n", *(unsigned long *)(pointer)info->dri->ring); @@ -3804,7 +2903,7 @@ if (drmAddMap(info->dri->drmFD, info->dri->ringReadOffset, info->dri->ringReadMapSize, DRM_SCATTER_GATHER, flags, &info->dri->ringReadPtrHandle) < 0) { -@@ -1115,8 +1279,10 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1117,8 +1281,10 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) "[pci] ring read ptr handle = 0x%08x\n", (unsigned int)info->dri->ringReadPtrHandle); @@ -3815,7 +2914,7 @@ xf86DrvMsg(pScreen->myNum, X_ERROR, "[pci] Could not map ring read ptr\n"); return FALSE; -@@ -1127,6 +1293,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1129,6 +1295,7 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) xf86DrvMsg(pScreen->myNum, X_INFO, "[pci] Ring read ptr contents 0x%08lx\n", *(unsigned long *)(pointer)info->dri->ringReadPtr); @@ -3823,7 +2922,7 @@ if (drmAddMap(info->dri->drmFD, info->dri->bufStart, info->dri->bufMapSize, DRM_SCATTER_GATHER, 0, &info->dri->bufHandle) < 0) { -@@ -1179,6 +1346,9 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1181,6 +1348,9 @@ static Bool RADEONDRIPciInit(RADEONInfoPtr info, ScreenPtr pScreen) */ static Bool RADEONDRIMapInit(RADEONInfoPtr info, ScreenPtr pScreen) { @@ -3833,7 +2932,7 @@ /* Map registers */ info->dri->registerSize = info->MMIOSize; if (drmAddMap(info->dri->drmFD, info->MMIOAddr, info->dri->registerSize, -@@ -1219,20 +1389,23 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1221,20 +1391,23 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) drmInfo.fb_bpp = info->CurrentLayout.pixel_code; drmInfo.depth_bpp = (info->dri->depthBits - 8) * 2; @@ -3871,7 +2970,7 @@ if (drmCommandWrite(info->dri->drmFD, DRM_RADEON_CP_INIT, &drmInfo, sizeof(drm_radeon_init_t)) < 0) return FALSE; -@@ -1241,8 +1414,9 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) +@@ -1243,8 +1416,9 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen) * registers back to their default values, so we need to restore * those engine register here. */ @@ -3883,7 +2982,7 @@ return TRUE; } -@@ -1440,12 +1614,11 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn) +@@ -1442,12 +1616,11 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn) /* Get DRM version & close DRM */ info->dri->pKernelDRMVersion = drmGetVersion(fd); @@ -3897,7 +2996,7 @@ } /* Now check if we qualify */ -@@ -1479,10 +1652,29 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn) +@@ -1481,10 +1654,29 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn) req_patch); drmFreeVersion(info->dri->pKernelDRMVersion); info->dri->pKernelDRMVersion = NULL; @@ -3928,7 +3027,7 @@ } Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on) -@@ -1491,6 +1683,9 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on) +@@ -1493,6 +1685,9 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on) xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); int value = 0; @@ -3938,7 +3037,7 @@ if (!info->want_vblank_interrupts) on = FALSE; -@@ -1510,6 +1705,52 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on) +@@ -1512,6 +1707,52 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on) return TRUE; } @@ -3991,7 +3090,7 @@ /* Initialize the screen-specific data structures for the DRI and the * Radeon. This is the main entry point to the device-specific -@@ -1573,10 +1814,22 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) +@@ -1575,10 +1816,22 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) pDRIInfo->ddxDriverMajorVersion = info->allowColorTiling ? 5 : 4; pDRIInfo->ddxDriverMinorVersion = 3; pDRIInfo->ddxDriverPatchVersion = 0; @@ -4018,7 +3117,7 @@ pDRIInfo->ddxDrawableTableEntry = RADEON_MAX_DRAWABLES; pDRIInfo->maxDrawableTableEntry = (SAREA_MAX_DRAWABLES < RADEON_MAX_DRAWABLES -@@ -1629,9 +1882,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) +@@ -1631,9 +1884,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) pDRIInfo->TransitionTo3d = RADEONDRITransitionTo3d; pDRIInfo->TransitionSingleToMulti3D = RADEONDRITransitionSingleToMulti3d; pDRIInfo->TransitionMultiToSingle3D = RADEONDRITransitionMultiToSingle3d; @@ -4029,7 +3128,7 @@ pDRIInfo->ClipNotify = RADEONDRIClipNotify; #endif -@@ -1663,57 +1914,60 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) +@@ -1665,57 +1916,60 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) pDRIInfo = NULL; return FALSE; } @@ -4134,7 +3233,7 @@ static Bool RADEONDRIDoCloseScreen(int scrnIndex, ScreenPtr pScreen) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -@@ -1755,17 +2009,21 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen) +@@ -1757,17 +2011,21 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen) return FALSE; } @@ -4164,7 +3263,7 @@ /* Initialize and start the CP if required */ RADEONDRICPInit(pScrn); -@@ -1774,6 +2032,10 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen) +@@ -1776,6 +2034,10 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen) pSAREAPriv = (drm_radeon_sarea_t*)DRIGetSAREAPrivate(pScreen); memset(pSAREAPriv, 0, sizeof(*pSAREAPriv)); @@ -4175,7 +3274,7 @@ pRADEONDRI = (RADEONDRIPtr)info->dri->pDRIInfo->devPrivate; pRADEONDRI->deviceID = info->Chipset; -@@ -1931,6 +2193,8 @@ void RADEONDRICloseScreen(ScreenPtr pScreen) +@@ -1933,6 +2195,8 @@ void RADEONDRICloseScreen(ScreenPtr pScreen) drmUnmap(info->dri->buf, info->dri->bufMapSize); info->dri->buf = NULL; } @@ -4184,7 +3283,7 @@ if (info->dri->ringReadPtr) { drmUnmap(info->dri->ringReadPtr, info->dri->ringReadMapSize); info->dri->ringReadPtr = NULL; -@@ -1939,6 +2203,7 @@ void RADEONDRICloseScreen(ScreenPtr pScreen) +@@ -1941,6 +2205,7 @@ void RADEONDRICloseScreen(ScreenPtr pScreen) drmUnmap(info->dri->ring, info->dri->ringMapSize); info->dri->ring = NULL; } @@ -4192,7 +3291,7 @@ if (info->dri->agpMemHandle != DRM_AGP_NO_HANDLE) { drmAgpUnbind(info->dri->drmFD, info->dri->agpMemHandle); drmAgpFree(info->dri->drmFD, info->dri->agpMemHandle); -@@ -2344,3 +2609,11 @@ int RADEONDRISetParam(ScrnInfoPtr pScrn, unsigned int param, int64_t value) +@@ -2346,3 +2611,11 @@ int RADEONDRISetParam(ScrnInfoPtr pScrn, unsigned int param, int64_t value) &radeonsetparam, sizeof(drm_radeon_setparam_t)); return ret; } @@ -4963,7 +4062,7 @@ + +#endif diff --git a/src/radeon_driver.c b/src/radeon_driver.c -index 7cac321..b65bb51 100644 +index 0842164..c61a722 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -67,7 +67,7 @@ @@ -5175,7 +4274,7 @@ info->cp->CPInUse = FALSE; info->cp->CPStarted = FALSE; info->cp->CPusecTimeout = RADEON_DEFAULT_CP_TIMEOUT; -@@ -2704,6 +2735,37 @@ static const xf86CrtcConfigFuncsRec RADEONCRTCResizeFuncs = { +@@ -2701,6 +2732,37 @@ static const xf86CrtcConfigFuncsRec RADEONCRTCResizeFuncs = { RADEONCRTCResize }; @@ -5213,7 +4312,7 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) { xf86CrtcConfigPtr xf86_config; -@@ -2724,6 +2786,8 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) +@@ -2721,6 +2783,8 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) info = RADEONPTR(pScrn); info->MMIO = NULL; @@ -5222,7 +4321,7 @@ info->IsSecondary = FALSE; info->IsPrimary = FALSE; -@@ -2758,62 +2822,63 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) +@@ -2755,62 +2819,63 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) } info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index); @@ -5333,7 +4432,7 @@ if (xf86RegisterResources(info->pEnt->index, 0, ResExclusive)) goto fail; -@@ -2823,10 +2888,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) +@@ -2820,10 +2885,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR; pScrn->monitor = pScrn->confScreen->monitor; @@ -5350,7 +4449,7 @@ if (!RADEONPreInitVisual(pScrn)) goto fail; -@@ -2840,136 +2907,198 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) +@@ -2837,154 +2904,216 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) memcpy(info->Options, RADEONOptions, sizeof(RADEONOptions)); xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, info->Options); @@ -5577,21 +4676,49 @@ + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No valid modes.\n"); + goto fail; + } -+ -+ ErrorF("after xf86InitialConfiguration\n"); - ErrorF("before xf86InitialConfiguration\n"); -+ } else { -+#ifdef XF86DRM_MODE -+ char *bus_id; -+ if (!radeon_alloc_dri(pScrn)) -+ return FALSE; ++ /* fix up cloning on rn50 cards ++ * since they only have one crtc sometimes the xserver doesn't assign ++ * a crtc to one of the outputs even though both outputs have common modes ++ * which results in only one monitor being enabled. Assign a crtc here so ++ * that both outputs light up. ++ */ ++ if (info->ChipFamily == CHIP_FAMILY_RV100 && !pRADEONEnt->HasCRTC2) { ++ int i; ++ ++ for (i = 0; i < xf86_config->num_output; i++) { ++ xf86OutputPtr output = xf86_config->output[i]; ++ ++ /* XXX: double check crtc mode */ ++ if ((output->probed_modes != NULL) && (output->crtc == NULL)) ++ output->crtc = xf86_config->crtc[0]; ++ } ++ } - if (!xf86InitialConfiguration (pScrn, FALSE)) - { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No valid modes.\n"); - goto fail; - } ++ ErrorF("after xf86InitialConfiguration\n"); + +- /* fix up cloning on rn50 cards +- * since they only have one crtc sometimes the xserver doesn't assign +- * a crtc to one of the outputs even though both outputs have common modes +- * which results in only one monitor being enabled. Assign a crtc here so +- * that both outputs light up. +- */ +- if (info->ChipFamily == CHIP_FAMILY_RV100 && !pRADEONEnt->HasCRTC2) { +- int i; ++ } else { ++#ifdef XF86DRM_MODE ++ char *bus_id; ++ if (!radeon_alloc_dri(pScrn)) ++ return FALSE; + +- for (i = 0; i < xf86_config->num_output; i++) { +- xf86OutputPtr output = xf86_config->output[i]; + bus_id = DRICreatePCIBusID(info->PciInfo); + if (drmmode_pre_init(pScrn, &info->drmmode, bus_id, "radeon", pScrn->bitsPerPixel / 8) == FALSE) { + xfree(bus_id); @@ -5599,7 +4726,9 @@ + goto fail; + } -- ErrorF("after xf86InitialConfiguration\n"); +- /* XXX: double check crtc mode */ +- if ((output->probed_modes != NULL) && (output->crtc == NULL)) +- output->crtc = xf86_config->crtc[0]; + info->dri->drmFD = info->drmmode.fd; + info->dri2.drm_fd = info->drmmode.fd; + info->dri2.enabled = FALSE; @@ -5638,13 +4767,15 @@ + if (info->ChipFamily < CHIP_FAMILY_R600) { + info->useEXA = TRUE; + info->directRenderingEnabled = TRUE; -+ } + } + info->new_cs = TRUE; + info->drm_mm = TRUE; + // info->directRenderingDisabled = FALSE; +#endif -+ } + } +- ErrorF("after xf86InitialConfiguration\n"); +- RADEONSetPitch(pScrn); - /* Set display resolution */ @@ -5654,7 +4785,7 @@ /* Get ScreenInit function */ if (!xf86LoadSubModule(pScrn, "fb")) return FALSE; -@@ -2984,10 +3113,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) +@@ -2999,10 +3128,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) if (!RADEONPreInitXv(pScrn)) goto fail; } @@ -5671,7 +4802,7 @@ } if (pScrn->modes == NULL) { -@@ -3140,6 +3271,9 @@ static void RADEONBlockHandler(int i, pointer blockData, +@@ -3155,6 +3286,9 @@ static void RADEONBlockHandler(int i, pointer blockData, #ifdef USE_EXA info->accel_state->engineMode = EXA_ENGINEMODE_UNKNOWN; @@ -5681,7 +4812,7 @@ #endif } -@@ -3228,7 +3362,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3243,7 +3377,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, int subPixelOrder = SubPixelUnknown; char* s; #endif @@ -5690,7 +4821,7 @@ info->accelOn = FALSE; #ifdef USE_XAA -@@ -3248,58 +3382,61 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3263,58 +3397,61 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, "RADEONScreenInit %lx %ld\n", pScrn->memPhysBase, pScrn->fbOffset); #endif @@ -5791,7 +4922,7 @@ /* Visual setup */ miClearVisualTypes(); if (!miSetVisualTypes(pScrn->depth, -@@ -3333,19 +3470,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3348,19 +3485,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, hasDRI = info->directRenderingEnabled; #endif /* XF86DRI */ @@ -5825,7 +4956,7 @@ } } -@@ -3382,7 +3521,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3397,7 +3536,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, #ifdef XF86DRI if (hasDRI) { info->accelDFS = xf86ReturnOptValBool(info->Options, OPTION_ACCEL_DFS, @@ -5837,7 +4968,7 @@ /* Reserve approx. half of offscreen memory for local textures by * default, can be overridden with Option "FBTexPercent". -@@ -3408,7 +3550,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3423,7 +3565,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, #endif #if defined(XF86DRI) && defined(USE_XAA) @@ -5846,7 +4977,7 @@ info->dri->textureSize = -1; if (xf86GetOptValInteger(info->Options, OPTION_FBTEX_PERCENT, &(info->dri->textureSize))) { -@@ -3426,7 +3568,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3441,7 +3583,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, #endif #ifdef USE_XAA @@ -5855,7 +4986,7 @@ return FALSE; #endif -@@ -3447,7 +3589,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3462,7 +3604,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, info->CurrentLayout.pixel_bytes); int maxy = info->FbMapSize / width_bytes; @@ -5864,7 +4995,7 @@ xf86DrvMsg(scrnIndex, X_ERROR, "Static buffer allocation failed. Disabling DRI.\n"); xf86DrvMsg(scrnIndex, X_ERROR, -@@ -3457,19 +3599,54 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3472,19 +3614,54 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, info->CurrentLayout.pixel_bytes * 3 + 1023) / 1024); info->directRenderingEnabled = FALSE; } else { @@ -5923,7 +5054,7 @@ #endif xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "Initializing fb layer\n"); -@@ -3493,7 +3670,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3508,7 +3685,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, if (info->r600_shadow_fb == FALSE) { /* Init fb layer */ @@ -5932,7 +5063,7 @@ pScrn->virtualX, pScrn->virtualY, pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth, pScrn->bitsPerPixel)) -@@ -3535,8 +3712,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3550,8 +3727,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, /* restore the memory map here otherwise we may get a hang when * initializing the drm below */ @@ -5945,7 +5076,7 @@ /* Backing store setup */ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, -@@ -3546,7 +3725,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3561,7 +3740,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, /* DRI finalisation */ #ifdef XF86DRI @@ -5954,7 +5085,7 @@ info->dri->pKernelDRMVersion->version_minor >= 19) { if (RADEONDRISetParam(pScrn, RADEON_SETPARAM_PCIGART_LOCATION, info->dri->pciGartOffset) < 0) -@@ -3562,14 +3741,24 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3577,14 +3756,24 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, if (info->directRenderingEnabled) { xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "DRI Finishing init !\n"); @@ -5980,7 +5111,7 @@ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering enabled\n"); -@@ -3665,10 +3854,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3680,10 +3869,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, return FALSE; } } @@ -5998,7 +5129,7 @@ /* Provide SaveScreen & wrap BlockHandler and CloseScreen */ /* Wrap CloseScreen */ -@@ -5245,7 +5440,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +@@ -5260,7 +5455,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) #ifdef XF86DRI Bool CPStarted = info->cp->CPStarted; @@ -6007,7 +5138,7 @@ DRILock(pScrn->pScreen, 0); RADEONCP_STOP(pScrn, info); } -@@ -5268,8 +5463,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +@@ -5283,8 +5478,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) #endif } @@ -6020,7 +5151,7 @@ ret = xf86SetSingleMode (pScrn, mode, RR_Rotate_0); -@@ -5281,16 +5478,19 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +@@ -5296,16 +5493,19 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) /* xf86SetRootClip would do, but can't access that here */ } @@ -6048,7 +5179,7 @@ } #endif -@@ -5488,6 +5688,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags) +@@ -5503,6 +5703,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags) xf86OutputPtr output = config->output[config->compat_output]; xf86CrtcPtr crtc = output->crtc; @@ -6060,7 +5191,7 @@ /* not handled */ if (IS_AVIVO_VARIANT) return; -@@ -5527,76 +5732,103 @@ Bool RADEONEnterVT(int scrnIndex, int flags) +@@ -5542,76 +5747,103 @@ Bool RADEONEnterVT(int scrnIndex, int flags) xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "RADEONEnterVT\n"); @@ -6213,7 +5344,7 @@ } #endif /* this will get XVideo going again, but only if XVideo was initialised -@@ -5611,7 +5843,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags) +@@ -5626,7 +5858,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags) info->accel_state->XInited3D = FALSE; #ifdef XF86DRI @@ -6222,7 +5353,7 @@ RADEONCP_START(pScrn, info); DRIUnlock(pScrn->pScreen); } -@@ -5634,26 +5866,28 @@ void RADEONLeaveVT(int scrnIndex, int flags) +@@ -5649,26 +5881,28 @@ void RADEONLeaveVT(int scrnIndex, int flags) "RADEONLeaveVT\n"); #ifdef XF86DRI if (RADEONPTR(pScrn)->directRenderingInited) { @@ -6266,7 +5397,7 @@ /* Make sure 3D clients will re-upload textures to video RAM */ if (info->dri->textureSize) { -@@ -5669,6 +5903,11 @@ void RADEONLeaveVT(int scrnIndex, int flags) +@@ -5684,6 +5918,11 @@ void RADEONLeaveVT(int scrnIndex, int flags) i = list[i].next; } while (i != 0); } @@ -6278,7 +5409,7 @@ } #endif -@@ -5695,10 +5934,18 @@ void RADEONLeaveVT(int scrnIndex, int flags) +@@ -5710,10 +5949,18 @@ void RADEONLeaveVT(int scrnIndex, int flags) xf86_hide_cursors (pScrn); @@ -6300,7 +5431,7 @@ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "Ok, leaving now...\n"); -@@ -5752,7 +5999,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen) +@@ -5767,7 +6014,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen) #endif /* USE_XAA */ if (pScrn->vtSema) { @@ -6310,7 +5441,7 @@ } xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, -@@ -5787,6 +6035,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen) +@@ -5802,6 +6050,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen) info->DGAModes = NULL; xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "Unmapping memory\n"); @@ -8834,10 +7965,10 @@ +} + diff --git a/src/radeon_probe.h b/src/radeon_probe.h -index f072b9c..6d31e39 100644 +index afc8e21..6138f36 100644 --- a/src/radeon_probe.h +++ b/src/radeon_probe.h -@@ -145,6 +145,27 @@ typedef struct +@@ -146,6 +146,27 @@ typedef struct Bool hw_capable; } RADEONI2CBusRec, *RADEONI2CBusPtr; @@ -8865,7 +7996,7 @@ typedef struct _RADEONCrtcPrivateRec { void *crtc_rotate_mem; void *cursor_mem; -@@ -158,6 +179,8 @@ typedef struct _RADEONCrtcPrivateRec { +@@ -159,6 +180,8 @@ typedef struct _RADEONCrtcPrivateRec { int can_tile; Bool enabled; Bool initialized; @@ -8875,7 +8006,7 @@ typedef struct _radeon_encoder { diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c -index cbedb7e..da60494 100644 +index 2df299f..72d60e2 100644 --- a/src/radeon_textured_video.c +++ b/src/radeon_textured_video.c @@ -40,6 +40,7 @@ @@ -8910,7 +8041,7 @@ #include "radeon_textured_videofuncs.c" -@@ -298,6 +302,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, +@@ -374,6 +378,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, size * 2, 64); if (pPriv->video_offset == 0) return BadAlloc; @@ -8920,7 +8051,7 @@ } /* Bicubic filter setup */ -@@ -321,6 +328,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, +@@ -397,6 +404,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, pPriv->bicubic_src_offset = pPriv->bicubic_offset + info->fbLocation + pScrn->fbOffset; if (pPriv->bicubic_offset == 0) pPriv->bicubic_enabled = FALSE; @@ -8930,7 +8061,7 @@ } if (pDraw->type == DRAWABLE_WINDOW) -@@ -350,11 +360,22 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, +@@ -426,11 +436,22 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, left = (x1 >> 16) & ~1; npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left; @@ -8958,13 +8089,15 @@ pPriv->src_pitch = dstPitch; pPriv->size = size; pPriv->pDraw = pDraw; -@@ -417,8 +438,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, +@@ -510,10 +531,23 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, } /* Upload bicubic filter tex */ -- if (pPriv->bicubic_enabled) -- RADEONCopyData(pScrn, (uint8_t *)bicubic_tex_512, (uint8_t *)(info->FB + pPriv->bicubic_offset), 1024, 1024, 1, 512, 2); -+ if (pPriv->bicubic_enabled) { +- if (pPriv->bicubic_enabled) { +- if (info->ChipFamily < CHIP_FAMILY_R600) +- RADEONCopyData(pScrn, (uint8_t *)bicubic_tex_512, +- (uint8_t *)(info->FB + pPriv->bicubic_offset), 1024, 1024, 1, 512, 2); ++ if (pPriv->bicubic_enabled && info->ChipFamily < CHIP_FAMILY_R600) { + uint8_t *bicubic_addr; + int ret; + @@ -8981,11 +8114,10 @@ + + if (info->new_cs) + dri_bo_unmap(pPriv->bicubic_bo); -+ } + } /* update cliplist */ - if (!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) { -@@ -435,10 +472,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, +@@ -531,10 +565,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, pPriv->w = width; pPriv->h = height; @@ -9183,7 +8315,7 @@ RADEON_COLOR_ARG_A_ZERO | RADEON_COLOR_ARG_B_ZERO | diff --git a/src/radeon_video.c b/src/radeon_video.c -index 2fb5fcc..33a4fd6 100644 +index 92d1a71..c953618 100644 --- a/src/radeon_video.c +++ b/src/radeon_video.c @@ -287,7 +287,7 @@ void RADEONInitVideo(ScreenPtr pScreen) Index: xorg-x11-drv-ati.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- xorg-x11-drv-ati.spec 5 Mar 2009 07:28:50 -0000 1.153 +++ xorg-x11-drv-ati.spec 6 Mar 2009 23:50:06 -0000 1.154 @@ -5,7 +5,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.11.0 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -76,6 +76,9 @@ %{_mandir}/man4/radeon.4* %changelog +* Sat Mar 07 2009 Dave Airlie 6.11.0-5 +- pull in more fixes from master + * Thu Mar 05 2009 Dave Airlie 6.11.0-4 - modeset: fixup radeon Xv with latest kernel From thm at fedoraproject.org Fri Mar 6 23:51:28 2009 From: thm at fedoraproject.org (Thomas Moschny) Date: Fri, 6 Mar 2009 23:51:28 +0000 (UTC) Subject: rpms/monotone/EL-5 monotone-0.42-gcc44.patch, NONE, 1.1 monotone-0.42-netsync.patch, NONE, 1.1 monotone-0.42-netsync2.patch, NONE, 1.1 import.log, 1.1, 1.2 monotone.spec, 1.36, 1.37 Message-ID: <20090306235128.C47D070116@cvs1.fedora.phx.redhat.com> Author: thm Update of /cvs/pkgs/rpms/monotone/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15398/EL-5 Modified Files: import.log monotone.spec Added Files: monotone-0.42-gcc44.patch monotone-0.42-netsync.patch monotone-0.42-netsync2.patch Log Message: Updating from devel. monotone-0.42-gcc44.patch: --- NEW FILE monotone-0.42-gcc44.patch --- diff -up monotone-0.42/key_store.cc.orig monotone-0.42/key_store.cc --- monotone-0.42/key_store.cc.orig 2008-12-14 00:02:12.000000000 +0100 +++ monotone-0.42/key_store.cc 2009-02-07 17:23:27.000000000 +0100 @@ -460,30 +460,30 @@ key_store::cache_decrypted_key(const rsa void key_store::create_key_pair(database & db, - rsa_keypair_id const & id, + rsa_keypair_id const & ident, utf8 const * maybe_passphrase, id * maybe_pubhash, id * maybe_privhash) { conditional_transaction_guard guard(db); - bool exists = key_pair_exists(id); + bool exists = key_pair_exists(ident); if (db.database_specified()) { guard.acquire(); - exists = exists || db.public_key_exists(id); + exists = exists || db.public_key_exists(ident); } - N(!exists, F("key '%s' already exists") % id); + N(!exists, F("key '%s' already exists") % ident); utf8 prompted_passphrase; if (!maybe_passphrase) { - get_passphrase(prompted_passphrase, id, true, true); + get_passphrase(prompted_passphrase, ident, true, true); maybe_passphrase = &prompted_passphrase; } // okay, now we can create the key - P(F("generating key-pair '%s'") % id); + P(F("generating key-pair '%s'") % ident); RSA_PrivateKey priv(*s->rng, static_cast(constants::keylen)); // serialize and maybe encrypt the private key @@ -514,20 +514,20 @@ key_store::create_key_pair(database & db % kp.priv().size()); // and save it. - P(F("storing key-pair '%s' in %s/") % id % get_key_dir()); - put_key_pair(id, kp); + P(F("storing key-pair '%s' in %s/") % ident % get_key_dir()); + put_key_pair(ident, kp); if (db.database_specified()) { - P(F("storing public key '%s' in %s") % id % db.get_filename()); - db.put_key(id, kp.pub); + P(F("storing public key '%s' in %s") % ident % db.get_filename()); + db.put_key(ident, kp.pub); guard.commit(); } if (maybe_pubhash) - key_hash_code(id, kp.pub, *maybe_pubhash); + key_hash_code(ident, kp.pub, *maybe_pubhash); if (maybe_privhash) - key_hash_code(id, kp.priv, *maybe_privhash); + key_hash_code(ident, kp.priv, *maybe_privhash); } void diff -up monotone-0.42/key_store.hh.orig monotone-0.42/key_store.hh --- monotone-0.42/key_store.hh.orig 2008-10-03 15:30:21.000000000 +0200 +++ monotone-0.42/key_store.hh 2009-02-07 17:21:54.000000000 +0100 @@ -64,7 +64,7 @@ public: void cache_decrypted_key(rsa_keypair_id const & id); - void create_key_pair(database & db, rsa_keypair_id const & id, + void create_key_pair(database & db, rsa_keypair_id const & ident, utf8 const * maybe_passphrase = NULL, id * maybe_pubhash = NULL, id * maybe_privhash = NULL); diff -up monotone-0.42/sanity.hh.orig monotone-0.42/sanity.hh --- monotone-0.42/sanity.hh.orig 2008-11-23 22:32:49.000000000 +0100 +++ monotone-0.42/sanity.hh 2009-02-07 17:21:42.000000000 +0100 @@ -12,6 +12,7 @@ #include #include +#include #include "boost/current_function.hpp" monotone-0.42-netsync.patch: --- NEW FILE monotone-0.42-netsync.patch --- diff -up monotone-0.42/netsync.cc.orig monotone-0.42/netsync.cc --- monotone-0.42/netsync.cc.orig 2009-02-04 13:53:00.000000000 +0100 +++ monotone-0.42/netsync.cc 2009-02-04 13:53:49.000000000 +0100 @@ -353,7 +353,7 @@ unsigned int reactable::count = 0; class session_base : public reactable { - bool read_some(); + void read_some(bool & failed, bool & eof); bool write_some(); void mark_recent_io() { @@ -468,10 +468,12 @@ session_base::which_events() return ret; } -bool -session_base::read_some() +void +session_base::read_some(bool & failed, bool & eof) { I(inbuf.size() < constants::netcmd_maxsz); + eof = false; + failed = false; char tmp[constants::bufsz]; Netxx::signed_size_type count = str->read(tmp, sizeof(tmp)); if (count > 0) @@ -479,17 +481,38 @@ session_base::read_some() L(FL("read %d bytes from fd %d (peer %s)") % count % str->get_socketfd() % peer_id); if (encountered_error) - { - L(FL("in error unwind mode, so throwing them into the bit bucket")); - return true; - } + L(FL("in error unwind mode, so throwing them into the bit bucket")); + inbuf.append(tmp,count); mark_recent_io(); note_bytes_in(count); - return true; + } + else if (count == 0) + { + // Returning 0 bytes after select() marks the file descriptor as + // ready for reading signifies EOF. + + switch (protocol_state) + { + case working_state: + P(F("peer %s IO terminated connection in working state (error)") + % peer_id); + break; + + case shutdown_state: + P(F("peer %s IO terminated connection in shutdown state " + "(possibly client misreported error)") + % peer_id); + break; + + case confirmed_state: + break; + } + + eof = true; } else - return false; + failed = true; } bool @@ -531,11 +554,14 @@ bool session_base::do_io(Netxx::Probe::ready_type what) { bool ok = true; + bool eof = false; try { if (what & Netxx::Probe::ready_read) { - if (!read_some()) + bool failed; + read_some(failed, eof); + if (failed) ok = false; } if (what & Netxx::Probe::ready_write) @@ -578,7 +604,11 @@ session_base::do_io(Netxx::Probe::ready_ % peer_id); ok = false; } - return ok; + + // Return false in case we reached EOF, so as to prevent further calls + // to select()s on this stream, as recommended by the select_tut man + // page. + return ok && !eof; } //////////////////////////////////////////////////////////////////////// monotone-0.42-netsync2.patch: --- NEW FILE monotone-0.42-netsync2.patch --- diff -up monotone-0.42/netsync.cc.orig monotone-0.42/netsync.cc --- monotone-0.42/netsync.cc.orig 2008-12-14 00:02:12.000000000 +0100 +++ monotone-0.42/netsync.cc 2009-02-27 19:19:37.000000000 +0100 @@ -374,7 +374,7 @@ protected: } bool output_overfull() const { - return outbuf.size() > constants::bufsz * 10; + return outbuf_size > constants::bufsz * 10; } public: string peer_id; Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/monotone/EL-5/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Jan 2009 12:19:43 -0000 1.1 +++ import.log 6 Mar 2009 23:50:56 -0000 1.2 @@ -1 +1,2 @@ monotone-0_42-2_fc10:EL-5:monotone-0.42-2.fc10.src.rpm:1230985114 +monotone-0_42-5_fc11:EL-5:monotone-0.42-5.fc11.src.rpm:1236383395 Index: monotone.spec =================================================================== RCS file: /cvs/pkgs/rpms/monotone/EL-5/monotone.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- monotone.spec 3 Jan 2009 12:19:43 -0000 1.36 +++ monotone.spec 6 Mar 2009 23:50:57 -0000 1.37 @@ -1,6 +1,6 @@ Name: monotone Version: 0.42 -Release: 2%{?dist} +Release: 5%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -12,6 +12,13 @@ Source2: monotone.sysconfig Source3: README.monotone-server +# rediffed changeset f18abebd.. from upstream +Patch0: monotone-0.42-netsync.patch +# rediffed changesets 33022690.. and 76e258cb.. from upstream +Patch1: monotone-0.42-gcc44.patch +# rediffed changeset 16184688.. from upstream +Patch2: monotone-0.42-netsync2.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -71,6 +78,9 @@ %prep %setup -q +%patch0 -p1 -b .gcc44 +%patch1 -p1 -b .netsync +%patch2 -p1 -b .netsync2 %build %configure --with-bundled-lua=%{bundled_lua} \ @@ -78,7 +88,8 @@ make %{?_smp_mflags} %check -make %{?_smp_mflags} check || { cat tester_dir/*.log; false; } +# disable parallel runs in the testsuite for now +make check || { cat tester_dir/*.log; false; } %install rm -rf %{buildroot} @@ -197,6 +208,18 @@ %changelog +* Fri Feb 27 2009 Thomas Moschny - 0.42-5 +- Add one more netsync related patch from trunk. + +* Wed Feb 25 2009 Fedora Release Engineering - 0.42-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 9 2009 Thomas Moschny - 0.42-3 +- Disable %%{_smp_mflags} in the testsuite, causes strange errors. +- Fix two issues with gcc44. +- Add patch from upstream fixing netsync printing an error message of + the form "peer [...] IO failed in confirmed state (success)". + * Fri Jan 2 2009 Thomas Moschny - 0.42-2 - Pack Monotone.pm (in a subpackage). (#450267) From oget at fedoraproject.org Fri Mar 6 23:58:28 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Fri, 6 Mar 2009 23:58:28 +0000 (UTC) Subject: rpms/rosegarden4/F-10 .cvsignore, 1.6, 1.7 rosegarden4.spec, 1.9, 1.10 sources, 1.6, 1.7 rosegarden-1.5.1-desktop-file.patch, 1.1, NONE rosegarden-1.6.0-fix-cmake-optflags.patch, 1.1, NONE rosegarden-1.6.1-gcc43.patch, 1.1, NONE Message-ID: <20090306235828.3702870116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/rosegarden4/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17427 Modified Files: .cvsignore rosegarden4.spec sources Removed Files: rosegarden-1.5.1-desktop-file.patch rosegarden-1.6.0-fix-cmake-optflags.patch rosegarden-1.6.1-gcc43.patch Log Message: * Fri Mar 06 2009 Orcan Ogetbil - 1.7.3-1 - New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rosegarden4/F-10/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Feb 2008 00:18:49 -0000 1.6 +++ .cvsignore 6 Mar 2009 23:57:57 -0000 1.7 @@ -1 +1 @@ -rosegarden-1.6.1.tar.bz2 +rosegarden-1.7.3.tar.bz2 Index: rosegarden4.spec =================================================================== RCS file: /cvs/pkgs/rpms/rosegarden4/F-10/rosegarden4.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rosegarden4.spec 2 Apr 2008 15:59:30 -0000 1.9 +++ rosegarden4.spec 6 Mar 2009 23:57:57 -0000 1.10 @@ -1,6 +1,6 @@ Name: rosegarden4 -Version: 1.6.1 -Release: 2%{?dist} +Version: 1.7.3 +Release: 1%{?dist} Summary: MIDI, audio and notation editor Group: Applications/Multimedia License: GPLv2+ @@ -8,10 +8,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://downloads.sourceforge.net/sourceforge/rosegarden/rosegarden-%{version}.tar.bz2 -Patch0: rosegarden-1.6.0-fix-cmake-optflags.patch -Patch1: rosegarden-1.5.1-desktop-file.patch Patch2: rosegarden-1.5.1-lib64.patch -Patch3: rosegarden-1.6.1-gcc43.patch BuildRequires: cmake BuildRequires: gettext @@ -34,26 +31,34 @@ %prep %setup -q -n rosegarden-%{version} -%patch0 -p1 -%patch1 -p1 # Look for LADSPA/DSSI plugins in the correct place on 64bit platforms %if "%{_lib}" == "lib64" %patch2 -p1 %endif -%patch3 -p1 -b .gcc43 + +# Fix permissions: +chmod 644 src/commands/segment/SegmentSplitTwiceCommand.* + +# Add GenericName to the desktop file: +echo "GenericName=Audio and MIDI Sequencer" >> data/desktop/rosegarden.desktop %build -%cmake . +%cmake . -DCMAKE_CXX_FLAGS="%{optflags}" make VERBOSE=1 %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} +mv %{buildroot}%{_datadir}/applications/kde/rosegarden.desktop \ + %{buildroot}%{_datadir}/applications/ + desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ --delete-original \ - %{buildroot}%{_datadir}/applications/kde/rosegarden.desktop + --remove-category X-SuSE-Sequencer \ + --remove-category X-Red-Hat-Base \ + %{buildroot}%{_datadir}/applications/rosegarden.desktop %find_lang rosegarden @@ -65,23 +70,23 @@ %post update-desktop-database &> /dev/null ||: -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi -# locolor seems to be a KDE thing? -touch --no-create %{_datadir}/icons/locolor || : +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +touch --no-create %{_datadir}/icons/locolor &>/dev/null || : %postun update-desktop-database &> /dev/null ||: -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/locolor &>/dev/null || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -touch --no-create %{_datadir}/icons/locolor || : + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files -f rosegarden.lang -%defattr(-,root,root) +%defattr(-,root,root,-) %doc AUTHORS COPYING %{_bindir}/rosegarden %{_bindir}/rosegarden-audiofile-importer @@ -109,6 +114,9 @@ %{_datadir}/mimelnk/audio/x-soundfont.desktop %changelog +* Fri Mar 06 2009 Orcan Ogetbil - 1.7.3-1 +- New upstream version. + * Wed Apr 02 2008 Rex Dieter - 1.6.1-2 - fix rawhide build (#434424) - drop: Requires: kdebase3 (don't want a hard dep here) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rosegarden4/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Feb 2008 00:18:49 -0000 1.6 +++ sources 6 Mar 2009 23:57:57 -0000 1.7 @@ -1 +1 @@ -60efd0d0afcb3632d8188ef25082bcf9 rosegarden-1.6.1.tar.bz2 +122eab42e375d2f3b009c8540ae8069c rosegarden-1.7.3.tar.bz2 --- rosegarden-1.5.1-desktop-file.patch DELETED --- --- rosegarden-1.6.0-fix-cmake-optflags.patch DELETED --- --- rosegarden-1.6.1-gcc43.patch DELETED --- From jkratoch at fedoraproject.org Sat Mar 7 00:33:01 2009 From: jkratoch at fedoraproject.org (Jan Kratochvil) Date: Sat, 7 Mar 2009 00:33:01 +0000 (UTC) Subject: rpms/gdb/devel gdb-6.3-pie-20050110.patch, 1.13, 1.14 gdb-6.8-inlining-addon.patch, 1.4, 1.5 gdb-archer.patch, 1.2, 1.3 gdb.spec, 1.326, 1.327 Message-ID: <20090307003301.6DF4270116@cvs1.fedora.phx.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24458 Modified Files: gdb-6.3-pie-20050110.patch gdb-6.8-inlining-addon.patch gdb-archer.patch gdb.spec Log Message: * Sat Mar 7 2009 Jan Kratochvil - 6.8.50.20090302-3 - Archer update to the snapshot: 6cf16c0711e844094ab694b3d929f7bd30b49f61 - Fix crash on the inlined functions support. - Fix crash from the PIE support, its varobj_refresh() was called only before varobj_invalidate() which is sufficient. - Fix BuildRequires for the `--with testsuite' runs. - Use the newly introduced `--with-pythondir' option. - Remove libstdcxx [python] pretty printers (as included in libstdc++ rpm now). gdb-6.3-pie-20050110.patch: Index: gdb-6.3-pie-20050110.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-pie-20050110.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gdb-6.3-pie-20050110.patch 2 Mar 2009 00:11:34 -0000 1.13 +++ gdb-6.3-pie-20050110.patch 7 Mar 2009 00:32:30 -0000 1.14 @@ -26,10 +26,10 @@ Fix scan_dyntag() for binaries provided by valgrind (BZ 460319). -Index: gdb-6.8.50.20090226/gdb/amd64-tdep.c +Index: gdb-6.8.50.20090302/gdb/amd64-tdep.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/amd64-tdep.c 2009-02-28 07:31:48.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/amd64-tdep.c 2009-02-28 07:38:59.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/amd64-tdep.c 2009-03-07 00:30:09.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/amd64-tdep.c 2009-03-07 00:30:12.000000000 +0100 @@ -36,6 +36,7 @@ #include "regcache.h" #include "regset.h" @@ -132,10 +132,10 @@ return pc; } -Index: gdb-6.8.50.20090226/gdb/auxv.c +Index: gdb-6.8.50.20090302/gdb/auxv.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/auxv.c 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/auxv.c 2009-02-28 07:40:35.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/auxv.c 2009-03-07 00:30:06.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/auxv.c 2009-03-07 00:30:12.000000000 +0100 @@ -81,7 +81,7 @@ procfs_xfer_auxv (struct target_ops *ops Return 1 if an entry was read into *TYPEP and *VALP. */ static int @@ -224,10 +224,10 @@ break; } -Index: gdb-6.8.50.20090226/gdb/auxv.h +Index: gdb-6.8.50.20090302/gdb/auxv.h =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/auxv.h 2009-01-03 06:57:50.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/auxv.h 2009-02-28 07:38:59.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/auxv.h 2009-01-03 06:57:50.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/auxv.h 2009-03-07 00:30:12.000000000 +0100 @@ -36,14 +36,14 @@ struct target_ops; /* Forward declarati Return 1 if an entry was read into *TYPEP and *VALP. */ extern int target_auxv_parse (struct target_ops *ops, @@ -245,10 +245,10 @@ /* Print the contents of the target's AUXV on the specified file. */ extern int fprint_target_auxv (struct ui_file *file, struct target_ops *ops); -Index: gdb-6.8.50.20090226/gdb/breakpoint.c +Index: gdb-6.8.50.20090302/gdb/breakpoint.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/breakpoint.c 2009-02-28 07:38:47.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/breakpoint.c 2009-02-28 07:38:59.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/breakpoint.c 2009-03-07 00:30:10.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/breakpoint.c 2009-03-07 00:30:12.000000000 +0100 @@ -3920,7 +3920,8 @@ describe_other_breakpoints (CORE_ADDR pc printf_filtered (" (thread %d)", b->thread); printf_filtered ("%s%s ", @@ -321,10 +321,10 @@ static void create_fork_vfork_event_catchpoint (int tempflag, char *cond_string, struct breakpoint_ops *ops) -Index: gdb-6.8.50.20090226/gdb/breakpoint.h +Index: gdb-6.8.50.20090302/gdb/breakpoint.h =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/breakpoint.h 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/breakpoint.h 2009-02-28 07:38:59.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/breakpoint.h 2009-03-07 00:30:06.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/breakpoint.h 2009-03-07 00:30:12.000000000 +0100 @@ -127,6 +127,7 @@ enum enable_state automatically enabled and reset when the call "lands" (either completes, or stops at another @@ -344,11 +344,11 @@ /* This function returns TRUE if ep is a catchpoint. */ extern int ep_is_catchpoint (struct breakpoint *); -Index: gdb-6.8.50.20090226/gdb/dwarf2read.c +Index: gdb-6.8.50.20090302/gdb/dwarf2read.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/dwarf2read.c 2009-02-28 07:38:48.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/dwarf2read.c 2009-02-28 07:38:59.000000000 +0100 -@@ -1421,7 +1421,7 @@ dwarf2_build_psymtabs (struct objfile *o +--- gdb-6.8.50.20090302.orig/gdb/dwarf2read.c 2009-03-07 00:30:10.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/dwarf2read.c 2009-03-07 00:30:12.000000000 +0100 +@@ -1413,7 +1413,7 @@ dwarf2_build_psymtabs (struct objfile *o else dwarf2_per_objfile->loc_buffer = NULL; @@ -357,10 +357,10 @@ || (objfile->global_psymbols.size == 0 && objfile->static_psymbols.size == 0)) { -Index: gdb-6.8.50.20090226/gdb/elfread.c +Index: gdb-6.8.50.20090302/gdb/elfread.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/elfread.c 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/elfread.c 2009-02-28 07:38:59.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/elfread.c 2009-03-07 00:30:06.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/elfread.c 2009-03-07 00:30:12.000000000 +0100 @@ -680,7 +680,7 @@ elf_symfile_read (struct objfile *objfil /* If we are reinitializing, or if we have never loaded syms yet, set table to empty. MAINLINE is cleared so that *_read_psymtab @@ -370,11 +370,11 @@ { init_psymbol_list (objfile, 0); mainline = 0; -Index: gdb-6.8.50.20090226/gdb/infrun.c +Index: gdb-6.8.50.20090302/gdb/infrun.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/infrun.c 2009-02-28 07:37:54.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/infrun.c 2009-02-28 07:38:59.000000000 +0100 -@@ -3328,6 +3328,11 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME ( +--- gdb-6.8.50.20090302.orig/gdb/infrun.c 2009-03-07 00:30:10.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/infrun.c 2009-03-07 00:30:12.000000000 +0100 +@@ -3354,6 +3354,11 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME ( #endif target_terminal_inferior (); @@ -386,10 +386,10 @@ /* If requested, stop when the dynamic linker notifies gdb of events. This allows the user to get control and place breakpoints in initializer routines for -Index: gdb-6.8.50.20090226/gdb/objfiles.c +Index: gdb-6.8.50.20090302/gdb/objfiles.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/objfiles.c 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/objfiles.c 2009-02-28 07:38:59.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/objfiles.c 2009-03-07 00:30:06.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/objfiles.c 2009-03-07 00:30:12.000000000 +0100 @@ -51,6 +51,9 @@ #include "arch-utils.h" #include "exec.h" @@ -431,10 +431,10 @@ /* Before the symbol table code was redone to make it easier to selectively load and remove information particular to a specific linkage unit, gdb used to do these things whenever the monolithic -Index: gdb-6.8.50.20090226/gdb/solib-svr4.c +Index: gdb-6.8.50.20090302/gdb/solib-svr4.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/solib-svr4.c 2009-02-28 07:31:58.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/solib-svr4.c 2009-02-28 07:38:59.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/solib-svr4.c 2009-03-07 00:30:09.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/solib-svr4.c 2009-03-07 00:30:12.000000000 +0100 @@ -45,6 +45,7 @@ #include "exec.h" #include "auxv.h" @@ -1116,10 +1116,10 @@ + add_info ("linkmap", info_linkmap_command, + "Display the inferior's linkmap."); } -Index: gdb-6.8.50.20090226/gdb/solib.c +Index: gdb-6.8.50.20090302/gdb/solib.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/solib.c 2009-02-21 17:14:49.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/solib.c 2009-02-28 07:38:59.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/solib.c 2009-02-21 17:14:49.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/solib.c 2009-03-07 00:30:12.000000000 +0100 @@ -81,6 +81,8 @@ set_solib_ops (struct gdbarch *gdbarch, /* external data declarations */ @@ -1306,10 +1306,10 @@ + NULL, NULL, + &setdebuglist, &showdebuglist); } -Index: gdb-6.8.50.20090226/gdb/solist.h +Index: gdb-6.8.50.20090302/gdb/solist.h =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/solist.h 2009-02-04 09:42:11.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/solist.h 2009-02-28 07:38:59.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/solist.h 2009-02-04 09:42:11.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/solist.h 2009-03-07 00:30:12.000000000 +0100 @@ -61,6 +61,8 @@ struct so_list bfd *abfd; char symbols_loaded; /* flag: symbols read in yet? */ @@ -1330,10 +1330,10 @@ +extern int debug_solib; + #endif -Index: gdb-6.8.50.20090226/gdb/symfile-mem.c +Index: gdb-6.8.50.20090302/gdb/symfile-mem.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/symfile-mem.c 2009-02-28 07:22:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/symfile-mem.c 2009-02-28 07:38:59.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/symfile-mem.c 2009-03-07 00:30:08.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/symfile-mem.c 2009-03-07 00:30:12.000000000 +0100 @@ -116,7 +116,7 @@ symbol_file_add_from_memory (struct bfd } @@ -1343,10 +1343,10 @@ /* This might change our ideas about frames already looked at. */ reinit_frame_cache (); -Index: gdb-6.8.50.20090226/gdb/symfile.c +Index: gdb-6.8.50.20090302/gdb/symfile.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/symfile.c 2009-02-28 07:31:58.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/symfile.c 2009-02-28 07:39:59.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/symfile.c 2009-03-07 00:30:09.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/symfile.c 2009-03-07 00:31:24.000000000 +0100 @@ -47,6 +47,7 @@ #include "readline/readline.h" #include "gdb_assert.h" @@ -1426,95 +1426,10 @@ /* If the mtime has changed between the time we set new_modtime and now, we *want* this to be out of date, so don't call stat again now. */ -@@ -3644,6 +3655,7 @@ clear_symtab_users (void) - breakpoint_re_set (); - set_default_breakpoint (0, 0, 0, 0); - clear_pc_function_cache (); -+ varobj_refresh (); - observer_notify_new_objfile (NULL); - - /* Clear globals which might have pointed into a removed objfile. -Index: gdb-6.8.50.20090226/gdb/varobj.c -=================================================================== ---- gdb-6.8.50.20090226.orig/gdb/varobj.c 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/varobj.c 2009-02-28 07:41:30.000000000 +0100 -@@ -1505,6 +1505,61 @@ varobj_set_visualizer (struct varobj *va - #endif - } - -+void -+varobj_refresh (void) -+{ -+ struct varobj *var; -+ struct varobj_root *croot; -+ int mycount = rootcount; -+ char * name; -+ -+ croot = rootlist; -+ while ((croot != NULL) && (mycount > 0)) -+ { -+ var = croot->rootvar; -+ -+ /* Get rid of the memory for the old expression. This also -+ leaves var->root->exp == NULL, which is ok for the parsing -+ below. */ -+ free_current_contents (&var->root->exp); -+ -+ value_free (var->value); -+ var->type = NULL; -+ -+ name = xstrdup (var->name); -+ -+ /* Reparse the expression. Wrap the call to parse expression, -+ so we can return a sensible error. */ -+ if (!gdb_parse_exp_1 (&name, var->root->valid_block, 0, &var->root->exp)) -+ { -+ return; -+ } -+ -+ /* We definitively need to catch errors here. -+ If evaluate_expression succeeds we got the value we wanted. -+ But if it fails, we still go on with a call to evaluate_type() */ -+ if (gdb_evaluate_expression (var->root->exp, &var->value)) -+ { -+ /* no error */ -+ release_value (var->value); -+ if (value_lazy (var->value)) -+ gdb_value_fetch_lazy (var->value); -+ } -+ else -+ var->value = evaluate_type (var->root->exp); -+ -+ var->type = value_type (var->value); -+ -+ mycount--; -+ croot = croot->next; -+ } -+ -+ if (mycount || (croot != NULL)) -+ warning -+ ("varobj_refresh: assertion failed - wrong tally of root vars (%d:%d)", -+ rootcount, mycount); -+} -+ - /* Update the values for a variable and its children. This is a - two-pronged attack. First, re-parse the value for the root's - expression to see if it's changed. Then go all the way -Index: gdb-6.8.50.20090226/gdb/varobj.h -=================================================================== ---- gdb-6.8.50.20090226.orig/gdb/varobj.h 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/varobj.h 2009-02-28 07:39:19.000000000 +0100 -@@ -163,4 +163,6 @@ varobj_clear_type_visualizers (); - extern void - varobj_set_visualizer (struct varobj *var, const char *visualizer); - -+extern void varobj_refresh(void); -+ - #endif /* VAROBJ_H */ -Index: gdb-6.8.50.20090226/gdb/target.h +Index: gdb-6.8.50.20090302/gdb/target.h =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/target.h 2009-02-28 07:32:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/target.h 2009-02-28 07:38:59.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/target.h 2009-03-07 00:30:09.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/target.h 2009-03-07 00:30:12.000000000 +0100 @@ -542,7 +542,7 @@ struct target_ops Return -1 if there is insufficient buffer for a whole entry. Return 1 if an entry was read into *TYPEP and *VALP. */ gdb-6.8-inlining-addon.patch: Index: gdb-6.8-inlining-addon.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-inlining-addon.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gdb-6.8-inlining-addon.patch 2 Mar 2009 00:11:35 -0000 1.4 +++ gdb-6.8-inlining-addon.patch 7 Mar 2009 00:32:30 -0000 1.5 @@ -5,10 +5,10 @@ resume() -> target_resume() move of clear_inline_frame_state() is for: gdb.mi/mi-nsmoribund.exp -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.c +Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/inline-bt.c 2009-02-28 07:34:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.c 2009-02-28 07:37:54.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-bt.c 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c 2009-03-06 19:07:30.000000000 +0100 @@ -13,10 +13,16 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -28,10 +28,10 @@ inline int func1(void) { -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.exp +Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/inline-bt.exp 2009-02-28 07:34:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-bt.exp 2009-02-28 07:37:54.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-bt.exp 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp 2009-03-06 19:07:30.000000000 +0100 @@ -41,18 +41,19 @@ if { [skip_inline_frame_tests] } { return } @@ -60,10 +60,10 @@ gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (3)" gdb_test "backtrace" "#0 bar.*#1 .*func1.*#2 .*func2.*#3 .*main.*" \ -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.c +Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/inline-cmds.c 2009-02-28 07:34:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.c 2009-02-28 07:37:54.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-cmds.c 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c 2009-03-06 19:07:30.000000000 +0100 @@ -13,13 +13,19 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -86,10 +86,10 @@ inline int func1(void) { bar (); -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.exp +Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-02-28 07:34:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-02-28 07:37:54.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-03-06 19:07:30.000000000 +0100 @@ -45,28 +45,28 @@ if { [skip_inline_frame_tests] } { # First, check that the things we expected to be inlined really were, @@ -180,10 +180,10 @@ +gdb_test "info frame" "inlined into frame.*" "outer_inline2 inlined" +gdb_test "fini" "" "up from outer_inline2" +gdb_test "info frame" " in main \[^\n\]*\n source language.*" "main not inlined" -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.c +Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/inline-locals.c 2009-02-28 07:34:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.c 2009-02-28 07:37:54.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-locals.c 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c 2009-03-06 19:07:30.000000000 +0100 @@ -13,11 +13,16 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -203,10 +203,10 @@ inline int func1(int arg1) { -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.exp +Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/inline-locals.exp 2009-02-28 07:34:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-locals.exp 2009-02-28 07:37:54.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-locals.exp 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp 2009-03-06 19:07:30.000000000 +0100 @@ -43,8 +43,8 @@ if { [skip_inline_var_tests] } { set no_frames [skip_inline_frame_tests] @@ -236,10 +236,10 @@ + setup_kfail *-*-* "gcc/debug.optimization" +} gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local (3)" -Index: gdb-6.8.50.20090226/gdb/frame.c +Index: gdb-6.8.50.20090302/gdb/frame.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/frame.c 2009-02-28 07:34:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/frame.c 2009-02-28 07:37:54.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/frame.c 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/frame.c 2009-03-06 19:07:30.000000000 +0100 @@ -269,7 +269,7 @@ fprint_frame (struct ui_file *file, stru static struct frame_info * skip_inlined_frames (struct frame_info *frame) @@ -276,10 +276,10 @@ { sal->symtab = SYMBOL_SYMTAB (sym); sal->line = SYMBOL_LINE (sym); -Index: gdb-6.8.50.20090226/gdb/breakpoint.c +Index: gdb-6.8.50.20090302/gdb/breakpoint.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/breakpoint.c 2009-02-28 07:34:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/breakpoint.c 2009-02-28 07:37:54.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/breakpoint.c 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/breakpoint.c 2009-03-06 19:07:30.000000000 +0100 @@ -57,6 +57,7 @@ #include "top.h" #include "wrapper.h" @@ -343,10 +343,10 @@ b = set_raw_breakpoint (sal, type); b->enable_state = bp_enabled; -Index: gdb-6.8.50.20090226/gdb/inline-frame.c +Index: gdb-6.8.50.20090302/gdb/inline-frame.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/inline-frame.c 2009-02-28 07:34:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/inline-frame.c 2009-02-28 07:37:54.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/inline-frame.c 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/inline-frame.c 2009-03-06 19:07:30.000000000 +0100 @@ -183,6 +183,12 @@ inline_frame_sniffer (const struct frame if (frame_block == NULL) return 0; @@ -423,10 +423,10 @@ /* Return the number of hidden functions inlined into the current frame. */ -Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-markers.c +Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.opt/inline-markers.c 2009-02-28 07:34:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.opt/inline-markers.c 2009-02-28 07:37:54.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-markers.c 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c 2009-03-06 19:07:30.000000000 +0100 @@ -15,11 +15,6 @@ extern int x, y; @@ -439,10 +439,10 @@ void marker(void) { x += y; /* set breakpoint 2 here */ -Index: gdb-6.8.50.20090226/gdb/gdbthread.h +Index: gdb-6.8.50.20090302/gdb/gdbthread.h =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/gdbthread.h 2009-02-28 07:34:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/gdbthread.h 2009-02-28 07:37:54.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/gdbthread.h 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/gdbthread.h 2009-03-06 19:07:30.000000000 +0100 @@ -180,6 +180,12 @@ struct thread_info /* Private data used by the target vector implementation. */ @@ -456,10 +456,10 @@ }; /* Create an empty thread list, or empty the existing one. */ -Index: gdb-6.8.50.20090226/gdb/infcmd.c +Index: gdb-6.8.50.20090302/gdb/infcmd.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/infcmd.c 2009-02-28 07:34:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/infcmd.c 2009-02-28 07:37:54.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/infcmd.c 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/infcmd.c 2009-03-06 19:07:30.000000000 +0100 @@ -1391,11 +1391,11 @@ finish_command_continuation (void *arg) struct type *value_type; @@ -600,10 +600,10 @@ } -Index: gdb-6.8.50.20090226/gdb/infrun.c +Index: gdb-6.8.50.20090302/gdb/infrun.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/infrun.c 2009-02-28 07:37:36.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/infrun.c 2009-02-28 07:37:54.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/infrun.c 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/infrun.c 2009-03-06 19:07:30.000000000 +0100 @@ -1152,8 +1152,6 @@ a command like `return' or `jump' to con step = 0; } @@ -622,10 +622,10 @@ } static int -Index: gdb-6.8.50.20090226/gdb/target.c +Index: gdb-6.8.50.20090302/gdb/target.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/target.c 2009-02-28 07:31:48.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/target.c 2009-02-28 07:38:36.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/target.c 2009-03-06 19:07:26.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/target.c 2009-03-06 19:07:30.000000000 +0100 @@ -41,6 +41,7 @@ #include "target-descriptions.h" #include "gdbthread.h" @@ -642,10 +642,10 @@ dcache_invalidate (target_dcache); for (t = current_target.beneath; t != NULL; t = t->beneath) -Index: gdb-6.8.50.20090226/gdb/inline-frame.h +Index: gdb-6.8.50.20090302/gdb/inline-frame.h =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/inline-frame.h 2009-02-28 07:34:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/inline-frame.h 2009-02-28 07:37:54.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/inline-frame.h 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/inline-frame.h 2009-03-06 19:07:30.000000000 +0100 @@ -43,6 +43,10 @@ void clear_inline_frame_state (ptid_t pt void step_into_inline_frame (ptid_t ptid); @@ -657,10 +657,10 @@ /* Return the number of hidden functions inlined into the current frame. */ -Index: gdb-6.8.50.20090226/gdb/infcall.c +Index: gdb-6.8.50.20090302/gdb/infcall.c =================================================================== ---- gdb-6.8.50.20090226.orig/gdb/infcall.c 2009-02-28 07:34:09.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/infcall.c 2009-02-28 07:37:54.000000000 +0100 +--- gdb-6.8.50.20090302.orig/gdb/infcall.c 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/infcall.c 2009-03-06 19:07:30.000000000 +0100 @@ -898,8 +898,15 @@ The program being debugged exited while if (unwind_on_signal_p) @@ -679,3 +679,35 @@ /* FIXME: Insert a bunch of wrap_here; name can be very long if it's a C++ name with arguments and stuff. */ +Index: gdb-6.8.50.20090302/gdb/dwarf2read.c +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/dwarf2read.c 2009-03-06 19:07:30.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/dwarf2read.c 2009-03-06 19:07:40.000000000 +0100 +@@ -3463,6 +3463,7 @@ read_func_scope (struct die_info *die, s + unsigned die_children = 0; + struct attribute *call_line, *call_file; + int inlined_func = (die->tag == DW_TAG_inlined_subroutine); ++ struct type *type; + + if (inlined_func) + { +@@ -3504,7 +3505,10 @@ read_func_scope (struct die_info *die, s + add_to_cu_func_list (name, lowpc, highpc, cu); + + new = push_context (0, lowpc); +- new->name = new_symbol (die, read_type_die (die, cu), cu); ++ type = read_type_die (die, cu); ++ gdb_assert (type != NULL); ++ new->name = new_symbol (die, type, cu); ++ gdb_assert (TYPE_CODE (SYMBOL_TYPE (new->name)) == TYPE_CODE_FUNC); + + /* If there is a location expression for DW_AT_frame_base, record + it. */ +@@ -8746,6 +8750,7 @@ read_type_die (struct die_info *die, str + break; + case DW_TAG_subprogram: + case DW_TAG_subroutine_type: ++ case DW_TAG_inlined_subroutine: + this_type = read_subroutine_type (die, cu); + break; + case DW_TAG_array_type: gdb-archer.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 gdb-archer.patch Index: gdb-archer.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-archer.patch 2 Mar 2009 23:14:15 -0000 1.2 +++ gdb-archer.patch 7 Mar 2009 00:32:30 -0000 1.3 @@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ArcherBranchManagement GIT snapshot: -commit 8cc3753a9aad85bf53bef54c04334c60d16cb251 +commit 6cf16c0711e844094ab694b3d929f7bd30b49f61 branch `archer' - the merge of branches: archer-jankratochvil-merge-expr @@ -21,10 +21,10 @@ diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index 74aa72e..fdb0582 100644 +index 74aa72e..c84a4ac 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -167,11 +167,18 @@ INTL_CFLAGS = @INCINTL@ +@@ -167,11 +167,20 @@ INTL_CFLAGS = @INCINTL@ # Where is the ICONV library? This can be empty if libc has iconv. LIBICONV = @LIBICONV@ @@ -38,12 +38,14 @@ +# Did the user give us a --with-gdb-datadir option? +GDB_DATADIR_PATH = @GDB_DATADIR_PATH@ + -+GDB_PYTHONDIR_PATH = @GDB_PYTHONDIR_PATH@ ++# The argument to --with-pythondir. If not given, this is ++# GDB_DATADIR_PATH/python. ++pythondir = @pythondir@ + # Helper code from gnulib. LIBGNU = gnulib/libgnu.a INCGNU = -I$(srcdir)/gnulib -Ignulib -@@ -270,12 +277,34 @@ SUBDIR_TUI_CFLAGS= \ +@@ -270,12 +279,34 @@ SUBDIR_TUI_CFLAGS= \ # SUBDIR_PYTHON_OBS = \ python.o \ @@ -78,7 +80,7 @@ python/python-utils.c \ python/python-value.c SUBDIR_PYTHON_DEPS = -@@ -390,7 +419,8 @@ INTERNAL_CFLAGS_BASE = \ +@@ -390,7 +421,8 @@ INTERNAL_CFLAGS_BASE = \ $(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \ $(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \ $(BFD_CFLAGS) $(INCLUDE_CFLAGS) $(LIBDECNUMBER_CFLAGS) \ @@ -88,7 +90,7 @@ INTERNAL_WARN_CFLAGS = $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS) INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS) -@@ -402,7 +432,7 @@ LDFLAGS = @LDFLAGS@ +@@ -402,7 +434,7 @@ LDFLAGS = @LDFLAGS@ # I think it's perfectly reasonable for a user to set -pg in CFLAGS # and have it work; that's why CFLAGS is here. # PROFILE_CFLAGS is _not_ included, however, because we use monstartup. @@ -97,7 +99,7 @@ # If your system is missing alloca(), or, more likely, it's there but # it doesn't work, then refer to libiberty. -@@ -663,6 +693,7 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \ +@@ -663,6 +695,7 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \ valarith.c valops.c valprint.c value.c varobj.c vec.c \ wrapper.c \ xml-tdesc.c xml-support.c \ @@ -105,7 +107,7 @@ inferior.c LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c -@@ -733,7 +764,8 @@ config/sparc/nm-sol2.h config/nm-linux.h config/mips/nm-irix5.h \ +@@ -733,7 +766,8 @@ config/sparc/nm-sol2.h config/nm-linux.h config/mips/nm-irix5.h \ config/rs6000/nm-rs6000.h top.h bsd-kvm.h gdb-stabs.h reggroups.h \ annotate.h sim-regno.h dictionary.h dfp.h main.h frame-unwind.h \ remote-fileio.h i386-linux-tdep.h vax-tdep.h objc-lang.h \ @@ -115,7 +117,7 @@ # Header files that already have srcdir in them, or which are in objdir. -@@ -812,10 +844,16 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \ +@@ -812,10 +846,16 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \ trad-frame.o \ tramp-frame.o \ solib.o solib-null.o \ @@ -133,7 +135,7 @@ TSOBS = inflow.o SUBDIRS = @subdirs@ -@@ -849,11 +887,38 @@ generated_files = config.h observer.h observer.inc ada-lex.c \ +@@ -849,11 +889,38 @@ generated_files = config.h observer.h observer.inc ada-lex.c \ $(COMPILE) $< $(POSTCOMPILE) @@ -173,7 +175,7 @@ installcheck: # The check target can not use subdir_do, because subdir_do does not -@@ -907,8 +972,11 @@ gdb.z:gdb.1 +@@ -907,8 +974,11 @@ gdb.z:gdb.1 # source file and doesn't care about rebuilding or just wants to save the # time it takes for make to check that all is up to date. # install-only is intended to address that need. @@ -187,7 +189,7 @@ transformed_name=`t='$(program_transform_name)'; \ echo gdb | sed -e "$$t"` ; \ if test "x$$transformed_name" = x; then \ -@@ -1202,6 +1270,12 @@ stamp-h: config.in config.status +@@ -1202,6 +1272,12 @@ stamp-h: config.in config.status CONFIG_LINKS= \ $(SHELL) config.status @@ -200,7 +202,7 @@ config.status: configure configure.tgt configure.host $(SHELL) config.status --recheck -@@ -1845,10 +1919,54 @@ python.o: $(srcdir)/python/python.c +@@ -1845,10 +1921,54 @@ python.o: $(srcdir)/python/python.c $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python.c $(POSTCOMPILE) @@ -255,7 +257,7 @@ python-utils.o: $(srcdir)/python/python-utils.c $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-utils.c $(POSTCOMPILE) -@@ -1857,6 +1975,39 @@ python-value.o: $(srcdir)/python/python-value.c +@@ -1857,6 +1977,38 @@ python-value.o: $(srcdir)/python/python-value.c $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-value.c $(POSTCOMPILE) @@ -271,24 +273,23 @@ + gdb/__init__.py + +# Install the Python library. Python library files go under -+# $(GDB_PYTHONDIR_PATH)/python. ++# $(pythondir). +install-python: + files='$(PY_FILES)'; for file in $$files; do \ + dir=`echo "$$file" | sed 's,/[^/]*$$,,'`; \ -+ $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_PYTHONDIR_PATH)/$$dir; \ -+ $(INSTALL_DATA) $(srcdir)/python/lib/$$file $(DESTDIR)$(GDB_PYTHONDIR_PATH)/$$file; \ ++ $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(pythondir)/$$dir; \ ++ $(INSTALL_DATA) $(srcdir)/python/lib/$$file $(DESTDIR)$(pythondir)/$$file; \ + done + -+# Other packages may have their files installed in $(GDB_PYTHONDIR_PATH). ++# Other packages may have their files installed in $(pythondir). +uninstall-python: -+ rm -rf $(DESTDIR)/$(GDB_PYTHONDIR_PATH)/python + files='$(PY_FILES)'; for file in $$files; do \ -+ dir=`echo "$$file" | sed 's,/[^/]*$$,,'`; \ -+ rm -f $(DESTDIR)$(GDB_PYTHONDIR_PATH)/$$file; \ -+ while test "x$$file" != "x$$dir"; do \ -+ rmdir 2>/dev/null "$(DESTDIR)$(GDB_PYTHONDIR_PATH)/$$dir"; \ -+ file="$$dir"; \ -+ dir=`echo "$$file" | sed 's,/[^/]*$$,,'`; \ ++ slashdir=`echo "/$$file" | sed 's,/[^/]*$$,,'`; \ ++ rm -f $(DESTDIR)$(pythondir)/$$file; \ ++ while test "x$$file" != "x$$slashdir"; do \ ++ rmdir 2>/dev/null "$(DESTDIR)$(pythondir)$$slashdir"; \ ++ file="$$slashdir"; \ ++ slashdir=`echo "$$file" | sed 's,/[^/]*$$,,'`; \ + done \ + done + @@ -7099,7 +7100,7 @@ default_symfile_offsets, /* sym_offsets: xlate external to internal form */ default_symfile_segments, /* sym_segments: Get segment information from diff --git a/gdb/config.in b/gdb/config.in -index 6aaf77a..1cfb12b 100644 +index 6aaf77a..0c8ccab 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -42,6 +42,12 @@ @@ -7115,17 +7116,7 @@ /* Define to be a string naming the default host character set. */ #undef GDB_DEFAULT_HOST_CHARSET -@@ -60,6 +66,9 @@ - /* Define to the default OS ABI for this configuration. */ - #undef GDB_OSABI_DEFAULT - -+/* Base directory for GDB Python modules. */ -+#undef GDB_PYTHONDIR_PATH -+ - /* Define to 1 if you have `alloca', as a function or macro. */ - #undef HAVE_ALLOCA - -@@ -169,12 +178,18 @@ +@@ -169,12 +175,18 @@ /* Define if you have the iconv() function. */ #undef HAVE_ICONV [...2376 lines suppressed...] @@ -38716,7 +38833,7 @@ /* If the type is changeable, compare the old and the new values. If this is the initial assignment, we don't have any old value -@@ -1123,6 +1361,150 @@ install_new_value (struct varobj *var, struct value *value, int initial) +@@ -1123,6 +1364,150 @@ install_new_value (struct varobj *var, struct value *value, int initial) return changed; } @@ -38810,7 +38927,7 @@ + install_visualizer (var, pretty_printer); + do_cleanups (cleanup); +#else -+ error ("Python support required"); ++ /* No error is right as this function is inserted just as a hook. */ +#endif +} + @@ -38867,7 +38984,7 @@ /* Update the values for a variable and its children. This is a two-pronged attack. First, re-parse the value for the root's expression to see if it's changed. Then go all the way -@@ -1148,7 +1530,7 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit) +@@ -1148,7 +1533,7 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit) struct varobj **cv; struct varobj **templist = NULL; struct value *new; @@ -38876,7 +38993,7 @@ VEC (varobj_update_result) *result = NULL; struct frame_info *fi; -@@ -1187,20 +1569,85 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit) +@@ -1187,20 +1572,85 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit) if (new == NULL) r.status = VAROBJ_NOT_IN_SCOPE; @@ -38970,7 +39087,7 @@ /* Push any children. Use reverse order so that the first child is popped from the work stack first, and so -@@ -1211,26 +1658,18 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit) +@@ -1211,26 +1661,18 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit) varobj_p c = VEC_index (varobj_p, v->children, i); /* Child may be NULL if explicitly deleted by -var-delete. */ if (c != NULL && !c->frozen) @@ -39004,7 +39121,7 @@ return result; } -@@ -1429,16 +1868,23 @@ uninstall_variable (struct varobj *var) +@@ -1429,16 +1871,23 @@ uninstall_variable (struct varobj *var) static struct varobj * create_child (struct varobj *parent, int index, char *name) { @@ -39031,7 +39148,7 @@ child->parent = parent; child->root = parent->root; childs_name = xstrprintf ("%s.%s", parent->obj_name, name); -@@ -1487,6 +1933,10 @@ new_variable (void) +@@ -1487,6 +1936,10 @@ new_variable (void) var->print_value = NULL; var->frozen = 0; var->not_fetched = 0; @@ -39042,7 +39159,7 @@ return var; } -@@ -1519,6 +1969,14 @@ free_variable (struct varobj *var) +@@ -1519,6 +1972,14 @@ free_variable (struct varobj *var) xfree (var->root); } @@ -39057,7 +39174,26 @@ xfree (var->name); xfree (var->obj_name); xfree (var->print_value); -@@ -1792,24 +2250,71 @@ my_value_of_variable (struct varobj *var, enum varobj_display_formats format) +@@ -1538,6 +1999,18 @@ make_cleanup_free_variable (struct varobj *var) + return make_cleanup (do_free_variable_cleanup, var); + } + ++static void ++do_uninstall_variable_cleanup (void *var) ++{ ++ uninstall_variable (var); ++} ++ ++static struct cleanup * ++make_cleanup_uninstall_variable (struct varobj *var) ++{ ++ return make_cleanup (do_uninstall_variable_cleanup, var); ++} ++ + /* This returns the type of the variable. It also skips past typedefs + to return the real type of the variable. + +@@ -1792,24 +2265,71 @@ my_value_of_variable (struct varobj *var, enum varobj_display_formats format) return NULL; } @@ -39133,7 +39269,7 @@ thevalue = ui_file_xstrdup (stb, &dummy); do_cleanups (old_chain); -@@ -1900,7 +2405,7 @@ varobj_floating_p (struct varobj *var) +@@ -1900,7 +2420,7 @@ varobj_floating_p (struct varobj *var) value is not known. If WAS_PTR is not NULL, set *WAS_PTR to 0 or 1 @@ -39142,7 +39278,7 @@ in this function. */ static void adjust_value_for_child_access (struct value **value, -@@ -2269,6 +2774,11 @@ c_value_of_variable (struct varobj *var, enum varobj_display_formats format) +@@ -2269,6 +2789,11 @@ c_value_of_variable (struct varobj *var, enum varobj_display_formats format) catch that case explicitly. */ struct type *type = get_type (var); @@ -39154,7 +39290,7 @@ /* Strip top-level references. */ while (TYPE_CODE (type) == TYPE_CODE_REF) type = check_typedef (TYPE_TARGET_TYPE (type)); -@@ -2313,7 +2823,8 @@ c_value_of_variable (struct varobj *var, enum varobj_display_formats format) +@@ -2313,7 +2838,8 @@ c_value_of_variable (struct varobj *var, enum varobj_display_formats format) if (format == var->format) return xstrdup (var->print_value); else @@ -39721,3 +39857,72 @@ +const char **xml_list_of_syscalls (const struct syscalls_info *sysinfo); + +#endif /* XML_SYSCALL_H */ +diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c +index c872db5..5e70395 100644 +--- a/opcodes/ppc-opc.c ++++ b/opcodes/ppc-opc.c +@@ -4560,8 +4560,8 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"lhbrx", X(31,790), X_MASK, COM, PPCNONE, {RT, RA0, RB}}, + +-{"lfqx", X(31,791), X_MASK, POWER2, PPCNONE, {FRT, RA, RB}}, + {"lfdpx", X(31,791), X_MASK, POWER6, POWER7, {FRT, RA, RB}}, ++{"lfqx", X(31,791), X_MASK, POWER2, PPCNONE, {FRT, RA, RB}}, + + {"sraw", XRC(31,792,0), X_MASK, PPCCOM, PPCNONE, {RA, RS, RB}}, + {"sra", XRC(31,792,0), X_MASK, PWRCOM, PPCNONE, {RA, RS, RB}}, +@@ -4638,8 +4638,8 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"sthbrx", X(31,918), X_MASK, COM, PPCNONE, {RS, RA0, RB}}, + +-{"stfqx", X(31,919), X_MASK, POWER2, PPCNONE, {FRS, RA, RB}}, + {"stfdpx", X(31,919), X_MASK, POWER6, PPCNONE, {FRS, RA, RB}}, ++{"stfqx", X(31,919), X_MASK, POWER2, PPCNONE, {FRS, RA, RB}}, + + {"sraq", XRC(31,920,0), X_MASK, M601, PPCNONE, {RA, RS, RB}}, + {"sraq.", XRC(31,920,1), X_MASK, M601, PPCNONE, {RA, RS, RB}}, +@@ -4801,12 +4801,12 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"psq_l", OP(56), OP_MASK, PPCPS, PPCNONE, {FRT,PSD,RA,PSW,PSQ}}, + ++{"lfdp", OP(57), OP_MASK, POWER6, POWER7, {FRT, D, RA0}}, ++ + {"lfqu", OP(57), OP_MASK, POWER2, PPCNONE, {FRT, D, RA0}}, + + {"psq_lu", OP(57), OP_MASK, PPCPS, PPCNONE, {FRT,PSD,RA,PSW,PSQ}}, + +-{"lfdp", OP(57), OP_MASK, POWER6, POWER7, {FRT, D, RA0}}, +- + {"ld", DSO(58,0), DS_MASK, PPC64, PPCNONE, {RT, DS, RA0}}, + {"ldu", DSO(58,1), DS_MASK, PPC64, PPCNONE, {RT, DS, RAL}}, + {"lwa", DSO(58,2), DS_MASK, PPC64, PPCNONE, {RT, DS, RA0}}, +@@ -4921,10 +4921,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"fcfidus", XRC(59,974,0), XRA_MASK, POWER7, PPCNONE, {FRT, FRB}}, + {"fcfidus.", XRC(59,974,1), XRA_MASK, POWER7, PPCNONE, {FRT, FRB}}, + +-{"stfq", OP(60), OP_MASK, POWER2, PPCNONE, {FRS, D, RA}}, +- +-{"psq_st", OP(60), OP_MASK, PPCPS, PPCNONE, {FRS,PSD,RA,PSW,PSQ}}, +- + {"xxsldwi", XX3(60,2), XX3SHW_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6, SHW}}, + {"xxsel", XX4(60,3), XX4_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6, XC6}}, + {"xxspltd", XX3(60,10), XX3DM_MASK, PPCVSX, PPCNONE, {XT6, XA6, XB6S, DMEX}}, +@@ -5067,12 +5063,16 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"xvcvsxddp", XX2(60,504), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + {"xvnegdp", XX2(60,505), XX2_MASK, PPCVSX, PPCNONE, {XT6, XB6}}, + +-{"psq_stu", OP(61), OP_MASK, PPCPS, PPCNONE, {FRS,PSD,RA,PSW,PSQ}}, ++{"stfq", OP(60), OP_MASK, POWER2, PPCNONE, {FRS, D, RA}}, + +-{"stfqu", OP(61), OP_MASK, POWER2, PPCNONE, {FRS, D, RA}}, ++{"psq_st", OP(60), OP_MASK, PPCPS, PPCNONE, {FRS,PSD,RA,PSW,PSQ}}, + + {"stfdp", OP(61), OP_MASK, POWER6, PPCNONE, {FRT, D, RA0}}, + ++{"stfqu", OP(61), OP_MASK, POWER2, PPCNONE, {FRS, D, RA}}, ++ ++{"psq_stu", OP(61), OP_MASK, PPCPS, PPCNONE, {FRS,PSD,RA,PSW,PSQ}}, ++ + {"std", DSO(62,0), DS_MASK, PPC64, PPCNONE, {RS, DS, RA0}}, + {"stdu", DSO(62,1), DS_MASK, PPC64, PPCNONE, {RS, DS, RAS}}, + {"stq", DSO(62,2), DS_MASK, POWER4, PPCNONE, {RSQ, DS, RA0}}, Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.326 retrieving revision 1.327 diff -u -r1.326 -r1.327 --- gdb.spec 6 Mar 2009 22:49:37 -0000 1.326 +++ gdb.spec 7 Mar 2009 00:32:30 -0000 1.327 @@ -13,7 +13,7 @@ # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 2%{?_with_upstream:.upstream}%{?dist} +Release: 3%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -386,21 +386,23 @@ %if 0%{?_with_testsuite:1} BuildRequires: sharutils dejagnu # gcc-objc++ is not covered by the GDB testsuite. -BuildRequires: gcc gcc-c++ gcc-gfortran gcc-java gcc-objc fpc +BuildRequires: gcc gcc-c++ gcc-gfortran gcc-java gcc-objc fpc glibc-static # Ensure the devel libraries are installed for both multilib arches. %define multilib_64_archs sparc64 ppc64 s390x x86_64 # Copied from gcc-4.1.2-32 %ifarch %{ix86} x86_64 ia64 ppc alpha BuildRequires: gcc-gnat %ifarch %{multilib_64_archs} ppc -BuildRequires: %{_exec_prefix}/lib64/libgnat-4.3.so %{_exec_prefix}/lib/libgnat-4.3.so +BuildRequires: %{_exec_prefix}/lib64/libgnat-4.4.so %{_exec_prefix}/lib/libgnat-4.4.so %endif %endif %ifarch %{multilib_64_archs} sparc sparcv9 ppc BuildRequires: /lib/libc.so.6 %{_exec_prefix}/lib/libc.so /lib64/libc.so.6 %{_exec_prefix}/lib64/libc.so BuildRequires: /lib/libgcc_s.so.1 /lib64/libgcc_s.so.1 BuildRequires: %{_exec_prefix}/lib/libstdc++.so.6 %{_exec_prefix}/lib64/libstdc++.so.6 -BuildRequires: %{_exec_prefix}/lib64/libgcj.so.9 %{_exec_prefix}/lib/libgcj.so.9 +BuildRequires: %{_exec_prefix}/lib64/libgcj.so.10 %{_exec_prefix}/lib/libgcj.so.10 +# multilib glibc-static is open Bug 488472: +#BuildRequires: %{_exec_prefix}/lib64/libc.a %{_exec_prefix}/lib/libc.a # for gcc-java: BuildRequires: %{_exec_prefix}/lib64/libz.so %{_exec_prefix}/lib/libz.so %endif @@ -612,7 +614,8 @@ --sysconfdir=%{_sysconfdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ - --with-gdb-datadir=%{_datadir}/%{name} \ + --with-gdb-datadir=%{_datadir}/gdb \ + --with-pythondir=%{python_sitelib} \ --enable-gdb-build-warnings=,-Wno-unused \ %ifnarch %{ix86} alpha ia64 ppc s390 s390x x86_64 ppc64 sparcv9 sparc64 --disable-werror \ @@ -755,6 +758,9 @@ cmp $RPM_BUILD_ROOT%{_mandir}/*/gdb.1 $RPM_BUILD_ROOT%{_mandir}/*/gdbtui.1 ln -sf gdb.1 $RPM_BUILD_ROOT%{_mandir}/*/gdbtui.1 +# A part of the libstdc++ rpm. +rm -rf $RPM_BUILD_ROOT%{python_sitelib}/gdb/libstdcxx + # Remove the files that are part of a gdb build but that are owned and # provided by other packages. # These are part of binutils @@ -830,11 +836,21 @@ %endif %changelog +* Sat Mar 7 2009 Jan Kratochvil - 6.8.50.20090302-3 +- Archer update to the snapshot: 6cf16c0711e844094ab694b3d929f7bd30b49f61 +- Fix crash on the inlined functions support. +- Fix crash from the PIE support, its varobj_refresh() was called only before + varobj_invalidate() which is sufficient. +- Fix BuildRequires for the `--with testsuite' runs. +- Use the newly introduced `--with-pythondir' option. +- Remove libstdcxx [python] pretty printers (as included in libstdc++ rpm now). + * Fri Mar 06 2009 Jesse Keating - 6.8.50.20090302-2 - Rebuild for new rpm libs * Mon Mar 2 2009 Jan Kratochvil - 6.8.50.20090302-1 - Include the Archer Project: http://sourceware.org/gdb/wiki/ProjectArcher + snapshot: 8cc3753a9aad85bf53bef54c04334c60d16cb251 * [python] Python scripting support: http://sourceware.org/gdb/wiki/PythonGdb * [catch-syscall] Trap and display syscalls. * [delayed-symfile] Improve startup performance by lazily read psymtabs. From konradm at fedoraproject.org Sat Mar 7 00:54:23 2009 From: konradm at fedoraproject.org (Conrad Meyer) Date: Sat, 7 Mar 2009 00:54:23 +0000 (UTC) Subject: rpms/ghc-haskell-src-exts/devel ghc-haskell-src-exts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307005423.2406670116@cvs1.fedora.phx.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/ghc-haskell-src-exts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29037/devel Modified Files: .cvsignore sources Added Files: ghc-haskell-src-exts.spec import.log Log Message: Import. --- NEW FILE ghc-haskell-src-exts.spec --- %global pkg_name haskell-src-exts %global ghc_version 6.10.1 %global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version} %global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version} %bcond_without prof %bcond_without doc # ghc does not emit debug information %global debug_package %{nil} Name: ghc-%{pkg_name} Version: 0.4.8 Release: 3%{?dist} Summary: Library for Manipulating Haskell source Group: Development/Libraries License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: %{name}-devel = %{version}-%{release} # ghc has only been bootstrapped on the following archs: ExclusiveArch: i386 x86_64 ppc BuildRequires: ghc = %{ghc_version} %if %{with doc} BuildRequires: ghc-doc = %{ghc_version} %endif %if %{with prof} BuildRequires: ghc-prof = %{ghc_version} %endif BuildRequires: ghc-cpphs BuildRequires: ghc-cpphs-prof BuildRequires: happy Requires: ghc = %{ghc_version} Requires: cpphs Requires: happy Requires(post): ghc = %{ghc_version} Requires(preun): ghc = %{ghc_version} %description Haskell-Source with Extensions (HSE, haskell-src-exts) is an extension of the standard haskell-src package, and handles most common syntactic extensions to Haskell, including: * Multi-parameter type classes with functional dependencies * Indexed type families (including associated types) * Empty data declarations * GADTs * Implicit parameters * Template Haskell and a few more. Apart from these standard extensions, it also handles regular patterns as per the HaRP extension as well as HSX-style embedded XML syntax. %if %{with doc} %package doc Summary: Documentation for %{name} Group: Development/Libraries Requires: ghc-doc = %{ghc_version} Requires(post): ghc-doc = %{ghc_version} Requires(postun): ghc-doc = %{ghc_version} %description doc This package contains development documentation files for the %{name} library. %endif %if %{with prof} %package prof Summary: Profiling libraries for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: ghc-prof = %{ghc_version} Requires: ghc-cpphs-prof %description prof This package contains profiling libraries for ghc %{ghc_version}. %endif %prep %setup -q -n %{pkg_name}-%{version} %build %cabal_configure --ghc %{!?without_prof:-p} %cabal build %if %{with doc} %cabal haddock %endif %ghc_gen_scripts %install rm -rf $RPM_BUILD_ROOT %cabal_install %ghc_install_scripts %ghc_gen_filelists %{name} %clean rm -rf $RPM_BUILD_ROOT %post %ghc_register_pkg %if %{with doc} %post doc %ghc_reindex_haddock %endif %preun if [ "$1" -eq 0 ] ; then %ghc_unregister_pkg fi %if %{with doc} %postun doc if [ "$1" -eq 0 ] ; then %ghc_reindex_haddock fi %endif %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE %if %{with doc} %files doc %defattr(-,root,root,-) %{pkg_docdir} %endif %if %{with prof} %files prof -f %{name}-prof.files %defattr(-,root,root,-) %endif %changelog * Mon Feb 16 2009 Conrad Meyer - 0.4.8-3 - Update to new cabal2spec template. - Replace %%defines by %%globals. * Wed Jan 21 2009 Conrad Meyer - 0.4.8-2 - update to new haskell packaging template * Mon Jan 12 2009 Conrad Meyer - 0.4.8-1 - initial packaging for Fedora created by cabal2spec --- NEW FILE import.log --- ghc-haskell-src-exts-0_4_8-3_fc10:HEAD:ghc-haskell-src-exts-0.4.8-3.fc10.src.rpm:1236387201 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ghc-haskell-src-exts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:35:31 -0000 1.1 +++ .cvsignore 7 Mar 2009 00:53:52 -0000 1.2 @@ -0,0 +1 @@ +haskell-src-exts-0.4.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ghc-haskell-src-exts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:35:31 -0000 1.1 +++ sources 7 Mar 2009 00:53:52 -0000 1.2 @@ -0,0 +1 @@ +a8bbb3de67480cfd2e3c4d7ad553a11d haskell-src-exts-0.4.8.tar.gz From konradm at fedoraproject.org Sat Mar 7 01:03:28 2009 From: konradm at fedoraproject.org (Conrad Meyer) Date: Sat, 7 Mar 2009 01:03:28 +0000 (UTC) Subject: rpms/ghc-haskell-src-exts/devel ghc-haskell-src-exts.spec,1.1,1.2 Message-ID: <20090307010328.841C370116@cvs1.fedora.phx.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/ghc-haskell-src-exts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30885 Modified Files: ghc-haskell-src-exts.spec Log Message: BR ghc-cpphs -> ghc-cpphs-devel Index: ghc-haskell-src-exts.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghc-haskell-src-exts/devel/ghc-haskell-src-exts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ghc-haskell-src-exts.spec 7 Mar 2009 00:53:52 -0000 1.1 +++ ghc-haskell-src-exts.spec 7 Mar 2009 01:02:58 -0000 1.2 @@ -29,7 +29,7 @@ %if %{with prof} BuildRequires: ghc-prof = %{ghc_version} %endif -BuildRequires: ghc-cpphs +BuildRequires: ghc-cpphs-devel BuildRequires: ghc-cpphs-prof BuildRequires: happy Requires: ghc = %{ghc_version} From rdieter at fedoraproject.org Sat Mar 7 01:20:26 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sat, 7 Mar 2009 01:20:26 +0000 (UTC) Subject: rpms/amarok/F-10 amarok.spec,1.133,1.134 Message-ID: <20090307012026.E321F70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/amarok/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2729/F-10 Modified Files: amarok.spec Log Message: fix min kdelibs dep Index: amarok.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- amarok.spec 6 Mar 2009 16:15:51 -0000 1.133 +++ amarok.spec 7 Mar 2009 01:19:56 -0000 1.134 @@ -2,7 +2,7 @@ Name: amarok Summary: Media player Version: 2.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -38,7 +38,7 @@ # %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1) %{?_qt4_version:Requires: qt4 >= %{_qt4_version}} -%{?_kdelibs4_version:Requires: kdelibs4 >= %{_kdelibs4_version}} +%{?kdelibs4_version:Requires: kdelibs4 >= %{_kdelibs4_version}} Requires(post): xdg-utils Requires(postun): xdg-utils @@ -136,7 +136,7 @@ %changelog -* Fri Mar 06 2009 Rex Dieter 2.0.2-2 +* Fri Mar 06 2009 Rex Dieter 2.0.2-3 - add minimal qt4,kdelibs4 deps * Wed Mar 04 2009 Rex Dieter 2.0.2-1 From rdieter at fedoraproject.org Sat Mar 7 01:20:27 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sat, 7 Mar 2009 01:20:27 +0000 (UTC) Subject: rpms/amarok/devel amarok.spec,1.140,1.141 Message-ID: <20090307012027.12ABE70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/amarok/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2729/devel Modified Files: amarok.spec Log Message: fix min kdelibs dep Index: amarok.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- amarok.spec 6 Mar 2009 16:13:53 -0000 1.140 +++ amarok.spec 7 Mar 2009 01:19:56 -0000 1.141 @@ -2,7 +2,7 @@ Name: amarok Summary: Media player Version: 2.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -38,7 +38,7 @@ # %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1) %{?_qt4_version:Requires: qt4 >= %{_qt4_version}} -%{?_kdelibs4_version:Requires: kdelibs4 >= %{_kdelibs4_version}} +%{?kdelibs4_version:Requires: kdelibs4 >= %{_kdelibs4_version}} Requires(post): xdg-utils Requires(postun): xdg-utils @@ -136,7 +136,7 @@ %changelog -* Fri Mar 06 2009 Rex Dieter 2.0.2-2 +* Fri Mar 06 2009 Rex Dieter 2.0.2-3 - add minimal qt4,kdelibs4 deps * Wed Mar 04 2009 Rex Dieter 2.0.2-1 From rdieter at fedoraproject.org Sat Mar 7 01:21:44 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sat, 7 Mar 2009 01:21:44 +0000 (UTC) Subject: rpms/amarok/F-10 amarok.spec,1.134,1.135 Message-ID: <20090307012144.B3A0E70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/amarok/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3038/F-10 Modified Files: amarok.spec Log Message: no really, really fix it Index: amarok.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- amarok.spec 7 Mar 2009 01:19:56 -0000 1.134 +++ amarok.spec 7 Mar 2009 01:21:14 -0000 1.135 @@ -38,7 +38,7 @@ # %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1) %{?_qt4_version:Requires: qt4 >= %{_qt4_version}} -%{?kdelibs4_version:Requires: kdelibs4 >= %{_kdelibs4_version}} +%{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}} Requires(post): xdg-utils Requires(postun): xdg-utils From rdieter at fedoraproject.org Sat Mar 7 01:21:45 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sat, 7 Mar 2009 01:21:45 +0000 (UTC) Subject: rpms/amarok/devel amarok.spec,1.141,1.142 Message-ID: <20090307012145.1A62270116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/amarok/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3038/devel Modified Files: amarok.spec Log Message: no really, really fix it Index: amarok.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- amarok.spec 7 Mar 2009 01:19:56 -0000 1.141 +++ amarok.spec 7 Mar 2009 01:21:14 -0000 1.142 @@ -38,7 +38,7 @@ # %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1) %{?_qt4_version:Requires: qt4 >= %{_qt4_version}} -%{?kdelibs4_version:Requires: kdelibs4 >= %{_kdelibs4_version}} +%{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}} Requires(post): xdg-utils Requires(postun): xdg-utils From mjakubicek at fedoraproject.org Sat Mar 7 01:36:47 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Sat, 7 Mar 2009 01:36:47 +0000 (UTC) Subject: rpms/boinc-client/devel boinc-guirpcauth.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 boinc-client.spec, 1.26, 1.27 sources, 1.4, 1.5 unicode, 1.1, NONE Message-ID: <20090307013647.9085A70116@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/boinc-client/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6449 Modified Files: .cvsignore boinc-client.spec sources Added Files: boinc-guirpcauth.patch Removed Files: unicode Log Message: - i386 arch conditional replaced by the %%{ix86} macro. - Rebase to current 6.4 branch, therefore using new suffix "r[revision]svn" instead of "[date]svn", fixes help button in the simple GUI (BZ#478713). - Trim CUDA prebuilt libraries from sources. - UTF8 conversion now done in spec, not in a separate 'unicode' script. - Add a short link to upstream's wiki about usage in Fedora into %%doc. - boincmgr turned into a wrapper script to allow passwordless connections from users of the boinc group (fix BZ#478715). boinc-guirpcauth.patch: --- NEW FILE boinc-guirpcauth.patch --- --- client/gui_rpc_server.cpp.orig 2009-03-07 02:00:20.000000000 +0100 +++ client/gui_rpc_server.cpp 2009-03-07 02:01:00.000000000 +0100 @@ -129,12 +129,7 @@ // they can cause code to execute as this user. // So better protect it. // - if (g_use_sandbox) { - // Allow group access so authorized administrator can modify it - chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR | S_IRGRP | S_IWGRP); - } else { - chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR); - } + chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR | S_IRGRP | S_IWGRP); #endif } } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Jan 2009 22:35:38 -0000 1.4 +++ .cvsignore 7 Mar 2009 01:36:16 -0000 1.5 @@ -1 +1 @@ -boinc-6.4.5.tar.bz2 +boinc-6.4.7.tar.bz2 Index: boinc-client.spec =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- boinc-client.spec 24 Feb 2009 21:59:03 -0000 1.26 +++ boinc-client.spec 7 Mar 2009 01:36:17 -0000 1.27 @@ -1,10 +1,10 @@ -%define snap 20081217 -%define version_ 6_4_5 +%define revision 17542 +%define version_ 6_4 Summary: The BOINC client core Name: boinc-client -Version: 6.4.5 -Release: 6.%{snap}svn%{?dist} +Version: 6.4.7 +Release: 1.r%{revision}svn%{?dist} License: LGPLv2+ Group: Applications/Engineering URL: http://boinc.berkeley.edu/ @@ -13,7 +13,6 @@ # svn export http://boinc.berkeley.edu/svn/tags/boinc_core_release_%{version_} # pushd boinc_core_release_%{version_} # ./_autosetup -# ./unicode . Convert changelogs to UTF8 # ./trim . Trim all binaries and other unnecessary things. # popd # tar -cjvf boinc-%{version}.tar.bz2 boinc_core_release_%{version_}/ @@ -22,19 +21,24 @@ Source2: boinc-client-logrotate-d Source3: boinc-manager.desktop Source8: trim -Source9: unicode #Remove -fomit-frame-pointer and -ffast-math gcc flags: #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/647 Patch1: boinc-gccflags.patch #Fix security bug BZ#479664 +#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/823 Patch2: boinc-rsa.patch #Change locales filenames from "BOINC Manager.mo" into "BOINC-Manager.mo" #so that we can use the find_lang macro. #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/722 #Fixed in SVN trunk, not yet in BOINC 6 branch. Patch3: boinc-locales.patch +#Both of these patches fix the gcc 4.4 build +#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/823 Patch4: boinc-gcc44.patch Patch5: boinc-client-6.4.5-event.patch +#Create password file rw for group, this enables passwordless connection +#of manager from users of the boinc group. +Patch6: boinc-guirpcauth.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: logrotate @@ -102,9 +106,23 @@ %patch3 -p1 %patch4 %patch5 -p1 +%patch6 + +# fix utf8 +iconv -f ISO88591 -t UTF8 < checkin_notes_2004 > checkin_notes_2004.utf8 +touch -r checkin_notes_2004 checkin_notes_2004.utf8 +mv checkin_notes_2004.utf8 checkin_notes_2004 + +iconv -f ISO88591 -t UTF8 < checkin_notes_2005 > checkin_notes_2005.utf8 +touch -r checkin_notes_2005 checkin_notes_2005.utf8 +mv checkin_notes_2005.utf8 checkin_notes_2005 + +iconv -f ISO88591 -t UTF8 < checkin_notes_2006 > checkin_notes_2006.utf8 +touch -r checkin_notes_2006 checkin_notes_2006.utf8 +mv checkin_notes_2006.utf8 checkin_notes_2006 %build -%ifarch i386 +%ifarch %{ix86} %define boinc_platform i686-pc-linux-gnu %endif %ifarch powerpc ppc @@ -129,7 +147,7 @@ # Parallel make does not work. -make -k +make %install rm -rf $RPM_BUILD_ROOT @@ -156,9 +174,15 @@ rm -rf $RPM_BUILD_ROOT%{_bindir}/upper_case pushd $RPM_BUILD_ROOT%{_bindir} - ln -s boinc_client boinc - mv boinc_gui boincmgr - mv boinc_cmd boinccmd +ln -s boinc_client boinc +mv boinc_cmd boinccmd +cat > boincmgr <<-EOF + #!/bin/bash + # wrapper script to allow passwordless manager connections from users of the boinc group + cd %{_localstatedir}/lib/boinc + boinc_gui +EOF +chmod a+x boincmgr popd rm $RPM_BUILD_ROOT%{_bindir}/ca-bundle.crt @@ -192,6 +216,11 @@ # bash-completion install -Dp -m644 client/scripts/boinc.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/boinc-client +# usability hints +cat > USAGE_FEDORA <<-EOF + For up-to-date instructions on how to setup BOINC client on Fedora, please have a look at: http://boinc.berkeley.edu/wiki/Installing_BOINC_on_Fedora +EOF + %clean rm -rf $RPM_BUILD_ROOT @@ -234,15 +263,9 @@ %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/bash_completion.d/ -%doc COPYING -%doc COPYRIGHT -%doc checkin_notes -%doc checkin_notes_2007 -%doc checkin_notes_2006 -%doc checkin_notes_2005 -%doc checkin_notes_2004 -%doc checkin_notes_2003 -%doc checkin_notes_2002 +%doc COPYING COPYRIGHT checkin_notes checkin_notes_2007 checkin_notes_2006 +%doc checkin_notes_2005 checkin_notes_2004 checkin_notes_2003 checkin_notes_2002 +%doc USAGE_FEDORA %{_bindir}/boinc %{_bindir}/boinc_client %{_bindir}/boinccmd @@ -257,6 +280,7 @@ %files -n boinc-manager -f BOINC-Manager.lang %defattr(-,root,root,-) +%{_bindir}/boinc_gui %{_bindir}/boincmgr %{_datadir}/applications/fedora-boinc-manager.desktop %{_datadir}/icons/hicolor/16x16/apps/boincmgr.png @@ -276,6 +300,16 @@ %{_includedir}/boinc/* %changelog +* Fri Mar 06 2009 Milos Jakubicek - 6.4.7-1.r17542svn +- i386 arch conditional replaced by the %%{ix86} macro. +- Rebase to current 6.4 branch, therefore using new suffix "r[revision]svn" + instead of "[date]svn", fixes help button in the simple GUI (BZ#478713). +- Trim CUDA prebuilt libraries from sources. +- UTF8 conversion now done in spec, not in a separate 'unicode' script. +- Add a short link to upstream's wiki about usage in Fedora into %%doc. +- boincmgr turned into a wrapper script to allow passwordless connections + from users of the boinc group (fix BZ#478715). + * Tue Feb 24 2009 Milos Jakubicek - 6.4.5-6.20081217svn - Added boinc-client-6.4.5-event.patch to fix build with gcc 4.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Jan 2009 22:35:38 -0000 1.4 +++ sources 7 Mar 2009 01:36:17 -0000 1.5 @@ -1 +1 @@ -98433ea90755d0579dcc778da99b9fa0 boinc-6.4.5.tar.bz2 +9593e6daa2d8604e274470065bd31b80 boinc-6.4.7.tar.bz2 --- unicode DELETED --- From jkratoch at fedoraproject.org Sat Mar 7 01:42:04 2009 From: jkratoch at fedoraproject.org (Jan Kratochvil) Date: Sat, 7 Mar 2009 01:42:04 +0000 (UTC) Subject: rpms/gdb/devel gdb-6.6-buildid-locate-rpm.patch, NONE, 1.1 gdb-6.6-buildid-locate.patch, 1.17, 1.18 gdb.spec, 1.327, 1.328 Message-ID: <20090307014204.2801170116@cvs1.fedora.phx.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7861 Modified Files: gdb-6.6-buildid-locate.patch gdb.spec Added Files: gdb-6.6-buildid-locate-rpm.patch Log Message: * Sat Mar 7 2009 Jan Kratochvil - 6.8.50.20090302-4 - Split `gdb-6.6-buildid-locate.patch' to `gdb-6.6-buildid-locate-rpm.patch'. gdb-6.6-buildid-locate-rpm.patch: --- NEW FILE gdb-6.6-buildid-locate-rpm.patch --- --- ./gdb/Makefile.in 2009-03-07 01:45:51.000000000 +0100 +++ ./gdb/Makefile.in 2009-03-07 01:52:00.000000000 +0100 @@ -396,7 +396,7 @@ CONFIG_UNINSTALL = @CONFIG_UNINSTALL@ # your system doesn't have fcntl.h in /usr/include (which is where it # should be according to Posix). DEFS = @DEFS@ -GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config -DLOCALEDIR="\"$(localedir)\"" $(DEFS) +GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config -I$(includedir)/rpm -DLOCALEDIR="\"$(localedir)\"" $(DEFS) # MH_CFLAGS, if defined, has host-dependent CFLAGS from the config directory. GLOBAL_CFLAGS = $(MH_CFLAGS) @@ -449,7 +449,7 @@ INSTALLED_LIBS=-lbfd -lreadline -lopcode CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \ $(XM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \ $(LIBICONV) $(LIBEXPAT) \ - $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) + $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) -lrpm CDEPS = $(XM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \ $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) --- ./gdb/event-top.c 2009-03-07 02:29:51.000000000 +0100 +++ ./gdb/event-top.c 2009-03-07 01:52:00.000000000 +0100 @@ -33,6 +33,7 @@ #include "cli/cli-script.h" /* for reset_command_nest_depth */ #include "main.h" #include "gdbthread.h" +#include "symfile.h" /* For dont_repeat() */ #include "gdbcmd.h" @@ -193,6 +194,8 @@ cli_command_loop (void) char *a_prompt; char *gdb_prompt = get_prompt (); + debug_flush_missing (); + /* Tell readline what the prompt to display is and what function it will need to call after a whole line is read. This also displays the first prompt. */ @@ -264,6 +267,8 @@ display_gdb_prompt (char *new_prompt) /* Reset the nesting depth used when trace-commands is set. */ reset_command_nest_depth (); + debug_flush_missing (); + /* Each interpreter has its own rules on displaying the command prompt. */ if (!current_interp_display_prompt_p ()) --- ./gdb/symfile.c 2009-03-07 02:30:20.000000000 +0100 +++ ./gdb/symfile.c 2009-03-07 01:52:00.000000000 +0100 @@ -55,6 +55,7 @@ #include "solib.h" #include "remote.h" #include "libbfd.h" +#include "elf/external.h" #include #include @@ -63,6 +64,7 @@ #include #include #include +#include int (*deprecated_ui_load_progress_hook) (const char *section, unsigned long num); @@ -1684,6 +1686,269 @@ build_id_to_filename (struct build_id *b return retval; } +#include +#include +#include +#include + +/* This MISSING_RPM_HASH tracker is used to collect all the missing rpm files + and avoid their duplicities during a single inferior run. */ + +static struct htab *missing_rpm_hash; + +/* This MISSING_RPM_LIST tracker is used to collect and print as a single line + all the rpms right before the nearest GDB prompt. It gets cleared after + each such print (it is questionable if we should clear it after the print). + */ + +struct missing_rpm + { + struct missing_rpm *next; + char rpm[1]; + }; +static struct missing_rpm *missing_rpm_list; +static int missing_rpm_list_entries; + +/* Returns the count of newly added rpms. */ + +static int +missing_rpm_enlist (const char *filename) +{ + static int rpm_init_done = 0; + rpmts ts; + rpmdbMatchIterator mi; + int count = 0; + + if (filename == NULL) + return 0; + + if (!rpm_init_done) + { + if (rpmReadConfigFiles(NULL, NULL) != 0) + { + warning (_("Error reading the rpm configuration files")); + return 0; + } + rpm_init_done = 1; + } + + ts = rpmtsCreate (); + + mi = rpmtsInitIterator (ts, RPMTAG_BASENAMES, filename, 0); + if (mi != NULL) + { + for (;;) + { + Header h; + char *debuginfo, **slot, *s, *s2; + errmsg_t err; + size_t srcrpmlen = sizeof (".src.rpm") - 1; + size_t debuginfolen = sizeof ("-debuginfo") - 1; + rpmdbMatchIterator mi_debuginfo; + + h = rpmdbNextIterator (mi); + if (h == NULL) + break; + + /* Verify the debuginfo file is not already installed. */ + + debuginfo = headerFormat (h, "%{sourcerpm}-debuginfo.%{arch}", &err); + if (!debuginfo) + { + warning (_("Error querying the rpm file `%s': %s"), filename, + err); + continue; + } + /* s = `.src.rpm-debuginfo.%{arch}' */ + s = strrchr (debuginfo, '-') - srcrpmlen; + s2 = NULL; + if (s > debuginfo && memcmp (s, ".src.rpm", srcrpmlen) == 0) + { + /* s2 = `-%{release}.src.rpm-debuginfo.%{arch}' */ + s2 = memrchr (debuginfo, '-', s - debuginfo); + } + if (s2) + { + /* s2 = `-%{version}-%{release}.src.rpm-debuginfo.%{arch}' */ + s2 = memrchr (debuginfo, '-', s2 - debuginfo); + } + if (!s2) + { + warning (_("Error querying the rpm file `%s': %s"), filename, + debuginfo); + xfree (debuginfo); + continue; + } + /* s = `.src.rpm-debuginfo.%{arch}' */ + /* s2 = `-%{version}-%{release}.src.rpm-debuginfo.%{arch}' */ + memmove (s2 + debuginfolen, s2, s - s2); + memcpy (s2, "-debuginfo", debuginfolen); + /* s = `XXXX.%{arch}' */ + /* strlen ("XXXX") == srcrpmlen + debuginfolen */ + /* s2 = `-debuginfo-%{version}-%{release}XX.%{arch}' */ + /* strlen ("XX") == srcrpmlen */ + memmove (s + debuginfolen, s + srcrpmlen + debuginfolen, + strlen (s + srcrpmlen + debuginfolen) + 1); + /* s = `-debuginfo-%{version}-%{release}.%{arch}' */ + + /* RPMDBI_PACKAGES requires keylen == sizeof (int). */ + /* RPMDBI_LABEL is an interface for NVR-based dbiFindByLabel(). */ + mi_debuginfo = rpmtsInitIterator (ts, RPMDBI_LABEL, debuginfo, 0); + xfree (debuginfo); + if (mi_debuginfo) + { + rpmdbFreeIterator (mi_debuginfo); + count = 0; + break; + } + + /* The allocated memory gets utilized below for MISSING_RPM_HASH. */ + debuginfo = headerFormat (h, + "%{name}-%{version}-%{release}.%{arch}", + &err); + if (!debuginfo) + { + warning (_("Error querying the rpm file `%s': %s"), filename, + err); + continue; + } + + /* Base package name for `debuginfo-install'. We do not use the + `yum' command directly as the line + yum --enablerepo='*-debuginfo' install NAME-debuginfo.ARCH + would be more complicated than just: + debuginfo-install NAME-VERSION-RELEASE.ARCH + Do not supply the rpm base name (derived from .src.rpm name) as + debuginfo-install is unable to install the debuginfo package if + the base name PKG binary rpm is not installed while for example + PKG-libs would be installed (RH Bug 467901). + FUTURE: After multiple debuginfo versions simultaneously installed + get supported the support for the VERSION-RELEASE tags handling + may need an update. */ + + if (missing_rpm_hash == NULL) + { + /* DEL_F is passed NULL as MISSING_RPM_LIST's HTAB_DELETE + should not deallocate the entries. */ + + missing_rpm_hash = htab_create_alloc (64, htab_hash_string, + (int (*) (const void *, const void *)) streq, + NULL, xcalloc, xfree); + } + slot = (char **) htab_find_slot (missing_rpm_hash, debuginfo, INSERT); + /* XCALLOC never returns NULL. */ + gdb_assert (slot != NULL); + if (*slot == NULL) + { + struct missing_rpm *missing_rpm; + + *slot = debuginfo; + + missing_rpm = xmalloc (sizeof (*missing_rpm) + strlen (debuginfo)); + strcpy (missing_rpm->rpm, debuginfo); + missing_rpm->next = missing_rpm_list; + missing_rpm_list = missing_rpm; + missing_rpm_list_entries++; + } + else + xfree (debuginfo); + count++; + } + + rpmdbFreeIterator (mi); + } + + rpmtsFree (ts); + + return count; +} + +static int +missing_rpm_list_compar (const char *const *ap, const char *const *bp) +{ + return strcoll (*ap, *bp); +} + +/* It returns a NULL-terminated array of strings needing to be FREEd. It may + also return only NULL. */ + +static void +missing_rpm_list_print (void) +{ + char **array, **array_iter; + struct missing_rpm *list_iter; + struct cleanup *cleanups; + + if (missing_rpm_list_entries == 0) + return; + + array = xmalloc (sizeof (*array) * missing_rpm_list_entries); + cleanups = make_cleanup (xfree, array); + + array_iter = array; + for (list_iter = missing_rpm_list; list_iter != NULL; + list_iter = list_iter->next) + { + *array_iter++ = list_iter->rpm; + } + gdb_assert (array_iter == array + missing_rpm_list_entries); + + qsort (array, missing_rpm_list_entries, sizeof (*array), + (int (*) (const void *, const void *)) missing_rpm_list_compar); + + printf_unfiltered (_("Missing separate debuginfos, use: %s"), + "debuginfo-install"); + for (array_iter = array; array_iter < array + missing_rpm_list_entries; + array_iter++) + { + putchar_unfiltered (' '); + puts_unfiltered (*array_iter); + } + putchar_unfiltered ('\n'); + + while (missing_rpm_list != NULL) + { + list_iter = missing_rpm_list; + missing_rpm_list = list_iter->next; + xfree (list_iter); + } + missing_rpm_list_entries = 0; + + do_cleanups (cleanups); +} + +static void +missing_rpm_change (void) +{ + debug_flush_missing (); + + gdb_assert (missing_rpm_list == NULL); + if (missing_rpm_hash != NULL) + { + htab_delete (missing_rpm_hash); + missing_rpm_hash = NULL; + } +} + +enum missing_exec + { + /* Init state. EXEC_BFD also still could be NULL. */ + MISSING_EXEC_NOT_TRIED, + /* We saw a non-NULL EXEC_BFD but RPM has no info about it. */ + MISSING_EXEC_NOT_FOUND, + /* We found EXEC_BFD by RPM and we either have its symbols (either embedded + or separate) or the main executable's RPM is now contained in + MISSING_RPM_HASH. */ + MISSING_EXEC_ENLISTED + }; +static enum missing_exec missing_exec = MISSING_EXEC_NOT_TRIED; + +void +debug_flush_missing (void) +{ + missing_rpm_list_print (); +} + /* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages yum --enablerepo='*-debuginfo' install ... avoidance. */ @@ -1739,11 +2004,13 @@ missing_filepair_change (void) /* All their memory came just from missing_filepair_OBSTACK. */ missing_filepair_hash = NULL; } + missing_exec = MISSING_EXEC_NOT_TRIED; } static void debug_print_executable_changed (void) { + missing_rpm_change (); missing_filepair_change (); } @@ -1802,14 +2069,31 @@ debug_print_missing (const char *binary, } *slot = missing_filepair; - /* We do not collect and flush these messages as each such message - already requires its own separate lines. */ + if (missing_exec == MISSING_EXEC_NOT_TRIED) + { + char *exec_filename; - fprintf_unfiltered (gdb_stdlog, - _("Missing separate debuginfo for %s\n"), binary); - if (debug != NULL) - fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"), - "yum --enablerepo='*-debuginfo' install", debug); + exec_filename = get_exec_file (0); + if (exec_filename != NULL) + { + if (missing_rpm_enlist (exec_filename) == 0) + missing_exec = MISSING_EXEC_NOT_FOUND; + else + missing_exec = MISSING_EXEC_ENLISTED; + } + } + if (missing_exec != MISSING_EXEC_ENLISTED) + if (missing_rpm_enlist (binary) == 0 && missing_rpm_enlist (debug) == 0) + { + /* We do not collect and flush these messages as each such message + already requires its own separate lines. */ + + fprintf_unfiltered (gdb_stdlog, + _("Missing separate debuginfo for %s\n"), binary); + if (debug != NULL) + fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"), + "yum --enablerepo='*-debuginfo' install", debug); + } } static char * --- ./gdb/symfile.h 2009-03-07 02:16:18.000000000 +0100 +++ ./gdb/symfile.h 2009-03-07 01:52:00.000000000 +0100 @@ -378,6 +378,7 @@ extern struct build_id *build_id_addr_ge extern char *build_id_to_filename (struct build_id *build_id, char **link_return, int add_debug_suffix); extern void debug_print_missing (const char *binary, const char *debug); +extern void debug_flush_missing (void); /* From dwarf2read.c */ --- ./gdb/testsuite/lib/gdb.exp 2009-03-07 02:10:11.000000000 +0100 +++ ./gdb/testsuite/lib/gdb.exp 2009-03-07 01:52:00.000000000 +0100 @@ -1230,7 +1230,7 @@ proc default_gdb_start { } { warning "Couldn't set the width to 0." } } - # Turn off the missing warnings as the testsuite does not expect it. + # Turn off the missing RPMs warnings as the testsuite does not expect it. send_gdb "set build-id-verbose 0\n" gdb_expect 10 { -re "$gdb_prompt $" { --- ./gdb/tui/tui-interp.c 2009-03-07 02:28:47.000000000 +0100 +++ ./gdb/tui/tui-interp.c 2009-03-07 01:52:00.000000000 +0100 @@ -30,6 +30,7 @@ #include "tui/tui.h" #include "tui/tui-io.h" #include "exceptions.h" +#include "symfile.h" /* Set to 1 when the TUI mode must be activated when we first start gdb. */ @@ -128,6 +129,8 @@ tui_command_loop (void *data) char *a_prompt; char *gdb_prompt = get_prompt (); + debug_flush_missing (); + /* Tell readline what the prompt to display is and what function it will need to call after a whole line is read. This also displays the first prompt. */ gdb-6.6-buildid-locate.patch: Index: gdb-6.6-buildid-locate.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate.patch,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gdb-6.6-buildid-locate.patch 2 Mar 2009 00:11:35 -0000 1.17 +++ gdb-6.6-buildid-locate.patch 7 Mar 2009 01:42:03 -0000 1.18 @@ -1,78 +1,5 @@ -[base] - -2007-10-16 Jan Kratochvil - - Port to GDB-6.7. - -2008-01-22 Jan Kratochvil - option "build-id-core-loads": Fix it to be an "on"/"off" type. - More intuitive build-id missing files messages. - Lookup also the main executable from the rpm database. - Suppress duplicite buil-id missing files warnings. - -2008-01-26 Jan Kratochvil - Print the shared libraries names unconditionally. - -2008-02-21 Jan Kratochvil - Rename `debug build-id' to `build-id-verbose'. - Provide its level 0 to disable the build-id messages. - New description of `build-id-verbose' in the documentation. - Resolve the RH Bug 432164. - -2008-02-24 Jan Kratochvil - - Port to GDB-6.8pre. - -2008-03-09 Jan Kratochvil - - Implement the `debuginfo-install' rpm/yum integration. - Resolve the RH Bug 435581. - -2008-04-16 Robert Scheck - - Fix -I for non-standard rpm includes in `$(includedir)/rpm'. - -2008-04-19 Jan Kratochvil - - Disable the warnings for the testsuite not expecting them. - -2008-10-12 Jan Kratochvil - - rpm compatibility patch by Panu Matilainen. - -2008-08-21 Jan Kratochvil - - Disable MI non-compliant message on the missing debuginfo printed on - reloaded exec file. - Fix found by Denys Vlasenko . - Fixes Red Hat Bug 459414. - -Index: gdb-6.8.50.20090226/gdb/Makefile.in -=================================================================== ---- gdb-6.8.50.20090226.orig/gdb/Makefile.in 2009-02-28 07:31:50.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/Makefile.in 2009-02-28 07:31:58.000000000 +0100 -@@ -392,7 +392,7 @@ CONFIG_UNINSTALL = @CONFIG_UNINSTALL@ - # your system doesn't have fcntl.h in /usr/include (which is where it - # should be according to Posix). - DEFS = @DEFS@ --GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config -DLOCALEDIR="\"$(localedir)\"" $(DEFS) -+GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config -I$(includedir)/rpm -DLOCALEDIR="\"$(localedir)\"" $(DEFS) - - # MH_CFLAGS, if defined, has host-dependent CFLAGS from the config directory. - GLOBAL_CFLAGS = $(MH_CFLAGS) -@@ -445,7 +445,7 @@ INSTALLED_LIBS=-lbfd -lreadline -lopcode - CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \ - $(XM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \ - $(LIBICONV) $(LIBEXPAT) \ -- $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) -+ $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) -lrpm - CDEPS = $(XM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \ - $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) - -Index: gdb-6.8.50.20090226/gdb/corelow.c -=================================================================== ---- gdb-6.8.50.20090226.orig/gdb/corelow.c 2009-02-23 01:03:48.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/corelow.c 2009-02-28 07:32:23.000000000 +0100 +--- ./gdb/corelow.c 2009-03-07 01:45:51.000000000 +0100 ++++ ./gdb/corelow.c 2009-03-07 02:29:31.000000000 +0100 @@ -45,6 +45,10 @@ #include "exceptions.h" #include "solib.h" @@ -166,10 +93,8 @@ + NULL, NULL, NULL, + &setlist, &showlist); } -Index: gdb-6.8.50.20090226/gdb/doc/gdb.texinfo -=================================================================== ---- gdb-6.8.50.20090226.orig/gdb/doc/gdb.texinfo 2009-02-28 07:31:50.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/doc/gdb.texinfo 2009-02-28 07:31:58.000000000 +0100 +--- ./gdb/doc/gdb.texinfo 2009-03-07 01:45:51.000000000 +0100 ++++ ./gdb/doc/gdb.texinfo 2009-03-07 02:10:11.000000000 +0100 @@ -13294,6 +13294,27 @@ information files. @end table @@ -198,40 +123,8 @@ @cindex @code{.gnu_debuglink} sections @cindex debug link sections A debug link is a special section of the executable file named -Index: gdb-6.8.50.20090226/gdb/event-top.c -=================================================================== ---- gdb-6.8.50.20090226.orig/gdb/event-top.c 2009-01-09 12:00:00.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/event-top.c 2009-02-28 07:31:58.000000000 +0100 -@@ -33,6 +33,7 @@ - #include "cli/cli-script.h" /* for reset_command_nest_depth */ - #include "main.h" - #include "gdbthread.h" -+#include "symfile.h" - - /* For dont_repeat() */ - #include "gdbcmd.h" -@@ -193,6 +194,8 @@ cli_command_loop (void) - char *a_prompt; - char *gdb_prompt = get_prompt (); - -+ debug_flush_missing (); -+ - /* Tell readline what the prompt to display is and what function it - will need to call after a whole line is read. This also displays - the first prompt. */ -@@ -264,6 +267,8 @@ display_gdb_prompt (char *new_prompt) - /* Reset the nesting depth used when trace-commands is set. */ - reset_command_nest_depth (); - -+ debug_flush_missing (); -+ - /* Each interpreter has its own rules on displaying the command - prompt. */ - if (!current_interp_display_prompt_p ()) -Index: gdb-6.8.50.20090226/gdb/solib-svr4.c -=================================================================== ---- gdb-6.8.50.20090226.orig/gdb/solib-svr4.c 2009-02-27 00:04:34.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/solib-svr4.c 2009-02-28 07:31:58.000000000 +0100 +--- ./gdb/solib-svr4.c 2009-03-07 01:45:51.000000000 +0100 ++++ ./gdb/solib-svr4.c 2009-03-07 02:10:11.000000000 +0100 @@ -1000,9 +1000,33 @@ svr4_current_sos (void) safe_strerror (errcode)); else @@ -269,28 +162,17 @@ } xfree (buffer); -Index: gdb-6.8.50.20090226/gdb/symfile.c -=================================================================== ---- gdb-6.8.50.20090226.orig/gdb/symfile.c 2009-02-28 07:22:43.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/symfile.c 2009-02-28 07:31:58.000000000 +0100 -@@ -54,6 +54,8 @@ +--- ./gdb/symfile.c 2009-03-07 01:45:51.000000000 +0100 ++++ ./gdb/symfile.c 2009-03-07 02:30:20.000000000 +0100 +@@ -54,6 +54,7 @@ #include "elf-bfd.h" #include "solib.h" #include "remote.h" +#include "libbfd.h" -+#include "elf/external.h" #include #include -@@ -62,6 +64,7 @@ - #include - #include - #include -+#include - - - int (*deprecated_ui_load_progress_hook) (const char *section, unsigned long num); -@@ -1185,16 +1188,65 @@ symbol_file_clear (int from_tty) +@@ -1185,16 +1186,65 @@ symbol_file_clear (int from_tty) printf_unfiltered (_("No symbol file now.\n")); } @@ -358,7 +240,7 @@ { struct build_id *retval; -@@ -1210,6 +1262,348 @@ build_id_bfd_get (bfd *abfd) +@@ -1210,6 +1260,348 @@ build_id_bfd_get (bfd *abfd) return retval; } @@ -707,7 +589,7 @@ /* Return if FILENAME has NT_GNU_BUILD_ID matching the CHECK value. */ static int -@@ -1227,7 +1621,7 @@ build_id_verify (const char *filename, s +@@ -1227,7 +1619,7 @@ build_id_verify (const char *filename, s if (abfd == NULL) return 0; @@ -716,7 +598,7 @@ if (found == NULL) warning (_("File \"%s\" has no build-id, file skipped"), filename); -@@ -1246,8 +1640,9 @@ build_id_verify (const char *filename, s +@@ -1246,8 +1638,9 @@ build_id_verify (const char *filename, s return retval; } @@ -728,7 +610,7 @@ { char *link, *s, *retval = NULL; gdb_byte *data = build_id->data; -@@ -1255,7 +1650,9 @@ build_id_to_debug_filename (struct build +@@ -1255,7 +1648,9 @@ build_id_to_debug_filename (struct build /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */ link = xmalloc (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1 @@ -739,7 +621,7 @@ s = link + sprintf (link, "%s/.build-id/", debug_file_directory); if (size > 0) { -@@ -1266,12 +1663,14 @@ build_id_to_debug_filename (struct build +@@ -1266,12 +1661,14 @@ build_id_to_debug_filename (struct build *s++ = '/'; while (size-- > 0) s += sprintf (s, "%02x", (unsigned) *data++); @@ -756,7 +638,7 @@ if (retval != NULL && !build_id_verify (retval, build_id)) { -@@ -1279,9 +1678,424 @@ build_id_to_debug_filename (struct build +@@ -1279,9 +1676,142 @@ build_id_to_debug_filename (struct build retval = NULL; } @@ -768,269 +650,6 @@ + return retval; +} + -+#include -+#include -+#include -+#include -+ -+/* This MISSING_RPM_HASH tracker is used to collect all the missing rpm files -+ and avoid their duplicities during a single inferior run. */ -+ -+static struct htab *missing_rpm_hash; -+ -+/* This MISSING_RPM_LIST tracker is used to collect and print as a single line -+ all the rpms right before the nearest GDB prompt. It gets cleared after -+ each such print (it is questionable if we should clear it after the print). -+ */ -+ -+struct missing_rpm -+ { -+ struct missing_rpm *next; -+ char rpm[1]; -+ }; -+static struct missing_rpm *missing_rpm_list; -+static int missing_rpm_list_entries; -+ -+/* Returns the count of newly added rpms. */ -+ -+static int -+missing_rpm_enlist (const char *filename) -+{ -+ static int rpm_init_done = 0; -+ rpmts ts; -+ rpmdbMatchIterator mi; -+ int count = 0; -+ -+ if (filename == NULL) -+ return 0; -+ -+ if (!rpm_init_done) -+ { -+ if (rpmReadConfigFiles(NULL, NULL) != 0) -+ { -+ warning (_("Error reading the rpm configuration files")); -+ return 0; -+ } -+ rpm_init_done = 1; -+ } -+ -+ ts = rpmtsCreate (); -+ -+ mi = rpmtsInitIterator (ts, RPMTAG_BASENAMES, filename, 0); -+ if (mi != NULL) -+ { -+ for (;;) -+ { -+ Header h; -+ char *debuginfo, **slot, *s, *s2; -+ errmsg_t err; -+ size_t srcrpmlen = sizeof (".src.rpm") - 1; -+ size_t debuginfolen = sizeof ("-debuginfo") - 1; -+ rpmdbMatchIterator mi_debuginfo; -+ -+ h = rpmdbNextIterator (mi); -+ if (h == NULL) -+ break; -+ -+ /* Verify the debuginfo file is not already installed. */ -+ -+ debuginfo = headerFormat (h, "%{sourcerpm}-debuginfo.%{arch}", &err); -+ if (!debuginfo) -+ { -+ warning (_("Error querying the rpm file `%s': %s"), filename, -+ err); -+ continue; -+ } -+ /* s = `.src.rpm-debuginfo.%{arch}' */ -+ s = strrchr (debuginfo, '-') - srcrpmlen; -+ s2 = NULL; -+ if (s > debuginfo && memcmp (s, ".src.rpm", srcrpmlen) == 0) -+ { -+ /* s2 = `-%{release}.src.rpm-debuginfo.%{arch}' */ -+ s2 = memrchr (debuginfo, '-', s - debuginfo); -+ } -+ if (s2) -+ { -+ /* s2 = `-%{version}-%{release}.src.rpm-debuginfo.%{arch}' */ -+ s2 = memrchr (debuginfo, '-', s2 - debuginfo); -+ } -+ if (!s2) -+ { -+ warning (_("Error querying the rpm file `%s': %s"), filename, -+ debuginfo); -+ xfree (debuginfo); -+ continue; -+ } -+ /* s = `.src.rpm-debuginfo.%{arch}' */ -+ /* s2 = `-%{version}-%{release}.src.rpm-debuginfo.%{arch}' */ -+ memmove (s2 + debuginfolen, s2, s - s2); -+ memcpy (s2, "-debuginfo", debuginfolen); -+ /* s = `XXXX.%{arch}' */ -+ /* strlen ("XXXX") == srcrpmlen + debuginfolen */ -+ /* s2 = `-debuginfo-%{version}-%{release}XX.%{arch}' */ -+ /* strlen ("XX") == srcrpmlen */ -+ memmove (s + debuginfolen, s + srcrpmlen + debuginfolen, -+ strlen (s + srcrpmlen + debuginfolen) + 1); -+ /* s = `-debuginfo-%{version}-%{release}.%{arch}' */ -+ -+ /* RPMDBI_PACKAGES requires keylen == sizeof (int). */ -+ /* RPMDBI_LABEL is an interface for NVR-based dbiFindByLabel(). */ -+ mi_debuginfo = rpmtsInitIterator (ts, RPMDBI_LABEL, debuginfo, 0); -+ xfree (debuginfo); -+ if (mi_debuginfo) -+ { -+ rpmdbFreeIterator (mi_debuginfo); -+ count = 0; -+ break; -+ } -+ -+ /* The allocated memory gets utilized below for MISSING_RPM_HASH. */ -+ debuginfo = headerFormat (h, -+ "%{name}-%{version}-%{release}.%{arch}", -+ &err); -+ if (!debuginfo) -+ { -+ warning (_("Error querying the rpm file `%s': %s"), filename, -+ err); -+ continue; -+ } -+ -+ /* Base package name for `debuginfo-install'. We do not use the -+ `yum' command directly as the line -+ yum --enablerepo='*-debuginfo' install NAME-debuginfo.ARCH -+ would be more complicated than just: -+ debuginfo-install NAME-VERSION-RELEASE.ARCH -+ Do not supply the rpm base name (derived from .src.rpm name) as -+ debuginfo-install is unable to install the debuginfo package if -+ the base name PKG binary rpm is not installed while for example -+ PKG-libs would be installed (RH Bug 467901). -+ FUTURE: After multiple debuginfo versions simultaneously installed -+ get supported the support for the VERSION-RELEASE tags handling -+ may need an update. */ -+ -+ if (missing_rpm_hash == NULL) -+ { -+ /* DEL_F is passed NULL as MISSING_RPM_LIST's HTAB_DELETE -+ should not deallocate the entries. */ -+ -+ missing_rpm_hash = htab_create_alloc (64, htab_hash_string, -+ (int (*) (const void *, const void *)) streq, -+ NULL, xcalloc, xfree); -+ } -+ slot = (char **) htab_find_slot (missing_rpm_hash, debuginfo, INSERT); -+ /* XCALLOC never returns NULL. */ -+ gdb_assert (slot != NULL); -+ if (*slot == NULL) -+ { -+ struct missing_rpm *missing_rpm; -+ -+ *slot = debuginfo; -+ -+ missing_rpm = xmalloc (sizeof (*missing_rpm) + strlen (debuginfo)); -+ strcpy (missing_rpm->rpm, debuginfo); -+ missing_rpm->next = missing_rpm_list; -+ missing_rpm_list = missing_rpm; -+ missing_rpm_list_entries++; -+ } -+ else -+ xfree (debuginfo); -+ count++; -+ } -+ -+ rpmdbFreeIterator (mi); -+ } -+ -+ rpmtsFree (ts); -+ -+ return count; -+} -+ -+static int -+missing_rpm_list_compar (const char *const *ap, const char *const *bp) -+{ -+ return strcoll (*ap, *bp); -+} -+ -+/* It returns a NULL-terminated array of strings needing to be FREEd. It may -+ also return only NULL. */ -+ -+static void -+missing_rpm_list_print (void) -+{ -+ char **array, **array_iter; -+ struct missing_rpm *list_iter; -+ struct cleanup *cleanups; -+ -+ if (missing_rpm_list_entries == 0) -+ return; -+ -+ array = xmalloc (sizeof (*array) * missing_rpm_list_entries); -+ cleanups = make_cleanup (xfree, array); -+ -+ array_iter = array; -+ for (list_iter = missing_rpm_list; list_iter != NULL; -+ list_iter = list_iter->next) -+ { -+ *array_iter++ = list_iter->rpm; -+ } -+ gdb_assert (array_iter == array + missing_rpm_list_entries); -+ -+ qsort (array, missing_rpm_list_entries, sizeof (*array), -+ (int (*) (const void *, const void *)) missing_rpm_list_compar); -+ -+ printf_unfiltered (_("Missing separate debuginfos, use: %s"), -+ "debuginfo-install"); -+ for (array_iter = array; array_iter < array + missing_rpm_list_entries; -+ array_iter++) -+ { -+ putchar_unfiltered (' '); -+ puts_unfiltered (*array_iter); -+ } -+ putchar_unfiltered ('\n'); -+ -+ while (missing_rpm_list != NULL) -+ { -+ list_iter = missing_rpm_list; -+ missing_rpm_list = list_iter->next; -+ xfree (list_iter); -+ } -+ missing_rpm_list_entries = 0; -+ -+ do_cleanups (cleanups); -+} -+ -+static void -+missing_rpm_change (void) -+{ -+ debug_flush_missing (); -+ -+ gdb_assert (missing_rpm_list == NULL); -+ if (missing_rpm_hash != NULL) -+ { -+ htab_delete (missing_rpm_hash); -+ missing_rpm_hash = NULL; -+ } -+} -+ -+enum missing_exec -+ { -+ /* Init state. EXEC_BFD also still could be NULL. */ -+ MISSING_EXEC_NOT_TRIED, -+ /* We saw a non-NULL EXEC_BFD but RPM has no info about it. */ -+ MISSING_EXEC_NOT_FOUND, -+ /* We found EXEC_BFD by RPM and we either have its symbols (either embedded -+ or separate) or the main executable's RPM is now contained in -+ MISSING_RPM_HASH. */ -+ MISSING_EXEC_ENLISTED -+ }; -+static enum missing_exec missing_exec = MISSING_EXEC_NOT_TRIED; -+ -+void -+debug_flush_missing (void) -+{ -+ missing_rpm_list_print (); -+} -+ +/* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages + yum --enablerepo='*-debuginfo' install ... + avoidance. */ @@ -1086,13 +705,11 @@ + /* All their memory came just from missing_filepair_OBSTACK. */ + missing_filepair_hash = NULL; + } -+ missing_exec = MISSING_EXEC_NOT_TRIED; +} + +static void +debug_print_executable_changed (void) +{ -+ missing_rpm_change (); + missing_filepair_change (); +} + @@ -1151,37 +768,20 @@ + } + *slot = missing_filepair; + -+ if (missing_exec == MISSING_EXEC_NOT_TRIED) -+ { -+ char *exec_filename; -+ -+ exec_filename = get_exec_file (0); -+ if (exec_filename != NULL) -+ { -+ if (missing_rpm_enlist (exec_filename) == 0) -+ missing_exec = MISSING_EXEC_NOT_FOUND; -+ else -+ missing_exec = MISSING_EXEC_ENLISTED; -+ } -+ } -+ if (missing_exec != MISSING_EXEC_ENLISTED) -+ if (missing_rpm_enlist (binary) == 0 && missing_rpm_enlist (debug) == 0) -+ { -+ /* We do not collect and flush these messages as each such message -+ already requires its own separate lines. */ ++ /* We do not collect and flush these messages as each such message ++ already requires its own separate lines. */ + -+ fprintf_unfiltered (gdb_stdlog, -+ _("Missing separate debuginfo for %s\n"), binary); -+ if (debug != NULL) -+ fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"), -+ "yum --enablerepo='*-debuginfo' install", debug); -+ } ++ fprintf_unfiltered (gdb_stdlog, ++ _("Missing separate debuginfo for %s\n"), binary); ++ if (debug != NULL) ++ fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"), ++ "yum --enablerepo='*-debuginfo' install", debug); +} + static char * get_debug_link_info (struct objfile *objfile, unsigned long *crc32_out) { -@@ -1364,32 +2178,36 @@ static char * +@@ -1364,32 +1894,36 @@ static char * find_separate_debug_file (struct objfile *objfile) { asection *sect; @@ -1226,7 +826,7 @@ } basename = get_debug_link_info (objfile, &crc32); -@@ -1397,7 +2215,7 @@ find_separate_debug_file (struct objfile +@@ -1397,7 +1931,7 @@ find_separate_debug_file (struct objfile if (basename == NULL) /* There's no separate debug info, hence there's no way we could load it => no warning. */ @@ -1235,7 +835,7 @@ dir = xstrdup (objfile->name); -@@ -1413,23 +2231,19 @@ find_separate_debug_file (struct objfile +@@ -1413,23 +1947,19 @@ find_separate_debug_file (struct objfile gdb_assert (i >= 0 && IS_DIR_SEPARATOR (dir[i])); dir[i+1] = '\0'; @@ -1266,7 +866,7 @@ /* Then try in the subdirectory named DEBUG_SUBDIRECTORY. */ strcpy (debugfile, dir); -@@ -1438,11 +2252,7 @@ find_separate_debug_file (struct objfile +@@ -1438,11 +1968,7 @@ find_separate_debug_file (struct objfile strcat (debugfile, basename); if (separate_debug_file_exists (debugfile, crc32, objfile->name)) @@ -1279,7 +879,7 @@ /* Then try in the global debugfile directory. */ strcpy (debugfile, debug_file_directory); -@@ -1451,11 +2261,7 @@ find_separate_debug_file (struct objfile +@@ -1451,11 +1977,7 @@ find_separate_debug_file (struct objfile strcat (debugfile, basename); if (separate_debug_file_exists (debugfile, crc32, objfile->name)) @@ -1292,7 +892,7 @@ /* If the file is in the sysroot, try using its base path in the global debugfile directory. */ -@@ -1470,20 +2276,18 @@ find_separate_debug_file (struct objfile +@@ -1470,20 +1992,18 @@ find_separate_debug_file (struct objfile strcat (debugfile, basename); if (separate_debug_file_exists (debugfile, crc32, objfile->name)) @@ -1321,7 +921,7 @@ } -@@ -4215,4 +5019,16 @@ Show printing of symbol loading messages +@@ -4216,4 +4736,16 @@ Show printing of symbol loading messages NULL, NULL, &setprintlist, &showprintlist); @@ -1338,11 +938,9 @@ + + observer_attach_executable_changed (debug_print_executable_changed); } -Index: gdb-6.8.50.20090226/gdb/symfile.h -=================================================================== ---- gdb-6.8.50.20090226.orig/gdb/symfile.h 2009-02-27 00:04:32.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/symfile.h 2009-02-28 07:31:58.000000000 +0100 -@@ -372,6 +372,14 @@ extern int symfile_map_offsets_to_segmen +--- ./gdb/symfile.h 2009-03-07 01:45:51.000000000 +0100 ++++ ./gdb/symfile.h 2009-03-07 02:16:18.000000000 +0100 +@@ -372,6 +372,13 @@ extern int symfile_map_offsets_to_segmen struct symfile_segment_data *get_symfile_segment_data (bfd *abfd); void free_symfile_segment_data (struct symfile_segment_data *data); @@ -1352,20 +950,17 @@ +extern char *build_id_to_filename (struct build_id *build_id, + char **link_return, int add_debug_suffix); +extern void debug_print_missing (const char *binary, const char *debug); -+extern void debug_flush_missing (void); + /* From dwarf2read.c */ extern int dwarf2_has_info (struct objfile *); -Index: gdb-6.8.50.20090226/gdb/testsuite/lib/gdb.exp -=================================================================== ---- gdb-6.8.50.20090226.orig/gdb/testsuite/lib/gdb.exp 2009-02-27 00:04:34.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/testsuite/lib/gdb.exp 2009-02-28 07:31:58.000000000 +0100 +--- ./gdb/testsuite/lib/gdb.exp 2009-03-07 01:45:51.000000000 +0100 ++++ ./gdb/testsuite/lib/gdb.exp 2009-03-07 02:10:11.000000000 +0100 @@ -1230,6 +1230,16 @@ proc default_gdb_start { } { warning "Couldn't set the width to 0." } } -+ # Turn off the missing RPMs warnings as the testsuite does not expect it. ++ # Turn off the missing warnings as the testsuite does not expect it. + send_gdb "set build-id-verbose 0\n" + gdb_expect 10 { + -re "$gdb_prompt $" { @@ -1378,24 +973,3 @@ return 0; } -Index: gdb-6.8.50.20090226/gdb/tui/tui-interp.c -=================================================================== ---- gdb-6.8.50.20090226.orig/gdb/tui/tui-interp.c 2009-02-21 17:14:50.000000000 +0100 -+++ gdb-6.8.50.20090226/gdb/tui/tui-interp.c 2009-02-28 07:31:58.000000000 +0100 -@@ -30,6 +30,7 @@ - #include "tui/tui.h" - #include "tui/tui-io.h" - #include "exceptions.h" -+#include "symfile.h" - - /* Set to 1 when the TUI mode must be activated when we first start - gdb. */ -@@ -128,6 +129,8 @@ tui_command_loop (void *data) - char *a_prompt; - char *gdb_prompt = get_prompt (); - -+ debug_flush_missing (); -+ - /* Tell readline what the prompt to display is and what function - it will need to call after a whole line is read. This also - displays the first prompt. */ Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.327 retrieving revision 1.328 diff -u -r1.327 -r1.328 --- gdb.spec 7 Mar 2009 00:32:30 -0000 1.327 +++ gdb.spec 7 Mar 2009 01:42:03 -0000 1.328 @@ -13,7 +13,7 @@ # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 3%{?_with_upstream:.upstream}%{?dist} +Release: 4%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -273,6 +273,7 @@ # New locating of the matching binaries from the pure core file (build-id). Patch274: gdb-6.6-buildid-locate.patch +Patch353: gdb-6.6-buildid-locate-rpm.patch # Fix hardware watchpoints after inferior forks-off some process. # Threaded `set follow-fork-mode child' still not fixed there, glibc fixes reqd. @@ -531,6 +532,7 @@ %patch266 -p1 %patch271 -p1 %patch274 -p1 +%patch353 -p1 %patch280 -p1 %patch282 -p1 %patch284 -p1 @@ -836,6 +838,9 @@ %endif %changelog +* Sat Mar 7 2009 Jan Kratochvil - 6.8.50.20090302-4 +- Split `gdb-6.6-buildid-locate.patch' to `gdb-6.6-buildid-locate-rpm.patch'. + * Sat Mar 7 2009 Jan Kratochvil - 6.8.50.20090302-3 - Archer update to the snapshot: 6cf16c0711e844094ab694b3d929f7bd30b49f61 - Fix crash on the inlined functions support. From konradm at fedoraproject.org Sat Mar 7 02:05:36 2009 From: konradm at fedoraproject.org (Conrad Meyer) Date: Sat, 7 Mar 2009 02:05:36 +0000 (UTC) Subject: rpms/joni/devel .cvsignore, 1.5, 1.6 joni.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <20090307020536.761B970116@cvs1.fedora.phx.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/joni/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12117 Modified Files: .cvsignore joni.spec sources Log Message: * Fri Mar 6 2009 Conrad Meyer - 1.1.3-1 - Bump to 1.1.3. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/joni/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Dec 2008 01:50:01 -0000 1.5 +++ .cvsignore 7 Mar 2009 02:05:06 -0000 1.6 @@ -1 +1 @@ -joni-1.1.2.tar.bz2 +joni-1.1.3.tar.bz2 Index: joni.spec =================================================================== RCS file: /cvs/pkgs/rpms/joni/devel/joni.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- joni.spec 25 Feb 2009 09:36:52 -0000 1.11 +++ joni.spec 7 Mar 2009 02:05:06 -0000 1.12 @@ -1,6 +1,6 @@ Name: joni -Version: 1.1.2 -Release: 2%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Summary: Java regular expression library Group: Development/Libraries License: MIT @@ -26,13 +26,9 @@ Requires: junit Requires: objectweb-asm -#%if 0%{?fedora} > 9 -#BuildArch: noarch -#%else BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 -#%endif %description @@ -61,27 +57,21 @@ # install unversioned jar as per Java Packaging Guidelines install -m 644 target/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar -#%if 0%{?fedora} <= 9 %{_bindir}/aot-compile-rpm -#%endif -#%if 0%{?fedora} <= 9 %post if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi -#%endif -#%if 0%{?fedora} <= 9 %postun if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi -#%endif %clean @@ -92,13 +82,13 @@ %defattr(-,root,root,-) %doc pom.xml %{_javadir}/%{name}.jar - -#%if 0%{?fedora} <= 9 %{_libdir}/gcj/%{name} -#%endif %changelog +* Fri Mar 6 2009 Conrad Meyer - 1.1.3-1 +- Bump to 1.1.3. + * Wed Feb 25 2009 Fedora Release Engineering - 1.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/joni/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Dec 2008 01:50:01 -0000 1.6 +++ sources 7 Mar 2009 02:05:06 -0000 1.7 @@ -1 +1 @@ -bf5ea31f0eb1eeb39f1ba7fa2bec782c joni-1.1.2.tar.bz2 +fd60e7b15f5cfaf4c018d36492ef4ac2 joni-1.1.3.tar.bz2 From mjakubicek at fedoraproject.org Sat Mar 7 02:55:23 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Sat, 7 Mar 2009 02:55:23 +0000 (UTC) Subject: rpms/boinc-client/F-10 boinc-guirpcauth.patch, NONE, 1.1 boinc-client.spec, 1.20, 1.21 sources, 1.4, 1.5 unicode, 1.1, NONE Message-ID: <20090307025523.B1C6670116@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/boinc-client/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22054 Modified Files: boinc-client.spec sources Added Files: boinc-guirpcauth.patch Removed Files: unicode Log Message: - i386 arch conditional replaced by the %%{ix86} macro. - Rebase to current 6.4 branch, therefore using new suffix "r[revision]svn" instead of "[date]svn", fixes help button in the simple GUI (BZ#478713). - Trim CUDA prebuilt libraries from sources. - UTF8 conversion now done in spec, not in a separate 'unicode' script. - Add a short link to upstream's wiki about usage in Fedora into %%doc. - boincmgr turned into a wrapper script to allow passwordless connections from users of the boinc group (fix BZ#478715). boinc-guirpcauth.patch: --- NEW FILE boinc-guirpcauth.patch --- --- client/gui_rpc_server.cpp.orig 2009-03-07 02:00:20.000000000 +0100 +++ client/gui_rpc_server.cpp 2009-03-07 02:01:00.000000000 +0100 @@ -129,12 +129,7 @@ // they can cause code to execute as this user. // So better protect it. // - if (g_use_sandbox) { - // Allow group access so authorized administrator can modify it - chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR | S_IRGRP | S_IWGRP); - } else { - chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR); - } + chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR | S_IRGRP | S_IWGRP); #endif } } Index: boinc-client.spec =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/F-10/boinc-client.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- boinc-client.spec 15 Jan 2009 00:59:02 -0000 1.20 +++ boinc-client.spec 7 Mar 2009 02:54:53 -0000 1.21 @@ -1,10 +1,10 @@ -%define snap 20081217 -%define version_ 6_4_5 +%define revision 17542 +%define version_ 6_4 Summary: The BOINC client core Name: boinc-client -Version: 6.4.5 -Release: 2.%{snap}svn%{?dist} +Version: 6.4.7 +Release: 1.r%{revision}svn%{?dist} License: LGPLv2+ Group: Applications/Engineering URL: http://boinc.berkeley.edu/ @@ -13,7 +13,6 @@ # svn export http://boinc.berkeley.edu/svn/tags/boinc_core_release_%{version_} # pushd boinc_core_release_%{version_} # ./_autosetup -# ./unicode . Convert changelogs to UTF8 # ./trim . Trim all binaries and other unnecessary things. # popd # tar -cjvf boinc-%{version}.tar.bz2 boinc_core_release_%{version_}/ @@ -22,17 +21,24 @@ Source2: boinc-client-logrotate-d Source3: boinc-manager.desktop Source8: trim -Source9: unicode #Remove -fomit-frame-pointer and -ffast-math gcc flags: #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/647 Patch1: boinc-gccflags.patch #Fix security bug BZ#479664 +#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/823 Patch2: boinc-rsa.patch #Change locales filenames from "BOINC Manager.mo" into "BOINC-Manager.mo" #so that we can use the find_lang macro. #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/722 #Fixed in SVN trunk, not yet in BOINC 6 branch. Patch3: boinc-locales.patch +#Both of these patches fix the gcc 4.4 build +#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/823 +Patch4: boinc-gcc44.patch +Patch5: boinc-client-6.4.5-event.patch +#Create password file rw for group, this enables passwordless connection +#of manager from users of the boinc group. +Patch6: boinc-guirpcauth.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: logrotate @@ -98,9 +104,25 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +#%patch4 +%patch5 -p1 +%patch6 + +# fix utf8 +iconv -f ISO88591 -t UTF8 < checkin_notes_2004 > checkin_notes_2004.utf8 +touch -r checkin_notes_2004 checkin_notes_2004.utf8 +mv checkin_notes_2004.utf8 checkin_notes_2004 + +iconv -f ISO88591 -t UTF8 < checkin_notes_2005 > checkin_notes_2005.utf8 +touch -r checkin_notes_2005 checkin_notes_2005.utf8 +mv checkin_notes_2005.utf8 checkin_notes_2005 + +iconv -f ISO88591 -t UTF8 < checkin_notes_2006 > checkin_notes_2006.utf8 +touch -r checkin_notes_2006 checkin_notes_2006.utf8 +mv checkin_notes_2006.utf8 checkin_notes_2006 %build -%ifarch i386 +%ifarch %{ix86} %define boinc_platform i686-pc-linux-gnu %endif %ifarch powerpc ppc @@ -125,7 +147,7 @@ # Parallel make does not work. -make -k +make %install rm -rf $RPM_BUILD_ROOT @@ -152,9 +174,15 @@ rm -rf $RPM_BUILD_ROOT%{_bindir}/upper_case pushd $RPM_BUILD_ROOT%{_bindir} - ln -s boinc_client boinc - mv boinc_gui boincmgr - mv boinc_cmd boinccmd +ln -s boinc_client boinc +mv boinc_cmd boinccmd +cat > boincmgr <<-EOF + #!/bin/bash + # wrapper script to allow passwordless manager connections from users of the boinc group + cd %{_localstatedir}/lib/boinc + boinc_gui +EOF +chmod a+x boincmgr popd rm $RPM_BUILD_ROOT%{_bindir}/ca-bundle.crt @@ -188,6 +216,11 @@ # bash-completion install -Dp -m644 client/scripts/boinc.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/boinc-client +# usability hints +cat > USAGE_FEDORA <<-EOF + For up-to-date instructions on how to setup BOINC client on Fedora, please have a look at: http://boinc.berkeley.edu/wiki/Installing_BOINC_on_Fedora +EOF + %clean rm -rf $RPM_BUILD_ROOT @@ -230,15 +263,9 @@ %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/bash_completion.d/ -%doc COPYING -%doc COPYRIGHT -%doc checkin_notes -%doc checkin_notes_2007 -%doc checkin_notes_2006 -%doc checkin_notes_2005 -%doc checkin_notes_2004 -%doc checkin_notes_2003 -%doc checkin_notes_2002 +%doc COPYING COPYRIGHT checkin_notes checkin_notes_2007 checkin_notes_2006 +%doc checkin_notes_2005 checkin_notes_2004 checkin_notes_2003 checkin_notes_2002 +%doc USAGE_FEDORA %{_bindir}/boinc %{_bindir}/boinc_client %{_bindir}/boinccmd @@ -253,6 +280,7 @@ %files -n boinc-manager -f BOINC-Manager.lang %defattr(-,root,root,-) +%{_bindir}/boinc_gui %{_bindir}/boincmgr %{_datadir}/applications/fedora-boinc-manager.desktop %{_datadir}/icons/hicolor/16x16/apps/boincmgr.png @@ -272,6 +300,28 @@ %{_includedir}/boinc/* %changelog +* Fri Mar 06 2009 Milos Jakubicek - 6.4.7-1.r17542svn +- i386 arch conditional replaced by the %%{ix86} macro. +- Rebase to current 6.4 branch, therefore using new suffix "r[revision]svn" + instead of "[date]svn", fixes help button in the simple GUI (BZ#478713). +- Trim CUDA prebuilt libraries from sources. +- UTF8 conversion now done in spec, not in a separate 'unicode' script. +- Add a short link to upstream's wiki about usage in Fedora into %%doc. +- boincmgr turned into a wrapper script to allow passwordless connections + from users of the boinc group (fix BZ#478715). + +* Tue Feb 24 2009 Milos Jakubicek - 6.4.5-6.20081217svn +- Added boinc-client-6.4.5-event.patch to fix build with gcc 4.4 + +* Mon Feb 23 2009 Fedora Release Engineering - 6.4.5-5.20081217svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 4 2009 Milos Jakubicek - 6.4.5-4.20081217svn +- Added boinc-gcc44.patch to fix build with gcc 4.4 + +* Mon Jan 26 2009 Tomas Mraz - 6.4.5-3.20081217svn +- rebuild with new openssl and mysql + * Thu Jan 15 2009 Milos Jakubicek - 6.4.5-2.20081217svn - Fix security bug BZ#479664 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Jan 2009 01:12:59 -0000 1.4 +++ sources 7 Mar 2009 02:54:53 -0000 1.5 @@ -1 +1 @@ -98433ea90755d0579dcc778da99b9fa0 boinc-6.4.5.tar.bz2 +9593e6daa2d8604e274470065bd31b80 boinc-6.4.7.tar.bz2 --- unicode DELETED --- From mjakubicek at fedoraproject.org Sat Mar 7 02:57:37 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Sat, 7 Mar 2009 02:57:37 +0000 (UTC) Subject: rpms/boinc-client/F-10 boinc-client.spec,1.21,1.22 Message-ID: <20090307025737.0F02570116@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/boinc-client/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22564 Modified Files: boinc-client.spec Log Message: - disable gcc 4.4 patches for F10 branch Index: boinc-client.spec =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/F-10/boinc-client.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- boinc-client.spec 7 Mar 2009 02:54:53 -0000 1.21 +++ boinc-client.spec 7 Mar 2009 02:57:06 -0000 1.22 @@ -34,8 +34,8 @@ Patch3: boinc-locales.patch #Both of these patches fix the gcc 4.4 build #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/823 -Patch4: boinc-gcc44.patch -Patch5: boinc-client-6.4.5-event.patch +#Patch4: boinc-gcc44.patch +#Patch5: boinc-client-6.4.5-event.patch #Create password file rw for group, this enables passwordless connection #of manager from users of the boinc group. Patch6: boinc-guirpcauth.patch @@ -105,7 +105,7 @@ %patch2 -p1 %patch3 -p1 #%patch4 -%patch5 -p1 +#%patch5 -p1 %patch6 # fix utf8 From mjakubicek at fedoraproject.org Sat Mar 7 03:18:56 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Sat, 7 Mar 2009 03:18:56 +0000 (UTC) Subject: rpms/boinc-client/F-9 boinc-guirpcauth.patch, NONE, 1.1 boinc-client.spec, 1.15, 1.16 sources, 1.4, 1.5 unicode, 1.1, NONE Message-ID: <20090307031856.A247B70116@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/boinc-client/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26515 Modified Files: boinc-client.spec sources Added Files: boinc-guirpcauth.patch Removed Files: unicode Log Message: - i386 arch conditional replaced by the %%{ix86} macro. - Rebase to current 6.4 branch, therefore using new suffix "r[revision]svn" instead of "[date]svn", fixes help button in the simple GUI (BZ#478713). - Trim CUDA prebuilt libraries from sources. - UTF8 conversion now done in spec, not in a separate 'unicode' script. - Add a short link to upstream's wiki about usage in Fedora into %%doc. - boincmgr turned into a wrapper script to allow passwordless connections from users of the boinc group (fix BZ#478715). boinc-guirpcauth.patch: --- NEW FILE boinc-guirpcauth.patch --- --- client/gui_rpc_server.cpp.orig 2009-03-07 02:00:20.000000000 +0100 +++ client/gui_rpc_server.cpp 2009-03-07 02:01:00.000000000 +0100 @@ -129,12 +129,7 @@ // they can cause code to execute as this user. // So better protect it. // - if (g_use_sandbox) { - // Allow group access so authorized administrator can modify it - chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR | S_IRGRP | S_IWGRP); - } else { - chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR); - } + chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR | S_IRGRP | S_IWGRP); #endif } } Index: boinc-client.spec =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-client.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- boinc-client.spec 15 Jan 2009 01:00:38 -0000 1.15 +++ boinc-client.spec 7 Mar 2009 03:18:25 -0000 1.16 @@ -1,10 +1,10 @@ -%define snap 20081217 -%define version_ 6_4_5 +%define revision 17542 +%define version_ 6_4 Summary: The BOINC client core Name: boinc-client -Version: 6.4.5 -Release: 2.%{snap}svn%{?dist} +Version: 6.4.7 +Release: 1.r%{revision}svn%{?dist} License: LGPLv2+ Group: Applications/Engineering URL: http://boinc.berkeley.edu/ @@ -13,7 +13,6 @@ # svn export http://boinc.berkeley.edu/svn/tags/boinc_core_release_%{version_} # pushd boinc_core_release_%{version_} # ./_autosetup -# ./unicode . Convert changelogs to UTF8 # ./trim . Trim all binaries and other unnecessary things. # popd # tar -cjvf boinc-%{version}.tar.bz2 boinc_core_release_%{version_}/ @@ -22,17 +21,24 @@ Source2: boinc-client-logrotate-d Source3: boinc-manager.desktop Source8: trim -Source9: unicode #Remove -fomit-frame-pointer and -ffast-math gcc flags: #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/647 Patch1: boinc-gccflags.patch #Fix security bug BZ#479664 +#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/823 Patch2: boinc-rsa.patch #Change locales filenames from "BOINC Manager.mo" into "BOINC-Manager.mo" #so that we can use the find_lang macro. #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/722 #Fixed in SVN trunk, not yet in BOINC 6 branch. Patch3: boinc-locales.patch +#Both of these patches fix the gcc 4.4 build +#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/823 +#Patch4: boinc-gcc44.patch +#Patch5: boinc-client-6.4.5-event.patch +#Create password file rw for group, this enables passwordless connection +#of manager from users of the boinc group. +Patch6: boinc-guirpcauth.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: logrotate @@ -98,9 +104,25 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +#%patch4 +#%patch5 -p1 +%patch6 + +# fix utf8 +iconv -f ISO88591 -t UTF8 < checkin_notes_2004 > checkin_notes_2004.utf8 +touch -r checkin_notes_2004 checkin_notes_2004.utf8 +mv checkin_notes_2004.utf8 checkin_notes_2004 + +iconv -f ISO88591 -t UTF8 < checkin_notes_2005 > checkin_notes_2005.utf8 +touch -r checkin_notes_2005 checkin_notes_2005.utf8 +mv checkin_notes_2005.utf8 checkin_notes_2005 + +iconv -f ISO88591 -t UTF8 < checkin_notes_2006 > checkin_notes_2006.utf8 +touch -r checkin_notes_2006 checkin_notes_2006.utf8 +mv checkin_notes_2006.utf8 checkin_notes_2006 %build -%ifarch i386 +%ifarch %{ix86} %define boinc_platform i686-pc-linux-gnu %endif %ifarch powerpc ppc @@ -125,7 +147,7 @@ # Parallel make does not work. -make -k +make %install rm -rf $RPM_BUILD_ROOT @@ -152,9 +174,15 @@ rm -rf $RPM_BUILD_ROOT%{_bindir}/upper_case pushd $RPM_BUILD_ROOT%{_bindir} - ln -s boinc_client boinc - mv boinc_gui boincmgr - mv boinc_cmd boinccmd +ln -s boinc_client boinc +mv boinc_cmd boinccmd +cat > boincmgr <<-EOF + #!/bin/bash + # wrapper script to allow passwordless manager connections from users of the boinc group + cd %{_localstatedir}/lib/boinc + boinc_gui +EOF +chmod a+x boincmgr popd rm $RPM_BUILD_ROOT%{_bindir}/ca-bundle.crt @@ -188,6 +216,11 @@ # bash-completion install -Dp -m644 client/scripts/boinc.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/boinc-client +# usability hints +cat > USAGE_FEDORA <<-EOF + For up-to-date instructions on how to setup BOINC client on Fedora, please have a look at: http://boinc.berkeley.edu/wiki/Installing_BOINC_on_Fedora +EOF + %clean rm -rf $RPM_BUILD_ROOT @@ -230,15 +263,9 @@ %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/bash_completion.d/ -%doc COPYING -%doc COPYRIGHT -%doc checkin_notes -%doc checkin_notes_2007 -%doc checkin_notes_2006 -%doc checkin_notes_2005 -%doc checkin_notes_2004 -%doc checkin_notes_2003 -%doc checkin_notes_2002 +%doc COPYING COPYRIGHT checkin_notes checkin_notes_2007 checkin_notes_2006 +%doc checkin_notes_2005 checkin_notes_2004 checkin_notes_2003 checkin_notes_2002 +%doc USAGE_FEDORA %{_bindir}/boinc %{_bindir}/boinc_client %{_bindir}/boinccmd @@ -253,6 +280,7 @@ %files -n boinc-manager -f BOINC-Manager.lang %defattr(-,root,root,-) +%{_bindir}/boinc_gui %{_bindir}/boincmgr %{_datadir}/applications/fedora-boinc-manager.desktop %{_datadir}/icons/hicolor/16x16/apps/boincmgr.png @@ -272,6 +300,28 @@ %{_includedir}/boinc/* %changelog +* Fri Mar 06 2009 Milos Jakubicek - 6.4.7-1.r17542svn +- i386 arch conditional replaced by the %%{ix86} macro. +- Rebase to current 6.4 branch, therefore using new suffix "r[revision]svn" + instead of "[date]svn", fixes help button in the simple GUI (BZ#478713). +- Trim CUDA prebuilt libraries from sources. +- UTF8 conversion now done in spec, not in a separate 'unicode' script. +- Add a short link to upstream's wiki about usage in Fedora into %%doc. +- boincmgr turned into a wrapper script to allow passwordless connections + from users of the boinc group (fix BZ#478715). + +* Tue Feb 24 2009 Milos Jakubicek - 6.4.5-6.20081217svn +- Added boinc-client-6.4.5-event.patch to fix build with gcc 4.4 + +* Mon Feb 23 2009 Fedora Release Engineering - 6.4.5-5.20081217svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 4 2009 Milos Jakubicek - 6.4.5-4.20081217svn +- Added boinc-gcc44.patch to fix build with gcc 4.4 + +* Mon Jan 26 2009 Tomas Mraz - 6.4.5-3.20081217svn +- rebuild with new openssl and mysql + * Thu Jan 15 2009 Milos Jakubicek - 6.4.5-2.20081217svn - Fix security bug BZ#479664 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Jan 2009 01:13:00 -0000 1.4 +++ sources 7 Mar 2009 03:18:26 -0000 1.5 @@ -1 +1 @@ -98433ea90755d0579dcc778da99b9fa0 boinc-6.4.5.tar.bz2 +9593e6daa2d8604e274470065bd31b80 boinc-6.4.7.tar.bz2 --- unicode DELETED --- From stingray at fedoraproject.org Sat Mar 7 03:21:19 2009 From: stingray at fedoraproject.org (Paul P Komkoff Jr) Date: Sat, 7 Mar 2009 03:21:19 +0000 (UTC) Subject: rpms/libnetfilter_log/devel .cvsignore, 1.4, 1.5 libnetfilter_log.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <20090307032119.5920A70116@cvs1.fedora.phx.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_log/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27065 Modified Files: .cvsignore libnetfilter_log.spec sources Log Message: libnetfilter_log-0.0.16-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_log/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Oct 2008 12:07:49 -0000 1.4 +++ .cvsignore 7 Mar 2009 03:20:48 -0000 1.5 @@ -1 +1 @@ -libnetfilter_log-0.0.15.tar.bz2 +libnetfilter_log-0.0.16.tar.bz2 Index: libnetfilter_log.spec =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_log/devel/libnetfilter_log.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libnetfilter_log.spec 25 Feb 2009 16:35:45 -0000 1.10 +++ libnetfilter_log.spec 7 Mar 2009 03:20:48 -0000 1.11 @@ -1,6 +1,6 @@ Name: libnetfilter_log -Version: 0.0.15 -Release: 2%{?dist} +Version: 0.0.16 +Release: 1%{?dist} Summary: Netfilter logging userspace library Group: System Environment/Libraries License: GPLv2 @@ -71,6 +71,9 @@ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Mar 6 2009 Paul P. Komkoff Jr - 0.0.16-1 +- upstream release + * Wed Feb 25 2009 Fedora Release Engineering - 0.0.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_log/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Oct 2008 12:07:49 -0000 1.4 +++ sources 7 Mar 2009 03:20:48 -0000 1.5 @@ -1 +1 @@ -310ddd9e0c2bb6108b5fa33cd2666008 libnetfilter_log-0.0.15.tar.bz2 +4ffcf46dad9d0c81f6611dd185639694 libnetfilter_log-0.0.16.tar.bz2 From leigh123linux at fedoraproject.org Sat Mar 7 04:45:47 2009 From: leigh123linux at fedoraproject.org (Leigh Scott) Date: Sat, 7 Mar 2009 04:45:47 +0000 (UTC) Subject: rpms/qbittorrent/devel qbittorrent.spec,1.6,1.7 Message-ID: <20090307044548.05E0270116@cvs1.fedora.phx.redhat.com> Author: leigh123linux Update of /cvs/pkgs/rpms/qbittorrent/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8212 Modified Files: qbittorrent.spec Log Message: update to version 1.3.2 Index: qbittorrent.spec =================================================================== RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qbittorrent.spec 4 Mar 2009 12:39:41 -0000 1.6 +++ qbittorrent.spec 7 Mar 2009 04:45:13 -0000 1.7 @@ -1,8 +1,8 @@ Name: qbittorrent Summary: A Bittorrent Client -Version: 1.3.1 -Release: 11%{dist} -Source0: http://downloads.sf.net/qbittorrent/qbittorrent-1.3.1.tar.gz +Version: 1.3.2 +Release: 12%{dist} +Source0: http://downloads.sf.net/qbittorrent/qbittorrent-1.3.2.tar.gz Patch0: qbittorrent_flag.patch URL: http://sourceforge.net/projects/qbittorrent @@ -77,6 +77,9 @@ %changelog +* Sat Mar 7 2009 Leigh Scott - 1.3.2-12 +- update to version 1.3.2 + * Wed Mar 4 2009 Leigh Scott - 1.3.1-11 - Remove qhostaddress.h.patch From leigh123linux at fedoraproject.org Sat Mar 7 04:56:09 2009 From: leigh123linux at fedoraproject.org (Leigh Scott) Date: Sat, 7 Mar 2009 04:56:09 +0000 (UTC) Subject: rpms/qbittorrent/devel sources,1.2,1.3 Message-ID: <20090307045609.18E3070116@cvs1.fedora.phx.redhat.com> Author: leigh123linux Update of /cvs/pkgs/rpms/qbittorrent/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9645 Modified Files: sources Log Message: update to 1.3.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Feb 2009 22:52:11 -0000 1.2 +++ sources 7 Mar 2009 04:55:38 -0000 1.3 @@ -1 +1 @@ -6611d60f31c2c7e22db8f1306d126c08 qbittorrent-1.3.1.tar.gz +680ea41e5601d5cd7990b303f9ad503c qbittorrent-1.3.2.tar.gz From leigh123linux at fedoraproject.org Sat Mar 7 05:05:57 2009 From: leigh123linux at fedoraproject.org (Leigh Scott) Date: Sat, 7 Mar 2009 05:05:57 +0000 (UTC) Subject: rpms/qbittorrent/devel .cvsignore,1.2,1.3 Message-ID: <20090307050557.66D2070116@cvs1.fedora.phx.redhat.com> Author: leigh123linux Update of /cvs/pkgs/rpms/qbittorrent/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10920 Modified Files: .cvsignore Log Message: update to 1.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Feb 2009 22:52:11 -0000 1.2 +++ .cvsignore 7 Mar 2009 05:05:27 -0000 1.3 @@ -1 +1 @@ -qbittorrent-1.3.1.tar.gz +qbittorrent-1.3.2.tar.gz From leigh123linux at fedoraproject.org Sat Mar 7 05:12:06 2009 From: leigh123linux at fedoraproject.org (Leigh Scott) Date: Sat, 7 Mar 2009 05:12:06 +0000 (UTC) Subject: rpms/qbittorrent/devel import.log,1.1,1.2 Message-ID: <20090307051206.287BD70116@cvs1.fedora.phx.redhat.com> Author: leigh123linux Update of /cvs/pkgs/rpms/qbittorrent/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11977/devel Modified Files: import.log Log Message: update to 1.3.2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/qbittorrent/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Feb 2009 22:52:11 -0000 1.1 +++ import.log 7 Mar 2009 05:12:05 -0000 1.2 @@ -1 +1,2 @@ qbittorrent-1_3_1-7_fc10:HEAD:qbittorrent-1.3.1-7.fc10.src.rpm:1234306317 +qbittorrent-1_3_2-12_fc10:HEAD:qbittorrent-1.3.2-12.fc10.src.rpm:1236402705 From leigh123linux at fedoraproject.org Sat Mar 7 05:28:51 2009 From: leigh123linux at fedoraproject.org (Leigh Scott) Date: Sat, 7 Mar 2009 05:28:51 +0000 (UTC) Subject: rpms/qbittorrent/devel import.log,1.2,1.3 Message-ID: <20090307052851.BCE6670116@cvs1.fedora.phx.redhat.com> Author: leigh123linux Update of /cvs/pkgs/rpms/qbittorrent/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14711/devel Modified Files: import.log Log Message: update to 1.3.2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/qbittorrent/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 7 Mar 2009 05:12:05 -0000 1.2 +++ import.log 7 Mar 2009 05:28:21 -0000 1.3 @@ -1,2 +1,3 @@ qbittorrent-1_3_1-7_fc10:HEAD:qbittorrent-1.3.1-7.fc10.src.rpm:1234306317 qbittorrent-1_3_2-12_fc10:HEAD:qbittorrent-1.3.2-12.fc10.src.rpm:1236402705 +qbittorrent-1_3_2-12_fc10:HEAD:qbittorrent-1.3.2-12.fc10.src.rpm:1236403693 From leigh123linux at fedoraproject.org Sat Mar 7 05:39:39 2009 From: leigh123linux at fedoraproject.org (Leigh Scott) Date: Sat, 7 Mar 2009 05:39:39 +0000 (UTC) Subject: rpms/qbittorrent/devel import.log,1.3,1.4 qbittorrent.spec,1.7,1.8 Message-ID: <20090307053939.8044570116@cvs1.fedora.phx.redhat.com> Author: leigh123linux Update of /cvs/pkgs/rpms/qbittorrent/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16903/devel Modified Files: import.log qbittorrent.spec Log Message: update to 1.3.2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/qbittorrent/devel/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 7 Mar 2009 05:28:21 -0000 1.3 +++ import.log 7 Mar 2009 05:39:09 -0000 1.4 @@ -1,3 +1,4 @@ qbittorrent-1_3_1-7_fc10:HEAD:qbittorrent-1.3.1-7.fc10.src.rpm:1234306317 qbittorrent-1_3_2-12_fc10:HEAD:qbittorrent-1.3.2-12.fc10.src.rpm:1236402705 qbittorrent-1_3_2-12_fc10:HEAD:qbittorrent-1.3.2-12.fc10.src.rpm:1236403693 +qbittorrent-1_3_2-13_fc10:HEAD:qbittorrent-1.3.2-13.fc10.src.rpm:1236404334 Index: qbittorrent.spec =================================================================== RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- qbittorrent.spec 7 Mar 2009 04:45:13 -0000 1.7 +++ qbittorrent.spec 7 Mar 2009 05:39:09 -0000 1.8 @@ -1,7 +1,7 @@ Name: qbittorrent Summary: A Bittorrent Client Version: 1.3.2 -Release: 12%{dist} +Release: 13%{dist} Source0: http://downloads.sf.net/qbittorrent/qbittorrent-1.3.2.tar.gz Patch0: qbittorrent_flag.patch @@ -77,6 +77,9 @@ %changelog +* Sat Mar 7 2009 Leigh Scott - 1.3.2-13 +- Had problems with cvs commit + * Sat Mar 7 2009 Leigh Scott - 1.3.2-12 - update to version 1.3.2 From transif at fedoraproject.org Sat Mar 7 06:34:42 2009 From: transif at fedoraproject.org (Transifex System User) Date: Sat, 7 Mar 2009 06:34:42 +0000 (UTC) Subject: comps/po es.po,1.28,1.29 Message-ID: <20090307063442.3A98F70116@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27291/po Modified Files: es.po Log Message: 2009-03-07 Jorge A Gallegos (via kad at fedoraproject.org) * po/es.po: Updated spanish translation Index: es.po =================================================================== RCS file: /cvs/pkgs/comps/po/es.po,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- es.po 4 Mar 2009 06:34:15 -0000 1.28 +++ es.po 7 Mar 2009 06:34:08 -0000 1.29 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: comps.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-04 03:52+0000\n" -"PO-Revision-Date: 2009-03-04 00:26-0600\n" +"POT-Creation-Date: 2009-03-07 05:53+0000\n" +"PO-Revision-Date: 2009-03-07 00:31-0600\n" "Last-Translator: Domingo Becker \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -20,7 +20,6 @@ #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 #: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1 -#, fuzzy msgid "A lightweight desktop environment that works well on low end machines." msgstr "" "Un entorno de escritorio liviano que funciona bien en m??quinas peque??as." @@ -571,45 +570,45 @@ msgstr "Soporte para marathi" #: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111 -#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:127 +#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:128 msgid "MySQL Database" msgstr "Base de datos MySQL" #: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113 -#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:130 +#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:131 #: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37 msgid "Network Servers" msgstr "Servidores de red" #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114 -#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:131 +#: ../comps-f10.xml.in.h:123 ../comps-f11.xml.in.h:132 #: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38 msgid "News Server" msgstr "Servidor de noticias" #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116 -#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:133 +#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:134 msgid "Northern Sotho Support" msgstr "Soporte para Sotho del Norte" #: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117 -#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:134 +#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:135 msgid "Norwegian Support" msgstr "Soporte para noruego" #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118 -#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:136 +#: ../comps-f10.xml.in.h:127 ../comps-f11.xml.in.h:137 #: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39 msgid "Office/Productivity" msgstr "Oficina/Productividad" #: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120 -#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:139 +#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:140 msgid "Oriya Support" msgstr "Soporte para Oriya" #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121 -#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:140 +#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:141 #: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40 msgid "" "Packages which provide functionality for developing and building " @@ -619,73 +618,73 @@ "aplicaciones." #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122 -#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:141 +#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:142 msgid "Persian Support" msgstr "Soporte para persa" #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123 -#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:142 +#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:143 msgid "Polish Support" msgstr "Soporte para polaco" #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124 -#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:143 +#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:144 msgid "Portuguese Support" msgstr "Soporte para portugu??s" #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125 -#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:144 +#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:145 msgid "PostgreSQL Database" msgstr "Base de datos PostgreSQL" #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126 -#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:145 +#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:146 msgid "Printing Support" msgstr "Soporte para la impresi??n" #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127 -#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:146 +#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:147 msgid "Punjabi Support" msgstr "Soporte para punjabi" #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128 -#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:147 +#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:148 msgid "Romanian Support" msgstr "Soporte para rumano" #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129 -#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:148 +#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:149 msgid "Ruby" msgstr "Ruby" #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130 -#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:149 +#: ../comps-f10.xml.in.h:139 ../comps-f11.xml.in.h:150 msgid "Russian Support" msgstr "Soporte para ruso" #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133 -#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:151 +#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:152 msgid "Samoan Support" msgstr "Soporte para saomano" #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134 -#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:152 +#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:153 msgid "Serbian Support" msgstr "Soporte para serbio" #: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135 -#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:153 +#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:154 msgid "Server Configuration Tools" msgstr "Herramientas de configuraci??n del servidor" #: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136 -#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:154 +#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:155 #: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41 msgid "Servers" msgstr "Servidores" #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137 -#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:155 +#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:156 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42 msgid "" "Simple window managers that aren't part of a larger desktop environment." @@ -694,38 +693,38 @@ "escritorio m??s grande." #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138 -#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:157 +#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:158 msgid "Sinhala Support" msgstr "Soporte para sinhala" #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139 -#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:158 +#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:159 msgid "Slovak Support" msgstr "Soporte para eslovaco" #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140 -#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:159 +#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:160 msgid "Slovenian Support" msgstr "Soporte para esloveno" #: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141 -#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:160 +#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:161 msgid "Smallest possible installation" msgstr "Instalaci??n lo m??s peque??a posible" #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142 -#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:161 +#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:162 #: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43 msgid "Software used for running network servers" msgstr "Programas usados para correr servidores de red" #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143 -#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:162 +#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:163 msgid "Somali Support" msgstr "Soporte para somal??" #: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144 -#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:163 +#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:164 msgid "" "Sometimes called text editors, these are programs that allow you to create " "and edit text files. This includes Emacs and Vi." @@ -734,79 +733,79 @@ "conoce como editores de texto. Estos incluyen Emacs y Vi." #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145 -#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:164 +#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:165 #: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45 msgid "Sound and Video" msgstr "Sonido y v??deo" #: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146 -#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:165 +#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:166 msgid "Southern Ndebele Support" msgstr "Soporte para Ndebele Sure??o" #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147 -#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:166 +#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:167 msgid "Southern Sotho Support" msgstr "Soporte para Sotho Sure??o" #: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148 -#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:167 +#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:168 msgid "Spanish Support" msgstr "Soporte para espa??ol" #: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149 -#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:169 +#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:171 #: ../comps-el4.xml.in.h:46 msgid "Support for developing programs in the Java programming language." msgstr "" "Soporte para el desarrollo de programas en el lenguaje de programaci??n Java." #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150 -#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:170 +#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:172 #: ../comps-el4.xml.in.h:47 msgid "Support for running programs written in the Java programming language." msgstr "" "Soporte para ejecutar programas escritos en el lenguaje de programaci??n Java." #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151 -#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:171 +#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:173 msgid "Swati Support" msgstr "Soporte para Swati" #: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:152 -#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:172 +#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:174 msgid "Swedish Support" msgstr "Soporte para sueco" #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:153 -#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:173 +#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:175 #: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46 msgid "System Tools" msgstr "Herramientas del sistema " #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:154 -#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:174 +#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:176 msgid "Tagalog Support" msgstr "Soporte para tagalo" #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:155 -#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:176 +#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:178 msgid "Tamil Support" msgstr "Soporte para tamil" #: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:156 -#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:177 +#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:179 msgid "Telugu Support" msgstr "Soporte para telugu" #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:157 -#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:178 +#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:180 #: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47 msgid "Text-based Internet" msgstr "Internet basada en texto" #: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:158 -#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:179 +#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:181 msgid "Thai Support" msgstr "Soporte para tailand??s" @@ -815,7 +814,7 @@ msgstr "El entorno de desarrollo integrado Eclipse." #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159 -#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:180 +#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:182 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49 msgid "The applications include office suites, PDF viewers, and more." msgstr "" @@ -823,28 +822,28 @@ "PDF y mucho m??s." #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160 -#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:181 +#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:183 msgid "" "The packages in this group are core libraries needed to develop applications." msgstr "" "Este paquete incluye bibliotecas necesarias para desarrollar aplicaciones." #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161 -#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:182 +#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:184 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50 msgid "These packages allow you to configure an IMAP or SMTP mail server." msgstr "" "Estos paquetes le permiten configurar un servidor de correo IMAP o SMTP." #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162 -#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:183 +#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:185 msgid "" "These packages allow you to develop applications for the X Window System." msgstr "" "Estos paquetes le permiten desarrollar aplicaciones para el sistema X Window." #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163 -#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:184 +#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:186 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51 msgid "" "These packages are helpful when developing web applications or web pages." @@ -852,7 +851,7 @@ "Estos paquetes son ??tiles para desarrollar aplicaciones web o p??ginas web." #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164 -#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:185 +#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:187 msgid "" "These packages include network-based servers such as DHCP, Kerberos and NIS." msgstr "" @@ -860,7 +859,7 @@ "Kerberos y NIS." #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165 -#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:186 +#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:188 msgid "" "These packages include servers for old network protocols such as rsh and " "telnet." @@ -869,17 +868,17 @@ "como rsh y telnet." #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166 -#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:187 +#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:189 msgid "These packages provide a virtualization environment." msgstr "Estos paquetes proporcionan un entorno de virtualizaci??n." #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:167 -#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:188 +#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:190 msgid "These packages provide compatibility with previous releases." msgstr "Estos paquetes proporcionan compatibilidad con versiones anteriores." #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168 -#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:189 +#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:191 msgid "" "These packages provide support for various locales including fonts and input " "methods." @@ -888,7 +887,7 @@ "incluyendotipograf??as y m??todos de escritura." #: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169 -#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:190 +#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:192 msgid "" "These tools allow you to create documents in the DocBook format and convert " "them into HTML, PDF, Postscript, and text." @@ -897,19 +896,19 @@ "convertirla a HTML, PDF, Postscript y texto." #: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170 -#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:191 +#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:193 #: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53 msgid "These tools allow you to run a Web server on the system." msgstr "Estas herramientas le permiten ejecutar un servidor Web en el sistema." #: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:171 -#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:192 +#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:194 #: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54 msgid "These tools allow you to run an FTP server on the system." msgstr "Estas herramientas le permiten ejecutar un servidor FTP en el sistema." #: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:172 -#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:193 +#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:195 #: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55 msgid "" "These tools include core development tools such as automake, gcc, perl, " @@ -919,21 +918,21 @@ "como por ejemplo automake, gcc, perl, python y depuradores." #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173 -#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:194 +#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:196 #: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56 msgid "This group allows you to configure the system as a news server." msgstr "" "Este grupo le permite configurar el sistema como un servidor de noticias." #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174 -#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:195 +#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:197 msgid "This group contains all of Red Hat's custom server configuration tools." msgstr "" "Este grupo contiene todas las herramientas de configuraci??n del servidor " "propias de Red Hat." #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175 -#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:196 +#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:198 msgid "" "This group includes a minimal set of packages. Useful for creating small " "router/firewall boxes, for example." @@ -942,13 +941,13 @@ "de peque??as cajas de enrutadores/cortafuegos, por ejemplo." #: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176 -#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:197 +#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:199 #: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57 msgid "This group includes graphical email, Web, and chat clients." msgstr "El grupo incluye clientes gr??ficos de correo electr??nico, Web y chat. " #: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:177 -#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:198 +#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:200 #: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58 msgid "" "This group includes packages for performing mathematical and scientific " @@ -958,14 +957,14 @@ "as?? como trazados y conversi??n de unidades." #: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178 -#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:199 +#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:201 #: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59 msgid "This group includes packages to help you manipulate and scan images." msgstr "" "Este grupo incluye paquetes que le permitir??n manipular y escanear im??genes." #: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179 -#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:200 +#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:202 #: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60 msgid "" "This group includes text-based email, Web, and chat clients. These " @@ -975,7 +974,7 @@ "chat. Estas aplicaciones no necesitan el sistema X Window." #: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180 -#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:201 +#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:203 #: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61 msgid "" "This group is a collection of graphical administration tools for the system, " @@ -986,7 +985,7 @@ "hardware del sistema." #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181 -#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:202 +#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:204 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64 msgid "" "This group is a collection of tools and resources of Armenian environments." @@ -995,7 +994,7 @@ "Armenio." #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182 -#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:203 +#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:205 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68 msgid "" "This group is a collection of tools for various hardware specific utilities." @@ -1004,7 +1003,7 @@ "espec??ficas al hardware." #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183 -#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:205 +#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:207 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69 msgid "" "This group is a collection of various tools for the system, such as the " @@ -1015,7 +1014,7 @@ "herramientas para monitorear el tr??fico de redes, entre otras. " #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184 -#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:206 +#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:208 msgid "" "This package group allows you to run a DNS name server (BIND) on the system." msgstr "" @@ -1023,7 +1022,7 @@ "sistema." #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185 -#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:207 +#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:209 msgid "" "This package group allows you to share files between Linux and MS Windows" "(tm) systems." @@ -1032,140 +1031,140 @@ "Linux y MS Windows (tm)." #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186 -#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:208 +#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:210 msgid "This package group contains packages useful for use with MySQL." msgstr "Este grupo incluye paquetes ??tiles para usar con MySQL." #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:187 -#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:209 +#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:211 msgid "This package group includes packages useful for use with Postgresql." msgstr "" "Este grupo de paquetes incluye paquetes ??tiles para usar con Postgresql." #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:188 -#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:210 +#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:212 msgid "Tibetan Support" msgstr "Soporte para tibet??no" #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:189 -#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:211 +#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:213 msgid "Tonga Support" msgstr "Soporte para tongano" #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:190 -#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:212 +#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:214 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70 msgid "Tools and Utilities needed by a Fedora Packager" msgstr "Herramientas y Utilitarios necesarios para un Empaquetador de Fedora" #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:191 -#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:213 +#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:215 msgid "Tsonga Support" msgstr "Soporte para tsonga" #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:192 -#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:214 +#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:216 msgid "Tswana Support" msgstr "Soporte para tswana" #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:193 -#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:215 +#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:217 msgid "Turkish Support" msgstr "Soporte para turco" #: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:194 -#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:217 +#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:219 msgid "Ukrainian Support" msgstr "Soporte para ucraniano " #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:195 -#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:219 +#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:221 msgid "Urdu Support" msgstr "Soporte para urd??" #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:196 -#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:221 +#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:223 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71 msgid "Various core pieces of the system." msgstr "Varias piezas n??cleo del sistema." #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:197 -#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:222 +#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:224 #: ../comps-el5.xml.in.h:72 msgid "Various ways to relax and spend your free time." msgstr "Varias maneras de relajarse y pasar el tiempo libre." #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:198 -#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:223 +#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:225 msgid "Venda Support" msgstr "Soporte para Venda" #: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:199 -#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:224 +#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:226 msgid "Vietnamese Support" msgstr "Soporte para vietnamita" #: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:200 -#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:225 +#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:227 msgid "Virtualization" msgstr "Virtualizaci??n" #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202 -#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:227 +#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:229 #: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73 msgid "Web Development" msgstr "Desarrollo Web" #: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:203 -#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:228 +#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:230 #: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74 msgid "Web Server" msgstr "Servidor Web" #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:204 -#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:229 +#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:231 msgid "Welsh Support" msgstr "Soporte para gal??s" #: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:205 -#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:230 +#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:232 #: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75 msgid "Window Managers" msgstr "Administradores de Ventana" #: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:206 -#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:231 +#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:233 msgid "Windows File Server" msgstr "Servidor de archivos Windows" #: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:207 -#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:232 +#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:234 msgid "X Software Development" msgstr "Desarrollo de software para X" #: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:208 -#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:233 +#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:235 #: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76 msgid "X Window System" msgstr "Sistema X Window" #: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:209 -#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:234 +#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:236 msgid "XFCE" msgstr "XFCE" #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210 -#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:235 +#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:237 msgid "XFCE Software Development" msgstr "Desarrollo de Software para XFCE" #: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:211 -#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:236 +#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:238 msgid "Xhosa Support" msgstr "Soporte para Xhosa" #: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:212 -#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:237 +#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:239 msgid "Zulu Support" msgstr "Soporte para zul??" @@ -1205,17 +1204,17 @@ msgstr "Soporte para bajo saj??n" #: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118 -#: ../comps-f11.xml.in.h:126 +#: ../comps-f11.xml.in.h:127 msgid "Mongolian Support" msgstr "Soporte para mongol" #: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121 -#: ../comps-f11.xml.in.h:129 +#: ../comps-f11.xml.in.h:130 msgid "Nepali Support" msgstr "Soporte para nepali" #: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128 -#: ../comps-f11.xml.in.h:137 +#: ../comps-f11.xml.in.h:138 msgid "Older bitmap and vector fonts packages" msgstr "Paquetes para viejas fuentes de mapas de bit y fuentes vectoriales" @@ -1237,12 +1236,12 @@ msgstr "Soporte para macedonio" #: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:124 -#: ../comps-f11.xml.in.h:132 +#: ../comps-f11.xml.in.h:133 msgid "Northern Sami Support" msgstr "Soporte para sami septentrional" #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:140 -#: ../comps-f11.xml.in.h:150 +#: ../comps-f11.xml.in.h:151 msgid "SUGAR Desktop Environment" msgstr "Entorno de Escritorio SUGAR" @@ -1251,7 +1250,7 @@ msgstr "SUGAR es el entorno de escritorio desarrollado para la OLPC XO." #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213 -#: ../comps-f11.xml.in.h:226 +#: ../comps-f11.xml.in.h:228 msgid "Walloon Support" msgstr "Soporte para wallon??s" @@ -1288,25 +1287,25 @@ msgid "Maithili Support" msgstr "Soporte para Maithili" -#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:128 +#: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:129 msgid "Myanmar (Burmese) Support" msgstr "Soporte para Myanmar (burmese)" -#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:156 +#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:157 msgid "Sindhi Support" msgstr "Soporte para Sindhi" -#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:168 +#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:170 msgid "Support for developing programs in the Haskell programming language." msgstr "" "Soporte para el desarrollo de programas en el lenguaje de programaci??n " "Haskell." -#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:175 +#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:177 msgid "Tajik Support" msgstr "Soporte para Tajik" -#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:220 +#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:222 msgid "Uzbek Support" msgstr "Soporte para Uszbek" @@ -1342,15 +1341,26 @@ msgid "Malagasy Support" msgstr "Soporte para malagasio" -#: ../comps-f11.xml.in.h:135 +#: ../comps-f11.xml.in.h:126 +msgid "MinGW cross-compiler" +msgstr "Compilador multi-plataforma MinGW" + +#: ../comps-f11.xml.in.h:136 msgid "Occitan Support" msgstr "Soporte para occitanio" -#: ../comps-f11.xml.in.h:138 +#: ../comps-f11.xml.in.h:139 msgid "Online Help and Documentation" msgstr "Ayuda y Documentaci??n en linea" -#: ../comps-f11.xml.in.h:204 +#: ../comps-f11.xml.in.h:169 +msgid "" +"Support for cross-compiling programs to 32 bit Windows targets, testing " +"them, and building installers, all from within Fedora." +msgstr "Soporte para compilar programas a objetivos de 32 bit, probarlos y crear " +"instaladores, todo desde dentro de Fedora." + +#: ../comps-f11.xml.in.h:206 msgid "" "This group is a collection of tools used in the design, modification, " "manipulation, and packaging of fonts." @@ -1358,11 +1368,11 @@ "Este grupo es un conjunto de herramientas que se usan en el dise??o, " "modificaci??n, manipulaci??n y empaquetado de fuentes (tipos de letras)." -#: ../comps-f11.xml.in.h:216 +#: ../comps-f11.xml.in.h:218 msgid "Turkmen Support" msgstr "Soporte para turkmenio" -#: ../comps-f11.xml.in.h:218 +#: ../comps-f11.xml.in.h:220 msgid "Upper Sorbian Support" msgstr "Soporte para serbio arribe??o" From toshio at fedoraproject.org Sat Mar 7 07:56:33 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Sat, 7 Mar 2009 07:56:33 +0000 (UTC) Subject: rpms/python-fedora/devel .cvsignore, 1.26, 1.27 python-fedora.spec, 1.32, 1.33 sources, 1.27, 1.28 Message-ID: <20090307075634.29B2E70116@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9933 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Fri Mar 6 2009 Toshio Kuratomi - 0.3.10-1 - CSRF fixes and django authentication provider. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 9 Feb 2009 06:31:43 -0000 1.26 +++ .cvsignore 7 Mar 2009 07:56:01 -0000 1.27 @@ -1 +1 @@ -python-fedora-0.3.9.tar.gz +python-fedora-0.3.10.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- python-fedora.spec 26 Feb 2009 21:26:23 -0000 1.32 +++ python-fedora.spec 7 Mar 2009 07:56:01 -0000 1.33 @@ -1,8 +1,8 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.9 -Release: 2%{?dist} +Version: 0.3.10 +Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services Group: Development/Languages @@ -61,6 +61,12 @@ %{python_sitelib}/* %changelog +* Fri Mar 6 2009 Toshio Kuratomi - 0.3.10-1 +- CSRF fixes and django authentication provider. + +* Mon Feb 9 2009 Toshio Kuratomi - 0.3.9.1-1 +- Fix for python-2.4 compatibility + * Thu Feb 26 2009 Fedora Release Engineering - 0.3.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 9 Feb 2009 06:31:43 -0000 1.27 +++ sources 7 Mar 2009 07:56:01 -0000 1.28 @@ -1 +1 @@ -c3d2e4b9f4515859998081a1812a282d python-fedora-0.3.9.tar.gz +7e20b69e07c3f1eab3e6a99e1d009f3b python-fedora-0.3.10.tar.gz From toshio at fedoraproject.org Sat Mar 7 07:58:29 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Sat, 7 Mar 2009 07:58:29 +0000 (UTC) Subject: rpms/python-fedora/devel python-fedora.spec,1.33,1.34 Message-ID: <20090307075829.90EE070116@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10451 Modified Files: python-fedora.spec Log Message: Fix changelog. Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- python-fedora.spec 7 Mar 2009 07:56:01 -0000 1.33 +++ python-fedora.spec 7 Mar 2009 07:57:59 -0000 1.34 @@ -64,9 +64,6 @@ * Fri Mar 6 2009 Toshio Kuratomi - 0.3.10-1 - CSRF fixes and django authentication provider. -* Mon Feb 9 2009 Toshio Kuratomi - 0.3.9.1-1 -- Fix for python-2.4 compatibility - * Thu Feb 26 2009 Fedora Release Engineering - 0.3.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From oget at fedoraproject.org Sat Mar 7 08:01:40 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Sat, 7 Mar 2009 08:01:40 +0000 (UTC) Subject: rpms/rosegarden4/devel rosegarden4.spec,1.11,1.12 Message-ID: <20090307080140.7ACF270116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/rosegarden4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11079 Modified Files: rosegarden4.spec Log Message: * Sat Mar 07 2009 Orcan Ogetbil - 1.7.3-2 - Add Requires: perl-XML-Twig. RHBZ#468919 - Fix the lilypondview script. RHBZ#464046 - Separate fonts to their own subpackages RHBZ#477450 Index: rosegarden4.spec =================================================================== RCS file: /cvs/pkgs/rpms/rosegarden4/devel/rosegarden4.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- rosegarden4.spec 6 Mar 2009 23:47:30 -0000 1.11 +++ rosegarden4.spec 7 Mar 2009 08:01:10 -0000 1.12 @@ -1,6 +1,6 @@ Name: rosegarden4 Version: 1.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MIDI, audio and notation editor Group: Applications/Multimedia License: GPLv2+ @@ -21,6 +21,11 @@ BuildRequires: liblrdf-devel BuildRequires: dssi-devel BuildRequires: lirc-devel +BuildRequires: fontpackages-devel + +Requires: perl-XML-Twig +Requires: %{name}-feta-fonts = %{version}-%{release} +Requires: %{name}-parmesan-fonts = %{version}-%{release} %description Rosegarden is a professional audio and MIDI sequencer, score editor, and @@ -29,6 +34,30 @@ Rosegarden is an easy to learn, attractive application, ideal for composers, musicians, music students, and small studio or home recording environments. +%package feta-fonts +Summary: Rosegarden feta fonts +Group: User Interface/X +Requires: fontpackages-filesystem + +%description feta-fonts +Rosegarden is a professional audio and MIDI sequencer, score editor, and +general purpose music composition and editing environment. + +This package contains Lilypond's feta musical notation fonts adapted for use +of Rosegarden. + +%package parmesan-fonts +Summary: Rosegarden parmesan fonts +Group: User Interface/X +Requires: fontpackages-filesystem + +%description parmesan-fonts +Rosegarden is a professional audio and MIDI sequencer, score editor, and +general purpose music composition and editing environment. + +This package contains Lilypond's parmesan musical notation fonts adapted for +use of Rosegarden. + %prep %setup -q -n rosegarden-%{version} # Look for LADSPA/DSSI plugins in the correct place on 64bit platforms @@ -42,6 +71,9 @@ # Add GenericName to the desktop file: echo "GenericName=Audio and MIDI Sequencer" >> data/desktop/rosegarden.desktop +# Put quotes around this item, otherwise the script will fail. RHBZ#464046 +sed -i 's|\(`send_dcop wasCancelled`\)|"\1"|' src/helpers/rosegarden-lilypondview + %build %cmake . -DCMAKE_CXX_FLAGS="%{optflags}" make VERBOSE=1 %{?_smp_mflags} @@ -62,6 +94,15 @@ %find_lang rosegarden +# Install fonts in the %%_fontdir and create symlinks +mkdir -p %{buildroot}/%{_fontdir} +install -pm 644 data/fonts/*.pfa %{buildroot}/%{_fontdir} +pushd %{buildroot}%{_datadir}/apps/rosegarden/fonts/ + for pfafile in *.pfa ; do + ln -sf ../../../fonts/%{name}/$pfafile . + done +popd + %check #ctest @@ -113,7 +154,18 @@ %{_datadir}/mimelnk/audio/x-rosegarden-device.desktop %{_datadir}/mimelnk/audio/x-soundfont.desktop +%_font_pkg -n feta *feta*.pfa +%doc data/fonts/README + +%_font_pkg -n parmesan *parmesan*.pfa +%doc data/fonts/README + %changelog +* Sat Mar 07 2009 Orcan Ogetbil - 1.7.3-2 +- Add Requires: perl-XML-Twig. RHBZ#468919 +- Fix the lilypondview script. RHBZ#464046 +- Separate fonts to their own subpackages RHBZ#477450 + * Fri Mar 06 2009 Orcan Ogetbil - 1.7.3-1 - New upstream version. From oget at fedoraproject.org Sat Mar 7 08:05:09 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Sat, 7 Mar 2009 08:05:09 +0000 (UTC) Subject: rpms/rosegarden4/F-10 rosegarden4.spec,1.10,1.11 Message-ID: <20090307080509.A414070116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/rosegarden4/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12065 Modified Files: rosegarden4.spec Log Message: * Fri Mar 06 2009 Orcan Ogetbil - 1.7.3-2 - Add Requires: perl-XML-Twig. RHBZ#468919 - Fix the lilypondview script. RHBZ#464046 Index: rosegarden4.spec =================================================================== RCS file: /cvs/pkgs/rpms/rosegarden4/F-10/rosegarden4.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rosegarden4.spec 6 Mar 2009 23:57:57 -0000 1.10 +++ rosegarden4.spec 7 Mar 2009 08:04:39 -0000 1.11 @@ -1,6 +1,6 @@ Name: rosegarden4 Version: 1.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MIDI, audio and notation editor Group: Applications/Multimedia License: GPLv2+ @@ -22,6 +22,8 @@ BuildRequires: dssi-devel BuildRequires: lirc-devel +Requires: perl-XML-Twig + %description Rosegarden is a professional audio and MIDI sequencer, score editor, and general purpose music composition and editing environment. @@ -42,6 +44,9 @@ # Add GenericName to the desktop file: echo "GenericName=Audio and MIDI Sequencer" >> data/desktop/rosegarden.desktop +# Put quotes around this item, otherwise the script will fail. RHBZ#464046 +sed -i 's|\(`send_dcop wasCancelled`\)|"\1"|' src/helpers/rosegarden-lilypondview + %build %cmake . -DCMAKE_CXX_FLAGS="%{optflags}" make VERBOSE=1 %{?_smp_mflags} @@ -114,6 +119,10 @@ %{_datadir}/mimelnk/audio/x-soundfont.desktop %changelog +* Fri Mar 06 2009 Orcan Ogetbil - 1.7.3-2 +- Add Requires: perl-XML-Twig. RHBZ#468919 +- Fix the lilypondview script. RHBZ#464046 + * Fri Mar 06 2009 Orcan Ogetbil - 1.7.3-1 - New upstream version. From toshio at fedoraproject.org Sat Mar 7 08:05:16 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Sat, 7 Mar 2009 08:05:16 +0000 (UTC) Subject: rpms/python-fedora/devel python-fedora.spec,1.34,1.35 Message-ID: <20090307080516.5DF9170116@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12011 Modified Files: python-fedora.spec Log Message: Sync whitespace change across branches. Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- python-fedora.spec 7 Mar 2009 07:57:59 -0000 1.34 +++ python-fedora.spec 7 Mar 2009 08:04:45 -0000 1.35 @@ -39,18 +39,15 @@ %prep %setup -q - %build paver build paver html - %install rm -rf %{buildroot} paver install --skip-build --root %{buildroot} mv build-doc/html doc/ - %clean rm -rf %{buildroot} From pghmcfc at fedoraproject.org Sat Mar 7 09:06:20 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Sat, 7 Mar 2009 09:06:20 +0000 (UTC) Subject: rpms/perl-Date-Simple/devel perl-Date-Simple.spec,1.11,1.12 Message-ID: <20090307090620.59DC570116@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-Date-Simple/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23092 Modified Files: perl-Date-Simple.spec Log Message: Filter out unwanted provides for perl shared objects Index: perl-Date-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Date-Simple/devel/perl-Date-Simple.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Date-Simple.spec 26 Feb 2009 14:42:00 -0000 1.11 +++ perl-Date-Simple.spec 7 Mar 2009 09:05:50 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Simple date object for perl Name: perl-Date-Simple Version: 3.03 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Date-Simple/ @@ -10,6 +10,12 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(ExtUtils::MakeMaker), perl(Test::More) +# don't "provide" private Perl libs +%global _use_internal_dependency_generator 0 +%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u +%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}" +%global __find_requires /bin/sh -c "%{__deploop R}" + %description %{summary}. @@ -53,10 +59,13 @@ %{_mandir}/man3/Date::Simple*.3pm* %changelog +* Fri Mar 6 2009 Paul Howarth - 3.03-3 +- Filter out unwanted provides for perl shared objects + * Thu Feb 26 2009 Fedora Release Engineering - 3.03-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Thu Jan 22 2009 Paul Howarth 3.03-1 +* Thu Jan 22 2009 Paul Howarth - 3.03-1 - Update to 3.03 - Don't package Artistic license text, not included in upstream release - New upstream maintainer -> new source URL From jakub at fedoraproject.org Sat Mar 7 09:16:52 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Sat, 7 Mar 2009 09:16:52 +0000 (UTC) Subject: rpms/gcc/devel power7.patch, NONE, 1.1 .cvsignore, 1.258, 1.259 gcc.spec, 1.26, 1.27 sources, 1.261, 1.262 gcc44-pr39358.patch, 1.1, NONE Message-ID: <20090307091652.C5B8270116@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/gcc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25405 Modified Files: .cvsignore gcc.spec sources Added Files: power7.patch Removed Files: gcc44-pr39358.patch Log Message: 4.4.0-0.23 power7.patch: --- NEW FILE power7.patch --- 2009-03-06 Michael Meissner * doc/invoke.texi (-mvsx-scalar-memory): New switch, to switch to use VSX reg+reg addressing for all scalar double precision floating point. * config/rs6000/rs6000.opt (-vsx-scalar-memory): Ditto. * configure.ac (gcc_cv_as_powerpc_mfpgpr): Set binutils version to 2.19.2. (gcc_cv_as_powerpc_cmpb): Ditto. (gcc_cv_as_powerpc_dfp): Ditto. (gcc_cv_as_powerpc_vsx): Ditto. (gcc_cv_as_powerpc_popcntd): Ditto. * configure: Regenerate. * config/rs6000/vector.md (VEC_int): New mode attribute for vector conversions. (VEC_INT): Ditto. (ftrunc2): Make this a define_expand. (float2): New vector conversion support to add VSX 32 bit int/32 bit floating point convert and 64 bit int/64 bit floating point vector instructions. (unsigned_float2): Ditto. (fix_trunc2): Ditto. (fixuns_trunc2): Ditto. * config/rs6000/predicates.md (easy_fp_constant): 0.0 is an easy constant under VSX. (indexed_or_indirect_operand): Add VSX load/store with update support. * config/rs6000/rs6000.c (rs6000_debug_addr): New global for -mdebug=addr. (rs6000_init_hard_regno_mode_ok): Add -mvsx-scalar-memory support. (rs6000_override_options): Add -mdebug=addr support. (rs6000_builtin_conversion): Add VSX same size conversions. (rs6000_legitimize_address): Add -mdebug=addr support. Add support for VSX load/store with update instructions. (rs6000_legitimize_reload_address): Ditto. (rs6000_legitimate_address): Ditto. (rs6000_mode_dependent_address): Ditto. (print_operand): Ditto. (bdesc_1arg): Add builtins for conversion that calls either the VSX or Altivec insn pattern. (rs6000_common_init_builtins): Ditto. * config/rs6000/vsx.md (VSX_I): Delete, no longer used. (VSi): New mode attribute for conversions. (VSI): Ditto. (VSc): Ditto. (vsx_mov): Add load/store with update support. (vsx_load_update*): New insns for load/store with update support. (vsx_store_update*): Ditto. (vsx_fmadd4): Generate correct code for V4SF. (vsx_fmsub4): Ditto. (vsx_fnmadd4_*): Ditto. (vsx_fnmsub4_*): Ditto. (vsx_float2): New insn for vector conversion. (vsx_floatuns2): Ditto. (vsx_fix_trunc2): Ditto. (vsx_fixuns_trunc2): Ditto. (vsx_xxmrghw): New insn for V4SF interleave. (vsx_xxmrglw): Ditto. * config/rs6000/rs6000.h (rs6000_debug_addr): -mdebug=addr support. (TARGET_DEBUG_ADDR): Ditto. (rs6000_builtins): Add VSX instructions for eventual VSX builtins. * config/rs6000/altivec.md (altivec_vmrghsf): Don't do the altivec instruction if VSX. (altivec_vmrglsf): Ditto. * config/rs6000/rs6000.md (movdf_hardfloat32): Add support for using xxlxor to zero a floating register if VSX. (movdf_hardfloat64_mfpgpr): Ditto. (movdf_hardfloat64): Ditto. 2009-03-03 Michael Meissner * config/rs6000/vsx.md (vsx_xxmrglw): Delete for now, use Altivec. (vsx_xxmrghw): Ditto. * config/rs6000/altivec.md (altivec_vmrghsf): Use this insn even on VSX systems. (altivec_vmrglsf): Ditto. * config/rs6000/rs6000.h (ASM_CPU_NATIVE_SPEC): Use %(asm_default) if we are running as a cross compiler. * config/rs6000/vector.md (vec_interleave_highv4sf): Use correct constants for the extraction. (vec_interleave_lowv4sf): Ditto. * config/rs6000/rs6000.md (floordf2): Fix typo, make this a define_expand, not define_insn. * config/rs6000/aix53.h (ASM_CPU_SPEC): If -mcpu=native, call %:local_cpu_detect(asm) to get the appropriate assembler flags for the machine. * config/rs6000/aix61.h (ASM_CPU_SPEC): Ditto. * config/rs6000/rs6000.h (ASM_CPU_SPEC): Ditto. (ASM_CPU_NATIVE_SPEC): New spec to get asm options if -mcpu=native. (EXTRA_SPECS): Add ASM_CPU_NATIVE_SPEC. * config/rs6000/driver-rs6000.c (asm_names): New static array to give the appropriate asm switches if -mcpu=native. (host_detect_local_cpu): Add support for "asm". * config/rs6000/rs6000.c (processor_target_table): Don't turn on -misel by default for power7. 2009-03-02 Michael Meissner * config/rs6000/rs6000.c (rs6000_emit_swdivdf): Revert last change, since we reverted the floating multiply/add changes. * doc/md.texi (Machine Constraints): Update rs6000 constraints. * config/rs6000/vector.md (neg2): Fix typo to enable vectorized negation. (ftrunc2): Move ftrunc expander here from altivec.md, and add V2DF case. (vec_interleave_highv4sf): Correct type to be V4SF, not V4SI. (vec_extract_evenv2df): Add expander. (vec_extract_oddv2df): Ditto. * config/rs6000/vsx.md (vsx_ftrunc2): New VSX pattern for truncate. (vsx_ftruncdf2): Ditto. (vsx_xxspltw): New instruction for word splat. (vsx_xxmrglw): Whitespace changes. Fix typo from V4SI to v4SF. (vsx_xxmrghw): Ditto. * config/rs6000/altivec.md (altivec_vmrghsf): Whitespace changes. (altivec_vmrglsf): Ditto. (altivec_vspltsf): Disable if we have VSX. (altivec_ftruncv4sf2): Move expander to vector.md, rename insn. * config/rs6000/rs6000.md (ftruncdf2): Add expander for VSX. * config/rs6000/rs6000.c (rs6000_init_hard_regno_mode_ok): Reenable vectorizing V4SF under altivec. (rs6000_hard_regno_mode_ok): Don't allow floating values in LR, CTR, MQ. Also, VRSAVE/VSCR are both 32-bits. (rs6000_init_hard_regno_mode_ok): Print some of the special registers if -mdebug=reg. * config/rs6000/rs6000.md (floating multiply/add insns): Go back to the original semantics for multiply add/subtract, particularly with -ffast-math. * config/rs6000/vsx.md (floating multiply/add insns): Mirror the rs6000 floating point multiply/add insns in VSX. 2009-03-01 Michael Meissner * config/rs6000/vector.md (VEC_L): At TImode. (VEC_M): Like VEC_L, except no TImode. (VEC_base): Add TImode support. (mov): Use VEC_M, not VEC_L. If there is no extra optimization for the move, just generate the standard move. (vector_store_): Ditto. (vector_load_): Ditto. (vec_init): Use vec_init_operand predicate. * config/rs6000/predicates.md (vec_init_operand): New predicate. * config/rs6000/rs6000.c (rs6000_hard_regno_mode_ok): Allow mode in a VSX register if there is a move operation. (rs6000_vector_reg_class): Add internal register number to the debug output. (rs6000_init_hard_regno_mode_ok): Reorganize so all of the code for a given type is located together. If not -mvsx, make "ws" constraint become NO_REGS, not FLOAT_REGS. Change -mdebug=reg output. (rs6000_expand_vector_init): Before calling gen_vsx_concat_v2df, make sure the two float arguments are copied into registers. (rs6000_legitimate_offset_address_p): If no vsx or altivec, don't disallow offset addressing. Add V2DImode. If TImode is handled by the vector unit, allow indexed addressing. Change default case to be a fatal_insn instead of gcc_unreachable. (rs6000_handle_altivec_attribute): Add support for vector double if -mvsx. (rs6000_register_move_cost): Add support for VSX_REGS. Know that under VSX, you can move between float and altivec registers cheaply. (rs6000_emit_swdivdf): Change the pattern of the negate multiply and subtract operation. * config/rs6000/vsx.md (VSX_I): Add TImode. (VSX_L): Add TImode. (VSm): Ditto. (VSs): Ditto. (VSr): Ditto. [...9107 lines suppressed...] if (TARGET_64BIT) \ error ("64-bit E500 not supported"); \ if (TARGET_HARD_FLOAT && TARGET_FPRS) \ --- gcc/config/rs6000/driver-rs6000.c (.../trunk) (revision 144557) +++ gcc/config/rs6000/driver-rs6000.c (.../branches/ibm/power7-meissner) (revision 144692) @@ -343,11 +343,115 @@ detect_processor_aix (void) #endif /* _AIX */ +/* + * Array to map -mcpu=native names to the switches passed to the assembler. + * This list mirrors the specs in ASM_CPU_SPEC, and any changes made here + * should be made there as well. + */ + +struct asm_name { + const char *cpu; + const char *asm_sw; +}; + +static const +struct asm_name asm_names[] = { +#if defined (_AIX) + { "power3", "-m620" }, + { "power4", "-mpwr4" }, + { "power5", "-mpwr5" }, + { "power5+", "-mpwr5x" }, + { "power6", "-mpwr6" }, + { "power6x", "-mpwr6" }, + { "power7", "-mpwr7" }, + { "powerpc", "-mppc" }, + { "rs64a", "-mppc" }, + { "603", "-m603" }, + { "603e", "-m603" }, + { "604", "-m604" }, + { "604e", "-m604" }, + { "620", "-m620" }, + { "630", "-m620" }, + { "970", "-m970" }, + { "G5", "-m970" }, + { NULL, "\ +%{!maix64: \ +%{mpowerpc64: -mppc64} \ +%{maltivec: -m970} \ +%{!maltivec: %{!mpower64: %(asm_default)}}}" }, + +#else + { "common", "-mcom" }, + { "cell", "-mcell" }, + { "power", "-mpwr" }, + { "power2", "-mpwrx" }, + { "power3", "-mppc64" }, + { "power4", "-mpower4" }, + { "power5", "%(asm_cpu_power5)" }, + { "power5+", "%(asm_cpu_power5)" }, + { "power6", "%(asm_cpu_power6) -maltivec" }, + { "power6x", "%(asm_cpu_power6) -maltivec" }, + { "power7", "%(asm_cpu_power7)" }, + { "powerpc", "-mppc" }, + { "rios", "-mpwr" }, + { "rios1", "-mpwr" }, + { "rios2", "-mpwrx" }, + { "rsc", "-mpwr" }, + { "rsc1", "-mpwr" }, + { "rs64a", "-mppc64" }, + { "401", "-mppc" }, + { "403", "-m403" }, + { "405", "-m405" }, + { "405fp", "-m405" }, + { "440", "-m440" }, + { "440fp", "-m440" }, + { "464", "-m440" }, + { "464fp", "-m440" }, + { "505", "-mppc" }, + { "601", "-m601" }, + { "602", "-mppc" }, + { "603", "-mppc" }, + { "603e", "-mppc" }, + { "ec603e", "-mppc" }, + { "604", "-mppc" }, + { "604e", "-mppc" }, + { "620", "-mppc64" }, + { "630", "-mppc64" }, + { "740", "-mppc" }, + { "750", "-mppc" }, + { "G3", "-mppc" }, + { "7400", "-mppc -maltivec" }, + { "7450", "-mppc -maltivec" }, + { "G4", "-mppc -maltivec" }, + { "801", "-mppc" }, + { "821", "-mppc" }, + { "823", "-mppc" }, + { "860", "-mppc" }, + { "970", "-mpower4 -maltivec" }, + { "G5", "-mpower4 -maltivec" }, + { "8540", "-me500" }, + { "8548", "-me500" }, + { "e300c2", "-me300" }, + { "e300c3", "-me300" }, + { "e500mc", "-me500mc" }, + { NULL, "\ +%{mpower: %{!mpower2: -mpwr}} \ +%{mpower2: -mpwrx} \ +%{mpowerpc64*: -mppc64} \ +%{!mpowerpc64*: %{mpowerpc*: -mppc}} \ +%{mno-power: %{!mpowerpc*: -mcom}} \ +%{!mno-power: %{!mpower*: %(asm_default)}}" }, +#endif +}; + /* This will be called by the spec parser in gcc.c when it sees a %:local_cpu_detect(args) construct. Currently it will be called with either "arch" or "tune" as argument depending on if -march=native or -mtune=native is to be substituted. + Additionally it will be called with "asm" to select the appropriate flags + for the assembler. + It returns a string containing new command line parameters to be put at the place of the above two options, depending on what CPU this is executed. @@ -361,29 +465,35 @@ const char const char *cache = ""; const char *options = ""; bool arch; + bool assembler; + size_t i; if (argc < 1) return NULL; arch = strcmp (argv[0], "cpu") == 0; - if (!arch && strcmp (argv[0], "tune")) + assembler = (!arch && strcmp (argv[0], "asm") == 0); + if (!arch && !assembler && strcmp (argv[0], "tune")) return NULL; + if (! assembler) + { #if defined (_AIX) - cache = detect_caches_aix (); + cache = detect_caches_aix (); #elif defined (__APPLE__) - cache = detect_caches_darwin (); + cache = detect_caches_darwin (); #elif defined (__FreeBSD__) - cache = detect_caches_freebsd (); - /* FreeBSD PPC does not provide any cache information yet. */ - cache = ""; + cache = detect_caches_freebsd (); + /* FreeBSD PPC does not provide any cache information yet. */ + cache = ""; #elif defined (__linux__) - cache = detect_caches_linux (); - /* PPC Linux does not provide any cache information yet. */ - cache = ""; + cache = detect_caches_linux (); + /* PPC Linux does not provide any cache information yet. */ + cache = ""; #else - cache = ""; + cache = ""; #endif + } #if defined (_AIX) cpu = detect_processor_aix (); @@ -397,6 +507,17 @@ const char cpu = "powerpc"; #endif + if (assembler) + { + for (i = 0; i < sizeof (asm_names) / sizeof (asm_names[0]); i++) + { + if (!asm_names[i].cpu || !strcmp (asm_names[i].cpu, cpu)) + return asm_names[i].asm_sw; + } + + return NULL; + } + return concat (cache, "-m", argv[0], "=", cpu, " ", options, NULL); } --- gcc/config/rs6000/sysv4.h (.../trunk) (revision 144557) +++ gcc/config/rs6000/sysv4.h (.../branches/ibm/power7-meissner) (revision 144692) @@ -119,9 +119,9 @@ do { \ else if (!strcmp (rs6000_abi_name, "i960-old")) \ { \ rs6000_current_abi = ABI_V4; \ - target_flags |= (MASK_LITTLE_ENDIAN | MASK_EABI \ - | MASK_NO_BITFIELD_WORD); \ + target_flags |= (MASK_LITTLE_ENDIAN | MASK_EABI); \ target_flags &= ~MASK_STRICT_ALIGN; \ + TARGET_NO_BITFIELD_WORD = 1; \ } \ else \ { \ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- .cvsignore 4 Mar 2009 13:55:08 -0000 1.258 +++ .cvsignore 7 Mar 2009 09:16:22 -0000 1.259 @@ -1,3 +1,3 @@ fastjar-0.97.tar.gz -gcc-4.4.0-20090304.tar.bz2 +gcc-4.4.0-20090307.tar.bz2 cloog-ppl-0.15.tar.gz Index: gcc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- gcc.spec 4 Mar 2009 15:23:21 -0000 1.26 +++ gcc.spec 7 Mar 2009 09:16:22 -0000 1.27 @@ -1,9 +1,9 @@ -%define DATE 20090304 -%define SVNREV 144601 +%define DATE 20090307 +%define SVNREV 144693 %define gcc_version 4.4.0 # Note, gcc_release must be integer, if you want to add suffixes to # %{release}, append them after %{gcc_release} on Release: line. -%define gcc_release 0.22 +%define gcc_release 0.23 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 @@ -145,7 +145,7 @@ Patch22: gcc44-raw-string.patch Patch24: gcc44-atom.patch Patch25: gcc44-pr39226.patch -Patch26: gcc44-pr39358.patch +Patch26: gcc44-power7.patch Patch1000: fastjar-0.97-segfault.patch @@ -434,7 +434,7 @@ %patch22 -p0 -b .raw-string~ %patch24 -p0 -b .atom~ %patch25 -p0 -b .pr39226~ -%patch26 -p0 -b .pr39358~ +%patch26 -p0 -b .power7~ # This testcase doesn't compile. rm libjava/testsuite/libjava.lang/PR35020* @@ -1769,6 +1769,18 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Sat Mar 7 2009 Jakub Jelinek 4.4.0-0.23 +- update from trunk + - PRs c++/13549, c++/29469, c++/29607, c++/33492, c++/37520, c++/38908, + c++/9634, debug/39372, middle-end/39360, rtl-optimization/39235, + testsuite/39357, tree-optimization/39349 + - emit DW_TAG_imported* even in main or in lexical blocks that + contain no automatic variables (#488547, PR debug/39379) + - fix DW_AT_decl_line on DW_TAG_imported* (#488771, PR debug/39387) + - fix SCCVN with SSA names occurring in abnormal PHIs (#488061, + PR tree-optimization/39362) +- preliminary Power7 support + * Wed Mar 4 2009 Jakub Jelinek 4.4.0-0.22 - update from trunk - PRs ada/39172, ada/39264, bootstrap/39257, c++/36411, c++/37789, Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- sources 4 Mar 2009 13:55:08 -0000 1.261 +++ sources 7 Mar 2009 09:16:22 -0000 1.262 @@ -1,3 +1,3 @@ 2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz -75f2e4ab9717342f13146245d58fa160 gcc-4.4.0-20090304.tar.bz2 +79ee98a73c0cbab32938bbf5d85f086b gcc-4.4.0-20090307.tar.bz2 716b7a0823f96c9d02c1703a9c47d387 cloog-ppl-0.15.tar.gz --- gcc44-pr39358.patch DELETED --- From jakub at fedoraproject.org Sat Mar 7 09:21:25 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Sat, 7 Mar 2009 09:21:25 +0000 (UTC) Subject: rpms/gcc/devel gcc44-power7.patch,NONE,1.1 power7.patch,1.1,NONE Message-ID: <20090307092125.F105A70116@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/gcc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26693 Added Files: gcc44-power7.patch Removed Files: power7.patch Log Message: 4.4.0-0.23 gcc44-power7.patch: --- NEW FILE gcc44-power7.patch --- 2009-03-06 Michael Meissner * doc/invoke.texi (-mvsx-scalar-memory): New switch, to switch to use VSX reg+reg addressing for all scalar double precision floating point. * config/rs6000/rs6000.opt (-vsx-scalar-memory): Ditto. * configure.ac (gcc_cv_as_powerpc_mfpgpr): Set binutils version to 2.19.2. (gcc_cv_as_powerpc_cmpb): Ditto. (gcc_cv_as_powerpc_dfp): Ditto. (gcc_cv_as_powerpc_vsx): Ditto. (gcc_cv_as_powerpc_popcntd): Ditto. * configure: Regenerate. * config/rs6000/vector.md (VEC_int): New mode attribute for vector conversions. (VEC_INT): Ditto. (ftrunc2): Make this a define_expand. (float2): New vector conversion support to add VSX 32 bit int/32 bit floating point convert and 64 bit int/64 bit floating point vector instructions. (unsigned_float2): Ditto. (fix_trunc2): Ditto. (fixuns_trunc2): Ditto. * config/rs6000/predicates.md (easy_fp_constant): 0.0 is an easy constant under VSX. (indexed_or_indirect_operand): Add VSX load/store with update support. * config/rs6000/rs6000.c (rs6000_debug_addr): New global for -mdebug=addr. (rs6000_init_hard_regno_mode_ok): Add -mvsx-scalar-memory support. (rs6000_override_options): Add -mdebug=addr support. (rs6000_builtin_conversion): Add VSX same size conversions. (rs6000_legitimize_address): Add -mdebug=addr support. Add support for VSX load/store with update instructions. (rs6000_legitimize_reload_address): Ditto. (rs6000_legitimate_address): Ditto. (rs6000_mode_dependent_address): Ditto. (print_operand): Ditto. (bdesc_1arg): Add builtins for conversion that calls either the VSX or Altivec insn pattern. (rs6000_common_init_builtins): Ditto. * config/rs6000/vsx.md (VSX_I): Delete, no longer used. (VSi): New mode attribute for conversions. (VSI): Ditto. (VSc): Ditto. (vsx_mov): Add load/store with update support. (vsx_load_update*): New insns for load/store with update support. (vsx_store_update*): Ditto. (vsx_fmadd4): Generate correct code for V4SF. (vsx_fmsub4): Ditto. (vsx_fnmadd4_*): Ditto. (vsx_fnmsub4_*): Ditto. (vsx_float2): New insn for vector conversion. (vsx_floatuns2): Ditto. (vsx_fix_trunc2): Ditto. (vsx_fixuns_trunc2): Ditto. (vsx_xxmrghw): New insn for V4SF interleave. (vsx_xxmrglw): Ditto. * config/rs6000/rs6000.h (rs6000_debug_addr): -mdebug=addr support. (TARGET_DEBUG_ADDR): Ditto. (rs6000_builtins): Add VSX instructions for eventual VSX builtins. * config/rs6000/altivec.md (altivec_vmrghsf): Don't do the altivec instruction if VSX. (altivec_vmrglsf): Ditto. * config/rs6000/rs6000.md (movdf_hardfloat32): Add support for using xxlxor to zero a floating register if VSX. (movdf_hardfloat64_mfpgpr): Ditto. (movdf_hardfloat64): Ditto. 2009-03-03 Michael Meissner * config/rs6000/vsx.md (vsx_xxmrglw): Delete for now, use Altivec. (vsx_xxmrghw): Ditto. * config/rs6000/altivec.md (altivec_vmrghsf): Use this insn even on VSX systems. (altivec_vmrglsf): Ditto. * config/rs6000/rs6000.h (ASM_CPU_NATIVE_SPEC): Use %(asm_default) if we are running as a cross compiler. * config/rs6000/vector.md (vec_interleave_highv4sf): Use correct constants for the extraction. (vec_interleave_lowv4sf): Ditto. * config/rs6000/rs6000.md (floordf2): Fix typo, make this a define_expand, not define_insn. * config/rs6000/aix53.h (ASM_CPU_SPEC): If -mcpu=native, call %:local_cpu_detect(asm) to get the appropriate assembler flags for the machine. * config/rs6000/aix61.h (ASM_CPU_SPEC): Ditto. * config/rs6000/rs6000.h (ASM_CPU_SPEC): Ditto. (ASM_CPU_NATIVE_SPEC): New spec to get asm options if -mcpu=native. (EXTRA_SPECS): Add ASM_CPU_NATIVE_SPEC. * config/rs6000/driver-rs6000.c (asm_names): New static array to give the appropriate asm switches if -mcpu=native. (host_detect_local_cpu): Add support for "asm". * config/rs6000/rs6000.c (processor_target_table): Don't turn on -misel by default for power7. 2009-03-02 Michael Meissner * config/rs6000/rs6000.c (rs6000_emit_swdivdf): Revert last change, since we reverted the floating multiply/add changes. * doc/md.texi (Machine Constraints): Update rs6000 constraints. * config/rs6000/vector.md (neg2): Fix typo to enable vectorized negation. (ftrunc2): Move ftrunc expander here from altivec.md, and add V2DF case. (vec_interleave_highv4sf): Correct type to be V4SF, not V4SI. (vec_extract_evenv2df): Add expander. (vec_extract_oddv2df): Ditto. * config/rs6000/vsx.md (vsx_ftrunc2): New VSX pattern for truncate. (vsx_ftruncdf2): Ditto. (vsx_xxspltw): New instruction for word splat. (vsx_xxmrglw): Whitespace changes. Fix typo from V4SI to v4SF. (vsx_xxmrghw): Ditto. * config/rs6000/altivec.md (altivec_vmrghsf): Whitespace changes. (altivec_vmrglsf): Ditto. (altivec_vspltsf): Disable if we have VSX. (altivec_ftruncv4sf2): Move expander to vector.md, rename insn. * config/rs6000/rs6000.md (ftruncdf2): Add expander for VSX. * config/rs6000/rs6000.c (rs6000_init_hard_regno_mode_ok): Reenable vectorizing V4SF under altivec. (rs6000_hard_regno_mode_ok): Don't allow floating values in LR, CTR, MQ. Also, VRSAVE/VSCR are both 32-bits. (rs6000_init_hard_regno_mode_ok): Print some of the special registers if -mdebug=reg. * config/rs6000/rs6000.md (floating multiply/add insns): Go back to the original semantics for multiply add/subtract, particularly with -ffast-math. * config/rs6000/vsx.md (floating multiply/add insns): Mirror the rs6000 floating point multiply/add insns in VSX. 2009-03-01 Michael Meissner * config/rs6000/vector.md (VEC_L): At TImode. (VEC_M): Like VEC_L, except no TImode. (VEC_base): Add TImode support. (mov): Use VEC_M, not VEC_L. If there is no extra optimization for the move, just generate the standard move. (vector_store_): Ditto. (vector_load_): Ditto. (vec_init): Use vec_init_operand predicate. * config/rs6000/predicates.md (vec_init_operand): New predicate. * config/rs6000/rs6000.c (rs6000_hard_regno_mode_ok): Allow mode in a VSX register if there is a move operation. (rs6000_vector_reg_class): Add internal register number to the debug output. (rs6000_init_hard_regno_mode_ok): Reorganize so all of the code for a given type is located together. If not -mvsx, make "ws" constraint become NO_REGS, not FLOAT_REGS. Change -mdebug=reg output. (rs6000_expand_vector_init): Before calling gen_vsx_concat_v2df, make sure the two float arguments are copied into registers. (rs6000_legitimate_offset_address_p): If no vsx or altivec, don't disallow offset addressing. Add V2DImode. If TImode is handled by the vector unit, allow indexed addressing. Change default case to be a fatal_insn instead of gcc_unreachable. (rs6000_handle_altivec_attribute): Add support for vector double if -mvsx. (rs6000_register_move_cost): Add support for VSX_REGS. Know that under VSX, you can move between float and altivec registers cheaply. (rs6000_emit_swdivdf): Change the pattern of the negate multiply and subtract operation. * config/rs6000/vsx.md (VSX_I): Add TImode. (VSX_L): Add TImode. (VSm): Ditto. (VSs): Ditto. (VSr): Ditto. [...9107 lines suppressed...] if (TARGET_64BIT) \ error ("64-bit E500 not supported"); \ if (TARGET_HARD_FLOAT && TARGET_FPRS) \ --- gcc/config/rs6000/driver-rs6000.c (.../trunk) (revision 144557) +++ gcc/config/rs6000/driver-rs6000.c (.../branches/ibm/power7-meissner) (revision 144692) @@ -343,11 +343,115 @@ detect_processor_aix (void) #endif /* _AIX */ +/* + * Array to map -mcpu=native names to the switches passed to the assembler. + * This list mirrors the specs in ASM_CPU_SPEC, and any changes made here + * should be made there as well. + */ + +struct asm_name { + const char *cpu; + const char *asm_sw; +}; + +static const +struct asm_name asm_names[] = { +#if defined (_AIX) + { "power3", "-m620" }, + { "power4", "-mpwr4" }, + { "power5", "-mpwr5" }, + { "power5+", "-mpwr5x" }, + { "power6", "-mpwr6" }, + { "power6x", "-mpwr6" }, + { "power7", "-mpwr7" }, + { "powerpc", "-mppc" }, + { "rs64a", "-mppc" }, + { "603", "-m603" }, + { "603e", "-m603" }, + { "604", "-m604" }, + { "604e", "-m604" }, + { "620", "-m620" }, + { "630", "-m620" }, + { "970", "-m970" }, + { "G5", "-m970" }, + { NULL, "\ +%{!maix64: \ +%{mpowerpc64: -mppc64} \ +%{maltivec: -m970} \ +%{!maltivec: %{!mpower64: %(asm_default)}}}" }, + +#else + { "common", "-mcom" }, + { "cell", "-mcell" }, + { "power", "-mpwr" }, + { "power2", "-mpwrx" }, + { "power3", "-mppc64" }, + { "power4", "-mpower4" }, + { "power5", "%(asm_cpu_power5)" }, + { "power5+", "%(asm_cpu_power5)" }, + { "power6", "%(asm_cpu_power6) -maltivec" }, + { "power6x", "%(asm_cpu_power6) -maltivec" }, + { "power7", "%(asm_cpu_power7)" }, + { "powerpc", "-mppc" }, + { "rios", "-mpwr" }, + { "rios1", "-mpwr" }, + { "rios2", "-mpwrx" }, + { "rsc", "-mpwr" }, + { "rsc1", "-mpwr" }, + { "rs64a", "-mppc64" }, + { "401", "-mppc" }, + { "403", "-m403" }, + { "405", "-m405" }, + { "405fp", "-m405" }, + { "440", "-m440" }, + { "440fp", "-m440" }, + { "464", "-m440" }, + { "464fp", "-m440" }, + { "505", "-mppc" }, + { "601", "-m601" }, + { "602", "-mppc" }, + { "603", "-mppc" }, + { "603e", "-mppc" }, + { "ec603e", "-mppc" }, + { "604", "-mppc" }, + { "604e", "-mppc" }, + { "620", "-mppc64" }, + { "630", "-mppc64" }, + { "740", "-mppc" }, + { "750", "-mppc" }, + { "G3", "-mppc" }, + { "7400", "-mppc -maltivec" }, + { "7450", "-mppc -maltivec" }, + { "G4", "-mppc -maltivec" }, + { "801", "-mppc" }, + { "821", "-mppc" }, + { "823", "-mppc" }, + { "860", "-mppc" }, + { "970", "-mpower4 -maltivec" }, + { "G5", "-mpower4 -maltivec" }, + { "8540", "-me500" }, + { "8548", "-me500" }, + { "e300c2", "-me300" }, + { "e300c3", "-me300" }, + { "e500mc", "-me500mc" }, + { NULL, "\ +%{mpower: %{!mpower2: -mpwr}} \ +%{mpower2: -mpwrx} \ +%{mpowerpc64*: -mppc64} \ +%{!mpowerpc64*: %{mpowerpc*: -mppc}} \ +%{mno-power: %{!mpowerpc*: -mcom}} \ +%{!mno-power: %{!mpower*: %(asm_default)}}" }, +#endif +}; + /* This will be called by the spec parser in gcc.c when it sees a %:local_cpu_detect(args) construct. Currently it will be called with either "arch" or "tune" as argument depending on if -march=native or -mtune=native is to be substituted. + Additionally it will be called with "asm" to select the appropriate flags + for the assembler. + It returns a string containing new command line parameters to be put at the place of the above two options, depending on what CPU this is executed. @@ -361,29 +465,35 @@ const char const char *cache = ""; const char *options = ""; bool arch; + bool assembler; + size_t i; if (argc < 1) return NULL; arch = strcmp (argv[0], "cpu") == 0; - if (!arch && strcmp (argv[0], "tune")) + assembler = (!arch && strcmp (argv[0], "asm") == 0); + if (!arch && !assembler && strcmp (argv[0], "tune")) return NULL; + if (! assembler) + { #if defined (_AIX) - cache = detect_caches_aix (); + cache = detect_caches_aix (); #elif defined (__APPLE__) - cache = detect_caches_darwin (); + cache = detect_caches_darwin (); #elif defined (__FreeBSD__) - cache = detect_caches_freebsd (); - /* FreeBSD PPC does not provide any cache information yet. */ - cache = ""; + cache = detect_caches_freebsd (); + /* FreeBSD PPC does not provide any cache information yet. */ + cache = ""; #elif defined (__linux__) - cache = detect_caches_linux (); - /* PPC Linux does not provide any cache information yet. */ - cache = ""; + cache = detect_caches_linux (); + /* PPC Linux does not provide any cache information yet. */ + cache = ""; #else - cache = ""; + cache = ""; #endif + } #if defined (_AIX) cpu = detect_processor_aix (); @@ -397,6 +507,17 @@ const char cpu = "powerpc"; #endif + if (assembler) + { + for (i = 0; i < sizeof (asm_names) / sizeof (asm_names[0]); i++) + { + if (!asm_names[i].cpu || !strcmp (asm_names[i].cpu, cpu)) + return asm_names[i].asm_sw; + } + + return NULL; + } + return concat (cache, "-m", argv[0], "=", cpu, " ", options, NULL); } --- gcc/config/rs6000/sysv4.h (.../trunk) (revision 144557) +++ gcc/config/rs6000/sysv4.h (.../branches/ibm/power7-meissner) (revision 144692) @@ -119,9 +119,9 @@ do { \ else if (!strcmp (rs6000_abi_name, "i960-old")) \ { \ rs6000_current_abi = ABI_V4; \ - target_flags |= (MASK_LITTLE_ENDIAN | MASK_EABI \ - | MASK_NO_BITFIELD_WORD); \ + target_flags |= (MASK_LITTLE_ENDIAN | MASK_EABI); \ target_flags &= ~MASK_STRICT_ALIGN; \ + TARGET_NO_BITFIELD_WORD = 1; \ } \ else \ { \ --- power7.patch DELETED --- From jakub at fedoraproject.org Sat Mar 7 09:38:29 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Sat, 7 Mar 2009 09:38:29 +0000 (UTC) Subject: rpms/gcc/devel gcc.spec,1.27,1.28 Message-ID: <20090307093829.70E0770116@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/gcc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29941 Modified Files: gcc.spec Log Message: 4.4.0-0.23 Index: gcc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gcc.spec 7 Mar 2009 09:16:22 -0000 1.27 +++ gcc.spec 7 Mar 2009 09:37:59 -0000 1.28 @@ -434,7 +434,7 @@ %patch22 -p0 -b .raw-string~ %patch24 -p0 -b .atom~ %patch25 -p0 -b .pr39226~ -%patch26 -p0 -b .power7~ +#%patch26 -p0 -b .power7~ # This testcase doesn't compile. rm libjava/testsuite/libjava.lang/PR35020* @@ -1779,7 +1779,6 @@ - fix DW_AT_decl_line on DW_TAG_imported* (#488771, PR debug/39387) - fix SCCVN with SSA names occurring in abnormal PHIs (#488061, PR tree-optimization/39362) -- preliminary Power7 support * Wed Mar 4 2009 Jakub Jelinek 4.4.0-0.22 - update from trunk From pghmcfc at fedoraproject.org Sat Mar 7 09:38:52 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Sat, 7 Mar 2009 09:38:52 +0000 (UTC) Subject: rpms/perl-Digest-MD2/devel perl-Digest-MD2.spec,1.9,1.10 Message-ID: <20090307093852.9C27D70116@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-Digest-MD2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30017 Modified Files: perl-Digest-MD2.spec Log Message: - Filter out unwanted provides for perl shared objects - Recode docs as UTF-8 Index: perl-Digest-MD2.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Digest-MD2/devel/perl-Digest-MD2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Digest-MD2.spec 26 Feb 2009 15:22:38 -0000 1.9 +++ perl-Digest-MD2.spec 7 Mar 2009 09:38:22 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Perl interface to the MD2 Algorithm Name: perl-Digest-MD2 Version: 2.03 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Digest-MD2/ @@ -10,6 +10,12 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(ExtUtils::MakeMaker) +# don't "provide" private Perl libs +%global _use_internal_dependency_generator 0 +%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u +%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}" +%global __find_requires /bin/sh -c "%{__deploop R}" + %description The Digest::MD2 module allows you to use the RSA Data Security Inc. MD2 Message Digest algorithm from within Perl programs. The algorithm takes as input a @@ -22,6 +28,10 @@ %prep %setup -q -n Digest-MD2-%{version} +# Convert docs to UTF-8 encoding +/usr/bin/iconv -f iso-8859-1 -t utf-8 < Changes > Changes.utf8 +%{__mv} -f Changes.utf8 Changes + %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" %{__make} %{?_smp_mflags} @@ -48,6 +58,10 @@ %{_mandir}/man3/Digest::MD2.3pm* %changelog +* Sat Mar 7 2009 Paul Howarth - 2.03-9 +- Filter out unwanted provides for perl shared objects +- Recode docs as UTF-8 + * Thu Feb 26 2009 Fedora Release Engineering - 2.03-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pmatilai at fedoraproject.org Sat Mar 7 10:05:49 2009 From: pmatilai at fedoraproject.org (Panu Matilainen) Date: Sat, 7 Mar 2009 10:05:49 +0000 (UTC) Subject: rpms/synaptic/F-10 synaptic-0.57.2-nss-hack.patch, NONE, 1.1 synaptic.spec, 1.35, 1.36 Message-ID: <20090307100549.69FC570116@cvs1.fedora.phx.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/synaptic/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2239 Modified Files: synaptic.spec Added Files: synaptic-0.57.2-nss-hack.patch Log Message: - shutdown rpm crypto after fork to force proper reinitialization (#449168) synaptic-0.57.2-nss-hack.patch: --- NEW FILE synaptic-0.57.2-nss-hack.patch --- diff -up synaptic-0.57.2/common/rinstallprogress.cc.nss-hack synaptic-0.57.2/common/rinstallprogress.cc --- synaptic-0.57.2/common/rinstallprogress.cc.nss-hack 2009-02-28 11:35:14.000000000 +0200 +++ synaptic-0.57.2/common/rinstallprogress.cc 2009-02-28 11:36:29.000000000 +0200 @@ -33,6 +33,7 @@ #include #ifdef HAVE_RPM #include +#include #endif #include "rinstallprogress.h" @@ -99,6 +100,7 @@ pkgPackageManager::OrderResult RInstallP close(fd[0]); close(fd[1]); + rpmFreeCrypto(); res = pm->DoInstallPostFork(); // dump errors into cerr (pass it to the parent process) _error->DumpErrors(); Index: synaptic.spec =================================================================== RCS file: /cvs/pkgs/rpms/synaptic/F-10/synaptic.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- synaptic.spec 2 Aug 2008 00:47:59 -0000 1.35 +++ synaptic.spec 7 Mar 2009 10:05:18 -0000 1.36 @@ -3,7 +3,7 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ Group: Applications/System @@ -17,6 +17,7 @@ Patch4: http://apt-rpm.org/patches/synaptic-0.57.2-showprog.patch Patch5: http://apt-rpm.org/patches/synaptic-0.57.2-progressapi-hack.patch Patch6: synaptic-0.57.2-gcc43.patch +Patch7: synaptic-0.57.2-nss-hack.patch URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: usermode-gtk @@ -42,6 +43,7 @@ %patch4 -p1 -b .showprog %patch5 -p1 -b .progresshack %patch6 -p1 -b .gcc43 +%patch7 -p1 -b .nss-hack %build %configure --disable-dependency-tracking @@ -114,6 +116,9 @@ %{_mandir}/man8/%{name}.8* %changelog +* Sat Mar 07 2009 Panu Matilainen - 0.57.2-18 +- shutdown rpm crypto after fork to force proper reinitialization (#449168) + * Fri Aug 01 2008 Alex Lancaster - 0.57.2-17 - Rebuild for new RPM 4.6 (fixes broken deps). From pmatilai at fedoraproject.org Sat Mar 7 10:12:10 2009 From: pmatilai at fedoraproject.org (Panu Matilainen) Date: Sat, 7 Mar 2009 10:12:10 +0000 (UTC) Subject: rpms/synaptic/F-9 synaptic-0.57.2-nss-hack.patch, NONE, 1.1 synaptic.spec, 1.34, 1.35 Message-ID: <20090307101210.3FCCE70116@cvs1.fedora.phx.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/synaptic/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3543 Modified Files: synaptic.spec Added Files: synaptic-0.57.2-nss-hack.patch Log Message: - shutdown rpm crypto after fork to force proper reinitialization (#449168) synaptic-0.57.2-nss-hack.patch: --- NEW FILE synaptic-0.57.2-nss-hack.patch --- diff -up synaptic-0.57.2/common/rinstallprogress.cc.nss-hack synaptic-0.57.2/common/rinstallprogress.cc --- synaptic-0.57.2/common/rinstallprogress.cc.nss-hack 2009-02-28 11:35:14.000000000 +0200 +++ synaptic-0.57.2/common/rinstallprogress.cc 2009-02-28 11:36:29.000000000 +0200 @@ -33,6 +33,7 @@ #include #ifdef HAVE_RPM #include +#include #endif #include "rinstallprogress.h" @@ -99,6 +100,7 @@ pkgPackageManager::OrderResult RInstallP close(fd[0]); close(fd[1]); + rpmFreeCrypto(); res = pm->DoInstallPostFork(); // dump errors into cerr (pass it to the parent process) _error->DumpErrors(); Index: synaptic.spec =================================================================== RCS file: /cvs/pkgs/rpms/synaptic/F-9/synaptic.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- synaptic.spec 18 Feb 2008 19:42:11 -0000 1.34 +++ synaptic.spec 7 Mar 2009 10:11:39 -0000 1.35 @@ -3,7 +3,7 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ Group: Applications/System @@ -17,6 +17,7 @@ Patch4: http://apt-rpm.org/patches/synaptic-0.57.2-showprog.patch Patch5: http://apt-rpm.org/patches/synaptic-0.57.2-progressapi-hack.patch Patch6: synaptic-0.57.2-gcc43.patch +Patch7: synaptic-0.57.2-nss-hack.patch URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: usermode-gtk @@ -42,6 +43,7 @@ %patch4 -p1 -b .showprog %patch5 -p1 -b .progresshack %patch6 -p1 -b .gcc43 +%patch7 -p1 -b .nss-hack %build %configure --disable-dependency-tracking @@ -114,6 +116,9 @@ %{_mandir}/man8/%{name}.8* %changelog +* Sat Mar 07 2009 Panu Matilainen - 0.57.2-17 +- shutdown rpm crypto after fork to force proper reinitialization (#449168) + * Mon Feb 18 2008 Fedora Release Engineering - 0.57.2-16 - Autorebuild for GCC 4.3 From chitlesh at fedoraproject.org Sat Mar 7 10:18:29 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Sat, 7 Mar 2009 10:18:29 +0000 (UTC) Subject: rpms/gwave/F-10 gwave.spec,1.9,1.10 Message-ID: <20090307101829.071B870116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/gwave/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4837 Modified Files: gwave.spec Log Message: #482934 Index: gwave.spec =================================================================== RCS file: /cvs/pkgs/rpms/gwave/F-10/gwave.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gwave.spec 5 Nov 2008 20:18:11 -0000 1.9 +++ gwave.spec 7 Mar 2009 10:17:58 -0000 1.10 @@ -1,8 +1,8 @@ -%define snap_date 20070514 +%define snap_date 20090124 Name: gwave Version: 2 -Release: 11.%{snap_date}snap%{?dist} +Release: 15.%{snap_date}snap%{?dist} Summary: GPLed Analog Waveform Viewing Environment License: GPLv2+ @@ -15,7 +15,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel guile-devel readline-devel desktop-file-utils -BuildRequires: g-wrap-devel guile-gnome-platform-devel +BuildRequires: g-wrap-devel +BuildRequires: guile-gnome-platform-devel >= 2.16.1 %if %{fedora} < 9 BuildRequires: libtermcap-devel @@ -47,14 +48,6 @@ %setup -q -n %{name}2-%{snap_date} -#fixing wrong-script-interpreter -sed -i "s|/usr/local/bin|%{_bindir}|" examples/*gw -sed -i "s|/tmp/gwtest/bin|%{_bindir}|" examples/*gw -sed -i "s|/home/sgt/proj/gwave|%{_docdir}/%{name}-2|" examples/{aoi.W.tr0.gw,gwave.gw} -sed -i "s|/home/tell/proj/gwave|%{_docdir}/%{name}-2|" examples/pd2.N.gw -sed -i "s|../examples|%{_docdir}/%{name}-2/examples|" examples/gw - - %build %configure CFLAGS="$CFLAGS -fgnu89-inline" @@ -100,6 +93,18 @@ %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 2-15.20090124snap +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 09 2009 Xavier Lamien - 2-14.20090124snap +- Update snapshot. + +* Wed Dec 31 2008 Lubomir Rintel - 2-13.20080626snap +- New upstream snapshot + +* Sun Dec 28 2008 Chitlesh Goorah - 2-12.20070514snap +- rebuild for rawhide + * Wed Nov 05 2008 Chitlesh Goorah - 2-11.20070514snap - Fixed crash by adding guile-gnome-platform-devel as Requires, upstream will be notified. From chitlesh at fedoraproject.org Sat Mar 7 10:24:25 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Sat, 7 Mar 2009 10:24:25 +0000 (UTC) Subject: rpms/gwave/F-10 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090307102425.50C3970116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/gwave/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6231/F-10 Modified Files: .cvsignore sources Added Files: import.log Log Message: rebuild for F-10 --- NEW FILE import.log --- gwave-2-15_20090124snap_fc11:F-10:gwave-2-15.20090124snap.fc11.src.rpm:1236421322 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gwave/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Dec 2007 22:26:23 -0000 1.2 +++ .cvsignore 7 Mar 2009 10:23:54 -0000 1.3 @@ -1 +1 @@ -gwave2-20070514.tar.gz +gwave2-20090124.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gwave/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Dec 2007 22:26:23 -0000 1.2 +++ sources 7 Mar 2009 10:23:54 -0000 1.3 @@ -1 +1 @@ -766c8861e23d6401f03b7b31f900e8ed gwave2-20070514.tar.gz +ffb2e85aa95a196c80aeb401f38dd601 gwave2-20090124.tar.gz From chitlesh at fedoraproject.org Sat Mar 7 10:30:38 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Sat, 7 Mar 2009 10:30:38 +0000 (UTC) Subject: rpms/gerbv/devel gerbv.spec,1.8,1.9 Message-ID: <20090307103038.4513970116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/gerbv/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7593 Modified Files: gerbv.spec Log Message: RHBZ#485585 Index: gerbv.spec =================================================================== RCS file: /cvs/pkgs/rpms/gerbv/devel/gerbv.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gerbv.spec 24 Feb 2009 20:41:06 -0000 1.8 +++ gerbv.spec 7 Mar 2009 10:30:07 -0000 1.9 @@ -1,6 +1,6 @@ Name: gerbv Version: 2.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Gerber file viewer from the gEDA toolkit Group: Applications/Engineering @@ -15,6 +15,7 @@ Requires(postun): /sbin/ldconfig Requires(post): /sbin/ldconfig +Requires: electronics-menu %description Gerber Viewer (gerbv) is a viewer for Gerber files. Gerber files @@ -139,6 +140,9 @@ %Changelog +* Thu Nov 13 2008 Chitlesh Goorah - 2.2.0-3 +- added requires electronics-menu #485585 + * Thu Jan 22 2009 Chitlesh Goorah - 2.2.0-1 - new upstream release From chitlesh at fedoraproject.org Sat Mar 7 10:33:08 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Sat, 7 Mar 2009 10:33:08 +0000 (UTC) Subject: rpms/gerbv/devel gerbv.spec,1.9,1.10 Message-ID: <20090307103308.716C770116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/gerbv/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8099 Modified Files: gerbv.spec Log Message: RHBZ#485585 Index: gerbv.spec =================================================================== RCS file: /cvs/pkgs/rpms/gerbv/devel/gerbv.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gerbv.spec 7 Mar 2009 10:30:07 -0000 1.9 +++ gerbv.spec 7 Mar 2009 10:32:38 -0000 1.10 @@ -140,7 +140,7 @@ %Changelog -* Thu Nov 13 2008 Chitlesh Goorah - 2.2.0-3 +* Sat Mar 07 2009 Chitlesh Goorah - 2.2.0-3 - added requires electronics-menu #485585 * Thu Jan 22 2009 Chitlesh Goorah - 2.2.0-1 From vpv at fedoraproject.org Sat Mar 7 10:44:31 2009 From: vpv at fedoraproject.org (Ville-Pekka Vainio) Date: Sat, 7 Mar 2009 10:44:31 +0000 (UTC) Subject: rpms/mozvoikko/F-9 mozvoikko.spec,1.8,1.9 Message-ID: <20090307104431.5104D70116@cvs1.fedora.phx.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/mozvoikko/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10338 Modified Files: mozvoikko.spec Log Message: Remove the gecko_ver version from an old changelog entry, it's quite useless and seems to cause confusion when doing rebuilds for new xulrunner versions Index: mozvoikko.spec =================================================================== RCS file: /cvs/pkgs/rpms/mozvoikko/F-9/mozvoikko.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mozvoikko.spec 6 Mar 2009 10:54:36 -0000 1.8 +++ mozvoikko.spec 7 Mar 2009 10:44:00 -0000 1.9 @@ -87,7 +87,7 @@ * Sat Aug 30 2008 Ville-Pekka Vainio - 0.9.5-2 - Fix the xulrunner requires: - - Add define gecko_ver 1.9.0.1 + - Add define gecko_ver - Add Requires: gecko-libs = gecko_ver - Add BuildRequires: gecko-devel-unstable = gecko_ver - Remove all actual xulrunner requires From vpv at fedoraproject.org Sat Mar 7 10:46:00 2009 From: vpv at fedoraproject.org (Ville-Pekka Vainio) Date: Sat, 7 Mar 2009 10:46:00 +0000 (UTC) Subject: rpms/mozvoikko/F-10 mozvoikko.spec,1.7,1.8 Message-ID: <20090307104600.85A9F70116@cvs1.fedora.phx.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/mozvoikko/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10690 Modified Files: mozvoikko.spec Log Message: Remove the gecko_ver version from an old changelog entry, it's quite useless and seems to cause confusion when doing rebuilds for new xulrunner versions Index: mozvoikko.spec =================================================================== RCS file: /cvs/pkgs/rpms/mozvoikko/F-10/mozvoikko.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mozvoikko.spec 6 Mar 2009 08:51:30 -0000 1.7 +++ mozvoikko.spec 7 Mar 2009 10:45:30 -0000 1.8 @@ -87,7 +87,7 @@ * Sat Aug 30 2008 Ville-Pekka Vainio - 0.9.5-2 - Fix the xulrunner requires: - - Add define gecko_ver 1.9.0.1 + - Add define gecko_ver - Add Requires: gecko-libs = gecko_ver - Add BuildRequires: gecko-devel-unstable = gecko_ver - Remove all actual xulrunner requires From chitlesh at fedoraproject.org Sat Mar 7 10:49:27 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Sat, 7 Mar 2009 10:49:27 +0000 (UTC) Subject: rpms/geda-gschem/devel geda-gschem.spec,1.18,1.19 Message-ID: <20090307104927.A5A6470116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/geda-gschem/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11292 Modified Files: geda-gschem.spec Log Message: RHBZ#485585 Index: geda-gschem.spec =================================================================== RCS file: /cvs/pkgs/rpms/geda-gschem/devel/geda-gschem.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- geda-gschem.spec 24 Feb 2009 20:19:13 -0000 1.18 +++ geda-gschem.spec 7 Mar 2009 10:48:57 -0000 1.19 @@ -2,7 +2,7 @@ Name: geda-gschem Version: 20081231 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Electronics schematics editor Group: Applications/Engineering @@ -16,7 +16,7 @@ BuildRequires: libgeda-devel, desktop-file-utils, autoconf, libstroke-devel BuildRequires: gettext-devel, gawk, intltool Requires: geda-symbols - +Requires: electronics-menu %description Gschem is an electronics schematic editor. It is part of the gEDA project. @@ -119,6 +119,9 @@ %{_datadir}/icons/hicolor/*/apps/geda-gschem.* %Changelog +* Sat Mar 07 2009 Chitlesh Goorah - 20081231-3 +- added requires electronics-menu #485585 + * Sun Jan 11 2009 Chitlesh Goorah - 20081231-1 - new upstream release From chitlesh at fedoraproject.org Sat Mar 7 10:50:47 2009 From: chitlesh at fedoraproject.org (Chitlesh GOORAH) Date: Sat, 7 Mar 2009 10:50:47 +0000 (UTC) Subject: rpms/geda-gattrib/devel geda-gattrib.spec,1.18,1.19 Message-ID: <20090307105047.8A8BF70116@cvs1.fedora.phx.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/geda-gattrib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11565 Modified Files: geda-gattrib.spec Log Message: RHBZ#485585 Index: geda-gattrib.spec =================================================================== RCS file: /cvs/pkgs/rpms/geda-gattrib/devel/geda-gattrib.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- geda-gattrib.spec 24 Feb 2009 20:17:20 -0000 1.18 +++ geda-gattrib.spec 7 Mar 2009 10:50:17 -0000 1.19 @@ -2,7 +2,7 @@ Name: geda-gattrib Version: 20081231 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Attribute editor for gEDA Group: Applications/Engineering @@ -15,6 +15,7 @@ BuildRequires: libgeda-devel, desktop-file-utils, gettext-devel, gawk, intltool Requires: geda-symbols +Requires: electronics-menu %description Gattrib is gEDA's attribute editor. It reads a set of gschem .sch files @@ -80,6 +81,9 @@ %Changelog +* Sat Mar 07 2009 Chitlesh Goorah - 20081231-3 +- added requires electronics-menu #485585 + * Sun Jan 11 2009 Chitlesh Goorah - 20081231-1 - new upstream release From ensc at fedoraproject.org Sat Mar 7 11:27:40 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sat, 7 Mar 2009 11:27:40 +0000 (UTC) Subject: rpms/hunt/devel hunt.spec,1.14,1.15 Message-ID: <20090307112741.2D82870116@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/hunt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19154 Modified Files: hunt.spec Log Message: updated Index: hunt.spec =================================================================== RCS file: /cvs/extras/rpms/hunt/devel/hunt.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- hunt.spec 1 Mar 2009 16:28:43 -0000 1.14 +++ hunt.spec 7 Mar 2009 11:27:08 -0000 1.15 @@ -74,6 +74,7 @@ %changelog * Sun Mar 1 2009 Enrico Scholz - 1.5-10 - do not build the static binary +- fixed some int <-> void * cast issues * Tue Feb 24 2009 Fedora Release Engineering - 1.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ensc at fedoraproject.org Sat Mar 7 12:03:12 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sat, 7 Mar 2009 12:03:12 +0000 (UTC) Subject: rpms/libextractor/devel .cvsignore, 1.5, 1.6 lastver, 1.3, 1.4 libextractor.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <20090307120312.18E4670116@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/libextractor/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28986 Modified Files: .cvsignore lastver libextractor.spec sources Log Message: updated Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libextractor/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 21 Jun 2008 18:30:14 -0000 1.5 +++ .cvsignore 7 Mar 2009 12:02:38 -0000 1.6 @@ -1 +1 @@ -libextractor-0.5.20b.tar.gz +libextractor-0.5.22.tar.gz Index: lastver =================================================================== RCS file: /cvs/extras/rpms/libextractor/devel/lastver,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lastver 21 Jun 2008 18:30:14 -0000 1.3 +++ lastver 7 Mar 2009 12:02:38 -0000 1.4 @@ -1 +1 @@ -0.5.20b +0.5.22 Index: libextractor.spec =================================================================== RCS file: /cvs/extras/rpms/libextractor/devel/libextractor.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libextractor.spec 25 Feb 2009 14:40:01 -0000 1.11 +++ libextractor.spec 7 Mar 2009 12:02:38 -0000 1.12 @@ -5,8 +5,8 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: libextractor -Version: 0.5.20b -Release: %release_func 3 +Version: 0.5.22 +Release: %release_func 1 Summary: Simple library for keyword extraction Group: System Environment/Libraries @@ -34,6 +34,7 @@ %package plugins Summary: Plugins for libextractor Group: System Environment/Libraries +BuildArch: noarch Requires: %name = %version-%release Requires: %name-plugins-base Requires: %name-plugins-exiv2 @@ -43,6 +44,7 @@ Requires: %name-plugins-flac Requires: %name-plugins-thumbnailgtk Requires: %name-plugins-thumbnailqt +#Requires: %name-plugins-rpm %global pluginpkg(B:R:P:u) \ @@ -79,6 +81,7 @@ %pluginpkg ogg %pluginpkg ole2 %pluginpkg pdf +#pluginpkg rpm -B rpm-devel %pluginpkg thumbnailgtk -u -P plugin(%name)=thumbnail %ghost %plugindir/libextractor-thumbnail.so @@ -128,12 +131,15 @@ install -pm644 %SOURCE10 . rm -f README.debian +sed -i 's!\(-L\(/usr\|\$with_qt\)/lib\|-I/usr/include\) !!g' configure %build %{!?with_mpeg:export ac_cv_lib_mpeg2_mpeg2_init=no} +export ac_cv_lib_rpm_rpmReadPackageFile=no + %configure --disable-static \ --disable-rpath \ - --enable-xpdf \ + --disable-xpdf \ --with-qt=/usr # build with --as-needed and disable rpath @@ -165,7 +171,8 @@ lib=${lib%%.so*} case $lib in (libz|libdl) ;; - (libextractor|libc|libm|libpthread) ;; + (libextractor|libextractor_common) ;; + (libc|libm|libpthread) ;; (*) target=other echo "$fname -> $lib" @@ -185,7 +192,6 @@ mv $RPM_BUILD_ROOT%_bindir/{,libextractor-}extract mv $RPM_BUILD_ROOT%_mandir/man1/{,libextractor-}extract.1 - %find_lang libextractor @@ -242,9 +248,18 @@ %changelog +* Sat Mar 7 2009 Enrico Scholz - 0.5.22-1 +- updated to 0.5.22 +- disabled rpm plugin for now as it does not build with rpm-4.6 +- disabled builtin xpdf plugin + * Wed Feb 25 2009 Fedora Release Engineering - 0.5.20b-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Wed Nov 26 2008 Enrico Scholz - 0.5.21-1 +- updated to 0.5.21 +- added -rpm plugin + * Wed Jul 16 2008 Tom "spot" Callaway - 0.5.20b-2 - fix license tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/libextractor/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 Jun 2008 18:30:14 -0000 1.7 +++ sources 7 Mar 2009 12:02:38 -0000 1.8 @@ -1 +1 @@ -118ef97ed6eb64f4f5151d598e57f3ce libextractor-0.5.20b.tar.gz +f6d6ea1264a471189eee99728b983c4e libextractor-0.5.22.tar.gz From ensc at fedoraproject.org Sat Mar 7 12:22:31 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sat, 7 Mar 2009 12:22:31 +0000 (UTC) Subject: rpms/milter-greylist/devel milter-greylist.upstart, NONE, 1.1 ai_addrconfig.patch, 1.1, 1.2 milter-greylist.spec, 1.28, 1.29 Message-ID: <20090307122231.B469B70116@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/milter-greylist/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv521 Modified Files: ai_addrconfig.patch milter-greylist.spec Added Files: milter-greylist.upstart Log Message: updated --- NEW FILE milter-greylist.upstart --- ### Uncomment matching 'start' lines below. ### Uncomment these two lines when you want milter-greylist to be a ### milter for a remote machine. ### 'starting\ local' and 'starting local' should be uncommented ### together as former is required due to broken Fedora initscripts ### and later is the correct one #start on starting\ local #start on starting local ### Uncomment this line when you run want milter-greylist to be a ### milter for sendmail on the current machine #start on starting sendmail ### Uncomment this line when you run want milter-greylist to be a ### milter for postfix on the current machine #start on starting postfix stop on runlevel 0 stop on runlevel 1 stop on runlevel 6 respawn exec /usr/sbin/milter-greylist -D ai_addrconfig.patch: Index: ai_addrconfig.patch =================================================================== RCS file: /cvs/extras/rpms/milter-greylist/devel/ai_addrconfig.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ai_addrconfig.patch 14 Feb 2009 18:28:43 -0000 1.1 +++ ai_addrconfig.patch 7 Mar 2009 12:22:30 -0000 1.2 @@ -1,5 +1,9 @@ ISC libbind provides AI_ADDRCONFIG macro, but getaddrinfo() fails with -EAI_BADFLAGS when invoked with it. +EAI_BADFLAGS when invoked with it. This patch retries getaddrinfo() +without AI_ADDRCONFIG flag in this case. + +It is very simple and a ./configure test for working AI_ADDRCONFIG +might be better. Index: milter-greylist-4.2b1/spamd.c =================================================================== Index: milter-greylist.spec =================================================================== RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- milter-greylist.spec 26 Feb 2009 00:45:24 -0000 1.28 +++ milter-greylist.spec 7 Mar 2009 12:22:30 -0000 1.29 @@ -19,7 +19,7 @@ Summary: Milter for greylisting, the next step in the spam control war Name: milter-greylist Version: 4.2 -Release: %release_func 0.3.%{?beta} +Release: %release_func 0.4.%{?beta} License: BSD with advertising Group: System Environment/Daemons URL: http://hcpnet.free.fr/milter-greylist/ @@ -41,17 +41,31 @@ BuildRequires: curl-devel GeoIP-devel %{?FE_USERADD_REQ} -%package sysv +%package sysvinit Summary: Sysv initscripts for %name Group: System Environment/Daemons -Provides: init(%name) = sysv +Provides: init(%name) = sysvinit Requires(preun): %name = %version-%release Requires(postun): %name = %version-%release Requires(preun): initscripts Requires(postun): initscripts Requires(post): %__chkconfig Requires(preun): %__chkconfig - +Provides: %name-sysv = %version-%release +Obsoletes: %name-sysv < %version-%release +BuildArch: noarch + +%package upstart +Summary: upstart initscripts for %name +Group: System Environment/Daemons +Source10: %name.upstart +Provides: init(%name) = upstart +Requires: %name = %version-%release +# implicates a conflict with upstart 0.5+ +Requires(pre): /etc/event.d +Requires(post): /usr/bin/killall +Requires(postun): /sbin/initctl +BuildArch: noarch %description Greylisting is a new method of blocking significant amounts of spam at @@ -63,7 +77,7 @@ This package provides a greylist filter for sendmail's milter API. -%description sysv +%description sysvinit Greylisting is a new method of blocking significant amounts of spam at the mailserver level, but without resorting to heavyweight statistical analysis or other heuristical (and error-prone) approaches. Consequently, @@ -73,6 +87,16 @@ This package provides the SysV initscripts for the %name package. +%description upstart +Greylisting is a new method of blocking significant amounts of spam at +the mailserver level, but without resorting to heavyweight statistical +analysis or other heuristical (and error-prone) approaches. Consequently, +implementations are fairly lightweight, and may even decrease network +traffic and processor load on your mailserver. + +This package provides the upstart initscripts for the %name package. + + %prep %setup -q %{?beta:-n %name-%version%beta} %patch0 -p1 -b .sysv @@ -124,6 +148,7 @@ %__install -d -m755 $RPM_BUILD_ROOT{%_initrddir,%rundir,%dbdir,%_var/run} %__make DESTDIR=$RPM_BUILD_ROOT install %makeflags USER="$(id -u)" %__install -p -m755 rc-redhat.sh $RPM_BUILD_ROOT%_initrddir/%name +%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/event.d/milter-greylist # create temporary files touch $RPM_BUILD_ROOT%rundir/milter-greylist.sock @@ -145,17 +170,24 @@ -%post sysv +%post sysvinit %__chkconfig --add %name -%preun sysv +%preun sysvinit test "$1" != 0 || %__chkconfig --del %name test "$1" != 0 || %_initrddir/%name stop >/dev/null || : -%postun sysv +%postun sysvinit test "$1" = 0 || %_initrddir/%name condrestart >/dev/null || : +%post upstart +/usr/bin/killall -u %username milter-greylist 2>/dev/null || : + +%preun upstart +test "$1" != "0" || /sbin/initctl -q stop milter-greylist || : + + %clean rm -rf $RPM_BUILD_ROOT @@ -172,13 +204,24 @@ %ghost %rundir/milter-greylist.sock %ghost %_var/run/milter-greylist.pid + %if 0%{!?_without_sysv:1} -%files sysv +%files sysvinit %defattr(-,root,root,-) %config %_initrddir/* %endif + +%files upstart +%defattr(-,root,root,-) +%config(noreplace) /etc/event.d/* + + %changelog +* Sat Mar 7 2009 Enrico Scholz - 4.2-0.4.b1 +- added -upstart subpackage +- renamed -sysv to -sysvinit to let -upstart win the default depresolving + * Wed Feb 25 2009 Fedora Release Engineering - 4.2-0.3.b1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ensc at fedoraproject.org Sat Mar 7 12:32:53 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sat, 7 Mar 2009 12:32:53 +0000 (UTC) Subject: rpms/mimetic/devel .cvsignore, 1.3, 1.4 lastver, 1.1, 1.2 mimetic.spec, 1.15, 1.16 sources, 1.6, 1.7 mimetic-0.9.3-gcc43.patch, 1.1, NONE Message-ID: <20090307123253.694C370116@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/mimetic/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2589 Modified Files: .cvsignore lastver mimetic.spec sources Removed Files: mimetic-0.9.3-gcc43.patch Log Message: updated Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Mar 2006 16:48:28 -0000 1.3 +++ .cvsignore 7 Mar 2009 12:32:22 -0000 1.4 @@ -1 +1 @@ -mimetic-*.tar.gz +mimetic-0.9.5.tar.gz Index: lastver =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/lastver,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lastver 1 Sep 2007 14:45:11 -0000 1.1 +++ lastver 7 Mar 2009 12:32:22 -0000 1.2 @@ -1 +1 @@ -0.9.3 +0.9.5 Index: mimetic.spec =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/mimetic.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mimetic.spec 26 Feb 2009 00:48:31 -0000 1.15 +++ mimetic.spec 7 Mar 2009 12:32:22 -0000 1.16 @@ -1,8 +1,8 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: mimetic -Version: 0.9.3 -Release: %release_func 6 +Version: 0.9.5 +Release: %release_func 0 Summary: A full featured MIME library written in C++ Group: System Environment/Libraries @@ -10,7 +10,6 @@ URL: http://codesink.org/mimetic_mime_library.html Source0: http://codesink.org/download/%name-%version.tar.gz Patch0: mimetic-0.9.2-noconfigh.patch -Patch1: mimetic-0.9.3-gcc43.patch BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: doxygen @@ -42,7 +41,6 @@ %prep %setup -q %patch0 -p1 -b .noconfigh -%patch1 -p1 %build @@ -86,6 +84,9 @@ %changelog +* Sat Mar 7 2009 Enrico Scholz - 0.9.5-0 +- updated to 0.9.5 + * Wed Feb 25 2009 Fedora Release Engineering - 0.9.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Jun 2007 18:44:41 -0000 1.6 +++ sources 7 Mar 2009 12:32:22 -0000 1.7 @@ -1 +1 @@ -4ae270d9108d07b1fa25be2e2e72a348 mimetic-0.9.3.tar.gz +eb5d437ca2f88db7e8ba6e7008180d81 mimetic-0.9.5.tar.gz --- mimetic-0.9.3-gcc43.patch DELETED --- From pkgdb at fedoraproject.org Sat Mar 7 12:35:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 12:35:15 +0000 Subject: [pkgdb] python-Traits was added for rakesh Message-ID: <20090307123536.955A7208543@bastion.fedora.phx.redhat.com> huzaifas has added Package python-Traits with summary Explicitly typed attributes for Python huzaifas has approved Package python-Traits huzaifas has added a Fedora devel branch for python-Traits with an owner of rakesh huzaifas has approved python-Traits in Fedora devel huzaifas has approved Package python-Traits huzaifas has set commit to Approved for provenpackager on python-Traits (Fedora devel) huzaifas has set build to Approved for provenpackager on python-Traits (Fedora devel) huzaifas has set checkout to Approved for provenpackager on python-Traits (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-Traits From pkgdb at fedoraproject.org Sat Mar 7 12:35:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 12:35:41 +0000 Subject: [pkgdb] python-Traits (Fedora, 10) updated by huzaifas Message-ID: <20090307123542.0BA0C208547@bastion.fedora.phx.redhat.com> huzaifas added a Fedora 10 branch for python-Traits huzaifas has set commit to Approved for provenpackager on python-Traits (Fedora 10) huzaifas has set build to Approved for provenpackager on python-Traits (Fedora 10) huzaifas has set checkout to Approved for provenpackager on python-Traits (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-Traits From pkgdb at fedoraproject.org Sat Mar 7 12:35:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 12:35:41 +0000 Subject: [pkgdb] python-Traits (Fedora, 9) updated by huzaifas Message-ID: <20090307123542.2D40220854A@bastion.fedora.phx.redhat.com> huzaifas added a Fedora 9 branch for python-Traits huzaifas has set commit to Approved for provenpackager on python-Traits (Fedora 9) huzaifas has set build to Approved for provenpackager on python-Traits (Fedora 9) huzaifas has set checkout to Approved for provenpackager on python-Traits (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-Traits From huzaifas at fedoraproject.org Sat Mar 7 12:36:05 2009 From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala) Date: Sat, 7 Mar 2009 12:36:05 +0000 (UTC) Subject: rpms/python-Traits - New directory Message-ID: <20090307123605.559DA70116@cvs1.fedora.phx.redhat.com> Author: huzaifas Update of /cvs/pkgs/rpms/python-Traits In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvshz3420/rpms/python-Traits Log Message: Directory /cvs/pkgs/rpms/python-Traits added to the repository From huzaifas at fedoraproject.org Sat Mar 7 12:36:05 2009 From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala) Date: Sat, 7 Mar 2009 12:36:05 +0000 (UTC) Subject: rpms/python-Traits/devel - New directory Message-ID: <20090307123605.9BE7B70119@cvs1.fedora.phx.redhat.com> Author: huzaifas Update of /cvs/pkgs/rpms/python-Traits/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvshz3420/rpms/python-Traits/devel Log Message: Directory /cvs/pkgs/rpms/python-Traits/devel added to the repository From huzaifas at fedoraproject.org Sat Mar 7 12:36:26 2009 From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala) Date: Sat, 7 Mar 2009 12:36:26 +0000 (UTC) Subject: rpms/python-Traits Makefile,NONE,1.1 Message-ID: <20090307123626.8756570116@cvs1.fedora.phx.redhat.com> Author: huzaifas Update of /cvs/pkgs/rpms/python-Traits In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvshz3420/rpms/python-Traits Added Files: Makefile Log Message: Setup of module python-Traits --- NEW FILE Makefile --- # Top level Makefile for module python-Traits all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From huzaifas at fedoraproject.org Sat Mar 7 12:36:26 2009 From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala) Date: Sat, 7 Mar 2009 12:36:26 +0000 (UTC) Subject: rpms/python-Traits/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307123626.E7F2E70116@cvs1.fedora.phx.redhat.com> Author: huzaifas Update of /cvs/pkgs/rpms/python-Traits/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvshz3420/rpms/python-Traits/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-Traits --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: python-Traits # $Id: Makefile,v 1.1 2009/03/07 12:36:26 huzaifas Exp $ NAME := python-Traits SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From ensc at fedoraproject.org Sat Mar 7 13:17:35 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sat, 7 Mar 2009 13:17:35 +0000 (UTC) Subject: rpms/tor/devel tor.upstart,NONE,1.1 tor.spec,1.29,1.30 Message-ID: <20090307131735.7A3CC70116@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/tor/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11437 Modified Files: tor.spec Added Files: tor.upstart Log Message: updated --- NEW FILE tor.upstart --- ### Uncomment matching 'start' lines below. ### 'starting\ local' and 'starting local' should be uncommented ### together as former is required due to broken Fedora initscripts ### and latter is the correct one #start on starting\ local #start on starting local stop on runlevel 0 stop on runlevel 1 stop on runlevel 6 respawn exec /usr/bin/tor Index: tor.spec =================================================================== RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- tor.spec 25 Feb 2009 21:21:43 -0000 1.29 +++ tor.spec 7 Mar 2009 13:17:05 -0000 1.30 @@ -11,7 +11,7 @@ Name: tor Version: 0.2.0.34 -Release: %release_func 2 +Release: %release_func 3 Group: System Environment/Daemons License: BSD Summary: Anonymizing overlay network for TCP (The onion router) @@ -50,13 +50,26 @@ Provides: init(%name) = lsb Requires: %name-core = %version-%release Source10: tor.lsb -#BuildArch: noarch +BuildArch: noarch Requires(pre): %name-core Requires(postun): lsb-core-noarch %name-core Requires(post): lsb-core-noarch Requires(preun): lsb-core-noarch +%package upstart +Summary: upstart initscripts for %name +Group: System Environment/Base +Source20: %name.upstart +Provides: init(%name) = upstart +Requires: %name = %version-%release +# implicates a conflict with upstart 0.5+ +Requires(pre): /etc/event.d +Requires(post): /usr/bin/killall +Requires(postun): /sbin/initctl +BuildArch: noarch + + %description Tor is a connection-based low-latency anonymous communication system. @@ -90,6 +103,13 @@ daemon. +%description upstart +Tor is a connection-based low-latency anonymous communication system. + +This package contains the upstart compliant initscripts to start the "tor" +daemon. + + %prep %setup -q %patch1 -p1 -b .geoippath @@ -125,6 +145,8 @@ install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor install -p -m0644 %SOURCE2 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor +install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/event.d/tor + ln -s %_datadir/tor/geoip $RPM_BUILD_ROOT%_var/lib/tor-data/geoip @@ -149,6 +171,13 @@ test "$1" = 0 || env -i %_initrddir/tor try-restart &>/dev/null +%post upstart +/usr/bin/killall -u %username tor 2>/dev/null || : + +%preun upstart +test "$1" != "0" || /sbin/initctl -q stop tor || : + + %clean rm -rf $RPM_BUILD_ROOT @@ -197,7 +226,16 @@ %attr(0755,%username,%username) %dir %_var/run/%name +%files upstart +%defattr(-,root,root,-) +%config(noreplace) /etc/event.d/* + + %changelog +* Sat Mar 7 2009 Enrico Scholz - 0.2.0.34-3 +- added -upstart subpackage (-lsb still wins by default as there exists + no end-user friendly solution for managing upstart initscripts) + * Wed Feb 25 2009 Fedora Release Engineering - 0.2.0.34-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From stingray at fedoraproject.org Sat Mar 7 13:24:05 2009 From: stingray at fedoraproject.org (Paul P Komkoff Jr) Date: Sat, 7 Mar 2009 13:24:05 +0000 (UTC) Subject: rpms/libnetfilter_queue/devel .cvsignore, 1.4, 1.5 libnetfilter_queue.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <20090307132405.5A72470116@cvs1.fedora.phx.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_queue/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12670 Modified Files: .cvsignore libnetfilter_queue.spec sources Log Message: libnetfilter_queue-0.0.17-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_queue/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jul 2008 21:15:30 -0000 1.4 +++ .cvsignore 7 Mar 2009 13:23:34 -0000 1.5 @@ -1 +1 @@ -libnetfilter_queue-0.0.16.tar.bz2 +libnetfilter_queue-0.0.17.tar.bz2 Index: libnetfilter_queue.spec =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_queue/devel/libnetfilter_queue.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libnetfilter_queue.spec 25 Feb 2009 16:36:39 -0000 1.9 +++ libnetfilter_queue.spec 7 Mar 2009 13:23:34 -0000 1.10 @@ -1,6 +1,8 @@ +%define libnfnetlink 0.0.41 + Name: libnetfilter_queue -Version: 0.0.16 -Release: 4%{?dist} +Version: 0.0.17 +Release: 1%{?dist} Summary: Netfilter queue userspace library Group: System Environment/Libraries # Most files say GPLv2+, one says v2 only. @@ -10,7 +12,7 @@ Patch0: libnetfilter_queue-sysheader.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libnfnetlink-devel >= 0.0.38, pkgconfig, kernel-headers +BuildRequires: libnfnetlink-devel >= %{libnfnetlink}, pkgconfig, kernel-headers BuildRequires: autoconf, automake, libtool %description @@ -24,7 +26,7 @@ Summary: Netfilter queue userspace library Group: Development/Libraries Requires: %{name} = %{version}-%{release}, pkgconfig -Requires: libnfnetlink-devel >= 0.0.38, kernel-headers +Requires: libnfnetlink-devel >= %{libnfnetlink}, kernel-headers %description devel libnetfilter_queue is a userspace library providing an API to packets that have @@ -68,6 +70,9 @@ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Mar 7 2009 Paul P. Komkoff Jr - 0.0.17-1 +- upstream update + * Wed Feb 25 2009 Fedora Release Engineering - 0.0.16-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_queue/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jul 2008 21:15:30 -0000 1.4 +++ sources 7 Mar 2009 13:23:35 -0000 1.5 @@ -1 +1 @@ -b36664e6cd39edbfe46b416a86118add libnetfilter_queue-0.0.16.tar.bz2 +2cde35e678ead3a8f9eb896bf807a159 libnetfilter_queue-0.0.17.tar.bz2 From mso at fedoraproject.org Sat Mar 7 13:31:28 2009 From: mso at fedoraproject.org (Martin Sourada) Date: Sat, 7 Mar 2009 13:31:28 +0000 (UTC) Subject: rpms/gtk-nodoka-engine/devel gtk-nodoka-engine-0.7.2-missing-widget-check.patch, NONE, 1.1 gtk-nodoka-engine.spec, 1.27, 1.28 Message-ID: <20090307133128.1210870116@cvs1.fedora.phx.redhat.com> Author: mso Update of /cvs/extras/rpms/gtk-nodoka-engine/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14073 Modified Files: gtk-nodoka-engine.spec Added Files: gtk-nodoka-engine-0.7.2-missing-widget-check.patch Log Message: Add missing check for widget when getting RTL info. gtk-nodoka-engine-0.7.2-missing-widget-check.patch: --- NEW FILE gtk-nodoka-engine-0.7.2-missing-widget-check.patch --- diff -up gtk-nodoka-engine-0.7.2/src/GTKEngine/nodoka_style.c.missing-widget-check gtk-nodoka-engine-0.7.2/src/GTKEngine/nodoka_style.c --- gtk-nodoka-engine-0.7.2/src/GTKEngine/nodoka_style.c.missing-widget-check 2009-03-07 14:24:50.000000000 +0100 +++ gtk-nodoka-engine-0.7.2/src/GTKEngine/nodoka_style.c 2009-03-07 14:28:37.000000000 +0100 @@ -94,7 +94,10 @@ nodoka_set_widget_parameters (const GtkW params->roundness = NODOKA_STYLE (style)->roundness; params->hilight_ratio = NODOKA_STYLE (style)->hilight_ratio; params->gradients = NODOKA_STYLE (style)->gradients; - params->ltr = !(nodoka_get_direction ((GtkWidget *) widget) == GTK_TEXT_DIR_RTL); + if (widget) + params->ltr = !(nodoka_get_direction ((GtkWidget *) widget) == GTK_TEXT_DIR_RTL); + else + params->ltr = TRUE; params->focus = widget && GTK_WIDGET_HAS_FOCUS (widget); params->is_default = widget && GTK_WIDGET_HAS_DEFAULT (widget); Index: gtk-nodoka-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gtk-nodoka-engine.spec 25 Feb 2009 01:48:14 -0000 1.27 +++ gtk-nodoka-engine.spec 7 Mar 2009 13:30:57 -0000 1.28 @@ -3,7 +3,7 @@ Name: gtk-nodoka-engine Version: 0.7.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Nodoka GTK Theme Engine Group: System Environment/Libraries @@ -12,6 +12,7 @@ Source0: https://fedorahosted.org/releases/n/o/gtk-nodoka-engine-%{version}.tar.gz Patch0: %{name}-scale-trough.patch Patch1: %{name}-handle-selection.patch +Patch2: %{name}-0.7.2-missing-widget-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel @@ -39,6 +40,7 @@ %setup -q %patch0 -p1 -b .scale-trough %patch1 -p1 -b .handle-selection +%patch2 -p1 -b .missing-widget-check %build %configure @@ -70,6 +72,9 @@ %changelog +* Sat Mar 07 2009 Maritn Sourada - 0.7.2-4 +- Add missing check for widget when getting RTL info + * Tue Feb 24 2009 Fedora Release Engineering - 0.7.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rjones at fedoraproject.org Sat Mar 7 13:50:41 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sat, 7 Mar 2009 13:50:41 +0000 (UTC) Subject: comps comps-f11.xml.in,1.146,1.147 Message-ID: <20090307135042.02D7D70116@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17903 Modified Files: comps-f11.xml.in Log Message: Added OCaml group. Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- comps-f11.xml.in 6 Mar 2009 18:01:37 -0000 1.146 +++ comps-f11.xml.in 7 Mar 2009 13:50:11 -0000 1.147 @@ -3930,6 +3930,43 @@ + ocaml + <_name>OCaml + <_description> + Support for developing software using the + Objective CAML programming language and libraries. + + false + true + + ocaml + ocaml-runtime + ocaml-x11 + ocaml-ocamldoc + ocaml-findlib-devel + ocaml-camlp4-devel + emacs-tuareg + ocaml-bitstring-devel + ocaml-calendar-devel + ocaml-camomile-devel + ocaml-csv-devel + ocaml-curl-devel + ocaml-curses-devel + ocaml-expat-devel + ocaml-extlib-devel + ocaml-lablgl-devel + ocaml-labltk-devel + ocaml-lablgtk-devel + ocaml-ocamlnet-devel + ocaml-pcre-devel + ocaml-pxp-devel + ocaml-ssl-devel + ocaml-xml-light-devel + ocaml-xmlrpc-light-devel + xemacs-tuareg + + + occitan-support <_name>Occitan Support <_description/> @@ -5613,6 +5650,7 @@ kde-software-development legacy-software-development mingw32 + ocaml ruby web-development x-software-development From rakesh at fedoraproject.org Sat Mar 7 14:13:39 2009 From: rakesh at fedoraproject.org (Rakesh Pandit) Date: Sat, 7 Mar 2009 14:13:39 +0000 (UTC) Subject: rpms/python-Traits/devel import.log, NONE, 1.1 python-Traits.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307141339.774DE70116@cvs1.fedora.phx.redhat.com> Author: rakesh Update of /cvs/pkgs/rpms/python-Traits/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22813/devel Modified Files: .cvsignore sources Added Files: import.log python-Traits.spec Log Message: Initial import. --- NEW FILE import.log --- python-Traits-3_0_2-2_fc10:HEAD:python-Traits-3.0.2-2.fc10.src.rpm:1236434911 --- NEW FILE python-Traits.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-Traits Version: 3.0.2 Release: 2%{?dist} Summary: Explicitly typed attributes for Python Group: Development/Languages # Images have different licenses. For image license breakdown check # image_LICENSE.txt file. Except enthought/traits/ui/editors_gen.py # which is GPLv2+ all remaining source or image files are in BSD # 3-clause license. Confirmed from upstream. License: BSD and EPL and LGPLv2 and GPLv2+ URL: http://code.enthought.com/projects/traits/ #md5=78622c7651113bbac544da2e63215f19 Source0: http://pypi.python.org/packages/source/T/Traits/Traits-3.0.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-setuptools, numpy, python-devel %description The traits package developed by Enthought provides a special type definition called a trait. Although they can be used as normal Python object attributes, traits also have several additional characteristics: * Initialization: A trait can be assigned a default value. * Validation: A trait attribute's type can be explicitly declared. * Delegation: The value of a trait attribute can be contained either in another object. * Notification: Setting the value of a trait attribute can trigger notification of other parts of the program. * Visualization: User interfaces that permit the interactive modification of a trait's value can be automatically constructed using the trait's definition. %prep %setup -q -n Traits-%{version} # fix wrong-file-end-of-line-encoding find examples \( -type f -o -name '*py' \ -o -name '*desc' -o -name '*txt' \) -print \ | sed 's/\ /\\ /g' | xargs sed -i 's/\r//' ls *txt | sed 's/\ /\\ /g' | xargs sed -i 's/\r//' sed -i 's/\r//' enthought/traits/protocols/unused_setup # scripts having 644 permission chmod 755 enthought/traits/protocols/unused_setup chmod 755 enthought/traits/ui/unused_setup # file not utf-8 iconv -f iso8859-1 -t utf-8 image_LICENSE_Eclipse.txt \ > image_LICENSE_Eclipse.txt.conv && mv -f \ image_LICENSE_Eclipse.txt.conv image_LICENSE_Eclipse.txt %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT python setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT rm $RPM_BUILD_ROOT/%{python_sitearch}/enthought/traits/protocols/_speedups.c rm $RPM_BUILD_ROOT/%{python_sitearch}/enthought/traits/ctraits.c # Prevents non standard permissions chmod 755 $RPM_BUILD_ROOT/%{python_sitearch}/enthought/traits/protocols/_speedups.so chmod 755 $RPM_BUILD_ROOT/%{python_sitearch}/enthought/traits/ctraits.so %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc *.txt examples/ docs/*.pdf %{python_sitearch}/* %changelog * Tue Jan 27 2009 Rakesh Pandit 3.0.2-2 - Fixed permissions for ctraits.so and _speedups.so - Fixed license after confirming from upstream * Sun Dec 07 2008 Rakesh Pandit 3.0.2-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-Traits/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 12:36:26 -0000 1.1 +++ .cvsignore 7 Mar 2009 14:13:09 -0000 1.2 @@ -0,0 +1 @@ +Traits-3.0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-Traits/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 12:36:26 -0000 1.1 +++ sources 7 Mar 2009 14:13:09 -0000 1.2 @@ -0,0 +1 @@ +78622c7651113bbac544da2e63215f19 Traits-3.0.2.tar.gz From rakesh at fedoraproject.org Sat Mar 7 14:17:17 2009 From: rakesh at fedoraproject.org (Rakesh Pandit) Date: Sat, 7 Mar 2009 14:17:17 +0000 (UTC) Subject: rpms/python-Traits/F-10 import.log, NONE, 1.1 python-Traits.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307141717.9F33170116@cvs1.fedora.phx.redhat.com> Author: rakesh Update of /cvs/pkgs/rpms/python-Traits/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23760/F-10 Modified Files: .cvsignore sources Added Files: import.log python-Traits.spec Log Message: Initial import. --- NEW FILE import.log --- python-Traits-3_0_2-2_fc10:F-10:python-Traits-3.0.2-2.fc10.src.rpm:1236435109 --- NEW FILE python-Traits.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-Traits Version: 3.0.2 Release: 2%{?dist} Summary: Explicitly typed attributes for Python Group: Development/Languages # Images have different licenses. For image license breakdown check # image_LICENSE.txt file. Except enthought/traits/ui/editors_gen.py # which is GPLv2+ all remaining source or image files are in BSD # 3-clause license. Confirmed from upstream. License: BSD and EPL and LGPLv2 and GPLv2+ URL: http://code.enthought.com/projects/traits/ #md5=78622c7651113bbac544da2e63215f19 Source0: http://pypi.python.org/packages/source/T/Traits/Traits-3.0.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-setuptools, numpy, python-devel %description The traits package developed by Enthought provides a special type definition called a trait. Although they can be used as normal Python object attributes, traits also have several additional characteristics: * Initialization: A trait can be assigned a default value. * Validation: A trait attribute's type can be explicitly declared. * Delegation: The value of a trait attribute can be contained either in another object. * Notification: Setting the value of a trait attribute can trigger notification of other parts of the program. * Visualization: User interfaces that permit the interactive modification of a trait's value can be automatically constructed using the trait's definition. %prep %setup -q -n Traits-%{version} # fix wrong-file-end-of-line-encoding find examples \( -type f -o -name '*py' \ -o -name '*desc' -o -name '*txt' \) -print \ | sed 's/\ /\\ /g' | xargs sed -i 's/\r//' ls *txt | sed 's/\ /\\ /g' | xargs sed -i 's/\r//' sed -i 's/\r//' enthought/traits/protocols/unused_setup # scripts having 644 permission chmod 755 enthought/traits/protocols/unused_setup chmod 755 enthought/traits/ui/unused_setup # file not utf-8 iconv -f iso8859-1 -t utf-8 image_LICENSE_Eclipse.txt \ > image_LICENSE_Eclipse.txt.conv && mv -f \ image_LICENSE_Eclipse.txt.conv image_LICENSE_Eclipse.txt %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT python setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT rm $RPM_BUILD_ROOT/%{python_sitearch}/enthought/traits/protocols/_speedups.c rm $RPM_BUILD_ROOT/%{python_sitearch}/enthought/traits/ctraits.c # Prevents non standard permissions chmod 755 $RPM_BUILD_ROOT/%{python_sitearch}/enthought/traits/protocols/_speedups.so chmod 755 $RPM_BUILD_ROOT/%{python_sitearch}/enthought/traits/ctraits.so %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc *.txt examples/ docs/*.pdf %{python_sitearch}/* %changelog * Tue Jan 27 2009 Rakesh Pandit 3.0.2-2 - Fixed permissions for ctraits.so and _speedups.so - Fixed license after confirming from upstream * Sun Dec 07 2008 Rakesh Pandit 3.0.2-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-Traits/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 12:36:26 -0000 1.1 +++ .cvsignore 7 Mar 2009 14:16:46 -0000 1.2 @@ -0,0 +1 @@ +Traits-3.0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-Traits/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 12:36:26 -0000 1.1 +++ sources 7 Mar 2009 14:16:46 -0000 1.2 @@ -0,0 +1 @@ +78622c7651113bbac544da2e63215f19 Traits-3.0.2.tar.gz From rakesh at fedoraproject.org Sat Mar 7 14:20:47 2009 From: rakesh at fedoraproject.org (Rakesh Pandit) Date: Sat, 7 Mar 2009 14:20:47 +0000 (UTC) Subject: rpms/python-Traits/F-9 import.log, NONE, 1.1 python-Traits.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307142047.8A0A170116@cvs1.fedora.phx.redhat.com> Author: rakesh Update of /cvs/pkgs/rpms/python-Traits/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24658/F-9 Modified Files: .cvsignore sources Added Files: import.log python-Traits.spec Log Message: Initial import. --- NEW FILE import.log --- python-Traits-3_0_2-2_fc10:F-9:python-Traits-3.0.2-2.fc10.src.rpm:1236435338 --- NEW FILE python-Traits.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-Traits Version: 3.0.2 Release: 2%{?dist} Summary: Explicitly typed attributes for Python Group: Development/Languages # Images have different licenses. For image license breakdown check # image_LICENSE.txt file. Except enthought/traits/ui/editors_gen.py # which is GPLv2+ all remaining source or image files are in BSD # 3-clause license. Confirmed from upstream. License: BSD and EPL and LGPLv2 and GPLv2+ URL: http://code.enthought.com/projects/traits/ #md5=78622c7651113bbac544da2e63215f19 Source0: http://pypi.python.org/packages/source/T/Traits/Traits-3.0.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-setuptools, numpy, python-devel %description The traits package developed by Enthought provides a special type definition called a trait. Although they can be used as normal Python object attributes, traits also have several additional characteristics: * Initialization: A trait can be assigned a default value. * Validation: A trait attribute's type can be explicitly declared. * Delegation: The value of a trait attribute can be contained either in another object. * Notification: Setting the value of a trait attribute can trigger notification of other parts of the program. * Visualization: User interfaces that permit the interactive modification of a trait's value can be automatically constructed using the trait's definition. %prep %setup -q -n Traits-%{version} # fix wrong-file-end-of-line-encoding find examples \( -type f -o -name '*py' \ -o -name '*desc' -o -name '*txt' \) -print \ | sed 's/\ /\\ /g' | xargs sed -i 's/\r//' ls *txt | sed 's/\ /\\ /g' | xargs sed -i 's/\r//' sed -i 's/\r//' enthought/traits/protocols/unused_setup # scripts having 644 permission chmod 755 enthought/traits/protocols/unused_setup chmod 755 enthought/traits/ui/unused_setup # file not utf-8 iconv -f iso8859-1 -t utf-8 image_LICENSE_Eclipse.txt \ > image_LICENSE_Eclipse.txt.conv && mv -f \ image_LICENSE_Eclipse.txt.conv image_LICENSE_Eclipse.txt %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT python setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT rm $RPM_BUILD_ROOT/%{python_sitearch}/enthought/traits/protocols/_speedups.c rm $RPM_BUILD_ROOT/%{python_sitearch}/enthought/traits/ctraits.c # Prevents non standard permissions chmod 755 $RPM_BUILD_ROOT/%{python_sitearch}/enthought/traits/protocols/_speedups.so chmod 755 $RPM_BUILD_ROOT/%{python_sitearch}/enthought/traits/ctraits.so %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc *.txt examples/ docs/*.pdf %{python_sitearch}/* %changelog * Tue Jan 27 2009 Rakesh Pandit 3.0.2-2 - Fixed permissions for ctraits.so and _speedups.so - Fixed license after confirming from upstream * Sun Dec 07 2008 Rakesh Pandit 3.0.2-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-Traits/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 12:36:26 -0000 1.1 +++ .cvsignore 7 Mar 2009 14:20:17 -0000 1.2 @@ -0,0 +1 @@ +Traits-3.0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-Traits/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 12:36:26 -0000 1.1 +++ sources 7 Mar 2009 14:20:17 -0000 1.2 @@ -0,0 +1 @@ +78622c7651113bbac544da2e63215f19 Traits-3.0.2.tar.gz From saispo at fedoraproject.org Sat Mar 7 14:28:48 2009 From: saispo at fedoraproject.org (Jerome Soyer) Date: Sat, 7 Mar 2009 14:28:48 +0000 (UTC) Subject: rpms/clamtk/devel .cvsignore, 1.3, 1.4 clamtk.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20090307142848.2668570116@cvs1.fedora.phx.redhat.com> Author: saispo Update of /cvs/pkgs/rpms/clamtk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26343 Modified Files: .cvsignore clamtk.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clamtk/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Feb 2009 21:27:58 -0000 1.3 +++ .cvsignore 7 Mar 2009 14:28:17 -0000 1.4 @@ -1,2 +1,3 @@ clamtk-4.08.tar.gz clamtk-4.09.tar.gz +clamtk-4.10.tar.gz Index: clamtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/clamtk/devel/clamtk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- clamtk.spec 24 Feb 2009 07:38:51 -0000 1.3 +++ clamtk.spec 7 Mar 2009 14:28:17 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Easy to use front-end for ClamAV Name: clamtk -Version: 4.09 -Release: 2%{dist} +Version: 4.10 +Release: 1%{dist} License: GPL+ or Artistic Group: Applications/System URL: http://clamtk.sourceforge.net/ @@ -65,6 +65,9 @@ %{_mandir}/man1/%{name}.1.* %changelog +* Sat Mar 07 2009 Jerome Soyer - 4.10-1 +- New upstream release + * Mon Feb 23 2009 Fedora Release Engineering - 4.09-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clamtk/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Feb 2009 21:27:58 -0000 1.3 +++ sources 7 Mar 2009 14:28:17 -0000 1.4 @@ -1,2 +1,3 @@ c052668af7941bc89cd3af32ff5fa633 clamtk-4.08.tar.gz acca210f94b28271258c7c379dedf863 clamtk-4.09.tar.gz +0de4b20f7b0cfd30e9e48c215a39c61c clamtk-4.10.tar.gz From transif at fedoraproject.org Sat Mar 7 14:54:05 2009 From: transif at fedoraproject.org (Transifex System User) Date: Sat, 7 Mar 2009 14:54:05 +0000 (UTC) Subject: comps/po de.po,1.34,1.35 Message-ID: <20090307145405.8016770116@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31115/po Modified Files: de.po Log Message: 2009-03-07 Fabian Affolter (via fab at fedoraproject.org) * po/de.po: Updated German translation Index: de.po =================================================================== RCS file: /cvs/pkgs/comps/po/de.po,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- de.po 19 Feb 2009 11:26:15 -0000 1.34 +++ de.po 7 Mar 2009 14:53:35 -0000 1.35 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: comps.HEAD.de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-19 01:52+0000\n" -"PO-Revision-Date: 2009-02-19 12:23+0100\n" +"POT-Creation-Date: 2009-03-07 13:52+0000\n" +"PO-Revision-Date: 2009-03-07 15:51+0100\n" "Last-Translator: Fabian Affolter \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -286,7 +286,7 @@ #: ../comps-f8.xml.in.h:32 #: ../comps-f9.xml.in.h:32 #: ../comps-f10.xml.in.h:33 -#: ../comps-f11.xml.in.h:34 +#: ../comps-f11.xml.in.h:35 #: ../comps-el4.xml.in.h:8 #: ../comps-el5.xml.in.h:9 msgid "Desktop Environments" @@ -296,7 +296,7 @@ #: ../comps-f8.xml.in.h:33 #: ../comps-f9.xml.in.h:33 #: ../comps-f10.xml.in.h:34 -#: ../comps-f11.xml.in.h:35 +#: ../comps-f11.xml.in.h:36 #: ../comps-el4.xml.in.h:9 #: ../comps-el5.xml.in.h:10 msgid "Desktop environments" @@ -306,7 +306,7 @@ #: ../comps-f8.xml.in.h:34 #: ../comps-f9.xml.in.h:34 #: ../comps-f10.xml.in.h:35 -#: ../comps-f11.xml.in.h:36 +#: ../comps-f11.xml.in.h:37 #: ../comps-el4.xml.in.h:10 #: ../comps-el5.xml.in.h:11 msgid "Development" @@ -316,7 +316,7 @@ #: ../comps-f8.xml.in.h:35 #: ../comps-f9.xml.in.h:35 #: ../comps-f10.xml.in.h:36 -#: ../comps-f11.xml.in.h:37 +#: ../comps-f11.xml.in.h:38 msgid "Development Libraries" msgstr "Entwicklungsbibliotheken" @@ -324,7 +324,7 @@ #: ../comps-f8.xml.in.h:36 #: ../comps-f9.xml.in.h:36 #: ../comps-f10.xml.in.h:37 -#: ../comps-f11.xml.in.h:38 +#: ../comps-f11.xml.in.h:39 #: ../comps-el4.xml.in.h:11 #: ../comps-el5.xml.in.h:12 msgid "Development Tools" @@ -334,7 +334,7 @@ #: ../comps-f8.xml.in.h:37 #: ../comps-f9.xml.in.h:37 #: ../comps-f10.xml.in.h:38 -#: ../comps-f11.xml.in.h:39 +#: ../comps-f11.xml.in.h:40 msgid "Dial-up Networking Support" msgstr "Unterst??tzung f??r DF??-Netzwerke" @@ -342,7 +342,7 @@ #: ../comps-f8.xml.in.h:38 #: ../comps-f9.xml.in.h:38 #: ../comps-f10.xml.in.h:39 -#: ../comps-f11.xml.in.h:40 +#: ../comps-f11.xml.in.h:41 msgid "Dutch Support" msgstr "Unterst??tzung f??r Holl??ndisch" @@ -354,7 +354,7 @@ #: ../comps-f8.xml.in.h:39 #: ../comps-f9.xml.in.h:39 #: ../comps-f10.xml.in.h:40 -#: ../comps-f11.xml.in.h:41 +#: ../comps-f11.xml.in.h:42 #: ../comps-el4.xml.in.h:13 #: ../comps-el5.xml.in.h:14 msgid "Editors" @@ -364,7 +364,7 @@ #: ../comps-f8.xml.in.h:40 #: ../comps-f9.xml.in.h:40 #: ../comps-f10.xml.in.h:41 -#: ../comps-f11.xml.in.h:42 +#: ../comps-f11.xml.in.h:43 #: ../comps-el4.xml.in.h:14 #: ../comps-el5.xml.in.h:15 msgid "Educational Software" @@ -374,7 +374,7 @@ #: ../comps-f8.xml.in.h:41 #: ../comps-f9.xml.in.h:41 #: ../comps-f10.xml.in.h:42 -#: ../comps-f11.xml.in.h:43 +#: ../comps-f11.xml.in.h:44 #: ../comps-el4.xml.in.h:15 #: ../comps-el5.xml.in.h:16 msgid "Educational software for learning" @@ -384,7 +384,7 @@ #: ../comps-f8.xml.in.h:42 #: ../comps-f9.xml.in.h:42 #: ../comps-f10.xml.in.h:43 -#: ../comps-f11.xml.in.h:44 +#: ../comps-f11.xml.in.h:46 #: ../comps-el4.xml.in.h:16 #: ../comps-el5.xml.in.h:17 msgid "Engineering and Scientific" @@ -394,7 +394,7 @@ #: ../comps-f8.xml.in.h:43 #: ../comps-f9.xml.in.h:43 #: ../comps-f10.xml.in.h:44 -#: ../comps-f11.xml.in.h:45 +#: ../comps-f11.xml.in.h:47 msgid "English (UK) Support" msgstr "Unterst??tzung f??r Englisch (UK)" @@ -402,7 +402,7 @@ #: ../comps-f8.xml.in.h:44 #: ../comps-f9.xml.in.h:45 #: ../comps-f10.xml.in.h:46 -#: ../comps-f11.xml.in.h:47 +#: ../comps-f11.xml.in.h:49 msgid "Estonian Support" msgstr "Unterst??tzung f??r Estnisch" @@ -410,7 +410,7 @@ #: ../comps-f8.xml.in.h:45 #: ../comps-f9.xml.in.h:46 #: ../comps-f10.xml.in.h:47 -#: ../comps-f11.xml.in.h:48 +#: ../comps-f11.xml.in.h:50 msgid "Ethiopic Support" msgstr "Unterst??tzung f??r ??thiopisch" @@ -418,7 +418,7 @@ #: ../comps-f8.xml.in.h:46 #: ../comps-f9.xml.in.h:47 #: ../comps-f10.xml.in.h:48 -#: ../comps-f11.xml.in.h:49 +#: ../comps-f11.xml.in.h:51 #: ../comps-el4.xml.in.h:17 #: ../comps-el5.xml.in.h:18 msgid "FTP Server" @@ -428,7 +428,7 @@ #: ../comps-f8.xml.in.h:47 #: ../comps-f9.xml.in.h:48 #: ../comps-f10.xml.in.h:49 -#: ../comps-f11.xml.in.h:50 +#: ../comps-f11.xml.in.h:52 msgid "Faeroese Support" msgstr "Unterst??tzung f??r F??r??erisch" @@ -437,7 +437,7 @@ #: ../comps-f8.xml.in.h:49 #: ../comps-f9.xml.in.h:50 #: ../comps-f10.xml.in.h:51 -#: ../comps-f11.xml.in.h:52 +#: ../comps-f11.xml.in.h:54 #: ../comps-el4.xml.in.h:18 #: ../comps-el5.xml.in.h:19 msgid "Fedora Packager" @@ -447,7 +447,7 @@ #: ../comps-f8.xml.in.h:50 #: ../comps-f9.xml.in.h:51 #: ../comps-f10.xml.in.h:52 -#: ../comps-f11.xml.in.h:53 +#: ../comps-f11.xml.in.h:55 msgid "Filipino Support" msgstr "Unterst??tzung f??r Philipinisch" @@ -455,7 +455,7 @@ #: ../comps-f8.xml.in.h:51 #: ../comps-f9.xml.in.h:52 #: ../comps-f10.xml.in.h:53 -#: ../comps-f11.xml.in.h:54 +#: ../comps-f11.xml.in.h:56 msgid "Finnish Support" msgstr "Unterst??tzung f??r Finnisch" @@ -463,7 +463,7 @@ #: ../comps-f8.xml.in.h:54 #: ../comps-f9.xml.in.h:55 #: ../comps-f10.xml.in.h:56 -#: ../comps-f11.xml.in.h:58 +#: ../comps-f11.xml.in.h:60 msgid "French Support" msgstr "Unterst??tzung f??r Franz??sisch" @@ -471,7 +471,7 @@ #: ../comps-f8.xml.in.h:55 #: ../comps-f9.xml.in.h:56 #: ../comps-f10.xml.in.h:57 -#: ../comps-f11.xml.in.h:61 +#: ../comps-f11.xml.in.h:63 #: ../comps-el4.xml.in.h:19 #: ../comps-el5.xml.in.h:20 msgid "From CD recording to playing audio CDs and multimedia files, this package group allows you to work with sound and video on the system." @@ -481,7 +481,7 @@ #: ../comps-f8.xml.in.h:56 #: ../comps-f9.xml.in.h:57 #: ../comps-f10.xml.in.h:58 -#: ../comps-f11.xml.in.h:62 +#: ../comps-f11.xml.in.h:64 #: ../comps-el4.xml.in.h:20 #: ../comps-el5.xml.in.h:21 msgid "GNOME Desktop Environment" @@ -491,7 +491,7 @@ #: ../comps-f8.xml.in.h:57 #: ../comps-f9.xml.in.h:58 #: ../comps-f10.xml.in.h:59 -#: ../comps-f11.xml.in.h:63 +#: ../comps-f11.xml.in.h:65 #: ../comps-el4.xml.in.h:21 #: ../comps-el5.xml.in.h:22 msgid "GNOME Software Development" @@ -501,7 +501,7 @@ #: ../comps-f8.xml.in.h:58 #: ../comps-f9.xml.in.h:59 #: ../comps-f10.xml.in.h:60 -#: ../comps-f11.xml.in.h:64 +#: ../comps-f11.xml.in.h:66 msgid "GNOME is a powerful graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." msgstr "GNOME ist eine m??chtige grafische Benutzeroberfl??che mit Men??leiste, Desktop, Systemsymbolen und grafischem Dateimanager." @@ -509,7 +509,7 @@ #: ../comps-f8.xml.in.h:59 #: ../comps-f9.xml.in.h:60 #: ../comps-f10.xml.in.h:61 -#: ../comps-f11.xml.in.h:65 +#: ../comps-f11.xml.in.h:67 msgid "Gaelic Support" msgstr "Unterst??tzung f??r G??lisch" @@ -517,7 +517,7 @@ #: ../comps-f8.xml.in.h:60 #: ../comps-f9.xml.in.h:61 #: ../comps-f10.xml.in.h:62 -#: ../comps-f11.xml.in.h:66 +#: ../comps-f11.xml.in.h:68 msgid "Galician Support" msgstr "Unterst??tzung f??r Galizisch" @@ -525,7 +525,7 @@ #: ../comps-f8.xml.in.h:61 #: ../comps-f9.xml.in.h:62 #: ../comps-f10.xml.in.h:63 -#: ../comps-f11.xml.in.h:67 +#: ../comps-f11.xml.in.h:69 #: ../comps-el5.xml.in.h:24 msgid "Games and Entertainment" msgstr "Spiele und Zeitvertreib" @@ -534,7 +534,7 @@ #: ../comps-f8.xml.in.h:62 #: ../comps-f9.xml.in.h:63 #: ../comps-f10.xml.in.h:64 -#: ../comps-f11.xml.in.h:68 +#: ../comps-f11.xml.in.h:70 msgid "Georgian Support" msgstr "Unterst??tzung f??r Georgisch" @@ -542,7 +542,7 @@ #: ../comps-f8.xml.in.h:63 #: ../comps-f9.xml.in.h:64 #: ../comps-f10.xml.in.h:65 -#: ../comps-f11.xml.in.h:69 +#: ../comps-f11.xml.in.h:71 msgid "German Support" msgstr "Unterst??tzung f??r Deutsch" @@ -550,7 +550,7 @@ #: ../comps-f8.xml.in.h:64 #: ../comps-f9.xml.in.h:65 #: ../comps-f10.xml.in.h:66 -#: ../comps-f11.xml.in.h:70 +#: ../comps-f11.xml.in.h:72 #: ../comps-el4.xml.in.h:23 #: ../comps-el5.xml.in.h:25 msgid "Graphical Internet" @@ -560,7 +560,7 @@ #: ../comps-f8.xml.in.h:65 #: ../comps-f9.xml.in.h:66 #: ../comps-f10.xml.in.h:67 -#: ../comps-f11.xml.in.h:71 +#: ../comps-f11.xml.in.h:73 #: ../comps-el4.xml.in.h:24 #: ../comps-el5.xml.in.h:26 msgid "Graphics" @@ -570,7 +570,7 @@ #: ../comps-f8.xml.in.h:66 #: ../comps-f9.xml.in.h:67 #: ../comps-f10.xml.in.h:68 -#: ../comps-f11.xml.in.h:72 +#: ../comps-f11.xml.in.h:74 msgid "Greek Support" msgstr "Unterst??tzung f??r Griechisch" @@ -578,7 +578,7 @@ #: ../comps-f8.xml.in.h:67 #: ../comps-f9.xml.in.h:68 #: ../comps-f10.xml.in.h:69 -#: ../comps-f11.xml.in.h:73 +#: ../comps-f11.xml.in.h:75 msgid "Gujarati Support" msgstr "Unterst??tzung f??r Gujarati" @@ -586,7 +586,7 @@ #: ../comps-f8.xml.in.h:68 #: ../comps-f9.xml.in.h:69 #: ../comps-f10.xml.in.h:70 -#: ../comps-f11.xml.in.h:74 +#: ../comps-f11.xml.in.h:76 #: ../comps-el4.xml.in.h:25 #: ../comps-el5.xml.in.h:27 msgid "Hardware Support" @@ -596,7 +596,7 @@ #: ../comps-f8.xml.in.h:69 #: ../comps-f9.xml.in.h:70 #: ../comps-f10.xml.in.h:72 -#: ../comps-f11.xml.in.h:76 +#: ../comps-f11.xml.in.h:78 #: ../comps-el4.xml.in.h:26 #: ../comps-el5.xml.in.h:28 msgid "Hebrew Support" @@ -606,7 +606,7 @@ #: ../comps-f8.xml.in.h:70 #: ../comps-f9.xml.in.h:71 #: ../comps-f10.xml.in.h:73 -#: ../comps-f11.xml.in.h:77 +#: ../comps-f11.xml.in.h:79 msgid "Hindi Support" msgstr "Unterst??tzung f??r Hindi" @@ -614,7 +614,7 @@ #: ../comps-f8.xml.in.h:71 #: ../comps-f9.xml.in.h:72 #: ../comps-f10.xml.in.h:74 -#: ../comps-f11.xml.in.h:78 +#: ../comps-f11.xml.in.h:80 msgid "Hungarian Support" msgstr "Unterst??tzung f??r Ungarisch" @@ -622,7 +622,7 @@ #: ../comps-f8.xml.in.h:72 #: ../comps-f9.xml.in.h:73 #: ../comps-f10.xml.in.h:75 -#: ../comps-f11.xml.in.h:79 +#: ../comps-f11.xml.in.h:81 msgid "Icelandic Support" msgstr "Unterst??tzung f??r Isl??ndisch" @@ -630,7 +630,7 @@ #: ../comps-f8.xml.in.h:73 #: ../comps-f9.xml.in.h:74 #: ../comps-f10.xml.in.h:76 -#: ../comps-f11.xml.in.h:80 +#: ../comps-f11.xml.in.h:82 msgid "Indonesian Support" msgstr "Unterst??tzung f??r Indonesisch" @@ -638,7 +638,7 @@ #: ../comps-f8.xml.in.h:74 #: ../comps-f9.xml.in.h:75 #: ../comps-f10.xml.in.h:79 -#: ../comps-f11.xml.in.h:83 +#: ../comps-f11.xml.in.h:85 #: ../comps-el4.xml.in.h:27 #: ../comps-el5.xml.in.h:29 msgid "Install these packages in order to develop GTK+ and GNOME graphical applications." @@ -648,7 +648,7 @@ #: ../comps-f8.xml.in.h:75 #: ../comps-f9.xml.in.h:76 #: ../comps-f10.xml.in.h:80 -#: ../comps-f11.xml.in.h:84 +#: ../comps-f11.xml.in.h:86 msgid "Install these packages in order to develop GTK+ and XFCE graphical applications." msgstr "Installieren Sie diese Pakete, um grafische Anwendungen f??r GTK+ und XFCE zu entwickeln." @@ -656,7 +656,7 @@ #: ../comps-f8.xml.in.h:76 #: ../comps-f9.xml.in.h:77 #: ../comps-f10.xml.in.h:81 -#: ../comps-f11.xml.in.h:85 +#: ../comps-f11.xml.in.h:87 #: ../comps-el4.xml.in.h:28 #: ../comps-el5.xml.in.h:30 msgid "Install these packages to develop QT and KDE graphical applications." @@ -666,7 +666,7 @@ #: ../comps-f8.xml.in.h:77 #: ../comps-f9.xml.in.h:78 #: ../comps-f10.xml.in.h:82 -#: ../comps-f11.xml.in.h:86 +#: ../comps-f11.xml.in.h:88 msgid "Install these tools to enable the system to print or act as a print server." msgstr "Installieren Sie diese Programme, um es dem System zu erm??glichen zu drucken oder als Drucker-Server zu fungieren." @@ -674,7 +674,7 @@ #: ../comps-f8.xml.in.h:78 #: ../comps-f9.xml.in.h:79 #: ../comps-f10.xml.in.h:83 -#: ../comps-f11.xml.in.h:87 +#: ../comps-f11.xml.in.h:89 #: ../comps-el4.xml.in.h:29 #: ../comps-el5.xml.in.h:31 msgid "Install this group of packages to use the base graphical (X) user interface." @@ -684,7 +684,7 @@ #: ../comps-f8.xml.in.h:80 #: ../comps-f9.xml.in.h:81 #: ../comps-f10.xml.in.h:85 -#: ../comps-f11.xml.in.h:89 +#: ../comps-f11.xml.in.h:91 msgid "Inuktitut Support" msgstr "Unterst??tzung f??r Inuktitut" @@ -692,7 +692,7 @@ #: ../comps-f8.xml.in.h:81 #: ../comps-f9.xml.in.h:82 #: ../comps-f10.xml.in.h:86 -#: ../comps-f11.xml.in.h:90 +#: ../comps-f11.xml.in.h:92 msgid "Irish Support" msgstr "Unterst??tzung f??r Irisch" @@ -700,7 +700,7 @@ #: ../comps-f8.xml.in.h:82 #: ../comps-f9.xml.in.h:83 #: ../comps-f10.xml.in.h:87 -#: ../comps-f11.xml.in.h:91 +#: ../comps-f11.xml.in.h:93 msgid "Italian Support" msgstr "Unterst??tzung f??r Italienisch" @@ -708,7 +708,7 @@ #: ../comps-f8.xml.in.h:83 #: ../comps-f9.xml.in.h:84 #: ../comps-f10.xml.in.h:88 -#: ../comps-f11.xml.in.h:92 +#: ../comps-f11.xml.in.h:94 #: ../comps-el4.xml.in.h:30 #: ../comps-el5.xml.in.h:32 msgid "Japanese Support" @@ -718,7 +718,7 @@ #: ../comps-f8.xml.in.h:84 #: ../comps-f9.xml.in.h:85 #: ../comps-f10.xml.in.h:89 -#: ../comps-f11.xml.in.h:93 +#: ../comps-f11.xml.in.h:95 #: ../comps-el4.xml.in.h:31 msgid "Java" msgstr "Java" @@ -727,7 +727,7 @@ #: ../comps-f8.xml.in.h:85 #: ../comps-f9.xml.in.h:86 #: ../comps-f10.xml.in.h:90 -#: ../comps-f11.xml.in.h:94 +#: ../comps-f11.xml.in.h:96 #: ../comps-el4.xml.in.h:32 msgid "Java Development" msgstr "Java-Softwareentwicklung" @@ -736,7 +736,7 @@ #: ../comps-f8.xml.in.h:86 #: ../comps-f9.xml.in.h:87 #: ../comps-f10.xml.in.h:91 -#: ../comps-f11.xml.in.h:95 +#: ../comps-f11.xml.in.h:97 #: ../comps-el4.xml.in.h:33 #: ../comps-el5.xml.in.h:33 msgid "KDE (K Desktop Environment)" @@ -746,7 +746,7 @@ #: ../comps-f8.xml.in.h:87 #: ../comps-f9.xml.in.h:88 #: ../comps-f10.xml.in.h:92 -#: ../comps-f11.xml.in.h:96 +#: ../comps-f11.xml.in.h:98 #: ../comps-el4.xml.in.h:34 #: ../comps-el5.xml.in.h:34 msgid "KDE Software Development" @@ -756,7 +756,7 @@ #: ../comps-f8.xml.in.h:88 #: ../comps-f9.xml.in.h:89 #: ../comps-f10.xml.in.h:93 -#: ../comps-f11.xml.in.h:97 +#: ../comps-f11.xml.in.h:99 msgid "KDE is a powerful graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." msgstr "KDE ist eine m??chtige, grafische Benutzeroberfl??che mit Men??leiste, Desktop, Systemsymbolen und grafischem Dateimanager." @@ -765,7 +765,7 @@ #: ../comps-f8.xml.in.h:89 #: ../comps-f9.xml.in.h:90 #: ../comps-f10.xml.in.h:94 -#: ../comps-f11.xml.in.h:98 +#: ../comps-f11.xml.in.h:100 msgid "Kannada Support" msgstr "Unterst??tzung f??r Kannada (Indien)" @@ -773,7 +773,7 @@ #: ../comps-f8.xml.in.h:90 #: ../comps-f9.xml.in.h:92 #: ../comps-f10.xml.in.h:97 -#: ../comps-f11.xml.in.h:101 +#: ../comps-f11.xml.in.h:103 msgid "Khmer Support" msgstr "Unterst??tzung f??r Khmer" @@ -781,7 +781,7 @@ #: ../comps-f8.xml.in.h:91 #: ../comps-f9.xml.in.h:93 #: ../comps-f10.xml.in.h:99 -#: ../comps-f11.xml.in.h:104 +#: ../comps-f11.xml.in.h:106 msgid "Korean Support" msgstr "Unterst??tzung f??r Koreanisch" @@ -789,7 +789,7 @@ #: ../comps-f8.xml.in.h:92 #: ../comps-f9.xml.in.h:95 #: ../comps-f10.xml.in.h:102 -#: ../comps-f11.xml.in.h:107 +#: ../comps-f11.xml.in.h:109 msgid "Languages" msgstr "Sprachen" @@ -797,7 +797,7 @@ #: ../comps-f8.xml.in.h:93 #: ../comps-f9.xml.in.h:96 #: ../comps-f10.xml.in.h:103 -#: ../comps-f11.xml.in.h:108 +#: ../comps-f11.xml.in.h:110 msgid "Lao Support" msgstr "Unterst??tzung f??r Laotisch" @@ -805,7 +805,7 @@ #: ../comps-f8.xml.in.h:94 #: ../comps-f9.xml.in.h:97 #: ../comps-f10.xml.in.h:104 -#: ../comps-f11.xml.in.h:109 +#: ../comps-f11.xml.in.h:111 msgid "Latvian Support" msgstr "Unterst??tzung f??r Lettisch" @@ -813,7 +813,7 @@ #: ../comps-f8.xml.in.h:96 #: ../comps-f9.xml.in.h:99 #: ../comps-f10.xml.in.h:106 -#: ../comps-f11.xml.in.h:111 +#: ../comps-f11.xml.in.h:113 msgid "Legacy Network Server" msgstr "??ltere Netzwerk-Server" @@ -821,7 +821,7 @@ #: ../comps-f8.xml.in.h:97 #: ../comps-f9.xml.in.h:100 #: ../comps-f10.xml.in.h:107 -#: ../comps-f11.xml.in.h:112 +#: ../comps-f11.xml.in.h:114 msgid "Legacy Software Development" msgstr "??ltere Softwareentwicklung" @@ -829,7 +829,7 @@ #: ../comps-f8.xml.in.h:98 #: ../comps-f9.xml.in.h:101 #: ../comps-f10.xml.in.h:108 -#: ../comps-f11.xml.in.h:113 +#: ../comps-f11.xml.in.h:115 msgid "Legacy Software Support" msgstr "Unterst??tzung f??r ??ltere Software" @@ -837,7 +837,7 @@ #: ../comps-f8.xml.in.h:99 #: ../comps-f9.xml.in.h:102 #: ../comps-f10.xml.in.h:109 -#: ../comps-f11.xml.in.h:114 +#: ../comps-f11.xml.in.h:116 msgid "Lithuanian Support" msgstr "Unterst??tzung f??r Litauisch" @@ -845,7 +845,7 @@ #: ../comps-f8.xml.in.h:101 #: ../comps-f9.xml.in.h:105 #: ../comps-f10.xml.in.h:112 -#: ../comps-f11.xml.in.h:117 +#: ../comps-f11.xml.in.h:119 #: ../comps-el4.xml.in.h:36 #: ../comps-el5.xml.in.h:36 msgid "Mail Server" @@ -855,7 +855,7 @@ #: ../comps-f8.xml.in.h:102 #: ../comps-f9.xml.in.h:106 #: ../comps-f10.xml.in.h:114 -#: ../comps-f11.xml.in.h:120 +#: ../comps-f11.xml.in.h:122 msgid "Malay Support" msgstr "Unterst??tzung f??r Malaiisch" @@ -863,7 +863,7 @@ #: ../comps-f8.xml.in.h:103 #: ../comps-f9.xml.in.h:107 #: ../comps-f10.xml.in.h:115 -#: ../comps-f11.xml.in.h:121 +#: ../comps-f11.xml.in.h:123 msgid "Malayalam Support" msgstr "Unterst??tzung f??r Malayalam" @@ -871,7 +871,7 @@ #: ../comps-f8.xml.in.h:104 #: ../comps-f9.xml.in.h:108 #: ../comps-f10.xml.in.h:116 -#: ../comps-f11.xml.in.h:122 +#: ../comps-f11.xml.in.h:124 msgid "Maori Support" msgstr "Unterst??tzung f??r Maori" @@ -879,7 +879,7 @@ #: ../comps-f8.xml.in.h:105 #: ../comps-f9.xml.in.h:109 #: ../comps-f10.xml.in.h:117 -#: ../comps-f11.xml.in.h:123 +#: ../comps-f11.xml.in.h:125 msgid "Marathi Support" msgstr "Unterst??tzung f??r Marathi" @@ -887,7 +887,7 @@ #: ../comps-f8.xml.in.h:107 #: ../comps-f9.xml.in.h:111 #: ../comps-f10.xml.in.h:119 -#: ../comps-f11.xml.in.h:125 +#: ../comps-f11.xml.in.h:128 msgid "MySQL Database" msgstr "MySQL-Datenbank" @@ -895,7 +895,7 @@ #: ../comps-f8.xml.in.h:109 #: ../comps-f9.xml.in.h:113 #: ../comps-f10.xml.in.h:122 -#: ../comps-f11.xml.in.h:128 +#: ../comps-f11.xml.in.h:131 #: ../comps-el4.xml.in.h:37 #: ../comps-el5.xml.in.h:37 msgid "Network Servers" @@ -905,7 +905,7 @@ #: ../comps-f8.xml.in.h:110 #: ../comps-f9.xml.in.h:114 #: ../comps-f10.xml.in.h:123 -#: ../comps-f11.xml.in.h:129 +#: ../comps-f11.xml.in.h:132 #: ../comps-el4.xml.in.h:38 #: ../comps-el5.xml.in.h:38 msgid "News Server" @@ -915,7 +915,7 @@ #: ../comps-f8.xml.in.h:111 #: ../comps-f9.xml.in.h:116 #: ../comps-f10.xml.in.h:125 -#: ../comps-f11.xml.in.h:131 +#: ../comps-f11.xml.in.h:134 msgid "Northern Sotho Support" msgstr "Unterst??tzung f??r Nord-Sotho" @@ -923,7 +923,7 @@ #: ../comps-f8.xml.in.h:112 #: ../comps-f9.xml.in.h:117 #: ../comps-f10.xml.in.h:126 -#: ../comps-f11.xml.in.h:132 +#: ../comps-f11.xml.in.h:135 msgid "Norwegian Support" msgstr "Unterst??tzung f??r Norwegisch" @@ -931,7 +931,7 @@ #: ../comps-f8.xml.in.h:113 #: ../comps-f9.xml.in.h:118 #: ../comps-f10.xml.in.h:127 -#: ../comps-f11.xml.in.h:134 +#: ../comps-f11.xml.in.h:138 #: ../comps-el4.xml.in.h:39 #: ../comps-el5.xml.in.h:39 msgid "Office/Productivity" @@ -941,7 +941,7 @@ #: ../comps-f8.xml.in.h:115 #: ../comps-f9.xml.in.h:120 #: ../comps-f10.xml.in.h:129 -#: ../comps-f11.xml.in.h:136 +#: ../comps-f11.xml.in.h:141 msgid "Oriya Support" msgstr "Unterst??tzung f??r Oriya" @@ -949,7 +949,7 @@ #: ../comps-f8.xml.in.h:116 #: ../comps-f9.xml.in.h:121 #: ../comps-f10.xml.in.h:130 -#: ../comps-f11.xml.in.h:137 +#: ../comps-f11.xml.in.h:142 #: ../comps-el4.xml.in.h:40 #: ../comps-el5.xml.in.h:40 msgid "Packages which provide functionality for developing and building applications." @@ -959,7 +959,7 @@ #: ../comps-f8.xml.in.h:117 #: ../comps-f9.xml.in.h:122 #: ../comps-f10.xml.in.h:131 -#: ../comps-f11.xml.in.h:138 +#: ../comps-f11.xml.in.h:143 msgid "Persian Support" msgstr "Unterst??tzung f??r Persisch" @@ -967,7 +967,7 @@ #: ../comps-f8.xml.in.h:118 #: ../comps-f9.xml.in.h:123 #: ../comps-f10.xml.in.h:132 -#: ../comps-f11.xml.in.h:139 +#: ../comps-f11.xml.in.h:144 msgid "Polish Support" msgstr "Unterst??tzung f??r Polnisch" @@ -975,7 +975,7 @@ #: ../comps-f8.xml.in.h:119 #: ../comps-f9.xml.in.h:124 #: ../comps-f10.xml.in.h:133 -#: ../comps-f11.xml.in.h:140 +#: ../comps-f11.xml.in.h:145 msgid "Portuguese Support" msgstr "Unterst??tzung f??r Portugiesisch" @@ -983,7 +983,7 @@ #: ../comps-f8.xml.in.h:120 #: ../comps-f9.xml.in.h:125 #: ../comps-f10.xml.in.h:134 -#: ../comps-f11.xml.in.h:141 +#: ../comps-f11.xml.in.h:146 msgid "PostgreSQL Database" msgstr "PostgreSQL-Datenbank" @@ -991,7 +991,7 @@ #: ../comps-f8.xml.in.h:121 #: ../comps-f9.xml.in.h:126 #: ../comps-f10.xml.in.h:135 -#: ../comps-f11.xml.in.h:142 +#: ../comps-f11.xml.in.h:147 msgid "Printing Support" msgstr "Drucker-Unterst??tzung" @@ -999,7 +999,7 @@ #: ../comps-f8.xml.in.h:122 #: ../comps-f9.xml.in.h:127 #: ../comps-f10.xml.in.h:136 -#: ../comps-f11.xml.in.h:143 +#: ../comps-f11.xml.in.h:148 msgid "Punjabi Support" msgstr "Unterst??tzung f??r Punjabi" @@ -1007,7 +1007,7 @@ #: ../comps-f8.xml.in.h:123 #: ../comps-f9.xml.in.h:128 #: ../comps-f10.xml.in.h:137 -#: ../comps-f11.xml.in.h:144 +#: ../comps-f11.xml.in.h:149 msgid "Romanian Support" msgstr "Unterst??tzung f??r Rum??nisch" @@ -1015,7 +1015,7 @@ #: ../comps-f8.xml.in.h:124 #: ../comps-f9.xml.in.h:129 #: ../comps-f10.xml.in.h:138 -#: ../comps-f11.xml.in.h:145 +#: ../comps-f11.xml.in.h:150 msgid "Ruby" msgstr "Ruby" @@ -1023,7 +1023,7 @@ #: ../comps-f8.xml.in.h:125 #: ../comps-f9.xml.in.h:130 #: ../comps-f10.xml.in.h:139 -#: ../comps-f11.xml.in.h:146 +#: ../comps-f11.xml.in.h:151 msgid "Russian Support" msgstr "Unterst??tzung f??r Russisch" @@ -1031,7 +1031,7 @@ #: ../comps-f8.xml.in.h:126 #: ../comps-f9.xml.in.h:133 #: ../comps-f10.xml.in.h:141 -#: ../comps-f11.xml.in.h:148 +#: ../comps-f11.xml.in.h:153 msgid "Samoan Support" msgstr "Unterst??tzung f??r Samoanisch" @@ -1039,7 +1039,7 @@ #: ../comps-f8.xml.in.h:127 #: ../comps-f9.xml.in.h:134 #: ../comps-f10.xml.in.h:142 -#: ../comps-f11.xml.in.h:149 +#: ../comps-f11.xml.in.h:154 msgid "Serbian Support" msgstr "Unterst??tzung f??r Serbisch" @@ -1047,7 +1047,7 @@ #: ../comps-f8.xml.in.h:128 #: ../comps-f9.xml.in.h:135 #: ../comps-f10.xml.in.h:143 -#: ../comps-f11.xml.in.h:150 +#: ../comps-f11.xml.in.h:155 msgid "Server Configuration Tools" msgstr "Server-Konfigurationswerkzeuge" @@ -1055,7 +1055,7 @@ #: ../comps-f8.xml.in.h:129 #: ../comps-f9.xml.in.h:136 #: ../comps-f10.xml.in.h:144 -#: ../comps-f11.xml.in.h:151 +#: ../comps-f11.xml.in.h:156 #: ../comps-el4.xml.in.h:41 #: ../comps-el5.xml.in.h:41 msgid "Servers" @@ -1065,7 +1065,7 @@ #: ../comps-f8.xml.in.h:130 #: ../comps-f9.xml.in.h:137 #: ../comps-f10.xml.in.h:145 -#: ../comps-f11.xml.in.h:152 +#: ../comps-f11.xml.in.h:157 #: ../comps-el4.xml.in.h:42 #: ../comps-el5.xml.in.h:42 msgid "Simple window managers that aren't part of a larger desktop environment." @@ -1075,7 +1075,7 @@ #: ../comps-f8.xml.in.h:131 #: ../comps-f9.xml.in.h:138 #: ../comps-f10.xml.in.h:147 -#: ../comps-f11.xml.in.h:154 +#: ../comps-f11.xml.in.h:159 msgid "Sinhala Support" msgstr "Unterst??tzung f??r Sinhala" @@ -1083,7 +1083,7 @@ #: ../comps-f8.xml.in.h:132 #: ../comps-f9.xml.in.h:139 #: ../comps-f10.xml.in.h:148 -#: ../comps-f11.xml.in.h:155 +#: ../comps-f11.xml.in.h:160 msgid "Slovak Support" msgstr "Unterst??tzung f??r Slowakisch" @@ -1091,7 +1091,7 @@ #: ../comps-f8.xml.in.h:133 #: ../comps-f9.xml.in.h:140 #: ../comps-f10.xml.in.h:149 -#: ../comps-f11.xml.in.h:156 +#: ../comps-f11.xml.in.h:161 msgid "Slovenian Support" msgstr "Unterst??tzung f??r Slowenisch" @@ -1099,7 +1099,7 @@ #: ../comps-f8.xml.in.h:134 #: ../comps-f9.xml.in.h:141 #: ../comps-f10.xml.in.h:150 -#: ../comps-f11.xml.in.h:157 +#: ../comps-f11.xml.in.h:162 msgid "Smallest possible installation" msgstr "Kleinstm??gliche Installation" @@ -1107,7 +1107,7 @@ #: ../comps-f8.xml.in.h:135 #: ../comps-f9.xml.in.h:142 #: ../comps-f10.xml.in.h:151 -#: ../comps-f11.xml.in.h:158 +#: ../comps-f11.xml.in.h:163 #: ../comps-el4.xml.in.h:43 #: ../comps-el5.xml.in.h:43 msgid "Software used for running network servers" @@ -1117,7 +1117,7 @@ #: ../comps-f8.xml.in.h:136 #: ../comps-f9.xml.in.h:143 #: ../comps-f10.xml.in.h:152 -#: ../comps-f11.xml.in.h:159 +#: ../comps-f11.xml.in.h:164 msgid "Somali Support" msgstr "Unterst??tzung f??r Somali" @@ -1125,7 +1125,7 @@ #: ../comps-f8.xml.in.h:137 #: ../comps-f9.xml.in.h:144 #: ../comps-f10.xml.in.h:153 -#: ../comps-f11.xml.in.h:160 +#: ../comps-f11.xml.in.h:165 msgid "Sometimes called text editors, these are programs that allow you to create and edit text files. This includes Emacs and Vi." msgstr "Diese auch als Text-Editoren bezeichneten Programme erm??glichen das Anlegen und Bearbeiten von Text-Dateien. Dazu geh??ren Emacs und Vi." @@ -1133,7 +1133,7 @@ #: ../comps-f8.xml.in.h:138 #: ../comps-f9.xml.in.h:145 #: ../comps-f10.xml.in.h:154 -#: ../comps-f11.xml.in.h:161 +#: ../comps-f11.xml.in.h:166 #: ../comps-el4.xml.in.h:45 #: ../comps-el5.xml.in.h:45 msgid "Sound and Video" @@ -1143,7 +1143,7 @@ #: ../comps-f8.xml.in.h:139 #: ../comps-f9.xml.in.h:146 #: ../comps-f10.xml.in.h:155 -#: ../comps-f11.xml.in.h:162 +#: ../comps-f11.xml.in.h:167 msgid "Southern Ndebele Support" msgstr "Unterst??tzung f??r S??d-Ndebele" @@ -1151,7 +1151,7 @@ #: ../comps-f8.xml.in.h:140 #: ../comps-f9.xml.in.h:147 #: ../comps-f10.xml.in.h:156 -#: ../comps-f11.xml.in.h:163 +#: ../comps-f11.xml.in.h:168 msgid "Southern Sotho Support" msgstr "Unterst??tzung f??r S??d-Sotho" @@ -1159,7 +1159,7 @@ #: ../comps-f8.xml.in.h:141 #: ../comps-f9.xml.in.h:148 #: ../comps-f10.xml.in.h:157 -#: ../comps-f11.xml.in.h:164 +#: ../comps-f11.xml.in.h:169 msgid "Spanish Support" msgstr "Unterst??tzung f??r Spanisch" @@ -1167,7 +1167,7 @@ #: ../comps-f8.xml.in.h:142 #: ../comps-f9.xml.in.h:149 #: ../comps-f10.xml.in.h:159 -#: ../comps-f11.xml.in.h:166 +#: ../comps-f11.xml.in.h:172 #: ../comps-el4.xml.in.h:46 msgid "Support for developing programs in the Java programming language." msgstr "Unterst??tzung f??r die Entwicklung von Programmen in der Programmiersprache Java." @@ -1176,7 +1176,7 @@ #: ../comps-f8.xml.in.h:143 #: ../comps-f9.xml.in.h:150 #: ../comps-f10.xml.in.h:160 -#: ../comps-f11.xml.in.h:167 +#: ../comps-f11.xml.in.h:174 #: ../comps-el4.xml.in.h:47 msgid "Support for running programs written in the Java programming language." msgstr "Unterst??tzung f??r die Ausf??hrung von in Java geschriebenen Programmen." @@ -1185,7 +1185,7 @@ #: ../comps-f8.xml.in.h:144 #: ../comps-f9.xml.in.h:151 #: ../comps-f10.xml.in.h:161 -#: ../comps-f11.xml.in.h:168 +#: ../comps-f11.xml.in.h:175 msgid "Swati Support" msgstr "Unterst??tzung f??r Swati" @@ -1193,7 +1193,7 @@ #: ../comps-f8.xml.in.h:145 #: ../comps-f9.xml.in.h:152 #: ../comps-f10.xml.in.h:162 -#: ../comps-f11.xml.in.h:169 +#: ../comps-f11.xml.in.h:176 msgid "Swedish Support" msgstr "Unterst??tzung f??r Schwedisch" @@ -1201,7 +1201,7 @@ #: ../comps-f8.xml.in.h:146 #: ../comps-f9.xml.in.h:153 #: ../comps-f10.xml.in.h:163 -#: ../comps-f11.xml.in.h:170 +#: ../comps-f11.xml.in.h:177 #: ../comps-el4.xml.in.h:48 #: ../comps-el5.xml.in.h:46 msgid "System Tools" @@ -1211,7 +1211,7 @@ #: ../comps-f8.xml.in.h:147 #: ../comps-f9.xml.in.h:154 #: ../comps-f10.xml.in.h:164 -#: ../comps-f11.xml.in.h:171 +#: ../comps-f11.xml.in.h:178 msgid "Tagalog Support" msgstr "Unterst??tzung f??r Tagalog" @@ -1219,7 +1219,7 @@ #: ../comps-f8.xml.in.h:148 #: ../comps-f9.xml.in.h:155 #: ../comps-f10.xml.in.h:166 -#: ../comps-f11.xml.in.h:173 +#: ../comps-f11.xml.in.h:180 msgid "Tamil Support" msgstr "Unterst??tzung f??r Tamil" @@ -1227,7 +1227,7 @@ #: ../comps-f8.xml.in.h:149 #: ../comps-f9.xml.in.h:156 #: ../comps-f10.xml.in.h:167 -#: ../comps-f11.xml.in.h:174 +#: ../comps-f11.xml.in.h:181 msgid "Telugu Support" msgstr "Unterst??tzung f??r Telugu" @@ -1235,7 +1235,7 @@ #: ../comps-f8.xml.in.h:150 #: ../comps-f9.xml.in.h:157 #: ../comps-f10.xml.in.h:168 -#: ../comps-f11.xml.in.h:175 +#: ../comps-f11.xml.in.h:182 #: ../comps-el4.xml.in.h:49 #: ../comps-el5.xml.in.h:47 msgid "Text-based Internet" @@ -1245,7 +1245,7 @@ #: ../comps-f8.xml.in.h:151 #: ../comps-f9.xml.in.h:158 #: ../comps-f10.xml.in.h:169 -#: ../comps-f11.xml.in.h:176 +#: ../comps-f11.xml.in.h:183 msgid "Thai Support" msgstr "Unterst??tzung f??r Thai" @@ -1257,7 +1257,7 @@ #: ../comps-f8.xml.in.h:152 #: ../comps-f9.xml.in.h:159 #: ../comps-f10.xml.in.h:170 -#: ../comps-f11.xml.in.h:177 +#: ../comps-f11.xml.in.h:184 #: ../comps-el4.xml.in.h:51 #: ../comps-el5.xml.in.h:49 msgid "The applications include office suites, PDF viewers, and more." @@ -1267,7 +1267,7 @@ #: ../comps-f8.xml.in.h:153 #: ../comps-f9.xml.in.h:160 #: ../comps-f10.xml.in.h:171 -#: ../comps-f11.xml.in.h:178 +#: ../comps-f11.xml.in.h:185 msgid "The packages in this group are core libraries needed to develop applications." msgstr "Bei den Paketen dieser Gruppe handelt es sich um grundlegende Bibliotheken f??r die Entwicklung von Anwendungen." @@ -1275,7 +1275,7 @@ #: ../comps-f8.xml.in.h:154 #: ../comps-f9.xml.in.h:161 #: ../comps-f10.xml.in.h:172 -#: ../comps-f11.xml.in.h:179 +#: ../comps-f11.xml.in.h:186 #: ../comps-el4.xml.in.h:52 #: ../comps-el5.xml.in.h:50 msgid "These packages allow you to configure an IMAP or SMTP mail server." @@ -1285,7 +1285,7 @@ #: ../comps-f8.xml.in.h:155 #: ../comps-f9.xml.in.h:162 #: ../comps-f10.xml.in.h:173 -#: ../comps-f11.xml.in.h:180 +#: ../comps-f11.xml.in.h:187 msgid "These packages allow you to develop applications for the X Window System." msgstr "Mit diesen Paketen k??nnen Sie Anwendungen f??r das X-Window-System entwickeln." @@ -1293,7 +1293,7 @@ #: ../comps-f8.xml.in.h:156 #: ../comps-f9.xml.in.h:163 #: ../comps-f10.xml.in.h:174 -#: ../comps-f11.xml.in.h:181 +#: ../comps-f11.xml.in.h:188 #: ../comps-el4.xml.in.h:53 #: ../comps-el5.xml.in.h:51 msgid "These packages are helpful when developing web applications or web pages." @@ -1303,7 +1303,7 @@ #: ../comps-f8.xml.in.h:157 #: ../comps-f9.xml.in.h:164 #: ../comps-f10.xml.in.h:175 -#: ../comps-f11.xml.in.h:182 +#: ../comps-f11.xml.in.h:189 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS." msgstr "Diese Pakete enthalten netzwerkbasierte Server wie DHCP, Kerberos und NIS." @@ -1311,7 +1311,7 @@ #: ../comps-f8.xml.in.h:158 #: ../comps-f9.xml.in.h:165 #: ../comps-f10.xml.in.h:176 -#: ../comps-f11.xml.in.h:183 +#: ../comps-f11.xml.in.h:190 msgid "These packages include servers for old network protocols such as rsh and telnet." msgstr "Diese Pakete enthalten Server f??r alte Netzwerkprotokolle wie rsh und telnet." @@ -1319,7 +1319,7 @@ #: ../comps-f8.xml.in.h:159 #: ../comps-f9.xml.in.h:166 #: ../comps-f10.xml.in.h:177 -#: ../comps-f11.xml.in.h:184 +#: ../comps-f11.xml.in.h:191 msgid "These packages provide a virtualization environment." msgstr "Diese Pakete liefern eine Virtualisierungsumgebung." @@ -1327,7 +1327,7 @@ #: ../comps-f8.xml.in.h:160 #: ../comps-f9.xml.in.h:167 #: ../comps-f10.xml.in.h:178 -#: ../comps-f11.xml.in.h:185 +#: ../comps-f11.xml.in.h:192 msgid "These packages provide compatibility with previous releases." msgstr "Diese Pakete liefern Kompatibilit??t zu fr??heren Versionen." @@ -1335,7 +1335,7 @@ #: ../comps-f8.xml.in.h:161 #: ../comps-f9.xml.in.h:168 #: ../comps-f10.xml.in.h:179 -#: ../comps-f11.xml.in.h:186 +#: ../comps-f11.xml.in.h:193 msgid "These packages provide support for various locales including fonts and input methods." msgstr "Diese Pakete stellen Unterst??tzung f??r verschiedene Schriftarten und Eingabemethoden bereit." @@ -1343,7 +1343,7 @@ #: ../comps-f8.xml.in.h:162 #: ../comps-f9.xml.in.h:169 #: ../comps-f10.xml.in.h:180 -#: ../comps-f11.xml.in.h:187 +#: ../comps-f11.xml.in.h:194 msgid "These tools allow you to create documents in the DocBook format and convert them into HTML, PDF, Postscript, and text." msgstr "Mit diesen Programmen k??nnen Sie Dokumentationen im DocBook-Format anlegen und diese in HTML, PDF, Postscript und Text konvertieren." @@ -1351,7 +1351,7 @@ #: ../comps-f8.xml.in.h:163 #: ../comps-f9.xml.in.h:170 #: ../comps-f10.xml.in.h:181 -#: ../comps-f11.xml.in.h:188 +#: ../comps-f11.xml.in.h:195 #: ../comps-el4.xml.in.h:55 #: ../comps-el5.xml.in.h:53 msgid "These tools allow you to run a Web server on the system." @@ -1361,7 +1361,7 @@ #: ../comps-f8.xml.in.h:164 #: ../comps-f9.xml.in.h:171 #: ../comps-f10.xml.in.h:182 -#: ../comps-f11.xml.in.h:189 +#: ../comps-f11.xml.in.h:196 #: ../comps-el4.xml.in.h:56 #: ../comps-el5.xml.in.h:54 msgid "These tools allow you to run an FTP server on the system." @@ -1371,7 +1371,7 @@ #: ../comps-f8.xml.in.h:165 #: ../comps-f9.xml.in.h:172 #: ../comps-f10.xml.in.h:183 -#: ../comps-f11.xml.in.h:190 +#: ../comps-f11.xml.in.h:197 #: ../comps-el4.xml.in.h:57 #: ../comps-el5.xml.in.h:55 msgid "These tools include core development tools such as automake, gcc, perl, python, and debuggers." @@ -1381,7 +1381,7 @@ #: ../comps-f8.xml.in.h:166 #: ../comps-f9.xml.in.h:173 #: ../comps-f10.xml.in.h:184 -#: ../comps-f11.xml.in.h:191 +#: ../comps-f11.xml.in.h:198 #: ../comps-el4.xml.in.h:58 #: ../comps-el5.xml.in.h:56 msgid "This group allows you to configure the system as a news server." @@ -1391,7 +1391,7 @@ #: ../comps-f8.xml.in.h:167 #: ../comps-f9.xml.in.h:174 #: ../comps-f10.xml.in.h:185 -#: ../comps-f11.xml.in.h:192 +#: ../comps-f11.xml.in.h:199 msgid "This group contains all of Red Hat's custom server configuration tools." msgstr "Diese Gruppe enth??lt alle Programme von Red Hat f??r die Server-Konfiguration." @@ -1399,7 +1399,7 @@ #: ../comps-f8.xml.in.h:168 #: ../comps-f9.xml.in.h:175 #: ../comps-f10.xml.in.h:186 -#: ../comps-f11.xml.in.h:193 +#: ../comps-f11.xml.in.h:200 msgid "This group includes a minimal set of packages. Useful for creating small router/firewall boxes, for example." msgstr "Diese Gruppe enth??lt eine minimale Paketauswahl. Dies ist zum Beispiel n??tzlich zum Aufbau kleiner Router-/Firewall-Rechner." @@ -1407,7 +1407,7 @@ #: ../comps-f8.xml.in.h:169 #: ../comps-f9.xml.in.h:176 #: ../comps-f10.xml.in.h:187 -#: ../comps-f11.xml.in.h:194 +#: ../comps-f11.xml.in.h:201 #: ../comps-el4.xml.in.h:59 #: ../comps-el5.xml.in.h:57 msgid "This group includes graphical email, Web, and chat clients." @@ -1417,7 +1417,7 @@ #: ../comps-f8.xml.in.h:170 #: ../comps-f9.xml.in.h:177 #: ../comps-f10.xml.in.h:188 -#: ../comps-f11.xml.in.h:195 +#: ../comps-f11.xml.in.h:202 #: ../comps-el4.xml.in.h:60 #: ../comps-el5.xml.in.h:58 msgid "This group includes packages for performing mathematical and scientific computations and plotting, as well as unit conversion." @@ -1427,7 +1427,7 @@ #: ../comps-f8.xml.in.h:171 #: ../comps-f9.xml.in.h:178 #: ../comps-f10.xml.in.h:189 -#: ../comps-f11.xml.in.h:196 +#: ../comps-f11.xml.in.h:203 #: ../comps-el4.xml.in.h:61 #: ../comps-el5.xml.in.h:59 msgid "This group includes packages to help you manipulate and scan images." @@ -1437,7 +1437,7 @@ #: ../comps-f8.xml.in.h:172 #: ../comps-f9.xml.in.h:179 #: ../comps-f10.xml.in.h:190 -#: ../comps-f11.xml.in.h:197 +#: ../comps-f11.xml.in.h:204 #: ../comps-el4.xml.in.h:62 #: ../comps-el5.xml.in.h:60 msgid "This group includes text-based email, Web, and chat clients. These applications do not require the X Window System." @@ -1447,7 +1447,7 @@ #: ../comps-f8.xml.in.h:173 #: ../comps-f9.xml.in.h:180 #: ../comps-f10.xml.in.h:191 -#: ../comps-f11.xml.in.h:198 +#: ../comps-f11.xml.in.h:205 #: ../comps-el4.xml.in.h:63 #: ../comps-el5.xml.in.h:61 msgid "This group is a collection of graphical administration tools for the system, such as for managing user accounts and configuring system hardware." @@ -1457,7 +1457,7 @@ #: ../comps-f8.xml.in.h:174 #: ../comps-f9.xml.in.h:181 #: ../comps-f10.xml.in.h:192 -#: ../comps-f11.xml.in.h:199 +#: ../comps-f11.xml.in.h:206 #: ../comps-el4.xml.in.h:66 #: ../comps-el5.xml.in.h:64 msgid "This group is a collection of tools and resources of Armenian environments." @@ -1467,7 +1467,7 @@ #: ../comps-f8.xml.in.h:175 #: ../comps-f9.xml.in.h:182 #: ../comps-f10.xml.in.h:193 -#: ../comps-f11.xml.in.h:200 +#: ../comps-f11.xml.in.h:207 #: ../comps-el4.xml.in.h:69 #: ../comps-el5.xml.in.h:68 msgid "This group is a collection of tools for various hardware specific utilities." @@ -1477,7 +1477,7 @@ #: ../comps-f8.xml.in.h:176 #: ../comps-f9.xml.in.h:183 #: ../comps-f10.xml.in.h:194 -#: ../comps-f11.xml.in.h:202 +#: ../comps-f11.xml.in.h:209 #: ../comps-el4.xml.in.h:70 #: ../comps-el5.xml.in.h:69 msgid "This group is a collection of various tools for the system, such as the client for connecting to SMB shares and tools to monitor network traffic." @@ -1487,7 +1487,7 @@ #: ../comps-f8.xml.in.h:177 #: ../comps-f9.xml.in.h:184 #: ../comps-f10.xml.in.h:195 -#: ../comps-f11.xml.in.h:203 +#: ../comps-f11.xml.in.h:210 msgid "This package group allows you to run a DNS name server (BIND) on the system." msgstr "Mit dieser Paketgruppe k??nnen Sie einen DNS-Nameserver (BIND) auf dem System betreiben." @@ -1495,7 +1495,7 @@ #: ../comps-f8.xml.in.h:178 #: ../comps-f9.xml.in.h:185 #: ../comps-f10.xml.in.h:196 -#: ../comps-f11.xml.in.h:204 +#: ../comps-f11.xml.in.h:211 msgid "This package group allows you to share files between Linux and MS Windows(tm) systems." msgstr "Mit dieser Paketgruppe k??nnen Sie Dateien in Linux und MS Windows(tm) gemeinsam nutzen." @@ -1503,7 +1503,7 @@ #: ../comps-f8.xml.in.h:179 #: ../comps-f9.xml.in.h:186 #: ../comps-f10.xml.in.h:197 -#: ../comps-f11.xml.in.h:205 +#: ../comps-f11.xml.in.h:212 msgid "This package group contains packages useful for use with MySQL." msgstr "Diese Paketgruppe enth??lt Pakete, die zur Verwendung mit MySQL n??tzlich sind." @@ -1511,7 +1511,7 @@ #: ../comps-f8.xml.in.h:180 #: ../comps-f9.xml.in.h:187 #: ../comps-f10.xml.in.h:198 -#: ../comps-f11.xml.in.h:206 +#: ../comps-f11.xml.in.h:213 msgid "This package group includes packages useful for use with Postgresql." msgstr "Diese Paketgruppe umfasst Pakete, die zur Verwendung mit Postgresql n??tzlich sind." @@ -1519,7 +1519,7 @@ #: ../comps-f8.xml.in.h:181 #: ../comps-f9.xml.in.h:188 #: ../comps-f10.xml.in.h:199 -#: ../comps-f11.xml.in.h:207 +#: ../comps-f11.xml.in.h:214 msgid "Tibetan Support" msgstr "Unterst??tzung f??r Tibetisch" @@ -1527,7 +1527,7 @@ #: ../comps-f8.xml.in.h:182 #: ../comps-f9.xml.in.h:189 #: ../comps-f10.xml.in.h:200 -#: ../comps-f11.xml.in.h:208 +#: ../comps-f11.xml.in.h:215 msgid "Tonga Support" msgstr "Unterst??tzung f??r Tongaisch" @@ -1535,7 +1535,7 @@ #: ../comps-f8.xml.in.h:183 #: ../comps-f9.xml.in.h:190 #: ../comps-f10.xml.in.h:201 -#: ../comps-f11.xml.in.h:209 +#: ../comps-f11.xml.in.h:216 #: ../comps-el4.xml.in.h:71 #: ../comps-el5.xml.in.h:70 msgid "Tools and Utilities needed by a Fedora Packager" @@ -1545,7 +1545,7 @@ #: ../comps-f8.xml.in.h:184 #: ../comps-f9.xml.in.h:191 #: ../comps-f10.xml.in.h:202 -#: ../comps-f11.xml.in.h:210 +#: ../comps-f11.xml.in.h:217 msgid "Tsonga Support" msgstr "Unterst??tzung f??r Tsonga" @@ -1553,7 +1553,7 @@ #: ../comps-f8.xml.in.h:185 #: ../comps-f9.xml.in.h:192 #: ../comps-f10.xml.in.h:203 -#: ../comps-f11.xml.in.h:211 +#: ../comps-f11.xml.in.h:218 msgid "Tswana Support" msgstr "Unterst??tzung f??r Tswana" @@ -1561,7 +1561,7 @@ #: ../comps-f8.xml.in.h:186 #: ../comps-f9.xml.in.h:193 #: ../comps-f10.xml.in.h:204 -#: ../comps-f11.xml.in.h:212 +#: ../comps-f11.xml.in.h:219 msgid "Turkish Support" msgstr "Unterst??tzung f??r T??rkisch" @@ -1569,7 +1569,7 @@ #: ../comps-f8.xml.in.h:187 #: ../comps-f9.xml.in.h:194 #: ../comps-f10.xml.in.h:205 -#: ../comps-f11.xml.in.h:214 +#: ../comps-f11.xml.in.h:221 msgid "Ukrainian Support" msgstr "Unterst??tzung f??r Ukrainisch" @@ -1577,7 +1577,7 @@ #: ../comps-f8.xml.in.h:188 #: ../comps-f9.xml.in.h:195 #: ../comps-f10.xml.in.h:206 -#: ../comps-f11.xml.in.h:216 +#: ../comps-f11.xml.in.h:223 msgid "Urdu Support" msgstr "Unterst??tzung f??r Urdu" @@ -1585,7 +1585,7 @@ #: ../comps-f8.xml.in.h:189 #: ../comps-f9.xml.in.h:196 #: ../comps-f10.xml.in.h:208 -#: ../comps-f11.xml.in.h:218 +#: ../comps-f11.xml.in.h:225 #: ../comps-el4.xml.in.h:72 #: ../comps-el5.xml.in.h:71 msgid "Various core pieces of the system." @@ -1595,7 +1595,7 @@ #: ../comps-f8.xml.in.h:190 #: ../comps-f9.xml.in.h:197 #: ../comps-f10.xml.in.h:209 -#: ../comps-f11.xml.in.h:219 +#: ../comps-f11.xml.in.h:226 #: ../comps-el5.xml.in.h:72 msgid "Various ways to relax and spend your free time." msgstr "Verschiedene M??glichkeiten zur Entspannung und zum Zeitvertreib." @@ -1604,7 +1604,7 @@ #: ../comps-f8.xml.in.h:191 #: ../comps-f9.xml.in.h:198 #: ../comps-f10.xml.in.h:210 -#: ../comps-f11.xml.in.h:220 +#: ../comps-f11.xml.in.h:227 msgid "Venda Support" msgstr "Unterst??tzung f??r Venda" @@ -1612,7 +1612,7 @@ #: ../comps-f8.xml.in.h:192 #: ../comps-f9.xml.in.h:199 #: ../comps-f10.xml.in.h:211 -#: ../comps-f11.xml.in.h:221 +#: ../comps-f11.xml.in.h:228 msgid "Vietnamese Support" msgstr "Unterst??tzung f??r Vietnamesisch" @@ -1620,7 +1620,7 @@ #: ../comps-f8.xml.in.h:193 #: ../comps-f9.xml.in.h:200 #: ../comps-f10.xml.in.h:212 -#: ../comps-f11.xml.in.h:222 +#: ../comps-f11.xml.in.h:229 msgid "Virtualization" msgstr "Virtualisierung" @@ -1628,7 +1628,7 @@ #: ../comps-f8.xml.in.h:194 #: ../comps-f9.xml.in.h:202 #: ../comps-f10.xml.in.h:214 -#: ../comps-f11.xml.in.h:224 +#: ../comps-f11.xml.in.h:231 #: ../comps-el4.xml.in.h:73 #: ../comps-el5.xml.in.h:73 msgid "Web Development" @@ -1638,7 +1638,7 @@ #: ../comps-f8.xml.in.h:195 #: ../comps-f9.xml.in.h:203 #: ../comps-f10.xml.in.h:215 -#: ../comps-f11.xml.in.h:225 +#: ../comps-f11.xml.in.h:232 #: ../comps-el4.xml.in.h:74 #: ../comps-el5.xml.in.h:74 msgid "Web Server" @@ -1648,7 +1648,7 @@ #: ../comps-f8.xml.in.h:196 #: ../comps-f9.xml.in.h:204 #: ../comps-f10.xml.in.h:216 -#: ../comps-f11.xml.in.h:226 +#: ../comps-f11.xml.in.h:233 msgid "Welsh Support" msgstr "Unterst??tzung f??r Walisisch" @@ -1656,7 +1656,7 @@ #: ../comps-f8.xml.in.h:197 #: ../comps-f9.xml.in.h:205 #: ../comps-f10.xml.in.h:217 -#: ../comps-f11.xml.in.h:227 +#: ../comps-f11.xml.in.h:234 #: ../comps-el4.xml.in.h:75 #: ../comps-el5.xml.in.h:75 msgid "Window Managers" @@ -1666,7 +1666,7 @@ #: ../comps-f8.xml.in.h:198 #: ../comps-f9.xml.in.h:206 #: ../comps-f10.xml.in.h:218 -#: ../comps-f11.xml.in.h:228 +#: ../comps-f11.xml.in.h:235 msgid "Windows File Server" msgstr "Windows-Dateiserver" @@ -1674,7 +1674,7 @@ #: ../comps-f8.xml.in.h:199 #: ../comps-f9.xml.in.h:207 #: ../comps-f10.xml.in.h:219 -#: ../comps-f11.xml.in.h:229 +#: ../comps-f11.xml.in.h:236 msgid "X Software Development" msgstr "X-Softwareentwicklung" @@ -1682,7 +1682,7 @@ #: ../comps-f8.xml.in.h:200 #: ../comps-f9.xml.in.h:208 #: ../comps-f10.xml.in.h:220 -#: ../comps-f11.xml.in.h:230 +#: ../comps-f11.xml.in.h:237 #: ../comps-el4.xml.in.h:76 #: ../comps-el5.xml.in.h:76 msgid "X Window System" @@ -1692,7 +1692,7 @@ #: ../comps-f8.xml.in.h:201 #: ../comps-f9.xml.in.h:209 #: ../comps-f10.xml.in.h:221 -#: ../comps-f11.xml.in.h:231 +#: ../comps-f11.xml.in.h:238 msgid "XFCE" msgstr "XFCE" @@ -1700,7 +1700,7 @@ #: ../comps-f8.xml.in.h:202 #: ../comps-f9.xml.in.h:210 #: ../comps-f10.xml.in.h:222 -#: ../comps-f11.xml.in.h:232 +#: ../comps-f11.xml.in.h:239 msgid "XFCE Software Development" msgstr "XFCE-Softwareentwicklung" @@ -1708,7 +1708,7 @@ #: ../comps-f8.xml.in.h:203 #: ../comps-f9.xml.in.h:211 #: ../comps-f10.xml.in.h:223 -#: ../comps-f11.xml.in.h:233 +#: ../comps-f11.xml.in.h:240 msgid "Xhosa Support" msgstr "Unterst??tzung f??r Xhosa" @@ -1716,7 +1716,7 @@ #: ../comps-f8.xml.in.h:204 #: ../comps-f9.xml.in.h:212 #: ../comps-f10.xml.in.h:224 -#: ../comps-f11.xml.in.h:234 +#: ../comps-f11.xml.in.h:241 msgid "Zulu Support" msgstr "Unterst??tzung f??r Zulu (S??dafrika)" @@ -1730,99 +1730,99 @@ #: ../comps-f8.xml.in.h:48 #: ../comps-f9.xml.in.h:49 #: ../comps-f10.xml.in.h:50 -#: ../comps-f11.xml.in.h:51 +#: ../comps-f11.xml.in.h:53 msgid "Fedora Eclipse" msgstr "Fedora Eclipse" #: ../comps-f8.xml.in.h:52 #: ../comps-f9.xml.in.h:53 #: ../comps-f10.xml.in.h:54 -#: ../comps-f11.xml.in.h:56 +#: ../comps-f11.xml.in.h:58 msgid "Fonts" msgstr "Schriftarten" #: ../comps-f8.xml.in.h:53 #: ../comps-f9.xml.in.h:54 #: ../comps-f10.xml.in.h:55 -#: ../comps-f11.xml.in.h:57 +#: ../comps-f11.xml.in.h:59 msgid "Fonts packages for rendering text on the desktop." msgstr "Schriftarten-Pakete zum Rendern von Text auf dem Desktop." #: ../comps-f8.xml.in.h:79 #: ../comps-f9.xml.in.h:80 #: ../comps-f10.xml.in.h:84 -#: ../comps-f11.xml.in.h:88 +#: ../comps-f11.xml.in.h:90 msgid "Integrated Development Environments based on Eclipse." msgstr "Die auf Eclipse basierende integrierte Entwicklungsumgebung." #: ../comps-f8.xml.in.h:95 #: ../comps-f9.xml.in.h:98 #: ../comps-f10.xml.in.h:105 -#: ../comps-f11.xml.in.h:110 +#: ../comps-f11.xml.in.h:112 msgid "Legacy Fonts" msgstr "??ltere Schriftarten" #: ../comps-f8.xml.in.h:100 #: ../comps-f9.xml.in.h:103 #: ../comps-f10.xml.in.h:110 -#: ../comps-f11.xml.in.h:115 +#: ../comps-f11.xml.in.h:117 msgid "Low Saxon Support" msgstr "Unterst??tzung f??r Nieders??chsisch" #: ../comps-f8.xml.in.h:106 #: ../comps-f9.xml.in.h:110 #: ../comps-f10.xml.in.h:118 -#: ../comps-f11.xml.in.h:124 +#: ../comps-f11.xml.in.h:127 msgid "Mongolian Support" msgstr "Unterst??tzung f??r Mongolisch" #: ../comps-f8.xml.in.h:108 #: ../comps-f9.xml.in.h:112 #: ../comps-f10.xml.in.h:121 -#: ../comps-f11.xml.in.h:127 +#: ../comps-f11.xml.in.h:130 msgid "Nepali Support" msgstr "Unterst??tzung f??r Nepalisch" #: ../comps-f8.xml.in.h:114 #: ../comps-f9.xml.in.h:119 #: ../comps-f10.xml.in.h:128 -#: ../comps-f11.xml.in.h:135 +#: ../comps-f11.xml.in.h:139 msgid "Older bitmap and vector fonts packages" msgstr "??ltere Pakete mit Bitmap- und Vektor-Schriftarten" #: ../comps-f9.xml.in.h:44 #: ../comps-f10.xml.in.h:45 -#: ../comps-f11.xml.in.h:46 +#: ../comps-f11.xml.in.h:48 msgid "Esperanto Support" msgstr "Unterst??tzung f??r Esperanto" #: ../comps-f9.xml.in.h:91 #: ../comps-f10.xml.in.h:96 -#: ../comps-f11.xml.in.h:100 +#: ../comps-f11.xml.in.h:102 msgid "Kashubian Support" msgstr "Unterst??tzung f??r Kashubisch" #: ../comps-f9.xml.in.h:94 #: ../comps-f10.xml.in.h:100 -#: ../comps-f11.xml.in.h:105 +#: ../comps-f11.xml.in.h:107 msgid "Kurdish Support" msgstr "Unterst??tzung f??r Kurdisch" #: ../comps-f9.xml.in.h:104 #: ../comps-f10.xml.in.h:111 -#: ../comps-f11.xml.in.h:116 +#: ../comps-f11.xml.in.h:118 msgid "Macedonian Support" msgstr "Unterst??tzung f??r Mazedonisch" #: ../comps-f9.xml.in.h:115 #: ../comps-f10.xml.in.h:124 -#: ../comps-f11.xml.in.h:130 +#: ../comps-f11.xml.in.h:133 msgid "Northern Sami Support" msgstr "Unterst??tzung f??r Nord-Sami" #: ../comps-f9.xml.in.h:131 #: ../comps-f10.xml.in.h:140 -#: ../comps-f11.xml.in.h:147 +#: ../comps-f11.xml.in.h:152 msgid "SUGAR Desktop Environment" msgstr "SUGAR Desktopumgebung" @@ -1832,7 +1832,7 @@ #: ../comps-f9.xml.in.h:201 #: ../comps-f10.xml.in.h:213 -#: ../comps-f11.xml.in.h:223 +#: ../comps-f11.xml.in.h:230 msgid "Walloon Support" msgstr "Unterst??tzung f??r Wallonisch" @@ -1842,62 +1842,62 @@ msgstr "Eine Software-Spielweise zum Lernen des Lernens." #: ../comps-f10.xml.in.h:71 -#: ../comps-f11.xml.in.h:75 +#: ../comps-f11.xml.in.h:77 msgid "Haskell Development" msgstr "Haskell-Entwicklung" #: ../comps-f10.xml.in.h:77 -#: ../comps-f11.xml.in.h:81 +#: ../comps-f11.xml.in.h:83 msgid "Input Methods" msgstr "Eingabemethoden" #: ../comps-f10.xml.in.h:78 -#: ../comps-f11.xml.in.h:82 +#: ../comps-f11.xml.in.h:84 msgid "Input method packages for the input of international text." msgstr "Eingabemethoden-Paket f??r die Eingabe von internationalem Text." #: ../comps-f10.xml.in.h:95 -#: ../comps-f11.xml.in.h:99 +#: ../comps-f11.xml.in.h:101 msgid "Kashmiri Support" msgstr "Unterst??tzung f??r Kashmiri" #: ../comps-f10.xml.in.h:98 -#: ../comps-f11.xml.in.h:103 +#: ../comps-f11.xml.in.h:105 msgid "Konkani Support" msgstr "Unterst??tzung f??r Konkani" #: ../comps-f10.xml.in.h:101 -#: ../comps-f11.xml.in.h:106 +#: ../comps-f11.xml.in.h:108 msgid "LXDE" msgstr "LXDE" #: ../comps-f10.xml.in.h:113 -#: ../comps-f11.xml.in.h:118 +#: ../comps-f11.xml.in.h:120 msgid "Maithili Support" msgstr "Unterst??tzung f??r Maithili" #: ../comps-f10.xml.in.h:120 -#: ../comps-f11.xml.in.h:126 +#: ../comps-f11.xml.in.h:129 msgid "Myanmar (Burmese) Support" msgstr "Unterst??tzung f??r Burmesisch (Myanmar)" #: ../comps-f10.xml.in.h:146 -#: ../comps-f11.xml.in.h:153 +#: ../comps-f11.xml.in.h:158 msgid "Sindhi Support" msgstr "Unterst??tzung f??r Sindhi" #: ../comps-f10.xml.in.h:158 -#: ../comps-f11.xml.in.h:165 +#: ../comps-f11.xml.in.h:171 msgid "Support for developing programs in the Haskell programming language." msgstr "Unterst??tzung f??r die Entwicklung von Programmen in der Programmiersprache Haskell." #: ../comps-f10.xml.in.h:165 -#: ../comps-f11.xml.in.h:172 +#: ../comps-f11.xml.in.h:179 msgid "Tajik Support" msgstr "Unterst??tzung f??r Tajik" #: ../comps-f10.xml.in.h:207 -#: ../comps-f11.xml.in.h:217 +#: ../comps-f11.xml.in.h:224 msgid "Uzbek Support" msgstr "Unterst??tzung f??r Usbekisch" @@ -1905,39 +1905,67 @@ msgid "Amazigh Support" msgstr "Unterst??tzung f??r Berber" -#: ../comps-f11.xml.in.h:55 +#: ../comps-f11.xml.in.h:34 +msgid "Design and Simulation tools for hardware engineers" +msgstr "Design and Simulation tools for hardware engineers" + +#: ../comps-f11.xml.in.h:45 +msgid "Electronic Lab" +msgstr "Electronic Lab" + +#: ../comps-f11.xml.in.h:57 msgid "Font design and packaging" msgstr "Schriftarten-Design und Paketierung" -#: ../comps-f11.xml.in.h:59 +#: ../comps-f11.xml.in.h:61 msgid "Frisian Support" msgstr "Unterst??tzung f??r Friesisch" -#: ../comps-f11.xml.in.h:60 +#: ../comps-f11.xml.in.h:62 msgid "Friulian Support" msgstr "Unterst??tzung f??r Furlanisch" -#: ../comps-f11.xml.in.h:102 +#: ../comps-f11.xml.in.h:104 msgid "Kinyarwanda Support" msgstr "Unterst??tzung f??r Kinyarwanda" -#: ../comps-f11.xml.in.h:119 +#: ../comps-f11.xml.in.h:121 msgid "Malagasy Support" msgstr "Unterst??tzung f??r Madagassisch" -#: ../comps-f11.xml.in.h:133 +#: ../comps-f11.xml.in.h:126 +msgid "MinGW cross-compiler" +msgstr "MinGW Cross-Compiler" + +#: ../comps-f11.xml.in.h:136 +msgid "OCaml" +msgstr "OCaml" + +#: ../comps-f11.xml.in.h:137 msgid "Occitan Support" msgstr "Unterst??tzung f??r Okzitanisch" -#: ../comps-f11.xml.in.h:201 +#: ../comps-f11.xml.in.h:140 +msgid "Online Help and Documentation" +msgstr "Online-Hilfe und Dokumentation" + +#: ../comps-f11.xml.in.h:170 +msgid "Support for cross-compiling programs to 32 bit Windows targets, testing them, and building installers, all from within Fedora." +msgstr "Unterst??tzung f??r Cross-Compiling von Programmen f??r 32-bit-Windows-Ziele, f??r das Testen und das Bauen, alles in Fedora." + +#: ../comps-f11.xml.in.h:173 +msgid "Support for developing software using the Objective CAML programming language and libraries." +msgstr "Unterst??tzung f??r die Entwicklung von Programmen in der Programmiersprache Objective CAML und deren Bibliotheken." + +#: ../comps-f11.xml.in.h:208 msgid "This group is a collection of tools used in the design, modification, manipulation, and packaging of fonts." msgstr "Diese Gruppe umfasst eine Sammlung von Werkzeugen, die beim Erstellen, ??ndern, Manipulieren und Paketieren von Schriftarten gebraucht werden." -#: ../comps-f11.xml.in.h:213 +#: ../comps-f11.xml.in.h:220 msgid "Turkmen Support" msgstr "Unterst??tzung f??r Turkmenisch" -#: ../comps-f11.xml.in.h:215 +#: ../comps-f11.xml.in.h:222 msgid "Upper Sorbian Support" msgstr "Unterst??tzung f??r Sorbisch" From bjohnson at fedoraproject.org Sat Mar 7 16:12:26 2009 From: bjohnson at fedoraproject.org (Bernard Johnson) Date: Sat, 7 Mar 2009 16:12:26 +0000 (UTC) Subject: rpms/php-pear-Config/devel import.log, NONE, 1.1 php-pear-Config.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307161226.C486870116@cvs1.fedora.phx.redhat.com> Author: bjohnson Update of /cvs/pkgs/rpms/php-pear-Config/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13233/devel Modified Files: .cvsignore sources Added Files: import.log php-pear-Config.spec Log Message: import --- NEW FILE import.log --- php-pear-Config-1_10_11-2_fc10:HEAD:php-pear-Config-1.10.11-2.fc10.src.rpm:1236442274 --- NEW FILE php-pear-Config.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Config # # Note: the test suite for this package has two badly written tests that will # cause failures. These can be ignored. # Name: php-pear-Config Version: 1.10.11 Release: 2%{?dist} Summary: Configuration file manipulation for PHP Group: Development/Libraries License: PHP URL: http://pear.php.net/package/Config Source0: http://download.pear.php.net/package/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 Requires: php-pear(PEAR), php-pear(XML_Parser), php-pear(XML_Util) Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} %description The PHP Config package provides methods for configuration manipulation. * Creates configurations from scratch * Parses and outputs different formats (XML, PHP, INI, Apache...) * Edits existing configurations * Converts configurations to other formats * Allows manipulation of sections, comments, directives... * Parses configurations into a tree structure %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{name}.xml cd %{pear_name}-%{version} %build cd %{pear_name}-%{version} # no build required %install cd %{pear_name}-%{version} rm -rf $RPM_BUILD_ROOT docdir %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml # Move documentation mkdir -p docdir mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir # Clean up unnecessary files rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??* # Install XML package description mkdir -p $RPM_BUILD_ROOT%{pear_xmldir} install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir} %clean rm -rf $RPM_BUILD_ROOT %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/%{pear_name}/* %{pear_xmldir}/%{name}.xml %{pear_testdir}/%{pear_name} # package does not contain %%{pear_datadir}/%{pear_name} files #%{pear_datadir}/%{pear_name} %{pear_phpdir}/Config* %changelog * Wed Feb 25 2009 Bernard Johnson - 1.10.11-2 - add dependencies for php-pear(XML_Parser) and php-pear(XML_Util) - change from %%{pear_name}.xml to %%{name}.xml to avoid channel conflicts - changes %%files section from %%{pear_phpdir}/* to %%{pear_phpdir}/Config* - note regarding test suite failures added * Tue Feb 17 2009 Bernard Johnson - 1.10.11-1 - initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-Config/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:15:23 -0000 1.1 +++ .cvsignore 7 Mar 2009 16:11:53 -0000 1.2 @@ -0,0 +1 @@ +Config-1.10.11.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-Config/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:15:23 -0000 1.1 +++ sources 7 Mar 2009 16:11:54 -0000 1.2 @@ -0,0 +1 @@ +ec85ece7ddd28a0a139c0699481c0116 Config-1.10.11.tgz From bjohnson at fedoraproject.org Sat Mar 7 16:17:17 2009 From: bjohnson at fedoraproject.org (Bernard Johnson) Date: Sat, 7 Mar 2009 16:17:17 +0000 (UTC) Subject: rpms/php-pear-Config/F-10 import.log, NONE, 1.1 php-pear-Config.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307161717.8ACC370116@cvs1.fedora.phx.redhat.com> Author: bjohnson Update of /cvs/pkgs/rpms/php-pear-Config/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14303/F-10 Modified Files: .cvsignore sources Added Files: import.log php-pear-Config.spec Log Message: import --- NEW FILE import.log --- php-pear-Config-1_10_11-2_fc10:F-10:php-pear-Config-1.10.11-2.fc10.src.rpm:1236442473 --- NEW FILE php-pear-Config.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Config # # Note: the test suite for this package has two badly written tests that will # cause failures. These can be ignored. # Name: php-pear-Config Version: 1.10.11 Release: 2%{?dist} Summary: Configuration file manipulation for PHP Group: Development/Libraries License: PHP URL: http://pear.php.net/package/Config Source0: http://download.pear.php.net/package/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 Requires: php-pear(PEAR), php-pear(XML_Parser), php-pear(XML_Util) Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} %description The PHP Config package provides methods for configuration manipulation. * Creates configurations from scratch * Parses and outputs different formats (XML, PHP, INI, Apache...) * Edits existing configurations * Converts configurations to other formats * Allows manipulation of sections, comments, directives... * Parses configurations into a tree structure %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{name}.xml cd %{pear_name}-%{version} %build cd %{pear_name}-%{version} # no build required %install cd %{pear_name}-%{version} rm -rf $RPM_BUILD_ROOT docdir %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml # Move documentation mkdir -p docdir mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir # Clean up unnecessary files rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??* # Install XML package description mkdir -p $RPM_BUILD_ROOT%{pear_xmldir} install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir} %clean rm -rf $RPM_BUILD_ROOT %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/%{pear_name}/* %{pear_xmldir}/%{name}.xml %{pear_testdir}/%{pear_name} # package does not contain %%{pear_datadir}/%{pear_name} files #%{pear_datadir}/%{pear_name} %{pear_phpdir}/Config* %changelog * Wed Feb 25 2009 Bernard Johnson - 1.10.11-2 - add dependencies for php-pear(XML_Parser) and php-pear(XML_Util) - change from %%{pear_name}.xml to %%{name}.xml to avoid channel conflicts - changes %%files section from %%{pear_phpdir}/* to %%{pear_phpdir}/Config* - note regarding test suite failures added * Tue Feb 17 2009 Bernard Johnson - 1.10.11-1 - initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-Config/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2009 00:15:23 -0000 1.1 +++ .cvsignore 7 Mar 2009 16:16:46 -0000 1.2 @@ -0,0 +1 @@ +Config-1.10.11.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-Config/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2009 00:15:23 -0000 1.1 +++ sources 7 Mar 2009 16:16:46 -0000 1.2 @@ -0,0 +1 @@ +ec85ece7ddd28a0a139c0699481c0116 Config-1.10.11.tgz From toshio at fedoraproject.org Sat Mar 7 16:38:32 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Sat, 7 Mar 2009 16:38:32 +0000 (UTC) Subject: rpms/python-fedora/EL-5 .cvsignore, 1.17, 1.18 python-fedora.spec, 1.19, 1.20 sources, 1.18, 1.19 python-fedora-el5.patch, 1.1, NONE Message-ID: <20090307163832.DCA1C70116@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18647/EL-5 Modified Files: .cvsignore python-fedora.spec sources Removed Files: python-fedora-el5.patch Log Message: * Fri Mar 6 2009 Toshio Kuratomi - 0.3.10-1 - CSRF fixes and django authentication provider. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 9 Feb 2009 20:11:06 -0000 1.17 +++ .cvsignore 7 Mar 2009 16:38:01 -0000 1.18 @@ -1 +1 @@ -python-fedora-0.3.9.1.tar.gz +python-fedora-0.3.10.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/python-fedora.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- python-fedora.spec 10 Feb 2009 17:37:08 -0000 1.19 +++ python-fedora.spec 7 Mar 2009 16:38:02 -0000 1.20 @@ -1,15 +1,14 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.9.1 -Release: 2%{?dist} +Version: 0.3.10 +Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services Group: Development/Languages License: GPLv2 URL: https://fedorahosted.org/python-fedora/ Source0: https://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}.tar.gz -Patch0: python-fedora-el5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -39,19 +38,18 @@ %prep %setup -q -%patch0 -p0 %build paver build paver html %install -rm -rf $RPM_BUILD_ROOT -paver install --skip-build --root $RPM_BUILD_ROOT +rm -rf %{buildroot} +paver install --skip-build --root %{buildroot} mv build-doc/html doc/ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -60,11 +58,11 @@ %{python_sitelib}/* %changelog -* Mon Feb 10 2009 Toshio Kuratomi - 0.3.9.1-2 -- Another python-2.4 compatibility fix. +* Fri Mar 6 2009 Toshio Kuratomi - 0.3.10-1 +- CSRF fixes and django authentication provider. -* Mon Feb 9 2009 Toshio Kuratomi - 0.3.9.1-1 -- Fix for python-2.4 compatibility +* Thu Feb 26 2009 Fedora Release Engineering - 0.3.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Sun Feb 8 2009 Toshio Kuratomi - 0.3.9-1 - New upstream with important bugfixes. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 9 Feb 2009 20:11:07 -0000 1.18 +++ sources 7 Mar 2009 16:38:02 -0000 1.19 @@ -1 +1 @@ -8cc6c2cab28a5bf9dafa71f542d12483 python-fedora-0.3.9.1.tar.gz +7e20b69e07c3f1eab3e6a99e1d009f3b python-fedora-0.3.10.tar.gz --- python-fedora-el5.patch DELETED --- From toshio at fedoraproject.org Sat Mar 7 16:38:33 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Sat, 7 Mar 2009 16:38:33 +0000 (UTC) Subject: rpms/python-fedora/F-10 .cvsignore, 1.26, 1.27 python-fedora.spec, 1.29, 1.30 sources, 1.27, 1.28 Message-ID: <20090307163833.23CA070116@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18647/F-10 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Fri Mar 6 2009 Toshio Kuratomi - 0.3.10-1 - CSRF fixes and django authentication provider. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-10/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 9 Feb 2009 06:40:39 -0000 1.26 +++ .cvsignore 7 Mar 2009 16:38:02 -0000 1.27 @@ -1 +1 @@ -python-fedora-0.3.9.tar.gz +python-fedora-0.3.10.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-10/python-fedora.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- python-fedora.spec 9 Feb 2009 06:40:39 -0000 1.29 +++ python-fedora.spec 7 Mar 2009 16:38:02 -0000 1.30 @@ -1,7 +1,7 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.9 +Version: 0.3.10 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -44,12 +44,12 @@ paver html %install -rm -rf $RPM_BUILD_ROOT -paver install --skip-build --root $RPM_BUILD_ROOT +rm -rf %{buildroot} +paver install --skip-build --root %{buildroot} mv build-doc/html doc/ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -58,6 +58,12 @@ %{python_sitelib}/* %changelog +* Fri Mar 6 2009 Toshio Kuratomi - 0.3.10-1 +- CSRF fixes and django authentication provider. + +* Thu Feb 26 2009 Fedora Release Engineering - 0.3.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Feb 8 2009 Toshio Kuratomi - 0.3.9-1 - New upstream with important bugfixes. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-10/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 9 Feb 2009 06:40:39 -0000 1.27 +++ sources 7 Mar 2009 16:38:02 -0000 1.28 @@ -1 +1 @@ -c3d2e4b9f4515859998081a1812a282d python-fedora-0.3.9.tar.gz +7e20b69e07c3f1eab3e6a99e1d009f3b python-fedora-0.3.10.tar.gz From toshio at fedoraproject.org Sat Mar 7 16:38:33 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Sat, 7 Mar 2009 16:38:33 +0000 (UTC) Subject: rpms/python-fedora/F-9 .cvsignore, 1.23, 1.24 python-fedora.spec, 1.27, 1.28 sources, 1.25, 1.26 Message-ID: <20090307163833.AF65270116@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18647/F-9 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Fri Mar 6 2009 Toshio Kuratomi - 0.3.10-1 - CSRF fixes and django authentication provider. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 9 Feb 2009 06:40:39 -0000 1.23 +++ .cvsignore 7 Mar 2009 16:38:03 -0000 1.24 @@ -1 +1 @@ -python-fedora-0.3.9.tar.gz +python-fedora-0.3.10.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/python-fedora.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- python-fedora.spec 9 Feb 2009 06:40:39 -0000 1.27 +++ python-fedora.spec 7 Mar 2009 16:38:03 -0000 1.28 @@ -1,7 +1,7 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.9 +Version: 0.3.10 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -44,12 +44,12 @@ paver html %install -rm -rf $RPM_BUILD_ROOT -paver install --skip-build --root $RPM_BUILD_ROOT +rm -rf %{buildroot} +paver install --skip-build --root %{buildroot} mv build-doc/html doc/ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -58,6 +58,12 @@ %{python_sitelib}/* %changelog +* Fri Mar 6 2009 Toshio Kuratomi - 0.3.10-1 +- CSRF fixes and django authentication provider. + +* Thu Feb 26 2009 Fedora Release Engineering - 0.3.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Feb 8 2009 Toshio Kuratomi - 0.3.9-1 - New upstream with important bugfixes. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 9 Feb 2009 06:40:39 -0000 1.25 +++ sources 7 Mar 2009 16:38:03 -0000 1.26 @@ -1 +1 @@ -c3d2e4b9f4515859998081a1812a282d python-fedora-0.3.9.tar.gz +7e20b69e07c3f1eab3e6a99e1d009f3b python-fedora-0.3.10.tar.gz From bjohnson at fedoraproject.org Sat Mar 7 16:42:16 2009 From: bjohnson at fedoraproject.org (Bernard Johnson) Date: Sat, 7 Mar 2009 16:42:16 +0000 (UTC) Subject: rpms/php-pear-Config/F-10 php-pear-Config.spec,1.1,1.2 Message-ID: <20090307164216.BCC7070116@cvs1.fedora.phx.redhat.com> Author: bjohnson Update of /cvs/pkgs/rpms/php-pear-Config/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19686/F-10 Modified Files: php-pear-Config.spec Log Message: - reference to test suite bug - remove req: php-pear(PEAR) since it's required by other required pkgs - bz #486044 Index: php-pear-Config.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-Config/F-10/php-pear-Config.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-pear-Config.spec 7 Mar 2009 16:16:46 -0000 1.1 +++ php-pear-Config.spec 7 Mar 2009 16:41:46 -0000 1.2 @@ -4,6 +4,7 @@ # # Note: the test suite for this package has two badly written tests that will # cause failures. These can be ignored. +# http://pear.php.net/bugs/15964 # Name: php-pear-Config @@ -19,7 +20,7 @@ BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 -Requires: php-pear(PEAR), php-pear(XML_Parser), php-pear(XML_Util) +Requires: php-pear(XML_Parser), php-pear(XML_Util) Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} @@ -89,6 +90,11 @@ %changelog +* Sat Mar 07 2009 Bernard Johnson - 1.10.11-3 +- reference to test suite bug +- remove req: php-pear(PEAR) since it's required by other required pkgs +- bz #486044 + * Wed Feb 25 2009 Bernard Johnson - 1.10.11-2 - add dependencies for php-pear(XML_Parser) and php-pear(XML_Util) - change from %%{pear_name}.xml to %%{name}.xml to avoid channel conflicts From bjohnson at fedoraproject.org Sat Mar 7 16:42:16 2009 From: bjohnson at fedoraproject.org (Bernard Johnson) Date: Sat, 7 Mar 2009 16:42:16 +0000 (UTC) Subject: rpms/php-pear-Config/devel php-pear-Config.spec,1.1,1.2 Message-ID: <20090307164216.DE3F470116@cvs1.fedora.phx.redhat.com> Author: bjohnson Update of /cvs/pkgs/rpms/php-pear-Config/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19686/devel Modified Files: php-pear-Config.spec Log Message: - reference to test suite bug - remove req: php-pear(PEAR) since it's required by other required pkgs - bz #486044 Index: php-pear-Config.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-Config/devel/php-pear-Config.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-pear-Config.spec 7 Mar 2009 16:11:54 -0000 1.1 +++ php-pear-Config.spec 7 Mar 2009 16:41:46 -0000 1.2 @@ -4,6 +4,7 @@ # # Note: the test suite for this package has two badly written tests that will # cause failures. These can be ignored. +# http://pear.php.net/bugs/15964 # Name: php-pear-Config @@ -19,7 +20,7 @@ BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 -Requires: php-pear(PEAR), php-pear(XML_Parser), php-pear(XML_Util) +Requires: php-pear(XML_Parser), php-pear(XML_Util) Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} @@ -89,6 +90,11 @@ %changelog +* Sat Mar 07 2009 Bernard Johnson - 1.10.11-3 +- reference to test suite bug +- remove req: php-pear(PEAR) since it's required by other required pkgs +- bz #486044 + * Wed Feb 25 2009 Bernard Johnson - 1.10.11-2 - add dependencies for php-pear(XML_Parser) and php-pear(XML_Util) - change from %%{pear_name}.xml to %%{name}.xml to avoid channel conflicts From jkeating at fedoraproject.org Sat Mar 7 16:42:38 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Sat, 7 Mar 2009 16:42:38 +0000 (UTC) Subject: rpms/abrt/devel abrt.spec,1.1,1.2 Message-ID: <20090307164238.1AB8870116@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/abrt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19879 Modified Files: abrt.spec Log Message: * Sat Mar 07 2009 Jesse Keating - 0.0.1-13 - Bump for new rpm Index: abrt.spec =================================================================== RCS file: /cvs/pkgs/rpms/abrt/devel/abrt.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- abrt.spec 3 Mar 2009 21:09:07 -0000 1.1 +++ abrt.spec 7 Mar 2009 16:42:07 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 0.0.1 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/crash-catcher/ @@ -179,6 +179,9 @@ %{_libdir}/%{name}/libMailx.so* %changelog +* Sat Mar 07 2009 Jesse Keating - 0.0.1-13 +- Bump for new rpm + * Tue Mar 3 2009 Jiri Moskovcak 0.0.1-12 - initial fedora release - changed SOURCE url From bjohnson at fedoraproject.org Sat Mar 7 16:48:20 2009 From: bjohnson at fedoraproject.org (Bernard Johnson) Date: Sat, 7 Mar 2009 16:48:20 +0000 (UTC) Subject: rpms/php-pear-Config/F-10 php-pear-Config.spec,1.2,1.3 Message-ID: <20090307164820.961F070116@cvs1.fedora.phx.redhat.com> Author: bjohnson Update of /cvs/pkgs/rpms/php-pear-Config/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21285/F-10 Modified Files: php-pear-Config.spec Log Message: increment rev Index: php-pear-Config.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-Config/F-10/php-pear-Config.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-Config.spec 7 Mar 2009 16:41:46 -0000 1.2 +++ php-pear-Config.spec 7 Mar 2009 16:47:50 -0000 1.3 @@ -9,7 +9,7 @@ Name: php-pear-Config Version: 1.10.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Configuration file manipulation for PHP Group: Development/Libraries From bjohnson at fedoraproject.org Sat Mar 7 16:48:20 2009 From: bjohnson at fedoraproject.org (Bernard Johnson) Date: Sat, 7 Mar 2009 16:48:20 +0000 (UTC) Subject: rpms/php-pear-Config/devel php-pear-Config.spec,1.2,1.3 Message-ID: <20090307164820.D318C70117@cvs1.fedora.phx.redhat.com> Author: bjohnson Update of /cvs/pkgs/rpms/php-pear-Config/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21285/devel Modified Files: php-pear-Config.spec Log Message: increment rev Index: php-pear-Config.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear-Config/devel/php-pear-Config.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-Config.spec 7 Mar 2009 16:41:46 -0000 1.2 +++ php-pear-Config.spec 7 Mar 2009 16:47:50 -0000 1.3 @@ -9,7 +9,7 @@ Name: php-pear-Config Version: 1.10.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Configuration file manipulation for PHP Group: Development/Libraries From jkratoch at fedoraproject.org Sat Mar 7 16:53:10 2009 From: jkratoch at fedoraproject.org (Jan Kratochvil) Date: Sat, 7 Mar 2009 16:53:10 +0000 (UTC) Subject: rpms/gdb/devel gdb-6.6-buildid-locate-rpm.patch, 1.1, 1.2 gdb-6.6-buildid-locate.patch, 1.18, 1.19 gdb.spec, 1.328, 1.329 Message-ID: <20090307165310.55CBC70116@cvs1.fedora.phx.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22393 Modified Files: gdb-6.6-buildid-locate-rpm.patch gdb-6.6-buildid-locate.patch gdb.spec Log Message: * Sat Mar 7 2009 Jan Kratochvil - 6.8.50.20090302-5 - Improve `gdb-6.6-buildid-locate-rpm.patch' by dlopen() (+pkg-config compat.). gdb-6.6-buildid-locate-rpm.patch: Index: gdb-6.6-buildid-locate-rpm.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate-rpm.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.6-buildid-locate-rpm.patch 7 Mar 2009 01:42:03 -0000 1.1 +++ gdb-6.6-buildid-locate-rpm.patch 7 Mar 2009 16:52:38 -0000 1.2 @@ -1,25 +1,7 @@ ---- ./gdb/Makefile.in 2009-03-07 01:45:51.000000000 +0100 -+++ ./gdb/Makefile.in 2009-03-07 01:52:00.000000000 +0100 -@@ -396,7 +396,7 @@ CONFIG_UNINSTALL = @CONFIG_UNINSTALL@ - # your system doesn't have fcntl.h in /usr/include (which is where it - # should be according to Posix). - DEFS = @DEFS@ --GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config -DLOCALEDIR="\"$(localedir)\"" $(DEFS) -+GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config -I$(includedir)/rpm -DLOCALEDIR="\"$(localedir)\"" $(DEFS) - - # MH_CFLAGS, if defined, has host-dependent CFLAGS from the config directory. - GLOBAL_CFLAGS = $(MH_CFLAGS) -@@ -449,7 +449,7 @@ INSTALLED_LIBS=-lbfd -lreadline -lopcode - CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \ - $(XM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \ - $(LIBICONV) $(LIBEXPAT) \ -- $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) -+ $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) -lrpm - CDEPS = $(XM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \ - $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) - ---- ./gdb/event-top.c 2009-03-07 02:29:51.000000000 +0100 -+++ ./gdb/event-top.c 2009-03-07 01:52:00.000000000 +0100 +Index: gdb-6.8.50.20090302/gdb/event-top.c +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/event-top.c 2009-03-07 17:13:33.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/event-top.c 2009-03-07 17:25:06.000000000 +0100 @@ -33,6 +33,7 @@ #include "cli/cli-script.h" /* for reset_command_nest_depth */ #include "main.h" @@ -46,8 +28,10 @@ /* Each interpreter has its own rules on displaying the command prompt. */ if (!current_interp_display_prompt_p ()) ---- ./gdb/symfile.c 2009-03-07 02:30:20.000000000 +0100 -+++ ./gdb/symfile.c 2009-03-07 01:52:00.000000000 +0100 +Index: gdb-6.8.50.20090302/gdb/symfile.c +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/symfile.c 2009-03-07 17:22:21.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/symfile.c 2009-03-07 17:26:47.000000000 +0100 @@ -55,6 +55,7 @@ #include "solib.h" #include "remote.h" @@ -64,14 +48,19 @@ int (*deprecated_ui_load_progress_hook) (const char *section, unsigned long num); -@@ -1684,6 +1686,269 @@ build_id_to_filename (struct build_id *b +@@ -1684,8 +1686,352 @@ build_id_to_filename (struct build_id *b return retval; } ++#ifdef HAVE_LIBRPM ++ +#include +#include +#include +#include ++#ifdef DLOPEN_LIBRPM ++#include ++#endif + +/* This MISSING_RPM_HASH tracker is used to collect all the missing rpm files + and avoid their duplicities during a single inferior run. */ @@ -101,22 +90,93 @@ + rpmdbMatchIterator mi; + int count = 0; + ++#ifdef DLOPEN_LIBRPM ++ /* Duplicate here the declarations to verify they match. The same sanity ++ check is present also in `configure.ac'. */ ++ extern char * headerFormat(Header h, const char * fmt, errmsg_t * errmsg); ++ static char *(*headerFormat_p) (Header h, const char * fmt, errmsg_t *errmsg); ++ extern int rpmReadConfigFiles(const char * file, const char * target); ++ static int (*rpmReadConfigFiles_p) (const char * file, const char * target); ++ extern rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi); ++ static rpmdbMatchIterator (*rpmdbFreeIterator_p) (rpmdbMatchIterator mi); ++ extern Header rpmdbNextIterator(rpmdbMatchIterator mi); ++ static Header (*rpmdbNextIterator_p) (rpmdbMatchIterator mi); ++ extern rpmts rpmtsCreate(void); ++ static rpmts (*rpmtsCreate_p) (void); ++ extern rpmts rpmtsFree(rpmts ts); ++ static rpmts (*rpmtsFree_p) (rpmts ts); ++ extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag, ++ const void * keyp, size_t keylen); ++ static rpmdbMatchIterator (*rpmtsInitIterator_p) (const rpmts ts, ++ rpmTag rpmtag, ++ const void *keyp, ++ size_t keylen); ++#else /* !DLOPEN_LIBRPM */ ++# define headerFormat_p headerFormat ++# define rpmReadConfigFiles_p rpmReadConfigFiles ++# define rpmdbFreeIterator_p rpmdbFreeIterator ++# define rpmdbNextIterator_p rpmdbNextIterator ++# define rpmtsCreate_p rpmtsCreate ++# define rpmtsFree_p rpmtsFree ++# define rpmtsInitIterator_p rpmtsInitIterator ++#endif /* !DLOPEN_LIBRPM */ ++ + if (filename == NULL) + return 0; + + if (!rpm_init_done) + { -+ if (rpmReadConfigFiles(NULL, NULL) != 0) ++ static int init_tried; ++ ++ /* Already failed the initialization before? */ ++ if (init_tried) ++ return 0; ++ init_tried = 1; ++ ++#ifdef DLOPEN_LIBRPM ++ { ++ void *h; ++ ++ h = dlopen (DLOPEN_LIBRPM, RTLD_LAZY); ++ if (!h) ++ { ++ warning (_("Unable to open \"%s\" (%s), " ++ "missing debuginfos notifications will not be displayed"), ++ DLOPEN_LIBRPM, dlerror ()); ++ return 0; ++ } ++ ++ if (!((headerFormat_p = dlsym (h, "headerFormat")) ++ && (rpmReadConfigFiles_p = dlsym (h, "rpmReadConfigFiles")) ++ && (rpmdbFreeIterator_p = dlsym (h, "rpmdbFreeIterator")) ++ && (rpmdbNextIterator_p = dlsym (h, "rpmdbNextIterator")) ++ && (rpmtsCreate_p = dlsym (h, "rpmtsCreate")) ++ && (rpmtsFree_p = dlsym (h, "rpmtsFree")) ++ && (rpmtsInitIterator_p = dlsym (h, "rpmtsInitIterator")))) ++ { ++ warning (_("Opened library \"%s\" is incompatible (%s), " ++ "missing debuginfos notifications will not be displayed"), ++ DLOPEN_LIBRPM, dlerror ()); ++ if (dlclose (h)) ++ warning (_("Error closing library \"%s\": %s\n"), DLOPEN_LIBRPM, ++ dlerror ()); ++ return 0; ++ } ++ } ++#endif /* DLOPEN_LIBRPM */ ++ ++ if (rpmReadConfigFiles_p (NULL, NULL) != 0) + { + warning (_("Error reading the rpm configuration files")); + return 0; + } ++ + rpm_init_done = 1; + } + -+ ts = rpmtsCreate (); ++ ts = rpmtsCreate_p (); + -+ mi = rpmtsInitIterator (ts, RPMTAG_BASENAMES, filename, 0); ++ mi = rpmtsInitIterator_p (ts, RPMTAG_BASENAMES, filename, 0); + if (mi != NULL) + { + for (;;) @@ -128,13 +188,14 @@ + size_t debuginfolen = sizeof ("-debuginfo") - 1; + rpmdbMatchIterator mi_debuginfo; + -+ h = rpmdbNextIterator (mi); ++ h = rpmdbNextIterator_p (mi); + if (h == NULL) + break; + + /* Verify the debuginfo file is not already installed. */ -+ -+ debuginfo = headerFormat (h, "%{sourcerpm}-debuginfo.%{arch}", &err); ++ ++ debuginfo = headerFormat_p (h, "%{sourcerpm}-debuginfo.%{arch}", ++ &err); + if (!debuginfo) + { + warning (_("Error querying the rpm file `%s': %s"), filename, @@ -175,19 +236,19 @@ + + /* RPMDBI_PACKAGES requires keylen == sizeof (int). */ + /* RPMDBI_LABEL is an interface for NVR-based dbiFindByLabel(). */ -+ mi_debuginfo = rpmtsInitIterator (ts, RPMDBI_LABEL, debuginfo, 0); ++ mi_debuginfo = rpmtsInitIterator_p (ts, RPMDBI_LABEL, debuginfo, 0); + xfree (debuginfo); + if (mi_debuginfo) + { -+ rpmdbFreeIterator (mi_debuginfo); ++ rpmdbFreeIterator_p (mi_debuginfo); + count = 0; + break; + } + + /* The allocated memory gets utilized below for MISSING_RPM_HASH. */ -+ debuginfo = headerFormat (h, -+ "%{name}-%{version}-%{release}.%{arch}", -+ &err); ++ debuginfo = headerFormat_p (h, ++ "%{name}-%{version}-%{release}.%{arch}", ++ &err); + if (!debuginfo) + { + warning (_("Error querying the rpm file `%s': %s"), filename, @@ -237,10 +298,10 @@ + count++; + } + -+ rpmdbFreeIterator (mi); ++ rpmdbFreeIterator_p (mi); + } + -+ rpmtsFree (ts); ++ rpmtsFree_p (ts); + + return count; +} @@ -325,35 +386,47 @@ + }; +static enum missing_exec missing_exec = MISSING_EXEC_NOT_TRIED; + ++#endif /* HAVE_LIBRPM */ ++ +void +debug_flush_missing (void) +{ ++#ifdef HAVE_LIBRPM + missing_rpm_list_print (); ++#endif +} + /* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages - yum --enablerepo='*-debuginfo' install ... +- Try to install the hash file ... ++ yum --enablerepo='*-debuginfo' install ... avoidance. */ -@@ -1739,11 +2004,13 @@ missing_filepair_change (void) + + struct missing_filepair +@@ -1739,11 +2085,17 @@ missing_filepair_change (void) /* All their memory came just from missing_filepair_OBSTACK. */ missing_filepair_hash = NULL; } ++#ifdef HAVE_LIBRPM + missing_exec = MISSING_EXEC_NOT_TRIED; ++#endif } static void debug_print_executable_changed (void) { ++#ifdef HAVE_LIBRPM + missing_rpm_change (); ++#endif missing_filepair_change (); } -@@ -1802,14 +2069,31 @@ debug_print_missing (const char *binary, +@@ -1802,14 +2154,33 @@ debug_print_missing (const char *binary, } *slot = missing_filepair; - /* We do not collect and flush these messages as each such message - already requires its own separate lines. */ ++#ifdef HAVE_LIBRPM + if (missing_exec == MISSING_EXEC_NOT_TRIED) + { + char *exec_filename; @@ -361,8 +434,8 @@ - fprintf_unfiltered (gdb_stdlog, - _("Missing separate debuginfo for %s\n"), binary); - if (debug != NULL) -- fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"), -- "yum --enablerepo='*-debuginfo' install", debug); +- fprintf_unfiltered (gdb_stdlog, _("Try to install the hash file %s\n"), +- debug); + exec_filename = get_exec_file (0); + if (exec_filename != NULL) + { @@ -374,6 +447,7 @@ + } + if (missing_exec != MISSING_EXEC_ENLISTED) + if (missing_rpm_enlist (binary) == 0 && missing_rpm_enlist (debug) == 0) ++#endif /* HAVE_LIBRPM */ + { + /* We do not collect and flush these messages as each such message + already requires its own separate lines. */ @@ -387,8 +461,10 @@ } static char * ---- ./gdb/symfile.h 2009-03-07 02:16:18.000000000 +0100 -+++ ./gdb/symfile.h 2009-03-07 01:52:00.000000000 +0100 +Index: gdb-6.8.50.20090302/gdb/symfile.h +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/symfile.h 2009-03-07 17:13:33.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/symfile.h 2009-03-07 17:25:06.000000000 +0100 @@ -378,6 +378,7 @@ extern struct build_id *build_id_addr_ge extern char *build_id_to_filename (struct build_id *build_id, char **link_return, int add_debug_suffix); @@ -397,8 +473,10 @@ /* From dwarf2read.c */ ---- ./gdb/testsuite/lib/gdb.exp 2009-03-07 02:10:11.000000000 +0100 -+++ ./gdb/testsuite/lib/gdb.exp 2009-03-07 01:52:00.000000000 +0100 +Index: gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/testsuite/lib/gdb.exp 2009-03-07 17:13:33.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp 2009-03-07 17:25:06.000000000 +0100 @@ -1230,7 +1230,7 @@ proc default_gdb_start { } { warning "Couldn't set the width to 0." } @@ -408,8 +486,10 @@ send_gdb "set build-id-verbose 0\n" gdb_expect 10 { -re "$gdb_prompt $" { ---- ./gdb/tui/tui-interp.c 2009-03-07 02:28:47.000000000 +0100 -+++ ./gdb/tui/tui-interp.c 2009-03-07 01:52:00.000000000 +0100 +Index: gdb-6.8.50.20090302/gdb/tui/tui-interp.c +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/tui/tui-interp.c 2009-03-07 17:13:33.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/tui/tui-interp.c 2009-03-07 17:25:06.000000000 +0100 @@ -30,6 +30,7 @@ #include "tui/tui.h" #include "tui/tui-io.h" @@ -427,3 +507,1154 @@ /* Tell readline what the prompt to display is and what function it will need to call after a whole line is read. This also displays the first prompt. */ +Index: gdb-6.8.50.20090302/gdb/aclocal.m4 +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/aclocal.m4 2009-03-07 17:13:33.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/aclocal.m4 2009-03-07 17:25:06.000000000 +0100 +@@ -11,6 +11,162 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + ++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# ++# Copyright ?? 2004 Scott James Remnant . ++# ++# 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. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++# ---------------------------------- ++AC_DEFUN([PKG_PROG_PKG_CONFIG], ++[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=m4_default([$1], [0.9.0]) ++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ PKG_CONFIG="" ++ fi ++ ++fi[]dnl ++])# PKG_PROG_PKG_CONFIG ++ ++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# ++# Check to see whether a particular set of modules exists. Similar ++# to PKG_CHECK_MODULES(), but does not set variables or print errors. ++# ++# ++# Similar to PKG_CHECK_MODULES, make sure that the first instance of ++# this or PKG_CHECK_MODULES is called, or make sure to call ++# PKG_CHECK_EXISTS manually ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_EXISTS], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++if test -n "$PKG_CONFIG" && \ ++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then ++ m4_ifval([$2], [$2], [:]) ++m4_ifvaln([$3], [else ++ $3])dnl ++fi]) ++ ++ ++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) ++# --------------------------------------------- ++m4_define([_PKG_CONFIG], ++[if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ elif test -n "$PKG_CONFIG"; then ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ else ++ pkg_failed=untried ++fi[]dnl ++])# _PKG_CONFIG ++ ++# _PKG_SHORT_ERRORS_SUPPORTED ++# ----------------------------- ++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++])# _PKG_SHORT_ERRORS_SUPPORTED ++ ++ ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) ++# ++# ++# Note that if there is a possibility the first call to ++# PKG_CHECK_MODULES might not happen, you should be sure to include an ++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac ++# ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_MODULES], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++ ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) ++ ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++ ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) ++ ++if test $pkg_failed = yes; then ++ _PKG_SHORT_ERRORS_SUPPORTED ++ if test $_pkg_short_errors_supported = yes; then ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` ++ else ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++ ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: ++ ++$$1_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++_PKG_TEXT ++])], ++ [AC_MSG_RESULT([no]) ++ $4]) ++elif test $pkg_failed = untried; then ++ ifelse([$4], , [AC_MSG_FAILURE(dnl ++[The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++_PKG_TEXT ++ ++To get pkg-config, see .])], ++ [$4]) ++else ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ ifelse([$3], , :, [$3]) ++fi[]dnl ++])# PKG_CHECK_MODULES ++ + # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation +@@ -468,6 +624,27 @@ AC_DEFUN([AM_PROG_INSTALL_SH], + install_sh=${install_sh-"$am_aux_dir/install-sh"} + AC_SUBST(install_sh)]) + ++# Copyright (C) 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 2 ++ ++# Check whether the underlying file-system supports filenames ++# with a leading dot. For instance MS-DOS doesn't. ++AC_DEFUN([AM_SET_LEADING_DOT], ++[rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++AC_SUBST([am__leading_dot])]) ++ + # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- + # From Jim Meyering + +@@ -868,7 +1045,4 @@ m4_include([gnulib/m4/onceonly_2_57.m4]) + m4_include([gnulib/m4/stdint.m4]) + m4_include([gnulib/m4/string_h.m4]) + m4_include([gnulib/m4/wchar.m4]) +-m4_include([../config/extensions.m4]) +-m4_include([../config/lead-dot.m4]) +-m4_include([../config/proginstall.m4]) + m4_include([acinclude.m4]) +Index: gdb-6.8.50.20090302/gdb/config.in +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/config.in 2009-03-07 17:13:33.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/config.in 2009-03-07 17:25:06.000000000 +0100 +@@ -38,6 +38,9 @@ + /* Define to BFD's default target vector. */ + #undef DEFAULT_BFD_VEC + ++/* librpm version specific library name to dlopen. */ ++#undef DLOPEN_LIBRPM ++ + /* Define to 1 if translation of program messages to the user's native + language is requested. */ + #undef ENABLE_NLS +@@ -211,6 +214,9 @@ + /* Define if Python 2.6 is being used. */ + #undef HAVE_LIBPYTHON2_6 + ++/* Define if librpm library is being used. */ ++#undef HAVE_LIBRPM ++ + /* Define if libunwind library is being used. */ + #undef HAVE_LIBUNWIND + +Index: gdb-6.8.50.20090302/gdb/configure +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/configure 2009-03-07 17:13:33.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/configure 2009-03-07 17:25:06.000000000 +0100 +@@ -314,7 +314,7 @@ ac_subdirs_all="$ac_subdirs_all doc test + ac_subdirs_all="$ac_subdirs_all gdbtk" + ac_subdirs_all="$ac_subdirs_all multi-ice" + ac_subdirs_all="$ac_subdirs_all gdbserver" +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os am__leading_dot DEPDIR CCDEPMODE MAKE GMAKE_TRUE GMAKE_FALSE SET_MAKE USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT localedir GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE GNULIB_MEMMEM GNULIB_MEMPCPY GNULIB_MEMRCHR GNULIB_STPCPY GNULIB_STPNCPY GNULIB_STRCHRNUL GNULIB_STRDUP GNULIB_STRNDUP GNULIB_STRNLEN GNULIB_STRPBRK GNULIB_STRSEP GNULIB_ STRSTR GNULIB_STRCASESTR GNULIB_STRTOK_R GNULIB_MBSLEN GNULIB_MBSNLEN GNULIB_MBSCHR GNULIB_MBSRCHR GNULIB_MBSSTR GNULIB_MBSCASECMP GNULIB_MBSNCASECMP GNULIB_MBSPCASECMP GNULIB_MBSCASESTR GNULIB_MBSCSPN GNULIB_MBSPBRK GNULIB_MBSSPN GNULIB_MBSSEP GNULIB_MBSTOK_R GNULIB_STRERROR GNULIB_STRSIGNAL HAVE_DECL_MEMMEM HAVE_MEMPCPY HAVE_DECL_MEMRCHR HAVE_STPCPY HAVE_STPNCPY HAVE_STRCHRNUL HAVE_DECL_STRDUP HAVE_STRNDUP HAVE_DECL_STRNDUP HAVE_DECL_STRNLEN HAVE_STRPBRK HAVE_STRSEP HAVE_STRCASESTR HAVE_DECL_STRTOK_R HAVE_DECL_STRERROR HAVE_DECL_STRSIGNAL REPLACE_STRERROR REPLACE_STRSIGNAL REPLACE_MEMMEM REPLACE_STRCASESTR REPLACE_STRSTR HAVE_LONG_LONG_INT HAVE_UNSIGNED_LONG_LONG_INT HAVE_INTTYPES_H HAVE_SYS_TYPES_H INCLUDE_NEXT NEXT_STDINT_H HAVE_STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H BITSIZEOF_PTRDIFF_T BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_WCHAR_T BITSIZEOF_WINT_T HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T PTRDIFF_T_SUFFIX SIG_ATOMIC_T_SUFFIX SI ZE_T_SUFFIX WCHAR_T_SUFFIX WINT_T_SUFFIX STDINT_H NEXT_STRING_H GNULIB_WCWIDTH HAVE_DECL_WCWIDTH REPLACE_WCWIDTH WCHAR_H HAVE_WCHAR_H NEXT_WCHAR_H LIBGNU_LIBDEPS LIBGNU_LTLIBDEPS GNULIB_STDINT_H PACKAGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK AMTAR am__tar am__untar am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH am__fastdepCC_TRUE am__fastdepCC_FALSE GDB_DATADIR_PATH pythondir subdirs TARGET_OBS PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI LN_S YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG LIBICONV LIBICONV_INCLUDE LIBICONV_LIBDIR READLINE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT LTLIBEXPAT PYTHON_CFLAGS ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDAPP TCL_VERSION TCL_PATCH_LEVEL TCL_BIN_DIR TCL_SRC _DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_INCLUDE TCL_LIBRARY TCL_DEPS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_INCLUDE TK_LIBRARY TK_DEPS TK_XINCLUDES X_CFLAGS X_LDFLAGS X_LIBS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR SIM SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags nm_h LIBOBJS LTLIBOBJS gl_LIBOBJS gl_LTLIBOBJS gltests_LIBOBJS gltests_LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os am__leading_dot DEPDIR CCDEPMODE MAKE GMAKE_TRUE GMAKE_FALSE SET_MAKE USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT localedir GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE GNULIB_MEMMEM GNULIB_MEMPCPY GNULIB_MEMRCHR GNULIB_STPCPY GNULIB_STPNCPY GNULIB_STRCHRNUL GNULIB_STRDUP GNULIB_STRNDUP GNULIB_STRNLEN GNULIB_STRPBRK GNULIB_STRSEP GNULIB_ STRSTR GNULIB_STRCASESTR GNULIB_STRTOK_R GNULIB_MBSLEN GNULIB_MBSNLEN GNULIB_MBSCHR GNULIB_MBSRCHR GNULIB_MBSSTR GNULIB_MBSCASECMP GNULIB_MBSNCASECMP GNULIB_MBSPCASECMP GNULIB_MBSCASESTR GNULIB_MBSCSPN GNULIB_MBSPBRK GNULIB_MBSSPN GNULIB_MBSSEP GNULIB_MBSTOK_R GNULIB_STRERROR GNULIB_STRSIGNAL HAVE_DECL_MEMMEM HAVE_MEMPCPY HAVE_DECL_MEMRCHR HAVE_STPCPY HAVE_STPNCPY HAVE_STRCHRNUL HAVE_DECL_STRDUP HAVE_STRNDUP HAVE_DECL_STRNDUP HAVE_DECL_STRNLEN HAVE_STRPBRK HAVE_STRSEP HAVE_STRCASESTR HAVE_DECL_STRTOK_R HAVE_DECL_STRERROR HAVE_DECL_STRSIGNAL REPLACE_STRERROR REPLACE_STRSIGNAL REPLACE_MEMMEM REPLACE_STRCASESTR REPLACE_STRSTR HAVE_LONG_LONG_INT HAVE_UNSIGNED_LONG_LONG_INT HAVE_INTTYPES_H HAVE_SYS_TYPES_H INCLUDE_NEXT NEXT_STDINT_H HAVE_STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H BITSIZEOF_PTRDIFF_T BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_WCHAR_T BITSIZEOF_WINT_T HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T PTRDIFF_T_SUFFIX SIG_ATOMIC_T_SUFFIX SI ZE_T_SUFFIX WCHAR_T_SUFFIX WINT_T_SUFFIX STDINT_H NEXT_STRING_H GNULIB_WCWIDTH HAVE_DECL_WCWIDTH REPLACE_WCWIDTH WCHAR_H HAVE_WCHAR_H NEXT_WCHAR_H LIBGNU_LIBDEPS LIBGNU_LTLIBDEPS GNULIB_STDINT_H PACKAGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK AMTAR am__tar am__untar am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH am__fastdepCC_TRUE am__fastdepCC_FALSE GDB_DATADIR_PATH pythondir PKG_CONFIG ac_pt_PKG_CONFIG RPM_CFLAGS RPM_LIBS subdirs TARGET_OBS PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI LN_S YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG LIBICONV LIBICONV_INCLUDE LIBICONV_LIBDIR READLINE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT LTLIBEXPAT PYTHON_CFLAGS ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDAPP TCL_VERSION TCL_PATCH_LEVEL TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_INCLUDE TCL_LIBRARY TCL_DEPS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_INCLUDE TK_LIBRARY TK_DEPS TK_XINCLUDES X_CFLAGS X_LDFLAGS X_LIBS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR SIM SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags nm_h LIBOBJS LTLIBOBJS gl_LIBOBJS gl_LTLIBOBJS gltests_LIBOBJS gltests_LTLIBOBJS' + ac_subst_files='host_makefile_frag' + ac_pwd=`pwd` + +@@ -776,6 +776,18 @@ ac_env_CPP_set=${CPP+set} + ac_env_CPP_value=$CPP + ac_cv_env_CPP_set=${CPP+set} + ac_cv_env_CPP_value=$CPP ++ac_env_PKG_CONFIG_set=${PKG_CONFIG+set} ++ac_env_PKG_CONFIG_value=$PKG_CONFIG ++ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set} ++ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG ++ac_env_RPM_CFLAGS_set=${RPM_CFLAGS+set} ++ac_env_RPM_CFLAGS_value=$RPM_CFLAGS ++ac_cv_env_RPM_CFLAGS_set=${RPM_CFLAGS+set} ++ac_cv_env_RPM_CFLAGS_value=$RPM_CFLAGS ++ac_env_RPM_LIBS_set=${RPM_LIBS+set} ++ac_env_RPM_LIBS_value=$RPM_LIBS ++ac_cv_env_RPM_LIBS_set=${RPM_LIBS+set} ++ac_cv_env_RPM_LIBS_value=$RPM_LIBS + + # + # Report the --help message. +@@ -886,6 +898,8 @@ Optional Packages: + [DATADIR/gdb] + --with-pythondir install Python data files in this path + [DATADIR/gdb/python] ++ --with-rpm query rpm database for missing debuginfos ++ [yes/no,], [def.], [auto=librpm.so] + --with-libunwind Use libunwind frame unwinding support + --with-pkgversion=PKG Use PKG in the version string in place of "GDB" + --with-bugurl=URL Direct users to URL to report a bug +@@ -913,6 +927,9 @@ Some influential environment variables: + CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have + headers in a nonstandard directory + CPP C preprocessor ++ PKG_CONFIG path to pkg-config utility ++ RPM_CFLAGS C compiler flags for RPM, overriding pkg-config ++ RPM_LIBS linker flags for RPM, overriding pkg-config + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. +@@ -6556,7 +6573,6 @@ am__api_version="1.9" + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. +-# Reject install programs that cannot install multiple files. + echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 + echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 + if test -z "$INSTALL"; then +@@ -6590,18 +6606,8 @@ case $as_dir/ in + # program-specific install script used by HP pwplus--don't use. + : + else +- rm -rf conftest.one conftest.two conftest.dir +- echo one > conftest.one +- echo two > conftest.two +- mkdir conftest.dir +- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && +- test -s conftest.one && test -s conftest.two && +- test -s conftest.dir/conftest.one && +- test -s conftest.dir/conftest.two +- then +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 +- fi ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 + fi + fi + done +@@ -6610,16 +6616,15 @@ case $as_dir/ in + esac + done + +-rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else +- # As a last resort, use the slow shell script. Don't cache a +- # value for INSTALL within a source directory, because that will ++ # As a last resort, use the slow shell script. We don't cache a ++ # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is +- # removed, or if the value is a relative name. ++ # removed, or if the path is relative. + INSTALL=$ac_install_sh + fi + fi +@@ -7202,6 +7207,559 @@ _ACEOF + fi + + ++# Integration with rpm library to support missing debuginfo suggestions. ++# --without-rpm: Disable any rpm support. ++# --with-rpm=libname.so: Try to dynamically open `libname.so' during runtime. ++# Even with runtime missing `libname.so' GDB will still other run correctly. ++# Missing `libname.so' during ./configure will abort the configuration. ++# --with-rpm=librpm.so: Like `--with-rpm=libname.so' but try to find specific ++# minor version first such as `librpm-4.6.so' as minor version differences ++# mean API+ABI incompatibility. If the specific match versioned library name ++# could not be found still open dynamically at least `librpm.so'. ++# --with-rpm: Like `--with-rpm=librpm.so' but if any of its detection fails try ++# to find librpm for compilation-time linking by pkg-config. GDB binary will ++# be probably linked with the version specific library (as `librpm-4.6.so'). ++# Failure to find librpm by pkg-config will abort the configuration. ++# (default) --with-rpm=auto: Like `--with-rpm=librpm.so' but if even pkg-config ++# cannot find librpm use to the rpmless compilation (like `--without-rpm'). ++ ++ ++# Check whether --with-rpm or --without-rpm was given. ++if test "${with_rpm+set}" = set; then ++ withval="$with_rpm" ++ ++else ++ with_rpm="auto" ++fi; ++ ++ ++ ++if test "x$with_rpm" != "xno"; then ++ if test "x$with_rpm" = "xyes"; then ++ LIBRPM="librpm.so" ++ RPM_REQUIRE=true ++ DLOPEN_REQUIRE=false ++ elif test "x$with_rpm" = "xauto"; then ++ LIBRPM="librpm.so" ++ RPM_REQUIRE=false ++ DLOPEN_REQUIRE=false ++ else ++ LIBRPM="$with_rpm" ++ RPM_REQUIRE=true ++ DLOPEN_REQUIRE=true ++ fi ++ LIBRPM_STRING='"'"$LIBRPM"'"' ++ ++ echo "$as_me:$LINENO: checking specific librpm version" >&5 ++echo $ECHO_N "checking specific librpm version... $ECHO_C" >&6 ++ HAVE_DLOPEN_LIBRPM=false ++ save_LIBS="$LIBS" ++ LIBS="$LIBS -ldl" ++ if test "$cross_compiling" = yes; then ++ { { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot run test program while cross compiling ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; }; } ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++#include ++#include ++#include ++ ++int ++main () ++{ ++ ++ void *h; ++ const char *const *rpmverp; ++ FILE *f; ++ ++ f = fopen ("conftest.out", "w"); ++ if (!f) ++ { ++ fprintf (stderr, "Cannot write \"%s\": %s\n", "conftest.out", ++ strerror (errno)); ++ return 1; ++ } ++ h = dlopen ($LIBRPM_STRING, RTLD_LAZY); ++ if (!h) ++ { ++ fprintf (stderr, "dlopen (\"%s\"): %s\n", $LIBRPM_STRING, dlerror ()); ++ return 1; ++ } ++ rpmverp = dlsym (h, "RPMVERSION"); ++ if (!rpmverp) ++ { ++ fprintf (stderr, "dlsym (\"RPMVERSION\"): %s\n", dlerror ()); ++ return 1; ++ } ++ fprintf (stderr, "RPMVERSION is: \""); ++ fprintf (stderr, "%s\"\n", *rpmverp); ++ ++ /* Try to find the specific librpm version only for "librpm.so" as we do ++ not know how to assemble the version string otherwise. */ ++ ++ if (strcmp ("librpm.so", $LIBRPM_STRING) != 0) ++ { ++ fprintf (f, "%s\n", $LIBRPM_STRING); ++ return 0; ++ } ++ else ++ { ++ char *h2_name; ++ void *h2; ++ int major, minor; ++ ++ if (sscanf (*rpmverp, "%d.%d", &major, &minor) != 2) ++ { ++ fprintf (stderr, "Unable to parse RPMVERSION.\n"); ++ fprintf (f, "%s\n", $LIBRPM_STRING); ++ return 0; ++ } ++ /* Avoid the square brackets by malloc. */ ++ h2_name = malloc (64); ++ sprintf (h2_name, "librpm-%d.%d.so", major, minor); ++ h2 = dlopen (h2_name, RTLD_LAZY); ++ if (!h2) ++ { ++ fprintf (stderr, "dlopen (\"%s\"): %s\n", h2_name, dlerror ()); ++ fprintf (f, "%s\n", $LIBRPM_STRING); ++ return 0; ++ } ++ if (h2 != h) ++ { ++ fprintf (stderr, "dlopen of \"%s\" and \"%s\" are different.\n", ++ $LIBRPM_STRING, h2_name); ++ fprintf (f, "%s\n", $LIBRPM_STRING); ++ return 0; ++ } ++ /* Found the valid .so name with a specific version. */ ++ fprintf (f, "%s\n", h2_name); ++ return 0; ++ } ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ++ DLOPEN_LIBRPM="`cat conftest.out`" ++ if test "x$DLOPEN_LIBRPM" != "x"; then ++ HAVE_DLOPEN_LIBRPM=true ++ echo "$as_me:$LINENO: result: $DLOPEN_LIBRPM" >&5 ++echo "${ECHO_T}$DLOPEN_LIBRPM" >&6 ++ fi ++ ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ rm -f conftest.out ++ ++ ++ ++ if $HAVE_DLOPEN_LIBRPM; then ++ ++ echo "$as_me:$LINENO: checking rpm library API compatibility" >&5 ++echo $ECHO_N "checking rpm library API compatibility... $ECHO_C" >&6 ++ # The compilation requires -Werror to verify anything. ++ save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Duplicate here the declarations to verify they match "symfile.c". */ ++#include ++#include ++#include ++#include ++extern char * headerFormat(Header h, const char * fmt, errmsg_t * errmsg); ++extern int rpmReadConfigFiles(const char * file, const char * target); ++extern rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi); ++extern Header rpmdbNextIterator(rpmdbMatchIterator mi); ++extern rpmts rpmtsCreate(void); ++extern rpmts rpmtsFree(rpmts ts); ++extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag, ++ const void * keyp, size_t keylen); ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ++ LIBRPM_COMPAT=true ++ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 ++ ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++ LIBRPM_COMPAT=false ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++ ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$save_CFLAGS" ++ ++ if ! $LIBRPM_COMPAT; then ++ HAVE_DLOPEN_LIBRPM=false ++ fi ++ fi ++ ++ if $HAVE_DLOPEN_LIBRPM; then ++ DLOPEN_LIBRPM_STRING='"'"$DLOPEN_LIBRPM"'"' ++ ++cat >>confdefs.h <<_ACEOF ++#define DLOPEN_LIBRPM $DLOPEN_LIBRPM_STRING ++_ACEOF ++ ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_LIBRPM 1 ++_ACEOF ++ ++ else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++ LIBS="$save_LIBS" ++ if $DLOPEN_REQUIRE; then ++ { { echo "$as_me:$LINENO: error: Specific name $LIBRPM was requested but it could not be opened." >&5 ++echo "$as_me: error: Specific name $LIBRPM was requested but it could not be opened." >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++ ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. ++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++ ++if test -n "$PKG_CONFIG"; then ++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6 ++else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++fi ++if test -z "$ac_cv_path_PKG_CONFIG"; then ++ ac_pt_PKG_CONFIG=$PKG_CONFIG ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $ac_pt_PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ ++ ;; ++esac ++fi ++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG ++ ++if test -n "$ac_pt_PKG_CONFIG"; then ++ echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 ++else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ PKG_CONFIG=$ac_pt_PKG_CONFIG ++else ++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++fi ++ ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=0.9.0 ++ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 ++ else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++ PKG_CONFIG="" ++ fi ++ ++fi ++ ++pkg_failed=no ++echo "$as_me:$LINENO: checking for RPM" >&5 ++echo $ECHO_N "checking for RPM... $ECHO_C" >&6 ++ ++if test -n "$RPM_CFLAGS"; then ++ pkg_cv_RPM_CFLAGS="$RPM_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"rpm\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "rpm") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_RPM_CFLAGS=`$PKG_CONFIG --cflags "rpm" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$RPM_LIBS"; then ++ pkg_cv_RPM_LIBS="$RPM_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"rpm\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "rpm") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_RPM_LIBS=`$PKG_CONFIG --libs "rpm" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ RPM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "rpm" 2>&1` ++ else ++ RPM_PKG_ERRORS=`$PKG_CONFIG --print-errors "rpm" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$RPM_PKG_ERRORS" >&5 ++ ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++ HAVE_LIBRPM=false ++elif test $pkg_failed = untried; then ++ HAVE_LIBRPM=false ++else ++ RPM_CFLAGS=$pkg_cv_RPM_CFLAGS ++ RPM_LIBS=$pkg_cv_RPM_LIBS ++ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 ++ HAVE_LIBRPM=true ++fi ++ ++ if $HAVE_LIBRPM; then ++ ++ echo "$as_me:$LINENO: checking rpm library API compatibility" >&5 ++echo $ECHO_N "checking rpm library API compatibility... $ECHO_C" >&6 ++ # The compilation requires -Werror to verify anything. ++ save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Duplicate here the declarations to verify they match "symfile.c". */ ++#include ++#include ++#include ++#include ++extern char * headerFormat(Header h, const char * fmt, errmsg_t * errmsg); ++extern int rpmReadConfigFiles(const char * file, const char * target); ++extern rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi); ++extern Header rpmdbNextIterator(rpmdbMatchIterator mi); ++extern rpmts rpmtsCreate(void); ++extern rpmts rpmtsFree(rpmts ts); ++extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag, ++ const void * keyp, size_t keylen); ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ++ LIBRPM_COMPAT=true ++ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 ++ ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++ LIBRPM_COMPAT=false ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++ ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$save_CFLAGS" ++ ++ if ! $LIBRPM_COMPAT; then ++ HAVE_LIBRPM=false ++ RPM_PKG_ERRORS="Found $LIBRPM API is incompatibile with this GDB" ++ fi ++ fi ++ ++ if $HAVE_LIBRPM; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_LIBRPM 1 ++_ACEOF ++ ++ CFLAGS="$CFLAGS $RPM_CFLAGS" ++ LIBS="$LIBS $RPM_LIBS" ++ else ++ if $RPM_REQUIRE; then ++ { { echo "$as_me:$LINENO: error: $RPM_PKG_ERRORS" >&5 ++echo "$as_me: error: $RPM_PKG_ERRORS" >&2;} ++ { (exit 1); exit 1; }; } ++ else ++ { echo "$as_me:$LINENO: WARNING: $RPM_PKG_ERRORS" >&5 ++echo "$as_me: WARNING: $RPM_PKG_ERRORS" >&2;} ++ fi ++ fi ++ fi ++fi ++ + + + +@@ -8623,7 +9181,6 @@ done + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. +-# Reject install programs that cannot install multiple files. + echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 + echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 + if test -z "$INSTALL"; then +@@ -8657,18 +9214,8 @@ case $as_dir/ in + # program-specific install script used by HP pwplus--don't use. + : + else +- rm -rf conftest.one conftest.two conftest.dir +- echo one > conftest.one +- echo two > conftest.two +- mkdir conftest.dir +- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && +- test -s conftest.one && test -s conftest.two && +- test -s conftest.dir/conftest.one && +- test -s conftest.dir/conftest.two +- then +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 +- fi ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 + fi + fi + done +@@ -8677,16 +9224,15 @@ case $as_dir/ in + esac + done + +-rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else +- # As a last resort, use the slow shell script. Don't cache a +- # value for INSTALL within a source directory, because that will ++ # As a last resort, use the slow shell script. We don't cache a ++ # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is +- # removed, or if the value is a relative name. ++ # removed, or if the path is relative. + INSTALL=$ac_install_sh + fi + fi +@@ -22270,6 +22816,10 @@ s, at am__fastdepCC_TRUE@,$am__fastdepCC_TR + s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t + s, at GDB_DATADIR_PATH@,$GDB_DATADIR_PATH,;t t + s, at pythondir@,$pythondir,;t t ++s, at PKG_CONFIG@,$PKG_CONFIG,;t t ++s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t ++s, at RPM_CFLAGS@,$RPM_CFLAGS,;t t ++s, at RPM_LIBS@,$RPM_LIBS,;t t + s, at subdirs@,$subdirs,;t t + s, at TARGET_OBS@,$TARGET_OBS,;t t + s, at PKGVERSION@,$PKGVERSION,;t t +Index: gdb-6.8.50.20090302/gdb/configure.ac +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/configure.ac 2009-03-07 17:13:33.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/configure.ac 2009-03-07 17:25:06.000000000 +0100 +@@ -162,6 +162,199 @@ else + fi + AC_SUBST(pythondir) + ++# Integration with rpm library to support missing debuginfo suggestions. ++# --without-rpm: Disable any rpm support. ++# --with-rpm=libname.so: Try to dynamically open `libname.so' during runtime. ++# Even with runtime missing `libname.so' GDB will still other run correctly. ++# Missing `libname.so' during ./configure will abort the configuration. ++# --with-rpm=librpm.so: Like `--with-rpm=libname.so' but try to find specific ++# minor version first such as `librpm-4.6.so' as minor version differences ++# mean API+ABI incompatibility. If the specific match versioned library name ++# could not be found still open dynamically at least `librpm.so'. ++# --with-rpm: Like `--with-rpm=librpm.so' but if any of its detection fails try ++# to find librpm for compilation-time linking by pkg-config. GDB binary will ++# be probably linked with the version specific library (as `librpm-4.6.so'). ++# Failure to find librpm by pkg-config will abort the configuration. ++# (default) --with-rpm=auto: Like `--with-rpm=librpm.so' but if even pkg-config ++# cannot find librpm use to the rpmless compilation (like `--without-rpm'). ++ ++AC_ARG_WITH([rpm], ++ [AS_HELP_STRING([--with-rpm], ++ [query rpm database for missing debuginfos [yes/no, def. auto=librpm.so]])], [], [with_rpm="auto"]) ++ ++m4_pattern_allow([^AC_MSG_ERROR$]) ++m4_pattern_allow([^AC_MSG_WARN$]) ++if test "x$with_rpm" != "xno"; then ++ if test "x$with_rpm" = "xyes"; then ++ LIBRPM="librpm.so" ++ RPM_REQUIRE=true ++ DLOPEN_REQUIRE=false ++ elif test "x$with_rpm" = "xauto"; then ++ LIBRPM="librpm.so" ++ RPM_REQUIRE=false ++ DLOPEN_REQUIRE=false ++ else ++ LIBRPM="$with_rpm" ++ RPM_REQUIRE=true ++ DLOPEN_REQUIRE=true ++ fi ++ LIBRPM_STRING='"'"$LIBRPM"'"' ++ ++ AC_MSG_CHECKING([specific librpm version]) ++ HAVE_DLOPEN_LIBRPM=false ++ save_LIBS="$LIBS" ++ LIBS="$LIBS -ldl" ++ AC_RUN_IFELSE(AC_LANG_PROGRAM([[ ++#include ++#include ++#include ++ ]], [[ ++ void *h; ++ const char *const *rpmverp; ++ FILE *f; ++ ++ f = fopen ("conftest.out", "w"); ++ if (!f) ++ { ++ fprintf (stderr, "Cannot write \"%s\": %s\n", "conftest.out", ++ strerror (errno)); ++ return 1; ++ } ++ h = dlopen ($LIBRPM_STRING, RTLD_LAZY); ++ if (!h) ++ { ++ fprintf (stderr, "dlopen (\"%s\"): %s\n", $LIBRPM_STRING, dlerror ()); ++ return 1; ++ } ++ rpmverp = dlsym (h, "RPMVERSION"); ++ if (!rpmverp) ++ { ++ fprintf (stderr, "dlsym (\"RPMVERSION\"): %s\n", dlerror ()); ++ return 1; ++ } ++ fprintf (stderr, "RPMVERSION is: \""); ++ fprintf (stderr, "%s\"\n", *rpmverp); ++ ++ /* Try to find the specific librpm version only for "librpm.so" as we do ++ not know how to assemble the version string otherwise. */ ++ ++ if (strcmp ("librpm.so", $LIBRPM_STRING) != 0) ++ { ++ fprintf (f, "%s\n", $LIBRPM_STRING); ++ return 0; ++ } ++ else ++ { ++ char *h2_name; ++ void *h2; ++ int major, minor; ++ ++ if (sscanf (*rpmverp, "%d.%d", &major, &minor) != 2) ++ { ++ fprintf (stderr, "Unable to parse RPMVERSION.\n"); ++ fprintf (f, "%s\n", $LIBRPM_STRING); ++ return 0; ++ } ++ /* Avoid the square brackets by malloc. */ ++ h2_name = malloc (64); ++ sprintf (h2_name, "librpm-%d.%d.so", major, minor); ++ h2 = dlopen (h2_name, RTLD_LAZY); ++ if (!h2) ++ { ++ fprintf (stderr, "dlopen (\"%s\"): %s\n", h2_name, dlerror ()); ++ fprintf (f, "%s\n", $LIBRPM_STRING); ++ return 0; ++ } ++ if (h2 != h) ++ { ++ fprintf (stderr, "dlopen of \"%s\" and \"%s\" are different.\n", ++ $LIBRPM_STRING, h2_name); ++ fprintf (f, "%s\n", $LIBRPM_STRING); ++ return 0; ++ } ++ /* Found the valid .so name with a specific version. */ ++ fprintf (f, "%s\n", h2_name); ++ return 0; ++ } ++ ]]), [ ++ DLOPEN_LIBRPM="`cat conftest.out`" ++ if test "x$DLOPEN_LIBRPM" != "x"; then ++ HAVE_DLOPEN_LIBRPM=true ++ AC_MSG_RESULT($DLOPEN_LIBRPM) ++ fi ++ ]) ++ rm -f conftest.out ++ ++ m4_define([CHECK_LIBRPM_COMPAT], [ ++ AC_MSG_CHECKING([rpm library API compatibility]) ++ # The compilation requires -Werror to verify anything. ++ save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" ++ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[ ++/* Duplicate here the declarations to verify they match "symfile.c". */ ++#include ++#include ++#include ++#include ++extern char * headerFormat(Header h, const char * fmt, errmsg_t * errmsg); ++extern int rpmReadConfigFiles(const char * file, const char * target); ++extern rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi); ++extern Header rpmdbNextIterator(rpmdbMatchIterator mi); ++extern rpmts rpmtsCreate(void); ++extern rpmts rpmtsFree(rpmts ts); ++extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag, ++ const void * keyp, size_t keylen); ++ ]]), [ ++ LIBRPM_COMPAT=true ++ AC_MSG_RESULT(yes) ++ ], [ ++ LIBRPM_COMPAT=false ++ AC_MSG_RESULT(no) ++ ]) ++ CFLAGS="$save_CFLAGS" ++ ]) ++ ++ if $HAVE_DLOPEN_LIBRPM; then ++ CHECK_LIBRPM_COMPAT ++ if ! $LIBRPM_COMPAT; then ++ HAVE_DLOPEN_LIBRPM=false ++ fi ++ fi ++ ++ if $HAVE_DLOPEN_LIBRPM; then ++ DLOPEN_LIBRPM_STRING='"'"$DLOPEN_LIBRPM"'"' ++ AC_DEFINE_UNQUOTED(DLOPEN_LIBRPM, $DLOPEN_LIBRPM_STRING, [librpm version specific library name to dlopen.]) ++ AC_DEFINE(HAVE_LIBRPM, 1, [Define if librpm library is being used.]) ++ else ++ AC_MSG_RESULT(no) ++ LIBS="$save_LIBS" ++ if $DLOPEN_REQUIRE; then ++ AC_MSG_ERROR([Specific name $LIBRPM was requested but it could not be opened.]) ++ fi ++ PKG_CHECK_MODULES(RPM, rpm, [HAVE_LIBRPM=true], [HAVE_LIBRPM=false]) ++ ++ if $HAVE_LIBRPM; then ++ CHECK_LIBRPM_COMPAT ++ if ! $LIBRPM_COMPAT; then ++ HAVE_LIBRPM=false ++ RPM_PKG_ERRORS="Found $LIBRPM API is incompatibile with this GDB" ++ fi ++ fi ++ ++ if $HAVE_LIBRPM; then ++ AC_DEFINE(HAVE_LIBRPM, 1, [Define if librpm library is being used.]) ++ CFLAGS="$CFLAGS $RPM_CFLAGS" ++ LIBS="$LIBS $RPM_LIBS" ++ else ++ if $RPM_REQUIRE; then ++ AC_MSG_ERROR($RPM_PKG_ERRORS) ++ else ++ AC_MSG_WARN($RPM_PKG_ERRORS) ++ fi ++ fi ++ fi ++fi ++ + + AC_CONFIG_SUBDIRS(doc testsuite) + gdb-6.6-buildid-locate.patch: Index: gdb-6.6-buildid-locate.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate.patch,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gdb-6.6-buildid-locate.patch 7 Mar 2009 01:42:03 -0000 1.18 +++ gdb-6.6-buildid-locate.patch 7 Mar 2009 16:52:39 -0000 1.19 @@ -1,5 +1,7 @@ ---- ./gdb/corelow.c 2009-03-07 01:45:51.000000000 +0100 -+++ ./gdb/corelow.c 2009-03-07 02:29:31.000000000 +0100 +Index: gdb-6.8.50.20090302/gdb/corelow.c +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/corelow.c 2009-02-23 01:03:48.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/corelow.c 2009-03-07 17:04:57.000000000 +0100 @@ -45,6 +45,10 @@ #include "exceptions.h" #include "solib.h" @@ -93,8 +95,10 @@ + NULL, NULL, NULL, + &setlist, &showlist); } ---- ./gdb/doc/gdb.texinfo 2009-03-07 01:45:51.000000000 +0100 -+++ ./gdb/doc/gdb.texinfo 2009-03-07 02:10:11.000000000 +0100 +Index: gdb-6.8.50.20090302/gdb/doc/gdb.texinfo +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/doc/gdb.texinfo 2009-03-07 17:04:56.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/doc/gdb.texinfo 2009-03-07 17:04:57.000000000 +0100 @@ -13294,6 +13294,27 @@ information files. @end table @@ -123,8 +127,10 @@ @cindex @code{.gnu_debuglink} sections @cindex debug link sections A debug link is a special section of the executable file named ---- ./gdb/solib-svr4.c 2009-03-07 01:45:51.000000000 +0100 -+++ ./gdb/solib-svr4.c 2009-03-07 02:10:11.000000000 +0100 +Index: gdb-6.8.50.20090302/gdb/solib-svr4.c +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/solib-svr4.c 2009-03-07 17:04:52.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/solib-svr4.c 2009-03-07 17:04:57.000000000 +0100 @@ -1000,9 +1000,33 @@ svr4_current_sos (void) safe_strerror (errcode)); else @@ -162,8 +168,10 @@ } xfree (buffer); ---- ./gdb/symfile.c 2009-03-07 01:45:51.000000000 +0100 -+++ ./gdb/symfile.c 2009-03-07 02:30:20.000000000 +0100 +Index: gdb-6.8.50.20090302/gdb/symfile.c +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/symfile.c 2009-03-07 17:04:53.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/symfile.c 2009-03-07 17:22:21.000000000 +0100 @@ -54,6 +54,7 @@ #include "elf-bfd.h" #include "solib.h" @@ -651,7 +659,7 @@ +} + +/* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages -+ yum --enablerepo='*-debuginfo' install ... ++ Try to install the hash file ... + avoidance. */ + +struct missing_filepair @@ -774,8 +782,8 @@ + fprintf_unfiltered (gdb_stdlog, + _("Missing separate debuginfo for %s\n"), binary); + if (debug != NULL) -+ fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"), -+ "yum --enablerepo='*-debuginfo' install", debug); ++ fprintf_unfiltered (gdb_stdlog, _("Try to install the hash file %s\n"), ++ debug); +} + static char * @@ -938,8 +946,10 @@ + + observer_attach_executable_changed (debug_print_executable_changed); } ---- ./gdb/symfile.h 2009-03-07 01:45:51.000000000 +0100 -+++ ./gdb/symfile.h 2009-03-07 02:16:18.000000000 +0100 +Index: gdb-6.8.50.20090302/gdb/symfile.h +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/symfile.h 2009-03-07 17:04:52.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/symfile.h 2009-03-07 17:13:33.000000000 +0100 @@ -372,6 +372,13 @@ extern int symfile_map_offsets_to_segmen struct symfile_segment_data *get_symfile_segment_data (bfd *abfd); void free_symfile_segment_data (struct symfile_segment_data *data); @@ -954,8 +964,10 @@ /* From dwarf2read.c */ extern int dwarf2_has_info (struct objfile *); ---- ./gdb/testsuite/lib/gdb.exp 2009-03-07 01:45:51.000000000 +0100 -+++ ./gdb/testsuite/lib/gdb.exp 2009-03-07 02:10:11.000000000 +0100 +Index: gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp +=================================================================== +--- gdb-6.8.50.20090302.orig/gdb/testsuite/lib/gdb.exp 2009-03-07 17:04:52.000000000 +0100 ++++ gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp 2009-03-07 17:13:33.000000000 +0100 @@ -1230,6 +1230,16 @@ proc default_gdb_start { } { warning "Couldn't set the width to 0." } Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.328 retrieving revision 1.329 diff -u -r1.328 -r1.329 --- gdb.spec 7 Mar 2009 01:42:03 -0000 1.328 +++ gdb.spec 7 Mar 2009 16:52:39 -0000 1.329 @@ -13,7 +13,7 @@ # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 4%{?_with_upstream:.upstream}%{?dist} +Release: 5%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -378,7 +378,8 @@ BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel Requires: readline BuildRequires: readline-devel -Requires: rpm-libs +# dlopen() no longer makes rpm-libs a mandatory dependency. +#Requires: rpm-libs BuildRequires: rpm-devel %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Requires: python-libs @@ -635,6 +636,7 @@ --with-expat \ --enable-tui \ --with-python \ + --with-rpm=librpm.so \ %ifarch ia64 --with-libunwind \ %else @@ -838,6 +840,9 @@ %endif %changelog +* Sat Mar 7 2009 Jan Kratochvil - 6.8.50.20090302-5 +- Improve `gdb-6.6-buildid-locate-rpm.patch' by dlopen() (+pkg-config compat.). + * Sat Mar 7 2009 Jan Kratochvil - 6.8.50.20090302-4 - Split `gdb-6.6-buildid-locate.patch' to `gdb-6.6-buildid-locate-rpm.patch'. From pkgdb at fedoraproject.org Sat Mar 7 17:00:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:00:23 +0000 Subject: [pkgdb] libkml was added for rakesh Message-ID: <20090307170024.2E25F2082B2@bastion.fedora.phx.redhat.com> kevin has added Package libkml with summary A KML library written in C++ with bindings to other languages kevin has approved Package libkml kevin has added a Fedora devel branch for libkml with an owner of rakesh kevin has approved libkml in Fedora devel kevin has approved Package libkml kevin has set commit to Approved for provenpackager on libkml (Fedora devel) kevin has set build to Approved for provenpackager on libkml (Fedora devel) kevin has set checkout to Approved for provenpackager on libkml (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libkml From pkgdb at fedoraproject.org Sat Mar 7 16:59:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 16:59:32 +0000 Subject: [pkgdb] libkml (Fedora, 10) updated by kevin Message-ID: <20090307170024.E0809208545@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for libkml kevin has set commit to Approved for provenpackager on libkml (Fedora 10) kevin has set build to Approved for provenpackager on libkml (Fedora 10) kevin has set checkout to Approved for provenpackager on libkml (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libkml From kevin at fedoraproject.org Sat Mar 7 17:00:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:00:00 +0000 (UTC) Subject: rpms/libkml/devel - New directory Message-ID: <20090307170000.B5C3370117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libkml/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa23899/rpms/libkml/devel Log Message: Directory /cvs/pkgs/rpms/libkml/devel added to the repository From kevin at fedoraproject.org Sat Mar 7 17:00:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:00:00 +0000 (UTC) Subject: rpms/libkml - New directory Message-ID: <20090307170000.6036F70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libkml In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa23899/rpms/libkml Log Message: Directory /cvs/pkgs/rpms/libkml added to the repository From kevin at fedoraproject.org Sat Mar 7 17:00:19 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:00:19 +0000 (UTC) Subject: rpms/libkml Makefile,NONE,1.1 Message-ID: <20090307170019.BAB6170116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libkml In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa23899/rpms/libkml Added Files: Makefile Log Message: Setup of module libkml --- NEW FILE Makefile --- # Top level Makefile for module libkml all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sat Mar 7 17:00:20 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:00:20 +0000 (UTC) Subject: rpms/libkml/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307170020.4A19870118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libkml/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa23899/rpms/libkml/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libkml --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libkml # $Id: Makefile,v 1.1 2009/03/07 17:00:20 kevin Exp $ NAME := libkml SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sat Mar 7 17:04:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:04:54 +0000 Subject: [pkgdb] libzdb was added for bjohnson Message-ID: <20090307170452.73C7E2082B2@bastion.fedora.phx.redhat.com> kevin has added Package libzdb with summary A small, fast, and easy to use database API kevin has approved Package libzdb kevin has added a Fedora devel branch for libzdb with an owner of bjohnson kevin has approved libzdb in Fedora devel kevin has approved Package libzdb kevin has set commit to Approved for provenpackager on libzdb (Fedora devel) kevin has set build to Approved for provenpackager on libzdb (Fedora devel) kevin has set checkout to Approved for provenpackager on libzdb (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libzdb From pkgdb at fedoraproject.org Sat Mar 7 17:04:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:04:32 +0000 Subject: [pkgdb] libzdb (Fedora EPEL, 5) updated by kevin Message-ID: <20090307170453.3FE4B208545@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for libzdb kevin has set commit to Approved for provenpackager on libzdb (Fedora EPEL 5) kevin has set build to Approved for provenpackager on libzdb (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on libzdb (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libzdb From kevin at fedoraproject.org Sat Mar 7 17:04:20 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:04:20 +0000 (UTC) Subject: rpms/libzdb - New directory Message-ID: <20090307170420.2CE0970116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libzdb In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24708/rpms/libzdb Log Message: Directory /cvs/pkgs/rpms/libzdb added to the repository From pkgdb at fedoraproject.org Sat Mar 7 17:04:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:04:32 +0000 Subject: [pkgdb] libzdb (Fedora, 10) updated by kevin Message-ID: <20090307170453.50C70208548@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for libzdb kevin has set commit to Approved for provenpackager on libzdb (Fedora 10) kevin has set build to Approved for provenpackager on libzdb (Fedora 10) kevin has set checkout to Approved for provenpackager on libzdb (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libzdb From kevin at fedoraproject.org Sat Mar 7 17:04:20 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:04:20 +0000 (UTC) Subject: rpms/libzdb/devel - New directory Message-ID: <20090307170420.6AD2070116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libzdb/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24708/rpms/libzdb/devel Log Message: Directory /cvs/pkgs/rpms/libzdb/devel added to the repository From kevin at fedoraproject.org Sat Mar 7 17:04:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:04:37 +0000 (UTC) Subject: rpms/libzdb Makefile,NONE,1.1 Message-ID: <20090307170437.1746A70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libzdb In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24708/rpms/libzdb Added Files: Makefile Log Message: Setup of module libzdb --- NEW FILE Makefile --- # Top level Makefile for module libzdb all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sat Mar 7 17:04:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:04:37 +0000 (UTC) Subject: rpms/libzdb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307170437.55D5370118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libzdb/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24708/rpms/libzdb/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libzdb --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libzdb # $Id: Makefile,v 1.1 2009/03/07 17:04:37 kevin Exp $ NAME := libzdb SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sat Mar 7 17:08:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:08:11 +0000 Subject: [pkgdb] tkgate was added for tnorth Message-ID: <20090307170832.2D29520820B@bastion.fedora.phx.redhat.com> kevin has added Package tkgate with summary Digital Circuit Simulator kevin has approved Package tkgate kevin has added a Fedora devel branch for tkgate with an owner of tnorth kevin has approved tkgate in Fedora devel kevin has approved Package tkgate kevin has set commit to Approved for provenpackager on tkgate (Fedora devel) kevin has set build to Approved for provenpackager on tkgate (Fedora devel) kevin has set checkout to Approved for provenpackager on tkgate (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tkgate From pkgdb at fedoraproject.org Sat Mar 7 17:08:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:08:38 +0000 Subject: [pkgdb] tkgate (Fedora, 9) updated by kevin Message-ID: <20090307170838.D4D6B208546@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for tkgate kevin has set commit to Approved for provenpackager on tkgate (Fedora 9) kevin has set build to Approved for provenpackager on tkgate (Fedora 9) kevin has set checkout to Approved for provenpackager on tkgate (Fedora 9) kevin approved watchbugzilla on tkgate (Fedora 9) for chitlesh kevin approved watchcommits on tkgate (Fedora 9) for chitlesh To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tkgate From pkgdb at fedoraproject.org Sat Mar 7 17:08:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:08:38 +0000 Subject: [pkgdb] tkgate (Fedora, 10) updated by kevin Message-ID: <20090307170838.DB1CF208548@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for tkgate kevin has set commit to Approved for provenpackager on tkgate (Fedora 10) kevin has set build to Approved for provenpackager on tkgate (Fedora 10) kevin has set checkout to Approved for provenpackager on tkgate (Fedora 10) kevin approved watchbugzilla on tkgate (Fedora 10) for chitlesh kevin approved watchcommits on tkgate (Fedora 10) for chitlesh To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tkgate From pkgdb at fedoraproject.org Sat Mar 7 17:08:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:08:38 +0000 Subject: [pkgdb] tkgate (Fedora, devel) updated by kevin Message-ID: <20090307170838.EBE7D20854B@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on tkgate (Fedora devel) for chitlesh kevin approved watchcommits on tkgate (Fedora devel) for chitlesh To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tkgate From kevin at fedoraproject.org Sat Mar 7 17:08:03 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:08:03 +0000 (UTC) Subject: rpms/tkgate - New directory Message-ID: <20090307170803.241AC70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tkgate In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss25489/rpms/tkgate Log Message: Directory /cvs/pkgs/rpms/tkgate added to the repository From kevin at fedoraproject.org Sat Mar 7 17:08:03 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:08:03 +0000 (UTC) Subject: rpms/tkgate/devel - New directory Message-ID: <20090307170803.62BC070116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tkgate/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss25489/rpms/tkgate/devel Log Message: Directory /cvs/pkgs/rpms/tkgate/devel added to the repository From pkgdb at fedoraproject.org Sat Mar 7 17:08:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:08:38 +0000 Subject: [pkgdb] tkgate (Fedora EPEL, 5) updated by kevin Message-ID: <20090307170839.AF6D120854E@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for tkgate kevin has set commit to Approved for provenpackager on tkgate (Fedora EPEL 5) kevin has set build to Approved for provenpackager on tkgate (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on tkgate (Fedora EPEL 5) kevin approved watchbugzilla on tkgate (Fedora EPEL 5) for chitlesh kevin approved watchcommits on tkgate (Fedora EPEL 5) for chitlesh To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tkgate From kevin at fedoraproject.org Sat Mar 7 17:08:19 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:08:19 +0000 (UTC) Subject: rpms/tkgate Makefile,NONE,1.1 Message-ID: <20090307170819.54AD370116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tkgate In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss25489/rpms/tkgate Added Files: Makefile Log Message: Setup of module tkgate --- NEW FILE Makefile --- # Top level Makefile for module tkgate all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sat Mar 7 17:08:19 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:08:19 +0000 (UTC) Subject: rpms/tkgate/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307170819.BC07070117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tkgate/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss25489/rpms/tkgate/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tkgate --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: tkgate # $Id: Makefile,v 1.1 2009/03/07 17:08:19 kevin Exp $ NAME := tkgate SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sat Mar 7 17:10:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:10:11 +0000 Subject: [pkgdb] PyQuante was added for jussilehtola Message-ID: <20090307171104.C7DAA208201@bastion.fedora.phx.redhat.com> kevin has added Package PyQuante with summary Python Quantum Chemistry kevin has approved Package PyQuante kevin has added a Fedora devel branch for PyQuante with an owner of jussilehtola kevin has approved PyQuante in Fedora devel kevin has approved Package PyQuante kevin has set commit to Approved for provenpackager on PyQuante (Fedora devel) kevin has set build to Approved for provenpackager on PyQuante (Fedora devel) kevin has set checkout to Approved for provenpackager on PyQuante (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyQuante From pkgdb at fedoraproject.org Sat Mar 7 17:11:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:11:10 +0000 Subject: [pkgdb] PyQuante (Fedora, 9) updated by kevin Message-ID: <20090307171108.749D2208544@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for PyQuante kevin has set commit to Approved for provenpackager on PyQuante (Fedora 9) kevin has set build to Approved for provenpackager on PyQuante (Fedora 9) kevin has set checkout to Approved for provenpackager on PyQuante (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyQuante From kevin at fedoraproject.org Sat Mar 7 17:10:34 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:10:34 +0000 (UTC) Subject: rpms/PyQuante - New directory Message-ID: <20090307171034.2580270116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/PyQuante In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26168/rpms/PyQuante Log Message: Directory /cvs/pkgs/rpms/PyQuante added to the repository From kevin at fedoraproject.org Sat Mar 7 17:10:34 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:10:34 +0000 (UTC) Subject: rpms/PyQuante/devel - New directory Message-ID: <20090307171034.5DAEF70118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/PyQuante/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26168/rpms/PyQuante/devel Log Message: Directory /cvs/pkgs/rpms/PyQuante/devel added to the repository From pkgdb at fedoraproject.org Sat Mar 7 17:11:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:11:10 +0000 Subject: [pkgdb] PyQuante (Fedora, 10) updated by kevin Message-ID: <20090307171109.42BFD208547@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for PyQuante kevin has set commit to Approved for provenpackager on PyQuante (Fedora 10) kevin has set build to Approved for provenpackager on PyQuante (Fedora 10) kevin has set checkout to Approved for provenpackager on PyQuante (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyQuante From kevin at fedoraproject.org Sat Mar 7 17:10:51 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:10:51 +0000 (UTC) Subject: rpms/PyQuante Makefile,NONE,1.1 Message-ID: <20090307171051.0231970116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/PyQuante In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26168/rpms/PyQuante Added Files: Makefile Log Message: Setup of module PyQuante --- NEW FILE Makefile --- # Top level Makefile for module PyQuante all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sat Mar 7 17:10:51 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:10:51 +0000 (UTC) Subject: rpms/PyQuante/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307171051.4732770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/PyQuante/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26168/rpms/PyQuante/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module PyQuante --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: PyQuante # $Id: Makefile,v 1.1 2009/03/07 17:10:51 kevin Exp $ NAME := PyQuante SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sat Mar 7 17:13:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:13:21 +0000 Subject: [pkgdb] auto-buildrequires was added for oget Message-ID: <20090307171321.96A982082B2@bastion.fedora.phx.redhat.com> kevin has added Package auto-buildrequires with summary Work out BuildRequires for rpmbuild automatically kevin has approved Package auto-buildrequires kevin has added a Fedora devel branch for auto-buildrequires with an owner of oget kevin has approved auto-buildrequires in Fedora devel kevin has approved Package auto-buildrequires kevin has set commit to Approved for provenpackager on auto-buildrequires (Fedora devel) kevin has set build to Approved for provenpackager on auto-buildrequires (Fedora devel) kevin has set checkout to Approved for provenpackager on auto-buildrequires (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/auto-buildrequires From pkgdb at fedoraproject.org Sat Mar 7 17:12:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:12:30 +0000 Subject: [pkgdb] auto-buildrequires (Fedora, 9) updated by kevin Message-ID: <20090307171322.B3927208546@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for auto-buildrequires kevin has set commit to Approved for provenpackager on auto-buildrequires (Fedora 9) kevin has set build to Approved for provenpackager on auto-buildrequires (Fedora 9) kevin has set checkout to Approved for provenpackager on auto-buildrequires (Fedora 9) kevin approved watchbugzilla on auto-buildrequires (Fedora 9) for rjones kevin approved watchcommits on auto-buildrequires (Fedora 9) for rjones kevin approved commit on auto-buildrequires (Fedora 9) for rjones kevin approved build on auto-buildrequires (Fedora 9) for rjones kevin approved approveacls on auto-buildrequires (Fedora 9) for rjones To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/auto-buildrequires From pkgdb at fedoraproject.org Sat Mar 7 17:12:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:12:30 +0000 Subject: [pkgdb] auto-buildrequires (Fedora, devel) updated by kevin Message-ID: <20090307171322.C8CB9208549@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on auto-buildrequires (Fedora devel) for rjones kevin approved watchcommits on auto-buildrequires (Fedora devel) for rjones kevin approved commit on auto-buildrequires (Fedora devel) for rjones kevin approved build on auto-buildrequires (Fedora devel) for rjones kevin approved approveacls on auto-buildrequires (Fedora devel) for rjones To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/auto-buildrequires From pkgdb at fedoraproject.org Sat Mar 7 17:12:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:12:30 +0000 Subject: [pkgdb] auto-buildrequires (Fedora, 10) updated by kevin Message-ID: <20090307171322.DE8F720854E@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for auto-buildrequires kevin has set commit to Approved for provenpackager on auto-buildrequires (Fedora 10) kevin has set build to Approved for provenpackager on auto-buildrequires (Fedora 10) kevin has set checkout to Approved for provenpackager on auto-buildrequires (Fedora 10) kevin approved watchbugzilla on auto-buildrequires (Fedora 10) for rjones kevin approved watchcommits on auto-buildrequires (Fedora 10) for rjones kevin approved commit on auto-buildrequires (Fedora 10) for rjones kevin approved build on auto-buildrequires (Fedora 10) for rjones kevin approved approveacls on auto-buildrequires (Fedora 10) for rjones To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/auto-buildrequires From kevin at fedoraproject.org Sat Mar 7 17:12:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:12:55 +0000 (UTC) Subject: rpms/auto-buildrequires - New directory Message-ID: <20090307171255.2454670117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/auto-buildrequires In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa26828/rpms/auto-buildrequires Log Message: Directory /cvs/pkgs/rpms/auto-buildrequires added to the repository From kevin at fedoraproject.org Sat Mar 7 17:13:12 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:13:12 +0000 (UTC) Subject: rpms/auto-buildrequires Makefile,NONE,1.1 Message-ID: <20090307171312.8FF9570116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/auto-buildrequires In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa26828/rpms/auto-buildrequires Added Files: Makefile Log Message: Setup of module auto-buildrequires --- NEW FILE Makefile --- # Top level Makefile for module auto-buildrequires all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sat Mar 7 17:13:12 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:13:12 +0000 (UTC) Subject: rpms/auto-buildrequires/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307171312.E7B5370117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/auto-buildrequires/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa26828/rpms/auto-buildrequires/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module auto-buildrequires --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: auto-buildrequires # $Id: Makefile,v 1.1 2009/03/07 17:13:12 kevin Exp $ NAME := auto-buildrequires SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Sat Mar 7 17:12:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:12:55 +0000 (UTC) Subject: rpms/auto-buildrequires/devel - New directory Message-ID: <20090307171255.5CAA570116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/auto-buildrequires/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa26828/rpms/auto-buildrequires/devel Log Message: Directory /cvs/pkgs/rpms/auto-buildrequires/devel added to the repository From pkgdb at fedoraproject.org Sat Mar 7 17:16:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:16:08 +0000 Subject: [pkgdb] libservicelog was added for rrakus Message-ID: <20090307171700.B48A5208543@bastion.fedora.phx.redhat.com> kevin has added Package libservicelog with summary Servicelog Database and Library kevin has approved Package libservicelog kevin has added a Fedora devel branch for libservicelog with an owner of rrakus kevin has approved libservicelog in Fedora devel kevin has approved Package libservicelog kevin has set commit to Approved for provenpackager on libservicelog (Fedora devel) kevin has set build to Approved for provenpackager on libservicelog (Fedora devel) kevin has set checkout to Approved for provenpackager on libservicelog (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libservicelog From kevin at fedoraproject.org Sat Mar 7 17:16:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:16:29 +0000 (UTC) Subject: rpms/libservicelog - New directory Message-ID: <20090307171629.2EA9F70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libservicelog In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso27665/rpms/libservicelog Log Message: Directory /cvs/pkgs/rpms/libservicelog added to the repository From kevin at fedoraproject.org Sat Mar 7 17:16:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:16:29 +0000 (UTC) Subject: rpms/libservicelog/devel - New directory Message-ID: <20090307171629.66E7670118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libservicelog/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso27665/rpms/libservicelog/devel Log Message: Directory /cvs/pkgs/rpms/libservicelog/devel added to the repository From kevin at fedoraproject.org Sat Mar 7 17:16:46 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:16:46 +0000 (UTC) Subject: rpms/libservicelog Makefile,NONE,1.1 Message-ID: <20090307171646.6238D70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libservicelog In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso27665/rpms/libservicelog Added Files: Makefile Log Message: Setup of module libservicelog --- NEW FILE Makefile --- # Top level Makefile for module libservicelog all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sat Mar 7 17:16:46 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:16:46 +0000 (UTC) Subject: rpms/libservicelog/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307171646.AD78470116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libservicelog/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso27665/rpms/libservicelog/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libservicelog --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libservicelog # $Id: Makefile,v 1.1 2009/03/07 17:16:46 kevin Exp $ NAME := libservicelog SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sat Mar 7 17:20:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:20:04 +0000 Subject: [pkgdb] perl-Verilog-Codegen was added for chitlesh Message-ID: <20090307172003.1D3BA208543@bastion.fedora.phx.redhat.com> kevin has added Package perl-Verilog-Codegen with summary Verilog code generator kevin has approved Package perl-Verilog-Codegen kevin has added a Fedora devel branch for perl-Verilog-Codegen with an owner of chitlesh kevin has approved perl-Verilog-Codegen in Fedora devel kevin has approved Package perl-Verilog-Codegen kevin has set commit to Approved for provenpackager on perl-Verilog-Codegen (Fedora devel) kevin has set build to Approved for provenpackager on perl-Verilog-Codegen (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Verilog-Codegen (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Verilog-Codegen From pkgdb at fedoraproject.org Sat Mar 7 17:19:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:19:43 +0000 Subject: [pkgdb] perl-Verilog-Codegen (Fedora EPEL, 5) updated by kevin Message-ID: <20090307172004.07376208546@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for perl-Verilog-Codegen kevin has set commit to Approved for provenpackager on perl-Verilog-Codegen (Fedora EPEL 5) kevin has set build to Approved for provenpackager on perl-Verilog-Codegen (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on perl-Verilog-Codegen (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Verilog-Codegen From pkgdb at fedoraproject.org Sat Mar 7 17:19:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:19:43 +0000 Subject: [pkgdb] perl-Verilog-Codegen (Fedora, 9) updated by kevin Message-ID: <20090307172004.1FACB20854A@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-Verilog-Codegen kevin has set commit to Approved for provenpackager on perl-Verilog-Codegen (Fedora 9) kevin has set build to Approved for provenpackager on perl-Verilog-Codegen (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-Verilog-Codegen (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Verilog-Codegen From pkgdb at fedoraproject.org Sat Mar 7 17:19:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:19:43 +0000 Subject: [pkgdb] perl-Verilog-Codegen (Fedora, 10) updated by kevin Message-ID: <20090307172004.3B66620854C@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Verilog-Codegen kevin has set commit to Approved for provenpackager on perl-Verilog-Codegen (Fedora 10) kevin has set build to Approved for provenpackager on perl-Verilog-Codegen (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Verilog-Codegen (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Verilog-Codegen From tnorth at fedoraproject.org Sat Mar 7 17:19:12 2009 From: tnorth at fedoraproject.org (Thibault North) Date: Sat, 7 Mar 2009 17:19:12 +0000 (UTC) Subject: rpms/tkgate/devel import.log, NONE, 1.1 tkgate-2.0-doc.patch, NONE, 1.1 tkgate.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307171912.AD32B70116@cvs1.fedora.phx.redhat.com> Author: tnorth Update of /cvs/pkgs/rpms/tkgate/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28333/devel Modified Files: .cvsignore sources Added Files: import.log tkgate-2.0-doc.patch tkgate.spec Log Message: initial package --- NEW FILE import.log --- tkgate-2_0-5_beta7_fc11:HEAD:tkgate-2.0-5.beta7.fc11.src.rpm:1236392128 tkgate-2.0-doc.patch: --- NEW FILE tkgate-2.0-doc.patch --- --- Makefile.in 2009-01-11 01:13:54.000000000 +0100 +++ Makefile.in_m 2009-01-21 22:47:18.000000000 +0100 @@ -216,7 +216,7 @@ # # List of directories that contain data files necessary for tkgate to run. # -TKG_DATADIRS = scripts bindings doc gdf images locale povray primitives vlib vpd test +TKG_DATADIRS = scripts bindings gdf images locale povray primitives vlib vpd # # Subdirectories in which more makefiles can be found @@ -226,7 +226,7 @@ # # List of data files in this directory that should be included with a tkgate distribution. # -dist_pkgdata_DATA = README README.verga COPYING INSTALL TODO site-preferences license.txt pkg-comment pkg-descr +dist_pkgdata_DATA = # # List of man pages for tkgate --- NEW FILE tkgate.spec --- Name: tkgate Version: 2.0 Release: 5.beta7%{?dist} Summary: An event driven digital circuit simulator Group: Applications/Engineering License: GPLv2+ URL: http://www.tkgate.org/ Patch0: tkgate-2.0-doc.patch Source0: ftp://gadoid.ices.cmu.edu/pub/tkgate/pre-release/%{name}-%{version}-b7.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tk-devel tcl-devel libICE-devel libSM-devel BuildRequires: desktop-file-utils Requires: electronics-menu %description TkGate is a event driven digital circuit simulator based on Verilog. TkGate supports a wide range of primitive circuit elements as well as user-defined modules for hierarchical design. %package ca Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description ca This package contains the Catalan locales and examples for tkgate, Digital Circuit Simulator %package cs Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description cs This package contains the Czech locales and examples for tkgate, Digital Circuit Simulator %package cy Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description cy This package contains the Welsh locales and examples for tkgate, Digital Circuit Simulator %package de Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description de This package contains the German locales and examples for tkgate, Digital Circuit Simulator %package es Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description es This package contains the Spanish locales and examples for tkgate, Digital Circuit Simulator %package fr Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description fr This package contains the French locales and examples for tkgate, Digital Circuit Simulator %package it Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description it This package contains the Italian locales and examples for tkgate, Digital Circuit Simulator %package ja Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description ja This package contains the Japanese locales and examples for tkgate, Digital Circuit Simulator %prep %setup -q -n %{name}-%{version}-b7 %patch0 -p0 -b .doc sed -i "s|\"\${tkg_gateHome}/libexec/verga\"|\"%{_bindir}/verga\"|" scripts/parms.tcl sed -i "s|license.txt||" scripts/license.tcl sed -i "s|TKGATE_LIBDIRS=\"\(.*\)\"|TKGATE_LIBDIRS=\"\1 %{_libdir}\"|" configure # E: backup-file-in-package find . -type f -name "*~" -exec rm -f {} ';' find . -type f -name "\#*\#" -exec rm -f {} ';' # spurious-executable-perm chmod 0755 scripts/tree.tcl chmod 0644 test/verga/maketests.sh chmod 0644 test/verga/runtests.sh # E: zero-length %{__rm} -f locale/{en,ja}/tutorials/definition.txt %{__rm} -f bindings/none %{__rm} -f scripts/dip.tcl %{__rm} -f test/verga/grammar.out cat > %{name}.desktop << EOF [Desktop Entry] Encoding=UTF-8 Name=Digital circuit simulator GenericName=Verilog circuit simulator Comment=Digital circuit simulator Type=Application Exec=tkgate Icon=tkgate Categories=Engineering;Electronics; EOF %build %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} INSTALL="install -p" install DESTDIR=%{buildroot} # Symlink points to BuildRoot: %{__rm} -rf %{buildroot}%{_datadir}/%{name}/libexec/ # desktop file and its icon desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ %{name}.desktop install -d %{buildroot}%{_datadir}/pixmaps/ install -pm 0644 images/run01.gif %{buildroot}%{_datadir}/pixmaps/%{name}.png cp -p site-preferences %{buildroot}%{_datadir}/%{name}/site-preferences %clean %{__rm} -rf %{buildroot} %files ca %defattr(-,root,root,-) %{_datadir}/%{name}/locale/ca/* %files cs %defattr(-,root,root,-) %{_datadir}/%{name}/locale/cs/* %files cy %defattr(-,root,root,-) %{_datadir}/%{name}/locale/cy/* %files de %defattr(-,root,root,-) %{_datadir}/%{name}/locale/de/* %files es %defattr(-,root,root,-) %{_datadir}/%{name}/locale/es/* %files fr %defattr(-,root,root,-) %{_datadir}/%{name}/locale/fr/* %files it %defattr(-,root,root,-) %{_datadir}/%{name}/locale/it/* %files ja %defattr(-,root,root,-) %{_datadir}/%{name}/locale/ja/* %files %defattr(-,root,root,-) %doc README README.verga COPYING %doc license.txt pkg-comment pkg-descr TODO %doc doc/ test/ %{_bindir}/gmac %{_bindir}/%{name} %{_bindir}/verga %{_datadir}/%{name} %{_mandir}/man1/gmac.1.gz %{_mandir}/man1/tkgate.1.gz %{_mandir}/man1/verga.1.gz %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png %exclude %{_datadir}/%{name}/locale/ca %exclude %{_datadir}/%{name}/locale/cs %exclude %{_datadir}/%{name}/locale/cy %exclude %{_datadir}/%{name}/locale/de %exclude %{_datadir}/%{name}/locale/es %exclude %{_datadir}/%{name}/locale/fr %exclude %{_datadir}/%{name}/locale/it %exclude %{_datadir}/%{name}/locale/ja %changelog * Fri Mar 6 2009 Thibault North - 2.0-5.beta7 - Minor fixes required for the package * Thu Mar 5 2009 Thibault North - 2.0-4.beta7 - Fixes in installed files * Tue Feb 24 2009 Thibault North - 2.0-1.beta7 - Updated to beta7 * Thu Feb 20 2009 Thibault North - 2.0-3.beta6 - Updated to beta6 - Separated locales - Compilation fixes for 64 bits arch * Wed Jan 21 2009 Chitlesh Goorah - 2.0-2.beta4 - updated to beta4 * Sat Dec 06 2008 Chitlesh Goorah 2.0-1.alpha11 - Initial package for fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tkgate/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:08:19 -0000 1.1 +++ .cvsignore 7 Mar 2009 17:18:42 -0000 1.2 @@ -0,0 +1 @@ +tkgate-2.0-b7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tkgate/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:08:19 -0000 1.1 +++ sources 7 Mar 2009 17:18:42 -0000 1.2 @@ -0,0 +1 @@ +8f4304aace787656ed66ad736011cbb4 tkgate-2.0-b7.tar.gz From kevin at fedoraproject.org Sat Mar 7 17:19:33 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:19:33 +0000 (UTC) Subject: rpms/perl-Verilog-Codegen - New directory Message-ID: <20090307171933.23FB870116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Verilog-Codegen In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG28690/rpms/perl-Verilog-Codegen Log Message: Directory /cvs/pkgs/rpms/perl-Verilog-Codegen added to the repository From kevin at fedoraproject.org Sat Mar 7 17:19:33 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:19:33 +0000 (UTC) Subject: rpms/perl-Verilog-Codegen/devel - New directory Message-ID: <20090307171933.6373170116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Verilog-Codegen/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG28690/rpms/perl-Verilog-Codegen/devel Log Message: Directory /cvs/pkgs/rpms/perl-Verilog-Codegen/devel added to the repository From kevin at fedoraproject.org Sat Mar 7 17:19:49 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:19:49 +0000 (UTC) Subject: rpms/perl-Verilog-Codegen Makefile,NONE,1.1 Message-ID: <20090307171949.8ECEC70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Verilog-Codegen In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG28690/rpms/perl-Verilog-Codegen Added Files: Makefile Log Message: Setup of module perl-Verilog-Codegen --- NEW FILE Makefile --- # Top level Makefile for module perl-Verilog-Codegen all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sat Mar 7 17:19:49 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:19:49 +0000 (UTC) Subject: rpms/perl-Verilog-Codegen/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307171949.D1E3C70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Verilog-Codegen/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG28690/rpms/perl-Verilog-Codegen/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Verilog-Codegen --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Verilog-Codegen # $Id: Makefile,v 1.1 2009/03/07 17:19:49 kevin Exp $ NAME := perl-Verilog-Codegen SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sat Mar 7 17:21:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:21:33 +0000 Subject: [pkgdb] scheme2js was added for salimma Message-ID: <20090307172131.276BB2082B2@bastion.fedora.phx.redhat.com> kevin has added Package scheme2js with summary Scheme to JavaScript compiler kevin has approved Package scheme2js kevin has added a Fedora devel branch for scheme2js with an owner of salimma kevin has approved scheme2js in Fedora devel kevin has approved Package scheme2js kevin has set commit to Approved for provenpackager on scheme2js (Fedora devel) kevin has set build to Approved for provenpackager on scheme2js (Fedora devel) kevin has set checkout to Approved for provenpackager on scheme2js (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scheme2js From pkgdb at fedoraproject.org Sat Mar 7 17:21:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:21:11 +0000 Subject: [pkgdb] scheme2js (Fedora, 9) updated by kevin Message-ID: <20090307172132.3917E208545@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for scheme2js kevin has set commit to Approved for provenpackager on scheme2js (Fedora 9) kevin has set build to Approved for provenpackager on scheme2js (Fedora 9) kevin has set checkout to Approved for provenpackager on scheme2js (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scheme2js From pkgdb at fedoraproject.org Sat Mar 7 17:21:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:21:11 +0000 Subject: [pkgdb] scheme2js (Fedora, 10) updated by kevin Message-ID: <20090307172132.45FB0208549@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for scheme2js kevin has set commit to Approved for provenpackager on scheme2js (Fedora 10) kevin has set build to Approved for provenpackager on scheme2js (Fedora 10) kevin has set checkout to Approved for provenpackager on scheme2js (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scheme2js From pkgdb at fedoraproject.org Sat Mar 7 17:21:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:21:11 +0000 Subject: [pkgdb] scheme2js (Fedora EPEL, 5) updated by kevin Message-ID: <20090307172132.5046F208546@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for scheme2js kevin has set commit to Approved for provenpackager on scheme2js (Fedora EPEL 5) kevin has set build to Approved for provenpackager on scheme2js (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on scheme2js (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scheme2js From kevin at fedoraproject.org Sat Mar 7 17:20:59 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:20:59 +0000 (UTC) Subject: rpms/scheme2js/devel - New directory Message-ID: <20090307172059.641B770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/scheme2js/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst29272/rpms/scheme2js/devel Log Message: Directory /cvs/pkgs/rpms/scheme2js/devel added to the repository From kevin at fedoraproject.org Sat Mar 7 17:20:59 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:20:59 +0000 (UTC) Subject: rpms/scheme2js - New directory Message-ID: <20090307172059.2332070116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/scheme2js In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst29272/rpms/scheme2js Log Message: Directory /cvs/pkgs/rpms/scheme2js added to the repository From kevin at fedoraproject.org Sat Mar 7 17:21:19 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:21:19 +0000 (UTC) Subject: rpms/scheme2js Makefile,NONE,1.1 Message-ID: <20090307172119.04A3570116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/scheme2js In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst29272/rpms/scheme2js Added Files: Makefile Log Message: Setup of module scheme2js --- NEW FILE Makefile --- # Top level Makefile for module scheme2js all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sat Mar 7 17:21:19 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:21:19 +0000 (UTC) Subject: rpms/scheme2js/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307172119.62A9B70118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/scheme2js/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst29272/rpms/scheme2js/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module scheme2js --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: scheme2js # $Id: Makefile,v 1.1 2009/03/07 17:21:19 kevin Exp $ NAME := scheme2js SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From tnorth at fedoraproject.org Sat Mar 7 17:21:11 2009 From: tnorth at fedoraproject.org (Thibault North) Date: Sat, 7 Mar 2009 17:21:11 +0000 (UTC) Subject: rpms/tkgate/F-10 import.log, NONE, 1.1 tkgate-2.0-doc.patch, NONE, 1.1 tkgate.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307172111.9BEF170116@cvs1.fedora.phx.redhat.com> Author: tnorth Update of /cvs/pkgs/rpms/tkgate/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29187/F-10 Modified Files: .cvsignore sources Added Files: import.log tkgate-2.0-doc.patch tkgate.spec Log Message: Initial package --- NEW FILE import.log --- tkgate-2_0-5_beta7_fc11:F-10:tkgate-2.0-5.beta7.fc11.src.rpm:1236446409 tkgate-2.0-doc.patch: --- NEW FILE tkgate-2.0-doc.patch --- --- Makefile.in 2009-01-11 01:13:54.000000000 +0100 +++ Makefile.in_m 2009-01-21 22:47:18.000000000 +0100 @@ -216,7 +216,7 @@ # # List of directories that contain data files necessary for tkgate to run. # -TKG_DATADIRS = scripts bindings doc gdf images locale povray primitives vlib vpd test +TKG_DATADIRS = scripts bindings gdf images locale povray primitives vlib vpd # # Subdirectories in which more makefiles can be found @@ -226,7 +226,7 @@ # # List of data files in this directory that should be included with a tkgate distribution. # -dist_pkgdata_DATA = README README.verga COPYING INSTALL TODO site-preferences license.txt pkg-comment pkg-descr +dist_pkgdata_DATA = # # List of man pages for tkgate --- NEW FILE tkgate.spec --- Name: tkgate Version: 2.0 Release: 5.beta7%{?dist} Summary: An event driven digital circuit simulator Group: Applications/Engineering License: GPLv2+ URL: http://www.tkgate.org/ Patch0: tkgate-2.0-doc.patch Source0: ftp://gadoid.ices.cmu.edu/pub/tkgate/pre-release/%{name}-%{version}-b7.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tk-devel tcl-devel libICE-devel libSM-devel BuildRequires: desktop-file-utils Requires: electronics-menu %description TkGate is a event driven digital circuit simulator based on Verilog. TkGate supports a wide range of primitive circuit elements as well as user-defined modules for hierarchical design. %package ca Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description ca This package contains the Catalan locales and examples for tkgate, Digital Circuit Simulator %package cs Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description cs This package contains the Czech locales and examples for tkgate, Digital Circuit Simulator %package cy Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description cy This package contains the Welsh locales and examples for tkgate, Digital Circuit Simulator %package de Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description de This package contains the German locales and examples for tkgate, Digital Circuit Simulator %package es Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description es This package contains the Spanish locales and examples for tkgate, Digital Circuit Simulator %package fr Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description fr This package contains the French locales and examples for tkgate, Digital Circuit Simulator %package it Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description it This package contains the Italian locales and examples for tkgate, Digital Circuit Simulator %package ja Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description ja This package contains the Japanese locales and examples for tkgate, Digital Circuit Simulator %prep %setup -q -n %{name}-%{version}-b7 %patch0 -p0 -b .doc sed -i "s|\"\${tkg_gateHome}/libexec/verga\"|\"%{_bindir}/verga\"|" scripts/parms.tcl sed -i "s|license.txt||" scripts/license.tcl sed -i "s|TKGATE_LIBDIRS=\"\(.*\)\"|TKGATE_LIBDIRS=\"\1 %{_libdir}\"|" configure # E: backup-file-in-package find . -type f -name "*~" -exec rm -f {} ';' find . -type f -name "\#*\#" -exec rm -f {} ';' # spurious-executable-perm chmod 0755 scripts/tree.tcl chmod 0644 test/verga/maketests.sh chmod 0644 test/verga/runtests.sh # E: zero-length %{__rm} -f locale/{en,ja}/tutorials/definition.txt %{__rm} -f bindings/none %{__rm} -f scripts/dip.tcl %{__rm} -f test/verga/grammar.out cat > %{name}.desktop << EOF [Desktop Entry] Encoding=UTF-8 Name=Digital circuit simulator GenericName=Verilog circuit simulator Comment=Digital circuit simulator Type=Application Exec=tkgate Icon=tkgate Categories=Engineering;Electronics; EOF %build %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} INSTALL="install -p" install DESTDIR=%{buildroot} # Symlink points to BuildRoot: %{__rm} -rf %{buildroot}%{_datadir}/%{name}/libexec/ # desktop file and its icon desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ %{name}.desktop install -d %{buildroot}%{_datadir}/pixmaps/ install -pm 0644 images/run01.gif %{buildroot}%{_datadir}/pixmaps/%{name}.png cp -p site-preferences %{buildroot}%{_datadir}/%{name}/site-preferences %clean %{__rm} -rf %{buildroot} %files ca %defattr(-,root,root,-) %{_datadir}/%{name}/locale/ca/* %files cs %defattr(-,root,root,-) %{_datadir}/%{name}/locale/cs/* %files cy %defattr(-,root,root,-) %{_datadir}/%{name}/locale/cy/* %files de %defattr(-,root,root,-) %{_datadir}/%{name}/locale/de/* %files es %defattr(-,root,root,-) %{_datadir}/%{name}/locale/es/* %files fr %defattr(-,root,root,-) %{_datadir}/%{name}/locale/fr/* %files it %defattr(-,root,root,-) %{_datadir}/%{name}/locale/it/* %files ja %defattr(-,root,root,-) %{_datadir}/%{name}/locale/ja/* %files %defattr(-,root,root,-) %doc README README.verga COPYING %doc license.txt pkg-comment pkg-descr TODO %doc doc/ test/ %{_bindir}/gmac %{_bindir}/%{name} %{_bindir}/verga %{_datadir}/%{name} %{_mandir}/man1/gmac.1.gz %{_mandir}/man1/tkgate.1.gz %{_mandir}/man1/verga.1.gz %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png %exclude %{_datadir}/%{name}/locale/ca %exclude %{_datadir}/%{name}/locale/cs %exclude %{_datadir}/%{name}/locale/cy %exclude %{_datadir}/%{name}/locale/de %exclude %{_datadir}/%{name}/locale/es %exclude %{_datadir}/%{name}/locale/fr %exclude %{_datadir}/%{name}/locale/it %exclude %{_datadir}/%{name}/locale/ja %changelog * Fri Mar 6 2009 Thibault North - 2.0-5.beta7 - Minor fixes required for the package * Thu Mar 5 2009 Thibault North - 2.0-4.beta7 - Fixes in installed files * Tue Feb 24 2009 Thibault North - 2.0-1.beta7 - Updated to beta7 * Thu Feb 20 2009 Thibault North - 2.0-3.beta6 - Updated to beta6 - Separated locales - Compilation fixes for 64 bits arch * Wed Jan 21 2009 Chitlesh Goorah - 2.0-2.beta4 - updated to beta4 * Sat Dec 06 2008 Chitlesh Goorah 2.0-1.alpha11 - Initial package for fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tkgate/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:08:19 -0000 1.1 +++ .cvsignore 7 Mar 2009 17:20:41 -0000 1.2 @@ -0,0 +1 @@ +tkgate-2.0-b7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tkgate/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:08:19 -0000 1.1 +++ sources 7 Mar 2009 17:20:41 -0000 1.2 @@ -0,0 +1 @@ +8f4304aace787656ed66ad736011cbb4 tkgate-2.0-b7.tar.gz From rakesh at fedoraproject.org Sat Mar 7 17:21:39 2009 From: rakesh at fedoraproject.org (Rakesh Pandit) Date: Sat, 7 Mar 2009 17:21:39 +0000 (UTC) Subject: rpms/libkml/devel import.log, NONE, 1.1 libkml-third_party_removal.diff, NONE, 1.1 libkml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307172139.5A9F270116@cvs1.fedora.phx.redhat.com> Author: rakesh Update of /cvs/pkgs/rpms/libkml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28559/devel Modified Files: .cvsignore sources Added Files: import.log libkml-third_party_removal.diff libkml.spec Log Message: Initial import. --- NEW FILE import.log --- libkml-0_6_1-2_fc10:HEAD:libkml-0.6.1-2.fc10.src.rpm:1236446111 libkml-third_party_removal.diff: --- NEW FILE libkml-third_party_removal.diff --- --- configure.ac~ 2009-01-12 20:34:47.000000000 +0300 +++ configure.ac 2009-01-30 12:21:01.018236863 +0300 @@ -210,7 +210,6 @@ testdata/update/Makefile testdata/xal/Makefile testdata/xsd/Makefile - third_party/Makefile xcode/Makefile xcode/LibKML/Makefile ]) --- examples/engine/Makefile.am~ 2009-01-09 22:31:04.000000000 +0300 +++ examples/engine/Makefile.am 2009-01-30 15:09:43.408236214 +0300 @@ -1,6 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include +AM_CPPFLAGS = -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti --- examples/gpx/Makefile.am~ 2008-10-28 07:30:02.000000000 +0300 +++ examples/gpx/Makefile.am 2009-01-30 15:08:44.819235790 +0300 @@ -1,5 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 +AM_CPPFLAGS = -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti --- examples/hellonet/Makefile.am~ 2008-10-28 07:30:02.000000000 +0300 +++ examples/hellonet/Makefile.am 2009-01-30 16:07:34.089236539 +0300 @@ -1,8 +1,6 @@ if HAVE_CURL AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/examples/hellonet \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include + -I$(top_srcdir)/examples/hellonet if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti --- examples/helloworld/Makefile.am~ 2009-01-10 01:04:32.000000000 +0300 +++ examples/helloworld/Makefile.am 2009-01-30 16:05:34.819235683 +0300 @@ -1,7 +1,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/examples/helloworld \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include + -I$(top_srcdir)/examples/helloworld if GCC @@ -11,7 +9,7 @@ noinst_LTLIBRARIES = libhelloutil.la libhelloutil_la_SOURCES = print.cc -libhelloutil_la_LIBADD = $(top_builddir)/third_party/libminizip.la +libhelloutil_la_LIBADD = -lminizip -lz noinst_PROGRAMS = countkml createkml checklinks helloattrs helloenum \ hellofeatures hellofolder hellogeometry hellohref hellokmz \ --- examples/regionator/Makefile.am~ 2009-01-09 22:31:04.000000000 +0300 +++ examples/regionator/Makefile.am 2009-01-30 15:14:04.349235516 +0300 @@ -1,7 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include \ - -I$(top_srcdir)/third_party/zlib-1.2.3/contrib +AM_CPPFLAGS = -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti --- examples/xsd/Makefile.am~ 2008-11-04 21:58:19.000000000 +0300 +++ examples/xsd/Makefile.am 2009-01-30 15:15:02.697234587 +0300 @@ -1,6 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/examples/xsd \ - -I$(top_srcdir)/third_party/boost_1_34_1 +AM_CPPFLAGS = -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti --- Makefile.am~ 2009-01-09 22:31:04.000000000 +0300 +++ Makefile.am 2009-01-30 12:20:11.472234263 +0300 @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 # Order is important: -SUBDIRS = third_party src testdata examples msvc xcode +SUBDIRS = src testdata examples msvc xcode EXTRA_DIST = \ AUTHORS \ --- src/kml/base/Makefile.am~ 2009-01-09 22:31:01.000000000 +0300 +++ src/kml/base/Makefile.am 2009-01-30 14:19:54.415237475 +0300 @@ -1,14 +1,11 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include \ - -I$(top_srcdir)/third_party/googletest-r108/include +AM_CPPFLAGS = -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti AM_TEST_CXXFLAGS = -Wall -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0 endif -libkmlbase_la_LDFLAGS = -lexpat +libkmlbase_la_LDFLAGS = -lexpat -luriparser lib_LTLIBRARIES = libkmlbase.la libkmlbase_la_SOURCES = \ @@ -75,90 +72,71 @@ attributes_test_SOURCES = attributes_test.cc attributes_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -attributes_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +attributes_test_LDADD = libkmlbase.la color32_test_SOURCES = color32_test.cc color32_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -color32_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +color32_test_LDADD = libkmlbase.la date_time_test_SOURCES = date_time_test.cc date_time_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -date_time_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +date_time_test_LDADD = libkmlbase.la expat_handler_ns_test_SOURCES = expat_handler_ns_test.cc expat_handler_ns_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -expat_handler_ns_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +expat_handler_ns_test_LDADD = libkmlbase.la expat_parser_test_SOURCES = expat_parser_test.cc expat_parser_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -expat_parser_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +expat_parser_test_LDADD = libkmlbase.la file_test_SOURCES = file_test.cc file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) -file_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +file_test_LDADD = libkmlbase.la net_cache_test_SOURCES = net_cache_test.cc net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) -net_cache_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la +net_cache_test_LDADD = libkmlbase.la referent_test_SOURCES = referent_test.cc referent_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -referent_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +referent_test_LDADD= libkmlbase.la tempfile_test_SOURCES = tempfile_test.cc tempfile_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) -tempfile_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +tempfile_test_LDADD = libkmlbase.la string_util_test_SOURCES = string_util_test.cc string_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -string_util_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +string_util_test_LDADD= libkmlbase.la time_util_test_SOURCES = time_util_test.cc time_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -time_util_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +time_util_test_LDADD= libkmlbase.la util_test_SOURCES = util_test.cc util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -util_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +util_test_LDADD= libkmlbase.la uri_parser_test_SOURCES = uri_parser_test.cc uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) -uri_parser_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la +uri_parser_test_LDADD= libkmlbase.la vec3_test_SOURCES = vec3_test.cc vec3_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -vec3_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +vec3_test_LDADD= libkmlbase.la xml_element_test_SOURCES = xml_element_test.cc xml_element_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -xml_element_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +xml_element_test_LDADD= libkmlbase.la xml_file_test_SOURCES = xml_file_test.cc xml_file_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -xml_file_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +xml_file_test_LDADD= libkmlbase.la xmlns_test_SOURCES = xmlns_test.cc xmlns_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -xmlns_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +xmlns_test_LDADD= libkmlbase.la CLEANFILES = check_PROGRAMS --- src/kml/convenience/Makefile.am~ 2008-10-28 07:29:53.000000000 +0300 +++ src/kml/convenience/Makefile.am 2009-01-30 13:08:16.410236843 +0300 @@ -1,7 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include \ - -I$(top_srcdir)/third_party/googletest-r108/include +AM_CPPFLAGS = -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti @@ -40,47 +37,41 @@ convenience_test_LDADD = libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la csv_file_test_SOURCES = csv_file_test.cc csv_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) csv_file_test_LDADD = libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la element_counter_test_SOURCES = element_counter_test.cc element_counter_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) element_counter_test_LDADD = libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la feature_list_test_SOURCES = feature_list_test.cc feature_list_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) feature_list_test_LDADD = libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la gpx_trk_pt_handler_test_SOURCES = gpx_trk_pt_handler_test.cc gpx_trk_pt_handler_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) gpx_trk_pt_handler_test_LDADD = libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/dom/libkmldom.la kmz_check_links_test_SOURCES = kmz_check_links_test.cc kmz_check_links_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) kmz_check_links_test_LDADD = libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la CLEANFILES = check_PROGRAMS --- src/kml/dom/Makefile.am~ 2009-01-09 22:31:00.000000000 +0300 +++ src/kml/dom/Makefile.am 2009-01-30 14:28:40.501235777 +0300 @@ -1,12 +1,12 @@ -AM_CPPFLAGS= -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/googletest-r108/include +AM_CPPFLAGS= -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti AM_TEST_CXXFLAGS = -Wall -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0 endif +libkmldom_la_LDFLAGS = -lexpat + lib_LTLIBRARIES = libkmldom.la libkmldom_la_SOURCES = \ abstractlatlonbox.cc \ @@ -167,283 +167,236 @@ abstractlatlonbox_test_SOURCES = abstractlatlonbox_test.cc abstractlatlonbox_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) abstractlatlonbox_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la abstractview_test_SOURCES = abstractview_test.cc abstractview_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) abstractview_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la atom_test_SOURCES = atom_test.cc atom_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) atom_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la balloonstyle_test_SOURCES = balloonstyle_test.cc balloonstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) balloonstyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la colorstyle_test_SOURCES = colorstyle_test.cc colorstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) colorstyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la container_test_SOURCES = container_test.cc container_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) container_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la document_test_SOURCES = document_test.cc document_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) document_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la element_test_SOURCES = element_test.cc element_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) element_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la extendeddata_test_SOURCES = extendeddata_test.cc extendeddata_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) extendeddata_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la feature_test_SOURCES = feature_test.cc feature_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) feature_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la folder_test_SOURCES = folder_test.cc folder_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) folder_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la geometry_test_SOURCES = geometry_test.cc geometry_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) geometry_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la hotspot_test_SOURCES = hotspot_test.cc hotspot_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) hotspot_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la iconstyle_test_SOURCES = iconstyle_test.cc iconstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) iconstyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_cast_test_SOURCES = kml_cast_test.cc kml_cast_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) kml_cast_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_test_SOURCES = kml_test.cc kml_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) kml_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_factory_test_SOURCES = kml_factory_test.cc kml_factory_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) kml_factory_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml22_test_SOURCES = kml22_test.cc kml22_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) kml22_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la labelstyle_test_SOURCES = labelstyle_test.cc labelstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) labelstyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la linestyle_test_SOURCES = linestyle_test.cc linestyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) linestyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la link_test_SOURCES = link_test.cc link_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) link_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la liststyle_test_SOURCES = liststyle_test.cc liststyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) liststyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la model_test_SOURCES = model_test.cc model_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) model_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la networklink_test_SOURCES = networklink_test.cc networklink_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) networklink_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la networklinkcontrol_test_SOURCES = networklinkcontrol_test.cc networklinkcontrol_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) networklinkcontrol_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la object_test_SOURCES = object_test.cc object_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) object_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la overlay_test_SOURCES = overlay_test.cc overlay_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) overlay_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la placemark_test_SOURCES = placemark_test.cc placemark_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) placemark_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la polystyle_test_SOURCES = polystyle_test.cc polystyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) polystyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la region_test_SOURCES = region_test.cc region_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) region_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la round_trip_test_SOURCES = round_trip_test.cc round_trip_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) round_trip_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la schema_test_SOURCES = schema_test.cc schema_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) schema_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la snippet_test_SOURCES = snippet_test.cc snippet_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) snippet_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la style_test_SOURCES = style_test.cc style_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) style_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la stylemap_test_SOURCES = stylemap_test.cc stylemap_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) stylemap_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la styleselector_test_SOURCES = styleselector_test.cc styleselector_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) styleselector_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la substyle_test_SOURCES = substyle_test.cc substyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) substyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la timeprimitive_test_SOURCES = timeprimitive_test.cc timeprimitive_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) timeprimitive_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la vec2_test_SOURCES = vec2_test.cc vec2_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) vec2_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la unknown_test_SOURCES = unknown_test.cc unknown_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) unknown_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_handler_test_SOURCES = kml_handler_test.cc kml_handler_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) kml_handler_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_handler_ns_test_SOURCES = kml_handler_ns_test.cc kml_handler_ns_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) kml_handler_ns_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la parser_test_SOURCES = parser_test.cc parser_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) parser_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la serializer_test_SOURCES = serializer_test.cc serializer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) serializer_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xal_test_SOURCES = xal_test.cc xal_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) xal_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xml_serializer_test_SOURCES = xml_serializer_test.cc xml_serializer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xml_serializer_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_test_SOURCES = xsd_test.cc xsd_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la CLEANFILES = check_PROGRAMS --- src/kml/engine/Makefile.am~ 2009-01-09 22:31:00.000000000 +0300 +++ src/kml/engine/Makefile.am 2009-01-30 14:50:53.452235945 +0300 @@ -1,14 +1,12 @@ -AM_CPPFLAGS= -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include \ - -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \ - -I$(top_srcdir)/third_party/googletest-r108/include +AM_CPPFLAGS= -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti AM_TEST_CXXFLAGS = -Wall -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0 endif +libkmlengine_la_LDFLAGS = -lminizip -lz + lib_LTLIBRARIES = libkmlengine.la libkmlengine_la_SOURCES = \ clone.cc \ @@ -35,8 +33,6 @@ update.cc libkmlengine_la_LIBADD = \ - $(top_builddir)/third_party/libminizip.la \ - $(top_builddir)/third_party/liburiparser.la \ $(top_builddir)/src/kml/base/libkmlbase.la libkmlengineincludedir = $(includedir)/kml/engine @@ -105,189 +101,156 @@ bbox_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) bbox_test_LDADD = libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la clone_test_SOURCES = clone_test.cc clone_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) clone_test_LDADD = libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la entity_mapper_test_SOURCES = entity_mapper_test.cc entity_mapper_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) entity_mapper_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la feature_balloon_test_SOURCES = feature_balloon_test.cc feature_balloon_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) feature_balloon_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la feature_visitor_test_SOURCES = feature_visitor_test.cc feature_visitor_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) feature_visitor_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la find_test_SOURCES = find_test.cc find_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) find_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la get_link_parents_test_SOURCES = get_link_parents_test.cc get_link_parents_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) get_link_parents_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la get_links_test_SOURCES = get_links_test.cc get_links_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) get_links_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la href_test_SOURCES = href_test.cc href_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) href_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la id_mapper_test_SOURCES = id_mapper_test.cc id_mapper_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) id_mapper_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_cache_test_SOURCES = kml_cache_test.cc kml_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) kml_cache_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_file_test_SOURCES = kml_file_test.cc kml_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) kml_file_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_stream_test_SOURCES = kml_stream_test.cc kml_stream_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) kml_stream_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_uri_test_SOURCES = kml_uri_test.cc kml_uri_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) kml_uri_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kmz_cache_test_SOURCES = kmz_cache_test.cc kmz_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) kmz_cache_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kmz_file_test_SOURCES = kmz_file_test.cc kmz_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) kmz_file_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la link_util_test_SOURCES = link_util_test.cc link_util_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) link_util_test_LDADD = libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la location_util_test_SOURCES = location_util_test.cc location_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) location_util_test_LDADD = libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la merge_test_SOURCES = merge_test.cc merge_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) merge_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la object_id_parser_observer_test_SOURCES = object_id_parser_observer_test.cc object_id_parser_observer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) object_id_parser_observer_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la parse_old_schema_test_SOURCES = parse_old_schema_test.cc parse_old_schema_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) parse_old_schema_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la schema_parser_observer_test_SOURCES = schema_parser_observer_test.cc schema_parser_observer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) schema_parser_observer_test_LDADD= \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la shared_style_parser_observer_test_SOURCES = shared_style_parser_observer_test.cc shared_style_parser_observer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) shared_style_parser_observer_test_LDADD= \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la style_merger_test_SOURCES = style_merger_test.cc style_merger_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) style_merger_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la style_resolver_test_SOURCES = style_resolver_test.cc style_resolver_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) style_resolver_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la update_test_SOURCES = update_test.cc update_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) update_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la CLEANFILES = check_PROGRAMS --- src/kml/regionator/Makefile.am~ 2008-10-28 07:29:52.000000000 +0300 +++ src/kml/regionator/Makefile.am 2009-01-30 13:14:42.100236700 +0300 @@ -1,7 +1,4 @@ -AM_CPPFLAGS= -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include \ - -I$(top_srcdir)/third_party/googletest-r108/include +AM_CPPFLAGS= -I$(top_srcdir)/src if GCC @@ -37,8 +34,7 @@ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la regionator_test_SOURCES = regionator_test.cc regionator_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) @@ -46,8 +42,7 @@ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la regionator_qid_test_SOURCES = regionator_qid_test.cc regionator_qid_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) @@ -55,8 +50,7 @@ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la regionator_util_test_SOURCES = regionator_util_test.cc regionator_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) @@ -64,7 +58,6 @@ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la CLEANFILES = check_PROGRAMS --- src/kml/xsd/Makefile.am~ 2008-10-28 07:29:53.000000000 +0300 +++ src/kml/xsd/Makefile.am 2009-01-30 13:15:36.758234683 +0300 @@ -1,6 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/googletest-r108/include +AM_CPPFLAGS = -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti @@ -48,55 +46,46 @@ xsd_complex_type_test_SOURCES = xsd_complex_type_test.cc xsd_complex_type_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_complex_type_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_file_test_SOURCES = xsd_file_test.cc xsd_file_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_file_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_element_test_SOURCES = xsd_element_test.cc xsd_element_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_element_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_handler_test_SOURCES = xsd_handler_test.cc xsd_handler_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) xsd_handler_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_primitive_type_test_SOURCES = xsd_primitive_type_test.cc xsd_primitive_type_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_primitive_type_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_schema_test_SOURCES = xsd_schema_test.cc xsd_schema_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_schema_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_simple_type_test_SOURCES = xsd_simple_type_test.cc xsd_simple_type_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_simple_type_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_util_test_SOURCES = xsd_util_test.cc xsd_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_util_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xst_parser_test_SOURCES = xst_parser_test.cc xst_parser_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xst_parser_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la CLEANFILES = check_PROGRAMS --- src/swig/Makefile.am~ 2008-10-29 02:04:39.000000000 +0300 +++ src/swig/Makefile.am 2009-01-30 13:22:24.128236653 +0300 @@ -1,8 +1,6 @@ SUBDIRS = java python -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include +AM_CPPFLAGS = -I$(top_srcdir)/src --- NEW FILE libkml.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)")} Name: libkml Version: 0.6.1 Release: 2%{?dist} Summary: A KML library written in C++ with bindings to other languagues Group: Development/Libraries License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.gz #Patch0: libkml-string.patch Patch1: libkml-third_party_removal.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # requires swig >= 1.3.35 BuildRequires: cppunit, swig >= 1.3.35 BuildRequires: java-devel, libcurl-devel BuildRequires: expat-devel, python-devel, chrpath BuildRequires: minizip-devel, uriparser-devel, zlib-devel BuildRequires: boost-devel BuildRequires: autoconf, libtool Requires: python, java %description Libkml is an implementation of the OGC KML 2.2 standard. is written in C++ and bindings are available via SWIG to other languages. It can be used in applications that want to parse, generate and operate on KML. %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 rm -rf third_party %patch1 -p0 -b .third_party #%patch0 -p1 -b .string %build autoreconf -fi %configure --disable-static \ --with-java-include-dir=%{_jvmdir}/java make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' # remove compiled examples cd examples; make clean;cd .. # remove x permssion from examples folder files find examples -type f -print | xargs chmod a-x # move libs to kml (for keeping third party libs away) mkdir -p $RPM_BUILD_ROOT%{_libdir}/libkml/ mv $RPM_BUILD_ROOT%{_libdir}/*.so* $RPM_BUILD_ROOT%{_libdir}/libkml/ #removing rpaths with chrpath chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libkml/libkmldom_swig_java.so.0.0.0 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libkml/libkmlengine_swig_python.so.0.0.0 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libkml/libkmlengine.so.0.0.0 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libkml/libkmldom_swig_python.so.0.0.0 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libkml/libkmlengine_swig_java.so.0.0.0 chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/_kmlengine.so chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/_kmldom.so chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/_kmlbase.so # remove .libs and .deps directories find . -name '.libs' -type d -print | xargs rm -rf find . -name '.deps' -type d -print | xargs rm -rf # fix unstripping-binary-or-object warning chmod a+x $RPM_BUILD_ROOT%{python_sitearch}/_kmlengine.so chmod a+x $RPM_BUILD_ROOT%{python_sitearch}/_kmldom.so %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING %doc AUTHORS %doc README %doc ChangeLog %dir %{_libdir}/libkml %{_libdir}/libkml/*.so.* %{python_sitearch}/*.so %{python_sitearch}/*.py %{python_sitearch}/*.pyc %{python_sitearch}/*.pyo %files devel %defattr(-,root,root,-) %doc examples %{_includedir}/* %dir %{_libdir}/libkml %{_libdir}/libkml/*.so %changelog * Sat Mar 07 2009 Rakesh Pandit 0.6.1-2 - updated to 0.6.1 - libkml-third_party_removal.diff Removes third part dependency - (provided by Peter Lemenkov) * Fri Jan 16 2009 Rakesh Pandit 0.6.1-1 - Updated to 0.6.1 * Mon Oct 05 2008 Rakesh Pandit 0.4.0-2 - Added >= 1.3.35 for swing * Sat Aug 09 2008 Rakesh Pandit 0.4.0-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libkml/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:00:20 -0000 1.1 +++ .cvsignore 7 Mar 2009 17:21:09 -0000 1.2 @@ -0,0 +1 @@ +libkml-0.6.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libkml/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:00:20 -0000 1.1 +++ sources 7 Mar 2009 17:21:09 -0000 1.2 @@ -0,0 +1 @@ +3fb00404e7a79ca53e591c0661f47ea2 libkml-0.6.1.tar.gz From pkgdb at fedoraproject.org Sat Mar 7 17:23:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:23:08 +0000 Subject: [pkgdb] mscore was added for oget Message-ID: <20090307172306.6D0B92082B2@bastion.fedora.phx.redhat.com> kevin has added Package mscore with summary Music Composition & Notation Software kevin has approved Package mscore kevin has added a Fedora devel branch for mscore with an owner of oget kevin has approved mscore in Fedora devel kevin has approved Package mscore kevin has set commit to Approved for provenpackager on mscore (Fedora devel) kevin has set build to Approved for provenpackager on mscore (Fedora devel) kevin has set checkout to Approved for provenpackager on mscore (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mscore From pkgdb at fedoraproject.org Sat Mar 7 17:22:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:22:46 +0000 Subject: [pkgdb] mscore (Fedora, 10) updated by kevin Message-ID: <20090307172307.E56C9208545@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for mscore kevin has set commit to Approved for provenpackager on mscore (Fedora 10) kevin has set build to Approved for provenpackager on mscore (Fedora 10) kevin has set checkout to Approved for provenpackager on mscore (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mscore From kevin at fedoraproject.org Sat Mar 7 17:22:36 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:22:36 +0000 (UTC) Subject: rpms/mscore - New directory Message-ID: <20090307172236.2483970116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mscore In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP30018/rpms/mscore Log Message: Directory /cvs/pkgs/rpms/mscore added to the repository From kevin at fedoraproject.org Sat Mar 7 17:22:36 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:22:36 +0000 (UTC) Subject: rpms/mscore/devel - New directory Message-ID: <20090307172236.6628670116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mscore/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP30018/rpms/mscore/devel Log Message: Directory /cvs/pkgs/rpms/mscore/devel added to the repository From nosnilmot at fedoraproject.org Sat Mar 7 17:22:38 2009 From: nosnilmot at fedoraproject.org (Stu Tomlinson) Date: Sat, 7 Mar 2009 17:22:38 +0000 (UTC) Subject: rpms/pidgin/F-10 .cvsignore, 1.22, 1.23 pidgin.spec, 1.73, 1.74 sources, 1.22, 1.23 Message-ID: <20090307172238.E62D670117@cvs1.fedora.phx.redhat.com> Author: nosnilmot Update of /cvs/pkgs/rpms/pidgin/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29795/F-10 Modified Files: .cvsignore pidgin.spec sources Log Message: Pidgin 2.5.5 for F9 & F10 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/F-10/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 12 Jan 2009 19:36:20 -0000 1.22 +++ .cvsignore 7 Mar 2009 17:22:08 -0000 1.23 @@ -1 +1 @@ -pidgin-2.5.4.tar.bz2 +pidgin-2.5.5.tar.bz2 Index: pidgin.spec =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/F-10/pidgin.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- pidgin.spec 12 Jan 2009 19:36:20 -0000 1.73 +++ pidgin.spec 7 Mar 2009 17:22:08 -0000 1.74 @@ -61,7 +61,7 @@ %endif Name: pidgin -Version: 2.5.4 +Version: 2.5.5 Release: 1%{?dist} License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls @@ -89,6 +89,7 @@ # - Browser "GNOME Default" # - Smiley Theme "Default" Source1: purple-fedora-prefs.xml +Source2: one_time_password.c ## Patches 0-99: Fedora specific or upstream wont accept @@ -115,6 +116,7 @@ # Basic Library Requirements BuildRequires: autoconf +BuildRequires: libtool BuildRequires: startup-notification-devel BuildRequires: cyrus-sasl-devel BuildRequires: nss-devel @@ -379,7 +381,13 @@ --enable-tcl --enable-tk \ --disable-schemas-install $SWITCHES -make %{?_smp_mflags} +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool + +# one_time_password plugin, to be merged upstream soon +cp %{SOURCE2} libpurple/plugins/ +cd libpurple/plugins/ +make one_time_password.so +cd - %if %{api_docs} make docs @@ -388,7 +396,9 @@ %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install LIBTOOL=/usr/bin/libtool + +install -m 0755 libpurple/plugins/one_time_password.so $RPM_BUILD_ROOT%{_libdir}/purple-2/ desktop-file-install --vendor pidgin --delete-original \ --add-category X-Red-Hat-Base \ @@ -561,6 +571,16 @@ %endif %changelog +* Tue Mar 03 2009 Stu Tomlinson 2.5.5-1 +- 2.5.5 + +* Thu Feb 26 2009 Fedora Release Engineering - 2.5.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jan 27 2009 Warren Togami 2.5.4-2 +- one_time_password plugin +- Eliminate RPATH + * Mon Jan 12 2009 Stu Tomlinson 2.5.4-1 - 2.5.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/F-10/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 12 Jan 2009 19:36:20 -0000 1.22 +++ sources 7 Mar 2009 17:22:08 -0000 1.23 @@ -1 +1 @@ -295fe533288c821342b660b6fc83bc11 pidgin-2.5.4.tar.bz2 +972101ca88a2ad338aad1fc4be5e1a8c pidgin-2.5.5.tar.bz2 From nosnilmot at fedoraproject.org Sat Mar 7 17:22:38 2009 From: nosnilmot at fedoraproject.org (Stu Tomlinson) Date: Sat, 7 Mar 2009 17:22:38 +0000 (UTC) Subject: rpms/pidgin/F-9 .cvsignore, 1.22, 1.23 pidgin.spec, 1.64, 1.65 sources, 1.22, 1.23 Message-ID: <20090307172238.8158870116@cvs1.fedora.phx.redhat.com> Author: nosnilmot Update of /cvs/pkgs/rpms/pidgin/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29795/F-9 Modified Files: .cvsignore pidgin.spec sources Log Message: Pidgin 2.5.5 for F9 & F10 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/F-9/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 12 Jan 2009 19:36:20 -0000 1.22 +++ .cvsignore 7 Mar 2009 17:22:07 -0000 1.23 @@ -1 +1 @@ -pidgin-2.5.4.tar.bz2 +pidgin-2.5.5.tar.bz2 Index: pidgin.spec =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/F-9/pidgin.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- pidgin.spec 12 Jan 2009 19:36:20 -0000 1.64 +++ pidgin.spec 7 Mar 2009 17:22:08 -0000 1.65 @@ -61,7 +61,7 @@ %endif Name: pidgin -Version: 2.5.4 +Version: 2.5.5 Release: 1%{?dist} License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls @@ -89,6 +89,7 @@ # - Browser "GNOME Default" # - Smiley Theme "Default" Source1: purple-fedora-prefs.xml +Source2: one_time_password.c ## Patches 0-99: Fedora specific or upstream wont accept @@ -115,6 +116,7 @@ # Basic Library Requirements BuildRequires: autoconf +BuildRequires: libtool BuildRequires: startup-notification-devel BuildRequires: cyrus-sasl-devel BuildRequires: nss-devel @@ -379,7 +381,13 @@ --enable-tcl --enable-tk \ --disable-schemas-install $SWITCHES -make %{?_smp_mflags} +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool + +# one_time_password plugin, to be merged upstream soon +cp %{SOURCE2} libpurple/plugins/ +cd libpurple/plugins/ +make one_time_password.so +cd - %if %{api_docs} make docs @@ -388,7 +396,9 @@ %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install LIBTOOL=/usr/bin/libtool + +install -m 0755 libpurple/plugins/one_time_password.so $RPM_BUILD_ROOT%{_libdir}/purple-2/ desktop-file-install --vendor pidgin --delete-original \ --add-category X-Red-Hat-Base \ @@ -561,6 +571,16 @@ %endif %changelog +* Tue Mar 03 2009 Stu Tomlinson 2.5.5-1 +- 2.5.5 + +* Thu Feb 26 2009 Fedora Release Engineering - 2.5.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jan 27 2009 Warren Togami 2.5.4-2 +- one_time_password plugin +- Eliminate RPATH + * Mon Jan 12 2009 Stu Tomlinson 2.5.4-1 - 2.5.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pidgin/F-9/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 12 Jan 2009 19:36:20 -0000 1.22 +++ sources 7 Mar 2009 17:22:08 -0000 1.23 @@ -1 +1 @@ -295fe533288c821342b660b6fc83bc11 pidgin-2.5.4.tar.bz2 +972101ca88a2ad338aad1fc4be5e1a8c pidgin-2.5.5.tar.bz2 From kevin at fedoraproject.org Sat Mar 7 17:22:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:22:55 +0000 (UTC) Subject: rpms/mscore Makefile,NONE,1.1 Message-ID: <20090307172255.85C6D70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mscore In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP30018/rpms/mscore Added Files: Makefile Log Message: Setup of module mscore --- NEW FILE Makefile --- # Top level Makefile for module mscore all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sat Mar 7 17:22:55 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:22:55 +0000 (UTC) Subject: rpms/mscore/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307172255.CAA3E70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mscore/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP30018/rpms/mscore/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mscore --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: mscore # $Id: Makefile,v 1.1 2009/03/07 17:22:55 kevin Exp $ NAME := mscore SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From tnorth at fedoraproject.org Sat Mar 7 17:23:28 2009 From: tnorth at fedoraproject.org (Thibault North) Date: Sat, 7 Mar 2009 17:23:28 +0000 (UTC) Subject: rpms/tkgate/F-9 import.log, NONE, 1.1 tkgate-2.0-doc.patch, NONE, 1.1 tkgate.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307172328.2106A70116@cvs1.fedora.phx.redhat.com> Author: tnorth Update of /cvs/pkgs/rpms/tkgate/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30138/F-9 Modified Files: .cvsignore sources Added Files: import.log tkgate-2.0-doc.patch tkgate.spec Log Message: Initial package --- NEW FILE import.log --- tkgate-2_0-5_beta7_fc11:F-9:tkgate-2.0-5.beta7.fc11.src.rpm:1236446543 tkgate-2.0-doc.patch: --- NEW FILE tkgate-2.0-doc.patch --- --- Makefile.in 2009-01-11 01:13:54.000000000 +0100 +++ Makefile.in_m 2009-01-21 22:47:18.000000000 +0100 @@ -216,7 +216,7 @@ # # List of directories that contain data files necessary for tkgate to run. # -TKG_DATADIRS = scripts bindings doc gdf images locale povray primitives vlib vpd test +TKG_DATADIRS = scripts bindings gdf images locale povray primitives vlib vpd # # Subdirectories in which more makefiles can be found @@ -226,7 +226,7 @@ # # List of data files in this directory that should be included with a tkgate distribution. # -dist_pkgdata_DATA = README README.verga COPYING INSTALL TODO site-preferences license.txt pkg-comment pkg-descr +dist_pkgdata_DATA = # # List of man pages for tkgate --- NEW FILE tkgate.spec --- Name: tkgate Version: 2.0 Release: 5.beta7%{?dist} Summary: An event driven digital circuit simulator Group: Applications/Engineering License: GPLv2+ URL: http://www.tkgate.org/ Patch0: tkgate-2.0-doc.patch Source0: ftp://gadoid.ices.cmu.edu/pub/tkgate/pre-release/%{name}-%{version}-b7.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tk-devel tcl-devel libICE-devel libSM-devel BuildRequires: desktop-file-utils Requires: electronics-menu %description TkGate is a event driven digital circuit simulator based on Verilog. TkGate supports a wide range of primitive circuit elements as well as user-defined modules for hierarchical design. %package ca Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description ca This package contains the Catalan locales and examples for tkgate, Digital Circuit Simulator %package cs Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description cs This package contains the Czech locales and examples for tkgate, Digital Circuit Simulator %package cy Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description cy This package contains the Welsh locales and examples for tkgate, Digital Circuit Simulator %package de Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description de This package contains the German locales and examples for tkgate, Digital Circuit Simulator %package es Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description es This package contains the Spanish locales and examples for tkgate, Digital Circuit Simulator %package fr Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description fr This package contains the French locales and examples for tkgate, Digital Circuit Simulator %package it Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description it This package contains the Italian locales and examples for tkgate, Digital Circuit Simulator %package ja Summary: Locales and examples for tkgate, Digital Circuit Simulator Group: Documentation Requires: %{name} = %{version}-%{release} %description ja This package contains the Japanese locales and examples for tkgate, Digital Circuit Simulator %prep %setup -q -n %{name}-%{version}-b7 %patch0 -p0 -b .doc sed -i "s|\"\${tkg_gateHome}/libexec/verga\"|\"%{_bindir}/verga\"|" scripts/parms.tcl sed -i "s|license.txt||" scripts/license.tcl sed -i "s|TKGATE_LIBDIRS=\"\(.*\)\"|TKGATE_LIBDIRS=\"\1 %{_libdir}\"|" configure # E: backup-file-in-package find . -type f -name "*~" -exec rm -f {} ';' find . -type f -name "\#*\#" -exec rm -f {} ';' # spurious-executable-perm chmod 0755 scripts/tree.tcl chmod 0644 test/verga/maketests.sh chmod 0644 test/verga/runtests.sh # E: zero-length %{__rm} -f locale/{en,ja}/tutorials/definition.txt %{__rm} -f bindings/none %{__rm} -f scripts/dip.tcl %{__rm} -f test/verga/grammar.out cat > %{name}.desktop << EOF [Desktop Entry] Encoding=UTF-8 Name=Digital circuit simulator GenericName=Verilog circuit simulator Comment=Digital circuit simulator Type=Application Exec=tkgate Icon=tkgate Categories=Engineering;Electronics; EOF %build %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} INSTALL="install -p" install DESTDIR=%{buildroot} # Symlink points to BuildRoot: %{__rm} -rf %{buildroot}%{_datadir}/%{name}/libexec/ # desktop file and its icon desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ %{name}.desktop install -d %{buildroot}%{_datadir}/pixmaps/ install -pm 0644 images/run01.gif %{buildroot}%{_datadir}/pixmaps/%{name}.png cp -p site-preferences %{buildroot}%{_datadir}/%{name}/site-preferences %clean %{__rm} -rf %{buildroot} %files ca %defattr(-,root,root,-) %{_datadir}/%{name}/locale/ca/* %files cs %defattr(-,root,root,-) %{_datadir}/%{name}/locale/cs/* %files cy %defattr(-,root,root,-) %{_datadir}/%{name}/locale/cy/* %files de %defattr(-,root,root,-) %{_datadir}/%{name}/locale/de/* %files es %defattr(-,root,root,-) %{_datadir}/%{name}/locale/es/* %files fr %defattr(-,root,root,-) %{_datadir}/%{name}/locale/fr/* %files it %defattr(-,root,root,-) %{_datadir}/%{name}/locale/it/* %files ja %defattr(-,root,root,-) %{_datadir}/%{name}/locale/ja/* %files %defattr(-,root,root,-) %doc README README.verga COPYING %doc license.txt pkg-comment pkg-descr TODO %doc doc/ test/ %{_bindir}/gmac %{_bindir}/%{name} %{_bindir}/verga %{_datadir}/%{name} %{_mandir}/man1/gmac.1.gz %{_mandir}/man1/tkgate.1.gz %{_mandir}/man1/verga.1.gz %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png %exclude %{_datadir}/%{name}/locale/ca %exclude %{_datadir}/%{name}/locale/cs %exclude %{_datadir}/%{name}/locale/cy %exclude %{_datadir}/%{name}/locale/de %exclude %{_datadir}/%{name}/locale/es %exclude %{_datadir}/%{name}/locale/fr %exclude %{_datadir}/%{name}/locale/it %exclude %{_datadir}/%{name}/locale/ja %changelog * Fri Mar 6 2009 Thibault North - 2.0-5.beta7 - Minor fixes required for the package * Thu Mar 5 2009 Thibault North - 2.0-4.beta7 - Fixes in installed files * Tue Feb 24 2009 Thibault North - 2.0-1.beta7 - Updated to beta7 * Thu Feb 20 2009 Thibault North - 2.0-3.beta6 - Updated to beta6 - Separated locales - Compilation fixes for 64 bits arch * Wed Jan 21 2009 Chitlesh Goorah - 2.0-2.beta4 - updated to beta4 * Sat Dec 06 2008 Chitlesh Goorah 2.0-1.alpha11 - Initial package for fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tkgate/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:08:19 -0000 1.1 +++ .cvsignore 7 Mar 2009 17:22:57 -0000 1.2 @@ -0,0 +1 @@ +tkgate-2.0-b7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tkgate/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:08:19 -0000 1.1 +++ sources 7 Mar 2009 17:22:57 -0000 1.2 @@ -0,0 +1 @@ +8f4304aace787656ed66ad736011cbb4 tkgate-2.0-b7.tar.gz From pkgdb at fedoraproject.org Sat Mar 7 17:25:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:25:35 +0000 Subject: [pkgdb] mpich2 (Fedora, 9) updated by kevin Message-ID: <20090307172555.DB62C208543@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for mpich2 kevin has set commit to Approved for provenpackager on mpich2 (Fedora 9) kevin has set build to Approved for provenpackager on mpich2 (Fedora 9) kevin has set checkout to Approved for provenpackager on mpich2 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mpich2 From pkgdb at fedoraproject.org Sat Mar 7 17:25:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:25:35 +0000 Subject: [pkgdb] mpich2 (Fedora, 10) updated by kevin Message-ID: <20090307172556.0A3E5208545@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for mpich2 kevin has set commit to Approved for provenpackager on mpich2 (Fedora 10) kevin has set build to Approved for provenpackager on mpich2 (Fedora 10) kevin has set checkout to Approved for provenpackager on mpich2 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mpich2 From pkgdb at fedoraproject.org Sat Mar 7 17:25:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:25:56 +0000 Subject: [pkgdb] mpich2 was added for deji Message-ID: <20090307172557.EE5BE208549@bastion.fedora.phx.redhat.com> kevin has added Package mpich2 with summary A high performance implementation of Message Passing Interface (MPI) kevin has approved Package mpich2 kevin has added a Fedora devel branch for mpich2 with an owner of deji kevin has approved mpich2 in Fedora devel kevin has approved Package mpich2 kevin has set commit to Approved for provenpackager on mpich2 (Fedora devel) kevin has set build to Approved for provenpackager on mpich2 (Fedora devel) kevin has set checkout to Approved for provenpackager on mpich2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mpich2 From kevin at fedoraproject.org Sat Mar 7 17:25:20 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:25:20 +0000 (UTC) Subject: rpms/mpich2 - New directory Message-ID: <20090307172520.2705570116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mpich2 In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse31054/rpms/mpich2 Log Message: Directory /cvs/pkgs/rpms/mpich2 added to the repository From kevin at fedoraproject.org Sat Mar 7 17:25:20 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:25:20 +0000 (UTC) Subject: rpms/mpich2/devel - New directory Message-ID: <20090307172520.60DC170116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mpich2/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse31054/rpms/mpich2/devel Log Message: Directory /cvs/pkgs/rpms/mpich2/devel added to the repository From kevin at fedoraproject.org Sat Mar 7 17:25:36 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:25:36 +0000 (UTC) Subject: rpms/mpich2 Makefile,NONE,1.1 Message-ID: <20090307172536.218FE70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mpich2 In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse31054/rpms/mpich2 Added Files: Makefile Log Message: Setup of module mpich2 --- NEW FILE Makefile --- # Top level Makefile for module mpich2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sat Mar 7 17:25:36 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:25:36 +0000 (UTC) Subject: rpms/mpich2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307172536.74B8770118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mpich2/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse31054/rpms/mpich2/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mpich2 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: mpich2 # $Id: Makefile,v 1.1 2009/03/07 17:25:36 kevin Exp $ NAME := mpich2 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From rakesh at fedoraproject.org Sat Mar 7 17:27:08 2009 From: rakesh at fedoraproject.org (Rakesh Pandit) Date: Sat, 7 Mar 2009 17:27:08 +0000 (UTC) Subject: rpms/libkml/F-10 import.log, NONE, 1.1 libkml-third_party_removal.diff, NONE, 1.1 libkml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307172708.3590C70116@cvs1.fedora.phx.redhat.com> Author: rakesh Update of /cvs/pkgs/rpms/libkml/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31330/F-10 Modified Files: .cvsignore sources Added Files: import.log libkml-third_party_removal.diff libkml.spec Log Message: Initial import --- NEW FILE import.log --- libkml-0_6_1-2_fc10:F-10:libkml-0.6.1-2.fc10.src.rpm:1236446450 libkml-third_party_removal.diff: --- NEW FILE libkml-third_party_removal.diff --- --- configure.ac~ 2009-01-12 20:34:47.000000000 +0300 +++ configure.ac 2009-01-30 12:21:01.018236863 +0300 @@ -210,7 +210,6 @@ testdata/update/Makefile testdata/xal/Makefile testdata/xsd/Makefile - third_party/Makefile xcode/Makefile xcode/LibKML/Makefile ]) --- examples/engine/Makefile.am~ 2009-01-09 22:31:04.000000000 +0300 +++ examples/engine/Makefile.am 2009-01-30 15:09:43.408236214 +0300 @@ -1,6 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include +AM_CPPFLAGS = -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti --- examples/gpx/Makefile.am~ 2008-10-28 07:30:02.000000000 +0300 +++ examples/gpx/Makefile.am 2009-01-30 15:08:44.819235790 +0300 @@ -1,5 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 +AM_CPPFLAGS = -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti --- examples/hellonet/Makefile.am~ 2008-10-28 07:30:02.000000000 +0300 +++ examples/hellonet/Makefile.am 2009-01-30 16:07:34.089236539 +0300 @@ -1,8 +1,6 @@ if HAVE_CURL AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/examples/hellonet \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include + -I$(top_srcdir)/examples/hellonet if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti --- examples/helloworld/Makefile.am~ 2009-01-10 01:04:32.000000000 +0300 +++ examples/helloworld/Makefile.am 2009-01-30 16:05:34.819235683 +0300 @@ -1,7 +1,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/examples/helloworld \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include + -I$(top_srcdir)/examples/helloworld if GCC @@ -11,7 +9,7 @@ noinst_LTLIBRARIES = libhelloutil.la libhelloutil_la_SOURCES = print.cc -libhelloutil_la_LIBADD = $(top_builddir)/third_party/libminizip.la +libhelloutil_la_LIBADD = -lminizip -lz noinst_PROGRAMS = countkml createkml checklinks helloattrs helloenum \ hellofeatures hellofolder hellogeometry hellohref hellokmz \ --- examples/regionator/Makefile.am~ 2009-01-09 22:31:04.000000000 +0300 +++ examples/regionator/Makefile.am 2009-01-30 15:14:04.349235516 +0300 @@ -1,7 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include \ - -I$(top_srcdir)/third_party/zlib-1.2.3/contrib +AM_CPPFLAGS = -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti --- examples/xsd/Makefile.am~ 2008-11-04 21:58:19.000000000 +0300 +++ examples/xsd/Makefile.am 2009-01-30 15:15:02.697234587 +0300 @@ -1,6 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/examples/xsd \ - -I$(top_srcdir)/third_party/boost_1_34_1 +AM_CPPFLAGS = -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti --- Makefile.am~ 2009-01-09 22:31:04.000000000 +0300 +++ Makefile.am 2009-01-30 12:20:11.472234263 +0300 @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 # Order is important: -SUBDIRS = third_party src testdata examples msvc xcode +SUBDIRS = src testdata examples msvc xcode EXTRA_DIST = \ AUTHORS \ --- src/kml/base/Makefile.am~ 2009-01-09 22:31:01.000000000 +0300 +++ src/kml/base/Makefile.am 2009-01-30 14:19:54.415237475 +0300 @@ -1,14 +1,11 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include \ - -I$(top_srcdir)/third_party/googletest-r108/include +AM_CPPFLAGS = -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti AM_TEST_CXXFLAGS = -Wall -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0 endif -libkmlbase_la_LDFLAGS = -lexpat +libkmlbase_la_LDFLAGS = -lexpat -luriparser lib_LTLIBRARIES = libkmlbase.la libkmlbase_la_SOURCES = \ @@ -75,90 +72,71 @@ attributes_test_SOURCES = attributes_test.cc attributes_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -attributes_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +attributes_test_LDADD = libkmlbase.la color32_test_SOURCES = color32_test.cc color32_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -color32_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +color32_test_LDADD = libkmlbase.la date_time_test_SOURCES = date_time_test.cc date_time_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -date_time_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +date_time_test_LDADD = libkmlbase.la expat_handler_ns_test_SOURCES = expat_handler_ns_test.cc expat_handler_ns_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -expat_handler_ns_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +expat_handler_ns_test_LDADD = libkmlbase.la expat_parser_test_SOURCES = expat_parser_test.cc expat_parser_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -expat_parser_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +expat_parser_test_LDADD = libkmlbase.la file_test_SOURCES = file_test.cc file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) -file_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +file_test_LDADD = libkmlbase.la net_cache_test_SOURCES = net_cache_test.cc net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) -net_cache_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la +net_cache_test_LDADD = libkmlbase.la referent_test_SOURCES = referent_test.cc referent_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -referent_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +referent_test_LDADD= libkmlbase.la tempfile_test_SOURCES = tempfile_test.cc tempfile_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) -tempfile_test_LDADD = libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +tempfile_test_LDADD = libkmlbase.la string_util_test_SOURCES = string_util_test.cc string_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -string_util_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +string_util_test_LDADD= libkmlbase.la time_util_test_SOURCES = time_util_test.cc time_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -time_util_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +time_util_test_LDADD= libkmlbase.la util_test_SOURCES = util_test.cc util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -util_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +util_test_LDADD= libkmlbase.la uri_parser_test_SOURCES = uri_parser_test.cc uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) -uri_parser_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la +uri_parser_test_LDADD= libkmlbase.la vec3_test_SOURCES = vec3_test.cc vec3_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -vec3_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +vec3_test_LDADD= libkmlbase.la xml_element_test_SOURCES = xml_element_test.cc xml_element_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -xml_element_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +xml_element_test_LDADD= libkmlbase.la xml_file_test_SOURCES = xml_file_test.cc xml_file_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -xml_file_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +xml_file_test_LDADD= libkmlbase.la xmlns_test_SOURCES = xmlns_test.cc xmlns_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) -xmlns_test_LDADD= libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la +xmlns_test_LDADD= libkmlbase.la CLEANFILES = check_PROGRAMS --- src/kml/convenience/Makefile.am~ 2008-10-28 07:29:53.000000000 +0300 +++ src/kml/convenience/Makefile.am 2009-01-30 13:08:16.410236843 +0300 @@ -1,7 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include \ - -I$(top_srcdir)/third_party/googletest-r108/include +AM_CPPFLAGS = -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti @@ -40,47 +37,41 @@ convenience_test_LDADD = libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la csv_file_test_SOURCES = csv_file_test.cc csv_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) csv_file_test_LDADD = libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la element_counter_test_SOURCES = element_counter_test.cc element_counter_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) element_counter_test_LDADD = libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la feature_list_test_SOURCES = feature_list_test.cc feature_list_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) feature_list_test_LDADD = libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la gpx_trk_pt_handler_test_SOURCES = gpx_trk_pt_handler_test.cc gpx_trk_pt_handler_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) gpx_trk_pt_handler_test_LDADD = libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/dom/libkmldom.la kmz_check_links_test_SOURCES = kmz_check_links_test.cc kmz_check_links_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) kmz_check_links_test_LDADD = libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la CLEANFILES = check_PROGRAMS --- src/kml/dom/Makefile.am~ 2009-01-09 22:31:00.000000000 +0300 +++ src/kml/dom/Makefile.am 2009-01-30 14:28:40.501235777 +0300 @@ -1,12 +1,12 @@ -AM_CPPFLAGS= -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/googletest-r108/include +AM_CPPFLAGS= -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti AM_TEST_CXXFLAGS = -Wall -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0 endif +libkmldom_la_LDFLAGS = -lexpat + lib_LTLIBRARIES = libkmldom.la libkmldom_la_SOURCES = \ abstractlatlonbox.cc \ @@ -167,283 +167,236 @@ abstractlatlonbox_test_SOURCES = abstractlatlonbox_test.cc abstractlatlonbox_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) abstractlatlonbox_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la abstractview_test_SOURCES = abstractview_test.cc abstractview_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) abstractview_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la atom_test_SOURCES = atom_test.cc atom_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) atom_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la balloonstyle_test_SOURCES = balloonstyle_test.cc balloonstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) balloonstyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la colorstyle_test_SOURCES = colorstyle_test.cc colorstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) colorstyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la container_test_SOURCES = container_test.cc container_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) container_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la document_test_SOURCES = document_test.cc document_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) document_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la element_test_SOURCES = element_test.cc element_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) element_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la extendeddata_test_SOURCES = extendeddata_test.cc extendeddata_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) extendeddata_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la feature_test_SOURCES = feature_test.cc feature_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) feature_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la folder_test_SOURCES = folder_test.cc folder_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) folder_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la geometry_test_SOURCES = geometry_test.cc geometry_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) geometry_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la hotspot_test_SOURCES = hotspot_test.cc hotspot_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) hotspot_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la iconstyle_test_SOURCES = iconstyle_test.cc iconstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) iconstyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_cast_test_SOURCES = kml_cast_test.cc kml_cast_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) kml_cast_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_test_SOURCES = kml_test.cc kml_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) kml_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_factory_test_SOURCES = kml_factory_test.cc kml_factory_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) kml_factory_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml22_test_SOURCES = kml22_test.cc kml22_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) kml22_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la labelstyle_test_SOURCES = labelstyle_test.cc labelstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) labelstyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la linestyle_test_SOURCES = linestyle_test.cc linestyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) linestyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la link_test_SOURCES = link_test.cc link_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) link_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la liststyle_test_SOURCES = liststyle_test.cc liststyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) liststyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la model_test_SOURCES = model_test.cc model_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) model_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la networklink_test_SOURCES = networklink_test.cc networklink_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) networklink_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la networklinkcontrol_test_SOURCES = networklinkcontrol_test.cc networklinkcontrol_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) networklinkcontrol_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la object_test_SOURCES = object_test.cc object_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) object_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la overlay_test_SOURCES = overlay_test.cc overlay_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) overlay_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la placemark_test_SOURCES = placemark_test.cc placemark_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) placemark_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la polystyle_test_SOURCES = polystyle_test.cc polystyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) polystyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la region_test_SOURCES = region_test.cc region_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) region_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la round_trip_test_SOURCES = round_trip_test.cc round_trip_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) round_trip_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la schema_test_SOURCES = schema_test.cc schema_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) schema_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la snippet_test_SOURCES = snippet_test.cc snippet_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) snippet_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la style_test_SOURCES = style_test.cc style_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) style_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la stylemap_test_SOURCES = stylemap_test.cc stylemap_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) stylemap_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la styleselector_test_SOURCES = styleselector_test.cc styleselector_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) styleselector_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la substyle_test_SOURCES = substyle_test.cc substyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) substyle_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la timeprimitive_test_SOURCES = timeprimitive_test.cc timeprimitive_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) timeprimitive_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la vec2_test_SOURCES = vec2_test.cc vec2_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) vec2_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la unknown_test_SOURCES = unknown_test.cc unknown_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) unknown_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_handler_test_SOURCES = kml_handler_test.cc kml_handler_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) kml_handler_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_handler_ns_test_SOURCES = kml_handler_ns_test.cc kml_handler_ns_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) kml_handler_ns_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la parser_test_SOURCES = parser_test.cc parser_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) parser_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la serializer_test_SOURCES = serializer_test.cc serializer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) serializer_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xal_test_SOURCES = xal_test.cc xal_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) xal_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xml_serializer_test_SOURCES = xml_serializer_test.cc xml_serializer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xml_serializer_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_test_SOURCES = xsd_test.cc xsd_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_test_LDADD= libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la CLEANFILES = check_PROGRAMS --- src/kml/engine/Makefile.am~ 2009-01-09 22:31:00.000000000 +0300 +++ src/kml/engine/Makefile.am 2009-01-30 14:50:53.452235945 +0300 @@ -1,14 +1,12 @@ -AM_CPPFLAGS= -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include \ - -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \ - -I$(top_srcdir)/third_party/googletest-r108/include +AM_CPPFLAGS= -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti AM_TEST_CXXFLAGS = -Wall -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0 endif +libkmlengine_la_LDFLAGS = -lminizip -lz + lib_LTLIBRARIES = libkmlengine.la libkmlengine_la_SOURCES = \ clone.cc \ @@ -35,8 +33,6 @@ update.cc libkmlengine_la_LIBADD = \ - $(top_builddir)/third_party/libminizip.la \ - $(top_builddir)/third_party/liburiparser.la \ $(top_builddir)/src/kml/base/libkmlbase.la libkmlengineincludedir = $(includedir)/kml/engine @@ -105,189 +101,156 @@ bbox_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) bbox_test_LDADD = libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la clone_test_SOURCES = clone_test.cc clone_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) clone_test_LDADD = libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la entity_mapper_test_SOURCES = entity_mapper_test.cc entity_mapper_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) entity_mapper_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la feature_balloon_test_SOURCES = feature_balloon_test.cc feature_balloon_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) feature_balloon_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la feature_visitor_test_SOURCES = feature_visitor_test.cc feature_visitor_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) feature_visitor_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la find_test_SOURCES = find_test.cc find_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) find_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la get_link_parents_test_SOURCES = get_link_parents_test.cc get_link_parents_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) get_link_parents_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la get_links_test_SOURCES = get_links_test.cc get_links_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) get_links_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la href_test_SOURCES = href_test.cc href_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) href_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la id_mapper_test_SOURCES = id_mapper_test.cc id_mapper_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) id_mapper_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_cache_test_SOURCES = kml_cache_test.cc kml_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) kml_cache_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_file_test_SOURCES = kml_file_test.cc kml_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) kml_file_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_stream_test_SOURCES = kml_stream_test.cc kml_stream_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) kml_stream_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kml_uri_test_SOURCES = kml_uri_test.cc kml_uri_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) kml_uri_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kmz_cache_test_SOURCES = kmz_cache_test.cc kmz_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) kmz_cache_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la kmz_file_test_SOURCES = kmz_file_test.cc kmz_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) kmz_file_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la link_util_test_SOURCES = link_util_test.cc link_util_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) link_util_test_LDADD = libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la location_util_test_SOURCES = location_util_test.cc location_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) location_util_test_LDADD = libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la merge_test_SOURCES = merge_test.cc merge_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) merge_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la object_id_parser_observer_test_SOURCES = object_id_parser_observer_test.cc object_id_parser_observer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) object_id_parser_observer_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la parse_old_schema_test_SOURCES = parse_old_schema_test.cc parse_old_schema_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) parse_old_schema_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la schema_parser_observer_test_SOURCES = schema_parser_observer_test.cc schema_parser_observer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) schema_parser_observer_test_LDADD= \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la shared_style_parser_observer_test_SOURCES = shared_style_parser_observer_test.cc shared_style_parser_observer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) shared_style_parser_observer_test_LDADD= \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la style_merger_test_SOURCES = style_merger_test.cc style_merger_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) style_merger_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la style_resolver_test_SOURCES = style_resolver_test.cc style_resolver_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) style_resolver_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la update_test_SOURCES = update_test.cc update_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) update_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/liburiparser.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la CLEANFILES = check_PROGRAMS --- src/kml/regionator/Makefile.am~ 2008-10-28 07:29:52.000000000 +0300 +++ src/kml/regionator/Makefile.am 2009-01-30 13:14:42.100236700 +0300 @@ -1,7 +1,4 @@ -AM_CPPFLAGS= -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include \ - -I$(top_srcdir)/third_party/googletest-r108/include +AM_CPPFLAGS= -I$(top_srcdir)/src if GCC @@ -37,8 +34,7 @@ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la regionator_test_SOURCES = regionator_test.cc regionator_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) @@ -46,8 +42,7 @@ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la regionator_qid_test_SOURCES = regionator_qid_test.cc regionator_qid_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) @@ -55,8 +50,7 @@ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la regionator_util_test_SOURCES = regionator_util_test.cc regionator_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) @@ -64,7 +58,6 @@ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la CLEANFILES = check_PROGRAMS --- src/kml/xsd/Makefile.am~ 2008-10-28 07:29:53.000000000 +0300 +++ src/kml/xsd/Makefile.am 2009-01-30 13:15:36.758234683 +0300 @@ -1,6 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/googletest-r108/include +AM_CPPFLAGS = -I$(top_srcdir)/src if GCC AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti @@ -48,55 +46,46 @@ xsd_complex_type_test_SOURCES = xsd_complex_type_test.cc xsd_complex_type_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_complex_type_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_file_test_SOURCES = xsd_file_test.cc xsd_file_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_file_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_element_test_SOURCES = xsd_element_test.cc xsd_element_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_element_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_handler_test_SOURCES = xsd_handler_test.cc xsd_handler_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) xsd_handler_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_primitive_type_test_SOURCES = xsd_primitive_type_test.cc xsd_primitive_type_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_primitive_type_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_schema_test_SOURCES = xsd_schema_test.cc xsd_schema_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_schema_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_simple_type_test_SOURCES = xsd_simple_type_test.cc xsd_simple_type_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_simple_type_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xsd_util_test_SOURCES = xsd_util_test.cc xsd_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xsd_util_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la xst_parser_test_SOURCES = xst_parser_test.cc xst_parser_test_CXXFLAGS = $(AM_TEST_CXXFLAGS) xst_parser_test_LDADD = libkmlxsd.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/third_party/libgtest.la + $(top_builddir)/src/kml/base/libkmlbase.la CLEANFILES = check_PROGRAMS --- src/swig/Makefile.am~ 2008-10-29 02:04:39.000000000 +0300 +++ src/swig/Makefile.am 2009-01-30 13:22:24.128236653 +0300 @@ -1,8 +1,6 @@ SUBDIRS = java python -AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/uriparser-0.7.1/include +AM_CPPFLAGS = -I$(top_srcdir)/src --- NEW FILE libkml.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)")} Name: libkml Version: 0.6.1 Release: 2%{?dist} Summary: A KML library written in C++ with bindings to other languagues Group: Development/Libraries License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.gz #Patch0: libkml-string.patch Patch1: libkml-third_party_removal.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # requires swig >= 1.3.35 BuildRequires: cppunit, swig >= 1.3.35 BuildRequires: java-devel, libcurl-devel BuildRequires: expat-devel, python-devel, chrpath BuildRequires: minizip-devel, uriparser-devel, zlib-devel BuildRequires: boost-devel BuildRequires: autoconf, libtool Requires: python, java %description Libkml is an implementation of the OGC KML 2.2 standard. is written in C++ and bindings are available via SWIG to other languages. It can be used in applications that want to parse, generate and operate on KML. %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 rm -rf third_party %patch1 -p0 -b .third_party #%patch0 -p1 -b .string %build autoreconf -fi %configure --disable-static \ --with-java-include-dir=%{_jvmdir}/java make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' # remove compiled examples cd examples; make clean;cd .. # remove x permssion from examples folder files find examples -type f -print | xargs chmod a-x # move libs to kml (for keeping third party libs away) mkdir -p $RPM_BUILD_ROOT%{_libdir}/libkml/ mv $RPM_BUILD_ROOT%{_libdir}/*.so* $RPM_BUILD_ROOT%{_libdir}/libkml/ #removing rpaths with chrpath chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libkml/libkmldom_swig_java.so.0.0.0 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libkml/libkmlengine_swig_python.so.0.0.0 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libkml/libkmlengine.so.0.0.0 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libkml/libkmldom_swig_python.so.0.0.0 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libkml/libkmlengine_swig_java.so.0.0.0 chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/_kmlengine.so chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/_kmldom.so chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/_kmlbase.so # remove .libs and .deps directories find . -name '.libs' -type d -print | xargs rm -rf find . -name '.deps' -type d -print | xargs rm -rf # fix unstripping-binary-or-object warning chmod a+x $RPM_BUILD_ROOT%{python_sitearch}/_kmlengine.so chmod a+x $RPM_BUILD_ROOT%{python_sitearch}/_kmldom.so %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING %doc AUTHORS %doc README %doc ChangeLog %dir %{_libdir}/libkml %{_libdir}/libkml/*.so.* %{python_sitearch}/*.so %{python_sitearch}/*.py %{python_sitearch}/*.pyc %{python_sitearch}/*.pyo %files devel %defattr(-,root,root,-) %doc examples %{_includedir}/* %dir %{_libdir}/libkml %{_libdir}/libkml/*.so %changelog * Sat Mar 07 2009 Rakesh Pandit 0.6.1-2 - updated to 0.6.1 - libkml-third_party_removal.diff Removes third part dependency - (provided by Peter Lemenkov) * Fri Jan 16 2009 Rakesh Pandit 0.6.1-1 - Updated to 0.6.1 * Mon Oct 05 2008 Rakesh Pandit 0.4.0-2 - Added >= 1.3.35 for swing * Sat Aug 09 2008 Rakesh Pandit 0.4.0-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libkml/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:00:20 -0000 1.1 +++ .cvsignore 7 Mar 2009 17:26:37 -0000 1.2 @@ -0,0 +1 @@ +libkml-0.6.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libkml/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:00:20 -0000 1.1 +++ sources 7 Mar 2009 17:26:37 -0000 1.2 @@ -0,0 +1 @@ +3fb00404e7a79ca53e591c0661f47ea2 libkml-0.6.1.tar.gz From nosnilmot at fedoraproject.org Sat Mar 7 17:27:32 2009 From: nosnilmot at fedoraproject.org (Stu Tomlinson) Date: Sat, 7 Mar 2009 17:27:32 +0000 (UTC) Subject: rpms/pidgin/F-9 one_time_password.c,NONE,1.1 Message-ID: <20090307172732.AC34070116@cvs1.fedora.phx.redhat.com> Author: nosnilmot Update of /cvs/pkgs/rpms/pidgin/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31657/F-9 Added Files: one_time_password.c Log Message: Add source for one time password plugin --- NEW FILE one_time_password.c --- /* * One Time Password support plugin for libpurple * * Copyright (C) 2009, Daniel Atallah * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02111-1301, USA. */ #include "internal.h" #include "debug.h" #include "plugin.h" #include "version.h" #include "account.h" #include "accountopt.h" #define PLUGIN_ID "core-one_time_password" #define PREF_NAME PLUGIN_ID "_enabled" static void signed_on_cb(PurpleConnection *conn, void *data) { PurpleAccount *account = purple_connection_get_account(conn); if (purple_account_get_bool(account, PREF_NAME, FALSE)) { if(purple_account_get_remember_password(account)) purple_debug_error("One Time Password", "Unable to enforce one time password for account %s (%s).\n" "Account is set to remember the password.\n", purple_account_get_username(account), purple_account_get_protocol_name(account)); else { purple_debug_info("One Time Password", "Clearing password for account %s (%s).\n", purple_account_get_username(account), purple_account_get_protocol_name(account)); purple_account_set_password(account, NULL); /* TODO: Do we need to somehow clear conn->password ? */ } } } static gboolean plugin_load(PurplePlugin *plugin) { PurplePlugin *prpl; PurplePluginProtocolInfo *prpl_info; PurpleAccountOption *option; GList *l; /* Register protocol preference. */ for (l = purple_plugins_get_protocols(); l != NULL; l = l->next) { prpl = (PurplePlugin *)l->data; prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); if (prpl_info != NULL && !(prpl_info->options & OPT_PROTO_NO_PASSWORD)) { option = purple_account_option_bool_new(_("One Time Password"), PREF_NAME, FALSE); prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option); } } /* Register callback. */ purple_signal_connect(purple_connections_get_handle(), "signed-on", plugin, PURPLE_CALLBACK(signed_on_cb), NULL); return TRUE; } static gboolean plugin_unload(PurplePlugin *plugin) { PurplePlugin *prpl; PurplePluginProtocolInfo *prpl_info; PurpleAccountOption *option; GList *l, *options; /* Remove protocol preference. */ for (l = purple_plugins_get_protocols(); l != NULL; l = l->next) { prpl = (PurplePlugin *)l->data; prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); if (prpl_info != NULL && !(prpl_info->options & OPT_PROTO_NO_PASSWORD)) { options = prpl_info->protocol_options; while (options != NULL) { option = (PurpleAccountOption *) options->data; if (strcmp(PREF_NAME, purple_account_option_get_setting(option)) == 0) { prpl_info->protocol_options = g_list_delete_link(prpl_info->protocol_options, options); purple_account_option_destroy(option); break; } options = options->next; } } } /* Callback will be automagically unregistered */ return TRUE; } static PurplePluginInfo info = { PURPLE_PLUGIN_MAGIC, PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION, PURPLE_PLUGIN_STANDARD, /**< type */ NULL, /**< ui_requirement */ 0, /**< flags */ NULL, /**< dependencies */ PURPLE_PRIORITY_DEFAULT, /**< priority */ PLUGIN_ID, /**< id */ N_("One Time Password Support"), /**< name */ DISPLAY_VERSION, /**< version */ /** summary */ N_("Enforce that passwords are used only once."), /** description */ N_("Allows you to enforce on a per-account basis that passwords not " "being saved are only used in a single successful connection.\n" "Note: The account password must not be saved for this to work."), "Daniel Atallah ", /**< author */ PURPLE_WEBSITE, /**< homepage */ plugin_load, /**< load */ plugin_unload, /**< unload */ NULL, /**< destroy */ NULL, /**< ui_info */ NULL, /**< extra_info */ NULL, /**< prefs_info */ NULL, /**< actions */ NULL, /**< reserved 1 */ NULL, /**< reserved 2 */ NULL, /**< reserved 3 */ NULL /**< reserved 4 */ }; static void init_plugin(PurplePlugin *plugin) { } PURPLE_INIT_PLUGIN(one_time_password, init_plugin, info) From nosnilmot at fedoraproject.org Sat Mar 7 17:27:33 2009 From: nosnilmot at fedoraproject.org (Stu Tomlinson) Date: Sat, 7 Mar 2009 17:27:33 +0000 (UTC) Subject: rpms/pidgin/F-10 one_time_password.c,NONE,1.1 Message-ID: <20090307172733.08DCB70116@cvs1.fedora.phx.redhat.com> Author: nosnilmot Update of /cvs/pkgs/rpms/pidgin/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31657/F-10 Added Files: one_time_password.c Log Message: Add source for one time password plugin --- NEW FILE one_time_password.c --- /* * One Time Password support plugin for libpurple * * Copyright (C) 2009, Daniel Atallah * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02111-1301, USA. */ #include "internal.h" #include "debug.h" #include "plugin.h" #include "version.h" #include "account.h" #include "accountopt.h" #define PLUGIN_ID "core-one_time_password" #define PREF_NAME PLUGIN_ID "_enabled" static void signed_on_cb(PurpleConnection *conn, void *data) { PurpleAccount *account = purple_connection_get_account(conn); if (purple_account_get_bool(account, PREF_NAME, FALSE)) { if(purple_account_get_remember_password(account)) purple_debug_error("One Time Password", "Unable to enforce one time password for account %s (%s).\n" "Account is set to remember the password.\n", purple_account_get_username(account), purple_account_get_protocol_name(account)); else { purple_debug_info("One Time Password", "Clearing password for account %s (%s).\n", purple_account_get_username(account), purple_account_get_protocol_name(account)); purple_account_set_password(account, NULL); /* TODO: Do we need to somehow clear conn->password ? */ } } } static gboolean plugin_load(PurplePlugin *plugin) { PurplePlugin *prpl; PurplePluginProtocolInfo *prpl_info; PurpleAccountOption *option; GList *l; /* Register protocol preference. */ for (l = purple_plugins_get_protocols(); l != NULL; l = l->next) { prpl = (PurplePlugin *)l->data; prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); if (prpl_info != NULL && !(prpl_info->options & OPT_PROTO_NO_PASSWORD)) { option = purple_account_option_bool_new(_("One Time Password"), PREF_NAME, FALSE); prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option); } } /* Register callback. */ purple_signal_connect(purple_connections_get_handle(), "signed-on", plugin, PURPLE_CALLBACK(signed_on_cb), NULL); return TRUE; } static gboolean plugin_unload(PurplePlugin *plugin) { PurplePlugin *prpl; PurplePluginProtocolInfo *prpl_info; PurpleAccountOption *option; GList *l, *options; /* Remove protocol preference. */ for (l = purple_plugins_get_protocols(); l != NULL; l = l->next) { prpl = (PurplePlugin *)l->data; prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); if (prpl_info != NULL && !(prpl_info->options & OPT_PROTO_NO_PASSWORD)) { options = prpl_info->protocol_options; while (options != NULL) { option = (PurpleAccountOption *) options->data; if (strcmp(PREF_NAME, purple_account_option_get_setting(option)) == 0) { prpl_info->protocol_options = g_list_delete_link(prpl_info->protocol_options, options); purple_account_option_destroy(option); break; } options = options->next; } } } /* Callback will be automagically unregistered */ return TRUE; } static PurplePluginInfo info = { PURPLE_PLUGIN_MAGIC, PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION, PURPLE_PLUGIN_STANDARD, /**< type */ NULL, /**< ui_requirement */ 0, /**< flags */ NULL, /**< dependencies */ PURPLE_PRIORITY_DEFAULT, /**< priority */ PLUGIN_ID, /**< id */ N_("One Time Password Support"), /**< name */ DISPLAY_VERSION, /**< version */ /** summary */ N_("Enforce that passwords are used only once."), /** description */ N_("Allows you to enforce on a per-account basis that passwords not " "being saved are only used in a single successful connection.\n" "Note: The account password must not be saved for this to work."), "Daniel Atallah ", /**< author */ PURPLE_WEBSITE, /**< homepage */ plugin_load, /**< load */ plugin_unload, /**< unload */ NULL, /**< destroy */ NULL, /**< ui_info */ NULL, /**< extra_info */ NULL, /**< prefs_info */ NULL, /**< actions */ NULL, /**< reserved 1 */ NULL, /**< reserved 2 */ NULL, /**< reserved 3 */ NULL /**< reserved 4 */ }; static void init_plugin(PurplePlugin *plugin) { } PURPLE_INIT_PLUGIN(one_time_password, init_plugin, info) From pkgdb at fedoraproject.org Sat Mar 7 17:28:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:28:30 +0000 Subject: [pkgdb] libbase was added for caolanm Message-ID: <20090307172850.B08BB208544@bastion.fedora.phx.redhat.com> kevin has added Package libbase with summary JFree Base Services kevin has approved Package libbase kevin has added a Fedora devel branch for libbase with an owner of caolanm kevin has approved libbase in Fedora devel kevin has approved Package libbase kevin has set commit to Approved for provenpackager on libbase (Fedora devel) kevin has set build to Approved for provenpackager on libbase (Fedora devel) kevin has set checkout to Approved for provenpackager on libbase (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libbase From kevin at fedoraproject.org Sat Mar 7 17:28:18 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:28:18 +0000 (UTC) Subject: rpms/libbase - New directory Message-ID: <20090307172818.2C13970116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libbase In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA32029/rpms/libbase Log Message: Directory /cvs/pkgs/rpms/libbase added to the repository From kevin at fedoraproject.org Sat Mar 7 17:28:18 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:28:18 +0000 (UTC) Subject: rpms/libbase/devel - New directory Message-ID: <20090307172818.666F670116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libbase/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA32029/rpms/libbase/devel Log Message: Directory /cvs/pkgs/rpms/libbase/devel added to the repository From kevin at fedoraproject.org Sat Mar 7 17:28:35 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:28:35 +0000 (UTC) Subject: rpms/libbase Makefile,NONE,1.1 Message-ID: <20090307172835.9A2C170116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libbase In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA32029/rpms/libbase Added Files: Makefile Log Message: Setup of module libbase --- NEW FILE Makefile --- # Top level Makefile for module libbase all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sat Mar 7 17:28:35 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:28:35 +0000 (UTC) Subject: rpms/libbase/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307172835.E5A9670116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libbase/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA32029/rpms/libbase/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libbase --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libbase # $Id: Makefile,v 1.1 2009/03/07 17:28:35 kevin Exp $ NAME := libbase SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sat Mar 7 17:31:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:31:23 +0000 Subject: [pkgdb] blahtexml was added for jasper Message-ID: <20090307173122.7D37A20820B@bastion.fedora.phx.redhat.com> kevin has added Package blahtexml with summary Converts TeX equations to MathML kevin has approved Package blahtexml kevin has added a Fedora devel branch for blahtexml with an owner of jasper kevin has approved blahtexml in Fedora devel kevin has approved Package blahtexml kevin has set commit to Approved for provenpackager on blahtexml (Fedora devel) kevin has set build to Approved for provenpackager on blahtexml (Fedora devel) kevin has set checkout to Approved for provenpackager on blahtexml (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/blahtexml From pkgdb at fedoraproject.org Sat Mar 7 17:31:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:31:03 +0000 Subject: [pkgdb] blahtexml (Fedora, 9) updated by kevin Message-ID: <20090307173124.4617D208545@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for blahtexml kevin has set commit to Approved for provenpackager on blahtexml (Fedora 9) kevin has set build to Approved for provenpackager on blahtexml (Fedora 9) kevin has set checkout to Approved for provenpackager on blahtexml (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/blahtexml From pkgdb at fedoraproject.org Sat Mar 7 17:31:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:31:03 +0000 Subject: [pkgdb] blahtexml (Fedora, 10) updated by kevin Message-ID: <20090307173124.5A5F4208548@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for blahtexml kevin has set commit to Approved for provenpackager on blahtexml (Fedora 10) kevin has set build to Approved for provenpackager on blahtexml (Fedora 10) kevin has set checkout to Approved for provenpackager on blahtexml (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/blahtexml From pkgdb at fedoraproject.org Sat Mar 7 17:31:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:31:03 +0000 Subject: [pkgdb] blahtexml (Fedora EPEL, 5) updated by kevin Message-ID: <20090307173124.6EF3E20854B@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for blahtexml kevin has set commit to Approved for provenpackager on blahtexml (Fedora EPEL 5) kevin has set build to Approved for provenpackager on blahtexml (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on blahtexml (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/blahtexml From kevin at fedoraproject.org Sat Mar 7 17:30:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:30:52 +0000 (UTC) Subject: rpms/blahtexml/devel - New directory Message-ID: <20090307173052.7EAC770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/blahtexml/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU32631/rpms/blahtexml/devel Log Message: Directory /cvs/pkgs/rpms/blahtexml/devel added to the repository From kevin at fedoraproject.org Sat Mar 7 17:30:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:30:52 +0000 (UTC) Subject: rpms/blahtexml - New directory Message-ID: <20090307173052.3AC5670116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/blahtexml In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU32631/rpms/blahtexml Log Message: Directory /cvs/pkgs/rpms/blahtexml added to the repository From kevin at fedoraproject.org Sat Mar 7 17:31:18 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:31:18 +0000 (UTC) Subject: rpms/blahtexml Makefile,NONE,1.1 Message-ID: <20090307173118.499CA70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/blahtexml In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU32631/rpms/blahtexml Added Files: Makefile Log Message: Setup of module blahtexml --- NEW FILE Makefile --- # Top level Makefile for module blahtexml all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sat Mar 7 17:31:18 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:31:18 +0000 (UTC) Subject: rpms/blahtexml/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307173118.B90EE70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/blahtexml/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU32631/rpms/blahtexml/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module blahtexml --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: blahtexml # $Id: Makefile,v 1.1 2009/03/07 17:31:18 kevin Exp $ NAME := blahtexml SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sat Mar 7 17:32:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:32:10 +0000 Subject: [pkgdb] perl-Hash-Merge-Simple was added for cweyl Message-ID: <20090307173302.DBEA32082B2@bastion.fedora.phx.redhat.com> kevin has added Package perl-Hash-Merge-Simple with summary Recursively merge two or more hashes, simply kevin has approved Package perl-Hash-Merge-Simple kevin has added a Fedora devel branch for perl-Hash-Merge-Simple with an owner of cweyl kevin has approved perl-Hash-Merge-Simple in Fedora devel kevin has approved Package perl-Hash-Merge-Simple kevin has set commit to Approved for provenpackager on perl-Hash-Merge-Simple (Fedora devel) kevin has set build to Approved for provenpackager on perl-Hash-Merge-Simple (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Hash-Merge-Simple (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Hash-Merge-Simple From pkgdb at fedoraproject.org Sat Mar 7 17:33:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:33:06 +0000 Subject: [pkgdb] perl-Hash-Merge-Simple (Fedora, 9) updated by kevin Message-ID: <20090307173304.D91E6208545@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-Hash-Merge-Simple kevin has set commit to Approved for provenpackager on perl-Hash-Merge-Simple (Fedora 9) kevin has set build to Approved for provenpackager on perl-Hash-Merge-Simple (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-Hash-Merge-Simple (Fedora 9) kevin approved watchbugzilla on perl-Hash-Merge-Simple (Fedora 9) for perl-sig kevin approved watchcommits on perl-Hash-Merge-Simple (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Hash-Merge-Simple From pkgdb at fedoraproject.org Sat Mar 7 17:33:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:33:06 +0000 Subject: [pkgdb] perl-Hash-Merge-Simple (Fedora, 10) updated by kevin Message-ID: <20090307173304.E3F29208548@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Hash-Merge-Simple kevin has set commit to Approved for provenpackager on perl-Hash-Merge-Simple (Fedora 10) kevin has set build to Approved for provenpackager on perl-Hash-Merge-Simple (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Hash-Merge-Simple (Fedora 10) kevin approved watchbugzilla on perl-Hash-Merge-Simple (Fedora 10) for perl-sig kevin approved watchcommits on perl-Hash-Merge-Simple (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Hash-Merge-Simple From pkgdb at fedoraproject.org Sat Mar 7 17:33:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:33:06 +0000 Subject: [pkgdb] perl-Hash-Merge-Simple (Fedora, devel) updated by kevin Message-ID: <20090307173305.A0D8820854B@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Hash-Merge-Simple (Fedora devel) for perl-sig kevin approved watchcommits on perl-Hash-Merge-Simple (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Hash-Merge-Simple From kevin at fedoraproject.org Sat Mar 7 17:33:30 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:33:30 +0000 (UTC) Subject: rpms/perl-Hash-Merge-Simple - New directory Message-ID: <20090307173330.3752470116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Hash-Merge-Simple In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnIF884/rpms/perl-Hash-Merge-Simple Log Message: Directory /cvs/pkgs/rpms/perl-Hash-Merge-Simple added to the repository From kevin at fedoraproject.org Sat Mar 7 17:33:30 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:33:30 +0000 (UTC) Subject: rpms/perl-Hash-Merge-Simple/devel - New directory Message-ID: <20090307173330.933F870118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Hash-Merge-Simple/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnIF884/rpms/perl-Hash-Merge-Simple/devel Log Message: Directory /cvs/pkgs/rpms/perl-Hash-Merge-Simple/devel added to the repository From kevin at fedoraproject.org Sat Mar 7 17:34:01 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:34:01 +0000 (UTC) Subject: rpms/perl-Hash-Merge-Simple/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307173401.09FCE70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Hash-Merge-Simple/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnIF884/rpms/perl-Hash-Merge-Simple/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Hash-Merge-Simple --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Hash-Merge-Simple # $Id: Makefile,v 1.1 2009/03/07 17:34:00 kevin Exp $ NAME := perl-Hash-Merge-Simple SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Sat Mar 7 17:34:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:34:00 +0000 (UTC) Subject: rpms/perl-Hash-Merge-Simple Makefile,NONE,1.1 Message-ID: <20090307173400.958EC70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Hash-Merge-Simple In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnIF884/rpms/perl-Hash-Merge-Simple Added Files: Makefile Log Message: Setup of module perl-Hash-Merge-Simple --- NEW FILE Makefile --- # Top level Makefile for module perl-Hash-Merge-Simple all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From caolanm at fedoraproject.org Sat Mar 7 17:34:29 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sat, 7 Mar 2009 17:34:29 +0000 (UTC) Subject: rpms/libvisual/devel libvisual-0.4.0-inlinedefineconflict.patch, NONE, 1.1 libvisual.spec, 1.20, 1.21 Message-ID: <20090307173429.28EE870116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/libvisual/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1044 Modified Files: libvisual.spec Added Files: libvisual-0.4.0-inlinedefineconflict.patch Log Message: defining inline causes problems trying to build against libvisual headers libvisual-0.4.0-inlinedefineconflict.patch: --- NEW FILE libvisual-0.4.0-inlinedefineconflict.patch --- diff -ru libvisual-0.4.0.orig/libvisual/lv_cache.c libvisual-0.4.0/libvisual/lv_cache.c --- libvisual-0.4.0.orig/libvisual/lv_cache.c 2009-03-07 17:17:38.000000000 +0000 +++ libvisual-0.4.0/libvisual/lv_cache.c 2009-03-07 17:25:26.000000000 +0000 @@ -32,7 +32,7 @@ static int cache_dtor (VisObject *object); static int cache_remove_list_entry (VisCache *cache, VisListEntry **le); -static inline void handle_request_reset (VisCache *cache, VisListEntry *le); +static lv_inline void handle_request_reset (VisCache *cache, VisListEntry *le); static int cache_dtor (VisObject *object) { @@ -74,7 +74,7 @@ } -static inline void handle_request_reset (VisCache *cache, VisListEntry *le) +static lv_inline void handle_request_reset (VisCache *cache, VisListEntry *le) { VisCacheEntry *centry; diff -ru libvisual-0.4.0.orig/libvisual/lv_defines.h libvisual-0.4.0/libvisual/lv_defines.h --- libvisual-0.4.0.orig/libvisual/lv_defines.h 2009-03-07 17:17:38.000000000 +0000 +++ libvisual-0.4.0/libvisual/lv_defines.h 2009-03-07 17:24:17.000000000 +0000 @@ -63,13 +63,13 @@ /* Compiler specific optimalization macros */ #if __GNUC__ >= 3 -# define inline inline __attribute__ ((always_inline)) +# define lv_inline inline __attribute__ ((always_inline)) # define __malloc __attribute__ ((malloc)) # define __packed __attribute__ ((packed)) # define VIS_LIKELY(x) __builtin_expect (!!(x), 1) # define VIS_UNLIKELY(x) __builtin_expect (!!(x), 0) #else -# define inline /* no inline */ +# define lv_inline /* no inline */ # define __malloc /* no malloc */ # define __packed /* no packed */ # define VIS_LIKELY(x) (x) diff -ru libvisual-0.4.0.orig/libvisual/lv_time.h libvisual-0.4.0/libvisual/lv_time.h --- libvisual-0.4.0.orig/libvisual/lv_time.h 2009-03-07 17:17:38.000000000 +0000 +++ libvisual-0.4.0/libvisual/lv_time.h 2009-03-07 17:25:15.000000000 +0000 @@ -101,7 +101,7 @@ * * @return Nothing. */ -static inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi) +static lv_inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi) { #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64) __asm __volatile @@ -115,7 +115,7 @@ } /* FIXME use uint64_t here, make sure type exists */ -static inline unsigned long long visual_timer_tsc_get_returned () +static lv_inline unsigned long long visual_timer_tsc_get_returned () { uint32_t lo, hi; Index: libvisual.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvisual/devel/libvisual.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- libvisual.spec 25 Feb 2009 19:49:18 -0000 1.20 +++ libvisual.spec 7 Mar 2009 17:33:58 -0000 1.21 @@ -2,7 +2,7 @@ Name: libvisual Version: 0.4.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Abstraction library for audio visualisation plugins Group: Applications/Multimedia @@ -14,6 +14,7 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=435771 Patch0: libvisual-0.4.0-better-altivec-detection.patch +Patch1: libvisual-0.4.0-inlinedefineconflict.patch %description @@ -43,6 +44,7 @@ %prep %setup -q %patch0 -p1 -b .altivec-detection +%patch1 -p1 -b .inlinedefineconflict %build %ifarch i386 @@ -84,6 +86,10 @@ %changelog +* Sat Mar 07 2009 Caol??n McNamara - 0.4.0-8 +- defining inline causes problems trying to build against libvisual headers, + e.g. libvisual-plugins + * Wed Feb 25 2009 Fedora Release Engineering - 0.4.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Sat Mar 7 17:36:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:36:05 +0000 Subject: [pkgdb] perl-IPC-System-Simple was added for cweyl Message-ID: <20090307173658.296E720820B@bastion.fedora.phx.redhat.com> kevin has added Package perl-IPC-System-Simple with summary Run commands simply, with detailed diagnostics kevin has approved Package perl-IPC-System-Simple kevin has added a Fedora devel branch for perl-IPC-System-Simple with an owner of cweyl kevin has approved perl-IPC-System-Simple in Fedora devel kevin has approved Package perl-IPC-System-Simple kevin has set commit to Approved for provenpackager on perl-IPC-System-Simple (Fedora devel) kevin has set build to Approved for provenpackager on perl-IPC-System-Simple (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-IPC-System-Simple (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-System-Simple From pkgdb at fedoraproject.org Sat Mar 7 17:37:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:37:03 +0000 Subject: [pkgdb] perl-IPC-System-Simple (Fedora, 9) updated by kevin Message-ID: <20090307173701.D1B5D208544@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-IPC-System-Simple kevin has set commit to Approved for provenpackager on perl-IPC-System-Simple (Fedora 9) kevin has set build to Approved for provenpackager on perl-IPC-System-Simple (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-IPC-System-Simple (Fedora 9) kevin approved watchbugzilla on perl-IPC-System-Simple (Fedora 9) for perl-sig kevin approved watchcommits on perl-IPC-System-Simple (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-System-Simple From pkgdb at fedoraproject.org Sat Mar 7 17:37:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:37:03 +0000 Subject: [pkgdb] perl-IPC-System-Simple (Fedora, 10) updated by kevin Message-ID: <20090307173702.126CF208547@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-IPC-System-Simple kevin has set commit to Approved for provenpackager on perl-IPC-System-Simple (Fedora 10) kevin has set build to Approved for provenpackager on perl-IPC-System-Simple (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-IPC-System-Simple (Fedora 10) kevin approved watchbugzilla on perl-IPC-System-Simple (Fedora 10) for perl-sig kevin approved watchcommits on perl-IPC-System-Simple (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-System-Simple From pkgdb at fedoraproject.org Sat Mar 7 17:37:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:37:03 +0000 Subject: [pkgdb] perl-IPC-System-Simple (Fedora, devel) updated by kevin Message-ID: <20090307173702.2153C20854A@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-IPC-System-Simple (Fedora devel) for perl-sig kevin approved watchcommits on perl-IPC-System-Simple (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-System-Simple From kevin at fedoraproject.org Sat Mar 7 17:36:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:36:29 +0000 (UTC) Subject: rpms/perl-IPC-System-Simple - New directory Message-ID: <20090307173629.3778970117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-IPC-System-Simple In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshq1844/rpms/perl-IPC-System-Simple Log Message: Directory /cvs/pkgs/rpms/perl-IPC-System-Simple added to the repository From kevin at fedoraproject.org Sat Mar 7 17:36:29 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:36:29 +0000 (UTC) Subject: rpms/perl-IPC-System-Simple/devel - New directory Message-ID: <20090307173629.8606670118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-IPC-System-Simple/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshq1844/rpms/perl-IPC-System-Simple/devel Log Message: Directory /cvs/pkgs/rpms/perl-IPC-System-Simple/devel added to the repository From kevin at fedoraproject.org Sat Mar 7 17:36:48 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:36:48 +0000 (UTC) Subject: rpms/perl-IPC-System-Simple Makefile,NONE,1.1 Message-ID: <20090307173648.7788C70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-IPC-System-Simple In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshq1844/rpms/perl-IPC-System-Simple Added Files: Makefile Log Message: Setup of module perl-IPC-System-Simple --- NEW FILE Makefile --- # Top level Makefile for module perl-IPC-System-Simple all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sat Mar 7 17:36:48 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:36:48 +0000 (UTC) Subject: rpms/perl-IPC-System-Simple/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307173648.C53DA70117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-IPC-System-Simple/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshq1844/rpms/perl-IPC-System-Simple/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-IPC-System-Simple --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-IPC-System-Simple # $Id: Makefile,v 1.1 2009/03/07 17:36:48 kevin Exp $ NAME := perl-IPC-System-Simple SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sat Mar 7 17:38:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:38:15 +0000 Subject: [pkgdb] perl-App-Cache was added for cweyl Message-ID: <20090307173908.9BD36208545@bastion.fedora.phx.redhat.com> kevin has added Package perl-App-Cache with summary Easy application-level caching kevin has approved Package perl-App-Cache kevin has added a Fedora devel branch for perl-App-Cache with an owner of cweyl kevin has approved perl-App-Cache in Fedora devel kevin has approved Package perl-App-Cache kevin has set commit to Approved for provenpackager on perl-App-Cache (Fedora devel) kevin has set build to Approved for provenpackager on perl-App-Cache (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-App-Cache (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-App-Cache From pkgdb at fedoraproject.org Sat Mar 7 17:39:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:39:11 +0000 Subject: [pkgdb] perl-App-Cache (Fedora, 10) updated by kevin Message-ID: <20090307173914.0DAE620854B@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-App-Cache kevin has set commit to Approved for provenpackager on perl-App-Cache (Fedora 10) kevin has set build to Approved for provenpackager on perl-App-Cache (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-App-Cache (Fedora 10) kevin approved watchbugzilla on perl-App-Cache (Fedora 10) for perl-sig kevin approved watchcommits on perl-App-Cache (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-App-Cache From pkgdb at fedoraproject.org Sat Mar 7 17:39:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:39:11 +0000 Subject: [pkgdb] perl-App-Cache (Fedora, 9) updated by kevin Message-ID: <20090307173912.B3E2C208548@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-App-Cache kevin has set commit to Approved for provenpackager on perl-App-Cache (Fedora 9) kevin has set build to Approved for provenpackager on perl-App-Cache (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-App-Cache (Fedora 9) kevin approved watchbugzilla on perl-App-Cache (Fedora 9) for perl-sig kevin approved watchcommits on perl-App-Cache (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-App-Cache From kevin at fedoraproject.org Sat Mar 7 17:38:40 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:38:40 +0000 (UTC) Subject: rpms/perl-App-Cache/devel - New directory Message-ID: <20090307173840.6BCFE70117@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-App-Cache/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCV2458/rpms/perl-App-Cache/devel Log Message: Directory /cvs/pkgs/rpms/perl-App-Cache/devel added to the repository From pkgdb at fedoraproject.org Sat Mar 7 17:39:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:39:11 +0000 Subject: [pkgdb] perl-App-Cache (Fedora, devel) updated by kevin Message-ID: <20090307173915.B5F1520854E@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-App-Cache (Fedora devel) for perl-sig kevin approved watchcommits on perl-App-Cache (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-App-Cache From kevin at fedoraproject.org Sat Mar 7 17:38:40 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:38:40 +0000 (UTC) Subject: rpms/perl-App-Cache - New directory Message-ID: <20090307173840.2C53D70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-App-Cache In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCV2458/rpms/perl-App-Cache Log Message: Directory /cvs/pkgs/rpms/perl-App-Cache added to the repository From kevin at fedoraproject.org Sat Mar 7 17:39:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:39:00 +0000 (UTC) Subject: rpms/perl-App-Cache Makefile,NONE,1.1 Message-ID: <20090307173900.89F4E70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-App-Cache In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCV2458/rpms/perl-App-Cache Added Files: Makefile Log Message: Setup of module perl-App-Cache --- NEW FILE Makefile --- # Top level Makefile for module perl-App-Cache all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sat Mar 7 17:39:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sat, 7 Mar 2009 17:39:00 +0000 (UTC) Subject: rpms/perl-App-Cache/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090307173900.F3EFF70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-App-Cache/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCV2458/rpms/perl-App-Cache/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-App-Cache --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-App-Cache # $Id: Makefile,v 1.1 2009/03/07 17:39:00 kevin Exp $ NAME := perl-App-Cache SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Sat Mar 7 17:39:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sat, 07 Mar 2009 17:39:09 +0000 Subject: [pkgdb] gsm (Fedora EPEL, 4) updated by kevin Message-ID: <20090307174003.3D88A208546@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for gsm kevin has set commit to Approved for provenpackager on gsm (Fedora EPEL 4) kevin has set build to Approved for provenpackager on gsm (Fedora EPEL 4) kevin has set checkout to Approved for provenpackager on gsm (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gsm From mjg59 at fedoraproject.org Sat Mar 7 17:40:31 2009 From: mjg59 at fedoraproject.org (Matthew Garrett) Date: Sat, 7 Mar 2009 17:40:31 +0000 (UTC) Subject: rpms/linuxwacom/devel linuxwacom-0.8.2.2-hal-setup.patch, NONE, 1.1 10-linuxwacom.fdi, 1.6, 1.7 linuxwacom.spec, 1.75, 1.76 Message-ID: <20090307174031.B585170116@cvs1.fedora.phx.redhat.com> Author: mjg59 Update of /cvs/pkgs/rpms/linuxwacom/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2903 Modified Files: 10-linuxwacom.fdi linuxwacom.spec Added Files: linuxwacom-0.8.2.2-hal-setup.patch Log Message: * Sat Mar 10 2009 Matthew Garrett 0.8.2.2-8 - linuxwacom-0.8.2.2-hal-setup.patch: Add a hal callout to set up secondary input types - 10-linuxwacom.fdi: Add support for the callout linuxwacom-0.8.2.2-hal-setup.patch: --- NEW FILE linuxwacom-0.8.2.2-hal-setup.patch --- --- linuxwacom-0.8.2-2.orig/configure.in 2009-03-07 16:36:22.000000000 +0000 +++ linuxwacom-0.8.2-2/configure.in 2009-03-07 16:54:20.000000000 +0000 @@ -421,6 +421,11 @@ else AM_CONDITIONAL(WCM_ENV_XFREE86, false) fi + +PKG_CHECK_MODULES(HAL, [hal]) +AC_SUBST([HAL_CFLAGS]) +AC_SUBST([HAL_LIBS]) + dnl Check for X.org SDK if test "$WCM_ENV_XFREE86" != yes; then AC_ARG_WITH(xorg-sdk, --- linuxwacom-0.8.2-2.orig/src/util/Makefile.am 2009-01-19 18:58:37.000000000 +0000 +++ linuxwacom-0.8.2-2/src/util/Makefile.am 2009-03-07 16:57:38.000000000 +0000 @@ -5,7 +5,7 @@ wacomcfg_HEADERS = wacomcfg.h if WCM_ENV_XORGSDK -WACOMCFG_INCLUDES = -I$(WCM_XORGSDK_DIR) $(X_CFLAGS) +WACOMCFG_INCLUDES = -I$(WCM_XORGSDK_DIR) $(X_CFLAGS) $(HAL_CFLAGS) endif if WCM_ENV_XFREE86 @@ -17,7 +17,8 @@ # These identify which programs, libraries, and headers could # potentially be built or installed depending on the results of # the configuration. -EXTRA_PROGRAMS = wacdump xidump xsetwacom +EXTRA_PROGRAMS = wacdump xidump xsetwacom +libexec_PROGRAMS = hal-setup-wacom # Source dependencies wacdump_SOURCES = wacdump.c wacscrn.c wacscrn.h \ @@ -40,3 +41,6 @@ xsetwacom_SOURCES = xsetwacom.c wacomcfg.h wcmAction.c wcmAction.h ../include/Xwacom.h xsetwacom_LDADD = libwacomcfg.la + +hal_setup_wacom_SOURCES = hal-setup-wacom.c +hal_setup_wacom_LDADD = $(HAL_LIBS) \ No newline at end of file --- linuxwacom-0.8.2-2.orig/src/util/hal-setup-wacom.c 1970-01-01 01:00:00.000000000 +0100 +++ linuxwacom-0.8.2-2/src/util/hal-setup-wacom.c 2009-03-06 04:05:30.000000000 +0000 @@ -0,0 +1,156 @@ +/* + * Licensed under the GNU General Public License Version 2 + * + * Copyright (C) 2009 Red Hat + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include + +#include + +static LibHalContext *ctx = NULL; +static char* udi; + +int +main (int argc, char **argv) +{ + char *device; + char *newudi; + char *forcedev; + char *name; + char *subname; + char **types; + int i; + DBusError error; + + udi = getenv ("UDI"); + if (udi == NULL) { + fprintf (stderr, "hal-setup-wacom: Failed to get UDI\n"); + return 1; + } + + asprintf (&newudi, "%s_subdev", udi); + + dbus_error_init (&error); + if ((ctx = libhal_ctx_init_direct (&error)) == NULL) { + fprintf (stderr, "hal-setup-wacom: Unable to initialise libhal context: %s\n", error.message); + return 1; + } + + dbus_error_init (&error); + if (!libhal_device_addon_is_ready (ctx, udi, &error)) { + return 1; + } + + dbus_error_init (&error); + + /* get the device */ + device = libhal_device_get_property_string (ctx, udi, "input.device", + &error); + if (dbus_error_is_set (&error) == TRUE) { + fprintf (stderr, + "hal-setup-wacom: Failed to get input device: '%s'\n", + error.message); + return 1; + } + + /* Is there a forcedevice? */ + dbus_error_init (&error); + forcedev = libhal_device_get_property_string + (ctx, udi, "input.x11_options.ForceDevice", &error); + + dbus_error_init (&error); + name = libhal_device_get_property_string (ctx, udi, "info.product", + &error); + + dbus_error_init (&error); + types = libhal_device_get_property_strlist (ctx, udi, "wacom.types", + &error); + + if (dbus_error_is_set (&error) == TRUE) { + fprintf (stderr, + "hal-setup-wacom: Failed to get wacom types: '%s'\n", + error.message); + return 1; + } + + /* Set up the extra devices */ + for (i=0; types[i] != NULL; i++) { + char *tmpdev; + + dbus_error_init (&error); + tmpdev = libhal_new_device(ctx, &error); + if (dbus_error_is_set (&error) == TRUE) { + fprintf (stderr, + "hal-setup-wacom: Failed to create input device: '%s'\n", + error.message); + return 1; + } + dbus_error_init (&error); + libhal_device_set_property_string (ctx, tmpdev, "input.device", + device, &error); + dbus_error_init (&error); + libhal_device_set_property_string (ctx, tmpdev, + "input.x11_driver", "wacom", + &error); + dbus_error_init (&error); + libhal_device_set_property_string (ctx, tmpdev, + "input.x11_options.Type", + types[i], &error); + dbus_error_init (&error); + libhal_device_set_property_string (ctx, tmpdev, "info.parent", + udi, &error); + dbus_error_init (&error); + libhal_device_property_strlist_append (ctx, tmpdev, + "info.capabilities", + "input", &error); + if (forcedev) { + dbus_error_init (&error); + libhal_device_set_property_string (ctx, tmpdev, + "input.x11_options.ForceDevice", + forcedev, &error); + } + if (name) { + dbus_error_init (&error); + asprintf (&subname, "%s %s", name, types[i]); + libhal_device_set_property_string (ctx, tmpdev, + "info.product", + subname, &error); + free (subname); + } + dbus_error_init (&error); + libhal_device_commit_to_gdl (ctx, tmpdev, newudi, &error); + + if (dbus_error_is_set (&error) == TRUE) { + fprintf (stderr, + "hal-setup-wacom: Failed to add input device: '%s'\n", + error.message); + return 1; + } + } + + return 0; +} + Index: 10-linuxwacom.fdi =================================================================== RCS file: /cvs/pkgs/rpms/linuxwacom/devel/10-linuxwacom.fdi,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- 10-linuxwacom.fdi 4 Mar 2009 14:32:56 -0000 1.6 +++ 10-linuxwacom.fdi 7 Mar 2009 17:40:01 -0000 1.7 @@ -5,27 +5,26 @@ wacom - stylus + hal-setup-wacom + eraser + cursor + pad input wacom - stylus ISDV4 - serial.device serial.device + hal-setup-wacom + eraser + + + touch + @@ -35,12 +34,10 @@ wacom - stylus + hal-setup-wacom + eraser + cursor Index: linuxwacom.spec =================================================================== RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- linuxwacom.spec 4 Mar 2009 14:32:56 -0000 1.75 +++ linuxwacom.spec 7 Mar 2009 17:40:01 -0000 1.76 @@ -3,7 +3,7 @@ # Upstream's versioning is goofy. Note the mapping from tarname to version. Name: linuxwacom Version: 0.8.2.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Wacom Drivers from Linux Wacom Project Group: User Interface/X Hardware Support @@ -19,11 +19,13 @@ Patch5: linuxwacom-0.8.2.2-export-module.patch Patch6: linuxwacom-0.8.2.2-HAL.patch Patch7: linuxwacom-0.8.2.2-wcmMaxX.patch +Patch8: linuxwacom-0.8.2.2-hal-setup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildRequires: libX11-devel libXi-devel ncurses-devel BuildRequires: xorg-x11-server-devel >= 1.5.99.1 BuildRequires: autoconf automake libtool xorg-x11-server-Xorg +BuildRequires: hal-devel Requires: xorg-x11-server-Xorg >= 1.5.99.1, udev >= 030-21 ExclusiveArch: %{ix86} x86_64 alpha ia64 ppc ppc64 sparcv9 sparc64 @@ -52,6 +54,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build @@ -100,6 +103,7 @@ %{_bindir}/wacdump %{_bindir}/xidump %{_bindir}/xsetwacom +%{_libexecdir}/hal-setup-wacom %{_datadir}/hal/fdi/policy/20thirdparty/10-linuxwacom.fdi %{_libdir}/libwacomcfg*so.* %{_mandir}/man4/wacom.4* @@ -113,6 +117,11 @@ %{_libdir}/libwacomcfg*.so %changelog +* Sat Mar 10 2009 Matthew Garrett 0.8.2.2-8 +- linuxwacom-0.8.2.2-hal-setup.patch: Add a hal callout to set up secondary + input types +- 10-linuxwacom.fdi: Add support for the callout + * Wed Mar 04 2009 Adam Jackson 0.8.2.2-7 - 10-linuxwacom.fdi: "info.product", not "info,product". From bjohnson at fedoraproject.org Sat Mar 7 17:46:20 2009 From: bjohnson at fedoraproject.org (Bernard Johnson) Date: Sat, 7 Mar 2009 17:46:20 +0000 (UTC) Subject: rpms/libzdb/devel import.log, NONE, 1.1 libzdb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307174620.5B55170116@cvs1.fedora.phx.redhat.com> Author: bjohnson Update of /cvs/pkgs/rpms/libzdb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4080/devel Modified Files: .cvsignore sources Added Files: import.log libzdb.spec Log Message: import --- NEW FILE import.log --- libzdb-2_4-2_fc10:HEAD:libzdb-2.4-2.fc10.src.rpm:1236447375 --- NEW FILE libzdb.spec --- Name: libzdb Version: 2.4 Release: 2%{?dist} Summary: Small, fast, and easy to use database API Group: System Environment/Libraries License: GPLv3+ and MIT URL: http://www.tildeslash.com/libzdb/ Source0: http://www.tildeslash.com/%{name}/dist/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex, mysql-devel >= 4.1, postgresql-devel >= 8, sqlite-devel %description The Zild C Database Library implements a small, fast, and easy to use database API with thread-safe connection pooling. The library can connect transparently to multiple database systems, has zero configuration and connections are specified via a standard URL scheme. %prep %setup -q # Errant file rm -f doc/api-docs/._* # Add a notice that the dual licensing is not available under Fedora cat > EXCEPTIONS.new <<_EOF_ +-----------------------------------------------------------------------------+ | | | NOTE: This file is included for reference reasons only. The Fedora | | project only offers this software under the GPLv3+ and MIT licenses. | | | | All files are GPLv3+ licensed, except the following files which are MIT | | licensed: | | src/exceptions/assert.c | | src/exceptions/AssertException.h | | | | If you wish to exercise the dual license, please obtain the sources from: | | http://www.tildeslash.com/libzdb/ | | | +-----------------------------------------------------------------------------+ _EOF_ cat EXCEPTIONS >> EXCEPTIONS.new && mv EXCEPTIONS.new EXCEPTIONS %build %configure --disable-static --enable-protected make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %{_libdir}/%{name}\.so\.* %doc AUTHORS CHANGES COPYING EXCEPTIONS README %package devel Summary: Developer header files & libraries for libzdb database API Group: Development/Libraries Requires: libzdb = %{version}-${release} %description devel Developer header files & libraries for libzdb database API. %files devel %defattr(-,root,root,-) %{_includedir}/zdb %{_libdir}/%{name}.so %exclude %{_libdir}/%{name}.la %doc doc/api-docs %changelog * Wed Feb 25 2009 Bernard Johnson - 2.4-2 - add a notice to EXCEPTIONS that dual licensing is not available in Fedora * Mon Feb 16 2009 Bernard Johnson - 2.4-1 - v 2.4 - remove patches required for 2.3 - drop EXCEPTIONS as noted in review ticket * Thu Feb 05 2009 Bernard Johnson - 2.3-1 - v 2.3 * Thu Dec 04 2008 Bernard Johnson - 2.2.3-2 - disable static build by default - remove release version from soname - move headers to %%{_includedir}/libzdb/ * Thu Nov 13 2008 Bernard Johnson - 2.2.3-1 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libzdb/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:04:37 -0000 1.1 +++ .cvsignore 7 Mar 2009 17:45:50 -0000 1.2 @@ -0,0 +1 @@ +libzdb-2.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libzdb/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:04:37 -0000 1.1 +++ sources 7 Mar 2009 17:45:50 -0000 1.2 @@ -0,0 +1 @@ +b4c4ba0090881d4714f7f3e56d6eadbd libzdb-2.4.tar.gz From bjohnson at fedoraproject.org Sat Mar 7 17:49:00 2009 From: bjohnson at fedoraproject.org (Bernard Johnson) Date: Sat, 7 Mar 2009 17:49:00 +0000 (UTC) Subject: rpms/libzdb/F-10 import.log, NONE, 1.1 libzdb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307174900.E6D3670116@cvs1.fedora.phx.redhat.com> Author: bjohnson Update of /cvs/pkgs/rpms/libzdb/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4711/F-10 Modified Files: .cvsignore sources Added Files: import.log libzdb.spec Log Message: import --- NEW FILE import.log --- libzdb-2_4-2_fc10:F-10:libzdb-2.4-2.fc10.src.rpm:1236448021 --- NEW FILE libzdb.spec --- Name: libzdb Version: 2.4 Release: 2%{?dist} Summary: Small, fast, and easy to use database API Group: System Environment/Libraries License: GPLv3+ and MIT URL: http://www.tildeslash.com/libzdb/ Source0: http://www.tildeslash.com/%{name}/dist/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex, mysql-devel >= 4.1, postgresql-devel >= 8, sqlite-devel %description The Zild C Database Library implements a small, fast, and easy to use database API with thread-safe connection pooling. The library can connect transparently to multiple database systems, has zero configuration and connections are specified via a standard URL scheme. %prep %setup -q # Errant file rm -f doc/api-docs/._* # Add a notice that the dual licensing is not available under Fedora cat > EXCEPTIONS.new <<_EOF_ +-----------------------------------------------------------------------------+ | | | NOTE: This file is included for reference reasons only. The Fedora | | project only offers this software under the GPLv3+ and MIT licenses. | | | | All files are GPLv3+ licensed, except the following files which are MIT | | licensed: | | src/exceptions/assert.c | | src/exceptions/AssertException.h | | | | If you wish to exercise the dual license, please obtain the sources from: | | http://www.tildeslash.com/libzdb/ | | | +-----------------------------------------------------------------------------+ _EOF_ cat EXCEPTIONS >> EXCEPTIONS.new && mv EXCEPTIONS.new EXCEPTIONS %build %configure --disable-static --enable-protected make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %{_libdir}/%{name}\.so\.* %doc AUTHORS CHANGES COPYING EXCEPTIONS README %package devel Summary: Developer header files & libraries for libzdb database API Group: Development/Libraries Requires: libzdb = %{version}-${release} %description devel Developer header files & libraries for libzdb database API. %files devel %defattr(-,root,root,-) %{_includedir}/zdb %{_libdir}/%{name}.so %exclude %{_libdir}/%{name}.la %doc doc/api-docs %changelog * Wed Feb 25 2009 Bernard Johnson - 2.4-2 - add a notice to EXCEPTIONS that dual licensing is not available in Fedora * Mon Feb 16 2009 Bernard Johnson - 2.4-1 - v 2.4 - remove patches required for 2.3 - drop EXCEPTIONS as noted in review ticket * Thu Feb 05 2009 Bernard Johnson - 2.3-1 - v 2.3 * Thu Dec 04 2008 Bernard Johnson - 2.2.3-2 - disable static build by default - remove release version from soname - move headers to %%{_includedir}/libzdb/ * Thu Nov 13 2008 Bernard Johnson - 2.2.3-1 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libzdb/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:04:37 -0000 1.1 +++ .cvsignore 7 Mar 2009 17:48:30 -0000 1.2 @@ -0,0 +1 @@ +libzdb-2.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libzdb/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:04:37 -0000 1.1 +++ sources 7 Mar 2009 17:48:30 -0000 1.2 @@ -0,0 +1 @@ +b4c4ba0090881d4714f7f3e56d6eadbd libzdb-2.4.tar.gz From bjohnson at fedoraproject.org Sat Mar 7 17:51:37 2009 From: bjohnson at fedoraproject.org (Bernard Johnson) Date: Sat, 7 Mar 2009 17:51:37 +0000 (UTC) Subject: rpms/libzdb/EL-5 import.log, NONE, 1.1 libzdb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307175137.8837F70116@cvs1.fedora.phx.redhat.com> Author: bjohnson Update of /cvs/pkgs/rpms/libzdb/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5202/EL-5 Modified Files: .cvsignore sources Added Files: import.log libzdb.spec Log Message: import --- NEW FILE import.log --- libzdb-2_4-2_fc10:EL-5:libzdb-2.4-2.fc10.src.rpm:1236448167 --- NEW FILE libzdb.spec --- Name: libzdb Version: 2.4 Release: 2%{?dist} Summary: Small, fast, and easy to use database API Group: System Environment/Libraries License: GPLv3+ and MIT URL: http://www.tildeslash.com/libzdb/ Source0: http://www.tildeslash.com/%{name}/dist/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex, mysql-devel >= 4.1, postgresql-devel >= 8, sqlite-devel %description The Zild C Database Library implements a small, fast, and easy to use database API with thread-safe connection pooling. The library can connect transparently to multiple database systems, has zero configuration and connections are specified via a standard URL scheme. %prep %setup -q # Errant file rm -f doc/api-docs/._* # Add a notice that the dual licensing is not available under Fedora cat > EXCEPTIONS.new <<_EOF_ +-----------------------------------------------------------------------------+ | | | NOTE: This file is included for reference reasons only. The Fedora | | project only offers this software under the GPLv3+ and MIT licenses. | | | | All files are GPLv3+ licensed, except the following files which are MIT | | licensed: | | src/exceptions/assert.c | | src/exceptions/AssertException.h | | | | If you wish to exercise the dual license, please obtain the sources from: | | http://www.tildeslash.com/libzdb/ | | | +-----------------------------------------------------------------------------+ _EOF_ cat EXCEPTIONS >> EXCEPTIONS.new && mv EXCEPTIONS.new EXCEPTIONS %build %configure --disable-static --enable-protected make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %{_libdir}/%{name}\.so\.* %doc AUTHORS CHANGES COPYING EXCEPTIONS README %package devel Summary: Developer header files & libraries for libzdb database API Group: Development/Libraries Requires: libzdb = %{version}-${release} %description devel Developer header files & libraries for libzdb database API. %files devel %defattr(-,root,root,-) %{_includedir}/zdb %{_libdir}/%{name}.so %exclude %{_libdir}/%{name}.la %doc doc/api-docs %changelog * Wed Feb 25 2009 Bernard Johnson - 2.4-2 - add a notice to EXCEPTIONS that dual licensing is not available in Fedora * Mon Feb 16 2009 Bernard Johnson - 2.4-1 - v 2.4 - remove patches required for 2.3 - drop EXCEPTIONS as noted in review ticket * Thu Feb 05 2009 Bernard Johnson - 2.3-1 - v 2.3 * Thu Dec 04 2008 Bernard Johnson - 2.2.3-2 - disable static build by default - remove release version from soname - move headers to %%{_includedir}/libzdb/ * Thu Nov 13 2008 Bernard Johnson - 2.2.3-1 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libzdb/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:04:37 -0000 1.1 +++ .cvsignore 7 Mar 2009 17:51:07 -0000 1.2 @@ -0,0 +1 @@ +libzdb-2.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libzdb/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:04:37 -0000 1.1 +++ sources 7 Mar 2009 17:51:07 -0000 1.2 @@ -0,0 +1 @@ +b4c4ba0090881d4714f7f3e56d6eadbd libzdb-2.4.tar.gz From mjakubicek at fedoraproject.org Sat Mar 7 17:53:54 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Sat, 7 Mar 2009 17:53:54 +0000 (UTC) Subject: rpms/gsl/devel gsl.spec,1.48,1.49 Message-ID: <20090307175354.CC81F70116@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/gsl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6106 Modified Files: gsl.spec Log Message: - Remove rpaths (fix BZ#487823) Index: gsl.spec =================================================================== RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- gsl.spec 25 Feb 2009 01:22:32 -0000 1.48 +++ gsl.spec 7 Mar 2009 17:53:24 -0000 1.49 @@ -1,7 +1,7 @@ Summary: The GNU Scientific Library for numerical analysis Name: gsl Version: 1.12 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnu.org/software/gsl/ Source: ftp://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz Patch0: gsl-1.10-lib64.patch @@ -46,6 +46,8 @@ %build %configure CFLAGS="$CFLAGS -fgnu89-inline" +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} %install @@ -98,6 +100,9 @@ %{_libdir}/*.a %changelog +* Sat Mar 07 2009 Milos Jakubicek - 1.12-3 +- Remove rpaths (fix BZ#487823). + * Tue Feb 24 2009 Fedora Release Engineering - 1.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From bjohnson at fedoraproject.org Sat Mar 7 17:56:31 2009 From: bjohnson at fedoraproject.org (Bernard Johnson) Date: Sat, 7 Mar 2009 17:56:31 +0000 (UTC) Subject: rpms/libzdb/EL-5 libzdb.spec,1.1,1.2 Message-ID: <20090307175631.0A38670116@cvs1.fedora.phx.redhat.com> Author: bjohnson Update of /cvs/pkgs/rpms/libzdb/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6695/EL-5 Modified Files: libzdb.spec Log Message: - fix typo in requires - bz #474044 Index: libzdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/libzdb/EL-5/libzdb.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libzdb.spec 7 Mar 2009 17:51:07 -0000 1.1 +++ libzdb.spec 7 Mar 2009 17:56:00 -0000 1.2 @@ -1,6 +1,6 @@ Name: libzdb Version: 2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Small, fast, and easy to use database API Group: System Environment/Libraries @@ -67,7 +67,7 @@ %package devel Summary: Developer header files & libraries for libzdb database API Group: Development/Libraries -Requires: libzdb = %{version}-${release} +Requires: libzdb = %{version}-%{release} %description devel Developer header files & libraries for libzdb database API. @@ -82,6 +82,10 @@ %changelog +* Sat Mar 07 2009 Bernard Johnson - 2.4-3 +- fix typo in requires +- bz #474044 + * Wed Feb 25 2009 Bernard Johnson - 2.4-2 - add a notice to EXCEPTIONS that dual licensing is not available in Fedora From bjohnson at fedoraproject.org Sat Mar 7 17:56:31 2009 From: bjohnson at fedoraproject.org (Bernard Johnson) Date: Sat, 7 Mar 2009 17:56:31 +0000 (UTC) Subject: rpms/libzdb/F-10 libzdb.spec,1.1,1.2 Message-ID: <20090307175631.2D23E70118@cvs1.fedora.phx.redhat.com> Author: bjohnson Update of /cvs/pkgs/rpms/libzdb/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6695/F-10 Modified Files: libzdb.spec Log Message: - fix typo in requires - bz #474044 Index: libzdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/libzdb/F-10/libzdb.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libzdb.spec 7 Mar 2009 17:48:30 -0000 1.1 +++ libzdb.spec 7 Mar 2009 17:56:00 -0000 1.2 @@ -1,6 +1,6 @@ Name: libzdb Version: 2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Small, fast, and easy to use database API Group: System Environment/Libraries @@ -67,7 +67,7 @@ %package devel Summary: Developer header files & libraries for libzdb database API Group: Development/Libraries -Requires: libzdb = %{version}-${release} +Requires: libzdb = %{version}-%{release} %description devel Developer header files & libraries for libzdb database API. @@ -82,6 +82,10 @@ %changelog +* Sat Mar 07 2009 Bernard Johnson - 2.4-3 +- fix typo in requires +- bz #474044 + * Wed Feb 25 2009 Bernard Johnson - 2.4-2 - add a notice to EXCEPTIONS that dual licensing is not available in Fedora From bjohnson at fedoraproject.org Sat Mar 7 17:56:31 2009 From: bjohnson at fedoraproject.org (Bernard Johnson) Date: Sat, 7 Mar 2009 17:56:31 +0000 (UTC) Subject: rpms/libzdb/devel libzdb.spec,1.1,1.2 Message-ID: <20090307175631.66D1470116@cvs1.fedora.phx.redhat.com> Author: bjohnson Update of /cvs/pkgs/rpms/libzdb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6695/devel Modified Files: libzdb.spec Log Message: - fix typo in requires - bz #474044 Index: libzdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/libzdb/devel/libzdb.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libzdb.spec 7 Mar 2009 17:45:50 -0000 1.1 +++ libzdb.spec 7 Mar 2009 17:56:01 -0000 1.2 @@ -1,6 +1,6 @@ Name: libzdb Version: 2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Small, fast, and easy to use database API Group: System Environment/Libraries @@ -67,7 +67,7 @@ %package devel Summary: Developer header files & libraries for libzdb database API Group: Development/Libraries -Requires: libzdb = %{version}-${release} +Requires: libzdb = %{version}-%{release} %description devel Developer header files & libraries for libzdb database API. @@ -82,6 +82,10 @@ %changelog +* Sat Mar 07 2009 Bernard Johnson - 2.4-3 +- fix typo in requires +- bz #474044 + * Wed Feb 25 2009 Bernard Johnson - 2.4-2 - add a notice to EXCEPTIONS that dual licensing is not available in Fedora From mtasaka at fedoraproject.org Sat Mar 7 18:01:24 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sat, 7 Mar 2009 18:01:24 +0000 (UTC) Subject: rpms/jd/F-10 .cvsignore, 1.350, 1.351 jd.spec, 1.407, 1.408 sources, 1.351, 1.352 Message-ID: <20090307180124.6DB1370116@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7800/F-10 Modified Files: .cvsignore jd.spec sources Log Message: rev 2708 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v retrieving revision 1.350 retrieving revision 1.351 diff -u -r1.350 -r1.351 --- .cvsignore 4 Mar 2009 16:30:14 -0000 1.350 +++ .cvsignore 7 Mar 2009 18:00:53 -0000 1.351 @@ -1 +1 @@ -jd-2.3.0-090305.tgz +jd-2.4.0-svn2708_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v retrieving revision 1.407 retrieving revision 1.408 diff -u -r1.407 -r1.408 --- jd.spec 4 Mar 2009 16:30:14 -0000 1.407 +++ jd.spec 7 Mar 2009 18:00:53 -0000 1.408 @@ -9,11 +9,11 @@ ########################################## # Defined by upsteam # -%define main_ver 2.3.0 -%define strtag 090305 +%define main_ver 2.4.0 +%define strtag svn2708_trunk %define repoid 38008 # Define this if this is pre-version -%define pre_release 0 +%define pre_release 1 ########################################## ########################################## @@ -138,6 +138,9 @@ %{icondir}/%{name}.png %changelog +* Sun Mar 8 2009 Mamoru Tasaka +- Update to latest trunk + * Thu Mar 5 2009 Mamoru Tasaka - 2.3.0-1 - 2.3.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-10/sources,v retrieving revision 1.351 retrieving revision 1.352 diff -u -r1.351 -r1.352 --- sources 4 Mar 2009 16:30:14 -0000 1.351 +++ sources 7 Mar 2009 18:00:53 -0000 1.352 @@ -1 +1 @@ -db7ac7fb010d8bd95d2842c400b2659a jd-2.3.0-090305.tgz +84cbd3183336f0fccc0042255d506cf0 jd-2.4.0-svn2708_trunk.tgz From mtasaka at fedoraproject.org Sat Mar 7 18:01:24 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sat, 7 Mar 2009 18:01:24 +0000 (UTC) Subject: rpms/jd/F-9 .cvsignore, 1.350, 1.351 jd.spec, 1.398, 1.399 sources, 1.351, 1.352 Message-ID: <20090307180124.9B66B70116@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7800/F-9 Modified Files: .cvsignore jd.spec sources Log Message: rev 2708 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.350 retrieving revision 1.351 diff -u -r1.350 -r1.351 --- .cvsignore 4 Mar 2009 16:30:15 -0000 1.350 +++ .cvsignore 7 Mar 2009 18:00:54 -0000 1.351 @@ -1 +1 @@ -jd-2.3.0-090305.tgz +jd-2.4.0-svn2708_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.398 retrieving revision 1.399 diff -u -r1.398 -r1.399 --- jd.spec 4 Mar 2009 16:30:15 -0000 1.398 +++ jd.spec 7 Mar 2009 18:00:54 -0000 1.399 @@ -9,11 +9,11 @@ ########################################## # Defined by upsteam # -%define main_ver 2.3.0 -%define strtag 090305 +%define main_ver 2.4.0 +%define strtag svn2708_trunk %define repoid 38008 # Define this if this is pre-version -%define pre_release 0 +%define pre_release 1 ########################################## ########################################## @@ -138,6 +138,9 @@ %{icondir}/%{name}.png %changelog +* Sun Mar 8 2009 Mamoru Tasaka +- Update to latest trunk + * Thu Mar 5 2009 Mamoru Tasaka - 2.3.0-1 - 2.3.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.351 retrieving revision 1.352 diff -u -r1.351 -r1.352 --- sources 4 Mar 2009 16:30:15 -0000 1.351 +++ sources 7 Mar 2009 18:00:54 -0000 1.352 @@ -1 +1 @@ -db7ac7fb010d8bd95d2842c400b2659a jd-2.3.0-090305.tgz +84cbd3183336f0fccc0042255d506cf0 jd-2.4.0-svn2708_trunk.tgz From mtasaka at fedoraproject.org Sat Mar 7 18:01:24 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sat, 7 Mar 2009 18:01:24 +0000 (UTC) Subject: rpms/jd/devel .cvsignore, 1.342, 1.343 jd.spec, 1.402, 1.403 sources, 1.343, 1.344 Message-ID: <20090307180124.E6F9270116@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7800/devel Modified Files: .cvsignore jd.spec sources Log Message: rev 2708 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.342 retrieving revision 1.343 diff -u -r1.342 -r1.343 --- .cvsignore 4 Mar 2009 16:30:15 -0000 1.342 +++ .cvsignore 7 Mar 2009 18:00:54 -0000 1.343 @@ -1 +1 @@ -jd-2.3.0-090305.tgz +jd-2.4.0-svn2708_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.402 retrieving revision 1.403 diff -u -r1.402 -r1.403 --- jd.spec 4 Mar 2009 16:30:15 -0000 1.402 +++ jd.spec 7 Mar 2009 18:00:54 -0000 1.403 @@ -9,11 +9,11 @@ ########################################## # Defined by upsteam # -%define main_ver 2.3.0 -%define strtag 090305 +%define main_ver 2.4.0 +%define strtag svn2708_trunk %define repoid 38008 # Define this if this is pre-version -%define pre_release 0 +%define pre_release 1 ########################################## ########################################## @@ -138,6 +138,9 @@ %{icondir}/%{name}.png %changelog +* Sun Mar 8 2009 Mamoru Tasaka +- Update to latest trunk + * Thu Mar 5 2009 Mamoru Tasaka - 2.3.0-1 - 2.3.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.343 retrieving revision 1.344 diff -u -r1.343 -r1.344 --- sources 4 Mar 2009 16:30:15 -0000 1.343 +++ sources 7 Mar 2009 18:00:54 -0000 1.344 @@ -1 +1 @@ -db7ac7fb010d8bd95d2842c400b2659a jd-2.3.0-090305.tgz +84cbd3183336f0fccc0042255d506cf0 jd-2.4.0-svn2708_trunk.tgz From dwalsh at fedoraproject.org Sat Mar 7 18:03:10 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Sat, 7 Mar 2009 18:03:10 +0000 (UTC) Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.84, 1.85 policycoreutils.spec, 1.595, 1.596 Message-ID: <20090307180310.4986D70116@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8713 Modified Files: policycoreutils-gui.patch policycoreutils.spec Log Message: * Sat Mar 7 2009 Dan Walsh 2.0.62-4 - Update polgengui templates to match current upstream policy policycoreutils-gui.patch: Index: policycoreutils-gui.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- policycoreutils-gui.patch 16 Feb 2009 14:21:37 -0000 1.84 +++ policycoreutils-gui.patch 7 Mar 2009 18:03:08 -0000 1.85 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.61/gui/booleansPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.62/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/booleansPage.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/booleansPage.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,247 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -249,9 +249,9 @@ + self.load(self.filter) + return True + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.61/gui/domainsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.62/gui/domainsPage.py --- nsapolicycoreutils/gui/domainsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/domainsPage.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/domainsPage.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,154 @@ +## domainsPage.py - show selinux domains +## Copyright (C) 2009 Red Hat, Inc. @@ -407,9 +407,9 @@ + + except ValueError, e: + self.error(e.args[0]) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.61/gui/fcontextPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.62/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/fcontextPage.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/fcontextPage.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,223 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -634,9 +634,9 @@ + self.store.set_value(iter, SPEC_COL, fspec) + self.store.set_value(iter, FTYPE_COL, ftype) + self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls)) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.61/gui/html_util.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.62/gui/html_util.py --- nsapolicycoreutils/gui/html_util.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/html_util.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/html_util.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,164 @@ +# Authors: John Dennis +# @@ -802,9 +802,9 @@ + doc += tail + return doc + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.61/gui/lockdown.glade +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.62/gui/lockdown.glade --- nsapolicycoreutils/gui/lockdown.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/lockdown.glade 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/lockdown.glade 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,771 @@ + + @@ -1577,9 +1577,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.61/gui/lockdown.gladep +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.62/gui/lockdown.gladep --- nsapolicycoreutils/gui/lockdown.gladep 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/lockdown.gladep 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/lockdown.gladep 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,7 @@ + + @@ -1588,9 +1588,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.61/gui/lockdown.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.62/gui/lockdown.py --- nsapolicycoreutils/gui/lockdown.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/lockdown.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/lockdown.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,382 @@ +#!/usr/bin/python +# @@ -1974,9 +1974,9 @@ + + app = booleanWindow() + app.stand_alone() -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.61/gui/loginsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.62/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/loginsPage.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/loginsPage.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,185 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -2163,9 +2163,9 @@ + self.store.set_value(iter, 1, seuser) + self.store.set_value(iter, 2, seobject.translate(serange)) + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.61/gui/Makefile +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.62/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/Makefile 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/Makefile 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,38 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -2205,9 +2205,9 @@ +indent: + +relabel: -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.61/gui/mappingsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.62/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/mappingsPage.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/mappingsPage.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,56 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -2265,9 +2265,9 @@ + for k in keys: + print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.61/gui/modulesPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.62/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/modulesPage.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/modulesPage.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,190 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006-2009 Red Hat, Inc. @@ -2459,9 +2459,9 @@ + + except ValueError, e: + self.error(e.args[0]) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.61/gui/polgen.glade +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.62/gui/polgen.glade --- nsapolicycoreutils/gui/polgen.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/polgen.glade 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/polgen.glade 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,3305 @@ + + @@ -5768,9 +5768,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.61/gui/polgen.gladep +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.62/gui/polgen.gladep --- nsapolicycoreutils/gui/polgen.gladep 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/polgen.gladep 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/polgen.gladep 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,7 @@ + + @@ -5779,9 +5779,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.61/gui/polgengui.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.62/gui/polgengui.py --- nsapolicycoreutils/gui/polgengui.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/polgengui.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/polgengui.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,626 @@ +#!/usr/bin/python -E +# @@ -6409,9 +6409,9 @@ + + app = childWindow() + app.stand_alone() -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.61/gui/polgen.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.62/gui/polgen.py --- nsapolicycoreutils/gui/polgen.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/polgen.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/polgen.py 2009-03-07 12:58:37.000000000 -0500 @@ -0,0 +1,954 @@ +#!/usr/bin/python +# @@ -6543,7 +6543,7 @@ +UNRESERVED = 2 +PORTS = 3 +ADMIN_TRANSITION_INTERFACE = "_admin$" -+USER_TRANSITION_INTERFACE = "_per_role_template$" ++USER_TRANSITION_INTERFACE = "_role$" + +DAEMON = 0 +DBUS = 1 @@ -6920,7 +6920,7 @@ + if self.type == USER: + for u in self.transition_users: + temp = re.sub("TEMPLATETYPE", self.name, executable.te_userapp_trans_rules) -+ newte += re.sub("USER", u, temp) ++ newte += re.sub("USER", u.split("_u")[0], temp) + + return newte + @@ -6934,7 +6934,7 @@ + newte += re.sub("APPLICATION", app, tmp) + + for u in self.transition_users: -+ role = u[:-2] ++ role = u.split("_u")[0] + if (role + "_r") in self.all_roles: + tmp = re.sub("TEMPLATETYPE", self.name, user.te_admin_trans_rules) + newte += re.sub("USER", role, tmp) @@ -7295,7 +7295,7 @@ + mypolicy.set_use_pam(True) + mypolicy.add_file("/var/lib/myuser/myuser.sock") + mypolicy.set_out_tcp(0,"8000") -+ mypolicy.set_transition_users(["unconfined", "staff"]) ++ mypolicy.set_transition_users(["unconfined_u", "staff_u"]) + print mypolicy.generate("/var/tmp") + + @@ -7367,9 +7367,9 @@ + sys.exit(0) + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.61/gui/portsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.62/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/portsPage.py 2009-01-21 17:12:32.000000000 -0500 ++++ policycoreutils-2.0.62/gui/portsPage.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,259 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -7630,9 +7630,9 @@ + + return True + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.61/gui/selinux.tbl +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.62/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/selinux.tbl 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/selinux.tbl 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,234 @@ +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /") @@ -7868,9 +7868,9 @@ +webadm_manage_user_files _("HTTPD Service") _("Allow SELinux webadm user to manage unprivileged users home directories") +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivileged users home directories") + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.61/gui/semanagePage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.62/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/semanagePage.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/semanagePage.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,168 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -8040,9 +8040,9 @@ + self.load(self.filter) + return True + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.61/gui/statusPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.62/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/statusPage.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/statusPage.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,190 @@ +# statusPage.py - show selinux status +## Copyright (C) 2006-2009 Red Hat, Inc. @@ -8234,9 +8234,9 @@ + return self.types[self.selinuxTypeOptionMenu.get_active()] + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.61/gui/system-config-selinux.glade +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.62/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/system-config-selinux.glade 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/system-config-selinux.glade 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,3403 @@ + + @@ -11641,9 +11641,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.61/gui/system-config-selinux.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.62/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/system-config-selinux.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/system-config-selinux.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,189 @@ +#!/usr/bin/python +# @@ -11834,9 +11834,9 @@ + + app = childWindow() + app.stand_alone() -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.61/gui/templates/boolean.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.62/gui/templates/boolean.py --- nsapolicycoreutils/gui/templates/boolean.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/templates/boolean.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/templates/boolean.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,40 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -11878,9 +11878,9 @@ +') +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.61/gui/templates/etc_rw.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.62/gui/templates/etc_rw.py --- nsapolicycoreutils/gui/templates/etc_rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/templates/etc_rw.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/templates/etc_rw.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12011,10 +12011,10 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_etc_rw_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.61/gui/templates/executable.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.62/gui/templates/executable.py --- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/templates/executable.py 2009-02-09 13:43:32.000000000 -0500 -@@ -0,0 +1,352 @@ ++++ policycoreutils-2.0.62/gui/templates/executable.py 2009-03-07 12:58:20.000000000 -0500 +@@ -0,0 +1,368 @@ +# Copyright (C) 2007-2009 Red Hat +# see file 'COPYING' for use and warranty information +# @@ -12131,9 +12131,6 @@ + +files_read_etc_files(TEMPLATETYPE_t) + -+libs_use_ld_so(TEMPLATETYPE_t) -+libs_use_shared_libs(TEMPLATETYPE_t) -+ +miscfiles_read_localization(TEMPLATETYPE_t) + +""" @@ -12197,12 +12194,10 @@ +optional_policy(` + gen_require(` + type USER_t; -+ type USER_devpts_t; -+ type USER_tty_device_t; + role USER_r; + ') + -+ TEMPLATETYPE_run(USER_t, USER_r, { USER_tty_device_t USER_devpts_t }) ++ TEMPLATETYPE_run(USER_t, USER_r) +') +""" + @@ -12247,11 +12242,6 @@ +## The role to be allowed the TEMPLATETYPE domain. +## +## -+## -+## -+## The type of the role's terminal. -+## -+## +# +interface(`TEMPLATETYPE_run',` + gen_require(` @@ -12260,9 +12250,35 @@ + + TEMPLATETYPE_domtrans($1) + role $2 types TEMPLATETYPE_t; -+ dontaudit TEMPLATETYPE_t $3:chr_file rw_term_perms; +') + ++######################################## ++## ++## Role access for TEMPLATETYPE ++## ++## ++## ++## Role allowed access ++## ++## ++## ++## ++## User domain for the role ++## ++## ++# ++interface(`TEMPLATETYPE_role',` ++ gen_require(` ++ type TEMPLATETYPE_t; ++ ') ++ ++ role $2 types TEMPLATETYPE_t; ++ ++ TEMPLATETYPE_domtrans($1) ++ ++ ps_process_pattern($2, TEMPLATETYPE_t) ++ allow $2 TEMPLATETYPE_t:process signal; ++') +""" + +if_initscript_rules=""" @@ -12276,7 +12292,7 @@ +##     +## +# -+interface(`TEMPLATETYPE_script_domtrans',` ++interface(`TEMPLATETYPE_initrc_domtrans',` + gen_require(` + type TEMPLATETYPE_initrc_exec_t; + ') @@ -12347,7 +12363,7 @@ + ') + + # Allow TEMPLATETYPE_t to restart the apache service -+ TEMPLATETYPE_script_domtrans($1) ++ TEMPLATETYPE_initrc_domtrans($1) + domain_system_change_exemption($1) + role_transition $2 TEMPLATETYPE_initrc_exec_t system_r; + allow $2 system_r; @@ -12367,9 +12383,9 @@ +EXECUTABLE -- gen_context(system_u:object_r:TEMPLATETYPE_initrc_exec_t,s0) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.61/gui/templates/__init__.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.62/gui/templates/__init__.py --- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/templates/__init__.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/templates/__init__.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,18 @@ +# +# Copyright (C) 2007 Red Hat, Inc. @@ -12389,9 +12405,9 @@ +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.61/gui/templates/network.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.62/gui/templates/network.py --- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/templates/network.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/templates/network.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,80 @@ +te_port_types=""" +type TEMPLATETYPE_port_t; @@ -12473,9 +12489,9 @@ +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.61/gui/templates/rw.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.62/gui/templates/rw.py --- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/templates/rw.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/templates/rw.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,128 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12605,9 +12621,9 @@ +fc_dir=""" +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.61/gui/templates/script.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.62/gui/templates/script.py --- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/templates/script.py 2009-02-16 09:19:35.000000000 -0500 ++++ policycoreutils-2.0.62/gui/templates/script.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,99 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12708,9 +12724,9 @@ +# Adding roles to SELinux user USER +/usr/sbin/semanage user -m -R +TEMPLATETYPE_r USER +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.61/gui/templates/semodule.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.62/gui/templates/semodule.py --- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/templates/semodule.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/templates/semodule.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,41 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12753,9 +12769,9 @@ +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.61/gui/templates/tmp.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.62/gui/templates/tmp.py --- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/templates/tmp.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/templates/tmp.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,97 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12854,9 +12870,9 @@ + TEMPLATETYPE_manage_tmp($1) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.61/gui/templates/user.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.62/gui/templates/user.py --- nsapolicycoreutils/gui/templates/user.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/templates/user.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/templates/user.py 2009-03-07 12:58:11.000000000 -0500 @@ -0,0 +1,182 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12985,7 +13001,7 @@ + +te_transition_rules=""" +optional_policy(` -+ APPLICATION_per_role_template(TEMPLATETYPE,TEMPLATETYPE_t,TEMPLATETYPE_r) ++ APPLICATION_role(TEMPLATETYPE_r,TEMPLATETYPE_t) +') +""" + @@ -13040,9 +13056,9 @@ +te_newrole_rules=""" +seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t }) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.61/gui/templates/var_lib.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.62/gui/templates/var_lib.py --- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/templates/var_lib.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/templates/var_lib.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,158 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -13202,9 +13218,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.61/gui/templates/var_log.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.62/gui/templates/var_log.py --- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/templates/var_log.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/templates/var_log.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,110 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -13316,9 +13332,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.61/gui/templates/var_run.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.62/gui/templates/var_run.py --- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/templates/var_run.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/templates/var_run.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,118 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -13438,9 +13454,9 @@ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.61/gui/templates/var_spool.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.62/gui/templates/var_spool.py --- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/templates/var_spool.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/templates/var_spool.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -13571,9 +13587,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.61/gui/translationsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.62/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/translationsPage.py 2009-01-20 09:49:03.000000000 -0500 ++++ policycoreutils-2.0.62/gui/translationsPage.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,118 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -13693,9 +13709,9 @@ + store, iter = self.view.get_selection().get_selected() + self.store.set_value(iter, 0, level) + self.store.set_value(iter, 1, translation) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.61/gui/usersPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.62/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.61/gui/usersPage.py 2009-01-21 17:12:14.000000000 -0500 ++++ policycoreutils-2.0.62/gui/usersPage.py 2009-02-18 16:52:27.000000000 -0500 @@ -0,0 +1,150 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006,2007,2008 Red Hat, Inc. Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.595 retrieving revision 1.596 diff -u -r1.595 -r1.596 --- policycoreutils.spec 27 Feb 2009 01:28:51 -0000 1.595 +++ policycoreutils.spec 7 Mar 2009 18:03:09 -0000 1.596 @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.62 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -221,6 +221,9 @@ fi %changelog +* Sat Mar 7 2009 Dan Walsh 2.0.62-4 +- Update polgengui templates to match current upstream policy + * Thu Feb 26 2009 Fedora Release Engineering - 2.0.62-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From oget at fedoraproject.org Sat Mar 7 18:04:35 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Sat, 7 Mar 2009 18:04:35 +0000 (UTC) Subject: rpms/auto-buildrequires/devel auto-buildrequires.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307180435.0248470116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/auto-buildrequires/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9075/devel Modified Files: .cvsignore sources Added Files: auto-buildrequires.spec import.log Log Message: * Fri Mar 6 2009 Orcan Ogetbil - 0.9-2 - Prepared the SPEC file for Review Request submission * Fri Mar 6 2009 Richard Jones - 0.9-1 - Imported to git and rebuilt. * Thu Nov 6 2008 Richard Jones - 0.1-2 - Initial build. --- NEW FILE auto-buildrequires.spec --- Summary: Work out BuildRequires for rpmbuild automatically Name: auto-buildrequires Version: 0.9 Release: 2%{?dist} License: GPLv2+ Group: Development/Tools URL: http://et.redhat.com/~rjones/auto-buildrequires/ Source0: http://et.redhat.com/~rjones/auto-buildrequires/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: rpm-build %description Auto-BuildRequires is a simple set of scripts for automatically suggesting BuildRequires lines for programs. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING README %{_bindir}/auto-br %{_bindir}/auto-br-rpmbuild %{_libexecdir}/auto-br-analyze.pl %{_libexecdir}/%{name}-preload.so %changelog * Fri Mar 6 2009 Orcan Ogetbil - 0.9-2 - Prepared the SPEC file for Review Request submission * Fri Mar 6 2009 Richard Jones - 0.9-1 - Imported to git and rebuilt. * Thu Nov 6 2008 Richard Jones - 0.1-2 - Initial build. --- NEW FILE import.log --- auto-buildrequires-0_9-2_fc10:HEAD:auto-buildrequires-0.9-2.fc10.src.rpm:1236449004 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/auto-buildrequires/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:13:12 -0000 1.1 +++ .cvsignore 7 Mar 2009 18:04:04 -0000 1.2 @@ -0,0 +1 @@ +auto-buildrequires-0.9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/auto-buildrequires/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:13:12 -0000 1.1 +++ sources 7 Mar 2009 18:04:04 -0000 1.2 @@ -0,0 +1 @@ +7e6bb91919165439bf347f7c23c4cad4 auto-buildrequires-0.9.tar.gz From oget at fedoraproject.org Sat Mar 7 18:09:58 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Sat, 7 Mar 2009 18:09:58 +0000 (UTC) Subject: rpms/auto-buildrequires/F-10 auto-buildrequires.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307180958.CC3CA70116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/auto-buildrequires/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10614/F-10 Modified Files: .cvsignore sources Added Files: auto-buildrequires.spec import.log Log Message: * Fri Mar 6 2009 Orcan Ogetbil - 0.9-2 - Prepared the SPEC file for Review Request submission * Fri Mar 6 2009 Richard Jones - 0.9-1 - Imported to git and rebuilt. * Thu Nov 6 2008 Richard Jones - 0.1-2 - Initial build. --- NEW FILE auto-buildrequires.spec --- Summary: Work out BuildRequires for rpmbuild automatically Name: auto-buildrequires Version: 0.9 Release: 2%{?dist} License: GPLv2+ Group: Development/Tools URL: http://et.redhat.com/~rjones/auto-buildrequires/ Source0: http://et.redhat.com/~rjones/auto-buildrequires/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: rpm-build %description Auto-BuildRequires is a simple set of scripts for automatically suggesting BuildRequires lines for programs. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING README %{_bindir}/auto-br %{_bindir}/auto-br-rpmbuild %{_libexecdir}/auto-br-analyze.pl %{_libexecdir}/%{name}-preload.so %changelog * Fri Mar 6 2009 Orcan Ogetbil - 0.9-2 - Prepared the SPEC file for Review Request submission * Fri Mar 6 2009 Richard Jones - 0.9-1 - Imported to git and rebuilt. * Thu Nov 6 2008 Richard Jones - 0.1-2 - Initial build. --- NEW FILE import.log --- auto-buildrequires-0_9-2_fc10:F-10:auto-buildrequires-0.9-2.fc10.src.rpm:1236449338 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/auto-buildrequires/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:13:12 -0000 1.1 +++ .cvsignore 7 Mar 2009 18:09:28 -0000 1.2 @@ -0,0 +1 @@ +auto-buildrequires-0.9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/auto-buildrequires/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:13:12 -0000 1.1 +++ sources 7 Mar 2009 18:09:28 -0000 1.2 @@ -0,0 +1 @@ +7e6bb91919165439bf347f7c23c4cad4 auto-buildrequires-0.9.tar.gz From oget at fedoraproject.org Sat Mar 7 18:11:32 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Sat, 7 Mar 2009 18:11:32 +0000 (UTC) Subject: rpms/auto-buildrequires/F-9 auto-buildrequires.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307181132.DDA2870116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/auto-buildrequires/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11051/F-9 Modified Files: .cvsignore sources Added Files: auto-buildrequires.spec import.log Log Message: * Fri Mar 6 2009 Orcan Ogetbil - 0.9-2 - Prepared the SPEC file for Review Request submission * Fri Mar 6 2009 Richard Jones - 0.9-1 - Imported to git and rebuilt. * Thu Nov 6 2008 Richard Jones - 0.1-2 - Initial build. --- NEW FILE auto-buildrequires.spec --- Summary: Work out BuildRequires for rpmbuild automatically Name: auto-buildrequires Version: 0.9 Release: 2%{?dist} License: GPLv2+ Group: Development/Tools URL: http://et.redhat.com/~rjones/auto-buildrequires/ Source0: http://et.redhat.com/~rjones/auto-buildrequires/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: rpm-build %description Auto-BuildRequires is a simple set of scripts for automatically suggesting BuildRequires lines for programs. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING README %{_bindir}/auto-br %{_bindir}/auto-br-rpmbuild %{_libexecdir}/auto-br-analyze.pl %{_libexecdir}/%{name}-preload.so %changelog * Fri Mar 6 2009 Orcan Ogetbil - 0.9-2 - Prepared the SPEC file for Review Request submission * Fri Mar 6 2009 Richard Jones - 0.9-1 - Imported to git and rebuilt. * Thu Nov 6 2008 Richard Jones - 0.1-2 - Initial build. --- NEW FILE import.log --- auto-buildrequires-0_9-2_fc10:F-9:auto-buildrequires-0.9-2.fc10.src.rpm:1236449427 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/auto-buildrequires/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:13:12 -0000 1.1 +++ .cvsignore 7 Mar 2009 18:11:02 -0000 1.2 @@ -0,0 +1 @@ +auto-buildrequires-0.9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/auto-buildrequires/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:13:12 -0000 1.1 +++ sources 7 Mar 2009 18:11:02 -0000 1.2 @@ -0,0 +1 @@ +7e6bb91919165439bf347f7c23c4cad4 auto-buildrequires-0.9.tar.gz From mjakubicek at fedoraproject.org Sat Mar 7 18:24:19 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Sat, 7 Mar 2009 18:24:19 +0000 (UTC) Subject: rpms/gsl/F-10 gsl.spec,1.45,1.46 Message-ID: <20090307182419.7D9A970116@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/gsl/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13604 Modified Files: gsl.spec Log Message: - Remove rpaths (fix BZ#487823). Index: gsl.spec =================================================================== RCS file: /cvs/pkgs/rpms/gsl/F-10/gsl.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- gsl.spec 16 Sep 2008 07:48:06 -0000 1.45 +++ gsl.spec 7 Mar 2009 18:23:49 -0000 1.46 @@ -1,7 +1,7 @@ Summary: The GNU Scientific Library for numerical analysis Name: gsl Version: 1.11 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.gnu.org/software/gsl/ Source: ftp://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz Patch0: gsl-1.10-lib64.patch @@ -46,6 +46,8 @@ %build %configure CFLAGS="$CFLAGS -fgnu89-inline" +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} %install @@ -98,6 +100,9 @@ %{_libdir}/*.a %changelog +* Sat Mar 07 2009 Milos Jakubicek - 1.11-5 +- Remove rpaths (fix BZ#487823). + * Tue Sep 16 2008 Ivana Varekova - 1.11-4 - Resolves: #462369 - remove %%{_datadir}/aclocal - add automake dependency From mbarnes at fedoraproject.org Sat Mar 7 19:24:16 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Sat, 7 Mar 2009 19:24:16 +0000 (UTC) Subject: rpms/evolution-data-server/devel evolution-data-server-2.25.92-unbreak-imap.patch, NONE, 1.1 evolution-data-server.spec, 1.254, 1.255 Message-ID: <20090307192416.5FF0370116@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution-data-server/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25181 Modified Files: evolution-data-server.spec Added Files: evolution-data-server-2.25.92-unbreak-imap.patch Log Message: * Sat Mar 07 2009 Matthew Barnes - 2.25.92-2.fc11 - Add patch to revert GNOME bug #573240 (IMAP message loading regressions). evolution-data-server-2.25.92-unbreak-imap.patch: --- NEW FILE evolution-data-server-2.25.92-unbreak-imap.patch --- diff -up evolution-data-server-2.25.92/camel/providers/imap/camel-imap-command.c.unbreak-imap evolution-data-server-2.25.92/camel/providers/imap/camel-imap-command.c --- evolution-data-server-2.25.92/camel/providers/imap/camel-imap-command.c.unbreak-imap 2009-02-26 12:18:38.000000000 -0500 +++ evolution-data-server-2.25.92/camel/providers/imap/camel-imap-command.c 2009-03-07 14:15:05.000000000 -0500 @@ -232,9 +232,8 @@ imap_command_start (CamelImapStore *stor else camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, g_strerror (errno)); - - if (g_str_has_prefix (cmd, "LOGIN")) - camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL); + + camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL); return FALSE; } @@ -276,14 +275,13 @@ camel_imap_command_continuation (CamelIm if (camel_stream_write (store->ostream, cmd, cmdlen) == -1 || camel_stream_write (store->ostream, "\r\n", 2) == -1) { - if (errno == EINTR) { + if (errno == EINTR) camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled")); - } else { + else camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, g_strerror (errno)); - camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL); - } + camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL); CAMEL_SERVICE_REC_UNLOCK (store, connect_lock); return NULL; } @@ -491,15 +489,13 @@ imap_read_untagged (CamelImapStore *stor do { if ((n = camel_stream_read (store->istream, str->str + nread + 1, length - nread)) == -1) { - if (errno == EINTR) { + if (errno == EINTR) camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled")); - } else { + else camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, g_strerror (errno)); - camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL); - } - + camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL); g_string_free (str, TRUE); goto lose; } diff -up evolution-data-server-2.25.92/camel/providers/imap/camel-imap-store.c.unbreak-imap evolution-data-server-2.25.92/camel/providers/imap/camel-imap-store.c --- evolution-data-server-2.25.92/camel/providers/imap/camel-imap-store.c.unbreak-imap 2009-02-26 12:18:38.000000000 -0500 +++ evolution-data-server-2.25.92/camel/providers/imap/camel-imap-store.c 2009-03-07 14:15:05.000000000 -0500 @@ -3033,16 +3033,14 @@ camel_imap_store_readline (CamelImapStor } if (nread <= 0) { - if (errno == EINTR) { + if (errno == EINTR) camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled")); - } else { + else camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, _("Server unexpectedly disconnected: %s"), g_strerror (errno)); - camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL); - } - + camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL); g_byte_array_free (ba, TRUE); return -1; } Index: evolution-data-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.254 retrieving revision 1.255 diff -u -r1.254 -r1.255 --- evolution-data-server.spec 2 Mar 2009 16:18:33 -0000 1.254 +++ evolution-data-server.spec 7 Mar 2009 19:23:45 -0000 1.255 @@ -31,7 +31,7 @@ Name: evolution-data-server Version: 2.25.92 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries Summary: Backend data server for Evolution License: LGPLv2+ @@ -53,6 +53,9 @@ # RH bug #243296 Patch12: evolution-data-server-1.11.5-fix-64bit-acinclude.patch +# Revert GNOME bug #573240 +Patch13: evolution-data-server-2.25.92-unbreak-imap.patch + ### Build Dependencies ### BuildRequires: GConf2-devel @@ -136,6 +139,7 @@ %patch10 -p1 -b .fix-ldap-query %patch11 -p1 -b .camel-folder-summary-crash %patch12 -p1 -b .fix-64bit-acinclude +%patch13 -p1 -b .unbreak-imap mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -381,6 +385,9 @@ %{_datadir}/gtk-doc/html/libedataserverui %changelog +* Sat Mar 07 2009 Matthew Barnes - 2.25.92-2.fc11 +- Add patch to revert GNOME bug #573240 (IMAP message loading regressions). + * Mon Mar 02 2009 Matthew Barnes - 2.25.92-1.fc11 - Update to 2.25.92 From rdieter at fedoraproject.org Sat Mar 7 19:45:58 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sat, 7 Mar 2009 19:45:58 +0000 (UTC) Subject: rpms/koffice/devel koffice-1.6.3-quint32.patch, NONE, 1.1 koffice.spec, 1.99, 1.100 Message-ID: <20090307194558.B5F0770116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/koffice/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29149 Modified Files: koffice.spec Added Files: koffice-1.6.3-quint32.patch Log Message: revert an upstream DWORD->quint32 commit (kdebug#168548) koffice-1.6.3-quint32.patch: --- NEW FILE koffice-1.6.3-quint32.patch --- diff -up koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc.quint32 koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc --- koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc.quint32 2009-03-06 15:55:16.000000000 -0600 +++ koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc 2009-03-07 13:42:40.000000000 -0600 @@ -242,7 +242,7 @@ KisImageBuilder_Result KisTIFFConverter: // Read image profile kdDebug() << "Reading profile" << endl; KisProfile* profile = 0; - quint32 EmbedLen; + DWORD EmbedLen; LPBYTE EmbedBuffer; if (TIFFGetField(image, TIFFTAG_ICCPROFILE, &EmbedLen, &EmbedBuffer)) { Index: koffice.spec =================================================================== RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- koffice.spec 6 Mar 2009 21:58:19 -0000 1.99 +++ koffice.spec 7 Mar 2009 19:45:28 -0000 1.100 @@ -31,6 +31,8 @@ # svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/koffice \ # > koffice-%{svn}svn.patch Patch100: koffice-%{svn}svn.patch +# Revert backport from https://bugs.kde.org/show_bug.cgi?id=168548 +Patch101: koffice-1.6.3-quint32.patch # http://www.kde.org/info/security/advisory-20070730-1.txt Patch1: ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff @@ -258,6 +260,7 @@ %patch50 -p1 -b glibc_strrchr %patch100 -p1 -b .svn +%patch101 -p1 -b .quint32 make -f admin/Makefile.common @@ -275,7 +278,7 @@ --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \ --disable-final -make %{?_smp_mflags} +make %{?_smp_mflags} -k %install From transif at fedoraproject.org Sat Mar 7 20:15:19 2009 From: transif at fedoraproject.org (Transifex System User) Date: Sat, 7 Mar 2009 20:15:19 +0000 (UTC) Subject: comps/po pt_BR.po,1.29,1.30 Message-ID: <20090307201519.9F18870116@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2383/po Modified Files: pt_BR.po Log Message: 2009-03-07 Igor Pires Soares (via igor at fedoraproject.org) * po/pt_BR.po: Updated Brazilian Portuguese translation Index: pt_BR.po =================================================================== RCS file: /cvs/pkgs/comps/po/pt_BR.po,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- pt_BR.po 24 Feb 2009 18:15:43 -0000 1.29 +++ pt_BR.po 7 Mar 2009 20:14:48 -0000 1.30 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: comps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-24 13:54+0000\n" -"PO-Revision-Date: 2009-02-24 15:10-0300\n" +"POT-Creation-Date: 2009-03-07 17:52+0000\n" +"PO-Revision-Date: 2009-03-07 17:11-0300\n" "Last-Translator: Igor Pires Soares \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" @@ -884,7 +884,7 @@ #: ../comps-f8.xml.in.h:107 #: ../comps-f9.xml.in.h:111 #: ../comps-f10.xml.in.h:119 -#: ../comps-f11.xml.in.h:127 +#: ../comps-f11.xml.in.h:128 msgid "MySQL Database" msgstr "Banco de dados MySQL" @@ -892,7 +892,7 @@ #: ../comps-f8.xml.in.h:109 #: ../comps-f9.xml.in.h:113 #: ../comps-f10.xml.in.h:122 -#: ../comps-f11.xml.in.h:130 +#: ../comps-f11.xml.in.h:131 #: ../comps-el4.xml.in.h:37 #: ../comps-el5.xml.in.h:37 msgid "Network Servers" @@ -902,7 +902,7 @@ #: ../comps-f8.xml.in.h:110 #: ../comps-f9.xml.in.h:114 #: ../comps-f10.xml.in.h:123 -#: ../comps-f11.xml.in.h:131 +#: ../comps-f11.xml.in.h:132 #: ../comps-el4.xml.in.h:38 #: ../comps-el5.xml.in.h:38 msgid "News Server" @@ -912,7 +912,7 @@ #: ../comps-f8.xml.in.h:111 #: ../comps-f9.xml.in.h:116 #: ../comps-f10.xml.in.h:125 -#: ../comps-f11.xml.in.h:133 +#: ../comps-f11.xml.in.h:134 msgid "Northern Sotho Support" msgstr "Suporte ?? Sotho do Norte" @@ -920,7 +920,7 @@ #: ../comps-f8.xml.in.h:112 #: ../comps-f9.xml.in.h:117 #: ../comps-f10.xml.in.h:126 -#: ../comps-f11.xml.in.h:134 +#: ../comps-f11.xml.in.h:135 msgid "Norwegian Support" msgstr "Suporte ?? Noruegu??s" @@ -928,7 +928,7 @@ #: ../comps-f8.xml.in.h:113 #: ../comps-f9.xml.in.h:118 #: ../comps-f10.xml.in.h:127 -#: ../comps-f11.xml.in.h:136 +#: ../comps-f11.xml.in.h:138 #: ../comps-el4.xml.in.h:39 #: ../comps-el5.xml.in.h:39 msgid "Office/Productivity" @@ -938,7 +938,7 @@ #: ../comps-f8.xml.in.h:115 #: ../comps-f9.xml.in.h:120 #: ../comps-f10.xml.in.h:129 -#: ../comps-f11.xml.in.h:139 +#: ../comps-f11.xml.in.h:141 msgid "Oriya Support" msgstr "Suporte ?? Oriya" @@ -946,7 +946,7 @@ #: ../comps-f8.xml.in.h:116 #: ../comps-f9.xml.in.h:121 #: ../comps-f10.xml.in.h:130 -#: ../comps-f11.xml.in.h:140 +#: ../comps-f11.xml.in.h:142 #: ../comps-el4.xml.in.h:40 #: ../comps-el5.xml.in.h:40 msgid "Packages which provide functionality for developing and building applications." @@ -956,7 +956,7 @@ #: ../comps-f8.xml.in.h:117 #: ../comps-f9.xml.in.h:122 #: ../comps-f10.xml.in.h:131 -#: ../comps-f11.xml.in.h:141 +#: ../comps-f11.xml.in.h:143 msgid "Persian Support" msgstr "Suporte ?? Persa" @@ -964,7 +964,7 @@ #: ../comps-f8.xml.in.h:118 #: ../comps-f9.xml.in.h:123 #: ../comps-f10.xml.in.h:132 -#: ../comps-f11.xml.in.h:142 +#: ../comps-f11.xml.in.h:144 msgid "Polish Support" msgstr "Suporte ?? Polon??s" @@ -972,7 +972,7 @@ #: ../comps-f8.xml.in.h:119 #: ../comps-f9.xml.in.h:124 #: ../comps-f10.xml.in.h:133 -#: ../comps-f11.xml.in.h:143 +#: ../comps-f11.xml.in.h:145 msgid "Portuguese Support" msgstr "Suporte ?? Portugu??s" @@ -980,7 +980,7 @@ #: ../comps-f8.xml.in.h:120 #: ../comps-f9.xml.in.h:125 #: ../comps-f10.xml.in.h:134 -#: ../comps-f11.xml.in.h:144 +#: ../comps-f11.xml.in.h:146 msgid "PostgreSQL Database" msgstr "Banco de dados PostgreSQL" @@ -988,7 +988,7 @@ #: ../comps-f8.xml.in.h:121 #: ../comps-f9.xml.in.h:126 #: ../comps-f10.xml.in.h:135 -#: ../comps-f11.xml.in.h:145 +#: ../comps-f11.xml.in.h:147 msgid "Printing Support" msgstr "Suporte ?? impress??o" @@ -996,7 +996,7 @@ #: ../comps-f8.xml.in.h:122 #: ../comps-f9.xml.in.h:127 #: ../comps-f10.xml.in.h:136 -#: ../comps-f11.xml.in.h:146 +#: ../comps-f11.xml.in.h:148 msgid "Punjabi Support" msgstr "Suporte ?? Punjabi" @@ -1004,7 +1004,7 @@ #: ../comps-f8.xml.in.h:123 #: ../comps-f9.xml.in.h:128 #: ../comps-f10.xml.in.h:137 -#: ../comps-f11.xml.in.h:147 +#: ../comps-f11.xml.in.h:149 msgid "Romanian Support" msgstr "Suporte ?? Romeno" @@ -1012,7 +1012,7 @@ #: ../comps-f8.xml.in.h:124 #: ../comps-f9.xml.in.h:129 #: ../comps-f10.xml.in.h:138 -#: ../comps-f11.xml.in.h:148 +#: ../comps-f11.xml.in.h:150 msgid "Ruby" msgstr "Ruby" @@ -1020,7 +1020,7 @@ #: ../comps-f8.xml.in.h:125 #: ../comps-f9.xml.in.h:130 #: ../comps-f10.xml.in.h:139 -#: ../comps-f11.xml.in.h:149 +#: ../comps-f11.xml.in.h:151 msgid "Russian Support" msgstr "Suporte ?? Russo" @@ -1028,7 +1028,7 @@ #: ../comps-f8.xml.in.h:126 #: ../comps-f9.xml.in.h:133 #: ../comps-f10.xml.in.h:141 -#: ../comps-f11.xml.in.h:151 +#: ../comps-f11.xml.in.h:153 msgid "Samoan Support" msgstr "Suporte ?? Samoano" @@ -1036,7 +1036,7 @@ #: ../comps-f8.xml.in.h:127 #: ../comps-f9.xml.in.h:134 #: ../comps-f10.xml.in.h:142 -#: ../comps-f11.xml.in.h:152 +#: ../comps-f11.xml.in.h:154 msgid "Serbian Support" msgstr "Suporte ?? S??rvio" @@ -1044,7 +1044,7 @@ #: ../comps-f8.xml.in.h:128 #: ../comps-f9.xml.in.h:135 #: ../comps-f10.xml.in.h:143 -#: ../comps-f11.xml.in.h:153 +#: ../comps-f11.xml.in.h:155 msgid "Server Configuration Tools" msgstr "Ferramentas de configura????o de servidores" @@ -1052,7 +1052,7 @@ #: ../comps-f8.xml.in.h:129 #: ../comps-f9.xml.in.h:136 #: ../comps-f10.xml.in.h:144 -#: ../comps-f11.xml.in.h:154 +#: ../comps-f11.xml.in.h:156 #: ../comps-el4.xml.in.h:41 #: ../comps-el5.xml.in.h:41 msgid "Servers" @@ -1062,7 +1062,7 @@ #: ../comps-f8.xml.in.h:130 #: ../comps-f9.xml.in.h:137 #: ../comps-f10.xml.in.h:145 -#: ../comps-f11.xml.in.h:155 +#: ../comps-f11.xml.in.h:157 #: ../comps-el4.xml.in.h:42 #: ../comps-el5.xml.in.h:42 msgid "Simple window managers that aren't part of a larger desktop environment." @@ -1072,7 +1072,7 @@ #: ../comps-f8.xml.in.h:131 #: ../comps-f9.xml.in.h:138 #: ../comps-f10.xml.in.h:147 -#: ../comps-f11.xml.in.h:157 +#: ../comps-f11.xml.in.h:159 msgid "Sinhala Support" msgstr "Suporte ?? Sinhala" @@ -1080,7 +1080,7 @@ #: ../comps-f8.xml.in.h:132 #: ../comps-f9.xml.in.h:139 #: ../comps-f10.xml.in.h:148 -#: ../comps-f11.xml.in.h:158 +#: ../comps-f11.xml.in.h:160 msgid "Slovak Support" msgstr "Suporte ?? Eslovaco" @@ -1088,7 +1088,7 @@ #: ../comps-f8.xml.in.h:133 #: ../comps-f9.xml.in.h:140 #: ../comps-f10.xml.in.h:149 -#: ../comps-f11.xml.in.h:159 +#: ../comps-f11.xml.in.h:161 msgid "Slovenian Support" msgstr "Suporte ?? Esloveno" @@ -1096,7 +1096,7 @@ #: ../comps-f8.xml.in.h:134 #: ../comps-f9.xml.in.h:141 #: ../comps-f10.xml.in.h:150 -#: ../comps-f11.xml.in.h:160 +#: ../comps-f11.xml.in.h:162 msgid "Smallest possible installation" msgstr "Menor instala????o poss??vel" @@ -1104,7 +1104,7 @@ #: ../comps-f8.xml.in.h:135 #: ../comps-f9.xml.in.h:142 #: ../comps-f10.xml.in.h:151 -#: ../comps-f11.xml.in.h:161 +#: ../comps-f11.xml.in.h:163 #: ../comps-el4.xml.in.h:43 #: ../comps-el5.xml.in.h:43 msgid "Software used for running network servers" @@ -1114,7 +1114,7 @@ #: ../comps-f8.xml.in.h:136 #: ../comps-f9.xml.in.h:143 #: ../comps-f10.xml.in.h:152 -#: ../comps-f11.xml.in.h:162 +#: ../comps-f11.xml.in.h:164 msgid "Somali Support" msgstr "Suporte ?? Somali" @@ -1122,7 +1122,7 @@ #: ../comps-f8.xml.in.h:137 #: ../comps-f9.xml.in.h:144 #: ../comps-f10.xml.in.h:153 -#: ../comps-f11.xml.in.h:163 +#: ../comps-f11.xml.in.h:165 msgid "Sometimes called text editors, these are programs that allow you to create and edit text files. This includes Emacs and Vi." msgstr "Algumas vezes chamados de editores de texto, estes programas permitem criar e editar arquivos de texto. Isto inclui o Emacs e o Vi." @@ -1130,7 +1130,7 @@ #: ../comps-f8.xml.in.h:138 #: ../comps-f9.xml.in.h:145 #: ../comps-f10.xml.in.h:154 -#: ../comps-f11.xml.in.h:164 +#: ../comps-f11.xml.in.h:166 #: ../comps-el4.xml.in.h:45 #: ../comps-el5.xml.in.h:45 msgid "Sound and Video" @@ -1140,7 +1140,7 @@ #: ../comps-f8.xml.in.h:139 #: ../comps-f9.xml.in.h:146 #: ../comps-f10.xml.in.h:155 -#: ../comps-f11.xml.in.h:165 +#: ../comps-f11.xml.in.h:167 msgid "Southern Ndebele Support" msgstr "Suporte ?? Ndebele do Sul" @@ -1148,7 +1148,7 @@ #: ../comps-f8.xml.in.h:140 #: ../comps-f9.xml.in.h:147 #: ../comps-f10.xml.in.h:156 -#: ../comps-f11.xml.in.h:166 +#: ../comps-f11.xml.in.h:168 msgid "Southern Sotho Support" msgstr "Suporte ?? Sotho do Sul" @@ -1156,7 +1156,7 @@ #: ../comps-f8.xml.in.h:141 #: ../comps-f9.xml.in.h:148 #: ../comps-f10.xml.in.h:157 -#: ../comps-f11.xml.in.h:167 +#: ../comps-f11.xml.in.h:169 msgid "Spanish Support" msgstr "Suporte ?? Espanhol" @@ -1164,7 +1164,7 @@ #: ../comps-f8.xml.in.h:142 #: ../comps-f9.xml.in.h:149 #: ../comps-f10.xml.in.h:159 -#: ../comps-f11.xml.in.h:169 +#: ../comps-f11.xml.in.h:172 #: ../comps-el4.xml.in.h:46 msgid "Support for developing programs in the Java programming language." msgstr "Suporte ao desenvolvimento de programas na linguagem de programa????o Java." @@ -1173,7 +1173,7 @@ #: ../comps-f8.xml.in.h:143 #: ../comps-f9.xml.in.h:150 #: ../comps-f10.xml.in.h:160 -#: ../comps-f11.xml.in.h:170 +#: ../comps-f11.xml.in.h:174 #: ../comps-el4.xml.in.h:47 msgid "Support for running programs written in the Java programming language." msgstr "Suporte para a execu????o de programas escritos na linguagem de programa????o Java." @@ -1182,7 +1182,7 @@ #: ../comps-f8.xml.in.h:144 #: ../comps-f9.xml.in.h:151 #: ../comps-f10.xml.in.h:161 -#: ../comps-f11.xml.in.h:171 +#: ../comps-f11.xml.in.h:175 msgid "Swati Support" msgstr "Suporte ?? Swati" @@ -1190,7 +1190,7 @@ #: ../comps-f8.xml.in.h:145 #: ../comps-f9.xml.in.h:152 #: ../comps-f10.xml.in.h:162 -#: ../comps-f11.xml.in.h:172 +#: ../comps-f11.xml.in.h:176 msgid "Swedish Support" msgstr "Suporte ?? Sueco" @@ -1198,7 +1198,7 @@ #: ../comps-f8.xml.in.h:146 #: ../comps-f9.xml.in.h:153 #: ../comps-f10.xml.in.h:163 -#: ../comps-f11.xml.in.h:173 +#: ../comps-f11.xml.in.h:177 #: ../comps-el4.xml.in.h:48 #: ../comps-el5.xml.in.h:46 msgid "System Tools" @@ -1208,7 +1208,7 @@ #: ../comps-f8.xml.in.h:147 #: ../comps-f9.xml.in.h:154 #: ../comps-f10.xml.in.h:164 -#: ../comps-f11.xml.in.h:174 +#: ../comps-f11.xml.in.h:178 msgid "Tagalog Support" msgstr "Suporte ?? Tagalog" @@ -1216,7 +1216,7 @@ #: ../comps-f8.xml.in.h:148 #: ../comps-f9.xml.in.h:155 #: ../comps-f10.xml.in.h:166 -#: ../comps-f11.xml.in.h:176 +#: ../comps-f11.xml.in.h:180 msgid "Tamil Support" msgstr "Suporte ?? Tamil" @@ -1224,7 +1224,7 @@ #: ../comps-f8.xml.in.h:149 #: ../comps-f9.xml.in.h:156 #: ../comps-f10.xml.in.h:167 -#: ../comps-f11.xml.in.h:177 +#: ../comps-f11.xml.in.h:181 msgid "Telugu Support" msgstr "Suporte ?? Telugu" @@ -1232,7 +1232,7 @@ #: ../comps-f8.xml.in.h:150 #: ../comps-f9.xml.in.h:157 #: ../comps-f10.xml.in.h:168 -#: ../comps-f11.xml.in.h:178 +#: ../comps-f11.xml.in.h:182 #: ../comps-el4.xml.in.h:49 #: ../comps-el5.xml.in.h:47 msgid "Text-based Internet" @@ -1242,7 +1242,7 @@ #: ../comps-f8.xml.in.h:151 #: ../comps-f9.xml.in.h:158 #: ../comps-f10.xml.in.h:169 -#: ../comps-f11.xml.in.h:179 +#: ../comps-f11.xml.in.h:183 msgid "Thai Support" msgstr "Suporte ?? Tailand??s" @@ -1254,7 +1254,7 @@ #: ../comps-f8.xml.in.h:152 #: ../comps-f9.xml.in.h:159 #: ../comps-f10.xml.in.h:170 -#: ../comps-f11.xml.in.h:180 +#: ../comps-f11.xml.in.h:184 #: ../comps-el4.xml.in.h:51 #: ../comps-el5.xml.in.h:49 msgid "The applications include office suites, PDF viewers, and more." @@ -1264,7 +1264,7 @@ #: ../comps-f8.xml.in.h:153 #: ../comps-f9.xml.in.h:160 #: ../comps-f10.xml.in.h:171 -#: ../comps-f11.xml.in.h:181 +#: ../comps-f11.xml.in.h:185 msgid "The packages in this group are core libraries needed to develop applications." msgstr "Os pacotes deste grupo s??o bibliotecas de base necess??rias para desenvolver aplica????es." @@ -1272,7 +1272,7 @@ #: ../comps-f8.xml.in.h:154 #: ../comps-f9.xml.in.h:161 #: ../comps-f10.xml.in.h:172 -#: ../comps-f11.xml.in.h:182 +#: ../comps-f11.xml.in.h:186 #: ../comps-el4.xml.in.h:52 #: ../comps-el5.xml.in.h:50 msgid "These packages allow you to configure an IMAP or SMTP mail server." @@ -1282,7 +1282,7 @@ #: ../comps-f8.xml.in.h:155 #: ../comps-f9.xml.in.h:162 #: ../comps-f10.xml.in.h:173 -#: ../comps-f11.xml.in.h:183 +#: ../comps-f11.xml.in.h:187 msgid "These packages allow you to develop applications for the X Window System." msgstr "Estes pacotes permitem desenvolver aplica????es para o X Window System." @@ -1290,7 +1290,7 @@ #: ../comps-f8.xml.in.h:156 #: ../comps-f9.xml.in.h:163 #: ../comps-f10.xml.in.h:174 -#: ../comps-f11.xml.in.h:184 +#: ../comps-f11.xml.in.h:188 #: ../comps-el4.xml.in.h:53 #: ../comps-el5.xml.in.h:51 msgid "These packages are helpful when developing web applications or web pages." @@ -1300,7 +1300,7 @@ #: ../comps-f8.xml.in.h:157 #: ../comps-f9.xml.in.h:164 #: ../comps-f10.xml.in.h:175 -#: ../comps-f11.xml.in.h:185 +#: ../comps-f11.xml.in.h:189 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS." msgstr "Estes pacotes incluem servidores baseados em rede como o DHCP, Kerberos e NIS." @@ -1308,7 +1308,7 @@ #: ../comps-f8.xml.in.h:158 #: ../comps-f9.xml.in.h:165 #: ../comps-f10.xml.in.h:176 -#: ../comps-f11.xml.in.h:186 +#: ../comps-f11.xml.in.h:190 msgid "These packages include servers for old network protocols such as rsh and telnet." msgstr "Estes pacotes incluem servidores para protocolos de rede antigos como rsh e telnet." @@ -1316,7 +1316,7 @@ #: ../comps-f8.xml.in.h:159 #: ../comps-f9.xml.in.h:166 #: ../comps-f10.xml.in.h:177 -#: ../comps-f11.xml.in.h:187 +#: ../comps-f11.xml.in.h:191 msgid "These packages provide a virtualization environment." msgstr "Estes pacotes oferecem um ambiente de virtualiza????o." @@ -1324,7 +1324,7 @@ #: ../comps-f8.xml.in.h:160 #: ../comps-f9.xml.in.h:167 #: ../comps-f10.xml.in.h:178 -#: ../comps-f11.xml.in.h:188 +#: ../comps-f11.xml.in.h:192 msgid "These packages provide compatibility with previous releases." msgstr "Estes pacotes oferecem compatibilidade com as vers??es anteriores." @@ -1332,7 +1332,7 @@ #: ../comps-f8.xml.in.h:161 #: ../comps-f9.xml.in.h:168 #: ../comps-f10.xml.in.h:179 -#: ../comps-f11.xml.in.h:189 +#: ../comps-f11.xml.in.h:193 msgid "These packages provide support for various locales including fonts and input methods." msgstr "Estes pacotes oferecem suporte para v??rias localidades, incluindo fontes e m??todos de entrada." @@ -1340,7 +1340,7 @@ #: ../comps-f8.xml.in.h:162 #: ../comps-f9.xml.in.h:169 #: ../comps-f10.xml.in.h:180 -#: ../comps-f11.xml.in.h:190 +#: ../comps-f11.xml.in.h:194 msgid "These tools allow you to create documents in the DocBook format and convert them into HTML, PDF, Postscript, and text." msgstr "Estas ferramentas permitem criar documentos no formato DocBook e convert??-los para HTML, PDF, PostScript e texto." @@ -1348,7 +1348,7 @@ #: ../comps-f8.xml.in.h:163 #: ../comps-f9.xml.in.h:170 #: ../comps-f10.xml.in.h:181 -#: ../comps-f11.xml.in.h:191 +#: ../comps-f11.xml.in.h:195 #: ../comps-el4.xml.in.h:55 #: ../comps-el5.xml.in.h:53 msgid "These tools allow you to run a Web server on the system." @@ -1358,7 +1358,7 @@ #: ../comps-f8.xml.in.h:164 #: ../comps-f9.xml.in.h:171 #: ../comps-f10.xml.in.h:182 -#: ../comps-f11.xml.in.h:192 +#: ../comps-f11.xml.in.h:196 #: ../comps-el4.xml.in.h:56 #: ../comps-el5.xml.in.h:54 msgid "These tools allow you to run an FTP server on the system." @@ -1368,7 +1368,7 @@ #: ../comps-f8.xml.in.h:165 #: ../comps-f9.xml.in.h:172 #: ../comps-f10.xml.in.h:183 -#: ../comps-f11.xml.in.h:193 +#: ../comps-f11.xml.in.h:197 #: ../comps-el4.xml.in.h:57 #: ../comps-el5.xml.in.h:55 msgid "These tools include core development tools such as automake, gcc, perl, python, and debuggers." @@ -1378,7 +1378,7 @@ #: ../comps-f8.xml.in.h:166 #: ../comps-f9.xml.in.h:173 #: ../comps-f10.xml.in.h:184 -#: ../comps-f11.xml.in.h:194 +#: ../comps-f11.xml.in.h:198 #: ../comps-el4.xml.in.h:58 #: ../comps-el5.xml.in.h:56 msgid "This group allows you to configure the system as a news server." @@ -1388,7 +1388,7 @@ #: ../comps-f8.xml.in.h:167 #: ../comps-f9.xml.in.h:174 #: ../comps-f10.xml.in.h:185 -#: ../comps-f11.xml.in.h:195 +#: ../comps-f11.xml.in.h:199 msgid "This group contains all of Red Hat's custom server configuration tools." msgstr "Este grupo cont??m todas as ferramentas personalizadas de configura????o de servidores da Red Hat." @@ -1396,7 +1396,7 @@ #: ../comps-f8.xml.in.h:168 #: ../comps-f9.xml.in.h:175 #: ../comps-f10.xml.in.h:186 -#: ../comps-f11.xml.in.h:196 +#: ../comps-f11.xml.in.h:200 msgid "This group includes a minimal set of packages. Useful for creating small router/firewall boxes, for example." msgstr "Este grupo inclui um conjunto m??nimo de pacotes. ??til, por exemplo, para a cria????o de pequenas caixas de roteadores/firewalls." @@ -1404,7 +1404,7 @@ #: ../comps-f8.xml.in.h:169 #: ../comps-f9.xml.in.h:176 #: ../comps-f10.xml.in.h:187 -#: ../comps-f11.xml.in.h:197 +#: ../comps-f11.xml.in.h:201 #: ../comps-el4.xml.in.h:59 #: ../comps-el5.xml.in.h:57 msgid "This group includes graphical email, Web, and chat clients." @@ -1414,7 +1414,7 @@ #: ../comps-f8.xml.in.h:170 #: ../comps-f9.xml.in.h:177 #: ../comps-f10.xml.in.h:188 -#: ../comps-f11.xml.in.h:198 +#: ../comps-f11.xml.in.h:202 #: ../comps-el4.xml.in.h:60 #: ../comps-el5.xml.in.h:58 msgid "This group includes packages for performing mathematical and scientific computations and plotting, as well as unit conversion." @@ -1424,7 +1424,7 @@ #: ../comps-f8.xml.in.h:171 #: ../comps-f9.xml.in.h:178 #: ../comps-f10.xml.in.h:189 -#: ../comps-f11.xml.in.h:199 +#: ../comps-f11.xml.in.h:203 #: ../comps-el4.xml.in.h:61 #: ../comps-el5.xml.in.h:59 msgid "This group includes packages to help you manipulate and scan images." @@ -1434,7 +1434,7 @@ #: ../comps-f8.xml.in.h:172 #: ../comps-f9.xml.in.h:179 #: ../comps-f10.xml.in.h:190 -#: ../comps-f11.xml.in.h:200 +#: ../comps-f11.xml.in.h:204 #: ../comps-el4.xml.in.h:62 #: ../comps-el5.xml.in.h:60 msgid "This group includes text-based email, Web, and chat clients. These applications do not require the X Window System." @@ -1444,7 +1444,7 @@ #: ../comps-f8.xml.in.h:173 #: ../comps-f9.xml.in.h:180 #: ../comps-f10.xml.in.h:191 -#: ../comps-f11.xml.in.h:201 +#: ../comps-f11.xml.in.h:205 #: ../comps-el4.xml.in.h:63 #: ../comps-el5.xml.in.h:61 msgid "This group is a collection of graphical administration tools for the system, such as for managing user accounts and configuring system hardware." @@ -1454,7 +1454,7 @@ #: ../comps-f8.xml.in.h:174 #: ../comps-f9.xml.in.h:181 #: ../comps-f10.xml.in.h:192 -#: ../comps-f11.xml.in.h:202 +#: ../comps-f11.xml.in.h:206 #: ../comps-el4.xml.in.h:66 #: ../comps-el5.xml.in.h:64 msgid "This group is a collection of tools and resources of Armenian environments." @@ -1464,7 +1464,7 @@ #: ../comps-f8.xml.in.h:175 #: ../comps-f9.xml.in.h:182 #: ../comps-f10.xml.in.h:193 -#: ../comps-f11.xml.in.h:203 +#: ../comps-f11.xml.in.h:207 #: ../comps-el4.xml.in.h:69 #: ../comps-el5.xml.in.h:68 msgid "This group is a collection of tools for various hardware specific utilities." @@ -1474,7 +1474,7 @@ #: ../comps-f8.xml.in.h:176 #: ../comps-f9.xml.in.h:183 #: ../comps-f10.xml.in.h:194 -#: ../comps-f11.xml.in.h:205 +#: ../comps-f11.xml.in.h:209 #: ../comps-el4.xml.in.h:70 #: ../comps-el5.xml.in.h:69 msgid "This group is a collection of various tools for the system, such as the client for connecting to SMB shares and tools to monitor network traffic." @@ -1484,7 +1484,7 @@ #: ../comps-f8.xml.in.h:177 #: ../comps-f9.xml.in.h:184 #: ../comps-f10.xml.in.h:195 -#: ../comps-f11.xml.in.h:206 +#: ../comps-f11.xml.in.h:210 msgid "This package group allows you to run a DNS name server (BIND) on the system." msgstr "Este grupo de pacotes permite rodar um servidor de nomes DNS (BIND) no sistema." @@ -1492,7 +1492,7 @@ #: ../comps-f8.xml.in.h:178 #: ../comps-f9.xml.in.h:185 #: ../comps-f10.xml.in.h:196 -#: ../comps-f11.xml.in.h:207 +#: ../comps-f11.xml.in.h:211 msgid "This package group allows you to share files between Linux and MS Windows(tm) systems." msgstr "Este grupo de pacotes permite compartilhar arquivos entre os sistemas operacionais Linux e MS Windows(tm)." @@ -1500,7 +1500,7 @@ #: ../comps-f8.xml.in.h:179 #: ../comps-f9.xml.in.h:186 #: ../comps-f10.xml.in.h:197 -#: ../comps-f11.xml.in.h:208 +#: ../comps-f11.xml.in.h:212 msgid "This package group contains packages useful for use with MySQL." msgstr "Este grupo cont??m pacotes ??teis para usar com o MySQL." @@ -1508,7 +1508,7 @@ #: ../comps-f8.xml.in.h:180 #: ../comps-f9.xml.in.h:187 #: ../comps-f10.xml.in.h:198 -#: ../comps-f11.xml.in.h:209 +#: ../comps-f11.xml.in.h:213 msgid "This package group includes packages useful for use with Postgresql." msgstr "Este grupo inclui pacotes ??teis para usar com o Postgresql." @@ -1516,7 +1516,7 @@ #: ../comps-f8.xml.in.h:181 #: ../comps-f9.xml.in.h:188 #: ../comps-f10.xml.in.h:199 -#: ../comps-f11.xml.in.h:210 +#: ../comps-f11.xml.in.h:214 msgid "Tibetan Support" msgstr "Suporte ?? Tibetano" @@ -1524,7 +1524,7 @@ #: ../comps-f8.xml.in.h:182 #: ../comps-f9.xml.in.h:189 #: ../comps-f10.xml.in.h:200 -#: ../comps-f11.xml.in.h:211 +#: ../comps-f11.xml.in.h:215 msgid "Tonga Support" msgstr "Suporte ?? Tonga" @@ -1532,7 +1532,7 @@ #: ../comps-f8.xml.in.h:183 #: ../comps-f9.xml.in.h:190 #: ../comps-f10.xml.in.h:201 -#: ../comps-f11.xml.in.h:212 +#: ../comps-f11.xml.in.h:216 #: ../comps-el4.xml.in.h:71 #: ../comps-el5.xml.in.h:70 msgid "Tools and Utilities needed by a Fedora Packager" @@ -1542,7 +1542,7 @@ #: ../comps-f8.xml.in.h:184 #: ../comps-f9.xml.in.h:191 #: ../comps-f10.xml.in.h:202 -#: ../comps-f11.xml.in.h:213 +#: ../comps-f11.xml.in.h:217 msgid "Tsonga Support" msgstr "Suporte ?? Tsonga" @@ -1550,7 +1550,7 @@ #: ../comps-f8.xml.in.h:185 #: ../comps-f9.xml.in.h:192 #: ../comps-f10.xml.in.h:203 -#: ../comps-f11.xml.in.h:214 +#: ../comps-f11.xml.in.h:218 msgid "Tswana Support" msgstr "Suporte ?? Tswana" @@ -1558,7 +1558,7 @@ #: ../comps-f8.xml.in.h:186 #: ../comps-f9.xml.in.h:193 #: ../comps-f10.xml.in.h:204 -#: ../comps-f11.xml.in.h:215 +#: ../comps-f11.xml.in.h:219 msgid "Turkish Support" msgstr "Suporte ?? Turco" @@ -1566,7 +1566,7 @@ #: ../comps-f8.xml.in.h:187 #: ../comps-f9.xml.in.h:194 #: ../comps-f10.xml.in.h:205 -#: ../comps-f11.xml.in.h:217 +#: ../comps-f11.xml.in.h:221 msgid "Ukrainian Support" msgstr "Suporte ?? Ucraniano" @@ -1574,7 +1574,7 @@ #: ../comps-f8.xml.in.h:188 #: ../comps-f9.xml.in.h:195 #: ../comps-f10.xml.in.h:206 -#: ../comps-f11.xml.in.h:219 +#: ../comps-f11.xml.in.h:223 msgid "Urdu Support" msgstr "Suporte ?? Urdu" @@ -1582,7 +1582,7 @@ #: ../comps-f8.xml.in.h:189 #: ../comps-f9.xml.in.h:196 #: ../comps-f10.xml.in.h:208 -#: ../comps-f11.xml.in.h:221 +#: ../comps-f11.xml.in.h:225 #: ../comps-el4.xml.in.h:72 #: ../comps-el5.xml.in.h:71 msgid "Various core pieces of the system." @@ -1592,7 +1592,7 @@ #: ../comps-f8.xml.in.h:190 #: ../comps-f9.xml.in.h:197 #: ../comps-f10.xml.in.h:209 -#: ../comps-f11.xml.in.h:222 +#: ../comps-f11.xml.in.h:226 #: ../comps-el5.xml.in.h:72 msgid "Various ways to relax and spend your free time." msgstr "V??rias maneiras de relaxar e passar seu tempo livre." @@ -1601,7 +1601,7 @@ #: ../comps-f8.xml.in.h:191 #: ../comps-f9.xml.in.h:198 #: ../comps-f10.xml.in.h:210 -#: ../comps-f11.xml.in.h:223 +#: ../comps-f11.xml.in.h:227 msgid "Venda Support" msgstr "Suporte ?? Venda" @@ -1609,7 +1609,7 @@ #: ../comps-f8.xml.in.h:192 #: ../comps-f9.xml.in.h:199 #: ../comps-f10.xml.in.h:211 -#: ../comps-f11.xml.in.h:224 +#: ../comps-f11.xml.in.h:228 msgid "Vietnamese Support" msgstr "Suporte ?? Vietnamita" @@ -1617,7 +1617,7 @@ #: ../comps-f8.xml.in.h:193 #: ../comps-f9.xml.in.h:200 #: ../comps-f10.xml.in.h:212 -#: ../comps-f11.xml.in.h:225 +#: ../comps-f11.xml.in.h:229 msgid "Virtualization" msgstr "Virtualiza????o" @@ -1625,7 +1625,7 @@ #: ../comps-f8.xml.in.h:194 #: ../comps-f9.xml.in.h:202 #: ../comps-f10.xml.in.h:214 -#: ../comps-f11.xml.in.h:227 +#: ../comps-f11.xml.in.h:231 #: ../comps-el4.xml.in.h:73 #: ../comps-el5.xml.in.h:73 msgid "Web Development" @@ -1635,7 +1635,7 @@ #: ../comps-f8.xml.in.h:195 #: ../comps-f9.xml.in.h:203 #: ../comps-f10.xml.in.h:215 -#: ../comps-f11.xml.in.h:228 +#: ../comps-f11.xml.in.h:232 #: ../comps-el4.xml.in.h:74 #: ../comps-el5.xml.in.h:74 msgid "Web Server" @@ -1645,7 +1645,7 @@ #: ../comps-f8.xml.in.h:196 #: ../comps-f9.xml.in.h:204 #: ../comps-f10.xml.in.h:216 -#: ../comps-f11.xml.in.h:229 +#: ../comps-f11.xml.in.h:233 msgid "Welsh Support" msgstr "Suporte ?? Gal??s" @@ -1653,7 +1653,7 @@ #: ../comps-f8.xml.in.h:197 #: ../comps-f9.xml.in.h:205 #: ../comps-f10.xml.in.h:217 -#: ../comps-f11.xml.in.h:230 +#: ../comps-f11.xml.in.h:234 #: ../comps-el4.xml.in.h:75 #: ../comps-el5.xml.in.h:75 msgid "Window Managers" @@ -1663,7 +1663,7 @@ #: ../comps-f8.xml.in.h:198 #: ../comps-f9.xml.in.h:206 #: ../comps-f10.xml.in.h:218 -#: ../comps-f11.xml.in.h:231 +#: ../comps-f11.xml.in.h:235 msgid "Windows File Server" msgstr "Servidor de arquivos Windows" @@ -1671,7 +1671,7 @@ #: ../comps-f8.xml.in.h:199 #: ../comps-f9.xml.in.h:207 #: ../comps-f10.xml.in.h:219 -#: ../comps-f11.xml.in.h:232 +#: ../comps-f11.xml.in.h:236 msgid "X Software Development" msgstr "Desenvolvimento de software X" @@ -1679,7 +1679,7 @@ #: ../comps-f8.xml.in.h:200 #: ../comps-f9.xml.in.h:208 #: ../comps-f10.xml.in.h:220 -#: ../comps-f11.xml.in.h:233 +#: ../comps-f11.xml.in.h:237 #: ../comps-el4.xml.in.h:76 #: ../comps-el5.xml.in.h:76 msgid "X Window System" @@ -1689,7 +1689,7 @@ #: ../comps-f8.xml.in.h:201 #: ../comps-f9.xml.in.h:209 #: ../comps-f10.xml.in.h:221 -#: ../comps-f11.xml.in.h:234 +#: ../comps-f11.xml.in.h:238 msgid "XFCE" msgstr "XFCE" @@ -1697,7 +1697,7 @@ #: ../comps-f8.xml.in.h:202 #: ../comps-f9.xml.in.h:210 #: ../comps-f10.xml.in.h:222 -#: ../comps-f11.xml.in.h:235 +#: ../comps-f11.xml.in.h:239 msgid "XFCE Software Development" msgstr "Desenvolvimento de software XFCE" @@ -1705,7 +1705,7 @@ #: ../comps-f8.xml.in.h:203 #: ../comps-f9.xml.in.h:211 #: ../comps-f10.xml.in.h:223 -#: ../comps-f11.xml.in.h:236 +#: ../comps-f11.xml.in.h:240 msgid "Xhosa Support" msgstr "Suporte ?? Xhosa" @@ -1713,7 +1713,7 @@ #: ../comps-f8.xml.in.h:204 #: ../comps-f9.xml.in.h:212 #: ../comps-f10.xml.in.h:224 -#: ../comps-f11.xml.in.h:237 +#: ../comps-f11.xml.in.h:241 msgid "Zulu Support" msgstr "Suporte ?? Zulu" @@ -1769,21 +1769,21 @@ #: ../comps-f8.xml.in.h:106 #: ../comps-f9.xml.in.h:110 #: ../comps-f10.xml.in.h:118 -#: ../comps-f11.xml.in.h:126 +#: ../comps-f11.xml.in.h:127 msgid "Mongolian Support" msgstr "Suporte ?? Mongol" #: ../comps-f8.xml.in.h:108 #: ../comps-f9.xml.in.h:112 #: ../comps-f10.xml.in.h:121 -#: ../comps-f11.xml.in.h:129 +#: ../comps-f11.xml.in.h:130 msgid "Nepali Support" msgstr "Suporte ?? Nepal??s" #: ../comps-f8.xml.in.h:114 #: ../comps-f9.xml.in.h:119 #: ../comps-f10.xml.in.h:128 -#: ../comps-f11.xml.in.h:137 +#: ../comps-f11.xml.in.h:139 msgid "Older bitmap and vector fonts packages" msgstr "Pacotes de fontes vetoriais e bitmaps antigos" @@ -1813,13 +1813,13 @@ #: ../comps-f9.xml.in.h:115 #: ../comps-f10.xml.in.h:124 -#: ../comps-f11.xml.in.h:132 +#: ../comps-f11.xml.in.h:133 msgid "Northern Sami Support" msgstr "Suporte ?? Sami do Norte" #: ../comps-f9.xml.in.h:131 #: ../comps-f10.xml.in.h:140 -#: ../comps-f11.xml.in.h:150 +#: ../comps-f11.xml.in.h:152 msgid "SUGAR Desktop Environment" msgstr "Ambiente de trabalho SUGAR" @@ -1829,7 +1829,7 @@ #: ../comps-f9.xml.in.h:201 #: ../comps-f10.xml.in.h:213 -#: ../comps-f11.xml.in.h:226 +#: ../comps-f11.xml.in.h:230 msgid "Walloon Support" msgstr "Suporte ?? Walloon" @@ -1874,27 +1874,27 @@ msgstr "Suporte ?? Maithili" #: ../comps-f10.xml.in.h:120 -#: ../comps-f11.xml.in.h:128 +#: ../comps-f11.xml.in.h:129 msgid "Myanmar (Burmese) Support" msgstr "Suporte ?? Myanmar (Birman??s)" #: ../comps-f10.xml.in.h:146 -#: ../comps-f11.xml.in.h:156 +#: ../comps-f11.xml.in.h:158 msgid "Sindhi Support" msgstr "Suporte ?? Sindhi" #: ../comps-f10.xml.in.h:158 -#: ../comps-f11.xml.in.h:168 +#: ../comps-f11.xml.in.h:171 msgid "Support for developing programs in the Haskell programming language." msgstr "Suporte ao desenvolvimento de programas na linguagem de programa????o Haskell." #: ../comps-f10.xml.in.h:165 -#: ../comps-f11.xml.in.h:175 +#: ../comps-f11.xml.in.h:179 msgid "Tajik Support" msgstr "Suporte ?? Tajik" #: ../comps-f10.xml.in.h:207 -#: ../comps-f11.xml.in.h:220 +#: ../comps-f11.xml.in.h:224 msgid "Uzbek Support" msgstr "Suporte ?? Uzbeque" @@ -1930,23 +1930,39 @@ msgid "Malagasy Support" msgstr "Suporte ?? Malagasy" -#: ../comps-f11.xml.in.h:135 +#: ../comps-f11.xml.in.h:126 +msgid "MinGW cross-compiler" +msgstr "Compilador cruzado MinGW" + +#: ../comps-f11.xml.in.h:136 +msgid "OCaml" +msgstr "OCaml" + +#: ../comps-f11.xml.in.h:137 msgid "Occitan Support" msgstr "Suporte ?? Occitan" -#: ../comps-f11.xml.in.h:138 +#: ../comps-f11.xml.in.h:140 msgid "Online Help and Documentation" msgstr "Documenta????o e ajuda online" -#: ../comps-f11.xml.in.h:204 +#: ../comps-f11.xml.in.h:170 +msgid "Support for cross-compiling programs to 32 bit Windows targets, testing them, and building installers, all from within Fedora." +msgstr "Suporte ?? compila????o cruzada de programas destinados ao Windows 32 bits, testes dos mesmos, constru????o de instaladores, tudo a partir do Fedora." + +#: ../comps-f11.xml.in.h:173 +msgid "Support for developing software using the Objective CAML programming language and libraries." +msgstr "Suporte ao desenvolvimento de programas na linguagem de programa????o Objective CAML e suas bibliotecas." + +#: ../comps-f11.xml.in.h:208 msgid "This group is a collection of tools used in the design, modification, manipulation, and packaging of fonts." msgstr "Este grupo ?? um cole????o de ferramentas usadas no desenho, modifica????o, manipula????o e empacotamento de fontes." -#: ../comps-f11.xml.in.h:216 +#: ../comps-f11.xml.in.h:220 msgid "Turkmen Support" msgstr "Suporte ?? Turcomeno" -#: ../comps-f11.xml.in.h:218 +#: ../comps-f11.xml.in.h:222 msgid "Upper Sorbian Support" msgstr "Suporte ?? Upper Sorbian" From tgl at fedoraproject.org Sat Mar 7 20:15:25 2009 From: tgl at fedoraproject.org (Tom Lane) Date: Sat, 7 Mar 2009 20:15:25 +0000 (UTC) Subject: rpms/mysql/F-10 mysql-expired-certs.patch, NONE, 1.1 .cvsignore, 1.33, 1.34 mysql-testing.patch, 1.11, 1.12 mysql.spec, 1.109, 1.110 sources, 1.33, 1.34 Message-ID: <20090307201525.937C870116@cvs1.fedora.phx.redhat.com> Author: tgl Update of /cvs/pkgs/rpms/mysql/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2412 Modified Files: .cvsignore mysql-testing.patch mysql.spec sources Added Files: mysql-expired-certs.patch Log Message: Update to mysql version 5.0.77; fix problem with expired SSL certs mysql-expired-certs.patch: --- NEW FILE mysql-expired-certs.patch --- Replace expired SSL certificates so that the regression tests can be run with SSL enabled. This shouldn't be needed anymore in future upstream releases. From: Date: January 28 2009 3:19pm Subject: bzr commit into mysql-5.0-bugteam branch (joro:2730) Bug#42366 List-Archive: http://lists.mysql.com/commits/64296 X-Bug: 42366 Message-Id: <200901281419.n0SEJQFl024918 at magare.gmz> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/kgeorge/mysql/work/B42366-5.0-bugteam/ based on revid:chad at mysql.com 2730 Georgi Kodinov 2009-01-28 Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT" Re-generated the PKI files needed. Removed the ones that are not needed. Updated the tests to reference the correct SSL subject. removed: mysql-test/std_data/server-cert-des.pem mysql-test/std_data/server-key-des.pem modified: mysql-test/r/openssl_1.result mysql-test/std_data/cacert.pem mysql-test/std_data/client-cert.pem mysql-test/std_data/client-key.pem mysql-test/std_data/server-cert.pem mysql-test/std_data/server-key.pem mysql-test/std_data/server8k-cert.pem mysql-test/std_data/server8k-key.pem mysql-test/t/openssl_1.test per-file messages: mysql-test/r/openssl_1.result Bug #42366: Updated the tests to reference the correct SSL subject mysql-test/std_data/cacert.pem Bug #42366: Re-generated the PKI files needed. mysql-test/std_data/client-cert.pem Bug #42366: Re-generated the PKI files needed. mysql-test/std_data/client-key.pem Bug #42366: Re-generated the PKI files needed. mysql-test/std_data/server-cert-des.pem Bug #42366: Removed the ones that are not needed. mysql-test/std_data/server-cert.pem Bug #42366: Re-generated the PKI files needed. mysql-test/std_data/server-key-des.pem Bug #42366: Removed the ones that are not needed. mysql-test/std_data/server-key.pem Bug #42366: Re-generated the PKI files needed. mysql-test/std_data/server8k-cert.pem Bug #42366: Re-generated the PKI files needed. mysql-test/std_data/server8k-key.pem Bug #42366: Re-generated the PKI files needed. mysql-test/t/openssl_1.test Bug #42366: Updated the tests to reference the correct SSL subject === modified file 'mysql-test/r/openssl_1.result' --- a/mysql-test/r/openssl_1.result 2007-07-25 15:46:50 +0000 +++ b/mysql-test/r/openssl_1.result 2009-01-28 14:18:50 +0000 @@ -3,8 +3,8 @@ create table t1(f1 int); insert into t1 values (5); grant select on test.* to ssl_user1 at localhost require SSL; grant select on test.* to ssl_user2 at localhost require cipher "DHE-RSA-AES256-SHA"; -grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com"; -grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; +grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com"; +grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; grant select on test.* to ssl_user5 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx"; flush privileges; connect(localhost,ssl_user5,,test,MASTER_PORT,MASTER_SOCKET); === modified file 'mysql-test/std_data/cacert.pem' --- a/mysql-test/std_data/cacert.pem 2007-07-27 15:39:07 +0000 +++ b/mysql-test/std_data/cacert.pem 2009-01-28 14:18:50 +0000 @@ -1,17 +1,17 @@ -----BEGIN CERTIFICATE----- -MIICrTCCAhagAwIBAgIJAIAO/Ybiptv1MA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV +MIICrTCCAhagAwIBAgIJAJXpePU0UOTVMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD -VQQKEwhNeVNRTCBBQjAeFw0wNjA1MDMwODQ4NTRaFw0wOTAxMjcwODQ4NTRaMEQx +VQQKEwhNeVNRTCBBQjAeFw0wOTAxMjgxMDQ5NDZaFw0xNDAxMjcxMDQ5NDZaMEQx CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA -+C46EQl1u7tQ6gb9eqc8V079gr8YmDPCEqtjO8bCIbchpjOpDITx0WZz36Sn9E72 -GPJwNip4FxLaPRIA3xNQHM5cE5U53qznlRx1Fc4O3hcWCvyCqNDl/vzPAh3pI6Bl -Ku9hfHXpp93W812smVPe9haShEXGgbEPYGzvOfVdu/MCAwEAAaOBpjCBozAdBgNV -HQ4EFgQUjIy/6OCTmqtPHBFha6/qzVk3yTcwdAYDVR0jBG0wa4AUjIy/6OCTmqtP -HBFha6/qzVk3yTehSKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxh -MRAwDgYDVQQHEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAIAO/Ybiptv1 -MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEA8lD9zyB820Oq1aj7ZafX -De/hbdt9RIl2tzgw2K3r1KZGdXJVL0vSt5fZ51Nq9lg7OPJy3iXf+caBJEp0IJpB -uf4Gfr6zfXw+UlY6ZthRtHQHoXKcbskECjH5/ps/Uaa+dpVQ9O+Ii1rPzmgo6ztM -s+xZ46ESBt4WiHXm8kwbU9Y= +4XQHAe5R1+TXC8noZtWf+d5E0v1C59FWpn9SWEUCBjE5UiIwuJvi4Y+7xWGOXLAI +/JzJx5gNXLBiTsE/zh0uX9fKlajLhxB0GN+QU0ZlpQ1BeYipEcNXeI/7cT499f6v +XWabnTflivdCgHSWUOQ20/Lzs6kP6/e6OoZd/DPSjPECAwEAAaOBpjCBozAdBgNV +HQ4EFgQU8uLqVWWkmuKsnZf1RWz294wRrd8wdAYDVR0jBG0wa4AU8uLqVWWkmuKs +nZf1RWz294wRrd+hSKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxh +MRAwDgYDVQQHEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAJXpePU0UOTV +MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMMTE5sDN+Z0ZlV7KvH3g +6+aKvql8dTpRT3hYukeQlWua0nq74WPGVw0c4e/M/vbiMwmJcCYpB9pd4+dHqzSw +aPyoenjY6UF8n7B4quWy3SIUk2LSHeJLW+kzJn2afN9gvipFhdVh/uU2TIyLGOur +Z/vmJX2W7hF1uqPnbfa8Lrw= -----END CERTIFICATE----- === modified file 'mysql-test/std_data/client-cert.pem' --- a/mysql-test/std_data/client-cert.pem 2007-07-27 15:39:07 +0000 +++ b/mysql-test/std_data/client-cert.pem 2009-01-28 14:18:50 +0000 @@ -1,42 +1,55 @@ Certificate: Data: - Version: 1 (0x0) - Serial Number: 1 (0x1) - Signature Algorithm: md5WithRSAEncryption + Version: 3 (0x2) + Serial Number: 3 (0x3) + Signature Algorithm: sha1WithRSAEncryption Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB Validity - Not Before: May 3 08:55:39 2006 GMT - Not After : Jan 27 08:55:39 2009 GMT - Subject: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com + Not Before: Jan 28 11:04:39 2009 GMT + Not After : Jan 28 11:04:39 2010 GMT + Subject: C=SE, ST=Uppsala, O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com Subject Public Key Info: Public Key Algorithm: rsaEncryption RSA Public Key: (512 bit) Modulus (512 bit): - 00:d8:db:68:28:49:84:4d:d6:0f:5c:bc:3d:9a:ab: - 70:d5:3e:f5:b5:17:ba:ef:e1:f8:87:54:30:22:1f: - 81:07:bf:f9:24:7f:8a:54:10:e9:5f:e6:99:50:04: - d4:3b:55:a9:f1:52:ad:12:2b:5a:da:5c:be:8c:3e: - 5b:9e:b0:5a:19 + 00:e1:52:30:2c:d9:be:64:28:91:5d:7a:fd:d9:e9: + 14:35:7a:d2:94:4e:91:46:e0:db:9f:6b:79:f4:4c: + ac:6e:07:61:34:86:74:62:a7:a8:44:af:fa:87:87: + a8:7d:42:61:ff:ab:50:d4:7b:bf:75:fa:d5:d5:b3: + 74:fb:56:1e:37 Exponent: 65537 (0x10001) - Signature Algorithm: md5WithRSAEncryption - 07:57:bf:07:92:c2:8e:86:24:6b:0a:bf:e5:31:21:44:c3:60: - 02:a6:ac:9e:f7:db:7a:6e:fc:4f:d4:7b:54:18:80:47:d2:4a: - 63:0e:e3:f8:af:6e:58:e3:97:5a:2b:82:5d:76:20:d1:33:a0: - f5:43:a1:d1:51:f4:ca:c8:b3:1a:66:4e:0e:55:df:d2:e8:fa: - 83:18:42:f5:ec:66:40:f0:39:e8:f9:d7:cf:f6:dd:e4:7b:69: - dd:0c:92:d8:52:95:43:6f:29:3d:f0:8d:4c:dd:52:ea:6b:a0: - 39:0f:dc:59:a7:5c:37:6b:8b:05:44:b7:69:ea:a3:58:e0:4e: - ce:d6 + X509v3 extensions: + X509v3 Basic Constraints: + CA:FALSE + X509v3 Subject Key Identifier: + 58:30:B5:9B:2C:05:94:06:BA:3D:3C:F0:B2:CD:1D:67:65:E3:7F:85 + X509v3 Authority Key Identifier: + keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF + DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB + serial:95:E9:78:F5:34:50:E4:D5 + + Signature Algorithm: sha1WithRSAEncryption + 05:19:e3:13:14:fc:c5:28:bf:69:f8:00:b3:25:cb:bd:ca:9f: + 2f:4c:b3:a8:04:11:f0:74:27:bd:82:2c:b4:49:9b:a7:59:f0: + f7:87:d1:e0:ba:99:a2:fe:4b:1d:10:6f:e4:a2:b3:cd:7f:8b: + 68:31:46:ee:cd:9e:e2:47:e1:4c:fa:74:d1:e2:8b:cc:a0:4b: + a8:24:d1:a4:c3:6b:2a:c6:28:cd:41:e0:06:48:e6:cf:f2:3c: + ca:37:95:d7:29:64:6b:91:91:83:e7:ac:c8:0b:87:bc:da:a6: + aa:f1:44:43:c8:74:7b:15:26:91:2e:03:c4:71:50:6c:f8:68: + dc:8c -----BEGIN CERTIFICATE----- -MIIB5jCCAU8CAQEwDQYJKoZIhvcNAQEEBQAwRDELMAkGA1UEBhMCU0UxEDAOBgNV -BAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFC -MB4XDTA2MDUwMzA4NTUzOVoXDTA5MDEyNzA4NTUzOVowdzELMAkGA1UEBhMCU0Ux -EDAOBgNVBAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15 -U1FMIEFCMTEwLwYJKoZIhvcNAQkBFiJhYnN0cmFjdC5teXNxbC5kZXZlbG9wZXJA -bXlzcWwuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANjbaChJhE3WD1y8PZqr -cNU+9bUXuu/h+IdUMCIfgQe/+SR/ilQQ6V/mmVAE1DtVqfFSrRIrWtpcvow+W56w -WhkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQAHV78HksKOhiRrCr/lMSFEw2ACpqye -99t6bvxP1HtUGIBH0kpjDuP4r25Y45daK4JddiDRM6D1Q6HRUfTKyLMaZk4OVd/S -6PqDGEL17GZA8Dno+dfP9t3ke2ndDJLYUpVDbyk98I1M3VLqa6A5D9xZp1w3a4sF -RLdp6qNY4E7O1g== +MIICfzCCAeigAwIBAgIBAzANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ +MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT +UUwgQUIwHhcNMDkwMTI4MTEwNDM5WhcNMTAwMTI4MTEwNDM5WjBlMQswCQYDVQQG +EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxMTAvBgkq +hkiG9w0BCQEWImFic3RyYWN0Lm15c3FsLmRldmVsb3BlckBteXNxbC5jb20wXDAN +BgkqhkiG9w0BAQEFAANLADBIAkEA4VIwLNm+ZCiRXXr92ekUNXrSlE6RRuDbn2t5 +9EysbgdhNIZ0YqeoRK/6h4eofUJh/6tQ1Hu/dfrV1bN0+1YeNwIDAQABo4GjMIGg +MAkGA1UdEwQCMAAwHQYDVR0OBBYEFFgwtZssBZQGuj088LLNHWdl43+FMHQGA1Ud +IwRtMGuAFPLi6lVlpJrirJ2X9UVs9veMEa3foUikRjBEMQswCQYDVQQGEwJTRTEQ +MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT +UUwgQUKCCQCV6Xj1NFDk1TANBgkqhkiG9w0BAQUFAAOBgQAFGeMTFPzFKL9p+ACz +Jcu9yp8vTLOoBBHwdCe9giy0SZunWfD3h9Hgupmi/ksdEG/korPNf4toMUbuzZ7i +R+FM+nTR4ovMoEuoJNGkw2sqxijNQeAGSObP8jzKN5XXKWRrkZGD56zIC4e82qaq +8URDyHR7FSaRLgPEcVBs+GjcjA== -----END CERTIFICATE----- === modified file 'mysql-test/std_data/client-key.pem' --- a/mysql-test/std_data/client-key.pem 2007-07-27 15:39:07 +0000 +++ b/mysql-test/std_data/client-key.pem 2009-01-28 14:18:50 +0000 @@ -1,9 +1,9 @@ -----BEGIN RSA PRIVATE KEY----- -MIIBOgIBAAJBANjbaChJhE3WD1y8PZqrcNU+9bUXuu/h+IdUMCIfgQe/+SR/ilQQ -6V/mmVAE1DtVqfFSrRIrWtpcvow+W56wWhkCAwEAAQJAK27WT6tZylUjQomZNQ89 -TBiOEbUtBbqWklQ0R8FTkH9uKV+8KYQ+k+tMkoAEGFfChB0YfofNQ2KZYWWw4yOB -WQIhAPXXDQt73aou10s+cmKM3C3WzLmIZtrvm9wNBXWDGxgTAiEA4dG4cXrZfa1M -TTbjzNU1/Jf50/M8SvZDWMPQWxJ8oqMCIH6zBpYUkHlVCsBMvsbrsc4uFfTIx7mu -I7WVQGr/1sbhAiBf4uFirjtztgZUMx5/d3k5DH80lG/hlLf8FQl/4lWx6QIhAPHw -CXfPUbUFl4r/i9Br5+exGol50qX4F3aP5Sh5EnZT +MIIBOQIBAAJBAOFSMCzZvmQokV16/dnpFDV60pROkUbg259refRMrG4HYTSGdGKn +qESv+oeHqH1CYf+rUNR7v3X61dWzdPtWHjcCAwEAAQJAXYooM8ZlcuEgj+VKU1ee +qyEFIMqJJxqcMk+E/nWCM96WxCP3zHNSrqNfSpI3ld7QzMwhdRz+gFLxT2gGNpIw +MQIhAPxzM/lDihe67X3ADYtDl9ZjA8Pm430x9sXlcxI17tCZAiEA5H1SyFl4mUee +9VnfSC2XGW7lwz72ZygfVX+b7tLWF08CIEh40gzW5MfXM+KLxdea+fXjyursV5ZT +R6KcMiKiNQLRAiAcmHqlzFzFgisotai2Fc6VRkXHG7gmzOSvBJt1VjmpDQIge6jf +2N7whTdvC4ferB+zUlgWQdyvx1c3T4gnt6PYdaY= -----END RSA PRIVATE KEY----- === removed file 'mysql-test/std_data/server-cert-des.pem' --- a/mysql-test/std_data/server-cert-des.pem 2006-09-25 14:44:15 +0000 +++ b/mysql-test/std_data/server-cert-des.pem 1970-01-01 00:00:00 +0000 @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICljCCAX4CAQEwDQYJKoZIhvcNAQEEBQAwUTELMAkGA1UEBhMCU0UxEDAOBgNV -BAgTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCMRAwDgYDVQQLEwdTdXBwb3J0 -MQswCQYDVQQDEwJDQTAeFw0wNjA4MjgxMTA4NTlaFw0wOTA1MjQxMTA4NTlaMFUx -CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBB -QjEQMA4GA1UECxMHU3VwcG9ydDEPMA0GA1UEAxMGc2VydmVyMIGfMA0GCSqGSIb3 -DQEBAQUAA4GNADCBiQKBgQDEiOVZcWYzZe7I8xhhUwCzvmkZifAXeMTH+8XKGLHX -NWF3FLduAmeAad9oOZgBKb+oWTdRDWXqwu6nYYUBfrUpaY27/wLkgWRgewL3LZnw -W2FjhNsjx3gI2NK+Pix47q9d+a+5T4AW5+lK499l0K0k2cvyFdIerhDW8R0t8Uru -twIDAQABMA0GCSqGSIb3DQEBBAUAA4IBAQC2LQcqLg52RbelWrKutlJ5E6rzugnJ -ZAlbN9sM98O2xFiIGDA3tb5j9LAEjE0E+RqdptEYnvy9b3szhLYXtIILZTkClf9r -Uwu1nUYPTyp+9ZYCa4fovOU5h1Ogv+9UZPds/LPDwWEn8K+lvscB4X57wJyuoEck -1Mu41OA6h77181MydSdgZo0oquJDWhdCsYHXVFVs0F6naMm2uPMCTDiQVlhHJuTO -VQMNIwxRFtvsv2tpsXsaP/8sT32d5CFebfxxSVnqQvJ4ZdIrphl6L43XU01rsEcE -K8KYujZQ6SKws+HVcGqsr7TPgJfJE6D+5RazvvIQISPvx4eduebqzqdC ------END CERTIFICATE----- === modified file 'mysql-test/std_data/server-cert.pem' --- a/mysql-test/std_data/server-cert.pem 2007-07-27 15:39:07 +0000 +++ b/mysql-test/std_data/server-cert.pem 2009-01-28 14:18:50 +0000 @@ -1,42 +1,55 @@ Certificate: Data: - Version: 1 (0x0) + Version: 3 (0x2) Serial Number: 1 (0x1) - Signature Algorithm: md5WithRSAEncryption + Signature Algorithm: sha1WithRSAEncryption Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB Validity - Not Before: May 3 08:54:13 2006 GMT - Not After : Jan 27 08:54:13 2009 GMT - Subject: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB, CN=localhost/emailAddress=abstract.mysql.developer at mysql.com + Not Before: Jan 28 10:55:13 2009 GMT + Not After : Jan 28 10:55:13 2010 GMT + Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost/emailAddress=abstract.mysql.developer at mysql.com Subject Public Key Info: Public Key Algorithm: rsaEncryption RSA Public Key: (512 bit) Modulus (512 bit): - 00:d9:fd:da:b3:fb:7c:e0:b0:03:be:97:c6:a4:36: - ac:71:af:bb:2d:e5:84:ed:f3:8f:2b:eb:11:e5:aa: - 66:ed:bf:62:6b:e3:ce:fa:80:ed:90:ff:b9:4a:39: - 20:40:b6:f2:99:bf:2f:33:b5:f2:ec:3a:90:60:1d: - 9e:94:7e:a4:1b + 00:b6:8f:e5:b7:b4:86:83:13:8a:f9:bf:63:cb:64: + 2d:b9:51:d1:de:ab:7b:45:1f:aa:b5:66:73:13:f9: + a6:07:d5:ba:7c:fa:92:bd:37:e2:ad:87:db:3e:b6: + 6a:12:64:f8:ee:17:e3:15:06:2f:a8:82:68:bf:57: + 8d:c3:04:98:27 Exponent: 65537 (0x10001) - Signature Algorithm: md5WithRSAEncryption - de:5e:35:cd:7b:11:e6:7c:c5:7c:d6:27:4e:72:12:49:42:eb: - 6f:2c:96:f3:f4:00:78:a7:4f:9f:2d:7b:d7:30:39:af:49:4d: - df:b1:55:0d:30:be:23:6f:06:67:fd:dd:ba:98:66:36:c6:32: - b7:ed:63:fc:aa:49:cd:4f:72:98:3b:13:0e:f6:28:d7:d4:eb: - 04:6b:dc:e8:c7:04:80:92:e4:04:86:0b:ed:32:25:76:1d:a9: - 5c:a9:2c:18:2c:bd:bc:15:ed:e1:76:96:4d:bb:0d:41:44:06: - 2c:ad:45:bb:db:61:ad:17:11:cb:49:70:67:eb:c6:27:d3:91: - c8:f2 + X509v3 extensions: + X509v3 Basic Constraints: + CA:FALSE + X509v3 Subject Key Identifier: + D9:9A:B8:5F:22:EA:04:10:C8:25:7D:82:57:E6:2E:FD:19:29:E7:DA + X509v3 Authority Key Identifier: + keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF + DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB + serial:95:E9:78:F5:34:50:E4:D5 + + Signature Algorithm: sha1WithRSAEncryption + 54:07:2d:21:0b:a5:af:3b:58:23:32:5e:56:7f:ab:58:63:48: + 91:aa:38:90:89:16:f9:cc:bf:a4:0e:78:2b:9f:c5:1b:58:a6: + e6:08:8f:2e:ae:97:03:21:9b:f1:cd:c0:26:8f:1d:d7:28:27: + a0:8e:81:09:1b:1c:0f:c9:a5:41:3a:2d:44:3f:9c:fa:87:ff: + c8:4c:2b:44:f7:1b:c1:3e:4f:01:7f:e9:26:cc:9f:1c:06:b5: + 0b:27:d1:10:90:be:93:0c:9c:e7:b0:d1:ea:27:99:4e:06:14: + 0c:7a:e9:c1:52:c5:33:68:bc:61:0d:db:81:3b:57:48:57:bf: + 42:9a -----BEGIN CERTIFICATE----- -MIIB+zCCAWQCAQEwDQYJKoZIhvcNAQEEBQAwRDELMAkGA1UEBhMCU0UxEDAOBgNV -BAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFC -MB4XDTA2MDUwMzA4NTQxM1oXDTA5MDEyNzA4NTQxM1owgYsxCzAJBgNVBAYTAlNF -MRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYDVQQKEwhN -eVNRTCBBQjESMBAGA1UEAxMJbG9jYWxob3N0MTEwLwYJKoZIhvcNAQkBFiJhYnN0 -cmFjdC5teXNxbC5kZXZlbG9wZXJAbXlzcWwuY29tMFwwDQYJKoZIhvcNAQEBBQAD -SwAwSAJBANn92rP7fOCwA76XxqQ2rHGvuy3lhO3zjyvrEeWqZu2/YmvjzvqA7ZD/ -uUo5IEC28pm/LzO18uw6kGAdnpR+pBsCAwEAATANBgkqhkiG9w0BAQQFAAOBgQDe -XjXNexHmfMV81idOchJJQutvLJbz9AB4p0+fLXvXMDmvSU3fsVUNML4jbwZn/d26 -mGY2xjK37WP8qknNT3KYOxMO9ijX1OsEa9zoxwSAkuQEhgvtMiV2HalcqSwYLL28 -Fe3hdpZNuw1BRAYsrUW722GtFxHLSXBn68Yn05HI8g== +MIICkzCCAfygAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ +MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT +UUwgQUIwHhcNMDkwMTI4MTA1NTEzWhcNMTAwMTI4MTA1NTEzWjB5MQswCQYDVQQG +EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNV +BAMTCWxvY2FsaG9zdDExMC8GCSqGSIb3DQEJARYiYWJzdHJhY3QubXlzcWwuZGV2 +ZWxvcGVyQG15c3FsLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC2j+W3tIaD +E4r5v2PLZC25UdHeq3tFH6q1ZnMT+aYH1bp8+pK9N+Kth9s+tmoSZPjuF+MVBi+o +gmi/V43DBJgnAgMBAAGjgaMwgaAwCQYDVR0TBAIwADAdBgNVHQ4EFgQU2Zq4XyLq +BBDIJX2CV+Yu/Rkp59owdAYDVR0jBG0wa4AU8uLqVWWkmuKsnZf1RWz294wRrd+h +SKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdV +cHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAJXpePU0UOTVMA0GCSqGSIb3DQEB +BQUAA4GBAFQHLSELpa87WCMyXlZ/q1hjSJGqOJCJFvnMv6QOeCufxRtYpuYIjy6u +lwMhm/HNwCaPHdcoJ6COgQkbHA/JpUE6LUQ/nPqH/8hMK0T3G8E+TwF/6SbMnxwG +tQsn0RCQvpMMnOew0eonmU4GFAx66cFSxTNovGEN24E7V0hXv0Ka -----END CERTIFICATE----- === removed file 'mysql-test/std_data/server-key-des.pem' --- a/mysql-test/std_data/server-key-des.pem 2006-09-25 14:44:15 +0000 +++ b/mysql-test/std_data/server-key-des.pem 1970-01-01 00:00:00 +0000 @@ -1,18 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -Proc-Type: 4,ENCRYPTED -DEK-Info: DES-EDE3-CBC,D2BE7598C7E3BDA5 - -1W3qPgw5ut80OhaAGVZZe/tfFiBAlwpX1SohdApWj+QYP+dK/mdEBhgI3BXTFNLW -pJqDTzGlKtft7hHN6QDFEdZMKxej5+2iLu14V62o+5yQgUoqswoXcmmqJCJ7AvyJ -yMBmGAzxRFlQsT8lf6o5TS1/efBvjvWhh3NG2Zq2LpyhWRRqA3kNhzktzt2WjDZe -ZkKmZJJnArr/Aw7jEBC4sH+nmgxoR18GzDddRG12hv1AWyHc3+VisTBpyNzeBy17 -rxuQtqLzkAJmId723ddw83RVNSvBUUS3G0rx5O3HPobvZK89UqVxcXtIgc11WTVU -N3DbcJq5it43Loo0W3gAngtESDm2E3rTadrmdUSDGv2wQ5dNFl6cQ1f397Sdd/WC -A0grn1tKjJ6COp80Ymdyvn+stjv/+Rl1/KHSeG0lNeZxqjPPOJ7NHaKv7qjYsJ6W -LT35/Xc3oCo5qk9FOlq/0tGjHxf6RcFr5U7k5ILKZs+RmvJ4Sv/VYShLfLTcfGbJ -wBNfRKvcHZBQJQBb1+s/kRrjFFtvhrUwLz4+c9kskp+t4qRVYywUAnGGGsMs/GPm -wYsLQZO6Bs5/taaVUyaJQW015J7FGGv+/7/A1dIhu73S/Xl/YcFbX/CMEVq2Lxxd -hZdFIuaZ7LE+0MDQWsvYMYPDPLDH11diczb/jeKBdLPOzk/FUqVx3Fin1PpcaBxY -b+7oZJhYdg/rAWDeQ/nji9qnEG8waK6x1hdkYPOrqqWQPfgM/LPsSrgWeuTSdx2B -Ixi01UlBb5UP4K7UrjyddPobmcVjXaQLNe7zaq0+OS3UnIG85GtHrQ== ------END RSA PRIVATE KEY----- === modified file 'mysql-test/std_data/server-key.pem' --- a/mysql-test/std_data/server-key.pem 2007-07-27 15:39:07 +0000 +++ b/mysql-test/std_data/server-key.pem 2009-01-28 14:18:50 +0000 @@ -1,9 +1,9 @@ -----BEGIN RSA PRIVATE KEY----- -MIIBOgIBAAJBANn92rP7fOCwA76XxqQ2rHGvuy3lhO3zjyvrEeWqZu2/YmvjzvqA -7ZD/uUo5IEC28pm/LzO18uw6kGAdnpR+pBsCAwEAAQJBAMieYdpmRoUaODf9wqh6 -ULXH/sG8i1vaXRcUHcJ50oRVfVK8/tGGvUuTDu6MeINTdahNDlYfjwOjKWVXys1w -h6ECIQDs6s7DfczK2bKCLt0zqg24mZL3rOpGmDU+TatwN1yVgwIhAOuMzdVTX39p -328+5WxJvBOFfxmSmqdDhIFpnRMvgguJAiByvKjT/km+970+1OllyvaIL0AA2OpA -tBgdC0p6tyUMdwIgKuHAWzTJbu28UolVxQgLaFZmVCZ/ZzIAfnrWsLZ2a1kCIBq/ -ywJ2cpyFlgazu8AH6KCQa0ok9s70ElaB6FEC85Al +MIIBOQIBAAJBALaP5be0hoMTivm/Y8tkLblR0d6re0UfqrVmcxP5pgfVunz6kr03 +4q2H2z62ahJk+O4X4xUGL6iCaL9XjcMEmCcCAwEAAQJASA5VwgNb0CKHiPm0ntOk +hG+54SRX3DmafEy6gRjZIl/bZ/asSLhXUZ+CeohyrQh7BZgYWvykd8pRISL9eKsU +GQIhAOXkUrOtP/EtjyqNluEqZdG+RZi/7p61JS3Ce13Myu+LAiEAy0uMlV34AJpM +b40FPKqlHxw8DD/Dt1iKhNVAg8+LDVUCIFjv7fbJDbW2VG63/Cj8CAwOukoP5rbL +iaicVrHBKrllAiB9+MiaXeopZXNrxDS0jQFYr8Q9yt1aJVFgUkxx4Q9HKQIgZPs0 +KlF3NNNWw78INaAEkyf0IEssnLMsuoCWw0DIOak= -----END RSA PRIVATE KEY----- === modified file 'mysql-test/std_data/server8k-cert.pem' --- a/mysql-test/std_data/server8k-cert.pem 2007-07-17 18:43:56 +0000 +++ b/mysql-test/std_data/server8k-cert.pem 2009-01-28 14:18:50 +0000 @@ -1,51 +1,138 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 4 (0x4) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB + Validity + Not Before: Jan 28 11:12:27 2009 GMT + Not After : Jan 28 11:12:27 2010 GMT + Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=server + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public Key: (8192 bit) + Modulus (8192 bit): + 00:c0:8f:22:03:24:59:67:46:14:d6:8f:60:09:58: + 06:07:45:f1:78:71:55:f1:ea:b9:30:8a:cd:c3:3c: + b9:bf:65:6e:18:ed:a0:b8:c9:19:56:6f:c4:90:19: + c8:65:09:db:ff:bf:82:a1:08:ad:01:4f:5a:a3:d4: + 3d:78:7e:4b:4a:01:a4:7d:e8:7b:05:3e:7d:d8:b9: + 55:58:60:d6:1c:ce:e8:32:62:2c:19:60:f3:ed:05: + 99:6d:c9:77:07:2e:11:6d:0b:9a:c7:68:38:46:e8: + fa:31:80:df:e8:79:f0:f1:fd:a9:94:c3:fa:0d:f5: + 78:ac:49:7e:d5:17:fd:e1:ee:44:f3:c7:0e:30:32: + 5d:a9:19:25:e4:bb:21:1d:fe:3c:84:48:40:f5:58: + f4:bf:13:8c:85:68:bb:ec:f5:dd:c6:38:d1:b0:77: + 1f:a6:8e:4f:8d:e2:6f:49:74:f5:3f:90:65:8e:99: + 1e:59:9c:1c:b5:26:24:c4:b1:de:1e:fb:96:65:c4: + 31:14:1a:53:b8:5e:62:8a:c7:04:f7:b4:36:a4:af: + 07:c8:27:06:ed:dd:e6:f4:8c:62:f1:65:40:d0:9f: + 9f:a9:14:c8:8e:8b:74:d6:67:5a:d0:c9:4d:35:a1: + d5:7b:39:3a:42:9f:e4:d0:f4:c6:0f:2e:42:30:4b: + 56:b2:3d:6d:8e:2d:58:c5:69:99:35:49:95:95:99: + b6:87:29:2b:32:d1:50:08:cd:25:14:48:6d:10:99: + 85:61:3c:41:26:21:55:cc:1f:cf:ad:b0:2f:b9:89: + d8:4e:a0:18:ff:75:1d:b6:97:7c:c5:fa:8b:dc:93: + 17:86:0a:64:d4:09:35:d5:83:34:6d:5c:6d:c6:8c: + cd:b9:ec:c2:93:c6:c1:b7:cc:04:6f:22:e0:07:bf: + e0:d9:9b:2f:d5:a0:50:cc:f9:f0:95:83:8f:f4:30: + 83:72:94:d7:b5:4b:da:cc:9f:54:3b:8d:78:77:0b: + 24:6c:0f:c2:96:61:96:2f:b8:5f:b5:7a:ab:7a:5b: + 97:7a:a9:ad:40:8b:f2:d6:c6:8d:81:d9:94:61:8f: + 9d:03:c5:b9:10:03:68:83:bf:04:81:cc:ac:bd:34: + 89:e8:d4:8d:43:20:e2:b6:a4:11:3d:15:2a:82:0c: + d6:3a:6a:8c:62:d4:93:bc:c3:80:bf:1b:b4:2b:0a: + 7a:34:f0:cd:1e:82:3f:25:0f:d1:04:a8:0a:05:19: + b0:d6:16:83:39:af:0b:45:7d:cb:14:7e:4d:aa:aa: + c2:39:a8:46:38:ab:bd:ab:2a:bd:34:43:7f:da:25: + de:2b:fb:69:3b:fe:3b:87:fd:98:94:76:4a:bf:04: + a3:31:e3:3a:ff:6f:04:fa:fa:24:e4:2a:89:e9:0e: + bf:44:4c:72:85:82:3c:89:4a:03:63:01:41:92:53: + d0:82:60:6e:d8:ff:8c:a2:b4:1a:3b:20:6d:ae:74: + 92:30:4e:48:e3:51:a6:cb:73:97:06:13:03:32:23: + 9b:7d:a2:c7:3a:a9:af:97:8c:51:ed:fe:fa:b4:b4: + 1a:a3:87:fc:cf:8c:8e:e6:80:15:03:fd:fe:7d:bd: + b1:76:f1:5f:b3:09:2b:4c:4d:a7:7c:b5:72:b1:d6: + db:38:c0:67:a4:54:bc:87:09:a5:39:ba:1a:7e:3f: + 74:60:ad:3d:4b:be:94:53:f3:64:16:c7:33:35:ec: + 41:00:95:b6:de:99:62:a2:7a:28:9a:45:4d:fa:cd: + a6:77:f6:de:58:72:50:c8:7d:69:38:db:07:04:84: + d8:4d:39:f7:50:13:43:ae:2d:af:45:a4:2a:39:56: + 3c:b8:b7:d8:26:a4:36:c9:23:aa:aa:b8:49:0b:21: + ba:9e:7a:2b:7f:4d:29:9f:0e:00:1e:b4:5e:a6:fa: + 49:fe:8d:e5:74:57:d8:ba:d9:92:2c:d2:ac:84:1d: + f2:a6:a4:44:1c:bf:88:41:32:7e:d1:c3:2f:6e:bc: + 0f:5d:19:a6:8f:74:2b:67:ba:dd:a9:db:68:b5:ce: + 9d:25:48:df:54:08:d0:1d:4f:2e:5b:24:bc:05:0f: + fb:58:46:fa:02:ca:53:93:29:cf:10:27:c2:a0:18: + d0:f5:d4:b9:3c:5e:df:8e:6c:f5:7c:b9:b4:54:cc: + 39:16:5d:3c:da:96:b3:c3:6c:d4:70:5d:d3:30:a7: + a6:bd:6f:dd:41:bc:a8:de:42:60:59:9a:85:25:0d: + 2a:45:c3:05:b4:6e:7a:4a:4d:ca:8c:0a:e5:6c:34: + bc:20:9b:6d:4a:ca:ca:b6:a6:3a:a0:db:c3:0e:20: + 1a:12:1b:77:dd:cb:1d:7f:c3:0d:0d:e7:c1:fd:96: + d2:c7:68:80:99:a0:d9:8a:33:21:a3:8b:a2:5a:a7: + 7e:27:06:02:7f:ed:60:11:37:34:54:17:7f:4d:90: + 14:1e:69:37:0d:ba:f0:2b:f0:a3:2d:62:79:c8:76: + a8:ea:c8:e7:3b:1f:c6:4f:c2:0c:d7:ac:f0:77:53: + 5d:f0:50:b4:df:9b:03:ca:4d:41:e1:18:b2:25:30: + 86:1d:63:e5:67:b1:53:cd:6b:4e:83:1a:b9:5e:2d: + 05:15:6b:d4:8e:b1:97:fc:31:03:57:cb:bf:27:7f: + cd:5f:27:7e:66:e7:3c:17:09:b6:11:2a:4f:33:cd: + eb:1a:d3:6f:d5:15:8b:8b:ce:68:6b:7e:9a:95:e5: + 74:7f:17:57:d9 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: + CA:FALSE + X509v3 Subject Key Identifier: + 58:12:24:59:A7:3C:29:15:89:5A:C2:12:DB:E7:A5:42:10:21:B7:BA + X509v3 Authority Key Identifier: + keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF + DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB + serial:95:E9:78:F5:34:50:E4:D5 + + Signature Algorithm: sha1WithRSAEncryption + cd:cb:5c:83:35:ea:cb:cb:c3:a8:c3:95:e2:e6:6f:4d:d8:e4: + ee:41:dd:3f:35:82:ac:2f:fd:63:89:4f:3a:19:d7:81:75:b3: + a3:fc:36:b2:12:d5:c6:56:bc:13:60:37:33:6e:a0:d8:ae:7c: + 88:f9:4b:ee:7b:1f:c8:f0:56:19:07:4d:bb:45:52:1c:78:81: + 07:7c:13:86:b8:86:70:85:e4:71:25:58:78:d1:be:de:22:82: + 6d:1a:4b:06:ac:f0:e8:50:87:c7:69:64:c2:61:43:cd:96:06: + a6:7e:09:a9:02:01:2a:a2:40:f3:cd:10:80:48:d0:34:55:40: + b9:ce -----BEGIN CERTIFICATE----- -MIIJHDCCBQQCAQEwDQYJKoZIhvcNAQEEBQAwTjELMAkGA1UEBhMCU0UxEDAOBgNV -BAgTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCMQ0wCwYDVQQLEwRUZXN0MQsw -CQYDVQQDEwJDQTAeFw0wNzA3MTMwNzU2MjVaFw0xMDA0MDgwNzU2MjVaMFoxCzAJ -BgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRkwFwYDVQQKFBBNeVNRTCAgIAog -ICAgIEFCMQ0wCwYDVQQLEwRUZXN0MQ8wDQYDVQQDEwZzZXJ2ZXIwggQiMA0GCSqG -SIb3DQEBAQUAA4IEDwAwggQKAoIEAQDUFlh/3mwov5YaICFXOdJXgHV/uDkTjXB6 -9oxlipshQaYPX8LDT5vhI3gPciS1Z1sRE2dTcC4Mk2K4LDUIjp3WkeTfFAHZPV3E -Y+3OH/ftH4N6SEIBTKE4EY6ah0nJtU98M0JhxOh5zHje6zQp1SkBnhEOQYexYRqj -OtGloZ9RyF0iFAXcyu2Ap14u37l5Yla0cyPzvZqP4mFYlcXwaRfAacJmqMM1vuQv -Fx1JITUTBugMF3VGZ1F0tw63EIUH/FW/WWncPqvG18na40qlv9ZkBw0FhZeKS8cK -JIY5y4J30jn/eV8p1lTO7K+ASTuGZWmdRDgjUG0Y9OGuKsPPoaE6ml0HTnMBsBSQ -fXUq9XkwGt8DTgPioAKHBHjLbILEy4FMYWrlTZlPTzNqyhayec/2T15oDladNSt7 -JpDLpX70UECXFhdEGxsGxtXdKbIBvNm2yT4X2nxW9ItsECjSSgD+94TgGoa8QKDw -rpmgq+Wqpm54CZ1vN1oqyMUw1sjNEX/iLByHAjSALby2Kffk5cl5mnsR6d/k4jsi -c3Qsciwkd+rQt/8VMhS2ns3nkez/BK3FvQA2Ms8xJhFLfszVrBhnjcFRTNT2+/KM -lr1oT5Q1XZKL7qVXTpabPL51JlVBL5CSHl1QRkffsqfqcgJkcHBq+kKjUiFs4lad -hTrvNBCXYa5+NkA2QqIfdOpNwl62/gdE7/7zU1uh40vkVKyzL+APkLPywPEXBOpQ -yIDNkgoXmS10+JMD44K7uZyUmxZL7W7Xbi30NuEFrVOzoUmVXhapPbpQnkQHxn8n -tqKPYXdBcvXcCKyJ6i79H2Vk9fM6rBYiwNcE7QyWqfd2QMjzr76veF04sXkPR+tG -5Y1lrF9Zp3vabFXQg2RJuGA3rV6MR2GFNXuChIYu410vhIhPNtmdKEVoIVZsFsug -+dtn0PDCFrR8VEd/sshp0naNa9Ad1lY+marJkOJOVpPgCs2yJDPAUB/YdvSJ4avW -6ZdvNTwhBL8fEJMS2DSqkaa6A3+i/SqITpU8ToJxsMGagBsLieXgvJALFysSRfR/ -2dmEu9/J0PPc28inHXwjiLb99VKlkuEz8wX9UkuoqFl0pLa8jrlM8hzdPQ9QHb3k -9c5knfgPCYkOIWwGXH+NwANHdQRK7CmGAFV24k9+P3q0g5ikabVHr+4ZQ3WPd+1H -K0+Msbb/vv53vFJWa+pYeNeFcwNCyW2kJBTMiI6qmlL4IWCcX+QDzpRLalbAWWHj -l5Zk39QEaCL024DYK948IDXCqDg6utEs7YnMdaIF0meYMKjehZFp0fVQ8e8Od+rp -bbjdj/w60wMgBpSOeYxVrs3QKNZd/if4Az3LggoVHB09SjXKiWpvAgMBAAEwDQYJ -KoZIhvcNAQEEBQADggQBABncOBW0wQwJdEB6W3d9CrhFp40q1OM54GPfX0/0aUfP -aOQPxS1uCKcFhxAmR4OT9RiJx+0bhDctekkuMkj5yy3u0a/4PxHIhnVxXTyB0/Hj -N1gLz6cQricunl6Q4Ldi54gR5/KUehKLBWnqsfxhgzWBHosvhlJC0xh/uio7JTqz -ns60djyL7R4wGbSqiGdhT9L2HfpJo3dmmWLDxe02jaHkbL1Z6NQMxrRgs3+gctp/ -Wd5UxNl4BHbNsSbzaK9V9gXUcj4TjZGGSqVki0+pEZ3dmksGZdoW9cSKtzKvgUQ6 -vhhqO4dcopxkY2zYeVOpspgTm0XLZSbNPXv5rSFwa4cpWSfD7u8o8KhHvkkSMahw -cMuH17W4voHHFDtWP8Oq9rA7uE/4/LKCl0JmJl2RWM+G6PMH8w4X4auHPssgRvb/ -Ge1AvgqQJrvi7zWx3XYKKJ0ISBy7fi5Jo/wYgLagRYcG3mwdm1+gAdw+77C/ZGmG -FbWFIPB1+Mc6azhhk9m/vqP7o/Wuncc99mp2zPMzdAEzuzp/IJ9UJNat0edA7jiC -bQ7JSRJ1DSzdJZSWWHdardLNKipPfrEHVm7f5QvL5DQLnGpt+rCWL361KsGtvETC -o+Ph7+kDJsJLokUYfs/BEZopzspNPy/NQ2ECwQp7T4Yq/PBE6Ce/dFaoZysMUOrG -TcALtJW6It98dRmTJPiqjlrlHNTrfoV3Aiy+tK4rpyGuApSHc+1Y+t7YvWotRlQ4 -GEboBqR8evjDPJ1xAaUZqwLkebf3mlpl4MzHM9uNWBkQdJilkQs/IrAaApG3Ayt0 -nIymNHmDslBEdrRGmT4aNWAWYvVYzyKDy3H0fzYdWwuA9goJUL4tj3eMJa8pgEU/ -rG3HfflVi+xuwm1UnLXPSIE8hixgV8ebnwcCnEjlUBvwpl7f5Ub40jKcdycdGvVu -gcTUzuRl1+Ikfk/MXKPbdi4A5Pjtz6AG4Ez9q5j7X77JqskTI5Z/f1RPiKwFBJHg -cN4+BPnEuSWGcjiNDOfQxhk5exlWRf/gpEhnQpGHe3a7tZgfxHUb/pWU9BYpf8OH -vtV3WSDXlUqsEEH6/bmvj8lmFWJLmeZv+qLy1wHxcXR9/GJ6TwCF8niQIl3MrBAL -sKPLft1drmpqdIQpZQIJxtN/AQuD9mxEdW7XA6rkvFySKcswJpS1QjkSWpafCBWE -wu+SPxZL8oFrnNMTU3JloUjcRp70FkNXLLm/Dy+MjW2qFBtIoBgNptVGp94L1uZS -amd2XJMcOQ+X9fcH3wAdM3IHGn3NiLf6eTW92JNNA0IN6aNtyVaJKmFJ1JfXOl9r -ujr4SorRSesaerjIcuzW1u1YE5RlgeI4kizV2/D5kYc= +MIIGJTCCBY6gAwIBAgIBBDANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ +MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT +UUwgQUIwHhcNMDkwMTI4MTExMjI3WhcNMTAwMTI4MTExMjI3WjBDMQswCQYDVQQG +EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxDzANBgNV +BAMTBnNlcnZlcjCCBCIwDQYJKoZIhvcNAQEBBQADggQPADCCBAoCggQBAMCPIgMk +WWdGFNaPYAlYBgdF8XhxVfHquTCKzcM8ub9lbhjtoLjJGVZvxJAZyGUJ2/+/gqEI +rQFPWqPUPXh+S0oBpH3oewU+fdi5VVhg1hzO6DJiLBlg8+0FmW3JdwcuEW0Lmsdo +OEbo+jGA3+h58PH9qZTD+g31eKxJftUX/eHuRPPHDjAyXakZJeS7IR3+PIRIQPVY +9L8TjIVou+z13cY40bB3H6aOT43ib0l09T+QZY6ZHlmcHLUmJMSx3h77lmXEMRQa +U7heYorHBPe0NqSvB8gnBu3d5vSMYvFlQNCfn6kUyI6LdNZnWtDJTTWh1Xs5OkKf +5ND0xg8uQjBLVrI9bY4tWMVpmTVJlZWZtocpKzLRUAjNJRRIbRCZhWE8QSYhVcwf +z62wL7mJ2E6gGP91HbaXfMX6i9yTF4YKZNQJNdWDNG1cbcaMzbnswpPGwbfMBG8i +4Ae/4NmbL9WgUMz58JWDj/Qwg3KU17VL2syfVDuNeHcLJGwPwpZhli+4X7V6q3pb +l3qprUCL8tbGjYHZlGGPnQPFuRADaIO/BIHMrL00iejUjUMg4rakET0VKoIM1jpq +jGLUk7zDgL8btCsKejTwzR6CPyUP0QSoCgUZsNYWgzmvC0V9yxR+TaqqwjmoRjir +vasqvTRDf9ol3iv7aTv+O4f9mJR2Sr8EozHjOv9vBPr6JOQqiekOv0RMcoWCPIlK +A2MBQZJT0IJgbtj/jKK0Gjsgba50kjBOSONRpstzlwYTAzIjm32ixzqpr5eMUe3+ ++rS0GqOH/M+MjuaAFQP9/n29sXbxX7MJK0xNp3y1crHW2zjAZ6RUvIcJpTm6Gn4/ +dGCtPUu+lFPzZBbHMzXsQQCVtt6ZYqJ6KJpFTfrNpnf23lhyUMh9aTjbBwSE2E05 +91ATQ64tr0WkKjlWPLi32CakNskjqqq4SQshup56K39NKZ8OAB60Xqb6Sf6N5XRX +2LrZkizSrIQd8qakRBy/iEEyftHDL268D10Zpo90K2e63anbaLXOnSVI31QI0B1P +LlskvAUP+1hG+gLKU5MpzxAnwqAY0PXUuTxe345s9Xy5tFTMORZdPNqWs8Ns1HBd +0zCnpr1v3UG8qN5CYFmahSUNKkXDBbRuekpNyowK5Ww0vCCbbUrKyramOqDbww4g +GhIbd93LHX/DDQ3nwf2W0sdogJmg2YozIaOLolqnficGAn/tYBE3NFQXf02QFB5p +Nw268Cvwoy1iech2qOrI5zsfxk/CDNes8HdTXfBQtN+bA8pNQeEYsiUwhh1j5Wex +U81rToMauV4tBRVr1I6xl/wxA1fLvyd/zV8nfmbnPBcJthEqTzPN6xrTb9UVi4vO +aGt+mpXldH8XV9kCAwEAAaOBozCBoDAJBgNVHRMEAjAAMB0GA1UdDgQWBBRYEiRZ +pzwpFYlawhLb56VCECG3ujB0BgNVHSMEbTBrgBTy4upVZaSa4qydl/VFbPb3jBGt +36FIpEYwRDELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcHNhbGExEDAOBgNVBAcT +B1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCggkAlel49TRQ5NUwDQYJKoZIhvcN +AQEFBQADgYEAzctcgzXqy8vDqMOV4uZvTdjk7kHdPzWCrC/9Y4lPOhnXgXWzo/w2 +shLVxla8E2A3M26g2K58iPlL7nsfyPBWGQdNu0VSHHiBB3wThriGcIXkcSVYeNG+ +3iKCbRpLBqzw6FCHx2lkwmFDzZYGpn4JqQIBKqJA880QgEjQNFVAuc4= -----END CERTIFICATE----- === modified file 'mysql-test/std_data/server8k-key.pem' --- a/mysql-test/std_data/server8k-key.pem 2007-07-17 18:43:56 +0000 +++ b/mysql-test/std_data/server8k-key.pem 2009-01-28 14:18:50 +0000 @@ -1,99 +1,99 @@ -----BEGIN RSA PRIVATE KEY----- -MIISKQIBAAKCBAEA1BZYf95sKL+WGiAhVznSV4B1f7g5E41wevaMZYqbIUGmD1/C -w0+b4SN4D3IktWdbERNnU3AuDJNiuCw1CI6d1pHk3xQB2T1dxGPtzh/37R+DekhC -AUyhOBGOmodJybVPfDNCYcToecx43us0KdUpAZ4RDkGHsWEaozrRpaGfUchdIhQF -3MrtgKdeLt+5eWJWtHMj872aj+JhWJXF8GkXwGnCZqjDNb7kLxcdSSE1EwboDBd1 -RmdRdLcOtxCFB/xVv1lp3D6rxtfJ2uNKpb/WZAcNBYWXikvHCiSGOcuCd9I5/3lf -KdZUzuyvgEk7hmVpnUQ4I1BtGPThrirDz6GhOppdB05zAbAUkH11KvV5MBrfA04D -4qAChwR4y2yCxMuBTGFq5U2ZT08zasoWsnnP9k9eaA5WnTUreyaQy6V+9FBAlxYX -RBsbBsbV3SmyAbzZtsk+F9p8VvSLbBAo0koA/veE4BqGvECg8K6ZoKvlqqZueAmd -bzdaKsjFMNbIzRF/4iwchwI0gC28tin35OXJeZp7Eenf5OI7InN0LHIsJHfq0Lf/ -FTIUtp7N55Hs/wStxb0ANjLPMSYRS37M1awYZ43BUUzU9vvyjJa9aE+UNV2Si+6l -V06Wmzy+dSZVQS+Qkh5dUEZH37Kn6nICZHBwavpCo1IhbOJWnYU67zQQl2GufjZA -NkKiH3TqTcJetv4HRO/+81NboeNL5FSssy/gD5Cz8sDxFwTqUMiAzZIKF5ktdPiT -A+OCu7mclJsWS+1u124t9DbhBa1Ts6FJlV4WqT26UJ5EB8Z/J7aij2F3QXL13Ais -ieou/R9lZPXzOqwWIsDXBO0Mlqn3dkDI86++r3hdOLF5D0frRuWNZaxfWad72mxV -0INkSbhgN61ejEdhhTV7goSGLuNdL4SITzbZnShFaCFWbBbLoPnbZ9Dwwha0fFRH -f7LIadJ2jWvQHdZWPpmqyZDiTlaT4ArNsiQzwFAf2Hb0ieGr1umXbzU8IQS/HxCT -Etg0qpGmugN/ov0qiE6VPE6CcbDBmoAbC4nl4LyQCxcrEkX0f9nZhLvfydDz3NvI -px18I4i2/fVSpZLhM/MF/VJLqKhZdKS2vI65TPIc3T0PUB295PXOZJ34DwmJDiFs -Blx/jcADR3UESuwphgBVduJPfj96tIOYpGm1R6/uGUN1j3ftRytPjLG2/77+d7xS -VmvqWHjXhXMDQsltpCQUzIiOqppS+CFgnF/kA86US2pWwFlh45eWZN/UBGgi9NuA -2CvePCA1wqg4OrrRLO2JzHWiBdJnmDCo3oWRadH1UPHvDnfq6W243Y/8OtMDIAaU -jnmMVa7N0CjWXf4n+AM9y4IKFRwdPUo1yolqbwIDAQABAoIEAQDI3u0tFoWMRoCs -99d8HLiaxYED2YC9gw2QeKjal198LQhRsVnu0ByMLKLOxkX8RgrbbmxDe5Exufob -A0urciAOFJoXqoRhs5x2oEqgGmkf/ePx0jQptOFREFfnBdGeKIpC0O3DWdLxYPbt -8wixwkEXVhVDUk9pcdXf2ZqsbBpQRBvpZdtzlgNCAcLTVHP/gmMqf48CkIauVjPq -ydfybibfx4sm3hodclH+Q78p/zicb8MhiKo7ZymgCKz4N743pQe1tsLrpbPeHY0C -MpoFyF8O2Bq+KxwvELxQX+19GcHVKJhj3hmCr4wde9BxCWtGTBCusekVkVvy8iQ5 -aCmTIrtonMEVZXjJlXK0sw5hBKOmKx0jrSVC5FfgdxzNVlW4fCJXLEEpMsjMc+/3 -6bV7jqGn4N5CYaopNS2ccxdaucE3NjcmofahO6bqUTJHSPFecfYmCA42W2m+ldjj -HZ78JLkyw03nT1hjPjbwHf5FTem1KfKg4EJrDprowMT7D8KZb0SW+z59pFoDOM5u -Heu6sOSUtvpvKfozdw2ZAI58dhpW4/jTfCEtewRhPqE3/V7g3haTnQFxU8gm/a4N -uefZTCjFE16QWNuvnUrJWw/DlvOBY8GjpQCWY0mDeBHPNOI0Xg9oRTgOCrKSLUya -YSbg6BmhSKwKsYQU834jrQb3fXFlXZVIxlcNePOWMhHFFNAHucHF822Nr7u/3FOT -twcbBIOXCGfDT6ed8d4dNum1L7k9Blju16CWkfuciL8PGXY4mGAmF4nZMXGZgK8B -Cz9cxhtvFLe8gz5615DtBAsuVm7Q4AAHiULAMg6t6auyxCb8pXbAL0Ec5X4zS3+f -I2riODYiyHCh/qTtjawOzUZZEtjZRMSDi+jk8wjjDdkFU8McOaYoPyqT3TDy2v6m -NiPJs8GWQ2NCNo9CNoGbEIIFFP5iSz18XLFAOF+2dN/KHHl9nKyi7kOhYbbzoNku -2wQV40yVsrS4E/hd/7+2IB2Muduxiu7NxCUSUXsw6p0hZTYMpIoduEfRSk1al0lS -862GD8JgJ4RhJ0uIOTDJS52MQmO8zFIL86emdjjV1CzVvadYSQLTX7ZgR0i8g46A -y0muCFAC8EJpnEtHzqtQ/z22zB8TCJShFuUK9KF6K8nOlbc6ShcUXU2J6r1sc8aT -Dx0yzRXfCL15fpCJBP49EYaKhArTNmFRa2GaLiJP0OYkTrrwVOGuS6x2+kRVoP/8 -BcNMZ5x8mXP1LgotHCztgMKX30Hn5CLxbH8QfcWKemGva1jBmhCWxS17Gh3Ld9T3 -/WKkBa6JDq83rlO84x/iF3mB3tYkZPfcYtYURn5wwm/BmVV/9G1VwAatJdxmfCSy -5JwC9WDBAoICAQD7xStPk3lq+qYHAtLZidujmzSNv7XG+E8UC9yvMRFuBwSM5ZE4 -YGD2LDev2nghB+7OSR8KJIkxeaNjP91Zf3s8wjCuxLg/cLGI6mf6uWy9+zypFg3i -J+ylDKa6NBuqYyY75W7Pj63xvGQlw5kX5+mB3ulQbActT4cUiVdEkyDytzubqLzY -s15QGFrL9gqLow+C+7LKQKdeXq8OavFV1PWkMDAJUki6cIir9m+f5Mqr2cQCLKgx -38aX8c9UWJv6pI5zQQuBjpaBOwz07WnyTXiFpc71x/8i85uLGDM0e3VO5ZPGeRBj -jZ0ucHatOHJ3i/nPRG16rsPR+q97QiDHoLF0quHEG+ND+rwTBzNGIwzYRE16p1o3 -UdzFk1RzlDCfOX7QgszCwK6mf8TbCK9f/FxJ5e6TCkt3iHXSrlLS4op6k9nEpKFH -KHf4nPtCy9GriP+A8+dA6K1s+DgejoIojBMBTsnl4TEf+m8BaenTXGuU7KYyc8dR -JqmpmDggDRT/ImHRhXirY7lIIYXnI7tRjN5gmnKpEiHScT1r848zpQ4gWH1Dx/ks -mKT6NZ8nF45saQCYbKEYc0RH9Kw0O7vr1kVtNPc2dEZtVgt4bC5fnl7xX1/YTk3m -+h1qfzbku/+MX5rRjHLR2l8a71UltlnnnpP5NKBBgtxll6aCIkk6CdH8YQKCAgEA -16aBaVa0cOZmiOQwPQkpuXIbV7msz1ttWEAHElCy6waniOCON89PYFCb7F0NjV3Q -i+pGaRgG1iZGbjjHwyqTrHhMloFm+IsSWZqOZzrHgSJgA4bgTJFgp+5b31sQXGfJ -14QQSqMJLC61/M+CnrNtiuI3IVHx6BFRxI42uE7PfTyUMaFhL9F0/SLl0Mw0oMPj -S5kmarduuKpRn1tN9WO+ywEvYwopvH3e9PBssZzPpttlLiE/Wulb0iEtlVXYB9DS -Vzc94N2dzFMIvWUDF9BQ+IBMRzXRm15Psy6LfzoK+9S6w38Dx3BVV8ykSMKeW1UR -ZwTajjdnIBLdE3onD5XMmrSOPw/WtV5zXEYY4DObhIPoN2iD8GJP0IubPb6fonH5 -VHmuVZoXrroFEe7rdt2wgmBdPPl6fqvBKVhjJOpYQctrFLgWh63bXZKaBWqbQM9W -fECq8We1VN3fzqwfwJQit3z5R/DjQNk8eQx7SnnkOzAY6ZgpysHCwaoPOnPVuiYF -ZU0+X3iwfsdeefWmGEDIzoZk6nYaljs61lOhhEoWHngZHDkMOp5kg0n9f8BUP02+ -WJ4QhwzZ73hr4FPBuPHHXECw9TCAgCBHBFrnrXg5QalDhRXz4F+3tCY7UUpD/ikZ -L6Daxm5zGJ5u3rXs6WwKy2EHVVS9zfqs4Q259pQdWM8CggIAcIKpGzOVM+h033c0 -kIBZxeAq+Rlt+0+lzxiJ80RjPJ8oOmqwndf8HKaf8BcaTfCEmGz20QqIwLJSAJ1e -posgoINLTB6fE8Kho8TU2KeaX7/xWMKBS8p5pzxjGZ0Fq/wI7wVVoq3blsaQnout -U5CQujfKXeUYw/fhLp09gWiadbzKh4I9ej2V7QclNDZsegBRg0BForqH0NVRN4k0 -9h1n9IqQPOonlCGMAgTr1zFgHLIBNNOOClOtJOOruk6qzbRR8FFl+eyld3TTEnUy -PlS+gkMZnJ5WduEUZnFXGKH/R1Wy1yPs3gA/+KvLbRdnl+LWrPgwUH3fBmwXlWZ0 -zaETDEb9Ay1PP2bCO2KhWDt7lv3W/fPhjg0oMqbnO4tCuzTvZfC93l5K7h708skL -zkIxX9i/57fXB8DUnmTGoHUaWzLNQ2IqrGj6TACjDDOXLCfZvl/AvTH9pk+6jHU0 -1zfZmmECOpeK43Z/ussA8jI/5Vpn3u38aVh0w1RB6JjQBD/yJLaXuUekWgaZFzTR -ldz014jNqp5uvONcBmzeVr7w9CV3PR4VTQed2i6yQ770J6A44uTQjOOd5OYDOohj -Lz4e4nGj9BK8Eko8cAEwLAzS8tyjMT+08n5dPOVCu68DwVBMGE7CVONYUuoXS/YU -cTxddiU9ZGk9Yq0FfOwjeys+SqECggIAdn3M2b6Egwx2Bn2ra74fKQBjub4SEBWi -bT0xJYUl6jHL2E/alRvZ94gTRLqUebq0nkxpx9El4IFDbcjRKpG4dqnbG0+a7rIr -sQRVfq8zc+cZbparpCa1P1CfNojo4n080KiF8xzGK3q3EGRM1zqr1AYcWLiX/PWX -QjMKKhdTtvKUUvjjV8z1RSnpsOKjgDpiJ+XM0BJeSiV7l94pZc4axZyvFvI8oI9g -9KEueCE7j+k5HTGziBZ1F26Xh1iVzSWWjcmSvH3I+L4fLUHVgz45X3HPd8lAlOgr -Tr8icxPHeTwYKtcdknZMzmNpWXlmXbTOTRbDqCUVCvCSfOM/lzauJ8tR5aCkTx/I -r0js3jQ9HYEFFXzeEjVSubob4L9fI3kQkLQTcIGsxZr8si/fPX7uP5UHZjuGbRee -mUMxptUFDZHiEo5cAs0qna2x54v+JoxGbxtxUhez8R/Am+TDxaMfuEZ5Cmh31egH -bFPJYtC68TKqXZ/4RqpUgukYWPvQ0emWSWU6AmdkQyT06nppeyYNsDz0MkgWr7l3 -yNBHDVNP+Anxcip+Z68kd2cuXQWmxOnIzxR67FnJXeWDEM20whRHgI8jLHYsBTq3 -CtOQPSaz/zosGXJIgF7Xp6riKPZvibW3Ww49Z47EuyBCtyirNk7hV4LG7sITUJyO -ZVKPfcdAoM0CggIBANz3EBZGyt3af2UjFFKbazV01KcHF8OxqdQzsLqHCXWb98V6 -PggQnrF76U7DvqOWho9djDBPrbQU55HG5nXq+eZKPwhsOdwQ8bxOhaVxQcATZOI7 -FtJYnjM1/+zMzzS0iPR5DA2pbB3AKH2Z+wODmF23CK2XTwoJyPKxvlyGKrIqq3gN -kOmocNu2Qm5bJf+D/hYPm5Ust2wzD52NnvJU536bZ0ZMo1/kaK2idqSAzqo4TkR1 -j9U0fdW2rIBDo/qFmBBdJhYVjYLj4qR8CEEoIjshD4Nztf1xRM5C8irE/gJcT5+r -4bPJJ5TjAtHxPiQqZruSprSEUbMsPqBap64ow0SmbNNWSgyaz2ha1rG0p52NBzH4 -XM52LBqS9QHPHvB0ooYfBTfPpDM3CePuuNyzjPAw86ncUo38FKXuc2oViJJ6C5I7 -v2sKhLK5gu3uPBB2ludDEXSpWBqiraynolOT/o52r+taYp9YY2WU3GrhOiV/A1FV -Nl118xiF6FOFpEeTbhHvy27A8kZEKXgeSs+f4aC0XG9kLVD1CiCbQiqHTDcDS4nV -O1N1eQxhP81X+YKE4Lgufh07REqYVwtCj2lQcMp73WDyfBLKTEFlmHusoqmT5JCH -X0BWNjk5Dn1g5h63/lQb+EjNRILBhDFYhrDRDQtw5p0/7IY3AcNKDUHv+XGn +MIISKAIBAAKCBAEAwI8iAyRZZ0YU1o9gCVgGB0XxeHFV8eq5MIrNwzy5v2VuGO2g +uMkZVm/EkBnIZQnb/7+CoQitAU9ao9Q9eH5LSgGkfeh7BT592LlVWGDWHM7oMmIs +GWDz7QWZbcl3By4RbQuax2g4Ruj6MYDf6Hnw8f2plMP6DfV4rEl+1Rf94e5E88cO +MDJdqRkl5LshHf48hEhA9Vj0vxOMhWi77PXdxjjRsHcfpo5PjeJvSXT1P5Bljpke +WZwctSYkxLHeHvuWZcQxFBpTuF5iiscE97Q2pK8HyCcG7d3m9Ixi8WVA0J+fqRTI +jot01mda0MlNNaHVezk6Qp/k0PTGDy5CMEtWsj1tji1YxWmZNUmVlZm2hykrMtFQ +CM0lFEhtEJmFYTxBJiFVzB/PrbAvuYnYTqAY/3Udtpd8xfqL3JMXhgpk1Ak11YM0 +bVxtxozNuezCk8bBt8wEbyLgB7/g2Zsv1aBQzPnwlYOP9DCDcpTXtUvazJ9UO414 +dwskbA/ClmGWL7hftXqreluXeqmtQIvy1saNgdmUYY+dA8W5EANog78EgcysvTSJ +6NSNQyDitqQRPRUqggzWOmqMYtSTvMOAvxu0Kwp6NPDNHoI/JQ/RBKgKBRmw1haD +Oa8LRX3LFH5NqqrCOahGOKu9qyq9NEN/2iXeK/tpO/47h/2YlHZKvwSjMeM6/28E ++vok5CqJ6Q6/RExyhYI8iUoDYwFBklPQgmBu2P+MorQaOyBtrnSSME5I41Gmy3OX +BhMDMiObfaLHOqmvl4xR7f76tLQao4f8z4yO5oAVA/3+fb2xdvFfswkrTE2nfLVy +sdbbOMBnpFS8hwmlOboafj90YK09S76UU/NkFsczNexBAJW23plionoomkVN+s2m +d/beWHJQyH1pONsHBITYTTn3UBNDri2vRaQqOVY8uLfYJqQ2ySOqqrhJCyG6nnor +f00pnw4AHrRepvpJ/o3ldFfYutmSLNKshB3ypqREHL+IQTJ+0cMvbrwPXRmmj3Qr +Z7rdqdtotc6dJUjfVAjQHU8uWyS8BQ/7WEb6AspTkynPECfCoBjQ9dS5PF7fjmz1 +fLm0VMw5Fl082pazw2zUcF3TMKemvW/dQbyo3kJgWZqFJQ0qRcMFtG56Sk3KjArl +bDS8IJttSsrKtqY6oNvDDiAaEht33csdf8MNDefB/ZbSx2iAmaDZijMho4uiWqd+ +JwYCf+1gETc0VBd/TZAUHmk3DbrwK/CjLWJ5yHao6sjnOx/GT8IM16zwd1Nd8FC0 +35sDyk1B4RiyJTCGHWPlZ7FTzWtOgxq5Xi0FFWvUjrGX/DEDV8u/J3/NXyd+Zuc8 +Fwm2ESpPM83rGtNv1RWLi85oa36aleV0fxdX2QIDAQABAoIEAGv5ltvmLQ/A93xc +x0BWEINRkBa2jrfpo9B5dOnuikWtza/Cx+X2NfQHFlSrcHhfr/JX5BsCb2iVo8DM +CXAgeX1VMHS9wQXuxciaHCZDnqxmxUNDU3EjsYQOKLusRcdL6M+Zuz/ny+7PQ0Qw +/N0yS46Wa9oUjon3RKRvTeSV4HIpFpcP3n/eLjDc/ielWuujnTGcBnjNWegvQROp +5/7221YElGh8U84kbK2l9DtfjwoGoTv11lPvOxXE/scg6em7r9j+y3p3TMzMeDtT +YBC6CA4Oa7GrWLJXROOKOQ0ddtvFNlUsZ02vG2QCbqU2y8mwJrJDI80qNbeKGel3 +SfwkssedtGoOOYHxNczwpyVNHVHrHuMPBe75gbo+5pFxVJ5ymCGWfbLJf73oVsqW +ZimoknvkozW4+mlVlcmo3X73IxTW2U4RlXthYdj9KXsBLRaKVCQJDc934eHWkXHU +GF2U2NonqOVd8YG/FmZQ2ig6EcW97hC6wnsWT2Uc7UNAE2RM4bY0xCUHaQiKTrEs +CI6wpbbTV+XhDu2HmL9G+fsuSIu0RoSOCmr5jQDAVwCNPXFgBgcIxbPZ/UCJ7RHj +GrWPBldAN8ip4osiA+B3XwBabcvwXP2fgBP/eLWN1St3q3tw5xpHpqCuhNuPSqsc +0ntz0oIdJyRR6fXWmRFex4kXQ597z5ozm0uyg8arV3HJFxDC3DI6kKfs86/oqMSW +l+9g+d4x6VrUOCTDk0bjN3T8HQ9ASfy9JVacqk6yuXX7a0WeeT+x9JsvFAjg2KmG +CJUtm5w5siItMDSPpcRE4hlfgh+M7ZKS3PFgH3vvwfPMbC/IC93QoSaFzRJMyobX +ei6PNwqJvL+HADlMfLmehE2w9ycp4Fe1Gw/NW0Ed1S6Ajo45hgXQJSIrzla6eglg +JPsPpQ8b+weZNQ8zvc0KvfRJmZKKEb9dHvFdi68I1kV8aapQsjrMOjwHC2pnCFh/ +axkVc7a59fKUs7L6nAJhCs2sSixTorZz5PvJ6mXhWu72TCzu+kThNnEORrlWPHQl +RFEAFpDDaGSzOMlhb92CWUMPyZU2qtzMzv4QGbP5YqTy121hXuT5OBKCF3eNLihV +aje16k0RMFqqW3Olbm7Mp2P1C6DuwzsUJBnNwB5JzhC79Po88zNAl2d1h+qysKU1 +jxF316nhpWJ2dGJ/sbJ+XpUMd/tVrNFQMA254GFfXycsfBoQOSY5d6GfRwKUDOou +xImbIzGUAaIYdsGKDuKtqs5S21JMJjJ/J5CwjLu9tbpP/jsp22KHCpraHAQCupSp ++SFwWI7tRUXzREuxJixfUOnJFQYOATnMFvvtk1d6v4xoPYCVEhHq8gHqJkTyTi3Y +BPVwT1UCggIBAOEy5gThTrEqSVFUcFJm9bJxtWZt/YhOIJWNNxeaxExHzy5hPpsw +fZXtN4MUCeMSWI4isgIujmltwgOHMjQqsJPISn/1gVrqLmrZ2PnFzko/WA8rMUfd +EUnOOpj2bKpChlRGHi76ZV4XGgoTXyO6mrVUcUgf3reSImdcdQ5IHa7J+lWhCQGb +neZIyDOk41LX1TxjcYkY7vuUgmbBYComXPm2UaY3HN4E/3ElXntj6PrlozL33A56 +z4UPfv2Vv9kl0ydkTJe/WcUN2htqLFCYygF2XLlwbv2SYDCT31PkJUORbScUM46A +DOhlxvLBFcpF+l0RtCtvnrKyFy9yZJKrcLh9x6xVChZ/aQqSptSHjll5IEcVm54Y +Z1TjWizCI4txnaBFV0UCLt1CZrllXnyIksZLS4/dVqUIKmkxPBQUpiD5dmgDcmPB +/LdWzS6k4MH3J3Y3tu3MNPHDwgUtnifSZrsWSYPK0F8J0dMU/mLaS9eOplAH7Eo1 +t7OrrImvitM6tUdErRYilIaoS/6YPmsPST5gY1N4n8Lf4sAE/tY8fwaWRpTVSrIw +CoFwLtHESUOhqfuAOdr1EkDfo/RQTUVdnmWZ+D0j3du8MmsMje4x3f2CjBDXqArl +gNnBQELDmrdif8KELNjlEpTIz0T7wEfquhVQ2dzhFpL7RLAgggD+oEBLAoICAQDa +5WOWrAtaI1cC5C7LFxM2qXTHGRttfAtVxuigJapLqNASJuu59GGRxsCVwhthbNFh +aCMSj+fZK7QNFkaoPwuZCEtzy0ErkVZzxYp3cP6b99mzGoCcuqiHiW5qhEkbxwdC +f3YEsSGqE6j8TPW8feiziqo8q+QPSudI9ngkH1gjgbIrTu9iaxKJcF2CwBxe5tfB +uFBNPIgJAaLPejRKQu17MAV2jDnBDIsZUZnm53IxQ+giIYUBay3cfC1KMJu/AnZ/ +CxETjgqqnzqdFW0b0o49Q6YQa6QXAiSjs+lL/BhjbdA5quVdFmA3CoASFQbihYfM +4vilUg7Y4wXfzS7DyBZdfppIn+HI8PPSMv/lfdsQXecl5TU1fBDPRWYPpTZqm1II +HDCkmGRKet/j4/oobabNRrJ6PJcxNjqeMVv/a72pypDRPIXzNxLb1BkfWDGfgu2R +YAdRNBSJSpdoHDZ+1VO2A+/8gz9Zuiv1WxoX7+u3pCAd+0vCfHiaXiFVc7fI8F+m +rtDmN5p3DD9l1+/v7yd+7eUezwxYecElw5E5MyAJRTYGrim8g7XvF/u9rXvH09VP +TeIE8oJ7XzrxCmtGIxlJs6FmgUbUblOyfPZDUqPnzlo8Ru1H2iKRo2FPiMfij8mh +H3wgFTnZpGDQjw/xop51bxVueXrmOeguS0wmk/8Z6wKCAgEA0y+bPApadJRWS1nn +N69sTBqMZfFR6Eh0ECts9criuTJCXZk+T+SqcTYTb+4T04k52Jk63Aby8HXIkuxv +LTK3gu86xkLiOvMP8o43Bwz0BvbeSuNThLQQ6Wjn1NiLUSOvu0pCNgYFl7YMalR+ +TRBK0y/MSDny762wa8Pt1iXVCDxLcY/h1UstSW8JqDzCHcdgJhCPwWTLgMxleZ1w +5DYzzM2oRjq67I49Sssjjo1ESD2fzUVZbY7IG11L1t1fG3F4UiGiHlCJC92Qo1Lv +Geoezj5EeHay70Mcx5F0xsRWGcZAWXx9WO5GrI39g1uFZro3Lp5SmsVDSwrt6UXa +gR0bSThTTw40tqJnTE34+6ff25JWrbLay+jQxm+q+fxZvwQeMNW2IHYKot4JXWVt +tVWSZzjnNJP6FCvTMfDFCYPPw26OFr7cwCaEKx7QriRazitMK3XWK6zsHalZwudj +wK50PpCJAnno7KdVySCP6v4ST6Rr3POBKJq1ml2tITWo96u/ooUJ2I83QAyFr8zw +BBBCvKdBnl6pW+P/TdmhbiEvcmrs59gaA34/6+DbV0Y++piZwswd9XML2iCgLZY8 +0IcZ6uf4PsXq4Yzcrz0HwM+tAXcyiPzkjstpCUxMShALgFxzuWOgdwpjYXnrviJk +0EyUkzbOCHBhbhcK9CyYHfyrJX8CggIAdWwgJC9eV5glkPN+9osGT4hPkI4zXGPy +YK03FNGfrL59/37JbRNfU6fen3dk4LpTB4Gpbserg6AiEfMlLBPF0O3WK+OYrhpk +2e3Z/YCr1Fb8fUt2Op0W0r4ycQlNfo0ho9ZkJNgwSuAJAm72U4rnTYjREYLT8DAq +KcWtZRM7YLCuNvU9DPqLExcn0n/juDT1AIIy8XvLLamnAM15R2znn/F+vL00Lg7g +f1B60pbNdwgKemSoyL4J+ADU+rtgkPJtRnFVU7walLSd6K4ZvZcRnmOvrZdQitcn +eHmGaLBvFMdPr9+w8mKScnQ7h3eoHdOrqYkIAQcn18jQ2eFjeLrY5IaJlPPPVs+K +u/OHuj/tR7ZXzMhL5skK62U6/qGNs1pmgts8bM8i3aFUgRdGlnFbzTpje5cNM+T3 +RO0NgNL3ByIW1Wc2I+YjQ7FfWKUi2YKOljGBO1pIue09kyevRBKDuVwbXMW7MhLg +idm5AaY+OGDeqbaoSUgkGgrsrr5IlI39gZi9jwG85qe3Spavq3ILKdfL1N8UrFGD +/xIN0TVPtilede7vjKTK79tZu8JYaDWGc+g/mo/M1wmawLrqGNGzOwoVRruKl2In +m9PU9wBZ1HuphDQ4DRdC/AU8qkGhmDOx4bDWEQ/R3KKFHNvhnamyfyR7xqt79gyS +NGNIElnJuskCggIARFaK6yAVmaL74Qu3iiELj8FU9Cw8kPP5HeWUfGxCjlegdH3R +FBtoQlDcQjYzO2uZR94Itg3yk3Dt+xbf7KxUsODwlgLj1UhV4eOXUDTosBFTrbTG +v9gnRVH0Eyu9tF+CMUcCXhq6tnIrQOVv1ozcdXfIpk9gvIbfh4rlo6X0iM8Xge2t +Vo7awq05t4wJBkO1xUtOaw9HabaszK/CU1iNV7cIBmaFF3AEP/KVfOs+kjubc9AF +mqC+LVVClvJPNzm1YA5JZlxmQ0u1xXFqZv0OMoibgY+gSzaiAQz3eKB6vEv4Xv4U +kaF9nEUTEjowpTE6uX9X0mGkXXT2wXmlTjosZFnxRX5IIrRNug30plRra5CNYPGp +3uTmD/D7Nzi1iYitJg3yhrTQmCWiJY3x4Z0xophLkio2nlJ9WoTKf1AwTIATY7fa +pX9bxEKldYXrYZNFlbqBPFgA/36v+JDVfMf2E9yRMCt0LAJ0HUM6zP0ngMv+S1TP +Pu6X0WXR9JeuoaF4uJSty/xwdpST/CkHflFLVsk5n3tNQfWGjqoTSOJMgL9NRY9e +Pc/OshHZHeCVFUSXtcf1pfmmBtT6FHX0L4cgVqA5xO8RYapnLDAFLXq2/dRv3NwW +W9CzZcZKh7jmJw4iSIY5IU1+ThgugWoxlkcmjs/egjBclL8BBfqRIwx/vOE= -----END RSA PRIVATE KEY----- === modified file 'mysql-test/t/openssl_1.test' --- a/mysql-test/t/openssl_1.test 2007-04-11 21:42:53 +0000 +++ b/mysql-test/t/openssl_1.test 2009-01-28 14:18:50 +0000 @@ -11,8 +11,8 @@ insert into t1 values (5); grant select on test.* to ssl_user1 at localhost require SSL; grant select on test.* to ssl_user2 at localhost require cipher "DHE-RSA-AES256-SHA"; -grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com"; -grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; +grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com"; +grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; grant select on test.* to ssl_user5 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx"; flush privileges; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mysql/F-10/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 23 Aug 2008 20:31:19 -0000 1.33 +++ .cvsignore 7 Mar 2009 20:14:55 -0000 1.34 @@ -1 +1 @@ -mysql-5.0.67.tar.gz +mysql-5.0.77.tar.gz mysql-testing.patch: Index: mysql-testing.patch =================================================================== RCS file: /cvs/pkgs/rpms/mysql/F-10/mysql-testing.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mysql-testing.patch 23 Aug 2008 20:31:19 -0000 1.11 +++ mysql-testing.patch 7 Mar 2009 20:14:55 -0000 1.12 @@ -9,9 +9,9 @@ without this, the build-time test works but the mysql-test RPM doesn't. -diff -Naur mysql-5.0.67.orig/Makefile.am mysql-5.0.67/Makefile.am ---- mysql-5.0.67.orig/Makefile.am 2008-08-04 08:18:47.000000000 -0400 -+++ mysql-5.0.67/Makefile.am 2008-08-23 13:49:56.000000000 -0400 +diff -Naur mysql-5.0.77.orig/Makefile.am mysql-5.0.77/Makefile.am +--- mysql-5.0.77.orig/Makefile.am 2009-01-29 16:41:18.000000000 -0500 ++++ mysql-5.0.77/Makefile.am 2009-03-07 12:45:59.000000000 -0500 @@ -127,11 +127,11 @@ test-ps: @@ -26,9 +26,9 @@ test: test-ns test-ps -diff -Naur mysql-5.0.67.orig/mysql-test/lib/mtr_process.pl mysql-5.0.67/mysql-test/lib/mtr_process.pl ---- mysql-5.0.67.orig/mysql-test/lib/mtr_process.pl 2008-08-04 08:32:17.000000000 -0400 -+++ mysql-5.0.67/mysql-test/lib/mtr_process.pl 2008-08-23 13:48:23.000000000 -0400 +diff -Naur mysql-5.0.77.orig/mysql-test/lib/mtr_process.pl mysql-5.0.77/mysql-test/lib/mtr_process.pl +--- mysql-5.0.77.orig/mysql-test/lib/mtr_process.pl 2009-01-29 17:38:31.000000000 -0500 ++++ mysql-5.0.77/mysql-test/lib/mtr_process.pl 2009-03-07 12:45:59.000000000 -0500 @@ -150,6 +150,9 @@ { # Child, redirect output and exec @@ -39,28 +39,28 @@ $SIG{INT}= 'DEFAULT'; # Parent do some stuff, we don't my $log_file_open_mode = '>'; -diff -Naur mysql-5.0.67.orig/mysql-test/mysql-test-run.pl mysql-5.0.67/mysql-test/mysql-test-run.pl ---- mysql-5.0.67.orig/mysql-test/mysql-test-run.pl 2008-08-04 08:19:21.000000000 -0400 -+++ mysql-5.0.67/mysql-test/mysql-test-run.pl 2008-08-23 13:48:23.000000000 -0400 -@@ -1510,13 +1510,15 @@ +diff -Naur mysql-5.0.77.orig/mysql-test/mysql-test-run.pl mysql-5.0.77/mysql-test/mysql-test-run.pl +--- mysql-5.0.77.orig/mysql-test/mysql-test-run.pl 2009-01-29 16:42:34.000000000 -0500 ++++ mysql-5.0.77/mysql-test/mysql-test-run.pl 2009-03-07 12:48:54.000000000 -0500 +@@ -1516,13 +1516,15 @@ $exe_ndbd= mtr_exe_maybe_exists("$ndb_path/src/kernel/ndbd", -- "$ndb_path/ndbd"); -+ "$ndb_path/ndbd", -+ "/usr/libexec/ndbd"); +- "$daemon_path/ndbd"); ++ "$daemon_path/ndbd", ++ "/usr/libexec/ndbd"); $exe_ndb_mgm= mtr_exe_maybe_exists("$ndb_path/src/mgmclient/ndb_mgm", "$ndb_path/ndb_mgm"); $exe_ndb_mgmd= mtr_exe_maybe_exists("$ndb_path/src/mgmsrv/ndb_mgmd", -- "$ndb_path/ndb_mgmd"); -+ "$ndb_path/ndb_mgmd", +- "$daemon_path/ndb_mgmd"); ++ "$daemon_path/ndb_mgmd", + "/usr/libexec/ndb_mgmd"); $exe_ndb_waiter= mtr_exe_maybe_exists("$ndb_path/tools/ndb_waiter", "$ndb_path/ndb_waiter"); -@@ -1617,7 +1619,8 @@ +@@ -1623,7 +1625,8 @@ # Look for mysql_fix_privilege_tables.sql script $file_mysql_fix_privilege_tables= mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql", @@ -70,7 +70,7 @@ if ( ! $opt_skip_ndbcluster and executable_setup_ndb()) { mtr_warning("Could not find all required ndb binaries, " . -@@ -4094,7 +4097,7 @@ +@@ -4103,7 +4106,7 @@ if ( defined $exe ) { Index: mysql.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysql/F-10/mysql.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- mysql.spec 1 Oct 2008 23:17:59 -0000 1.109 +++ mysql.spec 7 Mar 2009 20:14:55 -0000 1.110 @@ -1,6 +1,6 @@ Name: mysql -Version: 5.0.67 -Release: 2%{?dist} +Version: 5.0.77 +Release: 1%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases URL: http://www.mysql.com @@ -33,6 +33,7 @@ Patch10: mysql-bdb-open.patch Patch13: mysql-no-dbug.patch Patch15: mysql-stack-guard.patch +Patch16: mysql-expired-certs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gperf, perl, readline-devel, openssl-devel @@ -178,6 +179,7 @@ %patch10 -p1 %patch13 -p1 %patch15 -p1 +%patch16 -p1 libtoolize --force aclocal @@ -519,6 +521,7 @@ %{_mandir}/man1/mysqlbug.1* %{_mandir}/man1/mysqlbinlog.1* %{_mandir}/man1/mysqlcheck.1* +%{_mandir}/man1/mysqldumpslow.1* %{_mandir}/man1/mysqld_multi.1* %{_mandir}/man1/mysqld_safe.1* %{_mandir}/man1/mysqlhotcopy.1* @@ -533,8 +536,6 @@ %{_mandir}/man1/resolveip.1* %{_mandir}/man1/safe_mysqld.1* %{_mandir}/man1/mysql_tzinfo_to_sql.1* -%{_mandir}/man1/mysqlmanager-pwgen.1* -%{_mandir}/man1/mysqlmanagerc.1* %{_mandir}/man8/mysqld.8* %{_mandir}/man8/mysqlmanager.8* @@ -627,6 +628,12 @@ %{_mandir}/man1/mysql_client_test.1* %changelog +* Sat Mar 7 2009 Tom Lane 5.0.77-1 +- Update to mysql version 5.0.77, for various fixes described at + http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-77.html +- Insert non-expired SSL certificates so regression tests still work +Resolves: #489098 + * Wed Oct 1 2008 Tom Lane 5.0.67-2 - Build the "embedded server" library, and package it in a new sub-RPM mysql-embedded, along with mysql-embedded-devel for devel support files. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mysql/F-10/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 23 Aug 2008 20:31:19 -0000 1.33 +++ sources 7 Mar 2009 20:14:55 -0000 1.34 @@ -1 +1 @@ -7164483a5ffb8f7aa59b761c13cdbd6e mysql-5.0.67.tar.gz +6c30a20c9059daf053a301e927eb1667 mysql-5.0.77.tar.gz From mclasen at fedoraproject.org Sat Mar 7 20:19:21 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Sat, 7 Mar 2009 20:19:21 +0000 (UTC) Subject: rpms/libxklavier/devel xkbcomp-spew.patch, NONE, 1.1 libxklavier.spec, 1.46, 1.47 Message-ID: <20090307201921.2947C70116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/libxklavier/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3269 Modified Files: libxklavier.spec Added Files: xkbcomp-spew.patch Log Message: Suppress xkbcomp spew xkbcomp-spew.patch: --- NEW FILE xkbcomp-spew.patch --- diff -up libxklavier-3.8/libxklavier/xklavier_config_xkb.c.warn-spew libxklavier-3.8/libxklavier/xklavier_config_xkb.c --- libxklavier-3.8/libxklavier/xklavier_config_xkb.c.warn-spew 2009-03-07 15:11:15.940524703 -0500 +++ libxklavier-3.8/libxklavier/xklavier_config_xkb.c 2009-03-07 15:14:27.436489725 -0500 @@ -243,11 +243,11 @@ xkl_config_get_keyboard(XklEngine * engi case 0: /* child */ xkl_debug(160, "Executing %s\n", XKBCOMP); - xkl_debug(160, "%s %s %s %s %s %s %s\n", - XKBCOMP, XKBCOMP, "-I", + xkl_debug(160, "%s %s %s %s %s %s %s %s\n", + XKBCOMP, XKBCOMP, "-w0", "-I", "-I" XKB_BASE, "-xkm", xkb_fn, xkm_fn); - execl(XKBCOMP, XKBCOMP, "-I", + execl(XKBCOMP, XKBCOMP, "-w0", "-I", "-I" XKB_BASE, "-xkm", xkb_fn, xkm_fn, NULL); xkl_debug(0, "Could not exec %s: %d\n", Index: libxklavier.spec =================================================================== RCS file: /cvs/pkgs/rpms/libxklavier/devel/libxklavier.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- libxklavier.spec 25 Feb 2009 20:07:31 -0000 1.46 +++ libxklavier.spec 7 Mar 2009 20:18:50 -0000 1.47 @@ -1,7 +1,7 @@ Summary: High-level API for X Keyboard Extension Name: libxklavier Version: 3.8 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://gswitchit.sourceforge.net/ @@ -18,6 +18,7 @@ # https://bugs.freedesktop.org/show_bug.cgi?id=17651 Patch0: sax-leak.patch +Patch1: xkbcomp-spew.patch %description libxklavier is a library providing a high-level API for the X Keyboard @@ -40,6 +41,7 @@ %prep %setup -q %patch0 -p1 -b .sax-leak +%patch1 -p1 -b .xkbcomp-spew %build @@ -75,6 +77,9 @@ %{_datadir}/gtk-doc/html/libxklavier/ %changelog +* Sat Mar 7 2009 Matthias Clasen - 3.8-4 +- Suppress xkbcomp spew in .xsession-errors + * Wed Feb 25 2009 Fedora Release Engineering - 3.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pghmcfc at fedoraproject.org Sat Mar 7 20:31:42 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Sat, 7 Mar 2009 20:31:42 +0000 (UTC) Subject: rpms/perl-Digest-MD4/devel perl-Digest-MD4.spec,1.8,1.9 Message-ID: <20090307203142.1336E70116@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-Digest-MD4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5712 Modified Files: perl-Digest-MD4.spec Log Message: Filter out unwanted provides for perl shared objects Index: perl-Digest-MD4.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Digest-MD4/devel/perl-Digest-MD4.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Digest-MD4.spec 26 Feb 2009 15:23:33 -0000 1.8 +++ perl-Digest-MD4.spec 7 Mar 2009 20:31:11 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-Digest-MD4 Version: 1.5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Perl interface to the MD4 Algorithm Group: Development/Libraries License: GPL+ or Artistic @@ -10,6 +10,12 @@ BuildRequires: perl(ExtUtils::MakeMaker), db4-devel, gdbm-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# don't "provide" private Perl libs +%global _use_internal_dependency_generator 0 +%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u +%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}" +%global __find_requires /bin/sh -c "%{__deploop R}" + %description The Digest::MD4 module allows you to use the RSA Data Security Inc. MD4 Message Digest algorithm from within Perl programs. The algorithm takes as input a @@ -28,7 +34,7 @@ %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot} /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';' /usr/bin/find %{buildroot} -type f -name '*.bs' -empty -exec %{__rm} -f {} ';' -/usr/bin/find %{buildroot} -depth -type d -exec %{__rmdir} {} 2>/dev/null ';' +/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';' %{__chmod} -R u+w %{buildroot}/* %check @@ -45,6 +51,9 @@ %{_mandir}/man3/*.3pm* %changelog +* Sat Mar 7 2009 Paul Howarth - 1.5-8 +- Filter out unwanted provides for perl shared objects + * Thu Feb 26 2009 Fedora Release Engineering - 1.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From robert at fedoraproject.org Sat Mar 7 20:34:53 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sat, 7 Mar 2009 20:34:53 +0000 (UTC) Subject: rpms/ethtool/devel .cvsignore, 1.11, 1.12 ethtool-6-help_usage.patch, 1.1, 1.2 ethtool.spec, 1.21, 1.22 sources, 1.11, 1.12 ethtool-6-man_pages.patch, 1.1, NONE Message-ID: <20090307203453.30B1D70116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/ethtool/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6452 Modified Files: .cvsignore ethtool-6-help_usage.patch ethtool.spec sources Removed Files: ethtool-6-man_pages.patch Log Message: Upgrade to GIT 20090306 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ethtool/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 17 Jan 2009 13:20:13 -0000 1.11 +++ .cvsignore 7 Mar 2009 20:34:22 -0000 1.12 @@ -1,2 +1 @@ ethtool-6.tar.gz -gpl-2.0.txt ethtool-6-help_usage.patch: Index: ethtool-6-help_usage.patch =================================================================== RCS file: /cvs/pkgs/rpms/ethtool/devel/ethtool-6-help_usage.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ethtool-6-help_usage.patch 17 Jan 2009 13:20:13 -0000 1.1 +++ ethtool-6-help_usage.patch 7 Mar 2009 20:34:22 -0000 1.2 @@ -2,16 +2,16 @@ the bogus -h/--help usage stating, that DEVNAME is required for help. For further information, please have a look to Red Hat Bugzilla ID #472038. ---- ethtool-6/ethtool.c 2009-01-15 23:14:44.000000000 +0100 -+++ ethtool-6/ethtool.c.help_usage 2009-01-15 23:59:20.000000000 +0100 -@@ -201,8 +201,9 @@ +--- ethtool-6/ethtool.c 2009-03-07 21:10:41.000000000 +0100 ++++ ethtool-6/ethtool.c.help_usage 2009-03-07 21:19:40.000000000 +0100 +@@ -213,8 +213,9 @@ "Usage:\n" "ethtool DEVNAME\tDisplay standard information about device\n"); - for (i = 0; args[i].srt; i++) { -- fprintf(stderr, " ethtool %s|%s DEVNAME\t%s\n%s", -+ fprintf(stderr, " ethtool %s|%s %s\t%s\n%s", - args[i].srt, args[i].lng, -+ strstr(args[i].srt, "-h") ? "\t" : "DEVNAME", - args[i].help, - args[i].opthelp ? args[i].opthelp : ""); - } + for (i = 0; args[i].srt; i++) { +- fprintf(stdout, " ethtool %s|%s DEVNAME\t%s\n%s", ++ fprintf(stdout, " ethtool %s|%s %s\t%s\n%s", + args[i].srt, args[i].lng, ++ strstr(args[i].srt, "-h") ? "\t" : "DEVNAME", + args[i].help, + args[i].opthelp ? args[i].opthelp : ""); + } Index: ethtool.spec =================================================================== RCS file: /cvs/pkgs/rpms/ethtool/devel/ethtool.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ethtool.spec 23 Feb 2009 20:20:30 -0000 1.21 +++ ethtool.spec 7 Mar 2009 20:34:22 -0000 1.22 @@ -1,7 +1,7 @@ Summary: Ethernet settings tool for PCI ethernet cards Name: ethtool Version: 6 -Release: 3.20090115git%{?dist} +Release: 4.20090306git%{?dist} License: GPLv2 Group: Applications/System URL: http://sourceforge.net/projects/gkernel/ @@ -10,14 +10,12 @@ # # When generating tarball package from upstream git: # - git clone git://git.kernel.org/pub/scm/network/ethtool/ethtool.git ethtool-6 -# - cd ethtool-6; git checkout 2c4bd1c0c4d8112c16f9143da69c03d02ac3b1ae +# - cd ethtool-6; git checkout 7336e8a6a587802ca72dcf5f509696d96b9d6f23 # - cp -f ChangeLog ChangeLog.old; git log > ChangeLog.git # - rm -rf .git; cd ..; tar cvfz ethtool-6.tar.gz ethtool-6 # - Use the visible date of latest git log entry for %{release} in spec file Source0: %{name}-%{version}.tar.gz -Source1: http://www.gnu.org/licenses/gpl-2.0.txt -Patch0: ethtool-6-man_pages.patch -Patch1: ethtool-6-help_usage.patch +Patch0: ethtool-6-help_usage.patch BuildRequires: automake, autoconf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,8 +26,7 @@ %prep %setup -q -%patch0 -p1 -b .man_pages -%patch1 -p1 -b .help_usage +%patch0 -p1 -b .help_usage # Only needed when using upstream git aclocal @@ -37,9 +34,6 @@ automake --gnu --add-missing --copy autoconf -# Replace GPLvX from automake by GPLv2 -cp -f %{SOURCE1} COPYING - %build %configure --sbindir=/sbin make %{?_smp_mflags} @@ -63,6 +57,9 @@ %{_mandir}/man8/%{name}.8* %changelog +* Sat Mar 07 2009 Robert Scheck 6-4.20090306git +- Upgrade to GIT 20090306 + * Mon Feb 23 2009 Robert Scheck 6-3.20090115git - Rebuild for gcc 4.4 and rpm 4.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ethtool/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 17 Jan 2009 13:20:13 -0000 1.11 +++ sources 7 Mar 2009 20:34:22 -0000 1.12 @@ -1,2 +1 @@ -462e8eb1a18a05007e183ebeed65bfd5 ethtool-6.tar.gz -751419260aa954499f7abaabaa882bbe gpl-2.0.txt +efaf447b8bb746f7d989ed6a933b18b1 ethtool-6.tar.gz --- ethtool-6-man_pages.patch DELETED --- From cweyl at fedoraproject.org Sat Mar 7 20:38:28 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 7 Mar 2009 20:38:28 +0000 (UTC) Subject: rpms/perl-App-Cache/devel import.log, NONE, 1.1 perl-App-Cache.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307203828.D081F70116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-App-Cache/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7359/devel Modified Files: .cvsignore sources Added Files: import.log perl-App-Cache.spec Log Message: initial import --- NEW FILE import.log --- perl-App-Cache-0_35-1_fc10:HEAD:perl-App-Cache-0.35-1.fc10.src.rpm:1236458267 --- NEW FILE perl-App-Cache.spec --- Name: perl-App-Cache Version: 0.35 Release: 1%{?dist} # lib/App/Cache.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Easy application-level caching Source: http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/App-Cache-%{version}.tar.gz Url: http://search.cpan.org/dist/App-Cache BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Class::Accessor::Chained::Fast) BuildRequires: perl(File::Find::Rule) BuildRequires: perl(File::HomeDir) BuildRequires: perl(File::stat) BuildRequires: perl(HTTP::Cookies) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(Path::Class) BuildRequires: perl(Storable) # testing BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) # 'use base' strikes again... Requires: perl(Class::Accessor::Chained::Fast) %description The App::Cache module lets an application cache data locally. There are a few times an application would need to cache data: when it is retrieving information from the network or when it has to complete a large calculation. For example, the Parse::BACKPAN::Packages module downloads a file off the net and parses it, creating a data structure. Only then can it actually provide any useful information for the programmer. Parse::BACKPAN::Packages uses App::Cache to cache both the file download and data structures, providing much faster use when the data is cached. This module stores data in the home directory of the user, in a dot directory. For example, the Parse::BACKPAN::Packages cache is actually stored underneath "~/.parse_backpan_packages/cache/". This is so that permisssions are not a problem -- it is a per-user, per-application cache. %prep %setup -q -n App-Cache-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Mar 05 2009 Chris Weyl 0.35-1 - submission * Thu Mar 05 2009 Chris Weyl 0.35-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-App-Cache/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:39:00 -0000 1.1 +++ .cvsignore 7 Mar 2009 20:37:58 -0000 1.2 @@ -0,0 +1 @@ +App-Cache-0.35.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-App-Cache/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:39:00 -0000 1.1 +++ sources 7 Mar 2009 20:37:58 -0000 1.2 @@ -0,0 +1 @@ +3483ed94401531d16ceab63d57b8da6e App-Cache-0.35.tar.gz From cweyl at fedoraproject.org Sat Mar 7 20:39:15 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 7 Mar 2009 20:39:15 +0000 (UTC) Subject: rpms/perl-App-Cache/F-10 import.log, NONE, 1.1 perl-App-Cache.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307203915.3E72070116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-App-Cache/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7689/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-App-Cache.spec Log Message: initial import --- NEW FILE import.log --- perl-App-Cache-0_35-1_fc10:F-10:perl-App-Cache-0.35-1.fc10.src.rpm:1236458313 --- NEW FILE perl-App-Cache.spec --- Name: perl-App-Cache Version: 0.35 Release: 1%{?dist} # lib/App/Cache.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Easy application-level caching Source: http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/App-Cache-%{version}.tar.gz Url: http://search.cpan.org/dist/App-Cache BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Class::Accessor::Chained::Fast) BuildRequires: perl(File::Find::Rule) BuildRequires: perl(File::HomeDir) BuildRequires: perl(File::stat) BuildRequires: perl(HTTP::Cookies) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(Path::Class) BuildRequires: perl(Storable) # testing BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) # 'use base' strikes again... Requires: perl(Class::Accessor::Chained::Fast) %description The App::Cache module lets an application cache data locally. There are a few times an application would need to cache data: when it is retrieving information from the network or when it has to complete a large calculation. For example, the Parse::BACKPAN::Packages module downloads a file off the net and parses it, creating a data structure. Only then can it actually provide any useful information for the programmer. Parse::BACKPAN::Packages uses App::Cache to cache both the file download and data structures, providing much faster use when the data is cached. This module stores data in the home directory of the user, in a dot directory. For example, the Parse::BACKPAN::Packages cache is actually stored underneath "~/.parse_backpan_packages/cache/". This is so that permisssions are not a problem -- it is a per-user, per-application cache. %prep %setup -q -n App-Cache-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Mar 05 2009 Chris Weyl 0.35-1 - submission * Thu Mar 05 2009 Chris Weyl 0.35-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-App-Cache/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:39:00 -0000 1.1 +++ .cvsignore 7 Mar 2009 20:38:44 -0000 1.2 @@ -0,0 +1 @@ +App-Cache-0.35.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-App-Cache/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:39:00 -0000 1.1 +++ sources 7 Mar 2009 20:38:44 -0000 1.2 @@ -0,0 +1 @@ +3483ed94401531d16ceab63d57b8da6e App-Cache-0.35.tar.gz From cweyl at fedoraproject.org Sat Mar 7 20:39:31 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 7 Mar 2009 20:39:31 +0000 (UTC) Subject: rpms/perl-IPC-System-Simple/devel import.log, NONE, 1.1 perl-IPC-System-Simple.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307203931.723D670116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-IPC-System-Simple/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7924/devel Modified Files: .cvsignore sources Added Files: import.log perl-IPC-System-Simple.spec Log Message: initial import --- NEW FILE import.log --- perl-IPC-System-Simple-1_18-1_fc10:HEAD:perl-IPC-System-Simple-1.18-1.fc10.src.rpm:1236458330 --- NEW FILE perl-IPC-System-Simple.spec --- Name: perl-IPC-System-Simple Version: 1.18 Release: 1%{?dist} # lib/IPC/System/Simple.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Run commands simply, with detailed diagnostics Source: http://search.cpan.org/CPAN/authors/id/P/PJ/PJF/IPC-System-Simple-%{version}.tar.gz Url: http://search.cpan.org/dist/IPC-System-Simple BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 BuildRequires: perl(Config) BuildRequires: perl(File::Basename) BuildRequires: perl(File::Spec) BuildRequires: perl(List::Util) BuildRequires: perl(Scalar::Util) # testing BuildRequires: perl(BSD::Resource) BuildRequires: perl(Test) BuildRequires: perl(Test::More) BuildRequires: perl(Test::NoWarnings) # These are explicitly marked as AUTHOR_TESTS, and we skip those. #BuildRequires: perl(Test::Pod) #BuildRequires: perl(Test::Pod::Coverage) %description Calling Perl's in-built 'system()' function is easy, determining if it was successful is _hard_. Let's face it, '$?' isn't the nicest variable in the world to play with, and even if you _do_ check it, producing a well-formatted error string takes a lot of work. 'IPC::System::Simple' takes the hard work out of calling external commands. In fact, if you want to be really lazy, you can just write: use IPC::System::Simple qw(system); and all of your "system" commands will either succeeed (run to completion and return a zero exit value), or die with rich diagnostic messages. %prep %setup -q -n IPC-System-Simple-%{version} find . -type f -exec chmod -x {} \; %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes LICENSE README examples/ %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Mar 05 2009 Chris Weyl 1.18-1 - submission * Thu Mar 05 2009 Chris Weyl 1.18-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-System-Simple/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:36:48 -0000 1.1 +++ .cvsignore 7 Mar 2009 20:39:01 -0000 1.2 @@ -0,0 +1 @@ +IPC-System-Simple-1.18.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-System-Simple/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:36:48 -0000 1.1 +++ sources 7 Mar 2009 20:39:01 -0000 1.2 @@ -0,0 +1 @@ +deb1df36a184a6a5af0716f1acb8c70f IPC-System-Simple-1.18.tar.gz From cweyl at fedoraproject.org Sat Mar 7 20:40:01 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 7 Mar 2009 20:40:01 +0000 (UTC) Subject: rpms/perl-App-Cache/F-9 import.log, NONE, 1.1 perl-App-Cache.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307204001.3E5B970116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-App-Cache/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8273/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-App-Cache.spec Log Message: initial import --- NEW FILE import.log --- perl-App-Cache-0_35-1_fc10:F-9:perl-App-Cache-0.35-1.fc10.src.rpm:1236458360 --- NEW FILE perl-App-Cache.spec --- Name: perl-App-Cache Version: 0.35 Release: 1%{?dist} # lib/App/Cache.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Easy application-level caching Source: http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/App-Cache-%{version}.tar.gz Url: http://search.cpan.org/dist/App-Cache BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Class::Accessor::Chained::Fast) BuildRequires: perl(File::Find::Rule) BuildRequires: perl(File::HomeDir) BuildRequires: perl(File::stat) BuildRequires: perl(HTTP::Cookies) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(Path::Class) BuildRequires: perl(Storable) # testing BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) # 'use base' strikes again... Requires: perl(Class::Accessor::Chained::Fast) %description The App::Cache module lets an application cache data locally. There are a few times an application would need to cache data: when it is retrieving information from the network or when it has to complete a large calculation. For example, the Parse::BACKPAN::Packages module downloads a file off the net and parses it, creating a data structure. Only then can it actually provide any useful information for the programmer. Parse::BACKPAN::Packages uses App::Cache to cache both the file download and data structures, providing much faster use when the data is cached. This module stores data in the home directory of the user, in a dot directory. For example, the Parse::BACKPAN::Packages cache is actually stored underneath "~/.parse_backpan_packages/cache/". This is so that permisssions are not a problem -- it is a per-user, per-application cache. %prep %setup -q -n App-Cache-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Mar 05 2009 Chris Weyl 0.35-1 - submission * Thu Mar 05 2009 Chris Weyl 0.35-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-App-Cache/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:39:00 -0000 1.1 +++ .cvsignore 7 Mar 2009 20:39:30 -0000 1.2 @@ -0,0 +1 @@ +App-Cache-0.35.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-App-Cache/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:39:00 -0000 1.1 +++ sources 7 Mar 2009 20:39:30 -0000 1.2 @@ -0,0 +1 @@ +3483ed94401531d16ceab63d57b8da6e App-Cache-0.35.tar.gz From cweyl at fedoraproject.org Sat Mar 7 20:40:16 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 7 Mar 2009 20:40:16 +0000 (UTC) Subject: rpms/perl-IPC-System-Simple/F-10 import.log, NONE, 1.1 perl-IPC-System-Simple.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307204016.DFC9D70116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-IPC-System-Simple/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8498/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-IPC-System-Simple.spec Log Message: initial import --- NEW FILE import.log --- perl-IPC-System-Simple-1_18-1_fc10:F-10:perl-IPC-System-Simple-1.18-1.fc10.src.rpm:1236458376 --- NEW FILE perl-IPC-System-Simple.spec --- Name: perl-IPC-System-Simple Version: 1.18 Release: 1%{?dist} # lib/IPC/System/Simple.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Run commands simply, with detailed diagnostics Source: http://search.cpan.org/CPAN/authors/id/P/PJ/PJF/IPC-System-Simple-%{version}.tar.gz Url: http://search.cpan.org/dist/IPC-System-Simple BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 BuildRequires: perl(Config) BuildRequires: perl(File::Basename) BuildRequires: perl(File::Spec) BuildRequires: perl(List::Util) BuildRequires: perl(Scalar::Util) # testing BuildRequires: perl(BSD::Resource) BuildRequires: perl(Test) BuildRequires: perl(Test::More) BuildRequires: perl(Test::NoWarnings) # These are explicitly marked as AUTHOR_TESTS, and we skip those. #BuildRequires: perl(Test::Pod) #BuildRequires: perl(Test::Pod::Coverage) %description Calling Perl's in-built 'system()' function is easy, determining if it was successful is _hard_. Let's face it, '$?' isn't the nicest variable in the world to play with, and even if you _do_ check it, producing a well-formatted error string takes a lot of work. 'IPC::System::Simple' takes the hard work out of calling external commands. In fact, if you want to be really lazy, you can just write: use IPC::System::Simple qw(system); and all of your "system" commands will either succeeed (run to completion and return a zero exit value), or die with rich diagnostic messages. %prep %setup -q -n IPC-System-Simple-%{version} find . -type f -exec chmod -x {} \; %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes LICENSE README examples/ %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Mar 05 2009 Chris Weyl 1.18-1 - submission * Thu Mar 05 2009 Chris Weyl 1.18-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-System-Simple/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:36:48 -0000 1.1 +++ .cvsignore 7 Mar 2009 20:39:46 -0000 1.2 @@ -0,0 +1 @@ +IPC-System-Simple-1.18.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-System-Simple/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:36:48 -0000 1.1 +++ sources 7 Mar 2009 20:39:46 -0000 1.2 @@ -0,0 +1 @@ +deb1df36a184a6a5af0716f1acb8c70f IPC-System-Simple-1.18.tar.gz From cweyl at fedoraproject.org Sat Mar 7 20:41:03 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 7 Mar 2009 20:41:03 +0000 (UTC) Subject: rpms/perl-IPC-System-Simple/F-9 import.log, NONE, 1.1 perl-IPC-System-Simple.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307204103.869C970116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-IPC-System-Simple/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8866/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-IPC-System-Simple.spec Log Message: initial import --- NEW FILE import.log --- perl-IPC-System-Simple-1_18-1_fc10:F-9:perl-IPC-System-Simple-1.18-1.fc10.src.rpm:1236458422 --- NEW FILE perl-IPC-System-Simple.spec --- Name: perl-IPC-System-Simple Version: 1.18 Release: 1%{?dist} # lib/IPC/System/Simple.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Run commands simply, with detailed diagnostics Source: http://search.cpan.org/CPAN/authors/id/P/PJ/PJF/IPC-System-Simple-%{version}.tar.gz Url: http://search.cpan.org/dist/IPC-System-Simple BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 BuildRequires: perl(Config) BuildRequires: perl(File::Basename) BuildRequires: perl(File::Spec) BuildRequires: perl(List::Util) BuildRequires: perl(Scalar::Util) # testing BuildRequires: perl(BSD::Resource) BuildRequires: perl(Test) BuildRequires: perl(Test::More) BuildRequires: perl(Test::NoWarnings) # These are explicitly marked as AUTHOR_TESTS, and we skip those. #BuildRequires: perl(Test::Pod) #BuildRequires: perl(Test::Pod::Coverage) %description Calling Perl's in-built 'system()' function is easy, determining if it was successful is _hard_. Let's face it, '$?' isn't the nicest variable in the world to play with, and even if you _do_ check it, producing a well-formatted error string takes a lot of work. 'IPC::System::Simple' takes the hard work out of calling external commands. In fact, if you want to be really lazy, you can just write: use IPC::System::Simple qw(system); and all of your "system" commands will either succeeed (run to completion and return a zero exit value), or die with rich diagnostic messages. %prep %setup -q -n IPC-System-Simple-%{version} find . -type f -exec chmod -x {} \; %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes LICENSE README examples/ %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Mar 05 2009 Chris Weyl 1.18-1 - submission * Thu Mar 05 2009 Chris Weyl 1.18-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-System-Simple/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:36:48 -0000 1.1 +++ .cvsignore 7 Mar 2009 20:40:33 -0000 1.2 @@ -0,0 +1 @@ +IPC-System-Simple-1.18.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-System-Simple/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:36:48 -0000 1.1 +++ sources 7 Mar 2009 20:40:33 -0000 1.2 @@ -0,0 +1 @@ +deb1df36a184a6a5af0716f1acb8c70f IPC-System-Simple-1.18.tar.gz From cweyl at fedoraproject.org Sat Mar 7 20:55:15 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 7 Mar 2009 20:55:15 +0000 (UTC) Subject: rpms/perl-Hash-Merge-Simple/devel import.log, NONE, 1.1 perl-Hash-Merge-Simple.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307205515.3900870116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Hash-Merge-Simple/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11887/devel Modified Files: .cvsignore sources Added Files: import.log perl-Hash-Merge-Simple.spec Log Message: initial import --- NEW FILE import.log --- perl-Hash-Merge-Simple-0_04-1_fc10:HEAD:perl-Hash-Merge-Simple-0.04-1.fc10.src.rpm:1236459272 --- NEW FILE perl-Hash-Merge-Simple.spec --- Name: perl-Hash-Merge-Simple Version: 0.04 Release: 1%{?dist} # lib/Hash/Merge/Simple.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Recursively merge two or more hashes, simply Source: http://search.cpan.org/CPAN/authors/id/R/RK/RKRIMEN/Hash-Merge-Simple-%{version}.tar.gz Url: http://search.cpan.org/dist/Hash-Merge-Simple BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 BuildRequires: perl(Test::Deep) BuildRequires: perl(Test::More) %description Hash::Merge::Simple will recursively merge two or more hashes and return the result as a new hash reference. The merge function will descend and merge hashes that exist under the same node in both the left and right hash, but doesn't attempt to combine arrays, objects, scalars, or anything else. The rightmost hash also takes precedence, replacing whatever was in the left hash if a conflict occurs. This code was pretty much taken straight from Catalyst::Utils, and modified to handle more than 2 hashes at the same time. %prep %setup -q -n Hash-Merge-Simple-%{version} perl -pi -e 's/Test::Most/Test::More/g' `find . -type f` %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Mar 05 2009 Chris Weyl 0.04-1 - submission * Thu Mar 05 2009 Chris Weyl 0.04-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Hash-Merge-Simple/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:34:00 -0000 1.1 +++ .cvsignore 7 Mar 2009 20:54:44 -0000 1.2 @@ -0,0 +1 @@ +Hash-Merge-Simple-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Hash-Merge-Simple/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:34:00 -0000 1.1 +++ sources 7 Mar 2009 20:54:44 -0000 1.2 @@ -0,0 +1 @@ +977b6f679977e720ea70cef6acd00b47 Hash-Merge-Simple-0.04.tar.gz From cweyl at fedoraproject.org Sat Mar 7 20:56:02 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 7 Mar 2009 20:56:02 +0000 (UTC) Subject: rpms/perl-Hash-Merge-Simple/F-10 import.log, NONE, 1.1 perl-Hash-Merge-Simple.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307205602.2F13870116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Hash-Merge-Simple/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12257/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-Hash-Merge-Simple.spec Log Message: initial import --- NEW FILE import.log --- perl-Hash-Merge-Simple-0_04-1_fc10:F-10:perl-Hash-Merge-Simple-0.04-1.fc10.src.rpm:1236459321 --- NEW FILE perl-Hash-Merge-Simple.spec --- Name: perl-Hash-Merge-Simple Version: 0.04 Release: 1%{?dist} # lib/Hash/Merge/Simple.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Recursively merge two or more hashes, simply Source: http://search.cpan.org/CPAN/authors/id/R/RK/RKRIMEN/Hash-Merge-Simple-%{version}.tar.gz Url: http://search.cpan.org/dist/Hash-Merge-Simple BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 BuildRequires: perl(Test::Deep) BuildRequires: perl(Test::More) %description Hash::Merge::Simple will recursively merge two or more hashes and return the result as a new hash reference. The merge function will descend and merge hashes that exist under the same node in both the left and right hash, but doesn't attempt to combine arrays, objects, scalars, or anything else. The rightmost hash also takes precedence, replacing whatever was in the left hash if a conflict occurs. This code was pretty much taken straight from Catalyst::Utils, and modified to handle more than 2 hashes at the same time. %prep %setup -q -n Hash-Merge-Simple-%{version} perl -pi -e 's/Test::Most/Test::More/g' `find . -type f` %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Mar 05 2009 Chris Weyl 0.04-1 - submission * Thu Mar 05 2009 Chris Weyl 0.04-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Hash-Merge-Simple/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:34:00 -0000 1.1 +++ .cvsignore 7 Mar 2009 20:55:31 -0000 1.2 @@ -0,0 +1 @@ +Hash-Merge-Simple-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Hash-Merge-Simple/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:34:00 -0000 1.1 +++ sources 7 Mar 2009 20:55:31 -0000 1.2 @@ -0,0 +1 @@ +977b6f679977e720ea70cef6acd00b47 Hash-Merge-Simple-0.04.tar.gz From cweyl at fedoraproject.org Sat Mar 7 20:56:50 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sat, 7 Mar 2009 20:56:50 +0000 (UTC) Subject: rpms/perl-Hash-Merge-Simple/F-9 import.log, NONE, 1.1 perl-Hash-Merge-Simple.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307205650.23F0570116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Hash-Merge-Simple/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12588/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-Hash-Merge-Simple.spec Log Message: initial import --- NEW FILE import.log --- perl-Hash-Merge-Simple-0_04-1_fc10:F-9:perl-Hash-Merge-Simple-0.04-1.fc10.src.rpm:1236459368 --- NEW FILE perl-Hash-Merge-Simple.spec --- Name: perl-Hash-Merge-Simple Version: 0.04 Release: 1%{?dist} # lib/Hash/Merge/Simple.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Recursively merge two or more hashes, simply Source: http://search.cpan.org/CPAN/authors/id/R/RK/RKRIMEN/Hash-Merge-Simple-%{version}.tar.gz Url: http://search.cpan.org/dist/Hash-Merge-Simple BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 BuildRequires: perl(Test::Deep) BuildRequires: perl(Test::More) %description Hash::Merge::Simple will recursively merge two or more hashes and return the result as a new hash reference. The merge function will descend and merge hashes that exist under the same node in both the left and right hash, but doesn't attempt to combine arrays, objects, scalars, or anything else. The rightmost hash also takes precedence, replacing whatever was in the left hash if a conflict occurs. This code was pretty much taken straight from Catalyst::Utils, and modified to handle more than 2 hashes at the same time. %prep %setup -q -n Hash-Merge-Simple-%{version} perl -pi -e 's/Test::Most/Test::More/g' `find . -type f` %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Mar 05 2009 Chris Weyl 0.04-1 - submission * Thu Mar 05 2009 Chris Weyl 0.04-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Hash-Merge-Simple/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:34:00 -0000 1.1 +++ .cvsignore 7 Mar 2009 20:56:19 -0000 1.2 @@ -0,0 +1 @@ +Hash-Merge-Simple-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Hash-Merge-Simple/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:34:00 -0000 1.1 +++ sources 7 Mar 2009 20:56:19 -0000 1.2 @@ -0,0 +1 @@ +977b6f679977e720ea70cef6acd00b47 Hash-Merge-Simple-0.04.tar.gz From pghmcfc at fedoraproject.org Sat Mar 7 21:34:02 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Sat, 7 Mar 2009 21:34:02 +0000 (UTC) Subject: rpms/perl-Math-GMP/devel perl-Math-GMP.spec,1.14,1.15 Message-ID: <20090307213402.6ED6470116@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-Math-GMP/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19195 Modified Files: perl-Math-GMP.spec Log Message: - Filter out unwanted provides for perl shared objects - Do the build in a subdirectory so that the debug files list doesn't interfere with the signature test - Enable the signature test - Run the tests in the en_US locale - spell check tests now pass - Add buildreq perl(YAML) to enable the YAML tests Index: perl-Math-GMP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-GMP/devel/perl-Math-GMP.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-Math-GMP.spec 27 Feb 2009 00:35:31 -0000 1.14 +++ perl-Math-GMP.spec 7 Mar 2009 21:33:32 -0000 1.15 @@ -1,7 +1,7 @@ Summary: High speed arbitrary size integer math Name: perl-Math-GMP Version: 2.05 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: Development/Libraries Url: http://search.cpan.org/dist/Math-GMP/ @@ -11,7 +11,13 @@ BuildRequires: gmp-devel, perl(ExtUtils::MakeMaker), perl(Test::More), aspell-en BuildRequires: perl(Module::Signature), perl(Perl::Critic), perl(Pod::Spell) BuildRequires: perl(Test::Pod), perl(Test::YAML::Meta), perl(Text::SpellChecker) -BuildRequires: perl(File::Comments) +BuildRequires: perl(File::Comments), perl(YAML) + +# don't "provide" private Perl libs +%global _use_internal_dependency_generator 0 +%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u +%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}" +%global __find_requires /bin/sh -c "%{__deploop R}" %description Math::GMP was designed to be a drop-in replacement both for Math::BigInt and @@ -22,26 +28,37 @@ %prep %setup -q -n Math-GMP-%{version} +# Do the build in a subdirectory so that the debug files list doesn't interfere +# with the signature test +set -- * .perlcriticrc +%{__mkdir} source +%{__mv} "$@" source +# Copy docs back to top level for %doc +%{__cp} -a source/{README,Changes,LICENSE} . + %build +cd source %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" %{__make} %{?_smp_mflags} +cd - %check -# Note: -# Perl::Critic test fails, disabled for now -# Module::Signature test fails due to presence of debuginfo data in build dir -# Pod::Coverage test fails -# Spell check tests fails -%{__make} test \ - TEST_AUTHOR=1 TEST_CRITIC=0 TEST_SIGNATURE=0 TEST_SPELL=0 TEST_VERBOSE=1 +# Notes: +# Locale set to en_US for spell check tests +# Perl::Critic tests fail - disabled for now by setting TEST_CRITIC=0 +# Pod::Coverage tests fail - disabled for now by not having BR: perl(Test::Pod::Coverage) +LC_ALL=en_US %{__make} -C source test \ + TEST_AUTHOR=1 TEST_CRITIC=0 TEST_SIGNATURE=1 TEST_SPELL=1 TEST_VERBOSE=1 %install %{__rm} -rf %{buildroot} +cd source %{__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} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';' %{__chmod} -R u+w %{buildroot}/* +cd - %clean %{__rm} -rf %{buildroot} @@ -54,12 +71,20 @@ %{_mandir}/man3/Math::GMP.3pm* %changelog +* Sat Mar 7 2009 Paul Howarth 2.05-4 +- Filter out unwanted provides for perl shared objects +- Do the build in a subdirectory so that the debug files list doesn't interfere + with the signature test +- Enable the signature test +- Run the tests in the en_US locale - spell check tests now pass +- Add buildreq perl(YAML) to enable the YAML tests + * Thu Feb 26 2009 Paul Howarth 2.05-3 - Add buildreq aspell-en as it's not pulled in by aspell after Fedora 10 - Add buildreq perl(File::Comments) to support spellchecking of comments - Disable spellcheck tests as they fail anyway -* Thu Feb 26 2009 Fedora Release Engineering - 2.05-2 +* Thu Feb 26 2009 Fedora Release Engineering 2.05-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Tue Oct 7 2008 Paul Howarth 2.05-1 From lmacken at fedoraproject.org Sat Mar 7 21:41:03 2009 From: lmacken at fedoraproject.org (Luke Macken) Date: Sat, 7 Mar 2009 21:41:03 +0000 (UTC) Subject: rpms/python-sqlobject/EL-5 python-sqlobject-0.9.9-setup.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 python-sqlobject.spec, 1.13, 1.14 sources, 1.6, 1.7 python-sqlobject-0.9.7-setup.patch, 1.1, NONE Message-ID: <20090307214103.DE19470116@cvs1.fedora.phx.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-sqlobject/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20460 Modified Files: .cvsignore python-sqlobject.spec sources Added Files: python-sqlobject-0.9.9-setup.patch Removed Files: python-sqlobject-0.9.7-setup.patch Log Message: Update SQLObject to the latest release in the 0.9.x branch. Changes from 0.9.7 include: * Backported from the trunk: under MySQL use the connection's dbEncoding instead of ascii, when converting a unicode value from python to database for a StringCol. * Changed interpretation of strings in the DB URI for boolean parameters: '0', 'no', 'off' and 'false' are now interpreted as False. * Fixed a bug with incorrect handling of calls like connectionForURI(dburi, cache=False) when dburi already contains some parameters in the URI. * Convert decimal.to_eng_string() to str to work around a bug in Python 2.5.2; see http://mail.python.org/pipermail/python-dev/2008-March/078189.html * Added test_default_style.py. * Fixed a minor bug in SQLiteConnection that fails to parse Enum columns. python-sqlobject-0.9.9-setup.patch: --- NEW FILE python-sqlobject-0.9.9-setup.patch --- --- setup.py.orig 2008-05-20 18:48:49.000000000 -0400 +++ setup.py 2008-05-20 18:48:53.000000000 -0400 @@ -1,8 +1,6 @@ # ez_setup doesn't work with Python 2.2, so we use distutils # in that case: try: - from ez_setup import use_setuptools - use_setuptools() from setuptools import setup is_setuptools = True except ImportError: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlobject/EL-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 Aug 2008 23:51:24 -0000 1.6 +++ .cvsignore 7 Mar 2009 21:40:32 -0000 1.7 @@ -1 +1 @@ -SQLObject-0.9.7.tar.gz +SQLObject-0.9.9.tar.gz Index: python-sqlobject.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlobject/EL-5/python-sqlobject.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- python-sqlobject.spec 18 Oct 2008 00:18:59 -0000 1.13 +++ python-sqlobject.spec 7 Mar 2009 21:40:33 -0000 1.14 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-sqlobject -Version: 0.9.7 -Release: 2%{?dist} +Version: 0.9.9 +Release: 1%{?dist} Summary: SQLObject -Object-Relational Manager, aka database wrapper Group: Development/Libraries @@ -53,6 +53,9 @@ %{_bindir}/* %changelog +* Sat Mar 07 2009 Luke Macken - 0.9.9-1 +- Update to the latest version of the 0.9.x branch + * Fri Oct 17 2008 Toshio Kuratomi - 0.9.7-2 - Apply a patch that fixes unicode issue with MySQL-python-1.2.1 fixes bz#466011. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlobject/EL-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Aug 2008 23:51:24 -0000 1.6 +++ sources 7 Mar 2009 21:40:33 -0000 1.7 @@ -1 +1 @@ -72f50600c7272f6651a48e18bc70972a SQLObject-0.9.7.tar.gz +fcc8040377402f9fa7cc33407cca89bf SQLObject-0.9.9.tar.gz --- python-sqlobject-0.9.7-setup.patch DELETED --- From pghmcfc at fedoraproject.org Sat Mar 7 21:45:58 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Sat, 7 Mar 2009 21:45:58 +0000 (UTC) Subject: rpms/perl-Math-GMP/devel 14964AC8.asc, NONE, 1.1 perl-Math-GMP.spec, 1.15, 1.16 Message-ID: <20090307214558.D018470116@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-Math-GMP/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21850 Modified Files: perl-Math-GMP.spec Added Files: 14964AC8.asc Log Message: Need the upstream GPG key on the koij builder --- NEW FILE 14964AC8.asc --- -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.9 (GNU/Linux) mQGiBDbavsURBADbDrQSrOgsHNPn+rlmvgHyIYj2bG/yn0nbO4cEVmxBHEVz906s aOiFlAPYc0AOlRPbSZXg8n8tJ+FrGJUFLU4Znt8TmOvgOv0wmH6aZcdehFWwfIGU 1oZIMTbWnWsF4EikXJRfDjjXB1B1x4R8my3e8CBqUxYXiyey6qTZuw9z/wCg/xBS FBdOWq0MvaZWZveOcBBkrQcD/ihacwMJiO30I0GuZdeqhaamowS9TAFpBeYtpX2u tgGnvCZ8/MhDW4xrdMJ9jX6z/qjOzC8hmmeTMok4MrcCxFKB0oZ/kRQ6C9zt8yp+ TEBjwlDe1i3EsUcL2FC0sROWMUitw0o1O2vKadynKdklMlkjeDQEG0NsBZVSjdo+ gMy9BACBLVsnwMP7iMwLILQVGbJ+yNelg0ar4EU64lIIaEt15eOpz4u/EnJ0deUn LVIy1o9SvGRrJxyrBlZi4DNfoSivCE9Y26IEupPGwvajVSQ+pn9SK7M1/ER9cYYc 3XmKIas4YgXEW12wS7oOA9YVggG0Kad33jJ1x7GnCCcKGS4MlrQnR3JlZyBTYWJp bm8gTXVsbGFuZSA8Z3JlZ0B0dXJuc3RlcC5jb20+iEUEEBECAAYFAjtAjpIACgkQ hAWqkCam3o5X6wCWIhd86/eXgXNsESjzOks30okcRACeNWvcKqh3fWFeQ7rAL3ZK UNsJ6VmIRQQQEQIABgUCQIZyhgAKCRAXGjZtF9uc0yzAAKDB+3/GoFTqdlodB5oM CDcytqVEIgCXXMpQEl9vPJ3xRY9rZrRd4vnDJ4hGBBARAgAGBQI7FekeAAoJEBHY BW6dmJ/6pzQAoJSm9EiqGGLni1c4jSlCOk/8xpsYAJ9XTXWV1/LETFnX3WY4Hqjt Itn6HYhGBBARAgAGBQI7KqGAAAoJEMAuD5JDqDw2jWEAn04HTkSNA7g/W7w4mLwL 8cISCEfaAJ4gvWt/MJiehshO59gLvuDC+mSgKohGBBARAgAGBQI7QmhXAAoJELHP dAZuqtcr7mQAoK1ZKaeBkGVjDI0bxBcZbK9L55NMAKCVg/68QBTqnzTKdKre7P9u 12V7QIhGBBARAgAGBQI7QolMAAoJEDaLC7dz+Z2XihsAnjIGArMfKXoiUkYIfp0d 7xQvmViuAJ9h/9g/GJplxLJC2aVXk/VuHSEVR4hGBBARAgAGBQI7cpOWAAoJEHEh Uqs1l0lrIlIAoI8vWE7wJdnTl/pUkuuHnrSVlI6cAJ9u/pDnlYihVse9hfyTKtCg 69/I9ohGBBARAgAGBQI7r4C6AAoJEEQeK/Xt7e+5G5MAoON+8xDDdGWO0BwK85oR msM03Cv7AKCbJ7thEtbMdzxMGzpxRNX1TSAKwIhGBBARAgAGBQI7sp2OAAoJEBEd zLh1J3AbDCAAnj96tDwdSP+5ybOPWvlbRTZzgh/jAJwKkGNZcWYC8AjTmt5B9bmr ib/2J4hGBBARAgAGBQI7sqUNAAoJENElmsWUw7fwTsUAnjoHHUo3Fo60jFjnCSo/ 1Mp0YGA8AJ4l0pqatx28XxCKQ+8ZYbEQuMVgkYhGBBARAgAGBQI7syfcAAoJENh2 /K3Z1dz4xu4Anjc97pF0q3SFowPhudFxxk9XdX5wAJ9wk2RzHM3MsyLOgffrBtO3 AJ4OD4hGBBARAgAGBQI7sz5lAAoJEG5a17pGD/2k+qUAmgJI9uA2OcYiY5hhIf+7 54bFRU87AJ9fXhWGtxqIjDmHrOSCNBOOwxKHpohGBBARAgAGBQI7s1ZvAAoJEPqS CXOZKks/5RkAn3w0G9hTBqOA1U0nSMABx2c173JxAJ9peq8B/uTtN4MyrWrqbGGc d7K5GohGBBARAgAGBQI7uVJLAAoJEH5c9bxxC4ofpn4AnjEj7/r5rOdL1McxMQ/M bnHzjEuJAJ9xVB04DwHIDA2ZmHXuN/pKl5lIKohGBBARAgAGBQI8eXfiAAoJEOLQ 0T9c2gzwhnkAoIKrUW8+5Hvxt/P+zxahd+9aXoRKAJ9IpgbfOD/pknhcskrZlVpJ DPxjR4hGBBARAgAGBQI82WdeAAoJENaF05dpo4reHgMAn2DYt1qET05MEyIFJ7HR uIuvZp4xAKC3zymC4gzhRD7TuCGZCcfJdYfqaYhGBBARAgAGBQI9VFq6AAoJEOJa 9W6W3C+poWIAn2kJaGL6HWbf5qN+0ts1nVpVzcdxAJ46NCQ44RgObE0vDEV0+6XN fegKZ4hGBBARAgAGBQI958C1AAoJEOPrGoQWiQcenbsAoJkBE8Ww2ScVIrPW/lRP O7KKR/AUAJ4nCS5H2tMnkKlZkkGSQMqv3ooi14hGBBARAgAGBQI+9wzrAAoJEEGG YeMRZGyeOQsAn0gmstlvveSH4tmdIBtRM252erU9AJ9SsCqH1zqG0V47b6qbpdDy XcRAaohGBBARAgAGBQI/idGRAAoJEJ0zS5+T3kCf4IUAoJgajVYk7p9wKLbmLHLz lFXiZgJmAKDEUiObfW6uh23e3mbFu+Qw4SFVO4hGBBARAgAGBQI/8kbBAAoJEFqO QPxGgWZORaUAn1knhnwqgW2ZF+ly8OgMJwZC8MNKAKC8+Lcpkm55ldeJR0sTeG+z nPWZO4hGBBARAgAGBQI//ze9AAoJEPs/iMJV6ln+cKUAn2hH2vhQBiEtXYO58kXK 1kJf+9/AAJ0UGj3xNEEZBj+B2FgGyq3jtuHZM4hGBBARAgAGBQJA66f3AAoJECHC S9wFUtEecnIAnR+9ywGemrgQtrXvzcWCvHfgL6r3AKC9C9Jo24PIFRWlVu0QRX4h SUXMvohGBBARAgAGBQJBqjPtAAoJEAP6keFKJNb0UkQAoKhkBVCxVcD2VceFIFLM JYV2dIEyAJ9b/PVqM8KRhBFUrlYOW9UUDJIZq4hGBBARAgAGBQJCl3vuAAoJEIvY Lm8wuUtc9HkAoK8Rw6u5SFLLpmKpM6j1frXRAdzVAJsG3KfYOLtF+w52DhEYTx+O kMtLQYhGBBARAgAGBQJCnkNTAAoJEIdJ9NKJpwwp12wAn0nOSuiyWv0c8oEv4ZcH dk4dVvYgAJ97U268fPwNI1SEY8tSqMA9R3O43ohGBBARAgAGBQJCnkOJAAoJEDwi XkgE97q4AZYAnjFv7mHmiE3vCtv5sE7uX8n1nl3rAJ4hFN5d/mMoPLcJdplkX2N3 bmZdAIhGBBARAgAGBQJD5FsJAAoJEP3jfphHobhDwi8AnRBqHI2X/hP8fLEzIrv6 EM/ogr2wAJ4zIriHKTI7G6LQ9Zl1/6AyFIllTIhGBBARAgAGBQJEMRLrAAoJEPp0 OhEyNewemk0AoI+gyCGX7XJS8rUJREyljeBZ4CrOAJwKV43ttawYuVDt8mhLj95j ygn7t4hGBBARAgAGBQJERLAbAAoJECyxVuYYNNipPREAnjCHScxSs2qa3H7SunRC urIT4QELAKDU3k2E78plcfZXrCT/aL1l6hBuSYhGBBARAgAGBQJERuD0AAoJEPuU YqVsTBbb+yEAnilX0hRbZegmGvo3fE8Z1IaEIxYWAJ9YmdCeVo9OhJG4Xie/C+1s Lj+rjIhGBBARAgAGBQJERuVgAAoJEEiDMC3Tvg5XzzMAn1vm51m8vKMj5YKcjB5I r8p7i+TQAKCgOpiEV+HFi7hG+T7WmmJJrTNubIhGBBARAgAGBQJERuZnAAoJECpB abcF3BxinUYAoPcmrSZBuMmw4sKpX1X5mmcQBcokAJ42n3tmiy8P0liQoNhahOZL LFPORohGBBARAgAGBQJERucFAAoJEPg3nqnO++ttSlAAniMeRnW68aPAeIvOUmZl yeX76yV/AJ0SXJXoOVpdDbCv8EZNSZ3pHsXcYIhGBBARAgAGBQJERvJEAAoJEG8Q ugraTAiZm3YAn3yRfIIeQ369SlvqEguwh8mvwdhyAJ4ujApPKsGMn5PBIkDJs2aR ZzJ7EohGBBARAgAGBQJER5bKAAoJEGqr/t9yMnLN7UQAn14wgYCx8TMlgeWkGR5Z VCW8uUWXAKClp8bkEFnFlqoBSpPzU+HLg24Ez4hGBBARAgAGBQJESN5IAAoJEFdf TyFRBoojJmoAn0HpDHdnRzR3nayEYYa2N898xmGBAKCGcXRJCiMyGy9v+q9eilve EFyuJ4hGBBARAgAGBQJEWFh0AAoJEA0CRcITHAYezswAmgKUVzQiNZrWRYvVqZe1 UKaPSo9sAKCHIEtgS4Y+KSnwoQ24V2ogrhnRd4hGBBARAgAGBQJEhIUiAAoJEGHf XWohI4xcUPMAoIZpqz6+GMWBk163WYFYFB/rDJ7EAJ0aLAKXDFHm25kABjt0NO0S ZhoTmIhGBBARAgAGBQJEsRNHAAoJELnbtKH03fEuVrsAoMgqiWZbU649ru30iGnz cv4U77eqAJ9Gu4gi4rCaDdFL9WUcrn1PkIVvOYhGBBARAgAGBQJEsY0KAAoJEDe4 WVBqpqcTtEEAoMP66ZY43j03RV802rLQhI1LqWY4AJ9f0tT9mGAkNkxowoNZdVyr fmupoohGBBARAgAGBQJEsZBeAAoJEElFpTfXe0P7aNQAn36/G/sw8Hx0THp8Yppi ho0Aod7vAJ9woEBzqfnipC6qDDE1BzB/AleDwohGBBARAgAGBQJEspT5AAoJEGBl 1TP9wgW5ALsAn2UeTBnTNuONRuO64gn79InUtJMiAKCiAWzCnu6xNxPtzQh1sqwm taU0rIhGBBARAgAGBQJEs/hKAAoJEB/39Dn5yxXa0LUAn37nHP8M+09HCfkgKOjR 59XYtVnqAKDLIc1vdUxT1a4j4k53WfiEA3JmkYhGBBARAgAGBQJEtALdAAoJEFy9 wEIONXKHlXsAoI0EEEwh2ZPSct4vXKiWLEsZGSMRAJ4pcSmPWT0uNjAu7yuzJDgK ay6fqIhGBBARAgAGBQJEz8Q/AAoJEJYCDgQaGWQ7RzEAoNMm3ier2gPEOusZKFvF L5EMg4hAAKCiIuhxsrtbAund0l1TkeH4pptnBYhGBBARAgAGBQJE1ldnAAoJEE08 fKFVT7TGiQwAn3akWDArWbpBELfAML0vaIzQxzyDAJ0UVZhIqR15gtsJ46oSWCv/ shN9uIhGBBARAgAGBQJGVN6HAAoJECIYyB6OfAP/16MAniB0eanwhL/BcRVqxbMx 1P5sBzdWAJ49KrH2rIkywGAIZUPo7khMMo6LjohGBBARAgAGBQJGVP4vAAoJEFZB JvIp8ZvREvMAnR1uRVeMhL4IsmdfY1rGhuj1wqEvAJ43ciid7kfzrDq0VWFbY5E4 JEtwFYhGBBARAgAGBQJGzf5PAAoJEENCO59GRe9QSwsAnjFdfAI6HiDHO53fIcyp sStBL03AAKCoj6p3yDYMu01pcuC7flBV7mfoOIhGBBARAgAGBQJG8QgzAAoJEP+u yd6sYCpxncQAmgNI7cPTo+zXXlcf2x/Vp5pQSPBsAKCzCyyhNdF2e1kusmpYStbZ rHlfsYhGBBARAgAGBQJHdr4WAAoJEP1OdYVQ+DhYQ1EAoNs9L7RaTjwXkde6tzf+ OlKfjld9AJ97mQ/IabYAwYT4v0L7binXpX5fsYhGBBARAgAGBQJIxG3DAAoJEAEv XccQNt+6OaoAn0G12gr3sk5Pm9eVDeFn0E77JEzuAKDPaftQemYnQhraLoyHmDPm oobpE4hGBBERAgAGBQI9960MAAoJEEsqSJfTnaDjVscAnRVgOJOoA0QhRdooz2Pr 1n2MAugMAJ4nclblndDrVyfKC7Nc+5hMq8f3EYhGBBIRAgAGBQI+kjO7AAoJELRh qmzMGs0F1IgAoKOB3o01pQxks+QEvGWNNLD3LXoeAJ4zlZ+7O5jvVP5vhVA23PYC 4Hqx54hGBBIRAgAGBQI//gGEAAoJEFjQsbInVyxHz/sAoK2SZQDEvYZtyzWPr+yl p2AyA19CAJ96XOBeL44fHpU9e0GtLbrMGSXENYhGBBIRAgAGBQJA4YVDAAoJEOdN Kbgr4W0B3fUAoIIPuo6QkIioX38qDTh6E40IQjXcAJ92kddf4aKP8yR18jmxBclP pa3/Z4hGBBIRAgAGBQJA6Kd9AAoJEOjxl9aXn+aqG+wAn22zKGTKfGwN35iB5BYk 59ry/zRoAJ4uwYEpgC2r8fA9xUOMx0sIVplrAohGBBIRAgAGBQJBCegwAAoJEEb4 Yw7DTCQNM38AnicU9z55acgCojRe5qPJcZ5ZkxMrAJ0Vw1Jq9lFSGr6lLHwNwJXO OakLEYhGBBIRAgAGBQJBEvPPAAoJEOyZPWNl/c3urZkAnjyiNcUvvWJTBnOh12C6 h2UAbtaLAJ9lWQxmVaQKRb0Kep/n3QkbnF2Lu4hGBBIRAgAGBQJBodvrAAoJEPIr W//vmJk1tH0AmwR8b7pKjd3mB8EWc3h86UXymOqyAJ9qLwfG1+gWSPvYgGn6div0 REUZYohGBBIRAgAGBQJFyoRdAAoJENPjM6q7UON6DmQAninsUuzkAouDUfcQkSG/ 0Ww4blzuAJ9LeQzpgUdITTiTzQ6LwCdF8b7uuYhGBBIRAgAGBQJGXZLKAAoJEJyT ErgdEFWj6LoAniqJVcsyoyojAJm1WJpJd0uu/cAxAJ9ab0GeAm4IcJu3e57MzRAX WwFDKIhGBBMRAgAGBQI98clfAAoJENzdu9KN+dgQDmIAmgO+8JtmjFwUW+2KtbmT bh7ZMzJhAJ0UwTODf0yi54vSG3hyWqVo3AFHaYhGBBMRAgAGBQI99rnJAAoJEBIU 9rxL2aM4a0YAnR59uampGE73QjMKrFcGY/Vw8Rp2AJ9WisV66YrJVNbzxxln2zzl 9ydX7ohGBBMRAgAGBQI+1wYVAAoJEFeDNeUV15MzWGoAnRbVpooawhkduWqNZztB tqx/Uc3kAKCwQ6NP4z8GiSVhK3mC5iA6eNUunohGBBMRAgAGBQI/DPKrAAoJEIQ3 JM6fqHldkgkAoM7V5h8t5YDHeY3+uoec9NtHcrlxAJ9m1vR+A39UFFBb8oIli3tN vDRTyohGBBMRAgAGBQI/DRzVAAoJEB5K9ynVzv/QVp8An1pUns+IZNfUFIsL7yld aQmBiWIIAJ4uwD5XYDAV4u6jhvAsN5jlVqdAwYhGBBMRAgAGBQI/De/yAAoJEF3x nitnp7WErsMAn3RRYV/bEAqWTOVHcILOLp1w0m8fAJ9jaD2JjatNpEAtBGts3U/Z 6CxKK4hGBBMRAgAGBQI/E1wjAAoJENPoClqeQiUKq48An2MH1ea0I5HUGjruj900 yf/ek/4rAJ9vOL6hG3yC/eBUw/SdPVwLEGswR4hGBBMRAgAGBQI/JbdpAAoJEEsq SJfTnaDjrZIAmQG6ZZazBwEAgJUmIipCdiapO/mmAJ9ONzUJjLjSV0A6jU4KAQUo x0h3LIhGBBMRAgAGBQI/zTcxAAoJEM7uUhwTmj4/NDMAoLcgqDhst3nSnVYa6K4Z IiRroIalAJ9FO6YfBfkH/qDC+P5SrTcbDVx1B4hGBBMRAgAGBQI/zfZkAAoJECFz WYQ5V1q64cYAmwTryG/hMt3EBkm5JNHdMk0iiJmgAJ9J+7P4t+BQY2RkNNhHIag2 OiWQS4hGBBMRAgAGBQI/z4AyAAoJECdu7JDJZUvGZs0An3QjLxsoAYP063Y4WTTr NJPBphmpAJ45rTyJ0OGjeWJJdVoDNdeB7PW3K4hGBBMRAgAGBQI/9XHvAAoJEJeJ jZL0kb0hwHsAoO0rY8Yn25rA6KKzciMJbbsLKhyKAKDfzTl5osqzCua0GZ44p42m dyR4U4hGBBMRAgAGBQI/9XJQAAoJEFGiVRj0DVwDGRkAoKkciM7J1Wk9URhL5BFP cRqDSTm6AJ9BeChIzfLwd3YMgtYPFk81LPA5wohGBBMRAgAGBQI//FYbAAoJEM0d yqp3duk2qcoAnAq74wyvkOxGxYL450WWQlF0V7JrAJ0SUAPW8PCIMiDJK9Vu65gz htO4mYhGBBMRAgAGBQI//inNAAoJED5GLNxJLdt+/QMAnA2Vz0gxCRu4K3mNqxn/ a2lAvY65AKDVb79Bq+IllDZ4DvHuZmydeOpP14hGBBMRAgAGBQJAAY8YAAoJEM/a nYIGpzdujGIAoMl43vKx6Zi5JFSZuwYBZB/Gs5J5AKC6clEWAg4qFJqB12yCSG5X KsIl7ohGBBMRAgAGBQJA32zlAAoJEIzM4eDTwKZOwIsAniyR0cp43WupAK/rDAUb BaTlDYBRAKDCEOZ6ctF6yG4nb39CGPpZurdchohGBBMRAgAGBQJA41X0AAoJEO2T yikSSybzRNIAoJIryKc3Q7ap8Ll7Pf1WRVE20hlrAJ9v3HeA+RueBt6gsMdKiYd4 XTMzGohGBBMRAgAGBQJBCHkeAAoJECjern8pmC5aqTwAnR9Nqpn/KmCm7DlqUxnk h/ex+/r+AJ9hx7hTr5xz3rSmJrUB8Frak2K53ohGBBMRAgAGBQJBCTQ0AAoJEFz9 N/rMeMiTejcAoOiWVvVNJGTHuStf1cmhRGtKbvIoAJ9e8h+u+n5NTTVZ3W3+SXDf Iild1YhGBBMRAgAGBQJBCefwAAoJEF5FJs6Zkq38IxcAoMAmjO68twBNZnitCJ0N m0EK6mYfAJ9r4fGKcXOMe99SakSUkvKwmkKAqohGBBMRAgAGBQJBCq+OAAoJEC46 Vm8HIgIeUmAAniwE+GR+iMVLLavVrDJqs7O5ifZoAJ9efbqVvXVNRjWJi+Fp3RII V0YVAohGBBMRAgAGBQJBCsvhAAoJECrmC8IOSrEv7/cAn0amP7EaV/GjAIQ4QcIu PbkoYbkkAJ4/lvX7njgClBTjbEoORBJPL2N4QohGBBMRAgAGBQJBDjS3AAoJEG0/ 8nmINsl8Z6IAoIdud6HjZWzXchfqxv855IGUe5I2AKCIind/Rj8s9FvWkh76ukYX eq2O0ohGBBMRAgAGBQJBEl4WAAoJEAZrGd5s3/5Jwl8AnjqwSLrdYK1CYEo7Pr9i T555xVgrAKD0fTsByjKpBicNAJEOyNRKesXafYhGBBMRAgAGBQJBH8NUAAoJEDbn HCpaky5TJeoAnjOk8Vtv9o362jpPDHjP38njWWPlAKCrJjIRuHmZjw3fHeQipKSj p35SiYhGBBMRAgAGBQJBTzKUAAoJELRIfveSCoIpPtcAn3sXeKr8TSe+Q4HKOc2K XBAmIvjKAJ9VCFDb1sHwRLKaxiiVljww/5fLXohGBBMRAgAGBQJBpJ92AAoJELGJ 9rTSOkHI3tkAoI+ZzHhtzImsI6rufJuHxi/uC4QpAJ9sCjf1M86gIv2oGeFD/xEG BmQ71ohGBBMRAgAGBQJBpiP5AAoJEB2DXvh7HLazyMsAoL3wypjL2RlnYEBRMkME tjnxcPNlAKDuw0MznsTO9Jbyj1Oafa18cnEONYhGBBMRAgAGBQJByNveAAoJEGDN MIVnLaHt7PAAn2gAW4an3dsHaQmZDZrC40fILqf+AJ9uKmNOnJLFclECvx7Bh7zg cMLieohGBBMRAgAGBQJGWDdcAAoJEIUGW1nVLdGnHskAoIAWDaEYSwzQfkVDFjFY aCPfYZMsAKCFTxo9hFOqSf3vAQj0uRsRtjwjzIhJBBARAgAJBQJGWFVlAgcAAAoJ EKZntdggV58RuuwAmwbjzzYsiyBIAO2Jl7aPwZcs9juEAKCs+xXzbPeSx8Dejlj5 gCzquTiTC4hJBBMRAgAJBQI/DtpVAgcAAAoJEHMHjOre9VR723gAoOagSL4PiuIa VQ3z4JHk/C+0A6d1AKCF/Rp15UNWJyjMuWQi8PIqpquaXIhLBBARAgALBQI22r7F BAsDAgEACgkQvJuQZxSWSshdKwCgvehMHbd8VrClA4idVw0ILc6c3IkAoM4Wc2DC hiHOyyywXjecYNYrkT5viE4EEBECAA4ECwMCAQIZAQUCNtq+xgAKCRC8m5BnFJZK yPaxAJ9LYME4QOigx/UVIVc3eVAJf5SSegCgrMzONwqRZYUNvTfZ2fUdqkqUo9SI UwQQEQIACwUCNtq+xQQLAwIBABIJELybkGcUlkrIB2VHUEcAAQFdKwCgvehMHbd8 VrClA4idVw0ILc6c3IkAoM4Wc2DChiHOyyywXjecYNYrkT5viFYEEBECAA4ECwMC AQIZAQUCNtq+xgASCRC8m5BnFJZKyAdlR1BHAAEB9rEAn0tgwThA6KDH9RUhVzd5 UAl/lJJ6AKCszM43CpFlhQ29N9nZ9R2qSpSj1IhXBBARAgAXAh4BBQsKBAcDAxUD AgMWAgEFAjbavscACgkQvJuQZxSWSshm6wCeOo4NT9hEwbS5pU4A4wNJ15EnJQAA niJAg+iaCbWe/X8UpFbXWY2FUeAHiFoEEBECABoCHgEFCwoEBwMDFQMCAxYCAQIZ AQUCNtq+yAAKCRC8m5BnFJZKyK2qAKCDn2rHV+2y5Ro/UGygivnGUd20JACg7cI2 JmOSjE//Icod7R7eOSuTNf6IXwQQEQIAFwIeAQULCgQHAwMVAwIDFgIBBQI22r7H ABIJELybkGcUlkrIB2VHUEcAAQFm6wCeOo4NT9hEwbS5pU4A4wNJ15EnJQAAniJA g+iaCbWe/X8UpFbXWY2FUeAHiGIEEBECABoCHgEFCwoEBwMDFQMCAxYCAQIZAQUC Ntq+yAASCRC8m5BnFJZKyAdlR1BHAAEBraoAoIOfasdX7bLlGj9QbKCK+cZR3bQk AKDtwjYmY5KMT/8hyh3tHt45K5M1/oh8BBIRAgA8BQJAAdluNRpodHRwOi8vYW5p emUub3JnL2RmYy9ncGctcG9saWN5L0JDOUI5MDY3MTQ5NjRBQzguYXNjAAoJELeW Bz3JVB+yQ7cAnjMaHPYhRfCmRrh/ohipx7NvRgNhAJsGel8k8/jbBYgjtlJfliQY GMvfDIh8BBIRAgA8BQJAAdmMNRpodHRwOi8vYW5pemUub3JnL2RmYy9ncGctcG9s aWN5L0JDOUI5MDY3MTQ5NjRBQzguYXNjAAoJEEGiJScHL6yJ1SwAniuCBsTEdcvw f/C1zIOBOUqQESobAJ9d62xQJlkwmRX8XA0F4sdUvwbmr4icBBMBAgAGBQJBCYlB AAoJEPkoKP1ixIspttQEAJRwToU4+nnYyS8CA0bEW36IF+rgDWOizyr/OopJwouV FBhKrHdTaVYkZPOObLwSzl1XDV69heJOh6CGk09JOKu346UwndQ61W5L8iokL2yy 3DGRkHlPVhHso85KbrbKE9EZysfRJRK4POwtPYOHi98G0CDpEP8oyn/pMoi8ayFj iQEcBBIBAgAGBQJA6KfJAAoJEJ/h+jqqnfLJEZwH/ir5iVcCa4vKLNT9J2G1o7S3 cIsHUcmvVxtXLfgksudn7WSYhO5tvKAUVcc2cGCvA17p0+blvxYvvx5E+OgiY9qx hJ5n3lWM19wLT4dpXi7RGpEG18eNz5fMhn7/3cw42gVQzW94kgn9K65uPoDPCsCg ngy/nURQqyYfTqgRSrn4/do1tKlVUAp8aeE9nSW1J8GODDCr3MFc8PvKjD+KNuWr y6c9c9jKX1TUi4IfT/8WENvkUgemZIVKsXYrEXTKp2T7JSs8dmJKYGFoFnsBfKI0 4biX1azDWgs2FJnxgyfz4BcEjqgF0FykyVyDHJXthcwO7aC5L2lZpwrjLTWFGPKJ ARwEEwECAAYFAj8NCDUACgkQ229lmotMvJyu3QgAtUs5nfuVNGsVJ5fc64N8pnTC /fFy0owOlpfNLIO0ZpaV6l8GFY2qkqSNyf4JVG84HwOByaE0l3fkuUJ8PdHqdThr IPHc0AR32OBFFrTpCdEIshZ+TIKVhv5xeLyc/boyhWtAfrhNVI2fhx0oUCy1619S +zprZvMeySRiaMBfDJ1ilub8nRHldj8UXrYDPWOGCo9KzqEkOyWxm26/nHhRrR1C Q7m2GvXtpdMJcxRihzFGEEit4m10idR39mZamCrm5g3PYRfxc72UrR7Zp86B3Fym 2MceO6qw60R2PGmofg6E7H52gC6bqmo5gzBWPZGXrayGX0G5XTekKNLoNgpg0IkB HAQTAQIABgUCPxDXxQAKCRAiQhgCUFjMc52pCADD7CHrjjNwzcUgMYW5SJroIOzN pbcdH1MKrkTbbGVwR6STAblxA9mURYucU5ru2ttLv49074BsHkM837VIl/zdHalH L0nE/54NzItKT8dNShwX9tloSSwwY+HchQZ3IZmktrLPGxuTIdYOpUHKOUZwv20x 0Gw5RGEK0DQF2EHPL9uyRfYTuz99OfVt2bORzP8zX9sLgtE9p3twZJC/GORqY/7k RtAf3HpnphUQJxVAnHJimc9gs0x2tuO1d9gkxcmsiQbopMVVxHKBSBsi9Uc3By5V D3czB2AOn4lxz5kMj2Z6KV09e13LRcTteQKusBk9bqXXZ3Zky5Fy/NxQNPmwiQIc BBABAgAGBQJAYDdNAAoJEHRIisFJidJcsGgP/3OlGhKW3rW9+R7PceQQiXGYfXwd /xgmOjvuGCgwpIHDNYFal+uFTd8WGEYfLlHG+b4M/tuydlnHqaIquxAjd9qosu9f /MhGwSwjnZzyoQAKrLf7cddxg8UcAPipPyDsGyDBiKkw00kaJOAaePhgLyGqaWrx R4NItpRGo+up2VYEIWlf34MkG1J/32jz35rsJ6dG+mZPZrQr5CD0ixFe27Alb0xF qqO2raC65q8ohK4IP8XKdgTdfEs5M6vg1vfOi0IT5V2MHrQdFbWd8EQfNg7L6Im/ eNTlzZupIdVtDxP+5muxUmayE40g4WwY4OVY8MGtk5pREeoVoDAXLN9ehqbbU8Id 72b3gLedktPf5fotYxty4YOQpNJ/c9HNzUt/2g4d5wAo4avS8JJTlR+eZTjk76uy xYTSUd5B5RgatcR0WgWa07gTW73P0TWPGqcN/h7fjvpWvlisJEhQkKVdoFayQex/ gQWiOls+Ct1JL0qsW4CzYvhPkFLYEHU33dGXQuObwI0sm+k6b9BP6TShe2o6rETI mUxvzkCPl0rn+N6hDBS3fI9oJP5TnGmHYpJRoTi0nL22eUM8uJdl9Jyjpy3LKtf9 WkbCbNRXNA/K/lM+09xL4OrcKEYULK+P/4sgrmq1xNlCmBisjwEerasQp7ksL/Av HCmHTW/F6GbG9aZkiQIcBBABAgAGBQJD0BaCAAoJEP9K37xXYl36+MoP+wZReCVA J1DZORc/kd+Vz3pxqav8dKUG/6DnWko7VtDpURcWQopwKw5B2lB09cZCHLNUFxhm PO/WivYESJeX00zqGHkJTgCq3IgUv/IjsrI1W1w6Q0iKAEpAKt1nGbi15lVPZ/nO nahsgP8DkwPH0R70hJ9781gQsR2Fs0fa4IGsdlEx60fVSqd3myxhdZT6Z3X4ccMK zzXEe7o4i9oaZx4Q1D2v4J49QNtyCk+U1FQ1WRLqaHD/q4hPOKgcHQhRrjNtc0c0 6DGLGLnAS+uiiSH6GVfCJbF1a+zPDBLjzzO9XB8ik4Exlxr+qu5YKAde4pzmkJp/ 2L3Fb4o4gKXGwr3pWbu5TY0E1Um0bxrl4nPEPPhCq7HPwy8n+tdC4EuZEBuRFY+7 mmTPsHPChTbobQH/svH0bmZhGLkZ8VdsnMoIt9ay6Wzn26O4jb42ZAyPqBLv9seq BIS3vm2cXh44oCyCumSQBwjzCj0Ks3dwWUnlf/bjgRadRtrA70REec+ulpoA/yXT MkOp6w5ui/H5gdW7Bb89iaWMK/ammUo05HH6cNcZdHG32ML0fRDWJlMycv7zUkZ1 RQqrlPuZpzCuiJtalEegjF1bmkkRzO7GL7xwIamjADtioEDW3gDpQ5QFbYXvLJR8 GhxjBcQdXPj1hluwGPqOX4g+OO1wk+Qxq1ebiQIfBDABAgAJBQJFz880Ah0AAAoJ EP9K37xXYl36+eIP/25KIVWtcRsQcxNOAypdqfY4qxVAvhisr+2qfoDeQGiQGVXH rEgrrG1qANkXV3hCXrNXT3utv4secVqoEZp/6nkUGHwY4sdFZg++3usKAJPYqzQf h/+i7j/Ak9V4TRWLnupvZwH2SCLHCPYiT30Jwb8dVudEwr+/DEV8Ks86jsxPAVkr xifboCFrq40DRCmFRFD6VzNysKzogcD++PVZ5h7fmUQPLDTUvYCqX9emlhyj1CmB J7G2Bd/i5MQI0mzW0xllfS2g02I1D0ThB5xyga+C6rWPvlotm49T7DxcyL63BGQc f7xZxXsBIF2fXyOHsR+S+VhzGlWXRsok6zy+DBobuuV4kodFZdOno2PT+xIXqbpT YXW/ZxW+eQ53vKS7Rqsd2EzqxNrAHCCEQ592BnxiLK8mTUsN4YqRf6xD87wQ8d22 M5p3wM5mpxwif3TQiFSo72UTy3pDExRzZiS8hRBOmNC7YiP4INHOzd19qcSa/onm rIUQLQgJskIqj+390HFXTprhydCjJN3jwa/cdX7VOepgx6xqTpd1qJgMBk8fF+Qo 1vX+Lvhs6OK7HF1Mo0EBXnSAuDkXzyuaJzpvCZb2IjnEJ1EM6Zq4evM0H6eHbgr7 mNAIsaAO8qmlv4D/fnvGOPPDzMqUWbmcXB+EoP1a/XbBCMnHbVPq6HbPPlCZtCdH cmVnIFNhYmlubyBNdWxsYW5lIDxyb2pvQHR1cm5zdGVwLmNvbT6IRgQQEQIABgUC OyqhhAAKCRDALg+SQ6g8NkqAAJ0RvMAIRsvVKF7bELrT+yuTqsjJ9ACeKK4uKQid w15EzMUeg6bzMbz8UL+IRgQQEQIABgUCO0JoWwAKCRCxz3QGbqrXK/QYAJwIANuJ EBod6F6v1kA8AEWG1LoXLACgo0p++o9MkCEua5aDLFbwMBAU6N2IRgQQEQIABgUC O3KTpAAKCRBxIVKrNZdJa3nuAKCi80RaN6rZWNQmzIJ8moYa1CtVRgCeKD8q23+P SuGO/fUmn8qqMQ5VnLiIRgQQEQIABgUCO6+AwQAKCRBEHiv17e3vuSyTAKDiQKmW pYh8bhQrbKCwpXiMTjewHQCeLOEZ9vRrYaUOyIK+pnP0O5qXEDKIRgQQEQIABgUC O7KdnAAKCRARHcy4dSdwG3pFAJ9bOQathguwyZmocO9L+Uu2bq6t+wCfW+sm3RVH 4pLJirhYlfweShUjPvGIRgQQEQIABgUCO7KlEwAKCRDRJZrFlMO38PdZAJwKuZmI lS8y8t/8OHanxdqkL41GKwCeOnxRgHqa1MwaKcO6MsUek8+2MoeIRgQQEQIABgUC O7Mn3wAKCRDYdvyt2dXc+JBOAKCsyEDmZzDZcjSpHUMGoH+p0a0dwQCgo/+RSpe9 76u26DVdzWEBdhb4e3iIRgQQEQIABgUCO7NWeQAKCRD6kglzmSpLPyCtAJ4kQo6B RdQzmZ/njyld8bjiqdqgSwCfQWyjn7+q9yMoM9U/A/fEK8g7qHGIRgQSEQIABgUC PpIzuwAKCRC0YapszBrNBTmYAJ91ZTOXTXcQoOKyCeuFEYLEAatkmwCeO5/nYq0E TDNueX2ImLWn/ADrU+WIRgQSEQIABgUCP/4BhAAKCRBY0LGyJ1csR9YLAJ0f+gwp fFgWNUb39kwv1bPrqEDVjACfViWv17nE3ZL2Tys6hZiQiw87hO6IRgQSEQIABgUC QaHcLAAKCRDyK1v/75iZNY/TAJwPGSB3XCVNLn2ki4F4lfxMVkPW8wCfa6GXkdhF k9MAylaANzNPxacGf/+IRgQTEQIABgUCPwzysAAKCRCENyTOn6h5XX20AKDJMEUu m98DdtXmoj/sCtBWz/t+twCeOcHmycsJWTyN48t6Mm+pkKFNWWeIRgQTEQIABgUC QAGPrQAKCRDP2p2CBqc3bomrAJ4rPut0U0yadrRcdLTxeabXaokkfwCgx5Cannwx RPZZcH6fo4Qhp/4h+uCIRgQTEQIABgUCQN9s5wAKCRCMzOHg08CmTmWPAJ0f1/Uy xidDa7AbFElq+E6PTWh6KwCghOyjWvpdnWAy5DFpZ6IXawAIgxmIRgQTEQIABgUC QaSfgAAKCRCxifa00jpByEh6AJ47Ly0mDwlYA6dicY7WSXXSZECgjQCghgQ23D2s EkkzDSPURg2i39HX9q6ISwQQEQIACwUCNtr5OwQLAwIBAAoJELybkGcUlkrIMkwA mQEl02wTSNbYzq0CAh9k5bPLTff3AJ993GQiyvEAhACa+EBLArDigA7weohTBBAR AgALBQI22vk7BAsDAgEAEgkQvJuQZxSWSsgHZUdQRwABATJMAJkBJdNsE0jW2M6t AgIfZOWzy0339wCffdxkIsrxAIQAmvhASwKw4oAO8HqIbQQwEQIALQUCQgWjyyYd AFBsZWFzZSB1c2UgZ3JlZ0B0dXJuc3RlcC5jb20gaW5zdGVhZAAKCRC8m5BnFJZK yAtUAJ94vS0d2pVdFT/qk1tyiHy+uF3YwgCfe6FgBxpKkH55bjEnKAcy/tbK9beJ ARwEEwECAAYFAj8NCDoACgkQ229lmotMvJzEJQf+KAya7SPGn8+mzFEmxS+RrG16 hoZHZwjPe7itdJWU0zQlEoLizGYe7uAHll1FbNXRTV58inQZFmaE85GTidKaimcF XVlj3Ya9CIQFa+hCjAmndKk+lhcuc8NH5ElyIDMgNwH73MauvE3RESOlGYdErF0J VqgxoVwXXlFPFpprNtz+C99AgxyH2NIzG3ZYCJOTTsqVdI8INwcH1yTgXX7IW+gs FPdWyHy2rLD2JbVJUZ2Mu0IBwLUwsL0GvbEWxLgmy1XBxz3NsyrncEoDUqUANpmb TRkZK4iOr4X4ZBEDSpCiUrJIRv4jFiezbUvh2gM5mNAomQ/iaW/RrRgpU9QgrIkB HAQTAQIABgUCPxDXxgAKCRAiQhgCUFjMcz9zB/9KpVv8KuZ7uRemfN9S6Jl1Ptas WKbQ0goYbXFUPl+eaj0PQSUkvG64IuLd00+SWFULro4hV9bqMigLh+bFGogIO1JP CJN4gifrR0ipi43fEBkKxoyCPNr5nDDeJT4iz4vGYvBSER4NNXfLmPM2UV2EpjQj uqS30zvni+KLDvrXjDbsN7zgaX/hSAkfRgBzjjeHKtNo6Cj71TkmWVo0dsDdl5f+ pcjAxEtIkMaspBZq92Eh0VTHDPugB0Jt0fAUJdyAtb5eieHWdlA7sdKdmxQxQgCw 002MgvYiuQvlnDQiKgXxeamh320D02s6nY4cr5oUM9QMlKwHnj3tDczgKa5TtCxH cmVnIFNhYmlubyBNdWxsYW5lIDxtam11bGxhbmVAdHVybnN0ZXAuY29tPohGBBAR AgAGBQI7KqGEAAoJEMAuD5JDqDw2BqMAnRwORylBnH5CwgNv/dKzI0mwXtxDAJ9M G1B2tgL5W5YLOob9ZYoFTSAEmohGBBARAgAGBQI7QmhbAAoJELHPdAZuqtcrX38A n1/6cOtgcMXtTnGx5SzCfoNHa5OKAKC1SQGk05L98BKmPhQow37tjelGkIhGBBAR AgAGBQI7cpOkAAoJEHEhUqs1l0lrusoAnA0Pu92KW85f/75Jnswwqf58S0NpAKCt nE55dmDCbWeFsPis2Bu01A00hohGBBARAgAGBQI7r4DBAAoJEEQeK/Xt7e+5OlwA oOi7Z5ALtaBTzxycHIHRWGzQXcOuAKCEQbb8H/hQ+snC/WLHvIr2DXTNF4hGBBAR AgAGBQI7sp2dAAoJEBEdzLh1J3AbOlQAnjoyJDSzH9i8Y1MdH4WaSvbc2af5AJwM mEK8RmDf6XY31nJ7/ts5BGvuJIhGBBARAgAGBQI7sqUTAAoJENElmsWUw7fwI58A n0gT/LKSABtor1BCKYoCivWgxhMsAJ93Dy6g/S70cRAYuJhE2tENCQVjo4hGBBAR AgAGBQI7syffAAoJENh2/K3Z1dz4LBEAn3UWlTNOlRrfQ0T8TILLSLbxUuYsAKCL Wjj7DU18NdLApeaKhkiEZX+aAohGBBARAgAGBQI7sz5rAAoJEG5a17pGD/2kzNsA niJQhzlgeGRueSNwN2RpkGMAcoM9AJ4jDHQSrbTg11q6L94gIvAI/oVuTYhGBBAR AgAGBQI7s1Z5AAoJEPqSCXOZKks/HwcAoKfynCyksRDAZsZieIsIQFmypY1wAJsH t7pKEdfslCgad9YFScKWfAD5hYhGBBIRAgAGBQI+kjO7AAoJELRhqmzMGs0Fr74A oJHAs/tOR1RzHdnM3sS60TmVoXHlAJ9VHHsqRGmP6kZ63fIiYQIQ4c2HHohGBBIR AgAGBQI//gGAAAoJEFjQsbInVyxHHnUAn2sQh7/irCm688pWq33uAjxFGIwkAKC5 DvXPjl30hz24YbAizgeso/JtgohGBBIRAgAGBQJBodwtAAoJEPIrW//vmJk19F4A oLS3OqeeZB9t51IIlAshnKFNFVtIAJ4s0MMAGw5fG3pkQGMdyNl/2Nd5nohGBBMR AgAGBQI+1wYVAAoJEFeDNeUV15MzWGoAnRbVpooawhkduWqNZztBtqx/Uc3kAKCw Q6NP4z8GiSVhK3mC5iA6eNUunohGBBMRAgAGBQI/DPKwAAoJEIQ3JM6fqHldrYwA n2rwn7fqathtAbFNjNQLGs7dk0H4AJ4/EK/1tICdCzeK+2OJ4+j3mA1OUohGBBMR AgAGBQJAAY+kAAoJEM/anYIGpzduedgAoKOvV9D/IPw2u/P9G0D9EwjE3ttsAJ0V tI1tJWxUd+L/znY0jMFJwTfE34hGBBMRAgAGBQJA32znAAoJEIzM4eDTwKZOWswA niKYYLeQgux0Di+xncqPtaNsUURnAJ4nG8Db022C7UN1HCp7HDYr/Mhd14hGBBMR AgAGBQJBpJ+AAAoJELGJ9rTSOkHI+H0An0nK0eN3tP3ppDnOzFopgVMV9NyFAJ9I 0UpsjHb8K+HyPwtl1AHIYedvkohLBBARAgALBQI22vmvBAsDAgEACgkQvJuQZxSW SsjwdwCfXlHi9YkRJlQZ/Jaf+Sb8r1UyXS4An2uTKUMZvywugcDd+eJoJH+F7lc1 iFMEEBECAAsFAjba+a8ECwMCAQASCRC8m5BnFJZKyAdlR1BHAAEB8HcAn15R4vWJ ESZUGfyWn/km/K9VMl0uAJ9rkylDGb8sLoHA3fniaCR/he5XNYhnBDARAgAnBQJA AhYuIB0gInJlbW92ZWQgZHVlIHRvIHNwYW0gb3ZlcnJ1bnMiAAoJEFjQsbInVyxH 1bAAoJn8XsfOidXyfo3qP5VQJOEqYrGyAJ9EdKJOH7n5gQS0vpAQEV4qU5Q0aoht BDARAgAtBQJCBaORJh0AUGxlYXNlIHVzZSBncmVnQHR1cm5zdGVwLmNvbSBpbnN0 ZWFkAAoJELybkGcUlkrI2D4An22zsiEXDMV/pWD9q3nXlPIueYfiAKCdaFuew0Yc p7ge5EQxNGYbbgmR64kBHAQTAQIABgUCPw0IOwAKCRDbb2Wai0y8nD3oCACSYGB6 WxENJR3WxJNNHd8JL9CIwyLqEYUSla7hWzAWuojJAEHinQ7e3yyy0grTuLlUEW7T Zppxd3ygRK7E5o+NnYKCskHTvo1OtbgBn2Wq4exZVW5xRbBvV3IboDtHTXxzC8Kb RP4jSpmrsq38eZ/lG/+Rcy8zWc20M1Dkcziaxha1pXFT11T1Lzo0aeZptZHXUEZi /tjG/obpVhmK6YF4xU/IwL7Xg0ogCvVgtoWqw/178GEAnR49x6vHqHDjQwKItKl5 03HGyKud63z0+t710xqhZvUa2CCWibOx1s7K5iZZSJ1gZszmDOsaJwVdLu08cNGq LMFVR1aPLyoEmia8iQEcBBMBAgAGBQI/ENfDAAoJECJCGAJQWMxz67kIAInh7oI7 XYo1I8G3E9lm+FARCkcj10YBvBWK0yt1JPCe0dP25/1U5+XaQvVoID1m2ILs7f1s RH2YW6zoEHkRNmB2jeQcQ8cz3oB+rXvlJFxWK8p0mgm/HXzQw76y6gWwTNlP7DQB wCldIbekfw93RpwL5M/TurTKbLdZNnc4ryI5SAFDJXS1JT16lufBQxa40rcUL43T riZvN2VLZgKqbTnzcnlBPwLoGcENfWo63Yhp0rKvgfyJv8kRRRTTVI581Gcnkh4W IXTJg2W/blndTLqLf7mzlK9LeM2fUnTgLKjYacyZWUVU1DEjvUQ5wgC61oS0q2YG 0aYbZs4qHaBbmvi0LEdyZWcgU2FiaW5vIE11bGxhbmUgPHdlYm1hc3RlckB0dXJu c3RlcC5jb20+iEYEEBECAAYFAjsqoYQACgkQwC4PkkOoPDY0bgCfeKJOgLc+yTo1 sO6aSKNuasP/2awAnAwuqFfV2sMZR41PSxowJScQMiBHiEYEEBECAAYFAjtCaFsA CgkQsc90Bm6q1yudQwCg4GXRV4+HYvc96C6K0kOlr5v7670AoKuEqIq/O8H4RLcx jWzDe/UUDEBgiEYEEBECAAYFAjtyk6QACgkQcSFSqzWXSWvnhQCgiTS+rBekqxa5 Xq2BPBiNPmXCEr4An0RfUGU9N09XoAFEOpp1FkXz6QLSiEYEEBECAAYFAjuvgMEA CgkQRB4r9e3t77lXvACgnbQsK8PnSyKAsnw4H8LPdoDA1xcAn38kKUovaUNFObYa X9K+OmplshEBiEYEEBECAAYFAjuynZ0ACgkQER3MuHUncBsymwCfe5F7QonCJ9eF hF3HwziWXKW37P4An146wZZ/XeOhIdGDYfNpPoe4Di3xiEYEEBECAAYFAjuypRMA CgkQ0SWaxZTDt/AI2wCdHq6QkoqFSEBUV2ORsecQ/frmzccAnRtCFJd87lt7V6+I NPf4H/Rgy+ZHiEYEEBECAAYFAjuzJ98ACgkQ2Hb8rdnV3PjncACgt6uzJoMuWVHB CaXypcEqtXw5DL8An1uNtKd2wEzYzTcERUZV6cp31CgGiEYEEBECAAYFAjuzVnkA CgkQ+pIJc5kqSz9ITACgk64Q4zrrq7SSyS29Y38cG/FnVFYAoKB9E7sv35Td+H0R pMNXiFGGvyxiiEYEEhECAAYFAj6SM7sACgkQtGGqbMwazQXSBwCggUoxiAPBciZN 1l2yHltVBFuE/ioAn1e6k7OoaIBJBsnoTZ6WcDQa7+CziEYEEhECAAYFAj/+AYQA CgkQWNCxsidXLEeffACgl+hVMGoPF6ZcHeUIsCtioIkbjj0AoKJCC2T3ZMY7zDxz PP/Y5Uq5oVwCiEYEEhECAAYFAkGh3C0ACgkQ8itb/++YmTURaACg0HwFvHmRduLj QOiE5EByIC9vEAoAmgMqqnBjc6vdkNNmSty8jdmGCkeViEYEExECAAYFAj8M8rAA CgkQhDckzp+oeV3Q0QCfdauNWOiOqqbOmezpIfCUDEKOsfAAn3SA9h9VZZfI+hZY WFPgFKQJRwYRiEYEExECAAYFAkABj64ACgkQz9qdgganN27NHQCgz4V7RYYhziaM pSFpa0LPzbfNrLgAn15eVBOMA7F8f+3AT/4cTXhgkVnEiEYEExECAAYFAkDfbOcA CgkQjMzh4NPApk7UpwCgv9CqvIS9rpgqn/qOOGORZ5VFWvcAn3YBu9nwBO5h3yRv FbJnwXn9vOLfiEYEExECAAYFAkGkn4AACgkQsYn2tNI6QchzrwCfcRYzeUbHUuSU Ezm5m/Oer0TuaYIAoIvhSxp2incORncrv0xuKzhrDOEPiEsEEBECAAsFAjba+YQE CwMCAQAKCRC8m5BnFJZKyHA8AKCyZ/9koUHWQtkTvTWGzZOR1NxuegCfZubtZYwo MJyOUZdTNUIaADysqZOIUwQQEQIACwUCNtr5hAQLAwIBABIJELybkGcUlkrIB2VH UEcAAQFwPACgsmf/ZKFB1kLZE701hs2TkdTcbnoAn2bm7WWMKDCcjlGXUzVCGgA8 rKmTiG0EMBECAC0FAkIFo1cmHQBQbGVhc2UgdXNlIGdyZWdAdHVybnN0ZXAuY29t IGluc3RlYWQACgkQvJuQZxSWSsib/QCglXGGxjOzEgKjUlJN2gKD3msHPI8Ani0K QekDNJXMzW3kbXKpAxlH+DA4iQEcBBMBAgAGBQI/DQg8AAoJENtvZZqLTLyclmMH /RStQC5OskWJxU7/JNg/kgy8YT9DbQSx76GsE4tXIW6q0pc7YQGBIJGYPvOwz0F4 areQiVjSPJt5Kc+eIiCWPrPw+5dINQkOIYxMxe41+8YVI4oFtMWf70jV1OFkSqvV NAglFDP7ryEQ597d+vUgvE+yZ/OhecKX5/fyZtgm4uH+ywuhZPpv+DmLfgBPJRn9 GO/uinZrTg+2piwcgQ/yqe/qO9WTg0iGAP49cNXVAmcpVkLfJGHD5+lL/MLQ4nBJ OgtambOg0nDRSely3oZylLKQJ9tLwpLQzUPlHTt+VaXU+BjU4ZI7ATofr9bOhQy8 VxD89C7z+boBOXn2u33OjaKJARwEEwECAAYFAj8Q18YACgkQIkIYAlBYzHNfgQf/ Xa/j3xGf+8FlTCYa5rvsp1Qe891UEEvyw23tTMhHh7p5xnNrKfja13ADTC1FNUMm JzE+yiMeI7ZdTlKtylTes02oBi0xJRX+yYRjlyzaKoEYuedvvS/zF1T1TYY58d1+ 7qnCGm7YbDtnnKGnXzLRkcCqD67Vh5CucQn1reSJDBVUSUb6+J2BFGT30UIomyL/ kFsrIGXfuWhjkPiLbtbrQJeVfxDWmEtzVzfLIgi/5awV2cFSRwkhYGL8+lzjXpQk A3HTTiE2W6T/hhkSiQzjaKPHbd/y6zbAVK9kGsQPO+/9VyHq60brzRBZ6zoR5i53 EYRcWjO0Dyfs2z003cazTbQzR3JlZyBTYWJpbm8gTXVsbGFuZSA8ZXZpbGdyZWdA Y29uZG9yLmNpcmNhLnVmbC5lZHU+iEUEEBECAAYFAjuzJ98ACgkQ2Hb8rdnV3PiI +wCcC+K1X6GA7bzaN9DymGzCuvlPi30AljYdON3eQVrd0YResatOKuZmy7mIRQQQ EQIABgUCO7M+awAKCRBuWte6Rg/9pIToAJjfLnmtcRXNx++Z4NRAh72kibN2AKCq skfckW9LbuMPXua6rBtD8WYpA4hGBBARAgAGBQI7KqGEAAoJEMAuD5JDqDw2mn8A n12jPFkl/PxwKS1B1QYhc/FJUNuBAJ9RbeKD8VZcV0AmywgbagVnlwHPoYhGBBAR AgAGBQI7QmhbAAoJELHPdAZuqtcrEGAAnjrwQaQkI2hwvTOAsqHd6gX8sUvlAJ9y nSQy6tqxd5LzhNoYSYUIvMRFq4hGBBARAgAGBQI7cpOjAAoJEHEhUqs1l0lrpCwA oJxCZX8Wlok9qjyZbXOUbfke1M2ZAKCAwY+D14DFIMgUYWJZQmLEuub2NIhGBBAR AgAGBQI7r4DBAAoJEEQeK/Xt7e+5FI8AoJa86Efi1OOUXEbZv4T5iMuAL+d5AJ4+ QW60Shu73SU7bU889SIE6ErETohGBBARAgAGBQI7sp2dAAoJEBEdzLh1J3AbeOUA n1ol8gWTQP2UPwaeE7xzVP9dcUTfAJ0feoQWh9iGFAdR1VhZs6AIue4BjohGBBAR AgAGBQI7sqUTAAoJENElmsWUw7fwwnIAn2mzIh6Br6pJzRIfX0vDehd/tyJpAJ9u jB7oeckBmMMbkRNdorpUvg8UO4hGBBARAgAGBQI7s1Z5AAoJEPqSCXOZKks/1rYA nAxX45EPLs0hId8Z0gbvuLJr+iTmAJ9ESj3TlruIvVJe4P2I1ohrB9F8UYhGBBIR AgAGBQI+kjO7AAoJELRhqmzMGs0FYNUAoIGt5mxaa9GmiOJaBCdbYIvi+cV6AJ0c E6ovS+PF6e2zG5OUtXd+W/IF8YhGBBIRAgAGBQI//gGEAAoJEFjQsbInVyxHeXIA oLfg/ZuV/8QPVgQW1XN9XCOLRJQgAJ9QKCpJSJcZvqZW6jbHBfXYkeBg/YhGBBIR AgAGBQJBodwtAAoJEPIrW//vmJk1q4QAn2v3gfwOwtEpxpiOS0v0rd2WosiYAJ0e rFb1S9G6CD5HIryV4n5iXXsEkYhGBBMRAgAGBQI/DPKwAAoJEIQ3JM6fqHldEQsA nRQ1ZnEjuEjYbZo52git/i2fh67AAKC7iLtSMdbkJH7GwHGOJlMufST4I4hGBBMR AgAGBQJAAY+uAAoJEM/anYIGpzdu1YEAoIgzO3O/rSqE6BQWLeiBXIhi02w1AKCq /FPr8/nUTGyA7fFeTel+Gi+zo4hGBBMRAgAGBQJA32znAAoJEIzM4eDTwKZO5NoA oIlsJFI+bG9vDgf+fjKryoQb+KTtAKCRlc4hr96nVb4baP88A2E/ErzCr4hGBBMR AgAGBQJBpJ+AAAoJELGJ9rTSOkHIG3YAnRLxDu1+5g9h8XXGXYBwl1x8muE+AJ94 LWKWghH55vfczp3Q5rtjL9GYQ4hJBDARAgAJBQJCBaL7Ah0gAAoJELybkGcUlkrI 7T0AoPRutBWGO2BRsOFEv+b1SDnc4fKsAKDG+pHgZd9r37hsZXxihXYwLgZGJIhL BBARAgALBQI22r8uBAsDAgEACgkQvJuQZxSWSsh9rACdEPgsLpao4FfBiB2lhJvK aaA7QngAoLEc8U48mTvovFp7Ruhu3/GZf1SViFMEEBECAAsFAjbavy4ECwMCAQAS CRC8m5BnFJZKyAdlR1BHAAEBfawAnRD4LC6WqOBXwYgdpYSbymmgO0J4AKCxHPFO PJk76Lxae0bobt/xmX9UlYkBHAQTAQIABgUCPw0IPQAKCRDbb2Wai0y8nBf5CACn XvsDd1lkN3JNFmZ9BgbTHTX1eEJX4BiYWH/9gAz/dkiyIn63q1YFP598Rm9LYJHQ s++x1d7rFTU5ow6Qn0KZdfR86V3bIH7ARf/IadRU5xsjozLOF6+MalJwDNp3Sj0i yDtUM56W1aoWsTq7erJjFQ7HVBj7gdS2Od2JMyFaxNHS01eIJNwJ2pWgfI9/PdPc RkwQx+x5tQ8/PXwT6RwYpoI2cqbO7BB+MS8NyyUOm6ARjIO8s74Od3v8TMk5Pcly ig3ns5Qywsqy6LdotZOVLzLUW62ZAXxkW+eitcrhhyhq51WdpxN/f/b6TiQnhKxn ApuEaskHXDUuXd7ilBYqiQEcBBMBAgAGBQI/ENfGAAoJECJCGAJQWMxzo6kIAJDc 3j7V/cfGDEDcUAQM78IQVEw7/sT225WrOObDN73ZrPlQheLBCSx/8C+nkKWZ3HLy q2sHN/FhjXchqb6Cug6ITbOpGp0ZAZWIUnimY2Xnu5hVvq9WlH74uLnOGya5DpE4 W90z2liN/fCS4yzh3jeboIy+M3t8flpI3aLD6mxveVadulWQITtQLiqTRBycIWNV k8EGz7rN0158EsgCQmiZGGHhQk0SvnE//xDLS/YKZX5AiKl32jvkGY3CQCS/CH5A WhDn0xysl2vF0EYbRa/QZ3YkZ1KN6ndWXZcNVpMET6b5zrnTst3iyY3SIrSsEo4B hZU+zA/LUJn6DPWjogC5BA0ENtq+xhAQAPkYoH5aBmF6Q5CV3AVsh4bsYezNRR8O 2OCjecbJ3HoLrOQ/40aUtjBKU9d8AhZIgLUV5SmZqZ8HdNP/46HFliBOmGW42A3u EF2rthccUdhQyiJXQym+lehWKzh4XAvb+ExN1eOqRsz7zhfoKp0UYeOEqU/Rg4So ebbvj6dDRgjGzB13VyQ4SuLE8OiOE2eXTpITYfbb6yUOF/32mPfIfHmwch04dfv2 wXPEgxEmK0Ngw+Po1gr9oSgmC66prrNlD6IAUwGgfNaroxIe+g8qzh90hE/K8xfz pEDp19J3tkItAjbBJstoXp18mAkKjX4t7eRdefXUkk+bGI78KqdLfDL2Qle3CH8I F3KiutapQvMF6PlTETlPtvFuuUs4INoBp1ajFOmPQFXz0AfGy0OplK33TGSGSfgM g71l6RfUodNQ+PVZX9x2Uk89PY3bzpnhV5JZzf24rnRPxfx2vIPFRzBhznzJZv8V +bv9kV7HAarTW56NoKVyOtQa8L9GAFgr5fSI/VhOSdvNILSd5JEHNmszbDgNRR0P fIizHHxbLY7288kjwEPwpVsYjY67VYy4XTjTNP18F1dDox0YbN4zISy1Kv884bEp QBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWakXUGfnHy9iUsiGSa6 q6Jew1XrPdYXAAICEACzF58lQmUUlBYcykR0bA4r0SEWVxqXGydbDvBo5R+wk+Pi ZXD3/aG6umDhg7KxbZt3J9j1aeIrCnyIHuK6E21er7HIfxGolqY3/Np1BWWAC8KU RhAZPT+x4Jo8RFWA2V2humF+OUkr+GFQ58jWoXSTLt9+GkElJf8yyRqQKo6Xahzo gH+8RGWgS5LjJsSFJzxu/wFG/kcP0nR7rap7tSYmVhe/Vol4pL7XukarE4NmqbfM S208WTAhRDcmeaAPm1mdBLnfDoAE2KXgN/JJ12ufSIMXTlRPx17/FZveab96qKVB ql08f7z7fGzBlzs6v9bREqxjnlTtxyLry1oqo+PuoM9+rXbDpuCyNQ6l4gEM6sKw 3CCpmwfQyUd/Tl7HlWxjgjIQ8mY5aTNPixtYqu++neKRqwk3/Z4HlHpGadHcfu5z FLi8/JDYsP1rBkBz8Hmj7qJ9FQT91ALpdOn7AJnq2CAlb3n9YZTcxSBulN2TyuGs VUPxr3Bloexzw/nXeAOhGZptKzOYzdSRiYUQf3oRrNtEqW4D8DyyXb9GBdXiccue /y5IKnB/EzYWBZVn6dMtoGwJmxBagBcGGio65jEtigQ+KFwNsBflupFDFv9fnrUq hiTiOMQfN/c/YDPp21XcnCUKKURGpwC7IsuyfoPG8yfXo00NLmAtQ/EFgLZSIIhO BBgRAgAGBQI22r7GABIJELybkGcUlkrIB2VHUEcAAQEiKwCeKA/NBkTHIPZCZh4S HRZnq2D1xocAoLNX9LMdOt080s7/rNC46ltdqOGT =XCSS -----END PGP PUBLIC KEY BLOCK----- Index: perl-Math-GMP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-GMP/devel/perl-Math-GMP.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-Math-GMP.spec 7 Mar 2009 21:33:32 -0000 1.15 +++ perl-Math-GMP.spec 7 Mar 2009 21:45:28 -0000 1.16 @@ -6,6 +6,7 @@ Group: Development/Libraries Url: http://search.cpan.org/dist/Math-GMP/ Source0: http://search.cpan.org/CPAN/authors/id/T/TU/TURNSTEP/Math-GMP-%{version}.tar.gz +Source1: 14964AC8.asc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: gmp-devel, perl(ExtUtils::MakeMaker), perl(Test::More), aspell-en @@ -47,6 +48,7 @@ # Locale set to en_US for spell check tests # Perl::Critic tests fail - disabled for now by setting TEST_CRITIC=0 # Pod::Coverage tests fail - disabled for now by not having BR: perl(Test::Pod::Coverage) +%{__gpg} --import %{SOURCE1} LC_ALL=en_US %{__make} -C source test \ TEST_AUTHOR=1 TEST_CRITIC=0 TEST_SIGNATURE=1 TEST_SPELL=1 TEST_VERBOSE=1 From tibbs at fedoraproject.org Sat Mar 7 22:03:37 2009 From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=) Date: Sat, 7 Mar 2009 22:03:37 +0000 (UTC) Subject: rpms/libSM/devel libSM.spec,1.25,1.26 Message-ID: <20090307220337.C988870116@cvs1.fedora.phx.redhat.com> Author: tibbs Update of /cvs/extras/rpms/libSM/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25322 Modified Files: libSM.spec Log Message: * Sat Mar 07 2009 Jason L Tibbitts III - 1.1.0-5 - Minor tweaks to summaries and descriptions. - Don't own /usr/include/X11. - Use a regular, unversioned dep on xorg-x11-filesystem. Index: libSM.spec =================================================================== RCS file: /cvs/extras/rpms/libSM/devel/libSM.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- libSM.spec 25 Feb 2009 13:06:39 -0000 1.25 +++ libSM.spec 7 Mar 2009 22:03:07 -0000 1.26 @@ -1,7 +1,7 @@ -Summary: X.Org X11 libSM runtime library +Summary: X.Org X11 SM runtime library Name: libSM Version: 1.1.0 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -17,19 +17,19 @@ BuildRequires: e2fsprogs-devel %description -X.Org X11 libSM runtime library +The X.Org X11 SM (Session Management) runtime library. %package devel -Summary: X.Org X11 libSM development package +Summary: X.Org X11 SM development package Group: Development/Libraries -Requires(pre): xorg-x11-filesystem >= 0.99.2-3 Requires: %{name} = %{version}-%{release} Requires: libICE-devel +Requires: xorg-x11-filesystem Requires: xorg-x11-proto-devel Requires: pkgconfig %description devel -X.Org X11 libSM development package +The X.Org X11 SM (Session Management) development package. %prep %setup -q @@ -61,7 +61,6 @@ %files devel %defattr(-,root,root,-) -%dir %{_includedir}/X11 %dir %{_includedir}/X11/SM %{_includedir}/X11/SM/SM.h %{_includedir}/X11/SM/SMlib.h @@ -70,6 +69,11 @@ %{_libdir}/pkgconfig/sm.pc %changelog +* Sat Mar 07 2009 Jason L Tibbitts III - 1.1.0-5 +- Minor tweaks to summaries and descriptions. +- Don't own /usr/include/X11. +- Use a regular, unversioned dep on xorg-x11-filesystem. + * Wed Feb 25 2009 Fedora Release Engineering - 1.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jkratoch at fedoraproject.org Sat Mar 7 22:10:25 2009 From: jkratoch at fedoraproject.org (Jan Kratochvil) Date: Sat, 7 Mar 2009 22:10:25 +0000 (UTC) Subject: rpms/gdb/devel gdb-archer.patch,1.3,1.4 gdb.spec,1.329,1.330 Message-ID: <20090307221025.C454270116@cvs1.fedora.phx.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26786 Modified Files: gdb-archer.patch gdb.spec Log Message: * Sat Mar 7 2009 Jan Kratochvil - 6.8.50.20090302-6 - Archer update to the snapshot: 543fb2154d3bd551344b990b911be5c6cc703504 - Fixes [delayed-symfile] excessive `(no debugging symbols found)' messages. gdb-archer.patch: Index: gdb-archer.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-archer.patch 7 Mar 2009 00:32:30 -0000 1.3 +++ gdb-archer.patch 7 Mar 2009 22:10:22 -0000 1.4 @@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ArcherBranchManagement GIT snapshot: -commit 6cf16c0711e844094ab694b3d929f7bd30b49f61 +commit 543fb2154d3bd551344b990b911be5c6cc703504 branch `archer' - the merge of branches: archer-jankratochvil-merge-expr @@ -866,7 +866,7 @@ /* Set BLOCK's using member to USING; if needed, allocate memory via diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c -index b23b294..e9bc53f 100644 +index b23b294..38a17a1 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -191,6 +191,8 @@ static int is_hardware_watchpoint (struct breakpoint *bpt); @@ -1004,7 +1004,28 @@ len = TYPE_LENGTH (value_type (v)); type = hw_write; if (b->type == bp_read_watchpoint) -@@ -4134,6 +4160,8 @@ set_raw_breakpoint_without_location (enum bptype bptype) +@@ -3948,8 +3974,8 @@ check_duplicates_for (CORE_ADDR address, struct obj_section *section) + } + + /* If we found a permanent breakpoint at this address, go over the +- list again and declare all the other breakpoints there to be the +- duplicates. */ ++ list again and declare all the other breakpoints there (except ++ other permanent breakpoints) to be the duplicates. */ + if (perm_bp) + { + perm_bp->duplicate = 0; +@@ -3963,7 +3989,8 @@ check_duplicates_for (CORE_ADDR address, struct obj_section *section) + ALL_BP_LOCATIONS (b) + if (b != perm_bp) + { +- if (b->owner->enable_state != bp_disabled ++ if (b->owner->enable_state != bp_permanent ++ && b->owner->enable_state != bp_disabled + && b->owner->enable_state != bp_call_disabled + && b->enabled && !b->shlib_disabled + && b->address == address /* address / overlay match */ +@@ -4134,6 +4161,8 @@ set_raw_breakpoint_without_location (enum bptype bptype) b->frame_id = null_frame_id; b->forked_inferior_pid = null_ptid; b->exec_pathname = NULL; @@ -1013,7 +1034,7 @@ b->ops = NULL; b->condition_not_parsed = 0; -@@ -4660,7 +4688,241 @@ static struct breakpoint_ops catch_vfork_breakpoint_ops = +@@ -4660,7 +4689,241 @@ static struct breakpoint_ops catch_vfork_breakpoint_ops = print_mention_catch_vfork }; @@ -1256,7 +1277,7 @@ If TEMPFLAG is non-zero, then make the breakpoint temporary. If COND_STRING is not NULL, then store it in the breakpoint. -@@ -4668,16 +4930,13 @@ static struct breakpoint_ops catch_vfork_breakpoint_ops = +@@ -4668,16 +4931,13 @@ static struct breakpoint_ops catch_vfork_breakpoint_ops = to the catchpoint. */ static struct breakpoint * @@ -1275,7 +1296,7 @@ b = set_raw_breakpoint (sal, bp_catchpoint); set_breakpoint_count (breakpoint_count + 1); -@@ -4691,6 +4950,23 @@ create_catchpoint (int tempflag, char *cond_string, +@@ -4691,6 +4951,23 @@ create_catchpoint (int tempflag, char *cond_string, b->disposition = tempflag ? disp_del : disp_donttouch; b->ops = ops; @@ -1299,7 +1320,7 @@ mention (b); update_global_location_list (1); -@@ -4775,6 +5051,23 @@ static struct breakpoint_ops catch_exec_breakpoint_ops = +@@ -4775,6 +5052,23 @@ static struct breakpoint_ops catch_exec_breakpoint_ops = print_mention_catch_exec }; @@ -1323,7 +1344,7 @@ static int hw_breakpoint_used_count (void) { -@@ -5310,8 +5603,6 @@ create_breakpoints (struct symtabs_and_lines sals, char **addr_string, +@@ -5310,8 +5604,6 @@ create_breakpoints (struct symtabs_and_lines sals, char **addr_string, cond_string, type, disposition, thread, ignore_count, ops, from_tty, enabled); } @@ -1332,7 +1353,7 @@ } /* Parse ARG which is assumed to be a SAL specification possibly -@@ -5637,7 +5928,6 @@ break_command_really (char *arg, char *cond_string, int thread, +@@ -5637,7 +5929,6 @@ break_command_really (char *arg, char *cond_string, int thread, b->ops = ops; b->enable_state = enabled ? bp_enabled : bp_disabled; @@ -1340,7 +1361,7 @@ mention (b); } -@@ -5649,6 +5939,11 @@ break_command_really (char *arg, char *cond_string, int thread, +@@ -5649,6 +5940,11 @@ break_command_really (char *arg, char *cond_string, int thread, discard_cleanups (breakpoint_chain); /* But cleanup everything else. */ do_cleanups (old_chain); @@ -1352,7 +1373,7 @@ } /* Set a breakpoint. -@@ -6131,7 +6426,7 @@ can_use_hardware_watchpoint (struct value *v) +@@ -6131,7 +6427,7 @@ can_use_hardware_watchpoint (struct value *v) || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT && TYPE_CODE (vtype) != TYPE_CODE_ARRAY)) { @@ -1361,7 +1382,7 @@ int len = TYPE_LENGTH (value_type (v)); if (!TARGET_REGION_OK_FOR_HW_WATCHPOINT (vaddr, len)) -@@ -6668,6 +6963,122 @@ catch_ada_exception_command (char *arg, int from_tty, +@@ -6668,6 +6964,122 @@ catch_ada_exception_command (char *arg, int from_tty, from_tty); } @@ -1484,7 +1505,7 @@ /* Implement the "catch assert" command. */ static void -@@ -7134,6 +7545,7 @@ delete_breakpoint (struct breakpoint *bpt) +@@ -7134,6 +7546,7 @@ delete_breakpoint (struct breakpoint *bpt) xfree (bpt->source_file); if (bpt->exec_pathname != NULL) xfree (bpt->exec_pathname); @@ -1492,7 +1513,7 @@ /* Be sure no bpstat's are pointing at it after it's been freed. */ /* FIXME, how can we find all bpstat's? -@@ -8041,6 +8453,56 @@ single_step_breakpoint_inserted_here_p (CORE_ADDR pc) +@@ -8041,6 +8454,56 @@ single_step_breakpoint_inserted_here_p (CORE_ADDR pc) return 0; } @@ -1549,7 +1570,7 @@ /* This help string is used for the break, hbreak, tbreak and thbreak commands. It is defined as a macro to prevent duplication. -@@ -8073,6 +8535,8 @@ static void +@@ -8073,6 +8536,8 @@ static void add_catch_command (char *name, char *docstring, void (*sfunc) (char *args, int from_tty, struct cmd_list_element *command), @@ -1558,7 +1579,7 @@ void *user_data_catch, void *user_data_tcatch) { -@@ -8082,11 +8546,13 @@ add_catch_command (char *name, char *docstring, +@@ -8082,11 +8547,13 @@ add_catch_command (char *name, char *docstring, &catch_cmdlist); set_cmd_sfunc (command, sfunc); set_cmd_context (command, user_data_catch); @@ -1572,7 +1593,7 @@ } void -@@ -8361,36 +8827,50 @@ Set temporary catchpoints to catch events."), +@@ -8361,36 +8828,50 @@ Set temporary catchpoints to catch events."), Catch an exception, when caught.\n\ With an argument, catch only exceptions with the given name."), catch_catch_command, @@ -8714,7 +8735,7 @@ extern struct cleanup *make_final_cleanup (make_cleanup_ftype *, void *); diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo -index 10e7388..86941fe 100644 +index 10e7388..d2c0f1e 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -955,8 +955,10 @@ Connect to process ID @var{number}, as with the @code{attach} command. @@ -8846,7 +8867,44 @@ @item fork A call to @code{fork}. This is currently only available for HP-UX and @sc{gnu}/Linux. -@@ -6536,6 +6640,12 @@ Without this format, @value{GDBN} displays pointers to and arrays of +@@ -4711,6 +4815,24 @@ the program to report that some thread has stopped before prompting for + another command. In background execution, @value{GDBN} immediately gives + a command prompt so that you can issue other commands while your program runs. + ++You need to explicitly enable asynchronous mode before you can use ++background execution commands. You can use these commands to ++manipulate the asynchronous mode setting: ++ ++ at table @code ++ at kindex set target-async ++ at item set target-async on ++Enable asynchronous mode. ++ at item set target-async off ++Disable asynchronous mode. ++ at kindex show target-async ++ at item show target-async ++Show the current target-async setting. ++ at end table ++ ++If the target doesn't support async mode, @value{GDBN} issues an error ++message if you attempt to use the background execution commands. ++ + To specify background execution, add a @code{&} to the command. For example, + the background form of the @code{continue} command is @code{continue&}, or + just @code{c&}. The execution commands that accept background execution +@@ -4776,11 +4898,6 @@ only the current thread. To stop the whole program in non-stop mode, + use @code{interrupt -a}. + @end table + +-You may need to explicitly enable async mode before you can use background +-execution commands, with the @code{set target-async 1} command. If the +-target doesn't support async mode, @value{GDBN} issues an error message +-if you attempt to use the background execution commands. +- + @node Thread-Specific Breakpoints + @subsection Thread-Specific Breakpoints + +@@ -6536,6 +6653,12 @@ Without this format, @value{GDBN} displays pointers to and arrays of @code{char}, @w{@code{unsigned char}}, and @w{@code{signed char}} as strings. Single-byte members of a vector are displayed as an integer array. @@ -8859,7 +8917,7 @@ @end table For example, to print the program counter in hex (@pxref{Registers}), type -@@ -7408,6 +7518,20 @@ On HP-UX systems, if you refer to a function or variable name that +@@ -7408,6 +7531,20 @@ On HP-UX systems, if you refer to a function or variable name that begins with a dollar sign, @value{GDBN} searches for a user or system name first, before it searches for a convenience variable. @@ -8880,7 +8938,7 @@ @node Registers @section Registers -@@ -7931,13 +8055,17 @@ support: +@@ -7931,13 +8068,17 @@ support: @table @code @item set target-charset @var{charset} @kindex set target-charset @@ -8904,7 +8962,7 @@ @item set host-charset @var{charset} @kindex set host-charset Set the current host character set to @var{charset}. -@@ -7947,10 +8075,9 @@ system it is running on; you can override that default using the +@@ -7947,10 +8088,9 @@ system it is running on; you can override that default using the @code{set host-charset} command. @value{GDBN} can only use certain character sets as its host character @@ -8918,7 +8976,7 @@ @item set charset @var{charset} @kindex set charset -@@ -7974,37 +8101,6 @@ Show the name of the current target charset. +@@ -7974,37 +8114,6 @@ Show the name of the current target charset. @end table @@ -8956,7 +9014,7 @@ Here is an example of @value{GDBN}'s character set support in action. Assume that the following source code has been placed in the file @file{charset-test.c}: -@@ -12510,6 +12606,12 @@ It is possible for the function you call via the @code{print} or +@@ -12510,6 +12619,12 @@ It is possible for the function you call via the @code{print} or the function, or if you passed it incorrect arguments). What happens in that case is controlled by the @code{set unwindonsignal} command. @@ -8969,7 +9027,7 @@ @table @code @item set unwindonsignal @kindex set unwindonsignal -@@ -12526,6 +12628,23 @@ received. +@@ -12526,6 +12641,23 @@ received. @kindex show unwindonsignal Show the current setting of stack unwinding in the functions called by @value{GDBN}. @@ -8993,7 +9051,7 @@ @end table @cindex weak alias functions -@@ -17815,7 +17934,7 @@ command: +@@ -17815,7 +17947,7 @@ command: @table @code @kindex source @cindex execute commands from a file @@ -9002,7 +9060,7 @@ Execute the command file @var{filename}. @end table -@@ -17832,6 +17951,11 @@ If @code{-v}, for verbose mode, is given then @value{GDBN} displays +@@ -17832,6 +17964,11 @@ If @code{-v}, for verbose mode, is given then @value{GDBN} displays each command as it is executed. The option must be given before @var{filename}, and is interpreted as part of the filename anywhere else. @@ -9014,7 +9072,7 @@ Commands that would ask for confirmation if used interactively proceed without asking when used in a command file. Many @value{GDBN} commands that normally print messages to say what they are doing omit the messages -@@ -18093,8 +18217,6 @@ containing @code{end}. For example: +@@ -18093,8 +18230,6 @@ containing @code{end}. For example: @smallexample (@value{GDBP}) python @@ -9023,7 +9081,7 @@ >print 23 >end 23 -@@ -18107,6 +18229,14 @@ in a Python script. This can be controlled using @code{maint set +@@ -18107,6 +18242,14 @@ in a Python script. This can be controlled using @code{maint set python print-stack}: if @code{on}, the default, then Python stack printing is enabled; if @code{off}, then Python stack printing is disabled. @@ -9038,7 +9096,7 @@ @end table @node Python API -@@ -18114,6 +18244,14 @@ disabled. +@@ -18114,6 +18257,14 @@ disabled. @cindex python api @cindex programming in python @@ -9053,7 +9111,7 @@ @cindex python stdout @cindex python pagination At startup, @value{GDBN} overrides Python's @code{sys.stdout} and -@@ -18125,8 +18263,17 @@ situation, a Python @code{KeyboardInterrupt} exception is thrown. +@@ -18125,8 +18276,17 @@ situation, a Python @code{KeyboardInterrupt} exception is thrown. @menu * Basic Python:: Basic Python Functions. * Exception Handling:: @@ -9072,7 +9130,7 @@ @end menu @node Basic Python -@@ -18152,10 +18299,30 @@ command as having originated from the user invoking it interactively. +@@ -18152,10 +18312,30 @@ command as having originated from the user invoking it interactively. It must be a boolean value. If omitted, it defaults to @code{False}. @end defun @@ -9107,7 +9165,7 @@ spaces if the parameter has a multi-part name. For example, @samp{print object} is a valid parameter name. -@@ -18179,6 +18346,28 @@ If no exception is raised, the return value is always an instance of +@@ -18179,6 +18359,28 @@ If no exception is raised, the return value is always an instance of @code{gdb.Value} (@pxref{Values From Inferior}). @end defun @@ -9136,7 +9194,7 @@ @findex gdb.write @defun write string Print a string to @value{GDBN}'s paginated standard output stream. -@@ -18193,6 +18382,66 @@ Flush @value{GDBN}'s paginated standard output stream. Flushing +@@ -18193,6 +18395,66 @@ Flush @value{GDBN}'s paginated standard output stream. Flushing function. @end defun @@ -9203,7 +9261,7 @@ @node Exception Handling @subsubsection Exception Handling @cindex python exceptions -@@ -18224,6 +18473,44 @@ message as its value, and the Python call stack backtrace at the +@@ -18224,6 +18486,44 @@ message as its value, and the Python call stack backtrace at the Python statement closest to where the @value{GDBN} error occured as the traceback. @@ -9248,7 +9306,7 @@ @node Values From Inferior @subsubsection Values From Inferior @cindex values from inferior, with Python -@@ -18258,8 +18545,21 @@ bar = some_val['foo'] +@@ -18258,8 +18558,21 @@ bar = some_val['foo'] Again, @code{bar} will also be a @code{gdb.Value} object. @@ -9272,7 +9330,7 @@ @defmethod Value dereference This method returns a new @code{gdb.Value} object whose contents is -@@ -18282,7 +18582,7 @@ The result @code{bar} will be a @code{gdb.Value} object holding the +@@ -18282,7 +18595,7 @@ The result @code{bar} will be a @code{gdb.Value} object holding the value pointed to by @code{foo}. @end defmethod @@ -9281,7 +9339,7 @@ If this @code{gdb.Value} represents a string, then this method converts the contents to a Python string. Otherwise, this method will throw an exception. -@@ -18309,6 +18609,468 @@ The optional @var{errors} argument is the same as the corresponding +@@ -18309,6 +18622,468 @@ The optional @var{errors} argument is the same as the corresponding argument to Python's @code{string.decode} method. @end defmethod @@ -9750,7 +9808,7 @@ @node Commands In Python @subsubsection Commands In Python -@@ -18320,7 +19082,7 @@ You can implement new @value{GDBN} CLI commands in Python. A CLI +@@ -18320,7 +19095,7 @@ You can implement new @value{GDBN} CLI commands in Python. A CLI command is implemented using an instance of the @code{gdb.Command} class, most commonly using a subclass. @@ -9759,7 +9817,7 @@ The object initializer for @code{Command} registers the new command with @value{GDBN}. This initializer is normally invoked from the subclass' own @code{__init__} method. -@@ -18332,11 +19094,11 @@ an exception is raised. +@@ -18332,11 +19107,11 @@ an exception is raised. There is no support for multi-line commands. @@ -9773,7 +9831,7 @@ one of the @samp{COMPLETE_} constants defined below. This argument tells @value{GDBN} how to perform completion for this command. If not given, @value{GDBN} will attempt to complete using the object's -@@ -18563,6 +19325,374 @@ registration of the command with @value{GDBN}. Depending on how the +@@ -18563,6 +19338,374 @@ registration of the command with @value{GDBN}. Depending on how the Python code is read into @value{GDBN}, you may need to import the @code{gdb} module explicitly. @@ -10148,7 +10206,7 @@ @node Interpreters @chapter Command Interpreters @cindex command interpreters -@@ -22273,6 +23403,103 @@ Unfreezing a variable does not update it, only subsequent +@@ -22273,6 +23416,103 @@ Unfreezing a variable does not update it, only subsequent (gdb) @end smallexample @@ -10252,7 +10310,7 @@ @c %%%%%%%%%%%%%%%%%%%%%%%%%%%% SECTION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @node GDB/MI Data Manipulation -@@ -23832,6 +25059,10 @@ as possible presense of the @code{frozen} field in the output +@@ -23832,6 +25072,10 @@ as possible presense of the @code{frozen} field in the output of @code{-varobj-create}. @item pending-breakpoints Indicates presence of the @option{-f} option to the @code{-break-insert} command. @@ -10263,6 +10321,35 @@ @item thread-info Indicates presence of the @code{-thread-info} command. +@@ -25402,28 +26646,6 @@ data in a @file{gmon.out} file, be sure to move it to a safe location. + Configuring with @samp{--enable-profiling} arranges for @value{GDBN} to be + compiled with the @samp{-pg} compiler option. + +- at kindex maint set linux-async +- at kindex maint show linux-async +- at cindex asynchronous support +- at item maint set linux-async +- at itemx maint show linux-async +-Control the GNU/Linux native asynchronous support +-(@pxref{Background Execution}) of @value{GDBN}. +- +-GNU/Linux native asynchronous support will be disabled until you use +-the @samp{maint set linux-async} command to enable it. +- +- at kindex maint set remote-async +- at kindex maint show remote-async +- at cindex asynchronous support +- at item maint set remote-async +- at itemx maint show remote-async +-Control the remote asynchronous support +-(@pxref{Background Execution}) of @value{GDBN}. +- +-Remote asynchronous support will be disabled until you use +-the @samp{maint set remote-async} command to enable it. +- + @kindex maint show-debug-regs + @cindex x86 hardware debug registers + @item maint show-debug-regs diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c index ce11d89..eaa6a13 100644 --- a/gdb/dwarf2-frame.c @@ -20738,12 +20825,45 @@ +++ b/gdb/python/lib/gdb/libstdcxx/v6/__init__.py @@ -0,0 +1 @@ + +diff --git a/gdb/python/lib/gdb/libstdcxx/v6/hook.in b/gdb/python/lib/gdb/libstdcxx/v6/hook.in +new file mode 100644 +index 0000000..fe7c072 +--- /dev/null ++++ b/gdb/python/lib/gdb/libstdcxx/v6/hook.in +@@ -0,0 +1,27 @@ ++# -*- python -*- ++# Copyright (C) 2009 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++import sys ++import gdb ++ ++# Update module path. ++dir = '@dir@' ++if not dir in sys.path: ++ sys.path.insert(0, dir) ++ ++# Load the pretty-printers. ++from libstdcxx.v6.printers import register_libstdcxx_printers ++register_libstdcxx_printers (gdb.current_objfile ()) diff --git a/gdb/python/lib/gdb/libstdcxx/v6/printers.py b/gdb/python/lib/gdb/libstdcxx/v6/printers.py new file mode 100644 -index 0000000..7a77ad4 +index 0000000..ccef97d --- /dev/null +++ b/gdb/python/lib/gdb/libstdcxx/v6/printers.py -@@ -0,0 +1,647 @@ +@@ -0,0 +1,646 @@ +# Pretty-printers for libstc++. + +# Copyright (C) 2008, 2009 Free Software Foundation, Inc. @@ -20773,8 +20893,9 @@ + self.val = val + + def to_string (self): -+ return '%s (count %d) %s' % (self.typename, self.val['_M_refcount'], -+ self.val['_M_ptr']) ++ return '%s (count %d) %s' % (self.typename, ++ self.val['_M_refcount']['_M_pi']['_M_use_count'], ++ self.val['_M_ptr']) + +class UniquePointerPrinter: + "Print a unique_ptr" @@ -21358,21 +21479,20 @@ + pretty_printers_dict[re.compile('^std::queue<.*>$')] = lambda val: StdStackOrQueuePrinter("std::queue", val) + pretty_printers_dict[re.compile('^std::set<.*>$')] = lambda val: StdSetPrinter("std::set", val) + pretty_printers_dict[re.compile('^std::stack<.*>$')] = lambda val: StdStackOrQueuePrinter("std::stack", val) ++ pretty_printers_dict[re.compile('^std::unique_ptr<.*>$')] = UniquePointerPrinter + pretty_printers_dict[re.compile('^std::vector<.*>$')] = StdVectorPrinter -+ # vector + -+ # C++0x stuff. -+ # array - the default seems reasonable -+ # smart_ptr? seems to only be in boost right now -+ pretty_printers_dict[re.compile('^std::tr1::shared_ptr<.*>$')] = lambda val: StdPointerPrinter ('std::shared_ptr', val) -+ pretty_printers_dict[re.compile('^std::tr1::weak_ptr<.*>$')] = lambda val: StdPointerPrinter ('std::weak_ptr', val) -+ pretty_printers_dict[re.compile('^std::tr1::unique_ptr<.*>$')] = UniquePointerPrinter -+ pretty_printers_dict[re.compile('^std::tr1::unordered_map<.*>$')] = lambda val: Tr1UnorderedMapPrinter ('std::tr1::unordered_map', val) -+ pretty_printers_dict[re.compile('^std::tr1::unordered_set<.*>$')] = lambda val: Tr1UnorderedSetPrinter ('std::tr1::unordered_set', val) -+ pretty_printers_dict[re.compile('^std::tr1::unordered_multimap<.*>$')] = lambda val: Tr1UnorderedMapPrinter ('std::tr1::unordered_multimap', val) -+ pretty_printers_dict[re.compile('^std::tr1::unordered_multiset<.*>$')] = lambda val: Tr1UnorderedSetPrinter ('std::tr1::unordered_multiset', val) ++ # These are the C++0x printers. They also exist in the standard namespace. ++ # For array - the default GDB pretty-printer seems reasonable. ++ pretty_printers_dict[re.compile('^std::(tr1::)?shared_ptr<.*>$')] = lambda val: StdPointerPrinter ('std::shared_ptr', val) ++ pretty_printers_dict[re.compile('^std::(tr1::)?weak_ptr<.*>$')] = lambda val: StdPointerPrinter ('std::weak_ptr', val) ++ pretty_printers_dict[re.compile('^std::(tr1::)?unordered_map<.*>$')] = lambda val: Tr1UnorderedMapPrinter ('std::tr1::unordered_map', val) ++ pretty_printers_dict[re.compile('^std::(tr1::)?unordered_set<.*>$')] = lambda val: Tr1UnorderedSetPrinter ('std::tr1::unordered_set', val) ++ pretty_printers_dict[re.compile('^std::(tr1::)?unordered_multimap<.*>$')] = lambda val: Tr1UnorderedMapPrinter ('std::tr1::unordered_multimap', val) ++ pretty_printers_dict[re.compile('^std::(tr1::)?unordered_multiset<.*>$')] = lambda val: Tr1UnorderedSetPrinter ('std::tr1::unordered_multiset', val) + -+ # Extensions. ++ ++ # Extensions to std, tr1 pretty-printers. + pretty_printers_dict[re.compile('^__gnu_cxx::slist<.*>$')] = StdSlistPrinter + + if True: @@ -21390,7 +21510,6 @@ +pretty_printers_dict = {} + +build_libstdcxx_dictionary () -+register_libstdcxx_printers (gdb.current_objfile()) diff --git a/gdb/python/python-block.c b/gdb/python/python-block.c new file mode 100644 index 0000000..8019e9d @@ -28514,7 +28633,7 @@ + #endif /* #ifndef STACK_H */ diff --git a/gdb/symfile.c b/gdb/symfile.c -index 63b5c1d..8ca5457 100644 +index 63b5c1d..b047e94 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -929,6 +929,17 @@ new_symfile_objfile (struct objfile *objfile, int mainline, int verbo) @@ -28571,7 +28690,7 @@ debugfile = find_separate_debug_file (objfile); if (debugfile) { -@@ -1049,8 +1064,9 @@ symbol_file_add_with_addrs_or_offsets (bfd *abfd, int from_tty, +@@ -1049,8 +1064,10 @@ symbol_file_add_with_addrs_or_offsets (bfd *abfd, int from_tty, xfree (debugfile); } @@ -28579,11 +28698,12 @@ - && print_symbol_loading) + /* has_any_debug_symbols is not fully compatible with the former calls which + would just be needlessly expensive here. */ -+ if (print_symbol_loading && !has_any_debug_symbols (objfile) && mainline) ++ if ((from_tty || info_verbose) && print_symbol_loading ++ && !has_any_debug_symbols (objfile) && mainline) { wrap_here (""); printf_unfiltered (_("(no debugging symbols found)")); -@@ -2423,13 +2439,15 @@ reread_symbols (void) +@@ -2423,13 +2440,15 @@ reread_symbols (void) zero is OK since dbxread.c also does what it needs to do if objfile->global_psymbols.size is 0. */ (*objfile->sf->sym_read) (objfile, 0); @@ -28600,7 +28720,7 @@ /* We're done reading the symbol file; finish off complaints. */ clear_complaints (&symfile_complaints, 0, 1); -@@ -2726,7 +2744,7 @@ allocate_symtab (char *filename, struct objfile *objfile) +@@ -2726,7 +2745,7 @@ allocate_symtab (char *filename, struct objfile *objfile) } struct partial_symtab * @@ -28609,7 +28729,7 @@ { struct partial_symtab *psymtab; -@@ -3040,7 +3058,8 @@ again2: +@@ -3040,7 +3059,8 @@ again2: struct partial_symtab * start_psymtab_common (struct objfile *objfile, @@ -30022,6 +30142,18 @@ /* Command logging facility. */ #define target_log_command(p) \ +diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog +index e3aaeab..e886869 100644 +--- a/gdb/testsuite/ChangeLog ++++ b/gdb/testsuite/ChangeLog +@@ -1,3 +1,7 @@ ++2009-03-05 Pedro Alves ++ ++ * gdb.arch/i386-permbkpt.S, gdb.arch/i386-permbkpt.exp: New. ++ + 2009-02-18 Jan Kratochvil + + * gdb.base/macscp.exp (objfile): Move it to ${objdir}/${subdir}/. diff --git a/gdb/testsuite/configure.ac b/gdb/testsuite/configure.ac index 3d8fae4..5fb9067 100644 --- a/gdb/testsuite/configure.ac @@ -30035,6 +30167,100 @@ # Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify +diff --git a/gdb/testsuite/gdb.arch/i386-permbkpt.S b/gdb/testsuite/gdb.arch/i386-permbkpt.S +new file mode 100644 +index 0000000..02a31d6 +--- /dev/null ++++ b/gdb/testsuite/gdb.arch/i386-permbkpt.S +@@ -0,0 +1,30 @@ ++/* Copyright 2009 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . ++ ++ This file is part of the gdb testsuite. */ ++ ++#define CONCAT1(a, b) CONCAT2(a, b) ++#define CONCAT2(a, b) a ## b ++ ++#ifdef SYMBOL_PREFIX ++# define SYMBOL(str) CONCAT1(SYMBOL_PREFIX, str) ++#else ++# define SYMBOL(str) str ++#endif ++ ++ .global SYMBOL(main) ++SYMBOL(main): ++ int3 ++ ret +diff --git a/gdb/testsuite/gdb.arch/i386-permbkpt.exp b/gdb/testsuite/gdb.arch/i386-permbkpt.exp +new file mode 100644 +index 0000000..f1930e5 +--- /dev/null ++++ b/gdb/testsuite/gdb.arch/i386-permbkpt.exp +@@ -0,0 +1,52 @@ ++# Copyright (C) 2009 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++ ++# This file is part of the gdb testsuite. ++ ++if $tracelevel { ++ strace $tracelevel ++} ++ ++# Test inserting breakpoints over permanent breakpoints on i386 and amd64. ++ ++if { ![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] } then { ++ verbose "Skipping i386 test for multi break at permanent breakpoint location." ++ return ++} ++ ++set testfile "i386-permbkpt" ++set srcfile ${testfile}.S ++set binfile ${objdir}/${subdir}/${testfile} ++ ++# Some targets have leading underscores on assembly symbols. ++# TODO: detect this automatically ++set additional_flags "" ++if { [istarget "*-*-cygwin*"] || [istarget "*-*-mingw*"] } then { ++ set additional_flags "additional_flags=-DSYMBOL_PREFIX=_" ++} ++ ++if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } { ++ untested i386-permbkpt.exp ++ return -1 ++} ++ ++gdb_exit ++gdb_start ++gdb_reinitialize_dir $srcdir/$subdir ++gdb_load ${binfile} ++ ++gdb_test "break main" "" "First permanent break" ++gdb_test "break main" "" "Second permanent break" diff --git a/gdb/testsuite/gdb.arch/powerpc-power7.exp b/gdb/testsuite/gdb.arch/powerpc-power7.exp new file mode 100644 index 0000000..d9c48f9 @@ -36654,7 +36880,7 @@ } diff --git a/gdb/top.c b/gdb/top.c -index d676f02..83c54db 100644 +index d676f02..d6b17f0 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -377,6 +377,7 @@ execute_command (char *p, int from_tty) @@ -36665,6 +36891,16 @@ /* Force cleanup of any alloca areas if using C alloca instead of a builtin alloca. */ +@@ -1246,7 +1247,8 @@ quit_target (void *arg) + struct qt_args *qt = (struct qt_args *)arg; + + /* Kill or detach all inferiors. */ +- iterate_over_inferiors (kill_or_detach, qt); ++ if (target_has_execution) ++ iterate_over_inferiors (kill_or_detach, qt); + + /* Give all pushed targets a chance to do minimal cleanup, and pop + them all out. */ diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 83df64e..003ef3a 100644 --- a/gdb/tracepoint.c Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.329 retrieving revision 1.330 diff -u -r1.329 -r1.330 --- gdb.spec 7 Mar 2009 16:52:39 -0000 1.329 +++ gdb.spec 7 Mar 2009 22:10:23 -0000 1.330 @@ -13,7 +13,7 @@ # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 5%{?_with_upstream:.upstream}%{?dist} +Release: 6%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -840,6 +840,10 @@ %endif %changelog +* Sat Mar 7 2009 Jan Kratochvil - 6.8.50.20090302-6 +- Archer update to the snapshot: 543fb2154d3bd551344b990b911be5c6cc703504 + - Fixes [delayed-symfile] excessive `(no debugging symbols found)' messages. + * Sat Mar 7 2009 Jan Kratochvil - 6.8.50.20090302-5 - Improve `gdb-6.6-buildid-locate-rpm.patch' by dlopen() (+pkg-config compat.). From pali at fedoraproject.org Sat Mar 7 22:31:18 2009 From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=) Date: Sat, 7 Mar 2009 22:31:18 +0000 (UTC) Subject: rpms/cherokee/devel .cvsignore, 1.6, 1.7 cherokee.spec, 1.11, 1.12 import.log, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <20090307223118.67B6870116@cvs1.fedora.phx.redhat.com> Author: pali Update of /cvs/pkgs/rpms/cherokee/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30987/devel Modified Files: .cvsignore cherokee.spec import.log sources Log Message: TEXT_TO_CVS Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 16 Feb 2009 13:16:07 -0000 1.6 +++ .cvsignore 7 Mar 2009 22:30:45 -0000 1.7 @@ -1 +1 @@ -cherokee-0.98.1.tar.gz +cherokee-0.99.0.tar.gz Index: cherokee.spec =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/devel/cherokee.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cherokee.spec 24 Feb 2009 07:19:04 -0000 1.11 +++ cherokee.spec 7 Mar 2009 22:30:47 -0000 1.12 @@ -10,8 +10,8 @@ %endif Name: cherokee -Version: 0.98.1 -Release: 2%{?dist} +Version: 0.99.0 +Release: 1%{?dist} Summary: Flexible and Fast Webserver Group: Applications/Internet @@ -150,6 +150,7 @@ %config(noreplace) %{_var}/www/%{name}/images/cherokee-logo.png %config(noreplace) %{_var}/www/%{name}/images/default-bg.png %config(noreplace) %{_var}/www/%{name}/images/powered_by_cherokee.png +%config(noreplace) %{_var}/www/%{name}/images/favicon.ico %config(noreplace) %{_var}/www/%{name}/index.html %files devel @@ -164,6 +165,9 @@ %changelog +* Sat Mar 07 2009 Pavel Lisy - 0.99.0-1 +- updated to 0.99.0 + * Mon Feb 23 2009 Fedora Release Engineering - 0.98.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/devel/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 16 Feb 2009 13:16:07 -0000 1.8 +++ import.log 7 Mar 2009 22:30:47 -0000 1.9 @@ -6,3 +6,4 @@ cherokee-0_11_2-4_fc10:HEAD:cherokee-0.11.2-4.fc10.src.rpm:1230644204 cherokee-0_11_6-1_fc10:HEAD:cherokee-0.11.6-1.fc10.src.rpm:1230705672 cherokee-0_98_1-1_fc10:HEAD:cherokee-0.98.1-1.fc10.src.rpm:1234790139 +cherokee-0_99_0-1_fc10:HEAD:cherokee-0.99.0-1.fc10.src.rpm:1236464980 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Feb 2009 13:16:07 -0000 1.6 +++ sources 7 Mar 2009 22:30:47 -0000 1.7 @@ -1 +1 @@ -23ec213de911f4bf4cf0a3f21804e844 cherokee-0.98.1.tar.gz +719f16b3d99df5c22f0954eeb0d2cade cherokee-0.99.0.tar.gz From pali at fedoraproject.org Sat Mar 7 22:32:37 2009 From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=) Date: Sat, 7 Mar 2009 22:32:37 +0000 (UTC) Subject: rpms/cherokee/F-9 .cvsignore, 1.6, 1.7 cherokee.spec, 1.8, 1.9 import.log, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <20090307223237.4C0D570116@cvs1.fedora.phx.redhat.com> Author: pali Update of /cvs/pkgs/rpms/cherokee/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31392/F-9 Modified Files: .cvsignore cherokee.spec import.log sources Log Message: TEXT_TO_CVS Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 16 Feb 2009 13:40:36 -0000 1.6 +++ .cvsignore 7 Mar 2009 22:32:06 -0000 1.7 @@ -1 +1 @@ -cherokee-0.98.1.tar.gz +cherokee-0.99.0.tar.gz Index: cherokee.spec =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/F-9/cherokee.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cherokee.spec 16 Feb 2009 13:40:36 -0000 1.8 +++ cherokee.spec 7 Mar 2009 22:32:07 -0000 1.9 @@ -10,7 +10,7 @@ %endif Name: cherokee -Version: 0.98.1 +Version: 0.99.0 Release: 1%{?dist} Summary: Flexible and Fast Webserver @@ -150,6 +150,7 @@ %config(noreplace) %{_var}/www/%{name}/images/cherokee-logo.png %config(noreplace) %{_var}/www/%{name}/images/default-bg.png %config(noreplace) %{_var}/www/%{name}/images/powered_by_cherokee.png +%config(noreplace) %{_var}/www/%{name}/images/favicon.ico %config(noreplace) %{_var}/www/%{name}/index.html %files devel @@ -164,6 +165,12 @@ %changelog +* Sat Mar 07 2009 Pavel Lisy - 0.99.0-1 +- updated to 0.99.0 + +* Mon Feb 23 2009 Fedora Release Engineering - 0.98.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 16 2009 Pavel Lisy - 0.98.1-1 - updated to 0.98.1 * Sat Jan 24 2009 Caol??n McNamara - 0.11.6-2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/F-9/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 16 Feb 2009 13:40:36 -0000 1.8 +++ import.log 7 Mar 2009 22:32:07 -0000 1.9 @@ -6,3 +6,4 @@ cherokee-0_11_2-4_fc10:F-9:cherokee-0.11.2-4.fc10.src.rpm:1230644813 cherokee-0_11_6-1_fc10:F-9:cherokee-0.11.6-1.fc10.src.rpm:1230705823 cherokee-0_98_1-1_fc10:F-9:cherokee-0.98.1-1.fc10.src.rpm:1234791613 +cherokee-0_99_0-1_fc10:F-9:cherokee-0.99.0-1.fc10.src.rpm:1236465097 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Feb 2009 13:40:36 -0000 1.6 +++ sources 7 Mar 2009 22:32:07 -0000 1.7 @@ -1 +1 @@ -23ec213de911f4bf4cf0a3f21804e844 cherokee-0.98.1.tar.gz +719f16b3d99df5c22f0954eeb0d2cade cherokee-0.99.0.tar.gz From pali at fedoraproject.org Sat Mar 7 22:33:51 2009 From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=) Date: Sat, 7 Mar 2009 22:33:51 +0000 (UTC) Subject: rpms/cherokee/F-10 .cvsignore, 1.6, 1.7 cherokee.spec, 1.9, 1.10 import.log, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <20090307223351.BB1C270116@cvs1.fedora.phx.redhat.com> Author: pali Update of /cvs/pkgs/rpms/cherokee/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31769/F-10 Modified Files: .cvsignore cherokee.spec import.log sources Log Message: TEXT_TO_CVS Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/F-10/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 16 Feb 2009 13:41:49 -0000 1.6 +++ .cvsignore 7 Mar 2009 22:33:20 -0000 1.7 @@ -1 +1 @@ -cherokee-0.98.1.tar.gz +cherokee-0.99.0.tar.gz Index: cherokee.spec =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/F-10/cherokee.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cherokee.spec 16 Feb 2009 13:41:49 -0000 1.9 +++ cherokee.spec 7 Mar 2009 22:33:21 -0000 1.10 @@ -10,7 +10,7 @@ %endif Name: cherokee -Version: 0.98.1 +Version: 0.99.0 Release: 1%{?dist} Summary: Flexible and Fast Webserver @@ -150,6 +150,7 @@ %config(noreplace) %{_var}/www/%{name}/images/cherokee-logo.png %config(noreplace) %{_var}/www/%{name}/images/default-bg.png %config(noreplace) %{_var}/www/%{name}/images/powered_by_cherokee.png +%config(noreplace) %{_var}/www/%{name}/images/favicon.ico %config(noreplace) %{_var}/www/%{name}/index.html %files devel @@ -164,6 +165,12 @@ %changelog +* Sat Mar 07 2009 Pavel Lisy - 0.99.0-1 +- updated to 0.99.0 + +* Mon Feb 23 2009 Fedora Release Engineering - 0.98.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 16 2009 Pavel Lisy - 0.98.1-1 - updated to 0.98.1 * Sat Jan 24 2009 Caol??n McNamara - 0.11.6-2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/F-10/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 16 Feb 2009 13:41:49 -0000 1.8 +++ import.log 7 Mar 2009 22:33:21 -0000 1.9 @@ -6,3 +6,4 @@ cherokee-0_11_2-4_fc10:F-10:cherokee-0.11.2-4.fc10.src.rpm:1230644879 cherokee-0_11_6-1_fc10:F-10:cherokee-0.11.6-1.fc10.src.rpm:1230705923 cherokee-0_98_1-1_fc10:F-10:cherokee-0.98.1-1.fc10.src.rpm:1234791686 +cherokee-0_99_0-1_fc10:F-10:cherokee-0.99.0-1.fc10.src.rpm:1236465177 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Feb 2009 13:41:49 -0000 1.6 +++ sources 7 Mar 2009 22:33:21 -0000 1.7 @@ -1 +1 @@ -23ec213de911f4bf4cf0a3f21804e844 cherokee-0.98.1.tar.gz +719f16b3d99df5c22f0954eeb0d2cade cherokee-0.99.0.tar.gz From pali at fedoraproject.org Sat Mar 7 22:35:05 2009 From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=) Date: Sat, 7 Mar 2009 22:35:05 +0000 (UTC) Subject: rpms/cherokee/EL-4 .cvsignore, 1.6, 1.7 cherokee.spec, 1.9, 1.10 import.log, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <20090307223505.BDFD970116@cvs1.fedora.phx.redhat.com> Author: pali Update of /cvs/pkgs/rpms/cherokee/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32131/EL-4 Modified Files: .cvsignore cherokee.spec import.log sources Log Message: TEXT_TO_CVS Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/EL-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 16 Feb 2009 13:43:02 -0000 1.6 +++ .cvsignore 7 Mar 2009 22:34:35 -0000 1.7 @@ -1 +1 @@ -cherokee-0.98.1.tar.gz +cherokee-0.99.0.tar.gz Index: cherokee.spec =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/EL-4/cherokee.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cherokee.spec 16 Feb 2009 13:43:02 -0000 1.9 +++ cherokee.spec 7 Mar 2009 22:34:35 -0000 1.10 @@ -10,7 +10,7 @@ %endif Name: cherokee -Version: 0.98.1 +Version: 0.99.0 Release: 1%{?dist} Summary: Flexible and Fast Webserver @@ -150,6 +150,7 @@ %config(noreplace) %{_var}/www/%{name}/images/cherokee-logo.png %config(noreplace) %{_var}/www/%{name}/images/default-bg.png %config(noreplace) %{_var}/www/%{name}/images/powered_by_cherokee.png +%config(noreplace) %{_var}/www/%{name}/images/favicon.ico %config(noreplace) %{_var}/www/%{name}/index.html %files devel @@ -164,6 +165,12 @@ %changelog +* Sat Mar 07 2009 Pavel Lisy - 0.99.0-1 +- updated to 0.99.0 + +* Mon Feb 23 2009 Fedora Release Engineering - 0.98.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 16 2009 Pavel Lisy - 0.98.1-1 - updated to 0.98.1 * Sat Jan 24 2009 Caol??n McNamara - 0.11.6-2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/EL-4/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 16 Feb 2009 13:43:02 -0000 1.9 +++ import.log 7 Mar 2009 22:34:35 -0000 1.10 @@ -7,3 +7,4 @@ cherokee-0_11_2-4_fc10:EL-4:cherokee-0.11.2-4.fc10.src.rpm:1230644946 cherokee-0_11_6-1_fc10:EL-4:cherokee-0.11.6-1.fc10.src.rpm:1230705995 cherokee-0_98_1-1_fc10:EL-4:cherokee-0.98.1-1.fc10.src.rpm:1234791759 +cherokee-0_99_0-1_fc10:EL-4:cherokee-0.99.0-1.fc10.src.rpm:1236465251 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/EL-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Feb 2009 13:43:02 -0000 1.6 +++ sources 7 Mar 2009 22:34:35 -0000 1.7 @@ -1 +1 @@ -23ec213de911f4bf4cf0a3f21804e844 cherokee-0.98.1.tar.gz +719f16b3d99df5c22f0954eeb0d2cade cherokee-0.99.0.tar.gz From pali at fedoraproject.org Sat Mar 7 22:36:22 2009 From: pali at fedoraproject.org (=?utf-8?q?Pavel_Lis=C3=BD?=) Date: Sat, 7 Mar 2009 22:36:22 +0000 (UTC) Subject: rpms/cherokee/EL-5 .cvsignore, 1.6, 1.7 cherokee.spec, 1.8, 1.9 import.log, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <20090307223622.945C770116@cvs1.fedora.phx.redhat.com> Author: pali Update of /cvs/pkgs/rpms/cherokee/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32561/EL-5 Modified Files: .cvsignore cherokee.spec import.log sources Log Message: TEXT_TO_CVS Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/EL-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 16 Feb 2009 13:44:16 -0000 1.6 +++ .cvsignore 7 Mar 2009 22:35:52 -0000 1.7 @@ -1 +1 @@ -cherokee-0.98.1.tar.gz +cherokee-0.99.0.tar.gz Index: cherokee.spec =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/EL-5/cherokee.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cherokee.spec 16 Feb 2009 13:44:16 -0000 1.8 +++ cherokee.spec 7 Mar 2009 22:35:52 -0000 1.9 @@ -10,7 +10,7 @@ %endif Name: cherokee -Version: 0.98.1 +Version: 0.99.0 Release: 1%{?dist} Summary: Flexible and Fast Webserver @@ -150,6 +150,7 @@ %config(noreplace) %{_var}/www/%{name}/images/cherokee-logo.png %config(noreplace) %{_var}/www/%{name}/images/default-bg.png %config(noreplace) %{_var}/www/%{name}/images/powered_by_cherokee.png +%config(noreplace) %{_var}/www/%{name}/images/favicon.ico %config(noreplace) %{_var}/www/%{name}/index.html %files devel @@ -164,6 +165,12 @@ %changelog +* Sat Mar 07 2009 Pavel Lisy - 0.99.0-1 +- updated to 0.99.0 + +* Mon Feb 23 2009 Fedora Release Engineering - 0.98.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 16 2009 Pavel Lisy - 0.98.1-1 - updated to 0.98.1 * Sat Jan 24 2009 Caol??n McNamara - 0.11.6-2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/EL-5/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 16 Feb 2009 13:44:16 -0000 1.8 +++ import.log 7 Mar 2009 22:35:52 -0000 1.9 @@ -6,3 +6,4 @@ cherokee-0_11_2-4_fc10:EL-5:cherokee-0.11.2-4.fc10.src.rpm:1230645040 cherokee-0_11_6-1_fc10:EL-5:cherokee-0.11.6-1.fc10.src.rpm:1230706069 cherokee-0_98_1-1_fc10:EL-5:cherokee-0.98.1-1.fc10.src.rpm:1234791832 +cherokee-0_99_0-1_fc10:EL-5:cherokee-0.99.0-1.fc10.src.rpm:1236465324 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cherokee/EL-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Feb 2009 13:44:16 -0000 1.6 +++ sources 7 Mar 2009 22:35:52 -0000 1.7 @@ -1 +1 @@ -23ec213de911f4bf4cf0a3f21804e844 cherokee-0.98.1.tar.gz +719f16b3d99df5c22f0954eeb0d2cade cherokee-0.99.0.tar.gz From tgl at fedoraproject.org Sat Mar 7 22:54:02 2009 From: tgl at fedoraproject.org (Tom Lane) Date: Sat, 7 Mar 2009 22:54:02 +0000 (UTC) Subject: rpms/mysql/F-9 mysql-expired-certs.patch, NONE, 1.1 mysql-no-dbug.patch, NONE, 1.1 .cvsignore, 1.32, 1.33 mysql-errno.patch, 1.3, 1.4 mysql-testing.patch, 1.10, 1.11 mysql.init, 1.22, 1.23 mysql.spec, 1.106, 1.107 sources, 1.32, 1.33 mysql-innodb-crash.patch, 1.1, NONE mysql-ss-test.patch, 1.1, NONE mysql-ssl.patch, 1.1, NONE Message-ID: <20090307225403.2235270116@cvs1.fedora.phx.redhat.com> Author: tgl Update of /cvs/pkgs/rpms/mysql/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3521 Modified Files: .cvsignore mysql-errno.patch mysql-testing.patch mysql.init mysql.spec sources Added Files: mysql-expired-certs.patch mysql-no-dbug.patch Removed Files: mysql-innodb-crash.patch mysql-ss-test.patch mysql-ssl.patch Log Message: Update to mysql version 5.0.77; fix problem with expired SSL certs mysql-expired-certs.patch: --- NEW FILE mysql-expired-certs.patch --- Replace expired SSL certificates so that the regression tests can be run with SSL enabled. This shouldn't be needed anymore in future upstream releases. From: Date: January 28 2009 3:19pm Subject: bzr commit into mysql-5.0-bugteam branch (joro:2730) Bug#42366 List-Archive: http://lists.mysql.com/commits/64296 X-Bug: 42366 Message-Id: <200901281419.n0SEJQFl024918 at magare.gmz> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/kgeorge/mysql/work/B42366-5.0-bugteam/ based on revid:chad at mysql.com 2730 Georgi Kodinov 2009-01-28 Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT" Re-generated the PKI files needed. Removed the ones that are not needed. Updated the tests to reference the correct SSL subject. removed: mysql-test/std_data/server-cert-des.pem mysql-test/std_data/server-key-des.pem modified: mysql-test/r/openssl_1.result mysql-test/std_data/cacert.pem mysql-test/std_data/client-cert.pem mysql-test/std_data/client-key.pem mysql-test/std_data/server-cert.pem mysql-test/std_data/server-key.pem mysql-test/std_data/server8k-cert.pem mysql-test/std_data/server8k-key.pem mysql-test/t/openssl_1.test per-file messages: mysql-test/r/openssl_1.result Bug #42366: Updated the tests to reference the correct SSL subject mysql-test/std_data/cacert.pem Bug #42366: Re-generated the PKI files needed. mysql-test/std_data/client-cert.pem Bug #42366: Re-generated the PKI files needed. mysql-test/std_data/client-key.pem Bug #42366: Re-generated the PKI files needed. mysql-test/std_data/server-cert-des.pem Bug #42366: Removed the ones that are not needed. mysql-test/std_data/server-cert.pem Bug #42366: Re-generated the PKI files needed. mysql-test/std_data/server-key-des.pem Bug #42366: Removed the ones that are not needed. mysql-test/std_data/server-key.pem Bug #42366: Re-generated the PKI files needed. mysql-test/std_data/server8k-cert.pem Bug #42366: Re-generated the PKI files needed. mysql-test/std_data/server8k-key.pem Bug #42366: Re-generated the PKI files needed. mysql-test/t/openssl_1.test Bug #42366: Updated the tests to reference the correct SSL subject === modified file 'mysql-test/r/openssl_1.result' --- a/mysql-test/r/openssl_1.result 2007-07-25 15:46:50 +0000 +++ b/mysql-test/r/openssl_1.result 2009-01-28 14:18:50 +0000 @@ -3,8 +3,8 @@ create table t1(f1 int); insert into t1 values (5); grant select on test.* to ssl_user1 at localhost require SSL; grant select on test.* to ssl_user2 at localhost require cipher "DHE-RSA-AES256-SHA"; -grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com"; -grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; +grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com"; +grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; grant select on test.* to ssl_user5 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx"; flush privileges; connect(localhost,ssl_user5,,test,MASTER_PORT,MASTER_SOCKET); === modified file 'mysql-test/std_data/cacert.pem' --- a/mysql-test/std_data/cacert.pem 2007-07-27 15:39:07 +0000 +++ b/mysql-test/std_data/cacert.pem 2009-01-28 14:18:50 +0000 @@ -1,17 +1,17 @@ -----BEGIN CERTIFICATE----- -MIICrTCCAhagAwIBAgIJAIAO/Ybiptv1MA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV +MIICrTCCAhagAwIBAgIJAJXpePU0UOTVMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD -VQQKEwhNeVNRTCBBQjAeFw0wNjA1MDMwODQ4NTRaFw0wOTAxMjcwODQ4NTRaMEQx +VQQKEwhNeVNRTCBBQjAeFw0wOTAxMjgxMDQ5NDZaFw0xNDAxMjcxMDQ5NDZaMEQx CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA -+C46EQl1u7tQ6gb9eqc8V079gr8YmDPCEqtjO8bCIbchpjOpDITx0WZz36Sn9E72 -GPJwNip4FxLaPRIA3xNQHM5cE5U53qznlRx1Fc4O3hcWCvyCqNDl/vzPAh3pI6Bl -Ku9hfHXpp93W812smVPe9haShEXGgbEPYGzvOfVdu/MCAwEAAaOBpjCBozAdBgNV -HQ4EFgQUjIy/6OCTmqtPHBFha6/qzVk3yTcwdAYDVR0jBG0wa4AUjIy/6OCTmqtP -HBFha6/qzVk3yTehSKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxh -MRAwDgYDVQQHEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAIAO/Ybiptv1 -MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEA8lD9zyB820Oq1aj7ZafX -De/hbdt9RIl2tzgw2K3r1KZGdXJVL0vSt5fZ51Nq9lg7OPJy3iXf+caBJEp0IJpB -uf4Gfr6zfXw+UlY6ZthRtHQHoXKcbskECjH5/ps/Uaa+dpVQ9O+Ii1rPzmgo6ztM -s+xZ46ESBt4WiHXm8kwbU9Y= +4XQHAe5R1+TXC8noZtWf+d5E0v1C59FWpn9SWEUCBjE5UiIwuJvi4Y+7xWGOXLAI +/JzJx5gNXLBiTsE/zh0uX9fKlajLhxB0GN+QU0ZlpQ1BeYipEcNXeI/7cT499f6v +XWabnTflivdCgHSWUOQ20/Lzs6kP6/e6OoZd/DPSjPECAwEAAaOBpjCBozAdBgNV +HQ4EFgQU8uLqVWWkmuKsnZf1RWz294wRrd8wdAYDVR0jBG0wa4AU8uLqVWWkmuKs +nZf1RWz294wRrd+hSKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxh +MRAwDgYDVQQHEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAJXpePU0UOTV +MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMMTE5sDN+Z0ZlV7KvH3g +6+aKvql8dTpRT3hYukeQlWua0nq74WPGVw0c4e/M/vbiMwmJcCYpB9pd4+dHqzSw +aPyoenjY6UF8n7B4quWy3SIUk2LSHeJLW+kzJn2afN9gvipFhdVh/uU2TIyLGOur +Z/vmJX2W7hF1uqPnbfa8Lrw= -----END CERTIFICATE----- === modified file 'mysql-test/std_data/client-cert.pem' --- a/mysql-test/std_data/client-cert.pem 2007-07-27 15:39:07 +0000 +++ b/mysql-test/std_data/client-cert.pem 2009-01-28 14:18:50 +0000 @@ -1,42 +1,55 @@ Certificate: Data: - Version: 1 (0x0) - Serial Number: 1 (0x1) - Signature Algorithm: md5WithRSAEncryption + Version: 3 (0x2) + Serial Number: 3 (0x3) + Signature Algorithm: sha1WithRSAEncryption Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB Validity - Not Before: May 3 08:55:39 2006 GMT - Not After : Jan 27 08:55:39 2009 GMT - Subject: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com + Not Before: Jan 28 11:04:39 2009 GMT + Not After : Jan 28 11:04:39 2010 GMT + Subject: C=SE, ST=Uppsala, O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com Subject Public Key Info: Public Key Algorithm: rsaEncryption RSA Public Key: (512 bit) Modulus (512 bit): - 00:d8:db:68:28:49:84:4d:d6:0f:5c:bc:3d:9a:ab: - 70:d5:3e:f5:b5:17:ba:ef:e1:f8:87:54:30:22:1f: - 81:07:bf:f9:24:7f:8a:54:10:e9:5f:e6:99:50:04: - d4:3b:55:a9:f1:52:ad:12:2b:5a:da:5c:be:8c:3e: - 5b:9e:b0:5a:19 + 00:e1:52:30:2c:d9:be:64:28:91:5d:7a:fd:d9:e9: + 14:35:7a:d2:94:4e:91:46:e0:db:9f:6b:79:f4:4c: + ac:6e:07:61:34:86:74:62:a7:a8:44:af:fa:87:87: + a8:7d:42:61:ff:ab:50:d4:7b:bf:75:fa:d5:d5:b3: + 74:fb:56:1e:37 Exponent: 65537 (0x10001) - Signature Algorithm: md5WithRSAEncryption - 07:57:bf:07:92:c2:8e:86:24:6b:0a:bf:e5:31:21:44:c3:60: - 02:a6:ac:9e:f7:db:7a:6e:fc:4f:d4:7b:54:18:80:47:d2:4a: - 63:0e:e3:f8:af:6e:58:e3:97:5a:2b:82:5d:76:20:d1:33:a0: - f5:43:a1:d1:51:f4:ca:c8:b3:1a:66:4e:0e:55:df:d2:e8:fa: - 83:18:42:f5:ec:66:40:f0:39:e8:f9:d7:cf:f6:dd:e4:7b:69: - dd:0c:92:d8:52:95:43:6f:29:3d:f0:8d:4c:dd:52:ea:6b:a0: - 39:0f:dc:59:a7:5c:37:6b:8b:05:44:b7:69:ea:a3:58:e0:4e: - ce:d6 + X509v3 extensions: + X509v3 Basic Constraints: + CA:FALSE + X509v3 Subject Key Identifier: + 58:30:B5:9B:2C:05:94:06:BA:3D:3C:F0:B2:CD:1D:67:65:E3:7F:85 + X509v3 Authority Key Identifier: + keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF + DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB + serial:95:E9:78:F5:34:50:E4:D5 + + Signature Algorithm: sha1WithRSAEncryption + 05:19:e3:13:14:fc:c5:28:bf:69:f8:00:b3:25:cb:bd:ca:9f: + 2f:4c:b3:a8:04:11:f0:74:27:bd:82:2c:b4:49:9b:a7:59:f0: + f7:87:d1:e0:ba:99:a2:fe:4b:1d:10:6f:e4:a2:b3:cd:7f:8b: + 68:31:46:ee:cd:9e:e2:47:e1:4c:fa:74:d1:e2:8b:cc:a0:4b: + a8:24:d1:a4:c3:6b:2a:c6:28:cd:41:e0:06:48:e6:cf:f2:3c: + ca:37:95:d7:29:64:6b:91:91:83:e7:ac:c8:0b:87:bc:da:a6: + aa:f1:44:43:c8:74:7b:15:26:91:2e:03:c4:71:50:6c:f8:68: + dc:8c -----BEGIN CERTIFICATE----- -MIIB5jCCAU8CAQEwDQYJKoZIhvcNAQEEBQAwRDELMAkGA1UEBhMCU0UxEDAOBgNV -BAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFC -MB4XDTA2MDUwMzA4NTUzOVoXDTA5MDEyNzA4NTUzOVowdzELMAkGA1UEBhMCU0Ux -EDAOBgNVBAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15 -U1FMIEFCMTEwLwYJKoZIhvcNAQkBFiJhYnN0cmFjdC5teXNxbC5kZXZlbG9wZXJA -bXlzcWwuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANjbaChJhE3WD1y8PZqr -cNU+9bUXuu/h+IdUMCIfgQe/+SR/ilQQ6V/mmVAE1DtVqfFSrRIrWtpcvow+W56w -WhkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQAHV78HksKOhiRrCr/lMSFEw2ACpqye -99t6bvxP1HtUGIBH0kpjDuP4r25Y45daK4JddiDRM6D1Q6HRUfTKyLMaZk4OVd/S -6PqDGEL17GZA8Dno+dfP9t3ke2ndDJLYUpVDbyk98I1M3VLqa6A5D9xZp1w3a4sF -RLdp6qNY4E7O1g== +MIICfzCCAeigAwIBAgIBAzANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ +MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT +UUwgQUIwHhcNMDkwMTI4MTEwNDM5WhcNMTAwMTI4MTEwNDM5WjBlMQswCQYDVQQG +EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxMTAvBgkq +hkiG9w0BCQEWImFic3RyYWN0Lm15c3FsLmRldmVsb3BlckBteXNxbC5jb20wXDAN +BgkqhkiG9w0BAQEFAANLADBIAkEA4VIwLNm+ZCiRXXr92ekUNXrSlE6RRuDbn2t5 +9EysbgdhNIZ0YqeoRK/6h4eofUJh/6tQ1Hu/dfrV1bN0+1YeNwIDAQABo4GjMIGg +MAkGA1UdEwQCMAAwHQYDVR0OBBYEFFgwtZssBZQGuj088LLNHWdl43+FMHQGA1Ud +IwRtMGuAFPLi6lVlpJrirJ2X9UVs9veMEa3foUikRjBEMQswCQYDVQQGEwJTRTEQ +MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT +UUwgQUKCCQCV6Xj1NFDk1TANBgkqhkiG9w0BAQUFAAOBgQAFGeMTFPzFKL9p+ACz +Jcu9yp8vTLOoBBHwdCe9giy0SZunWfD3h9Hgupmi/ksdEG/korPNf4toMUbuzZ7i +R+FM+nTR4ovMoEuoJNGkw2sqxijNQeAGSObP8jzKN5XXKWRrkZGD56zIC4e82qaq +8URDyHR7FSaRLgPEcVBs+GjcjA== -----END CERTIFICATE----- === modified file 'mysql-test/std_data/client-key.pem' --- a/mysql-test/std_data/client-key.pem 2007-07-27 15:39:07 +0000 +++ b/mysql-test/std_data/client-key.pem 2009-01-28 14:18:50 +0000 @@ -1,9 +1,9 @@ -----BEGIN RSA PRIVATE KEY----- -MIIBOgIBAAJBANjbaChJhE3WD1y8PZqrcNU+9bUXuu/h+IdUMCIfgQe/+SR/ilQQ -6V/mmVAE1DtVqfFSrRIrWtpcvow+W56wWhkCAwEAAQJAK27WT6tZylUjQomZNQ89 -TBiOEbUtBbqWklQ0R8FTkH9uKV+8KYQ+k+tMkoAEGFfChB0YfofNQ2KZYWWw4yOB -WQIhAPXXDQt73aou10s+cmKM3C3WzLmIZtrvm9wNBXWDGxgTAiEA4dG4cXrZfa1M -TTbjzNU1/Jf50/M8SvZDWMPQWxJ8oqMCIH6zBpYUkHlVCsBMvsbrsc4uFfTIx7mu -I7WVQGr/1sbhAiBf4uFirjtztgZUMx5/d3k5DH80lG/hlLf8FQl/4lWx6QIhAPHw -CXfPUbUFl4r/i9Br5+exGol50qX4F3aP5Sh5EnZT +MIIBOQIBAAJBAOFSMCzZvmQokV16/dnpFDV60pROkUbg259refRMrG4HYTSGdGKn +qESv+oeHqH1CYf+rUNR7v3X61dWzdPtWHjcCAwEAAQJAXYooM8ZlcuEgj+VKU1ee +qyEFIMqJJxqcMk+E/nWCM96WxCP3zHNSrqNfSpI3ld7QzMwhdRz+gFLxT2gGNpIw +MQIhAPxzM/lDihe67X3ADYtDl9ZjA8Pm430x9sXlcxI17tCZAiEA5H1SyFl4mUee +9VnfSC2XGW7lwz72ZygfVX+b7tLWF08CIEh40gzW5MfXM+KLxdea+fXjyursV5ZT +R6KcMiKiNQLRAiAcmHqlzFzFgisotai2Fc6VRkXHG7gmzOSvBJt1VjmpDQIge6jf +2N7whTdvC4ferB+zUlgWQdyvx1c3T4gnt6PYdaY= -----END RSA PRIVATE KEY----- === removed file 'mysql-test/std_data/server-cert-des.pem' --- a/mysql-test/std_data/server-cert-des.pem 2006-09-25 14:44:15 +0000 +++ b/mysql-test/std_data/server-cert-des.pem 1970-01-01 00:00:00 +0000 @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICljCCAX4CAQEwDQYJKoZIhvcNAQEEBQAwUTELMAkGA1UEBhMCU0UxEDAOBgNV -BAgTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCMRAwDgYDVQQLEwdTdXBwb3J0 -MQswCQYDVQQDEwJDQTAeFw0wNjA4MjgxMTA4NTlaFw0wOTA1MjQxMTA4NTlaMFUx -CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBB -QjEQMA4GA1UECxMHU3VwcG9ydDEPMA0GA1UEAxMGc2VydmVyMIGfMA0GCSqGSIb3 -DQEBAQUAA4GNADCBiQKBgQDEiOVZcWYzZe7I8xhhUwCzvmkZifAXeMTH+8XKGLHX -NWF3FLduAmeAad9oOZgBKb+oWTdRDWXqwu6nYYUBfrUpaY27/wLkgWRgewL3LZnw -W2FjhNsjx3gI2NK+Pix47q9d+a+5T4AW5+lK499l0K0k2cvyFdIerhDW8R0t8Uru -twIDAQABMA0GCSqGSIb3DQEBBAUAA4IBAQC2LQcqLg52RbelWrKutlJ5E6rzugnJ -ZAlbN9sM98O2xFiIGDA3tb5j9LAEjE0E+RqdptEYnvy9b3szhLYXtIILZTkClf9r -Uwu1nUYPTyp+9ZYCa4fovOU5h1Ogv+9UZPds/LPDwWEn8K+lvscB4X57wJyuoEck -1Mu41OA6h77181MydSdgZo0oquJDWhdCsYHXVFVs0F6naMm2uPMCTDiQVlhHJuTO -VQMNIwxRFtvsv2tpsXsaP/8sT32d5CFebfxxSVnqQvJ4ZdIrphl6L43XU01rsEcE -K8KYujZQ6SKws+HVcGqsr7TPgJfJE6D+5RazvvIQISPvx4eduebqzqdC ------END CERTIFICATE----- === modified file 'mysql-test/std_data/server-cert.pem' --- a/mysql-test/std_data/server-cert.pem 2007-07-27 15:39:07 +0000 +++ b/mysql-test/std_data/server-cert.pem 2009-01-28 14:18:50 +0000 @@ -1,42 +1,55 @@ Certificate: Data: - Version: 1 (0x0) + Version: 3 (0x2) Serial Number: 1 (0x1) - Signature Algorithm: md5WithRSAEncryption + Signature Algorithm: sha1WithRSAEncryption Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB Validity - Not Before: May 3 08:54:13 2006 GMT - Not After : Jan 27 08:54:13 2009 GMT - Subject: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB, CN=localhost/emailAddress=abstract.mysql.developer at mysql.com + Not Before: Jan 28 10:55:13 2009 GMT + Not After : Jan 28 10:55:13 2010 GMT + Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost/emailAddress=abstract.mysql.developer at mysql.com Subject Public Key Info: Public Key Algorithm: rsaEncryption RSA Public Key: (512 bit) Modulus (512 bit): - 00:d9:fd:da:b3:fb:7c:e0:b0:03:be:97:c6:a4:36: - ac:71:af:bb:2d:e5:84:ed:f3:8f:2b:eb:11:e5:aa: - 66:ed:bf:62:6b:e3:ce:fa:80:ed:90:ff:b9:4a:39: - 20:40:b6:f2:99:bf:2f:33:b5:f2:ec:3a:90:60:1d: - 9e:94:7e:a4:1b + 00:b6:8f:e5:b7:b4:86:83:13:8a:f9:bf:63:cb:64: + 2d:b9:51:d1:de:ab:7b:45:1f:aa:b5:66:73:13:f9: + a6:07:d5:ba:7c:fa:92:bd:37:e2:ad:87:db:3e:b6: + 6a:12:64:f8:ee:17:e3:15:06:2f:a8:82:68:bf:57: + 8d:c3:04:98:27 Exponent: 65537 (0x10001) - Signature Algorithm: md5WithRSAEncryption - de:5e:35:cd:7b:11:e6:7c:c5:7c:d6:27:4e:72:12:49:42:eb: - 6f:2c:96:f3:f4:00:78:a7:4f:9f:2d:7b:d7:30:39:af:49:4d: - df:b1:55:0d:30:be:23:6f:06:67:fd:dd:ba:98:66:36:c6:32: - b7:ed:63:fc:aa:49:cd:4f:72:98:3b:13:0e:f6:28:d7:d4:eb: - 04:6b:dc:e8:c7:04:80:92:e4:04:86:0b:ed:32:25:76:1d:a9: - 5c:a9:2c:18:2c:bd:bc:15:ed:e1:76:96:4d:bb:0d:41:44:06: - 2c:ad:45:bb:db:61:ad:17:11:cb:49:70:67:eb:c6:27:d3:91: - c8:f2 + X509v3 extensions: + X509v3 Basic Constraints: + CA:FALSE + X509v3 Subject Key Identifier: + D9:9A:B8:5F:22:EA:04:10:C8:25:7D:82:57:E6:2E:FD:19:29:E7:DA + X509v3 Authority Key Identifier: + keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF + DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB + serial:95:E9:78:F5:34:50:E4:D5 + + Signature Algorithm: sha1WithRSAEncryption + 54:07:2d:21:0b:a5:af:3b:58:23:32:5e:56:7f:ab:58:63:48: + 91:aa:38:90:89:16:f9:cc:bf:a4:0e:78:2b:9f:c5:1b:58:a6: + e6:08:8f:2e:ae:97:03:21:9b:f1:cd:c0:26:8f:1d:d7:28:27: + a0:8e:81:09:1b:1c:0f:c9:a5:41:3a:2d:44:3f:9c:fa:87:ff: + c8:4c:2b:44:f7:1b:c1:3e:4f:01:7f:e9:26:cc:9f:1c:06:b5: + 0b:27:d1:10:90:be:93:0c:9c:e7:b0:d1:ea:27:99:4e:06:14: + 0c:7a:e9:c1:52:c5:33:68:bc:61:0d:db:81:3b:57:48:57:bf: + 42:9a -----BEGIN CERTIFICATE----- -MIIB+zCCAWQCAQEwDQYJKoZIhvcNAQEEBQAwRDELMAkGA1UEBhMCU0UxEDAOBgNV -BAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFC -MB4XDTA2MDUwMzA4NTQxM1oXDTA5MDEyNzA4NTQxM1owgYsxCzAJBgNVBAYTAlNF -MRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYDVQQKEwhN -eVNRTCBBQjESMBAGA1UEAxMJbG9jYWxob3N0MTEwLwYJKoZIhvcNAQkBFiJhYnN0 -cmFjdC5teXNxbC5kZXZlbG9wZXJAbXlzcWwuY29tMFwwDQYJKoZIhvcNAQEBBQAD -SwAwSAJBANn92rP7fOCwA76XxqQ2rHGvuy3lhO3zjyvrEeWqZu2/YmvjzvqA7ZD/ -uUo5IEC28pm/LzO18uw6kGAdnpR+pBsCAwEAATANBgkqhkiG9w0BAQQFAAOBgQDe -XjXNexHmfMV81idOchJJQutvLJbz9AB4p0+fLXvXMDmvSU3fsVUNML4jbwZn/d26 -mGY2xjK37WP8qknNT3KYOxMO9ijX1OsEa9zoxwSAkuQEhgvtMiV2HalcqSwYLL28 -Fe3hdpZNuw1BRAYsrUW722GtFxHLSXBn68Yn05HI8g== +MIICkzCCAfygAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ +MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT +UUwgQUIwHhcNMDkwMTI4MTA1NTEzWhcNMTAwMTI4MTA1NTEzWjB5MQswCQYDVQQG +EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNV +BAMTCWxvY2FsaG9zdDExMC8GCSqGSIb3DQEJARYiYWJzdHJhY3QubXlzcWwuZGV2 +ZWxvcGVyQG15c3FsLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC2j+W3tIaD +E4r5v2PLZC25UdHeq3tFH6q1ZnMT+aYH1bp8+pK9N+Kth9s+tmoSZPjuF+MVBi+o +gmi/V43DBJgnAgMBAAGjgaMwgaAwCQYDVR0TBAIwADAdBgNVHQ4EFgQU2Zq4XyLq +BBDIJX2CV+Yu/Rkp59owdAYDVR0jBG0wa4AU8uLqVWWkmuKsnZf1RWz294wRrd+h +SKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdV +cHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAJXpePU0UOTVMA0GCSqGSIb3DQEB +BQUAA4GBAFQHLSELpa87WCMyXlZ/q1hjSJGqOJCJFvnMv6QOeCufxRtYpuYIjy6u +lwMhm/HNwCaPHdcoJ6COgQkbHA/JpUE6LUQ/nPqH/8hMK0T3G8E+TwF/6SbMnxwG +tQsn0RCQvpMMnOew0eonmU4GFAx66cFSxTNovGEN24E7V0hXv0Ka -----END CERTIFICATE----- === removed file 'mysql-test/std_data/server-key-des.pem' --- a/mysql-test/std_data/server-key-des.pem 2006-09-25 14:44:15 +0000 +++ b/mysql-test/std_data/server-key-des.pem 1970-01-01 00:00:00 +0000 @@ -1,18 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -Proc-Type: 4,ENCRYPTED -DEK-Info: DES-EDE3-CBC,D2BE7598C7E3BDA5 - -1W3qPgw5ut80OhaAGVZZe/tfFiBAlwpX1SohdApWj+QYP+dK/mdEBhgI3BXTFNLW -pJqDTzGlKtft7hHN6QDFEdZMKxej5+2iLu14V62o+5yQgUoqswoXcmmqJCJ7AvyJ -yMBmGAzxRFlQsT8lf6o5TS1/efBvjvWhh3NG2Zq2LpyhWRRqA3kNhzktzt2WjDZe -ZkKmZJJnArr/Aw7jEBC4sH+nmgxoR18GzDddRG12hv1AWyHc3+VisTBpyNzeBy17 -rxuQtqLzkAJmId723ddw83RVNSvBUUS3G0rx5O3HPobvZK89UqVxcXtIgc11WTVU -N3DbcJq5it43Loo0W3gAngtESDm2E3rTadrmdUSDGv2wQ5dNFl6cQ1f397Sdd/WC -A0grn1tKjJ6COp80Ymdyvn+stjv/+Rl1/KHSeG0lNeZxqjPPOJ7NHaKv7qjYsJ6W -LT35/Xc3oCo5qk9FOlq/0tGjHxf6RcFr5U7k5ILKZs+RmvJ4Sv/VYShLfLTcfGbJ -wBNfRKvcHZBQJQBb1+s/kRrjFFtvhrUwLz4+c9kskp+t4qRVYywUAnGGGsMs/GPm -wYsLQZO6Bs5/taaVUyaJQW015J7FGGv+/7/A1dIhu73S/Xl/YcFbX/CMEVq2Lxxd -hZdFIuaZ7LE+0MDQWsvYMYPDPLDH11diczb/jeKBdLPOzk/FUqVx3Fin1PpcaBxY -b+7oZJhYdg/rAWDeQ/nji9qnEG8waK6x1hdkYPOrqqWQPfgM/LPsSrgWeuTSdx2B -Ixi01UlBb5UP4K7UrjyddPobmcVjXaQLNe7zaq0+OS3UnIG85GtHrQ== ------END RSA PRIVATE KEY----- === modified file 'mysql-test/std_data/server-key.pem' --- a/mysql-test/std_data/server-key.pem 2007-07-27 15:39:07 +0000 +++ b/mysql-test/std_data/server-key.pem 2009-01-28 14:18:50 +0000 @@ -1,9 +1,9 @@ -----BEGIN RSA PRIVATE KEY----- -MIIBOgIBAAJBANn92rP7fOCwA76XxqQ2rHGvuy3lhO3zjyvrEeWqZu2/YmvjzvqA -7ZD/uUo5IEC28pm/LzO18uw6kGAdnpR+pBsCAwEAAQJBAMieYdpmRoUaODf9wqh6 -ULXH/sG8i1vaXRcUHcJ50oRVfVK8/tGGvUuTDu6MeINTdahNDlYfjwOjKWVXys1w -h6ECIQDs6s7DfczK2bKCLt0zqg24mZL3rOpGmDU+TatwN1yVgwIhAOuMzdVTX39p -328+5WxJvBOFfxmSmqdDhIFpnRMvgguJAiByvKjT/km+970+1OllyvaIL0AA2OpA -tBgdC0p6tyUMdwIgKuHAWzTJbu28UolVxQgLaFZmVCZ/ZzIAfnrWsLZ2a1kCIBq/ -ywJ2cpyFlgazu8AH6KCQa0ok9s70ElaB6FEC85Al +MIIBOQIBAAJBALaP5be0hoMTivm/Y8tkLblR0d6re0UfqrVmcxP5pgfVunz6kr03 +4q2H2z62ahJk+O4X4xUGL6iCaL9XjcMEmCcCAwEAAQJASA5VwgNb0CKHiPm0ntOk +hG+54SRX3DmafEy6gRjZIl/bZ/asSLhXUZ+CeohyrQh7BZgYWvykd8pRISL9eKsU +GQIhAOXkUrOtP/EtjyqNluEqZdG+RZi/7p61JS3Ce13Myu+LAiEAy0uMlV34AJpM +b40FPKqlHxw8DD/Dt1iKhNVAg8+LDVUCIFjv7fbJDbW2VG63/Cj8CAwOukoP5rbL +iaicVrHBKrllAiB9+MiaXeopZXNrxDS0jQFYr8Q9yt1aJVFgUkxx4Q9HKQIgZPs0 +KlF3NNNWw78INaAEkyf0IEssnLMsuoCWw0DIOak= -----END RSA PRIVATE KEY----- === modified file 'mysql-test/std_data/server8k-cert.pem' --- a/mysql-test/std_data/server8k-cert.pem 2007-07-17 18:43:56 +0000 +++ b/mysql-test/std_data/server8k-cert.pem 2009-01-28 14:18:50 +0000 @@ -1,51 +1,138 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 4 (0x4) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB + Validity + Not Before: Jan 28 11:12:27 2009 GMT + Not After : Jan 28 11:12:27 2010 GMT + Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=server + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public Key: (8192 bit) + Modulus (8192 bit): + 00:c0:8f:22:03:24:59:67:46:14:d6:8f:60:09:58: + 06:07:45:f1:78:71:55:f1:ea:b9:30:8a:cd:c3:3c: + b9:bf:65:6e:18:ed:a0:b8:c9:19:56:6f:c4:90:19: + c8:65:09:db:ff:bf:82:a1:08:ad:01:4f:5a:a3:d4: + 3d:78:7e:4b:4a:01:a4:7d:e8:7b:05:3e:7d:d8:b9: + 55:58:60:d6:1c:ce:e8:32:62:2c:19:60:f3:ed:05: + 99:6d:c9:77:07:2e:11:6d:0b:9a:c7:68:38:46:e8: + fa:31:80:df:e8:79:f0:f1:fd:a9:94:c3:fa:0d:f5: + 78:ac:49:7e:d5:17:fd:e1:ee:44:f3:c7:0e:30:32: + 5d:a9:19:25:e4:bb:21:1d:fe:3c:84:48:40:f5:58: + f4:bf:13:8c:85:68:bb:ec:f5:dd:c6:38:d1:b0:77: + 1f:a6:8e:4f:8d:e2:6f:49:74:f5:3f:90:65:8e:99: + 1e:59:9c:1c:b5:26:24:c4:b1:de:1e:fb:96:65:c4: + 31:14:1a:53:b8:5e:62:8a:c7:04:f7:b4:36:a4:af: + 07:c8:27:06:ed:dd:e6:f4:8c:62:f1:65:40:d0:9f: + 9f:a9:14:c8:8e:8b:74:d6:67:5a:d0:c9:4d:35:a1: + d5:7b:39:3a:42:9f:e4:d0:f4:c6:0f:2e:42:30:4b: + 56:b2:3d:6d:8e:2d:58:c5:69:99:35:49:95:95:99: + b6:87:29:2b:32:d1:50:08:cd:25:14:48:6d:10:99: + 85:61:3c:41:26:21:55:cc:1f:cf:ad:b0:2f:b9:89: + d8:4e:a0:18:ff:75:1d:b6:97:7c:c5:fa:8b:dc:93: + 17:86:0a:64:d4:09:35:d5:83:34:6d:5c:6d:c6:8c: + cd:b9:ec:c2:93:c6:c1:b7:cc:04:6f:22:e0:07:bf: + e0:d9:9b:2f:d5:a0:50:cc:f9:f0:95:83:8f:f4:30: + 83:72:94:d7:b5:4b:da:cc:9f:54:3b:8d:78:77:0b: + 24:6c:0f:c2:96:61:96:2f:b8:5f:b5:7a:ab:7a:5b: + 97:7a:a9:ad:40:8b:f2:d6:c6:8d:81:d9:94:61:8f: + 9d:03:c5:b9:10:03:68:83:bf:04:81:cc:ac:bd:34: + 89:e8:d4:8d:43:20:e2:b6:a4:11:3d:15:2a:82:0c: + d6:3a:6a:8c:62:d4:93:bc:c3:80:bf:1b:b4:2b:0a: + 7a:34:f0:cd:1e:82:3f:25:0f:d1:04:a8:0a:05:19: + b0:d6:16:83:39:af:0b:45:7d:cb:14:7e:4d:aa:aa: + c2:39:a8:46:38:ab:bd:ab:2a:bd:34:43:7f:da:25: + de:2b:fb:69:3b:fe:3b:87:fd:98:94:76:4a:bf:04: + a3:31:e3:3a:ff:6f:04:fa:fa:24:e4:2a:89:e9:0e: + bf:44:4c:72:85:82:3c:89:4a:03:63:01:41:92:53: + d0:82:60:6e:d8:ff:8c:a2:b4:1a:3b:20:6d:ae:74: + 92:30:4e:48:e3:51:a6:cb:73:97:06:13:03:32:23: + 9b:7d:a2:c7:3a:a9:af:97:8c:51:ed:fe:fa:b4:b4: + 1a:a3:87:fc:cf:8c:8e:e6:80:15:03:fd:fe:7d:bd: + b1:76:f1:5f:b3:09:2b:4c:4d:a7:7c:b5:72:b1:d6: + db:38:c0:67:a4:54:bc:87:09:a5:39:ba:1a:7e:3f: + 74:60:ad:3d:4b:be:94:53:f3:64:16:c7:33:35:ec: + 41:00:95:b6:de:99:62:a2:7a:28:9a:45:4d:fa:cd: + a6:77:f6:de:58:72:50:c8:7d:69:38:db:07:04:84: + d8:4d:39:f7:50:13:43:ae:2d:af:45:a4:2a:39:56: + 3c:b8:b7:d8:26:a4:36:c9:23:aa:aa:b8:49:0b:21: + ba:9e:7a:2b:7f:4d:29:9f:0e:00:1e:b4:5e:a6:fa: + 49:fe:8d:e5:74:57:d8:ba:d9:92:2c:d2:ac:84:1d: + f2:a6:a4:44:1c:bf:88:41:32:7e:d1:c3:2f:6e:bc: + 0f:5d:19:a6:8f:74:2b:67:ba:dd:a9:db:68:b5:ce: + 9d:25:48:df:54:08:d0:1d:4f:2e:5b:24:bc:05:0f: + fb:58:46:fa:02:ca:53:93:29:cf:10:27:c2:a0:18: + d0:f5:d4:b9:3c:5e:df:8e:6c:f5:7c:b9:b4:54:cc: + 39:16:5d:3c:da:96:b3:c3:6c:d4:70:5d:d3:30:a7: + a6:bd:6f:dd:41:bc:a8:de:42:60:59:9a:85:25:0d: + 2a:45:c3:05:b4:6e:7a:4a:4d:ca:8c:0a:e5:6c:34: + bc:20:9b:6d:4a:ca:ca:b6:a6:3a:a0:db:c3:0e:20: + 1a:12:1b:77:dd:cb:1d:7f:c3:0d:0d:e7:c1:fd:96: + d2:c7:68:80:99:a0:d9:8a:33:21:a3:8b:a2:5a:a7: + 7e:27:06:02:7f:ed:60:11:37:34:54:17:7f:4d:90: + 14:1e:69:37:0d:ba:f0:2b:f0:a3:2d:62:79:c8:76: + a8:ea:c8:e7:3b:1f:c6:4f:c2:0c:d7:ac:f0:77:53: + 5d:f0:50:b4:df:9b:03:ca:4d:41:e1:18:b2:25:30: + 86:1d:63:e5:67:b1:53:cd:6b:4e:83:1a:b9:5e:2d: + 05:15:6b:d4:8e:b1:97:fc:31:03:57:cb:bf:27:7f: + cd:5f:27:7e:66:e7:3c:17:09:b6:11:2a:4f:33:cd: + eb:1a:d3:6f:d5:15:8b:8b:ce:68:6b:7e:9a:95:e5: + 74:7f:17:57:d9 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: + CA:FALSE + X509v3 Subject Key Identifier: + 58:12:24:59:A7:3C:29:15:89:5A:C2:12:DB:E7:A5:42:10:21:B7:BA + X509v3 Authority Key Identifier: + keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF + DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB + serial:95:E9:78:F5:34:50:E4:D5 + + Signature Algorithm: sha1WithRSAEncryption + cd:cb:5c:83:35:ea:cb:cb:c3:a8:c3:95:e2:e6:6f:4d:d8:e4: + ee:41:dd:3f:35:82:ac:2f:fd:63:89:4f:3a:19:d7:81:75:b3: + a3:fc:36:b2:12:d5:c6:56:bc:13:60:37:33:6e:a0:d8:ae:7c: + 88:f9:4b:ee:7b:1f:c8:f0:56:19:07:4d:bb:45:52:1c:78:81: + 07:7c:13:86:b8:86:70:85:e4:71:25:58:78:d1:be:de:22:82: + 6d:1a:4b:06:ac:f0:e8:50:87:c7:69:64:c2:61:43:cd:96:06: + a6:7e:09:a9:02:01:2a:a2:40:f3:cd:10:80:48:d0:34:55:40: + b9:ce -----BEGIN CERTIFICATE----- -MIIJHDCCBQQCAQEwDQYJKoZIhvcNAQEEBQAwTjELMAkGA1UEBhMCU0UxEDAOBgNV -BAgTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCMQ0wCwYDVQQLEwRUZXN0MQsw -CQYDVQQDEwJDQTAeFw0wNzA3MTMwNzU2MjVaFw0xMDA0MDgwNzU2MjVaMFoxCzAJ -BgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRkwFwYDVQQKFBBNeVNRTCAgIAog -ICAgIEFCMQ0wCwYDVQQLEwRUZXN0MQ8wDQYDVQQDEwZzZXJ2ZXIwggQiMA0GCSqG -SIb3DQEBAQUAA4IEDwAwggQKAoIEAQDUFlh/3mwov5YaICFXOdJXgHV/uDkTjXB6 -9oxlipshQaYPX8LDT5vhI3gPciS1Z1sRE2dTcC4Mk2K4LDUIjp3WkeTfFAHZPV3E -Y+3OH/ftH4N6SEIBTKE4EY6ah0nJtU98M0JhxOh5zHje6zQp1SkBnhEOQYexYRqj -OtGloZ9RyF0iFAXcyu2Ap14u37l5Yla0cyPzvZqP4mFYlcXwaRfAacJmqMM1vuQv -Fx1JITUTBugMF3VGZ1F0tw63EIUH/FW/WWncPqvG18na40qlv9ZkBw0FhZeKS8cK -JIY5y4J30jn/eV8p1lTO7K+ASTuGZWmdRDgjUG0Y9OGuKsPPoaE6ml0HTnMBsBSQ -fXUq9XkwGt8DTgPioAKHBHjLbILEy4FMYWrlTZlPTzNqyhayec/2T15oDladNSt7 -JpDLpX70UECXFhdEGxsGxtXdKbIBvNm2yT4X2nxW9ItsECjSSgD+94TgGoa8QKDw -rpmgq+Wqpm54CZ1vN1oqyMUw1sjNEX/iLByHAjSALby2Kffk5cl5mnsR6d/k4jsi -c3Qsciwkd+rQt/8VMhS2ns3nkez/BK3FvQA2Ms8xJhFLfszVrBhnjcFRTNT2+/KM -lr1oT5Q1XZKL7qVXTpabPL51JlVBL5CSHl1QRkffsqfqcgJkcHBq+kKjUiFs4lad -hTrvNBCXYa5+NkA2QqIfdOpNwl62/gdE7/7zU1uh40vkVKyzL+APkLPywPEXBOpQ -yIDNkgoXmS10+JMD44K7uZyUmxZL7W7Xbi30NuEFrVOzoUmVXhapPbpQnkQHxn8n -tqKPYXdBcvXcCKyJ6i79H2Vk9fM6rBYiwNcE7QyWqfd2QMjzr76veF04sXkPR+tG -5Y1lrF9Zp3vabFXQg2RJuGA3rV6MR2GFNXuChIYu410vhIhPNtmdKEVoIVZsFsug -+dtn0PDCFrR8VEd/sshp0naNa9Ad1lY+marJkOJOVpPgCs2yJDPAUB/YdvSJ4avW -6ZdvNTwhBL8fEJMS2DSqkaa6A3+i/SqITpU8ToJxsMGagBsLieXgvJALFysSRfR/ -2dmEu9/J0PPc28inHXwjiLb99VKlkuEz8wX9UkuoqFl0pLa8jrlM8hzdPQ9QHb3k -9c5knfgPCYkOIWwGXH+NwANHdQRK7CmGAFV24k9+P3q0g5ikabVHr+4ZQ3WPd+1H -K0+Msbb/vv53vFJWa+pYeNeFcwNCyW2kJBTMiI6qmlL4IWCcX+QDzpRLalbAWWHj -l5Zk39QEaCL024DYK948IDXCqDg6utEs7YnMdaIF0meYMKjehZFp0fVQ8e8Od+rp -bbjdj/w60wMgBpSOeYxVrs3QKNZd/if4Az3LggoVHB09SjXKiWpvAgMBAAEwDQYJ -KoZIhvcNAQEEBQADggQBABncOBW0wQwJdEB6W3d9CrhFp40q1OM54GPfX0/0aUfP -aOQPxS1uCKcFhxAmR4OT9RiJx+0bhDctekkuMkj5yy3u0a/4PxHIhnVxXTyB0/Hj -N1gLz6cQricunl6Q4Ldi54gR5/KUehKLBWnqsfxhgzWBHosvhlJC0xh/uio7JTqz -ns60djyL7R4wGbSqiGdhT9L2HfpJo3dmmWLDxe02jaHkbL1Z6NQMxrRgs3+gctp/ -Wd5UxNl4BHbNsSbzaK9V9gXUcj4TjZGGSqVki0+pEZ3dmksGZdoW9cSKtzKvgUQ6 -vhhqO4dcopxkY2zYeVOpspgTm0XLZSbNPXv5rSFwa4cpWSfD7u8o8KhHvkkSMahw -cMuH17W4voHHFDtWP8Oq9rA7uE/4/LKCl0JmJl2RWM+G6PMH8w4X4auHPssgRvb/ -Ge1AvgqQJrvi7zWx3XYKKJ0ISBy7fi5Jo/wYgLagRYcG3mwdm1+gAdw+77C/ZGmG -FbWFIPB1+Mc6azhhk9m/vqP7o/Wuncc99mp2zPMzdAEzuzp/IJ9UJNat0edA7jiC -bQ7JSRJ1DSzdJZSWWHdardLNKipPfrEHVm7f5QvL5DQLnGpt+rCWL361KsGtvETC -o+Ph7+kDJsJLokUYfs/BEZopzspNPy/NQ2ECwQp7T4Yq/PBE6Ce/dFaoZysMUOrG -TcALtJW6It98dRmTJPiqjlrlHNTrfoV3Aiy+tK4rpyGuApSHc+1Y+t7YvWotRlQ4 -GEboBqR8evjDPJ1xAaUZqwLkebf3mlpl4MzHM9uNWBkQdJilkQs/IrAaApG3Ayt0 -nIymNHmDslBEdrRGmT4aNWAWYvVYzyKDy3H0fzYdWwuA9goJUL4tj3eMJa8pgEU/ -rG3HfflVi+xuwm1UnLXPSIE8hixgV8ebnwcCnEjlUBvwpl7f5Ub40jKcdycdGvVu -gcTUzuRl1+Ikfk/MXKPbdi4A5Pjtz6AG4Ez9q5j7X77JqskTI5Z/f1RPiKwFBJHg -cN4+BPnEuSWGcjiNDOfQxhk5exlWRf/gpEhnQpGHe3a7tZgfxHUb/pWU9BYpf8OH -vtV3WSDXlUqsEEH6/bmvj8lmFWJLmeZv+qLy1wHxcXR9/GJ6TwCF8niQIl3MrBAL -sKPLft1drmpqdIQpZQIJxtN/AQuD9mxEdW7XA6rkvFySKcswJpS1QjkSWpafCBWE -wu+SPxZL8oFrnNMTU3JloUjcRp70FkNXLLm/Dy+MjW2qFBtIoBgNptVGp94L1uZS -amd2XJMcOQ+X9fcH3wAdM3IHGn3NiLf6eTW92JNNA0IN6aNtyVaJKmFJ1JfXOl9r -ujr4SorRSesaerjIcuzW1u1YE5RlgeI4kizV2/D5kYc= +MIIGJTCCBY6gAwIBAgIBBDANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ +MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT +UUwgQUIwHhcNMDkwMTI4MTExMjI3WhcNMTAwMTI4MTExMjI3WjBDMQswCQYDVQQG +EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxDzANBgNV +BAMTBnNlcnZlcjCCBCIwDQYJKoZIhvcNAQEBBQADggQPADCCBAoCggQBAMCPIgMk +WWdGFNaPYAlYBgdF8XhxVfHquTCKzcM8ub9lbhjtoLjJGVZvxJAZyGUJ2/+/gqEI +rQFPWqPUPXh+S0oBpH3oewU+fdi5VVhg1hzO6DJiLBlg8+0FmW3JdwcuEW0Lmsdo +OEbo+jGA3+h58PH9qZTD+g31eKxJftUX/eHuRPPHDjAyXakZJeS7IR3+PIRIQPVY +9L8TjIVou+z13cY40bB3H6aOT43ib0l09T+QZY6ZHlmcHLUmJMSx3h77lmXEMRQa +U7heYorHBPe0NqSvB8gnBu3d5vSMYvFlQNCfn6kUyI6LdNZnWtDJTTWh1Xs5OkKf +5ND0xg8uQjBLVrI9bY4tWMVpmTVJlZWZtocpKzLRUAjNJRRIbRCZhWE8QSYhVcwf +z62wL7mJ2E6gGP91HbaXfMX6i9yTF4YKZNQJNdWDNG1cbcaMzbnswpPGwbfMBG8i +4Ae/4NmbL9WgUMz58JWDj/Qwg3KU17VL2syfVDuNeHcLJGwPwpZhli+4X7V6q3pb +l3qprUCL8tbGjYHZlGGPnQPFuRADaIO/BIHMrL00iejUjUMg4rakET0VKoIM1jpq +jGLUk7zDgL8btCsKejTwzR6CPyUP0QSoCgUZsNYWgzmvC0V9yxR+TaqqwjmoRjir +vasqvTRDf9ol3iv7aTv+O4f9mJR2Sr8EozHjOv9vBPr6JOQqiekOv0RMcoWCPIlK +A2MBQZJT0IJgbtj/jKK0Gjsgba50kjBOSONRpstzlwYTAzIjm32ixzqpr5eMUe3+ ++rS0GqOH/M+MjuaAFQP9/n29sXbxX7MJK0xNp3y1crHW2zjAZ6RUvIcJpTm6Gn4/ +dGCtPUu+lFPzZBbHMzXsQQCVtt6ZYqJ6KJpFTfrNpnf23lhyUMh9aTjbBwSE2E05 +91ATQ64tr0WkKjlWPLi32CakNskjqqq4SQshup56K39NKZ8OAB60Xqb6Sf6N5XRX +2LrZkizSrIQd8qakRBy/iEEyftHDL268D10Zpo90K2e63anbaLXOnSVI31QI0B1P +LlskvAUP+1hG+gLKU5MpzxAnwqAY0PXUuTxe345s9Xy5tFTMORZdPNqWs8Ns1HBd +0zCnpr1v3UG8qN5CYFmahSUNKkXDBbRuekpNyowK5Ww0vCCbbUrKyramOqDbww4g +GhIbd93LHX/DDQ3nwf2W0sdogJmg2YozIaOLolqnficGAn/tYBE3NFQXf02QFB5p +Nw268Cvwoy1iech2qOrI5zsfxk/CDNes8HdTXfBQtN+bA8pNQeEYsiUwhh1j5Wex +U81rToMauV4tBRVr1I6xl/wxA1fLvyd/zV8nfmbnPBcJthEqTzPN6xrTb9UVi4vO +aGt+mpXldH8XV9kCAwEAAaOBozCBoDAJBgNVHRMEAjAAMB0GA1UdDgQWBBRYEiRZ +pzwpFYlawhLb56VCECG3ujB0BgNVHSMEbTBrgBTy4upVZaSa4qydl/VFbPb3jBGt +36FIpEYwRDELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcHNhbGExEDAOBgNVBAcT +B1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCggkAlel49TRQ5NUwDQYJKoZIhvcN +AQEFBQADgYEAzctcgzXqy8vDqMOV4uZvTdjk7kHdPzWCrC/9Y4lPOhnXgXWzo/w2 +shLVxla8E2A3M26g2K58iPlL7nsfyPBWGQdNu0VSHHiBB3wThriGcIXkcSVYeNG+ +3iKCbRpLBqzw6FCHx2lkwmFDzZYGpn4JqQIBKqJA880QgEjQNFVAuc4= -----END CERTIFICATE----- === modified file 'mysql-test/std_data/server8k-key.pem' --- a/mysql-test/std_data/server8k-key.pem 2007-07-17 18:43:56 +0000 +++ b/mysql-test/std_data/server8k-key.pem 2009-01-28 14:18:50 +0000 @@ -1,99 +1,99 @@ -----BEGIN RSA PRIVATE KEY----- -MIISKQIBAAKCBAEA1BZYf95sKL+WGiAhVznSV4B1f7g5E41wevaMZYqbIUGmD1/C -w0+b4SN4D3IktWdbERNnU3AuDJNiuCw1CI6d1pHk3xQB2T1dxGPtzh/37R+DekhC -AUyhOBGOmodJybVPfDNCYcToecx43us0KdUpAZ4RDkGHsWEaozrRpaGfUchdIhQF -3MrtgKdeLt+5eWJWtHMj872aj+JhWJXF8GkXwGnCZqjDNb7kLxcdSSE1EwboDBd1 -RmdRdLcOtxCFB/xVv1lp3D6rxtfJ2uNKpb/WZAcNBYWXikvHCiSGOcuCd9I5/3lf -KdZUzuyvgEk7hmVpnUQ4I1BtGPThrirDz6GhOppdB05zAbAUkH11KvV5MBrfA04D -4qAChwR4y2yCxMuBTGFq5U2ZT08zasoWsnnP9k9eaA5WnTUreyaQy6V+9FBAlxYX -RBsbBsbV3SmyAbzZtsk+F9p8VvSLbBAo0koA/veE4BqGvECg8K6ZoKvlqqZueAmd -bzdaKsjFMNbIzRF/4iwchwI0gC28tin35OXJeZp7Eenf5OI7InN0LHIsJHfq0Lf/ -FTIUtp7N55Hs/wStxb0ANjLPMSYRS37M1awYZ43BUUzU9vvyjJa9aE+UNV2Si+6l -V06Wmzy+dSZVQS+Qkh5dUEZH37Kn6nICZHBwavpCo1IhbOJWnYU67zQQl2GufjZA -NkKiH3TqTcJetv4HRO/+81NboeNL5FSssy/gD5Cz8sDxFwTqUMiAzZIKF5ktdPiT -A+OCu7mclJsWS+1u124t9DbhBa1Ts6FJlV4WqT26UJ5EB8Z/J7aij2F3QXL13Ais -ieou/R9lZPXzOqwWIsDXBO0Mlqn3dkDI86++r3hdOLF5D0frRuWNZaxfWad72mxV -0INkSbhgN61ejEdhhTV7goSGLuNdL4SITzbZnShFaCFWbBbLoPnbZ9Dwwha0fFRH -f7LIadJ2jWvQHdZWPpmqyZDiTlaT4ArNsiQzwFAf2Hb0ieGr1umXbzU8IQS/HxCT -Etg0qpGmugN/ov0qiE6VPE6CcbDBmoAbC4nl4LyQCxcrEkX0f9nZhLvfydDz3NvI -px18I4i2/fVSpZLhM/MF/VJLqKhZdKS2vI65TPIc3T0PUB295PXOZJ34DwmJDiFs -Blx/jcADR3UESuwphgBVduJPfj96tIOYpGm1R6/uGUN1j3ftRytPjLG2/77+d7xS -VmvqWHjXhXMDQsltpCQUzIiOqppS+CFgnF/kA86US2pWwFlh45eWZN/UBGgi9NuA -2CvePCA1wqg4OrrRLO2JzHWiBdJnmDCo3oWRadH1UPHvDnfq6W243Y/8OtMDIAaU -jnmMVa7N0CjWXf4n+AM9y4IKFRwdPUo1yolqbwIDAQABAoIEAQDI3u0tFoWMRoCs -99d8HLiaxYED2YC9gw2QeKjal198LQhRsVnu0ByMLKLOxkX8RgrbbmxDe5Exufob -A0urciAOFJoXqoRhs5x2oEqgGmkf/ePx0jQptOFREFfnBdGeKIpC0O3DWdLxYPbt -8wixwkEXVhVDUk9pcdXf2ZqsbBpQRBvpZdtzlgNCAcLTVHP/gmMqf48CkIauVjPq -ydfybibfx4sm3hodclH+Q78p/zicb8MhiKo7ZymgCKz4N743pQe1tsLrpbPeHY0C -MpoFyF8O2Bq+KxwvELxQX+19GcHVKJhj3hmCr4wde9BxCWtGTBCusekVkVvy8iQ5 -aCmTIrtonMEVZXjJlXK0sw5hBKOmKx0jrSVC5FfgdxzNVlW4fCJXLEEpMsjMc+/3 -6bV7jqGn4N5CYaopNS2ccxdaucE3NjcmofahO6bqUTJHSPFecfYmCA42W2m+ldjj -HZ78JLkyw03nT1hjPjbwHf5FTem1KfKg4EJrDprowMT7D8KZb0SW+z59pFoDOM5u -Heu6sOSUtvpvKfozdw2ZAI58dhpW4/jTfCEtewRhPqE3/V7g3haTnQFxU8gm/a4N -uefZTCjFE16QWNuvnUrJWw/DlvOBY8GjpQCWY0mDeBHPNOI0Xg9oRTgOCrKSLUya -YSbg6BmhSKwKsYQU834jrQb3fXFlXZVIxlcNePOWMhHFFNAHucHF822Nr7u/3FOT -twcbBIOXCGfDT6ed8d4dNum1L7k9Blju16CWkfuciL8PGXY4mGAmF4nZMXGZgK8B -Cz9cxhtvFLe8gz5615DtBAsuVm7Q4AAHiULAMg6t6auyxCb8pXbAL0Ec5X4zS3+f -I2riODYiyHCh/qTtjawOzUZZEtjZRMSDi+jk8wjjDdkFU8McOaYoPyqT3TDy2v6m -NiPJs8GWQ2NCNo9CNoGbEIIFFP5iSz18XLFAOF+2dN/KHHl9nKyi7kOhYbbzoNku -2wQV40yVsrS4E/hd/7+2IB2Muduxiu7NxCUSUXsw6p0hZTYMpIoduEfRSk1al0lS -862GD8JgJ4RhJ0uIOTDJS52MQmO8zFIL86emdjjV1CzVvadYSQLTX7ZgR0i8g46A -y0muCFAC8EJpnEtHzqtQ/z22zB8TCJShFuUK9KF6K8nOlbc6ShcUXU2J6r1sc8aT -Dx0yzRXfCL15fpCJBP49EYaKhArTNmFRa2GaLiJP0OYkTrrwVOGuS6x2+kRVoP/8 -BcNMZ5x8mXP1LgotHCztgMKX30Hn5CLxbH8QfcWKemGva1jBmhCWxS17Gh3Ld9T3 -/WKkBa6JDq83rlO84x/iF3mB3tYkZPfcYtYURn5wwm/BmVV/9G1VwAatJdxmfCSy -5JwC9WDBAoICAQD7xStPk3lq+qYHAtLZidujmzSNv7XG+E8UC9yvMRFuBwSM5ZE4 -YGD2LDev2nghB+7OSR8KJIkxeaNjP91Zf3s8wjCuxLg/cLGI6mf6uWy9+zypFg3i -J+ylDKa6NBuqYyY75W7Pj63xvGQlw5kX5+mB3ulQbActT4cUiVdEkyDytzubqLzY -s15QGFrL9gqLow+C+7LKQKdeXq8OavFV1PWkMDAJUki6cIir9m+f5Mqr2cQCLKgx -38aX8c9UWJv6pI5zQQuBjpaBOwz07WnyTXiFpc71x/8i85uLGDM0e3VO5ZPGeRBj -jZ0ucHatOHJ3i/nPRG16rsPR+q97QiDHoLF0quHEG+ND+rwTBzNGIwzYRE16p1o3 -UdzFk1RzlDCfOX7QgszCwK6mf8TbCK9f/FxJ5e6TCkt3iHXSrlLS4op6k9nEpKFH -KHf4nPtCy9GriP+A8+dA6K1s+DgejoIojBMBTsnl4TEf+m8BaenTXGuU7KYyc8dR -JqmpmDggDRT/ImHRhXirY7lIIYXnI7tRjN5gmnKpEiHScT1r848zpQ4gWH1Dx/ks -mKT6NZ8nF45saQCYbKEYc0RH9Kw0O7vr1kVtNPc2dEZtVgt4bC5fnl7xX1/YTk3m -+h1qfzbku/+MX5rRjHLR2l8a71UltlnnnpP5NKBBgtxll6aCIkk6CdH8YQKCAgEA -16aBaVa0cOZmiOQwPQkpuXIbV7msz1ttWEAHElCy6waniOCON89PYFCb7F0NjV3Q -i+pGaRgG1iZGbjjHwyqTrHhMloFm+IsSWZqOZzrHgSJgA4bgTJFgp+5b31sQXGfJ -14QQSqMJLC61/M+CnrNtiuI3IVHx6BFRxI42uE7PfTyUMaFhL9F0/SLl0Mw0oMPj -S5kmarduuKpRn1tN9WO+ywEvYwopvH3e9PBssZzPpttlLiE/Wulb0iEtlVXYB9DS -Vzc94N2dzFMIvWUDF9BQ+IBMRzXRm15Psy6LfzoK+9S6w38Dx3BVV8ykSMKeW1UR -ZwTajjdnIBLdE3onD5XMmrSOPw/WtV5zXEYY4DObhIPoN2iD8GJP0IubPb6fonH5 -VHmuVZoXrroFEe7rdt2wgmBdPPl6fqvBKVhjJOpYQctrFLgWh63bXZKaBWqbQM9W -fECq8We1VN3fzqwfwJQit3z5R/DjQNk8eQx7SnnkOzAY6ZgpysHCwaoPOnPVuiYF -ZU0+X3iwfsdeefWmGEDIzoZk6nYaljs61lOhhEoWHngZHDkMOp5kg0n9f8BUP02+ -WJ4QhwzZ73hr4FPBuPHHXECw9TCAgCBHBFrnrXg5QalDhRXz4F+3tCY7UUpD/ikZ -L6Daxm5zGJ5u3rXs6WwKy2EHVVS9zfqs4Q259pQdWM8CggIAcIKpGzOVM+h033c0 -kIBZxeAq+Rlt+0+lzxiJ80RjPJ8oOmqwndf8HKaf8BcaTfCEmGz20QqIwLJSAJ1e -posgoINLTB6fE8Kho8TU2KeaX7/xWMKBS8p5pzxjGZ0Fq/wI7wVVoq3blsaQnout -U5CQujfKXeUYw/fhLp09gWiadbzKh4I9ej2V7QclNDZsegBRg0BForqH0NVRN4k0 -9h1n9IqQPOonlCGMAgTr1zFgHLIBNNOOClOtJOOruk6qzbRR8FFl+eyld3TTEnUy -PlS+gkMZnJ5WduEUZnFXGKH/R1Wy1yPs3gA/+KvLbRdnl+LWrPgwUH3fBmwXlWZ0 -zaETDEb9Ay1PP2bCO2KhWDt7lv3W/fPhjg0oMqbnO4tCuzTvZfC93l5K7h708skL -zkIxX9i/57fXB8DUnmTGoHUaWzLNQ2IqrGj6TACjDDOXLCfZvl/AvTH9pk+6jHU0 -1zfZmmECOpeK43Z/ussA8jI/5Vpn3u38aVh0w1RB6JjQBD/yJLaXuUekWgaZFzTR -ldz014jNqp5uvONcBmzeVr7w9CV3PR4VTQed2i6yQ770J6A44uTQjOOd5OYDOohj -Lz4e4nGj9BK8Eko8cAEwLAzS8tyjMT+08n5dPOVCu68DwVBMGE7CVONYUuoXS/YU -cTxddiU9ZGk9Yq0FfOwjeys+SqECggIAdn3M2b6Egwx2Bn2ra74fKQBjub4SEBWi -bT0xJYUl6jHL2E/alRvZ94gTRLqUebq0nkxpx9El4IFDbcjRKpG4dqnbG0+a7rIr -sQRVfq8zc+cZbparpCa1P1CfNojo4n080KiF8xzGK3q3EGRM1zqr1AYcWLiX/PWX -QjMKKhdTtvKUUvjjV8z1RSnpsOKjgDpiJ+XM0BJeSiV7l94pZc4axZyvFvI8oI9g -9KEueCE7j+k5HTGziBZ1F26Xh1iVzSWWjcmSvH3I+L4fLUHVgz45X3HPd8lAlOgr -Tr8icxPHeTwYKtcdknZMzmNpWXlmXbTOTRbDqCUVCvCSfOM/lzauJ8tR5aCkTx/I -r0js3jQ9HYEFFXzeEjVSubob4L9fI3kQkLQTcIGsxZr8si/fPX7uP5UHZjuGbRee -mUMxptUFDZHiEo5cAs0qna2x54v+JoxGbxtxUhez8R/Am+TDxaMfuEZ5Cmh31egH -bFPJYtC68TKqXZ/4RqpUgukYWPvQ0emWSWU6AmdkQyT06nppeyYNsDz0MkgWr7l3 -yNBHDVNP+Anxcip+Z68kd2cuXQWmxOnIzxR67FnJXeWDEM20whRHgI8jLHYsBTq3 -CtOQPSaz/zosGXJIgF7Xp6riKPZvibW3Ww49Z47EuyBCtyirNk7hV4LG7sITUJyO -ZVKPfcdAoM0CggIBANz3EBZGyt3af2UjFFKbazV01KcHF8OxqdQzsLqHCXWb98V6 -PggQnrF76U7DvqOWho9djDBPrbQU55HG5nXq+eZKPwhsOdwQ8bxOhaVxQcATZOI7 -FtJYnjM1/+zMzzS0iPR5DA2pbB3AKH2Z+wODmF23CK2XTwoJyPKxvlyGKrIqq3gN -kOmocNu2Qm5bJf+D/hYPm5Ust2wzD52NnvJU536bZ0ZMo1/kaK2idqSAzqo4TkR1 -j9U0fdW2rIBDo/qFmBBdJhYVjYLj4qR8CEEoIjshD4Nztf1xRM5C8irE/gJcT5+r -4bPJJ5TjAtHxPiQqZruSprSEUbMsPqBap64ow0SmbNNWSgyaz2ha1rG0p52NBzH4 -XM52LBqS9QHPHvB0ooYfBTfPpDM3CePuuNyzjPAw86ncUo38FKXuc2oViJJ6C5I7 -v2sKhLK5gu3uPBB2ludDEXSpWBqiraynolOT/o52r+taYp9YY2WU3GrhOiV/A1FV -Nl118xiF6FOFpEeTbhHvy27A8kZEKXgeSs+f4aC0XG9kLVD1CiCbQiqHTDcDS4nV -O1N1eQxhP81X+YKE4Lgufh07REqYVwtCj2lQcMp73WDyfBLKTEFlmHusoqmT5JCH -X0BWNjk5Dn1g5h63/lQb+EjNRILBhDFYhrDRDQtw5p0/7IY3AcNKDUHv+XGn +MIISKAIBAAKCBAEAwI8iAyRZZ0YU1o9gCVgGB0XxeHFV8eq5MIrNwzy5v2VuGO2g +uMkZVm/EkBnIZQnb/7+CoQitAU9ao9Q9eH5LSgGkfeh7BT592LlVWGDWHM7oMmIs +GWDz7QWZbcl3By4RbQuax2g4Ruj6MYDf6Hnw8f2plMP6DfV4rEl+1Rf94e5E88cO +MDJdqRkl5LshHf48hEhA9Vj0vxOMhWi77PXdxjjRsHcfpo5PjeJvSXT1P5Bljpke +WZwctSYkxLHeHvuWZcQxFBpTuF5iiscE97Q2pK8HyCcG7d3m9Ixi8WVA0J+fqRTI +jot01mda0MlNNaHVezk6Qp/k0PTGDy5CMEtWsj1tji1YxWmZNUmVlZm2hykrMtFQ +CM0lFEhtEJmFYTxBJiFVzB/PrbAvuYnYTqAY/3Udtpd8xfqL3JMXhgpk1Ak11YM0 +bVxtxozNuezCk8bBt8wEbyLgB7/g2Zsv1aBQzPnwlYOP9DCDcpTXtUvazJ9UO414 +dwskbA/ClmGWL7hftXqreluXeqmtQIvy1saNgdmUYY+dA8W5EANog78EgcysvTSJ +6NSNQyDitqQRPRUqggzWOmqMYtSTvMOAvxu0Kwp6NPDNHoI/JQ/RBKgKBRmw1haD +Oa8LRX3LFH5NqqrCOahGOKu9qyq9NEN/2iXeK/tpO/47h/2YlHZKvwSjMeM6/28E ++vok5CqJ6Q6/RExyhYI8iUoDYwFBklPQgmBu2P+MorQaOyBtrnSSME5I41Gmy3OX +BhMDMiObfaLHOqmvl4xR7f76tLQao4f8z4yO5oAVA/3+fb2xdvFfswkrTE2nfLVy +sdbbOMBnpFS8hwmlOboafj90YK09S76UU/NkFsczNexBAJW23plionoomkVN+s2m +d/beWHJQyH1pONsHBITYTTn3UBNDri2vRaQqOVY8uLfYJqQ2ySOqqrhJCyG6nnor +f00pnw4AHrRepvpJ/o3ldFfYutmSLNKshB3ypqREHL+IQTJ+0cMvbrwPXRmmj3Qr +Z7rdqdtotc6dJUjfVAjQHU8uWyS8BQ/7WEb6AspTkynPECfCoBjQ9dS5PF7fjmz1 +fLm0VMw5Fl082pazw2zUcF3TMKemvW/dQbyo3kJgWZqFJQ0qRcMFtG56Sk3KjArl +bDS8IJttSsrKtqY6oNvDDiAaEht33csdf8MNDefB/ZbSx2iAmaDZijMho4uiWqd+ +JwYCf+1gETc0VBd/TZAUHmk3DbrwK/CjLWJ5yHao6sjnOx/GT8IM16zwd1Nd8FC0 +35sDyk1B4RiyJTCGHWPlZ7FTzWtOgxq5Xi0FFWvUjrGX/DEDV8u/J3/NXyd+Zuc8 +Fwm2ESpPM83rGtNv1RWLi85oa36aleV0fxdX2QIDAQABAoIEAGv5ltvmLQ/A93xc +x0BWEINRkBa2jrfpo9B5dOnuikWtza/Cx+X2NfQHFlSrcHhfr/JX5BsCb2iVo8DM +CXAgeX1VMHS9wQXuxciaHCZDnqxmxUNDU3EjsYQOKLusRcdL6M+Zuz/ny+7PQ0Qw +/N0yS46Wa9oUjon3RKRvTeSV4HIpFpcP3n/eLjDc/ielWuujnTGcBnjNWegvQROp +5/7221YElGh8U84kbK2l9DtfjwoGoTv11lPvOxXE/scg6em7r9j+y3p3TMzMeDtT +YBC6CA4Oa7GrWLJXROOKOQ0ddtvFNlUsZ02vG2QCbqU2y8mwJrJDI80qNbeKGel3 +SfwkssedtGoOOYHxNczwpyVNHVHrHuMPBe75gbo+5pFxVJ5ymCGWfbLJf73oVsqW +ZimoknvkozW4+mlVlcmo3X73IxTW2U4RlXthYdj9KXsBLRaKVCQJDc934eHWkXHU +GF2U2NonqOVd8YG/FmZQ2ig6EcW97hC6wnsWT2Uc7UNAE2RM4bY0xCUHaQiKTrEs +CI6wpbbTV+XhDu2HmL9G+fsuSIu0RoSOCmr5jQDAVwCNPXFgBgcIxbPZ/UCJ7RHj +GrWPBldAN8ip4osiA+B3XwBabcvwXP2fgBP/eLWN1St3q3tw5xpHpqCuhNuPSqsc +0ntz0oIdJyRR6fXWmRFex4kXQ597z5ozm0uyg8arV3HJFxDC3DI6kKfs86/oqMSW +l+9g+d4x6VrUOCTDk0bjN3T8HQ9ASfy9JVacqk6yuXX7a0WeeT+x9JsvFAjg2KmG +CJUtm5w5siItMDSPpcRE4hlfgh+M7ZKS3PFgH3vvwfPMbC/IC93QoSaFzRJMyobX +ei6PNwqJvL+HADlMfLmehE2w9ycp4Fe1Gw/NW0Ed1S6Ajo45hgXQJSIrzla6eglg +JPsPpQ8b+weZNQ8zvc0KvfRJmZKKEb9dHvFdi68I1kV8aapQsjrMOjwHC2pnCFh/ +axkVc7a59fKUs7L6nAJhCs2sSixTorZz5PvJ6mXhWu72TCzu+kThNnEORrlWPHQl +RFEAFpDDaGSzOMlhb92CWUMPyZU2qtzMzv4QGbP5YqTy121hXuT5OBKCF3eNLihV +aje16k0RMFqqW3Olbm7Mp2P1C6DuwzsUJBnNwB5JzhC79Po88zNAl2d1h+qysKU1 +jxF316nhpWJ2dGJ/sbJ+XpUMd/tVrNFQMA254GFfXycsfBoQOSY5d6GfRwKUDOou +xImbIzGUAaIYdsGKDuKtqs5S21JMJjJ/J5CwjLu9tbpP/jsp22KHCpraHAQCupSp ++SFwWI7tRUXzREuxJixfUOnJFQYOATnMFvvtk1d6v4xoPYCVEhHq8gHqJkTyTi3Y +BPVwT1UCggIBAOEy5gThTrEqSVFUcFJm9bJxtWZt/YhOIJWNNxeaxExHzy5hPpsw +fZXtN4MUCeMSWI4isgIujmltwgOHMjQqsJPISn/1gVrqLmrZ2PnFzko/WA8rMUfd +EUnOOpj2bKpChlRGHi76ZV4XGgoTXyO6mrVUcUgf3reSImdcdQ5IHa7J+lWhCQGb +neZIyDOk41LX1TxjcYkY7vuUgmbBYComXPm2UaY3HN4E/3ElXntj6PrlozL33A56 +z4UPfv2Vv9kl0ydkTJe/WcUN2htqLFCYygF2XLlwbv2SYDCT31PkJUORbScUM46A +DOhlxvLBFcpF+l0RtCtvnrKyFy9yZJKrcLh9x6xVChZ/aQqSptSHjll5IEcVm54Y +Z1TjWizCI4txnaBFV0UCLt1CZrllXnyIksZLS4/dVqUIKmkxPBQUpiD5dmgDcmPB +/LdWzS6k4MH3J3Y3tu3MNPHDwgUtnifSZrsWSYPK0F8J0dMU/mLaS9eOplAH7Eo1 +t7OrrImvitM6tUdErRYilIaoS/6YPmsPST5gY1N4n8Lf4sAE/tY8fwaWRpTVSrIw +CoFwLtHESUOhqfuAOdr1EkDfo/RQTUVdnmWZ+D0j3du8MmsMje4x3f2CjBDXqArl +gNnBQELDmrdif8KELNjlEpTIz0T7wEfquhVQ2dzhFpL7RLAgggD+oEBLAoICAQDa +5WOWrAtaI1cC5C7LFxM2qXTHGRttfAtVxuigJapLqNASJuu59GGRxsCVwhthbNFh +aCMSj+fZK7QNFkaoPwuZCEtzy0ErkVZzxYp3cP6b99mzGoCcuqiHiW5qhEkbxwdC +f3YEsSGqE6j8TPW8feiziqo8q+QPSudI9ngkH1gjgbIrTu9iaxKJcF2CwBxe5tfB +uFBNPIgJAaLPejRKQu17MAV2jDnBDIsZUZnm53IxQ+giIYUBay3cfC1KMJu/AnZ/ +CxETjgqqnzqdFW0b0o49Q6YQa6QXAiSjs+lL/BhjbdA5quVdFmA3CoASFQbihYfM +4vilUg7Y4wXfzS7DyBZdfppIn+HI8PPSMv/lfdsQXecl5TU1fBDPRWYPpTZqm1II +HDCkmGRKet/j4/oobabNRrJ6PJcxNjqeMVv/a72pypDRPIXzNxLb1BkfWDGfgu2R +YAdRNBSJSpdoHDZ+1VO2A+/8gz9Zuiv1WxoX7+u3pCAd+0vCfHiaXiFVc7fI8F+m +rtDmN5p3DD9l1+/v7yd+7eUezwxYecElw5E5MyAJRTYGrim8g7XvF/u9rXvH09VP +TeIE8oJ7XzrxCmtGIxlJs6FmgUbUblOyfPZDUqPnzlo8Ru1H2iKRo2FPiMfij8mh +H3wgFTnZpGDQjw/xop51bxVueXrmOeguS0wmk/8Z6wKCAgEA0y+bPApadJRWS1nn +N69sTBqMZfFR6Eh0ECts9criuTJCXZk+T+SqcTYTb+4T04k52Jk63Aby8HXIkuxv +LTK3gu86xkLiOvMP8o43Bwz0BvbeSuNThLQQ6Wjn1NiLUSOvu0pCNgYFl7YMalR+ +TRBK0y/MSDny762wa8Pt1iXVCDxLcY/h1UstSW8JqDzCHcdgJhCPwWTLgMxleZ1w +5DYzzM2oRjq67I49Sssjjo1ESD2fzUVZbY7IG11L1t1fG3F4UiGiHlCJC92Qo1Lv +Geoezj5EeHay70Mcx5F0xsRWGcZAWXx9WO5GrI39g1uFZro3Lp5SmsVDSwrt6UXa +gR0bSThTTw40tqJnTE34+6ff25JWrbLay+jQxm+q+fxZvwQeMNW2IHYKot4JXWVt +tVWSZzjnNJP6FCvTMfDFCYPPw26OFr7cwCaEKx7QriRazitMK3XWK6zsHalZwudj +wK50PpCJAnno7KdVySCP6v4ST6Rr3POBKJq1ml2tITWo96u/ooUJ2I83QAyFr8zw +BBBCvKdBnl6pW+P/TdmhbiEvcmrs59gaA34/6+DbV0Y++piZwswd9XML2iCgLZY8 +0IcZ6uf4PsXq4Yzcrz0HwM+tAXcyiPzkjstpCUxMShALgFxzuWOgdwpjYXnrviJk +0EyUkzbOCHBhbhcK9CyYHfyrJX8CggIAdWwgJC9eV5glkPN+9osGT4hPkI4zXGPy +YK03FNGfrL59/37JbRNfU6fen3dk4LpTB4Gpbserg6AiEfMlLBPF0O3WK+OYrhpk +2e3Z/YCr1Fb8fUt2Op0W0r4ycQlNfo0ho9ZkJNgwSuAJAm72U4rnTYjREYLT8DAq +KcWtZRM7YLCuNvU9DPqLExcn0n/juDT1AIIy8XvLLamnAM15R2znn/F+vL00Lg7g +f1B60pbNdwgKemSoyL4J+ADU+rtgkPJtRnFVU7walLSd6K4ZvZcRnmOvrZdQitcn +eHmGaLBvFMdPr9+w8mKScnQ7h3eoHdOrqYkIAQcn18jQ2eFjeLrY5IaJlPPPVs+K +u/OHuj/tR7ZXzMhL5skK62U6/qGNs1pmgts8bM8i3aFUgRdGlnFbzTpje5cNM+T3 +RO0NgNL3ByIW1Wc2I+YjQ7FfWKUi2YKOljGBO1pIue09kyevRBKDuVwbXMW7MhLg +idm5AaY+OGDeqbaoSUgkGgrsrr5IlI39gZi9jwG85qe3Spavq3ILKdfL1N8UrFGD +/xIN0TVPtilede7vjKTK79tZu8JYaDWGc+g/mo/M1wmawLrqGNGzOwoVRruKl2In +m9PU9wBZ1HuphDQ4DRdC/AU8qkGhmDOx4bDWEQ/R3KKFHNvhnamyfyR7xqt79gyS +NGNIElnJuskCggIARFaK6yAVmaL74Qu3iiELj8FU9Cw8kPP5HeWUfGxCjlegdH3R +FBtoQlDcQjYzO2uZR94Itg3yk3Dt+xbf7KxUsODwlgLj1UhV4eOXUDTosBFTrbTG +v9gnRVH0Eyu9tF+CMUcCXhq6tnIrQOVv1ozcdXfIpk9gvIbfh4rlo6X0iM8Xge2t +Vo7awq05t4wJBkO1xUtOaw9HabaszK/CU1iNV7cIBmaFF3AEP/KVfOs+kjubc9AF +mqC+LVVClvJPNzm1YA5JZlxmQ0u1xXFqZv0OMoibgY+gSzaiAQz3eKB6vEv4Xv4U +kaF9nEUTEjowpTE6uX9X0mGkXXT2wXmlTjosZFnxRX5IIrRNug30plRra5CNYPGp +3uTmD/D7Nzi1iYitJg3yhrTQmCWiJY3x4Z0xophLkio2nlJ9WoTKf1AwTIATY7fa +pX9bxEKldYXrYZNFlbqBPFgA/36v+JDVfMf2E9yRMCt0LAJ0HUM6zP0ngMv+S1TP +Pu6X0WXR9JeuoaF4uJSty/xwdpST/CkHflFLVsk5n3tNQfWGjqoTSOJMgL9NRY9e +Pc/OshHZHeCVFUSXtcf1pfmmBtT6FHX0L4cgVqA5xO8RYapnLDAFLXq2/dRv3NwW +W9CzZcZKh7jmJw4iSIY5IU1+ThgugWoxlkcmjs/egjBclL8BBfqRIwx/vOE= -----END RSA PRIVATE KEY----- === modified file 'mysql-test/t/openssl_1.test' --- a/mysql-test/t/openssl_1.test 2007-04-11 21:42:53 +0000 +++ b/mysql-test/t/openssl_1.test 2009-01-28 14:18:50 +0000 @@ -11,8 +11,8 @@ insert into t1 values (5); grant select on test.* to ssl_user1 at localhost require SSL; grant select on test.* to ssl_user2 at localhost require cipher "DHE-RSA-AES256-SHA"; -grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com"; -grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; +grant select on test.* to ssl_user3 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com"; +grant select on test.* to ssl_user4 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer at mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; grant select on test.* to ssl_user5 at localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx"; flush privileges; mysql-no-dbug.patch: --- NEW FILE mysql-no-dbug.patch --- Don't build the dbug manual. We aren't going to install it anyway, so there's no need to do so. Attempting to build it causes crashes if one has built with -DDBUG_OFF, as we do by default. Per bug #437053. diff -Naur mysql-5.0.51a.orig/dbug/Makefile.am mysql-5.0.51a/dbug/Makefile.am --- mysql-5.0.51a.orig/dbug/Makefile.am 2008-01-11 09:43:29.000000000 -0500 +++ mysql-5.0.51a/dbug/Makefile.am 2008-07-27 12:21:56.000000000 -0400 @@ -35,7 +35,7 @@ factorial_SOURCES = my_main.c factorial.c dbug_analyze_SOURCES = dbug_analyze.c -all: user.t user.ps +all: user.t: user.r $(NROFF_INC) -nroff -mm user.r > $@ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mysql/F-9/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 4 Mar 2008 02:46:54 -0000 1.32 +++ .cvsignore 7 Mar 2009 22:53:31 -0000 1.33 @@ -1 +1 @@ -mysql-5.0.51a.tar.gz +mysql-5.0.77.tar.gz mysql-errno.patch: Index: mysql-errno.patch =================================================================== RCS file: /cvs/pkgs/rpms/mysql/F-9/mysql-errno.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mysql-errno.patch 3 Nov 2005 03:30:48 -0000 1.3 +++ mysql-errno.patch 7 Mar 2009 22:53:31 -0000 1.4 @@ -1,14 +1,21 @@ -diff -Naur mysql-5.0.15.orig/include/my_global.h mysql-5.0.15/include/my_global.h ---- mysql-5.0.15.orig/include/my_global.h 2005-10-16 21:27:27.000000000 -0400 -+++ mysql-5.0.15/include/my_global.h 2005-11-02 16:16:37.000000000 -0500 -@@ -107,6 +107,10 @@ - #define _GNU_SOURCE 1 +"extern int errno" is just a really bad idea. + + +diff -Naur mysql-5.0.67.orig/include/my_sys.h mysql-5.0.67/include/my_sys.h +--- mysql-5.0.67.orig/include/my_sys.h 2008-08-04 08:19:12.000000000 -0400 ++++ mysql-5.0.67/include/my_sys.h 2008-08-23 14:39:08.000000000 -0400 +@@ -208,13 +208,8 @@ #endif + #endif /* MSDOS */ -+#ifdef __linux__ -+#define HAVE_ERRNO_AS_DEFINE -+#endif +-#ifndef errno /* did we already get it? */ +-#ifdef HAVE_ERRNO_AS_DEFINE + #include /* errno is a define */ +-#else +-extern int errno; /* declare errno */ +-#endif +-#endif /* #ifndef errno */ + - /* - Temporary solution to solve bug#7156. Include "sys/types.h" before - the thread headers, else the function madvise() will not be defined + extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE]; + extern char *home_dir; /* Home directory for user */ + extern const char *my_progname; /* program-name (printed in errors) */ mysql-testing.patch: Index: mysql-testing.patch =================================================================== RCS file: /cvs/pkgs/rpms/mysql/F-9/mysql-testing.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mysql-testing.patch 22 Jul 2007 20:35:24 -0000 1.10 +++ mysql-testing.patch 7 Mar 2009 22:53:31 -0000 1.11 @@ -9,27 +9,27 @@ without this, the build-time test works but the mysql-test RPM doesn't. -diff -Naur mysql-5.0.40.orig/Makefile.am mysql-5.0.40/Makefile.am ---- mysql-5.0.40.orig/Makefile.am 2007-04-20 10:14:34.000000000 -0400 -+++ mysql-5.0.40/Makefile.am 2007-05-23 12:59:49.000000000 -0400 -@@ -126,11 +126,11 @@ +diff -Naur mysql-5.0.77.orig/Makefile.am mysql-5.0.77/Makefile.am +--- mysql-5.0.77.orig/Makefile.am 2009-01-29 16:41:18.000000000 -0500 ++++ mysql-5.0.77/Makefile.am 2009-03-07 12:45:59.000000000 -0500 +@@ -127,11 +127,11 @@ test-ps: cd mysql-test ; \ -- @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol -+ @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --ps-protocol +- @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol ++ @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --ps-protocol test-ns: cd mysql-test ; \ -- @PERL@ ./mysql-test-run.pl $(force) $(mem) -+ @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl +- @PERL@ ./mysql-test-run.pl $(force) $(mem) ++ @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl test: test-ns test-ps -diff -Naur mysql-5.0.40.orig/mysql-test/lib/mtr_process.pl mysql-5.0.40/mysql-test/lib/mtr_process.pl ---- mysql-5.0.40.orig/mysql-test/lib/mtr_process.pl 2007-04-20 10:39:41.000000000 -0400 -+++ mysql-5.0.40/mysql-test/lib/mtr_process.pl 2007-05-23 12:59:49.000000000 -0400 -@@ -148,6 +148,9 @@ +diff -Naur mysql-5.0.77.orig/mysql-test/lib/mtr_process.pl mysql-5.0.77/mysql-test/lib/mtr_process.pl +--- mysql-5.0.77.orig/mysql-test/lib/mtr_process.pl 2009-01-29 17:38:31.000000000 -0500 ++++ mysql-5.0.77/mysql-test/lib/mtr_process.pl 2009-03-07 12:45:59.000000000 -0500 +@@ -150,6 +150,9 @@ { # Child, redirect output and exec @@ -39,28 +39,28 @@ $SIG{INT}= 'DEFAULT'; # Parent do some stuff, we don't my $log_file_open_mode = '>'; -diff -Naur mysql-5.0.40.orig/mysql-test/mysql-test-run.pl mysql-5.0.40/mysql-test/mysql-test-run.pl ---- mysql-5.0.40.orig/mysql-test/mysql-test-run.pl 2007-04-20 10:14:30.000000000 -0400 -+++ mysql-5.0.40/mysql-test/mysql-test-run.pl 2007-05-23 13:02:12.000000000 -0400 -@@ -1465,13 +1465,15 @@ +diff -Naur mysql-5.0.77.orig/mysql-test/mysql-test-run.pl mysql-5.0.77/mysql-test/mysql-test-run.pl +--- mysql-5.0.77.orig/mysql-test/mysql-test-run.pl 2009-01-29 16:42:34.000000000 -0500 ++++ mysql-5.0.77/mysql-test/mysql-test-run.pl 2009-03-07 12:48:54.000000000 -0500 +@@ -1516,13 +1516,15 @@ $exe_ndbd= mtr_exe_maybe_exists("$ndb_path/src/kernel/ndbd", -- "$ndb_path/ndbd"); -+ "$ndb_path/ndbd", -+ "/usr/libexec/ndbd"); +- "$daemon_path/ndbd"); ++ "$daemon_path/ndbd", ++ "/usr/libexec/ndbd"); $exe_ndb_mgm= mtr_exe_maybe_exists("$ndb_path/src/mgmclient/ndb_mgm", "$ndb_path/ndb_mgm"); $exe_ndb_mgmd= mtr_exe_maybe_exists("$ndb_path/src/mgmsrv/ndb_mgmd", -- "$ndb_path/ndb_mgmd"); -+ "$ndb_path/ndb_mgmd", +- "$daemon_path/ndb_mgmd"); ++ "$daemon_path/ndb_mgmd", + "/usr/libexec/ndb_mgmd"); $exe_ndb_waiter= mtr_exe_maybe_exists("$ndb_path/tools/ndb_waiter", "$ndb_path/ndb_waiter"); -@@ -1572,7 +1574,8 @@ +@@ -1623,7 +1625,8 @@ # Look for mysql_fix_privilege_tables.sql script $file_mysql_fix_privilege_tables= mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql", @@ -70,7 +70,7 @@ if ( ! $opt_skip_ndbcluster and executable_setup_ndb()) { mtr_warning("Could not find all required ndb binaries, " . -@@ -3999,7 +4002,7 @@ +@@ -4103,7 +4106,7 @@ if ( defined $exe ) { Index: mysql.init =================================================================== RCS file: /cvs/pkgs/rpms/mysql/F-9/mysql.init,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mysql.init 3 Mar 2008 22:30:11 -0000 1.22 +++ mysql.init 7 Mar 2009 22:53:31 -0000 1.23 @@ -46,7 +46,7 @@ chmod 0640 "$errlogfile" [ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile" if [ ! -d "$datadir/mysql" ] ; then - action $"Initializing MySQL database: " /usr/bin/mysql_install_db + action $"Initializing MySQL database: " /usr/bin/mysql_install_db --datadir="$datadir" --user=mysql ret=$? chown -R mysql:mysql "$datadir" if [ $ret -ne 0 ] ; then @@ -60,7 +60,7 @@ # but we need to be sure. /usr/bin/mysqld_safe --datadir="$datadir" --socket="$socketfile" \ --log-error="$errlogfile" --pid-file="$mypidfile" \ - >/dev/null 2>&1 & + --user=mysql >/dev/null 2>&1 & ret=$? # Spin for a maximum of N seconds waiting for the server to come up. # Rather than assuming we know a valid username, accept an "access Index: mysql.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysql/F-9/mysql.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- mysql.spec 4 Mar 2008 02:46:54 -0000 1.106 +++ mysql.spec 7 Mar 2009 22:53:31 -0000 1.107 @@ -1,5 +1,5 @@ Name: mysql -Version: 5.0.51a +Version: 5.0.77 Release: 1%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases @@ -28,10 +28,9 @@ Patch8: mysql-install-test.patch Patch9: mysql-bdb-link.patch Patch10: mysql-bdb-open.patch -Patch11: mysql-innodb-crash.patch -Patch12: mysql-ssl.patch -Patch14: mysql-ss-test.patch +Patch13: mysql-no-dbug.patch Patch15: mysql-stack-guard.patch +Patch16: mysql-expired-certs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gperf, perl, readline-devel, openssl-devel @@ -137,10 +136,9 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch14 -p1 +%patch13 -p1 %patch15 -p1 +%patch16 -p1 libtoolize --force aclocal @@ -432,8 +430,10 @@ %{_mandir}/man1/mysql_secure_installation.1* %{_mandir}/man1/mysql_upgrade.1* %{_mandir}/man1/mysql_zap.1* +%{_mandir}/man1/mysqlbug.1* %{_mandir}/man1/mysqlbinlog.1* %{_mandir}/man1/mysqlcheck.1* +%{_mandir}/man1/mysqldumpslow.1* %{_mandir}/man1/mysqld_multi.1* %{_mandir}/man1/mysqld_safe.1* %{_mandir}/man1/mysqlhotcopy.1* @@ -448,8 +448,6 @@ %{_mandir}/man1/resolveip.1* %{_mandir}/man1/safe_mysqld.1* %{_mandir}/man1/mysql_tzinfo_to_sql.1* -%{_mandir}/man1/mysqlmanager-pwgen.1* -%{_mandir}/man1/mysqlmanagerc.1* %{_mandir}/man8/mysqld.8* %{_mandir}/man8/mysqlmanager.8* @@ -483,6 +481,18 @@ %{_mandir}/man1/mysql_client_test.1* %changelog +* Sat Mar 7 2009 Tom Lane 5.0.77-1 +- Update to mysql version 5.0.77, for various fixes described at + http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-77.html +- Insert non-expired SSL certificates so regression tests still work +Related: #489098 +- Suppress odd crash messages during package build, caused by trying to + build dbug manual (which we don't install anyway) with dbug disabled +Related: #437053 +- Improve mysql.init to pass configured datadir to mysql_install_db, + and to force user=mysql for both mysql_install_db and mysqld_safe. +Related: #450178 + * Mon Mar 3 2008 Tom Lane 5.0.51a-1 - Update to mysql version 5.0.51a Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mysql/F-9/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 4 Mar 2008 02:46:54 -0000 1.32 +++ sources 7 Mar 2009 22:53:31 -0000 1.33 @@ -1 +1 @@ -a83dbdbb91267daf73d2297a9c283dd1 mysql-5.0.51a.tar.gz +6c30a20c9059daf053a301e927eb1667 mysql-5.0.77.tar.gz --- mysql-innodb-crash.patch DELETED --- --- mysql-ss-test.patch DELETED --- --- mysql-ssl.patch DELETED --- From oget at fedoraproject.org Sat Mar 7 23:13:54 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Sat, 7 Mar 2009 23:13:54 +0000 (UTC) Subject: rpms/rosegarden4/devel rosegarden4.spec,1.12,1.13 Message-ID: <20090307231354.6022370116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/rosegarden4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7242 Modified Files: rosegarden4.spec Log Message: * Sat Mar 07 2009 Orcan Ogetbil - 1.7.3-3 - The software makes use of kdialog. Thus we re-add Requires: kdebase. Index: rosegarden4.spec =================================================================== RCS file: /cvs/pkgs/rpms/rosegarden4/devel/rosegarden4.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- rosegarden4.spec 7 Mar 2009 08:01:10 -0000 1.12 +++ rosegarden4.spec 7 Mar 2009 23:13:23 -0000 1.13 @@ -1,6 +1,6 @@ Name: rosegarden4 Version: 1.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MIDI, audio and notation editor Group: Applications/Multimedia License: GPLv2+ @@ -23,6 +23,7 @@ BuildRequires: lirc-devel BuildRequires: fontpackages-devel +Requires: kdebase Requires: perl-XML-Twig Requires: %{name}-feta-fonts = %{version}-%{release} Requires: %{name}-parmesan-fonts = %{version}-%{release} @@ -161,6 +162,9 @@ %doc data/fonts/README %changelog +* Sat Mar 07 2009 Orcan Ogetbil - 1.7.3-3 +- The software makes use of kdialog. Thus we re-add Requires: kdebase. + * Sat Mar 07 2009 Orcan Ogetbil - 1.7.3-2 - Add Requires: perl-XML-Twig. RHBZ#468919 - Fix the lilypondview script. RHBZ#464046 From oget at fedoraproject.org Sat Mar 7 23:17:25 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Sat, 7 Mar 2009 23:17:25 +0000 (UTC) Subject: rpms/rosegarden4/F-10 rosegarden4.spec,1.11,1.12 Message-ID: <20090307231725.BBBC970116@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/rosegarden4/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7875 Modified Files: rosegarden4.spec Log Message: * Sat Mar 07 2009 Orcan Ogetbil - 1.7.3-3 - The software makes use of kdialog. Thus we re-add Requires: kdebase. Index: rosegarden4.spec =================================================================== RCS file: /cvs/pkgs/rpms/rosegarden4/F-10/rosegarden4.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- rosegarden4.spec 7 Mar 2009 08:04:39 -0000 1.11 +++ rosegarden4.spec 7 Mar 2009 23:16:55 -0000 1.12 @@ -1,6 +1,6 @@ Name: rosegarden4 Version: 1.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MIDI, audio and notation editor Group: Applications/Multimedia License: GPLv2+ @@ -22,6 +22,7 @@ BuildRequires: dssi-devel BuildRequires: lirc-devel +Requires: kdebase Requires: perl-XML-Twig %description @@ -119,6 +120,9 @@ %{_datadir}/mimelnk/audio/x-soundfont.desktop %changelog +* Sat Mar 07 2009 Orcan Ogetbil - 1.7.3-3 +- The software makes use of kdialog. Thus we re-add Requires: kdebase. + * Fri Mar 06 2009 Orcan Ogetbil - 1.7.3-2 - Add Requires: perl-XML-Twig. RHBZ#468919 - Fix the lilypondview script. RHBZ#464046 From laxathom at fedoraproject.org Sat Mar 7 23:28:29 2009 From: laxathom at fedoraproject.org (Xavier LAMIEN) Date: Sat, 7 Mar 2009 23:28:29 +0000 (UTC) Subject: rpms/mono/devel mono.spec,1.113,1.114 Message-ID: <20090307232829.CD98A70116@cvs1.fedora.phx.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/mono/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9810 Modified Files: mono.spec Log Message: Fix libdir on mono-cairo pkg-config Index: mono.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- mono.spec 27 Feb 2009 23:10:24 -0000 1.113 +++ mono.spec 7 Mar 2009 23:27:58 -0000 1.114 @@ -1,6 +1,6 @@ Name: mono Version: 2.4 -Release: 8.RC1%{?dist} +Release: 9.RC1%{?dist} Summary: A .NET runtime environment Group: Development/Languages @@ -282,6 +282,7 @@ sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions_1.0.pc.in sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions.design_1.0.pc.in sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' docs/Makefile.{am,in} +sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' data/mono-cairo.pc.in autoreconf -f -i -s @@ -685,6 +686,9 @@ %{_libdir}/pkgconfig/monodoc.pc %changelog +* Sat Mar 07 2009 Xavier Lamien - 2.4-9.RC1 +- Fix libdir on mono-cairo pkg-config. + * Fri Feb 27 2009 Paul F. Johnson 2.4-8.RC1 - Built using official tarball release - BR now uses libgdiplus >= 2.4 From jussilehtola at fedoraproject.org Sat Mar 7 23:29:38 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Sat, 7 Mar 2009 23:29:38 +0000 (UTC) Subject: rpms/PyQuante/devel PyQuante.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090307232938.C954C70116@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/PyQuante/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9880/devel Modified Files: .cvsignore sources Added Files: PyQuante.spec import.log Log Message: * Sun Mar 08 2009 Jussi Lehtola - 1.6.3-1 - Import to Fedora. --- NEW FILE PyQuante.spec --- %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: PyQuante Version: 1.6.3 Release: 1%{?dist} Summary: Python Quantum Chemistry Group: Applications/Engineering License: BSD URL: http://pyquante.sourceforge.net/ Source0: http://downloads.sourceforge.net/pyquante/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-setuptools-devel BuildRequires: numpy Requires: numpy %description PyQuante is an open-source suite of programs for developing quantum chemistry methods. The program is written in the Python programming language, but has many "rate-determining" modules also written in C for speed. The resulting code, though not as fast as Jaguar, NWChem, Gaussian, or GAMESS, is much easier to understand and modify. The goal of this software is not necessarily to provide a working quantum chemistry program (although it will hopefully do that), but rather to provide a well-engineered set of tools so that scientists can construct their own quantum chemistry programs without going through the tedium of having to write every low-level routine. %prep %setup -q %build %{__python} -c 'import setuptools; execfile("setup.py")' build %install rm -rf %{buildroot} %{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} mkdir -p %{buildroot}/%{_datadir}/%{name} cp -a Tests %{buildroot}/%{_datadir}/%{name}/ %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE README Doc/* %{python_sitearch}/* %{_datadir}/%{name} %changelog * Wed Feb 25 2009 Jussi Lehtola - 1.6.3-1 - Update to 1.6.3 that fixes the rest of the rpmlint errors. * Wed Feb 25 2009 Jussi Lehtola - 1.6.2-1 - Fix source URL. - Update to 1.6.2 that removes the shebangs and removes the use of the with keyword. * Tue Feb 24 2009 Jussi Lehtola - 1.6.1-5 - Add tests to %%{_datadir}/%%{name}. * Tue Feb 24 2009 Jussi Lehtola - 1.6.1-4 - Review fixes. * Fri Nov 21 2008 Jussi Lehtola - 1.6.1-3 - Fixed license tag. * Thu Nov 13 2008 Jussi Lehtola - 1.6.1-2 - Initial review fixes. * Sun Oct 26 2008 Jussi Lehtola - 1.6.1-1 - First release. --- NEW FILE import.log --- PyQuante-1_6_3-1_fc10:HEAD:PyQuante-1.6.3-1.fc10.src.rpm:1236468450 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PyQuante/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:10:51 -0000 1.1 +++ .cvsignore 7 Mar 2009 23:29:08 -0000 1.2 @@ -0,0 +1 @@ +PyQuante-1.6.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PyQuante/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:10:51 -0000 1.1 +++ sources 7 Mar 2009 23:29:08 -0000 1.2 @@ -0,0 +1 @@ +5e44d1e67a4f62da69ade7e26e53ab7b PyQuante-1.6.3.tar.gz From sadmac at fedoraproject.org Sat Mar 7 23:33:02 2009 From: sadmac at fedoraproject.org (Casey Dahlin) Date: Sat, 7 Mar 2009 23:33:02 +0000 (UTC) Subject: rpms/upstart/devel upstart-save-state-across-reexec.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.7, 1.8 upstart.spec, 1.27, 1.28 Message-ID: <20090307233302.7B45170116@cvs1.fedora.phx.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/upstart/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10809 Modified Files: .cvsignore sources upstart.spec Added Files: upstart-save-state-across-reexec.patch Log Message: Kill off 0.5.0 and revert back to 0.3.9 upstart-save-state-across-reexec.patch: --- NEW FILE upstart-save-state-across-reexec.patch --- diff -uNr upstart-0.3.9.orig/init/main.c upstart-0.3.9/init/main.c --- upstart-0.3.9.orig/init/main.c 2009-01-23 13:44:32.000000000 -0500 +++ upstart-0.3.9/init/main.c 2009-01-23 13:44:54.000000000 -0500 @@ -59,6 +59,7 @@ #include "cfgfile.h" #include "paths.h" #include "tty.h" +#include "restore.h" /* Prototypes for static functions */ @@ -278,6 +279,10 @@ exit (1); } + /* Restore the state of previously active jobs, if re-exec'd by + * a previously running init. */ + + if (restart) restore_configuration(args); /* Generate and run the startup event or read the state from the * init daemon that exec'd us @@ -534,6 +539,8 @@ NihError *err; const char *loglevel; sigset_t mask, oldmask; + char **args; + size_t len; nih_assert (argv0 != NULL); nih_assert (signal != NULL); @@ -559,7 +566,20 @@ } else { loglevel = NULL; } - execl (argv0, argv0, "--restart", loglevel, NULL); + args = nih_str_array_new(NULL); + len = 0; + if (args) args = nih_str_array_add(&args, NULL, &len, argv0); + if (args) args = nih_str_array_add(&args, NULL, &len, "--restart"); + if (args && loglevel) + args = nih_str_array_add(&args, NULL, &len, loglevel); + if (args) save_current_configuration(&args, NULL, &len); + if (args) { + execv (argv0, args); + nih_free(args); + } else { + nih_warn (_("Unable to save list of currently running jobs")); + execl(argv0, argv0, "--restart", loglevel, NULL); + } nih_error_raise_system (); err = nih_error_get (); diff -uNr upstart-0.3.9.orig/init/Makefile.am upstart-0.3.9/init/Makefile.am --- upstart-0.3.9.orig/init/Makefile.am 2009-01-23 13:44:32.000000000 -0500 +++ upstart-0.3.9/init/Makefile.am 2009-01-23 13:44:54.000000000 -0500 @@ -23,7 +23,8 @@ event.c event.h \ control.c control.h \ notify.c notify.h \ - cfgfile.c cfgfile.h + cfgfile.c cfgfile.h \ + restore.c restore.h init_LDFLAGS = -static init_LDADD = \ diff -uNr upstart-0.3.9.orig/init/Makefile.in upstart-0.3.9/init/Makefile.in --- upstart-0.3.9.orig/init/Makefile.in 2009-01-23 13:44:32.000000000 -0500 +++ upstart-0.3.9/init/Makefile.in 2009-01-23 13:44:54.000000000 -0500 @@ -72,7 +72,7 @@ PROGRAMS = $(sbin_PROGRAMS) am_init_OBJECTS = main.$(OBJEXT) tty.$(OBJEXT) process.$(OBJEXT) \ job.$(OBJEXT) event.$(OBJEXT) control.$(OBJEXT) \ - notify.$(OBJEXT) cfgfile.$(OBJEXT) + notify.$(OBJEXT) cfgfile.$(OBJEXT) restore.$(OBJEXT) init_OBJECTS = $(am_init_OBJECTS) am__DEPENDENCIES_1 = init_DEPENDENCIES = ../upstart/libupstart.la ../nih/libnih.la \ @@ -315,7 +315,8 @@ event.c event.h \ control.c control.h \ notify.c notify.h \ - cfgfile.c cfgfile.h + cfgfile.c cfgfile.h \ + restore.c restore.h init_LDFLAGS = -static init_LDADD = \ diff -uNr upstart-0.3.9.orig/init/restore.c upstart-0.3.9/init/restore.c --- upstart-0.3.9.orig/init/restore.c 1969-12-31 19:00:00.000000000 -0500 +++ upstart-0.3.9/init/restore.c 2009-01-23 13:44:54.000000000 -0500 @@ -0,0 +1,333 @@ +/* Modifications to upstart to allow passing of the state of currently + * running jobs when upstart re-execs itself. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif /* HAVE_CONFIG_H */ + + +#include +#include +#include +#include +#include +#include "job.h" +#include "restore.h" + + +/** + * store_pid: + * @proc: pointer to a JobProcess structure or NULL + * @args: array of arguments + * @parent: parent of @args + * @len: current length of @args + * + * Does nothing if @args is null. + * Pushes "X" onto @args if @args is non-null but @process is null. + * Otherwise: extracts the pid from @process, creates a hexadecimal string + * form of it, pushes a copy onto the array @args, then frees the original. + */ + +void store_pid(JobProcess *proc, char ***args, const void *parent, size_t *len) +{ + char *pidstr; + if (! *args) return; + pidstr = (proc ? nih_sprintf(NULL, "%x", proc->pid) : "X"); + + if (! pidstr) { + nih_error("Unable to allocate storage to save process id"); + *args = NULL; + return; + } + if (! nih_str_array_add(args, parent, len, pidstr)) { + nih_error("Unable to add process id to argument list"); + *args = NULL; + } + + if (proc) nih_free(pidstr); +} + +/** + * unpack_pid: + * @pidstr: hexadecimal string created by pack_pid + * @err: pointer to flag to set if error occurs + * + * Returns the process id corresponding to the string passed in pidstr. + * If an error occurs, returns 0 and sets the flag pointed to by @err. + **/ + +pid_t unpack_pid(char *pidstr, int *err) { + pid_t result = 0; + while (*pidstr) { + unsigned char c = *pidstr++; + result <<= 4; + if (c >= '0' && c <= '9') result += (c-'0'); + else if (c >= 'a' && c <= 'f') result += 10 + (c-'a'); + else { + *err = 1; + return 0; + } + } + return result; +} + +/** + * retrieve_pid: + * @arg: pointer to array of arguments from which to read pid string + * @jobname: name of job whose pids are being retrieved + * @err: pointer to flag to set if error occurs + * @pid: pointer to location to hold the retrieved process id + * @present: pointer to a location to hold 1 if the process id was present + * + * Reads a process id or no-process-present indicator from the hexadecimal + * string pointed to by @arg, increments @arg to point to the next string in + * the array unless it already points to a null string, and stores into + * @present a value of 0 or 1 indicating whether or not a process id is + * present, and stores into @pid the unpacked process id (or zero if there + * is no process present or an error occurred). If an error occured, sets + * the flag pointed to by @err and printes an error message. + **/ + +void retrieve_pid(char ***arg, char *jobname, int *err, + pid_t *pid, int *present) +{ + *pid = 0; + *present = 0; + char *str; + if (! arg || ! *arg || ! **arg) { + nih_error("Ran out of arguments when restoring job %s", + jobname); + *err = 1; + return; + } + str = **arg; + if (str) ++(*arg); + if (strcmp(str, "X")==0) return; + *present = 1; + *pid = unpack_pid(str, err); + if (*err) nih_error("Cannot parse pid %s for job %s", str, jobname); +} + +/** + * restore_pid: + * @proc: pointer to a JobProcess structure, or NULL + * @pid: process id + * @present: integer which is 1 if process id is applicable + * @jobname: name of job whose process ids are being restored + * + * Checks that the non-null status of @proc matches the true/false + * status of @present. If there is a mismatch, prints an error message. + * If @present is true and @proc is non-null, stores the process id from + * @pid into the JobProcess structure pointed to by @proc. + */ + +void restore_pid(JobProcess *proc, pid_t pid, int present, char *jobname) +{ + if (proc == NULL && ! present) return; + if (proc != NULL && present) { + proc->pid = pid; + return; + } + nih_error("Unable to restore process id for job %s", jobname); +} + +/** + * save_current_configuration: + * @args: array of arguments to pass to new init + * @parent: parent of @args + * @len: current length of @args + * + * Pushes, onto the array @args, information about currently running + * jobs. Each job consists of seven arguments: + * (1) The job name + * (2) A 3-character state/goal string: + * First character for the goal: 0=goal JOB_STOP, 1=goal JOB_START + * Second character for the current state: + * W=JOB_WAITING, + * S=JOB_STARTING, A=JOB_PRE_START, B=JOB_SPAWNED, C=JOB_POST_START, + * R=JOB_RUNNING, + * T=JOB_STOPPING, X=JOB_PRE_STOP, Y=JOB_KILLED, Z=JOB_POST_STOP + * Third character: N=normal job, I=instance job + * (3) The associated PROCESS_MAIN process id + * (4) The associated PROCESS_PRE_START process id + * (5) The associated PROCESS_POST_START process id + * (6) The associated PROCESS_PRE_STOP process id + * (7) The associated PROCESS_POST_STOP process id + * Process ids are in hexadecimal using lower-case letters (0-9,a-f), + * or 0 if there is a JobProcess structure but no running process, or + * "X" if there is no JobProcess structure. + * + */ + +void save_current_configuration(char ***args, const void *parent, size_t *len) +{ + NIH_HASH_FOREACH(jobs, iter) { + Job *job = (Job *) iter; + char goal_state[4]; + JobProcess **pids; + + + if (job->replacement_for != NULL) continue; + if (job->state == JOB_DELETED) continue; + if (job->instance && ! job->instance_of) continue; + + if (! nih_str_array_add(args, parent, len, job->name)) + return; + + if (job->goal == JOB_START) goal_state[0] = '1'; + else goal_state[0] = '0'; + + switch (job->state) + { + case JOB_WAITING: goal_state[1] = 'W'; break; + case JOB_STARTING: goal_state[1] = 'S'; break; + case JOB_PRE_START: goal_state[1] = 'A'; break; + case JOB_SPAWNED: goal_state[1] = 'B'; break; + case JOB_POST_START: goal_state[1] = 'C'; break; + case JOB_RUNNING: goal_state[1] = 'R'; break; + case JOB_STOPPING: goal_state[1] = 'T'; break; + case JOB_PRE_STOP: goal_state[1] = 'X'; break; + case JOB_KILLED: goal_state[1] = 'Y'; break; + case JOB_POST_STOP: goal_state[1] = 'Z'; break; + default: goal_state[1] = '?'; + } + if (job->instance_of) goal_state[2] = 'I'; + else goal_state[2] = 'N'; + goal_state[3] = 0; + + if (! nih_str_array_add(args, parent, len, goal_state)) + return; + + pids = job->process; + store_pid(pids[PROCESS_MAIN], args, parent, len); + store_pid(pids[PROCESS_PRE_START], args, parent, len); + store_pid(pids[PROCESS_POST_START], args, parent, len); + store_pid(pids[PROCESS_PRE_STOP], args, parent, len); + store_pid(pids[PROCESS_POST_STOP], args, parent, len); + } +} + +/** + * restore_job_state: + * @jobname: name of job whose state we are to restore + * @goal_state: the goal/state string generated by save_current_configuration + * @pids: array of five process ids + * @presents: array of five integers indicating which process ids are applicable + */ + +void restore_job_state (char *jobname, char *goal_state, + pid_t *pids, int *presents) +{ + Job *job; + JobGoal goal = JOB_STOP; + JobState state = JOB_WAITING; + int is_instance = 0; + int is_invalid = 0; + JobProcess **procs; + + if (jobname == NULL) { + nih_error("Missing name for restored job"); + return; + } + + if (goal_state == NULL) { + nih_error("Missing goal/state for restored job %s", jobname); + return; + } + + if (strlen(goal_state) != 3) { + nih_error("Invalid length goal/state %s for restored job %s", + goal_state, jobname); + return; + } + + switch (goal_state[0]) + { + case '0': goal = JOB_STOP; break; + case '1': goal = JOB_START; break; + default: is_invalid = 1; break; + } + + switch (goal_state[1]) + { + case 'W': state = JOB_WAITING; break; + case 'S': state = JOB_STARTING; break; + case 'A': state = JOB_PRE_START; break; + case 'B': state = JOB_SPAWNED; break; + case 'C': state = JOB_POST_START; break; + case 'R': state = JOB_RUNNING; break; + case 'T': state = JOB_STOPPING; break; + case 'X': state = JOB_PRE_STOP; break; + case 'Y': state = JOB_KILLED; break; + case 'Z': state = JOB_POST_STOP; break; + default: is_invalid = 1; + } + + switch (goal_state[2]) + { + case 'N': break; + case 'I': is_instance = 1; break; + default: is_invalid = 1; + } + + if (is_invalid) { + nih_error("Invalid goal/state %s for restored job %s", + goal_state, jobname); + return; + } + job = job_find_by_name(jobname); + if (! job) { + nih_error("Unknown job %s passed to re-exec", jobname); + return; + } + if (is_instance) { + if (! job->instance) { + nih_error("Can not restore job %s as instance job", + jobname); + return; + } + job = job_instance(job); + } else { + if (job->instance) { + nih_error("Can not restore job %s as non-instance job", + jobname); + return; + } + } + job->goal = goal; + job->state = state; + procs=job->process; + restore_pid(procs[PROCESS_MAIN], pids[0], presents[0], jobname); + restore_pid(procs[PROCESS_PRE_START], pids[1], presents[1], jobname); + restore_pid(procs[PROCESS_POST_START], pids[2], presents[2], jobname); + restore_pid(procs[PROCESS_PRE_STOP], pids[3], presents[3], jobname); + restore_pid(procs[PROCESS_POST_STOP], pids[4], presents[4], jobname); +} + +/** + * restore_current_configuration: + * @args: non-option arguments that were passed to the new init + */ + +void restore_configuration(char **args) +{ + if (! args) return; + + char **arg = args; + while (arg && *arg) { + char *jobname = *(arg++); + char *goal_state = *arg; + pid_t pids[5]; + int presents[5]; + int is_invalid = 0; + + if (*arg) ++arg; + for (int i = 0; i < 5; i++) + retrieve_pid(&arg, jobname, &is_invalid, + &pids[i], &presents[i]); + + if (! is_invalid) + restore_job_state (jobname, goal_state, pids, presents); + } +} diff -uNr upstart-0.3.9.orig/init/restore.h upstart-0.3.9/init/restore.h --- upstart-0.3.9.orig/init/restore.h 1969-12-31 19:00:00.000000000 -0500 +++ upstart-0.3.9/init/restore.h 2009-01-23 13:44:54.000000000 -0500 @@ -0,0 +1,13 @@ +#ifndef INIT_RESTORE_H +#define INIT_RESTORE_H + +#include + +NIH_BEGIN_EXTERN + +void save_current_configuration(char ***args, const void *parent, size_t *len); +void restore_configuration(char **args); + +NIH_END_EXTERN + +#endif /* INIT_RESTORE_H */ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Aug 2008 18:57:16 -0000 1.6 +++ .cvsignore 7 Mar 2009 23:32:31 -0000 1.7 @@ -1 +1 @@ -upstart-0.5.0.tar.bz2 +upstart-0.3.9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 12 Aug 2008 18:57:16 -0000 1.7 +++ sources 7 Mar 2009 23:32:31 -0000 1.8 @@ -1 +1 @@ -c040227c746d22f87c0cd20cd1ca865b upstart-0.5.0.tar.bz2 +794208083d405ece123ad59a02f3e233 upstart-0.3.9.tar.bz2 Index: upstart.spec =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- upstart.spec 25 Feb 2009 23:19:08 -0000 1.27 +++ upstart.spec 7 Mar 2009 23:32:31 -0000 1.28 @@ -1,26 +1,24 @@ -#%define build_str 20080730bzr_dbus_userspace_1046 -%define build_str 0 -%if %build_str -%define build_rel 0.%{build_str}_ -%define build_pkg -%{build_str} -%else -%define build_rel %{nil} -%define build_pkg %{nil} -%endif - Name: upstart -Version: 0.5.0 -Release: %{build_rel}1%{?dist}.1 +Version: 0.3.9 +Release: 22%{?dist} Summary: An event-driven init system + Group: System Environment/Base License: GPLv2+ URL: http://upstart.ubuntu.com -Source0: http://upstart.ubuntu.com/download/0.3/upstart-%{version}%{build_pkg}.tar.bz2 -Source1: events.5 +Source0: http://upstart.ubuntu.com/download/0.3/upstart-%{version}.tar.bz2 +Source1: events.5 +Patch0: upstart-gcc43.patch +Patch1: upstart-force-on-shutdown-reboot.patch +Patch2: upstart-tty-stack.patch +Patch3: upstart-rpm.patch +Patch4: upstart-fedora-buglist.patch +Patch5: upstart-telinit-u.patch +Patch6: upstart-initctl-man.patch +Patch7: upstart-save-state-across-reexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24 -Requires: dbus >= 1.2.1-4 BuildRequires: gettext %description @@ -28,11 +26,16 @@ handles starting of tasks and services during boot, stopping them during shutdown and supervising them while the system is running. -%post -kill -TERM 1 - %prep -%setup -q -n upstart-%{version}%{build_pkg} +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 +%patch3 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build %configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib} @@ -42,11 +45,20 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} -mkdir -p %{buildroot}/%{_sysconfdir}/init/jobs.d/ - mkdir -p %{buildroot}/%{_mandir}/man5 install -m 644 %{SOURCE1} %{buildroot}/%{_mandir}/man5/events.5 +# libupstart and libnih aren't shipped +rm -f %{buildroot}/%{_lib}/libupstart.* +rm -f %{buildroot}/%{_lib}/libnih.* +rm -f %{buildroot}/%{_includedir}/libnih.h +rm -f %{buildroot}/%{_includedir}/libupstart.h +rm -rf %{buildroot}/%{_includedir}/nih +rm -rf %{buildroot}/%{_includedir}/upstart +rm -rf %{buildroot}/%{_datadir}/aclocal/compiler.m4 +rm -rf %{buildroot}/%{_datadir}/aclocal/linker.m4 +rm -rf %{buildroot}/%{_datadir}/aclocal/misc.m4 + %find_lang %{name} %clean @@ -60,11 +72,12 @@ %doc README %doc TODO %doc HACKING -%{_sysconfdir}/init/ -%{_sysconfdir}/dbus-1/system.d/Upstart.conf +%{_sysconfdir}/event.d/ +%config(noreplace) %{_sysconfdir}/event.d/logd /sbin/halt /sbin/init /sbin/initctl +/sbin/logd /sbin/poweroff /sbin/reboot /sbin/runlevel @@ -77,6 +90,7 @@ %{_mandir}/man8/halt.8.gz %{_mandir}/man8/init.8.gz %{_mandir}/man8/initctl.8.gz +%{_mandir}/man8/logd.8.gz %{_mandir}/man8/poweroff.8.gz %{_mandir}/man8/reboot.8.gz %{_mandir}/man8/runlevel.8.gz @@ -87,43 +101,12 @@ %{_mandir}/man8/telinit.8.gz %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 0.5.0-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Aug 12 2008 Casey Dahlin - 0.3.9-22 +- Re-add 'telinit u' support along with patch to fix it (#450488). Patch due to + -* Wed Jul 16 2008 Casey Dahlin - 0.3.9-21 +- Remove 'telinit u' support as it is broken (#450488, ) * Fri Apr 25 2008 Bill Nottingham - 0.3.9-19 - with the merge of event-compat-sysv, move the sysvinit obsoletes/provides here From lmacken at fedoraproject.org Sat Mar 7 23:34:25 2009 From: lmacken at fedoraproject.org (Luke Macken) Date: Sat, 7 Mar 2009 23:34:25 +0000 (UTC) Subject: rpms/TurboGears/EL-5 TurboGears-1.0.8-setup.patch, 1.1, 1.2 TurboGears.spec, 1.22, 1.23 Message-ID: <20090307233425.91BE870116@cvs1.fedora.phx.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/TurboGears/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11270 Modified Files: TurboGears-1.0.8-setup.patch TurboGears.spec Log Message: Update our setup.py patch to work with the 0.9 branch of SQLObject TurboGears-1.0.8-setup.patch: Index: TurboGears-1.0.8-setup.patch =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears-1.0.8-setup.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TurboGears-1.0.8-setup.patch 4 Mar 2009 03:12:37 -0000 1.1 +++ TurboGears-1.0.8-setup.patch 7 Mar 2009 23:34:24 -0000 1.2 @@ -1,14 +1,12 @@ -Index: setup.py -=================================================================== ---- setup.py.orig -+++ setup.py +--- setup.py.orig 2009-03-07 17:39:25.000000000 -0500 ++++ setup.py 2009-03-07 17:47:10.000000000 -0500 @@ -1,5 +1,3 @@ -from ez_setup import use_setuptools -use_setuptools() from setuptools import setup, find_packages from pkg_resources import DistributionNotFound -@@ -14,7 +12,6 @@ execfile(os.path.join("turbogears", "rel +@@ -14,7 +12,6 @@ # setup params install_requires = [ "CherryPy >= 2.3.0, < 3.0.0alpha", @@ -16,12 +14,22 @@ "DecoratorTools >= 1.4", "FormEncode >= 0.7.1", "PasteScript >= 1.6.2", -@@ -23,7 +20,7 @@ install_requires = [ +@@ -22,8 +19,7 @@ + "setuptools >= 0.6c2", "simplejson >= 1.3", "TurboCheetah >= 1.0", - # TurboJson >= 1.2 uses PEAK-Rules +- # TurboJson >= 1.2 uses PEAK-Rules - "TurboJson >= 1.1.4, < 1.2", + "TurboJson >= 1.1.4", "TurboKid >= 1.0.4", ] +@@ -35,7 +31,7 @@ + ] + + sqlobject = [ +- "SQLObject >= 0.10.1", ++ "SQLObject >= 0.9.7", + ] + + if sys.version_info < (2, 4): Index: TurboGears.spec =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- TurboGears.spec 4 Mar 2009 03:16:28 -0000 1.22 +++ TurboGears.spec 7 Mar 2009 23:34:25 -0000 1.23 @@ -3,7 +3,7 @@ Name: TurboGears Version: 1.0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Back-to-front web development in Python Group: Development/Languages @@ -93,6 +93,9 @@ %{python_sitelib}/turbogears/ %changelog +* Sat Mar 07 2009 Luke Macken 1.0.8-3 +- Update our setup.py patch to work with the 0.9 branch of SQLObject + * Tue Mar 3 2009 Toshio Kuratomi 1.0.8-2 - Add the correct patches to cvs From jussilehtola at fedoraproject.org Sat Mar 7 23:35:41 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Sat, 7 Mar 2009 23:35:41 +0000 (UTC) Subject: rpms/PyQuante/F-10 PyQuante.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090307233541.CD3BD70116@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/PyQuante/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11364/F-10 Modified Files: sources Added Files: PyQuante.spec Log Message: * Sun Mar 08 2009 Jussi Lehtola - 1.6.3-1 - Import to Fedora. --- NEW FILE PyQuante.spec --- %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: PyQuante Version: 1.6.3 Release: 1%{?dist} Summary: Python Quantum Chemistry Group: Applications/Engineering License: BSD URL: http://pyquante.sourceforge.net/ Source0: http://downloads.sourceforge.net/pyquante/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-setuptools-devel BuildRequires: numpy Requires: numpy %description PyQuante is an open-source suite of programs for developing quantum chemistry methods. The program is written in the Python programming language, but has many "rate-determining" modules also written in C for speed. The resulting code, though not as fast as Jaguar, NWChem, Gaussian, or GAMESS, is much easier to understand and modify. The goal of this software is not necessarily to provide a working quantum chemistry program (although it will hopefully do that), but rather to provide a well-engineered set of tools so that scientists can construct their own quantum chemistry programs without going through the tedium of having to write every low-level routine. %prep %setup -q %build %{__python} -c 'import setuptools; execfile("setup.py")' build %install rm -rf %{buildroot} %{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} mkdir -p %{buildroot}/%{_datadir}/%{name} cp -a Tests %{buildroot}/%{_datadir}/%{name}/ %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE README Doc/* %{python_sitearch}/* %{_datadir}/%{name} %changelog * Wed Feb 25 2009 Jussi Lehtola - 1.6.3-1 - Update to 1.6.3 that fixes the rest of the rpmlint errors. * Wed Feb 25 2009 Jussi Lehtola - 1.6.2-1 - Fix source URL. - Update to 1.6.2 that removes the shebangs and removes the use of the with keyword. * Tue Feb 24 2009 Jussi Lehtola - 1.6.1-5 - Add tests to %%{_datadir}/%%{name}. * Tue Feb 24 2009 Jussi Lehtola - 1.6.1-4 - Review fixes. * Fri Nov 21 2008 Jussi Lehtola - 1.6.1-3 - Fixed license tag. * Thu Nov 13 2008 Jussi Lehtola - 1.6.1-2 - Initial review fixes. * Sun Oct 26 2008 Jussi Lehtola - 1.6.1-1 - First release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PyQuante/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:10:51 -0000 1.1 +++ sources 7 Mar 2009 23:35:11 -0000 1.2 @@ -0,0 +1 @@ +5e44d1e67a4f62da69ade7e26e53ab7b PyQuante-1.6.3.tar.gz From jussilehtola at fedoraproject.org Sat Mar 7 23:35:42 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Sat, 7 Mar 2009 23:35:42 +0000 (UTC) Subject: rpms/PyQuante/F-9 PyQuante.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090307233542.AD33A70116@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/PyQuante/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11364/F-9 Modified Files: sources Added Files: PyQuante.spec Log Message: * Sun Mar 08 2009 Jussi Lehtola - 1.6.3-1 - Import to Fedora. --- NEW FILE PyQuante.spec --- %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: PyQuante Version: 1.6.3 Release: 1%{?dist} Summary: Python Quantum Chemistry Group: Applications/Engineering License: BSD URL: http://pyquante.sourceforge.net/ Source0: http://downloads.sourceforge.net/pyquante/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-setuptools-devel BuildRequires: numpy Requires: numpy %description PyQuante is an open-source suite of programs for developing quantum chemistry methods. The program is written in the Python programming language, but has many "rate-determining" modules also written in C for speed. The resulting code, though not as fast as Jaguar, NWChem, Gaussian, or GAMESS, is much easier to understand and modify. The goal of this software is not necessarily to provide a working quantum chemistry program (although it will hopefully do that), but rather to provide a well-engineered set of tools so that scientists can construct their own quantum chemistry programs without going through the tedium of having to write every low-level routine. %prep %setup -q %build %{__python} -c 'import setuptools; execfile("setup.py")' build %install rm -rf %{buildroot} %{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} mkdir -p %{buildroot}/%{_datadir}/%{name} cp -a Tests %{buildroot}/%{_datadir}/%{name}/ %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE README Doc/* %{python_sitearch}/* %{_datadir}/%{name} %changelog * Wed Feb 25 2009 Jussi Lehtola - 1.6.3-1 - Update to 1.6.3 that fixes the rest of the rpmlint errors. * Wed Feb 25 2009 Jussi Lehtola - 1.6.2-1 - Fix source URL. - Update to 1.6.2 that removes the shebangs and removes the use of the with keyword. * Tue Feb 24 2009 Jussi Lehtola - 1.6.1-5 - Add tests to %%{_datadir}/%%{name}. * Tue Feb 24 2009 Jussi Lehtola - 1.6.1-4 - Review fixes. * Fri Nov 21 2008 Jussi Lehtola - 1.6.1-3 - Fixed license tag. * Thu Nov 13 2008 Jussi Lehtola - 1.6.1-2 - Initial review fixes. * Sun Oct 26 2008 Jussi Lehtola - 1.6.1-1 - First release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PyQuante/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:10:51 -0000 1.1 +++ sources 7 Mar 2009 23:35:12 -0000 1.2 @@ -0,0 +1 @@ +5e44d1e67a4f62da69ade7e26e53ab7b PyQuante-1.6.3.tar.gz From rafalzaq at fedoraproject.org Sat Mar 7 23:54:25 2009 From: rafalzaq at fedoraproject.org (=?utf-8?q?Rafa=C5=82_Psota?=) Date: Sat, 7 Mar 2009 23:54:25 +0000 (UTC) Subject: rpms/blobwars/F-9 blobwars-1.11-es-title.patch, NONE, 1.1 blobwars-1.11-es.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 blobwars.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <20090307235425.8668E70116@cvs1.fedora.phx.redhat.com> Author: rafalzaq Update of /cvs/pkgs/rpms/blobwars/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15105 Modified Files: .cvsignore blobwars.spec sources Added Files: blobwars-1.11-es-title.patch blobwars-1.11-es.patch Log Message: update to 1.11 (bz 488584) blobwars-1.11-es-title.patch: --- NEW FILE blobwars-1.11-es-title.patch --- --- data/es/titleWidgets~ 2009-02-01 12:34:45.000000000 +0100 +++ data/es/titleWidgets 2009-03-02 09:52:35.000000000 +0100 @@ -6,7 +6,7 @@ BUTTON quit mainMenu "Salir" "*" -1 390 0 0 LABEL label help "Para las instrucciones del juego, mira el manual del" "*" -1 260 0 0 -LABEL label help "juego instalado en la siguiente localizaci??n," "*" -1 290 0 0 +LABEL label help "juego instalado en la siguiente localizaci??n:" "*" -1 290 0 0 LABEL labelManual help "/usr/share/doc/blobwars/manual.html" "*" -1 320 0 0 LABEL labelManual help "(actualmente s??lo en ingl??s)" "*" -1 350 0 0 blobwars-1.11-es.patch: --- NEW FILE blobwars-1.11-es.patch --- --- locale/es.po.orig 2009-03-02 09:07:32.000000000 +0100 +++ locale/es.po 2009-03-02 09:08:24.000000000 +0100 @@ -1,9 +1,9 @@ msgid "" msgstr "" -"Project-Id-Version: blobwars 1.06\n" -"PO-Revision-Date: 2007-06-04 09:33+0100\n" +"Project-Id-Version: blobwars 1.11\n" +"PO-Revision-Date: 2009-03-02 09:08+0100\n" "Last-Translator: Pacho Ramos \n" -"Language-Team: Catalan Localization \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -169,10 +169,10 @@ msgstr "Lucha contra Galdov" msgid "Collect 10 Cherry Plants" -msgstr "Recolectar 10 Plantas de Cerezas" +msgstr "Recolectar 10 Cerezos" msgid "Collect 20 Cherry Plants" -msgstr "Recolectar 20 Plantas de Cerezas" +msgstr "Recolectar 20 Cerezos" msgid "Collect 25 Boxes of Orichalcum Beads" msgstr "Recolectar 25 Cajas de Bolas de Oricalc" @@ -344,7 +344,7 @@ msgstr "Llega al Bosque" msgid "Get to the Main Pump Room" -msgstr "Llega al la Sala Principal de la Bomba" +msgstr "Llega a la Sala Principal de la Bomba" msgid "Get to the Maintenance Room" msgstr "Llega a la Sala de Mantenimiento" @@ -437,6 +437,49 @@ msgid "Picked up a Three Way Spread" msgstr "Has conseguido un Rifle a Tres Bandas" +#missing Picked up... +msgid "Picked up a Transmitter" +msgstr "Has conseguido un Transmisor" + +msgid "Picked up a Cherry Plant" +msgstr "Has tomado un Cerezo" + +msgid "Picked up a Fire Crystal" +msgstr "Has conseguido un Cristal de Fuego" + +msgid "Picked up a Time Crystal" +msgstr "Has conseguido un Cristal del Tiempo" + +msgid "Picked up a Space Crystal" +msgstr "Has conseguido un Cristal del Espacio" + +msgid "Picked up a Reality Crystal" +msgstr "Has conseguido un Cristal de la realidad" + +msgid "Picked up a Sword" +msgstr "Has conseguido una Espada" + +msgid "Picked up a Pack of Dynamite" +msgstr "Has conseguido un Cartucho de Dinamita" + +msgid "Picked up a Diamond" +msgstr "Has adquirido un Diamante" + +msgid "Picked up a Set of Blueprints" +msgstr "Has adquirido los Planos" + +msgid "Picked up a Map Piece" +msgstr "Has conseguido una pieza del Mapa" + +msgid "Picked up a Box of Orichalcum" +msgstr "Has adquirido una caja de Oricalc" + +msgid "Picked up a Cypher Piece #1" +msgstr "Pieza clave #1 conseguida" + +msgid "Picked up a Cypher Piece #2" +msgstr "Pieza clave #2 conseguida" + # ... required msgid "Ancient Cog required" msgstr "Se requiere una Rueda Dentada Antigua" @@ -643,7 +686,7 @@ msgstr "F??cil" msgid "Empty" -msgstr "Vac??o" +msgstr "Vac??a" msgid "Enemies" msgstr "Enemigos" @@ -673,10 +716,10 @@ msgstr "????Galdov ha perdido el cristal!! ??R??pido! ??Hay que conseguirlo!" msgid "Got the Aqua Lung! You can now swim forever!" -msgstr "??Ya tienes el Pulm??n Acu??tico! ??Podr??s nadar para siempre??" +msgstr "??Ya tienes el Pulm??n Acu??tico! ??Podr??s nadar sin l??mite??" msgid "Got the Jetpack! Press SPACE to Activate!" -msgstr "??Ya tienes la Mochila a Propulsi??n! ??Act??valo para volar!" +msgstr "??Ya tienes la Mochila a Propulsi??n! ??Act??vala para volar!" msgid "Grenades" msgstr "Granadas" @@ -715,7 +758,7 @@ msgstr "Mochila a Propulsi??n" msgid "Jetpack cannot be used underwater" -msgstr "No puedes usar la Mochila a Propulsi??n bajo agua" +msgstr "No puedes usar la Mochila a Propulsi??n bajo el agua" msgid "Jetpack is recharging..." msgstr "La Mochila a Propulsi??n est?? recarg??ndose..." @@ -991,7 +1034,7 @@ msgstr "??Ya tienes la Mochila a Propulsi??n!" msgid "You'll need to 'Kill Two Birds with One Stone' here..." -msgstr "Aqu?? necesitar??s \"Matar Dos P??jaros de Una Tiro\"..." +msgstr "Aqu?? necesitar??s \"Matar Dos P??jaros de Un Tiro\"..." # Keys msgid "backspace" @@ -1007,7 +1050,7 @@ msgstr "abajo" msgid "end" -msgstr "fifin" +msgstr "fin" msgid "enter" msgstr "intro" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/blobwars/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Aug 2008 21:38:02 -0000 1.5 +++ .cvsignore 7 Mar 2009 23:53:54 -0000 1.6 @@ -1,2 +1 @@ -blobwars-1.09b2.tar.bz2 -blobwars-1.09b2-music.tar.bz2 +blobwars-1.11.tar.bz2 Index: blobwars.spec =================================================================== RCS file: /cvs/pkgs/rpms/blobwars/F-9/blobwars.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- blobwars.spec 29 Aug 2008 23:39:47 -0000 1.9 +++ blobwars.spec 7 Mar 2009 23:53:55 -0000 1.10 @@ -1,6 +1,6 @@ Name: blobwars -Version: 1.09b2 -Release: 2%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: Mission and Objective based 2D Platform Game Group: Amusements/Games License: GPLv2+ and Redistributable, no modification permitted @@ -8,11 +8,13 @@ URL: http://www.parallelrealities.co.uk/blobWars.php # no full URL as it gets downloaded through a php script, and nonfree sound files has been removed Source0: %{name}-%{version}.tar.bz2 -Source1: %{name}-%{version}-music.tar.bz2 +Source1: %{name}-1.09b2-music.tar.bz2 Patch0: blobwars-1.09b2-makefile.patch -Patch1: blobwars-1.05-desktop.patch +#Patch1: blobwars-1.05-desktop.patch #Patch2: blobwars-1.07-es.patch -Patch3: blobwars-1.09b2-font_error.patch +#Patch3: blobwars-1.09b2-font_error.patch +Patch4: blobwars-1.11-es.patch +Patch5: blobwars-1.11-es-title.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel SDL_image-devel SDL_ttf-devel zlib-devel BuildRequires: gettext desktop-file-utils @@ -28,10 +30,18 @@ %prep %setup -q -a 1 %patch0 -p0 -z .makefile -%patch1 -p1 -z .dsktop +#%patch1 -p1 -z .dsktop #%patch2 -p0 -%patch3 -p1 -z .font_error +#%patch3 -p1 -z .font_error +%patch4 -p0 +%patch5 -p0 + +# +sed -e "s#Name=Metal Blob Solid#Name=Blob Wars : Metal Blob Solid#" -i icons/blobwars.desktop +echo >> "Comment=Mission and Objective based 2D Platform Game" icons/blobwars.desktop +chmod a-x src/* doc/* + cp -p *{.xm,.s3m,.mod} music/ @@ -46,6 +56,9 @@ %find_lang %{name} desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --remove-category=Application \ + --add-category=ActionGame \ + --remove-key=X-Desktop-File-Install-Version \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} @@ -77,6 +90,9 @@ %changelog +* Sat Mar 07 2009 Rafa?? Psota 1.11-1 +- update to 1.11 (bz 488584) + * Sat Aug 30 2008 Rafa?? Psota 1.09b2-2 - FONT_ERROR patch (thanks to Micha?? Bentkowski) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/blobwars/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Aug 2008 21:38:02 -0000 1.5 +++ sources 7 Mar 2009 23:53:55 -0000 1.6 @@ -1,2 +1 @@ -30cc5ff2dc51e2e4ee4f48dfb6c7a1d1 blobwars-1.09b2.tar.bz2 -d01a343e3c18b817dc3f25224c6e66fb blobwars-1.09b2-music.tar.bz2 +ca356775247db91dea09459aeb6c33f2 blobwars-1.11.tar.bz2 From rafalzaq at fedoraproject.org Sat Mar 7 23:56:41 2009 From: rafalzaq at fedoraproject.org (=?utf-8?q?Rafa=C5=82_Psota?=) Date: Sat, 7 Mar 2009 23:56:41 +0000 (UTC) Subject: rpms/blobwars/F-10 blobwars-1.11-es-title.patch, NONE, 1.1 blobwars-1.11-es.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 blobwars.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <20090307235641.EA60970116@cvs1.fedora.phx.redhat.com> Author: rafalzaq Update of /cvs/pkgs/rpms/blobwars/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15650 Modified Files: .cvsignore blobwars.spec sources Added Files: blobwars-1.11-es-title.patch blobwars-1.11-es.patch Log Message: update to 1.11 (bz 488584) blobwars-1.11-es-title.patch: --- NEW FILE blobwars-1.11-es-title.patch --- --- data/es/titleWidgets~ 2009-02-01 12:34:45.000000000 +0100 +++ data/es/titleWidgets 2009-03-02 09:52:35.000000000 +0100 @@ -6,7 +6,7 @@ BUTTON quit mainMenu "Salir" "*" -1 390 0 0 LABEL label help "Para las instrucciones del juego, mira el manual del" "*" -1 260 0 0 -LABEL label help "juego instalado en la siguiente localizaci??n," "*" -1 290 0 0 +LABEL label help "juego instalado en la siguiente localizaci??n:" "*" -1 290 0 0 LABEL labelManual help "/usr/share/doc/blobwars/manual.html" "*" -1 320 0 0 LABEL labelManual help "(actualmente s??lo en ingl??s)" "*" -1 350 0 0 blobwars-1.11-es.patch: --- NEW FILE blobwars-1.11-es.patch --- --- locale/es.po.orig 2009-03-02 09:07:32.000000000 +0100 +++ locale/es.po 2009-03-02 09:08:24.000000000 +0100 @@ -1,9 +1,9 @@ msgid "" msgstr "" -"Project-Id-Version: blobwars 1.06\n" -"PO-Revision-Date: 2007-06-04 09:33+0100\n" +"Project-Id-Version: blobwars 1.11\n" +"PO-Revision-Date: 2009-03-02 09:08+0100\n" "Last-Translator: Pacho Ramos \n" -"Language-Team: Catalan Localization \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -169,10 +169,10 @@ msgstr "Lucha contra Galdov" msgid "Collect 10 Cherry Plants" -msgstr "Recolectar 10 Plantas de Cerezas" +msgstr "Recolectar 10 Cerezos" msgid "Collect 20 Cherry Plants" -msgstr "Recolectar 20 Plantas de Cerezas" +msgstr "Recolectar 20 Cerezos" msgid "Collect 25 Boxes of Orichalcum Beads" msgstr "Recolectar 25 Cajas de Bolas de Oricalc" @@ -344,7 +344,7 @@ msgstr "Llega al Bosque" msgid "Get to the Main Pump Room" -msgstr "Llega al la Sala Principal de la Bomba" +msgstr "Llega a la Sala Principal de la Bomba" msgid "Get to the Maintenance Room" msgstr "Llega a la Sala de Mantenimiento" @@ -437,6 +437,49 @@ msgid "Picked up a Three Way Spread" msgstr "Has conseguido un Rifle a Tres Bandas" +#missing Picked up... +msgid "Picked up a Transmitter" +msgstr "Has conseguido un Transmisor" + +msgid "Picked up a Cherry Plant" +msgstr "Has tomado un Cerezo" + +msgid "Picked up a Fire Crystal" +msgstr "Has conseguido un Cristal de Fuego" + +msgid "Picked up a Time Crystal" +msgstr "Has conseguido un Cristal del Tiempo" + +msgid "Picked up a Space Crystal" +msgstr "Has conseguido un Cristal del Espacio" + +msgid "Picked up a Reality Crystal" +msgstr "Has conseguido un Cristal de la realidad" + +msgid "Picked up a Sword" +msgstr "Has conseguido una Espada" + +msgid "Picked up a Pack of Dynamite" +msgstr "Has conseguido un Cartucho de Dinamita" + +msgid "Picked up a Diamond" +msgstr "Has adquirido un Diamante" + +msgid "Picked up a Set of Blueprints" +msgstr "Has adquirido los Planos" + +msgid "Picked up a Map Piece" +msgstr "Has conseguido una pieza del Mapa" + +msgid "Picked up a Box of Orichalcum" +msgstr "Has adquirido una caja de Oricalc" + +msgid "Picked up a Cypher Piece #1" +msgstr "Pieza clave #1 conseguida" + +msgid "Picked up a Cypher Piece #2" +msgstr "Pieza clave #2 conseguida" + # ... required msgid "Ancient Cog required" msgstr "Se requiere una Rueda Dentada Antigua" @@ -643,7 +686,7 @@ msgstr "F??cil" msgid "Empty" -msgstr "Vac??o" +msgstr "Vac??a" msgid "Enemies" msgstr "Enemigos" @@ -673,10 +716,10 @@ msgstr "????Galdov ha perdido el cristal!! ??R??pido! ??Hay que conseguirlo!" msgid "Got the Aqua Lung! You can now swim forever!" -msgstr "??Ya tienes el Pulm??n Acu??tico! ??Podr??s nadar para siempre??" +msgstr "??Ya tienes el Pulm??n Acu??tico! ??Podr??s nadar sin l??mite??" msgid "Got the Jetpack! Press SPACE to Activate!" -msgstr "??Ya tienes la Mochila a Propulsi??n! ??Act??valo para volar!" +msgstr "??Ya tienes la Mochila a Propulsi??n! ??Act??vala para volar!" msgid "Grenades" msgstr "Granadas" @@ -715,7 +758,7 @@ msgstr "Mochila a Propulsi??n" msgid "Jetpack cannot be used underwater" -msgstr "No puedes usar la Mochila a Propulsi??n bajo agua" +msgstr "No puedes usar la Mochila a Propulsi??n bajo el agua" msgid "Jetpack is recharging..." msgstr "La Mochila a Propulsi??n est?? recarg??ndose..." @@ -991,7 +1034,7 @@ msgstr "??Ya tienes la Mochila a Propulsi??n!" msgid "You'll need to 'Kill Two Birds with One Stone' here..." -msgstr "Aqu?? necesitar??s \"Matar Dos P??jaros de Una Tiro\"..." +msgstr "Aqu?? necesitar??s \"Matar Dos P??jaros de Un Tiro\"..." # Keys msgid "backspace" @@ -1007,7 +1050,7 @@ msgstr "abajo" msgid "end" -msgstr "fifin" +msgstr "fin" msgid "enter" msgstr "intro" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/blobwars/F-10/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Aug 2008 21:40:17 -0000 1.5 +++ .cvsignore 7 Mar 2009 23:56:11 -0000 1.6 @@ -1,2 +1 @@ -blobwars-1.09b2.tar.bz2 -blobwars-1.09b2-music.tar.bz2 +blobwars-1.11.tar.bz2 Index: blobwars.spec =================================================================== RCS file: /cvs/pkgs/rpms/blobwars/F-10/blobwars.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- blobwars.spec 29 Aug 2008 23:42:15 -0000 1.9 +++ blobwars.spec 7 Mar 2009 23:56:11 -0000 1.10 @@ -1,6 +1,6 @@ Name: blobwars -Version: 1.09b2 -Release: 2%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: Mission and Objective based 2D Platform Game Group: Amusements/Games License: GPLv2+ and Redistributable, no modification permitted @@ -8,11 +8,13 @@ URL: http://www.parallelrealities.co.uk/blobWars.php # no full URL as it gets downloaded through a php script, and nonfree sound files has been removed Source0: %{name}-%{version}.tar.bz2 -Source1: %{name}-%{version}-music.tar.bz2 +Source1: %{name}-1.09b2-music.tar.bz2 Patch0: blobwars-1.09b2-makefile.patch -Patch1: blobwars-1.05-desktop.patch +#Patch1: blobwars-1.05-desktop.patch #Patch2: blobwars-1.07-es.patch -Patch3: blobwars-1.09b2-font_error.patch +#Patch3: blobwars-1.09b2-font_error.patch +Patch4: blobwars-1.11-es.patch +Patch5: blobwars-1.11-es-title.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel SDL_image-devel SDL_ttf-devel zlib-devel BuildRequires: gettext desktop-file-utils @@ -28,10 +30,18 @@ %prep %setup -q -a 1 %patch0 -p0 -z .makefile -%patch1 -p1 -z .dsktop +#%patch1 -p1 -z .dsktop #%patch2 -p0 -%patch3 -p1 -z .font_error +#%patch3 -p1 -z .font_error +%patch4 -p0 +%patch5 -p0 + +# +sed -e "s#Name=Metal Blob Solid#Name=Blob Wars : Metal Blob Solid#" -i icons/blobwars.desktop +echo >> "Comment=Mission and Objective based 2D Platform Game" icons/blobwars.desktop +chmod a-x src/* doc/* + cp -p *{.xm,.s3m,.mod} music/ @@ -46,6 +56,9 @@ %find_lang %{name} desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --remove-category=Application \ + --add-category=ActionGame \ + --remove-key=X-Desktop-File-Install-Version \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} @@ -77,6 +90,9 @@ %changelog +* Sat Mar 07 2009 Rafa?? Psota 1.11-1 +- update to 1.11 (bz 488584) + * Sat Aug 30 2008 Rafa?? Psota 1.09b2-2 - FONT_ERROR patch (thanks to Micha?? Bentkowski) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/blobwars/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Aug 2008 21:40:17 -0000 1.5 +++ sources 7 Mar 2009 23:56:11 -0000 1.6 @@ -1,2 +1 @@ -30cc5ff2dc51e2e4ee4f48dfb6c7a1d1 blobwars-1.09b2.tar.bz2 -d01a343e3c18b817dc3f25224c6e66fb blobwars-1.09b2-music.tar.bz2 +ca356775247db91dea09459aeb6c33f2 blobwars-1.11.tar.bz2 From pfj at fedoraproject.org Sat Mar 7 23:59:00 2009 From: pfj at fedoraproject.org (Paul F. Johnson) Date: Sat, 7 Mar 2009 23:59:00 +0000 (UTC) Subject: rpms/mono/devel import.log, 1.39, 1.40 mono-22-libdir.patch, 1.1, 1.2 mono.spec, 1.114, 1.115 Message-ID: <20090307235900.3BDB270116@cvs1.fedora.phx.redhat.com> Author: pfj Update of /cvs/pkgs/rpms/mono/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16266/devel Modified Files: import.log mono-22-libdir.patch mono.spec Log Message: Fix libdir issue with mono-cairo Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- import.log 27 Feb 2009 23:10:23 -0000 1.39 +++ import.log 7 Mar 2009 23:58:29 -0000 1.40 @@ -37,3 +37,4 @@ mono-2_4-7_pre3_20091702svn127216_fc11:HEAD:mono-2.4-7.pre3.20091702svn127216.fc11.src.rpm:1234914090 mono-2_4-7_pre3_20091802svn127307_fc11:HEAD:mono-2.4-7.pre3.20091802svn127307.fc11.src.rpm:1234999657 mono-2_4-8_RC1_fc11:HEAD:mono-2.4-8.RC1.fc11.src.rpm:1235776176 +mono-2_4-9_RC1_fc11:HEAD:mono-2.4-9.RC1.fc11.src.rpm:1236470243 mono-22-libdir.patch: Index: mono-22-libdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/mono/devel/mono-22-libdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mono-22-libdir.patch 15 Dec 2008 11:57:49 -0000 1.1 +++ mono-22-libdir.patch 7 Mar 2009 23:58:29 -0000 1.2 @@ -39,25 +39,13 @@ Name: Mono Internal -- Do not use. --- mono-2.2/data/mint.pc.in 2008-11-18 21:10:32.000000000 +0000 +++ mono-2.2/data/mint.pc-new.in 2008-11-18 21:12:55.000000000 +0000 -@@ -1,6 +1,6 @@ +@@ -1,5 +1,5 @@ prefix=${pcfiledir}/../.. exec_prefix=${pcfiledir}/../.. -libdir=${prefix}/lib +libdir=@libdir@ includedir=${prefix}/include/mono- at API_VER@ - ---- mono-2.2/data/mono-cairo.pc.in 2008-11-18 21:10:32.000000000 +0000 -+++ mono-2.2/data/mono-cairo.pc-new.in 2008-11-18 21:13:30.000000000 +0000 -@@ -1,6 +1,6 @@ - prefix=${pcfiledir}/../.. - exec_prefix=${pcfiledir}/../.. --libdir=${prefix}/@reloc_libdir@ -+libdir=@libdir@ - includedir=${prefix}/include - - Name: Mono.Cairo - --- mono-2.2/data/mono-lineeditor.pc.in 2008-11-11 04:56:15.000000000 +0000 +++ mono-2.2/data/mono-lineeditor.pc-new.in 2008-11-18 21:14:18.000000000 +0000 @@ -1,5 +1,5 @@ @@ -128,5 +116,19 @@ -mono_instdir = $(prefix)/lib/mono +mono_instdir = $(libdir)/mono endif + +--- mono-2.4/data/mono-cairo.pc.in 2009-02-13 23:34:32.000000000 +0000 ++++ mono-2.4/data/mono-cairo.pc-new.in 2009-03-07 23:32:13.000000000 +0000 +@@ -1,9 +1,9 @@ + prefix=${pcfiledir}/../.. + exec_prefix=${pcfiledir}/../.. +-libdir=${prefix}/@reloc_libdir@ ++libdir=@libdir@ + includedir=${prefix}/include + Name: Mono.Cairo + Description: Cairo bindings for Mono + Version: @VERSION@ +-Libs: -r:${prefix}/lib/mono/1.0/Mono.Cairo.dll ++Libs: -r:${libdir}/mono/1.0/Mono.Cairo.dll Index: mono.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- mono.spec 7 Mar 2009 23:27:58 -0000 1.114 +++ mono.spec 7 Mar 2009 23:58:29 -0000 1.115 @@ -282,7 +282,6 @@ sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions_1.0.pc.in sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions.design_1.0.pc.in sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' docs/Makefile.{am,in} -sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' data/mono-cairo.pc.in autoreconf -f -i -s @@ -686,8 +685,8 @@ %{_libdir}/pkgconfig/monodoc.pc %changelog -* Sat Mar 07 2009 Xavier Lamien - 2.4-9.RC1 -- Fix libdir on mono-cairo pkg-config. +* Sat Mar 07 2009 Paul F. Johnson 2.4-9.RC1 +- Fix libdir issue with mono-cairo * Fri Feb 27 2009 Paul F. Johnson 2.4-8.RC1 - Built using official tarball release From rafalzaq at fedoraproject.org Sun Mar 8 00:01:52 2009 From: rafalzaq at fedoraproject.org (=?utf-8?q?Rafa=C5=82_Psota?=) Date: Sun, 8 Mar 2009 00:01:52 +0000 (UTC) Subject: rpms/blobwars/devel blobwars-1.11-es-title.patch, NONE, 1.1 blobwars-1.11-es.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 blobwars.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <20090308000152.339B170116@cvs1.fedora.phx.redhat.com> Author: rafalzaq Update of /cvs/pkgs/rpms/blobwars/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17391 Modified Files: .cvsignore blobwars.spec sources Added Files: blobwars-1.11-es-title.patch blobwars-1.11-es.patch Log Message: update to 1.11 (bz 488584) blobwars-1.11-es-title.patch: --- NEW FILE blobwars-1.11-es-title.patch --- --- data/es/titleWidgets~ 2009-02-01 12:34:45.000000000 +0100 +++ data/es/titleWidgets 2009-03-02 09:52:35.000000000 +0100 @@ -6,7 +6,7 @@ BUTTON quit mainMenu "Salir" "*" -1 390 0 0 LABEL label help "Para las instrucciones del juego, mira el manual del" "*" -1 260 0 0 -LABEL label help "juego instalado en la siguiente localizaci??n," "*" -1 290 0 0 +LABEL label help "juego instalado en la siguiente localizaci??n:" "*" -1 290 0 0 LABEL labelManual help "/usr/share/doc/blobwars/manual.html" "*" -1 320 0 0 LABEL labelManual help "(actualmente s??lo en ingl??s)" "*" -1 350 0 0 blobwars-1.11-es.patch: --- NEW FILE blobwars-1.11-es.patch --- --- locale/es.po.orig 2009-03-02 09:07:32.000000000 +0100 +++ locale/es.po 2009-03-02 09:08:24.000000000 +0100 @@ -1,9 +1,9 @@ msgid "" msgstr "" -"Project-Id-Version: blobwars 1.06\n" -"PO-Revision-Date: 2007-06-04 09:33+0100\n" +"Project-Id-Version: blobwars 1.11\n" +"PO-Revision-Date: 2009-03-02 09:08+0100\n" "Last-Translator: Pacho Ramos \n" -"Language-Team: Catalan Localization \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -169,10 +169,10 @@ msgstr "Lucha contra Galdov" msgid "Collect 10 Cherry Plants" -msgstr "Recolectar 10 Plantas de Cerezas" +msgstr "Recolectar 10 Cerezos" msgid "Collect 20 Cherry Plants" -msgstr "Recolectar 20 Plantas de Cerezas" +msgstr "Recolectar 20 Cerezos" msgid "Collect 25 Boxes of Orichalcum Beads" msgstr "Recolectar 25 Cajas de Bolas de Oricalc" @@ -344,7 +344,7 @@ msgstr "Llega al Bosque" msgid "Get to the Main Pump Room" -msgstr "Llega al la Sala Principal de la Bomba" +msgstr "Llega a la Sala Principal de la Bomba" msgid "Get to the Maintenance Room" msgstr "Llega a la Sala de Mantenimiento" @@ -437,6 +437,49 @@ msgid "Picked up a Three Way Spread" msgstr "Has conseguido un Rifle a Tres Bandas" +#missing Picked up... +msgid "Picked up a Transmitter" +msgstr "Has conseguido un Transmisor" + +msgid "Picked up a Cherry Plant" +msgstr "Has tomado un Cerezo" + +msgid "Picked up a Fire Crystal" +msgstr "Has conseguido un Cristal de Fuego" + +msgid "Picked up a Time Crystal" +msgstr "Has conseguido un Cristal del Tiempo" + +msgid "Picked up a Space Crystal" +msgstr "Has conseguido un Cristal del Espacio" + +msgid "Picked up a Reality Crystal" +msgstr "Has conseguido un Cristal de la realidad" + +msgid "Picked up a Sword" +msgstr "Has conseguido una Espada" + +msgid "Picked up a Pack of Dynamite" +msgstr "Has conseguido un Cartucho de Dinamita" + +msgid "Picked up a Diamond" +msgstr "Has adquirido un Diamante" + +msgid "Picked up a Set of Blueprints" +msgstr "Has adquirido los Planos" + +msgid "Picked up a Map Piece" +msgstr "Has conseguido una pieza del Mapa" + +msgid "Picked up a Box of Orichalcum" +msgstr "Has adquirido una caja de Oricalc" + +msgid "Picked up a Cypher Piece #1" +msgstr "Pieza clave #1 conseguida" + +msgid "Picked up a Cypher Piece #2" +msgstr "Pieza clave #2 conseguida" + # ... required msgid "Ancient Cog required" msgstr "Se requiere una Rueda Dentada Antigua" @@ -643,7 +686,7 @@ msgstr "F??cil" msgid "Empty" -msgstr "Vac??o" +msgstr "Vac??a" msgid "Enemies" msgstr "Enemigos" @@ -673,10 +716,10 @@ msgstr "????Galdov ha perdido el cristal!! ??R??pido! ??Hay que conseguirlo!" msgid "Got the Aqua Lung! You can now swim forever!" -msgstr "??Ya tienes el Pulm??n Acu??tico! ??Podr??s nadar para siempre??" +msgstr "??Ya tienes el Pulm??n Acu??tico! ??Podr??s nadar sin l??mite??" msgid "Got the Jetpack! Press SPACE to Activate!" -msgstr "??Ya tienes la Mochila a Propulsi??n! ??Act??valo para volar!" +msgstr "??Ya tienes la Mochila a Propulsi??n! ??Act??vala para volar!" msgid "Grenades" msgstr "Granadas" @@ -715,7 +758,7 @@ msgstr "Mochila a Propulsi??n" msgid "Jetpack cannot be used underwater" -msgstr "No puedes usar la Mochila a Propulsi??n bajo agua" +msgstr "No puedes usar la Mochila a Propulsi??n bajo el agua" msgid "Jetpack is recharging..." msgstr "La Mochila a Propulsi??n est?? recarg??ndose..." @@ -991,7 +1034,7 @@ msgstr "??Ya tienes la Mochila a Propulsi??n!" msgid "You'll need to 'Kill Two Birds with One Stone' here..." -msgstr "Aqu?? necesitar??s \"Matar Dos P??jaros de Una Tiro\"..." +msgstr "Aqu?? necesitar??s \"Matar Dos P??jaros de Un Tiro\"..." # Keys msgid "backspace" @@ -1007,7 +1050,7 @@ msgstr "abajo" msgid "end" -msgstr "fifin" +msgstr "fin" msgid "enter" msgstr "intro" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/blobwars/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Aug 2008 21:40:17 -0000 1.5 +++ .cvsignore 8 Mar 2009 00:01:20 -0000 1.6 @@ -1,2 +1 @@ -blobwars-1.09b2.tar.bz2 -blobwars-1.09b2-music.tar.bz2 +blobwars-1.11.tar.bz2 Index: blobwars.spec =================================================================== RCS file: /cvs/pkgs/rpms/blobwars/devel/blobwars.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- blobwars.spec 24 Feb 2009 05:05:37 -0000 1.10 +++ blobwars.spec 8 Mar 2009 00:01:21 -0000 1.11 @@ -1,6 +1,6 @@ Name: blobwars -Version: 1.09b2 -Release: 3%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: Mission and Objective based 2D Platform Game Group: Amusements/Games License: GPLv2+ and Redistributable, no modification permitted @@ -8,11 +8,13 @@ URL: http://www.parallelrealities.co.uk/blobWars.php # no full URL as it gets downloaded through a php script, and nonfree sound files has been removed Source0: %{name}-%{version}.tar.bz2 -Source1: %{name}-%{version}-music.tar.bz2 +Source1: %{name}-1.09b2-music.tar.bz2 Patch0: blobwars-1.09b2-makefile.patch -Patch1: blobwars-1.05-desktop.patch +#Patch1: blobwars-1.05-desktop.patch #Patch2: blobwars-1.07-es.patch -Patch3: blobwars-1.09b2-font_error.patch +#Patch3: blobwars-1.09b2-font_error.patch +Patch4: blobwars-1.11-es.patch +Patch5: blobwars-1.11-es-title.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel SDL_image-devel SDL_ttf-devel zlib-devel BuildRequires: gettext desktop-file-utils @@ -28,10 +30,18 @@ %prep %setup -q -a 1 %patch0 -p0 -z .makefile -%patch1 -p1 -z .dsktop +#%patch1 -p1 -z .dsktop #%patch2 -p0 -%patch3 -p1 -z .font_error +#%patch3 -p1 -z .font_error +%patch4 -p0 +%patch5 -p0 + +# +sed -e "s#Name=Metal Blob Solid#Name=Blob Wars : Metal Blob Solid#" -i icons/blobwars.desktop +echo >> "Comment=Mission and Objective based 2D Platform Game" icons/blobwars.desktop +chmod a-x src/* doc/* + cp -p *{.xm,.s3m,.mod} music/ @@ -46,6 +56,9 @@ %find_lang %{name} desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --remove-category=Application \ + --add-category=ActionGame \ + --remove-key=X-Desktop-File-Install-Version \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} @@ -77,6 +90,9 @@ %changelog +* Sat Mar 07 2009 Rafa?? Psota 1.11-1 +- update to 1.11 (bz 488584) + * Mon Feb 23 2009 Fedora Release Engineering - 1.09b2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/blobwars/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Aug 2008 21:40:17 -0000 1.5 +++ sources 8 Mar 2009 00:01:21 -0000 1.6 @@ -1,2 +1 @@ -30cc5ff2dc51e2e4ee4f48dfb6c7a1d1 blobwars-1.09b2.tar.bz2 -d01a343e3c18b817dc3f25224c6e66fb blobwars-1.09b2-music.tar.bz2 +ca356775247db91dea09459aeb6c33f2 blobwars-1.11.tar.bz2 From pkgdb at fedoraproject.org Sun Mar 8 00:13:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 00:13:26 +0000 Subject: [pkgdb] PyQuante (Fedora EPEL, 5) updated by kevin Message-ID: <20090308001324.1105020820B@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for PyQuante kevin has set commit to Approved for provenpackager on PyQuante (Fedora EPEL 5) kevin has set build to Approved for provenpackager on PyQuante (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on PyQuante (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyQuante From pkgdb at fedoraproject.org Sun Mar 8 00:14:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 00:14:24 +0000 Subject: [pkgdb] sugar-update-control was added for tuxbrewr Message-ID: <20090308001446.5E521208543@bastion.fedora.phx.redhat.com> kevin has added Package sugar-update-control with summary Activity update control panel for the Sugar Desktop kevin has approved Package sugar-update-control kevin has added a Fedora devel branch for sugar-update-control with an owner of tuxbrewr kevin has approved sugar-update-control in Fedora devel kevin has approved Package sugar-update-control kevin has set commit to Approved for provenpackager on sugar-update-control (Fedora devel) kevin has set build to Approved for provenpackager on sugar-update-control (Fedora devel) kevin has set checkout to Approved for provenpackager on sugar-update-control (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 00:13:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 00:13:53 +0000 Subject: [pkgdb] sugar-update-control (Fedora, 10) updated by kevin Message-ID: <20090308001447.6D282208546@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for sugar-update-control kevin has set commit to Approved for provenpackager on sugar-update-control (Fedora 10) kevin has set build to Approved for provenpackager on sugar-update-control (Fedora 10) kevin has set checkout to Approved for provenpackager on sugar-update-control (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From kevin at fedoraproject.org Sun Mar 8 00:14:10 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 8 Mar 2009 00:14:10 +0000 (UTC) Subject: rpms/sugar-update-control - New directory Message-ID: <20090308001410.4124170116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/sugar-update-control In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc20138/rpms/sugar-update-control Log Message: Directory /cvs/pkgs/rpms/sugar-update-control added to the repository From kevin at fedoraproject.org Sun Mar 8 00:14:10 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 8 Mar 2009 00:14:10 +0000 (UTC) Subject: rpms/sugar-update-control/devel - New directory Message-ID: <20090308001410.83DFF70119@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/sugar-update-control/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc20138/rpms/sugar-update-control/devel Log Message: Directory /cvs/pkgs/rpms/sugar-update-control/devel added to the repository From kevin at fedoraproject.org Sun Mar 8 00:14:28 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 8 Mar 2009 00:14:28 +0000 (UTC) Subject: rpms/sugar-update-control Makefile,NONE,1.1 Message-ID: <20090308001428.B010770116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/sugar-update-control In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc20138/rpms/sugar-update-control Added Files: Makefile Log Message: Setup of module sugar-update-control --- NEW FILE Makefile --- # Top level Makefile for module sugar-update-control all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Sun Mar 8 00:14:30 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 8 Mar 2009 00:14:30 +0000 (UTC) Subject: rpms/sugar-update-control/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090308001430.6067270116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/sugar-update-control/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc20138/rpms/sugar-update-control/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module sugar-update-control --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: sugar-update-control # $Id: Makefile,v 1.1 2009/03/08 00:14:30 kevin Exp $ NAME := sugar-update-control SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From rafalzaq at fedoraproject.org Sun Mar 8 00:15:42 2009 From: rafalzaq at fedoraproject.org (=?utf-8?q?Rafa=C5=82_Psota?=) Date: Sun, 8 Mar 2009 00:15:42 +0000 (UTC) Subject: rpms/blobwars/F-9 .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <20090308001542.A592870116@cvs1.fedora.phx.redhat.com> Author: rafalzaq Update of /cvs/pkgs/rpms/blobwars/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20422 Modified Files: .cvsignore sources Log Message: forgot about second tarball Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/blobwars/F-9/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 7 Mar 2009 23:53:54 -0000 1.6 +++ .cvsignore 8 Mar 2009 00:15:12 -0000 1.7 @@ -1 +1,2 @@ +blobwars-1.09b2-music.tar.bz2 blobwars-1.11.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/blobwars/F-9/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 7 Mar 2009 23:53:55 -0000 1.6 +++ sources 8 Mar 2009 00:15:12 -0000 1.7 @@ -1 +1,2 @@ +d01a343e3c18b817dc3f25224c6e66fb blobwars-1.09b2-music.tar.bz2 ca356775247db91dea09459aeb6c33f2 blobwars-1.11.tar.bz2 From rafalzaq at fedoraproject.org Sun Mar 8 00:17:43 2009 From: rafalzaq at fedoraproject.org (=?utf-8?q?Rafa=C5=82_Psota?=) Date: Sun, 8 Mar 2009 00:17:43 +0000 (UTC) Subject: rpms/blobwars/F-10 .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <20090308001743.A394170116@cvs1.fedora.phx.redhat.com> Author: rafalzaq Update of /cvs/pkgs/rpms/blobwars/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20861 Modified Files: .cvsignore sources Log Message: forgot about second tarball Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/blobwars/F-10/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 7 Mar 2009 23:56:11 -0000 1.6 +++ .cvsignore 8 Mar 2009 00:17:13 -0000 1.7 @@ -1 +1,2 @@ +blobwars-1.09b2-music.tar.bz2 blobwars-1.11.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/blobwars/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 7 Mar 2009 23:56:11 -0000 1.6 +++ sources 8 Mar 2009 00:17:13 -0000 1.7 @@ -1 +1,2 @@ +d01a343e3c18b817dc3f25224c6e66fb blobwars-1.09b2-music.tar.bz2 ca356775247db91dea09459aeb6c33f2 blobwars-1.11.tar.bz2 From rafalzaq at fedoraproject.org Sun Mar 8 00:19:04 2009 From: rafalzaq at fedoraproject.org (=?utf-8?q?Rafa=C5=82_Psota?=) Date: Sun, 8 Mar 2009 00:19:04 +0000 (UTC) Subject: rpms/blobwars/devel .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <20090308001904.BCC1E70116@cvs1.fedora.phx.redhat.com> Author: rafalzaq Update of /cvs/pkgs/rpms/blobwars/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21193 Modified Files: .cvsignore sources Log Message: forgot about second tarball Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/blobwars/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Mar 2009 00:01:20 -0000 1.6 +++ .cvsignore 8 Mar 2009 00:18:34 -0000 1.7 @@ -1 +1,2 @@ +blobwars-1.09b2-music.tar.bz2 blobwars-1.11.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/blobwars/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Mar 2009 00:01:21 -0000 1.6 +++ sources 8 Mar 2009 00:18:34 -0000 1.7 @@ -1 +1,2 @@ +d01a343e3c18b817dc3f25224c6e66fb blobwars-1.09b2-music.tar.bz2 ca356775247db91dea09459aeb6c33f2 blobwars-1.11.tar.bz2 From tuxbrewr at fedoraproject.org Sun Mar 8 00:22:54 2009 From: tuxbrewr at fedoraproject.org (Steven M. Parrish) Date: Sun, 8 Mar 2009 00:22:54 +0000 (UTC) Subject: rpms/sugar-update-control/devel .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <20090308002254.72E6770116@cvs1.fedora.phx.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/sugar-update-control/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22089 Modified Files: .cvsignore sources Log Message: Initial rawhide build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-update-control/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2009 00:14:29 -0000 1.1 +++ .cvsignore 8 Mar 2009 00:22:24 -0000 1.2 @@ -0,0 +1 @@ +sugar-update-control-0.20.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-update-control/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2009 00:14:30 -0000 1.1 +++ sources 8 Mar 2009 00:22:24 -0000 1.2 @@ -0,0 +1 @@ +14449c106c86b1262ec8f961be0684bb sugar-update-control-0.20.tar.gz From tuxbrewr at fedoraproject.org Sun Mar 8 00:28:56 2009 From: tuxbrewr at fedoraproject.org (Steven M. Parrish) Date: Sun, 8 Mar 2009 00:28:56 +0000 (UTC) Subject: rpms/sugar-update-control/devel sugar-update-control.spec,NONE,1.1 Message-ID: <20090308002856.D76DF70116@cvs1.fedora.phx.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/sugar-update-control/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23667 Added Files: sugar-update-control.spec Log Message: Initial rawhide build --- NEW FILE sugar-update-control.spec --- %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Summary: Activity update control panel for Sugar Name: sugar-update-control Version: 0.20 Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://git.sugarlabs.org/projects/sugar-update-control Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: olpc-update >= 2.13, sugar >= 0.83.0 BuildRequires: gettext, intltool, python-devel, python-distutils-extra BuildArch: noarch %description This package contains a control panel for the Sugar graphical environment which locates and installs activity updates. %prep %setup -q %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT %{__python} setup.py install --root=$RPM_BUILD_ROOT # avoid conflicts with standard __init__.py* rm $RPM_BUILD_ROOT%{python_sitelib}/{bitfrost,bitfrost/update,bitfrost/util}/__init__.py* %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc README COPYING %{python_sitelib}/* %{_datadir}/sugar/data/icons/* # currently nothing (on f-10 anyway) owns extentions, not sure # here is the best place, but... %dir %{_datadir}/sugar/extensions/ %{_datadir}/sugar/extensions/cpsection/ %changelog * Sat Mar 07 2009 - 0.20-3 - Merge with tuxbrewr spec * Thu Mar 05 2009 Steven M. Parrish 0.20-2 - Fix license and files * Wed Mar 04 2009 Steven M. Parrish 0.20-1 - New upstream release * Fri Jan 23 2009 Steven M. Parrish 0.19-2 - Initial build for Fedora repos * Wed Dec 17 2008 C. Scott Ananian - Fix packaging problems; actually distribute translation files. * Fri Dec 12 2008 Chris Ball - Trac #9044: Pick up Spanish translations for release. * Sun Sep 28 2008 C. Scott Ananian - Trac #7845, #8681: don't die if ~/Activities doesn't exist. - This fixes a regression introduced in 0.15. * Thu Sep 25 2008 C. Scott Ananian - Filter out library/library.info when it is not in the root directory of the bundle. * Wed Sep 24 2008 C. Scott Ananian - Minor fixes: strip whitespace when parsing HTML, avoid an unusual crash when cleaning up from a failed install. - If we have applied the 'G1G1 upgrade hack' to kludge in the G1G1 group, make sure this extra group persists. This avoids incomplete installs if a network error occurs in the middle. * Wed Sep 17 2008 C. Scott Ananian - Trac #8502: clean up icon cruft in /tmp - Trac #8106: support content bundles in addition to activity bundles. - Trac #8532: disable SIGCHLD handler to fix thread & subprocess interaction. - Properly time out slow activity group fetches. * Tue Sep 16 2008 C. Scott Ananian - Trac #8415: set base HREF for redirected update_urls correctly. - Trac #8502: clean up URL cache when control panel is closed. * Fri Sep 12 2008 C. Scott Ananian - New upstream: 0.12 - Trac #8361, #8393: don't allow bad update_urls to crash the updater. - Disable auto-close. * Wed Sep 02 2008 C. Scott Ananian - New upstream: 0.11 - Fix egregious typos in v0.10. * Tue Sep 02 2008 C. Scott Ananian - New upstream: 0.10 - Trac #8149: don't let malformed activity bundles kill the updater. - Allow groups to provide newer versions of the activities then exist at the activities update_url, to make it easier to create a group for testing 'prerelease' versions. * Wed Aug 20 2008 C. Scott Ananian - New upstream: 0.9 - Trac #7979: fix downloads via squid-using school server. Workaround for python issue 3566: http://bugs.python.org/issue3566 - Improve support for cancelling incomplete, hung, or slow downloads. - Trac #7865: stale "download size" label contents. - Don't use partial reads unnecessarily to download activity bundles. - Better installation feedback for delays caused by trac #7733. * Wed Aug 13 2008 C. Scott Ananian - New upstream: 0.8 - Catch 404 when trying to determine the size of a prospective update. - Catch exception caused by malformed activity bundle. - Use update_url in bundle's activity.info if present. - Inhibit suspend during refresh and download/install. - Trac #7622: preserve favorites status across upgrade. * Tue Aug 07 2008 C. Scott Ananian - New upstream: 0.7. * Wed Aug 06 2008 C. Scott Ananian - New upstream: 0.6. - Update to match upstream patch for dlo trac #7495. - Don't download large activity bundles to memory. * Thu Jul 31 2008 C. Scott Ananian - New upstream, with UI improvements. * Fri Jul 11 2008 C. Scott Ananian - Initial packaging. From pkgdb at fedoraproject.org Sun Mar 8 01:22:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 01:22:13 +0000 Subject: [pkgdb] dkms: iflyinsky has requested watchcommits Message-ID: <20090308012211.613842082B2@bastion.fedora.phx.redhat.com> iflyinsky has requested the watchcommits acl on dkms (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dkms From pgordon at fedoraproject.org Sun Mar 8 02:46:07 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Sun, 8 Mar 2009 02:46:07 +0000 (UTC) Subject: rpms/WebKit/devel .cvsignore, 1.13, 1.14 WebKit.spec, 1.28, 1.29 sources, 1.13, 1.14 Message-ID: <20090308024607.ABCD870116@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/WebKit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16097 Modified Files: .cvsignore WebKit.spec sources Log Message: Update to 1.1.1 - some ABI changes included (\!) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 21 Feb 2009 01:32:03 -0000 1.13 +++ .cvsignore 8 Mar 2009 02:45:34 -0000 1.14 @@ -1 +1 @@ -WebKit-r41071.tar.bz2 +webkit-1.1.1.tar.gz Index: WebKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/devel/WebKit.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- WebKit.spec 3 Mar 2009 18:57:53 -0000 1.28 +++ WebKit.spec 8 Mar 2009 02:45:34 -0000 1.29 @@ -3,7 +3,7 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \ echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list -%define svn_revision 41071 +#define svn_revision 41071 ## Optional build modifications... ## --with debug: Enable more verbose debugging. Makes runtime a bit slower. @@ -35,23 +35,25 @@ %bcond_with wml Name: WebKit -Version: 1.1.0 -Release: 0.21.svn%{svn_revision}%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: Web content engine library Group: Development/Libraries License: LGPLv2+ and BSD URL: http://webkit.org/ -Source0: http://nightly.webkit.org/files/trunk/src/WebKit-r%{svn_revision}.tar.bz2 +#Source0: http://nightly.webkit.org/files/trunk/src/WebKit-r%{svn_revision}.tar.bz2 +Source0: http://cafe.minaslivre.org/webkit/webkit-1.1.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison BuildRequires: flex BuildRequires: gperf +BuildRequires: gnome-keyring-devel BuildRequires: gtk2-devel -BuildRequires: libsoup-devel >= 2.23 +BuildRequires: libsoup-devel >= 2.25.91 BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libtool @@ -112,19 +114,17 @@ %prep -%setup -qn "%{name}-r%{svn_revision}" +#setup -qn "%{name}-r%{svn_revision}" +%setup -qn "webkit-%{version}" %build -## We don't like pre-built binaries, especially ones for other OSes. =) -rm -r WebKitLibraries/{*.a,win/} - ## Don't call configure automatically -sed -i.conf -e '$d' autogen.sh -./autogen.sh +#sed -i.conf -e '$d' autogen.sh +#./autogen.sh %configure \ - --with-http-backend=soup \ + --enable-gnomekeyring \ %{?with_debug: --enable-debug } \ %{?with_html5video: --enable-video } \ %{?with_jit: --enable-jit } \ @@ -149,16 +149,16 @@ ## Finally, copy over and rename the various files for %%doc inclusion. rm -f docfiles.list -%add_to_doc_files JavaScriptCore/COPYING.LIB -%add_to_doc_files JavaScriptCore/icu/LICENSE -%add_to_doc_files JavaScriptGlue/LICENSE +#add_to_doc_files JavaScriptCore/COPYING.LIB +#add_to_doc_files JavaScriptCore/icu/LICENSE +#add_to_doc_files JavaScriptGlue/LICENSE %add_to_doc_files WebKit/LICENSE %add_to_doc_files WebCore/LICENSE-APPLE %add_to_doc_files WebCore/LICENSE-LGPL-2.1 %add_to_doc_files WebCore/icu/LICENSE -%add_to_doc_files JavaScriptCore/icu/README -%add_to_doc_files WebCore/icu/README +#add_to_doc_files JavaScriptCore/icu/README +#add_to_doc_files WebCore/icu/README %add_to_doc_files JavaScriptCore/AUTHORS %add_to_doc_files JavaScriptCore/pcre/AUTHORS @@ -196,6 +196,10 @@ %changelog +* Sat Mar 07 2009 Peter Gordon - 1.1.1-1 +- Update to new upstream release (1.1.1), includes a soname bump. +- Enable gnome-keyring support. + * Wed Mar 4 2009 Mamoru Tasaka - 1.1.0-0.21.svn41071 - Compile libJavaScriptCore.a with -fno-strict-aliasing to do workaround for #488112 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 21 Feb 2009 01:32:03 -0000 1.13 +++ sources 8 Mar 2009 02:45:34 -0000 1.14 @@ -1 +1 @@ -3472abb3e3af9db37d1edf457401283e WebKit-r41071.tar.bz2 +d3a5d7233beab310e9d3e5568fae49a1 webkit-1.1.1.tar.gz From pkgdb at fedoraproject.org Sun Mar 8 02:54:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 02:54:11 +0000 Subject: [pkgdb] sugar-update-control: bernie has requested watchbugzilla Message-ID: <20090308025432.469D62082B2@bastion.fedora.phx.redhat.com> bernie has requested the watchbugzilla acl on sugar-update-control (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 02:54:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 02:54:34 +0000 Subject: [pkgdb] sugar-update-control: bernie has requested watchcommits Message-ID: <20090308025433.77E35208547@bastion.fedora.phx.redhat.com> bernie has requested the watchcommits acl on sugar-update-control (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 02:53:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 02:53:38 +0000 Subject: [pkgdb] sugar-update-control: bernie has requested commit Message-ID: <20090308025433.C3501208548@bastion.fedora.phx.redhat.com> bernie has requested the commit acl on sugar-update-control (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 02:53:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 02:53:41 +0000 Subject: [pkgdb] sugar-update-control: bernie has requested approveacls Message-ID: <20090308025435.7CF4B20854B@bastion.fedora.phx.redhat.com> bernie has requested the approveacls acl on sugar-update-control (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 02:54:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 02:54:42 +0000 Subject: [pkgdb] sugar-update-control: bernie has requested watchcommits Message-ID: <20090308025440.780C620854E@bastion.fedora.phx.redhat.com> bernie has requested the watchcommits acl on sugar-update-control (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 02:54:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 02:54:20 +0000 Subject: [pkgdb] sugar-update-control: bernie has requested watchbugzilla Message-ID: <20090308025440.96C80208551@bastion.fedora.phx.redhat.com> bernie has requested the watchbugzilla acl on sugar-update-control (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 02:54:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 02:54:42 +0000 Subject: [pkgdb] sugar-update-control: bernie has requested commit Message-ID: <20090308025442.283F3208554@bastion.fedora.phx.redhat.com> bernie has requested the commit acl on sugar-update-control (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 02:53:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 02:53:50 +0000 Subject: [pkgdb] sugar-update-control: bernie has requested approveacls Message-ID: <20090308025444.7F1F2208556@bastion.fedora.phx.redhat.com> bernie has requested the approveacls acl on sugar-update-control (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From jcollie at fedoraproject.org Sun Mar 8 03:03:25 2009 From: jcollie at fedoraproject.org (Jeffrey C. Ollie) Date: Sun, 8 Mar 2009 03:03:25 +0000 (UTC) Subject: rpms/gramps/devel .cvsignore, 1.25, 1.26 gramps.spec, 1.42, 1.43 sources, 1.25, 1.26 gramps-3.0.3-dbcrash.patch, 1.1, NONE Message-ID: <20090308030325.5603470116@cvs1.fedora.phx.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/gramps/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18875 Modified Files: .cvsignore gramps.spec sources Removed Files: gramps-3.0.3-dbcrash.patch Log Message: * Sat Mar 7 2009 Jeffrey C. Ollie - 3.1.0-1 - Update to 3.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gramps/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 7 Dec 2008 15:10:36 -0000 1.25 +++ .cvsignore 8 Mar 2009 03:02:53 -0000 1.26 @@ -1 +1 @@ -gramps-3.0.4.tar.gz +gramps-3.1.0.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/pkgs/rpms/gramps/devel/gramps.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- gramps.spec 25 Feb 2009 00:54:15 -0000 1.42 +++ gramps.spec 8 Mar 2009 03:02:54 -0000 1.43 @@ -1,6 +1,6 @@ Name: gramps -Version: 3.0.4 -Release: 2%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: Genealogical Research and Analysis Management Programming System Group: Applications/Productivity @@ -114,6 +114,9 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Sat Mar 7 2009 Jeffrey C. Ollie - 3.1.0-1 +- Update to 3.1.0 + * Tue Feb 24 2009 Fedora Release Engineering - 3.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gramps/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 7 Dec 2008 15:10:36 -0000 1.25 +++ sources 8 Mar 2009 03:02:54 -0000 1.26 @@ -1 +1 @@ -7d27020f391ba333b8a9bd490e5bf56e gramps-3.0.4.tar.gz +ddf380f34ee180b85bcf9a04b9a35d39 gramps-3.1.0.tar.gz --- gramps-3.0.3-dbcrash.patch DELETED --- From jwilson at fedoraproject.org Sun Mar 8 03:30:41 2009 From: jwilson at fedoraproject.org (Jarod Wilson) Date: Sun, 8 Mar 2009 03:30:41 +0000 (UTC) Subject: rpms/kernel/F-10 kernel.spec, 1.1206.2.41, 1.1206.2.42 linux-2.6-hdpvr.patch, 1.1, 1.1.12.1 Message-ID: <20090308033041.6142870116@cvs1.fedora.phx.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23657 Modified Files: Tag: private-fedora-10-2_6_27 kernel.spec linux-2.6-hdpvr.patch Log Message: * Sat Mar 07 2009 Jarod Wilson 2.6.27.19-170.2.42 - hdpvr: add addtional device IDs and permit functioning w/latest firmwares Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v retrieving revision 1.1206.2.41 retrieving revision 1.1206.2.42 diff -u -r1.1206.2.41 -r1.1206.2.42 --- kernel.spec 6 Mar 2009 04:15:58 -0000 1.1206.2.41 +++ kernel.spec 8 Mar 2009 03:30:09 -0000 1.1206.2.42 @@ -1987,6 +1987,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Sat Mar 07 2009 Jarod Wilson 2.6.27.19-170.2.42 +- hdpvr: add addtional device IDs and permit functioning w/latest firmwares + * Thu Mar 05 2009 Chuck Ebbert 2.6.27.19-170.2.41 - Add ext4 stable patch queue. - Drop linux-2.6-ext4-ENOSPC-debug.patch, replaced by upstream stable patch. linux-2.6-hdpvr.patch: Index: linux-2.6-hdpvr.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-hdpvr.patch,v retrieving revision 1.1 retrieving revision 1.1.12.1 diff -u -r1.1 -r1.1.12.1 --- linux-2.6-hdpvr.patch 6 Oct 2008 17:11:35 -0000 1.1 +++ linux-2.6-hdpvr.patch 8 Mar 2009 03:30:10 -0000 1.1.12.1 @@ -290,7 +290,7 @@ index 0000000..19e5282 --- /dev/null +++ b/drivers/media/video/hdpvr/hdpvr-core.c -@@ -0,0 +1,455 @@ +@@ -0,0 +1,461 @@ +/* + * Hauppage HD PVR USB driver + * @@ -350,6 +350,8 @@ +/* table of devices that work with this driver */ +static struct usb_device_id hdpvr_table [] = { + { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID) }, ++ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID1) }, ++ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID2) }, + { } /* Terminating entry */ +}; +MODULE_DEVICE_TABLE(usb, hdpvr_table); @@ -466,6 +468,10 @@ + dev->flags &= ~HDPVR_FLAG_AC3_CAP; + } else if (buf[1] == HDPVR_FIRMWARE_VERSION_AC3) { + dev->flags |= HDPVR_FLAG_AC3_CAP; ++ } else if (buf[1] > HDPVR_FIRMWARE_VERSION_AC3) { ++ hdpvr_print("untested firmware version 0x%x, the driver might " ++ "not work", buf[1]); ++ dev->flags |= HDPVR_FLAG_AC3_CAP; + } else { + hdpvr_err("unknown firmware version 0x%x", buf[1]); + ret = -EINVAL; @@ -902,7 +908,7 @@ index 0000000..2378099 --- /dev/null +++ b/drivers/media/video/hdpvr/hdpvr-video.c -@@ -0,0 +1,1258 @@ +@@ -0,0 +1,1261 @@ +/* + * Hauppage HD PVR USB driver - video 4 linux 2 interface + * @@ -1529,8 +1535,11 @@ +static int vidioc_querycap(struct file *file, void *priv, + struct v4l2_capability *cap) +{ ++ struct hdpvr_device *dev = video_drvdata(file); ++ + strcpy(cap->driver, "hdpvr"); -+ strcpy(cap->card, "Haupauge HD PVR"); ++ strcpy(cap->card, "Hauppauge HD PVR"); ++ usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); + cap->version = HDPVR_VERSION; + cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | + V4L2_CAP_AUDIO | @@ -2166,7 +2175,7 @@ index 0000000..ffe3a36 --- /dev/null +++ b/drivers/media/video/hdpvr/hdpvr.h -@@ -0,0 +1,324 @@ +@@ -0,0 +1,326 @@ +/* + * Hauppage HD PVR USB driver + * @@ -2194,6 +2203,8 @@ +/* Define these values to match your devices */ +#define HD_PVR_VENDOR_ID 0x2040 +#define HD_PVR_PRODUCT_ID 0x4900 ++#define HD_PVR_PRODUCT_ID1 0x4901 ++#define HD_PVR_PRODUCT_ID2 0x4902 + +#define UNSET (-1U) + From mclasen at fedoraproject.org Sun Mar 8 03:42:13 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Sun, 8 Mar 2009 03:42:13 +0000 (UTC) Subject: rpms/gnome-icon-theme/devel process-working.png, NONE, 1.1 gnome-icon-theme.spec, 1.99, 1.100 Message-ID: <20090308034213.9099570116@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-icon-theme/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25632 Modified Files: gnome-icon-theme.spec Added Files: process-working.png Log Message: add 48x48 spinner back Index: gnome-icon-theme.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- gnome-icon-theme.spec 24 Feb 2009 22:58:09 -0000 1.99 +++ gnome-icon-theme.spec 8 Mar 2009 03:41:41 -0000 1.100 @@ -1,16 +1,17 @@ Summary: GNOME icon theme Name: gnome-icon-theme Version: 2.25.91 -Release: 2%{?dist} +Release: 3%{?dist} Source0: http://download.gnome.org/sources/gnome-icon-theme/2.25/%{name}-%{version}.tar.bz2 Source1: gnome-icon-theme-extra-device-icons-5.tar.bz2 Source2: legacy-icon-mapping.xml +# gnome-packagekit needs this +Source3: process-working.png License: GPL+ BuildArch: noarch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: icon-naming-utils >= 0.8.7 -BuildRequires: perl(XML::Parser) BuildRequires: pkgconfig BuildRequires: gettext BuildRequires: librsvg2 @@ -78,16 +79,29 @@ tar xj -C $RPM_BUILD_ROOT/usr/share/icons/gnome -f %{SOURCE1} +# add a 48x48 spinner back +mkdir -p $RPM_BUILD_ROOT/usr/share/icons/gnome/48x48/animations +cp %{SOURCE3} $RPM_BUILD_ROOT/usr/share/icons/gnome/48x48/animations + +sed -i -e "s#^Directories=#Directories=48x48/animations,#" $RPM_BUILD_ROOT/usr/share/icons/gnome/index.theme +cat >>$RPM_BUILD_ROOT/usr/share/icons/gnome/index.theme < - 2.25.91-3 +- Add a 48x48 spinner back + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mtasaka at fedoraproject.org Sun Mar 8 04:31:29 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 8 Mar 2009 04:31:29 +0000 (UTC) Subject: rpms/kazehakase/devel .cvsignore, 1.26, 1.27 kazehakase.spec, 1.74, 1.75 sources, 1.26, 1.27 Message-ID: <20090308043129.B550270116@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1572 Modified Files: .cvsignore kazehakase.spec sources Log Message: * Sun Mar 8 2009 Mamoru Tasaka - Try rev 3766, along with WebKit soname bump Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 27 Feb 2009 11:27:43 -0000 1.26 +++ .cvsignore 8 Mar 2009 04:30:56 -0000 1.27 @@ -1 +1 @@ -kazehakase-0.5.6-svn3761_trunk.tar.gz +kazehakase-0.5.6-svn3766_trunk.tar.gz Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- kazehakase.spec 27 Feb 2009 11:27:43 -0000 1.74 +++ kazehakase.spec 8 Mar 2009 04:30:57 -0000 1.75 @@ -16,7 +16,7 @@ %define need_autogen 0 %if 0%{?fedora} == 11 -%define min_webkit_EVR 1.0.0-0.16.svn39421 +#%%define min_webkit_EVR 1.0.0-0.16.svn39421 %endif %if 0%{?fedora} >= 11 @@ -33,7 +33,7 @@ %define obsolete_plugin_ver 0.4.5-1 %define repoid 33533 -%define svnver 3761_trunk +%define svnver 3766_trunk %define fedorarel 6 @@ -323,6 +323,9 @@ %endif %changelog +* Sun Mar 8 2009 Mamoru Tasaka +- Try rev 3766, along with WebKit soname bump + * Fri Feb 27 2009 Mamoru Tasaka - Try rev 3760 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 27 Feb 2009 11:27:43 -0000 1.26 +++ sources 8 Mar 2009 04:30:57 -0000 1.27 @@ -1 +1 @@ -fa7c52b935dbbac63068a1bf64e80a3b kazehakase-0.5.6-svn3761_trunk.tar.gz +5ef8651825d237b31602d4ce925e19ff kazehakase-0.5.6-svn3766_trunk.tar.gz From fangq at fedoraproject.org Sun Mar 8 05:37:36 2009 From: fangq at fedoraproject.org (Qianqian Fang) Date: Sun, 8 Mar 2009 05:37:36 +0000 (UTC) Subject: rpms/wqy-zenhei-fonts/devel zenheiset-0.8.38-1-fontpackages.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 wqy-zenhei-fonts-0.8.34-1-noprefer.patch, 1.1, 1.2 wqy-zenhei-fonts.spec, 1.9, 1.10 Message-ID: <20090308053736.BFA4470116@cvs1.fedora.phx.redhat.com> Author: fangq Update of /cvs/pkgs/rpms/wqy-zenhei-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22263 Modified Files: .cvsignore sources wqy-zenhei-fonts-0.8.34-1-noprefer.patch wqy-zenhei-fonts.spec Added Files: zenheiset-0.8.38-1-fontpackages.patch Log Message: update to new upstream release zenheiset-0.8.38-1-fontpackages.patch: --- NEW FILE zenheiset-0.8.38-1-fontpackages.patch --- --- zenheiset.orig 2009-01-17 08:21:38.000000000 -0500 +++ zenheiset 2009-01-17 08:22:19.000000000 -0500 @@ -6,7 +6,7 @@ # Qianqian Fang ############################################### -FAVAIL=/etc/fonts/conf.avail +FAVAIL=/usr/share/fontconfig/conf.avail FCONF=/etc/fonts/conf.d BMPCONF=66-wqy-zenhei-sharp.conf BMPSTDCONF=66-wqy-zenhei-sharp-no13px.conf Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Oct 2008 03:40:18 -0000 1.6 +++ .cvsignore 8 Mar 2009 05:37:03 -0000 1.7 @@ -1 +1 @@ -wqy-zenhei-0.8.34-cvs20081027.tar.gz +wqy-zenhei-0.8.38-1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Oct 2008 03:40:18 -0000 1.6 +++ sources 8 Mar 2009 05:37:04 -0000 1.7 @@ -1 +1 @@ -6f1eb1bc6cc334c79c4dc4314593cd04 wqy-zenhei-0.8.34-cvs20081027.tar.gz +9f6c1b64170d08c568644f0661306729 wqy-zenhei-0.8.38-1.tar.gz wqy-zenhei-fonts-0.8.34-1-noprefer.patch: Index: wqy-zenhei-fonts-0.8.34-1-noprefer.patch =================================================================== RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/devel/wqy-zenhei-fonts-0.8.34-1-noprefer.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wqy-zenhei-fonts-0.8.34-1-noprefer.patch 12 Feb 2009 00:04:58 -0000 1.1 +++ wqy-zenhei-fonts-0.8.34-1-noprefer.patch 8 Mar 2009 05:37:04 -0000 1.2 @@ -1,14 +1,6 @@ ---- 44-wqy-zenhei.conf.orig 2009-01-17 01:33:54.000000000 -0500 +--- 44-wqy-zenhei.conf.orig 2009-01-17 08:08:17.000000000 -0500 +++ 44-wqy-zenhei.conf 2009-01-17 01:50:31.000000000 -0500 -@@ -2,7 +2,6 @@ - - - -- - - - WenQuanYi Zen Hei -@@ -19,27 +18,4 @@ +@@ -18,28 +18,4 @@ none false @@ -33,6 +25,7 @@ - - Bitstream Vera Sans Mono - DejaVu Sans Mono +- WenQuanYi Zen Hei Mono - - Index: wqy-zenhei-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/devel/wqy-zenhei-fonts.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wqy-zenhei-fonts.spec 26 Feb 2009 07:15:06 -0000 1.9 +++ wqy-zenhei-fonts.spec 8 Mar 2009 05:37:04 -0000 1.10 @@ -1,44 +1,51 @@ %define fontname wqy-zenhei %define fontconf 44-%{fontname}.conf %define fontconf2 66-%{fontname}-sharp.conf +%define fontconf3 66-%{fontname}-sharp-no13px.conf +%define setscript zenheiset Name: %{fontname}-fonts -Version: 0.8.34 -Release: 3.20081027cvs%{?dist} +Version: 0.8.38 +Release: 1%{?dist} Summary: WenQuanYi Zen Hei CJK Font Group: User Interface/X License: GPLv2 with exceptions URL: http://wenq.org/enindex.cgi -Source0: http://downloads.sourceforge.net/wqy/%{fontname}-%{version}-cvs20081027.tar.gz +Source0: http://downloads.sourceforge.net/wqy/%{fontname}-%{version}-1.tar.gz #Source1: 66-%{name}-sharp.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: fontpackages-devel Requires: fontpackages-filesystem -Patch0: %{name}-%{version}-1-noprefer.patch +Patch0: %{name}-0.8.34-1-noprefer.patch +Patch1: zenheiset-0.8.38-1-fontpackages.patch %description -The WenQuanYi Zen Hei is a Hei-Ti style (sans-serif) -Chinese outline font. It was designed for general purpose text -formatting and on-screen display of Chinese characters among -many other languages. The embolden strokes of the font glyphs -produces enhanced screen contrast, likely resulting in -improvement in reading speed and recognition. The embedded -bitmap glyphs further enhance on-screen performance, -which could be enabled with the provided configuration files. -WenQuanYi Zen Hei provides fairly complete coverage to Chinese -Hanzi glyphs including both simplified and traditional forms. -The total glyph number in this font is over 35,000, including over -21,000 Chinese Hanzi. This font provides full coverage to -GBK(CP936) charset, CJK Unified Ideographs, as well as the -code-points needed for zh_cn, zh_sg, zh_tw, zh_hk, zh_mo, -ja (Japanese) and ko (Korean) locales for fontconfig. +WenQuanYi Zen Hei is a Hei-Ti style (sans-serif type) Chinese +outline font. It is designed for general purpose text formatting +and on-screen display of Chinese characters and symbols from +many other languages. The embolden strokes of the font glyphs +produces enhanced screen contrast, making it easier to read +recognize. The embedded bitmap glyphs further enhance on-screen +performance, which can be enabled with the provided configuration +files. WenQuanYi Zen Hei provides a rather complete coverage to +Chinese Hanzi glyphs, including both simplified and traditional +forms. The total glyph number in this font is over 35,000, including +over 21,000 Chinese Hanzi. This font has full coverage to GBK(CP936) +charset, CJK Unified Ideographs, as well as the code-points +needed for zh_cn, zh_sg, zh_tw, zh_hk, zh_mo, ja (Japanese) +and ko (Korean) locales for fontconfig. Starting from version +0.8, this font package has contained two font families, i.e. +the proportionally-spaced Zen Hei, and a mono-spaced face +named "WenQuanYi Zen Hei Mono". + %prep %setup -q -n %{fontname} %patch0 -p0 +%patch1 -p0 %build @@ -57,10 +64,16 @@ %{buildroot}%{_fontconfig_templatedir}/%{fontconf} install -m 0644 -p %{fontconf2} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf2} +install -m 0644 -p %{fontconf3} \ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf3} ln -s %{_fontconfig_templatedir}/%{fontconf} \ %{buildroot}%{_fontconfig_confdir}/%{fontconf} +install -m 0755 -d %{buildroot}%{_bindir} + +install -m 0744 -p %{setscript} \ + %{buildroot}%{_bindir}/%{setscript} %clean rm -fr %{buildroot} @@ -70,9 +83,13 @@ %doc AUTHORS ChangeLog COPYING README %dir %{_fontdir} +%attr(744 ,root ,root) %{_bindir}/%{setscript} %changelog +*Sat Mar 07 2009 Qianqian Fang 0.8.38-1 +- update to the final version of upstream v0.8 release + * Wed Feb 25 2009 Fedora Release Engineering - 0.8.34-3.20081027cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From fangq at fedoraproject.org Sun Mar 8 06:09:33 2009 From: fangq at fedoraproject.org (Qianqian Fang) Date: Sun, 8 Mar 2009 06:09:33 +0000 (UTC) Subject: rpms/wqy-zenhei-fonts/F-10 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 wqy-zenhei-fonts.spec, 1.6, 1.7 Message-ID: <20090308060933.BDEB770116@cvs1.fedora.phx.redhat.com> Author: fangq Update of /cvs/pkgs/rpms/wqy-zenhei-fonts/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29410 Modified Files: .cvsignore sources wqy-zenhei-fonts.spec Log Message: update to new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/F-10/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Oct 2008 03:40:18 -0000 1.6 +++ .cvsignore 8 Mar 2009 06:08:57 -0000 1.7 @@ -1 +1 @@ -wqy-zenhei-0.8.34-cvs20081027.tar.gz +wqy-zenhei-0.8.38-1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Oct 2008 03:40:18 -0000 1.6 +++ sources 8 Mar 2009 06:08:57 -0000 1.7 @@ -1 +1 @@ -6f1eb1bc6cc334c79c4dc4314593cd04 wqy-zenhei-0.8.34-cvs20081027.tar.gz +9f6c1b64170d08c568644f0661306729 wqy-zenhei-0.8.38-1.tar.gz Index: wqy-zenhei-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/F-10/wqy-zenhei-fonts.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wqy-zenhei-fonts.spec 28 Oct 2008 03:40:18 -0000 1.6 +++ wqy-zenhei-fonts.spec 8 Mar 2009 06:08:58 -0000 1.7 @@ -1,38 +1,44 @@ %define fontname wqy-zenhei %define fontdir %{_datadir}/fonts/%{fontname} +%define fontconf 44-%{fontname}.conf %define fontconfdir %{_sysconfdir}/fonts/conf.d +%define fontconfavail %{_sysconfdir}/fonts/conf.avail %define catalogue %{_sysconfdir}/X11/fontpath.d +%define setscript zenheiset Name: %{fontname}-fonts Summary: WenQuanYi Zen Hei CJK Font -Version: 0.8.34 -Release: 0.cvs20081027%{?dist} +Version: 0.8.38 +Release: 1%{?dist} # for font embedding exception please see # http://www.gnu.org/licenses/gpl-faq.html#FontException License: GPLv2 with exceptions URL: http://wqy.sourceforge.net/en/ Group: User Interface/X -Source: http://downloads.sourceforge.net/wqy/%{fontname}-%{version}-cvs20081027.tar.gz +Source: http://downloads.sourceforge.net/wqy/%{fontname}-%{version}-1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: mkfontdir %description -The WenQuanYi Zen Hei is a Hei-Ti style (sans-serif) -Chinese outline font. It was designed for general purpose text -formatting and on-screen display of Chinese characters among +WenQuanYi Zen Hei is a Hei-Ti style (sans-serif type) Chinese +outline font. It is designed for general purpose text formatting +and on-screen display of Chinese characters and symbols from many other languages. The embolden strokes of the font glyphs -produces enhanced screen contrast, likely resulting in -improvement in reading speed and recognition. The embedded -bitmap glyphs further enhance on-screen performance, -which could be enabled with the provided configuration files. -WenQuanYi Zen Hei provides fairly complete coverage to Chinese -Hanzi glyphs including both simplified and traditional forms. -The total glyph number in this font is over 35,000, including over -21,000 Chinese Hanzi. This font provides full coverage to -GBK(CP936) charset, CJK Unified Ideographs, as well as the -code-points needed for zh_cn, zh_sg, zh_tw, zh_hk, zh_mo, -ja (Japanese) and ko (Korean) locales for fontconfig. +produces enhanced screen contrast, making it easier to read +recognize. The embedded bitmap glyphs further enhance on-screen +performance, which can be enabled with the provided configuration +files. WenQuanYi Zen Hei provides a rather complete coverage to +Chinese Hanzi glyphs, including both simplified and traditional +forms. The total glyph number in this font is over 35,000, including +over 21,000 Chinese Hanzi. This font has full coverage to GBK(CP936) +charset, CJK Unified Ideographs, as well as the code-points +needed for zh_cn, zh_sg, zh_tw, zh_hk, zh_mo, ja (Japanese) +and ko (Korean) locales for fontconfig. Starting from version +0.8, this font package has contained two font families, i.e. +the proportionally-spaced Zen Hei, and a mono-spaced face +named "WenQuanYi Zen Hei Mono". + %prep %setup -q -n %{fontname} @@ -44,9 +50,19 @@ rm -rf %{buildroot} install -d -m755 %{buildroot}%{fontdir} install -d -m755 %{buildroot}%{fontconfdir} +install -d -m755 %{buildroot}%{fontconfavail} install -p -m644 *.ttc %{buildroot}%{fontdir}/ -install -p -m644 44-%{fontname}.conf %{buildroot}%{fontconfdir}/ - +install -p -m644 *-%{fontname}*.conf \ + %{buildroot}%{fontconfavail}/ + +ln -s %{fontconfavail}/%{fontconf} \ + %{buildroot}%{fontconfdir}/%{fontconf} + +install -m 0755 -d %{buildroot}%{_bindir} + +install -m 0744 -p %{setscript} \ + %{buildroot}%{_bindir}/%{setscript} + # Install catalogue symlink mkdir -p %{buildroot}%{catalogue} ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} @@ -63,6 +79,11 @@ %{fontdir}/*.ttc %{fontdir}/fonts.dir %config(noreplace) %{fontconfdir}/44-%{fontname}.conf +%config(noreplace) %{fontconfavail}/44-%{fontname}.conf +%config(noreplace) %{fontconfavail}/66-%{fontname}-sharp.conf +%config(noreplace) %{fontconfavail}/66-%{fontname}-sharp-no13px.conf +%attr(744 ,root ,root) %{_bindir}/%{setscript} + %{catalogue}/%{name} %post @@ -78,6 +99,9 @@ fi %changelog +*Sat Mar 07 2009 Qianqian Fang 0.8.38-1 +- update to the final version of upstream v0.8 release + *Mon Oct 27 2008 Qianqian Fang 0.8.34-0.cvs20081027 - upstream new version prelease From pgordon at fedoraproject.org Sun Mar 8 06:43:19 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Sun, 8 Mar 2009 06:43:19 +0000 (UTC) Subject: rpms/midori/devel .cvsignore, 1.8, 1.9 midori.spec, 1.16, 1.17 sources, 1.8, 1.9 midori-no-git.patch, 1.1, NONE Message-ID: <20090308064319.927FB70116@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/midori/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4503 Modified Files: .cvsignore midori.spec sources Removed Files: midori-no-git.patch Log Message: Update to 0.1.4, build against new WebKitGTK+, and remove upstreamed patch. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/midori/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 23 Feb 2009 04:38:57 -0000 1.8 +++ .cvsignore 8 Mar 2009 06:42:46 -0000 1.9 @@ -1 +1 @@ -midori-0.1.3.tar.bz2 +midori-0.1.4.tar.bz2 Index: midori.spec =================================================================== RCS file: /cvs/pkgs/rpms/midori/devel/midori.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- midori.spec 26 Feb 2009 00:41:42 -0000 1.16 +++ midori.spec 8 Mar 2009 06:42:47 -0000 1.17 @@ -1,6 +1,6 @@ Name: midori -Version: 0.1.3 -Release: 2%{?dist} +Version: 0.1.4 +Release: 1%{?dist} Summary: A lightweight GTK+ web browser Group: Applications/Internet @@ -9,10 +9,6 @@ Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 -## No need to try using git for retrieving the version information, since it's a release -## tarball. -Patch0: %{name}-no-git.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -50,7 +46,6 @@ %setup -q ## Use the system-provided waf, instead of the in-tarball copy. rm -rf waf -%patch0 -b .no-git %build @@ -105,6 +100,12 @@ %changelog +* Sat Mar 07 2009 Peter Gordon - 0.1.4-1 +- Update to new upstream release (0.1.4): mostly small usability fixes and + related improvements. +- Drop upstreamed no-git patch. + - no-git.patch + * Wed Feb 25 2009 Fedora Release Engineering - 0.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/midori/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 23 Feb 2009 04:38:57 -0000 1.8 +++ sources 8 Mar 2009 06:42:47 -0000 1.9 @@ -1 +1 @@ -ebfcce4c60859d051ce2df5cafc494a1 midori-0.1.3.tar.bz2 +a9b21027ba894fed3055d7074c5f073d midori-0.1.4.tar.bz2 --- midori-no-git.patch DELETED --- From pkgdb at fedoraproject.org Sun Mar 8 09:06:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 09:06:06 +0000 Subject: [pkgdb] sugar-update-control had acl change status Message-ID: <20090308090604.6C1D4208543@bastion.fedora.phx.redhat.com> tuxbrewr has set the watchcommits acl on sugar-update-control (Fedora devel) to Approved for bernie To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 09:05:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 09:05:43 +0000 Subject: [pkgdb] sugar-update-control had acl change status Message-ID: <20090308090604.94670208546@bastion.fedora.phx.redhat.com> tuxbrewr has set the watchbugzilla acl on sugar-update-control (Fedora devel) to Approved for bernie To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 09:05:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 09:05:45 +0000 Subject: [pkgdb] sugar-update-control had acl change status Message-ID: <20090308090605.A2E54208549@bastion.fedora.phx.redhat.com> tuxbrewr has set the commit acl on sugar-update-control (Fedora devel) to Approved for bernie To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 09:06:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 09:06:09 +0000 Subject: [pkgdb] sugar-update-control had acl change status Message-ID: <20090308090607.38DA620854C@bastion.fedora.phx.redhat.com> tuxbrewr has set the approveacls acl on sugar-update-control (Fedora devel) to Approved for bernie To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 09:06:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 09:06:13 +0000 Subject: [pkgdb] sugar-update-control had acl change status Message-ID: <20090308090613.CAB3D208550@bastion.fedora.phx.redhat.com> tuxbrewr has set the watchbugzilla acl on sugar-update-control (Fedora 10) to Approved for bernie To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 09:05:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 09:05:18 +0000 Subject: [pkgdb] sugar-update-control had acl change status Message-ID: <20090308090614.2CF1F208553@bastion.fedora.phx.redhat.com> tuxbrewr has set the watchcommits acl on sugar-update-control (Fedora 10) to Approved for bernie To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 09:05:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 09:05:54 +0000 Subject: [pkgdb] sugar-update-control had acl change status Message-ID: <20090308090615.08FAD208556@bastion.fedora.phx.redhat.com> tuxbrewr has set the commit acl on sugar-update-control (Fedora 10) to Approved for bernie To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 09:06:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 09:06:16 +0000 Subject: [pkgdb] sugar-update-control had acl change status Message-ID: <20090308090616.D6B18208602@bastion.fedora.phx.redhat.com> tuxbrewr has set the approveacls acl on sugar-update-control (Fedora 10) to Approved for bernie To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sugar-update-control From tuxbrewr at fedoraproject.org Sun Mar 8 09:12:31 2009 From: tuxbrewr at fedoraproject.org (Steven M. Parrish) Date: Sun, 8 Mar 2009 09:12:31 +0000 (UTC) Subject: rpms/sugar-update-control/F-10 sugar-update-control.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090308091231.4196C70116@cvs1.fedora.phx.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/sugar-update-control/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2830 Modified Files: .cvsignore sources Added Files: sugar-update-control.spec Log Message: Initial F10 build --- NEW FILE sugar-update-control.spec --- %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Summary: Activity update control panel for Sugar Name: sugar-update-control Version: 0.20 Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://git.sugarlabs.org/projects/sugar-update-control Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: olpc-update >= 2.13, sugar >= 0.83.0 BuildRequires: gettext, intltool, python-devel, python-distutils-extra BuildArch: noarch %description This package contains a control panel for the Sugar graphical environment which locates and installs activity updates. %prep %setup -q %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT %{__python} setup.py install --root=$RPM_BUILD_ROOT # avoid conflicts with standard __init__.py* rm $RPM_BUILD_ROOT%{python_sitelib}/{bitfrost,bitfrost/update,bitfrost/util}/__init__.py* %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc README COPYING %{python_sitelib}/* %{_datadir}/sugar/data/icons/* # currently nothing (on f-10 anyway) owns extentions, not sure # here is the best place, but... %dir %{_datadir}/sugar/extensions/ %{_datadir}/sugar/extensions/cpsection/ %changelog * Sat Mar 07 2009 - 0.20-3 - Merge with tuxbrewr spec * Thu Mar 05 2009 Steven M. Parrish 0.20-2 - Fix license and files * Wed Mar 04 2009 Steven M. Parrish 0.20-1 - New upstream release * Fri Jan 23 2009 Steven M. Parrish 0.19-2 - Initial build for Fedora repos * Wed Dec 17 2008 C. Scott Ananian - Fix packaging problems; actually distribute translation files. * Fri Dec 12 2008 Chris Ball - Trac #9044: Pick up Spanish translations for release. * Sun Sep 28 2008 C. Scott Ananian - Trac #7845, #8681: don't die if ~/Activities doesn't exist. - This fixes a regression introduced in 0.15. * Thu Sep 25 2008 C. Scott Ananian - Filter out library/library.info when it is not in the root directory of the bundle. * Wed Sep 24 2008 C. Scott Ananian - Minor fixes: strip whitespace when parsing HTML, avoid an unusual crash when cleaning up from a failed install. - If we have applied the 'G1G1 upgrade hack' to kludge in the G1G1 group, make sure this extra group persists. This avoids incomplete installs if a network error occurs in the middle. * Wed Sep 17 2008 C. Scott Ananian - Trac #8502: clean up icon cruft in /tmp - Trac #8106: support content bundles in addition to activity bundles. - Trac #8532: disable SIGCHLD handler to fix thread & subprocess interaction. - Properly time out slow activity group fetches. * Tue Sep 16 2008 C. Scott Ananian - Trac #8415: set base HREF for redirected update_urls correctly. - Trac #8502: clean up URL cache when control panel is closed. * Fri Sep 12 2008 C. Scott Ananian - New upstream: 0.12 - Trac #8361, #8393: don't allow bad update_urls to crash the updater. - Disable auto-close. * Wed Sep 02 2008 C. Scott Ananian - New upstream: 0.11 - Fix egregious typos in v0.10. * Tue Sep 02 2008 C. Scott Ananian - New upstream: 0.10 - Trac #8149: don't let malformed activity bundles kill the updater. - Allow groups to provide newer versions of the activities then exist at the activities update_url, to make it easier to create a group for testing 'prerelease' versions. * Wed Aug 20 2008 C. Scott Ananian - New upstream: 0.9 - Trac #7979: fix downloads via squid-using school server. Workaround for python issue 3566: http://bugs.python.org/issue3566 - Improve support for cancelling incomplete, hung, or slow downloads. - Trac #7865: stale "download size" label contents. - Don't use partial reads unnecessarily to download activity bundles. - Better installation feedback for delays caused by trac #7733. * Wed Aug 13 2008 C. Scott Ananian - New upstream: 0.8 - Catch 404 when trying to determine the size of a prospective update. - Catch exception caused by malformed activity bundle. - Use update_url in bundle's activity.info if present. - Inhibit suspend during refresh and download/install. - Trac #7622: preserve favorites status across upgrade. * Tue Aug 07 2008 C. Scott Ananian - New upstream: 0.7. * Wed Aug 06 2008 C. Scott Ananian - New upstream: 0.6. - Update to match upstream patch for dlo trac #7495. - Don't download large activity bundles to memory. * Thu Jul 31 2008 C. Scott Ananian - New upstream, with UI improvements. * Fri Jul 11 2008 C. Scott Ananian - Initial packaging. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-update-control/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2009 00:14:29 -0000 1.1 +++ .cvsignore 8 Mar 2009 09:12:00 -0000 1.2 @@ -0,0 +1 @@ +sugar-update-control-0.20.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-update-control/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2009 00:14:30 -0000 1.1 +++ sources 8 Mar 2009 09:12:00 -0000 1.2 @@ -0,0 +1 @@ +14449c106c86b1262ec8f961be0684bb sugar-update-control-0.20.tar.gz From pmatilai at fedoraproject.org Sun Mar 8 09:53:28 2009 From: pmatilai at fedoraproject.org (Panu Matilainen) Date: Sun, 8 Mar 2009 09:53:28 +0000 (UTC) Subject: rpms/rpm/devel rpm-4.7.0-beta1-srcrpm-macros.patch, NONE, 1.1 rpm.spec, 1.335, 1.336 Message-ID: <20090308095328.41B8F70116@cvs1.fedora.phx.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/rpm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12163 Modified Files: rpm.spec Added Files: rpm-4.7.0-beta1-srcrpm-macros.patch Log Message: - load macros before creating directories on src.rpm install (#489104) rpm-4.7.0-beta1-srcrpm-macros.patch: --- NEW FILE rpm-4.7.0-beta1-srcrpm-macros.patch --- commit 7a813e149fe40bbb9beee7dbf9898ab0c1906da2 Author: Panu Matilainen Date: Sun Mar 8 11:33:22 2009 +0200 Load macros before creating directories (rhbz#489104) - %_sourcedir and friends can have things like %{name}, load macros before trying to create any directories when installing src.rpms (cherry picked from commit ac7c3412278a03da6633758bca999827d4b59038) diff --git a/lib/psm.c b/lib/psm.c index 3b2fd7c..112d344 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -275,6 +275,9 @@ rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd, if (rootdir && strcmp(rootdir, "/") == 0) rootdir = NULL; + /* Macros need to be added before trying to create directories */ + rpmInstallLoadMacros(h); + if (specix >= 0) { const char *bn; @@ -301,8 +304,6 @@ rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd, goto exit; } - rpmInstallLoadMacros(h); - te = rpmtsElement(ts, 0); if (te == NULL) { /* XXX can't happen */ goto exit; Index: rpm.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v retrieving revision 1.335 retrieving revision 1.336 diff -u -r1.335 -r1.336 --- rpm.spec 6 Mar 2009 18:28:20 -0000 1.335 +++ rpm.spec 8 Mar 2009 09:52:55 -0000 1.336 @@ -25,7 +25,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: 0.%{snapver}.1%{?dist} +Release: 0.%{snapver}.2%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 @@ -43,6 +43,7 @@ Patch3: rpm-4.6.0-fedora-specspo.patch # Patches already in upstream +Patch200: rpm-4.7.0-beta1-srcrpm-macros.patch # These are not yet upstream Patch300: rpm-4.7.0-extra-provides.patch @@ -183,6 +184,8 @@ %patch2 -p1 -b .gstreamer-prov %patch3 -p1 -b .fedora-specspo +%patch200 -p1 -b .srcrpm-macros + %patch300 -p1 -b .extra-prov %if %{with int_bdb} @@ -388,6 +391,9 @@ %doc doc/librpm/html/* %changelog +* Sun Mar 08 2009 Panu Matilainen - 4.7.0-0.beta1.2 +- load macros before creating directories on src.rpm install (#489104) + * Fri Mar 06 2009 Panu Matilainen - 4.7.0-0.beta1.1 - update to 4.7.0-beta1 (http://rpm.org/wiki/Releases/4.7.0) From trasher at fedoraproject.org Sun Mar 8 10:00:01 2009 From: trasher at fedoraproject.org (Johan Cwiklinski) Date: Sun, 8 Mar 2009 10:00:01 +0000 (UTC) Subject: rpms/eric/F-10 .cvsignore, 1.15, 1.16 eric.spec, 1.36, 1.37 sources, 1.18, 1.19 Message-ID: <20090308100001.3A39E70116@cvs1.fedora.phx.redhat.com> Author: trasher Update of /cvs/extras/rpms/eric/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13581 Modified Files: .cvsignore eric.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/eric/F-10/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 9 Feb 2009 08:02:44 -0000 1.15 +++ .cvsignore 8 Mar 2009 09:59:30 -0000 1.16 @@ -1,8 +1,8 @@ -eric4-4.3.0.tar.gz -eric4-i18n-fr-4.3.0.tar.gz -eric4-i18n-de-4.3.0.tar.gz -eric4-i18n-ru-4.3.0.tar.gz -eric4-i18n-cs-4.3.0.tar.gz -eric4-i18n-es-4.3.0.tar.gz -eric4-i18n-tr-4.3.0.tar.gz -eric4-i18n-zh_CN.GB2312-4.3.0.tar.gz +eric4-4.3.1.tar.gz +eric4-i18n-fr-4.3.1.tar.gz +eric4-i18n-de-4.3.1.tar.gz +eric4-i18n-ru-4.3.1.tar.gz +eric4-i18n-cs-4.3.1.tar.gz +eric4-i18n-es-4.3.1.tar.gz +eric4-i18n-tr-4.3.1.tar.gz +eric4-i18n-zh_CN.GB2312-4.3.1.tar.gz Index: eric.spec =================================================================== RCS file: /cvs/extras/rpms/eric/F-10/eric.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- eric.spec 9 Feb 2009 08:02:44 -0000 1.36 +++ eric.spec 8 Mar 2009 09:59:30 -0000 1.37 @@ -7,7 +7,7 @@ Name: eric Summary: Python IDE -Version: 4.3.0 +Version: 4.3.1 Release: 1%{?dist} License: GPL+ @@ -72,8 +72,8 @@ rm -rf %{buildroot} mkdir -p %{buildroot}/ -#path to install api files -sed -i -e 's|qtDataDir = pyqtconfig._pkg_config\["qt_data_dir"\]|qtDataDir = "%{buildroot}" + pyqtconfig._pkg_config\["qt_data_dir"\]|' install.py +#path to install api files // As of 4.3.1 release, this is no longer required +#sed -i -e 's|qtDataDir = pyqtconfig._pkg_config\["qt_data_dir"\]|qtDataDir = "%{buildroot}" + pyqtconfig._pkg_config\["qt_data_dir"\]|' install.py %{__python} install.py \ -i %{buildroot}/ \ @@ -143,8 +143,13 @@ %{_datadir}/applications/*eric4.desktop %{_datadir}/icons/hicolor/*/*/* +%{_libdir}/qt4/qsci/api/python/*.api +%{_libdir}/qt4/qsci/api/ruby/*.api %changelog +* Sun Mar 8 2009 Johan Cwiklinski 4.3.0-1 +- 4.3.1 + * Mon Feb 9 2009 Johan Cwiklinski 4.3.0-1 - 4.3.0 - Added new translation files (zh_CN) Index: sources =================================================================== RCS file: /cvs/extras/rpms/eric/F-10/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 9 Feb 2009 08:02:44 -0000 1.18 +++ sources 8 Mar 2009 09:59:30 -0000 1.19 @@ -1,8 +1,8 @@ -1620eeed4f09921f6ec48be3f11429a0 eric4-4.3.0.tar.gz -77e7de0335d11e2a16747ea3a720e7fe eric4-i18n-fr-4.3.0.tar.gz -6d83cca7ebb795dc923da25ab02d396e eric4-i18n-de-4.3.0.tar.gz -b27308507fcc9bd7709dd11184c9f3b8 eric4-i18n-ru-4.3.0.tar.gz -72d3b36706961ca91a681daa76e97462 eric4-i18n-cs-4.3.0.tar.gz -a0643ac53a8cd3748fed7c9e7c3eec09 eric4-i18n-es-4.3.0.tar.gz -de2cf3bff12b811f71b0012383f2bbdc eric4-i18n-tr-4.3.0.tar.gz -a233b39a23ad9a3b665674ce3fc96c6d eric4-i18n-zh_CN.GB2312-4.3.0.tar.gz +f7060154d397ca53dcc3fc43995c73b7 eric4-4.3.1.tar.gz +2829cd57dc9d817be19bdf4243531086 eric4-i18n-fr-4.3.1.tar.gz +fdbbcb08cde6c9b409ff9f96537e238c eric4-i18n-de-4.3.1.tar.gz +8bd1f98855456b38e84951e1c085e760 eric4-i18n-ru-4.3.1.tar.gz +4a1c78ff3d5e6bc07c28492364a9aed0 eric4-i18n-cs-4.3.1.tar.gz +d9d5bc76e586dbde47ad83bd4c62d106 eric4-i18n-es-4.3.1.tar.gz +74fcd0fcad8cd394ec903d9d2f937f12 eric4-i18n-tr-4.3.1.tar.gz +90bddf5c5a87aba71de3d2b480ac94b2 eric4-i18n-zh_CN.GB2312-4.3.1.tar.gz From trasher at fedoraproject.org Sun Mar 8 10:31:07 2009 From: trasher at fedoraproject.org (Johan Cwiklinski) Date: Sun, 8 Mar 2009 10:31:07 +0000 (UTC) Subject: rpms/eric/devel eric.spec,1.39,1.40 sources,1.18,1.19 Message-ID: <20090308103107.1988F70116@cvs1.fedora.phx.redhat.com> Author: trasher Update of /cvs/extras/rpms/eric/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20431 Modified Files: eric.spec sources Log Message: New upstream release Index: eric.spec =================================================================== RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- eric.spec 5 Mar 2009 18:02:39 -0000 1.39 +++ eric.spec 8 Mar 2009 10:30:35 -0000 1.40 @@ -7,8 +7,8 @@ Name: eric Summary: Python IDE -Version: 4.3.0 -Release: 3%{?dist} +Version: 4.3.1 +Release: 1%{?dist} License: GPL+ Group: Development/Tools @@ -72,8 +72,8 @@ rm -rf %{buildroot} mkdir -p %{buildroot}/ -#path to install api files -sed -i -e 's|qtDataDir = pyqtconfig._pkg_config\["qt_data_dir"\]|qtDataDir = "%{buildroot}" + pyqtconfig._pkg_config\["qt_data_dir"\]|' install.py +#path to install api files // As of 4.3.1 release, this is no longer required +#sed -i -e 's|qtDataDir = pyqtconfig._pkg_config\["qt_data_dir"\]|qtDataDir = "%{buildroot}" + pyqtconfig._pkg_config\["qt_data_dir"\]|' install.py %{__python} install.py \ -i %{buildroot}/ \ @@ -143,8 +143,13 @@ %{_datadir}/applications/*eric4.desktop %{_datadir}/icons/hicolor/*/*/* +%{_libdir}/qt4/qsci/api/python/*.api +%{_libdir}/qt4/qsci/api/ruby/*.api %changelog +* Sun Mar 8 2009 Johan Cwiklinski 4.3.0-1 +- 4.3.1 + * Thu Mar 5 2009 Johan Cwiklinski - 4.3.0-3 - Fixed bad 'full_python_ver' Index: sources =================================================================== RCS file: /cvs/extras/rpms/eric/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 9 Feb 2009 07:42:45 -0000 1.18 +++ sources 8 Mar 2009 10:30:35 -0000 1.19 @@ -1,8 +1,8 @@ -1620eeed4f09921f6ec48be3f11429a0 eric4-4.3.0.tar.gz -77e7de0335d11e2a16747ea3a720e7fe eric4-i18n-fr-4.3.0.tar.gz -6d83cca7ebb795dc923da25ab02d396e eric4-i18n-de-4.3.0.tar.gz -b27308507fcc9bd7709dd11184c9f3b8 eric4-i18n-ru-4.3.0.tar.gz -72d3b36706961ca91a681daa76e97462 eric4-i18n-cs-4.3.0.tar.gz -a0643ac53a8cd3748fed7c9e7c3eec09 eric4-i18n-es-4.3.0.tar.gz -de2cf3bff12b811f71b0012383f2bbdc eric4-i18n-tr-4.3.0.tar.gz -a233b39a23ad9a3b665674ce3fc96c6d eric4-i18n-zh_CN.GB2312-4.3.0.tar.gz +f7060154d397ca53dcc3fc43995c73b7 eric4-4.3.1.tar.gz +2829cd57dc9d817be19bdf4243531086 eric4-i18n-fr-4.3.1.tar.gz +fdbbcb08cde6c9b409ff9f96537e238c eric4-i18n-de-4.3.1.tar.gz +8bd1f98855456b38e84951e1c085e760 eric4-i18n-ru-4.3.1.tar.gz +4a1c78ff3d5e6bc07c28492364a9aed0 eric4-i18n-cs-4.3.1.tar.gz +d9d5bc76e586dbde47ad83bd4c62d106 eric4-i18n-es-4.3.1.tar.gz +74fcd0fcad8cd394ec903d9d2f937f12 eric4-i18n-tr-4.3.1.tar.gz +90bddf5c5a87aba71de3d2b480ac94b2 eric4-i18n-zh_CN.GB2312-4.3.1.tar.gz From jwrdegoede at fedoraproject.org Sun Mar 8 10:32:18 2009 From: jwrdegoede at fedoraproject.org (Hans de Goede) Date: Sun, 8 Mar 2009 10:32:18 +0000 (UTC) Subject: rpms/scorched3d/devel .cvsignore, 1.11, 1.12 scorched3d.spec, 1.36, 1.37 sources, 1.11, 1.12 scorched3d-41.1-gcc43.patch, 1.2, NONE Message-ID: <20090308103218.D0D4F70116@cvs1.fedora.phx.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scorched3d/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20803 Modified Files: .cvsignore scorched3d.spec sources Removed Files: scorched3d-41.1-gcc43.patch Log Message: * Sun Mar 8 2009 Hans de Goede 42.1-1 - New upstream release 42.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scorched3d/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 22 Feb 2009 19:18:04 -0000 1.11 +++ .cvsignore 8 Mar 2009 10:31:48 -0000 1.12 @@ -1 +1 @@ -Scorched3D-42-src-clean.tar.gz +Scorched3D-42.1-src-clean.tar.gz Index: scorched3d.spec =================================================================== RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- scorched3d.spec 25 Feb 2009 23:25:38 -0000 1.36 +++ scorched3d.spec 8 Mar 2009 10:31:48 -0000 1.37 @@ -1,6 +1,6 @@ Name: scorched3d -Version: 42 -Release: 2%{?dist} +Version: 42.1 +Release: 1%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games License: GPLv2+ @@ -10,12 +10,10 @@ # with the included glew removed as that contains files under the non free # SGI Free license B. Instead the system version is used, which has the # troublesome glew parts replaced -# Also the included vera and the included Arial (bad!) fonts have been removed Source0: Scorched3D-%{version}-src-clean.tar.gz Source1: %{name}.desktop Patch1: %{name}-syslibs.patch Patch2: %{name}-help.patch -Patch3: %{name}-41.1-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel freealut-devel SDL_net-devel libGLU-devel BuildRequires: expat-devel libvorbis-devel glew-devel fftw-devel libjpeg-devel @@ -45,9 +43,6 @@ rm `find . -name Makefile` %patch1 -p1 -z .syslibs %patch2 -p1 -z .help -%patch3 -p1 -z .gcc43 -iconv -f ISO-8859-1 -t UTF8 AUTHORS > AUTHORS.tmp -mv AUTHORS.tmp AUTHORS # stop autoxxx from running touch aclocal.m4 touch configure @@ -103,7 +98,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING CHANGELOG +%doc CHANGELOG %{_bindir}/%{name}* %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop @@ -111,6 +106,9 @@ %changelog +* Sun Mar 8 2009 Hans de Goede 42.1-1 +- New upstream release 42.1 + * Wed Feb 25 2009 Fedora Release Engineering - 42-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/scorched3d/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 22 Feb 2009 19:18:08 -0000 1.11 +++ sources 8 Mar 2009 10:31:48 -0000 1.12 @@ -1 +1 @@ -3c978ac43bc84b06b866ad23dc4abc25 Scorched3D-42-src-clean.tar.gz +77ecf4f74ba64128ce3488e027ed8e44 Scorched3D-42.1-src-clean.tar.gz --- scorched3d-41.1-gcc43.patch DELETED --- From mfleming at fedoraproject.org Sun Mar 8 10:32:51 2009 From: mfleming at fedoraproject.org (Michael Fleming) Date: Sun, 8 Mar 2009 10:32:51 +0000 (UTC) Subject: rpms/mod_security/EL-5 .cvsignore, 1.10, 1.11 mod_security.conf, 1.6, 1.7 mod_security.spec, 1.19, 1.20 sources, 1.11, 1.12 Message-ID: <20090308103251.5772F70116@cvs1.fedora.phx.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20949 Modified Files: .cvsignore mod_security.conf mod_security.spec sources Log Message: * Mon Dec 29 2008 Michael Fleming 2.5.7-1 - Update to upstream 2.5.7 - Reinstate mlogc Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_security/EL-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 1 May 2008 01:30:13 -0000 1.10 +++ .cvsignore 8 Mar 2009 10:32:18 -0000 1.11 @@ -1 +1 @@ -modsecurity-apache_2.1.7.tar.gz +modsecurity-apache_2.5.7.tar.gz Index: mod_security.conf =================================================================== RCS file: /cvs/extras/rpms/mod_security/EL-5/mod_security.conf,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mod_security.conf 19 Jun 2007 09:59:15 -0000 1.6 +++ mod_security.conf 8 Mar 2009 10:32:20 -0000 1.7 @@ -1,7 +1,5 @@ # Example configuration file for the mod_security Apache module -LoadFile LIBDIR/libxml2.so.2 - LoadModule security2_module modules/mod_security2.so LoadModule unique_id_module modules/mod_unique_id.so Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/EL-5/mod_security.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mod_security.spec 1 May 2008 01:30:14 -0000 1.19 +++ mod_security.spec 8 Mar 2009 10:32:21 -0000 1.20 @@ -1,6 +1,6 @@ Summary: Security module for the Apache HTTP Server Name: mod_security -Version: 2.1.7 +Version: 2.5.7 Release: 1%{?dist} License: GPLv2 URL: http://www.modsecurity.org/ @@ -9,8 +9,8 @@ Source1: mod_security.conf Source2: modsecurity_localrules.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: libxml2 pcre httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) -BuildRequires: httpd-devel libxml2-devel pcre-devel +Requires: httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) +BuildRequires: httpd-devel libxml2-devel pcre-devel curl-devel lua-devel %description ModSecurity is an open source intrusion detection and prevention engine @@ -22,8 +22,10 @@ %setup -n modsecurity-apache_%{version} %build -make -C apache2 CFLAGS="%{optflags}" top_dir="%{_libdir}/httpd" -perl -pi.orig -e 's|LIBDIR|%{_libdir}|;' %{SOURCE1} +cd apache2 +%configure +make %{_smp_mflags} +make %{_smp_mflags} mlogc %install rm -rf %{buildroot} @@ -33,28 +35,58 @@ cp -r rules/*.conf %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/ cp -r rules/optional_rules/*.conf %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/optional_rules/ install -D -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/modsecurity_localrules.conf +install -Dp tools/mlogc %{buildroot}/%{_bindir}/mlogc +install -D -m644 apache2/mlogc-src/mlogc-default.conf %{buildroot}/%{_sysconfdir}/mlogc.conf %clean rm -rf %{buildroot} %files %defattr (-,root,root) -%doc CHANGES LICENSE README.* modsecurity* doc +%doc CHANGES LICENSE README.* modsecurity* doc MODSECURITY_LICENSING_EXCEPTION %{_libdir}/httpd/modules/mod_security2.so +%{_bindir}/mlogc +%config(noreplace) %{_sysconfdir}/mlogc.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf %dir %{_sysconfdir}/httpd/modsecurity.d %dir %{_sysconfdir}/httpd/modsecurity.d/optional_rules %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/*.conf %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/optional_rules/*.conf - %changelog -* Thu May 1 2008 Michael Fleming 2.1.7-1 -- New upstream release (bz #444794) +* Mon Dec 29 2008 Michael Fleming 2.5.7-1 +- Update to upstream 2.5.7 +- Reinstate mlogc -* Thu Sep 13 2007 Michael Fleming 2.1.3-1 -- New upstream release -- Update License tag per guidelines +* Sat Aug 2 2008 Michael Fleming 2.5.6-1 +- Update to upstream 2.5.6 +- Remove references to mlogc, it no longer ships in the main tarball. +- Link correctly vs. libxml2 and lua (bz# 445839) +- Remove bogus LoadFile directives as they're no longer needed. + +* Sun Apr 13 2008 Michael Fleming 2.1.7-1 +- Update to upstream 2.1.7 + +* Sat Feb 23 2008 Michael Fleming 2.1.6-1 +- Update to upstream 2.1.6 (Extra features including SecUploadFileMode) + +* Tue Feb 19 2008 Fedora Release Engineering - 2.1.5-3 +- Autorebuild for GCC 4.3 + +* Sat Jan 27 2008 Michael Fleming 2.1.5-2 +- Update to 2.1.5 (bz#425986) +- "blocking" -> "optional_rules" per tarball ;-) + + +* Thu Sep 13 2007 Michael Fleming 2.1.3-1 +- Update to 2.1.3 +- Update License tag per guidelines. + +* Mon Sep 3 2007 Joe Orton 2.1.1-3 +- rebuild for fixed 32-bit APR (#254241) + +* Wed Aug 29 2007 Fedora Release Engineering - 2.1.1-2 +- Rebuild for selinux ppc32 issue. * Tue Jun 19 2007 Michael Fleming 2.1.1-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_security/EL-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 1 May 2008 01:30:14 -0000 1.11 +++ sources 8 Mar 2009 10:32:21 -0000 1.12 @@ -1 +1 @@ -19c34dd5611e0c516c0717de793f4640 modsecurity-apache_2.1.7.tar.gz +049509c4d76048ce02cfb558d6598761 modsecurity-apache_2.5.7.tar.gz From mfleming at fedoraproject.org Sun Mar 8 10:36:53 2009 From: mfleming at fedoraproject.org (Michael Fleming) Date: Sun, 8 Mar 2009 10:36:53 +0000 (UTC) Subject: rpms/mod_security/EL-4 .cvsignore, 1.10, 1.11 mod_security.conf, 1.4, 1.5 mod_security.spec, 1.16, 1.17 sources, 1.11, 1.12 Message-ID: <20090308103653.88DB470116@cvs1.fedora.phx.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21812 Modified Files: .cvsignore mod_security.conf mod_security.spec sources Log Message: * Mon Dec 29 2008 Michael Fleming 2.5.7-1 - Update to upstream 2.5.7 - Reinstate mlogc Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_security/EL-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 1 May 2008 01:33:21 -0000 1.10 +++ .cvsignore 8 Mar 2009 10:36:22 -0000 1.11 @@ -1 +1 @@ -modsecurity-apache_2.1.7.tar.gz +modsecurity-apache_2.5.7.tar.gz Index: mod_security.conf =================================================================== RCS file: /cvs/extras/rpms/mod_security/EL-4/mod_security.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_security.conf 4 Aug 2007 00:19:09 -0000 1.4 +++ mod_security.conf 8 Mar 2009 10:36:22 -0000 1.5 @@ -1,7 +1,5 @@ # Example configuration file for the mod_security Apache module -LoadFile LIBDIR/libxml2.so.2 - LoadModule security2_module modules/mod_security2.so LoadModule unique_id_module modules/mod_unique_id.so Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/EL-4/mod_security.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- mod_security.spec 1 May 2008 01:33:21 -0000 1.16 +++ mod_security.spec 8 Mar 2009 10:36:23 -0000 1.17 @@ -1,6 +1,6 @@ Summary: Security module for the Apache HTTP Server Name: mod_security -Version: 2.1.7 +Version: 2.5.7 Release: 1%{?dist} License: GPLv2 URL: http://www.modsecurity.org/ @@ -9,8 +9,8 @@ Source1: mod_security.conf Source2: modsecurity_localrules.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: libxml2 pcre httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) -BuildRequires: httpd-devel libxml2-devel pcre-devel +Requires: httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) +BuildRequires: httpd-devel libxml2-devel pcre-devel curl-devel lua-devel %description ModSecurity is an open source intrusion detection and prevention engine @@ -22,8 +22,10 @@ %setup -n modsecurity-apache_%{version} %build -make -C apache2 CFLAGS="%{optflags}" top_dir="%{_libdir}/httpd" -perl -pi.orig -e 's|LIBDIR|%{_libdir}|;' %{SOURCE1} +cd apache2 +%configure +make %{_smp_mflags} +make %{_smp_mflags} mlogc %install rm -rf %{buildroot} @@ -33,28 +35,58 @@ cp -r rules/*.conf %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/ cp -r rules/optional_rules/*.conf %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/optional_rules/ install -D -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/modsecurity_localrules.conf +install -Dp tools/mlogc %{buildroot}/%{_bindir}/mlogc +install -D -m644 apache2/mlogc-src/mlogc-default.conf %{buildroot}/%{_sysconfdir}/mlogc.conf %clean rm -rf %{buildroot} %files %defattr (-,root,root) -%doc CHANGES LICENSE README.* modsecurity* doc +%doc CHANGES LICENSE README.* modsecurity* doc MODSECURITY_LICENSING_EXCEPTION %{_libdir}/httpd/modules/mod_security2.so +%{_bindir}/mlogc +%config(noreplace) %{_sysconfdir}/mlogc.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf %dir %{_sysconfdir}/httpd/modsecurity.d %dir %{_sysconfdir}/httpd/modsecurity.d/optional_rules %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/*.conf %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/optional_rules/*.conf - %changelog -* Thu May 1 2008 Michael Fleming 2.1.7-1 -- New upstream release (bz #444794) +* Mon Dec 29 2008 Michael Fleming 2.5.7-1 +- Update to upstream 2.5.7 +- Reinstate mlogc -* Thu Sep 13 2007 Michael Fleming 2.1.3-1 -- New upstream release -- Update License tag per guidelines +* Sat Aug 2 2008 Michael Fleming 2.5.6-1 +- Update to upstream 2.5.6 +- Remove references to mlogc, it no longer ships in the main tarball. +- Link correctly vs. libxml2 and lua (bz# 445839) +- Remove bogus LoadFile directives as they're no longer needed. + +* Sun Apr 13 2008 Michael Fleming 2.1.7-1 +- Update to upstream 2.1.7 + +* Sat Feb 23 2008 Michael Fleming 2.1.6-1 +- Update to upstream 2.1.6 (Extra features including SecUploadFileMode) + +* Tue Feb 19 2008 Fedora Release Engineering - 2.1.5-3 +- Autorebuild for GCC 4.3 + +* Sat Jan 27 2008 Michael Fleming 2.1.5-2 +- Update to 2.1.5 (bz#425986) +- "blocking" -> "optional_rules" per tarball ;-) + + +* Thu Sep 13 2007 Michael Fleming 2.1.3-1 +- Update to 2.1.3 +- Update License tag per guidelines. + +* Mon Sep 3 2007 Joe Orton 2.1.1-3 +- rebuild for fixed 32-bit APR (#254241) + +* Wed Aug 29 2007 Fedora Release Engineering - 2.1.1-2 +- Rebuild for selinux ppc32 issue. * Tue Jun 19 2007 Michael Fleming 2.1.1-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_security/EL-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 1 May 2008 01:33:21 -0000 1.11 +++ sources 8 Mar 2009 10:36:23 -0000 1.12 @@ -1 +1 @@ -19c34dd5611e0c516c0717de793f4640 modsecurity-apache_2.1.7.tar.gz +049509c4d76048ce02cfb558d6598761 modsecurity-apache_2.5.7.tar.gz From jwrdegoede at fedoraproject.org Sun Mar 8 10:46:48 2009 From: jwrdegoede at fedoraproject.org (Hans de Goede) Date: Sun, 8 Mar 2009 10:46:48 +0000 (UTC) Subject: rpms/lm_sensors/devel .cvsignore, 1.23, 1.24 lm_sensors.spec, 1.68, 1.69 sources, 1.23, 1.24 Message-ID: <20090308104648.AC79B70116@cvs1.fedora.phx.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lm_sensors/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24729 Modified Files: .cvsignore lm_sensors.spec sources Log Message: * Sun Mar 8 2009 Hans de Goede 3.1.0-1 - New upstream release 3.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 2 Jan 2009 08:24:06 -0000 1.23 +++ .cvsignore 8 Mar 2009 10:46:18 -0000 1.24 @@ -1 +1 @@ -lm_sensors-3.0.3.tar.bz2 +lm_sensors-3.1.0.tar.bz2 Index: lm_sensors.spec =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/devel/lm_sensors.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- lm_sensors.spec 25 Feb 2009 20:44:05 -0000 1.68 +++ lm_sensors.spec 8 Mar 2009 10:46:18 -0000 1.69 @@ -1,14 +1,12 @@ Name: lm_sensors -Version: 3.0.3 -Release: 2%{?dist} +Version: 3.1.0 +Release: 1%{?dist} URL: http://www.lm-sensors.org/ Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2 Source1: lm_sensors.sysconfig # these 2 were taken from PLD-linux, Thanks! Source2: sensord.sysconfig Source3: sensord.init -# submitted to upstream mailinglist -Patch0: lm_sensors-3.0.3-acpi-bus.patch Summary: Hardware monitoring tools Group: Applications/System License: GPLv2+ @@ -50,7 +48,6 @@ %prep %setup -q -%patch0 -p0 mv prog/init/README prog/init/README.initscripts chmod -x prog/init/fancontrol.init @@ -67,12 +64,11 @@ DESTDIR=$RPM_BUILD_ROOT user_install rm $RPM_BUILD_ROOT%{_libdir}/libsensors.a -# Remove userland kernel headers, belong in glibc-kernheaders. -rm -rf $RPM_BUILD_ROOT%{_includedir}/linux - mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lm_sensors install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sensord +install -p -m 755 prog/init/sysconfig-lm_sensors-convert \ + $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_initrddir} install -p -m 755 prog/init/lm_sensors.init \ $RPM_BUILD_ROOT%{_initrddir}/lm_sensors @@ -104,6 +100,10 @@ mv /etc/sensors.conf.rpmsave.old /etc/sensors.conf.rpmsave fi +# for conversion of /etc/sysconfig/lm_sensors format change +%triggerpostun -- lm_sensors <= 3.0.3 +%{_bindir}/sysconfig-lm_sensors-convert + %pre if [ -f /var/lock/subsys/sensors ]; then @@ -164,6 +164,9 @@ %changelog +* Sun Mar 8 2009 Hans de Goede 3.1.0-1 +- New upstream release 3.1.0 + * Wed Feb 25 2009 Fedora Release Engineering - 3.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 2 Jan 2009 08:24:07 -0000 1.23 +++ sources 8 Mar 2009 10:46:18 -0000 1.24 @@ -1 +1 @@ -e88b236228ac2a50821217015b8fd0fa lm_sensors-3.0.3.tar.bz2 +e23130eaa46c66b861729835e08bdccf lm_sensors-3.1.0.tar.bz2 From mfleming at fedoraproject.org Sun Mar 8 10:50:07 2009 From: mfleming at fedoraproject.org (Michael Fleming) Date: Sun, 8 Mar 2009 10:50:07 +0000 (UTC) Subject: rpms/GeoIP/F-10 .cvsignore, 1.12, 1.13 GeoIP.spec, 1.16, 1.17 sources, 1.12, 1.13 Message-ID: <20090308105007.32E6070116@cvs1.fedora.phx.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25492 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Sun Mar 8 2009 Michael Fleming 1.4.6-1 - Update to 1.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/F-10/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 29 Nov 2008 00:01:32 -0000 1.12 +++ .cvsignore 8 Mar 2009 10:49:36 -0000 1.13 @@ -1 +1 @@ -GeoIP-1.4.5.tar.gz +GeoIP-1.4.6.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/F-10/GeoIP.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- GeoIP.spec 29 Nov 2008 00:15:06 -0000 1.16 +++ GeoIP.spec 8 Mar 2009 10:49:36 -0000 1.17 @@ -1,6 +1,6 @@ Name: GeoIP -Version: 1.4.5 -Release: 2%{?dist} +Version: 1.4.6 +Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries License: LGPLv2+ @@ -80,6 +80,9 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Sun Mar 8 2009 Michael Fleming 1.4.6-1 +- Update to 1.4.6 + * Sat Nov 29 2008 Michael Fleming 1.4.5-2 - Update to 1.4.5 - Fix database URL locations in Perl helper scripts Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/F-10/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 29 Nov 2008 00:01:32 -0000 1.12 +++ sources 8 Mar 2009 10:49:36 -0000 1.13 @@ -1 +1 @@ -d95c34cf8ebd48e357b1812db5d75cf1 GeoIP-1.4.5.tar.gz +cb14b1beeb40631a12676b11ca0c309a GeoIP-1.4.6.tar.gz From drago01 at fedoraproject.org Sun Mar 8 10:56:34 2009 From: drago01 at fedoraproject.org (Adel Gadllah) Date: Sun, 8 Mar 2009 10:56:34 +0000 (UTC) Subject: rpms/fsarchiver/devel .cvsignore, 1.3, 1.4 fsarchiver.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20090308105635.5C0FE70116@cvs1.fedora.phx.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/fsarchiver/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26909 Modified Files: .cvsignore fsarchiver.spec sources Log Message: update to 0.4.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fsarchiver/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Feb 2009 10:45:39 -0000 1.3 +++ .cvsignore 8 Mar 2009 10:56:02 -0000 1.4 @@ -1 +1 @@ -fsarchiver-0.4.3.tar.gz +fsarchiver-0.4.4.tar.gz Index: fsarchiver.spec =================================================================== RCS file: /cvs/pkgs/rpms/fsarchiver/devel/fsarchiver.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fsarchiver.spec 28 Feb 2009 10:45:39 -0000 1.3 +++ fsarchiver.spec 8 Mar 2009 10:56:02 -0000 1.4 @@ -1,5 +1,5 @@ Name: fsarchiver -Version: 0.4.3 +Version: 0.4.4 Release: 1%{?dist} Summary: Safe and flexible file-system backup/deployment tool @@ -50,6 +50,9 @@ %doc COPYING README THANKS NEWS MULTITHREADING %changelog +* Sun Mar 07 2009 Adel Gadllah - 0.4.4 +- Update to 0.4.4 + * Sat Feb 28 2009 Adel Gadllah - 0.4.3 - 0.4.3 - Drop build patch, no longer needed Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fsarchiver/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Feb 2009 10:45:39 -0000 1.3 +++ sources 8 Mar 2009 10:56:02 -0000 1.4 @@ -1 +1 @@ -1a2514546f84f5cc28819c330d9b8047 fsarchiver-0.4.3.tar.gz +434cdeafbfc2f45f914b15fef4158795 fsarchiver-0.4.4.tar.gz From mfleming at fedoraproject.org Sun Mar 8 10:59:42 2009 From: mfleming at fedoraproject.org (Michael Fleming) Date: Sun, 8 Mar 2009 10:59:42 +0000 (UTC) Subject: rpms/GeoIP/F-10 GeoIP.spec,1.17,1.18 Message-ID: <20090308105942.4D60770116@cvs1.fedora.phx.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27653 Modified Files: GeoIP.spec Log Message: * Sun Mar 08 2009 Michael Fleming - 1.4.6-2 - Add geoiplookup6 man page Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/F-10/GeoIP.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- GeoIP.spec 8 Mar 2009 10:49:36 -0000 1.17 +++ GeoIP.spec 8 Mar 2009 10:59:11 -0000 1.18 @@ -1,6 +1,6 @@ Name: GeoIP Version: 1.4.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries License: LGPLv2+ @@ -69,6 +69,7 @@ %config(noreplace) %{_sysconfdir}/GeoIP.conf %{_datadir}/GeoIP %{_mandir}/man1/geoiplookup.1* +%{_mandir}/man1/geoiplookup6.1* %{_mandir}/man1/geoipupdate.1* %files devel @@ -80,6 +81,9 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Sun Mar 08 2009 Michael Fleming - 1.4.6-2 +- Add geoiplookup6 man page + * Sun Mar 8 2009 Michael Fleming 1.4.6-1 - Update to 1.4.6 From nbecker at fedoraproject.org Sun Mar 8 11:00:15 2009 From: nbecker at fedoraproject.org (Neal Becker) Date: Sun, 8 Mar 2009 11:00:15 +0000 (UTC) Subject: rpms/uncrustify/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 uncrustify.spec, 1.15, 1.16 Message-ID: <20090308110015.46D3A70116@cvs1.fedora.phx.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/uncrustify/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27808 Modified Files: .cvsignore sources uncrustify.spec Log Message: update to 0.52 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/uncrustify/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 3 Nov 2008 13:29:50 -0000 1.11 +++ .cvsignore 8 Mar 2009 10:59:44 -0000 1.12 @@ -1 +1 @@ -uncrustify-0.50.tgz +uncrustify-0.52.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/uncrustify/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 3 Nov 2008 13:29:51 -0000 1.11 +++ sources 8 Mar 2009 10:59:44 -0000 1.12 @@ -1 +1 @@ -02c3aebe0ee486a4ca8bea7b927ad4a4 uncrustify-0.50.tgz +9e94f7e3e5e260d93d0e253418f95502 uncrustify-0.52.tgz Index: uncrustify.spec =================================================================== RCS file: /cvs/pkgs/rpms/uncrustify/devel/uncrustify.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- uncrustify.spec 25 Feb 2009 22:58:28 -0000 1.15 +++ uncrustify.spec 8 Mar 2009 10:59:45 -0000 1.16 @@ -1,6 +1,6 @@ Name: uncrustify -Version: 0.50 -Release: 3%{?dist} +Version: 0.52 +Release: 1%{?dist} Summary: Reformat Source Group: Development/Tools @@ -43,6 +43,9 @@ %changelog +* Sun Mar 8 2009 Neal Becker - 0.52-1 +- Update to 0.52 + * Wed Feb 25 2009 Fedora Release Engineering - 0.50-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mfleming at fedoraproject.org Sun Mar 8 11:07:29 2009 From: mfleming at fedoraproject.org (Michael Fleming) Date: Sun, 8 Mar 2009 11:07:29 +0000 (UTC) Subject: rpms/GeoIP/F-9 .cvsignore, 1.12, 1.13 GeoIP.spec, 1.15, 1.16 sources, 1.12, 1.13 Message-ID: <20090308110729.0B2F170116@cvs1.fedora.phx.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29540 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Sun Mar 08 2009 Michael Fleming - 1.4.6-1 - Add geoiplookup6 man page - Update to 1.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/F-9/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 29 Nov 2008 00:33:51 -0000 1.12 +++ .cvsignore 8 Mar 2009 11:06:57 -0000 1.13 @@ -1 +1 @@ -GeoIP-1.4.5.tar.gz +GeoIP-1.4.6.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/F-9/GeoIP.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- GeoIP.spec 29 Nov 2008 00:33:51 -0000 1.15 +++ GeoIP.spec 8 Mar 2009 11:06:58 -0000 1.16 @@ -1,6 +1,6 @@ Name: GeoIP -Version: 1.4.5 -Release: 2%{?dist} +Version: 1.4.6 +Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries License: LGPLv2+ @@ -69,6 +69,7 @@ %config(noreplace) %{_sysconfdir}/GeoIP.conf %{_datadir}/GeoIP %{_mandir}/man1/geoiplookup.1* +%{_mandir}/man1/geoiplookup6.1* %{_mandir}/man1/geoipupdate.1* %files devel @@ -80,6 +81,10 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Sun Mar 08 2009 Michael Fleming - 1.4.6-1 +- Add geoiplookup6 man page +- Update to 1.4.6 + * Sat Nov 29 2008 Michael Fleming 1.4.5-2 - Update to 1.4.5 - Fix database URL locations in Perl helper scripts Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 29 Nov 2008 00:33:51 -0000 1.12 +++ sources 8 Mar 2009 11:06:58 -0000 1.13 @@ -1 +1 @@ -d95c34cf8ebd48e357b1812db5d75cf1 GeoIP-1.4.5.tar.gz +cb14b1beeb40631a12676b11ca0c309a GeoIP-1.4.6.tar.gz From lkundrak at fedoraproject.org Sun Mar 8 11:24:49 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 8 Mar 2009 11:24:49 +0000 (UTC) Subject: rpms/perl-Class-Prototyped/devel perl-Class-Prototyped.spec, 1.5, 1.6 Message-ID: <20090308112450.1CFF370116@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/perl-Class-Prototyped/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6724 Modified Files: perl-Class-Prototyped.spec Log Message: * Sun Mar 9 2009 Lubomir Rintel 1.11-3 - Fix permissions - Fix requires/provides Index: perl-Class-Prototyped.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Prototyped/devel/perl-Class-Prototyped.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Class-Prototyped.spec 26 Feb 2009 13:11:04 -0000 1.5 +++ perl-Class-Prototyped.spec 8 Mar 2009 11:24:15 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Class-Prototyped Version: 1.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast prototype-based OO programming in Perl License: GPL+ or Artistic Group: Development/Libraries @@ -19,6 +19,27 @@ %prep %setup -q -n Class-Prototyped-%{version} +cat <%{name}-prov +#!/bin/bash +# Filter out bogus provides from documentation +%{__perl_provides} $@ |sed -e 's/perl([ABCD])//g;s/perl(My[^)]*Class)//g' +EOF + +cat <%{name}-req +#!/bin/bash +# Class/Prototyped/Graph.pm doesn't define Class::Prototyped::Graph package +# Benchmark is dragged in by a regression test +%{__perl_requires} $@ |sed -e '/perl(Class::Prototyped::Graph)/d;/perl(Benchmark)/d' +EOF + +%global __perl_provides %{_builddir}/Class-Prototyped-%{version}/%{name}-prov +%global __perl_requires %{_builddir}/Class-Prototyped-%{version}/%{name}-req +chmod +x %{__perl_provides} %{__perl_requires} + +# Documentation and libraries should not be executable +chmod -x perf/* examples/* Changes lib/Class/*.pm lib/Class/Prototyped/* + + %build %{__perl} Build.PL installdirs=vendor ./Build @@ -39,11 +60,15 @@ %files %defattr(-,root,root,-) -%doc Changes README perf/ examples/ t/ +%doc Changes README perf/ examples/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Sun Mar 9 2009 Lubomir Rintel 1.11-3 +- Fix permissions +- Fix requires/provides + * Thu Feb 26 2009 Fedora Release Engineering - 1.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mfleming at fedoraproject.org Sun Mar 8 11:26:33 2009 From: mfleming at fedoraproject.org (Michael Fleming) Date: Sun, 8 Mar 2009 11:26:33 +0000 (UTC) Subject: rpms/GeoIP/devel .cvsignore, 1.12, 1.13 GeoIP.spec, 1.17, 1.18 sources, 1.12, 1.13 Message-ID: <20090308112633.33FA470116@cvs1.fedora.phx.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12845 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Sun Mar 08 2009 Michael Fleming - 1.4.6-1 - Add geoiplookup6 man page - Update to 1.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 28 Nov 2008 23:55:43 -0000 1.12 +++ .cvsignore 8 Mar 2009 11:26:02 -0000 1.13 @@ -1 +1 @@ -GeoIP-1.4.5.tar.gz +GeoIP-1.4.6.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/GeoIP.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- GeoIP.spec 23 Feb 2009 21:18:49 -0000 1.17 +++ GeoIP.spec 8 Mar 2009 11:26:02 -0000 1.18 @@ -1,6 +1,6 @@ Name: GeoIP -Version: 1.4.5 -Release: 3%{?dist} +Version: 1.4.6 +Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries License: LGPLv2+ @@ -69,6 +69,7 @@ %config(noreplace) %{_sysconfdir}/GeoIP.conf %{_datadir}/GeoIP %{_mandir}/man1/geoiplookup.1* +%{_mandir}/man1/geoiplookup6.1* %{_mandir}/man1/geoipupdate.1* %files devel @@ -80,6 +81,10 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Sun Mar 08 2009 Michael Fleming - 1.4.6-1 +- Add geoiplookup6 man page +- Update to 1.4.6 + * Mon Feb 23 2009 Fedora Release Engineering - 1.4.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 28 Nov 2008 23:55:43 -0000 1.12 +++ sources 8 Mar 2009 11:26:02 -0000 1.13 @@ -1 +1 @@ -d95c34cf8ebd48e357b1812db5d75cf1 GeoIP-1.4.5.tar.gz +cb14b1beeb40631a12676b11ca0c309a GeoIP-1.4.6.tar.gz From trasher at fedoraproject.org Sun Mar 8 11:27:39 2009 From: trasher at fedoraproject.org (Johan Cwiklinski) Date: Sun, 8 Mar 2009 11:27:39 +0000 (UTC) Subject: rpms/eric/F-9 eric.spec,1.34,1.35 sources,1.19,1.20 Message-ID: <20090308112739.86A3B70116@cvs1.fedora.phx.redhat.com> Author: trasher Update of /cvs/extras/rpms/eric/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16158 Modified Files: eric.spec sources Log Message: New upstream release Index: eric.spec =================================================================== RCS file: /cvs/extras/rpms/eric/F-9/eric.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- eric.spec 9 Feb 2009 08:06:22 -0000 1.34 +++ eric.spec 8 Mar 2009 11:27:08 -0000 1.35 @@ -7,7 +7,7 @@ Name: eric Summary: Python IDE -Version: 4.3.0 +Version: 4.3.1 Release: 1%{?dist} License: GPL+ @@ -72,8 +72,8 @@ rm -rf %{buildroot} mkdir -p %{buildroot}/ -#path to install api files -sed -i -e 's|qtDataDir = pyqtconfig._pkg_config\["qt_data_dir"\]|qtDataDir = "%{buildroot}" + pyqtconfig._pkg_config\["qt_data_dir"\]|' install.py +#path to install api files // As of 4.3.1 release, this is no longer required +#sed -i -e 's|qtDataDir = pyqtconfig._pkg_config\["qt_data_dir"\]|qtDataDir = "%{buildroot}" + pyqtconfig._pkg_config\["qt_data_dir"\]|' install.py %{__python} install.py \ -i %{buildroot}/ \ @@ -143,8 +143,13 @@ %{_datadir}/applications/*eric4.desktop %{_datadir}/icons/hicolor/*/*/* +%{_libdir}/qt4/qsci/api/python/*.api +%{_libdir}/qt4/qsci/api/ruby/*.api %changelog +* Sun Mar 8 2009 Johan Cwiklinski 4.3.0-1 +- 4.3.1 + * Mon Feb 9 2009 Johan Cwiklinski 4.3.0-1 - 4.3.0 - Added new translation files (zh_CN) Index: sources =================================================================== RCS file: /cvs/extras/rpms/eric/F-9/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 9 Feb 2009 08:06:22 -0000 1.19 +++ sources 8 Mar 2009 11:27:09 -0000 1.20 @@ -1,8 +1,8 @@ -1620eeed4f09921f6ec48be3f11429a0 eric4-4.3.0.tar.gz -77e7de0335d11e2a16747ea3a720e7fe eric4-i18n-fr-4.3.0.tar.gz -6d83cca7ebb795dc923da25ab02d396e eric4-i18n-de-4.3.0.tar.gz -b27308507fcc9bd7709dd11184c9f3b8 eric4-i18n-ru-4.3.0.tar.gz -72d3b36706961ca91a681daa76e97462 eric4-i18n-cs-4.3.0.tar.gz -a0643ac53a8cd3748fed7c9e7c3eec09 eric4-i18n-es-4.3.0.tar.gz -de2cf3bff12b811f71b0012383f2bbdc eric4-i18n-tr-4.3.0.tar.gz -a233b39a23ad9a3b665674ce3fc96c6d eric4-i18n-zh_CN.GB2312-4.3.0.tar.gz +f7060154d397ca53dcc3fc43995c73b7 eric4-4.3.1.tar.gz +2829cd57dc9d817be19bdf4243531086 eric4-i18n-fr-4.3.1.tar.gz +fdbbcb08cde6c9b409ff9f96537e238c eric4-i18n-de-4.3.1.tar.gz +8bd1f98855456b38e84951e1c085e760 eric4-i18n-ru-4.3.1.tar.gz +4a1c78ff3d5e6bc07c28492364a9aed0 eric4-i18n-cs-4.3.1.tar.gz +d9d5bc76e586dbde47ad83bd4c62d106 eric4-i18n-es-4.3.1.tar.gz +74fcd0fcad8cd394ec903d9d2f937f12 eric4-i18n-tr-4.3.1.tar.gz +90bddf5c5a87aba71de3d2b480ac94b2 eric4-i18n-zh_CN.GB2312-4.3.1.tar.gz From lucilanga at fedoraproject.org Sun Mar 8 11:37:00 2009 From: lucilanga at fedoraproject.org (Lucian Langa) Date: Sun, 8 Mar 2009 11:37:00 +0000 (UTC) Subject: rpms/evolution-rss/devel evolution-rss.spec,1.22,1.23 Message-ID: <20090308113700.37E5970116@cvs1.fedora.phx.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2902 Modified Files: evolution-rss.spec Log Message: * Sun Mar 08 2009 Lucian Langa - 0.1.2-4 - rebuild against newer webkit Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- evolution-rss.spec 24 Feb 2009 15:45:03 -0000 1.22 +++ evolution-rss.spec 8 Mar 2009 11:36:29 -0000 1.23 @@ -1,7 +1,7 @@ Summary: Evolution RSS Reader Name: evolution-rss Version: 0.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz @@ -87,6 +87,9 @@ %doc TODO %changelog +* Sun Mar 08 2009 Lucian Langa - 0.1.2-4 +- rebuild against newer webkit + * Tue Feb 24 2009 Fedora Release Engineering - 0.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ensc at fedoraproject.org Sun Mar 8 11:39:07 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sun, 8 Mar 2009 11:39:07 +0000 (UTC) Subject: rpms/clamav/devel ChangeLog-rpm.old, NONE, 1.1 clamav-0.95-cliopts.patch, NONE, 1.1 clamav-milter.sysv, NONE, 1.1 clamav-milter.upstart, NONE, 1.1 clamd.scan.upstart, NONE, 1.1 .cvsignore, 1.16, 1.17 clamav.spec, 1.80, 1.81 clamd-wrapper, 1.3, 1.4 lastver, 1.6, 1.7 sources, 1.42, 1.43 clamav-0.93.1-path.patch, 1.1, NONE clamav-0.93.3-initoff.patch, 1.1, NONE clamav-0.93.3-pid.patch, 1.1, NONE Message-ID: <20090308113907.26E8570116@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3478 Modified Files: .cvsignore clamav.spec clamd-wrapper lastver sources Added Files: ChangeLog-rpm.old clamav-0.95-cliopts.patch clamav-milter.sysv clamav-milter.upstart clamd.scan.upstart Removed Files: clamav-0.93.1-path.patch clamav-0.93.3-initoff.patch clamav-0.93.3-pid.patch Log Message: updated --- NEW FILE ChangeLog-rpm.old --- * Tue Dec 12 2006 Enrico Scholz - 0.88.7-1 - updated to 0.88.7 * Sun Nov 5 2006 Enrico Scholz - 0.88.6-1 - updated to 0.88.6 * Wed Oct 18 2006 Enrico Scholz - 0.88.5-1 - updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 - added patch to set '__attribute__ ((visibility("hidden")))' for exported MD5_*() functions (fixes #202043) * Thu Oct 05 2006 Christian Iseli 0.88.4-4 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Thu Sep 21 2006 Enrico Scholz - 0.88.4-3 - splitted SysV initscripts of -milter and -server into own subpackages * Fri Sep 15 2006 Enrico Scholz - 0.88.4-2 - rebuilt * Tue Aug 8 2006 Enrico Scholz - 0.88.4-1 - updated to 0.88.4 (SECURITY) * Wed Jul 12 2006 Enrico Scholz - removed the clamdscan(1) manpage from the -server subpackage * Sat Jul 8 2006 Enrico Scholz - removed a superfluous '}' - removed some code which was relevant for FC-3 only * Sat Jul 8 2006 Enrico Scholz - 0.88.3-1 - updated to 0.88.3 - updated to new fedora-usermgmt macros * Tue May 16 2006 Enrico Scholz - 0.88.2-2 - cleanups: removed unneeded curlies, use plain command instead of %%__XXX macro, whitespace cleanup, removed unneeded versioned dependencies - added a 'Requires(post): group(clamav)' dependencies for -update and added the corresponding Provides: to -data - removed the %%_without_milter conditional; you won't gain anything when milter would be disabled at buildtime * Sun Apr 30 2006 Enrico Scholz - 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 - 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 - 0.88.1-1 - updated to 0.88.1 (SECURITY) * Sat Feb 18 2006 Enrico Scholz - 0.88-2 - rebuilt for FC5 * Tue Jan 10 2006 Enrico Scholz - 0.88-1 - updated to 0.88 - added pseudo-versions for the 'init(...)' provides as a first step for the support of alternative initmethods * Tue Nov 15 2005 Enrico Scholz - 0.87.1-2 - moved 'freshclam.conf.5' man page into the -update subpackage (#173221) - ship 'clamd.conf.5' man page in the -server subpackage *too*. The same file is contained in multiple packages now, but this man-page can not be removed from the base package because it also applies to 'clamdscan' there (#173221). * Fri Nov 4 2005 Enrico Scholz - 0.87.1-1 - updated to 0.87.1 * Sat Sep 17 2005 Enrico Scholz - 0.87-1 - updated to 0.87 (SECURITY) - removed -timeout patch; it is solved upstream - reverted the -exim changes; they add yet more complexity, their functionality can go into an own package and they contained flaws * Fri Sep 9 2005 David Woodhouse - 0.86.2-5 - Add clamav-exim configuration package * Fri Jul 29 2005 Enrico Scholz - 0.86.2-4 - [milter] create the milter-logfile in the %%post scriptlet - [milter] reverted the change of the default child_timeout value; it was set to 5 minutes in 0.86.2 which conflicts with the internal mode where a timeout must not be set. So, the clamav-milter would not run with the default configuration * Thu Jul 28 2005 Enrico Scholz - 0.86.2-3 - Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash modulo-operation. So the sleep may get a negative number of seconds being interpreted as an option. This version makes sure that the module-operations returns a non-negative value. [BZ #164494, James Wilkinson] - added support for a /usr/sbin/clamav-notify-servers.local hook; this file will be executed (source'd) before all other actions and can abort the entire processing by invoking 'exit' * Mon Jul 25 2005 Enrico Scholz - 0.86.2-2 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists of a crontab which does not need to be changed and a helper script (freshclam-sleep). This helper script is configured by /etc/sysconfig/freshclam * Sat Jun 25 2005 Enrico Scholz - 0.86.1-2 - updated to 0.86.1 - fixed randomization in %%post scriptlet: hour should be a range but not a single number * Tue Jun 21 2005 Enrico Scholz - 0.86-1 - updated to 0.86 - randomize freshclam startup times in -update's %%post script (suggested by Stephen Smoogen); this requires some more Requires(post): also * Wed May 18 2005 Warren Togami - 0.85.1-4 - fix dist tagging the way Enrico wants it * Tue May 17 2005 Oliver Falk - 0.85.1-2 - Rebuild * Tue May 17 2005 Oliver Falk - 0.85.1-1 - Update * Sat May 14 2005 Enrico Scholz - 0.85-0 - updated to 0.85 * Sun May 1 2005 Enrico Scholz - 0.84-0 - updated to 0.84 * Fri Apr 7 2005 Michael Schwendt - rebuilt * Tue Feb 15 2005 Enrico Scholz - 0:0.83-1 - updated to 0.83 * Tue Feb 8 2005 Enrico Scholz - 0:0.82-1 - updated to 0.82 - minor spec cleanups * Fri Jan 28 2005 Enrico Scholz - 0:0.81-0.fdr.2 - build the package with '--disable-zlib-vcheck' because RH is unable to apply a fix for a 5 month old and solved security issue. Please fill your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 - added 'BuildRequires: bc' (should work without also, but ./configure gives out ugly warnings else) * Fri Jan 28 2005 Enrico Scholz - 0:0.81-0.fdr.1 - updated to 0.81 - do not ship the 'clamd.milter' daemon anymore; clamav-milter supports an internal mode now which is enabled by default - updated -milter %%description * Thu Jan 20 2005 Enrico Scholz - 0:0.80-0.fdr.2 - s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) * Wed Nov 3 2004 Enrico Scholz - 0:0.80-0.fdr.1 - updated to 0.80 - removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore - buildrequire 'curl-devel' - renamed clamav.conf to clamd.conf (upstream change) - updated -initoff patch * Tue Sep 14 2004 Enrico Scholz - 0:0.75.1-0.fdr.1 - updated to 0.75.1 - use %%configure, the problems with the architecture specification seem to have passed (probably because of an autoconf update) - set mode 0600 for the cron-script (required by vixie-cron) - made the cronjob a spambot and send mail about deactivated freshclam service to nearly everybody... (root, postmaster, webmaster) - other fixes in the notification cronjob * Fri Jul 23 2004 Enrico Scholz - 0:0.75-0.fdr.1 - updated to 0.75 * Thu Jul 15 2004 Enrico Scholz - 0:0.74-0.fdr.2 - moved /usr/bin/clamav-config from main into -devel * Wed Jun 30 2004 Enrico Scholz - 0:0.74-0.fdr.1 - updated to 0.74 * Mon Jun 14 2004 Enrico Scholz - 0:0.73-0.fdr.1 - updated to 0.73 - added pkgconfig file * Fri Jun 11 2004 Enrico Scholz - 0:0.72-0.fdr.3 - notify the user about a deactivated clamav-update service - added clamd-gen script which generates template spec-files for services using clamd - copied template configuration files to %pkgdatadir/template (needed for clamd-gen) - moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink will be provided for compatibility reasons - conditionalized building of the -milter subpackage ('--without milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) * Fri Jun 4 2004 Enrico Scholz - 0:0.72-0.fdr.2 - removed 'BuildRequires: dietlibc'; it was a leftover from the pre-use-signal era (before 0.70) (bug #1716) * Thu Jun 3 2004 Enrico Scholz - 0:0.72-0.fdr.1 - updated to 0.72 * Thu May 20 2004 Enrico Scholz - 0:0.71-0.fdr.2 - removed the randomization in the cronjob; it seems to be impossible to use the mod-operator (%%) there. Instead of, the user has to replace some placeholders... * Wed May 19 2004 Enrico Scholz - 0:0.71-0.fdr.1 - updated to 0.71 * Fri May 7 2004 Enrico Scholz - 0:0.70-0.fdr.1.1 - quote 'EOF' to delay $RANDOM expansion * Tue Apr 27 2004 Enrico Scholz - 0:0.70-0.fdr.2 - updated GECOS entry for the 'clamav' user to describe its purpose more accurately - use explicit '-m755' when creating directories with install * Tue Apr 20 2004 Enrico Scholz - 0:0.70-0.fdr.1 - updated to 0.70; rediffed some patches - updated logrotate script to use signals and documented the steps which are needed to make it work - adapted initscript to use signals instead of sockwrite - removed sockwrite; signals can now be used to reload the database - added logfile to the -milter subpackage * Tue Apr 20 2004 Enrico Scholz - 0:0.68-0.fdr.2.1 - tagged some Requires:, since clamav-server is required in the milter-%%post* scriptlets * Sat Mar 20 2004 Enrico Scholz - 0:0.68-0.fdr.2 - split the double Requires(...,...): statements; see https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118773 - require the recent fedora-usermgmt package (0.7) which fixes similar ordering issues * Thu Mar 18 2004 Enrico Scholz - 0:0.68-0.fdr.1 - updated to 0.68 (using the -1 version) - ship milter-files in the -milter instead of the -server subpackage * Tue Feb 24 2004 Enrico Scholz - 0:0.67-0.fdr.3 - fixed ':' vs. '.' in chown * Tue Feb 17 2004 Enrico Scholz - 0:0.67-0.fdr.2 - randomize freshclam startup to prevent server peaks * Mon Feb 16 2004 Enrico Scholz - 0:0.67-0.fdr.1 - updated to 0.67 (using the -1 version) * Wed Feb 11 2004 Enrico Scholz - 0:0.66-0.fdr.2 - updated to 0.66; important, packaging-relevant changes are freshclam: * $http_proxy is not supported anymore; you have to configure it in /etc/freshclam.conf * the logfile has been renamed to /var/log/freshclam.log - removed %%check section; buildroot check is implemented in local testsuite already - added some %%verify(not mtime) modifiers to avoid unnecessary .rpmnew files - added some directory-Requires: - activated milter-package and made it work - added patch to disable clamav-milter service by default - renamed /var/run/clamav. to /var/run/clamd.; this makes things more consistently but can break backward compatibility. The initscript should deal with the old version too, but I would not bet on it... - updated some descriptions - fixed the update-mechanism; now it happens in two stages: at first, the files will be downloaded as user 'clamav' and then, root initiates the daemon-reload. * Mon Feb 9 2004 Enrico Scholz - 0:0.65-0.fdr.5 - added security fix for http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 clamav-0.95-cliopts.patch: --- NEW FILE clamav-0.95-cliopts.patch --- Index: clamav-0.95rc1/shared/optparser.c =================================================================== --- clamav-0.95rc1.orig/shared/optparser.c +++ clamav-0.95rc1/shared/optparser.c @@ -211,7 +211,7 @@ const struct clam_option clam_options[] { "ExitOnOOM", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Stop the daemon when libclamav reports an out of memory condition.", "yes" }, - { "Foreground", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, + { "Foreground", "nofork", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, { "Debug", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" }, --- NEW FILE clamav-milter.sysv --- #!/bin/sh # # clamav-milter Starts/stop the "clamav-milter" daemon # # chkconfig: 345 99 1 # description: A virus scanning milter # Source function library. . /etc/rc.d/init.d/functions exec=/usr/sbin/clamav-milter prog="clamav-milter" OPTS= [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog pidfile=/var/run/clamav-milter/milter.pid lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " daemon --pidfile=${pidfile} \ $exec $OPTS --nofork=no --pid=${pidfile} && success || failure retval=$? echo [ $retval -eq 0 ] && touch $lockfile return $retval } stop() { echo -n $"Stopping $prog: " killproc -o "${pidfile} $exec && success || failure retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile return $retval } restart() { stop start } reload() { restart } force_reload() { restart } rh_status() { # run checks to determine if the service is running or use generic status status $prog } rh_status_q() { rh_status >/dev/null 2>&1 } case "$1" in start) rh_status_q && exit 0 $1 ;; stop) rh_status_q || exit 0 $1 ;; restart) $1 ;; reload) rh_status_q || exit 7 $1 ;; force-reload) force_reload ;; status) rh_status ;; condrestart|try-restart) rh_status_q || exit 0 restart ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" exit 2 esac exit $? --- NEW FILE clamav-milter.upstart --- ### Uncomment these lines when you want clamav-milter to be a milter ### for a locally running MDA #start on starting\ sendmail #start on starting sendmail #start on starting\ postfix #start on starting postfix ### Uncomment these lines when you want clamav-milter to be a milter ### for a remotely running MDA #start on starting\ local #start on starting local stop on runlevel 0 stop on runlevel 1 stop on runlevel 6 respawn exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter --nofork=yes --- NEW FILE clamd.scan.upstart --- ### Uncomment these lines when you want clamd.scan to be a scanner ### for a locally running clamav-milter #start on starting clamav-milter ### Uncomment these lines when you want clamd.scan to be a generic ### scanner service #start on starting\ local #start on starting local stop on runlevel 0 stop on runlevel 1 stop on runlevel 6 respawn exec /usr/sbin/clamd -c /etc/clamd.d/clamd.scan --nofork=yes Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 2 Dec 2008 22:26:31 -0000 1.16 +++ .cvsignore 8 Mar 2009 11:38:34 -0000 1.17 @@ -1 +1 @@ -clamav-0.94.2-norar.tar.bz2 +clamav-0.95rc1-norar.tar.bz2 Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- clamav.spec 25 Feb 2009 08:58:23 -0000 1.80 +++ clamav.spec 8 Mar 2009 11:38:36 -0000 1.81 @@ -1,4 +1,4 @@ -#global snapshot rc1 +%global snapshot rc1 ## Fedora Extras specific customization below... %bcond_without fedora @@ -8,18 +8,20 @@ %global username clamav %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log -%global milterlog %_var/log/clamd.milter %global milteruser clamilt +%global milterlog %_var/log/clamav-milter.log %global milterstatedir %_var/run/clamav-milter %global pkgdatadir %_datadir/%name +%global scanuser clamscan +%global scanstatedir %_var/run/clamd.scan %{!?release_func:%global release_func() %1%{?dist}} Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94.2 -Release: %release_func 3%{?snapshot:.%snapshot} +Version: 0.95 +Release: %release_func 0.0.1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -41,11 +43,9 @@ Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.93.3-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch -Patch26: clamav-0.93.3-pid.patch +Patch26: clamav-0.95-cliopts.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -56,8 +56,9 @@ %package filesystem Summary: Filesystem structure for clamav Group: Applications/File -Provides: user(clamav) -Provides: group(clamav) +BuildArch: noarch +Provides: user(%username) = 4 +Provides: group(%username) = 4 # Prevent version mix Conflicts: %name < %version-%release Conflicts: %name > %version-%release @@ -81,7 +82,7 @@ %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File -BuildArch: noarch +BuildArch: noarch Requires(pre): clamav-filesystem = %version-%release Requires(postun): clamav-filesystem = %version-%release Provides: data(clamav) = full @@ -111,12 +112,11 @@ %package server Summary: Clam Antivirus scanner server Group: System Environment/Daemons -Requires: init(clamav-server) Requires: data(clamav) Requires: clamav-filesystem = %version-%release Requires: clamav-lib = %version-%release -%package server-sysv +%package server-sysvinit Summary: SysV initscripts for clamav server Group: System Environment/Daemons BuildArch: noarch @@ -124,48 +124,91 @@ Requires: clamav-server = %version-%release Requires(pre): %_initrddir Requires(postun): %_initrddir +Provides: clamav-server-sysv = %version-%release +Obsoletes: clamav-server-sysv < %version-%release -%package milter -Summary: Milter module for the Clam Antivirus scanner + +%package scanner +Summary: Clamav scanner daemon +Group: System Environment/Daemons +BuildArch: noarch +Requires: init(clamav-scanner) +Provides: user(%scanuser) = 99 +Provides: group(%scanuser) = 99 +Requires: clamav-server = %version-%release + +%package scanner-sysvinit +Summary: SysV initscripts for clamav scanner daemon Group: System Environment/Daemons -Requires: clamav-milter-core = %version-%release -Requires: milter(clamav) +BuildArch: noarch +Provides: init(clamav-scanner) = sysv +Requires: clamav-server-sysvinit = %version-%release +Requires: clamav-scanner = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts + +%package scanner-upstart +Summary: Upstart initscripts for clamav scanner daemon +Group: System Environment/Daemons +BuildArch: noarch +Source410: clamd.scan.upstart +Provides: init(clamav-scanner) = upstart +Requires: clamav-scanner = %version-%release +# implicates a conflict with upstart 0.5+ +Requires(pre): /etc/event.d +Requires(post): /usr/bin/killall +Requires(postun): /sbin/initctl + -%package milter-core -Summary: Core milter module for the Clam Antivirus scanner +%package milter +Summary: Milter module for the Clam Antivirus scanner Group: System Environment/Daemons +Source300: README.fedora Requires: init(clamav-milter) BuildRequires: sendmail-devel BuildRequires: fedora-usermgmt-devel -Provides: user(%milteruser) -Provides: group(%milteruser) +Provides: user(%milteruser) = 5 +Provides: group(%milteruser) = 5 Requires(post): coreutils %{?FE_USERADD_REQ} -%package milter-sendmail -Summary: Sendmail customizations for clamav-milter -Group: System Environment/Daemons -Source300: README.fedora -Requires: sendmail -Requires: clamav-milter-core = %version-%release -Requires(pre): user(%milteruser) -Requires(pre): group(%milteruser) Provides: milter(clamav) = sendmail -Conflicts: milter(clamav) < sendmail -Conflicts: milter(clamav) > sendmail +Provides: milter(clamav) = postfix -%package milter-sysv +Provides: clamav-milter-core = %version-%release +Obsoletes: clamav-milter-core < %version-%release +Provides: clamav-milter-sendmail = %version-%release +Obsoletes: clamav-milter-sendmail < %version-%release + +%package milter-sysvinit Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons -Provides: init(clamav-milter) = sysv -Requires: clamav-milter = %version-%release BuildArch: noarch +Source320: clamav-milter.sysv +Provides: init(clamav-milter) = sysvinit +Requires: clamav-milter = %version-%release Requires(post): user(%milteruser) clamav-milter Requires(preun): user(%milteruser) clamav-milter Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts Requires(post): chkconfig Requires(preun): chkconfig initscripts +Provides: milter-sysv = %version-%release +Obsoletes: milter-sysv < %version-%release + +%package milter-upstart +Summary: Upstart initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +BuildArch: noarch +Source310: clamav-milter.upstart +Provides: init(clamav-milter) = upstart +Requires: clamav-milter = %version-%release +# implicates a conflict with upstart 0.5+ +Requires(pre): /etc/event.d +Requires(post): /usr/bin/killall +Requires(postun): /sbin/initctl %description @@ -235,47 +278,54 @@ See the README file how this can be done with a minimum of effort. -%description server-sysv +%description server-sysvinit SysV initscripts template for the clamav server +%description scanner +This package contains a generic system wide clamd service which is +e.g. used by the clamav-milter package. + +%description scanner-sysvinit +The SysV initscripts for clamav-scanner. + +%description scanner-upstart +The Upstart initscripts for clamav-scanner. + + %description milter This package contains files which are needed to run the clamav-milter. -%description milter-sysv +%description milter-sysvinit The SysV initscripts for clamav-milter. -%description milter-core -Core files for the clamav-milter. - -%description milter-sendmail -Sendmail customizations of the clamav-milter. - +%description milter-upstart +The Upstart initscripts for clamav-milter. ## ------------------------------------------------------------ %prep %setup -q -n %{name}-%{version}%{?snapshot} -%patch21 -p1 -b .path -%patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open -%patch26 -p1 -b .pid +%patch26 -p1 -b .cliopts install -p -m0644 %SOURCE300 clamav-milter/ mkdir -p libclamunrar{,_iface} %{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} -perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.!g; - s!^#?(LocalSocket ).*!\1/var/run/clamd./clamd.sock!g; - s!^#?(PidFile ).*!\1/var/run/clamd./clamd.pid!g; - s!^#?(User ).*!\1!g; - s! /usr/local/share/clamav,! %homedir,!g; - ' etc/clamd.conf +sed -ri \ + -e 's!^(#?LogFile ).*!\1/var/log/clamd.!g' \ + -e 's!^(#?LocalSocket ).*!\1/var/run/clamd./clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd./clamd.pid!g' \ + -e 's!^#?(User ).*!\1!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf -perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf +sed -ri -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ @@ -321,12 +371,13 @@ install -d -m755 \ - ${RPM_BUILD_ROOT}%_sysconfdir/{clamd.d,cron.d,logrotate.d,sysconfig} \ + ${RPM_BUILD_ROOT}%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,sysconfig,event.d} \ ${RPM_BUILD_ROOT}%_var/log \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir + ${RPM_BUILD_ROOT}%homedir \ + ${RPM_BUILD_ROOT}%scanstatedir rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la @@ -369,22 +420,33 @@ $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -#### The milter stuff -function subst() { - sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" -} +### The scanner stuff +sed -e 's!!scan!g;s!!%scanuser!g' \ + etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/clamd.scan + +sed -e 's!!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ + > $RPM_BUILD_ROOT%_initrddir/clamd.scan + +install -p -m 644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamd.scan +touch $RPM_BUILD_ROOT%scanstatedir/clamd.sock -subst etc/clamd.conf /etc/clamd.d/milter.conf \ - 's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;' +### The milter stuff +sed -r \ + -e 's!^#?(User).*!\1 %milteruser!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ + -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ + -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ + -e 's! /tmp/clamav-milter.log! %milterlog!g' \ + etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf -cat <$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter -CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' -EOF +install -p -m 644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamav-milter +install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter -install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter -touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf +touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog} ## ------------------------------------------------------------ @@ -404,6 +466,35 @@ %__fe_groupdel %username &>/dev/null || : +%pre scanner +%__fe_groupadd 49 -r %scanuser &>/dev/null || : +%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ + -g %scanuser %scanuser &>/dev/null || : + +%postun scanner +%__fe_userdel %scanuser &>/dev/null || : +%__fe_groupdel %scanuser &>/dev/null || : + + +%post scanner-sysvinit +/sbin/chkconfig --add clamd.scan + +%preun scanner-sysvinit +test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.scan + +%postun scanner-sysvinit +test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : + + +%post scanner-upstart +/usr/bin/killall -u %scanuser clamd 2>/dev/null || : + +%preun scanner-upstart +test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : + + + %post update test -e %freshclamlog || { touch %freshclamlog @@ -411,34 +502,41 @@ %__chown root:%username %freshclamlog } -%pre milter-core +%pre milter %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : -%post milter-core +%post milter test -e %milterlog || { touch %milterlog chmod 0620 %milterlog chown root:%milteruser %milterlog } -%postun milter-core +%postun milter %__fe_userdel %milteruser &>/dev/null || : %__fe_groupdel %milteruser &>/dev/null || : -%post milter-sysv +%post milter-sysvinit /sbin/chkconfig --add clamav-milter -%preun milter-sysv +%preun milter-sysvinit test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : test "$1" != 0 || /sbin/chkconfig --del clamav-milter -%postun milter-sysv +%postun milter-sysvinit test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : +%post milter-upstart +/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : + +%preun milter-upstart +test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : + + %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig @@ -521,37 +619,57 @@ %exclude %_mandir/man8/clamav-milter* -%files server-sysv +%files server-sysvinit %defattr(-,root,root,-) %_initrddir/clamd-wrapper ## ----------------------- -%files milter +%files scanner %defattr(-,root,root,-) +%dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%config(noreplace) %_sysconfdir/clamd.d/clamd.scan +%ghost %scanstatedir/clamd.sock + +%files scanner-sysvinit +%attr(0755,root,root) %config %_initrddir/clamd.scan -%files milter-core +%files scanner-upstart %defattr(-,root,root,-) -%doc clamav-milter/INSTALL -%_sbindir/*milter* -%_mandir/man8/clamav-milter* -%config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf -%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%config(noreplace) %_sysconfdir/event.d/clamd.scan -%files milter-sendmail +## ----------------------- + +%files milter %defattr(-,root,root,-) %doc clamav-milter/README.fedora -%attr(0700,%milteruser,%milteruser) %dir %milterstatedir +%_sbindir/*milter* +%_mandir/man8/clamav-milter* +%config(noreplace) %_sysconfdir/mail/clamav-milter.conf +%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%attr(0710,%milteruser,%milteruser) %dir %milterstatedir %ghost %milterstatedir/* -%files milter-sysv +%files milter-sysvinit %defattr(-,root,root,-) %config %_initrddir/clamav-milter -%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamav-milter + +%files milter-upstart +%defattr(-,root,root,-) +%config(noreplace) %_sysconfdir/event.d/clamav-milter %changelog +* Sun Mar 8 2009 Enrico Scholz - 0.95-0.1.rc1 +- updated to 0.95rc1 +- added -upstart subpackages +- renamed -sysv to -sysvinit to make -upstart win the default dep resolving +- reworked complete milter stuff +- added -scanner subpackage which contains a preconfigured daemon + (e.g. for use by -milter) +- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old + * Wed Feb 25 2009 Enrico Scholz - 0.94.2-3 - made some subpackages noarch - fixed typo in SysV initscript which removes 'touch' file (#473513) @@ -681,283 +799,3 @@ updated per cron-job and user does not want to download the large -data package with outdated virus definitations (#214949) - %%ghost'ed the files downloaded by freshclam - -* Tue Dec 12 2006 Enrico Scholz - 0.88.7-1 -- updated to 0.88.7 - -* Sun Nov 5 2006 Enrico Scholz - 0.88.6-1 -- updated to 0.88.6 - -* Wed Oct 18 2006 Enrico Scholz - 0.88.5-1 -- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 -- added patch to set '__attribute__ ((visibility("hidden")))' for - exported MD5_*() functions (fixes #202043) - -* Thu Oct 05 2006 Christian Iseli 0.88.4-4 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Thu Sep 21 2006 Enrico Scholz - 0.88.4-3 -- splitted SysV initscripts of -milter and -server into own subpackages - -* Fri Sep 15 2006 Enrico Scholz - 0.88.4-2 -- rebuilt - -* Tue Aug 8 2006 Enrico Scholz - 0.88.4-1 -- updated to 0.88.4 (SECURITY) - -* Wed Jul 12 2006 Enrico Scholz -- removed the clamdscan(1) manpage from the -server subpackage - -* Sat Jul 8 2006 Enrico Scholz -- removed a superfluous '}' -- removed some code which was relevant for FC-3 only - -* Sat Jul 8 2006 Enrico Scholz - 0.88.3-1 -- updated to 0.88.3 -- updated to new fedora-usermgmt macros - -* Tue May 16 2006 Enrico Scholz - 0.88.2-2 -- cleanups: removed unneeded curlies, use plain command instead of - %%__XXX macro, whitespace cleanup, removed unneeded versioned - dependencies -- added a 'Requires(post): group(clamav)' dependencies for -update and - added the corresponding Provides: to -data -- removed the %%_without_milter conditional; you won't gain anything - when milter would be disabled at buildtime - -* Sun Apr 30 2006 Enrico Scholz - 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 - 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 - 0.88.1-1 -- updated to 0.88.1 (SECURITY) - -* Sat Feb 18 2006 Enrico Scholz - 0.88-2 -- rebuilt for FC5 - -* Tue Jan 10 2006 Enrico Scholz - 0.88-1 -- updated to 0.88 -- added pseudo-versions for the 'init(...)' provides as a first step - for the support of alternative initmethods - -* Tue Nov 15 2005 Enrico Scholz - 0.87.1-2 -- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) -- ship 'clamd.conf.5' man page in the -server subpackage *too*. The - same file is contained in multiple packages now, but this man-page - can not be removed from the base package because it also applies to - 'clamdscan' there (#173221). - -* Fri Nov 4 2005 Enrico Scholz - 0.87.1-1 -- updated to 0.87.1 - -* Sat Sep 17 2005 Enrico Scholz - 0.87-1 -- updated to 0.87 (SECURITY) -- removed -timeout patch; it is solved upstream -- reverted the -exim changes; they add yet more complexity, their - functionality can go into an own package and they contained flaws - -* Fri Sep 9 2005 David Woodhouse - 0.86.2-5 -- Add clamav-exim configuration package - -* Fri Jul 29 2005 Enrico Scholz - 0.86.2-4 -- [milter] create the milter-logfile in the %%post scriptlet -- [milter] reverted the change of the default child_timeout value; it - was set to 5 minutes in 0.86.2 which conflicts with the internal - mode where a timeout must not be set. So, the clamav-milter would - not run with the default configuration - -* Thu Jul 28 2005 Enrico Scholz - 0.86.2-3 -- Fixed calculation of sleep duration; on some systems/IPs, `hostid` - results in a negative number which is retained by the bash - modulo-operation. So the sleep may get a negative number of seconds - being interpreted as an option. This version makes sure that the - module-operations returns a non-negative value. [BZ #164494, James - Wilkinson] -- added support for a /usr/sbin/clamav-notify-servers.local hook; this - file will be executed (source'd) before all other actions and can - abort the entire processing by invoking 'exit' - -* Mon Jul 25 2005 Enrico Scholz - 0.86.2-2 -- updated to 0.86.2 (SECURITY) -- changed the freshclam updating mechanism (again); now, it consists - of a crontab which does not need to be changed and a helper script - (freshclam-sleep). This helper script is configured by - /etc/sysconfig/freshclam - -* Sat Jun 25 2005 Enrico Scholz - 0.86.1-2 -- updated to 0.86.1 -- fixed randomization in %%post scriptlet: hour should be a range but - not a single number - -* Tue Jun 21 2005 Enrico Scholz - 0.86-1 -- updated to 0.86 -- randomize freshclam startup times in -update's %%post script (suggested - by Stephen Smoogen); this requires some more Requires(post): also - -* Wed May 18 2005 Warren Togami - 0.85.1-4 -- fix dist tagging the way Enrico wants it - -* Tue May 17 2005 Oliver Falk - 0.85.1-2 -- Rebuild - -* Tue May 17 2005 Oliver Falk - 0.85.1-1 -- Update - -* Sat May 14 2005 Enrico Scholz - 0.85-0 -- updated to 0.85 - -* Sun May 1 2005 Enrico Scholz - 0.84-0 -- updated to 0.84 - -* Fri Apr 7 2005 Michael Schwendt -- rebuilt - -* Tue Feb 15 2005 Enrico Scholz - 0:0.83-1 -- updated to 0.83 - -* Tue Feb 8 2005 Enrico Scholz - 0:0.82-1 -- updated to 0.82 -- minor spec cleanups - -* Fri Jan 28 2005 Enrico Scholz - 0:0.81-0.fdr.2 -- build the package with '--disable-zlib-vcheck' because RH is unable to - apply a fix for a 5 month old and solved security issue. Please fill - your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 -- added 'BuildRequires: bc' (should work without also, but ./configure - gives out ugly warnings else) - -* Fri Jan 28 2005 Enrico Scholz - 0:0.81-0.fdr.1 -- updated to 0.81 -- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports - an internal mode now which is enabled by default -- updated -milter %%description - -* Thu Jan 20 2005 Enrico Scholz - 0:0.80-0.fdr.2 -- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update - subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) - -* Wed Nov 3 2004 Enrico Scholz - 0:0.80-0.fdr.1 -- updated to 0.80 -- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore -- buildrequire 'curl-devel' -- renamed clamav.conf to clamd.conf (upstream change) -- updated -initoff patch - -* Tue Sep 14 2004 Enrico Scholz - 0:0.75.1-0.fdr.1 -- updated to 0.75.1 -- use %%configure, the problems with the architecture specification - seem to have passed (probably because of an autoconf update) -- set mode 0600 for the cron-script (required by vixie-cron) -- made the cronjob a spambot and send mail about deactivated freshclam - service to nearly everybody... (root, postmaster, webmaster) -- other fixes in the notification cronjob - -* Fri Jul 23 2004 Enrico Scholz - 0:0.75-0.fdr.1 -- updated to 0.75 - -* Thu Jul 15 2004 Enrico Scholz - 0:0.74-0.fdr.2 -- moved /usr/bin/clamav-config from main into -devel - -* Wed Jun 30 2004 Enrico Scholz - 0:0.74-0.fdr.1 -- updated to 0.74 - -* Mon Jun 14 2004 Enrico Scholz - 0:0.73-0.fdr.1 -- updated to 0.73 -- added pkgconfig file - -* Fri Jun 11 2004 Enrico Scholz - 0:0.72-0.fdr.3 -- notify the user about a deactivated clamav-update service -- added clamd-gen script which generates template spec-files for - services using clamd -- copied template configuration files to %pkgdatadir/template (needed - for clamd-gen) -- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink - will be provided for compatibility reasons -- conditionalized building of the -milter subpackage ('--without - milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) - -* Fri Jun 4 2004 Enrico Scholz - 0:0.72-0.fdr.2 -- removed 'BuildRequires: dietlibc'; it was a leftover from the - pre-use-signal era (before 0.70) (bug #1716) - -* Thu Jun 3 2004 Enrico Scholz - 0:0.72-0.fdr.1 -- updated to 0.72 - -* Thu May 20 2004 Enrico Scholz - 0:0.71-0.fdr.2 -- removed the randomization in the cronjob; it seems to be impossible - to use the mod-operator (%%) there. Instead of, the user has to - replace some placeholders... - -* Wed May 19 2004 Enrico Scholz - 0:0.71-0.fdr.1 -- updated to 0.71 - -* Fri May 7 2004 Enrico Scholz - 0:0.70-0.fdr.1.1 -- quote 'EOF' to delay $RANDOM expansion - -* Tue Apr 27 2004 Enrico Scholz - 0:0.70-0.fdr.2 -- updated GECOS entry for the 'clamav' user to describe its purpose - more accurately -- use explicit '-m755' when creating directories with install - -* Tue Apr 20 2004 Enrico Scholz - 0:0.70-0.fdr.1 -- updated to 0.70; rediffed some patches -- updated logrotate script to use signals and documented the steps - which are needed to make it work -- adapted initscript to use signals instead of sockwrite -- removed sockwrite; signals can now be used to reload the database -- added logfile to the -milter subpackage - -* Tue Apr 20 2004 Enrico Scholz - 0:0.68-0.fdr.2.1 -- tagged some Requires:, since clamav-server is required in the milter-%%post* scriptlets - -* Sat Mar 20 2004 Enrico Scholz - 0:0.68-0.fdr.2 -- split the double Requires(...,...): statements; see - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118773 -- require the recent fedora-usermgmt package (0.7) which fixes similar - ordering issues - -* Thu Mar 18 2004 Enrico Scholz - 0:0.68-0.fdr.1 -- updated to 0.68 (using the -1 version) -- ship milter-files in the -milter instead of the -server subpackage - -* Tue Feb 24 2004 Enrico Scholz - 0:0.67-0.fdr.3 -- fixed ':' vs. '.' in chown - -* Tue Feb 17 2004 Enrico Scholz - 0:0.67-0.fdr.2 -- randomize freshclam startup to prevent server peaks - -* Mon Feb 16 2004 Enrico Scholz - 0:0.67-0.fdr.1 -- updated to 0.67 (using the -1 version) - -* Wed Feb 11 2004 Enrico Scholz - 0:0.66-0.fdr.2 -- updated to 0.66; important, packaging-relevant changes are - freshclam: - * $http_proxy is not supported anymore; you have to configure it in - /etc/freshclam.conf - * the logfile has been renamed to /var/log/freshclam.log -- removed %%check section; buildroot check is implemented in local - testsuite already -- added some %%verify(not mtime) modifiers to avoid unnecessary .rpmnew - files -- added some directory-Requires: -- activated milter-package and made it work -- added patch to disable clamav-milter service by default -- renamed /var/run/clamav. to /var/run/clamd.; this - makes things more consistently but can break backward compatibility. The - initscript should deal with the old version too, but I would not bet on - it... -- updated some descriptions -- fixed the update-mechanism; now it happens in two stages: at first, - the files will be downloaded as user 'clamav' and then, root initiates - the daemon-reload. - -* Mon Feb 9 2004 Enrico Scholz - 0:0.65-0.fdr.5 -- added security fix for - http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 Index: clamd-wrapper =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamd-wrapper,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- clamd-wrapper 25 Feb 2009 08:58:23 -0000 1.3 +++ clamd-wrapper 8 Mar 2009 11:38:36 -0000 1.4 @@ -26,6 +26,7 @@ CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf CLAMD_OPTIONS= +CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid ## backward-compatibility check... for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do @@ -40,7 +41,8 @@ start () { echo -n $"Starting $prog: " - daemon $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} + daemon --pidfile=${CLAMD_PIDFILE} \ + $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile @@ -59,10 +61,10 @@ reload() { rc=0 echo -n $"Reloading $prog: " - killproc $procname -SIGHUP || rc=$? + killproc -p ${CLAMD_PIDFILE} $procname -SIGHUP || rc=$? echo echo -n $"Loading new virus-database: " - killproc $procname -SIGUSR2 || rc=$? + killproc -p ${CLAMD_PIDFILE} $procname -SIGUSR2 || rc=$? echo return $rc } Index: lastver =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/lastver,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- lastver 13 Jul 2008 19:12:31 -0000 1.6 +++ lastver 8 Mar 2009 11:38:36 -0000 1.7 @@ -1 +1 @@ -0.93.3 +0.94.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 2 Dec 2008 22:26:31 -0000 1.42 +++ sources 8 Mar 2009 11:38:36 -0000 1.43 @@ -1 +1 @@ -9b04d010c17c607ace4ed5e9318104d4 clamav-0.94.2-norar.tar.bz2 +40d13c0d39568b17aec35fe793233861 clamav-0.95rc1-norar.tar.bz2 --- clamav-0.93.1-path.patch DELETED --- --- clamav-0.93.3-initoff.patch DELETED --- --- clamav-0.93.3-pid.patch DELETED --- From mfleming at fedoraproject.org Sun Mar 8 11:48:21 2009 From: mfleming at fedoraproject.org (Michael Fleming) Date: Sun, 8 Mar 2009 11:48:21 +0000 (UTC) Subject: rpms/GeoIP/EL-5 .cvsignore, 1.11, 1.12 GeoIP.spec, 1.11, 1.12 LICENSE.txt, 1.1, 1.2 sources, 1.11, 1.12 Message-ID: <20090308114821.59A3E70116@cvs1.fedora.phx.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5705 Modified Files: .cvsignore GeoIP.spec LICENSE.txt sources Log Message: * Sun Mar 08 2009 Michael Fleming - 1.4.6-1 - Add geoiplookup6 man page - Update to 1.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/EL-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 6 Dec 2008 23:49:32 -0000 1.11 +++ .cvsignore 8 Mar 2009 11:47:50 -0000 1.12 @@ -1 +1 @@ -GeoIP-1.4.5.tar.gz +GeoIP-1.4.6.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/EL-5/GeoIP.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- GeoIP.spec 6 Dec 2008 23:49:32 -0000 1.11 +++ GeoIP.spec 8 Mar 2009 11:47:50 -0000 1.12 @@ -1,5 +1,5 @@ Name: GeoIP -Version: 1.4.5 +Version: 1.4.6 Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries @@ -69,6 +69,7 @@ %config(noreplace) %{_sysconfdir}/GeoIP.conf %{_datadir}/GeoIP %{_mandir}/man1/geoiplookup.1* +%{_mandir}/man1/geoiplookup6.1* %{_mandir}/man1/geoipupdate.1* %files devel @@ -80,6 +81,10 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Sun Mar 08 2009 Michael Fleming - 1.4.6-1 +- Add geoiplookup6 man page +- Update to 1.4.6 + * Sat Nov 29 2008 Michael Fleming 1.4.5-1 - Update to 1.4.5 - Fix database URL locations in Perl helper scripts Index: LICENSE.txt =================================================================== RCS file: /cvs/extras/rpms/GeoIP/EL-5/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 6 Dec 2008 23:51:32 -0000 1.1 +++ LICENSE.txt 8 Mar 2009 11:47:50 -0000 1.2 @@ -8,7 +8,7 @@ OPEN DATA LICENSE (GeoLite Country and GeoLite City databases) -Copyright (c) 2008 MaxMind, Inc. All Rights Reserved. +Copyright (c) 2005 MaxMind LLC. All Rights Reserved. All advertising materials and documentation mentioning features or use of this database must display the following acknowledgment: @@ -27,13 +27,48 @@ 3. "MaxMind" may not be used to endorse or promote products derived from this database without specific prior written permission. -THIS DATABASE IS PROVIDED BY MAXMIND, INC ``AS IS'' AND ANY +THIS DATABASE IS PROVIDED BY MAXMIND.COM ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL MAXMIND BE LIABLE FOR ANY +DISCLAIMED. IN NO EVENT SHALL MAXMIND.COM 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 DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Some parts of this software distribution are derived from the APNIC, ARIN and +RIPE databases (copyright details below). The author of this module makes no +claims of ownership on those parts. + +APNIC conditions of use: + +The files are freely available for download and use on the condition that APNIC +will not be held responsible for any loss or damage arising from the application +of the information contained in these reports. + +APNIC endeavours to the best of its ability to ensure the accuracy of these +reports; however, APNIC makes no guarantee in this regard. + +In particular, it should be noted that these reports seek to indicate the +country where resources were first allocated or assigned. It is not intended +that these reports be considered as an authoritative statement of the location +in which any specific resource may currently be in use. + +ARIN database copyright: + +Copyright (c) American Registry for Internet Numbers. All rights reserved. + +RIPE database copyright: + +The information in the RIPE Database is available to the public for agreed +Internet operation purposes, but is under copyright. The copyright statement is: + +"Except for agreed Internet operational purposes, no part of this publication +may be reproduced, stored in a retrieval system, or transmitted, in any form or +by any means, electronic, mechanical, recording, or otherwise, without prior +permission of the RIPE NCC on behalf of the copyright holders. Any use of this +material to target advertising or similar activities is explicitly forbidden and +may be prosecuted. The RIPE NCC requests to be notified of any such activities +or suspicions thereof." Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/EL-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 6 Dec 2008 23:49:32 -0000 1.11 +++ sources 8 Mar 2009 11:47:50 -0000 1.12 @@ -1 +1 @@ -d95c34cf8ebd48e357b1812db5d75cf1 GeoIP-1.4.5.tar.gz +cb14b1beeb40631a12676b11ca0c309a GeoIP-1.4.6.tar.gz From mfleming at fedoraproject.org Sun Mar 8 11:54:35 2009 From: mfleming at fedoraproject.org (Michael Fleming) Date: Sun, 8 Mar 2009 11:54:35 +0000 (UTC) Subject: rpms/GeoIP/EL-4 .cvsignore, 1.12, 1.13 GeoIP.spec, 1.13, 1.14 LICENSE.txt, 1.1, 1.2 sources, 1.12, 1.13 Message-ID: <20090308115435.DA15770116@cvs1.fedora.phx.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6874 Modified Files: .cvsignore GeoIP.spec LICENSE.txt sources Log Message: * Sun Mar 08 2009 Michael Fleming - 1.4.6-1 - Add geoiplookup6 man page - Update to 1.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/EL-4/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 6 Dec 2008 23:54:47 -0000 1.12 +++ .cvsignore 8 Mar 2009 11:54:04 -0000 1.13 @@ -1 +1 @@ -GeoIP-1.4.5.tar.gz +GeoIP-1.4.6.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/EL-4/GeoIP.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- GeoIP.spec 6 Dec 2008 23:54:47 -0000 1.13 +++ GeoIP.spec 8 Mar 2009 11:54:04 -0000 1.14 @@ -1,5 +1,5 @@ Name: GeoIP -Version: 1.4.5 +Version: 1.4.6 Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries @@ -80,6 +80,10 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Sun Mar 08 2009 Michael Fleming - 1.4.6-1 +- Add geoiplookup6 man page +- Update to 1.4.6 + * Sat Nov 29 2008 Michael Fleming 1.4.5-1 - Update to 1.4.5 - Fix database URL locations in Perl helper scripts Index: LICENSE.txt =================================================================== RCS file: /cvs/extras/rpms/GeoIP/EL-4/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 6 Dec 2008 23:54:47 -0000 1.1 +++ LICENSE.txt 8 Mar 2009 11:54:04 -0000 1.2 @@ -8,7 +8,7 @@ OPEN DATA LICENSE (GeoLite Country and GeoLite City databases) -Copyright (c) 2008 MaxMind, Inc. All Rights Reserved. +Copyright (c) 2005 MaxMind LLC. All Rights Reserved. All advertising materials and documentation mentioning features or use of this database must display the following acknowledgment: @@ -27,13 +27,48 @@ 3. "MaxMind" may not be used to endorse or promote products derived from this database without specific prior written permission. -THIS DATABASE IS PROVIDED BY MAXMIND, INC ``AS IS'' AND ANY +THIS DATABASE IS PROVIDED BY MAXMIND.COM ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL MAXMIND BE LIABLE FOR ANY +DISCLAIMED. IN NO EVENT SHALL MAXMIND.COM 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 DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Some parts of this software distribution are derived from the APNIC, ARIN and +RIPE databases (copyright details below). The author of this module makes no +claims of ownership on those parts. + +APNIC conditions of use: + +The files are freely available for download and use on the condition that APNIC +will not be held responsible for any loss or damage arising from the application +of the information contained in these reports. + +APNIC endeavours to the best of its ability to ensure the accuracy of these +reports; however, APNIC makes no guarantee in this regard. + +In particular, it should be noted that these reports seek to indicate the +country where resources were first allocated or assigned. It is not intended +that these reports be considered as an authoritative statement of the location +in which any specific resource may currently be in use. + +ARIN database copyright: + +Copyright (c) American Registry for Internet Numbers. All rights reserved. + +RIPE database copyright: + +The information in the RIPE Database is available to the public for agreed +Internet operation purposes, but is under copyright. The copyright statement is: + +"Except for agreed Internet operational purposes, no part of this publication +may be reproduced, stored in a retrieval system, or transmitted, in any form or +by any means, electronic, mechanical, recording, or otherwise, without prior +permission of the RIPE NCC on behalf of the copyright holders. Any use of this +material to target advertising or similar activities is explicitly forbidden and +may be prosecuted. The RIPE NCC requests to be notified of any such activities +or suspicions thereof." Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/EL-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 6 Dec 2008 23:54:47 -0000 1.12 +++ sources 8 Mar 2009 11:54:05 -0000 1.13 @@ -1 +1 @@ -d95c34cf8ebd48e357b1812db5d75cf1 GeoIP-1.4.5.tar.gz +cb14b1beeb40631a12676b11ca0c309a GeoIP-1.4.6.tar.gz From mfleming at fedoraproject.org Sun Mar 8 11:57:25 2009 From: mfleming at fedoraproject.org (Michael Fleming) Date: Sun, 8 Mar 2009 11:57:25 +0000 (UTC) Subject: rpms/GeoIP/EL-4 GeoIP.spec,1.14,1.15 Message-ID: <20090308115725.C32FE70116@cvs1.fedora.phx.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7278 Modified Files: GeoIP.spec Log Message: Actually add manpage :-) Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/EL-4/GeoIP.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- GeoIP.spec 8 Mar 2009 11:54:04 -0000 1.14 +++ GeoIP.spec 8 Mar 2009 11:56:51 -0000 1.15 @@ -69,6 +69,7 @@ %config(noreplace) %{_sysconfdir}/GeoIP.conf %{_datadir}/GeoIP %{_mandir}/man1/geoiplookup.1* +%{_mandir}/man1/geoiplookup6.1* %{_mandir}/man1/geoipupdate.1* %files devel From pghmcfc at fedoraproject.org Sun Mar 8 11:57:47 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Sun, 8 Mar 2009 11:57:47 +0000 (UTC) Subject: rpms/perl-Math-Pari/devel perl-Math-Pari.spec,1.15,1.16 Message-ID: <20090308115747.9EDD270116@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-Math-Pari/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7415 Modified Files: perl-Math-Pari.spec Log Message: Filter out unwanted provides for perl shared objects Index: perl-Math-Pari.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-Pari/devel/perl-Math-Pari.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-Math-Pari.spec 26 Feb 2009 21:41:36 -0000 1.15 +++ perl-Math-Pari.spec 8 Mar 2009 11:57:16 -0000 1.16 @@ -17,7 +17,7 @@ Summary: Perl interface to PARI Name: perl-Math-Pari Version: %{module_version} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Math-Pari/ @@ -27,6 +27,12 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(ExtUtils::MakeMaker) +# don't "provide" private Perl libs or the redundant unversioned perl(Math::Pari) one +%global _use_internal_dependency_generator 0 +%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u +%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P} | %{__grep} -Fvx 'perl(Math::Pari)'" +%global __find_requires /bin/sh -c "%{__deploop R}" + %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 @@ -35,10 +41,6 @@ %prep %setup -q -n Math-Pari-%{module_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} - # Remove spurious executable permission bits %{__chmod} -x Changes README Pari.pm PariInit.pm func_codes.h Pari.xs @@ -80,10 +82,13 @@ %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm* %changelog +* Sun Mar 8 2009 Paul Howarth - 2.010801-3 +- Filter out unwanted provides for perl shared objects + * Thu Feb 26 2009 Fedora Release Engineering - 2.010801-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Wed Feb 11 2009 Paul Howarth 2.010801-1 +* Wed Feb 11 2009 Paul Howarth - 2.010801-1 - update to 2.010801, but build with pari-2.1.7 since 2.1.8 doesn't exist (upstream forgot their own numbering convention - CPAN RT#35493) - re-enable tests From nbecker at fedoraproject.org Sun Mar 8 11:59:08 2009 From: nbecker at fedoraproject.org (Neal Becker) Date: Sun, 8 Mar 2009 11:59:08 +0000 (UTC) Subject: rpms/uncrustify/F-10 sources,1.11,1.12 uncrustify.spec,1.14,1.15 Message-ID: <20090308115908.6822570116@cvs1.fedora.phx.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/uncrustify/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7699 Modified Files: sources uncrustify.spec Log Message: update to 0.52 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/uncrustify/F-10/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 3 Nov 2008 13:29:51 -0000 1.11 +++ sources 8 Mar 2009 11:58:37 -0000 1.12 @@ -1 +1 @@ -02c3aebe0ee486a4ca8bea7b927ad4a4 uncrustify-0.50.tgz +9e94f7e3e5e260d93d0e253418f95502 uncrustify-0.52.tgz Index: uncrustify.spec =================================================================== RCS file: /cvs/pkgs/rpms/uncrustify/F-10/uncrustify.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- uncrustify.spec 3 Nov 2008 13:43:20 -0000 1.14 +++ uncrustify.spec 8 Mar 2009 11:58:37 -0000 1.15 @@ -1,6 +1,6 @@ Name: uncrustify -Version: 0.50 -Release: 2%{?dist} +Version: 0.52 +Release: 1%{?dist} Summary: Reformat Source Group: Development/Tools @@ -43,6 +43,12 @@ %changelog +* Sun Mar 8 2009 Neal Becker - 0.52-1 +- Update to 0.52 + +* Wed Feb 25 2009 Fedora Release Engineering - 0.50-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Nov 3 2008 Neal Becker - 0.50-2 - Documentation fixes From mfleming at fedoraproject.org Sun Mar 8 12:05:08 2009 From: mfleming at fedoraproject.org (Michael Fleming) Date: Sun, 8 Mar 2009 12:05:08 +0000 (UTC) Subject: rpms/mod_geoip/EL-5 .cvsignore, 1.4, 1.5 mod_geoip.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <20090308120508.2549770116@cvs1.fedora.phx.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_geoip/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8748 Modified Files: .cvsignore mod_geoip.spec sources Log Message: * Fri Aug 29 2008 Michael Fleming - 1.2.5-2 - Update setup macro Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/EL-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Oct 2007 11:41:14 -0000 1.4 +++ .cvsignore 8 Mar 2009 12:04:36 -0000 1.5 @@ -1 +1 @@ -mod_geoip2_1.2.0.tar.gz +mod_geoip2_1.2.5.tar.gz Index: mod_geoip.spec =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/EL-5/mod_geoip.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_geoip.spec 28 Oct 2007 11:41:14 -0000 1.4 +++ mod_geoip.spec 8 Mar 2009 12:04:37 -0000 1.5 @@ -1,8 +1,8 @@ Summary: GeoIP module for the Apache HTTP Server Name: mod_geoip -Version: 1.2.0 -Release: 1%{?dist} -License: Apache Software License +Version: 1.2.5 +Release: 2%{?dist} +License: ASL 1.1 Group: System Environment/Daemons URL: http://www.maxmind.com/app/mod_geoip Source: http://www.maxmind.com/download/geoip/api/mod_geoip2/mod_geoip2_%{version}.tar.gz @@ -17,7 +17,7 @@ %prep -%setup -n mod_geoip2_%{version} +%setup -q -n mod_geoip2_%{version} %build /usr/sbin/apxs -Wc,"%{optflags}" -Wl,"-lGeoIP" -c mod_geoip.c @@ -46,6 +46,25 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf %changelog +* Fri Aug 29 2008 Michael Fleming - 1.2.5-2 +- Update setup macro + +* Fri Aug 29 2008 Michael Fleming - 1.2.5-1 +- Update to 1.2.5 + +* Mon Aug 11 2008 Tom "spot" Callaway - 1.2.4-3 +- fix license tag + +* Fri Jun 20 2008 Michael Fleming 1.2.4-2 +- New upstream update +- Minor spec tweaks + +* Sun Apr 13 2008 Michael Fleming 1.2.2-1 +- New upstream update + +* Tue Feb 19 2008 Fedora Release Engineering - 1.2.0-2 +- Autorebuild for GCC 4.3 + * Wed Sep 5 2007 Michael Fleming 1.2.0-1 - New upstream release - Employ some macro sanity.. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/EL-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Oct 2007 11:41:14 -0000 1.4 +++ sources 8 Mar 2009 12:04:37 -0000 1.5 @@ -1 +1 @@ -890f514e817e15d148c7becf8da9781b mod_geoip2_1.2.0.tar.gz +5d35c9a9cbf47c2cb636bed26cd5fa19 mod_geoip2_1.2.5.tar.gz From mfleming at fedoraproject.org Sun Mar 8 12:08:25 2009 From: mfleming at fedoraproject.org (Michael Fleming) Date: Sun, 8 Mar 2009 12:08:25 +0000 (UTC) Subject: rpms/mod_geoip/EL-4 .cvsignore, 1.4, 1.5 mod_geoip.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <20090308120825.6635A70116@cvs1.fedora.phx.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_geoip/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17291 Modified Files: .cvsignore mod_geoip.spec sources Log Message: * Fri Aug 29 2008 Michael Fleming - 1.2.5-2 - Update setup macro Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/EL-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Oct 2007 11:38:55 -0000 1.4 +++ .cvsignore 8 Mar 2009 12:07:54 -0000 1.5 @@ -1 +1 @@ -mod_geoip2_1.2.0.tar.gz +mod_geoip2_1.2.5.tar.gz Index: mod_geoip.spec =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/EL-4/mod_geoip.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_geoip.spec 28 Oct 2007 11:38:55 -0000 1.4 +++ mod_geoip.spec 8 Mar 2009 12:07:54 -0000 1.5 @@ -1,8 +1,8 @@ Summary: GeoIP module for the Apache HTTP Server Name: mod_geoip -Version: 1.2.0 -Release: 1%{?dist} -License: Apache Software License +Version: 1.2.5 +Release: 2%{?dist} +License: ASL 1.1 Group: System Environment/Daemons URL: http://www.maxmind.com/app/mod_geoip Source: http://www.maxmind.com/download/geoip/api/mod_geoip2/mod_geoip2_%{version}.tar.gz @@ -17,7 +17,7 @@ %prep -%setup -n mod_geoip2_%{version} +%setup -q -n mod_geoip2_%{version} %build /usr/sbin/apxs -Wc,"%{optflags}" -Wl,"-lGeoIP" -c mod_geoip.c @@ -46,6 +46,25 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf %changelog +* Fri Aug 29 2008 Michael Fleming - 1.2.5-2 +- Update setup macro + +* Fri Aug 29 2008 Michael Fleming - 1.2.5-1 +- Update to 1.2.5 + +* Mon Aug 11 2008 Tom "spot" Callaway - 1.2.4-3 +- fix license tag + +* Fri Jun 20 2008 Michael Fleming 1.2.4-2 +- New upstream update +- Minor spec tweaks + +* Sun Apr 13 2008 Michael Fleming 1.2.2-1 +- New upstream update + +* Tue Feb 19 2008 Fedora Release Engineering - 1.2.0-2 +- Autorebuild for GCC 4.3 + * Wed Sep 5 2007 Michael Fleming 1.2.0-1 - New upstream release - Employ some macro sanity.. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/EL-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Oct 2007 11:38:55 -0000 1.4 +++ sources 8 Mar 2009 12:07:54 -0000 1.5 @@ -1 +1 @@ -890f514e817e15d148c7becf8da9781b mod_geoip2_1.2.0.tar.gz +5d35c9a9cbf47c2cb636bed26cd5fa19 mod_geoip2_1.2.5.tar.gz From lkundrak at fedoraproject.org Sun Mar 8 12:10:09 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 8 Mar 2009 12:10:09 +0000 (UTC) Subject: rpms/kerneloops/devel kerneloops.spec,1.16,1.17 Message-ID: <20090308121009.B85EB70116@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/kerneloops/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24407 Modified Files: kerneloops.spec Log Message: * Sun Mar 08 2009 Lubomir Rintel 0.12-4 - Don't install the initscript, deinstall if present Index: kerneloops.spec =================================================================== RCS file: /cvs/pkgs/rpms/kerneloops/devel/kerneloops.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- kerneloops.spec 3 Mar 2009 20:50:44 -0000 1.16 +++ kerneloops.spec 8 Mar 2009 12:09:39 -0000 1.17 @@ -1,6 +1,6 @@ Name: kerneloops Version: 0.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool to automatically collect and submit kernel crash signatures Group: System Environment/Base @@ -48,14 +48,10 @@ make clean rm -rf $RPM_BUILD_ROOT -%post -/sbin/chkconfig --add %{name} +%pre +/sbin/service %{name} stop >/dev/null 2>&1 ||: +/sbin/chkconfig --del %{name} >/dev/null 2>&1 ||: -%preun -if [ $1 -eq 0 ]; then - /sbin/service %{name} stop > /dev/null 2>&1 - /sbin/chkconfig --del %{name} -fi %files -f %{name}.lang %defattr(-,root,root) @@ -70,6 +66,9 @@ %doc %{_mandir}/man8/kerneloops.8.gz %changelog +* Sun Mar 08 2009 Lubomir Rintel 0.12-4 +- Don't install the initscript, deinstall if present + * Tue Mar 03 2009 Bill Nottingham 0.12-3 - system-activate the service, don't use an initscript From drago01 at fedoraproject.org Sun Mar 8 12:21:32 2009 From: drago01 at fedoraproject.org (Adel Gadllah) Date: Sun, 8 Mar 2009 12:21:32 +0000 (UTC) Subject: rpms/fsarchiver/devel fsarchiver.spec,1.4,1.5 Message-ID: <20090308122132.BE0DD70116@cvs1.fedora.phx.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/fsarchiver/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29589 Modified Files: fsarchiver.spec Log Message: fix build (remove no more exiting file) Index: fsarchiver.spec =================================================================== RCS file: /cvs/pkgs/rpms/fsarchiver/devel/fsarchiver.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fsarchiver.spec 8 Mar 2009 10:56:02 -0000 1.4 +++ fsarchiver.spec 8 Mar 2009 12:21:01 -0000 1.5 @@ -47,13 +47,17 @@ %files %defattr(-,root,root,-) %{_sbindir}/%{name} -%doc COPYING README THANKS NEWS MULTITHREADING +%doc COPYING README THANKS NEWS %changelog -* Sun Mar 07 2009 Adel Gadllah - 0.4.4 +* Sun Mar 07 2009 Adel Gadllah - 0.4.4-2 +- Fix file section +- Fix changelog + +* Sun Mar 07 2009 Adel Gadllah - 0.4.4-1 - Update to 0.4.4 -* Sat Feb 28 2009 Adel Gadllah - 0.4.3 +* Sat Feb 28 2009 Adel Gadllah - 0.4.3-1 - 0.4.3 - Drop build patch, no longer needed From nbecker at fedoraproject.org Sun Mar 8 12:27:40 2009 From: nbecker at fedoraproject.org (Neal Becker) Date: Sun, 8 Mar 2009 12:27:40 +0000 (UTC) Subject: rpms/uncrustify/F-9 sources,1.11,1.12 uncrustify.spec,1.14,1.15 Message-ID: <20090308122740.493D670116@cvs1.fedora.phx.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/uncrustify/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30878 Modified Files: sources uncrustify.spec Log Message: update to 0.52 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/uncrustify/F-9/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 3 Nov 2008 13:31:50 -0000 1.11 +++ sources 8 Mar 2009 12:27:09 -0000 1.12 @@ -1 +1 @@ -02c3aebe0ee486a4ca8bea7b927ad4a4 uncrustify-0.50.tgz +9e94f7e3e5e260d93d0e253418f95502 uncrustify-0.52.tgz Index: uncrustify.spec =================================================================== RCS file: /cvs/pkgs/rpms/uncrustify/F-9/uncrustify.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- uncrustify.spec 3 Nov 2008 13:43:58 -0000 1.14 +++ uncrustify.spec 8 Mar 2009 12:27:09 -0000 1.15 @@ -1,6 +1,6 @@ Name: uncrustify -Version: 0.50 -Release: 2%{?dist} +Version: 0.52 +Release: 1%{?dist} Summary: Reformat Source Group: Development/Tools @@ -43,6 +43,12 @@ %changelog +* Sun Mar 8 2009 Neal Becker - 0.52-1 +- Update to 0.52 + +* Wed Feb 25 2009 Fedora Release Engineering - 0.50-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Nov 3 2008 Neal Becker - 0.50-2 - Documentation fixes From drago01 at fedoraproject.org Sun Mar 8 12:38:12 2009 From: drago01 at fedoraproject.org (Adel Gadllah) Date: Sun, 8 Mar 2009 12:38:12 +0000 (UTC) Subject: rpms/fsarchiver/devel fsarchiver.spec,1.5,1.6 Message-ID: <20090308123813.6ABFD70116@cvs1.fedora.phx.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/fsarchiver/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv439 Modified Files: fsarchiver.spec Log Message: really bump release Index: fsarchiver.spec =================================================================== RCS file: /cvs/pkgs/rpms/fsarchiver/devel/fsarchiver.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fsarchiver.spec 8 Mar 2009 12:21:01 -0000 1.5 +++ fsarchiver.spec 8 Mar 2009 12:37:39 -0000 1.6 @@ -1,6 +1,6 @@ Name: fsarchiver Version: 0.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Safe and flexible file-system backup/deployment tool Group: Applications/Archiving From ensc at fedoraproject.org Sun Mar 8 12:47:51 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sun, 8 Mar 2009 12:47:51 +0000 (UTC) Subject: rpms/clamav/devel clamav-0.95rc1-umask.patch, NONE, 1.1 README.fedora, 1.1, 1.2 clamav-milter.sysv, 1.1, 1.2 clamav-milter.upstart, 1.1, 1.2 clamav.spec, 1.81, 1.82 clamd-wrapper, 1.4, 1.5 clamd.scan.upstart, 1.1, 1.2 Message-ID: <20090308124751.E626B70116@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2018 Modified Files: README.fedora clamav-milter.sysv clamav-milter.upstart clamav.spec clamd-wrapper clamd.scan.upstart Added Files: clamav-0.95rc1-umask.patch Log Message: updated clamav-0.95rc1-umask.patch: --- NEW FILE clamav-0.95rc1-umask.patch --- Index: clamav-0.95rc1/clamav-milter/clamav-milter.c =================================================================== --- clamav-0.95rc1.orig/clamav-milter/clamav-milter.c +++ clamav-0.95rc1/clamav-milter/clamav-milter.c @@ -287,7 +287,7 @@ int main(int argc, char **argv) { if((opt = optget(opts, "PidFile"))->enabled) { FILE *fd; - mode_t old_umask = umask(0006); + mode_t old_umask = umask(0022); if((fd = fopen(opt->strarg, "w")) == NULL) { logg("!Can't save PID in file %s\n", opt->strarg); Index: clamav-0.95rc1/shared/output.c =================================================================== --- clamav-0.95rc1.orig/shared/output.c +++ clamav-0.95rc1/shared/output.c @@ -250,7 +250,7 @@ int logg(const char *str, ...) #endif if(logg_file) { if(!logg_fp) { - old_umask = umask(0037); + old_umask = umask(0077); if((logg_fp = fopen(logg_file, "at")) == NULL) { umask(old_umask); #ifdef CL_THREAD_SAFE Index: clamav-0.95rc1/freshclam/freshclam.c =================================================================== --- clamav-0.95rc1.orig/freshclam/freshclam.c +++ clamav-0.95rc1/freshclam/freshclam.c @@ -102,7 +102,7 @@ static void writepid(const char *pidfile { FILE *fd; int old_umask; - old_umask = umask(0006); + old_umask = umask(0022); if((fd = fopen(pidfile, "w")) == NULL) { logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); } else { Index: README.fedora =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/README.fedora,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README.fedora 1 Jan 2008 13:19:16 -0000 1.1 +++ README.fedora 8 Mar 2009 12:47:20 -0000 1.2 @@ -1,5 +1,42 @@ -Add +A clamav-milter setup consists of the following three components: - INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl +* the clamav-milter itself -to your sendmail.mc. + --> this is provided by the 'clamav-milter' package plus (alternatively) + 'clamav-milter-upstart' or 'clamav-milter-sysvinit' + + The main configuration is in /etc/mail/clamav-milter.conf and MUST + be changed before first use. + + The -sysvinit package is managed by the traditional tools, but + -upstart requires modification of /etc/event.d/clamav-milter to + enable automatic startup. See comments there for more details. + +* a clamav scanner daemon + + --> this package is called 'clamav-scanner' plus (alternatively) + 'clamav-scanner-upstart' or 'clamav-scanner-sysvinit' + + The daemon is configured by /etc/clamd.d/scan.conf (which MUST be + edited before first use). + + The -sysvinit package is managed by the traditional tools, but + -upstart requires modification of /etc/event.d/clamd.scan to enable + automatic startup. See comments there for more details. + +* the MDA (sendmail/postfix) + + --> you should know how to install this... + + When communicating across unix sockets with the clamav-milter, it is + suggested to use the /var/run/clamav-milter/clamav.sock path. You + have to add something like + + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl + + to your sendmail.mc. + + + +It is suggested that components communicate through TCP sockets as +this eases setup. Please add corresponding packet filter rules! Index: clamav-milter.sysv =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav-milter.sysv,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clamav-milter.sysv 8 Mar 2009 11:38:35 -0000 1.1 +++ clamav-milter.sysv 8 Mar 2009 12:47:20 -0000 1.2 @@ -11,7 +11,7 @@ exec=/usr/sbin/clamav-milter prog="clamav-milter" -OPTS= +OPTS='-c /etc/mail/clamav-milter.conf' [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog pidfile=/var/run/clamav-milter/milter.pid @@ -21,8 +21,7 @@ [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " - daemon --pidfile=${pidfile} \ - $exec $OPTS --nofork=no --pid=${pidfile} && success || failure + daemon --pidfile=${pidfile} $exec $OPTS --nofork=no --pid=${pidfile} retval=$? echo [ $retval -eq 0 ] && touch $lockfile @@ -31,7 +30,7 @@ stop() { echo -n $"Stopping $prog: " - killproc -o "${pidfile} $exec && success || failure + killproc -p "${pidfile}" $exec retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile @@ -53,7 +52,7 @@ rh_status() { # run checks to determine if the service is running or use generic status - status $prog + status -p "${pidfile}" $prog } rh_status_q() { Index: clamav-milter.upstart =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav-milter.upstart,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clamav-milter.upstart 8 Mar 2009 11:38:36 -0000 1.1 +++ clamav-milter.upstart 8 Mar 2009 12:47:20 -0000 1.2 @@ -16,4 +16,4 @@ stop on runlevel 6 respawn -exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter --nofork=yes +exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf --nofork=yes Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- clamav.spec 8 Mar 2009 11:38:36 -0000 1.81 +++ clamav.spec 8 Mar 2009 12:47:20 -0000 1.82 @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95 -Release: %release_func 0.0.1%{?snapshot:.%snapshot} +Release: %release_func 0.0.3%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -46,6 +46,7 @@ Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch Patch26: clamav-0.95-cliopts.patch +Patch27: clamav-0.95rc1-umask.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -310,6 +311,7 @@ %patch24 -p1 -b .private %patch25 -p1 -b .open %patch26 -p1 -b .cliopts +%patch27 -p1 -b .umask install -p -m0644 %SOURCE300 clamav-milter/ @@ -422,7 +424,7 @@ ### The scanner stuff sed -e 's!!scan!g;s!!%scanuser!g' \ - etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/clamd.scan + etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf sed -e 's!!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ > $RPM_BUILD_ROOT%_initrddir/clamd.scan @@ -629,7 +631,7 @@ %files scanner %defattr(-,root,root,-) %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%config(noreplace) %_sysconfdir/clamd.d/clamd.scan +%config(noreplace) %_sysconfdir/clamd.d/scan.conf %ghost %scanstatedir/clamd.sock %files scanner-sysvinit Index: clamd-wrapper =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamd-wrapper,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- clamd-wrapper 8 Mar 2009 11:38:36 -0000 1.4 +++ clamd-wrapper 8 Mar 2009 12:47:21 -0000 1.5 @@ -51,7 +51,7 @@ stop () { echo -n $"Stopping $prog: " - killproc $procname + killproc -p ${CLAMD_PIDFILE} $procname RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $lockfile @@ -79,7 +79,7 @@ start|stop|restart|reload) $1 ;; status) - status $procname ;; + status -p ${CLAMD_PIDFILE} $procname ;; condrestart) test ! -f $lockfile || restart ;; Index: clamd.scan.upstart =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamd.scan.upstart,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clamd.scan.upstart 8 Mar 2009 11:38:36 -0000 1.1 +++ clamd.scan.upstart 8 Mar 2009 12:47:21 -0000 1.2 @@ -12,4 +12,4 @@ stop on runlevel 6 respawn -exec /usr/sbin/clamd -c /etc/clamd.d/clamd.scan --nofork=yes +exec /usr/sbin/clamd -c /etc/clamd.d/scan.conf --nofork=yes From rakesh at fedoraproject.org Sun Mar 8 12:49:46 2009 From: rakesh at fedoraproject.org (Rakesh Pandit) Date: Sun, 8 Mar 2009 12:49:46 +0000 (UTC) Subject: rpms/anjuta/devel anjuta.spec,1.67,1.68 Message-ID: <20090308124946.9D2BA70119@cvs1.fedora.phx.redhat.com> Author: rakesh Update of /cvs/pkgs/rpms/anjuta/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2649 Modified Files: anjuta.spec Log Message: Bumped to consume new soname in webkit library. Index: anjuta.spec =================================================================== RCS file: /cvs/pkgs/rpms/anjuta/devel/anjuta.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- anjuta.spec 26 Feb 2009 21:21:12 -0000 1.67 +++ anjuta.spec 8 Mar 2009 12:49:15 -0000 1.68 @@ -2,7 +2,7 @@ Name: anjuta Epoch: 1 Version: 2.25.902 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Development/Tools URL: http://www.anjuta.org/ @@ -309,6 +309,9 @@ %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf %changelog +* Sun Mar 08 2009 Rakesh Pandit - 1:2.25.902-6 +- Bumped to consume new soname in webkit library. + * Wed Feb 27 2009 Debarshi Ray - 1:2.25.902-5 - Added 'Provides: perl(GBF::Make)'. Imported from gnome-build. (Red Hat Bugzilla #486530) From ensc at fedoraproject.org Sun Mar 8 12:53:34 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sun, 8 Mar 2009 12:53:34 +0000 (UTC) Subject: rpms/clamav/devel clamav.spec,1.82,1.83 Message-ID: <20090308125334.2447870116@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4033 Modified Files: clamav.spec Log Message: updated Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- clamav.spec 8 Mar 2009 12:47:20 -0000 1.82 +++ clamav.spec 8 Mar 2009 12:53:03 -0000 1.83 @@ -134,8 +134,8 @@ Group: System Environment/Daemons BuildArch: noarch Requires: init(clamav-scanner) -Provides: user(%scanuser) = 99 -Provides: group(%scanuser) = 99 +Provides: user(%scanuser) = 49 +Provides: group(%scanuser) = 49 Requires: clamav-server = %version-%release %package scanner-sysvinit From rakesh at fedoraproject.org Sun Mar 8 13:11:38 2009 From: rakesh at fedoraproject.org (Rakesh Pandit) Date: Sun, 8 Mar 2009 13:11:38 +0000 (UTC) Subject: rpms/devhelp/devel devhelp.spec,1.107,1.108 Message-ID: <20090308131138.F3B4A70116@cvs1.fedora.phx.redhat.com> Author: rakesh Update of /cvs/pkgs/rpms/devhelp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7459 Modified Files: devhelp.spec Log Message: Bumped to consume new soname in webkit library. Index: devhelp.spec =================================================================== RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- devhelp.spec 24 Feb 2009 11:33:30 -0000 1.107 +++ devhelp.spec 8 Mar 2009 13:11:08 -0000 1.108 @@ -6,7 +6,7 @@ Name: devhelp Version: 0.23 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Development/Tools Summary: API documention browser @@ -137,6 +137,9 @@ %{_libdir}/pkgconfig/* %changelog +* Sun Mar 08 2009 Rakesh Pandit - 0.23-6 +Bumped to consume new soname in webkit library. + * Tue Feb 24 2009 Fedora Release Engineering - 0.23-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ensc at fedoraproject.org Sun Mar 8 13:24:37 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sun, 8 Mar 2009 13:24:37 +0000 (UTC) Subject: rpms/clamav/devel clamav.spec,1.83,1.84 clamd-wrapper,1.5,1.6 Message-ID: <20090308132437.CE44D70116@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10729 Modified Files: clamav.spec clamd-wrapper Log Message: updated Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- clamav.spec 8 Mar 2009 12:53:03 -0000 1.83 +++ clamav.spec 8 Mar 2009 13:24:06 -0000 1.84 @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95 -Release: %release_func 0.0.3%{?snapshot:.%snapshot} +Release: %release_func 0.1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File Index: clamd-wrapper =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamd-wrapper,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- clamd-wrapper 8 Mar 2009 12:47:21 -0000 1.5 +++ clamd-wrapper 8 Mar 2009 13:24:07 -0000 1.6 @@ -42,7 +42,8 @@ start () { echo -n $"Starting $prog: " daemon --pidfile=${CLAMD_PIDFILE} \ - $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} + exec -a $procname /usr/sbin/clamd \ + ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile From rathann at fedoraproject.org Sun Mar 8 14:08:35 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Sun, 8 Mar 2009 14:08:35 +0000 (UTC) Subject: rpms/gsm/EL-5 gsm.spec,1.2,1.3 Message-ID: <20090308140836.5AE6C70116@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/gsm/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18573 Modified Files: gsm.spec Log Message: * Sun Mar 08 2009 Dominik Mierzejewski 1.0.12-4 - install symlinks instead of binaries in -devel - specfile cleanups Index: gsm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gsm/EL-5/gsm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gsm.spec 13 May 2007 11:29:23 -0000 1.2 +++ gsm.spec 8 Mar 2009 14:08:02 -0000 1.3 @@ -1,6 +1,6 @@ Name: gsm Version: 1.0.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Shared libraries for GSM speech compressor Group: System Environment/Libraries @@ -77,17 +77,19 @@ GSM_INSTALL_INC=$RPM_BUILD_ROOT%{_includedir}/gsm \ GSM_INSTALL_LIB=$RPM_BUILD_ROOT%{_libdir} -cp -prv $RPM_BUILD_DIR/gsm-%{srcver}/lib/*.so* $RPM_BUILD_ROOT%{_libdir} +cp -p $RPM_BUILD_DIR/gsm-%{srcver}/lib/libgsm.so.%{version} $RPM_BUILD_ROOT%{_libdir} +ln -s libgsm.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libgsm.so.1 +ln -s libgsm.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libgsm.so # some apps look for this in /usr/include ln -s gsm/gsm.h $RPM_BUILD_ROOT%{_includedir} -rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a %check # This is to ensure that the patch creates the proper library version. -[ -f ${RPM_BUILD_ROOT}%{_libdir}/libgsm.so.%{version} ] +[ -f $RPM_BUILD_ROOT%{_libdir}/libgsm.so.%{version} ] make addtst @@ -118,6 +120,10 @@ %{_mandir}/man3/* %changelog +* Sun Mar 08 2009 Dominik Mierzejewski 1.0.12-4 +- install symlinks instead of binaries in -devel +- specfile cleanups + * Sun May 13 2007 Dominik Mierzejewski 1.0.12-3 - fix parallel make From rathann at fedoraproject.org Sun Mar 8 14:36:28 2009 From: rathann at fedoraproject.org (Dominik Mierzejewski) Date: Sun, 8 Mar 2009 14:36:28 +0000 (UTC) Subject: rpms/gsm/EL-4 gsm.spec,1.6,1.7 Message-ID: <20090308143629.6478870116@cvs1.fedora.phx.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/gsm/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24227 Modified Files: gsm.spec Log Message: - sync with EL-5 branch Index: gsm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gsm/EL-4/gsm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gsm.spec 25 Feb 2009 01:23:27 -0000 1.6 +++ gsm.spec 8 Mar 2009 14:35:56 -0000 1.7 @@ -1,6 +1,6 @@ Name: gsm Version: 1.0.12 -Release: 7%{?dist} +Release: 4%{?dist} Summary: Shared libraries for GSM speech compressor Group: System Environment/Libraries @@ -120,17 +120,8 @@ %{_mandir}/man3/* %changelog -* Tue Feb 24 2009 Fedora Release Engineering - 1.0.12-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 11 2008 Jeffrey C. Ollie - 1.0.12-6 -- Rebuild for GCC 4.3 - -* Sun Aug 26 2007 Dominik Mierzejewski 1.0.12-5 +* Sun Mar 08 2009 Dominik Mierzejewski 1.0.12-4 - install symlinks instead of binaries in -devel - -* Sat Aug 25 2007 Dominik Mierzejewski 1.0.12-4 -- rebuild for BuildID - specfile cleanups * Sun May 13 2007 Dominik Mierzejewski 1.0.12-3 From ensc at fedoraproject.org Sun Mar 8 14:50:10 2009 From: ensc at fedoraproject.org (Enrico Scholz) Date: Sun, 8 Mar 2009 14:50:10 +0000 (UTC) Subject: rpms/clamav/devel README.fedora, 1.2, 1.3 clamav-milter.upstart, 1.2, 1.3 Message-ID: <20090308145011.6B4C170116@cvs1.fedora.phx.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26821 Modified Files: README.fedora clamav-milter.upstart Log Message: updated Index: README.fedora =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/README.fedora,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README.fedora 8 Mar 2009 12:47:20 -0000 1.2 +++ README.fedora 8 Mar 2009 14:49:39 -0000 1.3 @@ -24,7 +24,7 @@ -upstart requires modification of /etc/event.d/clamd.scan to enable automatic startup. See comments there for more details. -* the MDA (sendmail/postfix) +* the MTA (sendmail/postfix) --> you should know how to install this... Index: clamav-milter.upstart =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav-milter.upstart,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- clamav-milter.upstart 8 Mar 2009 12:47:20 -0000 1.2 +++ clamav-milter.upstart 8 Mar 2009 14:49:39 -0000 1.3 @@ -1,13 +1,13 @@ ### Uncomment these lines when you want clamav-milter to be a milter -### for a locally running MDA +### for a locally running MTA #start on starting\ sendmail #start on starting sendmail #start on starting\ postfix #start on starting postfix ### Uncomment these lines when you want clamav-milter to be a milter -### for a remotely running MDA +### for a remotely running MTA #start on starting\ local #start on starting local From lspooky at fedoraproject.org Sun Mar 8 15:03:21 2009 From: lspooky at fedoraproject.org (Henrique Junior) Date: Sun, 8 Mar 2009 15:03:21 +0000 (UTC) Subject: rpms/bkchem/F-9 .cvsignore, 1.4, 1.5 bkchem.spec, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <20090308150322.31A5070116@cvs1.fedora.phx.redhat.com> Author: lspooky Update of /cvs/pkgs/rpms/bkchem/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29879/F-9 Modified Files: .cvsignore bkchem.spec import.log sources Log Message: One step back due to an bug in upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Feb 2009 01:42:32 -0000 1.4 +++ .cvsignore 8 Mar 2009 15:02:49 -0000 1.5 @@ -1 +1 @@ -bkchem-0.13.0.tar.gz +bkchem-0.12.6.tar.gz Index: bkchem.spec =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-9/bkchem.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bkchem.spec 27 Feb 2009 01:42:32 -0000 1.3 +++ bkchem.spec 8 Mar 2009 15:02:49 -0000 1.4 @@ -2,13 +2,13 @@ Name: bkchem Version: 0.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Chemical drawing program Group: Applications/Engineering License: GPLv2+ and GFDL URL: http://bkchem.zirael.org/ Group: Applications/Engineering -Source0: http://bkchem.zirael.org/download/%{name}-%{version}.tar.gz +Source0: http://bkchem.zirael.org/download/%{name}-0.12.6.tar.gz Source1: %{name}.desktop Patch1: bkchem-setup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,7 +21,7 @@ written by Beda Kosata. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-0.12.6 %patch1 -p1 -b .bkchem-setup %{__rm} -rf %{_builddir}/%{name}-%{version}/%{name}/oasa %{__rm} -f %{_builddir}/%{name}-%{version}/%{name}/Pmw*.py @@ -61,11 +61,8 @@ %{python_sitelib}/%{name}* %changelog -* Thu Feb 24 2009 Henrique (LonelySpooky) Junior - 0.13.0-1 -- InChI generation is now compatibile with old InChI versions (1.0 and 1.0.1) -double bonds in 3D rotated molecules look much better now (z-coordinate is taken -into account when the bond is drawn) - +* Tue Feb 19 2009 Henrique (LonelySpooky) Junior - 0.13.0-2 +- One step back to solve one bug * Tue Feb 19 2009 Henrique (LonelySpooky) Junior - 0.12.6-1 - This release brings new options for 3D rotation - ability to fix one bond and rotate Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-9/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 27 Feb 2009 01:42:32 -0000 1.3 +++ import.log 8 Mar 2009 15:02:49 -0000 1.4 @@ -1,3 +1,4 @@ bkchem-0_12_5-4_fc10:F-9:bkchem-0.12.5-4.fc10.src.rpm:1230769551 bkchem-0_12_6-1_fc10:F-9:bkchem-0.12.6-1.fc10.src.rpm:1235069144 bkchem-0_13_0-1_fc10:F-9:bkchem-0.13.0-1.fc10.src.rpm:1235698722 +bkchem-0_13_0-2_fc10:F-9:bkchem-0.13.0-2.fc10.src.rpm:1236524476 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Feb 2009 01:42:32 -0000 1.4 +++ sources 8 Mar 2009 15:02:49 -0000 1.5 @@ -1 +1 @@ -41c55059794399526f4f6fc74af556bb bkchem-0.13.0.tar.gz +50718a160887985814f5b3b1377b30c9 bkchem-0.12.6.tar.gz From lspooky at fedoraproject.org Sun Mar 8 15:06:03 2009 From: lspooky at fedoraproject.org (Henrique Junior) Date: Sun, 8 Mar 2009 15:06:03 +0000 (UTC) Subject: rpms/bkchem/F-10 .cvsignore, 1.4, 1.5 bkchem.spec, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <20090308150604.0E4C970116@cvs1.fedora.phx.redhat.com> Author: lspooky Update of /cvs/pkgs/rpms/bkchem/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30406/F-10 Modified Files: .cvsignore bkchem.spec import.log sources Log Message: One step back due to an bug in upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-10/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Feb 2009 01:45:05 -0000 1.4 +++ .cvsignore 8 Mar 2009 15:05:32 -0000 1.5 @@ -1 +1 @@ -bkchem-0.13.0.tar.gz +bkchem-0.12.6.tar.gz Index: bkchem.spec =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-10/bkchem.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bkchem.spec 27 Feb 2009 01:45:05 -0000 1.3 +++ bkchem.spec 8 Mar 2009 15:05:32 -0000 1.4 @@ -2,13 +2,13 @@ Name: bkchem Version: 0.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Chemical drawing program Group: Applications/Engineering License: GPLv2+ and GFDL URL: http://bkchem.zirael.org/ Group: Applications/Engineering -Source0: http://bkchem.zirael.org/download/%{name}-%{version}.tar.gz +Source0: http://bkchem.zirael.org/download/%{name}-0.12.6.tar.gz Source1: %{name}.desktop Patch1: bkchem-setup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,7 +21,7 @@ written by Beda Kosata. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-0.12.6 %patch1 -p1 -b .bkchem-setup %{__rm} -rf %{_builddir}/%{name}-%{version}/%{name}/oasa %{__rm} -f %{_builddir}/%{name}-%{version}/%{name}/Pmw*.py @@ -61,11 +61,8 @@ %{python_sitelib}/%{name}* %changelog -* Thu Feb 24 2009 Henrique (LonelySpooky) Junior - 0.13.0-1 -- InChI generation is now compatibile with old InChI versions (1.0 and 1.0.1) -double bonds in 3D rotated molecules look much better now (z-coordinate is taken -into account when the bond is drawn) - +* Tue Feb 19 2009 Henrique (LonelySpooky) Junior - 0.13.0-2 +- One step back to solve one bug * Tue Feb 19 2009 Henrique (LonelySpooky) Junior - 0.12.6-1 - This release brings new options for 3D rotation - ability to fix one bond and rotate Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-10/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 27 Feb 2009 01:45:05 -0000 1.3 +++ import.log 8 Mar 2009 15:05:33 -0000 1.4 @@ -1,3 +1,4 @@ bkchem-0_12_5-4_fc10:F-10:bkchem-0.12.5-4.fc10.src.rpm:1230770905 bkchem-0_12_6-1_fc10:F-10:bkchem-0.12.6-1.fc10.src.rpm:1235069342 bkchem-0_13_0-1_fc10:F-10:bkchem-0.13.0-1.fc10.src.rpm:1235698985 +bkchem-0_13_0-2_fc10:F-10:bkchem-0.13.0-2.fc10.src.rpm:1236524613 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Feb 2009 01:45:05 -0000 1.4 +++ sources 8 Mar 2009 15:05:33 -0000 1.5 @@ -1 +1 @@ -41c55059794399526f4f6fc74af556bb bkchem-0.13.0.tar.gz +50718a160887985814f5b3b1377b30c9 bkchem-0.12.6.tar.gz From lspooky at fedoraproject.org Sun Mar 8 15:09:22 2009 From: lspooky at fedoraproject.org (Henrique Junior) Date: Sun, 8 Mar 2009 15:09:22 +0000 (UTC) Subject: rpms/bkchem/devel .cvsignore, 1.4, 1.5 bkchem.spec, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <20090308150922.5932C70116@cvs1.fedora.phx.redhat.com> Author: lspooky Update of /cvs/pkgs/rpms/bkchem/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31195/devel Modified Files: .cvsignore bkchem.spec import.log sources Log Message: One step back due to an bug in upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Feb 2009 01:47:48 -0000 1.4 +++ .cvsignore 8 Mar 2009 15:08:51 -0000 1.5 @@ -1 +1 @@ -bkchem-0.13.0.tar.gz +bkchem-0.12.6.tar.gz Index: bkchem.spec =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/devel/bkchem.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bkchem.spec 27 Feb 2009 01:47:48 -0000 1.4 +++ bkchem.spec 8 Mar 2009 15:08:51 -0000 1.5 @@ -2,13 +2,13 @@ Name: bkchem Version: 0.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Chemical drawing program Group: Applications/Engineering License: GPLv2+ and GFDL URL: http://bkchem.zirael.org/ Group: Applications/Engineering -Source0: http://bkchem.zirael.org/download/%{name}-%{version}.tar.gz +Source0: http://bkchem.zirael.org/download/%{name}-0.12.6.tar.gz Source1: %{name}.desktop Patch1: bkchem-setup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,7 +21,7 @@ written by Beda Kosata. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-0.12.6 %patch1 -p1 -b .bkchem-setup %{__rm} -rf %{_builddir}/%{name}-%{version}/%{name}/oasa %{__rm} -f %{_builddir}/%{name}-%{version}/%{name}/Pmw*.py @@ -61,11 +61,8 @@ %{python_sitelib}/%{name}* %changelog -* Thu Feb 24 2009 Henrique (LonelySpooky) Junior - 0.13.0-1 -- InChI generation is now compatibile with old InChI versions (1.0 and 1.0.1) -double bonds in 3D rotated molecules look much better now (z-coordinate is taken -into account when the bond is drawn) - +* Tue Feb 19 2009 Henrique (LonelySpooky) Junior - 0.13.0-2 +- One step back to solve one bug * Tue Feb 19 2009 Henrique (LonelySpooky) Junior - 0.12.6-1 - This release brings new options for 3D rotation - ability to fix one bond and rotate Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/devel/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 27 Feb 2009 01:47:48 -0000 1.3 +++ import.log 8 Mar 2009 15:08:51 -0000 1.4 @@ -1,3 +1,4 @@ bkchem-0_12_5-4_fc10:HEAD:bkchem-0.12.5-4.fc10.src.rpm:1230773042 bkchem-0_12_6-1_fc10:HEAD:bkchem-0.12.6-1.fc10.src.rpm:1235069569 bkchem-0_13_0-1_fc10:HEAD:bkchem-0.13.0-1.fc10.src.rpm:1235699163 +bkchem-0_13_0-2_fc10:HEAD:bkchem-0.13.0-2.fc10.src.rpm:1236524763 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Feb 2009 01:47:48 -0000 1.4 +++ sources 8 Mar 2009 15:08:51 -0000 1.5 @@ -1 +1 @@ -41c55059794399526f4f6fc74af556bb bkchem-0.13.0.tar.gz +50718a160887985814f5b3b1377b30c9 bkchem-0.12.6.tar.gz From lspooky at fedoraproject.org Sun Mar 8 15:13:17 2009 From: lspooky at fedoraproject.org (Henrique Junior) Date: Sun, 8 Mar 2009 15:13:17 +0000 (UTC) Subject: rpms/python-oasa/F-9 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 python-oasa.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <20090308151317.DDA8870116@cvs1.fedora.phx.redhat.com> Author: lspooky Update of /cvs/pkgs/rpms/python-oasa/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31939/F-9 Modified Files: .cvsignore import.log python-oasa.spec sources Log Message: One step back due to an bug in upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-oasa/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Feb 2009 01:51:48 -0000 1.4 +++ .cvsignore 8 Mar 2009 15:12:47 -0000 1.5 @@ -1 +1 @@ -oasa-0.13.0.tar.gz +oasa-0.12.7.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/python-oasa/F-9/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 27 Feb 2009 01:51:48 -0000 1.3 +++ import.log 8 Mar 2009 15:12:47 -0000 1.4 @@ -1,3 +1,4 @@ python-oasa-0_12_5-1_fc10:F-9:python-oasa-0.12.5-1.fc10.src.rpm:1230771610 python-oasa-0_12_7-1_fc10:F-9:python-oasa-0.12.7-1.fc10.src.rpm:1235064084 python-oasa-0_13_0-1_fc10:F-9:python-oasa-0.13.0-1.fc10.src.rpm:1235699425 +python-oasa-0_13_0-2_fc10:F-9:python-oasa-0.13.0-2.fc10.src.rpm:1236525039 Index: python-oasa.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-oasa/F-9/python-oasa.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-oasa.spec 27 Feb 2009 01:51:48 -0000 1.3 +++ python-oasa.spec 8 Mar 2009 15:12:47 -0000 1.4 @@ -2,12 +2,12 @@ Name: python-oasa Version: 0.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python library for manipulation of chemical formats Group: Development/Libraries License: GPLv2+ URL: http://bkchem.zirael.org -Source0: http://bkchem.zirael.org/download/oasa-%{version}.tar.gz +Source0: http://bkchem.zirael.org/download/oasa-0.12.7.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -18,7 +18,7 @@ %prep -%setup -q -n oasa-%{version} +%setup -q -n oasa-0.12.7 %build @@ -38,26 +38,15 @@ %defattr(-, root ,root, -) %doc PKG-INFO progress.log README %{python_sitelib}/oasa/ -%{python_sitelib}/oasa-%{version}-py*.egg-info +%{python_sitelib}/oasa-*-py*.egg-info %changelog -* Thu Feb 24 2009 Henrique (LonelySpooky) Junior - 0.13.0-1 -- cairo_out - double bonds in 3D rotated molecules look much better (z-coordinate is -taken into account when the bond is drawn) -smiles - smiles encoder did not prefix two digit ring numbers with "%" -graph - SSSR code did not find really smallest rings in case no vertices with -degree 2 were present in the initial drawing (fullerene and such) -molecule - aromatic bond detection uses SSSR instead of all possible rings -when there are more then 10 smallest rings - fixes lockup for fullerene -cairo_out - when scaling != 1 the resulting image was improperly cropped - +* Thu Feb 12 2009 Henrique (LonelySpooky) Junior - 0.13.0-2 +- One step back to solve one bug * Thu Feb 12 2009 Henrique (LonelySpooky) Junior - 0.12.7-1 -- cairo_out - mols_to_cairo and mol_to_cairo convenience functions added -cairo_out - background was not properly painted (thanks to Noel O'Boyle for reporting this) - * Fri Jun 13 2008 Henrique (LonelySpooky) Junior - 0.12.5-1 - initial package Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-oasa/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Feb 2009 01:51:48 -0000 1.4 +++ sources 8 Mar 2009 15:12:47 -0000 1.5 @@ -1 +1 @@ -478649e1483c34061dc0acc83cfef36f oasa-0.13.0.tar.gz +c9a07989eb47c3effc60a451a4cc8c2a oasa-0.12.7.tar.gz From lspooky at fedoraproject.org Sun Mar 8 15:15:11 2009 From: lspooky at fedoraproject.org (Henrique Junior) Date: Sun, 8 Mar 2009 15:15:11 +0000 (UTC) Subject: rpms/python-oasa/F-10 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 python-oasa.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <20090308151511.7184B70116@cvs1.fedora.phx.redhat.com> Author: lspooky Update of /cvs/pkgs/rpms/python-oasa/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32524/F-10 Modified Files: .cvsignore import.log python-oasa.spec sources Log Message: One step back due to an bug in upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-oasa/F-10/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Feb 2009 01:53:38 -0000 1.4 +++ .cvsignore 8 Mar 2009 15:14:40 -0000 1.5 @@ -1 +1 @@ -oasa-0.13.0.tar.gz +oasa-0.12.7.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/python-oasa/F-10/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 27 Feb 2009 01:53:38 -0000 1.3 +++ import.log 8 Mar 2009 15:14:40 -0000 1.4 @@ -1,3 +1,4 @@ python-oasa-0_12_5-1_fc10:F-10:python-oasa-0.12.5-1.fc10.src.rpm:1230772132 python-oasa-0_12_7-1_fc10:F-10:python-oasa-0.12.7-1.fc10.src.rpm:1235064271 python-oasa-0_13_0-1_fc10:F-10:python-oasa-0.13.0-1.fc10.src.rpm:1235699540 +python-oasa-0_13_0-2_fc10:F-10:python-oasa-0.13.0-2.fc10.src.rpm:1236525206 Index: python-oasa.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-oasa/F-10/python-oasa.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-oasa.spec 27 Feb 2009 01:53:38 -0000 1.3 +++ python-oasa.spec 8 Mar 2009 15:14:40 -0000 1.4 @@ -2,12 +2,12 @@ Name: python-oasa Version: 0.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python library for manipulation of chemical formats Group: Development/Libraries License: GPLv2+ URL: http://bkchem.zirael.org -Source0: http://bkchem.zirael.org/download/oasa-%{version}.tar.gz +Source0: http://bkchem.zirael.org/download/oasa-0.12.7.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -18,7 +18,7 @@ %prep -%setup -q -n oasa-%{version} +%setup -q -n oasa-0.12.7 %build @@ -38,26 +38,15 @@ %defattr(-, root ,root, -) %doc PKG-INFO progress.log README %{python_sitelib}/oasa/ -%{python_sitelib}/oasa-%{version}-py*.egg-info +%{python_sitelib}/oasa-*-py*.egg-info %changelog -* Thu Feb 24 2009 Henrique (LonelySpooky) Junior - 0.13.0-1 -- cairo_out - double bonds in 3D rotated molecules look much better (z-coordinate is -taken into account when the bond is drawn) -smiles - smiles encoder did not prefix two digit ring numbers with "%" -graph - SSSR code did not find really smallest rings in case no vertices with -degree 2 were present in the initial drawing (fullerene and such) -molecule - aromatic bond detection uses SSSR instead of all possible rings -when there are more then 10 smallest rings - fixes lockup for fullerene -cairo_out - when scaling != 1 the resulting image was improperly cropped - +* Thu Feb 12 2009 Henrique (LonelySpooky) Junior - 0.13.0-2 +- One step back to solve one bug * Thu Feb 12 2009 Henrique (LonelySpooky) Junior - 0.12.7-1 -- cairo_out - mols_to_cairo and mol_to_cairo convenience functions added -cairo_out - background was not properly painted (thanks to Noel O'Boyle for reporting this) - * Fri Jun 13 2008 Henrique (LonelySpooky) Junior - 0.12.5-1 - initial package Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-oasa/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Feb 2009 01:53:38 -0000 1.4 +++ sources 8 Mar 2009 15:14:41 -0000 1.5 @@ -1 +1 @@ -478649e1483c34061dc0acc83cfef36f oasa-0.13.0.tar.gz +c9a07989eb47c3effc60a451a4cc8c2a oasa-0.12.7.tar.gz From lspooky at fedoraproject.org Sun Mar 8 15:18:06 2009 From: lspooky at fedoraproject.org (Henrique Junior) Date: Sun, 8 Mar 2009 15:18:06 +0000 (UTC) Subject: rpms/python-oasa/devel .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 python-oasa.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <20090308151806.6533B70116@cvs1.fedora.phx.redhat.com> Author: lspooky Update of /cvs/pkgs/rpms/python-oasa/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv657/devel Modified Files: .cvsignore import.log python-oasa.spec sources Log Message: One step back due to an bug in upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-oasa/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Feb 2009 01:55:52 -0000 1.4 +++ .cvsignore 8 Mar 2009 15:17:35 -0000 1.5 @@ -1 +1 @@ -oasa-0.13.0.tar.gz +oasa-0.12.7.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/python-oasa/devel/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 27 Feb 2009 01:55:52 -0000 1.3 +++ import.log 8 Mar 2009 15:17:35 -0000 1.4 @@ -1,3 +1,4 @@ python-oasa-0_12_5-1_fc10:HEAD:python-oasa-0.12.5-1.fc10.src.rpm:1230772621 python-oasa-0_12_7-1_fc10:HEAD:python-oasa-0.12.7-1.fc10.src.rpm:1235064436 python-oasa-0_13_0-1_fc10:HEAD:python-oasa-0.13.0-1.fc10.src.rpm:1235699652 +python-oasa-0_13_0-2_fc10:HEAD:python-oasa-0.13.0-2.fc10.src.rpm:1236525339 Index: python-oasa.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-oasa/devel/python-oasa.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-oasa.spec 27 Feb 2009 01:55:52 -0000 1.4 +++ python-oasa.spec 8 Mar 2009 15:17:35 -0000 1.5 @@ -2,12 +2,12 @@ Name: python-oasa Version: 0.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python library for manipulation of chemical formats Group: Development/Libraries License: GPLv2+ URL: http://bkchem.zirael.org -Source0: http://bkchem.zirael.org/download/oasa-%{version}.tar.gz +Source0: http://bkchem.zirael.org/download/oasa-0.12.7.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -18,7 +18,7 @@ %prep -%setup -q -n oasa-%{version} +%setup -q -n oasa-0.12.7 %build @@ -38,26 +38,15 @@ %defattr(-, root ,root, -) %doc PKG-INFO progress.log README %{python_sitelib}/oasa/ -%{python_sitelib}/oasa-%{version}-py*.egg-info +%{python_sitelib}/oasa-*-py*.egg-info %changelog -* Thu Feb 24 2009 Henrique (LonelySpooky) Junior - 0.13.0-1 -- cairo_out - double bonds in 3D rotated molecules look much better (z-coordinate is -taken into account when the bond is drawn) -smiles - smiles encoder did not prefix two digit ring numbers with "%" -graph - SSSR code did not find really smallest rings in case no vertices with -degree 2 were present in the initial drawing (fullerene and such) -molecule - aromatic bond detection uses SSSR instead of all possible rings -when there are more then 10 smallest rings - fixes lockup for fullerene -cairo_out - when scaling != 1 the resulting image was improperly cropped - +* Thu Feb 12 2009 Henrique (LonelySpooky) Junior - 0.13.0-2 +- One step back to solve one bug * Thu Feb 12 2009 Henrique (LonelySpooky) Junior - 0.12.7-1 -- cairo_out - mols_to_cairo and mol_to_cairo convenience functions added -cairo_out - background was not properly painted (thanks to Noel O'Boyle for reporting this) - * Fri Jun 13 2008 Henrique (LonelySpooky) Junior - 0.12.5-1 - initial package Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-oasa/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Feb 2009 01:55:52 -0000 1.4 +++ sources 8 Mar 2009 15:17:35 -0000 1.5 @@ -1 +1 @@ -478649e1483c34061dc0acc83cfef36f oasa-0.13.0.tar.gz +c9a07989eb47c3effc60a451a4cc8c2a oasa-0.12.7.tar.gz From caolanm at fedoraproject.org Sun Mar 8 15:24:01 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sun, 8 Mar 2009 15:24:01 +0000 (UTC) Subject: rpms/tiger/devel tiger-3.2.1-doc.patch,1.1,1.2 tiger.spec,1.6,1.7 Message-ID: <20090308152401.6162670116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/tiger/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1914 Modified Files: tiger-3.2.1-doc.patch tiger.spec Log Message: defuzz patches to rebuild tiger-3.2.1-doc.patch: Index: tiger-3.2.1-doc.patch =================================================================== RCS file: /cvs/pkgs/rpms/tiger/devel/tiger-3.2.1-doc.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tiger-3.2.1-doc.patch 13 May 2006 21:38:59 -0000 1.1 +++ tiger-3.2.1-doc.patch 8 Mar 2009 15:23:30 -0000 1.2 @@ -1,5 +1,6 @@ ---- tiger-3.2.1.orig/CHANGES -+++ tiger-3.2.1/CHANGES +diff -ru tiger.orig/CHANGES tiger/CHANGES +--- tiger.orig/CHANGES 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/CHANGES 2009-03-08 14:48:36.000000000 +0000 @@ -1,6 +1,15 @@ NOTE: To read changes made to the Debian package (since August 23rd 2001) see the changelog.Debian file @@ -16,192 +17,9 @@ Changes (v 3.2.1) ---------------- - New checks: ---- tiger-3.2.1.orig/TODO.checks -+++ tiger-3.2.1/TODO.checks -@@ -0,0 +1,181 @@ -+This TODO details things that need to be done to improve the current -+security checks implemented in Tiger. -+ -+ -+IMPROVEMENTS -+------------ -+- Modify the rhosts check so that it will check for shosts files too -+ (or create a new check_shosts file) -+ -+- Modify check_network to include hosts.lpd in the tests -+ -+- Add .bash_profile into check_path -+ -+- Add more information to the messages outputed for inetd services which -+ might expose password information (Unix CERT configuration list item #2.4) -+ -+- check_rootkit should also consider analysing modification times of -+ important system files (binaries as well as logfiles). -+ Mtime, atime and ctime should not be in the future and mtime/ctime -+ of binaries should be similar to the time the system was installed -+ (unless it has been patched). Similarly, logfiles should not have -+ similar (almost equal) ctimes. This needs to be carefully planned in -+ order to avoid confusion of logfile rotation vs. a log cleaner though. -+ -+- check_patches for Solaris should generate better messages for security -+ and/or recommended patches (|R|S|). The check needs to be tested for -+ Solaris 9 too. -+ Also check_patches should only output information for packages installed. -+ -+- check_known should be improved to detect for symlink attacks and -+ hard links in user writable directories (/tmp, /var/tmp and, in -+ some systems, /var/spool/mail too, the directory list might be -+ defined in tigerrc or extracted by parsing the file system) -+ -+ -+NEW CHECKS -+----------- -+- Create the following (generic) scripts: -+ -+ - Check root $HOME files (might be redundant with check_path's) -+ - Do alias give the same as check_aliases? -+ - writable/executable check + word writable? (in find_files) -+ - Check for SAMBA configuration (checklist #20 SANS): -+ . encrypted passwords. -+ . 600 /etc/smbpasswd or /etc/samba/smbpasswd -+ . shares enabled/disabled -+ . guest access -+ . create mask (770) -+ - Check newer FTP (/etc/ftpaccess in newer Linux systems, ftpusers -+ is deprecated) see checklist #22 of SANS. -+ (DONE)- The check_inetd script should be improved to warn if echo/chargen.. -+ services are enabled (SANS unix checklist #3 and Linux #4) -+ - SANS unix checklist #18 -+ . Solaris /etc/system (noexec stack) -+ . Solaris locked accounts (#18 and #21) -+ . Solaris default/login -+ . Solaris /etc/default/kbd -+ - Partition checks (in Linux /etc/fstab, in Solaris /etc/vfstab), -+ if there is a /usr, /opt then read-only, if /var -+ or /tmp suggest nosuid (maybe noexec, although it's not a real -+ improvement). Separate partitions for /var, /usr, /tmp, /home -+ (boot?) so that no hard links attacks are possible. -+ In general user writable directories should be separated from -+ from system directories to avoid (hard) symlink attacks and -+ local DoS due to partitions being full. -+ In some installations /var/log or /var/spool (or /var/mail) might -+ make sense to be separated. -+ - Solaris /etc/notrouter to disable -+ -+ - Suggested by Bob Hall: -+ * Check if any local file systems are being exported to -+ 'localhost'. Also check if the local host is in a netgroups -+ entry in its own exports file. -+ * Look for (unexpected) normal files under /dev. -+ (Note: included in 'check_devices', done?) -+ * Check for user startup files that call 'umask' with weak -+ settings. (Should be 022 or 027.) -+ (Note: included in 'check_umask' using GENPASSWDSETS, done?) -+ * Check that '-' is not the first character in a /etc/hosts.equiv -+ /etc/hosts.lpd, or .rhosts files. Also check for a '+' entry in -+ hosts.lpd file. -+ (Note: included in 'check_rhosts'?) -+ * If a system allows it, check for an /etc/shells file and look -+ if the permitted shells are in the system directories. -+ References: -+ http://www.cert.org/tech_tips/usc20.html -+ http://www.cert.org/advisories/CA-2001-30.html -+ http://www.ciac.org/ciac/bulletins/b-37.shtml -+ http://www.nswc.navy.mil/ISSEC/Docs/Ref/GeneralInfo/unixsecurity.nrl.txt -+ -+ - Detect promiscous mode (DONE) -+ - Rootkits check, like chkrootkit (DONE) -+ Reference: -+ http://linux.oreillynet.com/pub/a/linux/2002/02/07/rootkits.html -+ -+- Implement a check for configuration files for user's password policies -+ and other sensible configuration such as /etc/login.access, /etc/login.defs, -+ /etc/login.conf -+ -+- Implement a generic script to test package management systems -+ (i.e. run 'rpm -Va' in RedHat, 'pkgchk' in Solaris). Most of these check: -+ md5sums, permissions, size, user/group ownerships... -+ These can be useful to detect trivial rootkits but might be redundant -+ when using also integrity checkers. -+ Note: The Debian deb_checkmd5sums only covers part of that (using -+ debsums), dpkg does not have a verify mode (see Debian Bug #187019) -+ References: -+ RedHat: http://www.rpm.org/max-rpm/ch-rpm-verify.html -+ http://www.rpm.org/max-rpm/s1-rpm-verify-what-to-verify.html -+ -+- Convert scripts/check_network (RedHat-based) into a number of tests. -+ This is a script provided by Bryan Gartner from HP -+ It currently checks for: -+ - Inetd configuration files (are xinetd or inetd files writable? -+ are they owned by the proper user? does inetd use -l? does -+ xinetd have filelog or syslog?) -+ (Note: some checks moved to check_tcpd) -+ - Does /etc/securetty exist? Does it have other entries besides vc/tty? -+ Is ownership of the file ok? -+ - Is ip forwarding enabled? -+ - Which version of DNS/Wu-ftpd is it running? -+ (Note: this might not be completely feasible since the check_network -+ scripts connects to the server to retrieve the banner which is -+ something that Tiger should leave to other, remote, VA tools) -+ - PermitRooLogin or Rhosts in sshd? -+ - EXPN/VRFY support in mail host? -+ Necessary services: -+ - Is syslog running? -+ - Is omniback running? -+ Not allowed (per policy): -+ - Is fingerd running? -+ - Is identd runnig? -+ - Are inetd internal services running? -+ - Is a routing daemon enabled? -+ - R-commands? -+ - X server -+ - Tftpd -+ - NIS -+ - UUCP -+ - R-exd? -+ - NFS -+ Note: some of this is already done in check_inetd and check_xinetd so -+ many might be redundant. -+ -+INTEGRATION CHECKS -+------------------ -+(checks related to other tools that integrate them in the Tiger framework) -+ -+- Tripwire: the 'tripwire_run' script has not been tested thoroughly -+ (mainly because in Debian it is already configured to execute -+ regular checks standalone) -+ -+- Crack: same for 'crack_run' (for the same reason as for tripwire -+ it has not been tested thoroughly yet) -+ -+- Other integrity checkers: aide, samhain, integrit... -+ (Note: done for aide and integrit for the moment) -+ -+- Other password crackers: john -+ -+- Logcheckers: swatch, logcheck, loganalysis, snort-logcheck -+ Note: Tiger currently does not do any log checking (see below) -+ I'm not sure if Tiger should provide a new one or re-use -+ existing ones and include them as an 'external' program to run -+ through a Tiger module. The benefit of using an accepted and use -+ log analysis tool is that Tiger can benefit from the database of -+ signatures of known attacks/non-issues. The problem is that the -+ sysadmin has to install yet another tool (if he is not using an OS -+ that already includes them) and, probably, some other stuff -+ (usually Perl) on which the tool itself is based. -+ -+- User analysis: sac, hostsentry (part of Abacus, but non-free) -+ -+- Network checks: Arpwatch, Snort -+ -+(DONE)- Other tools: chkrootkit -+ -+--- Javier Fernandez-Sanguino Pen~a -+Sun, 27 Jun 2004 22:28:39 +0200 -+ -+ ---- tiger-3.2.1.orig/doc/accounts.txt -+++ tiger-3.2.1/doc/accounts.txt +diff -ru tiger.orig/doc/accounts.txt tiger/doc/accounts.txt +--- tiger.orig/doc/accounts.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/accounts.txt 2009-03-08 14:48:36.000000000 +0000 @@ -98,10 +98,6 @@ %acc015w The listed login ID has a duplicate home directory with another login @@ -222,8 +40,21 @@ many important environment variables. %acc020w The listed login ID does not have a valid login program or shell. ---- tiger-3.2.1.orig/doc/anonftp.txt -+++ tiger-3.2.1/doc/anonftp.txt +diff -ru tiger.orig/doc/aide.txt tiger/doc/aide.txt +--- tiger.orig/doc/aide.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/aide.txt 2009-03-08 14:48:36.000000000 +0000 +@@ -5,7 +5,7 @@ + cannot make use of in the current Tiger version. Please supply a custom + configuration file using Tiger_Run_AIDE_CFG_OVERRIDE and/or make sure + no variable substitution is used in the Aide configuration file. +-%aide003w ++%aide003wsum + Aide detected changes in filesystem integrity. This line is only the summary. + %aide003w + Aide detected, by checking against the files' the attributes in the database, +diff -ru tiger.orig/doc/anonftp.txt tiger/doc/anonftp.txt +--- tiger.orig/doc/anonftp.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/anonftp.txt 2009-03-08 14:48:36.000000000 +0000 @@ -3,16 +3,16 @@ and hence there is nothing to check. %ftp002a @@ -253,8 +84,9 @@ +The 'ftp' account appears to have a valid shell. A valid shell is not +required for the 'ftp' user and can be safely set to /bin/false, +/sbin/nologin, etc. ---- tiger-3.2.1.orig/doc/config.txt -+++ tiger-3.2.1/doc/config.txt +diff -ru tiger.orig/doc/config.txt tiger/doc/config.txt +--- tiger.orig/doc/config.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/config.txt 2009-03-08 14:48:36.000000000 +0000 @@ -1,12 +1,12 @@ %con001c -The configuration file listed was not read in because it was @@ -302,8 +134,9 @@ +%run002e +A needed command cannot be executed, probably due to insufficient privileges. Make sure that Tiger is run by the superuser (root) account. ---- tiger-3.2.1.orig/doc/cron.txt -+++ tiger-3.2.1/doc/cron.txt +diff -ru tiger.orig/doc/cron.txt tiger/doc/cron.txt +--- tiger.orig/doc/cron.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/cron.txt 2009-03-08 14:48:36.000000000 +0000 @@ -25,4 +25,17 @@ particular, possibly recurring time. It can be very useful, but also has a very real potential for abuse by either users or system crackers. @@ -323,8 +156,9 @@ +Cron is restricted to a given user. This is usually good, since +restricting cron prevents this system from being +abused by either users or system crackers. ---- tiger-3.2.1.orig/doc/embed.txt -+++ tiger-3.2.1/doc/embed.txt +diff -ru tiger.orig/doc/embed.txt tiger/doc/embed.txt +--- tiger.orig/doc/embed.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/embed.txt 2009-03-08 14:48:36.000000000 +0000 @@ -69,11 +69,11 @@ The executable is group writable, world writable or both. This can enable an intruder to gain unauthorized privileges if they are able to @@ -339,8 +173,9 @@ study the file and programs in which the pathname was found to -determine whether there +determine whether there is a problem. ---- tiger-3.2.1.orig/doc/explain.idx -+++ tiger-3.2.1/doc/explain.idx +diff -ru tiger.orig/doc/explain.idx tiger/doc/explain.idx +--- tiger.orig/doc/explain.idx 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/explain.idx 2009-03-08 14:48:36.000000000 +0000 @@ -16,14 +16,20 @@ acc013w accounts.txt 86 94 acc014f accounts.txt 96 97 @@ -719,8 +554,9 @@ +ssh003w ssh.txt 10 13 +ssh004w ssh.txt 15 16 +ssh005e ssh.txt 18 $ ---- tiger-3.2.1.orig/doc/filesys.txt -+++ tiger-3.2.1/doc/filesys.txt +diff -ru tiger.orig/doc/filesys.txt tiger/doc/filesys.txt +--- tiger.orig/doc/filesys.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/filesys.txt 2009-03-08 14:48:36.000000000 +0000 @@ -24,7 +24,7 @@ all setuid programs will be listed. When fully configured for a platform, only those setuid programs that do not appear in the @@ -751,16 +587,18 @@ +The listed program is not owned by an administrative user. The +majority of SUID programs should probably be owned by an +administrative user. ---- tiger-3.2.1.orig/doc/group.txt -+++ tiger-3.2.1/doc/group.txt +diff -ru tiger.orig/doc/group.txt tiger/doc/group.txt +--- tiger.orig/doc/group.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/group.txt 2009-03-08 14:48:36.000000000 +0000 @@ -18,5 +18,3 @@ The group files have integrity issues as found by 'grpck -r'. This can lead to looping of password manipulation programs and to allow unexpected access to resources. - - ---- tiger-3.2.1.orig/doc/inetd.txt -+++ tiger-3.2.1/doc/inetd.txt +diff -ru tiger.orig/doc/inetd.txt tiger/doc/inetd.txt +--- tiger.orig/doc/inetd.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/inetd.txt 2009-03-08 14:48:36.000000000 +0000 @@ -25,8 +25,8 @@ be checked, and if anything unusual is found, the system should be checked for other signs of intrusion. @@ -852,8 +690,21 @@ +The service is disabled in the Xinetd configuration file. This is usually +a good thing, since this limits exposure of the server and prevents +external attacks. ---- tiger-3.2.1.orig/doc/known.txt -+++ tiger-3.2.1/doc/known.txt +diff -ru tiger.orig/doc/integrit.txt tiger/doc/integrit.txt +--- tiger.orig/doc/integrit.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/integrit.txt 2009-03-08 14:48:36.000000000 +0000 +@@ -5,7 +5,7 @@ + Tiger cannot make use of in the current Tiger version. Please supply a custom + configuration file using Tiger_Run_AIDE_CFG_OVERRIDE and/or make sure + no variable substitution is used in the Integrit configuration file. +-%integ003w ++%integ003wsum + Integrit detected changes in filesystem integrity. This line is only the + summary. + %integ003w +diff -ru tiger.orig/doc/known.txt tiger/doc/known.txt +--- tiger.orig/doc/known.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/known.txt 2009-03-08 14:48:36.000000000 +0000 @@ -44,7 +44,7 @@ of intrusion. %kis009w @@ -878,8 +729,9 @@ %kis013a A interface is set up on promiscuous mode, this is a common method used by attackers to capture user account and and password information. ---- tiger-3.2.1.orig/doc/linux.txt -+++ tiger-3.2.1/doc/linux.txt +diff -ru tiger.orig/doc/linux.txt tiger/doc/linux.txt +--- tiger.orig/doc/linux.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/linux.txt 2009-03-08 14:48:36.000000000 +0000 @@ -49,7 +49,7 @@ The kernel will answer (per configuration) to ICMP echo requests in any interface. You might want to configure it to not answer to this requests @@ -958,8 +810,9 @@ +use to specific local network IP addresses or hosts. +If the system is multi-home a local firewall configuration will prevent +spoofing attacks due to "weak end host" issues. ---- tiger-3.2.1.orig/doc/logfiles.txt -+++ tiger-3.2.1/doc/logfiles.txt +diff -ru tiger.orig/doc/logfiles.txt tiger/doc/logfiles.txt +--- tiger.orig/doc/logfiles.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/logfiles.txt 2009-03-08 14:48:36.000000000 +0000 @@ -18,7 +18,7 @@ server can be listed. This is accessed by the command "who". It might not exist due to a system configuration error or an @@ -984,8 +837,9 @@ It might not exist if you have configured your system to use a different file for logging or if an intruder has tried to cover his tracks by removing it since the messages file might contain ---- tiger-3.2.1.orig/doc/misc.txt -+++ tiger-3.2.1/doc/misc.txt +diff -ru tiger.orig/doc/misc.txt tiger/doc/misc.txt +--- tiger.orig/doc/misc.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/misc.txt 2009-03-08 14:48:36.000000000 +0000 @@ -68,8 +68,8 @@ execute commands which allow them to read and modify memory, boot alternate OS's etc. See the 'eeprom' man page for information @@ -1055,8 +909,23 @@ The script will not be run since it is not executable. This might be a problem with the installation of Tiger so you should recheck the script's file owner and permissions. ---- tiger-3.2.1.orig/doc/network.txt -+++ tiger-3.2.1/doc/network.txt +diff -ru tiger.orig/doc/ndd.txt tiger/doc/ndd.txt +--- tiger.orig/doc/ndd.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/ndd.txt 2009-03-08 14:48:36.000000000 +0000 +@@ -69,8 +69,8 @@ + services. + # ndd -set /dev/ip ip_respond_to_timestamp 0 + %ndd011w +-This option determins if HP-UX will include explanitory text in the +-RST segement it sends. This text is helpful for debugging, but is also ++This option determines if HP-UX will include explanatory text in the ++RST segment it sends. This text is helpful for debugging, but is also + useful to potential intruders. + To disable this do: + # ndd -set /dev/tcp tcp_text_in_resets 0 +diff -ru tiger.orig/doc/network.txt tiger/doc/network.txt +--- tiger.orig/doc/network.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/network.txt 2009-03-08 14:48:36.000000000 +0000 @@ -1,11 +1,11 @@ %netw001f -The listed file is world writeable. chomd -ow file to correct. @@ -1071,8 +940,9 @@ based, add the 'filelog' or 'syslog' options in /etc/sysconfig/xinetd configuration file. %netw004f ---- tiger-3.2.1.orig/doc/passwd.txt -+++ tiger-3.2.1/doc/passwd.txt +diff -ru tiger.orig/doc/passwd.txt tiger/doc/passwd.txt +--- tiger.orig/doc/passwd.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/passwd.txt 2009-03-08 14:48:36.000000000 +0000 @@ -28,7 +28,7 @@ %pass008e The password file was not generated and cannot be analysed. This might @@ -1101,8 +971,9 @@ +indicates the specified login ID has its cypher text publicly available +and is subject to brute force password cracking, even though shadow +passwords are implimented on the system. ---- tiger-3.2.1.orig/doc/paths.txt -+++ tiger-3.2.1/doc/paths.txt +diff -ru tiger.orig/doc/paths.txt tiger/doc/paths.txt +--- tiger.orig/doc/paths.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/paths.txt 2009-03-08 14:48:36.000000000 +0000 @@ -9,7 +9,7 @@ executables and spread by `root'. Often these executables are owned by `bin', `uucp' or other system accounts. If these commands are never @@ -1112,8 +983,9 @@ to install most /usr/sbin/* and /usr/bin/* executables as owned by `bin', this account will not flag a warning. ---- tiger-3.2.1.orig/doc/pcap.txt -+++ tiger-3.2.1/doc/pcap.txt +diff -ru tiger.orig/doc/pcap.txt tiger/doc/pcap.txt +--- tiger.orig/doc/pcap.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/pcap.txt 2009-03-08 14:48:36.000000000 +0000 @@ -14,6 +14,6 @@ group or world write permissions. This may represent a security vulnerability. @@ -1122,8 +994,9 @@ +The indicated executable associated with a printer control has group or world write permissions. This may represent a security vulnerability, as it may be possible to replace the executable. ---- tiger-3.2.1.orig/doc/permissions.txt -+++ tiger-3.2.1/doc/permissions.txt +diff -ru tiger.orig/doc/permissions.txt tiger/doc/permissions.txt +--- tiger.orig/doc/permissions.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/permissions.txt 2009-03-08 14:48:36.000000000 +0000 @@ -160,7 +160,7 @@ %perm26f The file '/etc/login.access' provides finer control over user @@ -1133,8 +1006,9 @@ users, then unauthorized access or privileges may be obtained. %perm27f The file '/etc/login.conf' is used by default on some BSD systems, ---- tiger-3.2.1.orig/doc/pxt.txt -+++ tiger-3.2.1/doc/pxt.txt +diff -ru tiger.orig/doc/pxt.txt tiger/doc/pxt.txt +--- tiger.orig/doc/pxt.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/pxt.txt 2009-03-08 14:48:36.000000000 +0000 @@ -1,6 +1,6 @@ -%dev001 +%dev001f @@ -1210,8 +1084,9 @@ -upgraded, removed or tampered with. If this modification is legitmate +upgraded, removed or tampered with. If this modification is legitimate please refresh the tripwire database by running "tripwire --update" ---- tiger-3.2.1.orig/doc/rhosts.txt -+++ tiger-3.2.1/doc/rhosts.txt +diff -ru tiger.orig/doc/rhosts.txt tiger/doc/rhosts.txt +--- tiger.orig/doc/rhosts.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/rhosts.txt 2009-03-08 14:48:36.000000000 +0000 @@ -54,7 +54,7 @@ security hole. It allows anyone to login to the machine as any user except `root'. This needs to be removed immediately. Note @@ -1230,17 +1105,9 @@ not the user needs to have an .rhosts file and, in any case, consider the use of safer replacement for the 'r' commands including public-key cryptography programs (such as SSH implementations) ---- tiger-3.2.1.orig/doc/root.txt -+++ tiger-3.2.1/doc/root.txt -@@ -8,5 +8,5 @@ - "root" should be added to this file. - %root003w - The root user should not have the message capability turned on. This --could lead to inadvertant modification of files with the root user is -+could lead to inadvertent modification of files with the root user is - logged in. ---- tiger-3.2.1.orig/doc/rootdir.txt -+++ tiger-3.2.1/doc/rootdir.txt +diff -ru tiger.orig/doc/rootdir.txt tiger/doc/rootdir.txt +--- tiger.orig/doc/rootdir.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/rootdir.txt 2009-03-08 14:48:36.000000000 +0000 @@ -1,6 +1,8 @@ %rootdir001f -The inode for the root directory is not on inode 2. This is a security @@ -1253,54 +1120,9 @@ - +%rootdir003f +The ownership of the root directory is not secure. ---- tiger-3.2.1.orig/doc/signature.txt -+++ tiger-3.2.1/doc/signature.txt -@@ -176,7 +176,7 @@ - %sig022f - The patchdiag.xref files is not available in the configuration directory. This - means that the script cannot proceed further since it does not have any --information of which are the appropiate patches for this system. -+information of which are the appropriate patches for this system. - - Please download the patchdiag file from Sunsolve, you can use, for example, - the following link: ---- tiger-3.2.1.orig/doc/aide.txt -+++ tiger-3.2.1/doc/aide.txt -@@ -5,7 +5,7 @@ - cannot make use of in the current Tiger version. Please supply a custom - configuration file using Tiger_Run_AIDE_CFG_OVERRIDE and/or make sure - no variable substitution is used in the Aide configuration file. --%aide003w -+%aide003wsum - Aide detected changes in filesystem integrity. This line is only the summary. - %aide003w - Aide detected, by checking against the files' the attributes in the database, ---- tiger-3.2.1.orig/doc/ndd.txt -+++ tiger-3.2.1/doc/ndd.txt -@@ -69,8 +69,8 @@ - services. - # ndd -set /dev/ip ip_respond_to_timestamp 0 - %ndd011w --This option determins if HP-UX will include explanitory text in the --RST segement it sends. This text is helpful for debugging, but is also -+This option determines if HP-UX will include explanatory text in the -+RST segment it sends. This text is helpful for debugging, but is also - useful to potential intruders. - To disable this do: - # ndd -set /dev/tcp tcp_text_in_resets 0 ---- tiger-3.2.1.orig/doc/integrit.txt -+++ tiger-3.2.1/doc/integrit.txt -@@ -5,7 +5,7 @@ - Tiger cannot make use of in the current Tiger version. Please supply a custom - configuration file using Tiger_Run_AIDE_CFG_OVERRIDE and/or make sure - no variable substitution is used in the Integrit configuration file. --%integ003w -+%integ003wsum - Integrit detected changes in filesystem integrity. This line is only the - summary. - %integ003w ---- tiger-3.2.1.orig/doc/rootkit.txt -+++ tiger-3.2.1/doc/rootkit.txt +diff -ru tiger.orig/doc/rootkit.txt tiger/doc/rootkit.txt +--- tiger.orig/doc/rootkit.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/rootkit.txt 2009-03-08 14:48:36.000000000 +0000 @@ -14,12 +14,12 @@ The 'chkrootkit' program has detected a suspicious directory which might be an indication of an intrusion. @@ -1330,8 +1152,31 @@ to power off the system and follow the steps outlined by Steps for Recovering from a UNIX or NT System Compromise (http://www.cert.org/tech_tips/root_compromise.html) ---- tiger-3.2.1.orig/doc/ssh.txt -+++ tiger-3.2.1/doc/ssh.txt +diff -ru tiger.orig/doc/root.txt tiger/doc/root.txt +--- tiger.orig/doc/root.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/root.txt 2009-03-08 14:48:36.000000000 +0000 +@@ -8,5 +8,5 @@ + "root" should be added to this file. + %root003w + The root user should not have the message capability turned on. This +-could lead to inadvertant modification of files with the root user is ++could lead to inadvertent modification of files with the root user is + logged in. +diff -ru tiger.orig/doc/signature.txt tiger/doc/signature.txt +--- tiger.orig/doc/signature.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/signature.txt 2009-03-08 14:48:36.000000000 +0000 +@@ -176,7 +176,7 @@ + %sig022f + The patchdiag.xref files is not available in the configuration directory. This + means that the script cannot proceed further since it does not have any +-information of which are the appropiate patches for this system. ++information of which are the appropriate patches for this system. + + Please download the patchdiag file from Sunsolve, you can use, for example, + the following link: +diff -ru tiger.orig/doc/ssh.txt tiger/doc/ssh.txt +--- tiger.orig/doc/ssh.txt 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/doc/ssh.txt 2009-03-08 14:48:36.000000000 +0000 @@ -8,12 +8,12 @@ and no. %ssh003w @@ -1347,8 +1192,9 @@ %ssh005e The variable SSHD_CONFIG is not defined which means that you have not setup (or the system has been enable to find) your SSH configuration ---- tiger-3.2.1.orig/html/accounts.html -+++ tiger-3.2.1/html/accounts.html +diff -ru tiger.orig/html/accounts.html tiger/html/accounts.html +--- tiger.orig/html/accounts.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/accounts.html 2009-03-08 14:48:36.000000000 +0000 @@ -316,22 +316,6 @@ @@ -1402,112 +1248,9 @@ The listed login ID appears to be dormant. Files in the home directory of this user have not been modified in the specified period of time and after investigation the account may need to ---- tiger-3.2.1.orig/html/aide.html -+++ tiger-3.2.1/html/aide.html -@@ -0,0 +1,101 @@ -+
    -+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Documents for aide

    -+

    Code [aide001i]

    -+Aide detected no changes. Good. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [aide002e]

    -+Aide configuration files can make use of variable substitution in a way Tiger -+cannot make use of in the current Tiger version. Please supply a custom -+configuration file using Tiger_Run_AIDE_CFG_OVERRIDE and/or make sure -+no variable substitution is used in the Aide configuration file. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [aide003wsum]

    -+Aide detected changes in filesystem integrity. This line is only the summary. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [aide003w]

    -+Aide detected, by checking against the files' the attributes in the database, -+the file has changed. "Benign" actions, like accessing a file (remember -+directories are files too) may have changed it, but it may be part of a breach -+of security. Please investigate. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [aide004w]

    -+Aide detected, by checking against the files' the attributes in the database, -+the file has been removed. "Benign" configuration errors of the database -+settings may lead to incorporation and checking of for instance temporary -+files. Uninstalling software and related files may lead to the same result -+when the database was not upgraded before this check. -+If the removed file was not a temporary file and not part of legitimately -+uninstalled software, it may have been used in a breach of security. -+Please investigate. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [aide005w]

    -+Aide detected, by checking file against the database, the file was not part of -+the database. "Benign" actions like installing software and related files or -+changes in the configuration file may lead to this result when the database -+was not upgraded before this check. If the removed file was not part of -+legitimately installed software, it may be in use in a breach of security. -+Please investigate. ---- tiger-3.2.1.orig/html/anonftp.html -+++ tiger-3.2.1/html/anonftp.html +diff -ru tiger.orig/html/anonftp.html tiger/html/anonftp.html +--- tiger.orig/html/anonftp.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/anonftp.html 2009-03-08 14:48:36.000000000 +0000 @@ -26,7 +26,7 @@

    Code [ftp002a]

    @@ -1551,8 +1294,9 @@ +The 'ftp' account appears to have a valid shell. A valid shell is not +required for the 'ftp' user and can be safely set to /bin/false, +/sbin/nologin, etc. ---- tiger-3.2.1.orig/html/config.html -+++ tiger-3.2.1/html/config.html +diff -ru tiger.orig/html/config.html tiger/html/config.html +--- tiger.orig/html/config.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/config.html 2009-03-08 14:48:36.000000000 +0000 @@ -10,7 +10,7 @@

    Documents for config

    @@ -1650,8 +1394,9 @@ +

    Code [run002e]

    +A needed command cannot be executed, probably due to insufficient privileges. Make sure that Tiger is run by the superuser (root) account. ---- tiger-3.2.1.orig/html/cron.html -+++ tiger-3.2.1/html/cron.html +diff -ru tiger.orig/html/cron.html tiger/html/cron.html +--- tiger.orig/html/cron.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/cron.html 2009-03-08 14:48:36.000000000 +0000 @@ -84,4 +84,41 @@ particular, possibly recurring time. It can be very useful, but also has a very real potential for abuse by either users or system crackers. @@ -1695,8 +1440,9 @@ +Cron is restricted to a given user. This is usually good, since +restricting cron prevents this system from being +abused by either users or system crackers. ---- tiger-3.2.1.orig/html/embed.html -+++ tiger-3.2.1/html/embed.html +diff -ru tiger.orig/html/embed.html tiger/html/embed.html +--- tiger.orig/html/embed.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/embed.html 2009-03-08 14:48:36.000000000 +0000 @@ -176,11 +176,11 @@ @@ -1711,8 +1457,9 @@ study the file and programs in which the pathname was found to -determine whether there +determine whether there is a problem. ---- tiger-3.2.1.orig/html/filesys.html -+++ tiger-3.2.1/html/filesys.html +diff -ru tiger.orig/html/filesys.html tiger/html/filesys.html +--- tiger.orig/html/filesys.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/filesys.html 2009-03-08 14:48:36.000000000 +0000 @@ -71,7 +71,7 @@ @@ -1755,16 +1502,18 @@ +The listed program is not owned by an administrative user. The +majority of SUID programs should probably be owned by an +administrative user. ---- tiger-3.2.1.orig/html/group.html -+++ tiger-3.2.1/html/group.html +diff -ru tiger.orig/html/group.html tiger/html/group.html +--- tiger.orig/html/group.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/group.html 2009-03-08 14:48:36.000000000 +0000 @@ -89,5 +89,3 @@ The group files have integrity issues as found by 'grpck -r'. This can lead to looping of password manipulation programs and to allow unexpected access to resources. -

    -

    ---- tiger-3.2.1.orig/html/inetd.html -+++ tiger-3.2.1/html/inetd.html +diff -ru tiger.orig/html/inetd.html tiger/html/inetd.html +--- tiger.orig/html/inetd.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/inetd.html 2009-03-08 14:48:36.000000000 +0000 @@ -96,12 +96,20 @@

    @@ -2193,114 +1942,9 @@ +The service is disabled in the Xinetd configuration file. This is usually +a good thing, since this limits exposure of the server and prevents +external attacks. ---- tiger-3.2.1.orig/html/integrit.html -+++ tiger-3.2.1/html/integrit.html -@@ -0,0 +1,103 @@ -+
    -+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Documents for integrit

    -+

    Code [integ001i]

    -+Integrit detected no changes. Good. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [integ002e]

    -+Integrit configuration files can make use of variable substitution in a way -+Tiger cannot make use of in the current Tiger version. Please supply a custom -+configuration file using Tiger_Run_AIDE_CFG_OVERRIDE and/or make sure -+no variable substitution is used in the Integrit configuration file. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [integ003wsum]

    -+Integrit detected changes in filesystem integrity. This line is only the -+summary. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [integ003w]

    -+Integrit detected, by checking against the files' the attributes in the -+database, the file has changed. "Benign" actions, like accessing a file -+(remember directories are files too) may have changed it, but it may be part -+of a breach of security. Please investigate. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [integ004w]

    -+Integrit detected, by checking against the files' the attributes in the -+database, the file has been removed. "Benign" configuration errors of the -+database settings may lead to incorporation and checking of for instance -+temporary files. Uninstalling software and related files may lead to the -+same result when the database was not upgraded before this check. -+If the removed file was not a temporary file and not part of legitimately -+uninstalled software, it may have been used in a breach of security. -+Please investigate. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [integ005w]

    -+Integrit detected, by checking file against the database, the file was -+not part of the database. "Benign" actions like installing software and -+related files or changes in the configuration file may lead to this result -+when the database was not upgraded before this check. If the removed file -+was not part of legitimately installed software, it may be in use in a -+breach of security. -+Please investigate. ---- tiger-3.2.1.orig/html/known.html -+++ tiger-3.2.1/html/known.html +diff -ru tiger.orig/html/known.html tiger/html/known.html +--- tiger.orig/html/known.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/known.html 2009-03-08 14:48:36.000000000 +0000 @@ -151,7 +151,7 @@

    Code [kis009w]

    @@ -2366,8 +2010,9 @@ +out in your /etc/inetd.conf. Intruders may turn on a service +that you previously thought you had turned off, or replace +the inetd program with a Trojan horse program. ---- tiger-3.2.1.orig/html/linux.html -+++ tiger-3.2.1/html/linux.html +diff -ru tiger.orig/html/linux.html tiger/html/linux.html +--- tiger.orig/html/linux.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/linux.html 2009-03-08 14:48:36.000000000 +0000 @@ -207,11 +207,12 @@ The system is configured to accept ICMP redirects, this might or might not be necessary in your network topology. If you have multiple routers @@ -2454,8 +2099,9 @@ +use to specific local network IP addresses or hosts. +If the system is multi-home a local firewall configuration will prevent +spoofing attacks due to "weak end host" issues. ---- tiger-3.2.1.orig/html/logfiles.html -+++ tiger-3.2.1/html/logfiles.html +diff -ru tiger.orig/html/logfiles.html tiger/html/logfiles.html +--- tiger.orig/html/logfiles.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/logfiles.html 2009-03-08 14:48:36.000000000 +0000 @@ -12,6 +12,8 @@

    Code [logf001f]

    The log file "wtmp" should exist to show an audit trail of which user has @@ -2535,8 +2181,9 @@ +different file for logging or if an intruder has tried to cover +his tracks by removing it since the messages file might contain +bad login attempts from local users and remote hosts. ---- tiger-3.2.1.orig/html/misc.html -+++ tiger-3.2.1/html/misc.html +diff -ru tiger.orig/html/misc.html tiger/html/misc.html +--- tiger.orig/html/misc.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/misc.html 2009-03-08 14:48:36.000000000 +0000 @@ -163,8 +163,8 @@ @@ -2634,222 +2281,13 @@ +The script will not be run since it is not executable. This might be a problem +with the installation of Tiger so you should recheck the script's file owner +and permissions. ---- tiger-3.2.1.orig/html/ndd.html -+++ tiger-3.2.1/html/ndd.html -@@ -0,0 +1,207 @@ -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Documents for ndd

    -+

    Code [ndd001f]

    -+This option determines whether to forward broadcast packets directed -+to a specific net or subnet, if that net or subnet is directly -+connected to the machine. If the system is acting as a router, this -+option can be exploited to generate a great deal of broadcast network -+traffic. Turning this option off will help prevent broadcast traffic -+attacks. -+To disable this do: -+# ndd -set /dev/ip ip_forward_directed_broadcasts 0 -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [ndd002f]

    -+This option determines whether to forward packets that are source -+routed. These packets define the path the packet should take instead -+of allowing network routers to define the path. -+To disable this do: -+# ndd -set /dev/ip ip_forward_src_routed 0 -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [ndd003w]

    -+IP forwarding is the option that permits the system to act as a router -+and thus resend packets from one network interface to another. If your -+system is not acting as such this option should be disabled. -+To disable this do: -+# ndd -set /dev/ip ip_forwarding 0 -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [ndd004f]

    -+The echo-request PMTU strategy can be used for amplification attacks. -+Use either strategy 1 or strategy 0. -+To disable this do: -+# ndd -set /dev/ip ip_pmtu_straegy [0|1] -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [ndd005w]

    -+This option determines whether to send ICMP redirect messages which -+can introduce changes into remote system's routing table. It should -+only be used on systems that act as routers. -+To disable this do: -+# ndd -set /dev/ip ip_send_redirects 0 -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [ndd006w]

    -+The system is configured to send ICMP source quench messages. These -+ICMP messages have been deprecated. -+To disable this do: -+# ndd -set /dev/ip ip_send_source_sqench 0 -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [ndd007f]

    -+This options determines whether to respond to ICMP netmask requests -+which are typically sent by diskless clients when booting. An -+attacker may use the netmask information for determining network -+topology or the broadcast address for the subnet. -+To disable this do: -+# ndd -set /dev/ip ip_respond_to_address_mask_broadcast 0 -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [ndd008f]

    -+This option determines whether to respond to ICMP broadcast echo -+requests (ping). An attacker may try to create a denial of service -+attack on subnets by sending many broadcast echo requests to which all -+systems will respond. This also provides information on systems that -+are available on the network. -+To disable this do: -+# ndd -set /dev/ip ip_respond_to_echo_broadcast 0 -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [ndd009f]

    -+This option determines whether to respond to ICMP broadcast timestamp -+requests which are used to discover the time on all systems in the -+broadcast range. This option is dangerous for the same reasons as -+responding to a single timestamp request. Additionally, an attacker -+may try to create a denial of service attack by generating many -+broadcast timestamp requests. -+To disable this do: -+# ndd -set /dev/ip ip_respond_to_timestamp_broadcast 0 -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [ndd010f]

    -+This option determines whether to respond to ICMP timestamp requests -+which some systems use to discover the time on a remote system. An -+attacker may use the time information to schedule an attack at a -+period of time when the system may run a cron job (or other time- -+based event) or otherwise be busy. It may also be possible predict -+ID or sequence numbers that are based on the time of day for spoofing -+services. -+# ndd -set /dev/ip ip_respond_to_timestamp 0 -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [ndd011w]

    -+This option determines if HP-UX will include explanatory text in the -+RST segment it sends. This text is helpful for debugging, but is also -+useful to potential intruders. -+To disable this do: -+# ndd -set /dev/tcp tcp_text_in_resets 0 ---- tiger-3.2.1.orig/html/netrc.html -+++ tiger-3.2.1/html/netrc.html -@@ -67,3 +67,19 @@ - that an intrusion has occurred. The directory should be examined - for unusual files. The system should also be checked for other - signs of intrusion. The directory should be renamed or removed. +diff -ru tiger.orig/html/netrc.html tiger/html/netrc.html +--- tiger.orig/html/netrc.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/netrc.html 2009-03-08 14:48:36.000000000 +0000 +@@ -67,3 +67,19 @@ + that an intrusion has occurred. The directory should be examined + for unusual files. The system should also be checked for other + signs of intrusion. The directory should be renamed or removed. +

     +
 +
@@ -2866,8 +2304,9 @@
 +The user has a .netrc file, you should avoid usage of these files unless
 +absolutely necessary since they can contain sensible information which
 +could be used by a local intruder.
---- tiger-3.2.1.orig/html/network.html
-+++ tiger-3.2.1/html/network.html
+diff -ru tiger.orig/html/network.html tiger/html/network.html
+--- tiger.orig/html/network.html	2009-03-08 14:41:40.000000000 +0000
++++ tiger/html/network.html	2009-03-08 14:48:36.000000000 +0000
 @@ -10,7 +10,7 @@

    Documents for network

    @@ -2886,8 +2325,9 @@ based, add the 'filelog' or 'syslog' options in /etc/sysconfig/xinetd configuration file. 
    ---- tiger-3.2.1.orig/html/passwd.html
-+++ tiger-3.2.1/html/passwd.html
+diff -ru tiger.orig/html/passwd.html tiger/html/passwd.html
+--- tiger.orig/html/passwd.html	2009-03-08 14:41:40.000000000 +0000
++++ tiger/html/passwd.html	2009-03-08 14:48:36.000000000 +0000
 @@ -135,7 +135,7 @@
  
  
@@ -3062,8 +2502,9 @@
 +indicates the specified login ID has its cypher text publicly available
 +and is subject to brute force password cracking, even though shadow
 +passwords are implimented on the system.
---- tiger-3.2.1.orig/html/paths.html
-+++ tiger-3.2.1/html/paths.html
+diff -ru tiger.orig/html/paths.html tiger/html/paths.html
+--- tiger.orig/html/paths.html	2009-03-08 14:41:40.000000000 +0000
++++ tiger/html/paths.html	2009-03-08 14:48:36.000000000 +0000
 @@ -32,9 +32,13 @@
  executables and spread by `root'. Often these executables are owned by
  `bin', `uucp' or other system accounts. If these commands are never
@@ -3080,8 +2521,9 @@
  
      
  
---- tiger-3.2.1.orig/html/pcap.html
-+++ tiger-3.2.1/html/pcap.html
+diff -ru tiger.orig/html/pcap.html tiger/html/pcap.html
+--- tiger.orig/html/pcap.html	2009-03-08 14:41:40.000000000 +0000
++++ tiger/html/pcap.html	2009-03-08 14:48:36.000000000 +0000
 @@ -73,6 +73,6 @@
  
  
    
@@ -3090,8 +2532,9 @@
 +The indicated executable associated with a printer control has
  group or world write permissions. This may represent a security
  vulnerability, as it may be possible to replace the executable.
---- tiger-3.2.1.orig/html/permissions.html
-+++ tiger-3.2.1/html/permissions.html
+diff -ru tiger.orig/html/permissions.html tiger/html/permissions.html
+--- tiger.orig/html/permissions.html	2009-03-08 14:41:40.000000000 +0000
++++ tiger/html/permissions.html	2009-03-08 14:48:36.000000000 +0000
 @@ -528,3 +528,101 @@
  loss of 'arp -a' functionality for a normal user account. (On SunOS 5.x
  systems, even this functionality isn't lost... there is no reason for
@@ -3194,8 +2637,9 @@
 +Since this file provides control over user access, if this file
 +is writable by non-root users, then unauthorized access or privileges
 +may be obtained.
---- tiger-3.2.1.orig/html/pxt.html
-+++ tiger-3.2.1/html/pxt.html
+diff -ru tiger.orig/html/pxt.html tiger/html/pxt.html
+--- tiger.orig/html/pxt.html	2009-03-08 14:41:40.000000000 +0000
++++ tiger/html/pxt.html	2009-03-08 14:48:36.000000000 +0000
 @@ -9,7 +9,7 @@
    @@ -3341,8 +2785,9 @@ -upgraded, removed or tampered with. If this modification is legitmate +upgraded, removed or tampered with. If this modification is legitimate please refresh the tripwire database by running "tripwire --update" ---- tiger-3.2.1.orig/html/rhosts.html -+++ tiger-3.2.1/html/rhosts.html +diff -ru tiger.orig/html/rhosts.html tiger/html/rhosts.html +--- tiger.orig/html/rhosts.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/rhosts.html 2009-03-08 14:48:36.000000000 +0000 @@ -173,7 +173,7 @@ @@ -3417,8 +2862,9 @@ +Consider removing the 'r' commands altogether and use safer replacements +commands, including public-key cryptography programs +(such as SSH implementations) ---- tiger-3.2.1.orig/html/rootdir.html -+++ tiger-3.2.1/html/rootdir.html +diff -ru tiger.orig/html/rootdir.html tiger/html/rootdir.html +--- tiger.orig/html/rootdir.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/rootdir.html 2009-03-08 14:48:36.000000000 +0000 @@ -10,8 +10,9 @@

    Documents for rootdir

    @@ -3450,120 +2896,9 @@ +
    +

    Code [rootdir003f]

    +The ownership of the root directory is not secure. ---- tiger-3.2.1.orig/html/rootkit.html -+++ tiger-3.2.1/html/rootkit.html -@@ -0,0 +1,109 @@ -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Documents for rootkit

    -+

    Code [rootkit001f]

    -+A test was run on the 'ls' command to determine if it 'sees' -+certain pathnames (e.g., '...','bnc','war',etc). Tiger creates -+a temporary directory, creates files with known hacker program -+names/directories, and attempts an 'ls'. If the 'ls' does not -+recognize the file, a FAIL is issued -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [rootkit002f]

    -+A test was run on the 'find' command to determine if it 'sees' -+certain pathnames (e.g., '...','bnc','war',etc). Tiger creates -+a temporary directory, creates files with known hacker program -+names/directories, and attempts an 'find'. If the 'find' does -+not recognize the file, a FAIL is issued. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [rootkit003w]

    -+The 'chkrootkit' program has detected a suspicious directory -+which might be an indication of an intrusion. -+A full analysis of the system is recommended to determine the -+presence of further signs of intrusion since a rootkit might have -+been installed. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [rootkit004w]

    -+The 'chkrootkit' program has detected a possible rootkit installation -+A full analysis of the system is recommended to determine the -+presence of further signs of intrusion since a rootkit might have -+been installed. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [rootkit005a]

    -+The 'chkrootkit' program has detected a rootkit installation -+A full analysis of the system is recommended to determine the -+presence of further signs of intrusion and to determine if the -+rootkit is indeed installed. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [rootkit006a]

    -+A rootkit is installed by intruders in systems which have been -+successfully compromised and in which they have obtained full -+administrator privileges. The installation of a rootkit is -+an indication of a major system compromise. -+

    -+If the installation of a rootkit is confirmed you are encouraged -+to power off the system and follow the steps outlined by -+Steps for Recovering from a UNIX or NT System Compromise -+(http://www.cert.org/tech_tips/root_compromise.html) ---- tiger-3.2.1.orig/html/root.html -+++ tiger-3.2.1/html/root.html +diff -ru tiger.orig/html/root.html tiger/html/root.html +--- tiger.orig/html/root.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/root.html 2009-03-08 14:48:36.000000000 +0000 @@ -43,5 +43,5 @@

    Code [root003w]

    @@ -3571,8 +2906,9 @@ -could lead to inadvertant modification of files with the root user is +could lead to inadvertent modification of files with the root user is logged in. ---- tiger-3.2.1.orig/html/signature.html -+++ tiger-3.2.1/html/signature.html +diff -ru tiger.orig/html/signature.html tiger/html/signature.html +--- tiger.orig/html/signature.html 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/html/signature.html 2009-03-08 14:48:36.000000000 +0000 @@ -424,3 +424,25 @@ field when changing the password. As a result, the 'root' account has a null password field, allowing anyone to remote shell in as root. To fix @@ -3599,126 +2935,9 @@ +http://sunsolve.sun.com/pub-cgi/patchDownload.pl?target=patchdiag.xref&method=H +

    +Once downloaded, place it in the configuration directory and rerun the script. ---- tiger-3.2.1.orig/html/ssh.html -+++ tiger-3.2.1/html/ssh.html -@@ -0,0 +1,80 @@ -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Documents for ssh

    -+

    Code [ssh001w]

    -+The Protocol directive in the sshd_config file is not in the -+allowed protocol list. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [ssh002w]

    -+The PermitRootLogin directive is not in the allowed methods -+list. This directive controls how root is allowed to use SSH. -+Valid options are: yes, without-password, forced-commands-only, -+and no. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [ssh003w]

    -+The RhostsAuthentication directive determines if .rhosts or -+/etc/hosts.equiv is sufficient authentication. This option -+only applies to protocol version 1 and is generally believed -+to be insecure. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [ssh004w]

    -+The PasswordAuthentication directive determines if passwords -+are a sufficient authentication. -+

    -+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
    -+

    Code [ssh005e]

    -+The variable SSHD_CONFIG is not defined which means that you have -+not setup (or the system has been enable to find) your SSH configuration -+files. You should setup that variable in your site-`hostname` -+configuration file. ---- tiger-3.2.1.orig/README.hostids -+++ tiger-3.2.1/README.hostids -@@ -14,7 +14,7 @@ - policy template for the module or a previous run to check against, - if available. Only messages not reported before (or not in the policy - will be checked against) --3.- The report (wether full or differential) is sent through e-mail -+3.- The report (whether full or differential) is sent through e-mail - to the address configured at 'Tiger_Mail_RCPT' - - Tiger can be configured so that it is run as a cron job hourly. -@@ -42,6 +42,7 @@ - - an integrity checker such as Tripwire (or a replacement like Aide). - - a logchecker (like logcheck) to look for security information in the - log files. -+- an specific tool to detect rootkits: chkrootkit - - (maybe) a Network IDS such as Snort. - - (maybe) a portscanner detection such as portsentry, scanlogd, - scandetd or psad (provided by Bastille) -@@ -64,10 +65,13 @@ - a) just use GPG/PGP to sign or encrypt the e-mails. You need however - to place a private key in the agent (and it could be compromised) - b) use a VPN tunnel between agents and the mailserver. This could -- be done either using a permament SSH tunnel, an Ipsec VPN... -+ be done either using a permanent SSH tunnel, an Ipsec VPN... - - 2.- there is no such thing (currently) as a Tiger Server, unlike other --HIDS (If anyone wants to write one please say so :) so there's no way to: -+HIDS (If anyone wants to write one please say so :) so there's no way to -+receive all the alerts in a single place and correlate them. -+Note: in the contrib directory you will find the 'secauditdb' program -+(not yet integrated into Tiger) which does just this. - - 3.- Tiger reports are not protected in anyway save for standard UNIX - permissions. This means that if the server Tiger is running in is ---- tiger-3.2.1.orig/man/tiger.8.in -+++ tiger-3.2.1/man/tiger.8.in +diff -ru tiger.orig/man/tiger.8.in tiger/man/tiger.8.in +--- tiger.orig/man/tiger.8.in 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/man/tiger.8.in 2009-03-08 14:48:36.000000000 +0000 @@ -2,7 +2,24 @@ .SH NAME tiger \- UNIX Security Checker @@ -3782,10 +3001,10 @@ +.I README.ignore +document. +.SH OPTIONS ++.TP ++The following arguments can be used when calling the program: .TP -.I "\-B tigerdir" -+The following arguments can be used when calling the program: -+.TP +.BI "\-B " tigerdir Specify the directory where -.I tiger @@ -4244,7 +3463,7 @@ .B lot @@ -359,12 +440,10 @@ The modifications for the Debian GNU/Linux operating system have been made - by Javier Fernandez-Sanguino Pe??a , including a number of + by Javier Fernandez-Sanguino Pe?a , including a number of checks for the GNU/Linux -operating systems ( -.B check_listeningprocs @@ -4260,8 +3479,92 @@ -.B deb_nopackfiles -). +.BR deb_nopackfiles ). ---- tiger-3.2.1.orig/man/tigexp.8 -+++ tiger-3.2.1/man/tigexp.8 +diff -ru tiger.orig/man/tigercron.8.in tiger/man/tigercron.8.in +--- tiger.orig/man/tigercron.8.in 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/man/tigercron.8.in 2009-03-08 14:48:36.000000000 +0000 +@@ -2,39 +2,47 @@ + .SH NAME + tigercron \- Cron utility for Tiger UNIX Security Checker + .SH SYNOPSIS +-.B "tigercron [-B basedir] [..tigeroptions..] [controlfile] " ++.B tigercron ++.RI [ controlfile ] ++.RB [ -B ++.IR basedir ] ++.RI [ tigeroptions ...] + .LP + .SH DESCRIPTION + .LP +-Tigercron is used to run periodically checks from the Tiger ++\fBTigercron\fR is used to run periodically checks from the Tiger + UNIX Security Checker. \fBTigercron\fR reads a control file +-which is located in '@tigerconfigdir@/cronrc'. The format +-of this control file is the same as for the \fBcron\fR program, each ++which is usually located in '@tigerconfigdir@/cronrc' although it ++can also be specificied as the first argument when calling the program. ++The format of this control file is the same as for the \fBcron\fR program, each + line indicates when different checks from \fBTiger\fR will be run. ++The user can indicate where Tiger is installed through the ++\fB-B basedir\fR parameter, any other additional options provided ++in the command line will be passed on to configure to configure \fBTiger\fR ++based on them (as described in \fBtiger (8)\fR). + + \fBTigercron\fR runs the specified checks and compares their reports + with previous stored reports (under @tigerlogdir@). It will then +-mail the user defined in the '@tigerconfigdir@/cronrc' ++mail the user defined in '@tigerconfigdir@/tigerrc' + (\fITiger_Mail_RCPT\fR) the results. + + When a module is run, \fBtigercron\fR checks: +- +-.PP +-* If \fITiger_Cron_Template\fR is set to Y in tigerrc. If it is, it checks ++.IP \(bu 4 ++If \fITiger_Cron_Template\fR is set to Y in tigerrc. If it is, it checks + if there is a template stating which are the expected results. +-.PP +-* If \fITiger_Cron_CheckPrev\fR is set to Y in tigerrc. If it is, it checks ++.IP \(bu 4 ++If \fITiger_Cron_CheckPrev\fR is set to Y in tigerrc. If it is, it checks + if there is a previous run of the module it can check against. +- ++.PP + A differential report is generated depending on the module reports + and previous run and is sent through e-mail. These reports +-provides an easy way to detect intrusions even if no configuration ++provide an easy way to detect intrusions even if no configuration + of templates has been done. In the event of an intrusion a \fBTiger\fR + check might detect something specific (file changes, new processes, + new users, etc.) and this alert mechanism provides a way to turn + \fBTiger\fR into a Host Intrusion Detection System (HIDS). + +-The hability of it to work as a proper HIDS is based on a good customization ++The ability of it to work as a proper HIDS is based on a good customization + of the cronrc file. Modules that check events to which the host is + most exposed to should be run often in order to detect deviations + from normal behaviour. +@@ -64,15 +72,15 @@ + .B Tiger + scripts to create temporary files. + .SH SEE ALSO +-tigexp(8), tiger(8), cron(8), crontab(5) ++.BR tigexp (8), tiger (8), cron (8), crontab (5) + +-The deficiencies of using \fBtigercron\fR as a HID are described in the ++The deficiencies of using \fBtigercron\fR as a HIDS are described in the + file README.hostids which is provided with the package. In Debian + GNU/Linux you will find this (and other related) documentation at + /usr/share/doc/tiger/ + .SH BUGS + Currently \fBTigercron\fR has only one alert mechanism (mail) and signatures + are not supported. Thus, alerts could be faked. Also, it is dependant +-on \fBcron\fR and will not work if its not working. ++on \fBcron\fR and will not work if \fBcron\fR is not working. + .SH AUTHOR + This manpage was written by Javier Fernandez-Sanguino. +diff -ru tiger.orig/man/tigexp.8 tiger/man/tigexp.8 +--- tiger.orig/man/tigexp.8 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/man/tigexp.8 2009-03-08 14:48:36.000000000 +0000 @@ -2,73 +2,82 @@ .SH NAME tigexp \- UNIX Security Checker Explanation Generator @@ -4385,90 +3688,9 @@ .LP .SH BUGS If the explanation index is out of date, it doesn't recognize it ---- tiger-3.2.1.orig/man/tigercron.8.in -+++ tiger-3.2.1/man/tigercron.8.in -@@ -2,39 +2,47 @@ - .SH NAME - tigercron \- Cron utility for Tiger UNIX Security Checker - .SH SYNOPSIS --.B "tigercron [-B basedir] [..tigeroptions..] [controlfile] " -+.B tigercron -+.RI [ controlfile ] -+.RB [ -B -+.IR basedir ] -+.RI [ tigeroptions ...] - .LP - .SH DESCRIPTION - .LP --Tigercron is used to run periodically checks from the Tiger -+\fBTigercron\fR is used to run periodically checks from the Tiger - UNIX Security Checker. \fBTigercron\fR reads a control file --which is located in '@tigerconfigdir@/cronrc'. The format --of this control file is the same as for the \fBcron\fR program, each -+which is usually located in '@tigerconfigdir@/cronrc' although it -+can also be specificied as the first argument when calling the program. -+The format of this control file is the same as for the \fBcron\fR program, each - line indicates when different checks from \fBTiger\fR will be run. -+The user can indicate where Tiger is installed through the -+\fB-B basedir\fR parameter, any other additional options provided -+in the command line will be passed on to configure to configure \fBTiger\fR -+based on them (as described in \fBtiger (8)\fR). - - \fBTigercron\fR runs the specified checks and compares their reports - with previous stored reports (under @tigerlogdir@). It will then --mail the user defined in the '@tigerconfigdir@/cronrc' -+mail the user defined in '@tigerconfigdir@/tigerrc' - (\fITiger_Mail_RCPT\fR) the results. - - When a module is run, \fBtigercron\fR checks: -- --.PP --* If \fITiger_Cron_Template\fR is set to Y in tigerrc. If it is, it checks -+.IP \(bu 4 -+If \fITiger_Cron_Template\fR is set to Y in tigerrc. If it is, it checks - if there is a template stating which are the expected results. --.PP --* If \fITiger_Cron_CheckPrev\fR is set to Y in tigerrc. If it is, it checks -+.IP \(bu 4 -+If \fITiger_Cron_CheckPrev\fR is set to Y in tigerrc. If it is, it checks - if there is a previous run of the module it can check against. -- -+.PP - A differential report is generated depending on the module reports - and previous run and is sent through e-mail. These reports --provides an easy way to detect intrusions even if no configuration -+provide an easy way to detect intrusions even if no configuration - of templates has been done. In the event of an intrusion a \fBTiger\fR - check might detect something specific (file changes, new processes, - new users, etc.) and this alert mechanism provides a way to turn - \fBTiger\fR into a Host Intrusion Detection System (HIDS). - --The hability of it to work as a proper HIDS is based on a good customization -+The ability of it to work as a proper HIDS is based on a good customization - of the cronrc file. Modules that check events to which the host is - most exposed to should be run often in order to detect deviations - from normal behaviour. -@@ -64,15 +72,15 @@ - .B Tiger - scripts to create temporary files. - .SH SEE ALSO --tigexp(8), tiger(8), cron(8), crontab(5) -+.BR tigexp (8), tiger (8), cron (8), crontab (5) - --The deficiencies of using \fBtigercron\fR as a HID are described in the -+The deficiencies of using \fBtigercron\fR as a HIDS are described in the - file README.hostids which is provided with the package. In Debian - GNU/Linux you will find this (and other related) documentation at - /usr/share/doc/tiger/ - .SH BUGS - Currently \fBTigercron\fR has only one alert mechanism (mail) and signatures - are not supported. Thus, alerts could be faked. Also, it is dependant --on \fBcron\fR and will not work if its not working. -+on \fBcron\fR and will not work if \fBcron\fR is not working. - .SH AUTHOR - This manpage was written by Javier Fernandez-Sanguino. ---- tiger-3.2.1.orig/README -+++ tiger-3.2.1/README +diff -ru tiger.orig/README tiger/README +--- tiger.orig/README 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/README 2009-03-08 14:48:36.000000000 +0000 @@ -37,7 +37,7 @@ Mailing lists ------------- @@ -4490,8 +3712,45 @@ an unstable release and included some new checks, a new autoconf script for automatic configuration, but mostly included fixes from bugs found after testing Tiger in Debian GNU/Linux and in other ---- tiger-3.2.1.orig/README.logo -+++ tiger-3.2.1/README.logo +diff -ru tiger.orig/README.hostids tiger/README.hostids +--- tiger.orig/README.hostids 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/README.hostids 2009-03-08 14:48:36.000000000 +0000 +@@ -14,7 +14,7 @@ + policy template for the module or a previous run to check against, + if available. Only messages not reported before (or not in the policy + will be checked against) +-3.- The report (wether full or differential) is sent through e-mail ++3.- The report (whether full or differential) is sent through e-mail + to the address configured at 'Tiger_Mail_RCPT' + + Tiger can be configured so that it is run as a cron job hourly. +@@ -42,6 +42,7 @@ + - an integrity checker such as Tripwire (or a replacement like Aide). + - a logchecker (like logcheck) to look for security information in the + log files. ++- an specific tool to detect rootkits: chkrootkit + - (maybe) a Network IDS such as Snort. + - (maybe) a portscanner detection such as portsentry, scanlogd, + scandetd or psad (provided by Bastille) +@@ -64,10 +65,13 @@ + a) just use GPG/PGP to sign or encrypt the e-mails. You need however + to place a private key in the agent (and it could be compromised) + b) use a VPN tunnel between agents and the mailserver. This could +- be done either using a permament SSH tunnel, an Ipsec VPN... ++ be done either using a permanent SSH tunnel, an Ipsec VPN... + + 2.- there is no such thing (currently) as a Tiger Server, unlike other +-HIDS (If anyone wants to write one please say so :) so there's no way to: ++HIDS (If anyone wants to write one please say so :) so there's no way to ++receive all the alerts in a single place and correlate them. ++Note: in the contrib directory you will find the 'secauditdb' program ++(not yet integrated into Tiger) which does just this. + + 3.- Tiger reports are not protected in anyway save for standard UNIX + permissions. This means that if the server Tiger is running in is +diff -ru tiger.orig/README.logo tiger/README.logo +--- tiger.orig/README.logo 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/README.logo 2009-03-08 14:48:36.000000000 +0000 @@ -3,9 +3,9 @@ ------------ @@ -4504,8 +3763,9 @@ ( http://savannah.nongnu.org/forum/forum.php?forum_id=1270), and the winner was a logo provided by OpenGraphics (http://www.coresis.com/opengraphics). The logo is available in the ---- tiger-3.2.1.orig/README.signatures -+++ tiger-3.2.1/README.signatures +diff -ru tiger.orig/README.signatures tiger/README.signatures +--- tiger.orig/README.signatures 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/README.signatures 2009-03-08 14:48:36.000000000 +0000 @@ -20,7 +20,7 @@ system you can use the scripts 'util/mksig' and 'util/mkfilelst' which will, respectively, create a signatures.$OS-$REV-$ARCH and @@ -4515,8 +3775,9 @@ rename them to 'signatures' and 'file_access_list') You can retrieve updated signatures (MD5 and SHA-1 signatures) from ---- tiger-3.2.1.orig/README.sources -+++ tiger-3.2.1/README.sources +diff -ru tiger.orig/README.sources tiger/README.sources +--- tiger.orig/README.sources 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/README.sources 2009-03-08 14:48:36.000000000 +0000 @@ -14,6 +14,14 @@ are dated) I still need to read the third edition though (http://www.oreilly.com/catalog/puis3/) @@ -5086,8 +4347,9 @@ -vold.sh -x-nolisten.sh -ziplock.sh ---- tiger-3.2.1.orig/README.writemodules -+++ tiger-3.2.1/README.writemodules +diff -ru tiger.orig/README.writemodules tiger/README.writemodules +--- tiger.orig/README.writemodules 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/README.writemodules 2009-03-08 14:48:36.000000000 +0000 @@ -27,7 +27,7 @@ After this check the core of the script is written. The core includes @@ -5108,33 +4370,9 @@ must include the message verbose description of the issue into the files (shown below). User's will be able to retrieve this information if they execute 'tigexp codeword'. Codewords are usually three letters followed ---- tiger-3.2.1.orig/check.d/README -+++ tiger-3.2.1/check.d/README -@@ -0,0 +1,22 @@ -+# -+# tiger - A UN*X security checking system -+# Copyright (C) 1993 Douglas Lee Schales, David K. Hess, David R. Safford -+# -+# 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 1, 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. -+# -+# Please see the file `COPYING' for the complete copyright notice. -+# -+#----------------------------------------------------------------------------- -+# -+# This directory is available for other packages to drop in additional check -+# scripts that will be run during the check_system security check. -+# -+# Files in this directory should contain one script name per line. ---- tiger-3.2.1.orig/tiger.in -+++ tiger-3.2.1/tiger.in +diff -ru tiger.orig/tiger.in tiger/tiger.in +--- tiger.orig/tiger.in 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/tiger.in 2009-03-08 14:48:36.000000000 +0000 @@ -38,7 +38,7 @@ echo "Tiger UN*X security checking system" echo " Developed by Texas A&M University, 1994" @@ -5144,8 +4382,9 @@ echo " Covered by the GNU General Public License (GPL)" echo TigerInstallDir="@tigerhome@" ---- tiger-3.2.1.orig/tigexp -+++ tiger-3.2.1/tigexp +diff -ru tiger.orig/tigexp tiger/tigexp +--- tiger.orig/tigexp 2009-03-08 14:41:39.000000000 +0000 ++++ tiger/tigexp 2009-03-08 14:48:36.000000000 +0000 @@ -19,7 +19,7 @@ # tigexp - 05/23/2003 - changed so that it is managed by autoconf # @@ -5155,8 +4394,9 @@ # #----------------------------------------------------------------------------- TigerInstallDir="." ---- tiger-3.2.1.orig/TODO -+++ tiger-3.2.1/TODO +diff -ru tiger.orig/TODO tiger/TODO +--- tiger.orig/TODO 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/TODO 2009-03-08 14:48:36.000000000 +0000 @@ -1,4 +1,3 @@ - Note: the up-to-date TODO list is maintained through Savannah's Task Manager @@ -5347,8 +4587,9 @@ --- Javier Fernandez-Sanguino Pen~a ---- tiger-3.2.1.orig/USING -+++ tiger-3.2.1/USING +diff -ru tiger.orig/USING tiger/USING +--- tiger.orig/USING 2009-03-08 14:41:40.000000000 +0000 ++++ tiger/USING 2009-03-08 14:48:36.000000000 +0000 @@ -72,7 +72,7 @@ there *is* new information. @@ -5358,4 +4599,3 @@ if your intention is to use Tiger in this way. ------------------------------------------------------------------------ - Index: tiger.spec =================================================================== RCS file: /cvs/pkgs/rpms/tiger/devel/tiger.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tiger.spec 25 Feb 2009 20:42:05 -0000 1.6 +++ tiger.spec 8 Mar 2009 15:23:30 -0000 1.7 @@ -1,6 +1,6 @@ Name: tiger Version: 3.2.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Security auditing on UNIX systems Group: Applications/System @@ -115,6 +115,9 @@ %changelog +* Sun Mar 08 2009 Caol??n McNamara 3.2.1-10 +- defuzz patches to rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 3.2.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From caolanm at fedoraproject.org Sun Mar 8 15:26:52 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Sun, 8 Mar 2009 15:26:52 +0000 (UTC) Subject: rpms/abrt/devel abrt-0.0.1-newenum.patch, NONE, 1.1 abrt.spec, 1.2, 1.3 Message-ID: <20090308152653.002F670119@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/abrt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2799 Modified Files: abrt.spec Added Files: abrt-0.0.1-newenum.patch Log Message: 0 -> RPMFI_NOHEADER enum for new rpmfiNew abrt-0.0.1-newenum.patch: --- NEW FILE abrt-0.0.1-newenum.patch --- diff -ru abrt-0.0.1.orig/lib/MiddleWare/RPMInfo.cpp abrt-0.0.1/lib/MiddleWare/RPMInfo.cpp --- abrt-0.0.1.orig/lib/MiddleWare/RPMInfo.cpp 2009-03-03 16:17:40.000000000 +0000 +++ abrt-0.0.1/lib/MiddleWare/RPMInfo.cpp 2009-03-08 15:18:54.000000000 +0000 @@ -72,7 +72,7 @@ Header header; if ((header = rpmdbNextIterator(iter)) != NULL) { - rpmfi fi = rpmfiNew(ts, header, RPMTAG_BASENAMES, 0); + rpmfi fi = rpmfiNew(ts, header, RPMTAG_BASENAMES, RPMFI_NOHEADER); pgpHashAlgo hashAlgo; std::string headerHash; char computedHash[1024] = ""; Index: abrt.spec =================================================================== RCS file: /cvs/pkgs/rpms/abrt/devel/abrt.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- abrt.spec 7 Mar 2009 16:42:07 -0000 1.2 +++ abrt.spec 8 Mar 2009 15:26:22 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 0.0.1 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/crash-catcher/ @@ -15,6 +15,8 @@ BuildRequires: desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: abrt-0.0.1-newenum.patch + %description %{name} is a tool to help users to detect defects in applications and to create a bug report with all informations needed by maintainer to fix it. @@ -91,6 +93,7 @@ %prep %setup -q +%patch0 -p1 -b .newenum %build %configure @@ -179,6 +182,9 @@ %{_libdir}/%{name}/libMailx.so* %changelog +* Sun Mar 08 2009 Caol??n McNamara - 0.0.1-14 +- 0 -> RPMFI_NOHEADER enum for new rpmfiNew + * Sat Mar 07 2009 Jesse Keating - 0.0.1-13 - Bump for new rpm From tuxbrewr at fedoraproject.org Sun Mar 8 15:27:02 2009 From: tuxbrewr at fedoraproject.org (Steven M. Parrish) Date: Sun, 8 Mar 2009 15:27:02 +0000 (UTC) Subject: rpms/liferea/devel liferea.spec,1.130,1.131 Message-ID: <20090308152702.8CF5F70119@cvs1.fedora.phx.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/liferea/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2878 Modified Files: liferea.spec Log Message: New upstream release Index: liferea.spec =================================================================== RCS file: /cvs/pkgs/rpms/liferea/devel/liferea.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- liferea.spec 25 Feb 2009 20:19:02 -0000 1.130 +++ liferea.spec 8 Mar 2009 15:26:31 -0000 1.131 @@ -1,8 +1,8 @@ %define gecko_ver 1.8.1.14 Name: liferea -Version: 1.4.23 -Release: 4%{?dist} +Version: 1.4.26 +Release: 1%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -10,7 +10,7 @@ URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-fedorafeed.patch -Patch1: liferea-1.4.23-webkit-fix.patch +#Patch1: liferea-1.4.23-webkit-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: GConf2-devel @@ -53,7 +53,7 @@ %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .fedorafeed -%patch1 -p1 -b .webkitfix +#patch1 -p1 -b .webkitfix %build %configure --disable-schemas-install --disable-gtkhtml2 --disable-lua --with-gecko=libxul --enable-webkit @@ -130,6 +130,9 @@ %{_libdir}/%{name}/liblihtmlw.so %changelog +* Sun Mar 08 2009 Steven M. Parrish 1.4.26-1 +- New upstream release + * Wed Feb 25 2009 Fedora Release Engineering - 1.4.23-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From tuxbrewr at fedoraproject.org Sun Mar 8 15:36:49 2009 From: tuxbrewr at fedoraproject.org (Steven M. Parrish) Date: Sun, 8 Mar 2009 15:36:49 +0000 (UTC) Subject: rpms/liferea/devel .cvsignore,1.79,1.80 sources,1.80,1.81 Message-ID: <20090308153649.9272C70116@cvs1.fedora.phx.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/liferea/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5561 Modified Files: .cvsignore sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liferea/devel/.cvsignore,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- .cvsignore 11 Jan 2009 18:39:45 -0000 1.79 +++ .cvsignore 8 Mar 2009 15:36:47 -0000 1.80 @@ -1 +1 @@ -liferea-1.4.23.tar.gz +liferea-1.4.26.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liferea/devel/sources,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- sources 11 Jan 2009 18:39:46 -0000 1.80 +++ sources 8 Mar 2009 15:36:47 -0000 1.81 @@ -1 +1 @@ -7772f04bd3ed995b7ce36e52d26ec088 liferea-1.4.23.tar.gz +d4ce9e710e3fb988bd5e4c2debe89331 liferea-1.4.26.tar.gz From mtasaka at fedoraproject.org Sun Mar 8 16:05:26 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 8 Mar 2009 16:05:26 +0000 (UTC) Subject: rpms/gnome-commander/devel .cvsignore, 1.26, 1.27 gnome-commander.spec, 1.50, 1.51 sources, 1.26, 1.27 Message-ID: <20090308160527.5368870116@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/gnome-commander/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12140 Modified Files: .cvsignore gnome-commander.spec sources Log Message: Update to latest Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 21 Feb 2009 13:03:33 -0000 1.26 +++ .cvsignore 8 Mar 2009 16:04:50 -0000 1.27 @@ -1 +1 @@ -gnome-commander-1.2.8-svn2475_trunk.tar.bz2 +gnome-commander-1.2.8-svn2483_trunk.tar.bz2 Index: gnome-commander.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- gnome-commander.spec 23 Feb 2009 21:37:21 -0000 1.50 +++ gnome-commander.spec 8 Mar 2009 16:04:51 -0000 1.51 @@ -18,7 +18,7 @@ %define use_autotool 0 %define if_pre 1 %define main_release 3 -%define extratag svn2475_trunk +%define extratag svn2483_trunk %define mimeedit_rev 1958 %if 0%{?if_pre} > 0 @@ -210,15 +210,12 @@ %{_datadir}/pixmaps/%{name}/ %changelog +* Mon Mar 9 2009 Mamoru Tasaka +- rev 2483 + * Tue Feb 24 2009 Mamoru Tasaka - F-11: Mass rebuild -* Sat Feb 21 2009 Mamoru Tasaka -- rev 2475 - -* Sun Feb 1 2009 Mamoru Tasaka -- rev 2448 - * Thu Dec 18 2008 Rex Dieter - respin (exiv2) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 21 Feb 2009 13:03:33 -0000 1.26 +++ sources 8 Mar 2009 16:04:51 -0000 1.27 @@ -1 +1 @@ -1dc32376713cfa25e57b8112e4990d9a gnome-commander-1.2.8-svn2475_trunk.tar.bz2 +7e07e73c336d728b6dc6517e0eaedd68 gnome-commander-1.2.8-svn2483_trunk.tar.bz2 From lspooky at fedoraproject.org Sun Mar 8 17:02:59 2009 From: lspooky at fedoraproject.org (Henrique Junior) Date: Sun, 8 Mar 2009 17:02:59 +0000 (UTC) Subject: rpms/bkchem/F-9 bkchem-crash.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 bkchem.spec, 1.4, 1.5 import.log, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <20090308170259.C6F4D70119@cvs1.fedora.phx.redhat.com> Author: lspooky Update of /cvs/pkgs/rpms/bkchem/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22912/F-9 Modified Files: .cvsignore bkchem.spec import.log sources Added Files: bkchem-crash.patch Log Message: Patch to fix some problems loading modules bkchem-crash.patch: --- NEW FILE bkchem-crash.patch --- --- bkchem/paper.py.debug 2009-02-17 22:37:59.000000000 +0900 +++ bkchem/paper.py 2009-03-09 00:07:30.000000000 +0900 @@ -27,8 +27,12 @@ import classes import arrow from molecule import molecule -from oasa.oasa.transform import transform -from oasa.oasa.transform3d import transform3d +try: + from oasa.oasa.transform import transform + from oasa.oasa.transform3d import transform3d +except ImportError: + from oasa.transform import transform + from oasa.transform3d import transform3d import misc from temp_manager import template_manager import string --- bkchem/temp_manager.py.debug 2009-02-17 22:38:15.000000000 +0900 +++ bkchem/temp_manager.py 2009-03-09 00:11:04.000000000 +0900 @@ -24,7 +24,10 @@ """template manager resides here""" import math -from oasa.oasa.transform import transform +try: + from oasa.oasa.transform import transform +except ImportError: + from oasa.transform import transform from molecule import molecule import xml.dom.minidom as dom from warnings import warn Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Mar 2009 15:02:49 -0000 1.5 +++ .cvsignore 8 Mar 2009 17:02:23 -0000 1.6 @@ -1 +1 @@ -bkchem-0.12.6.tar.gz +bkchem-0.13.0.tar.gz Index: bkchem.spec =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-9/bkchem.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bkchem.spec 8 Mar 2009 15:02:49 -0000 1.4 +++ bkchem.spec 8 Mar 2009 17:02:24 -0000 1.5 @@ -2,15 +2,16 @@ Name: bkchem Version: 0.13.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Chemical drawing program Group: Applications/Engineering License: GPLv2+ and GFDL URL: http://bkchem.zirael.org/ Group: Applications/Engineering -Source0: http://bkchem.zirael.org/download/%{name}-0.12.6.tar.gz +Source0: http://bkchem.zirael.org/download/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch1: bkchem-setup.patch +Patch2: bkchem-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel desktop-file-utils @@ -21,8 +22,9 @@ written by Beda Kosata. %prep -%setup -q -n %{name}-0.12.6 +%setup -q -n %{name}-%{version} %patch1 -p1 -b .bkchem-setup +%patch2 -p0 -b .bkchem-crash %{__rm} -rf %{_builddir}/%{name}-%{version}/%{name}/oasa %{__rm} -f %{_builddir}/%{name}-%{version}/%{name}/Pmw*.py %{__rm} -rf %{_builddir}/%{name}-%{version}/%{name}/plugins/piddle @@ -61,8 +63,11 @@ %{python_sitelib}/%{name}* %changelog -* Tue Feb 19 2009 Henrique (LonelySpooky) Junior - 0.13.0-2 -- One step back to solve one bug +* Thu Feb 24 2009 Henrique (LonelySpooky) Junior - 0.13.0-3 +- InChI generation is now compatibile with old InChI versions (1.0 and 1.0.1) +double bonds in 3D rotated molecules look much better now (z-coordinate is taken +into account when the bond is drawn) + * Tue Feb 19 2009 Henrique (LonelySpooky) Junior - 0.12.6-1 - This release brings new options for 3D rotation - ability to fix one bond and rotate Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-9/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Mar 2009 15:02:49 -0000 1.4 +++ import.log 8 Mar 2009 17:02:24 -0000 1.5 @@ -2,3 +2,4 @@ bkchem-0_12_6-1_fc10:F-9:bkchem-0.12.6-1.fc10.src.rpm:1235069144 bkchem-0_13_0-1_fc10:F-9:bkchem-0.13.0-1.fc10.src.rpm:1235698722 bkchem-0_13_0-2_fc10:F-9:bkchem-0.13.0-2.fc10.src.rpm:1236524476 +bkchem-0_13_0-3_fc10:F-9:bkchem-0.13.0-3.fc10.src.rpm:1236531542 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Mar 2009 15:02:49 -0000 1.5 +++ sources 8 Mar 2009 17:02:25 -0000 1.6 @@ -1 +1 @@ -50718a160887985814f5b3b1377b30c9 bkchem-0.12.6.tar.gz +41c55059794399526f4f6fc74af556bb bkchem-0.13.0.tar.gz From lspooky at fedoraproject.org Sun Mar 8 17:06:02 2009 From: lspooky at fedoraproject.org (Henrique Junior) Date: Sun, 8 Mar 2009 17:06:02 +0000 (UTC) Subject: rpms/bkchem/F-10 bkchem-crash.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 bkchem.spec, 1.4, 1.5 import.log, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <20090308170602.6056F70116@cvs1.fedora.phx.redhat.com> Author: lspooky Update of /cvs/pkgs/rpms/bkchem/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24444/F-10 Modified Files: .cvsignore bkchem.spec import.log sources Added Files: bkchem-crash.patch Log Message: Patch to fix some problems loading modules bkchem-crash.patch: --- NEW FILE bkchem-crash.patch --- --- bkchem/paper.py.debug 2009-02-17 22:37:59.000000000 +0900 +++ bkchem/paper.py 2009-03-09 00:07:30.000000000 +0900 @@ -27,8 +27,12 @@ import classes import arrow from molecule import molecule -from oasa.oasa.transform import transform -from oasa.oasa.transform3d import transform3d +try: + from oasa.oasa.transform import transform + from oasa.oasa.transform3d import transform3d +except ImportError: + from oasa.transform import transform + from oasa.transform3d import transform3d import misc from temp_manager import template_manager import string --- bkchem/temp_manager.py.debug 2009-02-17 22:38:15.000000000 +0900 +++ bkchem/temp_manager.py 2009-03-09 00:11:04.000000000 +0900 @@ -24,7 +24,10 @@ """template manager resides here""" import math -from oasa.oasa.transform import transform +try: + from oasa.oasa.transform import transform +except ImportError: + from oasa.transform import transform from molecule import molecule import xml.dom.minidom as dom from warnings import warn Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-10/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Mar 2009 15:05:32 -0000 1.5 +++ .cvsignore 8 Mar 2009 17:05:30 -0000 1.6 @@ -1 +1 @@ -bkchem-0.12.6.tar.gz +bkchem-0.13.0.tar.gz Index: bkchem.spec =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-10/bkchem.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bkchem.spec 8 Mar 2009 15:05:32 -0000 1.4 +++ bkchem.spec 8 Mar 2009 17:05:31 -0000 1.5 @@ -2,15 +2,16 @@ Name: bkchem Version: 0.13.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Chemical drawing program Group: Applications/Engineering License: GPLv2+ and GFDL URL: http://bkchem.zirael.org/ Group: Applications/Engineering -Source0: http://bkchem.zirael.org/download/%{name}-0.12.6.tar.gz +Source0: http://bkchem.zirael.org/download/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch1: bkchem-setup.patch +Patch2: bkchem-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel desktop-file-utils @@ -21,8 +22,9 @@ written by Beda Kosata. %prep -%setup -q -n %{name}-0.12.6 +%setup -q -n %{name}-%{version} %patch1 -p1 -b .bkchem-setup +%patch2 -p0 -b .bkchem-crash %{__rm} -rf %{_builddir}/%{name}-%{version}/%{name}/oasa %{__rm} -f %{_builddir}/%{name}-%{version}/%{name}/Pmw*.py %{__rm} -rf %{_builddir}/%{name}-%{version}/%{name}/plugins/piddle @@ -61,8 +63,11 @@ %{python_sitelib}/%{name}* %changelog -* Tue Feb 19 2009 Henrique (LonelySpooky) Junior - 0.13.0-2 -- One step back to solve one bug +* Thu Feb 24 2009 Henrique (LonelySpooky) Junior - 0.13.0-3 +- InChI generation is now compatibile with old InChI versions (1.0 and 1.0.1) +double bonds in 3D rotated molecules look much better now (z-coordinate is taken +into account when the bond is drawn) + * Tue Feb 19 2009 Henrique (LonelySpooky) Junior - 0.12.6-1 - This release brings new options for 3D rotation - ability to fix one bond and rotate Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-10/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Mar 2009 15:05:33 -0000 1.4 +++ import.log 8 Mar 2009 17:05:31 -0000 1.5 @@ -2,3 +2,4 @@ bkchem-0_12_6-1_fc10:F-10:bkchem-0.12.6-1.fc10.src.rpm:1235069342 bkchem-0_13_0-1_fc10:F-10:bkchem-0.13.0-1.fc10.src.rpm:1235698985 bkchem-0_13_0-2_fc10:F-10:bkchem-0.13.0-2.fc10.src.rpm:1236524613 +bkchem-0_13_0-3_fc10:F-10:bkchem-0.13.0-3.fc10.src.rpm:1236531811 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Mar 2009 15:05:33 -0000 1.5 +++ sources 8 Mar 2009 17:05:31 -0000 1.6 @@ -1 +1 @@ -50718a160887985814f5b3b1377b30c9 bkchem-0.12.6.tar.gz +41c55059794399526f4f6fc74af556bb bkchem-0.13.0.tar.gz From lspooky at fedoraproject.org Sun Mar 8 17:08:35 2009 From: lspooky at fedoraproject.org (Henrique Junior) Date: Sun, 8 Mar 2009 17:08:35 +0000 (UTC) Subject: rpms/bkchem/devel bkchem-crash.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 bkchem.spec, 1.5, 1.6 import.log, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <20090308170835.7862770116@cvs1.fedora.phx.redhat.com> Author: lspooky Update of /cvs/pkgs/rpms/bkchem/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25047/devel Modified Files: .cvsignore bkchem.spec import.log sources Added Files: bkchem-crash.patch Log Message: Patch to fix some problems loading modules bkchem-crash.patch: --- NEW FILE bkchem-crash.patch --- --- bkchem/paper.py.debug 2009-02-17 22:37:59.000000000 +0900 +++ bkchem/paper.py 2009-03-09 00:07:30.000000000 +0900 @@ -27,8 +27,12 @@ import classes import arrow from molecule import molecule -from oasa.oasa.transform import transform -from oasa.oasa.transform3d import transform3d +try: + from oasa.oasa.transform import transform + from oasa.oasa.transform3d import transform3d +except ImportError: + from oasa.transform import transform + from oasa.transform3d import transform3d import misc from temp_manager import template_manager import string --- bkchem/temp_manager.py.debug 2009-02-17 22:38:15.000000000 +0900 +++ bkchem/temp_manager.py 2009-03-09 00:11:04.000000000 +0900 @@ -24,7 +24,10 @@ """template manager resides here""" import math -from oasa.oasa.transform import transform +try: + from oasa.oasa.transform import transform +except ImportError: + from oasa.transform import transform from molecule import molecule import xml.dom.minidom as dom from warnings import warn Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Mar 2009 15:08:51 -0000 1.5 +++ .cvsignore 8 Mar 2009 17:08:04 -0000 1.6 @@ -1 +1 @@ -bkchem-0.12.6.tar.gz +bkchem-0.13.0.tar.gz Index: bkchem.spec =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/devel/bkchem.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bkchem.spec 8 Mar 2009 15:08:51 -0000 1.5 +++ bkchem.spec 8 Mar 2009 17:08:04 -0000 1.6 @@ -2,15 +2,16 @@ Name: bkchem Version: 0.13.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Chemical drawing program Group: Applications/Engineering License: GPLv2+ and GFDL URL: http://bkchem.zirael.org/ Group: Applications/Engineering -Source0: http://bkchem.zirael.org/download/%{name}-0.12.6.tar.gz +Source0: http://bkchem.zirael.org/download/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch1: bkchem-setup.patch +Patch2: bkchem-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel desktop-file-utils @@ -21,8 +22,9 @@ written by Beda Kosata. %prep -%setup -q -n %{name}-0.12.6 +%setup -q -n %{name}-%{version} %patch1 -p1 -b .bkchem-setup +%patch2 -p0 -b .bkchem-crash %{__rm} -rf %{_builddir}/%{name}-%{version}/%{name}/oasa %{__rm} -f %{_builddir}/%{name}-%{version}/%{name}/Pmw*.py %{__rm} -rf %{_builddir}/%{name}-%{version}/%{name}/plugins/piddle @@ -61,8 +63,11 @@ %{python_sitelib}/%{name}* %changelog -* Tue Feb 19 2009 Henrique (LonelySpooky) Junior - 0.13.0-2 -- One step back to solve one bug +* Thu Feb 24 2009 Henrique (LonelySpooky) Junior - 0.13.0-3 +- InChI generation is now compatibile with old InChI versions (1.0 and 1.0.1) +double bonds in 3D rotated molecules look much better now (z-coordinate is taken +into account when the bond is drawn) + * Tue Feb 19 2009 Henrique (LonelySpooky) Junior - 0.12.6-1 - This release brings new options for 3D rotation - ability to fix one bond and rotate Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/devel/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Mar 2009 15:08:51 -0000 1.4 +++ import.log 8 Mar 2009 17:08:04 -0000 1.5 @@ -2,3 +2,4 @@ bkchem-0_12_6-1_fc10:HEAD:bkchem-0.12.6-1.fc10.src.rpm:1235069569 bkchem-0_13_0-1_fc10:HEAD:bkchem-0.13.0-1.fc10.src.rpm:1235699163 bkchem-0_13_0-2_fc10:HEAD:bkchem-0.13.0-2.fc10.src.rpm:1236524763 +bkchem-0_13_0-3_fc10:HEAD:bkchem-0.13.0-3.fc10.src.rpm:1236531972 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bkchem/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Mar 2009 15:08:51 -0000 1.5 +++ sources 8 Mar 2009 17:08:04 -0000 1.6 @@ -1 +1 @@ -50718a160887985814f5b3b1377b30c9 bkchem-0.12.6.tar.gz +41c55059794399526f4f6fc74af556bb bkchem-0.13.0.tar.gz From robert at fedoraproject.org Sun Mar 8 17:32:32 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 8 Mar 2009 17:32:32 +0000 (UTC) Subject: rpms/perl/devel perl.spec,1.205,1.206 Message-ID: <20090308173232.7864870116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/perl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30548 Modified Files: perl.spec Log Message: Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- perl.spec 16 Feb 2009 18:27:31 -0000 1.205 +++ perl.spec 8 Mar 2009 17:31:57 -0000 1.206 @@ -7,7 +7,7 @@ Name: perl Version: %{perl_version} -Release: 58%{?dist} +Release: 59%{?dist} Epoch: %{perl_epoch} Summary: Practical Extraction and Report Language Group: Development/Languages @@ -1715,6 +1715,9 @@ # Old changelog entries are preserved in CVS. %changelog +* Sun Mar 08 2009 Robert Scheck - 4:5.10.0-59 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 16 2009 Tom "spot" Callaway - 4:5.10.0-58 - add /usr/lib/perl5/site_perl to otherlibs (bz 484053) From mjakubicek at fedoraproject.org Sun Mar 8 17:46:12 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Sun, 8 Mar 2009 17:46:12 +0000 (UTC) Subject: rpms/boinc-client/devel boinc-client-init-d, 1.5, 1.6 boinc-client.spec, 1.27, 1.28 boinc-gccflags.patch, 1.3, 1.4 Message-ID: <20090308174612.936B770116@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/boinc-client/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1337 Modified Files: boinc-client-init-d boinc-client.spec boinc-gccflags.patch Log Message: - Fix overriding $BOINCOPTS from /etc/sysconfig/boinc-client in the init script (BZ#489199). - Fix reference to sample sysconfig configuration file (boinc-client instead of boinc). - Fixed boinc-gccflags.patch Index: boinc-client-init-d =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client-init-d,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- boinc-client-init-d 13 Dec 2008 14:02:56 -0000 1.5 +++ boinc-client-init-d 8 Mar 2009 17:45:41 -0000 1.6 @@ -67,6 +67,11 @@ LOGFILE=/var/log/boinc.log ERRORLOG=/var/log/boincerr.log +# BOINC options: for the command line when running the client. +# Be aware that --allow_remote_gui_rpc opens up your machine to the world! +# +#BOINCOPTS="--allow_remote_gui_rpc" +BOINCOPTS=" --daemon" # Subsys lock file ... @@ -101,10 +106,10 @@ ## Look for any local configuration settings which override all above -if [ -f /etc/sysconfig/boinc ]; then - . /etc/sysconfig/boinc -elif [ -f /etc/default/boinc ]; then - . /etc/default/boinc +if [ -f /etc/sysconfig/boinc-client ]; then + . /etc/sysconfig/boinc-client +elif [ -f /etc/default/boinc-client ]; then + . /etc/default/boinc-client fi @@ -117,12 +122,6 @@ exit 7 fi -# BOINC options: for the command line when running the client. -# Be aware that --allow_remote_gui_rpc opens up your machine to the world! -# -#BOINCOPTS="--allow_remote_gui_rpc" -BOINCOPTS="--daemon --dir $BOINCDIR" - # Some additional places to look for the client executable # (Should do this after init.d/functions and sysconfig/boinc, which sets PATH) @@ -172,7 +171,7 @@ exit 4 fi - daemon --check $BOINCEXE --user $BOINCUSER +19 "$BOINCEXE $BOINCOPTS" >>$LOGFILE 2>>$ERRORLOG & + daemon --check $BOINCEXE --user $BOINCUSER +19 "$BOINCEXE" $BOINCOPTS --dir $BOINCDIR >>$LOGFILE 2>>$ERRORLOG & try=0 while [ $try -lt 10 ] ; do PID=`pidof -s -x -o $$ -o $PPID -o %PPID $BOINCEXE` Index: boinc-client.spec =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- boinc-client.spec 7 Mar 2009 01:36:17 -0000 1.27 +++ boinc-client.spec 8 Mar 2009 17:45:41 -0000 1.28 @@ -4,7 +4,7 @@ Summary: The BOINC client core Name: boinc-client Version: 6.4.7 -Release: 1.r%{revision}svn%{?dist} +Release: 2.r%{revision}svn%{?dist} License: LGPLv2+ Group: Applications/Engineering URL: http://boinc.berkeley.edu/ @@ -300,6 +300,13 @@ %{_includedir}/boinc/* %changelog +* Sun Mar 08 2009 Milos Jakubicek - 6.4.7-2.r17542svn +- Fix overriding $BOINCOPTS from /etc/sysconfig/boinc-client in the init script + (BZ#489199). +- Fix reference to sample sysconfig configuration file (boinc-client instead of + boinc). +- Fixed boinc-gccflags.patch + * Fri Mar 06 2009 Milos Jakubicek - 6.4.7-1.r17542svn - i386 arch conditional replaced by the %%{ix86} macro. - Rebase to current 6.4 branch, therefore using new suffix "r[revision]svn" boinc-gccflags.patch: Index: boinc-gccflags.patch =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-gccflags.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- boinc-gccflags.patch 2 Jan 2009 07:08:23 -0000 1.3 +++ boinc-gccflags.patch 8 Mar 2009 17:45:41 -0000 1.4 @@ -5,7 +5,7 @@ boinc_client_DEPENDENCIES = -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS) -+boinc_client_CPPFLAGS = -O3 -ffast-math $(AM_CPPFLAGS) ++boinc_client_CPPFLAGS = -O3 -fforce-addr $(AM_CPPFLAGS) boinc_client_LDFLAGS = -static-libgcc boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS) @@ -16,7 +16,7 @@ boinc_client_DEPENDENCIES = -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS) -+boinc_client_CPPFLAGS = -O3 -ffast-math $(AM_CPPFLAGS) ++boinc_client_CPPFLAGS = -O3 -fforce-addr $(AM_CPPFLAGS) boinc_client_LDFLAGS = -static-libgcc boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS) boinc_clientdir = $(bindir) From madko at fedoraproject.org Sun Mar 8 18:03:36 2009 From: madko at fedoraproject.org (Edouard Bourguignon) Date: Sun, 8 Mar 2009 18:03:36 +0000 (UTC) Subject: rpms/purple-msn-pecan/devel purple-msn-pecan-0.0.18_ru-po.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 purple-msn-pecan.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090308180337.2BF1970116@cvs1.fedora.phx.redhat.com> Author: madko Update of /cvs/pkgs/rpms/purple-msn-pecan/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5153 Modified Files: .cvsignore purple-msn-pecan.spec sources Added Files: purple-msn-pecan-0.0.18_ru-po.patch Log Message: Upgrade to version 0.0.18 purple-msn-pecan-0.0.18_ru-po.patch: --- NEW FILE purple-msn-pecan-0.0.18_ru-po.patch --- --- po/libmsn-pecan-ru.po.orig 2009-03-08 18:40:52.000000000 +0100 +++ po/libmsn-pecan-ru.po 2009-03-08 18:48:32.000000000 +0100 @@ -352,6 +352,20 @@ "\n" "?????????? ????????, ?????? ???????????????????????? ?????????? ????????????????????????, ???? ?????????????????????????? ?????????????? " "??????????????." +msgstr[1] "" +"???????????????????????? MSN-?????????????? ?????????? ???????????????????? ???? %d ??????????. ???? ???????????? " +"?????????????????????????? ?????????????????? ???? ?????? ??????????. ????????????????????, ?????????????????? ??????????-???????? " +"????????????????????.\n" +"\n" +"?????????? ????????, ?????? ???????????????????????? ?????????? ????????????????????????, ???? ?????????????????????????? ?????????????? " +"??????????????." +msgstr[2] "" +"???????????????????????? MSN-?????????????? ?????????? ???????????????????? ???? %d ??????????. ???? ???????????? " +"?????????????????????????? ?????????????????? ???? ?????? ??????????. ????????????????????, ?????????????????? ??????????-???????? " +"????????????????????.\n" +"\n" +"?????????? ????????, ?????? ???????????????????????? ?????????? ????????????????????????, ???? ?????????????????????????? ?????????????? " +"??????????????." #: session.c:340 msgid "Our protocol is not supported by the server." Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/purple-msn-pecan/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Jan 2009 19:05:09 -0000 1.2 +++ .cvsignore 8 Mar 2009 18:03:04 -0000 1.3 @@ -1 +1 @@ -msn-pecan-0.0.17.tar.bz2 +msn-pecan-0.0.18.tar.bz2 Index: purple-msn-pecan.spec =================================================================== RCS file: /cvs/pkgs/rpms/purple-msn-pecan/devel/purple-msn-pecan.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- purple-msn-pecan.spec 27 Feb 2009 03:06:09 -0000 1.2 +++ purple-msn-pecan.spec 8 Mar 2009 18:03:05 -0000 1.3 @@ -1,13 +1,14 @@ %define realname msn-pecan Name: purple-%{realname} -Version: 0.0.17 -Release: 5%{?dist} +Version: 0.0.18 +Release: 1%{?dist} Summary: Alternative MSN protocol plugin for libpurple Group: Applications/Internet License: GPLv2+ URL: http://code.google.com/p/msn-pecan/ Source0: http://msn-pecan.googlecode.com/files/%{realname}-%{version}.tar.bz2 +Patch0: purple-msn-pecan-0.0.18_ru-po.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpurple-devel @@ -32,6 +33,7 @@ %prep %setup -q -n %{realname}-%{version} +%patch0 -p0 -b ru-po.rej %build @@ -62,8 +64,9 @@ %changelog -* Thu Feb 26 2009 Fedora Release Engineering - 0.0.17-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Sun Mar 8 2009 Edouard Bourguignon - 0.0.18-1 +- Upgrade to 0.0.18 +- Patch russion translation file for missing plural line 348 in po/libmsn-pecan-ru.po * Mon Jan 19 2009 Edouard Bourguignon - 0.0.17-4 - Remove DEBUG make option Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/purple-msn-pecan/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Jan 2009 19:05:09 -0000 1.2 +++ sources 8 Mar 2009 18:03:05 -0000 1.3 @@ -1 +1 @@ -d0539f835d02c94774d06a7877e575ac msn-pecan-0.0.17.tar.bz2 +8e8a6effbea87bad70610d14a01a4429 msn-pecan-0.0.18.tar.bz2 From madko at fedoraproject.org Sun Mar 8 18:23:21 2009 From: madko at fedoraproject.org (Edouard Bourguignon) Date: Sun, 8 Mar 2009 18:23:21 +0000 (UTC) Subject: rpms/purple-msn-pecan/devel purple-msn-pecan.spec,1.3,1.4 Message-ID: <20090308182321.BBD2F70116@cvs1.fedora.phx.redhat.com> Author: madko Update of /cvs/pkgs/rpms/purple-msn-pecan/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9636 Modified Files: purple-msn-pecan.spec Log Message: Up-to-date description Index: purple-msn-pecan.spec =================================================================== RCS file: /cvs/pkgs/rpms/purple-msn-pecan/devel/purple-msn-pecan.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- purple-msn-pecan.spec 8 Mar 2009 18:03:05 -0000 1.3 +++ purple-msn-pecan.spec 8 Mar 2009 18:22:48 -0000 1.4 @@ -1,7 +1,7 @@ %define realname msn-pecan Name: purple-%{realname} Version: 0.0.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Alternative MSN protocol plugin for libpurple Group: Applications/Internet @@ -17,18 +17,26 @@ %description -The project aims to have a much faster development process, low barrier for +The project aims to have a much faster development process, low barrier for contributions, and close contact with the user-base. -Features include: +Compared to Pidgin's official MSN plug-in: - * Support for personal messages + * Faster log-in + * Fewer connection issues + * Fewer crashes + * Experimental direct connection support (fast file transfers) * Server-side storage for display names (private alias) - * Partial direct connection support - * Improved network IO - * Improved error handling - * Network issues tested with netem - * GObject usage + * Support for handwritten messages (read-only) + * Support for voice clips (receive-only) + * Support for Plus! sounds (receive-only) + * Option to hide Plus! tags + +Other features: + + * Support for personal status messages + * Support for offline messaging (read-only) + * Send custom emoticons (Pidgin >= 2.5) %prep @@ -64,6 +72,9 @@ %changelog +* Sun Mar 8 2009 Edouard Bourguignon - 0.0.18-2 +- Up-to-date description + * Sun Mar 8 2009 Edouard Bourguignon - 0.0.18-1 - Upgrade to 0.0.18 - Patch russion translation file for missing plural line 348 in po/libmsn-pecan-ru.po From robert at fedoraproject.org Sun Mar 8 18:25:23 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 8 Mar 2009 18:25:23 +0000 (UTC) Subject: rpms/Hermes/devel Hermes.spec,1.18,1.19 Message-ID: <20090308182524.03C8A70116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/Hermes/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10164 Modified Files: Hermes.spec Log Message: Solve the ppc64-redhat-linux-gnu configure target error Index: Hermes.spec =================================================================== RCS file: /cvs/pkgs/rpms/Hermes/devel/Hermes.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Hermes.spec 23 Feb 2009 21:24:22 -0000 1.18 +++ Hermes.spec 8 Mar 2009 18:24:53 -0000 1.19 @@ -1,6 +1,6 @@ Name: Hermes Version: 1.3.3 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Pixel format conversion library Group: System Environment/Libraries License: LGPLv2+ @@ -9,6 +9,7 @@ Source: %{name}-%{version}.tar.bz2 Patch0: Hermes-1.3.3-debian.patch Patch1: Hermes-1.3.3-64bit.patch +BuildRequires: automake BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -47,6 +48,8 @@ for i in src/*.S; do echo '.section .note.GNU-stack,"", at progbits' >> $i done +# Needed for ppc64, automake can't be run here +cp -f %{_datadir}/automake-*/config.* . %build @@ -82,6 +85,9 @@ %changelog +* Sun Mar 09 2009 Robert Scheck 1.3.3-16 +- Solve the ppc64-redhat-linux-gnu configure target error + * Mon Feb 23 2009 Fedora Release Engineering - 1.3.3-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From madko at fedoraproject.org Sun Mar 8 18:38:33 2009 From: madko at fedoraproject.org (Edouard Bourguignon) Date: Sun, 8 Mar 2009 18:38:33 +0000 (UTC) Subject: rpms/purple-msn-pecan/F-9 purple-msn-pecan-0.0.18_ru-po.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 purple-msn-pecan.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090308183833.EA6D170119@cvs1.fedora.phx.redhat.com> Author: madko Update of /cvs/pkgs/rpms/purple-msn-pecan/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12971 Modified Files: .cvsignore purple-msn-pecan.spec sources Added Files: purple-msn-pecan-0.0.18_ru-po.patch Log Message: upgrade to version 0.0.18 purple-msn-pecan-0.0.18_ru-po.patch: --- NEW FILE purple-msn-pecan-0.0.18_ru-po.patch --- --- po/libmsn-pecan-ru.po.orig 2009-03-08 18:40:52.000000000 +0100 +++ po/libmsn-pecan-ru.po 2009-03-08 18:48:32.000000000 +0100 @@ -352,6 +352,20 @@ "\n" "?????????? ????????, ?????? ???????????????????????? ?????????? ????????????????????????, ???? ?????????????????????????? ?????????????? " "??????????????." +msgstr[1] "" +"???????????????????????? MSN-?????????????? ?????????? ???????????????????? ???? %d ??????????. ???? ???????????? " +"?????????????????????????? ?????????????????? ???? ?????? ??????????. ????????????????????, ?????????????????? ??????????-???????? " +"????????????????????.\n" +"\n" +"?????????? ????????, ?????? ???????????????????????? ?????????? ????????????????????????, ???? ?????????????????????????? ?????????????? " +"??????????????." +msgstr[2] "" +"???????????????????????? MSN-?????????????? ?????????? ???????????????????? ???? %d ??????????. ???? ???????????? " +"?????????????????????????? ?????????????????? ???? ?????? ??????????. ????????????????????, ?????????????????? ??????????-???????? " +"????????????????????.\n" +"\n" +"?????????? ????????, ?????? ???????????????????????? ?????????? ????????????????????????, ???? ?????????????????????????? ?????????????? " +"??????????????." #: session.c:340 msgid "Our protocol is not supported by the server." Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Jan 2009 08:25:34 -0000 1.2 +++ .cvsignore 8 Mar 2009 18:38:02 -0000 1.3 @@ -1 +1 @@ -msn-pecan-0.0.17.tar.bz2 +msn-pecan-0.0.18.tar.bz2 Index: purple-msn-pecan.spec =================================================================== RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-9/purple-msn-pecan.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- purple-msn-pecan.spec 28 Jan 2009 08:25:34 -0000 1.1 +++ purple-msn-pecan.spec 8 Mar 2009 18:38:03 -0000 1.2 @@ -1,13 +1,14 @@ %define realname msn-pecan Name: purple-%{realname} -Version: 0.0.17 -Release: 4%{?dist} +Version: 0.0.18 +Release: 2%{?dist} Summary: Alternative MSN protocol plugin for libpurple Group: Applications/Internet License: GPLv2+ URL: http://code.google.com/p/msn-pecan/ Source0: http://msn-pecan.googlecode.com/files/%{realname}-%{version}.tar.bz2 +Patch0: purple-msn-pecan-0.0.18_ru-po.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpurple-devel @@ -16,22 +17,31 @@ %description -The project aims to have a much faster development process, low barrier for +The project aims to have a much faster development process, low barrier for contributions, and close contact with the user-base. -Features include: +Compared to Pidgin's official MSN plug-in: - * Support for personal messages + * Faster log-in + * Fewer connection issues + * Fewer crashes + * Experimental direct connection support (fast file transfers) * Server-side storage for display names (private alias) - * Partial direct connection support - * Improved network IO - * Improved error handling - * Network issues tested with netem - * GObject usage + * Support for handwritten messages (read-only) + * Support for voice clips (receive-only) + * Support for Plus! sounds (receive-only) + * Option to hide Plus! tags + +Other features: + + * Support for personal status messages + * Support for offline messaging (read-only) + * Send custom emoticons (Pidgin >= 2.5) %prep %setup -q -n %{realname}-%{version} +%patch0 -p0 -b ru-po.rej %build @@ -62,6 +72,13 @@ %changelog +* Sun Mar 8 2009 Edouard Bourguignon - 0.0.18-2 +- Up-to-date description + +* Sun Mar 8 2009 Edouard Bourguignon - 0.0.18-1 +- Upgrade to 0.0.18 +- Patch russion translation file for missing plural line 348 in po/libmsn-pecan-ru.po + * Mon Jan 19 2009 Edouard Bourguignon - 0.0.17-4 - Remove DEBUG make option - V=1 changed to V=yes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Jan 2009 08:25:34 -0000 1.2 +++ sources 8 Mar 2009 18:38:03 -0000 1.3 @@ -1 +1 @@ -d0539f835d02c94774d06a7877e575ac msn-pecan-0.0.17.tar.bz2 +8e8a6effbea87bad70610d14a01a4429 msn-pecan-0.0.18.tar.bz2 From madko at fedoraproject.org Sun Mar 8 18:42:41 2009 From: madko at fedoraproject.org (Edouard Bourguignon) Date: Sun, 8 Mar 2009 18:42:41 +0000 (UTC) Subject: rpms/purple-msn-pecan/F-10 purple-msn-pecan-0.0.18_ru-po.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 purple-msn-pecan.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090308184241.DD32670116@cvs1.fedora.phx.redhat.com> Author: madko Update of /cvs/pkgs/rpms/purple-msn-pecan/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14583 Modified Files: .cvsignore purple-msn-pecan.spec sources Added Files: purple-msn-pecan-0.0.18_ru-po.patch Log Message: Upgrade to version 0.0.18 purple-msn-pecan-0.0.18_ru-po.patch: --- NEW FILE purple-msn-pecan-0.0.18_ru-po.patch --- --- po/libmsn-pecan-ru.po.orig 2009-03-08 18:40:52.000000000 +0100 +++ po/libmsn-pecan-ru.po 2009-03-08 18:48:32.000000000 +0100 @@ -352,6 +352,20 @@ "\n" "?????????? ????????, ?????? ???????????????????????? ?????????? ????????????????????????, ???? ?????????????????????????? ?????????????? " "??????????????." +msgstr[1] "" +"???????????????????????? MSN-?????????????? ?????????? ???????????????????? ???? %d ??????????. ???? ???????????? " +"?????????????????????????? ?????????????????? ???? ?????? ??????????. ????????????????????, ?????????????????? ??????????-???????? " +"????????????????????.\n" +"\n" +"?????????? ????????, ?????? ???????????????????????? ?????????? ????????????????????????, ???? ?????????????????????????? ?????????????? " +"??????????????." +msgstr[2] "" +"???????????????????????? MSN-?????????????? ?????????? ???????????????????? ???? %d ??????????. ???? ???????????? " +"?????????????????????????? ?????????????????? ???? ?????? ??????????. ????????????????????, ?????????????????? ??????????-???????? " +"????????????????????.\n" +"\n" +"?????????? ????????, ?????? ???????????????????????? ?????????? ????????????????????????, ???? ?????????????????????????? ?????????????? " +"??????????????." #: session.c:340 msgid "Our protocol is not supported by the server." Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Jan 2009 03:03:09 -0000 1.2 +++ .cvsignore 8 Mar 2009 18:42:10 -0000 1.3 @@ -1 +1 @@ -msn-pecan-0.0.17.tar.bz2 +msn-pecan-0.0.18.tar.bz2 Index: purple-msn-pecan.spec =================================================================== RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-10/purple-msn-pecan.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- purple-msn-pecan.spec 28 Jan 2009 03:03:09 -0000 1.1 +++ purple-msn-pecan.spec 8 Mar 2009 18:42:11 -0000 1.2 @@ -1,13 +1,14 @@ %define realname msn-pecan Name: purple-%{realname} -Version: 0.0.17 -Release: 4%{?dist} +Version: 0.0.18 +Release: 2%{?dist} Summary: Alternative MSN protocol plugin for libpurple Group: Applications/Internet License: GPLv2+ URL: http://code.google.com/p/msn-pecan/ Source0: http://msn-pecan.googlecode.com/files/%{realname}-%{version}.tar.bz2 +Patch0: purple-msn-pecan-0.0.18_ru-po.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpurple-devel @@ -16,22 +17,31 @@ %description -The project aims to have a much faster development process, low barrier for +The project aims to have a much faster development process, low barrier for contributions, and close contact with the user-base. -Features include: +Compared to Pidgin's official MSN plug-in: - * Support for personal messages + * Faster log-in + * Fewer connection issues + * Fewer crashes + * Experimental direct connection support (fast file transfers) * Server-side storage for display names (private alias) - * Partial direct connection support - * Improved network IO - * Improved error handling - * Network issues tested with netem - * GObject usage + * Support for handwritten messages (read-only) + * Support for voice clips (receive-only) + * Support for Plus! sounds (receive-only) + * Option to hide Plus! tags + +Other features: + + * Support for personal status messages + * Support for offline messaging (read-only) + * Send custom emoticons (Pidgin >= 2.5) %prep %setup -q -n %{realname}-%{version} +%patch0 -p0 -b ru-po.rej %build @@ -62,6 +72,13 @@ %changelog +* Sun Mar 8 2009 Edouard Bourguignon - 0.0.18-2 +- Up-to-date description + +* Sun Mar 8 2009 Edouard Bourguignon - 0.0.18-1 +- Upgrade to 0.0.18 +- Patch russion translation file for missing plural line 348 in po/libmsn-pecan-ru.po + * Mon Jan 19 2009 Edouard Bourguignon - 0.0.17-4 - Remove DEBUG make option - V=1 changed to V=yes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Jan 2009 03:03:09 -0000 1.2 +++ sources 8 Mar 2009 18:42:11 -0000 1.3 @@ -1 +1 @@ -d0539f835d02c94774d06a7877e575ac msn-pecan-0.0.17.tar.bz2 +8e8a6effbea87bad70610d14a01a4429 msn-pecan-0.0.18.tar.bz2 From robert at fedoraproject.org Sun Mar 8 18:46:47 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Sun, 8 Mar 2009 18:46:47 +0000 (UTC) Subject: rpms/MAKEDEV/devel MAKEDEV.spec,1.65,1.66 Message-ID: <20090308184647.8DD5270116@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/pkgs/rpms/MAKEDEV/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15602 Modified Files: MAKEDEV.spec Log Message: Hardcoded temporarily the release tag in package source tag Index: MAKEDEV.spec =================================================================== RCS file: /cvs/pkgs/rpms/MAKEDEV/devel/MAKEDEV.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- MAKEDEV.spec 23 Feb 2009 21:57:24 -0000 1.65 +++ MAKEDEV.spec 8 Mar 2009 18:46:16 -0000 1.66 @@ -1,12 +1,12 @@ Name: MAKEDEV Version: 3.24 -Release: 2 +Release: 3 Group: System Environment/Base License: GPLv2 # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from # within this srpm. -Source: MAKEDEV-%{version}-%{release}.tar.gz +Source: MAKEDEV-%{version}-1.tar.gz Summary: A program used for creating device files in /dev BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel @@ -53,6 +53,9 @@ %config(noreplace) %{_sysconfdir}/makedev.d %changelog +* Sun Mar 08 2009 Robert Scheck 3.24-3 +- Hardcoded temporarily the release tag in package source tag + * Mon Feb 23 2009 Fedora Release Engineering - 3.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From mtasaka at fedoraproject.org Sun Mar 8 19:01:03 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 8 Mar 2009 19:01:03 +0000 (UTC) Subject: rpms/mecab/devel .cvsignore, 1.6, 1.7 mecab.spec, 1.19, 1.20 sources, 1.6, 1.7 Message-ID: <20090308190103.9542870116@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/mecab/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19903/mecab/devel Modified Files: .cvsignore mecab.spec sources Log Message: mecab update: 0.97 -> 0.98pre1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mecab/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Feb 2008 12:45:25 -0000 1.6 +++ .cvsignore 8 Mar 2009 19:00:32 -0000 1.7 @@ -1 +1 @@ -mecab-0.97.tar.gz +mecab-0.98pre1.tar.gz Index: mecab.spec =================================================================== RCS file: /cvs/extras/rpms/mecab/devel/mecab.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mecab.spec 23 Feb 2009 22:48:26 -0000 1.19 +++ mecab.spec 8 Mar 2009 19:00:32 -0000 1.20 @@ -1,6 +1,6 @@ -%define mainver 0.97 -%undefine betaver -%define fedorarel 4 +%define mainver 0.98 +%define betaver pre1 +%define fedorarel 1 # Note: # mecab dictionary requires mecab-devel to rebuild it, @@ -42,6 +42,10 @@ %prep %setup -q -n %{name}-%{mainver}%{?betaver} + +mv doc/doxygen . +find . -name \*.cpp -print0 | xargs -0 %{__chmod} 0644 + # compiler flags fix %{__sed} -i.flags \ -e '/-O3/s|CFLAGS=\"\(.*\)\"|CFLAGS=\${CFLAGS:-\1}|' \ @@ -92,7 +96,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS BSD COPYING GPL LGPL -%doc doc/* example/ +%doc doc/ example/ %{_mandir}/man1/%{name}.1* %config(noreplace) %{_sysconfdir}/mecabrc @@ -105,11 +109,15 @@ %dir %{_libdir}/%{name}/dic/ %files devel +%doc doxygen/ %{_bindir}/%{name}-config %{_libdir}/lib%{name}.so %{_includedir}/%{name}.h %changelog +* Mon Mar 9 2009 Mamoru Tasaka - 0.98-0.1.pre1 +- Update to 0.98pre1 + * Tue Feb 24 2009 Mamoru Tasaka - 0.97-4 - F-11: Mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/mecab/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Feb 2008 12:45:25 -0000 1.6 +++ sources 8 Mar 2009 19:00:33 -0000 1.7 @@ -1 +1 @@ -17821363921220e97578765110ce3e71 mecab-0.97.tar.gz +f5ac5efadaec532216b0a2dcb2740e06 mecab-0.98pre1.tar.gz From mtasaka at fedoraproject.org Sun Mar 8 19:01:04 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 8 Mar 2009 19:01:04 +0000 (UTC) Subject: rpms/python-mecab/devel .cvsignore, 1.4, 1.5 python-mecab.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <20090308190104.D294170119@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/python-mecab/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19903/python-mecab/devel Modified Files: .cvsignore python-mecab.spec sources Log Message: mecab update: 0.97 -> 0.98pre1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-mecab/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 3 Feb 2008 12:46:17 -0000 1.4 +++ .cvsignore 8 Mar 2009 19:00:34 -0000 1.5 @@ -1 +1 @@ -mecab-python-0.97.tar.gz +mecab-python-0.98pre1.tar.gz Index: python-mecab.spec =================================================================== RCS file: /cvs/extras/rpms/python-mecab/devel/python-mecab.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- python-mecab.spec 24 Feb 2009 04:58:57 -0000 1.10 +++ python-mecab.spec 8 Mar 2009 19:00:34 -0000 1.11 @@ -1,9 +1,9 @@ -%define mainver 0.97 -%undefine betaver -%define relnumber 2 +%define mainver 0.98 +%define betaver pre1 +%define relnumber 1 %define srcname mecab-python -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-mecab Version: %{mainver} @@ -42,7 +42,10 @@ %check %{__sed} -i.encoding -e '1s|^\(.*\)$|\1\n# coding=UTF-8|' \ test.py +rmdir tmpdir || : +%{__mkdir} tmpdir ; cd tmpdir ; %{__cp} -p ../test.py . PYTHONPATH=$RPM_BUILD_ROOT%{python_sitearch} %{__python} test.py +cd .. %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -58,6 +61,9 @@ %endif %changelog +* Mon Mar 9 2009 Mamoru Tasaka - 0.98-0.1.pre1 +- Update to 0.98pre1 + * Tue Feb 24 2009 Mamoru Tasaka - 0.97-2 - F-11: Mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-mecab/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 3 Feb 2008 12:46:17 -0000 1.4 +++ sources 8 Mar 2009 19:00:34 -0000 1.5 @@ -1 +1 @@ -f5b3545572d00b09c24a780dcfdf8bc8 mecab-python-0.97.tar.gz +786feda29dd9954c8d55d52fe9160cf6 mecab-python-0.98pre1.tar.gz From mtasaka at fedoraproject.org Sun Mar 8 19:01:04 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 8 Mar 2009 19:01:04 +0000 (UTC) Subject: rpms/perl-mecab/devel .cvsignore, 1.4, 1.5 perl-mecab.spec, 1.13, 1.14 sources, 1.4, 1.5 Message-ID: <20090308190104.6FC3B70116@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/perl-mecab/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19903/perl-mecab/devel Modified Files: .cvsignore perl-mecab.spec sources Log Message: mecab update: 0.97 -> 0.98pre1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-mecab/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 3 Feb 2008 12:45:57 -0000 1.4 +++ .cvsignore 8 Mar 2009 19:00:33 -0000 1.5 @@ -1 +1 @@ -mecab-perl-0.97.tar.gz +mecab-perl-0.98pre1.tar.gz Index: perl-mecab.spec =================================================================== RCS file: /cvs/extras/rpms/perl-mecab/devel/perl-mecab.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-mecab.spec 24 Feb 2009 04:58:57 -0000 1.13 +++ perl-mecab.spec 8 Mar 2009 19:00:34 -0000 1.14 @@ -1,6 +1,6 @@ -%define mainver 0.97 -%undefine betaver -%define relnumber 4 +%define mainver 0.98 +%define betaver pre1 +%define relnumber 1 %define srcname mecab-perl Name: perl-mecab @@ -60,6 +60,9 @@ %{perl_vendorarch}/auto/MeCab/ %changelog +* Mon Mar 9 2009 Mamoru Tasaka - 0.98-0.1.pre1 +- Update to 0.98pre1 + * Tue Feb 24 2009 Mamoru Tasaka - 0.97-4 - F-11: Mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-mecab/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 3 Feb 2008 12:45:57 -0000 1.4 +++ sources 8 Mar 2009 19:00:34 -0000 1.5 @@ -1 +1 @@ -01d127439e97fcd2c25fb6595ab7d1f2 mecab-perl-0.97.tar.gz +23e5774186096d978ee4d896100d77bb mecab-perl-0.98pre1.tar.gz From mtasaka at fedoraproject.org Sun Mar 8 19:01:05 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 8 Mar 2009 19:01:05 +0000 (UTC) Subject: rpms/ruby-mecab/devel .cvsignore, 1.4, 1.5 ruby-mecab.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <20090308190105.C265B7012F@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-mecab/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19903/ruby-mecab/devel Modified Files: .cvsignore ruby-mecab.spec sources Log Message: mecab update: 0.97 -> 0.98pre1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-mecab/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 3 Feb 2008 12:46:31 -0000 1.4 +++ .cvsignore 8 Mar 2009 19:00:34 -0000 1.5 @@ -1 +1 @@ -mecab-ruby-0.97.tar.gz +mecab-ruby-0.98pre1.tar.gz Index: ruby-mecab.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-mecab/devel/ruby-mecab.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ruby-mecab.spec 24 Feb 2009 13:23:47 -0000 1.12 +++ ruby-mecab.spec 8 Mar 2009 19:00:35 -0000 1.13 @@ -1,6 +1,6 @@ -%define mainver 0.97 -%undefine betaver -%define relnumber 3 +%define mainver 0.98 +%define betaver pre1 +%define relnumber 1 %define srcname mecab-ruby %define rubyver 1.8 @@ -61,6 +61,9 @@ %{ruby_sitearch}/*MeCab* %changelog +* Mon Mar 9 2009 Mamoru Tasaka - 0.98-0.1.pre1 +- Update to 0.98pre1 + * Tue Feb 24 2009 Mamoru Tasaka - 0.97-3 - %%global-ize "nested" macro Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-mecab/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 3 Feb 2008 12:46:31 -0000 1.4 +++ sources 8 Mar 2009 19:00:35 -0000 1.5 @@ -1 +1 @@ -2fa79278414b8a753a17e6e1b3ae044e mecab-ruby-0.97.tar.gz +db887a92714b24cfd5c3421c22f86715 mecab-ruby-0.98pre1.tar.gz From mtasaka at fedoraproject.org Sun Mar 8 19:01:03 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Sun, 8 Mar 2009 19:01:03 +0000 (UTC) Subject: rpms/mecab-java/devel .cvsignore, 1.3, 1.4 mecab-java.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <20090308190103.C20F070119@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/mecab-java/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19903/mecab-java/devel Modified Files: .cvsignore mecab-java.spec sources Log Message: mecab update: 0.97 -> 0.98pre1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mecab-java/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Feb 2008 12:45:41 -0000 1.3 +++ .cvsignore 8 Mar 2009 19:00:33 -0000 1.4 @@ -1 +1 @@ -mecab-java-0.97.tar.gz +mecab-java-0.98pre1.tar.gz Index: mecab-java.spec =================================================================== RCS file: /cvs/extras/rpms/mecab-java/devel/mecab-java.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mecab-java.spec 23 Feb 2009 22:48:26 -0000 1.9 +++ mecab-java.spec 8 Mar 2009 19:00:33 -0000 1.10 @@ -1,6 +1,6 @@ -%define mainver 0.97 -%undefine betaver -%define relnumber 3 +%define mainver 0.98 +%define betaver pre1 +%define relnumber 1 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} @@ -27,10 +27,12 @@ %{summary}. %prep -%setup -q +%setup -q -n %{name}-%{mainver}%{?betaver} %{__sed} -i.opt -e 's|-O3||' Makefile -%{__sed} -i.test \ +# ??? What are the following lines for? +# Disabling for now +: %{__sed} -i.test \ -e '/test\.java/s|\$|-$|' Makefile %build @@ -65,6 +67,9 @@ %{_javadir}/MeCab.jar %changelog +* Mon Mar 9 2009 Mamoru Tasaka - 0.98-0.1.pre1 +- Update to 0.98pre1 + * Tue Feb 24 2009 Mamoru Tasaka - 0.97-3 - %%global-lize "nested" macro Index: sources =================================================================== RCS file: /cvs/extras/rpms/mecab-java/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Feb 2008 12:45:41 -0000 1.3 +++ sources 8 Mar 2009 19:00:33 -0000 1.4 @@ -1 +1 @@ -e1182efe456ab7d5ac561374000861a6 mecab-java-0.97.tar.gz +87ad899177a782bfb1055de37cdd1e11 mecab-java-0.98pre1.tar.gz From remi at fedoraproject.org Sun Mar 8 19:02:51 2009 From: remi at fedoraproject.org (Remi Collet) Date: Sun, 8 Mar 2009 19:02:51 +0000 (UTC) Subject: rpms/php-pear-Cache-Lite/devel .cvsignore, 1.5, 1.6 php-pear-Cache-Lite.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <20090308190251.0BE5870116@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Cache-Lite/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20846 Modified Files: .cvsignore php-pear-Cache-Lite.spec sources Log Message: update to 1.7.7 (minor bugfix) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2009 06:09:14 -0000 1.5 +++ .cvsignore 8 Mar 2009 19:02:20 -0000 1.6 @@ -1 +1 @@ -Cache_Lite-1.7.6.tgz +Cache_Lite-1.7.7.tgz Index: php-pear-Cache-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/devel/php-pear-Cache-Lite.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- php-pear-Cache-Lite.spec 26 Feb 2009 20:46:45 -0000 1.5 +++ php-pear-Cache-Lite.spec 8 Mar 2009 19:02:20 -0000 1.6 @@ -4,8 +4,8 @@ Summary: Fast and Safe little cache system for PHP Summary(fr): M??thode de cache rapide et s??curis??e pour PHP Name: php-pear-Cache-Lite -Version: 1.7.6 -Release: 2%{?dist} +Version: 1.7.7 +Release: 1%{?dist} License: PHP Group: Development/Libraries Source: http://pear.php.net/get/%{pear_name}-%{version}.tgz @@ -97,8 +97,8 @@ %changelog -* Thu Feb 26 2009 Fedora Release Engineering - 1.7.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Sun Mar 08 2009 Remi Collet 1.7.7-1 +- update to 1.7.7 (bugfix) * Thu Jan 29 2009 Remi Collet 1.7.6-1 - now Requires php-pear(PEAR) >= 1.5.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2009 06:09:14 -0000 1.5 +++ sources 8 Mar 2009 19:02:20 -0000 1.6 @@ -1 +1 @@ -edccd4a674ac08a4a2e500894d58f45e Cache_Lite-1.7.6.tgz +b03763851a888e38834701807ed27a5a Cache_Lite-1.7.7.tgz From chkr at fedoraproject.org Sun Mar 8 19:06:42 2009 From: chkr at fedoraproject.org (Christian Krause) Date: Sun, 8 Mar 2009 19:06:42 +0000 (UTC) Subject: comps comps-f11.xml.in,1.147,1.148 Message-ID: <20090308190642.C616170116@cvs1.fedora.phx.redhat.com> Author: chkr Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21673 Modified Files: comps-f11.xml.in Log Message: add anki to the Educational Software group Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- comps-f11.xml.in 7 Mar 2009 13:50:11 -0000 1.147 +++ comps-f11.xml.in 8 Mar 2009 19:06:11 -0000 1.148 @@ -1241,6 +1241,7 @@ true gcompris-sound-en + anki childsplay corrida drgeo From remi at fedoraproject.org Sun Mar 8 19:09:40 2009 From: remi at fedoraproject.org (Remi Collet) Date: Sun, 8 Mar 2009 19:09:40 +0000 (UTC) Subject: rpms/php-pear-Cache-Lite/F-10 php-pear-Cache-Lite.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <20090308190940.C3E2970116@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Cache-Lite/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22682 Modified Files: php-pear-Cache-Lite.spec sources Log Message: update to 1.7.7 (minor bugfix) Index: php-pear-Cache-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/F-10/php-pear-Cache-Lite.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- php-pear-Cache-Lite.spec 24 Jan 2009 07:21:48 -0000 1.3 +++ php-pear-Cache-Lite.spec 8 Mar 2009 19:09:10 -0000 1.4 @@ -4,7 +4,7 @@ Summary: Fast and Safe little cache system for PHP Summary(fr): M??thode de cache rapide et s??curis??e pour PHP Name: php-pear-Cache-Lite -Version: 1.7.5 +Version: 1.7.7 Release: 1%{?dist} License: PHP Group: Development/Libraries @@ -15,8 +15,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: php-pear >= 1:1.4.9-1.2 -Requires: php-pear(PEAR) >= 1.4.9 +BuildRequires: php-pear(PEAR) >= 1.5.4 +Requires: php-pear(PEAR) >= 1.5.4 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} @@ -97,6 +97,12 @@ %changelog +* Sun Mar 08 2009 Remi Collet 1.7.7-1 +- update to 1.7.7 (bugfix) + +* Thu Jan 29 2009 Remi Collet 1.7.6-1 +- now Requires php-pear(PEAR) >= 1.5.4 + * Sat Jan 09 2009 Remi Collet 1.7.5-1 - update to 1.7.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 Jan 2009 07:21:48 -0000 1.4 +++ sources 8 Mar 2009 19:09:10 -0000 1.5 @@ -1 +1 @@ -085d095dc2bd92e546a8d6aa8dd748ba Cache_Lite-1.7.5.tgz +b03763851a888e38834701807ed27a5a Cache_Lite-1.7.7.tgz From remi at fedoraproject.org Sun Mar 8 19:10:43 2009 From: remi at fedoraproject.org (Remi Collet) Date: Sun, 8 Mar 2009 19:10:43 +0000 (UTC) Subject: rpms/php-pear-Cache-Lite/F-9 php-pear-Cache-Lite.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090308191043.9C0D970119@cvs1.fedora.phx.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Cache-Lite/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23251 Modified Files: php-pear-Cache-Lite.spec sources Log Message: update to 1.7.7 (minor bugfix) Index: php-pear-Cache-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/F-9/php-pear-Cache-Lite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-Cache-Lite.spec 24 Jan 2009 07:29:55 -0000 1.2 +++ php-pear-Cache-Lite.spec 8 Mar 2009 19:10:42 -0000 1.3 @@ -4,7 +4,7 @@ Summary: Fast and Safe little cache system for PHP Summary(fr): M??thode de cache rapide et s??curis??e pour PHP Name: php-pear-Cache-Lite -Version: 1.7.5 +Version: 1.7.7 Release: 1%{?dist} License: PHP Group: Development/Libraries @@ -15,8 +15,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: php-pear >= 1:1.4.9-1.2 -Requires: php-pear(PEAR) >= 1.4.9 +BuildRequires: php-pear(PEAR) >= 1.5.4 +Requires: php-pear(PEAR) >= 1.5.4 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} @@ -97,6 +97,12 @@ %changelog +* Sun Mar 08 2009 Remi Collet 1.7.7-1 +- update to 1.7.7 (bugfix) + +* Thu Jan 29 2009 Remi Collet 1.7.6-1 +- now Requires php-pear(PEAR) >= 1.5.4 + * Sat Jan 09 2009 Remi Collet 1.7.5-1 - update to 1.7.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Jan 2009 07:29:55 -0000 1.3 +++ sources 8 Mar 2009 19:10:43 -0000 1.4 @@ -1 +1 @@ -085d095dc2bd92e546a8d6aa8dd748ba Cache_Lite-1.7.5.tgz +b03763851a888e38834701807ed27a5a Cache_Lite-1.7.7.tgz From rdieter at fedoraproject.org Sun Mar 8 19:30:06 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sun, 8 Mar 2009 19:30:06 +0000 (UTC) Subject: rpms/kdegraphics/devel kdegraphics.spec,1.189,1.190 Message-ID: <20090308193006.73C6B70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegraphics/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28044 Modified Files: kdegraphics.spec Log Message: * Sun Mar 08 2009 Rex Dieter 4.2.1-2 - missing dependency on kipiplugin.desktop (#489218) Index: kdegraphics.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- kdegraphics.spec 27 Feb 2009 12:17:29 -0000 1.189 +++ kdegraphics.spec 8 Mar 2009 19:29:32 -0000 1.190 @@ -7,7 +7,7 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdegraphics #Obsoletes: kdegraphics4 < %{version}-%{release} @@ -122,16 +122,20 @@ %post -%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : %postun -%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig +%post libs +/sbin/ldconfig +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : + +%postun libs +/sbin/ldconfig +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : %files @@ -144,7 +148,7 @@ %{_kde4_datadir}/applications/kde4/* %{_kde4_datadir}/config.kcfg/* %{_kde4_datadir}/kde4/services/* -%{_kde4_datadir}/kde4/servicetypes/* +%{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop %{_kde4_docdir}/HTML/en/okular/ %{_kde4_appsdir}/gvpart/ %{_kde4_appsdir}/gwenview/ @@ -153,15 +157,28 @@ %{_kde4_appsdir}/svgpart/ %{_datadir}/dbus-1/interfaces/* %{_kde4_docdir}/HTML/en/*/ -%{_kde4_iconsdir}/hicolor/*/*/* +%{_kde4_iconsdir}/hicolor/*/apps/gwenview.* +%{_kde4_iconsdir}/hicolor/*/apps/kgamma.* +%{_kde4_iconsdir}/hicolor/*/apps/kolourpaint.* +%{_kde4_iconsdir}/hicolor/*/apps/kruler.* +%{_kde4_iconsdir}/hicolor/*/apps/ksnapshot.* +%{_kde4_iconsdir}/hicolor/*/apps/okular.* %files libs %defattr(-,root,root,-) %{_kde4_appsdir}/kipi/ +%{_kde4_iconsdir}/hicolor/*/apps/kipi.* +%{_kde4_datadir}/kde4/servicetypes/kipiplugin.desktop %{_kde4_appsdir}/libkdcraw/ -%{_kde4_libdir}/lib*.so.* -%{_kde4_libdir}/kde4/* -%{_kde4_libdir}/strigi/* +%{_kde4_iconsdir}/hicolor/*/apps/kdcraw.* +%{_kde4_libdir}/libgwenviewlib.so.4* +%{_kde4_libdir}/libkdcraw.so.7* +%{_kde4_libdir}/libkexiv2.so.7* +%{_kde4_libdir}/libkipi.so.6* +%{_kde4_libdir}/libkolourpaint_lgpl.so.4* +%{_kde4_libdir}/libksane.so.0* +%{_kde4_libdir}/libokularcore.so.1* +%{_kde4_libdir}/strigi/strigita_dvi.so %files devel %defattr(-,root,root,-) @@ -179,6 +196,9 @@ %changelog +* Sun Mar 08 2009 Rex Dieter 4.2.1-2 +- missing dependency on kipiplugin.desktop (#489218) + * Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 From rdieter at fedoraproject.org Sun Mar 8 19:35:54 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sun, 8 Mar 2009 19:35:54 +0000 (UTC) Subject: rpms/kdegraphics/F-10 kdegraphics.spec,1.185,1.186 Message-ID: <20090308193554.E066070116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegraphics/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29327 Modified Files: kdegraphics.spec Log Message: * Sun Mar 08 2009 Rex Dieter 4.2.1-2 - missing dependency on kipiplugin.desktop (#489218) Index: kdegraphics.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/kdegraphics.spec,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- kdegraphics.spec 2 Mar 2009 10:29:25 -0000 1.185 +++ kdegraphics.spec 8 Mar 2009 19:35:24 -0000 1.186 @@ -7,7 +7,7 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdegraphics #Obsoletes: kdegraphics4 < %{version}-%{release} @@ -122,16 +122,20 @@ %post -%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : %postun -%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig +%post libs +/sbin/ldconfig +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : + +%postun libs +/sbin/ldconfig +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : %files @@ -144,7 +148,7 @@ %{_kde4_datadir}/applications/kde4/* %{_kde4_datadir}/config.kcfg/* %{_kde4_datadir}/kde4/services/* -%{_kde4_datadir}/kde4/servicetypes/* +%{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop %{_kde4_docdir}/HTML/en/okular/ %{_kde4_appsdir}/gvpart/ %{_kde4_appsdir}/gwenview/ @@ -153,15 +157,28 @@ %{_kde4_appsdir}/svgpart/ %{_datadir}/dbus-1/interfaces/* %{_kde4_docdir}/HTML/en/*/ -%{_kde4_iconsdir}/hicolor/*/*/* +%{_kde4_iconsdir}/hicolor/*/apps/gwenview.* +%{_kde4_iconsdir}/hicolor/*/apps/kgamma.* +%{_kde4_iconsdir}/hicolor/*/apps/kolourpaint.* +%{_kde4_iconsdir}/hicolor/*/apps/kruler.* +%{_kde4_iconsdir}/hicolor/*/apps/ksnapshot.* +%{_kde4_iconsdir}/hicolor/*/apps/okular.* %files libs %defattr(-,root,root,-) %{_kde4_appsdir}/kipi/ +%{_kde4_iconsdir}/hicolor/*/apps/kipi.* +%{_kde4_datadir}/kde4/servicetypes/kipiplugin.desktop %{_kde4_appsdir}/libkdcraw/ -%{_kde4_libdir}/lib*.so.* -%{_kde4_libdir}/kde4/* -%{_kde4_libdir}/strigi/* +%{_kde4_iconsdir}/hicolor/*/apps/kdcraw.* +%{_kde4_libdir}/libgwenviewlib.so.4* +%{_kde4_libdir}/libkdcraw.so.7* +%{_kde4_libdir}/libkexiv2.so.7* +%{_kde4_libdir}/libkipi.so.6* +%{_kde4_libdir}/libkolourpaint_lgpl.so.4* +%{_kde4_libdir}/libksane.so.0* +%{_kde4_libdir}/libokularcore.so.1* +%{_kde4_libdir}/strigi/strigita_dvi.so %files devel %defattr(-,root,root,-) @@ -179,6 +196,9 @@ %changelog +* Sun Mar 08 2009 Rex Dieter 4.2.1-2 +- missing dependency on kipiplugin.desktop (#489218) + * Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 From rdieter at fedoraproject.org Sun Mar 8 19:49:07 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sun, 8 Mar 2009 19:49:07 +0000 (UTC) Subject: rpms/kdegraphics/devel kdegraphics.spec,1.190,1.191 Message-ID: <20090308194907.F1F1670116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegraphics/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv454 Modified Files: kdegraphics.spec Log Message: fix files, scriptlet-deps Index: kdegraphics.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- kdegraphics.spec 8 Mar 2009 19:29:32 -0000 1.190 +++ kdegraphics.spec 8 Mar 2009 19:48:37 -0000 1.191 @@ -71,6 +71,8 @@ %if 0%{?obsolete_kde3_kipi} Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0 %endif +Requires(post): xdg-utils +Requires(postun): xdg-utils %description libs %{summary}. @@ -102,7 +104,7 @@ %{cmake_kde4} .. popd -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %install @@ -149,15 +151,26 @@ %{_kde4_datadir}/config.kcfg/* %{_kde4_datadir}/kde4/services/* %{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop -%{_kde4_docdir}/HTML/en/okular/ %{_kde4_appsdir}/gvpart/ %{_kde4_appsdir}/gwenview/ %{_kde4_appsdir}/kolourpaint/ %{_kde4_appsdir}/kruler/ %{_kde4_appsdir}/svgpart/ +%{_kde4_libdir}/kde4/gsthumbnail.so +%{_kde4_libdir}/kde4/gvpart.so +%{_kde4_libdir}/kde4/kcm_kamera.so +%{_kde4_libdir}/kde4/kcm_kgamma.so +%{_kde4_libdir}/kde4/kio_kamera.so +%{_kde4_libdir}/kde4/kio_msits.so +%{_kde4_libdir}/kde4/ksaneplugin.so +%{_kde4_libdir}/kde4/okularGenerator_*.so +%{_kde4_libdir}/kde4/okularpart.so +%{_kde4_libdir}/kde4/svgpart.so %{_datadir}/dbus-1/interfaces/* %{_kde4_docdir}/HTML/en/*/ +%{_kde4_iconsdir}/hicolor/*/actions/* %{_kde4_iconsdir}/hicolor/*/apps/gwenview.* +%{_kde4_iconsdir}/hicolor/*/apps/kcolorchooser.* %{_kde4_iconsdir}/hicolor/*/apps/kgamma.* %{_kde4_iconsdir}/hicolor/*/apps/kolourpaint.* %{_kde4_iconsdir}/hicolor/*/apps/kruler.* @@ -180,6 +193,7 @@ %{_kde4_libdir}/libokularcore.so.1* %{_kde4_libdir}/strigi/strigita_dvi.so + %files devel %defattr(-,root,root,-) %if ! 0%{?omit_kde3_conflicts} From rdieter at fedoraproject.org Sun Mar 8 19:53:23 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sun, 8 Mar 2009 19:53:23 +0000 (UTC) Subject: rpms/kdegraphics/F-10 kdegraphics.spec,1.186,1.187 Message-ID: <20090308195323.DD1DD70116@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegraphics/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1603 Modified Files: kdegraphics.spec Log Message: fix %%files, scriplet deps Index: kdegraphics.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/kdegraphics.spec,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- kdegraphics.spec 8 Mar 2009 19:35:24 -0000 1.186 +++ kdegraphics.spec 8 Mar 2009 19:52:53 -0000 1.187 @@ -71,6 +71,8 @@ %if 0%{?obsolete_kde3_kipi} Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0 %endif +Requires(post): xdg-utils +Requires(postun): xdg-utils %description libs %{summary}. @@ -102,7 +104,7 @@ %{cmake_kde4} .. popd -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %install @@ -149,15 +151,26 @@ %{_kde4_datadir}/config.kcfg/* %{_kde4_datadir}/kde4/services/* %{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop -%{_kde4_docdir}/HTML/en/okular/ %{_kde4_appsdir}/gvpart/ %{_kde4_appsdir}/gwenview/ %{_kde4_appsdir}/kolourpaint/ %{_kde4_appsdir}/kruler/ %{_kde4_appsdir}/svgpart/ +%{_kde4_libdir}/kde4/gsthumbnail.so +%{_kde4_libdir}/kde4/gvpart.so +%{_kde4_libdir}/kde4/kcm_kamera.so +%{_kde4_libdir}/kde4/kcm_kgamma.so +%{_kde4_libdir}/kde4/kio_kamera.so +%{_kde4_libdir}/kde4/kio_msits.so +%{_kde4_libdir}/kde4/ksaneplugin.so +%{_kde4_libdir}/kde4/okularGenerator_*.so +%{_kde4_libdir}/kde4/okularpart.so +%{_kde4_libdir}/kde4/svgpart.so %{_datadir}/dbus-1/interfaces/* %{_kde4_docdir}/HTML/en/*/ +%{_kde4_iconsdir}/hicolor/*/actions/* %{_kde4_iconsdir}/hicolor/*/apps/gwenview.* +%{_kde4_iconsdir}/hicolor/*/apps/kcolorchooser.* %{_kde4_iconsdir}/hicolor/*/apps/kgamma.* %{_kde4_iconsdir}/hicolor/*/apps/kolourpaint.* %{_kde4_iconsdir}/hicolor/*/apps/kruler.* @@ -180,6 +193,7 @@ %{_kde4_libdir}/libokularcore.so.1* %{_kde4_libdir}/strigi/strigita_dvi.so + %files devel %defattr(-,root,root,-) %if ! 0%{?omit_kde3_conflicts} From terjeros at fedoraproject.org Sun Mar 8 20:03:19 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Sun, 8 Mar 2009 20:03:19 +0000 (UTC) Subject: rpms/python-ptrace/devel import.log, NONE, 1.1 python-ptrace.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090308200319.259E470116@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/python-ptrace/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4091/devel Modified Files: .cvsignore sources Added Files: import.log python-ptrace.spec Log Message: Import python-ptrace. --- NEW FILE import.log --- python-ptrace-0_6-2_fc10:HEAD:python-ptrace-0.6-2.fc10.src.rpm:1236542533 --- NEW FILE python-ptrace.spec --- %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitelib_arch: %global python_sitelib_arch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Summary: Debugger using ptrace written in Python Name: python-ptrace Version: 0.6 Release: 2%{?dist} License: GPLv2 Group: Development/Tools URL : http://python-ptrace.hachoir.org/ Source0: http://pypi.python.org/packages/source/p/python-ptrace/%{name}-%{version}.tar.gz BuildRequires: python-setuptools-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description python-ptrace is a debugger using ptrace written in Python. Fearures: o High level Python object API : PtraceDebugger and PtraceProcess o Able to control multiple processes: catch fork events on Linux o Read/write bytes to arbitrary address: take care of memory alignment and split bytes to cpu word o Execution step by step using ptrace_singlestep() or hardware interruption 3 o Dump registers, memory mappings, stack, etc. o Syscall tracer and parser (strace.py command) o Can use distorm disassembler (if available) %prep %setup -q %build %{__python} setup.py build %{__python} setup_cptrace.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} %{__python} setup_cptrace.py install -O1 --skip-build --root %{buildroot} %{__chmod} 0644 examples/*.py %{__rm} -f %{buildroot}%{_bindir}/{gdb,strace}.{pyo,pyc} %clean %{__rm} -rf %{buildroot} %check %{__python} ./test_doc.py %files %defattr(-, root, root, -) %doc AUTHORS ChangeLog COPYING README README.cptrace TODO %doc doc/* examples %exclude %{_bindir}/gdb.py[co] %exclude %{_bindir}/strace.py[co] %{_bindir}/gdb.py %{_bindir}/strace.py %{python_sitelib}/ptrace/ %{python_sitelib}/python_ptrace-*-py%{pyver}.egg-info %{python_sitelib_arch}/cptrace.so %{python_sitelib_arch}/ptrace-*-py%{pyver}.egg-info %changelog * Thu Mar 5 2009 Terje Rosten - 0.6-2 - switch to %%global, fix files listing, remove comments * Wed Mar 4 2009 Terje Rosten - 0.6-1 - 0.6 * Sat Sep 13 2008 Terje Rosten - 0.5-1 - 0.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-ptrace/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:45:44 -0000 1.1 +++ .cvsignore 8 Mar 2009 20:02:48 -0000 1.2 @@ -0,0 +1 @@ +python-ptrace-0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-ptrace/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:45:44 -0000 1.1 +++ sources 8 Mar 2009 20:02:48 -0000 1.2 @@ -0,0 +1 @@ +510c8c005f373c3e079074c9720bacc9 python-ptrace-0.6.tar.gz From cweyl at fedoraproject.org Sun Mar 8 20:07:57 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 8 Mar 2009 20:07:57 +0000 (UTC) Subject: rpms/perl-SQL-Translator/devel .cvsignore, 1.5, 1.6 perl-SQL-Translator.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <20090308200757.BD72B70116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-SQL-Translator/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5519 Modified Files: .cvsignore perl-SQL-Translator.spec sources Log Message: * Sun Mar 08 2009 Chris Weyl 0.09004-1 - update to 0.09004 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Translator/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 Feb 2009 05:09:45 -0000 1.5 +++ .cvsignore 8 Mar 2009 20:07:26 -0000 1.6 @@ -1 +1 @@ -SQL-Translator-0.09002.tar.gz +SQL-Translator-0.09004.tar.gz Index: perl-SQL-Translator.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Translator/devel/perl-SQL-Translator.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-SQL-Translator.spec 27 Feb 2009 01:13:02 -0000 1.7 +++ perl-SQL-Translator.spec 8 Mar 2009 20:07:27 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-SQL-Translator -Version: 0.09002 -Release: 2%{?dist} +Version: 0.09004 +Release: 1%{?dist} Summary: Manipulate structured data definitions (SQL and more) # see, e.g., lib/SQL/Translator.pm License: GPLv2 @@ -110,6 +110,9 @@ %{_mandir}/man[13]/* %changelog +* Sun Mar 08 2009 Chris Weyl 0.09004-1 +- update to 0.09004 + * Thu Feb 26 2009 Fedora Release Engineering - 0.09002-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Translator/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Feb 2009 05:09:45 -0000 1.5 +++ sources 8 Mar 2009 20:07:27 -0000 1.6 @@ -1 +1 @@ -b53c9f897a9415d6c48472d50b21cf50 SQL-Translator-0.09002.tar.gz +0f54df1319ad5c5c6e833cbb5d51e383 SQL-Translator-0.09004.tar.gz From cweyl at fedoraproject.org Sun Mar 8 20:09:00 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 8 Mar 2009 20:09:00 +0000 (UTC) Subject: rpms/perl-SQL-Translator/devel .cvsignore,1.6,1.7 Message-ID: <20090308200900.A362370116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-SQL-Translator/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5834 Modified Files: .cvsignore Log Message: ignore more... Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Translator/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Mar 2009 20:07:26 -0000 1.6 +++ .cvsignore 8 Mar 2009 20:08:30 -0000 1.7 @@ -1 +1,8 @@ SQL-Translator-0.09004.tar.gz +*.gz +*.tar +*.rpm +noarch +clog +.build* +*.bak From terjeros at fedoraproject.org Sun Mar 8 20:12:51 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Sun, 8 Mar 2009 20:12:51 +0000 (UTC) Subject: rpms/python-ptrace/devel python-ptrace.spec,1.1,1.2 Message-ID: <20090308201251.B48DB70116@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/python-ptrace/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6914 Modified Files: python-ptrace.spec Log Message: * Sun Mar 8 2009 Terje Rosten - 0.6-3 - Remove %exclude Index: python-ptrace.spec =================================================================== RCS file: /cvs/extras/rpms/python-ptrace/devel/python-ptrace.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-ptrace.spec 8 Mar 2009 20:02:48 -0000 1.1 +++ python-ptrace.spec 8 Mar 2009 20:12:21 -0000 1.2 @@ -6,7 +6,7 @@ Summary: Debugger using ptrace written in Python Name: python-ptrace Version: 0.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Development/Tools URL : http://python-ptrace.hachoir.org/ @@ -52,8 +52,8 @@ %defattr(-, root, root, -) %doc AUTHORS ChangeLog COPYING README README.cptrace TODO %doc doc/* examples -%exclude %{_bindir}/gdb.py[co] -%exclude %{_bindir}/strace.py[co] +#exclude %{_bindir}/gdb.py[co] +#exclude %{_bindir}/strace.py[co] %{_bindir}/gdb.py %{_bindir}/strace.py %{python_sitelib}/ptrace/ @@ -62,6 +62,9 @@ %{python_sitelib_arch}/ptrace-*-py%{pyver}.egg-info %changelog +* Sun Mar 8 2009 Terje Rosten - 0.6-3 +- Remove %%exclude + * Thu Mar 5 2009 Terje Rosten - 0.6-2 - switch to %%global, fix files listing, remove comments From kevin at fedoraproject.org Sun Mar 8 20:16:06 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Sun, 8 Mar 2009 20:16:06 +0000 (UTC) Subject: rpms/rkhunter/devel rkhunter.spec, 1.22, 1.23 rkhunter-1.3.4-fedoraconfig.patch, 1.1, 1.2 Message-ID: <20090308201606.5A3DE70116@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/extras/rpms/rkhunter/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8271 Modified Files: rkhunter.spec rkhunter-1.3.4-fedoraconfig.patch Log Message: Fix typo in patch file Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- rkhunter.spec 5 Mar 2009 23:01:05 -0000 1.22 +++ rkhunter.spec 8 Mar 2009 20:15:35 -0000 1.23 @@ -1,6 +1,6 @@ Name: rkhunter Version: 1.3.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A host-based tool to scan for rootkits, backdoors and local exploits Group: Applications/System @@ -104,6 +104,9 @@ %{_mandir}/man8/* %changelog +* Sun Mar 08 2009 Kevin Fenzi - 1.3.4-5 +- Fix typo in patch file + * Wed Mar 04 2009 Kevin Fenzi - 1.3.4-4 - Rework spec file - Add check for the new hmac ssh files rkhunter-1.3.4-fedoraconfig.patch: Index: rkhunter-1.3.4-fedoraconfig.patch =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter-1.3.4-fedoraconfig.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rkhunter-1.3.4-fedoraconfig.patch 5 Mar 2009 22:55:31 -0000 1.1 +++ rkhunter-1.3.4-fedoraconfig.patch 8 Mar 2009 20:15:35 -0000 1.2 @@ -139,7 +139,7 @@ # first non-blank line of the file. # -#OS_VERSION_FILE="/etc/release" -+OS_VERSION_FILE="/etc/redhat-release" ++OS_VERSION_FILE="/etc/fedora-release" # # The following two options can be used to whitelist files and directories From terjeros at fedoraproject.org Sun Mar 8 20:19:02 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Sun, 8 Mar 2009 20:19:02 +0000 (UTC) Subject: rpms/python-ptrace/F-9 python-ptrace.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090308201902.5EADC70119@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/python-ptrace/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9295/F-9 Modified Files: .cvsignore sources Added Files: python-ptrace.spec Log Message: Sync with rawhide. --- NEW FILE python-ptrace.spec --- %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitelib_arch: %global python_sitelib_arch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Summary: Debugger using ptrace written in Python Name: python-ptrace Version: 0.6 Release: 3%{?dist} License: GPLv2 Group: Development/Tools URL : http://python-ptrace.hachoir.org/ Source0: http://pypi.python.org/packages/source/p/python-ptrace/%{name}-%{version}.tar.gz BuildRequires: python-setuptools-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description python-ptrace is a debugger using ptrace written in Python. Fearures: o High level Python object API : PtraceDebugger and PtraceProcess o Able to control multiple processes: catch fork events on Linux o Read/write bytes to arbitrary address: take care of memory alignment and split bytes to cpu word o Execution step by step using ptrace_singlestep() or hardware interruption 3 o Dump registers, memory mappings, stack, etc. o Syscall tracer and parser (strace.py command) o Can use distorm disassembler (if available) %prep %setup -q %build %{__python} setup.py build %{__python} setup_cptrace.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} %{__python} setup_cptrace.py install -O1 --skip-build --root %{buildroot} %{__chmod} 0644 examples/*.py %{__rm} -f %{buildroot}%{_bindir}/{gdb,strace}.{pyo,pyc} %clean %{__rm} -rf %{buildroot} %check %{__python} ./test_doc.py %files %defattr(-, root, root, -) %doc AUTHORS ChangeLog COPYING README README.cptrace TODO %doc doc/* examples #exclude %{_bindir}/gdb.py[co] #exclude %{_bindir}/strace.py[co] %{_bindir}/gdb.py %{_bindir}/strace.py %{python_sitelib}/ptrace/ %{python_sitelib}/python_ptrace-*-py%{pyver}.egg-info %{python_sitelib_arch}/cptrace.so %{python_sitelib_arch}/ptrace-*-py%{pyver}.egg-info %changelog * Sun Mar 8 2009 Terje Rosten - 0.6-3 - Remove %%exclude * Thu Mar 5 2009 Terje Rosten - 0.6-2 - switch to %%global, fix files listing, remove comments * Wed Mar 4 2009 Terje Rosten - 0.6-1 - 0.6 * Sat Sep 13 2008 Terje Rosten - 0.5-1 - 0.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-ptrace/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:45:44 -0000 1.1 +++ .cvsignore 8 Mar 2009 20:18:31 -0000 1.2 @@ -0,0 +1 @@ +python-ptrace-0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-ptrace/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:45:44 -0000 1.1 +++ sources 8 Mar 2009 20:18:32 -0000 1.2 @@ -0,0 +1 @@ +510c8c005f373c3e079074c9720bacc9 python-ptrace-0.6.tar.gz From terjeros at fedoraproject.org Sun Mar 8 20:19:01 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Sun, 8 Mar 2009 20:19:01 +0000 (UTC) Subject: rpms/python-ptrace/F-10 python-ptrace.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090308201901.C3BE170116@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/python-ptrace/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9295/F-10 Modified Files: .cvsignore sources Added Files: python-ptrace.spec Log Message: Sync with rawhide. --- NEW FILE python-ptrace.spec --- %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitelib_arch: %global python_sitelib_arch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Summary: Debugger using ptrace written in Python Name: python-ptrace Version: 0.6 Release: 3%{?dist} License: GPLv2 Group: Development/Tools URL : http://python-ptrace.hachoir.org/ Source0: http://pypi.python.org/packages/source/p/python-ptrace/%{name}-%{version}.tar.gz BuildRequires: python-setuptools-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description python-ptrace is a debugger using ptrace written in Python. Fearures: o High level Python object API : PtraceDebugger and PtraceProcess o Able to control multiple processes: catch fork events on Linux o Read/write bytes to arbitrary address: take care of memory alignment and split bytes to cpu word o Execution step by step using ptrace_singlestep() or hardware interruption 3 o Dump registers, memory mappings, stack, etc. o Syscall tracer and parser (strace.py command) o Can use distorm disassembler (if available) %prep %setup -q %build %{__python} setup.py build %{__python} setup_cptrace.py build %install %{__rm} -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} %{__python} setup_cptrace.py install -O1 --skip-build --root %{buildroot} %{__chmod} 0644 examples/*.py %{__rm} -f %{buildroot}%{_bindir}/{gdb,strace}.{pyo,pyc} %clean %{__rm} -rf %{buildroot} %check %{__python} ./test_doc.py %files %defattr(-, root, root, -) %doc AUTHORS ChangeLog COPYING README README.cptrace TODO %doc doc/* examples #exclude %{_bindir}/gdb.py[co] #exclude %{_bindir}/strace.py[co] %{_bindir}/gdb.py %{_bindir}/strace.py %{python_sitelib}/ptrace/ %{python_sitelib}/python_ptrace-*-py%{pyver}.egg-info %{python_sitelib_arch}/cptrace.so %{python_sitelib_arch}/ptrace-*-py%{pyver}.egg-info %changelog * Sun Mar 8 2009 Terje Rosten - 0.6-3 - Remove %%exclude * Thu Mar 5 2009 Terje Rosten - 0.6-2 - switch to %%global, fix files listing, remove comments * Wed Mar 4 2009 Terje Rosten - 0.6-1 - 0.6 * Sat Sep 13 2008 Terje Rosten - 0.5-1 - 0.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-ptrace/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:45:44 -0000 1.1 +++ .cvsignore 8 Mar 2009 20:18:30 -0000 1.2 @@ -0,0 +1 @@ +python-ptrace-0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-ptrace/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:45:44 -0000 1.1 +++ sources 8 Mar 2009 20:18:31 -0000 1.2 @@ -0,0 +1 @@ +510c8c005f373c3e079074c9720bacc9 python-ptrace-0.6.tar.gz From scop at fedoraproject.org Sun Mar 8 20:24:56 2009 From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=) Date: Sun, 8 Mar 2009 20:24:56 +0000 (UTC) Subject: rpms/xemacs/devel xemacs.spec,1.45,1.46 Message-ID: <20090308202456.E5F1070116@cvs1.fedora.phx.redhat.com> Author: scop Update of /cvs/pkgs/rpms/xemacs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11072 Modified Files: xemacs.spec Log Message: * Sun Mar 8 2009 Ville Skytt?? - 21.5.28-12 - Make XFontSet support optional at build time and disable it by default to work around #478370. Index: xemacs.spec =================================================================== RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- xemacs.spec 26 Feb 2009 20:56:01 -0000 1.45 +++ xemacs.spec 8 Mar 2009 20:24:26 -0000 1.46 @@ -5,6 +5,7 @@ %bcond_with gtk %bcond_with wnn %bcond_with xaw3d +%bcond_with xfs %bcond_with xft %bcond_without mule %bcond_without nox @@ -17,7 +18,7 @@ Name: xemacs Version: 21.5.28 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -287,8 +288,10 @@ %if %{with xft} --with-xft=all \ %else +%if %{with xfs} --with-xfs \ %endif +%endif %if %{with gtk} --with-gtk \ --with-gnome \ @@ -547,6 +550,10 @@ %changelog +* Sun Mar 8 2009 Ville Skytt?? - 21.5.28-12 +- Make XFontSet support optional at build time and disable it by default + to work around #478370. + * Thu Feb 26 2009 Ville Skytt?? - 21.5.28-11 - Apply upstream autoload changes to be able to build recent XEmacs packages. - Make support for XIM optional at build time, still enabled by default. From terjeros at fedoraproject.org Sun Mar 8 20:25:55 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Sun, 8 Mar 2009 20:25:55 +0000 (UTC) Subject: rpms/python-ptrace/F-9 python-ptrace.spec,1.1,1.2 Message-ID: <20090308202555.31B2470116@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/python-ptrace/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11445 Modified Files: python-ptrace.spec Log Message: * Sun Mar 8 2009 Terje Rosten - 0.6-3.fc9.1 - Don't remove %exclude in < F10 Index: python-ptrace.spec =================================================================== RCS file: /cvs/extras/rpms/python-ptrace/F-9/python-ptrace.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-ptrace.spec 8 Mar 2009 20:18:31 -0000 1.1 +++ python-ptrace.spec 8 Mar 2009 20:25:24 -0000 1.2 @@ -6,7 +6,7 @@ Summary: Debugger using ptrace written in Python Name: python-ptrace Version: 0.6 -Release: 3%{?dist} +Release: 3%{?dist}.1 License: GPLv2 Group: Development/Tools URL : http://python-ptrace.hachoir.org/ @@ -62,6 +62,9 @@ %{python_sitelib_arch}/ptrace-*-py%{pyver}.egg-info %changelog +* Sun Mar 8 2009 Terje Rosten - 0.6-3.fc9.1 +- Don't remove %%exclude in < F10 + * Sun Mar 8 2009 Terje Rosten - 0.6-3 - Remove %%exclude From tuxbrewr at fedoraproject.org Sun Mar 8 20:28:33 2009 From: tuxbrewr at fedoraproject.org (Steven M. Parrish) Date: Sun, 8 Mar 2009 20:28:33 +0000 (UTC) Subject: rpms/pywebkitgtk/devel pywebkitgtk.spec,1.7,1.8 Message-ID: <20090308202833.5AC3770116@cvs1.fedora.phx.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/pywebkitgtk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12310 Modified Files: pywebkitgtk.spec Log Message: Rebuilt for WebKitGTK+ soname bump Index: pywebkitgtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/pywebkitgtk/devel/pywebkitgtk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pywebkitgtk.spec 27 Feb 2009 00:30:19 -0000 1.7 +++ pywebkitgtk.spec 8 Mar 2009 20:28:02 -0000 1.8 @@ -2,7 +2,7 @@ Name: pywebkitgtk Version: 1.0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Python Bindings for WebKit-gtk Group: Development/Languages @@ -46,6 +46,9 @@ %{python_sitearch}/gtk-2.0/* %changelog +* Sun Mar 08 2009 Steven M. Parrish +- Rebuilt for soname bump for webkitgtk+ + * Thu Feb 26 2009 Fedora Release Engineering - 1.0.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From tgl at fedoraproject.org Sun Mar 8 20:29:46 2009 From: tgl at fedoraproject.org (Tom Lane) Date: Sun, 8 Mar 2009 20:29:46 +0000 (UTC) Subject: rpms/postgresql/devel postgresql.spec,1.107,1.108 Message-ID: <20090308202946.0EB3470116@cvs1.fedora.phx.redhat.com> Author: tgl Update of /cvs/pkgs/rpms/postgresql/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12732 Modified Files: postgresql.spec Log Message: Enable tracing via systemtap Index: postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- postgresql.spec 27 Feb 2009 01:43:49 -0000 1.107 +++ postgresql.spec 8 Mar 2009 20:29:14 -0000 1.108 @@ -73,6 +73,7 @@ %{!?uuid:%define uuid 1} %{!?xml:%define xml 1} %{!?pam:%define pam 1} +%{!?sdt:%define sdt 1} %{!?pgfts:%define pgfts 1} %{!?runselftest:%define runselftest 1} @@ -83,7 +84,7 @@ Summary: PostgreSQL client programs and libraries Name: postgresql Version: 8.3.6 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/Databases Url: http://www.postgresql.org/ @@ -157,6 +158,10 @@ BuildRequires: pam-devel %endif +%if %sdt +BuildRequires: systemtap-sdt-devel +%endif + # main package requires -libs subpackage Requires: postgresql-libs = %{version}-%{release} @@ -440,6 +445,9 @@ %if %nls --enable-nls \ %endif +%if %sdt + --enable-dtrace \ +%endif %if %pgfts --enable-thread-safety \ %endif @@ -863,6 +871,10 @@ %endif %changelog +* Sun Mar 8 2009 Tom Lane 8.3.6-3 +- Enable tracing via systemtap +Resolves: #488941 + * Thu Feb 26 2009 Fedora Release Engineering - 8.3.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From cweyl at fedoraproject.org Sun Mar 8 20:33:16 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 8 Mar 2009 20:33:16 +0000 (UTC) Subject: rpms/perl-Class-MOP/devel .cvsignore, 1.25, 1.26 perl-Class-MOP.spec, 1.30, 1.31 sources, 1.24, 1.25 Message-ID: <20090308203316.E6BC870116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Class-MOP/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13811 Modified Files: .cvsignore perl-Class-MOP.spec sources Log Message: * Sun Mar 08 2009 Chris Weyl 0.78-1 - update to 0.78 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 28 Feb 2009 23:15:43 -0000 1.25 +++ .cvsignore 8 Mar 2009 20:32:46 -0000 1.26 @@ -1,10 +1,11 @@ -Class-MOP-0.77.tar.gz +Class-MOP-0.78.tar.gz Class-MOP-* *.gz *.tar *.rpm -noarch -i386 -x86_64 +*.bak clog .build* +noarch +x86_64 +i386 Index: perl-Class-MOP.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- perl-Class-MOP.spec 28 Feb 2009 23:15:43 -0000 1.30 +++ perl-Class-MOP.spec 8 Mar 2009 20:32:46 -0000 1.31 @@ -1,6 +1,6 @@ Name: perl-Class-MOP -Version: 0.77 -Release: 3%{?dist} +Version: 0.78 +Release: 1%{?dist} Summary: Metaobject programming model for Perl License: GPL+ or Artistic Group: Development/Libraries @@ -16,7 +16,6 @@ BuildRequires: perl(Module::Build) BuildRequires: perl(MRO::Compat) >= 0.05 BuildRequires: perl(Sub::Identify) >= 0.03 -# building w/XS, not needed BuildRequires: perl(Sub::Name) >= 0.04 BuildRequires: perl(Devel::GlobalDestruction) # test @@ -92,6 +91,9 @@ %{_mandir}/man3/* %changelog +* Sun Mar 08 2009 Chris Weyl 0.78-1 +- update to 0.78 + * Sat Feb 28 2009 Chris Weyl - 0.77-3 - Stripping bad provides of private Perl extension libs Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 23 Feb 2009 04:33:06 -0000 1.24 +++ sources 8 Mar 2009 20:32:46 -0000 1.25 @@ -1 +1 @@ -2254557171643537ee6473ad2c5c4f08 Class-MOP-0.77.tar.gz +03be1d56b26e6fb12c04746e421fdbbe Class-MOP-0.78.tar.gz From drago01 at fedoraproject.org Sun Mar 8 20:36:50 2009 From: drago01 at fedoraproject.org (Adel Gadllah) Date: Sun, 8 Mar 2009 20:36:50 +0000 (UTC) Subject: rpms/beagle/F-10 beagle-0.3.9-openfix.patch, NONE, 1.1 beagle.spec, 1.157, 1.158 Message-ID: <20090308203650.DA6CA70116@cvs1.fedora.phx.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/beagle/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14842 Modified Files: beagle.spec Added Files: beagle-0.3.9-openfix.patch Log Message: Remove bogos open check beagle-0.3.9-openfix.patch: --- NEW FILE beagle-0.3.9-openfix.patch --- diff -upNr beagle-0.3.9.orign/search/Beagle.Search.Tiles/Tile.cs beagle-0.3.9/search/Beagle.Search.Tiles/Tile.cs --- beagle-0.3.9.orign/search/Beagle.Search.Tiles/Tile.cs 2008-07-17 01:54:15.000000000 +0200 +++ beagle-0.3.9/search/Beagle.Search.Tiles/Tile.cs 2009-03-08 21:24:08.324409872 +0100 @@ -345,14 +345,7 @@ namespace Beagle.Search.Tiles { RunDefaultHandler ("desktop-launch", uri); #elif ENABLE_XDG_OPEN RunDefaultHandler ("xdg-open", uri); -#else - MimeApplication app; - app = Mime.GetDefaultApplication (mimetype); - if (app == null) { - Console.WriteLine ("Can't open MimeType '{0}'", mimetype); - return; - } - +#else bool expect_uris = app.SupportsUris (); path = hit.Path; Index: beagle.spec =================================================================== RCS file: /cvs/pkgs/rpms/beagle/F-10/beagle.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- beagle.spec 31 Jan 2009 11:49:20 -0000 1.157 +++ beagle.spec 8 Mar 2009 20:36:20 -0000 1.158 @@ -1,6 +1,6 @@ Name: beagle Version: 0.3.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Beagle Search Infrastructure Group: User Interface/Desktops # see COPYING for details @@ -57,6 +57,7 @@ Patch6: beagle-monodoc.patch Patch7: beagle-0.3.8-epiphany.patch Patch8: beagle-0.3.9-libgnome-desktop-soname.patch +Patch9: beagle-0.3.9-openfix.patch # Mono is not available on these arches ExcludeArch: s390 s390x sparc64 ppc64 @@ -139,6 +140,7 @@ %patch6 -p1 -b .monodoc %patch7 -p1 -b .epiphany %patch8 -p1 -b .gnome-desktop +%patch9 -p1 -b .open-fix %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} @@ -329,6 +331,9 @@ %{_libdir}/pkgconfig/beagle*.pc %changelog +* Sun Mar 08 2009 Adel Gadllah - 0.3.9-3 +- Don't fail to open some files + * Sat Jan 31 2009 Adel Gadllah - 0.3.9-2 - Rebase debug output patch From drago01 at fedoraproject.org Sun Mar 8 20:38:46 2009 From: drago01 at fedoraproject.org (Adel Gadllah) Date: Sun, 8 Mar 2009 20:38:46 +0000 (UTC) Subject: rpms/beagle/devel beagle-0.3.9-openfix.patch, NONE, 1.1 beagle.spec, 1.164, 1.165 Message-ID: <20090308203846.A361370116@cvs1.fedora.phx.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/beagle/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15382 Modified Files: beagle.spec Added Files: beagle-0.3.9-openfix.patch Log Message: Remove bogos open check beagle-0.3.9-openfix.patch: --- NEW FILE beagle-0.3.9-openfix.patch --- diff -upNr beagle-0.3.9.orign/search/Beagle.Search.Tiles/Tile.cs beagle-0.3.9/search/Beagle.Search.Tiles/Tile.cs --- beagle-0.3.9.orign/search/Beagle.Search.Tiles/Tile.cs 2008-07-17 01:54:15.000000000 +0200 +++ beagle-0.3.9/search/Beagle.Search.Tiles/Tile.cs 2009-03-08 21:24:08.324409872 +0100 @@ -345,14 +345,7 @@ namespace Beagle.Search.Tiles { RunDefaultHandler ("desktop-launch", uri); #elif ENABLE_XDG_OPEN RunDefaultHandler ("xdg-open", uri); -#else - MimeApplication app; - app = Mime.GetDefaultApplication (mimetype); - if (app == null) { - Console.WriteLine ("Can't open MimeType '{0}'", mimetype); - return; - } - +#else bool expect_uris = app.SupportsUris (); path = hit.Path; Index: beagle.spec =================================================================== RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- beagle.spec 2 Mar 2009 15:24:23 -0000 1.164 +++ beagle.spec 8 Mar 2009 20:38:16 -0000 1.165 @@ -1,6 +1,6 @@ Name: beagle Version: 0.3.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The Beagle Search Infrastructure Group: User Interface/Desktops # see COPYING for details @@ -66,6 +66,8 @@ #gnome-desktop Patch10: beagle-0.3.9-libgnome-desktop-soname.patch +Patch11: beagle-0.3.9-openfix.patch + # Mono is not available on these arches ExcludeArch: s390 s390x sparc64 ppc64 @@ -150,6 +152,7 @@ %patch8 -p1 -b .gmime-2.4 %patch9 -p1 -b .firefox-3.1 %patch10 -p1 -b .gnome-desktop +%patch11 -p1 -b .open-fix %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} @@ -351,6 +354,9 @@ %{_libdir}/pkgconfig/beagle*.pc %changelog +* Sun Mar 08 2009 Adel Gadllah - 0.3.9-6 +- Don't fail to open some files + * Mon Mar 02 2009 Adel Gadllah - 0.3.9-5 - Spec file cleanups (RH #225612) From cweyl at fedoraproject.org Sun Mar 8 20:42:35 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 8 Mar 2009 20:42:35 +0000 (UTC) Subject: rpms/perl-SQL-Translator/F-10 perl-SQL-Translator.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <20090308204235.3214B70116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-SQL-Translator/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16377 Modified Files: perl-SQL-Translator.spec sources Log Message: * Sun Mar 08 2009 Chris Weyl 0.09004-1 - update to 0.09004 Index: perl-SQL-Translator.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Translator/F-10/perl-SQL-Translator.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-SQL-Translator.spec 8 Sep 2008 02:18:13 -0000 1.5 +++ perl-SQL-Translator.spec 8 Mar 2009 20:42:04 -0000 1.6 @@ -1,5 +1,5 @@ Name: perl-SQL-Translator -Version: 0.09001 +Version: 0.09004 Release: 1%{?dist} Summary: Manipulate structured data definitions (SQL and more) # see, e.g., lib/SQL/Translator.pm @@ -110,6 +110,15 @@ %{_mandir}/man[13]/* %changelog +* Sun Mar 08 2009 Chris Weyl 0.09004-1 +- update to 0.09004 + +* Thu Feb 26 2009 Fedora Release Engineering - 0.09002-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Feb 03 2009 Chris Weyl 0.09002-1 +- update to 0.09002 + * Sun Sep 07 2008 Chris Weyl 0.9001-1 - update to 0.9001 - add new BR: perl(Digest::SHA1) >= 2.00 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Translator/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Sep 2008 02:18:13 -0000 1.4 +++ sources 8 Mar 2009 20:42:04 -0000 1.5 @@ -1 +1 @@ -323ae358c3b468b0686b4ddad8703944 SQL-Translator-0.09001.tar.gz +0f54df1319ad5c5c6e833cbb5d51e383 SQL-Translator-0.09004.tar.gz From pghmcfc at fedoraproject.org Sun Mar 8 20:44:16 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Sun, 8 Mar 2009 20:44:16 +0000 (UTC) Subject: rpms/perl-Net-SSLeay/devel perl-Net-SSLeay.spec,1.13,1.14 Message-ID: <20090308204416.828B770116@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-Net-SSLeay/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16853 Modified Files: perl-Net-SSLeay.spec Log Message: - filter out unwanted provides for perl shared objects - run tests in verbose mode Index: perl-Net-SSLeay.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-SSLeay/devel/perl-Net-SSLeay.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Net-SSLeay.spec 26 Feb 2009 23:28:04 -0000 1.13 +++ perl-Net-SSLeay.spec 8 Mar 2009 20:43:45 -0000 1.14 @@ -1,6 +1,6 @@ Name: perl-Net-SSLeay Version: 1.35 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl extension for using OpenSSL Group: Development/Libraries License: OpenSSL @@ -13,6 +13,12 @@ BuildRequires: perl(Test::Exception), perl(Test::NoWarnings), perl(Test::Pod) BuildRequires: perl(Test::Warn), perl(Tree::DAG_Node) +# don't "provide" private Perl libs or the redundant unversioned perl(Net::SSLeay) one +%global _use_internal_dependency_generator 0 +%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u +%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P} | %{__grep} -Fvx 'perl(Net::SSLeay)'" +%global __find_requires /bin/sh -c "%{__deploop R}" + %description This module offers some high level convenience functions for accessing web pages on SSL servers (for symmetry, same API is offered for @@ -29,10 +35,6 @@ %{__mv} ${f}.utf8 ${f} done -# Remove redundant provides (there's also a versioned one) -%global provfilt /bin/sh -c "%{__perl_provides} | %{__grep} -Fvx 'perl(Net::SSLeay)'" -%define __perl_provides %{provfilt} - %build PERL_MM_USE_DEFAULT=1 %{__perl} Makefile.PL \ INSTALLDIRS=vendor \ @@ -46,12 +48,12 @@ %{__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' -empty -exec %{__rm} -f {} ';' -/usr/bin/find %{buildroot} -depth -type d -exec %{__rmdir} {} 2>/dev/null ';' +/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';' %{__rm} -f %{buildroot}%{perl_vendorarch}/Net/ptrtstrun.pl %{__chmod} -R u+w %{buildroot}/* %check -%{__make} test +%{__make} test TEST_VERBOSE=1 %clean %{__rm} -rf %{buildroot} @@ -64,8 +66,12 @@ %{_mandir}/man3/Net::SSLeay*.3* %changelog +* Sun Mar 8 2009 Paul Howarth - 1.35-4 +- filter out unwanted provides for perl shared objects +- run tests in verbose mode + * Thu Feb 26 2009 Fedora Release Engineering - 1.35-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Sat Jan 17 2009 Tomas Mraz - 1.35-2 - rebuild with new openssl @@ -78,10 +84,10 @@ - use the distro openssl flags rather than guessing them * Wed Feb 27 2008 Tom "spot" Callaway - 1.32-5 -- Rebuild for perl 5.10 (again) +- rebuild for perl 5.10 (again) * Tue Feb 19 2008 Fedora Release Engineering - 1.32-4 -- Autorebuild for GCC 4.3 +- autorebuild for GCC 4.3 * Thu Jan 31 2008 Tom "spot" Callaway - 1.32-3 - rebuild for new perl From drago01 at fedoraproject.org Sun Mar 8 20:44:37 2009 From: drago01 at fedoraproject.org (Adel Gadllah) Date: Sun, 8 Mar 2009 20:44:37 +0000 (UTC) Subject: rpms/beagle/F-9 beagle-0.3.8-openfix.patch, NONE, 1.1 beagle.spec, 1.147, 1.148 Message-ID: <20090308204437.B22DD70116@cvs1.fedora.phx.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/beagle/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16967 Modified Files: beagle.spec Added Files: beagle-0.3.8-openfix.patch Log Message: Remove bogos open check beagle-0.3.8-openfix.patch: --- NEW FILE beagle-0.3.8-openfix.patch --- diff -upNr beagle-0.3.8.orign/search/Beagle.Search.Tiles/Tile.cs beagle-0.3.8/search/Beagle.Search.Tiles/Tile.cs --- beagle-0.3.8.orign/search/Beagle.Search.Tiles/Tile.cs 2008-06-12 07:41:19.000000000 +0200 +++ beagle-0.3.8/search/Beagle.Search.Tiles/Tile.cs 2009-03-08 21:41:56.274410522 +0100 @@ -346,15 +346,8 @@ namespace Beagle.Search.Tiles { #elif ENABLE_XDG_OPEN RunDefaultHandler ("xdg-open", uri); #else - MimeApplication app; - app = Mime.GetDefaultApplication (mimetype); bool expect_uris = app.SupportUris (); path = hit.Path; - - if (app == null) { - Console.WriteLine ("Can't open MimeType '{0}'", mimetype); - return; - } GLib.List list = new GLib.List ((IntPtr) 0); list.Append (expect_uris ? uri : path); Index: beagle.spec =================================================================== RCS file: /cvs/pkgs/rpms/beagle/F-9/beagle.spec,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- beagle.spec 9 Nov 2008 07:33:53 -0000 1.147 +++ beagle.spec 8 Mar 2009 20:44:07 -0000 1.148 @@ -1,6 +1,6 @@ Name: beagle Version: 0.3.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: The Beagle Search Infrastructure Group: User Interface/Desktops # see COPYING for details @@ -56,6 +56,8 @@ Patch8: beagle-0.3.8-desktop-parser.patch #svn commit r4855 Patch9: beagle-0.3.8-category-crash.patch +Patch10: beagle-0.3.8-openfix.patch + # Mono is not available on these arches ExcludeArch: s390 s390x sparc64 ppc64 @@ -149,6 +151,7 @@ %patch7 -p1 -b .typo %patch8 -p1 -b .desktop-parser %patch9 -p1 -b .category-crash +%patch10 -p1 -b .openfix %build autoconf @@ -341,6 +344,9 @@ %{_libdir}/pkgconfig/beagle*.pc %changelog +* Sun Mar 08 2009 Adel Gadllah - 0.3.8-8 +- Don't fail to open some files + * Sun Nov 09 2008 Adel Gadllah - 0.3.8-7 - Fix crash in the gnome UI (RH #469383) From jcollie at fedoraproject.org Sun Mar 8 20:46:31 2009 From: jcollie at fedoraproject.org (Jeffrey C. Ollie) Date: Sun, 8 Mar 2009 20:46:31 +0000 (UTC) Subject: rpms/compat-libosip2/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE compat-libosip2.spec, 1.10, NONE libosip2-2.2.2-x64.patch, 1.1, NONE sources, 1.2, NONE Message-ID: <20090308204631.38C8A70119@cvs1.fedora.phx.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/compat-libosip2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17912 Added Files: dead.package Removed Files: .cvsignore Makefile compat-libosip2.spec libosip2-2.2.2-x64.patch sources Log Message: Retiring package, no longer needed by anything. --- NEW FILE dead.package --- no longer needed by anything in Fedora --- .cvsignore DELETED --- --- Makefile DELETED --- --- compat-libosip2.spec DELETED --- --- libosip2-2.2.2-x64.patch DELETED --- --- sources DELETED --- From cweyl at fedoraproject.org Sun Mar 8 20:47:30 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 8 Mar 2009 20:47:30 +0000 (UTC) Subject: rpms/perl-B-Hooks-EndOfScope/devel .cvsignore, 1.2, 1.3 perl-B-Hooks-EndOfScope.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090308204730.A08C470119@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-B-Hooks-EndOfScope/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18094 Modified Files: .cvsignore perl-B-Hooks-EndOfScope.spec sources Log Message: * Sun Mar 08 2009 Chris Weyl 0.07-1 - update to 0.07 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-B-Hooks-EndOfScope/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Dec 2008 23:18:53 -0000 1.2 +++ .cvsignore 8 Mar 2009 20:47:00 -0000 1.3 @@ -1 +1 @@ -B-Hooks-EndOfScope-0.04.tar.gz +B-Hooks-EndOfScope-0.07.tar.gz Index: perl-B-Hooks-EndOfScope.spec =================================================================== RCS file: /cvs/extras/rpms/perl-B-Hooks-EndOfScope/devel/perl-B-Hooks-EndOfScope.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-B-Hooks-EndOfScope.spec 26 Feb 2009 11:16:44 -0000 1.2 +++ perl-B-Hooks-EndOfScope.spec 8 Mar 2009 20:47:00 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-B-Hooks-EndOfScope -Version: 0.04 -Release: 2%{?dist} +Version: 0.07 +Release: 1%{?dist} # see lib/B/Hooks/EndOfScope.pm License: GPL+ or Artistic Group: Development/Libraries @@ -12,7 +12,7 @@ BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(Scope::Guard) +BuildRequires: perl(Variable::Magic) >= 0.31 BuildRequires: perl(Sub::Exporter) BuildRequires: perl(Test::More) @@ -49,6 +49,9 @@ %{_mandir}/man3/*.3* %changelog +* Sun Mar 08 2009 Chris Weyl 0.07-1 +- update to 0.07 + * Thu Feb 26 2009 Fedora Release Engineering - 0.04-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-B-Hooks-EndOfScope/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Dec 2008 23:18:53 -0000 1.2 +++ sources 8 Mar 2009 20:47:00 -0000 1.3 @@ -1 +1 @@ -1705a0643af266ad902f8dda2212dd78 B-Hooks-EndOfScope-0.04.tar.gz +07bae81967dd4075f54aa839e70482e7 B-Hooks-EndOfScope-0.07.tar.gz From cweyl at fedoraproject.org Sun Mar 8 20:50:10 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 8 Mar 2009 20:50:10 +0000 (UTC) Subject: rpms/perl-B-Hooks-EndOfScope/F-10 .cvsignore, 1.2, 1.3 perl-B-Hooks-EndOfScope.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090308205010.2848A70116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-B-Hooks-EndOfScope/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19442 Modified Files: .cvsignore perl-B-Hooks-EndOfScope.spec sources Log Message: * Sun Mar 08 2009 Chris Weyl 0.07-1 - update to 0.07 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-B-Hooks-EndOfScope/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Dec 2008 23:20:26 -0000 1.2 +++ .cvsignore 8 Mar 2009 20:49:39 -0000 1.3 @@ -1 +1 @@ -B-Hooks-EndOfScope-0.04.tar.gz +B-Hooks-EndOfScope-0.07.tar.gz Index: perl-B-Hooks-EndOfScope.spec =================================================================== RCS file: /cvs/extras/rpms/perl-B-Hooks-EndOfScope/F-10/perl-B-Hooks-EndOfScope.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-B-Hooks-EndOfScope.spec 1 Dec 2008 23:20:26 -0000 1.1 +++ perl-B-Hooks-EndOfScope.spec 8 Mar 2009 20:49:39 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-B-Hooks-EndOfScope -Version: 0.04 -Release: 1%{?dist} +Version: 0.07 +Release: 1%{?dist} # see lib/B/Hooks/EndOfScope.pm License: GPL+ or Artistic Group: Development/Libraries @@ -12,7 +12,7 @@ BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(Scope::Guard) +BuildRequires: perl(Variable::Magic) >= 0.31 BuildRequires: perl(Sub::Exporter) BuildRequires: perl(Test::More) @@ -49,6 +49,12 @@ %{_mandir}/man3/*.3* %changelog +* Sun Mar 08 2009 Chris Weyl 0.07-1 +- update to 0.07 + +* Thu Feb 26 2009 Fedora Release Engineering - 0.04-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Nov 08 2008 Chris Weyl 0.04-1 - update for submission Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-B-Hooks-EndOfScope/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Dec 2008 23:20:26 -0000 1.2 +++ sources 8 Mar 2009 20:49:39 -0000 1.3 @@ -1 +1 @@ -1705a0643af266ad902f8dda2212dd78 B-Hooks-EndOfScope-0.04.tar.gz +07bae81967dd4075f54aa839e70482e7 B-Hooks-EndOfScope-0.07.tar.gz From mjakubicek at fedoraproject.org Sun Mar 8 20:51:30 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Sun, 8 Mar 2009 20:51:30 +0000 (UTC) Subject: rpms/boinc-client/devel boinc-client.spec,1.28,1.29 Message-ID: <20090308205130.C188170116@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/boinc-client/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19750 Modified Files: boinc-client.spec Log Message: - fix boincmgr wrapper script to honour data dir Index: boinc-client.spec =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- boinc-client.spec 8 Mar 2009 17:45:41 -0000 1.28 +++ boinc-client.spec 8 Mar 2009 20:50:59 -0000 1.29 @@ -176,11 +176,24 @@ pushd $RPM_BUILD_ROOT%{_bindir} ln -s boinc_client boinc mv boinc_cmd boinccmd -cat > boincmgr <<-EOF - #!/bin/bash - # wrapper script to allow passwordless manager connections from users of the boinc group - cd %{_localstatedir}/lib/boinc - boinc_gui +cat > boincmgr < - 6.4.7-2.r17542svn - Fix overriding $BOINCOPTS from /etc/sysconfig/boinc-client in the init script (BZ#489199). -- Fix reference to sample sysconfig configuration file (boinc-client instead of - boinc). - Fixed boinc-gccflags.patch +- Honour data dir in boincmgr wrapper script. * Fri Mar 06 2009 Milos Jakubicek - 6.4.7-1.r17542svn - i386 arch conditional replaced by the %%{ix86} macro. From epienbro at fedoraproject.org Sun Mar 8 20:52:48 2009 From: epienbro at fedoraproject.org (Erik van Pienbroek) Date: Sun, 8 Mar 2009 20:52:48 +0000 (UTC) Subject: rpms/mingw32-gtk2/devel mingw32-gtk2-enable_static_build.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mingw32-gtk2.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090308205248.7E32770116@cvs1.fedora.phx.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/mingw32-gtk2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20065 Modified Files: .cvsignore mingw32-gtk2.spec sources Added Files: mingw32-gtk2-enable_static_build.patch Log Message: - Update to 2.15.5 - Disable gdiplus support for now because of GNOME BZ#552678 - Use the ./configure flag --without-libtiff until mingw32-libtiff is packaged - Fixed the %%defattr line - Dropped the .def files as they aren't used anymore after compilation - Added -static subpackage mingw32-gtk2-enable_static_build.patch: --- NEW FILE mingw32-gtk2-enable_static_build.patch --- --- configure.in.orig 2009-03-08 17:44:05.697993414 +0100 +++ configure.in 2009-03-08 17:44:14.634993047 +0100 @@ -171,16 +171,16 @@ CXXFLAGS="$gtk_save_cxxflags" AC_LANG_RESTORE -if test "$os_win32" = "yes"; then - if test x$enable_static = xyes -o x$enable_static = x; then - AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) - enable_static=no - fi - if test x$enable_shared = xno; then - AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) - fi - enable_shared=yes -fi +#if test "$os_win32" = "yes"; then +# if test x$enable_static = xyes -o x$enable_static = x; then +# AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) +# enable_static=no +# fi +# if test x$enable_shared = xno; then +# AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) +# fi +# enable_shared=yes +#fi AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Feb 2009 10:09:34 -0000 1.2 +++ .cvsignore 8 Mar 2009 20:52:17 -0000 1.3 @@ -1 +1 @@ -gtk+-2.15.0.tar.bz2 +gtk+-2.15.5.tar.bz2 Index: mingw32-gtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mingw32-gtk2.spec 26 Feb 2009 01:10:41 -0000 1.2 +++ mingw32-gtk2.spec 8 Mar 2009 20:52:18 -0000 1.3 @@ -5,8 +5,8 @@ %define __find_provides %{_mingw32_findprovides} Name: mingw32-gtk2 -Version: 2.15.0 -Release: 4%{?dist} +Version: 2.15.5 +Release: 1%{?dist} Summary: MinGW Windows Gtk2 library License: LGPLv2+ @@ -23,6 +23,9 @@ # Fix use of extended buttons in gtkstatusicon. Patch1000: mingw32-gtk2-2.15.0-xbuttons.patch +# Enable building a static library of GTK +Patch1001: mingw32-gtk2-enable_static_build.patch + BuildArch: noarch BuildRequires: mingw32-filesystem >= 40 @@ -53,6 +56,11 @@ # Native one for gdk-pixbuf-csource BuildRequires: gtk2-devel +# These are required for the static library patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool + Requires: pkgconfig @@ -60,17 +68,31 @@ MinGW Windows Gtk2 library. +%package static +Summary: Static version of the MinGW Windows Gtk2 library +Requires: %{name} = %{version}-%{release} + +%description static +Static version of the MinGW Windows Gtk2 library. + + %prep %setup -q -n gtk+-%{version} %patch1000 -p1 +%patch1001 -p0 + +# Regenerate the configure script +aclocal +autoreconf +libtoolize %build # Need to run the correct version of glib-mkenums. PATH=%{_mingw32_bindir}:$PATH -%{_mingw32_configure} --disable-cups --disable-static +%{_mingw32_configure} --disable-cups --enable-static --disable-gdiplus --without-libtiff make %{?_smp_mflags} @@ -87,6 +109,14 @@ # Remove documentation too. rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc +# The .def files are only used while compiling the libraries themselves +# (they contain a list of functions which need to be exported by the linker) +# so they serve no purpose for other libraries and applications +rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk_pixbuf-2.0.def +rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk-win32-2.0.def +rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gtk-win32-2.0.def +rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gailutil.def + # Install gdk-pixbuf.loaders. mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/ @@ -99,7 +129,7 @@ %files -f %{name}.lang -%defattr(-,root,root) +%defattr(-,root,root,-) %doc COPYING %{_mingw32_datadir}/themes/* %{_mingw32_bindir}/gdk-pixbuf-csource.exe @@ -112,7 +142,124 @@ %{_mingw32_bindir}/libgdk-win32-2.0-0.dll %{_mingw32_bindir}/libgdk_pixbuf-2.0-0.dll %{_mingw32_bindir}/libgtk-win32-2.0-0.dll -%{_mingw32_libdir}/gtk-2.0/ +%dir %{_mingw32_libdir}/gtk-2.0 +%dir %{_mingw32_libdir}/gtk-2.0/2.10.0 +%dir %{_mingw32_libdir}/gtk-2.0/2.10.0/engines +%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libpixmap.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libpixmap.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libpixmap.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libwimp.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libwimp.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libwimp.la +%dir %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-am-et.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-am-et.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-am-et.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cedilla.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cedilla.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cedilla.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ime.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ime.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ime.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-inuktitut.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-inuktitut.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-inuktitut.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ipa.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ipa.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ipa.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-multipress.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-multipress.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-multipress.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-thai.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-thai.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-thai.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-er.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-er.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-er.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.la +%dir %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.la +%if 0 +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.la +%else +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.la +%endif +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-png.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.la +%{_mingw32_libdir}/gtk-2.0/include/ +%dir %{_mingw32_libdir}/gtk-2.0/modules +%{_mingw32_libdir}/gtk-2.0/modules/libgail.dll +%{_mingw32_libdir}/gtk-2.0/modules/libgail.dll.a +%{_mingw32_libdir}/gtk-2.0/modules/libgail.la %{_mingw32_libdir}/libgailutil.dll.a %{_mingw32_libdir}/libgailutil.la %{_mingw32_libdir}/libgdk-win32-2.0.dll.a @@ -121,9 +268,6 @@ %{_mingw32_libdir}/libgdk_pixbuf-2.0.la %{_mingw32_libdir}/libgtk-win32-2.0.dll.a %{_mingw32_libdir}/libgtk-win32-2.0.la -%{_mingw32_libdir}/gdk_pixbuf-2.0.def -%{_mingw32_libdir}/gdk-win32-2.0.def -%{_mingw32_libdir}/gtk-win32-2.0.def %{_mingw32_libdir}/pkgconfig/gail.pc %{_mingw32_libdir}/pkgconfig/gdk-2.0.pc %{_mingw32_libdir}/pkgconfig/gdk-win32-2.0.pc @@ -136,8 +280,52 @@ %{_mingw32_datadir}/aclocal/gtk-2.0.m4 %{_mingw32_datadir}/gtk-2.0/ +%files static +%defattr(-,root,root,-) +%{_mingw32_libdir}/libgailutil.a +%{_mingw32_libdir}/libgdk-win32-2.0.a +%{_mingw32_libdir}/libgdk_pixbuf-2.0.a +%{_mingw32_libdir}/libgtk-win32-2.0.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libpixmap.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libwimp.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-am-et.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cedilla.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ime.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-inuktitut.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ipa.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-multipress.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-thai.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-er.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-png.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.a +%{_mingw32_libdir}/gtk-2.0/modules/libgail.a %changelog +* Sun Mar 8 2009 Erik van Pienbroek - 2.15.5-1 +- Update to 2.15.5 +- Disable gdiplus support for now because of GNOME BZ#552678 +- Use the ./configure flag --without-libtiff until mingw32-libtiff is packaged +- Fixed the %%defattr line +- Dropped the .def files as they aren't used anymore after compilation +- Added -static subpackage + * Wed Feb 25 2009 Fedora Release Engineering - 2.15.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Feb 2009 10:09:35 -0000 1.2 +++ sources 8 Mar 2009 20:52:18 -0000 1.3 @@ -1 +1 @@ -23ff288d00b24f0820a4ae79a747f25e gtk+-2.15.0.tar.bz2 +aa010d3fa57cba96f32db352eb35754f gtk+-2.15.5.tar.bz2 From pkgdb at fedoraproject.org Sun Mar 8 20:57:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 20:57:36 +0000 Subject: [pkgdb] pikdev ownership updated Message-ID: <20090308205756.613EE20820B@bastion.fedora.phx.redhat.com> Package pikdev in Fedora devel is now owned by chitlesh To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Sun Mar 8 20:58:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 20:58:09 +0000 Subject: [pkgdb] pikdev ownership updated Message-ID: <20090308205807.7C0D4208545@bastion.fedora.phx.redhat.com> Package pikdev in Fedora 10 is now owned by chitlesh To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Sun Mar 8 20:57:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 20:57:11 +0000 Subject: [pkgdb] pikdev ownership updated Message-ID: <20090308205809.5228D20820B@bastion.fedora.phx.redhat.com> Package pikdev in Fedora 9 is now owned by chitlesh To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From tuxbrewr at fedoraproject.org Sun Mar 8 20:57:58 2009 From: tuxbrewr at fedoraproject.org (Steven M. Parrish) Date: Sun, 8 Mar 2009 20:57:58 +0000 (UTC) Subject: comps comps-f11.xml.in,1.148,1.149 Message-ID: <20090308205758.1CE9E70116@cvs1.fedora.phx.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21389 Modified Files: comps-f11.xml.in Log Message: Added sugar-update-control to sugar-desktop Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- comps-f11.xml.in 8 Mar 2009 19:06:11 -0000 1.148 +++ comps-f11.xml.in 8 Mar 2009 20:57:27 -0000 1.149 @@ -4613,6 +4613,7 @@ sugar-terminal sugar-turtleart sugar-write + sugar-update-control From pkgdb at fedoraproject.org Sun Mar 8 20:59:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 20:59:08 +0000 Subject: [pkgdb] pikloops ownership updated Message-ID: <20090308210006.7DB0720820B@bastion.fedora.phx.redhat.com> Package pikloops in Fedora devel is now owned by chitlesh To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Sun Mar 8 21:00:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 21:00:13 +0000 Subject: [pkgdb] pikloops ownership updated Message-ID: <20090308210011.821C52084CF@bastion.fedora.phx.redhat.com> Package pikloops in Fedora 10 is now owned by chitlesh To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Sun Mar 8 20:59:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 08 Mar 2009 20:59:53 +0000 Subject: [pkgdb] pikloops ownership updated Message-ID: <20090308210013.A1AD5208545@bastion.fedora.phx.redhat.com> Package pikloops in Fedora 9 is now owned by chitlesh To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From cweyl at fedoraproject.org Sun Mar 8 21:07:23 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Sun, 8 Mar 2009 21:07:23 +0000 (UTC) Subject: rpms/perl-Moose/devel .cvsignore, 1.25, 1.26 perl-Moose.spec, 1.35, 1.36 sources, 1.25, 1.26 Message-ID: <20090308210723.381A870116@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Moose/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23605 Modified Files: .cvsignore perl-Moose.spec sources Log Message: * Sun Mar 08 2009 Chris Weyl 0.72-1 - update to 0.72 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 23 Feb 2009 06:17:57 -0000 1.25 +++ .cvsignore 8 Mar 2009 21:06:52 -0000 1.26 @@ -1 +1 @@ -Moose-0.71.tar.gz +Moose-0.72.tar.gz Index: perl-Moose.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- perl-Moose.spec 26 Feb 2009 22:14:10 -0000 1.35 +++ perl-Moose.spec 8 Mar 2009 21:06:52 -0000 1.36 @@ -1,6 +1,6 @@ Name: perl-Moose -Version: 0.71 -Release: 2%{?dist} +Version: 0.72 +Release: 1%{?dist} Summary: Complete modern object system for Perl 5 License: GPL+ or Artistic Group: Development/Libraries @@ -15,7 +15,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(Class::MOP) >= 0.77 +BuildRequires: perl(Class::MOP) >= 0.78 BuildRequires: perl(Filter::Simple) BuildRequires: perl(List::MoreUtils) >= 0.12 BuildRequires: perl(Scalar::Util) >= 1.19 @@ -53,14 +53,11 @@ %description Moose is an extension of the Perl 5 object system. -Yes, I know there has been an explosion recently of new ways to build -objects in Perl 5, most of them based on inside-out objects and other -such things. Moose is different because it is not a new object system -for Perl 5, but instead an extension of the existing object system. - Moose is built on top of Class::MOP, which is a metaclass system for Perl 5. This means that Moose not only makes building normal Perl 5 objects better, but it also provides the power of metaclass programming. +such things. Moose is different from other Perl 5 object systems because +it is not a new system, but instead an extension of the existing one. While Moose is very much inspired by Perl 6, it is not itself Perl 6. Instead, it is an OO system for Perl 5. I built Moose because I was @@ -112,6 +109,9 @@ %{_mandir}/man3/* %changelog +* Sun Mar 08 2009 Chris Weyl 0.72-1 +- update to 0.72 + * Thu Feb 26 2009 Fedora Release Engineering - 0.71-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 23 Feb 2009 06:17:57 -0000 1.25 +++ sources 8 Mar 2009 21:06:52 -0000 1.26 @@ -1 +1 @@ -83ee74aa2d83ad1817fb6574ec324022 Moose-0.71.tar.gz +b78fef11546371f33b99e61fd4c4f5c0 Moose-0.72.tar.gz From mjakubicek at fedoraproject.org Sun Mar 8 21:14:44 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Sun, 8 Mar 2009 21:14:44 +0000 (UTC) Subject: rpms/boinc-client/F-10 boinc-client-init-d, 1.5, 1.6 boinc-client.spec, 1.22, 1.23 boinc-gccflags.patch, 1.3, 1.4 Message-ID: <20090308211444.EF4A970116@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/boinc-client/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25362 Modified Files: boinc-client-init-d boinc-client.spec boinc-gccflags.patch Log Message: - Fix overriding $BOINCOPTS from /etc/sysconfig/boinc-client in the init script (BZ#489199). - Fixed boinc-gccflags.patch - Honour data dir in boincmgr wrapper script. Index: boinc-client-init-d =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/F-10/boinc-client-init-d,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- boinc-client-init-d 13 Dec 2008 14:25:36 -0000 1.5 +++ boinc-client-init-d 8 Mar 2009 21:14:14 -0000 1.6 @@ -67,6 +67,11 @@ LOGFILE=/var/log/boinc.log ERRORLOG=/var/log/boincerr.log +# BOINC options: for the command line when running the client. +# Be aware that --allow_remote_gui_rpc opens up your machine to the world! +# +#BOINCOPTS="--allow_remote_gui_rpc" +BOINCOPTS=" --daemon" # Subsys lock file ... @@ -101,10 +106,10 @@ ## Look for any local configuration settings which override all above -if [ -f /etc/sysconfig/boinc ]; then - . /etc/sysconfig/boinc -elif [ -f /etc/default/boinc ]; then - . /etc/default/boinc +if [ -f /etc/sysconfig/boinc-client ]; then + . /etc/sysconfig/boinc-client +elif [ -f /etc/default/boinc-client ]; then + . /etc/default/boinc-client fi @@ -117,12 +122,6 @@ exit 7 fi -# BOINC options: for the command line when running the client. -# Be aware that --allow_remote_gui_rpc opens up your machine to the world! -# -#BOINCOPTS="--allow_remote_gui_rpc" -BOINCOPTS="--daemon --dir $BOINCDIR" - # Some additional places to look for the client executable # (Should do this after init.d/functions and sysconfig/boinc, which sets PATH) @@ -172,7 +171,7 @@ exit 4 fi - daemon --check $BOINCEXE --user $BOINCUSER +19 "$BOINCEXE $BOINCOPTS" >>$LOGFILE 2>>$ERRORLOG & + daemon --check $BOINCEXE --user $BOINCUSER +19 "$BOINCEXE" $BOINCOPTS --dir $BOINCDIR >>$LOGFILE 2>>$ERRORLOG & try=0 while [ $try -lt 10 ] ; do PID=`pidof -s -x -o $$ -o $PPID -o %PPID $BOINCEXE` Index: boinc-client.spec =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/F-10/boinc-client.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- boinc-client.spec 7 Mar 2009 02:57:06 -0000 1.22 +++ boinc-client.spec 8 Mar 2009 21:14:14 -0000 1.23 @@ -4,7 +4,7 @@ Summary: The BOINC client core Name: boinc-client Version: 6.4.7 -Release: 1.r%{revision}svn%{?dist} +Release: 2.r%{revision}svn%{?dist} License: LGPLv2+ Group: Applications/Engineering URL: http://boinc.berkeley.edu/ @@ -176,11 +176,24 @@ pushd $RPM_BUILD_ROOT%{_bindir} ln -s boinc_client boinc mv boinc_cmd boinccmd -cat > boincmgr <<-EOF - #!/bin/bash - # wrapper script to allow passwordless manager connections from users of the boinc group - cd %{_localstatedir}/lib/boinc - boinc_gui +cat > boincmgr < - 6.4.7-2.r17542svn +- Fix overriding $BOINCOPTS from /etc/sysconfig/boinc-client in the init script + (BZ#489199). +- Fixed boinc-gccflags.patch +- Honour data dir in boincmgr wrapper script. + * Fri Mar 06 2009 Milos Jakubicek - 6.4.7-1.r17542svn - i386 arch conditional replaced by the %%{ix86} macro. - Rebase to current 6.4 branch, therefore using new suffix "r[revision]svn" boinc-gccflags.patch: Index: boinc-gccflags.patch =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/F-10/boinc-gccflags.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- boinc-gccflags.patch 15 Jan 2009 01:23:57 -0000 1.3 +++ boinc-gccflags.patch 8 Mar 2009 21:14:14 -0000 1.4 @@ -5,7 +5,7 @@ boinc_client_DEPENDENCIES = -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS) -+boinc_client_CPPFLAGS = -O3 -ffast-math $(AM_CPPFLAGS) ++boinc_client_CPPFLAGS = -O3 -fforce-addr $(AM_CPPFLAGS) boinc_client_LDFLAGS = -static-libgcc boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS) @@ -16,7 +16,7 @@ boinc_client_DEPENDENCIES = -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS) -+boinc_client_CPPFLAGS = -O3 -ffast-math $(AM_CPPFLAGS) ++boinc_client_CPPFLAGS = -O3 -fforce-addr $(AM_CPPFLAGS) boinc_client_LDFLAGS = -static-libgcc boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS) boinc_clientdir = $(bindir) From mjakubicek at fedoraproject.org Sun Mar 8 21:15:08 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Sun, 8 Mar 2009 21:15:08 +0000 (UTC) Subject: rpms/boinc-client/F-9 boinc-client-init-d, 1.5, 1.6 boinc-client.spec, 1.16, 1.17 boinc-gccflags.patch, 1.3, 1.4 Message-ID: <20090308211508.EF06370116@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/boinc-client/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25511 Modified Files: boinc-client-init-d boinc-client.spec boinc-gccflags.patch Log Message: - Fix overriding $BOINCOPTS from /etc/sysconfig/boinc-client in the init script (BZ#489199). - Fixed boinc-gccflags.patch - Honour data dir in boincmgr wrapper script. Index: boinc-client-init-d =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-client-init-d,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- boinc-client-init-d 13 Dec 2008 14:52:48 -0000 1.5 +++ boinc-client-init-d 8 Mar 2009 21:14:38 -0000 1.6 @@ -67,6 +67,11 @@ LOGFILE=/var/log/boinc.log ERRORLOG=/var/log/boincerr.log +# BOINC options: for the command line when running the client. +# Be aware that --allow_remote_gui_rpc opens up your machine to the world! +# +#BOINCOPTS="--allow_remote_gui_rpc" +BOINCOPTS=" --daemon" # Subsys lock file ... @@ -101,10 +106,10 @@ ## Look for any local configuration settings which override all above -if [ -f /etc/sysconfig/boinc ]; then - . /etc/sysconfig/boinc -elif [ -f /etc/default/boinc ]; then - . /etc/default/boinc +if [ -f /etc/sysconfig/boinc-client ]; then + . /etc/sysconfig/boinc-client +elif [ -f /etc/default/boinc-client ]; then + . /etc/default/boinc-client fi @@ -117,12 +122,6 @@ exit 7 fi -# BOINC options: for the command line when running the client. -# Be aware that --allow_remote_gui_rpc opens up your machine to the world! -# -#BOINCOPTS="--allow_remote_gui_rpc" -BOINCOPTS="--daemon --dir $BOINCDIR" - # Some additional places to look for the client executable # (Should do this after init.d/functions and sysconfig/boinc, which sets PATH) @@ -172,7 +171,7 @@ exit 4 fi - daemon --check $BOINCEXE --user $BOINCUSER +19 "$BOINCEXE $BOINCOPTS" >>$LOGFILE 2>>$ERRORLOG & + daemon --check $BOINCEXE --user $BOINCUSER +19 "$BOINCEXE" $BOINCOPTS --dir $BOINCDIR >>$LOGFILE 2>>$ERRORLOG & try=0 while [ $try -lt 10 ] ; do PID=`pidof -s -x -o $$ -o $PPID -o %PPID $BOINCEXE` Index: boinc-client.spec =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-client.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- boinc-client.spec 7 Mar 2009 03:18:25 -0000 1.16 +++ boinc-client.spec 8 Mar 2009 21:14:38 -0000 1.17 @@ -4,7 +4,7 @@ Summary: The BOINC client core Name: boinc-client Version: 6.4.7 -Release: 1.r%{revision}svn%{?dist} +Release: 2.r%{revision}svn%{?dist} License: LGPLv2+ Group: Applications/Engineering URL: http://boinc.berkeley.edu/ @@ -176,11 +176,24 @@ pushd $RPM_BUILD_ROOT%{_bindir} ln -s boinc_client boinc mv boinc_cmd boinccmd -cat > boincmgr <<-EOF - #!/bin/bash - # wrapper script to allow passwordless manager connections from users of the boinc group - cd %{_localstatedir}/lib/boinc - boinc_gui +cat > boincmgr < - 6.4.7-2.r17542svn +- Fix overriding $BOINCOPTS from /etc/sysconfig/boinc-client in the init script + (BZ#489199). +- Fixed boinc-gccflags.patch +- Honour data dir in boincmgr wrapper script. + * Fri Mar 06 2009 Milos Jakubicek - 6.4.7-1.r17542svn - i386 arch conditional replaced by the %%{ix86} macro. - Rebase to current 6.4 branch, therefore using new suffix "r[revision]svn" boinc-gccflags.patch: Index: boinc-gccflags.patch =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-gccflags.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- boinc-gccflags.patch 15 Jan 2009 01:23:57 -0000 1.3 +++ boinc-gccflags.patch 8 Mar 2009 21:14:38 -0000 1.4 @@ -5,7 +5,7 @@ boinc_client_DEPENDENCIES = -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS) -+boinc_client_CPPFLAGS = -O3 -ffast-math $(AM_CPPFLAGS) ++boinc_client_CPPFLAGS = -O3 -fforce-addr $(AM_CPPFLAGS) boinc_client_LDFLAGS = -static-libgcc boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS) @@ -16,7 +16,7 @@ boinc_client_DEPENDENCIES = -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS) -+boinc_client_CPPFLAGS = -O3 -ffast-math $(AM_CPPFLAGS) ++boinc_client_CPPFLAGS = -O3 -fforce-addr $(AM_CPPFLAGS) boinc_client_LDFLAGS = -static-libgcc boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS) boinc_clientdir = $(bindir) From lkundrak at fedoraproject.org Sun Mar 8 21:56:39 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 8 Mar 2009 21:56:39 +0000 (UTC) Subject: rpms/dosbox/devel dosbox-0.72-evdev.patch, NONE, 1.1 dosbox-0.72-gcc44.patch, NONE, 1.1 dosbox.spec, 1.32, 1.33 Message-ID: <20090308215639.8940270116@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/dosbox/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4096 Modified Files: dosbox.spec Added Files: dosbox-0.72-evdev.patch dosbox-0.72-gcc44.patch Log Message: * Sun Mar 08 2009 Lubomir Rintel - 0.72-7 - Fix build with GCC 4.4 - Fix key mapping with evdev driver (#473875) dosbox-0.72-evdev.patch: --- NEW FILE dosbox-0.72-evdev.patch --- Fix support for evdev (#473875) Following upstream commits: Author: c2woody Date: Wed Dec 31 16:33:46 2008 +0000 add evdev-kbd compatible scancode remapping (disabled atm) Author: qbix79 Date: Thu Jan 22 13:14:33 2009 +0000 Add experimental evdev detection. Author: qbix79 Date: Thu Jan 22 21:44:14 2009 +0000 counting is hard diff -up dosbox-0.72/src/gui/sdl_mapper.cpp.evdev dosbox-0.72/src/gui/sdl_mapper.cpp --- dosbox-0.72/src/gui/sdl_mapper.cpp.evdev 2007-08-17 14:49:56.000000000 -0400 +++ dosbox-0.72/src/gui/sdl_mapper.cpp 2009-03-08 21:41:46.000000000 -0400 @@ -1614,7 +1614,7 @@ static struct { static void change_action_text(const char* text,Bit8u col) { - bind_but.action->Change(text); + bind_but.action->Change(text,""); bind_but.action->SetColor(col); } @@ -2172,7 +2172,7 @@ static void CreateBindGroups(void) { if (mapper.sticks.num) SDL_JoystickEventState(SDL_DISABLE); #else // enable joystick event handling - if (numsticks) SDL_JoystickEventState(SDL_ENABLE); + if (mapper.sticks.num) SDL_JoystickEventState(SDL_ENABLE); else return; #endif Bit8u joyno=0; @@ -2276,6 +2276,11 @@ void MAPPER_Init(void) { if (!MAPPER_LoadBinds()) CreateDefaultBinds(); } +//Somehow including them at the top conflicts with something in setup.h +#ifdef LINUX +#include "SDL_syswm.h" +#include +#endif void MAPPER_StartUp(Section * sec) { Section_prop * section=static_cast(sec); mapper.sticks.num=0; @@ -2292,7 +2297,7 @@ void MAPPER_StartUp(Section * sec) { virtual_joysticks[0].axis_pos[i]=0; } - usescancodes=false; + usescancodes = false; if (section->Get_bool("usescancodes")) { usescancodes=true; @@ -2319,23 +2324,63 @@ void MAPPER_StartUp(Section * sec) { sdlkey_map[0x5E]=SDLK_RALT; sdlkey_map[0x40]=SDLK_KP5; sdlkey_map[0x41]=SDLK_KP6; -#elif !defined (WIN32) /* => Linux */ - sdlkey_map[0x5a]=SDLK_UP; - sdlkey_map[0x60]=SDLK_DOWN; - sdlkey_map[0x5c]=SDLK_LEFT; - sdlkey_map[0x5e]=SDLK_RIGHT; - sdlkey_map[0x59]=SDLK_HOME; - sdlkey_map[0x5f]=SDLK_END; - sdlkey_map[0x5b]=SDLK_PAGEUP; - sdlkey_map[0x61]=SDLK_PAGEDOWN; - sdlkey_map[0x62]=SDLK_INSERT; - sdlkey_map[0x63]=SDLK_DELETE; - sdlkey_map[0x68]=SDLK_KP_DIVIDE; - sdlkey_map[0x64]=SDLK_KP_ENTER; - sdlkey_map[0x65]=SDLK_RCTRL; - sdlkey_map[0x66]=SDLK_PAUSE; - sdlkey_map[0x67]=SDLK_PRINT; - sdlkey_map[0x69]=SDLK_RALT; +#elif !defined (WIN32) /* => Linux & BSDs */ + //bool evdev_input = false; + bool evdev_input = true; +#ifdef LINUX + SDL_SysWMinfo info; + SDL_VERSION(&info.version); + if (SDL_GetWMInfo(&info)) { + XkbDescPtr desc = NULL; + if((desc = XkbGetMap(info.info.x11.display,XkbAllComponentsMask,XkbUseCoreKbd))) { + if(XkbGetNames(info.info.x11.display,XkbAllNamesMask,desc) == 0) { + const char* keycodes = XGetAtomName(info.info.x11.display, desc->names->keycodes); +// const char* geom = XGetAtomName(info.info.x11.display, desc->names->geometry); + if(keycodes) { + LOG(LOG_MISC,LOG_NORMAL)("keyboard type %s",keycodes); + if (strncmp(keycodes,"evdev",5) == 0) evdev_input = true; + } + XkbFreeNames(desc,XkbAllNamesMask,True); + } + XkbFreeClientMap(desc,0,True); + } + } +#endif + if (evdev_input) { + sdlkey_map[0x67]=SDLK_UP; + sdlkey_map[0x6c]=SDLK_DOWN; + sdlkey_map[0x69]=SDLK_LEFT; + sdlkey_map[0x6a]=SDLK_RIGHT; + sdlkey_map[0x66]=SDLK_HOME; + sdlkey_map[0x6b]=SDLK_END; + sdlkey_map[0x68]=SDLK_PAGEUP; + sdlkey_map[0x6d]=SDLK_PAGEDOWN; + sdlkey_map[0x6e]=SDLK_INSERT; + sdlkey_map[0x6f]=SDLK_DELETE; + sdlkey_map[0x62]=SDLK_KP_DIVIDE; + sdlkey_map[0x60]=SDLK_KP_ENTER; + sdlkey_map[0x61]=SDLK_RCTRL; + sdlkey_map[0x77]=SDLK_PAUSE; + sdlkey_map[0x63]=SDLK_PRINT; + sdlkey_map[0x64]=SDLK_RALT; + } else { + sdlkey_map[0x5a]=SDLK_UP; + sdlkey_map[0x60]=SDLK_DOWN; + sdlkey_map[0x5c]=SDLK_LEFT; + sdlkey_map[0x5e]=SDLK_RIGHT; + sdlkey_map[0x59]=SDLK_HOME; + sdlkey_map[0x5f]=SDLK_END; + sdlkey_map[0x5b]=SDLK_PAGEUP; + sdlkey_map[0x61]=SDLK_PAGEDOWN; + sdlkey_map[0x62]=SDLK_INSERT; + sdlkey_map[0x63]=SDLK_DELETE; + sdlkey_map[0x68]=SDLK_KP_DIVIDE; + sdlkey_map[0x64]=SDLK_KP_ENTER; + sdlkey_map[0x65]=SDLK_RCTRL; + sdlkey_map[0x66]=SDLK_PAUSE; + sdlkey_map[0x67]=SDLK_PRINT; + sdlkey_map[0x69]=SDLK_RALT; + } #else sdlkey_map[0xc8]=SDLK_UP; sdlkey_map[0xd0]=SDLK_DOWN; dosbox-0.72-gcc44.patch: --- NEW FILE dosbox-0.72-gcc44.patch --- Fix build with GCC 4.4 Submitted upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=2673190&group_id=52551&atid=467234 Lubomir Rintel diff -up dosbox-0.72/src/gui/midi_alsa.h.gcc44 dosbox-0.72/src/gui/midi_alsa.h --- dosbox-0.72/src/gui/midi_alsa.h.gcc44 2009-03-08 19:27:09.000000000 -0400 +++ dosbox-0.72/src/gui/midi_alsa.h 2009-03-08 19:27:48.000000000 -0400 @@ -51,7 +51,7 @@ private: } int parse_addr(const char *arg, int *client, int *port) { - char *p; + const char *p; if (isdigit(*arg)) { if ((p = strpbrk(arg, ADDR_DELIM)) == NULL) Index: dosbox.spec =================================================================== RCS file: /cvs/pkgs/rpms/dosbox/devel/dosbox.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- dosbox.spec 24 Feb 2009 12:30:39 -0000 1.32 +++ dosbox.spec 8 Mar 2009 21:56:05 -0000 1.33 @@ -1,6 +1,6 @@ Name: dosbox Version: 0.72 -Release: 6%{?dist} +Release: 7%{?dist} Summary: x86/DOS emulator with sound and graphics @@ -11,6 +11,8 @@ Source1: dosbox.desktop Source2: dosbox.png Patch0: dosbox-gcc43.patch +Patch1: dosbox-0.72-gcc44.patch +Patch2: dosbox-0.72-evdev.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libpng-devel @@ -38,6 +40,8 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 -b .gcc44 +%patch2 -p1 -b .evdev %build %configure --enable-core-inline @@ -75,6 +79,10 @@ %changelog +* Sun Mar 08 2009 Lubomir Rintel - 0.72-7 +- Fix build with GCC 4.4 +- Fix key mapping with evdev driver (#473875) + * Tue Feb 24 2009 Fedora Release Engineering - 0.72-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From lkundrak at fedoraproject.org Sun Mar 8 22:09:12 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 8 Mar 2009 22:09:12 +0000 (UTC) Subject: rpms/dosbox/F-10 dosbox-0.72-evdev.patch, NONE, 1.1 dosbox.spec, 1.31, 1.32 Message-ID: <20090308220912.976FF70116@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/dosbox/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6671 Modified Files: dosbox.spec Added Files: dosbox-0.72-evdev.patch Log Message: * Sun Mar 08 2009 Lubomir Rintel - 0.72-5.1 - Fix key mapping with evdev driver (#473875) dosbox-0.72-evdev.patch: --- NEW FILE dosbox-0.72-evdev.patch --- Fix support for evdev (#473875) Following upstream commits: Author: c2woody Date: Wed Dec 31 16:33:46 2008 +0000 add evdev-kbd compatible scancode remapping (disabled atm) Author: qbix79 Date: Thu Jan 22 13:14:33 2009 +0000 Add experimental evdev detection. Author: qbix79 Date: Thu Jan 22 21:44:14 2009 +0000 counting is hard diff -up dosbox-0.72/src/gui/sdl_mapper.cpp.evdev dosbox-0.72/src/gui/sdl_mapper.cpp --- dosbox-0.72/src/gui/sdl_mapper.cpp.evdev 2007-08-17 14:49:56.000000000 -0400 +++ dosbox-0.72/src/gui/sdl_mapper.cpp 2009-03-08 21:41:46.000000000 -0400 @@ -1614,7 +1614,7 @@ static struct { static void change_action_text(const char* text,Bit8u col) { - bind_but.action->Change(text); + bind_but.action->Change(text,""); bind_but.action->SetColor(col); } @@ -2172,7 +2172,7 @@ static void CreateBindGroups(void) { if (mapper.sticks.num) SDL_JoystickEventState(SDL_DISABLE); #else // enable joystick event handling - if (numsticks) SDL_JoystickEventState(SDL_ENABLE); + if (mapper.sticks.num) SDL_JoystickEventState(SDL_ENABLE); else return; #endif Bit8u joyno=0; @@ -2276,6 +2276,11 @@ void MAPPER_Init(void) { if (!MAPPER_LoadBinds()) CreateDefaultBinds(); } +//Somehow including them at the top conflicts with something in setup.h +#ifdef LINUX +#include "SDL_syswm.h" +#include +#endif void MAPPER_StartUp(Section * sec) { Section_prop * section=static_cast(sec); mapper.sticks.num=0; @@ -2292,7 +2297,7 @@ void MAPPER_StartUp(Section * sec) { virtual_joysticks[0].axis_pos[i]=0; } - usescancodes=false; + usescancodes = false; if (section->Get_bool("usescancodes")) { usescancodes=true; @@ -2319,23 +2324,63 @@ void MAPPER_StartUp(Section * sec) { sdlkey_map[0x5E]=SDLK_RALT; sdlkey_map[0x40]=SDLK_KP5; sdlkey_map[0x41]=SDLK_KP6; -#elif !defined (WIN32) /* => Linux */ - sdlkey_map[0x5a]=SDLK_UP; - sdlkey_map[0x60]=SDLK_DOWN; - sdlkey_map[0x5c]=SDLK_LEFT; - sdlkey_map[0x5e]=SDLK_RIGHT; - sdlkey_map[0x59]=SDLK_HOME; - sdlkey_map[0x5f]=SDLK_END; - sdlkey_map[0x5b]=SDLK_PAGEUP; - sdlkey_map[0x61]=SDLK_PAGEDOWN; - sdlkey_map[0x62]=SDLK_INSERT; - sdlkey_map[0x63]=SDLK_DELETE; - sdlkey_map[0x68]=SDLK_KP_DIVIDE; - sdlkey_map[0x64]=SDLK_KP_ENTER; - sdlkey_map[0x65]=SDLK_RCTRL; - sdlkey_map[0x66]=SDLK_PAUSE; - sdlkey_map[0x67]=SDLK_PRINT; - sdlkey_map[0x69]=SDLK_RALT; +#elif !defined (WIN32) /* => Linux & BSDs */ + //bool evdev_input = false; + bool evdev_input = true; +#ifdef LINUX + SDL_SysWMinfo info; + SDL_VERSION(&info.version); + if (SDL_GetWMInfo(&info)) { + XkbDescPtr desc = NULL; + if((desc = XkbGetMap(info.info.x11.display,XkbAllComponentsMask,XkbUseCoreKbd))) { + if(XkbGetNames(info.info.x11.display,XkbAllNamesMask,desc) == 0) { + const char* keycodes = XGetAtomName(info.info.x11.display, desc->names->keycodes); +// const char* geom = XGetAtomName(info.info.x11.display, desc->names->geometry); + if(keycodes) { + LOG(LOG_MISC,LOG_NORMAL)("keyboard type %s",keycodes); + if (strncmp(keycodes,"evdev",5) == 0) evdev_input = true; + } + XkbFreeNames(desc,XkbAllNamesMask,True); + } + XkbFreeClientMap(desc,0,True); + } + } +#endif + if (evdev_input) { + sdlkey_map[0x67]=SDLK_UP; + sdlkey_map[0x6c]=SDLK_DOWN; + sdlkey_map[0x69]=SDLK_LEFT; + sdlkey_map[0x6a]=SDLK_RIGHT; + sdlkey_map[0x66]=SDLK_HOME; + sdlkey_map[0x6b]=SDLK_END; + sdlkey_map[0x68]=SDLK_PAGEUP; + sdlkey_map[0x6d]=SDLK_PAGEDOWN; + sdlkey_map[0x6e]=SDLK_INSERT; + sdlkey_map[0x6f]=SDLK_DELETE; + sdlkey_map[0x62]=SDLK_KP_DIVIDE; + sdlkey_map[0x60]=SDLK_KP_ENTER; + sdlkey_map[0x61]=SDLK_RCTRL; + sdlkey_map[0x77]=SDLK_PAUSE; + sdlkey_map[0x63]=SDLK_PRINT; + sdlkey_map[0x64]=SDLK_RALT; + } else { + sdlkey_map[0x5a]=SDLK_UP; + sdlkey_map[0x60]=SDLK_DOWN; + sdlkey_map[0x5c]=SDLK_LEFT; + sdlkey_map[0x5e]=SDLK_RIGHT; + sdlkey_map[0x59]=SDLK_HOME; + sdlkey_map[0x5f]=SDLK_END; + sdlkey_map[0x5b]=SDLK_PAGEUP; + sdlkey_map[0x61]=SDLK_PAGEDOWN; + sdlkey_map[0x62]=SDLK_INSERT; + sdlkey_map[0x63]=SDLK_DELETE; + sdlkey_map[0x68]=SDLK_KP_DIVIDE; + sdlkey_map[0x64]=SDLK_KP_ENTER; + sdlkey_map[0x65]=SDLK_RCTRL; + sdlkey_map[0x66]=SDLK_PAUSE; + sdlkey_map[0x67]=SDLK_PRINT; + sdlkey_map[0x69]=SDLK_RALT; + } #else sdlkey_map[0xc8]=SDLK_UP; sdlkey_map[0xd0]=SDLK_DOWN; Index: dosbox.spec =================================================================== RCS file: /cvs/pkgs/rpms/dosbox/F-10/dosbox.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- dosbox.spec 21 Sep 2008 08:27:20 -0000 1.31 +++ dosbox.spec 8 Mar 2009 22:08:42 -0000 1.32 @@ -1,6 +1,6 @@ Name: dosbox Version: 0.72 -Release: 5%{?dist} +Release: 5%{?dist}.1 Summary: x86/DOS emulator with sound and graphics @@ -11,6 +11,7 @@ Source1: dosbox.desktop Source2: dosbox.png Patch0: dosbox-gcc43.patch +Patch1: dosbox-0.72-evdev.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libpng-devel @@ -38,6 +39,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 -b .evdev %build %configure --enable-core-inline @@ -75,6 +77,9 @@ %changelog +* Sun Mar 08 2009 Lubomir Rintel - 0.72-5.1 +- Fix key mapping with evdev driver (#473875) + * Sun Sep 21 2008 Ville Skytt?? - 0.72-5 - Fix Patch0:/%%patch mismatch. From terjeros at fedoraproject.org Sun Mar 8 22:33:01 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Sun, 8 Mar 2009 22:33:01 +0000 (UTC) Subject: rpms/python-ptrace/devel python-ptrace.spec,1.2,1.3 Message-ID: <20090308223302.0948470116@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/python-ptrace/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12547 Modified Files: python-ptrace.spec Log Message: * Sun Mar 8 2009 Terje Rosten - 0.6-4 - Build with all rpm versions Index: python-ptrace.spec =================================================================== RCS file: /cvs/extras/rpms/python-ptrace/devel/python-ptrace.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-ptrace.spec 8 Mar 2009 20:12:21 -0000 1.2 +++ python-ptrace.spec 8 Mar 2009 22:32:58 -0000 1.3 @@ -6,7 +6,7 @@ Summary: Debugger using ptrace written in Python Name: python-ptrace Version: 0.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Development/Tools URL : http://python-ptrace.hachoir.org/ @@ -52,8 +52,10 @@ %defattr(-, root, root, -) %doc AUTHORS ChangeLog COPYING README README.cptrace TODO %doc doc/* examples -#exclude %{_bindir}/gdb.py[co] -#exclude %{_bindir}/strace.py[co] +%if 0%{?fedora} < 11 +%exclude %{_bindir}/gdb.py[co] +%exclude %{_bindir}/strace.py[co] +%endif %{_bindir}/gdb.py %{_bindir}/strace.py %{python_sitelib}/ptrace/ @@ -62,6 +64,9 @@ %{python_sitelib_arch}/ptrace-*-py%{pyver}.egg-info %changelog +* Sun Mar 8 2009 Terje Rosten - 0.6-4 +- Build with all rpm versions + * Sun Mar 8 2009 Terje Rosten - 0.6-3 - Remove %%exclude From terjeros at fedoraproject.org Sun Mar 8 22:36:23 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Sun, 8 Mar 2009 22:36:23 +0000 (UTC) Subject: rpms/python-ptrace/F-10 python-ptrace.spec,1.1,1.2 Message-ID: <20090308223623.24E1970116@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/python-ptrace/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13168/F-10 Modified Files: python-ptrace.spec Log Message: Sync with rawhide. Index: python-ptrace.spec =================================================================== RCS file: /cvs/extras/rpms/python-ptrace/F-10/python-ptrace.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-ptrace.spec 8 Mar 2009 20:18:31 -0000 1.1 +++ python-ptrace.spec 8 Mar 2009 22:35:52 -0000 1.2 @@ -6,7 +6,7 @@ Summary: Debugger using ptrace written in Python Name: python-ptrace Version: 0.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Development/Tools URL : http://python-ptrace.hachoir.org/ @@ -52,8 +52,10 @@ %defattr(-, root, root, -) %doc AUTHORS ChangeLog COPYING README README.cptrace TODO %doc doc/* examples -#exclude %{_bindir}/gdb.py[co] -#exclude %{_bindir}/strace.py[co] +%if 0%{?fedora} < 11 +%exclude %{_bindir}/gdb.py[co] +%exclude %{_bindir}/strace.py[co] +%endif %{_bindir}/gdb.py %{_bindir}/strace.py %{python_sitelib}/ptrace/ @@ -62,6 +64,9 @@ %{python_sitelib_arch}/ptrace-*-py%{pyver}.egg-info %changelog +* Sun Mar 8 2009 Terje Rosten - 0.6-4 +- Build with all rpm versions + * Sun Mar 8 2009 Terje Rosten - 0.6-3 - Remove %%exclude From terjeros at fedoraproject.org Sun Mar 8 22:36:23 2009 From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=) Date: Sun, 8 Mar 2009 22:36:23 +0000 (UTC) Subject: rpms/python-ptrace/F-9 python-ptrace.spec,1.2,1.3 Message-ID: <20090308223623.4EC6270116@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/python-ptrace/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13168/F-9 Modified Files: python-ptrace.spec Log Message: Sync with rawhide. Index: python-ptrace.spec =================================================================== RCS file: /cvs/extras/rpms/python-ptrace/F-9/python-ptrace.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-ptrace.spec 8 Mar 2009 20:25:24 -0000 1.2 +++ python-ptrace.spec 8 Mar 2009 22:35:52 -0000 1.3 @@ -6,7 +6,7 @@ Summary: Debugger using ptrace written in Python Name: python-ptrace Version: 0.6 -Release: 3%{?dist}.1 +Release: 4%{?dist} License: GPLv2 Group: Development/Tools URL : http://python-ptrace.hachoir.org/ @@ -52,8 +52,10 @@ %defattr(-, root, root, -) %doc AUTHORS ChangeLog COPYING README README.cptrace TODO %doc doc/* examples -#exclude %{_bindir}/gdb.py[co] -#exclude %{_bindir}/strace.py[co] +%if 0%{?fedora} < 11 +%exclude %{_bindir}/gdb.py[co] +%exclude %{_bindir}/strace.py[co] +%endif %{_bindir}/gdb.py %{_bindir}/strace.py %{python_sitelib}/ptrace/ @@ -62,8 +64,8 @@ %{python_sitelib_arch}/ptrace-*-py%{pyver}.egg-info %changelog -* Sun Mar 8 2009 Terje Rosten - 0.6-3.fc9.1 -- Don't remove %%exclude in < F10 +* Sun Mar 8 2009 Terje Rosten - 0.6-4 +- Build with all rpm versions * Sun Mar 8 2009 Terje Rosten - 0.6-3 - Remove %%exclude From lkundrak at fedoraproject.org Sun Mar 8 23:15:54 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 8 Mar 2009 23:15:54 +0000 (UTC) Subject: rpms/xteddy/devel xteddy-2.0.1-iconname.patch, NONE, 1.1 xteddy.spec, 1.2, 1.3 Message-ID: <20090308231555.229A870116@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/xteddy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23316 Modified Files: xteddy.spec Added Files: xteddy-2.0.1-iconname.patch Log Message: * Sun Mar 08 2009 Lubomir Rintel 2.0.1-4 - Fix startup crash xteddy-2.0.1-iconname.patch: --- NEW FILE xteddy-2.0.1-iconname.patch --- Fix use of uninitialized value, which causes random crashes on startup. Lubomir Rintel diff -up xteddy-2.0.1/xteddy.c.iconname xteddy-2.0.1/xteddy.c --- xteddy-2.0.1/xteddy.c.iconname 2009-03-08 23:01:59.000000000 -0400 +++ xteddy-2.0.1/xteddy.c 2009-03-08 23:02:12.000000000 -0400 @@ -109,7 +109,7 @@ int main(int argc, char **argv) XSizeHints size_hints; XWMHints wm_hints; XClassHint class_hints; - XTextProperty windowName, iconName; + XTextProperty windowName; int argnum; int use_wm, float_up, allow_quit; XEvent report; @@ -237,7 +237,7 @@ int main(int argc, char **argv) class_hints.res_name = progname; class_hints.res_class = "Xteddy"; - XSetWMProperties(display, win, &windowName, &iconName, + XSetWMProperties(display, win, &windowName, NULL, argv, argc, &size_hints, &wm_hints, &class_hints); /* Select event types wanted */ Index: xteddy.spec =================================================================== RCS file: /cvs/pkgs/rpms/xteddy/devel/xteddy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xteddy.spec 26 Feb 2009 12:08:49 -0000 1.2 +++ xteddy.spec 8 Mar 2009 23:15:22 -0000 1.3 @@ -1,14 +1,15 @@ Name: xteddy Version: 2.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool to sit around silently, look cute, and make you smile Group: Amusements/Games License: GPL+ -URL: http://webstaff.itn.liu.se/~stegu/xteddy/ +URL: http://fam-tille.de/debian/xteddy.html Source0: http://webstaff.itn.liu.se/~stegu/xteddy/%{name}-%{version}.tar.gz -# Aleady submitted upstream by mail +# Both submitted upstream by mail Patch0: xteddy-2.0.1-visual.patch +Patch1: xteddy-2.0.1-iconname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: imlib-devel libpng-devel @@ -22,6 +23,7 @@ %prep %setup -q %patch0 -p1 -b .visual +%patch1 -p1 -b .iconname %build @@ -50,6 +52,9 @@ %changelog +* Sun Mar 08 2009 Lubomir Rintel 2.0.1-4 +- Fix startup crash + * Thu Feb 26 2009 Fedora Release Engineering - 2.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pwouters at fedoraproject.org Sun Mar 8 23:40:14 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Sun, 8 Mar 2009 23:40:14 +0000 (UTC) Subject: rpms/xl2tpd/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xl2tpd.spec, 1.16, 1.17 Message-ID: <20090308234015.9F51470116@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/xl2tpd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29772 Modified Files: .cvsignore sources xl2tpd.spec Log Message: * Sun Mar 08 2009 Paul Wouters - 1.2.4-1 - Upgraded to 1.2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xl2tpd/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 9 Oct 2008 23:34:22 -0000 1.8 +++ .cvsignore 8 Mar 2009 23:39:37 -0000 1.9 @@ -6,3 +6,4 @@ xl2tpd-1.1.11.tar.gz xl2tpd-1.1.12.tar.gz xl2tpd-1.2.0.tar.gz +xl2tpd-1.2.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xl2tpd/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 9 Oct 2008 23:34:22 -0000 1.8 +++ sources 8 Mar 2009 23:39:37 -0000 1.9 @@ -2,3 +2,4 @@ ab5656eb5a3d1973f7f69b039675332e xl2tpd-1.1.11.tar.gz 8ace771a29139485c0edf428091cad5d xl2tpd-1.1.12.tar.gz 07463b89394ff80ad6ee800d005d45b0 xl2tpd-1.2.0.tar.gz +d94fc8a13596f12a561240dfcea9f977 xl2tpd-1.2.4.tar.gz Index: xl2tpd.spec =================================================================== RCS file: /cvs/extras/rpms/xl2tpd/devel/xl2tpd.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xl2tpd.spec 26 Feb 2009 09:47:41 -0000 1.16 +++ xl2tpd.spec 8 Mar 2009 23:39:37 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.2.4 +Release: 1%{?dist} # No version specified. License: GPL+ Url: http://www.xelerance.com/software/xl2tpd/ @@ -77,6 +77,9 @@ %dir %{_localstatedir}/run/xl2tpd %changelog +* Sun Mar 08 2009 Paul Wouters - 1.2.4-1 +- Upgraded to 1.2.4 + * Thu Feb 26 2009 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pwouters at fedoraproject.org Sun Mar 8 23:44:09 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Sun, 8 Mar 2009 23:44:09 +0000 (UTC) Subject: rpms/xl2tpd/devel sources,1.9,1.10 Message-ID: <20090308234409.F0EFF70116@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/xl2tpd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30825 Modified Files: sources Log Message: clean up sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/xl2tpd/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 8 Mar 2009 23:39:37 -0000 1.9 +++ sources 8 Mar 2009 23:43:38 -0000 1.10 @@ -1,5 +1,2 @@ 5aebd437a6a9049a63c44825a6d1829c xl2tpd.init -ab5656eb5a3d1973f7f69b039675332e xl2tpd-1.1.11.tar.gz -8ace771a29139485c0edf428091cad5d xl2tpd-1.1.12.tar.gz -07463b89394ff80ad6ee800d005d45b0 xl2tpd-1.2.0.tar.gz d94fc8a13596f12a561240dfcea9f977 xl2tpd-1.2.4.tar.gz From tuxbrewr at fedoraproject.org Sun Mar 8 23:45:23 2009 From: tuxbrewr at fedoraproject.org (Steven M. Parrish) Date: Sun, 8 Mar 2009 23:45:23 +0000 (UTC) Subject: comps comps-f11.xml.in,1.149,1.150 Message-ID: <20090308234523.800FD70116@cvs1.fedora.phx.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31120 Modified Files: comps-f11.xml.in Log Message: Remove sugar-update-control Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- comps-f11.xml.in 8 Mar 2009 20:57:27 -0000 1.149 +++ comps-f11.xml.in 8 Mar 2009 23:44:52 -0000 1.150 @@ -4613,8 +4613,7 @@ sugar-terminal sugar-turtleart sugar-write - sugar-update-control - + swati-support From pwouters at fedoraproject.org Sun Mar 8 23:55:17 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Sun, 8 Mar 2009 23:55:17 +0000 (UTC) Subject: rpms/xl2tpd/devel xl2tpd.spec,1.17,1.18 Message-ID: <20090308235517.1087670116@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/xl2tpd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1031 Modified Files: xl2tpd.spec Log Message: Merged in updates to spec from upstream Index: xl2tpd.spec =================================================================== RCS file: /cvs/extras/rpms/xl2tpd/devel/xl2tpd.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xl2tpd.spec 8 Mar 2009 23:39:37 -0000 1.17 +++ xl2tpd.spec 8 Mar 2009 23:54:46 -0000 1.18 @@ -9,7 +9,11 @@ Source0: http://www.xelerance.com/software/xl2tpd/xl2tpd-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ppp -#BuildRequires: +%if 0%{?el3}%{?el4} +BuildRequires: libpcap +%else +BuildRequires: libpcap-devel +%endif Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service @@ -28,6 +32,16 @@ xl2tpd works by opening a pseudo-tty for communicating with pppd. It runs completely in userspace. +xl2tpd supports IPsec SA Reference tracking to enable overlapping internak +NAT'ed IP's by different clients (eg all clients connecting from their +linksys internal IP 192.168.1.101) as well as multiple clients behind +the same NAT router. + +xl2tpd supports the pppol2tp kernel mode operations on 2.6.23 or higher, +or via a patch in contrib for 2.4.x kernels. + +Xl2tpd is based on the 0.69 L2TP by Jeff McAdams +It was de-facto maintained by Jacco de Leeuw in 2002 and 2003. %prep %setup -q @@ -38,7 +52,7 @@ %install rm -rf %{buildroot} -make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install -p -D -m644 examples/xl2tpd.conf %{buildroot}%{_sysconfdir}/xl2tpd/xl2tpd.conf install -p -D -m644 examples/ppp-options.xl2tpd %{buildroot}%{_sysconfdir}/ppp/options.xl2tpd install -p -D -m600 doc/l2tp-secrets.sample %{buildroot}%{_sysconfdir}/xl2tpd/l2tp-secrets @@ -69,6 +83,7 @@ %doc BUGS CHANGES CREDITS LICENSE README.* TODO doc/rfc2661.txt %doc doc/README.patents examples/chapsecrets.sample %{_sbindir}/xl2tpd +%{_bindir}/pfc %{_mandir}/*/* %dir %{_sysconfdir}/xl2tpd %config(noreplace) %{_sysconfdir}/xl2tpd/* @@ -79,6 +94,7 @@ %changelog * Sun Mar 08 2009 Paul Wouters - 1.2.4-1 - Upgraded to 1.2.4 +- Merged spec file with upstream * Thu Feb 26 2009 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Mon Mar 9 00:06:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:06:06 +0000 Subject: [pkgdb] pikloops: tnorth has requested watchbugzilla Message-ID: <20090309000604.6F4A4208543@bastion.fedora.phx.redhat.com> tnorth has requested the watchbugzilla acl on pikloops (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 00:05:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:05:07 +0000 Subject: [pkgdb] pikloops: tnorth has requested commit Message-ID: <20090309000606.77918208548@bastion.fedora.phx.redhat.com> tnorth has requested the commit acl on pikloops (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 00:06:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:06:04 +0000 Subject: [pkgdb] pikloops: tnorth has requested watchcommits Message-ID: <20090309000606.778A3208547@bastion.fedora.phx.redhat.com> tnorth has requested the watchcommits acl on pikloops (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 00:06:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:06:15 +0000 Subject: [pkgdb] pikloops: tnorth has requested commit Message-ID: <20090309000613.3072120854C@bastion.fedora.phx.redhat.com> tnorth has requested the commit acl on pikloops (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 00:06:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:06:15 +0000 Subject: [pkgdb] pikloops: tnorth has requested watchbugzilla Message-ID: <20090309000615.E885220854E@bastion.fedora.phx.redhat.com> tnorth has requested the watchbugzilla acl on pikloops (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 00:05:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:05:20 +0000 Subject: [pkgdb] pikloops: tnorth has requested watchcommits Message-ID: <20090309000619.01533208551@bastion.fedora.phx.redhat.com> tnorth has requested the watchcommits acl on pikloops (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 00:06:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:06:27 +0000 Subject: [pkgdb] pikloops: tnorth has requested watchcommits Message-ID: <20090309000625.42654208544@bastion.fedora.phx.redhat.com> tnorth has requested the watchcommits acl on pikloops (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 00:06:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:06:05 +0000 Subject: [pkgdb] pikloops: tnorth has requested watchbugzilla Message-ID: <20090309000625.D20BE208548@bastion.fedora.phx.redhat.com> tnorth has requested the watchbugzilla acl on pikloops (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 00:06:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:06:26 +0000 Subject: [pkgdb] pikloops: tnorth has requested commit Message-ID: <20090309000627.0A857208555@bastion.fedora.phx.redhat.com> tnorth has requested the commit acl on pikloops (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 00:07:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:07:50 +0000 Subject: [pkgdb] pikdev: tnorth has requested watchbugzilla Message-ID: <20090309000748.6CB85208544@bastion.fedora.phx.redhat.com> tnorth has requested the watchbugzilla acl on pikdev (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 00:07:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:07:49 +0000 Subject: [pkgdb] pikdev: tnorth has requested watchcommits Message-ID: <20090309000749.F3A88208548@bastion.fedora.phx.redhat.com> tnorth has requested the watchcommits acl on pikdev (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 00:06:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:06:55 +0000 Subject: [pkgdb] pikdev: tnorth has requested commit Message-ID: <20090309000753.41C8E208547@bastion.fedora.phx.redhat.com> tnorth has requested the commit acl on pikdev (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 00:08:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:08:00 +0000 Subject: [pkgdb] pikdev: tnorth has requested watchcommits Message-ID: <20090309000758.7B47B20854B@bastion.fedora.phx.redhat.com> tnorth has requested the watchcommits acl on pikdev (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 00:07:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:07:59 +0000 Subject: [pkgdb] pikdev: tnorth has requested commit Message-ID: <20090309000800.256BC20854E@bastion.fedora.phx.redhat.com> tnorth has requested the commit acl on pikdev (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 00:07:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:07:39 +0000 Subject: [pkgdb] pikdev: tnorth has requested watchbugzilla Message-ID: <20090309000800.54BC6208551@bastion.fedora.phx.redhat.com> tnorth has requested the watchbugzilla acl on pikdev (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 00:07:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:07:05 +0000 Subject: [pkgdb] pikdev: tnorth has requested watchbugzilla Message-ID: <20090309000803.244F8208545@bastion.fedora.phx.redhat.com> tnorth has requested the watchbugzilla acl on pikdev (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 00:07:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:07:43 +0000 Subject: [pkgdb] pikdev: tnorth has requested watchcommits Message-ID: <20090309000803.A2D5B208546@bastion.fedora.phx.redhat.com> tnorth has requested the watchcommits acl on pikdev (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 00:08:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 00:08:07 +0000 Subject: [pkgdb] pikdev: tnorth has requested commit Message-ID: <20090309000805.592E2208555@bastion.fedora.phx.redhat.com> tnorth has requested the commit acl on pikdev (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From whot at fedoraproject.org Mon Mar 9 00:07:59 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Mon, 9 Mar 2009 00:07:59 +0000 (UTC) Subject: rpms/xorg-x11-drv-evdev/devel .cvsignore, 1.29, 1.30 sources, 1.29, 1.30 xorg-x11-drv-evdev.spec, 1.46, 1.47 Message-ID: <20090309000759.152CA70116@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4826 Modified Files: .cvsignore sources xorg-x11-drv-evdev.spec Log Message: * Mon Mar 09 2009 Peter Hutterer 2.2.0-1 - evdev 2.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 2 Mar 2009 06:48:06 -0000 1.29 +++ .cvsignore 9 Mar 2009 00:07:26 -0000 1.30 @@ -1 +1 @@ -xf86-input-evdev-2.1.99.1.tar.bz2 +xf86-input-evdev-2.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 2 Mar 2009 06:48:06 -0000 1.29 +++ sources 9 Mar 2009 00:07:27 -0000 1.30 @@ -1 +1 @@ -88fa959dcb3b5dcc8be6547c1d5b691a xf86-input-evdev-2.1.99.1.tar.bz2 +a1401d272e6d6b7a3443c824a3ea140d xf86-input-evdev-2.2.0.tar.bz2 Index: xorg-x11-drv-evdev.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- xorg-x11-drv-evdev.spec 2 Mar 2009 06:48:06 -0000 1.46 +++ xorg-x11-drv-evdev.spec 9 Mar 2009 00:07:27 -0000 1.47 @@ -6,7 +6,7 @@ Summary: Xorg X11 evdev input driver Name: xorg-x11-drv-evdev -Version: 2.1.99.1 +Version: 2.2.0 Release: 1%{?dist} URL: http://www.x.org License: MIT @@ -72,6 +72,9 @@ %changelog +* Mon Mar 09 2009 Peter Hutterer 2.2.0-1 +- evdev 2.2.0 + * Mon Mar 02 2009 Peter Hutterer 2.1.99.1-1 - evdev 2.2 snapshot 1 From pwouters at fedoraproject.org Mon Mar 9 00:14:44 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Mon, 9 Mar 2009 00:14:44 +0000 (UTC) Subject: rpms/nsd/devel nsd.init,1.10,1.11 Message-ID: <20090309001444.EB7A770116@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6287 Modified Files: nsd.init Log Message: touch was actually touching the wrong subsys. Index: nsd.init =================================================================== RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nsd.init 27 Jan 2009 03:55:13 -0000 1.10 +++ nsd.init 9 Mar 2009 00:14:14 -0000 1.11 @@ -46,7 +46,7 @@ RETVAL=$? echo if [ $RETVAL -eq 0 ]; then - touch /var/lock/subsys/named; + touch /var/lock/subsys/nsd; else exit 7; fi From pwouters at fedoraproject.org Mon Mar 9 00:19:57 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Mon, 9 Mar 2009 00:19:57 +0000 (UTC) Subject: rpms/xl2tpd/devel xl2tpd.init,NONE,1.1 Message-ID: <20090309001957.76ECF70116@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/xl2tpd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7571 Added Files: xl2tpd.init Log Message: updated init file for https://bugzilla.redhat.com/show_bug.cgi?id=247100 --- NEW FILE xl2tpd.init --- #!/bin/sh # # xl2tpd This shell script takes care of starting and stopping l2tpd. # # chkconfig: - 80 30 # description: Layer 2 Tunnelling Protocol Daemon (RFC 2661) # # processname: /usr/sbin/xl2tpd # config: /etc/xl2tpd/xl2tpd.conf # pidfile: /var/run/xl2tpd.pid ### BEGIN INIT INFO # Provides: xl2tpd # Required-Start: $local_fs $network $syslog # Required-Stop: $local_fs $network $syslog # Default-Start: # Short-Description: start|stop|status|restart|try-restart|reload|force-reload xl2tpd server # Description: control xl2tpd server ### END INIT INFO #Servicename SERVICE=xl2tpd # Source function library. . /etc/rc.d/init.d/functions # Source networking configuration. . /etc/sysconfig/network if [ ${NETWORKING} = "no" ] then exit 0 fi [ -x /usr/sbin/$SERVICE ] || exit 0 RETVAL=0 start() { echo -n "Starting $SERVICE: " if [ ! -d /var/run/xl2tpd ] then mkdir /var/run/xl2tpd fi daemon $SERVICE RETVAL=$? echo if [ $RETVAL -eq 0 ];then touch /var/lock/subsys/$SERVICE else exit 7; fi return 0; } stop() { echo -n "Stopping $SERVICE: " killproc $SERVICE RETVAL=$? if [ $RETVAL -eq 0 ]; then rm -f /var/run/xl2tpd/$SERVICE rm -f /var/lock/subsys/$SERVICE fi echo return $RETVAL } restart() { stop start } # See how we were called. case "$1" in start) start ;; stop) stop ;; status) status $SERVICE RETVAL=$? ;; restart|reload) restart ;; condrestart) [ -f /var/lock/subsys/$SERVICE ] && restart || : ;; *) echo "Usage: $SERVICE {start|stop|status|restart|reload|condrestart}" exit 1 esac From pwouters at fedoraproject.org Mon Mar 9 00:21:01 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Mon, 9 Mar 2009 00:21:01 +0000 (UTC) Subject: rpms/xl2tpd/devel sources,1.10,1.11 Message-ID: <20090309002101.2D5F070116@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/xl2tpd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7753 Modified Files: sources Log Message: updated sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/xl2tpd/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 8 Mar 2009 23:43:38 -0000 1.10 +++ sources 9 Mar 2009 00:20:30 -0000 1.11 @@ -1,2 +1,2 @@ -5aebd437a6a9049a63c44825a6d1829c xl2tpd.init d94fc8a13596f12a561240dfcea9f977 xl2tpd-1.2.4.tar.gz +f796838eb19fb36d23ba8f25139302e3 xl2tpd.init From pwouters at fedoraproject.org Mon Mar 9 00:26:43 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Mon, 9 Mar 2009 00:26:43 +0000 (UTC) Subject: rpms/xl2tpd/devel xl2tpd.spec,1.18,1.19 Message-ID: <20090309002643.E03B670116@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/xl2tpd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9027 Modified Files: xl2tpd.spec Log Message: * Sun Mar 08 2009 Paul Wouters - 1.2.4-2 -Fix initscript for https://bugzilla.redhat.com/show_bug.cgi?id=247100 Index: xl2tpd.spec =================================================================== RCS file: /cvs/extras/rpms/xl2tpd/devel/xl2tpd.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xl2tpd.spec 8 Mar 2009 23:54:46 -0000 1.18 +++ xl2tpd.spec 9 Mar 2009 00:26:12 -0000 1.19 @@ -1,7 +1,7 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} # No version specified. License: GPL+ Url: http://www.xelerance.com/software/xl2tpd/ @@ -92,6 +92,9 @@ %dir %{_localstatedir}/run/xl2tpd %changelog +* Sun Mar 08 2009 Paul Wouters - 1.2.4-2 +-Fix initscript for https://bugzilla.redhat.com/show_bug.cgi?id=247100 + * Sun Mar 08 2009 Paul Wouters - 1.2.4-1 - Upgraded to 1.2.4 - Merged spec file with upstream From pwouters at fedoraproject.org Mon Mar 9 00:28:40 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Mon, 9 Mar 2009 00:28:40 +0000 (UTC) Subject: rpms/xl2tpd/devel xl2tpd.spec,1.19,1.20 Message-ID: <20090309002840.3FD6270116@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/xl2tpd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9577 Modified Files: xl2tpd.spec Log Message: bump Index: xl2tpd.spec =================================================================== RCS file: /cvs/extras/rpms/xl2tpd/devel/xl2tpd.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xl2tpd.spec 9 Mar 2009 00:26:12 -0000 1.19 +++ xl2tpd.spec 9 Mar 2009 00:28:09 -0000 1.20 @@ -1,7 +1,7 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} # No version specified. License: GPL+ Url: http://www.xelerance.com/software/xl2tpd/ @@ -92,6 +92,9 @@ %dir %{_localstatedir}/run/xl2tpd %changelog +* Sun Mar 08 2009 Paul Wouters - 1.2.4-3 +- Bump version for tagging mistake + * Sun Mar 08 2009 Paul Wouters - 1.2.4-2 -Fix initscript for https://bugzilla.redhat.com/show_bug.cgi?id=247100 From pwouters at fedoraproject.org Mon Mar 9 00:31:54 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Mon, 9 Mar 2009 00:31:54 +0000 (UTC) Subject: rpms/nsd/devel nsd.spec,1.48,1.49 Message-ID: <20090309003154.17DC370116@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10384 Modified Files: nsd.spec Log Message: * Sun Mar 08 2009 Paul Wouters - 3.2.1-5 - nsd used the 'named' subsystem in one call in the init script Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- nsd.spec 26 Feb 2009 06:07:23 -0000 1.48 +++ nsd.spec 9 Mar 2009 00:31:23 -0000 1.49 @@ -1,7 +1,7 @@ Summary: fast and lean authoritative DNS name server Name: nsd Version: 3.2.1 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Url: http://www.nlnetlabs.nl/%{name}/ #Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz @@ -92,6 +92,9 @@ fi %changelog +* Sun Mar 08 2009 Paul Wouters - 3.2.1-5 +- nsd used the 'named' subsystem in one call in the init script + * Wed Feb 25 2009 Fedora Release Engineering - 3.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From bpepple at fedoraproject.org Mon Mar 9 00:46:04 2009 From: bpepple at fedoraproject.org (Brian Pepple) Date: Mon, 9 Mar 2009 00:46:04 +0000 (UTC) Subject: rpms/ggz-gtk-client/devel .cvsignore, 1.3, 1.4 ggz-gtk-client.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20090309004604.7A65F70116@cvs1.fedora.phx.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/ggz-gtk-client/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14598 Modified Files: .cvsignore ggz-gtk-client.spec sources Log Message: * Sun Mar 8 2009 Brian Pepple - 0.99.4-1 - Update to 0.99.4. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ggz-gtk-client/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 18 Feb 2008 01:08:22 -0000 1.3 +++ .cvsignore 9 Mar 2009 00:45:33 -0000 1.4 @@ -1 +1 @@ -ggz-gtk-client-0.0.14.1.tar.gz +ggz-gtk-client-snapshot-0.99.4.tar.gz Index: ggz-gtk-client.spec =================================================================== RCS file: /cvs/pkgs/rpms/ggz-gtk-client/devel/ggz-gtk-client.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ggz-gtk-client.spec 24 Feb 2009 21:12:20 -0000 1.3 +++ ggz-gtk-client.spec 9 Mar 2009 00:45:33 -0000 1.4 @@ -1,12 +1,12 @@ Name: ggz-gtk-client -Version: 0.0.14.1 -Release: 2%{?dist} +Version: 0.99.4 +Release: 1%{?dist} Summary: Gtk+ client libraries for GGZ gaming zone Group: Development/Libraries License: GPLv2+ URL: http://www.ggzgamingzone.org/ -Source0: http://ftp.belnet.be/packages/ggzgamingzone/ggz/0.0.14/%{name}-%{version}.tar.gz +Source0: http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/%{name}-snapshot-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libggz-devel @@ -37,7 +37,7 @@ %prep -%setup -q +%setup -q -n %{name}-snapshot-%{version} # Avoid lib64 rpaths %if "%{_libdir}" != "/usr/lib" sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure @@ -94,6 +94,9 @@ %changelog +* Sun Mar 8 2009 Brian Pepple - 0.99.4-1 +- Update to 0.99.4. + * Tue Feb 24 2009 Fedora Release Engineering - 0.0.14.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ggz-gtk-client/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Feb 2008 01:08:22 -0000 1.3 +++ sources 9 Mar 2009 00:45:33 -0000 1.4 @@ -1 +1 @@ -87f67ff01f867bd04ba894a7c6a9f7fc ggz-gtk-client-0.0.14.1.tar.gz +6f365ec777121bc950edd1bcc02e5614 ggz-gtk-client-snapshot-0.99.4.tar.gz From lmacken at fedoraproject.org Mon Mar 9 01:06:05 2009 From: lmacken at fedoraproject.org (Luke Macken) Date: Mon, 9 Mar 2009 01:06:05 +0000 (UTC) Subject: rpms/liveusb-creator/devel .cvsignore, 1.8, 1.9 liveusb-creator.spec, 1.14, 1.15 sources, 1.11, 1.12 Message-ID: <20090309010606.0314270116@cvs1.fedora.phx.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/liveusb-creator/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19094 Modified Files: .cvsignore liveusb-creator.spec sources Log Message: Update to v3.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 17 Jan 2009 01:57:20 -0000 1.8 +++ .cvsignore 9 Mar 2009 01:05:34 -0000 1.9 @@ -1 +1 @@ -liveusb-creator-3.5.tar.bz2 +liveusb-creator-3.6.tar.bz2 Index: liveusb-creator.spec =================================================================== RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/liveusb-creator.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- liveusb-creator.spec 25 Feb 2009 20:40:45 -0000 1.14 +++ liveusb-creator.spec 9 Mar 2009 01:05:34 -0000 1.15 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: liveusb-creator -Version: 3.5 -Release: 3%{?dist} +Version: 3.6 +Release: 1%{?dist} Summary: A liveusb creator Group: Applications/System @@ -29,6 +29,7 @@ %build %{__python} setup.py build make mo +make mo %install rm -rf %{buildroot} @@ -67,11 +68,15 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/%{name} %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 3.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 02 2009 Luke Macken 3.5-2 +* Mon Mar 07 2009 Luke Macken 3.6-1 - Require pyparted +- Update to v3.6 + +* Fri Mar 06 2009 wwp 3.5-2 +- Fix dd commands when output path contain whitespaces + +* Wed Feb 25 2009 Fedora Release Engineering 3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Fri Jan 16 2009 Luke Macken 3.5-1 - Update to v3.5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 17 Jan 2009 01:57:20 -0000 1.11 +++ sources 9 Mar 2009 01:05:35 -0000 1.12 @@ -1 +1 @@ -9d314557ad8972374a7f087eaa9fe28a liveusb-creator-3.5.tar.bz2 +34efdcd1bd95cd4fe7bc1fd01ce6e574 liveusb-creator-3.6.tar.bz2 From salimma at fedoraproject.org Mon Mar 9 01:12:56 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Mon, 9 Mar 2009 01:12:56 +0000 (UTC) Subject: rpms/gnugo/F-10 .cvsignore, 1.4, 1.5 gnugo.spec, 1.14, 1.15 sources, 1.4, 1.5 Message-ID: <20090309011256.5B2BA70116@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gnugo/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20692/F-10 Modified Files: .cvsignore gnugo.spec sources Log Message: * Sun Mar 8 2009 Michel Salim - 3.8-1 - Update to 3.8 - License is now GPLv3+ - Enable readline support Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnugo/F-10/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Nov 2004 01:09:04 -0000 1.4 +++ .cvsignore 9 Mar 2009 01:12:25 -0000 1.5 @@ -1 +1 @@ -gnugo-3.6.tar.gz +gnugo-3.8.tar.gz Index: gnugo.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnugo/F-10/gnugo.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gnugo.spec 24 Jul 2008 15:22:22 -0000 1.14 +++ gnugo.spec 9 Mar 2009 01:12:25 -0000 1.15 @@ -1,16 +1,16 @@ Name: gnugo -Version: 3.6 -Release: 7%{?dist} +Version: 3.8 +Release: 1%{?dist} Summary: Text based go program Group: Amusements/Games -License: GPLv2 +License: GPLv3+ URL: http://www.gnu.org/software/gnugo/gnugo.html -Source0: http://ftp.gnu.org/gnu/gnugo/gnugo-3.6.tar.gz +Source0: http://ftp.gnu.org/gnu/gnugo/gnugo-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel +BuildRequires: ncurses-devel readline-devel BuildRequires: texinfo Requires(post): info Requires(preun): info @@ -25,10 +25,16 @@ %prep rm -rf ${RPM_BUILD_ROOT} %setup -q +# convert docs to UTF-8 +for f in AUTHORS THANKS; do + iconv -f iso8859-1 -t utf-8 $f > $f.conv + touch -r $f $f.conv + mv $f.conv $f +done %build -%configure --enable-color +%configure --enable-color --with-readline make %{?_smp_mflags} @@ -60,6 +66,14 @@ %changelog +* Sun Mar 8 2009 Michel Salim - 3.8-1 +- Update to 3.8 +- License is now GPLv3+ +- Enable readline support + +* Tue Feb 24 2009 Fedora Release Engineering - 3.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jul 24 2008 Tom "spot" Callaway - 3.6-7 - fix license tag Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnugo/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Nov 2004 01:09:04 -0000 1.4 +++ sources 9 Mar 2009 01:12:25 -0000 1.5 @@ -1 +1 @@ -53abc7427d89d81155c8bfc8e005c47f gnugo-3.6.tar.gz +6db0a528df58876d2b0ef1659c374a9a gnugo-3.8.tar.gz From salimma at fedoraproject.org Mon Mar 9 01:12:56 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Mon, 9 Mar 2009 01:12:56 +0000 (UTC) Subject: rpms/gnugo/F-9 .cvsignore, 1.4, 1.5 gnugo.spec, 1.13, 1.14 sources, 1.4, 1.5 Message-ID: <20090309011256.C6A4A70116@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gnugo/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20692/F-9 Modified Files: .cvsignore gnugo.spec sources Log Message: * Sun Mar 8 2009 Michel Salim - 3.8-1 - Update to 3.8 - License is now GPLv3+ - Enable readline support Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnugo/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Nov 2004 01:09:04 -0000 1.4 +++ .cvsignore 9 Mar 2009 01:12:26 -0000 1.5 @@ -1 +1 @@ -gnugo-3.6.tar.gz +gnugo-3.8.tar.gz Index: gnugo.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnugo/F-9/gnugo.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gnugo.spec 19 Feb 2008 23:15:11 -0000 1.13 +++ gnugo.spec 9 Mar 2009 01:12:26 -0000 1.14 @@ -1,16 +1,16 @@ Name: gnugo -Version: 3.6 -Release: 6%{?dist} +Version: 3.8 +Release: 1%{?dist} Summary: Text based go program Group: Amusements/Games -License: GPL +License: GPLv3+ URL: http://www.gnu.org/software/gnugo/gnugo.html -Source0: http://ftp.gnu.org/gnu/gnugo/gnugo-3.6.tar.gz +Source0: http://ftp.gnu.org/gnu/gnugo/gnugo-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel +BuildRequires: ncurses-devel readline-devel BuildRequires: texinfo Requires(post): info Requires(preun): info @@ -25,10 +25,16 @@ %prep rm -rf ${RPM_BUILD_ROOT} %setup -q +# convert docs to UTF-8 +for f in AUTHORS THANKS; do + iconv -f iso8859-1 -t utf-8 $f > $f.conv + touch -r $f $f.conv + mv $f.conv $f +done %build -%configure --enable-color +%configure --enable-color --with-readline make %{?_smp_mflags} @@ -60,6 +66,17 @@ %changelog +* Sun Mar 8 2009 Michel Salim - 3.8-1 +- Update to 3.8 +- License is now GPLv3+ +- Enable readline support + +* Tue Feb 24 2009 Fedora Release Engineering - 3.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jul 24 2008 Tom "spot" Callaway - 3.6-7 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 3.6-6 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnugo/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Nov 2004 01:09:04 -0000 1.4 +++ sources 9 Mar 2009 01:12:26 -0000 1.5 @@ -1 +1 @@ -53abc7427d89d81155c8bfc8e005c47f gnugo-3.6.tar.gz +6db0a528df58876d2b0ef1659c374a9a gnugo-3.8.tar.gz From salimma at fedoraproject.org Mon Mar 9 01:12:57 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Mon, 9 Mar 2009 01:12:57 +0000 (UTC) Subject: rpms/gnugo/devel .cvsignore, 1.4, 1.5 gnugo.spec, 1.15, 1.16 sources, 1.4, 1.5 Message-ID: <20090309011257.2667470119@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/gnugo/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20692/devel Modified Files: .cvsignore gnugo.spec sources Log Message: * Sun Mar 8 2009 Michel Salim - 3.8-1 - Update to 3.8 - License is now GPLv3+ - Enable readline support Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnugo/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Nov 2004 01:09:04 -0000 1.4 +++ .cvsignore 9 Mar 2009 01:12:26 -0000 1.5 @@ -1 +1 @@ -gnugo-3.6.tar.gz +gnugo-3.8.tar.gz Index: gnugo.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnugo/devel/gnugo.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gnugo.spec 25 Feb 2009 00:03:44 -0000 1.15 +++ gnugo.spec 9 Mar 2009 01:12:26 -0000 1.16 @@ -1,16 +1,16 @@ Name: gnugo -Version: 3.6 -Release: 8%{?dist} +Version: 3.8 +Release: 1%{?dist} Summary: Text based go program Group: Amusements/Games -License: GPLv2 +License: GPLv3+ URL: http://www.gnu.org/software/gnugo/gnugo.html -Source0: http://ftp.gnu.org/gnu/gnugo/gnugo-3.6.tar.gz +Source0: http://ftp.gnu.org/gnu/gnugo/gnugo-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel +BuildRequires: ncurses-devel readline-devel BuildRequires: texinfo Requires(post): info Requires(preun): info @@ -25,10 +25,16 @@ %prep rm -rf ${RPM_BUILD_ROOT} %setup -q +# convert docs to UTF-8 +for f in AUTHORS THANKS; do + iconv -f iso8859-1 -t utf-8 $f > $f.conv + touch -r $f $f.conv + mv $f.conv $f +done %build -%configure --enable-color +%configure --enable-color --with-readline make %{?_smp_mflags} @@ -60,6 +66,11 @@ %changelog +* Sun Mar 8 2009 Michel Salim - 3.8-1 +- Update to 3.8 +- License is now GPLv3+ +- Enable readline support + * Tue Feb 24 2009 Fedora Release Engineering - 3.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnugo/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Nov 2004 01:09:04 -0000 1.4 +++ sources 9 Mar 2009 01:12:26 -0000 1.5 @@ -1 +1 @@ -53abc7427d89d81155c8bfc8e005c47f gnugo-3.6.tar.gz +6db0a528df58876d2b0ef1659c374a9a gnugo-3.8.tar.gz From lmacken at fedoraproject.org Mon Mar 9 01:20:07 2009 From: lmacken at fedoraproject.org (Luke Macken) Date: Mon, 9 Mar 2009 01:20:07 +0000 (UTC) Subject: rpms/liveusb-creator/F-9 .cvsignore, 1.7, 1.8 liveusb-creator.spec, 1.9, 1.10 sources, 1.8, 1.9 Message-ID: <20090309012007.F3EE970116@cvs1.fedora.phx.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/liveusb-creator/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22338 Modified Files: .cvsignore liveusb-creator.spec sources Log Message: Update to v3.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 17 Jan 2009 01:59:25 -0000 1.7 +++ .cvsignore 9 Mar 2009 01:19:35 -0000 1.8 @@ -1 +1 @@ -liveusb-creator-3.5.tar.bz2 +liveusb-creator-3.6.tar.bz2 Index: liveusb-creator.spec =================================================================== RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/liveusb-creator.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- liveusb-creator.spec 2 Feb 2009 20:17:34 -0000 1.9 +++ liveusb-creator.spec 9 Mar 2009 01:19:35 -0000 1.10 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: liveusb-creator -Version: 3.5 -Release: 2%{?dist} +Version: 3.6 +Release: 1%{?dist} Summary: A liveusb creator Group: Applications/System @@ -29,6 +29,7 @@ %build %{__python} setup.py build make mo +make mo %install rm -rf %{buildroot} @@ -67,8 +68,12 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/%{name} %changelog -* Mon Feb 02 2009 Luke Macken 3.5-2 +* Mon Mar 07 2009 Luke Macken 3.6-1 - Require pyparted +- Update to v3.6 + +* Fri Mar 06 2009 wwp 3.5-2 +- Fix dd commands when output path contain whitespaces * Fri Jan 16 2009 Luke Macken 3.5-1 - Update to v3.5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 17 Jan 2009 01:59:25 -0000 1.8 +++ sources 9 Mar 2009 01:19:35 -0000 1.9 @@ -1 +1 @@ -9d314557ad8972374a7f087eaa9fe28a liveusb-creator-3.5.tar.bz2 +34efdcd1bd95cd4fe7bc1fd01ce6e574 liveusb-creator-3.6.tar.bz2 From lmacken at fedoraproject.org Mon Mar 9 01:21:17 2009 From: lmacken at fedoraproject.org (Luke Macken) Date: Mon, 9 Mar 2009 01:21:17 +0000 (UTC) Subject: rpms/liveusb-creator/F-10 .cvsignore, 1.8, 1.9 liveusb-creator.spec, 1.12, 1.13 sources, 1.10, 1.11 Message-ID: <20090309012117.EEFBC70116@cvs1.fedora.phx.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/liveusb-creator/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22781 Modified Files: .cvsignore liveusb-creator.spec sources Log Message: Update to v3.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 17 Jan 2009 01:58:23 -0000 1.8 +++ .cvsignore 9 Mar 2009 01:20:47 -0000 1.9 @@ -1 +1 @@ -liveusb-creator-3.5.tar.bz2 +liveusb-creator-3.6.tar.bz2 Index: liveusb-creator.spec =================================================================== RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/liveusb-creator.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- liveusb-creator.spec 2 Feb 2009 20:16:39 -0000 1.12 +++ liveusb-creator.spec 9 Mar 2009 01:20:47 -0000 1.13 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: liveusb-creator -Version: 3.5 -Release: 2%{?dist} +Version: 3.6 +Release: 1%{?dist} Summary: A liveusb creator Group: Applications/System @@ -29,6 +29,7 @@ %build %{__python} setup.py build make mo +make mo %install rm -rf %{buildroot} @@ -67,8 +68,12 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/%{name} %changelog -* Mon Feb 02 2009 Luke Macken 3.5-2 +* Mon Mar 07 2009 Luke Macken 3.6-1 - Require pyparted +- Update to v3.6 + +* Fri Mar 06 2009 wwp 3.5-2 +- Fix dd commands when output path contain whitespaces * Fri Jan 16 2009 Luke Macken 3.5-1 - Update to v3.5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 17 Jan 2009 01:58:23 -0000 1.10 +++ sources 9 Mar 2009 01:20:47 -0000 1.11 @@ -1 +1 @@ -9d314557ad8972374a7f087eaa9fe28a liveusb-creator-3.5.tar.bz2 +34efdcd1bd95cd4fe7bc1fd01ce6e574 liveusb-creator-3.6.tar.bz2 From mbarnes at fedoraproject.org Mon Mar 9 01:39:32 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 9 Mar 2009 01:39:32 +0000 (UTC) Subject: rpms/openchange/devel openchange.spec,1.1,1.2 Message-ID: <20090309013932.1F4BB70116@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/openchange/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27417 Modified Files: openchange.spec Log Message: * Sun Mar 08 2009 Matthew Barnes - 0.8-6 - Explicitly require libldb-devel. Index: openchange.spec =================================================================== RCS file: /cvs/pkgs/rpms/openchange/devel/openchange.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openchange.spec 27 Feb 2009 01:47:25 -0000 1.1 +++ openchange.spec 9 Mar 2009 01:38:59 -0000 1.2 @@ -10,7 +10,7 @@ Name: openchange Version: 0.8 -Release: 5%{?dist} +Release: 6%{?dist} Group: Applications/System Summary: Provides access to Microsoft Exchange servers using native protocols License: GPLv3+ and Public Domain @@ -24,6 +24,7 @@ BuildRequires: doxygen BuildRequires: file-devel BuildRequires: flex +BuildRequires: libldb-devel BuildRequires: libtalloc-devel >= %{talloc_version} BuildRequires: libtdb-devel BuildRequires: pkgconfig @@ -145,6 +146,9 @@ # %doc apidocs/html/mapiproxy %changelog +* Sun Mar 08 2009 Matthew Barnes - 0.8-6 +- Explicitly require libldb-devel. + * Wed Feb 25 2009 Matthew Barnes - 0.8-5 - Rebuild with correct tarball. From mbarnes at fedoraproject.org Mon Mar 9 01:39:54 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 9 Mar 2009 01:39:54 +0000 (UTC) Subject: rpms/samba4/devel samba4.spec,1.7,1.8 Message-ID: <20090309013954.57E7B70116@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/samba4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27557 Modified Files: samba4.spec Log Message: * Sun Mar 08 2009 Matthew Barnes - 4.0.0-10alpha7 - Remove ldb.pc from samba4-devel (RH bug #489186). Index: samba4.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba4/devel/samba4.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- samba4.spec 5 Mar 2009 03:44:20 -0000 1.7 +++ samba4.spec 9 Mar 2009 01:39:23 -0000 1.8 @@ -1,4 +1,4 @@ -%define main_release 9 +%define main_release 10 %define samba4_version 4.0.0 %define talloc_version 1.2.0 @@ -703,7 +703,6 @@ #%{_libdir}/libtorture.so %{_libdir}/pkgconfig/dcerpc.pc %{_libdir}/pkgconfig/dcerpc_samr.pc -%{_libdir}/pkgconfig/ldb.pc %{_libdir}/pkgconfig/ndr.pc %{_libdir}/pkgconfig/samba-hostconfig.pc #%{_libdir}/pkgconfig/torture.pc @@ -834,6 +833,9 @@ %endif %changelog +* Sun Mar 08 2009 Matthew Barnes - 4.0.0-10alpha7 +- Remove ldb.pc from samba4-devel (RH bug #489186). + * Wed Mar 4 2009 Simo Sorce - 4.0.0-9alpha7 - Make talloc,tdb,tevent,ldb easy to exclude using defines - Fix package for non-mock "dirty" systems by deleting additional From kkofler at fedoraproject.org Mon Mar 9 02:00:43 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Mon, 9 Mar 2009 02:00:43 +0000 (UTC) Subject: rpms/cmake/devel cmake-2.6.3-#475876.patch, NONE, 1.1 cmake.spec, 1.54, 1.55 Message-ID: <20090309020043.51FB470116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/cmake/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31800/devel Modified Files: cmake.spec Added Files: cmake-2.6.3-#475876.patch Log Message: * Mon Mar 09 2009 Kevin Kofler - 2.6.3-2 - Fix crash during kdepimlibs build (#475876) cmake-2.6.3-#475876.patch: --- NEW FILE cmake-2.6.3-#475876.patch --- diff -ur cmake-2.6.3/Source/cmIncludeDirectoryCommand.cxx cmake-2.6.3-#475876/Source/cmIncludeDirectoryCommand.cxx --- cmake-2.6.3/Source/cmIncludeDirectoryCommand.cxx 2009-02-21 21:36:52.000000000 +0100 +++ cmake-2.6.3-#475876/Source/cmIncludeDirectoryCommand.cxx 2009-03-09 02:55:46.000000000 +0100 @@ -95,13 +95,13 @@ // remove any leading or trailing spaces and \r pos = ret.size()-1; - while(ret[pos] == ' ' || ret[pos] == '\r') + while(ret.size() && (ret[pos] == ' ' || ret[pos] == '\r')) { ret.erase(pos); pos--; } pos = 0; - while(ret.size() && ret[pos] == ' ' || ret[pos] == '\r') + while(ret.size() && (ret[pos] == ' ' || ret[pos] == '\r')) { ret.erase(pos,1); } Index: cmake.spec =================================================================== RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- cmake.spec 24 Feb 2009 04:23:11 -0000 1.54 +++ cmake.spec 9 Mar 2009 02:00:11 -0000 1.55 @@ -8,7 +8,7 @@ Name: cmake Version: 2.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -16,6 +16,9 @@ URL: http://www.cmake.org Source0: http://www.cmake.org/files/v2.6/cmake-%{version}%{rcver}.tar.gz Source2: macros.cmake +# fix crash during kdepimlibs build +# https://bugzilla.redhat.com/show_bug.cgi?id=475876 +Patch0: cmake-2.6.3-#475876.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, libX11-devel @@ -50,6 +53,7 @@ %prep %setup -q -n %{name}-%{version}%{rcver} +%patch0 -p1 -b .475876 # Fixup permissions find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x @@ -125,6 +129,9 @@ %changelog +* Mon Mar 09 2009 Kevin Kofler - 2.6.3-2 +- Fix crash during kdepimlibs build (#475876) + * Mon Feb 23 2009 Orion Poplawski - 2.6.3-1 - Update to 2.6.3 final From kkofler at fedoraproject.org Mon Mar 9 02:03:30 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Mon, 9 Mar 2009 02:03:30 +0000 (UTC) Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.76,1.77 Message-ID: <20090309020330.0B61970116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdepimlibs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32565/devel Modified Files: kdepimlibs.spec Log Message: * Mon Mar 09 2009 Kevin Kofler - 4.2.1-3 - disable CMake debugging, #475876 should be fixed now Index: kdepimlibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- kdepimlibs.spec 3 Mar 2009 20:31:57 -0000 1.76 +++ kdepimlibs.spec 9 Mar 2009 02:02:59 -0000 1.77 @@ -13,11 +13,11 @@ %define akonadi_subpkg 1 %define akonadi_version 1.1.1 -%define debug 1 +%define debug 0 Name: kdepimlibs Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: K Desktop Environment 4 - PIM Libraries License: LGPLv2 @@ -220,6 +220,9 @@ %changelog +* Mon Mar 09 2009 Kevin Kofler - 4.2.1-3 +- disable CMake debugging, #475876 should be fixed now + * Tue Mar 03 2009 Rex Dieter - 4.2.1-2 - avoid libkcal conflict with kdepim3 From ynemoy at fedoraproject.org Mon Mar 9 02:12:11 2009 From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy) Date: Mon, 9 Mar 2009 02:12:11 +0000 (UTC) Subject: rpms/ghc-X11/devel ghc-X11.spec,1.1,1.2 Message-ID: <20090309021211.1F74870116@cvs1.fedora.phx.redhat.com> Author: ynemoy Update of /cvs/pkgs/rpms/ghc-X11/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2792 Modified Files: ghc-X11.spec Log Message: updates the arch tags Index: ghc-X11.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ghc-X11.spec 6 Mar 2009 19:31:45 -0000 1.1 +++ ghc-X11.spec 9 Mar 2009 02:11:40 -0000 1.2 @@ -12,17 +12,16 @@ Name: ghc-%{pkg_name} Version: 1.4.5 -Release: 3%{?dist} -Summary: Haskell %{pkg_name} library with bindings to xlib C functions +Release: 4%{?dist} +Summary: Haskell %{pkg_name} librar Group: Development/Libraries License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Provides: %{name}-devel = %{version}-%{release} -# ghc has only been bootstrapped on the following archs: -ExclusiveArch: i386 x86_64 ppc +# fedora ghc archs: +ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc = %{ghc_version} %if %{with doc} BuildRequires: ghc-doc = %{ghc_version} @@ -144,6 +143,9 @@ %changelog +* Sun Mar 8 2009 Yaakov M. Nemoy - 1.4.5-4 +- forgot to include the right arch tags + * Sat Feb 28 2009 Jens Petersen - 1.4.5-3 - sync with cabal2spec-0.12: - improve requires From whot at fedoraproject.org Mon Mar 9 02:13:44 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Mon, 9 Mar 2009 02:13:44 +0000 (UTC) Subject: rpms/xorg-x11-drv-synaptics/devel .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 xorg-x11-drv-synaptics.spec, 1.25, 1.26 Message-ID: <20090309021344.5366970116@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3194 Modified Files: .cvsignore sources xorg-x11-drv-synaptics.spec Log Message: * Mon Mar 09 2009 Peter Hutterer 1.1.0-1 - synaptics 1.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 5 Mar 2009 02:17:48 -0000 1.12 +++ .cvsignore 9 Mar 2009 02:13:13 -0000 1.13 @@ -1 +1 @@ -xf86-input-synaptics-1.0.99.4.tar.bz2 +xf86-input-synaptics-1.1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 5 Mar 2009 02:17:48 -0000 1.12 +++ sources 9 Mar 2009 02:13:14 -0000 1.13 @@ -1 +1 @@ -5fd30e63296d7845274525571508fbc9 xf86-input-synaptics-1.0.99.4.tar.bz2 +d9a05d53c728400e00e6bc146758c6e5 xf86-input-synaptics-1.1.0.tar.bz2 Index: xorg-x11-drv-synaptics.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xorg-x11-drv-synaptics.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- xorg-x11-drv-synaptics.spec 5 Mar 2009 02:17:48 -0000 1.25 +++ xorg-x11-drv-synaptics.spec 9 Mar 2009 02:13:14 -0000 1.26 @@ -6,7 +6,7 @@ Name: xorg-x11-drv-synaptics Summary: Xorg X11 Synaptics touchpad input driver -Version: 1.0.99.4 +Version: 1.1.0 Release: 1%{?dist} URL: http://www.x.org License: MIT @@ -121,6 +121,9 @@ %changelog +* Mon Mar 09 2009 Peter Hutterer 1.1.0-1 +- synaptics 1.1 + * Thu Mar 05 2009 Peter Hutterer 1.0.99.4-1 - synaptics 1.1, snapshot 4 (fix for 64 bit crashes) From ynemoy at fedoraproject.org Mon Mar 9 02:23:48 2009 From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy) Date: Mon, 9 Mar 2009 02:23:48 +0000 (UTC) Subject: rpms/ghc-X11/devel ghc-X11.spec,1.2,1.3 Message-ID: <20090309022348.3A36E70116@cvs1.fedora.phx.redhat.com> Author: ynemoy Update of /cvs/pkgs/rpms/ghc-X11/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5043 Modified Files: ghc-X11.spec Log Message: corrects a faulty tag by bumping spec Index: ghc-X11.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ghc-X11.spec 9 Mar 2009 02:11:40 -0000 1.2 +++ ghc-X11.spec 9 Mar 2009 02:23:17 -0000 1.3 @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 1.4.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Haskell %{pkg_name} librar Group: Development/Libraries @@ -143,6 +143,9 @@ %changelog +* Sun Mar 8 2009 Yaakov M. Nemoy - 1.4.5-5 +- corrected a faulty tag + * Sun Mar 8 2009 Yaakov M. Nemoy - 1.4.5-4 - forgot to include the right arch tags From pkgdb at fedoraproject.org Mon Mar 9 03:11:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 03:11:14 +0000 Subject: [pkgdb] ghc-ghc-paths was added for petersen Message-ID: <20090309031213.07A5C20820B@bastion.fedora.phx.redhat.com> petersen has added Package ghc-ghc-paths with summary Interface to ghc's install directories petersen has approved Package ghc-ghc-paths petersen has added a Fedora devel branch for ghc-ghc-paths with an owner of petersen petersen has approved ghc-ghc-paths in Fedora devel petersen has approved Package ghc-ghc-paths petersen has set commit to Approved for provenpackager on ghc-ghc-paths (Fedora devel) petersen has set build to Approved for provenpackager on ghc-ghc-paths (Fedora devel) petersen has set checkout to Approved for provenpackager on ghc-ghc-paths (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ghc-ghc-paths From pkgdb at fedoraproject.org Mon Mar 9 03:11:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 03:11:54 +0000 Subject: [pkgdb] ghc-ghc-paths (Fedora, devel) updated by petersen Message-ID: <20090309031214.A8BF72084CF@bastion.fedora.phx.redhat.com> petersen approved watchbugzilla on ghc-ghc-paths (Fedora devel) for haskell-sig petersen approved watchcommits on ghc-ghc-paths (Fedora devel) for haskell-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ghc-ghc-paths From pkgdb at fedoraproject.org Mon Mar 9 03:11:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 03:11:54 +0000 Subject: [pkgdb] ghc-ghc-paths (Fedora, 10) updated by petersen Message-ID: <20090309031214.C12F9208545@bastion.fedora.phx.redhat.com> petersen added a Fedora 10 branch for ghc-ghc-paths petersen has set commit to Approved for provenpackager on ghc-ghc-paths (Fedora 10) petersen has set build to Approved for provenpackager on ghc-ghc-paths (Fedora 10) petersen has set checkout to Approved for provenpackager on ghc-ghc-paths (Fedora 10) petersen approved watchbugzilla on ghc-ghc-paths (Fedora 10) for haskell-sig petersen approved watchcommits on ghc-ghc-paths (Fedora 10) for haskell-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ghc-ghc-paths From airlied at fedoraproject.org Mon Mar 9 03:11:27 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Mon, 9 Mar 2009 03:11:27 +0000 (UTC) Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.62, 1.63 drm-next.patch, 1.8, 1.9 kernel.spec, 1.1394, 1.1395 Message-ID: <20090309031127.D896770116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13972 Modified Files: drm-modesetting-radeon.patch drm-next.patch kernel.spec Log Message: * Mon Mar 09 2009 Dave Airlie - drm-next.patch: fixes from upstream queue for r600 support - drm-modesetting-radeon.patch: make 2D/3D on PCIE faster drm-modesetting-radeon.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.62 -r 1.63 drm-modesetting-radeon.patch Index: drm-modesetting-radeon.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- drm-modesetting-radeon.patch 5 Mar 2009 07:26:21 -0000 1.62 +++ drm-modesetting-radeon.patch 9 Mar 2009 03:11:26 -0000 1.63 @@ -1,1492 +1,3 @@ -commit fef48d5013f761faec24ee1044282b6098318237 -Author: Dave Airlie -Date: Thu Mar 5 15:57:18 2009 +1000 - - radeon: add special relocation for WAIT_VLINE - - This is half ways between a hack and really neat. - -commit 530ebda60cb7270795b7edd72930ab2d0e4db102 -Author: Dave Airlie -Date: Tue Mar 3 18:23:22 2009 +1000 - - radeon: port proc debug files to new debugfs interface - -commit 94137dff359fc70b51bdf035f97cfbab7424a5ce -Author: Dave Airlie -Date: Tue Mar 3 15:33:52 2009 +1000 - - radeon: pin framebuffer and cursors dynamically - -commit 90a014f6d04548790dbcef1932ad3d89ff12aa32 -Author: Alex Deucher -Date: Fri Feb 27 20:25:36 2009 -0500 - - radeon: fix MC setup on systems with more than 512 MB of VRAM - - Signed-off-by: Alex Deucher - -commit 9e3775d3fe8677b2f995230521fd93cd9ef69327 -Author: Alex Deucher -Date: Fri Feb 27 20:18:20 2009 -0500 - - radeon: leave the MC_FB_LOCATION alone on RS780 - - Signed-off-by: Alex Deucher - -commit b3c52a1d083b846541e2b6d78c917ae00e9f04c1 -Author: Alex Deucher -Date: Fri Feb 27 20:15:04 2009 -0500 - - radeon: wait for MC idle on r6xx/r7xx chips - - Signed-off-by: Alex Deucher - -commit b077cde9a296856bcadb3003e746950034e929bb -Author: Alex Deucher -Date: Fri Feb 27 20:07:13 2009 -0500 - - radeon: fix up RS600 mc setup and unify mc reg access - - Signed-off-by: Alex Deucher - -commit 85a3e7390f17ba442c020dda1a47e6b6b1ce0588 -Author: Dave Airlie -Date: Mon Mar 2 23:51:30 2009 +1100 - - radeon: fixup suspend/resume hooks - -commit 1467208a03bb127c3882c59cbcc2818fb1076b8d -Author: Dave Airlie -Date: Sun Mar 1 18:25:07 2009 +1100 - - radeon: fix rs480 gart size - -commit f3812bb92e9900be559d5d4b2098b8dcef01cce9 -Author: Dave Airlie -Date: Fri Feb 27 15:37:14 2009 +1000 - - radeon: disable kms by default for r600 - -commit 924db462f118847e313a1a185e93e58016866da4 -Author: Dave Airlie -Date: Fri Feb 27 11:51:22 2009 +1000 - - radeon: fixup proc hacks - -commit 59883501a17405b6db133066d41309db083eb722 -Author: Dave Airlie -Date: Fri Feb 27 11:51:08 2009 +1000 - - radeon: fixup module load - -commit 0b8ecbca3940dc13b163ab2c46f633625d52aa72 -Author: Dave Airlie -Date: Fri Feb 27 11:50:50 2009 +1000 - - radeon: fix up ring read/write for new drm-next code - -commit 6bffd54b50ca1889aea58454e39edf23e3c4ec50 -Author: Dave Airlie -Date: Fri Feb 27 11:50:24 2009 +1000 - - ati_pcigart: update pcigart for changes in drm-next - -commit ddd936403f8c89d85a6407809e93e32b050b09b0 -Author: Dave Airlie -Date: Thu Feb 26 22:27:21 2009 +1000 - - radeon: fixup writeback/ring ptrs for Kms - -commit b245e49600fe885e376150d9e8adc6308408c70f -Author: Dave Airlie -Date: Thu Feb 26 22:00:59 2009 +1000 - - radeon: fixup after rebase so it builds - - lots more to do - -commit c2181284133a30bd1355b9f9463710f9ec43ccaa -Author: Dave Airlie -Date: Thu Feb 26 12:03:55 2009 +1000 - - drm/radeno: add support for r100 cp type 3 packets - -commit 62fb97e2a2e71f83c2c6c783f95a36ba19ec468f -Author: Dave Airlie -Date: Wed Feb 25 16:07:15 2009 +1000 - - radeon: fixup cs buffer re-use code to not block straight away - -commit 7da8970a24bad69684fba5713106b3c7ab69c858 -Author: Dave Airlie -Date: Wed Feb 25 16:06:30 2009 +1000 - - radeon: port CS mutex over from drm.git - - Totally missed this before - really helps stability - -commit 97c941152f9ebf9e8554d5fc9810a48c722e0c9b -Author: Dave Airlie -Date: Wed Feb 25 13:03:47 2009 +1000 - - radeon: fix IB dump end - -commit 7ce614a4e8d2c1f184de524eb5185fa0004328c5 -Author: Thomas Hellstrom -Date: Tue Feb 24 20:26:53 2009 +1000 - - drm/ttm: work around some x86 pat oddities by using mixedmap instead of pfnmap - -commit a7b9422d556ac958d4a13fc03f83be4cfa39b46a -Author: Dave Airlie -Date: Sun Feb 22 08:22:14 2009 +1000 - - radeon: add module IDs - -commit 9a51f123fcf038946ee12626b2b43c51aa83ce6c -Author: Dave Airlie -Date: Sun Feb 22 08:19:33 2009 +1000 - - radeon: fixup for new APIs - -commit 60f38523ede4949f2b45ca50965b63a32d7a55ba -Author: Dave Airlie -Date: Sun Feb 22 08:11:33 2009 +1000 - - drm: fix parmeter passed to fb_release - -commit fb9c478ac883cbff1c1dc749c375fb530516e37e -Author: Dave Airlie -Date: Wed Feb 18 17:36:33 2009 +1000 - - radeon: add IB dumping - - this adds basic IB dumping and cleans up some code around it. - -commit c7c57bbbc13a80bfd5eec9a52111f354871d6416 -Author: Dave Airlie -Date: Wed Feb 18 11:12:19 2009 +1000 - - radeon: fix packet2 parsing + enhance debug - -commit 7970531e80133bae363d81d2da4b71b8b058a9eb -Author: Dave Airlie -Date: Wed Feb 18 11:11:39 2009 +1000 - - radeon: use r100/r200 table to setup the regs database - - This takes the packet table from the older CS method and re-uses it to - setup the valid register table. - - It also doesn't or in the table values but sets them - -commit a8b00f79936bde4eade8eb4459fdc1bd3b1264aa -Author: Dave Airlie -Date: Tue Feb 17 20:57:34 2009 +1000 - - radeon/i2c: i2c adapter id is gone - -commit a941fade599c2468fedcf7b2cd0c8c77f8bf9db2 -Author: Dave Airlie [...1874 lines suppressed...] -@@ -0,0 +1,1555 @@ +@@ -0,0 +1,1568 @@ +/* + * Copyright 2008 Red Hat Inc. + * @@ -24808,20 +23350,26 @@ +{ + struct drm_gem_object *obj; + struct drm_radeon_gem_object *obj_priv; ++ struct drm_radeon_private *dev_priv; + int ret; + uint32_t flags; + uint32_t page_align; ++ uint32_t cached = 0; + + obj = drm_gem_object_alloc(dev, size); + if (!obj) + return NULL; + + obj_priv = obj->driver_private; ++ dev_priv = obj->dev->dev_private; + flags = DRM_BO_FLAG_MAPPABLE; ++ ++ if (!(dev_priv->flags & RADEON_IS_AGP)) ++ cached = DRM_BO_FLAG_CACHED; + if (initial_domain == RADEON_GEM_DOMAIN_VRAM) -+ flags |= DRM_BO_FLAG_MEM_VRAM; ++ flags |= DRM_BO_FLAG_MEM_VRAM | cached; + else if (initial_domain == RADEON_GEM_DOMAIN_GTT) -+ flags |= DRM_BO_FLAG_MEM_TT; ++ flags |= DRM_BO_FLAG_MEM_TT | cached; + else + flags |= DRM_BO_FLAG_MEM_LOCAL | DRM_BO_FLAG_CACHED; + @@ -24889,17 +23437,22 @@ +int radeon_gem_set_domain(struct drm_gem_object *obj, uint32_t read_domains, uint32_t write_domain, uint32_t *flags_p, bool unfenced) +{ + struct drm_radeon_gem_object *obj_priv; ++ drm_radeon_private_t *dev_priv = obj->dev->dev_private; + uint32_t flags = 0; + int ret; ++ uint32_t cached = 0; + + obj_priv = obj->driver_private; + ++ if (!(dev_priv->flags & RADEON_IS_AGP)) ++ cached = DRM_BO_FLAG_CACHED; ++ + /* work out where to validate the buffer to */ + if (write_domain) { /* write domains always win */ + if (write_domain == RADEON_GEM_DOMAIN_VRAM) -+ flags = DRM_BO_FLAG_MEM_VRAM; ++ flags = DRM_BO_FLAG_MEM_VRAM | cached; + else if (write_domain == RADEON_GEM_DOMAIN_GTT) -+ flags = DRM_BO_FLAG_MEM_TT; // need a can write gart check ++ flags = DRM_BO_FLAG_MEM_TT | cached; // need a can write gart check + else + return -EINVAL; // we can't write to system RAM + } else { @@ -24917,22 +23470,22 @@ + + /* simple case no choice in domains */ + if (read_domains == RADEON_GEM_DOMAIN_VRAM) -+ flags = DRM_BO_FLAG_MEM_VRAM; ++ flags = DRM_BO_FLAG_MEM_VRAM | cached; + else if (read_domains == RADEON_GEM_DOMAIN_GTT) -+ flags = DRM_BO_FLAG_MEM_TT; ++ flags = DRM_BO_FLAG_MEM_TT | cached; + else if ((obj_priv->bo->mem.mem_type == DRM_BO_MEM_VRAM) && (read_domains & RADEON_GEM_DOMAIN_VRAM)) -+ flags = DRM_BO_FLAG_MEM_VRAM; ++ flags = DRM_BO_FLAG_MEM_VRAM | cached; + else if ((obj_priv->bo->mem.mem_type == DRM_BO_MEM_TT) && (read_domains & RADEON_GEM_DOMAIN_GTT)) -+ flags = DRM_BO_FLAG_MEM_TT; ++ flags = DRM_BO_FLAG_MEM_TT | cached; + else if ((obj_priv->bo->mem.mem_type == DRM_BO_MEM_LOCAL) && (read_domains & RADEON_GEM_DOMAIN_GTT)) -+ flags = DRM_BO_FLAG_MEM_TT; ++ flags = DRM_BO_FLAG_MEM_TT | cached; + + /* no idea here just set whatever we are input */ + if (flags == 0) { + if (read_domains & RADEON_GEM_DOMAIN_VRAM) -+ flags |= DRM_BO_FLAG_MEM_VRAM; ++ flags |= DRM_BO_FLAG_MEM_VRAM | cached; + if (read_domains & RADEON_GEM_DOMAIN_GTT) -+ flags |= DRM_BO_FLAG_MEM_TT; ++ flags |= DRM_BO_FLAG_MEM_TT | cached; + } + } + @@ -24946,6 +23499,7 @@ + if (ret) + return ret; + ++ flags &= ~cached; + if (flags_p) + *flags_p = flags; + return 0; @@ -25814,7 +24368,8 @@ + drm_bo_driver_init(dev); + + /* use the uncached allocator */ -+ dev->bm.allocator_type = _DRM_BM_ALLOCATOR_UNCACHED; ++ if (dev_priv->flags & RADEON_IS_AGP) ++ dev->bm.allocator_type = _DRM_BM_ALLOCATOR_UNCACHED; + + /* size the mappable VRAM memory for now */ + radeon_vram_setup(dev); @@ -26658,7 +25213,7 @@ +} + diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c -index 8289e16..4d17023 100644 +index 9836c70..26ee45e 100644 --- a/drivers/gpu/drm/radeon/radeon_irq.c +++ b/drivers/gpu/drm/radeon/radeon_irq.c @@ -195,11 +195,14 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS) @@ -26676,7 +25231,7 @@ + } /* VBLANK interrupt */ - if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) { + if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) { @@ -216,20 +219,23 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS) return IRQ_HANDLED; } @@ -35195,7 +33750,7 @@ + +#endif diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c -index ca00cef..e6d0503 100644 +index fa728ec..6d96e7e 100644 --- a/drivers/gpu/drm/radeon/radeon_state.c +++ b/drivers/gpu/drm/radeon/radeon_state.c @@ -305,8 +305,9 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t * @@ -35633,7 +34188,7 @@ #endif diff --git a/include/drm/drm_objects.h b/include/drm/drm_objects.h new file mode 100644 -index 0000000..604c8f8 +index 0000000..60016d6 --- /dev/null +++ b/include/drm/drm_objects.h @@ -0,0 +1,913 @@ @@ -36535,12 +35090,12 @@ + void *virtual); + +/* -+ * drm_uncached.c ++ * drm_page_alloc. + */ -+extern int drm_uncached_init(void); -+extern void drm_uncached_fini(void); -+extern struct page *drm_get_uncached_page(void); -+extern void drm_put_uncached_page(struct page *page); ++extern int drm_page_alloc_init(void); ++extern void drm_page_alloc_fini(void); ++extern struct page *drm_get_page(int cached); ++extern void drm_put_page(struct page *page, int cached); + +#ifdef CONFIG_DEBUG_MUTEXES +#define DRM_ASSERT_LOCKED(_mutex) \ @@ -36550,38 +35105,6 @@ +#define DRM_ASSERT_LOCKED(_mutex) +#endif +#endif -diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h -index 912cd52..9aeb426 100644 ---- a/include/drm/i915_drm.h -+++ b/include/drm/i915_drm.h -@@ -187,7 +187,7 @@ typedef struct _drm_i915_sarea { - - #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t) - #define DRM_IOCTL_I915_FLUSH DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH) --#define DRM_IOCTL_I915_FLIP DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLIP) -+#define DRM_IOCTL_I915_FLIP DRM_IOW( DRM_COMMAND_BASE + DRM_I915_FLIP, drm_i915_flip_t) - #define DRM_IOCTL_I915_BATCHBUFFER DRM_IOW( DRM_COMMAND_BASE + DRM_I915_BATCHBUFFER, drm_i915_batchbuffer_t) - #define DRM_IOCTL_I915_IRQ_EMIT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_IRQ_EMIT, drm_i915_irq_emit_t) - #define DRM_IOCTL_I915_IRQ_WAIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_IRQ_WAIT, drm_i915_irq_wait_t) -@@ -220,6 +220,18 @@ typedef struct _drm_i915_sarea { - #define DRM_IOCTL_I915_GEM_GET_TILING DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct drm_i915_gem_get_tiling) - #define DRM_IOCTL_I915_GEM_GET_APERTURE DRM_IOR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_APERTURE, struct drm_i915_gem_get_aperture) - -+/* Asynchronous page flipping: -+ */ -+typedef struct drm_i915_flip { -+ /* -+ * This is really talking about planes, and we could rename it -+ * except for the fact that some of the duplicated i915_drm.h files -+ * out there check for HAVE_I915_FLIP and so might pick up this -+ * version. -+ */ -+ int pipes; -+} drm_i915_flip_t; -+ - /* Allow drivers to submit batchbuffers directly to hardware, relying - * on the security mechanisms provided by hardware. - */ diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h index 937a275..f716e0a 100644 --- a/include/drm/radeon_drm.h drm-next.patch: Index: drm-next.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-next.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- drm-next.patch 27 Feb 2009 03:14:01 -0000 1.8 +++ drm-next.patch 9 Mar 2009 03:11:26 -0000 1.9 @@ -1,4 +1,73 @@ -commit afdecdb151030e719a95896b610fdbde0ad4ca9f +commit d2d31c9fe72bf4904798fd0d01522644e49dd518 +Author: Dave Airlie +Date: Mon Mar 9 12:47:18 2009 +1000 + + drm: fix warnings about new mappings in info code. + + This fixes up the warnings in the debugfs code that conflicted + with the mapping fixups. + + Signed-off-by: Dave Airlie + +commit 4ac16538732ad683c1e7c13cc569335a2db8b6c5 +Author: Hannes Eder +Date: Thu Mar 5 20:14:18 2009 +0100 + + drm/radeon: NULL noise: drivers/gpu/drm/radeon/radeon_*.c + + Fix this sparse warning: + drivers/gpu/drm/radeon/r600_cp.c:1811:52: warning: Using plain integer as NULL pointer + drivers/gpu/drm/radeon/radeon_cp.c:1363:52: warning: Using plain integer as NULL pointer + drivers/gpu/drm/radeon/radeon_state.c:1983:61: warning: Using plain integer as NULL pointer + + Signed-off-by: Hannes Eder + Signed-off-by: Dave Airlie + +commit ae0add29f05b2f5d22863eaefad106f2bb3919be +Author: Dave Airlie +Date: Mon Mar 9 12:17:08 2009 +1000 + + drm/radeon: fix r600 pci mapping calls. + + This realigns the r600 pci mapping calls with the ati pcigart ones, + fixing the direction and using the correct interface. + + Suggested by Jerome Glisse. + + Signed-off-by: Dave Airlie + +commit 9cc01249240abd94eeba0792ad6fc509e7bf072e +Author: Alex Deucher +Date: Sat Mar 7 18:21:21 2009 -0500 + + drm/radeon: r6xx/r7xx: fix possible oops in r600_page_table_cleanup() + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit 8ebf7ff817d032d1f6a06da8b65149b3de049e14 +Author: Dave Airlie +Date: Mon Mar 9 12:12:28 2009 +1000 + + radeon: call the correct idle function, logic got inverted. + + This calls the correct idle function for the R600 and previous chips. + + Signed-off-by: Dave Airlie + +commit 144a1136478cca4f3efe67787eec33ca07aec929 +Author: Alex Deucher +Date: Fri Mar 6 11:47:54 2009 -0500 + + drm/radeon: RS600: fix interrupt handling + + the checks weren't updated when RS600 support + was added. + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit 664debb50231badbe84778f8945619e36555cd1d Author: Dave Airlie Date: Thu Feb 26 10:15:24 2009 +1000 @@ -6,7 +75,7 @@ Signed-off-by: Dave Airlie -commit cc35bf2855020c4067e298cbd50fa5494b82ab7f +commit 34aa4615a2cce35e46ef23b298c90afe4903f85d Author: Dave Airlie Date: Thu Feb 26 10:14:40 2009 +1000 @@ -16,7 +85,7 @@ Signed-off-by: Dave Airlie -commit 0101c60cfa2d6bd9e86524f267f8ba092bc7b0ae +commit 840cd338857ead31f2c208f70cff2126b6838fd0 Author: Dave Airlie Date: Thu Feb 26 10:13:47 2009 +1000 @@ -26,7 +95,7 @@ Signed-off-by: Dave Airlie -commit c455abd7d1f5ed1815d692f37b317f8eab358ced +commit ae18cf3a76471e058613a5a1256969b8cfd27128 Author: Dave Airlie Date: Thu Feb 26 10:12:10 2009 +1000 @@ -38,7 +107,7 @@ Signed-off-by: Dave Airlie -commit 89de134be815fe9e30ca42aeac8a4ef5c8db8d30 +commit c79813faebe755991896c699773f50851c670d4c Author: Alex Deucher Date: Wed Feb 25 17:02:19 2009 -0500 @@ -47,7 +116,7 @@ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie -commit 8dba4f2bd6d91a38a732dc3417187b75a6607e62 +commit a7f4943d120ba4c45cff2bd22883f598024a08dc Author: Alex Deucher Date: Wed Feb 25 16:57:49 2009 -0500 @@ -60,7 +129,7 @@ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie -commit e482e2e2c5dab12db6f1aa032c30993ca36d77b9 +commit b7fd19e6342c5f2522ec35dec0a92c8069813255 Author: Alex Deucher Date: Wed Feb 25 15:55:01 2009 -0500 @@ -71,7 +140,7 @@ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie -commit dbcce50efba41272d795b64edd06b1261dbdc5b8 +commit 393f865abfb61363ba117cb0c3ea5032bc0a3a3c Author: Alex Deucher Date: Tue Feb 24 17:13:42 2009 -0500 @@ -80,7 +149,7 @@ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie -commit 69184db08c49fd54d4e3a197dae64581c35a144f +commit 6b3287c090c2c3eee993a96886f2f597c9e6ccfa Author: Alex Deucher Date: Tue Feb 24 16:22:29 2009 -0500 @@ -92,7 +161,7 @@ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie -commit b95ec10efe0bb8a106c6ab4edc019033c5081d3d +commit e5a4f4a67d0e886b68ebb122b9282289bf9d6d7f Author: Alex Deucher Date: Tue Feb 24 14:28:34 2009 -0500 @@ -107,7 +176,7 @@ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie -commit 1e7e66e6dce44a77d4042b80de23c8ba4346c459 +commit 0c9f2a4eb40612b22c4bb32b9fe9bcbb82c99e10 Author: Alex Deucher Date: Tue Feb 24 14:02:13 2009 -0500 @@ -120,7 +189,7 @@ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie -commit 9cb39ece1f32fe75e7c34b193022650108d4bf0f +commit 3d802792f818036520ab805ded2904a749af4a48 Author: Owain G. Ainsworth Date: Fri Feb 20 08:30:19 2009 +0000 @@ -138,7 +207,7 @@ Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie -commit 5e60aaba5c9d226ec49f4c1030fc871bcea86048 +commit 088b364ce837e5b1fc8dd022bb5f98c8f3d96e3c Author: Chris Wilson Date: Wed Feb 11 14:26:38 2009 +0000 @@ -148,7 +217,7 @@ Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie -commit 475f933c677b8c59f34744aed2fc3bdcbec24c6e +commit b884af03178e5cd139c8f566090ce763fb9e3a2b Author: Eric Anholt Date: Tue Feb 17 23:53:41 2009 -0800 @@ -161,7 +230,7 @@ Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie -commit b4212836fef1ef28c6070f43d70fc73f9f5687f6 +commit ceeb73a867fe64a1de124cd3e9d776e89944f940 Author: Ben Gamari Date: Tue Feb 17 20:08:51 2009 -0500 @@ -174,7 +243,7 @@ Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie -commit a584bb1ed4de35a9206a8ed42fc7de18b3d46b5a +commit b1645221d43bbfab70c5c5cfdc9e9733e380fca0 Author: Ben Gamari Date: Tue Feb 17 20:08:49 2009 -0500 @@ -194,7 +263,7 @@ Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie -commit edd3993997087102558fd2dbad9d69f8936faf46 +commit d4b25b68f700e27a09c0c5a372c6ee5c1ec45b8e Author: Dave Airlie Date: Fri Feb 20 13:28:59 2009 +1000 @@ -204,7 +273,7 @@ Signed-off-by: Dave Airlie -commit d372535cb04702f5a631c9fc4d0a05c82a17f9b9 +commit 0c37ea7ccc5dabc1cd53780ae4600c6d0644b9f3 Author: Dave Airlie Date: Fri Feb 20 13:28:34 2009 +1000 @@ -217,7 +286,7 @@ Signed-off-by: Dave Airlie -commit ee97e09a8955f2c7c97142f53f259521a6366f95 +commit f7d0d89cc8da1e1ca489d5df3df68b00c0dd59d4 Author: Benjamin Herrenschmidt Date: Fri Feb 6 16:46:27 2009 +1100 @@ -229,7 +298,7 @@ Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Dave Airlie -commit caa35ced56886af48fbefd52e524267565c474db +commit e22139bc821f295d25c0eddbeb65facf1f395458 Author: David Miller Date: Wed Feb 18 01:35:21 2009 -0800 @@ -244,7 +313,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit 57c23ac2439fb3d63063803c1525e1797b7952cb +commit 85cee125f1756aeaa35e02db01987a0a4a5db909 Author: David Miller Date: Wed Feb 18 01:35:23 2009 -0800 @@ -260,7 +329,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit 61d7dc858751fa8134b10c21b2d79956a752f96d +commit 37d1de5730f78a682a19a47f83893e6116a65325 Author: David Miller Date: Wed Feb 18 15:41:02 2009 -0800 @@ -298,7 +367,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit ed19a4b6caeabf3e03a4d553da0396eaebf76531 +commit ddaf8998790ba8d389859fa6420c7da38db91191 Author: David Miller Date: Sun Feb 15 01:08:07 2009 -0800 @@ -316,7 +385,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit 303ba2de4375c08154f7636087161f8d68977833 +commit 1a531c0b82db724bf802f5e100c2c2fc08d54459 Author: David Miller Date: Sat Feb 14 01:51:07 2009 -0800 @@ -338,7 +407,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit 75af28fa5949ac848ca383238212bcb9466a50db +commit 7c5627f23a200c4ab9563b0f1fcfc6984be6ce0b Author: David Miller Date: Thu Feb 12 02:15:44 2009 -0800 @@ -350,7 +419,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit 15c128115096c24076739d0601532b6890482596 +commit 0a5bd3c5c690560a24886d25c5031291c0efbc35 Author: David Miller Date: Thu Feb 12 02:15:39 2009 -0800 @@ -362,7 +431,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit dad8df8c4dfbbf5dfaaed08f61b589ada484a755 +commit 557d71764de798c60cc504f678aaf66a01374860 Author: David Miller Date: Thu Feb 12 02:15:37 2009 -0800 @@ -385,7 +454,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit 1b80a560c76a15813969bc79f8bef4f2324407f1 +commit 2a2aba5d992576a6d73666be1e5ef0248b7a5c1b Author: David Miller Date: Thu Feb 12 02:15:34 2009 -0800 @@ -402,7 +471,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit a1971853c7d82fc14eff895757b5e093c1d6c0b5 +commit f087a3713864f4d3bba746cb70aaebbf9ee1e13f Author: David Miller Date: Thu Feb 12 02:15:27 2009 -0800 @@ -423,7 +492,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit cfc0cec3a58d760f0adaef295e9bef5b2b994a69 +commit 928278d2dfc9e3d1af52dd037c13693add544501 Author: Kristian H??gsberg Date: Mon Jan 5 16:10:05 2009 -0500 @@ -442,7 +511,7 @@ Signed-off-by: Kristian H??gsberg Signed-off-by: Dave Airlie -commit f258389e5a3dde1962f246ea8d893d41059a61d7 +commit 2c3a4c2e0f4127adbf9cecb473f2ac4576d289aa Author: Kristian H??gsberg Date: Sun Jan 4 16:55:33 2009 -0500 @@ -456,7 +525,7 @@ Signed-off-by: Kristian H??gsberg Signed-off-by: Dave Airlie -commit 0de5ea62f39de56d2d5513b35d6b9d8df9a66e45 +commit 731b22a5b708f10e45847007a8d786568cb8becc Author: Benjamin Herrenschmidt Date: Mon Feb 2 16:55:47 2009 +1100 @@ -483,7 +552,7 @@ Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Dave Airlie -commit b5fb48f9b87f1955f00a3651c5104d62381ab50d +commit 3365ed3f4b72d9eaecc7a67ff0f3078c9053806d Author: Benjamin Herrenschmidt Date: Mon Feb 2 16:55:46 2009 +1100 @@ -514,7 +583,7 @@ Acked-by: Eric Anholt Signed-off-by: Dave Airlie -commit 1262fdc859fc25e03ce7631daa0d2b50399b3a64 +commit 2d072cd331fb6434406977ac3bbe7a58589f5cca Author: Benjamin Herrenschmidt Date: Mon Feb 2 16:55:45 2009 +1100 @@ -645,7 +714,7 @@ } } diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c -index 72c667f..445c762 100644 +index 12715d3..6d80d17 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -34,15 +34,17 @@ @@ -1330,7 +1399,7 @@ unsigned long prot; diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c new file mode 100644 -index 0000000..fc98952 +index 0000000..60a1b6c --- /dev/null +++ b/drivers/gpu/drm/drm_info.c @@ -0,0 +1,328 @@ @@ -1408,7 +1477,7 @@ +{ + struct drm_info_node *node = (struct drm_info_node *) m->private; + struct drm_device *dev = node->minor->dev; -+ struct drm_map *map; ++ struct drm_local_map *map; + struct drm_map_list *r_list; + + /* Hardcoded from _DRM_FRAME_BUFFER, @@ -1430,9 +1499,9 @@ + else + type = types[map->type]; + -+ seq_printf(m, "%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx ", ++ seq_printf(m, "%4d 0x%016llx 0x%08lx %4.4s 0x%02x 0x%08lx ", + i, -+ map->offset, ++ (unsigned long long)map->offset, + map->size, type, map->flags, + (unsigned long) r_list->user_token); + if (map->mtrr < 0) @@ -2535,7 +2604,7 @@ -} -#endif diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c -index 46bb923..7c41600 100644 +index 7c8b15b..d009661 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -50,6 +50,7 @@ struct idr drm_minors_idr; @@ -2546,7 +2615,7 @@ static int drm_minor_get_id(struct drm_device *dev, int type) { -@@ -321,7 +322,15 @@ static int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int t +@@ -313,7 +314,15 @@ static int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int t goto err_mem; } } else @@ -2563,7 +2632,7 @@ ret = drm_sysfs_device_add(new_minor); if (ret) { -@@ -380,6 +389,7 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, +@@ -372,6 +381,7 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, } if (drm_core_check_feature(dev, DRIVER_MODESET)) { @@ -2571,7 +2640,7 @@ ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL); if (ret) goto err_g2; -@@ -403,9 +413,9 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, +@@ -395,9 +405,9 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, list_add_tail(&dev->driver_item, &driver->device_list); @@ -2583,7 +2652,7 @@ return 0; -@@ -417,29 +427,7 @@ err_g1: +@@ -409,29 +419,7 @@ err_g1: drm_free(dev, sizeof(*dev), DRM_MEM_STUB); return ret; } @@ -2614,7 +2683,7 @@ /** * Put a secondary minor number. -@@ -459,6 +447,10 @@ int drm_put_minor(struct drm_minor **minor_p) +@@ -451,6 +439,10 @@ int drm_put_minor(struct drm_minor **minor_p) if (minor->type == DRM_MINOR_LEGACY) drm_proc_cleanup(minor, drm_proc_root); @@ -2625,7 +2694,7 @@ drm_sysfs_device_remove(minor); idr_remove(&drm_minors_idr, minor->index); -@@ -467,3 +459,67 @@ int drm_put_minor(struct drm_minor **minor_p) +@@ -459,3 +451,67 @@ int drm_put_minor(struct drm_minor **minor_p) *minor_p = NULL; return 0; } @@ -2927,7 +2996,7 @@ intel_display.o \ intel_crt.o \ diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c -index cc46495..27ef79a 100644 +index 6dab63b..7fecc6d 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1057,7 +1057,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master) @@ -3837,10 +3906,10 @@ cmdbuf->bufsz -= sizeof(u64); diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c new file mode 100644 -index 0000000..37249b2 +index 0000000..6f2cc74 --- /dev/null +++ b/drivers/gpu/drm/radeon/r600_cp.c -@@ -0,0 +1,2244 @@ +@@ -0,0 +1,2247 @@ +/* + * Copyright 2008-2009 Advanced Micro Devices, Inc. + * Copyright 2008 Red Hat Inc. @@ -3964,6 +4033,9 @@ + int pages; + int i; + ++ if (!entry) ++ return; ++ + if (gart_info->bus_addr) { + max_pages = (gart_info->table_size / sizeof(u32)); + pages = (entry->pages <= max_pages) @@ -3972,8 +4044,8 @@ + for (i = 0; i < pages; i++) { + if (!entry->busaddr[i]) + break; -+ pci_unmap_single(dev->pdev, entry->busaddr[i], -+ PAGE_SIZE, PCI_DMA_TODEVICE); ++ pci_unmap_page(dev->pdev, entry->busaddr[i], ++ PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); + } + if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) + gart_info->bus_addr = 0; @@ -4005,10 +4077,10 @@ + + gart_idx = 0; + for (i = 0; i < pages; i++) { -+ entry->busaddr[i] = pci_map_single(dev->pdev, -+ page_address(entry-> -+ pagelist[i]), -+ PAGE_SIZE, PCI_DMA_TODEVICE); ++ entry->busaddr[i] = pci_map_page(dev->pdev, ++ entry->pagelist[i], 0, ++ PAGE_SIZE, ++ PCI_DMA_BIDIRECTIONAL); + if (entry->busaddr[i] == 0) { + DRM_ERROR("unable to map PCIGART pages!\n"); + r600_page_table_cleanup(dev, gart_info); @@ -5651,7 +5723,7 @@ + + if (dev_priv->gart_info.gart_table_location == DRM_ATI_GART_FB) { + drm_core_ioremapfree(&dev_priv->gart_info.mapping, dev); -+ dev_priv->gart_info.addr = 0; ++ dev_priv->gart_info.addr = NULL; + } + } + /* only clear to the start of flags */ @@ -29389,7 +29461,7 @@ + +#endif diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c -index 92965db..15cfe56 100644 +index 92965db..6f579a8 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c @@ -43,6 +43,78 @@ @@ -29922,7 +29994,7 @@ /* Turn on PCI GART */ radeon_set_pcigart(dev_priv, 1); } -@@ -1268,8 +1530,12 @@ static int radeon_do_cleanup_cp(struct drm_device * dev) +@@ -1268,14 +1530,18 @@ static int radeon_do_cleanup_cp(struct drm_device * dev) if (dev_priv->gart_info.bus_addr) { /* Turn off PCI GART */ radeon_set_pcigart(dev_priv, 0); @@ -29937,6 +30009,13 @@ } if (dev_priv->gart_info.gart_table_location == DRM_ATI_GART_FB) + { + drm_core_ioremapfree(&dev_priv->gart_info.mapping, dev); +- dev_priv->gart_info.addr = 0; ++ dev_priv->gart_info.addr = NULL; + } + } + /* only clear to the start of flags */ @@ -1326,6 +1592,7 @@ static int radeon_do_resume_cp(struct drm_device *dev, struct drm_file *file_pri int radeon_cp_init(struct drm_device *dev, void *data, struct drm_file *file_priv) @@ -30009,7 +30088,7 @@ /* Stop the cp */ - while ((ret = radeon_do_cp_idle(dev_priv)) != 0) { - DRM_DEBUG("radeon_do_cp_idle %d\n", ret); -+ if ((dev_priv->flags & RADEON_FAMILY_MASK) < CHIP_R600) { ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600) { + while ((ret = r600_do_cp_idle(dev_priv)) != 0) { + DRM_DEBUG("radeon_do_cp_idle %d\n", ret); +#ifdef __linux__ @@ -30195,10 +30274,10 @@ + } +} diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c -index fef2078..1e3b255 100644 +index fef2078..2cb4f32 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c -@@ -41,17 +41,6 @@ int radeon_no_wb; +@@ -41,23 +41,12 @@ int radeon_no_wb; MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers"); module_param_named(no_wb, radeon_no_wb, int, 0444); @@ -30216,6 +30295,22 @@ static int radeon_suspend(struct drm_device *dev, pm_message_t state) { drm_radeon_private_t *dev_priv = dev->dev_private; + + /* Disable *all* interrupts */ +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) + RADEON_WRITE(R500_DxMODE_INT_MASK, 0); + RADEON_WRITE(RADEON_GEN_INT_CNTL, 0); + return 0; +@@ -68,7 +57,7 @@ static int radeon_resume(struct drm_device *dev) + drm_radeon_private_t *dev_priv = dev->dev_private; + + /* Restore interrupt registers */ +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) + RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg); + RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg); + return 0; @@ -95,7 +84,6 @@ static struct drm_driver driver = { .get_vblank_counter = radeon_get_vblank_counter, .enable_vblank = radeon_enable_vblank, @@ -31044,8 +31139,75 @@ #define OUT_RING( x ) do { \ if ( RADEON_VERBOSE ) { \ +diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c +index 8289e16..9836c70 100644 +--- a/drivers/gpu/drm/radeon/radeon_irq.c ++++ b/drivers/gpu/drm/radeon/radeon_irq.c +@@ -65,7 +65,7 @@ int radeon_enable_vblank(struct drm_device *dev, int crtc) + { + drm_radeon_private_t *dev_priv = dev->dev_private; + +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) { ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) { + switch (crtc) { + case 0: + r500_vbl_irq_set_state(dev, R500_D1MODE_INT_MASK, 1); +@@ -100,7 +100,7 @@ void radeon_disable_vblank(struct drm_device *dev, int crtc) + { + drm_radeon_private_t *dev_priv = dev->dev_private; + +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) { ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) { + switch (crtc) { + case 0: + r500_vbl_irq_set_state(dev, R500_D1MODE_INT_MASK, 0); +@@ -135,7 +135,7 @@ static inline u32 radeon_acknowledge_irqs(drm_radeon_private_t *dev_priv, u32 *r + u32 irq_mask = RADEON_SW_INT_TEST; + + *r500_disp_int = 0; +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) { ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) { + /* vbl interrupts in a different place */ + + if (irqs & R500_DISPLAY_INT_STATUS) { +@@ -202,7 +202,7 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS) + DRM_WAKEUP(&dev_priv->swi_queue); + + /* VBLANK interrupt */ +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) { ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) { + if (r500_disp_int & R500_D1_VBLANK_INTERRUPT) + drm_handle_vblank(dev, 0); + if (r500_disp_int & R500_D2_VBLANK_INTERRUPT) +@@ -265,7 +265,7 @@ u32 radeon_get_vblank_counter(struct drm_device *dev, int crtc) + return -EINVAL; + } + +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) { ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) { + if (crtc == 0) + return RADEON_READ(R500_D1CRTC_FRAME_COUNT); + else +@@ -327,7 +327,7 @@ void radeon_driver_irq_preinstall(struct drm_device * dev) + u32 dummy; + + /* Disable *all* interrupts */ +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) + RADEON_WRITE(R500_DxMODE_INT_MASK, 0); + RADEON_WRITE(RADEON_GEN_INT_CNTL, 0); + +@@ -357,7 +357,7 @@ void radeon_driver_irq_uninstall(struct drm_device * dev) + if (!dev_priv) + return; + +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) + RADEON_WRITE(R500_DxMODE_INT_MASK, 0); + /* Disable *all* interrupts */ + RADEON_WRITE(RADEON_GEN_INT_CNTL, 0); diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c -index ef940a0..ca00cef 100644 +index ef940a0..fa728ec 100644 --- a/drivers/gpu/drm/radeon/radeon_state.c +++ b/drivers/gpu/drm/radeon/radeon_state.c @@ -1556,9 +1556,15 @@ static void radeon_cp_discard_buffer(struct drm_device *dev, struct drm_master * @@ -31067,6 +31229,15 @@ buf->pending = 1; buf->used = 0; +@@ -1980,7 +1986,7 @@ static int alloc_surface(drm_radeon_surface_alloc_t *new, + + /* find a virtual surface */ + for (i = 0; i < 2 * RADEON_MAX_SURFACES; i++) +- if (dev_priv->virt_surfaces[i].file_priv == 0) ++ if (dev_priv->virt_surfaces[i].file_priv == NULL) + break; + if (i == 2 * RADEON_MAX_SURFACES) { + return -1; @@ -2473,24 +2479,25 @@ static int radeon_cp_indirect(struct drm_device *dev, void *data, struct drm_fil buf->used = indirect->end; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1394 retrieving revision 1.1395 diff -u -r1.1394 -r1.1395 --- kernel.spec 6 Mar 2009 20:24:27 -0000 1.1394 +++ kernel.spec 9 Mar 2009 03:11:27 -0000 1.1395 @@ -1810,6 +1810,10 @@ # and build. %changelog +* Mon Mar 09 2009 Dave Airlie +- drm-next.patch: fixes from upstream queue for r600 support +- drm-modesetting-radeon.patch: make 2D/3D on PCIE faster + * Fri Mar 06 2009 Jarod Wilson - add atom to p4-clockmod for thermal mgmt benefits for the atom procs that don't do freq scaling (lookin' at you, atom 330) From petersen at fedoraproject.org Mon Mar 9 03:11:29 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 9 Mar 2009 03:11:29 +0000 (UTC) Subject: rpms/ghc-ghc-paths - New directory Message-ID: <20090309031129.2AF3C70116@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ghc-ghc-paths In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsl14040/rpms/ghc-ghc-paths Log Message: Directory /cvs/pkgs/rpms/ghc-ghc-paths added to the repository From petersen at fedoraproject.org Mon Mar 9 03:11:29 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 9 Mar 2009 03:11:29 +0000 (UTC) Subject: rpms/ghc-ghc-paths/devel - New directory Message-ID: <20090309031129.62F5370119@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ghc-ghc-paths/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsl14040/rpms/ghc-ghc-paths/devel Log Message: Directory /cvs/pkgs/rpms/ghc-ghc-paths/devel added to the repository From petersen at fedoraproject.org Mon Mar 9 03:11:44 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 9 Mar 2009 03:11:44 +0000 (UTC) Subject: rpms/ghc-ghc-paths Makefile,NONE,1.1 Message-ID: <20090309031144.B040970116@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ghc-ghc-paths In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsl14040/rpms/ghc-ghc-paths Added Files: Makefile Log Message: Setup of module ghc-ghc-paths --- NEW FILE Makefile --- # Top level Makefile for module ghc-ghc-paths all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From petersen at fedoraproject.org Mon Mar 9 03:11:44 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 9 Mar 2009 03:11:44 +0000 (UTC) Subject: rpms/ghc-ghc-paths/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309031144.E58637012F@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ghc-ghc-paths/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsl14040/rpms/ghc-ghc-paths/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ghc-ghc-paths --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ghc-ghc-paths # $Id: Makefile,v 1.1 2009/03/09 03:11:44 petersen Exp $ NAME := ghc-ghc-paths SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From mbarnes at fedoraproject.org Mon Mar 9 03:19:46 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 9 Mar 2009 03:19:46 +0000 (UTC) Subject: rpms/openchange/devel libmapi-0.8-ROMULUS-ndr-interface-table.patch, NONE, 1.1 openchange.spec, 1.2, 1.3 libmapi-0.8-ROMULUS-include-signal-h.patch, 1.1, NONE Message-ID: <20090309031946.871CF70116@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/openchange/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15866 Modified Files: openchange.spec Added Files: libmapi-0.8-ROMULUS-ndr-interface-table.patch Removed Files: libmapi-0.8-ROMULUS-include-signal-h.patch Log Message: * Sun Mar 08 2009 Matthew Barnes - 0.8-6 - Fix build breakage. - Explicitly require libldb-devel. - Bump samba4 requirement to alpha7. libmapi-0.8-ROMULUS-ndr-interface-table.patch: --- NEW FILE libmapi-0.8-ROMULUS-ndr-interface-table.patch --- diff -up libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy.c --- libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy.c.ndr-interface-table 2009-01-11 21:14:27.000000000 -0500 +++ libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy.c 2009-03-08 23:12:02.000000000 -0400 @@ -57,7 +57,7 @@ static NTSTATUS mapiproxy_op_bind_proxy( binding = lp_parm_string(dce_call->conn->dce_ctx->lp_ctx, NULL, "dcerpc_mapiproxy", "binding"); machine_account = lp_parm_bool(dce_call->conn->dce_ctx->lp_ctx, NULL, "dcerpc_mapiproxy", "use_machine_account", false); - private = dce_call->context->private; + private = dce_call->context->private_data; if (!binding) { DEBUG(0, ("You must specify a DCE/RPC binding string\n")); @@ -193,7 +193,7 @@ static NTSTATUS mapiproxy_op_bind(struct private->c_pipe = NULL; private->exchname = NULL; private->server_mode = server_mode; - dce_call->context->private = private; + dce_call->context->private_data = private; if (server_mode == false) { return mapiproxy_op_bind_proxy(dce_call, iface); @@ -213,7 +213,7 @@ static NTSTATUS mapiproxy_op_bind(struct */ static void mapiproxy_op_unbind(struct dcesrv_connection_context *context, const struct dcesrv_interface *iface) { - struct dcesrv_mapiproxy_private *private = (struct dcesrv_mapiproxy_private *) context->private; + struct dcesrv_mapiproxy_private *private = (struct dcesrv_mapiproxy_private *) context->private_data; DEBUG(5, ("mapiproxy::mapiproxy_op_unbind\n")); @@ -251,7 +251,7 @@ static NTSTATUS mapiproxy_op_ndr_pull(st DEBUG(5, ("mapiproxy::mapiproxy_op_ndr_pull\n")); - table = (const struct ndr_interface_table *)dce_call->context->iface->private; + table = (const struct ndr_interface_table *)dce_call->context->iface->private_data; opnum = dce_call->pkt.u.request.opnum; dce_call->fault_code = 0; @@ -308,8 +308,8 @@ static NTSTATUS mapiproxy_op_ndr_push(st DEBUG(5, ("mapiproxy::mapiproxy_op_ndr_push\n")); - private = dce_call->context->private; - table = (const struct ndr_interface_table *)dce_call->context->iface->private; + private = dce_call->context->private_data; + table = (const struct ndr_interface_table *)dce_call->context->iface->private_data; opnum = dce_call->pkt.u.request.opnum; name = table->calls[opnum].name; @@ -384,8 +384,8 @@ static NTSTATUS mapiproxy_op_dispatch(st const char *name; NTSTATUS status; - private = dce_call->context->private; - table = dce_call->context->iface->private; + private = dce_call->context->private_data; + table = dce_call->context->iface->private_data; opnum = dce_call->pkt.u.request.opnum; name = table->calls[opnum].name; @@ -477,7 +477,7 @@ static NTSTATUS mapiproxy_op_dispatch(st */ static NTSTATUS mapiproxy_register_one_iface(struct dcesrv_context *dce_ctx, const struct dcesrv_interface *iface) { - const struct ndr_interface_table *table = iface->private; + const struct ndr_interface_table *table = iface->private_data; int i; for (i = 0; i < table->endpoints->count; i++) { @@ -552,7 +552,7 @@ static bool mapiproxy_fill_interface(str iface->reply = mapiproxy_op_reply; iface->ndr_push = mapiproxy_op_ndr_push; - iface->private = tbl; + iface->private_data = tbl; return true; } diff -up libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_module.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_module.c --- libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_module.c.ndr-interface-table 2009-01-02 09:29:00.000000000 -0500 +++ libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_module.c 2009-03-08 23:12:02.000000000 -0400 @@ -44,7 +44,7 @@ NTSTATUS mapiproxy_module_push(struct dc const struct ndr_interface_table *table; NTSTATUS status; - table = (const struct ndr_interface_table *)dce_call->context->iface->private; + table = (const struct ndr_interface_table *)dce_call->context->iface->private_data; for (mpm = mpm_list; mpm; mpm = mpm->next) { if (mpm->module->endpoint && @@ -68,7 +68,7 @@ NTSTATUS mapiproxy_module_ndr_pull(struc const struct ndr_interface_table *table; NTSTATUS status; - table = (const struct ndr_interface_table *)dce_call->context->iface->private; + table = (const struct ndr_interface_table *)dce_call->context->iface->private_data; for (mpm = mpm_list; mpm; mpm = mpm->next) { if (mpm->module->endpoint && @@ -92,7 +92,7 @@ NTSTATUS mapiproxy_module_pull(struct dc const struct ndr_interface_table *table; NTSTATUS status; - table = (const struct ndr_interface_table *)dce_call->context->iface->private; + table = (const struct ndr_interface_table *)dce_call->context->iface->private_data; for (mpm = mpm_list; mpm; mpm = mpm->next) { if (mpm->module->endpoint && @@ -117,7 +117,7 @@ NTSTATUS mapiproxy_module_dispatch(struc const struct ndr_interface_table *table; NTSTATUS status; - table = (const struct ndr_interface_table *)dce_call->context->iface->private; + table = (const struct ndr_interface_table *)dce_call->context->iface->private_data; for (mpm = mpm_list; mpm; mpm = mpm->next) { if (mpm->module->endpoint && diff -up libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_nspi.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_nspi.c --- libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_nspi.c.ndr-interface-table 2008-09-16 21:15:10.000000000 -0400 +++ libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_nspi.c 2009-03-08 23:12:02.000000000 -0400 @@ -130,7 +130,7 @@ bool mapiproxy_NspiQueryRows(struct dces char *lpszA; char *exchname; - private = dce_call->context->private; + private = dce_call->context->private_data; /* Sanity checks */ if (!r->out.ppRows) return false; @@ -191,7 +191,7 @@ bool mapiproxy_NspiDNToMId(struct dcesrv const char *proxyname; uint32_t i; - private = dce_call->context->private; + private = dce_call->context->private_data; proxyname = lp_netbios_name(dce_call->conn->dce_ctx->lp_ctx); if (!private->exchname) return false; diff -up libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_server.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_server.c --- libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_server.c.ndr-interface-table 2009-01-10 14:34:32.000000000 -0500 +++ libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_server.c 2009-03-08 23:12:02.000000000 -0400 @@ -47,7 +47,7 @@ NTSTATUS mapiproxy_server_dispatch(struc const struct ndr_interface_table *table; NTSTATUS status; - table = (const struct ndr_interface_table *)dce_call->context->iface->private; + table = (const struct ndr_interface_table *)dce_call->context->iface->private_data; for (server = server_list; server; server = server->next) { if (server->module->endpoint && table->name && diff -up libmapi-0.8-ROMULUS/mapiproxy/modules/mpm_downgrade.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/modules/mpm_downgrade.c --- libmapi-0.8-ROMULUS/mapiproxy/modules/mpm_downgrade.c.ndr-interface-table 2008-11-01 11:53:29.000000000 -0400 +++ libmapi-0.8-ROMULUS/mapiproxy/modules/mpm_downgrade.c 2009-03-08 23:12:02.000000000 -0400 @@ -58,7 +58,7 @@ static NTSTATUS downgrade_push(struct dc uint16_t opnum; const char *name; - table = (const struct ndr_interface_table *)dce_call->context->iface->private; + table = (const struct ndr_interface_table *)dce_call->context->iface->private_data; opnum = dce_call->pkt.u.request.opnum; name = table->calls[opnum].name; @@ -103,7 +103,7 @@ static NTSTATUS downgrade_dispatch(struc const struct ndr_interface_table *table; uint16_t opnum; - table = (const struct ndr_interface_table *)dce_call->context->iface->private; + table = (const struct ndr_interface_table *)dce_call->context->iface->private_data; opnum = dce_call->pkt.u.request.opnum; if ((opnum == 0xA) && (table->name && !strcmp(table->name, "exchange_emsmdb"))) { diff -up libmapi-0.8-ROMULUS/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.c --- libmapi-0.8-ROMULUS/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.c.ndr-interface-table 2009-01-14 20:43:42.000000000 -0500 +++ libmapi-0.8-ROMULUS/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.c 2009-03-08 23:12:02.000000000 -0400 @@ -410,7 +410,7 @@ static NTSTATUS dcesrv_exchange_emsmdb_d const struct ndr_interface_table *table; uint16_t opnum; - table = (const struct ndr_interface_table *) dce_call->context->iface->private; + table = (const struct ndr_interface_table *) dce_call->context->iface->private_data; opnum = dce_call->pkt.u.request.opnum; /* Sanity checks */ diff -up libmapi-0.8-ROMULUS/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c --- libmapi-0.8-ROMULUS/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c.ndr-interface-table 2009-01-11 17:51:37.000000000 -0500 +++ libmapi-0.8-ROMULUS/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c 2009-03-08 23:12:02.000000000 -0400 @@ -797,7 +797,7 @@ static NTSTATUS dcesrv_exchange_nsp_disp const struct ndr_interface_table *table; uint16_t opnum; - table = (const struct ndr_interface_table *) dce_call->context->iface->private; + table = (const struct ndr_interface_table *) dce_call->context->iface->private_data; opnum = dce_call->pkt.u.request.opnum; /* Sanity checks */ diff -up libmapi-0.8-ROMULUS/mapiproxy/servers/default/rfr/dcesrv_exchange_ds_rfr.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/servers/default/rfr/dcesrv_exchange_ds_rfr.c --- libmapi-0.8-ROMULUS/mapiproxy/servers/default/rfr/dcesrv_exchange_ds_rfr.c.ndr-interface-table 2009-03-08 23:14:14.000000000 -0400 +++ libmapi-0.8-ROMULUS/mapiproxy/servers/default/rfr/dcesrv_exchange_ds_rfr.c 2009-03-08 23:14:21.000000000 -0400 @@ -146,7 +146,7 @@ static NTSTATUS dcesrv_exchange_ds_rfr_d const struct ndr_interface_table *table; uint16_t opnum; - table = (const struct ndr_interface_table *) dce_call->context->iface->private; + table = (const struct ndr_interface_table *) dce_call->context->iface->private_data; opnum = dce_call->pkt.u.request.opnum; /* Sanity checks */ Index: openchange.spec =================================================================== RCS file: /cvs/pkgs/rpms/openchange/devel/openchange.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openchange.spec 9 Mar 2009 01:38:59 -0000 1.2 +++ openchange.spec 9 Mar 2009 03:19:16 -0000 1.3 @@ -1,6 +1,6 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define samba4_version 4.0.0-1.alpha6 +%define samba4_version 4.0.0-1.alpha7 %define talloc_version 1.2.0 %define nickname ROMULUS @@ -10,7 +10,7 @@ Name: openchange Version: 0.8 -Release: 6%{?dist} +Release: 7%{?dist} Group: Applications/System Summary: Provides access to Microsoft Exchange servers using native protocols License: GPLv3+ and Public Domain @@ -18,6 +18,11 @@ Source0: http://downloads.sourceforge.net/openchange/libmapi-%{version}-%{nickname}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +### Patches ### + +# Samba APIs are still a moving target... +Patch1: libmapi-0.8-ROMULUS-ndr-interface-table.patch + ### Build Dependencies ### BuildRequires: bison @@ -75,6 +80,7 @@ %prep %setup -q -n libmapi-%{version}-%{nickname} +%patch1 -p1 -b .ndr-interface-table %build %configure @@ -147,7 +153,9 @@ %changelog * Sun Mar 08 2009 Matthew Barnes - 0.8-6 +- Fix build breakage. - Explicitly require libldb-devel. +- Bump samba4 requirement to alpha7. * Wed Feb 25 2009 Matthew Barnes - 0.8-5 - Rebuild with correct tarball. --- libmapi-0.8-ROMULUS-include-signal-h.patch DELETED --- From mbarnes at fedoraproject.org Mon Mar 9 03:33:04 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Mon, 9 Mar 2009 03:33:04 +0000 (UTC) Subject: rpms/openchange/devel openchange.spec,1.3,1.4 Message-ID: <20090309033304.21FC270116@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/openchange/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19162 Modified Files: openchange.spec Log Message: Fix release tag. Index: openchange.spec =================================================================== RCS file: /cvs/pkgs/rpms/openchange/devel/openchange.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- openchange.spec 9 Mar 2009 03:19:16 -0000 1.3 +++ openchange.spec 9 Mar 2009 03:32:33 -0000 1.4 @@ -10,7 +10,7 @@ Name: openchange Version: 0.8 -Release: 7%{?dist} +Release: 6%{?dist} Group: Applications/System Summary: Provides access to Microsoft Exchange servers using native protocols License: GPLv3+ and Public Domain From whot at fedoraproject.org Mon Mar 9 04:10:30 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Mon, 9 Mar 2009 04:10:30 +0000 (UTC) Subject: rpms/linuxwacom/devel linuxwacom.spec,1.76,1.77 Message-ID: <20090309041030.B8D9C70116@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/linuxwacom/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29063 Modified Files: linuxwacom.spec Log Message: * Mon Mar 09 2009 Peter Hutterer 0.8.2.2-9 - Remove linuxwacom-0.8.2.2-HAL.patch, obsolete with the hal callout. Index: linuxwacom.spec =================================================================== RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- linuxwacom.spec 7 Mar 2009 17:40:01 -0000 1.76 +++ linuxwacom.spec 9 Mar 2009 04:09:58 -0000 1.77 @@ -3,7 +3,7 @@ # Upstream's versioning is goofy. Note the mapping from tarname to version. Name: linuxwacom Version: 0.8.2.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Wacom Drivers from Linux Wacom Project Group: User Interface/X Hardware Support @@ -17,7 +17,6 @@ Patch3: linuxwacom-0.8.2.1-fix_build.patch Patch4: linuxwacom-0.8.2.2-fix-mapping.patch Patch5: linuxwacom-0.8.2.2-export-module.patch -Patch6: linuxwacom-0.8.2.2-HAL.patch Patch7: linuxwacom-0.8.2.2-wcmMaxX.patch Patch8: linuxwacom-0.8.2.2-hal-setup.patch @@ -52,7 +51,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch7 -p1 %patch8 -p1 @@ -117,7 +115,10 @@ %{_libdir}/libwacomcfg*.so %changelog -* Sat Mar 10 2009 Matthew Garrett 0.8.2.2-8 +* Mon Mar 09 2009 Peter Hutterer 0.8.2.2-9 +- Remove linuxwacom-0.8.2.2-HAL.patch, obsolete with the hal callout. + +* Sat Mar 07 2009 Matthew Garrett 0.8.2.2-8 - linuxwacom-0.8.2.2-hal-setup.patch: Add a hal callout to set up secondary input types - 10-linuxwacom.fdi: Add support for the callout From jstanley at fedoraproject.org Mon Mar 9 04:12:07 2009 From: jstanley at fedoraproject.org (Jon Stanley) Date: Mon, 9 Mar 2009 04:12:07 +0000 (UTC) Subject: rpms/icelandic-fonts/devel icelandic-fonts.spec,1.4,1.5 Message-ID: <20090309041207.37E8270116@cvs1.fedora.phx.redhat.com> Author: jstanley Update of /cvs/pkgs/rpms/icelandic-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29656 Modified Files: icelandic-fonts.spec Log Message: use font_pkg macro again Index: icelandic-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/icelandic-fonts/devel/icelandic-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- icelandic-fonts.spec 25 Feb 2009 06:39:21 -0000 1.4 +++ icelandic-fonts.spec 9 Mar 2009 04:11:36 -0000 1.5 @@ -2,7 +2,7 @@ Name: %{fontname}-fonts Version: 1.001 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Icelandic Magical Staves Group: User Interface/X @@ -47,14 +47,13 @@ %{_bindir}/fc-cache -f %{_fontdir} || : fi -%files -%defattr(644,root,root,755) -%dir %{_fontdir} -%{_fontdir}/*.otf -%doc README.license +%_font_pkg *.otf %changelog +* Sun Mar 8 2009 Jon Stanley - 1.001-6 +- Use font_pkg macro again + * Tue Feb 24 2009 Fedora Release Engineering - 1.001-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jstanley at fedoraproject.org Mon Mar 9 04:15:32 2009 From: jstanley at fedoraproject.org (Jon Stanley) Date: Mon, 9 Mar 2009 04:15:32 +0000 (UTC) Subject: rpms/icelandic-fonts/devel icelandic-fonts.spec,1.5,1.6 Message-ID: <20090309041532.7862270116@cvs1.fedora.phx.redhat.com> Author: jstanley Update of /cvs/pkgs/rpms/icelandic-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30927 Modified Files: icelandic-fonts.spec Log Message: fix having post in specfile Index: icelandic-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/icelandic-fonts/devel/icelandic-fonts.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- icelandic-fonts.spec 9 Mar 2009 04:11:36 -0000 1.5 +++ icelandic-fonts.spec 9 Mar 2009 04:15:02 -0000 1.6 @@ -2,7 +2,7 @@ Name: %{fontname}-fonts Version: 1.001 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Icelandic Magical Staves Group: User Interface/X @@ -37,20 +37,13 @@ %clean rm -fr %{buildroot} -%post -if [ -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache -f %{_fontdir} || : -fi - -%postun -if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache -f %{_fontdir} || : -fi - %_font_pkg *.otf %changelog +* Sun Mar 8 2009 Jon Stanley - 1.001-7 +- Fix including %%post in here from last fix + * Sun Mar 8 2009 Jon Stanley - 1.001-6 - Use font_pkg macro again From bskeggs at fedoraproject.org Mon Mar 9 04:32:26 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Mon, 9 Mar 2009 04:32:26 +0000 (UTC) Subject: rpms/kernel/devel drm-nouveau.patch, 1.18, 1.19 kernel.spec, 1.1395, 1.1396 Message-ID: <20090309043226.45D4570116@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2442 Modified Files: drm-nouveau.patch kernel.spec Log Message: * Mon Mar 09 2009 Ben Skeggs - drm-nouveau.patch: nv50 and kms fixes drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- drm-nouveau.patch 5 Mar 2009 05:52:05 -0000 1.18 +++ drm-nouveau.patch 9 Mar 2009 04:32:25 -0000 1.19 @@ -22,7 +22,7 @@ + userspaces with this enabled will cause pain. + diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile -index 03ceb3e..3df55d7 100644 +index d6788df..97aa0c8 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -27,4 +27,5 @@ obj-$(CONFIG_DRM_I915) += i915/ @@ -32,7 +32,7 @@ +obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/ diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c -index 325b4aa..05e928f 100644 +index 4d2161f..ac503e2 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -51,38 +51,24 @@ resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resour @@ -103,10 +103,10 @@ if (mask & ~fence->type) { DRM_ERROR("Wait trying to extend fence type" diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c -index 7e277c7..e5efd4a 100644 +index 5d45cbf..e3b0a76 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c -@@ -414,14 +414,14 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, +@@ -406,14 +406,14 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, if (dev->driver->load) { ret = dev->driver->load(dev, ent->driver_data); if (ret) @@ -123,7 +123,7 @@ } list_add_tail(&dev->driver_item, &driver->device_list); -@@ -432,8 +432,11 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, +@@ -424,8 +424,11 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, return 0; @@ -136,7 +136,7 @@ err_g2: pci_disable_device(pdev); err_g1: -@@ -515,11 +518,11 @@ void drm_put_dev(struct drm_device *dev) +@@ -507,11 +510,11 @@ void drm_put_dev(struct drm_device *dev) dev->agp = NULL; } @@ -2524,10 +2524,10 @@ +MODULE_LICENSE("GPL and additional rights"); diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h new file mode 100644 -index 0000000..adb7fdb +index 0000000..06e3f9e --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h -@@ -0,0 +1,737 @@ +@@ -0,0 +1,741 @@ +/* + * Copyright 2005 Stephane Marchesin. + * All Rights Reserved. @@ -2773,6 +2773,8 @@ + int (*init)(struct drm_device *); + void (*takedown)(struct drm_device *); + ++ void (*fifo_access)(struct drm_device *, bool); ++ + int (*create_context)(struct nouveau_channel *); + void (*destroy_context)(struct nouveau_channel *); + int (*load_context)(struct nouveau_channel *); @@ -3120,6 +3122,7 @@ +extern void nouveau_nv04_context_switch(struct drm_device *); +extern int nv04_graph_init(struct drm_device *); +extern void nv04_graph_takedown(struct drm_device *); ++extern void nv04_graph_fifo_access(struct drm_device *, bool); +extern int nv04_graph_create_context(struct nouveau_channel *); +extern void nv04_graph_destroy_context(struct nouveau_channel *); +extern int nv04_graph_load_context(struct nouveau_channel *); @@ -3154,6 +3157,7 @@ +/* nv50_graph.c */ +extern int nv50_graph_init(struct drm_device *); +extern void nv50_graph_takedown(struct drm_device *); ++extern void nv50_graph_fifo_access(struct drm_device *, bool); +extern int nv50_graph_create_context(struct nouveau_channel *); +extern void nv50_graph_destroy_context(struct nouveau_channel *); +extern int nv50_graph_load_context(struct nouveau_channel *); @@ -4505,10 +4509,10 @@ +}; diff --git a/drivers/gpu/drm/nouveau/nouveau_fifo.c b/drivers/gpu/drm/nouveau/nouveau_fifo.c new file mode 100644 -index 0000000..b31a000 +index 0000000..469fdf3 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_fifo.c -@@ -0,0 +1,673 @@ +@@ -0,0 +1,676 @@ +/* + * Copyright 2005-2006 Stephane Marchesin + * All Rights Reserved. @@ -4855,6 +4859,7 @@ + return ret; + } + ++ engine->graph.fifo_access(dev, false); + nouveau_wait_for_idle(dev); + + /* disable the fifo caches */ @@ -4910,6 +4915,8 @@ + /* reenable the fifo caches */ + nv_wr32(NV03_PFIFO_CACHES, 1); + ++ engine->graph.fifo_access(dev, true); ++ + if (dev_priv->mm_enabled) { + ret = nouveau_dma_channel_setup(chan); + if (ret) { @@ -5184,10 +5191,10 @@ +int nouveau_max_ioctl = DRM_ARRAY_SIZE(nouveau_ioctls); diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c new file mode 100644 -index 0000000..7abee4c +index 0000000..94a2dab --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c -@@ -0,0 +1,714 @@ +@@ -0,0 +1,716 @@ +/* + * Copyright (C) 2008 Ben Skeggs. + * All Rights Reserved. @@ -5265,6 +5272,8 @@ + flags = DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE; + flags |= DRM_BO_FLAG_MAPPABLE; + flags |= DRM_BO_FLAG_MEM_LOCAL; ++ if (dev_priv->gart_info.type != NOUVEAU_GART_AGP) ++ flags |= DRM_BO_FLAG_CACHED; + + size = (size + (PAGE_SIZE-1)) & ~(PAGE_SIZE-1); + if (dev_priv->card_type == NV_50) { @@ -7857,10 +7866,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c new file mode 100644 -index 0000000..48ff77e +index 0000000..068797b --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_object.c -@@ -0,0 +1,1229 @@ +@@ -0,0 +1,1237 @@ +/* + * Copyright (C) 2006 Ben Skeggs. + * @@ -8212,6 +8221,7 @@ + struct drm_nouveau_private *dev_priv = dev->dev_private; + struct nouveau_engine *engine = &dev_priv->engine; + struct nouveau_gpuobj *gpuobj; ++ int i; + + DRM_DEBUG("gpuobj %p\n", pgpuobj ? *pgpuobj : NULL); + @@ -8224,6 +8234,13 @@ + return -EINVAL; + } + ++ if (gpuobj->flags & NVOBJ_FLAG_ZERO_FREE) { ++ engine->instmem.prepare_access(dev, true); ++ for (i = 0; i < gpuobj->im_pramin->size; i += 4) ++ INSTANCE_WR(gpuobj, i/4, 0); ++ engine->instmem.finish_access(dev); ++ } ++ + if (gpuobj->dtor) + gpuobj->dtor(dev, gpuobj); + @@ -9092,7 +9109,7 @@ +} diff --git a/drivers/gpu/drm/nouveau/nouveau_reg.h b/drivers/gpu/drm/nouveau/nouveau_reg.h new file mode 100644 -index 0000000..510b528 +index 0000000..44337e6 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_reg.h @@ -0,0 +1,835 @@ @@ -9902,7 +9919,7 @@ +# define NV50_PDISPLAY_DAC_REGS_CLK_CTRL1_CONNECTED__SHIFT 9 + +# define NV50_PDISPLAY_SOR_REGS 0x0061c000 -+# define NV50_PDISPLAY_SOR_REGS__LEN 0x2 ++# define NV50_PDISPLAY_SOR_REGS__LEN 0x3 +# define NV50_PDISPLAY_SOR_REGS__ESIZE 0x800 +# define NV50_PDISPLAY_SOR_REGS_DPMS_CTRL(i) (0x0061c004+(i)*0x800) +# define NV50_PDISPLAY_SOR_REGS_DPMS_CTRL_ON (1<<0) @@ -10301,10 +10318,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c new file mode 100644 -index 0000000..6b7fed1 +index 0000000..52036d5 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_state.c -@@ -0,0 +1,942 @@ +@@ -0,0 +1,948 @@ +/* + * Copyright 2005 Stephane Marchesin + * Copyright 2008 Stuart Bennett @@ -10367,6 +10384,7 @@ + engine->fb.takedown = nv04_fb_takedown; + engine->graph.init = nv04_graph_init; + engine->graph.takedown = nv04_graph_takedown; ++ engine->graph.fifo_access = nv04_graph_fifo_access; + engine->graph.create_context = nv04_graph_create_context; + engine->graph.destroy_context = nv04_graph_destroy_context; + engine->graph.load_context = nv04_graph_load_context; @@ -10400,6 +10418,7 @@ + engine->graph.takedown = nv10_graph_takedown; + engine->graph.create_context = nv10_graph_create_context; + engine->graph.destroy_context = nv10_graph_destroy_context; ++ engine->graph.fifo_access = nv04_graph_fifo_access; + engine->graph.load_context = nv10_graph_load_context; + engine->graph.save_context = nv10_graph_save_context; + engine->fifo.channels = 32; @@ -10431,6 +10450,7 @@ + engine->graph.takedown = nv20_graph_takedown; + engine->graph.create_context = nv20_graph_create_context; + engine->graph.destroy_context = nv20_graph_destroy_context; ++ engine->graph.fifo_access = nv04_graph_fifo_access; + engine->graph.load_context = nv20_graph_load_context; + engine->graph.save_context = nv20_graph_save_context; + engine->fifo.channels = 32; @@ -10460,6 +10480,7 @@ + engine->fb.takedown = nv10_fb_takedown; + engine->graph.init = nv30_graph_init; + engine->graph.takedown = nv20_graph_takedown; ++ engine->graph.fifo_access = nv04_graph_fifo_access; + engine->graph.create_context = nv20_graph_create_context; + engine->graph.destroy_context = nv20_graph_destroy_context; + engine->graph.load_context = nv20_graph_load_context; @@ -10492,6 +10513,7 @@ + engine->fb.takedown = nv40_fb_takedown; + engine->graph.init = nv40_graph_init; + engine->graph.takedown = nv40_graph_takedown; ++ engine->graph.fifo_access = nv04_graph_fifo_access; + engine->graph.create_context = nv40_graph_create_context; + engine->graph.destroy_context = nv40_graph_destroy_context; + engine->graph.load_context = nv40_graph_load_context; @@ -10526,6 +10548,7 @@ + engine->fb.takedown = nouveau_stub_takedown; + engine->graph.init = nv50_graph_init; + engine->graph.takedown = nv50_graph_takedown; ++ engine->graph.fifo_access = nv50_graph_fifo_access; + engine->graph.create_context = nv50_graph_create_context; + engine->graph.destroy_context = nv50_graph_destroy_context; + engine->graph.load_context = nv50_graph_load_context; @@ -11667,10 +11690,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c new file mode 100644 -index 0000000..62ef1cf +index 0000000..5f923ef --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv04_graph.c -@@ -0,0 +1,516 @@ +@@ -0,0 +1,527 @@ +/* + * Copyright 2007 Stephane Marchesin + * All Rights Reserved. @@ -12175,7 +12198,6 @@ + + nv_wr32(NV04_PGRAPH_STATE , 0xFFFFFFFF); + nv_wr32(NV04_PGRAPH_CTX_CONTROL , 0x10010100); -+ nv_wr32(NV04_PGRAPH_FIFO , 0x00000001); + + /* These don't belong here, they're part of a per-channel context */ + nv_wr32(NV04_PGRAPH_PATTERN_SHAPE, 0x00000000); @@ -12187,6 +12209,18 @@ +void nv04_graph_takedown(struct drm_device *dev) +{ +} ++ ++void ++nv04_graph_fifo_access(struct drm_device *dev, bool enabled) ++{ ++ struct drm_nouveau_private *dev_priv = dev->dev_private; ++ ++ if (enabled) ++ nv_wr32(NV04_PGRAPH_FIFO, nv_rd32(NV04_PGRAPH_FIFO) | 1); ++ else ++ nv_wr32(NV04_PGRAPH_FIFO, nv_rd32(NV04_PGRAPH_FIFO) & ~1); ++} ++ diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c new file mode 100644 index 0000000..a83d271 @@ -12686,10 +12720,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv10_graph.c b/drivers/gpu/drm/nouveau/nv10_graph.c new file mode 100644 -index 0000000..791e08b +index 0000000..6a8c270 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv10_graph.c -@@ -0,0 +1,914 @@ +@@ -0,0 +1,913 @@ +/* + * Copyright 2007 Matthieu CASTET + * All Rights Reserved. @@ -13596,7 +13630,6 @@ + nv_wr32(NV10_PGRAPH_CTX_SWITCH4, 0x00000000); + nv_wr32(NV10_PGRAPH_CTX_CONTROL, 0x10010100); + nv_wr32(NV10_PGRAPH_STATE , 0xFFFFFFFF); -+ nv_wr32(NV04_PGRAPH_FIFO , 0x00000001); + + return 0; +} @@ -13606,10 +13639,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv20_graph.c b/drivers/gpu/drm/nouveau/nv20_graph.c new file mode 100644 -index 0000000..b8e138e +index 0000000..adbd389 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv20_graph.c -@@ -0,0 +1,917 @@ +@@ -0,0 +1,915 @@ +#include "drmP.h" +#include "drm.h" +#include "nouveau_drv.h" @@ -14380,7 +14413,6 @@ + + nv_wr32(NV10_PGRAPH_CTX_CONTROL, 0x10000100); + nv_wr32(NV10_PGRAPH_STATE , 0xFFFFFFFF); -+ nv_wr32(NV04_PGRAPH_FIFO , 0x00000001); + + tmp = nv_rd32(NV10_PGRAPH_SURFACE) & 0x0007ff00; + nv_wr32(NV10_PGRAPH_SURFACE, tmp); @@ -14491,7 +14523,6 @@ + nv_wr32(NV10_PGRAPH_CTX_CONTROL, 0x10000100); + nv_wr32(NV10_PGRAPH_STATE , 0xFFFFFFFF); + nv_wr32(0x0040075c , 0x00000001); -+ nv_wr32(NV04_PGRAPH_FIFO , 0x00000001); + + /* begin RAM config */ +// vramsz = drm_get_resource_len(dev, 0) - 1; @@ -14821,10 +14852,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c new file mode 100644 -index 0000000..31147ef +index 0000000..710a9a9 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv40_graph.c -@@ -0,0 +1,2192 @@ +@@ -0,0 +1,2191 @@ +/* + * Copyright (C) 2007 Ben Skeggs. + * All Rights Reserved. @@ -16839,7 +16870,6 @@ + + nv_wr32(NV10_PGRAPH_CTX_CONTROL, 0x10010100); + nv_wr32(NV10_PGRAPH_STATE , 0xFFFFFFFF); -+ nv_wr32(NV04_PGRAPH_FIFO , 0x00000001); + + j = nv_rd32(0x1540) & 0xff; + if (j) { @@ -17661,10 +17691,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c new file mode 100644 -index 0000000..5e6be22 +index 0000000..340e772 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c -@@ -0,0 +1,776 @@ +@@ -0,0 +1,775 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -17739,7 +17769,6 @@ + } + break; + default: -+ DRM_INFO("load 24bpp\n"); + /* R8G8B8 */ + for (i = 0; i < 256; i++) { + writew(crtc->lut.r[i] >> 2, lut + 8*i + 0); @@ -18987,10 +19016,10 @@ + diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c new file mode 100644 -index 0000000..5bd41ef +index 0000000..0e9fd37 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_display.c -@@ -0,0 +1,441 @@ +@@ -0,0 +1,442 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -19052,6 +19081,7 @@ + /* SOR */ + nv_wr32(0x006101e0 + 0 * 0x4, nv_rd32(0x0061c000 + 0 * 0x800)); + nv_wr32(0x006101e0 + 1 * 0x4, nv_rd32(0x0061c000 + 1 * 0x800)); ++ nv_wr32(0x006101e0 + 2 * 0x4, nv_rd32(0x0061c000 + 2 * 0x800)); + /* Something not yet in use, tv-out maybe. */ + nv_wr32(0x006101f0 + 0 * 0x4, nv_rd32(0x0061e000 + 0 * 0x800)); + nv_wr32(0x006101f0 + 1 * 0x4, nv_rd32(0x0061e000 + 1 * 0x800)); @@ -19196,7 +19226,7 @@ + } +#endif + -+ for (i = 0; i < 2; i++) { ++ for (i = 0; i < NV50_PDISPLAY_SOR_REGS__LEN; i++) { + if (!nv_wait(NV50_PDISPLAY_SOR_REGS_DPMS_STATE(i), + NV50_PDISPLAY_SOR_REGS_DPMS_STATE_WAIT, 0)) { + DRM_ERROR("timeout: SOR_DPMS_STATE_WAIT(%d) == 0\n", i); @@ -20267,10 +20297,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c new file mode 100644 -index 0000000..b892830 +index 0000000..30246c2 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_graph.c -@@ -0,0 +1,333 @@ +@@ -0,0 +1,345 @@ +/* + * Copyright (C) 2007 Ben Skeggs. + * All Rights Reserved. @@ -20344,7 +20374,7 @@ + nv_wr32(0x400108, 0xffffffff); + + nv_wr32(0x400824, 0x00004000); -+ nv_wr32(0x400500, 0x00010001); ++ nv_wr32(0x400500, 0x00000000); +} + +static void @@ -20417,9 +20447,9 @@ + DRM_DEBUG("\n"); + + nv50_graph_init_reset(dev); -+ nv50_graph_init_intr(dev); + nv50_graph_init_regs__nv(dev); + nv50_graph_init_regs(dev); ++ nv50_graph_init_intr(dev); + + ret = nv50_graph_init_ctxctl(dev); + if (ret) @@ -20434,6 +20464,18 @@ + DRM_DEBUG("\n"); +} + ++void ++nv50_graph_fifo_access(struct drm_device *dev, bool enabled) ++{ ++ struct drm_nouveau_private *dev_priv = dev->dev_private; ++ const uint32_t mask = 0x00010001; ++ ++ if (enabled) ++ nv_wr32(0x400500, nv_rd32(0x400500) | mask); ++ else ++ nv_wr32(0x400500, nv_rd32(0x400500) & ~mask); ++} ++ +int +nv50_graph_create_context(struct nouveau_channel *chan) +{ Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1395 retrieving revision 1.1396 diff -u -r1.1395 -r1.1396 --- kernel.spec 9 Mar 2009 03:11:27 -0000 1.1395 +++ kernel.spec 9 Mar 2009 04:32:25 -0000 1.1396 @@ -1810,6 +1810,9 @@ # and build. %changelog +* Mon Mar 09 2009 Ben Skeggs +- drm-nouveau.patch: nv50 and kms fixes + * Mon Mar 09 2009 Dave Airlie - drm-next.patch: fixes from upstream queue for r600 support - drm-modesetting-radeon.patch: make 2D/3D on PCIE faster From jstanley at fedoraproject.org Mon Mar 9 04:40:51 2009 From: jstanley at fedoraproject.org (Jon Stanley) Date: Mon, 9 Mar 2009 04:40:51 +0000 (UTC) Subject: rpms/brettfont-fonts/devel brettfont-fonts.spec,1.4,1.5 Message-ID: <20090309044051.19C1070116@cvs1.fedora.phx.redhat.com> Author: jstanley Update of /cvs/pkgs/rpms/brettfont-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4193 Modified Files: brettfont-fonts.spec Log Message: update to new packaging guidelines Index: brettfont-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/brettfont-fonts/devel/brettfont-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- brettfont-fonts.spec 24 Feb 2009 05:49:03 -0000 1.4 +++ brettfont-fonts.spec 9 Mar 2009 04:40:20 -0000 1.5 @@ -1,6 +1,4 @@ -%define fontname brettfont -%define fontdir %{_datadir}/fonts/%{fontname} -%define fontconfdir %{_sysconfdir}/fonts/conf.d +%define fontname brettfont Name: %{fontname}-fonts Version: 20080506 @@ -13,47 +11,42 @@ Source0: BrettFont1.1.ttf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + BuildArch: noarch +BuildRequires: fontpackages-devel +Requires: fontpackages-filesystem %description A handwriting font made by Brett Alton. + %prep %build %install -rm -rf $RPM_BUILD_ROOT - -install -dm 755 $RPM_BUILD_ROOT%{fontdir} -install -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{fontdir}/brettfont.ttf +rm -fr %{buildroot} +install -m 0755 -d %{buildroot}%{_fontdir} +install -m 0644 -p %{SOURCE0} %{buildroot}%{_fontdir}/brettfont.ttf %clean -rm -rf $RPM_BUILD_ROOT - +rm -fr %{buildroot} -%post -if [ -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache -f %{fontdir} || : -fi -%postun -if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache -f %{fontdir} || : -fi +%_font_pkg *.ttf - -%files -%defattr(644,root,root,755) %doc -%dir %{fontdir}/ -%{fontdir}/*.ttf + +%dir %{_fontdir} %changelog +* Sun Mar 8 2009 Jon Stanley - 20080506-5 +- Update to new packaging guidelines + * Mon Feb 23 2009 Fedora Release Engineering - 20080506-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -71,3 +64,4 @@ * Mon May 05 2008 Jon Stanley - 1.0-1 - Initial package + From bskeggs at fedoraproject.org Mon Mar 9 04:41:03 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Mon, 9 Mar 2009 04:41:03 +0000 (UTC) Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.14, 1.15 nouveau-fedora.patch, 1.4, 1.5 sources, 1.15, 1.16 xorg-x11-drv-nouveau.spec, 1.20, 1.21 Message-ID: <20090309044103.C886170116@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4271 Modified Files: .cvsignore nouveau-fedora.patch sources xorg-x11-drv-nouveau.spec Log Message: * Mon Mar 09 2009 Ben Skeggs 0.0.12-9.20090309gited9bd88 - upstream update, fixes - store used vbios image in /var/run, will potentially help debugging later Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 5 Mar 2009 06:07:55 -0000 1.14 +++ .cvsignore 9 Mar 2009 04:40:32 -0000 1.15 @@ -1 +1 @@ -xf86-video-nouveau-0.0.12-20090305git42f99e6.tar.bz2 +xf86-video-nouveau-0.0.12-20090309gited9bd88.tar.bz2 nouveau-fedora.patch: Index: nouveau-fedora.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fedora.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nouveau-fedora.patch 5 Mar 2009 06:07:55 -0000 1.4 +++ nouveau-fedora.patch 9 Mar 2009 04:40:33 -0000 1.5 @@ -11,7 +11,7 @@ nouveau_output.h \ nouveau_connector.h \ diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index ddb6aef..ca229db 100644 +index 081d194..ca229db 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -127,6 +127,50 @@ drmmode_crtc_dpms(xf86CrtcPtr drmmode_crtc, int mode) @@ -87,49 +87,6 @@ ret = drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, fb_id, x, y, output_ids, output_count, &kmode); if (ret) -@@ -370,8 +420,6 @@ drmmode_gamma_set(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue, - drmmode_ptr drmmode = drmmode_crtc->drmmode; - int ret; - -- return; -- - ret = drmModeCrtcSetGamma(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, - size, red, green, blue); - if (ret != 0) { -@@ -519,7 +567,32 @@ drmmode_output_destroy(xf86OutputPtr output) - static void - drmmode_output_dpms(xf86OutputPtr output, int mode) - { -- return; -+ drmmode_output_private_ptr drmmode_output = output->driver_private; -+ drmModeConnectorPtr koutput = drmmode_output->mode_output; -+ drmModePropertyPtr props; -+ drmmode_ptr drmmode = drmmode_output->drmmode; -+ int mode_id = -1, i; -+ -+ if (!NVPTR(output->scrn)->allow_dpms) -+ return; -+ -+ for (i = 0; i < koutput->count_props; i++) { -+ props = drmModeGetProperty(drmmode->fd, koutput->props[i]); -+ if (props && (props->flags && DRM_MODE_PROP_ENUM)) { -+ if (!strcmp(props->name, "DPMS")) { -+ mode_id = koutput->props[i]; -+ drmModeFreeProperty(props); -+ break; -+ } -+ drmModeFreeProperty(props); -+ } -+ } -+ -+ if (mode_id < 0) -+ return; -+ -+ drmModeConnectorSetProperty(drmmode->fd, koutput->connector_id, -+ mode_id, mode); - } - - /* diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c index 93fc3c5..6854b68 100644 --- a/src/nouveau_exa.c @@ -500,6 +457,45 @@ + + return true; +} +diff --git a/src/nv_bios.c b/src/nv_bios.c +index 9f4b665..68bc296 100644 +--- a/src/nv_bios.c ++++ b/src/nv_bios.c +@@ -22,6 +22,9 @@ + * SOFTWARE. + */ + ++#include ++#include ++#include + #include "nv_include.h" + + #if defined(__FreeBSD__) || defined(__NetBSD__) +@@ -4855,7 +4858,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn) + + bool NVInitVBIOS(ScrnInfoPtr pScrn) + { ++ NVPtr pNv = NVPTR(pScrn); + struct nvbios *bios = &NVPTR(pScrn)->VBIOS; ++ char img[128]; ++ int fd; + + memset(bios, 0, sizeof(struct nvbios)); + +@@ -4866,6 +4872,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn) + if (bios->length > NV_PROM_SIZE) + bios->length = NV_PROM_SIZE; + ++ sprintf(img, "/var/run/nv%02x_%04x.rom", pNv->NVArch, pNv->Chipset); ++ fd = open(img, O_CREAT|O_RDWR|O_EXCL, 0700); ++ if (fd >= 0) { ++ write(fd, bios->data, bios->length); ++ close(fd); ++ } ++ + return true; + } + diff --git a/src/nv_dri.c b/src/nv_dri.c index 796df9b..ac7022b 100644 --- a/src/nv_dri.c @@ -514,7 +510,7 @@ /* back/depth buffers will likely be allocated on a per-drawable * basis, but these may be useful if we want to support shared back diff --git a/src/nv_driver.c b/src/nv_driver.c -index d7e8025..42df24a 100644 +index b4739fa..42df24a 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -1583,6 +1583,8 @@ NVMapMemSW(ScrnInfoPtr pScrn) @@ -596,18 +592,7 @@ } if (!pNv->randr12_enable) { -@@ -2099,8 +2125,10 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (!NV50AcquireDisplay(pScrn)) - return FALSE; - -+ pNv->allow_dpms = FALSE; - if (!xf86SetDesiredModes(pScrn)) - return FALSE; -+ pNv->allow_dpms = TRUE; - } - - /* Darken the screen for aesthetic reasons */ -@@ -2295,6 +2323,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode) +@@ -2297,6 +2323,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode) bool on = xf86IsUnblank(mode); int i; @@ -624,10 +609,10 @@ return vgaHWSaveScreen(pScreen, mode); diff --git a/src/nv_proto.h b/src/nv_proto.h -index 28605a8..dd2be16 100644 +index 69ef280..e70b256 100644 --- a/src/nv_proto.h +++ b/src/nv_proto.h -@@ -280,6 +280,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool); +@@ -279,6 +279,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool); int nv50_xv_port_attribute_set(ScrnInfoPtr, Atom, INT32, pointer); int nv50_xv_port_attribute_get(ScrnInfoPtr, Atom, INT32 *, pointer); @@ -639,10 +624,10 @@ #ifndef exaMoveInPixmap extern void exaMoveInPixmap(PixmapPtr pPixmap); diff --git a/src/nv_type.h b/src/nv_type.h -index db5023f..70b806b 100644 +index b8031e3..e67c75a 100644 --- a/src/nv_type.h +++ b/src/nv_type.h -@@ -269,6 +269,7 @@ typedef struct _NVRec { +@@ -270,6 +270,7 @@ typedef struct _NVRec { /* Various pinned memory regions */ struct nouveau_bo * FB; void * FBMap; @@ -650,7 +635,7 @@ //struct nouveau_bo * FB_old; /* for KMS */ struct nouveau_bo * shadow[2]; /* for easy acces by exa */ struct nouveau_bo * Cursor; -@@ -277,6 +278,9 @@ typedef struct _NVRec { +@@ -278,6 +279,9 @@ typedef struct _NVRec { struct nvbios VBIOS; struct nouveau_bios_info *vbios; @@ -660,11 +645,3 @@ Bool NoAccel; Bool HWCursor; Bool FpScale; -@@ -355,6 +359,7 @@ typedef struct _NVRec { - - #ifdef XF86DRM_MODE - void *drmmode; /* for KMS */ -+ Bool allow_dpms; - #endif - - nouveauCrtcPtr crtc[2]; Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 5 Mar 2009 06:07:55 -0000 1.15 +++ sources 9 Mar 2009 04:40:33 -0000 1.16 @@ -1 +1 @@ -062620c6fa226f2515dbd75d38f67c8c xf86-video-nouveau-0.0.12-20090305git42f99e6.tar.bz2 +d593198e6802afaff49fb1619f949d72 xf86-video-nouveau-0.0.12-20090309gited9bd88.tar.bz2 Index: xorg-x11-drv-nouveau.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xorg-x11-drv-nouveau.spec 5 Mar 2009 06:07:55 -0000 1.20 +++ xorg-x11-drv-nouveau.spec 9 Mar 2009 04:40:33 -0000 1.21 @@ -7,8 +7,8 @@ # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2 -%define gitdate 20090305 -%define git_version 42f99e6 +%define gitdate 20090309 +%define git_version ed9bd88 %define snapshot %{gitdate}git%{git_version} @@ -19,7 +19,7 @@ # need to set an epoch to get version number in sync with upstream Epoch: 1 Version: %{nouveau_version} -Release: 8.%{snapshot}%{?dist} +Release: 9.%{snapshot}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -75,6 +75,10 @@ %{_mandir}/man4/nouveau.4* %changelog +* Mon Mar 09 2009 Ben Skeggs 0.0.12-9.20090309gited9bd88 +- upstream update, fixes +- store used vbios image in /var/run, will potentially help debugging later + * Thu Mar 05 2009 Ben Skeggs 0.0.12-8.20090305git42f99e6 - upstream update, fixes - kms: support gamma and dpms calls From jstanley at fedoraproject.org Mon Mar 9 04:42:25 2009 From: jstanley at fedoraproject.org (Jon Stanley) Date: Mon, 9 Mar 2009 04:42:25 +0000 (UTC) Subject: rpms/brettfont-fonts/devel brettfont-fonts.spec,1.5,1.6 Message-ID: <20090309044225.29D2B70119@cvs1.fedora.phx.redhat.com> Author: jstanley Update of /cvs/pkgs/rpms/brettfont-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4628 Modified Files: brettfont-fonts.spec Log Message: actually bump release, not just make changelog entry for it :) Index: brettfont-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/brettfont-fonts/devel/brettfont-fonts.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- brettfont-fonts.spec 9 Mar 2009 04:40:20 -0000 1.5 +++ brettfont-fonts.spec 9 Mar 2009 04:41:54 -0000 1.6 @@ -2,7 +2,7 @@ Name: %{fontname}-fonts Version: 20080506 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A handwriting font Group: User Interface/X From pkgdb at fedoraproject.org Mon Mar 9 04:46:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 04:46:30 +0000 Subject: [pkgdb] p0rn-comfort: ynemoy has requested watchbugzilla Message-ID: <20090309044729.B0BE32082B2@bastion.fedora.phx.redhat.com> ynemoy has requested the watchbugzilla acl on p0rn-comfort (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 04:46:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 04:46:32 +0000 Subject: [pkgdb] p0rn-comfort: ynemoy has given up watchbugzilla Message-ID: <20090309044734.5DDEE20854A@bastion.fedora.phx.redhat.com> ynemoy has given up the watchbugzilla acl on p0rn-comfort (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 04:47:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 04:47:41 +0000 Subject: [pkgdb] p0rn-comfort: ynemoy has requested watchbugzilla Message-ID: <20090309044741.C10812082B2@bastion.fedora.phx.redhat.com> ynemoy has requested the watchbugzilla acl on p0rn-comfort (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 04:47:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 04:47:44 +0000 Subject: [pkgdb] p0rn-comfort: ynemoy has requested watchcommits Message-ID: <20090309044742.3FCFE208602@bastion.fedora.phx.redhat.com> ynemoy has requested the watchcommits acl on p0rn-comfort (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 04:47:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 04:47:46 +0000 Subject: [pkgdb] p0rn-comfort: ynemoy has requested commit Message-ID: <20090309044744.8941F2086EF@bastion.fedora.phx.redhat.com> ynemoy has requested the commit acl on p0rn-comfort (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 04:47:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 04:47:26 +0000 Subject: [pkgdb] p0rn-comfort: ynemoy has requested approveacls Message-ID: <20090309044747.75989208705@bastion.fedora.phx.redhat.com> ynemoy has requested the approveacls acl on p0rn-comfort (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 04:48:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 04:48:50 +0000 Subject: [pkgdb] p0rn-comfort: ynemoy has requested watchbugzilla Message-ID: <20090309044850.8D77D208549@bastion.fedora.phx.redhat.com> ynemoy has requested the watchbugzilla acl on p0rn-comfort (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 04:48:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 04:48:30 +0000 Subject: [pkgdb] p0rn-comfort: ynemoy has requested watchcommits Message-ID: <20090309044851.2A7EA208550@bastion.fedora.phx.redhat.com> ynemoy has requested the watchcommits acl on p0rn-comfort (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 04:48:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 04:48:54 +0000 Subject: [pkgdb] p0rn-comfort: ynemoy has requested commit Message-ID: <20090309044853.00295208557@bastion.fedora.phx.redhat.com> ynemoy has requested the commit acl on p0rn-comfort (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 04:48:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 04:48:53 +0000 Subject: [pkgdb] p0rn-comfort: ynemoy has requested approveacls Message-ID: <20090309044853.730C820860F@bastion.fedora.phx.redhat.com> ynemoy has requested the approveacls acl on p0rn-comfort (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 04:48:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 04:48:38 +0000 Subject: [pkgdb] p0rn-comfort: ynemoy has requested watchbugzilla Message-ID: <20090309044858.A14CE208770@bastion.fedora.phx.redhat.com> ynemoy has requested the watchbugzilla acl on p0rn-comfort (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 04:49:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 04:49:01 +0000 Subject: [pkgdb] p0rn-comfort: ynemoy has requested commit Message-ID: <20090309044859.56DC82087F9@bastion.fedora.phx.redhat.com> ynemoy has requested the commit acl on p0rn-comfort (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 04:49:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 04:49:02 +0000 Subject: [pkgdb] p0rn-comfort: ynemoy has requested approveacls Message-ID: <20090309044902.C2AE52086F1@bastion.fedora.phx.redhat.com> ynemoy has requested the approveacls acl on p0rn-comfort (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 04:48:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 04:48:43 +0000 Subject: [pkgdb] p0rn-comfort: ynemoy has requested watchcommits Message-ID: <20090309044904.3DE36300009@bastion.fedora.phx.redhat.com> ynemoy has requested the watchcommits acl on p0rn-comfort (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From jstanley at fedoraproject.org Mon Mar 9 05:06:48 2009 From: jstanley at fedoraproject.org (Jon Stanley) Date: Mon, 9 Mar 2009 05:06:48 +0000 (UTC) Subject: rpms/roadstencil-fonts/devel roadstencil-fonts.spec,1.5,1.6 Message-ID: <20090309050648.E104170116@cvs1.fedora.phx.redhat.com> Author: jstanley Update of /cvs/pkgs/rpms/roadstencil-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11016 Modified Files: roadstencil-fonts.spec Log Message: update to new guidelines Index: roadstencil-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/roadstencil-fonts/devel/roadstencil-fonts.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- roadstencil-fonts.spec 25 Feb 2009 20:11:21 -0000 1.5 +++ roadstencil-fonts.spec 9 Mar 2009 05:06:18 -0000 1.6 @@ -1,64 +1,60 @@ -%define fontname roadstencil -%define fontdir %{_datadir}/fonts/%{fontname} -%define fontconfdir %{_sysconfdir}/fonts/conf.d +%define fontname roadstencil +%define fontconf 63-%{fontname}.conf Name: %{fontname}-fonts Version: 1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Roadstencil Fonts Group: User Interface/X License: OFL URL: http://openfontlibrary.org/media/files/andyfitz/237 Source0: http://openfontlibrary.org/people/andyfitz/andyfitz_-_roadstencil.otf -Source1: %{fontname}-fontconfig.conf +Source1: %{fontname}-fontconfig.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: fontpackages-devel +Requires: fontpackages-filesystem %description A rough font influenced by roadwork stencils %prep -cp -p %{SOURCE0} $RPM_BUILD_DIR/roadstencil.otf %build %install -rm -rf $RPM_BUILD_ROOT +rm -fr %{buildroot} -install -dm 755 $RPM_BUILD_ROOT%{fontdir} -install -pm 644 *.otf $RPM_BUILD_ROOT%{fontdir} +install -m 0755 -d %{buildroot}%{_fontdir} +install -m 0644 -p %{SOURCE0} %{buildroot}%{_fontdir}/roadstencil.otf -install -dm 755 $RPM_BUILD_ROOT%{fontconfdir} -install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{fontconfdir}/63-%{fontname}.conf +install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ + %{buildroot}%{_fontconfig_confdir} - -%clean -rm -rf $RPM_BUILD_ROOT +install -m 0644 -p %{SOURCE1} \ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf} +ln -s %{_fontconfig_templatedir}/%{fontconf} \ + %{buildroot}%{_fontconfig_confdir}/%{fontconf} -%post -if [ -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache -f %{fontdir} || : -fi +%clean +rm -fr %{buildroot} -%postun -if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache -f %{fontdir} || : -fi +%_font_pkg -f %{fontconf} *.otf -%files -%defattr(644,root,root,755) %doc -%dir %{fontdir}/ -%{fontdir}/*.otf -%config(noreplace) %{fontconfdir}/63-%{fontname}.conf + +%dir %{_fontdir} %changelog +* Sun Mar 8 2009 Jon Stanley - 1.0-7 +- Update for new guidelines + * Wed Feb 25 2009 Fedora Release Engineering - 1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -76,3 +72,4 @@ * Sun May 04 2008 Jon Stanley - 1.0-1 - Initial package + From petersen at fedoraproject.org Mon Mar 9 05:11:27 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 9 Mar 2009 05:11:27 +0000 (UTC) Subject: rpms/ghc-ghc-paths/devel ghc-ghc-paths.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309051127.57D2C70116@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc-ghc-paths/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12300 Modified Files: .cvsignore sources Added Files: ghc-ghc-paths.spec Log Message: import package renamed from ghc-paths --- NEW FILE ghc-ghc-paths.spec --- %global pkg_name ghc-paths %global ghc_version 6.10.1 %global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version} %global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version} %bcond_without doc %bcond_without prof # ghc does not emit debug information %global debug_package %{nil} Name: ghc-%{pkg_name} Version: 0.1.0.5 Release: 5%{?dist} Summary: Interface to GHC's installation directories Group: Development/Libraries License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc = %{ghc_version} %if %{with doc} BuildRequires: ghc-doc = %{ghc_version} %endif %if %{with prof} BuildRequires: ghc-prof = %{ghc_version} %endif %description This package provides the Haskell %{pkg_name} library for ghc. %package devel Summary: Haskell %{pkg_name} library Group: Development/Libraries Requires: ghc = %{ghc_version} Requires(post): ghc = %{ghc_version} Requires(preun): ghc = %{ghc_version} Obsoletes: ghc-paths < 0.1.0.5-5 %description devel This library provides an interface to reading the install directories of the ghc compiler. %if %{with doc} %package doc Summary: Documentation for %{name} Group: Development/Libraries Requires: ghc-doc = %{ghc_version} Requires(post): ghc-doc = %{ghc_version} Requires(postun): ghc-doc = %{ghc_version} Obsoletes: ghc-paths-doc < 0.1.0.5-5 %description doc This package contains development documentation files for the %{name} library. %endif %if %{with prof} %package prof Summary: Profiling libraries for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: ghc-prof = %{ghc_version} Obsoletes: ghc-paths-prof < 0.1.0.5-5 %description prof This package contains profiling libraries for %{name}. %endif %prep %setup -q -n %{pkg_name}-%{version} %build %cabal_configure --ghc %{!?without_prof:-p} %cabal build %if %{with doc} %cabal haddock %endif %ghc_gen_scripts %install rm -rf $RPM_BUILD_ROOT %cabal_install %ghc_install_scripts %ghc_gen_filelists %{name} %clean rm -rf $RPM_BUILD_ROOT %post devel %ghc_register_pkg %if %{with doc} %post doc %ghc_reindex_haddock %endif %preun devel if [ "$1" -eq 0 ] ; then %ghc_unregister_pkg fi %if %{with doc} %postun doc if [ "$1" -eq 0 ] ; then %ghc_reindex_haddock fi %endif %files devel -f %{name}-devel.files %defattr(-,root,root,-) %{_docdir}/%{name}-%{version} %if %{with doc} %files doc %defattr(-,root,root,-) %{pkg_docdir} %endif %if %{with prof} %files prof -f %{name}-prof.files %defattr(-,root,root,-) %endif %changelog * Mon Mar 9 2009 Jens Petersen - 0.1.0.5-5 - package renamed from ghc-paths - update to cabal2spec-0.12 * Tue Feb 24 2009 Fedora Release Engineering - 0.1.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Fri Feb 13 2009 Jens Petersen - 0.1.0.5-3 - update to latest packaging template: use bcond and add doc subpackage * Tue Dec 23 2008 Jens Petersen - 0.1.0.5-2 - improve summary and description (#476483) * Mon Dec 15 2008 Jens Petersen - 0.1.0.5-1 - initial packaging for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ghc-ghc-paths/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 03:11:44 -0000 1.1 +++ .cvsignore 9 Mar 2009 05:10:56 -0000 1.2 @@ -0,0 +1 @@ +ghc-paths-0.1.0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghc-ghc-paths/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 03:11:44 -0000 1.1 +++ sources 9 Mar 2009 05:10:56 -0000 1.2 @@ -0,0 +1 @@ +8fdc122e65845d2d53734f78e22c5155 ghc-paths-0.1.0.5.tar.gz From petersen at fedoraproject.org Mon Mar 9 05:22:44 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 9 Mar 2009 05:22:44 +0000 (UTC) Subject: rpms/ghc-paths/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE ghc-paths.spec, 1.3, NONE import.log, 1.1, NONE sources, 1.2, NONE Message-ID: <20090309052244.A875E70116@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ghc-paths/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15691 Added Files: dead.package Removed Files: .cvsignore Makefile ghc-paths.spec import.log sources Log Message: package renamed to ghc-ghc-paths --- NEW FILE dead.package --- package renamed to ghc-ghc-paths --- .cvsignore DELETED --- --- Makefile DELETED --- --- ghc-paths.spec DELETED --- --- import.log DELETED --- --- sources DELETED --- From airlied at fedoraproject.org Mon Mar 9 05:40:18 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Mon, 9 Mar 2009 05:40:18 +0000 (UTC) Subject: rpms/mesa/devel mesa.spec,1.227,1.228 radeon-rewrite.patch,1.7,1.8 Message-ID: <20090309054018.3A14D70116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/mesa/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19323 Modified Files: mesa.spec radeon-rewrite.patch Log Message: * Mon Mar 09 2009 Dave Airlie 7.3-11 - radeon-rewrite.patch: update with swtcl and r100 bugfixes Index: mesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v retrieving revision 1.227 retrieving revision 1.228 diff -u -r1.227 -r1.228 --- mesa.spec 5 Mar 2009 08:19:34 -0000 1.227 +++ mesa.spec 9 Mar 2009 05:39:46 -0000 1.228 @@ -427,6 +427,9 @@ %{_libdir}/mesa-demos-data %changelog +* Mon Mar 09 2009 Dave Airlie 7.3-11 +- radeon-rewrite.patch: update with swtcl and r100 bugfixes + * Thu Mar 05 2009 Dave Airlie 7.3-10 - radeon-rewrite.patch: fixup link against libdrm_radeon radeon-rewrite.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 radeon-rewrite.patch Index: radeon-rewrite.patch =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/radeon-rewrite.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- radeon-rewrite.patch 6 Mar 2009 00:07:16 -0000 1.7 +++ radeon-rewrite.patch 9 Mar 2009 05:39:46 -0000 1.8 @@ -1,3 +1,15 @@ +commit 6c28708e141d047fc44369eac08cfb9a47f22c87 +Author: Dave Airlie +Date: Mon Mar 9 13:51:39 2009 +1000 + + radeon/r200/r300: update from latest radeon-rewrite branch + +commit 38262b6fc16f627a66e1475b729047ffe8258803 +Author: Dave Airlie +Date: Mon Mar 9 13:46:44 2009 +1000 + + r300: remove some links + commit 263b887d85e3eac9a32673c8ed3004c3129ce997 Author: Dave Airlie Date: Sun Feb 15 17:03:47 2009 +1000 @@ -812,7 +824,7 @@ - cmd[0].wait.flags = flags; -} diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c -index 5531e0a..a744469 100644 +index 5531e0a..10a6362 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -54,7 +54,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -924,9 +936,9 @@ +{ + radeon->vtbl.get_lock = r200_get_lock; + radeon->vtbl.update_viewport_offset = r200UpdateViewportOffset; -+ radeon->vtbl.update_draw_buffer = r200UpdateDrawBuffer; + radeon->vtbl.emit_cs_header = r200_vtbl_emit_cs_header; + radeon->vtbl.swtcl_flush = r200_swtcl_flush; ++ radeon->vtbl.fallback = r200Fallback; +} + @@ -1989,7 +2001,7 @@ } } diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.c b/src/mesa/drivers/dri/r200/r200_ioctl.c -index 0741e57..c08968f 100644 +index 0741e57..1ab5a82 100644 --- a/src/mesa/drivers/dri/r200/r200_ioctl.c +++ b/src/mesa/drivers/dri/r200/r200_ioctl.c @@ -41,6 +41,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -2001,7 +2013,7 @@ #include "r200_context.h" #include "r200_state.h" #include "r200_ioctl.h" -@@ -54,635 +56,28 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +@@ -54,635 +56,45 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define R200_TIMEOUT 512 #define R200_IDLE_RETRY 16 @@ -2478,10 +2490,9 @@ - assert(dPriv); - assert(dPriv->driContextPriv); - assert(dPriv->driContextPriv->driverPrivate); -+ if (flags & (RADEON_FRONT | RADEON_BACK)) { - +- - rmesa = (r200ContextPtr) dPriv->driContextPriv->driverPrivate; - +- - if ( R200_DEBUG & DEBUG_IOCTL ) { - fprintf(stderr, "%s: pfCurrentPage: %d\n", __FUNCTION__, - rmesa->sarea->pfCurrentPage); @@ -2494,10 +2505,8 @@ - UNLOCK_HARDWARE( rmesa ); - usleep( 10000 ); /* throttle invisible client 10ms */ - return; - } -+ -+ if ((flags & (RADEON_DEPTH | RADEON_STENCIL)) -+ && (flags & RADEON_CLEAR_FASTZ)) { +- } ++ GLuint mask = 0; - /* Need to do this for the perf box placement: - */ @@ -2507,7 +2516,9 @@ - b[0] = box[0]; - rmesa->sarea->nbox = 1; - } -- ++ if (flags & RADEON_FRONT) ++ mask |= BUFFER_BIT_FRONT_LEFT; + - /* Throttle the frame rate -- only allow a few pending swap buffers - * request at a time. - */ @@ -2517,21 +2528,31 @@ - if ( missed_target ) { - rmesa->swap_missed_count++; - (void) (*psp->systemTime->getUST)( & rmesa->swap_missed_ust ); - } +- } - LOCK_HARDWARE( rmesa ); ++ if (flags & RADEON_BACK) ++ mask |= BUFFER_BIT_BACK_LEFT; - ret = drmCommandNone( rmesa->dri.fd, DRM_RADEON_FLIP ); -- ++ if (flags & RADEON_DEPTH) ++ mask |= BUFFER_BIT_DEPTH; + - UNLOCK_HARDWARE( rmesa ); -- ++ if (flags & RADEON_STENCIL) ++ mask |= BUFFER_BIT_STENCIL; + - if ( ret ) { - fprintf( stderr, "DRM_RADEON_FLIP: return = %d\n", ret ); - exit( 1 ); - } -- ++#if 1 ++ _swrast_Clear(ctx, mask); ++#else ++ if (flags & (RADEON_FRONT | RADEON_BACK)) { + - rmesa->swap_count++; - (void) (*psp->systemTime->getUST)( & rmesa->swap_ust ); -- + -#if 000 - if ( rmesa->sarea->pfCurrentPage == 1 ) { - rmesa->state.color.drawOffset = rmesa->r200Screen->frontOffset; @@ -2539,15 +2560,18 @@ - } else { - rmesa->state.color.drawOffset = rmesa->r200Screen->backOffset; - rmesa->state.color.drawPitch = rmesa->r200Screen->backPitch; -- } -- + } ++ ++ if ((flags & (RADEON_DEPTH | RADEON_STENCIL)) ++ && (flags & RADEON_CLEAR_FASTZ)) { + - R200_STATECHANGE( rmesa, ctx ); - rmesa->hw.ctx.cmd[CTX_RB3D_COLOROFFSET] = rmesa->state.color.drawOffset - + rmesa->r200Screen->fbLocation; - rmesa->hw.ctx.cmd[CTX_RB3D_COLORPITCH] = rmesa->state.color.drawPitch; - if (rmesa->sarea->tiling_enabled) { - rmesa->hw.ctx.cmd[CTX_RB3D_COLORPITCH] |= R200_COLOR_TILE_ENABLE; -- } + } -#else - /* Get ready for drawing next frame. Update the renderbuffers' - * flippedOffset/Pitch fields so we draw into the right place. @@ -2557,7 +2581,7 @@ - - - r200UpdateDrawBuffer(rmesa->glCtx); --#endif + #endif } - @@ -2573,10 +2597,7 @@ - GLuint color_mask = 0; - GLint ret, i; - GLint cx, cy, cw, ch; -+ __DRIdrawablePrivate *dPriv = rmesa->radeon.dri.drawable; -+ GLint cx, cy, cw, ch, ret; -+ GLuint i; - +- - if ( R200_DEBUG & DEBUG_IOCTL ) { - fprintf( stderr, "r200Clear\n"); - } @@ -2606,7 +2627,10 @@ - flags |= RADEON_DEPTH; - mask &= ~BUFFER_BIT_DEPTH; - } -- ++ __DRIdrawablePrivate *dPriv = rmesa->radeon.dri.drawable; ++ GLint cx, cy, cw, ch, ret; ++ GLuint i; + - if ( (mask & BUFFER_BIT_STENCIL) && rmesa->state.stencil.hwBuffer ) { - flags |= RADEON_STENCIL; - mask &= ~BUFFER_BIT_STENCIL; @@ -2647,7 +2671,7 @@ /* Throttle the number of clear ioctls we do. */ -@@ -693,7 +88,7 @@ static void r200Clear( GLcontext *ctx, GLbitfield mask ) +@@ -693,7 +105,7 @@ static void r200Clear( GLcontext *ctx, GLbitfield mask ) gp.param = RADEON_PARAM_LAST_CLEAR; gp.value = (int *)&clear; [...5783 lines suppressed...] ++ rb->bo = NULL; ++ } ++ rb = (void*)rfb->base.Attachment[BUFFER_BACK_LEFT].Renderbuffer; ++ if (rb && rb->bo) { ++ radeon_bo_unref(rb->bo); ++ rb->bo = NULL; ++ } ++ rb = (void*)rfb->base.Attachment[BUFFER_FRONT_LEFT].Renderbuffer; ++ if (rb->bo == NULL) { ++ /* Failed to BO for the buffer */ ++ return; ++ } ++ ++ _mesa_lock_texture(radeon->glCtx, texObj); ++ if (t->bo) { ++ radeon_bo_unref(t->bo); ++ t->bo = NULL; ++ } ++ if (rImage->bo) { ++ radeon_bo_unref(rImage->bo); ++ rImage->bo = NULL; ++ } ++ if (t->mt) { ++ radeon_miptree_unreference(t->mt); ++ t->mt = NULL; ++ } ++ if (rImage->mt) { ++ radeon_miptree_unreference(rImage->mt); ++ rImage->mt = NULL; ++ } ++ fprintf(stderr,"settexbuf %d %dx%d@%d\n", rb->pitch, rb->width, rb->height, rb->cpp); ++ _mesa_init_teximage_fields(radeon->glCtx, target, texImage, ++ rb->width, rb->height, 1, 0, rb->cpp); ++ texImage->TexFormat = &_mesa_texformat_rgba8888_rev; ++ rImage->bo = rb->bo; ++ radeon_bo_ref(rImage->bo); ++ t->bo = rb->bo; ++ radeon_bo_ref(t->bo); ++ t->tile_bits = 0; ++ t->image_override = GL_TRUE; ++ t->override_offset = 0; ++ t->pp_txpitch &= (1 << 13) -1; ++ pitch_val = rb->pitch; ++ switch (rb->cpp) { ++ case 4: ++ t->pp_txformat = tx_table[MESA_FORMAT_ARGB8888].format; ++ t->pp_txfilter |= tx_table[MESA_FORMAT_ARGB8888].filter; ++ break; ++ case 3: ++ default: ++ t->pp_txformat = tx_table[MESA_FORMAT_RGB888].format; ++ t->pp_txfilter |= tx_table[MESA_FORMAT_RGB888].filter; ++ break; ++ case 2: ++ t->pp_txformat = tx_table[MESA_FORMAT_RGB565].format; ++ t->pp_txfilter |= tx_table[MESA_FORMAT_RGB565].filter; ++ break; ++ } ++ t->pp_txsize = ((rb->width - 1) << RADEON_TEX_USIZE_SHIFT) ++ | ((rb->height - 1) << RADEON_TEX_VSIZE_SHIFT); ++ t->pp_txformat |= RADEON_TXFORMAT_NON_POWER2; ++ t->pp_txpitch = pitch_val; ++ t->pp_txpitch -= 32; ++ ++ t->validated = GL_TRUE; ++ _mesa_unlock_texture(radeon->glCtx, texObj); ++ return; ++} ++ + #define TEXOBJ_TXFILTER_MASK (RADEON_MAX_MIP_LEVEL_MASK | \ + RADEON_MIN_FILTER_MASK | \ + RADEON_MAG_FILTER_MASK | \ +@@ -901,12 +760,58 @@ void radeonSetTexOffset(__DRIcontext * pDRICtx, GLint texname, RADEON_TXFORMAT_NON_POWER2) @@ -33713,7 +34844,7 @@ GLuint se_coord_fmt = rmesa->hw.set.cmd[SET_SE_COORDFMT]; RADEON_STATECHANGE( rmesa, tex[unit] ); -@@ -915,10 +716,9 @@ static void import_tex_obj_state( radeonContextPtr rmesa, +@@ -915,10 +820,9 @@ static void import_tex_obj_state( radeonContextPtr rmesa, cmd[TEX_PP_TXFILTER] |= texobj->pp_txfilter & TEXOBJ_TXFILTER_MASK; cmd[TEX_PP_TXFORMAT] &= ~TEXOBJ_TXFORMAT_MASK; cmd[TEX_PP_TXFORMAT] |= texobj->pp_txformat & TEXOBJ_TXFORMAT_MASK; @@ -33725,7 +34856,7 @@ GLuint *txr_cmd = RADEON_DB_STATE( txr[unit] ); txr_cmd[TXR_PP_TEX_SIZE] = texobj->pp_txsize; /* NPOT only! */ txr_cmd[TXR_PP_TEX_PITCH] = texobj->pp_txpitch; /* NPOT only! */ -@@ -928,22 +728,12 @@ static void import_tex_obj_state( radeonContextPtr rmesa, +@@ -928,22 +832,12 @@ static void import_tex_obj_state( radeonContextPtr rmesa, else { se_coord_fmt &= ~(RADEON_VTX_ST0_NONPARAMETRIC << unit); @@ -33751,7 +34882,7 @@ } } -@@ -952,13 +742,11 @@ static void import_tex_obj_state( radeonContextPtr rmesa, +@@ -952,13 +846,11 @@ static void import_tex_obj_state( radeonContextPtr rmesa, rmesa->hw.set.cmd[SET_SE_COORDFMT] = se_coord_fmt; } @@ -33767,7 +34898,7 @@ GLuint unit, const GLfloat *s_plane, const GLfloat *t_plane, -@@ -986,14 +774,14 @@ static void set_texgen_matrix( radeonContextPtr rmesa, +@@ -986,14 +878,14 @@ static void set_texgen_matrix( radeonContextPtr rmesa, rmesa->TexGenMatrix[unit].m[15] = q_plane[3]; rmesa->TexGenEnabled |= RADEON_TEXMAT_0_ENABLE << unit; @@ -33784,7 +34915,7 @@ struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit]; GLuint inputshift = RADEON_TEXGEN_0_INPUT_SHIFT + unit*4; GLuint tmp = rmesa->TexGenEnabled; -@@ -1094,283 +882,185 @@ static GLboolean radeon_validate_texgen( GLcontext *ctx, GLuint unit ) +@@ -1094,283 +986,189 @@ static GLboolean radeon_validate_texgen( GLcontext *ctx, GLuint unit ) } if (tmp != rmesa->TexGenEnabled) { @@ -33893,16 +35024,18 @@ - struct gl_texture_object *tObj = texUnit->_Current; - radeonTexObjPtr t = (radeonTexObjPtr) tObj->DriverData; - GLuint face; -- ++ const struct gl_texture_image *firstImage; ++ GLint log2Width, log2Height, log2Depth, texelBytes; + - /* Need to load the 2d images associated with this unit. - */ - if (t->pp_txformat & RADEON_TXFORMAT_NON_POWER2) { - t->pp_txformat &= ~RADEON_TXFORMAT_NON_POWER2; - for (face = 0; face < 6; face++) - t->base.dirty_images[face] = ~0; -- } -+ const struct gl_texture_image *firstImage; -+ GLint log2Width, log2Height, log2Depth, texelBytes; ++ if ( t->bo ) { ++ return GL_TRUE; + } - ASSERT(tObj->Target == GL_TEXTURE_CUBE_MAP); + firstImage = t->base.Image[0][t->mt->firstLevel]; @@ -33980,16 +35113,16 @@ - return GL_TRUE; -} -+ t->pp_txsize = (((firstImage->Width - 1) << RADEON_TEX_USIZE_SHIFT) -+ | ((firstImage->Height - 1) << RADEON_TEX_VSIZE_SHIFT)); - +- -static GLboolean enable_tex_rect( GLcontext *ctx, int unit ) -{ - radeonContextPtr rmesa = RADEON_CONTEXT(ctx); - struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit]; - struct gl_texture_object *tObj = texUnit->_Current; - radeonTexObjPtr t = (radeonTexObjPtr) tObj->DriverData; -- ++ t->pp_txsize = (((firstImage->Width - 1) << RADEON_TEX_USIZE_SHIFT) ++ | ((firstImage->Height - 1) << RADEON_TEX_VSIZE_SHIFT)); + - if (!(t->pp_txformat & RADEON_TXFORMAT_NON_POWER2)) { - t->pp_txformat |= RADEON_TXFORMAT_NON_POWER2; - t->base.dirty_images[0] = ~0; @@ -34059,27 +35192,27 @@ - rmesa->state.texture.unit[unit].texobj->base.bound &= - ~(1UL << unit); - } -+ RADEON_STATECHANGE( rmesa, ctx ); -+ rmesa->hw.ctx.cmd[CTX_PP_CNTL] |= -+ (RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE) << unit; - +- - rmesa->state.texture.unit[unit].texobj = t; - t->base.bound |= (1UL << unit); - t->dirty_state |= 1<hw.ctx.cmd[CTX_PP_CNTL] |= ++ (RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE) << unit; + + RADEON_STATECHANGE( rmesa, tcl ); + rmesa->hw.tcl.cmd[TCL_OUTPUT_VTXFMT] |= RADEON_ST_BIT(unit); -+ rmesa->recheck_texgen[unit] = GL_TRUE; - - /* Newly enabled? - */ - if ( !(rmesa->hw.ctx.cmd[CTX_PP_CNTL] & (RADEON_TEX_0_ENABLE<hw.ctx.cmd[CTX_PP_CNTL] |= - (RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE) << unit; -- ++ rmesa->recheck_texgen[unit] = GL_TRUE; + - RADEON_STATECHANGE( rmesa, tcl ); - - rmesa->hw.tcl.cmd[TCL_OUTPUT_VTXFMT] |= RADEON_ST_BIT(unit); From airlied at fedoraproject.org Mon Mar 9 05:42:05 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Mon, 9 Mar 2009 05:42:05 +0000 (UTC) Subject: rpms/mesa/devel mesa.spec,1.228,1.229 Message-ID: <20090309054205.25EBB70116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/mesa/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19913 Modified Files: mesa.spec Log Message: * Mon Mar 09 2009 Dave Airlie 7.3-11 - radeon-rewrite.patch: update with swtcl and r100 bugfixes Index: mesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- mesa.spec 9 Mar 2009 05:39:46 -0000 1.228 +++ mesa.spec 9 Mar 2009 05:41:34 -0000 1.229 @@ -20,7 +20,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 7.3 -Release: 10%{?dist} +Release: 11%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org From airlied at fedoraproject.org Mon Mar 9 05:51:35 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Mon, 9 Mar 2009 05:51:35 +0000 (UTC) Subject: rpms/kernel/devel drm-next.patch, 1.9, 1.10 kernel.spec, 1.1396, 1.1397 Message-ID: <20090309055135.5950570116@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22885 Modified Files: drm-next.patch kernel.spec Log Message: * Mon Mar 09 2009 Dave Airlie - drm-next.patch: fix r600 writeback test drm-next.patch: Index: drm-next.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-next.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- drm-next.patch 9 Mar 2009 03:11:26 -0000 1.9 +++ drm-next.patch 9 Mar 2009 05:51:34 -0000 1.10 @@ -1,3 +1,18 @@ +commit 24011adb61c1510fdd9c7ec9a27fc1ac4b23f1bf +Author: Dave Airlie +Date: Mon Mar 9 15:31:20 2009 +1000 + + drm/radeon: fix r600 writeback setup. + + This fixes 2 bugs: + 1. the AGP calculation wasn't consistent with the PCI(E) calc for the + RPTR_ADDR registers. This consolidates the writes and fixes it up. + + 2. The scratch address was being incorrectly calculated, this breaks + it out into a lot more linear steps. + + Signed-off-by: Dave Airlie + commit d2d31c9fe72bf4904798fd0d01522644e49dd518 Author: Dave Airlie Date: Mon Mar 9 12:47:18 2009 +1000 @@ -3906,10 +3921,10 @@ cmdbuf->bufsz -= sizeof(u64); diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c new file mode 100644 -index 0000000..6f2cc74 +index 0000000..04fde35 --- /dev/null +++ b/drivers/gpu/drm/radeon/r600_cp.c -@@ -0,0 +1,2247 @@ +@@ -0,0 +1,2256 @@ +/* + * Copyright 2008-2009 Advanced Micro Devices, Inc. + * Copyright 2008 Red Hat Inc. @@ -5542,6 +5557,7 @@ +{ + struct drm_radeon_master_private *master_priv; + u32 ring_start; ++ u64 rptr_addr; + + if (((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770)) + r700_gfx_init(dev, dev_priv); @@ -5596,21 +5612,20 @@ + +#if __OS_HAS_AGP + if (dev_priv->flags & RADEON_IS_AGP) { -+ /* XXX */ -+ RADEON_WRITE(R600_CP_RB_RPTR_ADDR, -+ (dev_priv->ring_rptr->offset -+ - dev->agp->base + dev_priv->gart_vm_start) >> 8); -+ RADEON_WRITE(R600_CP_RB_RPTR_ADDR_HI, 0); ++ rptr_addr = dev_priv->ring_rptr->offset ++ - dev->agp->base + ++ dev_priv->gart_vm_start; + } else +#endif + { -+ RADEON_WRITE(R600_CP_RB_RPTR_ADDR, -+ dev_priv->ring_rptr->offset -+ - ((unsigned long) dev->sg->virtual) -+ + dev_priv->gart_vm_start); -+ -+ RADEON_WRITE(R600_CP_RB_RPTR_ADDR_HI, 0); -+ } ++ rptr_addr = dev_priv->ring_rptr->offset ++ - ((unsigned long) dev->sg->virtual) ++ + dev_priv->gart_vm_start; ++ } ++ RADEON_WRITE(R600_CP_RB_RPTR_ADDR, ++ rptr_addr & 0xffffffff); ++ RADEON_WRITE(R600_CP_RB_RPTR_ADDR_HI, ++ upper_32_bits(rptr_addr)); + +#ifdef __BIG_ENDIAN + RADEON_WRITE(R600_CP_RB_CNTL, @@ -5659,8 +5674,17 @@ + * We simply put this behind the ring read pointer, this works + * with PCI GART as well as (whatever kind of) AGP GART + */ -+ RADEON_WRITE(R600_SCRATCH_ADDR, ((RADEON_READ(R600_CP_RB_RPTR_ADDR) << 8) -+ + R600_SCRATCH_REG_OFFSET) >> 8); ++ { ++ u64 scratch_addr; ++ ++ scratch_addr = RADEON_READ(R600_CP_RB_RPTR_ADDR); ++ scratch_addr |= ((u64)RADEON_READ(R600_CP_RB_RPTR_ADDR_HI)) << 32; ++ scratch_addr += R600_SCRATCH_REG_OFFSET; ++ scratch_addr >>= 8; ++ scratch_addr &= 0xffffffff; ++ ++ RADEON_WRITE(R600_SCRATCH_ADDR, (uint32_t)scratch_addr); ++ } + + RADEON_WRITE(R600_SCRATCH_UMSK, 0x7); + Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1396 retrieving revision 1.1397 diff -u -r1.1396 -r1.1397 --- kernel.spec 9 Mar 2009 04:32:25 -0000 1.1396 +++ kernel.spec 9 Mar 2009 05:51:34 -0000 1.1397 @@ -1810,6 +1810,9 @@ # and build. %changelog +* Mon Mar 09 2009 Dave Airlie +- drm-next.patch: fix r600 writeback test + * Mon Mar 09 2009 Ben Skeggs - drm-nouveau.patch: nv50 and kms fixes From petersen at fedoraproject.org Mon Mar 9 06:02:02 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 9 Mar 2009 06:02:02 +0000 (UTC) Subject: rpms/haddock/devel haddock.spec,1.18,1.19 Message-ID: <20090309060202.E955970116@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25039 Modified Files: haddock.spec Log Message: - update to cabal2spec-0.12: - use global and bcond - arch list - ghc-paths is renamed to ghc-ghc-paths - devel subpackage obsoletes old library subpackage - move docs to doc subpackage Index: haddock.spec =================================================================== RCS file: /cvs/extras/rpms/haddock/devel/haddock.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- haddock.spec 25 Feb 2009 03:14:36 -0000 1.18 +++ haddock.spec 9 Mar 2009 06:01:32 -0000 1.19 @@ -1,29 +1,36 @@ -%define ghc_version 6.10.1 +%global ghc_version 6.10.1 + +%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version} +%global pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version} + +%bcond_without doc +%bcond_without prof -%define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version} -%define pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version} # ghc does not emit debug information -%define debug_package %{nil} +%global debug_package %{nil} Name: haddock Version: 2.4.1 -Release: 3%{?dist} -Summary: Haskell Documentation tool +Release: 4%{?dist} +Summary: Haskell documentation tool Group: Development/Tools License: BSD URL: http://www.haskell.org/haddock/ Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# ghc has only been bootstrapped on the following archs: -ExclusiveArch: i386 x86_64 ppc +# fedora ghc archs: +ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc = %{ghc_version} -Buildrequires: ghc-paths-devel -# for profiling -BuildRequires: ghc-prof = %{ghc_version} -BuildRequires: ghc-paths-prof -# for doc/ +Buildrequires: ghc-ghc-paths-devel +%if %{with doc} BuildRequires: libxslt, docbook-style-xsl, autoconf +BuildRequires: ghc-doc = %{ghc_version} +%endif +%if %{with prof} +BuildRequires: ghc-prof = %{ghc_version} +BuildRequires: ghc-ghc-paths-prof +%endif %description Haddock is a tool for automatically generating hyperlinked documentation from @@ -34,25 +41,41 @@ functions and types in the source code in a lightweight syntax. -%package -n ghc-%{name} -Summary: Libraries for working with Haddock from Haskell code -Group: Development/Libraries -Provides: ghc-%{name}-devel = %{version}-%{release} -Requires: ghc = %{ghc_version} -Obsoletes: ghc682-haddock < 2.0.0.0-3 +%package -n ghc-%{name}-devel +Summary: Haskell source documentation library +Group: Development/Libraries +Requires: ghc = %{ghc_version} +Obsoletes: ghc-haddock < 2.4.1-4 +Obsoletes: ghc682-haddock < 2.0.0.0-3 +Requires(post): ghc = %{ghc_version} +Requires(preun): ghc = %{ghc_version} -%description -n ghc-%{name} +%description -n ghc-%{name}-devel Libraries for working with Haddock from Haskell code. +%if %{with doc} +%package -n ghc-%{name}-doc +Summary: Documentation for %{name} +Group: Development/Libraries +Requires: ghc-doc = %{ghc_version} +Requires(post): ghc-doc = %{ghc_version} +Requires(postun): ghc-doc = %{ghc_version} + +%description -n ghc-%{name}-doc +This package contains development documentation files for the %{name} library. +%endif + +%if %{with prof} %package -n ghc-%{name}-prof -Summary: Profiling libraries for %{name} -Group: Development/Libraries -Requires: ghc-%{name} = %{version}-%{release} -Requires: ghc-prof = %{ghc_version} +Summary: Profiling libraries for %{name} +Group: Development/Libraries +Requires: ghc-%{name}-devel = %{version}-%{release} +Requires: ghc-prof = %{ghc_version} %description -n ghc-%{name}-prof This package contains profiling libraries for %{name}. +%endif %prep @@ -60,19 +83,21 @@ %build -%cabal_configure --ghc -p +%cabal_configure --ghc %{!?without_prof:-p} %cabal build +%if %{with doc} %cabal haddock -%ghc_gen_scripts - cd doc test -f configure || autoreconf ./configure make html +cd - +%endif +%ghc_gen_scripts %install -rm -rf ${RPM_BUILD_ROOT} +rm -rf $RPM_BUILD_ROOT %cabal_install %ghc_install_scripts %ghc_gen_filelists ghc-%{name} @@ -82,45 +107,70 @@ %clean -rm -rf ${RPM_BUILD_ROOT} - +rm -rf $RPM_BUILD_ROOT %post semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/%{name} >/dev/null 2>&1 restorecon %{_bindir}/%{name} -%post -n ghc-%{name} +%post -n ghc-%{name}-devel %ghc_register_pkg + + +%if %{with doc} +%post -n ghc-%{name}-doc %ghc_reindex_haddock +%endif + -%preun -n ghc-%{name} +%preun -n ghc-%{name}-devel if [ "$1" -eq 0 ] ; then %ghc_unregister_pkg fi -%postun -n ghc-%{name} + +%if %{with doc} +%postun -n ghc-%{name}-doc if [ "$1" -eq 0 ] ; then %ghc_reindex_haddock fi +%endif + %files %defattr(-,root,root,-) %doc CHANGES LICENSE README -%doc doc/haddock/* %{_bindir}/haddock-%{version} %{_datadir}/haddock-%{version} -%files -n ghc-%{name} -f ghc-%{name}.files +%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files +%defattr(-,root,root,-) + + +%if %{with doc} +%files -n ghc-%{name}-doc %defattr(-,root,root,-) %{pkg_docdir} +%doc doc/haddock/* +%endif +%if %{with prof} %files -n ghc-%{name}-prof -f ghc-%{name}-prof.files %defattr(-,root,root,-) +%endif %changelog +* Mon Mar 9 2009 Jens Petersen - 2.4.1-4 +- update to cabal2spec-0.12: + - use global and bcond + - arch list + - ghc-paths is renamed to ghc-ghc-paths +- devel subpackage obsoletes old library subpackage +- move docs to doc subpackage + * Tue Feb 24 2009 Fedora Release Engineering - 2.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From petersen at fedoraproject.org Mon Mar 9 06:41:42 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 9 Mar 2009 06:41:42 +0000 (UTC) Subject: rpms/ghc-gtk2hs/devel ghc-gtk2hs.spec,1.14,1.15 Message-ID: <20090309064142.C76A670116@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ghc-gtk2hs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1918 Modified Files: ghc-gtk2hs.spec Log Message: - use global and update arch list - rename library subpackages to devel and obsolete old packages Index: ghc-gtk2hs.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/ghc-gtk2hs.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ghc-gtk2hs.spec 24 Feb 2009 21:15:59 -0000 1.14 +++ ghc-gtk2hs.spec 9 Mar 2009 06:41:12 -0000 1.15 @@ -1,29 +1,34 @@ -#%%define snapdate 20090125 +#%%global snapdate 20090125 -%define pkg_name gtk2hs -%define ghc_version 6.10.1 +%global pkg_name gtk2hs +%global ghc_version 6.10.1 + +%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version} +%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name} %bcond_without docs +%bcond_without prof + %bcond_without cairo %bcond_without svgcairo %bcond_without gio %bcond_without opengl %bcond_without gstreamer -%bcond_with prof + %bcond_with gnomevfs %bcond_with mozembed -%define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version} -%define pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name} +# ghc does not emit debug information +%global debug_package %{nil} -%define common_descr \ +%global common_descr \ A Gtk+ binding for the functional language Haskell featuring automatic memory\ management, unicode support, and wide coverage of Gtk+ 2 widgets. Summary: Haskell binding for gtk2 and related libraries Name: ghc-gtk2hs Version: 0.10.0 -Release: 2%{?snapdate:.%{snapdate}}%{?dist} +Release: 3%{?snapdate:.%{snapdate}}%{?dist} # cairo/ and svgcairo/ are FreeBSD # compat/ is BSD # tools/c2hs (used to build) is GPLv2+, LGPLv2+ @@ -41,9 +46,9 @@ Source: http://prdownloads.sourceforge.net/%{pkg_name}/%{pkg_name}-%{version}.tar.gz %endif URL: http://gtk2hs.sourceforge.net/ -# we have only bootstrapped ghc on the following archs: -ExclusiveArch: i386 i686 x86_64 ppc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# fedora ghc archs: +ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc = %{ghc_version} BuildRequires: happy, alex %if %{with docs} @@ -90,9 +95,10 @@ # ghc682 is from f8 Obsoletes: ghc661-%{pkg_name}, ghc682-%{pkg_name} Obsoletes: ghc661-%{pkg_name}-mozembed, ghc682-%{pkg_name}-mozembed -Requires: ghc-soegtk = %{version}-%{release} -Requires: ghc-glade = %{version}-%{release} -Requires: ghc-gconf = %{version}-%{release} +# these 3 pull in the others +Requires: ghc-gconf-devel = %{version}-%{release} +Requires: ghc-glade-devel = %{version}-%{release} +Requires: ghc-soegtk-devel = %{version}-%{release} %description compat %common_descr @@ -124,8 +130,8 @@ # subpackage name lib [dep] [obsoletes] -%define subpackage()\ -%package -n ghc-%1\ +%global subpackage()\ +%package -n ghc-%1-devel\ Summary: Haskell binding for %1\ Group: Development/Libraries\ Requires: ghc = %{ghc_version}\ @@ -133,22 +139,24 @@ Requires: %2-devel, %{?3:ghc-%3 = %{version}-%{release}}\ Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}\ Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}\ +# added for F11 +Obsoletes: ghc-%1 < 0.10.0-3 %{?4:Obsoletes: %4 < 0.10.0}\ \ -%description -n ghc-%1\ +%description -n ghc-%1-devel\ %common_descr\ \ This package contains a Haskell binding of the %1 library.\ \ -%post -n ghc-%1\ +%post -n ghc-%1-devel\ ghc-pkg-%{ghc_version} update %{pkg_libdir}/%1.package.conf &>/dev/null || : \ \ -%preun -n ghc-%1\ +%preun -n ghc-%1-devel\ if [ "$1" = 0 ]; then\ ghc-pkg-%{ghc_version} unregister %1-%{version} &>/dev/null || : \ fi\ \ -%files -n ghc-%1\ +%files -n ghc-%1-devel\ %{pkg_libdir}/%1.cabal\ %{pkg_libdir}/%1.package.conf\ %{pkg_libdir}/libHS%1.a\ @@ -180,10 +188,6 @@ %subpackage soegtk gtk2 gtk %subpackage svgcairo librsvg2 cairo -# the debuginfo subpackage is currently empty anyway, so don't generate it -%define debug_package %{nil} - - %prep %if %{?snapdate:1}0 %setup -q -n %{pkg_name}-%{version}-%{snapdate} @@ -270,6 +274,11 @@ %changelog +* Mon Mar 9 2009 Jens Petersen - 0.10.0-3 +- use global +- update arch list +- rename library subpackages to devel and obsolete old packages + * Tue Feb 24 2009 Fedora Release Engineering - 0.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kkofler at fedoraproject.org Mon Mar 9 06:56:21 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Mon, 9 Mar 2009 06:56:21 +0000 (UTC) Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.77,1.78 Message-ID: <20090309065621.8940970116@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdepimlibs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6012/devel Modified Files: kdepimlibs.spec Log Message: Actually disable debugging. Index: kdepimlibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- kdepimlibs.spec 9 Mar 2009 02:02:59 -0000 1.77 +++ kdepimlibs.spec 9 Mar 2009 06:55:51 -0000 1.78 @@ -13,11 +13,10 @@ %define akonadi_subpkg 1 %define akonadi_version 1.1.1 -%define debug 0 Name: kdepimlibs Version: 4.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: K Desktop Environment 4 - PIM Libraries License: LGPLv2 @@ -220,7 +219,7 @@ %changelog -* Mon Mar 09 2009 Kevin Kofler - 4.2.1-3 +* Mon Mar 09 2009 Kevin Kofler - 4.2.1-4 - disable CMake debugging, #475876 should be fixed now * Tue Mar 03 2009 Rex Dieter - 4.2.1-2 From petersen at fedoraproject.org Mon Mar 9 07:00:00 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 9 Mar 2009 07:00:00 +0000 (UTC) Subject: rpms/ghc-gtk2hs/devel ghc-gtk2hs.spec,1.15,1.16 Message-ID: <20090309070000.E318470116@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ghc-gtk2hs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6874 Modified Files: ghc-gtk2hs.spec Log Message: fix subpkg macro eol quoting Index: ghc-gtk2hs.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/ghc-gtk2hs.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ghc-gtk2hs.spec 9 Mar 2009 06:41:12 -0000 1.15 +++ ghc-gtk2hs.spec 9 Mar 2009 06:59:30 -0000 1.16 @@ -139,8 +139,8 @@ Requires: %2-devel, %{?3:ghc-%3 = %{version}-%{release}}\ Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}\ Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}\ -# added for F11 -Obsoletes: ghc-%1 < 0.10.0-3 +# added for F11\ +Obsoletes: ghc-%1 < 0.10.0-3\ %{?4:Obsoletes: %4 < 0.10.0}\ \ %description -n ghc-%1-devel\ From abompard at fedoraproject.org Mon Mar 9 07:20:25 2009 From: abompard at fedoraproject.org (Aurelien Bompard) Date: Mon, 9 Mar 2009 07:20:25 +0000 (UTC) Subject: rpms/mhonarc/devel mhonarc.spec,1.18,1.19 Message-ID: <20090309072025.EA29870116@cvs1.fedora.phx.redhat.com> Author: abompard Update of /cvs/pkgs/rpms/mhonarc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12217 Modified Files: mhonarc.spec Log Message: * Mon Mar 09 2009 Aurelien Bompard 2.6.16-6 - filter out unwanted Requires (provided by MHonArc itself) Index: mhonarc.spec =================================================================== RCS file: /cvs/pkgs/rpms/mhonarc/devel/mhonarc.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mhonarc.spec 26 Feb 2009 00:38:07 -0000 1.18 +++ mhonarc.spec 9 Mar 2009 07:19:55 -0000 1.19 @@ -1,6 +1,6 @@ Name: mhonarc Version: 2.6.16 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Perl mail-to-HTML converter Group: Applications/Internet @@ -23,8 +23,15 @@ %prep %setup -q -n MHonArc-%{version} +# Filter out unwanted requires +cat << EOF > %{name}-req +#!/bin/sh +%{__perl_requires} $* |\ +sed -e '/perl(.*\.pl)/d' +EOF -%build +%global __perl_requires %{_builddir}/MHonArc-%{version}/%{name}-req +chmod +x %{__perl_requires} %install @@ -51,6 +58,9 @@ %changelog +* Mon Mar 09 2009 Aurelien Bompard 2.6.16-6 +- filter out unwanted Requires (provided by MHonArc itself) + * Wed Feb 25 2009 Fedora Release Engineering - 2.6.16-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From tmraz at fedoraproject.org Mon Mar 9 08:12:49 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Mon, 9 Mar 2009 08:12:49 +0000 (UTC) Subject: rpms/cronie/devel cronie.spec,1.15,1.16 Message-ID: <20090309081249.E52E870116@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/cronie/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24610 Modified Files: cronie.spec Log Message: * Mon Mar 9 2009 Tomas Mraz - 1.2-7 - rebuild Index: cronie.spec =================================================================== RCS file: /cvs/pkgs/rpms/cronie/devel/cronie.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- cronie.spec 24 Feb 2009 09:42:53 -0000 1.15 +++ cronie.spec 9 Mar 2009 08:12:18 -0000 1.16 @@ -6,7 +6,7 @@ Summary: Cron daemon for executing programs at set times Name: cronie Version: 1.2 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT and BSD Group: System Environment/Base URL: https://fedorahosted.org/cronie @@ -133,6 +133,9 @@ %config(noreplace) %{_sysconfdir}/cron.deny %changelog +* Mon Mar 9 2009 Tomas Mraz - 1.2-7 +- rebuild + * Tue Feb 24 2009 Fedora Release Engineering - 1.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Mon Mar 9 08:21:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 08:21:27 +0000 Subject: [pkgdb] memtest86+: wtogami has requested watchbugzilla Message-ID: <20090309082127.65B1A2082B2@bastion.fedora.phx.redhat.com> wtogami has requested the watchbugzilla acl on memtest86+ (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+ From pkgdb at fedoraproject.org Mon Mar 9 08:21:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 08:21:29 +0000 Subject: [pkgdb] memtest86+: wtogami has requested watchcommits Message-ID: <20090309082130.4A751208544@bastion.fedora.phx.redhat.com> wtogami has requested the watchcommits acl on memtest86+ (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+ From pkgdb at fedoraproject.org Mon Mar 9 08:21:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 08:21:38 +0000 Subject: [pkgdb] memtest86+ ownership updated Message-ID: <20090309082136.08E9F208546@bastion.fedora.phx.redhat.com> Package memtest86+ in Fedora devel was orphaned by wtogami To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+ From pkgdb at fedoraproject.org Mon Mar 9 08:21:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 08:21:51 +0000 Subject: [pkgdb] memtest86+ ownership updated Message-ID: <20090309082149.835C4208548@bastion.fedora.phx.redhat.com> Package memtest86+ in Fedora 8 was orphaned by wtogami To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+ From pkgdb at fedoraproject.org Mon Mar 9 08:21:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 08:21:32 +0000 Subject: [pkgdb] memtest86+ ownership updated Message-ID: <20090309082152.A9BAC208544@bastion.fedora.phx.redhat.com> Package memtest86+ in Fedora 9 was orphaned by wtogami To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+ From pkgdb at fedoraproject.org Mon Mar 9 08:21:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 08:21:44 +0000 Subject: [pkgdb] memtest86+ ownership updated Message-ID: <20090309082145.9427A2082B2@bastion.fedora.phx.redhat.com> Package memtest86+ in Fedora 7 was orphaned by wtogami To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+ From pkgdb at fedoraproject.org Mon Mar 9 08:20:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 08:20:58 +0000 Subject: [pkgdb] memtest86+ ownership updated Message-ID: <20090309082157.1249C208546@bastion.fedora.phx.redhat.com> Package memtest86+ in Fedora 10 was orphaned by wtogami To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+ From pkgdb at fedoraproject.org Mon Mar 9 08:23:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 08:23:52 +0000 Subject: [pkgdb] memtest86+ had acl change status Message-ID: <20090309082412.DBFD3208545@bastion.fedora.phx.redhat.com> wtogami has set the watchcommits acl on memtest86+ (Fedora devel) to Approved for wtogami To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+ From pkgdb at fedoraproject.org Mon Mar 9 08:24:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 08:24:09 +0000 Subject: [pkgdb] memtest86+ had acl change status Message-ID: <20090309082409.DBBAA2084CF@bastion.fedora.phx.redhat.com> wtogami has set the watchbugzilla acl on memtest86+ (Fedora devel) to Approved for wtogami To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+ From corsepiu at fedoraproject.org Mon Mar 9 08:46:04 2009 From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=) Date: Mon, 9 Mar 2009 08:46:04 +0000 (UTC) Subject: rpms/perl-LockFile-Simple/devel license_of_LockFile_Simple.txt, 1.1, NONE Message-ID: <20090309084604.1444D70116@cvs1.fedora.phx.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-LockFile-Simple/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv602 Removed Files: license_of_LockFile_Simple.txt Log Message: Remove. --- license_of_LockFile_Simple.txt DELETED --- From corsepiu at fedoraproject.org Mon Mar 9 08:49:49 2009 From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=) Date: Mon, 9 Mar 2009 08:49:49 +0000 (UTC) Subject: rpms/perl-LockFile-Simple/devel .cvsignore, 1.2, 1.3 perl-LockFile-Simple.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <20090309084949.30FCF70119@cvs1.fedora.phx.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-LockFile-Simple/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1751 Modified Files: .cvsignore perl-LockFile-Simple.spec sources Log Message: * Mon Mar 09 2009 Ralf Cors??pius - 0.207-1 - Upstream update. - Remove license_of_LockFile_Simple.txt (cf. README). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-LockFile-Simple/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Mar 2007 10:05:31 -0000 1.2 +++ .cvsignore 9 Mar 2009 08:49:18 -0000 1.3 @@ -1 +1 @@ -LockFile-Simple-0.2.5.tar.gz +LockFile-Simple-0.207.tar.gz Index: perl-LockFile-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-LockFile-Simple/devel/perl-LockFile-Simple.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-LockFile-Simple.spec 26 Feb 2009 21:05:59 -0000 1.5 +++ perl-LockFile-Simple.spec 9 Mar 2009 08:49:18 -0000 1.6 @@ -1,13 +1,11 @@ Name: perl-LockFile-Simple -Version: 0.206 -Release: 3%{?dist} +Version: 0.207 +Release: 1%{?dist} Summary: Simple file locking scheme -# Confirmed with copyright holder, code does not yet reflect it. -License: GPL+ or Artistic +License: GPLv2+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/LockFile-Simple/ Source0: http://www.cpan.org/modules/by-module/LockFile/LockFile-Simple-%{version}.tar.gz -Source1: license_of_LockFile_Simple.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -22,7 +20,6 @@ %prep %setup -q -n LockFile-Simple-%{version} -cp %{SOURCE1} . %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -46,11 +43,15 @@ %files %defattr(-,root,root,-) -%doc ChangeLog README license_of_LockFile_Simple.txt +%doc ChangeLog README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Mon Mar 09 2009 Ralf Cors??pius - 0.207-1 +- Upstream update. +- Remove license_of_LockFile_Simple.txt (cf. README). + * Thu Feb 26 2009 Fedora Release Engineering - 0.206-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-LockFile-Simple/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Mar 2007 10:05:31 -0000 1.2 +++ sources 9 Mar 2009 08:49:18 -0000 1.3 @@ -1 +1 @@ -acf9fd6f965789a42fa5314a4be0189d LockFile-Simple-0.2.5.tar.gz +194573bdf3f1823723959b25f0a322d0 LockFile-Simple-0.207.tar.gz From kwizart at fedoraproject.org Mon Mar 9 08:53:55 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 9 Mar 2009 08:53:55 +0000 (UTC) Subject: rpms/libproxy/devel libproxy.spec,1.2,1.3 Message-ID: <20090309085355.61A3970116@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/libproxy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3479 Modified Files: libproxy.spec Log Message: Rebuild Index: libproxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/libproxy/devel/libproxy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libproxy.spec 25 Feb 2009 17:39:14 -0000 1.2 +++ libproxy.spec 9 Mar 2009 08:53:24 -0000 1.3 @@ -1,10 +1,10 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define gecko_version 1.9 +%define gecko_version 1.9.1 Name: libproxy Version: 0.2.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A library handling all the details of proxy configuration Group: System Environment/Libraries @@ -184,6 +184,10 @@ %changelog +* Mon Mar 9 2009 kwizart < kwizart at gmail.com > - 0.2.3-10 +- Rebuild for webkit +- Raise requirement for xulrunner to 1.9.1 + * Wed Feb 25 2009 Fedora Release Engineering - 0.2.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From fabbione at fedoraproject.org Mon Mar 9 09:13:01 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Mon, 9 Mar 2009 09:13:01 +0000 (UTC) Subject: rpms/cluster/devel cluster.spec,1.45,1.46 Message-ID: <20090309091301.5AB3D70116@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/cluster/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6434 Modified Files: cluster.spec Log Message: Fix man page overlap between gfs-utils and cman package Index: cluster.spec =================================================================== RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- cluster.spec 6 Mar 2009 10:44:47 -0000 1.45 +++ cluster.spec 9 Mar 2009 09:12:30 -0000 1.46 @@ -19,7 +19,7 @@ Name: cluster Summary: Red Hat Cluster Version: 3.0.0 -Release: 13%{?alphatag:.%{alphatag}}%{?dist} +Release: 14%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sources.redhat.com/cluster/wiki/ @@ -306,10 +306,17 @@ %{_sbindir}/gfs_tool %{_sbindir}/*.gfs %{_mandir}/man8/gfs.* -%{_mandir}/man8/gfs_* +%{_mandir}/man8/gfs_edit* +%{_mandir}/man8/gfs_grow* +%{_mandir}/man8/gfs_jadd* +%{_mandir}/man8/gfs_quota* +%{_mandir}/man8/gfs_tool* %{_mandir}/man8/*.gfs.* %changelog +* Mon Mar 9 2009 Fabio M. Di Nitto - 3.0.0-14.alpha7 +- Fix gfs-utils and cman man page overlapping files. + * Fri Mar 6 2009 Fabio M. Di Nitto - 3.0.0-13.alpha7 - New upstream release. - Drop local build fix patch. From jwrdegoede at fedoraproject.org Mon Mar 9 09:18:05 2009 From: jwrdegoede at fedoraproject.org (Hans de Goede) Date: Mon, 9 Mar 2009 09:18:05 +0000 (UTC) Subject: rpms/libcddb/devel .cvsignore, 1.7, 1.8 libcddb.spec, 1.27, 1.28 sources, 1.8, 1.9 Message-ID: <20090309091805.1431370116@cvs1.fedora.phx.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libcddb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7277 Modified Files: .cvsignore libcddb.spec sources Log Message: * Mon Mar 9 2009 Hans de Goede 1.3.1-1 - New upstream release 1.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcddb/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 27 Oct 2006 12:51:44 -0000 1.7 +++ .cvsignore 9 Mar 2009 09:17:34 -0000 1.8 @@ -1 +1 @@ -libcddb-1.3.0.tar.bz2 +libcddb-1.3.1.tar.bz2 Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- libcddb.spec 25 Feb 2009 14:01:36 -0000 1.27 +++ libcddb.spec 9 Mar 2009 09:17:34 -0000 1.28 @@ -1,12 +1,12 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb -Version: 1.3.0 -Release: 7%{?dist} +Version: 1.3.1 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libcddb.sourceforge.net/ Source0: http://downloads.sourceforge.net/libcddb/%{name}-%{version}.tar.bz2 -Patch0: libcddb-1.3.0-multilib.patch +Patch0: libcddb-1.3.0-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: pkgconfig, libcdio-devel >= 0.67 @@ -31,6 +31,12 @@ %prep %setup -q %patch0 -p1 +iconv -f ISO_8859-1 -t UTF-8 THANKS > THANKS.tmp +touch -r THANKS THANKS.tmp +mv THANKS.tmp THANKS +iconv -f ISO_8859-1 -t UTF-8 ChangeLog > ChangeLog.tmp +touch -r ChangeLog ChangeLog.tmp +mv ChangeLog.tmp ChangeLog %build @@ -71,6 +77,9 @@ %changelog +* Mon Mar 9 2009 Hans de Goede 1.3.1-1 +- New upstream release 1.3.1 + * Wed Feb 25 2009 Fedora Release Engineering - 1.3.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcddb/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Oct 2006 12:51:44 -0000 1.8 +++ sources 9 Mar 2009 09:17:34 -0000 1.9 @@ -1 +1 @@ -e4a7f9579956c32b7f300eb12e9ea6df libcddb-1.3.0.tar.bz2 +9adeae462d6791ed8b75f2ec5fa7903b libcddb-1.3.1.tar.bz2 From jwrdegoede at fedoraproject.org Mon Mar 9 09:25:34 2009 From: jwrdegoede at fedoraproject.org (Hans de Goede) Date: Mon, 9 Mar 2009 09:25:34 +0000 (UTC) Subject: rpms/DevIL/devel .cvsignore, 1.5, 1.6 DevIL-1.7.5-il_endian_h.patch, 1.1, 1.2 DevIL.spec, 1.13, 1.14 sources, 1.5, 1.6 Message-ID: <20090309092534.876A170116@cvs1.fedora.phx.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/DevIL/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9184 Modified Files: .cvsignore DevIL-1.7.5-il_endian_h.patch DevIL.spec sources Log Message: * Mon Mar 9 2009 Hans de Goede 1.7.8-1 - Update to latest upstream: 1.7.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/DevIL/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 10 Feb 2009 13:26:05 -0000 1.5 +++ .cvsignore 9 Mar 2009 09:25:03 -0000 1.6 @@ -1 +1 @@ -devil-1.7.7.tar.gz +DevIL-1.7.8.tar.gz DevIL-1.7.5-il_endian_h.patch: Index: DevIL-1.7.5-il_endian_h.patch =================================================================== RCS file: /cvs/extras/rpms/DevIL/devel/DevIL-1.7.5-il_endian_h.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DevIL-1.7.5-il_endian_h.patch 14 Jan 2009 10:53:07 -0000 1.1 +++ DevIL-1.7.5-il_endian_h.patch 9 Mar 2009 09:25:04 -0000 1.2 @@ -1,5 +1,6 @@ ---- DevIL-1.6.8/src-IL/include/il_endian.h.orig 2006-12-21 03:40:57.000000000 +0000 -+++ DevIL-1.6.8/src-IL/include/il_endian.h 2006-12-21 03:33:34.000000000 +0000 +diff -up devil-1.7.8/src-IL/include/il_endian.h~ devil-1.7.8/src-IL/include/il_endian.h +--- devil-1.7.8/src-IL/include/il_endian.h~ 2009-03-08 08:10:08.000000000 +0100 ++++ devil-1.7.8/src-IL/include/il_endian.h 2009-03-09 10:11:33.000000000 +0100 @@ -15,6 +15,10 @@ #include "il_internal.h" @@ -8,26 +9,26 @@ +#include +#endif + - #ifdef WORDS_BIGENDIAN //this is defined by ./configure + #ifdef WORDS_BIGENDIAN // This is defined by ./configure. #ifndef __BIG_ENDIAN__ - #define __BIG_ENDIAN__ -@@ -101,9 +105,7 @@ + #define __BIG_ENDIAN__ 1 +@@ -104,9 +108,7 @@ INLINE void iSwapUShort(ILushort *s) { } #else #ifdef GCC_X86_ASM - asm("ror $8,%0" -- : -- : "r" (*s) ); +- : "=r" (*s) +- : "0" (*s)); + *s = __bswap_16(*s); #else *s = ((*s)>>8) | ((*s)<<8); #endif //GCC_X86_ASM -@@ -124,8 +126,7 @@ +@@ -127,8 +129,7 @@ INLINE void iSwapUInt(ILuint *i) { } #else #ifdef GCC_X86_ASM -- asm("bswap %0;" -- : "=r" (*i) ); +- asm("bswap %0;" +- : "+r" (*i)); + *i = __bswap_32(*i); #else *i = ((*i)>>24) | (((*i)>>8) & 0xff00) | (((*i)<<8) & 0xff0000) | ((*i)<<24); Index: DevIL.spec =================================================================== RCS file: /cvs/extras/rpms/DevIL/devel/DevIL.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- DevIL.spec 23 Feb 2009 20:15:50 -0000 1.13 +++ DevIL.spec 9 Mar 2009 09:25:04 -0000 1.14 @@ -1,11 +1,11 @@ Name: DevIL -Version: 1.7.7 -Release: 2%{?dist} +Version: 1.7.8 +Release: 1%{?dist} Summary: A cross-platform image library Group: System Environment/Libraries License: LGPLv2 URL: http://openil.sourceforge.net/ -Source0: http://downloads.sourceforge.net/openil/devil-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/openil/%{name}-%{version}.tar.gz Patch0: DevIL-1.7.5-allegropicfix.patch Patch1: DevIL-1.7.5-il_endian_h.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -68,6 +68,7 @@ iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv touch -r CREDITS CREDITS.conv mv CREDITS.conv CREDITS +chmod -x src-IL/src/il_*.c %build @@ -104,6 +105,7 @@ %files %defattr(-,root,root,-) +%{_bindir}/ilur %{_libdir}/libIL.so.* %{_libdir}/libILU.so.* %doc AUTHORS ChangeLog COPYING CREDITS README TODO @@ -136,6 +138,9 @@ %changelog +* Mon Mar 9 2009 Hans de Goede 1.7.8-1 +- Update to latest upstream: 1.7.8 + * Mon Feb 23 2009 Fedora Release Engineering - 1.7.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/DevIL/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Feb 2009 13:26:05 -0000 1.5 +++ sources 9 Mar 2009 09:25:04 -0000 1.6 @@ -1 +1 @@ -1951c24fe343c882c0c1ceeeb7468c7e devil-1.7.7.tar.gz +963ab2ef991b5921b2a981502fe43e74 DevIL-1.7.8.tar.gz From oliver at fedoraproject.org Mon Mar 9 09:34:56 2009 From: oliver at fedoraproject.org (Oliver Falk) Date: Mon, 9 Mar 2009 09:34:56 +0000 (UTC) Subject: rpms/postgresql/F-10 postgresql.spec,1.105,1.106 Message-ID: <20090309093456.B2D8C70116@cvs1.fedora.phx.redhat.com> Author: oliver Update of /cvs/pkgs/rpms/postgresql/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10719 Modified Files: postgresql.spec Log Message: * Mon Mar 9 2009 Oliver Falk 8.3.6-2 - Use -O1 on alpha, as on sparc64 - Renable selftests on alpha again Index: postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/postgresql/F-10/postgresql.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- postgresql.spec 2 Mar 2009 10:58:21 -0000 1.105 +++ postgresql.spec 9 Mar 2009 09:34:26 -0000 1.106 @@ -76,10 +76,6 @@ %{!?pgfts:%define pgfts 1} %{!?runselftest:%define runselftest 1} -%ifarch alpha - %define runselftest 0 -%endif - # Python major version. %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} @@ -87,7 +83,7 @@ Summary: PostgreSQL client programs and libraries Name: postgresql Version: 8.3.6 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Databases Url: http://www.postgresql.org/ @@ -397,8 +393,8 @@ # Strip out -ffast-math from CFLAGS.... CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100` -# use -O1 on sparc64 -%ifarch sparc64 +# use -O1 on sparc64 and alpha +%ifarch sparc64 alpha CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" ` %endif @@ -867,6 +863,10 @@ %endif %changelog +* Mon Mar 9 2009 Oliver Falk 8.3.6-2 +- Use -O1 on alpha, as on sparc64 +- Renable selftests on alpha again + * Sat Feb 7 2009 Tom Lane 8.3.6-1 - Update to PostgreSQL 8.3.6, for various fixes described at http://www.postgresql.org/docs/8.3/static/release-8-3-6.html From oliver at fedoraproject.org Mon Mar 9 09:39:47 2009 From: oliver at fedoraproject.org (Oliver Falk) Date: Mon, 9 Mar 2009 09:39:47 +0000 (UTC) Subject: rpms/postgresql/F-9 postgresql.spec,1.101,1.102 Message-ID: <20090309093947.BDDBD70116@cvs1.fedora.phx.redhat.com> Author: oliver Update of /cvs/pkgs/rpms/postgresql/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11553 Modified Files: postgresql.spec Log Message: * Mon Mar 9 2009 Oliver Falk 8.3.6-2 - Use -O1 on alpha, as on sparc64 - Renable selftests on alpha again Index: postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/postgresql/F-9/postgresql.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- postgresql.spec 2 Mar 2009 10:56:52 -0000 1.101 +++ postgresql.spec 9 Mar 2009 09:39:17 -0000 1.102 @@ -76,10 +76,6 @@ %{!?pgfts:%define pgfts 1} %{!?runselftest:%define runselftest 1} -%ifarch alpha - %define runselftest 0 -%endif - # Python major version. %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} @@ -87,7 +83,7 @@ Summary: PostgreSQL client programs and libraries Name: postgresql Version: 8.3.6 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Databases Url: http://www.postgresql.org/ @@ -397,8 +393,8 @@ # Strip out -ffast-math from CFLAGS.... CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100` -# use -O1 on sparc64 -%ifarch sparc64 +# use -O1 on sparc64 and alpha +%ifarch sparc64 alpha CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" ` %endif @@ -867,6 +863,10 @@ %endif %changelog +* Mon Mar 9 2009 Oliver Falk 8.3.6-2 +- Use -O1 on alpha, as on sparc64 +- Renable selftests on alpha again + * Sat Feb 7 2009 Tom Lane 8.3.6-1 - Update to PostgreSQL 8.3.6, for various fixes described at http://www.postgresql.org/docs/8.3/static/release-8-3-6.html From alexlan at fedoraproject.org Mon Mar 9 09:47:48 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Mon, 9 Mar 2009 09:47:48 +0000 (UTC) Subject: rpms/Miro/devel Miro-2.0.2-fhs.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 Miro.spec, 1.50, 1.51 sources, 1.15, 1.16 Miro-2.0-fhs.patch, 1.2, NONE Message-ID: <20090309094748.3FEB970116@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/extras/rpms/Miro/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13126 Modified Files: .cvsignore Miro.spec sources Added Files: Miro-2.0.2-fhs.patch Removed Files: Miro-2.0-fhs.patch Log Message: * Mon Mar 9 2009 Alex Lancaster - 2.0.2-1 - Update to upstream 2.0.2 - Add Requires: gstreamer-python (#489134) - Drop patch for libtorrent 0.13, applied upstream Miro-2.0.2-fhs.patch: --- NEW FILE Miro-2.0.2-fhs.patch --- --- Miro-2.0/platform/gtk-x11/setup.py.fhs 2009-02-09 23:34:54.000000000 -0500 --- Miro-2.0/platform/gtk-x11/setup.py 2009-02-10 22:15:58.126123836 -0500 @@ -660,7 +660,7 @@ [os.path.join(platform_dir, 'miro.1.gz')]), ('/usr/share/man/man1', [os.path.join(platform_dir, 'miro.real.1.gz')]), - ('/usr/lib/miro/', + ('/usr/libexec/', [os.path.join(platform_dir, 'xine/xine_extractor')]), ] --- Miro-2.0.2/platform/gtk-x11/plat/renderers/xinerenderer.py 2009-03-07 12:21:24.000000000 -0700 +++ Miro-2.0.2.modified/platform/gtk-x11/plat/renderers/xinerenderer.py 2009-03-09 02:06:25.000000000 -0700 @@ -214,8 +214,8 @@ logging.warn("set_rate not implemented for xine") def movie_data_program_info(self, movie_path, thumbnail_path): - if os.path.exists(resources.path('../../../lib/miro/xine_extractor')): - path = resources.path('../../../lib/miro/xine_extractor') + if os.path.exists(resources.path('/usr/libexec/xine_extractor')): + path = resources.path('/usr/libexec/xine_extractor') return ((path, movie_path, thumbnail_path), None) else: logging.error("xine_extractor cannot be found.") Only in Miro-2.0.2.modified/platform/gtk-x11/plat/renderers: xinerenderer.py~ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Miro/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 16 Feb 2009 05:05:32 -0000 1.15 +++ .cvsignore 9 Mar 2009 09:47:17 -0000 1.16 @@ -1 +1 @@ -Miro-2.0.tar.gz +Miro-2.0.2.tar.gz Index: Miro.spec =================================================================== RCS file: /cvs/extras/rpms/Miro/devel/Miro.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- Miro.spec 27 Feb 2009 14:06:07 -0000 1.50 +++ Miro.spec 9 Mar 2009 09:47:17 -0000 1.51 @@ -4,20 +4,16 @@ %define gecko_ver 1.9.1 Name: Miro -Version: 2.0 -Release: 5%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: Miro - Internet TV Player Group: Applications/Multimedia License: GPLv2+ URL: http://www.getmiro.com/ Source0: http://ftp.osuosl.org/pub/pculture.org/miro/src/%{name}-%{version}.tar.gz -Patch0: %{name}-2.0-fhs.patch -# Patch to allow use of libtorrent 0.13 -# http://bugzilla.pculture.org/show_bug.cgi?id=11385 -# Drop this when updating to 2.0.1 -Patch1: %{name}-2.0-libtorrent.patch -Patch2: %{name}-2.0-videodir.patch +Patch0: %{name}-2.0.2-fhs.patch +Patch1: %{name}-2.0-videodir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel xine-lib-devel Pyrex @@ -25,9 +21,12 @@ BuildRequires: gecko-devel-unstable = %{gecko_ver} gettext gtk2-devel BuildRequires: rb_libtorrent-devel rb_libtorrent-python -Requires: gecko-libs = %{gecko_ver} gnome-python2-gtkmozembed -Requires: gnome-python2-gconf dbus-python +Requires: gecko-libs = %{gecko_ver} +Requires: gnome-python2-gtkmozembed +Requires: gnome-python2-gconf +Requires: dbus-python Requires: rb_libtorrent-python +Requires: gstreamer-python Provides: Democracy = %{version}-%{release} Obsoletes: Democracy < 1.0 @@ -43,10 +42,7 @@ # Otherwise, the unpatched files get re-added into Miro # (and '.' breaks Python imports) %patch0 -p1 -%if 0%{?fedora} < 11 -%patch1 -p0 -%endif -%patch2 -p1 +%patch1 -p1 %build @@ -93,6 +89,11 @@ %changelog +* Mon Mar 9 2009 Alex Lancaster - 2.0.2-1 +- Update to upstream 2.0.2 +- Add Requires: gstreamer-python (#489134) +- Drop patch for libtorrent 0.13, applied upstream + * Fri Feb 27 2009 Alex Lancaster - 2.0-5 - Combine the fhs patches into one, and fix the path to /usr/libexec/xine_extractor (#487442) Index: sources =================================================================== RCS file: /cvs/extras/rpms/Miro/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 16 Feb 2009 05:05:32 -0000 1.15 +++ sources 9 Mar 2009 09:47:17 -0000 1.16 @@ -1 +1 @@ -6caef78badb3a68d3a5a1ffe16a5eeb5 Miro-2.0.tar.gz +ac72878d2faa0f62f96aca2e6d229cb9 Miro-2.0.2.tar.gz --- Miro-2.0-fhs.patch DELETED --- From fabbione at fedoraproject.org Mon Mar 9 09:53:51 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Mon, 9 Mar 2009 09:53:51 +0000 (UTC) Subject: rpms/corosync/devel corosync-trunk.diff, 1.3, 1.4 corosync.spec, 1.19, 1.20 Message-ID: <20090309095351.8FA3470116@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/corosync/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14807 Modified Files: corosync-trunk.diff corosync.spec Log Message: Update to svn1794 to include some important fixes corosync-trunk.diff: Index: corosync-trunk.diff =================================================================== RCS file: /cvs/pkgs/rpms/corosync/devel/corosync-trunk.diff,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- corosync-trunk.diff 6 Mar 2009 07:30:44 -0000 1.3 +++ corosync-trunk.diff 9 Mar 2009 09:53:20 -0000 1.4 @@ -1,6 +1,70 @@ -diff -Naurd corosync-0.94/exec/logsys.c corosync-trunk/exec/logsys.c ---- corosync-0.94/exec/logsys.c 2009-01-23 15:25:30.000000000 +0100 -+++ corosync-trunk/exec/logsys.c 2009-03-05 06:36:07.000000000 +0100 +diff -Naurd corosync-0.94.orig/exec/apidef.c corosync-trunk/exec/apidef.c +--- corosync-0.94.orig/exec/apidef.c 2009-02-25 12:14:47.000000000 +0100 ++++ corosync-trunk/exec/apidef.c 2009-03-06 08:38:34.000000000 +0100 +@@ -86,7 +86,6 @@ + .totem_family_get = totempg_my_family_get, + .totem_ring_reenable = totempg_ring_reenable, + .totem_mcast = main_mcast, +- .totem_send_ok = main_send_ok, + .totem_ifaces_get = totempg_ifaces_get, + .totem_ifaces_print = totempg_ifaces_print, + .totem_ip_print = totemip_print, +@@ -96,9 +95,11 @@ + .tpg_join = (typedef_tpg_join)totempg_groups_join, + .tpg_leave = (typedef_tpg_leave)totempg_groups_leave, + .tpg_joined_mcast = totempg_groups_mcast_joined, +- .tpg_joined_send_ok = totempg_groups_send_ok_joined, ++ .tpg_joined_reserve = totempg_groups_joined_reserve, ++ .tpg_joined_release = totempg_groups_joined_release, + .tpg_groups_mcast = (typedef_tpg_groups_mcast)totempg_groups_mcast_groups, +- .tpg_groups_send_ok = (typedef_tpg_groups_send_ok)totempg_groups_send_ok_groups, ++ .tpg_groups_reserve = NULL, ++ .tpg_groups_release = NULL, + .sync_request = sync_request, + .quorum_is_quorate = corosync_quorum_is_quorate, + .quorum_register_callback = corosync_quorum_register_callback, +diff -Naurd corosync-0.94.orig/exec/ipc.c corosync-trunk/exec/ipc.c +--- corosync-0.94.orig/exec/ipc.c 2009-03-03 01:58:16.000000000 +0100 ++++ corosync-trunk/exec/ipc.c 2009-03-06 08:38:34.000000000 +0100 +@@ -270,7 +270,7 @@ + struct res_overlay res_overlay; + struct iovec send_ok_joined_iovec; + int send_ok = 0; +- int send_ok_joined = 0; ++ int reserved_msgs = 0; + + for (;;) { + sop.sem_num = 0; +@@ -296,14 +296,16 @@ + + send_ok_joined_iovec.iov_base = (char *)header; + send_ok_joined_iovec.iov_len = header->size; +- send_ok_joined = totempg_groups_send_ok_joined (corosync_group_handle, ++ ++ reserved_msgs = totempg_groups_joined_reserve ( ++ corosync_group_handle, + &send_ok_joined_iovec, 1); + + send_ok = + (corosync_quorum_is_quorate() == 1 || ais_service[conn_info->service]->allow_inquorate == CS_LIB_ALLOW_INQUORATE) && ( + (ais_service[conn_info->service]->lib_engine[header->id].flow_control == CS_LIB_FLOW_CONTROL_NOT_REQUIRED) || + ((ais_service[conn_info->service]->lib_engine[header->id].flow_control == CS_LIB_FLOW_CONTROL_REQUIRED) && +- (send_ok_joined) && ++ (reserved_msgs) && + (sync_in_process() == 0))); + + if (send_ok) { +@@ -321,6 +323,7 @@ + res_overlay.header.size); + } + ++ totempg_groups_joined_release (reserved_msgs); + cs_conn_refcount_dec (conn); + } + pthread_exit (0); +diff -Naurd corosync-0.94.orig/exec/logsys.c corosync-trunk/exec/logsys.c +--- corosync-0.94.orig/exec/logsys.c 2009-01-23 15:25:30.000000000 +0100 ++++ corosync-trunk/exec/logsys.c 2009-03-06 08:09:24.000000000 +0100 @@ -112,8 +112,6 @@ static int logsys_facility = LOG_DAEMON; @@ -31,8 +95,25 @@ pthread_mutex_unlock (&logsys_config_mutex); } -diff -Naurd corosync-0.94/exec/mainconfig.c corosync-trunk/exec/mainconfig.c ---- corosync-0.94/exec/mainconfig.c 2009-02-25 12:14:47.000000000 +0100 +diff -Naurd corosync-0.94.orig/exec/main.c corosync-trunk/exec/main.c +--- corosync-0.94.orig/exec/main.c 2009-02-25 12:14:47.000000000 +0100 ++++ corosync-trunk/exec/main.c 2009-03-06 08:38:34.000000000 +0100 +@@ -448,13 +448,6 @@ + return (totempg_groups_mcast_joined (corosync_group_handle, iovec, iov_len, guarantee)); + } + +-extern int main_send_ok ( +- struct iovec *iovec, +- int iov_len) +-{ +- return (totempg_groups_send_ok_joined (corosync_group_handle, iovec, iov_len)); +-} +- + int main (int argc, char **argv) + { + char *error_string; +diff -Naurd corosync-0.94.orig/exec/mainconfig.c corosync-trunk/exec/mainconfig.c +--- corosync-0.94.orig/exec/mainconfig.c 2009-02-25 12:14:47.000000000 +0100 +++ corosync-trunk/exec/mainconfig.c 2009-03-04 11:14:36.000000000 +0100 @@ -158,16 +158,14 @@ } @@ -53,9 +134,20 @@ } /* free old string on reload */ -diff -Naurd corosync-0.94/exec/Makefile corosync-trunk/exec/Makefile -diff -Naurd corosync-0.94/exec/totemip.c corosync-trunk/exec/totemip.c ---- corosync-0.94/exec/totemip.c 2009-01-26 21:46:45.000000000 +0100 +diff -Naurd corosync-0.94.orig/exec/main.h corosync-trunk/exec/main.h +--- corosync-0.94.orig/exec/main.h 2009-02-25 12:14:47.000000000 +0100 ++++ corosync-trunk/exec/main.h 2009-03-06 08:38:34.000000000 +0100 +@@ -62,8 +62,4 @@ + int iov_len, + unsigned int guarantee); + +-extern int main_send_ok ( +- struct iovec *iovec, +- int iov_len); +- + #endif /* MAIN_H_DEFINED */ +diff -Naurd corosync-0.94.orig/exec/totemip.c corosync-trunk/exec/totemip.c +--- corosync-0.94.orig/exec/totemip.c 2009-01-26 21:46:45.000000000 +0100 +++ corosync-trunk/exec/totemip.c 2009-03-03 04:57:37.000000000 +0100 @@ -406,6 +406,7 @@ memset(&nladdr, 0, sizeof(nladdr)); @@ -65,10 +157,430 @@ req.nlh.nlmsg_len = sizeof(req); req.nlh.nlmsg_type = RTM_GETADDR; req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST; -diff -Naurd corosync-0.94/lib/Makefile corosync-trunk/lib/Makefile -diff -Naurd corosync-0.94/Makefile corosync-trunk/Makefile -diff -Naurd corosync-0.94/services/cpg.c corosync-trunk/services/cpg.c ---- corosync-0.94/services/cpg.c 2009-03-03 01:57:44.000000000 +0100 +diff -Naurd corosync-0.94.orig/exec/totempg.c corosync-trunk/exec/totempg.c +--- corosync-0.94.orig/exec/totempg.c 2009-02-25 12:14:47.000000000 +0100 ++++ corosync-trunk/exec/totempg.c 2009-03-06 08:38:34.000000000 +0100 +@@ -145,6 +145,8 @@ + + static int mcast_packed_msg_count = 0; + ++static int totempg_reserved = 0; ++ + /* + * Function and data used to log messages + */ +@@ -225,8 +227,6 @@ + .mutex = PTHREAD_MUTEX_INITIALIZER + }; + +-static int send_ok (int msg_size); +- + static unsigned char next_fragment = 1; + + static pthread_mutex_t totempg_mutex = PTHREAD_MUTEX_INITIALIZER; +@@ -241,6 +241,10 @@ + __FILE__, __LINE__, level, format, ##args); \ + } while (0); + ++static int msg_count_send_ok (int msg_count); ++ ++static int byte_count_send_ok (int byte_count); ++ + static struct assembly *assembly_ref (unsigned int nodeid) + { + struct assembly *assembly; +@@ -765,7 +769,7 @@ + total_size += iovec[i].iov_len; + } + +- if (send_ok (total_size + sizeof(unsigned short) * ++ if (byte_count_send_ok (total_size + sizeof(unsigned short) * + (mcast_packed_msg_count+1)) == 0) { + + pthread_mutex_unlock (&mcast_msg_mutex); +@@ -888,23 +892,44 @@ + /* + * Determine if a message of msg_size could be queued + */ +-#define FUZZY_AVAIL_SUBTRACT 5 +-static int send_ok ( +- int msg_size) ++static int msg_count_send_ok ( ++ int msg_count) + { + int avail = 0; +- int total; + +- avail = totemmrp_avail () - FUZZY_AVAIL_SUBTRACT; ++ avail = totemmrp_avail () - totempg_reserved - 1; + +- /* +- * msg size less then totempg_totem_config->net_mtu - 25 will take up +- * a full message, so add +1 +- * totempg_totem_config->net_mtu - 25 is for the totempg_mcast header +- */ +- total = (msg_size / (totempg_totem_config->net_mtu - 25)) + 1; ++ return (avail > msg_count); ++} + +- return (avail >= total); ++static int byte_count_send_ok ( ++ int byte_count) ++{ ++ unsigned int msg_count = 0; ++ int avail = 0; ++ ++ avail = totemmrp_avail () - 1; ++ ++ msg_count = (byte_count / (totempg_totem_config->net_mtu - 25)) + 1; ++ ++ return (avail > msg_count); ++} ++ ++static int send_reserve ( ++ int msg_size) ++{ ++ unsigned int msg_count = 0; ++ ++ msg_count = (msg_size / (totempg_totem_config->net_mtu - 25)) + 1; ++ totempg_reserved += msg_count; ++ ++ return (msg_count); ++} ++ ++static void send_release ( ++ int msg_count) ++{ ++ totempg_reserved -= msg_count; + } + + int totempg_callback_token_create ( +@@ -1091,7 +1116,7 @@ + return (res); + } + +-int totempg_groups_send_ok_joined ( ++int totempg_groups_joined_reserve ( + hdb_handle_t handle, + struct iovec *iovec, + int iov_len) +@@ -1100,6 +1125,7 @@ + unsigned int size = 0; + unsigned int i; + unsigned int res; ++ unsigned int reserved = 0; + + pthread_mutex_lock (&totempg_mutex); + pthread_mutex_lock (&mcast_msg_mutex); +@@ -1116,14 +1142,28 @@ + size += iovec[i].iov_len; + } + +- res = send_ok (size); ++ reserved = send_reserve (size); ++ if (msg_count_send_ok (reserved) == 0) { ++ send_release (reserved); ++ reserved = 0; ++ } + + hdb_handle_put (&totempg_groups_instance_database, handle); + + error_exit: + pthread_mutex_unlock (&mcast_msg_mutex); + pthread_mutex_unlock (&totempg_mutex); +- return (res); ++ return (reserved); ++} ++ ++ ++void totempg_groups_joined_release (int msg_count) ++{ ++ pthread_mutex_lock (&totempg_mutex); ++ pthread_mutex_lock (&mcast_msg_mutex); ++ send_release (msg_count); ++ pthread_mutex_unlock (&mcast_msg_mutex); ++ pthread_mutex_unlock (&totempg_mutex); + } + + int totempg_groups_mcast_groups ( +@@ -1201,7 +1241,7 @@ + size += iovec[i].iov_len; + } + +- res = send_ok (size); ++ res = msg_count_send_ok (size); + + hdb_handle_put (&totempg_groups_instance_database, handle); + error_exit: +diff -Naurd corosync-0.94.orig/include/corosync/engine/coroapi.h corosync-trunk/include/corosync/engine/coroapi.h +--- corosync-0.94.orig/include/corosync/engine/coroapi.h 2009-02-26 15:49:41.000000000 +0100 ++++ corosync-trunk/include/corosync/engine/coroapi.h 2009-03-06 08:38:34.000000000 +0100 +@@ -413,8 +413,6 @@ + + int (*totem_mcast) (struct iovec *iovec, int iov_len, unsigned int guarantee); + +- int (*totem_send_ok) (struct iovec *iovec, int iov_len); +- + int (*totem_ifaces_get) ( + unsigned int nodeid, + struct totem_ip_address *interfaces, +@@ -472,11 +470,14 @@ + int iov_len, + int guarantee); + +- int (*tpg_joined_send_ok) ( ++ int (*tpg_joined_reserve) ( + hdb_handle_t handle, + struct iovec *iovec, + int iov_len); + ++ int (*tpg_joined_release) ( ++ int reserved_msgs); ++ + int (*tpg_groups_mcast) ( + hdb_handle_t handle, + int guarantee, +@@ -485,13 +486,16 @@ + struct iovec *iovec, + int iov_len); + +- int (*tpg_groups_send_ok) ( ++ int (*tpg_groups_reserve) ( + hdb_handle_t handle, + struct corosync_tpg_group *groups, + int groups_cnt, + struct iovec *iovec, + int iov_len); + ++ int (*tpg_groups_release) ( ++ int reserved_msgs); ++ + int (*sync_request) ( + char *service_name); + +diff -Naurd corosync-0.94.orig/include/corosync/ipc_cfg.h corosync-trunk/include/corosync/ipc_cfg.h +--- corosync-0.94.orig/include/corosync/ipc_cfg.h 2009-02-19 03:23:58.000000000 +0100 ++++ corosync-trunk/include/corosync/ipc_cfg.h 2009-03-06 11:07:35.000000000 +0100 +@@ -69,7 +69,8 @@ + MESSAGE_RES_CFG_TRYSHUTDOWN = 9, + MESSAGE_RES_CFG_TESTSHUTDOWN = 10, + MESSAGE_RES_CFG_GET_NODE_ADDRS = 11, +- MESSAGE_RES_CFG_LOCAL_GET = 12 ++ MESSAGE_RES_CFG_LOCAL_GET = 12, ++ MESSAGE_RES_CFG_REPLYTOSHUTDOWN = 13 + }; + + struct req_lib_cfg_statetrack { +diff -Naurd corosync-0.94.orig/include/corosync/totem/totempg.h corosync-trunk/include/corosync/totem/totempg.h +--- corosync-0.94.orig/include/corosync/totem/totempg.h 2009-02-25 12:14:47.000000000 +0100 ++++ corosync-trunk/include/corosync/totem/totempg.h 2009-03-06 08:38:34.000000000 +0100 +@@ -110,10 +110,13 @@ + int iov_len, + int guarantee); + +-extern int totempg_groups_send_ok_joined ( ++extern int totempg_groups_joined_reserve ( + hdb_handle_t handle, + struct iovec *iovec, + int iov_len); ++ ++extern void totempg_groups_joined_release ( ++ int msg_count); + + extern int totempg_groups_mcast_groups ( + hdb_handle_t handle, +diff -Naurd corosync-0.94.orig/lib/cfg.c corosync-trunk/lib/cfg.c +--- corosync-0.94.orig/lib/cfg.c 2009-02-19 03:23:58.000000000 +0100 ++++ corosync-trunk/lib/cfg.c 2009-03-06 11:07:35.000000000 +0100 +@@ -295,8 +295,6 @@ + + pthread_mutex_destroy (&cfg_instance->dispatch_mutex); + +- cslib_service_disconnect (&cfg_instance->ipc_ctx); +- + (void)saHandleDestroy (&cfg_hdb, cfg_handle); + + (void)saHandleInstancePut (&cfg_hdb, cfg_handle); +diff -Naurd corosync-0.94.orig/services/cfg.c corosync-trunk/services/cfg.c +--- corosync-0.94.orig/services/cfg.c 2009-02-25 12:14:47.000000000 +0100 ++++ corosync-trunk/services/cfg.c 2009-03-06 11:07:35.000000000 +0100 +@@ -237,8 +237,8 @@ + }, + { /* 10 */ + .lib_handler_fn = message_handler_req_lib_cfg_replytoshutdown, +- .response_size = 0, +- .response_id = 0, ++ .response_size = sizeof (struct res_lib_cfg_replytoshutdown), ++ .response_id = MESSAGE_RES_CFG_REPLYTOSHUTDOWN, + .flow_control = CS_LIB_FLOW_CONTROL_NOT_REQUIRED + }, + { /* 11 */ +@@ -385,7 +385,7 @@ + return 0; + } + +-static void send_test_shutdown(void * conn, int status) ++static void send_test_shutdown(void *only_conn, void *exclude_conn, int status) + { + struct res_lib_cfg_testshutdown res_lib_cfg_testshutdown; + struct list_head *iter; +@@ -396,17 +396,19 @@ + res_lib_cfg_testshutdown.header.error = status; + res_lib_cfg_testshutdown.flags = shutdown_flags; + +- if (conn) { +- TRACE1("sending testshutdown to %p", conn); +- api->ipc_response_send(conn, &res_lib_cfg_testshutdown, +- sizeof(res_lib_cfg_testshutdown)); ++ if (only_conn) { ++ TRACE1("sending testshutdown to only %p", only_conn); ++ api->ipc_dispatch_send(only_conn, &res_lib_cfg_testshutdown, ++ sizeof(res_lib_cfg_testshutdown)); + } else { + for (iter = trackers_list.next; iter != &trackers_list; iter = iter->next) { + struct cfg_info *ci = list_entry(iter, struct cfg_info, list); + +- TRACE1("sending testshutdown to %p", ci->tracker_conn); +- api->ipc_dispatch_send(ci->tracker_conn, &res_lib_cfg_testshutdown, +- sizeof(res_lib_cfg_testshutdown)); ++ if (ci->conn != exclude_conn) { ++ TRACE1("sending testshutdown to %p", ci->tracker_conn); ++ api->ipc_dispatch_send(ci->tracker_conn, &res_lib_cfg_testshutdown, ++ sizeof(res_lib_cfg_testshutdown)); ++ } + } + } + LEAVE(); +@@ -436,11 +438,6 @@ + shutdown_flags == CFG_SHUTDOWN_FLAG_REGARDLESS) { + TRACE1("shutdown confirmed"); + +- /* +- * Tell other nodes we are going down +- */ +- send_shutdown(); +- + res_lib_cfg_tryshutdown.header.size = sizeof(struct res_lib_cfg_tryshutdown); + res_lib_cfg_tryshutdown.header.id = MESSAGE_RES_CFG_TRYSHUTDOWN; + res_lib_cfg_tryshutdown.header.error = CS_OK; +@@ -451,6 +448,12 @@ + api->ipc_response_send(shutdown_con->conn, &res_lib_cfg_tryshutdown, + sizeof(res_lib_cfg_tryshutdown)); + shutdown_con = NULL; ++ ++ /* ++ * Tell other nodes we are going down ++ */ ++ send_shutdown(); ++ + } + else { + +@@ -486,7 +489,7 @@ + shutdown_no = shutdown_expected; + check_shutdown_status(); + +- send_test_shutdown(NULL, CS_ERR_TIMEOUT); ++ send_test_shutdown(NULL, NULL, CS_ERR_TIMEOUT); + LEAVE(); + } + +@@ -695,7 +698,6 @@ + void *msg) + { + struct cfg_info *ci = (struct cfg_info *)api->ipc_private_data_get (conn); +-// struct req_lib_cfg_statetrack *req_lib_cfg_statetrack = (struct req_lib_cfg_statetrack *)message; + struct res_lib_cfg_statetrack res_lib_cfg_statetrack; + + ENTER(); +@@ -713,7 +715,7 @@ + */ + ci->shutdown_reply = SHUTDOWN_REPLY_UNKNOWN; + shutdown_expected++; +- send_test_shutdown(conn, CS_OK); ++ send_test_shutdown(conn, NULL, CS_OK); + } + } + +@@ -898,15 +900,32 @@ + shutdown_expected = 0; + + for (iter = trackers_list.next; iter != &trackers_list; iter = iter->next) { +- struct cfg_info *ci = list_entry(iter, struct cfg_info, list); +- ci->shutdown_reply = SHUTDOWN_REPLY_UNKNOWN; +- shutdown_expected++; ++ struct cfg_info *testci = list_entry(iter, struct cfg_info, list); ++ /* ++ * It is assumed that we will allow shutdown ++ */ ++ if (testci != ci) { ++ testci->shutdown_reply = SHUTDOWN_REPLY_UNKNOWN; ++ shutdown_expected++; ++ } + } + + /* + * If no-one is listening for events then we can just go down now + */ + if (shutdown_expected == 0) { ++ struct res_lib_cfg_tryshutdown res_lib_cfg_tryshutdown; ++ ++ res_lib_cfg_tryshutdown.header.size = sizeof(struct res_lib_cfg_tryshutdown); ++ res_lib_cfg_tryshutdown.header.id = MESSAGE_RES_CFG_TRYSHUTDOWN; ++ res_lib_cfg_tryshutdown.header.error = CS_OK; ++ ++ /* ++ * Tell originator that shutdown was confirmed ++ */ ++ api->ipc_response_send(conn, &res_lib_cfg_tryshutdown, ++ sizeof(res_lib_cfg_tryshutdown)); ++ + send_shutdown(); + LEAVE(); + return; +@@ -944,7 +963,7 @@ + /* + * Tell the users we would like to shut down + */ +- send_test_shutdown(NULL, CS_OK); ++ send_test_shutdown(NULL, conn, CS_OK); + } + + /* +@@ -961,11 +980,13 @@ + { + struct cfg_info *ci = (struct cfg_info *)api->ipc_private_data_get (conn); + struct req_lib_cfg_replytoshutdown *req_lib_cfg_replytoshutdown = (struct req_lib_cfg_replytoshutdown *)msg; ++ struct res_lib_cfg_replytoshutdown res_lib_cfg_replytoshutdown; ++ int status = CS_OK; + + ENTER(); + if (!shutdown_con) { +- LEAVE(); +- return; ++ status = CS_ERR_ACCESS; ++ goto exit_fn; + } + + if (req_lib_cfg_replytoshutdown->response) { +@@ -977,6 +998,15 @@ + ci->shutdown_reply = SHUTDOWN_REPLY_NO; + } + check_shutdown_status(); ++ ++exit_fn: ++ res_lib_cfg_replytoshutdown.header.error = status; ++ res_lib_cfg_replytoshutdown.header.id = MESSAGE_RES_CFG_REPLYTOSHUTDOWN; ++ res_lib_cfg_replytoshutdown.header.size = sizeof(res_lib_cfg_replytoshutdown); ++ ++ api->ipc_response_send(conn, &res_lib_cfg_replytoshutdown, ++ sizeof(res_lib_cfg_replytoshutdown)); ++ + LEAVE(); + } + +diff -Naurd corosync-0.94.orig/services/cpg.c corosync-trunk/services/cpg.c +--- corosync-0.94.orig/services/cpg.c 2009-03-03 01:57:44.000000000 +0100 +++ corosync-trunk/services/cpg.c 2009-03-06 03:42:48.000000000 +0100 @@ -489,8 +489,8 @@ notify_info.nodeid = api->totem_nodeid_get(); @@ -80,3 +592,141 @@ api->ipc_refcnt_dec (conn); return (0); } +diff -Naurd corosync-0.94.orig/services/evs.c corosync-trunk/services/evs.c +--- corosync-0.94.orig/services/evs.c 2009-02-19 03:23:58.000000000 +0100 ++++ corosync-trunk/services/evs.c 2009-03-06 08:38:34.000000000 +0100 +@@ -363,7 +363,6 @@ + struct res_lib_evs_mcast_joined res_lib_evs_mcast_joined; + struct iovec req_exec_evs_mcast_iovec[3]; + struct req_exec_evs_mcast req_exec_evs_mcast; +- int send_ok = 0; + int res; + struct evs_pd *evs_pd = (struct evs_pd *)api->ipc_private_data_get (conn); + +@@ -382,8 +381,6 @@ + req_exec_evs_mcast_iovec[1].iov_len = evs_pd->group_entries * sizeof (struct evs_group); + req_exec_evs_mcast_iovec[2].iov_base = (char *)&req_lib_evs_mcast_joined->msg; + req_exec_evs_mcast_iovec[2].iov_len = req_lib_evs_mcast_joined->msg_len; +-// TODO this doesn't seem to work for some reason +- send_ok = api->totem_send_ok (req_exec_evs_mcast_iovec, 3); + + res = api->totem_mcast (req_exec_evs_mcast_iovec, 3, TOTEM_AGREED); + // TODO +@@ -407,7 +404,6 @@ + struct iovec req_exec_evs_mcast_iovec[3]; + struct req_exec_evs_mcast req_exec_evs_mcast; + char *msg_addr; +- int send_ok = 0; + int res; + + req_exec_evs_mcast.header.size = sizeof (struct req_exec_evs_mcast) + +@@ -430,8 +426,6 @@ + req_exec_evs_mcast_iovec[2].iov_base = msg_addr; + req_exec_evs_mcast_iovec[2].iov_len = req_lib_evs_mcast_groups->msg_len; + +-// TODO this is wacky +- send_ok = api->totem_send_ok (req_exec_evs_mcast_iovec, 3); + res = api->totem_mcast (req_exec_evs_mcast_iovec, 3, TOTEM_AGREED); + if (res == 0) { + error = CS_OK; +diff -Naurd corosync-0.94.orig/tools/corosync-cfgtool.c corosync-trunk/tools/corosync-cfgtool.c +--- corosync-0.94.orig/tools/corosync-cfgtool.c 2009-02-13 10:21:57.000000000 +0100 ++++ corosync-trunk/tools/corosync-cfgtool.c 2009-03-06 11:07:35.000000000 +0100 +@@ -147,36 +147,13 @@ + (void)corosync_cfg_finalize (handle); + } + +-void shutdown_callback (corosync_cfg_handle_t cfg_handle, corosync_cfg_shutdown_flags_t flags) +-{ +- printf("shutdown callback called, flags = %d\n",flags); +- +- (void)corosync_cfg_replyto_shutdown (cfg_handle, COROSYNC_CFG_SHUTDOWN_FLAG_YES); +-} +- +-void *shutdown_dispatch_thread(void *arg) +-{ +- int res = CS_OK; +- corosync_cfg_handle_t *handle = arg; +- +- while (res == CS_OK) { +- res = corosync_cfg_dispatch(*handle, CS_DISPATCH_ALL); +- if (res != CS_OK) +- printf ("Could not dispatch cfg messages: %d\n", res); +- } +- return NULL; +-} +- + void shutdown_do() + { + cs_error_t result; + corosync_cfg_handle_t handle; + corosync_cfg_callbacks_t callbacks; +- corosync_cfg_state_notification_t notification_buffer; +- pthread_t dispatch_thread; + +- printf ("Shutting down corosync\n"); +- callbacks.corosync_cfg_shutdown_callback = shutdown_callback; ++ callbacks.corosync_cfg_shutdown_callback = NULL; + + result = corosync_cfg_initialize (&handle, &callbacks); + if (result != CS_OK) { +@@ -184,16 +161,7 @@ + exit (1); + } + +- pthread_create(&dispatch_thread, NULL, shutdown_dispatch_thread, &handle); +- +- result = corosync_cfg_state_track (handle, +- 0, +- ¬ification_buffer); +- if (result != CS_OK) { +- printf ("Could not start corosync cfg tracking error %d\n", result); +- exit (1); +- } +- ++ printf ("Shutting down corosync\n"); + result = corosync_cfg_try_shutdown (handle, COROSYNC_CFG_SHUTDOWN_FLAG_REQUEST); + if (result != CS_OK) { + printf ("Could not shutdown (error = %d)\n", result); +@@ -262,7 +230,7 @@ + + void usage_do (void) + { +- printf ("corosync-cfgtool [-s] [-r] [-l] [-u] [service_name] [-v] [version] [-k] [nodeid] [-a] [nodeid]\n\n"); ++ printf ("corosync-cfgtool [-s] [-r] [-l] [-u] [-H] [service_name] [-v] [version] [-k] [nodeid] [-a] [nodeid]\n\n"); + printf ("A tool for displaying and configuring active parameters within corosync.\n"); + printf ("options:\n"); + printf ("\t-s\tDisplays the status of the current rings on this node.\n"); +@@ -272,11 +240,11 @@ + printf ("\t-u\tUnload a service identified by name.\n"); + printf ("\t-a\tDisplay the IP address(es) of a node\n"); + printf ("\t-k\tKill a node identified by node id.\n"); +- printf ("\t-h\tShutdown corosync cleanly on this node.\n"); ++ printf ("\t-H\tShutdown corosync cleanly on this node.\n"); + } + + int main (int argc, char *argv[]) { +- const char *options = "srl:u:v:k:a:h"; ++ const char *options = "srl:u:v:k:a:hH"; + int opt; + int service_load = 0; + unsigned int nodeid; +@@ -307,7 +275,7 @@ + nodeid = atoi (optarg); + killnode_do(nodeid); + break; +- case 'h': ++ case 'H': + shutdown_do(); + break; + case 'a': +@@ -316,6 +284,9 @@ + case 'v': + version = atoi (optarg); + break; ++ case 'h': ++ usage_do(); ++ break; + } + } + Index: corosync.spec =================================================================== RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- corosync.spec 6 Mar 2009 07:30:44 -0000 1.19 +++ corosync.spec 9 Mar 2009 09:53:21 -0000 1.20 @@ -1,9 +1,9 @@ -%define alphatag svn1792 +%define alphatag svn1794 Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 0.94 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} License: BSD Group: System Environment/Base URL: http://www.openais.org @@ -190,6 +190,11 @@ %{_mandir}/man8/votequorum_overview.8* %changelog +* Mon Mar 9 2009 Fabio M. Di Nitto - 0.94-3.svn1794 +- Import fixes from upstream: + * Add reserve/release feature to totem message queue space (1793) + * Fix CG shutdown (1794) + * Fri Mar 6 2009 Fabio M. Di Nitto - 0.94-2.svn1792 - Import fixes from upstream: * Fix uninitialized memory. Spotted by valgrind (1788) From nphilipp at fedoraproject.org Mon Mar 9 09:56:04 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 9 Mar 2009 09:56:04 +0000 (UTC) Subject: rpms/gimp/devel gimp.spec,1.182,1.183 Message-ID: <20090309095604.2791F70116@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/gimp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15342 Modified Files: gimp.spec Log Message: rebuild against new WebKit Index: gimp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- gimp.spec 24 Feb 2009 21:33:18 -0000 1.182 +++ gimp.spec 9 Mar 2009 09:55:33 -0000 1.183 @@ -24,7 +24,7 @@ Name: gimp Epoch: 2 Version: 2.6.5 -Release: 2%{?dist} +Release: 3%{?dist} %define binver 2.6 %define gimp_lang_ver 20 %define interfacever 2.0 @@ -463,6 +463,9 @@ %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser %changelog +* Mon Mar 09 2009 Nils Philippsen - 2:2.6.5-3 +- rebuild against new WebKit + * Tue Feb 24 2009 Fedora Release Engineering - 2:2.6.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Mon Mar 9 10:06:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 10:06:32 +0000 Subject: [pkgdb] mrxvt ownership updated Message-ID: <20090309100732.ECAB5208543@bastion.fedora.phx.redhat.com> Package mrxvt in Fedora devel is now owned by tbzatek To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mrxvt From alexlan at fedoraproject.org Mon Mar 9 10:07:31 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Mon, 9 Mar 2009 10:07:31 +0000 (UTC) Subject: rpms/Miro/F-10 Miro-2.0.2-fhs.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 Miro.spec, 1.48, 1.49 sources, 1.15, 1.16 Miro-2.0-fhs.patch, 1.2, NONE Miro-2.0-libtorrent.patch, 1.1, NONE Message-ID: <20090309100731.D29F770116@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/extras/rpms/Miro/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18355 Modified Files: .cvsignore Miro.spec sources Added Files: Miro-2.0.2-fhs.patch Removed Files: Miro-2.0-fhs.patch Miro-2.0-libtorrent.patch Log Message: * Mon Mar 9 2009 Alex Lancaster - 2.0.2-1 - Update to upstream 2.0.2 - Add Requires: gstreamer-python (#489134) - Drop patch for libtorrent 0.13, applied upstream Miro-2.0.2-fhs.patch: --- NEW FILE Miro-2.0.2-fhs.patch --- --- Miro-2.0/platform/gtk-x11/setup.py.fhs 2009-02-09 23:34:54.000000000 -0500 --- Miro-2.0/platform/gtk-x11/setup.py 2009-02-10 22:15:58.126123836 -0500 @@ -660,7 +660,7 @@ [os.path.join(platform_dir, 'miro.1.gz')]), ('/usr/share/man/man1', [os.path.join(platform_dir, 'miro.real.1.gz')]), - ('/usr/lib/miro/', + ('/usr/libexec/', [os.path.join(platform_dir, 'xine/xine_extractor')]), ] --- Miro-2.0.2/platform/gtk-x11/plat/renderers/xinerenderer.py 2009-03-07 12:21:24.000000000 -0700 +++ Miro-2.0.2.modified/platform/gtk-x11/plat/renderers/xinerenderer.py 2009-03-09 02:06:25.000000000 -0700 @@ -214,8 +214,8 @@ logging.warn("set_rate not implemented for xine") def movie_data_program_info(self, movie_path, thumbnail_path): - if os.path.exists(resources.path('../../../lib/miro/xine_extractor')): - path = resources.path('../../../lib/miro/xine_extractor') + if os.path.exists(resources.path('/usr/libexec/xine_extractor')): + path = resources.path('/usr/libexec/xine_extractor') return ((path, movie_path, thumbnail_path), None) else: logging.error("xine_extractor cannot be found.") Only in Miro-2.0.2.modified/platform/gtk-x11/plat/renderers: xinerenderer.py~ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Miro/F-10/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 25 Feb 2009 07:30:07 -0000 1.15 +++ .cvsignore 9 Mar 2009 10:07:00 -0000 1.16 @@ -1 +1 @@ -Miro-2.0.tar.gz +Miro-2.0.2.tar.gz Index: Miro.spec =================================================================== RCS file: /cvs/extras/rpms/Miro/F-10/Miro.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- Miro.spec 6 Mar 2009 08:50:23 -0000 1.48 +++ Miro.spec 9 Mar 2009 10:07:01 -0000 1.49 @@ -4,19 +4,16 @@ %define gecko_ver 1.9.0.7 Name: Miro -Version: 2.0 -Release: 4%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: Miro - Internet TV Player + Group: Applications/Multimedia License: GPLv2+ URL: http://www.getmiro.com/ Source0: http://ftp.osuosl.org/pub/pculture.org/miro/src/%{name}-%{version}.tar.gz -Patch0: %{name}-2.0-fhs.patch -# Patch to allow use of libtorrent 0.13 -# http://bugzilla.pculture.org/show_bug.cgi?id=11385 -# Drop this when updating to 2.0.1 -Patch1: %{name}-2.0-libtorrent.patch -Patch2: %{name}-2.0-videodir.patch +Patch0: %{name}-2.0.2-fhs.patch +Patch1: %{name}-2.0-videodir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel xine-lib-devel Pyrex @@ -24,9 +21,12 @@ BuildRequires: gecko-devel-unstable = %{gecko_ver} gettext gtk2-devel BuildRequires: rb_libtorrent-devel rb_libtorrent-python -Requires: gecko-libs = %{gecko_ver} gnome-python2-gtkmozembed -Requires: gnome-python2-gconf dbus-python +Requires: gecko-libs = %{gecko_ver} +Requires: gnome-python2-gtkmozembed +Requires: gnome-python2-gconf +Requires: dbus-python Requires: rb_libtorrent-python +Requires: gstreamer-python Provides: Democracy = %{version}-%{release} Obsoletes: Democracy < 1.0 @@ -42,10 +42,7 @@ # Otherwise, the unpatched files get re-added into Miro # (and '.' breaks Python imports) %patch0 -p1 -%if 0%{?fedora} < 11 -%patch1 -p0 -%endif -%patch2 -p1 +%patch1 -p1 %build @@ -92,6 +89,11 @@ %changelog +* Mon Mar 9 2009 Alex Lancaster - 2.0.2-1 +- Update to upstream 2.0.2 +- Add Requires: gstreamer-python (#489134) +- Drop patch for libtorrent 0.13, applied upstream + * Fri Mar 06 2009 Jan Horak - 2.0-4 - Rebuild against newer gecko Index: sources =================================================================== RCS file: /cvs/extras/rpms/Miro/F-10/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 25 Feb 2009 07:30:08 -0000 1.15 +++ sources 9 Mar 2009 10:07:01 -0000 1.16 @@ -1 +1 @@ -6caef78badb3a68d3a5a1ffe16a5eeb5 Miro-2.0.tar.gz +ac72878d2faa0f62f96aca2e6d229cb9 Miro-2.0.2.tar.gz --- Miro-2.0-fhs.patch DELETED --- --- Miro-2.0-libtorrent.patch DELETED --- From fabbione at fedoraproject.org Mon Mar 9 10:08:08 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Mon, 9 Mar 2009 10:08:08 +0000 (UTC) Subject: rpms/openais/devel openais-trunk.diff, 1.2, 1.3 openais.spec, 1.40, 1.41 Message-ID: <20090309100808.6399C70116@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/openais/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18448 Modified Files: openais.spec Added Files: openais-trunk.diff Log Message: Import fixes from upstream svn openais-trunk.diff: Index: openais-trunk.diff =================================================================== RCS file: openais-trunk.diff diff -N openais-trunk.diff --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openais-trunk.diff 9 Mar 2009 10:08:07 -0000 1.3 @@ -0,0 +1,58 @@ +diff -Naurd openais-0.93.orig/services/amf.c openais-trunk/services/amf.c +--- openais-0.93.orig/services/amf.c 2009-02-19 03:22:07.000000000 +0100 ++++ openais-trunk/services/amf.c 2009-03-06 08:37:15.000000000 +0100 +@@ -2342,7 +2342,7 @@ + { + struct res_lib_amf_response res_lib; + struct req_lib_amf_response *req_lib = msg; +- int multicast, send_ok; ++ int multicast; + SaAisErrorT retval; + SaUint32T interface; + SaNameT dn; +@@ -2375,18 +2375,7 @@ + req_exec.error = req_lib->error; + iovec.iov_base = (char *)&req_exec; + iovec.iov_len = sizeof (req_exec); +- send_ok = api->totem_send_ok (&iovec, 1); +- +- if (send_ok) { +- if (api->totem_mcast (&iovec, 1, TOTEM_AGREED) == 0) { +- goto end; +- } else { +- corosync_fatal_error (COROSYNC_FATAL_ERR); +- } +- } else { +- /* TOTEM queue is full, try again later */ +- retval = SA_AIS_ERR_TRY_AGAIN; +- } ++ assert (api->totem_mcast (&iovec, 1, TOTEM_AGREED) == 0); + } + + send_response: +diff -Naurd openais-0.93.orig/services/lck.c openais-trunk/services/lck.c +--- openais-0.93.orig/services/lck.c 2009-02-19 03:22:07.000000000 +0100 ++++ openais-trunk/services/lck.c 2009-03-06 08:37:15.000000000 +0100 +@@ -1126,10 +1126,7 @@ + iovec.iov_base = (char *)&req_exec_lck_resourceclose; + iovec.iov_len = sizeof (req_exec_lck_resourceclose); + +- if (api->totem_send_ok (&iovec, 1)) { +- assert (api->totem_mcast (&iovec, 1, TOTEM_AGREED) == 0); +- return (0); +- } ++ assert (api->totem_mcast (&iovec, 1, TOTEM_AGREED) == 0); + return (-1); + } + +@@ -2235,9 +2232,7 @@ + iovecs[0].iov_base = (char *)&req_exec_lck_resourceclose; + iovecs[0].iov_len = sizeof (req_exec_lck_resourceclose); + +- if (api->totem_send_ok (iovecs, 1)) { +- assert (api->totem_mcast (iovecs, 1, TOTEM_AGREED) == 0); +- } ++ assert (api->totem_mcast (iovecs, 1, TOTEM_AGREED) == 0); + } + else { + res_lib_lck_resourceclose.header.size = sizeof (struct res_lib_lck_resourceclose); Index: openais.spec =================================================================== RCS file: /cvs/pkgs/rpms/openais/devel/openais.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- openais.spec 3 Mar 2009 06:30:15 -0000 1.40 +++ openais.spec 9 Mar 2009 10:08:08 -0000 1.41 @@ -1,29 +1,31 @@ -## define alphatag svn1688 +%define alphatag svn1741 Name: openais Summary: The openais Standards-Based Cluster Framework executive and APIs Version: 0.93 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} License: BSD Group: System Environment/Base URL: http://developer.osdl.org/dev/openais/ Source0: http://www.osdl.org/downloads/openais-%{version}/openais-%{version}.tar.gz Patch0: openais-bump-soname.diff +Patch1: openais-trunk.diff # Runtime bits Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig -Requires: corosync >= 0.94-1 +Requires: corosync >= 0.94-3 Requires: openaislib = %{version}-%{release} Conflicts: openais-devel <= 0.89 # Setup/build bits BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: corosynclib-devel >= 0.94-1 +BuildRequires: corosynclib-devel >= 0.94-3 %prep %setup -q -n openais-%{version} %patch0 -p1 +%patch1 -p1 %build # -O3 required for performance reasons @@ -140,6 +142,11 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Mar 9 2009 Fabio M. Di Nitto - 0.93-2.svn1741 +- Import fixes from upstream: + * Updates for new totem interface (1737, 1738, 1739, 1741). + * Fix ipc connection (1740). + * Tue Mar 3 2009 Fabio M. Di Nitto - 0.93-1 - New upstream release. - Bump Requires and BuildRequires to corosync 0.94-1. From alexlan at fedoraproject.org Mon Mar 9 10:10:01 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Mon, 9 Mar 2009 10:10:01 +0000 (UTC) Subject: rpms/Miro/devel Miro-2.0-libtorrent.patch,1.1,NONE Message-ID: <20090309101001.70A2A70116@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/extras/rpms/Miro/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19166 Removed Files: Miro-2.0-libtorrent.patch Log Message: removing old patch --- Miro-2.0-libtorrent.patch DELETED --- From caolanm at fedoraproject.org Mon Mar 9 10:10:59 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 9 Mar 2009 10:10:59 +0000 (UTC) Subject: rpms/libbase/devel import.log, NONE, 1.1 libbase.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309101059.0880B70116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/libbase/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19437/devel Modified Files: .cvsignore sources Added Files: import.log libbase.spec Log Message: --- NEW FILE import.log --- libbase-1_0_0-1_fc10:HEAD:libbase-1.0.0-1.fc10.src.rpm:1236593398 --- NEW FILE libbase.spec --- # Use rpmbuild --without gcj to disable native bits %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: libbase Version: 1.0.0 Release: 1%{?dist} Summary: JFree Base Services License: LGPLv2+ Group: System Environment/Libraries Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz URL: http://reporting.pentaho.org/ BuildRequires: ant, java-devel, jpackage-utils, jakarta-commons-logging Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: java, jpackage-utils, jakarta-commons-logging %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %else BuildArch: noarch %endif %description LibBase is a library developed to provide base services like logging, configuration and initialization to other libraries and applications. The library is the root library for all Pentaho-Reporting projects. %prep %setup -q find . -name "*.jar" -exec rm -f {} \; build-jar-repository -s -p lib commons-logging-api %build ant compile %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar %if %{with_gcj} %{_bindir}/aot-compile-rpm %endif %clean rm -rf $RPM_BUILD_ROOT %post %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %postun %if %{with_gcj} if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %endif %files %defattr(0644,root,root,0755) %doc ChangeLog.txt licence-LGPL.txt README.txt %{_javadir}/%{name}.jar %if %{with_gcj} %attr(-,root,root) %{_libdir}/gcj/%{name} %endif %changelog * Wed Dec 03 2008 Caolan McNamara 1.0.0-1 - initial fedora import Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libbase/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:28:35 -0000 1.1 +++ .cvsignore 9 Mar 2009 10:10:28 -0000 1.2 @@ -0,0 +1 @@ +libbase-1.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libbase/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:28:35 -0000 1.1 +++ sources 9 Mar 2009 10:10:28 -0000 1.2 @@ -0,0 +1 @@ +5907375823a3a9411a92d5131cd42307 libbase-1.0.0.tar.gz From alexlan at fedoraproject.org Mon Mar 9 10:11:11 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Mon, 9 Mar 2009 10:11:11 +0000 (UTC) Subject: rpms/Miro/F-10 Miro-1.1-utf8.patch, 1.1, NONE Miro-1.2.6-boost.patch, 1.1, NONE Miro-gcc43.patch, 1.3, NONE Miro-xulrunner.patch, 1.4, NONE dbus.patch, 1.1, NONE Message-ID: <20090309101111.A6E1270116@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/extras/rpms/Miro/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19646 Removed Files: Miro-1.1-utf8.patch Miro-1.2.6-boost.patch Miro-gcc43.patch Miro-xulrunner.patch dbus.patch Log Message: remove some obsolete patches --- Miro-1.1-utf8.patch DELETED --- --- Miro-1.2.6-boost.patch DELETED --- --- Miro-gcc43.patch DELETED --- --- Miro-xulrunner.patch DELETED --- --- dbus.patch DELETED --- From thm at fedoraproject.org Mon Mar 9 10:15:45 2009 From: thm at fedoraproject.org (Thomas Moschny) Date: Mon, 9 Mar 2009 10:15:45 +0000 (UTC) Subject: rpms/ikiwiki/devel .cvsignore, 1.17, 1.18 ikiwiki.spec, 1.19, 1.20 import.log, 1.17, 1.18 sources, 1.17, 1.18 Message-ID: <20090309101545.2774170116@cvs1.fedora.phx.redhat.com> Author: thm Update of /cvs/pkgs/rpms/ikiwiki/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20925/devel Modified Files: .cvsignore ikiwiki.spec import.log sources Log Message: Update to 3.07. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 5 Mar 2009 09:53:06 -0000 1.17 +++ .cvsignore 9 Mar 2009 10:15:14 -0000 1.18 @@ -1 +1 @@ -ikiwiki_3.06.tar.gz +ikiwiki_3.07.tar.gz Index: ikiwiki.spec =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ikiwiki.spec 5 Mar 2009 09:53:06 -0000 1.19 +++ ikiwiki.spec 9 Mar 2009 10:15:14 -0000 1.20 @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.06 +Version: 3.07 Release: 1%{?dist} Summary: A wiki compiler @@ -143,6 +143,9 @@ %changelog +* Mon Mar 9 2009 Thomas Moschny - 3.07-1 +- Update to 3.07. + * Thu Mar 5 2009 Thomas Moschny - 3.06-1 - Update to 3.06. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- import.log 5 Mar 2009 09:53:06 -0000 1.17 +++ import.log 9 Mar 2009 10:15:14 -0000 1.18 @@ -15,3 +15,4 @@ ikiwiki-3_03-1_fc10:HEAD:ikiwiki-3.03-1.fc10.src.rpm:1234219058 ikiwiki-3_04-1_fc10:HEAD:ikiwiki-3.04-1.fc10.src.rpm:1234948680 ikiwiki-3_06-1_fc10:HEAD:ikiwiki-3.06-1.fc10.src.rpm:1236246745 +ikiwiki-3_07-1_fc10:HEAD:ikiwiki-3.07-1.fc10.src.rpm:1236593624 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 5 Mar 2009 09:53:06 -0000 1.17 +++ sources 9 Mar 2009 10:15:14 -0000 1.18 @@ -1 +1 @@ -256888a241cb2dc704539ae31a81b2c9 ikiwiki_3.06.tar.gz +9a698de22ad508e4b13fd72fbe5a5ba7 ikiwiki_3.07.tar.gz From rhughes at fedoraproject.org Mon Mar 9 10:18:03 2009 From: rhughes at fedoraproject.org (Richard Hughes) Date: Mon, 9 Mar 2009 10:18:03 +0000 (UTC) Subject: rpms/kpackagekit/devel kpackagekit.spec,1.21,1.22 Message-ID: <20090309101803.3A28570116@cvs1.fedora.phx.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/kpackagekit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21654 Modified Files: kpackagekit.spec Log Message: * Mon Mar 09 2009 Richard Hughes - 0.4.0-3 - Rebuild for PackageKit-qt soname bump Index: kpackagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- kpackagekit.spec 25 Feb 2009 11:53:39 -0000 1.21 +++ kpackagekit.spec 9 Mar 2009 10:17:32 -0000 1.22 @@ -2,7 +2,7 @@ Name: kpackagekit Version: 0.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -70,6 +70,9 @@ %changelog +* Mon Mar 09 2009 Richard Hughes - 0.4.0-3 +- Rebuild for PackageKit-qt soname bump + * Wed Feb 25 2009 Fedora Release Engineering - 0.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jwrdegoede at fedoraproject.org Mon Mar 9 10:18:38 2009 From: jwrdegoede at fedoraproject.org (Hans de Goede) Date: Mon, 9 Mar 2009 10:18:38 +0000 (UTC) Subject: rpms/KoboDeluxe/devel KoboDeluxe-0.5.1-gcc44.patch, NONE, 1.1 KoboDeluxe.spec, 1.8, 1.9 Message-ID: <20090309101838.A181970116@cvs1.fedora.phx.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/KoboDeluxe/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21868 Modified Files: KoboDeluxe.spec Added Files: KoboDeluxe-0.5.1-gcc44.patch Log Message: * Mon Mar 9 2009 Hans de Goede 0.5.1-4 - Fix building with gcc 4.4 KoboDeluxe-0.5.1-gcc44.patch: --- NEW FILE KoboDeluxe-0.5.1-gcc44.patch --- diff -up KoboDeluxe-0.5.1/graphics/window.cpp~ KoboDeluxe-0.5.1/graphics/window.cpp --- KoboDeluxe-0.5.1/graphics/window.cpp~ 2007-12-14 10:13:24.000000000 +0100 +++ KoboDeluxe-0.5.1/graphics/window.cpp 2009-03-09 11:16:04.000000000 +0100 @@ -398,7 +398,7 @@ void window_t::center_token_fxp(int _x, */ if(token) { - char *tok = strchr(txt, token); + const char *tok = strchr(txt, token); if(tok) tokpos = tok-txt; else Index: KoboDeluxe.spec =================================================================== RCS file: /cvs/extras/rpms/KoboDeluxe/devel/KoboDeluxe.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- KoboDeluxe.spec 23 Feb 2009 21:54:43 -0000 1.8 +++ KoboDeluxe.spec 9 Mar 2009 10:18:08 -0000 1.9 @@ -1,6 +1,6 @@ Name: KoboDeluxe Version: 0.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: 3'rd person scrolling 2D shooter Group: Amusements/Games License: GPLv2+ @@ -10,6 +10,7 @@ Source2: %{name}.desktop Patch1: KoboDeluxe-defaults.patch Patch2: KoboDeluxe-0.5.1-avoid-unistd-pipe-collision.patch +Patch3: KoboDeluxe-0.5.1-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel desktop-file-utils Requires: hicolor-icon-theme @@ -30,6 +31,7 @@ %setup -q %patch1 -p1 -z .defaults %patch2 -p1 -b .pipe-unistd +%patch3 -p1 sed -i 's|$(sharedstatedir)/kobo-deluxe/scores|%{_var}/games/kobo-deluxe|g' \ configure iconv -f ISO-8859-1 -t UTF8 README > tmp; mv tmp README @@ -91,6 +93,9 @@ %changelog +* Mon Mar 9 2009 Hans de Goede 0.5.1-4 +- Fix building with gcc 4.4 + * Mon Feb 23 2009 Fedora Release Engineering - 0.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rhughes at fedoraproject.org Mon Mar 9 10:19:16 2009 From: rhughes at fedoraproject.org (Richard Hughes) Date: Mon, 9 Mar 2009 10:19:16 +0000 (UTC) Subject: rpms/gnome-packagekit/devel gnome-packagekit-0.4.5-use-unfinished-update-viewer.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 gnome-packagekit.spec, 1.74, 1.75 sources, 1.39, 1.40 Message-ID: <20090309101916.EFB0D70116@cvs1.fedora.phx.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-packagekit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22086 Modified Files: .cvsignore gnome-packagekit.spec sources Added Files: gnome-packagekit-0.4.5-use-unfinished-update-viewer.patch Log Message: * Mon Mar 09 2009 Richard Hughes - 0.4.5-1 - New upstream version - Merge in a new update viewer with a very different UI which I've patched Fedora to use by default as requested by Matthias. - Lots of translation updates gnome-packagekit-0.4.5-use-unfinished-update-viewer.patch: --- NEW FILE gnome-packagekit-0.4.5-use-unfinished-update-viewer.patch --- diff --git a/data/gpk-update-viewer.desktop.in b/data/gpk-update-viewer.desktop.in index bcde9af..cf5c67d 100644 --- a/data/gpk-update-viewer.desktop.in +++ b/data/gpk-update-viewer.desktop.in @@ -4,7 +4,7 @@ _Name=Update System _GenericName=Software Update Viewer _Comment=Update software installed on the system Icon=system-software-update -Exec=gpk-update-viewer +Exec=gpk-update-viewer2 Terminal=false Type=Application Categories=GNOME;GTK;Settings;System;PackageManager; diff --git a/src/gpk-check-update.c b/src/gpk-check-update.c index 2f2cd36..45ac91b 100644 --- a/src/gpk-check-update.c +++ b/src/gpk-check-update.c @@ -334,7 +334,7 @@ gpk_check_update_menuitem_update_system_cb (GtkMenuItem *item, gpointer data) static void gpk_check_update_menuitem_show_updates_cb (GtkMenuItem *item, gpointer data) { - const gchar *command = "gpk-update-viewer"; + const gchar *command = "gpk-update-viewer2"; if (!g_spawn_command_line_async (command, NULL)) egg_warning ("Couldn't execute command: %s", command); } diff --git a/src/gpk-log.c b/src/gpk-log.c index e3c711f..8414b5a 100644 --- a/src/gpk-log.c +++ b/src/gpk-log.c @@ -542,6 +542,9 @@ gpk_log_add_obj (const PkTransactionObj *obj) else if (egg_strequal (obj->cmdline, "gpk-update-viewer")) /* TRANSLATORS: short name for gpk-update-viewer */ tool = _("Update System"); + else if (egg_strequal (obj->cmdline, "gpk-update-viewer2")) + /* TRANSLATORS: short name for gpk-update-viewer (new name) */ + tool = _("Update System"); else if (egg_strequal (obj->cmdline, "gpk-update-icon")) /* TRANSLATORS: short name for gpk-update-icon */ tool = _("Update Icon"); Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 23 Feb 2009 11:06:02 -0000 1.39 +++ .cvsignore 9 Mar 2009 10:18:46 -0000 1.40 @@ -1 +1 @@ -gnome-packagekit-0.4.4.tar.gz +gnome-packagekit-0.4.5.tar.gz Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- gnome-packagekit.spec 24 Feb 2009 23:11:24 -0000 1.74 +++ gnome-packagekit.spec 9 Mar 2009 10:18:46 -0000 1.75 @@ -5,8 +5,8 @@ Summary: Session applications to manage packages Name: gnome-packagekit -Version: 0.4.4 -Release: 3%{?dist} +Version: 0.4.5 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.packagekit.org @@ -16,7 +16,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Fedora-specific -- requires behdad's new fontconfig before it's useful -Patch0: gnome-packagekit-0.4.0-set-gtk-module-false.patch +#Patch0: gnome-packagekit-0.4.0-set-gtk-module-false.patch + +# Fedora specific, as we want bleeding edge +Patch1: gnome-packagekit-0.4.5-use-unfinished-update-viewer.patch Requires: gtk2 >= 2.12.0 Requires: gnome-icon-theme @@ -53,7 +56,6 @@ BuildRequires: perl(XML::Parser) BuildRequires: gnome-doc-utils BuildRequires: gnome-menus-devel -BuildRequires: libsexy-devel BuildRequires: PackageKit-devel >= %{packagekit_version} BuildRequires: PolicyKit-gnome-devel BuildRequires: unique-devel @@ -77,7 +79,8 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 +%patch1 -p1 %build %configure --disable-scrollkeeper --disable-schemas-install @@ -207,11 +210,19 @@ %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/gpk-backend-status %{_bindir}/gpk-service-pack +%{_bindir}/gpk-update-viewer2 %{_datadir}/gnome-packagekit/gpk-service-pack.glade %{_datadir}/gnome-packagekit/gpk-backend-status.glade +%{_datadir}/gnome-packagekit/gpk-update-viewer2.glade %{_datadir}/applications/gpk-service-pack.desktop %changelog +* Mon Mar 09 2009 Richard Hughes - 0.4.5-1 +- New upstream version +- Merge in a new update viewer with a very different UI which I've patched + Fedora to use by default as requested by Matthias. +- Lots of translation updates + * Tue Feb 24 2009 Fedora Release Engineering - 0.4.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 23 Feb 2009 11:06:02 -0000 1.39 +++ sources 9 Mar 2009 10:18:46 -0000 1.40 @@ -1 +1 @@ -48f9005a49cf59c4212aa6145fbc2f2a gnome-packagekit-0.4.4.tar.gz +72bbc0d38a234777a602b3aadda8bb82 gnome-packagekit-0.4.5.tar.gz From rhughes at fedoraproject.org Mon Mar 9 10:20:26 2009 From: rhughes at fedoraproject.org (Richard Hughes) Date: Mon, 9 Mar 2009 10:20:26 +0000 (UTC) Subject: rpms/PackageKit/devel .cvsignore, 1.40, 1.41 PackageKit.spec, 1.93, 1.94 sources, 1.41, 1.42 Message-ID: <20090309102026.B092370116@cvs1.fedora.phx.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/PackageKit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22566 Modified Files: .cvsignore PackageKit.spec sources Log Message: * Mon Mar 09 2009 Richard Hughes - 0.4.5-1 - New upstream version - Add proper error handling to avoid exiting the script on correctable errors - Add support for the 'any' provide search - Updated QPackageKit soname version to 0.4.1 - Lots of translation updates Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 23 Feb 2009 11:10:23 -0000 1.40 +++ .cvsignore 9 Mar 2009 10:19:56 -0000 1.41 @@ -1 +1 @@ -PackageKit-0.4.4.tar.gz +PackageKit-0.4.5.tar.gz Index: PackageKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- PackageKit.spec 25 Feb 2009 03:08:38 -0000 1.93 +++ PackageKit.spec 9 Mar 2009 10:19:56 -0000 1.94 @@ -7,8 +7,8 @@ Summary: Package management service Name: PackageKit -Version: 0.4.4 -Release: 4%{?dist} +Version: 0.4.5 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.packagekit.org @@ -413,6 +413,13 @@ %{_includedir}/PackageKit/backend/*.h %changelog +* Mon Mar 09 2009 Richard Hughes - 0.4.5-1 +- New upstream version +- Add proper error handling to avoid exiting the script on correctable errors +- Add support for the 'any' provide search +- Updated QPackageKit soname version to 0.4.1 +- Lots of translation updates + * Tue Feb 24 2009 Matthias Clasen - 0.4.4-4 - Make -docs noarch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 23 Feb 2009 11:10:24 -0000 1.41 +++ sources 9 Mar 2009 10:19:56 -0000 1.42 @@ -1 +1 @@ -24966a2d951ef8f19ca597c51a3f2655 PackageKit-0.4.4.tar.gz +a335d299bb7e14d910c600d0975dd375 PackageKit-0.4.5.tar.gz From caolanm at fedoraproject.org Mon Mar 9 10:21:59 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 9 Mar 2009 10:21:59 +0000 (UTC) Subject: rpms/mythes-ca/devel .cvsignore, 1.1, 1.2 mythes-ca.spec, 1.2, 1.3 sources, 1.1, 1.2 thesaurus-ca.oxt, 1.1, 1.2 Message-ID: <20090309102159.2790670119@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/mythes-ca/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22963 Modified Files: .cvsignore mythes-ca.spec sources thesaurus-ca.oxt Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mythes-ca/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Feb 2009 22:33:14 -0000 1.1 +++ .cvsignore 9 Mar 2009 10:21:28 -0000 1.2 @@ -0,0 +1 @@ +thesaurus-ca.oxt Index: mythes-ca.spec =================================================================== RCS file: /cvs/pkgs/rpms/mythes-ca/devel/mythes-ca.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mythes-ca.spec 26 Feb 2009 03:45:44 -0000 1.2 +++ mythes-ca.spec 9 Mar 2009 10:21:28 -0000 1.3 @@ -1,7 +1,7 @@ Name: mythes-ca Summary: Catalan thesaurus -Version: 0.5.1 -Release: 0.2.beta%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Source: http://www.softcatala.org/diccionaris/actualitzacions/sinonims/thesaurus-ca.oxt Group: Applications/Text URL: http://www.softcatala.org/wiki/Projectes/Openthesaurus-ca @@ -22,7 +22,8 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mythes -cp -p dictionaries/th_ca_ES_v2.* $RPM_BUILD_ROOT/%{_datadir}/mythes +cp -p dictionaries/th_ca_ES_v3.dat $RPM_BUILD_ROOT/%{_datadir}/mythes/th_ca_ES_v2.dat +cp -p dictionaries/th_ca_ES_v3.idx $RPM_BUILD_ROOT/%{_datadir}/mythes/th_ca_ES_v2.idx pushd $RPM_BUILD_ROOT/%{_datadir}/mythes/ ca_ES_aliases="ca_AD ca_FR ca_IT" for lang in $ca_ES_aliases; do @@ -36,11 +37,14 @@ %files %defattr(-,root,root,-) -%doc dictionaries/README_th_ca_ES_v2.txt LICENCES-fr.txt LICENSES-en.txt LICENCIAS-es.txt LLICENCIES-ca.txt release_note-ca.txt +%doc dictionaries/README_th_ca_ES_v3.txt LICENCES-fr.txt LICENSES-en.txt LICENCIAS-es.txt LLICENCIES-ca.txt release_note-ca.txt %dir %{_datadir}/mythes %{_datadir}/mythes/* %changelog +* Mon Mar 09 2009 Caol??n McNamara - 1.0.0-1 +- latest version + * Wed Feb 25 2009 Fedora Release Engineering - 0.5.1-0.2.beta - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mythes-ca/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Feb 2009 22:33:14 -0000 1.1 +++ sources 9 Mar 2009 10:21:28 -0000 1.2 @@ -0,0 +1 @@ +65f7ab207f56bd1a3135637396166b14 thesaurus-ca.oxt Index: thesaurus-ca.oxt =================================================================== RCS file: /cvs/pkgs/rpms/mythes-ca/devel/thesaurus-ca.oxt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 Binary files /tmp/cvsBId9WQ and /tmp/cvsfM1oTm differ From jwrdegoede at fedoraproject.org Mon Mar 9 10:24:12 2009 From: jwrdegoede at fedoraproject.org (Hans de Goede) Date: Mon, 9 Mar 2009 10:24:12 +0000 (UTC) Subject: rpms/taxipilot/devel taxipilot.spec,1.9,1.10 Message-ID: <20090309102412.13CB270116@cvs1.fedora.phx.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/taxipilot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24300 Modified Files: taxipilot.spec Log Message: * Mon Mar 9 2009 Hans de Goede 0.9.2-8 - Try rebuild again now that all the deps are fixed Index: taxipilot.spec =================================================================== RCS file: /cvs/extras/rpms/taxipilot/devel/taxipilot.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- taxipilot.spec 25 Feb 2009 18:34:47 -0000 1.9 +++ taxipilot.spec 9 Mar 2009 10:23:41 -0000 1.10 @@ -1,6 +1,6 @@ Name: taxipilot Version: 0.9.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Game where you pilot a taxi in space Group: Amusements/Games License: GPLv2+ @@ -77,6 +77,9 @@ %changelog +* Mon Mar 9 2009 Hans de Goede 0.9.2-8 +- Try rebuild again now that all the deps are fixed + * Wed Feb 25 2009 Fedora Release Engineering - 0.9.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kwizart at fedoraproject.org Mon Mar 9 10:26:14 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 9 Mar 2009 10:26:14 +0000 (UTC) Subject: rpms/oyranos/devel import.log, NONE, 1.1 oyranos-0.1.9-cmms_lf.patch, NONE, 1.1 oyranos-0.1.9-default.patch, NONE, 1.1 oyranos-0.1.9-man-1_3.patch, NONE, 1.1 oyranos-0.1.9-rm_class.patch, NONE, 1.1 oyranos-0.1.9-shared_NVCtrl.patch, NONE, 1.1 oyranos-0.1.9-sw_elektra.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 oyranos-repack.sh, 1.1, 1.2 oyranos.spec, 1.5, 1.6 sources, 1.2, 1.3 oyranos-0.1.7-default.patch, 1.1, NONE oyranos-0.1.7-fix_bash.patch, 1.1, NONE oyranos-0.1.7-fix_pc.patch, 1.1, NONE oyranos-0.1.7-install_p.patch, 1.1, NONE oyranos-0.1.7-man-1_3.patch, 1.1, NONE oyranos-0.1.7-rm_class.patch, 1.1, NONE oyranos-0.1.7-rpath.patch, 1.1, NONE oyranos-0.1.7-shared_NVCtrl.patch, 1.1, NONE oyranos-0.1.7-sw_elektra.patch, 1.1, NONE Message-ID: <20090309102614.4A5E970116@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/oyranos/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25321/devel Modified Files: .cvsignore oyranos-repack.sh oyranos.spec sources Added Files: import.log oyranos-0.1.9-cmms_lf.patch oyranos-0.1.9-default.patch oyranos-0.1.9-man-1_3.patch oyranos-0.1.9-rm_class.patch oyranos-0.1.9-shared_NVCtrl.patch oyranos-0.1.9-sw_elektra.patch Removed Files: oyranos-0.1.7-default.patch oyranos-0.1.7-fix_bash.patch oyranos-0.1.7-fix_pc.patch oyranos-0.1.7-install_p.patch oyranos-0.1.7-man-1_3.patch oyranos-0.1.7-rm_class.patch oyranos-0.1.7-rpath.patch oyranos-0.1.7-shared_NVCtrl.patch oyranos-0.1.7-sw_elektra.patch Log Message: Update to 0.1.9 --- NEW FILE import.log --- oyranos-0_1_9-1_fc10:HEAD:oyranos-0.1.9-1.fc10.src.rpm:1236594370 oyranos-0.1.9-cmms_lf.patch: --- NEW FILE oyranos-0.1.9-cmms_lf.patch --- diff -up oyranos-0.1.9/makefile.in.cmms_lf oyranos-0.1.9/makefile.in --- oyranos-0.1.9/makefile.in.cmms_lf 2009-03-05 14:06:40.000000000 +0100 +++ oyranos-0.1.9/makefile.in 2009-03-05 14:07:33.000000000 +0100 @@ -24,9 +24,9 @@ LIB_MONI_SONAMEFULL = lib$(TARGET)_moni$ LIB_MONI_SONAME = lib$(TARGET)_moni$(SO).$(VERSION_A)$(LIBEXT) LIB_MONI_SO = lib$(TARGET)_moni$(SO)$(LIBEXT) LIB_MONI_NAME = lib$(TARGET)_moni.a -LIB_CMM_LCMS = lib$(TARGET)_lcms$(OY_MODULE_NAME)$(SO).$(VERSION)$(LIBEXT) -LIB_CMM_oyX1 = lib$(TARGET)_oyX1$(OY_MODULE_NAME)$(SO).$(VERSION)$(LIBEXT) -LIB_CMM_oyra = lib$(TARGET)_oyra$(OY_MODULE_NAME)$(SO).$(VERSION)$(LIBEXT) +LIB_CMM_LCMS = lib$(TARGET)_lcms$(OY_MODULE_NAME)$(SO).$(LIBEXT) +LIB_CMM_oyX1 = lib$(TARGET)_oyX1$(OY_MODULE_NAME)$(SO).$(LIBEXT) +LIB_CMM_oyra = lib$(TARGET)_oyra$(OY_MODULE_NAME)$(SO).$(LIBEXT) EXAMPLE1 = examples/image2pdf EXAMPLES = \ oyranos-0.1.9-default.patch: --- NEW FILE oyranos-0.1.9-default.patch --- diff -up oyranos-0.1.9/settings/designer.policy.xml.default oyranos-0.1.9/settings/designer.policy.xml --- oyranos-0.1.9/settings/designer.policy.xml.default 2008-10-22 18:30:57.000000000 +0200 +++ oyranos-0.1.9/settings/designer.policy.xml 2009-03-05 13:19:29.000000000 +0100 @@ -18,15 +18,15 @@ - XYZ.icc + LCMSXYZI.ICM - Lab.icc + LCMSLABI.ICM - XYZ.icc + LCMSXYZI.ICM diff -up oyranos-0.1.9/settings/office.policy.xml.default oyranos-0.1.9/settings/office.policy.xml --- oyranos-0.1.9/settings/office.policy.xml.default 2008-10-22 18:31:10.000000000 +0200 +++ oyranos-0.1.9/settings/office.policy.xml 2009-03-05 13:19:29.000000000 +0100 @@ -18,19 +18,19 @@ - XYZ.icc + LCMSXYZI.ICM - Lab.icc + LCMSLABI.ICM - XYZ.icc + LCMSXYZI.ICM - Lab.icc + LCMSLABI.ICM diff -up oyranos-0.1.9/settings/photographer.policy.xml.default oyranos-0.1.9/settings/photographer.policy.xml --- oyranos-0.1.9/settings/photographer.policy.xml.default 2008-10-22 18:49:30.000000000 +0200 +++ oyranos-0.1.9/settings/photographer.policy.xml 2009-03-05 13:19:29.000000000 +0100 @@ -18,15 +18,15 @@ - XYZ.icc + LCMSXYZI.ICM - Lab.icc + LCMSLABI.ICM - XYZ.icc + LCMSXYZI.ICM diff -up oyranos-0.1.9/settings/prepress.policy.xml.default oyranos-0.1.9/settings/prepress.policy.xml --- oyranos-0.1.9/settings/prepress.policy.xml.default 2008-10-22 18:49:14.000000000 +0200 +++ oyranos-0.1.9/settings/prepress.policy.xml 2009-03-05 13:19:29.000000000 +0100 @@ -18,15 +18,15 @@ - XYZ.icc + LCMSXYZI.ICM - Lab.icc + LCMSLABI.ICM - XYZ.icc + LCMSXYZI.ICM oyranos-0.1.9-man-1_3.patch: --- NEW FILE oyranos-0.1.9-man-1_3.patch --- diff -up oyranos-0.1.9/oyranos.3.man-1_3 oyranos-0.1.9/oyranos.3 --- oyranos-0.1.9/oyranos.3.man-1_3 2009-03-05 13:38:30.000000000 +0100 +++ oyranos-0.1.9/oyranos.3 2009-03-05 13:38:41.000000000 +0100 @@ -25,6 +25,6 @@ http://www.oyranos.org/doc/html/index.ht .SH AUTHOR Kai-Uwe Behrmann (ku.b (at) gmx.de) .SH "SEE ALSO" -oyranos-config(1) oyranos-policy(1) oyranos-monitor(1) +oyranos-config(3) oyranos-policy(1) oyranos-monitor(1) .SH BUGS at: http://sourceforge.net/tracker/?group_id=177017&atid=879553 diff -up oyranos-0.1.9/oyranos-config-fltk.1.man-1_3 oyranos-0.1.9/oyranos-config-fltk.1 --- oyranos-0.1.9/oyranos-config-fltk.1.man-1_3 2009-03-05 13:37:55.000000000 +0100 +++ oyranos-0.1.9/oyranos-config-fltk.1 2009-03-05 13:38:06.000000000 +0100 @@ -15,6 +15,6 @@ www.oyranos.org/wiki/index.php?title=Oyr .SH AUTHOR Kai-Uwe Behrmann (ku.b (at) gmx.de) .SH "SEE ALSO" -oyranos-config(1) oyranos-policy(1) oyranos-monitor(1) oyranos(3) +oyranos-config(3) oyranos-policy(1) oyranos-monitor(1) oyranos(3) .SH BUGS at: http://sourceforge.net/tracker/?group_id=177017&atid=879553 diff -up oyranos-0.1.9/oyranos-policy.1.man-1_3 oyranos-0.1.9/oyranos-policy.1 --- oyranos-0.1.9/oyranos-policy.1.man-1_3 2009-03-05 13:39:19.000000000 +0100 +++ oyranos-0.1.9/oyranos-policy.1 2009-03-05 13:39:31.000000000 +0100 @@ -54,6 +54,6 @@ Print a help text: .SH AUTHOR Kai-Uwe Behrmann (ku.b (at) gmx.de) .SH "SEE ALSO" -oyranos-config(1) oyranos-monitor(1) oyranos(3) +oyranos-config(3) oyranos-monitor(1) oyranos(3) .SH BUGS at: http://sourceforge.net/tracker/?group_id=177017&atid=879553 oyranos-0.1.9-rm_class.patch: --- NEW FILE oyranos-0.1.9-rm_class.patch --- diff -up oyranos-0.1.9/Doxyfile.rm_class oyranos-0.1.9/Doxyfile --- oyranos-0.1.9/Doxyfile.rm_class 2008-11-03 14:48:57.000000000 +0100 +++ oyranos-0.1.9/Doxyfile 2009-03-05 13:49:35.000000000 +0100 @@ -203,8 +203,8 @@ PERL_PATH = /usr/bin/perl CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES +CLASS_GRAPH = NO +COLLABORATION_GRAPH = NO UML_LOOK = YES TEMPLATE_RELATIONS = NO INCLUDE_GRAPH = NO oyranos-0.1.9-shared_NVCtrl.patch: --- NEW FILE oyranos-0.1.9-shared_NVCtrl.patch --- diff -up oyranos-0.1.9/makefile.in.NVCtrl oyranos-0.1.9/makefile.in --- oyranos-0.1.9/makefile.in.NVCtrl 2009-03-05 12:08:05.000000000 +0100 +++ oyranos-0.1.9/makefile.in 2009-03-05 13:19:07.000000000 +0100 @@ -33,8 +33,8 @@ EXAMPLES = \ $(EXAMPLE1) #ifdef $(X11) -LIB_XNVCTRL = libXNVCtrl -LIB_XNVCTRL_NAME = $(LIB_XNVCTRL).a +#LIB_XNVCTRL = libXNVCtrl +LIB_XNVCTRL_NAME = -lXNVCtrl #endif LIBFL_I18N = fl_i18n/libfl_i18n.a @@ -310,17 +310,17 @@ $(BUILDDIR)$(LIB_CMM_oyra): $(CMM_oyra_O $(RM) $(BUILDDIR)lib$(TARGET)_oyra$(OY_MODULE_NAME)$(SO)$(LIBEXT) $(LNK) $@ $(BUILDDIR)lib$(TARGET)_oyra$(OY_MODULE_NAME)$(SO)$(LIBEXT) -$(LIB_XNVCTRL).a: - echo Building $@ ... - -(cd $(LIB_XNVCTRL) && $(MAKE) -f Makefile) - test -L $(BUILDDIR)$(LIB_XNVCTRL).a || $(LNK) $(LIB_XNVCTRL)/$(LIB_XNVCTRL).a $(BUILDDIR). +#(LIB_XNVCTRL).a: +# echo Building $@ ... +# -(cd $(LIB_XNVCTRL) && $(MAKE) -f Makefile) +# test -L $(BUILDDIR)$(LIB_XNVCTRL).a || $(LNK) $(LIB_XNVCTRL)/$(LIB_XNVCTRL).a $(BUILDDIR). # the twinview library -$(BUILDDIR)$(TARGET)-monitor-nvidia: $(TARGET)_monitor_nvidia.c $(BUILDDIR)$(LIB_XNVCTRL).a $(BUILDDIR)$(LIB_MONI_SONAMEFULL) +$(BUILDDIR)$(TARGET)-monitor-nvidia: $(TARGET)_monitor_nvidia.c $(BUILDDIR)$(LIB_MONI_SONAMEFULL) echo Linking $@ ... - -$(CC) $(CFLAGS) $(INCL) $(TARGET)_monitor_nvidia.c -I./$(LIB_XNVCTRL) \ + -$(CC) $(CFLAGS) $(INCL) $(TARGET)_monitor_nvidia.c -I/usr/include/NVCtrl \ -o $(BUILDDIR)$(TARGET)-monitor-nvidia -L./ $(LDLIBS) $(X11_LIBS) \ - -L./$(LIB_XNVCTRL) -lXNVCtrl $(BUILDDIR)$(LIBSONAMEFULL) $(BUILDDIR)$(LIB_MONI_SONAMEFULL) \ + -lXNVCtrl $(BUILDDIR)$(LIBSONAMEFULL) $(BUILDDIR)$(LIB_MONI_SONAMEFULL) \ $(LINK_LIB_PATH) $(target)_config_fltk.o: $(TARGET)_config_fltk.cxx @@ -665,7 +665,7 @@ uninstall_docu: distclean: clean -$(RM) Makefile -$(RM) fl_i18n/Makefile - -$(RM) libXNVCtrl/Makefile + #-$(RM) libXNVCtrl/Makefile -$(RM) default_profiles/base/Makefile -$(RM) default_profiles/printing/Makefile -$(RM) mkdepend config.h oyranos.pc oyranos.spec @@ -698,7 +698,7 @@ clean: $(BUILDDIR)lib$${lib}$(SO)$(LIBEXT) \ $(BUILDDIR)lib$${lib}.a; \ done - -(cd $(LIB_XNVCTRL) && $(MAKE) -f Makefile clean) + #-(cd $(LIB_XNVCTRL) && $(MAKE) -f Makefile clean) cd fl_i18n/ && $(MAKE) -f $(MAKEFILE_ARCH) clean echo ... $@ done @@ -779,8 +779,8 @@ copy_files: $(DESTDIR) $(COPY) -r settings $(DESTDIR) #$(COPY) -r cmms $(DESTDIR) - -(cd $(LIB_XNVCTRL) && $(MAKE) -f Makefile clean) - $(COPY) -R $(LIB_XNVCTRL) $(DESTDIR) + #-(cd $(LIB_XNVCTRL) && $(MAKE) -f Makefile clean) + #$(COPY) -R $(LIB_XNVCTRL) $(DESTDIR) mkdir $(DESTDIR)/tests $(COPY) $(TEST_FILES) $(DESTDIR)/tests mkdir $(DESTDIR)/examples oyranos-0.1.9-sw_elektra.patch: --- NEW FILE oyranos-0.1.9-sw_elektra.patch --- diff -up oyranos-0.1.9/configure.sh.sw_elektra oyranos-0.1.9/configure.sh --- oyranos-0.1.9/configure.sh.sw_elektra 2009-03-05 12:08:05.000000000 +0100 +++ oyranos-0.1.9/configure.sh 2009-03-05 13:19:29.000000000 +0100 @@ -113,7 +113,7 @@ if [ -n "$ELEKTRA" ] && [ "$ELEKTRA" -gt else echo "ELEKTRA_LIBS = `pkg-config --libs elektra`" >> $CONF fi - echo "ELEKTRA_SW = `pkg-config --cflags-only-I elektra | sed 's/\-I// ; s%/include%/etc/kdb/%'`" >> $CONF + echo "ELEKTRA_SW = /etc/kdb/" >> $CONF ELEKTRA_FOUND=1 else if [ $ELEKTRA -eq 1 ]; then Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/oyranos/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Mar 2008 18:57:34 -0000 1.2 +++ .cvsignore 9 Mar 2009 10:26:13 -0000 1.3 @@ -1 +1 @@ -oyranos-repack-0.1.7.tar.bz2 +oyranos-repack-0.1.9.tar.bz2 Index: oyranos-repack.sh =================================================================== RCS file: /cvs/pkgs/rpms/oyranos/devel/oyranos-repack.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- oyranos-repack.sh 7 Mar 2008 18:57:34 -0000 1.1 +++ oyranos-repack.sh 9 Mar 2009 10:26:13 -0000 1.2 @@ -12,16 +12,14 @@ unset CDPATH pwd=$(pwd) -ver=0.1.7 +ver=0.1.9 cd "$tmp" wget -N http://downloads.sourceforge.net/oyranos/oyranos-${ver}.tar.gz tar zxvf oyranos-${ver}.tar.gz pushd oyranos-${ver} -# Prevent static elektra to be used -rm -rf elektra-0.6.4 # Prevent static libXNVCtrl to be used -rm -rf libXNVCtrl libXNVCtrl.a +rm -rf libXNVCtrl # Make build more verbose for f in `find . -name [mM]akefile\*` configure.sh ; do sed -i.silent -e '/.SILENT/d' $f ; done # Fix Changelog not-utf8 @@ -30,7 +28,7 @@ touch -r ChangeLog.origine ChangeLog rm -rf ChangeLog.origine # Remove icc profiles from the archive -rm -rf standard_profiles +rm -rf default_profiles popd tar jcf "$pwd"/oyranos-repack-${ver}.tar.bz2 oyranos-${ver} cd - >/dev/null Index: oyranos.spec =================================================================== RCS file: /cvs/pkgs/rpms/oyranos/devel/oyranos.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- oyranos.spec 6 Mar 2009 18:14:10 -0000 1.5 +++ oyranos.spec 9 Mar 2009 10:26:13 -0000 1.6 @@ -1,28 +1,24 @@ -%define _default_patch_fuzz 2 - Name: oyranos -Version: 0.1.7 -Release: 14%{?dist} +Version: 0.1.9 +Release: 1%{?dist} Summary: The Oyranos Colour Management System (CMS) Group: Applications/Multimedia License: GPLv2+ URL: http://www.oyranos.org #Source0: http://downloads.sourceforge.net/oyranos/oyranos-%{version}.tar.gz -Source0: http://kwizart.fedorapeople.org/SOURCES/oyranos-repack-0.1.7.tar.bz2 +Source0: http://kwizart.fedorapeople.org/SOURCES/oyranos-repack-%{version}.tar.bz2 Source1: README-Fedora-ICC_PROFILES Source10: oyranos-repack.sh -Patch0: oyranos-0.1.7-sw_elektra.patch -Patch1: oyranos-0.1.7-rpath.patch -Patch2: oyranos-0.1.7-install_p.patch -Patch3: oyranos-0.1.7-shared_NVCtrl.patch -Patch4: oyranos-0.1.7-fix_pc.patch -Patch5: oyranos-0.1.7-fix_bash.patch -Patch6: oyranos-0.1.7-default.patch -Patch7: oyranos-0.1.7-man-1_3.patch -Patch8: oyranos-0.1.7-rm_class.patch +Patch0: oyranos-0.1.9-sw_elektra.patch +Patch1: oyranos-0.1.9-shared_NVCtrl.patch +Patch2: oyranos-0.1.9-default.patch +Patch3: oyranos-0.1.9-man-1_3.patch +Patch4: oyranos-0.1.9-rm_class.patch +Patch5: oyranos-0.1.9-cmms_lf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: OpenEXR-devel BuildRequires: boost-devel BuildRequires: doxygen BuildRequires: graphviz @@ -47,7 +43,7 @@ Requires: %{name}-libs = %{version}-%{release} #Requires: color-icc-profiles -#Requires(post): /usr/sbin/elektra-kdb +Requires(post): elektra-kdb @@ -94,29 +90,11 @@ %prep %setup -q %patch0 -p1 -b .sw_elektra -%patch1 -p1 -b .rpath -%patch2 -p1 -b .install_p -%patch3 -p1 -b .NVCtrl -%patch4 -p1 -b .fix_pc -%patch5 -p1 -b .fix_bash -%patch6 -p1 -b .default -%patch7 -p1 -b .man-1_3 -%patch8 -p1 -b .rm_class - -# Prevent static elektra to be used -#rm -rf elektra-0.6.4 - -# Prevent static libXNVCtrl to be used -#rm -rf libXNVCtrl libXNVCtrl.a - -# Make build more verbose -#for f in `find . -name [mM]akefile\*` configure.sh ; do sed -i.silent -e '/.SILENT/d' $f ; done - -# Fix Changelog not-utf8 -#cp -p ChangeLog ChangeLog.origine -#iconv -f ISO-8859-1 -t UTF8 ChangeLog.origine > ChangeLog -#touch -r ChangeLog.origine ChangeLog -#rm -rf ChangeLog.origine +%patch1 -p1 -b .NVCtrl +%patch2 -p1 -b .default +%patch3 -p1 -b .man-1_3 +%patch4 -p1 -b .rm_class +#patch5 -p1 -b .cmms_lf # Update Doxygen doxygen -u @@ -126,7 +104,6 @@ %build -export internalelektra=no %configure --disable-static --syscolordir=%{_colordir} # Parralle build sometime fails @@ -137,21 +114,12 @@ %install rm -rf $RPM_BUILD_ROOT __doc -# Prevent icc profiles with commercial license to be installed -rm -rf standard_profiles - make DESTDIR=$RPM_BUILD_ROOT install_bin install_linguas install_gui # Remove unneeded files find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' -# install doc in the right place... -mkdir -p __doc/ -mv $RPM_BUILD_ROOT%{_datadir}/doc/oyranos/* __doc/ -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/oyranos - - # Tweak the oyranos_version.h sed -i -e '/OY_SRC/d' $RPM_BUILD_ROOT%{_includedir}/%{name}/oyranos_version.h touch -r ChangeLog $RPM_BUILD_ROOT%{_includedir}/%{name}/oyranos_version.h @@ -159,9 +127,9 @@ # Multilib tweaks touch -r ChangeLog $RPM_BUILD_ROOT%{_bindir}/%{name}-config -# Move oyranos-config.1 to oyranos-config.3 -mv $RPM_BUILD_ROOT%{_mandir}/man1/oyranos-config.1 $RPM_BUILD_ROOT%{_mandir}/man3/oyranos-config.3 -touch -r ChangeLog $RPM_BUILD_ROOT%{_mandir}/man3/oyranos-config.3 +#Manual install +mkdir -p $RPM_BUILD_ROOT%{_settingscolordir} +install -pm 0644 settings/*.policy.xml $RPM_BUILD_ROOT%{_settingscolordir} %find_lang %{name} @@ -172,12 +140,10 @@ %post libs -p /sbin/ldconfig -%if 0 %post if [ "`elektra-kdb ls system/sw/oyranos 2>/dev/zero | wc -l`" -eq 0 ]; then - oyranos-policy %{_settingscolordir}/office.policy.xml + oyranos-policy -i %{_settingscolordir}/office.policy.xml > /dev/null 2>&1 fi || : -%endif %postun libs -p /sbin/ldconfig @@ -189,10 +155,10 @@ %{_bindir}/%{name}-monitor-nvidia %{_bindir}/%{name}-config-fltk %{_bindir}/%{name}-policy -%{_mandir}/man1/%{name}-config-fltk.* -%{_mandir}/man1/%{name}-policy.* +#{_mandir}/man1/%{name}-config-fltk.* +#{_mandir}/man1/%{name}-policy.* %{_datadir}/color/settings/*.policy.xml -%{_datadir}/color/cmms/*.oy_cmm_register.xml +#{_datadir}/color/cmms/*.oy_cmm_register.xml # No profile should be installed with oyranos (even Cineon) # Instead we need to Requires them when available # from a separate package or from any virtual provides. @@ -201,28 +167,25 @@ %files libs %defattr(-,root,root,-) %{_libdir}/*.so.* - +%{_libdir}/color %files devel %defattr(-,root,root,-) %{_bindir}/%{name}-config -%{_mandir}/man3/%{name}.* -%{_mandir}/man3/%{name}-config.* +#{_mandir}/man3/%{name}.* +#{_mandir}/man3/%{name}-config.* %{_includedir}/%{name}/ %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}*.pc %files docs %defattr(-,root,root,-) -%doc __doc/html/* +#doc __doc/html/* %changelog -* Fri Mar 06 2009 Jesse Keating - 0.1.7-14 -- Rebuild for new elektra - -* Thu Feb 26 2009 Fedora Release Engineering - 0.1.7-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Thu Mar 5 2009 kwizart < kwizart at gmail.com > - 0.1.9-1 +- Update to 0.1.9 * Sun Sep 28 2008 kwizart < kwizart at gmail.com > - 0.1.7-12 - Fix patch fuzz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/oyranos/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Mar 2008 18:57:34 -0000 1.2 +++ sources 9 Mar 2009 10:26:13 -0000 1.3 @@ -1 +1 @@ -7db310bbdaea1c603941783b71372f52 oyranos-repack-0.1.7.tar.bz2 +9d8fe36499b6da7ff80389ca09150dac oyranos-repack-0.1.9.tar.bz2 --- oyranos-0.1.7-default.patch DELETED --- --- oyranos-0.1.7-fix_bash.patch DELETED --- --- oyranos-0.1.7-fix_pc.patch DELETED --- --- oyranos-0.1.7-install_p.patch DELETED --- --- oyranos-0.1.7-man-1_3.patch DELETED --- --- oyranos-0.1.7-rm_class.patch DELETED --- --- oyranos-0.1.7-rpath.patch DELETED --- --- oyranos-0.1.7-shared_NVCtrl.patch DELETED --- --- oyranos-0.1.7-sw_elektra.patch DELETED --- From caolanm at fedoraproject.org Mon Mar 9 10:28:39 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 9 Mar 2009 10:28:39 +0000 (UTC) Subject: rpms/flute/devel flute.spec,1.3,1.4 Message-ID: <20090309102839.39BC170116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/flute/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25826 Modified Files: flute.spec Log Message: better adherence to versioning guidelines Index: flute.spec =================================================================== RCS file: /cvs/pkgs/rpms/flute/devel/flute.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- flute.spec 24 Feb 2009 17:40:02 -0000 1.3 +++ flute.spec 9 Mar 2009 10:28:08 -0000 1.4 @@ -3,7 +3,7 @@ Name: flute Version: 1.3 -Release: 5%{?dist} +Release: 5.20061107jfree%{?dist} Summary: Java CSS parser using SAC License: W3C Group: System Environment/Libraries @@ -67,6 +67,9 @@ %{_javadocdir}/%{name} %changelog +* Mon May 09 2009 Caolan McNamara - 1.3-5.20061107jfree +- better adherence to versioning guidelines + * Tue Feb 24 2009 Fedora Release Engineering - 1.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From fabbione at fedoraproject.org Mon Mar 9 10:33:27 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Mon, 9 Mar 2009 10:33:27 +0000 (UTC) Subject: rpms/cluster/devel .cvsignore, 1.21, 1.22 cluster.spec, 1.46, 1.47 sources, 1.21, 1.22 Message-ID: <20090309103327.1E45970116@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/cluster/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26909 Modified Files: .cvsignore cluster.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cluster/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 6 Mar 2009 10:44:47 -0000 1.21 +++ .cvsignore 9 Mar 2009 10:32:56 -0000 1.22 @@ -1 +1 @@ -cluster-3.0.0.alpha7.tar.gz +cluster-3.0.0.beta1.tar.gz Index: cluster.spec =================================================================== RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- cluster.spec 9 Mar 2009 09:12:30 -0000 1.46 +++ cluster.spec 9 Mar 2009 10:32:56 -0000 1.47 @@ -14,7 +14,7 @@ # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html # keep around ready for later user -%define alphatag alpha7 +%define alphatag beta1 Name: cluster Summary: Red Hat Cluster @@ -33,8 +33,8 @@ BuildRequires: perl python BuildRequires: glibc-kernheaders glibc-devel BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel -BuildRequires: corosynclib-devel >= 0.94-1 -BuildRequires: openaislib-devel >= 0.93-1 +BuildRequires: corosynclib-devel >= 0.94-3 +BuildRequires: openaislib-devel >= 0.93-2 BuildRequires: openldap-devel perl(ExtUtils::MakeMaker) %prep @@ -100,8 +100,8 @@ Requires(post): chkconfig Requires(preun): initscripts Requires(preun): chkconfig -Requires: corosync >= 0.94-1 -Requires: openais >= 0.93-1 +Requires: corosync >= 0.94-3 +Requires: openais >= 0.93-2 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: ricci >= 0.15.0-4 modcluster >= 0.15.0-3 Requires: fence-agents @@ -315,6 +315,8 @@ %changelog * Mon Mar 9 2009 Fabio M. Di Nitto - 3.0.0-14.alpha7 +- New upstream release. +- Update corosync/openais BuildRequires and Requires. - Fix gfs-utils and cman man page overlapping files. * Fri Mar 6 2009 Fabio M. Di Nitto - 3.0.0-13.alpha7 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 6 Mar 2009 10:44:47 -0000 1.21 +++ sources 9 Mar 2009 10:32:56 -0000 1.22 @@ -1 +1 @@ -eb2f94ccca6b07a0beb1e8a55cb5691f cluster-3.0.0.alpha7.tar.gz +cb6e492b8995c7e3b69005a93737e46f cluster-3.0.0.beta1.tar.gz From steved at fedoraproject.org Mon Mar 9 10:36:02 2009 From: steved at fedoraproject.org (Steve Dickson) Date: Mon, 9 Mar 2009 10:36:02 +0000 (UTC) Subject: rpms/nfs-utils/devel nfs-utils-1.1.5-tcpwrap-externs.patch, NONE, 1.1 nfs-utils.spec, 1.218, 1.219 Message-ID: <20090309103602.24BB970116@cvs1.fedora.phx.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27676 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.1.5-tcpwrap-externs.patch Log Message: Fixed some lost externs in the tcpwrapper code nfs-utils-1.1.5-tcpwrap-externs.patch: --- NEW FILE nfs-utils-1.1.5-tcpwrap-externs.patch --- commit 06da4cfd46942acaaa5bd2e7933fd290701d186d Author: Steve Dickson Date: Sun Mar 8 10:10:25 2009 -0400 Added back the some logging variables which are no longer used but, unfortunately, they are extern-ed by public headers files which are not under the control of this package. Spotted-by: Juergen Daubert Signed-off-by: Steve Dickson diff --git a/support/misc/tcpwrapper.c b/support/misc/tcpwrapper.c index a361496..1da6020 100644 --- a/support/misc/tcpwrapper.c +++ b/support/misc/tcpwrapper.c @@ -60,8 +60,16 @@ static void logit(int severity, struct sockaddr_in *addr, u_long procnum, u_long prognum, char *text); static int check_files(void); +/* + * These need to exist since they are externed + * in public header files. + */ +int verboselog = 0; +int allow_severity = LOG_INFO; +int deny_severity = LOG_WARNING; + #define log_bad_host(addr, proc, prog) \ - logit(LOG_WARNING, addr, proc, prog, "request from unauthorized host") + logit(deny_severity, addr, proc, prog, "request from unauthorized host") #define ALLOW 1 #define DENY 0 Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.218 retrieving revision 1.219 diff -u -r1.218 -r1.219 --- nfs-utils.spec 6 Mar 2009 12:31:05 -0000 1.218 +++ nfs-utils.spec 9 Mar 2009 10:35:31 -0000 1.219 @@ -26,6 +26,8 @@ Patch01: nfs-utils-1.1.0-smnotify-path.patch Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch +Patch100: nfs-utils-1.1.5-tcpwrap-externs.patch + %if %{enablefscache} Patch90: nfs-utils-1.1.0-mount-fsc.patch %endif @@ -79,6 +81,8 @@ %patch01 -p1 %patch02 -p1 +%patch100 -p1 + %if %{enablefscache} %patch90 -p1 %endif @@ -243,6 +247,7 @@ %changelog * Fri Mar 6 2009 Steve Dickson 1.1.5-2 - Fixed lockd not using settings in sysconfig/nfs (bz 461043) +- Fixed some lost externs in the tcpwrapper code * Thu Mar 5 2009 Steve Dickson 1.1.5-1 - Updated to latest upstream version: 1.1.5 From fabbione at fedoraproject.org Mon Mar 9 10:37:54 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Mon, 9 Mar 2009 10:37:54 +0000 (UTC) Subject: rpms/fence-agents/devel .cvsignore, 1.4, 1.5 fence-agents.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <20090309103754.C355C70116@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/fence-agents/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28157 Modified Files: .cvsignore fence-agents.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fence-agents/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Mar 2009 10:51:04 -0000 1.4 +++ .cvsignore 9 Mar 2009 10:37:24 -0000 1.5 @@ -1 +1 @@ -fence-agents-3.0.0.alpha7.tar.gz +fence-agents-3.0.0.beta1.tar.gz Index: fence-agents.spec =================================================================== RCS file: /cvs/pkgs/rpms/fence-agents/devel/fence-agents.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fence-agents.spec 6 Mar 2009 10:51:04 -0000 1.5 +++ fence-agents.spec 9 Mar 2009 10:37:24 -0000 1.6 @@ -14,12 +14,12 @@ # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html # keep around ready for later user -%define alphatag alpha7 +%define alphatag beta1 Name: fence-agents Summary: Fence Agents for Red Hat Cluster Version: 3.0.0 -Release: 7%{?alphatag:.%{alphatag}}%{?dist} +Release: 8%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sources.redhat.com/cluster/wiki/ @@ -45,8 +45,8 @@ BuildRequires: glibc-devel BuildRequires: libxml2-devel BuildRequires: clusterlib-devel >= 3.0.0 -BuildRequires: corosynclib-devel >= 0.94-1 -BuildRequires: openaislib-devel >= 0.93-1 +BuildRequires: corosynclib-devel >= 0.94-3 +BuildRequires: openaislib-devel >= 0.93-2 %if %{buildvirt} BuildRequires: nss-devel nspr-devel libvirt-devel xen-libs @@ -100,6 +100,10 @@ %{_mandir}/man8/fence* %changelog +* Mon Mar 9 2009 Fabio M. Di Nitto - 3.0.0-8.beta1 +- New upstream release. +- Update corosync/openais BuildRequires and Requires. + * Fri Mar 6 2009 Fabio M. Di Nitto - 3.0.0-7.alpha7 - New upstream release. - Drop fence_scsi init stuff that's not required anylonger. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fence-agents/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Mar 2009 10:51:04 -0000 1.4 +++ sources 9 Mar 2009 10:37:24 -0000 1.5 @@ -1 +1 @@ -e88f4935e04540bb774b973a90e34d58 fence-agents-3.0.0.alpha7.tar.gz +85f5b2d70ec9fcccbf84d20b9016fe82 fence-agents-3.0.0.beta1.tar.gz From nphilipp at fedoraproject.org Mon Mar 9 10:38:53 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Mon, 9 Mar 2009 10:38:53 +0000 (UTC) Subject: rpms/gimp/devel gimp-2.6.5-define-deprecated.patch, NONE, 1.1 gimp.spec, 1.183, 1.184 Message-ID: <20090309103853.94C1170116@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/gimp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28656 Modified Files: gimp.spec Added Files: gimp-2.6.5-define-deprecated.patch Log Message: define deprecated gtk functions to avoid crashes (#486122) gimp-2.6.5-define-deprecated.patch: --- NEW FILE gimp-2.6.5-define-deprecated.patch --- diff -up gimp-2.6.5/app/widgets/gimpuimanager.c.define-deprecated gimp-2.6.5/app/widgets/gimpuimanager.c --- gimp-2.6.5/app/widgets/gimpuimanager.c.define-deprecated 2009-02-13 21:35:26.000000000 +0100 +++ gimp-2.6.5/app/widgets/gimpuimanager.c 2009-03-09 11:17:58.624783561 +0100 @@ -23,6 +23,7 @@ #include +#undef GTK_DISABLE_DEPRECATED #include #include Index: gimp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- gimp.spec 9 Mar 2009 09:55:33 -0000 1.183 +++ gimp.spec 9 Mar 2009 10:38:23 -0000 1.184 @@ -107,6 +107,7 @@ Source1: gimp-plugin-mgr.in Patch0: gimp-2.6.2-xdg-open.patch Patch1: gimp-2.6.2-jpeg-units.patch +Patch2: gimp-2.6.5-define-deprecated.patch %description GIMP (GNU Image Manipulation Program) is a powerful image composition and @@ -186,6 +187,7 @@ %setup -q -n gimp-%{version} %patch0 -p1 -b .xdg-open %patch1 -p1 -b .jpeg-units +%patch2 -p1 -b .define-deprecated %build if [ ! -f configure ]; then @@ -465,6 +467,7 @@ %changelog * Mon Mar 09 2009 Nils Philippsen - 2:2.6.5-3 - rebuild against new WebKit +- define deprecated gtk functions to avoid crashes (#486122) * Tue Feb 24 2009 Fedora Release Engineering - 2:2.6.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From fabbione at fedoraproject.org Mon Mar 9 10:40:42 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Mon, 9 Mar 2009 10:40:42 +0000 (UTC) Subject: rpms/resource-agents/devel .cvsignore, 1.4, 1.5 resource-agents.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <20090309104042.5876270116@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/resource-agents/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29047 Modified Files: .cvsignore resource-agents.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/resource-agents/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Mar 2009 10:59:09 -0000 1.4 +++ .cvsignore 9 Mar 2009 10:40:11 -0000 1.5 @@ -1 +1 @@ -resource-agents-3.0.0.alpha7.tar.gz +resource-agents-3.0.0.beta1.tar.gz Index: resource-agents.spec =================================================================== RCS file: /cvs/pkgs/rpms/resource-agents/devel/resource-agents.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- resource-agents.spec 6 Mar 2009 10:59:09 -0000 1.4 +++ resource-agents.spec 9 Mar 2009 10:40:11 -0000 1.5 @@ -14,12 +14,12 @@ # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html # keep around ready for later user -%define alphatag alpha7 +%define alphatag beta1 Name: resource-agents Summary: Open Source HA Resource Agents for Red Hat Cluster Version: 3.0.0 -Release: 6%{?alphatag:.%{alphatag}}%{?dist} +Release: 7%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sources.redhat.com/cluster/wiki/ @@ -72,6 +72,9 @@ %{_datadir}/cluster %changelog +* Mon Mar 9 2009 Fabio M. Di Nitto - 3.0.0-7.beta1 +- New upstream release. + * Fri Mar 6 2009 Fabio M. Di Nitto - 3.0.0-6.alpha7 - New upstream release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/resource-agents/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Mar 2009 10:59:09 -0000 1.4 +++ sources 9 Mar 2009 10:40:11 -0000 1.5 @@ -1 +1 @@ -22fb4ebc6c8360fd5dc74299ee04a903 resource-agents-3.0.0.alpha7.tar.gz +0b45a4e4152b3817f208fb64214a1526 resource-agents-3.0.0.beta1.tar.gz From alexlan at fedoraproject.org Mon Mar 9 10:42:25 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Mon, 9 Mar 2009 10:42:25 +0000 (UTC) Subject: rpms/evolution-brutus/devel sources, 1.12, 1.13 evolution-brutus.spec, 1.21, 1.22 .cvsignore, 1.12, 1.13 Message-ID: <20090309104225.8620D70116@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/pkgs/rpms/evolution-brutus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29550 Modified Files: sources evolution-brutus.spec .cvsignore Log Message: * Mon Mar 9 2009 Alex Lancaster - 1.2.35-1 - Update to upstream 1.2.35 to fix GCC 4.4 build Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-brutus/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 18 Dec 2008 12:17:28 -0000 1.12 +++ sources 9 Mar 2009 10:41:55 -0000 1.13 @@ -1 +1 @@ -0cc527fcd87361ff6fd77566f2b87a13 evolution-brutus-1.2.34.tar.gz +2fde8d7e767229cd2ff51f303c466583 evolution-brutus-1.2.35.tar.gz Index: evolution-brutus.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-brutus/devel/evolution-brutus.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- evolution-brutus.spec 24 Feb 2009 15:40:26 -0000 1.21 +++ evolution-brutus.spec 9 Mar 2009 10:41:55 -0000 1.22 @@ -4,8 +4,8 @@ %define eds_base_version 2.26 Name: evolution-brutus -Version: 1.2.34 -Release: 3%{?dist} +Version: 1.2.35 +Release: 1%{?dist} Summary: Brutus based Exchange connector for Novell Evolution 2.4 and later License: GPLv2+ @@ -119,6 +119,9 @@ %changelog +* Mon Mar 9 2009 Alex Lancaster - 1.2.35-1 +- Update to upstream 1.2.35 to fix GCC 4.4 build + * Tue Feb 24 2009 Fedora Release Engineering - 1.2.34-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-brutus/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 18 Dec 2008 12:17:28 -0000 1.12 +++ .cvsignore 9 Mar 2009 10:41:55 -0000 1.13 @@ -1 +1 @@ -evolution-brutus-1.2.34.tar.gz +evolution-brutus-1.2.35.tar.gz From caolanm at fedoraproject.org Mon Mar 9 10:47:13 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 9 Mar 2009 10:47:13 +0000 (UTC) Subject: rpms/jcommon/devel .cvsignore, 1.2, 1.3 jcommon.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <20090309104713.C67F970116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/jcommon/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31567 Modified Files: .cvsignore jcommon.spec sources Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jcommon/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 May 2008 09:58:59 -0000 1.2 +++ .cvsignore 9 Mar 2009 10:46:43 -0000 1.3 @@ -1 +1 @@ -jcommon-1.0.12.tar.gz +jcommon-1.0.15.tar.gz Index: jcommon.spec =================================================================== RCS file: /cvs/pkgs/rpms/jcommon/devel/jcommon.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jcommon.spec 25 Feb 2009 09:10:49 -0000 1.5 +++ jcommon.spec 9 Mar 2009 10:46:43 -0000 1.6 @@ -2,8 +2,8 @@ %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: jcommon -Version: 1.0.12 -Release: 5%{?dist} +Version: 1.0.15 +Release: 1%{?dist} Summary: JFree Java utility classes License: LGPLv2+ Group: System Environment/Libraries @@ -123,6 +123,9 @@ %{_javadocdir}/%{name} %changelog +* Mon Mar 09 2009 Caolan McNamara 1.0.15-1 +- latest version + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.12-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jcommon/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 May 2008 09:58:59 -0000 1.2 +++ sources 9 Mar 2009 10:46:43 -0000 1.3 @@ -1 +1 @@ -7fbb41dfcf6dba36f10ec7d89d1dd3f7 jcommon-1.0.12.tar.gz +171cd005bf7bdd527bdd559be423500f jcommon-1.0.15.tar.gz From caolanm at fedoraproject.org Mon Mar 9 10:51:17 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 9 Mar 2009 10:51:17 +0000 (UTC) Subject: rpms/jcommon-serializer/devel jcommon-serializer-0.3.0-depends.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 jcommon-serializer.spec, 1.3, 1.4 sources, 1.2, 1.3 jcommon-serializer-0.2.0-depends.patch, 1.1, NONE Message-ID: <20090309105117.E8F6970116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/jcommon-serializer/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv653 Modified Files: .cvsignore jcommon-serializer.spec sources Added Files: jcommon-serializer-0.3.0-depends.patch Removed Files: jcommon-serializer-0.2.0-depends.patch Log Message: new version, now sits on libbase jcommon-serializer-0.3.0-depends.patch: --- NEW FILE jcommon-serializer-0.3.0-depends.patch --- --- jcommon-serializer-0.3.0.orig/build.properties.depends.patch 2008-05-30 18:31:56.000000000 +0100 +++ jcommon-serializer-0.3.0/build.properties 2008-12-03 16:12:36.000000000 +0000 @@ -33,12 +33,16 @@ build.target-dir= build.manifest-lib-prefix=lib/ +Release-Major-Number=0 +Release-Minor-Number=3 +Release-Milestone-Number=0 + ########################################################### # # Used libraries ... # Used by: core libraries -dependency.release.core.libbase=libbase-1.0.0.jar +dependency.release.core.libbase=libbase.jar dependency.release.core.commons-logging=commons-logging-api.jar ############################################################## Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jcommon-serializer/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 May 2008 16:34:40 -0000 1.2 +++ .cvsignore 9 Mar 2009 10:50:47 -0000 1.3 @@ -1 +1 @@ -jcommon-serializer-0.2.0.tar.gz +jcommon-serializer-0.3.0.tar.gz Index: jcommon-serializer.spec =================================================================== RCS file: /cvs/pkgs/rpms/jcommon-serializer/devel/jcommon-serializer.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jcommon-serializer.spec 25 Feb 2009 09:11:42 -0000 1.3 +++ jcommon-serializer.spec 9 Mar 2009 10:50:47 -0000 1.4 @@ -2,16 +2,16 @@ %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: jcommon-serializer -Version: 0.2.0 -Release: 4%{?dist} +Version: 0.3.0 +Release: 1%{?dist} Summary: JFree Java General Serialization Framework License: LGPLv2+ Group: System Environment/Libraries Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz URL: http://www.jfree.org/jfreereport/jcommon-serializer -BuildRequires: ant, java-devel, jpackage-utils, jcommon +BuildRequires: ant, java-devel, jpackage-utils, libbase >= 1.0.0 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: java, jpackage-utils, jcommon +Requires: java, jpackage-utils, libbase >= 1.0.0 %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 @@ -19,7 +19,7 @@ %else BuildArch: noarch %endif -Patch1: jcommon-serializer-0.2.0-depends.patch +Patch1: jcommon-serializer-0.3.0-depends.patch %description Jcommon-serializer is a general serialization framework used by JFreeChart, @@ -38,7 +38,7 @@ %setup -q %patch1 -p1 -b .depends find . -name "*.jar" -exec rm -f {} \; -build-jar-repository -s -p lib jcommon +build-jar-repository -s -p lib libbase commons-logging-api %build ant compile javadoc @@ -87,6 +87,9 @@ %{_javadocdir}/%{name} %changelog +* Mon Mar 09 2009 Caolan McNamara 0.3.0-1 +- latest version + * Wed Feb 25 2009 Fedora Release Engineering - 0.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jcommon-serializer/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 May 2008 16:34:40 -0000 1.2 +++ sources 9 Mar 2009 10:50:47 -0000 1.3 @@ -1 +1 @@ -5466b988fd40d8745c1915b1e4a0e65f jcommon-serializer-0.2.0.tar.gz +06fa39275c38befc57691e45854fb549 jcommon-serializer-0.3.0.tar.gz --- jcommon-serializer-0.2.0-depends.patch DELETED --- From caolanm at fedoraproject.org Mon Mar 9 10:55:04 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 9 Mar 2009 10:55:04 +0000 (UTC) Subject: rpms/libloader/devel libloader-0.4.0-builddepends.patch, NONE, 1.1 libloader.spec, 1.2, 1.3 Message-ID: <20090309105504.83D4570116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/libloader/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2306 Modified Files: libloader.spec Added Files: libloader-0.4.0-builddepends.patch Log Message: latest version libloader-0.4.0-builddepends.patch: --- NEW FILE libloader-0.4.0-builddepends.patch --- --- libloader-0.4.0/build.properties.orig 2008-12-03 16:21:32.000000000 +0000 +++ libloader-0.4.0/build.properties 2008-12-03 16:21:41.000000000 +0000 @@ -38,7 +38,7 @@ # Used libraries ... # Used by: core libraries -dependency.release.core.libbase=libbase-1.0.0.jar +dependency.release.core.libbase=libbase.jar dependency.release.core.commons-logging=commons-logging-api.jar # Used by: module-factory-svg Index: libloader.spec =================================================================== RCS file: /cvs/pkgs/rpms/libloader/devel/libloader.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libloader.spec 25 Feb 2009 16:06:06 -0000 1.2 +++ libloader.spec 9 Mar 2009 10:54:34 -0000 1.3 @@ -2,16 +2,17 @@ %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: libloader -Version: 0.3.7 -Release: 2%{?dist} +Version: 0.4.0 +Release: 1%{?dist} Summary: Resource Loading Framework License: LGPLv2+ Group: System Environment/Libraries Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz URL: http://reporting.pentaho.org/ -BuildRequires: ant, java-devel, jpackage-utils, jcommon +BuildRequires: ant, java-devel, jpackage-utils +BuildRequires: libbase >= 1.0.0 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: java, jpackage-utils, jcommon +Requires: java, jpackage-utils, libbase >= 1.0.0 %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 @@ -19,6 +20,7 @@ %else BuildArch: noarch %endif +Patch1: libloader-0.4.0-builddepends.patch %description LibLoader is a general purpose resource loading framework. It has been @@ -38,7 +40,8 @@ %prep %setup -q find . -name "*.jar" -exec rm -f {} \; -build-jar-repository -s -p lib jcommon-1.0.12 +build-jar-repository -s -p lib libbase commons-logging-api +%patch1 -p1 -b .builddepends.patch %build ant compile javadoc @@ -91,6 +94,9 @@ %{_javadocdir}/%{name} %changelog +* Mon Mar 09 2009 Caolan McNamara 0.4.0-1 +- latest version + * Wed Feb 25 2009 Fedora Release Engineering - 0.3.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ondrejj at fedoraproject.org Mon Mar 9 10:55:48 2009 From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=) Date: Mon, 9 Mar 2009 10:55:48 +0000 (UTC) Subject: rpms/sagator/EL-5 .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 sagator.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090309105548.E2DB170116@cvs1.fedora.phx.redhat.com> Author: ondrejj Update of /cvs/pkgs/rpms/sagator/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2554/EL-5 Modified Files: .cvsignore import.log sagator.spec sources Log Message: Update upstream. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sagator/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Jul 2008 10:06:54 -0000 1.3 +++ .cvsignore 9 Mar 2009 10:55:18 -0000 1.4 @@ -1 +1 @@ -sagator-1.1.0.tar.bz2 +sagator-1.1.1.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/sagator/EL-5/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jul 2008 10:06:54 -0000 1.1 +++ import.log 9 Mar 2009 10:55:18 -0000 1.2 @@ -1 +1,2 @@ sagator-1_1_0-1_fc9:EL-5:sagator-1.1.0-1.fc9.src.rpm:1216030000 +sagator-1_1_1-1_fc10:EL-5:sagator-1.1.1-1.fc10.src.rpm:1236596078 Index: sagator.spec =================================================================== RCS file: /cvs/pkgs/rpms/sagator/EL-5/sagator.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sagator.spec 14 Jul 2008 10:06:54 -0000 1.2 +++ sagator.spec 9 Mar 2009 10:55:18 -0000 1.3 @@ -5,9 +5,9 @@ %define ANTISPAMS bogofilter,qsf %define CLAMAV_VERSION 0.92 -Summary: SAGATOR - antivir/antispam gateway for smtp server +Summary: Antivir/antispam gateway for smtp server Name: sagator -Version: 1.1.0 +Version: 1.1.1 Release: 1%{?dist} Source: http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}.tar.bz2 URL: http://www.salstar.sk/sagator/ @@ -16,23 +16,13 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel >= 2.2.2, ed, gettext -Obsoletes: sagator-libclamav <= 1.2.3 -Obsoletes: sagator-pydspam <= 0.9.1 +Requires: %{name}-core = %{version}-%{release} Requires: python >= 2.2.2, sed +Requires: spamassassin %if %_vendor == "suse" -BuildRequires: aaa_base, python-xml, clamav >= %{CLAMAV_VERSION} -Requires: aaa_base, smtp_daemon, clamav >= %{CLAMAV_VERSION} -%if 0%suse_version < 01030 -Requires: python-ctypes -%endif +Requires: clamav >= %{CLAMAV_VERSION} %else -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires: initscripts, smtpdaemon, shadow-utils Requires: clamav-lib >= %{CLAMAV_VERSION} -BuildRequires: initscripts, logwatch, clamav-devel >= %{CLAMAV_VERSION} - %endif %description @@ -56,10 +46,36 @@ * SQL database logging and configuration * simple chroot support +%package core +Summary: Antivir/antispam gateway for smtp server, core files +Group: System Environment/Daemons +Requires: python >= 2.2.2, sed +%if %_vendor == "suse" +BuildRequires: aaa_base, python-xml, clamav >= %{CLAMAV_VERSION} +Requires: aaa_base, smtp_daemon +%if 0%suse_version < 01030 +Requires: python-ctypes +%endif +%else +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts +Requires: initscripts, smtpdaemon, shadow-utils +BuildRequires: initscripts, logwatch, clamav-devel >= %{CLAMAV_VERSION} +Requires: clamav-lib >= %{CLAMAV_VERSION} +Requires: spamassassin +%endif +Obsoletes: sagator-libclamav <= 1.2.3 +Obsoletes: sagator-pydspam <= 0.9.1 + +%description core +SAGATOR's core files. You can use this package separatelly, if you do +not to depend on other software, required by sagator. + %package webq Summary: SAGATOR's web quarantine access Group: System Environment/Daemons -Requires: sagator = %{version}-%{release}, python-kid >= 0.9.5 +Requires: sagator-core = %{version}-%{release}, python-kid >= 0.9.5 BuildRequires: python-kid %description webq @@ -71,7 +87,7 @@ %package selinux Summary: SELinux support for SAGATOR Group: System Environment/Daemons -Requires: %{name} = %{version} +Requires: %{name}-core = %{version}-%{release} Requires(postun): policycoreutils, selinux-policy BuildRequires: selinux-policy-devel # SElinux directory and policy package @@ -103,13 +119,13 @@ mkdir -p %{buildroot}%{CHROOTDIR}/tmp/quarantine %find_lang %{name} -%pre +%pre core getent group vscan >/dev/null || groupadd -r vscan getent passwd vscan >/dev/null || \ useradd -r -g vscan -d %{CHROOTDIR} -s /sbin/nologin -c "SAGATOR" vscan exit 0 -%post +%post core touch %{_var}/lib/sagator-mkchroot if [ $1 = 2 ]; then # upgrade [ -f %{_sysconfdir}/sysconfig/sagator ] && . %{_sysconfdir}/sysconfig/sagator || true @@ -127,7 +143,7 @@ fi fi -%preun +%preun core if [ $1 = 0 ]; then # uninstall # stop service %{_initrddir}/sagator stop >/dev/null 2>&1 @@ -152,16 +168,20 @@ fi %endif -%triggerin -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS} +%triggerin core -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS} touch %{_var}/lib/sagator-mkchroot -%triggerpostun -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS} +%triggerpostun core -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS} touch %{_var}/lib/sagator-mkchroot %clean rm -rf %{buildroot} -%files -f filelist +%files +%defattr(-,root,root) +# no files, this package just requires others + +%files core -f filelist %defattr(-,root,root) %config(noreplace) %verify(not md5 size mtime) %attr(640,root,vscan) %{_sysconfdir}/%{name}.conf %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/%{name} @@ -205,25 +225,35 @@ %if %{install_sepolicy} %files selinux %defattr(-,root,root) +%dir %{_datadir}/%{name}/selinux %{sepolicy} %endif %changelog +* Wed Sep 17 2008 Jan ONDREJ (SAL) - 1.1.1-1 +- core files moved to core packages, sagator package now requires clamav + and spamassassin +- added selinux policy dir + +* Sun Feb 17 2008 Jan ONDREJ (SAL) - 1.1.0-2 +- changed dependency from smtpdaemon to server(smtp) +- reverted back previous change + * Sun Feb 17 2008 Jan ONDREJ (SAL) - 1.1.0-1 - added libclamav module - added pydspam module - selinux module moved to separate subpackage -* Fri Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0 +* Fri Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0-1 - /var/spool/vscan replaced by CHROOTDIR macro - posttrans section moved to init script (start section) - more macros used -* Thu Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0-0beta32 +* Thu Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0-2 - clean buildroot before install - sagator.conf symlink is now relative -* Fri Sep 7 2007 Jan ONDREJ (SAL) - 1.0.0-0beta31 +* Fri Sep 7 2007 Jan ONDREJ (SAL) - 1.0.0-1 - sagator moved from /usr/lib to /usr/share * Fri Apr 13 2007 Jan ONDREJ (SAL) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sagator/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Jul 2008 10:06:54 -0000 1.3 +++ sources 9 Mar 2009 10:55:18 -0000 1.4 @@ -1 +1 @@ -a5ac5ad840ba512b27d0fa53ed0108d5 sagator-1.1.0.tar.bz2 +a8be96499866353a56d4b49b1c3c2cd2 sagator-1.1.1.tar.bz2 From ondrejj at fedoraproject.org Mon Mar 9 10:57:47 2009 From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=) Date: Mon, 9 Mar 2009 10:57:47 +0000 (UTC) Subject: rpms/sagator/EL-4 .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 sagator.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090309105747.C5E0670116@cvs1.fedora.phx.redhat.com> Author: ondrejj Update of /cvs/pkgs/rpms/sagator/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3174/EL-4 Modified Files: .cvsignore import.log sagator.spec sources Log Message: Update upstream. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sagator/EL-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Jul 2008 10:10:54 -0000 1.3 +++ .cvsignore 9 Mar 2009 10:57:17 -0000 1.4 @@ -1 +1 @@ -sagator-1.1.0.tar.bz2 +sagator-1.1.1.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/sagator/EL-4/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jul 2008 10:10:54 -0000 1.1 +++ import.log 9 Mar 2009 10:57:17 -0000 1.2 @@ -1 +1,2 @@ sagator-1_1_0-1_fc9:EL-4:sagator-1.1.0-1.fc9.src.rpm:1216030241 +sagator-1_1_1-1_fc10:EL-4:sagator-1.1.1-1.fc10.src.rpm:1236596208 Index: sagator.spec =================================================================== RCS file: /cvs/pkgs/rpms/sagator/EL-4/sagator.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sagator.spec 14 Jul 2008 10:10:54 -0000 1.2 +++ sagator.spec 9 Mar 2009 10:57:17 -0000 1.3 @@ -5,9 +5,9 @@ %define ANTISPAMS bogofilter,qsf %define CLAMAV_VERSION 0.92 -Summary: SAGATOR - antivir/antispam gateway for smtp server +Summary: Antivir/antispam gateway for smtp server Name: sagator -Version: 1.1.0 +Version: 1.1.1 Release: 1%{?dist} Source: http://www.salstar.sk/pub/antivir/snapshots/sagator-%{version}.tar.bz2 URL: http://www.salstar.sk/sagator/ @@ -16,23 +16,13 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel >= 2.2.2, ed, gettext -Obsoletes: sagator-libclamav <= 1.2.3 -Obsoletes: sagator-pydspam <= 0.9.1 +Requires: %{name}-core = %{version}-%{release} Requires: python >= 2.2.2, sed +Requires: spamassassin %if %_vendor == "suse" -BuildRequires: aaa_base, python-xml, clamav >= %{CLAMAV_VERSION} -Requires: aaa_base, smtp_daemon, clamav >= %{CLAMAV_VERSION} -%if 0%suse_version < 01030 -Requires: python-ctypes -%endif +Requires: clamav >= %{CLAMAV_VERSION} %else -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires: initscripts, smtpdaemon, shadow-utils Requires: clamav-lib >= %{CLAMAV_VERSION} -BuildRequires: initscripts, logwatch, clamav-devel >= %{CLAMAV_VERSION} - %endif %description @@ -56,10 +46,36 @@ * SQL database logging and configuration * simple chroot support +%package core +Summary: Antivir/antispam gateway for smtp server, core files +Group: System Environment/Daemons +Requires: python >= 2.2.2, sed +%if %_vendor == "suse" +BuildRequires: aaa_base, python-xml, clamav >= %{CLAMAV_VERSION} +Requires: aaa_base, smtp_daemon +%if 0%suse_version < 01030 +Requires: python-ctypes +%endif +%else +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts +Requires: initscripts, smtpdaemon, shadow-utils +BuildRequires: initscripts, logwatch, clamav-devel >= %{CLAMAV_VERSION} +Requires: clamav-lib >= %{CLAMAV_VERSION} +Requires: spamassassin +%endif +Obsoletes: sagator-libclamav <= 1.2.3 +Obsoletes: sagator-pydspam <= 0.9.1 + +%description core +SAGATOR's core files. You can use this package separatelly, if you do +not to depend on other software, required by sagator. + %package webq Summary: SAGATOR's web quarantine access Group: System Environment/Daemons -Requires: sagator = %{version}-%{release}, python-kid >= 0.9.5 +Requires: sagator-core = %{version}-%{release}, python-kid >= 0.9.5 BuildRequires: python-kid %description webq @@ -71,7 +87,7 @@ %package selinux Summary: SELinux support for SAGATOR Group: System Environment/Daemons -Requires: %{name} = %{version} +Requires: %{name}-core = %{version}-%{release} Requires(postun): policycoreutils, selinux-policy BuildRequires: selinux-policy-devel # SElinux directory and policy package @@ -103,13 +119,13 @@ mkdir -p %{buildroot}%{CHROOTDIR}/tmp/quarantine %find_lang %{name} -%pre +%pre core getent group vscan >/dev/null || groupadd -r vscan getent passwd vscan >/dev/null || \ useradd -r -g vscan -d %{CHROOTDIR} -s /sbin/nologin -c "SAGATOR" vscan exit 0 -%post +%post core touch %{_var}/lib/sagator-mkchroot if [ $1 = 2 ]; then # upgrade [ -f %{_sysconfdir}/sysconfig/sagator ] && . %{_sysconfdir}/sysconfig/sagator || true @@ -127,7 +143,7 @@ fi fi -%preun +%preun core if [ $1 = 0 ]; then # uninstall # stop service %{_initrddir}/sagator stop >/dev/null 2>&1 @@ -152,16 +168,20 @@ fi %endif -%triggerin -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS} +%triggerin core -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS} touch %{_var}/lib/sagator-mkchroot -%triggerpostun -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS} +%triggerpostun core -- sagator-webq,%{BASE_LIBS},%{ARCHIVERS},%{ANTIVIRS},%{ANTISPAMS} touch %{_var}/lib/sagator-mkchroot %clean rm -rf %{buildroot} -%files -f filelist +%files +%defattr(-,root,root) +# no files, this package just requires others + +%files core -f filelist %defattr(-,root,root) %config(noreplace) %verify(not md5 size mtime) %attr(640,root,vscan) %{_sysconfdir}/%{name}.conf %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/%{name} @@ -205,25 +225,35 @@ %if %{install_sepolicy} %files selinux %defattr(-,root,root) +%dir %{_datadir}/%{name}/selinux %{sepolicy} %endif %changelog +* Wed Sep 17 2008 Jan ONDREJ (SAL) - 1.1.1-1 +- core files moved to core packages, sagator package now requires clamav + and spamassassin +- added selinux policy dir + +* Sun Feb 17 2008 Jan ONDREJ (SAL) - 1.1.0-2 +- changed dependency from smtpdaemon to server(smtp) +- reverted back previous change + * Sun Feb 17 2008 Jan ONDREJ (SAL) - 1.1.0-1 - added libclamav module - added pydspam module - selinux module moved to separate subpackage -* Fri Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0 +* Fri Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0-1 - /var/spool/vscan replaced by CHROOTDIR macro - posttrans section moved to init script (start section) - more macros used -* Thu Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0-0beta32 +* Thu Jan 3 2008 Jan ONDREJ (SAL) - 1.0.0-2 - clean buildroot before install - sagator.conf symlink is now relative -* Fri Sep 7 2007 Jan ONDREJ (SAL) - 1.0.0-0beta31 +* Fri Sep 7 2007 Jan ONDREJ (SAL) - 1.0.0-1 - sagator moved from /usr/lib to /usr/share * Fri Apr 13 2007 Jan ONDREJ (SAL) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sagator/EL-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Jul 2008 10:10:54 -0000 1.3 +++ sources 9 Mar 2009 10:57:17 -0000 1.4 @@ -1 +1 @@ -a5ac5ad840ba512b27d0fa53ed0108d5 sagator-1.1.0.tar.bz2 +a8be96499866353a56d4b49b1c3c2cd2 sagator-1.1.1.tar.bz2 From kwizart at fedoraproject.org Mon Mar 9 10:58:34 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 9 Mar 2009 10:58:34 +0000 (UTC) Subject: rpms/oyranos/devel oyranos-0.1.9-cmms_lf.patch,1.1,NONE Message-ID: <20090309105834.64D0C70116@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/oyranos/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3584 Removed Files: oyranos-0.1.9-cmms_lf.patch Log Message: Clean unused patch --- oyranos-0.1.9-cmms_lf.patch DELETED --- From caolanm at fedoraproject.org Mon Mar 9 10:59:58 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 9 Mar 2009 10:59:58 +0000 (UTC) Subject: rpms/libformula/devel libformula-0.2.0-builddepends.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libformula.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090309105958.0A95470116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/libformula/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3836 Modified Files: .cvsignore libformula.spec sources Added Files: libformula-0.2.0-builddepends.patch Log Message: latest version libformula-0.2.0-builddepends.patch: --- NEW FILE libformula-0.2.0-builddepends.patch --- --- libformula-0.2.0/build.properties.orig 2008-12-03 16:27:28.000000000 +0000 +++ libformula-0.2.0/build.properties 2008-12-03 16:27:35.000000000 +0000 @@ -42,7 +42,7 @@ # Used libraries ... # Used by: core libraries -dependency.release.core.libbase=libbase-1.0.0.jar +dependency.release.core.libbase=libbase.jar dependency.release.core.commons-logging=commons-logging-api.jar # Used tools: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libformula/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Jun 2008 17:29:33 -0000 1.2 +++ .cvsignore 9 Mar 2009 10:59:27 -0000 1.3 @@ -1 +1 @@ -libformula-0.1.18.tar.gz +libformula-0.2.0.tar.gz Index: libformula.spec =================================================================== RCS file: /cvs/pkgs/rpms/libformula/devel/libformula.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libformula.spec 25 Feb 2009 14:48:35 -0000 1.2 +++ libformula.spec 9 Mar 2009 10:59:27 -0000 1.3 @@ -2,16 +2,16 @@ %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: libformula -Version: 0.1.18 -Release: 2%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: Formula Parser License: LGPLv2+ Group: System Environment/Libraries Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz URL: http://reporting.pentaho.org/ -BuildRequires: ant, java-devel, jpackage-utils, jcommon +BuildRequires: ant, java-devel, jpackage-utils, libbase >= 1.0.0 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: java, jpackage-utils, jcommon +Requires: java, jpackage-utils, libbase >= 1.0.0 %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 @@ -19,6 +19,7 @@ %else BuildArch: noarch %endif +Patch0: libformula-0.2.0-builddepends.patch %description LibFormula provides Excel-Style-Expressions. The implementation provided @@ -37,7 +38,8 @@ %prep %setup -q find . -name "*.jar" -exec rm -f {} \; -build-jar-repository -s -p lib jcommon-1.0.12 +build-jar-repository -s -p lib commons-logging-api libbase +%patch0 -p1 -b.builddepends.patch %build ant compile javadoc @@ -86,6 +88,9 @@ %{_javadocdir}/%{name} %changelog +* Mon Mar 09 2009 Caolan McNamara 0.2.0-1 +- latest version + * Wed Feb 25 2009 Fedora Release Engineering - 0.1.18-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libformula/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Jun 2008 17:29:33 -0000 1.2 +++ sources 9 Mar 2009 10:59:27 -0000 1.3 @@ -1 +1 @@ -213ffd2a685932ab238e5ee225a1ad49 libformula-0.1.18.tar.gz +f4eb36ae9e4ea77cdb724a6e99106ec8 libformula-0.2.0.tar.gz From caolanm at fedoraproject.org Mon Mar 9 11:00:56 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 9 Mar 2009 11:00:56 +0000 (UTC) Subject: rpms/libloader/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <20090309110056.0E91170116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/libloader/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4143 Modified Files: .cvsignore sources Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libloader/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Jun 2008 17:23:49 -0000 1.2 +++ .cvsignore 9 Mar 2009 11:00:25 -0000 1.3 @@ -1 +1 @@ -libloader-0.3.7.tar.gz +libloader-0.4.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libloader/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Jun 2008 17:23:49 -0000 1.2 +++ sources 9 Mar 2009 11:00:25 -0000 1.3 @@ -1 +1 @@ -bc4b9732e3c898a2f1102062fd614f2b libloader-0.3.7.tar.gz +bfbd271ff87a8488e0295933f6ca0d8d libloader-0.4.0.tar.gz From transif at fedoraproject.org Mon Mar 9 11:02:17 2009 From: transif at fedoraproject.org (Transifex System User) Date: Mon, 9 Mar 2009 11:02:17 +0000 (UTC) Subject: comps/po es.po,1.29,1.30 Message-ID: <20090309110217.130A170116@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4434/po Modified Files: es.po Log Message: 2009-03-09 Domingo Becker (via beckerde at fedoraproject.org) * po/es.po: updated Spanish translation View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.29 -r 1.30 es.po Index: es.po =================================================================== RCS file: /cvs/pkgs/comps/po/es.po,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- es.po 7 Mar 2009 06:34:08 -0000 1.29 +++ es.po 9 Mar 2009 11:01:46 -0000 1.30 @@ -9,208 +9,330 @@ msgstr "" "Project-Id-Version: comps.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-07 05:53+0000\n" -"PO-Revision-Date: 2009-03-07 00:31-0600\n" +"POT-Creation-Date: 2009-03-09 09:53+0000\n" +"PO-Revision-Date: 2009-03-09 08:52-0300\n" "Last-Translator: Domingo Becker \n" -"Language-Team: Spanish \n" +"Language-Team: Fedora Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);" +"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Language: Spanish\n" -#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 -#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1 +#: ../comps-f7.xml.in.h:1 +#: ../comps-f8.xml.in.h:1 +#: ../comps-f9.xml.in.h:1 +#: ../comps-f10.xml.in.h:1 +#: ../comps-f11.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." -msgstr "" -"Un entorno de escritorio liviano que funciona bien en m??quinas peque??as." +msgstr "Un entorno de escritorio liviano que funciona bien en m??quinas peque??as." -#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 -#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1 +#: ../comps-f7.xml.in.h:2 +#: ../comps-f8.xml.in.h:2 +#: ../comps-f9.xml.in.h:2 +#: ../comps-f10.xml.in.h:3 +#: ../comps-f11.xml.in.h:3 +#: ../comps-el4.xml.in.h:1 #: ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "Herramientas de Administraci??n" -#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 -#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4 +#: ../comps-f7.xml.in.h:3 +#: ../comps-f8.xml.in.h:3 +#: ../comps-f9.xml.in.h:3 +#: ../comps-f10.xml.in.h:4 +#: ../comps-f11.xml.in.h:4 msgid "Afrikaans Support" msgstr "Soporte para africano" -#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 -#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5 +#: ../comps-f7.xml.in.h:4 +#: ../comps-f8.xml.in.h:4 +#: ../comps-f9.xml.in.h:4 +#: ../comps-f10.xml.in.h:5 +#: ../comps-f11.xml.in.h:5 msgid "Albanian Support" msgstr "Soporte para alban??s" -#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 -#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2 +#: ../comps-f7.xml.in.h:5 +#: ../comps-f8.xml.in.h:5 +#: ../comps-f9.xml.in.h:5 +#: ../comps-f10.xml.in.h:6 +#: ../comps-f11.xml.in.h:7 +#: ../comps-el4.xml.in.h:2 #: ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "Aplicaciones" -#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 -#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 +#: ../comps-f7.xml.in.h:6 +#: ../comps-f8.xml.in.h:6 +#: ../comps-f9.xml.in.h:6 +#: ../comps-f10.xml.in.h:7 +#: ../comps-f11.xml.in.h:8 msgid "Applications to perform a variety of tasks" msgstr "Aplicaciones para una variedad de tareas" -#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 -#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4 +#: ../comps-f7.xml.in.h:7 +#: ../comps-f8.xml.in.h:7 +#: ../comps-f9.xml.in.h:7 +#: ../comps-f10.xml.in.h:8 +#: ../comps-f11.xml.in.h:9 +#: ../comps-el4.xml.in.h:4 #: ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "Soporte para ??rabe" -#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 -#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5 +#: ../comps-f7.xml.in.h:8 +#: ../comps-f8.xml.in.h:8 +#: ../comps-f9.xml.in.h:8 +#: ../comps-f10.xml.in.h:9 +#: ../comps-f11.xml.in.h:10 +#: ../comps-el4.xml.in.h:5 #: ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "Soporte para armenio" -#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9 -#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 +#: ../comps-f7.xml.in.h:9 +#: ../comps-f8.xml.in.h:9 +#: ../comps-f9.xml.in.h:9 +#: ../comps-f10.xml.in.h:10 +#: ../comps-f11.xml.in.h:11 msgid "Assamese Support" msgstr "Soporte para assam??s" -#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10 -#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6 +#: ../comps-f7.xml.in.h:10 +#: ../comps-f8.xml.in.h:10 +#: ../comps-f9.xml.in.h:10 +#: ../comps-f10.xml.in.h:11 +#: ../comps-f11.xml.in.h:12 +#: ../comps-el4.xml.in.h:6 #: ../comps-el5.xml.in.h:6 msgid "Authoring and Publishing" msgstr "Autor??a y publicaci??n" -#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11 -#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:13 +#: ../comps-f7.xml.in.h:11 +#: ../comps-f8.xml.in.h:11 +#: ../comps-f9.xml.in.h:11 +#: ../comps-f10.xml.in.h:12 +#: ../comps-f11.xml.in.h:13 msgid "Base" msgstr "Base" -#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12 -#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:14 ../comps-el4.xml.in.h:7 +#: ../comps-f7.xml.in.h:12 +#: ../comps-f8.xml.in.h:12 +#: ../comps-f9.xml.in.h:12 +#: ../comps-f10.xml.in.h:13 +#: ../comps-f11.xml.in.h:14 +#: ../comps-el4.xml.in.h:7 #: ../comps-el5.xml.in.h:7 msgid "Base System" msgstr "Sistema Base" -#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13 -#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:15 +#: ../comps-f7.xml.in.h:13 +#: ../comps-f8.xml.in.h:13 +#: ../comps-f9.xml.in.h:13 +#: ../comps-f10.xml.in.h:14 +#: ../comps-f11.xml.in.h:15 msgid "Basic support for the Ruby programming language." msgstr "Soporte b??sico para el lenguaje de programaci??n Ruby." -#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14 -#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16 +#: ../comps-f7.xml.in.h:14 +#: ../comps-f8.xml.in.h:14 +#: ../comps-f9.xml.in.h:14 +#: ../comps-f10.xml.in.h:15 +#: ../comps-f11.xml.in.h:16 msgid "Basque Support" msgstr "Soporte para vascuence" -#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15 -#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17 +#: ../comps-f7.xml.in.h:15 +#: ../comps-f8.xml.in.h:15 +#: ../comps-f9.xml.in.h:15 +#: ../comps-f10.xml.in.h:16 +#: ../comps-f11.xml.in.h:17 msgid "Belarusian Support" msgstr "Soporte para bielorruso" -#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16 -#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18 +#: ../comps-f7.xml.in.h:16 +#: ../comps-f8.xml.in.h:16 +#: ../comps-f9.xml.in.h:16 +#: ../comps-f10.xml.in.h:17 +#: ../comps-f11.xml.in.h:18 msgid "Bengali Support" msgstr "Soporte para bengal??" [...2328 lines suppressed...] msgid "Sindhi Support" msgstr "Soporte para Sindhi" -#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:170 +#: ../comps-f10.xml.in.h:158 +#: ../comps-f11.xml.in.h:171 msgid "Support for developing programs in the Haskell programming language." -msgstr "" -"Soporte para el desarrollo de programas en el lenguaje de programaci??n " -"Haskell." +msgstr "Soporte para el desarrollo de programas en el lenguaje de programaci??n Haskell." -#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:177 +#: ../comps-f10.xml.in.h:165 +#: ../comps-f11.xml.in.h:179 msgid "Tajik Support" msgstr "Soporte para Tajik" -#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:222 +#: ../comps-f10.xml.in.h:207 +#: ../comps-f11.xml.in.h:224 msgid "Uzbek Support" msgstr "Soporte para Uszbek" @@ -1346,112 +1926,101 @@ msgstr "Compilador multi-plataforma MinGW" #: ../comps-f11.xml.in.h:136 +msgid "OCaml" +msgstr "OCaml" + +#: ../comps-f11.xml.in.h:137 msgid "Occitan Support" msgstr "Soporte para occitanio" -#: ../comps-f11.xml.in.h:139 +#: ../comps-f11.xml.in.h:140 msgid "Online Help and Documentation" msgstr "Ayuda y Documentaci??n en linea" -#: ../comps-f11.xml.in.h:169 -msgid "" -"Support for cross-compiling programs to 32 bit Windows targets, testing " -"them, and building installers, all from within Fedora." -msgstr "Soporte para compilar programas a objetivos de 32 bit, probarlos y crear " -"instaladores, todo desde dentro de Fedora." - -#: ../comps-f11.xml.in.h:206 -msgid "" -"This group is a collection of tools used in the design, modification, " -"manipulation, and packaging of fonts." -msgstr "" -"Este grupo es un conjunto de herramientas que se usan en el dise??o, " -"modificaci??n, manipulaci??n y empaquetado de fuentes (tipos de letras)." +#: ../comps-f11.xml.in.h:170 +msgid "Support for cross-compiling programs to 32 bit Windows targets, testing them, and building installers, all from within Fedora." +msgstr "Soporte para compilar programas a objetivos de 32 bit, probarlos y crear instaladores, todo desde dentro de Fedora." + +#: ../comps-f11.xml.in.h:173 +msgid "Support for developing software using the Objective CAML programming language and libraries." +msgstr "Soporte para el desarrollo de programas en el lenguaje de programaci??n Objective CAML y las bibliotecas." + +#: ../comps-f11.xml.in.h:208 +msgid "This group is a collection of tools used in the design, modification, manipulation, and packaging of fonts." +msgstr "Este grupo es un conjunto de herramientas que se usan en el dise??o, modificaci??n, manipulaci??n y empaquetado de fuentes (tipos de letras)." -#: ../comps-f11.xml.in.h:218 +#: ../comps-f11.xml.in.h:220 msgid "Turkmen Support" msgstr "Soporte para turkmenio" -#: ../comps-f11.xml.in.h:220 +#: ../comps-f11.xml.in.h:222 msgid "Upper Sorbian Support" msgstr "Soporte para serbio arribe??o" -#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 +#: ../comps-el4.xml.in.h:3 +#: ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" msgstr "Aplicaciones para una variedad de tareas" -#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13 +#: ../comps-el4.xml.in.h:12 +#: ../comps-el5.xml.in.h:13 msgid "Dialup Networking Support" msgstr "Soporte de red mediante discado" -#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23 -msgid "" -"GNOME is a powerful, graphical user interface which includes a panel, " -"desktop, system icons, and a graphical file manager." -msgstr "" -"GNOME es una potente interfaz gr??fica de usuario que incluye un panel, un " -"escritorio, iconos del sistema y gestores gr??ficos de archivos." - -#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35 -msgid "" -"KDE is a powerful, graphical user interface which includes a panel, desktop, " -"system icons, and a graphical file manager." -msgstr "" -"KDE es una interfaz de usuario gr??fica y potente que incluye un panel, un " -"escritorio, iconos del sistema y un gestor gr??fico de archivos. " - -#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44 -msgid "" -"Sometimes called text editors, these are programs that allow you to create " -"and edit files. These include Emacs and Vi." -msgstr "" -"Existen programas que permiten crear y modificar archivos, a veces llamados " -"editores de texto. Estos incluyen Emacs y Vi." +#: ../comps-el4.xml.in.h:22 +#: ../comps-el5.xml.in.h:23 +msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." +msgstr "GNOME es una potente interfaz gr??fica de usuario que incluye un panel, un escritorio, iconos del sistema y gestores gr??ficos de archivos." + +#: ../comps-el4.xml.in.h:35 +#: ../comps-el5.xml.in.h:35 +msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." +msgstr "KDE es una interfaz de usuario gr??fica y potente que incluye un panel, un escritorio, iconos del sistema y un gestor gr??fico de archivos. " + +#: ../comps-el4.xml.in.h:44 +#: ../comps-el5.xml.in.h:44 +msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi." +msgstr "Existen programas que permiten crear y modificar archivos, a veces llamados editores de texto. Estos incluyen Emacs y Vi." -#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48 +#: ../comps-el4.xml.in.h:50 +#: ../comps-el5.xml.in.h:48 msgid "The XEmacs text editor." msgstr "Editor de textos XEmacs." -#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52 -msgid "" -"These tools allow you to create documentation in the DocBook format and " -"convert them to HTML, PDF, Postscript, and text." -msgstr "" -"Estas herramientas le permiten crear documentaci??n en formato DocBook y " -"convertirla a HTML, PDF, Postscript y texto." +#: ../comps-el4.xml.in.h:54 +#: ../comps-el5.xml.in.h:52 +msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text." +msgstr "Estas herramientas le permiten crear documentaci??n en formato DocBook y convertirla a HTML, PDF, Postscript y texto." -#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62 +#: ../comps-el4.xml.in.h:64 +#: ../comps-el5.xml.in.h:62 msgid "This group is a collection of network servers for specific purposes" msgstr "Este grupo es un conjunto de servidores para prop??sitos espec??ficos" -#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 -msgid "" -"This group is a collection of tools and resources of Arabic environments." -msgstr "" -"Este grupo es un conjunto de herramientas y recursos para entornos en Ar??be." - -#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 -msgid "" -"This group is a collection of tools and resources of Hebrew environments." -msgstr "" -"Este grupo es un conjunto de herramientas y recursos para entornos en Hebreo." - -#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 -msgid "" -"This group is a collection of tools and resources of Japanese environments." -msgstr "" -"Este grupo es un conjunto de herramientas y recursos para entornos en " -"Japon??s." +#: ../comps-el4.xml.in.h:65 +#: ../comps-el5.xml.in.h:63 +msgid "This group is a collection of tools and resources of Arabic environments." +msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Ar??be." + +#: ../comps-el4.xml.in.h:67 +#: ../comps-el5.xml.in.h:66 +msgid "This group is a collection of tools and resources of Hebrew environments." +msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Hebreo." + +#: ../comps-el4.xml.in.h:68 +#: ../comps-el5.xml.in.h:67 +msgid "This group is a collection of tools and resources of Japanese environments." +msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Japon??s." -#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77 +#: ../comps-el4.xml.in.h:77 +#: ../comps-el5.xml.in.h:77 msgid "XEmacs" msgstr "XEmacs" #: ../comps-el5.xml.in.h:65 -msgid "" -"This group is a collection of tools and resources of Czech environments." -msgstr "" -"Este grupo es un conjunto de herramientas y recursos para entornos en Checo." +msgid "This group is a collection of tools and resources of Czech environments." +msgstr "Este grupo es un conjunto de herramientas y recursos para entornos en Checo." #~ msgid "Haskell" #~ msgstr "Haskell" + From kwizart at fedoraproject.org Mon Mar 9 11:03:55 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 9 Mar 2009 11:03:55 +0000 (UTC) Subject: rpms/oyranos/devel oyranos.spec,1.6,1.7 Message-ID: <20090309110355.D1D4170116@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/oyranos/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4941 Modified Files: oyranos.spec Log Message: Fix weirdness in the spec file Index: oyranos.spec =================================================================== RCS file: /cvs/pkgs/rpms/oyranos/devel/oyranos.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- oyranos.spec 9 Mar 2009 10:26:13 -0000 1.6 +++ oyranos.spec 9 Mar 2009 11:03:25 -0000 1.7 @@ -1,6 +1,6 @@ Name: oyranos Version: 0.1.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Oyranos Colour Management System (CMS) Group: Applications/Multimedia @@ -15,7 +15,6 @@ Patch2: oyranos-0.1.9-default.patch Patch3: oyranos-0.1.9-man-1_3.patch Patch4: oyranos-0.1.9-rm_class.patch -Patch5: oyranos-0.1.9-cmms_lf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: OpenEXR-devel @@ -31,6 +30,7 @@ BuildRequires: libstdc++-devel BuildRequires: libxslt-devel BuildRequires: libpng-devel +BuildRequires: libtiff-devel BuildRequires: libjpeg-devel BuildRequires: libXNVCtrl-devel @@ -72,6 +72,9 @@ Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} +# -doc deprecation introducted in F-11 +Provides: %{name}-doc = %{version}-%{release} +Obsoletes: %{name}-doc < 0.1.9-2 Requires: pkgconfig Requires: libX11-devel Requires: libXinerama-devel @@ -79,12 +82,6 @@ %description devel This package contains development files for %{name}. -%package docs -Summary: Documentation for %{name} -Group: Documentation - -%description docs -This package contains documentation files for %{name}. %prep @@ -94,7 +91,6 @@ %patch2 -p1 -b .default %patch3 -p1 -b .man-1_3 %patch4 -p1 -b .rm_class -#patch5 -p1 -b .cmms_lf # Update Doxygen doxygen -u @@ -110,6 +106,8 @@ make #{?_smp_mflags} +# Doxygen documentation generated here +make docu %install rm -rf $RPM_BUILD_ROOT __doc @@ -126,11 +124,13 @@ # Multilib tweaks touch -r ChangeLog $RPM_BUILD_ROOT%{_bindir}/%{name}-config +touch -r ChangeLog doc/html/* #Manual install mkdir -p $RPM_BUILD_ROOT%{_settingscolordir} install -pm 0644 settings/*.policy.xml $RPM_BUILD_ROOT%{_settingscolordir} + %find_lang %{name} @@ -171,6 +171,7 @@ %files devel %defattr(-,root,root,-) +%doc doc/html/* %{_bindir}/%{name}-config #{_mandir}/man3/%{name}.* #{_mandir}/man3/%{name}-config.* @@ -178,12 +179,14 @@ %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}*.pc -%files docs -%defattr(-,root,root,-) -#doc __doc/html/* %changelog +* Mon Mar 9 2009 kwizart < kwizart at gmail.com > - 0.1.9-2 +- Remove unused patch +- Merge -doc in -devel +- Add missing BR libtiff-devel + * Thu Mar 5 2009 kwizart < kwizart at gmail.com > - 0.1.9-1 - Update to 0.1.9 From allisson at fedoraproject.org Mon Mar 9 11:05:44 2009 From: allisson at fedoraproject.org (Allisson Azevedo) Date: Mon, 9 Mar 2009 11:05:44 +0000 (UTC) Subject: rpms/perl-Variable-Magic/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 perl-Variable-Magic.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090309110544.6A78270116@cvs1.fedora.phx.redhat.com> Author: allisson Update of /cvs/pkgs/rpms/perl-Variable-Magic/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5113/devel Modified Files: .cvsignore import.log perl-Variable-Magic.spec sources Log Message: Update to 0.32 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Variable-Magic/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Feb 2009 20:12:17 -0000 1.2 +++ .cvsignore 9 Mar 2009 11:05:13 -0000 1.3 @@ -1 +1 @@ -Variable-Magic-0.30.tar.gz +Variable-Magic-0.32.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/perl-Variable-Magic/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Feb 2009 20:12:17 -0000 1.1 +++ import.log 9 Mar 2009 11:05:13 -0000 1.2 @@ -1 +1,2 @@ perl-Variable-Magic-0_30-1_fc10:HEAD:perl-Variable-Magic-0.30-1.fc10.src.rpm:1234987754 +perl-Variable-Magic-0_32-1_fc10:HEAD:perl-Variable-Magic-0.32-1.fc10.src.rpm:1236596546 Index: perl-Variable-Magic.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Variable-Magic/devel/perl-Variable-Magic.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Variable-Magic.spec 27 Feb 2009 04:13:27 -0000 1.2 +++ perl-Variable-Magic.spec 9 Mar 2009 11:05:13 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Variable-Magic -Version: 0.30 -Release: 2%{?dist} +Version: 0.32 +Release: 1%{?dist} Summary: Associate user-defined magic to variables from Perl License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Mon Mar 9 2009 Allisson Azevedo - 0.32-1 +- Update to 0.32 + * Thu Feb 26 2009 Fedora Release Engineering - 0.30-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Variable-Magic/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Feb 2009 20:12:17 -0000 1.2 +++ sources 9 Mar 2009 11:05:13 -0000 1.3 @@ -1 +1 @@ -1850fb2c5770b48df0d9a13b5713a643 Variable-Magic-0.30.tar.gz +c2ff2f2ec88bbc291934a89e6fff06ed Variable-Magic-0.32.tar.gz From jwrdegoede at fedoraproject.org Mon Mar 9 11:07:21 2009 From: jwrdegoede at fedoraproject.org (Hans de Goede) Date: Mon, 9 Mar 2009 11:07:21 +0000 (UTC) Subject: rpms/ImageMagick/devel .cvsignore, 1.24, 1.25 ImageMagick-6.4.0-multilib.patch, 1.2, 1.3 ImageMagick.spec, 1.87, 1.88 sources, 1.24, 1.25 ImageMagick-6.3.8-invalid-gerror-use.patch, 1.2, NONE Message-ID: <20090309110721.3F0CD70116@cvs1.fedora.phx.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/ImageMagick/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5829 Modified Files: .cvsignore ImageMagick-6.4.0-multilib.patch ImageMagick.spec sources Removed Files: ImageMagick-6.3.8-invalid-gerror-use.patch Log Message: * Mon Mar 9 2009 Hans de Goede 6.4.9.6-1 - New upstream release 6.4.9-6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ImageMagick/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 27 Dec 2008 13:59:23 -0000 1.24 +++ .cvsignore 9 Mar 2009 11:06:50 -0000 1.25 @@ -1 +1 @@ -ImageMagick-6.4.5.5-clean.tar.bz2 +ImageMagick-6.4.9-6.tar.bz2 ImageMagick-6.4.0-multilib.patch: Index: ImageMagick-6.4.0-multilib.patch =================================================================== RCS file: /cvs/extras/rpms/ImageMagick/devel/ImageMagick-6.4.0-multilib.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ImageMagick-6.4.0-multilib.patch 14 Nov 2008 14:54:41 -0000 1.2 +++ ImageMagick-6.4.0-multilib.patch 9 Mar 2009 11:06:50 -0000 1.3 @@ -1,6 +1,6 @@ -diff -up ImageMagick-6.4.5/Magick++/bin/Magick++-config.in.multilib ImageMagick-6.4.5/Magick++/bin/Magick++-config.in ---- ImageMagick-6.4.5/Magick++/bin/Magick++-config.in.multilib 2008-02-17 19:10:46.000000000 +0100 -+++ ImageMagick-6.4.5/Magick++/bin/Magick++-config.in 2008-11-14 15:19:15.000000000 +0100 +diff -up ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in.multilib ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in +--- ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in.multilib 2008-12-08 20:00:35.000000000 +0100 ++++ ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in 2009-02-24 10:55:05.000000000 +0100 @@ -7,8 +7,6 @@ prefix=@prefix@ @@ -30,14 +30,14 @@ + pkg-config --libs Magick++ ;; --libs) -- echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore" +- echo "-L${libdir} -lMagick++ -lMagickWand @MAGICK_LIBS@" + pkg-config --libs Magick++ ;; *) echo "${usage}" 1>&2 -diff -up ImageMagick-6.4.5/magick/Magick-config.in.multilib ImageMagick-6.4.5/magick/Magick-config.in ---- ImageMagick-6.4.5/magick/Magick-config.in.multilib 2008-04-28 00:35:32.000000000 +0200 -+++ ImageMagick-6.4.5/magick/Magick-config.in 2008-11-14 15:19:15.000000000 +0100 +diff -up ImageMagick-6.4.9-6/magick/Magick-config.in.multilib ImageMagick-6.4.9-6/magick/Magick-config.in +--- ImageMagick-6.4.9-6/magick/Magick-config.in.multilib 2008-12-08 20:00:35.000000000 +0100 ++++ ImageMagick-6.4.9-6/magick/Magick-config.in 2009-02-24 10:57:33.000000000 +0100 @@ -6,8 +6,6 @@ prefix=@prefix@ @@ -67,14 +67,14 @@ + pkg-config --libs MagickCore ;; --libs) -- echo "-L${libdir} -lMagickCore" +- echo "-L${libdir} @MAGICK_LIBS@" + pkg-config --libs MagickCore ;; *) echo "${usage}" 1>&2 -diff -up ImageMagick-6.4.5/magick/MagickCore-config.in.multilib ImageMagick-6.4.5/magick/MagickCore-config.in ---- ImageMagick-6.4.5/magick/MagickCore-config.in.multilib 2008-08-16 19:34:36.000000000 +0200 -+++ ImageMagick-6.4.5/magick/MagickCore-config.in 2008-11-14 15:42:54.000000000 +0100 +diff -up ImageMagick-6.4.9-6/magick/MagickCore-config.in.multilib ImageMagick-6.4.9-6/magick/MagickCore-config.in +--- ImageMagick-6.4.9-6/magick/MagickCore-config.in.multilib 2008-12-08 20:00:35.000000000 +0100 ++++ ImageMagick-6.4.9-6/magick/MagickCore-config.in 2009-02-24 11:02:23.000000000 +0100 @@ -6,8 +6,6 @@ prefix=@prefix@ @@ -104,7 +104,7 @@ + pkg-config --libs MagickCore ;; --libs) -- echo "-L${libdir} -lMagickCore" +- echo "-L${libdir} @MAGICK_LIBS@" - ;; - --coder-path) - echo "@CODER_PATH@" @@ -115,9 +115,9 @@ ;; *) echo "${usage}" 1>&2 -diff -up ImageMagick-6.4.5/wand/MagickWand-config.in.multilib ImageMagick-6.4.5/wand/MagickWand-config.in ---- ImageMagick-6.4.5/wand/MagickWand-config.in.multilib 2008-02-05 19:50:44.000000000 +0100 -+++ ImageMagick-6.4.5/wand/MagickWand-config.in 2008-11-14 15:19:15.000000000 +0100 +diff -up ImageMagick-6.4.9-6/wand/MagickWand-config.in.multilib ImageMagick-6.4.9-6/wand/MagickWand-config.in +--- ImageMagick-6.4.9-6/wand/MagickWand-config.in.multilib 2008-12-08 20:00:35.000000000 +0100 ++++ ImageMagick-6.4.9-6/wand/MagickWand-config.in 2009-02-24 11:01:09.000000000 +0100 @@ -6,8 +6,6 @@ prefix=@prefix@ @@ -147,14 +147,14 @@ + pkg-config --libs MagickWand ;; --libs) -- echo "-L${libdir} -lMagickWand -lMagickCore" +- echo "-L${libdir} -lMagickWand @MAGICK_LIBS@" + pkg-config --libs MagickWand ;; *) echo "${usage}" 1>&2 -diff -up ImageMagick-6.4.5/wand/Wand-config.in.multilib ImageMagick-6.4.5/wand/Wand-config.in ---- ImageMagick-6.4.5/wand/Wand-config.in.multilib 2008-02-05 19:50:44.000000000 +0100 -+++ ImageMagick-6.4.5/wand/Wand-config.in 2008-11-14 15:19:15.000000000 +0100 +diff -up ImageMagick-6.4.9-6/wand/Wand-config.in.multilib ImageMagick-6.4.9-6/wand/Wand-config.in +--- ImageMagick-6.4.9-6/wand/Wand-config.in.multilib 2008-12-08 20:00:35.000000000 +0100 ++++ ImageMagick-6.4.9-6/wand/Wand-config.in 2009-02-24 10:54:27.000000000 +0100 @@ -6,8 +6,6 @@ prefix=@prefix@ @@ -184,7 +184,7 @@ + pkg-config --libs MagickWand ;; --libs) -- echo "-L${libdir} -lMagickWand -lMagickCore" +- echo "-L${libdir} -lMagickWand @MAGICK_LIBS@" + pkg-config --libs MagickWand ;; *) Index: ImageMagick.spec =================================================================== RCS file: /cvs/extras/rpms/ImageMagick/devel/ImageMagick.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- ImageMagick.spec 23 Feb 2009 21:26:13 -0000 1.87 +++ ImageMagick.spec 9 Mar 2009 11:06:50 -0000 1.88 @@ -1,20 +1,15 @@ -%define VER 6.4.5 -%define Patchlevel 5 +%define VER 6.4.9 +%define Patchlevel 6 Name: ImageMagick Version: %{VER}.%{Patchlevel} -Release: 9%{?dist} +Release: 1%{?dist} Summary: An X application for displaying and manipulating images Group: Applications/Multimedia License: ImageMagick Url: http://www.imagemagick.org/ -# This is: ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.bz2 -# With the 2 included copies of the non free ArtBrush font removed: -# PerlMagick/t/ttf/input.ttf -# PerlMagick/demo/Generic.ttf -Source0: %{name}-%{version}-clean.tar.bz2 +Source0: ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.bz2 Patch1: ImageMagick-6.4.0-multilib.patch -Patch2: ImageMagick-6.3.8-invalid-gerror-use.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel @@ -131,9 +126,8 @@ %prep -%setup -q -n %{name}-%{VER} +%setup -q -n %{name}-%{VER}-%{Patchlevel} %patch1 -p1 -b .multilib -%patch2 -p1 sed -i 's/libltdl.la/libltdl.so/g' configure iconv -f ISO-8859-1 -t UTF-8 README.txt > README.txt.tmp touch -r README.txt README.txt.tmp @@ -307,6 +301,9 @@ %changelog +* Mon Mar 9 2009 Hans de Goede 6.4.9.6-1 +- New upstream release 6.4.9-6 + * Mon Feb 23 2009 Fedora Release Engineering - 6.4.5.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/ImageMagick/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 27 Dec 2008 13:59:23 -0000 1.24 +++ sources 9 Mar 2009 11:06:50 -0000 1.25 @@ -1 +1 @@ -f1f95352f69d7c02ed19b0d3e0c806fb ImageMagick-6.4.5.5-clean.tar.bz2 +d65a4cd3cf103d49085a55c90c871854 ImageMagick-6.4.9-6.tar.bz2 --- ImageMagick-6.3.8-invalid-gerror-use.patch DELETED --- From allisson at fedoraproject.org Mon Mar 9 11:07:54 2009 From: allisson at fedoraproject.org (Allisson Azevedo) Date: Mon, 9 Mar 2009 11:07:54 +0000 (UTC) Subject: rpms/perl-Variable-Magic/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 perl-Variable-Magic.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090309110754.903DF70116@cvs1.fedora.phx.redhat.com> Author: allisson Update of /cvs/pkgs/rpms/perl-Variable-Magic/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5945/F-10 Modified Files: .cvsignore import.log perl-Variable-Magic.spec sources Log Message: Update to 0.32 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Variable-Magic/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Feb 2009 20:14:54 -0000 1.2 +++ .cvsignore 9 Mar 2009 11:07:23 -0000 1.3 @@ -1 +1 @@ -Variable-Magic-0.30.tar.gz +Variable-Magic-0.32.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/perl-Variable-Magic/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Feb 2009 20:14:54 -0000 1.1 +++ import.log 9 Mar 2009 11:07:23 -0000 1.2 @@ -1 +1,2 @@ perl-Variable-Magic-0_30-1_fc10:F-10:perl-Variable-Magic-0.30-1.fc10.src.rpm:1234987906 +perl-Variable-Magic-0_32-1_fc10:F-10:perl-Variable-Magic-0.32-1.fc10.src.rpm:1236596773 Index: perl-Variable-Magic.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Variable-Magic/F-10/perl-Variable-Magic.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Variable-Magic.spec 18 Feb 2009 20:14:54 -0000 1.1 +++ perl-Variable-Magic.spec 9 Mar 2009 11:07:23 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Variable-Magic -Version: 0.30 +Version: 0.32 Release: 1%{?dist} Summary: Associate user-defined magic to variables from Perl License: GPL+ or Artistic @@ -54,5 +54,11 @@ %{_mandir}/man3/* %changelog +* Mon Mar 9 2009 Allisson Azevedo - 0.32-1 +- Update to 0.32 + +* Thu Feb 26 2009 Fedora Release Engineering - 0.30-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Feb 14 2009 Allisson Azevedo 0.30-1 - Initial rpm release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Variable-Magic/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Feb 2009 20:14:54 -0000 1.2 +++ sources 9 Mar 2009 11:07:24 -0000 1.3 @@ -1 +1 @@ -1850fb2c5770b48df0d9a13b5713a643 Variable-Magic-0.30.tar.gz +c2ff2f2ec88bbc291934a89e6fff06ed Variable-Magic-0.32.tar.gz From allisson at fedoraproject.org Mon Mar 9 11:09:55 2009 From: allisson at fedoraproject.org (Allisson Azevedo) Date: Mon, 9 Mar 2009 11:09:55 +0000 (UTC) Subject: rpms/perl-Variable-Magic/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 perl-Variable-Magic.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090309110955.7142D70116@cvs1.fedora.phx.redhat.com> Author: allisson Update of /cvs/pkgs/rpms/perl-Variable-Magic/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6552/F-9 Modified Files: .cvsignore import.log perl-Variable-Magic.spec sources Log Message: Update to 0.32 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Variable-Magic/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Feb 2009 20:18:04 -0000 1.2 +++ .cvsignore 9 Mar 2009 11:09:24 -0000 1.3 @@ -1 +1 @@ -Variable-Magic-0.30.tar.gz +Variable-Magic-0.32.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/perl-Variable-Magic/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Feb 2009 20:18:04 -0000 1.1 +++ import.log 9 Mar 2009 11:09:24 -0000 1.2 @@ -1 +1,2 @@ perl-Variable-Magic-0_30-1_fc10:F-9:perl-Variable-Magic-0.30-1.fc10.src.rpm:1234988069 +perl-Variable-Magic-0_32-1_fc10:F-9:perl-Variable-Magic-0.32-1.fc10.src.rpm:1236596902 Index: perl-Variable-Magic.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Variable-Magic/F-9/perl-Variable-Magic.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Variable-Magic.spec 18 Feb 2009 20:18:04 -0000 1.1 +++ perl-Variable-Magic.spec 9 Mar 2009 11:09:24 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Variable-Magic -Version: 0.30 +Version: 0.32 Release: 1%{?dist} Summary: Associate user-defined magic to variables from Perl License: GPL+ or Artistic @@ -54,5 +54,11 @@ %{_mandir}/man3/* %changelog +* Mon Mar 9 2009 Allisson Azevedo - 0.32-1 +- Update to 0.32 + +* Thu Feb 26 2009 Fedora Release Engineering - 0.30-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Feb 14 2009 Allisson Azevedo 0.30-1 - Initial rpm release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Variable-Magic/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Feb 2009 20:18:04 -0000 1.2 +++ sources 9 Mar 2009 11:09:25 -0000 1.3 @@ -1 +1 @@ -1850fb2c5770b48df0d9a13b5713a643 Variable-Magic-0.30.tar.gz +c2ff2f2ec88bbc291934a89e6fff06ed Variable-Magic-0.32.tar.gz From pkgdb at fedoraproject.org Mon Mar 9 11:22:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 11:22:01 +0000 Subject: [pkgdb] p0rn-comfort had acl change status Message-ID: <20090309112201.EC1A42082B2@bastion.fedora.phx.redhat.com> kanarip has set the watchbugzilla acl on p0rn-comfort (Fedora devel) to Approved for ynemoy To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 11:21:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 11:21:02 +0000 Subject: [pkgdb] p0rn-comfort had acl change status Message-ID: <20090309112202.BCC9020854A@bastion.fedora.phx.redhat.com> kanarip has set the watchcommits acl on p0rn-comfort (Fedora devel) to Approved for ynemoy To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 11:22:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 11:22:04 +0000 Subject: [pkgdb] p0rn-comfort had acl change status Message-ID: <20090309112204.421EC208552@bastion.fedora.phx.redhat.com> kanarip has set the commit acl on p0rn-comfort (Fedora devel) to Approved for ynemoy To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 11:21:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 11:21:45 +0000 Subject: [pkgdb] p0rn-comfort had acl change status Message-ID: <20090309112205.9BC1B208604@bastion.fedora.phx.redhat.com> kanarip has set the approveacls acl on p0rn-comfort (Fedora devel) to Approved for ynemoy To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 11:22:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 11:22:10 +0000 Subject: [pkgdb] p0rn-comfort had acl change status Message-ID: <20090309112210.D5E582086F6@bastion.fedora.phx.redhat.com> kanarip has set the watchbugzilla acl on p0rn-comfort (Fedora 9) to Approved for ynemoy To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 11:22:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 11:22:13 +0000 Subject: [pkgdb] p0rn-comfort had acl change status Message-ID: <20090309112211.4CC85208705@bastion.fedora.phx.redhat.com> kanarip has set the watchcommits acl on p0rn-comfort (Fedora 9) to Approved for ynemoy To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 11:22:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 11:22:15 +0000 Subject: [pkgdb] p0rn-comfort had acl change status Message-ID: <20090309112212.9BF5420871B@bastion.fedora.phx.redhat.com> kanarip has set the commit acl on p0rn-comfort (Fedora 9) to Approved for ynemoy To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 11:21:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 11:21:53 +0000 Subject: [pkgdb] p0rn-comfort had acl change status Message-ID: <20090309112213.D51A92087F3@bastion.fedora.phx.redhat.com> kanarip has set the approveacls acl on p0rn-comfort (Fedora 9) to Approved for ynemoy To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 11:21:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 11:21:17 +0000 Subject: [pkgdb] p0rn-comfort had acl change status Message-ID: <20090309112217.4FC3B20892B@bastion.fedora.phx.redhat.com> kanarip has set the watchbugzilla acl on p0rn-comfort (Fedora 10) to Approved for ynemoy To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 11:21:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 11:21:58 +0000 Subject: [pkgdb] p0rn-comfort had acl change status Message-ID: <20090309112219.2D58C208934@bastion.fedora.phx.redhat.com> kanarip has set the watchcommits acl on p0rn-comfort (Fedora 10) to Approved for ynemoy To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 11:21:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 11:21:59 +0000 Subject: [pkgdb] p0rn-comfort had acl change status Message-ID: <20090309112220.38DDB20893B@bastion.fedora.phx.redhat.com> kanarip has set the commit acl on p0rn-comfort (Fedora 10) to Approved for ynemoy To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From pkgdb at fedoraproject.org Mon Mar 9 11:22:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 11:22:21 +0000 Subject: [pkgdb] p0rn-comfort had acl change status Message-ID: <20090309112221.C207F208942@bastion.fedora.phx.redhat.com> kanarip has set the approveacls acl on p0rn-comfort (Fedora 10) to Approved for ynemoy To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/p0rn-comfort From jwrdegoede at fedoraproject.org Mon Mar 9 11:22:59 2009 From: jwrdegoede at fedoraproject.org (Hans de Goede) Date: Mon, 9 Mar 2009 11:22:59 +0000 (UTC) Subject: rpms/python-pyblock/devel .cvsignore, 1.36, 1.37 python-pyblock.spec, 1.61, 1.62 sources, 1.39, 1.40 Message-ID: <20090309112259.986CA70116@cvs1.fedora.phx.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/python-pyblock/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9011 Modified Files: .cvsignore python-pyblock.spec sources Log Message: * Mon Mar 9 2009 Hans de Goede - 0.38-1 - Add additional functionality for the anaconda storage rewrite (jgranados) - Do not Py_DECREF imported dm module reference (hansg) - Only install our own dm_log handler while doing dm stuff (hansg) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-pyblock/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 27 Feb 2009 08:01:10 -0000 1.36 +++ .cvsignore 9 Mar 2009 11:22:27 -0000 1.37 @@ -1 +1 @@ -pyblock-0.37.tar.bz2 +pyblock-0.38.tar.bz2 Index: python-pyblock.spec =================================================================== RCS file: /cvs/extras/rpms/python-pyblock/devel/python-pyblock.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- python-pyblock.spec 27 Feb 2009 08:01:10 -0000 1.61 +++ python-pyblock.spec 9 Mar 2009 11:22:27 -0000 1.62 @@ -5,7 +5,7 @@ Summary: Python modules for dealing with block devices Name: python-%{realname} -Version: 0.37 +Version: 0.38 Release: 1%{?dist} Source0: %{realname}-%{version}.tar.bz2 License: GPLv2 or GPLv3 @@ -43,6 +43,11 @@ %{_docdir}/pyblock-%{version}/* %changelog +* Mon Mar 9 2009 Hans de Goede - 0.38-1 +- Add additional functionality for the anaconda storage rewrite (jgranados) +- Do not Py_DECREF imported dm module reference (hansg) +- Only install our own dm_log handler while doing dm stuff (hansg) + * Fri Feb 27 2009 Hans de Goede - 0.37-1 - Handle dmraid dm table's with multiple rows / targets properly, this fixes dmraid jbod configurations (hansg) Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-pyblock/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 27 Feb 2009 08:01:10 -0000 1.39 +++ sources 9 Mar 2009 11:22:27 -0000 1.40 @@ -1 +1 @@ -88f616a4f55edfc80c67fd19cc33ee3c pyblock-0.37.tar.bz2 +20d53b0ec29d6e1496bb1e8175d1ab51 pyblock-0.38.tar.bz2 From jsafrane at fedoraproject.org Mon Mar 9 11:25:34 2009 From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=) Date: Mon, 9 Mar 2009 11:25:34 +0000 (UTC) Subject: rpms/freeipmi/devel .cvsignore, 1.5, 1.6 freeipmi.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <20090309112534.ADFE770116@cvs1.fedora.phx.redhat.com> Author: jsafrane Update of /cvs/pkgs/rpms/freeipmi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10283 Modified Files: .cvsignore freeipmi.spec sources Log Message: Update to freeipmi-0.7.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/freeipmi/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Feb 2009 14:27:59 -0000 1.5 +++ .cvsignore 9 Mar 2009 11:25:03 -0000 1.6 @@ -1 +1 @@ -freeipmi-0.7.5.tar.gz +freeipmi-0.7.6.tar.gz Index: freeipmi.spec =================================================================== RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- freeipmi.spec 24 Feb 2009 14:28:00 -0000 1.11 +++ freeipmi.spec 9 Mar 2009 11:25:04 -0000 1.12 @@ -3,11 +3,11 @@ # %define name freeipmi -%define version 0.7.5 +%define version 0.7.6 %if %{?_with_debug:1}%{!?_with_debug:0} -%define release 2.debug%{?dist} +%define release 1.debug%{?dist} %else -%define release 2%{?dist} +%define release 1.{?dist} %endif Name: %{name} @@ -331,6 +331,9 @@ %{_mandir}/man8/ipmidetectd.8* %changelog +* Mon Mar 9 2009 Jan Safranek - 0.7.6-1 +- Update to freeipmi-0.7.6 + * Tue Feb 24 2009 Jan Safranek - 0.7.5-1 - Update to freeipmi-0.7.5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/freeipmi/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 Feb 2009 14:28:00 -0000 1.5 +++ sources 9 Mar 2009 11:25:04 -0000 1.6 @@ -1 +1 @@ -48f65225a7e48db33f3b0250341e6d7e freeipmi-0.7.5.tar.gz +c04419b47f525b132fc3e93afb2ed3fc freeipmi-0.7.6.tar.gz From rhughes at fedoraproject.org Mon Mar 9 11:34:55 2009 From: rhughes at fedoraproject.org (Richard Hughes) Date: Mon, 9 Mar 2009 11:34:55 +0000 (UTC) Subject: rpms/gnome-power-manager/devel .cvsignore, 1.55, 1.56 gnome-power-manager.spec, 1.151, 1.152 sources, 1.55, 1.56 gnome-power-manager-2.25.91-dont-block-logout.patch, 1.1, NONE Message-ID: <20090309113455.6CFBC70116@cvs1.fedora.phx.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-power-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12110 Modified Files: .cvsignore gnome-power-manager.spec sources Removed Files: gnome-power-manager-2.25.91-dont-block-logout.patch Log Message: * Mon Mar 09 2009 Richard Hughes - 2.25.92-1 - Update to 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/.cvsignore,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- .cvsignore 11 Feb 2009 15:04:00 -0000 1.55 +++ .cvsignore 9 Mar 2009 11:34:24 -0000 1.56 @@ -1 +1 @@ -gnome-power-manager-2.25.91.tar.gz +gnome-power-manager-2.25.92.tar.gz Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- gnome-power-manager.spec 27 Feb 2009 18:36:18 -0000 1.151 +++ gnome-power-manager.spec 9 Mar 2009 11:34:24 -0000 1.152 @@ -3,17 +3,14 @@ Summary: GNOME Power Manager Name: gnome-power-manager -Version: 2.25.91 -Release: 7%{?dist} +Version: 2.25.92 +Release: 1%{?dist} License: GPLv2+ and GFDL Group: Applications/System Source: http://download.gnome.org/sources/gnome-power-manager/2.25/gnome-power-manager-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://projects.gnome.org/gnome-power-manager/ -# already upstream in SVN -Patch1: gnome-power-manager-2.25.91-dont-block-logout.patch - BuildRequires: libgnomeui-devel BuildRequires: libglade2-devel BuildRequires: libwnck-devel @@ -58,7 +55,6 @@ %prep %setup -q -%patch1 -p0 -b .block-logout %build %configure \ @@ -166,6 +162,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml %changelog +* Mon Mar 09 2009 Richard Hughes - 2.25.92-1 +- Update to 2.25.92 + * Fri Feb 27 2009 Richard Hughes - 2.25.91-7 - We actually neeed BuildRequires PolicyKit-gnome-devel too Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- sources 11 Feb 2009 15:04:00 -0000 1.55 +++ sources 9 Mar 2009 11:34:25 -0000 1.56 @@ -1 +1 @@ -d6e508caf5fe720c4cfbb36e768ce27d gnome-power-manager-2.25.91.tar.gz +467ed19fa8a27b291258c66bd9c4cd8b gnome-power-manager-2.25.92.tar.gz --- gnome-power-manager-2.25.91-dont-block-logout.patch DELETED --- From rhughes at fedoraproject.org Mon Mar 9 11:45:41 2009 From: rhughes at fedoraproject.org (Richard Hughes) Date: Mon, 9 Mar 2009 11:45:41 +0000 (UTC) Subject: rpms/hal-info/devel .cvsignore, 1.21, 1.22 hal-info.spec, 1.39, 1.40 sources, 1.22, 1.23 Message-ID: <20090309114541.8B95770116@cvs1.fedora.phx.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/hal-info/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv776 Modified Files: .cvsignore hal-info.spec sources Log Message: * Mon Mar 09 2009 Richard Hughes - 20090309-1 - Update to latest upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hal-info/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 2 Feb 2009 14:46:46 -0000 1.21 +++ .cvsignore 9 Mar 2009 11:45:09 -0000 1.22 @@ -1 +1 @@ -hal-info-20090202.tar.gz +hal-info-20090309.tar.gz Index: hal-info.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- hal-info.spec 3 Mar 2009 10:35:35 -0000 1.39 +++ hal-info.spec 9 Mar 2009 11:45:09 -0000 1.40 @@ -1,7 +1,7 @@ Summary: Device information files for HAL Name: hal-info -Version: 20090202 -Release: 3%{?dist} +Version: 20090309 +Release: 1%{?dist} License: AFL or GPLv2 Group: System Environment/Libraries URL: http://www.freedesktop.org/Software/hal @@ -42,6 +42,9 @@ %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi %changelog +* Mon Mar 09 2009 Richard Hughes - 20090309-1 +- Update to latest upstream release + * Tue Mar 03 2009 - Bastien Nocera - 20090202-3 - Remove the Dell native killswitches, replaced by the kernel killswitches in dell_laptop (#488177) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hal-info/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 2 Feb 2009 14:46:46 -0000 1.22 +++ sources 9 Mar 2009 11:45:09 -0000 1.23 @@ -1 +1 @@ -f62f0a9ddbb3225a2746c4615ed9d8dd hal-info-20090202.tar.gz +a9b68014dcb985e68904075cbd815688 hal-info-20090309.tar.gz From twaugh at fedoraproject.org Mon Mar 9 12:12:09 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Mon, 9 Mar 2009 12:12:09 +0000 (UTC) Subject: rpms/cups/devel cups.spec,1.464,1.465 Message-ID: <20090309121209.1D97470116@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4114 Modified Files: cups.spec Log Message: * Mon Mar 9 2009 Tim Waugh 1:1.4-0.b2.9 - Handle https:// device URIs (bug #478677, STR #3122). Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.464 retrieving revision 1.465 diff -u -r1.464 -r1.465 --- cups.spec 5 Mar 2009 13:31:30 -0000 1.464 +++ cups.spec 9 Mar 2009 12:11:38 -0000 1.465 @@ -8,7 +8,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.4 -Release: 0.%{pre}.8%{?dist} +Release: 0.%{pre}.9%{?dist} License: GPLv2 Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2 @@ -290,6 +290,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve echo ipp > $RPM_BUILD_ROOT%{_sysconfdir}/portreserve/%{name} +# Handle https:// device URIs (bug #478677, STR #3122). +ln -s ipp $RPM_BUILD_ROOT%{cups_serverbin}/backend/https + # Remove unshipped files. rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop @@ -465,6 +468,9 @@ %{_libdir}/php/modules/*.so %changelog +* Mon Mar 9 2009 Tim Waugh 1:1.4-0.b2.9 +- Handle https:// device URIs (bug #478677, STR #3122). + * Thu Mar 5 2009 Tim Waugh 1:1.4-0.b2.8 - Updated to svn8404. From twaugh at fedoraproject.org Mon Mar 9 12:12:15 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Mon, 9 Mar 2009 12:12:15 +0000 (UTC) Subject: rpms/cups/F-10 cups.spec,1.455,1.456 Message-ID: <20090309121215.46A1B70116@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4162 Modified Files: cups.spec Log Message: * Mon Mar 9 2009 Tim Waugh 1:1.3.9-9 - Handle https:// device URIs (bug #478677, STR #3122). Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v retrieving revision 1.455 retrieving revision 1.456 diff -u -r1.455 -r1.456 --- cups.spec 28 Jan 2009 18:14:05 -0000 1.455 +++ cups.spec 9 Mar 2009 12:11:44 -0000 1.456 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.3.9 -Release: 8%{?svn:.svn%{svn}}%{?dist} +Release: 9%{?svn:.svn%{svn}}%{?dist} License: GPLv2 Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2 @@ -300,6 +300,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve echo ipp > $RPM_BUILD_ROOT%{_sysconfdir}/portreserve/%{name} +# Handle https:// device URIs (bug #478677, STR #3122). +ln -s ipp $RPM_BUILD_ROOT%{cups_serverbin}/backend/https + # Remove unshipped files. rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop @@ -488,6 +491,9 @@ %{_libdir}/php/modules/*.so %changelog +* Mon Mar 9 2009 Tim Waugh 1:1.3.9-9 +- Handle https:// device URIs (bug #478677, STR #3122). + * Wed Jan 28 2009 Tim Waugh 1:1.3.9-8 - Always supply document-name when printing a file (STR #3055). - Load MIME type rules correctly (bug #426089, STR #3059). From caolanm at fedoraproject.org Mon Mar 9 12:24:19 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 9 Mar 2009 12:24:19 +0000 (UTC) Subject: rpms/librepository/devel librepository-0.2.0-builddepends.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 librepository.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090309122419.1162470116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/librepository/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6116 Modified Files: .cvsignore librepository.spec sources Added Files: librepository-0.2.0-builddepends.patch Log Message: latest version librepository-0.2.0-builddepends.patch: --- NEW FILE librepository-0.2.0-builddepends.patch --- --- librepository-0.2.0.orig/build.properties 2009-03-09 12:15:21.000000000 +0000 +++ librepository-0.2.0/build.properties 2009-03-09 12:15:37.000000000 +0000 @@ -8,6 +8,10 @@ impl.name=librepository impl.version=${Implementation-Version} +Release-Major-Number=0 +Release-Minor-Number=2 +Release-Milestone-Number=0 + # # This defines the compiler settings. Optimizing would remove # the debug information, so we dont do that. This may be selfish, @@ -42,7 +46,7 @@ # Used libraries ... # Used by: core libraries -dependency.release.core.libbase=libbase-1.0.0.jar +dependency.release.core.libbase=libbase.jar dependency.release.core.commons-logging=commons-logging-api.jar ############################################################## Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/librepository/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2008 11:43:29 -0000 1.2 +++ .cvsignore 9 Mar 2009 12:23:48 -0000 1.3 @@ -1 +1 @@ -librepository-0.1.6.tar.gz +librepository-0.2.0.tar.gz Index: librepository.spec =================================================================== RCS file: /cvs/pkgs/rpms/librepository/devel/librepository.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- librepository.spec 25 Feb 2009 17:45:52 -0000 1.2 +++ librepository.spec 9 Mar 2009 12:23:48 -0000 1.3 @@ -2,16 +2,16 @@ %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: librepository -Version: 0.1.6 -Release: 2%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: Hierarchical repository abstraction layer License: LGPLv2+ Group: System Environment/Libraries Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz URL: http://reporting.pentaho.org/ -BuildRequires: ant, java-devel, jpackage-utils, jcommon +BuildRequires: ant, java-devel, jpackage-utils, libbase >= 1.0.0 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: java, jpackage-utils, jcommon +Requires: java, jpackage-utils, libbase >= 1.0.0 %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 @@ -20,6 +20,8 @@ BuildArch: noarch %endif +Patch0: librepository-0.2.0-builddepends.patch + %description LibRepository provides a simple abstraction layer to access bulk content that is organized in a hierarchical layer. @@ -35,8 +37,9 @@ %prep %setup -q +%patch0 -p1 -b .builddepends find . -name "*.jar" -exec rm -f {} \; -build-jar-repository -s -p lib jcommon-1.0.12 +build-jar-repository -s -p lib commons-logging-api libbase %build ant compile javadoc @@ -89,6 +92,9 @@ %{_javadocdir}/%{name} %changelog +* Mon May 09 2009 Caolan McNamara 0.2.0-1 +- latest version + * Wed Feb 25 2009 Fedora Release Engineering - 0.1.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/librepository/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2008 11:43:29 -0000 1.2 +++ sources 9 Mar 2009 12:23:48 -0000 1.3 @@ -1 +1 @@ -dd34238a64ed3021d1fb2bad3f7ea74f librepository-0.1.6.tar.gz +3d496a79b46ea933a420aab30aadc231 librepository-0.2.0.tar.gz From dhavalgiani at fedoraproject.org Mon Mar 9 12:30:59 2009 From: dhavalgiani at fedoraproject.org (Dhaval Giani) Date: Mon, 9 Mar 2009 12:30:59 +0000 (UTC) Subject: rpms/libcgroup/devel 03-fedora-adjust-initscript-priority.patch, NONE, 1.1 libcgroup.spec, 1.10, 1.11 Message-ID: <20090309123059.5A58A70116@cvs1.fedora.phx.redhat.com> Author: dhavalgiani Update of /cvs/pkgs/rpms/libcgroup/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7930 Modified Files: libcgroup.spec Added Files: 03-fedora-adjust-initscript-priority.patch Log Message: * Mon Mar 09 2009 Dhaval Giani 0.33-2 - Change the cgconfig script to start earlier - Move the binaries to /bin and /sbin 03-fedora-adjust-initscript-priority.patch: --- NEW FILE 03-fedora-adjust-initscript-priority.patch --- libcgroup: Start the config earlier From: Jan Safranek For Fedora, we want to start the cgconfig as soon as possible, i.e. when /usr might not be mounted. We don't need syslog, time nor $local_fs (see bug #309001). diff -up libcgroup-0.33/scripts/init.d/cgconfig.orig libcgroup-0.33/scripts/init.d/cgconfig --- libcgroup-0.33/scripts/init.d/cgconfig.orig 2009-03-08 20:46:12.000000000 +0100 +++ libcgroup-0.33/scripts/init.d/cgconfig 2009-03-08 20:45:01.000000000 +0100 @@ -14,15 +14,15 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # # cgconfig Control Groups Configuration Startup -# chkconfig: - 13 87 +# chkconfig: - 5 95 # description: This script runs the cgconfigparser utility to parse and setup # the control group filesystem. It uses /etc/cgconfig.conf # and parses the configuration specified in there. ### BEGIN INIT INFO # Provides: cgconfig -# Required-Start: $local_fs $syslog $time -# Required-Stop: $local_fs $syslog +# Required-Start: +# Required-Stop: # Should-Start: # Should-Stop: # Short-Description: start and stop the WLM configuration Index: libcgroup.spec =================================================================== RCS file: /cvs/pkgs/rpms/libcgroup/devel/libcgroup.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libcgroup.spec 2 Mar 2009 11:32:59 -0000 1.10 +++ libcgroup.spec 9 Mar 2009 12:30:29 -0000 1.11 @@ -2,12 +2,13 @@ Summary: Tools and libraries to control and monitor control groups Group: Development/Libraries Version: 0.33 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://libcg.sourceforge.net/ Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2 Patch0: http://downloads.sourceforge.net/libcg/01-fedora-fix-build.patch Patch1: http://downloads.sourceforge.net/libcg/02-fedora-fix-initscripts.patch +Patch2: http://downloads.sourceforge.net/libcg/03-fedora-adjust-initscript-priority.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: byacc BuildRequires: flex @@ -36,9 +37,11 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build -%configure +%configure --bindir=/bin --sbindir=/sbin --libdir=/%{_lib} + make %{?_smp_mflags} @@ -52,9 +55,6 @@ cp samples/cgred.conf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cgred.conf cp samples/cgconfig.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgconfig.conf cp samples/cgrules.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgrules.conf -mkdir -p $RPM_BUILD_ROOT/%{_lib}/security/ -mv $RPM_BUILD_ROOT/%{_libdir}/security/pam_cgroup.so \ - $RPM_BUILD_ROOT/%{_lib}/security/ %clean @@ -81,12 +81,12 @@ %config(noreplace) %{_sysconfdir}/sysconfig/cgred.conf %config(noreplace) %{_sysconfdir}/cgconfig.conf %config(noreplace) %{_sysconfdir}/cgrules.conf -%{_libdir}/libcgroup-%{version}.so -%{_libdir}/libcgroup.so.* -%{_bindir}/cgexec -%{_bindir}/cgclassify -%{_sbindir}/cgconfigparser -%{_bindir}/cgrulesengd +/%{_lib}/libcgroup-%{version}.so +/%{_lib}/libcgroup.so.* +/bin/cgexec +/bin/cgclassify +/sbin/cgconfigparser +/bin/cgrulesengd %attr(0644, root, root) %{_mandir}/man1/* %attr(0644, root, root) %{_mandir}/man5/* %attr(0644, root, root) %{_mandir}/man8/* @@ -99,11 +99,14 @@ %files devel %defattr(-,root,root,-) %{_includedir}/libcgroup.h -%{_libdir}/libcgroup.so -%doc COPYING INSTALL +/%{_lib}/libcgroup.so +%doc COPYING INSTALL %changelog +* Mon Mar 09 2009 Dhaval Giani 0.33-2 +- Change the cgconfig script to start earlier +- Move the binaries to /bin and /sbin * Mon Mar 02 2009 Dhaval Giani 0.33-1 - Update to latest upstream * Wed Feb 25 2009 Fedora Release Engineering - 0.32.2-4 From limb at fedoraproject.org Mon Mar 9 12:37:01 2009 From: limb at fedoraproject.org (Jon Ciesla) Date: Mon, 9 Mar 2009 12:37:01 +0000 (UTC) Subject: rpms/vdrift/F-10 vdrift-20090215-joepack-includes.patch, NONE, 1.1 sources, 1.3, 1.4 vdrift.spec, 1.12, 1.13 Message-ID: <20090309123701.2893870116@cvs1.fedora.phx.redhat.com> Author: limb Update of /cvs/pkgs/rpms/vdrift/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9167 Modified Files: sources vdrift.spec Added Files: vdrift-20090215-joepack-includes.patch Log Message: New version, 467860. vdrift-20090215-joepack-includes.patch: --- NEW FILE vdrift-20090215-joepack-includes.patch --- --- src/joepack.cpp.orig 2009-02-23 11:49:13.000000000 -0600 +++ src/joepack.cpp 2009-02-23 11:49:13.000000000 -0600 @@ -12,0 +13 @@ +#include Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vdrift/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Aug 2008 15:54:13 -0000 1.3 +++ sources 9 Mar 2009 12:36:30 -0000 1.4 @@ -1 +1 @@ -9e3e3c91960146354c2a9fb65da3bd97 vdrift-2008-08-05-src.tar.bz2 +5960be8c966bcbde42c054ca667b46ef vdrift-2009-02-15-src.tar.bz2 Index: vdrift.spec =================================================================== RCS file: /cvs/pkgs/rpms/vdrift/F-10/vdrift.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- vdrift.spec 21 Oct 2008 11:07:47 -0000 1.12 +++ vdrift.spec 9 Mar 2009 12:36:30 -0000 1.13 @@ -1,14 +1,14 @@ Name: vdrift -Version: 20080805 -Release: 2%{?dist} -Summary: VDrift is a cross-platform, open source driving/drift racing simulation +Version: 20090215 +Release: 1%{?dist} +Summary: Driving/drift racing simulation Group: Amusements/Games License: GPLv2+ URL: http://vdrift.net -Source0: %{name}-2008-08-05-src.tar.bz2 +Source0: %{name}-2009-02-15-src.tar.bz2 #Original upstream: -#Source0: http://downloads.sourceforge.net/%{name}/%{name}-2008-08-05-src.tar.bz2 +#Source0: http://downloads.sourceforge.net/%{name}/%{name}-2009-02-15-src.tar.bz2 # Modified: # cd docs # rm HOW_TO_COMPILE.txt SConscript INSTALL @@ -25,6 +25,7 @@ Patch1: vdrift-20071226-paths.patch #Patch2: vdrift-20071226-gcc4.3.patch #Patch3: vdrift-20071226-jamfile.patch +Patch4: vdrift-20090215-joepack-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: SDL_image-devel @@ -52,7 +53,7 @@ %prep -%setup -qn vdrift-08-05-08 +%setup -qn vdrift-2009-02-15 %ifarch ppc ppc64 sed -i 's/linuxx86/linuxppc/' src/SConscript @@ -62,20 +63,25 @@ %patch1 -p0 #%patch2 -p0 #%patch3 -p0 +%patch4 -p0 -/bin/chmod -x src/gamestate.cpp -/bin/chmod -x src/logo.cpp -/bin/chmod -x src/objects.cpp +#/bin/chmod -x src/gamestate.cpp +#/bin/chmod -x src/logo.cpp +#/bin/chmod -x src/objects.cpp /bin/chmod -x src/main.cpp /bin/chmod -x src/game.cpp -/bin/chmod -x bullet-2.66/src/LinearMath/*.h %build -cd bullet-2.66 -%configure -jam bulletcollision bulletmath -cd .. +tar -xzf bullet-2.73-sp1.tgz +/bin/chmod -x bullet-2.73/src/LinearMath/*.h +#cd bullet-2.73 +#./autogen.sh +#./configure +#jam bulletcollision bulletmath +#cmake . +#make +#cd .. CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons bin=/bin use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0 @@ -123,6 +129,13 @@ %changelog +* Thu Feb 19 2009 Jon Ciesla - 20090215-1 +- Update to 2009-02-15. +- Includes patch. + +* Mon Nov 24 2008 Jon Ciesla - 20080805-3 +- Cleaned up summary. + * Tue Oct 21 2008 Hans de Goede - 20080805-2 - Actually install the data now that its merged into the main package From mhlavink at fedoraproject.org Mon Mar 9 12:41:58 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 9 Mar 2009 12:41:58 +0000 (UTC) Subject: rpms/setuptool/devel .cvsignore, 1.18, 1.19 setuptool.spec, 1.33, 1.34 sources, 1.24, 1.25 Message-ID: <20090309124158.CF0CB70116@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/setuptool/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10034 Modified Files: .cvsignore setuptool.spec sources Log Message: update to 1.19.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/setuptool/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 23 Jan 2008 19:26:52 -0000 1.18 +++ .cvsignore 9 Mar 2009 12:41:28 -0000 1.19 @@ -1,3 +1 @@ -setuptool-1.18.1.tar.gz -setuptool-1.19.3.tar.gz -setuptool-1.19.4.tar.gz +setuptool-1.19.5.tar.gz Index: setuptool.spec =================================================================== RCS file: /cvs/extras/rpms/setuptool/devel/setuptool.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- setuptool.spec 26 Feb 2009 00:41:34 -0000 1.33 +++ setuptool.spec 9 Mar 2009 12:41:28 -0000 1.34 @@ -1,31 +1,27 @@ -# The name is "setuptool" because we already have a package -# named "setup". Oh, well. Name: setuptool -Version: 1.19.4 -Release: 3%{?dist} +Version: 1.19.5 +Release: 1%{?dist} Summary: A text mode system configuration tool License: GPLv2+ Group: Applications/System +Url: http://git.fedorahosted.org/git/?p=setuptool.git Source: setuptool-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: newt-devel, gettext, perl-XML-Parser Requires: usermode -Conflicts: pam < 0.78 %description Setuptool is a user-friendly text mode menu utility which allows you to access all of the text mode configuration programs included in the operating system distribution. -You should install the setuptool package because you may find -yourself using its features for essential system administration. - %prep %setup -q %build +./autogen.sh %configure -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -36,18 +32,21 @@ rm -rf $RPM_BUILD_ROOT %files -f setup.lang -%defattr(-,root,root) -%doc README -%attr(0755,root,root) %{_bindir}/setup -%attr(0644,root,root) %{_sysconfdir}/pam.d/* -%attr(0644,root,root) %{_sysconfdir}/security/console.apps/* -%attr(0755,root,root) %{_sbindir}/setup -%attr(0755,root,root) %dir %{_datadir}/%{name} -%attr(0755,root,root) %dir %{_datadir}/%{name}/setuptool.d -%attr(0755,root,root) %dir %{_sysconfdir}/setuptool.d -%attr(0644,root,root) %{_sysconfdir}/setuptool.d/* +%defattr(-,root,root,-) +%doc README COPYING +%{_bindir}/setup +%config %{_sysconfdir}/pam.d/* +%config(noreplace) %{_sysconfdir}/security/console.apps/* +%{_sbindir}/setup +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/setuptool.d +%dir %{_sysconfdir}/setuptool.d +%config %{_sysconfdir}/setuptool.d/* %changelog +* Mon Mar 09 2009 Michal Hlavinka - 1.19.5-1 +- new version (only translations updated) + * Wed Feb 25 2009 Fedora Release Engineering - 1.19.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/setuptool/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 23 Jan 2008 19:26:52 -0000 1.24 +++ sources 9 Mar 2009 12:41:28 -0000 1.25 @@ -1 +1 @@ -b4f7439b3c69ec2b49564183838dd890 setuptool-1.19.4.tar.gz +4880d27fbb76e8cf723d220683b9957a setuptool-1.19.5.tar.gz From deji at fedoraproject.org Mon Mar 9 12:48:34 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Mon, 9 Mar 2009 12:48:34 +0000 (UTC) Subject: rpms/mpich2/devel import.log, NONE, 1.1 mpich2-1.0.8-rpmbuild.patch, NONE, 1.1 mpich2.module.in, NONE, 1.1 mpich2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309124834.EF99670116@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/mpich2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11531/devel Modified Files: .cvsignore sources Added Files: import.log mpich2-1.0.8-rpmbuild.patch mpich2.module.in mpich2.spec Log Message: Initial import --- NEW FILE import.log --- mpich2-1_0_8-2_fc10:HEAD:mpich2-1.0.8-2.fc10.src.rpm:1236602656 mpich2-1.0.8-rpmbuild.patch: --- NEW FILE mpich2-1.0.8-rpmbuild.patch --- --- src/mpe2/sbin/mpeinstall.in 2008-10-24 12:56:05.000000000 -0400 +++ src/mpe2/sbin/mpeinstall.in.new 2008-10-24 22:37:15.886589567 -0400 @@ -40,10 +40,10 @@ mandir=@mandir@ # Since autoconf < 2.60 does not set docdir and htmldir, # check if they are set. If not, set them accordingly. -if [ "$docdir" = "@docdir@" ] ; then +if [ "$docdir" != "@docdir@" ] ; then docdir=${datadir}/doc/${PACKAGE} fi -if [ "$htmldir" = "@htmldir@" ] ; then +if [ "$htmldir" != "@htmldir@" ] ; then htmldir=${docdir} fi @@ -440,10 +440,10 @@ mandir=@mandir@ # Since autoconf < 2.60 does not set docdir and htmldir, # check if they are set. If not, set them accordingly. - if [ "$docdir" = "@docdir@" ] ; then + if [ "$docdir" != "@docdir@" ] ; then docdir=${datadir}/doc/${PACKAGE} fi - if [ "$htmldir" = "@htmldir@" ] ; then + if [ "$htmldir" != "@htmldir@" ] ; then htmldir=${docdir} fi if [ $appendUninstall = 0 ] ; then @@ -493,7 +493,6 @@ if [ -n "$etcbuild_dir" ] ; then if [ -d $etcbuild_dir ] ; then echo "Installing $pkgname configuration files to $DESTDIR$sysconfdir" - InstallDirRecur $etcbuild_dir $sysconfdir $MODE cd $etcbuild_dir && \ for file in *.conf ; do \ FixInstallFile $file $sysconfdir/$file ; \ --- src/mpe2/src/slog2sdk/sbin/install-package.in 2008-10-24 12:56:05.000000000 -0400 +++ src/mpe2/src/slog2sdk/sbin/install-package.in.new 2008-10-24 23:02:20.047590684 -0400 @@ -39,7 +39,7 @@ docdir=@docdir@ # Since autoconf < 2.60 does not set docdir, # check if it is set. If not, set it accordingly. -if [ "$docdir" = "@docdir@" ] ; then +if [ "$docdir" != "@docdir@" ] ; then docdir=${datadir}/doc/${PACKAGE} fi @@ -388,7 +388,7 @@ docdir=@docdir@ # Since autoconf < 2.60 does not set docdir, # check if it is set. If not, set it accordingly. - if [ "$docdir" = "@docdir@" ] ; then + if [ "$docdir" != "@docdir@" ] ; then docdir=${datadir}/doc/${PACKAGE} fi if [ $appendUninstall = 0 ] ; then --- src/mpe2/src/slog2sdk/trace_rlog/src/Makefile.in 2007-05-29 18:25:53.000000000 -0400 +++ src/mpe2/src/slog2sdk/trace_rlog/src/Makefile.in.new 2007-10-15 22:23:20.000000000 -0400 @@ -48,7 +48,7 @@ JNI_INC = @JNI_INC@ CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@ -LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ +LDFLAGS = -module -no-undefined -avoid-version @COPTS@ @LDFLAGS@ # memory leak checker MEMLIBS = @DEBUG_LIBS@ --- src/mpe2/src/slog2sdk/trace_sample/src/Makefile.in 2007-05-29 18:25:53.000000000 -0400 +++ src/mpe2/src/slog2sdk/trace_sample/src/Makefile.in.new 2007-10-15 22:23:20.000000000 -0400 @@ -48,7 +48,7 @@ JNI_INC = @JNI_INC@ CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@ -LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ +LDFLAGS = -module -no-undefined -avoid-version @COPTS@ @LDFLAGS@ # memory leak checker MEMLIBS = @DEBUG_LIBS@ --- NEW FILE mpich2.module.in --- #%Module 1.0 # # MPICH2 module for use with 'environment-modules' package: # prepend-path PATH @DATADIR@/bin at MODE@ setenv CFLAGS -I at INCLUDEDIR@ setenv LDFLAGS -L at LIBDIR@ -lmpich --- NEW FILE mpich2.spec --- Summary: An implementation of MPI Name: mpich2 Version: 1.0.8 Release: 2%{?dist} License: MIT Group: Development/Libraries URL: http://www.mcs.anl.gov/research/projects/mpich2 Source: http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}/%{name}-%{version}.tar.gz Source1: mpich2.module.in Patch0: mpich2-%{version}-rpmbuild.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libXt-devel, e2fsprogs-devel BuildRequires: java-devel, gcc-gfortran BuildRequires: emacs-common, perl, python Requires: %{name}-libs = %{version}-%{release} Requires: python Requires(post): chkconfig Requires(preun):chkconfig #Requires chkconfig for /usr/sbin/alternatives %description MPICH2 is a high-performance and widely portable implementation of the MPI standard. This release has all MPI-2.1 functions and features required by the standard with the exeption of support for the "external32" portable I/O format. The mpich2 binaries in Fedora were configured to use the default process manager 'MPD' using the default device 'ch3'. The ch3 device was configured with support for the nemesis channel that allows for shared-memory and TCP/IP sockets based communication. The Fedora builds also include support for using '/usr/sbin/alternatives' and/or the 'module environment' to select which MPI implementation to use when multiple implementations are installed. %package devel Summary: Development files for mpich2 Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: gcc-gfortran Requires(post): /usr/sbin/alternatives Requires(preun):/usr/sbin/alternatives %description devel Contains development headers and libraries for mpich2 %package libs Summary: Libraries and configuration files for mpich2 Group: Development/Libraries %description libs Contains the arch dependent libraries and their build configuration for mpich2 # We only compile with gcc, but other people may want other compilers. # Set the compiler here. %{!?opt_cc: %define opt_cc gcc} %{!?opt_fc: %define opt_fc gfortran} # Optional CFLAGS to use with the specific compiler...gcc doesn't need any, # so uncomment and undefine to NOT use %{!?opt_cc_cflags: %define opt_cc_cflags %{optflags}} %{!?opt_fc_fflags: %define opt_fc_fflags %{optflags}} %ifarch %{ix86} x86_64 %define selected_channels ch3:nemesis %else %define selected_channels ch3:dllchan:sock,shm,ssm %endif %ifarch %{ix86} ppc %define mode 32 %define priority 40 %else %define mode 64 %define priority 41 %endif %ifarch x86_64 %define XFLAGS -fPIC %endif %prep %setup -q %patch0 -p0 -b .build %configure \ --enable-sharedlibs=gcc \ --with-device=%{selected_channels} \ --sysconfdir=%{_sysconfdir}/%{name}-%{mode} \ --includedir=%{_includedir}/%{name} \ --libdir=%{_libdir}/%{name} \ --datadir=%{_datadir}/%{name} \ --docdir=%{_docdir}/%{name}-%{version} \ --htmldir=%{_docdir}/%{name}-%{version}/www \ --with-java=%{_sysconfdir}/alternatives/java_sdk \ F90=%{opt_fc} \ F77=%{opt_fc} \ CFLAGS="%{?opt_cc_cflags} %{?XFLAGS}" \ CXXFLAGS="%{optflags} %{?XFLAGS}" \ F90FLAGS="%{?opt_fc_fflags} %{?XFLAGS}" \ FFLAGS="%{?opt_fc_fflags} %{?XFLAGS}" \ LDFLAGS='-Wl,-z,noexecstack' %build #make %{?_smp_mflags} doesn't work make %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install ## Resolve clashes with LAM/OPENMP: mpicxx mpicc mpif77 mpif90 mpiexec mpirun rm -f %{buildroot}%{_bindir}/{mpiexec,mpirun,mpdrun} mv %{buildroot}%{_mandir}/man1/{,mp-}mpiexec.1 pushd %{buildroot}%{_bindir}/ ln -s mpiexec.py mpdrun popd mkdir -p %{buildroot}%{_datadir}/%{name}/bin%{mode} for b in mpicxx mpicc mpif77 mpif90; do mv %{buildroot}%{_bindir}/$b %{buildroot}%{_bindir}/mp%{mode}-$b; mv %{buildroot}%{_mandir}/man1/$b.1 %{buildroot}%{_mandir}/man1/mp-$b.1; ln -s ../../../bin/mp%{mode}-$b %{buildroot}%{_datadir}/%{name}/bin%{mode}/$b done mv %{buildroot}%{_libdir}/%{name}/pkgconfig %{buildroot}%{_libdir}/ chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc ## Create modules file sed 's#@DATADIR@#'%{_datadir}/%{name}'#;s#@LIBDIR@#'%{_libdir}/%{name}'#;s#@INCLUDEDIR@#'%{_includedir}/%{name}'#;s#@MODE@#'%{mode}'#' < %SOURCE1 > %{buildroot}%{_datadir}/%{name}/%{name}.module #:; # Manually copy doc file here instead of the %files section to prevent the rpm #build script from throwing the other things in there out cp -pr CHANGES COPYRIGHT README RELEASE_NOTES %{buildroot}%{_docdir}/%{name}-%{version}/ cp -pr src/mpe2/README %{buildroot}%{_docdir}/%{name}-%{version}/README.mpe # Silence rpmlint sed -i '/^#! \//,1 d' %{buildroot}%{_sysconfdir}/%{name}-%{mode}/{mpi*.conf,mpe_help.*} #Rename the MPI routine manpages, to avoid conflict with openmpi for man in %{buildroot}%{_mandir}/man3/*; do manf=`basename $man .3` mv %{buildroot}%{_mandir}/man3/$manf.3 %{buildroot}%{_mandir}/man4/$manf.4 sed s/3/4/1 -i %{buildroot}%{_mandir}/man4/$manf.4 done # The uninstall script that is installed in this directory is not needed in rpm # packaging rm -rf %{buildroot}%{_sbindir}/mpe* find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf %{buildroot} %post /usr/sbin/alternatives \ --install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py 41 \ --slave %{_bindir}/mpiexec mpi-exec %{_bindir}/mpiexec.py \ --slave %{_mandir}/man1/mpiexec.1.gz mpi-exec-man \ %{_mandir}/man1/mp-mpiexec.1.gz \ --slave %{_mandir}/man1/mpif90.1.gz mpif90-man \ %{_mandir}/man1/mp-mpif90.1.gz \ --slave %{_mandir}/man1/mpif77.1.gz mpif77-man \ %{_mandir}/man1/mp-mpif77.1.gz \ --slave %{_mandir}/man1/mpicc.1.gz mpicc-man \ %{_mandir}/man1/mp-mpicc.1.gz \ --slave %{_mandir}/man1/mpic++.1.gz mpic++-man \ %{_mandir}/man1/mp-mpicxx.1.gz %preun /usr/sbin/alternatives --remove mpi-run %{_bindir}/mpiexec.py %post devel /usr/sbin/alternatives \ --install %{_bindir}/mpicc mpicc %{_bindir}/mp%{mode}-mpicc %{priority}\ --slave %{_bindir}/mpicxx mpicxx %{_bindir}/mp%{mode}-mpicxx \ --slave %{_bindir}/mpif90 mpif90 %{_bindir}/mp%{mode}-mpif90 \ --slave %{_bindir}/mpif77 mpif77 %{_bindir}/mp%{mode}-mpif77 %preun devel /usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{mode}-mpicc %files %defattr(-,root,root,-) %{_bindir}/* %exclude %{_bindir}/mp*.pyc %exclude %{_bindir}/mp*.pyo %exclude %{_bindir}/mp%{mode}-mpicc %exclude %{_bindir}/mp%{mode}-mpicxx %exclude %{_bindir}/mp%{mode}-mpif90 %exclude %{_bindir}/mp%{mode}-mpif77 %doc %{_docdir}/%{name}-%{version}/ %{_mandir}/man1/* %files libs %defattr(-,root,root,-) %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.jar %{_libdir}/%{name}/mpe*.o %{_libdir}/%{name}/*.so.* %config %{_sysconfdir}/%{name}-%{mode}/ %files devel %defattr(-,root,root,-) %{_bindir}/mp%{mode}-mpicc %{_bindir}/mp%{mode}-mpicxx %{_bindir}/mp%{mode}-mpif90 %{_bindir}/mp%{mode}-mpif77 %{_includedir}/* %{_libdir}/%{name}/*.a %{_libdir}/%{name}/*.so %{_libdir}/%{name}/trace_rlog/libTraceInput.so %{_libdir}/pkgconfig/%{name}-ch3.pc %dir %{_datadir}/%{name} %{_datadir}/%{name}/bin%{mode}/ %{_datadir}/%{name}/%{name}.module %{_datadir}/%{name}/examples* %{_datadir}/%{name}/logfiles/ %{_mandir}/man4/*.gz %doc README.testing README.romio README.developer %changelog * Fri Mar 06 2009 Deji Akingunola - 1.0.8-2 - Fix the source url, pointed out from package review - Finally accepted to go into Fedora * Sat Oct 24 2008 Deji Akingunola - 1.0.8-1 - Update to the 1.0.8 - Configure with the default nemesis channel * Fri May 16 2008 Deji Akingunola - 1.0.7-5 - Update the alternate compiler/compiler flags macro to allow overriding it from command-line * Wed Apr 16 2008 Deji Akingunola - 1.0.7-4 - Apply patch from Orion Poplawski to silence rpmlint * Tue Apr 15 2008 Deji Akingunola - 1.0.7-3 - Add a note on the device/channels configuration options used, and - Fix logfile listings as suggested by Orion Poplawski (Package review, 171993) * Tue Apr 15 2008 Deji Akingunola - 1.0.7-2 - Fix the source url * Sat Apr 05 2008 Deji Akingunola - 1.0.7-1 - Update to 1.0.7 * Mon Oct 15 2007 Deji Akingunola - 1.0.6p1-1 - Update to 1.0.6p1 * Mon Oct 15 2007 Deji Akingunola - 1.0.6-1 - New version upgrade * Mon Jul 31 2007 Deji Akingunola - 1.0.5p4-4 - Create a -mpi-manpages subpackage for the MPI routines manuals * Fri Jul 27 2007 Deji Akingunola - 1.0.5p4-3 - Fix java-gcj-compat BR - Handle upgrades in the post scripts * Mon Jun 12 2007 Deji Akingunola - 1.0.5p4-2 - Fix typos and make other adjustments arising from Fedora package reviews * Mon Jun 12 2007 Deji Akingunola - 1.0.5p4-1 - Patch #4 release * Mon Feb 12 2007 Deji Akingunola - 1.0.5p2-1 - Patch #2 release * Tue Jan 09 2007 Deji Akingunola - 1.0.5p1-1 - New release with manpages - Create a -libs subpackage as it's done in Fedora's openmpi to help with multi-libs packaging - Disable modules support (until I can properly figure it out) * Wed Dec 27 2006 Deji Akingunola - 1.0.5-1 - New release * Sat Nov 18 2006 Deji Akingunola - 1.0.4p1-2 - Set the java_sdk directory so all java bit work * Sat Sep 02 2006 Deji Akingunola - 1.0.4p1-1 - Update to version 1.0.4p1 - Cleanup up spec file to use alternatives similarly to FC's openmpi * Wed Aug 02 2006 Deji Akingunola - 1.0.4-1 - Update to version 1.0.4 * Thu May 18 2006 Deji Akingunola - 1.0.3-3 - Add missing BRs (Orion Polawski) * Mon Apr 10 2006 Deji Akingunola - 1.0.3-2 - Rewrite the spec, borrowing extensively from openmpi's spec by Jason Vas Dias - Allows use of environment modules and alternatives * Fri Nov 25 2005 Deji Akingunola - 1.0.3-1 - Update to new version * Sat Oct 15 2005 Deji Akingunola - 1.0.2p1-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mpich2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:25:36 -0000 1.1 +++ .cvsignore 9 Mar 2009 12:48:04 -0000 1.2 @@ -0,0 +1 @@ +mpich2-1.0.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mpich2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:25:36 -0000 1.1 +++ sources 9 Mar 2009 12:48:04 -0000 1.2 @@ -0,0 +1 @@ +d9dfb6e38d7ca6f8ad92a191a413ee57 mpich2-1.0.8.tar.gz From jakub at fedoraproject.org Mon Mar 9 12:51:14 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Mon, 9 Mar 2009 12:51:14 +0000 (UTC) Subject: rpms/valgrind/devel valgrind-3.4.1-cachegrind-improvements.patch, NONE, 1.1 valgrind-3.4.1-openat.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 valgrind.spec, 1.61, 1.62 valgrind-3.4.0-cachegrind-improvements.patch, 1.2, NONE valgrind-3.4.0-debug.patch, 1.1, NONE valgrind-3.4.0-newbu.patch, 1.1, NONE valgrind-3.4.0-openat.patch, 1.1, NONE valgrind-3.4.0-pkg-config.patch, 1.1, NONE valgrind-3.4.0-power5+-6.patch, 1.2, NONE Message-ID: <20090309125114.EEA0770116@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/valgrind/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12185 Modified Files: .cvsignore sources valgrind.spec Added Files: valgrind-3.4.1-cachegrind-improvements.patch valgrind-3.4.1-openat.patch Removed Files: valgrind-3.4.0-cachegrind-improvements.patch valgrind-3.4.0-debug.patch valgrind-3.4.0-newbu.patch valgrind-3.4.0-openat.patch valgrind-3.4.0-pkg-config.patch valgrind-3.4.0-power5+-6.patch Log Message: 3.4.1-1 valgrind-3.4.1-cachegrind-improvements.patch: --- NEW FILE valgrind-3.4.1-cachegrind-improvements.patch --- --- valgrind-3.4.0/cachegrind/cg_sim.c.jj 2007-01-08 02:43:10.000000000 -0500 +++ valgrind-3.4.0/cachegrind/cg_sim.c 2007-02-13 07:15:46.000000000 -0500 @@ -42,27 +42,30 @@ typedef struct { Int size; /* bytes */ Int assoc; Int line_size; /* bytes */ - Int sets; Int sets_min_1; Int line_size_bits; Int tag_shift; - Char desc_line[128]; UWord* tags; -} cache_t2; + Char desc_line[128]; +} cache_t2 +#ifdef __GNUC__ +__attribute__ ((aligned (8 * sizeof (Int)))) +#endif +; /* By this point, the size/assoc/line_size has been checked. */ static void cachesim_initcache(cache_t config, cache_t2* c) { - Int i; + Int sets; c->size = config.size; c->assoc = config.assoc; c->line_size = config.line_size; - c->sets = (c->size / c->line_size) / c->assoc; - c->sets_min_1 = c->sets - 1; + sets = (c->size / c->line_size) / c->assoc; + c->sets_min_1 = sets - 1; c->line_size_bits = VG_(log2)(c->line_size); - c->tag_shift = c->line_size_bits + VG_(log2)(c->sets); + c->tag_shift = c->line_size_bits + VG_(log2)(sets); if (c->assoc == 1) { VG_(sprintf)(c->desc_line, "%d B, %d B, direct-mapped", @@ -72,11 +75,8 @@ static void cachesim_initcache(cache_t c c->size, c->line_size, c->assoc); } - c->tags = VG_(malloc)("cg.sim.ci.1", - sizeof(UWord) * c->sets * c->assoc); - - for (i = 0; i < c->sets * c->assoc; i++) - c->tags[i] = 0; + c->tags = VG_(calloc)("cg.sim.ci.1", + sizeof(UWord), sets * c->assoc); } /* This is done as a macro rather than by passing in the cache_t2 as an @@ -138,8 +138,7 @@ void cachesim_##L##_doref(Addr a, UChar return; \ \ /* Second case: word straddles two lines. */ \ - /* Nb: this is a fast way of doing ((set1+1) % L.sets) */ \ - } else if (((set1 + 1) & (L.sets-1)) == set2) { \ + } else if (((set1 + 1) & (L.sets_min_1)) == set2) { \ set = &(L.tags[set1 * L.assoc]); \ if (tag == set[0]) { \ goto block2; \ valgrind-3.4.1-openat.patch: --- NEW FILE valgrind-3.4.1-openat.patch --- Testcase: #define _GNU_SOURCE #include #include int main (void) { int dfd = open ("/tmp", O_RDONLY); int fd1 = openat (dfd, "abc", O_RDONLY); int fd2 = openat (0x12345678, "/tmp/abc", O_RDONLY); int fd3 = openat (AT_FDCWD, "abc", O_RDONLY); /* This is the only one that should warn. */ int fd4 = openat (0x12345678, "abc", O_RDONLY); return 0; } --- valgrind-3.3.0/coregrind/m_syswrap/syswrap-linux.c.jj 2007-12-11 00:18:43.000000000 +0100 +++ valgrind-3.3.0/coregrind/m_syswrap/syswrap-linux.c 2008-03-03 11:35:15.000000000 +0100 @@ -2455,10 +2455,15 @@ PRE(sys_openat) int, dfd, const char *, filename, int, flags); } - if (ARG1 != VKI_AT_FDCWD && !ML_(fd_allowed)(ARG1, "openat", tid, False)) + PRE_MEM_RASCIIZ( "openat(filename)", ARG2 ); + + /* For absolute filenames, dfd is ignored. If dfd is AT_FDCWD, + filename is relative to cwd. */ + if (ML_(safe_to_deref)( (void*)ARG2, 1 ) + && *(Char *)ARG2 != '/' + && ARG1 != VKI_AT_FDCWD + && !ML_(fd_allowed)(ARG1, "openat", tid, False)) SET_STATUS_Failure( VKI_EBADF ); - else - PRE_MEM_RASCIIZ( "openat(filename)", ARG2 ); /* Handle the case where the open is of /proc/self/cmdline or /proc//cmdline, and just give it a copy of the fd for the Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/valgrind/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 7 Feb 2009 11:51:27 -0000 1.14 +++ .cvsignore 9 Mar 2009 12:50:44 -0000 1.15 @@ -1 +1 @@ -valgrind-3.4.0.tar.bz2 +valgrind-3.4.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/valgrind/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 7 Feb 2009 11:51:27 -0000 1.14 +++ sources 9 Mar 2009 12:50:44 -0000 1.15 @@ -1 +1 @@ -1b0fe1219e1a583ff8c2db54ed2265e6 valgrind-3.4.0.tar.bz2 +b5f039dd2271aaf9ae570ab4116f87c7 valgrind-3.4.1.tar.bz2 Index: valgrind.spec =================================================================== RCS file: /cvs/pkgs/rpms/valgrind/devel/valgrind.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- valgrind.spec 25 Feb 2009 23:44:24 -0000 1.61 +++ valgrind.spec 9 Mar 2009 12:50:44 -0000 1.62 @@ -1,14 +1,11 @@ Summary: Tool for finding memory management bugs in programs Name: valgrind -Version: 3.4.0 -Release: 4 +Version: 3.4.1 +Release: 1 Epoch: 1 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2 -Patch1: valgrind-3.4.0-cachegrind-improvements.patch -Patch2: valgrind-3.4.0-pkg-config.patch -Patch3: valgrind-3.4.0-openat.patch -Patch4: valgrind-3.4.0-newbu.patch -Patch5: valgrind-3.4.0-debug.patch +Patch1: valgrind-3.4.1-cachegrind-improvements.patch +Patch2: valgrind-3.4.1-openat.patch License: GPLv2 URL: http://www.valgrind.org/ Group: Development/Debuggers @@ -18,7 +15,7 @@ # Ensure glibc{,-devel} is installed for both multilib arches BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so %endif -BuildRequires: glibc-devel >= 2.8 +BuildRequires: glibc-devel >= 2.9 ExclusiveArch: %{ix86} x86_64 ppc ppc64 %ifarch %{ix86} %define valarch x86 @@ -64,9 +61,6 @@ %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build %ifarch x86_64 ppc64 @@ -157,8 +151,8 @@ %{_libdir}/pkgconfig/* %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 1:3.4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Mon Mar 9 2009 Jakub Jelinek 3.4.1-1 +- update to 3.4.1 * Tue Feb 9 2009 Jakub Jelinek 3.4.0-3 - update to 3.4.0 --- valgrind-3.4.0-cachegrind-improvements.patch DELETED --- --- valgrind-3.4.0-debug.patch DELETED --- --- valgrind-3.4.0-newbu.patch DELETED --- --- valgrind-3.4.0-openat.patch DELETED --- --- valgrind-3.4.0-pkg-config.patch DELETED --- --- valgrind-3.4.0-power5+-6.patch DELETED --- From deji at fedoraproject.org Mon Mar 9 12:51:35 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Mon, 9 Mar 2009 12:51:35 +0000 (UTC) Subject: rpms/mpich2/F-10 import.log, NONE, 1.1 mpich2-1.0.8-rpmbuild.patch, NONE, 1.1 mpich2.module.in, NONE, 1.1 mpich2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309125135.1631670116@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/mpich2/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12310/F-10 Modified Files: .cvsignore sources Added Files: import.log mpich2-1.0.8-rpmbuild.patch mpich2.module.in mpich2.spec Log Message: Initial import --- NEW FILE import.log --- mpich2-1_0_8-2_fc10:F-10:mpich2-1.0.8-2.fc10.src.rpm:1236602784 mpich2-1.0.8-rpmbuild.patch: --- NEW FILE mpich2-1.0.8-rpmbuild.patch --- --- src/mpe2/sbin/mpeinstall.in 2008-10-24 12:56:05.000000000 -0400 +++ src/mpe2/sbin/mpeinstall.in.new 2008-10-24 22:37:15.886589567 -0400 @@ -40,10 +40,10 @@ mandir=@mandir@ # Since autoconf < 2.60 does not set docdir and htmldir, # check if they are set. If not, set them accordingly. -if [ "$docdir" = "@docdir@" ] ; then +if [ "$docdir" != "@docdir@" ] ; then docdir=${datadir}/doc/${PACKAGE} fi -if [ "$htmldir" = "@htmldir@" ] ; then +if [ "$htmldir" != "@htmldir@" ] ; then htmldir=${docdir} fi @@ -440,10 +440,10 @@ mandir=@mandir@ # Since autoconf < 2.60 does not set docdir and htmldir, # check if they are set. If not, set them accordingly. - if [ "$docdir" = "@docdir@" ] ; then + if [ "$docdir" != "@docdir@" ] ; then docdir=${datadir}/doc/${PACKAGE} fi - if [ "$htmldir" = "@htmldir@" ] ; then + if [ "$htmldir" != "@htmldir@" ] ; then htmldir=${docdir} fi if [ $appendUninstall = 0 ] ; then @@ -493,7 +493,6 @@ if [ -n "$etcbuild_dir" ] ; then if [ -d $etcbuild_dir ] ; then echo "Installing $pkgname configuration files to $DESTDIR$sysconfdir" - InstallDirRecur $etcbuild_dir $sysconfdir $MODE cd $etcbuild_dir && \ for file in *.conf ; do \ FixInstallFile $file $sysconfdir/$file ; \ --- src/mpe2/src/slog2sdk/sbin/install-package.in 2008-10-24 12:56:05.000000000 -0400 +++ src/mpe2/src/slog2sdk/sbin/install-package.in.new 2008-10-24 23:02:20.047590684 -0400 @@ -39,7 +39,7 @@ docdir=@docdir@ # Since autoconf < 2.60 does not set docdir, # check if it is set. If not, set it accordingly. -if [ "$docdir" = "@docdir@" ] ; then +if [ "$docdir" != "@docdir@" ] ; then docdir=${datadir}/doc/${PACKAGE} fi @@ -388,7 +388,7 @@ docdir=@docdir@ # Since autoconf < 2.60 does not set docdir, # check if it is set. If not, set it accordingly. - if [ "$docdir" = "@docdir@" ] ; then + if [ "$docdir" != "@docdir@" ] ; then docdir=${datadir}/doc/${PACKAGE} fi if [ $appendUninstall = 0 ] ; then --- src/mpe2/src/slog2sdk/trace_rlog/src/Makefile.in 2007-05-29 18:25:53.000000000 -0400 +++ src/mpe2/src/slog2sdk/trace_rlog/src/Makefile.in.new 2007-10-15 22:23:20.000000000 -0400 @@ -48,7 +48,7 @@ JNI_INC = @JNI_INC@ CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@ -LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ +LDFLAGS = -module -no-undefined -avoid-version @COPTS@ @LDFLAGS@ # memory leak checker MEMLIBS = @DEBUG_LIBS@ --- src/mpe2/src/slog2sdk/trace_sample/src/Makefile.in 2007-05-29 18:25:53.000000000 -0400 +++ src/mpe2/src/slog2sdk/trace_sample/src/Makefile.in.new 2007-10-15 22:23:20.000000000 -0400 @@ -48,7 +48,7 @@ JNI_INC = @JNI_INC@ CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@ -LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ +LDFLAGS = -module -no-undefined -avoid-version @COPTS@ @LDFLAGS@ # memory leak checker MEMLIBS = @DEBUG_LIBS@ --- NEW FILE mpich2.module.in --- #%Module 1.0 # # MPICH2 module for use with 'environment-modules' package: # prepend-path PATH @DATADIR@/bin at MODE@ setenv CFLAGS -I at INCLUDEDIR@ setenv LDFLAGS -L at LIBDIR@ -lmpich --- NEW FILE mpich2.spec --- Summary: An implementation of MPI Name: mpich2 Version: 1.0.8 Release: 2%{?dist} License: MIT Group: Development/Libraries URL: http://www.mcs.anl.gov/research/projects/mpich2 Source: http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}/%{name}-%{version}.tar.gz Source1: mpich2.module.in Patch0: mpich2-%{version}-rpmbuild.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libXt-devel, e2fsprogs-devel BuildRequires: java-devel, gcc-gfortran BuildRequires: emacs-common, perl, python Requires: %{name}-libs = %{version}-%{release} Requires: python Requires(post): chkconfig Requires(preun):chkconfig #Requires chkconfig for /usr/sbin/alternatives %description MPICH2 is a high-performance and widely portable implementation of the MPI standard. This release has all MPI-2.1 functions and features required by the standard with the exeption of support for the "external32" portable I/O format. The mpich2 binaries in Fedora were configured to use the default process manager 'MPD' using the default device 'ch3'. The ch3 device was configured with support for the nemesis channel that allows for shared-memory and TCP/IP sockets based communication. The Fedora builds also include support for using '/usr/sbin/alternatives' and/or the 'module environment' to select which MPI implementation to use when multiple implementations are installed. %package devel Summary: Development files for mpich2 Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: gcc-gfortran Requires(post): /usr/sbin/alternatives Requires(preun):/usr/sbin/alternatives %description devel Contains development headers and libraries for mpich2 %package libs Summary: Libraries and configuration files for mpich2 Group: Development/Libraries %description libs Contains the arch dependent libraries and their build configuration for mpich2 # We only compile with gcc, but other people may want other compilers. # Set the compiler here. %{!?opt_cc: %define opt_cc gcc} %{!?opt_fc: %define opt_fc gfortran} # Optional CFLAGS to use with the specific compiler...gcc doesn't need any, # so uncomment and undefine to NOT use %{!?opt_cc_cflags: %define opt_cc_cflags %{optflags}} %{!?opt_fc_fflags: %define opt_fc_fflags %{optflags}} %ifarch %{ix86} x86_64 %define selected_channels ch3:nemesis %else %define selected_channels ch3:dllchan:sock,shm,ssm %endif %ifarch %{ix86} ppc %define mode 32 %define priority 40 %else %define mode 64 %define priority 41 %endif %ifarch x86_64 %define XFLAGS -fPIC %endif %prep %setup -q %patch0 -p0 -b .build %configure \ --enable-sharedlibs=gcc \ --with-device=%{selected_channels} \ --sysconfdir=%{_sysconfdir}/%{name}-%{mode} \ --includedir=%{_includedir}/%{name} \ --libdir=%{_libdir}/%{name} \ --datadir=%{_datadir}/%{name} \ --docdir=%{_docdir}/%{name}-%{version} \ --htmldir=%{_docdir}/%{name}-%{version}/www \ --with-java=%{_sysconfdir}/alternatives/java_sdk \ F90=%{opt_fc} \ F77=%{opt_fc} \ CFLAGS="%{?opt_cc_cflags} %{?XFLAGS}" \ CXXFLAGS="%{optflags} %{?XFLAGS}" \ F90FLAGS="%{?opt_fc_fflags} %{?XFLAGS}" \ FFLAGS="%{?opt_fc_fflags} %{?XFLAGS}" \ LDFLAGS='-Wl,-z,noexecstack' %build #make %{?_smp_mflags} doesn't work make %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install ## Resolve clashes with LAM/OPENMP: mpicxx mpicc mpif77 mpif90 mpiexec mpirun rm -f %{buildroot}%{_bindir}/{mpiexec,mpirun,mpdrun} mv %{buildroot}%{_mandir}/man1/{,mp-}mpiexec.1 pushd %{buildroot}%{_bindir}/ ln -s mpiexec.py mpdrun popd mkdir -p %{buildroot}%{_datadir}/%{name}/bin%{mode} for b in mpicxx mpicc mpif77 mpif90; do mv %{buildroot}%{_bindir}/$b %{buildroot}%{_bindir}/mp%{mode}-$b; mv %{buildroot}%{_mandir}/man1/$b.1 %{buildroot}%{_mandir}/man1/mp-$b.1; ln -s ../../../bin/mp%{mode}-$b %{buildroot}%{_datadir}/%{name}/bin%{mode}/$b done mv %{buildroot}%{_libdir}/%{name}/pkgconfig %{buildroot}%{_libdir}/ chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc ## Create modules file sed 's#@DATADIR@#'%{_datadir}/%{name}'#;s#@LIBDIR@#'%{_libdir}/%{name}'#;s#@INCLUDEDIR@#'%{_includedir}/%{name}'#;s#@MODE@#'%{mode}'#' < %SOURCE1 > %{buildroot}%{_datadir}/%{name}/%{name}.module #:; # Manually copy doc file here instead of the %files section to prevent the rpm #build script from throwing the other things in there out cp -pr CHANGES COPYRIGHT README RELEASE_NOTES %{buildroot}%{_docdir}/%{name}-%{version}/ cp -pr src/mpe2/README %{buildroot}%{_docdir}/%{name}-%{version}/README.mpe # Silence rpmlint sed -i '/^#! \//,1 d' %{buildroot}%{_sysconfdir}/%{name}-%{mode}/{mpi*.conf,mpe_help.*} #Rename the MPI routine manpages, to avoid conflict with openmpi for man in %{buildroot}%{_mandir}/man3/*; do manf=`basename $man .3` mv %{buildroot}%{_mandir}/man3/$manf.3 %{buildroot}%{_mandir}/man4/$manf.4 sed s/3/4/1 -i %{buildroot}%{_mandir}/man4/$manf.4 done # The uninstall script that is installed in this directory is not needed in rpm # packaging rm -rf %{buildroot}%{_sbindir}/mpe* find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf %{buildroot} %post /usr/sbin/alternatives \ --install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py 41 \ --slave %{_bindir}/mpiexec mpi-exec %{_bindir}/mpiexec.py \ --slave %{_mandir}/man1/mpiexec.1.gz mpi-exec-man \ %{_mandir}/man1/mp-mpiexec.1.gz \ --slave %{_mandir}/man1/mpif90.1.gz mpif90-man \ %{_mandir}/man1/mp-mpif90.1.gz \ --slave %{_mandir}/man1/mpif77.1.gz mpif77-man \ %{_mandir}/man1/mp-mpif77.1.gz \ --slave %{_mandir}/man1/mpicc.1.gz mpicc-man \ %{_mandir}/man1/mp-mpicc.1.gz \ --slave %{_mandir}/man1/mpic++.1.gz mpic++-man \ %{_mandir}/man1/mp-mpicxx.1.gz %preun /usr/sbin/alternatives --remove mpi-run %{_bindir}/mpiexec.py %post devel /usr/sbin/alternatives \ --install %{_bindir}/mpicc mpicc %{_bindir}/mp%{mode}-mpicc %{priority}\ --slave %{_bindir}/mpicxx mpicxx %{_bindir}/mp%{mode}-mpicxx \ --slave %{_bindir}/mpif90 mpif90 %{_bindir}/mp%{mode}-mpif90 \ --slave %{_bindir}/mpif77 mpif77 %{_bindir}/mp%{mode}-mpif77 %preun devel /usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{mode}-mpicc %files %defattr(-,root,root,-) %{_bindir}/* %exclude %{_bindir}/mp*.pyc %exclude %{_bindir}/mp*.pyo %exclude %{_bindir}/mp%{mode}-mpicc %exclude %{_bindir}/mp%{mode}-mpicxx %exclude %{_bindir}/mp%{mode}-mpif90 %exclude %{_bindir}/mp%{mode}-mpif77 %doc %{_docdir}/%{name}-%{version}/ %{_mandir}/man1/* %files libs %defattr(-,root,root,-) %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.jar %{_libdir}/%{name}/mpe*.o %{_libdir}/%{name}/*.so.* %config %{_sysconfdir}/%{name}-%{mode}/ %files devel %defattr(-,root,root,-) %{_bindir}/mp%{mode}-mpicc %{_bindir}/mp%{mode}-mpicxx %{_bindir}/mp%{mode}-mpif90 %{_bindir}/mp%{mode}-mpif77 %{_includedir}/* %{_libdir}/%{name}/*.a %{_libdir}/%{name}/*.so %{_libdir}/%{name}/trace_rlog/libTraceInput.so %{_libdir}/pkgconfig/%{name}-ch3.pc %dir %{_datadir}/%{name} %{_datadir}/%{name}/bin%{mode}/ %{_datadir}/%{name}/%{name}.module %{_datadir}/%{name}/examples* %{_datadir}/%{name}/logfiles/ %{_mandir}/man4/*.gz %doc README.testing README.romio README.developer %changelog * Fri Mar 06 2009 Deji Akingunola - 1.0.8-2 - Fix the source url, pointed out from package review - Finally accepted to go into Fedora * Sat Oct 24 2008 Deji Akingunola - 1.0.8-1 - Update to the 1.0.8 - Configure with the default nemesis channel * Fri May 16 2008 Deji Akingunola - 1.0.7-5 - Update the alternate compiler/compiler flags macro to allow overriding it from command-line * Wed Apr 16 2008 Deji Akingunola - 1.0.7-4 - Apply patch from Orion Poplawski to silence rpmlint * Tue Apr 15 2008 Deji Akingunola - 1.0.7-3 - Add a note on the device/channels configuration options used, and - Fix logfile listings as suggested by Orion Poplawski (Package review, 171993) * Tue Apr 15 2008 Deji Akingunola - 1.0.7-2 - Fix the source url * Sat Apr 05 2008 Deji Akingunola - 1.0.7-1 - Update to 1.0.7 * Mon Oct 15 2007 Deji Akingunola - 1.0.6p1-1 - Update to 1.0.6p1 * Mon Oct 15 2007 Deji Akingunola - 1.0.6-1 - New version upgrade * Mon Jul 31 2007 Deji Akingunola - 1.0.5p4-4 - Create a -mpi-manpages subpackage for the MPI routines manuals * Fri Jul 27 2007 Deji Akingunola - 1.0.5p4-3 - Fix java-gcj-compat BR - Handle upgrades in the post scripts * Mon Jun 12 2007 Deji Akingunola - 1.0.5p4-2 - Fix typos and make other adjustments arising from Fedora package reviews * Mon Jun 12 2007 Deji Akingunola - 1.0.5p4-1 - Patch #4 release * Mon Feb 12 2007 Deji Akingunola - 1.0.5p2-1 - Patch #2 release * Tue Jan 09 2007 Deji Akingunola - 1.0.5p1-1 - New release with manpages - Create a -libs subpackage as it's done in Fedora's openmpi to help with multi-libs packaging - Disable modules support (until I can properly figure it out) * Wed Dec 27 2006 Deji Akingunola - 1.0.5-1 - New release * Sat Nov 18 2006 Deji Akingunola - 1.0.4p1-2 - Set the java_sdk directory so all java bit work * Sat Sep 02 2006 Deji Akingunola - 1.0.4p1-1 - Update to version 1.0.4p1 - Cleanup up spec file to use alternatives similarly to FC's openmpi * Wed Aug 02 2006 Deji Akingunola - 1.0.4-1 - Update to version 1.0.4 * Thu May 18 2006 Deji Akingunola - 1.0.3-3 - Add missing BRs (Orion Polawski) * Mon Apr 10 2006 Deji Akingunola - 1.0.3-2 - Rewrite the spec, borrowing extensively from openmpi's spec by Jason Vas Dias - Allows use of environment modules and alternatives * Fri Nov 25 2005 Deji Akingunola - 1.0.3-1 - Update to new version * Sat Oct 15 2005 Deji Akingunola - 1.0.2p1-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mpich2/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:25:36 -0000 1.1 +++ .cvsignore 9 Mar 2009 12:51:04 -0000 1.2 @@ -0,0 +1 @@ +mpich2-1.0.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mpich2/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:25:36 -0000 1.1 +++ sources 9 Mar 2009 12:51:04 -0000 1.2 @@ -0,0 +1 @@ +d9dfb6e38d7ca6f8ad92a191a413ee57 mpich2-1.0.8.tar.gz From deji at fedoraproject.org Mon Mar 9 12:54:28 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Mon, 9 Mar 2009 12:54:28 +0000 (UTC) Subject: rpms/mpich2/F-9 import.log, NONE, 1.1 mpich2-1.0.8-rpmbuild.patch, NONE, 1.1 mpich2.module.in, NONE, 1.1 mpich2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309125428.468FB70116@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/mpich2/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13122/F-9 Modified Files: .cvsignore sources Added Files: import.log mpich2-1.0.8-rpmbuild.patch mpich2.module.in mpich2.spec Log Message: Initial import --- NEW FILE import.log --- mpich2-1_0_8-2_fc10:F-9:mpich2-1.0.8-2.fc10.src.rpm:1236603002 mpich2-1.0.8-rpmbuild.patch: --- NEW FILE mpich2-1.0.8-rpmbuild.patch --- --- src/mpe2/sbin/mpeinstall.in 2008-10-24 12:56:05.000000000 -0400 +++ src/mpe2/sbin/mpeinstall.in.new 2008-10-24 22:37:15.886589567 -0400 @@ -40,10 +40,10 @@ mandir=@mandir@ # Since autoconf < 2.60 does not set docdir and htmldir, # check if they are set. If not, set them accordingly. -if [ "$docdir" = "@docdir@" ] ; then +if [ "$docdir" != "@docdir@" ] ; then docdir=${datadir}/doc/${PACKAGE} fi -if [ "$htmldir" = "@htmldir@" ] ; then +if [ "$htmldir" != "@htmldir@" ] ; then htmldir=${docdir} fi @@ -440,10 +440,10 @@ mandir=@mandir@ # Since autoconf < 2.60 does not set docdir and htmldir, # check if they are set. If not, set them accordingly. - if [ "$docdir" = "@docdir@" ] ; then + if [ "$docdir" != "@docdir@" ] ; then docdir=${datadir}/doc/${PACKAGE} fi - if [ "$htmldir" = "@htmldir@" ] ; then + if [ "$htmldir" != "@htmldir@" ] ; then htmldir=${docdir} fi if [ $appendUninstall = 0 ] ; then @@ -493,7 +493,6 @@ if [ -n "$etcbuild_dir" ] ; then if [ -d $etcbuild_dir ] ; then echo "Installing $pkgname configuration files to $DESTDIR$sysconfdir" - InstallDirRecur $etcbuild_dir $sysconfdir $MODE cd $etcbuild_dir && \ for file in *.conf ; do \ FixInstallFile $file $sysconfdir/$file ; \ --- src/mpe2/src/slog2sdk/sbin/install-package.in 2008-10-24 12:56:05.000000000 -0400 +++ src/mpe2/src/slog2sdk/sbin/install-package.in.new 2008-10-24 23:02:20.047590684 -0400 @@ -39,7 +39,7 @@ docdir=@docdir@ # Since autoconf < 2.60 does not set docdir, # check if it is set. If not, set it accordingly. -if [ "$docdir" = "@docdir@" ] ; then +if [ "$docdir" != "@docdir@" ] ; then docdir=${datadir}/doc/${PACKAGE} fi @@ -388,7 +388,7 @@ docdir=@docdir@ # Since autoconf < 2.60 does not set docdir, # check if it is set. If not, set it accordingly. - if [ "$docdir" = "@docdir@" ] ; then + if [ "$docdir" != "@docdir@" ] ; then docdir=${datadir}/doc/${PACKAGE} fi if [ $appendUninstall = 0 ] ; then --- src/mpe2/src/slog2sdk/trace_rlog/src/Makefile.in 2007-05-29 18:25:53.000000000 -0400 +++ src/mpe2/src/slog2sdk/trace_rlog/src/Makefile.in.new 2007-10-15 22:23:20.000000000 -0400 @@ -48,7 +48,7 @@ JNI_INC = @JNI_INC@ CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@ -LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ +LDFLAGS = -module -no-undefined -avoid-version @COPTS@ @LDFLAGS@ # memory leak checker MEMLIBS = @DEBUG_LIBS@ --- src/mpe2/src/slog2sdk/trace_sample/src/Makefile.in 2007-05-29 18:25:53.000000000 -0400 +++ src/mpe2/src/slog2sdk/trace_sample/src/Makefile.in.new 2007-10-15 22:23:20.000000000 -0400 @@ -48,7 +48,7 @@ JNI_INC = @JNI_INC@ CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@ -LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ +LDFLAGS = -module -no-undefined -avoid-version @COPTS@ @LDFLAGS@ # memory leak checker MEMLIBS = @DEBUG_LIBS@ --- NEW FILE mpich2.module.in --- #%Module 1.0 # # MPICH2 module for use with 'environment-modules' package: # prepend-path PATH @DATADIR@/bin at MODE@ setenv CFLAGS -I at INCLUDEDIR@ setenv LDFLAGS -L at LIBDIR@ -lmpich --- NEW FILE mpich2.spec --- Summary: An implementation of MPI Name: mpich2 Version: 1.0.8 Release: 2%{?dist} License: MIT Group: Development/Libraries URL: http://www.mcs.anl.gov/research/projects/mpich2 Source: http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}/%{name}-%{version}.tar.gz Source1: mpich2.module.in Patch0: mpich2-%{version}-rpmbuild.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libXt-devel, e2fsprogs-devel BuildRequires: java-devel, gcc-gfortran BuildRequires: emacs-common, perl, python Requires: %{name}-libs = %{version}-%{release} Requires: python Requires(post): chkconfig Requires(preun):chkconfig #Requires chkconfig for /usr/sbin/alternatives %description MPICH2 is a high-performance and widely portable implementation of the MPI standard. This release has all MPI-2.1 functions and features required by the standard with the exeption of support for the "external32" portable I/O format. The mpich2 binaries in Fedora were configured to use the default process manager 'MPD' using the default device 'ch3'. The ch3 device was configured with support for the nemesis channel that allows for shared-memory and TCP/IP sockets based communication. The Fedora builds also include support for using '/usr/sbin/alternatives' and/or the 'module environment' to select which MPI implementation to use when multiple implementations are installed. %package devel Summary: Development files for mpich2 Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: gcc-gfortran Requires(post): /usr/sbin/alternatives Requires(preun):/usr/sbin/alternatives %description devel Contains development headers and libraries for mpich2 %package libs Summary: Libraries and configuration files for mpich2 Group: Development/Libraries %description libs Contains the arch dependent libraries and their build configuration for mpich2 # We only compile with gcc, but other people may want other compilers. # Set the compiler here. %{!?opt_cc: %define opt_cc gcc} %{!?opt_fc: %define opt_fc gfortran} # Optional CFLAGS to use with the specific compiler...gcc doesn't need any, # so uncomment and undefine to NOT use %{!?opt_cc_cflags: %define opt_cc_cflags %{optflags}} %{!?opt_fc_fflags: %define opt_fc_fflags %{optflags}} %ifarch %{ix86} x86_64 %define selected_channels ch3:nemesis %else %define selected_channels ch3:dllchan:sock,shm,ssm %endif %ifarch %{ix86} ppc %define mode 32 %define priority 40 %else %define mode 64 %define priority 41 %endif %ifarch x86_64 %define XFLAGS -fPIC %endif %prep %setup -q %patch0 -p0 -b .build %configure \ --enable-sharedlibs=gcc \ --with-device=%{selected_channels} \ --sysconfdir=%{_sysconfdir}/%{name}-%{mode} \ --includedir=%{_includedir}/%{name} \ --libdir=%{_libdir}/%{name} \ --datadir=%{_datadir}/%{name} \ --docdir=%{_docdir}/%{name}-%{version} \ --htmldir=%{_docdir}/%{name}-%{version}/www \ --with-java=%{_sysconfdir}/alternatives/java_sdk \ F90=%{opt_fc} \ F77=%{opt_fc} \ CFLAGS="%{?opt_cc_cflags} %{?XFLAGS}" \ CXXFLAGS="%{optflags} %{?XFLAGS}" \ F90FLAGS="%{?opt_fc_fflags} %{?XFLAGS}" \ FFLAGS="%{?opt_fc_fflags} %{?XFLAGS}" \ LDFLAGS='-Wl,-z,noexecstack' %build #make %{?_smp_mflags} doesn't work make %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install ## Resolve clashes with LAM/OPENMP: mpicxx mpicc mpif77 mpif90 mpiexec mpirun rm -f %{buildroot}%{_bindir}/{mpiexec,mpirun,mpdrun} mv %{buildroot}%{_mandir}/man1/{,mp-}mpiexec.1 pushd %{buildroot}%{_bindir}/ ln -s mpiexec.py mpdrun popd mkdir -p %{buildroot}%{_datadir}/%{name}/bin%{mode} for b in mpicxx mpicc mpif77 mpif90; do mv %{buildroot}%{_bindir}/$b %{buildroot}%{_bindir}/mp%{mode}-$b; mv %{buildroot}%{_mandir}/man1/$b.1 %{buildroot}%{_mandir}/man1/mp-$b.1; ln -s ../../../bin/mp%{mode}-$b %{buildroot}%{_datadir}/%{name}/bin%{mode}/$b done mv %{buildroot}%{_libdir}/%{name}/pkgconfig %{buildroot}%{_libdir}/ chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc ## Create modules file sed 's#@DATADIR@#'%{_datadir}/%{name}'#;s#@LIBDIR@#'%{_libdir}/%{name}'#;s#@INCLUDEDIR@#'%{_includedir}/%{name}'#;s#@MODE@#'%{mode}'#' < %SOURCE1 > %{buildroot}%{_datadir}/%{name}/%{name}.module #:; # Manually copy doc file here instead of the %files section to prevent the rpm #build script from throwing the other things in there out cp -pr CHANGES COPYRIGHT README RELEASE_NOTES %{buildroot}%{_docdir}/%{name}-%{version}/ cp -pr src/mpe2/README %{buildroot}%{_docdir}/%{name}-%{version}/README.mpe # Silence rpmlint sed -i '/^#! \//,1 d' %{buildroot}%{_sysconfdir}/%{name}-%{mode}/{mpi*.conf,mpe_help.*} #Rename the MPI routine manpages, to avoid conflict with openmpi for man in %{buildroot}%{_mandir}/man3/*; do manf=`basename $man .3` mv %{buildroot}%{_mandir}/man3/$manf.3 %{buildroot}%{_mandir}/man4/$manf.4 sed s/3/4/1 -i %{buildroot}%{_mandir}/man4/$manf.4 done # The uninstall script that is installed in this directory is not needed in rpm # packaging rm -rf %{buildroot}%{_sbindir}/mpe* find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf %{buildroot} %post /usr/sbin/alternatives \ --install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py 41 \ --slave %{_bindir}/mpiexec mpi-exec %{_bindir}/mpiexec.py \ --slave %{_mandir}/man1/mpiexec.1.gz mpi-exec-man \ %{_mandir}/man1/mp-mpiexec.1.gz \ --slave %{_mandir}/man1/mpif90.1.gz mpif90-man \ %{_mandir}/man1/mp-mpif90.1.gz \ --slave %{_mandir}/man1/mpif77.1.gz mpif77-man \ %{_mandir}/man1/mp-mpif77.1.gz \ --slave %{_mandir}/man1/mpicc.1.gz mpicc-man \ %{_mandir}/man1/mp-mpicc.1.gz \ --slave %{_mandir}/man1/mpic++.1.gz mpic++-man \ %{_mandir}/man1/mp-mpicxx.1.gz %preun /usr/sbin/alternatives --remove mpi-run %{_bindir}/mpiexec.py %post devel /usr/sbin/alternatives \ --install %{_bindir}/mpicc mpicc %{_bindir}/mp%{mode}-mpicc %{priority}\ --slave %{_bindir}/mpicxx mpicxx %{_bindir}/mp%{mode}-mpicxx \ --slave %{_bindir}/mpif90 mpif90 %{_bindir}/mp%{mode}-mpif90 \ --slave %{_bindir}/mpif77 mpif77 %{_bindir}/mp%{mode}-mpif77 %preun devel /usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{mode}-mpicc %files %defattr(-,root,root,-) %{_bindir}/* %exclude %{_bindir}/mp*.pyc %exclude %{_bindir}/mp*.pyo %exclude %{_bindir}/mp%{mode}-mpicc %exclude %{_bindir}/mp%{mode}-mpicxx %exclude %{_bindir}/mp%{mode}-mpif90 %exclude %{_bindir}/mp%{mode}-mpif77 %doc %{_docdir}/%{name}-%{version}/ %{_mandir}/man1/* %files libs %defattr(-,root,root,-) %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.jar %{_libdir}/%{name}/mpe*.o %{_libdir}/%{name}/*.so.* %config %{_sysconfdir}/%{name}-%{mode}/ %files devel %defattr(-,root,root,-) %{_bindir}/mp%{mode}-mpicc %{_bindir}/mp%{mode}-mpicxx %{_bindir}/mp%{mode}-mpif90 %{_bindir}/mp%{mode}-mpif77 %{_includedir}/* %{_libdir}/%{name}/*.a %{_libdir}/%{name}/*.so %{_libdir}/%{name}/trace_rlog/libTraceInput.so %{_libdir}/pkgconfig/%{name}-ch3.pc %dir %{_datadir}/%{name} %{_datadir}/%{name}/bin%{mode}/ %{_datadir}/%{name}/%{name}.module %{_datadir}/%{name}/examples* %{_datadir}/%{name}/logfiles/ %{_mandir}/man4/*.gz %doc README.testing README.romio README.developer %changelog * Fri Mar 06 2009 Deji Akingunola - 1.0.8-2 - Fix the source url, pointed out from package review - Finally accepted to go into Fedora * Sat Oct 24 2008 Deji Akingunola - 1.0.8-1 - Update to the 1.0.8 - Configure with the default nemesis channel * Fri May 16 2008 Deji Akingunola - 1.0.7-5 - Update the alternate compiler/compiler flags macro to allow overriding it from command-line * Wed Apr 16 2008 Deji Akingunola - 1.0.7-4 - Apply patch from Orion Poplawski to silence rpmlint * Tue Apr 15 2008 Deji Akingunola - 1.0.7-3 - Add a note on the device/channels configuration options used, and - Fix logfile listings as suggested by Orion Poplawski (Package review, 171993) * Tue Apr 15 2008 Deji Akingunola - 1.0.7-2 - Fix the source url * Sat Apr 05 2008 Deji Akingunola - 1.0.7-1 - Update to 1.0.7 * Mon Oct 15 2007 Deji Akingunola - 1.0.6p1-1 - Update to 1.0.6p1 * Mon Oct 15 2007 Deji Akingunola - 1.0.6-1 - New version upgrade * Mon Jul 31 2007 Deji Akingunola - 1.0.5p4-4 - Create a -mpi-manpages subpackage for the MPI routines manuals * Fri Jul 27 2007 Deji Akingunola - 1.0.5p4-3 - Fix java-gcj-compat BR - Handle upgrades in the post scripts * Mon Jun 12 2007 Deji Akingunola - 1.0.5p4-2 - Fix typos and make other adjustments arising from Fedora package reviews * Mon Jun 12 2007 Deji Akingunola - 1.0.5p4-1 - Patch #4 release * Mon Feb 12 2007 Deji Akingunola - 1.0.5p2-1 - Patch #2 release * Tue Jan 09 2007 Deji Akingunola - 1.0.5p1-1 - New release with manpages - Create a -libs subpackage as it's done in Fedora's openmpi to help with multi-libs packaging - Disable modules support (until I can properly figure it out) * Wed Dec 27 2006 Deji Akingunola - 1.0.5-1 - New release * Sat Nov 18 2006 Deji Akingunola - 1.0.4p1-2 - Set the java_sdk directory so all java bit work * Sat Sep 02 2006 Deji Akingunola - 1.0.4p1-1 - Update to version 1.0.4p1 - Cleanup up spec file to use alternatives similarly to FC's openmpi * Wed Aug 02 2006 Deji Akingunola - 1.0.4-1 - Update to version 1.0.4 * Thu May 18 2006 Deji Akingunola - 1.0.3-3 - Add missing BRs (Orion Polawski) * Mon Apr 10 2006 Deji Akingunola - 1.0.3-2 - Rewrite the spec, borrowing extensively from openmpi's spec by Jason Vas Dias - Allows use of environment modules and alternatives * Fri Nov 25 2005 Deji Akingunola - 1.0.3-1 - Update to new version * Sat Oct 15 2005 Deji Akingunola - 1.0.2p1-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mpich2/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:25:36 -0000 1.1 +++ .cvsignore 9 Mar 2009 12:53:57 -0000 1.2 @@ -0,0 +1 @@ +mpich2-1.0.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mpich2/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:25:36 -0000 1.1 +++ sources 9 Mar 2009 12:53:57 -0000 1.2 @@ -0,0 +1 @@ +d9dfb6e38d7ca6f8ad92a191a413ee57 mpich2-1.0.8.tar.gz From langel at fedoraproject.org Mon Mar 9 13:08:22 2009 From: langel at fedoraproject.org (Lillian Angel) Date: Mon, 9 Mar 2009 13:08:22 +0000 (UTC) Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec, 1.110, 1.111 sources, 1.61, 1.62 Message-ID: <20090309130822.1448C70116@cvs1.fedora.phx.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16713 Modified Files: java-1.6.0-openjdk.spec sources Log Message: * Mon Mar 9 2009 Lillian Angel - 1:1.6.0-14.b14 - Updated sources. - Resolves: rhbz#489029 Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- java-1.6.0-openjdk.spec 2 Mar 2009 19:42:42 -0000 1.110 +++ java-1.6.0-openjdk.spec 9 Mar 2009 13:07:51 -0000 1.111 @@ -921,6 +921,10 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so %changelog +* Mon Mar 9 2009 Lillian Angel - 1:1.6.0-14.b14 +- Updated sources. +- Resolves: rhbz#489029 + * Mon Mar 2 2009 Lillian Angel - 1:1.6.0-14.b14 - Reverting last change. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 25 Feb 2009 18:54:35 -0000 1.61 +++ sources 9 Mar 2009 13:07:51 -0000 1.62 @@ -5,4 +5,4 @@ c8f78d48ac83987bc2adebeebcd354e9 hotspot.tar.gz 786ab31817cbd902a7211cd6a6161750 netbeans-profiler-visualvm_release65_mod.tar.gz 1174486e82a65840b44c47166d79f212 visualvm-11-src.tar.gz -5632f278539a2aa71e1581040744843a icedtea6-1.4.1.tar.gz +a9559a8fb7b688ca2d78dd53db2ceef0 icedtea6-1.4.1.tar.gz From pmatilai at fedoraproject.org Mon Mar 9 13:08:31 2009 From: pmatilai at fedoraproject.org (Panu Matilainen) Date: Mon, 9 Mar 2009 13:08:31 +0000 (UTC) Subject: rpms/rpm/devel rpm-4.7.0-beta1-fstates.patch, NONE, 1.1 rpm-4.7.0-beta1-installangs.patch, NONE, 1.1 rpm.spec, 1.336, 1.337 Message-ID: <20090309130831.B486670116@cvs1.fedora.phx.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/rpm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16764 Modified Files: rpm.spec Added Files: rpm-4.7.0-beta1-fstates.patch rpm-4.7.0-beta1-installangs.patch Log Message: - fix _install_langs behavior (#489235) - fix recording of file states into rpmdb on install rpm-4.7.0-beta1-fstates.patch: --- NEW FILE rpm-4.7.0-beta1-fstates.patch --- commit 2b4507d852ac8469608bef2ce8e219d76b0c543e Author: Panu Matilainen Date: Mon Mar 9 14:48:47 2009 +0200 Fix RPMTAG_FILESTATES in rpmdb - sizeof(rpmfileState) != sizeof(char), and char is what goes to headers resulting in some pretty weird states despite being correct on disk - add rpm_fstate_t type for the header presentation of states and use where appropriate diff --git a/lib/psm.c b/lib/psm.c index 112d344..b493b33 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -1417,11 +1417,11 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage) rpm_time_t installTime = (rpm_time_t) time(NULL); rpmfs fs = rpmteGetFileStates(psm->te); rpm_count_t fc = rpmfsFC(fs); - rpmfileState * fileStates = rpmfsGetStates(fs); + rpm_fstate_t * fileStates = rpmfsGetStates(fs); Header h = rpmteHeader(psm->te); if (fileStates != NULL && fc > 0) { - headerPutChar(h, RPMTAG_FILESTATES, (char *) fileStates, fc); + headerPutChar(h, RPMTAG_FILESTATES, fileStates, fc); } headerPutUint32(h, RPMTAG_INSTALLTIME, &installTime, 1); diff --git a/lib/rpmte.c b/lib/rpmte.c index 130c1d9..bda5411 100644 --- a/lib/rpmte.c +++ b/lib/rpmte.c @@ -988,7 +988,7 @@ rpmfileState rpmfsGetState(rpmfs fs, unsigned int ix) return RPMFILE_STATE_MISSING; } -rpmfileState * rpmfsGetStates(rpmfs fs) +rpm_fstate_t * rpmfsGetStates(rpmfs fs) { return fs->states; } diff --git a/lib/rpmte_internal.h b/lib/rpmte_internal.h index 5706d56..3ce4112 100644 --- a/lib/rpmte_internal.h +++ b/lib/rpmte_internal.h @@ -36,10 +36,12 @@ struct sharedFileInfo_s { int otherFileNum; }; +typedef char rpm_fstate_t; + struct rpmfs_s { unsigned int fc; - rpmfileState * states; + rpm_fstate_t * states; rpmFileAction * actions; /*!< File disposition(s). */ sharedFileInfo replaced; /*!< (TR_ADDED) to be replaced files in the rpmdb */ @@ -106,7 +108,7 @@ rpmfileState rpmfsGetState(rpmfs fs, unsigned int ix); * May return NULL */ RPM_GNUC_INTERNAL -rpmfileState * rpmfsGetStates(rpmfs fs); +rpm_fstate_t * rpmfsGetStates(rpmfs fs); RPM_GNUC_INTERNAL rpmFileAction rpmfsGetAction(rpmfs fs, unsigned int ix); rpm-4.7.0-beta1-installangs.patch: --- NEW FILE rpm-4.7.0-beta1-installangs.patch --- commit cdcbd324fe41cd729434576200593c0fbda44a19 Author: Panu Matilainen Date: Mon Mar 9 14:57:46 2009 +0200 Unbreak %_install_langs handling (rhbz#489235) - using rpmfiFLangs() in skipFiles() broke the %_install_langs logic, causing all files to be skipped if install langs, eek diff --git a/lib/transaction.c b/lib/transaction.c index 2940634..25a147a 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -488,7 +488,8 @@ static void skipFiles(const rpmts ts, rpmte p) /* * Skip i18n language specific files. */ - if (ts->installLangs != NULL && (flangs = rpmfiFLangs(fi)) != NULL) { + flangs = (ts->installLangs != NULL) ? rpmfiFLangs(fi) : NULL; + if (flangs != NULL && *flangs != '\0') { const char *l, *le; char **lang; for (lang = ts->installLangs; *lang != NULL; lang++) { Index: rpm.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v retrieving revision 1.336 retrieving revision 1.337 diff -u -r1.336 -r1.337 --- rpm.spec 8 Mar 2009 09:52:55 -0000 1.336 +++ rpm.spec 9 Mar 2009 13:08:01 -0000 1.337 @@ -25,7 +25,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: 0.%{snapver}.2%{?dist} +Release: 0.%{snapver}.3%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 @@ -44,6 +44,8 @@ # Patches already in upstream Patch200: rpm-4.7.0-beta1-srcrpm-macros.patch +Patch201: rpm-4.7.0-beta1-fstates.patch +Patch202: rpm-4.7.0-beta1-installangs.patch # These are not yet upstream Patch300: rpm-4.7.0-extra-provides.patch @@ -185,6 +187,8 @@ %patch3 -p1 -b .fedora-specspo %patch200 -p1 -b .srcrpm-macros +%patch201 -p1 -b .fstates +%patch202 -p1 -b .installangs %patch300 -p1 -b .extra-prov @@ -391,6 +395,10 @@ %doc doc/librpm/html/* %changelog +* Mon Mar 09 2009 Panu Matilainen - 4.7.0-0.beta1.3 +- fix _install_langs behavior (#489235) +- fix recording of file states into rpmdb on install + * Sun Mar 08 2009 Panu Matilainen - 4.7.0-0.beta1.2 - load macros before creating directories on src.rpm install (#489104) From caolanm at fedoraproject.org Mon Mar 9 13:14:39 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 9 Mar 2009 13:14:39 +0000 (UTC) Subject: rpms/libfonts/devel libfonts-0.4.0-builddepends.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libfonts.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090309131439.E889670116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/libfonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18240 Modified Files: .cvsignore libfonts.spec sources Added Files: libfonts-0.4.0-builddepends.patch Log Message: latest version libfonts-0.4.0-builddepends.patch: --- NEW FILE libfonts-0.4.0-builddepends.patch --- diff -ru libfonts-0.4.0.orig/build.properties libfonts-0.4.0/build.properties --- libfonts-0.4.0.orig/build.properties 2009-03-09 12:44:45.000000000 +0000 +++ libfonts-0.4.0/build.properties 2009-03-09 12:47:54.000000000 +0000 @@ -37,11 +37,11 @@ ########################################################### # # Used libraries ... -dependency.release.core.libbase=libbase-1.0.0.jar +dependency.release.core.libbase=libbase.jar dependency.release.core.commons-logging=commons-logging-api.jar -dependency.release.core.libloader=libloader-0.4.0.jar +dependency.release.core.libloader=libloader.jar -dependency.release.core.itext=itext-1.5.2.jar +dependency.release.core.itext=itext.jar ############################################################## # Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libfonts/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Jul 2008 23:05:34 -0000 1.2 +++ .cvsignore 9 Mar 2009 13:14:09 -0000 1.3 @@ -1 +1 @@ -libfonts-0.3.4.tar.gz +libfonts-0.4.0.tar.gz Index: libfonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/libfonts/devel/libfonts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libfonts.spec 25 Feb 2009 14:47:38 -0000 1.2 +++ libfonts.spec 9 Mar 2009 13:14:09 -0000 1.3 @@ -2,16 +2,16 @@ %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: libfonts -Version: 0.3.4 -Release: 2%{?dist} +Version: 0.4.0 +Release: 1%{?dist} Summary: TrueType Font Layouting License: LGPLv2+ Group: System Environment/Libraries Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz URL: http://reporting.pentaho.org/ -BuildRequires: ant, java-devel, jpackage-utils, jcommon, libloader +BuildRequires: ant, java-devel, jpackage-utils, jcommon, libloader >= 0.3.7-1, itext Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: java, jpackage-utils, jcommon, libloader >= 0.3.7-1 +Requires: java, jpackage-utils, jcommon, libloader >= 0.3.7-1, itext %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 @@ -20,6 +20,8 @@ BuildArch: noarch %endif +Patch0: libfonts-0.4.0-builddepends.patch + %description LibFonts is a library developed to support advanced layouting in JFreeReport. This library allows to read TrueType-Font files to extract layouting specific @@ -36,8 +38,9 @@ %prep %setup -q +%patch0 -p1 -b .builddepends find . -name "*.jar" -exec rm -f {} \; -build-jar-repository -s -p lib jcommon-1.0.12 libloader-0.3.7 +build-jar-repository -s -p lib libbase commons-logging-api libloader itext %build ant compile javadoc @@ -90,6 +93,9 @@ %{_javadocdir}/%{name} %changelog +* Mon Mar 09 2009 Caolan McNamara 0.4.0-1 +- latest version + * Wed Feb 25 2009 Fedora Release Engineering - 0.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libfonts/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Jul 2008 23:05:34 -0000 1.2 +++ sources 9 Mar 2009 13:14:09 -0000 1.3 @@ -1 +1 @@ -8369400998f44a37812c419797666691 libfonts-0.3.4.tar.gz +e7ffdf8d43f45d22c2854575b0f1e6a8 libfonts-0.4.0.tar.gz From caolanm at fedoraproject.org Mon Mar 9 13:25:20 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 9 Mar 2009 13:25:20 +0000 (UTC) Subject: rpms/pentaho-libxml/devel libxml-1.0.0-rc.depends.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pentaho-libxml.spec, 1.2, 1.3 sources, 1.2, 1.3 libxml-0.9.11-depends.patch, 1.1, NONE Message-ID: <20090309132520.D75D470116@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/pentaho-libxml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20630 Modified Files: .cvsignore pentaho-libxml.spec sources Added Files: libxml-1.0.0-rc.depends.patch Removed Files: libxml-0.9.11-depends.patch Log Message: latest version libxml-1.0.0-rc.depends.patch: --- NEW FILE libxml-1.0.0-rc.depends.patch --- diff -ru libxml-1.0.0-rc.orig/build.properties libxml-1.0.0-rc/build.properties --- libxml-1.0.0-rc.orig/build.properties 2009-03-09 13:18:13.000000000 +0000 +++ libxml-1.0.0-rc/build.properties 2009-03-09 13:21:12.000000000 +0000 @@ -45,8 +45,8 @@ # Used by: core libraries dependency.release.core.commons-logging=commons-logging-api.jar -dependency.release.core.libbase=libbase-1.0.0-rc.jar -dependency.release.core.libloader=libloader-0.4.0-rc.jar +dependency.release.core.libbase=libbase.jar +dependency.release.core.libloader=libloader.jar # # GnuJaxp is optional if there is an other JAXP-implementation Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pentaho-libxml/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Aug 2008 17:58:26 -0000 1.2 +++ .cvsignore 9 Mar 2009 13:24:50 -0000 1.3 @@ -1 +1 @@ -libxml-0.9.11.tar.gz +libxml-1.0.0-rc.tar.gz Index: pentaho-libxml.spec =================================================================== RCS file: /cvs/pkgs/rpms/pentaho-libxml/devel/pentaho-libxml.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pentaho-libxml.spec 26 Feb 2009 10:34:20 -0000 1.2 +++ pentaho-libxml.spec 9 Mar 2009 13:24:50 -0000 1.3 @@ -3,16 +3,16 @@ %define origname libxml Name: pentaho-libxml -Version: 0.9.11 -Release: 2%{?dist} +Version: 1.0.0 +Release: 0.1.rc%{?dist} Summary: Namespace aware SAX-Parser utility library License: LGPLv2+ Group: System Environment/Libraries -Source: http://downloads.sourceforge.net/jfreereport/%{origname}-%{version}.tar.gz +Source: http://downloads.sourceforge.net/jfreereport/%{origname}-1.0.0-rc.tar.gz URL: http://reporting.pentaho.org/ -BuildRequires: ant, java-devel, jpackage-utils, jcommon, libloader +BuildRequires: ant, java-devel, jpackage-utils, libbase, libloader Buildroot: %{_tmppath}/%{origname}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: java, jpackage-utils, jcommon, libloader >= 0.3.7 +Requires: java, jpackage-utils, libbase >= 1.0.0, libloader >= 0.3.7 %if %{with_gcj} BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 @@ -20,7 +20,7 @@ %else BuildArch: noarch %endif -Patch1: libxml-0.9.11-depends.patch +Patch1: libxml-1.0.0-rc.depends.patch %description Pentaho LibXML is a namespace aware SAX-Parser utility library. It eases the @@ -36,10 +36,10 @@ Javadoc for %{name}. %prep -%setup -q -n %{origname}-%{version} +%setup -q -n %{origname}-%{version}-rc %patch1 -p1 -b .depends find . -name "*.jar" -exec rm -f {} \; -build-jar-repository -s -p lib jcommon libloader +build-jar-repository -s -p lib commons-logging-api libbase libloader %build ant compile javadoc @@ -52,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp -p %{origname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{origname}.jar +cp -p %{origname}-%{version}-rc.jar $RPM_BUILD_ROOT%{_javadir}/%{origname}.jar mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{origname} cp -rp javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{origname} @@ -92,6 +92,9 @@ %{_javadocdir}/%{origname} %changelog +* Mon Mar 09 2009 Caolan McNamara 1.0.0-0.1.rc +- latest version + * Thu Feb 26 2009 Fedora Release Engineering - 0.9.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pentaho-libxml/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Aug 2008 17:58:26 -0000 1.2 +++ sources 9 Mar 2009 13:24:50 -0000 1.3 @@ -1 +1 @@ -ebe912634961bc2540b08ed89a1199fb libxml-0.9.11.tar.gz +bfde7e230373c98ec86327356d5fe0f0 libxml-1.0.0-rc.tar.gz --- libxml-0.9.11-depends.patch DELETED --- From mhlavink at fedoraproject.org Mon Mar 9 13:25:56 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 9 Mar 2009 13:25:56 +0000 (UTC) Subject: rpms/setuptool/devel setuptool.spec,1.34,1.35 Message-ID: <20090309132556.313E470116@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/setuptool/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20735 Modified Files: setuptool.spec Log Message: fix buildrequires Index: setuptool.spec =================================================================== RCS file: /cvs/extras/rpms/setuptool/devel/setuptool.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- setuptool.spec 9 Mar 2009 12:41:28 -0000 1.34 +++ setuptool.spec 9 Mar 2009 13:25:25 -0000 1.35 @@ -1,13 +1,13 @@ Name: setuptool Version: 1.19.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A text mode system configuration tool License: GPLv2+ Group: Applications/System Url: http://git.fedorahosted.org/git/?p=setuptool.git Source: setuptool-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: newt-devel, gettext, perl-XML-Parser +BuildRequires: newt-devel, gettext, perl-XML-Parser, glib2-devel, intltool Requires: usermode %description @@ -44,6 +44,9 @@ %config %{_sysconfdir}/setuptool.d/* %changelog +* Mon Mar 09 2009 Michal Hlavinka - 1.19.5-2 +- fix buildrequires + * Mon Mar 09 2009 Michal Hlavinka - 1.19.5-1 - new version (only translations updated) From jorton at fedoraproject.org Mon Mar 9 13:33:19 2009 From: jorton at fedoraproject.org (Joe Orton) Date: Mon, 9 Mar 2009 13:33:19 +0000 (UTC) Subject: rpms/neon/F-10 neon.spec, 1.47, 1.48 sources, 1.14, 1.15 neon-0.28.2-nocomp.patch, 1.1, NONE neon-0.28.2.tar.gz.asc, 1.1, NONE neon-0.28.3-gnutls.patch, 1.1, NONE Message-ID: <20090309133319.348F170034@cvs1.fedora.phx.redhat.com> Author: jorton Update of /cvs/extras/rpms/neon/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23249 Modified Files: neon.spec sources Removed Files: neon-0.28.2-nocomp.patch neon-0.28.2.tar.gz.asc neon-0.28.3-gnutls.patch Log Message: * Fri Mar 6 2009 Joe Orton 0.28.4-1 - update to 0.28.4 - use install-p in "make install" (Robert Scheck, #226189) Index: neon.spec =================================================================== RCS file: /cvs/extras/rpms/neon/F-10/neon.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- neon.spec 3 Feb 2009 15:59:48 -0000 1.47 +++ neon.spec 9 Mar 2009 13:32:48 -0000 1.48 @@ -1,13 +1,12 @@ Summary: An HTTP and WebDAV client library Name: neon -Version: 0.28.3 -Release: 2.1%{?dist} +Version: 0.28.4 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.webdav.org/neon/ Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz Patch0: neon-0.27.0-multilib.patch -Patch1: neon-0.28.3-gnutls.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel, gnutls-devel, zlib-devel, krb5-devel BuildRequires: pkgconfig, pakchois-devel @@ -34,7 +33,6 @@ %prep %setup -q %patch0 -p1 -b .multilib -%patch1 -p1 -b .gnutls %build export CC="%{__cc} -pthread" @@ -47,7 +45,7 @@ %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" sed -ri "/^dependency_libs/{s,-l[^ ']*,,g}" \ $RPM_BUILD_ROOT%{_libdir}/libneon.la @@ -77,6 +75,10 @@ %{_libdir}/*.so %changelog +* Fri Mar 6 2009 Joe Orton 0.28.4-1 +- update to 0.28.4 +- use install-p in "make install" (Robert Scheck, #226189) + * Tue Feb 3 2009 Joe Orton 0.28.3-2.1 - GnuTLS fixes from upstream (#445044) Index: sources =================================================================== RCS file: /cvs/extras/rpms/neon/F-10/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 28 Aug 2008 18:20:43 -0000 1.14 +++ sources 9 Mar 2009 13:32:48 -0000 1.15 @@ -1 +1 @@ -47599a328862ce64ac3c52726d6daa12 neon-0.28.3.tar.gz +6c3b94362af743d046e198e9fcbe4a85 neon-0.28.4.tar.gz --- neon-0.28.2-nocomp.patch DELETED --- --- neon-0.28.2.tar.gz.asc DELETED --- --- neon-0.28.3-gnutls.patch DELETED --- From ovasik at fedoraproject.org Mon Mar 9 13:36:58 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Mon, 9 Mar 2009 13:36:58 +0000 (UTC) Subject: rpms/taskjuggler/devel taskjuggler.spec, 1.28, 1.29 taskjuggler-2.4.1-no-kdepim3.patch, 1.1, NONE Message-ID: <20090309133658.3F55E70034@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/taskjuggler/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24088 Modified Files: taskjuggler.spec Removed Files: taskjuggler-2.4.1-no-kdepim3.patch Log Message: build with ICal support again (#488347, #467136) Index: taskjuggler.spec =================================================================== RCS file: /cvs/extras/rpms/taskjuggler/devel/taskjuggler.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- taskjuggler.spec 3 Mar 2009 12:10:12 -0000 1.28 +++ taskjuggler.spec 9 Mar 2009 13:36:27 -0000 1.29 @@ -1,6 +1,6 @@ Name: taskjuggler Version: 2.4.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Project management tool Group: Applications/Productivity @@ -14,7 +14,7 @@ %if 0%{?fedora} < 10 BuildRequires: kdepim-devel %else -%define nokdepim3 1 +BuildRequires: kdepim3-devel BuildRequires: kdelibs3-devel %endif # need gettext for untranslated .po files @@ -44,8 +44,6 @@ %prep %setup -q -%if 0%{?nokdepim3} -%patch0 -p1 -b .no-kdepim3 # timestamp magic to keep autotools from regenerating everything sleep 1 touch acinclude.m4 configure.files configure.in subdirs @@ -125,6 +123,9 @@ %{_libdir}/libtaskjuggler* %changelog +* Mon Mar 09 2009 Ondrej Vasik - 2.4.1-7 +- build with ICal support again (#488347, #467136) + * Tue Mar 03 2009 Ondrej Vasik - 2.4.1-6 - fix build requires, rebuild for F11 --- taskjuggler-2.4.1-no-kdepim3.patch DELETED --- From atkac at fedoraproject.org Mon Mar 9 13:38:03 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Mon, 9 Mar 2009 13:38:03 +0000 (UTC) Subject: rpms/dump/devel dump-rh356121.patch,NONE,1.1 dump.spec,1.50,1.51 Message-ID: <20090309133803.D49A870034@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/dump/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24386 Modified Files: dump.spec Added Files: dump-rh356121.patch Log Message: - correct manual page (dump level is 0 by default, #356121) dump-rh356121.patch: --- NEW FILE dump-rh356121.patch --- diff -up dump-0.4b41/dump/dump.8.in.rh356121 dump-0.4b41/dump/dump.8.in --- dump-0.4b41/dump/dump.8.in.rh356121 2009-03-09 11:44:29.000000000 +0100 +++ dump-0.4b41/dump/dump.8.in 2009-03-09 11:45:30.000000000 +0100 @@ -94,7 +94,7 @@ option below). A level number above 0, i .B dump to copy all files new or modified since the last dump of a lower level. The -default level is 9. Historically only levels 0 to 9 were usable in +default level is 0. Historically only levels 0 to 9 were usable in dump, this version is able to understand any integer as a dump level. .TP .BI \-a Index: dump.spec =================================================================== RCS file: /cvs/pkgs/rpms/dump/devel/dump.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- dump.spec 24 Feb 2009 12:58:51 -0000 1.50 +++ dump.spec 9 Mar 2009 13:37:33 -0000 1.51 @@ -3,7 +3,7 @@ Summary: Programs for backing up and restoring ext2/ext3 filesystems Name: dump Version: 0.4b41 -Release: 11%{?dist} +Release: 12%{?dist} License: BSD Group: Applications/Archiving URL: http://dump.sourceforge.net/ @@ -14,6 +14,7 @@ Patch1: dump-dmfix.patch Patch2: dump-immutable.patch Patch4: dump-0.4b41-libtinfo.patch +Patch5: dump-rh356121.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2 BuildRequires: zlib-devel, bzip2-devel, automake @@ -52,6 +53,8 @@ %patch1 -p1 -b .dmfix %patch2 -p1 -b .orig %patch4 -p1 -b .libtinfo +%patch5 -p1 -b .rh356121 + for i in THANKS MAINTAINERS COPYRIGHT CHANGES; do iconv -f iso-8859-1 -t utf-8 $i -o $i.new touch -r $i $i.new @@ -123,6 +126,9 @@ %{_mandir}/man8/rmt.8* %changelog +* Mon Mar 09 2009 Adam Tkac 0.4b41-12 +- correct manual page (dump level is 0 by default, #356121) + * Tue Feb 24 2009 Fedora Release Engineering - 0.4b41-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rdieter at fedoraproject.org Mon Mar 9 13:39:04 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 9 Mar 2009 13:39:04 +0000 (UTC) Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.2.1-kde#185736.patch, NONE, 1.1 kdebase-workspace.spec, 1.197, 1.198 Message-ID: <20090309133904.EE44D70034@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24663 Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.2.1-kde#185736.patch Log Message: * Mon Mar 09 2009 Rex Dieter - 4.2.1-4 - kde 4.2 update crashes plasma (kdebug#185736) kdebase-workspace-4.2.1-kde#185736.patch: --- NEW FILE kdebase-workspace-4.2.1-kde#185736.patch --- --- branches/KDE/4.2/kdebase/workspace/plasma/shells/desktop/panelview.cpp 2009/02/24 04:51:03 930724 +++ branches/KDE/4.2/kdebase/workspace/plasma/shells/desktop/panelview.cpp 2009/03/03 23:39:55 934863 @@ -203,6 +203,11 @@ m_triggerEntered(false) { Q_ASSERT(qobject_cast(panel->scene())); + + m_strutsTimer = new QTimer(this); + m_strutsTimer->setSingleShot(true); + connect(m_strutsTimer, SIGNAL(timeout()), this, SLOT(updateStruts())); + if (panel) { connect(panel, SIGNAL(destroyed(QObject*)), this, SLOT(panelDeleted())); connect(panel, SIGNAL(toolBoxToggled()), this, SLOT(togglePanelController())); @@ -248,10 +253,6 @@ KWindowSystem::setOnAllDesktops(winId(), true); QTimer::singleShot(0, this, SLOT(init())); - - m_strutsTimer = new QTimer(this); - m_strutsTimer->setSingleShot(true); - connect(m_strutsTimer,SIGNAL(timeout()),this,SLOT(updateStruts())); } PanelView::~PanelView() Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- kdebase-workspace.spec 4 Mar 2009 19:15:58 -0000 1.197 +++ kdebase-workspace.spec 9 Mar 2009 13:38:34 -0000 1.198 @@ -8,7 +8,7 @@ Name: kdebase-workspace Version: 4.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -42,6 +42,8 @@ Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch # from 4.3: http://bugs.kde.org/180576 Patch103: kdebase-workspace-4.2.0-kde#180576.patch +# 4.2 , http://bugs.kde.org/185736 +Patch104: kdebase-workspace-4.2.1-kde#185736.patch Provides: kdebase-kdm = 6:%{version}-%{release} Provides: kdm = %{version}-%{release} @@ -222,6 +224,8 @@ %patch101 -p0 -b .solid-bluetoothTrunkTo42 %endif %patch103 -p1 -b .kde#180576 +%patch104 -p5 -b .kde#185736 + %build @@ -370,6 +374,9 @@ %changelog +* Mon Mar 09 2009 Rex Dieter - 4.2.1-4 +- kde 4.2 update crashes plasma (kdebug#185736) + * Wed Mar 04 2009 Rex Dieter - 4.2.1-3 - move designer plugins to main/runtime (#487622) From atkac at fedoraproject.org Mon Mar 9 13:44:52 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Mon, 9 Mar 2009 13:44:52 +0000 (UTC) Subject: rpms/libbind/devel libbind.spec, NONE, 1.1 libbind60-install.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309134452.7D35870034@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/libbind/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26002 Modified Files: .cvsignore sources Added Files: libbind.spec libbind60-install.patch Log Message: - initial import of libbind --- NEW FILE libbind.spec --- %define PREVER b1 %define VERSION %{version}%{PREVER} Name: libbind Version: 6.0 Release: 0.3.%{PREVER}%{?dist} Summary: ISC's standard resolver library Group: System Environment/Libraries License: ISC URL: ftp://ftp.isc.org/isc/libbind/ Source0: ftp://ftp.isc.org/isc/libbind/%{VERSION}/libbind-%{VERSION}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: groff Patch0: libbind60-install.patch %description ISC's libbind provides the standard resolver library, for communicating with domain name servers, retrieving network host entries from /etc/hosts or via DNS, converting CIDR network addresses, perform Hesiod information lookups, retrieve network entries from /etc/networks, implement TSIG transaction/request security of DNS messages, perform name-to-address and address-to-name translations, utilize /etc/resolv.conf for resolver configuration %package devel Summary: Header files for ISC's libbind Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel libbind-devel provides header files and documentation for development with ISC's libbind %prep %setup -q -n libbind-%{VERSION} %patch0 -p1 -b .install %build %configure --with-libtool --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir}/bind # We don't want this... rm -f $RPM_BUILD_ROOT/%{_libdir}/libbind.la rm -rf $RPM_BUILD_ROOT/%{_mandir}/cat{3,5,7} # libbind manpages has traditionally libbind_* prefix # section 3 for all in getaddrinfo getipnodebyname gethostbyname getnameinfo getnetent \ hesiod inet_cidr resolver tsig; do oldname=$RPM_BUILD_ROOT/%{_mandir}/man3/$all.3 newname=$RPM_BUILD_ROOT/%{_mandir}/man3/libbind_$all.3 cp -p $oldname $newname rm -f $oldname done # section 5 for all in irs.conf resolver; do oldname=$RPM_BUILD_ROOT/%{_mandir}/man5/$all.5 newname=$RPM_BUILD_ROOT/%{_mandir}/man5/libbind_$all.5 cp -p $oldname $newname rm -f $oldname done # section 7 for all in hostname; do oldname=$RPM_BUILD_ROOT/%{_mandir}/man7/$all.7 newname=$RPM_BUILD_ROOT/%{_mandir}/man7/libbind_$all.7 cp -p $oldname $newname rm -f $oldname done %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc CHANGES COPYRIGHT README %{_libdir}/libbind.so.4 %{_libdir}/libbind.so.4.2.0 %files devel %defattr(-,root,root,-) %{_libdir}/libbind.so %{_includedir}/bind %{_mandir}/man3/libbind_* %{_mandir}/man5/libbind_* %{_mandir}/man7/libbind_* %changelog * Mon Mar 02 2009 Adam Tkac 6.0-0.3.b1 - removed unneeded Obsoletes/Provides * Thu Feb 19 2009 Adam Tkac 6.0-0.2.b1 - package review related fixes * Mon Feb 02 2009 Adam Tkac 6.0-0.1.b1 - initial package libbind60-install.patch: --- NEW FILE libbind60-install.patch --- diff -up libbind-6.0b1/Makefile.in.install libbind-6.0b1/Makefile.in --- libbind-6.0b1/Makefile.in.install 2009-02-02 16:36:05.000000000 +0100 +++ libbind-6.0b1/Makefile.in 2009-02-02 16:36:13.000000000 +0100 @@ -118,7 +118,7 @@ installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} install:: timestamp installdirs - ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libbind. at A@ ${DESTDIR}${libdir} + ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libbind. at A@ ${DESTDIR}${libdir} clean distclean:: rm -f libbind. at SA@ libbind.la Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libbind/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2009 20:11:06 -0000 1.1 +++ .cvsignore 9 Mar 2009 13:44:21 -0000 1.2 @@ -0,0 +1 @@ +libbind-6.0b1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libbind/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2009 20:11:06 -0000 1.1 +++ sources 9 Mar 2009 13:44:22 -0000 1.2 @@ -0,0 +1 @@ +c54fa30a0051d604bc4a8a9242b4604a libbind-6.0b1.tar.gz From mtasaka at fedoraproject.org Mon Mar 9 13:55:16 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Mon, 9 Mar 2009 13:55:16 +0000 (UTC) Subject: rpms/ruby-RMagick/devel ruby-RMagick.spec,1.25,1.26 Message-ID: <20090309135516.371E570034@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-RMagick/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29134 Modified Files: ruby-RMagick.spec Log Message: * Mon Mar 9 2009 Mamoru Tasaka - F-11: Rebuild against new ImageMagick Index: ruby-RMagick.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-RMagick/devel/ruby-RMagick.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- ruby-RMagick.spec 24 Feb 2009 12:36:39 -0000 1.25 +++ ruby-RMagick.spec 9 Mar 2009 13:54:45 -0000 1.26 @@ -16,7 +16,7 @@ Name: ruby-%{modname} Version: %{mainver} -Release: %{fedorarel}%{?betaver:.%betaver}%{?dist} +Release: %{fedorarel}%{?betaver:.%betaver}%{?dist}.1 Summary: Graphics Processing for Ruby and Ruby on Rails Group: Development/Languages @@ -95,6 +95,9 @@ %doc DOCDIR/HTML/* %changelog +* Mon Mar 9 2009 Mamoru Tasaka +- F-11: Rebuild against new ImageMagick + * Tue Feb 24 2009 Mamoru Tasaka - 2.9.1-2 - %%global-ize "nested" macro From dwalsh at fedoraproject.org Mon Mar 9 14:03:43 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 9 Mar 2009 14:03:43 +0000 (UTC) Subject: rpms/libselinux/devel libselinux.spec,1.360,1.361 Message-ID: <20090309140343.6603670034@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libselinux/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32618 Modified Files: libselinux.spec Log Message: * Mon Mar 9 2009 Dan Walsh - 2.0.78-3 - Fix URL Index: libselinux.spec =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.360 retrieving revision 1.361 diff -u -r1.360 -r1.361 --- libselinux.spec 6 Mar 2009 21:31:10 -0000 1.360 +++ libselinux.spec 9 Mar 2009 14:03:12 -0000 1.361 @@ -5,12 +5,12 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 2.0.78 -Release: 2%{?dist} +Release: 3%{?dist} License: Public Domain Group: System Environment/Libraries -Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz +Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz Patch: libselinux-rhat.patch -URL: http://www.nsa.gov/selinux +URL: http://www.selinuxproject.org BuildRequires: python-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig Requires: libsepol >= %{libsepolver} @@ -164,6 +164,9 @@ %{ruby_sitearch}/selinux.so %changelog +* Mon Mar 9 2009 Dan Walsh - 2.0.78-3 +- Fix URL + * Fri Mar 6 2009 Dan Walsh - 2.0.78-2 - Add substitute pattern - matchpathcon output <> on ENOENT From jorton at fedoraproject.org Mon Mar 9 14:04:25 2009 From: jorton at fedoraproject.org (Joe Orton) Date: Mon, 9 Mar 2009 14:04:25 +0000 (UTC) Subject: rpms/subversion/devel psvn-init.el, NONE, 1.1 subversion-1.5.6.tar.gz.asc, NONE, 1.1 .cvsignore, 1.28, 1.29 sources, 1.35, 1.36 subversion.spec, 1.130, 1.131 upstream, 1.21, 1.22 Message-ID: <20090309140425.88E1670034@cvs1.fedora.phx.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv364 Modified Files: .cvsignore sources subversion.spec upstream Added Files: psvn-init.el subversion-1.5.6.tar.gz.asc Log Message: * Mon Mar 9 2009 Joe Orton 1.5.6-1 - update to 1.5.6 - autoload psvn (#238491, Tom Tromey) --- NEW FILE psvn-init.el --- (defalias 'svn-examine 'svn-status) (autoload 'svn-status "psvn" "Examine the status of Subversion working copy in directory DIR.") --- NEW FILE subversion-1.5.6.tar.gz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABECAAYFAkmlkusACgkQCwOubk4kUXwZxwCgzH29yGPMxB5BhuqTyp+VFIfv sb4AoMU4dPm5/zn5r0dlWzPYDJg+6Gtd =qPyK -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABECAAYFAkmlujYACgkQvJ27E9sAokgXggCgjcQYY2hTOQv4Ky83FKc0GpJG 8IYAnA/2jIpHS/9ohEoXMRlZIAAF1qUP =XON9 -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABECAAYFAkmllUYACgkQokEGqRcG/W51UwCffPPA3zPH/jqmk2MKQ/0GBIOh FRAAoI+aVskN69uvjfH0HgFc6B84Zhdu =R4LR -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABECAAYFAkmmA8YACgkQ9o1G+2zNQDhytQCdHF6oU24LB8ghM+MMUmuA11QD adQAoLi5M+wSRjxqAobuuN251mu/qe8h =6B4V -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEABECAAYFAkmmbkYACgkQ/P1jBZgh97IwPQCbBdK0VxwR0OKeQ/oGLmIVxzEg hXIAmwceK3qgrCfIKqF1nx/D627vbGHP =Mls4 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 30 Jan 2009 12:45:10 -0000 1.28 +++ .cvsignore 9 Mar 2009 14:03:54 -0000 1.29 @@ -1,2 +1 @@ -subversion-1.5.4.tar.gz -subversion-1.5.5.tar.gz +subversion-1.5.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 30 Jan 2009 12:45:11 -0000 1.35 +++ sources 9 Mar 2009 14:03:55 -0000 1.36 @@ -1,2 +1 @@ -8ec0a6e756c35dc3ce20abb580040924 subversion-1.5.4.tar.gz -532c7d49b3cd33d712289a5ef03b7749 subversion-1.5.5.tar.gz +ad81e54058e64b5d399d3eda5f8bfcd1 subversion-1.5.6.tar.gz Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- subversion.spec 26 Feb 2009 03:30:14 -0000 1.130 +++ subversion.spec 9 Mar 2009 14:03:55 -0000 1.131 @@ -12,10 +12,10 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -Summary: Modern Version Control System designed to replace CVS +Summary: A Modern Concurrent Version Control System Name: subversion -Version: 1.5.5 -Release: 6 +Version: 1.5.6 +Release: 1 License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -23,6 +23,7 @@ Source1: subversion.conf Source3: filter-requires.sh Source4: http://www.xsteve.at/prg/emacs/psvn.el +Source5: psvn-init.el Patch2: subversion-0.20.1-deplibs.patch Patch3: subversion-1.5.1-rpath.patch Patch6: subversion-1.5.2-pie.patch @@ -60,7 +61,7 @@ %package -n mod_dav_svn Group: System Environment/Daemons -Summary: Apache server module for Subversion server +Summary: Apache httpd module for Subversion server Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing) Requires: subversion = %{version}-%{release} BuildRequires: httpd-devel >= 2.0.45 @@ -181,6 +182,9 @@ install -m 644 $RPM_SOURCE_DIR/psvn.el ${RPM_BUILD_ROOT}%{_datadir}/$f done +install -m 644 $RPM_SOURCE_DIR/psvn-init.el \ + ${RPM_BUILD_ROOT}%{_datadir}/%{_datadir}/emacs/site-lisp + # Rename authz_svn INSTALL doc for docdir ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL @@ -232,8 +236,8 @@ %{_mandir}/man*/* %{python_sitearch}/svn %{python_sitearch}/libsvn -%{_datadir}/emacs/site-lisp -%{_datadir}/xemacs/site-packages/lisp +%{_datadir}/emacs/site-lisp/*.el +%{_datadir}/xemacs/site-packages/lisp/*.el %dir %{_sysconfdir}/subversion %exclude %{_libdir}/libsvn_swig_perl* %exclude %{_libdir}/libsvn_swig_ruby* @@ -275,6 +279,10 @@ %endif %changelog +* Mon Mar 9 2009 Joe Orton 1.5.6-1 +- update to 1.5.6 +- autoload psvn (#238491, Tom Tromey) + * Wed Feb 25 2009 Fedora Release Engineering - 1.5.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: upstream =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/upstream,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- upstream 30 Jan 2009 12:45:11 -0000 1.21 +++ upstream 9 Mar 2009 14:03:55 -0000 1.22 @@ -1 +1 @@ -subversion-1.5.5.tar.gz +subversion-1.5.6.tar.gz From pkgdb at fedoraproject.org Mon Mar 9 14:07:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 14:07:21 +0000 Subject: [pkgdb] cryptsetup-luks: whulbert has requested watchbugzilla Message-ID: <20090309140741.6991F208544@bastion.fedora.phx.redhat.com> whulbert has requested the watchbugzilla acl on cryptsetup-luks (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks From pkgdb at fedoraproject.org Mon Mar 9 14:06:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 14:06:44 +0000 Subject: [pkgdb] cryptsetup-luks: whulbert has requested watchcommits Message-ID: <20090309140744.F04C120854A@bastion.fedora.phx.redhat.com> whulbert has requested the watchcommits acl on cryptsetup-luks (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks From atkac at fedoraproject.org Mon Mar 9 14:08:45 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Mon, 9 Mar 2009 14:08:45 +0000 (UTC) Subject: rpms/freeciv/devel freeciv.spec,1.44,1.45 Message-ID: <20090309140845.14E1170034@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/freeciv/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1655 Modified Files: freeciv.spec Log Message: - drop bind-devel BuildReq, it is not needed Index: freeciv.spec =================================================================== RCS file: /cvs/pkgs/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- freeciv.spec 24 Feb 2009 18:10:43 -0000 1.44 +++ freeciv.spec 9 Mar 2009 14:08:14 -0000 1.45 @@ -5,7 +5,7 @@ Name: freeciv Version: 2.1.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A multi-player strategy game Group: Amusements/Games @@ -18,7 +18,6 @@ BuildRequires: gtk2-devel BuildRequires: readline-devel BuildRequires: zlib-devel -BuildRequires: bind-devel BuildRequires: SDL_mixer-devel BuildRequires: esound-devel BuildRequires: ncurses-devel @@ -112,6 +111,9 @@ %changelog +* Mon Mar 09 2009 Adam Tkac - 2.1.8-3 +- drop bind-devel BuildReq, it is not needed + * Tue Feb 24 2009 Fedora Release Engineering - 2.1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rdieter at fedoraproject.org Mon Mar 9 14:12:46 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 9 Mar 2009 14:12:46 +0000 (UTC) Subject: rpms/kdegraphics/devel gwenview-fix-version.diff, NONE, 1.1 kdegraphics.spec, 1.191, 1.192 Message-ID: <20090309141246.388B870034@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegraphics/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3133 Modified Files: kdegraphics.spec Added Files: gwenview-fix-version.diff Log Message: * Mon Mar 09 2009 Rex Dieter 4.2.1-3 - gwenview-fix-version.diff gwenview-fix-version.diff: --- NEW FILE gwenview-fix-version.diff --- diff --git a/gwenview/app/main.cpp b/gwenview/app/main.cpp index 8bdf041..74dd694 100644 --- a/gwenview/app/main.cpp +++ b/gwenview/app/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) { "gwenview", /* appname */ 0, /* catalogName */ ki18n("Gwenview"), /* programName */ - "2.2.0"); /* version */ + "2.2.1"); /* version */ aboutData.setShortDescription(ki18n("An Image Viewer")); aboutData.setLicense(KAboutData::License_GPL); aboutData.setCopyrightStatement(ki18n("Copyright 2000-2008 Aur??lien G??teau")); Index: kdegraphics.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- kdegraphics.spec 8 Mar 2009 19:48:37 -0000 1.191 +++ kdegraphics.spec 9 Mar 2009 14:12:15 -0000 1.192 @@ -7,7 +7,7 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Name: kdegraphics #Obsoletes: kdegraphics4 < %{version}-%{release} @@ -20,6 +20,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## upstream patches +Patch100: gwenview-fix-version.diff BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdepimlibs-devel >= %{version} @@ -96,6 +97,8 @@ %setup -q -n kdegraphics-%{version} # upstream patches +%patch100 -p1 -b .gwenview_fix_version + %build @@ -210,6 +213,9 @@ %changelog +* Mon Mar 09 2009 Rex Dieter 4.2.1-3 +- gwenview-fix-version.diff + * Sun Mar 08 2009 Rex Dieter 4.2.1-2 - missing dependency on kipiplugin.desktop (#489218) From mlichvar at fedoraproject.org Mon Mar 9 14:16:11 2009 From: mlichvar at fedoraproject.org (Miroslav Lichvar) Date: Mon, 9 Mar 2009 14:16:11 +0000 (UTC) Subject: rpms/chrony/devel chrony-1.23-cap.patch, NONE, 1.1 chrony.spec, 1.2, 1.3 Message-ID: <20090309141611.75DF770034@cvs1.fedora.phx.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/chrony/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4168 Modified Files: chrony.spec Added Files: chrony-1.23-cap.patch Log Message: - fix building with broken libcap header (#483548) chrony-1.23-cap.patch: --- NEW FILE chrony-1.23-cap.patch --- diff -up chrony-1.23/sys_linux.c.cap chrony-1.23/sys_linux.c --- chrony-1.23/sys_linux.c.cap 2009-03-09 14:56:29.000000000 +0100 +++ chrony-1.23/sys_linux.c 2009-03-09 14:57:24.000000000 +0100 @@ -39,14 +39,6 @@ #include #include -#ifdef FEAT_LINUXCAPS -#include -#include -#include -#include -#include -#endif - #include "localp.h" #include "sys_linux.h" #include "sched.h" @@ -55,6 +47,14 @@ #include "logging.h" #include "wrap_adjtimex.h" +#ifdef FEAT_LINUXCAPS +#include +#include +#include +#include +#include +#endif + static long current_tick; /* This is the value of tick, in seconds, including the current vernier Index: chrony.spec =================================================================== RCS file: /cvs/pkgs/rpms/chrony/devel/chrony.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- chrony.spec 24 Feb 2009 07:31:16 -0000 1.2 +++ chrony.spec 9 Mar 2009 14:15:41 -0000 1.3 @@ -1,6 +1,6 @@ Name: chrony Version: 1.23 -Release: 3.20081106gitbe42b4%{?dist} +Release: 4.20081106gitbe42b4%{?dist} Summary: An NTP client/server Group: System Environment/Daemons @@ -18,6 +18,7 @@ Patch2: chrony-1.23-ppc.patch Patch3: chrony-1.23-gethost.patch Patch4: chrony-1.23-res.patch +Patch5: chrony-1.23-cap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libcap-devel readline-devel bison texinfo @@ -40,6 +41,7 @@ %patch2 -p1 -b .ppc %patch3 -p1 -b .gethost %patch4 -p1 -b .res +%patch5 -p1 -b .cap # don't link with ncurses sed -i 's|-lncurses||' configure @@ -121,6 +123,9 @@ %dir %attr(-,chrony,chrony) %{_localstatedir}/log/chrony %changelog +* Mon Mar 09 2009 Miroslav Lichvar 1.23-4.20081106gitbe42b4 +- fix building with broken libcap header (#483548) + * Mon Feb 23 2009 Fedora Release Engineering - 1.23-3.20081106gitbe42b4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rdieter at fedoraproject.org Mon Mar 9 14:18:08 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 9 Mar 2009 14:18:08 +0000 (UTC) Subject: rpms/kdepim/devel kdepim-4.2.1-korganizer_view.patch, NONE, 1.1 kdepim.spec, 1.209, 1.210 Message-ID: <20090309141808.8ADC470034@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepim/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4787 Modified Files: kdepim.spec Added Files: kdepim-4.2.1-korganizer_view.patch Log Message: * Mon Mar 09 2009 Rex Dieter 4.2.1-3 - upstream korganizer-view patch kdepim-4.2.1-korganizer_view.patch: --- NEW FILE kdepim-4.2.1-korganizer_view.patch --- --- branches/KDE/4.2/kdepim/korganizer/views/agendaview/koagendaview.cpp 2009/02/22 04:06:27 929771 +++ branches/KDE/4.2/kdepim/korganizer/views/agendaview/koagendaview.cpp 2009/03/01 13:45:42 933657 @@ -1544,7 +1544,11 @@ KConfigGroup group = config->group( "Views" ); QList sizes = group.readEntry( "Separator AgendaView", QList() ); - mSplitterAgenda->setSizes( sizes ); + + // the size depends on the number of plugins used + if ( sizes.count() >= 2 ) { + mSplitterAgenda->setSizes( sizes ); + } updateConfig(); } Index: kdepim.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v retrieving revision 1.209 retrieving revision 1.210 diff -u -r1.209 -r1.210 --- kdepim.spec 4 Mar 2009 21:32:45 -0000 1.209 +++ kdepim.spec 9 Mar 2009 14:17:37 -0000 1.210 @@ -6,7 +6,7 @@ Summary: PIM (Personal Information Manager) applications Epoch: 6 Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/Productivity @@ -15,6 +15,7 @@ Patch0: kdepim-4.1.80-libqgpgme-link-fix.patch # upstream patches Patch100: kdepim-4.2.1-imap.patch +Patch101: kdepim-4.2.1-korganizer_view.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -95,6 +96,8 @@ # upstream patches %patch100 -p0 -b .imap +%patch101 -p4 -b .korganizer_view + %build mkdir -p %{_target_platform} @@ -102,7 +105,7 @@ %{cmake_kde4} .. popd -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %install @@ -184,6 +187,9 @@ %changelog +* Mon Mar 09 2009 Rex Dieter 4.2.1-3 +- upstream korganizer-view patch + * Wed Mar 04 2009 Than Ngo - 4.2.1-2 - upstream patch, speed up folder syncing From ovasik at fedoraproject.org Mon Mar 9 14:18:11 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Mon, 9 Mar 2009 14:18:11 +0000 (UTC) Subject: rpms/taskjuggler/devel taskjuggler.spec,1.29,1.30 Message-ID: <20090309141811.5FD1A70034@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/taskjuggler/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4829 Modified Files: taskjuggler.spec Log Message: remove patch, fix spec file Index: taskjuggler.spec =================================================================== RCS file: /cvs/extras/rpms/taskjuggler/devel/taskjuggler.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- taskjuggler.spec 9 Mar 2009 13:36:27 -0000 1.29 +++ taskjuggler.spec 9 Mar 2009 14:17:41 -0000 1.30 @@ -7,8 +7,6 @@ License: GPL+ URL: http://www.taskjuggler.org Source0: http://www.taskjuggler.org/download/%{name}-%{version}.tar.bz2 -# disable kdepim support (without disabling all of KDE support) -Patch0: taskjuggler-2.4.1-no-kdepim3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?fedora} < 10 @@ -44,12 +42,6 @@ %prep %setup -q -# timestamp magic to keep autotools from regenerating everything -sleep 1 -touch acinclude.m4 configure.files configure.in subdirs -sleep 1 -touch aclocal.m4 config.h.in configure Makefile.in stamp-h.in -%endif %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh From jorton at fedoraproject.org Mon Mar 9 14:18:58 2009 From: jorton at fedoraproject.org (Joe Orton) Date: Mon, 9 Mar 2009 14:18:58 +0000 (UTC) Subject: rpms/subversion/devel subversion.spec,1.131,1.132 Message-ID: <20090309141858.BC5B270034@cvs1.fedora.phx.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5082 Modified Files: subversion.spec Log Message: * Mon Mar 9 2009 Joe Orton 1.5.6-2 - update to 1.5.6 - autoload psvn (#238491, Tom Tromey) - regenerate swig bindings (#480503) Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- subversion.spec 9 Mar 2009 14:03:55 -0000 1.131 +++ subversion.spec 9 Mar 2009 14:18:28 -0000 1.132 @@ -15,7 +15,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.5.6 -Release: 1 +Release: 2 License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -112,8 +112,10 @@ %endif %build -# Regenerate after patches to build.conf et al -autoheader && autoconf && ./gen-make.py --reload +# Regenerate the buildsystem, so that: +# 1) patches applied to configure.in take effect +# 2) the swig bindings are regenerated using the system swig +./autogen.sh --release # fix shebang lines, #111498 perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in @@ -183,7 +185,7 @@ done install -m 644 $RPM_SOURCE_DIR/psvn-init.el \ - ${RPM_BUILD_ROOT}%{_datadir}/%{_datadir}/emacs/site-lisp + ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp # Rename authz_svn INSTALL doc for docdir ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL @@ -279,9 +281,10 @@ %endif %changelog -* Mon Mar 9 2009 Joe Orton 1.5.6-1 +* Mon Mar 9 2009 Joe Orton 1.5.6-2 - update to 1.5.6 - autoload psvn (#238491, Tom Tromey) +- regenerate swig bindings (#480503) * Wed Feb 25 2009 Fedora Release Engineering - 1.5.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From atkac at fedoraproject.org Mon Mar 9 14:31:53 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Mon, 9 Mar 2009 14:31:53 +0000 (UTC) Subject: rpms/dnscap/devel dnscap.spec,1.5,1.6 Message-ID: <20090309143153.CFFFB70034@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/dnscap/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8722 Modified Files: dnscap.spec Log Message: - replace bind-devel by libbind-devel Index: dnscap.spec =================================================================== RCS file: /cvs/pkgs/rpms/dnscap/devel/dnscap.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dnscap.spec 24 Feb 2009 12:11:24 -0000 1.5 +++ dnscap.spec 9 Mar 2009 14:31:23 -0000 1.6 @@ -1,6 +1,6 @@ Name: dnscap Version: 1.0 -Release: 0.7.20070807cvs%{?dist} +Release: 0.8.20070807cvs%{?dist} Summary: DNS traffic capture utility Group: Applications/Internet @@ -9,7 +9,7 @@ Source0: dnscap-20070807cvs.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libpcap-devel, bind-devel, autoconf, automake, libtool +BuildRequires: libpcap-devel, libbind-devel, autoconf, automake, libtool BuildRequires: groff, pkgconfig Requires: libpcap, bind-libs @@ -48,6 +48,9 @@ %{_mandir}/man1/dnscap.1.gz %changelog +* Mon Mar 09 2009 Adam Tkac 1.0-0.8.20070807cvs +- replace bind-devel by libbind-devel + * Tue Feb 24 2009 Fedora Release Engineering - 1.0-0.7.20070807cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Mon Mar 9 14:33:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 14:33:42 +0000 Subject: [pkgdb] cryptsetup-luks had acl change status Message-ID: <20090309143342.2B39C208544@bastion.fedora.phx.redhat.com> agk has set the watchbugzilla acl on cryptsetup-luks (Fedora devel) to Approved for whulbert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks From pkgdb at fedoraproject.org Mon Mar 9 14:33:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 14:33:47 +0000 Subject: [pkgdb] cryptsetup-luks had acl change status Message-ID: <20090309143344.EB35220854D@bastion.fedora.phx.redhat.com> agk has set the watchcommits acl on cryptsetup-luks (Fedora devel) to Approved for whulbert To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cryptsetup-luks From rdieter at fedoraproject.org Mon Mar 9 14:34:14 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 9 Mar 2009 14:34:14 +0000 (UTC) Subject: rpms/kdegraphics/F-9 gwenview-fix-version.diff, NONE, 1.1 kdegraphics.spec, 1.164, 1.165 Message-ID: <20090309143414.8448070034@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegraphics/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9495 Modified Files: kdegraphics.spec Added Files: gwenview-fix-version.diff Log Message: * Mon Mar 09 2009 Rex Dieter 4.2.1-3 - gwenview-fix-version.diff gwenview-fix-version.diff: --- NEW FILE gwenview-fix-version.diff --- diff --git a/gwenview/app/main.cpp b/gwenview/app/main.cpp index 8bdf041..74dd694 100644 --- a/gwenview/app/main.cpp +++ b/gwenview/app/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) { "gwenview", /* appname */ 0, /* catalogName */ ki18n("Gwenview"), /* programName */ - "2.2.0"); /* version */ + "2.2.1"); /* version */ aboutData.setShortDescription(ki18n("An Image Viewer")); aboutData.setLicense(KAboutData::License_GPL); aboutData.setCopyrightStatement(ki18n("Copyright 2000-2008 Aur??lien G??teau")); Index: kdegraphics.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/kdegraphics.spec,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- kdegraphics.spec 2 Mar 2009 10:29:26 -0000 1.164 +++ kdegraphics.spec 9 Mar 2009 14:33:44 -0000 1.165 @@ -7,7 +7,7 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 Version: 4.2.1 -Release: 1%{?dist} +Release: 3%{?dist} Name: kdegraphics #Obsoletes: kdegraphics4 < %{version}-%{release} @@ -20,6 +20,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## upstream patches +Patch100: gwenview-fix-version.diff BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdepimlibs-devel >= %{version} @@ -71,6 +72,8 @@ %if 0%{?obsolete_kde3_kipi} Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0 %endif +Requires(post): xdg-utils +Requires(postun): xdg-utils %description libs %{summary}. @@ -94,6 +97,8 @@ %setup -q -n kdegraphics-%{version} # upstream patches +%patch100 -p1 -b .gwenview_fix_version + %build @@ -102,7 +107,7 @@ %{cmake_kde4} .. popd -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %install @@ -122,16 +127,20 @@ %post -%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : %postun -%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : - -%post libs -p /sbin/ldconfig +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : -%postun libs -p /sbin/ldconfig +%post libs +/sbin/ldconfig +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : + +%postun libs +/sbin/ldconfig +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : %files @@ -144,24 +153,49 @@ %{_kde4_datadir}/applications/kde4/* %{_kde4_datadir}/config.kcfg/* %{_kde4_datadir}/kde4/services/* -%{_kde4_datadir}/kde4/servicetypes/* -%{_kde4_docdir}/HTML/en/okular/ +%{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop %{_kde4_appsdir}/gvpart/ %{_kde4_appsdir}/gwenview/ %{_kde4_appsdir}/kolourpaint/ %{_kde4_appsdir}/kruler/ %{_kde4_appsdir}/svgpart/ +%{_kde4_libdir}/kde4/gsthumbnail.so +%{_kde4_libdir}/kde4/gvpart.so +%{_kde4_libdir}/kde4/kcm_kamera.so +%{_kde4_libdir}/kde4/kcm_kgamma.so +%{_kde4_libdir}/kde4/kio_kamera.so +%{_kde4_libdir}/kde4/kio_msits.so +%{_kde4_libdir}/kde4/ksaneplugin.so +%{_kde4_libdir}/kde4/okularGenerator_*.so +%{_kde4_libdir}/kde4/okularpart.so +%{_kde4_libdir}/kde4/svgpart.so %{_datadir}/dbus-1/interfaces/* %{_kde4_docdir}/HTML/en/*/ -%{_kde4_iconsdir}/hicolor/*/*/* +%{_kde4_iconsdir}/hicolor/*/actions/* +%{_kde4_iconsdir}/hicolor/*/apps/gwenview.* +%{_kde4_iconsdir}/hicolor/*/apps/kcolorchooser.* +%{_kde4_iconsdir}/hicolor/*/apps/kgamma.* +%{_kde4_iconsdir}/hicolor/*/apps/kolourpaint.* +%{_kde4_iconsdir}/hicolor/*/apps/kruler.* +%{_kde4_iconsdir}/hicolor/*/apps/ksnapshot.* +%{_kde4_iconsdir}/hicolor/*/apps/okular.* %files libs %defattr(-,root,root,-) %{_kde4_appsdir}/kipi/ +%{_kde4_iconsdir}/hicolor/*/apps/kipi.* +%{_kde4_datadir}/kde4/servicetypes/kipiplugin.desktop %{_kde4_appsdir}/libkdcraw/ -%{_kde4_libdir}/lib*.so.* -%{_kde4_libdir}/kde4/* -%{_kde4_libdir}/strigi/* +%{_kde4_iconsdir}/hicolor/*/apps/kdcraw.* +%{_kde4_libdir}/libgwenviewlib.so.4* +%{_kde4_libdir}/libkdcraw.so.7* +%{_kde4_libdir}/libkexiv2.so.7* +%{_kde4_libdir}/libkipi.so.6* +%{_kde4_libdir}/libkolourpaint_lgpl.so.4* +%{_kde4_libdir}/libksane.so.0* +%{_kde4_libdir}/libokularcore.so.1* +%{_kde4_libdir}/strigi/strigita_dvi.so + %files devel %defattr(-,root,root,-) @@ -179,6 +213,12 @@ %changelog +* Mon Mar 09 2009 Rex Dieter 4.2.1-3 +- gwenview-fix-version.diff + +* Sun Mar 08 2009 Rex Dieter 4.2.1-2 +- missing dependency on kipiplugin.desktop (#489218) + * Fri Feb 27 2009 Than Ngo - 4.2.1-1 - 4.2.1 From rdieter at fedoraproject.org Mon Mar 9 14:35:29 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 9 Mar 2009 14:35:29 +0000 (UTC) Subject: rpms/kdegraphics/F-10 gwenview-fix-version.diff, NONE, 1.1 kdegraphics.spec, 1.187, 1.188 Message-ID: <20090309143529.31D6770034@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdegraphics/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9936 Modified Files: kdegraphics.spec Added Files: gwenview-fix-version.diff Log Message: * Mon Mar 09 2009 Rex Dieter 4.2.1-3 - gwenview-fix-version.diff gwenview-fix-version.diff: --- NEW FILE gwenview-fix-version.diff --- diff --git a/gwenview/app/main.cpp b/gwenview/app/main.cpp index 8bdf041..74dd694 100644 --- a/gwenview/app/main.cpp +++ b/gwenview/app/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) { "gwenview", /* appname */ 0, /* catalogName */ ki18n("Gwenview"), /* programName */ - "2.2.0"); /* version */ + "2.2.1"); /* version */ aboutData.setShortDescription(ki18n("An Image Viewer")); aboutData.setLicense(KAboutData::License_GPL); aboutData.setCopyrightStatement(ki18n("Copyright 2000-2008 Aur??lien G??teau")); Index: kdegraphics.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/kdegraphics.spec,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- kdegraphics.spec 8 Mar 2009 19:52:53 -0000 1.187 +++ kdegraphics.spec 9 Mar 2009 14:34:58 -0000 1.188 @@ -7,7 +7,7 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Name: kdegraphics #Obsoletes: kdegraphics4 < %{version}-%{release} @@ -20,6 +20,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## upstream patches +Patch100: gwenview-fix-version.diff BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdepimlibs-devel >= %{version} @@ -96,6 +97,8 @@ %setup -q -n kdegraphics-%{version} # upstream patches +%patch100 -p1 -b .gwenview_fix_version + %build @@ -210,6 +213,9 @@ %changelog +* Mon Mar 09 2009 Rex Dieter 4.2.1-3 +- gwenview-fix-version.diff + * Sun Mar 08 2009 Rex Dieter 4.2.1-2 - missing dependency on kipiplugin.desktop (#489218) From atkac at fedoraproject.org Mon Mar 9 14:35:55 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Mon, 9 Mar 2009 14:35:55 +0000 (UTC) Subject: rpms/libbind/devel .cvsignore, 1.2, 1.3 libbind.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090309143555.25B0570034@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/libbind/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10109 Modified Files: .cvsignore libbind.spec sources Log Message: - updated to 6.0rc1 - added pkg-config file Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libbind/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Mar 2009 13:44:21 -0000 1.2 +++ .cvsignore 9 Mar 2009 14:35:24 -0000 1.3 @@ -1 +1,2 @@ -libbind-6.0b1.tar.gz +libbind-6.0rc1.tar.gz +libbind.pc Index: libbind.spec =================================================================== RCS file: /cvs/pkgs/rpms/libbind/devel/libbind.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libbind.spec 9 Mar 2009 13:44:21 -0000 1.1 +++ libbind.spec 9 Mar 2009 14:35:24 -0000 1.2 @@ -1,15 +1,16 @@ -%define PREVER b1 +%define PREVER rc1 %define VERSION %{version}%{PREVER} Name: libbind Version: 6.0 -Release: 0.3.%{PREVER}%{?dist} +Release: 0.4.%{PREVER}%{?dist} Summary: ISC's standard resolver library Group: System Environment/Libraries License: ISC URL: ftp://ftp.isc.org/isc/libbind/ Source0: ftp://ftp.isc.org/isc/libbind/%{VERSION}/libbind-%{VERSION}.tar.gz +Source1: libbind.pc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: groff @@ -80,6 +81,9 @@ rm -f $oldname done +mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libbind.pc + %clean rm -rf $RPM_BUILD_ROOT @@ -90,17 +94,22 @@ %defattr(-,root,root,-) %doc CHANGES COPYRIGHT README %{_libdir}/libbind.so.4 -%{_libdir}/libbind.so.4.2.0 +%{_libdir}/libbind.so.4.2.1 %files devel %defattr(-,root,root,-) %{_libdir}/libbind.so +%{_libdir}/pkgconfig/libbind.pc %{_includedir}/bind %{_mandir}/man3/libbind_* %{_mandir}/man5/libbind_* %{_mandir}/man7/libbind_* %changelog +* Mon Mar 09 2009 Adam Tkac 6.0-0.4.rc1 +- updated to 6.0rc1 +- added pkg-config file + * Mon Mar 02 2009 Adam Tkac 6.0-0.3.b1 - removed unneeded Obsoletes/Provides Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libbind/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Mar 2009 13:44:22 -0000 1.2 +++ sources 9 Mar 2009 14:35:24 -0000 1.3 @@ -1 +1,2 @@ -c54fa30a0051d604bc4a8a9242b4604a libbind-6.0b1.tar.gz +6bed81bcaffa54de99c5d1b08aae7271 libbind-6.0rc1.tar.gz +4290a468430ce9b3e3ae7d88ccc4666d libbind.pc From atkac at fedoraproject.org Mon Mar 9 14:36:26 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Mon, 9 Mar 2009 14:36:26 +0000 (UTC) Subject: rpms/bind/devel .cvsignore, 1.50, 1.51 bind-nonexec.patch, 1.3, 1.4 bind.spec, 1.303, 1.304 sources, 1.59, 1.60 bind-96-libtool2-libbind.patch, 1.1, NONE bind-96-temporary-libbind.patch, 1.1, NONE Message-ID: <20090309143626.EDCD770034@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/bind/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10295 Modified Files: .cvsignore bind-nonexec.patch bind.spec sources Removed Files: bind-96-libtool2-libbind.patch bind-96-temporary-libbind.patch Log Message: - fire away libbind, it is now separate package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 8 Jan 2009 14:05:03 -0000 1.50 +++ .cvsignore 9 Mar 2009 14:35:56 -0000 1.51 @@ -1,5 +1,3 @@ config-4.tar.bz2 -libbind-man.tar.gz bind-chroot.tar.bz2 bind-9.6.0-P1.tar.gz -libbind-9.5.1b2.tar.bz2 bind-nonexec.patch: Index: bind-nonexec.patch =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/bind-nonexec.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bind-nonexec.patch 22 May 2008 13:49:34 -0000 1.3 +++ bind-nonexec.patch 9 Mar 2009 14:35:56 -0000 1.4 @@ -1,14 +1,3 @@ ---- bind-9.2.4rc6/lib/bind/Makefile.in.nonexec 2004-03-09 04:17:23.000000000 -0500 -+++ bind-9.2.4rc6/lib/bind/Makefile.in 2004-07-16 19:23:30.000000000 -0400 -@@ -111,7 +111,7 @@ - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} - - install:: timestamp installdirs -- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libbind. at A@ ${DESTDIR}${libdir} -+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libbind. at A@ ${DESTDIR}${libdir} - - clean distclean:: - rm -f libbind. at SA@ libbind.la --- bind-9.2.4rc6/lib/dns/Makefile.in.nonexec 2004-04-14 20:35:27.000000000 -0400 +++ bind-9.2.4rc6/lib/dns/Makefile.in 2004-07-16 19:25:40.000000000 -0400 @@ -136,7 +136,7 @@ Index: bind.spec =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v retrieving revision 1.303 retrieving revision 1.304 diff -u -r1.303 -r1.304 --- bind.spec 4 Mar 2009 09:27:48 -0000 1.303 +++ bind.spec 9 Mar 2009 14:35:56 -0000 1.304 @@ -9,7 +9,6 @@ %define VERSION %{version}-%{PATCHVER} %{?!SDB: %define SDB 1} -%{?!LIBBIND: %define LIBBIND 1} %{?!test: %define test 0} %{?!bind_uid: %define bind_uid 25} %{?!bind_gid: %define bind_gid 25} @@ -21,7 +20,7 @@ Name: bind License: ISC Version: 9.6.0 -Release: 7.%{PATCHVER}%{?dist} +Release: 8.%{PATCHVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,7 +34,6 @@ Source6: bind-chroot.tar.bz2 Source7: bind-9.3.1rc1-sdb_tools-Makefile.in Source8: dnszone.schema -Source9: libbind-man.tar.gz Source12: README.sdb_pgsql Source21: Copyright.caching-nameserver Source24: libbind.pc @@ -43,12 +41,6 @@ Source28: config-4.tar.bz2 Source30: ldap2zone.c -%if %{LIBBIND} -# XXX libbind is going to be a separate product in 9.6 series but it wasn't -# released yet. Use libbind from 9.5 series -Source31: libbind-9.5.1b2.tar.bz2 -%endif - # Common patches Patch1: bind-9.3.3rc2-rndckey.patch Patch5: bind-nonexec.patch @@ -59,10 +51,6 @@ Patch72: bind-9.5-dlz-64bit.patch Patch87: bind-9.5-parallel-build.patch Patch96: bind-95-rh469440.patch -%if %{LIBBIND} -Patch97: bind-96-temporary-libbind.patch -Patch100:bind-96-libtool2-libbind.patch -%endif Patch99: bind-96-libtool2.patch Patch101:bind-96-old-api.patch Patch102:bind-95-rh452060.patch @@ -177,14 +165,6 @@ %prep %setup -q -n %{name}-%{VERSION} -%if %{LIBBIND} -# XXX temporary libbind workaround -pushd lib -tar xjf %{SOURCE31} -popd -sed -i 's/SUBDIRS\(.*\)/SUBDIRS\1 lib\/bind/' Makefile.in -%endif - # Common patches %patch1 -p1 -b .key %patch5 -p1 -b .nonexec @@ -217,10 +197,6 @@ cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools %patch12 -p1 -b .sdb %endif -%if %{LIBBIND} -%patch13 -p1 -b .fix_libbind_includedir -%patch97 -p1 -b .temporary-libbind -%endif %if %{SDB} %patch17 -p1 -b .fix_sdb_ldap %endif @@ -241,10 +217,6 @@ # XXX due new libtool. Not sure about proper upstream approach yet. mkdir m4 %patch99 -p1 -b .libtool2 -%if %{LIBBIND} -mkdir lib/bind/m4 -%patch100 -p1 -b .libtool2-libbind -%endif %patch102 -p1 -b .rh452060 %patch103 -p0 -b .realloc @@ -267,11 +239,6 @@ 's/RELEASEVER=\(.*\)/RELEASEVER=\1-RedHat-%{version}-%{release}/' \ version -%if %{LIBBIND} -pushd lib/bind -libtoolize -c -f; aclocal -I m4 --force; autoconf -f -popd -%endif libtoolize -c -f; aclocal -I m4 --force; autoheader -f; autoconf -f %configure \ @@ -360,11 +327,6 @@ install -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}/etc/openldap/schema/dnszone.schema install -m 644 %{SOURCE12} contrib/sdb/pgsql/ %endif -%if %{LIBBIND} -gunzip < %{SOURCE9} | (cd ${RPM_BUILD_ROOT}/usr/share; tar -xpf -) -mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig -install -m 644 %{SOURCE24} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libbind.pc -%endif # Files required to run test-suite outside of build tree: cp -fp config.h ${RPM_BUILD_ROOT}/%{_includedir}/bind9 @@ -575,13 +537,6 @@ %{_includedir}/lwres %{_mandir}/man3/lwres* %{_bindir}/isc-config.sh -%if %{LIBBIND} -%{_libdir}/pkgconfig/libbind.pc -%{_includedir}/bind -%{_mandir}/man3/libbind-* -%{_mandir}/man7/libbind-* -%{_mandir}/man5/libbind-* -%endif %files chroot @@ -606,10 +561,13 @@ %ghost %{chroot_prefix}/etc/localtime %changelog -* Wed Mar 04 2009 Adam Tkac - 32:9.6.0-7.P1 +* Mon Mar 09 2009 Adam Tkac 32:9.6.0-8.P1 +- fire away libbind, it is now separate package + +* Wed Mar 04 2009 Adam Tkac 32:9.6.0-7.P1 - fixed some read buffer overflows (upstream) -* Mon Feb 23 2009 Fedora Release Engineering - 32:9.6.0-6.P1 +* Mon Feb 23 2009 Fedora Release Engineering 32:9.6.0-6.P1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Thu Feb 12 2009 Martin Nagy 32:9.6.0-5.P1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/sources,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- sources 8 Jan 2009 14:05:04 -0000 1.59 +++ sources 9 Mar 2009 14:35:56 -0000 1.60 @@ -1,5 +1,3 @@ de68e10e91e05ab100be879b5bcaa6cb config-4.tar.bz2 -13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz 4faa4395b955e5f8a3d50f308b9fabc8 bind-chroot.tar.bz2 886b7eae55cfdc8cd8d2ca74a2f99c6e bind-9.6.0-P1.tar.gz -3d1dad3630ec3510c8ab0ac2217a3317 libbind-9.5.1b2.tar.bz2 --- bind-96-libtool2-libbind.patch DELETED --- --- bind-96-temporary-libbind.patch DELETED --- From atkac at fedoraproject.org Mon Mar 9 14:37:13 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Mon, 9 Mar 2009 14:37:13 +0000 (UTC) Subject: rpms/milter-greylist/devel milter-greylist.spec,1.29,1.30 Message-ID: <20090309143713.9A7D570034@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/milter-greylist/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10687 Modified Files: milter-greylist.spec Log Message: - libbind has been moved to separate package, rebuild Index: milter-greylist.spec =================================================================== RCS file: /cvs/pkgs/rpms/milter-greylist/devel/milter-greylist.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- milter-greylist.spec 7 Mar 2009 12:22:30 -0000 1.29 +++ milter-greylist.spec 9 Mar 2009 14:36:42 -0000 1.30 @@ -19,7 +19,7 @@ Summary: Milter for greylisting, the next step in the spam control war Name: milter-greylist Version: 4.2 -Release: %release_func 0.4.%{?beta} +Release: %release_func 0.5.%{?beta} License: BSD with advertising Group: System Environment/Daemons URL: http://hcpnet.free.fr/milter-greylist/ @@ -218,6 +218,9 @@ %changelog +* Mon Mar 09 2009 Adam Tkac - 4.2-0.5.b1 +- libbind has been moved to separate package, rebuild + * Sat Mar 7 2009 Enrico Scholz - 4.2-0.4.b1 - added -upstart subpackage - renamed -sysv to -sysvinit to let -upstart win the default depresolving From rdieter at fedoraproject.org Mon Mar 9 14:37:14 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 9 Mar 2009 14:37:14 +0000 (UTC) Subject: rpms/kdepim/devel .cvsignore,1.58,1.59 Message-ID: <20090309143714.44E9570034@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepim/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10637/devel Modified Files: .cvsignore Log Message: cleanup Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- .cvsignore 27 Feb 2009 12:41:03 -0000 1.58 +++ .cvsignore 9 Mar 2009 14:36:43 -0000 1.59 @@ -1,6 +1 @@ -kdepim-4.1.2.tar.bz2 -kdepim-4.1.80.tar.bz2 -kdepim-4.1.85.tar.bz2 -kdepim-4.1.96.tar.bz2 -kdepim-4.2.0.tar.bz2 kdepim-4.2.1.tar.bz2 From rdieter at fedoraproject.org Mon Mar 9 14:37:14 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 9 Mar 2009 14:37:14 +0000 (UTC) Subject: rpms/kdepim/F-10 .cvsignore,1.59,1.60 Message-ID: <20090309143714.6EAE670034@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepim/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10637/F-10 Modified Files: .cvsignore Log Message: cleanup Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/F-10/.cvsignore,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- .cvsignore 24 Jan 2009 06:02:23 -0000 1.59 +++ .cvsignore 9 Mar 2009 14:36:44 -0000 1.60 @@ -1,5 +1 @@ -kdepim-4.1.2.tar.bz2 -kdepim-4.1.80.tar.bz2 -kdepim-4.1.85.tar.bz2 -kdepim-4.1.96.tar.bz2 -kdepim-4.2.0.tar.bz2 +kdepim-4.2.1.tar.bz2 From rdieter at fedoraproject.org Mon Mar 9 14:38:17 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 9 Mar 2009 14:38:17 +0000 (UTC) Subject: rpms/kdepim/F-10 kdepim-4.2.1-korganizer_view.patch, NONE, 1.1 kdepim.spec, 1.206, 1.207 Message-ID: <20090309143817.349F170034@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdepim/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11044 Modified Files: kdepim.spec Added Files: kdepim-4.2.1-korganizer_view.patch Log Message: * Mon Mar 09 2009 Rex Dieter 4.2.1-3 - upstream korganizer-view patch kdepim-4.2.1-korganizer_view.patch: --- NEW FILE kdepim-4.2.1-korganizer_view.patch --- --- branches/KDE/4.2/kdepim/korganizer/views/agendaview/koagendaview.cpp 2009/02/22 04:06:27 929771 +++ branches/KDE/4.2/kdepim/korganizer/views/agendaview/koagendaview.cpp 2009/03/01 13:45:42 933657 @@ -1544,7 +1544,11 @@ KConfigGroup group = config->group( "Views" ); QList sizes = group.readEntry( "Separator AgendaView", QList() ); - mSplitterAgenda->setSizes( sizes ); + + // the size depends on the number of plugins used + if ( sizes.count() >= 2 ) { + mSplitterAgenda->setSizes( sizes ); + } updateConfig(); } Index: kdepim.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepim/F-10/kdepim.spec,v retrieving revision 1.206 retrieving revision 1.207 diff -u -r1.206 -r1.207 --- kdepim.spec 4 Mar 2009 22:02:38 -0000 1.206 +++ kdepim.spec 9 Mar 2009 14:37:46 -0000 1.207 @@ -6,7 +6,7 @@ Summary: PIM (Personal Information Manager) applications Epoch: 6 Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/Productivity @@ -15,6 +15,7 @@ Patch0: kdepim-4.1.80-libqgpgme-link-fix.patch # upstream patches Patch100: kdepim-4.2.1-imap.patch +Patch101: kdepim-4.2.1-korganizer_view.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -95,6 +96,8 @@ # upstream patches %patch100 -p0 -b .imap +%patch101 -p4 -b .korganizer_view + %build mkdir -p %{_target_platform} @@ -102,7 +105,7 @@ %{cmake_kde4} .. popd -make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 +make %{?_smp_mflags} -C %{_target_platform} %install @@ -184,6 +187,9 @@ %changelog +* Mon Mar 09 2009 Rex Dieter 4.2.1-3 +- upstream korganizer-view patch + * Wed Mar 04 2009 Than Ngo - 4.2.1-2 - upstream patch, speed up folder syncing From mhlavink at fedoraproject.org Mon Mar 9 14:57:35 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 9 Mar 2009 14:57:35 +0000 (UTC) Subject: rpms/smartmontools/devel smartmontools.spec,1.51,1.52 Message-ID: <20090309145735.B085770034@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/smartmontools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23850 Modified Files: smartmontools.spec Log Message: clean up for merge review Index: smartmontools.spec =================================================================== RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- smartmontools.spec 27 Feb 2009 20:27:03 -0000 1.51 +++ smartmontools.spec 9 Mar 2009 14:57:05 -0000 1.52 @@ -1,7 +1,7 @@ Summary: Tools for monitoring SMART capable hard disks Name: smartmontools Version: 5.38 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 Group: System Environment/Base License: GPLv2+ @@ -14,13 +14,10 @@ Patch3: smartmontools-5.38-perc.patch Patch4: smartmontools-5.38-selinux.patch Patch5: smartmontools-5.38-defaultconf.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-root -PreReq: /sbin/chkconfig /sbin/service -Requires: fileutils mailx -BuildRequires: readline-devel ncurses-devel /usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf util-linux groff gettext +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Requires: fileutils mailx chkconfig initscripts +BuildRequires: readline-devel ncurses-devel /usr/bin/aclocal util-linux groff gettext BuildRequires: libselinux-devel -Obsoletes: kernel-utils smartmontools-config ExclusiveArch: %{ix86} x86_64 %{arm} ia64 ppc ppc64 %description @@ -61,28 +58,25 @@ /sbin/service smartd stop >/dev/null 2>&1 /sbin/chkconfig --del smartd fi -exit 0 %post /sbin/chkconfig --add smartd -%triggerpostun -- kernel-utils -/sbin/chkconfig --add smartd -exit 0 - %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc AUTHORS CHANGELOG COPYING INSTALL NEWS README %doc TODO WARNINGS examplescripts smartd.conf %{_sbindir}/smartd %{_sbindir}/smartctl -%{_sysconfdir}/rc.d/init.d/smartd +%{_initrddir}/smartd %{_mandir}/man?/smart*.* -# %ghost %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/smartd.conf %config(noreplace) %{_sysconfdir}/smartd.conf %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools %changelog +* Mon Mar 09 2009 Michal Hlavinka - 1:5.38-10 +- cleanup for merge review + * Fri Feb 27 2009 Tom "spot" Callaway - 1:5.38-9 - fix ExclusiveArch From jakub at fedoraproject.org Mon Mar 9 15:00:34 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Mon, 9 Mar 2009 15:00:34 +0000 (UTC) Subject: rpms/glibc/devel .cvsignore, 1.262, 1.263 glibc-fedora.patch, 1.294, 1.295 glibc.spec, 1.382, 1.383 import.log, 1.6, 1.7 sources, 1.287, 1.288 thread_db.patch, 1.1, NONE Message-ID: <20090309150034.890FB70034@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/glibc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24624/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec import.log sources Removed Files: thread_db.patch Log Message: 2.9.90-9 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- .cvsignore 18 Feb 2009 20:47:03 -0000 1.262 +++ .cvsignore 9 Mar 2009 15:00:02 -0000 1.263 @@ -1,2 +1,2 @@ -glibc-20090218T1534.tar.bz2 -glibc-fedora-20090218T1534.tar.bz2 +glibc-20090309T1421.tar.bz2 +glibc-fedora-20090309T1421.tar.bz2 glibc-fedora.patch: Index: glibc-fedora.patch =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.294 retrieving revision 1.295 diff -u -r1.294 -r1.295 --- glibc-fedora.patch 18 Feb 2009 23:18:08 -0000 1.294 +++ glibc-fedora.patch 9 Mar 2009 15:00:02 -0000 1.295 @@ -1,6 +1,6 @@ ---- glibc-20090218T1534/ChangeLog 16 Feb 2009 21:00:06 -0000 1.11497 -+++ glibc-20090218T1534-fedora/ChangeLog 18 Feb 2009 15:49:26 -0000 1.8782.2.319 -@@ -6595,6 +6595,13 @@ +--- glibc-20090309T1421/ChangeLog 8 Mar 2009 19:53:12 -0000 1.11527 ++++ glibc-20090309T1421-fedora/ChangeLog 9 Mar 2009 14:35:15 -0000 1.8782.2.320 +@@ -6813,6 +6813,13 @@ * include/sys/cdefs.h: Redefine __nonnull so that test for incorrect parameters in the libc code itself are not omitted. @@ -14,7 +14,7 @@ 2007-05-09 Jakub Jelinek * sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow -@@ -6890,6 +6897,10 @@ +@@ -7108,6 +7115,10 @@ [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -25,7 +25,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -8147,6 +8158,15 @@ +@@ -8365,6 +8376,15 @@ separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -41,8 +41,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-20090218T1534/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20090218T1534-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3 +--- glibc-20090309T1421/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20090309T1421-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -108,8 +108,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20090218T1534/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 -+++ glibc-20090218T1534-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 +--- glibc-20090309T1421/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 ++++ glibc-20090309T1421-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 @@ -171,6 +171,11 @@ [BZ #2611] * stdio-common/renameat.c (renameat): Fix typo. @@ -281,8 +281,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20090218T1534/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 -+++ glibc-20090218T1534-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6 +--- glibc-20090309T1421/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 ++++ glibc-20090309T1421-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -293,8 +293,8 @@ vpath initfini.c $(sysdirs) ---- glibc-20090218T1534/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20090218T1534-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20090309T1421/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20090309T1421-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -319,8 +319,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20090218T1534/debug/tst-chk1.c 5 Mar 2008 06:51:37 -0000 1.19 -+++ glibc-20090218T1534-fedora/debug/tst-chk1.c 5 Mar 2008 09:37:40 -0000 1.1.2.19 +--- glibc-20090309T1421/debug/tst-chk1.c 5 Mar 2008 06:51:37 -0000 1.19 ++++ glibc-20090309T1421-fedora/debug/tst-chk1.c 5 Mar 2008 09:37:40 -0000 1.1.2.19 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -349,8 +349,8 @@ # define O 0 # else # define O 1 ---- glibc-20090218T1534/elf/ldconfig.c 6 Feb 2009 20:09:33 -0000 1.65 -+++ glibc-20090218T1534-fedora/elf/ldconfig.c 18 Feb 2009 15:49:28 -0000 1.47.2.20 +--- glibc-20090309T1421/elf/ldconfig.c 6 Feb 2009 20:09:33 -0000 1.65 ++++ glibc-20090309T1421-fedora/elf/ldconfig.c 18 Feb 2009 15:49:28 -0000 1.47.2.20 @@ -1020,17 +1020,19 @@ search_dirs (void) @@ -432,8 +432,8 @@ } if (! opt_ignore_aux_cache) ---- glibc-20090218T1534/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20090218T1534-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20090309T1421/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20090309T1421-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -458,9 +458,9 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20090218T1534/include/features.h 13 Nov 2008 21:41:25 -0000 1.51 -+++ glibc-20090218T1534-fedora/include/features.h 13 Nov 2008 22:19:33 -0000 1.35.2.21 -@@ -282,8 +282,13 @@ +--- glibc-20090309T1421/include/features.h 26 Feb 2009 01:43:33 -0000 1.53 ++++ glibc-20090309T1421-fedora/include/features.h 9 Mar 2009 14:35:16 -0000 1.35.2.22 +@@ -297,8 +297,13 @@ #endif #if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \ @@ -476,16 +476,16 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-20090218T1534/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090218T1534-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20090309T1421/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090309T1421-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20090218T1534/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090218T1534-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20090309T1421/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090309T1421-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20090218T1534/intl/locale.alias 28 Oct 2007 01:39:54 -0000 1.24 -+++ glibc-20090218T1534-fedora/intl/locale.alias 12 Dec 2007 18:13:23 -0000 1.23.2.2 +--- glibc-20090309T1421/intl/locale.alias 28 Oct 2007 01:39:54 -0000 1.24 ++++ glibc-20090309T1421-fedora/intl/locale.alias 12 Dec 2007 18:13:23 -0000 1.23.2.2 @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -495,8 +495,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20090218T1534/libio/stdio.h 24 May 2008 18:14:36 -0000 1.93 -+++ glibc-20090218T1534-fedora/libio/stdio.h 24 May 2008 22:22:18 -0000 1.78.2.14 +--- glibc-20090309T1421/libio/stdio.h 26 Feb 2009 15:43:58 -0000 1.94 ++++ glibc-20090309T1421-fedora/libio/stdio.h 9 Mar 2009 14:35:17 -0000 1.78.2.15 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -510,8 +510,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20090218T1534/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 -+++ glibc-20090218T1534-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5 +--- glibc-20090309T1421/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 ++++ glibc-20090309T1421-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -603,8 +603,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20090218T1534/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25 -+++ glibc-20090218T1534-fedora/locale/programs/locarchive.c 31 Jul 2007 17:45:53 -0000 1.21.2.4 +--- glibc-20090309T1421/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25 ++++ glibc-20090309T1421-fedora/locale/programs/locarchive.c 31 Jul 2007 17:45:53 -0000 1.21.2.4 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -636,8 +636,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-20090218T1534/localedata/Makefile 7 Feb 2009 05:28:00 -0000 1.110 -+++ glibc-20090218T1534-fedora/localedata/Makefile 18 Feb 2009 15:49:33 -0000 1.101.2.10 +--- glibc-20090309T1421/localedata/Makefile 7 Feb 2009 05:28:00 -0000 1.110 ++++ glibc-20090309T1421-fedora/localedata/Makefile 18 Feb 2009 15:49:33 -0000 1.101.2.10 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -646,8 +646,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20090218T1534/localedata/SUPPORTED 6 Dec 2008 03:02:45 -0000 1.115 -+++ glibc-20090218T1534-fedora/localedata/SUPPORTED 2 Jan 2009 21:13:56 -0000 1.71.2.23 +--- glibc-20090309T1421/localedata/SUPPORTED 6 Dec 2008 03:02:45 -0000 1.115 ++++ glibc-20090309T1421-fedora/localedata/SUPPORTED 2 Jan 2009 21:13:56 -0000 1.71.2.23 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -689,8 +689,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20090218T1534/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20090218T1534-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20090309T1421/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20090309T1421-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -705,8 +705,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20090218T1534/localedata/locales/en_GB 31 Oct 2008 19:00:57 -0000 1.18 -+++ glibc-20090218T1534-fedora/localedata/locales/en_GB 31 Oct 2008 21:33:57 -0000 1.10.2.7 +--- glibc-20090309T1421/localedata/locales/en_GB 31 Oct 2008 19:00:57 -0000 1.18 ++++ glibc-20090309T1421-fedora/localedata/locales/en_GB 31 Oct 2008 21:33:57 -0000 1.10.2.7 @@ -116,8 +116,8 @@ mon "" d_fmt "" @@ -718,8 +718,8 @@ date_fmt "/ / " ---- glibc-20090218T1534/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090218T1534-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20090309T1421/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090309T1421-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -790,8 +790,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20090218T1534/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20090218T1534-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20090309T1421/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20090309T1421-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -819,8 +819,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20090218T1534/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20 -+++ glibc-20090218T1534-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2 +--- glibc-20090309T1421/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20 ++++ glibc-20090309T1421-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2 @@ -24,9 +24,25 @@ # include # include @@ -896,8 +896,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20090218T1534/manual/libc.texinfo 31 Jan 2008 01:43:04 -0000 1.98 -+++ glibc-20090218T1534-fedora/manual/libc.texinfo 31 Jan 2008 08:43:19 -0000 1.94.2.4 +--- glibc-20090309T1421/manual/libc.texinfo 31 Jan 2008 01:43:04 -0000 1.98 ++++ glibc-20090309T1421-fedora/manual/libc.texinfo 31 Jan 2008 08:43:19 -0000 1.94.2.4 @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -907,8 +907,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-20090218T1534/misc/sys/cdefs.h 3 Oct 2007 18:27:02 -0000 1.73 -+++ glibc-20090218T1534-fedora/misc/sys/cdefs.h 3 Oct 2007 19:32:28 -0000 1.58.2.10 +--- glibc-20090309T1421/misc/sys/cdefs.h 2 Mar 2009 15:56:03 -0000 1.74 ++++ glibc-20090309T1421-fedora/misc/sys/cdefs.h 9 Mar 2009 14:35:17 -0000 1.58.2.11 @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -940,7 +940,7 @@ # define __extern_always_inline \ extern __always_inline __attribute__ ((__gnu_inline__, __artificial__)) # else -@@ -309,7 +318,10 @@ +@@ -314,7 +323,10 @@ /* GCC 4.3 and above allow passing all anonymous arguments of an __extern_always_inline function to some other vararg function. */ @@ -952,17 +952,17 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-20090218T1534/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 -+++ glibc-20090218T1534-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 +--- glibc-20090309T1421/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 ++++ glibc-20090309T1421-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 @@ -25,4 +25,4 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get # the next entry. -#SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE ---- glibc-20090218T1534/nptl/ChangeLog 13 Feb 2009 23:36:40 -0000 1.1102 -+++ glibc-20090218T1534-fedora/nptl/ChangeLog 18 Feb 2009 15:49:35 -0000 1.706.2.168 -@@ -3411,6 +3411,15 @@ +--- glibc-20090309T1421/nptl/ChangeLog 9 Mar 2009 14:19:52 -0000 1.1107 ++++ glibc-20090309T1421-fedora/nptl/ChangeLog 9 Mar 2009 14:35:17 -0000 1.706.2.169 +@@ -3439,6 +3439,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -978,7 +978,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -4147,6 +4156,11 @@ +@@ -4175,6 +4184,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -990,7 +990,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6221,6 +6235,11 @@ +@@ -6249,6 +6263,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1002,8 +1002,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20090218T1534/nptl/Makefile 12 Nov 2008 13:38:23 -0000 1.195 -+++ glibc-20090218T1534-fedora/nptl/Makefile 12 Nov 2008 20:29:34 -0000 1.157.2.37 +--- glibc-20090309T1421/nptl/Makefile 12 Nov 2008 13:38:23 -0000 1.195 ++++ glibc-20090309T1421-fedora/nptl/Makefile 12 Nov 2008 20:29:34 -0000 1.157.2.37 @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1036,8 +1036,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20090218T1534/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20090218T1534-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20090309T1421/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20090309T1421-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1062,8 +1062,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20090218T1534/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090218T1534-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20090309T1421/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090309T1421-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1071,18 +1071,18 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20090218T1534/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 8 Mar 2008 01:57:04 -0000 1.16 -+++ glibc-20090218T1534-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 14 Mar 2008 22:36:45 -0000 1.8.2.9 -@@ -181,4 +181,7 @@ +--- glibc-20090309T1421/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 26 Feb 2009 16:22:45 -0000 1.18 ++++ glibc-20090309T1421-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 9 Mar 2009 14:35:18 -0000 1.8.2.10 +@@ -187,4 +187,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 +/* Streams are not available. */ +#define _XOPEN_STREAMS -1 + - #endif /* posix_opt.h */ ---- glibc-20090218T1534/nscd/nscd.conf 6 Nov 2007 00:50:48 -0000 1.16 -+++ glibc-20090218T1534-fedora/nscd/nscd.conf 12 Dec 2007 18:13:28 -0000 1.8.2.7 + #endif /* bits/posix_opt.h */ +--- glibc-20090309T1421/nscd/nscd.conf 6 Nov 2007 00:50:48 -0000 1.16 ++++ glibc-20090309T1421-fedora/nscd/nscd.conf 12 Dec 2007 18:13:28 -0000 1.8.2.7 @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1092,8 +1092,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-20090218T1534/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 -+++ glibc-20090218T1534-fedora/nscd/nscd.init 12 Dec 2007 18:13:28 -0000 1.6.2.6 +--- glibc-20090309T1421/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 ++++ glibc-20090309T1421-fedora/nscd/nscd.init 12 Dec 2007 18:13:28 -0000 1.6.2.6 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1150,8 +1150,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-20090218T1534/posix/Makefile 7 Feb 2009 08:18:49 -0000 1.204 -+++ glibc-20090218T1534-fedora/posix/Makefile 18 Feb 2009 15:49:37 -0000 1.171.2.28 +--- glibc-20090309T1421/posix/Makefile 7 Feb 2009 08:18:49 -0000 1.204 ++++ glibc-20090309T1421-fedora/posix/Makefile 18 Feb 2009 15:49:37 -0000 1.171.2.28 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1172,8 +1172,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-20090218T1534/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090218T1534-fedora/posix/getconf.speclist.h 18 Feb 2009 16:47:01 -0000 1.1.2.3 +--- glibc-20090309T1421/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090309T1421-fedora/posix/getconf.speclist.h 18 Feb 2009 16:47:01 -0000 1.1.2.3 @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1214,8 +1214,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-20090218T1534/resolv/Versions 1 Aug 2008 17:15:34 -0000 1.25 -+++ glibc-20090218T1534-fedora/resolv/Versions 2 Jan 2009 21:14:01 -0000 1.20.2.6 +--- glibc-20090309T1421/resolv/Versions 1 Aug 2008 17:15:34 -0000 1.25 ++++ glibc-20090309T1421-fedora/resolv/Versions 2 Jan 2009 21:14:01 -0000 1.20.2.6 @@ -102,7 +102,7 @@ libnss_dns { _nss_dns_gethostbyname_r; _nss_dns_getnetbyaddr_r; _nss_dns_getnetbyname_r; _nss_dns_getcanonname_r; @@ -1225,8 +1225,8 @@ } } ---- glibc-20090218T1534/streams/Makefile 23 Oct 2002 23:48:41 -0000 1.4 -+++ glibc-20090218T1534-fedora/streams/Makefile 14 Mar 2008 22:36:46 -0000 1.4.2.1 +--- glibc-20090309T1421/streams/Makefile 23 Oct 2002 23:48:41 -0000 1.4 ++++ glibc-20090309T1421-fedora/streams/Makefile 14 Mar 2008 22:36:46 -0000 1.4.2.1 @@ -21,7 +21,7 @@ # subdir := streams @@ -1236,8 +1236,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-20090218T1534/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20090218T1534-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20090309T1421/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20090309T1421-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1253,8 +1253,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20090218T1534/sysdeps/i386/Makefile 13 May 2008 05:30:43 -0000 1.21 -+++ glibc-20090218T1534-fedora/sysdeps/i386/Makefile 15 May 2008 07:57:47 -0000 1.16.2.5 +--- glibc-20090309T1421/sysdeps/i386/Makefile 13 May 2008 05:30:43 -0000 1.21 ++++ glibc-20090309T1421-fedora/sysdeps/i386/Makefile 15 May 2008 07:57:47 -0000 1.16.2.5 @@ -64,6 +64,14 @@ endif ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS))) @@ -1270,8 +1270,8 @@ endif ifeq ($(subdir),elf) ---- glibc-20090218T1534/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20090218T1534-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20090309T1421/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20090309T1421-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1283,8 +1283,8 @@ endif endif ---- glibc-20090218T1534/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20090218T1534-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20090309T1421/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20090309T1421-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1636,8 +1636,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20090218T1534/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090218T1534-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20090309T1421/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090309T1421-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1723,8 +1723,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20090218T1534/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 -+++ glibc-20090218T1534-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5 +--- glibc-20090309T1421/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 ++++ glibc-20090309T1421-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5 @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1733,8 +1733,8 @@ endif ifeq ($(subdir),elf) ---- glibc-20090218T1534/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 -+++ glibc-20090218T1534-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 +--- glibc-20090309T1421/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 ++++ glibc-20090309T1421-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1749,8 +1749,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-20090218T1534/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 00:24:52 -0000 1.15 -+++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 20:20:42 -0000 1.3.2.11 +--- glibc-20090309T1421/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 00:24:52 -0000 1.15 ++++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 20:20:42 -0000 1.3.2.11 @@ -27,13 +27,10 @@ #include #include @@ -1766,8 +1766,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-20090218T1534/sysdeps/unix/sysv/linux/dl-osinfo.h 11 Jan 2009 04:42:04 -0000 1.29 -+++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 4 Feb 2009 22:36:00 -0000 1.14.2.15 +--- glibc-20090309T1421/sysdeps/unix/sysv/linux/dl-osinfo.h 11 Jan 2009 04:42:04 -0000 1.29 ++++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 4 Feb 2009 22:36:00 -0000 1.14.2.15 @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -1815,8 +1815,8 @@ } else #endif ---- glibc-20090218T1534/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 -+++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 +--- glibc-20090309T1421/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 ++++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1859,8 +1859,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-20090218T1534/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 -+++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 +--- glibc-20090309T1421/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 ++++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 @@ -25,6 +25,24 @@ #include @@ -1886,8 +1886,8 @@ struct netlink_res { ---- glibc-20090218T1534/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20090309T1421/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -1897,8 +1897,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20090218T1534/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20090309T1421/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -1944,8 +1944,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20090218T1534/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 -+++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6 +--- glibc-20090309T1421/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 ++++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6 @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -1964,8 +1964,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-20090218T1534/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20090309T1421/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -2026,8 +2026,8 @@ + } while (0) + +#include_next ---- glibc-20090218T1534/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20090309T1421/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2060,29 +2060,29 @@ + } while (0) + #include_next ---- glibc-20090218T1534/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20090309T1421/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20090218T1534/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20090309T1421/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20090218T1534/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20090309T1421/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-20090218T1534/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 -+++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4 +--- glibc-20090309T1421/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 ++++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4 @@ -89,9 +89,6 @@ L(pseudo_end): ret @@ -2101,193 +2101,3 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) -2009-12-18 Jakub Jelinek - - * sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S: Use - .machine push; .machine "power6" and .machine pop around mtfsf - insns outside of _ARCH_PWR6 define. - * sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S: Likewise. - * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S: - Likewise. - * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S: - Likewise. - * sysdeps/powerpc/fpu/tst-setcontext-fpscr.c (_SET_DI_FPSCR): Likewise. - * sysdeps/powerpc/fpu/fenv_libc.h (fesetenv_register, - relax_fenv_state): Likewise. - ---- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S.jj 2008-11-17 03:49:06.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S 2009-02-18 22:55:07.000000000 +0100 -@@ -1,5 +1,6 @@ - /* Switch to context. -- Copyright (C) 2002, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. -+ Copyright (C) 2002, 2004, 2005, 2006, 2008, 2009 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -86,6 +87,8 @@ ENTRY(__novec_setcontext) - /* Use the extended four-operand version of the mtfsf insn. */ - mtfsf 0xff,fp0,1,0 - # else -+ .machine push -+ .machine "power6" - /* Availability of DFP indicates a 64-bit FPSCR. */ - andi. r6,r5,PPC_FEATURE_HAS_DFP - beq 5f -@@ -96,6 +99,7 @@ ENTRY(__novec_setcontext) - 5: - mtfsf 0xff,fp0 - 6: -+ .machine pop - # endif /* _ARCH_PWR6 */ - lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) - lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) -@@ -374,6 +378,8 @@ L(has_no_vec): - /* Use the extended four-operand version of the mtfsf insn. */ - mtfsf 0xff,fp0,1,0 - # else -+ .machine push -+ .machine "power6" - /* Availability of DFP indicates a 64-bit FPSCR. */ - andi. r6,r5,PPC_FEATURE_HAS_DFP - beq 7f -@@ -384,6 +390,7 @@ L(has_no_vec): - 7: - mtfsf 0xff,fp0 - 8: -+ .machine pop - # endif /* _ARCH_PWR6 */ - lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) - lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) ---- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S.jj 2008-11-17 03:49:30.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S 2009-02-18 22:55:37.000000000 +0100 -@@ -1,5 +1,6 @@ - /* Save current context and install the given one. -- Copyright (C) 2002, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. -+ Copyright (C) 2002, 2004, 2005, 2006, 2008, 2009 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -180,6 +181,8 @@ ENTRY(__novec_swapcontext) - /* Use the extended four-operand version of the mtfsf insn. */ - mtfsf 0xff,fp0,1,0 - # else -+ .machine push -+ .machine "power6" - /* Availability of DFP indicates a 64-bit FPSCR. */ - andi. r6,r8,PPC_FEATURE_HAS_DFP - beq 5f -@@ -190,6 +193,7 @@ ENTRY(__novec_swapcontext) - 5: - mtfsf 0xff,fp0 - 6: -+ .machine pop - #endif /* _ARCH_PWR6 */ - lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) - lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) -@@ -672,6 +676,8 @@ L(has_no_vec2): - /* Use the extended four-operand version of the mtfsf insn. */ - mtfsf 0xff,fp0,1,0 - # else -+ .machine push -+ .machine "power6" - /* Availability of DFP indicates a 64-bit FPSCR. */ - andi. r6,r8,PPC_FEATURE_HAS_DFP - beq 7f -@@ -682,6 +688,7 @@ L(has_no_vec2): - 7: - mtfsf 0xff,fp0 - 8: -+ .machine pop - #endif /* _ARCH_PWR6 */ - lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) - lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) ---- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S.jj 2009-01-30 21:30:33.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S 2009-02-18 22:52:48.000000000 +0100 -@@ -430,6 +430,8 @@ ENTRY(__CONTEXT_FUNC_NAME) - /* Use the extended four-operand version of the mtfsf insn. */ - mtfsf 0xff,fp31,1,0 - # else -+ .machine push -+ .machine "power6" - /* Availability of DFP indicates a 64-bit FPSCR. */ - andi. r6,r7,PPC_FEATURE_HAS_DFP - beq 7f -@@ -438,7 +440,7 @@ ENTRY(__CONTEXT_FUNC_NAME) - b 8f - /* Continue to operate on the FPSCR as if it were 32-bits. */ - 7: mtfsf 0xff,fp31 --8: -+8: .machine pop - #endif /* _ARCH_PWR6 */ - lfd fp1,_UC_FREGS+(1*8)(r31) - lfd fp2,_UC_FREGS+(2*8)(r31) ---- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S.jj 2009-01-30 21:29:24.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S 2009-02-18 22:52:39.000000000 +0100 -@@ -204,6 +204,8 @@ ENTRY(__CONTEXT_FUNC_NAME) - /* Use the extended four-operand version of the mtfsf insn. */ - mtfsf 0xff,fp31,1,0 - # else -+ .machine push -+ .machine "power6" - /* Availability of DFP indicates a 64-bit FPSCR. */ - andi. r6,r7,PPC_FEATURE_HAS_DFP - beq 7f -@@ -212,7 +214,7 @@ ENTRY(__CONTEXT_FUNC_NAME) - b 8f - /* Continue to operate on the FPSCR as if it were 32-bits. */ - 7: mtfsf 0xff,fp31 --8: -+8: .machine pop - # endif /* _ARCH_PWR6 */ - lfd fp1,_UC_FREGS+(1*8)(r31) - lfd fp2,_UC_FREGS+(2*8)(r31) ---- libc/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c.jj 2009-01-30 21:27:24.000000000 +0100 -+++ libc/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c 2009-02-18 23:40:01.000000000 +0100 -@@ -111,7 +111,11 @@ typedef unsigned int si_fpscr_t __attrib - tmp __attribute__ ((__aligned__(8))); \ - tmp.fpscr = __fpscr; \ - /* Set the entire 64-bit FPSCR. */ \ -- __asm__ ("lfd%U0 0,%0; mtfsf 255,0,1,0" : : "m" (tmp.d) : "fr0"); \ -+ __asm__ ("lfd%U0 0,%0; " \ -+ ".machine push; " \ -+ ".machine \"power6\"; " \ -+ "mtfsf 255,0,1,0; " \ -+ ".machine pop" : : "m" (tmp.d) : "fr0"); \ - tmp.d = 0; \ - __asm__("lfd%U0 0,%0" : : "m" (tmp.d) : "fr0"); \ - } ---- libc/sysdeps/powerpc/fpu/fenv_libc.h.jj 2008-11-17 02:32:11.000000000 +0100 -+++ libc/sysdeps/powerpc/fpu/fenv_libc.h 2009-02-18 23:42:15.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Internal libc stuff for floating point environment routines. -- Copyright (C) 1997, 2006, 2008 Free Software Foundation, Inc. -+ Copyright (C) 1997, 2006, 2008, 2009 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -39,7 +39,10 @@ libm_hidden_proto (__fe_nomask_env) - do { \ - double d = (env); \ - if(GLRO(dl_hwcap) & PPC_FEATURE_HAS_DFP) \ -- asm volatile ("mtfsf 0xff,%0,1,0" : : "f" (d)); \ -+ asm volatile (".machine push; " \ -+ ".machine \"power6\"; " \ -+ "mtfsf 0xff,%0,1,0; " \ -+ ".machine pop" : : "f" (d)); \ - else \ - asm volatile ("mtfsf 0xff,%0" : : "f" (d)); \ - } while(0) -@@ -52,8 +55,9 @@ libm_hidden_proto (__fe_nomask_env) - functions. */ - #define relax_fenv_state() \ - do { \ -- if(GLRO(dl_hwcap) & PPC_FEATURE_HAS_DFP) \ -- asm ("mtfsfi 7,0,1"); \ -+ if (GLRO(dl_hwcap) & PPC_FEATURE_HAS_DFP) \ -+ asm (".machine push; .machine \"power6\"; " \ -+ "mtfsfi 7,0,1; .machine pop"); \ - asm ("mtfsfi 7,0"); \ - } while(0) - Index: glibc.spec =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v retrieving revision 1.382 retrieving revision 1.383 diff -u -r1.382 -r1.383 --- glibc.spec 28 Feb 2009 02:29:56 -0000 1.382 +++ glibc.spec 9 Mar 2009 15:00:02 -0000 1.383 @@ -1,6 +1,6 @@ -%define glibcdate 20090218T1534 +%define glibcdate 20090309T1421 %define glibcname glibc -%define glibcsrcdir glibc-20090218T1534 +%define glibcsrcdir glibc-20090309T1421 %define glibc_release_tarballs 0 %define run_glibc_tests 1 %define auxarches i686 athlon sparcv9v sparc64v alphaev6 @@ -23,7 +23,7 @@ Summary: The GNU libc libraries Name: glibc Version: 2.9.90 -Release: 8.1 +Release: 9 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -77,8 +77,6 @@ %define __find_provides %{_builddir}/%{glibcsrcdir}/find_provides.sh %define _filter_GLIBC_PRIVATE 1 -Patch2: thread_db.patch - %description The glibc package contains standard libraries which are used by multiple programs on the system. In order to save disk space and @@ -235,8 +233,6 @@ %endif %endif -%patch2 -p0 - # A lot of programs still misuse memcpy when they have to use # memmove. The memcpy implementation below is not tolerant at # all. @@ -607,10 +603,10 @@ egrep -v "(%{_prefix}/include)|(%{_infodir})" > rpm.filelist grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist \ - | grep '/lib\(\(c\|pthread\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \ + | grep '/lib\(\(c\|pthread\|nldbl\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \ >> devel.filelist grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist \ - | grep -v '/lib\(\(c\|pthread\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \ + | grep -v '/lib\(\(c\|pthread\|nldbl\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \ > static.filelist grep '%{_prefix}/%{_lib}/.*\.o' < rpm.filelist >> devel.filelist grep '%{_prefix}/%{_lib}/lib.*\.so' < rpm.filelist >> devel.filelist @@ -756,7 +752,7 @@ %endif pushd $RPM_BUILD_ROOT/usr/%{_lib}/ -$GCC -Wl,-r -nostdlib -o libpthread.o -Wl,--whole-archive ./libpthread.a +$GCC -r -nostdlib -o libpthread.o -Wl,--whole-archive ./libpthread.a rm libpthread.a ar rcs libpthread.a libpthread.o rm libpthread.o @@ -1017,6 +1013,11 @@ %endif %changelog +* Mon Mar 9 2009 Jakub Jelinek 2.9.90-9 +- update from trunk + - POSIX 2008 support: -D_XOPEN_SOURCE=700 and -D_POSIX_C_SOURCE=200809L +- move libnldbl_nonshared.a on ppc*/s390*/sparc* back to glibc-devel + * Fri Feb 27 2009 Roland McGrath - 2.9.90-8.1 - fix libthread_db (#487212) Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 18 Feb 2009 20:47:04 -0000 1.6 +++ import.log 9 Mar 2009 15:00:02 -0000 1.7 @@ -4,3 +4,4 @@ glibc-2_9_90-2:HEAD:glibc-2.9.90-2.src.rpm:1231411404 glibc-2_9_90-3:HEAD:glibc-2.9.90-3.src.rpm:1233787870 glibc-2_9_90-4:HEAD:glibc-2.9.90-4.src.rpm:1234989992 +glibc-2_9_90-9:HEAD:glibc-2.9.90-9.src.rpm:1236610744 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v retrieving revision 1.287 retrieving revision 1.288 diff -u -r1.287 -r1.288 --- sources 18 Feb 2009 20:47:04 -0000 1.287 +++ sources 9 Mar 2009 15:00:03 -0000 1.288 @@ -1,2 +1,2 @@ -086325bc4b2a05d1870f12b627d894ca glibc-20090218T1534.tar.bz2 -407b035feb8ac8f685409d8208f99605 glibc-fedora-20090218T1534.tar.bz2 +5dd18e197bad27f4b286cef3f7f5c7f6 glibc-20090309T1421.tar.bz2 +f04dcc55050cf57727323ff916bd0612 glibc-fedora-20090309T1421.tar.bz2 --- thread_db.patch DELETED --- From uwog at fedoraproject.org Mon Mar 9 15:03:06 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Mon, 9 Mar 2009 15:03:06 +0000 (UTC) Subject: rpms/abiword/devel .cvsignore, 1.23, 1.24 abiword.spec, 1.73, 1.74 sources, 1.23, 1.24 Message-ID: <20090309150306.5B25870034@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26063 Modified Files: .cvsignore abiword.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/abiword/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 10 Jan 2009 17:08:48 -0000 1.23 +++ .cvsignore 9 Mar 2009 15:02:35 -0000 1.24 @@ -1,4 +1,4 @@ -abiword-2.6.6.tar.gz -abiword-docs-2.6.6.tar.gz -abiword-extras-2.6.6.tar.gz -abiword-plugins-2.6.6.tar.gz +abiword-2.6.8.tar.gz +abiword-docs-2.6.8.tar.gz +abiword-extras-2.6.8.tar.gz +abiword-plugins-2.6.8.tar.gz Index: abiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- abiword.spec 23 Feb 2009 23:55:40 -0000 1.73 +++ abiword.spec 9 Mar 2009 15:02:35 -0000 1.74 @@ -1,13 +1,13 @@ %define majorversion 2 %define minorversion 6 -%define microversion 6 +%define microversion 8 %define olpc_build 0 Summary: The AbiWord word processor Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 10%{?dist} +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -214,6 +214,9 @@ %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %changelog +* Mon Mar 09 2009 Marc Maurer - 1:2.6.8-1 +- New upstream release + * Mon Feb 23 2009 Fedora Release Engineering - 1:2.6.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/abiword/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 10 Jan 2009 17:08:48 -0000 1.23 +++ sources 9 Mar 2009 15:02:35 -0000 1.24 @@ -1,4 +1,4 @@ -b9de84f03f555d4490b63e5b7f53e2f1 abiword-2.6.6.tar.gz -833129f266e699b3cf0f3774e005a312 abiword-docs-2.6.6.tar.gz -15db5e3ffa5429d2ce773351fc6fdb72 abiword-extras-2.6.6.tar.gz -45dabc491976e3f21d943817e61b9d89 abiword-plugins-2.6.6.tar.gz +fab04d8ef999c303f720197adf261310 abiword-2.6.8.tar.gz +5698c79cfa179f4b15c82a699d11a309 abiword-docs-2.6.8.tar.gz +e3cfff6ad4cda3e4200a75fd2665857a abiword-extras-2.6.8.tar.gz +421c49723e209c971ddb0798c1b313a9 abiword-plugins-2.6.8.tar.gz From jakub at fedoraproject.org Mon Mar 9 15:03:51 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Mon, 9 Mar 2009 15:03:51 +0000 (UTC) Subject: rpms/glibc/devel glibc-fedora.patch,1.295,1.296 Message-ID: <20090309150351.CA98070034@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/glibc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26586 Modified Files: glibc-fedora.patch Log Message: 2.9.90-9 glibc-fedora.patch: Index: glibc-fedora.patch =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.295 retrieving revision 1.296 diff -u -r1.295 -r1.296 --- glibc-fedora.patch 9 Mar 2009 15:00:02 -0000 1.295 +++ glibc-fedora.patch 9 Mar 2009 15:03:51 -0000 1.296 @@ -2101,3 +2101,193 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) +2009-02-18 Jakub Jelinek + + * sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S: Use + .machine push; .machine "power6" and .machine pop around mtfsf + insns outside of _ARCH_PWR6 define. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S: + Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S: + Likewise. + * sysdeps/powerpc/fpu/tst-setcontext-fpscr.c (_SET_DI_FPSCR): Likewise. + * sysdeps/powerpc/fpu/fenv_libc.h (fesetenv_register, + relax_fenv_state): Likewise. + +--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S.jj 2008-11-17 03:49:06.000000000 +0100 ++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S 2009-02-18 22:55:07.000000000 +0100 +@@ -1,5 +1,6 @@ + /* Switch to context. +- Copyright (C) 2002, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. ++ Copyright (C) 2002, 2004, 2005, 2006, 2008, 2009 ++ Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -86,6 +87,8 @@ ENTRY(__novec_setcontext) + /* Use the extended four-operand version of the mtfsf insn. */ + mtfsf 0xff,fp0,1,0 + # else ++ .machine push ++ .machine "power6" + /* Availability of DFP indicates a 64-bit FPSCR. */ + andi. r6,r5,PPC_FEATURE_HAS_DFP + beq 5f +@@ -96,6 +99,7 @@ ENTRY(__novec_setcontext) + 5: + mtfsf 0xff,fp0 + 6: ++ .machine pop + # endif /* _ARCH_PWR6 */ + lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) + lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) +@@ -374,6 +378,8 @@ L(has_no_vec): + /* Use the extended four-operand version of the mtfsf insn. */ + mtfsf 0xff,fp0,1,0 + # else ++ .machine push ++ .machine "power6" + /* Availability of DFP indicates a 64-bit FPSCR. */ + andi. r6,r5,PPC_FEATURE_HAS_DFP + beq 7f +@@ -384,6 +390,7 @@ L(has_no_vec): + 7: + mtfsf 0xff,fp0 + 8: ++ .machine pop + # endif /* _ARCH_PWR6 */ + lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) + lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) +--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S.jj 2008-11-17 03:49:30.000000000 +0100 ++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S 2009-02-18 22:55:37.000000000 +0100 +@@ -1,5 +1,6 @@ + /* Save current context and install the given one. +- Copyright (C) 2002, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. ++ Copyright (C) 2002, 2004, 2005, 2006, 2008, 2009 ++ Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -180,6 +181,8 @@ ENTRY(__novec_swapcontext) + /* Use the extended four-operand version of the mtfsf insn. */ + mtfsf 0xff,fp0,1,0 + # else ++ .machine push ++ .machine "power6" + /* Availability of DFP indicates a 64-bit FPSCR. */ + andi. r6,r8,PPC_FEATURE_HAS_DFP + beq 5f +@@ -190,6 +193,7 @@ ENTRY(__novec_swapcontext) + 5: + mtfsf 0xff,fp0 + 6: ++ .machine pop + #endif /* _ARCH_PWR6 */ + lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) + lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) +@@ -672,6 +676,8 @@ L(has_no_vec2): + /* Use the extended four-operand version of the mtfsf insn. */ + mtfsf 0xff,fp0,1,0 + # else ++ .machine push ++ .machine "power6" + /* Availability of DFP indicates a 64-bit FPSCR. */ + andi. r6,r8,PPC_FEATURE_HAS_DFP + beq 7f +@@ -682,6 +688,7 @@ L(has_no_vec2): + 7: + mtfsf 0xff,fp0 + 8: ++ .machine pop + #endif /* _ARCH_PWR6 */ + lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) + lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) +--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S.jj 2009-01-30 21:30:33.000000000 +0100 ++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S 2009-02-18 22:52:48.000000000 +0100 +@@ -430,6 +430,8 @@ ENTRY(__CONTEXT_FUNC_NAME) + /* Use the extended four-operand version of the mtfsf insn. */ + mtfsf 0xff,fp31,1,0 + # else ++ .machine push ++ .machine "power6" + /* Availability of DFP indicates a 64-bit FPSCR. */ + andi. r6,r7,PPC_FEATURE_HAS_DFP + beq 7f +@@ -438,7 +440,7 @@ ENTRY(__CONTEXT_FUNC_NAME) + b 8f + /* Continue to operate on the FPSCR as if it were 32-bits. */ + 7: mtfsf 0xff,fp31 +-8: ++8: .machine pop + #endif /* _ARCH_PWR6 */ + lfd fp1,_UC_FREGS+(1*8)(r31) + lfd fp2,_UC_FREGS+(2*8)(r31) +--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S.jj 2009-01-30 21:29:24.000000000 +0100 ++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S 2009-02-18 22:52:39.000000000 +0100 +@@ -204,6 +204,8 @@ ENTRY(__CONTEXT_FUNC_NAME) + /* Use the extended four-operand version of the mtfsf insn. */ + mtfsf 0xff,fp31,1,0 + # else ++ .machine push ++ .machine "power6" + /* Availability of DFP indicates a 64-bit FPSCR. */ + andi. r6,r7,PPC_FEATURE_HAS_DFP + beq 7f +@@ -212,7 +214,7 @@ ENTRY(__CONTEXT_FUNC_NAME) + b 8f + /* Continue to operate on the FPSCR as if it were 32-bits. */ + 7: mtfsf 0xff,fp31 +-8: ++8: .machine pop + # endif /* _ARCH_PWR6 */ + lfd fp1,_UC_FREGS+(1*8)(r31) + lfd fp2,_UC_FREGS+(2*8)(r31) +--- libc/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c.jj 2009-01-30 21:27:24.000000000 +0100 ++++ libc/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c 2009-02-18 23:40:01.000000000 +0100 +@@ -111,7 +111,11 @@ typedef unsigned int si_fpscr_t __attrib + tmp __attribute__ ((__aligned__(8))); \ + tmp.fpscr = __fpscr; \ + /* Set the entire 64-bit FPSCR. */ \ +- __asm__ ("lfd%U0 0,%0; mtfsf 255,0,1,0" : : "m" (tmp.d) : "fr0"); \ ++ __asm__ ("lfd%U0 0,%0; " \ ++ ".machine push; " \ ++ ".machine \"power6\"; " \ ++ "mtfsf 255,0,1,0; " \ ++ ".machine pop" : : "m" (tmp.d) : "fr0"); \ + tmp.d = 0; \ + __asm__("lfd%U0 0,%0" : : "m" (tmp.d) : "fr0"); \ + } +--- libc/sysdeps/powerpc/fpu/fenv_libc.h.jj 2008-11-17 02:32:11.000000000 +0100 ++++ libc/sysdeps/powerpc/fpu/fenv_libc.h 2009-02-18 23:42:15.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Internal libc stuff for floating point environment routines. +- Copyright (C) 1997, 2006, 2008 Free Software Foundation, Inc. ++ Copyright (C) 1997, 2006, 2008, 2009 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -39,7 +39,10 @@ libm_hidden_proto (__fe_nomask_env) + do { \ + double d = (env); \ + if(GLRO(dl_hwcap) & PPC_FEATURE_HAS_DFP) \ +- asm volatile ("mtfsf 0xff,%0,1,0" : : "f" (d)); \ ++ asm volatile (".machine push; " \ ++ ".machine \"power6\"; " \ ++ "mtfsf 0xff,%0,1,0; " \ ++ ".machine pop" : : "f" (d)); \ + else \ + asm volatile ("mtfsf 0xff,%0" : : "f" (d)); \ + } while(0) +@@ -52,8 +55,9 @@ libm_hidden_proto (__fe_nomask_env) + functions. */ + #define relax_fenv_state() \ + do { \ +- if(GLRO(dl_hwcap) & PPC_FEATURE_HAS_DFP) \ +- asm ("mtfsfi 7,0,1"); \ ++ if (GLRO(dl_hwcap) & PPC_FEATURE_HAS_DFP) \ ++ asm (".machine push; .machine \"power6\"; " \ ++ "mtfsfi 7,0,1; .machine pop"); \ + asm ("mtfsfi 7,0"); \ + } while(0) + From katzj at fedoraproject.org Mon Mar 9 15:05:26 2009 From: katzj at fedoraproject.org (Jeremy Katz) Date: Mon, 9 Mar 2009 15:05:26 +0000 (UTC) Subject: rpms/livecd-tools/devel .cvsignore, 1.18, 1.19 livecd-tools.spec, 1.22, 1.23 sources, 1.18, 1.19 Message-ID: <20090309150526.EF87770034@cvs1.fedora.phx.redhat.com> Author: katzj Update of /cvs/pkgs/rpms/livecd-tools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26918 Modified Files: .cvsignore livecd-tools.spec sources Log Message: * Mon Mar 9 2009 Jeremy Katz - 022-1 - Fixes for hybird GPT/MBR usb sticks (Stewart Adam) - Support setting SELinux booleans (Dan Walsh) - Fix unicode error messages (Felix Schwarz) - Update man pages (Chris Curran, #484627) - Support syslinux under /usr/share - Remove some legacy support from livecd-iso-to-disk - Basic support for multi-image usb sticks Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/livecd-tools/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 19 Jan 2009 16:28:48 -0000 1.18 +++ .cvsignore 9 Mar 2009 15:04:56 -0000 1.19 @@ -1 +1 @@ -livecd-tools-021.tar.bz2 +livecd-tools-022.tar.bz2 Index: livecd-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/livecd-tools/devel/livecd-tools.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- livecd-tools.spec 25 Feb 2009 20:39:46 -0000 1.22 +++ livecd-tools.spec 9 Mar 2009 15:04:56 -0000 1.23 @@ -4,8 +4,8 @@ Summary: Tools for building live CD's Name: livecd-tools -Version: 021 -Release: 2%{?dist} +Version: 022 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd @@ -67,6 +67,15 @@ %{python_sitelib}/imgcreate/*.pyc %changelog +* Mon Mar 9 2009 Jeremy Katz - 022-1 +- Fixes for hybird GPT/MBR usb sticks (Stewart Adam) +- Support setting SELinux booleans (Dan Walsh) +- Fix unicode error messages (Felix Schwarz) +- Update man pages (Chris Curran, #484627) +- Support syslinux under /usr/share +- Remove some legacy support from livecd-iso-to-disk +- Basic support for multi-image usb sticks + * Wed Feb 25 2009 Fedora Release Engineering - 021-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/livecd-tools/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 19 Jan 2009 16:28:48 -0000 1.18 +++ sources 9 Mar 2009 15:04:56 -0000 1.19 @@ -1 +1 @@ -92d8706282f51ab188c09d2bc4461532 livecd-tools-021.tar.bz2 +6a4dca80700cb74f902ac07de6d25356 livecd-tools-022.tar.bz2 From jorton at fedoraproject.org Mon Mar 9 15:11:53 2009 From: jorton at fedoraproject.org (Joe Orton) Date: Mon, 9 Mar 2009 15:11:53 +0000 (UTC) Subject: rpms/subversion/devel subversion-1.5.6-lt22.patch, NONE, 1.1 subversion.spec, 1.132, 1.133 Message-ID: <20090309151153.0E99770034@cvs1.fedora.phx.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28420 Modified Files: subversion.spec Added Files: subversion-1.5.6-lt22.patch Log Message: * Mon Mar 9 2009 Joe Orton 1.5.6-2 - update to 1.5.6 - autoload psvn (#238491, Tom Tromey) - regenerate swig bindings (#480503) - fix build with libtool 2.2 (#469524) subversion-1.5.6-lt22.patch: --- NEW FILE subversion-1.5.6-lt22.patch --- --- subversion-1.5.6/autogen.sh.lt22 +++ subversion-1.5.6/autogen.sh @@ -48,53 +48,7 @@ if [ "x$libtoolize" = "x" ]; then fi rm -f build/config.guess build/config.sub -$libtoolize --copy --automake --force - -ltpath="`dirname $libtoolize`" -ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} - -if [ ! -f $ltfile ]; then - echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)" - exit 1 -fi - -echo "Copying libtool helper: $ltfile" -# An ancient helper might already be present from previous builds, -# and it might be write-protected (e.g. mode 444, seen on FreeBSD). -# This would cause cp to fail and print an error message, but leave -# behind a potentially outdated libtool helper. So, remove before -# copying: -rm -f build/libtool.m4 -cp $ltfile build/libtool.m4 - -for file in ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4; do - rm -f build/$file - - if [ $lt_major_version -ge 2 ]; then - ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/$file} - - if [ ! -f $ltfile ]; then - echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)" - exit 1 - fi - - echo "Copying libtool helper: $ltfile" - cp $ltfile build/$file - fi -done - -if [ $lt_major_version -ge 2 ]; then - for file in config.guess config.sub; do - configfile=${LIBTOOL_CONFIG-`cd $ltpath/../share/libtool/config ; pwd`/$file} - - if [ ! -f $configfile ]; then - echo "$configfile not found (try setting the LIBTOOL_CONFIG environment variable)" - exit 1 - fi - - cp $configfile build/$file - done -fi +$libtoolize --copy --automake --force --install # Create the file detailing all of the build outputs for SVN. # --- subversion-1.5.6/configure.ac.lt22 +++ subversion-1.5.6/configure.ac @@ -11,6 +11,7 @@ AC_INIT([subversion], AC_CONFIG_SRCDIR(subversion/include/svn_types.h) AC_CONFIG_AUX_DIR([build]) +AC_CONFIG_MACRO_DIR([build]) AC_MSG_NOTICE([Configuring Subversion ]AC_PACKAGE_VERSION) @@ -27,6 +28,7 @@ SVN_CONFIG_NICE(config.nice) # Look for a C compiler (before anything can set CFLAGS) AC_PROG_CC +AC_PROG_CXX # Look for a C pre-processor AC_PROG_CPP @@ -687,8 +689,7 @@ if test "$do_javahl_build" = "yes"; then Please specify a suitable JDK using the --with-jdk option.]) fi - AC_PROG_CXX - + dnl The temporary directory where libtool compiles libsvnjavahl. dnl N.B. objdir is "the name of the directory that contains temporary dnl libtool files" and it is set by libtool.m4 Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- subversion.spec 9 Mar 2009 14:18:28 -0000 1.132 +++ subversion.spec 9 Mar 2009 15:11:22 -0000 1.133 @@ -24,6 +24,7 @@ Source3: filter-requires.sh Source4: http://www.xsteve.at/prg/emacs/psvn.el Source5: psvn-init.el +Patch1: subversion-1.5.6-lt22.patch Patch2: subversion-0.20.1-deplibs.patch Patch3: subversion-1.5.1-rpath.patch Patch6: subversion-1.5.2-pie.patch @@ -104,6 +105,7 @@ %prep %setup -q +%patch1 -p1 -b .lt22 %patch2 -p1 -b .deplibs %patch3 -p1 -b .rpath %patch6 -p1 -b .pie @@ -130,7 +132,8 @@ --with-swig --with-neon=%{_prefix} \ --with-ruby-sitedir=%{ruby_sitearch} \ --with-apxs=%{_sbindir}/apxs --disable-mod-activation \ - --disable-static --with-sasl=%{_prefix} + --disable-static --with-sasl=%{_prefix} \ + --disable-neon-version-check make %{?_smp_mflags} all make swig-py swig-py-lib %{swigdirs} make swig-pl swig-pl-lib swig-rb swig-rb-lib @@ -285,6 +288,7 @@ - update to 1.5.6 - autoload psvn (#238491, Tom Tromey) - regenerate swig bindings (#480503) +- fix build with libtool 2.2 (#469524) * Wed Feb 25 2009 Fedora Release Engineering - 1.5.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jorton at fedoraproject.org Mon Mar 9 15:16:18 2009 From: jorton at fedoraproject.org (Joe Orton) Date: Mon, 9 Mar 2009 15:16:18 +0000 (UTC) Subject: rpms/subversion/devel subversion.spec,1.133,1.134 Message-ID: <20090309151618.ACCA170034@cvs1.fedora.phx.redhat.com> Author: jorton Update of /cvs/extras/rpms/subversion/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29342 Modified Files: subversion.spec Log Message: * Mon Mar 9 2009 Joe Orton 1.5.6-3 - update to 1.5.6 - autoload psvn (#238491, Tom Tromey) - regenerate swig bindings (#480503) - fix build with libtool 2.2 (#469524) Index: subversion.spec =================================================================== RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- subversion.spec 9 Mar 2009 15:11:22 -0000 1.133 +++ subversion.spec 9 Mar 2009 15:15:48 -0000 1.134 @@ -15,7 +15,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.5.6 -Release: 2 +Release: 3 License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -284,7 +284,7 @@ %endif %changelog -* Mon Mar 9 2009 Joe Orton 1.5.6-2 +* Mon Mar 9 2009 Joe Orton 1.5.6-3 - update to 1.5.6 - autoload psvn (#238491, Tom Tromey) - regenerate swig bindings (#480503) From uwog at fedoraproject.org Mon Mar 9 15:19:37 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Mon, 9 Mar 2009 15:19:37 +0000 (UTC) Subject: rpms/abiword/F-10 .cvsignore, 1.23, 1.24 abiword.spec, 1.72, 1.73 sources, 1.23, 1.24 Message-ID: <20090309151937.CA80870034@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30038 Modified Files: .cvsignore abiword.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-10/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 10 Jan 2009 17:52:52 -0000 1.23 +++ .cvsignore 9 Mar 2009 15:19:07 -0000 1.24 @@ -1,4 +1,4 @@ -abiword-2.6.6.tar.gz -abiword-docs-2.6.6.tar.gz -abiword-extras-2.6.6.tar.gz -abiword-plugins-2.6.6.tar.gz +abiword-2.6.8.tar.gz +abiword-docs-2.6.8.tar.gz +abiword-extras-2.6.8.tar.gz +abiword-plugins-2.6.8.tar.gz Index: abiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-10/abiword.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- abiword.spec 10 Jan 2009 17:52:52 -0000 1.72 +++ abiword.spec 9 Mar 2009 15:19:07 -0000 1.73 @@ -1,6 +1,6 @@ %define majorversion 2 %define minorversion 6 -%define microversion 6 +%define microversion 8 %define olpc_build 0 @@ -214,6 +214,9 @@ %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %changelog +* Mon Mar 09 2009 Marc Maurer - 1:2.6.8-1 +- New upstream release + * Sat Jan 10 2009 Marc Maurer - 1:2.6.6-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-10/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 10 Jan 2009 17:52:52 -0000 1.23 +++ sources 9 Mar 2009 15:19:07 -0000 1.24 @@ -1,4 +1,4 @@ -b9de84f03f555d4490b63e5b7f53e2f1 abiword-2.6.6.tar.gz -833129f266e699b3cf0f3774e005a312 abiword-docs-2.6.6.tar.gz -15db5e3ffa5429d2ce773351fc6fdb72 abiword-extras-2.6.6.tar.gz -45dabc491976e3f21d943817e61b9d89 abiword-plugins-2.6.6.tar.gz +fab04d8ef999c303f720197adf261310 abiword-2.6.8.tar.gz +5698c79cfa179f4b15c82a699d11a309 abiword-docs-2.6.8.tar.gz +e3cfff6ad4cda3e4200a75fd2665857a abiword-extras-2.6.8.tar.gz +421c49723e209c971ddb0798c1b313a9 abiword-plugins-2.6.8.tar.gz From rdieter at fedoraproject.org Mon Mar 9 15:22:24 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 9 Mar 2009 15:22:24 +0000 (UTC) Subject: rpms/kdebase-workspace/devel .cvsignore,1.27,1.28 Message-ID: <20090309152224.2E00870034@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30733 Modified Files: .cvsignore Log Message: cleanup Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 27 Feb 2009 11:54:47 -0000 1.27 +++ .cvsignore 9 Mar 2009 15:21:53 -0000 1.28 @@ -1,4 +1 @@ -kdebase-workspace-4.1.85.tar.bz2 -kdebase-workspace-4.1.96.tar.bz2 -kdebase-workspace-4.2.0.tar.bz2 kdebase-workspace-4.2.1.tar.bz2 From rdieter at fedoraproject.org Mon Mar 9 15:24:25 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 9 Mar 2009 15:24:25 +0000 (UTC) Subject: rpms/kdebase-workspace/F-10 kdebase-workspace-4.2.1-kde#185736.patch, NONE, 1.1 kdebase-workspace.spec, 1.165, 1.166 Message-ID: <20090309152425.2459270034@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31228 Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.2.1-kde#185736.patch Log Message: * Mon Mar 09 2009 Rex Dieter - 4.2.1-4 - kde 4.2 update crashes plasma (kdebug#185736) kdebase-workspace-4.2.1-kde#185736.patch: --- NEW FILE kdebase-workspace-4.2.1-kde#185736.patch --- --- branches/KDE/4.2/kdebase/workspace/plasma/shells/desktop/panelview.cpp 2009/02/24 04:51:03 930724 +++ branches/KDE/4.2/kdebase/workspace/plasma/shells/desktop/panelview.cpp 2009/03/03 23:39:55 934863 @@ -203,6 +203,11 @@ m_triggerEntered(false) { Q_ASSERT(qobject_cast(panel->scene())); + + m_strutsTimer = new QTimer(this); + m_strutsTimer->setSingleShot(true); + connect(m_strutsTimer, SIGNAL(timeout()), this, SLOT(updateStruts())); + if (panel) { connect(panel, SIGNAL(destroyed(QObject*)), this, SLOT(panelDeleted())); connect(panel, SIGNAL(toolBoxToggled()), this, SLOT(togglePanelController())); @@ -248,10 +253,6 @@ KWindowSystem::setOnAllDesktops(winId(), true); QTimer::singleShot(0, this, SLOT(init())); - - m_strutsTimer = new QTimer(this); - m_strutsTimer->setSingleShot(true); - connect(m_strutsTimer,SIGNAL(timeout()),this,SLOT(updateStruts())); } PanelView::~PanelView() Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- kdebase-workspace.spec 5 Mar 2009 01:32:31 -0000 1.165 +++ kdebase-workspace.spec 9 Mar 2009 15:23:54 -0000 1.166 @@ -8,7 +8,7 @@ Name: kdebase-workspace Version: 4.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -42,6 +42,8 @@ Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch # from 4.3: http://bugs.kde.org/180576 Patch103: kdebase-workspace-4.2.0-kde#180576.patch +# 4.2 , http://bugs.kde.org/185736 +Patch104: kdebase-workspace-4.2.1-kde#185736.patch Provides: kdebase-kdm = 6:%{version}-%{release} Provides: kdm = %{version}-%{release} @@ -222,6 +224,8 @@ %patch101 -p0 -b .solid-bluetoothTrunkTo42 %endif %patch103 -p1 -b .kde#180576 +%patch104 -p5 -b .kde#185736 + %build @@ -370,6 +374,9 @@ %changelog +* Mon Mar 09 2009 Rex Dieter - 4.2.1-4 +- kde 4.2 update crashes plasma (kdebug#185736) + * Wed Mar 04 2009 Rex Dieter - 4.2.1-3 - move designer plugins to main/runtime (#487622) From rdieter at fedoraproject.org Mon Mar 9 15:25:33 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 9 Mar 2009 15:25:33 +0000 (UTC) Subject: rpms/kdebase-workspace/F-9 kdebase-workspace-4.2.1-kde#185736.patch, NONE, 1.1 kdebase-workspace.spec, 1.138, 1.139 Message-ID: <20090309152533.1C89A70034@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase-workspace/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31565 Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.2.1-kde#185736.patch Log Message: * Mon Mar 09 2009 Rex Dieter - 4.2.1-4 - kde 4.2 update crashes plasma (kdebug#185736) kdebase-workspace-4.2.1-kde#185736.patch: --- NEW FILE kdebase-workspace-4.2.1-kde#185736.patch --- --- branches/KDE/4.2/kdebase/workspace/plasma/shells/desktop/panelview.cpp 2009/02/24 04:51:03 930724 +++ branches/KDE/4.2/kdebase/workspace/plasma/shells/desktop/panelview.cpp 2009/03/03 23:39:55 934863 @@ -203,6 +203,11 @@ m_triggerEntered(false) { Q_ASSERT(qobject_cast(panel->scene())); + + m_strutsTimer = new QTimer(this); + m_strutsTimer->setSingleShot(true); + connect(m_strutsTimer, SIGNAL(timeout()), this, SLOT(updateStruts())); + if (panel) { connect(panel, SIGNAL(destroyed(QObject*)), this, SLOT(panelDeleted())); connect(panel, SIGNAL(toolBoxToggled()), this, SLOT(togglePanelController())); @@ -248,10 +253,6 @@ KWindowSystem::setOnAllDesktops(winId(), true); QTimer::singleShot(0, this, SLOT(init())); - - m_strutsTimer = new QTimer(this); - m_strutsTimer->setSingleShot(true); - connect(m_strutsTimer,SIGNAL(timeout()),this,SLOT(updateStruts())); } PanelView::~PanelView() Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- kdebase-workspace.spec 5 Mar 2009 01:32:15 -0000 1.138 +++ kdebase-workspace.spec 9 Mar 2009 15:25:02 -0000 1.139 @@ -8,7 +8,7 @@ Name: kdebase-workspace Version: 4.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -42,6 +42,8 @@ Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch # from 4.3: http://bugs.kde.org/180576 Patch103: kdebase-workspace-4.2.0-kde#180576.patch +# 4.2 , http://bugs.kde.org/185736 +Patch104: kdebase-workspace-4.2.1-kde#185736.patch Provides: kdebase-kdm = 6:%{version}-%{release} Provides: kdm = %{version}-%{release} @@ -222,6 +224,8 @@ %patch101 -p0 -b .solid-bluetoothTrunkTo42 %endif %patch103 -p1 -b .kde#180576 +%patch104 -p5 -b .kde#185736 + %build @@ -370,6 +374,9 @@ %changelog +* Mon Mar 09 2009 Rex Dieter - 4.2.1-4 +- kde 4.2 update crashes plasma (kdebug#185736) + * Wed Mar 04 2009 Rex Dieter - 4.2.1-3 - move designer plugins to main/runtime (#487622) From cweyl at fedoraproject.org Mon Mar 9 15:28:28 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 9 Mar 2009 15:28:28 +0000 (UTC) Subject: rpms/perl-Catalyst-Action-RenderView/devel .cvsignore, 1.4, 1.5 perl-Catalyst-Action-RenderView.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <20090309152829.0042670034@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Catalyst-Action-RenderView/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32338 Modified Files: .cvsignore perl-Catalyst-Action-RenderView.spec sources Log Message: * Mon Mar 09 2009 Chris Weyl 0.09-1 - update to 0.09 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Action-RenderView/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 May 2008 06:15:36 -0000 1.4 +++ .cvsignore 9 Mar 2009 15:27:58 -0000 1.5 @@ -1 +1 @@ -Catalyst-Action-RenderView-0.08.tar.gz +Catalyst-Action-RenderView-0.09.tar.gz Index: perl-Catalyst-Action-RenderView.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Action-RenderView/devel/perl-Catalyst-Action-RenderView.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Catalyst-Action-RenderView.spec 26 Feb 2009 12:01:17 -0000 1.6 +++ perl-Catalyst-Action-RenderView.spec 9 Mar 2009 15:27:58 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Catalyst-Action-RenderView -Version: 0.08 -Release: 2%{?dist} +Version: 0.09 +Release: 1%{?dist} Summary: Sensible default end action for view renders License: GPL+ or Artistic Group: Development/Libraries @@ -16,6 +16,7 @@ BuildRequires: perl(Test::More) # cpan BuildRequires: perl(Catalyst) >= 5.7 +BuildRequires: perl(MRO::Compat) BuildRequires: perl(Module::Build) BuildRequires: perl(Data::Visitor) >= 0.08 # test @@ -92,6 +93,9 @@ %{_mandir}/man3/* %changelog +* Mon Mar 09 2009 Chris Weyl 0.09-1 +- update to 0.09 + * Thu Feb 26 2009 Fedora Release Engineering - 0.08-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Action-RenderView/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 May 2008 06:15:36 -0000 1.4 +++ sources 9 Mar 2009 15:27:58 -0000 1.5 @@ -1 +1 @@ -47a4771bed9b9b065cc83be14632f433 Catalyst-Action-RenderView-0.08.tar.gz +9a964d2c8d5cee6c82efc97e11565c3d Catalyst-Action-RenderView-0.09.tar.gz From hadess at fedoraproject.org Mon Mar 9 15:29:01 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 9 Mar 2009 15:29:01 +0000 (UTC) Subject: rpms/bluez/devel bluez-fix-sdp-copy-for-strings-with-nulls.patch, NONE, 1.1 bluez.spec, 1.46, 1.47 Message-ID: <20090309152901.A2A8E70034@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32528 Modified Files: bluez.spec Added Files: bluez-fix-sdp-copy-for-strings-with-nulls.patch Log Message: * Mon Mar 09 2009 - Bastien Nocera - 4.32-6 - Fix sdp_copy_record(), so records are properly exported through D-Bus bluez-fix-sdp-copy-for-strings-with-nulls.patch: --- NEW FILE bluez-fix-sdp-copy-for-strings-with-nulls.patch --- diff --git a/lib/sdp.c b/lib/sdp.c index 896c5eb..66e65ca 100644 --- a/lib/sdp.c +++ b/lib/sdp.c @@ -97,6 +97,7 @@ static uint128_t bluetooth_base_uuid = { #define SDP_MAX_ATTR_LEN 65535 static sdp_data_t *sdp_copy_seq(sdp_data_t *data); +static int sdp_attr_add_new_with_length(sdp_record_t *rec, uint16_t attr, uint8_t dtd, const void *value, uint32_t len); /* Message structure. */ struct tupla { @@ -1381,7 +1382,7 @@ static void sdp_copy_pattern(void *value, void *udata) sdp_pattern_add_uuid(rec, uuid); } -static void *sdp_data_value(sdp_data_t *data) +static void *sdp_data_value(sdp_data_t *data, uint32_t *len) { void *val = NULL; @@ -1435,6 +1436,8 @@ static void *sdp_data_value(sdp_data_t *data) case SDP_URL_STR32: case SDP_TEXT_STR32: val = data->val.str; + if (len) + *len = data->unitSize - 1; break; case SDP_ALT8: case SDP_ALT16: @@ -1457,7 +1460,7 @@ static sdp_data_t *sdp_copy_seq(sdp_data_t *data) sdp_data_t *datatmp; void *value; - value = sdp_data_value(tmp); + value = sdp_data_value(tmp, NULL); datatmp = sdp_data_alloc_with_length(tmp->dtd, value, tmp->unitSize); @@ -1477,10 +1480,14 @@ static void sdp_copy_attrlist(void *value, void *udata) sdp_data_t *data = value; sdp_record_t *rec = udata; void *val; + uint32_t len = 0; - val = sdp_data_value(data); + val = sdp_data_value(data, &len); - sdp_attr_add_new(rec, data->attrId, data->dtd, val); + if (!len) + sdp_attr_add_new(rec, data->attrId, data->dtd, val); + else + sdp_attr_add_new_with_length(rec, data->attrId, data->dtd, val, len); } sdp_record_t *sdp_copy_record(sdp_record_t *rec) @@ -2068,6 +2075,17 @@ int sdp_attr_add_new(sdp_record_t *rec, uint16_t attr, uint8_t dtd, return -1; } +static int sdp_attr_add_new_with_length(sdp_record_t *rec, uint16_t attr, uint8_t dtd, + const void *value, uint32_t len) +{ + sdp_data_t *d = sdp_data_alloc_with_length(dtd, value, len); + if (d) { + sdp_attr_replace(rec, attr, d); + return 0; + } + return -1; +} + /* * Set the information attributes of the service * pointed to by rec. The attributes are Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- bluez.spec 6 Mar 2009 01:06:07 -0000 1.46 +++ bluez.spec 9 Mar 2009 15:28:31 -0000 1.47 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez Version: 4.32 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz @@ -14,6 +14,8 @@ Patch2: bluez-try-utf8-harder.patch # http://thread.gmane.org/gmane.linux.bluez.kernel/1688 Patch3: bluez-sdp-xml-with-nulls.patch +# http://thread.gmane.org/gmane.linux.bluez.kernel/1688/focus=1708 +Patch4: bluez-fix-sdp-copy-for-strings-with-nulls.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.bluez.org/ @@ -102,6 +104,7 @@ %patch1 -p0 -b .oui %patch2 -p1 -b .non-utf8-name %patch3 -p1 -b .nulls-in-sdp-text +%patch4 -p1 -b .more-nulls-in-sdp-text %build %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund @@ -194,6 +197,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Mon Mar 09 2009 - Bastien Nocera - 4.32-6 +- Fix sdp_copy_record(), so records are properly exported through D-Bus + * Fri Mar 06 2009 - Bastien Nocera - 4.32-5 - Fix SDP parsing to XML when it contains NULLs From rjones at fedoraproject.org Mon Mar 9 15:29:54 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 9 Mar 2009 15:29:54 +0000 (UTC) Subject: rpms/ocaml-postgresql/devel ocaml-postgresql.spec,1.10,1.11 Message-ID: <20090309152954.127BA70034@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-postgresql/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv794 Modified Files: ocaml-postgresql.spec Log Message: Fix typo in summary (rhbz#487632). Index: ocaml-postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/ocaml-postgresql.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ocaml-postgresql.spec 26 Feb 2009 07:28:25 -0000 1.10 +++ ocaml-postgresql.spec 9 Mar 2009 15:29:23 -0000 1.11 @@ -3,8 +3,8 @@ Name: ocaml-postgresql Version: 1.9.2 -Release: 4%{?dist} -Summary: OCaml library for accessing PostreSQL databases +Release: 5%{?dist} +Summary: OCaml library for accessing PostgreSQL databases Group: Development/Libraries License: LGPLv2+ with exceptions @@ -91,6 +91,9 @@ %changelog +* Mon Mar 9 2008 Richard W.M. Jones - 1.9.2-5 +- Fix typo in summary (rhbz#487632). + * Wed Feb 25 2009 Fedora Release Engineering - 1.9.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rjones at fedoraproject.org Mon Mar 9 15:31:15 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 9 Mar 2009 15:31:15 +0000 (UTC) Subject: rpms/ocaml-postgresql/devel ocaml-postgresql.spec,1.11,1.12 Message-ID: <20090309153115.61F2970034@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-postgresql/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1481 Modified Files: ocaml-postgresql.spec Log Message: Typo in changelog too ... Index: ocaml-postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/ocaml-postgresql.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ocaml-postgresql.spec 9 Mar 2009 15:29:23 -0000 1.11 +++ ocaml-postgresql.spec 9 Mar 2009 15:30:44 -0000 1.12 @@ -3,7 +3,7 @@ Name: ocaml-postgresql Version: 1.9.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: OCaml library for accessing PostgreSQL databases Group: Development/Libraries @@ -91,7 +91,7 @@ %changelog -* Mon Mar 9 2008 Richard W.M. Jones - 1.9.2-5 +* Mon Mar 9 2009 Richard W.M. Jones - 1.9.2-6 - Fix typo in summary (rhbz#487632). * Wed Feb 25 2009 Fedora Release Engineering - 1.9.2-4 From pbrobinson at fedoraproject.org Mon Mar 9 15:31:25 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Mon, 9 Mar 2009 15:31:25 +0000 (UTC) Subject: rpms/libgnomeprint22/devel libgnomeprint22.spec,1.61,1.62 Message-ID: <20090309153125.82BED70034@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/libgnomeprint22/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1594 Modified Files: libgnomeprint22.spec Log Message: - Remove redundent perl dep - RHBZ 489227 Index: libgnomeprint22.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- libgnomeprint22.spec 25 Feb 2009 15:21:18 -0000 1.61 +++ libgnomeprint22.spec 9 Mar 2009 15:30:55 -0000 1.62 @@ -13,7 +13,7 @@ Summary: Printing library for GNOME Name: libgnomeprint22 Version: 2.18.5 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ and BSD # BSD applies to ttsubset code that was taken from STSF Group: System Environment/Base @@ -24,7 +24,6 @@ Requires: urw-fonts Requires: ghostscript Requires: ghostscript-fonts -Requires: perl BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -122,6 +121,9 @@ %{_datadir}/gtk-doc/html/libgnomeprint %changelog +* Mon Mar 9 2009 Peter Robinson - 2.18.5-3 +- Remove redundent perl dep - RHBZ 489227 + * Wed Feb 25 2009 Fedora Release Engineering - 2.18.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From cweyl at fedoraproject.org Mon Mar 9 15:31:38 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 9 Mar 2009 15:31:38 +0000 (UTC) Subject: rpms/perl-Catalyst-Manual/devel .cvsignore, 1.5, 1.6 perl-Catalyst-Manual.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <20090309153138.41AB570034@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Catalyst-Manual/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1730 Modified Files: .cvsignore perl-Catalyst-Manual.spec sources Log Message: * Mon Mar 09 2009 Chris Weyl 5.7017-1 - update to 5.7017 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Jan 2009 23:06:09 -0000 1.5 +++ .cvsignore 9 Mar 2009 15:31:07 -0000 1.6 @@ -1 +1 @@ -Catalyst-Manual-5.7016.tar.gz +Catalyst-Manual-5.7017.tar.gz Index: perl-Catalyst-Manual.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/perl-Catalyst-Manual.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Catalyst-Manual.spec 26 Feb 2009 12:09:48 -0000 1.10 +++ perl-Catalyst-Manual.spec 9 Mar 2009 15:31:07 -0000 1.11 @@ -1,7 +1,7 @@ Name: perl-Catalyst-Manual Epoch: 1 -Version: 5.7016 -Release: 2%{?dist} +Version: 5.7017 +Release: 1%{?dist} Summary: Catalyst web framework manual License: GPL+ or Artistic Group: Development/Libraries @@ -53,6 +53,9 @@ %exclude %{_mandir}/man3/Catalyst::Manual.3* %changelog +* Mon Mar 09 2009 Chris Weyl 5.7017-1 +- update to 5.7017 + * Thu Feb 26 2009 Fedora Release Engineering - 1:5.7016-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 Jan 2009 23:06:09 -0000 1.6 +++ sources 9 Mar 2009 15:31:07 -0000 1.7 @@ -1 +1 @@ -7645455d158e362b1d34dc8e678bbed1 Catalyst-Manual-5.7016.tar.gz +8d8c30dba6ff6e8dad014d6b48d7ceb2 Catalyst-Manual-5.7017.tar.gz From uwog at fedoraproject.org Mon Mar 9 15:35:09 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Mon, 9 Mar 2009 15:35:09 +0000 (UTC) Subject: rpms/abiword/F-9 .cvsignore, 1.23, 1.24 abiword.spec, 1.64, 1.65 sources, 1.23, 1.24 Message-ID: <20090309153509.F29D970034@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3924 Modified Files: .cvsignore abiword.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-9/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 10 Jan 2009 18:26:31 -0000 1.23 +++ .cvsignore 9 Mar 2009 15:34:39 -0000 1.24 @@ -1,4 +1,4 @@ -abiword-2.6.6.tar.gz -abiword-docs-2.6.6.tar.gz -abiword-extras-2.6.6.tar.gz -abiword-plugins-2.6.6.tar.gz +abiword-2.6.8.tar.gz +abiword-docs-2.6.8.tar.gz +abiword-extras-2.6.8.tar.gz +abiword-plugins-2.6.8.tar.gz Index: abiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-9/abiword.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- abiword.spec 10 Jan 2009 18:26:31 -0000 1.64 +++ abiword.spec 9 Mar 2009 15:34:39 -0000 1.65 @@ -1,6 +1,6 @@ %define majorversion 2 %define minorversion 6 -%define microversion 6 +%define microversion 8 Summary: The AbiWord word processor Name: abiword @@ -173,6 +173,9 @@ %ghost %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %changelog +* Mon Mar 09 2009 Marc Maurer - 1:2.6.8-1 +- New upstream release + * Sat Jan 10 2009 Marc Maurer - 1:2.6.6-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-9/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 10 Jan 2009 18:26:31 -0000 1.23 +++ sources 9 Mar 2009 15:34:39 -0000 1.24 @@ -1,4 +1,4 @@ -b9de84f03f555d4490b63e5b7f53e2f1 abiword-2.6.6.tar.gz -833129f266e699b3cf0f3774e005a312 abiword-docs-2.6.6.tar.gz -15db5e3ffa5429d2ce773351fc6fdb72 abiword-extras-2.6.6.tar.gz -45dabc491976e3f21d943817e61b9d89 abiword-plugins-2.6.6.tar.gz +fab04d8ef999c303f720197adf261310 abiword-2.6.8.tar.gz +5698c79cfa179f4b15c82a699d11a309 abiword-docs-2.6.8.tar.gz +e3cfff6ad4cda3e4200a75fd2665857a abiword-extras-2.6.8.tar.gz +421c49723e209c971ddb0798c1b313a9 abiword-plugins-2.6.8.tar.gz From hadess at fedoraproject.org Mon Mar 9 15:36:02 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 9 Mar 2009 15:36:02 +0000 (UTC) Subject: rpms/rhythmbox/devel .cvsignore, 1.44, 1.45 rhythmbox.spec, 1.230, 1.231 sources, 1.46, 1.47 Message-ID: <20090309153602.472E670034@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/rhythmbox/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv548 Modified Files: .cvsignore rhythmbox.spec sources Log Message: * Mon Mar 09 2009 - Bastien Nocera - 0.11.6-30.r6184 - Update to r6184 - Change default burner plugin to brasero Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 4 Mar 2009 10:46:44 -0000 1.44 +++ .cvsignore 9 Mar 2009 15:35:31 -0000 1.45 @@ -1 +1 @@ -rhythmbox-0.11.6-r6176.tar.bz2 +rhythmbox-0.11.6-r6184.tar.bz2 Index: rhythmbox.spec =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- rhythmbox.spec 4 Mar 2009 10:46:45 -0000 1.230 +++ rhythmbox.spec 9 Mar 2009 15:35:31 -0000 1.231 @@ -3,12 +3,12 @@ Name: rhythmbox Summary: Music Management Application Version: 0.11.6 -Release: 29.r6176%{?dist} +Release: 30.r6184%{?dist} License: GPLv2+ with exceptions and GFDL Group: Applications/Multimedia URL: http://projects.gnome.org/rhythmbox/ #Source: http://download.gnome.org/sources/rhythmbox/0.11/%{name}-%{version}.tar.bz2 -Source: %{name}-%{version}-r6176.tar.bz2 +Source: %{name}-%{version}-r6184.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=524079 Source2: rhythmbox.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,7 +27,7 @@ BuildRequires: libgpod-devel BuildRequires: gnome-media-devel BuildRequires: libgnomeui-devel >= 2.6.0 -BuildRequires: nautilus-cd-burner-devel >= 2.15.3 +BuildRequires: brasero-devel BuildRequires: gstreamer-plugins-base-devel >= 0.10 BuildRequires: gettext, scrollkeeper BuildRequires: totem-pl-parser-devel >= 2.21.1 @@ -222,6 +222,10 @@ %{_libdir}/rhythmbox/plugins/upnp_coherence %changelog +* Mon Mar 09 2009 - Bastien Nocera - 0.11.6-30.r6184 +- Update to r6184 +- Change default burner plugin to brasero + * Wed Mar 04 2009 - Bastien Nocera - 0.11.6-29.r6176 - Update to r6176 - Drop upstreamed patches Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/devel/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 4 Mar 2009 10:46:45 -0000 1.46 +++ sources 9 Mar 2009 15:35:32 -0000 1.47 @@ -1 +1 @@ -cb4cb450f41c9dc8f75eeab48003a076 rhythmbox-0.11.6-r6176.tar.bz2 +e384e801109d06abd3df95ef7e6659a2 rhythmbox-0.11.6-r6184.tar.bz2 From ovasik at fedoraproject.org Mon Mar 9 15:37:00 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Mon, 9 Mar 2009 15:37:00 +0000 (UTC) Subject: rpms/taskjuggler/F-10 taskjuggler.spec, 1.23, 1.24 taskjuggler-2.4.1-no-kdepim3.patch, 1.1, NONE Message-ID: <20090309153700.3388170034@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/taskjuggler/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4839 Modified Files: taskjuggler.spec Removed Files: taskjuggler-2.4.1-no-kdepim3.patch Log Message: rebuilt with ICal support again (#488347, #467136) Index: taskjuggler.spec =================================================================== RCS file: /cvs/extras/rpms/taskjuggler/F-10/taskjuggler.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- taskjuggler.spec 9 Jun 2008 13:12:21 -0000 1.23 +++ taskjuggler.spec 9 Mar 2009 15:36:29 -0000 1.24 @@ -1,20 +1,18 @@ Name: taskjuggler Version: 2.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Project management tool Group: Applications/Productivity License: GPL+ URL: http://www.taskjuggler.org Source0: http://www.taskjuggler.org/download/%{name}-%{version}.tar.bz2 -# disable kdepim support (without disabling all of KDE support) -Patch0: taskjuggler-2.4.1-no-kdepim3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?fedora} < 10 BuildRequires: kdepim-devel %else -%define nokdepim3 1 +BuildRequires: kdepim3-devel BuildRequires: kdelibs3-devel %endif # need gettext for untranslated .po files @@ -43,14 +41,6 @@ %prep %setup -q -%if 0%{?nokdepim3} -%patch0 -p1 -b .no-kdepim3 -# timestamp magic to keep autotools from regenerating everything -sleep 1 -touch acinclude.m4 configure.files configure.in subdirs -sleep 1 -touch aclocal.m4 config.h.in configure Makefile.in stamp-h.in -%endif %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -121,6 +111,9 @@ %{_libdir}/libtaskjuggler* %changelog +* Mon Mar 9 2009 Ondrej Vasik - 2.4.1-4 +- rebuilt with ICal support again (#488347, #467136) + * Mon Jun 9 2008 Kevin Kofler - 2.4.1-3 - disable kdepim support on F10+, kdepim 3 no longer available --- taskjuggler-2.4.1-no-kdepim3.patch DELETED --- From cweyl at fedoraproject.org Mon Mar 9 15:37:45 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 9 Mar 2009 15:37:45 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel .cvsignore, 1.2, 1.3 perl-Catalyst-Plugin-Session-State-Cookie.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <20090309153745.448F270034@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5193 Modified Files: .cvsignore perl-Catalyst-Plugin-Session-State-Cookie.spec sources Log Message: * Mon Mar 09 2009 Chris Weyl 0.10-1 - update to 0.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jun 2008 18:01:59 -0000 1.2 +++ .cvsignore 9 Mar 2009 15:37:15 -0000 1.3 @@ -1 +1,12 @@ -Catalyst-Plugin-Session-State-Cookie-0.09.tar.gz +Catalyst-Plugin-Session-State-Cookie-0.10.tar.gz +Catalyst-Plugin-Session-State-Cookie-* +*.tar +*.gz +*.rpm +noarch +i386 +x86_64 +.build* +clog +*.old +*.bak Index: perl-Catalyst-Plugin-Session-State-Cookie.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel/perl-Catalyst-Plugin-Session-State-Cookie.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Catalyst-Plugin-Session-State-Cookie.spec 26 Feb 2009 12:19:21 -0000 1.3 +++ perl-Catalyst-Plugin-Session-State-Cookie.spec 9 Mar 2009 15:37:15 -0000 1.4 @@ -1,17 +1,19 @@ Name: perl-Catalyst-Plugin-Session-State-Cookie -Version: 0.09 -Release: 3%{?dist} +Version: 0.10 +Release: 1%{?dist} Summary: Maintain session IDs using cookies License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Session-State-Cookie/ -Source0: http://www.cpan.org/authors/id/N/NU/NUFFIN/Catalyst-Plugin-Session-State-Cookie-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-State-Cookie-%{version}.tar.gz +#Source0: http://www.cpan.org/authors/id/N/NU/NUFFIN/Catalyst-Plugin-Session-State-Cookie-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Catalyst::Plugin::Session) >= 0.19 +BuildRequires: perl(MRO::Compat) BuildRequires: perl(Test::More) BuildRequires: perl(Test::MockObject) # optional tests @@ -70,6 +72,9 @@ %{_mandir}/man3/* %changelog +* Mon Mar 09 2009 Chris Weyl 0.10-1 +- update to 0.10 + * Thu Feb 26 2009 Fedora Release Engineering - 0.09-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jun 2008 18:01:59 -0000 1.2 +++ sources 9 Mar 2009 15:37:15 -0000 1.3 @@ -1 +1 @@ -0eb184e081051ca284c2952ba6db59f7 Catalyst-Plugin-Session-State-Cookie-0.09.tar.gz +0c0f8992eecbe98295f3d36a9b378edc Catalyst-Plugin-Session-State-Cookie-0.10.tar.gz From cweyl at fedoraproject.org Mon Mar 9 15:39:59 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 9 Mar 2009 15:39:59 +0000 (UTC) Subject: rpms/perl-Catalyst-Manual/F-10 .cvsignore, 1.3, 1.4 perl-Catalyst-Manual.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <20090309153959.1FCCE70034@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Catalyst-Manual/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6420 Modified Files: .cvsignore perl-Catalyst-Manual.spec sources Log Message: * Mon Mar 09 2009 Chris Weyl 5.7017-1 - update to 5.7017 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Jun 2008 03:34:14 -0000 1.3 +++ .cvsignore 9 Mar 2009 15:39:28 -0000 1.4 @@ -1 +1 @@ -Catalyst-Manual-5.7012.tar.gz +Catalyst-Manual-5.7017.tar.gz Index: perl-Catalyst-Manual.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/F-10/perl-Catalyst-Manual.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Catalyst-Manual.spec 25 Jan 2009 23:06:43 -0000 1.9 +++ perl-Catalyst-Manual.spec 9 Mar 2009 15:39:28 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Catalyst-Manual Epoch: 1 -Version: 5.7016 +Version: 5.7017 Release: 1%{?dist} Summary: Catalyst web framework manual License: GPL+ or Artistic @@ -53,6 +53,12 @@ %exclude %{_mandir}/man3/Catalyst::Manual.3* %changelog +* Mon Mar 09 2009 Chris Weyl 5.7017-1 +- update to 5.7017 + +* Thu Feb 26 2009 Fedora Release Engineering - 1:5.7016-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Jan 25 2009 Chris Weyl 5.7016-1 - update to 5.7016 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 Jan 2009 23:06:43 -0000 1.6 +++ sources 9 Mar 2009 15:39:28 -0000 1.7 @@ -1 +1 @@ -7645455d158e362b1d34dc8e678bbed1 Catalyst-Manual-5.7016.tar.gz +8d8c30dba6ff6e8dad014d6b48d7ceb2 Catalyst-Manual-5.7017.tar.gz From salimma at fedoraproject.org Mon Mar 9 15:43:23 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Mon, 9 Mar 2009 15:43:23 +0000 (UTC) Subject: rpms/scheme2js/EL-5 scheme2js.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309154323.986CF70034@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/scheme2js/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7268/EL-5 Modified Files: .cvsignore sources Added Files: scheme2js.spec Log Message: Initial import --- NEW FILE scheme2js.spec --- Name: scheme2js Version: 20081219 Release: 2%{?dist} Summary: Scheme to JavaScript compiler Group: Development/Languages # discussed with upstream. next version might go to CeCILL-C/LGPLv2+ License: GPL+ URL: http://www-sop.inria.fr/mimosa/scheme2js/ Source0: http://www-sop.inria.fr/mimosa/scheme2js/files/scheme2js-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bigloo #Requires: ExcludeArch: ppc64 %description Scheme2Js is a Scheme to JavaScript compiler distributed under the GPL license. While some effort has been spent on being as close as possible to R5RS, we concentrated mainly on efficiency. Usually Scheme2Js produces JavaScript code, that is comparable to hand-written code. In order to achieve this performance, Scheme2Js is not completely R5RS compliant. In particular it lacks exact numbers. Scheme2Js is not yet complete either: it lacks hygienic macros and the eval procedure. %prep %setup -q %build # picks up Bigloo's compiler flags, no need to pass it in ./configure --prefix=%{_prefix} --mandir=%{_mandir}/man1 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 doc/index.html LICENSE %{_bindir}/%{name} %{_datadir}/%{name} %{_mandir}/man1/* %changelog * Wed Mar 4 2009 Michel Salim - 20081219-2 - Not building on ppc64, as bigloo is not available * Sun Mar 1 2009 Michel Salim - 20081219-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scheme2js/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:21:19 -0000 1.1 +++ .cvsignore 9 Mar 2009 15:42:52 -0000 1.2 @@ -0,0 +1 @@ +scheme2js-20081219.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scheme2js/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:21:19 -0000 1.1 +++ sources 9 Mar 2009 15:42:53 -0000 1.2 @@ -0,0 +1 @@ +efb16e806849ff0198a965b5d2d91b38 scheme2js-20081219.tar.gz From salimma at fedoraproject.org Mon Mar 9 15:43:23 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Mon, 9 Mar 2009 15:43:23 +0000 (UTC) Subject: rpms/scheme2js/F-10 scheme2js.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309154323.E95687012E@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/scheme2js/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7268/F-10 Modified Files: .cvsignore sources Added Files: scheme2js.spec Log Message: Initial import --- NEW FILE scheme2js.spec --- Name: scheme2js Version: 20081219 Release: 2%{?dist} Summary: Scheme to JavaScript compiler Group: Development/Languages # discussed with upstream. next version might go to CeCILL-C/LGPLv2+ License: GPL+ URL: http://www-sop.inria.fr/mimosa/scheme2js/ Source0: http://www-sop.inria.fr/mimosa/scheme2js/files/scheme2js-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bigloo #Requires: ExcludeArch: ppc64 %description Scheme2Js is a Scheme to JavaScript compiler distributed under the GPL license. While some effort has been spent on being as close as possible to R5RS, we concentrated mainly on efficiency. Usually Scheme2Js produces JavaScript code, that is comparable to hand-written code. In order to achieve this performance, Scheme2Js is not completely R5RS compliant. In particular it lacks exact numbers. Scheme2Js is not yet complete either: it lacks hygienic macros and the eval procedure. %prep %setup -q %build # picks up Bigloo's compiler flags, no need to pass it in ./configure --prefix=%{_prefix} --mandir=%{_mandir}/man1 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 doc/index.html LICENSE %{_bindir}/%{name} %{_datadir}/%{name} %{_mandir}/man1/* %changelog * Wed Mar 4 2009 Michel Salim - 20081219-2 - Not building on ppc64, as bigloo is not available * Sun Mar 1 2009 Michel Salim - 20081219-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scheme2js/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:21:19 -0000 1.1 +++ .cvsignore 9 Mar 2009 15:42:53 -0000 1.2 @@ -0,0 +1 @@ +scheme2js-20081219.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scheme2js/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:21:19 -0000 1.1 +++ sources 9 Mar 2009 15:42:53 -0000 1.2 @@ -0,0 +1 @@ +efb16e806849ff0198a965b5d2d91b38 scheme2js-20081219.tar.gz From salimma at fedoraproject.org Mon Mar 9 15:43:24 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Mon, 9 Mar 2009 15:43:24 +0000 (UTC) Subject: rpms/scheme2js/F-9 scheme2js.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309154324.6AE3D70034@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/scheme2js/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7268/F-9 Modified Files: .cvsignore sources Added Files: scheme2js.spec Log Message: Initial import --- NEW FILE scheme2js.spec --- Name: scheme2js Version: 20081219 Release: 2%{?dist} Summary: Scheme to JavaScript compiler Group: Development/Languages # discussed with upstream. next version might go to CeCILL-C/LGPLv2+ License: GPL+ URL: http://www-sop.inria.fr/mimosa/scheme2js/ Source0: http://www-sop.inria.fr/mimosa/scheme2js/files/scheme2js-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bigloo #Requires: ExcludeArch: ppc64 %description Scheme2Js is a Scheme to JavaScript compiler distributed under the GPL license. While some effort has been spent on being as close as possible to R5RS, we concentrated mainly on efficiency. Usually Scheme2Js produces JavaScript code, that is comparable to hand-written code. In order to achieve this performance, Scheme2Js is not completely R5RS compliant. In particular it lacks exact numbers. Scheme2Js is not yet complete either: it lacks hygienic macros and the eval procedure. %prep %setup -q %build # picks up Bigloo's compiler flags, no need to pass it in ./configure --prefix=%{_prefix} --mandir=%{_mandir}/man1 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 doc/index.html LICENSE %{_bindir}/%{name} %{_datadir}/%{name} %{_mandir}/man1/* %changelog * Wed Mar 4 2009 Michel Salim - 20081219-2 - Not building on ppc64, as bigloo is not available * Sun Mar 1 2009 Michel Salim - 20081219-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scheme2js/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:21:19 -0000 1.1 +++ .cvsignore 9 Mar 2009 15:42:53 -0000 1.2 @@ -0,0 +1 @@ +scheme2js-20081219.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scheme2js/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:21:19 -0000 1.1 +++ sources 9 Mar 2009 15:42:54 -0000 1.2 @@ -0,0 +1 @@ +efb16e806849ff0198a965b5d2d91b38 scheme2js-20081219.tar.gz From salimma at fedoraproject.org Mon Mar 9 15:43:24 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Mon, 9 Mar 2009 15:43:24 +0000 (UTC) Subject: rpms/scheme2js/devel scheme2js.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309154324.CFFBA70133@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/scheme2js/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7268/devel Modified Files: .cvsignore sources Added Files: scheme2js.spec Log Message: Initial import --- NEW FILE scheme2js.spec --- Name: scheme2js Version: 20081219 Release: 2%{?dist} Summary: Scheme to JavaScript compiler Group: Development/Languages # discussed with upstream. next version might go to CeCILL-C/LGPLv2+ License: GPL+ URL: http://www-sop.inria.fr/mimosa/scheme2js/ Source0: http://www-sop.inria.fr/mimosa/scheme2js/files/scheme2js-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bigloo #Requires: ExcludeArch: ppc64 %description Scheme2Js is a Scheme to JavaScript compiler distributed under the GPL license. While some effort has been spent on being as close as possible to R5RS, we concentrated mainly on efficiency. Usually Scheme2Js produces JavaScript code, that is comparable to hand-written code. In order to achieve this performance, Scheme2Js is not completely R5RS compliant. In particular it lacks exact numbers. Scheme2Js is not yet complete either: it lacks hygienic macros and the eval procedure. %prep %setup -q %build # picks up Bigloo's compiler flags, no need to pass it in ./configure --prefix=%{_prefix} --mandir=%{_mandir}/man1 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 doc/index.html LICENSE %{_bindir}/%{name} %{_datadir}/%{name} %{_mandir}/man1/* %changelog * Wed Mar 4 2009 Michel Salim - 20081219-2 - Not building on ppc64, as bigloo is not available * Sun Mar 1 2009 Michel Salim - 20081219-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scheme2js/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:21:19 -0000 1.1 +++ .cvsignore 9 Mar 2009 15:42:54 -0000 1.2 @@ -0,0 +1 @@ +scheme2js-20081219.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scheme2js/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:21:19 -0000 1.1 +++ sources 9 Mar 2009 15:42:54 -0000 1.2 @@ -0,0 +1 @@ +efb16e806849ff0198a965b5d2d91b38 scheme2js-20081219.tar.gz From pkgdb at fedoraproject.org Mon Mar 9 15:52:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:52:14 +0000 Subject: [pkgdb] pyfacebook (Fedora EPEL, 5) updated by kevin Message-ID: <20090309155317.213D9208549@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for pyfacebook kevin has set commit to Approved for provenpackager on pyfacebook (Fedora EPEL 5) kevin has set build to Approved for provenpackager on pyfacebook (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on pyfacebook (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pyfacebook From pkgdb at fedoraproject.org Mon Mar 9 15:53:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:53:17 +0000 Subject: [pkgdb] pyfacebook was added for ianweller Message-ID: <20090309155315.375E8208545@bastion.fedora.phx.redhat.com> kevin has added Package pyfacebook with summary Python wrapper for Facebook's API kevin has approved Package pyfacebook kevin has added a Fedora devel branch for pyfacebook with an owner of ianweller kevin has approved pyfacebook in Fedora devel kevin has approved Package pyfacebook kevin has set commit to Approved for provenpackager on pyfacebook (Fedora devel) kevin has set build to Approved for provenpackager on pyfacebook (Fedora devel) kevin has set checkout to Approved for provenpackager on pyfacebook (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pyfacebook From pkgdb at fedoraproject.org Mon Mar 9 15:52:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:52:14 +0000 Subject: [pkgdb] pyfacebook (Fedora, 10) updated by kevin Message-ID: <20090309155317.31DF620854C@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for pyfacebook kevin has set commit to Approved for provenpackager on pyfacebook (Fedora 10) kevin has set build to Approved for provenpackager on pyfacebook (Fedora 10) kevin has set checkout to Approved for provenpackager on pyfacebook (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pyfacebook From kevin at fedoraproject.org Mon Mar 9 15:52:32 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:52:32 +0000 (UTC) Subject: rpms/pyfacebook/devel - New directory Message-ID: <20090309155232.8FC5E7012E@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/pyfacebook/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswi9980/rpms/pyfacebook/devel Log Message: Directory /cvs/pkgs/rpms/pyfacebook/devel added to the repository From kevin at fedoraproject.org Mon Mar 9 15:52:32 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:52:32 +0000 (UTC) Subject: rpms/pyfacebook - New directory Message-ID: <20090309155232.312B470034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/pyfacebook In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswi9980/rpms/pyfacebook Log Message: Directory /cvs/pkgs/rpms/pyfacebook added to the repository From kevin at fedoraproject.org Mon Mar 9 15:52:50 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:52:50 +0000 (UTC) Subject: rpms/pyfacebook Makefile,NONE,1.1 Message-ID: <20090309155250.89C4B70034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/pyfacebook In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswi9980/rpms/pyfacebook Added Files: Makefile Log Message: Setup of module pyfacebook --- NEW FILE Makefile --- # Top level Makefile for module pyfacebook all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Mon Mar 9 15:52:50 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:52:50 +0000 (UTC) Subject: rpms/pyfacebook/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309155250.DB7D070034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/pyfacebook/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswi9980/rpms/pyfacebook/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pyfacebook --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: pyfacebook # $Id: Makefile,v 1.1 2009/03/09 15:52:50 kevin Exp $ NAME := pyfacebook SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From dwalsh at fedoraproject.org Mon Mar 9 15:52:55 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 9 Mar 2009 15:52:55 +0000 (UTC) Subject: rpms/libselinux/devel libselinux-xaccel.patch, NONE, 1.1 libselinux.spec, 1.361, 1.362 Message-ID: <20090309155255.C467570034@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libselinux/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9933 Modified Files: libselinux.spec Added Files: libselinux-xaccel.patch Log Message: * Mon Mar 9 2009 Dan Walsh - 2.0.78-4 - Add eparis patch to accellerate Xwindows performance libselinux-xaccel.patch: --- NEW FILE libselinux-xaccel.patch --- diff -up libselinux-2.0.77/include/selinux/avc.h.pre.create.cache libselinux-2.0.77/include/selinux/avc.h --- libselinux-2.0.77/include/selinux/avc.h.pre.create.cache 2009-01-27 14:47:32.000000000 -0500 +++ libselinux-2.0.77/include/selinux/avc.h 2009-03-02 14:52:40.859167987 -0500 @@ -353,6 +353,7 @@ int avc_compute_member(security_id_t ssi #define AVC_CALLBACK_AUDITALLOW_DISABLE 32 #define AVC_CALLBACK_AUDITDENY_ENABLE 64 #define AVC_CALLBACK_AUDITDENY_DISABLE 128 +#define AVC_CALLBACK_ADD_CREATE 256 /** * avc_add_callback - Register a callback for security events. diff -up libselinux-2.0.77/src/avc.c.pre.create.cache libselinux-2.0.77/src/avc.c --- libselinux-2.0.77/src/avc.c.pre.create.cache 2009-01-27 14:47:32.000000000 -0500 +++ libselinux-2.0.77/src/avc.c 2009-03-02 15:57:54.764288907 -0500 @@ -20,6 +20,8 @@ struct avc_entry { security_id_t tsid; security_class_t tclass; struct av_decision avd; + security_id_t create_sid; + unsigned create_decided :1; int used; /* used recently */ }; @@ -58,6 +60,11 @@ static struct avc_cache_stats cache_stat static struct avc_callback_node *avc_callbacks = NULL; static struct sidtab avc_sidtab; +/* forward declaration */ +static int avc_update_cache(uint32_t event, security_id_t ssid, + security_id_t tsid, security_class_t tclass, + access_vector_t perms, security_id_t create_sid); + static inline int avc_hash(security_id_t ssid, security_id_t tsid, security_class_t tclass) { @@ -340,6 +347,16 @@ static inline struct avc_node *avc_recla return cur; } +static inline void avc_clear_avc_entry(struct avc_entry *ae) +{ + ae->ssid = ae->tsid = ae->create_sid = NULL; + ae->tclass = 0; + ae->create_decided = 0; + ae->avd.allowed = ae->avd.decided = 0; + ae->avd.auditallow = ae->avd.auditdeny = 0; + ae->used = 0; +} + static inline struct avc_node *avc_claim_node(security_id_t ssid, security_id_t tsid, security_class_t tclass) @@ -361,6 +378,7 @@ static inline struct avc_node *avc_claim } hvalue = avc_hash(ssid, tsid, tclass); + avc_clear_avc_entry(&new->ae); new->ae.used = 1; new->ae.ssid = ssid; new->ae.tsid = tsid; @@ -498,8 +516,8 @@ static int avc_insert(security_id_t ssid * avc_remove - Remove AVC and sidtab entries for SID. * @sid: security identifier to be removed * - * Remove all AVC entries containing @sid as source - * or target, and remove @sid from the SID table. + * Remove all AVC entries containing @sid as source, target, or + * create_sid, and remove @sid from the SID table. * Free the memory allocated for the structure corresponding * to @sid. After this function has been called, @sid must * not be used until another call to avc_context_to_sid() has @@ -514,19 +532,15 @@ static void avc_remove(security_id_t sid cur = avc_cache.slots[i]; prev = NULL; while (cur) { - if (sid == cur->ae.ssid || sid == cur->ae.tsid) { + if (sid == cur->ae.ssid || sid == cur->ae.tsid || + (cur->ae.create_decided && sid == cur->ae.create_sid)) { if (prev) prev->next = cur->next; else avc_cache.slots[i] = cur->next; tmp = cur; cur = cur->next; - tmp->ae.ssid = tmp->ae.tsid = NULL; - tmp->ae.tclass = 0; - tmp->ae.avd.allowed = tmp->ae.avd.decided = 0; - tmp->ae.avd.auditallow = tmp->ae.avd.auditdeny = - 0; - tmp->ae.used = 0; + avc_clear_avc_entry(&tmp->ae); tmp->next = avc_node_freelist; avc_node_freelist = tmp; avc_cache.active_nodes--; @@ -570,11 +584,7 @@ int avc_reset(void) while (node) { tmp = node; node = node->next; - tmp->ae.ssid = tmp->ae.tsid = NULL; - tmp->ae.tclass = 0; - tmp->ae.avd.allowed = tmp->ae.avd.decided = 0; - tmp->ae.avd.auditallow = tmp->ae.avd.auditdeny = 0; - tmp->ae.used = 0; + avc_clear_avc_entry(&tmp->ae); tmp->next = avc_node_freelist; avc_node_freelist = tmp; avc_cache.active_nodes--; @@ -896,24 +906,52 @@ int avc_compute_create(security_id_t ssi security_class_t tclass, security_id_t *newsid) { int rc; + struct avc_entry_ref aeref; + security_context_t ctx = NULL; + *newsid = NULL; + + avc_entry_ref_init(&aeref); +retry: avc_get_lock(avc_lock); - if (ssid->refcnt > 0 && tsid->refcnt > 0) { - security_context_t ctx = NULL; - rc = security_compute_create_raw(ssid->ctx, tsid->ctx, tclass, - &ctx); - if (rc) - goto out; - rc = sidtab_context_to_sid(&avc_sidtab, ctx, newsid); - if (!rc) - (*newsid)->refcnt++; - freecon(ctx); - } else { + if (ssid->refcnt <= 0 || tsid->refcnt <= 0) { errno = EINVAL; /* bad reference count */ rc = -1; + goto out; + } + + rc = avc_lookup(ssid, tsid, tclass, 0, &aeref); + if (!rc) { + /* we found something in the avc */ + if (aeref.ae->create_decided) { + *newsid = aeref.ae->create_sid; + goto out; + } else { + goto compute; + } } + /* there is nothing in the avd for this tuple, so, lets get something */ + avc_release_lock(avc_lock); + avc_has_perm_noaudit(ssid, tsid, tclass, 0, &aeref, NULL); + goto retry; + +compute: + rc = security_compute_create_raw(ssid->ctx, tsid->ctx, tclass, + &ctx); + if (rc) + goto out; + rc = sidtab_context_to_sid(&avc_sidtab, ctx, newsid); + if (rc) + goto out; + + avc_update_cache(AVC_CALLBACK_ADD_CREATE, ssid, tsid, tclass, 0, + *newsid); + out: + if (*newsid) + (*newsid)->refcnt++; avc_release_lock(avc_lock); + freecon(ctx); return rc; } @@ -978,7 +1016,8 @@ static inline int avc_sidcmp(security_id } static inline void avc_update_node(uint32_t event, struct avc_node *node, - access_vector_t perms) + access_vector_t perms, + security_id_t create_sid) { switch (event) { case AVC_CALLBACK_GRANT: @@ -1000,12 +1039,16 @@ static inline void avc_update_node(uint3 case AVC_CALLBACK_AUDITDENY_DISABLE: node->ae.avd.auditdeny &= ~perms; break; + case AVC_CALLBACK_ADD_CREATE: + node->ae.create_sid = create_sid; + node->ae.create_decided = 1; + break; } } static int avc_update_cache(uint32_t event, security_id_t ssid, security_id_t tsid, security_class_t tclass, - access_vector_t perms) + access_vector_t perms, security_id_t create_sid) { struct avc_node *node; int i; @@ -1019,7 +1062,7 @@ static int avc_update_cache(uint32_t eve if (avc_sidcmp(ssid, node->ae.ssid) && avc_sidcmp(tsid, node->ae.tsid) && tclass == node->ae.tclass) { - avc_update_node(event, node, perms); + avc_update_node(event, node, perms, create_sid); } } } @@ -1027,7 +1070,7 @@ static int avc_update_cache(uint32_t eve /* apply to one node */ node = avc_search_node(ssid, tsid, tclass, 0); if (node) { - avc_update_node(event, node, perms); + avc_update_node(event, node, perms, create_sid); } } @@ -1058,7 +1101,7 @@ static int avc_control(uint32_t event, s * been invoked to update the cache state. */ if (event != AVC_CALLBACK_TRY_REVOKE) - avc_update_cache(event, ssid, tsid, tclass, perms); + avc_update_cache(event, ssid, tsid, tclass, perms, NULL); for (c = avc_callbacks; c; c = c->next) { if ((c->events & event) && @@ -1080,7 +1123,7 @@ static int avc_control(uint32_t event, s if (event == AVC_CALLBACK_TRY_REVOKE) { /* revoke any unretained permissions */ perms &= ~tretained; - avc_update_cache(event, ssid, tsid, tclass, perms); + avc_update_cache(event, ssid, tsid, tclass, perms, NULL); *out_retained = tretained; } Index: libselinux.spec =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.361 retrieving revision 1.362 diff -u -r1.361 -r1.362 --- libselinux.spec 9 Mar 2009 14:03:12 -0000 1.361 +++ libselinux.spec 9 Mar 2009 15:52:25 -0000 1.362 @@ -5,11 +5,12 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 2.0.78 -Release: 3%{?dist} +Release: 4%{?dist} License: Public Domain Group: System Environment/Libraries Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz Patch: libselinux-rhat.patch +Patch1: libselinux-xaccel.patch URL: http://www.selinuxproject.org BuildRequires: python-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig @@ -79,6 +80,7 @@ %prep %setup -q %patch -p1 -b .rhat +%patch1 -p1 -b .xaccel %build make clean @@ -164,6 +166,9 @@ %{ruby_sitearch}/selinux.so %changelog +* Mon Mar 9 2009 Dan Walsh - 2.0.78-4 +- Add eparis patch to accellerate Xwindows performance + * Mon Mar 9 2009 Dan Walsh - 2.0.78-3 - Fix URL From pkgdb at fedoraproject.org Mon Mar 9 15:55:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:55:31 +0000 Subject: [pkgdb] lpairs was added for szpak Message-ID: <20090309155528.8B76C208545@bastion.fedora.phx.redhat.com> kevin has added Package lpairs with summary Classical memory game with cards kevin has approved Package lpairs kevin has added a Fedora devel branch for lpairs with an owner of szpak kevin has approved lpairs in Fedora devel kevin has approved Package lpairs kevin has set commit to Approved for provenpackager on lpairs (Fedora devel) kevin has set build to Approved for provenpackager on lpairs (Fedora devel) kevin has set checkout to Approved for provenpackager on lpairs (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lpairs From pkgdb at fedoraproject.org Mon Mar 9 15:54:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:54:29 +0000 Subject: [pkgdb] lpairs (Fedora, 10) updated by kevin Message-ID: <20090309155531.B491C20854E@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for lpairs kevin has set commit to Approved for provenpackager on lpairs (Fedora 10) kevin has set build to Approved for provenpackager on lpairs (Fedora 10) kevin has set checkout to Approved for provenpackager on lpairs (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lpairs From pkgdb at fedoraproject.org Mon Mar 9 15:54:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:54:29 +0000 Subject: [pkgdb] lpairs (Fedora, 9) updated by kevin Message-ID: <20090309155531.ABA3220854A@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for lpairs kevin has set commit to Approved for provenpackager on lpairs (Fedora 9) kevin has set build to Approved for provenpackager on lpairs (Fedora 9) kevin has set checkout to Approved for provenpackager on lpairs (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lpairs From kevin at fedoraproject.org Mon Mar 9 15:54:45 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:54:45 +0000 (UTC) Subject: rpms/lpairs - New directory Message-ID: <20090309155445.2534770034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/lpairs In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst10695/rpms/lpairs Log Message: Directory /cvs/pkgs/rpms/lpairs added to the repository From kevin at fedoraproject.org Mon Mar 9 15:54:45 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:54:45 +0000 (UTC) Subject: rpms/lpairs/devel - New directory Message-ID: <20090309155445.636AF70034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/lpairs/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst10695/rpms/lpairs/devel Log Message: Directory /cvs/pkgs/rpms/lpairs/devel added to the repository From kevin at fedoraproject.org Mon Mar 9 15:55:02 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:55:02 +0000 (UTC) Subject: rpms/lpairs Makefile,NONE,1.1 Message-ID: <20090309155502.719FC70034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/lpairs In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst10695/rpms/lpairs Added Files: Makefile Log Message: Setup of module lpairs --- NEW FILE Makefile --- # Top level Makefile for module lpairs all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Mon Mar 9 15:55:02 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:55:02 +0000 (UTC) Subject: rpms/lpairs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309155502.C409470034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/lpairs/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst10695/rpms/lpairs/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lpairs --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: lpairs # $Id: Makefile,v 1.1 2009/03/09 15:55:02 kevin Exp $ NAME := lpairs SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Mon Mar 9 15:56:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:56:17 +0000 Subject: [pkgdb] metromap was added for fab Message-ID: <20090309155637.85760208548@bastion.fedora.phx.redhat.com> kevin has added Package metromap with summary Simple program for finding paths in subway/metro maps kevin has approved Package metromap kevin has added a Fedora devel branch for metromap with an owner of fab kevin has approved metromap in Fedora devel kevin has approved Package metromap kevin has set commit to Approved for provenpackager on metromap (Fedora devel) kevin has set build to Approved for provenpackager on metromap (Fedora devel) kevin has set checkout to Approved for provenpackager on metromap (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/metromap From pkgdb at fedoraproject.org Mon Mar 9 15:56:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:56:40 +0000 Subject: [pkgdb] metromap (Fedora, 9) updated by kevin Message-ID: <20090309155640.51CEB208549@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for metromap kevin has set commit to Approved for provenpackager on metromap (Fedora 9) kevin has set build to Approved for provenpackager on metromap (Fedora 9) kevin has set checkout to Approved for provenpackager on metromap (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/metromap From pkgdb at fedoraproject.org Mon Mar 9 15:56:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:56:40 +0000 Subject: [pkgdb] metromap (Fedora, 10) updated by kevin Message-ID: <20090309155640.6AFFB20854C@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for metromap kevin has set commit to Approved for provenpackager on metromap (Fedora 10) kevin has set build to Approved for provenpackager on metromap (Fedora 10) kevin has set checkout to Approved for provenpackager on metromap (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/metromap From kevin at fedoraproject.org Mon Mar 9 15:55:53 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:55:53 +0000 (UTC) Subject: rpms/metromap - New directory Message-ID: <20090309155553.296E670034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/metromap In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ11210/rpms/metromap Log Message: Directory /cvs/pkgs/rpms/metromap added to the repository From kevin at fedoraproject.org Mon Mar 9 15:55:53 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:55:53 +0000 (UTC) Subject: rpms/metromap/devel - New directory Message-ID: <20090309155553.6189B70034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/metromap/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ11210/rpms/metromap/devel Log Message: Directory /cvs/pkgs/rpms/metromap/devel added to the repository From kevin at fedoraproject.org Mon Mar 9 15:56:10 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:56:10 +0000 (UTC) Subject: rpms/metromap Makefile,NONE,1.1 Message-ID: <20090309155610.C199470034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/metromap In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ11210/rpms/metromap Added Files: Makefile Log Message: Setup of module metromap --- NEW FILE Makefile --- # Top level Makefile for module metromap all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Mon Mar 9 15:56:11 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:56:11 +0000 (UTC) Subject: rpms/metromap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309155611.9016870034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/metromap/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ11210/rpms/metromap/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module metromap --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: metromap # $Id: Makefile,v 1.1 2009/03/09 15:56:11 kevin Exp $ NAME := metromap SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Mon Mar 9 15:57:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:57:49 +0000 Subject: [pkgdb] libdmapsharing was added for mikep Message-ID: <20090309155750.2CB54208545@bastion.fedora.phx.redhat.com> kevin has added Package libdmapsharing with summary libdmapsharing implements the DMAP protocols kevin has approved Package libdmapsharing kevin has added a Fedora devel branch for libdmapsharing with an owner of mikep kevin has approved libdmapsharing in Fedora devel kevin has approved Package libdmapsharing kevin has set commit to Approved for provenpackager on libdmapsharing (Fedora devel) kevin has set build to Approved for provenpackager on libdmapsharing (Fedora devel) kevin has set checkout to Approved for provenpackager on libdmapsharing (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libdmapsharing From pkgdb at fedoraproject.org Mon Mar 9 15:57:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:57:53 +0000 Subject: [pkgdb] libdmapsharing (Fedora, 9) updated by kevin Message-ID: <20090309155752.8D25320854B@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for libdmapsharing kevin has set commit to Approved for provenpackager on libdmapsharing (Fedora 9) kevin has set build to Approved for provenpackager on libdmapsharing (Fedora 9) kevin has set checkout to Approved for provenpackager on libdmapsharing (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libdmapsharing From kevin at fedoraproject.org Mon Mar 9 15:57:04 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:57:04 +0000 (UTC) Subject: rpms/libdmapsharing - New directory Message-ID: <20090309155704.271E170034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libdmapsharing In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso11616/rpms/libdmapsharing Log Message: Directory /cvs/pkgs/rpms/libdmapsharing added to the repository From pkgdb at fedoraproject.org Mon Mar 9 15:57:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:57:54 +0000 Subject: [pkgdb] libdmapsharing (Fedora, 10) updated by kevin Message-ID: <20090309155753.048CC208550@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for libdmapsharing kevin has set commit to Approved for provenpackager on libdmapsharing (Fedora 10) kevin has set build to Approved for provenpackager on libdmapsharing (Fedora 10) kevin has set checkout to Approved for provenpackager on libdmapsharing (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libdmapsharing From kevin at fedoraproject.org Mon Mar 9 15:57:04 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:57:04 +0000 (UTC) Subject: rpms/libdmapsharing/devel - New directory Message-ID: <20090309155704.6511870034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libdmapsharing/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso11616/rpms/libdmapsharing/devel Log Message: Directory /cvs/pkgs/rpms/libdmapsharing/devel added to the repository From kevin at fedoraproject.org Mon Mar 9 15:57:22 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:57:22 +0000 (UTC) Subject: rpms/libdmapsharing/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309155722.30DE070034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libdmapsharing/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso11616/rpms/libdmapsharing/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libdmapsharing --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libdmapsharing # $Id: Makefile,v 1.1 2009/03/09 15:57:22 kevin Exp $ NAME := libdmapsharing SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Mon Mar 9 15:57:21 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:57:21 +0000 (UTC) Subject: rpms/libdmapsharing Makefile,NONE,1.1 Message-ID: <20090309155721.DD2C670034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/libdmapsharing In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso11616/rpms/libdmapsharing Added Files: Makefile Log Message: Setup of module libdmapsharing --- NEW FILE Makefile --- # Top level Makefile for module libdmapsharing all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From pkgdb at fedoraproject.org Mon Mar 9 15:59:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:59:01 +0000 Subject: [pkgdb] touchcal was added for sharkcz Message-ID: <20090309155922.B429B20854E@bastion.fedora.phx.redhat.com> kevin has added Package touchcal with summary Calibration utility for touch screens kevin has approved Package touchcal kevin has added a Fedora devel branch for touchcal with an owner of sharkcz kevin has approved touchcal in Fedora devel kevin has approved Package touchcal kevin has set commit to Approved for provenpackager on touchcal (Fedora devel) kevin has set build to Approved for provenpackager on touchcal (Fedora devel) kevin has set checkout to Approved for provenpackager on touchcal (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/touchcal From pkgdb at fedoraproject.org Mon Mar 9 15:59:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:59:04 +0000 Subject: [pkgdb] touchcal (Fedora, 9) updated by kevin Message-ID: <20090309155924.ECF4D20854F@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for touchcal kevin has set commit to Approved for provenpackager on touchcal (Fedora 9) kevin has set build to Approved for provenpackager on touchcal (Fedora 9) kevin has set checkout to Approved for provenpackager on touchcal (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/touchcal From pkgdb at fedoraproject.org Mon Mar 9 15:59:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:59:04 +0000 Subject: [pkgdb] touchcal (Fedora EPEL, 5) updated by kevin Message-ID: <20090309155925.28C32208554@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for touchcal kevin has set commit to Approved for provenpackager on touchcal (Fedora EPEL 5) kevin has set build to Approved for provenpackager on touchcal (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on touchcal (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/touchcal From pkgdb at fedoraproject.org Mon Mar 9 15:59:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:59:04 +0000 Subject: [pkgdb] touchcal (Fedora, 10) updated by kevin Message-ID: <20090309155925.60C0B208556@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for touchcal kevin has set commit to Approved for provenpackager on touchcal (Fedora 10) kevin has set build to Approved for provenpackager on touchcal (Fedora 10) kevin has set checkout to Approved for provenpackager on touchcal (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/touchcal From pkgdb at fedoraproject.org Mon Mar 9 15:59:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 15:59:04 +0000 Subject: [pkgdb] touchcal (Fedora EPEL, 4) updated by kevin Message-ID: <20090309155925.A0EC4208603@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for touchcal kevin has set commit to Approved for provenpackager on touchcal (Fedora EPEL 4) kevin has set build to Approved for provenpackager on touchcal (Fedora EPEL 4) kevin has set checkout to Approved for provenpackager on touchcal (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/touchcal From kevin at fedoraproject.org Mon Mar 9 15:58:48 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:58:48 +0000 (UTC) Subject: rpms/touchcal - New directory Message-ID: <20090309155848.26E6270034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/touchcal In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa12190/rpms/touchcal Log Message: Directory /cvs/pkgs/rpms/touchcal added to the repository From kevin at fedoraproject.org Mon Mar 9 15:58:48 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:58:48 +0000 (UTC) Subject: rpms/touchcal/devel - New directory Message-ID: <20090309155848.707CC70034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/touchcal/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa12190/rpms/touchcal/devel Log Message: Directory /cvs/pkgs/rpms/touchcal/devel added to the repository From kevin at fedoraproject.org Mon Mar 9 15:59:07 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:59:07 +0000 (UTC) Subject: rpms/touchcal/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309155907.1E6427012E@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/touchcal/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa12190/rpms/touchcal/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module touchcal --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: touchcal # $Id: Makefile,v 1.1 2009/03/09 15:59:06 kevin Exp $ NAME := touchcal SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From kevin at fedoraproject.org Mon Mar 9 15:59:06 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 15:59:06 +0000 (UTC) Subject: rpms/touchcal Makefile,NONE,1.1 Message-ID: <20090309155906.BEE0870034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/touchcal In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa12190/rpms/touchcal Added Files: Makefile Log Message: Setup of module touchcal --- NEW FILE Makefile --- # Top level Makefile for module touchcal all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From cassmodiah at fedoraproject.org Mon Mar 9 15:59:13 2009 From: cassmodiah at fedoraproject.org (Simon Wesp) Date: Mon, 9 Mar 2009 15:59:13 +0000 (UTC) Subject: rpms/teeworlds/F-9 import.log, NONE, 1.1 teeworlds-0.5.1-extlibs.patch, NONE, 1.1 teeworlds-0.5.1-optflags.patch, NONE, 1.1 teeworlds.png, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 teeworlds.spec, 1.2, 1.3 teeworlds-0.5.0-extlibs.patch, 1.1, NONE teeworlds-0.5.0-optflags.patch, 1.1, NONE teeworlds-0.5.0-segv.patch, 1.1, NONE Message-ID: <20090309155913.A1E0B70034@cvs1.fedora.phx.redhat.com> Author: cassmodiah Update of /cvs/pkgs/rpms/teeworlds/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12123/F-9 Modified Files: .cvsignore sources teeworlds.spec Added Files: import.log teeworlds-0.5.1-extlibs.patch teeworlds-0.5.1-optflags.patch teeworlds.png Removed Files: teeworlds-0.5.0-extlibs.patch teeworlds-0.5.0-optflags.patch teeworlds-0.5.0-segv.patch Log Message: --- NEW FILE import.log --- teeworlds-0_5_1-1_fc10:F-9:teeworlds-0.5.1-1.fc10.src.rpm:1236614273 teeworlds-0.5.1-extlibs.patch: --- NEW FILE teeworlds-0.5.1-extlibs.patch --- diff -Naur teeworlds-0.5.1-src.orig/default.bam teeworlds-0.5.1-src/default.bam --- teeworlds-0.5.1-src.orig/default.bam 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/default.bam 2009-03-09 12:48:10.000000000 +0100 @@ -7,6 +7,8 @@ config:Add(OptFindCompiler()) config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all")) config:Add(OptFindLibrary("zlib", "zlib.h", false)) +config:Add(OptFindLibrary("wavpack", "wavpack/wavpack.h", false)) +config:Add(OptFindLibrary("pnglite", "sys/types.h", false)) config:Add(SDL.OptFind("sdl", true)) config:Finalize("config.bam") @@ -151,8 +153,29 @@ end -- build the small libraries - wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) - pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) + -- compile wavpack if needed + if config.wavpack.value == 1 then + settings.link.libs:Add("wavpack") + if config.wavpack.include_path then + settings.cc.includes:Add(config.wavpack.include_path) + end + wavpack = {} + else + wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) + settings.cc.includes:Add("src/engine/external") + end + + -- compile pnglite if needed + if config.pnglite.value == 1 then + settings.link.libs:Add("pnglite") + if config.pnglite.include_path then + settings.cc.includes:Add(config.pnglite.include_path) + end + pnglite = {} + else + pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) + settings.cc.includes:Add("src/engine/external/pnglite") + end -- build game components engine_settings = settings:Copy() diff -Naur teeworlds-0.5.1-src.orig/src/engine/client/ec_gfx.c teeworlds-0.5.1-src/src/engine/client/ec_gfx.c --- teeworlds-0.5.1-src.orig/src/engine/client/ec_gfx.c 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/src/engine/client/ec_gfx.c 2009-03-09 12:48:39.000000000 +0100 @@ -18,7 +18,7 @@ #endif #include -#include +#include #include #include diff -Naur teeworlds-0.5.1-src.orig/src/engine/client/ec_snd.c teeworlds-0.5.1-src/src/engine/client/ec_snd.c --- teeworlds-0.5.1-src.orig/src/engine/client/ec_snd.c 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/src/engine/client/ec_snd.c 2009-03-09 12:55:19.000000000 +0100 @@ -6,7 +6,7 @@ #include "SDL.h" -#include +#include #include #include #include @@ -358,19 +358,12 @@ snd->num_frames = num_frames; } - -static IOHANDLE file = NULL; - -static int read_data(void *buffer, int size) -{ - return io_read(file, buffer, size); -} - int snd_load_wv(const char *filename) { SAMPLE *snd; int sid = -1; char error[100]; + char completefilename[512]; WavpackContext *context; /* don't waste memory on sound when we are stress testing */ @@ -381,19 +374,13 @@ if(!sound_enabled) return 1; - file = engine_openfile(filename, IOFLAG_READ); /* TODO: use system.h stuff for this */ - if(!file) - { - dbg_msg("sound/wv", "failed to open %s", filename); - return -1; - } - sid = snd_alloc_id(); if(sid < 0) return -1; snd = &samples[sid]; - context = WavpackOpenFileInput(read_data, error); + engine_getpath(completefilename, sizeof(completefilename), filename, IOFLAG_READ); + context = WavpackOpenFileInput(completefilename, error, 0, 0); if (context) { int samples = WavpackGetNumSamples(context); @@ -410,7 +397,7 @@ if(snd->channels > 2) { - dbg_msg("sound/wv", "file is not mono or stereo. filename='%s'", filename); + dbg_msg("sound/wv", "failed to open %s: %s", completefilename, error); return -1; } @@ -448,9 +435,6 @@ dbg_msg("sound/wv", "failed to open %s: %s", filename, error); } - io_close(file); - file = NULL; - if(config.debug) dbg_msg("sound/wv", "loaded %s", filename); diff -Naur teeworlds-0.5.1-src.orig/src/game/client/render.hpp teeworlds-0.5.1-src/src/game/client/render.hpp --- teeworlds-0.5.1-src.orig/src/game/client/render.hpp 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/src/game/client/render.hpp 2009-03-09 12:56:19.000000000 +0100 @@ -37,7 +37,7 @@ TILERENDERFLAG_EXTEND=4, }; -typedef struct SPRITE; +struct SPRITE; void select_sprite(SPRITE *spr, int flags=0, int sx=0, int sy=0); void select_sprite(int id, int flags=0, int sx=0, int sy=0); diff -Naur teeworlds-0.5.1-src.orig/src/tools/dilate.c teeworlds-0.5.1-src/src/tools/dilate.c --- teeworlds-0.5.1-src.orig/src/tools/dilate.c 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/src/tools/dilate.c 2009-03-09 12:56:50.000000000 +0100 @@ -1,6 +1,9 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include "../engine/external/pnglite/pnglite.c" +#include +#include +#include +#include typedef struct pixel_t { diff -Naur teeworlds-0.5.1-src.orig/src/tools/tileset_borderfix.c teeworlds-0.5.1-src/src/tools/tileset_borderfix.c --- teeworlds-0.5.1-src.orig/src/tools/tileset_borderfix.c 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/src/tools/tileset_borderfix.c 2009-03-09 12:57:14.000000000 +0100 @@ -1,6 +1,9 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include "../engine/external/pnglite/pnglite.c" +#include +#include +#include +#include typedef struct pixel_t { teeworlds-0.5.1-optflags.patch: --- NEW FILE teeworlds-0.5.1-optflags.patch --- diff -Naur teeworlds-0.5.1-src.orig/default.bam teeworlds-0.5.1-src/default.bam --- teeworlds-0.5.1-src.orig/default.bam 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/default.bam 2009-03-09 12:14:32.000000000 +0100 @@ -106,6 +106,9 @@ function build(settings) --settings.objdir = Path("objs") settings.cc.Output = Intermediate_Output + settings.cc.flags:Add(os.getenv ('CFLAGS')) + settings.cc.flags:Add(os.getenv ('CPPFLAGS')) + settings.cc.flags:Add(os.getenv ('LDFLAGS')) if config.compiler.value == "cl" then settings.cc.flags:Add("/wd4244") Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/teeworlds/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 18 Jan 2009 18:40:37 -0000 1.3 +++ .cvsignore 9 Mar 2009 15:58:42 -0000 1.4 @@ -1,2 +1 @@ -teeworlds-0.5.0-src.tar.gz -teeworlds.png +teeworlds-0.5.1-src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/teeworlds/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Jan 2009 18:40:37 -0000 1.3 +++ sources 9 Mar 2009 15:58:43 -0000 1.4 @@ -1,2 +1 @@ -39d7b5d41c2c7250201214a4ab6844ed teeworlds-0.5.0-src.tar.gz -d541e3afa7809bd73bb64adb0795cb65 teeworlds.png +5f96e73ff4c3d552de55902da9255606 teeworlds-0.5.1-src.tar.gz Index: teeworlds.spec =================================================================== RCS file: /cvs/pkgs/rpms/teeworlds/F-9/teeworlds.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- teeworlds.spec 18 Jan 2009 18:40:37 -0000 1.2 +++ teeworlds.spec 9 Mar 2009 15:58:43 -0000 1.3 @@ -1,5 +1,5 @@ Name: teeworlds -Version: 0.5.0 +Version: 0.5.1 Release: 1%{?dist} Summary: Online multi-player platform 2D shooter @@ -9,9 +9,8 @@ Source0: http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz Source1: %{name}.png Source2: %{name}.desktop -Patch1: %{name}-0.5.0-extlibs.patch -Patch2: %{name}-0.5.0-optflags.patch -Patch3: %{name}-0.5.0-segv.patch +Patch1: %{name}-0.5.1-extlibs.patch +Patch2: %{name}-0.5.1-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mesa-libGLU-devel @@ -24,7 +23,7 @@ BuildRequires: pnglite-devel BuildRequires: SDL-devel Requires: %{name}-data - + %description The game features cartoon-themed graphics and physics, @@ -53,14 +52,17 @@ %setup -q -n %{name}-%{version}-src rm -rf src/engine/external -%patch1 -p1 -b .extlibs -%patch2 -p1 -b .optflags -%patch3 -p1 -b .segv +%patch1 -p1 +%patch2 -p1 iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8 touch -c -r readme.txt readme.txt.utf8 mv readme.txt.utf8 readme.txt +iconv -f iso-8859-1 -t utf-8 src/game/editor/array.hpp |sed 's|\r||g' > src/game/editor/array.hpp.utf8 +touch -c -r src/game/editor/array.hpp src/game/editor/array.hpp.utf8 +mv src/game/editor/array.hpp.utf8 src/game/editor/array.hpp + %build CFLAGS="%{optflags}" bam -v release @@ -115,6 +117,12 @@ %changelog +* Mon Mar 09 2009 Simon Wesp 0.5.1-1 +- New upstream release + +* Wed Feb 25 2009 Fedora Release Engineering - 0.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Jan 17 2009 Lubomir Rintel 0.5.0-1 - New upstream release --- teeworlds-0.5.0-extlibs.patch DELETED --- --- teeworlds-0.5.0-optflags.patch DELETED --- --- teeworlds-0.5.0-segv.patch DELETED --- From cweyl at fedoraproject.org Mon Mar 9 16:00:15 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 9 Mar 2009 16:00:15 +0000 (UTC) Subject: rpms/perl-Catalyst-Plugin-Session-State-Cookie/F-10 .cvsignore, 1.2, 1.3 perl-Catalyst-Plugin-Session-State-Cookie.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090309160015.52EB270034@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12715 Modified Files: .cvsignore perl-Catalyst-Plugin-Session-State-Cookie.spec sources Log Message: * Mon Mar 09 2009 Chris Weyl 0.10-1 - update to 0.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jun 2008 18:01:59 -0000 1.2 +++ .cvsignore 9 Mar 2009 15:59:44 -0000 1.3 @@ -1 +1,12 @@ -Catalyst-Plugin-Session-State-Cookie-0.09.tar.gz +Catalyst-Plugin-Session-State-Cookie-0.10.tar.gz +Catalyst-Plugin-Session-State-Cookie-* +*.tar +*.gz +*.rpm +noarch +i386 +x86_64 +.build* +clog +*.old +*.bak Index: perl-Catalyst-Plugin-Session-State-Cookie.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/F-10/perl-Catalyst-Plugin-Session-State-Cookie.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Catalyst-Plugin-Session-State-Cookie.spec 1 Jun 2008 18:06:28 -0000 1.2 +++ perl-Catalyst-Plugin-Session-State-Cookie.spec 9 Mar 2009 15:59:45 -0000 1.3 @@ -1,17 +1,19 @@ Name: perl-Catalyst-Plugin-Session-State-Cookie -Version: 0.09 -Release: 2%{?dist} +Version: 0.10 +Release: 1%{?dist} Summary: Maintain session IDs using cookies License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Session-State-Cookie/ -Source0: http://www.cpan.org/authors/id/N/NU/NUFFIN/Catalyst-Plugin-Session-State-Cookie-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-State-Cookie-%{version}.tar.gz +#Source0: http://www.cpan.org/authors/id/N/NU/NUFFIN/Catalyst-Plugin-Session-State-Cookie-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Catalyst::Plugin::Session) >= 0.19 +BuildRequires: perl(MRO::Compat) BuildRequires: perl(Test::More) BuildRequires: perl(Test::MockObject) # optional tests @@ -70,6 +72,12 @@ %{_mandir}/man3/* %changelog +* Mon Mar 09 2009 Chris Weyl 0.10-1 +- update to 0.10 + +* Thu Feb 26 2009 Fedora Release Engineering - 0.09-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Jun 01 2008 Chris Weyl 0.09-2 - bump Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jun 2008 18:01:59 -0000 1.2 +++ sources 9 Mar 2009 15:59:45 -0000 1.3 @@ -1 +1 @@ -0eb184e081051ca284c2952ba6db59f7 Catalyst-Plugin-Session-State-Cookie-0.09.tar.gz +0c0f8992eecbe98295f3d36a9b378edc Catalyst-Plugin-Session-State-Cookie-0.10.tar.gz From cweyl at fedoraproject.org Mon Mar 9 16:00:36 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 9 Mar 2009 16:00:36 +0000 (UTC) Subject: rpms/perl-Catalyst-Action-RenderView/F-10 .cvsignore, 1.4, 1.5 perl-Catalyst-Action-RenderView.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <20090309160036.C529270034@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Catalyst-Action-RenderView/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12934 Modified Files: .cvsignore perl-Catalyst-Action-RenderView.spec sources Log Message: * Mon Mar 09 2009 Chris Weyl 0.09-1 - update to 0.09 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Action-RenderView/F-10/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 May 2008 06:15:36 -0000 1.4 +++ .cvsignore 9 Mar 2009 16:00:06 -0000 1.5 @@ -1 +1 @@ -Catalyst-Action-RenderView-0.08.tar.gz +Catalyst-Action-RenderView-0.09.tar.gz Index: perl-Catalyst-Action-RenderView.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Action-RenderView/F-10/perl-Catalyst-Action-RenderView.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Catalyst-Action-RenderView.spec 22 May 2008 06:15:36 -0000 1.5 +++ perl-Catalyst-Action-RenderView.spec 9 Mar 2009 16:00:06 -0000 1.6 @@ -1,5 +1,5 @@ Name: perl-Catalyst-Action-RenderView -Version: 0.08 +Version: 0.09 Release: 1%{?dist} Summary: Sensible default end action for view renders License: GPL+ or Artistic @@ -16,6 +16,7 @@ BuildRequires: perl(Test::More) # cpan BuildRequires: perl(Catalyst) >= 5.7 +BuildRequires: perl(MRO::Compat) BuildRequires: perl(Module::Build) BuildRequires: perl(Data::Visitor) >= 0.08 # test @@ -92,6 +93,12 @@ %{_mandir}/man3/* %changelog +* Mon Mar 09 2009 Chris Weyl 0.09-1 +- update to 0.09 + +* Thu Feb 26 2009 Fedora Release Engineering - 0.08-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed May 21 2008 Chris Weyl 0.08-1 - update to 0.08 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Action-RenderView/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 May 2008 06:15:36 -0000 1.4 +++ sources 9 Mar 2009 16:00:06 -0000 1.5 @@ -1 +1 @@ -47a4771bed9b9b065cc83be14632f433 Catalyst-Action-RenderView-0.08.tar.gz +9a964d2c8d5cee6c82efc97e11565c3d Catalyst-Action-RenderView-0.09.tar.gz From twaugh at fedoraproject.org Mon Mar 9 16:01:03 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Mon, 9 Mar 2009 16:01:03 +0000 (UTC) Subject: rpms/cups/F-10 cups-getnameddest.patch, 1.3, 1.4 cups.spec, 1.456, 1.457 Message-ID: <20090309160103.415FF70034@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13197 Modified Files: cups-getnameddest.patch cups.spec Log Message: * Mon Mar 9 2009 Tim Waugh 1:1.3.9-9 - Fixed getnameddest patch (bug #481481, STR #3082). cups-getnameddest.patch: Index: cups-getnameddest.patch =================================================================== RCS file: /cvs/pkgs/rpms/cups/F-10/cups-getnameddest.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cups-getnameddest.patch 10 Oct 2008 09:44:33 -0000 1.3 +++ cups-getnameddest.patch 9 Mar 2009 16:00:32 -0000 1.4 @@ -1,6 +1,6 @@ diff -up cups-1.3.9/berkeley/lpr.c.getnameddest cups-1.3.9/berkeley/lpr.c ---- cups-1.3.9/berkeley/lpr.c.getnameddest 2008-10-10 09:35:05.000000000 +0100 -+++ cups-1.3.9/berkeley/lpr.c 2008-10-10 09:35:05.000000000 +0100 +--- cups-1.3.9/berkeley/lpr.c.getnameddest 2009-03-09 15:56:30.000000000 +0000 ++++ cups-1.3.9/berkeley/lpr.c 2009-03-09 15:56:38.000000000 +0000 @@ -92,9 +92,7 @@ main(int argc, /* I - Number of comm int num_copies; /* Number of copies per file */ int num_files; /* Number of files to print */ @@ -57,7 +57,7 @@ "non-existent destination \"%s\"!\n"), diff -up cups-1.3.9/cups/cups.h.getnameddest cups-1.3.9/cups/cups.h --- cups-1.3.9/cups/cups.h.getnameddest 2008-07-23 01:06:46.000000000 +0100 -+++ cups-1.3.9/cups/cups.h 2008-10-10 09:35:05.000000000 +0100 ++++ cups-1.3.9/cups/cups.h 2009-03-09 15:56:38.000000000 +0000 @@ -248,6 +248,9 @@ extern void cupsSetDefaultDest(const ch int num_dests, cups_dest_t *dests); @@ -70,7 +70,16 @@ } diff -up cups-1.3.9/cups/dest.c.getnameddest cups-1.3.9/cups/dest.c --- cups-1.3.9/cups/dest.c.getnameddest 2008-09-17 00:37:56.000000000 +0100 -+++ cups-1.3.9/cups/dest.c 2008-10-10 09:36:02.000000000 +0100 ++++ cups-1.3.9/cups/dest.c 2009-03-09 15:56:47.000000000 +0000 +@@ -4,7 +4,7 @@ + * User-defined destination (and option) support for the Common UNIX + * Printing System (CUPS). + * +- * Copyright 2007-2008 by Apple Inc. ++ * Copyright 2007-2009 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products. + * + * These coded instructions, statements, and computer programs are the @@ -25,6 +25,7 @@ * server. * cupsGetDests2() - Get the list of destinations from the @@ -158,7 +167,7 @@ } /* -@@ -460,6 +463,136 @@ cupsGetDests2(http_t *http, /* I - +@@ -460,6 +463,147 @@ cupsGetDests2(http_t *http, /* I - /* @@ -261,7 +270,18 @@ + */ + + if (!cups_get_sdests(http, op, name, 0, &dest)) -+ return (NULL); ++ { ++ if (op == CUPS_GET_DEFAULT) ++ return (NULL); ++ ++ /* ++ * The default printer from environment variables or from a ++ * configuration file does not exist. Find out the real default. ++ */ ++ ++ if (!cups_get_sdests(http, CUPS_GET_DEFAULT, name, 0, &dest)) ++ return (NULL); ++ } + + if (instance) + dest->instance = _cupsStrAlloc(instance); @@ -295,7 +315,7 @@ * 'cupsRemoveDest()' - Remove a destination from the destination list. * * Removing a destination/instance does not delete the class or printer -@@ -556,19 +689,17 @@ void +@@ -556,19 +700,17 @@ void cupsSetDests(int num_dests, /* I - Number of destinations */ cups_dest_t *dests) /* I - Destinations */ { @@ -319,7 +339,7 @@ } -@@ -614,8 +745,8 @@ cupsSetDests2(http_t *http, /* I - +@@ -614,8 +756,8 @@ cupsSetDests2(http_t *http, /* I - * Get the server destinations... */ @@ -330,7 +350,7 @@ /* * Figure out which file to write to... -@@ -630,7 +761,7 @@ cupsSetDests2(http_t *http, /* I - +@@ -630,7 +772,7 @@ cupsSetDests2(http_t *http, /* I - * Merge in server defaults... */ @@ -339,7 +359,7 @@ /* * Point to user defaults... -@@ -797,24 +928,88 @@ cupsSetDests2(http_t *http, /* I - +@@ -797,24 +939,88 @@ cupsSetDests2(http_t *http, /* I - /* @@ -429,7 +449,7 @@ /* * Check environment variables... */ -@@ -824,12 +1019,8 @@ cups_get_dests(const char *filename, /* +@@ -824,12 +1030,8 @@ cups_get_dests(const char *filename, /* if (strcmp(printer, "lp") == 0) printer = NULL; @@ -444,7 +464,7 @@ /* * Read each printer; each line looks like: -@@ -838,28 +1029,22 @@ cups_get_dests(const char *filename, /* +@@ -838,28 +1040,22 @@ cups_get_dests(const char *filename, /* * Default name[/instance] options */ @@ -482,7 +502,7 @@ name = lineptr; -@@ -870,9 +1055,6 @@ cups_get_dests(const char *filename, /* +@@ -870,9 +1066,6 @@ cups_get_dests(const char *filename, /* while (!isspace(*lineptr & 255) && *lineptr && *lineptr != '/') lineptr ++; @@ -492,7 +512,7 @@ if (*lineptr == '/') { /* -@@ -892,30 +1074,49 @@ cups_get_dests(const char *filename, /* +@@ -892,30 +1085,49 @@ cups_get_dests(const char *filename, /* else instance = NULL; @@ -555,7 +575,7 @@ } /* -@@ -926,11 +1127,20 @@ cups_get_dests(const char *filename, /* +@@ -926,11 +1138,20 @@ cups_get_dests(const char *filename, /* &(dest->options)); /* @@ -577,7 +597,7 @@ for (i = 0; i < num_dests; i ++) (*dests)[i].is_default = 0; -@@ -942,7 +1152,7 @@ cups_get_dests(const char *filename, /* +@@ -942,7 +1163,7 @@ cups_get_dests(const char *filename, /* * Close the file and return... */ @@ -586,7 +606,7 @@ return (num_dests); } -@@ -954,7 +1164,8 @@ cups_get_dests(const char *filename, /* +@@ -954,7 +1175,8 @@ cups_get_dests(const char *filename, /* static int /* O - Number of destinations */ cups_get_sdests(http_t *http, /* I - HTTP connection */ @@ -596,7 +616,7 @@ int num_dests, /* I - Number of destinations */ cups_dest_t **dests) /* IO - Destinations */ { -@@ -971,8 +1182,9 @@ cups_get_sdests(http_t *http, /* I +@@ -971,8 +1193,9 @@ cups_get_sdests(http_t *http, /* I const char *info, /* printer-info attribute */ *location, /* printer-location attribute */ *make_model, /* printer-make-and-model attribute */ @@ -608,7 +628,7 @@ auth_info_req[1024], /* auth-info-required attribute */ reasons[1024]; /* printer-state-reasons attribute */ int num_options; /* Number of options */ -@@ -1016,6 +1228,14 @@ cups_get_sdests(http_t *http, /* I +@@ -1016,6 +1239,14 @@ cups_get_sdests(http_t *http, /* I ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", NULL, cupsUser()); @@ -623,7 +643,7 @@ /* * Do the request and get back a response... */ -@@ -1038,17 +1258,17 @@ cups_get_sdests(http_t *http, /* I +@@ -1038,17 +1269,17 @@ cups_get_sdests(http_t *http, /* I * Pull the needed attributes from this printer... */ @@ -652,7 +672,7 @@ auth_info_req[0] = '\0'; job_sheets[0] = '\0'; -@@ -1099,7 +1319,7 @@ cups_get_sdests(http_t *http, /* I +@@ -1099,7 +1330,7 @@ cups_get_sdests(http_t *http, /* I make_model = attr->values[0].string.text; else if (!strcmp(attr->name, "printer-name") && attr->value_tag == IPP_TAG_NAME) @@ -661,7 +681,7 @@ else if (!strcmp(attr->name, "printer-state") && attr->value_tag == IPP_TAG_ENUM) state = attr->values[0].integer; -@@ -1204,7 +1424,7 @@ cups_get_sdests(http_t *http, /* I +@@ -1204,7 +1435,7 @@ cups_get_sdests(http_t *http, /* I * See if we have everything needed... */ @@ -670,7 +690,7 @@ { cupsFreeOptions(num_options, options); -@@ -1214,9 +1434,9 @@ cups_get_sdests(http_t *http, /* I +@@ -1214,9 +1445,9 @@ cups_get_sdests(http_t *http, /* I continue; } @@ -684,7 +704,7 @@ dest->options = options; diff -up cups-1.3.9/cups/libcups.exp.getnameddest cups-1.3.9/cups/libcups.exp --- cups-1.3.9/cups/libcups.exp.getnameddest 2008-04-09 04:39:40.000000000 +0100 -+++ cups-1.3.9/cups/libcups.exp 2008-10-10 09:35:05.000000000 +0100 ++++ cups-1.3.9/cups/libcups.exp 2009-03-09 15:56:38.000000000 +0000 @@ -114,6 +114,7 @@ _cupsGetFd _cupsGetFile _cupsGetJobs @@ -695,7 +715,7 @@ _cupsGetPPD diff -up cups-1.3.9/cups/Makefile.getnameddest cups-1.3.9/cups/Makefile --- cups-1.3.9/cups/Makefile.getnameddest 2008-09-06 01:30:39.000000000 +0100 -+++ cups-1.3.9/cups/Makefile 2008-10-10 09:35:05.000000000 +0100 ++++ cups-1.3.9/cups/Makefile 2009-03-09 15:56:38.000000000 +0000 @@ -263,7 +263,7 @@ libcups.so.2 libcups.sl.2: $(LIBOBJS) # libcups.2.dylib # @@ -707,7 +727,7 @@ -install_name $(libdir)/$@ \ diff -up cups-1.3.9/cups/testcups.c.getnameddest cups-1.3.9/cups/testcups.c --- cups-1.3.9/cups/testcups.c.getnameddest 2008-07-11 23:48:49.000000000 +0100 -+++ cups-1.3.9/cups/testcups.c 2008-10-10 09:35:05.000000000 +0100 ++++ cups-1.3.9/cups/testcups.c 2009-03-09 15:56:38.000000000 +0000 @@ -16,7 +16,8 @@ * * Contents: @@ -950,7 +970,7 @@ */ diff -up cups-1.3.9/systemv/lp.c.getnameddest cups-1.3.9/systemv/lp.c --- cups-1.3.9/systemv/lp.c.getnameddest 2008-07-11 23:48:49.000000000 +0100 -+++ cups-1.3.9/systemv/lp.c 2008-10-10 09:35:05.000000000 +0100 ++++ cups-1.3.9/systemv/lp.c 2009-03-09 15:56:38.000000000 +0000 @@ -73,9 +73,7 @@ main(int argc, /* I - Number of comm int num_copies; /* Number of copies per file */ int num_files; /* Number of files to print */ Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v retrieving revision 1.456 retrieving revision 1.457 diff -u -r1.456 -r1.457 --- cups.spec 9 Mar 2009 12:11:44 -0000 1.456 +++ cups.spec 9 Mar 2009 16:00:32 -0000 1.457 @@ -492,6 +492,7 @@ %changelog * Mon Mar 9 2009 Tim Waugh 1:1.3.9-9 +- Fixed getnameddest patch (bug #481481, STR #3082). - Handle https:// device URIs (bug #478677, STR #3122). * Wed Jan 28 2009 Tim Waugh 1:1.3.9-8 From pkgdb at fedoraproject.org Mon Mar 9 16:02:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:02:14 +0000 Subject: [pkgdb] mingw32-gnutls was added for rjones Message-ID: <20090309160211.BD57B208549@bastion.fedora.phx.redhat.com> kevin has added Package mingw32-gnutls with summary MinGW GnuTLS TLS/SSL encryption library kevin has approved Package mingw32-gnutls kevin has added a Fedora devel branch for mingw32-gnutls with an owner of rjones kevin has approved mingw32-gnutls in Fedora devel kevin has approved Package mingw32-gnutls kevin has set commit to Approved for provenpackager on mingw32-gnutls (Fedora devel) kevin has set build to Approved for provenpackager on mingw32-gnutls (Fedora devel) kevin has set checkout to Approved for provenpackager on mingw32-gnutls (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gnutls From pkgdb at fedoraproject.org Mon Mar 9 16:01:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:01:53 +0000 Subject: [pkgdb] mingw32-gnutls (Fedora EPEL, 5) updated by kevin Message-ID: <20090309160213.C995C2D0023@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for mingw32-gnutls kevin has set commit to Approved for provenpackager on mingw32-gnutls (Fedora EPEL 5) kevin has set build to Approved for provenpackager on mingw32-gnutls (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on mingw32-gnutls (Fedora EPEL 5) kevin approved watchbugzilla on mingw32-gnutls (Fedora EPEL 5) for berrange kevin approved watchcommits on mingw32-gnutls (Fedora EPEL 5) for berrange kevin approved commit on mingw32-gnutls (Fedora EPEL 5) for berrange kevin approved build on mingw32-gnutls (Fedora EPEL 5) for berrange kevin approved approveacls on mingw32-gnutls (Fedora EPEL 5) for berrange To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gnutls From pkgdb at fedoraproject.org Mon Mar 9 16:01:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:01:53 +0000 Subject: [pkgdb] mingw32-gnutls (Fedora, devel) updated by kevin Message-ID: <20090309160214.158532D0036@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on mingw32-gnutls (Fedora devel) for berrange kevin approved watchcommits on mingw32-gnutls (Fedora devel) for berrange kevin approved commit on mingw32-gnutls (Fedora devel) for berrange kevin approved build on mingw32-gnutls (Fedora devel) for berrange kevin approved approveacls on mingw32-gnutls (Fedora devel) for berrange To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gnutls From pkgdb at fedoraproject.org Mon Mar 9 16:01:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:01:53 +0000 Subject: [pkgdb] mingw32-gnutls (Fedora, 10) updated by kevin Message-ID: <20090309160213.ED04F2D0032@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for mingw32-gnutls kevin has set commit to Approved for provenpackager on mingw32-gnutls (Fedora 10) kevin has set build to Approved for provenpackager on mingw32-gnutls (Fedora 10) kevin has set checkout to Approved for provenpackager on mingw32-gnutls (Fedora 10) kevin approved watchbugzilla on mingw32-gnutls (Fedora 10) for berrange kevin approved watchcommits on mingw32-gnutls (Fedora 10) for berrange kevin approved commit on mingw32-gnutls (Fedora 10) for berrange kevin approved build on mingw32-gnutls (Fedora 10) for berrange kevin approved approveacls on mingw32-gnutls (Fedora 10) for berrange To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gnutls From kevin at fedoraproject.org Mon Mar 9 16:01:26 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:01:26 +0000 (UTC) Subject: rpms/mingw32-gnutls/devel - New directory Message-ID: <20090309160126.6D20070034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mingw32-gnutls/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf13546/rpms/mingw32-gnutls/devel Log Message: Directory /cvs/pkgs/rpms/mingw32-gnutls/devel added to the repository From kevin at fedoraproject.org Mon Mar 9 16:01:26 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:01:26 +0000 (UTC) Subject: rpms/mingw32-gnutls - New directory Message-ID: <20090309160126.2D88270034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mingw32-gnutls In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf13546/rpms/mingw32-gnutls Log Message: Directory /cvs/pkgs/rpms/mingw32-gnutls added to the repository From kevin at fedoraproject.org Mon Mar 9 16:01:45 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:01:45 +0000 (UTC) Subject: rpms/mingw32-gnutls Makefile,NONE,1.1 Message-ID: <20090309160145.8326870034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mingw32-gnutls In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf13546/rpms/mingw32-gnutls Added Files: Makefile Log Message: Setup of module mingw32-gnutls --- NEW FILE Makefile --- # Top level Makefile for module mingw32-gnutls all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Mon Mar 9 16:01:45 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:01:45 +0000 (UTC) Subject: rpms/mingw32-gnutls/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309160145.D12E270034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/mingw32-gnutls/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf13546/rpms/mingw32-gnutls/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mingw32-gnutls --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: mingw32-gnutls # $Id: Makefile,v 1.1 2009/03/09 16:01:45 kevin Exp $ NAME := mingw32-gnutls SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From hadess at fedoraproject.org Mon Mar 9 16:02:15 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 9 Mar 2009 16:02:15 +0000 (UTC) Subject: rpms/sound-juicer/devel .cvsignore, 1.52, 1.53 sound-juicer.spec, 1.110, 1.111 sources, 1.54, 1.55 Message-ID: <20090309160215.DE87470034@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/sound-juicer/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13605 Modified Files: .cvsignore sound-juicer.spec sources Log Message: * Mon Mar 09 2009 - Bastien Nocera - 2.25.92-1 - Update to 2.25.92 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sound-juicer/devel/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 18 Feb 2009 03:29:25 -0000 1.52 +++ .cvsignore 9 Mar 2009 16:01:45 -0000 1.53 @@ -1 +1 @@ -sound-juicer-2.25.3.tar.bz2 +sound-juicer-2.25.92.tar.bz2 Index: sound-juicer.spec =================================================================== RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- sound-juicer.spec 2 Mar 2009 15:22:51 -0000 1.110 +++ sound-juicer.spec 9 Mar 2009 16:01:45 -0000 1.111 @@ -7,8 +7,8 @@ Name: sound-juicer Summary: Clean and lean CD ripper -Version: 2.25.3 -Release: 3%{?dist} +Version: 2.25.92 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia Source: http://download.gnome.org/sources/sound-juicer/2.25/%{name}-%{version}.tar.bz2 @@ -112,6 +112,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 09 2009 - Bastien Nocera - 2.25.92-1 +- Update to 2.25.92 + * Mon Mar 02 2009 - Bastien Nocera - 2.25.3-3 - Remove nautilus-cd-burner dependency Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 18 Feb 2009 03:29:25 -0000 1.54 +++ sources 9 Mar 2009 16:01:45 -0000 1.55 @@ -1 +1 @@ -7c0bb0ccd41cbb0e61cd56e9b706a3fd sound-juicer-2.25.3.tar.bz2 +d706fc807c853d1bc3db9b3a1e22c4ec sound-juicer-2.25.92.tar.bz2 From cassmodiah at fedoraproject.org Mon Mar 9 16:02:52 2009 From: cassmodiah at fedoraproject.org (Simon Wesp) Date: Mon, 9 Mar 2009 16:02:52 +0000 (UTC) Subject: rpms/teeworlds/F-10 import.log, NONE, 1.1 teeworlds-0.5.1-extlibs.patch, NONE, 1.1 teeworlds-0.5.1-optflags.patch, NONE, 1.1 teeworlds.png, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 teeworlds.spec, 1.2, 1.3 teeworlds-0.5.0-extlibs.patch, 1.1, NONE teeworlds-0.5.0-optflags.patch, 1.1, NONE teeworlds-0.5.0-segv.patch, 1.1, NONE Message-ID: <20090309160252.D23AD70034@cvs1.fedora.phx.redhat.com> Author: cassmodiah Update of /cvs/pkgs/rpms/teeworlds/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13723/F-10 Modified Files: .cvsignore sources teeworlds.spec Added Files: import.log teeworlds-0.5.1-extlibs.patch teeworlds-0.5.1-optflags.patch teeworlds.png Removed Files: teeworlds-0.5.0-extlibs.patch teeworlds-0.5.0-optflags.patch teeworlds-0.5.0-segv.patch Log Message: --- NEW FILE import.log --- teeworlds-0_5_1-1_fc10:F-10:teeworlds-0.5.1-1.fc10.src.rpm:1236614421 teeworlds-0.5.1-extlibs.patch: --- NEW FILE teeworlds-0.5.1-extlibs.patch --- diff -Naur teeworlds-0.5.1-src.orig/default.bam teeworlds-0.5.1-src/default.bam --- teeworlds-0.5.1-src.orig/default.bam 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/default.bam 2009-03-09 12:48:10.000000000 +0100 @@ -7,6 +7,8 @@ config:Add(OptFindCompiler()) config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all")) config:Add(OptFindLibrary("zlib", "zlib.h", false)) +config:Add(OptFindLibrary("wavpack", "wavpack/wavpack.h", false)) +config:Add(OptFindLibrary("pnglite", "sys/types.h", false)) config:Add(SDL.OptFind("sdl", true)) config:Finalize("config.bam") @@ -151,8 +153,29 @@ end -- build the small libraries - wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) - pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) + -- compile wavpack if needed + if config.wavpack.value == 1 then + settings.link.libs:Add("wavpack") + if config.wavpack.include_path then + settings.cc.includes:Add(config.wavpack.include_path) + end + wavpack = {} + else + wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) + settings.cc.includes:Add("src/engine/external") + end + + -- compile pnglite if needed + if config.pnglite.value == 1 then + settings.link.libs:Add("pnglite") + if config.pnglite.include_path then + settings.cc.includes:Add(config.pnglite.include_path) + end + pnglite = {} + else + pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) + settings.cc.includes:Add("src/engine/external/pnglite") + end -- build game components engine_settings = settings:Copy() diff -Naur teeworlds-0.5.1-src.orig/src/engine/client/ec_gfx.c teeworlds-0.5.1-src/src/engine/client/ec_gfx.c --- teeworlds-0.5.1-src.orig/src/engine/client/ec_gfx.c 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/src/engine/client/ec_gfx.c 2009-03-09 12:48:39.000000000 +0100 @@ -18,7 +18,7 @@ #endif #include -#include +#include #include #include diff -Naur teeworlds-0.5.1-src.orig/src/engine/client/ec_snd.c teeworlds-0.5.1-src/src/engine/client/ec_snd.c --- teeworlds-0.5.1-src.orig/src/engine/client/ec_snd.c 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/src/engine/client/ec_snd.c 2009-03-09 12:55:19.000000000 +0100 @@ -6,7 +6,7 @@ #include "SDL.h" -#include +#include #include #include #include @@ -358,19 +358,12 @@ snd->num_frames = num_frames; } - -static IOHANDLE file = NULL; - -static int read_data(void *buffer, int size) -{ - return io_read(file, buffer, size); -} - int snd_load_wv(const char *filename) { SAMPLE *snd; int sid = -1; char error[100]; + char completefilename[512]; WavpackContext *context; /* don't waste memory on sound when we are stress testing */ @@ -381,19 +374,13 @@ if(!sound_enabled) return 1; - file = engine_openfile(filename, IOFLAG_READ); /* TODO: use system.h stuff for this */ - if(!file) - { - dbg_msg("sound/wv", "failed to open %s", filename); - return -1; - } - sid = snd_alloc_id(); if(sid < 0) return -1; snd = &samples[sid]; - context = WavpackOpenFileInput(read_data, error); + engine_getpath(completefilename, sizeof(completefilename), filename, IOFLAG_READ); + context = WavpackOpenFileInput(completefilename, error, 0, 0); if (context) { int samples = WavpackGetNumSamples(context); @@ -410,7 +397,7 @@ if(snd->channels > 2) { - dbg_msg("sound/wv", "file is not mono or stereo. filename='%s'", filename); + dbg_msg("sound/wv", "failed to open %s: %s", completefilename, error); return -1; } @@ -448,9 +435,6 @@ dbg_msg("sound/wv", "failed to open %s: %s", filename, error); } - io_close(file); - file = NULL; - if(config.debug) dbg_msg("sound/wv", "loaded %s", filename); diff -Naur teeworlds-0.5.1-src.orig/src/game/client/render.hpp teeworlds-0.5.1-src/src/game/client/render.hpp --- teeworlds-0.5.1-src.orig/src/game/client/render.hpp 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/src/game/client/render.hpp 2009-03-09 12:56:19.000000000 +0100 @@ -37,7 +37,7 @@ TILERENDERFLAG_EXTEND=4, }; -typedef struct SPRITE; +struct SPRITE; void select_sprite(SPRITE *spr, int flags=0, int sx=0, int sy=0); void select_sprite(int id, int flags=0, int sx=0, int sy=0); diff -Naur teeworlds-0.5.1-src.orig/src/tools/dilate.c teeworlds-0.5.1-src/src/tools/dilate.c --- teeworlds-0.5.1-src.orig/src/tools/dilate.c 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/src/tools/dilate.c 2009-03-09 12:56:50.000000000 +0100 @@ -1,6 +1,9 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include "../engine/external/pnglite/pnglite.c" +#include +#include +#include +#include typedef struct pixel_t { diff -Naur teeworlds-0.5.1-src.orig/src/tools/tileset_borderfix.c teeworlds-0.5.1-src/src/tools/tileset_borderfix.c --- teeworlds-0.5.1-src.orig/src/tools/tileset_borderfix.c 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/src/tools/tileset_borderfix.c 2009-03-09 12:57:14.000000000 +0100 @@ -1,6 +1,9 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include "../engine/external/pnglite/pnglite.c" +#include +#include +#include +#include typedef struct pixel_t { teeworlds-0.5.1-optflags.patch: --- NEW FILE teeworlds-0.5.1-optflags.patch --- diff -Naur teeworlds-0.5.1-src.orig/default.bam teeworlds-0.5.1-src/default.bam --- teeworlds-0.5.1-src.orig/default.bam 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/default.bam 2009-03-09 12:14:32.000000000 +0100 @@ -106,6 +106,9 @@ function build(settings) --settings.objdir = Path("objs") settings.cc.Output = Intermediate_Output + settings.cc.flags:Add(os.getenv ('CFLAGS')) + settings.cc.flags:Add(os.getenv ('CPPFLAGS')) + settings.cc.flags:Add(os.getenv ('LDFLAGS')) if config.compiler.value == "cl" then settings.cc.flags:Add("/wd4244") Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/teeworlds/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 18 Jan 2009 18:40:36 -0000 1.3 +++ .cvsignore 9 Mar 2009 16:02:22 -0000 1.4 @@ -1,2 +1 @@ -teeworlds-0.5.0-src.tar.gz -teeworlds.png +teeworlds-0.5.1-src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/teeworlds/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Jan 2009 18:40:36 -0000 1.3 +++ sources 9 Mar 2009 16:02:22 -0000 1.4 @@ -1,2 +1 @@ -39d7b5d41c2c7250201214a4ab6844ed teeworlds-0.5.0-src.tar.gz -d541e3afa7809bd73bb64adb0795cb65 teeworlds.png +5f96e73ff4c3d552de55902da9255606 teeworlds-0.5.1-src.tar.gz Index: teeworlds.spec =================================================================== RCS file: /cvs/pkgs/rpms/teeworlds/F-10/teeworlds.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- teeworlds.spec 18 Jan 2009 18:40:37 -0000 1.2 +++ teeworlds.spec 9 Mar 2009 16:02:22 -0000 1.3 @@ -1,5 +1,5 @@ Name: teeworlds -Version: 0.5.0 +Version: 0.5.1 Release: 1%{?dist} Summary: Online multi-player platform 2D shooter @@ -9,9 +9,8 @@ Source0: http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz Source1: %{name}.png Source2: %{name}.desktop -Patch1: %{name}-0.5.0-extlibs.patch -Patch2: %{name}-0.5.0-optflags.patch -Patch3: %{name}-0.5.0-segv.patch +Patch1: %{name}-0.5.1-extlibs.patch +Patch2: %{name}-0.5.1-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mesa-libGLU-devel @@ -24,7 +23,7 @@ BuildRequires: pnglite-devel BuildRequires: SDL-devel Requires: %{name}-data - + %description The game features cartoon-themed graphics and physics, @@ -53,14 +52,17 @@ %setup -q -n %{name}-%{version}-src rm -rf src/engine/external -%patch1 -p1 -b .extlibs -%patch2 -p1 -b .optflags -%patch3 -p1 -b .segv +%patch1 -p1 +%patch2 -p1 iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8 touch -c -r readme.txt readme.txt.utf8 mv readme.txt.utf8 readme.txt +iconv -f iso-8859-1 -t utf-8 src/game/editor/array.hpp |sed 's|\r||g' > src/game/editor/array.hpp.utf8 +touch -c -r src/game/editor/array.hpp src/game/editor/array.hpp.utf8 +mv src/game/editor/array.hpp.utf8 src/game/editor/array.hpp + %build CFLAGS="%{optflags}" bam -v release @@ -115,6 +117,12 @@ %changelog +* Mon Mar 09 2009 Simon Wesp 0.5.1-1 +- New upstream release + +* Wed Feb 25 2009 Fedora Release Engineering - 0.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Jan 17 2009 Lubomir Rintel 0.5.0-1 - New upstream release --- teeworlds-0.5.0-extlibs.patch DELETED --- --- teeworlds-0.5.0-optflags.patch DELETED --- --- teeworlds-0.5.0-segv.patch DELETED --- From pkgdb at fedoraproject.org Mon Mar 9 16:04:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:04:02 +0000 Subject: [pkgdb] php-pecl-selinux was added for kaigai Message-ID: <20090309160402.2AE4E208548@bastion.fedora.phx.redhat.com> kevin has added Package php-pecl-selinux with summary SELinux binding for PHP scripting language kevin has approved Package php-pecl-selinux kevin has added a Fedora devel branch for php-pecl-selinux with an owner of kaigai kevin has approved php-pecl-selinux in Fedora devel kevin has approved Package php-pecl-selinux kevin has set commit to Approved for provenpackager on php-pecl-selinux (Fedora devel) kevin has set build to Approved for provenpackager on php-pecl-selinux (Fedora devel) kevin has set checkout to Approved for provenpackager on php-pecl-selinux (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-selinux From pkgdb at fedoraproject.org Mon Mar 9 16:03:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:03:02 +0000 Subject: [pkgdb] php-pecl-selinux (Fedora, 9) updated by kevin Message-ID: <20090309160404.C130220854A@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for php-pecl-selinux kevin has set commit to Approved for provenpackager on php-pecl-selinux (Fedora 9) kevin has set build to Approved for provenpackager on php-pecl-selinux (Fedora 9) kevin has set checkout to Approved for provenpackager on php-pecl-selinux (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-selinux From pkgdb at fedoraproject.org Mon Mar 9 16:03:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:03:02 +0000 Subject: [pkgdb] php-pecl-selinux (Fedora, 10) updated by kevin Message-ID: <20090309160404.CCA9D20854D@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for php-pecl-selinux kevin has set commit to Approved for provenpackager on php-pecl-selinux (Fedora 10) kevin has set build to Approved for provenpackager on php-pecl-selinux (Fedora 10) kevin has set checkout to Approved for provenpackager on php-pecl-selinux (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-selinux From kevin at fedoraproject.org Mon Mar 9 16:03:17 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:03:17 +0000 (UTC) Subject: rpms/php-pecl-selinux/devel - New directory Message-ID: <20090309160317.65B6D70133@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/php-pecl-selinux/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG14488/rpms/php-pecl-selinux/devel Log Message: Directory /cvs/pkgs/rpms/php-pecl-selinux/devel added to the repository From kevin at fedoraproject.org Mon Mar 9 16:03:17 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:03:17 +0000 (UTC) Subject: rpms/php-pecl-selinux - New directory Message-ID: <20090309160317.2A6E470034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/php-pecl-selinux In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG14488/rpms/php-pecl-selinux Log Message: Directory /cvs/pkgs/rpms/php-pecl-selinux added to the repository From kevin at fedoraproject.org Mon Mar 9 16:03:35 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:03:35 +0000 (UTC) Subject: rpms/php-pecl-selinux Makefile,NONE,1.1 Message-ID: <20090309160335.3929370034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/php-pecl-selinux In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG14488/rpms/php-pecl-selinux Added Files: Makefile Log Message: Setup of module php-pecl-selinux --- NEW FILE Makefile --- # Top level Makefile for module php-pecl-selinux all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Mon Mar 9 16:03:35 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:03:35 +0000 (UTC) Subject: rpms/php-pecl-selinux/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309160335.775AD70034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/php-pecl-selinux/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG14488/rpms/php-pecl-selinux/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-pecl-selinux --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: php-pecl-selinux # $Id: Makefile,v 1.1 2009/03/09 16:03:35 kevin Exp $ NAME := php-pecl-selinux SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From mclasen at fedoraproject.org Mon Mar 9 16:03:46 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 9 Mar 2009 16:03:46 +0000 (UTC) Subject: comps comps-f11.xml.in,1.150,1.151 Message-ID: <20090309160346.239147012E@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14368 Modified Files: comps-f11.xml.in Log Message: switch to brasero by default Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- comps-f11.xml.in 8 Mar 2009 23:44:52 -0000 1.150 +++ comps-f11.xml.in 9 Mar 2009 16:03:15 -0000 1.151 @@ -2172,7 +2172,6 @@ gvfs-smb libcanberra-gtk2 mousetweaks - nautilus-cd-burner nautilus-sendto NetworkManager-gnome notification-daemon @@ -2221,6 +2220,7 @@ istanbul lock-keys-applet nautilus-actions + nautilus-cd-burner nautilus-image-converter nautilus-open-terminal nautilus-search-tool @@ -4407,6 +4407,7 @@ vorbis-tools xine-lib-pulseaudio alsa-plugins-pulseaudio + brasero cdparanoia genisoimage gstreamer-plugins-good From pkgdb at fedoraproject.org Mon Mar 9 16:04:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:04:15 +0000 Subject: [pkgdb] qd was added for jussilehtola Message-ID: <20090309160517.4C8FB208545@bastion.fedora.phx.redhat.com> kevin has added Package qd with summary Double-Double and Quad-Double Arithmetic kevin has approved Package qd kevin has added a Fedora devel branch for qd with an owner of jussilehtola kevin has approved qd in Fedora devel kevin has approved Package qd kevin has set commit to Approved for provenpackager on qd (Fedora devel) kevin has set build to Approved for provenpackager on qd (Fedora devel) kevin has set checkout to Approved for provenpackager on qd (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qd From pkgdb at fedoraproject.org Mon Mar 9 16:04:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:04:58 +0000 Subject: [pkgdb] qd (Fedora, 9) updated by kevin Message-ID: <20090309160519.17BA6208548@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for qd kevin has set commit to Approved for provenpackager on qd (Fedora 9) kevin has set build to Approved for provenpackager on qd (Fedora 9) kevin has set checkout to Approved for provenpackager on qd (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qd From pkgdb at fedoraproject.org Mon Mar 9 16:04:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:04:58 +0000 Subject: [pkgdb] qd (Fedora, 10) updated by kevin Message-ID: <20090309160519.2661820854C@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for qd kevin has set commit to Approved for provenpackager on qd (Fedora 10) kevin has set build to Approved for provenpackager on qd (Fedora 10) kevin has set checkout to Approved for provenpackager on qd (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qd From kevin at fedoraproject.org Mon Mar 9 16:04:33 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:04:33 +0000 (UTC) Subject: rpms/qd/devel - New directory Message-ID: <20090309160433.7CA327012E@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/qd/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15265/rpms/qd/devel Log Message: Directory /cvs/pkgs/rpms/qd/devel added to the repository From kevin at fedoraproject.org Mon Mar 9 16:04:33 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:04:33 +0000 (UTC) Subject: rpms/qd - New directory Message-ID: <20090309160433.280867012E@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/qd In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15265/rpms/qd Log Message: Directory /cvs/pkgs/rpms/qd added to the repository From pkgdb at fedoraproject.org Mon Mar 9 16:04:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:04:58 +0000 Subject: [pkgdb] qd (Fedora EPEL, 5) updated by kevin Message-ID: <20090309160519.3F43C20854F@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for qd kevin has set commit to Approved for provenpackager on qd (Fedora EPEL 5) kevin has set build to Approved for provenpackager on qd (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on qd (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qd From kevin at fedoraproject.org Mon Mar 9 16:04:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:04:52 +0000 (UTC) Subject: rpms/qd Makefile,NONE,1.1 Message-ID: <20090309160452.EA21A7012E@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/qd In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15265/rpms/qd Added Files: Makefile Log Message: Setup of module qd --- NEW FILE Makefile --- # Top level Makefile for module qd all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Mon Mar 9 16:04:53 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:04:53 +0000 (UTC) Subject: rpms/qd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309160453.51E9F7012E@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/qd/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15265/rpms/qd/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module qd --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: qd # $Id: Makefile,v 1.1 2009/03/09 16:04:53 kevin Exp $ NAME := qd SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Mon Mar 9 16:06:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:06:06 +0000 Subject: [pkgdb] clc-intercal was added for iarnell Message-ID: <20090309160626.8DCE2208543@bastion.fedora.phx.redhat.com> kevin has added Package clc-intercal with summary Compiler for the INTERCAL language kevin has approved Package clc-intercal kevin has added a Fedora devel branch for clc-intercal with an owner of iarnell kevin has approved clc-intercal in Fedora devel kevin has approved Package clc-intercal kevin has set commit to Approved for provenpackager on clc-intercal (Fedora devel) kevin has set build to Approved for provenpackager on clc-intercal (Fedora devel) kevin has set checkout to Approved for provenpackager on clc-intercal (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/clc-intercal From pkgdb at fedoraproject.org Mon Mar 9 16:06:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:06:27 +0000 Subject: [pkgdb] clc-intercal (Fedora, 9) updated by kevin Message-ID: <20090309160627.C861F208549@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for clc-intercal kevin has set commit to Approved for provenpackager on clc-intercal (Fedora 9) kevin has set build to Approved for provenpackager on clc-intercal (Fedora 9) kevin has set checkout to Approved for provenpackager on clc-intercal (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/clc-intercal From pkgdb at fedoraproject.org Mon Mar 9 16:06:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:06:27 +0000 Subject: [pkgdb] clc-intercal (Fedora, 10) updated by kevin Message-ID: <20090309160627.E28C420854E@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for clc-intercal kevin has set commit to Approved for provenpackager on clc-intercal (Fedora 10) kevin has set build to Approved for provenpackager on clc-intercal (Fedora 10) kevin has set checkout to Approved for provenpackager on clc-intercal (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/clc-intercal From kevin at fedoraproject.org Mon Mar 9 16:05:42 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:05:42 +0000 (UTC) Subject: rpms/clc-intercal - New directory Message-ID: <20090309160542.238D070034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/clc-intercal In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc16350/rpms/clc-intercal Log Message: Directory /cvs/pkgs/rpms/clc-intercal added to the repository From kevin at fedoraproject.org Mon Mar 9 16:05:42 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:05:42 +0000 (UTC) Subject: rpms/clc-intercal/devel - New directory Message-ID: <20090309160542.6E80F70034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/clc-intercal/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc16350/rpms/clc-intercal/devel Log Message: Directory /cvs/pkgs/rpms/clc-intercal/devel added to the repository From kevin at fedoraproject.org Mon Mar 9 16:05:59 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:05:59 +0000 (UTC) Subject: rpms/clc-intercal Makefile,NONE,1.1 Message-ID: <20090309160559.DC7F970034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/clc-intercal In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc16350/rpms/clc-intercal Added Files: Makefile Log Message: Setup of module clc-intercal --- NEW FILE Makefile --- # Top level Makefile for module clc-intercal all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Mon Mar 9 16:06:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:06:00 +0000 (UTC) Subject: rpms/clc-intercal/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309160600.37F5F70133@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/clc-intercal/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc16350/rpms/clc-intercal/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module clc-intercal --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: clc-intercal # $Id: Makefile,v 1.1 2009/03/09 16:06:00 kevin Exp $ NAME := clc-intercal SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From atkac at fedoraproject.org Mon Mar 9 16:05:44 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Mon, 9 Mar 2009 16:05:44 +0000 (UTC) Subject: rpms/swig/devel swig.spec,1.44,1.45 Message-ID: <20090309160544.6955C70034@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/swig/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15871 Modified Files: swig.spec Log Message: - moved documentation to -doc subpackage and build it as noarch - added Example/ directory to -doc (#489077) - fixed build root Index: swig.spec =================================================================== RCS file: /cvs/pkgs/rpms/swig/devel/swig.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- swig.spec 26 Feb 2009 04:29:45 -0000 1.44 +++ swig.spec 9 Mar 2009 16:05:14 -0000 1.45 @@ -4,7 +4,7 @@ Summary: Connects C/C++/Objective C to some high-level programming languages. Name: swig Version: 1.3.38 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Development/Tools URL: http://swig.sourceforge.net/ @@ -12,7 +12,7 @@ Patch1: swig-1.3.23-pylib.patch Patch2: swig-1.3.38-rh485540.patch -BuildRoot: %{_tmppath}/swig-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl, python-devel %if %{tcl} BuildRequires: tcl-devel @@ -31,6 +31,15 @@ interpreted programming environments, systems integration, and as a tool for building user interfaces. +%package doc +Summary: Documentation files for SWIG +License: BSD +Group: Development/Tools +BuildArch: noarch + +%description doc +This package contains documentation for SWIG and useful examples. + %prep %setup -q -n swig-%{version} %patch1 -p1 -b .pylib @@ -45,6 +54,13 @@ %install rm -rf $RPM_BUILD_ROOT +# Remove all arch dependent files in Examples/ +pushd Examples/ +for all in `find Makefile.in`; do + rm -f "${all%%.in}" +done +popd + make DESTDIR=$RPM_BUILD_ROOT install %clean @@ -56,13 +72,20 @@ %files %defattr(-,root,root) -%doc ANNOUNCE CHANGES FUTURE INSTALL LICENSE NEW README TODO -%doc Doc/* %{_bindir}/* %{_datadir}/swig %{_mandir}/man1/ccache-swig.1* +%files doc +%doc ANNOUNCE CHANGES FUTURE INSTALL LICENSE NEW README TODO +%doc Doc Examples + %changelog +* Mon Mar 09 2009 Adam Tkac 1.3.38-4 +- moved documentation to -doc subpackage and build it as noarch +- added Example/ directory to -doc (#489077) +- fixed build root + * Wed Feb 25 2009 Fedora Release Engineering - 1.3.38-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From cassmodiah at fedoraproject.org Mon Mar 9 16:06:01 2009 From: cassmodiah at fedoraproject.org (Simon Wesp) Date: Mon, 9 Mar 2009 16:06:01 +0000 (UTC) Subject: rpms/teeworlds/devel import.log, NONE, 1.1 teeworlds-0.5.1-extlibs.patch, NONE, 1.1 teeworlds-0.5.1-optflags.patch, NONE, 1.1 teeworlds.png, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 teeworlds.spec, 1.3, 1.4 teeworlds-0.5.0-extlibs.patch, 1.1, NONE teeworlds-0.5.0-optflags.patch, 1.1, NONE teeworlds-0.5.0-segv.patch, 1.1, NONE Message-ID: <20090309160601.919FB70034@cvs1.fedora.phx.redhat.com> Author: cassmodiah Update of /cvs/pkgs/rpms/teeworlds/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15803/devel Modified Files: .cvsignore sources teeworlds.spec Added Files: import.log teeworlds-0.5.1-extlibs.patch teeworlds-0.5.1-optflags.patch teeworlds.png Removed Files: teeworlds-0.5.0-extlibs.patch teeworlds-0.5.0-optflags.patch teeworlds-0.5.0-segv.patch Log Message: --- NEW FILE import.log --- teeworlds-0_5_1-1_fc10:HEAD:teeworlds-0.5.1-1.fc10.src.rpm:1236614659 teeworlds-0.5.1-extlibs.patch: --- NEW FILE teeworlds-0.5.1-extlibs.patch --- diff -Naur teeworlds-0.5.1-src.orig/default.bam teeworlds-0.5.1-src/default.bam --- teeworlds-0.5.1-src.orig/default.bam 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/default.bam 2009-03-09 12:48:10.000000000 +0100 @@ -7,6 +7,8 @@ config:Add(OptFindCompiler()) config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all")) config:Add(OptFindLibrary("zlib", "zlib.h", false)) +config:Add(OptFindLibrary("wavpack", "wavpack/wavpack.h", false)) +config:Add(OptFindLibrary("pnglite", "sys/types.h", false)) config:Add(SDL.OptFind("sdl", true)) config:Finalize("config.bam") @@ -151,8 +153,29 @@ end -- build the small libraries - wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) - pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) + -- compile wavpack if needed + if config.wavpack.value == 1 then + settings.link.libs:Add("wavpack") + if config.wavpack.include_path then + settings.cc.includes:Add(config.wavpack.include_path) + end + wavpack = {} + else + wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) + settings.cc.includes:Add("src/engine/external") + end + + -- compile pnglite if needed + if config.pnglite.value == 1 then + settings.link.libs:Add("pnglite") + if config.pnglite.include_path then + settings.cc.includes:Add(config.pnglite.include_path) + end + pnglite = {} + else + pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) + settings.cc.includes:Add("src/engine/external/pnglite") + end -- build game components engine_settings = settings:Copy() diff -Naur teeworlds-0.5.1-src.orig/src/engine/client/ec_gfx.c teeworlds-0.5.1-src/src/engine/client/ec_gfx.c --- teeworlds-0.5.1-src.orig/src/engine/client/ec_gfx.c 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/src/engine/client/ec_gfx.c 2009-03-09 12:48:39.000000000 +0100 @@ -18,7 +18,7 @@ #endif #include -#include +#include #include #include diff -Naur teeworlds-0.5.1-src.orig/src/engine/client/ec_snd.c teeworlds-0.5.1-src/src/engine/client/ec_snd.c --- teeworlds-0.5.1-src.orig/src/engine/client/ec_snd.c 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/src/engine/client/ec_snd.c 2009-03-09 12:55:19.000000000 +0100 @@ -6,7 +6,7 @@ #include "SDL.h" -#include +#include #include #include #include @@ -358,19 +358,12 @@ snd->num_frames = num_frames; } - -static IOHANDLE file = NULL; - -static int read_data(void *buffer, int size) -{ - return io_read(file, buffer, size); -} - int snd_load_wv(const char *filename) { SAMPLE *snd; int sid = -1; char error[100]; + char completefilename[512]; WavpackContext *context; /* don't waste memory on sound when we are stress testing */ @@ -381,19 +374,13 @@ if(!sound_enabled) return 1; - file = engine_openfile(filename, IOFLAG_READ); /* TODO: use system.h stuff for this */ - if(!file) - { - dbg_msg("sound/wv", "failed to open %s", filename); - return -1; - } - sid = snd_alloc_id(); if(sid < 0) return -1; snd = &samples[sid]; - context = WavpackOpenFileInput(read_data, error); + engine_getpath(completefilename, sizeof(completefilename), filename, IOFLAG_READ); + context = WavpackOpenFileInput(completefilename, error, 0, 0); if (context) { int samples = WavpackGetNumSamples(context); @@ -410,7 +397,7 @@ if(snd->channels > 2) { - dbg_msg("sound/wv", "file is not mono or stereo. filename='%s'", filename); + dbg_msg("sound/wv", "failed to open %s: %s", completefilename, error); return -1; } @@ -448,9 +435,6 @@ dbg_msg("sound/wv", "failed to open %s: %s", filename, error); } - io_close(file); - file = NULL; - if(config.debug) dbg_msg("sound/wv", "loaded %s", filename); diff -Naur teeworlds-0.5.1-src.orig/src/game/client/render.hpp teeworlds-0.5.1-src/src/game/client/render.hpp --- teeworlds-0.5.1-src.orig/src/game/client/render.hpp 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/src/game/client/render.hpp 2009-03-09 12:56:19.000000000 +0100 @@ -37,7 +37,7 @@ TILERENDERFLAG_EXTEND=4, }; -typedef struct SPRITE; +struct SPRITE; void select_sprite(SPRITE *spr, int flags=0, int sx=0, int sy=0); void select_sprite(int id, int flags=0, int sx=0, int sy=0); diff -Naur teeworlds-0.5.1-src.orig/src/tools/dilate.c teeworlds-0.5.1-src/src/tools/dilate.c --- teeworlds-0.5.1-src.orig/src/tools/dilate.c 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/src/tools/dilate.c 2009-03-09 12:56:50.000000000 +0100 @@ -1,6 +1,9 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include "../engine/external/pnglite/pnglite.c" +#include +#include +#include +#include typedef struct pixel_t { diff -Naur teeworlds-0.5.1-src.orig/src/tools/tileset_borderfix.c teeworlds-0.5.1-src/src/tools/tileset_borderfix.c --- teeworlds-0.5.1-src.orig/src/tools/tileset_borderfix.c 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/src/tools/tileset_borderfix.c 2009-03-09 12:57:14.000000000 +0100 @@ -1,6 +1,9 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include "../engine/external/pnglite/pnglite.c" +#include +#include +#include +#include typedef struct pixel_t { teeworlds-0.5.1-optflags.patch: --- NEW FILE teeworlds-0.5.1-optflags.patch --- diff -Naur teeworlds-0.5.1-src.orig/default.bam teeworlds-0.5.1-src/default.bam --- teeworlds-0.5.1-src.orig/default.bam 2009-01-25 14:50:33.000000000 +0100 +++ teeworlds-0.5.1-src/default.bam 2009-03-09 12:14:32.000000000 +0100 @@ -106,6 +106,9 @@ function build(settings) --settings.objdir = Path("objs") settings.cc.Output = Intermediate_Output + settings.cc.flags:Add(os.getenv ('CFLAGS')) + settings.cc.flags:Add(os.getenv ('CPPFLAGS')) + settings.cc.flags:Add(os.getenv ('LDFLAGS')) if config.compiler.value == "cl" then settings.cc.flags:Add("/wd4244") Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/teeworlds/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jan 2009 18:40:37 -0000 1.4 +++ .cvsignore 9 Mar 2009 16:05:31 -0000 1.5 @@ -1,2 +1 @@ -teeworlds-0.5.0-src.tar.gz -teeworlds.png +teeworlds-0.5.1-src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/teeworlds/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jan 2009 18:30:52 -0000 1.4 +++ sources 9 Mar 2009 16:05:31 -0000 1.5 @@ -1,2 +1 @@ -39d7b5d41c2c7250201214a4ab6844ed teeworlds-0.5.0-src.tar.gz -d541e3afa7809bd73bb64adb0795cb65 teeworlds.png +5f96e73ff4c3d552de55902da9255606 teeworlds-0.5.1-src.tar.gz Index: teeworlds.spec =================================================================== RCS file: /cvs/pkgs/rpms/teeworlds/devel/teeworlds.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- teeworlds.spec 25 Feb 2009 19:30:59 -0000 1.3 +++ teeworlds.spec 9 Mar 2009 16:05:31 -0000 1.4 @@ -1,6 +1,6 @@ Name: teeworlds -Version: 0.5.0 -Release: 2%{?dist} +Version: 0.5.1 +Release: 1%{?dist} Summary: Online multi-player platform 2D shooter Group: Amusements/Games @@ -9,9 +9,8 @@ Source0: http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz Source1: %{name}.png Source2: %{name}.desktop -Patch1: %{name}-0.5.0-extlibs.patch -Patch2: %{name}-0.5.0-optflags.patch -Patch3: %{name}-0.5.0-segv.patch +Patch1: %{name}-0.5.1-extlibs.patch +Patch2: %{name}-0.5.1-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mesa-libGLU-devel @@ -24,7 +23,7 @@ BuildRequires: pnglite-devel BuildRequires: SDL-devel Requires: %{name}-data - + %description The game features cartoon-themed graphics and physics, @@ -53,14 +52,17 @@ %setup -q -n %{name}-%{version}-src rm -rf src/engine/external -%patch1 -p1 -b .extlibs -%patch2 -p1 -b .optflags -%patch3 -p1 -b .segv +%patch1 -p1 +%patch2 -p1 iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8 touch -c -r readme.txt readme.txt.utf8 mv readme.txt.utf8 readme.txt +iconv -f iso-8859-1 -t utf-8 src/game/editor/array.hpp |sed 's|\r||g' > src/game/editor/array.hpp.utf8 +touch -c -r src/game/editor/array.hpp src/game/editor/array.hpp.utf8 +mv src/game/editor/array.hpp.utf8 src/game/editor/array.hpp + %build CFLAGS="%{optflags}" bam -v release @@ -115,6 +117,9 @@ %changelog +* Mon Mar 09 2009 Simon Wesp 0.5.1-1 +- New upstream release + * Wed Feb 25 2009 Fedora Release Engineering - 0.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- teeworlds-0.5.0-extlibs.patch DELETED --- --- teeworlds-0.5.0-optflags.patch DELETED --- --- teeworlds-0.5.0-segv.patch DELETED --- From pkgdb at fedoraproject.org Mon Mar 9 16:08:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:08:34 +0000 Subject: [pkgdb] smp_utils was added for sharkcz Message-ID: <20090309160936.1BB60208545@bastion.fedora.phx.redhat.com> kevin has added Package smp_utils with summary Utilities for SAS management protocol (SMP) kevin has approved Package smp_utils kevin has added a Fedora devel branch for smp_utils with an owner of sharkcz kevin has approved smp_utils in Fedora devel kevin has approved Package smp_utils kevin has set commit to Approved for provenpackager on smp_utils (Fedora devel) kevin has set build to Approved for provenpackager on smp_utils (Fedora devel) kevin has set checkout to Approved for provenpackager on smp_utils (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/smp_utils From pkgdb at fedoraproject.org Mon Mar 9 16:08:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:08:35 +0000 Subject: [pkgdb] smp_utils (Fedora EPEL, 4) updated by kevin Message-ID: <20090309160938.8103E20854B@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for smp_utils kevin has set commit to Approved for provenpackager on smp_utils (Fedora EPEL 4) kevin has set build to Approved for provenpackager on smp_utils (Fedora EPEL 4) kevin has set checkout to Approved for provenpackager on smp_utils (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/smp_utils From pkgdb at fedoraproject.org Mon Mar 9 16:08:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:08:35 +0000 Subject: [pkgdb] smp_utils (Fedora, 9) updated by kevin Message-ID: <20090309160938.002B4208549@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for smp_utils kevin has set commit to Approved for provenpackager on smp_utils (Fedora 9) kevin has set build to Approved for provenpackager on smp_utils (Fedora 9) kevin has set checkout to Approved for provenpackager on smp_utils (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/smp_utils From pkgdb at fedoraproject.org Mon Mar 9 16:08:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:08:35 +0000 Subject: [pkgdb] smp_utils (Fedora, 10) updated by kevin Message-ID: <20090309160939.64EE720854E@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for smp_utils kevin has set commit to Approved for provenpackager on smp_utils (Fedora 10) kevin has set build to Approved for provenpackager on smp_utils (Fedora 10) kevin has set checkout to Approved for provenpackager on smp_utils (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/smp_utils From pkgdb at fedoraproject.org Mon Mar 9 16:08:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:08:35 +0000 Subject: [pkgdb] smp_utils (Fedora EPEL, 5) updated by kevin Message-ID: <20090309160939.7310A208551@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for smp_utils kevin has set commit to Approved for provenpackager on smp_utils (Fedora EPEL 5) kevin has set build to Approved for provenpackager on smp_utils (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on smp_utils (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/smp_utils From kevin at fedoraproject.org Mon Mar 9 16:08:51 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:08:51 +0000 (UTC) Subject: rpms/smp_utils - New directory Message-ID: <20090309160851.301F070034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/smp_utils In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG17183/rpms/smp_utils Log Message: Directory /cvs/pkgs/rpms/smp_utils added to the repository From kevin at fedoraproject.org Mon Mar 9 16:08:51 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:08:51 +0000 (UTC) Subject: rpms/smp_utils/devel - New directory Message-ID: <20090309160851.74D1E7012E@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/smp_utils/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG17183/rpms/smp_utils/devel Log Message: Directory /cvs/pkgs/rpms/smp_utils/devel added to the repository From kevin at fedoraproject.org Mon Mar 9 16:09:08 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:09:08 +0000 (UTC) Subject: rpms/smp_utils Makefile,NONE,1.1 Message-ID: <20090309160908.D1B4270034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/smp_utils In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG17183/rpms/smp_utils Added Files: Makefile Log Message: Setup of module smp_utils --- NEW FILE Makefile --- # Top level Makefile for module smp_utils all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Mon Mar 9 16:09:09 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:09:09 +0000 (UTC) Subject: rpms/smp_utils/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309160909.2CCB770034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/smp_utils/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG17183/rpms/smp_utils/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module smp_utils --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: smp_utils # $Id: Makefile,v 1.1 2009/03/09 16:09:09 kevin Exp $ NAME := smp_utils SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Mon Mar 9 16:11:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:11:00 +0000 Subject: [pkgdb] rednotebook was added for fab Message-ID: <20090309161101.DA4C720854C@bastion.fedora.phx.redhat.com> kevin has added Package rednotebook with summary A desktop diary kevin has approved Package rednotebook kevin has added a Fedora devel branch for rednotebook with an owner of fab kevin has approved rednotebook in Fedora devel kevin has approved Package rednotebook kevin has set commit to Approved for provenpackager on rednotebook (Fedora devel) kevin has set build to Approved for provenpackager on rednotebook (Fedora devel) kevin has set checkout to Approved for provenpackager on rednotebook (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rednotebook From pkgdb at fedoraproject.org Mon Mar 9 16:10:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:10:45 +0000 Subject: [pkgdb] rednotebook (Fedora, 9) updated by kevin Message-ID: <20090309161105.97BD6208544@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for rednotebook kevin has set commit to Approved for provenpackager on rednotebook (Fedora 9) kevin has set build to Approved for provenpackager on rednotebook (Fedora 9) kevin has set checkout to Approved for provenpackager on rednotebook (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rednotebook From pkgdb at fedoraproject.org Mon Mar 9 16:10:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:10:45 +0000 Subject: [pkgdb] rednotebook (Fedora, 10) updated by kevin Message-ID: <20090309161105.C5555208548@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for rednotebook kevin has set commit to Approved for provenpackager on rednotebook (Fedora 10) kevin has set build to Approved for provenpackager on rednotebook (Fedora 10) kevin has set checkout to Approved for provenpackager on rednotebook (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rednotebook From kevin at fedoraproject.org Mon Mar 9 16:10:22 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:10:22 +0000 (UTC) Subject: rpms/rednotebook - New directory Message-ID: <20090309161022.2B21770034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rednotebook In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj17808/rpms/rednotebook Log Message: Directory /cvs/pkgs/rpms/rednotebook added to the repository From kevin at fedoraproject.org Mon Mar 9 16:10:22 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:10:22 +0000 (UTC) Subject: rpms/rednotebook/devel - New directory Message-ID: <20090309161022.6D98D70034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rednotebook/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj17808/rpms/rednotebook/devel Log Message: Directory /cvs/pkgs/rpms/rednotebook/devel added to the repository From kevin at fedoraproject.org Mon Mar 9 16:10:43 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:10:43 +0000 (UTC) Subject: rpms/rednotebook Makefile,NONE,1.1 Message-ID: <20090309161043.98F4870034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rednotebook In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj17808/rpms/rednotebook Added Files: Makefile Log Message: Setup of module rednotebook --- NEW FILE Makefile --- # Top level Makefile for module rednotebook all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Mon Mar 9 16:10:43 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:10:43 +0000 (UTC) Subject: rpms/rednotebook/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309161043.E3D3E70034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rednotebook/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj17808/rpms/rednotebook/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rednotebook --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: rednotebook # $Id: Makefile,v 1.1 2009/03/09 16:10:43 kevin Exp $ NAME := rednotebook SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Mon Mar 9 16:11:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:11:55 +0000 Subject: [pkgdb] tcpjunk was added for fab Message-ID: <20090309161153.1A0B0208546@bastion.fedora.phx.redhat.com> kevin has added Package tcpjunk with summary TCP protocols testing tool kevin has approved Package tcpjunk kevin has added a Fedora devel branch for tcpjunk with an owner of fab kevin has approved tcpjunk in Fedora devel kevin has approved Package tcpjunk kevin has set commit to Approved for provenpackager on tcpjunk (Fedora devel) kevin has set build to Approved for provenpackager on tcpjunk (Fedora devel) kevin has set checkout to Approved for provenpackager on tcpjunk (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tcpjunk From pkgdb at fedoraproject.org Mon Mar 9 16:10:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:10:52 +0000 Subject: [pkgdb] tcpjunk (Fedora, 9) updated by kevin Message-ID: <20090309161156.1C87920854E@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for tcpjunk kevin has set commit to Approved for provenpackager on tcpjunk (Fedora 9) kevin has set build to Approved for provenpackager on tcpjunk (Fedora 9) kevin has set checkout to Approved for provenpackager on tcpjunk (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tcpjunk From pkgdb at fedoraproject.org Mon Mar 9 16:10:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:10:52 +0000 Subject: [pkgdb] tcpjunk (Fedora, 10) updated by kevin Message-ID: <20090309161156.A8BF4208551@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for tcpjunk kevin has set commit to Approved for provenpackager on tcpjunk (Fedora 10) kevin has set build to Approved for provenpackager on tcpjunk (Fedora 10) kevin has set checkout to Approved for provenpackager on tcpjunk (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tcpjunk From kevin at fedoraproject.org Mon Mar 9 16:11:09 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:11:09 +0000 (UTC) Subject: rpms/tcpjunk/devel - New directory Message-ID: <20090309161109.7140470133@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tcpjunk/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR18125/rpms/tcpjunk/devel Log Message: Directory /cvs/pkgs/rpms/tcpjunk/devel added to the repository From kevin at fedoraproject.org Mon Mar 9 16:11:09 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:11:09 +0000 (UTC) Subject: rpms/tcpjunk - New directory Message-ID: <20090309161109.2D61F70034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tcpjunk In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR18125/rpms/tcpjunk Log Message: Directory /cvs/pkgs/rpms/tcpjunk added to the repository From kevin at fedoraproject.org Mon Mar 9 16:11:34 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:11:34 +0000 (UTC) Subject: rpms/tcpjunk Makefile,NONE,1.1 Message-ID: <20090309161134.E4F9370034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tcpjunk In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR18125/rpms/tcpjunk Added Files: Makefile Log Message: Setup of module tcpjunk --- NEW FILE Makefile --- # Top level Makefile for module tcpjunk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Mon Mar 9 16:11:35 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:11:35 +0000 (UTC) Subject: rpms/tcpjunk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309161135.3394370133@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/tcpjunk/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR18125/rpms/tcpjunk/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tcpjunk --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: tcpjunk # $Id: Makefile,v 1.1 2009/03/09 16:11:35 kevin Exp $ NAME := tcpjunk SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Mon Mar 9 16:12:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:12:28 +0000 Subject: [pkgdb] perl-Parse-BACKPAN-Packages was added for cweyl Message-ID: <20090309161248.AD308208544@bastion.fedora.phx.redhat.com> kevin has added Package perl-Parse-BACKPAN-Packages with summary Provide an index of BACKPAN kevin has approved Package perl-Parse-BACKPAN-Packages kevin has added a Fedora devel branch for perl-Parse-BACKPAN-Packages with an owner of cweyl kevin has approved perl-Parse-BACKPAN-Packages in Fedora devel kevin has approved Package perl-Parse-BACKPAN-Packages kevin has set commit to Approved for provenpackager on perl-Parse-BACKPAN-Packages (Fedora devel) kevin has set build to Approved for provenpackager on perl-Parse-BACKPAN-Packages (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-Parse-BACKPAN-Packages (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-BACKPAN-Packages From pkgdb at fedoraproject.org Mon Mar 9 16:12:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:12:53 +0000 Subject: [pkgdb] perl-Parse-BACKPAN-Packages (Fedora, 9) updated by kevin Message-ID: <20090309161253.B44BA20854A@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-Parse-BACKPAN-Packages kevin has set commit to Approved for provenpackager on perl-Parse-BACKPAN-Packages (Fedora 9) kevin has set build to Approved for provenpackager on perl-Parse-BACKPAN-Packages (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-Parse-BACKPAN-Packages (Fedora 9) kevin approved watchbugzilla on perl-Parse-BACKPAN-Packages (Fedora 9) for perl-sig kevin approved watchcommits on perl-Parse-BACKPAN-Packages (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-BACKPAN-Packages From pkgdb at fedoraproject.org Mon Mar 9 16:12:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:12:53 +0000 Subject: [pkgdb] perl-Parse-BACKPAN-Packages (Fedora, 10) updated by kevin Message-ID: <20090309161253.DF8E0208550@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Parse-BACKPAN-Packages kevin has set commit to Approved for provenpackager on perl-Parse-BACKPAN-Packages (Fedora 10) kevin has set build to Approved for provenpackager on perl-Parse-BACKPAN-Packages (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-Parse-BACKPAN-Packages (Fedora 10) kevin approved watchbugzilla on perl-Parse-BACKPAN-Packages (Fedora 10) for perl-sig kevin approved watchcommits on perl-Parse-BACKPAN-Packages (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-BACKPAN-Packages From pkgdb at fedoraproject.org Mon Mar 9 16:12:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:12:53 +0000 Subject: [pkgdb] perl-Parse-BACKPAN-Packages (Fedora, devel) updated by kevin Message-ID: <20090309161253.C9E2120854D@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-Parse-BACKPAN-Packages (Fedora devel) for perl-sig kevin approved watchcommits on perl-Parse-BACKPAN-Packages (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-BACKPAN-Packages From kevin at fedoraproject.org Mon Mar 9 16:12:08 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:12:08 +0000 (UTC) Subject: rpms/perl-Parse-BACKPAN-Packages - New directory Message-ID: <20090309161208.269FD70034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Parse-BACKPAN-Packages In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse18483/rpms/perl-Parse-BACKPAN-Packages Log Message: Directory /cvs/pkgs/rpms/perl-Parse-BACKPAN-Packages added to the repository From kevin at fedoraproject.org Mon Mar 9 16:12:08 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:12:08 +0000 (UTC) Subject: rpms/perl-Parse-BACKPAN-Packages/devel - New directory Message-ID: <20090309161208.6F83770034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Parse-BACKPAN-Packages/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse18483/rpms/perl-Parse-BACKPAN-Packages/devel Log Message: Directory /cvs/pkgs/rpms/perl-Parse-BACKPAN-Packages/devel added to the repository From kevin at fedoraproject.org Mon Mar 9 16:12:25 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:12:25 +0000 (UTC) Subject: rpms/perl-Parse-BACKPAN-Packages Makefile,NONE,1.1 Message-ID: <20090309161225.C654570034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Parse-BACKPAN-Packages In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse18483/rpms/perl-Parse-BACKPAN-Packages Added Files: Makefile Log Message: Setup of module perl-Parse-BACKPAN-Packages --- NEW FILE Makefile --- # Top level Makefile for module perl-Parse-BACKPAN-Packages all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Mon Mar 9 16:12:26 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:12:26 +0000 (UTC) Subject: rpms/perl-Parse-BACKPAN-Packages/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309161226.381AD70034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-Parse-BACKPAN-Packages/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse18483/rpms/perl-Parse-BACKPAN-Packages/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Parse-BACKPAN-Packages --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-Parse-BACKPAN-Packages # $Id: Makefile,v 1.1 2009/03/09 16:12:26 kevin Exp $ NAME := perl-Parse-BACKPAN-Packages SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Mon Mar 9 16:13:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:13:11 +0000 Subject: [pkgdb] perl-local-lib (Fedora, 9) updated by kevin Message-ID: <20090309161413.C420D208547@bastion.fedora.phx.redhat.com> kevin added a Fedora 9 branch for perl-local-lib kevin has set commit to Approved for provenpackager on perl-local-lib (Fedora 9) kevin has set build to Approved for provenpackager on perl-local-lib (Fedora 9) kevin has set checkout to Approved for provenpackager on perl-local-lib (Fedora 9) kevin approved watchbugzilla on perl-local-lib (Fedora 9) for perl-sig kevin approved watchcommits on perl-local-lib (Fedora 9) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-local-lib From pkgdb at fedoraproject.org Mon Mar 9 16:13:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:13:51 +0000 Subject: [pkgdb] perl-local-lib was added for cweyl Message-ID: <20090309161412.60D1A208544@bastion.fedora.phx.redhat.com> kevin has added Package perl-local-lib with summary Create and use a local lib/ for perl modules kevin has approved Package perl-local-lib kevin has added a Fedora devel branch for perl-local-lib with an owner of cweyl kevin has approved perl-local-lib in Fedora devel kevin has approved Package perl-local-lib kevin has set commit to Approved for provenpackager on perl-local-lib (Fedora devel) kevin has set build to Approved for provenpackager on perl-local-lib (Fedora devel) kevin has set checkout to Approved for provenpackager on perl-local-lib (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-local-lib From pkgdb at fedoraproject.org Mon Mar 9 16:13:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:13:11 +0000 Subject: [pkgdb] perl-local-lib (Fedora, devel) updated by kevin Message-ID: <20090309161413.CD2FC20854A@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on perl-local-lib (Fedora devel) for perl-sig kevin approved watchcommits on perl-local-lib (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-local-lib From pkgdb at fedoraproject.org Mon Mar 9 16:13:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:13:11 +0000 Subject: [pkgdb] perl-local-lib (Fedora, 10) updated by kevin Message-ID: <20090309161413.D9BE720854D@bastion.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-local-lib kevin has set commit to Approved for provenpackager on perl-local-lib (Fedora 10) kevin has set build to Approved for provenpackager on perl-local-lib (Fedora 10) kevin has set checkout to Approved for provenpackager on perl-local-lib (Fedora 10) kevin approved watchbugzilla on perl-local-lib (Fedora 10) for perl-sig kevin approved watchcommits on perl-local-lib (Fedora 10) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-local-lib From kevin at fedoraproject.org Mon Mar 9 16:13:26 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:13:26 +0000 (UTC) Subject: rpms/perl-local-lib/devel - New directory Message-ID: <20090309161326.75FBF70133@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-local-lib/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg18877/rpms/perl-local-lib/devel Log Message: Directory /cvs/pkgs/rpms/perl-local-lib/devel added to the repository From kevin at fedoraproject.org Mon Mar 9 16:13:26 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:13:26 +0000 (UTC) Subject: rpms/perl-local-lib - New directory Message-ID: <20090309161326.34DE270034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-local-lib In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg18877/rpms/perl-local-lib Log Message: Directory /cvs/pkgs/rpms/perl-local-lib added to the repository From kevin at fedoraproject.org Mon Mar 9 16:13:46 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:13:46 +0000 (UTC) Subject: rpms/perl-local-lib Makefile,NONE,1.1 Message-ID: <20090309161346.DAC1470034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-local-lib In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg18877/rpms/perl-local-lib Added Files: Makefile Log Message: Setup of module perl-local-lib --- NEW FILE Makefile --- # Top level Makefile for module perl-local-lib all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Mon Mar 9 16:13:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Mon, 9 Mar 2009 16:13:47 +0000 (UTC) Subject: rpms/perl-local-lib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309161347.4555370034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/perl-local-lib/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg18877/rpms/perl-local-lib/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-local-lib --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-local-lib # $Id: Makefile,v 1.1 2009/03/09 16:13:47 kevin Exp $ NAME := perl-local-lib SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Mon Mar 9 16:14:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:14:51 +0000 Subject: [pkgdb] boinc-client (Fedora EPEL, 5) updated by kevin Message-ID: <20090309161452.10E5D20854B@bastion.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for boinc-client kevin has set commit to Approved for provenpackager on boinc-client (Fedora EPEL 5) kevin has set build to Approved for provenpackager on boinc-client (Fedora EPEL 5) kevin has set checkout to Approved for provenpackager on boinc-client (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/boinc-client From tmraz at fedoraproject.org Mon Mar 9 16:15:00 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Mon, 9 Mar 2009 16:15:00 +0000 (UTC) Subject: rpms/pam/devel Linux-PAM-1.0.91.tar.bz2.sign, NONE, 1.1 pam.spec, 1.188, 1.189 Linux-PAM-1.0.90.tar.bz2.sign, 1.1, NONE pam-1.0.90-access-no-resolve.patch, 1.1, NONE pam-1.0.90-mkhomedir-helper.patch, 1.1, NONE pam-1.0.90-strtok-unsigned.patch, 1.1, NONE pam-1.0.90-unix-mindays.patch, 1.1, NONE Message-ID: <20090309161500.A194170034@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/pam/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19433 Modified Files: pam.spec Added Files: Linux-PAM-1.0.91.tar.bz2.sign Removed Files: Linux-PAM-1.0.90.tar.bz2.sign pam-1.0.90-access-no-resolve.patch pam-1.0.90-mkhomedir-helper.patch pam-1.0.90-strtok-unsigned.patch pam-1.0.90-unix-mindays.patch Log Message: * Mon Mar 9 2009 Tomas Mraz 1.0.91-1 - upgrade to new upstream release --- NEW FILE Linux-PAM-1.0.91.tar.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBJtReGyGugalF9Dw4RAoSBAJkB8GXcG7sriiwqGQZnnhXH0zDU4QCfZf54 LvlqV/O0XyZBhBRfSl/QW/o= =AocX -----END PGP SIGNATURE----- Index: pam.spec =================================================================== RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- pam.spec 27 Feb 2009 12:52:52 -0000 1.188 +++ pam.spec 9 Mar 2009 16:14:30 -0000 1.189 @@ -2,8 +2,8 @@ Summary: An extensible library which provides authentication for applications Name: pam -Version: 1.0.90 -Release: 4%{?dist} +Version: 1.0.91 +Release: 1%{?dist} # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+, # pam_rhosts_auth module is BSD with advertising @@ -20,10 +20,6 @@ Source10: config-util.5 Source11: 90-nproc.conf Patch1: pam-1.0.90-redhat-modules.patch -Patch2: pam-1.0.90-mkhomedir-helper.patch -Patch3: pam-1.0.90-unix-mindays.patch -Patch4: pam-1.0.90-access-no-resolve.patch -Patch5: pam-1.0.90-strtok-unsigned.patch %define _sbindir /sbin %define _moduledir /%{_lib}/security @@ -86,10 +82,6 @@ mv pam-redhat-%{pam_redhat_version}/* modules %patch1 -p1 -b .redhat-modules -%patch2 -p1 -b .mkhomedir-helper -%patch3 -p0 -b .mindays -%patch4 -p0 -b .no-resolve -%patch5 -p0 -b .strtok-unsigned autoreconf @@ -322,6 +314,9 @@ %doc doc/adg/*.txt doc/adg/html %changelog +* Mon Mar 9 2009 Tomas Mraz 1.0.91-1 +- upgrade to new upstream release + * Fri Feb 27 2009 Tomas Mraz 1.0.90-4 - fix parsing of config files containing non-ASCII characters - fix CVE-2009-0579 (mininimum days for password change ignored) (#487216) --- Linux-PAM-1.0.90.tar.bz2.sign DELETED --- --- pam-1.0.90-access-no-resolve.patch DELETED --- --- pam-1.0.90-mkhomedir-helper.patch DELETED --- --- pam-1.0.90-strtok-unsigned.patch DELETED --- --- pam-1.0.90-unix-mindays.patch DELETED --- From dwalsh at fedoraproject.org Mon Mar 9 16:19:23 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 9 Mar 2009 16:19:23 +0000 (UTC) Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.16, 1.17 modules-mls.conf, 1.50, 1.51 modules-targeted.conf, 1.118, 1.119 policy-20090105.patch, 1.55, 1.56 selinux-policy.spec, 1.801, 1.802 Message-ID: <20090309161923.157D770034@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20575 Modified Files: modules-minimum.conf modules-mls.conf modules-targeted.conf policy-20090105.patch selinux-policy.spec Log Message: * Sat Mar 7 2009 Dan Walsh 3.6.8-2 - Add pulseaudio context Index: modules-minimum.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- modules-minimum.conf 6 Mar 2009 21:11:04 -0000 1.16 +++ modules-minimum.conf 9 Mar 2009 16:18:51 -0000 1.17 @@ -1015,6 +1015,13 @@ # publicfile = module +# Layer: apps +# Module: pulseaudio +# +# The PulseAudio Sound System +# +pulseaudio = module + # Layer: services # Module: pyzor # Index: modules-mls.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- modules-mls.conf 6 Mar 2009 21:11:04 -0000 1.50 +++ modules-mls.conf 9 Mar 2009 16:18:51 -0000 1.51 @@ -1008,6 +1008,13 @@ # publicfile = module +# Layer: apps +# Module: pulseaudio +# +# The PulseAudio Sound System +# +pulseaudio = module + # Layer: services # Module: pyzor # Index: modules-targeted.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- modules-targeted.conf 6 Mar 2009 21:11:04 -0000 1.118 +++ modules-targeted.conf 9 Mar 2009 16:18:51 -0000 1.119 @@ -1015,6 +1015,13 @@ # publicfile = module +# Layer: apps +# Module: pulseaudio +# +# The PulseAudio Sound System +# +pulseaudio = module + # Layer: services # Module: pyzor # policy-20090105.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.55 -r 1.56 policy-20090105.patch Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- policy-20090105.patch 6 Mar 2009 21:11:04 -0000 1.55 +++ policy-20090105.patch 9 Mar 2009 16:18:51 -0000 1.56 @@ -1,6 +1,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.8/config/appconfig-mcs/default_contexts --- nsaserefpolicy/config/appconfig-mcs/default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/default_contexts 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/default_contexts 2009-03-07 12:11:40.000000000 -0500 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -24,13 +24,13 @@ +system_r:xdm_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.8/config/appconfig-mcs/failsafe_context --- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.8/config/appconfig-mcs/failsafe_context 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/failsafe_context 2009-03-07 12:11:40.000000000 -0500 @@ -1 +1 @@ -sysadm_r:sysadm_t:s0 +system_r:unconfined_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/guest_u_default_contexts 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/guest_u_default_contexts 2009-03-07 12:11:40.000000000 -0500 @@ -0,0 +1,6 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -40,7 +40,7 @@ +guest_r:guest_t:s0 guest_r:guest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/root_default_contexts --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/root_default_contexts 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/root_default_contexts 2009-03-07 12:11:40.000000000 -0500 @@ -1,11 +1,7 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0 +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -57,7 +57,7 @@ +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.8/config/appconfig-mcs/seusers --- nsaserefpolicy/config/appconfig-mcs/seusers 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.8/config/appconfig-mcs/seusers 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/seusers 2009-03-07 12:11:40.000000000 -0500 @@ -1,3 +1,3 @@ system_u:system_u:s0-mcs_systemhigh -root:root:s0-mcs_systemhigh @@ -66,7 +66,7 @@ +__default__:unconfined_u:s0-mcs_systemhigh diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/staff_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/staff_u_default_contexts 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/staff_u_default_contexts 2009-03-07 12:11:40.000000000 -0500 @@ -1,10 +1,12 @@ system_r:local_login_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 system_r:remote_login_t:s0 staff_r:staff_t:s0 @@ -83,7 +83,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/unconfined_u_default_contexts 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/unconfined_u_default_contexts 2009-03-07 12:11:40.000000000 -0500 @@ -1,4 +1,4 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0 +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 @@ -99,13 +99,13 @@ system_r:xdm_t:s0 unconfined_r:unconfined_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.8/config/appconfig-mcs/userhelper_context --- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.8/config/appconfig-mcs/userhelper_context 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/userhelper_context 2009-03-07 12:11:40.000000000 -0500 @@ -1 +1 @@ -system_u:sysadm_r:sysadm_t:s0 +system_u:system_r:unconfined_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/user_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/user_u_default_contexts 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/user_u_default_contexts 2009-03-07 12:11:40.000000000 -0500 @@ -1,8 +1,9 @@ system_r:local_login_t:s0 user_r:user_t:s0 system_r:remote_login_t:s0 user_r:user_t:s0 @@ -120,17 +120,17 @@ +user_r:user_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.8/config/appconfig-mcs/virtual_domain_context --- nsaserefpolicy/config/appconfig-mcs/virtual_domain_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/virtual_domain_context 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/virtual_domain_context 2009-03-07 12:11:40.000000000 -0500 @@ -0,0 +1 @@ +system_u:system_r:svirt_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.8/config/appconfig-mcs/virtual_image_context --- nsaserefpolicy/config/appconfig-mcs/virtual_image_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/virtual_image_context 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/virtual_image_context 2009-03-07 12:11:40.000000000 -0500 @@ -0,0 +1 @@ +system_u:object_r:virt_image_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/xguest_u_default_contexts 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/xguest_u_default_contexts 2009-03-07 12:11:40.000000000 -0500 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -141,7 +141,7 @@ +xguest_r:xguest_t:s0 xguest_r:xguest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.8/config/appconfig-mls/default_contexts --- nsaserefpolicy/config/appconfig-mls/default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/default_contexts 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/default_contexts 2009-03-07 12:11:40.000000000 -0500 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -165,7 +165,7 @@ +system_r:xdm_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/guest_u_default_contexts 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/guest_u_default_contexts 2009-03-07 12:11:40.000000000 -0500 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -173,7 +173,7 @@ +system_r:crond_t:s0 guest_r:guest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.8/config/appconfig-mls/root_default_contexts --- nsaserefpolicy/config/appconfig-mls/root_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/root_default_contexts 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/root_default_contexts 2009-03-07 12:11:40.000000000 -0500 @@ -1,11 +1,11 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0 -system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -194,17 +194,17 @@ +#system_r:sshd_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.8/config/appconfig-mls/virtual_domain_context --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/virtual_domain_context 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/virtual_domain_context 2009-03-07 12:11:40.000000000 -0500 @@ -0,0 +1 @@ +system_u:system_r:qemu_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.8/config/appconfig-mls/virtual_image_context --- nsaserefpolicy/config/appconfig-mls/virtual_image_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/virtual_image_context 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/virtual_image_context 2009-03-07 12:11:40.000000000 -0500 @@ -0,0 +1 @@ +system_u:object_r:virt_image_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mls/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/xguest_u_default_contexts 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/xguest_u_default_contexts 2009-03-07 12:11:40.000000000 -0500 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -215,7 +215,7 @@ +xguest_r:xguest_t:s0 xguest_r:xguest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.8/Makefile --- nsaserefpolicy/Makefile 2009-01-19 11:07:35.000000000 -0500 -+++ serefpolicy-3.6.8/Makefile 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/Makefile 2009-03-07 12:11:40.000000000 -0500 @@ -241,7 +241,7 @@ appdir := $(contextpath) user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts) @@ -280,7 +280,7 @@ $(verbose) $(INSTALL) -m 644 $< $@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.8/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2009-03-05 10:02:34.000000000 -0500 -+++ serefpolicy-3.6.8/policy/flask/access_vectors 2009-03-05 15:26:58.000000000 -0500 ++++ serefpolicy-3.6.8/policy/flask/access_vectors 2009-03-07 12:11:40.000000000 -0500 @@ -157,6 +157,9 @@ class sock_file @@ -293,7 +293,7 @@ inherits file diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.8/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/policy/global_tunables 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/global_tunables 2009-03-07 12:11:40.000000000 -0500 @@ -61,15 +61,6 @@ ## @@ -325,7 +325,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.8/policy/mcs --- nsaserefpolicy/policy/mcs 2009-02-03 22:50:50.000000000 -0500 -+++ serefpolicy-3.6.8/policy/mcs 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/mcs 2009-03-07 12:11:40.000000000 -0500 @@ -67,7 +67,8 @@ # Note that getattr on files is always permitted. # @@ -365,7 +365,7 @@ (( h1 dom h2 ) or ( t1 == mcssetcats )); diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.6.8/policy/modules/admin/alsa.te --- nsaserefpolicy/policy/modules/admin/alsa.te 2009-01-05 15:39:44.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/admin/alsa.te 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/admin/alsa.te 2009-03-07 12:11:40.000000000 -0500 @@ -43,6 +43,7 @@ dev_read_sound(alsa_t) @@ -376,7 +376,7 @@ [...3426 lines suppressed...] -@@ -1435,9 +1500,11 @@ +@@ -1435,9 +1504,11 @@ interface(`userdom_dontaudit_list_user_home_dirs',` gen_require(` type user_home_dir_t; @@ -28901,7 +29106,7 @@ ') ######################################## -@@ -1494,6 +1561,25 @@ +@@ -1494,6 +1565,25 @@ allow $1 user_home_dir_t:dir relabelto; ') @@ -28927,7 +29132,7 @@ ######################################## ##

    ## Create directories in the home dir root with -@@ -1568,6 +1654,8 @@ +@@ -1568,6 +1658,8 @@ ') dontaudit $1 user_home_t:dir search_dir_perms; @@ -28936,7 +29141,7 @@ ') ######################################## -@@ -1643,6 +1731,7 @@ +@@ -1643,6 +1735,7 @@ type user_home_dir_t, user_home_t; ') @@ -28944,7 +29149,7 @@ read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t) files_search_home($1) ') -@@ -1741,6 +1830,62 @@ +@@ -1741,6 +1834,62 @@ ######################################## ## @@ -29007,7 +29212,7 @@ ## Execute user home files. ## ## -@@ -1757,14 +1902,6 @@ +@@ -1757,14 +1906,6 @@ files_search_home($1) exec_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t) @@ -29022,7 +29227,7 @@ ') ######################################## -@@ -1787,6 +1924,46 @@ +@@ -1787,6 +1928,46 @@ ######################################## ## @@ -29069,7 +29274,7 @@ ## Create, read, write, and delete files ## in a user home subdirectory. ## -@@ -1799,6 +1976,7 @@ +@@ -1799,6 +1980,7 @@ interface(`userdom_manage_user_home_content_files',` gen_require(` type user_home_dir_t, user_home_t; @@ -29077,7 +29282,7 @@ ') manage_files_pattern($1, user_home_t, user_home_t) -@@ -2328,7 +2506,7 @@ +@@ -2328,7 +2510,7 @@ ######################################## ## @@ -29086,7 +29291,7 @@ ## ## ## -@@ -2814,7 +2992,25 @@ +@@ -2814,7 +2996,25 @@ type user_tmp_t; ') @@ -29113,7 +29318,7 @@ ') ######################################## -@@ -2851,6 +3047,7 @@ +@@ -2851,6 +3051,7 @@ ') read_files_pattern($1,userdomain,userdomain) @@ -29121,7 +29326,7 @@ kernel_search_proc($1) ') -@@ -2981,3 +3178,462 @@ +@@ -2981,3 +3182,462 @@ allow $1 userdomain:dbus send_msg; ') @@ -29586,7 +29791,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.8/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/userdomain.te 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/userdomain.te 2009-03-07 12:11:40.000000000 -0500 @@ -8,13 +8,6 @@ ## @@ -29672,12 +29877,12 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.8/policy/modules/system/virtual.fc --- nsaserefpolicy/policy/modules/system/virtual.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/virtual.fc 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/virtual.fc 2009-03-07 12:11:40.000000000 -0500 @@ -0,0 +1 @@ +# No application file contexts. diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.8/policy/modules/system/virtual.if --- nsaserefpolicy/policy/modules/system/virtual.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/virtual.if 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/virtual.if 2009-03-07 12:11:40.000000000 -0500 @@ -0,0 +1,99 @@ +## Virtual machine emulator and virtualizer + @@ -29780,7 +29985,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.8/policy/modules/system/virtual.te --- nsaserefpolicy/policy/modules/system/virtual.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/virtual.te 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/virtual.te 2009-03-07 12:11:40.000000000 -0500 @@ -0,0 +1,78 @@ + +policy_module(virtualization, 1.1.2) @@ -29862,7 +30067,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.8/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/xen.fc 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/xen.fc 2009-03-07 12:11:40.000000000 -0500 @@ -2,17 +2,10 @@ /usr/bin/virsh -- gen_context(system_u:object_r:xm_exec_t,s0) @@ -29891,7 +30096,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.8/policy/modules/system/xen.if --- nsaserefpolicy/policy/modules/system/xen.if 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/xen.if 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/xen.if 2009-03-07 12:11:40.000000000 -0500 @@ -167,11 +167,14 @@ # interface(`xen_stream_connect',` @@ -29935,7 +30140,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.8/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/xen.te 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/xen.te 2009-03-07 12:11:40.000000000 -0500 @@ -6,6 +6,13 @@ # Declarations # @@ -30159,7 +30364,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.8/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-10-16 17:21:16.000000000 -0400 -+++ serefpolicy-3.6.8/policy/support/obj_perm_sets.spt 2009-03-05 15:27:08.000000000 -0500 ++++ serefpolicy-3.6.8/policy/support/obj_perm_sets.spt 2009-03-07 12:11:40.000000000 -0500 @@ -179,20 +179,20 @@ # # Directory (dir) @@ -30234,7 +30439,7 @@ +define(`manage_key_perms', `{ create link read search setattr view write } ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.8/policy/users --- nsaserefpolicy/policy/users 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.6.8/policy/users 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/policy/users 2009-03-07 12:11:40.000000000 -0500 @@ -25,11 +25,8 @@ # permit any access to such users, then remove this entry. # @@ -30261,7 +30466,7 @@ +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.8/Rules.modular --- nsaserefpolicy/Rules.modular 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/Rules.modular 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/Rules.modular 2009-03-07 12:11:40.000000000 -0500 @@ -73,8 +73,8 @@ $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te @echo "Compliling $(NAME) $(@F) module" @@ -30293,7 +30498,7 @@ $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.8/support/Makefile.devel --- nsaserefpolicy/support/Makefile.devel 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/support/Makefile.devel 2009-03-05 15:25:24.000000000 -0500 ++++ serefpolicy-3.6.8/support/Makefile.devel 2009-03-07 12:11:40.000000000 -0500 @@ -185,8 +185,7 @@ tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te @$(EINFO) "Compiling $(NAME) $(basename $(@F)) module" Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.801 retrieving revision 1.802 diff -u -r1.801 -r1.802 --- selinux-policy.spec 5 Mar 2009 21:05:47 -0000 1.801 +++ selinux-policy.spec 9 Mar 2009 16:18:51 -0000 1.802 @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.6.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -44,7 +44,7 @@ Source18: setrans-minimum.conf Source19: securetty_types-minimum -Url: http://serefpolicy.sourceforge.net +Url: http://oss.tresys.com/repos/refpolicy/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python gawk checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils-python >= %{POLICYCOREUTILSVER} bzip2 @@ -447,6 +447,9 @@ %endif %changelog +* Sat Mar 7 2009 Dan Walsh 3.6.8-2 +- Add pulseaudio context + * Thu Mar 4 2009 Dan Walsh 3.6.8-1 - Upgrade to latest patches From tbzatek at fedoraproject.org Mon Mar 9 16:24:32 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 9 Mar 2009 16:24:32 +0000 (UTC) Subject: rpms/gvfs/devel gvfs-1.1.7-gdu-computer-expose-devices.patch, NONE, 1.1 gvfs.spec, 1.112, 1.113 Message-ID: <20090309162432.BB69970034@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22410 Modified Files: gvfs.spec Added Files: gvfs-1.1.7-gdu-computer-expose-devices.patch Log Message: * Mon Mar 9 2009 Tomas Bzatek - 1.1.7-5 - Expose device file attribute for all items in computer:// gvfs-1.1.7-gdu-computer-expose-devices.patch: --- NEW FILE gvfs-1.1.7-gdu-computer-expose-devices.patch --- diff -up gvfs-1.1.7/daemon/gvfsbackendcomputer.c.orig gvfs-1.1.7/daemon/gvfsbackendcomputer.c --- gvfs-1.1.7/daemon/gvfsbackendcomputer.c.orig 2009-02-10 13:56:11.000000000 +0100 +++ gvfs-1.1.7/daemon/gvfsbackendcomputer.c 2009-03-09 16:07:22.000000000 +0100 @@ -595,11 +595,16 @@ try_open_for_read (GVfsBackend *backend, return TRUE; } +/* TODO: push upstream */ +#define G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE_FILE "mountable::unix-device-file" + + static void file_info_from_file (ComputerFile *file, GFileInfo *info) { char *uri; + char *device_file = NULL; g_file_info_set_name (info, file->filename); g_file_info_set_display_name (info, file->display_name); @@ -627,6 +632,18 @@ file_info_from_file (ComputerFile *file, g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, FALSE); g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE, FALSE); g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH, FALSE); + + if (file->volume) + /* Take volume as a precedence */ + device_file = g_volume_get_identifier (file->volume, "unix-device"); + else + if (file->drive) + device_file = g_drive_get_identifier (file->drive, "unix-device"); + if (device_file) + { + g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE_FILE, device_file); + g_free (device_file); + } } static gboolean Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- gvfs.spec 6 Mar 2009 13:56:35 -0000 1.112 +++ gvfs.spec 9 Mar 2009 16:24:02 -0000 1.113 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.1.7 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -37,6 +37,9 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=573826 Patch3: gvfs-1.1.7-gdu-monitor-empty-drives.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=573826 +Patch4: gvfs-1.1.7-gdu-computer-expose-devices.patch + %description The gvfs package provides backend implementations for the gio @@ -121,6 +124,7 @@ %patch1 -p0 -b .archive-integration %patch2 -p0 -b .gdu %patch3 -p1 -b .gdu-volumes-typo +%patch4 -p1 -b .computer-gdu %build @@ -264,6 +268,9 @@ %changelog +* Mon Mar 9 2009 Tomas Bzatek - 1.1.7-5 +- Expose device file attribute for all items in computer:// + * Fri Mar 6 2009 Tomas Bzatek - 1.1.7-4 - Fix volume lists not filled correctly From rjones at fedoraproject.org Mon Mar 9 16:28:42 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 9 Mar 2009 16:28:42 +0000 (UTC) Subject: rpms/auto-buildrequires/devel .cvsignore, 1.2, 1.3 auto-buildrequires.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090309162842.D667E70034@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/auto-buildrequires/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23589 Modified Files: .cvsignore auto-buildrequires.spec sources Log Message: * Mon Mar 9 2009 Richard W.M. Jones - 1.0-3 - New upstream version 1.0: . Fixes 32-bit platforms. . Add a missing runtime requires for a Perl library. - High release number is so that we are larger than the release number in the upstream specfile. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/auto-buildrequires/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Mar 2009 18:04:04 -0000 1.2 +++ .cvsignore 9 Mar 2009 16:28:12 -0000 1.3 @@ -1 +1 @@ -auto-buildrequires-0.9.tar.gz +auto-buildrequires-1.0.tar.gz Index: auto-buildrequires.spec =================================================================== RCS file: /cvs/pkgs/rpms/auto-buildrequires/devel/auto-buildrequires.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- auto-buildrequires.spec 7 Mar 2009 18:04:04 -0000 1.1 +++ auto-buildrequires.spec 9 Mar 2009 16:28:12 -0000 1.2 @@ -1,13 +1,15 @@ Summary: Work out BuildRequires for rpmbuild automatically Name: auto-buildrequires -Version: 0.9 -Release: 2%{?dist} +Version: 1.0 +Release: 3%{?dist} License: GPLv2+ Group: Development/Tools URL: http://et.redhat.com/~rjones/auto-buildrequires/ Source0: http://et.redhat.com/~rjones/auto-buildrequires/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + Requires: rpm-build +Requires: perl-String-ShellQuote %description Auto-BuildRequires is a simple set of scripts for automatically suggesting @@ -42,6 +44,13 @@ %changelog +* Mon Mar 9 2009 Richard W.M. Jones - 1.0-3 +- New upstream version 1.0: + . Fixes 32-bit platforms. + . Add a missing runtime requires for a Perl library. +- High release number is so that we are larger than the release number + in the upstream specfile. + * Fri Mar 6 2009 Orcan Ogetbil - 0.9-2 - Prepared the SPEC file for Review Request submission Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/auto-buildrequires/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Mar 2009 18:04:04 -0000 1.2 +++ sources 9 Mar 2009 16:28:12 -0000 1.3 @@ -1 +1 @@ -7e6bb91919165439bf347f7c23c4cad4 auto-buildrequires-0.9.tar.gz +dc9b0e1ad93658fc0e0174bf7318dee5 auto-buildrequires-1.0.tar.gz From rstrode at fedoraproject.org Mon Mar 9 16:35:18 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Mon, 9 Mar 2009 16:35:18 +0000 (UTC) Subject: rpms/plymouth/devel plymouth.spec, 1.122, 1.123 sources, 1.50, 1.51 plymouth-0.7.0-fix-set-default.patch, 1.1, NONE Message-ID: <20090309163518.B32837012E@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/plymouth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26666 Modified Files: plymouth.spec sources Removed Files: plymouth-0.7.0-fix-set-default.patch Log Message: - Attempt to address some problems with password handling in the 0.7.0 snapshots Index: plymouth.spec =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- plymouth.spec 6 Mar 2009 23:08:10 -0000 1.122 +++ plymouth.spec 9 Mar 2009 16:34:48 -0000 1.123 @@ -5,7 +5,7 @@ Summary: Graphical Boot Animation and Logger Name: plymouth Version: 0.7.0 -Release: 0.2009.03.06.2%{?dist} +Release: 0.2009.03.09.1%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -19,7 +19,6 @@ Requires: initscripts >= 8.83-1 Obsoletes: plymouth-text-and-details-only < %{version}-%{release} -Patch0: plymouth-0.7.0-fix-set-default.patch %description Plymouth provides an attractive graphical boot animation in @@ -150,7 +149,6 @@ %prep %setup -q -%patch0 -p1 -b .fix-set-default %build %configure --enable-tracing --disable-tests --without-boot-entry \ @@ -321,6 +319,10 @@ %defattr(-, root, root) %changelog +* Mon Mar 9 2009 Ray Strode 0.7.0-0.2009.03.09.1 +- Attempt to address some problems with password handling in the + 0.7.0 snapshots + * Fri Mar 6 2009 Ray Strode 0.7.0-0.2009.03.06.2 - Fix set default script Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 6 Mar 2009 22:35:01 -0000 1.50 +++ sources 9 Mar 2009 16:34:48 -0000 1.51 @@ -1 +1 @@ -8e0a1cd4e4cf8ada175c763ed23e5a92 plymouth-0.7.0.tar.bz2 +825a8b5c66b1b6e48c638abfe2a38f36 plymouth-0.7.0.tar.bz2 --- plymouth-0.7.0-fix-set-default.patch DELETED --- From caolanm at fedoraproject.org Mon Mar 9 16:38:42 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Mon, 9 Mar 2009 16:38:42 +0000 (UTC) Subject: rpms/openoffice.org/F-10 openoffice.org.spec,1.1722,1.1723 Message-ID: <20090309163842.A178B70034@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28927 Modified Files: openoffice.org.spec Log Message: lets push out and update to fix what's known Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v retrieving revision 1.1722 retrieving revision 1.1723 diff -u -r1.1722 -r1.1723 --- openoffice.org.spec 23 Feb 2009 15:23:13 -0000 1.1722 +++ openoffice.org.spec 9 Mar 2009 16:38:11 -0000 1.1723 @@ -3778,7 +3778,7 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog -* Mon Feb 23 2009 Caol??n McNamara - 1:3.0.1-15.3 +* Mon Mar 09 2009 Caol??n McNamara - 1:3.0.1-15.3 - Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch - Resolves: rhbz#483931 openoffice.org-3.0.1.ooo98885.sw.safeindex.patch - Resolves: rhbz#484604 crash in glyph substitution From pkgdb at fedoraproject.org Mon Mar 9 16:42:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:42:11 +0000 Subject: [pkgdb] sssd (Fedora, devel) updated by toshio Message-ID: <20090309164208.7B311208546@bastion.fedora.phx.redhat.com> toshio approved watchbugzilla on sssd (Fedora devel) for jhrozek toshio approved watchcommits on sssd (Fedora devel) for jhrozek toshio approved watchbugzilla on sssd (Fedora devel) for sbose toshio approved watchcommits on sssd (Fedora devel) for sbose To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sssd From pkgdb at fedoraproject.org Mon Mar 9 16:42:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:42:05 +0000 Subject: [pkgdb] sssd was added for simo Message-ID: <20090309164205.DE9052084CF@bastion.fedora.phx.redhat.com> toshio has added Package sssd with summary System Security Services Daemon toshio has approved Package sssd toshio has added a Fedora devel branch for sssd with an owner of simo toshio has approved sssd in Fedora devel toshio has approved Package sssd toshio has set commit to Approved for provenpackager on sssd (Fedora devel) toshio has set build to Approved for provenpackager on sssd (Fedora devel) toshio has set checkout to Approved for provenpackager on sssd (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sssd From toshio at fedoraproject.org Mon Mar 9 16:41:41 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Mon, 9 Mar 2009 16:41:41 +0000 (UTC) Subject: rpms/sssd/devel - New directory Message-ID: <20090309164141.693B870133@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/sssd/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsa30155/rpms/sssd/devel Log Message: Directory /cvs/pkgs/rpms/sssd/devel added to the repository From toshio at fedoraproject.org Mon Mar 9 16:41:41 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Mon, 9 Mar 2009 16:41:41 +0000 (UTC) Subject: rpms/sssd - New directory Message-ID: <20090309164141.2AD2C70034@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/sssd In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsa30155/rpms/sssd Log Message: Directory /cvs/pkgs/rpms/sssd added to the repository From toshio at fedoraproject.org Mon Mar 9 16:42:03 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Mon, 9 Mar 2009 16:42:03 +0000 (UTC) Subject: rpms/sssd Makefile,NONE,1.1 Message-ID: <20090309164203.3750570034@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/sssd In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsa30155/rpms/sssd Added Files: Makefile Log Message: Setup of module sssd --- NEW FILE Makefile --- # Top level Makefile for module sssd all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From toshio at fedoraproject.org Mon Mar 9 16:42:03 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Mon, 9 Mar 2009 16:42:03 +0000 (UTC) Subject: rpms/sssd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090309164203.99E7B70034@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/sssd/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsa30155/rpms/sssd/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module sssd --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: sssd # $Id: Makefile,v 1.1 2009/03/09 16:42:03 toshio Exp $ NAME := sssd SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Mon Mar 9 16:44:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:44:04 +0000 Subject: [pkgdb] openoffice.org had acl change status Message-ID: <20090309164424.DB8B72082B2@bastion.fedora.phx.redhat.com> caolanm has set the watchbugzilla acl on openoffice.org (Fedora devel) to Obsolete for jnavrati To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org From pkgdb at fedoraproject.org Mon Mar 9 16:43:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:43:34 +0000 Subject: [pkgdb] openoffice.org had acl change status Message-ID: <20090309164436.ADB3720820B@bastion.fedora.phx.redhat.com> caolanm has set the watchcommits acl on openoffice.org (Fedora devel) to Obsolete for jnavrati To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org From pkgdb at fedoraproject.org Mon Mar 9 16:44:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:44:39 +0000 Subject: [pkgdb] openoffice.org had acl change status Message-ID: <20090309164439.D10B4208546@bastion.fedora.phx.redhat.com> caolanm has set the commit acl on openoffice.org (Fedora devel) to Obsolete for jnavrati To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org From pkgdb at fedoraproject.org Mon Mar 9 16:45:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:45:17 +0000 Subject: [pkgdb] openoffice.org had acl change status Message-ID: <20090309164514.E70CE208545@bastion.fedora.phx.redhat.com> caolanm has set the watchbugzilla acl on openoffice.org (Fedora 7) to Obsolete for jnavrati To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org From pkgdb at fedoraproject.org Mon Mar 9 16:44:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:44:56 +0000 Subject: [pkgdb] openoffice.org had acl change status Message-ID: <20090309164516.ACD65208548@bastion.fedora.phx.redhat.com> caolanm has set the watchcommits acl on openoffice.org (Fedora 7) to Obsolete for jnavrati To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org From pkgdb at fedoraproject.org Mon Mar 9 16:44:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:44:16 +0000 Subject: [pkgdb] openoffice.org had acl change status Message-ID: <20090309164519.73A2720820B@bastion.fedora.phx.redhat.com> caolanm has set the commit acl on openoffice.org (Fedora 7) to Obsolete for jnavrati To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org From pkgdb at fedoraproject.org Mon Mar 9 16:45:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:45:24 +0000 Subject: [pkgdb] openoffice.org had acl change status Message-ID: <20090309164524.4D3CB20854D@bastion.fedora.phx.redhat.com> caolanm has set the watchbugzilla acl on openoffice.org (Fedora 8) to Obsolete for jnavrati To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org From pkgdb at fedoraproject.org Mon Mar 9 16:45:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:45:29 +0000 Subject: [pkgdb] openoffice.org had acl change status Message-ID: <20090309164527.0025320854F@bastion.fedora.phx.redhat.com> caolanm has set the watchcommits acl on openoffice.org (Fedora 8) to Obsolete for jnavrati To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org From pkgdb at fedoraproject.org Mon Mar 9 16:45:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:45:08 +0000 Subject: [pkgdb] openoffice.org had acl change status Message-ID: <20090309164529.4EEC1208550@bastion.fedora.phx.redhat.com> caolanm has set the commit acl on openoffice.org (Fedora 8) to Obsolete for jnavrati To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org From kwizart at fedoraproject.org Mon Mar 9 16:44:36 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 9 Mar 2009 16:44:36 +0000 (UTC) Subject: rpms/cinepaint/devel cinepaint-0.22-gcc44.patch, NONE, 1.1 icc_examin-0.46-default.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 cinepaint.spec, 1.14, 1.15 sources, 1.3, 1.4 cinepaint-0.22-0-icc_helfer_fltk.patch, 1.1, NONE icc_examin-0.44-gcc43.patch, 1.1, NONE Message-ID: <20090309164436.315AF70034@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/cinepaint/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30578/devel Modified Files: .cvsignore cinepaint.spec sources Added Files: cinepaint-0.22-gcc44.patch icc_examin-0.46-default.patch import.log Removed Files: cinepaint-0.22-0-icc_helfer_fltk.patch icc_examin-0.44-gcc43.patch Log Message: - Fix for gcc44 - backport oyranos 0.1.9 support - Switch from freefont to dejavu-sans-fonts for icc_examin internal plug-in cinepaint-0.22-gcc44.patch: --- NEW FILE cinepaint-0.22-gcc44.patch --- diff -up cinepaint-0.22-1/plug-ins/collect/collect.cpp.gcc44 cinepaint-0.22-1/plug-ins/collect/collect.cpp --- cinepaint-0.22-1/plug-ins/collect/collect.cpp.gcc44 2009-03-09 14:47:35.000000000 +0100 +++ cinepaint-0.22-1/plug-ins/collect/collect.cpp 2009-03-09 15:17:01.000000000 +0100 @@ -301,7 +301,7 @@ do_collect () return -1; // renaming the layer to the original filename - gimp_layer_set_name (layers[0], strrchr(fc->value(1),'/')+1); + gimp_layer_set_name (layers[0], strrchr((char *)fc->value(1),'/')+1); GPrecisionType image_base_prec = gimp_drawable_precision (layers[0]); int base_gray = gimp_drawable_gray (layers[0]); @@ -341,7 +341,7 @@ do_collect () #endif gimp_image_add_layer (image_ID, layers[0], 0); DBG // set layer name to filename - gimp_layer_set_name(layers[0], strrchr(fc->value(i),'/')+1); + gimp_layer_set_name(layers[0], strrchr((char *)fc->value(i),'/')+1); // searching max dimensions if (gimp_image_width(load_image_ID) > max_w) icc_examin-0.46-default.patch: --- NEW FILE icc_examin-0.46-default.patch --- diff -up icc_examin-0.46/icc_gl.cpp.default icc_examin-0.46/icc_gl.cpp --- icc_examin-0.46/icc_gl.cpp.default 2009-03-05 16:26:24.000000000 +0100 +++ icc_examin-0.46/icc_gl.cpp 2009-03-05 16:28:09.000000000 +0100 @@ -731,7 +731,7 @@ GL_Ansicht::GLinit_() if(font) delete font; if(ortho_font) delete ortho_font; - const char* font_name = "/usr/X11R6/lib/X11/fonts/truetype/FreeSans.ttf"; + const char* font_name = "/usr/share/fonts/dejavu/DejaVuSans.ttf"; # if APPLE std::string f_n; if(getenv("RESOURCESPATH")) @@ -748,7 +748,7 @@ GL_Ansicht::GLinit_() # endif if(!holeDateiModifikationsZeit(font_name)) { DBG_PROG_S( _("Could not open font in:") << font_name ) - font_name = "/usr/X11R6/lib/X11/fonts/truetype/arial.ttf"; + font_name = "/usr/share/fonts/dejavu/DejaVuSans.ttf"; if(!holeDateiModifikationsZeit(font_name)) { DBG_PROG_S( _("Could not open font in:") << font_name ) #ifdef WIN32 @@ -773,7 +773,7 @@ GL_Ansicht::GLinit_() font_name = n; if(!holeDateiModifikationsZeit(font_name)) { DBG_PROG_S( _("Could not open font in:") << font_name ) - sprintf (n, "%s/FreeSans.ttf", SRCDIR); + sprintf (n, "%s/DejaVuSans.ttf", SRCDIR); font_name = n; } } --- NEW FILE import.log --- cinepaint-0_22_1-12_fc10:HEAD:cinepaint-0.22.1-12.fc10.src.rpm:1236616951 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Mar 2008 21:39:36 -0000 1.3 +++ .cvsignore 9 Mar 2009 16:44:35 -0000 1.4 @@ -1,2 +1,2 @@ cinepaint-0.22-1.tar.gz -icc_examin-0.44.tar.gz +icc_examin-0.46.tar.gz Index: cinepaint.spec =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- cinepaint.spec 24 Feb 2009 07:33:18 -0000 1.14 +++ cinepaint.spec 9 Mar 2009 16:44:35 -0000 1.15 @@ -6,7 +6,7 @@ Name: cinepaint Version: %(echo %{cinever} |sed 's|-|.|') -Release: 11%{?dist} +Release: 12%{?dist} Summary: CinePaint is a tool for manipulating images Group: Applications/Multimedia @@ -14,8 +14,7 @@ URL: http://www.cinepaint.org/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{cinever}.tar.gz # http://www.behrmann.name/index.php?option=com_content&task=view&id=33&Itemid=69 -Source1: http://kwizart.fedorapeople.org/SOURCES/icc_examin-0.44.tar.gz -Patch0: cinepaint-0.22-0-icc_helfer_fltk.patch +Source1: http://downloads.sourceforge.net/oyranos/icc_examin-0.46.tar.gz Patch1: cinepaint-0.22-0-nonweak-symbol.patch Patch2: cinepaint-0.22-0-rm_rpath.patch Patch3: cinepaint-0.22-0-pc_req.patch @@ -24,7 +23,8 @@ Patch6: cinepaint-0.22-multilib.patch Patch8: cinepaint-0.22-gcc43_cine.patch Patch9: cinepaint-0.22-1-underquoted.patch -Patch11: icc_examin-0.44-gcc43.patch +Patch10: cinepaint-0.22-gcc44.patch +Patch11: icc_examin-0.46-default.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #ifnarch %{ix86} ppc @@ -47,9 +47,11 @@ BuildRequires: libXxf86vm-devel BuildRequires: OpenEXR-devel >= 1.6.0 BuildRequires: oyranos-devel +BuildRequires: elektra-devel -Requires: freefont -Requires: pygtk2 +%if 0%{?fedora} > 10 +Requires: dejavu-sans-fonts +%endif Requires: oyranos Requires: %{name}-libs = %{version}-%{release} @@ -88,7 +90,6 @@ %prep %setup -q -n cinepaint-%{cinever} -%patch0 -p1 -b .compile %patch1 -p1 -b .symbol %patch2 -p1 -b .rm_rpath %patch3 -p1 -b .req @@ -98,24 +99,21 @@ %patch8 -p1 -b .gcc43_cine #Fix #450325 %patch9 -p1 -b .underquoted +%patch10 -p1 -b .gcc44 #Fix to prevent a multilibs problem touch -r cinepaint.m4.underquoted cinepaint.m4 %setup -q -D -T -a 1 -n cinepaint-%{cinever} -pushd icc_examin-0.44 -%patch11 -p1 -b .gcc43 +pushd icc_examin-0.46 +%patch11 -p1 -b .icc_def popd +# Update bundled version of icc_examin rm -rf plug-ins/icc_examin/icc_examin -# Fix default path FreeSans.ttf -sed -i -e 's|/usr/X11R6/lib/X11/fonts/truetype/FreeSans.ttf|%{_datadir}/fonts/freefont/FreeSans.ttf|' \ - icc_examin-0.44/icc_gl.cpp -sed -i -e 's|fonts/FreeSans.ttf|fonts/freefont/FreeSans.ttf|' icc_examin-0.44/icc_gl.cpp - -cp -pR icc_examin-0.44 plug-ins/icc_examin/icc_examin +cp -pR icc_examin-0.46 plug-ins/icc_examin/icc_examin #ifnarch %{ix86} ppc -autoconf +autoconf -f -i #endif for i in AUTHORS COPYING LICENSE README ;do @@ -123,17 +121,12 @@ done sed -i 's|\r||' NEWS COPYING - -# make compile log more verbose -sed -i.debug -e '/SILENT/s|^.*$|:|' plug-ins/icc_examin/icc_examin/configure.sh -# remove rpath -sed -i.rpath -e '/rpath/d' plug-ins/icc_examin/icc_examin/configure - # prevent interp_md5 to be used rm plug-ins/script-fu/interp_md5.{h,c} %build +export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %configure \ --disable-static \ --enable-gtk2 \ @@ -225,14 +218,15 @@ %changelog +* Mon Mar 9 2009 kwizart < kwizart at gmail.com > - 0.22.1-12 +- Fix for gcc44 + * Mon Feb 23 2009 Fedora Release Engineering - 0.22.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Mon Dec 8 2008 kwizart < kwizart at gmail.com > - 0.22.1-10 - Fix underquoted cinepaint.m4 - #450325 - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.22.1-9 -- Rebuild for Python 2.6 +- Fix automatic provides a specific architecture * Thu Oct 09 2008 Dennis Gilmore - 0.22.1-8 - add sparc64 to the list of 64 bit arches for python site arch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Mar 2008 21:39:36 -0000 1.3 +++ sources 9 Mar 2009 16:44:35 -0000 1.4 @@ -1,2 +1,2 @@ f360587240db6b6d2f0bfd94c420c492 cinepaint-0.22-1.tar.gz -81e9bba15a777d53fbeb03acd65f7338 icc_examin-0.44.tar.gz +01b8a19489601850192476a06393cf47 icc_examin-0.46.tar.gz --- cinepaint-0.22-0-icc_helfer_fltk.patch DELETED --- --- icc_examin-0.44-gcc43.patch DELETED --- From pkgdb at fedoraproject.org Mon Mar 9 16:44:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:44:49 +0000 Subject: [pkgdb] openoffice.org had acl change status Message-ID: <20090309164551.905F2208548@bastion.fedora.phx.redhat.com> caolanm has set the watchbugzilla acl on openoffice.org (Fedora 10) to Obsolete for jnavrati To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org From pkgdb at fedoraproject.org Mon Mar 9 16:45:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:45:52 +0000 Subject: [pkgdb] openoffice.org had acl change status Message-ID: <20090309164552.F1EE520854B@bastion.fedora.phx.redhat.com> caolanm has set the watchcommits acl on openoffice.org (Fedora 10) to Obsolete for jnavrati To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org From pkgdb at fedoraproject.org Mon Mar 9 16:45:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:45:57 +0000 Subject: [pkgdb] openoffice.org had acl change status Message-ID: <20090309164554.B460120854D@bastion.fedora.phx.redhat.com> caolanm has set the commit acl on openoffice.org (Fedora 10) to Obsolete for jnavrati To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org From kwizart at fedoraproject.org Mon Mar 9 16:48:56 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 9 Mar 2009 16:48:56 +0000 (UTC) Subject: rpms/cinepaint/devel cinepaint-0.22-oyranos19.patch, NONE, 1.1 cinepaint.spec, 1.15, 1.16 import.log, 1.1, 1.2 Message-ID: <20090309164856.B89A170034@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/cinepaint/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32256/devel Modified Files: cinepaint.spec import.log Added Files: cinepaint-0.22-oyranos19.patch Log Message: Add missing patch cinepaint-0.22-oyranos19.patch: --- NEW FILE cinepaint-0.22-oyranos19.patch --- diff -up cinepaint-0.22-1/app/cms.c.oy19 cinepaint-0.22-1/app/cms.c --- cinepaint-0.22-1/app/cms.c.oy19 2007-05-10 22:18:31.000000000 +0200 +++ cinepaint-0.22-1/app/cms.c 2009-03-09 15:39:36.000000000 +0100 @@ -38,9 +38,18 @@ #ifdef HAVE_OY #include +#ifndef OYRANOS_VERSION +#define OYRANOS_VERSION 0 +#endif +#if OYRANOS_VERSION < 108 +#include /* ntohl */ #include +#else +#include +#endif #endif +#include "config.h" #include "../lib/version.h" #include "libgimp/gimpintl.h" #include "depth/float16.h" @@ -49,6 +58,7 @@ #include "general.h" #include "gdisplay.h" #include "gimage_cmds.h" +#include "interface.h" #include "pixelarea.h" #include "pixelrow.h" #include "rc.h" @@ -104,12 +114,14 @@ struct _CMSProfile cmsHPROFILE handle; char *data; /* save original data for profile i/o */ size_t size; + char cspace[8]; }; /* same for transform */ struct _CMSTransform { gchar *cache_key; - Tag tag; + Tag src_tag; + Tag dest_tag; cmsHTRANSFORM handle; icColorSpaceSignature colourspace_in; /*!< source/image colour space */ DWORD lcms_input_format; /*!< put information about alpha ... */ @@ -263,7 +275,7 @@ void cms_init() /* sanity checks of settings, remove failed settings */ /* suppress lcms errors while checking */ - cmsErrorAction(LCMS_ERROR_IGNORE); + cmsErrorAction(LCMS_ERROR_IGNORE); /* 1. image profile */ if (cms_default_image_profile_name != NULL) @@ -334,6 +346,77 @@ void* my_alloc_func( size_t size ) { return calloc(1, size); } +#ifdef HAVE_OY +# if OYRANOS_VERSION > 107 +int iccMessageFunc( int code, const oyStruct_s * context, const char * format, ... ) +{ + char* text = 0, *pos = 0; + va_list list; + const char * type_name = ""; + int id = -1; + + if(code == oyMSG_DBG) + return 0; + + + if(context && oyOBJECT_NONE < context->type_) + { + type_name = oyStruct_TypeToText( context ); + id = oyObject_GetId( context->oy_ ); + } + + text = (char*)calloc(sizeof(char), 4096); + if(!text) + return 1; + text[0] = 0; + + switch(code) + { + case oyMSG_WARN: + sprintf( &text[strlen(text)], _("WARNING: ")); + break; + case oyMSG_ERROR: + sprintf( &text[strlen(text)], _("!!! ERROR: ")); + break; + } + + va_start( list, format); + vsnprintf( &text[strlen(text)], 4096 - strlen(text), format, list); + va_end ( list ); + + + snprintf( &text[strlen(text)], 4096 - strlen(text), "%s[%d] ",type_name,id ); + + pos = &text[strlen(text)]; + *pos = '\n'; + pos++; + *pos = 0; + +#ifndef DEBUG + if(code == oyMSG_WARN) + { + int i = 0; + while(text[i]) + fputc(text[i++], stderr); + fprintf( stderr, "\n" ); + } else +#endif + message_box( text, NULL, NULL ); + + free( text ); + + return 0; +} +/* just a wrapper */ +int lcmsMessageFunc( int code, const char * txt ) +{ + iccMessageFunc( code, 0, txt ); + return 0; +} +# endif +#endif + + void cms_init_oyranos() { #ifdef HAVE_OY @@ -341,6 +424,12 @@ void cms_init_oyranos() size_t test_size = 0; /* profile size */ char *p_name = NULL; /* profile name */ + /* messages */ +# if OYRANOS_VERSION > 107 + oyMessageFuncSet( iccMessageFunc ); + cmsSetErrorHandler( lcmsMessageFunc ); +# endif + /* we dont touch or save the hand made settings */ /* 1. assumed image profile */ @@ -374,6 +463,8 @@ void cms_init_oyranos() const char *display_name = gdk_get_display (); test = oyGetMonitorProfile( display_name, &test_size, my_alloc_func ); + printf("%s:%d %s() monitor profile size: %d\n",__FILE__,__LINE__,__func__, + test_size ); if (test == NULL || !test_size) { @@ -666,6 +757,7 @@ cms_get_long_profile_info(cmsHPROFILE h { static char profile_info[4096]; gchar *text; + const char*tmp = NULL; cmsCIEXYZ WhitePt; int first = FALSE, min_len = 24, /* formatting */ @@ -683,56 +775,71 @@ cms_get_long_profile_info(cmsHPROFILE h #endif profile_info[0] = '\000'; if (cmsIsTag(hProfile, icSigProfileDescriptionTag)) { + tmp = cmsTakeProductDesc(hProfile); + if(tmp && strlen(tmp)) + { sprintf (text,_("Description: ")); - sprintf (profile_info,"%s%s %s",profile_info,text, - cmsTakeProductDesc(hProfile)); + sprintf (&profile_info[strlen(profile_info)],"%s %s", text, tmp); if (!first) { len = min_len - strlen (profile_info); for (i=0; i < len * 2.2; i++) { - sprintf (profile_info,"%s ",profile_info); + sprintf (&profile_info[strlen(profile_info)]," "); } } - sprintf (profile_info,"%s\n",profile_info); + sprintf (&profile_info[strlen(profile_info)],"\n"); + } } if (cmsIsTag(hProfile, icSigDeviceMfgDescTag)) { + tmp = cmsTakeProductName(hProfile); + if(tmp && strlen(tmp)) + { sprintf (text,_("Product: ")); - sprintf (profile_info,"%s%s %s\n",profile_info,text, - cmsTakeProductName(hProfile)); + sprintf (&profile_info[strlen(profile_info)],"%s %s\n", text, tmp); + } } #if LCMS_VERSION >= 112 if (cmsIsTag(hProfile, icSigDeviceMfgDescTag)) { + tmp = cmsTakeManufacturer(hProfile); + if(tmp && strlen(tmp)) + { sprintf (text,_("Manufacturer: ")); - sprintf (profile_info,"%s%s %s\n",profile_info,text, - cmsTakeManufacturer(hProfile)); + sprintf (&profile_info[strlen(profile_info)],"%s %s\n", text, tmp); + } } if (cmsIsTag(hProfile, icSigDeviceModelDescTag)) { + tmp = cmsTakeModel(hProfile); + if(tmp && strlen(tmp)) + { sprintf (text,_("Model: ")); - sprintf (profile_info,"%s%s %s\n",profile_info,text, - cmsTakeModel(hProfile)); + sprintf (&profile_info[strlen(profile_info)],"%s %s\n", text, tmp); + } } #endif #if LCMS_VERSION >= 113 if (cmsIsTag(hProfile, icSigCopyrightTag)) { + tmp = cmsTakeCopyright(hProfile); + if(tmp && strlen(tmp)) + { sprintf (text,_("Copyright: ")); - sprintf (profile_info,"%s%s %s\n",profile_info,text, - cmsTakeCopyright(hProfile)); + sprintf (&profile_info[strlen(profile_info)],"%s %s\n", text, tmp); + } } #endif - sprintf (profile_info,"%s\n",profile_info); + sprintf (&profile_info[strlen(profile_info)],"\n"); cmsTakeMediaWhitePoint (&WhitePt, hProfile); _cmsIdentifyWhitePoint (text, &WhitePt); - sprintf (profile_info, "%s%s\n", profile_info, text); + sprintf (&profile_info[strlen(profile_info)], "%s\n", text); sprintf (text,_("Device Class: ")); - sprintf (profile_info,"%s%s %s\n",profile_info,text, + sprintf (&profile_info[strlen(profile_info)],"%s %s\n", text, cms_get_device_class_name(hProfile)); sprintf (text,_("Color Space: ")); - sprintf (profile_info,"%s%s %s\n",profile_info,text, + sprintf (&profile_info[strlen(profile_info)],"%s %s\n", text, cms_get_color_space_name(hProfile)); sprintf (text,_("PCS Space: ")); - sprintf (profile_info,"%s%s %s",profile_info,text, + sprintf (&profile_info[strlen(profile_info)],"%s %s", text, cms_get_pcs_name(hProfile)); free (text); @@ -814,8 +921,9 @@ cms_read_icc_profile_dir(gchar *path, ic * profile class, class==CMS_ANY_PROFILECLASS gives all profiles, does not recur over dirs * returns a list of char * or NULL in case of error */ +//#define DEBUG 1 GSList * -cms_read_standard_profile_dirs(icProfileClassSignature class) +cms_read_standard_profile_dirs(icColorSpaceSignature space) { /* the temporary list to hold the names */ GSList* return_list = NULL; @@ -831,19 +939,49 @@ cms_read_standard_profile_dirs(icProfile #ifdef HAVE_OY if(cms_oyranos) { +# if OYRANOS_VERSION > 107 + oyPROFILE_e type = oyDEFAULT_PROFILE_START; + int size, i; + oyProfile_s * temp_prof = 0; + oyProfiles_s * iccs = 0; + + iccs = oyProfiles_ForStd( type, 0, 0 ); + + size = oyProfiles_Count( iccs ); + for( i = 0; i < size; ++i) + { + temp_prof = oyProfiles_Get( iccs, i ); +# ifdef DEBUG + printf("%d: \"%s\" %s\n", i, + oyProfile_GetText( temp_prof, oyNAME_DESCRIPTION ), + oyProfile_GetFileName(temp_prof, 0)); +# endif + return_list = g_slist_append(return_list, + (gpointer) strdup(oyProfile_GetFileName(temp_prof, 0))); + oyProfile_Release( &temp_prof ); + } + oyProfiles_Release( &iccs ); +# else int count = 0, i; - char** names = /*(const char**)*/ oyProfileListGet( 0, &count ); + char profile_space[] = {0,0,0,0,0,0,0,0}; + char** names = /*(const char**)*/ 0; + + icColorSpaceSignature space_host = ntohl(space); -# ifdef DEBUG + memcpy( profile_space, &space_host, 4 ); + names = oyProfileListGet( profile_space, &count); + +# ifdef DEBUG printf("profiles: %d\n", count); -# endif +# endif for(i = 0; i < count; ++i) { -# ifdef DEBUG_ - printf("profiles: %d %s %s\n", i, names[i], oyGetPathFromProfileName(names[i], my_alloc_func)); -# endif +# ifdef DEBUG + printf("%s profiles: %d %s %s\n", profile_space, i, names[i], oyGetPathFromProfileName(names[i], my_alloc_func)); +# endif return_list = g_slist_append(return_list, (gpointer) names[i]); } +# endif return return_list; } @@ -865,7 +1003,7 @@ cms_read_standard_profile_dirs(icProfile { path = strdup(token); } - sub_list = cms_read_icc_profile_dir(path, class); + sub_list = cms_read_icc_profile_dir(path, space); return_list = g_slist_concat(return_list, sub_list); g_free(path); @@ -877,6 +1015,7 @@ cms_read_standard_profile_dirs(icProfile return return_list; } +#undef DEBUG /* * gets meta information about the profile @@ -888,31 +1027,48 @@ CMSProfileInfo * cms_get_profile_info(CMSProfile *profile) { const char *dummy[] = {"","","",""}; +#if defined(HAVE_OY) && OYRANOS_VERSION > 107 + char ** texts = 0; + int32_t texts_n = 0; + oyProfileTag_s * tag = 0; + oyProfile_s * p = oyProfile_FromMem( profile->size, profile->data, 0, 0 ); +#endif + profile_info_buffer->manufacturer = dummy[0]; + profile_info_buffer->description = dummy[0]; + profile_info_buffer->pcs = dummy[0]; + profile_info_buffer->color_space_name = dummy[0]; + profile_info_buffer->color_space_channel_names = &dummy[0]; + profile_info_buffer->device_class_name = dummy[0]; + profile_info_buffer->long_info = dummy[0]; + +#if defined(HAVE_OY) && OYRANOS_VERSION > 107 + tag = oyProfile_GetTagById( p, icSigDeviceMfgDescTag ); + texts = oyProfileTag_GetText( tag, &texts_n, "", 0,0,0); + if(texts_n && texts && texts[0]) + profile_info_buffer->manufacturer = texts[0]; + if(texts) free(texts); + oyProfileTag_Release( &tag ); + + profile_info_buffer->description = strdup( oyProfile_GetText( p, + oyNAME_DESCRIPTION )); + oyProfile_Release( &p ); +#else if(profile) profile_info_buffer->manufacturer= cmsTakeManufacturer(profile->handle); - if(!profile_info_buffer->manufacturer) - profile_info_buffer->manufacturer = dummy[0]; if(profile) profile_info_buffer->description = cmsTakeProductDesc(profile->handle); - if(!profile_info_buffer->description) - profile_info_buffer->description = dummy[0]; +#endif if(profile) profile_info_buffer->pcs = cms_get_pcs_name(profile->handle); - if(!profile_info_buffer->pcs) - profile_info_buffer->pcs = dummy[0]; if(profile) profile_info_buffer->color_space_name = cms_get_color_space_name(profile->handle); - if(!profile_info_buffer->color_space_name) - profile_info_buffer->color_space_name = dummy[0]; if(profile) profile_info_buffer->color_space_channel_names = cms_get_color_space_channel_names(profile->handle); - if(!profile_info_buffer->color_space_channel_names) - profile_info_buffer->color_space_channel_names = &dummy[0]; # ifdef DEBUG /*printf("%s:%d ",__FILE__,__LINE__); printf("%s\n",profile_info_buffer->color_space_channel_names[2]);*/ @@ -920,14 +1076,9 @@ cms_get_profile_info(CMSProfile *profile if(profile) profile_info_buffer->device_class_name = cms_get_device_class_name(profile->handle); - if(!profile_info_buffer->device_class_name) - profile_info_buffer->device_class_name = dummy[0]; if(profile) profile_info_buffer->long_info = cms_get_long_profile_info(profile->handle); - if(!profile_info_buffer->long_info) - profile_info_buffer->long_info = dummy[0]; - return profile_info_buffer; } @@ -950,8 +1101,10 @@ cms_get_lcms_format(Tag tag, CMSProfile if (color_channels > num_channels) { - printf (_("Drawable cannot handle all colours.")); - //return 0; + printf ("%s:%d %s(): Drawable cannot handle all colours.\n",__FILE__,__LINE__,__func__); +#ifndef DEBUG_ + return 0; +#endif } /* workaround for Lab float images and lcms <= 1.15 @@ -1036,6 +1189,14 @@ cms_load_profile_to_mem (char* filename, } /* + * obtain a four char string of the ICC colour space, e.g. "Lab" + */ +const char * cms_get_profile_cspace ( CMSProfile * profile ) +{ + return profile->cspace; +} + +/* * get a handle to the profile in file filename * either from the cache or from the file * returns NULL on error @@ -1050,6 +1211,9 @@ cms_get_profile_from_file(char *file_nam char *fullFileName = file_name; cmsHPROFILE profile = NULL; + if( !file_name || strcmp(file_name,_("[none]")) == 0 ) + return NULL; + /* get profile information */ cmsErrorAction(LCMS_ERROR_IGNORE); profile = cmsOpenProfileFromFile (file_name, "r"); @@ -1118,6 +1282,8 @@ cms_get_profile_from_file(char *file_nam return_value = g_new(CMSProfile, 1); return_value->cache_key = strdup(cms_get_profile_keyname(profile,mem)); return_value->handle = profile; + sprintf( return_value->cspace, + cms_get_color_space_name( return_value->handle ) ); /* save an copy of the original icc profile to mem */ return_value->size = 0; @@ -1153,6 +1319,7 @@ cms_get_profile_from_mem(void *mem_point return NULL; } + /* check hash table for profile */ cache_entry = g_hash_table_lookup(profile_cache, (gpointer) cms_get_profile_keyname(profile,mem_pointer)); @@ -1169,6 +1336,8 @@ cms_get_profile_from_mem(void *mem_point return_value = g_new(CMSProfile, 1); return_value->cache_key = strdup(cms_get_profile_keyname(profile,mem_pointer)); return_value->handle = profile; + sprintf( return_value->cspace, + cms_get_color_space_name( return_value->handle ) ); cache_entry = g_new(ProfileCacheEntry, 1); cache_entry->ref_count = 1; @@ -1383,7 +1552,7 @@ cms_return_profile(CMSProfile *profile) * decreate ref_counter + possibly close profile */ if (profile == NULL) - { g_warning("cms_return_profile: profile is NULL"); + { /*g_warning("cms_return_profile: profile is NULL");*/ return FALSE; } @@ -1411,7 +1580,7 @@ CMSTransform * cms_create_transform(cmsHPROFILE *profile_array, int num_profiles, DWORD lcms_input_format, DWORD lcms_output_format, int lcms_intent, DWORD lcms_flags, int proof_intent, - Tag tag, + Tag src_tag, Tag dest_tag, CMSTransform **expensive_transform, int * set_expensive_transform_b) { @@ -1465,7 +1634,7 @@ cms_create_transform(cmsHPROFILE *profil *set_expensive_transform_b = TRUE; } if (!transform) - { g_warning ("%s:%d ICC profile not valid.",__FILE__,__LINE__); + { g_warning ("%s:%d ICC profile not valid?",__FILE__,__LINE__); return NULL; } } else @@ -1495,7 +1664,7 @@ CMSTransform * cms_get_transform(GSList *profiles, DWORD lcms_input_format, DWORD lcms_output_format, int lcms_intent, DWORD lcms_flags, int proof_intent, - Tag tag, + Tag src_tag, Tag dest_tag, CMSTransform **expensive_transform) { /* turn profiles into an array as needed by lcms + check all profiles are registered with the profile cache + @@ -1557,10 +1726,10 @@ cms_get_transform(GSList *profiles, iterator = g_slist_next(iterator); } - g_string_sprintfa(hash_key,"%d%d%d%d%d%d%d", + g_string_sprintfa(hash_key,"%d%d%d%d%d%d%d%d", (int)lcms_input_format, (int)lcms_output_format, lcms_intent, (int)lcms_flags, proof_intent, num_profiles, - tag); + src_tag, dest_tag); /* now check the cache */ cache_entry = g_hash_table_lookup(transform_cache, (gpointer) hash_key->str); @@ -1607,7 +1776,7 @@ cms_get_transform(GSList *profiles, transform = cms_create_transform( profile_array, num_profiles, lcms_input_format, lcms_output_format, lcms_intent, lcms_flags, proof_intent, - tag, expensive_transform, + src_tag, dest_tag, expensive_transform, &set_expensive_transform_b ); { @@ -1618,7 +1787,8 @@ cms_get_transform(GSList *profiles, cache_entry = g_new(TransformCacheEntry, 1); cache_entry->ref_count = 1; cache_entry->transform = g_new(CMSTransform, 1); - cache_entry->transform->tag = tag; + cache_entry->transform->src_tag = src_tag; + cache_entry->transform->dest_tag = dest_tag; cache_entry->transform->cache_key = hash_key->str; cache_entry->transform->handle = transform; cache_entry->device_link_file = NULL; @@ -1668,7 +1838,7 @@ cms_get_transform(GSList *profiles, transform = cms_create_transform( profile_array, num_profiles, lcms_input_format, lcms_output_format, lcms_intent, lcms_flags, proof_intent, - tag, expensive_transform, + src_tag, dest_tag, expensive_transform, &set_expensive_transform_b ); cache_entry->transform->handle = transform; @@ -1705,7 +1875,7 @@ CMSTransform * cms_get_canvas_transform(GSList *profiles, Tag src_tag, Tag dest_tag, int lcms_intent, DWORD lcms_flags, int proof_intent, CMSTransform **expensive_transform) -{ Tag t = src_tag; +{ DWORD lcms_format_in, lcms_format_out; CMSTransform *transform = NULL; @@ -1729,7 +1899,7 @@ cms_get_canvas_transform(GSList *profile transform = cms_get_transform(profiles, lcms_format_in, lcms_format_out, lcms_intent, lcms_flags, proof_intent, - t, expensive_transform); + src_tag, dest_tag, expensive_transform); return transform; } @@ -1826,12 +1996,12 @@ cms_transform_buffer (CMSTransform *tran transform_func = cms_transform_float; break; default: - g_warning ("cms_transform: precision not supported"); + g_warning ("%s:%d %s(): precision not supported", __FILE__,__LINE__,__func__); return; } if(src_data == dest_data && - tag_format(transform->tag) == FORMAT_GRAY) + tag_format(transform->dest_tag) == FORMAT_GRAY) { len = bytes * 4 * num_pixels; dest_data_ = malloc( len ); @@ -1865,7 +2035,9 @@ cms_transform_area(CMSTransform *transfo void *pag; if (tag_precision(src_tag) != tag_precision(dest_tag)) - { g_warning("cms_transform: src and dest area have to have same precision"); + { + int i; i = 0; + /*g_warning("cms_transform: src and dest area have to have same precision");*/ } if (!transform || !transform->handle) @@ -1885,12 +2057,12 @@ cms_transform_area(CMSTransform *transfo transform_func = cms_transform_float; break; default: - g_warning ("cms_transform: precision not supported"); + g_warning ("%s:%d %s(): precision not supported", __FILE__,__LINE__,__func__); return; } - for (pag = pixelarea_register (1, src_area, dest_area); + for (pag = pixelarea_register (2, src_area, dest_area); pag != NULL; pag = pixelarea_process (pag)) { h = pixelarea_height(src_area); @@ -1902,24 +2074,135 @@ cms_transform_area(CMSTransform *transfo src_data = pixelrow_data(&src_row_buffer); dest_data = pixelrow_data(&dest_row_buffer); if (!dest_data || !src_data) - g_warning ("%s:%d %s() buffer failed at hight %d\n", - __FILE__,__LINE__,__func__, h); + g_warning ("%s:%d %s() buffer failed\n", + __FILE__,__LINE__,__func__); (*transform_func) (transform, src_data, dest_data, num_pixels); } } } +#if 0 +void +cms_transform_uint_extra(CMSTransform *transform, void *src_data, void *dest_data, int num_pixels) +{ + int cchan_in = T_CHANNELS( transform->lcms_input_format ); + int cchan_out = T_CHANNELS( transform->lcms_output_format ); + int chan_in = tag_num_channels( transform->src_tag ); + int chan_out = tag_num_channels( transform->dest_tag ); + int extra_in = chan_in - cchan_in; + int extra_out = chan_out - cchan_out; + Precision prec_in = tag_precision( transform->src_tag ); + Precision prec_out = tag_precision( transform->dest_tag ); + int dest_alpha = tag_alpha( transform->dest_tag ) == ALPHA_YES ? 1:0; + int i, j; + ShortsFloat u; + + if(chan_out > cchan_out) + for(i = 0 ; i < num_pixels; ++i) + { + int pos_in = i * chan_in + cchan_in; + int pos_out = i * chan_out + cchan_out; + + switch (prec_out) + { + case PRECISION_U8: + { + guint8 *dest = (guint8 *)dest_data; + float dest_white = 255; + + for(j = 0; j < extra_in && j < extra_out; ++j) + switch( prec_in ) + { + case PRECISION_U8: + { + guint8 *src = (guint8 *)src_data; + dest[pos_out + j] = src[pos_in + j]; + } + break; + case PRECISION_U16: + { + guint16 * src = (guint16*)src_data; + dest[pos_out + j] = src[pos_in + j]/256; + } + break; + case PRECISION_FLOAT16: + { + guint16 * src = (guint16*)src_data; + dest[pos_out + j] = FLT(src[pos_in + j], u) * dest_white; + } + break; + case PRECISION_FLOAT: + { + float * src = (float*)src_data; + dest[pos_out + j] = src[pos_in + j] * dest_white; + } + break; + } + for(j = extra_in; j < extra_out; ++j) + dest[pos_out + j] = dest_white; + } + break; + case PRECISION_U16: + { + guint16 *dest = (guint16 *)dest_data; + float dest_white = 65535; + + for(j = 0; j < extra_in && j < extra_out; ++j) + switch( prec_in ) + { + case PRECISION_U8: + { + guint8 *src = (guint8 *)src_data; + dest[pos_out + j] = src[pos_in + j]*257; + } + break; + case PRECISION_U16: + { + guint16 * src = (guint16*)src_data; + dest[pos_out + j] = src[pos_in + j]; + } + break; + case PRECISION_FLOAT16: + { + guint16 * src = (guint16*)src_data; + dest[pos_out + j] = FLT(src[pos_in + j], u) * dest_white; + } + break; + case PRECISION_FLOAT: + { + float * src = (float*)src_data; + dest[pos_out + j] = src[pos_in + j] * dest_white; + } + break; + } + + for(j = chan_in; j < chan_out; ++j) + if(dest_alpha && j+1 == chan_out) + dest[i*chan_out + j] = dest_white; + else + dest[i*chan_out + j] = dest[i*chan_out + j-1]; + } + break; + } + } +} +#endif void cms_transform_uint(CMSTransform *transform, void *src_data, void *dest_data, int num_pixels) { int cchan_in = T_CHANNELS( transform->lcms_input_format ); int cchan_out = T_CHANNELS( transform->lcms_output_format ); - int chan = tag_num_channels( transform->tag ); - int extra_in = chan - cchan_in; - int extra_out = chan - cchan_out; - int alpha = tag_alpha( transform->tag ) == ALPHA_YES ? 1:0; + int alpha = tag_alpha( transform->dest_tag ) == ALPHA_YES ? 1:0; + int chan_in = tag_num_channels( transform->src_tag ); + int chan_out = tag_num_channels( transform->dest_tag ); + int extra_in = chan_in - cchan_in; + int extra_out = chan_out - cchan_out; + Precision prec_in = tag_precision( transform->src_tag ); + Precision prec_out = tag_precision( transform->dest_tag ); + int dest_alpha = tag_alpha( transform->dest_tag ) == ALPHA_YES ? 1:0; int i, j; + ShortsFloat u; /* easy, no previous conversion, lcms does it all */ if (!transform || !transform->handle) @@ -1932,32 +2215,36 @@ cms_transform_uint(CMSTransform *transfo /* easy, no previous conversion, lcms does it all */ cmsDoTransform(transform->handle,src_data,dest_data,num_pixels); +# if 0 + cms_transform_uint_extra( transform, src_data, dest_data, num_pixels ); +# else for(i = 0 ; i < num_pixels; ++i) { - switch (tag_precision( transform->tag )) + switch (tag_precision( transform->dest_tag )) { case PRECISION_U8: { guint8 *dest = (guint8 *)dest_data; for(j = cchan_out; j < cchan_in; ++j) - if(alpha && j+1 == chan) - dest[i*chan + j] = 255; + if(alpha && j+1 == chan_out) + dest[i*chan_out + j] = 255; else - dest[i*chan + j] = dest[i*chan + j-1]; + dest[i*chan_out + j] = dest[i*chan_out + j-1]; } break; case PRECISION_U16: { guint16 *dest = (guint16 *)dest_data; for(j = cchan_out; j < cchan_in; ++j) - if(alpha && j+1 == chan) - dest[i*chan + j] = 65535; + if(alpha && j+1 == chan_out) + dest[i*chan_out + j] = 65535; else - dest[i*chan + j] = dest[i*chan + j-1]; + dest[i*chan_out + j] = dest[i*chan_out + j-1]; } break; } } +# endif } void @@ -1965,17 +2252,26 @@ cms_transform_float(CMSTransform *transf { /* need to convert data to double for lcms's convenience */ int cchan_in = T_CHANNELS( transform->lcms_input_format ); int cchan_out = T_CHANNELS( transform->lcms_output_format ); - int chan = tag_num_channels( transform->tag ); - int extra_in = chan - cchan_in; - int extra_out = chan - cchan_out; - int alpha = tag_alpha( transform->tag ) == ALPHA_YES ? 1:0; + int chan_in = tag_num_channels( transform->src_tag ); + int chan_out = tag_num_channels( transform->dest_tag ); + int chan = chan_out; + int alpha = tag_alpha( transform->dest_tag ) == ALPHA_YES ? 1:0; + /*int extra_in = chan_in - cchan_in; + int extra_out = chan_out - cchan_out; */ + int src_alpha = tag_alpha( transform->src_tag ) == ALPHA_YES ? 1:0; + int dest_alpha = tag_alpha( transform->dest_tag ) == ALPHA_YES ? 1:0; int i, j, pix; float *src_fbuffer = (float *)src_data; float *dest_fbuffer = (float *)dest_data; guint16 *src_hbuffer = (guint16 *)src_data; guint16 *dest_hbuffer = (guint16 *)dest_data; - double *dbuffer = 0; + double *src_dbuffer = NULL, + *dest_dbuffer = NULL; + void * src_buffer = NULL, + * dest_buffer = NULL; + double* dbuffer = NULL; ShortsFloat u; + Precision dest_p = tag_precision( transform->dest_tag ); if (!transform || !transform->handle) g_warning ("%s:%d %s() transform not allocated\n", @@ -1984,13 +2280,117 @@ cms_transform_float(CMSTransform *transf g_warning ("%s:%d %s() array not allocated\n", __FILE__,__LINE__,__func__); +# if 1 + src_dbuffer = malloc(sizeof(double) * num_pixels * 4); + if( dest_p == PRECISION_FLOAT16 || + dest_p == PRECISION_FLOAT) + { + dest_dbuffer = malloc(sizeof(double) * num_pixels * 4); + dest_buffer = dest_dbuffer; + } else + dest_buffer = dest_data; + src_buffer = src_dbuffer; +# else dbuffer = malloc(sizeof(double) * num_pixels * 4); +# endif # ifdef DEBUG_ printf ("%s:%d %s() colourspace%d extra:%d channels:%d lcms_bytes%d \n", __FILE__,__LINE__,__func__, T_COLORSPACE(transform->lcms_input_format), T_EXTRA(transform->lcms_input_format), T_CHANNELS(transform->lcms_input_format), T_BYTES(transform->lcms_input_format) ); # endif - switch (tag_precision( transform->tag )) +#if 1 + switch (tag_precision( transform->src_tag )) + { + case PRECISION_FLOAT16: + for (i=0; i < num_pixels * chan_in; ++i) + { + if(T_COLORSPACE(transform->lcms_input_format) == PT_CMYK) + src_dbuffer[i] = (double) FLT( src_hbuffer[i], u ) * 100.; + else + src_dbuffer[i] = (double) FLT( src_hbuffer[i], u ); + } + break; + case PRECISION_FLOAT: +# if 0 + // Lab floating point makes no sense + if (transform->colourspace_in == icSigLabData) + { + for (pix=0; pix < num_pixels; ++pix) + { i = pix * chan_in; + /* The 100. multiplicator comes from PT_ANY in cms_get_lcms_format(). + */ + src_dbuffer[i+0] = (double) src_fbuffer[i+0]*100.; + src_dbuffer[i+1] = (double) src_fbuffer[i+1]*100.; + src_dbuffer[i+2] = (double) src_fbuffer[i+2]*100.; + if(src_alpha) + src_dbuffer[i+3] = (double) src_fbuffer[i+3]; + } + } else { +# endif + for (i=0; i < num_pixels * chan_in; ++i) +# if 0 + if(transform->colourspace_in == icSigCmykData) + src_dbuffer[i]=(double)src_fbuffer[i] * 100.; + else +# endif + src_dbuffer[i]=(double)src_fbuffer[i]; +/* } */ + break; + default: + dest_buffer = dest_data; + return; + } + + cmsDoTransform( transform->handle, src_buffer, dest_buffer, num_pixels ); + + /* and convert back */ + switch (tag_precision( transform->dest_tag )) + { + case PRECISION_FLOAT16: + for (i=0; i < num_pixels; ++i) + { + for(j = 0; j < cchan_out; ++j) + /* copy colour channels */ + if(T_COLORSPACE(transform->lcms_output_format) == PT_CMYK) + dest_hbuffer[i*chan_out + j] = (double) FLT16( dest_dbuffer[i*chan_out + j] / 100., u ); + else + dest_hbuffer[i*chan_out + j] = (double) FLT16( dest_dbuffer[i*chan_out + j], u ); + for(j = chan_in; j < chan_out; ++j) + if(dest_alpha && j+1 == chan_out) + /* set CinePaints alpha channel to opace */ + dest_hbuffer[i*chan_out + j] = ONE_FLOAT16; + else + /* refill with previous values */ + dest_hbuffer[i*chan_out + j] = dest_hbuffer[i*chan_out + j-1]; + /* ignore other untouched channels */ + } + break; + case PRECISION_FLOAT: + for (i=0; i < num_pixels; ++i) + { + for(j = 0; j < cchan_out; ++j) +# if 0 + if(T_COLORSPACE(transform->lcms_output_format) == PT_CMYK) + dest_fbuffer[i*chan_out + j] = dest_dbuffer[i*chan_out + j]/100.0; + else +# endif + dest_fbuffer[i*chan_out + j] = dest_dbuffer[i*chan_out + j]; + for(j = chan_in; j < chan_out; ++j) + if(dest_alpha && j+1 == chan_out) + dest_fbuffer[i*chan_out + j] = 1.0; + else + dest_fbuffer[i*chan_out + j] = dest_fbuffer[i*chan_out + j-1]; + } + break; + default: + break; + } + + if(dest_dbuffer) g_free(dest_dbuffer); + if(src_dbuffer) g_free(src_dbuffer); +# else + + switch (tag_precision( transform->dest_tag )) { case PRECISION_FLOAT16: for (i=0; i < num_pixels * chan; ++i) @@ -2030,7 +2430,7 @@ cms_transform_float(CMSTransform *transf cmsDoTransform(transform->handle,dbuffer,dbuffer,num_pixels); /* and convert back */ - switch (tag_precision( transform->tag )) + switch (tag_precision( transform->dest_tag )) { case PRECISION_FLOAT16: for (i=0; i < num_pixels; ++i) @@ -2069,6 +2469,7 @@ cms_transform_float(CMSTransform *transf } g_free(dbuffer); +# endif } @@ -2286,19 +2687,35 @@ static GtkWidget *cms_profile_menu_new(G GtkWidget *menuitem; GtkWidget *optionmenu; - GSList *profile_file_names = cms_read_standard_profile_dirs(CMS_ANY_PROFILECLASS); - GSList *iterator = profile_file_names; + GSList *profile_file_names = 0; + GSList *iterator = 0; gchar *current_filename; CMSProfile *current_profile; CMSProfileInfo *current_profile_info; int pos = can_select_none ? 1 : 0, select_pos = -1; + gchar * label_text = 0, * temp_label_text = 0; + label_text = temp_label_text = calloc(1024,sizeof(char)); menu = gtk_menu_new (); + profile_file_names = cms_read_standard_profile_dirs(icSigInputClass); + iterator = cms_read_standard_profile_dirs(icSigDisplayClass); + profile_file_names = g_slist_concat( profile_file_names, iterator ); + iterator = cms_read_standard_profile_dirs(icSigOutputClass); + profile_file_names = g_slist_concat( profile_file_names, iterator ); + iterator = cms_read_standard_profile_dirs(icSigLinkClass); + profile_file_names = g_slist_concat( profile_file_names, iterator ); + iterator = cms_read_standard_profile_dirs(icSigAbstractClass); + profile_file_names = g_slist_concat( profile_file_names, iterator ); + iterator = cms_read_standard_profile_dirs(icSigColorSpaceClass); + profile_file_names = g_slist_concat( profile_file_names, iterator ); + + iterator = profile_file_names; + if (can_select_none) { menuitem = gtk_menu_item_new_with_label(_("[none]")); - gtk_menu_append (GTK_MENU (menu), menuitem); - gtk_object_set_data(GTK_OBJECT(menuitem), "value", NULL); + gtk_menu_append (GTK_MENU (menu), menuitem); + gtk_object_set_data(GTK_OBJECT(menuitem), "value", NULL); } while (iterator != NULL) @@ -2309,8 +2726,8 @@ static GtkWidget *cms_profile_menu_new(G if(prefered_name && strlen(prefered_name) && strcmp( current_filename, prefered_name ) == 0 ) select_pos = pos; - - menuitem = gtk_menu_item_new_with_label (current_profile_info->description); + sprintf(label_text, "%s (%s)", current_profile_info->description, current_filename); + menuitem = gtk_menu_item_new_with_label (label_text); gtk_menu_append (GTK_MENU (menu), menuitem); gtk_object_set_data_full(GTK_OBJECT(menuitem), "value", (gpointer)current_filename, g_free); @@ -2322,6 +2739,7 @@ static GtkWidget *cms_profile_menu_new(G if (profile_file_names != NULL) { g_slist_free(profile_file_names); } + if(temp_label_text) free(temp_label_text); if(select_pos >= 0) gtk_menu_set_active (GTK_MENU (menu), select_pos); @@ -2381,27 +2799,27 @@ cms_ok_cancel_buttons_new(GtkBox *action GtkSignalFunc cancel_callback, gpointer data) { GtkWidget *buttonbox = NULL; - GtkWidget *button = NULL; + GtkWidget *button = NULL; buttonbox = gtk_hbutton_box_new(); gtk_button_box_set_spacing(GTK_BUTTON_BOX(buttonbox), 4); gtk_box_set_homogeneous(action_area, FALSE); - gtk_box_pack_end (action_area, buttonbox, FALSE, FALSE, 0); + gtk_box_pack_end (action_area, buttonbox, FALSE, FALSE, 0); button = gtk_button_new_with_label(_("OK")); - gtk_signal_connect(GTK_OBJECT(button), "clicked", + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(ok_callback), data); - gtk_box_pack_start (GTK_BOX (buttonbox), button, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (buttonbox), button, FALSE, FALSE, 0); button = gtk_button_new_with_label(_("Cancel")); - gtk_signal_connect(GTK_OBJECT(button), "clicked", + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(cancel_callback), data); - gtk_box_pack_start (GTK_BOX (buttonbox), button, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (buttonbox), button, FALSE, FALSE, 0); } /* - * CONVERT DIALOG - * menu: Image>Convert using ICC Profile... + * CONVERT DIALOG + * menu: Image>Convert using ICC Profile... */ /* private types */ diff -up cinepaint-0.22-1/app/cms.h.oy19 cinepaint-0.22-1/app/cms.h --- cinepaint-0.22-1/app/cms.h.oy19 2007-04-20 13:23:52.000000000 +0200 +++ cinepaint-0.22-1/app/cms.h 2009-03-09 15:39:36.000000000 +0100 @@ -79,7 +79,7 @@ GSList *cms_read_icc_profile_dir(gchar * * profile class, class==CMS_ANY_PROFILECLASS gives all profiles, does not recur over dirs * returns a list of char * or NULL in case of error */ -GSList *cms_read_standard_profile_dirs(icProfileClassSignature class); +GSList *cms_read_standard_profile_dirs(icColorSpaceSignature class); /* * get a handle to the profile in file filename @@ -133,6 +133,8 @@ gboolean cms_return_profile(CMSProfile * */ CMSProfileInfo *cms_get_profile_info(CMSProfile *profile); +const char * cms_get_profile_cspace ( CMSProfile * profile ); + /* returns the lcms format corresponding to this tag and profile */ DWORD cms_get_lcms_format(Tag tag, CMSProfile *profile); @@ -154,7 +156,7 @@ CMSTransform *cms_get_transform(GSList * DWORD lcms_output_format, int lcms_intent, DWORD lcms_flags, int proof_intent, - Tag input, + Tag input, Tag output, CMSTransform **expensive_transform); /* diff -up cinepaint-0.22-1/app/color_correction.c.oy19 cinepaint-0.22-1/app/color_correction.c --- cinepaint-0.22-1/app/color_correction.c.oy19 2009-03-09 16:05:50.000000000 +0100 +++ cinepaint-0.22-1/app/color_correction.c 2009-03-09 16:06:05.000000000 +0100 @@ -115,11 +115,11 @@ color_correction_init_lab_transforms (GI profiles = g_slist_append(profiles, image_profile); profiles = g_slist_append(profiles, lab_profile); lcms_format = cms_get_lcms_format(t, image_profile); - color_correction_to_lab_transform = cms_get_transform(profiles, lcms_format, TYPE_Lab_16, INTENT_PERCEPTUAL, 0, 0, t, NULL); + color_correction_to_lab_transform = cms_get_transform(profiles, lcms_format, TYPE_Lab_16, INTENT_PERCEPTUAL, 0, 0, t, t, NULL); profiles = g_slist_remove(profiles, image_profile); profiles = g_slist_append(profiles, image_profile); - color_correction_from_lab_transform = cms_get_transform(profiles, TYPE_Lab_16, lcms_format, INTENT_PERCEPTUAL, 0, 0, t, NULL); + color_correction_from_lab_transform = cms_get_transform(profiles, TYPE_Lab_16, lcms_format, INTENT_PERCEPTUAL, 0, 0, t, t, NULL); g_slist_free(profiles); } diff -up cinepaint-0.22-1/app/convert.c.oy19 cinepaint-0.22-1/app/convert.c --- cinepaint-0.22-1/app/convert.c.oy19 2009-03-09 16:07:14.000000000 +0100 +++ cinepaint-0.22-1/app/convert.c 2009-03-09 16:11:04.000000000 +0100 @@ -351,7 +351,7 @@ convert_image_colorspace (void *gimage_p transform = cms_get_transform(profiles, lcms_format_in, lcms_format_out, lcms_intent, cms_flags, - 0, tag, NULL); + 0, tag, tag, NULL); g_slist_free(profiles); if(!transform) { g_warning("%s:%d %s(): transform failed", __FILE__,__LINE__,__func__); diff -up cinepaint-0.22-1/app/look_profile.c.oy19 cinepaint-0.22-1/app/look_profile.c --- cinepaint-0.22-1/app/look_profile.c.oy19 2009-03-09 16:14:14.000000000 +0100 +++ cinepaint-0.22-1/app/look_profile.c 2009-03-09 16:14:23.000000000 +0100 @@ -297,7 +297,8 @@ look_profile_create(GImage *image, gint transform = cms_get_transform( profiles, TYPE_Lab_16, lcms_format_out, INTENT_PERCEPTUAL, - cms_default_flags, 0,tag, NULL); + cms_default_flags, 0, + tag, tag, NULL); g_slist_free(profiles); /* iterate over Lab space, converting to rgb, filling into picture */ @@ -481,7 +482,8 @@ look_profile_save (LookProfile *profile, profiles = g_slist_append(profiles, lab_profile); sample_info->transform = cms_get_transform(profiles, cms_get_lcms_format(t, input_profile), - TYPE_Lab_16, intent, flags, 0, t, NULL); + TYPE_Lab_16, intent, flags, 0, + t, t, NULL); pixelarea_init(&sample_info->sample_area, profile->canvas, @@ -884,7 +886,7 @@ _look_profile_gui_apply(_LookProfileGui gdisplay_get_cms_intent(data->display), gdisplay_get_cms_flags(data->display), gdisplay_get_cms_proof_intent(data->display), - tag, NULL); + tag, tag, NULL); g_slist_free(profiles); gimage_transform_colors(data->display->gimage, transform, TRUE); cms_return_transform(transform); @@ -929,7 +931,7 @@ _look_profile_gui_apply_flipbook (_LookP gdisplay_get_cms_intent(data->display), gdisplay_get_cms_flags(data->display), gdisplay_get_cms_proof_intent(data->display), - tag, NULL); + tag, tag, NULL); g_slist_free(profiles); /* create progress dialog */ diff -up cinepaint-0.22-1/app/main.c.oy19 cinepaint-0.22-1/app/main.c --- cinepaint-0.22-1/app/main.c.oy19 2009-03-09 16:19:06.000000000 +0100 +++ cinepaint-0.22-1/app/main.c 2009-03-09 16:20:54.000000000 +0100 @@ -32,6 +32,10 @@ #include #include #include +/* check for directories */ +#include +#include + #ifdef WIN32 extern int _fmode; @@ -146,6 +150,7 @@ int WINAPI WinMain( { #else + int main (int argc, char **argv) { #endif @@ -195,11 +200,14 @@ int main (int argc, char **argv) { #ifdef HAVE_OY /* set a profile temporary path */ + /* this is obsolete with the XDG paths being supported since v0.1.8 */ +#if (OYRANOS_VERSION < 108) if(strcmp(text, GetDirPrefix()) != 0) { int n = oyPathsCount(), i, has_path = 0; + oyranos_temp_path = myAlloc (strlen(GetDirPrefix()) + - sizeof(OY_ICCDIRNAME) + 64); + sizeof(OY_ICCDIRNAME) + strlen(text) + 64); sprintf(oyranos_temp_path, "%s%sshare%scolor%s%s", text, DIR_SEPARATOR, DIR_SEPARATOR, DIR_SEPARATOR, OY_ICCDIRNAME); for(i = 0; i < n; ++i) @@ -210,13 +218,23 @@ int main (int argc, char **argv) if(temp) free(temp); } if(!has_path) - oyPathAdd( oyranos_temp_path ); - else { + { + struct stat status; + int r = 0; + + status.st_mode = 0; + r = stat (oyranos_temp_path, &status); + r = !r && + ((status.st_mode & S_IFMT) & S_IFDIR); + if(!r) + oyPathAdd( oyranos_temp_path ); + } else { free( oyranos_temp_path ); oyranos_temp_path = NULL; } } #endif +#endif SetDirPrefix( text ); fclose(fp); } @@ -483,7 +501,9 @@ int main (int argc, char **argv) /* remove a profile temporary path */ if(oyranos_temp_path) { +#if (OYRANOS_VERSION < 108) oyPathRemove( oyranos_temp_path ); +#endif free( oyranos_temp_path ); } #endif @@ -674,13 +694,14 @@ fl_initialise_locale( const char *domain // 1. get the locale info CFLocaleRef userLocaleRef = CFLocaleCopyCurrent(); CFStringRef cfstring = CFLocaleGetIdentifier( userLocaleRef ); - + CFIndex gr = 36; + char text[36]; + Boolean fehler = 0; + CFShow( cfstring ); // copy to a C buffer - CFIndex gr = 36; - char text[36]; - Boolean fehler = CFStringGetCString( cfstring, text, gr, kCFStringEncodingISOLatin1 ); + fehler = CFStringGetCString( cfstring, text, gr, kCFStringEncodingISOLatin1 ); if(fehler) { d_printf( "osX locale obtained: %s", text ); diff -up cinepaint-0.22-1/configure.in.oy19 cinepaint-0.22-1/configure.in --- cinepaint-0.22-1/configure.in.oy19 2009-03-09 15:39:36.000000000 +0100 +++ cinepaint-0.22-1/configure.in 2009-03-09 15:39:36.000000000 +0100 @@ -475,8 +475,8 @@ AC_ARG_ENABLE(print, [ --disable-print dnl Test for Oyranos; beku AC_PATH_PROG(OY_CONFIG, oyranos-config, no) if test "x$OY_CONFIG" != "xno"; then - OYRANOS_LIBS="-DHAVE_OY `$OY_CONFIG --ld_x_flags | sed s/-O.\//`" - OYRANOS_CFLAGS="-DHAVE_OY `$OY_CONFIG --cflags | sed s/-O.\//`" + OYRANOS_LIBS=" `$OY_CONFIG --ldflags` " + OYRANOS_CFLAGS="-DHAVE_OY `$OY_CONFIG --cflags` " OYRANOS="`$OY_CONFIG --version`" else AC_MSG_WARN([ Index: cinepaint.spec =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- cinepaint.spec 9 Mar 2009 16:44:35 -0000 1.15 +++ cinepaint.spec 9 Mar 2009 16:48:26 -0000 1.16 @@ -25,6 +25,7 @@ Patch9: cinepaint-0.22-1-underquoted.patch Patch10: cinepaint-0.22-gcc44.patch Patch11: icc_examin-0.46-default.patch +Patch12: cinepaint-0.22-oyranos19.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #ifnarch %{ix86} ppc @@ -99,15 +100,17 @@ %patch8 -p1 -b .gcc43_cine #Fix #450325 %patch9 -p1 -b .underquoted -%patch10 -p1 -b .gcc44 #Fix to prevent a multilibs problem touch -r cinepaint.m4.underquoted cinepaint.m4 +%patch10 -p1 -b .gcc44 %setup -q -D -T -a 1 -n cinepaint-%{cinever} pushd icc_examin-0.46 %patch11 -p1 -b .icc_def popd +%patch12 -p1 -b .oy19 + # Update bundled version of icc_examin rm -rf plug-ins/icc_examin/icc_examin cp -pR icc_examin-0.46 plug-ins/icc_examin/icc_examin @@ -167,10 +170,8 @@ %find_lang %{name} %find_lang cinepaint-script-fu %find_lang cinepaint-std-plugins -%find_lang icc_examin_cp cat cinepaint-script-fu.lang | grep lang >> %{name}.lang cat cinepaint-std-plugins.lang | grep lang >> %{name}.lang -cat icc_examin_cp.lang | grep lang >> %{name}.lang %clean rm -rf $RPM_BUILD_ROOT @@ -220,6 +221,8 @@ %changelog * Mon Mar 9 2009 kwizart < kwizart at gmail.com > - 0.22.1-12 - Fix for gcc44 +- backport oyranos 0.1.9 support +- Switch from freefont to dejavu-sans-fonts for icc_examin internal plug-in * Mon Feb 23 2009 Fedora Release Engineering - 0.22.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Mar 2009 16:44:35 -0000 1.1 +++ import.log 9 Mar 2009 16:48:26 -0000 1.2 @@ -1 +1,2 @@ cinepaint-0_22_1-12_fc10:HEAD:cinepaint-0.22.1-12.fc10.src.rpm:1236616951 +cinepaint-0_22_1-12_fc10:HEAD:cinepaint-0.22.1-12.fc10.src.rpm:1236617303 From kwizart at fedoraproject.org Mon Mar 9 16:51:41 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 9 Mar 2009 16:51:41 +0000 (UTC) Subject: rpms/cinepaint/devel cinepaint.spec,1.16,1.17 Message-ID: <20090309165141.0D04670034@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/cinepaint/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv780 Modified Files: cinepaint.spec Log Message: Prevent force-tag for non-built release Index: cinepaint.spec =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- cinepaint.spec 9 Mar 2009 16:48:26 -0000 1.16 +++ cinepaint.spec 9 Mar 2009 16:51:10 -0000 1.17 @@ -6,7 +6,7 @@ Name: cinepaint Version: %(echo %{cinever} |sed 's|-|.|') -Release: 12%{?dist} +Release: 12%{?dist}.1 Summary: CinePaint is a tool for manipulating images Group: Applications/Multimedia From pkgdb at fedoraproject.org Mon Mar 9 16:52:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 16:52:27 +0000 Subject: [pkgdb] sssd (Fedora, devel) updated by toshio Message-ID: <20090309165248.2B79E208547@bastion.fedora.phx.redhat.com> toshio approved watchbugzilla on sssd (Fedora devel) for jhrozek toshio approved watchcommits on sssd (Fedora devel) for jhrozek toshio approved commit on sssd (Fedora devel) for jhrozek toshio approved build on sssd (Fedora devel) for jhrozek toshio approved approveacls on sssd (Fedora devel) for jhrozek To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sssd From tbzatek at fedoraproject.org Mon Mar 9 16:51:52 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 9 Mar 2009 16:51:52 +0000 (UTC) Subject: rpms/nautilus-gdu/devel .cvsignore, 1.4, 1.5 nautilus-gdu.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <20090309165152.9535070034@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/nautilus-gdu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv960 Modified Files: .cvsignore nautilus-gdu.spec sources Log Message: * Mon Mar 9 2009 Tomas Bzatek - 0.2-git20090309.1 - Rebase to latest git Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus-gdu/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Mar 2009 15:00:15 -0000 1.4 +++ .cvsignore 9 Mar 2009 16:51:22 -0000 1.5 @@ -1 +1 @@ -nautilus-gdu-0.2.git20090304.tar.bz2 +nautilus-gdu-0.2.git20090309.tar.bz2 Index: nautilus-gdu.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-gdu/devel/nautilus-gdu.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nautilus-gdu.spec 4 Mar 2009 15:00:15 -0000 1.4 +++ nautilus-gdu.spec 9 Mar 2009 16:51:22 -0000 1.5 @@ -6,7 +6,7 @@ Name: nautilus-gdu Version: 0.2 -Release: git20090304.1%{?dist} +Release: git20090309.1%{?dist} Summary: Nautilus extension for disk formatting Group: Applications/File @@ -82,6 +82,9 @@ %changelog +* Mon Mar 9 2009 Tomas Bzatek - 0.2-git20090309.1 +- Rebase to latest git + * Wed Mar 4 2009 Tomas Bzatek - 0.2-git20090304.1 - Rebase to latest git Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus-gdu/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Mar 2009 15:00:15 -0000 1.4 +++ sources 9 Mar 2009 16:51:22 -0000 1.5 @@ -1 +1 @@ -8c4d3d074b3f6de1abf83ef1a9df2b8b nautilus-gdu-0.2.git20090304.tar.bz2 +44947632f7b7e7b781bf9653baa046cb nautilus-gdu-0.2.git20090309.tar.bz2 From ovasik at fedoraproject.org Mon Mar 9 16:59:14 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Mon, 9 Mar 2009 16:59:14 +0000 (UTC) Subject: rpms/jadetex/devel jadetex.spec,1.21,1.22 Message-ID: <20090309165914.2DE5A70034@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/jadetex/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4057 Modified Files: jadetex.spec Log Message: run restorecon -R /usr/share/texmf/web2c in post to prevent mishandled context (#448101) Index: jadetex.spec =================================================================== RCS file: /cvs/extras/rpms/jadetex/devel/jadetex.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- jadetex.spec 25 Feb 2009 08:34:54 -0000 1.21 +++ jadetex.spec 9 Mar 2009 16:58:43 -0000 1.22 @@ -1,6 +1,6 @@ Name: jadetex Version: 3.13 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Publishing Summary: TeX macros used by Jade TeX output @@ -12,6 +12,7 @@ Requires: tetex >= 3.0 tetex-latex >= 3.0 Requires: jade Requires(post): tetex >= 3.0 +Requires(post): policycoreutils BuildRequires: unzip tetex-latex tetex tetex-fonts BuildRoot: %{_tmppath}/%{name}-%{version} @@ -62,6 +63,7 @@ %post [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : %{_bindir}/env - PATH=$PATH:%{_bindir} fmtutil-sys --cnffile %{_datadir}/texmf/tex/jadetex/jadefmtutil.cnf --all --fmtdir %{_datadir}/texmf/web2c > /dev/null 2>&1 +restorecon -R /usr/share/texmf/web2c exit 0 %postun @@ -92,6 +94,10 @@ exit 0 %changelog +* Mon Mar 9 2009 Ondrej Vasik 3.13-4 +- run restorecon -R /usr/share/texmf/web2c in post to prevent + mishandled context (#448101) + * Wed Feb 25 2009 Fedora Release Engineering - 3.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From twaugh at fedoraproject.org Mon Mar 9 17:00:40 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Mon, 9 Mar 2009 17:00:40 +0000 (UTC) Subject: rpms/system-config-printer/F-10 system-config-printer-git-1.0.x.patch, NONE, 1.1 system-config-printer.spec, 1.238, 1.239 Message-ID: <20090309170040.DEBC670034@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4483 Modified Files: system-config-printer.spec Added Files: system-config-printer-git-1.0.x.patch Log Message: * Mon Mar 9 2009 Tim Waugh 1.0.15-2 - Added patch for 1.0.x changes since 1.0.15: - Fixed locale save/restore in cupshelpers (bug #489313). - Troubleshoot: include local printer attributes in diagnostic output. - Don't allow LPD probe with an empty hostname. - Fixed the LPD probe. - Updated translations. system-config-printer-git-1.0.x.patch: --- NEW FILE system-config-printer-git-1.0.x.patch --- diff -U0 system-config-printer-1.0.15/ChangeLog.git-1.0.x system-config-printer-1.0.15/ChangeLog --- system-config-printer-1.0.15/ChangeLog.git-1.0.x 2009-02-18 15:47:29.000000000 +0000 +++ system-config-printer-1.0.15/ChangeLog 2009-03-09 16:03:38.000000000 +0000 @@ -0,0 +1,25 @@ +2009-03-09 Tim Waugh + + * cupshelpers/cupshelpers.py (Printer._expand_flags): Use + setlocale() to save current LC_CTYPE value, not getlocale() (bug + #489313). + +2009-03-03 Tim Waugh + + * troubleshoot/CheckPrinterSanity.py (CheckPrinterSanity.display): + Include local printer attributes in diagnostic output. + +2009-03-02 Tim Waugh + + * system-config-printer.py + (NewPrinterGUI.on_tvNPDeviceURIs_cursor_changed): Clear LPD + drop-down list. + +2009-02-25 Tim Waugh + + * system-config-printer.py + (NewPrinterGUI.on_tvNPDeviceURIs_cursor_changed): Set initial + sensitivity of LPD probe button. + (NewPrinterGUI.on_cmbentNPTLpdHost_changed): Adjust button + sensitivity when hostname is changed. + diff -up system-config-printer-1.0.15/cupshelpers/cupshelpers.py.git-1.0.x system-config-printer-1.0.15/cupshelpers/cupshelpers.py --- system-config-printer-1.0.15/cupshelpers/cupshelpers.py.git-1.0.x 2009-02-18 15:46:02.000000000 +0000 +++ system-config-printer-1.0.15/cupshelpers/cupshelpers.py 2009-03-09 16:03:38.000000000 +0000 @@ -52,7 +52,7 @@ class Printer: prefix_length = len(prefix) # Use the C locale for lower() (trac #151). - current_ctype = locale.getlocale (locale.LC_CTYPE) + current_ctype = locale.setlocale (locale.LC_CTYPE) locale.setlocale (locale.LC_CTYPE, "C") # loop over cups constants diff -up system-config-printer-1.0.15/po/es.po.git-1.0.x system-config-printer-1.0.15/po/es.po --- system-config-printer-1.0.15/po/es.po.git-1.0.x 2009-02-18 16:11:35.000000000 +0000 +++ system-config-printer-1.0.15/po/es.po 2009-03-09 16:03:38.000000000 +0000 @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: system-config-printer.trunk.es\n" "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n" -"POT-Creation-Date: 2009-02-11 15:01+0000\n" -"PO-Revision-Date: 2009-01-15 13:35-0300\n" +"POT-Creation-Date: 2009-02-17 07:20+0000\n" +"PO-Revision-Date: 2009-02-21 18:48-0300\n" "Last-Translator: Domingo Becker \n" "Language-Team: Fedora Spanish \n" "MIME-Version: 1.0\n" @@ -54,23 +54,20 @@ msgid "Browse Servers" msgstr "Navegar Servidores" #: ../AdvancedServerSettings.py:93 -msgid "" -"Usually print servers broadcast their queues. Specify print servers below " -"to periodically ask for queues instead." -msgstr "" -"Normalmente los servidores de impresi??n dan a conocer sus colas de " -"impresi??n. Especifique los servidores de impresi??n abajo a los que " -"peri??dicamente se les preguntar?? acerca de la cola de impresi??n." +msgid "Usually print servers broadcast their queues. Specify print servers below to periodically ask for queues instead." +msgstr "Normalmente los servidores de impresi??n dan a conocer sus colas de impresi??n. Especifique los servidores de impresi??n abajo a los que peri??dicamente se les preguntar?? acerca de la cola de impresi??n." #: ../AdvancedServerSettings.py:225 msgid "Enter IP address" msgstr "Ingrese la direcci??n IP" -#: ../authconn.py:31 ../system-config-printer.glade.h:253 +#: ../authconn.py:31 +#: ../system-config-printer.glade.h:253 msgid "Username:" msgstr "Nombre de Usuario:" -#: ../authconn.py:32 ../system-config-printer.glade.h:187 +#: ../authconn.py:32 +#: ../system-config-printer.glade.h:187 msgid "Password:" msgstr "Contrase??a:" @@ -86,16 +83,21 @@ msgstr "Autenticaci??n" msgid "Operation canceled" msgstr "Operaci??n cancelada" -#: ../authconn.py:270 ../authconn.py:272 ../errordialogs.py:77 ../pysmb.py:80 +#: ../authconn.py:270 +#: ../authconn.py:272 +#: ../errordialogs.py:77 +#: ../pysmb.py:80 #: ../pysmb.py:82 msgid "Not authorized" msgstr "No autorizado" -#: ../authconn.py:273 ../pysmb.py:83 +#: ../authconn.py:273 +#: ../pysmb.py:83 msgid "The password may be incorrect." msgstr "La contrase??a puede ser incorrecta." -#: ../errordialogs.py:68 ../errordialogs.py:82 +#: ../errordialogs.py:68 +#: ../errordialogs.py:82 msgid "CUPS server error" msgstr "Error del servidor CUPS" @@ -104,18 +106,15 @@ msgstr "Error del servidor CUPS" # ../util/printconf_gui.py:1812 ../util/printconf_gui.py:1829 # ../util/printconf_gui.py:1863 ../util/printconf_tui.py:1805 # ../util/printconf_gui.py:1942 ../util/printconf_tui.py:1834 -#: ../errordialogs.py:69 ../troubleshoot/PrintTestPage.py:327 +#: ../errordialogs.py:69 +#: ../troubleshoot/PrintTestPage.py:327 #, python-format msgid "There was an error during the CUPS operation: '%s'." msgstr "Se ha producido un error en CUPS durante la operaci??n: '%s'." #: ../errordialogs.py:78 -msgid "" -"The password may be incorrect, or the server may be configured to deny " -"remote administration." -msgstr "" -"La contrase??a puede ser incorrecta, o el servidor fue configurado para negar " -"la administraci??n remota." +msgid "The password may be incorrect, or the server may be configured to deny remote administration." +msgstr "La contrase??a puede ser incorrecta, o el servidor fue configurado para negar la administraci??n remota." #: ../errordialogs.py:84 msgid "Bad request" @@ -137,7 +136,8 @@ msgstr "Se requiere actualizaci??n" msgid "Server error" msgstr "Error del servidor" -#: ../errordialogs.py:94 ../system-config-printer.py:828 +#: ../errordialogs.py:94 +#: ../system-config-printer.py:828 msgid "Not connected" msgstr "No conectado" @@ -151,7 +151,8 @@ msgstr "estado %s" msgid "There was an HTTP error: %s." msgstr "Hubo un error HTTP: %s." -#: ../jobviewer.py:184 ../troubleshoot/PrintTestPage.py:77 +#: ../jobviewer.py:184 +#: ../troubleshoot/PrintTestPage.py:77 msgid "Job" msgstr "Trabajo" @@ -165,16 +166,21 @@ msgstr "Trabajo" msgid "User" msgstr "Usuario" -#: ../jobviewer.py:186 ../troubleshoot/PrintTestPage.py:81 +#: ../jobviewer.py:186 +#: ../troubleshoot/PrintTestPage.py:81 msgid "Document" msgstr "Documento" # ../gui/printconf-gui.glade.str:141 # ../gui/printconf-gui.glade.str:153 # ../gui/printconf-gui.glade.str:153 -#: ../jobviewer.py:187 ../jobviewer.py:251 ../my-default-printer.py:158 -#: ../system-config-printer.py:308 ../system-config-printer.py:924 -#: ../system-config-printer.py:3206 ../troubleshoot/PrintTestPage.py:79 +#: ../jobviewer.py:187 +#: ../jobviewer.py:251 +#: ../my-default-printer.py:158 +#: ../system-config-printer.py:308 +#: ../system-config-printer.py:924 +#: ../system-config-printer.py:3206 +#: ../troubleshoot/PrintTestPage.py:79 msgid "Printer" msgstr "Impresora" @@ -186,7 +192,8 @@ msgstr "Tama??o" msgid "Time submitted" msgstr "Hora de ingreso" -#: ../jobviewer.py:190 ../troubleshoot/PrintTestPage.py:82 +#: ../jobviewer.py:190 +#: ../troubleshoot/PrintTestPage.py:82 msgid "Status" msgstr "Estado" @@ -212,15 +219,23 @@ msgstr "Estado de impresi??n del documen msgid "Message" msgstr "Mensaje" -#: ../jobviewer.py:411 ../jobviewer.py:477 ../jobviewer.py:478 -#: ../jobviewer.py:531 ../jobviewer.py:561 ../jobviewer.py:645 -#: ../system-config-printer.py:1955 ../troubleshoot/ChooseNetworkPrinter.py:95 +#: ../jobviewer.py:411 +#: ../jobviewer.py:477 +#: ../jobviewer.py:478 [...6216 lines suppressed...] #~ msgstr "%s-lpd-k?? %s@%s" - #~ msgid "%s SMB queue on share %s" #~ msgstr "%s-SMB-k?? p?? utdelningen %s" - #~ msgid "%s Novell queue %s on server %s" #~ msgstr "%s-Novell-k?? %s p?? servern %s" - #~ msgid "%s JetDirect queue %s:%s" #~ msgstr "%s-JetDirect-k?? %s:%s" - #~ msgid "%s unknown queue type %s" #~ msgstr "%s ok??nd k??typ %s" - #~ msgid "" #~ "This queue is in an unknown format.\n" #~ "Cannot Edit." #~ msgstr "" #~ "Denna k?? ??r i ett ok??nt format.\n" #~ "Kan inte redigera." - #~ msgid "" #~ "You must select a valid name.\n" #~ "Use only the characters -,a-z,A-Z,0-9,_ please." #~ msgstr "" #~ "Du m??ste ange ett giltigt namn.\n" #~ "Anv??nd endast tecknen -,a-z,A-Z,0-9,_ ??r du sn??ll." - #~ msgid "Another print queue is already using \"%s\" as a name." #~ msgstr "En annan utskriftsk?? anv??nder redan \"%s\" som namn." - #~ msgid "You must select a valid name for an alias.\n" #~ msgstr "Du m??ste v??lja ett giltigt namn p?? ett alias.\n" - #~ msgid "" #~ "You do not seem to have the samba client installed.\n" #~ "You will not be able to print to SMB servers.\n" @@ -4183,7 +3594,6 @@ msgstr "V??lj standardskrivare" #~ "Du verkar inte ha samba-klienten installerad.\n" #~ "Du kommer inte att kunna skriva ut till SMB-servrar.\n" #~ "??verv??g att installera rpm-paketet \"samba-client\"." - #~ msgid "" #~ "You do not seem to have the nprint program installed.\n" #~ "You will not be able to print to NCP servers.\n" @@ -4192,30 +3602,24 @@ msgstr "V??lj standardskrivare" #~ "Du verkar inte ha programmet nprint installerat.\n" #~ "Du kommer inte att kunna skriva ut till NCP-servrar.\n" #~ "??verv??g att installera rpm-paketet \"ncpfs\"." - #~ msgid "" #~ "Exiting will discard your unsaved changes.\n" #~ "Continue?" #~ msgstr "" #~ "Att avsluta kommer att f??rkasta alla osparade ??ndringar.\n" #~ "Forts??tta?" - #~ msgid "" #~ "FIXME:%s\n" #~ "This feature is incomplete, and under development." #~ msgstr "" #~ "FIXME:%s\n" #~ "Denna finess ??r ofullst??ndig och under utveckling." - #~ msgid "Download Printer Driver" #~ msgstr "H??mta skrivardrivrutin" - #~ msgid "Installed Options" #~ msgstr "Installerade alternativ" - #~ msgid "Printers to be members of this Class" #~ msgstr "Skrivare som ska vara medlemmar av denna klass" - #~ msgid "Select Connection" #~ msgstr "V??lj anslutning" @@ -4772,3 +4176,4 @@ msgstr "V??lj standardskrivare" #, fuzzy #~ msgid "Unknown printer" #~ msgstr "Ok??nd" + diff -up system-config-printer-1.0.15/probe_printer.py.git-1.0.x system-config-printer-1.0.15/probe_printer.py --- system-config-printer-1.0.15/probe_printer.py.git-1.0.x 2009-01-12 16:46:56.000000000 +0000 +++ system-config-printer-1.0.15/probe_printer.py 2009-03-09 16:03:38.000000000 +0000 @@ -1,8 +1,8 @@ ## system-config-printer -## Copyright (C) 2006, 2007, 2008 Red Hat, Inc. +## Copyright (C) 2006, 2007, 2008, 2009 Red Hat, Inc. ## Copyright (C) 2006 Florian Festi -## Copyright (C) 2007, 2008 Tim Waugh +## Copyright (C) 2007, 2008, 2009 Tim Waugh ## 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 @@ -61,7 +61,7 @@ class LpdServer: print name try: - s.send('\0x02%s\n' % name) # cmd send job to queue + s.send('\2%s\n' % name) # cmd send job to queue data = s.recv(1024) # receive status print repr(data) except socket.error, msg: @@ -73,9 +73,9 @@ class LpdServer: return False - if len(data)>0 and data[0]==0: + if len(data)>0 and ord(data[0])==0: try: - s.send('\0x01\n') # abort job again + s.send('\1\n') # abort job again s.close () except: pass diff -up system-config-printer-1.0.15/system-config-printer.glade.git-1.0.x system-config-printer-1.0.15/system-config-printer.glade --- system-config-printer-1.0.15/system-config-printer.glade.git-1.0.x 2009-02-18 15:46:03.000000000 +0000 +++ system-config-printer-1.0.15/system-config-printer.glade 2009-03-09 16:03:38.000000000 +0000 @@ -1795,7 +1795,7 @@ - + 1 diff -up system-config-printer-1.0.15/system-config-printer.py.git-1.0.x system-config-printer-1.0.15/system-config-printer.py --- system-config-printer-1.0.15/system-config-printer.py.git-1.0.x 2009-02-18 15:46:03.000000000 +0000 +++ system-config-printer-1.0.15/system-config-printer.py 2009-03-09 16:03:38.000000000 +0000 @@ -2678,7 +2678,8 @@ class NewPrinterGUI(GtkGUI): "tvNPDeviceURIs", "cmbNPTSerialBaud", "cmbNPTSerialParity", "cmbNPTSerialBits", "cmbNPTSerialFlow", - "cmbentNPTLpdHost", "cmbentNPTLpdQueue", + "btnNPTLpdProbe", + "cmbentNPTLpdHost", "cmbentNPTLpdQueue", "entNPTIPPHostname", "btnIPPFindQueue", "lblIPPURI", "entNPTIPPQueuename", "btnIPPVerify", @@ -4602,7 +4603,11 @@ class NewPrinterGUI(GtkGUI): self.entNPTIPPQueuename.show() self.lblIPPURI.hide() elif device.type=="lpd": - if device.uri.startswith ("lpd"): + self.cmbentNPTLpdHost.child.set_text ('') + self.cmbentNPTLpdQueue.child.set_text ('') + self.cmbentNPTLpdQueue.get_model().clear () + self.btnNPTLpdProbe.set_sensitive (False) + if len (device.uri) > 6: host = device.uri[6:] i = host.find ("/") if i != -1: @@ -4613,8 +4618,7 @@ class NewPrinterGUI(GtkGUI): self.cmbentNPTLpdHost.child.set_text (host) self.cmbentNPTLpdQueue.child.set_text (printer) location = host - elif device.uri == "lpd": - pass + self.btnNPTLpdProbe.set_sensitive (True) elif device.uri == "smb": self.entSMBURI.set_text('') self.btnSMBVerify.set_sensitive(False) @@ -4641,6 +4645,11 @@ class NewPrinterGUI(GtkGUI): self.setNPButtons() + def on_cmbentNPTLpdHost_changed(self, cmbent): + hostname = cmbent.get_active_text() + self.btnNPTLpdProbe.set_sensitive (len (hostname) > 0) + self.setNPButtons() + def on_btnNPTLpdProbe_clicked(self, button): # read hostname, probe, fill printer names hostname = self.cmbentNPTLpdHost.get_active_text() diff -up system-config-printer-1.0.15/troubleshoot/CheckPrinterSanity.py.git-1.0.x system-config-printer-1.0.15/troubleshoot/CheckPrinterSanity.py --- system-config-printer-1.0.15/troubleshoot/CheckPrinterSanity.py.git-1.0.x 2009-02-18 15:46:03.000000000 +0000 +++ system-config-printer-1.0.15/troubleshoot/CheckPrinterSanity.py 2009-03-09 16:03:38.000000000 +0000 @@ -2,8 +2,8 @@ ## Printing troubleshooter -## Copyright (C) 2008 Red Hat, Inc. -## Copyright (C) 2008 Tim Waugh +## Copyright (C) 2008, 2009 Red Hat, Inc. +## Copyright (C) 2008, 2009 Tim Waugh ## 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 @@ -55,6 +55,9 @@ class CheckPrinterSanity(Question): classes = c.getClasses () queue = classes[name] self.answers['cups_class_dict'] = queue + + attrs = c.getPrinterAttributes(name) + self.answers['local_cups_queue_attributes'] = attrs except: pass Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v retrieving revision 1.238 retrieving revision 1.239 diff -u -r1.238 -r1.239 --- system-config-printer.spec 18 Feb 2009 17:25:25 -0000 1.238 +++ system-config-printer.spec 9 Mar 2009 17:00:10 -0000 1.239 @@ -7,13 +7,14 @@ Summary: A printer administration tool Name: system-config-printer Version: 1.0.15 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base Source0: http://cyberelk.net/tim/data/system-config-printer/1.0.x/system-config-printer-%{version}.tar.bz2 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2 +Patch1: system-config-printer-git-1.0.x.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -60,6 +61,7 @@ %prep %setup -q -a 1 -a 2 +%patch1 -p1 -b .git-1.0.x %build %configure @@ -149,6 +151,15 @@ exit 0 %changelog +* Mon Mar 9 2009 Tim Waugh 1.0.15-2 +- Added patch for 1.0.x changes since 1.0.15: + - Fixed locale save/restore in cupshelpers (bug #489313). + - Troubleshoot: include local printer attributes in diagnostic + output. + - Don't allow LPD probe with an empty hostname. + - Fixed the LPD probe. + - Updated translations. + * Wed Feb 18 2009 Tim Waugh 1.0.15-1 - Updated to 1.0.15: - Perform lowercase operations in a locale-independent manner From cweyl at fedoraproject.org Mon Mar 9 17:02:07 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 9 Mar 2009 17:02:07 +0000 (UTC) Subject: rpms/perl-local-lib/devel import.log, NONE, 1.1 perl-local-lib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309170207.E770370034@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-local-lib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5330/devel Modified Files: .cvsignore sources Added Files: import.log perl-local-lib.spec Log Message: initial import --- NEW FILE import.log --- perl-local-lib-1_003002-1_fc10:HEAD:perl-local-lib-1.003002-1.fc10.src.rpm:1236618084 --- NEW FILE perl-local-lib.spec --- Name: perl-local-lib Version: 1.003002 Release: 1%{?dist} # lib/local/lib.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Create and use a local lib/ for perl modules Source: http://search.cpan.org/CPAN/authors/id/A/AP/APEIRON/local-lib-%{version}.tar.gz Url: http://search.cpan.org/dist/local-lib BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) >= 6.31 BuildRequires: perl(CPAN) >= 1.80 BuildRequires: perl(ExtUtils::CBuilder) BuildRequires: perl(ExtUtils::ParseXS) BuildRequires: perl(Module::Build) >= 0.28 # testing... BuildRequires: perl(Test::More) %description This module provides a quick, convenient way of bootstrapping a user- local Perl module library located within the user's home directory. It also constructs and prints out for the user the list of environment variables using the syntax appropriate for the user's current shell (as specified by the 'SHELL' environment variable), suitable for directly adding to one's shell configuration file. More generally, local::lib allows for the bootstrapping and usage of a directory containing Perl modules outside of Perl's '@INC'. This makes it easier to ship an application with an app-specific copy of a Perl module, or collection of modules. Useful in cases like when an upstream maintainer hasn't applied a patch to a module of theirs that you need for your application. %prep %setup -q -n local-lib-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Sun Mar 08 2009 Chris Weyl 1.003002-1 - submission * Sun Mar 08 2009 Chris Weyl 1.003002-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-local-lib/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:13:47 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:01:37 -0000 1.2 @@ -0,0 +1 @@ +local-lib-1.003002.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-local-lib/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:13:47 -0000 1.1 +++ sources 9 Mar 2009 17:01:37 -0000 1.2 @@ -0,0 +1 @@ +e3988eb5f0dff67b4bca98fe0cc3790d local-lib-1.003002.tar.gz From kyle at fedoraproject.org Mon Mar 9 17:02:28 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Mon, 9 Mar 2009 17:02:28 +0000 (UTC) Subject: rpms/kernel/devel patch-2.6.29-rc7-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.1028, 1.1029 kernel.spec, 1.1397, 1.1398 sources, 1.989, 1.990 upstream, 1.901, 1.902 drm-fix-setmaster-deadlock.patch, 1.1, NONE linux-2.6-ext4-inode-alloc-race.patch, 1.1, NONE Message-ID: <20090309170228.5AC8770034@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5600 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.29-rc7-git2.bz2.sign Removed Files: drm-fix-setmaster-deadlock.patch linux-2.6-ext4-inode-alloc-race.patch Log Message: * Mon Mar 09 2009 Kyle McMartin - Linux 2.6.29-rc7-git2 --- NEW FILE patch-2.6.29-rc7-git2.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBJtFy3yGugalF9Dw4RAivuAJ9UPOzxyafDeN7oHvE2jLcoCls/ewCeJiF8 KyTqheMeta4Y+HdJu3bspPM= =cbgF -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.1028 retrieving revision 1.1029 diff -u -r1.1028 -r1.1029 --- .cvsignore 4 Mar 2009 03:50:51 -0000 1.1028 +++ .cvsignore 9 Mar 2009 17:01:56 -0000 1.1029 @@ -6,3 +6,4 @@ kernel-2.6.28 linux-2.6.28.tar.bz2 patch-2.6.29-rc7.bz2 +patch-2.6.29-rc7-git2.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1397 retrieving revision 1.1398 diff -u -r1.1397 -r1.1398 --- kernel.spec 9 Mar 2009 05:51:34 -0000 1.1397 +++ kernel.spec 9 Mar 2009 17:01:57 -0000 1.1398 @@ -58,7 +58,7 @@ # The rc snapshot level %define rcrev 7 # The git snapshot level -%define gitrev 0 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -102,7 +102,7 @@ %define doc_build_fail true %endif -%define rawhide_skip_docs 0 +%define rawhide_skip_docs 1 %if 0%{?rawhide_skip_docs} %define with_doc 0 %endif @@ -651,7 +651,6 @@ Patch1814: drm-nouveau.patch Patch1816: drm-no-gem-on-i8xx.patch Patch1818: drm-i915-resume-force-mode.patch -Patch1819: drm-fix-setmaster-deadlock.patch # kludge to make ich9 e1000 work Patch2000: linux-2.6-e1000-ich9.patch @@ -680,7 +679,6 @@ Patch2900: linux-2.6-v4l-dvb-update.patch # ext4 fixes -Patch2910: linux-2.6-ext4-inode-alloc-race.patch Patch9001: revert-fix-modules_install-via-nfs.patch @@ -1096,7 +1094,6 @@ # # ext4 -ApplyPatch linux-2.6-ext4-inode-alloc-race.patch # xfs @@ -1201,7 +1198,6 @@ #ApplyPatch drm-radeon-pm.patch ApplyPatch drm-no-gem-on-i8xx.patch ApplyPatch drm-i915-resume-force-mode.patch -ApplyPatch drm-fix-setmaster-deadlock.patch # linux1394 git patches ApplyPatch linux-2.6-firewire-git-update.patch @@ -1810,6 +1806,9 @@ # and build. %changelog +* Mon Mar 09 2009 Kyle McMartin +- Linux 2.6.29-rc7-git2 + * Mon Mar 09 2009 Dave Airlie - drm-next.patch: fix r600 writeback test Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.989 retrieving revision 1.990 diff -u -r1.989 -r1.990 --- sources 4 Mar 2009 03:50:51 -0000 1.989 +++ sources 9 Mar 2009 17:01:57 -0000 1.990 @@ -1,2 +1,3 @@ d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2 9404c2ead603a80a3aad6361b5fc5413 patch-2.6.29-rc7.bz2 +35d497f3dd989d00ffbcf379fc3ea5ac patch-2.6.29-rc7-git2.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.901 retrieving revision 1.902 diff -u -r1.901 -r1.902 --- upstream 4 Mar 2009 03:50:51 -0000 1.901 +++ upstream 9 Mar 2009 17:01:57 -0000 1.902 @@ -1,2 +1,3 @@ linux-2.6.28.tar.bz2 patch-2.6.29-rc7.bz2 +patch-2.6.29-rc7-git2.bz2 --- drm-fix-setmaster-deadlock.patch DELETED --- --- linux-2.6-ext4-inode-alloc-race.patch DELETED --- From cweyl at fedoraproject.org Mon Mar 9 17:02:27 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 9 Mar 2009 17:02:27 +0000 (UTC) Subject: rpms/perl-Parse-BACKPAN-Packages/devel import.log, NONE, 1.1 perl-Parse-BACKPAN-Packages.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309170227.E152D70034@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5641/devel Modified Files: .cvsignore sources Added Files: import.log perl-Parse-BACKPAN-Packages.spec Log Message: initial import --- NEW FILE import.log --- perl-Parse-BACKPAN-Packages-0_34-1_fc10:HEAD:perl-Parse-BACKPAN-Packages-0.34-1.fc10.src.rpm:1236618104 --- NEW FILE perl-Parse-BACKPAN-Packages.spec --- Name: perl-Parse-BACKPAN-Packages Version: 0.34 Release: 1%{?dist} # lib/Parse/BACKPAN/Packages.pm -> GPL+ or Artistic # lib/Parse/BACKPAN/Packages/Distribution.pm -> GPL+ or Artistic # lib/Parse/BACKPAN/Packages/File.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Provide an index of BACKPAN Source: http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/Parse-BACKPAN-Packages-%{version}.tar.gz Url: http://search.cpan.org/dist/Parse-BACKPAN-Packages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(App::Cache) BuildRequires: perl(Class::Accessor::Fast) BuildRequires: perl(Compress::Zlib) BuildRequires: perl(CPAN::DistnameInfo) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(IO::Zlib) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(Module::Build::Compat) # testing... BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) # 'use base' strikes again... Requires: perl(Class::Accessor::Chained::Fast) %description The Comprehensive Perl Archive Network (CPAN) is a very useful collection of Perl code. However, in order to keep CPAN relatively small, authors of modules can delete older versions of modules to only let CPAN have the latest version of a module. BACKPAN is where these deleted modules are backed up. It's more like a full CPAN mirror, only without the deletions. This module provides an index of BACKPAN and some handy functions. The data is fetched from the net and cached for an hour. %prep %setup -q -n Parse-BACKPAN-Packages-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check # tests require network access %{?_with_network_tests: make test } %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Mar 05 2009 Chris Weyl 0.34-1 - submission - conditionalize tests; they require network access * Thu Mar 05 2009 Chris Weyl 0.34-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:12:25 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:01:57 -0000 1.2 @@ -0,0 +1 @@ +Parse-BACKPAN-Packages-0.34.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:12:26 -0000 1.1 +++ sources 9 Mar 2009 17:01:57 -0000 1.2 @@ -0,0 +1 @@ +278a232a6b987e4ff0db45f5ac191f3f Parse-BACKPAN-Packages-0.34.tar.gz From cweyl at fedoraproject.org Mon Mar 9 17:03:01 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 9 Mar 2009 17:03:01 +0000 (UTC) Subject: rpms/perl-local-lib/F-10 import.log, NONE, 1.1 perl-local-lib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309170301.8F8B770034@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-local-lib/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5981/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-local-lib.spec Log Message: initial import --- NEW FILE import.log --- perl-local-lib-1_003002-1_fc10:F-10:perl-local-lib-1.003002-1.fc10.src.rpm:1236618136 --- NEW FILE perl-local-lib.spec --- Name: perl-local-lib Version: 1.003002 Release: 1%{?dist} # lib/local/lib.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Create and use a local lib/ for perl modules Source: http://search.cpan.org/CPAN/authors/id/A/AP/APEIRON/local-lib-%{version}.tar.gz Url: http://search.cpan.org/dist/local-lib BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) >= 6.31 BuildRequires: perl(CPAN) >= 1.80 BuildRequires: perl(ExtUtils::CBuilder) BuildRequires: perl(ExtUtils::ParseXS) BuildRequires: perl(Module::Build) >= 0.28 # testing... BuildRequires: perl(Test::More) %description This module provides a quick, convenient way of bootstrapping a user- local Perl module library located within the user's home directory. It also constructs and prints out for the user the list of environment variables using the syntax appropriate for the user's current shell (as specified by the 'SHELL' environment variable), suitable for directly adding to one's shell configuration file. More generally, local::lib allows for the bootstrapping and usage of a directory containing Perl modules outside of Perl's '@INC'. This makes it easier to ship an application with an app-specific copy of a Perl module, or collection of modules. Useful in cases like when an upstream maintainer hasn't applied a patch to a module of theirs that you need for your application. %prep %setup -q -n local-lib-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Sun Mar 08 2009 Chris Weyl 1.003002-1 - submission * Sun Mar 08 2009 Chris Weyl 1.003002-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-local-lib/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:13:47 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:02:31 -0000 1.2 @@ -0,0 +1 @@ +local-lib-1.003002.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-local-lib/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:13:47 -0000 1.1 +++ sources 9 Mar 2009 17:02:31 -0000 1.2 @@ -0,0 +1 @@ +e3988eb5f0dff67b4bca98fe0cc3790d local-lib-1.003002.tar.gz From cweyl at fedoraproject.org Mon Mar 9 17:03:18 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 9 Mar 2009 17:03:18 +0000 (UTC) Subject: rpms/perl-Parse-BACKPAN-Packages/F-10 import.log, NONE, 1.1 perl-Parse-BACKPAN-Packages.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309170318.11DCC70034@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6297/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-Parse-BACKPAN-Packages.spec Log Message: initial import --- NEW FILE import.log --- perl-Parse-BACKPAN-Packages-0_34-1_fc10:F-10:perl-Parse-BACKPAN-Packages-0.34-1.fc10.src.rpm:1236618155 --- NEW FILE perl-Parse-BACKPAN-Packages.spec --- Name: perl-Parse-BACKPAN-Packages Version: 0.34 Release: 1%{?dist} # lib/Parse/BACKPAN/Packages.pm -> GPL+ or Artistic # lib/Parse/BACKPAN/Packages/Distribution.pm -> GPL+ or Artistic # lib/Parse/BACKPAN/Packages/File.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Provide an index of BACKPAN Source: http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/Parse-BACKPAN-Packages-%{version}.tar.gz Url: http://search.cpan.org/dist/Parse-BACKPAN-Packages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(App::Cache) BuildRequires: perl(Class::Accessor::Fast) BuildRequires: perl(Compress::Zlib) BuildRequires: perl(CPAN::DistnameInfo) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(IO::Zlib) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(Module::Build::Compat) # testing... BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) # 'use base' strikes again... Requires: perl(Class::Accessor::Chained::Fast) %description The Comprehensive Perl Archive Network (CPAN) is a very useful collection of Perl code. However, in order to keep CPAN relatively small, authors of modules can delete older versions of modules to only let CPAN have the latest version of a module. BACKPAN is where these deleted modules are backed up. It's more like a full CPAN mirror, only without the deletions. This module provides an index of BACKPAN and some handy functions. The data is fetched from the net and cached for an hour. %prep %setup -q -n Parse-BACKPAN-Packages-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check # tests require network access %{?_with_network_tests: make test } %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Mar 05 2009 Chris Weyl 0.34-1 - submission - conditionalize tests; they require network access * Thu Mar 05 2009 Chris Weyl 0.34-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:12:25 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:02:47 -0000 1.2 @@ -0,0 +1 @@ +Parse-BACKPAN-Packages-0.34.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:12:26 -0000 1.1 +++ sources 9 Mar 2009 17:02:47 -0000 1.2 @@ -0,0 +1 @@ +278a232a6b987e4ff0db45f5ac191f3f Parse-BACKPAN-Packages-0.34.tar.gz From cweyl at fedoraproject.org Mon Mar 9 17:03:50 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 9 Mar 2009 17:03:50 +0000 (UTC) Subject: rpms/perl-local-lib/F-9 import.log, NONE, 1.1 perl-local-lib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309170350.0384D70034@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-local-lib/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6751/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-local-lib.spec Log Message: initial import --- NEW FILE import.log --- perl-local-lib-1_003002-1_fc10:F-9:perl-local-lib-1.003002-1.fc10.src.rpm:1236618187 --- NEW FILE perl-local-lib.spec --- Name: perl-local-lib Version: 1.003002 Release: 1%{?dist} # lib/local/lib.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Create and use a local lib/ for perl modules Source: http://search.cpan.org/CPAN/authors/id/A/AP/APEIRON/local-lib-%{version}.tar.gz Url: http://search.cpan.org/dist/local-lib BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) >= 6.31 BuildRequires: perl(CPAN) >= 1.80 BuildRequires: perl(ExtUtils::CBuilder) BuildRequires: perl(ExtUtils::ParseXS) BuildRequires: perl(Module::Build) >= 0.28 # testing... BuildRequires: perl(Test::More) %description This module provides a quick, convenient way of bootstrapping a user- local Perl module library located within the user's home directory. It also constructs and prints out for the user the list of environment variables using the syntax appropriate for the user's current shell (as specified by the 'SHELL' environment variable), suitable for directly adding to one's shell configuration file. More generally, local::lib allows for the bootstrapping and usage of a directory containing Perl modules outside of Perl's '@INC'. This makes it easier to ship an application with an app-specific copy of a Perl module, or collection of modules. Useful in cases like when an upstream maintainer hasn't applied a patch to a module of theirs that you need for your application. %prep %setup -q -n local-lib-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Sun Mar 08 2009 Chris Weyl 1.003002-1 - submission * Sun Mar 08 2009 Chris Weyl 1.003002-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-local-lib/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:13:47 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:03:19 -0000 1.2 @@ -0,0 +1 @@ +local-lib-1.003002.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-local-lib/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:13:47 -0000 1.1 +++ sources 9 Mar 2009 17:03:19 -0000 1.2 @@ -0,0 +1 @@ +e3988eb5f0dff67b4bca98fe0cc3790d local-lib-1.003002.tar.gz From cweyl at fedoraproject.org Mon Mar 9 17:04:05 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Mon, 9 Mar 2009 17:04:05 +0000 (UTC) Subject: rpms/perl-Parse-BACKPAN-Packages/F-9 import.log, NONE, 1.1 perl-Parse-BACKPAN-Packages.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309170405.D9DD570034@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7032/F-9 Modified Files: .cvsignore sources Added Files: import.log perl-Parse-BACKPAN-Packages.spec Log Message: initial import --- NEW FILE import.log --- perl-Parse-BACKPAN-Packages-0_34-1_fc10:F-9:perl-Parse-BACKPAN-Packages-0.34-1.fc10.src.rpm:1236618203 --- NEW FILE perl-Parse-BACKPAN-Packages.spec --- Name: perl-Parse-BACKPAN-Packages Version: 0.34 Release: 1%{?dist} # lib/Parse/BACKPAN/Packages.pm -> GPL+ or Artistic # lib/Parse/BACKPAN/Packages/Distribution.pm -> GPL+ or Artistic # lib/Parse/BACKPAN/Packages/File.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Provide an index of BACKPAN Source: http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/Parse-BACKPAN-Packages-%{version}.tar.gz Url: http://search.cpan.org/dist/Parse-BACKPAN-Packages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(App::Cache) BuildRequires: perl(Class::Accessor::Fast) BuildRequires: perl(Compress::Zlib) BuildRequires: perl(CPAN::DistnameInfo) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(IO::Zlib) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(Module::Build::Compat) # testing... BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) # 'use base' strikes again... Requires: perl(Class::Accessor::Chained::Fast) %description The Comprehensive Perl Archive Network (CPAN) is a very useful collection of Perl code. However, in order to keep CPAN relatively small, authors of modules can delete older versions of modules to only let CPAN have the latest version of a module. BACKPAN is where these deleted modules are backed up. It's more like a full CPAN mirror, only without the deletions. This module provides an index of BACKPAN and some handy functions. The data is fetched from the net and cached for an hour. %prep %setup -q -n Parse-BACKPAN-Packages-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check # tests require network access %{?_with_network_tests: make test } %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Mar 05 2009 Chris Weyl 0.34-1 - submission - conditionalize tests; they require network access * Thu Mar 05 2009 Chris Weyl 0.34-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:12:25 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:03:35 -0000 1.2 @@ -0,0 +1 @@ +Parse-BACKPAN-Packages-0.34.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:12:26 -0000 1.1 +++ sources 9 Mar 2009 17:03:35 -0000 1.2 @@ -0,0 +1 @@ +278a232a6b987e4ff0db45f5ac191f3f Parse-BACKPAN-Packages-0.34.tar.gz From uwog at fedoraproject.org Mon Mar 9 17:07:20 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Mon, 9 Mar 2009 17:07:20 +0000 (UTC) Subject: rpms/abiword/devel abiword-plugins-2.6.8-rindex.patch, NONE, 1.1 abiword.spec, 1.74, 1.75 Message-ID: <20090309170720.8202F70118@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8449 Modified Files: abiword.spec Added Files: abiword-plugins-2.6.8-rindex.patch Log Message: Build fix abiword-plugins-2.6.8-rindex.patch: --- NEW FILE abiword-plugins-2.6.8-rindex.patch --- diff -u -r abiword-plugins-2.6.8.orig/tools/abicommand/xp/AbiCommand.cpp abiword-plugins-2.6.8/tools/abicommand/xp/AbiCommand.cpp --- abiword-plugins-2.6.8.orig/tools/abicommand/xp/AbiCommand.cpp 2007-10-11 22:05:55.000000000 +0200 +++ abiword-plugins-2.6.8/tools/abicommand/xp/AbiCommand.cpp 2009-03-09 16:59:14.000000000 +0100 @@ -551,7 +551,7 @@ UT_UTF8String *pCom1 = const_cast < UT_UTF8String * >(static_cast < const UT_UTF8String * >(pToks->getNthItem (1))); printf(" Filename %s \n",pCom1->utf8_str()); - char *suffix = rindex (pCom1->utf8_str (), '.'); + const char *suffix = static_cast(rindex (pCom1->utf8_str (), '.')); if (suffix != NULL) { Index: abiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- abiword.spec 9 Mar 2009 15:02:35 -0000 1.74 +++ abiword.spec 9 Mar 2009 17:06:50 -0000 1.75 @@ -7,7 +7,7 @@ Summary: The AbiWord word processor Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -30,6 +30,7 @@ Patch1: abiword-2.6.4-desktop.patch Patch2: abiword-2.6.0-boolean.patch Patch3: abiword-plugins-2.6.0-boolean.patch +Patch4: abiword-plugins-2.6.8-rindex.patch %if %{olpc_build} Patch100: abiword-2.6.4-defaultfont.patch Patch101: abiword-2.6.4-draghandles.patch @@ -93,6 +94,7 @@ # setup abiword-plugins %setup -q -T -b 1 -n abiword-plugins-%{version} %patch3 -p1 -b .boolean +%patch4 -p1 -b .rindex # setup abiword extras %setup -q -T -b 2 -n abiword-extras-%{version} @@ -214,6 +216,9 @@ %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %changelog +* Mon Mar 09 2009 Marc Maurer - 1:2.6.8-2 +- Make g++ 4.4 and rindex friends again + * Mon Mar 09 2009 Marc Maurer - 1:2.6.8-1 - New upstream release From jhrozek at fedoraproject.org Mon Mar 9 17:07:56 2009 From: jhrozek at fedoraproject.org (Jakub Hrozek) Date: Mon, 9 Mar 2009 17:07:56 +0000 (UTC) Subject: rpms/sssd/devel import.log, NONE, 1.1 sssd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309170756.0452C70034@cvs1.fedora.phx.redhat.com> Author: jhrozek Update of /cvs/extras/rpms/sssd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8567/devel Modified Files: .cvsignore sources Added Files: import.log sssd.spec Log Message: Initial import of sssd into Fedora --- NEW FILE import.log --- sssd-0_1_0-5_20090309git691c9b3_fc10:HEAD:sssd-0.1.0-5.20090309git691c9b3.fc10.src.rpm:1236618353 --- NEW FILE sssd.spec --- # this is the git snapshot we're packaging %define datetag 20090309 %define vcs git %define vcsversion 691c9b3 %define alphatag %{datetag}%{vcs}%{vcsversion} Name: sssd Version: 0.1.0 Release: 5.%{alphatag}%{dist} Group: Applications/System Summary: System Security Services Daemon # The entire source code is GPLv3+ except replace/ which is LGPLv3+ License: GPLv3+ and LGPLv3+ URL: http://www.freeipa.org/ # Tarfile created using git # git clone git clone git://fedorahosted.org/sssd.git # cd sssd # git-archive --format=tar --prefix=%{name}-%{version}/ %{name}-%{version} | gzip > %{name}-%{version}.tar.gz Source0: sssd-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ### Patches ### ### Dependencies ### Requires: libldb >= 0.9.3 Requires(preun): initscripts chkconfig Requires(postun): /sbin/service %define servicename sssd ### Build Dependencies ### BuildRequires: autoconf BuildRequires: popt-devel BuildRequires: libtalloc-devel BuildRequires: libtevent-devel BuildRequires: libtdb-devel BuildRequires: libldb-devel BuildRequires: dbus-devel BuildRequires: dbus-libs BuildRequires: openldap-devel BuildRequires: pam-devel BuildRequires: nss-devel BuildRequires: nspr-devel %description Provides a set of daemons to manage access to remote directories and authentication mechanisms. It provides an NSS and PAM interface toward the system and a pluggable backend system to connect to multiple different account sources. It is also the basis to provide client auditing and policy services for projects like FreeIPA. %prep %setup -q %build # sssd pushd server ./autogen.sh %configure --prefix=%{_usr} \ --sysconfdir=%{_sysconfdir} \ --without-tests \ --without-policykit \ --with-openldap \ --with-infopipe \ --with-initrd-dir=%{_initrddir} \ make %{?_smp_mflags} popd pushd sss_client ./autogen.sh %configure --libdir=/%{_lib} make %{?_smp_mflags} popd %install rm -rf $RPM_BUILD_ROOT # sssd pushd server make install DESTDIR=$RPM_BUILD_ROOT popd pushd sss_client make install DESTDIR=$RPM_BUILD_ROOT popd %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{_initrddir}/%{name} %{_sbindir}/sssd %{_sbindir}/sss_useradd %{_sbindir}/sss_userdel %{_sbindir}/sss_groupadd %{_sbindir}/sss_groupdel %{_libexecdir}/%{servicename}/ %{_libdir}/%{name}/ %{_libdir}/ldb/memberof.so* %{_sharedstatedir}/sss/ %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freeipa.sssd.infopipe.conf %{_datadir}/%{name}/introspect/infopipe/org.freeipa.sssd.infopipe.Introspect.xml /%{_lib}/libnss_sss.so.0.0.1 /%{_lib}/libnss_sss.so.2 /%{_lib}/security/pam_sss.so %post /sbin/ldconfig /sbin/chkconfig --add %{servicename} %preun if [ $1 = 0 ]; then /sbin/service %{servicename} stop 2>&1 > /dev/null /sbin/chkconfig --del %{servicename} fi %postun /sbin/ldconfig if [ $1 -ge 1 ] ; then /sbin/service %{servicename} condrestart 2>&1 > /dev/null fi %changelog * Sun Mar 08 2009 Jakub Hrozek - 0.1.0-5.20090309git691c9b3 - package git snapshot * Fri Mar 06 2009 Jakub Hrozek - 0.1.0-4 - fixed items found during review - added initscript * Thu Mar 05 2009 Sumit Bose - 0.1.0-3 - added sss_client * Mon Feb 23 2009 Jakub Hrozek - 0.1.0-2 - Small cleanup and fixes in the spec file * Thu Feb 12 2009 Stephen Gallagher - 0.1.0-1 - Initial release (based on version 0.1.0 upstream code) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sssd/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:42:03 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:07:25 -0000 1.2 @@ -0,0 +1 @@ +sssd-0.1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/sssd/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:42:03 -0000 1.1 +++ sources 9 Mar 2009 17:07:25 -0000 1.2 @@ -0,0 +1 @@ +a56ba0f725a2adc6db40603c160a31e9 sssd-0.1.0.tar.gz From stingray at fedoraproject.org Mon Mar 9 17:08:08 2009 From: stingray at fedoraproject.org (Paul P Komkoff Jr) Date: Mon, 9 Mar 2009 17:08:08 +0000 (UTC) Subject: rpms/roundup/devel bts518768-disable-editcsv.patch, NONE, 1.1 roundup.spec, 1.16, 1.17 Message-ID: <20090309170808.84FE570034@cvs1.fedora.phx.redhat.com> Author: stingray Update of /cvs/extras/rpms/roundup/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9082 Modified Files: roundup.spec Added Files: bts518768-disable-editcsv.patch Log Message: Fix bz#489355 bts518768-disable-editcsv.patch: --- NEW FILE bts518768-disable-editcsv.patch --- --- a/roundup/cgi/actions.py +++ b/roundup/cgi/actions.py @@ -277,6 +277,8 @@ removed lines are retired. """ + self.client.error_message.append('EditCSVAction has been disabled for security reasons') + return cl = self.db.classes[self.classname] idlessprops = cl.getprops(protected=0).keys() idlessprops.sort() Index: roundup.spec =================================================================== RCS file: /cvs/extras/rpms/roundup/devel/roundup.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- roundup.spec 25 Feb 2009 20:22:02 -0000 1.16 +++ roundup.spec 9 Mar 2009 17:07:38 -0000 1.17 @@ -3,7 +3,7 @@ Summary: Simple and flexible issue-tracking system Name: roundup Version: 1.4.6 -Release: 3%{dist} +Release: 4%{dist} License: MIT Group: Applications/Engineering Source: http://pypi.python.org/packages/source/r/%{name}/%{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ Source2: roundup Source3: README.Fedora Patch0: roundup-setup.patch +Patch1: bts518768-disable-editcsv.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -29,6 +30,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 mv locale/ru.po locale/ru-koi8.po iconv -f koi8-r -t utf-8 locale/ru-koi8.po | sed -e 's|Content-Type: text/plain; charset=koi8-r|Content-Type: text/plain; charset=utf-8|' > locale/ru.po @@ -81,6 +83,9 @@ %doc README.Fedora COPYING.txt %changelog +* Mon Mar 9 2009 Paul P. Komkoff Jr - 1.4.6-4 +- security bug bz#489355 + * Wed Feb 25 2009 Fedora Release Engineering - 1.4.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From tbzatek at fedoraproject.org Mon Mar 9 17:11:40 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 9 Mar 2009 17:11:40 +0000 (UTC) Subject: rpms/nautilus-gdu/devel nautilus-gdu.spec,1.5,1.6 Message-ID: <20090309171140.16EB670034@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/nautilus-gdu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10277 Modified Files: nautilus-gdu.spec Log Message: Forgot to update date tag for source tarball Index: nautilus-gdu.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-gdu/devel/nautilus-gdu.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nautilus-gdu.spec 9 Mar 2009 16:51:22 -0000 1.5 +++ nautilus-gdu.spec 9 Mar 2009 17:11:09 -0000 1.6 @@ -14,7 +14,7 @@ URL: http://fedorapeople.org/gitweb?p=tbzatek/public_git/nautilus-gdu.git;a=summary # TODO: to fetch latest snapshot please use # 'git clone git://fedorapeople.org/~tbzatek/nautilus-gdu.git' -Source0: %{name}-%{version}.git20090304.tar.bz2 +Source0: %{name}-%{version}.git20090309.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= %{glib2_version} From kwizart at fedoraproject.org Mon Mar 9 17:11:58 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 9 Mar 2009 17:11:58 +0000 (UTC) Subject: rpms/cinepaint/devel cinepaint.spec,1.17,1.18 Message-ID: <20090309171158.1A41A70034@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/cinepaint/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10410 Modified Files: cinepaint.spec Log Message: - Add BR BuildRequires: libxml2-devel Index: cinepaint.spec =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- cinepaint.spec 9 Mar 2009 16:51:10 -0000 1.17 +++ cinepaint.spec 9 Mar 2009 17:11:27 -0000 1.18 @@ -6,7 +6,7 @@ Name: cinepaint Version: %(echo %{cinever} |sed 's|-|.|') -Release: 12%{?dist}.1 +Release: 12%{?dist}.2 Summary: CinePaint is a tool for manipulating images Group: Applications/Multimedia @@ -49,6 +49,7 @@ BuildRequires: OpenEXR-devel >= 1.6.0 BuildRequires: oyranos-devel BuildRequires: elektra-devel +BuildRequires: libxml2-devel %if 0%{?fedora} > 10 Requires: dejavu-sans-fonts @@ -223,6 +224,7 @@ - Fix for gcc44 - backport oyranos 0.1.9 support - Switch from freefont to dejavu-sans-fonts for icc_examin internal plug-in +- Add BR libxml2-devel * Mon Feb 23 2009 Fedora Release Engineering - 0.22.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From hadess at fedoraproject.org Mon Mar 9 17:12:27 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 9 Mar 2009 17:12:27 +0000 (UTC) Subject: rpms/bluez/devel bluez-sdp-xml-with-nulls-2.patch, NONE, 1.1 bluez.spec, 1.47, 1.48 bluez-sdp-xml-with-nulls.patch, 1.1, NONE Message-ID: <20090309171227.16E9D70034@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10564 Modified Files: bluez.spec Added Files: bluez-sdp-xml-with-nulls-2.patch Removed Files: bluez-sdp-xml-with-nulls.patch Log Message: * Mon Mar 09 2009 - Bastien Nocera - 4.32-7 - A (slightly) different fix for parsing to XML when it contains a NULL bluez-sdp-xml-with-nulls-2.patch: --- NEW FILE bluez-sdp-xml-with-nulls-2.patch --- diff --git a/common/sdp-xml.c b/common/sdp-xml.c index 0403dcd..c3d3934 100644 --- a/common/sdp-xml.c +++ b/common/sdp-xml.c @@ -239,9 +239,7 @@ static void convert_raw_data_to_xml(sdp_data_t *value, int indent_level, hex = 0; for (i = 0; i < length; i++) { - if (value->val.str[i] == '\0') - break; - if (!isprint(value->val.str[i])) { + if (!isprint(value->val.str[i]) && value->val.str[i] != '\0') { hex = 1; break; } @@ -304,7 +302,9 @@ static void convert_raw_data_to_xml(sdp_data_t *value, int indent_level, strBuf[j++] = 'o'; strBuf[j++] = 't'; } - else { + else if (value->val.str[i] == '\0') { + strBuf[j++] = ' '; + } else { strBuf[j++] = value->val.str[i]; } } Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- bluez.spec 9 Mar 2009 15:28:31 -0000 1.47 +++ bluez.spec 9 Mar 2009 17:11:56 -0000 1.48 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez Version: 4.32 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz @@ -13,7 +13,7 @@ # http://thread.gmane.org/gmane.linux.bluez.kernel/1687 Patch2: bluez-try-utf8-harder.patch # http://thread.gmane.org/gmane.linux.bluez.kernel/1688 -Patch3: bluez-sdp-xml-with-nulls.patch +Patch3: bluez-sdp-xml-with-nulls-2.patch # http://thread.gmane.org/gmane.linux.bluez.kernel/1688/focus=1708 Patch4: bluez-fix-sdp-copy-for-strings-with-nulls.patch @@ -197,6 +197,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Mon Mar 09 2009 - Bastien Nocera - 4.32-7 +- A (slightly) different fix for parsing to XML when it contains a NULL + * Mon Mar 09 2009 - Bastien Nocera - 4.32-6 - Fix sdp_copy_record(), so records are properly exported through D-Bus --- bluez-sdp-xml-with-nulls.patch DELETED --- From kwizart at fedoraproject.org Mon Mar 9 17:20:39 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 9 Mar 2009 17:20:39 +0000 (UTC) Subject: rpms/cinepaint/devel cinepaint.spec,1.18,1.19 Message-ID: <20090309172039.DFAD570034@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/cinepaint/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12738 Modified Files: cinepaint.spec Log Message: Switch to gtk+ Index: cinepaint.spec =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- cinepaint.spec 9 Mar 2009 17:11:27 -0000 1.18 +++ cinepaint.spec 9 Mar 2009 17:20:09 -0000 1.19 @@ -37,7 +37,7 @@ BuildRequires: fltk-devel BuildRequires: ftgl-devel BuildRequires: gettext -BuildRequires: gtk2-devel >= 2.10.8 +BuildRequires: gtk+-devel >= 1.2.10 BuildRequires: gutenprint-devel >= 5.0.0 BuildRequires: python-devel BuildRequires: lcms-devel >= 1.16 @@ -85,7 +85,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: automake Requires: pkgconfig -Requires: gtk2-devel +Requires: gtk+-devel %description devel This package contains development files for %{name}. @@ -130,10 +130,8 @@ %build -export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %configure \ --disable-static \ - --enable-gtk2 \ --enable-pygimp \ --with-pixmap=%{_datadir}/pixmaps \ --with-python=%{_bindir}/python @@ -224,7 +222,7 @@ - Fix for gcc44 - backport oyranos 0.1.9 support - Switch from freefont to dejavu-sans-fonts for icc_examin internal plug-in -- Add BR libxml2-devel +- Add BR libxml2-devel, switch back to gtk+-devel for now. * Mon Feb 23 2009 Fedora Release Engineering - 0.22.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kwizart at fedoraproject.org Mon Mar 9 17:24:35 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 9 Mar 2009 17:24:35 +0000 (UTC) Subject: rpms/cinepaint/devel cinepaint.spec,1.19,1.20 Message-ID: <20090309172435.77E7F70034@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/cinepaint/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14149 Modified Files: cinepaint.spec Log Message: - Better multiarch condition Index: cinepaint.spec =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- cinepaint.spec 9 Mar 2009 17:20:09 -0000 1.19 +++ cinepaint.spec 9 Mar 2009 17:24:04 -0000 1.20 @@ -198,7 +198,7 @@ %exclude %{_datadir}/fonts/FreeSans.ttf %{python_sitelib}/* -%ifarch x86_64 ppc64 sparc64 +%if %{_lib} == "lib64" %{python_sitearch}/* %endif From ltinkl at fedoraproject.org Mon Mar 9 17:25:35 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 9 Mar 2009 17:25:35 +0000 (UTC) Subject: rpms/kdebase-workspace/F-10 kdebase-workspace-4.3.0-desktopnumbers.patch, NONE, 1.1 kdebase-workspace.spec, 1.166, 1.167 Message-ID: <20090309172535.2D54F70034@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase-workspace/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14418/F-10 Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.3.0-desktopnumbers.patch Log Message: fix pager not displaying desktop numbers (kdebug#184152) kdebase-workspace-4.3.0-desktopnumbers.patch: --- NEW FILE kdebase-workspace-4.3.0-desktopnumbers.patch --- --- plasma/applets/pager/pager.cpp 2009/02/28 02:35:49 933128 +++ plasma/applets/pager/pager.cpp 2009/02/28 02:46:32 933129 @@ -1118,8 +1118,13 @@ QRectF target = m_rects[i]; //take also shadow position and radius into account //kDebug() << target << result.height(); - if (target.height() >= result.height() - radius * 2) { - QPointF paintPoint = target.center() - (result.rect().center() + QPoint(radius, radius)); + + // for the default size of the panel we can allow this "one pixel" + // offset on the bottom. the applet is so small that you almost + // can't see the offset and this brings back the labels for the + // panel's default size. + if (target.height() + 1 >= result.height() - radius * 2) { + QPointF paintPoint = target.center() - (result.rect().center() + QPoint(radius, radius)); if (paintPoint.x() + radius < target.x() + 1) { paintPoint.setX(target.x() + 1 - radius); Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- kdebase-workspace.spec 9 Mar 2009 15:23:54 -0000 1.166 +++ kdebase-workspace.spec 9 Mar 2009 17:25:04 -0000 1.167 @@ -8,7 +8,7 @@ Name: kdebase-workspace Version: 4.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -44,6 +44,8 @@ Patch103: kdebase-workspace-4.2.0-kde#180576.patch # 4.2 , http://bugs.kde.org/185736 Patch104: kdebase-workspace-4.2.1-kde#185736.patch +#??4.3, https://bugs.kde.org/show_bug.cgi?id=184152 +Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch Provides: kdebase-kdm = 6:%{version}-%{release} Provides: kdm = %{version}-%{release} @@ -225,7 +227,7 @@ %endif %patch103 -p1 -b .kde#180576 %patch104 -p5 -b .kde#185736 - +%patch105 -p0 -b .desktopnumbers %build @@ -374,6 +376,9 @@ %changelog +* Mon Mar 9 2009 Luk???? Tinkl - 4.2.1-5 +- fix pager not displaying desktop numbers (kdebug#184152) + * Mon Mar 09 2009 Rex Dieter - 4.2.1-4 - kde 4.2 update crashes plasma (kdebug#185736) From ltinkl at fedoraproject.org Mon Mar 9 17:25:35 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 9 Mar 2009 17:25:35 +0000 (UTC) Subject: rpms/kdebase-workspace/F-9 kdebase-workspace-4.3.0-desktopnumbers.patch, NONE, 1.1 kdebase-workspace.spec, 1.139, 1.140 Message-ID: <20090309172535.6C7C370034@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase-workspace/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14418/F-9 Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.3.0-desktopnumbers.patch Log Message: fix pager not displaying desktop numbers (kdebug#184152) kdebase-workspace-4.3.0-desktopnumbers.patch: --- NEW FILE kdebase-workspace-4.3.0-desktopnumbers.patch --- --- plasma/applets/pager/pager.cpp 2009/02/28 02:35:49 933128 +++ plasma/applets/pager/pager.cpp 2009/02/28 02:46:32 933129 @@ -1118,8 +1118,13 @@ QRectF target = m_rects[i]; //take also shadow position and radius into account //kDebug() << target << result.height(); - if (target.height() >= result.height() - radius * 2) { - QPointF paintPoint = target.center() - (result.rect().center() + QPoint(radius, radius)); + + // for the default size of the panel we can allow this "one pixel" + // offset on the bottom. the applet is so small that you almost + // can't see the offset and this brings back the labels for the + // panel's default size. + if (target.height() + 1 >= result.height() - radius * 2) { + QPointF paintPoint = target.center() - (result.rect().center() + QPoint(radius, radius)); if (paintPoint.x() + radius < target.x() + 1) { paintPoint.setX(target.x() + 1 - radius); Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- kdebase-workspace.spec 9 Mar 2009 15:25:02 -0000 1.139 +++ kdebase-workspace.spec 9 Mar 2009 17:25:05 -0000 1.140 @@ -8,7 +8,7 @@ Name: kdebase-workspace Version: 4.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -44,6 +44,8 @@ Patch103: kdebase-workspace-4.2.0-kde#180576.patch # 4.2 , http://bugs.kde.org/185736 Patch104: kdebase-workspace-4.2.1-kde#185736.patch +#??4.3, https://bugs.kde.org/show_bug.cgi?id=184152 +Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch Provides: kdebase-kdm = 6:%{version}-%{release} Provides: kdm = %{version}-%{release} @@ -225,7 +227,7 @@ %endif %patch103 -p1 -b .kde#180576 %patch104 -p5 -b .kde#185736 - +%patch105 -p0 -b .desktopnumbers %build @@ -374,6 +376,9 @@ %changelog +* Mon Mar 9 2009 Luk???? Tinkl - 4.2.1-5 +- fix pager not displaying desktop numbers (kdebug#184152) + * Mon Mar 09 2009 Rex Dieter - 4.2.1-4 - kde 4.2 update crashes plasma (kdebug#185736) From ltinkl at fedoraproject.org Mon Mar 9 17:25:35 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 9 Mar 2009 17:25:35 +0000 (UTC) Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.3.0-desktopnumbers.patch, NONE, 1.1 kdebase-workspace.spec, 1.198, 1.199 Message-ID: <20090309172535.DF1ED70034@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdebase-workspace/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14418/devel Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.3.0-desktopnumbers.patch Log Message: fix pager not displaying desktop numbers (kdebug#184152) kdebase-workspace-4.3.0-desktopnumbers.patch: --- NEW FILE kdebase-workspace-4.3.0-desktopnumbers.patch --- --- plasma/applets/pager/pager.cpp 2009/02/28 02:35:49 933128 +++ plasma/applets/pager/pager.cpp 2009/02/28 02:46:32 933129 @@ -1118,8 +1118,13 @@ QRectF target = m_rects[i]; //take also shadow position and radius into account //kDebug() << target << result.height(); - if (target.height() >= result.height() - radius * 2) { - QPointF paintPoint = target.center() - (result.rect().center() + QPoint(radius, radius)); + + // for the default size of the panel we can allow this "one pixel" + // offset on the bottom. the applet is so small that you almost + // can't see the offset and this brings back the labels for the + // panel's default size. + if (target.height() + 1 >= result.height() - radius * 2) { + QPointF paintPoint = target.center() - (result.rect().center() + QPoint(radius, radius)); if (paintPoint.x() + radius < target.x() + 1) { paintPoint.setX(target.x() + 1 - radius); Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- kdebase-workspace.spec 9 Mar 2009 13:38:34 -0000 1.198 +++ kdebase-workspace.spec 9 Mar 2009 17:25:05 -0000 1.199 @@ -8,7 +8,7 @@ Name: kdebase-workspace Version: 4.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -44,6 +44,8 @@ Patch103: kdebase-workspace-4.2.0-kde#180576.patch # 4.2 , http://bugs.kde.org/185736 Patch104: kdebase-workspace-4.2.1-kde#185736.patch +#??4.3, https://bugs.kde.org/show_bug.cgi?id=184152 +Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch Provides: kdebase-kdm = 6:%{version}-%{release} Provides: kdm = %{version}-%{release} @@ -225,7 +227,7 @@ %endif %patch103 -p1 -b .kde#180576 %patch104 -p5 -b .kde#185736 - +%patch105 -p0 -b .desktopnumbers %build @@ -374,6 +376,9 @@ %changelog +* Mon Mar 9 2009 Luk???? Tinkl - 4.2.1-5 +- fix pager not displaying desktop numbers (kdebug#184152) + * Mon Mar 09 2009 Rex Dieter - 4.2.1-4 - kde 4.2 update crashes plasma (kdebug#185736) From mjakubicek at fedoraproject.org Mon Mar 9 17:27:07 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Mon, 9 Mar 2009 17:27:07 +0000 (UTC) Subject: rpms/boinc-client/EL-5 boinc-client.spec,1.29,1.30 Message-ID: <20090309172707.DC03870034@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/boinc-client/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15068 Modified Files: boinc-client.spec Log Message: - disable gcc44 patches for EL-5 Index: boinc-client.spec =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/EL-5/boinc-client.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- boinc-client.spec 8 Mar 2009 20:50:59 -0000 1.29 +++ boinc-client.spec 9 Mar 2009 17:26:37 -0000 1.30 @@ -34,8 +34,8 @@ Patch3: boinc-locales.patch #Both of these patches fix the gcc 4.4 build #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/823 -Patch4: boinc-gcc44.patch -Patch5: boinc-client-6.4.5-event.patch +#Patch4: boinc-gcc44.patch +#Patch5: boinc-client-6.4.5-event.patch #Create password file rw for group, this enables passwordless connection #of manager from users of the boinc group. Patch6: boinc-guirpcauth.patch @@ -104,8 +104,8 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -%patch5 -p1 +#%patch4 +#%patch5 -p1 %patch6 # fix utf8 From rhughes at fedoraproject.org Mon Mar 9 17:28:46 2009 From: rhughes at fedoraproject.org (Richard Hughes) Date: Mon, 9 Mar 2009 17:28:46 +0000 (UTC) Subject: rpms/gnome-packagekit/devel gnome-packagekit.spec,1.75,1.76 Message-ID: <20090309172846.1F30370034@cvs1.fedora.phx.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-packagekit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15641 Modified Files: gnome-packagekit.spec Log Message: * Mon Mar 09 2009 Richard Hughes - 0.4.5-2 - Require PackageKit 0.4.5 otherwise the new update viewer breaks Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- gnome-packagekit.spec 9 Mar 2009 10:18:46 -0000 1.75 +++ gnome-packagekit.spec 9 Mar 2009 17:28:15 -0000 1.76 @@ -1,12 +1,12 @@ %define dbus_version 0.61 -%define packagekit_version 0.4.0 +%define packagekit_version 0.4.5 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: Session applications to manage packages Name: gnome-packagekit Version: 0.4.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.packagekit.org @@ -217,6 +217,9 @@ %{_datadir}/applications/gpk-service-pack.desktop %changelog +* Mon Mar 09 2009 Richard Hughes - 0.4.5-2 +- Require PackageKit 0.4.5 otherwise the new update viewer breaks + * Mon Mar 09 2009 Richard Hughes - 0.4.5-1 - New upstream version - Merge in a new update viewer with a very different UI which I've patched From rdieter at fedoraproject.org Mon Mar 9 17:28:51 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 9 Mar 2009 17:28:51 +0000 (UTC) Subject: rpms/kphotoalbum/devel .cvsignore, 1.12, 1.13 kphotoalbum.spec, 1.35, 1.36 sources, 1.11, 1.12 Message-ID: <20090309172851.B3FF070034@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kphotoalbum/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15681 Modified Files: .cvsignore kphotoalbum.spec sources Log Message: * Mon Mar 09 2009 Rex Dieter - 3.2-0.10.20090308 - kphotoalbum-20090308 snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kphotoalbum/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 12 Feb 2009 20:37:55 -0000 1.12 +++ .cvsignore 9 Mar 2009 17:28:21 -0000 1.13 @@ -1 +1 @@ -kphotoalbum-2009-02-11.tar.bz2 +kphotoalbum-20090308.tar.bz2 Index: kphotoalbum.spec =================================================================== RCS file: /cvs/pkgs/rpms/kphotoalbum/devel/kphotoalbum.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- kphotoalbum.spec 25 Feb 2009 11:54:38 -0000 1.35 +++ kphotoalbum.spec 9 Mar 2009 17:28:21 -0000 1.36 @@ -1,11 +1,10 @@ -%define pre 2009-02-11 -%define pre_tag 20090211svn +%define pre 20090308 Summary: KDE Photo Album Name: kphotoalbum Version: 3.2 -Release: 0.9.%{pre_tag}%{?dist} +Release: 0.10.%{pre}%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -105,6 +104,9 @@ %changelog +* Mon Mar 09 2009 Rex Dieter - 3.2-0.10.20090308 +- kphotoalbum-20090308 snapshot + * Wed Feb 25 2009 Fedora Release Engineering - 3.2-0.9.20090211svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kphotoalbum/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 12 Feb 2009 20:37:55 -0000 1.11 +++ sources 9 Mar 2009 17:28:21 -0000 1.12 @@ -1 +1 @@ -b7789444c7edbb65fce15ff340b7cef5 kphotoalbum-2009-02-11.tar.bz2 +612622632a29cdedb5ef3764a4a22622 kphotoalbum-20090308.tar.bz2 From kwizart at fedoraproject.org Mon Mar 9 17:31:28 2009 From: kwizart at fedoraproject.org (NicolasChauvet) Date: Mon, 9 Mar 2009 17:31:28 +0000 (UTC) Subject: rpms/cinepaint/devel cinepaint.spec,1.20,1.21 Message-ID: <20090309173128.63C1C70034@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/cinepaint/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16600 Modified Files: cinepaint.spec Log Message: Revert back to gtk2 (broke python interfaces) Index: cinepaint.spec =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- cinepaint.spec 9 Mar 2009 17:24:04 -0000 1.20 +++ cinepaint.spec 9 Mar 2009 17:30:58 -0000 1.21 @@ -37,7 +37,7 @@ BuildRequires: fltk-devel BuildRequires: ftgl-devel BuildRequires: gettext -BuildRequires: gtk+-devel >= 1.2.10 +BuildRequires: gtk2-devel >= 2.10.8 BuildRequires: gutenprint-devel >= 5.0.0 BuildRequires: python-devel BuildRequires: lcms-devel >= 1.16 @@ -85,7 +85,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: automake Requires: pkgconfig -Requires: gtk+-devel +Requires: gtk2-devel %description devel This package contains development files for %{name}. @@ -133,6 +133,7 @@ %configure \ --disable-static \ --enable-pygimp \ + --enable-gtk2 \ --with-pixmap=%{_datadir}/pixmaps \ --with-python=%{_bindir}/python @@ -222,7 +223,8 @@ - Fix for gcc44 - backport oyranos 0.1.9 support - Switch from freefont to dejavu-sans-fonts for icc_examin internal plug-in -- Add BR libxml2-devel, switch back to gtk+-devel for now. +- Add BR libxml2-devel +- Better multiarch conditional * Mon Feb 23 2009 Fedora Release Engineering - 0.22.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Mon Mar 9 17:35:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:35:54 +0000 Subject: [pkgdb] pikloops had acl change status Message-ID: <20090309173614.B186D208493@bastion.fedora.phx.redhat.com> chitlesh has set the watchbugzilla acl on pikloops (Fedora devel) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 17:36:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:36:15 +0000 Subject: [pkgdb] pikloops had acl change status Message-ID: <20090309173615.A668B208543@bastion.fedora.phx.redhat.com> chitlesh has set the watchcommits acl on pikloops (Fedora devel) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 17:35:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:35:14 +0000 Subject: [pkgdb] pikloops had acl change status Message-ID: <20090309173616.3E3E8208548@bastion.fedora.phx.redhat.com> chitlesh has set the commit acl on pikloops (Fedora devel) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 17:36:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:36:00 +0000 Subject: [pkgdb] pikloops had acl change status Message-ID: <20090309173620.B173120854C@bastion.fedora.phx.redhat.com> chitlesh has set the watchbugzilla acl on pikloops (Fedora 9) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 17:36:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:36:23 +0000 Subject: [pkgdb] pikloops had acl change status Message-ID: <20090309173621.559CD20854F@bastion.fedora.phx.redhat.com> chitlesh has set the watchcommits acl on pikloops (Fedora 9) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 17:36:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:36:21 +0000 Subject: [pkgdb] pikloops had acl change status Message-ID: <20090309173622.04D36208552@bastion.fedora.phx.redhat.com> chitlesh has set the commit acl on pikloops (Fedora 9) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 17:36:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:36:04 +0000 Subject: [pkgdb] pikloops had acl change status Message-ID: <20090309173626.5E009208556@bastion.fedora.phx.redhat.com> chitlesh has set the watchcommits acl on pikloops (Fedora 10) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 17:36:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:36:29 +0000 Subject: [pkgdb] pikloops had acl change status Message-ID: <20090309173626.8E12B208554@bastion.fedora.phx.redhat.com> chitlesh has set the commit acl on pikloops (Fedora 10) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 17:35:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:35:25 +0000 Subject: [pkgdb] pikloops had acl change status Message-ID: <20090309173627.AF64F208603@bastion.fedora.phx.redhat.com> chitlesh has set the watchbugzilla acl on pikloops (Fedora 10) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikloops From pkgdb at fedoraproject.org Mon Mar 9 17:35:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:35:32 +0000 Subject: [pkgdb] pikdev had acl change status Message-ID: <20090309173634.6B07D20860B@bastion.fedora.phx.redhat.com> chitlesh has set the watchcommits acl on pikdev (Fedora devel) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 17:36:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:36:34 +0000 Subject: [pkgdb] pikdev had acl change status Message-ID: <20090309173634.65F82208544@bastion.fedora.phx.redhat.com> chitlesh has set the watchbugzilla acl on pikdev (Fedora devel) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 17:36:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:36:15 +0000 Subject: [pkgdb] pikdev had acl change status Message-ID: <20090309173636.34EA32086F1@bastion.fedora.phx.redhat.com> chitlesh has set the commit acl on pikdev (Fedora devel) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 17:36:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:36:43 +0000 Subject: [pkgdb] pikdev had acl change status Message-ID: <20090309173640.EE72B2086F6@bastion.fedora.phx.redhat.com> chitlesh has set the watchbugzilla acl on pikdev (Fedora 9) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 17:35:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:35:39 +0000 Subject: [pkgdb] pikdev had acl change status Message-ID: <20090309173641.ACB0F208546@bastion.fedora.phx.redhat.com> chitlesh has set the commit acl on pikdev (Fedora 9) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 17:36:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:36:23 +0000 Subject: [pkgdb] pikdev had acl change status Message-ID: <20090309173643.905CD208547@bastion.fedora.phx.redhat.com> chitlesh has set the watchbugzilla acl on pikdev (Fedora 10) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 17:36:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:36:41 +0000 Subject: [pkgdb] pikdev had acl change status Message-ID: <20090309173642.0BA5A208704@bastion.fedora.phx.redhat.com> chitlesh has set the watchcommits acl on pikdev (Fedora 9) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 17:36:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:36:47 +0000 Subject: [pkgdb] pikdev had acl change status Message-ID: <20090309173645.10202208710@bastion.fedora.phx.redhat.com> chitlesh has set the watchcommits acl on pikdev (Fedora 10) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From pkgdb at fedoraproject.org Mon Mar 9 17:36:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 17:36:45 +0000 Subject: [pkgdb] pikdev had acl change status Message-ID: <20090309173645.DA9F5208548@bastion.fedora.phx.redhat.com> chitlesh has set the commit acl on pikdev (Fedora 10) to Approved for tnorth To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/pikdev From ovasik at fedoraproject.org Mon Mar 9 17:38:32 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Mon, 9 Mar 2009 17:38:32 +0000 (UTC) Subject: rpms/cpio/devel cpio-2.9.90-defaultremoteshell.patch, NONE, 1.1 cpio.spec, 1.64, 1.65 Message-ID: <20090309173832.1C84970118@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/cpio/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18674 Modified Files: cpio.spec Added Files: cpio-2.9.90-defaultremoteshell.patch Log Message: define default remote shell as /usr/bin/ssh(#452904), use /etc/rmt as default rmt command cpio-2.9.90-defaultremoteshell.patch: --- NEW FILE cpio-2.9.90-defaultremoteshell.patch --- diff -urNp cpio-2.9.90-orig/lib/rtapelib.c cpio-2.9.90/lib/rtapelib.c --- cpio-2.9.90-orig/lib/rtapelib.c 2007-08-12 09:57:15.000000000 +0200 +++ cpio-2.9.90/lib/rtapelib.c 2009-03-09 18:06:43.000000000 +0100 @@ -59,6 +59,10 @@ # include #endif +#ifndef REMOTE_SHELL +# define REMOTE_SHELL "/usr/bin/ssh" +#endif + #include #include Index: cpio.spec =================================================================== RCS file: /cvs/extras/rpms/cpio/devel/cpio.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- cpio.spec 24 Feb 2009 09:22:54 -0000 1.64 +++ cpio.spec 9 Mar 2009 17:38:01 -0000 1.65 @@ -3,7 +3,7 @@ Summary: A GNU archiving program Name: cpio Version: 2.9.90 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -17,9 +17,10 @@ Patch5: cpio-2.9-dir_perm.patch Patch6: cpio-2.9-dev_number.patch Patch7: cpio-2.9-sys_umask.patch +Patch8: cpio-2.9.90-defaultremoteshell.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -BuildRequires: texinfo, autoconf, gettext +BuildRequires: texinfo, autoconf, gettext, rmt Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -45,12 +46,13 @@ %patch5 -p1 -b .dir_perm %patch6 -p1 -b .dev_number %patch7 -p1 -b .sys_umask +%patch8 -p1 -b .defaultremote autoheader %build -CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -pedantic -Wall" %configure +CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -pedantic -Wall" %configure --with-rmt="%{_sysconfdir}/rmt" make %{?_smp_mflags} %install @@ -85,6 +87,10 @@ %{_infodir}/*.info* %changelog +* Mon Mar 9 2009 Ondrej Vasik 2.9.90-5 +- define default remote shell as /usr/bin/ssh(#452904) +- use /etc/rmt as default rmt command + * Tue Feb 24 2009 Fedora Release Engineering - 2.9.90-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From behdad at fedoraproject.org Mon Mar 9 17:40:28 2009 From: behdad at fedoraproject.org (Behdad Esfahbod) Date: Mon, 9 Mar 2009 17:40:28 +0000 (UTC) Subject: rpms/freetype/devel freetype.spec,1.68,1.69 Message-ID: <20090309174028.D3DBF70034@cvs1.fedora.phx.redhat.com> Author: behdad Update of /cvs/pkgs/rpms/freetype/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20001 Modified Files: freetype.spec Log Message: * Thu Mar 09 2009 Behdad Esfahbod 2.3.8-2.1 - Preserve timestamp of FTL.TXT when converting to UTF-8. Index: freetype.spec =================================================================== RCS file: /cvs/pkgs/rpms/freetype/devel/freetype.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- freetype.spec 24 Feb 2009 18:29:01 -0000 1.68 +++ freetype.spec 9 Mar 2009 17:39:58 -0000 1.69 @@ -11,7 +11,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.3.8 -Release: 2%{?dist} +Release: 2.1%{?dist} License: FTL or GPLv2+ Group: System Environment/Libraries URL: http://www.freetype.org @@ -109,7 +109,9 @@ # Convert FTL.txt to UTF-8 pushd docs -iconv -f latin1 -t utf-8 < FTL.TXT > FTL.TXT.tmp && mv FTL.TXT.tmp FTL.TXT +iconv -f latin1 -t utf-8 < FTL.TXT > FTL.TXT.tmp && \ +touch -r FTL.TXT FTL.TXT.tmp && \ +mv FTL.TXT.tmp FTL.TXT popd @@ -219,6 +221,9 @@ %doc docs/tutorial %changelog +* Thu Mar 09 2009 Behdad Esfahbod 2.3.8-2.1 +- Preserve timestamp of FTL.TXT when converting to UTF-8. + * Tue Feb 24 2009 Fedora Release Engineering - 2.3.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From sharkcz at fedoraproject.org Mon Mar 9 17:42:31 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Mon, 9 Mar 2009 17:42:31 +0000 (UTC) Subject: rpms/smp_utils/devel smp_utils-0.94-makefile.patch, NONE, 1.1 smp_utils.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309174231.D3EE770034@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/smp_utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20820 Modified Files: .cvsignore sources Added Files: smp_utils-0.94-makefile.patch smp_utils.spec Log Message: initial import smp_utils-0.94-makefile.patch: --- NEW FILE smp_utils-0.94-makefile.patch --- >From 304453fa4dda47e5e94f7995cdd1d3b9086370ef Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Mon, 2 Feb 2009 17:31:42 +0100 Subject: [PATCH] don't change ownership when installing the files --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f87d0a6..9f19e43 100644 --- a/Makefile +++ b/Makefile @@ -122,11 +122,11 @@ smp_rep_exp_route_tbl: smp_rep_exp_route_tbl.o libsmp.a install: $(EXECS) install -d $(INSTDIR) for name in $^; \ - do install -s -o root -g root -m 755 $$name $(INSTDIR); \ + do install -m 755 $$name $(INSTDIR); \ done install -d $(MANDIR)/$(MAN_PREF) for mp in $(MAN_PGS); \ - do install -o root -g root -m 644 doc/$$mp $(MANDIR)/$(MAN_PREF); \ + do install -m 644 doc/$$mp $(MANDIR)/$(MAN_PREF); \ gzip -9f $(MANDIR)/$(MAN_PREF)/$$mp; \ done -- 1.6.0.6 --- NEW FILE smp_utils.spec --- Summary: Utilities for SAS management protocol (SMP) Name: smp_utils Version: 0.94 Release: 2%{?dist} License: BSD Group: Applications/System URL: http://sg.danny.cz/sg/smp_utils.html Source0: http://sg.danny.cz/sg/p/%{name}-%{version}.tgz Patch0: %{name}-0.94-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This is a package of utilities. Each utility sends a Serial Attached SCSI (SAS) Management Protocol (SMP) request to a SMP target. If the request fails then the error is decoded. If the request succeeds then the response is either decoded, printed out in hexadecimal or output in binary. This package supports multiple interfaces since SMP passthroughs are not mature. This package supports the linux 2.4 and 2.6 series and should be easy to port to other operating systems. Warning: Some of these tools access the internals of your system and the incorrect usage of them may render your system inoperable. %prep %setup -q %patch0 -p1 %build make %{?smp_mflags} CFLAGS="%{optflags} -DSMP_UTILS_LINUX" %install rm -rf %{buildroot} make install \ PREFIX=%{_prefix} \ DESTDIR=%{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog COPYING COVERAGE CREDITS INSTALL README %{_bindir}/* %{_mandir}/man8/* %changelog * Mon Mar 9 2009 Dan Hor??k 0.94-2 - update BuildRoot * Mon Feb 2 2009 Dan Hor??k 0.94-1 - update for Fedora compliance * Mon Dec 29 2008 - dgilbert at interlog dot com - adjust sgv4 for lk 2.6.27, sync with sas2r15 * smp_utils-0.94 * Sun Jan 06 2008 - dgilbert at interlog dot com - sync with sas2r13, add 'sgv4' interface * smp_utils-0.93 * Fri Dec 08 2006 - dgilbert at interlog dot com - sync against sas2r07, add smp_conf_general * smp_utils-0.92 * Tue Aug 22 2006 - dgilbert at interlog dot com - add smp_phy_test and smp_discover_list, uniform exit status values * smp_utils-0.91 * Sun Jun 11 2006 - dgilbert at interlog dot com - add smp_read_gpio, smp_conf_route_info and smp_write_gpio * smp_utils-0.90 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/smp_utils/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:09:09 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:42:01 -0000 1.2 @@ -0,0 +1 @@ +smp_utils-0.94.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/smp_utils/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:09:09 -0000 1.1 +++ sources 9 Mar 2009 17:42:01 -0000 1.2 @@ -0,0 +1 @@ +301917fef92726c947b8623813c2cdfc smp_utils-0.94.tgz From jakub at fedoraproject.org Mon Mar 9 17:43:34 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Mon, 9 Mar 2009 17:43:34 +0000 (UTC) Subject: rpms/compat-gcc-32/devel gcc32-bison.patch, NONE, 1.1 compat-gcc-32.spec, 1.35, 1.36 Message-ID: <20090309174334.755A170034@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/compat-gcc-32/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21170 Modified Files: compat-gcc-32.spec Added Files: gcc32-bison.patch Log Message: 3.2.3-66 gcc32-bison.patch: --- NEW FILE gcc32-bison.patch --- --- gcc/c-parse.in.jj 2009-03-09 14:27:38.000000000 +0100 +++ gcc/c-parse.in 2009-03-09 14:33:29.000000000 +0100 @@ -1713,7 +1713,7 @@ enum_head: structsp_attr: struct_head identifier '{' - { $$ = start_struct (RECORD_TYPE, $2); + { $$ = start_struct (RECORD_TYPE, $2); /* Start scope of tag before parsing components. */ } component_decl_list '}' maybe_attribute @@ -1723,7 +1723,7 @@ structsp_attr: $3, chainon ($1, $5)); } | union_head identifier '{' - { $$ = start_struct (UNION_TYPE, $2); } + { $$ = start_struct (UNION_TYPE, $2); } component_decl_list '}' maybe_attribute { $$ = finish_struct ($4, $5, chainon ($1, $7)); } | union_head '{' component_decl_list '}' maybe_attribute @@ -1731,12 +1731,12 @@ structsp_attr: $3, chainon ($1, $5)); } | enum_head identifier '{' - { $$ = start_enum ($2); } + { $$ = start_enum ($2); } enumlist maybecomma_warn '}' maybe_attribute { $$ = finish_enum ($4, nreverse ($5), chainon ($1, $8)); } | enum_head '{' - { $$ = start_enum (NULL_TREE); } + { $$ = start_enum (NULL_TREE); } enumlist maybecomma_warn '}' maybe_attribute { $$ = finish_enum ($3, nreverse ($4), chainon ($1, $7)); } --- gcc/cp/parse.y.jj 2009-03-09 14:39:01.000000000 +0100 +++ gcc/cp/parse.y 2009-03-09 14:41:58.000000000 +0100 @@ -804,7 +804,7 @@ fndef: constructor_declarator: nested_name_specifier SELFNAME '(' - { $$ = begin_constructor_declarator ($1, $2); } + { $$ = begin_constructor_declarator ($1, $2); } parmlist ')' cv_qualifiers exception_specification_opt { $$ = make_call_declarator ($4, $5, $7, $8); } | nested_name_specifier SELFNAME LEFT_RIGHT cv_qualifiers exception_specification_opt @@ -812,7 +812,7 @@ constructor_declarator: $$ = make_call_declarator ($$, empty_parms (), $4, $5); } | global_scope nested_name_specifier SELFNAME '(' - { $$ = begin_constructor_declarator ($2, $3); } + { $$ = begin_constructor_declarator ($2, $3); } parmlist ')' cv_qualifiers exception_specification_opt { $$ = make_call_declarator ($5, $6, $8, $9); } | global_scope nested_name_specifier SELFNAME LEFT_RIGHT cv_qualifiers exception_specification_opt @@ -820,7 +820,7 @@ constructor_declarator: $$ = make_call_declarator ($$, empty_parms (), $5, $6); } | nested_name_specifier self_template_type '(' - { $$ = begin_constructor_declarator ($1, $2); } + { $$ = begin_constructor_declarator ($1, $2); } parmlist ')' cv_qualifiers exception_specification_opt { $$ = make_call_declarator ($4, $5, $7, $8); } | nested_name_specifier self_template_type LEFT_RIGHT cv_qualifiers exception_specification_opt @@ -828,7 +828,7 @@ constructor_declarator: $$ = make_call_declarator ($$, empty_parms (), $4, $5); } | global_scope nested_name_specifier self_template_type '(' - { $$ = begin_constructor_declarator ($2, $3); } + { $$ = begin_constructor_declarator ($2, $3); } parmlist ')' cv_qualifiers exception_specification_opt { $$ = make_call_declarator ($5, $6, $8, $9); } | global_scope nested_name_specifier self_template_type LEFT_RIGHT cv_qualifiers exception_specification_opt Index: compat-gcc-32.spec =================================================================== RCS file: /cvs/pkgs/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- compat-gcc-32.spec 24 Feb 2009 08:34:18 -0000 1.35 +++ compat-gcc-32.spec 9 Mar 2009 17:43:04 -0000 1.36 @@ -1,7 +1,7 @@ %define LIBSTDCXXDATE 20040818 %define DATE 20040701 %define gcc_version 3.2.3 -%define gcc_release 65 +%define gcc_release 66 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define build_java 0 @@ -37,7 +37,7 @@ BuildRequires: binutils >= 2.16.91.0.5-1 BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo # Make sure pthread.h doesn't contain __thread tokens -BuildRequires: glibc-devel >= 2.2.90-12 +BuildRequires: glibc-devel >= 2.2.90-12, glibc-static # Need .eh_frame ld optimizations # Need proper visibility support # Need -pie support @@ -113,6 +113,7 @@ Patch60: gcc32-obstack-lvalues.patch Patch61: gcc32-fc4-compile.patch Patch62: gcc32-s390x-compile.patch +Patch63: gcc32-bison.patch Patch100: compat-libstdc++33-incdir.patch Patch101: compat-libstdc++33-limits.patch @@ -214,6 +215,7 @@ %patch60 -p0 -b .obstack-lvalues~ %patch61 -p0 -b .fc4-compile~ %patch62 -p0 -b .s390x-compile~ +%patch63 -p0 -b .bison~ %patch100 -p0 -b .compat-libstdc++33-incdir~ %patch101 -p0 -b .compat-libstdc++33-limits~ @@ -434,8 +436,8 @@ %{_prefix}/%{_lib}/libstdc++.so.5* %changelog -* Tue Feb 24 2009 Fedora Release Engineering - 3.2.3-65.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Mon Mar 9 2009 Jakub Jelinek 3.2.3-66 +- fix up for latest bison * Sat Feb 14 2009 Dennis Gilmore - 3.2.3-65 - fix to build 32 bit sparc sparcv9 From sharkcz at fedoraproject.org Mon Mar 9 17:44:26 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Mon, 9 Mar 2009 17:44:26 +0000 (UTC) Subject: rpms/touchcal/devel touchcal-0.31-strncpy.patch, NONE, 1.1 touchcal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309174426.7B4E570034@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/touchcal/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21597 Modified Files: .cvsignore sources Added Files: touchcal-0.31-strncpy.patch touchcal.spec Log Message: initial import touchcal-0.31-strncpy.patch: --- NEW FILE touchcal-0.31-strncpy.patch --- >From 5f67053c9f53fd3e116cb53d3cfd891f7655bd3f Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Tue, 3 Feb 2009 11:58:58 +0100 Subject: [PATCH] fix string overflow --- touchcal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/touchcal.c b/touchcal.c index 7341fd7..b7b192b 100644 --- a/touchcal.c +++ b/touchcal.c @@ -139,7 +139,7 @@ static void init_mu(char dev[]) set_page[4]=0x0d; /*define data string*/ - strcpy(data,"00180769001D0793"); + strncpy(data,"00180769001D0793",16); bzero(&newtio, sizeof(newtio)); /* clear struct for new port settings */ -- 1.6.0.6 --- NEW FILE touchcal.spec --- Name: touchcal Version: 0.31 Release: 1%{?dist} Summary: Calibration utility for touch screens Group: User Interface/X Hardware Support License: GPLv2+ URL: http://touchcal.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-0.31-strncpy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel %description touchcal is a tool to calibrate touch screens with serial controllers from the manufacturers EloGraphics (IntelliTouch E281-2310) and MicroTouch (SMT3 serial) for use under Xorg. %prep %setup -q %patch0 -p1 -b .strncpy %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_bindir}/touchcal %changelog * Tue Feb 3 2009 Dan Hor??k 0.31-1 - update to upstream version 0.31 * Mon Jun 6 2006 Dan Hor??k 0.23-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/touchcal/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 15:59:06 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:43:56 -0000 1.2 @@ -0,0 +1 @@ +touchcal-0.31.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/touchcal/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 15:59:06 -0000 1.1 +++ sources 9 Mar 2009 17:43:56 -0000 1.2 @@ -0,0 +1 @@ +253032b585254056e19c56827ed9f539 touchcal-0.31.tar.gz From jakub at fedoraproject.org Mon Mar 9 17:45:10 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Mon, 9 Mar 2009 17:45:10 +0000 (UTC) Subject: rpms/compat-gcc-32/devel compat-gcc-32.spec,1.36,1.37 Message-ID: <20090309174510.5F8B570034@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/compat-gcc-32/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21856 Modified Files: compat-gcc-32.spec Log Message: 3.2.3-66 Index: compat-gcc-32.spec =================================================================== RCS file: /cvs/pkgs/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- compat-gcc-32.spec 9 Mar 2009 17:43:04 -0000 1.36 +++ compat-gcc-32.spec 9 Mar 2009 17:44:39 -0000 1.37 @@ -21,7 +21,7 @@ Summary: The compatibility GNU Compiler Collection Name: compat-gcc-32 Version: %{gcc_version} -Release: %{gcc_release}.1 +Release: %{gcc_release} License: GPLv2+ with exceptions Group: Development/Languages Source0: gcc-%{gcc_version}-%{DATE}.tar.bz2 From twaugh at fedoraproject.org Mon Mar 9 17:45:24 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Mon, 9 Mar 2009 17:45:24 +0000 (UTC) Subject: rpms/hplip/devel hplip-no-root-config.patch, 1.9, 1.10 hplip.spec, 1.201, 1.202 Message-ID: <20090309174524.0FEE970034@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/hplip/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22064 Modified Files: hplip-no-root-config.patch hplip.spec Log Message: * Mon Mar 9 2009 Tim Waugh 3.9.2-4 - Fixed no-root-config patch (bug #489055). hplip-no-root-config.patch: Index: hplip-no-root-config.patch =================================================================== RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-no-root-config.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- hplip-no-root-config.patch 20 Feb 2009 13:13:49 -0000 1.9 +++ hplip-no-root-config.patch 9 Mar 2009 17:45:22 -0000 1.10 @@ -1,30 +1,30 @@ diff -up hplip-3.9.2/base/g.py.no-root-config hplip-3.9.2/base/g.py --- hplip-3.9.2/base/g.py.no-root-config 2009-02-20 00:36:51.000000000 +0000 -+++ hplip-3.9.2/base/g.py 2009-02-20 11:13:28.000000000 +0000 -@@ -110,6 +110,10 @@ class ConfigBase(object): - keys = options ++++ hplip-3.9.2/base/g.py 2009-03-09 17:43:15.000000000 +0000 +@@ -111,6 +111,10 @@ class ConfigBase(object): def read(self): -+ if filename.startswith ("/root/") or filename.startswith ("/var/"): -+ # Don't try opening a file in root's home directory. -+ return -+ if self.filename is not None: ++ filename = self.filename ++ if filename.startswith ("/root/") or filename.startswith ("/var/"): ++ # Don't try opening a file in root's home directory. ++ return try: fp = open(self.filename, "r") -@@ -119,6 +123,15 @@ class ConfigBase(object): - log.debug("Unable to open file %s for reading." % self.filename) + self.conf.readfp(fp) +@@ -120,6 +124,15 @@ class ConfigBase(object): def write(self): -+ filename = self.filename -+ if filename.startswith ("/root/") or filename.startswith ("/var/"): -+ # Don't try writing a file in root's home directory. -+ return -+ elif filename.startswith ("/etc/"): -+ # Certainly don't try writing the system-wide config file! -+ # See bug #479178. -+ return -+ if self.filename is not None: ++ filename = self.filename ++ if filename.startswith ("/root/") or filename.startswith ("/var/"): ++ # Don't try writing a file in root's home directory. ++ return ++ elif filename.startswith ("/etc/"): ++ # Certainly don't try writing the system-wide config file! ++ # See bug #479178. ++ return ++ try: fp = open(self.filename, "w") + self.conf.write(fp) Index: hplip.spec =================================================================== RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- hplip.spec 25 Feb 2009 04:00:40 -0000 1.201 +++ hplip.spec 9 Mar 2009 17:45:23 -0000 1.202 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -326,6 +326,9 @@ exit 0 %changelog +* Mon Mar 9 2009 Tim Waugh 3.9.2-4 +- Fixed no-root-config patch (bug #489055). + * Tue Feb 24 2009 Fedora Release Engineering - 3.9.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From dhavalgiani at fedoraproject.org Mon Mar 9 17:46:41 2009 From: dhavalgiani at fedoraproject.org (Dhaval Giani) Date: Mon, 9 Mar 2009 17:46:41 +0000 (UTC) Subject: rpms/libcgroup/devel 04-fedora-workaround-for-sysdefault.patch, NONE, 1.1 libcgroup.spec, 1.11, 1.12 Message-ID: <20090309174641.3468470034@cvs1.fedora.phx.redhat.com> Author: dhavalgiani Update of /cvs/pkgs/rpms/libcgroup/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21520 Modified Files: libcgroup.spec Added Files: 04-fedora-workaround-for-sysdefault.patch Log Message: * Mon Mar 09 2009 Dhaval Giani 0.33-3 - Add a workaround for rt cgroup controller. 04-fedora-workaround-for-sysdefault.patch: --- NEW FILE 04-fedora-workaround-for-sysdefault.patch --- diff --git a/scripts/init.d/cgconfig b/scripts/init.d/cgconfig index 1c60b86..fe3ff65 100644 --- a/scripts/init.d/cgconfig +++ b/scripts/init.d/cgconfig @@ -122,6 +122,15 @@ start() { ${MOUNTPOINT[$i]}/$defaultcgroup/cpuset.mems fi # + # special rule for cpu + # + echo ${MOUNTOPTS[$i]} | grep -q -w cpu + if [ $? -eq 0 ] + then + cat ${MOUNTPOINT[$i]}/cpu.rt_runtime_us > \ + ${MOUNTPOINT[$i]}/$defaultcgroup/cpu.rt_runtime_us + fi + # # classify everything to default cgroup # for j in `ps --no-headers -eL o tid` Index: libcgroup.spec =================================================================== RCS file: /cvs/pkgs/rpms/libcgroup/devel/libcgroup.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libcgroup.spec 9 Mar 2009 12:30:29 -0000 1.11 +++ libcgroup.spec 9 Mar 2009 17:46:10 -0000 1.12 @@ -2,13 +2,14 @@ Summary: Tools and libraries to control and monitor control groups Group: Development/Libraries Version: 0.33 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://libcg.sourceforge.net/ Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2 Patch0: http://downloads.sourceforge.net/libcg/01-fedora-fix-build.patch Patch1: http://downloads.sourceforge.net/libcg/02-fedora-fix-initscripts.patch Patch2: http://downloads.sourceforge.net/libcg/03-fedora-adjust-initscript-priority.patch +Patch3: http://downloads.sourceforge.net/libcg/04-fedora-workaround-for-sysdefault.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: byacc BuildRequires: flex @@ -38,6 +39,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure --bindir=/bin --sbindir=/sbin --libdir=/%{_lib} @@ -104,6 +106,8 @@ %changelog +* Mon Mar 09 2009 Dhaval Giani 0.33-3 +- Add a workaround for rt cgroup controller. * Mon Mar 09 2009 Dhaval Giani 0.33-2 - Change the cgconfig script to start earlier - Move the binaries to /bin and /sbin From rjones at fedoraproject.org Mon Mar 9 17:46:46 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 9 Mar 2009 17:46:46 +0000 (UTC) Subject: rpms/mingw32-gnutls/devel gnutls-2.6.2-nosrp.patch, NONE, 1.1 import.log, NONE, 1.1 mingw32-gnutls-2.6.3-certtool-build.patch, NONE, 1.1 mingw32-gnutls.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309174646.1F90770034@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-gnutls/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22374/devel Modified Files: .cvsignore sources Added Files: gnutls-2.6.2-nosrp.patch import.log mingw32-gnutls-2.6.3-certtool-build.patch mingw32-gnutls.spec Log Message: Initial import. gnutls-2.6.2-nosrp.patch: --- NEW FILE gnutls-2.6.2-nosrp.patch --- diff -up gnutls-2.6.2/lib/gnutlsxx.cpp.nosrp gnutls-2.6.2/lib/gnutlsxx.cpp --- gnutls-2.6.2/lib/gnutlsxx.cpp.nosrp 2008-11-12 10:56:28.000000000 +0100 +++ gnutls-2.6.2/lib/gnutlsxx.cpp 2008-12-04 14:34:10.000000000 +0100 @@ -396,12 +396,14 @@ void session::set_credentials( credentia RETWRAP(gnutls_credentials_set( s, cred.get_type(), cred.ptr())); } -#ifdef ENABLE_SRP const char* server_session::get_srp_username() const { +#ifdef ENABLE_SRP return gnutls_srp_server_get_username( s); -} +#else + return NULL; #endif +} const char* server_session::get_psk_username() const { --- NEW FILE import.log --- mingw32-gnutls-2_6_4-1_fc11:HEAD:mingw32-gnutls-2.6.4-1.fc11.src.rpm:1236620604 mingw32-gnutls-2.6.3-certtool-build.patch: --- NEW FILE mingw32-gnutls-2.6.3-certtool-build.patch --- --- gnutls-2.6.3.orig/src/Makefile.am 2008-12-12 18:45:34.000000000 +0000 +++ gnutls-2.6.3/src/Makefile.am 2009-01-23 14:30:16.000000000 +0000 @@ -37,35 +37,35 @@ gnutls_serv_SOURCES = serv.gaa serv-gaa.h serv-gaa.c list.h serv.c \ common.h common.c select.c gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \ - $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la + $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl if ENABLE_SRP srptool_SOURCES = crypt.gaa crypt-gaa.h crypt-gaa.c crypt.c srptool_LDADD = ../lib/libgnutls.la \ $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) \ - ../gl/libgnu.la ../lgl/liblgnu.la + ../gl/libgnu.la ../lgl/liblgnu.la -lintl endif psktool_SOURCES = psk.gaa psk-gaa.h psk-gaa.c psk.c psktool_LDADD = ../lib/libgnutls.la \ $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) \ - ../gl/libgnu.la ../lgl/liblgnu.la + ../gl/libgnu.la ../lgl/liblgnu.la -lintl gnutls_cli_SOURCES = cli.gaa cli-gaa.h cli-gaa.c cli.c common.h \ common.c select.c gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \ - $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la + $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl gnutls_cli_debug_SOURCES = tls_test.gaa tls_test-gaa.h tls_test-gaa.c \ tls_test.c tests.h tests.c common.h common.c gnutls_cli_debug_LDADD = ../lib/libgnutls.la \ $(LIBGCRYPT_LIBS) \ - $(LIBTASN1_LIBS) ../gl/libgnu.la + $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl certtool_SOURCES = certtool.gaa certtool-gaa.h certtool-cfg.h \ certtool-gaa.c certtool.c prime.c certtool-cfg.c certtool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \ - $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la @LTLIBREADLINE@ + $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la @LTLIBREADLINE@ -lintl if HAVE_LIBCFG certtool_LDADD += -lcfg+ else @@ -78,11 +78,11 @@ noinst_PROGRAMS = errcodes printlist errcodes_SOURCES = errcodes.c errcodes_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) \ - ../gl/libgnu.la ../lgl/liblgnu.la + ../gl/libgnu.la ../lgl/liblgnu.la -lintl printlist_SOURCES = printlist.c printlist_LDADD = ../lib/libgnutls.la \ - $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la + $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl psk-gaa.c: $(srcdir)/psk.gaa --- NEW FILE mingw32-gnutls.spec --- %define __strip %{_mingw32_strip} %define __objdump %{_mingw32_objdump} %define _use_internal_dependency_generator 0 %define __find_requires %{_mingw32_findrequires} %define __find_provides %{_mingw32_findprovides} Name: mingw32-gnutls Version: 2.6.4 Release: 1%{?dist} Summary: MinGW GnuTLS TLS/SSL encryption library License: GPLv3+ and LGPLv2+ Group: Development/Libraries URL: http://www.gnutls.org/ #Source0: ftp://ftp.gnutls.org/pub/gnutls/gnutls-%{version}.tar.bz2 # We use the same source tarball as Fedora native package, which # has the patent tainted SRP code removed. Source0: gnutls-%{version}-nosrp.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Patch1: gnutls-2.6.2-nosrp.patch # MinGW-specific patches. Patch1000: mingw32-gnutls-2.6.3-certtool-build.patch BuildRequires: mingw32-filesystem >= 40 BuildRequires: mingw32-gcc BuildRequires: mingw32-gcc-c++ BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn BuildRequires: mingw32-libgpg-error BuildRequires: mingw32-libgcrypt >= 1.2.2 BuildRequires: mingw32-gettext BuildRequires: mingw32-iconv BuildRequires: mingw32-readline BuildRequires: mingw32-zlib BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool # Yes, really ... BuildRequires: pkgconfig # For native /usr/bin/msgfmt etc. BuildRequires: gettext Requires: pkgconfig %description GnuTLS TLS/SSL encryption library. This library is cross-compiled for MinGW. %prep %setup -q -n gnutls-%{version} %patch1 -p1 -b .nosrp %patch1000 -p1 -b .mingw32 for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do touch lib/$i done %if 0%{?fedora} > 10 libtoolize --force --copy aclocal autoreconf %endif %build PATH="%{_mingw32_bindir}:$PATH" \ %{_mingw32_configure} \ --with-included-libtasn1 \ --disable-srp-authentication \ --disable-static # %{?_smp_mflags} doesn't build correctly. make %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir # Remove info and man pages which duplicate stuff in Fedora already. rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir} rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} %find_lang gnutls %clean rm -rf $RPM_BUILD_ROOT %files -f gnutls.lang %defattr(-,root,root) %doc COPYING COPYING.LIB %{_mingw32_bindir}/certtool.exe %{_mingw32_bindir}/gnutls-cli-debug.exe %{_mingw32_bindir}/gnutls-cli.exe %{_mingw32_bindir}/gnutls-serv.exe %{_mingw32_bindir}/libgnutls-26.def %{_mingw32_bindir}/libgnutls-26.dll %{_mingw32_bindir}/libgnutls-config %{_mingw32_bindir}/libgnutls-extra-26.def %{_mingw32_bindir}/libgnutls-extra-26.dll %{_mingw32_bindir}/libgnutls-extra-config %{_mingw32_bindir}/libgnutls-openssl-26.def %{_mingw32_bindir}/libgnutls-openssl-26.dll %{_mingw32_bindir}/psktool.exe %{_mingw32_libdir}/libgnutls-extra.dll.a %{_mingw32_libdir}/libgnutls-extra.la %{_mingw32_libdir}/libgnutls-openssl.dll.a %{_mingw32_libdir}/libgnutls-openssl.la %{_mingw32_libdir}/libgnutls.dll.a %{_mingw32_libdir}/libgnutls.la %{_mingw32_libdir}/pkgconfig/gnutls-extra.pc %{_mingw32_libdir}/pkgconfig/gnutls.pc %{_mingw32_includedir}/gnutls/ %{_mingw32_datadir}/aclocal/libgnutls-extra.m4 %{_mingw32_datadir}/aclocal/libgnutls.m4 %changelog * Mon Mar 9 2009 Richard W.M. Jones - 2.6.4-1 - New Fedora native version 2.6.4. * Fri Feb 20 2009 Richard W.M. Jones - 2.6.3-5 - Rebuild for mingw32-gcc 4.4 * Thu Feb 19 2009 Richard W.M. Jones - 2.6.3-4 - +BR mingw32-gcc-c++ * Fri Feb 6 2009 Richard W.M. Jones - 2.6.3-3 - Include license. * Fri Jan 23 2009 Richard W.M. Jones - 2.6.3-2 - Rebase to native Fedora version 2.6.3. - Enable C++ library. - Use find_lang macro. - Don't build static library. - Rebase MinGW patch to 2.6.3. - +BR mingw32-dlfcn. - +BR mingw32-readline. - Force rebuild of libtool. * Tue Jan 13 2009 Richard W.M. Jones - 2.4.2-4 - Requires pkgconfig. * Thu Nov 13 2008 Richard W.M. Jones - 2.4.2-3 - fix chain verification issue CVE-2008-4989 (#470079) - separate out the MinGW-specific patch from the others * Wed Sep 24 2008 Richard W.M. Jones - 2.4.2-2 - Rename mingw -> mingw32. * Wed Sep 24 2008 Richard W.M. Jones - 2.4.2-1 - New native version. * Mon Sep 22 2008 Daniel P. Berrange - 2.4.1-9 - Switch to source tar.bz2 with SRP stuff removed * Sun Sep 21 2008 Richard W.M. Jones - 2.4.1-8 - Remove duplicate manpages and info files. * Thu Sep 11 2008 Daniel P. Berrange - 2.4.1-7 - Add BR on autoconf, automake and libtool * Wed Sep 10 2008 Richard W.M. Jones - 2.4.1-6 - Need to run autoreconf after patching src/Makefile.am. - Remove static libs. * Fri Sep 5 2008 Richard W.M. Jones - 2.4.1-5 - Add patch to build certtool.exe because of missing dep of gnulib on intl. - BuildArch is noarch. * Thu Sep 4 2008 Richard W.M. Jones - 2.4.1-3 - Use mingw-filesystem RPM macros. - Depends on mingw-iconv, mingw-gettext. * Tue Sep 2 2008 Daniel P. Berrange - 2.4.1-2 - List files explicitly and use custom CFLAGS * Mon Jul 7 2008 Richard W.M. Jones - 2.4.1-1 - Initial RPM release, largely based on earlier work from several sources. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gnutls/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:01:45 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:46:14 -0000 1.2 @@ -0,0 +1 @@ +gnutls-2.6.4-nosrp.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gnutls/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:01:45 -0000 1.1 +++ sources 9 Mar 2009 17:46:15 -0000 1.2 @@ -0,0 +1 @@ +ac96cacb84b7dd7483a495d3907e7664 gnutls-2.6.4-nosrp.tar.bz2 From rjones at fedoraproject.org Mon Mar 9 17:47:17 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 9 Mar 2009 17:47:17 +0000 (UTC) Subject: rpms/mingw32-gnutls/F-10 gnutls-2.6.2-nosrp.patch, NONE, 1.1 import.log, NONE, 1.1 mingw32-gnutls-2.6.3-certtool-build.patch, NONE, 1.1 mingw32-gnutls.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309174717.BF29670034@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-gnutls/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22921/F-10 Modified Files: .cvsignore sources Added Files: gnutls-2.6.2-nosrp.patch import.log mingw32-gnutls-2.6.3-certtool-build.patch mingw32-gnutls.spec Log Message: Initial import. gnutls-2.6.2-nosrp.patch: --- NEW FILE gnutls-2.6.2-nosrp.patch --- diff -up gnutls-2.6.2/lib/gnutlsxx.cpp.nosrp gnutls-2.6.2/lib/gnutlsxx.cpp --- gnutls-2.6.2/lib/gnutlsxx.cpp.nosrp 2008-11-12 10:56:28.000000000 +0100 +++ gnutls-2.6.2/lib/gnutlsxx.cpp 2008-12-04 14:34:10.000000000 +0100 @@ -396,12 +396,14 @@ void session::set_credentials( credentia RETWRAP(gnutls_credentials_set( s, cred.get_type(), cred.ptr())); } -#ifdef ENABLE_SRP const char* server_session::get_srp_username() const { +#ifdef ENABLE_SRP return gnutls_srp_server_get_username( s); -} +#else + return NULL; #endif +} const char* server_session::get_psk_username() const { --- NEW FILE import.log --- mingw32-gnutls-2_6_4-1_fc11:F-10:mingw32-gnutls-2.6.4-1.fc11.src.rpm:1236620807 mingw32-gnutls-2.6.3-certtool-build.patch: --- NEW FILE mingw32-gnutls-2.6.3-certtool-build.patch --- --- gnutls-2.6.3.orig/src/Makefile.am 2008-12-12 18:45:34.000000000 +0000 +++ gnutls-2.6.3/src/Makefile.am 2009-01-23 14:30:16.000000000 +0000 @@ -37,35 +37,35 @@ gnutls_serv_SOURCES = serv.gaa serv-gaa.h serv-gaa.c list.h serv.c \ common.h common.c select.c gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \ - $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la + $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl if ENABLE_SRP srptool_SOURCES = crypt.gaa crypt-gaa.h crypt-gaa.c crypt.c srptool_LDADD = ../lib/libgnutls.la \ $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) \ - ../gl/libgnu.la ../lgl/liblgnu.la + ../gl/libgnu.la ../lgl/liblgnu.la -lintl endif psktool_SOURCES = psk.gaa psk-gaa.h psk-gaa.c psk.c psktool_LDADD = ../lib/libgnutls.la \ $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) \ - ../gl/libgnu.la ../lgl/liblgnu.la + ../gl/libgnu.la ../lgl/liblgnu.la -lintl gnutls_cli_SOURCES = cli.gaa cli-gaa.h cli-gaa.c cli.c common.h \ common.c select.c gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \ - $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la + $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl gnutls_cli_debug_SOURCES = tls_test.gaa tls_test-gaa.h tls_test-gaa.c \ tls_test.c tests.h tests.c common.h common.c gnutls_cli_debug_LDADD = ../lib/libgnutls.la \ $(LIBGCRYPT_LIBS) \ - $(LIBTASN1_LIBS) ../gl/libgnu.la + $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl certtool_SOURCES = certtool.gaa certtool-gaa.h certtool-cfg.h \ certtool-gaa.c certtool.c prime.c certtool-cfg.c certtool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \ - $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la @LTLIBREADLINE@ + $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la @LTLIBREADLINE@ -lintl if HAVE_LIBCFG certtool_LDADD += -lcfg+ else @@ -78,11 +78,11 @@ noinst_PROGRAMS = errcodes printlist errcodes_SOURCES = errcodes.c errcodes_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) \ - ../gl/libgnu.la ../lgl/liblgnu.la + ../gl/libgnu.la ../lgl/liblgnu.la -lintl printlist_SOURCES = printlist.c printlist_LDADD = ../lib/libgnutls.la \ - $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la + $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl psk-gaa.c: $(srcdir)/psk.gaa --- NEW FILE mingw32-gnutls.spec --- %define __strip %{_mingw32_strip} %define __objdump %{_mingw32_objdump} %define _use_internal_dependency_generator 0 %define __find_requires %{_mingw32_findrequires} %define __find_provides %{_mingw32_findprovides} Name: mingw32-gnutls Version: 2.6.4 Release: 1%{?dist} Summary: MinGW GnuTLS TLS/SSL encryption library License: GPLv3+ and LGPLv2+ Group: Development/Libraries URL: http://www.gnutls.org/ #Source0: ftp://ftp.gnutls.org/pub/gnutls/gnutls-%{version}.tar.bz2 # We use the same source tarball as Fedora native package, which # has the patent tainted SRP code removed. Source0: gnutls-%{version}-nosrp.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Patch1: gnutls-2.6.2-nosrp.patch # MinGW-specific patches. Patch1000: mingw32-gnutls-2.6.3-certtool-build.patch BuildRequires: mingw32-filesystem >= 40 BuildRequires: mingw32-gcc BuildRequires: mingw32-gcc-c++ BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn BuildRequires: mingw32-libgpg-error BuildRequires: mingw32-libgcrypt >= 1.2.2 BuildRequires: mingw32-gettext BuildRequires: mingw32-iconv BuildRequires: mingw32-readline BuildRequires: mingw32-zlib BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool # Yes, really ... BuildRequires: pkgconfig # For native /usr/bin/msgfmt etc. BuildRequires: gettext Requires: pkgconfig %description GnuTLS TLS/SSL encryption library. This library is cross-compiled for MinGW. %prep %setup -q -n gnutls-%{version} %patch1 -p1 -b .nosrp %patch1000 -p1 -b .mingw32 for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do touch lib/$i done %if 0%{?fedora} > 10 libtoolize --force --copy aclocal autoreconf %endif %build PATH="%{_mingw32_bindir}:$PATH" \ %{_mingw32_configure} \ --with-included-libtasn1 \ --disable-srp-authentication \ --disable-static # %{?_smp_mflags} doesn't build correctly. make %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir # Remove info and man pages which duplicate stuff in Fedora already. rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir} rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} %find_lang gnutls %clean rm -rf $RPM_BUILD_ROOT %files -f gnutls.lang %defattr(-,root,root) %doc COPYING COPYING.LIB %{_mingw32_bindir}/certtool.exe %{_mingw32_bindir}/gnutls-cli-debug.exe %{_mingw32_bindir}/gnutls-cli.exe %{_mingw32_bindir}/gnutls-serv.exe %{_mingw32_bindir}/libgnutls-26.def %{_mingw32_bindir}/libgnutls-26.dll %{_mingw32_bindir}/libgnutls-config %{_mingw32_bindir}/libgnutls-extra-26.def %{_mingw32_bindir}/libgnutls-extra-26.dll %{_mingw32_bindir}/libgnutls-extra-config %{_mingw32_bindir}/libgnutls-openssl-26.def %{_mingw32_bindir}/libgnutls-openssl-26.dll %{_mingw32_bindir}/psktool.exe %{_mingw32_libdir}/libgnutls-extra.dll.a %{_mingw32_libdir}/libgnutls-extra.la %{_mingw32_libdir}/libgnutls-openssl.dll.a %{_mingw32_libdir}/libgnutls-openssl.la %{_mingw32_libdir}/libgnutls.dll.a %{_mingw32_libdir}/libgnutls.la %{_mingw32_libdir}/pkgconfig/gnutls-extra.pc %{_mingw32_libdir}/pkgconfig/gnutls.pc %{_mingw32_includedir}/gnutls/ %{_mingw32_datadir}/aclocal/libgnutls-extra.m4 %{_mingw32_datadir}/aclocal/libgnutls.m4 %changelog * Mon Mar 9 2009 Richard W.M. Jones - 2.6.4-1 - New Fedora native version 2.6.4. * Fri Feb 20 2009 Richard W.M. Jones - 2.6.3-5 - Rebuild for mingw32-gcc 4.4 * Thu Feb 19 2009 Richard W.M. Jones - 2.6.3-4 - +BR mingw32-gcc-c++ * Fri Feb 6 2009 Richard W.M. Jones - 2.6.3-3 - Include license. * Fri Jan 23 2009 Richard W.M. Jones - 2.6.3-2 - Rebase to native Fedora version 2.6.3. - Enable C++ library. - Use find_lang macro. - Don't build static library. - Rebase MinGW patch to 2.6.3. - +BR mingw32-dlfcn. - +BR mingw32-readline. - Force rebuild of libtool. * Tue Jan 13 2009 Richard W.M. Jones - 2.4.2-4 - Requires pkgconfig. * Thu Nov 13 2008 Richard W.M. Jones - 2.4.2-3 - fix chain verification issue CVE-2008-4989 (#470079) - separate out the MinGW-specific patch from the others * Wed Sep 24 2008 Richard W.M. Jones - 2.4.2-2 - Rename mingw -> mingw32. * Wed Sep 24 2008 Richard W.M. Jones - 2.4.2-1 - New native version. * Mon Sep 22 2008 Daniel P. Berrange - 2.4.1-9 - Switch to source tar.bz2 with SRP stuff removed * Sun Sep 21 2008 Richard W.M. Jones - 2.4.1-8 - Remove duplicate manpages and info files. * Thu Sep 11 2008 Daniel P. Berrange - 2.4.1-7 - Add BR on autoconf, automake and libtool * Wed Sep 10 2008 Richard W.M. Jones - 2.4.1-6 - Need to run autoreconf after patching src/Makefile.am. - Remove static libs. * Fri Sep 5 2008 Richard W.M. Jones - 2.4.1-5 - Add patch to build certtool.exe because of missing dep of gnulib on intl. - BuildArch is noarch. * Thu Sep 4 2008 Richard W.M. Jones - 2.4.1-3 - Use mingw-filesystem RPM macros. - Depends on mingw-iconv, mingw-gettext. * Tue Sep 2 2008 Daniel P. Berrange - 2.4.1-2 - List files explicitly and use custom CFLAGS * Mon Jul 7 2008 Richard W.M. Jones - 2.4.1-1 - Initial RPM release, largely based on earlier work from several sources. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gnutls/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:01:45 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:47:14 -0000 1.2 @@ -0,0 +1 @@ +gnutls-2.6.4-nosrp.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gnutls/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:01:45 -0000 1.1 +++ sources 9 Mar 2009 17:47:15 -0000 1.2 @@ -0,0 +1 @@ +ac96cacb84b7dd7483a495d3907e7664 gnutls-2.6.4-nosrp.tar.bz2 From stingray at fedoraproject.org Mon Mar 9 17:47:34 2009 From: stingray at fedoraproject.org (Paul P Komkoff Jr) Date: Mon, 9 Mar 2009 17:47:34 +0000 (UTC) Subject: rpms/roundup/F-9 bts518768-disable-editcsv.patch, NONE, 1.1 roundup.spec, 1.14, 1.15 Message-ID: <20090309174734.DDA1370034@cvs1.fedora.phx.redhat.com> Author: stingray Update of /cvs/extras/rpms/roundup/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22890/F-9 Modified Files: roundup.spec Added Files: bts518768-disable-editcsv.patch Log Message: Fix bz#489355 bts518768-disable-editcsv.patch: --- NEW FILE bts518768-disable-editcsv.patch --- --- a/roundup/cgi/actions.py +++ b/roundup/cgi/actions.py @@ -277,6 +277,8 @@ removed lines are retired. """ + self.client.error_message.append('EditCSVAction has been disabled for security reasons') + return cl = self.db.classes[self.classname] idlessprops = cl.getprops(protected=0).keys() idlessprops.sort() Index: roundup.spec =================================================================== RCS file: /cvs/extras/rpms/roundup/F-9/roundup.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- roundup.spec 16 Nov 2008 13:58:17 -0000 1.14 +++ roundup.spec 9 Mar 2009 17:47:33 -0000 1.15 @@ -3,7 +3,7 @@ Summary: Simple and flexible issue-tracking system Name: roundup Version: 1.4.6 -Release: 1%{dist} +Release: 4%{dist} License: MIT Group: Applications/Engineering Source: http://pypi.python.org/packages/source/r/%{name}/%{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ Source2: roundup Source3: README.Fedora Patch0: roundup-setup.patch +Patch1: bts518768-disable-editcsv.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -29,6 +30,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 mv locale/ru.po locale/ru-koi8.po iconv -f koi8-r -t utf-8 locale/ru-koi8.po | sed -e 's|Content-Type: text/plain; charset=koi8-r|Content-Type: text/plain; charset=utf-8|' > locale/ru.po @@ -81,6 +83,15 @@ %doc README.Fedora COPYING.txt %changelog +* Mon Mar 9 2009 Paul P. Komkoff Jr - 1.4.6-4 +- security bug bz#489355 + +* Wed Feb 25 2009 Fedora Release Engineering - 1.4.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.4.6-2 +- Rebuild for Python 2.6 + * Fri Oct 3 2008 Paul P. Komkoff Jr - 1.4.6-1 - new upstream version From stingray at fedoraproject.org Mon Mar 9 17:48:03 2009 From: stingray at fedoraproject.org (Paul P Komkoff Jr) Date: Mon, 9 Mar 2009 17:48:03 +0000 (UTC) Subject: rpms/roundup/F-10 bts518768-disable-editcsv.patch, NONE, 1.1 roundup.spec, 1.14, 1.15 Message-ID: <20090309174803.82DD270034@cvs1.fedora.phx.redhat.com> Author: stingray Update of /cvs/extras/rpms/roundup/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22890/F-10 Modified Files: roundup.spec Added Files: bts518768-disable-editcsv.patch Log Message: Fix bz#489355 bts518768-disable-editcsv.patch: --- NEW FILE bts518768-disable-editcsv.patch --- --- a/roundup/cgi/actions.py +++ b/roundup/cgi/actions.py @@ -277,6 +277,8 @@ removed lines are retired. """ + self.client.error_message.append('EditCSVAction has been disabled for security reasons') + return cl = self.db.classes[self.classname] idlessprops = cl.getprops(protected=0).keys() idlessprops.sort() Index: roundup.spec =================================================================== RCS file: /cvs/extras/rpms/roundup/F-10/roundup.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- roundup.spec 3 Oct 2008 13:52:48 -0000 1.14 +++ roundup.spec 9 Mar 2009 17:47:32 -0000 1.15 @@ -3,7 +3,7 @@ Summary: Simple and flexible issue-tracking system Name: roundup Version: 1.4.6 -Release: 1%{dist} +Release: 4%{dist} License: MIT Group: Applications/Engineering Source: http://pypi.python.org/packages/source/r/%{name}/%{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ Source2: roundup Source3: README.Fedora Patch0: roundup-setup.patch +Patch1: bts518768-disable-editcsv.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -29,6 +30,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 mv locale/ru.po locale/ru-koi8.po iconv -f koi8-r -t utf-8 locale/ru-koi8.po | sed -e 's|Content-Type: text/plain; charset=koi8-r|Content-Type: text/plain; charset=utf-8|' > locale/ru.po @@ -81,6 +83,15 @@ %doc README.Fedora COPYING.txt %changelog +* Mon Mar 9 2009 Paul P. Komkoff Jr - 1.4.6-4 +- security bug bz#489355 + +* Wed Feb 25 2009 Fedora Release Engineering - 1.4.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.4.6-2 +- Rebuild for Python 2.6 + * Fri Oct 3 2008 Paul P. Komkoff Jr - 1.4.6-1 - new upstream version From rjones at fedoraproject.org Mon Mar 9 17:49:16 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 9 Mar 2009 17:49:16 +0000 (UTC) Subject: rpms/mingw32-gnutls/EL-5 gnutls-2.6.2-nosrp.patch, NONE, 1.1 import.log, NONE, 1.1 mingw32-gnutls-2.6.3-certtool-build.patch, NONE, 1.1 mingw32-gnutls.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309174916.F1CD870034@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-gnutls/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23493/EL-5 Modified Files: .cvsignore sources Added Files: gnutls-2.6.2-nosrp.patch import.log mingw32-gnutls-2.6.3-certtool-build.patch mingw32-gnutls.spec Log Message: Initial import. gnutls-2.6.2-nosrp.patch: --- NEW FILE gnutls-2.6.2-nosrp.patch --- diff -up gnutls-2.6.2/lib/gnutlsxx.cpp.nosrp gnutls-2.6.2/lib/gnutlsxx.cpp --- gnutls-2.6.2/lib/gnutlsxx.cpp.nosrp 2008-11-12 10:56:28.000000000 +0100 +++ gnutls-2.6.2/lib/gnutlsxx.cpp 2008-12-04 14:34:10.000000000 +0100 @@ -396,12 +396,14 @@ void session::set_credentials( credentia RETWRAP(gnutls_credentials_set( s, cred.get_type(), cred.ptr())); } -#ifdef ENABLE_SRP const char* server_session::get_srp_username() const { +#ifdef ENABLE_SRP return gnutls_srp_server_get_username( s); -} +#else + return NULL; #endif +} const char* server_session::get_psk_username() const { --- NEW FILE import.log --- mingw32-gnutls-2_6_4-1_fc11:EL-5:mingw32-gnutls-2.6.4-1.fc11.src.rpm:1236620795 mingw32-gnutls-2.6.3-certtool-build.patch: --- NEW FILE mingw32-gnutls-2.6.3-certtool-build.patch --- --- gnutls-2.6.3.orig/src/Makefile.am 2008-12-12 18:45:34.000000000 +0000 +++ gnutls-2.6.3/src/Makefile.am 2009-01-23 14:30:16.000000000 +0000 @@ -37,35 +37,35 @@ gnutls_serv_SOURCES = serv.gaa serv-gaa.h serv-gaa.c list.h serv.c \ common.h common.c select.c gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \ - $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la + $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl if ENABLE_SRP srptool_SOURCES = crypt.gaa crypt-gaa.h crypt-gaa.c crypt.c srptool_LDADD = ../lib/libgnutls.la \ $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) \ - ../gl/libgnu.la ../lgl/liblgnu.la + ../gl/libgnu.la ../lgl/liblgnu.la -lintl endif psktool_SOURCES = psk.gaa psk-gaa.h psk-gaa.c psk.c psktool_LDADD = ../lib/libgnutls.la \ $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) \ - ../gl/libgnu.la ../lgl/liblgnu.la + ../gl/libgnu.la ../lgl/liblgnu.la -lintl gnutls_cli_SOURCES = cli.gaa cli-gaa.h cli-gaa.c cli.c common.h \ common.c select.c gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \ - $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la + $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl gnutls_cli_debug_SOURCES = tls_test.gaa tls_test-gaa.h tls_test-gaa.c \ tls_test.c tests.h tests.c common.h common.c gnutls_cli_debug_LDADD = ../lib/libgnutls.la \ $(LIBGCRYPT_LIBS) \ - $(LIBTASN1_LIBS) ../gl/libgnu.la + $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl certtool_SOURCES = certtool.gaa certtool-gaa.h certtool-cfg.h \ certtool-gaa.c certtool.c prime.c certtool-cfg.c certtool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \ - $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la @LTLIBREADLINE@ + $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la @LTLIBREADLINE@ -lintl if HAVE_LIBCFG certtool_LDADD += -lcfg+ else @@ -78,11 +78,11 @@ noinst_PROGRAMS = errcodes printlist errcodes_SOURCES = errcodes.c errcodes_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) \ - ../gl/libgnu.la ../lgl/liblgnu.la + ../gl/libgnu.la ../lgl/liblgnu.la -lintl printlist_SOURCES = printlist.c printlist_LDADD = ../lib/libgnutls.la \ - $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la + $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl psk-gaa.c: $(srcdir)/psk.gaa --- NEW FILE mingw32-gnutls.spec --- %define __strip %{_mingw32_strip} %define __objdump %{_mingw32_objdump} %define _use_internal_dependency_generator 0 %define __find_requires %{_mingw32_findrequires} %define __find_provides %{_mingw32_findprovides} Name: mingw32-gnutls Version: 2.6.4 Release: 1%{?dist} Summary: MinGW GnuTLS TLS/SSL encryption library License: GPLv3+ and LGPLv2+ Group: Development/Libraries URL: http://www.gnutls.org/ #Source0: ftp://ftp.gnutls.org/pub/gnutls/gnutls-%{version}.tar.bz2 # We use the same source tarball as Fedora native package, which # has the patent tainted SRP code removed. Source0: gnutls-%{version}-nosrp.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Patch1: gnutls-2.6.2-nosrp.patch # MinGW-specific patches. Patch1000: mingw32-gnutls-2.6.3-certtool-build.patch BuildRequires: mingw32-filesystem >= 40 BuildRequires: mingw32-gcc BuildRequires: mingw32-gcc-c++ BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn BuildRequires: mingw32-libgpg-error BuildRequires: mingw32-libgcrypt >= 1.2.2 BuildRequires: mingw32-gettext BuildRequires: mingw32-iconv BuildRequires: mingw32-readline BuildRequires: mingw32-zlib BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool # Yes, really ... BuildRequires: pkgconfig # For native /usr/bin/msgfmt etc. BuildRequires: gettext Requires: pkgconfig %description GnuTLS TLS/SSL encryption library. This library is cross-compiled for MinGW. %prep %setup -q -n gnutls-%{version} %patch1 -p1 -b .nosrp %patch1000 -p1 -b .mingw32 for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do touch lib/$i done %if 0%{?fedora} > 10 libtoolize --force --copy aclocal autoreconf %endif %build PATH="%{_mingw32_bindir}:$PATH" \ %{_mingw32_configure} \ --with-included-libtasn1 \ --disable-srp-authentication \ --disable-static # %{?_smp_mflags} doesn't build correctly. make %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir # Remove info and man pages which duplicate stuff in Fedora already. rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir} rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} %find_lang gnutls %clean rm -rf $RPM_BUILD_ROOT %files -f gnutls.lang %defattr(-,root,root) %doc COPYING COPYING.LIB %{_mingw32_bindir}/certtool.exe %{_mingw32_bindir}/gnutls-cli-debug.exe %{_mingw32_bindir}/gnutls-cli.exe %{_mingw32_bindir}/gnutls-serv.exe %{_mingw32_bindir}/libgnutls-26.def %{_mingw32_bindir}/libgnutls-26.dll %{_mingw32_bindir}/libgnutls-config %{_mingw32_bindir}/libgnutls-extra-26.def %{_mingw32_bindir}/libgnutls-extra-26.dll %{_mingw32_bindir}/libgnutls-extra-config %{_mingw32_bindir}/libgnutls-openssl-26.def %{_mingw32_bindir}/libgnutls-openssl-26.dll %{_mingw32_bindir}/psktool.exe %{_mingw32_libdir}/libgnutls-extra.dll.a %{_mingw32_libdir}/libgnutls-extra.la %{_mingw32_libdir}/libgnutls-openssl.dll.a %{_mingw32_libdir}/libgnutls-openssl.la %{_mingw32_libdir}/libgnutls.dll.a %{_mingw32_libdir}/libgnutls.la %{_mingw32_libdir}/pkgconfig/gnutls-extra.pc %{_mingw32_libdir}/pkgconfig/gnutls.pc %{_mingw32_includedir}/gnutls/ %{_mingw32_datadir}/aclocal/libgnutls-extra.m4 %{_mingw32_datadir}/aclocal/libgnutls.m4 %changelog * Mon Mar 9 2009 Richard W.M. Jones - 2.6.4-1 - New Fedora native version 2.6.4. * Fri Feb 20 2009 Richard W.M. Jones - 2.6.3-5 - Rebuild for mingw32-gcc 4.4 * Thu Feb 19 2009 Richard W.M. Jones - 2.6.3-4 - +BR mingw32-gcc-c++ * Fri Feb 6 2009 Richard W.M. Jones - 2.6.3-3 - Include license. * Fri Jan 23 2009 Richard W.M. Jones - 2.6.3-2 - Rebase to native Fedora version 2.6.3. - Enable C++ library. - Use find_lang macro. - Don't build static library. - Rebase MinGW patch to 2.6.3. - +BR mingw32-dlfcn. - +BR mingw32-readline. - Force rebuild of libtool. * Tue Jan 13 2009 Richard W.M. Jones - 2.4.2-4 - Requires pkgconfig. * Thu Nov 13 2008 Richard W.M. Jones - 2.4.2-3 - fix chain verification issue CVE-2008-4989 (#470079) - separate out the MinGW-specific patch from the others * Wed Sep 24 2008 Richard W.M. Jones - 2.4.2-2 - Rename mingw -> mingw32. * Wed Sep 24 2008 Richard W.M. Jones - 2.4.2-1 - New native version. * Mon Sep 22 2008 Daniel P. Berrange - 2.4.1-9 - Switch to source tar.bz2 with SRP stuff removed * Sun Sep 21 2008 Richard W.M. Jones - 2.4.1-8 - Remove duplicate manpages and info files. * Thu Sep 11 2008 Daniel P. Berrange - 2.4.1-7 - Add BR on autoconf, automake and libtool * Wed Sep 10 2008 Richard W.M. Jones - 2.4.1-6 - Need to run autoreconf after patching src/Makefile.am. - Remove static libs. * Fri Sep 5 2008 Richard W.M. Jones - 2.4.1-5 - Add patch to build certtool.exe because of missing dep of gnulib on intl. - BuildArch is noarch. * Thu Sep 4 2008 Richard W.M. Jones - 2.4.1-3 - Use mingw-filesystem RPM macros. - Depends on mingw-iconv, mingw-gettext. * Tue Sep 2 2008 Daniel P. Berrange - 2.4.1-2 - List files explicitly and use custom CFLAGS * Mon Jul 7 2008 Richard W.M. Jones - 2.4.1-1 - Initial RPM release, largely based on earlier work from several sources. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gnutls/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:01:45 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:48:46 -0000 1.2 @@ -0,0 +1 @@ +gnutls-2.6.4-nosrp.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gnutls/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:01:45 -0000 1.1 +++ sources 9 Mar 2009 17:48:46 -0000 1.2 @@ -0,0 +1 @@ +ac96cacb84b7dd7483a495d3907e7664 gnutls-2.6.4-nosrp.tar.bz2 From jstanley at fedoraproject.org Mon Mar 9 17:49:38 2009 From: jstanley at fedoraproject.org (Jon Stanley) Date: Mon, 9 Mar 2009 17:49:38 +0000 (UTC) Subject: rpms/sportrop-fonts/devel sportrop-fonts.spec,1.2,1.3 Message-ID: <20090309174938.81A4570034@cvs1.fedora.phx.redhat.com> Author: jstanley Update of /cvs/pkgs/rpms/sportrop-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23694 Modified Files: sportrop-fonts.spec Log Message: update to new packaging guidelines Index: sportrop-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/sportrop-fonts/devel/sportrop-fonts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sportrop-fonts.spec 26 Feb 2009 02:33:12 -0000 1.2 +++ sportrop-fonts.spec 9 Mar 2009 17:49:08 -0000 1.3 @@ -1,10 +1,11 @@ -%define fontname sportrop -%define fontdir %{_datadir}/fonts/%{fontname} -%define fontconfdir %{_sysconfdir}/fonts/conf.d +%define fontname sportrop +%define fontconf 63-%{fontname}.conf + +#define archivename %{name}-%{version} Name: %{fontname}-fonts Version: 0.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A multiline decorative font Group: User Interface/X @@ -14,11 +15,15 @@ Source1: %{name}-fontconfig.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + BuildArch: noarch +BuildRequires: fontpackages-devel +Requires: fontpackages-filesystem %description A neat multiline font + %prep %setup -c chmod 0644 *.txt @@ -34,38 +39,35 @@ %install -rm -rf $RPM_BUILD_ROOT +rm -fr %{buildroot} -install -dm 755 $RPM_BUILD_ROOT%{fontdir} -install -pm 644 Sportrop.ttf $RPM_BUILD_ROOT%{fontdir} +install -m 0755 -d %{buildroot}%{_fontdir} +install -m 0644 -p *.ttf %{buildroot}%{_fontdir} -install -dm 755 $RPM_BUILD_ROOT%{fontconfdir} -install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{fontconfdir}/63-%{fontname}.conf +install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ + %{buildroot}%{_fontconfig_confdir} +install -m 0644 -p %{SOURCE1} \ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf} +ln -s %{_fontconfig_templatedir}/%{fontconf} \ + %{buildroot}%{_fontconfig_confdir}/%{fontconf} -%clean -rm -rf $RPM_BUILD_ROOT +%clean +rm -fr %{buildroot} -%post -if [ -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache -f %{fontdir} || : -fi -%postun -if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache -f %{fontdir} || : -fi +%_font_pkg -f %{fontconf} *.ttf -%files -%defattr(644,root,root,755) %doc OFL_FAQ.txt OFL_License.txt tabl_c.jpg -%config(noreplace) %{fontconfdir}/63-%{fontname}.conf -%dir %{fontdir}/ -%{fontdir}/*.ttf + +%dir %{_fontdir} %changelog +* Mon Mar 9 2009 Jon Stanley - 0.9-6 +- Update to new packaging guidelines + * Wed Feb 25 2009 Fedora Release Engineering - 0.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -81,3 +83,4 @@ * Tue Jul 22 2008 Jon Stanley - 0.9-1 - Initial package + From sharkcz at fedoraproject.org Mon Mar 9 17:55:20 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Mon, 9 Mar 2009 17:55:20 +0000 (UTC) Subject: rpms/smp_utils/F-10 smp_utils-0.94-makefile.patch, NONE, 1.1 smp_utils.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309175520.59E9A70034@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/smp_utils/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25583 Modified Files: .cvsignore sources Added Files: smp_utils-0.94-makefile.patch smp_utils.spec Log Message: initial import smp_utils-0.94-makefile.patch: --- NEW FILE smp_utils-0.94-makefile.patch --- >From 304453fa4dda47e5e94f7995cdd1d3b9086370ef Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Mon, 2 Feb 2009 17:31:42 +0100 Subject: [PATCH] don't change ownership when installing the files --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f87d0a6..9f19e43 100644 --- a/Makefile +++ b/Makefile @@ -122,11 +122,11 @@ smp_rep_exp_route_tbl: smp_rep_exp_route_tbl.o libsmp.a install: $(EXECS) install -d $(INSTDIR) for name in $^; \ - do install -s -o root -g root -m 755 $$name $(INSTDIR); \ + do install -m 755 $$name $(INSTDIR); \ done install -d $(MANDIR)/$(MAN_PREF) for mp in $(MAN_PGS); \ - do install -o root -g root -m 644 doc/$$mp $(MANDIR)/$(MAN_PREF); \ + do install -m 644 doc/$$mp $(MANDIR)/$(MAN_PREF); \ gzip -9f $(MANDIR)/$(MAN_PREF)/$$mp; \ done -- 1.6.0.6 --- NEW FILE smp_utils.spec --- Summary: Utilities for SAS management protocol (SMP) Name: smp_utils Version: 0.94 Release: 2%{?dist} License: BSD Group: Applications/System URL: http://sg.danny.cz/sg/smp_utils.html Source0: http://sg.danny.cz/sg/p/%{name}-%{version}.tgz Patch0: %{name}-0.94-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This is a package of utilities. Each utility sends a Serial Attached SCSI (SAS) Management Protocol (SMP) request to a SMP target. If the request fails then the error is decoded. If the request succeeds then the response is either decoded, printed out in hexadecimal or output in binary. This package supports multiple interfaces since SMP passthroughs are not mature. This package supports the linux 2.4 and 2.6 series and should be easy to port to other operating systems. Warning: Some of these tools access the internals of your system and the incorrect usage of them may render your system inoperable. %prep %setup -q %patch0 -p1 %build make %{?smp_mflags} CFLAGS="%{optflags} -DSMP_UTILS_LINUX" %install rm -rf %{buildroot} make install \ PREFIX=%{_prefix} \ DESTDIR=%{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog COPYING COVERAGE CREDITS INSTALL README %{_bindir}/* %{_mandir}/man8/* %changelog * Mon Mar 9 2009 Dan Hor??k 0.94-2 - update BuildRoot * Mon Feb 2 2009 Dan Hor??k 0.94-1 - update for Fedora compliance * Mon Dec 29 2008 - dgilbert at interlog dot com - adjust sgv4 for lk 2.6.27, sync with sas2r15 * smp_utils-0.94 * Sun Jan 06 2008 - dgilbert at interlog dot com - sync with sas2r13, add 'sgv4' interface * smp_utils-0.93 * Fri Dec 08 2006 - dgilbert at interlog dot com - sync against sas2r07, add smp_conf_general * smp_utils-0.92 * Tue Aug 22 2006 - dgilbert at interlog dot com - add smp_phy_test and smp_discover_list, uniform exit status values * smp_utils-0.91 * Sun Jun 11 2006 - dgilbert at interlog dot com - add smp_read_gpio, smp_conf_route_info and smp_write_gpio * smp_utils-0.90 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/smp_utils/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:09:09 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:54:49 -0000 1.2 @@ -0,0 +1 @@ +smp_utils-0.94.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/smp_utils/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:09:09 -0000 1.1 +++ sources 9 Mar 2009 17:54:49 -0000 1.2 @@ -0,0 +1 @@ +301917fef92726c947b8623813c2cdfc smp_utils-0.94.tgz From jussilehtola at fedoraproject.org Mon Mar 9 17:56:11 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Mon, 9 Mar 2009 17:56:11 +0000 (UTC) Subject: rpms/qd/devel import.log, NONE, 1.1 qd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309175611.0574E70034@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/qd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25563/devel Modified Files: .cvsignore sources Added Files: import.log qd.spec Log Message: * Mon Mar 09 2009 Jussi Lehtola - 2.3.7-5 - Import to Fedora. --- NEW FILE import.log --- qd-2_3_7-5_fc10:HEAD:qd-2.3.7-5.fc10.src.rpm:1236621257 --- NEW FILE qd.spec --- # Disable debug package since only static library provided (leading to an empty debuginfo file) %global debug_package %{nil} Name: qd Version: 2.3.7 Release: 5%{?dist} Summary: Double-Double and Quad-Double Arithmetic Group: Applications/Engineering License: BSD URL: http://www.cs.berkeley.edu/~yozo/ Source0: http://www.cs.berkeley.edu/%7Eyozo/software/qd-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-c++ BuildRequires: gcc-gfortran %description This package provides numeric types of twice the precision of IEEE double (106 mantissa bits, or approximately 32 decimal digits) and four times the precision of IEEE double (212 mantissa bits, or approximately 64 decimal digits). Due to features such as operator and function overloading, these facilities can be utilized with only minor modifications to conventional C++ and Fortran-90 programs. In addition to the basic arithmetic operations (add, subtract, multiply, divide, square root), common transcendental functions such as the exponential, logarithm, trigonometric and hyperbolic functions are also included. %package devel Summary: Double-Double and Quad-Double Arithmetic Group: Applications/Engineering Provides: qd-static = %{name}-%{version} %description devel This package provides numeric types of twice the precision of IEEE double (106 mantissa bits, or approximately 32 decimal digits) and four times the precision of IEEE double (212 mantissa bits, or approximately 64 decimal digits). Due to features such as operator and function overloading, these facilities can be utilized with only minor modifications to conventional C++ and Fortran-90 programs. In addition to the basic arithmetic operations (add, subtract, multiply, divide, square root), common transcendental functions such as the exponential, logarithm, trigonometric and hyperbolic functions are also included. %prep %setup -q -n qd-%{version} %build export CC=gcc export CXX=g++ export FC=gfortran export FCFLAGS="%{optflags}" %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Fix location of documentation mv %{buildroot}/usr/share/doc/qd/* . rm -rf %{buildroot}/usr/share/ %check make check %clean rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README qd.pdf TODO %{_bindir}/qd-config %{_includedir}/qd %{_libdir}/* %changelog * Sun Mar 08 2009 Jussi Lehtola - 2.3.7-5 - Fix license. * Thu Dec 18 2008 Jussi Lehtola - 2.3.7-4 - Change base name back to qd. * Sat Dec 13 2008 Jussi Lehtola - 2.3.7-3 - Removed debug package. * Sat Dec 13 2008 Jussi Lehtola - 2.3.7-2 - Review fixes. - Rename package to qd-devel. * Thu Nov 06 2008 Jussi Lehtola - 2.3.7-1 - First release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qd/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:04:53 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:55:40 -0000 1.2 @@ -0,0 +1 @@ +qd-2.3.7.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qd/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:04:53 -0000 1.1 +++ sources 9 Mar 2009 17:55:40 -0000 1.2 @@ -0,0 +1 @@ +8a66004a0eead55cf3cca87ddf3b69d8 qd-2.3.7.tar.gz From sharkcz at fedoraproject.org Mon Mar 9 17:57:12 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Mon, 9 Mar 2009 17:57:12 +0000 (UTC) Subject: rpms/smp_utils/F-9 smp_utils-0.94-makefile.patch, NONE, 1.1 smp_utils.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309175712.D9F1470034@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/smp_utils/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26269 Modified Files: .cvsignore sources Added Files: smp_utils-0.94-makefile.patch smp_utils.spec Log Message: initial import smp_utils-0.94-makefile.patch: --- NEW FILE smp_utils-0.94-makefile.patch --- >From 304453fa4dda47e5e94f7995cdd1d3b9086370ef Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Mon, 2 Feb 2009 17:31:42 +0100 Subject: [PATCH] don't change ownership when installing the files --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f87d0a6..9f19e43 100644 --- a/Makefile +++ b/Makefile @@ -122,11 +122,11 @@ smp_rep_exp_route_tbl: smp_rep_exp_route_tbl.o libsmp.a install: $(EXECS) install -d $(INSTDIR) for name in $^; \ - do install -s -o root -g root -m 755 $$name $(INSTDIR); \ + do install -m 755 $$name $(INSTDIR); \ done install -d $(MANDIR)/$(MAN_PREF) for mp in $(MAN_PGS); \ - do install -o root -g root -m 644 doc/$$mp $(MANDIR)/$(MAN_PREF); \ + do install -m 644 doc/$$mp $(MANDIR)/$(MAN_PREF); \ gzip -9f $(MANDIR)/$(MAN_PREF)/$$mp; \ done -- 1.6.0.6 --- NEW FILE smp_utils.spec --- Summary: Utilities for SAS management protocol (SMP) Name: smp_utils Version: 0.94 Release: 2%{?dist} License: BSD Group: Applications/System URL: http://sg.danny.cz/sg/smp_utils.html Source0: http://sg.danny.cz/sg/p/%{name}-%{version}.tgz Patch0: %{name}-0.94-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This is a package of utilities. Each utility sends a Serial Attached SCSI (SAS) Management Protocol (SMP) request to a SMP target. If the request fails then the error is decoded. If the request succeeds then the response is either decoded, printed out in hexadecimal or output in binary. This package supports multiple interfaces since SMP passthroughs are not mature. This package supports the linux 2.4 and 2.6 series and should be easy to port to other operating systems. Warning: Some of these tools access the internals of your system and the incorrect usage of them may render your system inoperable. %prep %setup -q %patch0 -p1 %build make %{?smp_mflags} CFLAGS="%{optflags} -DSMP_UTILS_LINUX" %install rm -rf %{buildroot} make install \ PREFIX=%{_prefix} \ DESTDIR=%{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog COPYING COVERAGE CREDITS INSTALL README %{_bindir}/* %{_mandir}/man8/* %changelog * Mon Mar 9 2009 Dan Hor??k 0.94-2 - update BuildRoot * Mon Feb 2 2009 Dan Hor??k 0.94-1 - update for Fedora compliance * Mon Dec 29 2008 - dgilbert at interlog dot com - adjust sgv4 for lk 2.6.27, sync with sas2r15 * smp_utils-0.94 * Sun Jan 06 2008 - dgilbert at interlog dot com - sync with sas2r13, add 'sgv4' interface * smp_utils-0.93 * Fri Dec 08 2006 - dgilbert at interlog dot com - sync against sas2r07, add smp_conf_general * smp_utils-0.92 * Tue Aug 22 2006 - dgilbert at interlog dot com - add smp_phy_test and smp_discover_list, uniform exit status values * smp_utils-0.91 * Sun Jun 11 2006 - dgilbert at interlog dot com - add smp_read_gpio, smp_conf_route_info and smp_write_gpio * smp_utils-0.90 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/smp_utils/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:09:09 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:56:42 -0000 1.2 @@ -0,0 +1 @@ +smp_utils-0.94.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/smp_utils/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:09:09 -0000 1.1 +++ sources 9 Mar 2009 17:56:42 -0000 1.2 @@ -0,0 +1 @@ +301917fef92726c947b8623813c2cdfc smp_utils-0.94.tgz From jussilehtola at fedoraproject.org Mon Mar 9 17:58:25 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Mon, 9 Mar 2009 17:58:25 +0000 (UTC) Subject: rpms/qd/EL-5 qd.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090309175825.C4BF470034@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/qd/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26478/EL-5 Modified Files: sources Added Files: qd.spec Log Message: * Mon Mar 09 2009 Jussi Lehtola - 2.3.7-5 - Import to Fedora. --- NEW FILE qd.spec --- # Disable debug package since only static library provided (leading to an empty debuginfo file) %global debug_package %{nil} Name: qd Version: 2.3.7 Release: 5%{?dist} Summary: Double-Double and Quad-Double Arithmetic Group: Applications/Engineering License: BSD URL: http://www.cs.berkeley.edu/~yozo/ Source0: http://www.cs.berkeley.edu/%7Eyozo/software/qd-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-c++ BuildRequires: gcc-gfortran %description This package provides numeric types of twice the precision of IEEE double (106 mantissa bits, or approximately 32 decimal digits) and four times the precision of IEEE double (212 mantissa bits, or approximately 64 decimal digits). Due to features such as operator and function overloading, these facilities can be utilized with only minor modifications to conventional C++ and Fortran-90 programs. In addition to the basic arithmetic operations (add, subtract, multiply, divide, square root), common transcendental functions such as the exponential, logarithm, trigonometric and hyperbolic functions are also included. %package devel Summary: Double-Double and Quad-Double Arithmetic Group: Applications/Engineering Provides: qd-static = %{name}-%{version} %description devel This package provides numeric types of twice the precision of IEEE double (106 mantissa bits, or approximately 32 decimal digits) and four times the precision of IEEE double (212 mantissa bits, or approximately 64 decimal digits). Due to features such as operator and function overloading, these facilities can be utilized with only minor modifications to conventional C++ and Fortran-90 programs. In addition to the basic arithmetic operations (add, subtract, multiply, divide, square root), common transcendental functions such as the exponential, logarithm, trigonometric and hyperbolic functions are also included. %prep %setup -q -n qd-%{version} %build export CC=gcc export CXX=g++ export FC=gfortran export FCFLAGS="%{optflags}" %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Fix location of documentation mv %{buildroot}/usr/share/doc/qd/* . rm -rf %{buildroot}/usr/share/ %check make check %clean rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README qd.pdf TODO %{_bindir}/qd-config %{_includedir}/qd %{_libdir}/* %changelog * Sun Mar 08 2009 Jussi Lehtola - 2.3.7-5 - Fix license. * Thu Dec 18 2008 Jussi Lehtola - 2.3.7-4 - Change base name back to qd. * Sat Dec 13 2008 Jussi Lehtola - 2.3.7-3 - Removed debug package. * Sat Dec 13 2008 Jussi Lehtola - 2.3.7-2 - Review fixes. - Rename package to qd-devel. * Thu Nov 06 2008 Jussi Lehtola - 2.3.7-1 - First release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qd/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:04:53 -0000 1.1 +++ sources 9 Mar 2009 17:57:55 -0000 1.2 @@ -0,0 +1 @@ +8a66004a0eead55cf3cca87ddf3b69d8 qd-2.3.7.tar.gz From jussilehtola at fedoraproject.org Mon Mar 9 17:58:26 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Mon, 9 Mar 2009 17:58:26 +0000 (UTC) Subject: rpms/qd/F-10 qd.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090309175826.287F570118@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/qd/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26478/F-10 Modified Files: sources Added Files: qd.spec Log Message: * Mon Mar 09 2009 Jussi Lehtola - 2.3.7-5 - Import to Fedora. --- NEW FILE qd.spec --- # Disable debug package since only static library provided (leading to an empty debuginfo file) %global debug_package %{nil} Name: qd Version: 2.3.7 Release: 5%{?dist} Summary: Double-Double and Quad-Double Arithmetic Group: Applications/Engineering License: BSD URL: http://www.cs.berkeley.edu/~yozo/ Source0: http://www.cs.berkeley.edu/%7Eyozo/software/qd-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-c++ BuildRequires: gcc-gfortran %description This package provides numeric types of twice the precision of IEEE double (106 mantissa bits, or approximately 32 decimal digits) and four times the precision of IEEE double (212 mantissa bits, or approximately 64 decimal digits). Due to features such as operator and function overloading, these facilities can be utilized with only minor modifications to conventional C++ and Fortran-90 programs. In addition to the basic arithmetic operations (add, subtract, multiply, divide, square root), common transcendental functions such as the exponential, logarithm, trigonometric and hyperbolic functions are also included. %package devel Summary: Double-Double and Quad-Double Arithmetic Group: Applications/Engineering Provides: qd-static = %{name}-%{version} %description devel This package provides numeric types of twice the precision of IEEE double (106 mantissa bits, or approximately 32 decimal digits) and four times the precision of IEEE double (212 mantissa bits, or approximately 64 decimal digits). Due to features such as operator and function overloading, these facilities can be utilized with only minor modifications to conventional C++ and Fortran-90 programs. In addition to the basic arithmetic operations (add, subtract, multiply, divide, square root), common transcendental functions such as the exponential, logarithm, trigonometric and hyperbolic functions are also included. %prep %setup -q -n qd-%{version} %build export CC=gcc export CXX=g++ export FC=gfortran export FCFLAGS="%{optflags}" %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Fix location of documentation mv %{buildroot}/usr/share/doc/qd/* . rm -rf %{buildroot}/usr/share/ %check make check %clean rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README qd.pdf TODO %{_bindir}/qd-config %{_includedir}/qd %{_libdir}/* %changelog * Sun Mar 08 2009 Jussi Lehtola - 2.3.7-5 - Fix license. * Thu Dec 18 2008 Jussi Lehtola - 2.3.7-4 - Change base name back to qd. * Sat Dec 13 2008 Jussi Lehtola - 2.3.7-3 - Removed debug package. * Sat Dec 13 2008 Jussi Lehtola - 2.3.7-2 - Review fixes. - Rename package to qd-devel. * Thu Nov 06 2008 Jussi Lehtola - 2.3.7-1 - First release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qd/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:04:53 -0000 1.1 +++ sources 9 Mar 2009 17:57:55 -0000 1.2 @@ -0,0 +1 @@ +8a66004a0eead55cf3cca87ddf3b69d8 qd-2.3.7.tar.gz From jussilehtola at fedoraproject.org Mon Mar 9 17:58:26 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Mon, 9 Mar 2009 17:58:26 +0000 (UTC) Subject: rpms/qd/F-9 qd.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20090309175826.7EDC070034@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/qd/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26478/F-9 Modified Files: sources Added Files: qd.spec Log Message: * Mon Mar 09 2009 Jussi Lehtola - 2.3.7-5 - Import to Fedora. --- NEW FILE qd.spec --- # Disable debug package since only static library provided (leading to an empty debuginfo file) %global debug_package %{nil} Name: qd Version: 2.3.7 Release: 5%{?dist} Summary: Double-Double and Quad-Double Arithmetic Group: Applications/Engineering License: BSD URL: http://www.cs.berkeley.edu/~yozo/ Source0: http://www.cs.berkeley.edu/%7Eyozo/software/qd-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-c++ BuildRequires: gcc-gfortran %description This package provides numeric types of twice the precision of IEEE double (106 mantissa bits, or approximately 32 decimal digits) and four times the precision of IEEE double (212 mantissa bits, or approximately 64 decimal digits). Due to features such as operator and function overloading, these facilities can be utilized with only minor modifications to conventional C++ and Fortran-90 programs. In addition to the basic arithmetic operations (add, subtract, multiply, divide, square root), common transcendental functions such as the exponential, logarithm, trigonometric and hyperbolic functions are also included. %package devel Summary: Double-Double and Quad-Double Arithmetic Group: Applications/Engineering Provides: qd-static = %{name}-%{version} %description devel This package provides numeric types of twice the precision of IEEE double (106 mantissa bits, or approximately 32 decimal digits) and four times the precision of IEEE double (212 mantissa bits, or approximately 64 decimal digits). Due to features such as operator and function overloading, these facilities can be utilized with only minor modifications to conventional C++ and Fortran-90 programs. In addition to the basic arithmetic operations (add, subtract, multiply, divide, square root), common transcendental functions such as the exponential, logarithm, trigonometric and hyperbolic functions are also included. %prep %setup -q -n qd-%{version} %build export CC=gcc export CXX=g++ export FC=gfortran export FCFLAGS="%{optflags}" %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Fix location of documentation mv %{buildroot}/usr/share/doc/qd/* . rm -rf %{buildroot}/usr/share/ %check make check %clean rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README qd.pdf TODO %{_bindir}/qd-config %{_includedir}/qd %{_libdir}/* %changelog * Sun Mar 08 2009 Jussi Lehtola - 2.3.7-5 - Fix license. * Thu Dec 18 2008 Jussi Lehtola - 2.3.7-4 - Change base name back to qd. * Sat Dec 13 2008 Jussi Lehtola - 2.3.7-3 - Removed debug package. * Sat Dec 13 2008 Jussi Lehtola - 2.3.7-2 - Review fixes. - Rename package to qd-devel. * Thu Nov 06 2008 Jussi Lehtola - 2.3.7-1 - First release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qd/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:04:53 -0000 1.1 +++ sources 9 Mar 2009 17:57:56 -0000 1.2 @@ -0,0 +1 @@ +8a66004a0eead55cf3cca87ddf3b69d8 qd-2.3.7.tar.gz From jkeating at fedoraproject.org Mon Mar 9 17:59:05 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Mon, 9 Mar 2009 17:59:05 +0000 (UTC) Subject: rpms/pungi/devel .cvsignore, 1.60, 1.61 import.log, 1.11, 1.12 pungi.spec, 1.67, 1.68 sources, 1.61, 1.62 Message-ID: <20090309175905.4DF1B70034@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/pungi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26910/devel Modified Files: .cvsignore import.log pungi.spec sources Log Message: New upstream release. Knowingly overwriting releng auto commit Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- .cvsignore 12 Feb 2009 01:18:48 -0000 1.60 +++ .cvsignore 9 Mar 2009 17:58:34 -0000 1.61 @@ -1 +1 @@ -pungi-2.0.10.tar.bz2 +pungi-2.0.11.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 12 Feb 2009 01:18:48 -0000 1.11 +++ import.log 9 Mar 2009 17:58:34 -0000 1.12 @@ -9,3 +9,4 @@ pungi-2_0_8-1_fc10:HEAD:pungi-2.0.8-1.fc10.src.rpm:1225841597 pungi-2_0_9-1_fc10:HEAD:pungi-2.0.9-1.fc10.src.rpm:1228437620 pungi-2_0_10-1_fc10:HEAD:pungi-2.0.10-1.fc10.src.rpm:1234401376 +pungi-2_0_11-1_fc11:HEAD:pungi-2.0.11-1.fc11.src.rpm:1236621458 Index: pungi.spec =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- pungi.spec 23 Feb 2009 19:39:44 -0000 1.67 +++ pungi.spec 9 Mar 2009 17:58:34 -0000 1.68 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pungi -Version: 2.0.10 -Release: 2%{?dist} +Version: 2.0.11 +Release: 1%{?dist} Summary: Distribution compose tool Group: Development/Tools @@ -56,8 +56,9 @@ %changelog -* Mon Feb 23 2009 Fedora Release Engineering - 2.0.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Mon Mar 09 2009 Jesse Keating - 2.0.11-1 +- Fix size estimation in splittree +- Disable arch test in splittree for now * Wed Feb 11 2009 Jesse Keating - 2.0.10-1 - Fix CD1 overflow issue Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 12 Feb 2009 01:18:48 -0000 1.61 +++ sources 9 Mar 2009 17:58:34 -0000 1.62 @@ -1 +1 @@ -ec292dc2497e020527ceba950497ddd0 pungi-2.0.10.tar.bz2 +7daa38de3044c989b9dcec0fc86c5e25 pungi-2.0.11.tar.bz2 From sharkcz at fedoraproject.org Mon Mar 9 17:59:39 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Mon, 9 Mar 2009 17:59:39 +0000 (UTC) Subject: rpms/smp_utils/EL-5 smp_utils-0.94-makefile.patch, NONE, 1.1 smp_utils.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309175939.EAD9270034@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/smp_utils/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27324 Modified Files: .cvsignore sources Added Files: smp_utils-0.94-makefile.patch smp_utils.spec Log Message: initial import smp_utils-0.94-makefile.patch: --- NEW FILE smp_utils-0.94-makefile.patch --- >From 304453fa4dda47e5e94f7995cdd1d3b9086370ef Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Mon, 2 Feb 2009 17:31:42 +0100 Subject: [PATCH] don't change ownership when installing the files --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f87d0a6..9f19e43 100644 --- a/Makefile +++ b/Makefile @@ -122,11 +122,11 @@ smp_rep_exp_route_tbl: smp_rep_exp_route_tbl.o libsmp.a install: $(EXECS) install -d $(INSTDIR) for name in $^; \ - do install -s -o root -g root -m 755 $$name $(INSTDIR); \ + do install -m 755 $$name $(INSTDIR); \ done install -d $(MANDIR)/$(MAN_PREF) for mp in $(MAN_PGS); \ - do install -o root -g root -m 644 doc/$$mp $(MANDIR)/$(MAN_PREF); \ + do install -m 644 doc/$$mp $(MANDIR)/$(MAN_PREF); \ gzip -9f $(MANDIR)/$(MAN_PREF)/$$mp; \ done -- 1.6.0.6 --- NEW FILE smp_utils.spec --- Summary: Utilities for SAS management protocol (SMP) Name: smp_utils Version: 0.94 Release: 2%{?dist} License: BSD Group: Applications/System URL: http://sg.danny.cz/sg/smp_utils.html Source0: http://sg.danny.cz/sg/p/%{name}-%{version}.tgz Patch0: %{name}-0.94-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This is a package of utilities. Each utility sends a Serial Attached SCSI (SAS) Management Protocol (SMP) request to a SMP target. If the request fails then the error is decoded. If the request succeeds then the response is either decoded, printed out in hexadecimal or output in binary. This package supports multiple interfaces since SMP passthroughs are not mature. This package supports the linux 2.4 and 2.6 series and should be easy to port to other operating systems. Warning: Some of these tools access the internals of your system and the incorrect usage of them may render your system inoperable. %prep %setup -q %patch0 -p1 %build make %{?smp_mflags} CFLAGS="%{optflags} -DSMP_UTILS_LINUX" %install rm -rf %{buildroot} make install \ PREFIX=%{_prefix} \ DESTDIR=%{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog COPYING COVERAGE CREDITS INSTALL README %{_bindir}/* %{_mandir}/man8/* %changelog * Mon Mar 9 2009 Dan Hor??k 0.94-2 - update BuildRoot * Mon Feb 2 2009 Dan Hor??k 0.94-1 - update for Fedora compliance * Mon Dec 29 2008 - dgilbert at interlog dot com - adjust sgv4 for lk 2.6.27, sync with sas2r15 * smp_utils-0.94 * Sun Jan 06 2008 - dgilbert at interlog dot com - sync with sas2r13, add 'sgv4' interface * smp_utils-0.93 * Fri Dec 08 2006 - dgilbert at interlog dot com - sync against sas2r07, add smp_conf_general * smp_utils-0.92 * Tue Aug 22 2006 - dgilbert at interlog dot com - add smp_phy_test and smp_discover_list, uniform exit status values * smp_utils-0.91 * Sun Jun 11 2006 - dgilbert at interlog dot com - add smp_read_gpio, smp_conf_route_info and smp_write_gpio * smp_utils-0.90 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/smp_utils/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:09:09 -0000 1.1 +++ .cvsignore 9 Mar 2009 17:59:09 -0000 1.2 @@ -0,0 +1 @@ +smp_utils-0.94.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/smp_utils/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:09:09 -0000 1.1 +++ sources 9 Mar 2009 17:59:09 -0000 1.2 @@ -0,0 +1 @@ +301917fef92726c947b8623813c2cdfc smp_utils-0.94.tgz From sharkcz at fedoraproject.org Mon Mar 9 18:01:26 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Mon, 9 Mar 2009 18:01:26 +0000 (UTC) Subject: rpms/smp_utils/EL-4 smp_utils-0.94-makefile.patch, NONE, 1.1 smp_utils.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309180126.E9D8770034@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/smp_utils/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28113 Modified Files: .cvsignore sources Added Files: smp_utils-0.94-makefile.patch smp_utils.spec Log Message: initial import smp_utils-0.94-makefile.patch: --- NEW FILE smp_utils-0.94-makefile.patch --- >From 304453fa4dda47e5e94f7995cdd1d3b9086370ef Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Mon, 2 Feb 2009 17:31:42 +0100 Subject: [PATCH] don't change ownership when installing the files --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f87d0a6..9f19e43 100644 --- a/Makefile +++ b/Makefile @@ -122,11 +122,11 @@ smp_rep_exp_route_tbl: smp_rep_exp_route_tbl.o libsmp.a install: $(EXECS) install -d $(INSTDIR) for name in $^; \ - do install -s -o root -g root -m 755 $$name $(INSTDIR); \ + do install -m 755 $$name $(INSTDIR); \ done install -d $(MANDIR)/$(MAN_PREF) for mp in $(MAN_PGS); \ - do install -o root -g root -m 644 doc/$$mp $(MANDIR)/$(MAN_PREF); \ + do install -m 644 doc/$$mp $(MANDIR)/$(MAN_PREF); \ gzip -9f $(MANDIR)/$(MAN_PREF)/$$mp; \ done -- 1.6.0.6 --- NEW FILE smp_utils.spec --- Summary: Utilities for SAS management protocol (SMP) Name: smp_utils Version: 0.94 Release: 2%{?dist} License: BSD Group: Applications/System URL: http://sg.danny.cz/sg/smp_utils.html Source0: http://sg.danny.cz/sg/p/%{name}-%{version}.tgz Patch0: %{name}-0.94-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This is a package of utilities. Each utility sends a Serial Attached SCSI (SAS) Management Protocol (SMP) request to a SMP target. If the request fails then the error is decoded. If the request succeeds then the response is either decoded, printed out in hexadecimal or output in binary. This package supports multiple interfaces since SMP passthroughs are not mature. This package supports the linux 2.4 and 2.6 series and should be easy to port to other operating systems. Warning: Some of these tools access the internals of your system and the incorrect usage of them may render your system inoperable. %prep %setup -q %patch0 -p1 %build make %{?smp_mflags} CFLAGS="%{optflags} -DSMP_UTILS_LINUX" %install rm -rf %{buildroot} make install \ PREFIX=%{_prefix} \ DESTDIR=%{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog COPYING COVERAGE CREDITS INSTALL README %{_bindir}/* %{_mandir}/man8/* %changelog * Mon Mar 9 2009 Dan Hor??k 0.94-2 - update BuildRoot * Mon Feb 2 2009 Dan Hor??k 0.94-1 - update for Fedora compliance * Mon Dec 29 2008 - dgilbert at interlog dot com - adjust sgv4 for lk 2.6.27, sync with sas2r15 * smp_utils-0.94 * Sun Jan 06 2008 - dgilbert at interlog dot com - sync with sas2r13, add 'sgv4' interface * smp_utils-0.93 * Fri Dec 08 2006 - dgilbert at interlog dot com - sync against sas2r07, add smp_conf_general * smp_utils-0.92 * Tue Aug 22 2006 - dgilbert at interlog dot com - add smp_phy_test and smp_discover_list, uniform exit status values * smp_utils-0.91 * Sun Jun 11 2006 - dgilbert at interlog dot com - add smp_read_gpio, smp_conf_route_info and smp_write_gpio * smp_utils-0.90 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/smp_utils/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:09:09 -0000 1.1 +++ .cvsignore 9 Mar 2009 18:00:56 -0000 1.2 @@ -0,0 +1 @@ +smp_utils-0.94.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/smp_utils/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:09:09 -0000 1.1 +++ sources 9 Mar 2009 18:00:56 -0000 1.2 @@ -0,0 +1 @@ +301917fef92726c947b8623813c2cdfc smp_utils-0.94.tgz From twaugh at fedoraproject.org Mon Mar 9 18:03:29 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Mon, 9 Mar 2009 18:03:29 +0000 (UTC) Subject: rpms/hplip/devel hplip.spec,1.202,1.203 Message-ID: <20090309180329.6BB8C70034@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/hplip/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28831 Modified Files: hplip.spec Log Message: * Mon Mar 9 2009 Tim Waugh 3.9.2-4 - Ship libhpmud.so (bug #489059). Index: hplip.spec =================================================================== RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- hplip.spec 9 Mar 2009 17:45:23 -0000 1.202 +++ hplip.spec 9 Mar 2009 18:02:58 -0000 1.203 @@ -150,7 +150,8 @@ rm -f %{buildroot}%{_bindir}/foomatic-rip \ %{buildroot}%{_libdir}/cups/filter/foomatic-rip \ %{buildroot}%{_libdir}/*.la \ - %{buildroot}%{_libdir}/*.so \ + %{buildroot}%{_libdir}/python*/site-packages/*.la \ + %{buildroot}%{_libdir}/libhpip.so \ %{buildroot}%{_libdir}/sane/*.la \ %{buildroot}%{_datadir}/cups/model/foomatic-ppds \ %{buildroot}%{_datadir}/applications/hplip.desktop \ @@ -268,7 +269,7 @@ %files libs %defattr(-,root,root) -%{_libdir}/libhpip.so* +%{_libdir}/libhpip.so.* %{_libdir}/libhpmud.so* # Python extension %{_libdir}/python*/site-packages/* @@ -327,6 +328,7 @@ %changelog * Mon Mar 9 2009 Tim Waugh 3.9.2-4 +- Ship libhpmud.so (bug #489059). - Fixed no-root-config patch (bug #489055). * Tue Feb 24 2009 Fedora Release Engineering - 3.9.2-3 From hardaker at fedoraproject.org Mon Mar 9 18:04:20 2009 From: hardaker at fedoraproject.org (Wes Hardaker) Date: Mon, 9 Mar 2009 18:04:20 +0000 (UTC) Subject: rpms/geoqo/devel .cvsignore, 1.4, 1.5 geoqo.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <20090309180420.2115D70034@cvs1.fedora.phx.redhat.com> Author: hardaker Update of /cvs/extras/rpms/geoqo/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29078 Modified Files: .cvsignore geoqo.spec sources Log Message: update for 1.01 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geoqo/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Nov 2008 01:05:00 -0000 1.4 +++ .cvsignore 9 Mar 2009 18:03:49 -0000 1.5 @@ -1 +1 @@ -geoqo-0.99.tar.gz +geoqo-1.01.tar.gz Index: geoqo.spec =================================================================== RCS file: /cvs/extras/rpms/geoqo/devel/geoqo.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- geoqo.spec 24 Feb 2009 20:39:13 -0000 1.8 +++ geoqo.spec 9 Mar 2009 18:03:49 -0000 1.9 @@ -1,7 +1,7 @@ Summary: GeoCaching and General Waypoint Database Name: geoqo -Version: 0.99 -Release: 2%{?dist} +Version: 1.01 +Release: 1%{?dist} License: GPLv2 Group: Amusements/Games URL: http://www.geoqo.org/ @@ -19,7 +19,6 @@ BuildRequires: perl(XML::Simple) BuildRequires: perl(DBD::SQLite2) BuildRequires: perl(Text::Balanced) -Patch0: geoqo-makefile.patch %description geoqo is an application and support modules for manipulating a database @@ -33,8 +32,6 @@ %prep %setup -q -n geoqo-%{version} -%patch0 -p0 - %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -81,6 +78,9 @@ %{_datadir}/geoqo/scripts/*/* %changelog +* Mon Mar 9 2009 Wes Hardaker - 1.01-1 +- Upgrade to upstream 1.01 + * Tue Feb 24 2009 Fedora Release Engineering - 0.99-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/geoqo/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Nov 2008 01:05:00 -0000 1.4 +++ sources 9 Mar 2009 18:03:49 -0000 1.5 @@ -1 +1 @@ -1e011b2f4c4eef632fd945a4503da068 geoqo-0.99.tar.gz +da5feb149bd75303f7be3bb90fc8b4ee geoqo-1.01.tar.gz From uwog at fedoraproject.org Mon Mar 9 18:05:31 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Mon, 9 Mar 2009 18:05:31 +0000 (UTC) Subject: rpms/pyabiword/devel .cvsignore, 1.2, 1.3 pyabiword.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <20090309180531.1468270034@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/pyabiword/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29460 Modified Files: .cvsignore pyabiword.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Jul 2008 16:54:46 -0000 1.2 +++ .cvsignore 9 Mar 2009 18:05:00 -0000 1.3 @@ -1 +1 @@ -pyabiword-0.6.1.tar.gz +pyabiword-0.6.2.tar.gz Index: pyabiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/devel/pyabiword.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pyabiword.spec 26 Feb 2009 19:42:35 -0000 1.3 +++ pyabiword.spec 9 Mar 2009 18:05:00 -0000 1.4 @@ -4,8 +4,8 @@ Summary: Python bindings for libabiword Name: pyabiword -Version: 0.6.1 -Release: 5%{?dist} +Version: 0.6.2 +Release: 1%{?dist} Source0: pyabiword-%{version}.tar.gz URL: http://abisource.com/downloads/pyabiword/%{version}/pyabiword-%{version}.tar.gz License: GPL+ @@ -65,6 +65,9 @@ %{_datadir}/pygtk/2.0/defs/pyabiword.defs %changelog +* Mon Mar 09 2009 Marc Maurer - 0.6.2-1 +- New upstream release + * Thu Feb 26 2009 Fedora Release Engineering - 0.6.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Jul 2008 16:54:46 -0000 1.2 +++ sources 9 Mar 2009 18:05:00 -0000 1.3 @@ -1 +1 @@ -d0cfa7533fc30db236993131a513ec0d pyabiword-0.6.1.tar.gz +c2e652ff6c5f9b5df0d28773952e4c0c pyabiword-0.6.2.tar.gz From sharkcz at fedoraproject.org Mon Mar 9 18:07:16 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Mon, 9 Mar 2009 18:07:16 +0000 (UTC) Subject: rpms/touchcal/F-10 touchcal-0.31-strncpy.patch, NONE, 1.1 touchcal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309180717.086DE70034@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/touchcal/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29995 Modified Files: .cvsignore sources Added Files: touchcal-0.31-strncpy.patch touchcal.spec Log Message: initial import touchcal-0.31-strncpy.patch: --- NEW FILE touchcal-0.31-strncpy.patch --- >From 5f67053c9f53fd3e116cb53d3cfd891f7655bd3f Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Tue, 3 Feb 2009 11:58:58 +0100 Subject: [PATCH] fix string overflow --- touchcal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/touchcal.c b/touchcal.c index 7341fd7..b7b192b 100644 --- a/touchcal.c +++ b/touchcal.c @@ -139,7 +139,7 @@ static void init_mu(char dev[]) set_page[4]=0x0d; /*define data string*/ - strcpy(data,"00180769001D0793"); + strncpy(data,"00180769001D0793",16); bzero(&newtio, sizeof(newtio)); /* clear struct for new port settings */ -- 1.6.0.6 --- NEW FILE touchcal.spec --- Name: touchcal Version: 0.31 Release: 1%{?dist} Summary: Calibration utility for touch screens Group: User Interface/X Hardware Support License: GPLv2+ URL: http://touchcal.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-0.31-strncpy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel %description touchcal is a tool to calibrate touch screens with serial controllers from the manufacturers EloGraphics (IntelliTouch E281-2310) and MicroTouch (SMT3 serial) for use under Xorg. %prep %setup -q %patch0 -p1 -b .strncpy %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_bindir}/touchcal %changelog * Tue Feb 3 2009 Dan Hor??k 0.31-1 - update to upstream version 0.31 * Mon Jun 6 2006 Dan Hor??k 0.23-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/touchcal/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 15:59:06 -0000 1.1 +++ .cvsignore 9 Mar 2009 18:06:46 -0000 1.2 @@ -0,0 +1 @@ +touchcal-0.31.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/touchcal/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 15:59:06 -0000 1.1 +++ sources 9 Mar 2009 18:06:46 -0000 1.2 @@ -0,0 +1 @@ +253032b585254056e19c56827ed9f539 touchcal-0.31.tar.gz From hardaker at fedoraproject.org Mon Mar 9 18:15:03 2009 From: hardaker at fedoraproject.org (Wes Hardaker) Date: Mon, 9 Mar 2009 18:15:03 +0000 (UTC) Subject: rpms/geoqo/F-10 .cvsignore, 1.4, 1.5 geoqo.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <20090309181503.5BA8E70034@cvs1.fedora.phx.redhat.com> Author: hardaker Update of /cvs/extras/rpms/geoqo/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32611 Modified Files: .cvsignore geoqo.spec sources Log Message: update for 1.01 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geoqo/F-10/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Nov 2008 00:13:54 -0000 1.4 +++ .cvsignore 9 Mar 2009 18:14:32 -0000 1.5 @@ -1 +1 @@ -geoqo-0.99.tar.gz +geoqo-1.01.tar.gz Index: geoqo.spec =================================================================== RCS file: /cvs/extras/rpms/geoqo/F-10/geoqo.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- geoqo.spec 20 Nov 2008 00:40:32 -0000 1.7 +++ geoqo.spec 9 Mar 2009 18:14:32 -0000 1.8 @@ -1,6 +1,6 @@ Summary: GeoCaching and General Waypoint Database Name: geoqo -Version: 0.99 +Version: 1.01 Release: 1%{?dist} License: GPLv2 Group: Amusements/Games @@ -19,7 +19,6 @@ BuildRequires: perl(XML::Simple) BuildRequires: perl(DBD::SQLite2) BuildRequires: perl(Text::Balanced) -Patch0: geoqo-makefile.patch %description geoqo is an application and support modules for manipulating a database @@ -33,8 +32,6 @@ %prep %setup -q -n geoqo-%{version} -%patch0 -p0 - %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -81,6 +78,12 @@ %{_datadir}/geoqo/scripts/*/* %changelog +* Mon Mar 9 2009 Wes Hardaker - 1.01-1 +- Upgrade to upstream 1.01 + +* Tue Feb 24 2009 Fedora Release Engineering - 0.99-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Nov 19 2008 Wes Hardaker - 0.99-1 - Update to version 0.99 Index: sources =================================================================== RCS file: /cvs/extras/rpms/geoqo/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Nov 2008 00:13:55 -0000 1.4 +++ sources 9 Mar 2009 18:14:32 -0000 1.5 @@ -1 +1 @@ -1e011b2f4c4eef632fd945a4503da068 geoqo-0.99.tar.gz +da5feb149bd75303f7be3bb90fc8b4ee geoqo-1.01.tar.gz From uwog at fedoraproject.org Mon Mar 9 18:20:23 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Mon, 9 Mar 2009 18:20:23 +0000 (UTC) Subject: rpms/pyabiword/devel .cvsignore, 1.3, 1.4 pyabiword.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <20090309182023.DA87D70034@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/pyabiword/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1580 Modified Files: .cvsignore pyabiword.spec sources Log Message: New (brown paper bag) upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Mar 2009 18:05:00 -0000 1.3 +++ .cvsignore 9 Mar 2009 18:19:53 -0000 1.4 @@ -1 +1 @@ -pyabiword-0.6.2.tar.gz +pyabiword-0.6.3.tar.gz Index: pyabiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/devel/pyabiword.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pyabiword.spec 9 Mar 2009 18:05:00 -0000 1.4 +++ pyabiword.spec 9 Mar 2009 18:19:53 -0000 1.5 @@ -1,10 +1,13 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define abiword_api_version 2.6 +# normally 2.6 would be enough for a dependency, but +# abiword 2.6.7 introduced abi_widget_render_page_to_image, +# which is is used by OLPC +%define abiword_api_version 2.6.7 Summary: Python bindings for libabiword Name: pyabiword -Version: 0.6.2 +Version: 0.6.3 Release: 1%{?dist} Source0: pyabiword-%{version}.tar.gz URL: http://abisource.com/downloads/pyabiword/%{version}/pyabiword-%{version}.tar.gz @@ -65,6 +68,9 @@ %{_datadir}/pygtk/2.0/defs/pyabiword.defs %changelog +* Mon Mar 09 2009 Marc Maurer - 0.6.3-1 +- New upstream release + * Mon Mar 09 2009 Marc Maurer - 0.6.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Mar 2009 18:05:00 -0000 1.3 +++ sources 9 Mar 2009 18:19:53 -0000 1.4 @@ -1 +1 @@ -c2e652ff6c5f9b5df0d28773952e4c0c pyabiword-0.6.2.tar.gz +f308b4cd38d5ea0e8a65b9452ea33359 pyabiword-0.6.3.tar.gz From rdieter at fedoraproject.org Mon Mar 9 18:28:48 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 9 Mar 2009 18:28:48 +0000 (UTC) Subject: rpms/solar-kde-theme/devel solar-kde-theme.spec,1.21,1.22 Message-ID: <20090309182848.2DD0170034@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/solar-kde-theme/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4027 Modified Files: solar-kde-theme.spec Log Message: * Mon Mar 09 2009 Rex Dieter - 0.1.17-3 - own %_kde4_datadir/wallpapers/Solar Index: solar-kde-theme.spec =================================================================== RCS file: /cvs/pkgs/rpms/solar-kde-theme/devel/solar-kde-theme.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- solar-kde-theme.spec 26 Feb 2009 01:58:24 -0000 1.21 +++ solar-kde-theme.spec 9 Mar 2009 18:28:17 -0000 1.22 @@ -1,6 +1,6 @@ Name: solar-kde-theme Version: 0.1.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Solar KDE Theme Group: User Interface/Desktops @@ -136,11 +136,14 @@ %{_kde4_datadir}/wallpapers/solar.png %{_kde4_datadir}/wallpapers/solar_wide.png %{_kde4_datadir}/wallpapers/solar_high.png -%{_kde4_datadir}/wallpapers/Solar/* +%{_kde4_datadir}/wallpapers/Solar/ %{_kde4_appsdir}/kdm/pics/users/default_solar.png %changelog +* Mon Mar 09 2009 Rex Dieter - 0.1.17-3 +- own %%_kde4_datadir/wallpapers/Solar + * Wed Feb 25 2009 Fedora Release Engineering - 0.1.17-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rjones at fedoraproject.org Mon Mar 9 18:30:26 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 9 Mar 2009 18:30:26 +0000 (UTC) Subject: rpms/mingw32-gnutls/EL-5 mingw32-gnutls.spec,1.1,1.2 Message-ID: <20090309183026.898A270034@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-gnutls/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4517 Modified Files: mingw32-gnutls.spec Log Message: Removed BR mingw32-gnutls because there is some sort of linking problem. Index: mingw32-gnutls.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gnutls/EL-5/mingw32-gnutls.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mingw32-gnutls.spec 9 Mar 2009 17:48:46 -0000 1.1 +++ mingw32-gnutls.spec 9 Mar 2009 18:29:56 -0000 1.2 @@ -6,7 +6,7 @@ Name: mingw32-gnutls Version: 2.6.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW GnuTLS TLS/SSL encryption library License: GPLv3+ and LGPLv2+ @@ -32,7 +32,6 @@ BuildRequires: mingw32-dlfcn BuildRequires: mingw32-libgpg-error BuildRequires: mingw32-libgcrypt >= 1.2.2 -BuildRequires: mingw32-gettext BuildRequires: mingw32-iconv BuildRequires: mingw32-readline BuildRequires: mingw32-zlib @@ -130,6 +129,9 @@ %changelog +* Mon Mar 9 2009 Richard W.M. Jones - 2.6.4-2 +- Removed BR mingw32-gnutls because there is some sort of linking problem. + * Mon Mar 9 2009 Richard W.M. Jones - 2.6.4-1 - New Fedora native version 2.6.4. From jakub at fedoraproject.org Mon Mar 9 18:35:00 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Mon, 9 Mar 2009 18:35:00 +0000 (UTC) Subject: rpms/compat-gcc-296/devel compat-gcc-296.spec,1.24,1.25 Message-ID: <20090309183500.8E78170034@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/compat-gcc-296/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5772 Modified Files: compat-gcc-296.spec Log Message: 2.96-142 Index: compat-gcc-296.spec =================================================================== RCS file: /cvs/pkgs/rpms/compat-gcc-296/devel/compat-gcc-296.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- compat-gcc-296.spec 24 Feb 2009 08:33:03 -0000 1.24 +++ compat-gcc-296.spec 9 Mar 2009 18:34:29 -0000 1.25 @@ -1,10 +1,10 @@ %define DATE 20000731 %define gcc_version 2.96 -%define gcc_release 141 +%define gcc_release 142 Summary: 2.96-RH compatibility libraries Name: compat-gcc-296 Version: %{gcc_version} -Release: %{gcc_release}.1 +Release: %{gcc_release} License: GPLv2+ Group: Development/Languages ExclusiveArch: %{ix86} ia64 ppc @@ -17,7 +17,7 @@ BuildRequires: binutils >= 2.15.90.0.1.1-2 BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo # Make sure pthread.h doesn't contain __thread tokens -BuildRequires: glibc-devel >= 2.2.90-12 +BuildRequires: glibc-devel >= 2.2.90-12, glibc-static # Need .eh_frame ld optimizations # Need proper visibility support # Need -pie support @@ -1077,8 +1077,8 @@ %{_prefix}/lib/gcc-lib/%{_target_platform}/%{gcc_version}/crtendS.o %changelog -* Tue Feb 24 2009 Fedora Release Engineering - 2.96-141.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Mon Mar 9 2009 Jakub Jelinek 2.96-142 +- rebuilt with GCC 4.4 * Tue Jul 15 2008 Tom "spot" Callaway 2.96-141 - fix license tag From lucilanga at fedoraproject.org Mon Mar 9 18:35:37 2009 From: lucilanga at fedoraproject.org (Lucian Langa) Date: Mon, 9 Mar 2009 18:35:37 +0000 (UTC) Subject: rpms/scummvm/devel .cvsignore, 1.7, 1.8 scummvm.spec, 1.15, 1.16 sources, 1.7, 1.8 Message-ID: <20090309183537.9D1B170034@cvs1.fedora.phx.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/scummvm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6085 Modified Files: .cvsignore scummvm.spec sources Log Message: * Mon Mar 09 2009 Lucian Langa - 0.13.0-1 - new upstream release - update patch0 - drop installing uneeded theme files - drop vendor from desktop file; fix icon entry Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scummvm/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 2 Sep 2008 09:51:12 -0000 1.7 +++ .cvsignore 9 Mar 2009 18:35:36 -0000 1.8 @@ -1,2 +1,2 @@ -scummvm-0.12.0.tar.bz2 +scummvm-0.13.0.tar.bz2 scummvm-icons.tar.gz Index: scummvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/scummvm/devel/scummvm.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- scummvm.spec 26 Feb 2009 17:27:16 -0000 1.15 +++ scummvm.spec 9 Mar 2009 18:35:37 -0000 1.16 @@ -1,6 +1,6 @@ Name: scummvm -Version: 0.12.0 -Release: 3%{?dist} +Version: 0.13.0 +Release: 1%{?dist} Summary: Interpreter for several adventure games Group: Applications/Emulators License: GPLv2+ @@ -8,7 +8,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 ####### Icons extracted from icons/scummvm.ico with the gimp Source1: scummvm-icons.tar.gz -Patch0: scummvm-0.11.0-nostrip.patch +Patch0: scummvm-0.13.0-nostrip.patch Patch1: scummvm-0.12.0-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel libvorbis-devel flac-devel zlib-devel @@ -33,7 +33,7 @@ %setup -q -a 1 %patch0 -p1 -b .nostrip %patch1 -p1 -b .gcc44 -sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop +sed -i 's/%{name}.xpm/%{name}/' dists/%{name}.desktop sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \ dists/%{name}.desktop @@ -52,16 +52,12 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -install -D -p -m 0644 gui/themes/modern.ini \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/modern.ini -install -D -p -m 0644 gui/themes/modern.zip \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/modern.zip # Remove doc files we want to include with %%doc rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/ # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ dists/%{name}.desktop @@ -99,11 +95,17 @@ %{_bindir}/%{name} %{_datadir}/%{name}/ %{_mandir}/man6/%{name}.6* -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Mon Mar 09 2009 Lucian Langa - 0.13.0-1 +- new upstream release +- update patch0 +- drop installing uneeded theme files +- drop vendor from desktop file; fix icon entry + * Thu Feb 26 2009 Lucian Langa - 0.12.0-3 - add patch1 for gcc44 fixes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scummvm/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 2 Sep 2008 09:51:12 -0000 1.7 +++ sources 9 Mar 2009 18:35:37 -0000 1.8 @@ -1,2 +1,2 @@ -cd5620c57645948c8da0d4d9c9fcffb3 scummvm-0.12.0.tar.bz2 +85225f7b7d6d2ce9147f76743ba7ca68 scummvm-0.13.0.tar.bz2 b20d750de2c88e8aefea364afae1776c scummvm-icons.tar.gz From mtasaka at fedoraproject.org Mon Mar 9 18:40:30 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Mon, 9 Mar 2009 18:40:30 +0000 (UTC) Subject: rpms/jd/devel .cvsignore, 1.343, 1.344 jd.spec, 1.403, 1.404 sources, 1.344, 1.345 Message-ID: <20090309184030.A692070118@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7283 Modified Files: .cvsignore jd.spec sources Log Message: Update to latest trunk Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.343 retrieving revision 1.344 diff -u -r1.343 -r1.344 --- .cvsignore 7 Mar 2009 18:00:54 -0000 1.343 +++ .cvsignore 9 Mar 2009 18:39:59 -0000 1.344 @@ -1 +1 @@ -jd-2.4.0-svn2708_trunk.tgz +jd-2.4.0-svn2713_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.403 retrieving revision 1.404 diff -u -r1.403 -r1.404 --- jd.spec 7 Mar 2009 18:00:54 -0000 1.403 +++ jd.spec 9 Mar 2009 18:39:59 -0000 1.404 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.4.0 -%define strtag svn2708_trunk +%define strtag svn2713_trunk %define repoid 38008 # Define this if this is pre-version %define pre_release 1 @@ -138,7 +138,7 @@ %{icondir}/%{name}.png %changelog -* Sun Mar 8 2009 Mamoru Tasaka +* Tue Mar 10 2009 Mamoru Tasaka - Update to latest trunk * Thu Mar 5 2009 Mamoru Tasaka - 2.3.0-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.344 retrieving revision 1.345 diff -u -r1.344 -r1.345 --- sources 7 Mar 2009 18:00:54 -0000 1.344 +++ sources 9 Mar 2009 18:39:59 -0000 1.345 @@ -1 +1 @@ -84cbd3183336f0fccc0042255d506cf0 jd-2.4.0-svn2708_trunk.tgz +568914f39dd30db52cb3eafabd8766e3 jd-2.4.0-svn2713_trunk.tgz From rjones at fedoraproject.org Mon Mar 9 18:42:20 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 9 Mar 2009 18:42:20 +0000 (UTC) Subject: rpms/mingw32-gnutls/EL-5 mingw32-gnutls.spec,1.2,1.3 Message-ID: <20090309184220.5C6C170034@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-gnutls/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8584 Modified Files: mingw32-gnutls.spec Log Message: Since gettext is disabled, there are no locale files. Index: mingw32-gnutls.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-gnutls/EL-5/mingw32-gnutls.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mingw32-gnutls.spec 9 Mar 2009 18:29:56 -0000 1.2 +++ mingw32-gnutls.spec 9 Mar 2009 18:41:50 -0000 1.3 @@ -6,7 +6,7 @@ Name: mingw32-gnutls Version: 2.6.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW GnuTLS TLS/SSL encryption library License: GPLv3+ and LGPLv2+ @@ -92,14 +92,12 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir} rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} -%find_lang gnutls - %clean rm -rf $RPM_BUILD_ROOT -%files -f gnutls.lang +%files %defattr(-,root,root) %doc COPYING COPYING.LIB %{_mingw32_bindir}/certtool.exe @@ -129,8 +127,9 @@ %changelog -* Mon Mar 9 2009 Richard W.M. Jones - 2.6.4-2 +* Mon Mar 9 2009 Richard W.M. Jones - 2.6.4-3 - Removed BR mingw32-gnutls because there is some sort of linking problem. +- Since gettext is disabled, there are no locale files. * Mon Mar 9 2009 Richard W.M. Jones - 2.6.4-1 - New Fedora native version 2.6.4. From sharkcz at fedoraproject.org Mon Mar 9 18:52:56 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Mon, 9 Mar 2009 18:52:56 +0000 (UTC) Subject: rpms/touchcal/F-9 touchcal-0.31-strncpy.patch, NONE, 1.1 touchcal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309185257.0761A70034@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/touchcal/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11445 Modified Files: .cvsignore sources Added Files: touchcal-0.31-strncpy.patch touchcal.spec Log Message: initial import touchcal-0.31-strncpy.patch: --- NEW FILE touchcal-0.31-strncpy.patch --- >From 5f67053c9f53fd3e116cb53d3cfd891f7655bd3f Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Tue, 3 Feb 2009 11:58:58 +0100 Subject: [PATCH] fix string overflow --- touchcal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/touchcal.c b/touchcal.c index 7341fd7..b7b192b 100644 --- a/touchcal.c +++ b/touchcal.c @@ -139,7 +139,7 @@ static void init_mu(char dev[]) set_page[4]=0x0d; /*define data string*/ - strcpy(data,"00180769001D0793"); + strncpy(data,"00180769001D0793",16); bzero(&newtio, sizeof(newtio)); /* clear struct for new port settings */ -- 1.6.0.6 --- NEW FILE touchcal.spec --- Name: touchcal Version: 0.31 Release: 1%{?dist} Summary: Calibration utility for touch screens Group: User Interface/X Hardware Support License: GPLv2+ URL: http://touchcal.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-0.31-strncpy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel %description touchcal is a tool to calibrate touch screens with serial controllers from the manufacturers EloGraphics (IntelliTouch E281-2310) and MicroTouch (SMT3 serial) for use under Xorg. %prep %setup -q %patch0 -p1 -b .strncpy %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_bindir}/touchcal %changelog * Tue Feb 3 2009 Dan Hor??k 0.31-1 - update to upstream version 0.31 * Mon Jun 6 2006 Dan Hor??k 0.23-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/touchcal/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 15:59:06 -0000 1.1 +++ .cvsignore 9 Mar 2009 18:52:26 -0000 1.2 @@ -0,0 +1 @@ +touchcal-0.31.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/touchcal/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 15:59:06 -0000 1.1 +++ sources 9 Mar 2009 18:52:26 -0000 1.2 @@ -0,0 +1 @@ +253032b585254056e19c56827ed9f539 touchcal-0.31.tar.gz From uwog at fedoraproject.org Mon Mar 9 18:53:17 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Mon, 9 Mar 2009 18:53:17 +0000 (UTC) Subject: rpms/pyabiword/F-10 .cvsignore, 1.2, 1.3 pyabiword.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090309185317.402D570034@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/pyabiword/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11537 Modified Files: .cvsignore pyabiword.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Jul 2008 16:54:46 -0000 1.2 +++ .cvsignore 9 Mar 2009 18:52:46 -0000 1.3 @@ -1 +1 @@ -pyabiword-0.6.1.tar.gz +pyabiword-0.6.3.tar.gz Index: pyabiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/F-10/pyabiword.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pyabiword.spec 23 Jul 2008 16:54:46 -0000 1.1 +++ pyabiword.spec 9 Mar 2009 18:52:46 -0000 1.2 @@ -1,11 +1,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define abiword_api_version 2.6 +# normally 2.6 would be enough for a dependency, but +# abiword 2.6.7 introduced abi_widget_render_page_to_image, +# which is is used by OLPC +%define abiword_api_version 2.6.7 Summary: Python bindings for libabiword Name: pyabiword -Version: 0.6.1 -Release: 3%{?dist} +Version: 0.6.3 +Release: 1%{?dist} Source0: pyabiword-%{version}.tar.gz URL: http://abisource.com/downloads/pyabiword/%{version}/pyabiword-%{version}.tar.gz License: GPL+ @@ -65,6 +68,9 @@ %{_datadir}/pygtk/2.0/defs/pyabiword.defs %changelog +* Mon Mar 09 2009 Marc Maurer - 0.6.3-1 +- New upstream release + * Tue Jul 22 2008 Marc Maurer - 0.6.1-3 - Include the BRs required to build in koji Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Jul 2008 16:54:46 -0000 1.2 +++ sources 9 Mar 2009 18:52:46 -0000 1.3 @@ -1 +1 @@ -d0cfa7533fc30db236993131a513ec0d pyabiword-0.6.1.tar.gz +f308b4cd38d5ea0e8a65b9452ea33359 pyabiword-0.6.3.tar.gz From sharkcz at fedoraproject.org Mon Mar 9 18:56:29 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Mon, 9 Mar 2009 18:56:29 +0000 (UTC) Subject: rpms/touchcal/EL-5 touchcal-0.31-strncpy.patch, NONE, 1.1 touchcal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309185629.A848770034@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/touchcal/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12439 Modified Files: .cvsignore sources Added Files: touchcal-0.31-strncpy.patch touchcal.spec Log Message: initial import touchcal-0.31-strncpy.patch: --- NEW FILE touchcal-0.31-strncpy.patch --- >From 5f67053c9f53fd3e116cb53d3cfd891f7655bd3f Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Tue, 3 Feb 2009 11:58:58 +0100 Subject: [PATCH] fix string overflow --- touchcal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/touchcal.c b/touchcal.c index 7341fd7..b7b192b 100644 --- a/touchcal.c +++ b/touchcal.c @@ -139,7 +139,7 @@ static void init_mu(char dev[]) set_page[4]=0x0d; /*define data string*/ - strcpy(data,"00180769001D0793"); + strncpy(data,"00180769001D0793",16); bzero(&newtio, sizeof(newtio)); /* clear struct for new port settings */ -- 1.6.0.6 --- NEW FILE touchcal.spec --- Name: touchcal Version: 0.31 Release: 1%{?dist} Summary: Calibration utility for touch screens Group: User Interface/X Hardware Support License: GPLv2+ URL: http://touchcal.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-0.31-strncpy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel %description touchcal is a tool to calibrate touch screens with serial controllers from the manufacturers EloGraphics (IntelliTouch E281-2310) and MicroTouch (SMT3 serial) for use under Xorg. %prep %setup -q %patch0 -p1 -b .strncpy %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_bindir}/touchcal %changelog * Tue Feb 3 2009 Dan Hor??k 0.31-1 - update to upstream version 0.31 * Mon Jun 6 2006 Dan Hor??k 0.23-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/touchcal/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 15:59:06 -0000 1.1 +++ .cvsignore 9 Mar 2009 18:55:59 -0000 1.2 @@ -0,0 +1 @@ +touchcal-0.31.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/touchcal/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 15:59:06 -0000 1.1 +++ sources 9 Mar 2009 18:55:59 -0000 1.2 @@ -0,0 +1 @@ +253032b585254056e19c56827ed9f539 touchcal-0.31.tar.gz From sharkcz at fedoraproject.org Mon Mar 9 18:58:28 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Mon, 9 Mar 2009 18:58:28 +0000 (UTC) Subject: rpms/touchcal/EL-4 touchcal-0.31-strncpy.patch, NONE, 1.1 touchcal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090309185828.D1BA470034@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/touchcal/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13123 Modified Files: .cvsignore sources Added Files: touchcal-0.31-strncpy.patch touchcal.spec Log Message: initial import touchcal-0.31-strncpy.patch: --- NEW FILE touchcal-0.31-strncpy.patch --- >From 5f67053c9f53fd3e116cb53d3cfd891f7655bd3f Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Tue, 3 Feb 2009 11:58:58 +0100 Subject: [PATCH] fix string overflow --- touchcal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/touchcal.c b/touchcal.c index 7341fd7..b7b192b 100644 --- a/touchcal.c +++ b/touchcal.c @@ -139,7 +139,7 @@ static void init_mu(char dev[]) set_page[4]=0x0d; /*define data string*/ - strcpy(data,"00180769001D0793"); + strncpy(data,"00180769001D0793",16); bzero(&newtio, sizeof(newtio)); /* clear struct for new port settings */ -- 1.6.0.6 --- NEW FILE touchcal.spec --- Name: touchcal Version: 0.31 Release: 1%{?dist} Summary: Calibration utility for touch screens Group: User Interface/X Hardware Support License: GPLv2+ URL: http://touchcal.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-0.31-strncpy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel %description touchcal is a tool to calibrate touch screens with serial controllers from the manufacturers EloGraphics (IntelliTouch E281-2310) and MicroTouch (SMT3 serial) for use under Xorg. %prep %setup -q %patch0 -p1 -b .strncpy %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_bindir}/touchcal %changelog * Tue Feb 3 2009 Dan Hor??k 0.31-1 - update to upstream version 0.31 * Mon Jun 6 2006 Dan Hor??k 0.23-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/touchcal/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 15:59:06 -0000 1.1 +++ .cvsignore 9 Mar 2009 18:57:58 -0000 1.2 @@ -0,0 +1 @@ +touchcal-0.31.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/touchcal/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 15:59:06 -0000 1.1 +++ sources 9 Mar 2009 18:57:58 -0000 1.2 @@ -0,0 +1 @@ +253032b585254056e19c56827ed9f539 touchcal-0.31.tar.gz From trasher at fedoraproject.org Mon Mar 9 19:10:00 2009 From: trasher at fedoraproject.org (Johan Cwiklinski) Date: Mon, 9 Mar 2009 19:10:00 +0000 (UTC) Subject: rpms/gcompris/devel .cvsignore, 1.15, 1.16 gcompris.spec, 1.42, 1.43 sources, 1.18, 1.19 gcompris-8.4.8-python26-reserved-keyword.patch, 1.1, NONE Message-ID: <20090309191000.EF65170034@cvs1.fedora.phx.redhat.com> Author: trasher Update of /cvs/extras/rpms/gcompris/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15773 Modified Files: .cvsignore gcompris.spec sources Removed Files: gcompris-8.4.8-python26-reserved-keyword.patch Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 8 Aug 2008 22:02:46 -0000 1.15 +++ .cvsignore 9 Mar 2009 19:09:30 -0000 1.16 @@ -1 +1 @@ -gcompris-8.4.6.tar.gz +gcompris-8.4.9.tar.gz Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- gcompris.spec 28 Feb 2009 08:50:22 -0000 1.42 +++ gcompris.spec 9 Mar 2009 19:09:30 -0000 1.43 @@ -1,6 +1,6 @@ Name: gcompris -Version: 8.4.8 -Release: 4%{?dist} +Version: 8.4.9 +Release: 1%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPLv3+ @@ -8,7 +8,6 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: gcompris-8.1-icon.patch Patch1: gcompris-8.3.2-tuxpaint-fullscreen.patch -Patch2: gcompris-8.4.8-python26-reserved-keyword.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libgnomeui-devel sqlite-devel python-devel gnet2-devel Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel @@ -258,7 +257,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 iconv -f ISO-8859-1 -t UTF8 docs/C/%{name}.info > tmp mv tmp docs/C/%{name}.info iconv -f ISO-8859-1 -t UTF8 AUTHORS > tmp @@ -505,6 +503,9 @@ %changelog +* Mon Mar 9 2009 Johan Cwiklinski 8.4.9-1 +- New wupstream bugfix release 8.4.9 + * Fri Feb 27 2009 Johan Cwiklinski - 8.4.8-4 - Fix python 2.6 reserved keyword Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 20 Nov 2008 06:45:48 -0000 1.18 +++ sources 9 Mar 2009 19:09:30 -0000 1.19 @@ -1 +1 @@ -d46c014c8f13505f94a5756f05cca12e gcompris-8.4.8.tar.gz +04fdc50bd61f4ac10a5feea79d9d5ff1 gcompris-8.4.9.tar.gz --- gcompris-8.4.8-python26-reserved-keyword.patch DELETED --- From kasal at fedoraproject.org Mon Mar 9 19:12:51 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Mon, 9 Mar 2009 19:12:51 +0000 (UTC) Subject: rpms/perl/devel noautobuild,1.2,NONE Message-ID: <20090309191251.1C89E70034@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17258 Removed Files: noautobuild Log Message: late --- noautobuild DELETED --- From dcbw at fedoraproject.org Mon Mar 9 19:18:39 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Mon, 9 Mar 2009 19:18:39 +0000 (UTC) Subject: rpms/NetworkManager/devel NetworkManager-0.7.0.99-fix-hal-resync.patch, NONE, 1.1 NetworkManager.spec, 1.262, 1.263 Message-ID: <20090309191839.7E49B70034@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18608 Modified Files: NetworkManager.spec Added Files: NetworkManager-0.7.0.99-fix-hal-resync.patch Log Message: * Mon Mar 9 2009 Dan Williams - 1:0.7.0.99-2 - Fix conflict with NetworkManager-openconnect (rh #489271) - Fix possible crash when resynchronizing devices if HAL restarts NetworkManager-0.7.0.99-fix-hal-resync.patch: --- NEW FILE NetworkManager-0.7.0.99-fix-hal-resync.patch --- commit 21defe6d73853bf19c6ce99d07701d1531e09409 Author: Drew Moseley Date: Fri Mar 6 17:19:17 2009 -0500 core: fix use-after-free caused by incorrect HAL device resync code diff --git a/src/nm-manager.c b/src/nm-manager.c index a6bac55..d0e5564 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1426,12 +1426,11 @@ static void sync_devices (NMManager *self) { NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); - GSList *devices; + GSList *devices = NULL; GSList *iter; - /* Remove devices which are no longer known to HAL */ - devices = g_slist_copy (priv->devices); - for (iter = devices; iter; iter = iter->next) { + /* Keep devices still known to HAL; get rid of ones HAL no longer knows about */ + for (iter = priv->devices; iter; iter = iter->next) { NMDevice *device = NM_DEVICE (iter->data); const char *udi = nm_device_get_udi (device); @@ -1440,15 +1439,14 @@ sync_devices (NMManager *self) nm_device_set_managed (device, TRUE, NM_DEVICE_STATE_REASON_NOW_MANAGED); else nm_device_set_managed (device, FALSE, NM_DEVICE_STATE_REASON_NOW_UNMANAGED); - } else { - priv->devices = g_slist_delete_link (priv->devices, iter); + devices = g_slist_prepend (devices, device); + } else remove_one_device (self, device); - } } + g_slist_free (priv->devices); + priv->devices = devices; - g_slist_free (devices); - - /* Get any new ones */ + /* Ask HAL for new devices */ nm_hal_manager_query_devices (priv->hal_mgr); } Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- NetworkManager.spec 5 Mar 2009 00:22:16 -0000 1.262 +++ NetworkManager.spec 9 Mar 2009 19:18:08 -0000 1.263 @@ -18,7 +18,7 @@ Summary: Network connection manager and user applications Epoch: 1 Version: 0.7.0.99 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -28,6 +28,7 @@ Source2: nm-system-settings.conf Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch +Patch4: NetworkManager-0.7.0.99-fix-hal-resync.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig @@ -48,7 +49,7 @@ Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1 Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1 Conflicts: NetworkManager-pptp < 1:0.7.0.99-1 -Conflicts: NetworkManager-openconnect < 1:0.7.0.99-1 +Conflicts: NetworkManager-openconnect < 0:0.7.0.99-1 BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -145,6 +146,7 @@ tar -xjf %{SOURCE1} %patch1 -p1 -b .buildfix %patch2 -p1 -b .explain-dns1-dns2 +%patch4 -p1 -b .fix-hal-resync %build @@ -325,6 +327,10 @@ %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Mon Mar 9 2009 Dan Williams - 1:0.7.0.99-2 +- Fix conflict with NetworkManager-openconnect (rh #489271) +- Fix possible crash when resynchronizing devices if HAL restarts + * Wed Mar 4 2009 Dan Williams - 1:0.7.0.99-1 - nm: make default wired "Auto ethX" connection modifiable if an enabled system settings plugin supports modifying connections (rh #485555) From dcbw at fedoraproject.org Mon Mar 9 19:21:23 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Mon, 9 Mar 2009 19:21:23 +0000 (UTC) Subject: rpms/NetworkManager/F-10 NetworkManager-0.7.0.99-fix-hal-resync.patch, NONE, 1.1 NetworkManager.spec, 1.259, 1.260 Message-ID: <20090309192123.7561F70034@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19462 Modified Files: NetworkManager.spec Added Files: NetworkManager-0.7.0.99-fix-hal-resync.patch Log Message: * Mon Mar 9 2009 Dan Williams - 1:0.7.0.99-2 - Fix conflict with NetworkManager-openconnect (rh #489271) - Fix possible crash when resynchronizing devices if HAL restarts NetworkManager-0.7.0.99-fix-hal-resync.patch: --- NEW FILE NetworkManager-0.7.0.99-fix-hal-resync.patch --- commit 21defe6d73853bf19c6ce99d07701d1531e09409 Author: Drew Moseley Date: Fri Mar 6 17:19:17 2009 -0500 core: fix use-after-free caused by incorrect HAL device resync code diff --git a/src/nm-manager.c b/src/nm-manager.c index a6bac55..d0e5564 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1426,12 +1426,11 @@ static void sync_devices (NMManager *self) { NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); - GSList *devices; + GSList *devices = NULL; GSList *iter; - /* Remove devices which are no longer known to HAL */ - devices = g_slist_copy (priv->devices); - for (iter = devices; iter; iter = iter->next) { + /* Keep devices still known to HAL; get rid of ones HAL no longer knows about */ + for (iter = priv->devices; iter; iter = iter->next) { NMDevice *device = NM_DEVICE (iter->data); const char *udi = nm_device_get_udi (device); @@ -1440,15 +1439,14 @@ sync_devices (NMManager *self) nm_device_set_managed (device, TRUE, NM_DEVICE_STATE_REASON_NOW_MANAGED); else nm_device_set_managed (device, FALSE, NM_DEVICE_STATE_REASON_NOW_UNMANAGED); - } else { - priv->devices = g_slist_delete_link (priv->devices, iter); + devices = g_slist_prepend (devices, device); + } else remove_one_device (self, device); - } } + g_slist_free (priv->devices); + priv->devices = devices; - g_slist_free (devices); - - /* Get any new ones */ + /* Ask HAL for new devices */ nm_hal_manager_query_devices (priv->hal_mgr); } Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager.spec,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- NetworkManager.spec 5 Mar 2009 11:03:04 -0000 1.259 +++ NetworkManager.spec 9 Mar 2009 19:20:53 -0000 1.260 @@ -18,7 +18,7 @@ Summary: Network connection manager and user applications Epoch: 1 Version: 0.7.0.99 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -29,6 +29,7 @@ Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch Patch3: NetworkManager-0.7.1-localhost-localdomain.patch +Patch4: NetworkManager-0.7.0.99-fix-hal-resync.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig @@ -49,7 +50,7 @@ Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1 Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1 Conflicts: NetworkManager-pptp < 1:0.7.0.99-1 -Conflicts: NetworkManager-openconnect < 1:0.7.0.99-1 +Conflicts: NetworkManager-openconnect < 0:0.7.0.99-1 BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -72,7 +73,7 @@ BuildRequires: PolicyKit-devel PolicyKit-gnome-devel BuildRequires: dhclient BuildRequires: gtk-doc -#BuildRequires: libudev-devel +BuildRequires: libudev-devel %description NetworkManager attempts to keep an active network connection available at all @@ -147,6 +148,7 @@ %patch1 -p1 -b .buildfix %patch2 -p1 -b .explain-dns1-dns2 %patch3 -p1 -b .keep-localhost-localdomain +%patch4 -p1 -b .fix-hal-resync %build @@ -327,6 +329,10 @@ %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Mon Mar 9 2009 Dan Williams - 1:0.7.0.99-2 +- Fix conflict with NetworkManager-openconnect (rh #489271) +- Fix possible crash when resynchronizing devices if HAL restarts + * Wed Mar 4 2009 Dan Williams - 1:0.7.0.99-1 - nm: make default wired "Auto ethX" connection modifiable if an enabled system settings plugin supports modifying connections (rh #485555) From dcbw at fedoraproject.org Mon Mar 9 19:23:47 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Mon, 9 Mar 2009 19:23:47 +0000 (UTC) Subject: rpms/NetworkManager/F-9 NetworkManager-0.7.0.99-fix-hal-resync.patch, NONE, 1.1 NetworkManager.spec, 1.253, 1.254 Message-ID: <20090309192347.2F68B70034@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20100 Modified Files: NetworkManager.spec Added Files: NetworkManager-0.7.0.99-fix-hal-resync.patch Log Message: * Mon Mar 9 2009 Dan Williams - 1:0.7.0.99-2 - Fix conflict with NetworkManager-openconnect (rh #489271) - Fix possible crash when resynchronizing devices if HAL restarts NetworkManager-0.7.0.99-fix-hal-resync.patch: --- NEW FILE NetworkManager-0.7.0.99-fix-hal-resync.patch --- commit 21defe6d73853bf19c6ce99d07701d1531e09409 Author: Drew Moseley Date: Fri Mar 6 17:19:17 2009 -0500 core: fix use-after-free caused by incorrect HAL device resync code diff --git a/src/nm-manager.c b/src/nm-manager.c index a6bac55..d0e5564 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1426,12 +1426,11 @@ static void sync_devices (NMManager *self) { NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); - GSList *devices; + GSList *devices = NULL; GSList *iter; - /* Remove devices which are no longer known to HAL */ - devices = g_slist_copy (priv->devices); - for (iter = devices; iter; iter = iter->next) { + /* Keep devices still known to HAL; get rid of ones HAL no longer knows about */ + for (iter = priv->devices; iter; iter = iter->next) { NMDevice *device = NM_DEVICE (iter->data); const char *udi = nm_device_get_udi (device); @@ -1440,15 +1439,14 @@ sync_devices (NMManager *self) nm_device_set_managed (device, TRUE, NM_DEVICE_STATE_REASON_NOW_MANAGED); else nm_device_set_managed (device, FALSE, NM_DEVICE_STATE_REASON_NOW_UNMANAGED); - } else { - priv->devices = g_slist_delete_link (priv->devices, iter); + devices = g_slist_prepend (devices, device); + } else remove_one_device (self, device); - } } + g_slist_free (priv->devices); + priv->devices = devices; - g_slist_free (devices); - - /* Get any new ones */ + /* Ask HAL for new devices */ nm_hal_manager_query_devices (priv->hal_mgr); } Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v retrieving revision 1.253 retrieving revision 1.254 diff -u -r1.253 -r1.254 --- NetworkManager.spec 5 Mar 2009 11:05:17 -0000 1.253 +++ NetworkManager.spec 9 Mar 2009 19:23:16 -0000 1.254 @@ -18,7 +18,7 @@ Summary: Network connection manager and user applications Epoch: 1 Version: 0.7.0.99 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -29,6 +29,7 @@ Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch Patch3: NetworkManager-0.7.1-localhost-localdomain.patch +Patch4: NetworkManager-0.7.0.99-fix-hal-resync.patch Patch10: old-dbus-glib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -150,6 +151,7 @@ %patch1 -p1 -b .buildfix %patch2 -p1 -b .explain-dns1-dns2 %patch3 -p1 -b .keep-localhost-localdomain +%patch4 -p1 -b .fix-hal-resync %patch10 -p1 -b .old-dbus-glib %build @@ -334,6 +336,10 @@ %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Mon Mar 9 2009 Dan Williams - 1:0.7.0.99-2 +- Fix conflict with NetworkManager-openconnect (rh #489271) +- Fix possible crash when resynchronizing devices if HAL restarts + * Wed Mar 4 2009 Dan Williams - 1:0.7.0.99-1 - nm: make default wired "Auto ethX" connection modifiable if an enabled system settings plugin supports modifying connections (rh #485555) From atkac at fedoraproject.org Mon Mar 9 19:24:17 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Mon, 9 Mar 2009 19:24:17 +0000 (UTC) Subject: rpms/mtools/devel mtools-3.9.6-config.patch, 1.2, 1.3 mtools.spec, 1.42, 1.43 mtools-3.9.7-bigdisk.patch, 1.1, NONE mtools400-rh480112.patch, 1.1, NONE Message-ID: <20090309192417.F313270034@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/mtools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20520 Modified Files: mtools-3.9.6-config.patch mtools.spec Removed Files: mtools-3.9.7-bigdisk.patch mtools400-rh480112.patch Log Message: - updated to 4.0.9 - merged mtools-3.9.7-bigdisk.patch to config patch - mtools400-rh480112.patch merged to upstream mtools-3.9.6-config.patch: Index: mtools-3.9.6-config.patch =================================================================== RCS file: /cvs/pkgs/rpms/mtools/devel/mtools-3.9.6-config.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mtools-3.9.6-config.patch 9 Sep 2004 08:50:30 -0000 1.2 +++ mtools-3.9.6-config.patch 9 Mar 2009 19:24:16 -0000 1.3 @@ -1,6 +1,8 @@ ---- mtools-3.9.6/mtools.conf.fixes Sun Jan 4 04:29:32 1998 -+++ mtools-3.9.6/mtools.conf Wed Feb 9 11:41:36 2000 -@@ -1,22 +1,25 @@ +diff -up mtools-4.0.9/mtools.conf.conf mtools-4.0.9/mtools.conf +--- mtools-4.0.9/mtools.conf.conf 2009-03-01 00:01:03.000000000 +0100 ++++ mtools-4.0.9/mtools.conf 2009-03-09 18:21:40.000000000 +0100 +@@ -16,11 +16,10 @@ + # Example mtools.conf files. Uncomment the lines which correspond to # your architecture and comment out the "SAMPLE FILE" line below -SAMPLE FILE @@ -9,30 +11,8 @@ -# drive a: file="/dev/fd0" exclusive -# drive b: file="/dev/fd1" exclusive +# Linux floppy drives -+drive a: file="/dev/fd0" exclusive 1.44m mformat_only -+drive b: file="/dev/fd1" exclusive 1.44m mformat_only - --# # First SCSI hard disk partition --# drive c: file="/dev/sda1" -+# First SCSI hard disk partition -+#drive c: file="/dev/sda1" - --# # First IDE hard disk partition --# drive c: file="/dev/hda1" -+# First IDE hard disk partition -+#drive c: file="/dev/hda1" - - # # dosemu floppy image - # drive m: file="/var/lib/dosemu/diskimage" - --# # dosemu hdimage --# drive n: file="/var/lib/dosemu/diskimage" offset=3840 -+# dosemu hdimage -+drive n: file="/var/lib/dosemu/hdimage" offset=8832 -+ -+# # HPOJ (ptal-photod) -+mtools_skip_check=1 -+drive p: file=":0" remote ++drive a: file="/dev/fd0" exclusive mformat_only ++drive b: file="/dev/fd1" exclusive mformat_only - # # Atari ramdisk image - # drive o: file="/tmp/atari_rd" offset=136 + # # First SCSI hard disk partition + # drive c: file="/dev/sda1" Index: mtools.spec =================================================================== RCS file: /cvs/pkgs/rpms/mtools/devel/mtools.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- mtools.spec 26 Feb 2009 03:13:33 -0000 1.42 +++ mtools.spec 9 Mar 2009 19:24:16 -0000 1.43 @@ -1,15 +1,13 @@ Summary: Programs for accessing MS-DOS disks without mounting the disks Name: mtools -Version: 4.0.0 -Release: 4%{?dist} +Version: 4.0.9 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2 Url: http://mtools.linux.lu/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: mtools-3.9.6-config.patch -Patch3: mtools-3.9.7-bigdisk.patch -Patch4: mtools400-rh480112.patch Requires: info BuildRequires: texinfo, autoconf @@ -24,9 +22,7 @@ %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -%patch3 -p1 -b .big -%patch4 -p1 -b .rh480112 +%patch0 -p1 -b .conf # Correct system paths for all in mtools.5 mtools.texi; do @@ -65,12 +61,17 @@ %files %defattr(-,root,root) %config(noreplace) /etc/mtools.conf -%doc COPYING Changelog README Release.notes +%doc COPYING README Release.notes /usr/bin/* %{_mandir}/*/* %{_infodir}/%{name}.info.gz %changelog +* Mon Mar 09 2009 Adam Tkac 4.0.9-1 +- updated to 4.0.9 +- merged mtools-3.9.7-bigdisk.patch to config patch +- mtools400-rh480112.patch merged to upstream + * Wed Feb 25 2009 Fedora Release Engineering - 4.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- mtools-3.9.7-bigdisk.patch DELETED --- --- mtools400-rh480112.patch DELETED --- From hardaker at fedoraproject.org Mon Mar 9 19:26:31 2009 From: hardaker at fedoraproject.org (Wes Hardaker) Date: Mon, 9 Mar 2009 19:26:31 +0000 (UTC) Subject: rpms/geoqo/F-9 .cvsignore, 1.4, 1.5 geoqo.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <20090309192631.27E2F70034@cvs1.fedora.phx.redhat.com> Author: hardaker Update of /cvs/extras/rpms/geoqo/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21137 Modified Files: .cvsignore geoqo.spec sources Log Message: update for 1.01 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geoqo/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Nov 2008 00:42:53 -0000 1.4 +++ .cvsignore 9 Mar 2009 19:26:00 -0000 1.5 @@ -1 +1 @@ -geoqo-0.99.tar.gz +geoqo-1.01.tar.gz Index: geoqo.spec =================================================================== RCS file: /cvs/extras/rpms/geoqo/F-9/geoqo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- geoqo.spec 20 Nov 2008 00:42:53 -0000 1.6 +++ geoqo.spec 9 Mar 2009 19:26:00 -0000 1.7 @@ -1,6 +1,6 @@ Summary: GeoCaching and General Waypoint Database Name: geoqo -Version: 0.99 +Version: 1.01 Release: 1%{?dist} License: GPLv2 Group: Amusements/Games @@ -19,7 +19,6 @@ BuildRequires: perl(XML::Simple) BuildRequires: perl(DBD::SQLite2) BuildRequires: perl(Text::Balanced) -Patch0: geoqo-makefile.patch %description geoqo is an application and support modules for manipulating a database @@ -33,8 +32,6 @@ %prep %setup -q -n geoqo-%{version} -%patch0 -p0 - %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -81,6 +78,12 @@ %{_datadir}/geoqo/scripts/*/* %changelog +* Mon Mar 9 2009 Wes Hardaker - 1.01-1 +- Upgrade to upstream 1.01 + +* Tue Feb 24 2009 Fedora Release Engineering - 0.99-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Nov 19 2008 Wes Hardaker - 0.99-1 - Update to version 0.99 Index: sources =================================================================== RCS file: /cvs/extras/rpms/geoqo/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Nov 2008 00:42:53 -0000 1.4 +++ sources 9 Mar 2009 19:26:00 -0000 1.5 @@ -1 +1 @@ -1e011b2f4c4eef632fd945a4503da068 geoqo-0.99.tar.gz +da5feb149bd75303f7be3bb90fc8b4ee geoqo-1.01.tar.gz From jkratoch at fedoraproject.org Mon Mar 9 19:32:16 2009 From: jkratoch at fedoraproject.org (Jan Kratochvil) Date: Mon, 9 Mar 2009 19:32:16 +0000 (UTC) Subject: rpms/gdb/devel gdb-archer.patch,1.4,1.5 gdb.spec,1.330,1.331 Message-ID: <20090309193216.4CE3D70034@cvs1.fedora.phx.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22711 Modified Files: gdb-archer.patch gdb.spec Log Message: * Mon Mar 9 2009 Jan Kratochvil - 6.8.50.20090302-7 - Archer update to the snapshot: ec29855686f2a78d90ebcc63765681249bbbe808 - Temporarily place libstdc++ pretty printers in this gdb.rpm. gdb-archer.patch: Index: gdb-archer.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gdb-archer.patch 7 Mar 2009 22:10:22 -0000 1.4 +++ gdb-archer.patch 9 Mar 2009 19:31:44 -0000 1.5 @@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ArcherBranchManagement GIT snapshot: -commit 543fb2154d3bd551344b990b911be5c6cc703504 +commit ec29855686f2a78d90ebcc63765681249bbbe808 branch `archer' - the merge of branches: archer-jankratochvil-merge-expr @@ -20860,10 +20860,10 @@ +register_libstdcxx_printers (gdb.current_objfile ()) diff --git a/gdb/python/lib/gdb/libstdcxx/v6/printers.py b/gdb/python/lib/gdb/libstdcxx/v6/printers.py new file mode 100644 -index 0000000..ccef97d +index 0000000..c0dc987 --- /dev/null +++ b/gdb/python/lib/gdb/libstdcxx/v6/printers.py -@@ -0,0 +1,646 @@ +@@ -0,0 +1,647 @@ +# Pretty-printers for libstc++. + +# Copyright (C) 2008, 2009 Free Software Foundation, Inc. @@ -21481,6 +21481,7 @@ + pretty_printers_dict[re.compile('^std::stack<.*>$')] = lambda val: StdStackOrQueuePrinter("std::stack", val) + pretty_printers_dict[re.compile('^std::unique_ptr<.*>$')] = UniquePointerPrinter + pretty_printers_dict[re.compile('^std::vector<.*>$')] = StdVectorPrinter ++ # vector + + # These are the C++0x printers. They also exist in the standard namespace. + # For array - the default GDB pretty-printer seems reasonable. @@ -21492,7 +21493,7 @@ + pretty_printers_dict[re.compile('^std::(tr1::)?unordered_multiset<.*>$')] = lambda val: Tr1UnorderedSetPrinter ('std::tr1::unordered_multiset', val) + + -+ # Extensions to std, tr1 pretty-printers. ++ # Extensions. + pretty_printers_dict[re.compile('^__gnu_cxx::slist<.*>$')] = StdSlistPrinter + + if True: Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.330 retrieving revision 1.331 diff -u -r1.330 -r1.331 --- gdb.spec 7 Mar 2009 22:10:23 -0000 1.330 +++ gdb.spec 9 Mar 2009 19:31:45 -0000 1.331 @@ -13,7 +13,7 @@ # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 6%{?_with_upstream:.upstream}%{?dist} +Release: 7%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -384,6 +384,8 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Requires: python-libs BuildRequires: python-devel +# Temporarily before it gets moved to libstdc++.rpm +BuildRequires: libstdc++ %if 0%{?_with_testsuite:1} BuildRequires: sharutils dejagnu @@ -762,8 +764,17 @@ cmp $RPM_BUILD_ROOT%{_mandir}/*/gdb.1 $RPM_BUILD_ROOT%{_mandir}/*/gdbtui.1 ln -sf gdb.1 $RPM_BUILD_ROOT%{_mandir}/*/gdbtui.1 -# A part of the libstdc++ rpm. -rm -rf $RPM_BUILD_ROOT%{python_sitelib}/gdb/libstdcxx +# In the future: +#%# A part of the libstdc++ rpm. +#%rm -rf $RPM_BUILD_ROOT%{python_sitelib}/gdb/libstdcxx +# Temporarily now: +for LIB in lib lib64;do + LIBPATH="$RPM_BUILD_ROOT%{_datadir}/gdb/auto-load%{_prefix}/$LIB" + mkdir -p $LIBPATH + # basename is being run only for the native (non-biarch) file. + sed -e 's, at dir@,%{python_sitelib}/gdb,' <$RPM_BUILD_DIR/%{gdb_src}/gdb/python/lib/gdb/libstdcxx/v6/hook.in \ + >$LIBPATH/$(basename %{_prefix}/%{_lib}/libstdc++.so.6.*)-gdb.py +done # Remove the files that are part of a gdb build but that are owned and # provided by other packages. @@ -840,6 +851,10 @@ %endif %changelog +* Mon Mar 9 2009 Jan Kratochvil - 6.8.50.20090302-7 +- Archer update to the snapshot: ec29855686f2a78d90ebcc63765681249bbbe808 +- Temporarily place libstdc++ pretty printers in this gdb.rpm. + * Sat Mar 7 2009 Jan Kratochvil - 6.8.50.20090302-6 - Archer update to the snapshot: 543fb2154d3bd551344b990b911be5c6cc703504 - Fixes [delayed-symfile] excessive `(no debugging symbols found)' messages. From hadess at fedoraproject.org Mon Mar 9 19:32:22 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 9 Mar 2009 19:32:22 +0000 (UTC) Subject: rpms/bluez/devel bluez-port-cups-to-bluez4.patch, NONE, 1.1 bluez.spec, 1.48, 1.49 Message-ID: <20090309193222.765CA70034@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22562 Modified Files: bluez.spec Added Files: bluez-port-cups-to-bluez4.patch Log Message: * Mon Mar 09 2009 - Bastien Nocera - 4.32-8 - Port CUPS backend to BlueZ 4.x bluez-port-cups-to-bluez4.patch: --- NEW FILE bluez-port-cups-to-bluez4.patch --- diff --git a/cups/main.c b/cups/main.c index d8b899e..002c96a 100644 --- a/cups/main.c +++ b/cups/main.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -42,8 +43,6 @@ #include "cups.h" -#define PRINTER_SERVICE_CLASS_NAME "printer" - struct cups_device { char *bdaddr; char *name; @@ -53,53 +52,87 @@ struct cups_device { static GSList *device_list = NULL; static GMainLoop *loop = NULL; static DBusConnection *conn = NULL; +static gboolean doing_disco = FALSE; #define ATTRID_1284ID 0x0300 -static sdp_record_t *sdp_xml_parse_record(const char *data, int size) -{ - return NULL; -} +struct context_data { + gboolean found; + char *id; +}; -static char *parse_xml_sdp(const char *xml) +static void element_start(GMarkupParseContext *context, + const gchar *element_name, const gchar **attribute_names, + const gchar **attribute_values, gpointer user_data, GError **err) { - sdp_record_t *sdp_record; - sdp_list_t *l; - char *str = NULL; + struct context_data *ctx_data = user_data; - sdp_record = sdp_xml_parse_record(xml, strlen(xml)); - if (sdp_record == NULL) - return NULL; + if (!strcmp(element_name, "record")) + return; - for (l = sdp_record->attrlist; l != NULL; l = l->next) { - sdp_data_t *data; + if (!strcmp(element_name, "attribute")) { + int i; + for (i = 0; attribute_names[i]; i++) { + if (!strcmp(attribute_names[i], "id")) { + if (strtol(attribute_values[i], 0, 0) == ATTRID_1284ID) + ctx_data->found = TRUE; + break; + } + } + return; + } - data = (sdp_data_t *) l->data; - if (data->attrId != ATTRID_1284ID) - continue; - /* Ignore the length, it's null terminated */ - str = g_strdup(data->val.str + 2); - break; + if (ctx_data->found && !strcmp(element_name, "text")) { + int i; + for (i = 0; attribute_names[i]; i++) { + if (!strcmp(attribute_names[i], "value")) { + ctx_data->id = g_strdup (attribute_values[i] + 2); + ctx_data->found = FALSE; + } + } } - sdp_record_free(sdp_record); +} + +static GMarkupParser parser = { + element_start, NULL, NULL, NULL, NULL +}; - return str; +static char *sdp_xml_parse_record(const char *data) +{ + GMarkupParseContext *ctx; + struct context_data ctx_data; + int size; + + size = strlen (data); + ctx_data.found = FALSE; + ctx_data.id = NULL; + ctx = g_markup_parse_context_new(&parser, 0, &ctx_data, NULL); + + if (g_markup_parse_context_parse(ctx, data, size, NULL) == FALSE) { + g_markup_parse_context_free(ctx); + g_free (ctx_data.id); + return NULL; + } + + g_markup_parse_context_free(ctx); + + return ctx_data.id; } -static char *device_get_ieee1284_id(const char *adapter, const char *bdaddr) +static char *device_get_ieee1284_id(const char *adapter, const char *device) { - guint service_handle; DBusMessage *message, *reply; - DBusMessageIter iter, reply_iter, iter_array; + DBusMessageIter iter, reply_iter; + DBusMessageIter reply_iter_entry; const char *hcr_print = "00001126-0000-1000-8000-00805f9b34fb"; - char *xml, *id; + const char *xml; + char *id; /* Look for the service handle of the HCRP service */ - message = dbus_message_new_method_call("org.bluez", adapter, - "org.bluez.Adapter", - "GetRemoteServiceHandles"); + message = dbus_message_new_method_call("org.bluez", device, + "org.bluez.Device", + "DiscoverServices"); dbus_message_iter_init_append(message, &iter); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &bdaddr); dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &hcr_print); reply = dbus_connection_send_with_reply_and_block(conn, @@ -111,40 +144,41 @@ static char *device_get_ieee1284_id(const char *adapter, const char *bdaddr) return NULL; dbus_message_iter_init(reply, &reply_iter); - if (dbus_message_iter_get_arg_type(&reply_iter) != DBUS_TYPE_ARRAY) { - dbus_message_unref(reply); - return NULL; - } - /* Hopefully we only get one handle, or take a punt */ - dbus_message_iter_recurse(&reply_iter, &iter_array); - while (dbus_message_iter_get_arg_type(&iter_array) == DBUS_TYPE_UINT32) { - dbus_message_iter_get_basic(&iter_array, &service_handle); - dbus_message_iter_next(&iter_array); + if (dbus_message_iter_get_arg_type (&reply_iter) != DBUS_TYPE_ARRAY) { + dbus_message_unref(reply); + return FALSE; } - dbus_message_unref(reply); + dbus_message_iter_recurse (&reply_iter, &reply_iter_entry); - /* Now get the XML for the HCRP service record */ - message = dbus_message_new_method_call("org.bluez", adapter, - "org.bluez.Adapter", - "GetRemoteServiceRecordAsXML"); - dbus_message_iter_init_append(message, &iter); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &bdaddr); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_UINT32, &service_handle); + /* Hopefully we only get one handle, or take a punt */ + while (dbus_message_iter_get_arg_type(&reply_iter_entry) == DBUS_TYPE_DICT_ENTRY) { + guint32 key; + DBusMessageIter dict_entry; - reply = dbus_connection_send_with_reply_and_block(conn, - message, -1, NULL); + dbus_message_iter_recurse (&reply_iter_entry, &dict_entry); - dbus_message_unref(message); + /* Key ? */ + dbus_message_iter_get_basic (&dict_entry, &key); + if (!key) { + dbus_message_iter_next (&reply_iter_entry); + continue; + } - if (!reply) - return NULL; + /* Try to get the value */ + if (!dbus_message_iter_next (&dict_entry)) { + dbus_message_iter_next (&reply_iter_entry); + continue; + } - dbus_message_iter_init(reply, &reply_iter); - dbus_message_iter_get_basic(&reply_iter, &xml); + dbus_message_iter_get_basic(&dict_entry, &xml); - id = parse_xml_sdp(xml); + id = sdp_xml_parse_record(xml); + if (id != NULL) + break; + dbus_message_iter_next (&reply_iter_entry); + } dbus_message_unref(reply); @@ -161,8 +195,12 @@ static void add_device_to_list(const char *name, const char *bdaddr, const char device = (struct cups_device *) l->data; if (strcmp(device->bdaddr, bdaddr) == 0) { - g_free(device->name); - device->name = g_strdup(name); + if (device->name != name) { + g_free(device->name); + device->name = g_strdup(name); + } + g_free(device->id); + device->id = g_strdup(id); return; } } @@ -176,25 +214,12 @@ static void add_device_to_list(const char *name, const char *bdaddr, const char device_list = g_slist_prepend(device_list, device); } -static char *escape_name(const char *str, char orig, char dest) -{ - char *ret, *s; - - ret = g_strdup(str); - while ((s = strchr(ret, orig)) != NULL) - s[0] = dest; - return ret; -} - static void print_printer_details(const char *name, const char *bdaddr, const char *id) { char *uri, *escaped; - guint len; - escaped = escape_name(name, '\"', '\''); - len = strlen("bluetooth://") + 12 + 1; - uri = g_malloc(len); - snprintf(uri, len, "bluetooth://%c%c%c%c%c%c%c%c%c%c%c%c", + escaped = g_strdelimit (g_strdup(name), "\"", '\''); + uri = g_strdup_printf("bluetooth://%c%c%c%c%c%c%c%c%c%c%c%c", bdaddr[0], bdaddr[1], bdaddr[3], bdaddr[4], bdaddr[6], bdaddr[7], @@ -210,48 +235,71 @@ static void print_printer_details(const char *name, const char *bdaddr, const ch g_free(uri); } -static gboolean device_is_printer(const char *adapter, const char *bdaddr) +static gboolean parse_device_properties(DBusMessageIter *reply_iter, char **name, char **bdaddr) { - char *class; - DBusMessage *message, *reply; - DBusMessageIter iter, reply_iter; + guint32 class = 0; + DBusMessageIter reply_iter_entry; - message = dbus_message_new_method_call("org.bluez", adapter, - "org.bluez.Adapter", - "GetRemoteMinorClass"); - dbus_message_iter_init_append(message, &iter); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &bdaddr); + if (dbus_message_iter_get_arg_type (reply_iter) != DBUS_TYPE_ARRAY) + return FALSE; - reply = dbus_connection_send_with_reply_and_block(conn, - message, -1, NULL); + dbus_message_iter_recurse (reply_iter, &reply_iter_entry); - dbus_message_unref(message); + while (dbus_message_iter_get_arg_type(&reply_iter_entry) == DBUS_TYPE_DICT_ENTRY) { + const char *key; + DBusMessageIter dict_entry, iter_dict_val; - if (!reply) - return FALSE; + dbus_message_iter_recurse (&reply_iter_entry, &dict_entry); - dbus_message_iter_init(reply, &reply_iter); - dbus_message_iter_get_basic(&reply_iter, &class); + /* Key == Class ? */ + dbus_message_iter_get_basic (&dict_entry, &key); + if (!key) { + dbus_message_iter_next (&reply_iter_entry); + continue; + } - if (class != NULL && strcmp(class, PRINTER_SERVICE_CLASS_NAME) == 0) { - dbus_message_unref(reply); - return TRUE; + if (strcmp(key, "Class") != 0 && strcmp(key, "Alias") != 0 && strcmp (key, "Address") != 0) { + dbus_message_iter_next (&reply_iter_entry); + continue; + } + + /* Try to get the value */ + if (!dbus_message_iter_next (&dict_entry)) { + dbus_message_iter_next (&reply_iter_entry); + continue; + } + dbus_message_iter_recurse (&dict_entry, &iter_dict_val); + if (strcmp(key, "Class") == 0) { + dbus_message_iter_get_basic (&iter_dict_val, &class); + } else { + const char *value; + dbus_message_iter_get_basic (&iter_dict_val, &value); + if (strcmp(key, "Alias") == 0) { + *name = g_strdup (value); + } else if (bdaddr) { + *bdaddr = g_strdup (value); + } + } + dbus_message_iter_next (&reply_iter_entry); } + if (class == 0) + return FALSE; + if (((class & 0x1f00) >> 8) == 0x06 && (class & 0x80)) + return TRUE; + return FALSE; } -static char *device_get_name(const char *adapter, const char *bdaddr) +static gboolean device_is_printer(const char *adapter, const char *device_path, char **name, char **bdaddr) { DBusMessage *message, *reply; - DBusMessageIter iter, reply_iter; - char *name; + DBusMessageIter reply_iter; + gboolean retval; - message = dbus_message_new_method_call("org.bluez", adapter, - "org.bluez.Adapter", - "GetRemoteName"); - dbus_message_iter_init_append(message, &iter); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &bdaddr); + message = dbus_message_new_method_call("org.bluez", device_path, + "org.bluez.Device", + "GetProperties"); reply = dbus_connection_send_with_reply_and_block(conn, message, -1, NULL); @@ -259,56 +307,78 @@ static char *device_get_name(const char *adapter, const char *bdaddr) dbus_message_unref(message); if (!reply) - return NULL; + return FALSE; dbus_message_iter_init(reply, &reply_iter); - dbus_message_iter_get_basic(&reply_iter, &name); - name = g_strdup(name); + retval = parse_device_properties(&reply_iter, name, bdaddr); + dbus_message_unref(reply); - return name; + return retval; } -static void remote_device_found(const char *adapter, const char *bdaddr, guint class, int rssi) +static void remote_device_found(const char *adapter, const char *bdaddr, const char *name) { - uint8_t major_index = (class >> 8) & 0x1F; - uint8_t minor_index; - uint8_t shift_minor = 0; - gboolean found = FALSE; - char *name, *id; - - /* Check if we have a printer - * From hcid/dbus-adapter.c minor_class_str() */ - if (major_index != 6) - return; + DBusMessage *message, *reply, *adapter_reply; + DBusMessageIter iter; + char *object_path = NULL; + char *id; - minor_index = (class >> 4) & 0x0F; - while (shift_minor < 4) { - if (((minor_index >> shift_minor) & 0x01) == 0x01) { - if (shift_minor == 3) { - found = TRUE; - break; - } - } - shift_minor++; + adapter_reply = NULL; + + if (adapter == NULL) { + message = dbus_message_new_method_call("org.bluez", "/", + "org.bluez.Manager", + "DefaultAdapter"); + + adapter_reply = dbus_connection_send_with_reply_and_block(conn, + message, -1, NULL); + + dbus_message_unref(message); + + if (dbus_message_get_args(adapter_reply, NULL, DBUS_TYPE_OBJECT_PATH, &adapter, DBUS_TYPE_INVALID) == FALSE) + return; } - if (!found) - return; + message = dbus_message_new_method_call("org.bluez", adapter, + "org.bluez.Adapter", + "FindDevice"); + dbus_message_iter_init_append(message, &iter); + dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &bdaddr); + + if (adapter_reply != NULL) + dbus_message_unref(adapter_reply); + + reply = dbus_connection_send_with_reply_and_block(conn, + message, -1, NULL); + + dbus_message_unref(message); + + if (!reply) { + message = dbus_message_new_method_call("org.bluez", adapter, + "org.bluez.Adapter", + "CreateDevice"); + dbus_message_iter_init_append(message, &iter); + dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &bdaddr); - name = device_get_name(adapter, bdaddr); - id = device_get_ieee1284_id(adapter, bdaddr); + reply = dbus_connection_send_with_reply_and_block(conn, + message, -1, NULL); + + dbus_message_unref(message); + + if (!reply) + return; + } else { + if (dbus_message_get_args(reply, NULL, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID) == FALSE) + return; + } + + id = device_get_ieee1284_id(adapter, object_path); add_device_to_list(name, bdaddr, id); - g_free(name); g_free(id); } -static void remote_name_updated(const char *bdaddr, const char *name) -{ - add_device_to_list(name, bdaddr, NULL); -} - static void discovery_completed(void) { GSList *l; @@ -317,7 +387,10 @@ static void discovery_completed(void) struct cups_device *device = (struct cups_device *) l->data; if (device->name == NULL) - device->name = escape_name(device->bdaddr, ':', '-'); + device->name = g_strdelimit(g_strdup(device->bdaddr), ":", '-'); + /* Give another try to getting an ID for the device */ + if (device->id == NULL) + remote_device_found(NULL, device->bdaddr, device->name); print_printer_details(device->name, device->bdaddr, device->id); g_free(device->name); g_free(device->bdaddr); @@ -356,7 +429,7 @@ static gboolean list_known_printers(const char *adapter) message = dbus_message_new_method_call ("org.bluez", adapter, "org.bluez.Adapter", - "ListRemoteDevices"); + "ListDevices"); if (message == NULL) return FALSE; @@ -376,18 +449,21 @@ static gboolean list_known_printers(const char *adapter) } dbus_message_iter_recurse(&reply_iter, &iter_array); - while (dbus_message_iter_get_arg_type(&iter_array) == DBUS_TYPE_STRING) { - char *bdaddr; + while (dbus_message_iter_get_arg_type(&iter_array) == DBUS_TYPE_OBJECT_PATH) { + const char *object_path; + char *name = NULL; + char *bdaddr = NULL; - dbus_message_iter_get_basic(&iter_array, &bdaddr); - if (device_is_printer(adapter, bdaddr)) { - char *name, *id; - name = device_get_name(adapter, bdaddr); - id = device_get_ieee1284_id(adapter, bdaddr); + dbus_message_iter_get_basic(&iter_array, &object_path); + if (device_is_printer(adapter, object_path, &name, &bdaddr)) { + char *id; + + id = device_get_ieee1284_id(adapter, object_path); add_device_to_list(name, bdaddr, id); - g_free(name); g_free(id); } + g_free(name); + g_free(bdaddr); dbus_message_iter_next(&iter_array); } @@ -398,32 +474,22 @@ static gboolean list_known_printers(const char *adapter) static DBusHandlerResult filter_func(DBusConnection *connection, DBusMessage *message, void *user_data) { - const char *adapter; - if (dbus_message_is_signal(message, "org.bluez.Adapter", - "RemoteDeviceFound")) { - char *bdaddr; - guint class; - int rssi; + "DeviceFound")) { + const char *adapter, *bdaddr; + char *name; + DBusMessageIter iter; - dbus_message_get_args(message, NULL, - DBUS_TYPE_STRING, &bdaddr, - DBUS_TYPE_UINT32, &class, - DBUS_TYPE_INT32, &rssi, - DBUS_TYPE_INVALID); - adapter = dbus_message_get_path(message); - remote_device_found(adapter, bdaddr, class, rssi); - } else if (dbus_message_is_signal(message, "org.bluez.Adapter", - "RemoteNameUpdated")) { - char *bdaddr, *name; + dbus_message_iter_init(message, &iter); + dbus_message_iter_get_basic(&iter, &bdaddr); + dbus_message_iter_next(&iter); - dbus_message_get_args(message, NULL, - DBUS_TYPE_STRING, &bdaddr, - DBUS_TYPE_STRING, &name, - DBUS_TYPE_INVALID); - remote_name_updated(bdaddr, name); + adapter = dbus_message_get_path(message); + if (parse_device_properties(&iter, &name, NULL)) + remote_device_found(adapter, bdaddr, name); + g_free (name); } else if (dbus_message_is_signal(message, "org.bluez.Adapter", - "RemoteDeviceDisappeared")) { + "DeviceDisappeared")) { char *bdaddr; dbus_message_get_args(message, NULL, @@ -431,8 +497,21 @@ static DBusHandlerResult filter_func(DBusConnection *connection, DBusMessage *me DBUS_TYPE_INVALID); remote_device_disappeared(bdaddr); } else if (dbus_message_is_signal(message, "org.bluez.Adapter", - "DiscoveryCompleted")) { - discovery_completed(); + "PropertyChanged")) { + DBusMessageIter iter, value_iter; + const char *name; + gboolean discovering; + + dbus_message_iter_init(message, &iter); + dbus_message_iter_get_basic(&iter, &name); + dbus_message_iter_next(&iter); + dbus_message_iter_recurse(&iter, &value_iter); + dbus_message_iter_get_basic(&value_iter, &discovering); + + if (discovering == FALSE && doing_disco) { + doing_disco = FALSE; + discovery_completed(); + } } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; @@ -452,7 +531,6 @@ static gboolean list_printers(void) DBusMessage *reply, *message; DBusMessageIter reply_iter; char *adapter, *match; - guint len; conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NULL, NULL); if (conn == NULL) @@ -486,7 +564,7 @@ static gboolean list_printers(void) } dbus_message_iter_init(reply, &reply_iter); - if (dbus_message_iter_get_arg_type(&reply_iter) != DBUS_TYPE_STRING) { + if (dbus_message_iter_get_arg_type(&reply_iter) != DBUS_TYPE_OBJECT_PATH) { dbus_message_unref(reply); dbus_connection_unref(conn); return FALSE; @@ -508,19 +586,17 @@ static gboolean list_printers(void) "sender='org.bluez'," \ "path='%s'" - len = strlen(MATCH_FORMAT) - 2 + strlen(adapter) + 1; - match = g_malloc(len); - snprintf(match, len, "type='signal'," - "interface='org.bluez.Adapter'," - "sender='org.bluez'," - "path='%s'", - adapter); + match = g_strdup_printf(MATCH_FORMAT, adapter); dbus_bus_add_match(conn, match, &error); g_free(match); + /* Add the the recent devices */ + list_known_printers(adapter); + + doing_disco = TRUE; message = dbus_message_new_method_call("org.bluez", adapter, "org.bluez.Adapter", - "DiscoverDevicesWithoutNameResolving"); + "StartDiscovery"); if (!dbus_connection_send_with_reply(conn, message, NULL, -1)) { dbus_message_unref(message); @@ -530,9 +606,6 @@ static gboolean list_printers(void) } dbus_message_unref(message); - /* Also add the the recent devices */ - g_timeout_add(0, (GSourceFunc) list_known_printers, adapter); - loop = g_main_loop_new(NULL, TRUE); g_main_loop_run(loop); Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- bluez.spec 9 Mar 2009 17:11:56 -0000 1.48 +++ bluez.spec 9 Mar 2009 19:31:52 -0000 1.49 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez Version: 4.32 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz @@ -16,6 +16,8 @@ Patch3: bluez-sdp-xml-with-nulls-2.patch # http://thread.gmane.org/gmane.linux.bluez.kernel/1688/focus=1708 Patch4: bluez-fix-sdp-copy-for-strings-with-nulls.patch +# http://thread.gmane.org/gmane.linux.bluez.kernel/1688/focus=1712 +Patch5: bluez-port-cups-to-bluez4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.bluez.org/ @@ -105,6 +107,7 @@ %patch2 -p1 -b .non-utf8-name %patch3 -p1 -b .nulls-in-sdp-text %patch4 -p1 -b .more-nulls-in-sdp-text +%patch5 -p1 -b .cups-bluez4 %build %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund @@ -197,6 +200,9 @@ %{_libdir}/alsa-lib/*.so %changelog +* Mon Mar 09 2009 - Bastien Nocera - 4.32-8 +- Port CUPS backend to BlueZ 4.x + * Mon Mar 09 2009 - Bastien Nocera - 4.32-7 - A (slightly) different fix for parsing to XML when it contains a NULL From pingou at fedoraproject.org Mon Mar 9 19:36:06 2009 From: pingou at fedoraproject.org (Pierre-YvesChibon) Date: Mon, 9 Mar 2009 19:36:06 +0000 (UTC) Subject: rpms/libfprint/devel libfprint.spec,1.13,1.14 Message-ID: <20090309193606.DF52070034@cvs1.fedora.phx.redhat.com> Author: pingou Update of /cvs/pkgs/rpms/libfprint/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23929 Modified Files: libfprint.spec Log Message: rebuilt for rawhide Index: libfprint.spec =================================================================== RCS file: /cvs/pkgs/rpms/libfprint/devel/libfprint.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libfprint.spec 25 Feb 2009 14:50:50 -0000 1.13 +++ libfprint.spec 9 Mar 2009 19:35:36 -0000 1.14 @@ -1,6 +1,6 @@ Name: libfprint Version: 0.1.0 -Release: 5.pre1%{?dist} +Release: 6.pre1%{?dist} Summary: Tool kit for fingerprint scanner Group: System Environment/Libraries @@ -71,6 +71,9 @@ %{_datadir}/hal/fdi/information/20thirdparty/10-fingerprint-reader-fprint.fdi %changelog +* Mon Mar 09 2009 pingou - 0.1.0-6.pre1 +- Rebuilt for rawhide + * Wed Feb 25 2009 Fedora Release Engineering - 0.1.0-5.pre1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From lucilanga at fedoraproject.org Mon Mar 9 19:37:50 2009 From: lucilanga at fedoraproject.org (Lucian Langa) Date: Mon, 9 Mar 2009 19:37:50 +0000 (UTC) Subject: rpms/scummvm/devel scummvm-0.13.0-nostrip.patch, NONE, 1.1 scummvm-0.11.0-nostrip.patch, 1.1, NONE Message-ID: <20090309193750.AA40070034@cvs1.fedora.phx.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/scummvm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24573 Added Files: scummvm-0.13.0-nostrip.patch Removed Files: scummvm-0.11.0-nostrip.patch Log Message: * Mon Mar 09 2009 Lucian Langa - 0.13.0-1 - new upstream release - update patch0 - drop installing uneeded theme files - drop vendor from desktop file; fix icon entry scummvm-0.13.0-nostrip.patch: --- NEW FILE scummvm-0.13.0-nostrip.patch --- --- scummvm-0.13.0/ports.mk 2009-02-22 03:06:44.000000000 +0200 +++ scummvm-0.13.0-mod/ports.mk 2009-03-09 15:30:40.000000000 +0200 @@ -10,7 +10,7 @@ # install: all $(INSTALL) -d "$(DESTDIR)$(BINDIR)" - $(INSTALL) -c -s -m 755 "./scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" + $(INSTALL) -c -m 755 "./scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/" $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6" $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/" --- scummvm-0.11.0-nostrip.patch DELETED --- From atkac at fedoraproject.org Mon Mar 9 19:56:48 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Mon, 9 Mar 2009 19:56:48 +0000 (UTC) Subject: rpms/mtools/devel .cvsignore,1.11,1.12 sources,1.11,1.12 Message-ID: <20090309195648.EAC2B70034@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/mtools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29458 Modified Files: .cvsignore sources Log Message: - updated sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mtools/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 1 Dec 2008 11:12:58 -0000 1.11 +++ .cvsignore 9 Mar 2009 19:56:18 -0000 1.12 @@ -1 +1 @@ -mtools-4.0.0.tar.bz2 +mtools-4.0.9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mtools/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 1 Dec 2008 11:12:58 -0000 1.11 +++ sources 9 Mar 2009 19:56:18 -0000 1.12 @@ -1 +1 @@ -acd2d6911d7657a051daefc55fe0baaf mtools-4.0.0.tar.bz2 +4e73fb58fad16f48259a01abd0377d8d mtools-4.0.9.tar.bz2 From notting at fedoraproject.org Mon Mar 9 20:01:49 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Mon, 9 Mar 2009 20:01:49 +0000 (UTC) Subject: rpms/chkconfig/devel .cvsignore, 1.43, 1.44 chkconfig.spec, 1.54, 1.55 sources, 1.44, 1.45 Message-ID: <20090309200149.24ED270034@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/rpms/chkconfig/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30936 Modified Files: .cvsignore chkconfig.spec sources Log Message: 1.3.42-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/chkconfig/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 20 Jan 2009 18:39:54 -0000 1.43 +++ .cvsignore 9 Mar 2009 20:01:18 -0000 1.44 @@ -1 +1 @@ -chkconfig-1.3.41.tar.bz2 +chkconfig-1.3.42.tar.bz2 Index: chkconfig.spec =================================================================== RCS file: /cvs/extras/rpms/chkconfig/devel/chkconfig.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- chkconfig.spec 24 Feb 2009 07:24:39 -0000 1.54 +++ chkconfig.spec 9 Mar 2009 20:01:18 -0000 1.55 @@ -1,7 +1,7 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig -Version: 1.3.41 -Release: 2 +Version: 1.3.42 +Release: 1 License: GPLv2 Group: System Environment/Base Source: %{name}-%{version}.tar.bz2 @@ -74,8 +74,11 @@ %{_mandir}/*/ntsysv.8* %changelog -* Mon Feb 23 2009 Fedora Release Engineering - 1.3.41-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Fri Mar 6 2009 Bill Nottingham 1.3.42-1 +- further LSB fixes (#474223) +- throw errors on various malformed init scripts (#481198) +- man page updates re: LSB (#487979) +- translation updates: mai, gu, pt_BR, ro, ca, pa, sr, fr, hu * Tue Jan 20 2009 Bill Nottingham 1.3.41-1 - restore return code & error on unconfigured services (#480805) Index: sources =================================================================== RCS file: /cvs/extras/rpms/chkconfig/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 20 Jan 2009 18:39:54 -0000 1.44 +++ sources 9 Mar 2009 20:01:18 -0000 1.45 @@ -1 +1 @@ -9f6708c058adc77d1fe7537983633ad7 chkconfig-1.3.41.tar.bz2 +5366f164e08a8982a6606a08b8918cc3 chkconfig-1.3.42.tar.bz2 From spot at fedoraproject.org Mon Mar 9 20:03:26 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Mon, 9 Mar 2009 20:03:26 +0000 (UTC) Subject: rpms/anaconda/F-9 anaconda-11.4.0.83-sparc-smalltftp.patch, 1.2, 1.3 anaconda.spec, 1.701, 1.702 Message-ID: <20090309200326.96F0270034@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/anaconda/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31420 Modified Files: anaconda-11.4.0.83-sparc-smalltftp.patch anaconda.spec Log Message: temporary hack to keep tftpinitrd.img around anaconda-11.4.0.83-sparc-smalltftp.patch: Index: anaconda-11.4.0.83-sparc-smalltftp.patch =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/F-9/anaconda-11.4.0.83-sparc-smalltftp.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- anaconda-11.4.0.83-sparc-smalltftp.patch 12 Feb 2009 19:59:44 -0000 1.2 +++ anaconda-11.4.0.83-sparc-smalltftp.patch 9 Mar 2009 20:02:56 -0000 1.3 @@ -40,7 +40,7 @@ + --initrdfrom $TOPDESTPATH/images/tftpinitrd.img \ --systemmap $MBD_BOOTTREE/System.map + echo "Deleting $TOPDESTPATH/images/tftpinitrd.img , we only want this for the tftp image creation" -+ rm -rf $TOPDESTPATH/images/tftpinitrd.img ++ # rm -rf $TOPDESTPATH/images/tftpinitrd.img else echo "I can't find SILO in $IMGPATH/usr/lib/anaconda-runtime/boot ?!?" exit 1 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/F-9/anaconda.spec,v retrieving revision 1.701 retrieving revision 1.702 diff -u -r1.701 -r1.702 --- anaconda.spec 12 Feb 2009 19:59:44 -0000 1.701 +++ anaconda.spec 9 Mar 2009 20:02:56 -0000 1.702 @@ -3,7 +3,7 @@ Summary: Graphical system installer Name: anaconda Version: 11.4.0.83 -Release: 15 +Release: 15.1 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -232,6 +232,10 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Mon Mar 9 2009 Tom "spot" Callaway - 11.4.0.83-15.1 +- HACK: Don't delete the tftpinitrd.img, we need to look at it to see what + else we can scoop out + * Wed Feb 11 2009 Tom "spot" Callaway - 11.4.0.83-15 - tweak smalltftp patch to take out more modules (on sparc) From lucilanga at fedoraproject.org Mon Mar 9 20:14:16 2009 From: lucilanga at fedoraproject.org (Lucian Langa) Date: Mon, 9 Mar 2009 20:14:16 +0000 (UTC) Subject: rpms/xlog/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xlog.spec, 1.9, 1.10 Message-ID: <20090309201416.CB3E270034@cvs1.fedora.phx.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xlog/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1587 Modified Files: .cvsignore sources xlog.spec Log Message: * Mon Mar 09 2009 Lucian Langa - 2.0.1-1 - new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xlog/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Feb 2009 08:07:56 -0000 1.4 +++ .cvsignore 9 Mar 2009 20:13:45 -0000 1.5 @@ -1 +1 @@ -xlog-2.0.tar.gz +xlog-2.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xlog/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Feb 2009 08:07:56 -0000 1.4 +++ sources 9 Mar 2009 20:13:46 -0000 1.5 @@ -1 +1 @@ -7daf0a83be1728dbdbed3c1b3dac5310 xlog-2.0.tar.gz +13cdfd32dcec84ff417fa03ea4fcb086 xlog-2.0.1.tar.gz Index: xlog.spec =================================================================== RCS file: /cvs/pkgs/rpms/xlog/devel/xlog.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xlog.spec 26 Feb 2009 09:52:53 -0000 1.9 +++ xlog.spec 9 Mar 2009 20:13:46 -0000 1.10 @@ -1,6 +1,6 @@ Name: xlog -Version: 2.0 -Release: 2%{?dist} +Version: 2.0.1 +Release: 1%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -74,6 +74,9 @@ %changelog +* Mon Mar 09 2009 Lucian Langa - 2.0.1-1 +- new upstream release + * Thu Feb 26 2009 Fedora Release Engineering - 2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pwouters at fedoraproject.org Mon Mar 9 20:24:45 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Mon, 9 Mar 2009 20:24:45 +0000 (UTC) Subject: rpms/dnssec-conf/devel .cvsignore,1.3,1.4 dnssec-conf.spec,1.5,1.6 Message-ID: <20090309202445.1505E70034@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/dnssec-conf/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4271 Modified Files: .cvsignore dnssec-conf.spec Log Message: prepare new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Feb 2009 20:54:43 -0000 1.3 +++ .cvsignore 9 Mar 2009 20:24:14 -0000 1.4 @@ -1,2 +1,3 @@ dnssec-conf-1.13.tar.gz dnssec-conf-1.15.tar.gz +dnssec-conf-1.16.tar.gz Index: dnssec-conf.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/devel/dnssec-conf.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dnssec-conf.spec 2 Mar 2009 00:04:57 -0000 1.5 +++ dnssec-conf.spec 9 Mar 2009 20:24:14 -0000 1.6 @@ -1,6 +1,6 @@ Summary: DNSSEC and DLV configuration and priming tool Name: dnssec-conf -Version: 1.16 +Version: 1.17 Release: 1 License: GPLv2+ Url: http://www.xelerance.com/software/dnssec-conf/ @@ -32,7 +32,7 @@ %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install - +install -m 0755 packaging/fedora/dnssec.sysconfig %{_sysconfdir}/dnssec %clean rm -rf ${RPM_BUILD_ROOT} @@ -51,6 +51,10 @@ %{_mandir}/*/* %changelog +* Mon Mar 09 2009 Paul Wouters - 1.17-1 +- Upgraded to 1.17. This adds better initscript support and fixes a bug + when named/unbound were not installed (rhbug 488685) + * Sun Mar 01 2009 Paul Wouters - 1.16-1 - Upgraded to 1.16. This adds the production key for .gov See http://dotgov.gov/dnssecinfo.aspx From tmraz at fedoraproject.org Mon Mar 9 20:33:41 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Mon, 9 Mar 2009 20:33:41 +0000 (UTC) Subject: rpms/pam/devel .cvsignore,1.52,1.53 sources,1.54,1.55 Message-ID: <20090309203341.A6D8D70034@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/pam/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6387 Modified Files: .cvsignore sources Log Message: * Mon Mar 9 2009 Tomas Mraz 1.0.91-1 - upgrade to new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pam/devel/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 16 Dec 2008 15:17:15 -0000 1.52 +++ .cvsignore 9 Mar 2009 20:33:11 -0000 1.53 @@ -1,4 +1 @@ -*.src.rpm -*.tar.bz2 -pam-redhat-0.99.10-1.tar.bz2 -Linux-PAM-1.0.90.tar.bz2 +Linux-PAM-1.0.91.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pam/devel/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 16 Dec 2008 15:17:16 -0000 1.54 +++ sources 9 Mar 2009 20:33:11 -0000 1.55 @@ -1,2 +1 @@ -c115640346a987356f6b76ec1d425185 pam-redhat-0.99.10-1.tar.bz2 -1ec85b7ca3422648c5fa9ca65caff039 Linux-PAM-1.0.90.tar.bz2 +e1dd807721b6981d82c302c6b74065cd Linux-PAM-1.0.91.tar.bz2 From rstrode at fedoraproject.org Mon Mar 9 20:34:48 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Mon, 9 Mar 2009 20:34:48 +0000 (UTC) Subject: rpms/gdm/devel gdm-2.25.2-multistack-but-boring.patch, 1.7, 1.8 gdm.spec, 1.448, 1.449 Message-ID: <20090309203448.3931770034@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gdm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6841 Modified Files: gdm-2.25.2-multistack-but-boring.patch gdm.spec Log Message: - Don't race with PAM modules that ask questions during pam_open_session (and don't subsequently go bonkers when losing the race). gdm-2.25.2-multistack-but-boring.patch: Index: gdm-2.25.2-multistack-but-boring.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.25.2-multistack-but-boring.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gdm-2.25.2-multistack-but-boring.patch 6 Mar 2009 20:05:08 -0000 1.7 +++ gdm-2.25.2-multistack-but-boring.patch 9 Mar 2009 20:34:47 -0000 1.8 @@ -13735,3 +13735,568 @@ + + return GDM_GREETER_EXTENSION (extension); +} +commit a28cd7576027cc531e655325a9f3b4b307a1fd22 +Author: Ray Strode +Date: Mon Mar 9 15:41:12 2009 -0400 + + Don't tear down greeter until pam_open_session finishes + + Some PAM modules ask questions at that late stage of the game, + and so we need a greeter to forward the questions on to the + user. + +diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c +index 826612e..ef6d236 100644 +--- a/daemon/gdm-factory-slave.c ++++ b/daemon/gdm-factory-slave.c +@@ -278,9 +278,7 @@ on_session_accredited (GdmSession *session, + { + g_debug ("GdmFactorySlave: session user verified"); + +- gdm_session_start_session (session, service_name); +- +- gdm_greeter_server_reset (slave->priv->greeter_server); ++ gdm_session_open_session (session, service_name); + } + + static void +@@ -298,6 +296,31 @@ on_session_accreditation_failed (GdmSession *session, + } + + static void ++on_session_opened (GdmSession *session, ++ const char *service_name, ++ GdmFactorySlave *slave) ++{ ++ g_debug ("GdmFactorySlave: session opened"); ++ ++ gdm_session_start_session (session, service_name); ++ ++ gdm_greeter_server_reset (slave->priv->greeter_server); ++} ++ ++static void ++on_session_open_failed (GdmSession *session, ++ const char *service_name, ++ const char *message, ++ GdmFactorySlave *slave) ++{ ++ g_debug ("GdmFactorySlave: could not open session: %s", message); ++ ++ gdm_greeter_server_problem (slave->priv->greeter_server, service_name, _("Unable to open session")); ++ ++ queue_greeter_reset (slave); ++} ++ ++static void + on_session_session_started (GdmSession *session, + GdmFactorySlave *slave) + { +@@ -767,6 +790,14 @@ gdm_factory_slave_start (GdmSlave *slave) + G_CALLBACK (on_session_accreditation_failed), + slave); + g_signal_connect (GDM_FACTORY_SLAVE (slave)->priv->session, ++ "session-opened", ++ G_CALLBACK (on_session_opened), ++ slave); ++ g_signal_connect (GDM_FACTORY_SLAVE (slave)->priv->session, ++ "session-open-failed", ++ G_CALLBACK (on_session_open_failed), ++ slave); ++ g_signal_connect (GDM_FACTORY_SLAVE (slave)->priv->session, + "info", + G_CALLBACK (on_session_info), + slave); +diff --git a/daemon/gdm-product-slave.c b/daemon/gdm-product-slave.c +index dd2e1bc..93d83a1 100644 +--- a/daemon/gdm-product-slave.c ++++ b/daemon/gdm-product-slave.c +@@ -635,6 +635,27 @@ on_session_accreditation_failed (GdmSession *session, + } + + static void ++on_session_opened (GdmSession *session, ++ const char *service_name, ++ GdmProductSlave *slave) ++{ ++ send_dbus_string_method (slave->priv->session_relay_connection, ++ "SessionOpened", service_name); ++} ++ ++static void ++on_session_open_failed (GdmSession *session, ++ const char *service_name, ++ const char *message, ++ GdmProductSlave *slave) ++{ ++ send_dbus_string_string_method (slave->priv->session_relay_connection, ++ "SessionOpenFailed", ++ service_name, ++ message); ++} ++ ++static void + on_session_info (GdmSession *session, + const char *service_name, + const char *text, +@@ -1051,7 +1072,14 @@ create_new_session (GdmProductSlave *slave) + "accreditation-failed", + G_CALLBACK (on_session_accreditation_failed), + slave); +- ++ g_signal_connect (slave->priv->session, ++ "session-opened", ++ G_CALLBACK (on_session_opened), ++ slave); ++ g_signal_connect (slave->priv->session, ++ "session-open-failed", ++ G_CALLBACK (on_session_open_failed), ++ slave); + g_signal_connect (slave->priv->session, + "info", + G_CALLBACK (on_session_info), +diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c +index 2fc39f3..472d91f 100644 +--- a/daemon/gdm-session-direct.c ++++ b/daemon/gdm-session-direct.c +@@ -943,6 +943,58 @@ gdm_session_direct_handle_problem (GdmSessionDirect *session, + } + + static DBusHandlerResult ++gdm_session_direct_handle_session_opened (GdmSessionDirect *session, ++ GdmSessionConversation *conversation, ++ DBusMessage *message) ++{ ++ DBusMessage *reply; ++ DBusError error; ++ ++ g_debug ("GdmSessionDirect: Handling SessionOpened"); ++ ++ dbus_error_init (&error); ++ if (! dbus_message_get_args (message, &error, DBUS_TYPE_INVALID)) { ++ g_warning ("ERROR: %s", error.message); ++ } ++ ++ g_debug ("GdmSessionDirect: Emitting 'session-opened' signal"); ++ ++ _gdm_session_session_opened (GDM_SESSION (session), conversation->service_name); ++ ++ reply = dbus_message_new_method_return (message); ++ dbus_connection_send (conversation->worker_connection, reply, NULL); ++ dbus_message_unref (reply); ++ ++ return DBUS_HANDLER_RESULT_HANDLED; ++} ++ ++static DBusHandlerResult ++gdm_session_direct_handle_open_failed (GdmSessionDirect *session, ++ GdmSessionConversation *conversation, ++ DBusMessage *message) ++{ ++ DBusMessage *reply; ++ DBusError error; ++ const char *text; ++ ++ dbus_error_init (&error); ++ if (! dbus_message_get_args (message, &error, ++ DBUS_TYPE_STRING, &text, ++ DBUS_TYPE_INVALID)) { ++ g_warning ("ERROR: %s", error.message); ++ } ++ ++ reply = dbus_message_new_method_return (message); ++ dbus_connection_send (conversation->worker_connection, reply, NULL); ++ dbus_message_unref (reply); ++ ++ g_debug ("GdmSessionDirect: Emitting 'session-open-failed' signal"); ++ _gdm_session_session_open_failed (GDM_SESSION (session), conversation->service_name, text); ++ ++ return DBUS_HANDLER_RESULT_HANDLED; ++} ++ ++static DBusHandlerResult + gdm_session_direct_handle_session_started (GdmSessionDirect *session, + GdmSessionConversation *conversation, + DBusMessage *message) +@@ -1221,6 +1273,10 @@ session_worker_message (DBusConnection *connection, + return gdm_session_direct_handle_accreditation_failed (session, conversation, message); + } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "UsernameChanged")) { + return gdm_session_direct_handle_username_changed (session, conversation, message); ++ } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "SessionOpened")) { ++ return gdm_session_direct_handle_session_opened (session, conversation, message); ++ } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "OpenFailed")) { ++ return gdm_session_direct_handle_open_failed (session, conversation, message); + } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "SessionStarted")) { + return gdm_session_direct_handle_session_started (session, conversation, message); + } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "StartFailed")) { +@@ -2213,6 +2269,19 @@ setup_session_environment (GdmSessionDirect *session) + } + + static void ++gdm_session_direct_open_session (GdmSession *session, ++ const char *service_name) ++{ ++ GdmSessionDirect *impl = GDM_SESSION_DIRECT (session); ++ GdmSessionConversation *conversation; ++ ++ g_return_if_fail (session != NULL); ++ ++ conversation = find_conversation_by_name (impl, service_name); ++ send_dbus_void_signal (conversation, "OpenSession"); ++} ++ ++static void + gdm_session_direct_start_session (GdmSession *session, + const char *service_name) + { +@@ -2685,6 +2754,7 @@ gdm_session_iface_init (GdmSessionIface *iface) + iface->authenticate = gdm_session_direct_authenticate; + iface->authorize = gdm_session_direct_authorize; + iface->accredit = gdm_session_direct_accredit; ++ iface->open_session = gdm_session_direct_open_session; + iface->close = gdm_session_direct_close; + + iface->cancel = gdm_session_direct_cancel; +diff --git a/daemon/gdm-session-private.h b/daemon/gdm-session-private.h +index 860c09c..36781dd 100644 +--- a/daemon/gdm-session-private.h ++++ b/daemon/gdm-session-private.h +@@ -54,6 +54,11 @@ void _gdm_session_accredited (GdmSession *sessio + void _gdm_session_accreditation_failed (GdmSession *session, + const char *service_name, + const char *text); ++void _gdm_session_session_opened (GdmSession *session, ++ const char *service_name); ++void _gdm_session_session_open_failed (GdmSession *session, ++ const char *service_name, ++ const char *message); + void _gdm_session_session_started (GdmSession *session, + const char *service_name, + int pid); +diff --git a/daemon/gdm-session-relay.c b/daemon/gdm-session-relay.c +index 6e15f75..3bf8ed7 100644 +--- a/daemon/gdm-session-relay.c ++++ b/daemon/gdm-session-relay.c +@@ -247,6 +247,14 @@ gdm_session_relay_accredit (GdmSession *session, + } + + static void ++gdm_session_relay_open_session (GdmSession *session, ++ const char *service_name) ++{ ++ GdmSessionRelay *impl = GDM_SESSION_RELAY (session); ++ send_dbus_string_signal (impl, "OpenSession", service_name); ++} ++ ++static void + gdm_session_relay_answer_query (GdmSession *session, + const char *service_name, + const char *text) +@@ -678,6 +686,61 @@ handle_accreditation_failed (GdmSessionRelay *session_relay, + + return DBUS_HANDLER_RESULT_HANDLED; + } ++static DBusHandlerResult ++handle_session_opened (GdmSessionRelay *session_relay, ++ DBusConnection *connection, ++ DBusMessage *message) ++{ ++ DBusMessage *reply; ++ DBusError error; ++ char *service_name; ++ ++ dbus_error_init (&error); ++ if (! dbus_message_get_args (message, &error, ++ DBUS_TYPE_STRING, &service_name, ++ DBUS_TYPE_INVALID)) { ++ g_warning ("ERROR: %s", error.message); ++ } ++ dbus_error_free (&error); ++ ++ g_debug ("GdmSessionRelay: Session Opened"); ++ ++ reply = dbus_message_new_method_return (message); ++ dbus_connection_send (connection, reply, NULL); ++ dbus_message_unref (reply); ++ ++ _gdm_session_session_opened (GDM_SESSION (session_relay), service_name); ++ ++ return DBUS_HANDLER_RESULT_HANDLED; ++} ++ ++static DBusHandlerResult ++handle_session_open_failed (GdmSessionRelay *session_relay, ++ DBusConnection *connection, ++ DBusMessage *message) ++{ ++ DBusMessage *reply; ++ DBusError error; ++ char *service_name; ++ ++ dbus_error_init (&error); ++ if (! dbus_message_get_args (message, &error, ++ DBUS_TYPE_STRING, &service_name, ++ DBUS_TYPE_INVALID)) { ++ g_warning ("ERROR: %s", error.message); ++ } ++ dbus_error_free (&error); ++ ++ g_debug ("GdmSessionRelay: Session Open Failed"); ++ ++ reply = dbus_message_new_method_return (message); ++ dbus_connection_send (connection, reply, NULL); ++ dbus_message_unref (reply); ++ ++ _gdm_session_session_open_failed (GDM_SESSION (session_relay), service_name, NULL); ++ ++ return DBUS_HANDLER_RESULT_HANDLED; ++} + + static DBusHandlerResult + handle_session_started (GdmSessionRelay *session_relay, +@@ -794,6 +857,10 @@ session_handle_child_message (DBusConnection *connection, + return handle_accredited (session_relay, connection, message); + } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "AccreditationFailed")) { + return handle_accreditation_failed (session_relay, connection, message); ++ } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "SessionOpened")) { ++ return handle_session_opened (session_relay, connection, message); ++ } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "SessionOpenFailed")) { ++ return handle_session_open_failed (session_relay, connection, message); + } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "SessionStarted")) { + return handle_session_started (session_relay, connection, message); + } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "SessionStopped")) { +@@ -1193,6 +1260,7 @@ gdm_session_iface_init (GdmSessionIface *iface) + iface->authenticate = gdm_session_relay_authenticate; + iface->authorize = gdm_session_relay_authorize; + iface->accredit = gdm_session_relay_accredit; ++ iface->open_session = gdm_session_relay_open_session; + iface->close = gdm_session_relay_close; + + iface->cancel = gdm_session_relay_cancel; +diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c +index 4c37943..c6ab15c 100644 +--- a/daemon/gdm-session-worker.c ++++ b/daemon/gdm-session-worker.c +@@ -2189,13 +2189,13 @@ do_open_session (GdmSessionWorker *worker) + res = gdm_session_worker_open_user_session (worker, &error); + if (! res) { + send_dbus_string_method (worker->priv->connection, +- "StartFailed", ++ "OpenFailed", + error->message); + g_error_free (error); + return; + } + +- queue_state_change (worker); ++ send_dbus_void_method (worker->priv->connection, "SessionOpened"); + } + + static void +@@ -2311,7 +2311,7 @@ on_start_program (GdmSessionWorker *worker, + const char *text; + dbus_bool_t res; + +- /* FIXME: return error if not in ACCREDITED state */ ++ /* FIXME: return error if not in SESSION_OPENED state */ + + dbus_error_init (&error); + res = dbus_message_get_args (message, +@@ -2450,6 +2450,14 @@ on_establish_credentials (GdmSessionWorker *worker, + } + + static void ++on_open_session (GdmSessionWorker *worker, ++ DBusMessage *message) ++{ ++ /* FIXME: return error if not in ACCREDITED state */ ++ queue_state_change (worker); ++} ++ ++static void + on_reauthenticate (GdmSessionWorker *worker, + DBusMessage *message) + { +@@ -2509,6 +2517,8 @@ worker_dbus_handle_message (DBusConnection *connection, + on_authorize (worker, message); + } else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "EstablishCredentials")) { + on_establish_credentials (worker, message); ++ } else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "OpenSession")) { ++ on_open_session (worker, message); + } else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "StartProgram")) { + on_start_program (worker, message); + } else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "Reauthenticate")) { +diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c +index 9ee34af..8858071 100644 +--- a/daemon/gdm-session.c ++++ b/daemon/gdm-session.c +@@ -46,6 +46,8 @@ enum { + PROBLEM, + INFO_QUERY, + SECRET_INFO_QUERY, ++ SESSION_OPENED, ++ SESSION_OPEN_FAILED, + SESSION_STARTED, + SESSION_START_FAILED, + SESSION_EXITED, +@@ -207,6 +209,15 @@ gdm_session_cancel (GdmSession *session) + } + + void ++gdm_session_open_session (GdmSession *session, ++ const char *service_name) ++{ ++ g_return_if_fail (GDM_IS_SESSION (session)); ++ ++ GDM_SESSION_GET_IFACE (session)->open_session (session, service_name); ++} ++ ++void + gdm_session_start_session (GdmSession *session, + const char *service_name) + { +@@ -391,6 +402,28 @@ gdm_session_class_init (gpointer g_iface) + G_TYPE_NONE, + 2, + G_TYPE_STRING, G_TYPE_STRING); ++ signals [SESSION_OPENED] = ++ g_signal_new ("session-opened", ++ iface_type, ++ G_SIGNAL_RUN_FIRST, ++ G_STRUCT_OFFSET (GdmSessionIface, session_opened), ++ NULL, ++ NULL, ++ g_cclosure_marshal_VOID__STRING, ++ G_TYPE_NONE, ++ 1, ++ G_TYPE_STRING); ++ signals [SESSION_OPEN_FAILED] = ++ g_signal_new ("session-open-failed", ++ iface_type, ++ G_SIGNAL_RUN_FIRST, ++ G_STRUCT_OFFSET (GdmSessionIface, session_open_failed), ++ NULL, ++ NULL, ++ gdm_marshal_VOID__STRING_STRING, ++ G_TYPE_NONE, ++ 2, ++ G_TYPE_STRING, G_TYPE_STRING); + signals [SESSION_STARTED] = + g_signal_new ("session-started", + iface_type, +@@ -616,6 +649,23 @@ _gdm_session_problem (GdmSession *session, + } + + void ++_gdm_session_session_opened (GdmSession *session, ++ const char *service_name) ++{ ++ g_return_if_fail (GDM_IS_SESSION (session)); ++ g_signal_emit (session, signals [SESSION_OPENED], 0, service_name); ++} ++ ++void ++_gdm_session_session_open_failed (GdmSession *session, ++ const char *service_name, ++ const char *text) ++{ ++ g_return_if_fail (GDM_IS_SESSION (session)); ++ g_signal_emit (session, signals [SESSION_OPEN_FAILED], 0, service_name, text); ++} ++ ++void + _gdm_session_session_started (GdmSession *session, + const char *service_name, + int pid) +diff --git a/daemon/gdm-session.h b/daemon/gdm-session.h +index c45a770..22c2ccb 100644 +--- a/daemon/gdm-session.h ++++ b/daemon/gdm-session.h +@@ -62,6 +62,8 @@ struct _GdmSessionIface + void (* accredit) (GdmSession *session, + const char *service_name, + int cred_flag); ++ void (* open_session) (GdmSession *session, ++ const char *service_name); + void (* answer_query) (GdmSession *session, + const char *service_name, + const char *text); +@@ -115,6 +117,11 @@ struct _GdmSessionIface + void (* problem) (GdmSession *session, + const char *service_name, + const char *problem); ++ void (* session_opened) (GdmSession *session, ++ const char *service_name); ++ void (* session_open_failed) (GdmSession *session, ++ const char *service_name, ++ const char *message); + void (* session_started) (GdmSession *session, + const char *service_name, + int pid); +@@ -160,6 +167,8 @@ void gdm_session_authorize (GdmSession *session, + void gdm_session_accredit (GdmSession *session, + const char *service_name, + int cred_flag); ++void gdm_session_open_session (GdmSession *session, ++ const char *service_name); + void gdm_session_start_session (GdmSession *session, + const char *service_name); + void gdm_session_close (GdmSession *session); +diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c +index 1924185..d6b9724 100644 +--- a/daemon/gdm-simple-slave.c ++++ b/daemon/gdm-simple-slave.c +@@ -420,7 +420,7 @@ on_session_accredited (GdmSession *session, + const char *service_name, + GdmSimpleSlave *slave) + { +- queue_start_session (slave, service_name); ++ gdm_session_open_session (session, service_name); + } + + static void +@@ -454,6 +454,29 @@ on_session_accreditation_failed (GdmSession *session, + } + + static void ++on_session_opened (GdmSession *session, ++ const char *service_name, ++ GdmSimpleSlave *slave) ++{ ++ queue_start_session (slave, service_name); ++} ++ ++static void ++on_session_open_failed (GdmSession *session, ++ const char *service_name, ++ const char *message, ++ GdmSimpleSlave *slave) ++{ ++ if (slave->priv->greeter_server != NULL) { ++ gdm_greeter_server_problem (slave->priv->greeter_server, ++ service_name, ++ _("Unable to open session")); ++ } ++ ++ gdm_session_stop_conversation (session, service_name); ++} ++ ++static void + on_session_info (GdmSession *session, + const char *service_name, + const char *text, +@@ -685,6 +708,14 @@ create_new_session (GdmSimpleSlave *slave) + G_CALLBACK (on_session_accreditation_failed), + slave); + g_signal_connect (slave->priv->session, ++ "session-opened", ++ G_CALLBACK (on_session_opened), ++ slave); ++ g_signal_connect (slave->priv->session, ++ "session-open-failed", ++ G_CALLBACK (on_session_open_failed), ++ slave); ++ g_signal_connect (slave->priv->session, + "info", + G_CALLBACK (on_session_info), + slave); Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.448 retrieving revision 1.449 diff -u -r1.448 -r1.449 --- gdm.spec 6 Mar 2009 20:05:08 -0000 1.448 +++ gdm.spec 9 Mar 2009 20:34:47 -0000 1.449 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.25.2 -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -341,6 +341,11 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Mon Mar 9 2009 Ray Strode - 1:2.25.2-15 +- Don't race with PAM modules that ask questions during + pam_open_session (and don't subsequently go bonkers when + losing the race). + * Fri Mar 6 2009 Ray Strode - 1:2.25.2-14 - Reset "start session when ready" state to FALSE when starting new greeter from existing slave. May fix problem Chris Ball From jcollie at fedoraproject.org Mon Mar 9 20:35:57 2009 From: jcollie at fedoraproject.org (Jeffrey C. Ollie) Date: Mon, 9 Mar 2009 20:35:57 +0000 (UTC) Subject: rpms/zabbix/devel zabbix-1.6.3-pre.patch, 1.1, 1.2 zabbix.spec, 1.34, 1.35 Message-ID: <20090309203557.D7D7F70034@cvs1.fedora.phx.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/zabbix/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7450 Modified Files: zabbix-1.6.3-pre.patch zabbix.spec Log Message: * Mon Mar 9 2009 Jeffrey C. Ollie - 1.6.2-5 - Update pre patch due to incomplete fix for security problems. zabbix-1.6.3-pre.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 zabbix-1.6.3-pre.patch Index: zabbix-1.6.3-pre.patch =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix-1.6.3-pre.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- zabbix-1.6.3-pre.patch 6 Mar 2009 17:27:51 -0000 1.1 +++ zabbix-1.6.3-pre.patch 9 Mar 2009 20:35:57 -0000 1.2 @@ -1,10 +1,16 @@ diff --git a/ChangeLog b/ChangeLog -index b6ee465..e217193 100644 +index b6ee465..47f1cce 100644 --- a/ChangeLog +++ b/ChangeLog -@@ -1,3 +1,71 @@ +@@ -1,3 +1,77 @@ +Changes for 1.6.3 + ++ - [ZBX-448] fixed zabbix server status when frontend and backend are on different servers (Vedmak) ++ - [ZBX-660] fixed screen clock set to server time showed local time (Artem) ++ - [ZBX-603] fixed min autologout value to 90 seconds (amach) ++ - [ZBX-762] improved performance of processing of log and text items (Sasha) ++ - [ZBX-749] details box is open by default if any error occured (Vedmak) ++ - [ZBX-751] expanded details box added for triggers copying messages (Vedmak) + - [DEV-268] added support of for system.cpu.util under Solaris (Sasha) + - [ZBX-737] the behaviour of the agent's key "vfs.fs.size" improved to be similar to the "df" command (Dmitry) + - [ZBX-599] the purpose of the configuration parameter StartAgents precised (Dmitry) @@ -5654,6 +5660,9 @@ $p_elements[] = get_table_header(SPACE, $form); // TABLE +diff --git a/frontends/php/images/flash/zbxclock.swf b/frontends/php/images/flash/zbxclock.swf +index 3bd482b..776f3ae 100644 +Binary files a/frontends/php/images/flash/zbxclock.swf and b/frontends/php/images/flash/zbxclock.swf differ diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php index 33316fe..1088d00 100644 --- a/frontends/php/include/actions.inc.php @@ -6261,6 +6270,19 @@ insert_show_color_picker_javascript(); } +diff --git a/frontends/php/include/classes/cflashclock.mod.php b/frontends/php/include/classes/cflashclock.mod.php +index 8f359fd..5ab5ed5 100644 +--- a/frontends/php/include/classes/cflashclock.mod.php ++++ b/frontends/php/include/classes/cflashclock.mod.php +@@ -47,7 +47,7 @@ + function BodyToString() + { + if($this->timetype == TIME_TYPE_SERVER) +- $this->SetSrc($this->src."×tamp=".time()); ++ $this->setSrc($this->src.'×tamp='.(time() + date('Z'))); + + return parent::BodyToString(); + } diff --git a/frontends/php/include/classes/cform.inc.php b/frontends/php/include/classes/cform.inc.php index 4f87073..5678b90 100644 --- a/frontends/php/include/classes/cform.inc.php @@ -7499,7 +7521,7 @@ +} \ No newline at end of file diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php -index 1e11d0b..bbd154d 100644 +index 1e11d0b..b001b4a 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -30,7 +30,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! @@ -7660,6 +7682,15 @@ function show_messages($bool=TRUE,$okmsg=NULL,$errmsg=NULL){ global $page, $ZBX_MESSAGES; +@@ -364,7 +377,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! + else if($bool && !is_null($okmsg)) $msg=$okmsg; + + if(isset($msg)){ +- switch($page["type"]){ ++ switch($page['type']){ + case PAGE_TYPE_IMAGE: + array_push($message, array( + 'text' => $msg, @@ -372,29 +385,29 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! 'font' => 2)); $width = max($width, ImageFontWidth(2) * strlen($msg) + 1); @@ -7676,8 +7707,9 @@ $msg_tab->setCellPadding(0); $msg_tab->setCellSpacing(0); - +- $msg_col = new CCol(bold($msg),'msg'); + - $msg_col = new CCol(bold($msg),'msg'); ++ $msg_col = new CCol(bold($msg),'msg_main msg'); $msg_col->addOption('id','page_msg'); - + @@ -7710,7 +7742,7 @@ + $msg_count = $msg_show; + + $msg_count = ($msg_count * 16); -+ $lst_error->AddOption('style','height: '.$msg_count.'px;'); ++ $lst_error->addOption('style','height: '.$msg_count.'px;'); + } - $msg_count = ($msg_count * $msg_font_size * 4); @@ -7726,8 +7758,9 @@ $tab->addOption('id','msg_messages'); $tab->addOption('style','width: 100%;'); - +- if(isset($msg_tab)){ + - if(isset($msg_tab)){ ++ if(isset($msg_tab) && is_null($errmsg)){ $tab->addOption('style','display: none;'); } - @@ -7777,7 +7810,31 @@ // The hash has form , function calc_trigger_hash(){ -@@ -770,7 +784,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! +@@ -727,16 +741,15 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! + } + + function get_status(){ +-// global $DB; ++ global $ZBX_SERVER, $ZBX_SERVER_PORT; ++ + $status = array(); + // server +- if( (exec('ps -ef|grep zabbix_server|grep -v grep|wc -l')>0) || (exec('ps -ax|grep zabbix_server|grep -v grep|wc -l')>0) ){ +- $status["zabbix_server"] = S_YES; +- } +- else{ +- $status["zabbix_server"] = S_NO; +- } +-// history & trends ++ $checkport = fsockopen($ZBX_SERVER, $ZBX_SERVER_PORT, $errnum, $errstr, 2); ++ ++ $status["zabbix_server"] = ($checkport) ? S_YES : S_NO; ++ ++ // history & trends + /* if ($DB['DB_TYPE'] == "MYSQL"){ + $row=DBfetch(DBselect('show table status like "history"')); + $status["history_count"] = $row["Rows"]; +@@ -770,7 +783,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! // alerts /* $row=DBfetch(DBselect('SELECT COUNT(alertid) as cnt from alerts")); $status["alerts_count"]=$row["cnt"];*/ @@ -7786,7 +7843,7 @@ // triggers $sql = 'SELECT COUNT(DISTINCT t.triggerid) as cnt '. ' FROM triggers t, functions f, items i, hosts h'. -@@ -779,7 +793,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! +@@ -779,7 +792,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! ' AND i.status='.ITEM_STATUS_ACTIVE. ' AND i.hostid=h.hostid '. ' AND h.status='.HOST_STATUS_MONITORED; @@ -7795,7 +7852,7 @@ $row=DBfetch(DBselect($sql)); $status['triggers_count']=$row['cnt']; -@@ -797,13 +811,13 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! +@@ -797,13 +810,13 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! $row=DBfetch(DBselect($sql.' and t.status=0 and t.value=2')); $status['triggers_count_unknown']=$row['cnt']; @@ -7812,7 +7869,7 @@ $row=DBfetch(DBselect($sql)); $status['items_count']=$row['cnt']; -@@ -818,7 +832,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! +@@ -818,7 +831,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! $row=DBfetch(DBselect($sql.' and i.type=2')); $status['items_count_trapper']=$row['cnt']; @@ -7821,7 +7878,7 @@ // hosts $sql = 'SELECT COUNT(hostid) as cnt '. ' FROM hosts '. -@@ -837,20 +851,20 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! +@@ -837,20 +850,20 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! $row=DBfetch(DBselect('SELECT COUNT(hostid) as cnt FROM hosts WHERE status='.HOST_STATUS_DELETED)); $status['hosts_count_deleted']=$row['cnt']; @@ -7846,7 +7903,7 @@ $result=DBselect('SELECT DISTINCT s.userid '. ' FROM sessions s, users u '. ' WHERE u.userid=s.userid '. -@@ -985,19 +999,19 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! +@@ -985,19 +998,19 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! global $IMAGE_FORMAT_DEFAULT; if(is_null($format)) $format = $IMAGE_FORMAT_DEFAULT; @@ -7874,7 +7931,7 @@ if(IMAGE_FORMAT_JPEG == $format) ImageJPEG($image); else -@@ -1037,7 +1051,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! +@@ -1037,7 +1050,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! if(!is_array($mappings)) return FALSE; $valuemapid = get_dbid("valuemaps","valuemapid"); [...3188 lines suppressed...] } -@@ -1151,14 +1156,11 @@ int DBadd_history_text(zbx_uint64_t itemid, char *value, int clock) +@@ -1151,14 +1157,11 @@ int DBadd_history_text(zbx_uint64_t itemid, char *value, int clock) { #ifdef HAVE_ORACLE char sql[MAX_STRING_LEN]; @@ -24056,7 +24847,7 @@ zabbix_log(LOG_LEVEL_DEBUG, "In add_history_text()"); -@@ -1168,10 +1170,7 @@ int DBadd_history_text(zbx_uint64_t itemid, char *value, int clock) +@@ -1168,10 +1171,7 @@ int DBadd_history_text(zbx_uint64_t itemid, char *value, int clock) sqlo_autocommit_off(oracle); @@ -24068,7 +24859,7 @@ value_esc_max_len = strlen(value_esc); /* alloate the lob descriptor */ -@@ -1259,12 +1258,12 @@ lbl_exit: +@@ -1259,12 +1259,12 @@ lbl_exit: int DBadd_history_log(zbx_uint64_t itemid, char *value, int clock, int timestamp, char *source, int severity, int lastlogsize) { @@ -24083,7 +24874,7 @@ DBexecute("insert into history_log (id,clock,itemid,timestamp,value,source,severity)" " values (" ZBX_FS_UI64 ",%d," ZBX_FS_UI64 ",%d,'%s','%s',%d)", -@@ -1276,6 +1275,7 @@ int DBadd_history_log(zbx_uint64_t itemid, char *value, int clock, int timestamp +@@ -1276,6 +1276,7 @@ int DBadd_history_log(zbx_uint64_t itemid, char *value, int clock, int timestamp source_esc, severity); @@ -24091,7 +24882,7 @@ zbx_free(value_esc); return SUCCEED; -@@ -1512,12 +1512,15 @@ zbx_uint64_t DBget_proxy_lastaccess(const char *hostname) +@@ -1512,12 +1513,15 @@ zbx_uint64_t DBget_proxy_lastaccess(const char *hostname) zbx_uint64_t res; DB_RESULT result; DB_ROW row; @@ -24109,7 +24900,7 @@ if (NULL == (row = DBfetch(result)) || SUCCEED == DBis_null(row[0])) { zabbix_log(LOG_LEVEL_ERR, "Proxy \"%s\" not exists", -@@ -1538,33 +1541,17 @@ zbx_uint64_t DBget_proxy_lastaccess(const char *hostname) +@@ -1538,33 +1542,17 @@ zbx_uint64_t DBget_proxy_lastaccess(const char *hostname) int DBadd_alert(zbx_uint64_t actionid, zbx_uint64_t userid, zbx_uint64_t eventid, zbx_uint64_t mediatypeid, char *sendto, char *subject, char *message) { int now; @@ -24147,7 +24938,7 @@ DBexecute("insert into alerts (alertid,actionid,eventid,userid,clock,mediatypeid,sendto,subject,message,status,retries)" " values (" ZBX_FS_UI64 "," ZBX_FS_UI64 "," ZBX_FS_UI64 "," ZBX_FS_UI64 ",%d," ZBX_FS_UI64 ",'%s','%s','%s',0,0)", DBget_maxid("alerts","alertid"), -@@ -1716,6 +1703,56 @@ char* DBdyn_escape_string(const char *src) +@@ -1716,6 +1704,56 @@ char* DBdyn_escape_string(const char *src) return dst; } @@ -24204,7 +24995,7 @@ void DBget_item_from_db(DB_ITEM *item,DB_ROW row) { char *s; -@@ -1724,6 +1761,7 @@ void DBget_item_from_db(DB_ITEM *item,DB_ROW row) +@@ -1724,6 +1762,7 @@ void DBget_item_from_db(DB_ITEM *item,DB_ROW row) ZBX_STR2UINT64(item->itemid, row[0]); /* item->itemid=atoi(row[0]); */ @@ -24212,7 +25003,7 @@ item->key_orig=row[1]; item->host_name=row[2]; item->port=atoi(row[3]); -@@ -1851,16 +1889,16 @@ void DBget_item_from_db(DB_ITEM *item,DB_ROW row) +@@ -1851,16 +1890,16 @@ void DBget_item_from_db(DB_ITEM *item,DB_ROW row) case ITEM_TYPE_SIMPLE: case ITEM_TYPE_EXTERNAL: key = zbx_dsprintf(key, "%s", item->key_orig); @@ -24232,7 +25023,27 @@ } } -@@ -2103,16 +2141,18 @@ void DBproxy_add_history_uint(zbx_uint64_t itemid, zbx_uint64_t value, int clock +@@ -1935,10 +1974,18 @@ zbx_uint64_t DBget_maxid_num(char *tablename, char *fieldname, int num) + int found = FAIL, dbres, nodeid; + const ZBX_TABLE *table; + +- zabbix_log(LOG_LEVEL_DEBUG,"In DBget_maxid \"%s\".\"%s\"", ++ zabbix_log(LOG_LEVEL_DEBUG,"In DBget_maxid %s.%s", + tablename, + fieldname); + ++ if ((0 == strcmp(tablename, "history_log") && 0 == strcmp(fieldname, "id")) || ++ (0 == strcmp(tablename, "history_text") && 0 == strcmp(fieldname, "id")) || ++ (0 == strcmp(tablename, "dservices") && 0 == strcmp(fieldname, "dserviceid")) || ++ (0 == strcmp(tablename, "dhosts") && 0 == strcmp(fieldname, "dhostid")) || ++ (0 == strcmp(tablename, "alerts") && 0 == strcmp(fieldname, "alertid")) || ++ (0 == strcmp(tablename, "escalations") && 0 == strcmp(fieldname, "escalationid"))) ++ return DCget_nextid(tablename, fieldname, num); ++ + table = DBget_table(tablename); + nodeid = CONFIG_NODEID >= 0 ? CONFIG_NODEID : 0; + +@@ -2103,16 +2150,18 @@ void DBproxy_add_history_uint(zbx_uint64_t itemid, zbx_uint64_t value, int clock void DBproxy_add_history_str(zbx_uint64_t itemid, char *value, int clock) { @@ -24253,7 +25064,7 @@ } void DBproxy_add_history_text(zbx_uint64_t itemid, char *value, int clock) -@@ -2133,11 +2173,11 @@ void DBproxy_add_history_text(zbx_uint64_t itemid, char *value, int clock) +@@ -2133,11 +2182,11 @@ void DBproxy_add_history_text(zbx_uint64_t itemid, char *value, int clock) void DBproxy_add_history_log(zbx_uint64_t itemid, char *value, int clock, int timestamp, char *source, int severity, int lastlogsize) { @@ -24267,7 +25078,7 @@ value_esc = DBdyn_escape_string(value); DBexecute("insert into proxy_history (itemid,clock,timestamp,source,severity,value)" -@@ -2150,6 +2190,7 @@ void DBproxy_add_history_log(zbx_uint64_t itemid, char *value, int clock, int ti +@@ -2150,6 +2199,7 @@ void DBproxy_add_history_log(zbx_uint64_t itemid, char *value, int clock, int ti value_esc); zbx_free(value_esc); @@ -24275,7 +25086,7 @@ } void DBadd_condition_alloc(char **sql, int *sql_alloc, int *sql_offset, const char *fieldname, const zbx_uint64_t *values, const int num) -@@ -2187,8 +2228,23 @@ void DBadd_condition_alloc(char **sql, int *sql_alloc, int *sql_offset, const ch +@@ -2187,8 +2237,23 @@ void DBadd_condition_alloc(char **sql, int *sql_alloc, int *sql_offset, const ch zbx_snprintf_alloc(sql, sql_alloc, sql_offset, 2, ")"); } @@ -24300,7 +25111,7 @@ char *zbx_host_key_string(zbx_uint64_t itemid) { DB_RESULT result; -@@ -2203,9 +2259,26 @@ char *zbx_host_key_string(zbx_uint64_t itemid) +@@ -2203,9 +2268,26 @@ char *zbx_host_key_string(zbx_uint64_t itemid) else zbx_snprintf(string, sizeof(string), "???"); @@ -24327,7 +25138,7 @@ char *zbx_host_key_string_by_item(DB_ITEM *item) { zbx_snprintf(string, sizeof(string), "%s:%s", item->host_name, item->key); -@@ -2213,6 +2286,23 @@ char *zbx_host_key_string_by_item(DB_ITEM *item) +@@ -2213,6 +2295,23 @@ char *zbx_host_key_string_by_item(DB_ITEM *item) return string; } @@ -24351,7 +25162,7 @@ char *zbx_host_key_function_string(zbx_uint64_t functionid) { DB_RESULT result; -@@ -2227,6 +2317,8 @@ char *zbx_host_key_function_string(zbx_uint64_t functionid) +@@ -2227,6 +2326,8 @@ char *zbx_host_key_function_string(zbx_uint64_t functionid) else zbx_snprintf(string, sizeof(string), "???"); @@ -26830,7 +27641,7 @@ CONFIG_POLLER_FORKS, poller_num-1, diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c -index fa2087e..d274877 100644 +index fa2087e..24e9666 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -50,8 +50,6 @@ @@ -26851,6 +27662,29 @@ int CONFIG_IPMIPOLLER_FORKS = 0; int CONFIG_TIMER_FORKS = 1; int CONFIG_TRAPPERD_FORKS = 5; +@@ -1080,8 +1078,7 @@ int MAIN_ZABBIX_ENTRY(void) + exit(FAIL); + } + +- if (CONFIG_DBSYNCER_FORKS != 0) +- init_database_cache(ZBX_PROCESS_SERVER); ++ init_database_cache(ZBX_PROCESS_SERVER); + + /*#define CALC_TREND*/ + +@@ -1304,11 +1301,7 @@ void zbx_on_exit() + zbx_sleep(2); /* wait for all threads closing */ + + DBconnect(ZBX_DB_CONNECT_EXIT); +- +- if(CONFIG_DBSYNCER_FORKS!=0) +- { +- free_database_cache(); +- } ++ free_database_cache(); + DBclose(); + + zbx_mutex_destroy(&node_sync_access); diff --git a/src/zabbix_server/utils/nodechange.c b/src/zabbix_server/utils/nodechange.c index 60a99e0..ca414d1 100644 --- a/src/zabbix_server/utils/nodechange.c Index: zabbix.spec =================================================================== RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- zabbix.spec 6 Mar 2009 17:27:52 -0000 1.34 +++ zabbix.spec 9 Mar 2009 20:35:57 -0000 1.35 @@ -1,6 +1,6 @@ Name: zabbix Version: 1.6.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Open-source monitoring solution for your IT infrastructure Group: Applications/Internet @@ -465,6 +465,9 @@ %defattr(-,root,root,-) %changelog +* Mon Mar 9 2009 Jeffrey C. Ollie - 1.6.2-5 +- Update pre patch due to incomplete fix for security problems. + * Wed Mar 4 2009 Jeffrey C. Ollie - 1.6.2-4 - Update to a SVN snapshot of the upstream 1.6 branch to fix security issue (BZ#488501) From atkac at fedoraproject.org Mon Mar 9 20:36:04 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Mon, 9 Mar 2009 20:36:04 +0000 (UTC) Subject: rpms/bind/devel bind.spec,1.304,1.305 named.init,1.69,1.70 Message-ID: <20090309203604.CA37A70034@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/bind/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7259 Modified Files: bind.spec named.init Log Message: - add DNSSEC support to initscript, enabled it per default - add requires dnssec-conf Index: bind.spec =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v retrieving revision 1.304 retrieving revision 1.305 diff -u -r1.304 -r1.305 --- bind.spec 9 Mar 2009 14:35:56 -0000 1.304 +++ bind.spec 9 Mar 2009 20:35:34 -0000 1.305 @@ -20,7 +20,7 @@ Name: bind License: ISC Version: 9.6.0 -Release: 8.%{PATCHVER}%{?dist} +Release: 9.%{PATCHVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,7 +36,6 @@ Source8: dnszone.schema Source12: README.sdb_pgsql Source21: Copyright.caching-nameserver -Source24: libbind.pc Source25: named.conf.sample Source28: config-4.tar.bz2 Source30: ldap2zone.c @@ -77,6 +76,7 @@ Requires(post): grep, chkconfig Requires(pre): shadow-utils Requires(preun):chkconfig +Requires: dnssec-conf Obsoletes: bind-config < 30:9.3.2-34.fc6, caching-nameserver < 31:9.4.1-7.fc8 Provides: bind-config = 30:9.3.2-34.fc6, caching-nameserver = 31:9.4.1-7.fc8 BuildRequires: openssl-devel, libtool, autoconf, pkgconfig, libcap-devel @@ -377,6 +377,9 @@ # rndc.key has to have correct perms and ownership, CVE-2007-6283 [ -e /etc/rndc.key ] && chown root:named /etc/rndc.key [ -e /etc/rndc.key ] && chmod 0640 /etc/rndc.key + # Enable DNSSEC per default + [ -x /usr/sbin/dnssec-configure ] && \ + dnssec-configure -b --norestart --dnssec=on --dlv=off > /dev/null 2>&1 fi :; @@ -561,6 +564,10 @@ %ghost %{chroot_prefix}/etc/localtime %changelog +* Mon Mar 09 2009 Adam Tkac 32:9.6.0-9.P1 +- add DNSSEC support to initscript, enabled it per default +- add requires dnssec-conf + * Mon Mar 09 2009 Adam Tkac 32:9.6.0-8.P1 - fire away libbind, it is now separate package Index: named.init =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/named.init,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- named.init 10 Nov 2008 16:36:47 -0000 1.69 +++ named.init 9 Mar 2009 20:35:34 -0000 1.70 @@ -22,6 +22,7 @@ . /etc/rc.d/init.d/functions [ -r /etc/sysconfig/named ] && . /etc/sysconfig/named +[ -r /etc/sysconfig/dnssec ] && . /etc/sysconfig/dnssec RETVAL=0 export KRB5_KTNAME=${KEYTAB_FILE:-/etc/named.keytab} @@ -42,6 +43,10 @@ fi; fi +[ -x /usr/sbin/dnssec-configure ] && [ -r /etc/named.conf ] && \ + [ /etc/sysconfig/dnssec -nt /etc/named.conf ] && \ + /usr/sbin/dnssec-configure -b --norestart --dnssec="$DNSSEC" --dlv="$DLV" + # Check if all what named needs running start() { From atkac at fedoraproject.org Mon Mar 9 20:36:32 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Mon, 9 Mar 2009 20:36:32 +0000 (UTC) Subject: rpms/unbound/devel unbound.init,1.6,1.7 unbound.spec,1.22,1.23 Message-ID: <20090309203632.CB37470034@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/unbound/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7491 Modified Files: unbound.init unbound.spec Log Message: - add DNSSEC support to initscript, enabled it per default - add requires dnssec-conf Index: unbound.init =================================================================== RCS file: /cvs/pkgs/rpms/unbound/devel/unbound.init,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- unbound.init 26 Jan 2009 23:02:22 -0000 1.6 +++ unbound.init 9 Mar 2009 20:36:02 -0000 1.7 @@ -28,9 +28,14 @@ piddir=`dirname $pidfile` [ -e /etc/sysconfig/unbound ] && . /etc/sysconfig/unbound +[ -e /etc/sysconfig/dnssec ] && . /etc/sysconfig/dnssec lockfile=/var/lock/subsys/unbound +[ -x /usr/sbin/dnssec-configure ] && [ -r "$config" ] && + [ /etc/sysconfig/dnssec -nt "$config" ] && \ + /usr/sbin/dnssec-configure -u --norestart --dnssec="$DNSSEC" --dlv="$DLV" + start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 Index: unbound.spec =================================================================== RCS file: /cvs/pkgs/rpms/unbound/devel/unbound.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- unbound.spec 25 Feb 2009 22:57:23 -0000 1.22 +++ unbound.spec 9 Mar 2009 20:36:02 -0000 1.23 @@ -1,7 +1,7 @@ Summary: Validating, recursive, and caching DNS(SEC) resolver Name: unbound Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Url: http://www.nlnetlabs.nl/unbound/ Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz @@ -18,6 +18,7 @@ Requires(postun): initscripts Requires: ldns >= 1.5.0 Requires(pre): shadow-utils +Requires: dnssec-conf # Is this obsolete? #Provides: caching-nameserver @@ -125,12 +126,16 @@ -c "Unbound DNS resolver" unbound exit 0 -%post +%post +# Enable DNSSEC per default +if [ "$1" -eq 1 ]; then + [ -x /usr/sbin/dnssec-configure ] && \ + dnssec-configure -u --norestart --dnssec=on --dlv=off > /dev/null 2>&1 +fi /sbin/chkconfig --add %{name} %post libs -p /sbin/ldconfig - %preun if [ "$1" -eq 0 ]; then /sbin/service %{name} stop >/dev/null 2>&1 @@ -145,6 +150,10 @@ %postun libs -p /sbin/ldconfig %changelog +* Mon Mar 09 2009 Adam Tkac - 1.2.1-3 +- add DNSSEC support to initscript and enabled it per default +- add requires dnssec-conf + * Wed Feb 25 2009 Fedora Release Engineering - 1.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From tmz at fedoraproject.org Mon Mar 9 20:37:12 2009 From: tmz at fedoraproject.org (Todd M. Zullinger) Date: Mon, 9 Mar 2009 20:37:12 +0000 (UTC) Subject: rpms/git/devel .cvsignore, 1.72, 1.73 git.spec, 1.81, 1.82 sources, 1.72, 1.73 0001-git-web-browse-Fix-check-for-bin-start.patch, 1.1, NONE Message-ID: <20090309203712.2539770034@cvs1.fedora.phx.redhat.com> Author: tmz Update of /cvs/extras/rpms/git/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7975 Modified Files: .cvsignore git.spec sources Removed Files: 0001-git-web-browse-Fix-check-for-bin-start.patch Log Message: Update to git-1.6.2 - Include contrib/emacs/README in emacs subpackage - Drop upstreamed git-web--browse patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- .cvsignore 9 Feb 2009 06:39:18 -0000 1.72 +++ .cvsignore 9 Mar 2009 20:36:41 -0000 1.73 @@ -1 +1 @@ -git-1.6.1.3.tar.bz2 +git-1.6.2.tar.bz2 Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/devel/git.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- git.spec 25 Feb 2009 02:22:19 -0000 1.81 +++ git.spec 9 Mar 2009 20:36:41 -0000 1.82 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.1.3 -Release: 2%{?dist} +Version: 1.6.2 +Release: 1%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -11,8 +11,6 @@ Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -# Included upstream as f6b98e4, tmz -Patch1: 0001-git-web-browse-Fix-check-for-bin-start.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -142,7 +140,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -268,6 +265,7 @@ %files -n emacs-git %defattr(-,root,root) +%doc contrib/emacs/README %{_datadir}/emacs/site-lisp/*git*.el* %{_datadir}/emacs/site-lisp/site-start.d/git-init.el @@ -290,6 +288,11 @@ # No files for you! %changelog +* Mon Mar 09 2009 Todd Zullinger - 1.6.2-1 +- git-1.6.2 +- Include contrib/emacs/README in emacs subpackage +- Drop upstreamed git-web--browse patch + * Tue Feb 24 2009 Todd Zullinger - 1.6.1.3-2 - Require perl(Authen::SASL) in git-email (bug 483062) - Build many of the subpackages as noarch Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/devel/sources,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- sources 9 Feb 2009 06:39:19 -0000 1.72 +++ sources 9 Mar 2009 20:36:41 -0000 1.73 @@ -1 +1 @@ -e31ea5ce9b076f5745056f01465e9602 git-1.6.1.3.tar.bz2 +12c7d874e17c6e111697b1714b5f4319 git-1.6.2.tar.bz2 --- 0001-git-web-browse-Fix-check-for-bin-start.patch DELETED --- From pwouters at fedoraproject.org Mon Mar 9 20:40:55 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Mon, 9 Mar 2009 20:40:55 +0000 (UTC) Subject: rpms/dnssec-conf/devel .cvsignore,1.4,1.5 sources,1.4,1.5 Message-ID: <20090309204055.C4FBB70034@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/dnssec-conf/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8721 Modified Files: .cvsignore sources Log Message: updated sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Mar 2009 20:24:14 -0000 1.4 +++ .cvsignore 9 Mar 2009 20:40:25 -0000 1.5 @@ -1,3 +1,4 @@ dnssec-conf-1.13.tar.gz dnssec-conf-1.15.tar.gz dnssec-conf-1.16.tar.gz +dnssec-conf-1.17.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Mar 2009 00:04:57 -0000 1.4 +++ sources 9 Mar 2009 20:40:25 -0000 1.5 @@ -1 +1,2 @@ 62890fd2bc3e23e198c7eae432f55b17 dnssec-conf-1.16.tar.gz +ba191a0d45d697f09a9afa739c7aaecb dnssec-conf-1.17.tar.gz From tmraz at fedoraproject.org Mon Mar 9 20:46:37 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Mon, 9 Mar 2009 20:46:37 +0000 (UTC) Subject: rpms/pam/devel .cvsignore,1.53,1.54 sources,1.55,1.56 Message-ID: <20090309204637.5B6AF70034@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/pam/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10364 Modified Files: .cvsignore sources Log Message: * Mon Mar 9 2009 Tomas Mraz 1.0.91-1 - upgrade to new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pam/devel/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 9 Mar 2009 20:33:11 -0000 1.53 +++ .cvsignore 9 Mar 2009 20:46:06 -0000 1.54 @@ -1 +1,4 @@ +*.src.rpm +*.tar.bz2 +pam-redhat-0.99.10-1.tar.bz2 Linux-PAM-1.0.91.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pam/devel/sources,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- sources 9 Mar 2009 20:33:11 -0000 1.55 +++ sources 9 Mar 2009 20:46:07 -0000 1.56 @@ -1 +1,2 @@ +c115640346a987356f6b76ec1d425185 pam-redhat-0.99.10-1.tar.bz2 e1dd807721b6981d82c302c6b74065cd Linux-PAM-1.0.91.tar.bz2 From kkofler at fedoraproject.org Mon Mar 9 20:49:31 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Mon, 9 Mar 2009 20:49:31 +0000 (UTC) Subject: rpms/kdebluetooth/devel kdebluetooth.spec,1.21,1.22 Message-ID: <20090309204931.E71A170034@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebluetooth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10964/devel Modified Files: kdebluetooth.spec Log Message: * Mon Mar 09 2009 Kevin Kofler - 1:0.3-3 - Provides: dbus-bluez-pin-helper (so bluez doesn't drag in gnome-bluetooth) Index: kdebluetooth.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebluetooth/devel/kdebluetooth.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- kdebluetooth.spec 25 Feb 2009 10:42:14 -0000 1.21 +++ kdebluetooth.spec 9 Mar 2009 20:49:01 -0000 1.22 @@ -1,7 +1,7 @@ Summary: The KDE Bluetooth Framework Name: kdebluetooth Version: 0.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPLv2+ Group: Applications/Communications @@ -14,6 +14,8 @@ Obsoletes: %{name}-libs < 1:0.2 Obsoletes: %{name}-devel < 1:0.2 +Provides: dbus-bluez-pin-helper + # Depend on and track solid-bluetooth backport BuildRequires: solid-bluetooth-devel >= 4.3 Requires: solid-bluetooth >= 4.3 @@ -73,6 +75,9 @@ %changelog +* Mon Mar 09 2009 Kevin Kofler - 1:0.3-3 +- Provides: dbus-bluez-pin-helper (so bluez doesn't drag in gnome-bluetooth) + * Wed Feb 25 2009 Fedora Release Engineering - 1:0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From tmraz at fedoraproject.org Mon Mar 9 20:59:08 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Mon, 9 Mar 2009 20:59:08 +0000 (UTC) Subject: rpms/pam/devel pam.spec,1.189,1.190 Message-ID: <20090309205908.D434D70034@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/pam/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12494 Modified Files: pam.spec Log Message: - the buildrequires on glibc will make it install a conflicting version Index: pam.spec =================================================================== RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- pam.spec 9 Mar 2009 16:14:30 -0000 1.189 +++ pam.spec 9 Mar 2009 20:58:38 -0000 1.190 @@ -49,7 +49,6 @@ BuildRequires: libselinux-devel >= 1.33.2 Requires: libselinux >= 1.33.2 %endif -BuildRequires: glibc >= 2.3.90-37 Requires: glibc >= 2.3.90-37 BuildRequires: db4-devel # Following deps are necessary only to build the pam library documentation. From dcbw at fedoraproject.org Mon Mar 9 21:03:11 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Mon, 9 Mar 2009 21:03:11 +0000 (UTC) Subject: rpms/wpa_supplicant/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 wpa_supplicant.spec, 1.54, 1.55 wpa-supplicant-0.6.7-really-disassoc.patch, 1.1, NONE wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch, 1.3, NONE wpa_supplicant-0.6.7-wext-scan-size.patch, 1.1, NONE Message-ID: <20090309210311.38C0470034@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/extras/rpms/wpa_supplicant/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13579 Modified Files: .cvsignore sources wpa_supplicant.spec Removed Files: wpa-supplicant-0.6.7-really-disassoc.patch wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch wpa_supplicant-0.6.7-wext-scan-size.patch Log Message: * Mon Mar 9 2009 Dan Williams - 1:0.6.8-1 - Update to latest upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 30 Jan 2009 17:45:46 -0000 1.10 +++ .cvsignore 9 Mar 2009 21:02:40 -0000 1.11 @@ -8,3 +8,4 @@ wpa_supplicant-0.6.3.tar.gz wpa_supplicant-0.6.4.tar.gz wpa_supplicant-0.6.7.tar.gz +wpa_supplicant-0.6.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 30 Jan 2009 17:45:46 -0000 1.10 +++ sources 9 Mar 2009 21:02:40 -0000 1.11 @@ -1 +1 @@ -b61f6e94b63f92173f4286b5e6a84140 wpa_supplicant-0.6.7.tar.gz +e933332490e0e5acfef2279457f1070a wpa_supplicant-0.6.8.tar.gz Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- wpa_supplicant.spec 25 Feb 2009 18:17:56 -0000 1.54 +++ wpa_supplicant.spec 9 Mar 2009 21:02:40 -0000 1.55 @@ -1,8 +1,8 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant Name: wpa_supplicant Epoch: 1 -Version: 0.6.7 -Release: 4%{?dist} +Version: 0.6.8 +Release: 1%{?dist} License: BSD Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -15,11 +15,8 @@ Patch0: wpa_supplicant-assoc-timeout.patch Patch1: wpa_supplicant-0.5.7-qmake-location.patch Patch2: wpa_supplicant-0.5.7-flush-debug-output.patch -Patch3: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch Patch4: wpa_supplicant-0.5.10-dbus-service-file.patch Patch5: wpa_supplicant-0.6.7-quiet-scan-results-message.patch -Patch6: wpa-supplicant-0.6.7-really-disassoc.patch -Patch7: wpa_supplicant-0.6.7-wext-scan-size.patch # Upstream: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff;h=c3f5b1e16d119392ec30e3b5a0d015ee2aa3d664;hp=02a89365abba33fb462f739c325dc9cc3e847dae#patch1 Patch8: wpa_supplicant-0.6.7-no-unrequested-reply.patch @@ -52,11 +49,8 @@ %patch0 -p1 -b .assoc-timeout %patch1 -p1 -b .qmake-location %patch2 -p1 -b .flush-debug-output -%patch3 -p1 -b .use-IW_ENCODE_TEMP %patch4 -p1 -b .dbus-service-file %patch5 -p1 -b .quiet-scan-results-msg -%patch6 -p1 -b .really-disassociate -%patch7 -p1 -b .lots-o-scan-results %patch8 -p1 -b .no-unrequested-reply %build @@ -148,6 +142,9 @@ %{_bindir}/wpa_gui %changelog +* Mon Mar 9 2009 Dan Williams - 1:0.6.8-1 +- Update to latest upstream release + * Wed Feb 25 2009 Colin Walters - 1:0.6.7-4 - Add patch from upstream to suppress unrequested replies, this quiets a dbus warning. --- wpa-supplicant-0.6.7-really-disassoc.patch DELETED --- --- wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch DELETED --- --- wpa_supplicant-0.6.7-wext-scan-size.patch DELETED --- From bskeggs at fedoraproject.org Mon Mar 9 21:03:30 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Mon, 9 Mar 2009 21:03:30 +0000 (UTC) Subject: rpms/kernel/devel drm-nouveau.patch, 1.19, 1.20 kernel.spec, 1.1398, 1.1399 Message-ID: <20090309210330.9CDB170034@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13639 Modified Files: drm-nouveau.patch kernel.spec Log Message: * Tue Mar 10 2009 Ben Skeggs - drm-nouveau.patch: fix ppc drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- drm-nouveau.patch 9 Mar 2009 04:32:25 -0000 1.19 +++ drm-nouveau.patch 9 Mar 2009 21:03:29 -0000 1.20 @@ -6605,10 +6605,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c new file mode 100644 -index 0000000..a15a106 +index 0000000..8a32e82 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c -@@ -0,0 +1,1073 @@ +@@ -0,0 +1,1071 @@ +/* + * Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. + * Copyright 2005 Stephane Marchesin @@ -6895,18 +6895,18 @@ +{ + struct drm_nouveau_private *dev_priv = dev->dev_private; + struct nouveau_gpuobj **pgt; -+ unsigned psz, pfl; ++ unsigned psz, pfl, pages; + + if (virt >= dev_priv->vm_gart_base && + (virt + size) < (dev_priv->vm_gart_base + dev_priv->vm_gart_size)) { -+ psz = 4096; ++ psz = 12; + pgt = &dev_priv->gart_info.sg_ctxdma; + pfl = 0x21; + virt -= dev_priv->vm_gart_base; + } else + if (virt >= dev_priv->vm_vram_base && + (virt + size) < (dev_priv->vm_vram_base + dev_priv->vm_vram_size)) { -+ psz = 65536; ++ psz = 16; + pgt = dev_priv->vm_vram_pt; + pfl = 0x01; + virt -= dev_priv->vm_vram_base; @@ -6916,31 +6916,29 @@ + return -EINVAL; + } + -+ size &= ~(psz - 1); ++ pages = size >> psz; + + dev_priv->engine.instmem.prepare_access(dev, true); + if (flags & 0x80000000) { -+ while (size) { -+ struct nouveau_gpuobj *pt = pgt[virt / (512*1024*1024)]; -+ int pte = ((u32)(virt % (512*1024*1024)) / psz) * 2; ++ while (pages--) { ++ struct nouveau_gpuobj *pt = pgt[virt >> 29]; ++ unsigned pte = ((virt & 0x1fffffffULL) >> psz) << 1; + + INSTANCE_WR(pt, pte++, 0x00000000); + INSTANCE_WR(pt, pte++, 0x00000000); + -+ size -= psz; -+ virt += psz; ++ virt += (1 << psz); + } + } else { -+ while (size) { -+ struct nouveau_gpuobj *pt = pgt[virt / (512*1024*1024)]; -+ int pte = ((u32)(virt % (512*1024*1024)) / psz) * 2; ++ while (pages--) { ++ struct nouveau_gpuobj *pt = pgt[virt >> 29]; ++ unsigned pte = ((virt & 0x1fffffffULL) >> psz) << 1; + + INSTANCE_WR(pt, pte++, phys | pfl); + INSTANCE_WR(pt, pte++, flags); + -+ size -= psz; -+ phys += psz; -+ virt += psz; ++ phys += (1 << psz); ++ virt += (1 << psz); + } + } + dev_priv->engine.instmem.finish_access(dev); @@ -10318,10 +10316,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c new file mode 100644 -index 0000000..52036d5 +index 0000000..756141a --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_state.c -@@ -0,0 +1,948 @@ +@@ -0,0 +1,943 @@ +/* + * Copyright 2005 Stephane Marchesin + * Copyright 2008 Stuart Bennett @@ -10885,18 +10883,13 @@ + dn = pci_device_to_OF_node(dev->pdev); + if (dn) + { -+ int size; ++ int size, i; + const uint32_t *bios = of_get_property(dn, "NVDA,BMP", &size); -+ if (bios) -+ { -+ int i; -+ dev_priv->engine.instmem.prepare_access(dev, true); ++ if (bios) { + for(i=0;iengine.instmem.finish_access(dev); ++ nv_out32(dev_priv->ramin, i, bios[i/4]); + DRM_INFO("OF bios successfully copied (%d bytes)\n",size); -+ } -+ else ++ } else + DRM_INFO("Unable to get the OF bios\n"); + } + else @@ -41589,7 +41582,7 @@ +#endif diff --git a/drivers/gpu/drm/nouveau/nv50_i2c.c b/drivers/gpu/drm/nouveau/nv50_i2c.c new file mode 100644 -index 0000000..e3a6430 +index 0000000..aa37e24 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_i2c.c @@ -0,0 +1,400 @@ @@ -41705,7 +41698,7 @@ + udelay(2); + } + -+ printk("a timeout occured in nv50_i2c_raise_clock\n"); ++ DRM_DEBUG("a timeout occured in nv50_i2c_raise_clock\n"); + + return false; +} @@ -41792,7 +41785,7 @@ + } + + if (i <= 0) { -+ printk("a timeout occured in nv50_i2c_write_byte\n"); ++ DRM_DEBUG("a timeout occured in nv50_i2c_write_byte\n"); + rval = false; + } + } @@ -41875,7 +41868,7 @@ + } + + if (!rval) -+ printk("nv50_i2c_read failed\n"); ++ DRM_DEBUG("nv50_i2c_read failed\n"); + + return rval; +} @@ -41906,7 +41899,7 @@ + } + + if (!rval) -+ printk("nv50_i2c_write failed\n"); ++ DRM_DEBUG("nv50_i2c_write failed\n"); + + return rval; +} Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1398 retrieving revision 1.1399 diff -u -r1.1398 -r1.1399 --- kernel.spec 9 Mar 2009 17:01:57 -0000 1.1398 +++ kernel.spec 9 Mar 2009 21:03:29 -0000 1.1399 @@ -1806,6 +1806,9 @@ # and build. %changelog +* Tue Mar 10 2009 Ben Skeggs +- drm-nouveau.patch: fix ppc + * Mon Mar 09 2009 Kyle McMartin - Linux 2.6.29-rc7-git2 From dcbw at fedoraproject.org Mon Mar 9 21:09:18 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Mon, 9 Mar 2009 21:09:18 +0000 (UTC) Subject: rpms/wpa_supplicant/devel wpa_supplicant.spec, 1.55, 1.56 wpa_supplicant-0.6.7-no-unrequested-reply.patch, 1.1, NONE Message-ID: <20090309210918.4773B70034@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/extras/rpms/wpa_supplicant/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14762 Modified Files: wpa_supplicant.spec Removed Files: wpa_supplicant-0.6.7-no-unrequested-reply.patch Log Message: drop upstreamed patch Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- wpa_supplicant.spec 9 Mar 2009 21:02:40 -0000 1.55 +++ wpa_supplicant.spec 9 Mar 2009 21:08:47 -0000 1.56 @@ -17,8 +17,6 @@ Patch2: wpa_supplicant-0.5.7-flush-debug-output.patch Patch4: wpa_supplicant-0.5.10-dbus-service-file.patch Patch5: wpa_supplicant-0.6.7-quiet-scan-results-message.patch -# Upstream: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff;h=c3f5b1e16d119392ec30e3b5a0d015ee2aa3d664;hp=02a89365abba33fb462f739c325dc9cc3e847dae#patch1 -Patch8: wpa_supplicant-0.6.7-no-unrequested-reply.patch URL: http://w1.fi/wpa_supplicant/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,7 +49,6 @@ %patch2 -p1 -b .flush-debug-output %patch4 -p1 -b .dbus-service-file %patch5 -p1 -b .quiet-scan-results-msg -%patch8 -p1 -b .no-unrequested-reply %build pushd wpa_supplicant --- wpa_supplicant-0.6.7-no-unrequested-reply.patch DELETED --- From dwalsh at fedoraproject.org Mon Mar 9 21:17:54 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 9 Mar 2009 21:17:54 +0000 (UTC) Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.17, 1.18 modules-mls.conf, 1.51, 1.52 modules-targeted.conf, 1.119, 1.120 policy-20090105.patch, 1.56, 1.57 Message-ID: <20090309211754.92A7870034@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17354 Modified Files: modules-minimum.conf modules-mls.conf modules-targeted.conf policy-20090105.patch Log Message: * Sat Mar 7 2009 Dan Walsh 3.6.8-2 - Add pulseaudio context Index: modules-minimum.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- modules-minimum.conf 9 Mar 2009 16:18:51 -0000 1.17 +++ modules-minimum.conf 9 Mar 2009 21:17:23 -0000 1.18 @@ -1273,6 +1273,13 @@ # ssh = base +# Layer: services +# Module: sssd +# +# System Security Services Daemon +# +sssd = module + # Layer: kernel # Module: storage # Index: modules-mls.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- modules-mls.conf 9 Mar 2009 16:18:51 -0000 1.51 +++ modules-mls.conf 9 Mar 2009 21:17:23 -0000 1.52 @@ -1266,6 +1266,13 @@ # ssh = base +# Layer: services +# Module: sssd +# +# System Security Services Daemon +# +sssd = module + # Layer: kernel # Module: storage # Index: modules-targeted.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- modules-targeted.conf 9 Mar 2009 16:18:51 -0000 1.119 +++ modules-targeted.conf 9 Mar 2009 21:17:23 -0000 1.120 @@ -1273,6 +1273,13 @@ # ssh = base +# Layer: services +# Module: sssd +# +# System Security Services Daemon +# +sssd = module + # Layer: kernel # Module: storage # policy-20090105.patch: Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- policy-20090105.patch 9 Mar 2009 16:18:51 -0000 1.56 +++ policy-20090105.patch 9 Mar 2009 21:17:23 -0000 1.57 @@ -3553,8 +3553,8 @@ +/usr/bin/pulseaudio -- gen_context(system_u:object_r:pulseaudio_exec_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.if serefpolicy-3.6.8/policy/modules/apps/pulseaudio.if --- nsaserefpolicy/policy/modules/apps/pulseaudio.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/apps/pulseaudio.if 2009-03-08 08:48:02.000000000 -0400 -@@ -0,0 +1,85 @@ ++++ serefpolicy-3.6.8/policy/modules/apps/pulseaudio.if 2009-03-09 16:50:20.000000000 -0400 +@@ -0,0 +1,86 @@ + +## policy for pulseaudio + @@ -3631,19 +3631,20 @@ + ps_process_pattern($2, pulseaudio_t) + + allow pulseaudio_t $2:process { signal signull }; ++ allow $2 pulseaudio_t:process { signal signull }; + ps_process_pattern(pulseaudio_t, $2) + + allow pulseaudio_t $2:unix_stream_socket connectto; + allow $2 pulseaudio_t:unix_stream_socket connectto; + -+ userdom_manage_home_role($1, $2) -+ userdom_manage_tmp_role($1, $2) -+ userdom_manage_tmpfs_role($1, $2) ++ userdom_manage_home_role($1, pulseaudio_t) ++ userdom_manage_tmp_role($1, pulseaudio_t) ++ userdom_manage_tmpfs_role($1, pulseaudio_t) +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.te serefpolicy-3.6.8/policy/modules/apps/pulseaudio.te --- nsaserefpolicy/policy/modules/apps/pulseaudio.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/apps/pulseaudio.te 2009-03-08 08:48:02.000000000 -0400 -@@ -0,0 +1,82 @@ ++++ serefpolicy-3.6.8/policy/modules/apps/pulseaudio.te 2009-03-09 16:49:50.000000000 -0400 +@@ -0,0 +1,88 @@ +policy_module(pulseaudio,1.0.0) + +######################################## @@ -3687,10 +3688,13 @@ +files_read_usr_files(pulseaudio_t) + +fs_rw_anon_inodefs_files(pulseaudio_t) ++fs_getattr_tmpfs(pulseaudio_t) + +term_use_all_user_ttys(pulseaudio_t) +term_use_all_user_ptys(pulseaudio_t) + ++auth_use_nsswitch(pulseaudio_t) ++ +miscfiles_read_localization(pulseaudio_t) + +logging_send_syslog_msg(pulseaudio_t) @@ -3718,6 +3722,8 @@ + +optional_policy(` + xserver_common_app(pulseaudio_t) ++ xserver_read_xdm_pid(pulseaudio_t) ++ xserver_stream_connect(pulseaudio_t) +') + +tunable_policy(`pulseaudio_network',` @@ -3726,6 +3732,7 @@ +#FALSE +') + ++ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.fc serefpolicy-3.6.8/policy/modules/apps/qemu.fc --- nsaserefpolicy/policy/modules/apps/qemu.fc 2008-08-07 11:15:02.000000000 -0400 +++ serefpolicy-3.6.8/policy/modules/apps/qemu.fc 2009-03-07 12:11:40.000000000 -0500 @@ -12684,7 +12691,7 @@ /usr/libexec/hald-addon-macbookpro-backlight -- gen_context(system_u:object_r:hald_mac_exec_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.6.8/policy/modules/services/hal.if --- nsaserefpolicy/policy/modules/services/hal.if 2008-11-19 11:51:44.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/services/hal.if 2009-03-09 12:17:13.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/services/hal.if 2009-03-09 16:17:22.000000000 -0400 @@ -20,6 +20,24 @@ ######################################## @@ -12777,7 +12784,7 @@ +# +interface(`hal_create_log',` + gen_require(` -+ type hald_logd_t; ++ type hald_log_t; + ') + + # log files for hald @@ -21256,6 +21263,328 @@ logging_send_syslog_msg(ssh_keygen_t) userdom_dontaudit_use_unpriv_user_fds(ssh_keygen_t) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.fc serefpolicy-3.6.8/policy/modules/services/sssd.fc +--- nsaserefpolicy/policy/modules/services/sssd.fc 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/services/sssd.fc 2009-03-09 15:47:38.000000000 -0400 +@@ -0,0 +1,6 @@ ++ ++/usr/sbin/sssd -- gen_context(system_u:object_r:sssd_exec_t,s0) ++ ++/etc/rc.d/init.d/sssd -- gen_context(system_u:object_r:sssd_initrc_exec_t,s0) ++/var/run/sssd.pid -- gen_context(system_u:object_r:sssd_var_run_t,s0) ++/var/lib/sss(/.*)? gen_context(system_u:object_r:sssd_var_lib_t,s0) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.if serefpolicy-3.6.8/policy/modules/services/sssd.if +--- nsaserefpolicy/policy/modules/services/sssd.if 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/services/sssd.if 2009-03-09 15:49:56.000000000 -0400 +@@ -0,0 +1,249 @@ ++ ++## policy for sssd ++ ++######################################## ++## ++## Execute a domain transition to run sssd. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`sssd_domtrans',` ++ gen_require(` ++ type sssd_t; ++ type sssd_exec_t; ++ ') ++ ++ domtrans_pattern($1,sssd_exec_t,sssd_t) ++') ++ ++ ++######################################## ++## ++## Execute sssd server in the sssd domain. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`sssd_initrc_domtrans',` ++ gen_require(` ++ type sssd_initrc_exec_t; ++ ') ++ ++ init_labeled_script_domtrans($1,sssd_initrc_exec_t) ++') ++ ++######################################## ++## ++## Read sssd PID files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`sssd_read_pid_files',` ++ gen_require(` ++ type sssd_var_run_t; ++ ') ++ ++ files_search_pids($1) ++ allow $1 sssd_var_run_t:file read_file_perms; ++') ++ ++######################################## ++## ++## Manage sssd var_run files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`sssd_manage_var_run',` ++ gen_require(` ++ type sssd_var_run_t; ++ ') ++ ++ manage_dirs_pattern($1,sssd_var_run_t,sssd_var_run_t) ++ manage_files_pattern($1,sssd_var_run_t,sssd_var_run_t) ++ manage_lnk_files_pattern($1,sssd_var_run_t,sssd_var_run_t) ++') ++ ++ ++######################################## ++## ++## Search sssd lib directories. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`sssd_search_lib',` ++ gen_require(` ++ type sssd_var_lib_t; ++ ') ++ ++ allow $1 sssd_var_lib_t:dir search_dir_perms; ++ files_search_var_lib($1) ++') ++ ++######################################## ++## ++## Read sssd lib files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`sssd_read_lib_files',` ++ gen_require(` ++ type sssd_var_lib_t; ++ ') ++ ++ files_search_var_lib($1) ++ read_files_pattern($1, sssd_var_lib_t, sssd_var_lib_t) ++') ++ ++######################################## ++## ++## Create, read, write, and delete ++## sssd lib files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`sssd_manage_lib_files',` ++ gen_require(` ++ type sssd_var_lib_t; ++ ') ++ ++ files_search_var_lib($1) ++ manage_files_pattern($1, sssd_var_lib_t, sssd_var_lib_t) ++') ++ ++######################################## ++## ++## Manage sssd var_lib files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`sssd_manage_var_lib',` ++ gen_require(` ++ type sssd_var_lib_t; ++ ') ++ ++ manage_dirs_pattern($1,sssd_var_lib_t,sssd_var_lib_t) ++ manage_files_pattern($1,sssd_var_lib_t,sssd_var_lib_t) ++ manage_lnk_files_pattern($1,sssd_var_lib_t,sssd_var_lib_t) ++') ++ ++ ++######################################## ++## ++## Send and receive messages from ++## sssd over dbus. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`sssd_dbus_chat',` ++ gen_require(` ++ type sssd_t; ++ class dbus send_msg; ++ ') ++ ++ allow $1 sssd_t:dbus send_msg; ++ allow sssd_t $1:dbus send_msg; ++') ++ ++ ++######################################## ++## ++## Connect to sssd over an unix stream socket. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`sssd_stream_connect',` ++ gen_require(` ++ type sssd_t, sssd_var_run_t; ++ ') ++ ++ files_search_pids($1) ++ allow $1 sssd_var_run_t:sock_file write; ++ allow $1 sssd_t:unix_stream_socket connectto; ++') ++ ++######################################## ++## ++## All of the rules required to administrate ++## an sssd environment ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The role to be allowed to manage the sssd domain. ++## ++## ++## ++## ++## The type of the user terminal. ++## ++## ++## ++# ++interface(`sssd_admin',` ++ gen_require(` ++ type sssd_t; ++ ') ++ ++ allow $1 sssd_t:process { ptrace signal_perms getattr }; ++ read_files_pattern($1, sssd_t, sssd_t) ++ ++ ++ gen_require(` ++ type sssd_initrc_exec_t; ++ ') ++ ++ # Allow sssd_t to restart the apache service ++ sssd_initrc_domtrans($1) ++ domain_system_change_exemption($1) ++ role_transition $2 sssd_initrc_exec_t system_r; ++ allow $2 system_r; ++ ++ sssd_manage_var_run($1) ++ ++ sssd_manage_var_lib($1) ++ ++') ++ +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.te serefpolicy-3.6.8/policy/modules/services/sssd.te +--- nsaserefpolicy/policy/modules/services/sssd.te 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/services/sssd.te 2009-03-09 15:47:36.000000000 -0400 +@@ -0,0 +1,55 @@ ++policy_module(sssd,1.0.0) ++ ++######################################## ++# ++# Declarations ++# ++ ++type sssd_t; ++type sssd_exec_t; ++init_daemon_domain(sssd_t, sssd_exec_t) ++ ++permissive sssd_t; ++ ++type sssd_initrc_exec_t; ++init_script_file(sssd_initrc_exec_t) ++ ++type sssd_var_run_t; ++files_pid_file(sssd_var_run_t) ++ ++type sssd_var_lib_t; ++files_type(sssd_var_lib_t) ++ ++######################################## ++# ++# sssd local policy ++# ++ ++# Init script handling ++domain_use_interactive_fds(sssd_t) ++ ++# internal communication is often done using fifo and unix sockets. ++allow sssd_t self:fifo_file rw_file_perms; ++allow sssd_t self:unix_stream_socket { create_stream_socket_perms connectto }; ++ ++manage_dirs_pattern(sssd_t, sssd_var_run_t, sssd_var_run_t) ++manage_files_pattern(sssd_t, sssd_var_run_t, sssd_var_run_t) ++files_pid_filetrans(sssd_t,sssd_var_run_t, { file dir }) ++ ++manage_dirs_pattern(sssd_t, sssd_var_lib_t, sssd_var_lib_t) ++manage_files_pattern(sssd_t, sssd_var_lib_t, sssd_var_lib_t) ++manage_sock_files_pattern(sssd_t, sssd_var_lib_t, sssd_var_lib_t) ++files_var_lib_filetrans(sssd_t, sssd_var_lib_t, { file dir } ) ++ ++corecmd_exec_bin(sssd_t) ++ ++dev_read_urand(sssd_t) ++ ++files_read_etc_files(sssd_t) ++ ++miscfiles_read_localization(sssd_t) ++ ++optional_policy(` ++ dbus_system_bus_client(sssd_t) ++ dbus_connect_system_bus(sssd_t) ++') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.fc serefpolicy-3.6.8/policy/modules/services/stunnel.fc --- nsaserefpolicy/policy/modules/services/stunnel.fc 2008-08-07 11:15:11.000000000 -0400 +++ serefpolicy-3.6.8/policy/modules/services/stunnel.fc 2009-03-07 12:11:40.000000000 -0500 @@ -22706,7 +23035,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.8/policy/modules/services/xserver.te --- nsaserefpolicy/policy/modules/services/xserver.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/services/xserver.te 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/services/xserver.te 2009-03-09 16:07:15.000000000 -0400 @@ -34,6 +34,13 @@ ## @@ -23121,7 +23450,7 @@ hostname_exec(xdm_t) ') -@@ -542,6 +639,19 @@ +@@ -542,6 +639,23 @@ ') optional_policy(` @@ -23130,6 +23459,10 @@ + polkit_read_reload(xdm_t) +') + ++optional_policy(` ++ pulseaudio_role(system_r, xdm_t) ++') ++ +# On crash gdm execs gdb to dump stack +optional_policy(` + rpm_exec(xdm_t) @@ -23141,7 +23474,7 @@ seutil_sigchld_newrole(xdm_t) ') -@@ -550,8 +660,9 @@ +@@ -550,8 +664,9 @@ ') optional_policy(` @@ -23153,7 +23486,7 @@ ifndef(`distro_redhat',` allow xdm_t self:process { execheap execmem }; -@@ -560,7 +671,6 @@ +@@ -560,7 +675,6 @@ ifdef(`distro_rhel4',` allow xdm_t self:process { execheap execmem }; ') @@ -23161,7 +23494,7 @@ optional_policy(` userhelper_dontaudit_search_config(xdm_t) -@@ -571,6 +681,10 @@ +@@ -571,6 +685,10 @@ ') optional_policy(` @@ -23172,7 +23505,7 @@ xfs_stream_connect(xdm_t) ') -@@ -587,7 +701,7 @@ +@@ -587,7 +705,7 @@ # execheap needed until the X module loader is fixed. # NVIDIA Needs execstack @@ -23181,7 +23514,7 @@ dontaudit xserver_t self:capability chown; allow xserver_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; allow xserver_t self:memprotect mmap_zero; -@@ -602,9 +716,11 @@ +@@ -602,9 +720,11 @@ allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto }; allow xserver_t self:tcp_socket create_stream_socket_perms; allow xserver_t self:udp_socket create_socket_perms; @@ -23193,7 +23526,7 @@ allow xserver_t { input_xevent_t input_xevent_type }:x_event send; -@@ -622,7 +738,7 @@ +@@ -622,7 +742,7 @@ manage_sock_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t) files_tmp_filetrans(xserver_t, xserver_tmp_t, { file dir sock_file }) @@ -23202,7 +23535,7 @@ manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t) manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t) -@@ -635,9 +751,19 @@ +@@ -635,9 +755,19 @@ manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t) files_search_var_lib(xserver_t) @@ -23222,7 +23555,7 @@ kernel_read_system_state(xserver_t) kernel_read_device_sysctls(xserver_t) -@@ -680,9 +806,14 @@ +@@ -680,9 +810,14 @@ dev_rw_xserver_misc(xserver_t) # read events - the synaptics touchpad driver reads raw events dev_rw_input_dev(xserver_t) @@ -23237,7 +23570,7 @@ files_read_etc_files(xserver_t) files_read_etc_runtime_files(xserver_t) -@@ -697,8 +828,13 @@ +@@ -697,8 +832,13 @@ fs_search_nfs(xserver_t) fs_search_auto_mountpoints(xserver_t) fs_search_ramfs(xserver_t) @@ -23251,7 +23584,7 @@ selinux_validate_context(xserver_t) selinux_compute_access_vector(xserver_t) -@@ -720,6 +856,7 @@ +@@ -720,6 +860,7 @@ miscfiles_read_localization(xserver_t) miscfiles_read_fonts(xserver_t) @@ -23259,7 +23592,7 @@ modutils_domtrans_insmod(xserver_t) -@@ -742,7 +879,7 @@ +@@ -742,7 +883,7 @@ ') ifdef(`enable_mls',` @@ -23268,7 +23601,7 @@ range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh; ') -@@ -774,6 +911,10 @@ +@@ -774,6 +915,10 @@ ') optional_policy(` @@ -23279,7 +23612,7 @@ rhgb_getpgid(xserver_t) rhgb_signal(xserver_t) ') -@@ -806,7 +947,7 @@ +@@ -806,7 +951,7 @@ allow xserver_t xdm_var_lib_t:file { getattr read }; dontaudit xserver_t xdm_var_lib_t:dir search; @@ -23288,7 +23621,7 @@ # Label pid and temporary files with derived types. manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t) -@@ -827,9 +968,14 @@ +@@ -827,9 +972,14 @@ # to read ROLE_home_t - examine this in more detail # (xauth?) userdom_read_user_home_content_files(xserver_t) @@ -23303,7 +23636,7 @@ tunable_policy(`use_nfs_home_dirs',` fs_manage_nfs_dirs(xserver_t) fs_manage_nfs_files(xserver_t) -@@ -844,11 +990,14 @@ +@@ -844,11 +994,14 @@ optional_policy(` dbus_system_bus_client(xserver_t) @@ -23319,7 +23652,7 @@ ') optional_policy(` -@@ -856,6 +1005,11 @@ +@@ -856,6 +1009,11 @@ rhgb_rw_tmpfs_files(xserver_t) ') @@ -23331,7 +23664,7 @@ ######################################## # # Rules common to all X window domains -@@ -881,6 +1035,8 @@ +@@ -881,6 +1039,8 @@ # X Server # can read server-owned resources allow x_domain xserver_t:x_resource read; @@ -23340,7 +23673,7 @@ # can mess with own clients allow x_domain self:x_client { manage destroy }; -@@ -905,6 +1061,8 @@ +@@ -905,6 +1065,8 @@ # operations allowed on my windows allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive }; @@ -23349,7 +23682,7 @@ # X Colormaps # can use the default colormap allow x_domain rootwindow_t:x_colormap { read use add_color }; -@@ -972,17 +1130,51 @@ +@@ -972,17 +1134,51 @@ allow xserver_unconfined_type { x_domain xserver_t }:x_resource *; allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *; @@ -23559,7 +23892,7 @@ +/var/cache/coolkey(/.*)? gen_context(system_u:object_r:auth_cache_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.6.8/policy/modules/system/authlogin.if --- nsaserefpolicy/policy/modules/system/authlogin.if 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/authlogin.if 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/authlogin.if 2009-03-09 15:51:16.000000000 -0400 @@ -43,20 +43,38 @@ interface(`auth_login_pgm_domain',` gen_require(` @@ -23607,7 +23940,7 @@ init_rw_utmp($1) -@@ -100,9 +119,38 @@ +@@ -100,11 +119,40 @@ seutil_read_config($1) seutil_read_default_contexts($1) @@ -23627,9 +23960,9 @@ + optional_policy(` + oddjob_dbus_chat($1) + oddjob_domtrans_mkhomedir($1) -+ ') -+ ') -+ + ') + ') + + optional_policy(` + corecmd_exec_bin($1) + storage_getattr_fixed_disk_dev($1) @@ -23638,16 +23971,18 @@ + + optional_policy(` + nis_authenticate($1) - ') ++ ') + + optional_policy(` + ssh_agent_exec($1) + userdom_read_user_home_content_files($1) + ') + - ') - ++') ++ ######################################## + ## + ## Use the login program as an entry point program. @@ -197,8 +245,11 @@ interface(`auth_domtrans_chk_passwd',` gen_require(` @@ -23780,15 +24115,21 @@ nis_use_ypbind($1) ') -@@ -1307,6 +1413,7 @@ +@@ -1305,8 +1411,13 @@ + ') + optional_policy(` ++ sssd_stream_connect($1) ++ ') ++ ++ optional_policy(` samba_stream_connect_winbind($1) samba_read_var_files($1) + samba_dontaudit_write_var_files($1) ') ') -@@ -1341,3 +1448,99 @@ +@@ -1341,3 +1452,99 @@ typeattribute $1 can_write_shadow_passwords; typeattribute $1 can_relabelto_shadow_passwords; ') @@ -27942,7 +28283,7 @@ +/dev/shm/mono.* gen_context(system_u:object_r:user_tmpfs_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.8/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/userdomain.if 2009-03-07 12:36:20.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/userdomain.if 2009-03-09 16:06:34.000000000 -0400 @@ -30,8 +30,9 @@ ') From spot at fedoraproject.org Mon Mar 9 21:21:18 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Mon, 9 Mar 2009 21:21:18 +0000 (UTC) Subject: rpms/kernel/devel linux-2.6.29-sparc-IOC_TYPECHECK.patch, NONE, 1.1 config-sparc64-generic, 1.21, 1.22 kernel.spec, 1.1399, 1.1400 Message-ID: <20090309212118.C66AE70034@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18255 Modified Files: config-sparc64-generic kernel.spec Added Files: linux-2.6.29-sparc-IOC_TYPECHECK.patch Log Message: sparc config changes, fix sparc64 compile linux-2.6.29-sparc-IOC_TYPECHECK.patch: --- NEW FILE linux-2.6.29-sparc-IOC_TYPECHECK.patch --- diff -up vanilla-2.6.29-rc7-git2/arch/sparc/include/asm/ioctl.h.BAD vanilla-2.6.29-rc7-git2/arch/sparc/include/asm/ioctl.h --- vanilla-2.6.29-rc7-git2/arch/sparc/include/asm/ioctl.h.BAD 2009-03-09 17:01:32.000000000 -0400 +++ vanilla-2.6.29-rc7-git2/arch/sparc/include/asm/ioctl.h 2009-03-09 16:52:27.000000000 -0400 @@ -41,6 +41,17 @@ ((nr) << _IOC_NRSHIFT) | \ ((size) << _IOC_SIZESHIFT)) +#ifdef __KERNEL__ +/* provoke compile error for invalid uses of size argument */ +extern unsigned int __invalid_size_argument_for_IOC; +#define _IOC_TYPECHECK(t) \ + ((sizeof(t) == sizeof(t[1]) && \ + sizeof(t) < (1 << _IOC_SIZEBITS)) ? \ + sizeof(t) : __invalid_size_argument_for_IOC) +#else +#define _IOC_TYPECHECK(t) (sizeof(t)) +#endif + #define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0) #define _IOR(type,nr,size) _IOC(_IOC_READ,(type),(nr),sizeof(size)) #define _IOW(type,nr,size) _IOC(_IOC_WRITE,(type),(nr),sizeof(size)) Index: config-sparc64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- config-sparc64-generic 17 Nov 2008 17:14:34 -0000 1.21 +++ config-sparc64-generic 9 Mar 2009 21:20:48 -0000 1.22 @@ -85,7 +85,6 @@ # CONFIG_FB_LEO is not set CONFIG_FB_XVR500=y CONFIG_FB_XVR2500=y -# CONFIG_DRM is not set # CONFIG_VGASTATE is not set # CONFIG_FB_DDC is not set # CONFIG_FB_CIRRUS is not set @@ -153,7 +152,6 @@ CONFIG_ATM_FORE200E_DEBUG=0 CONFIG_ATM_FORE200E_TX_RETRY=16 # CONFIG_DRM_TDFX is not set -# CONFIG_DRM_R128 is not set # CONFIG_KEYBOARD_ATKBD is not set CONFIG_KEYBOARD_SUNKBD=y # CONFIG_INPUT_PCSPKR is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1399 retrieving revision 1.1400 diff -u -r1.1399 -r1.1400 --- kernel.spec 9 Mar 2009 21:03:29 -0000 1.1399 +++ kernel.spec 9 Mar 2009 21:20:48 -0000 1.1400 @@ -604,6 +604,8 @@ Patch144: linux-2.6-vio-modalias.patch Patch147: linux-2.6-imac-transparent-bridge.patch +Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch + Patch160: linux-2.6-execshield.patch Patch250: linux-2.6-debug-sizeof-structs.patch Patch260: linux-2.6-debug-nmi-timeout.patch @@ -1084,6 +1086,8 @@ # SPARC64 # +ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch + # # Exec shield # @@ -1806,6 +1810,9 @@ # and build. %changelog +* Tue Mar 10 2009 Tom "spot" Callaway +- linux-2.6.29-sparc-IOC_TYPECHECK.patch: missing function in sparc specific ioctl.h + * Tue Mar 10 2009 Ben Skeggs - drm-nouveau.patch: fix ppc From tuxbrewr at fedoraproject.org Mon Mar 9 21:38:26 2009 From: tuxbrewr at fedoraproject.org (Steven M. Parrish) Date: Mon, 9 Mar 2009 21:38:26 +0000 (UTC) Subject: rpms/sugar-update-control/devel python25.patch, NONE, 1.1 sugar-update-control.spec, 1.1, 1.2 Message-ID: <20090309213826.6E7C470034@cvs1.fedora.phx.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/sugar-update-control/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23359 Modified Files: sugar-update-control.spec Added Files: python25.patch Log Message: Fix broken deps python25.patch: --- NEW FILE python25.patch --- diff -crB sugar-update-control-0.20/bitfrost/update/actinfo.py sugar-update-control-0.20-fedora/bitfrost/update/actinfo.py *** sugar-update-control-0.20/bitfrost/update/actinfo.py 2009-02-19 05:05:13.000000000 -0500 --- sugar-update-control-0.20-fedora/bitfrost/update/actinfo.py 2009-03-09 06:30:38.000000000 -0400 *************** *** 1,4 **** ! #!/usr/bin/python2.5 # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian --- 1,4 ---- ! #!/usr/bin/python # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian diff -crB sugar-update-control-0.20/bitfrost/update/actutils.py sugar-update-control-0.20-fedora/bitfrost/update/actutils.py *** sugar-update-control-0.20/bitfrost/update/actutils.py 2009-02-19 05:05:13.000000000 -0500 --- sugar-update-control-0.20-fedora/bitfrost/update/actutils.py 2009-03-09 06:30:57.000000000 -0400 *************** *** 1,4 **** ! #!/usr/bin/python2.5 # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian --- 1,4 ---- ! #!/usr/bin/python # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian diff -crB sugar-update-control-0.20/bitfrost/update/microformat.py sugar-update-control-0.20-fedora/bitfrost/update/microformat.py *** sugar-update-control-0.20/bitfrost/update/microformat.py 2009-02-19 05:05:13.000000000 -0500 --- sugar-update-control-0.20-fedora/bitfrost/update/microformat.py 2009-03-09 06:31:25.000000000 -0400 *************** *** 1,4 **** ! #!/usr/bin/python2.5 # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian --- 1,4 ---- ! #!/usr/bin/python # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian diff -crB sugar-update-control-0.20/bitfrost/util/urlrange.py sugar-update-control-0.20-fedora/bitfrost/util/urlrange.py *** sugar-update-control-0.20/bitfrost/util/urlrange.py 2009-02-19 05:05:13.000000000 -0500 --- sugar-update-control-0.20-fedora/bitfrost/util/urlrange.py 2009-03-09 06:30:08.000000000 -0400 *************** *** 1,4 **** ! #!/usr/bin/python2.5 # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian --- 1,4 ---- ! #!/usr/bin/python # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian diff -crB sugar-update-control-0.20/src/model.py sugar-update-control-0.20-fedora/src/model.py *** sugar-update-control-0.20/src/model.py 2009-02-19 05:05:13.000000000 -0500 --- sugar-update-control-0.20-fedora/src/model.py 2009-03-09 06:28:48.000000000 -0400 *************** *** 1,4 **** ! #!/usr/bin/python2.5 # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian --- 1,4 ---- ! #!/usr/bin/python # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian diff -crB sugar-update-control-0.20/src/view.py sugar-update-control-0.20-fedora/src/view.py *** sugar-update-control-0.20/src/view.py 2009-02-19 05:05:13.000000000 -0500 --- sugar-update-control-0.20-fedora/src/view.py 2009-03-09 06:29:18.000000000 -0400 *************** *** 1,4 **** ! #!/usr/bin/python2.5 # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian --- 1,4 ---- ! #!/usr/bin/python # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian Index: sugar-update-control.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-update-control/devel/sugar-update-control.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sugar-update-control.spec 8 Mar 2009 00:28:56 -0000 1.1 +++ sugar-update-control.spec 9 Mar 2009 21:37:56 -0000 1.2 @@ -3,14 +3,18 @@ Summary: Activity update control panel for Sugar Name: sugar-update-control Version: 0.20 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://git.sugarlabs.org/projects/sugar-update-control Source0: %{name}-%{version}.tar.gz +Patch0: python25.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: olpc-update >= 2.13, sugar >= 0.83.0 -BuildRequires: gettext, intltool, python-devel, python-distutils-extra +Requires: sugar >= 0.83.0 +BuildRequires: gettext +BuildRequires: intltool +BuildRequires: python-devel +BuildRequires: python-distutils-extra BuildArch: noarch %description @@ -19,6 +23,7 @@ %prep %setup -q +%patch0 -p1 -b .py25 %build %{__python} setup.py build @@ -27,6 +32,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT %{__python} setup.py install --root=$RPM_BUILD_ROOT + # avoid conflicts with standard __init__.py* rm $RPM_BUILD_ROOT%{python_sitelib}/{bitfrost,bitfrost/update,bitfrost/util}/__init__.py* %find_lang %{name} @@ -45,10 +51,12 @@ %{_datadir}/sugar/extensions/cpsection/ %changelog +* Sun Mar 08 2009 0.20-4 +- Fix missing deps + * Sat Mar 07 2009 - 0.20-3 - Merge with tuxbrewr spec - * Thu Mar 05 2009 Steven M. Parrish 0.20-2 - Fix license and files From mnowak at fedoraproject.org Mon Mar 9 21:42:02 2009 From: mnowak at fedoraproject.org (Michal Nowak) Date: Mon, 9 Mar 2009 21:42:02 +0000 (UTC) Subject: rpms/xcb-util/F-10 xcb-util.spec,1.1,1.2 Message-ID: <20090309214202.BF2CF70034@cvs1.fedora.phx.redhat.com> Author: mnowak Update of /cvs/pkgs/rpms/xcb-util/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24284 Modified Files: xcb-util.spec Log Message: 0.3.3 Index: xcb-util.spec =================================================================== RCS file: /cvs/pkgs/rpms/xcb-util/F-10/xcb-util.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xcb-util.spec 13 Jan 2009 10:45:18 -0000 1.1 +++ xcb-util.spec 9 Mar 2009 21:41:32 -0000 1.2 @@ -1,14 +1,12 @@ Name: xcb-util -Version: 0.3.2 -Release: 2%{?dist} +Version: 0.3.3 +Release: 1%{?dist} Summary: Convenience libraries sitting on top of libxcb Group: System Environment/Libraries License: MIT URL: http://xcb.freedesktop.org Source0: http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2 -Patch0: xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch -Patch1: xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gperf, pkgconfig, libxcb-devel, m4, xorg-x11-proto-devel BuildRequires: chrpath @@ -33,9 +31,6 @@ %prep %setup -q -# taken from upstream git, both post 0.3.2 patches -%patch0 -p1 -%patch1 -p1 %build @@ -85,6 +80,10 @@ %changelog +* Mon Mar 9 2009 Michal Nowak - 0.3.3-1 +- 0.3.3 +- removed patches already in git (and 0.3.3) + * Fri Dec 19 2008 Michal Nowak - 0.3.2-2 - hack the sed lines after %%configure out and hack chrpath in - make check is running again From ausil at fedoraproject.org Mon Mar 9 21:44:03 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Mon, 9 Mar 2009 21:44:03 +0000 (UTC) Subject: rpms/kernel/F-10 linux-2.6-sparc-cs4231-ebus-dma.patch, NONE, 1.1.2.1 kernel.spec, 1.1206.2.42, 1.1206.2.43 Message-ID: <20090309214403.9BC9270034@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/extras/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24960 Modified Files: Tag: private-fedora-10-2_6_27 kernel.spec Added Files: Tag: private-fedora-10-2_6_27 linux-2.6-sparc-cs4231-ebus-dma.patch Log Message: add linux-2.6-sparc-cs4231-ebus-dma.patch linux-2.6-sparc-cs4231-ebus-dma.patch: --- NEW FILE linux-2.6-sparc-cs4231-ebus-dma.patch --- --- linux-2.6.27.noarch/sound/sparc/cs4231.c.BAD 2009-01-22 20:54:11.665600509 -0600 +++ linux-2.6.27.noarch/sound/sparc/cs4231.c 2009-01-22 20:54:27.130350403 -0600 @@ -36,6 +36,7 @@ #define EBUS_SUPPORT #include #include +#include #endif static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ Index: kernel.spec =================================================================== RCS file: /cvs/extras/rpms/kernel/F-10/kernel.spec,v retrieving revision 1.1206.2.42 retrieving revision 1.1206.2.43 diff -u -r1.1206.2.42 -r1.1206.2.43 --- kernel.spec 8 Mar 2009 03:30:09 -0000 1.1206.2.42 +++ kernel.spec 9 Mar 2009 21:43:32 -0000 1.1206.2.43 @@ -643,6 +643,7 @@ Patch591: selinux-netlabel_setsockopt_fix.patch # fix for ebus_dma.h Patch600: sparc-2.6.git-aae7fb87ec4d2df6cb551670b1765cf4e5795a3b.patch +Patch610: linux-2.6-sparc-cs4231-ebus-dma.patch Patch670: linux-2.6-ata-quirk.patch Patch671: linux-2.6-libata-make-sure-port-is-thawed.patch @@ -1178,7 +1179,7 @@ # SPARC64 # ApplyPatch sparc-2.6.git-aae7fb87ec4d2df6cb551670b1765cf4e5795a3b.patch - +ApplyPatch linux-2.6-sparc-cs4231-ebus-dma.patch # # Exec shield # @@ -1987,6 +1988,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Mon Mar 09 2009 Dennis Gilmore 2.6.27.19-170.2.43 +- add cs4231 ebus dma patch + * Sat Mar 07 2009 Jarod Wilson 2.6.27.19-170.2.42 - hdpvr: add addtional device IDs and permit functioning w/latest firmwares From mnowak at fedoraproject.org Mon Mar 9 21:46:43 2009 From: mnowak at fedoraproject.org (Michal Nowak) Date: Mon, 9 Mar 2009 21:46:43 +0000 (UTC) Subject: rpms/xcb-util/F-9 xcb-util.spec,1.1,1.2 Message-ID: <20090309214643.EB0DB70034@cvs1.fedora.phx.redhat.com> Author: mnowak Update of /cvs/pkgs/rpms/xcb-util/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25327 Modified Files: xcb-util.spec Log Message: 0.3.3 Index: xcb-util.spec =================================================================== RCS file: /cvs/pkgs/rpms/xcb-util/F-9/xcb-util.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xcb-util.spec 13 Jan 2009 10:48:26 -0000 1.1 +++ xcb-util.spec 9 Mar 2009 21:46:13 -0000 1.2 @@ -1,14 +1,12 @@ Name: xcb-util -Version: 0.3.2 -Release: 2%{?dist} +Version: 0.3.3 +Release: 1%{?dist} Summary: Convenience libraries sitting on top of libxcb Group: System Environment/Libraries License: MIT URL: http://xcb.freedesktop.org Source0: http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2 -Patch0: xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch -Patch1: xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gperf, pkgconfig, libxcb-devel, m4, xorg-x11-proto-devel BuildRequires: chrpath @@ -33,9 +31,6 @@ %prep %setup -q -# taken from upstream git, both post 0.3.2 patches -%patch0 -p1 -%patch1 -p1 %build @@ -85,6 +80,10 @@ %changelog +* Mon Mar 9 2009 Michal Nowak - 0.3.3-1 +- 0.3.3 +- removed patches already in git (and 0.3.3) + * Fri Dec 19 2008 Michal Nowak - 0.3.2-2 - hack the sed lines after %%configure out and hack chrpath in - make check is running again From pkgdb at fedoraproject.org Mon Mar 9 21:51:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 21:51:49 +0000 Subject: [pkgdb] eclipse: dbhole has requested commit Message-ID: <20090309215209.BD55D2084CF@bastion.fedora.phx.redhat.com> dbhole has requested the commit acl on eclipse (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse From tuxbrewr at fedoraproject.org Mon Mar 9 21:51:48 2009 From: tuxbrewr at fedoraproject.org (Steven M. Parrish) Date: Mon, 9 Mar 2009 21:51:48 +0000 (UTC) Subject: rpms/sugar-update-control/F-10 python25.patch, NONE, 1.1 sugar-update-control.spec, 1.1, 1.2 Message-ID: <20090309215148.89C0870034@cvs1.fedora.phx.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/rpms/sugar-update-control/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28271 Modified Files: sugar-update-control.spec Added Files: python25.patch Log Message: Fix broken deps python25.patch: --- NEW FILE python25.patch --- diff -crB sugar-update-control-0.20/bitfrost/update/actinfo.py sugar-update-control-0.20-fedora/bitfrost/update/actinfo.py *** sugar-update-control-0.20/bitfrost/update/actinfo.py 2009-02-19 05:05:13.000000000 -0500 --- sugar-update-control-0.20-fedora/bitfrost/update/actinfo.py 2009-03-09 06:30:38.000000000 -0400 *************** *** 1,4 **** ! #!/usr/bin/python2.5 # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian --- 1,4 ---- ! #!/usr/bin/python # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian diff -crB sugar-update-control-0.20/bitfrost/update/actutils.py sugar-update-control-0.20-fedora/bitfrost/update/actutils.py *** sugar-update-control-0.20/bitfrost/update/actutils.py 2009-02-19 05:05:13.000000000 -0500 --- sugar-update-control-0.20-fedora/bitfrost/update/actutils.py 2009-03-09 06:30:57.000000000 -0400 *************** *** 1,4 **** ! #!/usr/bin/python2.5 # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian --- 1,4 ---- ! #!/usr/bin/python # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian diff -crB sugar-update-control-0.20/bitfrost/update/microformat.py sugar-update-control-0.20-fedora/bitfrost/update/microformat.py *** sugar-update-control-0.20/bitfrost/update/microformat.py 2009-02-19 05:05:13.000000000 -0500 --- sugar-update-control-0.20-fedora/bitfrost/update/microformat.py 2009-03-09 06:31:25.000000000 -0400 *************** *** 1,4 **** ! #!/usr/bin/python2.5 # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian --- 1,4 ---- ! #!/usr/bin/python # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian diff -crB sugar-update-control-0.20/bitfrost/util/urlrange.py sugar-update-control-0.20-fedora/bitfrost/util/urlrange.py *** sugar-update-control-0.20/bitfrost/util/urlrange.py 2009-02-19 05:05:13.000000000 -0500 --- sugar-update-control-0.20-fedora/bitfrost/util/urlrange.py 2009-03-09 06:30:08.000000000 -0400 *************** *** 1,4 **** ! #!/usr/bin/python2.5 # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian --- 1,4 ---- ! #!/usr/bin/python # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian diff -crB sugar-update-control-0.20/src/model.py sugar-update-control-0.20-fedora/src/model.py *** sugar-update-control-0.20/src/model.py 2009-02-19 05:05:13.000000000 -0500 --- sugar-update-control-0.20-fedora/src/model.py 2009-03-09 06:28:48.000000000 -0400 *************** *** 1,4 **** ! #!/usr/bin/python2.5 # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian --- 1,4 ---- ! #!/usr/bin/python # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian diff -crB sugar-update-control-0.20/src/view.py sugar-update-control-0.20-fedora/src/view.py *** sugar-update-control-0.20/src/view.py 2009-02-19 05:05:13.000000000 -0500 --- sugar-update-control-0.20-fedora/src/view.py 2009-03-09 06:29:18.000000000 -0400 *************** *** 1,4 **** ! #!/usr/bin/python2.5 # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian --- 1,4 ---- ! #!/usr/bin/python # Copyright (C) 2008 One Laptop Per Child Association, Inc. # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details. # Written by C. Scott Ananian Index: sugar-update-control.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-update-control/F-10/sugar-update-control.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sugar-update-control.spec 8 Mar 2009 09:12:00 -0000 1.1 +++ sugar-update-control.spec 9 Mar 2009 21:51:18 -0000 1.2 @@ -3,14 +3,18 @@ Summary: Activity update control panel for Sugar Name: sugar-update-control Version: 0.20 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://git.sugarlabs.org/projects/sugar-update-control Source0: %{name}-%{version}.tar.gz +Patch0: python25.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: olpc-update >= 2.13, sugar >= 0.83.0 -BuildRequires: gettext, intltool, python-devel, python-distutils-extra +Requires: sugar >= 0.83.0 +BuildRequires: gettext +BuildRequires: intltool +BuildRequires: python-devel +BuildRequires: python-distutils-extra BuildArch: noarch %description @@ -19,6 +23,7 @@ %prep %setup -q +%patch0 -p1 -b .py25 %build %{__python} setup.py build @@ -27,6 +32,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT %{__python} setup.py install --root=$RPM_BUILD_ROOT + # avoid conflicts with standard __init__.py* rm $RPM_BUILD_ROOT%{python_sitelib}/{bitfrost,bitfrost/update,bitfrost/util}/__init__.py* %find_lang %{name} @@ -45,10 +51,12 @@ %{_datadir}/sugar/extensions/cpsection/ %changelog +* Sun Mar 08 2009 0.20-4 +- Fix missing deps + * Sat Mar 07 2009 - 0.20-3 - Merge with tuxbrewr spec - * Thu Mar 05 2009 Steven M. Parrish 0.20-2 - Fix license and files From pkgdb at fedoraproject.org Mon Mar 9 21:55:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 21:55:01 +0000 Subject: [pkgdb] eclipse had acl change status Message-ID: <20090309215521.E86482084CF@bastion.fedora.phx.redhat.com> overholt has set the commit acl on eclipse (Fedora devel) to Approved for dbhole To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse From overholt at fedoraproject.org Mon Mar 9 21:57:19 2009 From: overholt at fedoraproject.org (Andrew Overholt) Date: Mon, 9 Mar 2009 21:57:19 +0000 (UTC) Subject: rpms/eclipse/devel eclipse.spec,1.621,1.622 Message-ID: <20090309215719.D257270034@cvs1.fedora.phx.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29763 Modified Files: eclipse.spec Log Message: * Mon Mar 9 2009 Andrew Overholt 1:3.4.2-3 - Remove ecj sub-package as it is replaced by standalone ecj package. Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.621 retrieving revision 1.622 diff -u -r1.621 -r1.622 --- eclipse.spec 26 Feb 2009 17:08:30 -0000 1.621 +++ eclipse.spec 9 Mar 2009 21:56:49 -0000 1.622 @@ -1,5 +1,4 @@ # TODO: -# - update ecj-rpmdebuginfo patch # - look at startup script and launcher patches # - get Ganymede update site pre-configured (https://bugs.eclipse.org/249133) # - investigate bi-arch requirements @@ -30,7 +29,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 2%{?dist} +Release: 3%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -51,7 +50,6 @@ Source5: org.fedoraproject.ide.feature-1.0.0.zip Source16: %{name}-copy-platform.sh Source17: efj.sh.in -Source18: ecj.sh.in # This file contains the types of files we'd like to extract from the jars # when using the FileInitializer Source19: %{name}-filenamepatterns.txt @@ -75,11 +73,6 @@ Source27: ecf-filetransfer-build.properties # This script copies the platform sub-set of the SDK for generating metadata Source28: %{name}-mv-Platform.sh -# Use ECJ for GCJ -# cvs -d:pserver:anonymous at sourceware.org:/cvs/rhug \ -# export -r eclipse_r34_1 eclipse-gcj -# tar cjf eclipse-ecj-gcj.tar.bz2 eclipse-gcj -Source29: %{name}-ecj-gcj.tar.bz2 # Test feature and plugins # cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse co equinox-incubator/org.eclipse.equinox.initializer # mkdir %{name}-%{version}-testframework; cd %{name}-%{version}-testframework @@ -107,9 +100,6 @@ # (which contains the JNI .sos) is in %{_libdir} # We should investigate whether or not this can go upstream #Patch12: %{name}-launcher-set-install-dir-and-shared-config.patch -# Always generate debug info when building RPMs (Andrew Haley) -# This needs to be investigated for getEnv changes -Patch14: %{name}-ecj-rpmdebuginfo.patch # generic releng plugins that can be used to build plugins # see this thread for details: # https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html @@ -157,10 +147,6 @@ Patch43: %{name}-osgi-classpath.patch Patch44: %{name}-fix-javahome64.patch -# Default to 1.5 source and bytecode -# https://bugzilla.redhat.com/354721 -Patch45: %{name}-ecj-defaultto1.5.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant BuildRequires: jpackage-utils >= 0:1.5, make, gcc @@ -183,10 +169,6 @@ BuildRequires: java-devel >= 1.6.0 BuildRequires: java-javadoc BuildRequires: libXt-devel -# For ecj's AOT bits -BuildRequires: gcc-java -BuildRequires: java-1.5.0-gcj-javadoc -BuildRequires: java-gcj-compat-devel BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch @@ -209,20 +191,6 @@ environments (IDEs), server-side applications, desktop applications, and everything in between. -%package ecj -Summary: Eclipse Compiler for Java -Group: Development/Languages -Obsoletes: ecj < %{version}-%{release} -Provides: ecj = %{version}-%{release} -Requires: java >= 1.6.0 -# For AOT bits -Requires: libgcj >= 4.0.2 -Requires(post): java-gcj-compat >= 1.0.64 -Requires(postun): java-gcj-compat >= 1.0.64 - -%description ecj -Eclipse compiler for Java. - %package swt Summary: SWT Library for GTK+-2.0 Group: Text Editors/Integrated Development Environments (IDE) @@ -284,7 +252,6 @@ Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-cvs-client = %{epoch}:%{version}-%{release} -Requires: %{name}-ecj = %{epoch}:%{version}-%{release} Requires: junit >= 3.8.1-3jpp Requires: junit4 Requires: java-javadoc @@ -322,14 +289,6 @@ %patch4 -p0 %patch32 -p0 -# Use ECJ for GCJ's bytecode compiler -tar jxf %{SOURCE29} -mv eclipse-gcj/org/eclipse/jdt/internal/compiler/batch/GCCMain.java \ - plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ -cat eclipse-gcj/gcc.properties >> \ - plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties -rm -rf eclipse-gcj - # liblocalfile fixes sed --in-place "s/JAVA_HOME =/#JAVA_HOME =/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile sed --in-place "s/OPT_FLAGS=-O/OPT_FLAGS=-O2 -g/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile @@ -361,11 +320,6 @@ plugins/org.eclipse.pde.doc.user/pdeOptions.txt \ plugins/org.eclipse.pde.doc.user/pdeOptions -pushd plugins/org.eclipse.jdt.core -%patch14 -p0 -%patch45 -p0 -popd - pushd plugins/org.eclipse.pde.build %patch15 sed --in-place "s:/usr/share/eclipse:%{_libdir}/%{name}:" templates/package-build/build.properties @@ -1096,23 +1050,6 @@ ln -s ../%{name}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar ../java/swt.jar popd -# Install the eclipse-ecj.jar symlink for java-1.4.2-gcj-compat's "javac" -JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/jdt/plugins \ - | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//") -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -ln -s %{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX \ - $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj-%{version}.jar -ln -s %{_javadir}/eclipse-ecj-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj.jar -ln -s %{_javadir}/eclipse-ecj-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/jdtcore-%{version}.jar -ln -s %{_javadir}/jdtcore-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/jdtcore.jar -ln -s %{_javadir}/eclipse-ecj-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/ecj-%{version}.jar -ln -s %{_javadir}/ecj-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/ecj.jar - # Icons install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_%{version}/eclipse48.png \ @@ -1131,10 +1068,6 @@ sed --in-place "s:startup.jar:%{_libdir}/%{name}/startup.jar:" \ $RPM_BUILD_ROOT%{_bindir}/efj -# Install the ecj wrapper script -install -p -D -m0755 %{SOURCE18} $RPM_BUILD_ROOT%{_bindir}/ecj -sed --in-place "s:@JAVADIR@:%{_javadir}:" $RPM_BUILD_ROOT%{_bindir}/ecj - # A sanity check. desktop-file-validate %{SOURCE2} @@ -1281,25 +1214,9 @@ popd -tmpdir=$PWD/aot-compile-ecj # must not be within $RPM_BUILD_ROOT -mkdir -p $tmpdir -cp -p $sdkDir/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar $tmpdir -RPM_PACKAGE_NAME=eclipse-ecj RPM_BUILD_ROOT=$tmpdir aot-compile-rpm -cp -rp $tmpdir%{_libdir}/gcj $RPM_BUILD_ROOT%{_libdir}/gcj - %clean rm -rf $RPM_BUILD_ROOT -%post ecj -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun ecj -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - %post platform touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then @@ -1312,19 +1229,6 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -%files ecj -%defattr(-,root,root) -%dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/dropins -%dir %{_libdir}/%{name}/dropins/jdt -%dir %{_libdir}/%{name}/dropins/jdt/plugins -%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_* -%{_javadir}/eclipse-ecj*.jar -%{_javadir}/jdtcore*.jar -%{_javadir}/ecj*.jar -%{_bindir}/ecj -%{_libdir}/gcj/eclipse-ecj - %if %{initialize} %files swt -f %{name}-swt.install %else @@ -1568,6 +1472,9 @@ #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Mon Mar 9 2009 Andrew Overholt 1:3.4.2-3 +- Remove ecj sub-package as it is replaced by standalone ecj package. + * Thu Feb 26 2009 Alexander Kurtakov 1:3.4.2-2 - Strict R/BR for sat4j >= 2.0.3. From dwalsh at fedoraproject.org Mon Mar 9 21:58:08 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 9 Mar 2009 21:58:08 +0000 (UTC) Subject: rpms/selinux-policy/devel exclude, NONE, 1.1 nsadiff, NONE, 1.1 policy-20090105.patch, 1.57, 1.58 selinux-policy.spec, 1.802, 1.803 Message-ID: <20090309215808.8768370034@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30096 Modified Files: policy-20090105.patch selinux-policy.spec Added Files: exclude nsadiff Log Message: * Mon Mar 9 2009 Dan Walsh 3.6.8-3 - Add pulseaudio, sssd policy - Allow networkmanager to exec udevadm --- NEW FILE exclude --- CVS *2004* *h *~ .#* *.spec *.orig *.rej *.suse *.strict policy.conf policy.15 tmp debian #* policy.conf policy.xml modules.conf booleans.conf base.conf base.fc *.pyc fc_sort CVS CVSROOT .svn svn --- NEW FILE nsadiff --- diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.8 > /tmp/diff policy-20090105.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.57 -r 1.58 policy-20090105.patch Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- policy-20090105.patch 9 Mar 2009 21:17:23 -0000 1.57 +++ policy-20090105.patch 9 Mar 2009 21:58:07 -0000 1.58 @@ -1,6 +1,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.8/config/appconfig-mcs/default_contexts --- nsaserefpolicy/config/appconfig-mcs/default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/default_contexts 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/default_contexts 2009-03-09 17:56:08.452575000 -0400 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -24,13 +24,13 @@ +system_r:xdm_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.8/config/appconfig-mcs/failsafe_context --- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.8/config/appconfig-mcs/failsafe_context 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/failsafe_context 2009-03-09 17:56:08.454576000 -0400 @@ -1 +1 @@ -sysadm_r:sysadm_t:s0 +system_r:unconfined_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/guest_u_default_contexts 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/guest_u_default_contexts 2009-03-09 17:56:08.457575000 -0400 @@ -0,0 +1,6 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -40,7 +40,7 @@ +guest_r:guest_t:s0 guest_r:guest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/root_default_contexts --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/root_default_contexts 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/root_default_contexts 2009-03-09 17:56:08.459573000 -0400 @@ -1,11 +1,7 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0 +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -57,7 +57,7 @@ +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.8/config/appconfig-mcs/seusers --- nsaserefpolicy/config/appconfig-mcs/seusers 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.8/config/appconfig-mcs/seusers 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/seusers 2009-03-09 17:56:08.461575000 -0400 @@ -1,3 +1,3 @@ system_u:system_u:s0-mcs_systemhigh -root:root:s0-mcs_systemhigh @@ -66,7 +66,7 @@ +__default__:unconfined_u:s0-mcs_systemhigh diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/staff_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/staff_u_default_contexts 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/staff_u_default_contexts 2009-03-09 17:56:08.464572000 -0400 @@ -1,10 +1,12 @@ system_r:local_login_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 system_r:remote_login_t:s0 staff_r:staff_t:s0 @@ -83,7 +83,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/unconfined_u_default_contexts 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/unconfined_u_default_contexts 2009-03-09 17:56:08.466573000 -0400 @@ -1,4 +1,4 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0 +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 @@ -99,13 +99,13 @@ system_r:xdm_t:s0 unconfined_r:unconfined_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.8/config/appconfig-mcs/userhelper_context --- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.8/config/appconfig-mcs/userhelper_context 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/userhelper_context 2009-03-09 17:56:08.468575000 -0400 @@ -1 +1 @@ -system_u:sysadm_r:sysadm_t:s0 +system_u:system_r:unconfined_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/user_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/user_u_default_contexts 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/user_u_default_contexts 2009-03-09 17:56:08.470575000 -0400 @@ -1,8 +1,9 @@ system_r:local_login_t:s0 user_r:user_t:s0 system_r:remote_login_t:s0 user_r:user_t:s0 @@ -120,17 +120,17 @@ +user_r:user_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.8/config/appconfig-mcs/virtual_domain_context --- nsaserefpolicy/config/appconfig-mcs/virtual_domain_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/virtual_domain_context 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/virtual_domain_context 2009-03-09 17:56:08.472577000 -0400 @@ -0,0 +1 @@ +system_u:system_r:svirt_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.8/config/appconfig-mcs/virtual_image_context --- nsaserefpolicy/config/appconfig-mcs/virtual_image_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/virtual_image_context 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/virtual_image_context 2009-03-09 17:56:08.474575000 -0400 @@ -0,0 +1 @@ +system_u:object_r:virt_image_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/xguest_u_default_contexts 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mcs/xguest_u_default_contexts 2009-03-09 17:56:08.476573000 -0400 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -141,7 +141,7 @@ +xguest_r:xguest_t:s0 xguest_r:xguest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.8/config/appconfig-mls/default_contexts --- nsaserefpolicy/config/appconfig-mls/default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/default_contexts 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/default_contexts 2009-03-09 17:56:08.478573000 -0400 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -165,7 +165,7 @@ +system_r:xdm_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/guest_u_default_contexts 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/guest_u_default_contexts 2009-03-09 17:56:08.490572000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -173,7 +173,7 @@ +system_r:crond_t:s0 guest_r:guest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.8/config/appconfig-mls/root_default_contexts --- nsaserefpolicy/config/appconfig-mls/root_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/root_default_contexts 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/root_default_contexts 2009-03-09 17:56:08.491577000 -0400 @@ -1,11 +1,11 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0 -system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -194,17 +194,17 @@ +#system_r:sshd_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.8/config/appconfig-mls/virtual_domain_context --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/virtual_domain_context 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/virtual_domain_context 2009-03-09 17:56:08.493579000 -0400 @@ -0,0 +1 @@ +system_u:system_r:qemu_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.8/config/appconfig-mls/virtual_image_context --- nsaserefpolicy/config/appconfig-mls/virtual_image_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/virtual_image_context 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/virtual_image_context 2009-03-09 17:56:08.495579000 -0400 @@ -0,0 +1 @@ +system_u:object_r:virt_image_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mls/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/xguest_u_default_contexts 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/config/appconfig-mls/xguest_u_default_contexts 2009-03-09 17:56:08.497575000 -0400 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -214,8 +214,8 @@ +system_r:initrc_su_t:s0 xguest_r:xguest_t:s0 +xguest_r:xguest_t:s0 xguest_r:xguest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.8/Makefile ---- nsaserefpolicy/Makefile 2009-01-19 11:07:35.000000000 -0500 -+++ serefpolicy-3.6.8/Makefile 2009-03-07 12:11:40.000000000 -0500 +--- nsaserefpolicy/Makefile 2009-02-09 12:15:51.000000000 -0500 ++++ serefpolicy-3.6.8/Makefile 2009-03-09 17:56:08.500572000 -0400 @@ -241,7 +241,7 @@ appdir := $(contextpath) user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts) @@ -279,8 +279,8 @@ @mkdir -p $(appdir) $(verbose) $(INSTALL) -m 644 $< $@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.8/policy/flask/access_vectors ---- nsaserefpolicy/policy/flask/access_vectors 2009-03-05 10:02:34.000000000 -0500 -+++ serefpolicy-3.6.8/policy/flask/access_vectors 2009-03-07 12:11:40.000000000 -0500 +--- nsaserefpolicy/policy/flask/access_vectors 2009-03-09 17:54:21.056246000 -0400 ++++ serefpolicy-3.6.8/policy/flask/access_vectors 2009-03-09 17:56:08.502573000 -0400 @@ -157,6 +157,9 @@ class sock_file @@ -293,7 +293,7 @@ inherits file diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.8/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/policy/global_tunables 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/policy/global_tunables 2009-03-09 17:56:08.504576000 -0400 @@ -61,15 +61,6 @@ ## @@ -324,8 +324,8 @@ + + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.8/policy/mcs ---- nsaserefpolicy/policy/mcs 2009-02-03 22:50:50.000000000 -0500 -+++ serefpolicy-3.6.8/policy/mcs 2009-03-07 12:11:40.000000000 -0500 +--- nsaserefpolicy/policy/mcs 2009-02-09 12:15:17.000000000 -0500 ++++ serefpolicy-3.6.8/policy/mcs 2009-03-09 17:56:08.507572000 -0400 @@ -67,7 +67,8 @@ # Note that getattr on files is always permitted. # @@ -365,7 +365,7 @@ (( h1 dom h2 ) or ( t1 == mcssetcats )); diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.6.8/policy/modules/admin/alsa.te --- nsaserefpolicy/policy/modules/admin/alsa.te 2009-01-05 15:39:44.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/admin/alsa.te 2009-03-07 12:11:40.000000000 -0500 [...3359 lines suppressed...] ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`udev_exec',` ++ gen_require(` ++ type udev_exec_t; ++ ') ++ ++ can_exec($1, udev_exec_t) ++') ++ ++######################################## ++## + ## Execute a udev helper in the udev domain. + ## + ## +@@ -96,6 +114,24 @@ ######################################## ## @@ -27478,7 +27625,7 @@ ## Allow process to read list of devices. ## ## -@@ -106,11 +124,13 @@ +@@ -106,11 +142,13 @@ # interface(`udev_read_db',` gen_require(` @@ -27494,7 +27641,7 @@ ') ######################################## -@@ -125,9 +145,9 @@ +@@ -125,9 +163,9 @@ # interface(`udev_rw_db',` gen_require(` @@ -27507,8 +27654,8 @@ + allow $1 udev_tbl_t:file rw_file_perms; ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.8/policy/modules/system/udev.te ---- nsaserefpolicy/policy/modules/system/udev.te 2009-03-02 16:51:45.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/udev.te 2009-03-07 12:11:40.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/udev.te 2009-03-03 15:55:59.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/udev.te 2009-03-09 17:56:09.491492000 -0400 @@ -55,6 +55,7 @@ can_exec(udev_t, udev_exec_t) @@ -27595,7 +27742,7 @@ ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.8/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2008-09-11 16:42:49.000000000 -0400 -+++ serefpolicy-3.6.8/policy/modules/system/unconfined.fc 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/unconfined.fc 2009-03-09 17:56:09.493496000 -0400 @@ -2,15 +2,28 @@ # e.g.: # /usr/local/bin/appsrv -- gen_context(system_u:object_r:unconfined_exec_t,s0) @@ -27636,7 +27783,7 @@ +/opt/real/(.*/)?realplay\.bin -- gen_context(system_u:object_r:execmem_exec_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.8/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/unconfined.if 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/unconfined.if 2009-03-09 17:56:09.496492000 -0400 @@ -12,14 +12,13 @@ # interface(`unconfined_domain_noaudit',` @@ -27916,7 +28063,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.8/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/unconfined.te 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/unconfined.te 2009-03-09 17:56:09.499491000 -0400 @@ -5,6 +5,35 @@ # # Declarations @@ -28271,7 +28418,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.8/policy/modules/system/userdomain.fc --- nsaserefpolicy/policy/modules/system/userdomain.fc 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/userdomain.fc 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/userdomain.fc 2009-03-09 17:56:09.501491000 -0400 @@ -1,4 +1,7 @@ HOME_DIR -d gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh) +HOME_DIR -l gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh) @@ -28282,8 +28429,8 @@ +/dev/shm/pulse-shm.* gen_context(system_u:object_r:user_tmpfs_t,s0) +/dev/shm/mono.* gen_context(system_u:object_r:user_tmpfs_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.8/policy/modules/system/userdomain.if ---- nsaserefpolicy/policy/modules/system/userdomain.if 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/userdomain.if 2009-03-09 16:06:34.000000000 -0400 +--- nsaserefpolicy/policy/modules/system/userdomain.if 2009-02-09 12:15:51.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/userdomain.if 2009-03-09 17:56:09.506492000 -0400 @@ -30,8 +30,9 @@ ') @@ -30131,8 +30278,8 @@ +') + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.8/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/userdomain.te 2009-03-07 12:11:40.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/userdomain.te 2009-02-09 12:15:51.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/userdomain.te 2009-03-09 17:56:09.508492000 -0400 @@ -8,13 +8,6 @@ ## @@ -30218,12 +30365,12 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.8/policy/modules/system/virtual.fc --- nsaserefpolicy/policy/modules/system/virtual.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/virtual.fc 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/virtual.fc 2009-03-09 17:56:09.511492000 -0400 @@ -0,0 +1 @@ +# No application file contexts. diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.8/policy/modules/system/virtual.if --- nsaserefpolicy/policy/modules/system/virtual.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/virtual.if 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/virtual.if 2009-03-09 17:56:09.513493000 -0400 @@ -0,0 +1,99 @@ +## Virtual machine emulator and virtualizer + @@ -30326,7 +30473,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.8/policy/modules/system/virtual.te --- nsaserefpolicy/policy/modules/system/virtual.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/virtual.te 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/virtual.te 2009-03-09 17:56:09.515494000 -0400 @@ -0,0 +1,78 @@ + +policy_module(virtualization, 1.1.2) @@ -30408,7 +30555,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.8/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/xen.fc 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/xen.fc 2009-03-09 17:56:09.517492000 -0400 @@ -2,17 +2,10 @@ /usr/bin/virsh -- gen_context(system_u:object_r:xm_exec_t,s0) @@ -30437,7 +30584,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.8/policy/modules/system/xen.if --- nsaserefpolicy/policy/modules/system/xen.if 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/xen.if 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/xen.if 2009-03-09 17:56:09.519494000 -0400 @@ -167,11 +167,14 @@ # interface(`xen_stream_connect',` @@ -30480,8 +30627,8 @@ + rw_files_pattern($1, xen_image_t, xen_image_t) +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.8/policy/modules/system/xen.te ---- nsaserefpolicy/policy/modules/system/xen.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/xen.te 2009-03-07 12:11:40.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/xen.te 2009-02-09 12:15:51.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/xen.te 2009-03-09 17:56:09.522491000 -0400 @@ -6,6 +6,13 @@ # Declarations # @@ -30705,7 +30852,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.8/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-10-16 17:21:16.000000000 -0400 -+++ serefpolicy-3.6.8/policy/support/obj_perm_sets.spt 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/policy/support/obj_perm_sets.spt 2009-03-09 17:56:09.524494000 -0400 @@ -179,20 +179,20 @@ # # Directory (dir) @@ -30780,7 +30927,7 @@ +define(`manage_key_perms', `{ create link read search setattr view write } ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.8/policy/users --- nsaserefpolicy/policy/users 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.6.8/policy/users 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/policy/users 2009-03-09 17:56:09.527491000 -0400 @@ -25,11 +25,8 @@ # permit any access to such users, then remove this entry. # @@ -30807,7 +30954,7 @@ +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.8/Rules.modular --- nsaserefpolicy/Rules.modular 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/Rules.modular 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/Rules.modular 2009-03-09 17:56:09.529491000 -0400 @@ -73,8 +73,8 @@ $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te @echo "Compliling $(NAME) $(@F) module" @@ -30839,7 +30986,7 @@ $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.8/support/Makefile.devel --- nsaserefpolicy/support/Makefile.devel 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/support/Makefile.devel 2009-03-07 12:11:40.000000000 -0500 ++++ serefpolicy-3.6.8/support/Makefile.devel 2009-03-09 17:56:09.531494000 -0400 @@ -185,8 +185,7 @@ tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te @$(EINFO) "Compiling $(NAME) $(basename $(@F)) module" Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.802 retrieving revision 1.803 diff -u -r1.802 -r1.803 --- selinux-policy.spec 9 Mar 2009 16:18:51 -0000 1.802 +++ selinux-policy.spec 9 Mar 2009 21:58:08 -0000 1.803 @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.6.8 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -447,6 +447,10 @@ %endif %changelog +* Mon Mar 9 2009 Dan Walsh 3.6.8-3 +- Add pulseaudio, sssd policy +- Allow networkmanager to exec udevadm + * Sat Mar 7 2009 Dan Walsh 3.6.8-2 - Add pulseaudio context From mnowak at fedoraproject.org Mon Mar 9 22:03:03 2009 From: mnowak at fedoraproject.org (Michal Nowak) Date: Mon, 9 Mar 2009 22:03:03 +0000 (UTC) Subject: rpms/xcb-util/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3 xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch, 1.1, NONE xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch, 1.1, NONE Message-ID: <20090309220303.7CE0D70034@cvs1.fedora.phx.redhat.com> Author: mnowak Update of /cvs/pkgs/rpms/xcb-util/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31162/F-10 Modified Files: .cvsignore import.log sources Removed Files: xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch Log Message: 0.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xcb-util/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Jan 2009 10:45:18 -0000 1.2 +++ .cvsignore 9 Mar 2009 22:02:32 -0000 1.3 @@ -1 +1 @@ -xcb-util-0.3.2.tar.bz2 +xcb-util-0.3.3.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/xcb-util/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jan 2009 10:45:18 -0000 1.1 +++ import.log 9 Mar 2009 22:02:32 -0000 1.2 @@ -1 +1,2 @@ xcb-util-0_3_2-2_fc10:F-10:xcb-util-0.3.2-2.fc10.src.rpm:1231843041 +xcb-util-0_3_3-1_fc10:F-10:xcb-util-0.3.3-1.fc10.src.rpm:1236635931 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xcb-util/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jan 2009 10:45:18 -0000 1.2 +++ sources 9 Mar 2009 22:02:33 -0000 1.3 @@ -1 +1 @@ -fa41a147f5a63b01207cfd975fecc45c xcb-util-0.3.2.tar.bz2 +b1b16c5c1fcf7a6facb346c262cd3513 xcb-util-0.3.3.tar.bz2 --- xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch DELETED --- --- xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch DELETED --- From pkgdb at fedoraproject.org Mon Mar 9 22:06:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 22:06:26 +0000 Subject: [pkgdb] wireshark: crisgil79 has requested watchcommits Message-ID: <20090309220646.DE6382084CF@bastion.fedora.phx.redhat.com> crisgil79 has requested the watchcommits acl on wireshark (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wireshark From pkgdb at fedoraproject.org Mon Mar 9 22:08:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 09 Mar 2009 22:08:39 +0000 Subject: [pkgdb] wireshark: crisgil79 has given up watchcommits Message-ID: <20090309220839.500042084CF@bastion.fedora.phx.redhat.com> crisgil79 has given up the watchcommits acl on wireshark (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/wireshark From than at fedoraproject.org Mon Mar 9 22:13:54 2009 From: than at fedoraproject.org (Than Ngo) Date: Mon, 9 Mar 2009 22:13:54 +0000 (UTC) Subject: rpms/kdebase/devel kdebase-4.2.1-konsole-layout-regression.patch, NONE, 1.1 kdebase.spec, 1.367, 1.368 Message-ID: <20090309221354.5CD0C70034@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1485 Modified Files: kdebase.spec Added Files: kdebase-4.2.1-konsole-layout-regression.patch Log Message: - apply patch to fix regression in konsole, layout regression affecting apps using the KPart kdebase-4.2.1-konsole-layout-regression.patch: --- NEW FILE kdebase-4.2.1-konsole-layout-regression.patch --- --- kdebase/apps/konsole/src/ViewContainer.cpp 2009/01/08 09:44:16 907499 +++ kdebase/apps/konsole/src/ViewContainer.cpp 2009/03/09 15:51:15 937339 @@ -784,6 +784,7 @@ searchBar()->setParent(_containerWidget); layout->addWidget(searchBar()); layout->addWidget(_stackWidget); + layout->setMargin(0); } StackedViewContainer::~StackedViewContainer() { @@ -829,6 +830,7 @@ searchBar()->setParent(contentArea); layout->addWidget(_stackWidget); layout->addWidget(searchBar()); + layout->setMargin(0); // elide left is used because the most informative part of the session name is often // the rightmost part Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.367 retrieving revision 1.368 diff -u -r1.367 -r1.368 --- kdebase.spec 4 Mar 2009 20:55:57 -0000 1.367 +++ kdebase.spec 9 Mar 2009 22:13:23 -0000 1.368 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Core Files Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} > 8 Name: kdebase @@ -28,8 +28,9 @@ Patch1: kdebase-4.1.70-konsole-session.patch Patch2: kdebase-4.2.1-home-icon.patch -## upstream patches +# upstream patches Patch100: kdebase-4.2.1-konsole-selection.patch +Patch101: kdebase-4.2.1-konsole-layout-regression.patch %ifnarch s390 s390x Requires: eject @@ -127,6 +128,7 @@ %patch2 -p1 -b .home-icon %patch100 -p1 -b .konsole +%patch101 -p1 -b .layout-regression # fix incorrect assumption that we're building in a combined kdebase tree sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt @@ -308,6 +310,10 @@ %changelog +* Mon Mar 09 2009 Than Ngo - 4.2.1-3 +- apply patch to fix regression in konsole, layout regression affecting apps + using the KPart + * Wed Mar 04 2009 Than Ngo - 4.2.1-2 - apply patch to fix regression in konsole, double-click selection works again From than at fedoraproject.org Mon Mar 9 22:21:47 2009 From: than at fedoraproject.org (Than Ngo) Date: Mon, 9 Mar 2009 22:21:47 +0000 (UTC) Subject: rpms/kdebase/F-10 kdebase-4.2.1-konsole-layout-regression.patch, NONE, 1.1 kdebase.spec, 1.360, 1.361 Message-ID: <20090309222147.D0BF370034@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4348 Modified Files: kdebase.spec Added Files: kdebase-4.2.1-konsole-layout-regression.patch Log Message: - apply patch to fix regression in konsole, layout regression affecting apps using the KPart kdebase-4.2.1-konsole-layout-regression.patch: --- NEW FILE kdebase-4.2.1-konsole-layout-regression.patch --- --- kdebase/apps/konsole/src/ViewContainer.cpp 2009/01/08 09:44:16 907499 +++ kdebase/apps/konsole/src/ViewContainer.cpp 2009/03/09 15:51:15 937339 @@ -784,6 +784,7 @@ searchBar()->setParent(_containerWidget); layout->addWidget(searchBar()); layout->addWidget(_stackWidget); + layout->setMargin(0); } StackedViewContainer::~StackedViewContainer() { @@ -829,6 +830,7 @@ searchBar()->setParent(contentArea); layout->addWidget(_stackWidget); layout->addWidget(searchBar()); + layout->setMargin(0); // elide left is used because the most informative part of the session name is often // the rightmost part Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v retrieving revision 1.360 retrieving revision 1.361 diff -u -r1.360 -r1.361 --- kdebase.spec 4 Mar 2009 20:59:56 -0000 1.360 +++ kdebase.spec 9 Mar 2009 22:21:16 -0000 1.361 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Core Files Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} > 8 Name: kdebase @@ -28,8 +28,9 @@ Patch1: kdebase-4.1.70-konsole-session.patch Patch2: kdebase-4.2.1-home-icon.patch -## upstream patches +# upstream patches Patch100: kdebase-4.2.1-konsole-selection.patch +Patch101: kdebase-4.2.1-konsole-layout-regression.patch %ifnarch s390 s390x Requires: eject @@ -127,6 +128,7 @@ %patch2 -p1 -b .home-icon %patch100 -p1 -b .konsole +%patch101 -p1 -b .layout-regression # fix incorrect assumption that we're building in a combined kdebase tree sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt @@ -308,6 +310,10 @@ %changelog +* Mon Mar 09 2009 Than Ngo - 4.2.1-3 +- apply patch to fix regression in konsole, layout regression affecting apps + using the KPart + * Wed Mar 04 2009 Than Ngo - 4.2.1-2 - apply patch to fix regression in konsole, double-click selection works again From than at fedoraproject.org Mon Mar 9 22:24:22 2009 From: than at fedoraproject.org (Than Ngo) Date: Mon, 9 Mar 2009 22:24:22 +0000 (UTC) Subject: rpms/kdebase/F-9 kdebase-4.2.1-konsole-layout-regression.patch, NONE, 1.1 kdebase.spec, 1.350, 1.351 Message-ID: <20090309222422.A9AF470034@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5220 Modified Files: kdebase.spec Added Files: kdebase-4.2.1-konsole-layout-regression.patch Log Message: - apply patch to fix regression in konsole, layout regression affecting apps using the KPart kdebase-4.2.1-konsole-layout-regression.patch: --- NEW FILE kdebase-4.2.1-konsole-layout-regression.patch --- --- kdebase/apps/konsole/src/ViewContainer.cpp 2009/01/08 09:44:16 907499 +++ kdebase/apps/konsole/src/ViewContainer.cpp 2009/03/09 15:51:15 937339 @@ -784,6 +784,7 @@ searchBar()->setParent(_containerWidget); layout->addWidget(searchBar()); layout->addWidget(_stackWidget); + layout->setMargin(0); } StackedViewContainer::~StackedViewContainer() { @@ -829,6 +830,7 @@ searchBar()->setParent(contentArea); layout->addWidget(_stackWidget); layout->addWidget(searchBar()); + layout->setMargin(0); // elide left is used because the most informative part of the session name is often // the rightmost part Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v retrieving revision 1.350 retrieving revision 1.351 diff -u -r1.350 -r1.351 --- kdebase.spec 4 Mar 2009 21:02:15 -0000 1.350 +++ kdebase.spec 9 Mar 2009 22:23:51 -0000 1.351 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Core Files Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} > 8 Name: kdebase @@ -28,8 +28,9 @@ Patch1: kdebase-4.1.70-konsole-session.patch Patch2: kdebase-4.2.1-home-icon.patch -## upstream patches +# upstream patches Patch100: kdebase-4.2.1-konsole-selection.patch +Patch101: kdebase-4.2.1-konsole-layout-regression.patch %ifnarch s390 s390x Requires: eject @@ -127,6 +128,7 @@ %patch2 -p1 -b .home-icon %patch100 -p1 -b .konsole +%patch101 -p1 -b .layout-regression # fix incorrect assumption that we're building in a combined kdebase tree sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt @@ -308,6 +310,10 @@ %changelog +* Mon Mar 09 2009 Than Ngo - 4.2.1-3 +- apply patch to fix regression in konsole, layout regression affecting apps + using the KPart + * Wed Mar 04 2009 Than Ngo - 4.2.1-2 - apply patch to fix regression in konsole, double-click selection works again From jkratoch at fedoraproject.org Mon Mar 9 22:24:19 2009 From: jkratoch at fedoraproject.org (Jan Kratochvil) Date: Mon, 9 Mar 2009 22:24:19 +0000 (UTC) Subject: rpms/gdb/devel gdb-archer.patch,1.5,1.6 gdb.spec,1.331,1.332 Message-ID: <20090309222419.BF84370034@cvs1.fedora.phx.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5181 Modified Files: gdb-archer.patch gdb.spec Log Message: * Mon Mar 9 2009 Jan Kratochvil - 6.8.50.20090302-8 - Archer update to the snapshot: a99e30d08ade4a2df0f943b036cd653bcd12b04d - Fixes internal error on breaking at a multi-locations C++ caller (BZ 488572). gdb-archer.patch: Index: gdb-archer.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gdb-archer.patch 9 Mar 2009 19:31:44 -0000 1.5 +++ gdb-archer.patch 9 Mar 2009 22:23:48 -0000 1.6 @@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ArcherBranchManagement GIT snapshot: -commit ec29855686f2a78d90ebcc63765681249bbbe808 +commit a99e30d08ade4a2df0f943b036cd653bcd12b04d branch `archer' - the merge of branches: archer-jankratochvil-merge-expr @@ -866,7 +866,7 @@ /* Set BLOCK's using member to USING; if needed, allocate memory via diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c -index b23b294..38a17a1 100644 +index b23b294..531c43d 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -191,6 +191,8 @@ static int is_hardware_watchpoint (struct breakpoint *bpt); @@ -1344,7 +1344,65 @@ static int hw_breakpoint_used_count (void) { -@@ -5310,8 +5604,6 @@ create_breakpoints (struct symtabs_and_lines sals, char **addr_string, +@@ -5188,7 +5482,6 @@ expand_line_sal_maybe (struct symtab_and_line sal) + struct symtabs_and_lines expanded; + CORE_ADDR original_pc = sal.pc; + char *original_function = NULL; +- int found; + int i; + + /* If we have explicit pc, don't expand. +@@ -5264,14 +5557,42 @@ expand_line_sal_maybe (struct symtab_and_line sal) + + if (original_pc) + { +- found = 0; ++ /* Find all the other PCs for a line of code with multiple instances ++ (locations). If the instruction is in the middle of an instruction ++ block for source line GDB cannot safely find the same instruction in ++ the other compiled instances of the same source line because the other ++ instances may have been compiled completely differently. ++ ++ The testcase gdb.cp/expand-sals.exp shows that breaking at the return ++ address in a caller of the current frame works for the current ++ instance but the breakpoint cannot catch the point (instruction) where ++ the callee returns in the other compiled instances of this source line. ++ ++ The current implementation will place the breakpoint at the expected ++ returning address of the current instance of the caller. But the ++ other instances will get the breakpoint at the first instruction of ++ the source line - therefore before the call would be made. Another ++ possibility would be to place the breakpoint in the other instances at ++ the start of the next source line. ++ ++ A possible heuristics would compare the instructions length of each of ++ the instances of the current source line and if it matches it would ++ place the breakpoint at the same offset. Unfortunately a mistaken ++ guess would possibly crash the inferior. */ ++ ++ CORE_ADDR best = -1; ++ ++ /* Find the nearest preceding PC and set it to ORIGINAL_PC. */ + for (i = 0; i < expanded.nelts; ++i) +- if (expanded.sals[i].pc == original_pc) +- { +- found = 1; +- break; +- } +- gdb_assert (found); ++ if (expanded.sals[i].pc <= original_pc ++ && (best == -1 || expanded.sals[best].pc < expanded.sals[i].pc)) ++ best = i; ++ ++ if (best == -1) ++ error (_("Cannot find the best address for %s out of the %d locations"), ++ paddr (original_pc), expanded.nelts); ++ ++ expanded.sals[best].pc = original_pc; + } + + return expanded; +@@ -5310,8 +5631,6 @@ create_breakpoints (struct symtabs_and_lines sals, char **addr_string, cond_string, type, disposition, thread, ignore_count, ops, from_tty, enabled); } @@ -1353,7 +1411,7 @@ } /* Parse ARG which is assumed to be a SAL specification possibly -@@ -5637,7 +5929,6 @@ break_command_really (char *arg, char *cond_string, int thread, +@@ -5637,7 +5956,6 @@ break_command_really (char *arg, char *cond_string, int thread, b->ops = ops; b->enable_state = enabled ? bp_enabled : bp_disabled; @@ -1361,7 +1419,7 @@ mention (b); } -@@ -5649,6 +5940,11 @@ break_command_really (char *arg, char *cond_string, int thread, +@@ -5649,6 +5967,11 @@ break_command_really (char *arg, char *cond_string, int thread, discard_cleanups (breakpoint_chain); /* But cleanup everything else. */ do_cleanups (old_chain); @@ -1373,7 +1431,7 @@ } /* Set a breakpoint. -@@ -6131,7 +6427,7 @@ can_use_hardware_watchpoint (struct value *v) +@@ -6131,7 +6454,7 @@ can_use_hardware_watchpoint (struct value *v) || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT && TYPE_CODE (vtype) != TYPE_CODE_ARRAY)) { @@ -1382,7 +1440,7 @@ int len = TYPE_LENGTH (value_type (v)); if (!TARGET_REGION_OK_FOR_HW_WATCHPOINT (vaddr, len)) -@@ -6668,6 +6964,122 @@ catch_ada_exception_command (char *arg, int from_tty, +@@ -6668,6 +6991,122 @@ catch_ada_exception_command (char *arg, int from_tty, from_tty); } @@ -1505,7 +1563,7 @@ /* Implement the "catch assert" command. */ static void -@@ -7134,6 +7546,7 @@ delete_breakpoint (struct breakpoint *bpt) +@@ -7134,6 +7573,7 @@ delete_breakpoint (struct breakpoint *bpt) xfree (bpt->source_file); if (bpt->exec_pathname != NULL) xfree (bpt->exec_pathname); @@ -1513,7 +1571,7 @@ /* Be sure no bpstat's are pointing at it after it's been freed. */ /* FIXME, how can we find all bpstat's? -@@ -8041,6 +8454,56 @@ single_step_breakpoint_inserted_here_p (CORE_ADDR pc) +@@ -8041,6 +8481,56 @@ single_step_breakpoint_inserted_here_p (CORE_ADDR pc) return 0; } @@ -1570,7 +1628,7 @@ /* This help string is used for the break, hbreak, tbreak and thbreak commands. It is defined as a macro to prevent duplication. -@@ -8073,6 +8536,8 @@ static void +@@ -8073,6 +8563,8 @@ static void add_catch_command (char *name, char *docstring, void (*sfunc) (char *args, int from_tty, struct cmd_list_element *command), @@ -1579,7 +1637,7 @@ void *user_data_catch, void *user_data_tcatch) { -@@ -8082,11 +8547,13 @@ add_catch_command (char *name, char *docstring, +@@ -8082,11 +8574,13 @@ add_catch_command (char *name, char *docstring, &catch_cmdlist); set_cmd_sfunc (command, sfunc); set_cmd_context (command, user_data_catch); @@ -1593,7 +1651,7 @@ } void -@@ -8361,36 +8828,50 @@ Set temporary catchpoints to catch events."), +@@ -8361,36 +8855,50 @@ Set temporary catchpoints to catch events."), Catch an exception, when caught.\n\ With an argument, catch only exceptions with the given name."), catch_catch_command, @@ -33471,6 +33529,171 @@ } proc do_tests {} { +diff --git a/gdb/testsuite/gdb.cp/expand-sals.cc b/gdb/testsuite/gdb.cp/expand-sals.cc +new file mode 100644 +index 0000000..6169a05 +--- /dev/null ++++ b/gdb/testsuite/gdb.cp/expand-sals.cc +@@ -0,0 +1,53 @@ ++/* This testcase is part of GDB, the GNU debugger. ++ ++ Copyright (C) 2009 Free Software Foundation, Inc. ++ ++ This file is part of GDB. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++int ++func () ++{ ++ return 42; /* func-line */ ++} ++ ++volatile int global_x; ++ ++class A ++{ ++public: ++ A () ++ { ++ global_x = func (); /* caller-line */ ++ } ++}; ++ ++/* class B is here just to make the `func' calling line above having multiple ++ instances - multiple locations. Template cannot be used as its instances ++ would have different function names which get discarded by GDB ++ expand_line_sal_maybe. */ ++ ++class B : public A ++{ ++}; ++ ++int ++main (void) ++{ ++ A a; ++ B b; ++ ++ return 0; /* exit-line */ ++} +diff --git a/gdb/testsuite/gdb.cp/expand-sals.exp b/gdb/testsuite/gdb.cp/expand-sals.exp +new file mode 100644 +index 0000000..a2631fb +--- /dev/null ++++ b/gdb/testsuite/gdb.cp/expand-sals.exp +@@ -0,0 +1,100 @@ ++# Copyright 2009 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++if { [skip_cplus_tests] } { continue } ++ ++set srcfile expand-sals.cc ++if { [prepare_for_testing expand-sals.exp expand-sals $srcfile {debug c++}] } { ++ return -1 ++} ++if ![runto_main] { ++ return -1 ++} ++ ++gdb_breakpoint [gdb_get_line_number "exit-line"] ++ ++gdb_breakpoint [gdb_get_line_number "func-line"] ++gdb_continue_to_breakpoint "func" ".*func-line.*" ++ ++gdb_test "up" "caller-line.*" ++ ++# PC should not be at the boundary of source lines to make the original bug ++# exploitable. ++ ++set test "p/x \$pc" ++set pc {} ++gdb_test_multiple $test $test { ++ -re "\\$\[0-9\]+ = (0x\[0-9a-f\]+)\r\n$gdb_prompt $" { ++ set pc $expect_out(1,string) ++ pass $test ++ } ++} ++ ++set test "info line" ++set end {} ++gdb_test_multiple $test $test { ++ -re "Line \[0-9\]+ of .* starts at address 0x\[0-9a-f\]+.* and ends at (0x\[0-9a-f\]+).*\\.\r\n$gdb_prompt $" { ++ set end $expect_out(1,string) ++ pass $test ++ } ++} ++ ++set test "caller line has trailing code" ++if {$pc != $end} { ++ pass $test ++} else { ++ fail $test ++} ++ ++# Original problem was an internal error here. Still sanity multiple locations ++# were found at this code place as otherwise this test would not test anything. ++set test "break" ++gdb_test_multiple $test $test { ++ -re "Breakpoint \[0-9\]+ at .*, line \[0-9\]+\\. \\(\[2-9\] locations\\)\r\n$gdb_prompt $" { ++ pass $test ++ } ++ -re "Breakpoint \[0-9\]+ at .*, line \[0-9\]+\\.\r\n$gdb_prompt $" { ++ # It just could not be decided if GDB is OK by this testcase. ++ setup_xfail *-*-* ++ fail $test ++ return 0 ++ } ++} ++ ++gdb_continue_to_breakpoint "caller" ".*caller-line.*" ++ ++# Test GDB caught this return call and not the next one through B::B() ++gdb_test "bt" \ ++ "#0 \[^\r\n\]* A \[^\r\n\]*\r\n#1 \[^\r\n\]* main \[^\r\n\]*" \ ++ "bt from A" ++ ++gdb_continue_to_breakpoint "next caller instance" ".*caller-line.*" ++ ++# Test that GDB caught now already A through B::B() in the other instance. ++# As discussed in GDB expand_line_sal_maybe it would more match the original ++# instance behavior to catch here the `func' breakpoint and catch the ++# multiple-locations breakpoint only during the call return. This is not the ++# case, expecting here to catch the breakpoint before the call happens. ++ ++gdb_test "bt" \ ++ "#0 \[^\r\n\]* A \[^\r\n\]*\r\n#1 \[^\r\n\]* B \[^\r\n\]*\r\n#2 \[^\r\n\]* main \[^\r\n\]*" \ ++ "bt from B before the call" ++ ++gdb_continue_to_breakpoint "next caller func" ".*func-line.*" ++ ++# Verify GDB really could not catch the originally intended point of the return ++# from func. ++ ++gdb_continue_to_breakpoint "uncaught return" ".*exit-line.*" diff --git a/gdb/testsuite/gdb.cp/gdb1355.exp b/gdb/testsuite/gdb.cp/gdb1355.exp index 77687a6..66d16cf 100644 --- a/gdb/testsuite/gdb.cp/gdb1355.exp Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.331 retrieving revision 1.332 diff -u -r1.331 -r1.332 --- gdb.spec 9 Mar 2009 19:31:45 -0000 1.331 +++ gdb.spec 9 Mar 2009 22:23:48 -0000 1.332 @@ -13,7 +13,7 @@ # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 7%{?_with_upstream:.upstream}%{?dist} +Release: 8%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -851,6 +851,10 @@ %endif %changelog +* Mon Mar 9 2009 Jan Kratochvil - 6.8.50.20090302-8 +- Archer update to the snapshot: a99e30d08ade4a2df0f943b036cd653bcd12b04d +- Fixes internal error on breaking at a multi-locations C++ caller (BZ 488572). + * Mon Mar 9 2009 Jan Kratochvil - 6.8.50.20090302-7 - Archer update to the snapshot: ec29855686f2a78d90ebcc63765681249bbbe808 - Temporarily place libstdc++ pretty printers in this gdb.rpm. From jkeating at fedoraproject.org Mon Mar 9 22:24:46 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Mon, 9 Mar 2009 22:24:46 +0000 (UTC) Subject: rpms/pungi/devel sources,1.62,1.63 Message-ID: <20090309222446.5964F70034@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/pungi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5402 Modified Files: sources Log Message: fix tarball Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 9 Mar 2009 17:58:34 -0000 1.62 +++ sources 9 Mar 2009 22:24:16 -0000 1.63 @@ -1 +1 @@ -7daa38de3044c989b9dcec0fc86c5e25 pungi-2.0.11.tar.bz2 +995a39e050c154c27f9749730877a5dc pungi-2.0.11.tar.bz2 From petersen at fedoraproject.org Mon Mar 9 22:28:54 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 9 Mar 2009 22:28:54 +0000 (UTC) Subject: rpms/alex/devel alex.spec,1.12,1.13 Message-ID: <20090309222854.296FC70034@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/extras/rpms/alex/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6631 Modified Files: alex.spec Log Message: update arch list and bring closer to cabal2spec-0.12 Index: alex.spec =================================================================== RCS file: /cvs/extras/rpms/alex/devel/alex.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- alex.spec 24 Feb 2009 00:31:01 -0000 1.12 +++ alex.spec 9 Mar 2009 22:28:23 -0000 1.13 @@ -1,18 +1,20 @@ # ghc does not emit debug information -%define debug_package %{nil} +%global debug_package %{nil} Name: alex Version: 2.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A lexer generator for Haskell Group: Development/Tools License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/alex -Source: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz +Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: i386 x86_64 ppc -BuildRequires: autoconf ghc docbook-style-xsl libxslt +# fedora ghc archs: +ExclusiveArch: %{ix86} x86_64 ppc alpha +BuildRequires: ghc +BuildRequires: autoconf docbook-style-xsl libxslt %description Alex is a tool for generating lexical analysers in Haskell, given a @@ -28,30 +30,33 @@ %cabal_configure %cabal build -pushd doc +cd doc autoreconf ./configure --prefix=%{_prefix} --libdir=%{_libdir} make html -popd +cd - %install -rm -rf ${RPM_BUILD_ROOT} +rm -rf $RPM_BUILD_ROOT %cabal_install %clean -rm -rf ${RPM_BUILD_ROOT} +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ANNOUNCE LICENSE README TODO doc/alex examples -%{_bindir}/alex -%{_datadir}/alex-%{version} +%{_bindir}/%{name} +%{_datadir}/%{name}-%{version} %changelog +* Tue Mar 10 2009 Jens Petersen - 2.3.1-3 +- update arch list and bring closer to cabal2spec-0.12 + * Mon Feb 23 2009 Fedora Release Engineering - 2.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pwouters at fedoraproject.org Mon Mar 9 22:35:14 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Mon, 9 Mar 2009 22:35:14 +0000 (UTC) Subject: rpms/dnssec-conf/devel dnssec-conf.spec,1.6,1.7 Message-ID: <20090309223514.DD24D70034@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/dnssec-conf/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8272 Modified Files: dnssec-conf.spec Log Message: * Mon Mar 09 2009 Paul Wouters - 1.17-2 - Fix build for /etc/sysconfig/dnssec Index: dnssec-conf.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/devel/dnssec-conf.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dnssec-conf.spec 9 Mar 2009 20:24:14 -0000 1.6 +++ dnssec-conf.spec 9 Mar 2009 22:34:44 -0000 1.7 @@ -1,7 +1,7 @@ Summary: DNSSEC and DLV configuration and priming tool Name: dnssec-conf Version: 1.17 -Release: 1 +Release: 2 License: GPLv2+ Url: http://www.xelerance.com/software/dnssec-conf/ Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz @@ -32,7 +32,8 @@ %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install -install -m 0755 packaging/fedora/dnssec.sysconfig %{_sysconfdir}/dnssec +install -d 0755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig +install -m 0644 packaging/fedora/dnssec.sysconfig ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/dnssec %clean rm -rf ${RPM_BUILD_ROOT} @@ -46,11 +47,15 @@ %attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/testing %attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/harvest %attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/dlv +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/dnssec %{_bindir}/dnskey-pull %{_sbindir}/dnssec-configure %{_mandir}/*/* %changelog +* Mon Mar 09 2009 Paul Wouters - 1.17-2 +- Fix build for /etc/sysconfig/dnssec + * Mon Mar 09 2009 Paul Wouters - 1.17-1 - Upgraded to 1.17. This adds better initscript support and fixes a bug when named/unbound were not installed (rhbug 488685) From than at fedoraproject.org Mon Mar 9 22:36:18 2009 From: than at fedoraproject.org (Than Ngo) Date: Mon, 9 Mar 2009 22:36:18 +0000 (UTC) Subject: rpms/kdelibs/devel kdelibs-4.2.1-css.patch, NONE, 1.1 kdelibs.spec, 1.452, 1.453 Message-ID: <20090309223618.4AB1170034@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8869 Modified Files: kdelibs.spec Added Files: kdelibs-4.2.1-css.patch Log Message: apply patch to fix issue in CSS style that causes konqueror shows a blank page kdelibs-4.2.1-css.patch: --- NEW FILE kdelibs-4.2.1-css.patch --- --- kdelibs/khtml/ecma/kjs_css.cpp 2009/02/07 18:21:18 922888 +++ 4.2/kdelibs/khtml/ecma/kjs_css.cpp 2009/03/09 14:38:22 937328 @@ -222,12 +222,12 @@ CSSStyleDeclarationImpl &styleDecl = *m_impl; if (propertyName == "cssText") { - styleDecl.setCssText(value->toString(exec).domString()); + styleDecl.setCssText(valueToStringWithNullCheck(exec, value)); } else { bool pxSuffix; QString prop = cssPropertyName(propertyName, &pxSuffix); - QString propvalue = value->toString(exec).qstring(); + QString propvalue = valueToStringWithNullCheck(exec, value).string(); if (pxSuffix) propvalue += QLatin1String("px"); Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.452 retrieving revision 1.453 diff -u -r1.452 -r1.453 --- kdelibs.spec 4 Mar 2009 19:12:01 -0000 1.452 +++ kdelibs.spec 9 Mar 2009 22:35:47 -0000 1.453 @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.1 -Release: 4%{?dist} +Release: 5%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -85,6 +85,7 @@ # upstream # 4.2 branch +Patch100: kdelibs-4.2.1-css.patch # 4.3 branch Patch200: kdelibs-4.1.96-AllowExternalPaths.patch @@ -221,6 +222,7 @@ # upstream patches # 4.2 +%patch100 -p1 -b .css-style # 4.3 %patch200 -p1 -b .AllowExternalPaths @@ -397,6 +399,9 @@ %changelog +* Mon Mar 09 2009 Than Ngo - 4.2.1-5 +- apply patch to fix issue in CSS style that causes konqueror shows a blank page + * Wed Mar 05 2009 Rex Dieter - 4.2.1-4 - move designer plugins to main/runtime (#487622) From jkeating at fedoraproject.org Mon Mar 9 22:37:27 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Mon, 9 Mar 2009 22:37:27 +0000 (UTC) Subject: rpms/pungi/devel sources,1.63,1.64 Message-ID: <20090309223727.D606F70034@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/pungi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9312 Modified Files: sources Log Message: fix tarball Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 9 Mar 2009 22:24:16 -0000 1.63 +++ sources 9 Mar 2009 22:36:57 -0000 1.64 @@ -1 +1 @@ -995a39e050c154c27f9749730877a5dc pungi-2.0.11.tar.bz2 +fdc9eba0f1f6ebb3de897859df638972 pungi-2.0.11.tar.bz2 From whot at fedoraproject.org Mon Mar 9 22:45:09 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Mon, 9 Mar 2009 22:45:09 +0000 (UTC) Subject: rpms/system-config-keyboard/F-10 system-config-keyboard-1.2.15-nolayout.patch, NONE, 1.1 system-config-keyboard.spec, 1.42, 1.43 Message-ID: <20090309224509.9069570034@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/system-config-keyboard/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11536 Modified Files: system-config-keyboard.spec Added Files: system-config-keyboard-1.2.15-nolayout.patch Log Message: * Tue Mar 10 2009 Peter Hutterer 1.2.15-5 - system-config-keyboard-1.2.15-nolayout.patch: insert a default ServerLayout section if none is found. (#484488) system-config-keyboard-1.2.15-nolayout.patch: --- NEW FILE system-config-keyboard-1.2.15-nolayout.patch --- Create a default layout if none is given before inserting the core keyboard. Index: keyboard_backend.py =================================================================== --- system-config-keyboard-1.2.15/src/keyboard_backend.py (revision 569) +++ system-config-keyboard-1.2.15/src/keyboard_backend.py (working copy) @@ -44,6 +44,9 @@ keyboard.options.insert (xf86config.XF86Option("XkbModel", "pc101")) keyboard.options.insert (xf86config.XF86Option("XkbLayout", "us")) xconfig.input.insert (keyboard) + if len(xconfig.layout) == 0: + xconfig.layout.insert(xf86config.XF86ConfLayout()) + xconfig.layout[0].inputs.insert (xf86config.XF86ConfInputref ("Keyboard0", "CoreKeyboard")); found = 0 Index: system-config-keyboard.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-keyboard/F-10/system-config-keyboard.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- system-config-keyboard.spec 23 Oct 2008 20:32:57 -0000 1.42 +++ system-config-keyboard.spec 9 Mar 2009 22:44:39 -0000 1.43 @@ -1,6 +1,6 @@ Name: system-config-keyboard Version: 1.2.15 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A graphical interface for modifying the keyboard Group: System Environment/Base @@ -10,6 +10,7 @@ Patch0: system-config-keyboard-1.2.15-fixcomments.patch Patch1: system-config-keyboard-1.2.15-beenset.patch Patch2: system-config-keyboard-1.2.15-reconfig.patch +Patch3: system-config-keyboard-1.2.15-nolayout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -36,6 +37,7 @@ %patch0 -p0 -b .fixcomments %patch1 -p1 -b .beenset %patch2 -p1 +%patch3 -p1 %build @@ -84,6 +86,10 @@ %changelog +* Tue Mar 10 2009 Peter Hutterer 1.2.15-5 +- system-config-keyboard-1.2.15-nolayout.patch: insert a default ServerLayout + section if none is found. (#484488) + * Thu Oct 23 2008 Chris Lumens 1.2.15-4 - Fix a traceback when running under firstboot reconfig mode. From dcantrel at fedoraproject.org Mon Mar 9 23:01:37 2009 From: dcantrel at fedoraproject.org (David Cantrell) Date: Mon, 9 Mar 2009 23:01:37 +0000 (UTC) Subject: rpms/dhcp/devel .cvsignore, 1.23, 1.24 dhcp.spec, 1.244, 1.245 sources, 1.24, 1.25 README.ldap, 1.7, NONE dhcp-4.1.0-ldap-configuration.patch, 1.1, NONE dhcp.schema, 1.4, NONE dhcpd-conf-to-ldap, 1.9, NONE draft-ietf-dhc-ldap-schema-01.txt, 1.5, NONE get-ldap-patch.sh, 1.3, NONE Message-ID: <20090309230137.C226370034@cvs1.fedora.phx.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/dhcp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16745 Modified Files: .cvsignore dhcp.spec sources Removed Files: README.ldap dhcp-4.1.0-ldap-configuration.patch dhcp.schema dhcpd-conf-to-ldap draft-ietf-dhc-ldap-schema-01.txt get-ldap-patch.sh Log Message: * Mon Mar 09 2009 David Cantrell - 12:4.1.0-11 - Use LDAP configuration patch from upstream tarball Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dhcp/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 6 Jan 2009 23:46:50 -0000 1.23 +++ .cvsignore 9 Mar 2009 23:01:06 -0000 1.24 @@ -1 +1,2 @@ dhcp-4.1.0.tar.gz +ldap-for-dhcp-4.1.0.tar.gz Index: dhcp.spec =================================================================== RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- dhcp.spec 6 Mar 2009 00:57:04 -0000 1.244 +++ dhcp.spec 9 Mar 2009 23:01:07 -0000 1.245 @@ -4,7 +4,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.1.0 -Release: 10%{?dist} +Release: 11%{?dist} # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # dcantrell maintaining the package) made incorrect use of the epoch and # that's why it is at 12 now. It should have never been used, but it was. @@ -14,36 +14,31 @@ Group: System Environment/Daemons URL: http://isc.org/products/DHCP/ Source0: ftp://ftp.isc.org/isc/%{name}/%{name}-%{version}.tar.gz -Source1: dhcpd.init -Source2: dhcrelay.init -Source3: README.ldap -Source4: draft-ietf-dhc-ldap-schema-01.txt -Source5: dhcpd-conf-to-ldap -Source8: dhclient-script -Source9: dhcp.schema -Source10: get-ldap-patch.sh -Source11: README.dhclient.d +Source1: http://dcantrel.fedorapeople.org/dhcp/ldap-patch/ldap-for-dhcp-%{version}.tar.gz +Source2: dhcpd.init +Source3: dhcrelay.init +Source4: dhclient-script +Source5: README.dhclient.d Patch0: %{name}-4.1.0-errwarn-message.patch -Patch1: %{name}-4.1.0-ldap-configuration.patch -Patch2: %{name}-4.1.0-memory.patch -Patch3: %{name}-4.1.0-options.patch -Patch4: %{name}-4.1.0-release-by-ifup.patch -Patch5: %{name}-4.1.0-dhclient-decline-backoff.patch -Patch6: %{name}-4.1.0-unicast-bootp.patch -Patch7: %{name}-4.1.0-failover-ports.patch -Patch8: %{name}-4.1.0-dhclient-usage.patch -Patch9: %{name}-4.1.0-default-requested-options.patch -Patch10: %{name}-4.1.0-xen-checksum.patch -Patch11: %{name}-4.1.0-dhclient-anycast.patch -Patch12: %{name}-4.1.0-manpages.patch -Patch13: %{name}-4.1.0-paths.patch -Patch14: %{name}-4.1.0-CLOEXEC.patch -Patch15: %{name}-4.1.0-inherit-leases.patch -Patch16: %{name}-4.1.0-garbage-chars.patch -Patch17: %{name}-4.1.0-port-validation.patch -Patch18: %{name}-4.1.0-invalid-dhclient-conf.patch -Patch19: %{name}-4.1.0-missing-ipv6-not-fatal.patch +Patch1: %{name}-4.1.0-memory.patch +Patch2: %{name}-4.1.0-options.patch +Patch3: %{name}-4.1.0-release-by-ifup.patch +Patch4: %{name}-4.1.0-dhclient-decline-backoff.patch +Patch5: %{name}-4.1.0-unicast-bootp.patch +Patch6: %{name}-4.1.0-failover-ports.patch +Patch7: %{name}-4.1.0-dhclient-usage.patch +Patch8: %{name}-4.1.0-default-requested-options.patch +Patch9: %{name}-4.1.0-xen-checksum.patch +Patch10: %{name}-4.1.0-dhclient-anycast.patch +Patch11: %{name}-4.1.0-manpages.patch +Patch12: %{name}-4.1.0-paths.patch +Patch13: %{name}-4.1.0-CLOEXEC.patch +Patch14: %{name}-4.1.0-inherit-leases.patch +Patch15: %{name}-4.1.0-garbage-chars.patch +Patch16: %{name}-4.1.0-port-validation.patch +Patch17: %{name}-4.1.0-invalid-dhclient-conf.patch +Patch18: %{name}-4.1.0-missing-ipv6-not-fatal.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf @@ -100,96 +95,93 @@ %prep %setup -q +%setup -T -D -a 1 + +# Add in LDAP support +%{__patch} -p1 < ldap-for-dhcp-%{version}/%{name}-%{version}-ldap.patch # Replace the standard ISC warning message about requesting help with an # explanation that this is a patched build of ISC DHCP and bugs should be # reported through bugzilla.redhat.com %patch0 -p1 -# Add support for dhcpd.conf data in LDAP -# NOTE: Use get-ldap-patch.sh to pull down latest LDAP patch and then modify -# it for this package. -%patch1 -p1 - # Fix memory alignment and initialization problems in common/packet.c # Fix buffer overflow in minires library # Init struct sock_prog in common/lpf.c to NULL -%patch2 -p1 +%patch1 -p1 # Add more dhclient options (-I, -B, -H, -F, -timeout, -V, and -R) -%patch3 -p1 +%patch2 -p1 # Handle releasing interfaces requested by /sbin/ifup # pid file is assumed to be /var/run/dhclient-$interface.pid -%patch4 -p1 +%patch3 -p1 # If we receive a DHCP offer in dhclient and it's DECLINEd in dhclient-script, # backoff for an amount of time before trying again -%patch5 -p1 +%patch4 -p1 # Support unicast BOOTP for IBM pSeries systems (and maybe others) # (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #19146]) -%patch6 -p1 +%patch5 -p1 # Use the following IANA-registered failover ports: # dhcp-failover 647/tcp # dhcp-failover 647/udp # dhcp-failover 847/tcp # dhcp-failover 847/udp -%patch7 -p1 +%patch6 -p1 # Update the usage screen for dhclient(8) indicating new options # Use printf() rather than log_info() to display the information # Also, return EXIT_FAILURE when the usage() screen is displayed (stop parsing) -%patch8 -p1 +%patch7 -p1 # Add NIS domain, NIS servers, and NTP servers to the list of default # requested DHCP options -%patch9 -p1 +%patch8 -p1 # Handle Xen partial UDP checksums -%patch10 -p1 +%patch9 -p1 # Add anycast support to dhclient (for OLPC) -%patch11 -p1 +%patch10 -p1 # Patch man page contents -%patch12 -p1 +%patch11 -p1 # Change paths to conform to our standards -%patch13 -p1 +%patch12 -p1 # Make sure all open file descriptors are closed-on-exec for SELinux (#446632) # (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #19148]) -%patch14 -p1 +%patch13 -p1 # If we have an active lease, do not down the interface (#453982) -%patch15 -p1 +%patch14 -p1 # Fix 'garbage in format string' error (#450042) -%patch16 -p1 +%patch15 -p1 # Validate port numbers specified for dhclient, dhcpd, and dhcrelay # to make sure they are within 1-65535, inclusive. (#438149) # (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #18695]) -%patch17 -p1 +%patch16 -p1 # The sample dhclient.conf should say 'supersede domain-search' (#467955) # (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #19147]) -%patch18 -p1 +%patch17 -p1 # If the ipv6 kernel module is missing, do not segfault # (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #19367] -%patch19 -p1 +%patch18 -p1 # Copy in documentation and example scripts for LDAP patch to dhcpd -%{__install} -p -m 0644 %{SOURCE3} . -%{__install} -p -m 0644 %{SOURCE4} doc/ -%{__install} -p -m 0755 %{SOURCE5} contrib/ +%{__install} -p -m 0755 ldap-for-dhcp-%{version}/dhcpd-conf-to-ldap contrib/ # Copy in the Fedora/RHEL dhclient script -%{__install} -p -m 0755 %{SOURCE8} client/scripts/linux -%{__install} -p -m 0644 %{SOURCE11} . +%{__install} -p -m 0755 %{SOURCE4} client/scripts/linux +%{__install} -p -m 0644 %{SOURCE5} . # Ensure we don't pick up Perl as a dependency from the scripts and modules # in the contrib directory (we copy this to /usr/share/doc in the final @@ -272,8 +264,8 @@ # Install init scripts %{__mkdir} -p %{buildroot}%{_initrddir} -%{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/dhcpd -%{__install} -p -m 0755 %{SOURCE2} %{buildroot}%{_initrddir}/dhcrelay +%{__install} -p -m 0755 %{SOURCE2} %{buildroot}%{_initrddir}/dhcpd +%{__install} -p -m 0755 %{SOURCE3} %{buildroot}%{_initrddir}/dhcrelay # Start empty lease databases %{__mkdir} -p %{buildroot}%{_localstatedir}/lib/dhcpd/ @@ -311,7 +303,8 @@ # Install dhcp.schema for LDAP configuration %{__mkdir} -p %{buildroot}%{_sysconfdir}/openldap/schema -%{__install} -p -m 0644 -D %{SOURCE9} %{buildroot}%{_sysconfdir}/openldap/schema +%{__install} -p -m 0644 -D ldap-for-dhcp-%{version}/dhcp.schema \ + %{buildroot}%{_sysconfdir}/openldap/schema # Install empty directory for dhclient.d scripts %{__mkdir} -p %{buildroot}%{_sysconfdir}/dhcp/dhclient.d @@ -369,8 +362,9 @@ %files %defattr(-,root,root,-) -%doc LICENSE README README.ldap RELNOTES dhcpd.conf.sample -%doc doc/IANA-arp-parameters doc/api+protocol doc/*.txt __fedora_contrib/* +%doc LICENSE README ldap-for-dhcp-%{version}/README.ldap +%doc RELNOTES dhcpd.conf.sample doc/IANA-arp-parameters doc/api+protocol +%doc doc/*.txt __fedora_contrib/* ldap-for-dhcp-%{version}/*.txt %dir %{_localstatedir}/lib/dhcpd %dir %{_sysconfdir}/dhcp %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/dhcpd/dhcpd.leases @@ -419,6 +413,9 @@ %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz %changelog +* Mon Mar 09 2009 David Cantrell - 12:4.1.0-11 +- Use LDAP configuration patch from upstream tarball + * Thu Mar 05 2009 David Cantrell - 12:4.1.0-10 - restorecon fixes for /etc/localtime and /etc/resolv.conf (#488470) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dhcp/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 6 Jan 2009 23:46:51 -0000 1.24 +++ sources 9 Mar 2009 23:01:07 -0000 1.25 @@ -1 +1,2 @@ 1fffed2e8c3d67b111316d6a9b33db7a dhcp-4.1.0.tar.gz +782cf7358bab53fd564895a253f93fff ldap-for-dhcp-4.1.0.tar.gz --- README.ldap DELETED --- --- dhcp-4.1.0-ldap-configuration.patch DELETED --- --- dhcp.schema DELETED --- --- dhcpd-conf-to-ldap DELETED --- --- draft-ietf-dhc-ldap-schema-01.txt DELETED --- --- get-ldap-patch.sh DELETED --- From toshio at fedoraproject.org Mon Mar 9 23:38:13 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Mon, 9 Mar 2009 23:38:13 +0000 (UTC) Subject: rpms/python-fedora/devel .cvsignore, 1.27, 1.28 python-fedora.spec, 1.35, 1.36 sources, 1.28, 1.29 Message-ID: <20090309233813.8F52070034@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28347 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Mon Mar 9 2009 Toshio Kuratomi - 0.3.11-1 - readd the old jsonfasproviders. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 7 Mar 2009 07:56:01 -0000 1.27 +++ .cvsignore 9 Mar 2009 23:37:41 -0000 1.28 @@ -1 +1 @@ -python-fedora-0.3.10.tar.gz +python-fedora-0.3.11.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- python-fedora.spec 7 Mar 2009 08:04:45 -0000 1.35 +++ python-fedora.spec 9 Mar 2009 23:37:42 -0000 1.36 @@ -1,7 +1,7 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.10 +Version: 0.3.11 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -51,13 +51,15 @@ %clean rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc README COPYING AUTHORS ChangeLog doc %{python_sitelib}/* %changelog +* Mon Mar 9 2009 Toshio Kuratomi - 0.3.11-1 +- readd the old jsonfasproviders. + * Fri Mar 6 2009 Toshio Kuratomi - 0.3.10-1 - CSRF fixes and django authentication provider. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 7 Mar 2009 07:56:01 -0000 1.28 +++ sources 9 Mar 2009 23:37:43 -0000 1.29 @@ -1 +1 @@ -7e20b69e07c3f1eab3e6a99e1d009f3b python-fedora-0.3.10.tar.gz +b19ddcab1718934d9a3d7e88c0d295f3 python-fedora-0.3.11.tar.gz From lutter at fedoraproject.org Mon Mar 9 23:41:19 2009 From: lutter at fedoraproject.org (David Lutterkort) Date: Mon, 9 Mar 2009 23:41:19 +0000 (UTC) Subject: rpms/augeas/devel .cvsignore, 1.15, 1.16 augeas.spec, 1.15, 1.16 sources, 1.15, 1.16 Message-ID: <20090309234119.A920770034@cvs1.fedora.phx.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29517 Modified Files: .cvsignore augeas.spec sources Log Message: Version 0.4.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 3 Mar 2009 00:17:40 -0000 1.15 +++ .cvsignore 9 Mar 2009 23:40:48 -0000 1.16 @@ -1 +1 @@ -augeas-0.4.1.tar.gz +augeas-0.4.2.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/devel/augeas.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- augeas.spec 3 Mar 2009 00:17:40 -0000 1.15 +++ augeas.spec 9 Mar 2009 23:40:49 -0000 1.16 @@ -1,5 +1,5 @@ Name: augeas -Version: 0.4.1 +Version: 0.4.2 Release: 1%{?dist} Summary: A library for changing configuration files @@ -9,7 +9,7 @@ Source0: http://augeas.net/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: readline-devel +BuildRequires: readline-devel libselinux-devel Requires: %{name}-libs = %{version}-%{release} %description @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/augeas.pc %changelog +* Mon Mar 9 2009 David Lutterkort - 0.4.2-1 +- New version + * Fri Feb 27 2009 David Lutterkort - 0.4.1-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 3 Mar 2009 00:17:40 -0000 1.15 +++ sources 9 Mar 2009 23:40:49 -0000 1.16 @@ -1 +1 @@ -2cf261ed428d51c24171d0bc39f9ee6a augeas-0.4.1.tar.gz +bceb3a4a1aafde204428ec6421f83900 augeas-0.4.2.tar.gz From thm at fedoraproject.org Mon Mar 9 23:47:48 2009 From: thm at fedoraproject.org (Thomas Moschny) Date: Mon, 9 Mar 2009 23:47:48 +0000 (UTC) Subject: rpms/lmms/devel README.fedora, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.2, 1.3 lmms.spec, 1.3, 1.4 sources, 1.3, 1.4 lmms-0.4.2-gcc44.patch, 1.1, NONE Message-ID: <20090309234748.BAFB670034@cvs1.fedora.phx.redhat.com> Author: thm Update of /cvs/pkgs/rpms/lmms/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31744/devel Modified Files: .cvsignore import.log lmms.spec sources Added Files: README.fedora Removed Files: lmms-0.4.2-gcc44.patch Log Message: Update to 0.4.3. --- NEW FILE README.fedora --- For legal reasons, the following files have been removed from the original tarfile: lmms-0.4.3/data/projects/tutorials/editing_note_volumes.mmp lmms-0.4.3/data/projects/covers/J.S.Bach-Preludium_and_Fugue_A-Minor.mmpz lmms-0.4.3/data/projects/covers/MonkeyIsland1-Intro.mmpz lmms-0.4.3/data/projects/oldstuff/SharkyX-DeadManDancing.mmp lmms-0.4.3/data/projects/oldstuff/MaxFellner-Ease.mmp lmms-0.4.3/data/projects/oldstuff/time_machine.mmp lmms-0.4.3/data/projects/oldstuff/Mart-Dirt_Track.mmp lmms-0.4.3/data/projects/oldstuff/1st.mmp lmms-0.4.3/data/projects/demos/Zvonsully-RaceTheZBeat.mmp lmms-0.4.3/data/projects/demos/beat_collection.mmp lmms-0.4.3/data/projects/demos/demo5.mmp lmms-0.4.3/data/projects/demos/newFangled.mmpz lmms-0.4.3/data/projects/demos/TobyDox-Crystallo.mmp lmms-0.4.3/data/projects/demos/loop_collection.mmp lmms-0.4.3/data/projects/demos/demo1.mmp lmms-0.4.3/data/projects/demos/demo4.mmp lmms-0.4.3/data/projects/demos/demo3.mmp lmms-0.4.3/data/projects/demos/lb302quick.mmpz lmms-0.4.3/data/projects/demos/demo2.mmp lmms-0.4.3/data/projects/demos/demo6.mmp lmms-0.4.3/data/projects/demos/some_basslines.mmp lmms-0.4.3/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp lmms-0.4.3/data/projects/cool_songs/MysthR-Living.mmpz lmms-0.4.3/data/projects/cool_songs/Siegel-DreamWave.mmp lmms-0.4.3/data/projects/cool_songs/Silva-ElvesCall.mmp lmms-0.4.3/data/projects/cool_songs/TobyDox-Psycho.mmp lmms-0.4.3/data/projects/cool_songs/Chris-RaveRiff.mmpz lmms-0.4.3/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz lmms-0.4.3/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp lmms-0.4.3/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz lmms-0.4.3/data/projects/cool_songs/Chris-HorizonRemix.mmp lmms-0.4.3/data/projects/cool_songs/j1m-DingDong.mmp lmms-0.4.3/data/projects/cool_songs/Djeezus-BeatRolls.mmp lmms-0.4.3/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp lmms-0.4.3/data/projects/cool_songs/BlueWolf-DreamTravel.mmp lmms-0.4.3/data/projects/cool_songs/Marfil-MarfilDrum01.mmp lmms-0.4.3/data/projects/cool_songs/Malex-Horizon4.mmp lmms-0.4.3/data/projects/cool_songs/StrictProduction-Underline.mmp lmms-0.4.3/data/projects/cool_songs/Skiessi-TurningPoint.mmpz lmms-0.4.3/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp lmms-0.4.3/data/projects/cool_songs/SharkyX-Experiments.mmp lmms-0.4.3/data/projects/cool_songs/Skiessi-Onion.mmpz lmms-0.4.3/data/projects/cool_songs/TobyDox-Confused.mmp lmms-0.4.3/data/projects/cool_songs/Siegel-SpeedTrack.mmp lmms-0.4.3/data/projects/cool_songs/Djeezus-Oscilisous.mmp lmms-0.4.3/data/samples/latin/latin_brass01.ogg lmms-0.4.3/data/samples/latin/latin_guitar03.ogg lmms-0.4.3/data/samples/latin/latin_guitar01.ogg lmms-0.4.3/data/samples/latin/latin_guitar02.ogg lmms-0.4.3/data/samples/shapes/technosynth3.wav lmms-0.4.3/data/samples/shapes/technosynth1.wav lmms-0.4.3/data/samples/shapes/technosynth2.wav lmms-0.4.3/data/samples/shapes/additive2.wav lmms-0.4.3/data/samples/shapes/harmonics.wav lmms-0.4.3/data/samples/shapes/micro.wav lmms-0.4.3/data/samples/shapes/bunglist2.wav lmms-0.4.3/data/samples/shapes/bunglist3.wav lmms-0.4.3/data/samples/shapes/saw+sine.wav lmms-0.4.3/data/samples/shapes/smooth_inv_saw2.ogg lmms-0.4.3/data/samples/shapes/bunglist.wav lmms-0.4.3/data/samples/shapes/smooth_inv_saw.ogg lmms-0.4.3/data/samples/shapes/roundbass.wav lmms-0.4.3/data/samples/shapes/bunglist9.wav lmms-0.4.3/data/samples/shapes/bunglist7.wav lmms-0.4.3/data/samples/shapes/low_sine.wav lmms-0.4.3/data/samples/shapes/bunglist4.wav lmms-0.4.3/data/samples/shapes/bunglist5.wav lmms-0.4.3/data/samples/shapes/sine_dist.ogg lmms-0.4.3/data/samples/shapes/technobass.wav lmms-0.4.3/data/samples/shapes/roundsaw.ogg lmms-0.4.3/data/samples/shapes/technosynth6.wav lmms-0.4.3/data/samples/shapes/smooth_inv_saw_dist.ogg lmms-0.4.3/data/samples/shapes/bunglist6.wav lmms-0.4.3/data/samples/shapes/moog.wav lmms-0.4.3/data/samples/shapes/bunglist8.wav lmms-0.4.3/data/samples/shapes/additive.wav lmms-0.4.3/data/samples/shapes/technosynth5.wav lmms-0.4.3/data/samples/shapes/technosynth4.wav lmms-0.4.3/data/samples/shapes/vowel_a.wav lmms-0.4.3/data/samples/shapes/vowel_u.wav lmms-0.4.3/data/samples/basses/bass_punch01.ogg lmms-0.4.3/data/samples/basses/bass_acid01.ogg lmms-0.4.3/data/samples/basses/rave_bass02.ogg lmms-0.4.3/data/samples/basses/bass_hard02.ogg lmms-0.4.3/data/samples/basses/rave_bass01.ogg lmms-0.4.3/data/samples/basses/bass_hard01.ogg lmms-0.4.3/data/samples/basses/synth_acid02.ogg lmms-0.4.3/data/samples/basses/horror_bass01.ogg lmms-0.4.3/data/samples/basses/matrix1000_pluck01.ogg lmms-0.4.3/data/samples/basses/bass01.ogg lmms-0.4.3/data/samples/basses/bass_acid02.ogg lmms-0.4.3/data/samples/basses/synth_acid01.ogg lmms-0.4.3/data/samples/basses/techno_synth01.ogg lmms-0.4.3/data/samples/basses/rave_bass04.ogg lmms-0.4.3/data/samples/basses/rave_bass03.ogg lmms-0.4.3/data/samples/effects/explode01.ogg lmms-0.4.3/data/samples/effects/warp01.ogg lmms-0.4.3/data/samples/effects/filter_sweep01.ogg lmms-0.4.3/data/samples/effects/start01.ogg lmms-0.4.3/data/samples/effects/wind_chimes01.ogg lmms-0.4.3/data/samples/effects/scratch01.ogg lmms-0.4.3/data/samples/effects/warp02.ogg lmms-0.4.3/data/samples/effects/chroma_sound_effect01.ogg lmms-0.4.3/data/samples/effects/stop01.ogg lmms-0.4.3/data/samples/effects/start02.ogg lmms-0.4.3/data/samples/beats/house_loop01.ogg lmms-0.4.3/data/samples/beats/break02.ogg lmms-0.4.3/data/samples/beats/909beat01.ogg lmms-0.4.3/data/samples/beats/break03.ogg lmms-0.4.3/data/samples/beats/electro_beat02.ogg lmms-0.4.3/data/samples/beats/electro_beat01.ogg lmms-0.4.3/data/samples/beats/jungle01.ogg lmms-0.4.3/data/samples/beats/rave_hihat01.ogg lmms-0.4.3/data/samples/beats/rave_kick01.ogg lmms-0.4.3/data/samples/beats/rave_kick02.ogg lmms-0.4.3/data/samples/beats/break01.ogg lmms-0.4.3/data/samples/beats/rave_snare01.ogg lmms-0.4.3/data/samples/beats/rave_hihat02.ogg lmms-0.4.3/data/samples/stringsnpads/bell_choir02.ogg lmms-0.4.3/data/samples/stringsnpads/strings01.ogg lmms-0.4.3/data/samples/stringsnpads/korg_poly6_drone01.ogg lmms-0.4.3/data/samples/stringsnpads/space_strings01.ogg lmms-0.4.3/data/samples/stringsnpads/chorus02.ogg lmms-0.4.3/data/samples/stringsnpads/space_strings03.ogg lmms-0.4.3/data/samples/stringsnpads/chorus01.ogg lmms-0.4.3/data/samples/stringsnpads/juno_pad01.ogg lmms-0.4.3/data/samples/stringsnpads/orion_string01.ogg lmms-0.4.3/data/samples/stringsnpads/rave_choir01.ogg lmms-0.4.3/data/samples/stringsnpads/bell_choir01.ogg lmms-0.4.3/data/samples/stringsnpads/heaven_strings01.ogg lmms-0.4.3/data/samples/stringsnpads/nord_ambient01.ogg lmms-0.4.3/data/samples/stringsnpads/space_strings02.ogg lmms-0.4.3/data/samples/bassloopes/briff01.ogg lmms-0.4.3/data/samples/bassloopes/techno_bass01.ogg lmms-0.4.3/data/samples/bassloopes/rave_bass02.ogg lmms-0.4.3/data/samples/bassloopes/techno_synth02.ogg lmms-0.4.3/data/samples/bassloopes/tb303_01.ogg lmms-0.4.3/data/samples/bassloopes/rave_bass01.ogg lmms-0.4.3/data/samples/bassloopes/techno_synth03.ogg lmms-0.4.3/data/samples/bassloopes/techno_bass02.ogg lmms-0.4.3/data/samples/bassloopes/techno_synth04.ogg lmms-0.4.3/data/samples/bassloopes/techno_synth01.ogg lmms-0.4.3/data/samples/instruments/violin_double_stop01.ogg lmms-0.4.3/data/samples/instruments/bassslap01.ogg lmms-0.4.3/data/samples/instruments/church_organ01.ogg lmms-0.4.3/data/samples/instruments/e_piano_accord01.ogg lmms-0.4.3/data/samples/instruments/flute01.ogg lmms-0.4.3/data/samples/instruments/steel_guitar_medium_distorted01.ogg lmms-0.4.3/data/samples/instruments/church_organ04.ogg lmms-0.4.3/data/samples/instruments/trumpet01.ogg lmms-0.4.3/data/samples/instruments/steel_guitar_slight_distorted01.ogg lmms-0.4.3/data/samples/instruments/steel_guitar_heavy_distorted01.ogg lmms-0.4.3/data/samples/instruments/e_organ01.ogg lmms-0.4.3/data/samples/instruments/church_organ03.ogg lmms-0.4.3/data/samples/instruments/piano02.ogg lmms-0.4.3/data/samples/instruments/cello01.ogg lmms-0.4.3/data/samples/instruments/piano01.ogg lmms-0.4.3/data/samples/instruments/violin_fingered01.ogg lmms-0.4.3/data/samples/instruments/violin_pizzicato01.ogg lmms-0.4.3/data/samples/instruments/e_piano_accord02.ogg lmms-0.4.3/data/samples/instruments/harpsichord01.ogg lmms-0.4.3/data/samples/instruments/steel_guitar01.ogg lmms-0.4.3/data/samples/instruments/bassslap02.ogg lmms-0.4.3/data/samples/instruments/church_organ02.ogg lmms-0.4.3/data/samples/misc/applause01.ogg lmms-0.4.3/data/samples/misc/breath01.ogg lmms-0.4.3/data/samples/misc/raving_crowd01.ogg lmms-0.4.3/data/samples/misc/hit02.ogg lmms-0.4.3/data/samples/misc/dong01.ogg lmms-0.4.3/data/samples/misc/hit01.ogg lmms-0.4.3/data/samples/misc/bass!.ogg lmms-0.4.3/data/samples/misc/dong03.ogg lmms-0.4.3/data/samples/misc/undefined01.ogg lmms-0.4.3/data/samples/misc/metronome01.ogg lmms-0.4.3/data/samples/misc/buzz!.ogg lmms-0.4.3/data/samples/misc/dong02.ogg lmms-0.4.3/data/samples/misc/electric_ping01.ogg lmms-0.4.3/data/samples/misc/metalish_dong01.ogg lmms-0.4.3/data/samples/misc/snaph01.ogg lmms-0.4.3/data/samples/drums/kick_soft01.ogg lmms-0.4.3/data/samples/drums/snare_rim01.ogg lmms-0.4.3/data/samples/drums/hihat_opened02.ogg lmms-0.4.3/data/samples/drums/snare05.ogg lmms-0.4.3/data/samples/drums/bassdrum_acoustic02.ogg lmms-0.4.3/data/samples/drums/kick_hard01.ogg lmms-0.4.3/data/samples/drums/sidestick01.ogg lmms-0.4.3/data/samples/drums/clap01.ogg lmms-0.4.3/data/samples/drums/snare02.ogg lmms-0.4.3/data/samples/drums/clap02.ogg lmms-0.4.3/data/samples/drums/snare04.ogg lmms-0.4.3/data/samples/drums/bassdrum03.ogg lmms-0.4.3/data/samples/drums/tom_low01.ogg lmms-0.4.3/data/samples/drums/bassdrum02.ogg lmms-0.4.3/data/samples/drums/tom02.ogg lmms-0.4.3/data/samples/drums/shaker03.ogg lmms-0.4.3/data/samples/drums/kick_hiphop01.ogg lmms-0.4.3/data/samples/drums/clap03.ogg lmms-0.4.3/data/samples/drums/snare_muffled02.ogg lmms-0.4.3/data/samples/drums/tom01.ogg lmms-0.4.3/data/samples/drums/hihat_closed03.ogg lmms-0.4.3/data/samples/drums/hihat_closed05.ogg lmms-0.4.3/data/samples/drums/tom_hi01.ogg lmms-0.4.3/data/samples/drums/kick01.ogg lmms-0.4.3/data/samples/drums/shaker01.ogg lmms-0.4.3/data/samples/drums/tom05.ogg lmms-0.4.3/data/samples/drums/ride01.ogg lmms-0.4.3/data/samples/drums/shaker02.ogg lmms-0.4.3/data/samples/drums/hihat_opened01.ogg lmms-0.4.3/data/samples/drums/snare06.ogg lmms-0.4.3/data/samples/drums/kick_soft02.ogg lmms-0.4.3/data/samples/drums/kick_long01.ogg lmms-0.4.3/data/samples/drums/kick04.ogg lmms-0.4.3/data/samples/drums/snare07.ogg lmms-0.4.3/data/samples/drums/bassdrum04.ogg lmms-0.4.3/data/samples/drums/crash02.ogg lmms-0.4.3/data/samples/drums/tom04.ogg lmms-0.4.3/data/samples/drums/kick02.ogg lmms-0.4.3/data/samples/drums/nasty_rim01.ogg lmms-0.4.3/data/samples/drums/bassdrum_acoustic01.ogg lmms-0.4.3/data/samples/drums/ride02.ogg lmms-0.4.3/data/samples/drums/hihat_closed02.ogg lmms-0.4.3/data/samples/drums/hihat_closed01.ogg lmms-0.4.3/data/samples/drums/snare01.ogg lmms-0.4.3/data/samples/drums/wood01.ogg lmms-0.4.3/data/samples/drums/nasty_bass01.ogg lmms-0.4.3/data/samples/drums/snare_hiphop02.ogg lmms-0.4.3/data/samples/drums/kick_distorted01.ogg lmms-0.4.3/data/samples/drums/zap01.ogg lmms-0.4.3/data/samples/drums/clav01.ogg lmms-0.4.3/data/samples/drums/rim01.ogg lmms-0.4.3/data/samples/drums/nasty_snare01.ogg lmms-0.4.3/data/samples/drums/snare_harsh01.ogg lmms-0.4.3/data/samples/drums/clav02.ogg lmms-0.4.3/data/samples/drums/clap04.ogg lmms-0.4.3/data/samples/drums/snare_muffled01.ogg lmms-0.4.3/data/samples/drums/kick03.ogg lmms-0.4.3/data/samples/drums/snare_acoustic01.ogg lmms-0.4.3/data/samples/drums/kick_hardcore01.ogg lmms-0.4.3/data/samples/drums/hihat_foot_pedal01.ogg lmms-0.4.3/data/samples/drums/snare_short01.ogg lmms-0.4.3/data/samples/drums/hihat_closed04.ogg lmms-0.4.3/data/samples/drums/bassdrum01.ogg lmms-0.4.3/data/samples/drums/snare03.ogg lmms-0.4.3/data/samples/drums/zap02.ogg lmms-0.4.3/data/samples/drums/snare_hiphop01.ogg lmms-0.4.3/data/samples/drums/snare_electro01.ogg lmms-0.4.3/data/samples/drums/tom_mid01.ogg lmms-0.4.3/data/samples/drums/tom03.ogg lmms-0.4.3/data/samples/drums/crash01.ogg lmms-0.4.3/data/samples/drums/hihat_opened03.ogg lmms-0.4.3/data/samples/drums/zap03.ogg Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lmms/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Feb 2009 21:09:59 -0000 1.2 +++ .cvsignore 9 Mar 2009 23:47:18 -0000 1.3 @@ -1 +1 @@ -lmms-0.4.2.stripped.tar.bz2 +lmms-0.4.3.stripped.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/lmms/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 20 Feb 2009 21:48:06 -0000 1.2 +++ import.log 9 Mar 2009 23:47:18 -0000 1.3 @@ -1,2 +1,3 @@ lmms-0_4_2-3_fc10:HEAD:lmms-0.4.2-3.fc10.src.rpm:1234472931 lmms-0_4_2-4_fc10:HEAD:lmms-0.4.2-4.fc10.src.rpm:1235166451 +lmms-0_4_3-1_fc10:HEAD:lmms-0.4.3-1.fc10.src.rpm:1236642380 Index: lmms.spec =================================================================== RCS file: /cvs/pkgs/rpms/lmms/devel/lmms.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lmms.spec 25 Feb 2009 20:45:48 -0000 1.3 +++ lmms.spec 9 Mar 2009 23:47:18 -0000 1.4 @@ -1,6 +1,6 @@ Name: lmms -Version: 0.4.2 -Release: 5%{?dist} +Version: 0.4.3 +Release: 1%{?dist} Summary: Linux MultiMedia Studio URL: http://lmms.sourceforge.net/ Group: Applications/Multimedia @@ -10,13 +10,14 @@ # - the drumsynth files are GPLv2+ or MIT License: GPLv2+ and GPLv2 and (GPLv2+ or MIT) -# we strip all .ogg / .wav / .mmp(z) / .ds files from the tarfile, -# until their license situation becomes clearer. - # original tarfile can be found here: # Source0: http://downloads.sourceforge.net/lmms/%{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.stripped.tar.bz2 +# we strip all .ogg / .wav / .mmp(z) files from the tarfile, +# until their license situation becomes clearer. +Source1: README.fedora + # our cmake seems to have a different value for LIB_DIR. Patch0: lmms-0.4.2-libdir.patch @@ -27,9 +28,6 @@ # upstream isn't really interested in. Patch2: lmms-0.4.2-vst-nowine.patch -# sent upstream. -Patch3: lmms-0.4.2-gcc44.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # according to upstream we should at least support oss, alsa, and @@ -108,11 +106,12 @@ %patch0 -p1 -b .libdir %patch1 -p1 -b .libexecdir %patch2 -p1 -b .nowine -%patch3 -p1 -b .gcc44 # remove spurious x-bits find . -type f -exec chmod 0644 {} \; +%{__cp} -a %{SOURCE1} README.fedora + %build %cmake \ @@ -163,7 +162,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO +%doc AUTHORS ChangeLog COPYING README TODO README.fedora %{_bindir}/%{name} %{_libdir}/%{name} %{_datadir}/%{name} @@ -196,6 +195,11 @@ %changelog +* Mon Mar 9 2009 Thomas Moschny - 0.4.3-1 +- Update to 0.4.3. +- Remove lmms-0.4.2-gcc44.patch (fixed upstream). +- Add README.fedora. + * Wed Feb 25 2009 Fedora Release Engineering - 0.4.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lmms/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Feb 2009 21:48:06 -0000 1.3 +++ sources 9 Mar 2009 23:47:18 -0000 1.4 @@ -1 +1 @@ -5a60c3fa8c84dbd731817a75208b3a83 lmms-0.4.2.stripped.tar.bz2 +7a68751ce50fc0a077f852d539b0b712 lmms-0.4.3.stripped.tar.bz2 --- lmms-0.4.2-gcc44.patch DELETED --- From toshio at fedoraproject.org Mon Mar 9 23:49:33 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Mon, 9 Mar 2009 23:49:33 +0000 (UTC) Subject: rpms/python-fedora/EL-5 .cvsignore, 1.18, 1.19 python-fedora.spec, 1.20, 1.21 sources, 1.19, 1.20 Message-ID: <20090309234933.C574070118@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32260/EL-5 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Mon Mar 9 2009 Toshio Kuratomi - 0.3.11-1 - readd the old jsonfasproviders. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 7 Mar 2009 16:38:01 -0000 1.18 +++ .cvsignore 9 Mar 2009 23:49:02 -0000 1.19 @@ -1 +1 @@ -python-fedora-0.3.10.tar.gz +python-fedora-0.3.11.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/python-fedora.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- python-fedora.spec 7 Mar 2009 16:38:02 -0000 1.20 +++ python-fedora.spec 9 Mar 2009 23:49:03 -0000 1.21 @@ -1,7 +1,7 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.10 +Version: 0.3.11 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -51,13 +51,15 @@ %clean rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc README COPYING AUTHORS ChangeLog doc %{python_sitelib}/* %changelog +* Mon Mar 9 2009 Toshio Kuratomi - 0.3.11-1 +- readd the old jsonfasproviders. + * Fri Mar 6 2009 Toshio Kuratomi - 0.3.10-1 - CSRF fixes and django authentication provider. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 7 Mar 2009 16:38:02 -0000 1.19 +++ sources 9 Mar 2009 23:49:03 -0000 1.20 @@ -1 +1 @@ -7e20b69e07c3f1eab3e6a99e1d009f3b python-fedora-0.3.10.tar.gz +b19ddcab1718934d9a3d7e88c0d295f3 python-fedora-0.3.11.tar.gz From toshio at fedoraproject.org Mon Mar 9 23:49:34 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Mon, 9 Mar 2009 23:49:34 +0000 (UTC) Subject: rpms/python-fedora/F-10 .cvsignore, 1.27, 1.28 python-fedora.spec, 1.30, 1.31 sources, 1.28, 1.29 Message-ID: <20090309234934.AF9CC70118@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32260/F-10 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Mon Mar 9 2009 Toshio Kuratomi - 0.3.11-1 - readd the old jsonfasproviders. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-10/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 7 Mar 2009 16:38:02 -0000 1.27 +++ .cvsignore 9 Mar 2009 23:49:03 -0000 1.28 @@ -1 +1 @@ -python-fedora-0.3.10.tar.gz +python-fedora-0.3.11.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-10/python-fedora.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- python-fedora.spec 7 Mar 2009 16:38:02 -0000 1.30 +++ python-fedora.spec 9 Mar 2009 23:49:04 -0000 1.31 @@ -1,7 +1,7 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.10 +Version: 0.3.11 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -51,13 +51,15 @@ %clean rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc README COPYING AUTHORS ChangeLog doc %{python_sitelib}/* %changelog +* Mon Mar 9 2009 Toshio Kuratomi - 0.3.11-1 +- readd the old jsonfasproviders. + * Fri Mar 6 2009 Toshio Kuratomi - 0.3.10-1 - CSRF fixes and django authentication provider. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-10/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 7 Mar 2009 16:38:02 -0000 1.28 +++ sources 9 Mar 2009 23:49:04 -0000 1.29 @@ -1 +1 @@ -7e20b69e07c3f1eab3e6a99e1d009f3b python-fedora-0.3.10.tar.gz +b19ddcab1718934d9a3d7e88c0d295f3 python-fedora-0.3.11.tar.gz From toshio at fedoraproject.org Mon Mar 9 23:49:35 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Mon, 9 Mar 2009 23:49:35 +0000 (UTC) Subject: rpms/python-fedora/F-9 .cvsignore, 1.24, 1.25 python-fedora.spec, 1.28, 1.29 sources, 1.26, 1.27 Message-ID: <20090309234935.D0A6270133@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32260/F-9 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Mon Mar 9 2009 Toshio Kuratomi - 0.3.11-1 - readd the old jsonfasproviders. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 7 Mar 2009 16:38:03 -0000 1.24 +++ .cvsignore 9 Mar 2009 23:49:04 -0000 1.25 @@ -1 +1 @@ -python-fedora-0.3.10.tar.gz +python-fedora-0.3.11.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/python-fedora.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- python-fedora.spec 7 Mar 2009 16:38:03 -0000 1.28 +++ python-fedora.spec 9 Mar 2009 23:49:05 -0000 1.29 @@ -1,7 +1,7 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-fedora -Version: 0.3.10 +Version: 0.3.11 Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services @@ -51,13 +51,15 @@ %clean rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc README COPYING AUTHORS ChangeLog doc %{python_sitelib}/* %changelog +* Mon Mar 9 2009 Toshio Kuratomi - 0.3.11-1 +- readd the old jsonfasproviders. + * Fri Mar 6 2009 Toshio Kuratomi - 0.3.10-1 - CSRF fixes and django authentication provider. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/F-9/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 7 Mar 2009 16:38:03 -0000 1.26 +++ sources 9 Mar 2009 23:49:05 -0000 1.27 @@ -1 +1 @@ -7e20b69e07c3f1eab3e6a99e1d009f3b python-fedora-0.3.10.tar.gz +b19ddcab1718934d9a3d7e88c0d295f3 python-fedora-0.3.11.tar.gz From lutter at fedoraproject.org Mon Mar 9 23:49:40 2009 From: lutter at fedoraproject.org (David Lutterkort) Date: Mon, 9 Mar 2009 23:49:40 +0000 (UTC) Subject: rpms/augeas/EL-4 .cvsignore, 1.15, 1.16 augeas.spec, 1.16, 1.17 sources, 1.15, 1.16 Message-ID: <20090309234940.BA61070118@cvs1.fedora.phx.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32287/EL-4 Modified Files: .cvsignore augeas.spec sources Log Message: Version 0.4.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/EL-4/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 3 Mar 2009 00:17:38 -0000 1.15 +++ .cvsignore 9 Mar 2009 23:49:09 -0000 1.16 @@ -1 +1 @@ -augeas-0.4.1.tar.gz +augeas-0.4.2.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/EL-4/augeas.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- augeas.spec 3 Mar 2009 00:17:38 -0000 1.16 +++ augeas.spec 9 Mar 2009 23:49:09 -0000 1.17 @@ -1,5 +1,5 @@ Name: augeas -Version: 0.4.1 +Version: 0.4.2 Release: 1%{?dist} Summary: A library for changing configuration files @@ -9,7 +9,7 @@ Source0: http://augeas.net/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: readline-devel +BuildRequires: readline-devel libselinux-devel Requires: %{name}-libs = %{version}-%{release} %description @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/augeas.pc %changelog +* Mon Mar 9 2009 David Lutterkort - 0.4.2-1 +- New version + * Fri Feb 27 2009 David Lutterkort - 0.4.1-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/EL-4/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 3 Mar 2009 00:17:38 -0000 1.15 +++ sources 9 Mar 2009 23:49:10 -0000 1.16 @@ -1 +1 @@ -2cf261ed428d51c24171d0bc39f9ee6a augeas-0.4.1.tar.gz +bceb3a4a1aafde204428ec6421f83900 augeas-0.4.2.tar.gz From lutter at fedoraproject.org Mon Mar 9 23:49:42 2009 From: lutter at fedoraproject.org (David Lutterkort) Date: Mon, 9 Mar 2009 23:49:42 +0000 (UTC) Subject: rpms/augeas/EL-5 .cvsignore, 1.15, 1.16 augeas.spec, 1.15, 1.16 sources, 1.15, 1.16 Message-ID: <20090309234942.7FD1770034@cvs1.fedora.phx.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32287/EL-5 Modified Files: .cvsignore augeas.spec sources Log Message: Version 0.4.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/EL-5/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 3 Mar 2009 00:17:39 -0000 1.15 +++ .cvsignore 9 Mar 2009 23:49:10 -0000 1.16 @@ -1 +1 @@ -augeas-0.4.1.tar.gz +augeas-0.4.2.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/EL-5/augeas.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- augeas.spec 3 Mar 2009 00:17:39 -0000 1.15 +++ augeas.spec 9 Mar 2009 23:49:11 -0000 1.16 @@ -1,5 +1,5 @@ Name: augeas -Version: 0.4.1 +Version: 0.4.2 Release: 1%{?dist} Summary: A library for changing configuration files @@ -9,7 +9,7 @@ Source0: http://augeas.net/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: readline-devel +BuildRequires: readline-devel libselinux-devel Requires: %{name}-libs = %{version}-%{release} %description @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/augeas.pc %changelog +* Mon Mar 9 2009 David Lutterkort - 0.4.2-1 +- New version + * Fri Feb 27 2009 David Lutterkort - 0.4.1-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/EL-5/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 3 Mar 2009 00:17:39 -0000 1.15 +++ sources 9 Mar 2009 23:49:12 -0000 1.16 @@ -1 +1 @@ -2cf261ed428d51c24171d0bc39f9ee6a augeas-0.4.1.tar.gz +bceb3a4a1aafde204428ec6421f83900 augeas-0.4.2.tar.gz From lutter at fedoraproject.org Mon Mar 9 23:49:42 2009 From: lutter at fedoraproject.org (David Lutterkort) Date: Mon, 9 Mar 2009 23:49:42 +0000 (UTC) Subject: rpms/augeas/F-10 .cvsignore, 1.15, 1.16 augeas.spec, 1.14, 1.15 sources, 1.15, 1.16 Message-ID: <20090309234942.D4B0F70118@cvs1.fedora.phx.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32287/F-10 Modified Files: .cvsignore augeas.spec sources Log Message: Version 0.4.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-10/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 3 Mar 2009 00:17:39 -0000 1.15 +++ .cvsignore 9 Mar 2009 23:49:12 -0000 1.16 @@ -1 +1 @@ -augeas-0.4.1.tar.gz +augeas-0.4.2.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-10/augeas.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- augeas.spec 3 Mar 2009 00:17:39 -0000 1.14 +++ augeas.spec 9 Mar 2009 23:49:12 -0000 1.15 @@ -1,5 +1,5 @@ Name: augeas -Version: 0.4.1 +Version: 0.4.2 Release: 1%{?dist} Summary: A library for changing configuration files @@ -9,7 +9,7 @@ Source0: http://augeas.net/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: readline-devel +BuildRequires: readline-devel libselinux-devel Requires: %{name}-libs = %{version}-%{release} %description @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/augeas.pc %changelog +* Mon Mar 9 2009 David Lutterkort - 0.4.2-1 +- New version + * Fri Feb 27 2009 David Lutterkort - 0.4.1-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-10/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 3 Mar 2009 00:17:39 -0000 1.15 +++ sources 9 Mar 2009 23:49:12 -0000 1.16 @@ -1 +1 @@ -2cf261ed428d51c24171d0bc39f9ee6a augeas-0.4.1.tar.gz +bceb3a4a1aafde204428ec6421f83900 augeas-0.4.2.tar.gz From lutter at fedoraproject.org Mon Mar 9 23:49:43 2009 From: lutter at fedoraproject.org (David Lutterkort) Date: Mon, 9 Mar 2009 23:49:43 +0000 (UTC) Subject: rpms/augeas/F-9 .cvsignore, 1.15, 1.16 augeas.spec, 1.14, 1.15 sources, 1.15, 1.16 Message-ID: <20090309234943.63E8670034@cvs1.fedora.phx.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/augeas/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32287/F-9 Modified Files: .cvsignore augeas.spec sources Log Message: Version 0.4.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-9/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 3 Mar 2009 00:17:39 -0000 1.15 +++ .cvsignore 9 Mar 2009 23:49:12 -0000 1.16 @@ -1 +1 @@ -augeas-0.4.1.tar.gz +augeas-0.4.2.tar.gz Index: augeas.spec =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-9/augeas.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- augeas.spec 3 Mar 2009 00:17:39 -0000 1.14 +++ augeas.spec 9 Mar 2009 23:49:13 -0000 1.15 @@ -1,5 +1,5 @@ Name: augeas -Version: 0.4.1 +Version: 0.4.2 Release: 1%{?dist} Summary: A library for changing configuration files @@ -9,7 +9,7 @@ Source0: http://augeas.net/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: readline-devel +BuildRequires: readline-devel libselinux-devel Requires: %{name}-libs = %{version}-%{release} %description @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/augeas.pc %changelog +* Mon Mar 9 2009 David Lutterkort - 0.4.2-1 +- New version + * Fri Feb 27 2009 David Lutterkort - 0.4.1-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/augeas/F-9/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 3 Mar 2009 00:17:39 -0000 1.15 +++ sources 9 Mar 2009 23:49:13 -0000 1.16 @@ -1 +1 @@ -2cf261ed428d51c24171d0bc39f9ee6a augeas-0.4.1.tar.gz +bceb3a4a1aafde204428ec6421f83900 augeas-0.4.2.tar.gz From kkofler at fedoraproject.org Tue Mar 10 00:01:28 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 10 Mar 2009 00:01:28 +0000 (UTC) Subject: rpms/klamav/devel klamav-0.44-no-kde3-mediamanager.patch, NONE, 1.1 klamav.spec, 1.28, 1.29 Message-ID: <20090310000128.EFB1F70034@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/klamav/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4067/devel Modified Files: klamav.spec Added Files: klamav-0.44-no-kde3-mediamanager.patch Log Message: * Tue Mar 10 2009 Kevin Kofler 0.44-5 - rebuild for clamav 0.95rc1 - disable device mounting which requires KDE 3 (#483518) klamav-0.44-no-kde3-mediamanager.patch: --- NEW FILE klamav-0.44-no-kde3-mediamanager.patch --- diff -ur klamav-0.44/src/directorylist.cpp klamav-0.44-no-kde3-mediamanager/src/directorylist.cpp --- klamav-0.44/src/directorylist.cpp 2008-07-06 14:05:42.000000000 +0200 +++ klamav-0.44-no-kde3-mediamanager/src/directorylist.cpp 2009-03-08 09:43:59.000000000 +0100 @@ -68,7 +68,7 @@ reinterpret_cast(m_view->header())->hide(); new Item( m_view, i18n( "System Folder" ), "/", "folder_red" ); new Item( m_view, i18n( "Home Folder" ), QDir::homeDirPath(), "folder_home" ); - new DeviceItem( m_view ); + // new DeviceItem( m_view ); setSpacing( 6 ); } Index: klamav.spec =================================================================== RCS file: /cvs/pkgs/rpms/klamav/devel/klamav.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- klamav.spec 25 Feb 2009 11:32:47 -0000 1.28 +++ klamav.spec 10 Mar 2009 00:00:58 -0000 1.29 @@ -1,13 +1,15 @@ Summary: Clam Anti-Virus on the KDE Desktop Name: klamav Version: 0.44 -Release: 4%{?dist} +Release: 5%{?dist} Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2 Patch0: klamav-suse-clamav-path.diff # Upstream notified via mailing list: # http://sourceforge.net/mailarchive/message.php?msg_name=20080123100636.GC1177%40serv.smile.org.ua Patch1: klamav-0.41.1-pwd-echo.patch Patch2: klamav-clamav094.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=483518 +Patch3: klamav-0.44-no-kde3-mediamanager.patch URL: http://klamav.sourceforge.net Group: Applications/System License: GPLv2+ @@ -33,6 +35,7 @@ %patch0 -p0 -b .suse-clamav-path %patch1 -p1 -b .pwd-echo %patch2 -p1 -b .clamav094 +%patch3 -p1 -b .no-kde3-mediamanager %build %configure --disable-rpath --without-included-sqlite @@ -87,6 +90,10 @@ %{_datadir}/icons/*/*x*/apps/klamav.png %changelog +* Tue Mar 10 2009 Kevin Kofler 0.44-5 +- rebuild for clamav 0.95rc1 +- disable device mounting which requires KDE 3 (#483518) + * Wed Feb 25 2009 Fedora Release Engineering - 0.44-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kkofler at fedoraproject.org Tue Mar 10 00:10:44 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 10 Mar 2009 00:10:44 +0000 (UTC) Subject: rpms/gurlchecker/devel gurlchecker.spec,1.27,1.28 Message-ID: <20090310001044.3194C70034@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/gurlchecker/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6817/devel Modified Files: gurlchecker.spec Log Message: * Tue Mar 10 2009 Kevin Kofler - 0.10.1-12 - rebuild for clamav 0.95rc1 Index: gurlchecker.spec =================================================================== RCS file: /cvs/pkgs/rpms/gurlchecker/devel/gurlchecker.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gurlchecker.spec 25 Feb 2009 02:59:53 -0000 1.27 +++ gurlchecker.spec 10 Mar 2009 00:10:13 -0000 1.28 @@ -1,6 +1,6 @@ Name: gurlchecker Version: 0.10.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A Gnome link validity checker @@ -56,6 +56,9 @@ %{_mandir}/man?/* %changelog +* Tue Mar 10 2009 Kevin Kofler - 0.10.1-12 +- rebuild for clamav 0.95rc1 + * Tue Feb 24 2009 Fedora Release Engineering - 0.10.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From simo at fedoraproject.org Tue Mar 10 00:17:54 2009 From: simo at fedoraproject.org (Simo Sorce) Date: Tue, 10 Mar 2009 00:17:54 +0000 (UTC) Subject: rpms/samba4/devel 0001-Fix-potential-segfaults-using-freed-memory.patch, NONE, 1.1 samba4.spec, 1.8, 1.9 Message-ID: <20090310001754.AF67270034@cvs1.fedora.phx.redhat.com> Author: simo Update of /cvs/pkgs/rpms/samba4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9134 Modified Files: samba4.spec Added Files: 0001-Fix-potential-segfaults-using-freed-memory.patch Log Message: * Mon Mar 09 2009 Simo Sorce - 4.0.0-11alpha7 - Add upstream patch to fix a problem within ldb 0001-Fix-potential-segfaults-using-freed-memory.patch: --- NEW FILE 0001-Fix-potential-segfaults-using-freed-memory.patch --- >From 0b25a1f4547f5fb9124b4d8a03d87aaddf6ca307 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Mon, 9 Mar 2009 18:04:38 -0400 Subject: [PATCH] Fix potential segfaults using freed memory. In some code paths ltdb_context was still referenced even after we were returned an error by one of the callbacks. Because the interface assumes that once an error is returned the ldb_request may be freed, and because the ltdb_context was allocated as a child of the request, this might cause access to freed memory. Allocate the ltdb_context on ldb, and keep track of what's going on with the request by adding a spy children on it. This way even if the request is freed before the ltdb_callback is called, we will safely free the ctx and just quietly return. --- source4/lib/ldb/ldb_tdb/ldb_index.c | 2 +- source4/lib/ldb/ldb_tdb/ldb_search.c | 6 ++-- source4/lib/ldb/ldb_tdb/ldb_tdb.c | 49 ++++++++++++++++++++++++++++++--- source4/lib/ldb/ldb_tdb/ldb_tdb.h | 7 ++++- 4 files changed, 54 insertions(+), 10 deletions(-) diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/source4/lib/ldb/ldb_tdb/ldb_index.c index ad27c9a..c99c293 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_index.c +++ b/source4/lib/ldb/ldb_tdb/ldb_index.c @@ -1055,7 +1055,7 @@ static int ltdb_index_filter(const struct dn_list *dn_list, ret = ldb_module_send_entry(ac->req, msg, NULL); if (ret != LDB_SUCCESS) { - ac->callback_failed = true; + ac->request_terminated = true; return ret; } } diff --git a/source4/lib/ldb/ldb_tdb/ldb_search.c b/source4/lib/ldb/ldb_tdb/ldb_search.c index 0f59526..d395c28 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_search.c +++ b/source4/lib/ldb/ldb_tdb/ldb_search.c @@ -424,10 +424,10 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi ret = ldb_module_send_entry(ac->req, msg, NULL); if (ret != LDB_SUCCESS) { - ac->callback_failed = true; + ac->request_terminated = true; /* the callback failed, abort the operation */ return -1; - } + } return 0; } @@ -544,7 +544,7 @@ int ltdb_search(struct ltdb_context *ctx) /* Check if we got just a normal error. * In that case proceed to a full search unless we got a * callback error */ - if ( ! ctx->callback_failed && ret != LDB_SUCCESS) { + if ( ! ctx->request_terminated && ret != LDB_SUCCESS) { /* Not indexed, so we need to do a full scan */ ret = ltdb_search_full(ctx); if (ret != LDB_SUCCESS) { diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c index 24ec06e..d38cb82 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c +++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c @@ -1019,7 +1019,15 @@ static void ltdb_timeout(struct tevent_context *ev, struct ltdb_context *ctx; ctx = talloc_get_type(private_data, struct ltdb_context); - ltdb_request_done(ctx, LDB_ERR_TIME_LIMIT_EXCEEDED); + if (!ctx->request_terminated) { + /* neutralize the spy */ + ctx->spy->ctx = NULL; + + /* request is done now */ + ltdb_request_done(ctx, LDB_ERR_TIME_LIMIT_EXCEEDED); + } + + talloc_free(ctx); } static void ltdb_request_extended_done(struct ltdb_context *ctx, @@ -1078,6 +1086,11 @@ static void ltdb_callback(struct tevent_context *ev, ctx = talloc_get_type(private_data, struct ltdb_context); + if (!ctx->request_terminated) { + /* neutralize the spy */ + ctx->spy->ctx = NULL; + } else goto done; + switch (ctx->req->operation) { case LDB_SEARCH: ret = ltdb_search(ctx); @@ -1102,11 +1115,24 @@ static void ltdb_callback(struct tevent_context *ev, ret = LDB_ERR_UNWILLING_TO_PERFORM; } - if (!ctx->callback_failed) { - /* Once we are done, we do not need timeout events */ - talloc_free(ctx->timeout_event); + if (!ctx->request_terminated) { + /* request is done now */ ltdb_request_done(ctx, ret); } + +done: + talloc_free(ctx); +} + +static int ltdb_request_destructor(void *ptr) +{ + struct ltdb_req_spy *spy = talloc_get_type(ptr, struct ltdb_req_spy); + + if (spy->ctx != NULL) { + spy->ctx->request_terminated = true; + } + + return 0; } static int ltdb_handle_request(struct ldb_module *module, @@ -1131,7 +1157,7 @@ static int ltdb_handle_request(struct ldb_module *module, ev = ldb_get_event_context(ldb); - ac = talloc_zero(req, struct ltdb_context); + ac = talloc_zero(ldb, struct ltdb_context); if (ac == NULL) { ldb_set_errstring(ldb, "Out of Memory"); return LDB_ERR_OPERATIONS_ERROR; @@ -1144,15 +1170,28 @@ static int ltdb_handle_request(struct ldb_module *module, tv.tv_usec = 0; te = tevent_add_timer(ev, ac, tv, ltdb_callback, ac); if (NULL == te) { + talloc_free(ac); return LDB_ERR_OPERATIONS_ERROR; } tv.tv_sec = req->starttime + req->timeout; ac->timeout_event = tevent_add_timer(ev, ac, tv, ltdb_timeout, ac); if (NULL == ac->timeout_event) { + talloc_free(ac); return LDB_ERR_OPERATIONS_ERROR; } + /* set a spy so that we do not try to use the request context + * if it is freed before ltdb_callback fires */ + ac->spy = talloc(req, struct ltdb_req_spy); + if (NULL == ac->spy) { + talloc_free(ac); + return LDB_ERR_OPERATIONS_ERROR; + } + ac->spy->ctx = ac; + + talloc_set_destructor((TALLOC_CTX *)ac->spy, ltdb_request_destructor); + return LDB_SUCCESS; } diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h b/source4/lib/ldb/ldb_tdb/ldb_tdb.h index 0a06cdb..5a1c8fe 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h +++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.h @@ -36,11 +36,16 @@ struct ltdb_private { the async local context holds also internal search state during a full db search */ +struct ltdb_req_spy { + struct ltdb_context *ctx; +}; + struct ltdb_context { struct ldb_module *module; struct ldb_request *req; - bool callback_failed; + bool request_terminated; + struct ltdb_req_spy *spy; /* search stuff */ const struct ldb_parse_tree *tree; -- 1.6.0.6 Index: samba4.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba4/devel/samba4.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- samba4.spec 9 Mar 2009 01:39:23 -0000 1.8 +++ samba4.spec 10 Mar 2009 00:17:24 -0000 1.9 @@ -1,4 +1,4 @@ -%define main_release 10 +%define main_release 11 %define samba4_version 4.0.0 %define talloc_version 1.2.0 @@ -56,6 +56,7 @@ Source5: %{name}.init Patch1: samba-4.0.0alpha6-GIT-3508a66-undefined-comparison_fn_t.patch +Patch2: 0001-Fix-potential-segfaults-using-freed-memory.patch Requires(pre): /usr/sbin/groupadd @@ -288,6 +289,7 @@ # copy Red Hat specific scripts %patch1 -p1 -b .undefined-comparison_fn_t +%patch2 -p1 -b .potential_ldb_segfault mv source4/VERSION source4/VERSION.orig sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&%{release}/' < source4/VERSION.orig > source4/VERSION @@ -833,6 +835,9 @@ %endif %changelog +* Mon Mar 09 2009 Simo Sorce - 4.0.0-11alpha7 +- Add upstream patch to fix a problem within ldb + * Sun Mar 08 2009 Matthew Barnes - 4.0.0-10alpha7 - Remove ldb.pc from samba4-devel (RH bug #489186). From kkofler at fedoraproject.org Tue Mar 10 00:31:28 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 10 Mar 2009 00:31:28 +0000 (UTC) Subject: rpms/klamav/devel .cvsignore, 1.6, 1.7 klamav.spec, 1.29, 1.30 sources, 1.6, 1.7 klamav-clamav094.patch, 1.1, NONE Message-ID: <20090310003128.C0EAA70034@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/klamav/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13243/devel Modified Files: .cvsignore klamav.spec sources Removed Files: klamav-clamav094.patch Log Message: * Tue Mar 10 2009 Kevin Kofler 0.46-1 - upgrade to 0.46 (compatible with clamav 0.95rc1) - drop klamav-clamav094.patch (fixed upstream) - disable device mounting which requires KDE 3 (#483518) Note to the maintainer: This upgrade (to a bugfix release) is needed to support the new clamav 0.95rc1 and fix the broken dependency on the old soname. I hope you won't mind me upgrading it. The beta freeze is only a few hours away. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/klamav/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 20 Jul 2008 15:55:32 -0000 1.6 +++ .cvsignore 10 Mar 2009 00:30:57 -0000 1.7 @@ -1 +1 @@ -klamav-0.44.tar.bz2 +klamav-0.46.tar.bz2 Index: klamav.spec =================================================================== RCS file: /cvs/pkgs/rpms/klamav/devel/klamav.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- klamav.spec 10 Mar 2009 00:00:58 -0000 1.29 +++ klamav.spec 10 Mar 2009 00:30:58 -0000 1.30 @@ -1,15 +1,14 @@ Summary: Clam Anti-Virus on the KDE Desktop Name: klamav -Version: 0.44 -Release: 5%{?dist} +Version: 0.46 +Release: 1%{?dist} Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2 Patch0: klamav-suse-clamav-path.diff # Upstream notified via mailing list: # http://sourceforge.net/mailarchive/message.php?msg_name=20080123100636.GC1177%40serv.smile.org.ua Patch1: klamav-0.41.1-pwd-echo.patch -Patch2: klamav-clamav094.patch # https://bugzilla.redhat.com/show_bug.cgi?id=483518 -Patch3: klamav-0.44-no-kde3-mediamanager.patch +Patch2: klamav-0.44-no-kde3-mediamanager.patch URL: http://klamav.sourceforge.net Group: Applications/System License: GPLv2+ @@ -34,8 +33,7 @@ %setup -q %patch0 -p0 -b .suse-clamav-path %patch1 -p1 -b .pwd-echo -%patch2 -p1 -b .clamav094 -%patch3 -p1 -b .no-kde3-mediamanager +%patch2 -p1 -b .no-kde3-mediamanager %build %configure --disable-rpath --without-included-sqlite @@ -90,8 +88,9 @@ %{_datadir}/icons/*/*x*/apps/klamav.png %changelog -* Tue Mar 10 2009 Kevin Kofler 0.44-5 -- rebuild for clamav 0.95rc1 +* Tue Mar 10 2009 Kevin Kofler 0.46-1 +- upgrade to 0.46 (compatible with clamav 0.95rc1) +- drop klamav-clamav094.patch (fixed upstream) - disable device mounting which requires KDE 3 (#483518) * Wed Feb 25 2009 Fedora Release Engineering - 0.44-4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/klamav/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Jul 2008 15:55:32 -0000 1.6 +++ sources 10 Mar 2009 00:30:58 -0000 1.7 @@ -1 +1 @@ -0f5b89db6a8e5d4151a967e4983b4c10 klamav-0.44.tar.bz2 +0c189ccc63434fe29b8eba166950551f klamav-0.46.tar.bz2 --- klamav-clamav094.patch DELETED --- From kkofler at fedoraproject.org Tue Mar 10 00:42:09 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 10 Mar 2009 00:42:09 +0000 (UTC) Subject: rpms/klamav/devel klamav-0.46-suse-clamav-path.patch, NONE, 1.1 klamav.spec, 1.30, 1.31 klamav-suse-clamav-path.diff, 1.2, NONE Message-ID: <20090310004209.8EBCF70034@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/klamav/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15671/devel Modified Files: klamav.spec Added Files: klamav-0.46-suse-clamav-path.patch Removed Files: klamav-suse-clamav-path.diff Log Message: - rediff suse-clamav-path patch klamav-0.46-suse-clamav-path.patch: --- NEW FILE klamav-0.46-suse-clamav-path.patch --- diff -ur klamav-0.46/src/klammail/clamdmail.c klamav-0.46-suse-clamav-path/src/klammail/clamdmail.c --- klamav-0.46/src/klammail/clamdmail.c 2009-02-28 11:27:28.000000000 +0100 +++ klamav-0.46-suse-clamav-path/src/klammail/clamdmail.c 2009-03-10 01:39:09.000000000 +0100 @@ -576,7 +576,7 @@ break; } }else{ - fprintf(tmp,"DatabaseDirectory /usr/local/share/clamav\n"); + fprintf(tmp,"DatabaseDirectory /var/lib/clamav\n"); } //fprintf(tmp,"ScanMail\n"); if ((strstr(cl_retver(), "0.8")) || (strstr(cl_retver(), "0.7"))) Index: klamav.spec =================================================================== RCS file: /cvs/pkgs/rpms/klamav/devel/klamav.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- klamav.spec 10 Mar 2009 00:30:58 -0000 1.30 +++ klamav.spec 10 Mar 2009 00:41:39 -0000 1.31 @@ -3,7 +3,7 @@ Version: 0.46 Release: 1%{?dist} Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2 -Patch0: klamav-suse-clamav-path.diff +Patch0: klamav-0.46-suse-clamav-path.diff # Upstream notified via mailing list: # http://sourceforge.net/mailarchive/message.php?msg_name=20080123100636.GC1177%40serv.smile.org.ua Patch1: klamav-0.41.1-pwd-echo.patch @@ -31,7 +31,7 @@ %prep %setup -q -%patch0 -p0 -b .suse-clamav-path +%patch0 -p1 -b .suse-clamav-path %patch1 -p1 -b .pwd-echo %patch2 -p1 -b .no-kde3-mediamanager @@ -92,6 +92,7 @@ - upgrade to 0.46 (compatible with clamav 0.95rc1) - drop klamav-clamav094.patch (fixed upstream) - disable device mounting which requires KDE 3 (#483518) +- rediff suse-clamav-path patch * Wed Feb 25 2009 Fedora Release Engineering - 0.44-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- klamav-suse-clamav-path.diff DELETED --- From lutter at fedoraproject.org Tue Mar 10 00:49:40 2009 From: lutter at fedoraproject.org (David Lutterkort) Date: Tue, 10 Mar 2009 00:49:40 +0000 (UTC) Subject: rpms/ruby-libvirt/devel ruby-libvirt.spec,1.11,1.12 Message-ID: <20090310004940.3391870034@cvs1.fedora.phx.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/ruby-libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17156 Modified Files: ruby-libvirt.spec Log Message: Disable tests since they cause spurious failures Index: ruby-libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ruby-libvirt/devel/ruby-libvirt.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ruby-libvirt.spec 25 Feb 2009 21:25:23 -0000 1.11 +++ ruby-libvirt.spec 10 Mar 2009 00:49:09 -0000 1.12 @@ -3,7 +3,7 @@ Name: ruby-libvirt Version: 0.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Ruby bindings for libvirt Group: Development/Languages @@ -36,10 +36,10 @@ install -p -m0644 lib/libvirt.rb %{buildroot}%{ruby_sitelib} install -p -m0755 ext/libvirt/_libvirt.so %{buildroot}%{ruby_sitearch} -%check -%if 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} > 5 -rake test -%endif +#%check +#%if 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} > 5 +#rake test +#%endif %clean rm -rf $RPM_BUILD_ROOT @@ -53,6 +53,9 @@ %changelog +* Mon Mar 9 2009 David Lutterkort - 0.1.0-4 +- Disable tests since they cause spurious failures + * Wed Feb 25 2009 Fedora Release Engineering - 0.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kkofler at fedoraproject.org Tue Mar 10 00:53:02 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 10 Mar 2009 00:53:02 +0000 (UTC) Subject: rpms/klamav/devel klamav.spec,1.31,1.32 Message-ID: <20090310005302.C68C470034@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/klamav/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18603/devel Modified Files: klamav.spec Log Message: Fix file name. Index: klamav.spec =================================================================== RCS file: /cvs/pkgs/rpms/klamav/devel/klamav.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- klamav.spec 10 Mar 2009 00:41:39 -0000 1.31 +++ klamav.spec 10 Mar 2009 00:52:32 -0000 1.32 @@ -3,7 +3,7 @@ Version: 0.46 Release: 1%{?dist} Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2 -Patch0: klamav-0.46-suse-clamav-path.diff +Patch0: klamav-0.46-suse-clamav-path.patch # Upstream notified via mailing list: # http://sourceforge.net/mailarchive/message.php?msg_name=20080123100636.GC1177%40serv.smile.org.ua Patch1: klamav-0.41.1-pwd-echo.patch From kkofler at fedoraproject.org Tue Mar 10 01:04:25 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 10 Mar 2009 01:04:25 +0000 (UTC) Subject: rpms/klamav/devel klamav.spec,1.32,1.33 Message-ID: <20090310010425.43C3670034@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/klamav/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21477/devel Modified Files: klamav.spec Log Message: Fix file list. Index: klamav.spec =================================================================== RCS file: /cvs/pkgs/rpms/klamav/devel/klamav.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- klamav.spec 10 Mar 2009 00:52:32 -0000 1.32 +++ klamav.spec 10 Mar 2009 01:04:23 -0000 1.33 @@ -84,8 +84,8 @@ %{_datadir}/apps/klamav %{_datadir}/apps/konqueror/servicemenus/klamav-dropdown.desktop %{_datadir}/config.kcfg/klamavconfig.kcfg -%{_datadir}/icons/*/*x*/actions/klamav.png -%{_datadir}/icons/*/*x*/apps/klamav.png +%{_datadir}/icons/*/*x*/actions/*.png +%{_datadir}/icons/*/*x*/apps/*.png %changelog * Tue Mar 10 2009 Kevin Kofler 0.46-1 From airlied at fedoraproject.org Tue Mar 10 01:07:47 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 10 Mar 2009 01:07:47 +0000 (UTC) Subject: rpms/mesa/devel mesa.spec,1.229,1.230 radeon-rewrite.patch,1.8,1.9 Message-ID: <20090310010747.1FFDB70034@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/mesa/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22176 Modified Files: mesa.spec radeon-rewrite.patch Log Message: * Tue Mar 10 2009 Dave Airlie 7.3-12 - radeon-rewrite.patch: enable R200 hw clears Index: mesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- mesa.spec 9 Mar 2009 05:41:34 -0000 1.229 +++ mesa.spec 10 Mar 2009 01:07:15 -0000 1.230 @@ -20,7 +20,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 7.3 -Release: 11%{?dist} +Release: 12%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -427,6 +427,9 @@ %{_libdir}/mesa-demos-data %changelog +* Tue Mar 10 2009 Dave Airlie 7.3-12 +- radeon-rewrite.patch: enable R200 hw clears + * Mon Mar 09 2009 Dave Airlie 7.3-11 - radeon-rewrite.patch: update with swtcl and r100 bugfixes radeon-rewrite.patch: Index: radeon-rewrite.patch =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/radeon-rewrite.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- radeon-rewrite.patch 9 Mar 2009 05:39:46 -0000 1.8 +++ radeon-rewrite.patch 10 Mar 2009 01:07:15 -0000 1.9 @@ -1,3 +1,9 @@ +commit 2ea80bec3da9c62a3abc1d88b0edf9d2f1c9f258 +Author: Dave Airlie +Date: Tue Mar 10 11:01:57 2009 +1000 + + r200: add hw clears + commit 6c28708e141d047fc44369eac08cfb9a47f22c87 Author: Dave Airlie Date: Mon Mar 9 13:51:39 2009 +1000 @@ -1395,7 +1401,7 @@ return GL_TRUE; } diff --git a/src/mesa/drivers/dri/r200/r200_context.h b/src/mesa/drivers/dri/r200/r200_context.h -index 14a1dda..fcbe725 100644 +index 14a1dda..f7bad2a 100644 --- a/src/mesa/drivers/dri/r200/r200_context.h +++ b/src/mesa/drivers/dri/r200/r200_context.h @@ -53,51 +53,17 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -1766,23 +1772,23 @@ - * installed in the Mesa state vector. - */ - GLuint vertex_size; - +- - /** - * Attributes instructing the Mesa TCL pipeline where / how to put vertex - * data in the hardware buffer. - */ - struct tnl_attr_map vertex_attrs[VERT_ATTRIB_MAX]; - +- - /** - * Number of elements of \c ::vertex_attrs that are actually used. - */ - GLuint vertex_attr_count; -- + - /** - * Cached pointer to the buffer where Mesa will store vertex data. - */ - GLubyte *verts; -- + - /* Fallback rasterization functions - */ - r200_point_func draw_point; @@ -1912,7 +1918,7 @@ /* r200_tcl.c */ struct r200_tcl_info tcl; -@@ -910,14 +617,6 @@ struct r200_context { +@@ -910,45 +617,34 @@ struct r200_context { */ struct r200_swtcl_info swtcl; @@ -1927,9 +1933,18 @@ GLboolean using_hyperz; GLboolean texmicrotile; -@@ -927,28 +626,10 @@ struct r200_context { - #define R200_CONTEXT(ctx) ((r200ContextPtr)(ctx->DriverCtx)) + struct ati_fragment_shader *afs_loaded; +-}; + +-#define R200_CONTEXT(ctx) ((r200ContextPtr)(ctx->DriverCtx)) ++ struct { ++ struct gl_fragment_program *bitmap_fp; ++ struct gl_vertex_program *passthrough_vp; ++ struct gl_fragment_program *saved_fp; ++ GLboolean saved_fp_enable; ++ struct gl_vertex_program *saved_vp; ++ GLboolean saved_vp_enable; -static INLINE GLuint r200PackColor( GLuint cpp, - GLubyte r, GLubyte g, @@ -1944,8 +1959,16 @@ - return 0; - } -} -- -- ++ GLint saved_vp_x, saved_vp_y; ++ GLsizei saved_vp_width, saved_vp_height; ++ GLenum saved_matrix_mode; ++ } meta; ++ ++}; ++ ++#define R200_CONTEXT(ctx) ((r200ContextPtr)(ctx->DriverCtx)) + + extern void r200DestroyContext( __DRIcontextPrivate *driContextPriv ); extern GLboolean r200CreateContext( const __GLcontextModes *glVisual, __DRIcontextPrivate *driContextPriv, @@ -1956,7 +1979,7 @@ extern GLboolean r200MakeCurrent( __DRIcontextPrivate *driContextPriv, __DRIdrawablePrivate *driDrawPriv, __DRIdrawablePrivate *driReadPriv ); -@@ -957,28 +638,9 @@ extern GLboolean r200UnbindContext( __DRIcontextPrivate *driContextPriv ); +@@ -957,28 +653,9 @@ extern GLboolean r200UnbindContext( __DRIcontextPrivate *driContextPriv ); /* ================================================================ * Debugging: */ @@ -2001,19 +2024,33 @@ } } diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.c b/src/mesa/drivers/dri/r200/r200_ioctl.c -index 0741e57..1ab5a82 100644 +index 0741e57..96ed496 100644 --- a/src/mesa/drivers/dri/r200/r200_ioctl.c +++ b/src/mesa/drivers/dri/r200/r200_ioctl.c -@@ -41,6 +41,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +@@ -41,6 +41,22 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/context.h" #include "swrast/swrast.h" ++#include "main/blend.h" ++#include "main/bufferobj.h" ++#include "main/buffers.h" ++#include "main/depth.h" ++#include "main/shaders.h" ++#include "main/texstate.h" ++#include "main/varray.h" ++#include "glapi/dispatch.h" ++#include "swrast/swrast.h" ++#include "main/stencil.h" ++#include "main/matrix.h" ++#include "main/attrib.h" ++#include "main/enable.h" ++ +#include "radeon_common.h" +#include "radeon_lock.h" #include "r200_context.h" #include "r200_state.h" #include "r200_ioctl.h" -@@ -54,635 +56,45 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +@@ -54,635 +70,230 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define R200_TIMEOUT 512 #define R200_IDLE_RETRY 16 @@ -2027,18 +2064,31 @@ - * start of a cmdbuf can rely on the state being kept from the previous one. - */ -static void r200BackUpAndEmitLostStateLocked( r200ContextPtr rmesa ) --{ ++static void ++r200_meta_set_passthrough_transform(r200ContextPtr r200) + { - GLuint nr_released_bufs; - struct r200_store saved_store; -- ++ GLcontext *ctx = r200->radeon.glCtx; + - if (rmesa->backup_store.cmd_used == 0) - return; -- ++ r200->meta.saved_vp_x = ctx->Viewport.X; ++ r200->meta.saved_vp_y = ctx->Viewport.Y; ++ r200->meta.saved_vp_width = ctx->Viewport.Width; ++ r200->meta.saved_vp_height = ctx->Viewport.Height; ++ r200->meta.saved_matrix_mode = ctx->Transform.MatrixMode; + - if (R200_DEBUG & DEBUG_STATE) - fprintf(stderr, "Emitting backup state on lost context\n"); -- ++ _mesa_Viewport(0, 0, ctx->DrawBuffer->Width, ctx->DrawBuffer->Height); + - rmesa->lost_context = GL_FALSE; -- ++ _mesa_MatrixMode(GL_PROJECTION); ++ _mesa_PushMatrix(); ++ _mesa_LoadIdentity(); ++ _mesa_Ortho(0, ctx->DrawBuffer->Width, 0, ctx->DrawBuffer->Height, 1, -1); + - nr_released_bufs = rmesa->dma.nr_released_bufs; - saved_store = rmesa->store; - rmesa->dma.nr_released_bufs = 0; @@ -2046,10 +2096,15 @@ - r200FlushCmdBufLocked( rmesa, __FUNCTION__ ); - rmesa->dma.nr_released_bufs = nr_released_bufs; - rmesa->store = saved_store; --} -- ++ _mesa_MatrixMode(GL_MODELVIEW); ++ _mesa_PushMatrix(); ++ _mesa_LoadIdentity(); + } + -int r200FlushCmdBufLocked( r200ContextPtr rmesa, const char * caller ) --{ ++static void ++r200_meta_restore_transform(r200ContextPtr r200) + { - int ret, i; - drm_radeon_cmd_buffer_t cmd; - @@ -2093,8 +2148,13 @@ - "mangled textures\n", __FUNCTION__ ); - } - } -- -- ++ _mesa_MatrixMode(GL_PROJECTION); ++ _mesa_PopMatrix(); ++ _mesa_MatrixMode(GL_MODELVIEW); ++ _mesa_PopMatrix(); + ++ _mesa_MatrixMode(r200->meta.saved_matrix_mode); + - cmd.bufsz = rmesa->store.cmd_used; - cmd.buf = rmesa->store.cmd_buf; - @@ -2127,8 +2187,10 @@ - rmesa->save_on_next_emit = 1; - - return ret; --} -- ++ _mesa_Viewport(r200->meta.saved_vp_x, r200->meta.saved_vp_y, ++ r200->meta.saved_vp_width, r200->meta.saved_vp_height); + } + - -/* Note: does not emit any commands to avoid recursion on - * r200AllocCmdBuf. @@ -2152,11 +2214,19 @@ - -/* ============================================================= - * Hardware vertex buffer handling -- */ ++/** ++ * Perform glClear where mask contains only color, depth, and/or stencil. ++ * ++ * The implementation is based on calling into Mesa to set GL state and ++ * performing normal triangle rendering. The intent of this path is to ++ * have as generic a path as possible, so that any driver could make use of ++ * it. + */ - - -void r200RefillCurrentDmaRegion( r200ContextPtr rmesa ) --{ ++static void radeon_clear_tris(GLcontext *ctx, GLbitfield mask) + { - struct r200_dma_buffer *dmabuf; - int fd = rmesa->dri.fd; - int index = 0; @@ -2194,7 +2264,16 @@ - ret = drmDMA( fd, &dma ); - if (ret == 0) - break; -- ++ r200ContextPtr rmesa = R200_CONTEXT(ctx); ++ GLfloat vertices[4][3]; ++ GLfloat color[4][4]; ++ GLfloat dst_z; ++ struct gl_framebuffer *fb = ctx->DrawBuffer; ++ int i; ++ GLboolean saved_fp_enable = GL_FALSE, saved_vp_enable = GL_FALSE; ++ GLboolean saved_shader_program = 0; ++ unsigned int saved_active_texture; + - if (rmesa->dma.nr_released_bufs) { - r200FlushCmdBufLocked( rmesa, __FUNCTION__ ); - } @@ -2204,7 +2283,46 @@ - DO_USLEEP( 1 ); - LOCK_HARDWARE( rmesa ); - } -- } ++ assert((mask & ~(BUFFER_BIT_BACK_LEFT | BUFFER_BIT_FRONT_LEFT | ++ BUFFER_BIT_DEPTH | BUFFER_BIT_STENCIL)) == 0); ++ ++ _mesa_PushAttrib(GL_COLOR_BUFFER_BIT | ++ GL_CURRENT_BIT | ++ GL_DEPTH_BUFFER_BIT | ++ GL_ENABLE_BIT | ++ GL_STENCIL_BUFFER_BIT | ++ GL_TRANSFORM_BIT | ++ GL_CURRENT_BIT); ++ _mesa_PushClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT); ++ saved_active_texture = ctx->Texture.CurrentUnit; ++ ++ /* Disable existing GL state we don't want to apply to a clear. */ ++ _mesa_Disable(GL_ALPHA_TEST); ++ _mesa_Disable(GL_BLEND); ++ _mesa_Disable(GL_CULL_FACE); ++ _mesa_Disable(GL_FOG); ++ _mesa_Disable(GL_POLYGON_SMOOTH); ++ _mesa_Disable(GL_POLYGON_STIPPLE); ++ _mesa_Disable(GL_POLYGON_OFFSET_FILL); ++ _mesa_Disable(GL_LIGHTING); ++ _mesa_Disable(GL_CLIP_PLANE0); ++ _mesa_Disable(GL_CLIP_PLANE1); ++ _mesa_Disable(GL_CLIP_PLANE2); ++ _mesa_Disable(GL_CLIP_PLANE3); ++ _mesa_Disable(GL_CLIP_PLANE4); ++ _mesa_Disable(GL_CLIP_PLANE5); ++ if (ctx->Extensions.ARB_fragment_program && ctx->FragmentProgram.Enabled) { ++ saved_fp_enable = GL_TRUE; ++ _mesa_Disable(GL_FRAGMENT_PROGRAM_ARB); ++ } ++ if (ctx->Extensions.ARB_vertex_program && ctx->VertexProgram.Enabled) { ++ saved_vp_enable = GL_TRUE; ++ _mesa_Disable(GL_VERTEX_PROGRAM_ARB); ++ } ++ if (ctx->Extensions.ARB_shader_objects && ctx->Shader.CurrentProgram) { ++ saved_shader_program = ctx->Shader.CurrentProgram->Name; ++ _mesa_UseProgramObjectARB(0); + } - - UNLOCK_HARDWARE(rmesa); - @@ -2228,7 +2346,7 @@ -{ - if (R200_DEBUG & DEBUG_IOCTL) - fprintf(stderr, "%s from %s\n", __FUNCTION__, caller); -- + - if (!region->buf) - return; - @@ -2241,7 +2359,9 @@ - if (R200_DEBUG & (DEBUG_IOCTL|DEBUG_DMA)) - fprintf(stderr, "%s -- DISCARD BUF %d\n", __FUNCTION__, - region->buf->buf->idx); -- ++ if (ctx->Texture._EnabledUnits != 0) { ++ int i; + - cmd = (drm_radeon_cmd_header_t *)r200AllocCmdBuf( rmesa, sizeof(*cmd), - __FUNCTION__ ); - cmd->dma.cmd_type = RADEON_CMD_DMA_DISCARD; @@ -2359,7 +2479,19 @@ - UNLOCK_HARDWARE( rmesa ); - r200WaitIrq( rmesa ); - LOCK_HARDWARE( rmesa ); -- } ++ for (i = 0; i < ctx->Const.MaxTextureUnits; i++) { ++ _mesa_ActiveTextureARB(GL_TEXTURE0 + i); ++ _mesa_Disable(GL_TEXTURE_1D); ++ _mesa_Disable(GL_TEXTURE_2D); ++ _mesa_Disable(GL_TEXTURE_3D); ++ if (ctx->Extensions.ARB_texture_cube_map) ++ _mesa_Disable(GL_TEXTURE_CUBE_MAP_ARB); ++ if (ctx->Extensions.NV_texture_rectangle) ++ _mesa_Disable(GL_TEXTURE_RECTANGLE_NV); ++ if (ctx->Extensions.MESA_texture_array) { ++ _mesa_Disable(GL_TEXTURE_1D_ARRAY_EXT); ++ _mesa_Disable(GL_TEXTURE_2D_ARRAY_EXT); + } - rmesa->irqsEmitted = 10; - } - @@ -2374,8 +2506,8 @@ - if (rmesa->do_usleeps) - DO_USLEEP( 1 ); - LOCK_HARDWARE( rmesa ); -- } -- } + } + } -} - - @@ -2399,8 +2531,16 @@ - - if ( R200_DEBUG & DEBUG_IOCTL ) { - fprintf( stderr, "\n%s( %p )\n\n", __FUNCTION__, (void *)rmesa->glCtx ); -- } -- ++ ++ r200_meta_set_passthrough_transform(rmesa); ++ ++ for (i = 0; i < 4; i++) { ++ color[i][0] = ctx->Color.ClearColor[0]; ++ color[i][1] = ctx->Color.ClearColor[1]; ++ color[i][2] = ctx->Color.ClearColor[2]; ++ color[i][3] = ctx->Color.ClearColor[3]; + } + - R200_FIREVERTICES( rmesa ); - - LOCK_HARDWARE( rmesa ); @@ -2408,7 +2548,12 @@ - - /* Throttle the frame rate -- only allow one pending swap buffers - * request at a time. -- */ ++ /* convert clear Z from [0,1] to NDC coord in [-1,1] */ ++ dst_z = -1.0 + 2.0 * ctx->Depth.Clear; ++ ++ /* Prepare the vertices, which are the same regardless of which buffer we're ++ * drawing to. + */ - r200WaitForFrameCompletion( rmesa ); - if (!rect) - { @@ -2443,56 +2588,118 @@ - if (b->x1 >= b->x2 || b->y1 >= b->y2) - continue; - } -- ++ vertices[0][0] = fb->_Xmin; ++ vertices[0][1] = fb->_Ymin; ++ vertices[0][2] = dst_z; ++ vertices[1][0] = fb->_Xmax; ++ vertices[1][1] = fb->_Ymin; ++ vertices[1][2] = dst_z; ++ vertices[2][0] = fb->_Xmax; ++ vertices[2][1] = fb->_Ymax; ++ vertices[2][2] = dst_z; ++ vertices[3][0] = fb->_Xmin; ++ vertices[3][1] = fb->_Ymax; ++ vertices[3][2] = dst_z; ++ ++ _mesa_ColorPointer(4, GL_FLOAT, 4 * sizeof(GLfloat), &color); ++ _mesa_VertexPointer(3, GL_FLOAT, 3 * sizeof(GLfloat), &vertices); ++ _mesa_Enable(GL_COLOR_ARRAY); ++ _mesa_Enable(GL_VERTEX_ARRAY); ++ ++ while (mask != 0) { ++ GLuint this_mask = 0; ++ ++ if (mask & BUFFER_BIT_BACK_LEFT) ++ this_mask = BUFFER_BIT_BACK_LEFT; ++ else if (mask & BUFFER_BIT_FRONT_LEFT) ++ this_mask = BUFFER_BIT_FRONT_LEFT; ++ ++ /* Clear depth/stencil in the same pass as color. */ ++ this_mask |= (mask & (BUFFER_BIT_DEPTH | BUFFER_BIT_STENCIL)); ++ ++ /* Select the current color buffer and use the color write mask if ++ * we have one, otherwise don't write any color channels. ++ */ ++ if (this_mask & BUFFER_BIT_FRONT_LEFT) ++ _mesa_DrawBuffer(GL_FRONT_LEFT); ++ else if (this_mask & BUFFER_BIT_BACK_LEFT) ++ _mesa_DrawBuffer(GL_BACK_LEFT); ++ else ++ _mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); + - b++; - n++; -- } ++ /* Control writing of the depth clear value to depth. */ ++ if (this_mask & BUFFER_BIT_DEPTH) { ++ _mesa_DepthFunc(GL_ALWAYS); ++ _mesa_Enable(GL_DEPTH_TEST); ++ } else { ++ _mesa_Disable(GL_DEPTH_TEST); ++ _mesa_DepthMask(GL_FALSE); + } - rmesa->sarea->nbox = n; - - if (!n) - continue; -- + - ret = drmCommandNone( rmesa->dri.fd, DRM_RADEON_SWAP ); - - if ( ret ) { - fprintf( stderr, "DRM_R200_SWAP_BUFFERS: return = %d\n", ret ); - UNLOCK_HARDWARE( rmesa ); - exit( 1 ); -- } ++ /* Control writing of the stencil clear value to stencil. */ ++ if (this_mask & BUFFER_BIT_STENCIL) { ++ _mesa_Enable(GL_STENCIL_TEST); ++ _mesa_StencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE); ++ _mesa_StencilFuncSeparate(GL_FRONT, GL_ALWAYS, ctx->Stencil.Clear, ++ ctx->Stencil.WriteMask[0]); ++ } else { ++ _mesa_Disable(GL_STENCIL_TEST); + } - } - - UNLOCK_HARDWARE( rmesa ); - if (!rect) - { - rmesa->hw.all_dirty = GL_TRUE; -- + - rmesa->swap_count++; - (*psp->systemTime->getUST)( & ust ); - if ( missed_target ) { - rmesa->swap_missed_count++; - rmesa->swap_missed_ust = ust - rmesa->swap_ust; - } -- ++ CALL_DrawArrays(ctx->Exec, (GL_TRIANGLE_FAN, 0, 4)); + - rmesa->swap_ust = ust; - - sched_yield(); -- } ++ mask &= ~this_mask; + } -} -- + -void r200PageFlip( __DRIdrawablePrivate *dPriv ) -+static void r200UserClear(GLcontext *ctx, GLuint flags) - { +-{ - r200ContextPtr rmesa; - GLint ret; - GLboolean missed_target; - __DRIscreenPrivate *psp = dPriv->driScreenPriv; -- ++ r200_meta_restore_transform(rmesa); + - assert(dPriv); - assert(dPriv->driContextPriv); - assert(dPriv->driContextPriv->driverPrivate); -- ++ _mesa_ActiveTextureARB(GL_TEXTURE0 + saved_active_texture); ++ if (saved_fp_enable) ++ _mesa_Enable(GL_FRAGMENT_PROGRAM_ARB); ++ if (saved_vp_enable) ++ _mesa_Enable(GL_VERTEX_PROGRAM_ARB); + - rmesa = (r200ContextPtr) dPriv->driContextPriv->driverPrivate; -- ++ if (saved_shader_program) ++ _mesa_UseProgramObjectARB(saved_shader_program); + - if ( R200_DEBUG & DEBUG_IOCTL ) { - fprintf(stderr, "%s: pfCurrentPage: %d\n", __FUNCTION__, - rmesa->sarea->pfCurrentPage); @@ -2506,8 +2713,7 @@ - usleep( 10000 ); /* throttle invisible client 10ms */ - return; - } -+ GLuint mask = 0; - +- - /* Need to do this for the perf box placement: - */ - { @@ -2516,9 +2722,7 @@ - b[0] = box[0]; - rmesa->sarea->nbox = 1; - } -+ if (flags & RADEON_FRONT) -+ mask |= BUFFER_BIT_FRONT_LEFT; - +- - /* Throttle the frame rate -- only allow a few pending swap buffers - * request at a time. - */ @@ -2530,29 +2734,19 @@ - (void) (*psp->systemTime->getUST)( & rmesa->swap_missed_ust ); - } - LOCK_HARDWARE( rmesa ); -+ if (flags & RADEON_BACK) -+ mask |= BUFFER_BIT_BACK_LEFT; - +- - ret = drmCommandNone( rmesa->dri.fd, DRM_RADEON_FLIP ); -+ if (flags & RADEON_DEPTH) -+ mask |= BUFFER_BIT_DEPTH; - +- - UNLOCK_HARDWARE( rmesa ); -+ if (flags & RADEON_STENCIL) -+ mask |= BUFFER_BIT_STENCIL; - +- - if ( ret ) { - fprintf( stderr, "DRM_RADEON_FLIP: return = %d\n", ret ); - exit( 1 ); - } -+#if 1 -+ _swrast_Clear(ctx, mask); -+#else -+ if (flags & (RADEON_FRONT | RADEON_BACK)) { - +- - rmesa->swap_count++; - (void) (*psp->systemTime->getUST)( & rmesa->swap_ust ); - +- -#if 000 - if ( rmesa->sarea->pfCurrentPage == 1 ) { - rmesa->state.color.drawOffset = rmesa->r200Screen->frontOffset; @@ -2560,28 +2754,31 @@ - } else { - rmesa->state.color.drawOffset = rmesa->r200Screen->backOffset; - rmesa->state.color.drawPitch = rmesa->r200Screen->backPitch; - } -+ -+ if ((flags & (RADEON_DEPTH | RADEON_STENCIL)) -+ && (flags & RADEON_CLEAR_FASTZ)) { - +- } +- - R200_STATECHANGE( rmesa, ctx ); - rmesa->hw.ctx.cmd[CTX_RB3D_COLOROFFSET] = rmesa->state.color.drawOffset - + rmesa->r200Screen->fbLocation; - rmesa->hw.ctx.cmd[CTX_RB3D_COLORPITCH] = rmesa->state.color.drawPitch; - if (rmesa->sarea->tiling_enabled) { - rmesa->hw.ctx.cmd[CTX_RB3D_COLORPITCH] |= R200_COLOR_TILE_ENABLE; - } +- } -#else - /* Get ready for drawing next frame. Update the renderbuffers' - * flippedOffset/Pitch fields so we draw into the right place. - */ - driFlipRenderbuffers(rmesa->glCtx->WinSysDrawBuffer, - rmesa->sarea->pfCurrentPage); -- -- ++ _mesa_PopClientAttrib(); ++ _mesa_PopAttrib(); ++} + + - r200UpdateDrawBuffer(rmesa->glCtx); - #endif +-#endif ++static void r200UserClear(GLcontext *ctx, GLuint mask) ++{ ++ radeon_clear_tris(ctx, mask); } - @@ -2627,10 +2824,7 @@ - flags |= RADEON_DEPTH; - mask &= ~BUFFER_BIT_DEPTH; - } -+ __DRIdrawablePrivate *dPriv = rmesa->radeon.dri.drawable; -+ GLint cx, cy, cw, ch, ret; -+ GLuint i; - +- - if ( (mask & BUFFER_BIT_STENCIL) && rmesa->state.stencil.hwBuffer ) { - flags |= RADEON_STENCIL; - mask &= ~BUFFER_BIT_STENCIL; @@ -2655,7 +2849,10 @@ - flags |= RADEON_CLEAR_FASTZ; - } - } -- ++ __DRIdrawablePrivate *dPriv = rmesa->radeon.dri.drawable; ++ GLint cx, cy, cw, ch, ret; ++ GLuint i; + - LOCK_HARDWARE( rmesa ); - - /* compute region after locking: */ @@ -2671,7 +2868,7 @@ /* Throttle the number of clear ioctls we do. */ -@@ -693,7 +105,7 @@ static void r200Clear( GLcontext *ctx, GLbitfield mask ) +@@ -693,7 +304,7 @@ static void r200Clear( GLcontext *ctx, GLbitfield mask ) gp.param = RADEON_PARAM_LAST_CLEAR; gp.value = (int *)&clear; @@ -2680,7 +2877,7 @@ DRM_RADEON_GETPARAM, &gp, sizeof(gp) ); if ( ret ) { -@@ -703,24 +115,34 @@ static void r200Clear( GLcontext *ctx, GLbitfield mask ) +@@ -703,24 +314,34 @@ static void r200Clear( GLcontext *ctx, GLbitfield mask ) /* Clear throttling needs more thought. */ @@ -2703,13 +2900,13 @@ - r200FlushCmdBufLocked( rmesa, __FUNCTION__ ); + rcommonFlushCmdBufLocked( &rmesa->radeon, __FUNCTION__ ); + -+ + + /* compute region after locking: */ + cx = ctx->DrawBuffer->_Xmin; + cy = ctx->DrawBuffer->_Ymin; + cw = ctx->DrawBuffer->_Xmax - cx; + ch = ctx->DrawBuffer->_Ymax - cy; - ++ + /* Flip top to bottom */ + cx += dPriv->x; + cy = dPriv->y + dPriv->h - cy - ch; @@ -2721,7 +2918,7 @@ drm_radeon_clear_t clear; drm_radeon_clear_rect_t depth_boxes[RADEON_NR_SAREA_CLIPRECTS]; GLint n = 0; -@@ -755,17 +177,17 @@ static void r200Clear( GLcontext *ctx, GLbitfield mask ) +@@ -755,17 +376,17 @@ static void r200Clear( GLcontext *ctx, GLbitfield mask ) } } @@ -2744,7 +2941,7 @@ for ( ; n >= 0 ; n-- ) { depth_boxes[n].f[CLEAR_X1] = (float)b[n].x1; depth_boxes[n].f[CLEAR_Y1] = (float)b[n].y1; -@@ -774,83 +196,91 @@ static void r200Clear( GLcontext *ctx, GLbitfield mask ) +@@ -774,83 +395,92 @@ static void r200Clear( GLcontext *ctx, GLbitfield mask ) depth_boxes[n].f[CLEAR_DEPTH] = ctx->Depth.Clear; } @@ -2793,6 +2990,7 @@ + GLuint flags = 0; + GLuint color_mask = 0; + GLint ret; ++ GLuint orig_mask = mask; + if ( R200_DEBUG & DEBUG_IOCTL ) { + fprintf( stderr, "r200Clear %x %d\n", mask, rmesa->radeon.sarea->pfCurrentPage); @@ -2883,7 +3081,7 @@ -} + if (rmesa->radeon.radeonScreen->kernel_mm) -+ r200UserClear(ctx, flags); ++ r200UserClear(ctx, orig_mask); + else + r200KernelClear(ctx, flags); + @@ -2892,7 +3090,7 @@ /* This version of AllocateMemoryMESA allocates only GART memory, and * only does so after the point at which the driver has been -@@ -875,7 +305,7 @@ void *r200AllocateMemoryMESA(__DRIscreen *screen, GLsizei size, +@@ -875,7 +505,7 @@ void *r200AllocateMemoryMESA(__DRIscreen *screen, GLsizei size, fprintf(stderr, "%s sz %d %f/%f/%f\n", __FUNCTION__, size, readfreq, writefreq, priority); @@ -2901,7 +3099,7 @@ return NULL; if (getenv("R200_NO_ALLOC")) -@@ -886,7 +316,7 @@ void *r200AllocateMemoryMESA(__DRIscreen *screen, GLsizei size, +@@ -886,7 +516,7 @@ void *r200AllocateMemoryMESA(__DRIscreen *screen, GLsizei size, alloc.size = size; alloc.region_offset = ®ion_offset; @@ -2910,7 +3108,7 @@ DRM_RADEON_ALLOC, &alloc, sizeof(alloc)); -@@ -896,7 +326,7 @@ void *r200AllocateMemoryMESA(__DRIscreen *screen, GLsizei size, +@@ -896,7 +526,7 @@ void *r200AllocateMemoryMESA(__DRIscreen *screen, GLsizei size, } { @@ -2919,7 +3117,7 @@ return (void *)(region_start + region_offset); } } -@@ -914,24 +344,24 @@ void r200FreeMemoryMESA(__DRIscreen *screen, GLvoid *pointer) +@@ -914,24 +544,24 @@ void r200FreeMemoryMESA(__DRIscreen *screen, GLvoid *pointer) if (R200_DEBUG & DEBUG_IOCTL) fprintf(stderr, "%s %p\n", __FUNCTION__, pointer); @@ -2949,7 +3147,7 @@ DRM_RADEON_FREE, &memfree, sizeof(memfree)); -@@ -956,16 +386,16 @@ GLuint r200GetMemoryOffsetMESA(__DRIscreen *screen, const GLvoid *pointer) +@@ -956,16 +586,16 @@ GLuint r200GetMemoryOffsetMESA(__DRIscreen *screen, const GLvoid *pointer) card_offset = r200GartOffsetFromVirtual( rmesa, pointer ); @@ -2969,7 +3167,7 @@ if (R200_DEBUG & DEBUG_IOCTL) fprintf(stderr, "r200IsGartMemory( %p ) : %d\n", pointer, valid ); -@@ -976,12 +406,12 @@ GLboolean r200IsGartMemory( r200ContextPtr rmesa, const GLvoid *pointer, +@@ -976,12 +606,12 @@ GLboolean r200IsGartMemory( r200ContextPtr rmesa, const GLvoid *pointer, GLuint r200GartOffsetFromVirtual( r200ContextPtr rmesa, const GLvoid *pointer ) { @@ -2985,7 +3183,7 @@ } -@@ -989,7 +419,7 @@ GLuint r200GartOffsetFromVirtual( r200ContextPtr rmesa, const GLvoid *pointer ) +@@ -989,7 +619,7 @@ GLuint r200GartOffsetFromVirtual( r200ContextPtr rmesa, const GLvoid *pointer ) void r200InitIoctlFuncs( struct dd_function_table *functions ) { functions->Clear = r200Clear; From airlied at fedoraproject.org Tue Mar 10 01:09:14 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 10 Mar 2009 01:09:14 +0000 (UTC) Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.63, 1.64 kernel.spec, 1.1400, 1.1401 Message-ID: <20090310010914.09D0C70034@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22771 Modified Files: drm-modesetting-radeon.patch kernel.spec Log Message: * Mon Mar 09 2009 Dave Airlie - radeon: enable kms on r100/r200 drm-modesetting-radeon.patch: Index: drm-modesetting-radeon.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- drm-modesetting-radeon.patch 9 Mar 2009 03:11:26 -0000 1.63 +++ drm-modesetting-radeon.patch 10 Mar 2009 01:09:12 -0000 1.64 @@ -1,3 +1,1532 @@ +commit 85510fb358cb3c0e3d526a93389a8d847b7398c0 +Author: Dave Airlie +Date: Tue Mar 10 19:01:37 2009 +1000 + + radeon: enable kms on r100/r200 + +commit cd45bd5f01fb0294befd98ced95e46e3a6983d2c +Author: Dave Airlie +Date: Sat Mar 7 19:11:20 2009 +1100 + + drm: switch uncached allocator to be generic cached/uncached + + This gets rid of neraly all the overhead of dma allocs for glxgears. + + using cached pages on PCIE ftw + +commit b34c746ed223c60c3c8aa2b9f707eaaf9e0427dc +Author: Dave Airlie +Date: Sat Mar 7 17:55:11 2009 +1100 + + radeon: when we are using PCIE/IGP don't play with caching + + We really want to use cached BOs as much as possible on PCIE/IGP + for now. We should investigate uncached BOs for certain operations + perhaps. + + Signed-off-by: Dave Airlie + +commit 121cc720f350cc7a34af1d8a3c002266ba990d9b +Author: Dave Airlie +Date: Fri Mar 6 16:42:06 2009 +1100 + + radeon: add depth offset reloc properly + +commit e2eeb3497972e391e519c2139a5ac9fd32dadccc +Author: Dave Airlie +Date: Fri Mar 6 16:25:38 2009 +1100 + + radeon: r100/r200 add depth offset check + +commit 9abfacf388ee1f62cd2f19b32639372b781cd9b7 +Author: Dave Airlie +Date: Fri Mar 6 06:07:38 2009 +1000 + + radeon: add some more texture relocations for r100/r200/r300 + +commit e039bd0f71b17bad18724b5fbb0c1f72be737de2 +Author: Dave Airlie +Date: Thu Mar 5 15:57:18 2009 +1000 + + radeon: add special relocation for WAIT_VLINE + + This is half ways between a hack and really neat. + +commit bd274a6fb4d9bd78e2467620e6c5898c209dfb12 +Author: Dave Airlie +Date: Tue Mar 3 18:23:22 2009 +1000 + + radeon: port proc debug files to new debugfs interface + +commit f5b2321e7d646e6e7438911e811a973e34270abb +Author: Dave Airlie +Date: Tue Mar 3 15:33:52 2009 +1000 + + radeon: pin framebuffer and cursors dynamically + +commit dfe5afc942903cdf9240db9da3670bae07742f85 +Author: Alex Deucher +Date: Fri Feb 27 20:25:36 2009 -0500 + + radeon: fix MC setup on systems with more than 512 MB of VRAM + + Signed-off-by: Alex Deucher + +commit 1c653f0dd7ca80b57be396b5af67f18a73ce6bbc +Author: Alex Deucher +Date: Fri Feb 27 20:18:20 2009 -0500 + + radeon: leave the MC_FB_LOCATION alone on RS780 + + Signed-off-by: Alex Deucher + +commit 709a927cf8b67b87086e7cf97cc8916f9b9106f9 +Author: Alex Deucher +Date: Fri Feb 27 20:15:04 2009 -0500 + + radeon: wait for MC idle on r6xx/r7xx chips + + Signed-off-by: Alex Deucher + +commit 1be02ac8d9307f2aeb1190dd1e08f8588020b273 +Author: Alex Deucher +Date: Fri Feb 27 20:07:13 2009 -0500 + + radeon: fix up RS600 mc setup and unify mc reg access + + Signed-off-by: Alex Deucher + +commit 4e200d8a0063650385096ab6485dea9d428acecb +Author: Dave Airlie +Date: Mon Mar 2 23:51:30 2009 +1100 + + radeon: fixup suspend/resume hooks + +commit b6cd6f6b0c543380381fd730031831e62da3fbda +Author: Dave Airlie +Date: Sun Mar 1 18:25:07 2009 +1100 + + radeon: fix rs480 gart size + +commit 59109f23bf6e835e80d43d138f22520882618a7c +Author: Dave Airlie +Date: Fri Feb 27 15:37:14 2009 +1000 + + radeon: disable kms by default for r600 + +commit 0b64e6b2ba58ca37f8c40d3954b523e44d691430 +Author: Dave Airlie +Date: Fri Feb 27 11:51:22 2009 +1000 + + radeon: fixup proc hacks + +commit c83e971d04031798907c5d1b3a6dfeda9eb7bbd3 +Author: Dave Airlie +Date: Fri Feb 27 11:51:08 2009 +1000 + + radeon: fixup module load + +commit 3642c37a553efb63c1835da912731b131231dd3e +Author: Dave Airlie +Date: Fri Feb 27 11:50:50 2009 +1000 + + radeon: fix up ring read/write for new drm-next code + +commit 9a66ef9814ccf8dded0d59a14da04f10d3082708 +Author: Dave Airlie +Date: Fri Feb 27 11:50:24 2009 +1000 + + ati_pcigart: update pcigart for changes in drm-next + +commit 2e236e8f40317c3bf944e8214829aa22669de489 +Author: Dave Airlie +Date: Thu Feb 26 22:27:21 2009 +1000 + + radeon: fixup writeback/ring ptrs for Kms + +commit de3c748976b7fe35bf1cb0d8ddfd006698d9fcf3 +Author: Dave Airlie +Date: Thu Feb 26 22:00:59 2009 +1000 + + radeon: fixup after rebase so it builds + + lots more to do + +commit 26ae113e4e1eeb7c0f6b54fb9426173875f1302a +Author: Dave Airlie +Date: Thu Feb 26 12:03:55 2009 +1000 + + drm/radeno: add support for r100 cp type 3 packets + +commit 6396d153c51a88225f48f32a06bf32f763976631 +Author: Dave Airlie +Date: Wed Feb 25 16:07:15 2009 +1000 + + radeon: fixup cs buffer re-use code to not block straight away + +commit 16b03d4bd01e196283b6022fcf9d1cfcd8a9dd8e +Author: Dave Airlie +Date: Wed Feb 25 16:06:30 2009 +1000 + + radeon: port CS mutex over from drm.git + + Totally missed this before - really helps stability + +commit eb42460c14c46ca57a4db94245ae678d9c745e2d +Author: Dave Airlie +Date: Wed Feb 25 13:03:47 2009 +1000 + + radeon: fix IB dump end + +commit 551ac6e7de26f8a8a9bfd6cd4a768968a4e5f82a +Author: Thomas Hellstrom +Date: Tue Feb 24 20:26:53 2009 +1000 + + drm/ttm: work around some x86 pat oddities by using mixedmap instead of pfnmap + +commit e248a04dd2ad1b38b9f25bf6d60f4423595d7c7b +Author: Dave Airlie +Date: Sun Feb 22 08:22:14 2009 +1000 + + radeon: add module IDs + +commit 28b0b74dae8edd5b99f4067f251700fbd6f45f54 +Author: Dave Airlie +Date: Sun Feb 22 08:19:33 2009 +1000 + + radeon: fixup for new APIs + +commit 67007e9c5d1cf3aed713d8fcb9e49991441685ea +Author: Dave Airlie +Date: Sun Feb 22 08:11:33 2009 +1000 + + drm: fix parmeter passed to fb_release + +commit 683d802a7122ae6463a100d4db87a030a6e5b789 +Author: Dave Airlie +Date: Wed Feb 18 17:36:33 2009 +1000 + + radeon: add IB dumping + + this adds basic IB dumping and cleans up some code around it. + +commit d4f11e7e4c971bcb955a6e6d5f91ad219fec4d8b +Author: Dave Airlie +Date: Wed Feb 18 11:12:19 2009 +1000 + + radeon: fix packet2 parsing + enhance debug + +commit 82f9be7accb1ba4868a51dd7dfb392fb150ef243 +Author: Dave Airlie +Date: Wed Feb 18 11:11:39 2009 +1000 + + radeon: use r100/r200 table to setup the regs database + + This takes the packet table from the older CS method and re-uses it to + setup the valid register table. + + It also doesn't or in the table values but sets them + +commit 88c0d5f8cf3007d48b761e7d33ccbe9964152289 +Author: Dave Airlie +Date: Tue Feb 17 20:57:34 2009 +1000 + + radeon/i2c: i2c adapter id is gone + +commit 7af3f24aa54f3b8a8c5e59e4cd3c25e1e39a6d35 +Author: Dave Airlie +Date: Thu Jan 22 17:15:56 2009 +1000 + + drm: fix radeon Kconfig + +commit 0e15e446001ecd67ce0fb740092cbca61f9920cf +Author: Dave Airlie +Date: Sun Jan 11 19:50:23 2009 +1000 + + radeon: add missing Kconfig text + +commit a3593ea46217392fe98040f6c4eae20f173a0641 +Author: Dave Airlie +Date: Sun Jan 11 19:47:39 2009 +1000 + + drm: fix merge issue that messes up irq + +commit 12a869aeee1d43d75077ccb0742e1d6672c0cff2 +Author: Dave Airlie +Date: Sat Jan 10 12:40:42 2009 +1000 + + radeon: add getparam to get pci device from userspace + +commit 41eab9945df058e15d22a5cda4aed0e086e5412c +Author: Dave Airlie +Date: Thu Dec 18 23:01:12 2008 +1000 + + drm: don't set cached bits on pages from uncached allocator. + + This should make AGP no corrupt itself to all buggery + (cherry picked from commit 55c0a3f1d3693cb5c3b65f37d4bb6e8a3c025460) + +commit 79a4aa259b41457361c94c24b74c550e52079705 +Author: Dave Airlie +Date: Tue Dec 2 16:38:04 2008 +1000 + + drop old CS + +commit 14d3a512b1da85fed4dcd8d18e7e414dbd8bce39 +Author: Dave Airlie +Date: Mon Dec 1 15:09:27 2008 +1000 + + radeon: update with latest CS bits + +commit 830554d3eb003dbec5ab456aba80be5b082d0933 +Author: Dave Airlie +Date: Wed Dec 17 06:56:36 2008 +1000 + + fixups post rebase + +commit a860582dfdad05de769b83f23af7da17766b6a7a +Author: Dave Airlie +Date: Thu Dec 11 01:35:09 2008 +1000 + + radeon: fix agp mode when kms isn't enabled + +commit 1b831e0840b8fef20634c5f5ca18b275494705ee +Author: Dave Airlie +Date: Wed Dec 3 17:22:07 2008 +1100 + + radeon: add support for accessing disabled ROMs. + +commit a09ca5260b48b00d28c454ceba71265d9b7de301 +Author: Dave Airlie +Date: Wed Dec 3 17:19:02 2008 +1100 + + radeon: make cail do pll read/write via actual PLL functions + +commit c214949d354de7e6e6306cb90deaa7253aa7d913 +Author: Dave Airlie +Date: Wed Dec 3 16:36:00 2008 +1100 + + radeon: atom fixes for endianness + +commit 5731a00b153b2dd550586e84fde9feef6c2d4212 +Author: Dave Airlie +Date: Wed Dec 3 20:28:05 2008 +1000 + + radeon: AGP fixes round 2. + + More I can't believe its not AGP fixes. + Limit the AGP aperture to the GART size, and init the registers + in the right place + +commit 809221e8bf8410dd723c5ca51de5200eddf4387e +Author: Dave Airlie +Date: Tue Dec 2 12:49:17 2008 +1000 + + radeon: AGP fixes + + 1. Proper PCIE fallback on PCIE cards. + 2. Setup agp base + location regs properly + +commit 80dcec25a55f4572cc666a87613f1876c69f58e5 +Author: Michal Schmidt +Date: Tue Dec 2 08:06:59 2008 +1000 + + radeon: fix IGP GART calcs + + fedora bz 473895 + +commit ff1f9d13924fba428d039b18ced9f9a65ba0915c +Author: Dave Airlie +Date: Thu Nov 27 17:14:40 2008 +1000 + + radeon: post any GPUs that aren't posted + +commit b2f4666ef616c190eb545d635183568043e170f1 +Author: Dave Airlie +Date: Mon Nov 24 15:18:31 2008 +1000 + + radeon: enable larger GART size on PCIE/IGP + + Allocate a larger GART on PCIE and IGP chipsets controlled by the gart_size + command line option. + + Default to 512MB gart. + +commit 3206705ff8403525291eccfc8cca47ff246d3b21 +Author: Dave Airlie +Date: Mon Nov 24 15:17:49 2008 +1000 + + radeon: add some missing feature checks for modesetting + +commit 7decf0c32c01a0ffb7590271771197859fe26770 +Author: Dave Airlie +Date: Mon Nov 24 11:41:06 2008 +1100 + + radeon: make rs480/rs690 gart invalidate work properly. + + we really need to read back to make sure the invalidate has happened + before continuing along happily in life. + +commit 312496e7a43b9df395acbecc53272f6d866300ad +Author: Dave Airlie +Date: Sun Nov 23 19:19:02 2008 +1000 + + drm: we have discardable now so don't do special cases + +commit 6e1e6dbe649721345943bf58740bf3dcefedad8f +Author: Dave Airlie +Date: Fri Nov 21 14:52:25 2008 +1000 + + atom: fix bug in parser for MC reads + +commit 8b5d3666aaef086ca4456a452a2983414a2fd9d4 +Author: Dave Airlie +Date: Mon Nov 17 18:14:28 2008 +1000 + + radeon: turn of VRAM zeroing by default for now - needs work + +commit 1996c2ba79351996635d04c4ab9149f436eb7294 +Author: Dave Airlie +Date: Mon Nov 17 09:03:36 2008 +1000 + + radeon: fix return value for no relocs + +commit 164fc5078364a42262d8fd2a8c0bc4bf36a03c82 +Author: Dave Airlie +Date: Mon Nov 17 09:03:01 2008 +1000 + + ttm: add discard for VRAM buffers + +commit 07516743f53ddd91d8cbe64d7f9eb15e6ac99393 +Author: Dave Airlie +Date: Fri Nov 14 15:52:32 2008 +1000 + + drm: fix the exit path of the bo unlocking + +commit 5f2a4e386644c556945472e4e62905980c1707eb +Author: Dave Airlie +Date: Fri Nov 14 15:51:44 2008 +1000 + + radeon: fixup relocate to work on locate write buffers in VRAM first. + + Fixup failure paths and make EAGAIN work + +commit 6b53199631b4663935b537d4af94b8226d714292 +Author: Dave Airlie +Date: Thu Nov 13 17:22:26 2008 +1100 + + radeon: fix some issues since last rebase + +commit fe6cfbd92f444ec0c8a4764b70b3ccef6d0adbcd +Author: Dave Airlie +Date: Wed Nov 12 09:01:14 2008 +1000 + + radeon: fix more build + +commit 93e2435814ba5d05e3c68d3095923d342ad233de +Author: Dave Airlie +Date: Wed Nov 12 08:59:04 2008 +1000 + + radeon: fix compile + +commit d249f5e92393cee7585fff0cc0f57b2a568f058a +Author: Dave Airlie +Date: Mon Nov 10 14:26:11 2008 +1000 + + radeon: add gart useable size to report to userspace + +commit 4e6436d3188aef52d6b31fa0b25d2e44b98056d2 +Author: Dave Airlie +Date: Sun Nov 9 20:34:49 2008 +1000 + + radeon: fix powerpc oops on rv280 + +commit 8a03ca851e33e067981aa33648c4aaf536b5ae18 +Author: Dave Airlie +Date: Sun Nov 9 10:23:43 2008 +1000 + + radeon: upgrade atom headers + +commit b33502e29664f2414eac9c9aeed8f0d4416ec93e +Author: Dave Airlie +Date: Sat Nov 8 14:39:41 2008 +1000 + + radeon: fix fence race condition hopefully + + For some reason reading the SCRATCH reg from RAM causes some race to occur. + Hopefully fix this. + +commit 79b1e7caf75eac0569942c3ee23d9e6e1fff4c67 +Author: Dave Airlie +Date: Sat Nov 8 11:31:03 2008 +1000 + + drm/radeon: add dpms connector functions + +commit e7d9e11e35a1c96917308889bb78d0ac12073e67 +Author: Dave Airlie +Date: Fri Nov 7 16:22:22 2008 +1000 + + radeon: avivo cursors are across the full surface. + + fixes cursor on second head + +commit 149420076a621cb9510b7a303d822cce1eb7fa85 +Author: Dave Airlie +Date: Fri Nov 7 16:21:03 2008 +1000 + + modesetting: set the crtc x,y after the mode base change + +commit ef18b7de77e1833cd0a71b0143bc8b94d7b4584b +Author: Dave Airlie +Date: Wed Nov 5 10:23:35 2008 +1000 + + drm/radeon: add uncached allocator to drm ttm code. + + This allows re-use of uc/wc marked pages + +commit 2966196cdd272216b5a2b18f518854c20108ce65 +Author: Dave Airlie +Date: Tue Nov 4 13:18:02 2008 +1000 + + radeon: disable HDP read cache for now + +commit 17edb7f743f87439ad277b36771dc48fc79fd01e +Author: Dave Airlie +Date: Mon Nov 3 15:43:08 2008 +1000 + + radeon: fixup vram visible calculation to take a/c pinned objects for now + +commit 6f047bee0334d27ecf472c42365cbb53047aca13 +Author: Dave Airlie +Date: Mon Nov 3 09:56:02 2008 +1100 + + radeon: if modesetting state is unknown make it known so pm-utils can use it + +commit 83ef7cc84d460b79c8cf0f2561d15fb3c48f3b7b +Author: Dave Airlie +Date: Fri Oct 31 14:40:12 2008 +1000 + + radeon: fix ROP values for the paint ROP + +commit e59eee09c376a23083e4611602becd8cb784f85a +Author: Dave Airlie +Date: Thu Oct 30 14:00:39 2008 +1000 + + radeon: add mtrr support for VRAM aperture. + + This speeds things up a bit + +commit 6b279dc10dce026518179958ad4c772e63b19a7c +Author: Dave Airlie +Date: Thu Oct 30 14:00:15 2008 +1000 + + radeon: disable AGP for certain chips if not specified until we figure it out + +commit c2f8f0621f88dd214c27aaa4145820e751d6d104 +Author: Dave Airlie +Date: Wed Oct 29 15:45:47 2008 +1000 + + radeon: disable debugging message + +commit f2b541c168e0aef790f03fcfd36d76d723787c39 +Author: Dave Airlie +Date: Wed Oct 29 15:37:32 2008 +1000 + + radeon: commit ring after emitting the buffer discards + +commit f5571843ad266102bb4cd93f640bbfa730df9b61 +Author: Dave Airlie +Date: Wed Oct 29 17:39:27 2008 +1100 + + radeon: fix whitespace in encoders C file + +commit 7a0aabb129d581663ba207e63342d8256bd60353 +Author: Dave Airlie +Date: Wed Oct 29 17:39:08 2008 +1100 + + radeon: add more HDMI bits + +commit 66383dea1fa552976b6f0653eb04f1b061f91c03 +Author: Dave Airlie +Date: Thu Oct 30 01:41:34 2008 +1000 + + radeon: set dma bufs bo type to a kernel type + +commit 0e85ebe0bc716bf6a2b4eb9b884538ca55197f72 +Author: Dave Airlie +Date: Wed Oct 29 15:46:16 2008 +1100 + + radeon: enable DVI-D + HDMI connectors. + + This allows the rs690 to work on DVI + +commit 588f5064301b3ab9776faeaca9fa9343516f63b5 +Author: Dave Airlie +Date: Tue Oct 28 20:33:13 2008 +1000 + + radeon: setup isync cntl properly + +commit 4b004f17d087b7d3b05b1aa7d3da1ccacb3cf227 +Author: Dave Airlie +Date: Tue Oct 28 20:31:27 2008 +1000 + + radeon: add more debugging + +commit 256fe7ac7d23d254d55c0eceab0a2e30e666a91c +Author: Dave Airlie +Date: Tue Oct 28 20:26:04 2008 +1000 + + radeon: overhaul ring interactions + + emit in 16-dword blocks, emit irqs at same time as everything else + +commit c03beb43a3958c560c45f0985b0e9095cace1024 +Author: Dave Airlie +Date: Tue Oct 28 16:46:47 2008 +1000 + + radeon: add proc debugging for interrupts/ring + +commit f43ad0f2d7d5844a95c7792e9657823b7bda8269 +Author: Dave Airlie +Date: Tue Oct 28 16:44:54 2008 +1000 + + radeon: only enable dynclks if asked for + +commit 7611a729b6f821c6ec025fa79b959c87d2372574 +Author: Dave Airlie +Date: Tue Oct 28 06:35:10 2008 +1000 + + radeon: add wait rendering API + +commit 9c0ef8d1ee719adbae91776d7830b034cea7a80f +Author: Dave Airlie +Date: Mon Oct 27 18:30:15 2008 +1000 + + radeon: remove unused gem indirect ioctl + +commit d1a9729dd7ea3629340587c9b40de38a628cad1c +Author: Dave Airlie +Date: Mon Oct 27 16:41:09 2008 +1000 + + radeon: fix some warnings + +commit e27e8b840b20e2db56a5f9ea82669a725e44ee97 +Author: Dave Airlie +Date: Mon Oct 27 16:40:34 2008 +1000 + + radeon: fix free after refcount + +commit 86622cccc891397fca746a246342ef390f5ed66e +Author: Dave Airlie +Date: Mon Oct 27 16:40:15 2008 +1000 + + radeon: CS2 make it all work with new relocs style + +commit cf4211732c0826e47c0ee5845e592245867e7223 +Author: Dave Airlie +Date: Mon Oct 27 16:39:12 2008 +1000 + + radeon: don't copy to user the cs ids + +commit 2886f4709e0de2ad8aa2fcda00630a01e98443d1 +Author: Dave Airlie +Date: Mon Oct 27 14:23:22 2008 +1000 + + radeon: make new CS2 command submission interface port older interface to this + +commit 0307426c1d0517c758c9aca5e274d689f8cda06e +Author: Dave Airlie +Date: Thu Oct 23 19:13:50 2008 +1000 + + radeon: release agp on module unload + +commit c4c6a3c7061cbe38e1aebe19c8e9038e83613d27 +Author: Dave Airlie +Date: Tue Oct 21 14:15:23 2008 +1000 + + radeon: add r423 bits to modesetting + +commit 2cc60c202afdb5233993d25d36aefa6c561c2586 +Author: Dave Airlie +Date: Tue Oct 21 14:12:38 2008 +1000 + + radeon: pull bus master enable into its own function + +commit 8d1312eda42e7d851fc0a252b4386b4d65d00ba7 +Author: Dave Airlie +Date: Mon Oct 20 14:44:23 2008 +1000 + + radeon: fix accessible VRAM sizing. + + We actually were passing accessible to userspace, but I thought + the code sized it correctly, however it doesn't seem to. + +commit edf47666be04c602fe6bea5cf9d4c0342fb80538 +Author: Dave Airlie +Date: Mon Oct 20 13:41:05 2008 +1000 + + radeon: update proper chip family + +commit 761ede6f2802671863d11d92cefe0b741006bcfe +Author: Dave Airlie +Date: Mon Oct 20 12:08:50 2008 +1000 + + radeon: fixup scratch register interactions properly + +commit 914b95db67a7b88ec997059d6445deda5b411d5a +Author: Dave Airlie +Date: Mon Oct 20 10:27:50 2008 +1000 + + radeon: make writeback work again + +commit 2a28a9d058129c1b9b55db984ba21f1d4ebab77f +Author: Dave Airlie +Date: Mon Oct 20 09:20:23 2008 +1000 + + drm: cleanup some warnings + +commit 2f075376d42529a5601e207082e2f77735e3f03d +Author: Dave Airlie +Date: Thu Oct 16 16:29:08 2008 +1000 + + radeon: fix small typo in agp code + +commit 43798d2e4f3b411958eb64d9dd01d209151b07bd +Author: Dave Airlie +Date: Thu Oct 16 16:17:01 2008 +1000 + + radeon: workaround failure to parse some rs48x edid + +commit 8d6af9be3705511a343cf2e50b36f49ae865b997 +Author: Dave Airlie +Date: Thu Oct 16 16:15:08 2008 +1000 + + radeon: don't enable dynclks on rs48x + +commit 8b2cf6807eeebf01aa9b7615e0b74eefa4b85a4e +Author: Dave Airlie +Date: Wed Oct 15 15:12:20 2008 +1000 + + radeon: allow r100/r200 modesetting to be forced on by users + +commit 6258201b624ef976060cbab6b5dfeaa865f3e6a2 +Author: Dave Airlie +Date: Thu Oct 16 22:06:00 2008 +1000 + + radeon: fix unused agp functionality + +commit e3063ac5c06634f93c11b61ea65b9505ccf237fc +Author: Dave Airlie +Date: Thu Oct 16 22:05:02 2008 +1000 + + radeon: add some more r100 support to test AGP + +commit 30fc2390c1206e81457ba21b9fc32e0ad2fe678d +Author: airlied +Date: Wed Oct 15 23:58:03 2008 +1000 + + radeon: add initial agp support. + + This add agpmode command line option. + +commit edd8423eab59f95fe78afaab913ee07bed9b491e +Author: airlied +Date: Wed Oct 15 23:57:21 2008 +1000 + + radeon: add CS support for r100/r200 in 2D driver + +commit 4c40ab66e516835c830522520810d8e8568bcc85 +Author: Dave Airlie +Date: Thu Oct 9 16:37:23 2008 +1100 + + radeon: fixup interrupt suspend/resume + +commit 0268699b5e507d3c798ec0116a50d0317903a4c6 +Author: Dave Airlie +Date: Wed Oct 8 16:57:12 2008 +1000 + + radeon: fixup suspend/resume bus master enable + +commit 6771715974b0762b581dd28b0c6e6da6046d6e1f +Author: Dave Airlie +Date: Wed Oct 8 16:56:04 2008 +1000 + + radeon: re-enable hw blits for copying from VRAM + +commit e1f0bf2f74ecd1e844bac82c6f3a926c9d951657 +Author: Dave Airlie +Date: Wed Oct 8 16:53:43 2008 +1000 + + radeon: fix buffer copying for VRAM->TT + +commit ffa1c98f896b4fe136de1836494787b896751da0 +Author: Dave Airlie +Date: Wed Oct 8 16:51:58 2008 +1000 + + radeon: move memcpy until after CP is stopped + +commit be269a05c7a0b0a0a82e355dd3cef0b784381fd9 +Author: Dave Airlie +Date: Tue Oct 7 16:34:12 2008 +1000 + + drm: remove stray debug code + +commit dfc61d03cb6f72f58cdf2b5fa1e8073fd7362ff3 +Author: Dave Airlie +Date: Tue Oct 7 16:31:22 2008 +1000 + + radeon: use discardable flags on no backing store objects + +commit 9707473bf198df414d140d1f4e363a7d2161fbae +Author: Dave Airlie +Date: Tue Oct 7 16:30:09 2008 +1000 + + drm: add discardable flag. + + This discards memory contents on suspend/resume with the + hope the upper layers know something we don't. + +commit dfa8e82c56e8beb7c25456aaaba5c6cc2ec48afc +Author: Dave Airlie +Date: Tue Oct 7 16:27:31 2008 +1000 + + drm/radeon: initial suspend/resume fix. + + This enables the evict code and also sets radeon up + to allow evict from VRAM to LOCAL + +commit 7f41f849fdfeaecf2790cf03054a4c1efe3059a0 +Author: Dave Airlie +Date: Mon Oct 6 16:20:38 2008 +1000 + + radeon: fixup alignment between GEM and TTM + + fixup the interface between gem and ttm for alignment. makes Xv work better + +commit 8df2fc577181a1a7609baa5791daceb13cc43af8 +Author: Dave Airlie +Date: Wed Oct 1 11:27:02 2008 +1000 + + radeon: fixup GEM pinned offset retrieval for mesa + +commit 6129cc7a4814a0ba45cd44d7002aac9d2c4e1b61 +Author: Dave Airlie +Date: Wed Oct 1 11:25:54 2008 +1000 + + drm: fixup clean flag handling properly + +commit ef42fa0e79bb164c3a504c62e4e3aac65ce79c18 +Author: Alex Deucher +Date: Mon Sep 29 14:57:11 2008 +1000 + + radeon: use atom for ext tmds on r4xx + +commit 49b556352e646afb11f8422429d640f9d428e2c6 +Author: Alex Deucher +Date: Mon Sep 29 14:56:32 2008 +1000 + + radeon: make atom on r4xx a module option + + default is legacy modesetting. pass module option r4xx_atom + to try using atom on r4xx. + +commit 580cbde5bf712c9c9e76d73b81ff4b6e8f77f148 +Author: Alex Deucher +Date: Mon Sep 29 14:55:16 2008 +1000 + + radeon: first pass at using atombios on r4xx hw + +commit 08cc15e19ea691e99f8c5a0c1b6788681757e9d5 +Author: Dave Airlie +Date: Mon Sep 29 14:50:47 2008 +1000 + + radeon: add r600 modesetting registers writes + +commit b2b0663222bec03d298777a3fc9d3f66f9b0272d +Author: Dave Airlie +Date: Mon Sep 29 14:45:11 2008 +1000 + + radeon: parse object tables for connectors on r600 + +commit 85cf00824a1d7b57d95cc8222111b47a289a82fb +Author: Dave Airlie +Date: Tue Sep 23 16:34:55 2008 +1000 + + radeon: fix minor cursor disappearing issues + +commit 97eaafe7033f44fd4095263ba0fb4b1c931293c6 +Author: Kristian H??gsberg +Date: Mon Sep 22 18:40:36 2008 -0400 + + radeon: Fix type in check for tmds type. + +commit f835eabd02fab838a3c2d81f283b628db524a22f +Author: Kristian H??gsberg +Date: Mon Sep 22 12:00:57 2008 -0400 + + Store the buffer object backing the fb as a void pointer, not a handle. + + This lets us defer handle creation until userspace acutally asks for + one, at which point we also have a drm_file to associate it with. + +commit 620c4893322e2337bcbfec73890ee53ac85a8912 +Author: Dave Airlie +Date: Sun Sep 21 09:48:51 2008 +1000 + + drm: fixups on top of rebase + +commit 56b1d148fb5ae36b77a8a88616929438212f77b2 +Author: Dave Airlie +Date: Sat Sep 20 03:08:05 2008 +1000 + + radeon: rmx_fixup() fixes for legacy chips + +commit fb1984082185045beb436aa67aa5a709543311e9 +Author: Dave Airlie +Date: Sat Sep 20 01:55:27 2008 +1000 + + radeon: fix combios + +commit 4d8ce6248e75e864e5da16470a5338ee1cf28745 +Author: Dave Airlie +Date: Fri Sep 19 09:17:36 2008 +1000 + + radeon: port Alexs patches from modesetting-gem + +commit 385a6616e420c34b5851b3cd4fb8057cba67f8fc +Author: Kristian H??gsberg +Date: Thu Sep 18 16:10:29 2008 -0400 + + radeon: Add DRM_ERROR() messages to all EINVAL exits from DRM_RADEON_CS. + + Shouldn't trigger under normal use and when something breaks, it will + be easier to debug. + +commit 5284eeab2934faad2063c6d4454506a4afea018b +Author: Kristian H??gsberg +Date: Thu Sep 18 16:07:50 2008 -0400 + + Allow R300_DST_PIPE_CONFIG for R420 and up. + + The X server emits writes to R300_DST_PIPE_CONFIG for R420 chipsets during + accel init. + +commit b1cb328f2b882f22a1add8da56b31b8e063df5fe +Author: Kristian H??gsberg +Date: Thu Sep 18 14:53:46 2008 -0400 + + radeon kms: Get precedence right when computing PLL values. + +commit 9fb52142f4966a5d697c308959df02baad94c30d +Author: Alex Deucher +Date: Thu Sep 18 09:55:14 2008 +1000 + + radeon: further LVDS fixes + +commit 44ce629a68dcf21471241bd662c64782a7e6b1fc +Author: Alex Deucher +Date: Thu Sep 18 09:54:12 2008 +1000 + + radeon: legacy lvds updates + +commit 0e53b81b9e750ba4fcf5d0ffcc0ee37eb81cc1f5 +Author: Dave Airlie +Date: Thu Sep 11 18:26:27 2008 +1000 + + radeon: fixup buffer and cs + + just fallback around busted stuff for now + +commit 420bb28e51e4a67ce7e4b57beda203d0f5518fa9 +Author: Dave Airlie +Date: Thu Sep 11 18:25:18 2008 +1000 + + radeon: fixup GEM domain setting - allows more userspace paths + + also dirty buffer on validate + +commit 1ab9b0aa4be4447fdf92fbf55e3016db74aa1f04 +Author: Dave Airlie +Date: Thu Sep 11 17:13:32 2008 +1000 + + radeon: disable blit moves + +commit 2199e43ed192c9ef42684e4b048cc592c226c512 +Author: Dave Airlie +Date: Thu Sep 11 16:18:27 2008 +1000 + + radeon: fail properly if we can't create the ring. + + Normally this will be due to an AGP driver needing updating + +commit 4a976f85e2522bcf26a15a75961fc16f2f75cac8 +Author: Dave Airlie +Date: Wed Sep 10 14:35:43 2008 +1000 + + radeon: do proper memory controller init and setup + +commit c9f1c2cd97a339432347a3c6b14833825c75a658 +Author: Dave Airlie +Date: Wed Sep 10 14:35:08 2008 +1000 + + radeon: fix return value + +commit 5ad1696f217f6f626a420d708af76ef2c120ce9a +Author: Dave Airlie +Date: Wed Sep 10 14:34:39 2008 +1000 + + radeon: fixup reference counting properly + +commit 3f0b29b7840ba25877dc2445f9ad97779d2f2041 +Author: Dave Airlie +Date: Tue Sep 9 15:55:38 2008 +1000 + + radeon: sort out atom vs combios tables for r400 cards + +commit e246ab15373406ef1d7f4c58b2c0bffd8ed9747f +Author: Dave Airlie +Date: Mon Sep 8 11:37:26 2008 +1000 + + radeon: remove unneeded debugging + +commit 1ddb69f3e68215d5ca9c3fa850588347ba31d90e +Author: Dave Airlie +Date: Mon Sep 8 11:25:12 2008 +1000 + + radeon: don't do full edid for detection purposes + +commit 2bd64ea1e093fb20384322025a8cfc7eebfadb73 +Author: Dave Airlie +Date: Mon Sep 8 10:27:48 2008 +1000 + + radeon: disable debugging that sneaky itself on + +commit bf7ee9ca1c05014310be2d406c159964d111e235 +Author: Dave Airlie +Date: Mon Sep 8 10:20:44 2008 +1000 + + radeon: make text reserve 256k + +commit 4de464ee77ec2a4a1622f6a92a279b8b74a556e8 +Author: Dave Airlie +Date: Mon Sep 8 10:11:27 2008 +1000 + + radeon: don't disable VGA bits it breaks X later + +commit 90ad5d81a1a09b2629bc661ae299ca93584a23ea +Author: Dave Airlie +Date: Fri Sep 5 16:12:59 2008 +1000 + + radeon: further suspend/resume support + +commit 7b669f986abfd20969fea6b9a2b278f36e6804d7 +Author: Dave Airlie +Date: Fri Aug 29 14:52:15 2008 +1000 + + radeon: add initial suspend/resume support + + this gets us back to fbcon.. its dirty like zebra + +commit 1ef166842039d1d52847a5dc0c1f004502faf8f6 +Author: Dave Airlie +Date: Fri Sep 5 11:15:03 2008 +1000 + + radeon: only enable KMS for radeon on x86 for now + +commit 741344c11e952f46a97e05f4a169c42998db0801 +Author: Dave Airlie +Date: Fri Sep 5 10:46:17 2008 +1000 + + radeon: rs690 GART tables need to be in uncached memory. + + Allocate the rs480/690 tables from uncached memory. + +commit 24f07b73a7f2c4287ff993c281bc6eb5860f4728 +Author: Dave Airlie +Date: Thu Sep 4 11:58:08 2008 +1000 + + drm/radeon: fixup some avivo/rs690 checks + +commit e8a194254a28290a02adf4301cf4684a070a5b90 +Author: Dave Airlie +Date: Fri Aug 29 09:59:02 2008 +1000 + + drm: move text mode check to driver. + + also change name from text to nomodeset + +commit 374022dd330c454c83d0dbb7ef80268b2de36c05 +Author: Dave Airlie +Date: Thu Aug 28 21:22:27 2008 +1000 + + radeon: fix up LVDS panel mode + + also don't explode on lack of DDC + +commit 0e38fa74ee66e42ef67824578a462791ed1e6787 +Author: Dave Airlie +Date: Thu Aug 28 18:31:50 2008 +1000 + + drm: fix dev->master convert + +commit dcf2970b7c240e8f7558c4ace6a0cad0323c6bae +Author: Kristian H??gsberg +Date: Wed Aug 20 11:24:13 2008 -0400 + + drm: Set up a kernel side hw_lock, so userspace isn't required to do so. + + DRI2 doesn't use a user space lock, so don't require one to be set up. + Old DRI can still provide a lock containing map as before, which will + override the default kernel-side lock. + + Signed-off-by: Kristian H??gsberg + +commit 9c0d27d38c8ea1c547fb525188099bdc73d48f21 +Author: Dave Airlie +Date: Thu Aug 28 16:38:49 2008 +1000 + + radeon: fix LVDS on atombios - typos + +commit 48495fcb03f7fbfb361ef18c7a03978bfe94606f +Author: Dave Airlie +Date: Thu Aug 28 12:01:53 2008 +1000 + + radeon: limit LVDS to first CRTC for now + +commit c30ec34cb22447763fde2751266a5cc835bdf776 +Author: Dave Airlie +Date: Thu Aug 28 12:01:38 2008 +1000 + + radeon: fixup checks for crtc in dpms path + +commit 5377c9fd16df95450d00c8ba87e4ffa5d2b51bbe +Author: Dave Airlie +Date: Wed Aug 27 15:39:17 2008 +1000 + + radeon: fix after rebase + +commit 80625b198c77ac3c6a27c47ab1891ec0e75760f6 +Author: Dave Airlie +Date: Wed Aug 27 13:43:04 2008 +1000 + + radeon: avoid oops on encdoers with no crtc set + +commit 1768664c9fbc160834e5dda68e11d7b2e9546de6 +Author: Alex Deucher +Date: Tue Aug 26 17:23:21 2008 +1000 + + radeon: fix warning from radeon_legacy_state removal + +commit fb71b24a9d40e483fe17f0b8feb2986f45a492d1 +Author: Alex Deucher +Date: Tue Aug 26 17:22:37 2008 +1000 + + radeon: first pass at legacy dac detect + + - done: primary dac, vga on tvdac + - todo: ext dac, tv on tvdac + +commit af293dc1673fa0a84f38c878000d2cab6b22ae3a +Author: Alex Deucher +Date: Tue Aug 26 17:22:11 2008 +1000 + + radeon: first pass at bios scratch regs + + - todo: updated connected status + +commit bdcda1366c379e31f316819a30749f892bd8c9ee +Author: Alex Deucher +Date: Tue Aug 26 17:20:54 2008 +1000 + + radeon: remove unused legacy state + +commit 2db5eb9bfe54ae261d80db296b085f3822f0cc40 +Author: Alex Deucher +Date: Tue Aug 26 17:20:15 2008 +1000 + + radeon: get primary dac adj info from bios tables + +commit 5f49a75cdc350fc5d9aed4daf8f292d533acb0c7 +Author: Dave Airlie +Date: Tue Aug 26 17:03:13 2008 +1000 + + x86: export pat_enabled + +commit 574bb303096c6ed5558232a84a89a4f333d5b006 +Author: Dave Airlie +Date: Tue Aug 26 17:02:43 2008 +1000 + + drm: enable PAT and writecombining support. + + If PAT is enabled, enable write combining support for kernel/user mappings + when pat is enabled. Also set memory to WC instead of uncached in ttm + +commit a5c57e835385ddc5ab53be38dfd719c129cf3c59 +Author: Dave Airlie +Date: Tue Aug 26 17:01:35 2008 +1000 + + radeon: add more domain support to GEM code. + + move domain validate function to separate function + call it from correct places + +commit 476ff7fc90344f3dbc14eb64682140544a06c7bc +Author: Dave Airlie +Date: Tue Aug 26 17:00:49 2008 +1000 + + radeon: implement zero fill for VRAM migration + + If a BO hasn't been dirtied, do a solid fill on VRAM instead of + migrating pages to VRAM + +commit 2881fdb8c64959517474af1cd506c2c14a49b436 +Author: Dave Airlie +Date: Tue Aug 26 16:59:45 2008 +1000 + + drm: set clean flags in new flags so it doesn't disappear + +commit 944a186de12ac69445abf56329fad95bfe8ff9f5 +Author: Dave Airlie +Date: Fri Aug 22 10:16:20 2008 +1000 + + radeon: wait for dma gui idle on 2D idle + +commit fa458c4fe628b2464df777312e1f6225f9ea8fcc +Author: Dave Airlie +Date: Fri Aug 22 10:16:01 2008 +1000 + + radeon_gem: fix some misplace == + +commit d8cbf2fe532736148ff9bff7a19ac4ff3b54e65c +Author: Dave Airlie +Date: Fri Aug 22 10:13:25 2008 +1000 + + radeon: get buffer upload working + +commit 8e73b2ff19e59657c5952a18dfa12d2634ecd659 +Author: Dave Airlie +Date: Fri Aug 22 10:12:57 2008 +1000 + + radeon: read back register between on gart flush + +commit 2629e781e8dfd10922f92ae4f36f6d8d1bcaf21f +Author: Dave Airlie +Date: Fri Aug 22 10:11:55 2008 +1000 + + drm: export buffer zeroing function for sw fallback + + We need a buffer zeroing function for before we have + accel running etc + +commit bb863cf157f152bf9c3c75ef52d3358f74810e50 +Author: Dave Airlie +Date: Fri Aug 22 09:49:16 2008 +1000 + + ttm: add clean bo flags + + This can be used to denote a bo hasn't been mapped or validated yet. + + Primarily for the move code when we get a buffer in VRAM, we don't need + to copy the contents just zero them. + +commit 45144d80175ae671e2867f70fab46e9f3815819d +Author: Dave Airlie +Date: Fri Aug 22 09:39:07 2008 +1000 + + ati_pcigart: add memory barrier and volatile for table access + +commit df092768d49d784ecb67276550411a1c046ea5d4 +Author: Dave Airlie +Date: Fri Aug 22 09:35:26 2008 +1000 + + drm: remove tlb flush logic from ttm + +commit 48e599681d7421efb102bf67d3ffb85de98909c9 +Author: Dave Airlie +Date: Tue Aug 19 12:14:38 2008 +1000 + + radeon: add GTT domain + +commit bdfab3f0e5e60270faadb63b6b2b2b4ab927af7e +Author: Dave Airlie +Date: Wed Aug 27 14:58:05 2008 +1000 + + radeon: add missing regs from a previous rebase + +commit c2643a95fcd172f53b00d8a048c6e855f806c133 +Author: Dave Airlie +Date: Thu Aug 14 18:14:56 2008 +1000 + + disable modeset on < r300 + +commit 03743ff14775ff8f571be33c3cdf14115e8eceae +Author: Dave Airlie +Date: Fri Aug 15 09:36:21 2008 +1000 + + radeon: set the base after mode is programmed + +commit ae7a56532e1472035f907c0acecae826fe853d2c +Author: Dave Airlie +Date: Fri Aug 15 09:35:55 2008 +1000 + + radeon: fix LVDS modes problem + +commit cb3888f2aab3f335a17a4da0e1669f5e8baec359 +Author: Dave Airlie +Date: Thu Aug 14 18:06:31 2008 +1000 + + radeon: reserve 64k of VRAM for now for text mode so we don't trample it + +commit b6a7bbdfc75615cf75376303a63182d44c808dae +Author: Dave Airlie +Date: Thu Aug 14 14:38:27 2008 +1000 + + radeon: add support for init memory map + + This gets RN50 to initialise correctly + +commit 3230dce3c9d2fb5a2f8c2a83f450975f76740c67 +Author: Dave Airlie +Date: Thu Aug 14 14:37:25 2008 +1000 + + radeon: add copy/solid regs for rn50 + +commit aabe2fff48d537ce5beb8cff5165dca4101b19b8 +Author: Alex Deucher +Date: Thu Aug 14 09:59:47 2008 +1000 + + radeon: fill in and make use of more combios tables + +commit d0654741d455c4466a43ca5b258820e73f765209 +Author: Dave Airlie +Date: Thu Aug 14 09:59:31 2008 +1000 + + radeon: add quirks from DDX + +commit 3082e9106d61b8be1c4222f7dc0e425f779c01b1 +Author: Alex Deucher +Date: Thu Aug 14 09:59:12 2008 +1000 + + radeon: fix warnings + +commit bd236f2de22f59b7c00474e9b2cdba6a42a140d4 +Author: Alex Deucher +Date: Thu Aug 14 09:58:47 2008 +1000 + + radeon: get legacy working + + - extra ~ in RADEON_WRITE_P() + - re-arrange crtc setup a bit + - add debugging for tracing calls + - fix pitch calculation + +commit 8f28bc535dc4c9c7ce675cec9ece6616e4cb402d +Author: Alex Deucher +Date: Thu Aug 14 09:58:24 2008 +1000 + + radeon: set base in legacy crtc mode set + +commit 2aac7d2763a7f3f112df2f9942092c046cf80f59 +Author: Alex Deucher +Date: Thu Aug 14 09:55:06 2008 +1000 + + radeon: Convert COM BIOS to table offset lookup function + +commit fab2ca2fc0657328ee4a08a04e8f7e173a6f5439 +Author: Alex Deucher +Date: Thu Aug 14 09:54:03 2008 +1000 + + radeon/cursor: Restructure cursor handling and add support for legacy cursors + +commit 431bb03668c1075ef877586ae2014c52265c9ad4 +Author: Alex Deucher +Date: Thu Aug 14 09:53:08 2008 +1000 + + radeon/atom: implement crtc lock + +commit 885eb36edc42c1bc2f734ac07465caa0a5908063 +Author: Alex Deucher +Date: Thu Aug 14 09:50:15 2008 +1000 + + LUT updates + + - Add gamma set for legacy chips + - Add 16 bpp gamma set + +commit b14d8294d72e709abb5508bc4f3a1ef9d4aa9dde +Author: Alex Deucher +Date: Thu Aug 14 09:49:55 2008 +1000 + + radeon: various cleanups + + - white space + - move i2c_lock to radeon_i2c.c + - enable tv dac on legacy + +commit 2a2eba912557867ada33f18b01c9e568d5fe21a2 +Author: Alex Deucher +Date: Thu Aug 14 09:49:30 2008 +1000 + + radeon: Add legacy dac detect stubs + +commit 81320399c817e2c380d61cc47e33c2941f2713b9 +Author: Alex Deucher +Date: Thu Aug 14 09:49:12 2008 +1000 + + unify connector, i2c handling for atom and legacy + +commit b8be98822ed9e227862574035a337355af602e87 +Author: Alex Deucher +Date: Thu Aug 14 09:48:50 2008 +1000 + + Brute force port of legacy crtc/encoder code + + - removed save/init/restore chain with set functions + +commit 08c73750a6c4e7c9cd2001e5356f9a41c69df4e9 +Author: Dave Airlie +Date: Thu Aug 14 08:54:04 2008 +1000 + + FEDORA: radeon set gart buffers start + +commit 5a45731318a2ce1c5c837ebc6ed4f90adc560215 +Author: Dave Airlie +Date: Thu Aug 14 08:52:41 2008 +1000 + + radeon: command submission remove debug + +commit 5ca82fa7c0c1c37933758da571f7a49049f02f69 +Author: Dave Airlie +Date: Thu Aug 14 08:51:00 2008 +1000 + + radeon: use mm_enabled variable to denote memory manager running + +commit b346d7fd98f71b30ac260ddfd573e85232fb8cd3 +Author: Dave Airlie +Date: Tue Aug 12 12:19:05 2008 +1000 + + radeon: hack it up so we get front/back offsets + + in the correct place in the drm so buffer swaps work again + +commit ae94f51427464934539adc74ba24d8a65bd956af +Author: Dave Airlie +Date: Tue Aug 12 12:18:08 2008 +1000 + + radeon: add mm supported call for userspace + +commit 87ce2d51fe9bf6b12d566acceb60e3c8e6ef3754 +Author: Dave Airlie +Date: Tue Aug 12 09:40:18 2008 +1000 + + FEDORA: add old DMA buffers on top of GEM + +commit 273fba23a75da935f37ea5a96dd0139e3794c917 +Author: Dave Airlie +Date: Fri Aug 8 15:57:10 2008 +1000 + + radeon: add initial code to support legacy crtc/encoders. + + This adds the CRTC and PLL setting code, it doesn't work + yet but its all heading in the right direction. + +commit 62b6a15caddf40f7bf53d42c312637b9379301c8 +Author: Dave Airlie +Date: Fri Aug 8 10:11:23 2008 +1000 + + radeon: add initial tmds parsing for legacy cards + +commit 821344e246fa73e802bda1739877bf5aca6b99ac +Author: Dave Airlie +Date: Wed Aug 6 16:01:22 2008 +1000 + + radeon: set new memmap on gem enable + +commit f76d528fa4b9bda0384a0ecb2bbfbd129c1f7d89 +Author: Dave Airlie +Date: Wed Aug 6 15:51:02 2008 +1000 + + radeon/pci: fixup table when GEM allocates it + +commit e2ee758f327971e46098c9bc9ce39a5d100892c7 +Author: Dave Airlie +Date: Wed Aug 6 15:44:38 2008 +1000 + + radeon: set gart table size + +commit 52aa63f3ce873308630e0045f61e240a179cf9c6 +Author: Dave Airlie +Date: Wed Aug 6 15:44:18 2008 +1000 + + radeon: fix buffer evict slection + +commit e556cbe8e4f0c0ff061b8590208628ad32002550 +Author: Dave Airlie +Date: Wed Aug 6 15:43:51 2008 +1000 + + pcigart: fix incorrect memset + no need for wbinvd + +commit 5a9bf40c73e2dbff29cf2473b784f1cf9563f2f7 +Author: Dave Airlie +Date: Tue Aug 5 11:22:24 2008 +1000 + + radeon: fix defines so blit works again + +commit 31a1f633e91259b69828a58728357045bd7669f9 +Author: Dave Airlie +Date: Mon Aug 4 17:10:35 2008 +1000 + + drm: leave bo driver finish to the driver + +commit 8c087263ec8a2944a5cc30a933903c6c39436a51 +Author: Dave Airlie +Date: Mon Aug 4 14:21:22 2008 +1000 + + drm: fix unneeded debug + +commit e042198ac4304fb008d236cf2076f9e5793d6d47 +Author: Dave Airlie +Date: Mon Aug 4 14:20:47 2008 +1000 + + radeon: add setparam for userspace to init the memory manager. + + if kms enabled memory manager will be enabled by default + +commit 37ef33584e98a4800bf15b31835b88084ece1d51 +Author: Dave Airlie +Date: Mon Aug 4 14:20:26 2008 +1000 + + drm: kill bo after driver lastclose + +commit 18fbb00c453c91f3e80d3925604ad0566d11c082 +Author: Dave Airlie +Date: Mon Aug 4 11:32:45 2008 +1000 + + radeon: don't invalidate cache if CP isn't running + +commit 5521d206bb65bcf35e3d3da84cd46cb9280f8e60 +Author: Dave Airlie +Date: Sat Aug 2 08:06:26 2008 +1000 + + drm: fix release locking + +commit 78044363260bd8adc8c31d5626121cb50fbca0cf +Author: Dave Airlie +Date: Fri Aug 1 16:55:34 2008 +1000 + + drm: add radeon modesetting support + +commit f9bb60a2d2b9f9d108f5197d19acf51b00cee104 +Author: Dave Airlie +Date: Fri Aug 1 14:06:12 2008 +1000 + + drm: add TTM VM changes + +commit f22ee89b38cf4d6f7ac1f18fb837022ac303577d +Author: Dave Airlie +Date: Thu Jul 31 15:27:27 2008 +1000 + + drm: import TTM basic objects diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index e0ab173..69de2db 100644 --- a/arch/x86/mm/pat.c @@ -13452,7 +14981,7 @@ /* BEGIN: Vertex program instruction set */ diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c -index 6f2cc74..4ef9f66 100644 +index 04fde35..8cc1542 100644 --- a/drivers/gpu/drm/radeon/r600_cp.c +++ b/drivers/gpu/drm/radeon/r600_cp.c @@ -1720,7 +1720,7 @@ static void r600_cp_init_ring_buffer(struct drm_device *dev, @@ -16441,7 +17970,7 @@ + return NULL; +} diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c -index 6f579a8..db52017 100644 +index 6f579a8..ac31d0b 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c @@ -46,8 +46,12 @@ static void radeon_do_cp_start(drm_radeon_private_t * dev_priv); @@ -18273,15 +19802,13 @@ switch (flags & RADEON_FAMILY_MASK) { case CHIP_R100: case CHIP_RV200: -@@ -2073,6 +3118,23 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) +@@ -2073,6 +3118,21 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) break; } -+ /* FEDORA HACKS - don't enable modesetting on pre-r300 -+ * until we have a mesa driver in place -+ */ ++ /* don't enable kms by default on r600 yet */ + if (radeon_modeset == -1) { -+ if ((dev_priv->chip_family <= CHIP_RV280) || (dev_priv->chip_family >= CHIP_R600)) { ++ if ((dev_priv->chip_family >= CHIP_R600)) { + dev->driver->driver_features &= ~DRIVER_MODESET; + drm_put_minor(&dev->control); + radeon_modeset = 0; @@ -18297,7 +19824,7 @@ if (drm_device_is_agp(dev)) dev_priv->flags |= RADEON_IS_AGP; else if (drm_device_is_pcie(dev)) -@@ -2080,9 +3142,34 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) +@@ -2080,9 +3140,34 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) else dev_priv->flags |= RADEON_IS_PCI; @@ -18333,7 +19860,7 @@ if (ret != 0) return ret; -@@ -2092,8 +3179,63 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) +@@ -2092,8 +3177,63 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) return ret; } @@ -18399,7 +19926,7 @@ return ret; } -@@ -2147,18 +3289,12 @@ void radeon_master_destroy(struct drm_device *dev, struct drm_master *master) +@@ -2147,18 +3287,12 @@ void radeon_master_destroy(struct drm_device *dev, struct drm_master *master) */ int radeon_driver_firstopen(struct drm_device *dev) { @@ -18421,7 +19948,7 @@ return 0; } -@@ -2167,6 +3303,14 @@ int radeon_driver_unload(struct drm_device *dev) +@@ -2167,6 +3301,14 @@ int radeon_driver_unload(struct drm_device *dev) { drm_radeon_private_t *dev_priv = dev->dev_private; @@ -18436,7 +19963,7 @@ DRM_DEBUG("\n"); drm_rmmap(dev, dev_priv->mmio); -@@ -2214,3 +3358,41 @@ void radeon_commit_ring(drm_radeon_private_t *dev_priv) +@@ -2214,3 +3356,41 @@ void radeon_commit_ring(drm_radeon_private_t *dev_priv) RADEON_READ(RADEON_CP_RB_RPTR); } } Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1400 retrieving revision 1.1401 diff -u -r1.1400 -r1.1401 --- kernel.spec 9 Mar 2009 21:20:48 -0000 1.1400 +++ kernel.spec 10 Mar 2009 01:09:13 -0000 1.1401 @@ -1810,6 +1810,9 @@ # and build. %changelog +* Tue Mar 10 2009 Dave Airlie +- radeon: enable kms on r100/r200 + * Tue Mar 10 2009 Tom "spot" Callaway - linux-2.6.29-sparc-IOC_TYPECHECK.patch: missing function in sparc specific ioctl.h From kkofler at fedoraproject.org Tue Mar 10 01:11:24 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 10 Mar 2009 01:11:24 +0000 (UTC) Subject: rpms/xine-lib/devel xine-lib.spec,1.70,1.71 Message-ID: <20090310011124.D5D2570034@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/xine-lib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23381/devel Modified Files: xine-lib.spec Log Message: * Tue Mar 10 2009 Kevin Kofler - 1.1.16.2-5 - rebuild for new ImageMagick Index: xine-lib.spec =================================================================== RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- xine-lib.spec 26 Feb 2009 09:40:15 -0000 1.70 +++ xine-lib.spec 10 Mar 2009 01:10:54 -0000 1.71 @@ -34,7 +34,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.16.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -442,6 +442,9 @@ %changelog +* Tue Mar 10 2009 Kevin Kofler - 1.1.16.2-5 +- rebuild for new ImageMagick + * Thu Feb 26 2009 Fedora Release Engineering - 1.1.16.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kkofler at fedoraproject.org Tue Mar 10 01:12:55 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 10 Mar 2009 01:12:55 +0000 (UTC) Subject: rpms/klamav/devel klamav.spec,1.33,1.34 Message-ID: <20090310011255.D28D370034@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/klamav/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23794/devel Modified Files: klamav.spec Log Message: Really fix file list. Index: klamav.spec =================================================================== RCS file: /cvs/pkgs/rpms/klamav/devel/klamav.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- klamav.spec 10 Mar 2009 01:04:23 -0000 1.33 +++ klamav.spec 10 Mar 2009 01:12:25 -0000 1.34 @@ -84,8 +84,7 @@ %{_datadir}/apps/klamav %{_datadir}/apps/konqueror/servicemenus/klamav-dropdown.desktop %{_datadir}/config.kcfg/klamavconfig.kcfg -%{_datadir}/icons/*/*x*/actions/*.png -%{_datadir}/icons/*/*x*/apps/*.png +%{_datadir}/icons/*/*x*/apps/klamav.png %changelog * Tue Mar 10 2009 Kevin Kofler 0.46-1 From kkofler at fedoraproject.org Tue Mar 10 01:21:58 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 10 Mar 2009 01:21:58 +0000 (UTC) Subject: rpms/koffice/devel koffice.spec,1.100,1.101 Message-ID: <20090310012158.748BF70118@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/koffice/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26424/devel Modified Files: koffice.spec Log Message: * Tue Mar 10 2009 Kevin Kofler 2:1.6.3-20.20090306svn - rebuild for new ImageMagick Index: koffice.spec =================================================================== RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- koffice.spec 7 Mar 2009 19:45:28 -0000 1.100 +++ koffice.spec 10 Mar 2009 01:21:27 -0000 1.101 @@ -12,7 +12,7 @@ Name: koffice Epoch: 2 Version: 1.6.3 -Release: 19.%{svn}svn%{?dist} +Release: 20.%{svn}svn%{?dist} Summary: An integrated office suite Group: Applications/Productivity @@ -735,8 +735,11 @@ %{_datadir}/applications/kde/*kplato.desktop -%changelog -* Fri Mar 06 2009 Rex Dieter 2:1.1.6-19 +%changelog +* Tue Mar 10 2009 Kevin Kofler 2:1.6.3-20.20090306svn +- rebuild for new ImageMagick + +* Fri Mar 06 2009 Rex Dieter 2:1.6.3-19.20090306svn - revert koffice2 -> koffice1, Epoch bump - 20090306svn From dchen at fedoraproject.org Tue Mar 10 01:33:08 2009 From: dchen at fedoraproject.org (Ding-Yi Chen) Date: Tue, 10 Mar 2009 01:33:08 +0000 (UTC) Subject: rpms/ibus-chewing/F-10 .cvsignore, 1.8, 1.9 ibus-chewing.spec, 1.7, 1.8 import.log, 1.3, 1.4 sources, 1.8, 1.9 Message-ID: <20090310013308.6A55870034@cvs1.fedora.phx.redhat.com> Author: dchen Update of /cvs/pkgs/rpms/ibus-chewing/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30108/F-10 Modified Files: .cvsignore ibus-chewing.spec import.log sources Log Message: Revert to 0.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 2 Mar 2009 03:49:55 -0000 1.8 +++ .cvsignore 10 Mar 2009 01:32:37 -0000 1.9 @@ -1 +1 @@ -ibus-chewing-1.0.2.20090302-Source.tar.gz +ibus-chewing-0.1.1.20090129.tar.gz Index: ibus-chewing.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/ibus-chewing.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ibus-chewing.spec 2 Mar 2009 03:49:55 -0000 1.7 +++ ibus-chewing.spec 10 Mar 2009 01:32:37 -0000 1.8 @@ -1,110 +1,65 @@ +#%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%define mod_path ibus-0.1 Name: ibus-chewing -Version: 1.0.2.20090302 +Version: 0.1.1.20090129 Release: 1%{?dist} Summary: The Chewing engine for IBus input platform License: GPLv2+ Group: System Environment/Libraries URL: http://code.google.com/p/ibus/ -Source0: http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz +Source0: http://cloud.github.com/downloads/definite/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext-devel -BuildRequires: gtk2-devel -BuildRequires: ibus-devel >= 1.1 -BuildRequires: cmake -BuildRequires: gob2 +BuildRequires: libtool +BuildRequires: python-devel BuildRequires: libchewing-devel >= 0.3.2-4 +# BuildRequires: swig BuildRequires: pkgconfig -BuildRequires: GConf2-devel -Requires: ibus >= 1.1 +# BuildArchitectures: noarch +Requires: ibus Requires: libchewing >= 0.3.2-4 -Requires: GConf2 -Requires(pre): GConf2 -Requires(post): GConf2 -Requires(preun): GConf2 %description The Chewing engine for IBus platform. It provides Chinese input method from libchewing. %prep -%setup -q -n %{name}-%{version}-Source +%setup -q %build -%cmake -DCMAKE_INSTALL_PREFIX=%{_usr} -make VERBOSE=1 C_DEFINES="$RPM_OPT_FLAGS" %{?_smp_mflags} +%configure --disable-static +# make -C po update-gmo +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -%find_lang %{name} +make DESTDIR=${RPM_BUILD_ROOT} install +rm -f $RPM_BUILD_ROOT%{python_sitearch}/_chewing.la -%pre -if [ "$1" -gt 1 ] ; then -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-uninstall-rule \ -%{_sysconfdir}/gconf/schemas/%{name}.schema >/dev/null || : -fi - -%post -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule \ -%{_sysconfdir}/gconf/schemas/%{name}.schema > /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}.schema > /dev/null || : -fi +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS README ChangeLog NEWS COPYING -%{_libexecdir}/ibus-engine-chewing -%{_datadir}/%{name} -%{_datadir}/ibus/component/chewing.xml -%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schema +%doc AUTHORS COPYING README +# %dir %{python_sitearch}/ibus +#%{python_sitearch}/chewing.py* +#%{python_sitearch}/_chewing.so +%dir %{_datadir}/ibus-chewing +%{_bindir}/ibus-engine-chewing +%{_datadir}/ibus-chewing/* +%{_datadir}/ibus/engine/chewing.engine %changelog -* Mon Mar 02 2009 Ding-Yi Chen - 1.0.2.20090302-1 -- Required gconf2 -> GConf2. -- Fix RPM install issues. - -* Fri Feb 27 2009 Ding-Yi Chen - 1.0.1.20090227-1 -- Setting shows/hides KBType, selKeys, and various settings. -- Add gconf schema. -- Fix some memory leaking checked. -- Move some function to cmake_modules. -- Fix Google code issue 281 - -* Tue Feb 24 2009 Fedora Release Engineering - 0.1.1.20081023-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Tue Mar 10 2009 Ding-Yi Chen - 0.1.1.20090129-1 +- Revert F-10 branch to ibus-chewing-0.1.1, as ibus in F-10 is still 0.1.1. -* Wed Feb 18 2009 Ding-Yi Chen - 1.0.0.20090220-1 -- First working version for IBus C - -* Wed Jan 28 2009 Ding-Yi Chen - 1.0.0.20090128-1 +* Wed Jan 28 2009 Ding-Yi Chen - 0.1.1.20090129-1 - Fix the binding with libchewing 0.3.2. -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.1.1.20081023-2 -- Rebuild for Python 2.6 - -* Thu Oct 23 2008 Huang Peng - 0.1.1.20080923-1 -- Update to 0.1.1.20080923. - -* Wed Sep 17 2008 Huang Peng - 0.1.1.20080917-1 -- Update to 0.1.1.20080917. - -* Tue Sep 16 2008 Huang Peng - 0.1.1.20080916-1 -- Update to 0.1.1.20080916. - -* Mon Sep 09 2008 Huang Peng - 0.1.1.20080901-1 -- Update to 0.1.1.20080901. - -* Fri Aug 15 2008 Huang Peng - 0.1.1.20081023-1 +* Fri Aug 15 2008 Huang Peng - 0.1.1.20090129-1 - The first version. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 2 Mar 2009 03:49:55 -0000 1.3 +++ import.log 10 Mar 2009 01:32:38 -0000 1.4 @@ -1,3 +1,4 @@ ibus-chewing-0_1_1_20080823-1_fc9:HEAD:ibus-chewing-0.1.1.20080823-1.fc9.src.rpm:1219617084 ibus-chewing-1_0_1_20090227-1_fc10:F-10:ibus-chewing-1.0.1.20090227-1.fc10.src.rpm:1235721693 ibus-chewing-1_0_2_20090302-1_fc10:F-10:ibus-chewing-1.0.2.20090302-1.fc10.src.rpm:1235965759 +ibus-chewing-0_1_1_20090129-1_fc10:F-10:ibus-chewing-0.1.1.20090129-1.fc10.src.rpm:1236648721 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 Mar 2009 03:49:55 -0000 1.8 +++ sources 10 Mar 2009 01:32:38 -0000 1.9 @@ -1 +1 @@ -40885ad9997236d4d4a601b44cfd33e9 ibus-chewing-1.0.2.20090302-Source.tar.gz +5ad0d2c164c882203f36fe641d5e27f5 ibus-chewing-0.1.1.20090129.tar.gz From kaigai at fedoraproject.org Tue Mar 10 01:49:06 2009 From: kaigai at fedoraproject.org (KaiGai Kohei) Date: Tue, 10 Mar 2009 01:49:06 +0000 (UTC) Subject: rpms/php-pecl-selinux/devel import.log, NONE, 1.1 php-pecl-selinux.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310014906.995B670034@cvs1.fedora.phx.redhat.com> Author: kaigai Update of /cvs/pkgs/rpms/php-pecl-selinux/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1388/devel Modified Files: .cvsignore sources Added Files: import.log php-pecl-selinux.spec Log Message: The initial version of php-pecl-selinux (SELinux binding for PHP script language) --- NEW FILE import.log --- php-pecl-selinux-0_1_2-1_fc10:HEAD:php-pecl-selinux-0.1.2-1.fc10.src.rpm:1236649588 --- NEW FILE php-pecl-selinux.spec --- # PECL(PHP Extension Community Library) related definitions %{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} %define pecl_name selinux Summary: SELinux binding for PHP scripting language Name: php-pecl-selinux Version: 0.1.2 Release: 1%{?dist} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: php-devel >= 5.2.0, php-pear, libselinux-devel >= 2.0.43 Requires: php >= 5.2.0, libselinux >= 2.0.43 Requires(post): %{__pecl} Requires(postun): %{__pecl} %if 0%{?php_zend_api} Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} %else Requires: php-api = %{php_apiver} %endif Provides: php-pecl(%{pecl_name}) = %{version}-%{release} %description This package is an extension to the PHP Hypertext Preprocessor. It wraps the libselinux library and provides a set of interfaces to the PHP runtime engine. The libselinux is a set of application program interfaces towards in-kernel SELinux, contains get/set security context, communicate security server, translate between raw and readable format and so on. %prep %setup -c -q %build pushd %{pecl_name}-%{version} %{_bindir}/phpize %configure --enable-selinux make %{?_smp_mflags} (echo "; Enable SELinux extension module" echo "extension=selinux.so") > selinux.ini popd %install pushd %{pecl_name}-%{version} rm -rf $RPM_BUILD_ROOT install -D -p -m 0755 modules/selinux.so %{buildroot}%{php_extdir}/selinux.so install -D -p -m 0644 selinux.ini %{buildroot}%{_sysconfdir}/php.d/selinux.ini # Install XML package description %{__mkdir_p} %{buildroot}%{pecl_xmldir} %{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml popd %clean rm -rf $RPM_BUILD_ROOT %if 0%{?pecl_install:1} %post %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : %endif %if 0%{?pecl_uninstall:1} %postun if [ $1 -eq 0 ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi %endif %files %defattr(-,root,root,-) %doc %{pecl_name}-%{version}/LICENSE %{pecl_name}-%{version}/README %config(noreplace) %{_sysconfdir}/php.d/selinux.ini %{php_extdir}/selinux.so %{pecl_xmldir}/%{name}.xml %changelog * Thu Mar 5 2009 KaiGai Kohei - 0.1.2-1 - The initial release of SELinux binding for PHP script language. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-pecl-selinux/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:03:35 -0000 1.1 +++ .cvsignore 10 Mar 2009 01:48:36 -0000 1.2 @@ -0,0 +1 @@ +selinux-0.1.2.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-pecl-selinux/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:03:35 -0000 1.1 +++ sources 10 Mar 2009 01:48:36 -0000 1.2 @@ -0,0 +1 @@ +d7c1a6d926663c8a7898d619ee319c5b selinux-0.1.2.tgz From kaigai at fedoraproject.org Tue Mar 10 01:52:09 2009 From: kaigai at fedoraproject.org (KaiGai Kohei) Date: Tue, 10 Mar 2009 01:52:09 +0000 (UTC) Subject: rpms/php-pecl-selinux/F-9 import.log, NONE, 1.1 php-pecl-selinux.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310015209.AE11670034@cvs1.fedora.phx.redhat.com> Author: kaigai Update of /cvs/pkgs/rpms/php-pecl-selinux/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2509/F-9 Modified Files: .cvsignore sources Added Files: import.log php-pecl-selinux.spec Log Message: The initial version of php-pecl-selinux (SELinux binding for PHP script language) for Fedora 9 --- NEW FILE import.log --- php-pecl-selinux-0_1_2-1_fc10:F-9:php-pecl-selinux-0.1.2-1.fc10.src.rpm:1236649807 --- NEW FILE php-pecl-selinux.spec --- # PECL(PHP Extension Community Library) related definitions %{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} %define pecl_name selinux Summary: SELinux binding for PHP scripting language Name: php-pecl-selinux Version: 0.1.2 Release: 1%{?dist} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: php-devel >= 5.2.0, php-pear, libselinux-devel >= 2.0.43 Requires: php >= 5.2.0, libselinux >= 2.0.43 Requires(post): %{__pecl} Requires(postun): %{__pecl} %if 0%{?php_zend_api} Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} %else Requires: php-api = %{php_apiver} %endif Provides: php-pecl(%{pecl_name}) = %{version}-%{release} %description This package is an extension to the PHP Hypertext Preprocessor. It wraps the libselinux library and provides a set of interfaces to the PHP runtime engine. The libselinux is a set of application program interfaces towards in-kernel SELinux, contains get/set security context, communicate security server, translate between raw and readable format and so on. %prep %setup -c -q %build pushd %{pecl_name}-%{version} %{_bindir}/phpize %configure --enable-selinux make %{?_smp_mflags} (echo "; Enable SELinux extension module" echo "extension=selinux.so") > selinux.ini popd %install pushd %{pecl_name}-%{version} rm -rf $RPM_BUILD_ROOT install -D -p -m 0755 modules/selinux.so %{buildroot}%{php_extdir}/selinux.so install -D -p -m 0644 selinux.ini %{buildroot}%{_sysconfdir}/php.d/selinux.ini # Install XML package description %{__mkdir_p} %{buildroot}%{pecl_xmldir} %{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml popd %clean rm -rf $RPM_BUILD_ROOT %if 0%{?pecl_install:1} %post %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : %endif %if 0%{?pecl_uninstall:1} %postun if [ $1 -eq 0 ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi %endif %files %defattr(-,root,root,-) %doc %{pecl_name}-%{version}/LICENSE %{pecl_name}-%{version}/README %config(noreplace) %{_sysconfdir}/php.d/selinux.ini %{php_extdir}/selinux.so %{pecl_xmldir}/%{name}.xml %changelog * Thu Mar 5 2009 KaiGai Kohei - 0.1.2-1 - The initial release of SELinux binding for PHP script language. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-pecl-selinux/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:03:35 -0000 1.1 +++ .cvsignore 10 Mar 2009 01:51:38 -0000 1.2 @@ -0,0 +1 @@ +selinux-0.1.2.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-pecl-selinux/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:03:35 -0000 1.1 +++ sources 10 Mar 2009 01:51:39 -0000 1.2 @@ -0,0 +1 @@ +d7c1a6d926663c8a7898d619ee319c5b selinux-0.1.2.tgz From kaigai at fedoraproject.org Tue Mar 10 01:54:00 2009 From: kaigai at fedoraproject.org (KaiGai Kohei) Date: Tue, 10 Mar 2009 01:54:00 +0000 (UTC) Subject: rpms/php-pecl-selinux/F-10 import.log, NONE, 1.1 php-pecl-selinux.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310015400.341AC70034@cvs1.fedora.phx.redhat.com> Author: kaigai Update of /cvs/pkgs/rpms/php-pecl-selinux/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3493/F-10 Modified Files: .cvsignore sources Added Files: import.log php-pecl-selinux.spec Log Message: The initial version of php-pecl-selinux (SELinux binding for PHP script language) for Fedora 10 --- NEW FILE import.log --- php-pecl-selinux-0_1_2-1_fc10:F-10:php-pecl-selinux-0.1.2-1.fc10.src.rpm:1236649946 --- NEW FILE php-pecl-selinux.spec --- # PECL(PHP Extension Community Library) related definitions %{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} %define pecl_name selinux Summary: SELinux binding for PHP scripting language Name: php-pecl-selinux Version: 0.1.2 Release: 1%{?dist} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: php-devel >= 5.2.0, php-pear, libselinux-devel >= 2.0.43 Requires: php >= 5.2.0, libselinux >= 2.0.43 Requires(post): %{__pecl} Requires(postun): %{__pecl} %if 0%{?php_zend_api} Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} %else Requires: php-api = %{php_apiver} %endif Provides: php-pecl(%{pecl_name}) = %{version}-%{release} %description This package is an extension to the PHP Hypertext Preprocessor. It wraps the libselinux library and provides a set of interfaces to the PHP runtime engine. The libselinux is a set of application program interfaces towards in-kernel SELinux, contains get/set security context, communicate security server, translate between raw and readable format and so on. %prep %setup -c -q %build pushd %{pecl_name}-%{version} %{_bindir}/phpize %configure --enable-selinux make %{?_smp_mflags} (echo "; Enable SELinux extension module" echo "extension=selinux.so") > selinux.ini popd %install pushd %{pecl_name}-%{version} rm -rf $RPM_BUILD_ROOT install -D -p -m 0755 modules/selinux.so %{buildroot}%{php_extdir}/selinux.so install -D -p -m 0644 selinux.ini %{buildroot}%{_sysconfdir}/php.d/selinux.ini # Install XML package description %{__mkdir_p} %{buildroot}%{pecl_xmldir} %{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml popd %clean rm -rf $RPM_BUILD_ROOT %if 0%{?pecl_install:1} %post %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : %endif %if 0%{?pecl_uninstall:1} %postun if [ $1 -eq 0 ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi %endif %files %defattr(-,root,root,-) %doc %{pecl_name}-%{version}/LICENSE %{pecl_name}-%{version}/README %config(noreplace) %{_sysconfdir}/php.d/selinux.ini %{php_extdir}/selinux.so %{pecl_xmldir}/%{name}.xml %changelog * Thu Mar 5 2009 KaiGai Kohei - 0.1.2-1 - The initial release of SELinux binding for PHP script language. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/php-pecl-selinux/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:03:35 -0000 1.1 +++ .cvsignore 10 Mar 2009 01:53:29 -0000 1.2 @@ -0,0 +1 @@ +selinux-0.1.2.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/php-pecl-selinux/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:03:35 -0000 1.1 +++ sources 10 Mar 2009 01:53:29 -0000 1.2 @@ -0,0 +1 @@ +d7c1a6d926663c8a7898d619ee319c5b selinux-0.1.2.tgz From airlied at fedoraproject.org Tue Mar 10 02:05:22 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 10 Mar 2009 02:05:22 +0000 (UTC) Subject: rpms/xorg-x11-drv-ati/devel radeon-6.11.0-git.patch, 1.3, 1.4 radeon-modeset.patch, 1.36, 1.37 xorg-x11-drv-ati.spec, 1.154, 1.155 Message-ID: <20090310020522.1B14070034@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7003 Modified Files: radeon-6.11.0-git.patch radeon-modeset.patch xorg-x11-drv-ati.spec Log Message: * Tue Mar 10 2009 Dave Airlie 6.11.0-6 - master fixes for panning + enable r600 accel by default radeon-6.11.0-git.patch: Index: radeon-6.11.0-git.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-6.11.0-git.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- radeon-6.11.0-git.patch 6 Mar 2009 23:50:06 -0000 1.3 +++ radeon-6.11.0-git.patch 10 Mar 2009 02:04:50 -0000 1.4 @@ -50,9 +50,15 @@ #define PCI_VENDOR_IBM 0x1014 #define PCI_VENDOR_AMD 0x1022 diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c -index 5c26ef8..bf207bf 100644 +index 5c26ef8..c004719 100644 --- a/src/atombios_crtc.c +++ b/src/atombios_crtc.c +@@ -1,4 +1,4 @@ +- /* ++/* + * Copyright ?? 2007 Red Hat, Inc. + * Copyright 2007 Advanced Micro Devices, Inc. + * @@ -186,7 +186,7 @@ atombios_set_crtc_timing(atomBiosHandlePtr atomBIOS, SET_CRTC_TIMING_PARAMETERS_ conv_param.ucOverscanRight = crtc_param->ucOverscanRight; conv_param.ucOverscanLeft = crtc_param->ucOverscanLeft; @@ -97,7 +103,16 @@ } } -@@ -484,7 +481,7 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc, +@@ -472,6 +469,8 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc, + OUTREG(AVIVO_D1GRPH_ENABLE + radeon_crtc->crtc_offset, 1); + + OUTREG(AVIVO_D1MODE_DESKTOP_HEIGHT + radeon_crtc->crtc_offset, mode->VDisplay); ++ x &= ~3; ++ y &= ~1; + OUTREG(AVIVO_D1MODE_VIEWPORT_START + radeon_crtc->crtc_offset, (x << 16) | y); + OUTREG(AVIVO_D1MODE_VIEWPORT_SIZE + radeon_crtc->crtc_offset, + (mode->HDisplay << 16) | mode->VDisplay); +@@ -484,7 +483,7 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc, 0); } @@ -10947,7 +10962,7 @@ } } diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c -index 5a7c730..a87e99b 100644 +index 5a7c730..3a9432f 100644 --- a/src/radeon_crtc.c +++ b/src/radeon_crtc.c @@ -410,6 +410,14 @@ radeon_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height) @@ -10974,7 +10989,16 @@ /** * Creates a pixmap for this CRTC's rotated shadow framebuffer. */ -@@ -587,8 +595,7 @@ Bool RADEONAllocateControllers(ScrnInfoPtr pScrn, int mask) +@@ -499,6 +507,8 @@ radeon_crtc_set_origin(xf86CrtcPtr crtc, int x, int y) + unsigned char *RADEONMMIO = info->MMIO; + + if (IS_AVIVO_VARIANT) { ++ x &= ~3; ++ y &= ~1; + atombios_lock_crtc(info->atomBIOS, radeon_crtc->crtc_id, 1); + OUTREG(AVIVO_D1MODE_VIEWPORT_START + radeon_crtc->crtc_offset, (x << 16) | y); + atombios_lock_crtc(info->atomBIOS, radeon_crtc->crtc_id, 0); +@@ -587,8 +597,7 @@ Bool RADEONAllocateControllers(ScrnInfoPtr pScrn, int mask) RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); RADEONInfoPtr info = RADEONPTR(pScrn); @@ -11346,7 +11370,7 @@ RADEONDRICPInit(pScrn); } diff --git a/src/radeon_driver.c b/src/radeon_driver.c -index 32cb307..0842164 100644 +index 32cb307..e8d28f0 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -578,7 +578,7 @@ unsigned RADEONINMC(ScrnInfoPtr pScrn, int addr) @@ -11580,39 +11604,50 @@ xf86DrvMsg(pScrn->scrnIndex, X_DEFAULT, - "No acceleration support available on R600 yet.\n"); - return TRUE; -+ "Experimental R6xx/R7xx EXA support.\n"); ++ "Will attempt to use R6xx/R7xx EXA support if DRI is enabled.\n"); + info->useEXA = TRUE; } if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) { -@@ -2146,16 +2148,23 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn) +@@ -2145,17 +2147,15 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn) + return FALSE; if (info->Chipset == PCI_CHIP_RN50_515E || - info->Chipset == PCI_CHIP_RN50_5969 || +- info->Chipset == PCI_CHIP_RN50_5969 || - info->ChipFamily == CHIP_FAMILY_RS600 || - info->ChipFamily >= CHIP_FAMILY_R600) { +- info->ChipFamily >= CHIP_FAMILY_R600) { ++ info->Chipset == PCI_CHIP_RN50_5969) { if (xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE)) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Direct rendering for RN50/RS600/R600 forced on -- " -+ "Direct rendering for RN50/R600 forced on -- " ++ "Direct rendering for RN50 forced on -- " "This is NOT officially supported at the hardware level " "and may cause instability or lockups\n"); } else { xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Direct rendering not officially supported on RN50/RS600/R600\n"); -+ "Direct rendering not officially supported on RN50/R600\n"); -+ -+ if (info->ChipFamily >= CHIP_FAMILY_R600) { -+ info->r600_shadow_fb = TRUE; -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, -+ "using shadow framebuffer\n"); -+ if (!xf86LoadSubModule(pScrn, "shadow")) -+ info->r600_shadow_fb = FALSE; -+ } ++ "Direct rendering not officially supported on RN50\n"); return FALSE; } } -@@ -2952,6 +2961,24 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) +@@ -2887,6 +2887,16 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) + */ + info->directRenderingEnabled = RADEONPreInitDRI(pScrn); + #endif ++ if (!info->directRenderingEnabled) { ++ if (info->ChipFamily >= CHIP_FAMILY_R600) { ++ info->r600_shadow_fb = TRUE; ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, ++ "using shadow framebuffer\n"); ++ if (!xf86LoadSubModule(pScrn, "shadow")) ++ info->r600_shadow_fb = FALSE; ++ } ++ } ++ + if (!RADEONPreInitVRAM(pScrn)) + goto fail; + +@@ -2952,6 +2962,24 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) goto fail; } @@ -11637,7 +11672,7 @@ ErrorF("after xf86InitialConfiguration\n"); RADEONSetPitch(pScrn); -@@ -3644,11 +3671,9 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3644,11 +3672,9 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, RADEONDGAInit(pScreen); /* Init Xv */ @@ -11652,7 +11687,7 @@ if (info->r600_shadow_fb == TRUE) { if (!shadowSetup(pScreen)) { -@@ -3771,9 +3796,10 @@ void RADEONRestoreMemMapRegisters(ScrnInfoPtr pScrn, +@@ -3771,9 +3797,10 @@ void RADEONRestoreMemMapRegisters(ScrnInfoPtr pScrn, } else { OUTREG(R600_HDP_NONSURFACE_BASE, (restore->mc_fb_location << 16) & 0xff0000); } @@ -11665,7 +11700,7 @@ } } else { -@@ -3958,7 +3984,7 @@ static void RADEONAdjustMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save) +@@ -3958,7 +3985,7 @@ static void RADEONAdjustMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save) } #ifdef USE_EXA @@ -11674,7 +11709,7 @@ { drm_radeon_getparam_t gp; int gart_base; -@@ -4419,15 +4445,40 @@ avivo_save(ScrnInfoPtr pScrn, RADEONSavePtr save) +@@ -4419,15 +4446,40 @@ avivo_save(ScrnInfoPtr pScrn, RADEONSavePtr save) state->aux_cntl2[j] = INREG(i + 0x040); state->aux_cntl3[j] = INREG(i + 0x400); state->aux_cntl4[j] = INREG(i + 0x440); @@ -11719,7 +11754,7 @@ } j = 0; /* save PHY,LINK regs */ -@@ -4770,15 +4821,40 @@ avivo_restore(ScrnInfoPtr pScrn, RADEONSavePtr restore) +@@ -4770,15 +4822,40 @@ avivo_restore(ScrnInfoPtr pScrn, RADEONSavePtr restore) OUTREG((i + 0x040), state->aux_cntl2[j]); OUTREG((i + 0x400), state->aux_cntl3[j]); OUTREG((i + 0x440), state->aux_cntl4[j]); @@ -11764,7 +11799,7 @@ } j = 0; /* save PHY,LINK regs */ -@@ -5046,8 +5122,10 @@ static void RADEONRestore(ScrnInfoPtr pScrn) +@@ -5046,8 +5123,10 @@ static void RADEONRestore(ScrnInfoPtr pScrn) "RADEONRestore\n"); #if X_BYTE_ORDER == X_BIG_ENDIAN @@ -11777,7 +11812,7 @@ #endif RADEONBlank(pScrn); -@@ -5220,7 +5298,8 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +@@ -5220,7 +5299,8 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) if (info->accelOn) { RADEON_SYNC(info, pScrn); @@ -11787,7 +11822,7 @@ } #ifdef XF86DRI -@@ -5424,6 +5503,10 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags) +@@ -5424,6 +5504,10 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags) xf86OutputPtr output = config->output[config->compat_output]; xf86CrtcPtr crtc = output->crtc; @@ -11798,7 +11833,7 @@ #ifdef XF86DRI if (info->cp->CPStarted && pScrn->pScreen) DRILock(pScrn->pScreen, 0); #endif -@@ -5536,9 +5619,12 @@ Bool RADEONEnterVT(int scrnIndex, int flags) +@@ -5536,9 +5620,12 @@ Bool RADEONEnterVT(int scrnIndex, int flags) if (info->adaptor) RADEONResetVideo(pScrn); radeon-modeset.patch: Index: radeon-modeset.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- radeon-modeset.patch 6 Mar 2009 23:50:06 -0000 1.36 +++ radeon-modeset.patch 10 Mar 2009 02:04:50 -0000 1.37 @@ -1,3 +1,904 @@ +commit 792123c802991e2a0ef6f37361ceccf9373ce81f +Author: Dave Airlie +Date: Thu Mar 5 16:05:41 2009 +1000 + + radeon: add support for relocatable CRTC inside VLINE + + We cannot let userspace decide which CRTC it wants because its userspace + and might not own the crtc, so we need to provide a way to relocate it + +commit 25471f05a590bf0aff31d29cd1ac0de4bf4409b9 +Author: Dave Airlie +Date: Tue Mar 3 15:30:21 2009 +1000 + + radeon: initial framebuffer resize support + + This relies on the kernel pinning everything which the latest + rawhide kernel should do fine + +commit 7d0a186543661e10167590b1743459754fdda75d +Author: Dave Airlie +Date: Tue Mar 3 09:20:30 2009 +1000 + + radeon: do get sarea until we know we aren't DRI2 + +commit 92d98c27fb82debf303e90dd29fbb691bb112cc3 +Author: Dave Airlie +Date: Tue Mar 3 09:12:30 2009 +1000 + + radeon: no need to do any of this for DRI2 + +commit 633e5bf4a81449e8800d4deea1166fddb75a9fb2 +Author: Dave Airlie +Date: Fri Feb 27 12:00:29 2009 +1000 + + fixup issues post rebase + +commit 36c1522b08722de1c2164481ce418bd1f08c5261 +Author: Dave Airlie +Date: Thu Feb 26 10:47:42 2009 +1000 + + radeon: don't init 3d engine in Xv path for drm mm + +commit d21c95cd5ffa21568bd18d2b3f6efaf9c9b571f3 +Author: Dave Airlie +Date: Tue Feb 17 19:14:27 2009 +1000 + + radeon: fix vt switch for legacy paths + +commit 181b0eed3c247f4ac3fceb8b75aeaae92e5926aa +Author: Dave Airlie +Date: Tue Feb 17 19:13:05 2009 +1000 + + radeon: only init gart heap for non-kms + +commit bf389fd99a9b9ef1895cc77b213db5817cca7b3d +Author: Dave Airlie +Date: Sun Jan 11 09:29:44 2009 +1000 + + radeon: drop CS1 + +commit 06952498f6cc23e29a40a9f62af2edd7ecb090e2 +Author: Jerome Glisse +Date: Wed Nov 12 14:36:52 2008 +0100 + + radeon: enable dri2 only if memory manager is present + (cherry picked from commit fd4bb9b7b639befd63e7acd37254011b9e46732d) + +commit ed9d3d1f442ac68dd46d62a5e8f2236e851204b0 +Author: Jerome Glisse +Date: Mon Nov 10 22:16:57 2008 +0100 + + radeon: flush command stream in block handler and in dri2 copy callback + (cherry picked from commit 13fa5ab73a707af52e71af400ea186073022f8b7) + +commit b7b3ef60fc68a52627be2211700e6c8332889d48 +Author: Jerome Glisse +Date: Fri Nov 14 12:44:29 2008 +0100 + + radeon: bufmgr exa doesn't exist + (cherry picked from commit 8a00de47a186db1707b82a5977da8cbf2e8e0c80) + +commit 19ce13951371b8576f51da9b4e6d8a70b7edb0f6 +Author: Jerome Glisse +Date: Thu Nov 6 00:25:18 2008 +0100 + + radeon: initial dri2 support + +commit 972cfd240fde82d9b6e2259c9e622e13b261a29d +Author: Dave Airlie +Date: Mon Dec 1 19:15:41 2008 +1000 + + radeno: fixup unpinned buffers + (cherry picked from commit d9759ca976cad48e6c8fd3c7d17ce38588522c34) + +commit 37d665b6f3193929afae7608a92f7a05dc830a76 +Author: Dave Airlie +Date: Mon Dec 22 16:16:16 2008 +1000 + + radeon: fix for 1.6 server + +commit 2e27c619191ff42698662b538863237df557c3a6 +Author: Dave Airlie +Date: Fri Dec 19 12:37:01 2008 +1100 + + radeon: only do mappings if direct rendering is enabled + +commit 80308a43b19966cdc1e9b58249ced45080f7e6ba +Author: Dave Airlie +Date: Tue Dec 9 13:29:18 2008 +1000 + + radeon: upstream fix for Init3D vs switch to/from 2d/3d + +commit 0ccd8d665d2b11a4af35586d86c8cb7742ad14e0 +Author: Dave Airlie +Date: Mon Dec 8 14:19:47 2008 +1000 + + radeon: only update dri buffers if DRI enabled + +commit 19f0842e41a81a8cd883048f9fae8736734ea3f4 +Author: Dave Airlie +Date: Mon Dec 1 15:31:08 2008 +1100 + + radeon: don't have 2D and 3D in one CS buffer + +commit 5a09cdbd0dee2513dfde9da4e11cbc9ba85b28d6 +Author: Dave Airlie +Date: Wed Nov 26 16:09:29 2008 +1100 + + radeon: set touched flag on pinned buffers + +commit b1153a6c85856db565791e8937b60214d32eff3b +Author: Dave Airlie +Date: Wed Nov 26 16:04:35 2008 +1100 + + radeon: fix up some of the touched by gpu handling and force gtt handling + + this fixes DFS on the rs690 + +commit cd04e7dd7067b5ab067a5252884e85bef8d7f60b +Author: Dave Airlie +Date: Wed Nov 26 12:52:24 2008 +1100 + + radeon: brutal attempt to fix RS4xx and RS6xx by flushing more often + + this might take more CPU but hopefully leads to stabler GPU + +commit ea31830a208ff187d86a131236d3a681551c8de3 +Author: Dave Airlie +Date: Sun Nov 23 17:56:02 2008 +1000 + + radeon: wait for rendering before doing UTS + +commit aa6f7f49f8a7576bdbd05e440126aa61e614a1a0 +Author: Dave Airlie +Date: Sun Nov 23 17:54:27 2008 +1000 + + radeon: stop this_op_read from going negative + +commit d49164d6cfe4b75706fe5700b1d572bcb24ff3c1 +Author: Dave Airlie +Date: Sun Nov 23 17:52:42 2008 +1000 + + radeon: return flush for conflicting domains + +commit fa9c42e37adc3755ae64e0362faa6b2c8daefe2c +Author: Dave Airlie +Date: Sun Nov 23 17:50:47 2008 +1000 + + radeon: only reset state2d before emitting cache flush + +commit 152939e563e77a90a1154669fa7b9af4c0392d63 +Author: Dave Airlie +Date: Thu Nov 20 16:48:33 2008 +1000 + + flush on UTS if any references + +commit 41a16e4646f422e5cc76e44631ec17a5fd5d019f +Author: Dave Airlie +Date: Thu Nov 20 16:44:40 2008 +1000 + + radeon: add gart vs vram writes + +commit 64ced4a986b8c5c6534b4a27830e3a1e6119e269 +Author: Dave Airlie +Date: Thu Nov 20 16:37:07 2008 +1000 + + radeon: improve DFS performance for non-vram objects + +commit 9f9545dd3b926b0edbef6dbe8f7b4c544e8f2631 +Author: Dave Airlie +Date: Wed Nov 19 14:49:44 2008 +1000 + + radeon: scrap state on LeaveVT not EnterVT + +commit 9d80e58ee16d56d7b6c5d1dcbf6e8dafc4ce09ae +Author: Dave Airlie +Date: Wed Nov 19 11:08:34 2008 +1000 + + radeon: even more typos + +commit 1823d254a3a07ceea9cf7c6d70b0b22193fe4b27 +Author: Dave Airlie +Date: Wed Nov 19 07:51:03 2008 +1000 + + radeon: oops bad typo + +commit 61285e439341b3ac357b46086b7535f8a3c6252c +Author: Dave Airlie +Date: Tue Nov 18 16:09:10 2008 +1000 + + radeon: even if kernels fails, struggle onwards + + try and keep the session going even if visual glitches happen + +commit e97d0ee5deb8dd8b681c491c5ef5505ae24db3a0 +Author: Dave Airlie +Date: Tue Nov 18 15:46:46 2008 +1000 + + radeon_bufmgr: much more complete size check functionality + +commit 60806b5a76582478323be5649aeee510f0043328 +Author: Dave Airlie +Date: Tue Nov 18 14:33:44 2008 +1000 + + radeon: I fail at uint32_t division + +commit 7402017c10bb3ef0d02dd81a940df1d97f14ec42 +Author: Dave Airlie +Date: Tue Nov 18 12:06:02 2008 +1000 + + radeon: workaround O(wtf) logic in post_submit bufmgr + +commit 86265d8a8134e16211c8e179d2b5af11af77646e +Author: Dave Airlie +Date: Mon Nov 17 19:19:43 2008 +1000 + + radeon: set emit limit to 90% VRAM + +commit dc74e4f790a30fed364b06e37978384bc5708149 +Author: Dave Airlie +Date: Mon Nov 17 16:16:51 2008 +1000 + + radeon: use get/set master ioctls + +commit 57af898aece299faf54bb36de26b5b9df7a23570 +Author: Dave Airlie +Date: Fri Nov 14 15:56:16 2008 +1000 + + radeon: make space accounting a lot smarter + +commit 45ecaf81e28f47c3e49fbdaf94a205b827f7de8a +Author: Dave Airlie +Date: Fri Nov 14 15:55:12 2008 +1000 + + radeon: retry on CS2 EAGAIN + +commit d494dcfeff48b2ede9c0149b7b329cc764c16946 +Author: Dave Airlie +Date: Fri Nov 14 15:20:59 2008 +1000 + + radeon: add src/mask/dest to fallbacks + +commit 3e94797cd315f138473a8e259c852ead40ab2826 +Author: Dave Airlie +Date: Fri Nov 14 15:20:37 2008 +1000 + + radeon_memory: align all allocations + +commit 99f552fbb084b39df01495917c8799fd960238ff +Author: Dave Airlie +Date: Fri Nov 14 11:03:34 2008 +1000 + + radeon: force gtt for mmap after fallbacks + +commit 6b3c66d4ce4e8e63927dd3a0ce3b483241ec491b +Author: Dave Airlie +Date: Mon Nov 10 14:18:17 2008 +1000 + + radeon: add more buffer info + fix read objects too big fallback + +commit e33b4410b0913ed9b614b54ccb884c00c2370615 +Author: Dave Airlie +Date: Mon Nov 10 11:47:02 2008 +1000 + + radeon: remove old exa bufmgr not used anymore code + +commit e8fad094a7d481cdfc712d55a31f8d8dbaf0b930 +Author: Dave Airlie +Date: Mon Nov 10 11:18:27 2008 +1000 + + radeon: fix crtc dpms + + need to find a better way to switch displays off + +commit 877935b871232545e84e32fc9d02fcff72552295 +Author: Dave Airlie +Date: Sat Nov 8 14:48:29 2008 +1000 + + radeon: add DPMS support for connectors + +commit 6093bcb92e2b2439827300493f7179f8c1ce573f +Author: Dave Airlie +Date: Fri Nov 7 16:20:09 2008 +1000 + + radeon: fix rotation of right-of heads + +commit 5408002d2647353f9a8efe7f80371813810e1cc0 +Author: Dave Airlie +Date: Mon Nov 3 14:51:43 2008 +1000 + + radeon: respect fb tex percent + trust kernel values + +commit 939f818aa364c381ff50f7d46094986fc606ce58 +Author: Dave Airlie +Date: Fri Oct 31 15:05:14 2008 +1000 + + radeon: remove workaround hack since kernel is hopefully fixed + +commit 492f3bb44de6676d68afbaca2f352ba4e22c0925 +Author: Dave Airlie +Date: Fri Oct 31 15:04:31 2008 +1000 + + radeon: workaround use after free + +commit 10188b4331bbe466e4bce9ece9e512f4872a4331 +Author: Dave Airlie +Date: Thu Oct 30 13:53:02 2008 +1000 + + radeon: setup accel dfs for PCIE cards only if drm_mm + +commit fda1c3d0db74e7dac72d73fce481baae365aeec5 +Author: Dave Airlie +Date: Thu Oct 30 10:00:10 2008 +1000 + + radeon: fixup name handling for bufmgr + +commit 10cf6444c73542a28255072bea0a090197ef3493 +Author: Dave Airlie +Date: Thu Oct 30 09:59:11 2008 +1000 + + radeon: fix memory leak in CS2 code + +commit d8589d2a8a5aa96e8799b0baa176804f60491f0c +Author: Dave Airlie +Date: Tue Oct 28 20:35:19 2008 +1000 + + return on empty IBs, flush happen in the kernel + +commit 6feee544fb530b78c255357268bb0e9aa34e5430 +Author: Dave Airlie +Date: Tue Oct 28 10:16:09 2008 +1000 + + radeon: remove some debugging + +commit 98a17f1cc7326e35c17712ed318e79d7816eb817 +Author: Dave Airlie +Date: Tue Oct 28 06:40:31 2008 +1000 + + radeon: enable gem wait rendering. + +commit 9f884ba97fe517b52148198df4ed0aceaabe4618 +Author: Dave Airlie +Date: Mon Oct 27 16:51:00 2008 +1000 + + radeon: add new CS submission scheme + +commit bbbc0e7e21668684cb60649d0ebf0be36d94b5e4 +Author: Dave Airlie +Date: Thu Oct 23 17:05:12 2008 +1000 + + radeon: really rough effort at vram limit setting + +commit 619eca79f15c36e1e50ca8d2e28a451327810216 +Author: Dave Airlie +Date: Thu Oct 23 17:04:51 2008 +1000 + + radeon: this shouldn't fail but it did once while debugging so patch up + +commit 6bb16c3a3bcba75557fa45567d28d5dda5463875 +Author: Dave Airlie +Date: Thu Oct 23 10:43:09 2008 +1000 + + radeon: fixup some memory allocation issues + + hopefully since the alignment got fixed this doesn't break anything + +commit 790e378c46b133e9a30d12e5b036ff9d1ec97181 +Author: Dave Airlie +Date: Tue Oct 21 15:50:17 2008 +1000 + + radeon: cleanup reserved space calcs + +commit 5d0cdb6321c301ab94e9b9c49912562299efe9f3 +Author: Dave Airlie +Date: Tue Oct 21 15:49:48 2008 +1000 + + radeon: fixup Owen's optimisation - this fixes corruption + + I haven't a good explaination why mapping the buffer twice in a row + seems to cause this failure. but I probably don't have time to track + it down before release. + +commit 79134741c9bd31d19d1ca887464a41625a4b9256 +Author: Dave Airlie +Date: Sun Oct 19 18:27:53 2008 +1000 + + radeon: fixup tex offset for no modeset + +commit bc7abf58eb5f9497f70c337709631d4f991552e0 +Author: Dave Airlie +Date: Wed Oct 15 17:01:34 2008 +1000 + + radeon: add DFS support for CS + +commit 977018370d2626aca452894b7d0cf7cc9b773d77 +Author: airlied +Date: Wed Oct 15 23:55:13 2008 +1000 + + radeon: add r100/r200 support for EXA render + +commit 82c18e976f825c93aaec2208feb92877db13084b +Author: Dave Airlie +Date: Mon Oct 13 16:59:02 2008 +1000 + + radeon: fix switch mode path so nexuiz starts + +commit 7e2f98ba5bf205e395518a6a283095918620f099 +Author: Dave Airlie +Date: Fri Oct 10 15:29:24 2008 +1000 + + remove gem buf caching useless on radeon + +commit 1dda85f41012139539b135af0c7280e703aa025c +Author: Dave Airlie +Date: Fri Oct 10 15:18:41 2008 +1000 + + radeon: drmmode make names same as for non-kms drivers + +commit a26a20f9a0ad340f3032c8420249c36b02de4fc4 +Author: Dave Airlie +Date: Fri Oct 10 15:10:28 2008 +1000 + + radeon: fix rotation under kms + +commit 34a711886a77724f49cd3b8793922dc1b60d41ae +Author: Dave Airlie +Date: Fri Oct 10 14:44:39 2008 +1000 + + radeon: remove testing fallback + +commit 14e85e9202c0ea048877cd317db762e60a9586a3 +Author: Kristian H??gsberg +Date: Fri Oct 10 10:57:47 2008 +1100 + + radeon: add copy fb contents patch + +commit 08ee251f5ef124562eb496c966e5c5ab24de079c +Author: Dave Airlie +Date: Fri Oct 10 10:57:20 2008 +1100 + + bufmgr: turn off debug + +commit 19ecc7092fa7830ef19e3664c363d312a8112175 +Author: Dave Airlie +Date: Fri Oct 10 10:38:38 2008 +1100 + + radeon: fixup modesetting code after rebasing to master + +commit 42ab306a892601460d69dd3a15ac459c902bfea3 +Author: Dave Airlie +Date: Thu Oct 9 16:34:52 2008 +1100 + + radeon: misc cleanups in exa + +commit 4d7a61c0567d7d71c4df29d21e4e8731caa5af0c +Author: Dave Airlie +Date: Thu Oct 9 16:34:23 2008 +1100 + + radeon: fix UTS for non-modesetting + +commit d15a38541dfc34dd5156a727706eeef015346de2 +Author: Dave Airlie +Date: Thu Oct 9 16:33:59 2008 +1100 + + radeon: fix exa limits problem - shouldn't have been resetting scissor + +commit c1ae7fbc398dd01c03621b7bf9b13df1c0da680e +Author: Dave Airlie +Date: Wed Oct 1 11:21:53 2008 +1000 + + radeon: fixup for latest libdrm changes + +commit 35b8f71d6181c2207ab523b78224c6c9b9a950b6 +Author: Owen Taylor +Date: Fri Sep 26 16:17:49 2008 -0400 + + Don't flush when mapping a newly created pixmap into system ram If we have a pixmap that has never been mapped into vram (and thus never written to by the GPU), there is no need to flush the graphics pipeline and wait for idle before starting to write to it. + +commit c8750ddbe1c91fcfb1b2aefcb75f0d5f86fee8a1 +Author: Dave Airlie +Date: Mon Sep 29 16:32:51 2008 +1000 + + radeon: hopefully fix textured xv + +commit 8a5a10bdd9e4f83047cc87353fa313f1299a601f +Author: Dave Airlie +Date: Fri Sep 26 11:38:36 2008 +1000 + + radeon: fix the offset checks for command submission + + since we are relocating in the kernel we don't need these + +commit 5636af08d3aa2294e25b574738d89859ad7e5d58 +Author: Dave Airlie +Date: Fri Sep 26 10:46:20 2008 +1000 + + radeon: fixup after mertge + +commit 3785954990de17d4d1fd4972ea2f52a08df67c3f +Author: Dave Airlie +Date: Fri Sep 26 10:34:41 2008 +1000 + + radeon: fix issues with emitting DST PIPE on cards that don't use it + +commit 930633213ec71f48e30142185815df11ff945dba +Author: Dave Airlie +Date: Wed Sep 24 17:12:19 2008 +1000 + + modesetting: fixup bits of drmmode_display.c + +commit 442c52e9cc396a0c2c97f96e37fa97621d6ef81d +Author: Dave Airlie +Date: Wed Sep 24 15:42:01 2008 +1000 + + r600: fixup for kms + +commit e4e80616398db33614e38d58d47c8a5a8adaddce +Author: Dave Airlie +Date: Sun Sep 7 08:01:56 2008 +1000 + + modeset: fix AddFB for current tree + +commit f7cac11fc7f2b91d39f58dd0d03c7b7c8bf46450 +Author: Dave Airlie +Date: Thu Aug 14 10:52:52 2008 +1000 + + radeon: disable overlay for modesetting for now + +commit 8ab5cc31e41a5d181f6c47b88c6f64764d44a346 +Author: Dave Airlie +Date: Thu Aug 14 10:52:42 2008 +1000 + + radeon: no need for this anymore + +commit 35d4ee0ab5c3d6e3a76bde048a385b22da5996f0 +Author: Dave Airlie +Date: Fri Sep 5 16:32:01 2008 +1000 + + radeon: fix up for suspend/resume - uses new API + +commit aaa954b49c92dafb4c24df67477d54f7b982c79b +Author: Dave Airlie +Date: Wed Aug 27 13:09:55 2008 +1000 + + radeon: update to proper domain + + this should fix 3d again for now at least + +commit da197aabd20d47dedabe18734da8c487f4875c8d +Author: Dave Airlie +Date: Tue Aug 26 18:29:23 2008 +1000 + + ddx: move to using new gem interface + + add a GEM bufmgr backend along the lines of Intels one. + + The buffer reuse is disabled and I'll probably rip it out for radeon + as we can't just re-use buffers that might have ended up in VRAM etc. + + Probably need some sort of in-kernel re-use. + +commit 4e5fc75c73c388a0840720ce0fc27db3a19c86cf +Author: Dave Airlie +Date: Mon Aug 25 11:37:48 2008 +1000 + + radeon: add an initial GEM bufmgr + +commit 90a4d7d67767f2dfef516868d28b533b37e9bb93 +Author: Dave Airlie +Date: Mon Aug 25 11:37:20 2008 +1000 + + radeon: implement simple UTS + +commit 6042177580839fdb7578200ba3ed39ec55312203 +Author: Dave Airlie +Date: Fri Aug 22 15:34:58 2008 +1000 + + radeon: add read/write domains properly + +commit a7bb412bdca1bc915794ddae7276ebb59be6b4f7 +Author: Dave Airlie +Date: Fri Aug 15 11:25:31 2008 +1000 + + radeon: fix some rotate bugs + +commit 05ec9ff3b85e3f526e2f803600ffb8db707aaf6c +Author: Dave Airlie +Date: Fri Aug 15 11:16:18 2008 +1000 + + radeon: when create fake bos, they are already mapped + +commit dfca01f53644333444c9364716e1024fc0ed3a3a +Author: Dave Airlie +Date: Fri Aug 15 11:15:58 2008 +1000 + + exa: remove wrong assert + +commit ad3cfb887815361be0ee61e1e8559781c8ebf026 +Author: Dave Airlie +Date: Tue Aug 12 19:27:44 2008 +1000 + + radeon: start to work on rotate pixmap support + +commit dfeeb56293d4480e9b875334a7a8509f173e95cc +Author: Dave Airlie +Date: Tue Aug 12 18:28:23 2008 +1000 + + radeon: port simple exa bufmgr + + exa pixmaps work now but they are slow + +commit c612788007beaa5f09602c87f1b2f3bd517551be +Author: Dave Airlie +Date: Thu Aug 7 17:52:04 2008 +1000 + + further pixmaps on EXA + +commit 3ca79597ec6357571b01c143f75054624952c107 +Author: Dave Airlie +Date: Thu Aug 7 11:22:46 2008 +1000 + + initial exa on gem hackx + + Conflicts: + + src/radeon_exa.c + src/radeon_memory.c + +commit fb6f4e2dbf6a3c96493f1c85d0383954549b5ab6 +Author: Dave Airlie +Date: Tue Aug 12 15:31:03 2008 +1000 + + radeon: initial rotate pixmap + + This doesn't work, we really need EXA pixmaps for this stuff + +commit 9de349249ff9f175e703b3d975e5f6a9fa332d40 +Author: Dave Airlie +Date: Tue Aug 12 14:40:18 2008 +1000 + + radeon: use buffer names + +commit 18a3c5cc114b9af53c5d15301787dd67738e97b8 +Author: Dave Airlie +Date: Tue Aug 12 14:38:56 2008 +1000 + + ati: fix do adjust mode + +commit 96f754c15ce3ac2c8477a1e46f7e013a67c68bb3 +Author: Dave Airlie +Date: Tue Aug 12 09:38:48 2008 +1000 + + FEDORA: update offsets in DRI private + +commit 6636f4511635df967ad83c91ed5c5584b4fd70e0 +Author: Dave Airlie +Date: Tue Aug 12 09:10:18 2008 +1000 + + radeon: add vt bind flag + +commit 97e41f34e01fa38f98d5a1b85a03e4fe61c341b2 +Author: Dave Airlie +Date: Wed Aug 6 13:30:54 2008 +1000 + + radeon: warning cleanups + +commit 349c56d5229927317c4c533247bb13b22ef876f9 +Author: Dave Airlie +Date: Wed Aug 6 13:18:52 2008 +1000 + + radeon: remove debugging + +commit 26705852d8be63f6d9f237b4023487089392c4ae +Author: Dave Airlie +Date: Wed Aug 6 13:17:31 2008 +1000 + + radeon: add code to set memory map and not futz with mappings + +commit c5a452276fc86beabc81d64d3da04afbe3e6b370 +Author: Dave Airlie +Date: Wed Aug 6 13:16:56 2008 +1000 + + drm: don't futz with framebuffer when no drm_mm + +commit 558864d7647f69f610f6815368c7b8c23bf1808e +Author: Dave Airlie +Date: Tue Aug 5 16:47:21 2008 +1000 + + radeon: undef OUT_RELOC + +commit 1a67c636f39c62e7438958d07aa9e13893d529e4 +Author: Dave Airlie +Date: Tue Aug 5 16:37:52 2008 +1000 + + radeon: add stdint/lib to check for modesetting + +commit cc426003d5ebf1ef6c3bf439ae00bcd0c8d08788 +Author: Dave Airlie +Date: Tue Aug 5 16:07:31 2008 +1000 + + fix whitespace + +commit 9c1cb1d7a83a4fea9796acdceb792a7e0821554c +Author: Dave Airlie +Date: Tue Aug 5 16:07:07 2008 +1000 + + radeon: fix build issue + +commit fb90c1c7c2d9bb7c374080362a66947e0893751b +Author: Dave Airlie +Date: Mon Aug 4 16:27:55 2008 +1000 + + radeon: free all pinned memory on server shutdown + +commit bf5dbb81ba35ecbd1a215910404bd91dcc389e32 +Author: Dave Airlie +Date: Mon Aug 4 16:11:30 2008 +1000 + + radeon: get textured video working on the memory manager + +commit 562c15131f0b47af3e60649e7bb0f63d0f8ce905 +Author: Dave Airlie +Date: Mon Aug 4 16:11:18 2008 +1000 + + radeon: convert bus addr to void pointer + +commit dd5a36b4116f83ae1f406693b55ebacc90a96ba7 +Author: Dave Airlie +Date: Mon Aug 4 15:11:13 2008 +1000 + + radeon: avoid z cache flushes if not needed + +commit 203cb77f84e2b6f449789adbc64609ec739522cf +Author: Dave Airlie +Date: Wed Jul 30 17:04:22 2008 +1000 + + radeon: update DRI support, so mappings get added + + We only add fake frontbuffer mapping as DRI clients expect one. + +commit d09e37bed190f3e4cf3c5fe415082b5af627ee73 +Author: Dave Airlie +Date: Tue Jul 29 16:50:03 2008 +1000 + + radeon: exa through the handle relocation function + +commit 348cb50fb0ff61c42a55f1adaeb7e6521931a5b6 +Author: Dave Airlie +Date: Tue Jul 29 14:58:22 2008 +1000 + + radeon: keep track of 2D state + + This lets the kernel use the 2D blit engine in theory + +commit 4ffb66c161f17b4a275a99e46dda6e9904ba0293 +Author: Dave Airlie +Date: Mon Jul 28 17:48:59 2008 +1000 + + new command submission attempt + +commit 2db6760e425efedad537f33276553efa693b5f93 +Author: Dave Airlie +Date: Mon Jul 28 17:48:08 2008 +1000 + + radeon: fixup over fluishing problem + +commit 34e98ac507605fee60f9811c25cd4eed531f3d8c +Author: Dave Airlie +Date: Mon Jul 28 17:44:51 2008 +1000 + + hack for now: divide texture size by 2 + +commit 347cf1dfa7ce4f98e25af3d83b865208186cd41e +Author: Dave Airlie +Date: Fri Jul 25 17:07:20 2008 +1000 + + radeon: fix dri message + +commit 03e469920c0908e62c5fa76f892d6fc969026492 +Author: Dave Airlie +Date: Fri Jul 25 15:11:58 2008 +1000 + + radeon: fix pool which caused memory corruption + +commit 4a214f115890170ffbd8c710067e165d4106cb5c +Author: Dave Airlie +Date: Fri Jul 25 14:59:07 2008 +1000 + + radeon: get DRI to attempt to start up + +commit f06e03e4b909b4a7a68365330b6b19937abe1506 +Author: Dave Airlie +Date: Fri Jul 25 14:58:23 2008 +1000 + + radeon: call the right sync function + +commit b08f5b921676570a357cdbf2c9411b6b56fd564f +Author: Dave Airlie +Date: Fri Jul 25 14:57:21 2008 +1000 + + radeon: unmap memory from objects + +commit 869ce0cd2d28673eb30c92c8b79ada5870ff4c4f +Author: Dave Airlie +Date: Wed Jul 23 10:59:16 2008 +1000 + + use CP for 3D engine with modeset + +commit 7dedbf4a3abdba120cff59785e232d28ff324887 +Author: Dave Airlie +Date: Wed Jul 23 10:59:04 2008 +1000 + + radeon: fix DFS + +commit 66581330987a8a6fa50df6be4edb41efdb998bd9 +Author: Dave Airlie +Date: Wed Jul 23 10:48:45 2008 +1000 + + radeon: get the fb location right + +commit 3438a51e0d87a25dd1f747212ac9612149f49d3f +Author: Dave Airlie +Date: Tue Jul 22 18:08:25 2008 +1000 + + radeon: make at least the EXA stipple work.. + +commit fce2c06070101243f8228574907f9f67826633d7 +Author: Dave Airlie +Date: Tue Jul 22 18:07:15 2008 +1000 + + radeon: disable debugging for now + +commit 3d779c1a27ae4691a13ee8da83f6f06922afb83a +Author: Dave Airlie +Date: Mon Jul 21 18:40:14 2008 +1000 + + radeon: initial indirect buffer use. + + Move EXA and front allocation into one big buffer to workaround + EXA issues - need to move to driver pixmap hooks. + + Add new indirect GEM to take indirect buffers. + + doesn't work think the offsets are all wrong. + +commit 181dec8fe5651fd7feb4efa1674fa0ef3685a7b4 +Author: Dave Airlie +Date: Fri Jul 18 13:46:41 2008 +1000 + + modesetting step 1: have X and a cursor + +commit 8b5a5b041bc58c085d45aecedda4df11c94716f5 +Author: Dave Airlie +Date: Thu Jul 17 09:59:19 2008 +1000 + + radeon: add radeon_memory.c + +commit 415ef83b9c2954fe7110e9dc6e2b2d6b4ce52bfb +Author: Dave Airlie +Date: Tue Jul 8 16:55:27 2008 +1000 + + remove mappings of some buffers. + + use drm gart code if available + +commit dff36e2075f948d9002b882aa6c9e3098a3481c9 +Author: Dave Airlie +Date: Mon Jul 7 16:54:35 2008 +1000 + + add initial support for a kernel memory manager + + This just pins all the current allocations via the kernel memory manager + instead of trying to do them all in userspace. + + useful steps towards getting kernel modesetting + +commit c12eccd5889541e9aa1a700f97c1de38920794c8 +Author: Dave Airlie +Date: Fri Jul 4 10:39:34 2008 +1000 + + port to using drm header files diff --git a/configure.ac b/configure.ac index b094a50..29a19e3 100644 --- a/configure.ac @@ -4062,7 +4963,7 @@ + +#endif diff --git a/src/radeon_driver.c b/src/radeon_driver.c -index 0842164..c61a722 100644 +index e8d28f0..caea901 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -67,7 +67,7 @@ @@ -4274,7 +5175,7 @@ info->cp->CPInUse = FALSE; info->cp->CPStarted = FALSE; info->cp->CPusecTimeout = RADEON_DEFAULT_CP_TIMEOUT; -@@ -2701,6 +2732,37 @@ static const xf86CrtcConfigFuncsRec RADEONCRTCResizeFuncs = { +@@ -2692,6 +2723,37 @@ static const xf86CrtcConfigFuncsRec RADEONCRTCResizeFuncs = { RADEONCRTCResize }; @@ -4312,7 +5213,7 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) { xf86CrtcConfigPtr xf86_config; -@@ -2721,6 +2783,8 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) +@@ -2712,6 +2774,8 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) info = RADEONPTR(pScrn); info->MMIO = NULL; @@ -4321,7 +5222,7 @@ info->IsSecondary = FALSE; info->IsPrimary = FALSE; -@@ -2755,62 +2819,63 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) +@@ -2746,62 +2810,63 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) } info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index); @@ -4432,7 +5333,7 @@ if (xf86RegisterResources(info->pEnt->index, 0, ResExclusive)) goto fail; -@@ -2820,10 +2885,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) +@@ -2811,10 +2876,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR; pScrn->monitor = pScrn->confScreen->monitor; @@ -4449,7 +5350,7 @@ if (!RADEONPreInitVisual(pScrn)) goto fail; -@@ -2837,154 +2904,216 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) +@@ -2828,164 +2895,224 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) memcpy(info->Options, RADEONOptions, sizeof(RADEONOptions)); xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, info->Options); @@ -4562,6 +5463,20 @@ + */ + info->directRenderingEnabled = RADEONPreInitDRI(pScrn); #endif +- if (!info->directRenderingEnabled) { +- if (info->ChipFamily >= CHIP_FAMILY_R600) { +- info->r600_shadow_fb = TRUE; +- xf86DrvMsg(pScrn->scrnIndex, X_INFO, ++ if (!info->directRenderingEnabled) { ++ if (info->ChipFamily >= CHIP_FAMILY_R600) { ++ info->r600_shadow_fb = TRUE; ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "using shadow framebuffer\n"); +- if (!xf86LoadSubModule(pScrn, "shadow")) +- info->r600_shadow_fb = FALSE; +- } +- } +- - if (!RADEONPreInitVRAM(pScrn)) - goto fail; - @@ -4577,25 +5492,10 @@ - info->allowColorTiling = FALSE; - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Requested desktop size exceeds surface limts for tiling, ColorTiling disabled\n"); -+ -+ if (!RADEONPreInitVRAM(pScrn)) -+ goto fail; -+ -+ RADEONPreInitColorTiling(pScrn); -+ -+ /* we really need an FB manager... */ -+ if (pScrn->display->virtualX) { -+ crtc_max_X = pScrn->display->virtualX; -+ crtc_max_Y = pScrn->display->virtualY; -+ if (info->allowColorTiling) { -+ if (crtc_max_X > info->MaxSurfaceWidth || -+ crtc_max_Y > info->MaxLines) { -+ info->allowColorTiling = FALSE; -+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -+ "Requested desktop size exceeds surface limts for tiling, ColorTiling disabled\n"); -+ } ++ if (!xf86LoadSubModule(pScrn, "shadow")) ++ info->r600_shadow_fb = FALSE; } -- } + } - if (crtc_max_X > 8192) - crtc_max_X = 8192; - if (crtc_max_Y > 8192) @@ -4614,6 +5514,24 @@ - } else if (IS_AVIVO_VARIANT) { - crtc_max_X = 2560; - crtc_max_Y = 1600; ++ ++ if (!RADEONPreInitVRAM(pScrn)) ++ goto fail; ++ ++ RADEONPreInitColorTiling(pScrn); ++ ++ /* we really need an FB manager... */ ++ if (pScrn->display->virtualX) { ++ crtc_max_X = pScrn->display->virtualX; ++ crtc_max_Y = pScrn->display->virtualY; ++ if (info->allowColorTiling) { ++ if (crtc_max_X > info->MaxSurfaceWidth || ++ crtc_max_Y > info->MaxLines) { ++ info->allowColorTiling = FALSE; ++ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, ++ "Requested desktop size exceeds surface limts for tiling, ColorTiling disabled\n"); ++ } ++ } + if (crtc_max_X > 8192) + crtc_max_X = 8192; + if (crtc_max_Y > 8192) @@ -4676,31 +5594,30 @@ + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No valid modes.\n"); + goto fail; + } ++ ++ /* fix up cloning on rn50 cards ++ * since they only have one crtc sometimes the xserver doesn't assign ++ * a crtc to one of the outputs even though both outputs have common modes ++ * which results in only one monitor being enabled. Assign a crtc here so ++ * that both outputs light up. ++ */ ++ if (info->ChipFamily == CHIP_FAMILY_RV100 && !pRADEONEnt->HasCRTC2) { ++ int i; - ErrorF("before xf86InitialConfiguration\n"); -+ /* fix up cloning on rn50 cards -+ * since they only have one crtc sometimes the xserver doesn't assign -+ * a crtc to one of the outputs even though both outputs have common modes -+ * which results in only one monitor being enabled. Assign a crtc here so -+ * that both outputs light up. -+ */ -+ if (info->ChipFamily == CHIP_FAMILY_RV100 && !pRADEONEnt->HasCRTC2) { -+ int i; -+ + for (i = 0; i < xf86_config->num_output; i++) { -+ xf86OutputPtr output = xf86_config->output[i]; -+ -+ /* XXX: double check crtc mode */ -+ if ((output->probed_modes != NULL) && (output->crtc == NULL)) -+ output->crtc = xf86_config->crtc[0]; -+ } -+ } ++ xf86OutputPtr output = xf86_config->output[i]; - if (!xf86InitialConfiguration (pScrn, FALSE)) - { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No valid modes.\n"); - goto fail; - } ++ /* XXX: double check crtc mode */ ++ if ((output->probed_modes != NULL) && (output->crtc == NULL)) ++ output->crtc = xf86_config->crtc[0]; ++ } ++ } + ErrorF("after xf86InitialConfiguration\n"); - /* fix up cloning on rn50 cards @@ -4716,19 +5633,14 @@ + char *bus_id; + if (!radeon_alloc_dri(pScrn)) + return FALSE; - -- for (i = 0; i < xf86_config->num_output; i++) { -- xf86OutputPtr output = xf86_config->output[i]; ++ + bus_id = DRICreatePCIBusID(info->PciInfo); + if (drmmode_pre_init(pScrn, &info->drmmode, bus_id, "radeon", pScrn->bitsPerPixel / 8) == FALSE) { + xfree(bus_id); + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Kernel modesetting setup failed\n"); + goto fail; + } - -- /* XXX: double check crtc mode */ -- if ((output->probed_modes != NULL) && (output->crtc == NULL)) -- output->crtc = xf86_config->crtc[0]; ++ + info->dri->drmFD = info->drmmode.fd; + info->dri2.drm_fd = info->drmmode.fd; + info->dri2.enabled = FALSE; @@ -4749,11 +5661,16 @@ + { + struct drm_radeon_getparam gp; + int value; -+ + +- for (i = 0; i < xf86_config->num_output; i++) { +- xf86OutputPtr output = xf86_config->output[i]; + memset(&gp, 0, sizeof(gp)); + gp.param = RADEON_PARAM_FB_LOCATION; + gp.value = &value; -+ + +- /* XXX: double check crtc mode */ +- if ((output->probed_modes != NULL) && (output->crtc == NULL)) +- output->crtc = xf86_config->crtc[0]; + if (drmCommandWriteRead(info->dri->drmFD, DRM_RADEON_GETPARAM, &gp, + sizeof(gp)) < 0) { + goto fail; @@ -4785,7 +5702,7 @@ /* Get ScreenInit function */ if (!xf86LoadSubModule(pScrn, "fb")) return FALSE; -@@ -2999,10 +3128,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) +@@ -3000,10 +3127,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) if (!RADEONPreInitXv(pScrn)) goto fail; } @@ -4802,7 +5719,7 @@ } if (pScrn->modes == NULL) { -@@ -3155,6 +3286,9 @@ static void RADEONBlockHandler(int i, pointer blockData, +@@ -3156,6 +3285,9 @@ static void RADEONBlockHandler(int i, pointer blockData, #ifdef USE_EXA info->accel_state->engineMode = EXA_ENGINEMODE_UNKNOWN; @@ -4812,7 +5729,7 @@ #endif } -@@ -3243,7 +3377,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3244,7 +3376,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, int subPixelOrder = SubPixelUnknown; char* s; #endif @@ -4821,7 +5738,7 @@ info->accelOn = FALSE; #ifdef USE_XAA -@@ -3263,58 +3397,61 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3264,58 +3396,61 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, "RADEONScreenInit %lx %ld\n", pScrn->memPhysBase, pScrn->fbOffset); #endif @@ -4922,7 +5839,7 @@ /* Visual setup */ miClearVisualTypes(); if (!miSetVisualTypes(pScrn->depth, -@@ -3348,19 +3485,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3349,19 +3484,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, hasDRI = info->directRenderingEnabled; #endif /* XF86DRI */ @@ -4956,7 +5873,7 @@ } } -@@ -3397,7 +3536,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3398,7 +3535,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, #ifdef XF86DRI if (hasDRI) { info->accelDFS = xf86ReturnOptValBool(info->Options, OPTION_ACCEL_DFS, @@ -4968,7 +5885,7 @@ /* Reserve approx. half of offscreen memory for local textures by * default, can be overridden with Option "FBTexPercent". -@@ -3423,7 +3565,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3424,7 +3564,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, #endif #if defined(XF86DRI) && defined(USE_XAA) @@ -4977,7 +5894,7 @@ info->dri->textureSize = -1; if (xf86GetOptValInteger(info->Options, OPTION_FBTEX_PERCENT, &(info->dri->textureSize))) { -@@ -3441,7 +3583,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3442,7 +3582,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, #endif #ifdef USE_XAA @@ -4986,7 +5903,7 @@ return FALSE; #endif -@@ -3462,7 +3604,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3463,7 +3603,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, info->CurrentLayout.pixel_bytes); int maxy = info->FbMapSize / width_bytes; @@ -4995,7 +5912,7 @@ xf86DrvMsg(scrnIndex, X_ERROR, "Static buffer allocation failed. Disabling DRI.\n"); xf86DrvMsg(scrnIndex, X_ERROR, -@@ -3472,19 +3614,54 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3473,19 +3613,54 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, info->CurrentLayout.pixel_bytes * 3 + 1023) / 1024); info->directRenderingEnabled = FALSE; } else { @@ -5054,7 +5971,7 @@ #endif xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "Initializing fb layer\n"); -@@ -3508,7 +3685,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3509,7 +3684,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, if (info->r600_shadow_fb == FALSE) { /* Init fb layer */ @@ -5063,7 +5980,7 @@ pScrn->virtualX, pScrn->virtualY, pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth, pScrn->bitsPerPixel)) -@@ -3550,8 +3727,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3551,8 +3726,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, /* restore the memory map here otherwise we may get a hang when * initializing the drm below */ @@ -5076,7 +5993,7 @@ /* Backing store setup */ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, -@@ -3561,7 +3740,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3562,7 +3739,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, /* DRI finalisation */ #ifdef XF86DRI @@ -5085,7 +6002,7 @@ info->dri->pKernelDRMVersion->version_minor >= 19) { if (RADEONDRISetParam(pScrn, RADEON_SETPARAM_PCIGART_LOCATION, info->dri->pciGartOffset) < 0) -@@ -3577,14 +3756,24 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3578,14 +3755,24 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, if (info->directRenderingEnabled) { xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "DRI Finishing init !\n"); @@ -5111,7 +6028,7 @@ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering enabled\n"); -@@ -3680,10 +3869,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, +@@ -3681,10 +3868,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, return FALSE; } } @@ -5121,15 +6038,15 @@ - if (!xf86SetDesiredModes (pScrn)) + if (info->drm_mode_setting) { + if (!drmmode_set_desired_modes(pScrn, &info->drmmode)) - return FALSE; ++ return FALSE; + } else { + if (!xf86SetDesiredModes (pScrn)) -+ return FALSE; + return FALSE; + } /* Provide SaveScreen & wrap BlockHandler and CloseScreen */ /* Wrap CloseScreen */ -@@ -5260,7 +5455,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +@@ -5261,7 +5454,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) #ifdef XF86DRI Bool CPStarted = info->cp->CPStarted; @@ -5138,7 +6055,7 @@ DRILock(pScrn->pScreen, 0); RADEONCP_STOP(pScrn, info); } -@@ -5283,8 +5478,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +@@ -5284,8 +5477,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) #endif } @@ -5151,7 +6068,7 @@ ret = xf86SetSingleMode (pScrn, mode, RR_Rotate_0); -@@ -5296,16 +5493,19 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +@@ -5297,16 +5492,19 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) /* xf86SetRootClip would do, but can't access that here */ } @@ -5179,7 +6096,7 @@ } #endif -@@ -5503,6 +5703,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags) +@@ -5504,6 +5702,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags) xf86OutputPtr output = config->output[config->compat_output]; xf86CrtcPtr crtc = output->crtc; @@ -5191,7 +6108,7 @@ /* not handled */ if (IS_AVIVO_VARIANT) return; -@@ -5542,76 +5747,103 @@ Bool RADEONEnterVT(int scrnIndex, int flags) +@@ -5543,76 +5746,103 @@ Bool RADEONEnterVT(int scrnIndex, int flags) xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "RADEONEnterVT\n"); @@ -5344,7 +6261,7 @@ } #endif /* this will get XVideo going again, but only if XVideo was initialised -@@ -5626,7 +5858,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags) +@@ -5627,7 +5857,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags) info->accel_state->XInited3D = FALSE; #ifdef XF86DRI @@ -5353,7 +6270,7 @@ RADEONCP_START(pScrn, info); DRIUnlock(pScrn->pScreen); } -@@ -5649,26 +5881,28 @@ void RADEONLeaveVT(int scrnIndex, int flags) +@@ -5650,26 +5880,28 @@ void RADEONLeaveVT(int scrnIndex, int flags) "RADEONLeaveVT\n"); #ifdef XF86DRI if (RADEONPTR(pScrn)->directRenderingInited) { @@ -5397,7 +6314,7 @@ /* Make sure 3D clients will re-upload textures to video RAM */ if (info->dri->textureSize) { -@@ -5684,6 +5918,11 @@ void RADEONLeaveVT(int scrnIndex, int flags) +@@ -5685,6 +5917,11 @@ void RADEONLeaveVT(int scrnIndex, int flags) i = list[i].next; } while (i != 0); } @@ -5409,7 +6326,7 @@ } #endif -@@ -5710,10 +5949,18 @@ void RADEONLeaveVT(int scrnIndex, int flags) +@@ -5711,10 +5948,18 @@ void RADEONLeaveVT(int scrnIndex, int flags) xf86_hide_cursors (pScrn); @@ -5431,7 +6348,7 @@ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "Ok, leaving now...\n"); -@@ -5767,7 +6014,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen) +@@ -5768,7 +6013,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen) #endif /* USE_XAA */ if (pScrn->vtSema) { @@ -5441,7 +6358,7 @@ } xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, -@@ -5802,6 +6050,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen) +@@ -5803,6 +6049,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen) info->DGAModes = NULL; xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "Unmapping memory\n"); @@ -8006,7 +8923,7 @@ typedef struct _radeon_encoder { diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c -index 2df299f..72d60e2 100644 +index 2df299f..79b80de 100644 --- a/src/radeon_textured_video.c +++ b/src/radeon_textured_video.c @@ -40,6 +40,7 @@ @@ -8089,35 +9006,35 @@ pPriv->src_pitch = dstPitch; pPriv->size = size; pPriv->pDraw = pDraw; -@@ -510,10 +531,23 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, - } +@@ -511,9 +532,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, /* Upload bicubic filter tex */ -- if (pPriv->bicubic_enabled) { + if (pPriv->bicubic_enabled) { - if (info->ChipFamily < CHIP_FAMILY_R600) - RADEONCopyData(pScrn, (uint8_t *)bicubic_tex_512, - (uint8_t *)(info->FB + pPriv->bicubic_offset), 1024, 1024, 1, 512, 2); -+ if (pPriv->bicubic_enabled && info->ChipFamily < CHIP_FAMILY_R600) { -+ uint8_t *bicubic_addr; -+ int ret; -+ -+ if (info->new_cs) { -+ ret = dri_bo_map(pPriv->bicubic_bo, 1); -+ if (ret) -+ return BadAlloc; -+ -+ bicubic_addr = pPriv->bicubic_bo->virtual; -+ } else -+ bicubic_addr = (uint8_t *)(info->FB + pPriv->bicubic_offset); -+ -+ RADEONCopyData(pScrn, (uint8_t *)bicubic_tex_512, bicubic_addr, 1024, 1024, 1, 512, 2); -+ -+ if (info->new_cs) -+ dri_bo_unmap(pPriv->bicubic_bo); ++ if (info->ChipFamily < CHIP_FAMILY_R600) { ++ uint8_t *bicubic_addr; ++ int ret; ++ ++ if (info->new_cs) { ++ ret = dri_bo_map(pPriv->bicubic_bo, 1); ++ if (ret) ++ return BadAlloc; ++ ++ bicubic_addr = pPriv->bicubic_bo->virtual; ++ } else ++ bicubic_addr = (uint8_t *)(info->FB + pPriv->bicubic_offset); ++ ++ RADEONCopyData(pScrn, (uint8_t *)bicubic_tex_512, bicubic_addr, 1024, 1024, 1, 512, 2); ++ ++ if (info->new_cs) ++ dri_bo_unmap(pPriv->bicubic_bo); ++ } } /* update cliplist */ -@@ -531,10 +565,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, +@@ -531,10 +567,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, pPriv->w = width; pPriv->h = height; Index: xorg-x11-drv-ati.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- xorg-x11-drv-ati.spec 6 Mar 2009 23:50:06 -0000 1.154 +++ xorg-x11-drv-ati.spec 10 Mar 2009 02:04:50 -0000 1.155 @@ -5,7 +5,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.11.0 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -76,6 +76,9 @@ %{_mandir}/man4/radeon.4* %changelog +* Tue Mar 10 2009 Dave Airlie 6.11.0-6 +- master fixes for panning + enable r600 accel by default + * Sat Mar 07 2009 Dave Airlie 6.11.0-5 - pull in more fixes from master From dchen at fedoraproject.org Tue Mar 10 02:08:09 2009 From: dchen at fedoraproject.org (Ding-Yi Chen) Date: Tue, 10 Mar 2009 02:08:09 +0000 (UTC) Subject: rpms/ibus-chewing/F-10 ibus-chewing.spec, 1.8, 1.9 import.log, 1.4, 1.5 sources, 1.9, 1.10 Message-ID: <20090310020809.8152A70034@cvs1.fedora.phx.redhat.com> Author: dchen Update of /cvs/pkgs/rpms/ibus-chewing/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8135/F-10 Modified Files: ibus-chewing.spec import.log sources Log Message: Fix koji build Index: ibus-chewing.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/ibus-chewing.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ibus-chewing.spec 10 Mar 2009 01:32:37 -0000 1.8 +++ ibus-chewing.spec 10 Mar 2009 02:07:38 -0000 1.9 @@ -2,7 +2,7 @@ %define mod_path ibus-0.1 Name: ibus-chewing Version: 0.1.1.20090129 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Chewing engine for IBus input platform License: GPLv2+ Group: System Environment/Libraries @@ -15,9 +15,8 @@ BuildRequires: libtool BuildRequires: python-devel BuildRequires: libchewing-devel >= 0.3.2-4 -# BuildRequires: swig +BuildRequires: swig BuildRequires: pkgconfig -# BuildArchitectures: noarch Requires: ibus Requires: libchewing >= 0.3.2-4 @@ -55,11 +54,14 @@ %{_datadir}/ibus/engine/chewing.engine %changelog +* Tue Mar 10 2009 Ding-Yi Chen - 0.1.1.20090129-2 +- Fix koji build. + * Tue Mar 10 2009 Ding-Yi Chen - 0.1.1.20090129-1 - Revert F-10 branch to ibus-chewing-0.1.1, as ibus in F-10 is still 0.1.1. -* Wed Jan 28 2009 Ding-Yi Chen - 0.1.1.20090129-1 +* Wed Jan 28 2009 Ding-Yi Chen - 0.1.1.20090127-1 - Fix the binding with libchewing 0.3.2. -* Fri Aug 15 2008 Huang Peng - 0.1.1.20090129-1 +* Fri Aug 15 2008 Huang Peng - 0.1.1.20080823-1 - The first version. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 10 Mar 2009 01:32:38 -0000 1.4 +++ import.log 10 Mar 2009 02:07:39 -0000 1.5 @@ -2,3 +2,4 @@ ibus-chewing-1_0_1_20090227-1_fc10:F-10:ibus-chewing-1.0.1.20090227-1.fc10.src.rpm:1235721693 ibus-chewing-1_0_2_20090302-1_fc10:F-10:ibus-chewing-1.0.2.20090302-1.fc10.src.rpm:1235965759 ibus-chewing-0_1_1_20090129-1_fc10:F-10:ibus-chewing-0.1.1.20090129-1.fc10.src.rpm:1236648721 +ibus-chewing-0_1_1_20090129-2_fc10:F-10:ibus-chewing-0.1.1.20090129-2.fc10.src.rpm:1236650663 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 10 Mar 2009 01:32:38 -0000 1.9 +++ sources 10 Mar 2009 02:07:39 -0000 1.10 @@ -1 +1 @@ -5ad0d2c164c882203f36fe641d5e27f5 ibus-chewing-0.1.1.20090129.tar.gz +bad42a04f8be87a5e0376aa1347a5d08 ibus-chewing-0.1.1.20090129.tar.gz From notting at fedoraproject.org Tue Mar 10 02:10:22 2009 From: notting at fedoraproject.org (Bill Nottingham) Date: Tue, 10 Mar 2009 02:10:22 +0000 (UTC) Subject: rpms/initscripts/devel .cvsignore, 1.159, 1.160 initscripts.spec, 1.187, 1.188 sources, 1.177, 1.178 Message-ID: <20090310021022.D901A70034@cvs1.fedora.phx.redhat.com> Author: notting Update of /cvs/extras/rpms/initscripts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8602 Modified Files: .cvsignore initscripts.spec sources Log Message: 8.90-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- .cvsignore 28 Jan 2009 16:21:03 -0000 1.159 +++ .cvsignore 10 Mar 2009 02:09:51 -0000 1.160 @@ -1 +1 @@ -initscripts-8.89.tar.bz2 +initscripts-8.90.tar.bz2 Index: initscripts.spec =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- initscripts.spec 25 Feb 2009 07:23:49 -0000 1.187 +++ initscripts.spec 10 Mar 2009 02:09:51 -0000 1.188 @@ -2,11 +2,11 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.89 +Version: 8.90 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 2 +Release: 1 URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -250,8 +250,16 @@ /etc/profile.d/debug* %changelog -* Tue Feb 24 2009 Fedora Release Engineering - 8.89-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Mon Mar 9 2009 Bill Nottingham - 8.90-1 +- init.d/functions: cgroup support () +- fix various issues with dmraid handling (#485895, ) +- rc.sysinit: fix typo. (#487926) +- console_init: loadkeys has a -q option for silent running. Use it. +- ifup-tunnel: add compatiblity for openNHRP tunnels (#486559, ) +- ccw_init: don't re-init an existing device, it causes errors. (#484411, ) +- netfs: use same kpartx arguments as rc.sysinit +- don't list mtab in rwtab (#457941) +- translation updates: fi, de, mai * Wed Jan 28 2009 Bill Nottingham - 8.89-1 - use a leading path when sourcing files (#482826) Index: sources =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/sources,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- sources 28 Jan 2009 16:21:03 -0000 1.177 +++ sources 10 Mar 2009 02:09:52 -0000 1.178 @@ -1 +1 @@ -89d41b810122aebbcb96ba0317df7076 initscripts-8.89.tar.bz2 +1610ff0c53a2947774e73ee5ad590fa3 initscripts-8.90.tar.bz2 From jkeating at fedoraproject.org Tue Mar 10 02:12:23 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Tue, 10 Mar 2009 02:12:23 +0000 (UTC) Subject: fedora-release RPM-GPG-KEY-fedora-test-11-primary, NONE, 1.1 fedora-release.spec, 1.71, 1.72 Message-ID: <20090310021224.00E1570034@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9511 Modified Files: fedora-release.spec Added Files: RPM-GPG-KEY-fedora-test-11-primary Log Message: New release for beta --- NEW FILE RPM-GPG-KEY-fedora-test-11-primary --- -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.5 (GNU/Linux) mQINBEl1CHEBEACn5bv6rGJW50UJ59QoI5E27q04g3Gv8bH5/wtk8NjwvgTCtGRd hfXCWvd4OGZjN67m0tsWmJltC7pCv6i3pnaVsVWo1u36+aoZtdP1tqv7CD3QlnLK bx740Oor2YJJvlr7ypFcYPH1+xBZOHXUjPRrqTT6nY6AVm2U/udIVZQHhNG0mc4K IHYZeJM3GFOL1sE+PX8zpcGh4MUKBsVcPNVYpD+HPQyDAgQcL4+uOFR0tnonaiWm vA7A/4kNokHpbwDY7WwEnGZM6KJUGa2rTNXJ+Vij0ng7mWRZ5/0GcM4/mMX6dn9S xghbESiLdip1ZTb60B/ClFZi5PiB12J6DQo2h3+hpxhx0AHJSQRKt+5uw/UyjdmG zHROos8KRvTlTXeKj2SsNvjQKrbyQGT0AXVBcuXLbbDjijaIF8EE4SFXkCyU5Do9 6mEkuEwMcdZ8KQC25gF5jlM0G+nZmcSgZin7b4jRvFEPZ+WbPzB51wijmPuiadWT H2ssiBFSHZG0SljVu6vG5YaTwgyB24+1jb/eTSz/wa/Kh8u1loZnWb/F0K2UnA6M frDnlpdBskgMjBFXnzOqRYqzyQRCBe4T2IbkzUnQYeiqvJAiVsdVG5/TncxCzhfA E9t2gjilRcWGRl8W96M0mHlw2uMkLRDN4BfwmWePlQQ8fGKma+PiO4E9rQARAQAB tC5GZWRvcmEgKDExIFRlc3RpbmcpIDxmZWRvcmFAZmVkb3JhcHJvamVjdC5vcmc+ iQI2BBMBAgAgBQJJdQhxAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQHcXH WNIud/Ja1xAAmnNzBcvepZf7zAlwKrS4iGCI1zFCR3kiUGqeCP/DuMpwRkylis6R NGIJwmSocEn7WcIskgdZZDlU0EDfPF2rRuX3WPkhT4pZNSqyLp0TuNVpMKim8kUu OU9YlCZW8376zCLKOy0YjIJIGsq7S51JURtGtS4d1sb2NwgakFNz0kBStUtzIuFa iz4NxOsFMs2M/7rtZgaLAUzrrlkxPtK12k3JgKiVKp/pLwwkKELtQA3GwVP+s/Gi Pf7nID8UQ1VzvIHbeHueixYmUChk/lUeP6+NjyDOdr0Vl5m5qX52PDO/o2PkVskm UurvyTjE2z3JxGVXWru1hizcr8jpAx/E45LyY/RQh3UEnO9llOxxbPtm3nl2Yp9N Wd5az0jZTZRoenPyNnMQopZaEsH+cINdKwCzM5BC1nDwYKQjNPkUb0NS/tX2rpzs ZYcy0/Lfg4aEmnToiruBym1aB3oDo31d4slKaShv/EAbbeIio/B5jydV65+ucCVD j2twwJH40ooDn0PuJq7KWPC3s+6S92QUV88YA4wypGVAsThiYEIPKkxsy9EWYMhA 5PUNQ2cIPqxT7cg2/mJbHL58IqceW6uKYxFM8pDZnhGW7CX/VXw2MtrUlWKmHkYL +rf8LdjtAakZE5behqfKoGmYn8iPThX81o9OcB9mblC82MNU4KzDAoA= =pXEj -----END PGP PUBLIC KEY BLOCK----- Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- fedora-release.spec 5 Mar 2009 17:55:36 -0000 1.71 +++ fedora-release.spec 10 Mar 2009 02:12:23 -0000 1.72 @@ -3,8 +3,8 @@ Summary: Fedora release files Name: fedora-release -Version: 10.91 -Release: 4 +Version: 10.92 +Release: 1 License: GPLv2 Group: System Environment/Base URL: http://fedoraproject.org @@ -93,6 +93,10 @@ /etc/pki/rpm-gpg/* %changelog +* Mon Mar 09 2009 Jesse Keating - 10.92-1 +- Bump for F11 Beta +- Add the (giant) F11 Test key + * Thu Mar 05 2009 Jesse Keating - 10.91-4 - Drop req on fedora-release-notes (#483018) From jkeating at fedoraproject.org Tue Mar 10 02:20:18 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Tue, 10 Mar 2009 02:20:18 +0000 (UTC) Subject: rpms/fedora-release/devel .cvsignore, 1.36, 1.37 fedora-release.spec, 1.73, 1.74 sources, 1.60, 1.61 Message-ID: <20090310022018.6971570034@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/fedora-release/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11808 Modified Files: .cvsignore fedora-release.spec sources Log Message: * Mon Mar 09 2009 Jesse Keating - 10.92-1 - Bump for F11 Beta - Add the (giant) F11 Test key Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 21 Jan 2009 23:49:57 -0000 1.36 +++ .cvsignore 10 Mar 2009 02:19:47 -0000 1.37 @@ -1 +1 @@ -fedora-release-10.91.tar.gz +fedora-release-10.92.tar.gz Index: fedora-release.spec =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release/devel/fedora-release.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- fedora-release.spec 5 Mar 2009 17:57:12 -0000 1.73 +++ fedora-release.spec 10 Mar 2009 02:19:47 -0000 1.74 @@ -3,8 +3,8 @@ Summary: Fedora release files Name: fedora-release -Version: 10.91 -Release: 4 +Version: 10.92 +Release: 1 License: GPLv2 Group: System Environment/Base URL: http://fedoraproject.org @@ -93,6 +93,10 @@ /etc/pki/rpm-gpg/* %changelog +* Mon Mar 09 2009 Jesse Keating - 10.92-1 +- Bump for F11 Beta +- Add the (giant) F11 Test key + * Thu Mar 05 2009 Jesse Keating - 10.91-4 - Drop req on fedora-release-notes (#483018) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release/devel/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- sources 5 Mar 2009 17:57:12 -0000 1.60 +++ sources 10 Mar 2009 02:19:47 -0000 1.61 @@ -1 +1 @@ -57da332eedd24e0fc8dc325aa54e440c fedora-release-10.91.tar.gz +12ae96929f02c104e0c0ea48a5e71434 fedora-release-10.92.tar.gz From pkgdb at fedoraproject.org Tue Mar 10 02:27:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 02:27:54 +0000 Subject: [pkgdb] leonidas-backgrounds was added for mso Message-ID: <20090310022814.EDBB5208543@bastion.fedora.phx.redhat.com> kevin has added Package leonidas-backgrounds with summary Leonidas desktop backgrounds kevin has approved Package leonidas-backgrounds kevin has added a Fedora devel branch for leonidas-backgrounds with an owner of mso kevin has approved leonidas-backgrounds in Fedora devel kevin has approved Package leonidas-backgrounds kevin has set commit to Approved for provenpackager on leonidas-backgrounds (Fedora devel) kevin has set build to Approved for provenpackager on leonidas-backgrounds (Fedora devel) kevin has set checkout to Approved for provenpackager on leonidas-backgrounds (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-backgrounds From kevin at fedoraproject.org Tue Mar 10 02:27:46 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 10 Mar 2009 02:27:46 +0000 (UTC) Subject: rpms/leonidas-backgrounds - New directory Message-ID: <20090310022746.5CB4570034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/leonidas-backgrounds In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT14768/rpms/leonidas-backgrounds Log Message: Directory /cvs/pkgs/rpms/leonidas-backgrounds added to the repository From kevin at fedoraproject.org Tue Mar 10 02:27:46 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 10 Mar 2009 02:27:46 +0000 (UTC) Subject: rpms/leonidas-backgrounds/devel - New directory Message-ID: <20090310022746.A986270118@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/leonidas-backgrounds/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT14768/rpms/leonidas-backgrounds/devel Log Message: Directory /cvs/pkgs/rpms/leonidas-backgrounds/devel added to the repository From kevin at fedoraproject.org Tue Mar 10 02:28:08 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 10 Mar 2009 02:28:08 +0000 (UTC) Subject: rpms/leonidas-backgrounds Makefile,NONE,1.1 Message-ID: <20090310022808.AF9DD70034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/leonidas-backgrounds In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT14768/rpms/leonidas-backgrounds Added Files: Makefile Log Message: Setup of module leonidas-backgrounds --- NEW FILE Makefile --- # Top level Makefile for module leonidas-backgrounds all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 10 02:28:09 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 10 Mar 2009 02:28:09 +0000 (UTC) Subject: rpms/leonidas-backgrounds/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090310022809.46FE270034@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/leonidas-backgrounds/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT14768/rpms/leonidas-backgrounds/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module leonidas-backgrounds --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: leonidas-backgrounds # $Id: Makefile,v 1.1 2009/03/10 02:28:09 kevin Exp $ NAME := leonidas-backgrounds SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From crobinso at fedoraproject.org Tue Mar 10 02:29:08 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Tue, 10 Mar 2009 02:29:08 +0000 (UTC) Subject: rpms/libvirt/devel libvirt.spec,1.117,1.118 Message-ID: <20090310022908.C3B5C70034@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15023 Modified Files: libvirt.spec Log Message: Add Requires: libselinux Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- libvirt.spec 6 Mar 2009 13:31:38 -0000 1.117 +++ libvirt.spec 10 Mar 2009 02:28:38 -0000 1.118 @@ -47,7 +47,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.1 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -97,6 +97,8 @@ Requires: iscsi-initiator-utils # For disk driver Requires: parted +# For svirt support +Requires: libselinux %if %{with_xen} BuildRequires: xen-devel %endif @@ -478,6 +480,9 @@ %endif %changelog +* Mon Mar 9 2009 Cole Robinson - 0.6.1-3.fc11 +- Add Requires: libselinux + * Fri Mar 6 2009 Daniel P. Berrange - 0.6.1-2.fc11 - Fix crash after storage vol deletion fails - Add patch to enable VNC SASL authentication From deji at fedoraproject.org Tue Mar 10 02:47:01 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Tue, 10 Mar 2009 02:47:01 +0000 (UTC) Subject: rpms/mpich2/devel mpich2.spec,1.1,1.2 Message-ID: <20090310024701.78AAF70034@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/mpich2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19671 Modified Files: mpich2.spec Log Message: * Mon Mar 09 2009 Deji Akingunola - 1.0.8-3 - Drop the ssm channel from ppc* archs, it fails to build - Python scripts in bindir and sbindir are no longer bytecompiled (F-11+) - Enhance the spec file to support ia64 and sparc - Include mpiexec and mpirun (symlinks) in the environment module bindir Index: mpich2.spec =================================================================== RCS file: /cvs/pkgs/rpms/mpich2/devel/mpich2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mpich2.spec 9 Mar 2009 12:48:04 -0000 1.1 +++ mpich2.spec 10 Mar 2009 02:46:30 -0000 1.2 @@ -1,7 +1,7 @@ Summary: An implementation of MPI Name: mpich2 Version: 1.0.8 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Group: Development/Libraries URL: http://www.mcs.anl.gov/research/projects/mpich2 @@ -61,18 +61,20 @@ %{!?opt_cc_cflags: %define opt_cc_cflags %{optflags}} %{!?opt_fc_fflags: %define opt_fc_fflags %{optflags}} +%define selected_channels ch3:dllchan:sock,shm,ssm %ifarch %{ix86} x86_64 %define selected_channels ch3:nemesis -%else -%define selected_channels ch3:dllchan:sock,shm,ssm +%endif +%ifarch ppc ppc64 +%define selected_channels ch3:dllchan:sock,shm %endif -%ifarch %{ix86} ppc -%define mode 32 -%define priority 40 -%else +%ifarch x86_64 ia64 ppc64 s390x sparc64 %define mode 64 %define priority 41 +%else +%define mode 32 +%define priority 40 %endif %ifarch x86_64 @@ -115,12 +117,19 @@ pushd %{buildroot}%{_bindir}/ ln -s mpiexec.py mpdrun popd -mkdir -p %{buildroot}%{_datadir}/%{name}/bin%{mode} for b in mpicxx mpicc mpif77 mpif90; do mv %{buildroot}%{_bindir}/$b %{buildroot}%{_bindir}/mp%{mode}-$b; mv %{buildroot}%{_mandir}/man1/$b.1 %{buildroot}%{_mandir}/man1/mp-$b.1; +done + +## Setup the executables for environment module +mkdir -p %{buildroot}%{_datadir}/%{name}/bin%{mode} +for b in mpicxx mpicc mpif77 mpif90; do ln -s ../../../bin/mp%{mode}-$b %{buildroot}%{_datadir}/%{name}/bin%{mode}/$b done +for ex in mpiexec mpirun; do + ln -s ../../../bin/mpiexec.py %{buildroot}%{_datadir}/%{name}/bin%{mode}/$ex +done mv %{buildroot}%{_libdir}/%{name}/pkgconfig %{buildroot}%{_libdir}/ chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc @@ -184,14 +193,19 @@ %files %defattr(-,root,root,-) %{_bindir}/* -%exclude %{_bindir}/mp*.pyc -%exclude %{_bindir}/mp*.pyo +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/bin%{mode}/mpiexec +%{_datadir}/%{name}/bin%{mode}/mpirun %exclude %{_bindir}/mp%{mode}-mpicc %exclude %{_bindir}/mp%{mode}-mpicxx %exclude %{_bindir}/mp%{mode}-mpif90 %exclude %{_bindir}/mp%{mode}-mpif77 %doc %{_docdir}/%{name}-%{version}/ %{_mandir}/man1/* +%if 0%{?fedora} < 11 +%exclude %{_bindir}/mp*.pyc +%exclude %{_bindir}/mp*.pyo +%endif %files libs %defattr(-,root,root,-) @@ -212,17 +226,25 @@ %{_libdir}/%{name}/*.so %{_libdir}/%{name}/trace_rlog/libTraceInput.so %{_libdir}/pkgconfig/%{name}-ch3.pc -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/bin%{mode}/ %{_datadir}/%{name}/%{name}.module +%{_datadir}/%{name}/bin%{mode}/mpicc +%{_datadir}/%{name}/bin%{mode}/mpicxx +%{_datadir}/%{name}/bin%{mode}/mpif90 +%{_datadir}/%{name}/bin%{mode}/mpif77 %{_datadir}/%{name}/examples* %{_datadir}/%{name}/logfiles/ %{_mandir}/man4/*.gz %doc README.testing README.romio README.developer %changelog +* Mon Mar 09 2009 Deji Akingunola - 1.0.8-3 +- Drop the ssm channel from ppc* archs, it fails to build +- Python scripts in bindir and sbindir are no longer bytecompiled (F-11+) +- Enhance the spec file to support ia64 and sparc +- Include mpiexec and mpirun (symlinks) in the environment module bindir + * Fri Mar 06 2009 Deji Akingunola - 1.0.8-2 -- Fix the source url, pointed out from package review +- Fix the source url, pointed out from package review - Finally accepted to go into Fedora * Sat Oct 24 2008 Deji Akingunola - 1.0.8-1 From mtasaka at fedoraproject.org Tue Mar 10 03:05:57 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Tue, 10 Mar 2009 03:05:57 +0000 (UTC) Subject: rpms/evolution-brutus/devel evolution-brutus.spec,1.22,1.23 Message-ID: <20090310030557.23E6070034@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/evolution-brutus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24725 Modified Files: evolution-brutus.spec Log Message: * Tue Mar 10 2009 Mamoru Tasaka - 1.2.35-2 - Workaround to build with latest ImageMagick 6.4.9.6 Index: evolution-brutus.spec =================================================================== RCS file: /cvs/extras/rpms/evolution-brutus/devel/evolution-brutus.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- evolution-brutus.spec 9 Mar 2009 10:41:55 -0000 1.22 +++ evolution-brutus.spec 10 Mar 2009 03:05:26 -0000 1.23 @@ -5,7 +5,7 @@ Name: evolution-brutus Version: 1.2.35 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Brutus based Exchange connector for Novell Evolution 2.4 and later License: GPLv2+ @@ -66,6 +66,8 @@ %prep %setup -q +# Workaround to build with ImageMagick 6.4.9.6-1.fc11 +sed -i.undef -e 's|-Wundef||' configure %build %configure \ @@ -119,6 +121,9 @@ %changelog +* Tue Mar 10 2009 Mamoru Tasaka - 1.2.35-2 +- Workaround to build with latest ImageMagick 6.4.9.6 + * Mon Mar 9 2009 Alex Lancaster - 1.2.35-1 - Update to upstream 1.2.35 to fix GCC 4.4 build From jkeating at fedoraproject.org Tue Mar 10 03:16:59 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Tue, 10 Mar 2009 03:16:59 +0000 (UTC) Subject: rpms/trac/devel trac.spec,1.26,1.27 Message-ID: <20090310031659.C96F170034@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/trac/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27241 Modified Files: trac.spec Log Message: * Mon Mar 09 2009 Jesse Keating - 0.11.3-3 - Obsolete trac-webadmin, its now built in Index: trac.spec =================================================================== RCS file: /cvs/pkgs/rpms/trac/devel/trac.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- trac.spec 25 Feb 2009 21:31:09 -0000 1.26 +++ trac.spec 10 Mar 2009 03:16:29 -0000 1.27 @@ -2,7 +2,7 @@ Name: trac Version: 0.11.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Enhanced wiki and issue tracking system Group: Applications/Internet License: BSD @@ -21,6 +21,8 @@ Requires: httpd Requires: python-sqlite Requires: python-pygments +Provides: trac-webadmin = trac-webadmin-0.1.2-0.7.dev_r4429.fc11 +Obsoletes: trac-webadmin < trac-webadmin-0.1.2-0.6 %description Trac is an integrated system for managing software projects, an @@ -78,6 +80,9 @@ %{_var}/www/cgi-bin/trac.fcgi %changelog +* Mon Mar 09 2009 Jesse Keating - 0.11.3-3 +- Obsolete trac-webadmin, its now built in + * Wed Feb 25 2009 Fedora Release Engineering - 0.11.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jkeating at fedoraproject.org Tue Mar 10 03:19:47 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Tue, 10 Mar 2009 03:19:47 +0000 (UTC) Subject: rpms/trac-webadmin/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE sources, 1.2, NONE trac-webadmin.spec, 1.5, NONE Message-ID: <20090310031947.82AB070034@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/trac-webadmin/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28081 Added Files: dead.package Removed Files: Makefile sources trac-webadmin.spec Log Message: This package is built into trac-0.11, so making it dead in devel/ --- NEW FILE dead.package --- Built into trac-0.11 --- Makefile DELETED --- --- sources DELETED --- --- trac-webadmin.spec DELETED --- From dcbw at fedoraproject.org Tue Mar 10 03:31:12 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Tue, 10 Mar 2009 03:31:12 +0000 (UTC) Subject: rpms/NetworkManager/F-10 missing-onboot-equals-yes.patch, NONE, 1.1 NetworkManager.spec, 1.260, 1.261 Message-ID: <20090310033112.8541970034@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31547 Modified Files: NetworkManager.spec Added Files: missing-onboot-equals-yes.patch Log Message: * Mon Mar 9 2009 Dan Williams - 1:0.7.0.99-3 - Missing ONBOOT should actually mean ONBOOT=yes (rh #489422) missing-onboot-equals-yes.patch: --- NEW FILE missing-onboot-equals-yes.patch --- diff -up NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c.ignore-minimal NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c --- NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c.ignore-minimal 2009-03-09 23:02:38.000000000 -0400 +++ NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c 2009-03-09 23:22:57.000000000 -0400 @@ -132,9 +132,9 @@ make_connection_setting (const char *fil NULL); g_free (uuid); - /* Be somewhat conservative about autoconnect */ + /* Missing ONBOOT is treated as "ONBOOT=true" by the old network service */ g_object_set (s_con, NM_SETTING_CONNECTION_AUTOCONNECT, - svTrueValue (ifcfg, "ONBOOT", FALSE), + svTrueValue (ifcfg, "ONBOOT", TRUE), NULL); value = svGetValue (ifcfg, "LAST_CONNECT", FALSE); Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager.spec,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- NetworkManager.spec 9 Mar 2009 19:20:53 -0000 1.260 +++ NetworkManager.spec 10 Mar 2009 03:31:11 -0000 1.261 @@ -18,7 +18,7 @@ Summary: Network connection manager and user applications Epoch: 1 Version: 0.7.0.99 -Release: 2%{snapshot}%{?dist} +Release: 3%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -30,6 +30,7 @@ Patch2: explain-dns1-dns2.patch Patch3: NetworkManager-0.7.1-localhost-localdomain.patch Patch4: NetworkManager-0.7.0.99-fix-hal-resync.patch +Patch5: missing-onboot-equals-yes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig @@ -149,6 +150,7 @@ %patch2 -p1 -b .explain-dns1-dns2 %patch3 -p1 -b .keep-localhost-localdomain %patch4 -p1 -b .fix-hal-resync +%patch5 -p1 -b .missing-onboot %build @@ -329,6 +331,9 @@ %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Mon Mar 9 2009 Dan Williams - 1:0.7.0.99-3 +- Missing ONBOOT should actually mean ONBOOT=yes (rh #489422) + * Mon Mar 9 2009 Dan Williams - 1:0.7.0.99-2 - Fix conflict with NetworkManager-openconnect (rh #489271) - Fix possible crash when resynchronizing devices if HAL restarts From dcbw at fedoraproject.org Tue Mar 10 03:32:07 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Tue, 10 Mar 2009 03:32:07 +0000 (UTC) Subject: rpms/NetworkManager/devel missing-onboot-equals-yes.patch, NONE, 1.1 NetworkManager.spec, 1.263, 1.264 Message-ID: <20090310033207.8FF4270034@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31826 Modified Files: NetworkManager.spec Added Files: missing-onboot-equals-yes.patch Log Message: * Mon Mar 9 2009 Dan Williams - 1:0.7.0.99-3 - Missing ONBOOT should actually mean ONBOOT=yes (rh #489422) missing-onboot-equals-yes.patch: --- NEW FILE missing-onboot-equals-yes.patch --- diff -up NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c.ignore-minimal NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c --- NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c.ignore-minimal 2009-03-09 23:02:38.000000000 -0400 +++ NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c 2009-03-09 23:22:57.000000000 -0400 @@ -132,9 +132,9 @@ make_connection_setting (const char *fil NULL); g_free (uuid); - /* Be somewhat conservative about autoconnect */ + /* Missing ONBOOT is treated as "ONBOOT=true" by the old network service */ g_object_set (s_con, NM_SETTING_CONNECTION_AUTOCONNECT, - svTrueValue (ifcfg, "ONBOOT", FALSE), + svTrueValue (ifcfg, "ONBOOT", TRUE), NULL); value = svGetValue (ifcfg, "LAST_CONNECT", FALSE); Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- NetworkManager.spec 9 Mar 2009 19:18:08 -0000 1.263 +++ NetworkManager.spec 10 Mar 2009 03:31:36 -0000 1.264 @@ -18,7 +18,7 @@ Summary: Network connection manager and user applications Epoch: 1 Version: 0.7.0.99 -Release: 2%{snapshot}%{?dist} +Release: 3%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -29,6 +29,7 @@ Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch Patch4: NetworkManager-0.7.0.99-fix-hal-resync.patch +Patch5: missing-onboot-equals-yes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig @@ -147,6 +148,7 @@ %patch1 -p1 -b .buildfix %patch2 -p1 -b .explain-dns1-dns2 %patch4 -p1 -b .fix-hal-resync +%patch5 -p1 -b .missing-onboot %build @@ -327,6 +329,9 @@ %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Mon Mar 9 2009 Dan Williams - 1:0.7.0.99-3 +- Missing ONBOOT should actually mean ONBOOT=yes (rh #489422) + * Mon Mar 9 2009 Dan Williams - 1:0.7.0.99-2 - Fix conflict with NetworkManager-openconnect (rh #489271) - Fix possible crash when resynchronizing devices if HAL restarts From dcbw at fedoraproject.org Tue Mar 10 03:34:04 2009 From: dcbw at fedoraproject.org (Daniel Williams) Date: Tue, 10 Mar 2009 03:34:04 +0000 (UTC) Subject: rpms/NetworkManager/F-9 missing-onboot-equals-yes.patch, NONE, 1.1 NetworkManager.spec, 1.254, 1.255 Message-ID: <20090310033404.9573470034@cvs1.fedora.phx.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/NetworkManager/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32381 Modified Files: NetworkManager.spec Added Files: missing-onboot-equals-yes.patch Log Message: * Mon Mar 9 2009 Dan Williams - 1:0.7.0.99-3 - Missing ONBOOT should actually mean ONBOOT=yes (rh #489422) missing-onboot-equals-yes.patch: --- NEW FILE missing-onboot-equals-yes.patch --- diff -up NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c.ignore-minimal NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c --- NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c.ignore-minimal 2009-03-09 23:02:38.000000000 -0400 +++ NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c 2009-03-09 23:22:57.000000000 -0400 @@ -132,9 +132,9 @@ make_connection_setting (const char *fil NULL); g_free (uuid); - /* Be somewhat conservative about autoconnect */ + /* Missing ONBOOT is treated as "ONBOOT=true" by the old network service */ g_object_set (s_con, NM_SETTING_CONNECTION_AUTOCONNECT, - svTrueValue (ifcfg, "ONBOOT", FALSE), + svTrueValue (ifcfg, "ONBOOT", TRUE), NULL); value = svGetValue (ifcfg, "LAST_CONNECT", FALSE); Index: NetworkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v retrieving revision 1.254 retrieving revision 1.255 diff -u -r1.254 -r1.255 --- NetworkManager.spec 9 Mar 2009 19:23:16 -0000 1.254 +++ NetworkManager.spec 10 Mar 2009 03:33:33 -0000 1.255 @@ -18,7 +18,7 @@ Summary: Network connection manager and user applications Epoch: 1 Version: 0.7.0.99 -Release: 2%{snapshot}%{?dist} +Release: 3%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -30,6 +30,7 @@ Patch2: explain-dns1-dns2.patch Patch3: NetworkManager-0.7.1-localhost-localdomain.patch Patch4: NetworkManager-0.7.0.99-fix-hal-resync.patch +Patch5: missing-onboot-equals-yes.patch Patch10: old-dbus-glib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,7 +52,7 @@ Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1 Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1 Conflicts: NetworkManager-pptp < 1:0.7.0.99-1 -Conflicts: NetworkManager-openconnect < 1:0.7.0.99-1 +Conflicts: NetworkManager-openconnect < 0:0.7.0.99-1 BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -152,6 +153,7 @@ %patch2 -p1 -b .explain-dns1-dns2 %patch3 -p1 -b .keep-localhost-localdomain %patch4 -p1 -b .fix-hal-resync +%patch5 -p1 -b .missing-onboot %patch10 -p1 -b .old-dbus-glib %build @@ -336,6 +338,9 @@ %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Mon Mar 9 2009 Dan Williams - 1:0.7.0.99-3 +- Missing ONBOOT should actually mean ONBOOT=yes (rh #489422) + * Mon Mar 9 2009 Dan Williams - 1:0.7.0.99-2 - Fix conflict with NetworkManager-openconnect (rh #489271) - Fix possible crash when resynchronizing devices if HAL restarts From petersen at fedoraproject.org Tue Mar 10 03:41:29 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Tue, 10 Mar 2009 03:41:29 +0000 (UTC) Subject: rpms/ghc-gtk2hs/devel ghc-gtk2hs.spec,1.16,1.17 Message-ID: <20090310034129.D552870034@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/ghc-gtk2hs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1850 Modified Files: ghc-gtk2hs.spec Log Message: add prof subpackages Index: ghc-gtk2hs.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/ghc-gtk2hs.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ghc-gtk2hs.spec 9 Mar 2009 06:59:30 -0000 1.16 +++ ghc-gtk2hs.spec 10 Mar 2009 03:40:59 -0000 1.17 @@ -148,6 +148,19 @@ \ This package contains a Haskell binding of the %1 library.\ \ +%if %{with prof}\ +%package -n ghc-%1-prof\ +Summary: Haskell %1 profiling library\ +Group: Development/Libraries\ +Requires: ghc-prof = %{ghc_version}\ +Requires: ghc-%1-devel = %{version}-%{release}\ +\ +%description -n ghc-%1-prof\ +%common_descr\ +\ +This package contains the profiling libraries for the Haskell %1 library.\ +%endif\ +\ %post -n ghc-%1-devel\ ghc-pkg-%{ghc_version} update %{pkg_libdir}/%1.package.conf &>/dev/null || : \ \ @@ -157,12 +170,18 @@ fi\ \ %files -n ghc-%1-devel\ +%defattr(-,root,root,-)\ %{pkg_libdir}/%1.cabal\ %{pkg_libdir}/%1.package.conf\ %{pkg_libdir}/libHS%1.a\ %{pkg_libdir}/HS%1.o\ -%{pkg_libdir}/imports/%1 - +%{pkg_libdir}/imports/%1\ +\ +%if %{with prof}\ +%files -n ghc-%1-prof\ +%defattr(-,root,root,-)\ +%{pkg_libdir}/libHS%{1}_p.a\ +%endif %subpackage cairo cairo glib %subpackage gconf GConf2 glib @@ -278,6 +297,7 @@ - use global - update arch list - rename library subpackages to devel and obsolete old packages +- add prof subpackages * Tue Feb 24 2009 Fedora Release Engineering - 0.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From bskeggs at fedoraproject.org Tue Mar 10 03:48:35 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Tue, 10 Mar 2009 03:48:35 +0000 (UTC) Subject: rpms/kernel/devel drm-nouveau.patch, 1.20, 1.21 kernel.spec, 1.1401, 1.1402 Message-ID: <20090310034835.569D670034@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3849 Modified Files: drm-nouveau.patch kernel.spec Log Message: * Tue Mar 10 2009 Ben Skeggs - drm-nouveau.patch: fix kms issues seen while testing original 8800gtx drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- drm-nouveau.patch 9 Mar 2009 21:03:29 -0000 1.20 +++ drm-nouveau.patch 10 Mar 2009 03:48:32 -0000 1.21 @@ -17684,10 +17684,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c new file mode 100644 -index 0000000..340e772 +index 0000000..fa7376c --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c -@@ -0,0 +1,775 @@ +@@ -0,0 +1,756 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -17785,33 +17785,29 @@ + DRM_DEBUG("%s\n", blanked ? "blanked" : "unblanked"); + + if (blanked) { -+ crtc->cursor->hide(crtc); ++ crtc->cursor->hide(crtc, false); + + OUT_MODE(NV50_CRTC0_CLUT_MODE + offset, + NV50_CRTC0_CLUT_MODE_BLANK); + if (dev_priv->chipset != 0x50) -+ OUT_MODE(NV84_CRTC0_BLANK_UNK1 + offset, -+ NV84_CRTC0_BLANK_UNK1_BLANK); ++ OUT_MODE(NV84_CRTC0_CLUT_DMA + offset, ++ NV84_CRTC0_CLUT_DMA_DISABLE); ++ + OUT_MODE(NV50_CRTC0_BLANK_CTRL + offset, + NV50_CRTC0_BLANK_CTRL_BLANK); -+ if (dev_priv->chipset != 0x50) -+ OUT_MODE(NV84_CRTC0_BLANK_UNK2 + offset, -+ NV84_CRTC0_BLANK_UNK2_BLANK); + } else { + crtc->cursor->set_offset(crtc); -+ -+ if (dev_priv->chipset != 0x50) -+ OUT_MODE(NV84_CRTC0_BLANK_UNK2 + offset, -+ NV84_CRTC0_BLANK_UNK2_UNBLANK); -+ + if (crtc->cursor->visible) -+ crtc->cursor->show(crtc); ++ crtc->cursor->show(crtc, false); + else -+ crtc->cursor->hide(crtc); ++ crtc->cursor->hide(crtc, false); + ++ OUT_MODE(NV50_CRTC0_CLUT_MODE + offset, crtc->lut.depth == 8 ? ++ NV50_CRTC0_CLUT_MODE_OFF : NV50_CRTC0_CLUT_MODE_ON); + if (dev_priv->chipset != 0x50) -+ OUT_MODE(NV84_CRTC0_BLANK_UNK1 + offset, -+ NV84_CRTC0_BLANK_UNK1_UNBLANK); ++ OUT_MODE(NV84_CRTC0_CLUT_DMA + offset, ++ NV84_CRTC0_CLUT_DMA_LOCAL); ++ + OUT_MODE(NV50_CRTC0_BLANK_CTRL + offset, + NV50_CRTC0_BLANK_CTRL_UNBLANK); + } @@ -18134,13 +18130,12 @@ + + crtc->cursor->set_bo(crtc, gem); + crtc->cursor->set_offset(crtc); -+ ret = crtc->cursor->show(crtc); ++ ret = crtc->cursor->show(crtc, true); + } else { + crtc->cursor->set_bo(crtc, NULL); -+ crtc->cursor->hide(crtc); ++ crtc->cursor->hide(crtc, true); + } + -+ OUT_MODE(NV50_UPDATE_DISPLAY, 0); + return ret; +} + @@ -18225,13 +18220,42 @@ +} + +static int -+nv50_crtc_execute_mode(struct nouveau_crtc *crtc, struct drm_display_mode *mode) ++nv50_crtc_mode_set(struct drm_crtc *drm_crtc, struct drm_display_mode *mode, ++ struct drm_display_mode *adjusted_mode, int x, int y, ++ struct drm_framebuffer *old_fb) +{ -+ struct drm_device *dev = crtc->base.dev; ++ struct drm_device *dev = drm_crtc->dev; ++ struct nouveau_crtc *crtc = to_nouveau_crtc(drm_crtc); ++ struct drm_encoder *drm_encoder; ++ struct nouveau_encoder *encoder; ++ struct drm_crtc_helper_funcs *crtc_helper = drm_crtc->helper_private; ++ struct nouveau_connector *connector = NULL; + uint32_t hsync_dur, vsync_dur, hsync_start_to_end, vsync_start_to_end; + uint32_t hunk1, vunk1, vunk2a, vunk2b; + uint32_t offset = crtc->index * 0x400; + ++ /* Find the connector attached to this CRTC */ ++ list_for_each_entry(drm_encoder, &dev->mode_config.encoder_list, head) { ++ struct drm_connector *drm_connector; ++ ++ encoder = to_nouveau_encoder(drm_encoder); ++ if (drm_encoder->crtc != &crtc->base) ++ continue; ++ ++ list_for_each_entry(drm_connector, &dev->mode_config.connector_list, head) { ++ connector = to_nouveau_connector(drm_connector); ++ if (drm_connector->encoder != drm_encoder) ++ continue; ++ ++ break; ++ } ++ ++ break; /* no use in finding more than one mode */ ++ } ++ ++ *crtc->mode = *adjusted_mode; ++ crtc->use_dithering = connector->use_dithering; ++ + DRM_DEBUG("index %d\n", crtc->index); + + hsync_dur = mode->hsync_end - mode->hsync_start; @@ -18286,46 +18310,6 @@ + OUT_MODE(NV50_CRTC0_SCALE_CENTER_OFFSET + offset, + NV50_CRTC_SCALE_CENTER_OFFSET_VAL(0,0)); + -+ nv50_crtc_blank(crtc, false); -+ return 0; -+} -+ -+ -+static int -+nv50_crtc_mode_set(struct drm_crtc *drm_crtc, struct drm_display_mode *mode, -+ struct drm_display_mode *adjusted_mode, int x, int y, -+ struct drm_framebuffer *old_fb) -+{ -+ struct drm_device *dev = drm_crtc->dev; -+ struct nouveau_crtc *crtc = to_nouveau_crtc(drm_crtc); -+ struct drm_encoder *drm_encoder; -+ struct nouveau_encoder *encoder; -+ struct drm_crtc_helper_funcs *crtc_helper = drm_crtc->helper_private; -+ struct nouveau_connector *connector = NULL; -+ -+ /* Find the connector attached to this CRTC */ -+ list_for_each_entry(drm_encoder, &dev->mode_config.encoder_list, head) { -+ struct drm_connector *drm_connector; -+ -+ encoder = to_nouveau_encoder(drm_encoder); -+ if (drm_encoder->crtc != &crtc->base) -+ continue; -+ -+ list_for_each_entry(drm_connector, &dev->mode_config.connector_list, head) { -+ connector = to_nouveau_connector(drm_connector); -+ if (drm_connector->encoder != drm_encoder) -+ continue; -+ -+ break; -+ } -+ -+ break; /* no use in finding more than one mode */ -+ } -+ -+ *crtc->mode = *adjusted_mode; -+ crtc->use_dithering = connector->use_dithering; -+ -+ nv50_crtc_execute_mode(crtc, adjusted_mode); + crtc->set_scale(crtc, connector->scaling_mode, false); + crtc_helper->mode_set_base(drm_crtc, x, y, old_fb); + @@ -18377,12 +18361,9 @@ + crtc->lut.depth = fb->base.depth; + nv50_crtc_lut_load(crtc); + } -+ -+ OUT_MODE(NV50_CRTC0_CLUT_MODE + offset, fb->base.depth == 8 ? -+ NV50_CRTC0_CLUT_MODE_OFF : NV50_CRTC0_CLUT_MODE_ON); + OUT_MODE(NV50_CRTC0_CLUT_OFFSET + offset, crtc->lut.mem->start >> 8); + -+ OUT_MODE(NV50_UPDATE_DISPLAY, 0); ++ nv50_crtc_blank(crtc, false); + return 0; +} + @@ -18465,10 +18446,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_cursor.c b/drivers/gpu/drm/nouveau/nv50_cursor.c new file mode 100644 -index 0000000..fca5b4a +index 0000000..5a3cedc --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_cursor.c -@@ -0,0 +1,201 @@ +@@ -0,0 +1,217 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -18555,8 +18536,9 @@ +} + +/* Calling update or changing the stored cursor state is left to the higher level ioctl's. */ -+static int nv50_cursor_show(struct nouveau_crtc *crtc) ++static int nv50_cursor_show(struct nouveau_crtc *crtc, bool update) +{ ++ struct drm_nouveau_private *dev_priv = crtc->base.dev->dev_private; + struct drm_device *dev = crtc->base.dev; + uint32_t offset = crtc->index * 0x400; + @@ -18570,21 +18552,36 @@ + } + + OUT_MODE(NV50_CRTC0_CURSOR_CTRL + offset, NV50_CRTC0_CURSOR_CTRL_SHOW); ++ if (dev_priv->chipset != 0x50) ++ OUT_MODE(NV84_CRTC0_CURSOR_DMA + offset, ++ NV84_CRTC0_CURSOR_DMA_LOCAL); ++ ++ if (update) { ++ OUT_MODE(NV50_UPDATE_DISPLAY, 0); ++ crtc->cursor->visible = true; ++ } + -+ crtc->cursor->visible = true; + return 0; +} + -+static int nv50_cursor_hide(struct nouveau_crtc *crtc) ++static int nv50_cursor_hide(struct nouveau_crtc *crtc, bool update) +{ ++ struct drm_nouveau_private *dev_priv = crtc->base.dev->dev_private; + struct drm_device *dev = crtc->base.dev; + uint32_t offset = crtc->index * 0x400; + + DRM_DEBUG("\n"); + + OUT_MODE(NV50_CRTC0_CURSOR_CTRL + offset, NV50_CRTC0_CURSOR_CTRL_HIDE); ++ if (dev_priv->chipset != 0x50) ++ OUT_MODE(NV84_CRTC0_CURSOR_DMA + offset, ++ NV84_CRTC0_CURSOR_DMA_DISABLE); ++ ++ if (update) { ++ OUT_MODE(NV50_UPDATE_DISPLAY, 0); ++ crtc->cursor->visible = false; ++ } + -+ crtc->cursor->visible = false; + return 0; +} + @@ -18672,7 +18669,7 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_cursor.h b/drivers/gpu/drm/nouveau/nv50_cursor.h new file mode 100644 -index 0000000..9be1591 +index 0000000..089a69c --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_cursor.h @@ -0,0 +1,45 @@ @@ -18710,8 +18707,8 @@ + int x, y; + bool visible; + -+ int (*show) (struct nouveau_crtc *crtc); -+ int (*hide) (struct nouveau_crtc *crtc); ++ int (*show) (struct nouveau_crtc *crtc, bool update); ++ int (*hide) (struct nouveau_crtc *crtc, bool update); + int (*set_pos) (struct nouveau_crtc *crtc, int x, int y); + int (*set_offset) (struct nouveau_crtc *crtc); + int (*set_bo) (struct nouveau_crtc *crtc, struct drm_gem_object *gem); @@ -19505,10 +19502,10 @@ +#endif /* __NV50_DISPLAY_H__ */ diff --git a/drivers/gpu/drm/nouveau/nv50_display_commands.h b/drivers/gpu/drm/nouveau/nv50_display_commands.h new file mode 100644 -index 0000000..97b3d3c +index 0000000..4fd10c9 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_display_commands.h -@@ -0,0 +1,196 @@ +@@ -0,0 +1,195 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -19586,10 +19583,9 @@ + #define NV50_CRTC0_CLUT_MODE_ON 0xC0000000 +#define NV50_CRTC0_CLUT_OFFSET 0x844 + -+/* Anyone know what part of the chip is triggered here precisely? */ -+#define NV84_CRTC0_BLANK_UNK1 0x85C -+ #define NV84_CRTC0_BLANK_UNK1_BLANK 0x0 -+ #define NV84_CRTC0_BLANK_UNK1_UNBLANK 0x1 ++#define NV84_CRTC0_CLUT_DMA 0x85C ++ #define NV84_CRTC0_CLUT_DMA_DISABLE 0x0 ++ #define NV84_CRTC0_CLUT_DMA_LOCAL 0x1 + +#define NV50_CRTC0_FB_OFFSET 0x860 + @@ -19616,9 +19612,9 @@ +#define NV50_CRTC0_CURSOR_OFFSET 0x884 + +/* Anyone know what part of the chip is triggered here precisely? */ -+#define NV84_CRTC0_BLANK_UNK2 0x89C -+ #define NV84_CRTC0_BLANK_UNK2_BLANK 0x0 -+ #define NV84_CRTC0_BLANK_UNK2_UNBLANK 0x1 ++#define NV84_CRTC0_CURSOR_DMA 0x89C ++ #define NV84_CRTC0_CURSOR_DMA_DISABLE 0x0 ++ #define NV84_CRTC0_CURSOR_DMA_LOCAL 0x1 + +#define NV50_CRTC0_DITHERING_CTRL 0x8A0 + #define NV50_CRTC0_DITHERING_CTRL_ON 0x11 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1401 retrieving revision 1.1402 diff -u -r1.1401 -r1.1402 --- kernel.spec 10 Mar 2009 01:09:13 -0000 1.1401 +++ kernel.spec 10 Mar 2009 03:48:33 -0000 1.1402 @@ -1810,6 +1810,9 @@ # and build. %changelog +* Tue Mar 10 2009 Ben Skeggs +- drm-nouveau.patch: fix kms issues seen while testing original 8800gtx + * Tue Mar 10 2009 Dave Airlie - radeon: enable kms on r100/r200 From deji at fedoraproject.org Tue Mar 10 04:13:39 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Tue, 10 Mar 2009 04:13:39 +0000 (UTC) Subject: rpms/mpich2/F-10 mpich2.spec,1.1,1.2 Message-ID: <20090310041339.D170670034@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/mpich2/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10275 Modified Files: mpich2.spec Log Message: * Mon Mar 09 2009 Deji Akingunola - 1.0.8-3 - Drop the ssm channel from ppc* archs, it fails to build - Python scripts in bindir and sbindir are no longer bytecompiled (F-11+) - Enhance the spec file to support ia64 and sparc - Include mpiexec and mpirun (symlinks) in the environment module bindir Index: mpich2.spec =================================================================== RCS file: /cvs/pkgs/rpms/mpich2/F-10/mpich2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mpich2.spec 9 Mar 2009 12:51:04 -0000 1.1 +++ mpich2.spec 10 Mar 2009 04:13:09 -0000 1.2 @@ -1,7 +1,7 @@ Summary: An implementation of MPI Name: mpich2 Version: 1.0.8 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Group: Development/Libraries URL: http://www.mcs.anl.gov/research/projects/mpich2 @@ -64,15 +64,15 @@ %ifarch %{ix86} x86_64 %define selected_channels ch3:nemesis %else -%define selected_channels ch3:dllchan:sock,shm,ssm +%define selected_channels ch3:sock %endif -%ifarch %{ix86} ppc -%define mode 32 -%define priority 40 -%else +%ifarch x86_64 ia64 ppc64 s390x sparc64 %define mode 64 %define priority 41 +%else +%define mode 32 +%define priority 40 %endif %ifarch x86_64 @@ -115,12 +115,19 @@ pushd %{buildroot}%{_bindir}/ ln -s mpiexec.py mpdrun popd -mkdir -p %{buildroot}%{_datadir}/%{name}/bin%{mode} for b in mpicxx mpicc mpif77 mpif90; do mv %{buildroot}%{_bindir}/$b %{buildroot}%{_bindir}/mp%{mode}-$b; mv %{buildroot}%{_mandir}/man1/$b.1 %{buildroot}%{_mandir}/man1/mp-$b.1; +done + +## Setup the executables for environment module +mkdir -p %{buildroot}%{_datadir}/%{name}/bin%{mode} +for b in mpicxx mpicc mpif77 mpif90; do ln -s ../../../bin/mp%{mode}-$b %{buildroot}%{_datadir}/%{name}/bin%{mode}/$b done +for ex in mpiexec mpirun; do + ln -s ../../../bin/mpiexec.py %{buildroot}%{_datadir}/%{name}/bin%{mode}/$ex +done mv %{buildroot}%{_libdir}/%{name}/pkgconfig %{buildroot}%{_libdir}/ chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc @@ -184,14 +191,19 @@ %files %defattr(-,root,root,-) %{_bindir}/* -%exclude %{_bindir}/mp*.pyc -%exclude %{_bindir}/mp*.pyo +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/bin%{mode}/mpiexec +%{_datadir}/%{name}/bin%{mode}/mpirun %exclude %{_bindir}/mp%{mode}-mpicc %exclude %{_bindir}/mp%{mode}-mpicxx %exclude %{_bindir}/mp%{mode}-mpif90 %exclude %{_bindir}/mp%{mode}-mpif77 %doc %{_docdir}/%{name}-%{version}/ %{_mandir}/man1/* +%if 0%{?fedora} < 11 +%exclude %{_bindir}/mp*.pyc +%exclude %{_bindir}/mp*.pyo +%endif %files libs %defattr(-,root,root,-) @@ -212,17 +224,25 @@ %{_libdir}/%{name}/*.so %{_libdir}/%{name}/trace_rlog/libTraceInput.so %{_libdir}/pkgconfig/%{name}-ch3.pc -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/bin%{mode}/ %{_datadir}/%{name}/%{name}.module +%{_datadir}/%{name}/bin%{mode}/mpicc +%{_datadir}/%{name}/bin%{mode}/mpicxx +%{_datadir}/%{name}/bin%{mode}/mpif90 +%{_datadir}/%{name}/bin%{mode}/mpif77 %{_datadir}/%{name}/examples* %{_datadir}/%{name}/logfiles/ %{_mandir}/man4/*.gz %doc README.testing README.romio README.developer %changelog +* Mon Mar 09 2009 Deji Akingunola - 1.0.8-3 +- Drop the ssm channel from ppc* archs, it fails to build +- Python scripts in bindir and sbindir are no longer bytecompiled (F-11+) +- Enhance the spec file to support ia64 and sparc +- Include mpiexec and mpirun (symlinks) in the environment module bindir + * Fri Mar 06 2009 Deji Akingunola - 1.0.8-2 -- Fix the source url, pointed out from package review +- Fix the source url, pointed out from package review - Finally accepted to go into Fedora * Sat Oct 24 2008 Deji Akingunola - 1.0.8-1 From bskeggs at fedoraproject.org Tue Mar 10 04:14:58 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Tue, 10 Mar 2009 04:14:58 +0000 (UTC) Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.15, 1.16 nouveau-fedora.patch, 1.5, 1.6 sources, 1.16, 1.17 xorg-x11-drv-nouveau.spec, 1.21, 1.22 Message-ID: <20090310041458.D7A8670034@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10634 Modified Files: .cvsignore nouveau-fedora.patch sources xorg-x11-drv-nouveau.spec Log Message: * Tue Mar 10 2009 Ben Skeggs 0.0.12-10.20090310git8f9a580 - upstream update, should fix #455194 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 9 Mar 2009 04:40:32 -0000 1.15 +++ .cvsignore 10 Mar 2009 04:14:27 -0000 1.16 @@ -1 +1 @@ -xf86-video-nouveau-0.0.12-20090309gited9bd88.tar.bz2 +xf86-video-nouveau-0.0.12-20090310git8f9a580.tar.bz2 nouveau-fedora.patch: Index: nouveau-fedora.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fedora.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nouveau-fedora.patch 9 Mar 2009 04:40:33 -0000 1.5 +++ nouveau-fedora.patch 10 Mar 2009 04:14:28 -0000 1.6 @@ -458,7 +458,7 @@ + return true; +} diff --git a/src/nv_bios.c b/src/nv_bios.c -index 9f4b665..68bc296 100644 +index a290996..22d5c47 100644 --- a/src/nv_bios.c +++ b/src/nv_bios.c @@ -22,6 +22,9 @@ @@ -471,7 +471,7 @@ #include "nv_include.h" #if defined(__FreeBSD__) || defined(__NetBSD__) -@@ -4855,7 +4858,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn) +@@ -4857,7 +4860,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn) bool NVInitVBIOS(ScrnInfoPtr pScrn) { @@ -482,7 +482,7 @@ memset(bios, 0, sizeof(struct nvbios)); -@@ -4866,6 +4872,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn) +@@ -4868,6 +4874,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn) if (bios->length > NV_PROM_SIZE) bios->length = NV_PROM_SIZE; @@ -609,10 +609,10 @@ return vgaHWSaveScreen(pScreen, mode); diff --git a/src/nv_proto.h b/src/nv_proto.h -index 69ef280..e70b256 100644 +index dac8fdb..289c8a2 100644 --- a/src/nv_proto.h +++ b/src/nv_proto.h -@@ -279,6 +279,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool); +@@ -281,6 +281,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool); int nv50_xv_port_attribute_set(ScrnInfoPtr, Atom, INT32, pointer); int nv50_xv_port_attribute_get(ScrnInfoPtr, Atom, INT32 *, pointer); @@ -624,10 +624,10 @@ #ifndef exaMoveInPixmap extern void exaMoveInPixmap(PixmapPtr pPixmap); diff --git a/src/nv_type.h b/src/nv_type.h -index b8031e3..e67c75a 100644 +index 3130f9e..1c4fd10 100644 --- a/src/nv_type.h +++ b/src/nv_type.h -@@ -270,6 +270,7 @@ typedef struct _NVRec { +@@ -272,6 +272,7 @@ typedef struct _NVRec { /* Various pinned memory regions */ struct nouveau_bo * FB; void * FBMap; @@ -635,7 +635,7 @@ //struct nouveau_bo * FB_old; /* for KMS */ struct nouveau_bo * shadow[2]; /* for easy acces by exa */ struct nouveau_bo * Cursor; -@@ -278,6 +279,9 @@ typedef struct _NVRec { +@@ -280,6 +281,9 @@ typedef struct _NVRec { struct nvbios VBIOS; struct nouveau_bios_info *vbios; Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 9 Mar 2009 04:40:33 -0000 1.16 +++ sources 10 Mar 2009 04:14:28 -0000 1.17 @@ -1 +1 @@ -d593198e6802afaff49fb1619f949d72 xf86-video-nouveau-0.0.12-20090309gited9bd88.tar.bz2 +f2046675f98da002dd324451fd976863 xf86-video-nouveau-0.0.12-20090310git8f9a580.tar.bz2 Index: xorg-x11-drv-nouveau.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xorg-x11-drv-nouveau.spec 9 Mar 2009 04:40:33 -0000 1.21 +++ xorg-x11-drv-nouveau.spec 10 Mar 2009 04:14:28 -0000 1.22 @@ -7,8 +7,8 @@ # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2 -%define gitdate 20090309 -%define git_version ed9bd88 +%define gitdate 20090310 +%define git_version 8f9a580 %define snapshot %{gitdate}git%{git_version} @@ -19,7 +19,7 @@ # need to set an epoch to get version number in sync with upstream Epoch: 1 Version: %{nouveau_version} -Release: 9.%{snapshot}%{?dist} +Release: 10.%{snapshot}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -75,6 +75,9 @@ %{_mandir}/man4/nouveau.4* %changelog +* Tue Mar 10 2009 Ben Skeggs 0.0.12-10.20090310git8f9a580 +- upstream update, should fix #455194 + * Mon Mar 09 2009 Ben Skeggs 0.0.12-9.20090309gited9bd88 - upstream update, fixes - store used vbios image in /var/run, will potentially help debugging later From pjones at fedoraproject.org Tue Mar 10 04:16:31 2009 From: pjones at fedoraproject.org (Peter Jones) Date: Tue, 10 Mar 2009 04:16:31 +0000 (UTC) Subject: rpms/anaconda/devel anaconda-efi.patch, NONE, 1.1 anaconda.spec, 1.763, 1.764 Message-ID: <20090310041631.36DA670034@cvs1.fedora.phx.redhat.com> Author: pjones Update of /cvs/extras/rpms/anaconda/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11165 Modified Files: anaconda.spec Added Files: anaconda-efi.patch Log Message: * Tue Mar 10 2009 Peter Jones - 11.5.0.25-2 - Update EFI CD booting code in mk-images (pjones) anaconda-efi.patch: --- NEW FILE anaconda-efi.patch --- diff --git a/bootdisk/i386/grub.conf b/bootdisk/i386/grub.conf index 156f98d..6e94d05 100644 --- a/bootdisk/i386/grub.conf +++ b/bootdisk/i386/grub.conf @@ -1,8 +1,8 @@ #debug --graphics default=0 -splashimage=/EFI/boot/splash.xpm.gz +splashimage=@SPLASHPATH@ timeout 5 hiddenmenu title @PRODUCT@ @VERSION@ - kernel /EFI/boot/vmlinuz - initrd /EFI/boot/initrd.img + kernel @KERNELPATH@ + initrd @INITRDPATH@ diff --git a/bootdisk/x86_64/grub.conf b/bootdisk/x86_64/grub.conf index 156f98d..6e94d05 100644 --- a/bootdisk/x86_64/grub.conf +++ b/bootdisk/x86_64/grub.conf @@ -1,8 +1,8 @@ #debug --graphics default=0 -splashimage=/EFI/boot/splash.xpm.gz +splashimage=@SPLASHPATH@ timeout 5 hiddenmenu title @PRODUCT@ @VERSION@ - kernel /EFI/boot/vmlinuz - initrd /EFI/boot/initrd.img + kernel @KERNELPATH@ + initrd @INITRDPATH@ diff --git a/scripts/buildinstall b/scripts/buildinstall index ab8d2df..f098537 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -219,8 +219,9 @@ echo "Writing .treeinfo file..." $MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BASEARCH --outfile=$OUTPUT/.treeinfo # FIXME: need to update mk-images to take the yumconf -echo "Making images..." -$MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BASEARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf || die "image creation failed" +MKIMGCMD="$MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BASEARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf" +echo "Making images: $PWD\$ $MKIMGCMD" +$MKIMGCMD || die "image creation failed" echo "Writing .discinfo file" $MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="ALL" --outfile=$OUTPUT/.discinfo diff --git a/scripts/mk-images b/scripts/mk-images index d4cac46..d69301e 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -863,6 +863,7 @@ doPostImages() { # this gets overloaded if we're on an EFI-capable arch (... with grub) makeEfiImages() { + echo "Not on an EFI capable machine; skipping EFI images." /bin/true } diff --git a/scripts/mk-images.efi b/scripts/mk-images.efi index 7c25950..3be5594 100644 --- a/scripts/mk-images.efi +++ b/scripts/mk-images.efi @@ -45,6 +45,7 @@ makeefibootdisk() #makeefibootimage required for EFI bootloader dosfs image makeefibootimage() { + echo "in makeefibootimage: makeefibootimage $@" MBD_FILENAME="" KERNELFILE="" INITRDFILE="" @@ -57,20 +58,29 @@ makeefibootimage() { KERNELFILE=$2 shift; shift continue + elif [ $1 = "--kernelpath" ]; then + KERNELPATH=$2 + shift; shift + continue elif [ $1 = "--initrd" ]; then INITRDFILE=$2 shift; shift continue + elif [ $1 = "--initrdpath" ]; then + INITRDPATH=$2 + shift; shift + continue elif [ $1 = "--imagename" ]; then MBD_FILENAME=$IMAGEPATH/$2 shift; shift continue elif [ $1 = "--grubpkg" ]; then grubpkg=$2 + echo "grubpkg=$grubpkg" shift; shift continue fi - echo "Unknown option passed to makebootdisk" + echo "Unknown option passed to makebootdisk: \"$1\"" exit 1 done @@ -111,6 +121,7 @@ makeefibootimage() { # prepare and build an efiboot.img. prepareEfiImage() { + echo "in prepareEfiImage" prepareEfiTree || return 1 # dynamically calculate the size of the dosfs @@ -125,47 +136,65 @@ prepareEfiImage() { # prepare a directory with the kernel, initrd, and various message files # used to populate the efi boot image prepareEfiTree() { - mkdir -p $MBD_BOOTTREE_TMP/EFI/boot - - cp -a $BOOTDISKDIR/* $MBD_BOOTTREE_TMP/EFI/boot/ - [ -n "$INITRDFILE" ] && cp $INITRDFILE $MBD_BOOTTREE_TMP/EFI/boot/initrd.img - [ -n "$KERNELFILE" ] && cp $KERNELFILE $MBD_BOOTTREE_TMP/EFI/boot/vmlinuz - - sed -i "s/@PRODUCT@/$PRODUCT/g" $MBD_BOOTTREE_TMP/EFI/boot/grub.conf - sed -i "s/@VERSION@/$VERSION/g" $MBD_BOOTTREE_TMP/EFI/boot/grub.conf - - yumdownloader -c $yumconf $grubpkg + echo "in prepareEfiTree" + mkdir -p $MBD_BOOTTREE_TMP/EFI/BOOT + + cp -av $BOOTDISKDIR/*.conf $MBD_BOOTTREE_TMP/EFI/BOOT/ + [ -n "$KERNELFILE" ] && cp -av $KERNELFILE $MBD_BOOTTREE_TMP/EFI/BOOT/vmlinuz + [ -n "$INITRDFILE" ] && cp -av $INITRDFILE $MBD_BOOTTREE_TMP/EFI/BOOT/initrd.img + [ -z "$KERNELPATH" ] && KERNELPATH="/EFI/BOOT/vmlinuz" + [ -z "$INITRDPATH" ] && INITRDPATH="/EFI/BOOT/initrd.img" + + SPLASHPATH="/EFI/BOOT/splash.xpm.gz" + sed -e "s/@PRODUCT@/$PRODUCT/g" \ + -e "s/@VERSION@/$VERSION/g" \ + -e "s, at KERNELPATH@,$KERNELPATH,g" \ + -e "s, at INITRDPATH@,$INITRDPATH,g" \ + -e "s, at SPLASHPATH@,$SPLASHPATH,g" \ + -i $MBD_BOOTTREE_TMP/EFI/BOOT/grub.conf + + ydcmd="yumdownloader -c $yumconf $grubpkg" + echo "(grubpkg) $ydcmd" + $ydcmd rpm2cpio $grubpkg.rpm | (cd $KERNELROOT; cpio --quiet -iumd) - cp $KERNELROOT/boot/efi/EFI/redhat/grub.efi $MBD_BOOTTREE_TMP/EFI/boot/grub.efi + cp -av $KERNELROOT/boot/efi/EFI/redhat/grub.efi $MBD_BOOTTREE_TMP/EFI/BOOT/grub.efi # The first generation Mactel machines get the bootloader name wrong # as per the spec. Awesome, guys. if [ "$efiarch" == "ia32" ]; then - cp $MBD_BOOTTREE_TMP/EFI/boot/grub.efi $MBD_BOOTTREE_TMP/EFI/boot/boot.efi - cp $MBD_BOOTTREE_TMP/EFI/boot/grub.conf $MBD_BOOTTREE_TMP/EFI/boot/boot.conf + cp -av $MBD_BOOTTREE_TMP/EFI/BOOT/grub.efi $MBD_BOOTTREE_TMP/EFI/BOOT/BOOT.efi + cp -av $MBD_BOOTTREE_TMP/EFI/BOOT/grub.conf $MBD_BOOTTREE_TMP/EFI/BOOT/BOOT.conf fi - mv $MBD_BOOTTREE_TMP/EFI/boot/grub.efi $MBD_BOOTTREE_TMP/EFI/boot/boot${efiarch}.efi - mv $MBD_BOOTTREE_TMP/EFI/boot/grub.conf $MBD_BOOTTREE_TMP/EFI/boot/boot${efiarch}.conf + local tmpefiarch=${efiarch} + case ${efiarch} in + x64) tmpefiarch="X64" ;; + ia32) tmpefiarch="IA32" ;; + esac + mv -v $MBD_BOOTTREE_TMP/EFI/BOOT/grub.efi $MBD_BOOTTREE_TMP/EFI/BOOT/BOOT${tmpefiarch}.efi + mv -v $MBD_BOOTTREE_TMP/EFI/BOOT/grub.conf $MBD_BOOTTREE_TMP/EFI/BOOT/BOOT${tmpefiarch}.conf artpkg=$(repoquery --qf "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}" --whatprovides ${brandpkgname}-logos | grep -v generic-logos | head -1) if [ -z "$artpkg" ]; then argpkg="generic-logos" fi - yumdownloader -c ${yumconf} ${artpkg} + ydcmd="yumdownloader -c ${yumconf} ${artpkg}" + echo "(artpkg) $ydcmd" + $ydcmd rpm2cpio ${artpkg}.rpm | (cd $KERNELROOT; cpio --quiet -iumd) - cp $KERNELROOT/boot/grub/splash.xpm.gz $MBD_BOOTTREE_TMP/EFI/boot/splash.xpm.gz + cp -av $KERNELROOT/boot/grub/splash.xpm.gz $MBD_BOOTTREE_TMP/$SPLASHPATH # if we don't have a kernel or initrd, we're making a CD image and we need # to mirror EFI/ to the cd. if [ -z "$KERNELFILE" -a -z "$INITRDFILE" ]; then cp -av $MBD_BOOTTREE_TMP/EFI/ $TOPDESTPATH/EFI/ - rm -f $TOPDESTPATH/EFI/boot/*.efi + rm -f $TOPDESTPATH/EFI/BOOT/*.efi fi } makeEfiImages() { + echo "in makeEfiImages" yumconf="$1" echo "Making EFI images ($PWD)" if [ "$kernelvers" != "$kernelxen" ]; then @@ -182,9 +211,10 @@ makeEfiImages() { return 1 fi echo "Building efiboot.img for ${efiarch}/$KERNELARCH at $TOPDESTPATH/images/efiboot.img" + echo "grubpkg: ${grubpkg}" makeefibootimage \ - --imagename pxeboot/efiboot.img \ + --imagename efiboot.img \ --kernel $TOPDESTPATH/images/pxeboot/vmlinuz \ --initrd $TOPDESTPATH/images/pxeboot/initrd.img \ --grubpkg ${grubpkg} @@ -194,13 +224,16 @@ makeEfiImages() { return $ret fi - makeefibootdisk $TOPDESTPATH/images/pxeboot/efiboot.img $TOPDESTPATH/images/efidisk.img - [ $ret -eq 0 ] || return $ret + makeefibootdisk $TOPDESTPATH/images/efiboot.img $TOPDESTPATH/images/efidisk.img local ret=$? + [ $ret -eq 0 ] || return $ret + rm -vf $TOPDESTPATH/images/efiboot.img # make a boot image with just boot*.efi in it... makeefibootimage \ - --imagename pxeboot/efiboot.img \ + --imagename efiboot.img \ + --kernelpath /images/pxeboot/vmlinuz \ + --initrdpath /images/pxeboot/initrd.img \ --grubpkg ${grubpkg} local ret=$? if [ $ret -ne 0 ]; then diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86 index fe7a978..22db99c 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -159,15 +159,16 @@ doPostImages() { if [ -n "$BOOTISO" ]; then EFIARGS="" EFIGRAFT="" - if [ -f $TOPDESTPATH/images/pxeboot/efiboot.img ]; then - cp $TOPDESTPATH/images/pxeboot/efiboot.img $TOPDESTPATH/isolinux/efiboot.img - EFIARGS="-eltorito-alt-boot -e isolinux/efiboot.img -no-emul-boot" - EFIGRAFT="EFI/boot=$TOPDESTPATH/EFI/boot" + if [ -f $TOPDESTPATH/images/efiboot.img ]; then + echo "Found efiboot.img, making an EFI-capable boot.iso" + EFIARGS="-eltorito-alt-boot -e images/efiboot.img -no-emul-boot" + EFIGRAFT="EFI/BOOT=$TOPDESTPATH/EFI/BOOT" + else + echo "No efiboot.img found, making BIOS-only boot.iso" fi BIOSARGS="-b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table" - echo $PWD:\$ mkisofs -o $TOPDESTPATH/images/$BOOTISO $BIOSARGS $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images/install.img=$TOPDESTPATH/images/install.img $EFIGRAFT - mkisofs -o $TOPDESTPATH/images/$BOOTISO $BIOSARGS $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images/install.img=$TOPDESTPATH/images/install.img $EFIGRAFT - implantisomd5 $TOPDESTPATH/images/$BOOTISO + mkisocmd="mkisofs -v -o $TOPDESTPATH/images/$BOOTISO $BIOSARGS $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images=$TOPDESTPATH/images $EFIGRAFT" + echo $PWD:\$ $mkisocmd + $mkisocmd fi - } Index: anaconda.spec =================================================================== RCS file: /cvs/extras/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.763 retrieving revision 1.764 diff -u -r1.763 -r1.764 --- anaconda.spec 6 Mar 2009 01:44:44 -0000 1.763 +++ anaconda.spec 10 Mar 2009 04:16:00 -0000 1.764 @@ -3,7 +3,7 @@ Summary: Graphical system installer Name: anaconda Version: 11.5.0.25 -Release: 1 +Release: 2 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -13,6 +13,7 @@ # git checkout -b archive-branch anaconda-%{version}-%{release} # make archive-no-tag Source0: %{name}-%{version}.tar.bz2 +Patch0: anaconda-efi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -153,6 +154,7 @@ %prep %setup -q +%patch0 -p1 %build %{__make} depend @@ -209,6 +211,9 @@ %endif %changelog +* Tue Mar 10 2009 Peter Jones - 11.5.0.25-2 +- Update EFI CD booting code in mk-images (pjones) + * Thu Mar 05 2009 David Cantrell - 11.5.0.25-1 - Schedule device destroy actions for partitions last. (dlehman) - Pass storage.disks, not storage, to createAllowed.... (#488860) (dlehman) From deji at fedoraproject.org Tue Mar 10 04:35:14 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Tue, 10 Mar 2009 04:35:14 +0000 (UTC) Subject: rpms/mpich2/F-9 mpich2.spec,1.1,1.2 Message-ID: <20090310043514.BCD6870034@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/mpich2/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15803 Modified Files: mpich2.spec Log Message: * Mon Mar 09 2009 Deji Akingunola - 1.0.8-3 - Drop the ssm channel from ppc* archs, it fails to build - Python scripts in bindir and sbindir are no longer bytecompiled (F-11+) - Enhance the spec file to support ia64 and sparc - Include mpiexec and mpirun (symlinks) in the environment module bindir Index: mpich2.spec =================================================================== RCS file: /cvs/pkgs/rpms/mpich2/F-9/mpich2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mpich2.spec 9 Mar 2009 12:53:57 -0000 1.1 +++ mpich2.spec 10 Mar 2009 04:34:43 -0000 1.2 @@ -1,7 +1,7 @@ Summary: An implementation of MPI Name: mpich2 Version: 1.0.8 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Group: Development/Libraries URL: http://www.mcs.anl.gov/research/projects/mpich2 @@ -64,15 +64,15 @@ %ifarch %{ix86} x86_64 %define selected_channels ch3:nemesis %else -%define selected_channels ch3:dllchan:sock,shm,ssm +%define selected_channels ch3:sock %endif -%ifarch %{ix86} ppc -%define mode 32 -%define priority 40 -%else +%ifarch x86_64 ia64 ppc64 s390x sparc64 %define mode 64 %define priority 41 +%else +%define mode 32 +%define priority 40 %endif %ifarch x86_64 @@ -115,12 +115,19 @@ pushd %{buildroot}%{_bindir}/ ln -s mpiexec.py mpdrun popd -mkdir -p %{buildroot}%{_datadir}/%{name}/bin%{mode} for b in mpicxx mpicc mpif77 mpif90; do mv %{buildroot}%{_bindir}/$b %{buildroot}%{_bindir}/mp%{mode}-$b; mv %{buildroot}%{_mandir}/man1/$b.1 %{buildroot}%{_mandir}/man1/mp-$b.1; +done + +## Setup the executables for environment module +mkdir -p %{buildroot}%{_datadir}/%{name}/bin%{mode} +for b in mpicxx mpicc mpif77 mpif90; do ln -s ../../../bin/mp%{mode}-$b %{buildroot}%{_datadir}/%{name}/bin%{mode}/$b done +for ex in mpiexec mpirun; do + ln -s ../../../bin/mpiexec.py %{buildroot}%{_datadir}/%{name}/bin%{mode}/$ex +done mv %{buildroot}%{_libdir}/%{name}/pkgconfig %{buildroot}%{_libdir}/ chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc @@ -184,14 +191,19 @@ %files %defattr(-,root,root,-) %{_bindir}/* -%exclude %{_bindir}/mp*.pyc -%exclude %{_bindir}/mp*.pyo +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/bin%{mode}/mpiexec +%{_datadir}/%{name}/bin%{mode}/mpirun %exclude %{_bindir}/mp%{mode}-mpicc %exclude %{_bindir}/mp%{mode}-mpicxx %exclude %{_bindir}/mp%{mode}-mpif90 %exclude %{_bindir}/mp%{mode}-mpif77 %doc %{_docdir}/%{name}-%{version}/ %{_mandir}/man1/* +%if 0%{?fedora} < 11 +%exclude %{_bindir}/mp*.pyc +%exclude %{_bindir}/mp*.pyo +%endif %files libs %defattr(-,root,root,-) @@ -212,17 +224,25 @@ %{_libdir}/%{name}/*.so %{_libdir}/%{name}/trace_rlog/libTraceInput.so %{_libdir}/pkgconfig/%{name}-ch3.pc -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/bin%{mode}/ %{_datadir}/%{name}/%{name}.module +%{_datadir}/%{name}/bin%{mode}/mpicc +%{_datadir}/%{name}/bin%{mode}/mpicxx +%{_datadir}/%{name}/bin%{mode}/mpif90 +%{_datadir}/%{name}/bin%{mode}/mpif77 %{_datadir}/%{name}/examples* %{_datadir}/%{name}/logfiles/ %{_mandir}/man4/*.gz %doc README.testing README.romio README.developer %changelog +* Mon Mar 09 2009 Deji Akingunola - 1.0.8-3 +- Drop the ssm channel from ppc* archs, it fails to build +- Python scripts in bindir and sbindir are no longer bytecompiled (F-11+) +- Enhance the spec file to support ia64 and sparc +- Include mpiexec and mpirun (symlinks) in the environment module bindir + * Fri Mar 06 2009 Deji Akingunola - 1.0.8-2 -- Fix the source url, pointed out from package review +- Fix the source url, pointed out from package review - Finally accepted to go into Fedora * Sat Oct 24 2008 Deji Akingunola - 1.0.8-1 From rishi at fedoraproject.org Tue Mar 10 04:35:54 2009 From: rishi at fedoraproject.org (Debarshi Ray) Date: Tue, 10 Mar 2009 04:35:54 +0000 (UTC) Subject: rpms/libgdl/F-10 libgdl.spec,1.11,1.12 Message-ID: <20090310043554.8AA6070034@cvs1.fedora.phx.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libgdl/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15271 Modified Files: libgdl.spec Log Message: Fixed Spec in F-10. Modified Files: libgdl.spec Index: libgdl.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/F-10/libgdl.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libgdl.spec 24 Feb 2009 18:46:11 -0000 1.11 +++ libgdl.spec 10 Mar 2009 04:35:23 -0000 1.12 @@ -111,6 +111,7 @@ * Fri Oct 24 2008 Debarshi Ray - 2.24.0-1 - Version bump to 2.24.0. * Smaller icons to waste less space. + * Ported to GLib IO. (GNOME Bugzilla #513845) * Ported to GtkTooltip. (GNOME Bugzilla #457562) * Translation updates: da, tr, el, it, zh_TW, zh_HK, ru, ar, vi, bg, th, ps, sq, pt_BR and mr. From rishi at fedoraproject.org Tue Mar 10 04:38:41 2009 From: rishi at fedoraproject.org (Debarshi Ray) Date: Tue, 10 Mar 2009 04:38:41 +0000 (UTC) Subject: rpms/libgdl/devel libgdl-2.25.92-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 libgdl.spec, 1.11, 1.12 sources, 1.7, 1.8 libgdl-2.25.91-pkgconfig.patch, 1.1, NONE Message-ID: <20090310043841.5DD1D70034@cvs1.fedora.phx.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libgdl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16634 Modified Files: .cvsignore libgdl.spec sources Added Files: libgdl-2.25.92-pkgconfig.patch Removed Files: libgdl-2.25.91-pkgconfig.patch Log Message: * Tue Mar 10 2009 Debarshi Ray - 2.25.92-1 - Version bump to 2.25.92. * Fixed locked layout mode. (GNOME Bugzilla #573522) * Fixed dock/undock/reset behaviour. (GNOME Bugzilla #566801) * http://ftp.gnome.org/pub/GNOME/sources/gdl/2.25/gdl-2.25.92.news - Replaced 'BuildRequires: libgnomeui-devel' with 'BuildRequires: libglade2-devel'. - Dropped COPYING because it contains GPLv3, which does not tally with the license notices in the source code. libgdl-2.25.92-pkgconfig.patch: --- NEW FILE libgdl-2.25.92-pkgconfig.patch --- diff -urNp gdl-2.24.0.orig/gdl-1.0.pc.in gdl-2.24.0/gdl-1.0.pc.in --- gdl-2.24.0.orig/gdl-1.0.pc.in 2008-09-22 20:48:17.000000000 +0530 +++ gdl-2.24.0/gdl-1.0.pc.in 2008-10-24 15:46:24.750075149 +0530 @@ -8,6 +8,6 @@ idldir=@datadir@/idl/libgdl-1.0 Name: gdl Description: Gnome DevTool Libraries Version: @VERSION@ -Requires: gtk+-2.0 libxml-2.0 libglade-2.0 +Requires: gtk+-2.0 Libs: -L${libdir} -lgdl-1 Cflags: -I${includedir} Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Feb 2009 19:35:26 -0000 1.7 +++ .cvsignore 10 Mar 2009 04:38:09 -0000 1.8 @@ -1 +1 @@ -gdl-2.25.91.tar.gz +gdl-2.25.92.tar.gz Index: libgdl.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/devel/libgdl.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libgdl.spec 24 Feb 2009 19:35:26 -0000 1.11 +++ libgdl.spec 10 Mar 2009 04:38:10 -0000 1.12 @@ -1,6 +1,6 @@ Summary: Components and library for GNOME development tools Name: libgdl -Version: 2.25.91 +Version: 2.25.92 Release: 1%{?dist} # Mixed source licensing scenario. License: (GPLv2 and GPLv2+ and LGPLv2+) @@ -14,7 +14,7 @@ BuildRequires: gettext BuildRequires: intltool -BuildRequires: libgnomeui-devel +BuildRequires: libglade2-devel BuildRequires: libtool BuildRequires: perl(XML::Parser) @@ -70,7 +70,6 @@ %defattr (-,root,root,-) %doc AUTHORS %doc ChangeLog -%doc COPYING %doc MAINTAINERS %doc NEWS %doc README @@ -91,6 +90,16 @@ %{_includedir}/%{name}-1.0/gdl %changelog +* Tue Mar 10 2009 Debarshi Ray - 2.25.92-1 +- Version bump to 2.25.92. + * Fixed locked layout mode. (GNOME Bugzilla #573522) + * Fixed dock/undock/reset behaviour. (GNOME Bugzilla #566801) + * http://ftp.gnome.org/pub/GNOME/sources/gdl/2.25/gdl-2.25.92.news +- Replaced 'BuildRequires: libgnomeui-devel' with + 'BuildRequires: libglade2-devel'. +- Dropped COPYING because it contains GPLv3, which does not tally with the + license notices in the source code. + * Wed Feb 25 2009 Debarshi Ray - 2.25.91-1 - Version bump to 2.25.91. * Updated documentation. @@ -104,6 +113,7 @@ * Fri Oct 24 2008 Debarshi Ray - 2.24.0-1 - Version bump to 2.24.0. * Smaller icons to waste less space. + * Ported to GLib IO. (GNOME Bugzilla #513845) * Ported to GtkTooltip. (GNOME Bugzilla #457562) * Translation updates: da, tr, el, it, zh_TW, zh_HK, ru, ar, vi, bg, th, ps, sq, pt_BR and mr. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Feb 2009 19:35:26 -0000 1.7 +++ sources 10 Mar 2009 04:38:10 -0000 1.8 @@ -1 +1 @@ -561363c34f1eb4049738897476d2a3ec gdl-2.25.91.tar.gz +720678e06356bc0401597f9f853a1f0a gdl-2.25.92.tar.gz --- libgdl-2.25.91-pkgconfig.patch DELETED --- From dcantrel at fedoraproject.org Tue Mar 10 04:42:47 2009 From: dcantrel at fedoraproject.org (David Cantrell) Date: Tue, 10 Mar 2009 04:42:47 +0000 (UTC) Subject: rpms/anaconda/devel .cvsignore, 1.616, 1.617 anaconda.spec, 1.764, 1.765 sources, 1.750, 1.751 Message-ID: <20090310044247.E28CE70034@cvs1.fedora.phx.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17677 Modified Files: .cvsignore anaconda.spec sources Log Message: * Mon Mar 09 2009 David Cantrell - 11.5.0.26-1 - Move the recursive teardown of all devices out of processActions. (dlehman) - Clean up handling of /proc, /sys, /dev/pts, /dev/shm entries. (dlehman) - Fix several minor bugs preventing upgrade/rescue mount. (#488946) (dlehman) - Only populate the device tree on demand. (dlehman) - Prune actions by device based on path, not object-id. (dlehman) - Rewrite action sort so it works correctly. (dlehman) - Do a separate disk.commit for each partition add/remove. (dlehman) - Fix bug keeping track of best free region/type/disk info. (dlehman) - Return early if doAutoPart is False, but clearpart first if kickstart. (dlehman) - Recognize PS3 as a valid machine type (#489263). (clumens) - Move the mdRaidBootArches logic into the platform module. (clumens) - stdout and stderr may also need to be created. (clumens) - Fix booty for dmraid (hdegoede) - It's self.origrequest, not self.origreqest (#489036). (clumens) - Added crypto.py unittest; Updated devicelibs tests baseclass.py and lvm.py (mgracik) - Start storage before parsing the kickstart file. (clumens) - Make sure autopart without any clearpart command will fail. (clumens) - Update storage flag on ks autopart (rvykydal) - Use correct storage attribute for ks clearpart (rvykydal) - Catch the new _ped.DiskLabelException for unrecognized disklabels. (dlehman) - Catch all failures from making parted objects in exceptionDisks. (dlehman) - various dmraid fixes. (jgranado) - Implement the format disk question as a callback. (jgranado) - Add dmraid functionality to new storage code. (jgranado) - Do not pass None values into nonmandatory arguments, you are screwing the default values.. (msivak) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.616 retrieving revision 1.617 diff -u -r1.616 -r1.617 --- .cvsignore 6 Mar 2009 01:44:43 -0000 1.616 +++ .cvsignore 10 Mar 2009 04:42:16 -0000 1.617 @@ -1,2 +1,2 @@ clog -anaconda-11.5.0.25.tar.bz2 +anaconda-11.5.0.26.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.764 retrieving revision 1.765 diff -u -r1.764 -r1.765 --- anaconda.spec 10 Mar 2009 04:16:00 -0000 1.764 +++ anaconda.spec 10 Mar 2009 04:42:16 -0000 1.765 @@ -2,8 +2,8 @@ Summary: Graphical system installer Name: anaconda -Version: 11.5.0.25 -Release: 2 +Version: 11.5.0.26 +Release: 1 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -211,8 +211,36 @@ %endif %changelog -* Tue Mar 10 2009 Peter Jones - 11.5.0.25-2 -- Update EFI CD booting code in mk-images (pjones) +* Mon Mar 09 2009 David Cantrell - 11.5.0.26-1 +- Move the recursive teardown of all devices out of processActions. (dlehman) +- Clean up handling of /proc, /sys, /dev/pts, /dev/shm entries. (dlehman) +- Fix several minor bugs preventing upgrade/rescue mount. (#488946) (dlehman) +- Only populate the device tree on demand. (dlehman) +- Prune actions by device based on path, not object-id. (dlehman) +- Rewrite action sort so it works correctly. (dlehman) +- Do a separate disk.commit for each partition add/remove. (dlehman) +- Fix bug keeping track of best free region/type/disk info. (dlehman) +- Return early if doAutoPart is False, but clearpart first if kickstart. + (dlehman) +- Recognize PS3 as a valid machine type (#489263). (clumens) +- Move the mdRaidBootArches logic into the platform module. (clumens) +- stdout and stderr may also need to be created. (clumens) +- Fix booty for dmraid (hdegoede) +- It's self.origrequest, not self.origreqest (#489036). (clumens) +- Added crypto.py unittest; Updated devicelibs tests baseclass.py and lvm.py + (mgracik) +- Start storage before parsing the kickstart file. (clumens) +- Make sure autopart without any clearpart command will fail. (clumens) +- Update storage flag on ks autopart (rvykydal) +- Use correct storage attribute for ks clearpart (rvykydal) +- Catch the new _ped.DiskLabelException for unrecognized disklabels. + (dlehman) +- Catch all failures from making parted objects in exceptionDisks. (dlehman) +- various dmraid fixes. (jgranado) +- Implement the format disk question as a callback. (jgranado) +- Add dmraid functionality to new storage code. (jgranado) +- Do not pass None values into nonmandatory arguments, you are screwing the + default values.. (msivak) * Thu Mar 05 2009 David Cantrell - 11.5.0.25-1 - Schedule device destroy actions for partitions last. (dlehman) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.750 retrieving revision 1.751 diff -u -r1.750 -r1.751 --- sources 6 Mar 2009 01:44:44 -0000 1.750 +++ sources 10 Mar 2009 04:42:17 -0000 1.751 @@ -1 +1 @@ -1b28850bf72438f98f3c3334f9467f7e anaconda-11.5.0.25.tar.bz2 +f0ce719ba3774013022d96018bab0813 anaconda-11.5.0.26.tar.bz2 From bskeggs at fedoraproject.org Tue Mar 10 04:51:23 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Tue, 10 Mar 2009 04:51:23 +0000 (UTC) Subject: rpms/kernel/devel drm-nouveau.patch, 1.21, 1.22 kernel.spec, 1.1402, 1.1403 Message-ID: <20090310045123.2B57E70034@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19631 Modified Files: drm-nouveau.patch kernel.spec Log Message: * Tue Mar 10 2009 Ben Skeggs - drm-nouveau.patch: another 8800GTX kms fix drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- drm-nouveau.patch 10 Mar 2009 03:48:32 -0000 1.21 +++ drm-nouveau.patch 10 Mar 2009 04:50:48 -0000 1.22 @@ -1840,10 +1840,10 @@ +#endif /* __NOUVEAU_CONNECTOR_H__ */ diff --git a/drivers/gpu/drm/nouveau/nouveau_crtc.h b/drivers/gpu/drm/nouveau/nouveau_crtc.h new file mode 100644 -index 0000000..0ba9475 +index 0000000..c65994f --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_crtc.h -@@ -0,0 +1,59 @@ +@@ -0,0 +1,64 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -1883,7 +1883,12 @@ + struct drm_display_mode *mode; + bool use_dithering; + ++ struct { ++ uint32_t offset; ++ } fb; ++ + struct nv50_cursor *cursor; ++ + struct { + struct mem_block *mem; + uint16_t r[256]; @@ -17086,10 +17091,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_connector.c b/drivers/gpu/drm/nouveau/nv50_connector.c new file mode 100644 -index 0000000..a16445a +index 0000000..aea44cf --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_connector.c -@@ -0,0 +1,592 @@ +@@ -0,0 +1,591 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -17477,7 +17482,6 @@ + return NULL; + + list_for_each_entry(mode, &connector->base.probed_modes, head) { -+ DRM_INFO("%d %d 0x%08x\n", mode->hdisplay, mode->vdisplay, mode->type); + if (mode->type & DRM_MODE_TYPE_PREFERRED) + return drm_mode_duplicate(dev, mode); + } @@ -17684,10 +17688,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c new file mode 100644 -index 0000000..fa7376c +index 0000000..8a10dc9 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c -@@ -0,0 +1,756 @@ +@@ -0,0 +1,758 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -17789,6 +17793,7 @@ + + OUT_MODE(NV50_CRTC0_CLUT_MODE + offset, + NV50_CRTC0_CLUT_MODE_BLANK); ++ OUT_MODE(NV50_CRTC0_CLUT_OFFSET + offset, 0); + if (dev_priv->chipset != 0x50) + OUT_MODE(NV84_CRTC0_CLUT_DMA + offset, + NV84_CRTC0_CLUT_DMA_DISABLE); @@ -17804,10 +17809,14 @@ + + OUT_MODE(NV50_CRTC0_CLUT_MODE + offset, crtc->lut.depth == 8 ? + NV50_CRTC0_CLUT_MODE_OFF : NV50_CRTC0_CLUT_MODE_ON); ++ OUT_MODE(NV50_CRTC0_CLUT_OFFSET + offset, ++ crtc->lut.mem->start >> 8); + if (dev_priv->chipset != 0x50) + OUT_MODE(NV84_CRTC0_CLUT_DMA + offset, + NV84_CRTC0_CLUT_DMA_LOCAL); + ++ OUT_MODE(NV50_CRTC0_FB_OFFSET + offset, crtc->fb.offset >> 8); ++ OUT_MODE(0x864 + offset, 0); + OUT_MODE(NV50_CRTC0_BLANK_CTRL + offset, + NV50_CRTC0_BLANK_CTRL_UNBLANK); + } @@ -18326,11 +18335,9 @@ + struct drm_framebuffer *drm_fb = crtc->base.fb; + struct nouveau_framebuffer *fb = to_nouveau_framebuffer(drm_fb); + struct nouveau_gem_object *ngem = nouveau_gem_object(fb->gem); -+ uint32_t v_vram = ngem->bo->offset - dev_priv->vm_vram_base; + uint32_t offset = crtc->index * 0x400; + -+ OUT_MODE(NV50_CRTC0_FB_OFFSET + offset, v_vram >> 8); -+ OUT_MODE(0x864 + offset, 0); ++ crtc->fb.offset = ngem->bo->offset - dev_priv->vm_vram_base; + + OUT_MODE(NV50_CRTC0_FB_SIZE + offset, + drm_fb->height << 16 | drm_fb->width); @@ -18361,7 +18368,6 @@ + crtc->lut.depth = fb->base.depth; + nv50_crtc_lut_load(crtc); + } -+ OUT_MODE(NV50_CRTC0_CLUT_OFFSET + offset, crtc->lut.mem->start >> 8); + + nv50_crtc_blank(crtc, false); + return 0; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1402 retrieving revision 1.1403 diff -u -r1.1402 -r1.1403 --- kernel.spec 10 Mar 2009 03:48:33 -0000 1.1402 +++ kernel.spec 10 Mar 2009 04:50:51 -0000 1.1403 @@ -1811,6 +1811,9 @@ %changelog * Tue Mar 10 2009 Ben Skeggs +- drm-nouveau.patch: another 8800GTX kms fix + +* Tue Mar 10 2009 Ben Skeggs - drm-nouveau.patch: fix kms issues seen while testing original 8800gtx * Tue Mar 10 2009 Dave Airlie From pgordon at fedoraproject.org Tue Mar 10 05:01:26 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Tue, 10 Mar 2009 05:01:26 +0000 (UTC) Subject: rpms/deluge/devel .cvsignore, 1.54, 1.55 deluge.spec, 1.85, 1.86 sources, 1.54, 1.55 Message-ID: <20090310050126.E429E70034@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/deluge/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23055 Modified Files: .cvsignore deluge.spec sources Log Message: Update to 1.1.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/deluge/devel/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 16 Feb 2009 02:21:17 -0000 1.54 +++ .cvsignore 10 Mar 2009 05:00:56 -0000 1.55 @@ -1 +1 @@ -deluge-1.1.3.tar.bz2 +deluge-1.1.4.tar.bz2 Index: deluge.spec =================================================================== RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- deluge.spec 24 Feb 2009 11:23:59 -0000 1.85 +++ deluge.spec 10 Mar 2009 05:00:56 -0000 1.86 @@ -6,8 +6,8 @@ %define min_rblibtorrent_ver 0.14.1 Name: deluge -Version: 1.1.3 -Release: 2%{?dist} +Version: 1.1.4 +Release: 1%{?dist} Summary: A GTK+ BitTorrent client with support for DHT, UPnP, and PEX Group: Applications/Internet License: GPLv2+ @@ -144,6 +144,9 @@ %changelog +* Mon Mar 09 2009 Peter Gordon - 1.1.4-1 +- Update to new upstream bug-fix release (1.1.4) + * Tue Feb 24 2009 Fedora Release Engineering - 1.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/deluge/devel/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 16 Feb 2009 02:21:17 -0000 1.54 +++ sources 10 Mar 2009 05:00:56 -0000 1.55 @@ -1 +1 @@ -d138a4a890d987ec98eaba8149056924 deluge-1.1.3.tar.bz2 +8c506ab2b0ac24d2ee61388962e5b090 deluge-1.1.4.tar.bz2 From crobinso at fedoraproject.org Tue Mar 10 05:14:51 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Tue, 10 Mar 2009 05:14:51 +0000 (UTC) Subject: rpms/python-virtinst/F-9 .cvsignore, 1.16, 1.17 python-virtinst.spec, 1.47, 1.48 sources, 1.16, 1.17 virtinst-0.400.2-fix-file.patch, 1.1, NONE virtinst-0.400.2-update-polish-trans.patch, 1.1, NONE Message-ID: <20090310051451.F071F70034@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27742 Modified Files: .cvsignore python-virtinst.spec sources Removed Files: virtinst-0.400.2-fix-file.patch virtinst-0.400.2-update-polish-trans.patch Log Message: Update to bugfix release 0.400.3 Fix virt-install --os-type windows installs Fix URL installs to not wipe out --os-variant value Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-9/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 4 Mar 2009 17:44:06 -0000 1.16 +++ .cvsignore 10 Mar 2009 05:14:20 -0000 1.17 @@ -1 +1 @@ -virtinst-0.400.2.tar.gz +virtinst-0.400.3.tar.gz Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-9/python-virtinst.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- python-virtinst.spec 5 Mar 2009 15:24:46 -0000 1.47 +++ python-virtinst.spec 10 Mar 2009 05:14:20 -0000 1.48 @@ -10,11 +10,9 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} -Version: 0.400.2 -Release: 2%{_extra_release} +Version: 0.400.3 +Release: 1%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz -Patch1: %{appname}-%{version}-update-polish-trans.patch -Patch2: %{appname}-%{version}-fix-file.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,8 +38,6 @@ %prep %setup -q -n %{appname}-%{version} -%patch1 -p1 -%patch2 -p1 %build python setup.py build @@ -75,6 +71,11 @@ %{_bindir}/virt-convert %changelog +* Tue Mar 10 2009 Cole Robinson - 0.400.3-1.fc9 +- Update to bugfix release 0.400.3 +- Fix virt-install --os-type windows installs +- Fix URL installs to not wipe out --os-variant value + * Thu Mar 5 2009 Cole Robinson - 0.400.2-2.fc9 - Fix virt-install --file option (bz 488731) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-9/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 4 Mar 2009 17:44:06 -0000 1.16 +++ sources 10 Mar 2009 05:14:21 -0000 1.17 @@ -1 +1 @@ -4bde385a237a7b1d250bd7c67687bbf5 virtinst-0.400.2.tar.gz +85b570586e7584ad607bc7a53970f66f virtinst-0.400.3.tar.gz --- virtinst-0.400.2-fix-file.patch DELETED --- --- virtinst-0.400.2-update-polish-trans.patch DELETED --- From crobinso at fedoraproject.org Tue Mar 10 05:15:08 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Tue, 10 Mar 2009 05:15:08 +0000 (UTC) Subject: rpms/python-virtinst/F-10 .cvsignore, 1.16, 1.17 python-virtinst.spec, 1.52, 1.53 sources, 1.17, 1.18 virtinst-0.400.2-fix-file.patch, 1.1, NONE virtinst-0.400.2-update-polish-trans.patch, 1.1, NONE Message-ID: <20090310051508.D012D70034@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27987 Modified Files: .cvsignore python-virtinst.spec sources Removed Files: virtinst-0.400.2-fix-file.patch virtinst-0.400.2-update-polish-trans.patch Log Message: Update to bugfix release 0.400.3 Fix virt-install --os-type windows installs Fix URL installs to not wipe out --os-variant value Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 4 Mar 2009 16:33:17 -0000 1.16 +++ .cvsignore 10 Mar 2009 05:14:37 -0000 1.17 @@ -1 +1 @@ -virtinst-0.400.2.tar.gz +virtinst-0.400.3.tar.gz Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/python-virtinst.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- python-virtinst.spec 5 Mar 2009 15:26:13 -0000 1.52 +++ python-virtinst.spec 10 Mar 2009 05:14:37 -0000 1.53 @@ -10,11 +10,9 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} -Version: 0.400.2 -Release: 2%{_extra_release} +Version: 0.400.3 +Release: 1%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz -Patch1: %{appname}-%{version}-update-polish-trans.patch -Patch2: %{appname}-%{version}-fix-file.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,8 +38,6 @@ %prep %setup -q -n %{appname}-%{version} -%patch1 -p1 -%patch2 -p1 %build python setup.py build @@ -75,6 +71,11 @@ %{_bindir}/virt-convert %changelog +* Tue Mar 10 2009 Cole Robinson - 0.400.3-1.fc10 +- Update to bugfix release 0.400.3 +- Fix virt-install --os-type windows installs +- Fix URL installs to not wipe out --os-variant value + * Thu Mar 5 2009 Cole Robinson - 0.400.2-2.fc10 - Fix virt-install --file option (bz 488731) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 4 Mar 2009 16:33:17 -0000 1.17 +++ sources 10 Mar 2009 05:14:38 -0000 1.18 @@ -1 +1 @@ -4bde385a237a7b1d250bd7c67687bbf5 virtinst-0.400.2.tar.gz +85b570586e7584ad607bc7a53970f66f virtinst-0.400.3.tar.gz --- virtinst-0.400.2-fix-file.patch DELETED --- --- virtinst-0.400.2-update-polish-trans.patch DELETED --- From pwouters at fedoraproject.org Tue Mar 10 05:20:13 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Tue, 10 Mar 2009 05:20:13 +0000 (UTC) Subject: rpms/dnssec-conf/devel sources,1.5,1.6 Message-ID: <20090310052013.3DA1A70034@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/dnssec-conf/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29441 Modified Files: sources Log Message: updated sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Mar 2009 20:40:25 -0000 1.5 +++ sources 10 Mar 2009 05:19:42 -0000 1.6 @@ -1,2 +1 @@ -62890fd2bc3e23e198c7eae432f55b17 dnssec-conf-1.16.tar.gz ba191a0d45d697f09a9afa739c7aaecb dnssec-conf-1.17.tar.gz From pgordon at fedoraproject.org Tue Mar 10 05:21:20 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Tue, 10 Mar 2009 05:21:20 +0000 (UTC) Subject: rpms/midori/devel midori.spec,1.17,1.18 Message-ID: <20090310052120.58B4E70034@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/midori/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29670 Modified Files: midori.spec Log Message: Add brief TODO note about libidn support. (Thanks, Kevin Fenzi.) Index: midori.spec =================================================================== RCS file: /cvs/pkgs/rpms/midori/devel/midori.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- midori.spec 8 Mar 2009 06:42:47 -0000 1.17 +++ midori.spec 10 Mar 2009 05:20:49 -0000 1.18 @@ -11,6 +11,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +## TODO: For IDN support, we need libidn 1.0+, but that's currently stalled +## from entering Fedora due to license-change issues. (#302111) BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gtksourceview2-devel @@ -100,6 +102,9 @@ %changelog +* Mon Mar 09 2009 Peter Gordon +- Add TODO note about libidn support. (Thanks to Kevin Fenzi via IRC.) + * Sat Mar 07 2009 Peter Gordon - 0.1.4-1 - Update to new upstream release (0.1.4): mostly small usability fixes and related improvements. From pwouters at fedoraproject.org Tue Mar 10 05:23:56 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Tue, 10 Mar 2009 05:23:56 +0000 (UTC) Subject: rpms/dnssec-conf/devel dnssec-conf.spec,1.7,1.8 Message-ID: <20090310052356.E58D770034@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/dnssec-conf/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30132 Modified Files: dnssec-conf.spec Log Message: * Tue Mar 10 2009 Paul Wouters - 1.17-3 - Remove require for unbound. It can also be used with just bind, and we don't require it to work. Index: dnssec-conf.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/devel/dnssec-conf.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dnssec-conf.spec 9 Mar 2009 22:34:44 -0000 1.7 +++ dnssec-conf.spec 10 Mar 2009 05:23:26 -0000 1.8 @@ -1,7 +1,7 @@ Summary: DNSSEC and DLV configuration and priming tool Name: dnssec-conf Version: 1.17 -Release: 2 +Release: 3 License: GPLv2+ Url: http://www.xelerance.com/software/dnssec-conf/ Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz @@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Buildrequires: xmlto -Requires: python-dns, curl, unbound >= 1.1.1-7 +Requires: python-dns, curl #Requires: a caching nameserver #Requires bind 9.4.0 if bind is reconfigured..... @@ -53,6 +53,10 @@ %{_mandir}/*/* %changelog +* Tue Mar 10 2009 Paul Wouters - 1.17-3 +- Remove require for unbound. It can also be used with just bind, + and we don't require it to work. + * Mon Mar 09 2009 Paul Wouters - 1.17-2 - Fix build for /etc/sysconfig/dnssec From crobinso at fedoraproject.org Tue Mar 10 05:26:51 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Tue, 10 Mar 2009 05:26:51 +0000 (UTC) Subject: rpms/python-virtinst/devel .cvsignore, 1.17, 1.18 python-virtinst.spec, 1.58, 1.59 sources, 1.17, 1.18 virtinst-0.400.2-fix-file.patch, 1.1, NONE virtinst-0.400.2-update-polish-trans.patch, 1.1, NONE Message-ID: <20090310052651.B4AFC70034@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30718 Modified Files: .cvsignore python-virtinst.spec sources Removed Files: virtinst-0.400.2-fix-file.patch virtinst-0.400.2-update-polish-trans.patch Log Message: Update to bugfix release 0.400.3 Fix virt-install --os-type windows installs Fix URL installs to not wipe out --os-variant value Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 4 Mar 2009 01:41:14 -0000 1.17 +++ .cvsignore 10 Mar 2009 05:26:20 -0000 1.18 @@ -1 +1 @@ -virtinst-0.400.2.tar.gz +virtinst-0.400.3.tar.gz Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- python-virtinst.spec 5 Mar 2009 15:14:20 -0000 1.58 +++ python-virtinst.spec 10 Mar 2009 05:26:21 -0000 1.59 @@ -10,11 +10,9 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} -Version: 0.400.2 -Release: 3%{_extra_release} +Version: 0.400.3 +Release: 1%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz -Patch1: %{appname}-%{version}-update-polish-trans.patch -Patch2: %{appname}-%{version}-fix-file.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,8 +38,6 @@ %prep %setup -q -n %{appname}-%{version} -%patch1 -p1 -%patch2 -p1 %build python setup.py build @@ -75,6 +71,11 @@ %{_bindir}/virt-convert %changelog +* Tue Mar 10 2009 Cole Robinson - 0.400.3-1.fc11 +- Update to bugfix release 0.400.3 +- Fix virt-install --os-type windows installs +- Fix URL installs to not wipe out --os-variant value + * Thu Mar 5 2009 Cole Robinson - 0.400.2-3.fc11 - Fix virt-install --file option (bz 488731) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 4 Mar 2009 01:41:14 -0000 1.17 +++ sources 10 Mar 2009 05:26:21 -0000 1.18 @@ -1 +1 @@ -4bde385a237a7b1d250bd7c67687bbf5 virtinst-0.400.2.tar.gz +85b570586e7584ad607bc7a53970f66f virtinst-0.400.3.tar.gz --- virtinst-0.400.2-fix-file.patch DELETED --- --- virtinst-0.400.2-update-polish-trans.patch DELETED --- From jkeating at fedoraproject.org Tue Mar 10 05:37:12 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Tue, 10 Mar 2009 05:37:12 +0000 (UTC) Subject: rpms/mash/devel 0001-Add-the-F11-Test-key-to-the-rawhide-config.patch, NONE, 1.1 mash.spec, 1.45, 1.46 Message-ID: <20090310053712.1E31A70034@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/mash/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1542 Modified Files: mash.spec Added Files: 0001-Add-the-F11-Test-key-to-the-rawhide-config.patch Log Message: * Mon Mar 09 2009 Jesse Keating - 0.4.9-3 - Add an upstream patch for F11 test key 0001-Add-the-F11-Test-key-to-the-rawhide-config.patch: --- NEW FILE 0001-Add-the-F11-Test-key-to-the-rawhide-config.patch --- >From fe6ba67e6cb51608549b7e08f3566a47afb07a0e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 9 Mar 2009 22:32:54 -0700 Subject: [PATCH] Add the F11 Test key to the rawhide config --- configs/rawhide.mash | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configs/rawhide.mash b/configs/rawhide.mash index b1814c4..4e67fc8 100644 --- a/configs/rawhide.mash +++ b/configs/rawhide.mash @@ -10,7 +10,7 @@ multilib_method = devel tag = dist-rawhide inherit = True strict_keys = False -keys = 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 +keys = D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/%(arch)s/os/ repoviewtitle = "Fedora Rawhide - %(arch)s" arches = i386 x86_64 ppc ppc64 -- 1.6.1.3 Index: mash.spec =================================================================== RCS file: /cvs/pkgs/rpms/mash/devel/mash.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- mash.spec 25 Feb 2009 23:42:15 -0000 1.45 +++ mash.spec 10 Mar 2009 05:36:41 -0000 1.46 @@ -2,7 +2,7 @@ Name: mash Version: 0.4.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Koji buildsystem to yum repository converter Group: Development/Tools License: GPL @@ -13,6 +13,7 @@ Conflicts: pungi < 1.0.0 BuildRequires: python-devel BuildArch: noarch +Patch0: 0001-Add-the-F11-Test-key-to-the-rawhide-config.patch %description mash is a tool that queries a koji buildsystem for the latest RPMs for @@ -21,6 +22,7 @@ %prep %setup -q +%patch0 -p1 %build %{__python} setup.py build @@ -44,6 +46,9 @@ /var/cache/mash %changelog +* Mon Mar 09 2009 Jesse Keating - 0.4.9-3 +- Add an upstream patch for F11 test key + * Wed Feb 25 2009 Fedora Release Engineering - 0.4.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kkofler at fedoraproject.org Tue Mar 10 06:19:49 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 10 Mar 2009 06:19:49 +0000 (UTC) Subject: rpms/cmake/F-9 cmake-2.6.1-parens.patch,1.1,NONE Message-ID: <20090310061950.3E36570118@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/cmake/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11353/F-9 Removed Files: cmake-2.6.1-parens.patch Log Message: Remove obsolete patch. --- cmake-2.6.1-parens.patch DELETED --- From kkofler at fedoraproject.org Tue Mar 10 06:19:49 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 10 Mar 2009 06:19:49 +0000 (UTC) Subject: rpms/cmake/F-10 cmake-2.6.1-parens.patch,1.1,NONE Message-ID: <20090310061950.3AD3E70034@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/cmake/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11353/F-10 Removed Files: cmake-2.6.1-parens.patch Log Message: Remove obsolete patch. --- cmake-2.6.1-parens.patch DELETED --- From cebbert at fedoraproject.org Tue Mar 10 06:21:58 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Tue, 10 Mar 2009 06:21:58 +0000 (UTC) Subject: rpms/kernel/F-10 patch-2.6.29-rc7-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.995, 1.996 drm-modesetting-radeon.patch, 1.76, 1.77 drm-next.patch, 1.13, 1.14 kernel.spec, 1.1283, 1.1284 sources, 1.956, 1.957 upstream, 1.867, 1.868 Message-ID: <20090310062158.679AB70034@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11648 Modified Files: .cvsignore drm-modesetting-radeon.patch drm-next.patch kernel.spec sources upstream Added Files: patch-2.6.29-rc7-git3.bz2.sign Log Message: 2.6.29-rc7-git3 Copy drm-modesetting-radeon and drm-next patches from rawhide. --- NEW FILE patch-2.6.29-rc7-git3.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBJta37yGugalF9Dw4RAp4nAJsFV+1irXI9wUHrJh1IvolEzM5MhACfWC/L qH/MUzESq0kB2C1AFyQ7r3E= =eRey -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v retrieving revision 1.995 retrieving revision 1.996 diff -u -r1.995 -r1.996 --- .cvsignore 4 Mar 2009 06:53:38 -0000 1.995 +++ .cvsignore 10 Mar 2009 06:21:23 -0000 1.996 @@ -6,3 +6,4 @@ kernel-2.6.28 linux-2.6.28.tar.bz2 patch-2.6.29-rc7.bz2 +patch-2.6.29-rc7-git3.bz2 drm-modesetting-radeon.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.76 -r 1.77 drm-modesetting-radeon.patch Index: drm-modesetting-radeon.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-modesetting-radeon.patch,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- drm-modesetting-radeon.patch 4 Mar 2009 00:03:20 -0000 1.76 +++ drm-modesetting-radeon.patch 10 Mar 2009 06:21:23 -0000 1.77 @@ -1,16 +1,70 @@ -commit 530ebda60cb7270795b7edd72930ab2d0e4db102 +commit 85510fb358cb3c0e3d526a93389a8d847b7398c0 +Author: Dave Airlie +Date: Tue Mar 10 19:01:37 2009 +1000 + + radeon: enable kms on r100/r200 + +commit cd45bd5f01fb0294befd98ced95e46e3a6983d2c +Author: Dave Airlie +Date: Sat Mar 7 19:11:20 2009 +1100 + + drm: switch uncached allocator to be generic cached/uncached + + This gets rid of neraly all the overhead of dma allocs for glxgears. + + using cached pages on PCIE ftw + +commit b34c746ed223c60c3c8aa2b9f707eaaf9e0427dc +Author: Dave Airlie +Date: Sat Mar 7 17:55:11 2009 +1100 + + radeon: when we are using PCIE/IGP don't play with caching + + We really want to use cached BOs as much as possible on PCIE/IGP + for now. We should investigate uncached BOs for certain operations + perhaps. + + Signed-off-by: Dave Airlie + +commit 121cc720f350cc7a34af1d8a3c002266ba990d9b +Author: Dave Airlie +Date: Fri Mar 6 16:42:06 2009 +1100 + + radeon: add depth offset reloc properly + +commit e2eeb3497972e391e519c2139a5ac9fd32dadccc +Author: Dave Airlie +Date: Fri Mar 6 16:25:38 2009 +1100 + + radeon: r100/r200 add depth offset check + +commit 9abfacf388ee1f62cd2f19b32639372b781cd9b7 +Author: Dave Airlie +Date: Fri Mar 6 06:07:38 2009 +1000 + + radeon: add some more texture relocations for r100/r200/r300 + +commit e039bd0f71b17bad18724b5fbb0c1f72be737de2 +Author: Dave Airlie +Date: Thu Mar 5 15:57:18 2009 +1000 + + radeon: add special relocation for WAIT_VLINE + + This is half ways between a hack and really neat. + +commit bd274a6fb4d9bd78e2467620e6c5898c209dfb12 Author: Dave Airlie Date: Tue Mar 3 18:23:22 2009 +1000 radeon: port proc debug files to new debugfs interface -commit 94137dff359fc70b51bdf035f97cfbab7424a5ce +commit f5b2321e7d646e6e7438911e811a973e34270abb Author: Dave Airlie Date: Tue Mar 3 15:33:52 2009 +1000 radeon: pin framebuffer and cursors dynamically -commit 90a014f6d04548790dbcef1932ad3d89ff12aa32 +commit dfe5afc942903cdf9240db9da3670bae07742f85 Author: Alex Deucher Date: Fri Feb 27 20:25:36 2009 -0500 @@ -18,7 +72,7 @@ Signed-off-by: Alex Deucher -commit 9e3775d3fe8677b2f995230521fd93cd9ef69327 +commit 1c653f0dd7ca80b57be396b5af67f18a73ce6bbc Author: Alex Deucher Date: Fri Feb 27 20:18:20 2009 -0500 @@ -26,7 +80,7 @@ Signed-off-by: Alex Deucher -commit b3c52a1d083b846541e2b6d78c917ae00e9f04c1 +commit 709a927cf8b67b87086e7cf97cc8916f9b9106f9 Author: Alex Deucher Date: Fri Feb 27 20:15:04 2009 -0500 @@ -34,7 +88,7 @@ Signed-off-by: Alex Deucher -commit b077cde9a296856bcadb3003e746950034e929bb +commit 1be02ac8d9307f2aeb1190dd1e08f8588020b273 Author: Alex Deucher Date: Fri Feb 27 20:07:13 2009 -0500 @@ -42,55 +96,55 @@ Signed-off-by: Alex Deucher -commit 85a3e7390f17ba442c020dda1a47e6b6b1ce0588 +commit 4e200d8a0063650385096ab6485dea9d428acecb Author: Dave Airlie Date: Mon Mar 2 23:51:30 2009 +1100 radeon: fixup suspend/resume hooks -commit 1467208a03bb127c3882c59cbcc2818fb1076b8d +commit b6cd6f6b0c543380381fd730031831e62da3fbda Author: Dave Airlie Date: Sun Mar 1 18:25:07 2009 +1100 radeon: fix rs480 gart size -commit f3812bb92e9900be559d5d4b2098b8dcef01cce9 +commit 59109f23bf6e835e80d43d138f22520882618a7c Author: Dave Airlie Date: Fri Feb 27 15:37:14 2009 +1000 radeon: disable kms by default for r600 -commit 924db462f118847e313a1a185e93e58016866da4 +commit 0b64e6b2ba58ca37f8c40d3954b523e44d691430 Author: Dave Airlie Date: Fri Feb 27 11:51:22 2009 +1000 radeon: fixup proc hacks -commit 59883501a17405b6db133066d41309db083eb722 +commit c83e971d04031798907c5d1b3a6dfeda9eb7bbd3 Author: Dave Airlie Date: Fri Feb 27 11:51:08 2009 +1000 radeon: fixup module load -commit 0b8ecbca3940dc13b163ab2c46f633625d52aa72 +commit 3642c37a553efb63c1835da912731b131231dd3e Author: Dave Airlie Date: Fri Feb 27 11:50:50 2009 +1000 radeon: fix up ring read/write for new drm-next code -commit 6bffd54b50ca1889aea58454e39edf23e3c4ec50 +commit 9a66ef9814ccf8dded0d59a14da04f10d3082708 Author: Dave Airlie Date: Fri Feb 27 11:50:24 2009 +1000 ati_pcigart: update pcigart for changes in drm-next -commit ddd936403f8c89d85a6407809e93e32b050b09b0 +commit 2e236e8f40317c3bf944e8214829aa22669de489 Author: Dave Airlie Date: Thu Feb 26 22:27:21 2009 +1000 radeon: fixup writeback/ring ptrs for Kms -commit b245e49600fe885e376150d9e8adc6308408c70f +commit de3c748976b7fe35bf1cb0d8ddfd006698d9fcf3 Author: Dave Airlie Date: Thu Feb 26 22:00:59 2009 +1000 @@ -98,19 +152,19 @@ lots more to do -commit c2181284133a30bd1355b9f9463710f9ec43ccaa +commit 26ae113e4e1eeb7c0f6b54fb9426173875f1302a Author: Dave Airlie Date: Thu Feb 26 12:03:55 2009 +1000 drm/radeno: add support for r100 cp type 3 packets -commit 62fb97e2a2e71f83c2c6c783f95a36ba19ec468f +commit 6396d153c51a88225f48f32a06bf32f763976631 Author: Dave Airlie Date: Wed Feb 25 16:07:15 2009 +1000 radeon: fixup cs buffer re-use code to not block straight away -commit 7da8970a24bad69684fba5713106b3c7ab69c858 +commit 16b03d4bd01e196283b6022fcf9d1cfcd8a9dd8e Author: Dave Airlie Date: Wed Feb 25 16:06:30 2009 +1000 @@ -118,37 +172,37 @@ Totally missed this before - really helps stability [...2371 lines suppressed...] -+ flags |= DRM_BO_FLAG_MEM_TT; ++ flags |= DRM_BO_FLAG_MEM_TT | cached; + else + flags |= DRM_BO_FLAG_MEM_LOCAL | DRM_BO_FLAG_CACHED; + @@ -24802,17 +24964,22 @@ +int radeon_gem_set_domain(struct drm_gem_object *obj, uint32_t read_domains, uint32_t write_domain, uint32_t *flags_p, bool unfenced) +{ + struct drm_radeon_gem_object *obj_priv; ++ drm_radeon_private_t *dev_priv = obj->dev->dev_private; + uint32_t flags = 0; + int ret; ++ uint32_t cached = 0; + + obj_priv = obj->driver_private; + ++ if (!(dev_priv->flags & RADEON_IS_AGP)) ++ cached = DRM_BO_FLAG_CACHED; ++ + /* work out where to validate the buffer to */ + if (write_domain) { /* write domains always win */ + if (write_domain == RADEON_GEM_DOMAIN_VRAM) -+ flags = DRM_BO_FLAG_MEM_VRAM; ++ flags = DRM_BO_FLAG_MEM_VRAM | cached; + else if (write_domain == RADEON_GEM_DOMAIN_GTT) -+ flags = DRM_BO_FLAG_MEM_TT; // need a can write gart check ++ flags = DRM_BO_FLAG_MEM_TT | cached; // need a can write gart check + else + return -EINVAL; // we can't write to system RAM + } else { @@ -24830,22 +24997,22 @@ + + /* simple case no choice in domains */ + if (read_domains == RADEON_GEM_DOMAIN_VRAM) -+ flags = DRM_BO_FLAG_MEM_VRAM; ++ flags = DRM_BO_FLAG_MEM_VRAM | cached; + else if (read_domains == RADEON_GEM_DOMAIN_GTT) -+ flags = DRM_BO_FLAG_MEM_TT; ++ flags = DRM_BO_FLAG_MEM_TT | cached; + else if ((obj_priv->bo->mem.mem_type == DRM_BO_MEM_VRAM) && (read_domains & RADEON_GEM_DOMAIN_VRAM)) -+ flags = DRM_BO_FLAG_MEM_VRAM; ++ flags = DRM_BO_FLAG_MEM_VRAM | cached; + else if ((obj_priv->bo->mem.mem_type == DRM_BO_MEM_TT) && (read_domains & RADEON_GEM_DOMAIN_GTT)) -+ flags = DRM_BO_FLAG_MEM_TT; ++ flags = DRM_BO_FLAG_MEM_TT | cached; + else if ((obj_priv->bo->mem.mem_type == DRM_BO_MEM_LOCAL) && (read_domains & RADEON_GEM_DOMAIN_GTT)) -+ flags = DRM_BO_FLAG_MEM_TT; ++ flags = DRM_BO_FLAG_MEM_TT | cached; + + /* no idea here just set whatever we are input */ + if (flags == 0) { + if (read_domains & RADEON_GEM_DOMAIN_VRAM) -+ flags |= DRM_BO_FLAG_MEM_VRAM; ++ flags |= DRM_BO_FLAG_MEM_VRAM | cached; + if (read_domains & RADEON_GEM_DOMAIN_GTT) -+ flags |= DRM_BO_FLAG_MEM_TT; ++ flags |= DRM_BO_FLAG_MEM_TT | cached; + } + } + @@ -24859,6 +25026,7 @@ + if (ret) + return ret; + ++ flags &= ~cached; + if (flags_p) + *flags_p = flags; + return 0; @@ -25727,7 +25895,8 @@ + drm_bo_driver_init(dev); + + /* use the uncached allocator */ -+ dev->bm.allocator_type = _DRM_BM_ALLOCATOR_UNCACHED; ++ if (dev_priv->flags & RADEON_IS_AGP) ++ dev->bm.allocator_type = _DRM_BM_ALLOCATOR_UNCACHED; + + /* size the mappable VRAM memory for now */ + radeon_vram_setup(dev); @@ -26571,7 +26740,7 @@ +} + diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c -index 8289e16..4d17023 100644 +index 9836c70..26ee45e 100644 --- a/drivers/gpu/drm/radeon/radeon_irq.c +++ b/drivers/gpu/drm/radeon/radeon_irq.c @@ -195,11 +195,14 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS) @@ -26589,7 +26758,7 @@ + } /* VBLANK interrupt */ - if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) { + if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) { @@ -216,20 +219,23 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS) return IRQ_HANDLED; } @@ -29766,10 +29935,10 @@ + diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h new file mode 100644 -index 0000000..bb9ad4a +index 0000000..9ccf839 --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_reg.h -@@ -0,0 +1,5335 @@ +@@ -0,0 +1,5337 @@ +/* + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and + * VA Linux Systems Inc., Fremont, California. @@ -33431,6 +33600,7 @@ +#define AVIVO_D1MODE_DATA_FORMAT 0x6528 +# define AVIVO_D1MODE_INTERLEAVE_EN (1 << 0) +#define AVIVO_D1MODE_DESKTOP_HEIGHT 0x652C ++#define AVIVO_D1MODE_VLINE_START_END 0x6538 +#define AVIVO_D1MODE_VIEWPORT_START 0x6580 +#define AVIVO_D1MODE_VIEWPORT_SIZE 0x6584 +#define AVIVO_D1MODE_EXT_OVERSCAN_LEFT_RIGHT 0x6588 @@ -33482,6 +33652,7 @@ +#define AVIVO_D2CUR_SIZE 0x6c10 +#define AVIVO_D2CUR_POSITION 0x6c14 + ++#define AVIVO_D2MODE_VLINE_START_END 0x6d38 +#define AVIVO_D2MODE_VIEWPORT_START 0x6d80 +#define AVIVO_D2MODE_VIEWPORT_SIZE 0x6d84 +#define AVIVO_D2MODE_EXT_OVERSCAN_LEFT_RIGHT 0x6d88 @@ -35106,7 +35277,7 @@ + +#endif diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c -index ca00cef..e6d0503 100644 +index fa728ec..6d96e7e 100644 --- a/drivers/gpu/drm/radeon/radeon_state.c +++ b/drivers/gpu/drm/radeon/radeon_state.c @@ -305,8 +305,9 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t * @@ -35544,7 +35715,7 @@ #endif diff --git a/include/drm/drm_objects.h b/include/drm/drm_objects.h new file mode 100644 -index 0000000..604c8f8 +index 0000000..60016d6 --- /dev/null +++ b/include/drm/drm_objects.h @@ -0,0 +1,913 @@ @@ -36446,12 +36617,12 @@ + void *virtual); + +/* -+ * drm_uncached.c ++ * drm_page_alloc. + */ -+extern int drm_uncached_init(void); -+extern void drm_uncached_fini(void); -+extern struct page *drm_get_uncached_page(void); -+extern void drm_put_uncached_page(struct page *page); ++extern int drm_page_alloc_init(void); ++extern void drm_page_alloc_fini(void); ++extern struct page *drm_get_page(int cached); ++extern void drm_put_page(struct page *page, int cached); + +#ifdef CONFIG_DEBUG_MUTEXES +#define DRM_ASSERT_LOCKED(_mutex) \ @@ -36461,38 +36632,6 @@ +#define DRM_ASSERT_LOCKED(_mutex) +#endif +#endif -diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h -index 912cd52..9aeb426 100644 ---- a/include/drm/i915_drm.h -+++ b/include/drm/i915_drm.h -@@ -187,7 +187,7 @@ typedef struct _drm_i915_sarea { - - #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t) - #define DRM_IOCTL_I915_FLUSH DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH) --#define DRM_IOCTL_I915_FLIP DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLIP) -+#define DRM_IOCTL_I915_FLIP DRM_IOW( DRM_COMMAND_BASE + DRM_I915_FLIP, drm_i915_flip_t) - #define DRM_IOCTL_I915_BATCHBUFFER DRM_IOW( DRM_COMMAND_BASE + DRM_I915_BATCHBUFFER, drm_i915_batchbuffer_t) - #define DRM_IOCTL_I915_IRQ_EMIT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_IRQ_EMIT, drm_i915_irq_emit_t) - #define DRM_IOCTL_I915_IRQ_WAIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_IRQ_WAIT, drm_i915_irq_wait_t) -@@ -220,6 +220,18 @@ typedef struct _drm_i915_sarea { - #define DRM_IOCTL_I915_GEM_GET_TILING DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct drm_i915_gem_get_tiling) - #define DRM_IOCTL_I915_GEM_GET_APERTURE DRM_IOR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_APERTURE, struct drm_i915_gem_get_aperture) - -+/* Asynchronous page flipping: -+ */ -+typedef struct drm_i915_flip { -+ /* -+ * This is really talking about planes, and we could rename it -+ * except for the fact that some of the duplicated i915_drm.h files -+ * out there check for HAVE_I915_FLIP and so might pick up this -+ * version. -+ */ -+ int pipes; -+} drm_i915_flip_t; -+ - /* Allow drivers to submit batchbuffers directly to hardware, relying - * on the security mechanisms provided by hardware. - */ diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h index 937a275..f716e0a 100644 --- a/include/drm/radeon_drm.h drm-next.patch: Index: drm-next.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-next.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- drm-next.patch 1 Mar 2009 04:01:30 -0000 1.13 +++ drm-next.patch 10 Mar 2009 06:21:25 -0000 1.14 @@ -1,4 +1,88 @@ -commit afdecdb151030e719a95896b610fdbde0ad4ca9f +commit 24011adb61c1510fdd9c7ec9a27fc1ac4b23f1bf +Author: Dave Airlie +Date: Mon Mar 9 15:31:20 2009 +1000 + + drm/radeon: fix r600 writeback setup. + + This fixes 2 bugs: + 1. the AGP calculation wasn't consistent with the PCI(E) calc for the + RPTR_ADDR registers. This consolidates the writes and fixes it up. + + 2. The scratch address was being incorrectly calculated, this breaks + it out into a lot more linear steps. + + Signed-off-by: Dave Airlie + +commit d2d31c9fe72bf4904798fd0d01522644e49dd518 +Author: Dave Airlie +Date: Mon Mar 9 12:47:18 2009 +1000 + + drm: fix warnings about new mappings in info code. + + This fixes up the warnings in the debugfs code that conflicted + with the mapping fixups. + + Signed-off-by: Dave Airlie + +commit 4ac16538732ad683c1e7c13cc569335a2db8b6c5 +Author: Hannes Eder +Date: Thu Mar 5 20:14:18 2009 +0100 + + drm/radeon: NULL noise: drivers/gpu/drm/radeon/radeon_*.c + + Fix this sparse warning: + drivers/gpu/drm/radeon/r600_cp.c:1811:52: warning: Using plain integer as NULL pointer + drivers/gpu/drm/radeon/radeon_cp.c:1363:52: warning: Using plain integer as NULL pointer + drivers/gpu/drm/radeon/radeon_state.c:1983:61: warning: Using plain integer as NULL pointer + + Signed-off-by: Hannes Eder + Signed-off-by: Dave Airlie + +commit ae0add29f05b2f5d22863eaefad106f2bb3919be +Author: Dave Airlie +Date: Mon Mar 9 12:17:08 2009 +1000 + + drm/radeon: fix r600 pci mapping calls. + + This realigns the r600 pci mapping calls with the ati pcigart ones, + fixing the direction and using the correct interface. + + Suggested by Jerome Glisse. + + Signed-off-by: Dave Airlie + +commit 9cc01249240abd94eeba0792ad6fc509e7bf072e +Author: Alex Deucher +Date: Sat Mar 7 18:21:21 2009 -0500 + + drm/radeon: r6xx/r7xx: fix possible oops in r600_page_table_cleanup() + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit 8ebf7ff817d032d1f6a06da8b65149b3de049e14 +Author: Dave Airlie +Date: Mon Mar 9 12:12:28 2009 +1000 + + radeon: call the correct idle function, logic got inverted. + + This calls the correct idle function for the R600 and previous chips. + + Signed-off-by: Dave Airlie + +commit 144a1136478cca4f3efe67787eec33ca07aec929 +Author: Alex Deucher +Date: Fri Mar 6 11:47:54 2009 -0500 + + drm/radeon: RS600: fix interrupt handling + + the checks weren't updated when RS600 support + was added. + + Signed-off-by: Alex Deucher + Signed-off-by: Dave Airlie + +commit 664debb50231badbe84778f8945619e36555cd1d Author: Dave Airlie Date: Thu Feb 26 10:15:24 2009 +1000 @@ -6,7 +90,7 @@ Signed-off-by: Dave Airlie -commit cc35bf2855020c4067e298cbd50fa5494b82ab7f +commit 34aa4615a2cce35e46ef23b298c90afe4903f85d Author: Dave Airlie Date: Thu Feb 26 10:14:40 2009 +1000 @@ -16,7 +100,7 @@ Signed-off-by: Dave Airlie -commit 0101c60cfa2d6bd9e86524f267f8ba092bc7b0ae +commit 840cd338857ead31f2c208f70cff2126b6838fd0 Author: Dave Airlie Date: Thu Feb 26 10:13:47 2009 +1000 @@ -26,7 +110,7 @@ Signed-off-by: Dave Airlie -commit c455abd7d1f5ed1815d692f37b317f8eab358ced +commit ae18cf3a76471e058613a5a1256969b8cfd27128 Author: Dave Airlie Date: Thu Feb 26 10:12:10 2009 +1000 @@ -38,7 +122,7 @@ Signed-off-by: Dave Airlie -commit 89de134be815fe9e30ca42aeac8a4ef5c8db8d30 +commit c79813faebe755991896c699773f50851c670d4c Author: Alex Deucher Date: Wed Feb 25 17:02:19 2009 -0500 @@ -47,7 +131,7 @@ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie -commit 8dba4f2bd6d91a38a732dc3417187b75a6607e62 +commit a7f4943d120ba4c45cff2bd22883f598024a08dc Author: Alex Deucher Date: Wed Feb 25 16:57:49 2009 -0500 @@ -60,7 +144,7 @@ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie -commit e482e2e2c5dab12db6f1aa032c30993ca36d77b9 +commit b7fd19e6342c5f2522ec35dec0a92c8069813255 Author: Alex Deucher Date: Wed Feb 25 15:55:01 2009 -0500 @@ -71,7 +155,7 @@ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie -commit dbcce50efba41272d795b64edd06b1261dbdc5b8 +commit 393f865abfb61363ba117cb0c3ea5032bc0a3a3c Author: Alex Deucher Date: Tue Feb 24 17:13:42 2009 -0500 @@ -80,7 +164,7 @@ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie -commit 69184db08c49fd54d4e3a197dae64581c35a144f +commit 6b3287c090c2c3eee993a96886f2f597c9e6ccfa Author: Alex Deucher Date: Tue Feb 24 16:22:29 2009 -0500 @@ -92,7 +176,7 @@ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie -commit b95ec10efe0bb8a106c6ab4edc019033c5081d3d +commit e5a4f4a67d0e886b68ebb122b9282289bf9d6d7f Author: Alex Deucher Date: Tue Feb 24 14:28:34 2009 -0500 @@ -107,7 +191,7 @@ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie -commit 1e7e66e6dce44a77d4042b80de23c8ba4346c459 +commit 0c9f2a4eb40612b22c4bb32b9fe9bcbb82c99e10 Author: Alex Deucher Date: Tue Feb 24 14:02:13 2009 -0500 @@ -120,7 +204,7 @@ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie -commit 9cb39ece1f32fe75e7c34b193022650108d4bf0f +commit 3d802792f818036520ab805ded2904a749af4a48 Author: Owain G. Ainsworth Date: Fri Feb 20 08:30:19 2009 +0000 @@ -138,7 +222,7 @@ Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie -commit 5e60aaba5c9d226ec49f4c1030fc871bcea86048 +commit 088b364ce837e5b1fc8dd022bb5f98c8f3d96e3c Author: Chris Wilson Date: Wed Feb 11 14:26:38 2009 +0000 @@ -148,7 +232,7 @@ Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie -commit 475f933c677b8c59f34744aed2fc3bdcbec24c6e +commit b884af03178e5cd139c8f566090ce763fb9e3a2b Author: Eric Anholt Date: Tue Feb 17 23:53:41 2009 -0800 @@ -161,7 +245,7 @@ Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie -commit b4212836fef1ef28c6070f43d70fc73f9f5687f6 +commit ceeb73a867fe64a1de124cd3e9d776e89944f940 Author: Ben Gamari Date: Tue Feb 17 20:08:51 2009 -0500 @@ -174,7 +258,7 @@ Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie -commit a584bb1ed4de35a9206a8ed42fc7de18b3d46b5a +commit b1645221d43bbfab70c5c5cfdc9e9733e380fca0 Author: Ben Gamari Date: Tue Feb 17 20:08:49 2009 -0500 @@ -194,7 +278,7 @@ Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie -commit edd3993997087102558fd2dbad9d69f8936faf46 +commit d4b25b68f700e27a09c0c5a372c6ee5c1ec45b8e Author: Dave Airlie Date: Fri Feb 20 13:28:59 2009 +1000 @@ -204,7 +288,7 @@ Signed-off-by: Dave Airlie -commit d372535cb04702f5a631c9fc4d0a05c82a17f9b9 +commit 0c37ea7ccc5dabc1cd53780ae4600c6d0644b9f3 Author: Dave Airlie Date: Fri Feb 20 13:28:34 2009 +1000 @@ -217,7 +301,7 @@ Signed-off-by: Dave Airlie -commit ee97e09a8955f2c7c97142f53f259521a6366f95 +commit f7d0d89cc8da1e1ca489d5df3df68b00c0dd59d4 Author: Benjamin Herrenschmidt Date: Fri Feb 6 16:46:27 2009 +1100 @@ -229,7 +313,7 @@ Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Dave Airlie -commit caa35ced56886af48fbefd52e524267565c474db +commit e22139bc821f295d25c0eddbeb65facf1f395458 Author: David Miller Date: Wed Feb 18 01:35:21 2009 -0800 @@ -244,7 +328,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit 57c23ac2439fb3d63063803c1525e1797b7952cb +commit 85cee125f1756aeaa35e02db01987a0a4a5db909 Author: David Miller Date: Wed Feb 18 01:35:23 2009 -0800 @@ -260,7 +344,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit 61d7dc858751fa8134b10c21b2d79956a752f96d +commit 37d1de5730f78a682a19a47f83893e6116a65325 Author: David Miller Date: Wed Feb 18 15:41:02 2009 -0800 @@ -298,7 +382,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit ed19a4b6caeabf3e03a4d553da0396eaebf76531 +commit ddaf8998790ba8d389859fa6420c7da38db91191 Author: David Miller Date: Sun Feb 15 01:08:07 2009 -0800 @@ -316,7 +400,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit 303ba2de4375c08154f7636087161f8d68977833 +commit 1a531c0b82db724bf802f5e100c2c2fc08d54459 Author: David Miller Date: Sat Feb 14 01:51:07 2009 -0800 @@ -338,7 +422,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit 75af28fa5949ac848ca383238212bcb9466a50db +commit 7c5627f23a200c4ab9563b0f1fcfc6984be6ce0b Author: David Miller Date: Thu Feb 12 02:15:44 2009 -0800 @@ -350,7 +434,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit 15c128115096c24076739d0601532b6890482596 +commit 0a5bd3c5c690560a24886d25c5031291c0efbc35 Author: David Miller Date: Thu Feb 12 02:15:39 2009 -0800 @@ -362,7 +446,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit dad8df8c4dfbbf5dfaaed08f61b589ada484a755 +commit 557d71764de798c60cc504f678aaf66a01374860 Author: David Miller Date: Thu Feb 12 02:15:37 2009 -0800 @@ -385,7 +469,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit 1b80a560c76a15813969bc79f8bef4f2324407f1 +commit 2a2aba5d992576a6d73666be1e5ef0248b7a5c1b Author: David Miller Date: Thu Feb 12 02:15:34 2009 -0800 @@ -402,7 +486,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit a1971853c7d82fc14eff895757b5e093c1d6c0b5 +commit f087a3713864f4d3bba746cb70aaebbf9ee1e13f Author: David Miller Date: Thu Feb 12 02:15:27 2009 -0800 @@ -423,7 +507,7 @@ Signed-off-by: David S. Miller Signed-off-by: Dave Airlie -commit cfc0cec3a58d760f0adaef295e9bef5b2b994a69 +commit 928278d2dfc9e3d1af52dd037c13693add544501 Author: Kristian H??gsberg Date: Mon Jan 5 16:10:05 2009 -0500 @@ -442,7 +526,7 @@ Signed-off-by: Kristian H??gsberg Signed-off-by: Dave Airlie -commit f258389e5a3dde1962f246ea8d893d41059a61d7 +commit 2c3a4c2e0f4127adbf9cecb473f2ac4576d289aa Author: Kristian H??gsberg Date: Sun Jan 4 16:55:33 2009 -0500 @@ -456,7 +540,7 @@ Signed-off-by: Kristian H??gsberg Signed-off-by: Dave Airlie -commit 0de5ea62f39de56d2d5513b35d6b9d8df9a66e45 +commit 731b22a5b708f10e45847007a8d786568cb8becc Author: Benjamin Herrenschmidt Date: Mon Feb 2 16:55:47 2009 +1100 @@ -483,7 +567,7 @@ Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Dave Airlie -commit b5fb48f9b87f1955f00a3651c5104d62381ab50d +commit 3365ed3f4b72d9eaecc7a67ff0f3078c9053806d Author: Benjamin Herrenschmidt Date: Mon Feb 2 16:55:46 2009 +1100 @@ -514,7 +598,7 @@ Acked-by: Eric Anholt Signed-off-by: Dave Airlie -commit 1262fdc859fc25e03ce7631daa0d2b50399b3a64 +commit 2d072cd331fb6434406977ac3bbe7a58589f5cca Author: Benjamin Herrenschmidt Date: Mon Feb 2 16:55:45 2009 +1100 @@ -645,7 +729,7 @@ } } diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c -index 72c667f..445c762 100644 +index 12715d3..6d80d17 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -34,15 +34,17 @@ @@ -1330,7 +1414,7 @@ unsigned long prot; diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c new file mode 100644 -index 0000000..fc98952 +index 0000000..60a1b6c --- /dev/null +++ b/drivers/gpu/drm/drm_info.c @@ -0,0 +1,328 @@ @@ -1408,7 +1492,7 @@ +{ + struct drm_info_node *node = (struct drm_info_node *) m->private; + struct drm_device *dev = node->minor->dev; -+ struct drm_map *map; ++ struct drm_local_map *map; + struct drm_map_list *r_list; + + /* Hardcoded from _DRM_FRAME_BUFFER, @@ -1430,9 +1514,9 @@ + else + type = types[map->type]; + -+ seq_printf(m, "%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx ", ++ seq_printf(m, "%4d 0x%016llx 0x%08lx %4.4s 0x%02x 0x%08lx ", + i, -+ map->offset, ++ (unsigned long long)map->offset, + map->size, type, map->flags, + (unsigned long) r_list->user_token); + if (map->mtrr < 0) @@ -2535,7 +2619,7 @@ -} -#endif diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c -index 46bb923..7c41600 100644 +index 7c8b15b..d009661 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -50,6 +50,7 @@ struct idr drm_minors_idr; @@ -2546,7 +2630,7 @@ static int drm_minor_get_id(struct drm_device *dev, int type) { -@@ -321,7 +322,15 @@ static int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int t +@@ -313,7 +314,15 @@ static int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int t goto err_mem; } } else @@ -2563,7 +2647,7 @@ ret = drm_sysfs_device_add(new_minor); if (ret) { -@@ -380,6 +389,7 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, +@@ -372,6 +381,7 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, } if (drm_core_check_feature(dev, DRIVER_MODESET)) { @@ -2571,7 +2655,7 @@ ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL); if (ret) goto err_g2; -@@ -403,9 +413,9 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, +@@ -395,9 +405,9 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, list_add_tail(&dev->driver_item, &driver->device_list); @@ -2583,7 +2667,7 @@ return 0; -@@ -417,29 +427,7 @@ err_g1: +@@ -409,29 +419,7 @@ err_g1: drm_free(dev, sizeof(*dev), DRM_MEM_STUB); return ret; } @@ -2614,7 +2698,7 @@ /** * Put a secondary minor number. -@@ -459,6 +447,10 @@ int drm_put_minor(struct drm_minor **minor_p) +@@ -451,6 +439,10 @@ int drm_put_minor(struct drm_minor **minor_p) if (minor->type == DRM_MINOR_LEGACY) drm_proc_cleanup(minor, drm_proc_root); @@ -2625,7 +2709,7 @@ drm_sysfs_device_remove(minor); idr_remove(&drm_minors_idr, minor->index); -@@ -467,3 +459,67 @@ int drm_put_minor(struct drm_minor **minor_p) +@@ -459,3 +451,67 @@ int drm_put_minor(struct drm_minor **minor_p) *minor_p = NULL; return 0; } @@ -2927,7 +3011,7 @@ intel_display.o \ intel_crt.o \ diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c -index cc46495..27ef79a 100644 +index 6dab63b..7fecc6d 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1057,7 +1057,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master) @@ -3837,10 +3921,10 @@ cmdbuf->bufsz -= sizeof(u64); diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c new file mode 100644 -index 0000000..37249b2 +index 0000000..04fde35 --- /dev/null +++ b/drivers/gpu/drm/radeon/r600_cp.c -@@ -0,0 +1,2244 @@ +@@ -0,0 +1,2256 @@ +/* + * Copyright 2008-2009 Advanced Micro Devices, Inc. + * Copyright 2008 Red Hat Inc. @@ -3964,6 +4048,9 @@ + int pages; + int i; + ++ if (!entry) ++ return; ++ + if (gart_info->bus_addr) { + max_pages = (gart_info->table_size / sizeof(u32)); + pages = (entry->pages <= max_pages) @@ -3972,8 +4059,8 @@ + for (i = 0; i < pages; i++) { + if (!entry->busaddr[i]) + break; -+ pci_unmap_single(dev->pdev, entry->busaddr[i], -+ PAGE_SIZE, PCI_DMA_TODEVICE); ++ pci_unmap_page(dev->pdev, entry->busaddr[i], ++ PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); + } + if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) + gart_info->bus_addr = 0; @@ -4005,10 +4092,10 @@ + + gart_idx = 0; + for (i = 0; i < pages; i++) { -+ entry->busaddr[i] = pci_map_single(dev->pdev, -+ page_address(entry-> -+ pagelist[i]), -+ PAGE_SIZE, PCI_DMA_TODEVICE); ++ entry->busaddr[i] = pci_map_page(dev->pdev, ++ entry->pagelist[i], 0, ++ PAGE_SIZE, ++ PCI_DMA_BIDIRECTIONAL); + if (entry->busaddr[i] == 0) { + DRM_ERROR("unable to map PCIGART pages!\n"); + r600_page_table_cleanup(dev, gart_info); @@ -5470,6 +5557,7 @@ +{ + struct drm_radeon_master_private *master_priv; + u32 ring_start; ++ u64 rptr_addr; + + if (((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770)) + r700_gfx_init(dev, dev_priv); @@ -5524,21 +5612,20 @@ + +#if __OS_HAS_AGP + if (dev_priv->flags & RADEON_IS_AGP) { -+ /* XXX */ -+ RADEON_WRITE(R600_CP_RB_RPTR_ADDR, -+ (dev_priv->ring_rptr->offset -+ - dev->agp->base + dev_priv->gart_vm_start) >> 8); -+ RADEON_WRITE(R600_CP_RB_RPTR_ADDR_HI, 0); ++ rptr_addr = dev_priv->ring_rptr->offset ++ - dev->agp->base + ++ dev_priv->gart_vm_start; + } else +#endif + { -+ RADEON_WRITE(R600_CP_RB_RPTR_ADDR, -+ dev_priv->ring_rptr->offset -+ - ((unsigned long) dev->sg->virtual) -+ + dev_priv->gart_vm_start); -+ -+ RADEON_WRITE(R600_CP_RB_RPTR_ADDR_HI, 0); -+ } ++ rptr_addr = dev_priv->ring_rptr->offset ++ - ((unsigned long) dev->sg->virtual) ++ + dev_priv->gart_vm_start; ++ } ++ RADEON_WRITE(R600_CP_RB_RPTR_ADDR, ++ rptr_addr & 0xffffffff); ++ RADEON_WRITE(R600_CP_RB_RPTR_ADDR_HI, ++ upper_32_bits(rptr_addr)); + +#ifdef __BIG_ENDIAN + RADEON_WRITE(R600_CP_RB_CNTL, @@ -5587,8 +5674,17 @@ + * We simply put this behind the ring read pointer, this works + * with PCI GART as well as (whatever kind of) AGP GART + */ -+ RADEON_WRITE(R600_SCRATCH_ADDR, ((RADEON_READ(R600_CP_RB_RPTR_ADDR) << 8) -+ + R600_SCRATCH_REG_OFFSET) >> 8); ++ { ++ u64 scratch_addr; ++ ++ scratch_addr = RADEON_READ(R600_CP_RB_RPTR_ADDR); ++ scratch_addr |= ((u64)RADEON_READ(R600_CP_RB_RPTR_ADDR_HI)) << 32; ++ scratch_addr += R600_SCRATCH_REG_OFFSET; ++ scratch_addr >>= 8; ++ scratch_addr &= 0xffffffff; ++ ++ RADEON_WRITE(R600_SCRATCH_ADDR, (uint32_t)scratch_addr); ++ } + + RADEON_WRITE(R600_SCRATCH_UMSK, 0x7); + @@ -5651,7 +5747,7 @@ + + if (dev_priv->gart_info.gart_table_location == DRM_ATI_GART_FB) { + drm_core_ioremapfree(&dev_priv->gart_info.mapping, dev); -+ dev_priv->gart_info.addr = 0; ++ dev_priv->gart_info.addr = NULL; + } + } + /* only clear to the start of flags */ @@ -29389,7 +29485,7 @@ + +#endif diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c -index 92965db..15cfe56 100644 +index 92965db..6f579a8 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c @@ -43,6 +43,78 @@ @@ -29922,7 +30018,7 @@ /* Turn on PCI GART */ radeon_set_pcigart(dev_priv, 1); } -@@ -1268,8 +1530,12 @@ static int radeon_do_cleanup_cp(struct drm_device * dev) +@@ -1268,14 +1530,18 @@ static int radeon_do_cleanup_cp(struct drm_device * dev) if (dev_priv->gart_info.bus_addr) { /* Turn off PCI GART */ radeon_set_pcigart(dev_priv, 0); @@ -29937,6 +30033,13 @@ } if (dev_priv->gart_info.gart_table_location == DRM_ATI_GART_FB) + { + drm_core_ioremapfree(&dev_priv->gart_info.mapping, dev); +- dev_priv->gart_info.addr = 0; ++ dev_priv->gart_info.addr = NULL; + } + } + /* only clear to the start of flags */ @@ -1326,6 +1592,7 @@ static int radeon_do_resume_cp(struct drm_device *dev, struct drm_file *file_pri int radeon_cp_init(struct drm_device *dev, void *data, struct drm_file *file_priv) @@ -30009,7 +30112,7 @@ /* Stop the cp */ - while ((ret = radeon_do_cp_idle(dev_priv)) != 0) { - DRM_DEBUG("radeon_do_cp_idle %d\n", ret); -+ if ((dev_priv->flags & RADEON_FAMILY_MASK) < CHIP_R600) { ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600) { + while ((ret = r600_do_cp_idle(dev_priv)) != 0) { + DRM_DEBUG("radeon_do_cp_idle %d\n", ret); +#ifdef __linux__ @@ -30195,10 +30298,10 @@ + } +} diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c -index fef2078..1e3b255 100644 +index fef2078..2cb4f32 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c -@@ -41,17 +41,6 @@ int radeon_no_wb; +@@ -41,23 +41,12 @@ int radeon_no_wb; MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers"); module_param_named(no_wb, radeon_no_wb, int, 0444); @@ -30216,6 +30319,22 @@ static int radeon_suspend(struct drm_device *dev, pm_message_t state) { drm_radeon_private_t *dev_priv = dev->dev_private; + + /* Disable *all* interrupts */ +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) + RADEON_WRITE(R500_DxMODE_INT_MASK, 0); + RADEON_WRITE(RADEON_GEN_INT_CNTL, 0); + return 0; +@@ -68,7 +57,7 @@ static int radeon_resume(struct drm_device *dev) + drm_radeon_private_t *dev_priv = dev->dev_private; + + /* Restore interrupt registers */ +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) + RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg); + RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg); + return 0; @@ -95,7 +84,6 @@ static struct drm_driver driver = { .get_vblank_counter = radeon_get_vblank_counter, .enable_vblank = radeon_enable_vblank, @@ -31044,8 +31163,75 @@ #define OUT_RING( x ) do { \ if ( RADEON_VERBOSE ) { \ +diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c +index 8289e16..9836c70 100644 +--- a/drivers/gpu/drm/radeon/radeon_irq.c ++++ b/drivers/gpu/drm/radeon/radeon_irq.c +@@ -65,7 +65,7 @@ int radeon_enable_vblank(struct drm_device *dev, int crtc) + { + drm_radeon_private_t *dev_priv = dev->dev_private; + +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) { ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) { + switch (crtc) { + case 0: + r500_vbl_irq_set_state(dev, R500_D1MODE_INT_MASK, 1); +@@ -100,7 +100,7 @@ void radeon_disable_vblank(struct drm_device *dev, int crtc) + { + drm_radeon_private_t *dev_priv = dev->dev_private; + +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) { ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) { + switch (crtc) { + case 0: + r500_vbl_irq_set_state(dev, R500_D1MODE_INT_MASK, 0); +@@ -135,7 +135,7 @@ static inline u32 radeon_acknowledge_irqs(drm_radeon_private_t *dev_priv, u32 *r + u32 irq_mask = RADEON_SW_INT_TEST; + + *r500_disp_int = 0; +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) { ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) { + /* vbl interrupts in a different place */ + + if (irqs & R500_DISPLAY_INT_STATUS) { +@@ -202,7 +202,7 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS) + DRM_WAKEUP(&dev_priv->swi_queue); + + /* VBLANK interrupt */ +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) { ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) { + if (r500_disp_int & R500_D1_VBLANK_INTERRUPT) + drm_handle_vblank(dev, 0); + if (r500_disp_int & R500_D2_VBLANK_INTERRUPT) +@@ -265,7 +265,7 @@ u32 radeon_get_vblank_counter(struct drm_device *dev, int crtc) + return -EINVAL; + } + +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) { ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) { + if (crtc == 0) + return RADEON_READ(R500_D1CRTC_FRAME_COUNT); + else +@@ -327,7 +327,7 @@ void radeon_driver_irq_preinstall(struct drm_device * dev) + u32 dummy; + + /* Disable *all* interrupts */ +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) + RADEON_WRITE(R500_DxMODE_INT_MASK, 0); + RADEON_WRITE(RADEON_GEN_INT_CNTL, 0); + +@@ -357,7 +357,7 @@ void radeon_driver_irq_uninstall(struct drm_device * dev) + if (!dev_priv) + return; + +- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) ++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) + RADEON_WRITE(R500_DxMODE_INT_MASK, 0); + /* Disable *all* interrupts */ + RADEON_WRITE(RADEON_GEN_INT_CNTL, 0); diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c -index ef940a0..ca00cef 100644 +index ef940a0..fa728ec 100644 --- a/drivers/gpu/drm/radeon/radeon_state.c +++ b/drivers/gpu/drm/radeon/radeon_state.c @@ -1556,9 +1556,15 @@ static void radeon_cp_discard_buffer(struct drm_device *dev, struct drm_master * @@ -31067,6 +31253,15 @@ buf->pending = 1; buf->used = 0; +@@ -1980,7 +1986,7 @@ static int alloc_surface(drm_radeon_surface_alloc_t *new, + + /* find a virtual surface */ + for (i = 0; i < 2 * RADEON_MAX_SURFACES; i++) +- if (dev_priv->virt_surfaces[i].file_priv == 0) ++ if (dev_priv->virt_surfaces[i].file_priv == NULL) + break; + if (i == 2 * RADEON_MAX_SURFACES) { + return -1; @@ -2473,24 +2479,25 @@ static int radeon_cp_indirect(struct drm_device *dev, void *data, struct drm_fil buf->used = indirect->end; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v retrieving revision 1.1283 retrieving revision 1.1284 diff -u -r1.1283 -r1.1284 --- kernel.spec 4 Mar 2009 06:53:39 -0000 1.1283 +++ kernel.spec 10 Mar 2009 06:21:25 -0000 1.1284 @@ -57,7 +57,7 @@ # The rc snapshot level %define rcrev 7 # The git snapshot level -%define gitrev 0 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1767,6 +1767,10 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Tue Mar 10 2009 Chuck Ebbert 2.6.29-0.54.rc7.git3 +- 2.6.29-rc7-git3 +- Copy drm-modesetting-radeon and drm-next patches from rawhide. + * Wed Mar 04 2009 Chuck Ebbert 2.6.29-0.53.rc7 - 2.6.29-rc7 - Disable CONFIG_GEF_SBC610 on powerpc to fix USB detection (F10#486511) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v retrieving revision 1.956 retrieving revision 1.957 diff -u -r1.956 -r1.957 --- sources 4 Mar 2009 06:53:40 -0000 1.956 +++ sources 10 Mar 2009 06:21:27 -0000 1.957 @@ -1,2 +1,3 @@ d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2 9404c2ead603a80a3aad6361b5fc5413 patch-2.6.29-rc7.bz2 +4ed646718fc5684d63e6e9015b7d02a6 patch-2.6.29-rc7-git3.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v retrieving revision 1.867 retrieving revision 1.868 diff -u -r1.867 -r1.868 --- upstream 4 Mar 2009 06:53:40 -0000 1.867 +++ upstream 10 Mar 2009 06:21:27 -0000 1.868 @@ -1,2 +1,4 @@ linux-2.6.28.tar.bz2 patch-2.6.29-rc7.bz2 +patch-2.6.29-rc7-git3.bz2 + From kkofler at fedoraproject.org Tue Mar 10 06:23:29 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 10 Mar 2009 06:23:29 +0000 (UTC) Subject: rpms/cmake/F-10 cmake-2.6.3-#475876.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 cmake.spec, 1.47, 1.48 sources, 1.23, 1.24 Message-ID: <20090310062329.D3EDF70034@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/cmake/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12224/F-10 Modified Files: .cvsignore cmake.spec sources Added Files: cmake-2.6.3-#475876.patch Log Message: Sync from devel: * Mon Mar 09 2009 Kevin Kofler - 2.6.3-2 - Fix crash during kdepimlibs build (#475876) * Mon Feb 23 2009 Orion Poplawski - 2.6.3-1 - Update to 2.6.3 final * Tue Feb 17 2009 Orion Poplawski - 2.6.3-0.4.rc13 - Update to 2.6.3-RC-13 * Tue Jan 13 2009 Orion Poplawski - 2.6.3-0.3.rc8 - Update to 2.6.3-RC-8 * Sun Jan 04 2009 Rex Dieter - 2.6.3-0.2.rc5 - macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON - fix Release tag * Wed Dec 10 2008 Orion Poplawski - 2.6.3-0.rc5.1 - Update to 2.6.3-RC-5 * Tue Dec 2 2008 Rex Dieter - 2.6.2-3 - Add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake (#474053) - preserve timestamp of macros.cmake - cosmetics cmake-2.6.3-#475876.patch: --- NEW FILE cmake-2.6.3-#475876.patch --- diff -ur cmake-2.6.3/Source/cmIncludeDirectoryCommand.cxx cmake-2.6.3-#475876/Source/cmIncludeDirectoryCommand.cxx --- cmake-2.6.3/Source/cmIncludeDirectoryCommand.cxx 2009-02-21 21:36:52.000000000 +0100 +++ cmake-2.6.3-#475876/Source/cmIncludeDirectoryCommand.cxx 2009-03-09 02:55:46.000000000 +0100 @@ -95,13 +95,13 @@ // remove any leading or trailing spaces and \r pos = ret.size()-1; - while(ret[pos] == ' ' || ret[pos] == '\r') + while(ret.size() && (ret[pos] == ' ' || ret[pos] == '\r')) { ret.erase(pos); pos--; } pos = 0; - while(ret.size() && ret[pos] == ' ' || ret[pos] == '\r') + while(ret.size() && (ret[pos] == ' ' || ret[pos] == '\r')) { ret.erase(pos,1); } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cmake/F-10/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 29 Sep 2008 21:24:39 -0000 1.23 +++ .cvsignore 10 Mar 2009 06:22:59 -0000 1.24 @@ -1 +1 @@ -cmake-2.6.2.tar.gz +cmake-2.6.3.tar.gz Index: cmake.spec =================================================================== RCS file: /cvs/pkgs/rpms/cmake/F-10/cmake.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- cmake.spec 9 Jan 2009 12:54:42 -0000 1.47 +++ cmake.spec 10 Mar 2009 06:22:59 -0000 1.48 @@ -7,8 +7,8 @@ %define rcver %{nil} Name: cmake -Version: 2.6.2 -Release: 3%{?dist} +Version: 2.6.3 +Release: 2%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -16,6 +16,9 @@ URL: http://www.cmake.org Source0: http://www.cmake.org/files/v2.6/cmake-%{version}%{rcver}.tar.gz Source2: macros.cmake +# fix crash during kdepimlibs build +# https://bugzilla.redhat.com/show_bug.cgi?id=475876 +Patch0: cmake-2.6.3-#475876.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, libX11-devel @@ -26,8 +29,6 @@ %if %{with gui} BuildRequires: qt4-devel, desktop-file-utils %define qt_gui --qt-gui -%else -%define qt_gui %{nil} %endif Requires: rpm @@ -41,7 +42,6 @@ generation, code generation, and template instantiation. -%if %{with gui} %package gui Summary: Qt GUI for %{name} Group: Development/Tools @@ -49,11 +49,11 @@ %description gui The %{name}-gui package contains the Qt based GUI for CMake. -%endif %prep %setup -q -n %{name}-%{version}%{rcver} +%patch0 -p1 -b .475876 # Fixup permissions find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x @@ -65,7 +65,7 @@ --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \ --%{?with_bootstrap:no-}system-libs \ --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \ - %{qt_gui} + %{?qt_gui} make VERBOSE=1 %{?_smp_mflags} @@ -77,8 +77,7 @@ cp -a Example $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/ install -m 0644 Docs/cmake-mode.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ # RPM macros -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm -install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ +install -p -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cmake %if %{with gui} # Desktop file desktop-file-install --delete-original \ @@ -130,9 +129,29 @@ %changelog -* Fri Jan 09 2009 Rex Dieter 2.6.2-3 -- macros.cmake: add -DCMAKE_VERBOSE_MAKEFILE=ON (#474053) +* Mon Mar 09 2009 Kevin Kofler - 2.6.3-2 +- Fix crash during kdepimlibs build (#475876) + +* Mon Feb 23 2009 Orion Poplawski - 2.6.3-1 +- Update to 2.6.3 final + +* Tue Feb 17 2009 Orion Poplawski - 2.6.3-0.4.rc13 +- Update to 2.6.3-RC-13 + +* Tue Jan 13 2009 Orion Poplawski - 2.6.3-0.3.rc8 +- Update to 2.6.3-RC-8 + +* Sun Jan 04 2009 Rex Dieter - 2.6.3-0.2.rc5 - macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON +- fix Release tag + +* Wed Dec 10 2008 Orion Poplawski - 2.6.3-0.rc5.1 +- Update to 2.6.3-RC-5 + +* Tue Dec 2 2008 Rex Dieter - 2.6.2-3 +- Add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake (#474053) +- preserve timestamp of macros.cmake +- cosmetics * Tue Oct 21 2008 Orion Poplawski - 2.6.2-2 - Allow conditional build of gui Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cmake/F-10/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 29 Sep 2008 21:24:39 -0000 1.23 +++ sources 10 Mar 2009 06:22:59 -0000 1.24 @@ -1 +1 @@ -9e82aa3beb991aa8e5797cf330618d42 cmake-2.6.2.tar.gz +5ba47a94ce276f326abca1fd72a7e7c6 cmake-2.6.3.tar.gz From kkofler at fedoraproject.org Tue Mar 10 06:23:30 2009 From: kkofler at fedoraproject.org (Kevin Kofler) Date: Tue, 10 Mar 2009 06:23:30 +0000 (UTC) Subject: rpms/cmake/F-9 cmake-2.6.3-#475876.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 cmake.spec, 1.33, 1.34 sources, 1.16, 1.17 Message-ID: <20090310062330.CB46970034@cvs1.fedora.phx.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/cmake/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12224/F-9 Modified Files: .cvsignore cmake.spec sources Added Files: cmake-2.6.3-#475876.patch Log Message: Sync from devel: * Mon Mar 09 2009 Kevin Kofler - 2.6.3-2 - Fix crash during kdepimlibs build (#475876) * Mon Feb 23 2009 Orion Poplawski - 2.6.3-1 - Update to 2.6.3 final * Tue Feb 17 2009 Orion Poplawski - 2.6.3-0.4.rc13 - Update to 2.6.3-RC-13 * Tue Jan 13 2009 Orion Poplawski - 2.6.3-0.3.rc8 - Update to 2.6.3-RC-8 * Sun Jan 04 2009 Rex Dieter - 2.6.3-0.2.rc5 - macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON - fix Release tag * Wed Dec 10 2008 Orion Poplawski - 2.6.3-0.rc5.1 - Update to 2.6.3-RC-5 * Tue Dec 2 2008 Rex Dieter - 2.6.2-3 - Add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake (#474053) - preserve timestamp of macros.cmake - cosmetics cmake-2.6.3-#475876.patch: --- NEW FILE cmake-2.6.3-#475876.patch --- diff -ur cmake-2.6.3/Source/cmIncludeDirectoryCommand.cxx cmake-2.6.3-#475876/Source/cmIncludeDirectoryCommand.cxx --- cmake-2.6.3/Source/cmIncludeDirectoryCommand.cxx 2009-02-21 21:36:52.000000000 +0100 +++ cmake-2.6.3-#475876/Source/cmIncludeDirectoryCommand.cxx 2009-03-09 02:55:46.000000000 +0100 @@ -95,13 +95,13 @@ // remove any leading or trailing spaces and \r pos = ret.size()-1; - while(ret[pos] == ' ' || ret[pos] == '\r') + while(ret.size() && (ret[pos] == ' ' || ret[pos] == '\r')) { ret.erase(pos); pos--; } pos = 0; - while(ret.size() && ret[pos] == ' ' || ret[pos] == '\r') + while(ret.size() && (ret[pos] == ' ' || ret[pos] == '\r')) { ret.erase(pos,1); } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cmake/F-9/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 29 Sep 2008 21:58:46 -0000 1.15 +++ .cvsignore 10 Mar 2009 06:22:59 -0000 1.16 @@ -1 +1 @@ -cmake-2.6.2.tar.gz +cmake-2.6.3.tar.gz Index: cmake.spec =================================================================== RCS file: /cvs/pkgs/rpms/cmake/F-9/cmake.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- cmake.spec 9 Jan 2009 12:53:58 -0000 1.33 +++ cmake.spec 10 Mar 2009 06:23:00 -0000 1.34 @@ -7,8 +7,8 @@ %define rcver %{nil} Name: cmake -Version: 2.6.2 -Release: 3%{?dist} +Version: 2.6.3 +Release: 2%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -16,6 +16,9 @@ URL: http://www.cmake.org Source0: http://www.cmake.org/files/v2.6/cmake-%{version}%{rcver}.tar.gz Source2: macros.cmake +# fix crash during kdepimlibs build +# https://bugzilla.redhat.com/show_bug.cgi?id=475876 +Patch0: cmake-2.6.3-#475876.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, libX11-devel @@ -26,8 +29,6 @@ %if %{with gui} BuildRequires: qt4-devel, desktop-file-utils %define qt_gui --qt-gui -%else -%define qt_gui %{nil} %endif Requires: rpm @@ -41,7 +42,6 @@ generation, code generation, and template instantiation. -%if %{with gui} %package gui Summary: Qt GUI for %{name} Group: Development/Tools @@ -49,11 +49,11 @@ %description gui The %{name}-gui package contains the Qt based GUI for CMake. -%endif %prep %setup -q -n %{name}-%{version}%{rcver} +%patch0 -p1 -b .475876 # Fixup permissions find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x @@ -65,7 +65,7 @@ --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \ --%{?with_bootstrap:no-}system-libs \ --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \ - %{qt_gui} + %{?qt_gui} make VERBOSE=1 %{?_smp_mflags} @@ -77,8 +77,7 @@ cp -a Example $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/ install -m 0644 Docs/cmake-mode.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ # RPM macros -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm -install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ +install -p -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cmake %if %{with gui} # Desktop file desktop-file-install --delete-original \ @@ -130,9 +129,29 @@ %changelog -* Fri Jan 09 2009 Rex Dieter 2.6.2-3 -- macros.cmake: add -DCMAKE_VERBOSE_MAKEFILE=ON (#474053) +* Mon Mar 09 2009 Kevin Kofler - 2.6.3-2 +- Fix crash during kdepimlibs build (#475876) + +* Mon Feb 23 2009 Orion Poplawski - 2.6.3-1 +- Update to 2.6.3 final + +* Tue Feb 17 2009 Orion Poplawski - 2.6.3-0.4.rc13 +- Update to 2.6.3-RC-13 + +* Tue Jan 13 2009 Orion Poplawski - 2.6.3-0.3.rc8 +- Update to 2.6.3-RC-8 + +* Sun Jan 04 2009 Rex Dieter - 2.6.3-0.2.rc5 - macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON +- fix Release tag + +* Wed Dec 10 2008 Orion Poplawski - 2.6.3-0.rc5.1 +- Update to 2.6.3-RC-5 + +* Tue Dec 2 2008 Rex Dieter - 2.6.2-3 +- Add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake (#474053) +- preserve timestamp of macros.cmake +- cosmetics * Tue Oct 21 2008 Orion Poplawski - 2.6.2-2 - Allow conditional build of gui Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cmake/F-9/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 29 Sep 2008 21:58:46 -0000 1.16 +++ sources 10 Mar 2009 06:23:00 -0000 1.17 @@ -1 +1 @@ -9e82aa3beb991aa8e5797cf330618d42 cmake-2.6.2.tar.gz +5ba47a94ce276f326abca1fd72a7e7c6 cmake-2.6.3.tar.gz From pgordon at fedoraproject.org Tue Mar 10 06:26:22 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Tue, 10 Mar 2009 06:26:22 +0000 (UTC) Subject: rpms/deluge/F-10 .cvsignore, 1.51, 1.52 deluge.spec, 1.76, 1.77 sources, 1.51, 1.52 Message-ID: <20090310062622.5323770034@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/deluge/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12956 Modified Files: .cvsignore deluge.spec sources Log Message: Update to 1.1.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/deluge/F-10/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 16 Feb 2009 06:25:40 -0000 1.51 +++ .cvsignore 10 Mar 2009 06:25:50 -0000 1.52 @@ -1 +1 @@ -deluge-1.1.3.tar.bz2 +deluge-1.1.4.tar.bz2 Index: deluge.spec =================================================================== RCS file: /cvs/pkgs/rpms/deluge/F-10/deluge.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- deluge.spec 16 Feb 2009 06:25:40 -0000 1.76 +++ deluge.spec 10 Mar 2009 06:25:51 -0000 1.77 @@ -2,7 +2,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: deluge -Version: 1.1.3 +Version: 1.1.4 Release: 1%{?dist} Summary: A GTK+ BitTorrent client with support for DHT, UPnP, and PEX Group: Applications/Internet @@ -153,6 +153,9 @@ %changelog +* Mon Mar 09 2009 Peter Gordon - 1.1.4-1 +- Update to new upstream bug-fix release (1.1.4) + * Sun Feb 15 2009 Peter Gordon - 1.1.3-1 - Update to new upstream bug-fix release (1.1.3) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/deluge/F-10/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 16 Feb 2009 06:25:40 -0000 1.51 +++ sources 10 Mar 2009 06:25:51 -0000 1.52 @@ -1 +1 @@ -d138a4a890d987ec98eaba8149056924 deluge-1.1.3.tar.bz2 +8c506ab2b0ac24d2ee61388962e5b090 deluge-1.1.4.tar.bz2 From cweyl at fedoraproject.org Tue Mar 10 06:29:50 2009 From: cweyl at fedoraproject.org (Chris Weyl) Date: Tue, 10 Mar 2009 06:29:50 +0000 (UTC) Subject: rpms/perl-Test-WWW-Mechanize-Catalyst/devel .cvsignore, 1.4, 1.5 perl-Test-WWW-Mechanize-Catalyst.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <20090310062950.2CA0570034@cvs1.fedora.phx.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14121 Modified Files: .cvsignore perl-Test-WWW-Mechanize-Catalyst.spec sources Log Message: * Mon Mar 09 2009 Chris Weyl 0.50-1 - update to 0.50 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Oct 2008 00:08:23 -0000 1.4 +++ .cvsignore 10 Mar 2009 06:29:19 -0000 1.5 @@ -1 +1 @@ -Test-WWW-Mechanize-Catalyst-0.43.tar.gz +Test-WWW-Mechanize-Catalyst-0.50.tar.gz Index: perl-Test-WWW-Mechanize-Catalyst.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/devel/perl-Test-WWW-Mechanize-Catalyst.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Test-WWW-Mechanize-Catalyst.spec 27 Feb 2009 03:02:25 -0000 1.5 +++ perl-Test-WWW-Mechanize-Catalyst.spec 10 Mar 2009 06:29:19 -0000 1.6 @@ -1,17 +1,19 @@ Name: perl-Test-WWW-Mechanize-Catalyst -Version: 0.43 -Release: 2%{?dist} +Version: 0.50 +Release: 1%{?dist} Summary: Test::WWW::Mechanize for Catalyst License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Test-WWW-Mechanize-Catalyst/ -Source0: http://www.cpan.org/authors/id/L/LB/LBROCARD/Test-WWW-Mechanize-Catalyst-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/A/AS/ASH/Test-WWW-Mechanize-Catalyst-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildRequires: perl(Catalyst) >= 5.00 BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(namespace::clean) +BuildRequires: perl(Catalyst) >= 5.00 +BuildRequires: perl(Moose) BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::WWW::Mechanize) >= 1.14 BuildRequires: perl(WWW::Mechanize) >= 1.30 @@ -83,6 +85,12 @@ %{_mandir}/man3/* %changelog +* Mon Mar 09 2009 Chris Weyl 0.50-1 +- update to 0.50 + +* Mon Mar 09 2009 Chris Weyl 0.50-1 +- update to 0.50 + * Thu Feb 26 2009 Fedora Release Engineering - 0.43-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize-Catalyst/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Oct 2008 00:08:23 -0000 1.4 +++ sources 10 Mar 2009 06:29:19 -0000 1.5 @@ -1 +1 @@ -2f3faf93d6aa138b0255cfc402de537a Test-WWW-Mechanize-Catalyst-0.43.tar.gz +f220d31d9f0b665843b14a4dd9511226 Test-WWW-Mechanize-Catalyst-0.50.tar.gz From trasher at fedoraproject.org Tue Mar 10 06:31:53 2009 From: trasher at fedoraproject.org (Johan Cwiklinski) Date: Tue, 10 Mar 2009 06:31:53 +0000 (UTC) Subject: rpms/gcompris/F-10 gcompris.spec,1.39,1.40 sources,1.18,1.19 Message-ID: <20090310063153.DB6D170034@cvs1.fedora.phx.redhat.com> Author: trasher Update of /cvs/extras/rpms/gcompris/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14605 Modified Files: gcompris.spec sources Log Message: New upstream release Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/F-10/gcompris.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- gcompris.spec 20 Nov 2008 18:30:12 -0000 1.39 +++ gcompris.spec 10 Mar 2009 06:31:23 -0000 1.40 @@ -1,5 +1,5 @@ Name: gcompris -Version: 8.4.8 +Version: 8.4.9 Release: 1%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games @@ -503,6 +503,9 @@ %changelog +* Mon Mar 9 2009 Johan Cwiklinski 8.4.9-1 +- New wupstream bugfix release 8.4.9 + * Tue Oct 7 2008 Johan Cwiklinski 8.4.8-1 - New upstream bugfix release 8.4.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcompris/F-10/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 20 Nov 2008 06:44:10 -0000 1.18 +++ sources 10 Mar 2009 06:31:23 -0000 1.19 @@ -1 +1 @@ -d46c014c8f13505f94a5756f05cca12e gcompris-8.4.8.tar.gz +04fdc50bd61f4ac10a5feea79d9d5ff1 gcompris-8.4.9.tar.gz From trasher at fedoraproject.org Tue Mar 10 06:36:08 2009 From: trasher at fedoraproject.org (Johan Cwiklinski) Date: Tue, 10 Mar 2009 06:36:08 +0000 (UTC) Subject: rpms/gcompris/F-9 gcompris.spec,1.39,1.40 sources,1.18,1.19 Message-ID: <20090310063608.171C070034@cvs1.fedora.phx.redhat.com> Author: trasher Update of /cvs/extras/rpms/gcompris/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16284 Modified Files: gcompris.spec sources Log Message: New upstream release Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/F-9/gcompris.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- gcompris.spec 20 Nov 2008 18:32:51 -0000 1.39 +++ gcompris.spec 10 Mar 2009 06:35:36 -0000 1.40 @@ -1,5 +1,5 @@ Name: gcompris -Version: 8.4.8 +Version: 8.4.9 Release: 1%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games @@ -503,6 +503,9 @@ %changelog +* Mon Mar 9 2009 Johan Cwiklinski 8.4.9-1 +- New wupstream bugfix release 8.4.9 + * Tue Oct 7 2008 Johan Cwiklinski 8.4.8-1 - New upstream bugfix release 8.4.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcompris/F-9/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 20 Nov 2008 06:42:38 -0000 1.18 +++ sources 10 Mar 2009 06:35:36 -0000 1.19 @@ -1 +1 @@ -d46c014c8f13505f94a5756f05cca12e gcompris-8.4.8.tar.gz +04fdc50bd61f4ac10a5feea79d9d5ff1 gcompris-8.4.9.tar.gz From crobinso at fedoraproject.org Tue Mar 10 06:37:55 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Tue, 10 Mar 2009 06:37:55 +0000 (UTC) Subject: rpms/virt-manager/devel .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 virt-manager.spec, 1.47, 1.48 virt-manager-0.6.1-fix-cadl.patch, 1.1, NONE virt-manager-0.6.1-fix-stats-prefs.patch, 1.1, NONE virt-manager-0.6.1-update-polish.patch, 1.1, NONE Message-ID: <20090310063755.10BBD70034@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/virt-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16742 Modified Files: .cvsignore sources virt-manager.spec Removed Files: virt-manager-0.6.1-fix-cadl.patch virt-manager-0.6.1-fix-stats-prefs.patch virt-manager-0.6.1-update-polish.patch Log Message: Update to release 0.7.0 Redesigned 'New Virtual Machine' wizard Option to remove storage when deleting a virtual machine. File browser for libvirt storage pools and volumes Physical device assignment (PCI, USB) for existing virtual machines. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 27 Jan 2009 01:28:18 -0000 1.21 +++ .cvsignore 10 Mar 2009 06:37:18 -0000 1.22 @@ -1 +1 @@ -virt-manager-0.6.1.tar.gz +virt-manager-0.7.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 27 Jan 2009 01:28:18 -0000 1.21 +++ sources 10 Mar 2009 06:37:19 -0000 1.22 @@ -1 +1 @@ -9c4eeaf447919b425f890b6bff715512 virt-manager-0.6.1.tar.gz +32ca0ab48fd317cb6598d88468f16951 virt-manager-0.7.0.tar.gz Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- virt-manager.spec 4 Mar 2009 17:53:31 -0000 1.47 +++ virt-manager.spec 10 Mar 2009 06:37:24 -0000 1.48 @@ -7,24 +7,21 @@ %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}} Name: virt-manager -Version: 0.6.1 -Release: 4%{_extra_release} +Version: 0.7.0 +Release: 1%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz -Patch1: %{name}-%{version}-update-polish.patch -Patch2: %{name}-%{version}-fix-cadl.patch -Patch3: %{name}-%{version}-fix-stats-prefs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # These two are just the oldest version tested Requires: pygtk2 >= 1.99.12-6 Requires: gnome-python2-gconf >= 1.99.11-7 # Absolutely require this version or newer -Requires: libvirt-python >= 0.4.5 +Requires: libvirt-python >= 0.6.1 # Definitely does not work with earlier due to python API changes Requires: dbus-python >= 0.61 Requires: dbus-x11 @@ -44,7 +41,7 @@ # Minimum we've tested with Requires: libxml2-python >= 2.6.23 # Required to install Xen & QEMU guests -Requires: python-virtinst >= 0.400.1 +Requires: python-virtinst >= 0.400.3 # Required for loading the glade UI Requires: pygtk2-libglade # Required for our graphics which are currently SVG format @@ -89,9 +86,6 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %configure @@ -169,6 +163,13 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog +* Tue Mar 10 2009 Cole Robinson - 0.7.0-1.fc11 +- Update to release 0.7.0 +- Redesigned 'New Virtual Machine' wizard +- Option to remove storage when deleting a virtual machine. +- File browser for libvirt storage pools and volumes +- Physical device assignment (PCI, USB) for existing virtual machines. + * Wed Mar 4 2009 Cole Robinson - 0.6.1-4.fc11 - Update polish translation (bz 263301) - Fix sending ctrl-alt-del to guest --- virt-manager-0.6.1-fix-cadl.patch DELETED --- --- virt-manager-0.6.1-fix-stats-prefs.patch DELETED --- --- virt-manager-0.6.1-update-polish.patch DELETED --- From mso at fedoraproject.org Tue Mar 10 07:13:29 2009 From: mso at fedoraproject.org (Martin Sourada) Date: Tue, 10 Mar 2009 07:13:29 +0000 (UTC) Subject: rpms/leonidas-backgrounds/devel import.log, NONE, 1.1 leonidas-backgrounds.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310071329.8385A7002E@cvs1.fedora.phx.redhat.com> Author: mso Update of /cvs/extras/rpms/leonidas-backgrounds/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24754/devel Modified Files: .cvsignore sources Added Files: import.log leonidas-backgrounds.spec Log Message: Initial import of Leonidas backgrounds. --- NEW FILE import.log --- leonidas-backgrounds-10_92_1-2_fc11:HEAD:leonidas-backgrounds-10.92.1-2.fc11.src.rpm:1236669130 --- NEW FILE leonidas-backgrounds.spec --- Name: leonidas-backgrounds Version: 10.92.1 Release: 2%{?dist} Summary: Leonidas desktop backgrounds Group: Applications/Multimedia License: CC-BY-SA URL: https://fedoraproject.org/wiki/F11_Artwork # This is a Fedora maintained package which is specific to our distribution. # The source is only available from within this srpm. # Images in the source archive are basically crops/resizes of # https://fedoraproject.org/w/uploads/e/e9/Artwork_F11_Betamockup1_n.jpg Source0: %{name}-%{version}.tar.lzma BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description This package contains desktop backgrounds for the leonidas theme. %prep %setup -q %build %install rm -rf $RPM_BUILD_ROOT # copy image files mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/normal mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/wide mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/normal.dual mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas/wide.dual cp -a $RPM_BUILD_DIR/%{name}-%{version}/normal \ $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas cp -a $RPM_BUILD_DIR/%{name}-%{version}/wide \ $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas cp -a $RPM_BUILD_DIR/%{name}-%{version}/normal.dual \ $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas cp -a $RPM_BUILD_DIR/%{name}-%{version}/wide.dual \ $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas # copy slideshow xml files cp -a $RPM_BUILD_DIR/%{name}-%{version}/leonidas.xml \ $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas cp -a $RPM_BUILD_DIR/%{name}-%{version}/leonidas_left.xml \ $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas cp -a $RPM_BUILD_DIR/%{name}-%{version}/leonidas_right.xml \ $RPM_BUILD_ROOT/%{_datadir}/backgrounds/leonidas # copy metadata xmls file mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-leonidas.xml \ $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{_datadir}/backgrounds/leonidas %{_datadir}/gnome-background-properties %changelog * Mon Mar 09 2009 Martin Sourada - 10.92.1-2 - Add note about source (we are upstream and don't host the source elsewhere) - Don't pass -r to cp, it's already implied by -a * Mon Mar 09 2009 Martin Sourada - 10.92.1-1 - Update to newer version - add dual screen versions - add left part of dual screen as a wallpaper on its own * Thu Mar 05 2009 Martin Sourada - 10.92.0-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/leonidas-backgrounds/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 02:28:08 -0000 1.1 +++ .cvsignore 10 Mar 2009 07:12:56 -0000 1.2 @@ -0,0 +1 @@ +leonidas-backgrounds-10.92.1.tar.lzma Index: sources =================================================================== RCS file: /cvs/extras/rpms/leonidas-backgrounds/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 02:28:09 -0000 1.1 +++ sources 10 Mar 2009 07:12:56 -0000 1.2 @@ -0,0 +1 @@ +752c6291a5b344d9fdbe79d9cfc669a8 leonidas-backgrounds-10.92.1.tar.lzma From denis at fedoraproject.org Tue Mar 10 07:15:23 2009 From: denis at fedoraproject.org (Denis Leroy) Date: Tue, 10 Mar 2009 07:15:23 +0000 (UTC) Subject: rpms/pstoedit/devel pstoedit.spec,1.13,1.14 Message-ID: <20090310071523.4AC667002E@cvs1.fedora.phx.redhat.com> Author: denis Update of /cvs/pkgs/rpms/pstoedit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25232 Modified Files: pstoedit.spec Log Message: - Removed EMF BR for ia64 arch (#489412) - Rebuild for ImageMagick Index: pstoedit.spec =================================================================== RCS file: /cvs/pkgs/rpms/pstoedit/devel/pstoedit.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- pstoedit.spec 27 Feb 2009 02:48:36 -0000 1.13 +++ pstoedit.spec 10 Mar 2009 07:14:52 -0000 1.14 @@ -1,6 +1,6 @@ Name: pstoedit Version: 3.45 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Translates PostScript and PDF graphics into other vector formats Group: Applications/Productivity @@ -20,6 +20,7 @@ BuildRequires: dos2unix BuildRequires: ghostscript BuildRequires: plotutils-devel +%ifnarch ia64 BuildRequires: libEMF-devel %description @@ -94,6 +95,10 @@ %changelog +* Tue Mar 10 2009 Denis Leroy - 3.45-7 +- Removed EMF BR for ia64 arch (#489412) +- Rebuild for ImageMagick + * Thu Feb 26 2009 Fedora Release Engineering - 3.45-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From denis at fedoraproject.org Tue Mar 10 07:19:35 2009 From: denis at fedoraproject.org (Denis Leroy) Date: Tue, 10 Mar 2009 07:19:35 +0000 (UTC) Subject: rpms/pstoedit/devel pstoedit.spec,1.14,1.15 Message-ID: <20090310071935.BFAA07002E@cvs1.fedora.phx.redhat.com> Author: denis Update of /cvs/pkgs/rpms/pstoedit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26443 Modified Files: pstoedit.spec Log Message: Fixed ifnarch Index: pstoedit.spec =================================================================== RCS file: /cvs/pkgs/rpms/pstoedit/devel/pstoedit.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- pstoedit.spec 10 Mar 2009 07:14:52 -0000 1.14 +++ pstoedit.spec 10 Mar 2009 07:19:05 -0000 1.15 @@ -22,6 +22,8 @@ BuildRequires: plotutils-devel %ifnarch ia64 BuildRequires: libEMF-devel +%endif + %description Pstoedit converts PostScript and PDF files to various vector graphic From giallu at fedoraproject.org Tue Mar 10 07:45:39 2009 From: giallu at fedoraproject.org (Gianluca Sforna) Date: Tue, 10 Mar 2009 07:45:39 +0000 (UTC) Subject: rpms/alleyoop/devel alleyoop.desktop,1.3,1.4 Message-ID: <20090310074540.549F87002E@cvs1.fedora.phx.redhat.com> Author: giallu Update of /cvs/extras/rpms/alleyoop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32320 Modified Files: alleyoop.desktop Log Message: Application has no icon, art team contacted to create one Index: alleyoop.desktop =================================================================== RCS file: /cvs/extras/rpms/alleyoop/devel/alleyoop.desktop,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- alleyoop.desktop 3 Mar 2009 09:02:41 -0000 1.3 +++ alleyoop.desktop 10 Mar 2009 07:45:06 -0000 1.4 @@ -4,7 +4,7 @@ GenericName=Memory Checker Comment=Find memory-management problems in your programs using the valgrind tool Exec=alleyoop -Icon=gnome-devel.png +Icon=alleyoop StartupNotify=true Terminal=false Type=Application From sharkcz at fedoraproject.org Tue Mar 10 08:04:45 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Tue, 10 Mar 2009 08:04:45 +0000 (UTC) Subject: rpms/mm3d/devel .cvsignore, 1.3, 1.4 mm3d.spec, 1.3, 1.4 sources, 1.3, 1.4 mm3d-1.3.7-autoconf.patch, 1.1, NONE mm3d-1.3.7-gcc44.patch, 1.2, NONE Message-ID: <20090310080445.C23937002E@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/mm3d/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4549 Modified Files: .cvsignore mm3d.spec sources Removed Files: mm3d-1.3.7-autoconf.patch mm3d-1.3.7-gcc44.patch Log Message: * Tue Mar 10 2009 Dan Hor??k 1.3.8-1 - update to 1.3.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mm3d/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Feb 2009 08:37:01 -0000 1.3 +++ .cvsignore 10 Mar 2009 08:04:14 -0000 1.4 @@ -1,3 +1,3 @@ ad3dsfilter-0.8.1.tar.gz imtex-1.4.0.tar.gz -mm3d-1.3.7a.tar.gz +mm3d-1.3.8.tar.gz Index: mm3d.spec =================================================================== RCS file: /cvs/pkgs/rpms/mm3d/devel/mm3d.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mm3d.spec 24 Feb 2009 08:37:02 -0000 1.3 +++ mm3d.spec 10 Mar 2009 08:04:15 -0000 1.4 @@ -4,7 +4,7 @@ %define major_version 1.3 Name: mm3d -Version: 1.3.7a +Version: 1.3.8 Release: 1%{?dist} Summary: 3D model editor @@ -16,8 +16,6 @@ Source10: http://www.misfitcode.com/misfitmodel3d/download/plugins/ad3dsfilter-%{plugin_3ds_ver}.tar.gz Source11: http://www.misfitcode.com/misfitmodel3d/download/plugins/imtex-%{plugin_imtex_ver}.tar.gz Patch0: mm3d-1.3.6-sighandler.patch -Patch1: mm3d-1.3.7-autoconf.patch -Patch2: mm3d-1.3.7-gcc44.patch Patch10: mm3d-ad3dsfilter-make.patch Patch11: mm3d-imtex-make.patch Patch12: mm3d-imtex-gcc43.patch @@ -41,8 +39,6 @@ %setup -q -a 10 -a 11 %patch0 -b .sigh -%patch1 -p1 -b .autoconf -%patch2 -p1 -b .gcc44 %patch10 -b .ad3ds %patch11 -b .imtex @@ -122,18 +118,21 @@ %changelog -* Tue Feb 24 2009 Dan Horak 1.3.7a-1 +* Tue Mar 10 2009 Dan Hor??k 1.3.8-1 +- update to 1.3.8 + +* Tue Feb 24 2009 Dan Hor??k 1.3.7a-1 - update to 1.3.7a - better fix for the conflict between list type and parameter -* Thu Feb 19 2009 Dan Horak 1.3.7-3 +* Thu Feb 19 2009 Dan Hor??k 1.3.7-3 - fixes for gcc 4.4 -* Fri Jun 4 2008 Dan Horak 1.3.7-2 +* Fri Jun 4 2008 Dan Hor??k 1.3.7-2 - fix plugin installation directory - change how the docs are installed - fix DocPath in the desktop file - add scriptlets for updating the desktop database -* Tue Jun 1 2008 Dan Horak 1.3.7-1 +* Tue Jun 1 2008 Dan Hor??k 1.3.7-1 - initial Fedora version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mm3d/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Feb 2009 08:37:02 -0000 1.3 +++ sources 10 Mar 2009 08:04:15 -0000 1.4 @@ -1,3 +1,3 @@ d0d7be8bd51e912f1ef8bd4e122855d1 ad3dsfilter-0.8.1.tar.gz 4b26d78210d251bc4f9fc392123ea02a imtex-1.4.0.tar.gz -4aac3f895337b662359ab4dbc24e4be3 mm3d-1.3.7a.tar.gz +c7b64a9f4320b28eb8a53168ae918cbc mm3d-1.3.8.tar.gz --- mm3d-1.3.7-autoconf.patch DELETED --- --- mm3d-1.3.7-gcc44.patch DELETED --- From behdad at fedoraproject.org Tue Mar 10 08:07:39 2009 From: behdad at fedoraproject.org (Behdad Esfahbod) Date: Tue, 10 Mar 2009 08:07:39 +0000 (UTC) Subject: rpms/fontconfig/devel .cvsignore, 1.38, 1.39 fontconfig.spec, 1.124, 1.125 sources, 1.39, 1.40 fontconfig-2.6.97-fix-provides-name.patch, 1.1, NONE Message-ID: <20090310080739.3D8107002E@cvs1.fedora.phx.redhat.com> Author: behdad Update of /cvs/pkgs/rpms/fontconfig/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5449 Modified Files: .cvsignore fontconfig.spec sources Removed Files: fontconfig-2.6.97-fix-provides-name.patch Log Message: * Tue Mar 10 2009 Behdad Esfahbod - 2.6.98-1.gb39c36a - Update to 2.6.98-1.gb39c36a Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fontconfig/devel/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 15 Feb 2009 22:31:22 -0000 1.38 +++ .cvsignore 10 Mar 2009 08:07:07 -0000 1.39 @@ -1 +1 @@ -fontconfig-2.6.97.tar.gz +fontconfig-2.6.98.tar.gz Index: fontconfig.spec =================================================================== RCS file: /cvs/pkgs/rpms/fontconfig/devel/fontconfig.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- fontconfig.spec 24 Feb 2009 17:47:44 -0000 1.124 +++ fontconfig.spec 10 Mar 2009 08:07:08 -0000 1.125 @@ -2,8 +2,8 @@ Summary: Font configuration and customization library Name: fontconfig -Version: 2.6.97 -Release: 5.g945d6a4%{?dist} +Version: 2.6.98 +Release: 1.gb39c36a%{?dist} License: MIT Group: System Environment/Libraries Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz @@ -11,9 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Source1: 25-no-bitmap-fedora.conf -# behdad has this in his local tree -Patch1: fontconfig-2.6.97-fix-provides-name.patch - BuildRequires: gawk BuildRequires: expat-devel BuildRequires: freetype-devel >= %{freetype_version} @@ -47,7 +44,6 @@ %prep %setup -q -%patch1 -p1 %build @@ -135,6 +131,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 10 2009 Behdad Esfahbod - 2.6.98-1.gb39c36a +- Update to 2.6.98-1.gb39c36a + * Tue Feb 24 2009 Fedora Release Engineering - 2.6.97-5.g945d6a4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fontconfig/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 15 Feb 2009 22:31:22 -0000 1.39 +++ sources 10 Mar 2009 08:07:08 -0000 1.40 @@ -1 +1 @@ -addd72182847a156db9f5f7aa7fb6e91 fontconfig-2.6.97.tar.gz +8468c848937965e13b66a88b0bf231b9 fontconfig-2.6.98.tar.gz --- fontconfig-2.6.97-fix-provides-name.patch DELETED --- From bskeggs at fedoraproject.org Tue Mar 10 08:15:07 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Tue, 10 Mar 2009 08:15:07 +0000 (UTC) Subject: rpms/kernel/devel drm-nouveau.patch, 1.22, 1.23 kernel.spec, 1.1403, 1.1404 Message-ID: <20090310081507.1B5DA7002E@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7509 Modified Files: drm-nouveau.patch kernel.spec Log Message: * Tue Mar 10 2009 Ben Skeggs - drm-nouveau.patch: more kms fixes/cleanups - now works decently on all the G8x chips I have drm-nouveau.patch: Index: drm-nouveau.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- drm-nouveau.patch 10 Mar 2009 04:50:48 -0000 1.22 +++ drm-nouveau.patch 10 Mar 2009 08:15:01 -0000 1.23 @@ -17688,10 +17688,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c new file mode 100644 -index 0000000..8a10dc9 +index 0000000..ef888b2 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c -@@ -0,0 +1,758 @@ +@@ -0,0 +1,768 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -18219,6 +18219,9 @@ + +static void nv50_crtc_commit(struct drm_crtc *drm_crtc) +{ ++ struct nouveau_crtc *crtc = to_nouveau_crtc(drm_crtc); ++ ++ nv50_crtc_blank(crtc, false); +} + +static bool nv50_crtc_mode_fixup(struct drm_crtc *drm_crtc, @@ -18267,25 +18270,29 @@ + + DRM_DEBUG("index %d\n", crtc->index); + -+ hsync_dur = mode->hsync_end - mode->hsync_start; -+ vsync_dur = mode->vsync_end - mode->vsync_start; -+ hsync_start_to_end = mode->htotal - mode->hsync_start; -+ vsync_start_to_end = mode->vtotal - mode->vsync_start; ++ hsync_dur = adjusted_mode->hsync_end - adjusted_mode->hsync_start; ++ vsync_dur = adjusted_mode->vsync_end - adjusted_mode->vsync_start; ++ hsync_start_to_end = adjusted_mode->htotal - adjusted_mode->hsync_start; ++ vsync_start_to_end = adjusted_mode->vtotal - adjusted_mode->vsync_start; + /* I can't give this a proper name, anyone else can? */ -+ hunk1 = mode->htotal - mode->hsync_start + mode->hdisplay; -+ vunk1 = mode->vtotal - mode->vsync_start + mode->vdisplay; -+ /* Another strange value, this time only for interlaced modes. */ -+ vunk2a = 2*mode->vtotal - mode->vsync_start + mode->vdisplay; -+ vunk2b = mode->vtotal - mode->vsync_start + mode->vtotal; ++ hunk1 = adjusted_mode->htotal - ++ adjusted_mode->hsync_start + adjusted_mode->hdisplay; ++ vunk1 = adjusted_mode->vtotal - ++ adjusted_mode->vsync_start + adjusted_mode->vdisplay; ++ /* Another strange value, this time only for interlaced adjusted_modes. */ ++ vunk2a = 2 * adjusted_mode->vtotal - ++ adjusted_mode->vsync_start + adjusted_mode->vdisplay; ++ vunk2b = adjusted_mode->vtotal - ++ adjusted_mode->vsync_start + adjusted_mode->vtotal; + -+ if (mode->flags & DRM_MODE_FLAG_INTERLACE) { ++ if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) { + vsync_dur /= 2; + vsync_start_to_end /= 2; + vunk1 /= 2; + vunk2a /= 2; + vunk2b /= 2; + /* magic */ -+ if (mode->flags & DRM_MODE_FLAG_DBLSCAN) { ++ if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN) { + vsync_start_to_end -= 1; + vunk1 -= 1; + vunk2a -= 1; @@ -18293,20 +18300,20 @@ + } + } + -+ OUT_MODE(NV50_CRTC0_CLOCK + offset, mode->clock | 0x800000); ++ OUT_MODE(NV50_CRTC0_CLOCK + offset, adjusted_mode->clock | 0x800000); + OUT_MODE(NV50_CRTC0_INTERLACE + offset, -+ (mode->flags & DRM_MODE_FLAG_INTERLACE) ? 2 : 0); ++ (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) ? 2 : 0); + OUT_MODE(NV50_CRTC0_DISPLAY_START + offset, 0); + OUT_MODE(NV50_CRTC0_UNK82C + offset, 0); + OUT_MODE(NV50_CRTC0_DISPLAY_TOTAL + offset, -+ mode->vtotal << 16 | mode->htotal); ++ adjusted_mode->vtotal << 16 | adjusted_mode->htotal); + OUT_MODE(NV50_CRTC0_SYNC_DURATION + offset, + (vsync_dur - 1) << 16 | (hsync_dur - 1)); + OUT_MODE(NV50_CRTC0_SYNC_START_TO_BLANK_END + offset, + (vsync_start_to_end - 1) << 16 | (hsync_start_to_end - 1)); + OUT_MODE(NV50_CRTC0_MODE_UNK1 + offset, + (vunk1 - 1) << 16 | (hunk1 - 1)); -+ if (mode->flags & DRM_MODE_FLAG_INTERLACE) { ++ if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) { + OUT_MODE(NV50_CRTC0_MODE_UNK2 + offset, + (vunk2b - 1) << 16 | (vunk2a - 1)); + } @@ -18339,6 +18346,9 @@ + + crtc->fb.offset = ngem->bo->offset - dev_priv->vm_vram_base; + ++ OUT_MODE(NV50_CRTC0_FB_OFFSET + offset, crtc->fb.offset >> 8); ++ OUT_MODE(0x864 + offset, 0); ++ + OUT_MODE(NV50_CRTC0_FB_SIZE + offset, + drm_fb->height << 16 | drm_fb->width); + @@ -18369,7 +18379,7 @@ + nv50_crtc_lut_load(crtc); + } + -+ nv50_crtc_blank(crtc, false); ++ OUT_MODE(NV50_UPDATE_DISPLAY, 0); + return 0; +} + @@ -18452,7 +18462,7 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_cursor.c b/drivers/gpu/drm/nouveau/nv50_cursor.c new file mode 100644 -index 0000000..5a3cedc +index 0000000..10736de --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_cursor.c @@ -0,0 +1,217 @@ @@ -18557,10 +18567,10 @@ + return -EINVAL; + } + -+ OUT_MODE(NV50_CRTC0_CURSOR_CTRL + offset, NV50_CRTC0_CURSOR_CTRL_SHOW); + if (dev_priv->chipset != 0x50) + OUT_MODE(NV84_CRTC0_CURSOR_DMA + offset, + NV84_CRTC0_CURSOR_DMA_LOCAL); ++ OUT_MODE(NV50_CRTC0_CURSOR_CTRL + offset, NV50_CRTC0_CURSOR_CTRL_SHOW); + + if (update) { + OUT_MODE(NV50_UPDATE_DISPLAY, 0); @@ -42474,10 +42484,10 @@ +} diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c new file mode 100644 -index 0000000..fd29ffc +index 0000000..a147fb6 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_sor.c -@@ -0,0 +1,275 @@ +@@ -0,0 +1,274 @@ +/* + * Copyright (C) 2008 Maarten Maathuis. + * All Rights Reserved. @@ -42524,7 +42534,6 @@ + DRM_DEBUG("Disconnecting SOR %d\n", encoder->or); + + OUT_MODE(NV50_SOR0_MODE_CTRL + offset, NV50_SOR_MODE_CTRL_OFF); -+ OUT_MODE(NV50_UPDATE_DISPLAY, 0); +} + +static int Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1403 retrieving revision 1.1404 diff -u -r1.1403 -r1.1404 --- kernel.spec 10 Mar 2009 04:50:51 -0000 1.1403 +++ kernel.spec 10 Mar 2009 08:15:05 -0000 1.1404 @@ -1811,6 +1811,10 @@ %changelog * Tue Mar 10 2009 Ben Skeggs +- drm-nouveau.patch: more kms fixes/cleanups +- now works decently on all the G8x chips I have + +* Tue Mar 10 2009 Ben Skeggs - drm-nouveau.patch: another 8800GTX kms fix * Tue Mar 10 2009 Ben Skeggs From giallu at fedoraproject.org Tue Mar 10 08:03:08 2009 From: giallu at fedoraproject.org (Gianluca Sforna) Date: Tue, 10 Mar 2009 08:03:08 +0000 (UTC) Subject: rpms/alleyoop/devel .cvsignore, 1.3, 1.4 alleyoop.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <20090310080308.CDA9D7002E@cvs1.fedora.phx.redhat.com> Author: giallu Update of /cvs/extras/rpms/alleyoop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4089 Modified Files: .cvsignore alleyoop.spec sources Log Message: * Mon Mar 9 2009 Gianluca Sforna - 0.9.5-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/alleyoop/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Feb 2009 10:10:50 -0000 1.3 +++ .cvsignore 10 Mar 2009 08:03:06 -0000 1.4 @@ -1 +1 @@ -alleyoop-0.9.4.tar.gz +alleyoop-0.9.5.tar.gz Index: alleyoop.spec =================================================================== RCS file: /cvs/extras/rpms/alleyoop/devel/alleyoop.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- alleyoop.spec 25 Feb 2009 14:46:00 -0000 1.6 +++ alleyoop.spec 10 Mar 2009 08:03:06 -0000 1.7 @@ -1,6 +1,6 @@ Name: alleyoop -Version: 0.9.4 -Release: 3%{?dist} +Version: 0.9.5 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools Summary: Graphical front-end to the Valgrind memory checker for x86 @@ -68,6 +68,9 @@ %changelog +* Mon Mar 9 2009 Gianluca Sforna - 0.9.5-1 +- New upstream version + * Wed Feb 25 2009 Gianluca Sforna - 0.9.4-3 - Don't mark schemas as %%config Index: sources =================================================================== RCS file: /cvs/extras/rpms/alleyoop/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Feb 2009 10:10:50 -0000 1.3 +++ sources 10 Mar 2009 08:03:06 -0000 1.4 @@ -1 +1 @@ -beb7fbdecc593301f453997e51bf46cc alleyoop-0.9.4.tar.gz +ec9b0dd29087473c34591d0d11327530 alleyoop-0.9.5.tar.gz From jorton at fedoraproject.org Tue Mar 10 08:41:44 2009 From: jorton at fedoraproject.org (Joe Orton) Date: Tue, 10 Mar 2009 08:41:44 +0000 (UTC) Subject: rpms/libidn/devel libidn-1.9.tar.gz.sig, NONE, 1.1 .cvsignore, 1.27, 1.28 libidn.spec, 1.50, 1.51 mirrors, 1.1, 1.2 sources, 1.28, 1.29 upstream, 1.18, 1.19 libidn-0.6.14-aconf262.patch, 1.1, NONE libidn-0.6.14-include-next.patch, 1.1, NONE Message-ID: <20090310084144.4909970132@cvs1.fedora.phx.redhat.com> Author: jorton Update of /cvs/extras/rpms/libidn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13774 Modified Files: .cvsignore libidn.spec mirrors sources upstream Added Files: libidn-1.9.tar.gz.sig Removed Files: libidn-0.6.14-aconf262.patch libidn-0.6.14-include-next.patch Log Message: * Tue Mar 10 2009 Joe Orton 1.9-1 - update to 1.9 (#302111) - update License to reflect GPLv3+ binaries, LGPLv2+ library --- NEW FILE libidn-1.9.tar.gz.sig --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iOoEAAECADQFAkhqWXotFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvjn8E/iCct48j/lxCfxz7VCCHH/zad/EA 3bfxHbo8zO7I3pdk4a/Q7pOM5mXWqmf87YVfkx513WMNKs+4QjnzM9bhUUeayMEm njEFVGN3b6qMpVQxco58ztHZOsfdu9SfZ81qyM1234CXVzEkbsJe065xqCoRmX1Y SZbNKWfHme6prO9nkAPQ2YLRXFPfkklB0dR4GxVcsUJ0Pp0hoyobb6i+ouU= =ABeW -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libidn/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 26 Jul 2007 13:51:41 -0000 1.27 +++ .cvsignore 10 Mar 2009 08:41:09 -0000 1.28 @@ -1,4 +1 @@ -libidn-0.6.14.tar.gz -libidn-0.6.14 -x86_64 -clog +libidn-1.9.tar.gz Index: libidn.spec =================================================================== RCS file: /cvs/extras/rpms/libidn/devel/libidn.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- libidn.spec 25 Feb 2009 15:49:29 -0000 1.50 +++ libidn.spec 10 Mar 2009 08:41:10 -0000 1.51 @@ -1,12 +1,10 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.6.14 -Release: 10 +Version: 1.9 +Release: 1 URL: http://www.gnu.org/software/libidn/ -License: LGPLv2+ +License: LGPLv2+ and GPLv3+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz -Patch0: libidn-0.6.14-aconf262.patch -Patch1: libidn-0.6.14-include-next.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, gettext, libtool, autoconf @@ -33,8 +31,6 @@ %prep %setup -q -%patch0 -p1 -b .aconf262 -%patch1 -p1 -b .include-next-fix # Name directory sections consistently in the info file, #209491 sed -i '/^INFO-DIR-SECTION/{s/GNU Libraries/Libraries/;s/GNU utilities/Utilities/;}' doc/libidn.info @@ -44,9 +40,7 @@ %build # Must re-bootstrap to get multilib-aware libtool -libtoolize --force --copy -aclocal -I m4 -I gl/m4 -I lib/gl/m4 -autoheader && autoconf && automake +autoreconf %configure --disable-csharp --disable-static --libdir=/%{_lib} make %{?_smp_mflags} @@ -114,6 +108,10 @@ %{_mandir}/man3/* %changelog +* Tue Mar 10 2009 Joe Orton 1.9-1 +- update to 1.9 (#302111) +- update License to reflect GPLv3+ binaries, LGPLv2+ library + * Wed Feb 25 2009 Fedora Release Engineering - 0.6.14-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: mirrors =================================================================== RCS file: /cvs/extras/rpms/libidn/devel/mirrors,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mirrors 7 Oct 2004 16:00:22 -0000 1.1 +++ mirrors 10 Mar 2009 08:41:10 -0000 1.2 @@ -1 +1 @@ -http://josefsson.org/libidn/releases/ +http://ftp.gnu.org/gnu/libidn/ Index: sources =================================================================== RCS file: /cvs/extras/rpms/libidn/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 26 Jul 2007 13:51:41 -0000 1.28 +++ sources 10 Mar 2009 08:41:11 -0000 1.29 @@ -1 +1 @@ -040f012a45feb56168853998bb87ad4d libidn-0.6.14.tar.gz +f4d794639564256a367566302611224e libidn-1.9.tar.gz Index: upstream =================================================================== RCS file: /cvs/extras/rpms/libidn/devel/upstream,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- upstream 26 Jul 2007 13:51:41 -0000 1.18 +++ upstream 10 Mar 2009 08:41:11 -0000 1.19 @@ -1 +1 @@ -libidn-0.6.14.tar.gz +libidn-1.9.tar.gz --- libidn-0.6.14-aconf262.patch DELETED --- --- libidn-0.6.14-include-next.patch DELETED --- From jorton at fedoraproject.org Tue Mar 10 08:44:02 2009 From: jorton at fedoraproject.org (Joe Orton) Date: Tue, 10 Mar 2009 08:44:02 +0000 (UTC) Subject: rpms/libidn/devel libidn-0.6.14.tar.gz.sig,1.1,NONE Message-ID: <20090310084402.8140C7002E@cvs1.fedora.phx.redhat.com> Author: jorton Update of /cvs/extras/rpms/libidn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14992 Removed Files: libidn-0.6.14.tar.gz.sig Log Message: - remove old sig file --- libidn-0.6.14.tar.gz.sig DELETED --- From jorton at fedoraproject.org Tue Mar 10 08:47:20 2009 From: jorton at fedoraproject.org (Joe Orton) Date: Tue, 10 Mar 2009 08:47:20 +0000 (UTC) Subject: rpms/libidn/devel libidn.spec,1.51,1.52 Message-ID: <20090310084720.775FD7002E@cvs1.fedora.phx.redhat.com> Author: jorton Update of /cvs/extras/rpms/libidn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15819 Modified Files: libidn.spec Log Message: bump release Index: libidn.spec =================================================================== RCS file: /cvs/extras/rpms/libidn/devel/libidn.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- libidn.spec 10 Mar 2009 08:41:10 -0000 1.51 +++ libidn.spec 10 Mar 2009 08:46:49 -0000 1.52 @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.9 -Release: 1 +Release: 2 URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -108,7 +108,7 @@ %{_mandir}/man3/* %changelog -* Tue Mar 10 2009 Joe Orton 1.9-1 +* Tue Mar 10 2009 Joe Orton 1.9-2 - update to 1.9 (#302111) - update License to reflect GPLv3+ binaries, LGPLv2+ library From sharkcz at fedoraproject.org Tue Mar 10 08:54:07 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Tue, 10 Mar 2009 08:54:07 +0000 (UTC) Subject: rpms/mm3d/F-10 .cvsignore, 1.2, 1.3 mm3d.spec, 1.1, 1.2 sources, 1.2, 1.3 mm3d-1.3.7-autoconf.patch, 1.1, NONE Message-ID: <20090310085407.76D887002E@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/mm3d/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17489 Modified Files: .cvsignore mm3d.spec sources Removed Files: mm3d-1.3.7-autoconf.patch Log Message: * Tue Mar 10 2009 Dan Hor??k 1.3.8-1 - update to 1.3.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mm3d/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Jul 2008 06:06:52 -0000 1.2 +++ .cvsignore 10 Mar 2009 08:53:35 -0000 1.3 @@ -1,3 +1,3 @@ ad3dsfilter-0.8.1.tar.gz imtex-1.4.0.tar.gz -mm3d-1.3.7.tar.gz +mm3d-1.3.8.tar.gz Index: mm3d.spec =================================================================== RCS file: /cvs/pkgs/rpms/mm3d/F-10/mm3d.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mm3d.spec 5 Jul 2008 06:06:52 -0000 1.1 +++ mm3d.spec 10 Mar 2009 08:53:36 -0000 1.2 @@ -4,8 +4,8 @@ %define major_version 1.3 Name: mm3d -Version: 1.3.7 -Release: 2%{?dist} +Version: 1.3.8 +Release: 1%{?dist} Summary: 3D model editor Group: Applications/Multimedia @@ -16,7 +16,6 @@ Source10: http://www.misfitcode.com/misfitmodel3d/download/plugins/ad3dsfilter-%{plugin_3ds_ver}.tar.gz Source11: http://www.misfitcode.com/misfitmodel3d/download/plugins/imtex-%{plugin_imtex_ver}.tar.gz Patch0: mm3d-1.3.6-sighandler.patch -Patch1: mm3d-1.3.7-autoconf.patch Patch10: mm3d-ad3dsfilter-make.patch Patch11: mm3d-imtex-make.patch Patch12: mm3d-imtex-gcc43.patch @@ -40,7 +39,6 @@ %setup -q -a 10 -a 11 %patch0 -b .sigh -%patch1 -p1 -b .autoconf %patch10 -b .ad3ds %patch11 -b .imtex @@ -115,11 +113,14 @@ %changelog -* Fri Jun 4 2008 Dan Horak 1.3.7-2 +* Tue Mar 10 2009 Dan Hor??k 1.3.8-1 +- update to 1.3.8 + +* Fri Jun 4 2008 Dan Hor??k 1.3.7-2 - fix plugin installation directory - change how the docs are installed - fix DocPath in the desktop file - add scriptlets for updating the desktop database -* Tue Jun 1 2008 Dan Horak 1.3.7-1 +* Tue Jun 1 2008 Dan Hor??k 1.3.7-1 - initial Fedora version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mm3d/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Jul 2008 06:06:52 -0000 1.2 +++ sources 10 Mar 2009 08:53:36 -0000 1.3 @@ -1,3 +1,3 @@ d0d7be8bd51e912f1ef8bd4e122855d1 ad3dsfilter-0.8.1.tar.gz 4b26d78210d251bc4f9fc392123ea02a imtex-1.4.0.tar.gz -6a5467d03d61a23af1ab51c47109c4d5 mm3d-1.3.7.tar.gz +c7b64a9f4320b28eb8a53168ae918cbc mm3d-1.3.8.tar.gz --- mm3d-1.3.7-autoconf.patch DELETED --- From jorton at fedoraproject.org Tue Mar 10 08:58:54 2009 From: jorton at fedoraproject.org (Joe Orton) Date: Tue, 10 Mar 2009 08:58:54 +0000 (UTC) Subject: rpms/libidn/devel libidn.spec,1.52,1.53 Message-ID: <20090310085855.036847002E@cvs1.fedora.phx.redhat.com> Author: jorton Update of /cvs/extras/rpms/libidn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18231 Modified Files: libidn.spec Log Message: - autoreconf fix Index: libidn.spec =================================================================== RCS file: /cvs/extras/rpms/libidn/devel/libidn.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- libidn.spec 10 Mar 2009 08:46:49 -0000 1.52 +++ libidn.spec 10 Mar 2009 08:58:24 -0000 1.53 @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.9 -Release: 2 +Release: 3 URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -40,7 +40,7 @@ %build # Must re-bootstrap to get multilib-aware libtool -autoreconf +autoreconf -i %configure --disable-csharp --disable-static --libdir=/%{_lib} make %{?_smp_mflags} From sharkcz at fedoraproject.org Tue Mar 10 09:07:26 2009 From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=) Date: Tue, 10 Mar 2009 09:07:26 +0000 (UTC) Subject: rpms/mm3d/F-9 .cvsignore, 1.2, 1.3 mm3d.spec, 1.1, 1.2 sources, 1.2, 1.3 mm3d-1.3.7-autoconf.patch, 1.1, NONE Message-ID: <20090310090726.378ED7002E@cvs1.fedora.phx.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/mm3d/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19931 Modified Files: .cvsignore mm3d.spec sources Removed Files: mm3d-1.3.7-autoconf.patch Log Message: * Tue Mar 10 2009 Dan Hor??k 1.3.8-1 - update to 1.3.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mm3d/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Jul 2008 06:10:11 -0000 1.2 +++ .cvsignore 10 Mar 2009 09:06:55 -0000 1.3 @@ -1,3 +1,3 @@ ad3dsfilter-0.8.1.tar.gz imtex-1.4.0.tar.gz -mm3d-1.3.7.tar.gz +mm3d-1.3.8.tar.gz Index: mm3d.spec =================================================================== RCS file: /cvs/pkgs/rpms/mm3d/F-9/mm3d.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mm3d.spec 5 Jul 2008 06:10:11 -0000 1.1 +++ mm3d.spec 10 Mar 2009 09:06:55 -0000 1.2 @@ -4,8 +4,8 @@ %define major_version 1.3 Name: mm3d -Version: 1.3.7 -Release: 2%{?dist} +Version: 1.3.8 +Release: 1%{?dist} Summary: 3D model editor Group: Applications/Multimedia @@ -16,7 +16,6 @@ Source10: http://www.misfitcode.com/misfitmodel3d/download/plugins/ad3dsfilter-%{plugin_3ds_ver}.tar.gz Source11: http://www.misfitcode.com/misfitmodel3d/download/plugins/imtex-%{plugin_imtex_ver}.tar.gz Patch0: mm3d-1.3.6-sighandler.patch -Patch1: mm3d-1.3.7-autoconf.patch Patch10: mm3d-ad3dsfilter-make.patch Patch11: mm3d-imtex-make.patch Patch12: mm3d-imtex-gcc43.patch @@ -40,7 +39,6 @@ %setup -q -a 10 -a 11 %patch0 -b .sigh -%patch1 -p1 -b .autoconf %patch10 -b .ad3ds %patch11 -b .imtex @@ -115,11 +113,14 @@ %changelog -* Fri Jun 4 2008 Dan Horak 1.3.7-2 +* Tue Mar 10 2009 Dan Hor??k 1.3.8-1 +- update to 1.3.8 + +* Fri Jun 4 2008 Dan Hor??k 1.3.7-2 - fix plugin installation directory - change how the docs are installed - fix DocPath in the desktop file - add scriptlets for updating the desktop database -* Tue Jun 1 2008 Dan Horak 1.3.7-1 +* Tue Jun 1 2008 Dan Hor??k 1.3.7-1 - initial Fedora version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mm3d/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Jul 2008 06:10:11 -0000 1.2 +++ sources 10 Mar 2009 09:06:55 -0000 1.3 @@ -1,3 +1,3 @@ d0d7be8bd51e912f1ef8bd4e122855d1 ad3dsfilter-0.8.1.tar.gz 4b26d78210d251bc4f9fc392123ea02a imtex-1.4.0.tar.gz -6a5467d03d61a23af1ab51c47109c4d5 mm3d-1.3.7.tar.gz +c7b64a9f4320b28eb8a53168ae918cbc mm3d-1.3.8.tar.gz --- mm3d-1.3.7-autoconf.patch DELETED --- From pkgdb at fedoraproject.org Tue Mar 10 09:09:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:09:26 +0000 Subject: [pkgdb] openssh ownership updated Message-ID: <20090310090946.E9EE3208510@bastion.fedora.phx.redhat.com> Package openssh in Fedora devel was orphaned by tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 09:08:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:08:47 +0000 Subject: [pkgdb] openssh ownership updated Message-ID: <20090310090952.C7788208556@bastion.fedora.phx.redhat.com> Package openssh in Fedora 9 was orphaned by tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 09:09:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:09:35 +0000 Subject: [pkgdb] openssh ownership updated Message-ID: <20090310090955.D6F8120860F@bastion.fedora.phx.redhat.com> Package openssh in Fedora 10 was orphaned by tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 09:11:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:11:07 +0000 Subject: [pkgdb] openssh: jfch2222 has requested watchcommits Message-ID: <20090310091127.6A2DE208504@bastion.fedora.phx.redhat.com> jfch2222 has requested the watchcommits acl on openssh (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 09:11:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:11:31 +0000 Subject: [pkgdb] openssh: jfch2222 has requested commit Message-ID: <20090310091131.3FBD6208510@bastion.fedora.phx.redhat.com> jfch2222 has requested the commit acl on openssh (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From jorton at fedoraproject.org Tue Mar 10 09:11:23 2009 From: jorton at fedoraproject.org (Joe Orton) Date: Tue, 10 Mar 2009 09:11:23 +0000 (UTC) Subject: rpms/libidn/devel libidn.spec,1.53,1.54 Message-ID: <20090310091123.8C3BA7002E@cvs1.fedora.phx.redhat.com> Author: jorton Update of /cvs/extras/rpms/libidn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20796 Modified Files: libidn.spec Log Message: - drop ChangeLog from %doc - drop autoreconf entirely Index: libidn.spec =================================================================== RCS file: /cvs/extras/rpms/libidn/devel/libidn.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- libidn.spec 10 Mar 2009 08:58:24 -0000 1.53 +++ libidn.spec 10 Mar 2009 09:10:52 -0000 1.54 @@ -1,13 +1,13 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 1.9 -Release: 3 +Release: 4 URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pkgconfig, gettext, libtool, autoconf +BuildRequires: pkgconfig, gettext Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Requires(postun): /sbin/ldconfig @@ -39,8 +39,6 @@ mv iconv.tmp doc/libidn.info %build -# Must re-bootstrap to get multilib-aware libtool -autoreconf -i %configure --disable-csharp --disable-static --libdir=/%{_lib} make %{?_smp_mflags} @@ -92,7 +90,7 @@ %files -f %{name}.lang %defattr(-,root,root) -%doc ChangeLog NEWS FAQ README THANKS COPYING* +%doc AUTHORS NEWS FAQ README THANKS COPYING* %{_bindir}/idn %{_mandir}/man1/idn.1* %{_datadir}/emacs/site-lisp @@ -108,7 +106,7 @@ %{_mandir}/man3/* %changelog -* Tue Mar 10 2009 Joe Orton 1.9-2 +* Tue Mar 10 2009 Joe Orton 1.9-4 - update to 1.9 (#302111) - update License to reflect GPLv3+ binaries, LGPLv2+ library From pkgdb at fedoraproject.org Tue Mar 10 09:21:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:21:33 +0000 Subject: [pkgdb] openssh ownership updated Message-ID: <20090310092153.580E1208510@bastion.fedora.phx.redhat.com> Package openssh in Fedora devel is now owned by tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 09:22:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:22:16 +0000 Subject: [pkgdb] svnkit: akurtakov has requested watchbugzilla Message-ID: <20090310092321.B0153208552@bastion.fedora.phx.redhat.com> akurtakov has requested the watchbugzilla acl on svnkit (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/svnkit From pkgdb at fedoraproject.org Tue Mar 10 09:23:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:23:23 +0000 Subject: [pkgdb] svnkit: akurtakov has requested watchcommits Message-ID: <20090310092321.2F877208514@bastion.fedora.phx.redhat.com> akurtakov has requested the watchcommits acl on svnkit (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/svnkit From pkgdb at fedoraproject.org Tue Mar 10 09:23:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:23:04 +0000 Subject: [pkgdb] svnkit: akurtakov has requested commit Message-ID: <20090310092324.349DA208555@bastion.fedora.phx.redhat.com> akurtakov has requested the commit acl on svnkit (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/svnkit From pkgdb at fedoraproject.org Tue Mar 10 09:23:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:23:56 +0000 Subject: [pkgdb] libeXosip2 ownership updated Message-ID: <20090310092354.1654C208503@bastion.fedora.phx.redhat.com> Package libeXosip2 in Fedora devel is now owned by rakesh To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:23:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:23:46 +0000 Subject: [pkgdb] libeXosip2 ownership updated Message-ID: <20090310092407.6D468208552@bastion.fedora.phx.redhat.com> Package libeXosip2 in Fedora 10 is now owned by rakesh To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:24:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:24:38 +0000 Subject: [pkgdb] eclipse-subclipse: akurtakov has requested watchcommits Message-ID: <20090310092436.2C7FA208510@bastion.fedora.phx.redhat.com> akurtakov has requested the watchcommits acl on eclipse-subclipse (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-subclipse From pkgdb at fedoraproject.org Tue Mar 10 09:26:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:26:40 +0000 Subject: [pkgdb] libeXosip2 ownership updated Message-ID: <20090310092700.BD9A3208503@bastion.fedora.phx.redhat.com> Package libeXosip2 in Fedora 9 is now owned by rakesh To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From denis at fedoraproject.org Tue Mar 10 09:28:31 2009 From: denis at fedoraproject.org (Denis Leroy) Date: Tue, 10 Mar 2009 09:28:31 +0000 (UTC) Subject: rpms/k3d/devel k3d-0.7.10.0-fontpath.patch, NONE, 1.1 k3d-0.7.10.0-potfiles.patch, NONE, 1.1 k3d-0.7.10.0-warn.patch, NONE, 1.1 k3d.desktop, NONE, 1.1 .cvsignore, 1.10, 1.11 k3d.spec, 1.26, 1.27 sources, 1.10, 1.11 k3d-0.5.15.0-gl64.patch, 1.2, NONE k3d-0.6.6.0-vfs.patch, 1.1, NONE k3d-0.6.7.0-desktop.patch, 1.1, NONE k3d-0.6.7.0-gcc43.patch, 1.2, NONE k3d-0.6.7.0-sigc2.patch, 1.1, NONE Message-ID: <20090310092832.0E6C77002E@cvs1.fedora.phx.redhat.com> Author: denis Update of /cvs/pkgs/rpms/k3d/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25204 Modified Files: .cvsignore k3d.spec sources Added Files: k3d-0.7.10.0-fontpath.patch k3d-0.7.10.0-potfiles.patch k3d-0.7.10.0-warn.patch k3d.desktop Removed Files: k3d-0.5.15.0-gl64.patch k3d-0.6.6.0-vfs.patch k3d-0.6.7.0-desktop.patch k3d-0.6.7.0-gcc43.patch k3d-0.6.7.0-sigc2.patch Log Message: - Update to upstream 0.7.10.0 - Build system now based on cmake - All patches upstreamed or obsoleted - Added potfiles file list patch fix - Removed example subpackage - Removed packaged bitstream fonts, use Fedora ones instead k3d-0.7.10.0-fontpath.patch: --- NEW FILE k3d-0.7.10.0-fontpath.patch --- diff -ur k3d-source-0.7.10.0.orig/modules/annotation/annotation_2d.cpp k3d-source-0.7.10.0/modules/annotation/annotation_2d.cpp --- k3d-source-0.7.10.0.orig/modules/annotation/annotation_2d.cpp 2008-12-14 22:03:53.000000000 +0100 +++ k3d-source-0.7.10.0/modules/annotation/annotation_2d.cpp 2009-03-10 09:29:17.000000000 +0100 @@ -57,7 +57,7 @@ public: annotation_2d(k3d::iplugin_factory& Factory, k3d::idocument& Document) : base(Factory, Document), - m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), + m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), m_line_width(init_owner(*this) + init_name("line_width") + init_label(_("Line Width")) + init_description(_("Maximum width of a single line of text..")) + init_value(200.0)), m_line_spacing(init_owner(*this) + init_name("line_spacing") + init_label(_("Line Spacing")) + init_description(_("Controls the spacing between lines of text.")) + init_value(1.0)), diff -ur k3d-source-0.7.10.0.orig/modules/annotation/annotation_3d.cpp k3d-source-0.7.10.0/modules/annotation/annotation_3d.cpp --- k3d-source-0.7.10.0.orig/modules/annotation/annotation_3d.cpp 2008-12-14 22:03:53.000000000 +0100 +++ k3d-source-0.7.10.0/modules/annotation/annotation_3d.cpp 2009-03-10 09:29:17.000000000 +0100 @@ -57,7 +57,7 @@ public: annotation_3d(k3d::iplugin_factory& Factory, k3d::idocument& Document) : base(Factory, Document), - m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), + m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), m_line_width(init_owner(*this) + init_name("line_width") + init_label(_("Line Width")) + init_description(_("Maximum width of a single line of text..")) + init_value(200.0)), m_line_spacing(init_owner(*this) + init_name("line_spacing") + init_label(_("Line Spacing")) + init_description(_("Controls the spacing between lines of text.")) + init_value(1.0)), diff -ur k3d-source-0.7.10.0.orig/modules/annotation/annotation.cpp k3d-source-0.7.10.0/modules/annotation/annotation.cpp --- k3d-source-0.7.10.0.orig/modules/annotation/annotation.cpp 2008-12-14 22:03:53.000000000 +0100 +++ k3d-source-0.7.10.0/modules/annotation/annotation.cpp 2009-03-10 09:29:17.000000000 +0100 @@ -55,7 +55,7 @@ public: annotation(k3d::iplugin_factory& Factory, k3d::idocument& Document) : base(Factory, Document), - m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), + m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), m_line_width(init_owner(*this) + init_name("line_width") + init_label(_("Line Width")) + init_description(_("Maximum width of a single line of text..")) + init_value(200.0)), m_line_spacing(init_owner(*this) + init_name("line_spacing") + init_label(_("Line Spacing")) + init_description(_("Controls the spacing between lines of text.")) + init_value(1.0)), diff -ur k3d-source-0.7.10.0.orig/modules/core/axes.cpp k3d-source-0.7.10.0/modules/core/axes.cpp --- k3d-source-0.7.10.0.orig/modules/core/axes.cpp 2008-12-14 22:03:50.000000000 +0100 +++ k3d-source-0.7.10.0/modules/core/axes.cpp 2009-03-10 09:29:17.000000000 +0100 @@ -67,7 +67,7 @@ m_y_color(init_owner(*this) + init_name("ycolor") + init_label(_("Y Color")) + init_description(_("Y axis color")) + init_value(k3d::color(0, 0.7, 0))), m_z_color(init_owner(*this) + init_name("zcolor") + init_label(_("Z Color")) + init_description(_("Z axis color")) + init_value(k3d::color(0, 0, 0.7))), m_grid_color(init_owner(*this) + init_name("gridcolor") + init_label(_("Grid Color")) + init_description(_("Grid color")) + init_value(k3d::color(0.4, 0.4, 0.4))), - m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/Vera.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), + m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/Vera.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(12.0)) { m_axes.changed_signal().connect(make_async_redraw_slot()); diff -ur k3d-source-0.7.10.0.orig/modules/freetype2/poly_text.cpp k3d-source-0.7.10.0/modules/freetype2/poly_text.cpp --- k3d-source-0.7.10.0.orig/modules/freetype2/poly_text.cpp 2008-12-14 22:03:50.000000000 +0100 +++ k3d-source-0.7.10.0/modules/freetype2/poly_text.cpp 2009-03-10 09:29:17.000000000 +0100 @@ -51,7 +51,7 @@ const k3d::filesystem::path default_font() { - return k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf"); + return k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf"); } /// Defines a closed contour diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/edge_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/edge_numbering_painter.cpp --- k3d-source-0.7.10.0.orig/modules/opengl_painters/edge_numbering_painter.cpp 2008-12-14 22:03:51.000000000 +0100 +++ k3d-source-0.7.10.0/modules/opengl_painters/edge_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100 @@ -57,7 +57,7 @@ public: edge_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) : base(Factory, Document), - m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), + m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)), m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected polygons.")) + init_value(true)), diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/face_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/face_numbering_painter.cpp --- k3d-source-0.7.10.0.orig/modules/opengl_painters/face_numbering_painter.cpp 2008-12-14 22:03:52.000000000 +0100 +++ k3d-source-0.7.10.0/modules/opengl_painters/face_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100 @@ -57,7 +57,7 @@ public: face_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) : base(Factory, Document), - m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), + m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)), m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected polygons")) + init_value(true)), diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_curve_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/nurbs_curve_numbering_painter.cpp --- k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_curve_numbering_painter.cpp 2008-12-14 22:03:52.000000000 +0100 +++ k3d-source-0.7.10.0/modules/opengl_painters/nurbs_curve_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100 @@ -57,7 +57,7 @@ public: nurbs_curve_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) : base(Factory, Document), - m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), + m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)), m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected curves.")) + init_value(true)), diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_patch_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/nurbs_patch_numbering_painter.cpp --- k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_patch_numbering_painter.cpp 2008-12-14 22:03:52.000000000 +0100 +++ k3d-source-0.7.10.0/modules/opengl_painters/nurbs_patch_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100 @@ -57,7 +57,7 @@ public: nurbs_patch_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) : base(Factory, Document), - m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), + m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)), m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected patches.")) + init_value(true)), diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/point_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/point_numbering_painter.cpp --- k3d-source-0.7.10.0.orig/modules/opengl_painters/point_numbering_painter.cpp 2008-12-14 22:03:51.000000000 +0100 +++ k3d-source-0.7.10.0/modules/opengl_painters/point_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100 @@ -57,7 +57,7 @@ public: point_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) : base(Factory, Document), - m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), + m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)), m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected polygons")) + init_value(true)), diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/varying_data_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/varying_data_painter.cpp --- k3d-source-0.7.10.0.orig/modules/opengl_painters/varying_data_painter.cpp 2008-12-14 22:03:51.000000000 +0100 +++ k3d-source-0.7.10.0/modules/opengl_painters/varying_data_painter.cpp 2009-03-10 09:29:17.000000000 +0100 @@ -82,7 +82,7 @@ public: varying_data_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) : base(Factory, Document), - m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), + m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)), m_color(init_owner(*this) + init_name("color") + init_label(_("Color")) + init_description(_("Color of the text")) + init_value(k3d::color(0, 1, 0))), diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/vertex_data_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/vertex_data_painter.cpp --- k3d-source-0.7.10.0.orig/modules/opengl_painters/vertex_data_painter.cpp 2008-12-14 22:03:52.000000000 +0100 +++ k3d-source-0.7.10.0/modules/opengl_painters/vertex_data_painter.cpp 2009-03-10 09:29:17.000000000 +0100 @@ -80,7 +80,7 @@ public: vertex_data_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) : base(Factory, Document), - m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), + m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())), m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)), m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)), m_color(init_owner(*this) + init_name("color") + init_label(_("Color")) + init_description(_("Color of the numbers")) + init_value(k3d::color(0.5, 0, 0))), k3d-0.7.10.0-potfiles.patch: --- NEW FILE k3d-0.7.10.0-potfiles.patch --- --- k3d-source-0.7.10.0/po/POTFILES.in~ 2008-12-14 22:03:53.000000000 +0100 +++ k3d-source-0.7.10.0/po/POTFILES.in 2009-01-21 10:47:19.000000000 +0100 @@ -1,6 +1,5 @@ application/k3d_main.cpp application/main.cpp -bug-buddy/main.cpp k3dsdk/bitmap_modifier.h k3dsdk/bitmap_sink.h k3dsdk/bitmap_source.h @@ -185,10 +184,10 @@ modules/jpeg_io/bitmap_importer.cpp modules/jpeg_io/bitmap_reader.cpp modules/jpeg_io/bitmap_writer.cpp -modules/k3d_io/k3d_document_exporter.cpp -modules/k3d_io/k3d_document_importer.cpp -modules/k3d_io/k3d_mesh_reader.cpp -modules/k3d_io/k3d_mesh_writer.cpp +modules/k3d_io/document_exporter.cpp +modules/k3d_io/document_importer.cpp +modules/k3d_io/mesh_reader.cpp +modules/k3d_io/mesh_writer.cpp modules/k3dscript/engine.cpp modules/linear_curve/knot_curve.cpp modules/linear_curve/lissajous_curve.cpp k3d-0.7.10.0-warn.patch: --- NEW FILE k3d-0.7.10.0-warn.patch --- --- k3d-source-0.7.10.0/share/shaders/k3d_functions.h~ 2008-12-14 22:03:49.000000000 +0100 +++ k3d-source-0.7.10.0/share/shaders/k3d_functions.h 2009-03-10 09:00:30.000000000 +0100 @@ -24,10 +24,3 @@ /* separate fuzzes */ #define smoothPulse2Fuzz(a, b, afuzz, bfuzz, loc) (smoothstep (a-afuzz, a, loc) - smoothstep (b, b+bfuzz, loc)) - - - - - - - \ No newline at end of file --- NEW FILE k3d.desktop --- [Desktop Entry] Encoding=UTF-8 Name=K-3D Name[sv_SE.ISO8859-15]=K-3D Comment=3D modeling and animation Comment[sv_SE.ISO8859-15]=3D modellering och animation Exec=/usr/bin/k3d Icon=/usr/share/k3d/icons/k3d.png Terminal=false Type=Application Categories=Application;Graphics; X-Desktop-File-Install-Version=0.15 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/k3d/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 9 Jul 2007 07:23:29 -0000 1.10 +++ .cvsignore 10 Mar 2009 09:27:58 -0000 1.11 @@ -1 +1 @@ -k3d-0.6.7.0-src.tar.bz2 +k3d-source-0.7.10.0.tar.gz Index: k3d.spec =================================================================== RCS file: /cvs/pkgs/rpms/k3d/devel/k3d.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- k3d.spec 25 Feb 2009 10:03:28 -0000 1.26 +++ k3d.spec 10 Mar 2009 09:27:59 -0000 1.27 @@ -1,22 +1,22 @@ Name: k3d -Version: 0.6.7.0 -Release: 10%{?dist} +Version: 0.7.10.0 +Release: 1%{?dist} Summary: A 3D Modeling, Animation and Rendering System Group: Applications/Multimedia License: GPLv2+ URL: http://www.k-3d.org/ -Source0: http://dl.sourceforge.net/k3d/k3d-%{version}-src.tar.bz2 -Patch0: k3d-0.5.15.0-gl64.patch -Patch1: k3d-0.6.6.0-vfs.patch -Patch2: k3d-0.6.7.0-desktop.patch -Patch3: k3d-0.6.7.0-gcc43.patch -Patch4: k3d-0.6.7.0-sigc2.patch +Source0: http://dl.sourceforge.net/k3d/k3d-source-%{version}.tar.gz +Source1: k3d.desktop +Patch0: k3d-0.7.10.0-potfiles.patch +Patch1: k3d-0.7.10.0-warn.patch +Patch2: k3d-0.7.10.0-fontpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: aqsis +BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: mesa-libGL-devel BuildRequires: expat-devel @@ -37,12 +37,18 @@ BuildRequires: librsvg2 BuildRequires: bzip2-devel BuildRequires: libtool +BuildRequires: libpng-devel +BuildRequires: cairomm-devel + +Requires: bitstream-vera-fonts Requires(post): /sbin/ldconfig Requires(post): desktop-file-utils Requires(postun): /sbin/ldconfig Requires(postun): desktop-file-utils +Obsoletes: k3d-examples < 0.7.10.0 + %description K-3D is a complete 3D modeling, animation and rendering system. K-3D @@ -63,49 +69,52 @@ rendering a model written by K-3D. -%package examples -Summary: Examples for K-3D -Group: Development/Demos - - -%description examples -This package contains examples of K-3D documents. - - %prep -%setup -q -%patch0 -p1 -b .gl64 -%patch1 -p1 -b .vfs -%patch2 -p1 -b .desktop -%patch3 -p1 -b .gcc43 -%patch4 -p1 -b .sigc2 +%setup -q -n k3d-source-%{version} +%patch0 -p 1 -b .potfiles +%patch1 -p 1 -b .warn +%patch2 -p 1 -b .fontpath %build -%configure --disable-static --with-external-boost -make %{?_smp_mflags} +mkdir b +cd b +%cmake .. +# Since our cmake macro disables rpath, we need to set some temp +# library paths as the build invokes some built binaries to generate +# proxy files. +export LD_LIBRARY_PATH=%{_builddir}/k3d-source-%{version}/b/lib:$LD_LIBRARY_PATH +echo LD_LIBRARY_PATH is $LD_LIBRARY_PATH +make VERBOSE=1 %{?_smp_mflags} %install - find -type f -regex '.*\.\(cpp\|h\|svg\)' -perm +111 -exec chmod -x {} ';' +rm -rf $RPM_BUILD_ROOT +cd b make install DESTDIR=$RPM_BUILD_ROOT +# Workaround for install bug +cp lib/libk3dsdk-python-primitives.so $RPM_BUILD_ROOT%{_libdir} +rm -fr $RPM_BUILD_ROOT%{_datadir}/k3d/locale/chef/LC_MESSAGES/k3d.mo +# Remove fonts, we use Fedora-shipped fonts instead +rm -fr $RPM_BUILD_ROOT${_datadir}/k3d/fonts find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' -desktop-file-install \ - --vendor fedora \ - --mode 644 \ - --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/k3d.desktop +desktop-file-install --vendor "fedora" \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT +%check +ctest + + %post /sbin/ldconfig update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : @@ -118,49 +127,29 @@ %files %defattr(-, root, root, -) -%doc AUTHORS COPYING NEWS README -%{_bindir}/k3d -%{_bindir}/k3d-[bd-z]* -%{_libdir}/libHapy.so.* -%{_libdir}/libk3dngui.so* -%{_libdir}/libk3dnui.so* -%{_libdir}/libk3dsdk.so.* -%{_libdir}/libsubdivision_surface.so.* -%{_libdir}/libsurface_polygonizer.so.* +%doc AUTHORS COPYING README +%{_bindir}/k3d* +%{_libdir}/*.so* %{_libdir}/k3d -%{_datadir}/applications/fedora-k3d.desktop -%dir %{_datadir}/k3d -%{_datadir}/k3d/*.k3d -%{_datadir}/k3d/fonts -%{_datadir}/k3d/icons -%{_datadir}/k3d/logo -%{_datadir}/k3d/lsystem -%{_datadir}/k3d/ngui -%{_datadir}/k3d/qtui -%{_datadir}/k3d/scripts -%{_datadir}/k3d/shaders -%{_datadir}/k3d/textures -%{_datadir}/k3d/tutorials +%{_datadir}/k3d %{_mandir}/man1/k3d* -%files examples -%defattr(-, root, root, -) -%{_datadir}/k3d/documents - - %files devel %defattr(-, root, root, -) -%doc ChangeLog -%{_bindir}/k3d-config %{_includedir}/k3d -%{_libdir}/libHapy.so -%{_libdir}/libk3dsdk.so -%{_libdir}/libsubdivision_surface.so -%{_libdir}/libsurface_polygonizer.so +%{_libdir}/*.so %changelog +* Wed Mar 4 2009 Denis Leroy - 0.7.10.0-1 +- Update to upstream 0.7.10.0 +- Build system now based on cmake +- All patches upstreamed or obsoleted +- Added potfiles file list patch fix +- Removed example subpackage +- Removed packaged bitstream fonts, use Fedora ones instead + * Wed Feb 25 2009 Fedora Release Engineering - 0.6.7.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/k3d/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 9 Jul 2007 07:23:29 -0000 1.10 +++ sources 10 Mar 2009 09:27:59 -0000 1.11 @@ -1 +1 @@ -0031402206dab46b563d149eac2324db k3d-0.6.7.0-src.tar.bz2 +52736c4e2d3df11af741ed356f8bc448 k3d-source-0.7.10.0.tar.gz --- k3d-0.5.15.0-gl64.patch DELETED --- --- k3d-0.6.6.0-vfs.patch DELETED --- --- k3d-0.6.7.0-desktop.patch DELETED --- --- k3d-0.6.7.0-gcc43.patch DELETED --- --- k3d-0.6.7.0-sigc2.patch DELETED --- From pkgdb at fedoraproject.org Tue Mar 10 09:32:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:32:23 +0000 Subject: [pkgdb] openssh had acl change status Message-ID: <20090310093221.3D521208505@bastion.fedora.phx.redhat.com> tmraz has set the approveacls acl on openssh (Fedora devel) to Obsolete for mgrepl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 09:42:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:42:11 +0000 Subject: [pkgdb] libeXosip2: rishi has requested watchbugzilla Message-ID: <20090310094209.37618208511@bastion.fedora.phx.redhat.com> rishi has requested the watchbugzilla acl on libeXosip2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:41:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:41:49 +0000 Subject: [pkgdb] libeXosip2: rishi has requested watchcommits Message-ID: <20090310094209.BB686208551@bastion.fedora.phx.redhat.com> rishi has requested the watchcommits acl on libeXosip2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From denis at fedoraproject.org Tue Mar 10 09:41:14 2009 From: denis at fedoraproject.org (Denis Leroy) Date: Tue, 10 Mar 2009 09:41:14 +0000 (UTC) Subject: rpms/k3d/devel k3d.spec,1.27,1.28 Message-ID: <20090310094115.033667002E@cvs1.fedora.phx.redhat.com> Author: denis Update of /cvs/pkgs/rpms/k3d/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27335 Modified Files: k3d.spec Log Message: Added missing doxygen BR Index: k3d.spec =================================================================== RCS file: /cvs/pkgs/rpms/k3d/devel/k3d.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- k3d.spec 10 Mar 2009 09:27:59 -0000 1.27 +++ k3d.spec 10 Mar 2009 09:40:44 -0000 1.28 @@ -36,7 +36,7 @@ BuildRequires: gts-devel BuildRequires: librsvg2 BuildRequires: bzip2-devel -BuildRequires: libtool +BuildRequires: libtool doxygen BuildRequires: libpng-devel BuildRequires: cairomm-devel From pkgdb at fedoraproject.org Tue Mar 10 09:41:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:41:08 +0000 Subject: [pkgdb] libeXosip2: rishi has requested commit Message-ID: <20090310094213.B071A208554@bastion.fedora.phx.redhat.com> rishi has requested the commit acl on libeXosip2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:42:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:42:23 +0000 Subject: [pkgdb] libeXosip2: rishi has requested approveacls Message-ID: <20090310094221.CD1BA20850F@bastion.fedora.phx.redhat.com> rishi has requested the approveacls acl on libeXosip2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:42:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:42:37 +0000 Subject: [pkgdb] libeXosip2: rishi has requested watchbugzilla Message-ID: <20090310094234.7ED7B208511@bastion.fedora.phx.redhat.com> rishi has requested the watchbugzilla acl on libeXosip2 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:42:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:42:35 +0000 Subject: [pkgdb] libeXosip2: rishi has requested watchcommits Message-ID: <20090310094235.33457208551@bastion.fedora.phx.redhat.com> rishi has requested the watchcommits acl on libeXosip2 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:41:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:41:30 +0000 Subject: [pkgdb] libeXosip2: rishi has requested commit Message-ID: <20090310094236.05AF7208556@bastion.fedora.phx.redhat.com> rishi has requested the commit acl on libeXosip2 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:42:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:42:18 +0000 Subject: [pkgdb] libeXosip2: rishi has requested approveacls Message-ID: <20090310094238.A92AD208604@bastion.fedora.phx.redhat.com> rishi has requested the approveacls acl on libeXosip2 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:42:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:42:42 +0000 Subject: [pkgdb] libeXosip2: rishi has requested watchbugzilla Message-ID: <20090310094243.12A10208554@bastion.fedora.phx.redhat.com> rishi has requested the watchbugzilla acl on libeXosip2 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:42:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:42:23 +0000 Subject: [pkgdb] libeXosip2: rishi has requested approveacls Message-ID: <20090310094244.057A2208608@bastion.fedora.phx.redhat.com> rishi has requested the approveacls acl on libeXosip2 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:42:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:42:47 +0000 Subject: [pkgdb] libeXosip2: rishi has requested watchcommits Message-ID: <20090310094245.2321D20860B@bastion.fedora.phx.redhat.com> rishi has requested the watchcommits acl on libeXosip2 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:42:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:42:47 +0000 Subject: [pkgdb] libeXosip2: rishi has requested commit Message-ID: <20090310094247.C585920860F@bastion.fedora.phx.redhat.com> rishi has requested the commit acl on libeXosip2 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:42:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:42:06 +0000 Subject: [pkgdb] linphone: rishi has requested watchbugzilla Message-ID: <20090310094312.418D6208557@bastion.fedora.phx.redhat.com> rishi has requested the watchbugzilla acl on linphone (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/linphone From pkgdb at fedoraproject.org Tue Mar 10 09:42:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:42:53 +0000 Subject: [pkgdb] linphone: rishi has requested commit Message-ID: <20090310094313.53CAC2086F3@bastion.fedora.phx.redhat.com> rishi has requested the commit acl on linphone (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/linphone From pkgdb at fedoraproject.org Tue Mar 10 09:43:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:43:16 +0000 Subject: [pkgdb] linphone: rishi has requested watchcommits Message-ID: <20090310094313.8CE462086FE@bastion.fedora.phx.redhat.com> rishi has requested the watchcommits acl on linphone (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/linphone From pkgdb at fedoraproject.org Tue Mar 10 09:43:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:43:14 +0000 Subject: [pkgdb] linphone: rishi has requested approveacls Message-ID: <20090310094314.CE3F0208604@bastion.fedora.phx.redhat.com> rishi has requested the approveacls acl on linphone (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/linphone From pkgdb at fedoraproject.org Tue Mar 10 09:43:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:43:23 +0000 Subject: [pkgdb] linphone: rishi has requested watchcommits Message-ID: <20090310094321.121A4208703@bastion.fedora.phx.redhat.com> rishi has requested the watchcommits acl on linphone (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/linphone From pkgdb at fedoraproject.org Tue Mar 10 09:42:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:42:17 +0000 Subject: [pkgdb] linphone: rishi has requested commit Message-ID: <20090310094322.7078F208706@bastion.fedora.phx.redhat.com> rishi has requested the commit acl on linphone (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/linphone From pkgdb at fedoraproject.org Tue Mar 10 09:43:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:43:09 +0000 Subject: [pkgdb] linphone: rishi has requested approveacls Message-ID: <20090310094329.73863208608@bastion.fedora.phx.redhat.com> rishi has requested the approveacls acl on linphone (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/linphone From pkgdb at fedoraproject.org Tue Mar 10 09:43:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:43:11 +0000 Subject: [pkgdb] linphone: rishi has requested approveacls Message-ID: <20090310094332.9D2DE208609@bastion.fedora.phx.redhat.com> rishi has requested the approveacls acl on linphone (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/linphone From pkgdb at fedoraproject.org Tue Mar 10 09:43:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:43:33 +0000 Subject: [pkgdb] linphone: rishi has requested watchcommits Message-ID: <20090310094334.3105620871B@bastion.fedora.phx.redhat.com> rishi has requested the watchcommits acl on linphone (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/linphone From pkgdb at fedoraproject.org Tue Mar 10 09:43:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:43:35 +0000 Subject: [pkgdb] linphone: rishi has requested commit Message-ID: <20090310094335.8F54E20876E@bastion.fedora.phx.redhat.com> rishi has requested the commit acl on linphone (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/linphone From pkgdb at fedoraproject.org Tue Mar 10 09:43:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:43:39 +0000 Subject: [pkgdb] linphone: rishi has requested watchbugzilla Message-ID: <20090310094336.50FC220866A@bastion.fedora.phx.redhat.com> rishi has requested the watchbugzilla acl on linphone (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/linphone From pkgdb at fedoraproject.org Tue Mar 10 09:56:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:56:04 +0000 Subject: [pkgdb] libeXosip2 had acl change status Message-ID: <20090310095604.7E4E420850F@bastion.fedora.phx.redhat.com> rakesh has set the watchbugzilla acl on libeXosip2 (Fedora devel) to Approved for rishi To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:56:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:56:08 +0000 Subject: [pkgdb] libeXosip2 had acl change status Message-ID: <20090310095605.ADA8A208514@bastion.fedora.phx.redhat.com> rakesh has set the watchcommits acl on libeXosip2 (Fedora devel) to Approved for rishi To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:55:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:55:00 +0000 Subject: [pkgdb] libeXosip2 had acl change status Message-ID: <20090310095606.04AA9208552@bastion.fedora.phx.redhat.com> rakesh has set the commit acl on libeXosip2 (Fedora devel) to Approved for rishi To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:55:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:55:48 +0000 Subject: [pkgdb] libeXosip2 had acl change status Message-ID: <20090310095608.C27A0208555@bastion.fedora.phx.redhat.com> rakesh has set the approveacls acl on libeXosip2 (Fedora devel) to Approved for rishi To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:56:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:56:12 +0000 Subject: [pkgdb] libeXosip2 had acl change status Message-ID: <20090310095612.C3DF3208604@bastion.fedora.phx.redhat.com> rakesh has set the watchbugzilla acl on libeXosip2 (Fedora 10) to Approved for rishi To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:56:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:56:15 +0000 Subject: [pkgdb] libeXosip2 had acl change status Message-ID: <20090310095612.C5345208608@bastion.fedora.phx.redhat.com> rakesh has set the watchcommits acl on libeXosip2 (Fedora 10) to Approved for rishi To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:55:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:55:09 +0000 Subject: [pkgdb] libeXosip2 had acl change status Message-ID: <20090310095614.5628F20860B@bastion.fedora.phx.redhat.com> rakesh has set the commit acl on libeXosip2 (Fedora 10) to Approved for rishi To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:55:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:55:56 +0000 Subject: [pkgdb] libeXosip2 had acl change status Message-ID: <20090310095616.189DD20866A@bastion.fedora.phx.redhat.com> rakesh has set the approveacls acl on libeXosip2 (Fedora 10) to Approved for rishi To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:56:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:56:18 +0000 Subject: [pkgdb] libeXosip2 had acl change status Message-ID: <20090310095618.C2E062086FE@bastion.fedora.phx.redhat.com> rakesh has set the watchbugzilla acl on libeXosip2 (Fedora 9) to Approved for rishi To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:56:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:56:21 +0000 Subject: [pkgdb] libeXosip2 had acl change status Message-ID: <20090310095618.C61C82086FF@bastion.fedora.phx.redhat.com> rakesh has set the watchcommits acl on libeXosip2 (Fedora 9) to Approved for rishi To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:56:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:56:01 +0000 Subject: [pkgdb] libeXosip2 had acl change status Message-ID: <20090310095621.B17A8208710@bastion.fedora.phx.redhat.com> rakesh has set the approveacls acl on libeXosip2 (Fedora 9) to Approved for rishi To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From pkgdb at fedoraproject.org Tue Mar 10 09:55:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 09:55:14 +0000 Subject: [pkgdb] libeXosip2 had acl change status Message-ID: <20090310095619.E12DE208704@bastion.fedora.phx.redhat.com> rakesh has set the commit acl on libeXosip2 (Fedora 9) to Approved for rishi To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libeXosip2 From karsten at fedoraproject.org Tue Mar 10 09:58:29 2009 From: karsten at fedoraproject.org (Karsten Hopp) Date: Tue, 10 Mar 2009 09:58:29 +0000 (UTC) Subject: rpms/vim/devel 7.2.132, NONE, 1.1 README.patches, 1.120, 1.121 vim.spec, 1.234, 1.235 Message-ID: <20090310095829.D00437002E@cvs1.fedora.phx.redhat.com> Author: karsten Update of /cvs/extras/rpms/vim/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31376 Modified Files: README.patches vim.spec Added Files: 7.2.132 Log Message: - patchlevel 132, fixes accesses to freed memory --- NEW FILE 7.2.132 --- To: vim-dev at vim.org Subject: Patch 7.2.132 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.2.132 Problem: When changing directory during a SwapExists autocmd freed memory may be accessed. (Dominique Pelle) Solution: Add the allbuf_lock flag. Files: src/ex_getln.c, src/globals.h, src/fileio.c, src/proto/ex_getln.pro *** ../vim-7.2.131/src/ex_getln.c Mon Mar 2 02:11:09 2009 --- src/ex_getln.c Mon Mar 2 00:53:39 2009 *************** *** 2000,2007 **** #if defined(FEAT_AUTOCMD) || defined(PROTO) /* ! * Check if "curbuf_lock" is set and return TRUE when it is and give an error ! * message. */ int curbuf_locked() --- 2000,2007 ---- #if defined(FEAT_AUTOCMD) || defined(PROTO) /* ! * Check if "curbuf_lock" or "allbuf_lock" is set and return TRUE when it is ! * and give an error message. */ int curbuf_locked() *************** *** 2011,2016 **** --- 2011,2031 ---- EMSG(_("E788: Not allowed to edit another buffer now")); return TRUE; } + return allbuf_locked(); + } + + /* + * Check if "allbuf_lock" is set and return TRUE when it is and give an error + * message. + */ + int + allbuf_locked() + { + if (allbuf_lock > 0) + { + EMSG(_("E811: Not allowed to change buffer information now")); + return TRUE; + } return FALSE; } #endif *** ../vim-7.2.131/src/globals.h Mon Mar 2 02:44:54 2009 --- src/globals.h Mon Mar 2 02:40:16 2009 *************** *** 619,624 **** --- 619,629 ---- EXTERN int curbuf_lock INIT(= 0); /* non-zero when the current buffer can't be * changed. Used for FileChangedRO. */ + EXTERN int allbuf_lock INIT(= 0); + /* non-zero when no buffer name can be + * changed, no buffer can be deleted and + * current directory can't be changed. + * Used for SwapExists et al. */ #endif #ifdef FEAT_EVAL # define HAVE_SANDBOX *** ../vim-7.2.131/src/fileio.c Wed Dec 31 16:20:54 2008 --- src/fileio.c Sun Mar 1 23:37:10 2009 *************** *** 69,75 **** static int au_find_group __ARGS((char_u *name)); # define AUGROUP_DEFAULT -1 /* default autocmd group */ ! # define AUGROUP_ERROR -2 /* errornouse autocmd group */ # define AUGROUP_ALL -3 /* all autocmd groups */ #endif --- 69,75 ---- static int au_find_group __ARGS((char_u *name)); # define AUGROUP_DEFAULT -1 /* default autocmd group */ ! # define AUGROUP_ERROR -2 /* erroneous autocmd group */ # define AUGROUP_ALL -3 /* all autocmd groups */ #endif *************** *** 144,150 **** # endif #endif static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf)); ! void filemess(buf, name, s, attr) --- 144,152 ---- # endif #endif static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf)); ! #ifdef FEAT_AUTOCMD ! static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name"); ! #endif void filemess(buf, name, s, attr) *************** *** 295,300 **** --- 297,315 ---- int conv_restlen = 0; /* nr of bytes in conv_rest[] */ #endif + #ifdef FEAT_AUTOCMD + /* Remember the initial values of curbuf, curbuf->b_ffname and + * curbuf->b_fname to detect whether they are altered as a result of + * executing nasty autocommands. Also check if "fname" and "sfname" + * point to one of these values. */ + buf_T *old_curbuf = curbuf; + char_u *old_b_ffname = curbuf->b_ffname; + char_u *old_b_fname = curbuf->b_fname; + int using_b_ffname = (fname == curbuf->b_ffname) + || (sfname == curbuf->b_ffname); + int using_b_fname = (fname == curbuf->b_fname) + || (sfname == curbuf->b_fname); + #endif write_no_eol_lnum = 0; /* in case it was set by the previous read */ /* *************** *** 589,595 **** --- 604,624 ---- #ifdef FEAT_QUICKFIX if (!bt_dontwrite(curbuf)) #endif + { check_need_swap(newfile); + #ifdef FEAT_AUTOCMD + /* SwapExists autocommand may mess things up */ + if (curbuf != old_curbuf + || (using_b_ffname + && (old_b_ffname != curbuf->b_ffname)) + || (using_b_fname + && (old_b_fname != curbuf->b_fname))) + { + EMSG(_(e_auchangedbuf)); + return FAIL; + } + #endif + } if (dir_of_file_exists(fname)) filemess(curbuf, sfname, (char_u *)_("[New File]"), 0); else *************** *** 668,673 **** --- 697,713 ---- #endif { check_need_swap(newfile); + #ifdef FEAT_AUTOCMD + if (!read_stdin && (curbuf != old_curbuf + || (using_b_ffname && (old_b_ffname != curbuf->b_ffname)) + || (using_b_fname && (old_b_fname != curbuf->b_fname)))) + { + EMSG(_(e_auchangedbuf)); + if (!read_buffer) + close(fd); + return FAIL; + } + #endif #ifdef UNIX /* Set swap file protection bits after creating it. */ if (swap_mode > 0 && curbuf->b_ml.ml_mfp->mf_fname != NULL) *************** *** 698,704 **** { int m = msg_scroll; int n = msg_scrolled; - buf_T *old_curbuf = curbuf; /* * The file must be closed again, the autocommands may want to change --- 738,743 ---- *************** *** 740,747 **** --- 779,791 ---- /* * Don't allow the autocommands to change the current buffer. * Try to re-open the file. + * + * Don't allow the autocommands to change the buffer name either + * (cd for example) if it invalidates fname or sfname. */ if (!read_stdin && (curbuf != old_curbuf + || (using_b_ffname && (old_b_ffname != curbuf->b_ffname)) + || (using_b_fname && (old_b_fname != curbuf->b_fname)) || (fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0)) < 0)) { --no_wait_return; *************** *** 6320,6326 **** if (!stuff_empty() || global_busy || !typebuf_typed() #ifdef FEAT_AUTOCMD ! || autocmd_busy || curbuf_lock > 0 #endif ) need_check_timestamps = TRUE; /* check later */ --- 6364,6370 ---- if (!stuff_empty() || global_busy || !typebuf_typed() #ifdef FEAT_AUTOCMD ! || autocmd_busy || curbuf_lock > 0 || allbuf_lock > 0 #endif ) need_check_timestamps = TRUE; /* check later */ *************** *** 6522,6529 **** --- 6566,6575 ---- set_vim_var_string(VV_FCS_REASON, (char_u *)reason, -1); set_vim_var_string(VV_FCS_CHOICE, (char_u *)"", -1); # endif + ++allbuf_lock; n = apply_autocmds(EVENT_FILECHANGEDSHELL, buf->b_fname, buf->b_fname, FALSE, buf); + --allbuf_lock; busy = FALSE; if (n) { *** ../vim-7.2.131/src/proto/ex_getln.pro Fri Nov 28 10:59:57 2008 --- src/proto/ex_getln.pro Sun Mar 1 00:27:12 2009 *************** *** 4,9 **** --- 4,10 ---- int text_locked __ARGS((void)); void text_locked_msg __ARGS((void)); int curbuf_locked __ARGS((void)); + int allbuf_locked __ARGS((void)); char_u *getexline __ARGS((int c, void *dummy, int indent)); char_u *getexmodeline __ARGS((int promptc, void *dummy, int indent)); int cmdline_overstrike __ARGS((void)); *** ../vim-7.2.131/src/version.c Wed Mar 4 04:11:56 2009 --- src/version.c Thu Mar 5 03:08:54 2009 *************** *** 678,679 **** --- 678,681 ---- { /* Add new patch number below this line */ + /**/ + 132, /**/ -- hundred-and-one symptoms of being an internet addict: 168. You have your own domain name. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// Index: README.patches =================================================================== RCS file: /cvs/extras/rpms/vim/devel/README.patches,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- README.patches 4 Mar 2009 11:14:39 -0000 1.120 +++ README.patches 10 Mar 2009 09:57:58 -0000 1.121 @@ -160,3 +160,4 @@ 2229 7.2.129 opening command window from input() uses the search history 12852 7.2.130 Vim may haing until CTRL-C is typed when using CTRL-Z 2612 7.2.131 using wrong cursor highlighting after clearing 'keymap' + 7823 7.2.132 may access freed memory when changing dir in SwapExists autocmd Index: vim.spec =================================================================== RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v retrieving revision 1.234 retrieving revision 1.235 diff -u -r1.234 -r1.235 --- vim.spec 4 Mar 2009 11:16:37 -0000 1.234 +++ vim.spec 10 Mar 2009 09:57:58 -0000 1.235 @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim72%{?beta} -%define patchlevel 131 +%define patchlevel 132 Summary: The VIM editor URL: http://www.vim.org/ @@ -197,6 +197,7 @@ Patch129: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.129 Patch130: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.130 Patch131: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.131 +Patch132: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.132 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -461,6 +462,7 @@ %patch129 -p0 %patch130 -p0 %patch131 -p0 +%patch132 -p0 # install spell files %if %{withvimspell} @@ -919,6 +921,9 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue Mar 10 2009 Karsten Hopp 7.2.132-1 +- patchlevel 132, fixes accesses to freed memory + * Wed Mar 04 2009 Karsten Hopp 7.2.131-1 - patchlevel 131 From tagoh at fedoraproject.org Tue Mar 10 10:13:50 2009 From: tagoh at fedoraproject.org (Akira TAGOH) Date: Tue, 10 Mar 2009 10:13:50 +0000 (UTC) Subject: rpms/imsettings/devel .cvsignore, 1.12, 1.13 imsettings-constraint-of-language.patch, 1.2, 1.3 imsettings.spec, 1.25, 1.26 sources, 1.11, 1.12 Message-ID: <20090310101350.840747002E@cvs1.fedora.phx.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/imsettings/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2299 Modified Files: .cvsignore imsettings-constraint-of-language.patch imsettings.spec sources Log Message: * Tue Mar 10 2009 Akira TAGOH - 0.106.1-1 - New upstream release. - Fix a double-free issue. (#485595) - Workaround to get the accelerator keys working on X apps. (#488713) - Get rid of debugging messages (#489119) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 23 Feb 2009 14:10:41 -0000 1.12 +++ .cvsignore 10 Mar 2009 10:13:19 -0000 1.13 @@ -11,3 +11,4 @@ imsettings-0.105.0.tar.bz2 imsettings-0.105.1.tar.bz2 imsettings-0.106.0.tar.bz2 +imsettings-0.106.1.tar.bz2 imsettings-constraint-of-language.patch: Index: imsettings-constraint-of-language.patch =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings-constraint-of-language.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- imsettings-constraint-of-language.patch 21 Oct 2008 08:56:42 -0000 1.2 +++ imsettings-constraint-of-language.patch 10 Mar 2009 10:13:19 -0000 1.3 @@ -1,7 +1,7 @@ -diff -ruN imsettings-0.105.0.orig/data/xinput.sh.in.in imsettings-0.105.0/data/xinput.sh.in.in ---- imsettings-0.105.0.orig/data/xinput.sh.in.in 2008-10-11 14:54:28.000000000 +0900 -+++ imsettings-0.105.0/data/xinput.sh.in.in 2008-10-21 14:57:51.000000000 +0900 -@@ -152,7 +152,20 @@ +diff -pruN imsettings-0.106.0.1.orig/data/xinput.sh.in.in imsettings-0.106.0.1/data/xinput.sh.in.in +--- imsettings-0.106.0.1.orig/data/xinput.sh.in.in 2009-03-04 12:18:10.000000000 +0900 ++++ imsettings-0.106.0.1/data/xinput.sh.in.in 2009-03-04 17:44:14.000000000 +0900 +@@ -158,7 +158,20 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTING SHORT_DESC="User Specific" fi elif [ -r "$SYS_XINPUTRC" ]; then @@ -22,4 +22,4 @@ + fi fi - [ -z "$XIM" ] && XIM=none + [ -z "$IMSETTINGS_INTEGRATE_DESKTOP" ] && IMSETTINGS_INTEGRATE_DESKTOP=yes Index: imsettings.spec =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- imsettings.spec 24 Feb 2009 04:10:07 -0000 1.25 +++ imsettings.spec 10 Mar 2009 10:13:19 -0000 1.26 @@ -1,5 +1,5 @@ Name: imsettings -Version: 0.106.0 +Version: 0.106.1 Release: 1%{?dist} License: LGPLv2+ URL: http://code.google.com/p/imsettings/ @@ -110,8 +110,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/env install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/ -sed -i -e '/^Hidden=true$/d' $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop -touch -r backends/xfce_xfconf/imsettings-xfce-helper.desktop $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop #desktop-file-install \ # --delete-original \ # --dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \ @@ -173,6 +171,7 @@ %{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh %{_sysconfdir}/X11/xinit/xinput.d %{_sysconfdir}/xdg/autostart/imsettings-applet.desktop +%{_sysconfdir}/xdg/autostart/imsettings-start.desktop %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas %{_sysconfdir}/kde/env/*.sh @@ -198,6 +197,12 @@ %changelog +* Tue Mar 10 2009 Akira TAGOH - 0.106.1-1 +- New upstream release. + - Fix a double-free issue. (#485595) + - Workaround to get the accelerator keys working on X apps. (#488713) + - Get rid of debugging messages (#489119) + * Mon Feb 23 2009 Akira TAGOH - 0.106.0-1 - New upstream release. - Fix a parser error for Compose data. (#484142) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 23 Feb 2009 14:10:41 -0000 1.11 +++ sources 10 Mar 2009 10:13:19 -0000 1.12 @@ -1 +1 @@ -ec96c8f421559fe8654e85830871fdb8 imsettings-0.106.0.tar.bz2 +c561896f78388e5cab13f95fa9996259 imsettings-0.106.1.tar.bz2 From pkgdb at fedoraproject.org Tue Mar 10 10:14:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:14:30 +0000 Subject: [pkgdb] openssh ownership updated Message-ID: <20090310101535.09610208503@bastion.fedora.phx.redhat.com> Package openssh in Fedora 9 is now owned by jfch2222 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:16:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:16:30 +0000 Subject: [pkgdb] openssh ownership updated Message-ID: <20090310101650.882612082B2@bastion.fedora.phx.redhat.com> Package openssh in Fedora 10 is now owned by jfch2222 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:17:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:17:28 +0000 Subject: [pkgdb] openssh had acl change status Message-ID: <20090310101726.022A2208510@bastion.fedora.phx.redhat.com> tmraz has set the watchcommits acl on openssh (Fedora devel) to Obsolete for jfch2222 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:17:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:17:07 +0000 Subject: [pkgdb] openssh had acl change status Message-ID: <20090310101728.02B71208503@bastion.fedora.phx.redhat.com> tmraz has set the commit acl on openssh (Fedora devel) to Obsolete for jfch2222 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:16:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:16:26 +0000 Subject: [pkgdb] openssh ownership updated Message-ID: <20090310101732.01572208551@bastion.fedora.phx.redhat.com> Package openssh in Fedora devel was orphaned by tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:18:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:18:25 +0000 Subject: [pkgdb] openssh: tmraz has requested watchcommits Message-ID: <20090310101845.AFCD3208504@bastion.fedora.phx.redhat.com> tmraz has requested the watchcommits acl on openssh (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:17:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:17:46 +0000 Subject: [pkgdb] openssh: tmraz has requested watchbugzilla Message-ID: <20090310101851.CCC71208510@bastion.fedora.phx.redhat.com> tmraz has requested the watchbugzilla acl on openssh (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:18:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:18:58 +0000 Subject: [pkgdb] openssh: tmraz has requested commit Message-ID: <20090310101855.81A83208551@bastion.fedora.phx.redhat.com> tmraz has requested the commit acl on openssh (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:19:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:19:00 +0000 Subject: [pkgdb] openssh ownership updated Message-ID: <20090310101857.82C86208503@bastion.fedora.phx.redhat.com> Package openssh in Fedora devel is now owned by jfch2222 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:18:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:18:41 +0000 Subject: [pkgdb] openssh: tmraz has requested approveacls Message-ID: <20090310101901.4F29420850F@bastion.fedora.phx.redhat.com> tmraz has requested the approveacls acl on openssh (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:18:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:18:00 +0000 Subject: [pkgdb] openssh: tmraz has requested watchbugzilla Message-ID: <20090310101905.E70C3208504@bastion.fedora.phx.redhat.com> tmraz has requested the watchbugzilla acl on openssh (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:19:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:19:07 +0000 Subject: [pkgdb] openssh: tmraz has requested watchcommits Message-ID: <20090310101907.D422620866A@bastion.fedora.phx.redhat.com> tmraz has requested the watchcommits acl on openssh (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:19:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:19:12 +0000 Subject: [pkgdb] openssh: tmraz has requested commit Message-ID: <20090310101909.7F6802086F1@bastion.fedora.phx.redhat.com> tmraz has requested the commit acl on openssh (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:18:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:18:06 +0000 Subject: [pkgdb] openssh: tmraz has requested approveacls Message-ID: <20090310101911.9C20B2086F6@bastion.fedora.phx.redhat.com> tmraz has requested the approveacls acl on openssh (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:19:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:19:08 +0000 Subject: [pkgdb] openssh: tmraz has requested watchbugzilla Message-ID: <20090310101928.317AC208551@bastion.fedora.phx.redhat.com> tmraz has requested the watchbugzilla acl on openssh (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:19:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:19:31 +0000 Subject: [pkgdb] openssh: tmraz has requested commit Message-ID: <20090310101931.CCE33208557@bastion.fedora.phx.redhat.com> tmraz has requested the commit acl on openssh (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:18:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:18:24 +0000 Subject: [pkgdb] openssh: tmraz has requested watchcommits Message-ID: <20090310101929.9F8F1208554@bastion.fedora.phx.redhat.com> tmraz has requested the watchcommits acl on openssh (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:19:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:19:36 +0000 Subject: [pkgdb] openssh: tmraz has requested approveacls Message-ID: <20090310101934.300BE2086FE@bastion.fedora.phx.redhat.com> tmraz has requested the approveacls acl on openssh (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:19:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:19:10 +0000 Subject: [pkgdb] openssh ownership updated Message-ID: <20090310102015.4AFFB208505@bastion.fedora.phx.redhat.com> Package openssh in Fedora devel was orphaned by jfch2222 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:20:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:20:55 +0000 Subject: [pkgdb] openssh ownership updated Message-ID: <20090310102052.9E8C8208504@bastion.fedora.phx.redhat.com> Package openssh in Fedora devel is now owned by jfch2222 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:21:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:21:02 +0000 Subject: [pkgdb] openssh had acl change status Message-ID: <20090310102102.97482208510@bastion.fedora.phx.redhat.com> jfch2222 has set the watchbugzilla acl on openssh (Fedora devel) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:20:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:20:00 +0000 Subject: [pkgdb] openssh had acl change status Message-ID: <20090310102105.B3A15208550@bastion.fedora.phx.redhat.com> jfch2222 has set the watchcommits acl on openssh (Fedora devel) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:21:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:21:11 +0000 Subject: [pkgdb] openssh had acl change status Message-ID: <20090310102108.BD8BF208609@bastion.fedora.phx.redhat.com> jfch2222 has set the commit acl on openssh (Fedora devel) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:21:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:21:13 +0000 Subject: [pkgdb] openssh had acl change status Message-ID: <20090310102114.02FF62086EF@bastion.fedora.phx.redhat.com> jfch2222 has set the approveacls acl on openssh (Fedora devel) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:21:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:21:26 +0000 Subject: [pkgdb] openssh had acl change status Message-ID: <20090310102123.8CEF5208554@bastion.fedora.phx.redhat.com> jfch2222 has set the watchbugzilla acl on openssh (Fedora 9) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:21:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:21:06 +0000 Subject: [pkgdb] openssh had acl change status Message-ID: <20090310102126.A06012086FE@bastion.fedora.phx.redhat.com> jfch2222 has set the watchcommits acl on openssh (Fedora 9) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:20:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:20:27 +0000 Subject: [pkgdb] openssh had acl change status Message-ID: <20090310102132.CDCCE208556@bastion.fedora.phx.redhat.com> jfch2222 has set the approveacls acl on openssh (Fedora 9) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:21:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:21:30 +0000 Subject: [pkgdb] openssh had acl change status Message-ID: <20090310102130.952AD20850F@bastion.fedora.phx.redhat.com> jfch2222 has set the commit acl on openssh (Fedora 9) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:21:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:21:40 +0000 Subject: [pkgdb] openssh had acl change status Message-ID: <20090310102138.1951F208703@bastion.fedora.phx.redhat.com> jfch2222 has set the watchbugzilla acl on openssh (Fedora 10) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:21:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:21:19 +0000 Subject: [pkgdb] openssh had acl change status Message-ID: <20090310102139.3A1FD208711@bastion.fedora.phx.redhat.com> jfch2222 has set the watchcommits acl on openssh (Fedora 10) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:21:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:21:41 +0000 Subject: [pkgdb] openssh had acl change status Message-ID: <20090310102142.0F89B208603@bastion.fedora.phx.redhat.com> jfch2222 has set the commit acl on openssh (Fedora 10) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From pkgdb at fedoraproject.org Tue Mar 10 10:20:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 10:20:38 +0000 Subject: [pkgdb] openssh had acl change status Message-ID: <20090310102143.17EF2208719@bastion.fedora.phx.redhat.com> jfch2222 has set the approveacls acl on openssh (Fedora 10) to Approved for tmraz To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/openssh From kraxel at fedoraproject.org Tue Mar 10 10:21:53 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Tue, 10 Mar 2009 10:21:53 +0000 (UTC) Subject: rpms/xen/devel xen-fix-deprecated-warnings.patch, NONE, 1.1 xen.spec, 1.234, 1.235 Message-ID: <20090310102153.347D47002E@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4450 Modified Files: xen.spec Added Files: xen-fix-deprecated-warnings.patch Log Message: fix python 2.6 warnings xen-fix-deprecated-warnings.patch: --- NEW FILE xen-fix-deprecated-warnings.patch --- diff -up xen-3.3.1/tools/python/xen/util/acmpolicy.py.deprecated xen-3.3.1/tools/python/xen/util/acmpolicy.py --- xen-3.3.1/tools/python/xen/util/acmpolicy.py.deprecated 2009-03-09 17:22:39.000000000 +0100 +++ xen-3.3.1/tools/python/xen/util/acmpolicy.py 2009-03-09 17:23:09.000000000 +0100 @@ -17,7 +17,7 @@ #============================================================================ import os -import sha +import hashlib import stat import array import struct @@ -1103,7 +1103,7 @@ class ACMPolicy(XSPolicy): def hash(self): """ Calculate a SAH1 hash of the XML policy """ - return sha.sha(self.toxml()) + return hashlib.sha1(self.toxml()) def save(self): ### Save the XML policy into a file ### diff -up xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated xen-3.3.1/tools/python/xen/xend/XendAPI.py --- xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated 2009-03-10 11:16:47.000000000 +0100 +++ xen-3.3.1/tools/python/xen/xend/XendAPI.py 2009-03-10 11:17:34.000000000 +0100 @@ -18,7 +18,6 @@ import inspect import os import Queue -import sets import string import sys import traceback @@ -116,7 +115,7 @@ event_registrations = {} def event_register(session, reg_classes): if session not in event_registrations: event_registrations[session] = { - 'classes' : sets.Set(), + 'slasses' : set(), 'queue' : Queue.Queue(EVENT_QUEUE_LENGTH), 'next-id' : 1 } Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.234 retrieving revision 1.235 diff -u -r1.234 -r1.235 --- xen.spec 6 Mar 2009 11:26:51 -0000 1.234 +++ xen.spec 10 Mar 2009 10:21:22 -0000 1.235 @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.3.1 -%define base_release 9 +%define base_release 10 # Hypervisor ABI %define hv_abi 3.3 @@ -67,6 +67,7 @@ Source14: grub-0.97.tar.gz Patch1: xen-initscript.patch Patch2: xen-initscript-pvops.patch +Patch3: xen-fix-deprecated-warnings.patch Patch8: xen-xenstore-cli.patch Patch13: xen-dumpdir.patch Patch14: xen-net-disable-bridge-by-default.patch @@ -168,6 +169,7 @@ %setup -q -n %{directory_tag} %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch8 -p1 %patch13 -p1 @@ -500,6 +502,9 @@ %{_libdir}/*.a %changelog +* Tue Mar 10 2009 Gerd Hoffmann - 3.3.1-10 +- fix python 2.6 warnings. + * Fri Mar 6 2009 Gerd Hoffmann - 3.3.1-9 - fix xen.modules init script for pv_ops kernel. - stick rpm release tag into XEN_VENDORVERSION. From mhlavink at fedoraproject.org Tue Mar 10 10:28:48 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Tue, 10 Mar 2009 10:28:48 +0000 (UTC) Subject: rpms/ksh/devel ksh.spec,1.45,1.46 Message-ID: <20090310102848.49F7A7002E@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/ksh/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5941 Modified Files: ksh.spec Log Message: fix typos in specfile Index: ksh.spec =================================================================== RCS file: /cvs/extras/rpms/ksh/devel/ksh.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- ksh.spec 25 Feb 2009 12:06:29 -0000 1.45 +++ ksh.spec 10 Mar 2009 10:28:17 -0000 1.46 @@ -6,7 +6,7 @@ Group: System Environment/Shells License: CPL Version: 20081104 -Release: 2%{?dist} +Release: 3%{?dist} Source0: http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz Source1: http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz Source3: kshrc.rhs @@ -84,14 +84,17 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 10 2009 Michal Hlavinka - 20081104-3 +- fix typos in spec file + * Wed Feb 25 2009 Fedora Release Engineering - 20081104-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Tue Jan 21 2009 Michal Hlavinka 20091104-1 +* Tue Jan 21 2009 Michal Hlavinka 20081104-1 - update to 2008-11-04 - ast-ksh-locales are not useable remove them -* Tue Oct 21 2008 Michal Hlavinka 20080202-4 +* Tue Oct 21 2008 Michal Hlavinka 20080725-4 - fix #467025 - Ksh fails to initialise environment when login from graphic console * Wed Aug 06 2008 Tomas Smetana 20080725-3 From varekova at fedoraproject.org Tue Mar 10 10:37:43 2009 From: varekova at fedoraproject.org (Ivana Varekova) Date: Tue, 10 Mar 2009 10:37:43 +0000 (UTC) Subject: rpms/man-pages/devel .cvsignore, 1.57, 1.58 man-pages.spec, 1.110, 1.111 sources, 1.56, 1.57 Message-ID: <20090310103743.D401A7002E@cvs1.fedora.phx.redhat.com> Author: varekova Update of /cvs/pkgs/rpms/man-pages/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7908 Modified Files: .cvsignore man-pages.spec sources Log Message: - update to 3.19 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/man-pages/devel/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- .cvsignore 16 Jan 2009 13:24:37 -0000 1.57 +++ .cvsignore 10 Mar 2009 10:37:12 -0000 1.58 @@ -3,4 +3,4 @@ man-pages-posix-2003-a.tar.bz2 man-pages_syscalls.tar.bz2 man-pages_add-01.tar.bz2 -man-pages-3.16.tar.bz2 +man-pages-3.19.tar.bz2 Index: man-pages.spec =================================================================== RCS file: /cvs/pkgs/rpms/man-pages/devel/man-pages.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- man-pages.spec 25 Feb 2009 23:07:03 -0000 1.110 +++ man-pages.spec 10 Mar 2009 10:37:13 -0000 1.111 @@ -3,8 +3,8 @@ Summary: Man (manual) pages from the Linux Documentation Project Name: man-pages -Version: 3.16 -Release: 2%{?dist} +Version: 3.19 +Release: 1%{?dist} License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE Group: Documentation URL: http://www.kernel.org/pub/linux/docs/manpages/ @@ -96,7 +96,12 @@ man$sec/'*'.$sec) # this dir is empty continue ;; - man7/iso_8859-*.7 | man7/koi8-r.7) + man7/iso_8859-*.7) + enc=${f#man7/} + enc=${enc%.7} + enc=ISO-${enc#iso_} + LANG=en iconv -f $enc -t utf-8 -o $instdir/$f $f ;; + man7/koi8-r.7) enc=${f#man7/} enc=${enc%.7} LANG=en iconv -f $enc -t utf-8 -o $instdir/$f $f ;; @@ -119,6 +124,9 @@ %lang(en) %{_mandir}/en/man* %changelog +* Tue Mar 10 2009 Ivana Varekova - 3.19-1 +- update to 3.19 + * Wed Feb 25 2009 Fedora Release Engineering - 3.16-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/man-pages/devel/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 16 Jan 2009 13:24:37 -0000 1.56 +++ sources 10 Mar 2009 10:37:13 -0000 1.57 @@ -3,4 +3,4 @@ 7c78aff03c0a6767ba483d34f19e4b09 man-pages-posix-2003-a.tar.bz2 bf0d94a7faf6dc0db31325dbf576fd84 man-pages_syscalls.tar.bz2 4ae755c6caaa035cb7737bf4a3ec7927 man-pages_add-01.tar.bz2 -d0bd9e9d1260a6e640f485e93c472a11 man-pages-3.16.tar.bz2 +ef57c3e49c42ee6216e1333c16c069f8 man-pages-3.19.tar.bz2 From caolanm at fedoraproject.org Tue Mar 10 10:37:45 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 10 Mar 2009 10:37:45 +0000 (UTC) Subject: rpms/hunspell-ca/devel .cvsignore, 1.11, 1.12 hunspell-ca.spec, 1.14, 1.15 sources, 1.11, 1.12 Message-ID: <20090310103745.2CDED7002E@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-ca/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7965 Modified Files: .cvsignore hunspell-ca.spec sources Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 3 Mar 2009 09:32:13 -0000 1.11 +++ .cvsignore 10 Mar 2009 10:37:14 -0000 1.12 @@ -1 +1 @@ -hunspell-ca-20090302.tar.bz2 +hunspell-ca-20090309.tar.bz2 Index: hunspell-ca.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/hunspell-ca.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- hunspell-ca.spec 3 Mar 2009 09:32:13 -0000 1.14 +++ hunspell-ca.spec 10 Mar 2009 10:37:14 -0000 1.15 @@ -1,6 +1,6 @@ Name: hunspell-ca Summary: Catalan hunspell dictionaries -%define upstreamid 20090302 +%define upstreamid 20090309 Version: 0.%{upstreamid} Release: 1%{?dist} #svn checkout svn://softcatala.org/corrector/trunk/resultats/hunspell @@ -43,6 +43,9 @@ %{_datadir}/myspell/* %changelog +* Tue Mar 10 2009 Caolan McNamara - 0.20090309-1 +- latest version + * Tue Mar 03 2009 Caolan McNamara - 0.20090302-1 - latest version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 3 Mar 2009 09:32:13 -0000 1.11 +++ sources 10 Mar 2009 10:37:14 -0000 1.12 @@ -1 +1 @@ -f6d7dcaf2157fa3b3fdb141db9941166 hunspell-ca-20090302.tar.bz2 +bb76f88f2f77619429d95b55d3568b83 hunspell-ca-20090309.tar.bz2 From caolanm at fedoraproject.org Tue Mar 10 10:39:58 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 10 Mar 2009 10:39:58 +0000 (UTC) Subject: rpms/hunspell-pt/devel .cvsignore, 1.16, 1.17 hunspell-pt.spec, 1.29, 1.30 sources, 1.18, 1.19 Message-ID: <20090310103958.CFEBD7002E@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-pt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8554 Modified Files: .cvsignore hunspell-pt.spec sources Log Message: latest pt_PT version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 23 Nov 2008 16:40:33 -0000 1.16 +++ .cvsignore 10 Mar 2009 10:39:28 -0000 1.17 @@ -1,2 +1,2 @@ pt_BR-2008-07-07C.zip -hunspell-pt_PT-20081113.tar.gz +hunspell-pt_PT-20090309.tar.gz Index: hunspell-pt.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/hunspell-pt.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- hunspell-pt.spec 25 Feb 2009 05:22:48 -0000 1.29 +++ hunspell-pt.spec 10 Mar 2009 10:39:28 -0000 1.30 @@ -1,9 +1,9 @@ Name: hunspell-pt Summary: Portuguese hunspell dictionaries -%define upstreamid 20081113 +%define upstreamid 20090309 Version: 0.%{upstreamid} -Release: 2%{?dist} -Source0: http://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/hunspell-pt_PT-20081113.tar.gz +Release: 1%{?dist} +Source0: http://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/hunspell-pt_PT-20090309.tar.gz Source1: http://www.deso-se.com.br/downloads/pt_BR-2008-07-07C.zip Group: Applications/Text URL: http://www.broffice.org/verortografico/baixar @@ -17,7 +17,7 @@ Portuguese hunspell dictionaries. %prep -%setup -q -n hunspell-pt_PT-20081113 +%setup -q -n hunspell-pt_PT-20090309 unzip -q -o %{SOURCE1} tr -d '\r' < README_pt_BR.TXT > README.TXT.new mv -f README.TXT.new README_pt_BR.TXT @@ -42,6 +42,9 @@ %{_datadir}/myspell/* %changelog +* Tue Mar 10 2009 Caolan McNamara - 0.20090309-1 +- latest pt_PT version + * Tue Feb 24 2009 Fedora Release Engineering - 0.20081113-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 23 Nov 2008 16:40:33 -0000 1.18 +++ sources 10 Mar 2009 10:39:28 -0000 1.19 @@ -1,2 +1,2 @@ 4c113481e574c7fd3496855b98662eb3 pt_BR-2008-07-07C.zip -f2b817685b73bb8e0e8f4a500a7c9f94 hunspell-pt_PT-20081113.tar.gz +ce4a36a835baa32fc358f578d5529832 hunspell-pt_PT-20090309.tar.gz From rjones at fedoraproject.org Tue Mar 10 10:42:41 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 10:42:41 +0000 (UTC) Subject: rpms/ocaml-libvirt/F-10 .cvsignore, 1.16, 1.17 ocaml-libvirt.spec, 1.24, 1.25 sources, 1.16, 1.17 Message-ID: <20090310104241.76FA07002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-libvirt/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9219 Modified Files: .cvsignore ocaml-libvirt.spec sources Log Message: New upstream release 0.6.1.0. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/F-10/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 9 Jul 2008 12:01:31 -0000 1.16 +++ .cvsignore 10 Mar 2009 10:42:10 -0000 1.17 @@ -1 +1 @@ -ocaml-libvirt-0.4.4.2.tar.gz +ocaml-libvirt-0.6.1.0.tar.gz Index: ocaml-libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/F-10/ocaml-libvirt.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ocaml-libvirt.spec 9 Jul 2008 12:01:31 -0000 1.24 +++ ocaml-libvirt.spec 10 Mar 2009 10:42:10 -0000 1.25 @@ -5,7 +5,7 @@ %define build_mlvirsh 1 Name: ocaml-libvirt -Version: 0.4.4.2 +Version: 0.6.1.0 Release: 1%{?dist} Summary: OCaml binding for libvirt @@ -123,6 +123,9 @@ %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 0.6.1.0-1 +- New upstream release 0.6.1.0. + * Wed Jul 9 2008 Richard W.M. Jones - 0.4.4.2-1 - New upstream version. - In upstream, 'make install' became 'make install-byte' or 'make install-opt' Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/F-10/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 9 Jul 2008 12:01:31 -0000 1.16 +++ sources 10 Mar 2009 10:42:11 -0000 1.17 @@ -1 +1 @@ -f903edd5827eff48835c0d1896cd9962 ocaml-libvirt-0.4.4.2.tar.gz +af774cf259e16ae48c6a203c51ffa231 ocaml-libvirt-0.6.1.0.tar.gz From rjones at fedoraproject.org Tue Mar 10 10:42:47 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 10:42:47 +0000 (UTC) Subject: rpms/ocaml-libvirt/devel .cvsignore, 1.16, 1.17 ocaml-libvirt.spec, 1.27, 1.28 sources, 1.16, 1.17 Message-ID: <20090310104247.E96437002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9266 Modified Files: .cvsignore ocaml-libvirt.spec sources Log Message: New upstream release 0.6.1.0. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 9 Jul 2008 12:01:31 -0000 1.16 +++ .cvsignore 10 Mar 2009 10:42:17 -0000 1.17 @@ -1 +1 @@ -ocaml-libvirt-0.4.4.2.tar.gz +ocaml-libvirt-0.6.1.0.tar.gz Index: ocaml-libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- ocaml-libvirt.spec 26 Feb 2009 07:14:11 -0000 1.27 +++ ocaml-libvirt.spec 10 Mar 2009 10:42:17 -0000 1.28 @@ -5,8 +5,8 @@ %define build_mlvirsh 1 Name: ocaml-libvirt -Version: 0.4.4.2 -Release: 4%{?dist} +Version: 0.6.1.0 +Release: 1%{?dist} Summary: OCaml binding for libvirt Group: Development/Libraries @@ -123,6 +123,9 @@ %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 0.6.1.0-1 +- New upstream release 0.6.1.0. + * Wed Feb 25 2009 Fedora Release Engineering - 0.4.4.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 9 Jul 2008 12:01:31 -0000 1.16 +++ sources 10 Mar 2009 10:42:17 -0000 1.17 @@ -1 +1 @@ -f903edd5827eff48835c0d1896cd9962 ocaml-libvirt-0.4.4.2.tar.gz +af774cf259e16ae48c6a203c51ffa231 ocaml-libvirt-0.6.1.0.tar.gz From lucilanga at fedoraproject.org Tue Mar 10 10:49:56 2009 From: lucilanga at fedoraproject.org (Lucian Langa) Date: Tue, 10 Mar 2009 10:49:56 +0000 (UTC) Subject: rpms/scummvm-tools/devel .cvsignore, 1.2, 1.3 scummvm-tools.spec, 1.2, 1.3 sources, 1.2, 1.3 scummvm-tools-0.12.0-makeinstalltarget.patch, 1.1, NONE Message-ID: <20090310104956.757557002E@cvs1.fedora.phx.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/scummvm-tools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11704 Modified Files: .cvsignore scummvm-tools.spec sources Removed Files: scummvm-tools-0.12.0-makeinstalltarget.patch Log Message: * Tue Mar 10 2009 Lucian Langa - 0.13.0-1 - new upstream release - use SF generic downloads URL - drop patch0 (fixed upstream) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scummvm-tools/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Oct 2008 06:08:09 -0000 1.2 +++ .cvsignore 10 Mar 2009 10:49:25 -0000 1.3 @@ -1 +1 @@ -scummvm-tools-0.12.0.tar.bz2 +scummvm-tools-0.13.0.tar.bz2 Index: scummvm-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/scummvm-tools/devel/scummvm-tools.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scummvm-tools.spec 26 Feb 2009 00:09:51 -0000 1.2 +++ scummvm-tools.spec 10 Mar 2009 10:49:25 -0000 1.3 @@ -1,15 +1,13 @@ Name: scummvm-tools -Version: 0.12.0 -Release: 6%{?dist} +Version: 0.13.0 +Release: 1%{?dist} Summary: Tools for scummVM / S.C.U.M.M scripting language Group: Development/Tools License: GPLv2+ URL: http://scummvm.sourceforge.net -Source0: http://dl.sf.net/scummvm/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/scummvm/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop -#patch submited upstream https://sourceforge.net/tracker2/?func=detail&aid=2174188&group_id=37116&atid=418822 -Patch0: scummvm-tools-0.12.0-makeinstalltarget.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel, libvorbis-devel, flac-devel, desktop-file-utils BuildRequires: zlib-devel @@ -31,7 +29,6 @@ %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .makeinstall sed -i -e "s/-O //g" -e "s/-fno-exceptions//g" Makefile %build @@ -62,6 +59,11 @@ %changelog +* Tue Mar 10 2009 Lucian Langa - 0.13.0-1 +- new upstream release +- use SF generic downloads URL +- drop patch0 (fixed upstream) + * Wed Feb 25 2009 Fedora Release Engineering - 0.12.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scummvm-tools/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Oct 2008 06:08:09 -0000 1.2 +++ sources 10 Mar 2009 10:49:25 -0000 1.3 @@ -1 +1 @@ -af927a7cb59952ed869628250a916ab1 scummvm-tools-0.12.0.tar.bz2 +57031b2b8b209e2e6f705788f2056a3d scummvm-tools-0.13.0.tar.bz2 --- scummvm-tools-0.12.0-makeinstalltarget.patch DELETED --- From hno at fedoraproject.org Tue Mar 10 10:50:38 2009 From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=) Date: Tue, 10 Mar 2009 10:50:38 +0000 (UTC) Subject: rpms/bzr/devel .cvsignore, 1.34, 1.35 bzr.spec, 1.49, 1.50 sources, 1.34, 1.35 Message-ID: <20090310105038.5041C7002E@cvs1.fedora.phx.redhat.com> Author: hno Update of /cvs/pkgs/rpms/bzr/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11899 Modified Files: .cvsignore bzr.spec sources Log Message: 1.13rc1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 13 Feb 2009 20:59:52 -0000 1.34 +++ .cvsignore 10 Mar 2009 10:50:07 -0000 1.35 @@ -1 +1 @@ -bzr-1.12.tar.gz +bzr-1.13rc1.tar.gz Index: bzr.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- bzr.spec 24 Feb 2009 06:15:39 -0000 1.49 +++ bzr.spec 10 Mar 2009 10:50:07 -0000 1.50 @@ -1,11 +1,13 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# bzr major versions uses two digits. Specify subreleases if any in Version: -# release should be 0.N prerelases, N stable releases, starting at 1 on each -# replace % in bzrrc line with # on stable releases -%define bzrver 1.12 -#define bzrrc rc1 -%define release 2 +# All package versioning is found here: +# the actual version is composed from these below, including leading 0 for release candidates +# bzrver: main bzr version +# bzrrc: release candidate version, if any, line starts with % for rc, # for stable releas. +# release: rpm subrelease (0.N for rc candidates, N for stable releases) +%define bzrver 1.13 +%define bzrrc rc1 +%define release 0.1 # Magics to get the dots in Release string correct per the above %define subrelease %{?bzrrc:.}%{?bzrrc} @@ -87,6 +89,9 @@ %endif %changelog +* Tue Mar 10 2009 Henrik Nordstrom - 1.13-0.1.rc1 +- Update to 1.13rc1 + * Mon Feb 23 2009 Fedora Release Engineering - 1.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 13 Feb 2009 20:59:52 -0000 1.34 +++ sources 10 Mar 2009 10:50:07 -0000 1.35 @@ -1 +1 @@ -331ceefccbe39ddff610a1a847bd611a bzr-1.12.tar.gz +b3573a0f6e1a77e9e61a1480ae1c83c2 bzr-1.13rc1.tar.gz From denis at fedoraproject.org Tue Mar 10 11:09:17 2009 From: denis at fedoraproject.org (Denis Leroy) Date: Tue, 10 Mar 2009 11:09:17 +0000 (UTC) Subject: rpms/k3d/devel k3d.spec,1.28,1.29 Message-ID: <20090310110918.1696C7002E@cvs1.fedora.phx.redhat.com> Author: denis Update of /cvs/pkgs/rpms/k3d/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15677 Modified Files: k3d.spec Log Message: Added e2fsprogs BR Index: k3d.spec =================================================================== RCS file: /cvs/pkgs/rpms/k3d/devel/k3d.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- k3d.spec 10 Mar 2009 09:40:44 -0000 1.28 +++ k3d.spec 10 Mar 2009 11:08:44 -0000 1.29 @@ -36,6 +36,7 @@ BuildRequires: gts-devel BuildRequires: librsvg2 BuildRequires: bzip2-devel +BuildRequires: e2fsprogs-devel BuildRequires: libtool doxygen BuildRequires: libpng-devel BuildRequires: cairomm-devel From denis at fedoraproject.org Tue Mar 10 11:20:57 2009 From: denis at fedoraproject.org (Denis Leroy) Date: Tue, 10 Mar 2009 11:20:57 +0000 (UTC) Subject: rpms/k3d/devel k3d.spec,1.29,1.30 Message-ID: <20090310112057.B15CF7002E@cvs1.fedora.phx.redhat.com> Author: denis Update of /cvs/pkgs/rpms/k3d/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18696 Modified Files: k3d.spec Log Message: Added gettext BR Index: k3d.spec =================================================================== RCS file: /cvs/pkgs/rpms/k3d/devel/k3d.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- k3d.spec 10 Mar 2009 11:08:44 -0000 1.29 +++ k3d.spec 10 Mar 2009 11:20:26 -0000 1.30 @@ -37,7 +37,7 @@ BuildRequires: librsvg2 BuildRequires: bzip2-devel BuildRequires: e2fsprogs-devel -BuildRequires: libtool doxygen +BuildRequires: libtool doxygen gettext BuildRequires: libpng-devel BuildRequires: cairomm-devel From rjones at fedoraproject.org Tue Mar 10 11:21:24 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 11:21:24 +0000 (UTC) Subject: rpms/virt-df/devel .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 virt-df.spec, 1.9, 1.10 Message-ID: <20090310112124.1A6027002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/virt-df/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18820 Modified Files: .cvsignore sources virt-df.spec Log Message: - New upstream version 2.1.5. - Remove patch for camlp4, since it's now upstream. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/virt-df/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 21 Oct 2008 09:28:15 -0000 1.5 +++ .cvsignore 10 Mar 2009 11:20:53 -0000 1.6 @@ -1,2 +1 @@ -virt-df-2.1.3.tar.gz -virt-df-2.1.4.tar.gz +virt-df-2.1.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/virt-df/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 21 Oct 2008 09:58:47 -0000 1.6 +++ sources 10 Mar 2009 11:20:53 -0000 1.7 @@ -1 +1 @@ -2669e1d701948355632f2d74889ce115 virt-df-2.1.4.tar.gz +b9143047ca1c4afdc461e3f5c4e47058 virt-df-2.1.5.tar.gz Index: virt-df.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-df/devel/virt-df.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- virt-df.spec 26 Feb 2009 00:30:40 -0000 1.9 +++ virt-df.spec 10 Mar 2009 11:20:53 -0000 1.10 @@ -3,8 +3,8 @@ %define _default_patch_fuzz 2 Name: virt-df -Version: 2.1.4 -Release: 4%{?dist} +Version: 2.1.5 +Release: 1%{?dist} Summary: Utility like 'df' for virtual guests Group: Development/Libraries @@ -14,7 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: virt-df-2.1.4-bogus-zh_CN-plurals.patch -Patch1: virt-df-2.1.4-camlp4-parse.patch BuildRequires: ocaml >= 3.10.2 BuildRequires: ocaml-ocamldoc @@ -51,7 +50,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build @@ -100,6 +98,10 @@ %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 2.1.5-1 +- New upstream version 2.1.5. +- Remove patch for camlp4, since it's now upstream. + * Wed Feb 25 2009 Fedora Release Engineering - 2.1.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rjones at fedoraproject.org Tue Mar 10 11:22:44 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 11:22:44 +0000 (UTC) Subject: rpms/virt-df/F-10 .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 virt-df.spec, 1.7, 1.8 Message-ID: <20090310112244.C30677002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/virt-df/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19282 Modified Files: .cvsignore sources virt-df.spec Log Message: New upstream version 2.1.5. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/virt-df/F-10/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 21 Oct 2008 09:28:15 -0000 1.5 +++ .cvsignore 10 Mar 2009 11:22:14 -0000 1.6 @@ -1,2 +1 @@ -virt-df-2.1.3.tar.gz -virt-df-2.1.4.tar.gz +virt-df-2.1.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/virt-df/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 21 Oct 2008 09:58:47 -0000 1.6 +++ sources 10 Mar 2009 11:22:14 -0000 1.7 @@ -1 +1 @@ -2669e1d701948355632f2d74889ce115 virt-df-2.1.4.tar.gz +b9143047ca1c4afdc461e3f5c4e47058 virt-df-2.1.5.tar.gz Index: virt-df.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-df/F-10/virt-df.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- virt-df.spec 21 Oct 2008 09:58:47 -0000 1.7 +++ virt-df.spec 10 Mar 2009 11:22:14 -0000 1.8 @@ -3,8 +3,8 @@ %define _default_patch_fuzz 2 Name: virt-df -Version: 2.1.4 -Release: 2%{?dist} +Version: 2.1.5 +Release: 1%{?dist} Summary: Utility like 'df' for virtual guests Group: Development/Libraries @@ -98,6 +98,9 @@ %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 2.1.5-1 +- New upstream version 2.1.5. + * Tue Oct 21 2008 Richard W.M. Jones - 2.1.4-2 - Fix incorrect sources file. - Remove bogus Plural-Forms line from zh_CN PO file. From jakub at fedoraproject.org Tue Mar 10 11:23:39 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Tue, 10 Mar 2009 11:23:39 +0000 (UTC) Subject: rpms/gcc/devel .cvsignore, 1.259, 1.260 gcc.spec, 1.28, 1.29 gcc44-cloog-dl.patch, 1.2, 1.3 gcc44-power7.patch, 1.1, 1.2 sources, 1.262, 1.263 Message-ID: <20090310112339.DF2DA7002E@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/gcc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19455 Modified Files: .cvsignore gcc.spec gcc44-cloog-dl.patch gcc44-power7.patch sources Log Message: 4.4.0-0.24 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- .cvsignore 7 Mar 2009 09:16:22 -0000 1.259 +++ .cvsignore 10 Mar 2009 11:23:07 -0000 1.260 @@ -1,3 +1,2 @@ fastjar-0.97.tar.gz -gcc-4.4.0-20090307.tar.bz2 -cloog-ppl-0.15.tar.gz +gcc-4.4.0-20090310.tar.bz2 Index: gcc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- gcc.spec 7 Mar 2009 09:37:59 -0000 1.28 +++ gcc.spec 10 Mar 2009 11:23:08 -0000 1.29 @@ -1,9 +1,9 @@ -%define DATE 20090307 -%define SVNREV 144693 +%define DATE 20090310 +%define SVNREV 144741 %define gcc_version 4.4.0 # Note, gcc_release must be integer, if you want to add suffixes to # %{release}, append them after %{gcc_release} on Release: line. -%define gcc_release 0.23 +%define gcc_release 0.24 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 @@ -51,7 +51,6 @@ Source3: protoize.1 %define fastjar_ver 0.97 Source4: http://download.savannah.nongnu.org/releases/fastjar/fastjar-%{fastjar_ver}.tar.gz -Source5: ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.tar.gz URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Need binutils with -pie support >= 2.14.90.0.4-4 @@ -95,7 +94,7 @@ BuildRequires: libunwind >= 0.98 %endif %if %{build_cloog} -BuildRequires: ppl >= 0.10, ppl-devel >= 0.10 +BuildRequires: ppl >= 0.10, ppl-devel >= 0.10, cloog-ppl >= 0.15, cloog-ppl-devel >= 0.15 %endif Requires: cpp = %{version}-%{release} # Need .eh_frame ld optimizations @@ -122,6 +121,9 @@ Obsoletes: gcc-gnat < %{version}-%{release} Obsoletes: libgnat < %{version}-%{release} %endif +%if %{build_cloog} +Requires: cloog-ppl >= 0.15 +%endif Prereq: /sbin/install-info AutoReq: true @@ -434,15 +436,12 @@ %patch22 -p0 -b .raw-string~ %patch24 -p0 -b .atom~ %patch25 -p0 -b .pr39226~ -#%patch26 -p0 -b .power7~ +%patch26 -p0 -b .power7~ # This testcase doesn't compile. rm libjava/testsuite/libjava.lang/PR35020* tar xzf %{SOURCE4} -%if %{build_cloog} -tar xzf %{SOURCE5} -%endif %patch1000 -p0 -b .fastjar-0.97-segfault~ @@ -497,16 +496,6 @@ cd ../../ %endif -%if %{build_cloog} -mkdir cloog-ppl/obj-%{gcc_target_platform} -cd cloog-ppl/obj-%{gcc_target_platform} -../configure CFLAGS="$RPM_OPT_FLAGS" --prefix=/usr --with-ppl -make %{?_smp_mflags} -make check || : -make install DESTDIR=`cd ../; pwd`/inst/ -cd ../.. -%endif - rm -fr obj-%{gcc_target_platform} mkdir obj-%{gcc_target_platform} cd obj-%{gcc_target_platform} @@ -598,7 +587,7 @@ --disable-libjava-multilib \ %endif %if %{build_cloog} - --with-ppl --with-cloog=`cd ../cloog-ppl/inst/usr/; pwd` \ + --with-ppl --with-cloog \ %endif %ifarch %{arm} --disable-sjlj-exceptions \ @@ -640,10 +629,6 @@ #GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" bootstrap GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" profiledbootstrap -%if %{build_cloog} -cp -a ../cloog-ppl/inst/usr/lib/libcloog.so.0* gcc/ -%endif - # run the tests. make %{?_smp_mflags} -k check ALT_CC_UNDER_TEST=gcc ALT_CXX_UNDER_TEST=g++ RUNTESTFLAGS="--target_board=unix/'{,-fstack-protector}'" || : echo ====================TESTING========================= @@ -748,10 +733,6 @@ FULLPATH=$RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version} FULLEPATH=$RPM_BUILD_ROOT%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version} -%if %{build_cloog} -cp -a ../cloog-ppl/inst/usr/lib/libcloog.so.0* $FULLPATH/ -%endif - # fix some things ln -sf gcc $RPM_BUILD_ROOT%{_prefix}/bin/cc mkdir -p $RPM_BUILD_ROOT/lib @@ -1334,9 +1315,6 @@ %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgomp.spec %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgomp.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgomp.so -%if %{build_cloog} -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libcloog.so.0* -%endif %ifarch sparcv9 ppc %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/crt*.o @@ -1769,6 +1747,13 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Tue Mar 10 2009 Jakub Jelinek 4.4.0-0.24 +- update from trunk + - PRs ada/39221, c++/39060, c++/39367, c++/39371, libfortran/39402, + middle-end/38028, target/39361, tree-optimization/39394 +- use system cloog-ppl instead of building a private libcloog.so.0 (#489183) +- preliminary Power7 support (#463846) + * Sat Mar 7 2009 Jakub Jelinek 4.4.0-0.23 - update from trunk - PRs c++/13549, c++/29469, c++/29607, c++/33492, c++/37520, c++/38908, gcc44-cloog-dl.patch: Index: gcc44-cloog-dl.patch =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-cloog-dl.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gcc44-cloog-dl.patch 27 Jan 2009 17:31:57 -0000 1.2 +++ gcc44-cloog-dl.patch 10 Mar 2009 11:23:08 -0000 1.3 @@ -1,6 +1,5 @@ 2009-01-27 Jakub Jelinek - * toplev.c (save_argv): No longer static. * Makefile.in (BACKENDLIBS): Link against -ldl instead of -lcloog -lppl. (graphite.o): Force -O, remove -fkeep-inline-functions. * graphite.c: Include . Reference libcloog and libppl symbols @@ -9,17 +8,6 @@ (gcc_type_for_iv_of_clast_loop): Rename stmt_for argument to stmt_fora. (graphite_transform_loops): Call init_cloog_pointers. ---- gcc/toplev.c.jj 2008-12-09 23:59:10.000000000 +0100 -+++ gcc/toplev.c 2009-01-27 14:33:52.000000000 +0100 -@@ -128,7 +128,7 @@ static bool no_backend; - const char *progname; - - /* Copy of argument vector to toplev_main. */ --static const char **save_argv; -+const char **save_argv; - - /* Name of top-level original source file (what was input to cpp). - This comes from the #-command at the beginning of the actual input. --- gcc/Makefile.in.jj 2009-01-26 20:50:38.000000000 +0100 +++ gcc/Makefile.in 2009-01-27 14:18:10.000000000 +0100 @@ -915,7 +915,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY) @@ -43,7 +31,7 @@ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mips-tfile.o version.o $(LIBS) --- gcc/graphite.c.jj 2009-01-24 19:59:02.000000000 +0100 +++ gcc/graphite.c 2009-01-27 14:52:08.000000000 +0100 -@@ -59,6 +59,138 @@ along with GCC; see the file COPYING3. +@@ -59,6 +59,110 @@ along with GCC; see the file COPYING3. #include "cloog/cloog.h" #include "graphite.h" @@ -128,39 +116,11 @@ +static bool +init_cloog_pointers (void) +{ -+ void *h = NULL; -+ extern const char **save_argv; -+ char *buf, *p; -+ size_t len; ++ void *h; + + if (cloog_pointers.inited) + return cloog_pointers.h != NULL; -+ len = progname - save_argv[0]; -+ buf = XALLOCAVAR (char, len + sizeof "libcloog.so.0"); -+ memcpy (buf, save_argv[0], len); -+ strcpy (buf + len, "libcloog.so.0"); -+ len += sizeof "libcloog.so.0"; -+ p = strstr (buf, "/libexec/"); -+ if (p != NULL) -+ { -+ while (1) -+ { -+ char *q = strstr (p + 8, "/libexec/"); -+ if (q == NULL) -+ break; -+ p = q; -+ } -+ memmove (p + 4, p + 8, len - (p + 8 - buf)); -+ h = dlopen (buf, RTLD_LAZY); -+ if (h == NULL) -+ { -+ len = progname - save_argv[0]; -+ memcpy (buf, save_argv[0], len); -+ strcpy (buf + len, "libcloog.so.0"); -+ } -+ } -+ if (h == NULL) -+ h = dlopen (buf, RTLD_LAZY); ++ h = dlopen ("libcloog.so.0", RTLD_LAZY); + cloog_pointers.h = h; + if (h == NULL) + return false; gcc44-power7.patch: Index: gcc44-power7.patch =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-power7.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc44-power7.patch 7 Mar 2009 09:21:25 -0000 1.1 +++ gcc44-power7.patch 10 Mar 2009 11:23:08 -0000 1.2 @@ -1,3 +1,10 @@ +2009-03-09 Michael Meissner + + * config/rs6000/vsx.md (vsx_store_update64): Use correct + registers for store with update. + (vsx_store_update32): Ditto. + (vsx_storedf_update): Ditto. + 2009-03-06 Michael Meissner * doc/invoke.texi (-mvsx-scalar-memory): New switch, to switch to @@ -893,7 +900,7 @@ * gcc.target/powerpc/popcount-3.c: Ditto. --- gcc/doc/invoke.texi (.../trunk) (revision 144557) -+++ gcc/doc/invoke.texi (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/doc/invoke.texi (.../branches/ibm/power7-meissner) (revision 144730) @@ -712,7 +712,8 @@ See RS/6000 and PowerPC Options. -maltivec -mno-altivec @gol -mpowerpc-gpopt -mno-powerpc-gpopt @gol @@ -1001,7 +1008,7 @@ @itemx -mfloat-gprs @opindex mfloat-gprs --- gcc/doc/md.texi (.../trunk) (revision 144557) -+++ gcc/doc/md.texi (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/doc/md.texi (.../branches/ibm/power7-meissner) (revision 144730) @@ -1905,7 +1905,19 @@ Address base register Floating point register @@ -1034,7 +1041,7 @@ @item Intel 386--- at file{config/i386/constraints.md} --- gcc/reload.c (.../trunk) (revision 144557) -+++ gcc/reload.c (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/reload.c (.../branches/ibm/power7-meissner) (revision 144730) @@ -6255,8 +6255,14 @@ subst_reloads (rtx insn) *r->where = reloadreg; } @@ -1053,7 +1060,7 @@ } --- gcc/testsuite/gcc.target/powerpc/popcount-3.c (.../trunk) (revision 0) -+++ gcc/testsuite/gcc.target/powerpc/popcount-3.c (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/testsuite/gcc.target/powerpc/popcount-3.c (.../branches/ibm/power7-meissner) (revision 144730) @@ -0,0 +1,9 @@ +/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */ +/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ @@ -1065,7 +1072,7 @@ + return __builtin_popcountl(x); +} --- gcc/testsuite/gcc.target/powerpc/vsx-vector-1.c (.../trunk) (revision 0) -+++ gcc/testsuite/gcc.target/powerpc/vsx-vector-1.c (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/testsuite/gcc.target/powerpc/vsx-vector-1.c (.../branches/ibm/power7-meissner) (revision 144730) @@ -0,0 +1,74 @@ +/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */ +/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ @@ -1142,7 +1149,7 @@ + a[i] = b[i] / c[i]; +} --- gcc/testsuite/gcc.target/powerpc/vsx-vector-2.c (.../trunk) (revision 0) -+++ gcc/testsuite/gcc.target/powerpc/vsx-vector-2.c (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/testsuite/gcc.target/powerpc/vsx-vector-2.c (.../branches/ibm/power7-meissner) (revision 144730) @@ -0,0 +1,74 @@ +/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */ +/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ @@ -1219,7 +1226,7 @@ + a[i] = b[i] / c[i]; +} --- gcc/testsuite/gcc.target/powerpc/vsx-vector-3.c (.../trunk) (revision 0) -+++ gcc/testsuite/gcc.target/powerpc/vsx-vector-3.c (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/testsuite/gcc.target/powerpc/vsx-vector-3.c (.../branches/ibm/power7-meissner) (revision 144730) @@ -0,0 +1,48 @@ +/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */ +/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ @@ -1270,7 +1277,7 @@ + a = b / c; +} --- gcc/testsuite/gcc.target/powerpc/popcount-2.c (.../trunk) (revision 0) -+++ gcc/testsuite/gcc.target/powerpc/popcount-2.c (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/testsuite/gcc.target/powerpc/popcount-2.c (.../branches/ibm/power7-meissner) (revision 144730) @@ -0,0 +1,9 @@ +/* { dg-do compile { target { ilp32 } } } */ +/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ @@ -1282,7 +1289,7 @@ + return __builtin_popcount(x); +} --- gcc/testsuite/gcc.target/powerpc/vsx-vector-4.c (.../trunk) (revision 0) -+++ gcc/testsuite/gcc.target/powerpc/vsx-vector-4.c (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/testsuite/gcc.target/powerpc/vsx-vector-4.c (.../branches/ibm/power7-meissner) (revision 144730) @@ -0,0 +1,48 @@ +/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */ +/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ @@ -1333,7 +1340,7 @@ + a = b / c; +} --- gcc/testsuite/gcc.dg/vmx/vmx.exp (.../trunk) (revision 144557) -+++ gcc/testsuite/gcc.dg/vmx/vmx.exp (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/testsuite/gcc.dg/vmx/vmx.exp (.../branches/ibm/power7-meissner) (revision 144730) @@ -31,7 +31,7 @@ if {![istarget powerpc*-*-*] # nothing but extensions. global DEFAULT_VMXCFLAGS @@ -1344,7 +1351,7 @@ # If the target system supports AltiVec instructions, the default action --- gcc/testsuite/lib/target-supports.exp (.../trunk) (revision 144557) -+++ gcc/testsuite/lib/target-supports.exp (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/testsuite/lib/target-supports.exp (.../branches/ibm/power7-meissner) (revision 144730) @@ -873,6 +873,32 @@ proc check_sse2_hw_available { } { }] } @@ -1430,7 +1437,7 @@ proc check_effective_target_powerpc_ppu_ok { } { --- gcc/config.in (.../trunk) (revision 144557) -+++ gcc/config.in (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config.in (.../branches/ibm/power7-meissner) (revision 144730) @@ -334,12 +334,18 @@ #endif @@ -1452,7 +1459,7 @@ #ifndef USED_FOR_TARGET #undef HAVE_AS_REGISTER_PSEUDO_OP --- gcc/configure.ac (.../trunk) (revision 144557) -+++ gcc/configure.ac (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/configure.ac (.../branches/ibm/power7-meissner) (revision 144730) @@ -2,7 +2,7 @@ # Process this file with autoconf to generate a configuration script. @@ -1518,7 +1525,7 @@ gcc_cv_as_powerpc_gnu_attribute, [2,18,0],, [.gnu_attribute 4,1],, --- gcc/configure (.../trunk) (revision 144557) -+++ gcc/configure (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/configure (.../branches/ibm/power7-meissner) (revision 144730) @@ -23225,7 +23225,7 @@ if test "${gcc_cv_as_powerpc_mfpgpr+set} else gcc_cv_as_powerpc_mfpgpr=no @@ -1609,7 +1616,7 @@ echo $ECHO_N "checking assembler for .gnu_attribute support... $ECHO_C" >&6 if test "${gcc_cv_as_powerpc_gnu_attribute+set}" = set; then --- gcc/config/rs6000/aix53.h (.../trunk) (revision 144557) -+++ gcc/config/rs6000/aix53.h (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/aix53.h (.../branches/ibm/power7-meissner) (revision 144730) @@ -57,20 +57,24 @@ do { \ #undef ASM_SPEC #define ASM_SPEC "-u %{maix64:-a64 %{!mcpu*:-mppc64}} %(asm_cpu)" @@ -1638,7 +1645,7 @@ %{mcpu=rs64a: -mppc} \ %{mcpu=603: -m603} \ --- gcc/config/rs6000/vector.md (.../trunk) (revision 0) -+++ gcc/config/rs6000/vector.md (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/vector.md (.../branches/ibm/power7-meissner) (revision 144730) @@ -0,0 +1,518 @@ +;; Expander definitions for vector support between altivec & vsx. No +;; instructions are in this file, this file provides the generic vector @@ -2159,7 +2166,7 @@ + "VECTOR_UNIT_VSX_P (V2DFmode)" + "") --- gcc/config/rs6000/spe.md (.../trunk) (revision 144557) -+++ gcc/config/rs6000/spe.md (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/spe.md (.../branches/ibm/power7-meissner) (revision 144730) @@ -99,7 +99,7 @@ (define_insn "*divsf3_gpr" ;; Floating point conversion instructions. @@ -2170,7 +2177,7 @@ (unsigned_fix:SI (match_operand:DF 1 "gpc_reg_operand" "r")))] "TARGET_HARD_FLOAT && TARGET_E500_DOUBLE" --- gcc/config/rs6000/constraints.md (.../trunk) (revision 144557) -+++ gcc/config/rs6000/constraints.md (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/constraints.md (.../branches/ibm/power7-meissner) (revision 144730) @@ -17,6 +17,8 @@ ;; along with GCC; see the file COPYING3. If not see ;; . @@ -2213,7 +2220,7 @@ + "Zero vector constant" + (match_test "(op == const0_rtx || op == CONST0_RTX (GET_MODE (op)))")) --- gcc/config/rs6000/predicates.md (.../trunk) (revision 144557) -+++ gcc/config/rs6000/predicates.md (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/predicates.md (.../branches/ibm/power7-meissner) (revision 144730) @@ -38,6 +38,37 @@ (define_predicate "altivec_register_oper || ALTIVEC_REGNO_P (REGNO (op)) || REGNO (op) > LAST_VIRTUAL_REGISTER"))) @@ -2303,7 +2310,7 @@ + return 1; +}) --- gcc/config/rs6000/ppc-asm.h (.../trunk) (revision 144557) -+++ gcc/config/rs6000/ppc-asm.h (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/ppc-asm.h (.../branches/ibm/power7-meissner) (revision 144730) @@ -63,7 +63,7 @@ #define f16 16 #define f17 17 @@ -2458,7 +2465,7 @@ * Macros to glue together two tokens. */ --- gcc/config/rs6000/linux64.opt (.../trunk) (revision 144557) -+++ gcc/config/rs6000/linux64.opt (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/linux64.opt (.../branches/ibm/power7-meissner) (revision 144730) @@ -20,5 +20,5 @@ ; . @@ -2467,7 +2474,7 @@ +Target Report Var(TARGET_PROFILE_KERNEL) Call mcount for profiling before a function prologue --- gcc/config/rs6000/sysv4.opt (.../trunk) (revision 144557) -+++ gcc/config/rs6000/sysv4.opt (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/sysv4.opt (.../branches/ibm/power7-meissner) (revision 144730) @@ -32,7 +32,7 @@ Target RejectNegative Joined Specify bit size of immediate TLS offsets @@ -2492,7 +2499,7 @@ ;; FIXME: Does nothing. --- gcc/config/rs6000/rs6000-protos.h (.../trunk) (revision 144557) -+++ gcc/config/rs6000/rs6000-protos.h (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/rs6000-protos.h (.../branches/ibm/power7-meissner) (revision 144730) @@ -64,9 +64,14 @@ extern int insvdi_rshift_rlwimi_p (rtx, extern int registers_ok_for_quad_peep (rtx, rtx); extern int mems_ok_for_quad_peep (rtx, rtx); @@ -2525,7 +2532,7 @@ +extern unsigned char rs6000_hard_regno_nregs[][FIRST_PSEUDO_REGISTER]; #endif /* rs6000-protos.h */ --- gcc/config/rs6000/t-rs6000 (.../trunk) (revision 144557) -+++ gcc/config/rs6000/t-rs6000 (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/t-rs6000 (.../branches/ibm/power7-meissner) (revision 144730) @@ -16,3 +16,33 @@ rs6000-c.o: $(srcdir)/config/rs6000/rs60 # The rs6000 backend doesn't cause warnings in these files. @@ -2561,7 +2568,7 @@ + $(srcdir)/config/rs6000/dfp.md \ + $(srcdir)/config/rs6000/paired.md --- gcc/config/rs6000/power7.md (.../trunk) (revision 0) -+++ gcc/config/rs6000/power7.md (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/power7.md (.../branches/ibm/power7-meissner) (revision 144730) @@ -0,0 +1,320 @@ +;; Scheduling description for IBM POWER7 processor. +;; Copyright (C) 2009 Free Software Foundation, Inc. @@ -2884,7 +2891,7 @@ + + --- gcc/config/rs6000/rs6000-c.c (.../trunk) (revision 144557) -+++ gcc/config/rs6000/rs6000-c.c (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/rs6000-c.c (.../branches/ibm/power7-meissner) (revision 144730) @@ -265,6 +265,8 @@ rs6000_cpu_cpp_builtins (cpp_reader *pfi builtin_define ("_ARCH_PWR6X"); if (! TARGET_POWER && ! TARGET_POWER2 && ! TARGET_POWERPC) @@ -2904,7 +2911,7 @@ /* May be overridden by target configuration. */ RS6000_CPU_CPP_ENDIAN_BUILTINS(); --- gcc/config/rs6000/rs6000.opt (.../trunk) (revision 144557) -+++ gcc/config/rs6000/rs6000.opt (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/rs6000.opt (.../branches/ibm/power7-meissner) (revision 144730) @@ -111,24 +111,44 @@ mhard-float Target Report RejectNegative InverseMask(SOFT_FLOAT, HARD_FLOAT) Use hardware floating point @@ -2969,7 +2976,7 @@ misel= --- gcc/config/rs6000/linux64.h (.../trunk) (revision 144557) -+++ gcc/config/rs6000/linux64.h (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/linux64.h (.../branches/ibm/power7-meissner) (revision 144730) @@ -114,7 +114,7 @@ extern int dot_symbols; error (INVALID_32BIT, "32"); \ if (TARGET_PROFILE_KERNEL) \ @@ -2980,7 +2987,7 @@ } \ } \ --- gcc/config/rs6000/rs6000.c (.../trunk) (revision 144557) -+++ gcc/config/rs6000/rs6000.c (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/rs6000.c (.../branches/ibm/power7-meissner) (revision 144730) @@ -178,9 +178,6 @@ int rs6000_spe; /* Nonzero if we want SPE ABI extensions. */ int rs6000_spe_abi; @@ -5686,7 +5693,7 @@ else --- gcc/config/rs6000/vsx.md (.../trunk) (revision 0) -+++ gcc/config/rs6000/vsx.md (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/vsx.md (.../branches/ibm/power7-meissner) (revision 144730) @@ -0,0 +1,864 @@ +;; VSX patterns. +;; Copyright (C) 2009 @@ -5840,7 +5847,7 @@ + (plus:DI (match_dup 1) + (match_dup 2)))] + "TARGET_64BIT && TARGET_UPDATE && VECTOR_MEM_VSX_P (mode)" -+ "stxux %x3,%0,%1" ++ "stxux %x3,%0,%2" + [(set_attr "type" "vecstore")]) + +(define_insn "*vsx_store_update32" @@ -5851,7 +5858,7 @@ + (plus:SI (match_dup 1) + (match_dup 2)))] + "TARGET_32BIT && TARGET_UPDATE && VECTOR_MEM_VSX_P (mode)" -+ "stxux %x3,%0,%1" ++ "stxux %x3,%0,%2" + [(set_attr "type" "vecstore")]) + +(define_insn "*vsx_loaddf_update" @@ -5873,7 +5880,7 @@ + (plus:P (match_dup 1) + (match_dup 2)))] + "TARGET_BIT && TARGET_UPDATE && VECTOR_MEM_VSX_P (DFmode)" -+ "stxsdux %x3,%0,%1" ++ "stxsdux %x3,%0,%2" + [(set_attr "type" "vecstore")]) + +;; We may need to have a varient on the pattern for use in the prologue @@ -6553,7 +6560,7 @@ + "xxmrglw %x0,%x1,%x2" + [(set_attr "type" "vecperm")]) --- gcc/config/rs6000/rs6000.h (.../trunk) (revision 144557) -+++ gcc/config/rs6000/rs6000.h (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/rs6000.h (.../branches/ibm/power7-meissner) (revision 144730) @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler, for IBM RS/6000. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, @@ -7286,7 +7293,7 @@ extern GTY(()) tree rs6000_builtin_types[RS6000_BTI_MAX]; --- gcc/config/rs6000/altivec.md (.../trunk) (revision 144557) -+++ gcc/config/rs6000/altivec.md (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/altivec.md (.../branches/ibm/power7-meissner) (revision 144730) @@ -21,18 +21,7 @@ (define_constants @@ -8250,7 +8257,7 @@ (define_expand "vec_interleave_high" [(set (match_operand:VI 0 "register_operand" "") --- gcc/config/rs6000/aix61.h (.../trunk) (revision 144557) -+++ gcc/config/rs6000/aix61.h (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/aix61.h (.../branches/ibm/power7-meissner) (revision 144730) @@ -57,20 +57,24 @@ do { \ #undef ASM_SPEC #define ASM_SPEC "-u %{maix64:-a64 %{!mcpu*:-mppc64}} %(asm_cpu)" @@ -8279,7 +8286,7 @@ %{mcpu=rs64a: -mppc} \ %{mcpu=603: -m603} \ --- gcc/config/rs6000/rs6000.md (.../trunk) (revision 144557) -+++ gcc/config/rs6000/rs6000.md (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/rs6000.md (.../branches/ibm/power7-meissner) (revision 144730) @@ -138,7 +138,7 @@ (define_attr "length" "" ;; Processor type -- this attribute must exactly match the processor_type ;; enumeration in rs6000.h. @@ -8448,11 +8455,11 @@ #" - [(set_attr "type" "compare,compare,compare,delayed_compare,compare,compare,compare,compare") + [(set_attr "type" "compare,fast_compare,fast_compare,delayed_compare,compare,\ -+ compare,compare,compare") ++ compare,compare,compare") (set_attr "length" "8,4,4,4,8,8,8,8")]) - (define_insn "*andsi3_internal5_nomc" -@@ -3141,7 +3161,7 @@ (define_insn "*boolsi3_internal2" + (define_split +@@ -3127,7 +3147,7 @@ (define_insn "*boolsi3_internal2" "@ %q4. %3,%1,%2 #" @@ -8461,7 +8468,7 @@ (set_attr "length" "4,8")]) (define_split -@@ -3170,7 +3190,7 @@ (define_insn "*boolsi3_internal3" +@@ -3156,7 +3176,7 @@ (define_insn "*boolsi3_internal3" "@ %q4. %0,%1,%2 #" @@ -8470,7 +8477,7 @@ (set_attr "length" "4,8")]) (define_split -@@ -3295,7 +3315,7 @@ (define_insn "*boolccsi3_internal2" +@@ -3281,7 +3301,7 @@ (define_insn "*boolccsi3_internal2" "@ %q4. %3,%1,%2 #" @@ -8479,7 +8486,7 @@ (set_attr "length" "4,8")]) (define_split -@@ -3324,7 +3344,7 @@ (define_insn "*boolccsi3_internal3" +@@ -3310,7 +3330,7 @@ (define_insn "*boolccsi3_internal3" "@ %q4. %0,%1,%2 #" @@ -8488,7 +8495,7 @@ (set_attr "length" "4,8")]) (define_split -@@ -5317,7 +5337,7 @@ (define_insn "fres" +@@ -5303,7 +5323,7 @@ (define_insn "fres" "fres %0,%1" [(set_attr "type" "fp")]) @@ -8497,7 +8504,7 @@ [(set (match_operand:SF 0 "gpc_reg_operand" "=f") (plus:SF (mult:SF (match_operand:SF 1 "gpc_reg_operand" "%f") (match_operand:SF 2 "gpc_reg_operand" "f")) -@@ -5328,7 +5348,7 @@ (define_insn "" +@@ -5314,7 +5334,7 @@ (define_insn "" [(set_attr "type" "fp") (set_attr "fp_type" "fp_maddsub_s")]) @@ -8506,7 +8513,7 @@ [(set (match_operand:SF 0 "gpc_reg_operand" "=f") (plus:SF (mult:SF (match_operand:SF 1 "gpc_reg_operand" "%f") (match_operand:SF 2 "gpc_reg_operand" "f")) -@@ -5337,7 +5357,7 @@ (define_insn "" +@@ -5323,7 +5343,7 @@ (define_insn "" "{fma|fmadd} %0,%1,%2,%3" [(set_attr "type" "dmul")]) @@ -8515,7 +8522,7 @@ [(set (match_operand:SF 0 "gpc_reg_operand" "=f") (minus:SF (mult:SF (match_operand:SF 1 "gpc_reg_operand" "%f") (match_operand:SF 2 "gpc_reg_operand" "f")) -@@ -5348,7 +5368,7 @@ (define_insn "" +@@ -5334,7 +5354,7 @@ (define_insn "" [(set_attr "type" "fp") (set_attr "fp_type" "fp_maddsub_s")]) @@ -8524,7 +8531,7 @@ [(set (match_operand:SF 0 "gpc_reg_operand" "=f") (minus:SF (mult:SF (match_operand:SF 1 "gpc_reg_operand" "%f") (match_operand:SF 2 "gpc_reg_operand" "f")) -@@ -5357,7 +5377,7 @@ (define_insn "" +@@ -5343,7 +5363,7 @@ (define_insn "" "{fms|fmsub} %0,%1,%2,%3" [(set_attr "type" "dmul")]) @@ -8533,7 +8540,7 @@ [(set (match_operand:SF 0 "gpc_reg_operand" "=f") (neg:SF (plus:SF (mult:SF (match_operand:SF 1 "gpc_reg_operand" "%f") (match_operand:SF 2 "gpc_reg_operand" "f")) -@@ -5368,7 +5388,7 @@ (define_insn "" +@@ -5354,7 +5374,7 @@ (define_insn "" [(set_attr "type" "fp") (set_attr "fp_type" "fp_maddsub_s")]) @@ -8542,7 +8549,7 @@ [(set (match_operand:SF 0 "gpc_reg_operand" "=f") (minus:SF (mult:SF (neg:SF (match_operand:SF 1 "gpc_reg_operand" "f")) (match_operand:SF 2 "gpc_reg_operand" "f")) -@@ -5379,7 +5399,7 @@ (define_insn "" +@@ -5365,7 +5385,7 @@ (define_insn "" [(set_attr "type" "fp") (set_attr "fp_type" "fp_maddsub_s")]) @@ -8551,7 +8558,7 @@ [(set (match_operand:SF 0 "gpc_reg_operand" "=f") (neg:SF (plus:SF (mult:SF (match_operand:SF 1 "gpc_reg_operand" "%f") (match_operand:SF 2 "gpc_reg_operand" "f")) -@@ -5388,7 +5408,7 @@ (define_insn "" +@@ -5374,7 +5394,7 @@ (define_insn "" "{fnma|fnmadd} %0,%1,%2,%3" [(set_attr "type" "dmul")]) @@ -8560,7 +8567,7 @@ [(set (match_operand:SF 0 "gpc_reg_operand" "=f") (minus:SF (mult:SF (neg:SF (match_operand:SF 1 "gpc_reg_operand" "f")) (match_operand:SF 2 "gpc_reg_operand" "f")) -@@ -5398,7 +5418,7 @@ (define_insn "" +@@ -5384,7 +5404,7 @@ (define_insn "" "{fnma|fnmadd} %0,%1,%2,%3" [(set_attr "type" "dmul")]) @@ -8569,7 +8576,7 @@ [(set (match_operand:SF 0 "gpc_reg_operand" "=f") (neg:SF (minus:SF (mult:SF (match_operand:SF 1 "gpc_reg_operand" "%f") (match_operand:SF 2 "gpc_reg_operand" "f")) -@@ -5409,7 +5429,7 @@ (define_insn "" +@@ -5395,7 +5415,7 @@ (define_insn "" [(set_attr "type" "fp") (set_attr "fp_type" "fp_maddsub_s")]) @@ -8578,7 +8585,7 @@ [(set (match_operand:SF 0 "gpc_reg_operand" "=f") (minus:SF (match_operand:SF 3 "gpc_reg_operand" "f") (mult:SF (match_operand:SF 1 "gpc_reg_operand" "%f") -@@ -5420,7 +5440,7 @@ (define_insn "" +@@ -5406,7 +5426,7 @@ (define_insn "" [(set_attr "type" "fp") (set_attr "fp_type" "fp_maddsub_s")]) @@ -8587,7 +8594,7 @@ [(set (match_operand:SF 0 "gpc_reg_operand" "=f") (neg:SF (minus:SF (mult:SF (match_operand:SF 1 "gpc_reg_operand" "%f") (match_operand:SF 2 "gpc_reg_operand" "f")) -@@ -5429,7 +5449,7 @@ (define_insn "" +@@ -5415,7 +5435,7 @@ (define_insn "" "{fnms|fnmsub} %0,%1,%2,%3" [(set_attr "type" "dmul")]) @@ -8596,7 +8603,7 @@ [(set (match_operand:SF 0 "gpc_reg_operand" "=f") (minus:SF (match_operand:SF 3 "gpc_reg_operand" "f") (mult:SF (match_operand:SF 1 "gpc_reg_operand" "%f") -@@ -5510,9 +5530,18 @@ (define_expand "copysigndf3" +@@ -5496,9 +5516,18 @@ (define_expand "copysigndf3" (match_dup 5)) (match_dup 3) (match_dup 4)))] @@ -8617,7 +8624,7 @@ operands[3] = gen_reg_rtx (DFmode); operands[4] = gen_reg_rtx (DFmode); operands[5] = CONST0_RTX (DFmode); -@@ -5556,12 +5585,12 @@ (define_split +@@ -5542,12 +5571,12 @@ (define_split DONE; }") @@ -8636,7 +8643,7 @@ " { if (rs6000_emit_cmove (operands[0], operands[1], operands[2], operands[3])) -@@ -5578,28 +5607,28 @@ (define_expand "movsicc" +@@ -5564,28 +5593,28 @@ (define_expand "movsicc" ;; leave out the mode in operand 4 and use one pattern, but reload can ;; change the mode underneath our feet and then gets confused trying ;; to reload the value. @@ -8677,7 +8684,7 @@ "* { return output_isel (operands); }" [(set_attr "length" "4")]) -@@ -5647,7 +5676,8 @@ (define_expand "negdf2" +@@ -5633,7 +5662,8 @@ (define_expand "negdf2" (define_insn "*negdf2_fpr" [(set (match_operand:DF 0 "gpc_reg_operand" "=f") (neg:DF (match_operand:DF 1 "gpc_reg_operand" "f")))] @@ -8687,7 +8694,7 @@ "fneg %0,%1" [(set_attr "type" "fp")]) -@@ -5660,14 +5690,16 @@ (define_expand "absdf2" +@@ -5646,14 +5676,16 @@ (define_expand "absdf2" (define_insn "*absdf2_fpr" [(set (match_operand:DF 0 "gpc_reg_operand" "=f") (abs:DF (match_operand:DF 1 "gpc_reg_operand" "f")))] @@ -8706,7 +8713,7 @@ "fnabs %0,%1" [(set_attr "type" "fp")]) -@@ -5682,7 +5714,8 @@ (define_insn "*adddf3_fpr" +@@ -5668,7 +5700,8 @@ (define_insn "*adddf3_fpr" [(set (match_operand:DF 0 "gpc_reg_operand" "=f") (plus:DF (match_operand:DF 1 "gpc_reg_operand" "%f") (match_operand:DF 2 "gpc_reg_operand" "f")))] @@ -8716,7 +8723,7 @@ "{fa|fadd} %0,%1,%2" [(set_attr "type" "fp") (set_attr "fp_type" "fp_addsub_d")]) -@@ -5698,7 +5731,8 @@ (define_insn "*subdf3_fpr" +@@ -5684,7 +5717,8 @@ (define_insn "*subdf3_fpr" [(set (match_operand:DF 0 "gpc_reg_operand" "=f") (minus:DF (match_operand:DF 1 "gpc_reg_operand" "f") (match_operand:DF 2 "gpc_reg_operand" "f")))] @@ -8726,7 +8733,7 @@ "{fs|fsub} %0,%1,%2" [(set_attr "type" "fp") (set_attr "fp_type" "fp_addsub_d")]) -@@ -5714,7 +5748,8 @@ (define_insn "*muldf3_fpr" +@@ -5700,7 +5734,8 @@ (define_insn "*muldf3_fpr" [(set (match_operand:DF 0 "gpc_reg_operand" "=f") (mult:DF (match_operand:DF 1 "gpc_reg_operand" "%f") (match_operand:DF 2 "gpc_reg_operand" "f")))] @@ -8736,7 +8743,7 @@ "{fm|fmul} %0,%1,%2" [(set_attr "type" "dmul") (set_attr "fp_type" "fp_mul_d")]) -@@ -5732,7 +5767,8 @@ (define_insn "*divdf3_fpr" +@@ -5718,7 +5753,8 @@ (define_insn "*divdf3_fpr" [(set (match_operand:DF 0 "gpc_reg_operand" "=f") (div:DF (match_operand:DF 1 "gpc_reg_operand" "f") (match_operand:DF 2 "gpc_reg_operand" "f")))] @@ -8746,7 +8753,7 @@ "{fd|fdiv} %0,%1,%2" [(set_attr "type" "ddiv")]) -@@ -5748,73 +5784,81 @@ (define_expand "recipdf3" +@@ -5734,73 +5770,81 @@ (define_expand "recipdf3" DONE; }) @@ -8842,7 +8849,7 @@ "{fnms|fnmsub} %0,%1,%2,%3" [(set_attr "type" "dmul") (set_attr "fp_type" "fp_maddsub_d")]) -@@ -5823,7 +5867,8 @@ (define_insn "sqrtdf2" +@@ -5809,7 +5853,8 @@ (define_insn "sqrtdf2" [(set (match_operand:DF 0 "gpc_reg_operand" "=f") (sqrt:DF (match_operand:DF 1 "gpc_reg_operand" "f")))] "(TARGET_PPC_GPOPT || TARGET_POWER2) && TARGET_HARD_FLOAT && TARGET_FPRS @@ -8852,7 +8859,7 @@ "fsqrt %0,%1" [(set_attr "type" "dsqrt")]) -@@ -5912,6 +5957,18 @@ (define_expand "fix_truncsfsi2" +@@ -5898,6 +5943,18 @@ (define_expand "fix_truncsfsi2" "TARGET_HARD_FLOAT && !TARGET_FPRS && TARGET_SINGLE_FLOAT" "") @@ -8871,7 +8878,7 @@ ; For each of these conversions, there is a define_expand, a define_insn ; with a '#' template, and a define_split (with C code). The idea is ; to allow constant folding with the template of the define_insn, -@@ -6153,10 +6210,17 @@ (define_insn "fctiwz" +@@ -6139,10 +6196,17 @@ (define_insn "fctiwz" "{fcirz|fctiwz} %0,%1" [(set_attr "type" "fp")]) @@ -8890,7 +8897,7 @@ "friz %0,%1" [(set_attr "type" "fp")]) -@@ -6167,10 +6231,17 @@ (define_insn "btruncsf2" +@@ -6153,10 +6217,17 @@ (define_insn "btruncsf2" "friz %0,%1" [(set_attr "type" "fp")]) @@ -8910,7 +8917,7 @@ "frip %0,%1" [(set_attr "type" "fp")]) -@@ -6181,10 +6252,17 @@ (define_insn "ceilsf2" +@@ -6167,10 +6238,17 @@ (define_insn "ceilsf2" "frip %0,%1" [(set_attr "type" "fp")]) @@ -8930,7 +8937,7 @@ "frim %0,%1" [(set_attr "type" "fp")]) -@@ -6195,6 +6273,7 @@ (define_insn "floorsf2" +@@ -6181,6 +6259,7 @@ (define_insn "floorsf2" "frim %0,%1" [(set_attr "type" "fp")]) @@ -8938,7 +8945,7 @@ (define_insn "rounddf2" [(set (match_operand:DF 0 "gpc_reg_operand" "=f") (unspec:DF [(match_operand:DF 1 "gpc_reg_operand" "f")] UNSPEC_FRIN))] -@@ -6209,6 +6288,12 @@ (define_insn "roundsf2" +@@ -6195,6 +6274,12 @@ (define_insn "roundsf2" "frin %0,%1" [(set_attr "type" "fp")]) @@ -8951,7 +8958,7 @@ ; An UNSPEC is used so we don't have to support SImode in FP registers. (define_insn "stfiwx" [(set (match_operand:SI 0 "memory_operand" "=Z") -@@ -6224,17 +6309,40 @@ (define_expand "floatsisf2" +@@ -6210,17 +6295,40 @@ (define_expand "floatsisf2" "TARGET_HARD_FLOAT && !TARGET_FPRS" "") @@ -8996,7 +9003,7 @@ "fctidz %0,%1" [(set_attr "type" "fp")]) -@@ -7623,7 +7731,7 @@ (define_insn "anddi3_mc" +@@ -7609,7 +7717,7 @@ (define_insn "anddi3_mc" andi. %0,%1,%b2 andis. %0,%1,%u2 #" @@ -9005,7 +9012,7 @@ (set_attr "length" "4,4,4,4,4,8")]) (define_insn "anddi3_nomc" -@@ -7681,7 +7789,9 @@ (define_insn "*anddi3_internal2_mc" +@@ -7667,7 +7775,9 @@ (define_insn "*anddi3_internal2_mc" # # #" @@ -9015,8 +9022,8 @@ + compare,compare") (set_attr "length" "4,4,4,4,4,8,8,8,8,8,8,12")]) - (define_insn "*anddi3_internal2_nomc" -@@ -7744,7 +7854,9 @@ (define_insn "*anddi3_internal3_mc" + (define_split +@@ -7718,7 +7828,9 @@ (define_insn "*anddi3_internal3_mc" # # #" @@ -9026,8 +9033,8 @@ + compare,compare") (set_attr "length" "4,4,4,4,4,8,8,8,8,8,8,12")]) - (define_insn "*anddi3_internal3_nomc" -@@ -7896,7 +8008,7 @@ (define_insn "*booldi3_internal2" + (define_split +@@ -7858,7 +7970,7 @@ (define_insn "*booldi3_internal2" "@ %q4. %3,%1,%2 #" @@ -9036,7 +9043,7 @@ (set_attr "length" "4,8")]) (define_split -@@ -7925,7 +8037,7 @@ (define_insn "*booldi3_internal3" +@@ -7887,7 +7999,7 @@ (define_insn "*booldi3_internal3" "@ %q4. %0,%1,%2 #" @@ -9045,7 +9052,7 @@ (set_attr "length" "4,8")]) (define_split -@@ -7996,7 +8108,7 @@ (define_insn "*boolcdi3_internal2" +@@ -7958,7 +8070,7 @@ (define_insn "*boolcdi3_internal2" "@ %q4. %3,%2,%1 #" @@ -9054,7 +9061,7 @@ (set_attr "length" "4,8")]) (define_split -@@ -8025,7 +8137,7 @@ (define_insn "*boolcdi3_internal3" +@@ -7987,7 +8099,7 @@ (define_insn "*boolcdi3_internal3" "@ %q4. %0,%2,%1 #" @@ -9063,7 +9070,7 @@ (set_attr "length" "4,8")]) (define_split -@@ -8062,7 +8174,7 @@ (define_insn "*boolccdi3_internal2" +@@ -8024,7 +8136,7 @@ (define_insn "*boolccdi3_internal2" "@ %q4. %3,%1,%2 #" @@ -9072,7 +9079,7 @@ (set_attr "length" "4,8")]) (define_split -@@ -8091,7 +8203,7 @@ (define_insn "*boolccdi3_internal3" +@@ -8053,7 +8165,7 @@ (define_insn "*boolccdi3_internal3" "@ %q4. %0,%1,%2 #" @@ -9081,7 +9088,7 @@ (set_attr "length" "4,8")]) (define_split -@@ -8108,6 +8220,51 @@ (define_split +@@ -8070,6 +8182,51 @@ (define_split (compare:CC (match_dup 0) (const_int 0)))] "") @@ -9133,7 +9140,7 @@ ;; Now define ways of moving data around. -@@ -8511,8 +8668,8 @@ (define_split +@@ -8473,8 +8630,8 @@ (define_split ;; The "??" is a kludge until we can figure out a more reasonable way ;; of handling these non-offsettable values. (define_insn "*movdf_hardfloat32" @@ -9144,7 +9151,7 @@ "! TARGET_POWERPC64 && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_DOUBLE_FLOAT && (gpc_reg_operand (operands[0], DFmode) || gpc_reg_operand (operands[1], DFmode))" -@@ -8591,19 +8748,30 @@ (define_insn "*movdf_hardfloat32" +@@ -8553,19 +8710,30 @@ (define_insn "*movdf_hardfloat32" return \"\"; } case 3: @@ -9180,7 +9187,7 @@ (define_insn "*movdf_softfloat32" [(set (match_operand:DF 0 "nonimmediate_operand" "=r,r,m,r,r,r") -@@ -8651,19 +8819,26 @@ (define_insn "*movdf_softfloat32" +@@ -8613,19 +8781,26 @@ (define_insn "*movdf_softfloat32" ; ld/std require word-aligned displacements -> 'Y' constraint. ; List Y->r and r->Y before r->r for reload. (define_insn "*movdf_hardfloat64_mfpgpr" @@ -9210,7 +9217,7 @@ mt%0 %1 mf%1 %0 {cror 0,0,0|nop} -@@ -8672,33 +8847,40 @@ (define_insn "*movdf_hardfloat64_mfpgpr" +@@ -8634,33 +8809,40 @@ (define_insn "*movdf_hardfloat64_mfpgpr" # mftgpr %0,%1 mffgpr %0,%1" @@ -9258,7 +9265,7 @@ (define_insn "*movdf_softfloat64" [(set (match_operand:DF 0 "nonimmediate_operand" "=r,Y,r,cl,r,r,r,r,*h") -@@ -9275,15 +9457,16 @@ (define_insn "*movti_string" +@@ -9237,15 +9419,16 @@ (define_insn "*movti_string" (define_insn "*movti_ppc64" [(set (match_operand:TI 0 "nonimmediate_operand" "=r,o<>,r") (match_operand:TI 1 "input_operand" "r,r,m"))] @@ -9278,7 +9285,7 @@ [(set (match_dup 2) (match_dup 4)) (set (match_dup 3) (match_dup 5))] " -@@ -9309,7 +9492,7 @@ (define_split +@@ -9271,7 +9454,7 @@ (define_split (define_split [(set (match_operand:TI 0 "nonimmediate_operand" "") (match_operand:TI 1 "input_operand" ""))] @@ -9287,7 +9294,7 @@ && gpr_or_gpr_p (operands[0], operands[1])" [(pc)] { rs6000_split_multireg_move (operands[0], operands[1]); DONE; }) -@@ -14929,6 +15112,8 @@ (define_insn "prefetch" +@@ -14891,6 +15074,8 @@ (define_insn "prefetch" (include "sync.md") @@ -9297,7 +9304,7 @@ (include "spe.md") (include "dfp.md") --- gcc/config/rs6000/e500.h (.../trunk) (revision 144557) -+++ gcc/config/rs6000/e500.h (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/e500.h (.../branches/ibm/power7-meissner) (revision 144730) @@ -37,6 +37,8 @@ { \ if (TARGET_ALTIVEC) \ @@ -9308,7 +9315,7 @@ error ("64-bit E500 not supported"); \ if (TARGET_HARD_FLOAT && TARGET_FPRS) \ --- gcc/config/rs6000/driver-rs6000.c (.../trunk) (revision 144557) -+++ gcc/config/rs6000/driver-rs6000.c (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/driver-rs6000.c (.../branches/ibm/power7-meissner) (revision 144730) @@ -343,11 +343,115 @@ detect_processor_aix (void) #endif /* _AIX */ @@ -9490,7 +9497,7 @@ } --- gcc/config/rs6000/sysv4.h (.../trunk) (revision 144557) -+++ gcc/config/rs6000/sysv4.h (.../branches/ibm/power7-meissner) (revision 144692) ++++ gcc/config/rs6000/sysv4.h (.../branches/ibm/power7-meissner) (revision 144730) @@ -119,9 +119,9 @@ do { \ else if (!strcmp (rs6000_abi_name, "i960-old")) \ { \ Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- sources 7 Mar 2009 09:16:22 -0000 1.262 +++ sources 10 Mar 2009 11:23:08 -0000 1.263 @@ -1,3 +1,2 @@ 2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz -79ee98a73c0cbab32938bbf5d85f086b gcc-4.4.0-20090307.tar.bz2 -716b7a0823f96c9d02c1703a9c47d387 cloog-ppl-0.15.tar.gz +f6c306d03c8512974488b21eee60a438 gcc-4.4.0-20090310.tar.bz2 From ovasik at fedoraproject.org Tue Mar 10 11:25:31 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Tue, 10 Mar 2009 11:25:31 +0000 (UTC) Subject: rpms/jadetex/devel jadetex.spec,1.22,1.23 Message-ID: <20090310112531.A9FDD7002E@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/jadetex/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19951 Modified Files: jadetex.spec Log Message: cleanup after post scriptlet (no .log files in web2c dir) Index: jadetex.spec =================================================================== RCS file: /cvs/extras/rpms/jadetex/devel/jadetex.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- jadetex.spec 9 Mar 2009 16:58:43 -0000 1.22 +++ jadetex.spec 10 Mar 2009 11:25:01 -0000 1.23 @@ -1,6 +1,6 @@ Name: jadetex Version: 3.13 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Publishing Summary: TeX macros used by Jade TeX output @@ -63,6 +63,8 @@ %post [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : %{_bindir}/env - PATH=$PATH:%{_bindir} fmtutil-sys --cnffile %{_datadir}/texmf/tex/jadetex/jadefmtutil.cnf --all --fmtdir %{_datadir}/texmf/web2c > /dev/null 2>&1 +rm -f %{_datadir}/texmf/web2c/jadetex.log +rm -f %{_datadir}/texmf/web2c/pdfjadetex.log restorecon -R /usr/share/texmf/web2c exit 0 @@ -94,6 +96,9 @@ exit 0 %changelog +* Tue Mar 10 2009 Ondrej Vasik 3.13-5 +- cleanup after post scriptlet (no .log files in web2c dir) + * Mon Mar 9 2009 Ondrej Vasik 3.13-4 - run restorecon -R /usr/share/texmf/web2c in post to prevent mishandled context (#448101) From hadess at fedoraproject.org Tue Mar 10 11:39:53 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 10 Mar 2009 11:39:53 +0000 (UTC) Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.64,1.65 Message-ID: <20090310113953.74AF27002E@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-bluetooth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23146 Modified Files: gnome-bluetooth.spec Log Message: * Tue Mar 10 2009 - Bastien Nocera - 2.27.1-4 - Make the -libs-devel obsolete and provide the -devel package, so we can actually upgrade... Index: gnome-bluetooth.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- gnome-bluetooth.spec 5 Mar 2009 00:21:11 -0000 1.64 +++ gnome-bluetooth.spec 10 Mar 2009 11:39:22 -0000 1.65 @@ -1,6 +1,6 @@ Name: gnome-bluetooth Version: 2.27.1 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Bluetooth graphical utilities Group: Applications/Communications @@ -53,6 +53,8 @@ License: LGPLv2+ Requires: %{name}-libs = %{version}-%{release} Requires: gtk-doc pkgconfig +Obsoletes: gnome-bluetooth-devel +Provides: gnome-bluetooth-devel %description libs-devel This package contains the libraries amd header files that are needed @@ -158,6 +160,10 @@ %{_datadir}/gtk-doc/html/gnome-bluetooth/ %changelog +* Tue Mar 10 2009 - Bastien Nocera - 2.27.1-4 +- Make the -libs-devel obsolete and provide the -devel package, so + we can actually upgrade... + * Thu Mar 05 2009 - Bastien Nocera - 2.27.1-3 - Add patch to fix sendto From fabbione at fedoraproject.org Tue Mar 10 11:42:45 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Tue, 10 Mar 2009 11:42:45 +0000 (UTC) Subject: rpms/corosync/devel corosync-trunk.diff, 1.4, 1.5 corosync.spec, 1.21, 1.22 Message-ID: <20090310114245.962497002E@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/corosync/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23775 Modified Files: corosync-trunk.diff corosync.spec Log Message: Update the corosync-trunk patch for real this time. corosync-trunk.diff: Index: corosync-trunk.diff =================================================================== RCS file: /cvs/pkgs/rpms/corosync/devel/corosync-trunk.diff,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- corosync-trunk.diff 9 Mar 2009 09:53:20 -0000 1.4 +++ corosync-trunk.diff 10 Mar 2009 11:42:15 -0000 1.5 @@ -64,7 +64,7 @@ pthread_exit (0); diff -Naurd corosync-0.94.orig/exec/logsys.c corosync-trunk/exec/logsys.c --- corosync-0.94.orig/exec/logsys.c 2009-01-23 15:25:30.000000000 +0100 -+++ corosync-trunk/exec/logsys.c 2009-03-06 08:09:24.000000000 +0100 ++++ corosync-trunk/exec/logsys.c 2009-03-10 09:03:50.000000000 +0100 @@ -112,8 +112,6 @@ static int logsys_facility = LOG_DAEMON; @@ -83,21 +83,45 @@ static int log_requests_pending = 0; -@@ -875,7 +873,10 @@ +@@ -875,11 +873,25 @@ { pthread_mutex_lock (&logsys_config_mutex); - logsys_format = format; -+ if (format) -+ format_buffer = format; -+ else -+ format_buffer = "[%6s] %b"; ++ if (format_buffer) { ++ free(format_buffer); ++ format_buffer = NULL; ++ } ++ ++ if (format) { ++ format_buffer = strdup(format); ++ } else { ++ format_buffer = strdup("[%6s] %b"); ++ } pthread_mutex_unlock (&logsys_config_mutex); } + ++char *logsys_format_get (void) ++{ ++ return format_buffer; ++} ++ + void logsys_config_facility_set (char *name, unsigned int facility) + { + pthread_mutex_lock (&logsys_config_mutex); diff -Naurd corosync-0.94.orig/exec/main.c corosync-trunk/exec/main.c --- corosync-0.94.orig/exec/main.c 2009-02-25 12:14:47.000000000 +0100 -+++ corosync-trunk/exec/main.c 2009-03-06 08:38:34.000000000 +0100 ++++ corosync-trunk/exec/main.c 2009-03-09 13:59:40.000000000 +0100 +@@ -83,7 +83,7 @@ + LOG_MODE_OUTPUT_STDERR | LOG_MODE_THREADED | LOG_MODE_FORK, + NULL, + LOG_DAEMON, +- "[%6s] %b", ++ NULL, + 1000000); + + LOGSYS_DECLARE_SUBSYS ("MAIN", LOG_INFO); @@ -448,13 +448,6 @@ return (totempg_groups_mcast_joined (corosync_group_handle, iovec, iov_len, guarantee)); } @@ -114,7 +138,7 @@ char *error_string; diff -Naurd corosync-0.94.orig/exec/mainconfig.c corosync-trunk/exec/mainconfig.c --- corosync-0.94.orig/exec/mainconfig.c 2009-02-25 12:14:47.000000000 +0100 -+++ corosync-trunk/exec/mainconfig.c 2009-03-04 11:14:36.000000000 +0100 ++++ corosync-trunk/exec/mainconfig.c 2009-03-09 13:59:40.000000000 +0100 @@ -158,16 +158,14 @@ } } @@ -126,7 +150,7 @@ } else if (strcmp (value, "off") == 0) { - main_config->logmode &= ~LOG_MODE_DISPLAY_TIMESTAMP; -+ logsys_format_set("[%6s] %b"); ++ logsys_format_set(NULL); } else { goto parse_error; } @@ -358,6 +382,18 @@ int (*sync_request) ( char *service_name); +diff -Naurd corosync-0.94.orig/include/corosync/engine/logsys.h corosync-trunk/include/corosync/engine/logsys.h +--- corosync-0.94.orig/include/corosync/engine/logsys.h 2009-01-16 09:59:09.000000000 +0100 ++++ corosync-trunk/include/corosync/engine/logsys.h 2009-03-10 09:03:50.000000000 +0100 +@@ -97,6 +97,8 @@ + extern void logsys_format_set ( + char *format); + ++extern char *logsys_format_get (void); ++ + extern unsigned int logsys_config_subsys_set ( + const char *subsys, + unsigned int tags, diff -Naurd corosync-0.94.orig/include/corosync/ipc_cfg.h corosync-trunk/include/corosync/ipc_cfg.h --- corosync-0.94.orig/include/corosync/ipc_cfg.h 2009-02-19 03:23:58.000000000 +0100 +++ corosync-trunk/include/corosync/ipc_cfg.h 2009-03-06 11:07:35.000000000 +0100 @@ -629,6 +665,42 @@ res = api->totem_mcast (req_exec_evs_mcast_iovec, 3, TOTEM_AGREED); if (res == 0) { error = CS_OK; +diff -Naurd corosync-0.94.orig/test/logsysbench.c corosync-trunk/test/logsysbench.c +--- corosync-0.94.orig/test/logsysbench.c 2008-10-30 23:25:56.000000000 +0100 ++++ corosync-trunk/test/logsysbench.c 2009-03-09 13:59:40.000000000 +0100 +@@ -42,7 +42,7 @@ + LOG_MODE_OUTPUT_STDERR | LOG_MODE_THREADED, + NULL, + LOG_DAEMON, +- "[%6s] %b", ++ NULL, + 100000); + + LOGSYS_DECLARE_NOSUBSYS(LOG_LEVEL_INFO); +diff -Naurd corosync-0.94.orig/test/logsysrec.c corosync-trunk/test/logsysrec.c +--- corosync-0.94.orig/test/logsysrec.c 2008-10-30 23:25:56.000000000 +0100 ++++ corosync-trunk/test/logsysrec.c 2009-03-09 13:59:40.000000000 +0100 +@@ -39,7 +39,7 @@ + LOG_MODE_OUTPUT_STDERR | LOG_MODE_THREADED, + NULL, + LOG_DAEMON, +- "[%6s] %b", ++ NULL, + 100000); + + LOGSYS_DECLARE_NOSUBSYS(LOG_LEVEL_INFO); +diff -Naurd corosync-0.94.orig/test/logsys_t2.c corosync-trunk/test/logsys_t2.c +--- corosync-0.94.orig/test/logsys_t2.c 2008-10-30 23:25:56.000000000 +0100 ++++ corosync-trunk/test/logsys_t2.c 2009-03-09 13:59:40.000000000 +0100 +@@ -39,7 +39,7 @@ + LOG_MODE_OUTPUT_STDERR | LOG_MODE_THREADED, + NULL, + LOG_DAEMON, +- "[%6s] %b" ++ NULL, + 100000); + + LOGSYS_DECLARE_NOSUBSYS(LOG_LEVEL_INFO); diff -Naurd corosync-0.94.orig/tools/corosync-cfgtool.c corosync-trunk/tools/corosync-cfgtool.c --- corosync-0.94.orig/tools/corosync-cfgtool.c 2009-02-13 10:21:57.000000000 +0100 +++ corosync-trunk/tools/corosync-cfgtool.c 2009-03-06 11:07:35.000000000 +0100 Index: corosync.spec =================================================================== RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- corosync.spec 10 Mar 2009 11:34:31 -0000 1.21 +++ corosync.spec 10 Mar 2009 11:42:15 -0000 1.22 @@ -3,7 +3,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 0.94 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} License: BSD Group: System Environment/Base URL: http://www.openais.org @@ -192,6 +192,9 @@ %{_mandir}/man8/votequorum_overview.8* %changelog +* Tue Mar 10 2009 Fabio M. Di Nitto - 0.94-5.svn1797 +- Update the corosync-trunk patch for real this time. + * Tue Mar 10 2009 Fabio M. Di Nitto - 0.94-4.svn1797 - Import fixes from upstream: * Cleanup logsys format init around to use default settings (1795) From fabbione at fedoraproject.org Tue Mar 10 11:35:02 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Tue, 10 Mar 2009 11:35:02 +0000 (UTC) Subject: rpms/corosync/devel corosync-1807.diff, NONE, 1.1 corosync.spec, 1.20, 1.21 Message-ID: <20090310113502.F3DBD7002E@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/corosync/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22052 Modified Files: corosync.spec Added Files: corosync-1807.diff Log Message: Cherry pick changes from upstream to unbreak some basic functionalities corosync-1807.diff: --- NEW FILE corosync-1807.diff --- diff -Naurd corosync-trunk.orig/exec/vsf_quorum.c corosync-trunk/exec/vsf_quorum.c --- corosync-trunk.orig/exec/vsf_quorum.c 2009-02-25 12:14:47.000000000 +0100 +++ corosync-trunk/exec/vsf_quorum.c 2009-03-10 09:51:09.000000000 +0100 @@ -116,8 +116,6 @@ log_printf (LOG_LEVEL_NOTICE, "This node is within the non-primary component and will NOT provide any services.\n"); } - memcpy(&quorum_ring_id, ring_id, sizeof (quorum_ring_id)); - quorum_view_list_entries = view_list_entries; /* Tell sync() only if there is a new ring_id (ie this is not a 'fake' quorum event) */ @@ -125,6 +123,7 @@ sync_primary_callback_fn(view_list, view_list_entries, primary_designated, ring_id); } + memcpy(&quorum_ring_id, ring_id, sizeof (quorum_ring_id)); memcpy(quorum_view_list, view_list, sizeof(unsigned int)*view_list_entries); /* Tell internal listeners */ Index: corosync.spec =================================================================== RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- corosync.spec 9 Mar 2009 09:53:21 -0000 1.20 +++ corosync.spec 10 Mar 2009 11:34:31 -0000 1.21 @@ -1,15 +1,16 @@ -%define alphatag svn1794 +%define alphatag svn1797 Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 0.94 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} License: BSD Group: System Environment/Base URL: http://www.openais.org Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz Patch0: corosync-bump-soname.diff Patch1: corosync-trunk.diff +Patch2: corosync-1807.diff # Runtime bits Requires: corosynclib = %{version}-%{release} @@ -27,6 +28,7 @@ %setup -q -n corosync-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -190,6 +192,13 @@ %{_mandir}/man8/votequorum_overview.8* %changelog +* Tue Mar 10 2009 Fabio M. Di Nitto - 0.94-4.svn1797 +- Import fixes from upstream: + * Cleanup logsys format init around to use default settings (1795) + * logsys_format_set should use its own internal copy of format_buffer (1796) + * Add logsys_format_get to logsys API (1797) +- Cherry pick svn1807 to unbreak CPG. + * Mon Mar 9 2009 Fabio M. Di Nitto - 0.94-3.svn1794 - Import fixes from upstream: * Add reserve/release feature to totem message queue space (1793) From atkac at fedoraproject.org Tue Mar 10 11:54:15 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Tue, 10 Mar 2009 11:54:15 +0000 (UTC) Subject: rpms/bind/devel bind.spec,1.305,1.306 libbind.pc,1.4,NONE Message-ID: <20090310115416.29B5E7002E@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/bind/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27075 Modified Files: bind.spec Removed Files: libbind.pc Log Message: - enable DNSSEC only if it is enabled in sysconfig/dnssec Index: bind.spec =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v retrieving revision 1.305 retrieving revision 1.306 diff -u -r1.305 -r1.306 --- bind.spec 9 Mar 2009 20:35:34 -0000 1.305 +++ bind.spec 10 Mar 2009 11:53:41 -0000 1.306 @@ -20,7 +20,7 @@ Name: bind License: ISC Version: 9.6.0 -Release: 9.%{PATCHVER}%{?dist} +Release: 10.%{PATCHVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -377,9 +377,14 @@ # rndc.key has to have correct perms and ownership, CVE-2007-6283 [ -e /etc/rndc.key ] && chown root:named /etc/rndc.key [ -e /etc/rndc.key ] && chmod 0640 /etc/rndc.key - # Enable DNSSEC per default - [ -x /usr/sbin/dnssec-configure ] && \ - dnssec-configure -b --norestart --dnssec=on --dlv=off > /dev/null 2>&1 + + # Check DNSSEC settings if this is a fresh install + if [ -r /etc/sysconfig/dnssec ]; then + . /etc/sysconfig/dnssec + [ -x /usr/sbin/dnssec-configure ] && \ + dnssec-configure -b --norestart --dnssec="$DNSSEC" --dlv="$DLV" > \ + /dev/null 2>&1 + fi; fi :; @@ -564,6 +569,9 @@ %ghost %{chroot_prefix}/etc/localtime %changelog +* Tue Mar 10 2009 Adam Tkac 32:9.6.0-10.P1 +- enable DNSSEC only if it is enabled in sysconfig/dnssec + * Mon Mar 09 2009 Adam Tkac 32:9.6.0-9.P1 - add DNSSEC support to initscript, enabled it per default - add requires dnssec-conf --- libbind.pc DELETED --- From jfch2222 at fedoraproject.org Tue Mar 10 11:55:14 2009 From: jfch2222 at fedoraproject.org (Jan F. Chadima) Date: Tue, 10 Mar 2009 11:55:14 +0000 (UTC) Subject: rpms/openssh/devel openssh-5.2p1-fips.patch, NONE, 1.1 openssh-5.2p1-nss-keys.patch, NONE, 1.1 openssh-5.2p1-redhat.patch, NONE, 1.1 openssh-5.2p1-selinux.patch, NONE, 1.1 openssh-5.2p1-vendor.patch, NONE, 1.1 openssh.spec, 1.137, 1.138 openssh-5.1p1-bannerlen.patch, 1.1, NONE openssh-5.1p1-compat-sessions.patch, 1.1, NONE openssh-5.1p1-fips.patch, 1.1, NONE openssh-5.1p1-nss-keys.patch, 1.2, NONE openssh-5.1p1-redhat.patch, 1.2, NONE openssh-5.1p1-selinux.patch, 1.1, NONE openssh-5.1p1-vendor.patch, 1.1, NONE Message-ID: <20090310115514.9FAD57002E@cvs1.fedora.phx.redhat.com> Author: jfch2222 Update of /cvs/pkgs/rpms/openssh/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27146 Modified Files: openssh.spec Added Files: openssh-5.2p1-fips.patch openssh-5.2p1-nss-keys.patch openssh-5.2p1-redhat.patch openssh-5.2p1-selinux.patch openssh-5.2p1-vendor.patch Removed Files: openssh-5.1p1-bannerlen.patch openssh-5.1p1-compat-sessions.patch openssh-5.1p1-fips.patch openssh-5.1p1-nss-keys.patch openssh-5.1p1-redhat.patch openssh-5.1p1-selinux.patch openssh-5.1p1-vendor.patch Log Message: Bounce openssh to version 5.2p1 openssh-5.2p1-fips.patch: --- NEW FILE openssh-5.2p1-fips.patch --- diff -up openssh-5.2p1/auth2-pubkey.c.fips openssh-5.2p1/auth2-pubkey.c --- openssh-5.2p1/auth2-pubkey.c.fips 2009-03-10 03:51:55.047234449 +0100 +++ openssh-5.2p1/auth2-pubkey.c 2009-03-10 03:51:56.174214480 +0100 @@ -33,6 +33,7 @@ #include #include #include +#include #include "xmalloc.h" #include "ssh.h" @@ -243,7 +244,7 @@ user_key_allowed2(struct passwd *pw, Key found_key = 1; debug("matching key found: file %s, line %lu", file, linenum); - fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX); + fp = key_fingerprint(found, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); verbose("Found matching %s key: %s", key_type(found), fp); xfree(fp); diff -up openssh-5.2p1/cipher.c.fips openssh-5.2p1/cipher.c --- openssh-5.2p1/cipher.c.fips 2009-03-09 09:47:30.000000000 +0100 +++ openssh-5.2p1/cipher.c 2009-03-10 03:51:56.297398184 +0100 @@ -40,6 +40,7 @@ #include #include +#include #include #include @@ -93,6 +94,22 @@ struct Cipher { { NULL, SSH_CIPHER_INVALID, 0, 0, 0, 0, NULL } }; +struct Cipher fips_ciphers[] = { + { "none", SSH_CIPHER_NONE, 8, 0, 0, 0, EVP_enc_null }, + { "3des", SSH_CIPHER_3DES, 8, 16, 0, 1, evp_ssh1_3des }, + + { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, 1, EVP_des_ede3_cbc }, + { "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, 0, 1, EVP_aes_128_cbc }, + { "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, 0, 1, EVP_aes_192_cbc }, + { "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc }, + { "rijndael-cbc at lysator.liu.se", + SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc }, + { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, 0, 0, evp_aes_128_ctr }, + { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, 0, 0, evp_aes_128_ctr }, + { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, 0, 0, evp_aes_128_ctr }, + { NULL, SSH_CIPHER_INVALID, 0, 0, 0, 0, NULL } +}; + /*--*/ u_int @@ -135,7 +152,7 @@ Cipher * cipher_by_name(const char *name) { Cipher *c; - for (c = ciphers; c->name != NULL; c++) + for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++) if (strcmp(c->name, name) == 0) return c; return NULL; @@ -145,7 +162,7 @@ Cipher * cipher_by_number(int id) { Cipher *c; - for (c = ciphers; c->name != NULL; c++) + for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++) if (c->number == id) return c; return NULL; @@ -189,7 +206,7 @@ cipher_number(const char *name) Cipher *c; if (name == NULL) return -1; - for (c = ciphers; c->name != NULL; c++) + for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++) if (strcasecmp(c->name, name) == 0) return c->number; return -1; diff -up openssh-5.2p1/mac.c.fips openssh-5.2p1/mac.c --- openssh-5.2p1/mac.c.fips 2008-06-13 02:58:50.000000000 +0200 +++ openssh-5.2p1/mac.c 2009-03-10 03:51:56.227222184 +0100 @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -47,14 +48,14 @@ #define SSH_EVP 1 /* OpenSSL EVP-based MAC */ #define SSH_UMAC 2 /* UMAC (not integrated with OpenSSL) */ -struct { +struct Macs { char *name; int type; const EVP_MD * (*mdfunc)(void); int truncatebits; /* truncate digest if != 0 */ int key_len; /* just for UMAC */ int len; /* just for UMAC */ -} macs[] = { +} all_macs[] = { { "hmac-sha1", SSH_EVP, EVP_sha1, 0, -1, -1 }, { "hmac-sha1-96", SSH_EVP, EVP_sha1, 96, -1, -1 }, { "hmac-md5", SSH_EVP, EVP_md5, 0, -1, -1 }, @@ -65,9 +66,15 @@ struct { { NULL, 0, NULL, 0, -1, -1 } }; +struct Macs fips_macs[] = { + { "hmac-sha1", SSH_EVP, EVP_sha1, 0, -1, -1 }, + { NULL, 0, NULL, 0, -1, -1 } +}; + static void mac_setup_by_id(Mac *mac, int which) { + struct Macs *macs = FIPS_mode() ? fips_macs : all_macs; int evp_len; mac->type = macs[which].type; if (mac->type == SSH_EVP) { @@ -88,6 +95,7 @@ int mac_setup(Mac *mac, char *name) { int i; + struct Macs *macs = FIPS_mode() ? fips_macs : all_macs; for (i = 0; macs[i].name; i++) { if (strcmp(name, macs[i].name) == 0) { diff -up openssh-5.2p1/Makefile.in.fips openssh-5.2p1/Makefile.in --- openssh-5.2p1/Makefile.in.fips 2009-03-10 03:51:55.910250677 +0100 +++ openssh-5.2p1/Makefile.in 2009-03-10 03:51:56.222702935 +0100 @@ -134,28 +134,28 @@ libssh.a: $(LIBSSH_OBJS) $(RANLIB) $@ ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) - $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) - $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) + $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) -lfipscheck $(LIBS) scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o - $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o - $(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + $(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o - $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o - $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o - $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) + $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lfipscheck $(LIBS) sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) diff -up openssh-5.2p1/myproposal.h.fips openssh-5.2p1/myproposal.h --- openssh-5.2p1/myproposal.h.fips 2009-01-28 06:33:31.000000000 +0100 +++ openssh-5.2p1/myproposal.h 2009-03-10 03:51:56.257243733 +0100 @@ -53,7 +53,11 @@ "hmac-sha1-96,hmac-md5-96" #define KEX_DEFAULT_COMP "none,zlib at openssh.com,zlib" #define KEX_DEFAULT_LANG "" - +#define KEX_FIPS_ENCRYPT \ + "aes128-cbc,3des-cbc," \ + "aes192-cbc,aes256-cbc,rijndael-cbc at lysator.liu.se" +#define KEX_FIPS_MAC \ + "hmac-sha1" static char *myproposal[PROPOSAL_MAX] = { KEX_DEFAULT_KEX, diff -up openssh-5.2p1/nsskeys.c.fips openssh-5.2p1/nsskeys.c --- openssh-5.2p1/nsskeys.c.fips 2009-03-10 03:51:55.871242620 +0100 +++ openssh-5.2p1/nsskeys.c 2009-03-10 03:51:56.251363837 +0100 @@ -183,8 +183,8 @@ nss_convert_pubkey(Key *k) break; } - p = key_fingerprint(k, SSH_FP_MD5, SSH_FP_HEX); - debug("fingerprint %u %s", key_size(k), p); + p = key_fingerprint(k, SSH_FP_SHA1, SSH_FP_HEX); + debug("SHA1 fingerprint %u %s", key_size(k), p); xfree(p); return 0; diff -up openssh-5.2p1/openbsd-compat/bsd-arc4random.c.fips openssh-5.2p1/openbsd-compat/bsd-arc4random.c --- openssh-5.2p1/openbsd-compat/bsd-arc4random.c.fips 2008-06-04 02:54:00.000000000 +0200 +++ openssh-5.2p1/openbsd-compat/bsd-arc4random.c 2009-03-10 03:51:56.255331659 +0100 @@ -39,6 +39,7 @@ static int rc4_ready = 0; static RC4_KEY rc4; +#if 0 unsigned int arc4random(void) { @@ -82,6 +83,32 @@ arc4random_stir(void) rc4_ready = REKEY_BYTES; } +#else +unsigned int +arc4random(void) +{ + unsigned int r = 0; + void *rp = &r; + + if (!rc4_ready) { + arc4random_stir(); + } + RAND_bytes(rp, sizeof(r)); + + return(r); +} + +void +arc4random_stir(void) +{ + unsigned char rand_buf[SEED_SIZE]; + + if (RAND_bytes(rand_buf, sizeof(rand_buf)) <= 0) + fatal("Couldn't obtain random bytes (error %ld)", + ERR_get_error()); + rc4_ready = 1; +} +#endif #endif /* !HAVE_ARC4RANDOM */ #ifndef ARC4RANDOM_BUF diff -up openssh-5.2p1/ssh-add.c.fips openssh-5.2p1/ssh-add.c --- openssh-5.2p1/ssh-add.c.fips 2009-03-10 03:51:55.928225121 +0100 +++ openssh-5.2p1/ssh-add.c 2009-03-10 03:51:56.254252403 +0100 @@ -42,6 +42,8 @@ #include #include +#include +#include #include "openbsd-compat/openssl-compat.h" #ifdef HAVE_LIBNSS @@ -254,7 +256,7 @@ list_identities(AuthenticationConnection key = ssh_get_next_identity(ac, &comment, version)) { had_identities = 1; if (do_fp) { - fp = key_fingerprint(key, SSH_FP_MD5, + fp = key_fingerprint(key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); printf("%d %s %s (%s)\n", key_size(key), fp, comment, key_type(key)); @@ -463,11 +465,16 @@ main(int argc, char **argv) sanitise_stdfd(); __progname = ssh_get_progname(argv[0]); + SSLeay_add_all_algorithms(); + if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { + fprintf(stderr, + "FIPS integrity verification test failed.\n"); + exit(3); + } + init_rng(); seed_rng(); - SSLeay_add_all_algorithms(); - /* At first, get a connection to the authentication agent. */ ac = ssh_get_authentication_connection(); if (ac == NULL) { diff -up openssh-5.2p1/ssh-agent.c.fips openssh-5.2p1/ssh-agent.c --- openssh-5.2p1/ssh-agent.c.fips 2009-03-10 03:51:55.846341085 +0100 +++ openssh-5.2p1/ssh-agent.c 2009-03-10 03:51:56.171221623 +0100 @@ -51,6 +51,8 @@ #include #include +#include +#include #include "openbsd-compat/openssl-compat.h" #include @@ -200,9 +202,9 @@ confirm_key(Identity *id) char *p; int ret = -1; - p = key_fingerprint(id->key, SSH_FP_MD5, SSH_FP_HEX); - if (ask_permission("Allow use of key %s?\nKey fingerprint %s.", - id->comment, p)) + p = key_fingerprint(id->key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); + if (ask_permission("Allow use of key %s?\nKey %sfingerprint %s.", + id->comment, FIPS_mode() ? "SHA1 " : "", p)) ret = 0; xfree(p); @@ -1196,6 +1198,11 @@ main(int ac, char **av) #endif SSLeay_add_all_algorithms(); + if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { + fprintf(stderr, + "FIPS integrity verification test failed.\n"); + exit(3); + } __progname = ssh_get_progname(av[0]); init_rng(); diff -up openssh-5.2p1/ssh.c.fips openssh-5.2p1/ssh.c --- openssh-5.2p1/ssh.c.fips 2009-03-10 03:51:55.906266464 +0100 +++ openssh-5.2p1/ssh.c 2009-03-10 03:51:56.176206362 +0100 @@ -71,6 +71,8 @@ #include #include +#include +#include #include "openbsd-compat/openssl-compat.h" #include "openbsd-compat/sys-queue.h" @@ -220,6 +222,10 @@ main(int ac, char **av) sanitise_stdfd(); __progname = ssh_get_progname(av[0]); + SSLeay_add_all_algorithms(); + if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { + fatal("FIPS integrity verification test failed."); + } init_rng(); /* @@ -550,7 +556,6 @@ main(int ac, char **av) if (!host) usage(); - SSLeay_add_all_algorithms(); ERR_load_crypto_strings(); /* Initialize the command to execute on remote host. */ diff -up openssh-5.2p1/sshconnect2.c.fips openssh-5.2p1/sshconnect2.c --- openssh-5.2p1/sshconnect2.c.fips 2009-03-10 03:51:56.079247745 +0100 +++ openssh-5.2p1/sshconnect2.c 2009-03-10 03:51:56.197416110 +0100 @@ -44,6 +44,8 @@ #include #endif +#include + #include "openbsd-compat/sys-queue.h" #include "xmalloc.h" @@ -115,6 +117,10 @@ ssh_kex2(char *host, struct sockaddr *ho if (options.ciphers != NULL) { myproposal[PROPOSAL_ENC_ALGS_CTOS] = myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; + } else if (FIPS_mode()) { + myproposal[PROPOSAL_ENC_ALGS_CTOS] = + myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_ENCRYPT; + } myproposal[PROPOSAL_ENC_ALGS_CTOS] = compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); @@ -130,7 +136,11 @@ ssh_kex2(char *host, struct sockaddr *ho if (options.macs != NULL) { myproposal[PROPOSAL_MAC_ALGS_CTOS] = myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; + } else if (FIPS_mode()) { + myproposal[PROPOSAL_MAC_ALGS_CTOS] = + myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_MAC; } + if (options.hostkeyalgorithms != NULL) myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = options.hostkeyalgorithms; @@ -507,8 +517,8 @@ input_userauth_pk_ok(int type, u_int32_t key->type, pktype); goto done; } - fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); - debug2("input_userauth_pk_ok: fp %s", fp); + fp = key_fingerprint(key, SSH_FP_SHA1, SSH_FP_HEX); + debug2("input_userauth_pk_ok: SHA1 fp %s", fp); xfree(fp); /* diff -up openssh-5.2p1/sshconnect.c.fips openssh-5.2p1/sshconnect.c --- openssh-5.2p1/sshconnect.c.fips 2009-03-10 03:51:56.085211598 +0100 +++ openssh-5.2p1/sshconnect.c 2009-03-10 03:51:56.315348971 +0100 @@ -40,6 +40,8 @@ #include #include +#include + #include "xmalloc.h" #include "key.h" #include "hostfile.h" @@ -761,6 +763,7 @@ check_host_key(char *hostname, struct so goto fail; } else if (options.strict_host_key_checking == 2) { char msg1[1024], msg2[1024]; + int fips_on = FIPS_mode(); if (show_other_keys(host, host_key)) snprintf(msg1, sizeof(msg1), @@ -769,8 +772,8 @@ check_host_key(char *hostname, struct so else snprintf(msg1, sizeof(msg1), "."); /* The default */ - fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); - ra = key_fingerprint(host_key, SSH_FP_MD5, + fp = key_fingerprint(host_key, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); + ra = key_fingerprint(host_key, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_RANDOMART); msg2[0] = '\0'; if (options.verify_host_key_dns) { @@ -786,10 +789,10 @@ check_host_key(char *hostname, struct so snprintf(msg, sizeof(msg), "The authenticity of host '%.200s (%s)' can't be " "established%s\n" - "%s key fingerprint is %s.%s%s\n%s" + "%s key %sfingerprint is %s.%s%s\n%s" "Are you sure you want to continue connecting " "(yes/no)? ", - host, ip, msg1, type, fp, + host, ip, msg1, type, fips_on ? "SHA1 " : "", fp, options.visual_host_key ? "\n" : "", options.visual_host_key ? ra : "", msg2); @@ -1077,17 +1080,18 @@ show_key_from_file(const char *file, con Key *found; char *fp, *ra; int line, ret; + int fips_on = FIPS_mode(); found = key_new(keytype); if ((ret = lookup_key_in_hostfile_by_type(file, host, keytype, found, &line))) { - fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX); - ra = key_fingerprint(found, SSH_FP_MD5, SSH_FP_RANDOMART); + fp = key_fingerprint(found, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); + ra = key_fingerprint(found, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_RANDOMART); logit("WARNING: %s key found for host %s\n" "in %s:%d\n" - "%s key fingerprint %s.\n%s\n", + "%s key %sfingerprint %s.\n%s\n", key_type(found), host, file, line, - key_type(found), fp, ra); + key_type(found), fips_on ? "SHA1 ":"", fp, ra); xfree(ra); xfree(fp); } @@ -1133,8 +1137,9 @@ warn_changed_key(Key *host_key) { char *fp; const char *type = key_type(host_key); + int fips_on = FIPS_mode(); - fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); + fp = key_fingerprint(host_key, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); error("@ WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED! @"); @@ -1142,8 +1147,8 @@ warn_changed_key(Key *host_key) error("IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"); error("Someone could be eavesdropping on you right now (man-in-the-middle attack)!"); error("It is also possible that the %s host key has just been changed.", type); - error("The fingerprint for the %s key sent by the remote host is\n%s.", - type, fp); + error("The %sfingerprint for the %s key sent by the remote host is\n%s.", + fips_on ? "SHA1 ":"", type, fp); error("Please contact your system administrator."); xfree(fp); diff -up openssh-5.2p1/sshd.c.fips openssh-5.2p1/sshd.c --- openssh-5.2p1/sshd.c.fips 2009-03-10 03:51:55.512212775 +0100 +++ openssh-5.2p1/sshd.c 2009-03-10 03:51:56.224238563 +0100 @@ -76,6 +76,8 @@ #include #include #include +#include +#include #include "openbsd-compat/openssl-compat.h" #ifdef HAVE_SECUREWARE @@ -1260,6 +1262,12 @@ main(int ac, char **av) (void)set_auth_parameters(ac, av); #endif __progname = ssh_get_progname(av[0]); + + SSLeay_add_all_algorithms(); + if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { + fatal("FIPS integrity verification test failed."); + } + init_rng(); /* Save argv. Duplicate so setproctitle emulation doesn't clobber it */ @@ -1412,8 +1420,6 @@ main(int ac, char **av) else closefrom(REEXEC_DEVCRYPTO_RESERVED_FD); - SSLeay_add_all_algorithms(); - /* * Force logging to stderr until we have loaded the private host * key (unless started from inetd) @@ -2182,6 +2188,9 @@ do_ssh2_kex(void) if (options.ciphers != NULL) { myproposal[PROPOSAL_ENC_ALGS_CTOS] = myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; + } else if (FIPS_mode()) { + myproposal[PROPOSAL_ENC_ALGS_CTOS] = + myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_ENCRYPT; } myproposal[PROPOSAL_ENC_ALGS_CTOS] = compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); @@ -2191,6 +2200,9 @@ do_ssh2_kex(void) if (options.macs != NULL) { myproposal[PROPOSAL_MAC_ALGS_CTOS] = myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; + } else if (FIPS_mode()) { + myproposal[PROPOSAL_MAC_ALGS_CTOS] = + myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_MAC; } if (options.compression == COMP_NONE) { myproposal[PROPOSAL_COMP_ALGS_CTOS] = diff -up openssh-5.2p1/ssh-keygen.c.fips openssh-5.2p1/ssh-keygen.c --- openssh-5.2p1/ssh-keygen.c.fips 2009-03-10 03:51:55.948283636 +0100 +++ openssh-5.2p1/ssh-keygen.c 2009-03-10 03:51:56.249239228 +0100 @@ -21,6 +21,8 @@ #include #include +#include +#include #include "openbsd-compat/openssl-compat.h" #include @@ -537,7 +539,7 @@ do_fingerprint(struct passwd *pw) enum fp_type fptype; struct stat st; - fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5; + fptype = print_bubblebabble ? SSH_FP_SHA1 : FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5; rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX; if (!have_identity) @@ -1125,6 +1127,12 @@ main(int argc, char **argv) __progname = ssh_get_progname(argv[0]); SSLeay_add_all_algorithms(); + if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { + fprintf(stderr, + "FIPS integrity verification test failed.\n"); + exit(3); + } + log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); init_rng(); @@ -1506,14 +1514,15 @@ passphrase_again: fclose(f); if (!quiet) { - char *fp = key_fingerprint(public, SSH_FP_MD5, SSH_FP_HEX); - char *ra = key_fingerprint(public, SSH_FP_MD5, + int fips_on = FIPS_mode(); + char *fp = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); + char *ra = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_RANDOMART); printf("Your public key has been saved in %s.\n", identity_file); - printf("The key fingerprint is:\n"); + printf("The key %sfingerprint is:\n", fips_on ? "SHA1 " : ""); printf("%s %s\n", fp, comment); - printf("The key's randomart image is:\n"); + printf("The key's %srandomart image is:\n", fips_on ? "SHA1 " :""); printf("%s\n", ra); xfree(ra); xfree(fp); diff -up openssh-5.2p1/ssh-keyscan.c.fips openssh-5.2p1/ssh-keyscan.c --- openssh-5.2p1/ssh-keyscan.c.fips 2009-01-28 06:31:23.000000000 +0100 +++ openssh-5.2p1/ssh-keyscan.c 2009-03-10 03:51:56.313291759 +0100 @@ -19,6 +19,8 @@ #include #include +#include +#include #include #include @@ -731,6 +733,13 @@ main(int argc, char **argv) extern char *optarg; __progname = ssh_get_progname(argv[0]); + SSLeay_add_all_algorithms(); + if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { + fprintf(stderr, + "FIPS integrity verification test failed.\n"); + exit(3); + } + init_rng(); seed_rng(); TAILQ_INIT(&tq); diff -up openssh-5.2p1/ssh-keysign.c.fips openssh-5.2p1/ssh-keysign.c --- openssh-5.2p1/ssh-keysign.c.fips 2006-09-01 07:38:37.000000000 +0200 +++ openssh-5.2p1/ssh-keysign.c 2009-03-10 03:51:56.295222876 +0100 @@ -38,6 +38,8 @@ #include #include #include +#include +#include #include "xmalloc.h" #include "log.h" @@ -175,6 +177,11 @@ main(int argc, char **argv) permanently_set_uid(pw); + SSLeay_add_all_algorithms(); + if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { + fatal("FIPS integrity verification test failed"); + } + init_rng(); seed_rng(); arc4random_stir(); @@ -194,7 +201,6 @@ main(int argc, char **argv) if (key_fd[0] == -1 && key_fd[1] == -1) fatal("could not open any host key"); - SSLeay_add_all_algorithms(); for (i = 0; i < 256; i++) rnd[i] = arc4random(); RAND_seed(rnd, sizeof(rnd)); openssh-5.2p1-nss-keys.patch: --- NEW FILE openssh-5.2p1-nss-keys.patch --- diff -up openssh-5.2p1/authfd.c.nss-keys openssh-5.2p1/authfd.c --- openssh-5.2p1/authfd.c.nss-keys 2006-09-01 07:38:36.000000000 +0200 +++ openssh-5.2p1/authfd.c 2009-03-10 03:51:55.866208145 +0100 @@ -626,6 +626,45 @@ ssh_update_card(AuthenticationConnection return decode_reply(type); } +int +ssh_update_nss_key(AuthenticationConnection *auth, int add, + const char *tokenname, const char *keyname, + const char *pass, u_int life, u_int confirm) +{ + Buffer msg; + int type, constrained = (life || confirm); + + if (add) { + type = constrained ? + SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED : + SSH_AGENTC_ADD_NSS_KEY; + } else + type = SSH_AGENTC_REMOVE_NSS_KEY; + + buffer_init(&msg); + buffer_put_char(&msg, type); + buffer_put_cstring(&msg, tokenname); + buffer_put_cstring(&msg, keyname); + buffer_put_cstring(&msg, pass); + + if (constrained) { + if (life != 0) { + buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME); + buffer_put_int(&msg, life); + } + if (confirm != 0) + buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM); + } + + if (ssh_request_reply(auth, &msg, &msg) == 0) { + buffer_free(&msg); + return 0; + } + type = buffer_get_char(&msg); + buffer_free(&msg); + return decode_reply(type); +} + /* * Removes all identities from the agent. This call is not meant to be used * by normal applications. diff -up openssh-5.2p1/authfd.h.nss-keys openssh-5.2p1/authfd.h --- openssh-5.2p1/authfd.h.nss-keys 2006-08-05 04:39:39.000000000 +0200 +++ openssh-5.2p1/authfd.h 2009-03-10 03:51:55.847449129 +0100 @@ -49,6 +49,12 @@ #define SSH2_AGENTC_ADD_ID_CONSTRAINED 25 #define SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED 26 +/* nss */ +#define SSH_AGENTC_ADD_NSS_KEY 30 +#define SSH_AGENTC_REMOVE_NSS_KEY 31 +#define SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED 32 + + #define SSH_AGENT_CONSTRAIN_LIFETIME 1 #define SSH_AGENT_CONSTRAIN_CONFIRM 2 @@ -83,6 +89,8 @@ int ssh_remove_all_identities(Authentic int ssh_lock_agent(AuthenticationConnection *, int, const char *); int ssh_update_card(AuthenticationConnection *, int, const char *, const char *, u_int, u_int); +int ssh_update_nss_key(AuthenticationConnection *, int, const char *, + const char *, const char *, u_int, u_int); int ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16], diff -up openssh-5.2p1/configure.ac.nss-keys openssh-5.2p1/configure.ac --- openssh-5.2p1/configure.ac.nss-keys 2009-03-10 03:51:55.285821039 +0100 +++ openssh-5.2p1/configure.ac 2009-03-10 03:51:55.850215090 +0100 @@ -3462,6 +3462,20 @@ AC_ARG_WITH(kerberos5, ] ) +# Check whether user wants NSS support +LIBNSS_MSG="no" +AC_ARG_WITH(nss, + [ --with-nss Enable NSS support], + [ if test "x$withval" != "xno" ; then + AC_DEFINE(HAVE_LIBNSS,1,[Define if you want NSS support.]) + LIBNSS_MSG="yes" + CPPFLAGS="$CPPFLAGS -I/usr/include/nss3 -I/usr/include/nspr4" + AC_CHECK_HEADERS(pk11pub.h) + LIBS="$LIBS -lnss3" + fi + ]) +AC_SUBST(LIBNSS) + # Looking for programs, paths and files PRIVSEP_PATH=/var/empty @@ -4189,6 +4203,7 @@ echo " TCP Wrappers support echo " MD5 password support: $MD5_MSG" echo " libedit support: $LIBEDIT_MSG" echo " Solaris process contract support: $SPC_MSG" +echo " NSS support: $LIBNSS_MSG" echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" echo " BSD Auth support: $BSD_AUTH_MSG" diff -up openssh-5.2p1/key.c.nss-keys openssh-5.2p1/key.c --- openssh-5.2p1/key.c.nss-keys 2008-11-03 09:24:17.000000000 +0100 +++ openssh-5.2p1/key.c 2009-03-10 03:51:55.840226575 +0100 @@ -96,6 +96,54 @@ key_new(int type) return k; } +#ifdef HAVE_LIBNSS +Key * +key_new_nss(int type) +{ + Key *k = key_new(type); + + k->nss = xcalloc(1, sizeof(*k->nss)); + k->flags = KEY_FLAG_EXT | KEY_FLAG_NSS; + + return k; +} + +Key * +key_new_nss_copy(int type, const Key *c) +{ + Key *k = key_new_nss(type); + + switch (k->type) { + case KEY_RSA: + if ((BN_copy(k->rsa->n, c->rsa->n) == NULL) || + (BN_copy(k->rsa->e, c->rsa->e) == NULL)) + fatal("key_new_nss_copy: BN_copy failed"); + break; + case KEY_DSA: + if ((BN_copy(k->dsa->p, c->rsa->p) == NULL) || + (BN_copy(k->dsa->q, c->dsa->q) == NULL) || + (BN_copy(k->dsa->g, c->dsa->g) == NULL) || + (BN_copy(k->dsa->pub_key, c->dsa->pub_key) == NULL)) + fatal("key_new_nss_copy: BN_copy failed"); + break; + } + + k->nss->privk = SECKEY_CopyPrivateKey(c->nss->privk); + if (k->nss->privk == NULL) + fatal("key_new_nss_copy: SECKEY_CopyPrivateKey failed"); + + k->nss->pubk = SECKEY_CopyPublicKey(c->nss->pubk); + if (k->nss->pubk == NULL) + fatal("key_new_nss_copy: SECKEY_CopyPublicKey failed"); + + if (c->nss->privk->wincx) + k->nss->privk->wincx = xstrdup(c->nss->privk->wincx); + + return k; +} +#endif + + Key * key_new_private(int type) { @@ -151,6 +199,19 @@ key_free(Key *k) fatal("key_free: bad key type %d", k->type); break; } +#ifdef HAVE_LIBNSS + if (k->flags & KEY_FLAG_NSS) { + if (k->nss->privk != NULL && k->nss->privk->wincx != NULL) { + memset(k->nss->privk->wincx, 0, + strlen(k->nss->privk->wincx)); + xfree(k->nss->privk->wincx); + k->nss->privk->wincx = NULL; + } + SECKEY_DestroyPrivateKey(k->nss->privk); + SECKEY_DestroyPublicKey(k->nss->pubk); + xfree(k->nss); + } +#endif xfree(k); } diff -up openssh-5.2p1/key.h.nss-keys openssh-5.2p1/key.h --- openssh-5.2p1/key.h.nss-keys 2008-06-12 20:40:35.000000000 +0200 +++ openssh-5.2p1/key.h 2009-03-10 03:51:55.925279322 +0100 @@ -29,11 +29,17 @@ #include #include +#ifdef HAVE_LIBNSS +#include +#include +#endif + typedef struct Key Key; enum types { KEY_RSA1, KEY_RSA, KEY_DSA, + KEY_NSS, KEY_UNSPEC }; enum fp_type { @@ -48,16 +54,30 @@ enum fp_rep { /* key is stored in external hardware */ #define KEY_FLAG_EXT 0x0001 +#define KEY_FLAG_NSS 0x0002 + +#ifdef HAVE_LIBNSS +typedef struct NSSKey NSSKey; +struct NSSKey { + SECKEYPrivateKey *privk; + SECKEYPublicKey *pubk; +}; +#endif struct Key { int type; int flags; RSA *rsa; DSA *dsa; +#ifdef HAVE_LIBNSS + NSSKey *nss; +#endif }; Key *key_new(int); Key *key_new_private(int); +Key *key_new_nss(int); +Key *key_new_nss_copy(int, const Key *); void key_free(Key *); Key *key_demote(const Key *); int key_equal(const Key *, const Key *); diff -up openssh-5.2p1/Makefile.in.nss-keys openssh-5.2p1/Makefile.in --- openssh-5.2p1/Makefile.in.nss-keys 2008-11-05 06:20:46.000000000 +0100 +++ openssh-5.2p1/Makefile.in 2009-03-10 03:51:56.222702935 +0100 @@ -71,7 +71,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o b atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ - entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o + entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o nsskeys.o SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ sshconnect.o sshconnect1.o sshconnect2.o mux.o @@ -134,28 +134,28 @@ libssh.a: $(LIBSSH_OBJS) $(RANLIB) $@ ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) - $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) - $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) + $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) -lfipscheck $(LIBS) scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o - $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o - $(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + $(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o - $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o - $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o - $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) + $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lfipscheck $(LIBS) sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) diff -up /dev/null openssh-5.2p1/nsskeys.c --- /dev/null 2009-03-09 14:26:59.819020596 +0100 +++ openssh-5.2p1/nsskeys.c 2009-03-10 03:51:56.251363837 +0100 @@ -0,0 +1,327 @@ +/* + * Copyright (c) 2001 Markus Friedl. All rights reserved. + * Copyright (c) 2007 Red Hat, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "includes.h" +#ifdef HAVE_LIBNSS + +#include + +#include +#include +#include + +#include + +#include +#include +#include +#include + +#include "xmalloc.h" +#include "key.h" +#include "log.h" +#include "misc.h" +#include "nsskeys.h" +#include "pathnames.h" + +static char * +password_cb(PK11SlotInfo *slot, PRBool retry, void *arg) +{ + char *password = arg; + if (retry || password == NULL) + return NULL; + + return PL_strdup(password); +} + +int +nss_init(PK11PasswordFunc pwfn) +{ + char *dbpath; + char buf[MAXPATHLEN]; + + if (NSS_IsInitialized()) + return 0; + + if ((dbpath=getenv("NSS_DB_PATH")) == NULL) { + struct passwd *pw; + if ((pw = getpwuid(getuid())) == NULL || + pw->pw_dir == NULL) { + return -1; + } + snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir, + _PATH_SSH_USER_DIR); + dbpath = buf; + } + + if (NSS_Init(dbpath) != SECSuccess) + return -1; + + if (pwfn == NULL) { + pwfn = password_cb; + } + + PK11_SetPasswordFunc(pwfn); + + return 0; +} + +static Key * +make_key_from_privkey(SECKEYPrivateKey *privk, char *password) +{ + Key *k; + switch (SECKEY_GetPrivateKeyType(privk)) { + case rsaKey: + k = key_new_nss(KEY_RSA); + break; + case dsaKey: + k = key_new_nss(KEY_DSA); + break; + default: + return NULL; + } + k->nss->pubk = SECKEY_ConvertToPublicKey(privk); + if (k->nss->pubk != NULL) { + k->nss->privk = SECKEY_CopyPrivateKey(privk); + } + if (k->nss->privk != NULL) { + if (password != NULL) { + k->nss->privk->wincx = xstrdup(password); + } + return k; + } + key_free(k); + return NULL; +} + +static Key ** +add_key_to_list(Key *k, Key **keys, size_t *i, size_t *allocated) +{ + if (*allocated < *i + 2) { + *allocated += 16; + keys = xrealloc(keys, *allocated, sizeof(k)); + } + keys[*i] = k; + (*i)++; + keys[*i] = NULL; + return keys; +} + +static int +nss_convert_pubkey(Key *k) +{ + u_char *n; + unsigned int len; + char *p; + + switch (k->type) { + case KEY_RSA: + n = k->nss->pubk->u.rsa.modulus.data; + len = k->nss->pubk->u.rsa.modulus.len; + + if (BN_bin2bn(n, len, k->rsa->n) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + + n = k->nss->pubk->u.rsa.publicExponent.data; + len = k->nss->pubk->u.rsa.publicExponent.len; + + if (BN_bin2bn(n, len, k->rsa->e) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + break; + case KEY_DSA: + n = k->nss->pubk->u.dsa.params.prime.data; + len = k->nss->pubk->u.dsa.params.prime.len; + + if (BN_bin2bn(n, len, k->dsa->p) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + + n = k->nss->pubk->u.dsa.params.subPrime.data; + len = k->nss->pubk->u.dsa.params.subPrime.len; + + if (BN_bin2bn(n, len, k->dsa->q) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + + n = k->nss->pubk->u.dsa.params.base.data; + len = k->nss->pubk->u.dsa.params.base.len; + + if (BN_bin2bn(n, len, k->dsa->g) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + + n = k->nss->pubk->u.dsa.publicValue.data; + len = k->nss->pubk->u.dsa.publicValue.len; + + if (BN_bin2bn(n, len, k->dsa->pub_key) == NULL) { + fatal("nss_convert_pubkey: BN_bin2bn failed"); + } + break; + } + + p = key_fingerprint(k, SSH_FP_SHA1, SSH_FP_HEX); + debug("SHA1 fingerprint %u %s", key_size(k), p); + xfree(p); + + return 0; +} + +static Key ** +nss_find_privkeys(const char *tokenname, const char *keyname, + char *password) +{ + Key *k = NULL; + Key **keys = NULL; + PK11SlotList *slots; + PK11SlotListElement *sle; + size_t allocated = 0; + size_t i = 0; + + if ((slots=PK11_FindSlotsByNames(NULL, NULL, tokenname, PR_TRUE)) == NULL) { + if (tokenname == NULL) { + debug("No NSS token found"); + } else { + debug("NSS token not found: %s", tokenname); + } + return NULL; + } + + for (sle = slots->head; sle; sle = sle->next) { + SECKEYPrivateKeyList *list; + SECKEYPrivateKeyListNode *node; + char *tmppass = password; + + if (PK11_NeedLogin(sle->slot)) { + if (password == NULL) { + char *prompt; + if (asprintf(&prompt, "Enter passphrase for token %s: ", + PK11_GetTokenName(sle->slot)) < 0) + fatal("password_cb: asprintf failed"); + tmppass = read_passphrase(prompt, RP_ALLOW_STDIN); + } + PK11_Authenticate(sle->slot, PR_TRUE, tmppass); + } + + debug("Looking for: %s:%s", tokenname, keyname); + list = PK11_ListPrivKeysInSlot(sle->slot, (char *)keyname, + tmppass); + if (list == NULL && keyname != NULL) { + char *fooname; + /* NSS bug workaround */ + if (asprintf(&fooname, "%s~", keyname) < 0) { + error("nss_find_privkey: asprintf failed"); + PK11_FreeSlotList(slots); + return NULL; + } + list = PK11_ListPrivKeysInSlot(sle->slot, fooname, + tmppass); + free(fooname); + } + if (list == NULL && keyname != NULL) { + CERTCertificate *cert; + SECKEYPrivateKey *privk; + cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(), + (char *)keyname); + if (cert == NULL) + goto cleanup; + privk = PK11_FindPrivateKeyFromCert(sle->slot, cert, tmppass); + CERT_DestroyCertificate(cert); + if (privk == NULL) + goto cleanup; + if ((k=make_key_from_privkey(privk, tmppass)) != NULL) { + nss_convert_pubkey(k); + keys = add_key_to_list(k, keys, &i, &allocated); + } + SECKEY_DestroyPrivateKey(privk); + } else { + if (list == NULL) + goto cleanup; + for (node=PRIVKEY_LIST_HEAD(list); !PRIVKEY_LIST_END(node, list); + node=PRIVKEY_LIST_NEXT(node)) + if ((k=make_key_from_privkey(node->key, tmppass)) != NULL) { + nss_convert_pubkey(k); + keys = add_key_to_list(k, keys, &i, &allocated); + } + SECKEY_DestroyPrivateKeyList(list); + } +cleanup: + if (password == NULL && tmppass != NULL) { + memset(tmppass, 0, strlen(tmppass)); + xfree(tmppass); + } + } + PK11_FreeSlotList(slots); + + return keys; +} + +Key ** +nss_get_keys(const char *tokenname, const char *keyname, + char *password) +{ + Key **keys; + + if (nss_init(NULL) == -1) { + error("Failed to initialize NSS library"); + return NULL; + } + + keys = nss_find_privkeys(tokenname, keyname, password); + if (keys == NULL && keyname != NULL) { + error("Cannot find key in nss, token removed"); + return NULL; + } +#if 0 + keys = xcalloc(3, sizeof(Key *)); + + if (k->type == KEY_RSA) { + n = key_new_nss_copy(KEY_RSA1, k); + + keys[0] = n; + keys[1] = k; + keys[2] = NULL; + } else { + keys[0] = k; + keys[1] = NULL; + } +#endif + return keys; +} + +char * +nss_get_key_label(Key *key) +{ + char *label, *nickname; + + nickname = PK11_GetPrivateKeyNickname(key->nss->privk); + label = xstrdup(nickname); + PORT_Free(nickname); + + return label; +} + +#endif /* HAVE_LIBNSS */ diff -up /dev/null openssh-5.2p1/nsskeys.h --- /dev/null 2009-03-09 14:26:59.819020596 +0100 +++ openssh-5.2p1/nsskeys.h 2009-03-10 03:51:55.908243644 +0100 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2001 Markus Friedl. All rights reserved. + * Copyright (c) 2007 Red Hat, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef NSSKEYS_H +#define NSSKEYS_H +#ifdef HAVE_LIBNSS +#include +#include + +int nss_init(PK11PasswordFunc); +Key **nss_get_keys(const char *, const char *, char *); +char *nss_get_key_label(Key *); +/*void sc_close(void);*/ +/*int sc_put_key(Key *, const char *);*/ + +#endif +#endif diff -up openssh-5.2p1/readconf.c.nss-keys openssh-5.2p1/readconf.c --- openssh-5.2p1/readconf.c.nss-keys 2009-02-14 06:28:21.000000000 +0100 +++ openssh-5.2p1/readconf.c 2009-03-10 03:51:55.950217925 +0100 @@ -124,6 +124,7 @@ typedef enum { oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, oHostKeyAlgorithms, oBindAddress, oSmartcardDevice, + oUseNSS, oNSSToken, oClearAllForwardings, oNoHostAuthenticationForLocalhost, oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, oAddressFamily, oGssAuthentication, oGssDelegateCreds, @@ -210,6 +211,13 @@ static struct { #else { "smartcarddevice", oUnsupported }, #endif +#ifdef HAVE_LIBNSS + { "usenss", oUseNSS }, + { "nsstoken", oNSSToken }, +#else + { "usenss", oUnsupported }, + { "nsstoken", oNSSToken }, +#endif { "clearallforwardings", oClearAllForwardings }, { "enablesshkeysign", oEnableSSHKeysign }, { "verifyhostkeydns", oVerifyHostKeyDNS }, @@ -612,6 +620,14 @@ parse_string: charptr = &options->smartcard_device; goto parse_string; + case oUseNSS: + intptr = &options->use_nss; + goto parse_flag; + + case oNSSToken: + charptr = &options->nss_token; + goto parse_command; + case oProxyCommand: charptr = &options->proxy_command; parse_command: @@ -1047,6 +1063,8 @@ initialize_options(Options * options) options->preferred_authentications = NULL; options->bind_address = NULL; options->smartcard_device = NULL; + options->use_nss = -1; + options->nss_token = NULL; options->enable_ssh_keysign = - 1; options->no_host_authentication_for_localhost = - 1; options->identities_only = - 1; @@ -1177,6 +1195,8 @@ fill_default_options(Options * options) options->no_host_authentication_for_localhost = 0; if (options->identities_only == -1) options->identities_only = 0; + if (options->use_nss == -1) + options->use_nss = 0; if (options->enable_ssh_keysign == -1) options->enable_ssh_keysign = 0; if (options->rekey_limit == -1) diff -up openssh-5.2p1/readconf.h.nss-keys openssh-5.2p1/readconf.h --- openssh-5.2p1/readconf.h.nss-keys 2009-02-14 06:28:21.000000000 +0100 +++ openssh-5.2p1/readconf.h 2009-03-10 03:51:55.868252768 +0100 @@ -85,6 +85,8 @@ typedef struct { char *preferred_authentications; char *bind_address; /* local socket address for connection to sshd */ char *smartcard_device; /* Smartcard reader device */ + int use_nss; /* Use NSS library for keys */ + char *nss_token; /* Look for NSS keys on token */ int verify_host_key_dns; /* Verify host key using DNS */ int num_identity_files; /* Number of files for RSA/DSA identities. */ diff -up openssh-5.2p1/ssh-add.c.nss-keys openssh-5.2p1/ssh-add.c --- openssh-5.2p1/ssh-add.c.nss-keys 2008-02-28 09:13:52.000000000 +0100 +++ openssh-5.2p1/ssh-add.c 2009-03-10 03:51:56.254252403 +0100 @@ -42,8 +42,18 @@ #include #include +#include +#include #include "openbsd-compat/openssl-compat.h" +#ifdef HAVE_LIBNSS +#include +#include +#include +#include +#include +#endif + #include #include #include @@ -57,6 +67,7 @@ #include "rsa.h" #include "log.h" #include "key.h" +#include "nsskeys.h" #include "buffer.h" #include "authfd.h" #include "authfile.h" @@ -245,7 +256,7 @@ list_identities(AuthenticationConnection key = ssh_get_next_identity(ac, &comment, version)) { had_identities = 1; if (do_fp) { - fp = key_fingerprint(key, SSH_FP_MD5, + fp = key_fingerprint(key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); printf("%d %s %s (%s)\n", key_size(key), fp, comment, key_type(key)); @@ -307,6 +318,117 @@ do_file(AuthenticationConnection *ac, in return 0; } +#ifdef HAVE_LIBNSS +static char * +password_cb(PK11SlotInfo *slot, PRBool retry, void *arg) +{ + char **passcache = arg; + char *password, *p2 = NULL; + char *prompt; + + if (retry) + return NULL; + + if (asprintf(&prompt, "Enter passphrase for token %s: ", + PK11_GetTokenName(slot)) < 0) + fatal("password_cb: asprintf failed"); + + password = read_passphrase(prompt, RP_ALLOW_STDIN); + + if (password != NULL && (p2=PL_strdup(password)) == NULL) { + memset(password, 0, strlen(password)); + fatal("password_cb: PL_strdup failed"); + } + + if (passcache != NULL) { + if (*passcache != NULL) { + memset(*passcache, 0, strlen(*passcache)); + xfree(*passcache); + } + *passcache = password; + } else { + memset(password, 0, strlen(password)); + xfree(password); + } + + return p2; +} + +static int +add_slot_keys(AuthenticationConnection *ac, PK11SlotInfo *slot, int add) +{ + SECKEYPrivateKeyList *list; + SECKEYPrivateKeyListNode *node; + char *passcache = NULL; + char *tokenname; + + int count = 0; + + if (PK11_NeedLogin(slot)) + PK11_Authenticate(slot, PR_TRUE, &passcache); + + if ((list=PK11_ListPrivKeysInSlot(slot, NULL, NULL)) == NULL) { + return 0; + } + + tokenname = PK11_GetTokenName(slot); + + for (node=PRIVKEY_LIST_HEAD(list); !PRIVKEY_LIST_END(node, list); + node=PRIVKEY_LIST_NEXT(node)) { + char *keyname; + SECKEYPublicKey *pub; + + keyname = PK11_GetPrivateKeyNickname(node->key); + if (keyname == NULL || *keyname == '\0') { + /* no nickname to refer to */ + CERTCertificate *cert; + char *kn; + cert = PK11_GetCertFromPrivateKey(node->key); + if (cert == NULL) + continue; + kn = strchr(cert->nickname, ':'); + if (kn == NULL) + kn = cert->nickname; + else + kn++; + keyname = PORT_Strdup(kn); + CERT_DestroyCertificate(cert); + if (keyname == NULL) + continue; + } + pub = SECKEY_ConvertToPublicKey(node->key); + if (pub == NULL) { + fprintf(stderr, "No public key for: %s:%s\n", + tokenname, keyname); + continue; /* not possible to obtain public key */ + } + SECKEY_DestroyPublicKey(pub); + + if (ssh_update_nss_key(ac, add, tokenname, keyname, + passcache?passcache:"", lifetime, confirm)) { + fprintf(stderr, "Key %s: %s:%s\n", + add?"added":"removed", tokenname, keyname); + count++; + } else { + fprintf(stderr, "Could not %s key: %s:%s\n", + add?"add":"remove", tokenname, keyname); + } + + PORT_Free(keyname); + count++; + } + + if (passcache != NULL) { + memset(passcache, 0, strlen(passcache)); + xfree(passcache); + } + + SECKEY_DestroyPrivateKeyList(list); + + return count; +} +#endif + static void usage(void) { @@ -334,16 +456,25 @@ main(int argc, char **argv) AuthenticationConnection *ac = NULL; char *sc_reader_id = NULL; int i, ch, deleting = 0, ret = 0; +#ifdef HAVE_LIBNSS + char *token_id = NULL; + int use_nss = 0; +#endif /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ sanitise_stdfd(); __progname = ssh_get_progname(argv[0]); + SSLeay_add_all_algorithms(); + if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { + fprintf(stderr, + "FIPS integrity verification test failed.\n"); + exit(3); + } + init_rng(); seed_rng(); - SSLeay_add_all_algorithms(); - /* At first, get a connection to the authentication agent. */ ac = ssh_get_authentication_connection(); if (ac == NULL) { @@ -351,7 +482,7 @@ main(int argc, char **argv) "Could not open a connection to your authentication agent.\n"); exit(2); } - while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) { + while ((ch = getopt(argc, argv, "lLcdDnxXe:s:t:T:")) != -1) { switch (ch) { case 'l': case 'L': @@ -373,6 +504,11 @@ main(int argc, char **argv) if (delete_all(ac) == -1) ret = 1; goto done; +#ifdef HAVE_LIBNSS + case 'n': + use_nss = 1; + break; +#endif case 's': sc_reader_id = optarg; break; @@ -387,6 +523,11 @@ main(int argc, char **argv) goto done; } break; +#ifdef HAVE_LIBNSS + case 'T': + token_id = optarg; + break; +#endif default: usage(); ret = 1; @@ -400,6 +541,40 @@ main(int argc, char **argv) ret = 1; goto done; } +#ifdef HAVE_LIBNSS + if (use_nss) { + PK11SlotList *slots; + PK11SlotListElement *sle; + int count = 0; + if (nss_init(password_cb) == -1) { + fprintf(stderr, "Failed to initialize NSS library\n"); + ret = 1; + goto done; + } + + if ((slots=PK11_GetAllTokens(CKM_INVALID_MECHANISM, PR_FALSE, PR_FALSE, + NULL)) == NULL) { + fprintf(stderr, "No tokens found\n"); + ret = 1; + goto nss_done; + } + + for (sle = slots->head; sle; sle = sle->next) { + int rv; + if ((rv=add_slot_keys(ac, sle->slot, !deleting)) == -1) { + ret = 1; + } + count += rv; + } + if (count == 0) { + ret = 1; + } +nss_done: + NSS_Shutdown(); + clear_pass(); + goto done; + } +#endif if (argc == 0) { char buf[MAXPATHLEN]; struct passwd *pw; diff -up openssh-5.2p1/ssh-agent.c.nss-keys openssh-5.2p1/ssh-agent.c --- openssh-5.2p1/ssh-agent.c.nss-keys 2008-07-04 15:10:49.000000000 +0200 +++ openssh-5.2p1/ssh-agent.c 2009-03-10 03:51:56.171221623 +0100 @@ -51,6 +51,8 @@ #include #include +#include +#include #include "openbsd-compat/openssl-compat.h" #include @@ -80,6 +82,10 @@ #include "scard.h" #endif +#ifdef HAVE_LIBNSS +#include "nsskeys.h" +#endif + #if defined(HAVE_SYS_PRCTL_H) #include /* For prctl() and PR_SET_DUMPABLE */ #endif @@ -196,9 +202,9 @@ confirm_key(Identity *id) char *p; int ret = -1; - p = key_fingerprint(id->key, SSH_FP_MD5, SSH_FP_HEX); - if (ask_permission("Allow use of key %s?\nKey fingerprint %s.", - id->comment, p)) + p = key_fingerprint(id->key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); + if (ask_permission("Allow use of key %s?\nKey %sfingerprint %s.", + id->comment, FIPS_mode() ? "SHA1 " : "", p)) ret = 0; xfree(p); @@ -714,6 +720,114 @@ send: } #endif /* SMARTCARD */ +#ifdef HAVE_LIBNSS +static void +process_add_nss_key (SocketEntry *e) +{ + char *tokenname = NULL, *keyname = NULL, *password = NULL; + int i, version, success = 0, death = 0, confirm = 0; + Key **keys, *k; + Identity *id; + Idtab *tab; + + tokenname = buffer_get_string(&e->request, NULL); + keyname = buffer_get_string(&e->request, NULL); + password = buffer_get_string(&e->request, NULL); + + while (buffer_len(&e->request)) { + switch (buffer_get_char(&e->request)) { + case SSH_AGENT_CONSTRAIN_LIFETIME: + death = time(NULL) + buffer_get_int(&e->request); + break; + case SSH_AGENT_CONSTRAIN_CONFIRM: + confirm = 1; + break; + default: + break; + } + } + if (lifetime && !death) + death = time(NULL) + lifetime; + + keys = nss_get_keys(tokenname, keyname, password); + /* password is owned by keys[0] now */ + xfree(tokenname); + xfree(keyname); + + if (keys == NULL) { + memset(password, 0, strlen(password)); + xfree(password); + error("nss_get_keys failed"); + goto send; + } + for (i = 0; keys[i] != NULL; i++) { + k = keys[i]; + version = k->type == KEY_RSA1 ? 1 : 2; + tab = idtab_lookup(version); + if (lookup_identity(k, version) == NULL) { + id = xmalloc(sizeof(Identity)); + id->key = k; + id->comment = nss_get_key_label(k); + id->death = death; + id->confirm = confirm; + TAILQ_INSERT_TAIL(&tab->idlist, id, next); + tab->nentries++; + success = 1; + } else { + key_free(k); + } + keys[i] = NULL; + } + xfree(keys); +send: + buffer_put_int(&e->output, 1); + buffer_put_char(&e->output, + success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE); +} + +static void +process_remove_nss_key(SocketEntry *e) +{ + char *tokenname = NULL, *keyname = NULL, *password = NULL; + int i, version, success = 0; + Key **keys, *k = NULL; + Identity *id; + Idtab *tab; + + tokenname = buffer_get_string(&e->request, NULL); + keyname = buffer_get_string(&e->request, NULL); + password = buffer_get_string(&e->request, NULL); + + keys = nss_get_keys(tokenname, keyname, password); + xfree(tokenname); + xfree(keyname); + xfree(password); + + if (keys == NULL || keys[0] == NULL) { + error("nss_get_keys failed"); + goto send; + } + for (i = 0; keys[i] != NULL; i++) { + k = keys[i]; + version = k->type == KEY_RSA1 ? 1 : 2; + if ((id = lookup_identity(k, version)) != NULL) { + tab = idtab_lookup(version); + TAILQ_REMOVE(&tab->idlist, id, next); + tab->nentries--; + free_identity(id); + success = 1; + } + key_free(k); + keys[i] = NULL; + } + xfree(keys); +send: + buffer_put_int(&e->output, 1); + buffer_put_char(&e->output, + success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE); +} +#endif /* HAVE_LIBNSS */ + /* dispatch incoming messages */ static void @@ -806,6 +920,15 @@ process_message(SocketEntry *e) process_remove_smartcard_key(e); break; #endif /* SMARTCARD */ +#ifdef HAVE_LIBNSS + case SSH_AGENTC_ADD_NSS_KEY: + case SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED: + process_add_nss_key(e); + break; + case SSH_AGENTC_REMOVE_NSS_KEY: + process_remove_nss_key(e); + break; +#endif /* SMARTCARD */ default: /* Unknown message. Respond with failure. */ error("Unknown message %d", type); @@ -1075,6 +1198,11 @@ main(int ac, char **av) #endif SSLeay_add_all_algorithms(); + if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { + fprintf(stderr, + "FIPS integrity verification test failed.\n"); + exit(3); + } __progname = ssh_get_progname(av[0]); init_rng(); diff -up openssh-5.2p1/ssh.c.nss-keys openssh-5.2p1/ssh.c --- openssh-5.2p1/ssh.c.nss-keys 2009-02-14 06:28:21.000000000 +0100 +++ openssh-5.2p1/ssh.c 2009-03-10 03:51:56.176206362 +0100 @@ -71,6 +71,8 @@ #include #include +#include +#include #include "openbsd-compat/openssl-compat.h" #include "openbsd-compat/sys-queue.h" @@ -104,6 +106,9 @@ #ifdef SMARTCARD #include "scard.h" #endif +#ifdef HAVE_LIBNSS +#include "nsskeys.h" +#endif extern char *__progname; @@ -217,6 +222,10 @@ main(int ac, char **av) sanitise_stdfd(); __progname = ssh_get_progname(av[0]); + SSLeay_add_all_algorithms(); + if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { + fatal("FIPS integrity verification test failed."); + } init_rng(); /* @@ -547,7 +556,6 @@ main(int ac, char **av) if (!host) usage(); - SSLeay_add_all_algorithms(); ERR_load_crypto_strings(); /* Initialize the command to execute on remote host. */ @@ -1231,9 +1239,11 @@ load_public_identity_files(void) int i = 0; Key *public; struct passwd *pw; -#ifdef SMARTCARD +#if defined(SMARTCARD) || defined(HAVE_LIBNSS) Key **keys; +#endif +#ifdef SMARTCARD if (options.smartcard_device != NULL && options.num_identity_files < SSH_MAX_IDENTITY_FILES && (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) { @@ -1256,6 +1266,27 @@ load_public_identity_files(void) xfree(keys); } #endif /* SMARTCARD */ +#ifdef HAVE_LIBNSS + if (options.use_nss && + options.num_identity_files < SSH_MAX_IDENTITY_FILES && + (keys = nss_get_keys(options.nss_token, NULL, NULL)) != NULL) { + int count; + for (count = 0; keys[count] != NULL; count++) { + memmove(&options.identity_files[1], &options.identity_files[0], + sizeof(char *) * (SSH_MAX_IDENTITY_FILES - 1)); + memmove(&options.identity_keys[1], &options.identity_keys[0], + sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1)); + options.num_identity_files++; + options.identity_keys[0] = keys[count]; + options.identity_files[0] = nss_get_key_label(keys[count]); + } + if (options.num_identity_files > SSH_MAX_IDENTITY_FILES) + options.num_identity_files = SSH_MAX_IDENTITY_FILES; + i += count; + xfree(keys); + } +#endif /* HAVE_LIBNSS */ + if ((pw = getpwuid(original_real_uid)) == NULL) fatal("load_public_identity_files: getpwuid failed"); pwname = xstrdup(pw->pw_name); diff -up openssh-5.2p1/ssh-dss.c.nss-keys openssh-5.2p1/ssh-dss.c --- openssh-5.2p1/ssh-dss.c.nss-keys 2006-11-07 13:14:42.000000000 +0100 +++ openssh-5.2p1/ssh-dss.c 2009-03-10 03:51:55.843232632 +0100 @@ -39,6 +39,10 @@ #include "log.h" #include "key.h" +#ifdef HAVE_LIBNSS +#include +#endif + #define INTBLOB_LEN 20 #define SIGBLOB_LEN (2*INTBLOB_LEN) @@ -57,6 +61,34 @@ ssh_dss_sign(const Key *key, u_char **si error("ssh_dss_sign: no DSA key"); return -1; } +#ifdef HAVE_LIBNSS + if (key->flags & KEY_FLAG_NSS) { + SECItem sigitem; + SECItem *rawsig; + + memset(&sigitem, 0, sizeof(sigitem)); + if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk, + SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST) != SECSuccess) { + error("ssh_dss_sign: sign failed"); + return -1; + } + + if ((rawsig=DSAU_DecodeDerSig(&sigitem)) == NULL) { + error("ssh_dss_sign: der decode failed"); + SECITEM_ZfreeItem(&sigitem, PR_FALSE); + return -1; + } + SECITEM_ZfreeItem(&sigitem, PR_FALSE); + if (rawsig->len != SIGBLOB_LEN) { + error("ssh_dss_sign: unsupported signature length %d", + rawsig->len); + SECITEM_ZfreeItem(rawsig, PR_TRUE); + return -1; + } + memcpy(sigblob, rawsig->data, SIGBLOB_LEN); + SECITEM_ZfreeItem(rawsig, PR_TRUE); + } else { +#endif EVP_DigestInit(&md, evp_md); EVP_DigestUpdate(&md, data, datalen); EVP_DigestFinal(&md, digest, &dlen); @@ -80,7 +112,9 @@ ssh_dss_sign(const Key *key, u_char **si BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen); BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen); DSA_SIG_free(sig); - +#ifdef HAVE_LIBNSS + } +#endif if (datafellows & SSH_BUG_SIGBLOB) { if (lenp != NULL) *lenp = SIGBLOB_LEN; diff -up openssh-5.2p1/ssh-keygen.c.nss-keys openssh-5.2p1/ssh-keygen.c --- openssh-5.2p1/ssh-keygen.c.nss-keys 2009-02-21 22:47:02.000000000 +0100 +++ openssh-5.2p1/ssh-keygen.c 2009-03-10 03:51:56.249239228 +0100 @@ -21,6 +21,8 @@ #include #include +#include +#include #include "openbsd-compat/openssl-compat.h" #include @@ -53,6 +55,11 @@ #include "scard.h" #endif +#ifdef HAVE_LIBNSS +#include +#include "nsskeys.h" +#endif + /* Number of bits in the RSA/DSA key. This value can be set on the command line. */ #define DEFAULT_BITS 2048 #define DEFAULT_BITS_DSA 1024 @@ -501,6 +508,26 @@ do_download(struct passwd *pw, const cha } #endif /* SMARTCARD */ +#ifdef HAVE_LIBNSS +static void +do_nss_download(struct passwd *pw, const char *tokenname, const char *keyname) +{ + Key **keys = NULL; + int i; + + keys = nss_get_keys(tokenname, keyname, NULL); + if (keys == NULL) + fatal("cannot find public key in NSS"); + for (i = 0; keys[i]; i++) { + key_write(keys[i], stdout); + key_free(keys[i]); + fprintf(stdout, "\n"); + } + xfree(keys); + exit(0); +} +#endif /* HAVE_LIBNSS */ + static void do_fingerprint(struct passwd *pw) { @@ -512,7 +539,7 @@ do_fingerprint(struct passwd *pw) enum fp_type fptype; struct stat st; - fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5; + fptype = print_bubblebabble ? SSH_FP_SHA1 : FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5; rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX; if (!have_identity) @@ -1083,7 +1110,8 @@ main(int argc, char **argv) Key *private, *public; struct passwd *pw; struct stat st; - int opt, type, fd, download = 0; + int opt, type, fd, download = 1; + int use_nss = 0; u_int32_t memory = 0, generator_wanted = 0, trials = 100; int do_gen_candidates = 0, do_screen_candidates = 0; BIGNUM *start = NULL; @@ -1099,6 +1127,12 @@ main(int argc, char **argv) __progname = ssh_get_progname(argv[0]); SSLeay_add_all_algorithms(); + if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { + fprintf(stderr, + "FIPS integrity verification test failed.\n"); + exit(3); + } + log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); init_rng(); @@ -1116,7 +1150,7 @@ main(int argc, char **argv) } while ((opt = getopt(argc, argv, - "degiqpclBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) { + "degiqpclnBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) { switch (opt) { case 'b': bits = (u_int32_t)strtonum(optarg, 768, 32768, &errstr); @@ -1156,6 +1190,10 @@ main(int argc, char **argv) case 'g': print_generic = 1; break; + case 'n': + use_nss = 1; + download = 1; + break; case 'P': identity_passphrase = optarg; break; @@ -1187,10 +1225,10 @@ main(int argc, char **argv) case 't': key_type_name = optarg; break; - case 'D': - download = 1; - /*FALLTHROUGH*/ case 'U': + download = 0; + /*FALLTHROUGH*/ + case 'D': reader_id = optarg; break; case 'v': @@ -1299,6 +1337,17 @@ main(int argc, char **argv) exit(0); } } + + if (use_nss) { +#ifdef HAVE_LIBNSS + if (download) + do_nss_download(pw, reader_id, identity_file); + else + fatal("no support for NSS key upload."); +#else + fatal("no support for NSS keys."); +#endif + } if (reader_id != NULL) { #ifdef SMARTCARD if (download) @@ -1465,14 +1514,15 @@ passphrase_again: fclose(f); if (!quiet) { - char *fp = key_fingerprint(public, SSH_FP_MD5, SSH_FP_HEX); - char *ra = key_fingerprint(public, SSH_FP_MD5, + int fips_on = FIPS_mode(); + char *fp = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); + char *ra = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_RANDOMART); printf("Your public key has been saved in %s.\n", identity_file); - printf("The key fingerprint is:\n"); + printf("The key %sfingerprint is:\n", fips_on ? "SHA1 " : ""); printf("%s %s\n", fp, comment); - printf("The key's randomart image is:\n"); + printf("The key's %srandomart image is:\n", fips_on ? "SHA1 " :""); printf("%s\n", ra); xfree(ra); xfree(fp); diff -up openssh-5.2p1/ssh-rsa.c.nss-keys openssh-5.2p1/ssh-rsa.c --- openssh-5.2p1/ssh-rsa.c.nss-keys 2006-09-01 07:38:37.000000000 +0200 +++ openssh-5.2p1/ssh-rsa.c 2009-03-10 03:51:55.930219040 +0100 @@ -32,6 +32,10 @@ #include "compat.h" #include "ssh.h" +#ifdef HAVE_LIBNSS +#include +#endif + static int openssh_RSA_verify(int, u_char *, u_int, u_char *, u_int, RSA *); /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */ @@ -50,6 +54,38 @@ ssh_rsa_sign(const Key *key, u_char **si error("ssh_rsa_sign: no RSA key"); return -1; } + + slen = RSA_size(key->rsa); + sig = xmalloc(slen); + +#ifdef HAVE_LIBNSS + if (key->flags & KEY_FLAG_NSS) { + SECItem sigitem; + SECOidTag alg; + + memset(&sigitem, 0, sizeof(sigitem)); + alg = (datafellows & SSH_BUG_RSASIGMD5) ? + SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION : + SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION; + + if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk, + alg) != SECSuccess) { + error("ssh_rsa_sign: sign failed"); + return -1; + } + if (sigitem.len > slen) { + error("ssh_rsa_sign: slen %u slen2 %u", slen, sigitem.len); + xfree(sig); + SECITEM_ZfreeItem(&sigitem, PR_FALSE); + return -1; + } + if (sigitem.len < slen) { + memset(sig, 0, slen - sigitem.len); + } + memcpy(sig+slen-sigitem.len, sigitem.data, sigitem.len); + SECITEM_ZfreeItem(&sigitem, PR_FALSE); + } else { +#endif nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1; if ((evp_md = EVP_get_digestbynid(nid)) == NULL) { error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid); @@ -59,9 +95,6 @@ ssh_rsa_sign(const Key *key, u_char **si EVP_DigestUpdate(&md, data, datalen); EVP_DigestFinal(&md, digest, &dlen); - slen = RSA_size(key->rsa); - sig = xmalloc(slen); - ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa); memset(digest, 'd', sizeof(digest)); @@ -83,6 +116,9 @@ ssh_rsa_sign(const Key *key, u_char **si xfree(sig); return -1; } +#ifdef HAVE_LIBNSS + } +#endif /* encode signature */ buffer_init(&b); buffer_put_cstring(&b, "ssh-rsa"); openssh-5.2p1-redhat.patch: --- NEW FILE openssh-5.2p1-redhat.patch --- diff -up openssh-5.2p1/ssh_config.redhat openssh-5.2p1/ssh_config --- openssh-5.2p1/ssh_config.redhat 2009-02-21 02:45:02.000000000 +0100 +++ openssh-5.2p1/ssh_config 2009-03-10 03:51:54.749290375 +0100 @@ -44,3 +44,13 @@ # TunnelDevice any:any # PermitLocalCommand no # VisualHostKey no +Host * + GSSAPIAuthentication yes +# If this option is set to yes then remote X11 clients will have full access +# to the original X11 display. As virtually no X11 client supports the untrusted +# mode correctly we set this to yes. + ForwardX11Trusted yes +# Send locale-related environment variables + SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES + SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT + SendEnv LC_IDENTIFICATION LC_ALL LANGUAGE diff -up openssh-5.2p1/sshd_config.0.redhat openssh-5.2p1/sshd_config.0 --- openssh-5.2p1/sshd_config.0.redhat 2009-02-23 01:18:15.000000000 +0100 +++ openssh-5.2p1/sshd_config.0 2009-03-10 03:51:54.958364611 +0100 @@ -467,6 +467,11 @@ DESCRIPTION Defines the number of bits in the ephemeral protocol version 1 server key. The minimum value is 512, and the default is 1024. + ShowPatchLevel + Specifies whether sshd will display the specific patch level of + the binary in the server identification string. The patch level + is set at compile-time. The default is M-bM-^@M-^\noM-bM-^@M-^]. + StrictModes Specifies whether sshd(8) should check file modes and ownership of the user's files and home directory before accepting login. @@ -491,9 +496,9 @@ DESCRIPTION SyslogFacility Gives the facility code that is used when logging messages from - sshd(8). The possible values are: DAEMON, USER, AUTH, LOCAL0, - LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. The de- - fault is AUTH. + sshd(8). The possible values are: DAEMON, USER, AUTH, AUTHPRIV, + LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. + The default is AUTH. TCPKeepAlive Specifies whether the system should send TCP keepalive messages diff -up openssh-5.2p1/sshd_config.5.redhat openssh-5.2p1/sshd_config.5 --- openssh-5.2p1/sshd_config.5.redhat 2009-02-23 01:00:24.000000000 +0100 +++ openssh-5.2p1/sshd_config.5 2009-03-10 03:51:54.931352756 +0100 @@ -814,6 +814,14 @@ This option applies to protocol version .It Cm ServerKeyBits Defines the number of bits in the ephemeral protocol version 1 server key. The minimum value is 512, and the default is 1024. +.It Cm ShowPatchLevel +Specifies whether +.Nm sshd +will display the patch level of the binary in the identification string. +The patch level is set at compile-time. +The default is +.Dq no . +This option applies to protocol version 1 only. .It Cm StrictModes Specifies whether .Xr sshd 8 @@ -848,7 +856,7 @@ Note that this option applies to protoco .It Cm SyslogFacility Gives the facility code that is used when logging messages from .Xr sshd 8 . -The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2, +The possible values are: DAEMON, USER, AUTH, AUTHPRIV, LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. The default is AUTH. .It Cm TCPKeepAlive diff -up openssh-5.2p1/sshd_config.redhat openssh-5.2p1/sshd_config --- openssh-5.2p1/sshd_config.redhat 2008-07-02 14:35:43.000000000 +0200 +++ openssh-5.2p1/sshd_config 2009-03-10 03:51:54.960221540 +0100 @@ -33,6 +33,7 @@ Protocol 2 # Logging # obsoletes QuietMode and FascistLogging #SyslogFacility AUTH +SyslogFacility AUTHPRIV #LogLevel INFO # Authentication: @@ -60,9 +61,11 @@ Protocol 2 # To disable tunneled clear text passwords, change to no here! #PasswordAuthentication yes #PermitEmptyPasswords no +PasswordAuthentication yes # Change to no to disable s/key passwords #ChallengeResponseAuthentication yes +ChallengeResponseAuthentication no # Kerberos options #KerberosAuthentication no @@ -72,7 +75,9 @@ Protocol 2 # GSSAPI options #GSSAPIAuthentication no +GSSAPIAuthentication yes #GSSAPICleanupCredentials yes +GSSAPICleanupCredentials yes # Set this to 'yes' to enable PAM authentication, account processing, # and session processing. If this is enabled, PAM authentication will @@ -84,11 +89,18 @@ Protocol 2 # PAM authentication, then enable this but set PasswordAuthentication # and ChallengeResponseAuthentication to 'no'. #UsePAM no +UsePAM yes + +# Accept locale-related environment variables +AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES +AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT +AcceptEnv LC_IDENTIFICATION LC_ALL LANGUAGE #AllowAgentForwarding yes #AllowTcpForwarding yes #GatewayPorts no #X11Forwarding no +X11Forwarding yes #X11DisplayOffset 10 #X11UseLocalhost yes #PrintMotd yes @@ -100,6 +112,7 @@ Protocol 2 #Compression delayed #ClientAliveInterval 0 #ClientAliveCountMax 3 +#ShowPatchLevel no #UseDNS yes #PidFile /var/run/sshd.pid #MaxStartups 10 openssh-5.2p1-selinux.patch: --- NEW FILE openssh-5.2p1-selinux.patch --- diff -up openssh-5.2p1/auth1.c.selinux openssh-5.2p1/auth1.c --- openssh-5.2p1/auth1.c.selinux 2009-03-10 03:51:54.813223420 +0100 +++ openssh-5.2p1/auth1.c 2009-03-10 03:51:55.045214236 +0100 @@ -391,7 +391,7 @@ void do_authentication(Authctxt *authctxt) { u_int ulen; - char *user, *style = NULL; + char *user, *style = NULL, *role=NULL; /* Get the name of the user that we wish to log in as. */ packet_read_expect(SSH_CMSG_USER); @@ -400,11 +400,19 @@ do_authentication(Authctxt *authctxt) user = packet_get_string(&ulen); packet_check_eom(); + if ((role = strchr(user, '/')) != NULL) + *role++ = '\0'; + if ((style = strchr(user, ':')) != NULL) *style++ = '\0'; + else + if (role && (style = strchr(role, ':')) != NULL) + *style++ = '\0'; + authctxt->user = user; authctxt->style = style; + authctxt->role = role; /* Verify that the user is a valid user. */ if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL) diff -up openssh-5.2p1/auth2.c.selinux openssh-5.2p1/auth2.c --- openssh-5.2p1/auth2.c.selinux 2008-11-05 06:20:46.000000000 +0100 +++ openssh-5.2p1/auth2.c 2009-03-10 03:51:55.071216534 +0100 @@ -215,7 +215,7 @@ input_userauth_request(int type, u_int32 { Authctxt *authctxt = ctxt; Authmethod *m = NULL; - char *user, *service, *method, *style = NULL; + char *user, *service, *method, *style = NULL, *role = NULL; int authenticated = 0; if (authctxt == NULL) @@ -227,6 +227,9 @@ input_userauth_request(int type, u_int32 debug("userauth-request for user %s service %s method %s", user, service, method); debug("attempt %d failures %d", authctxt->attempt, authctxt->failures); + if ((role = strchr(user, '/')) != NULL) + *role++ = 0; + if ((style = strchr(user, ':')) != NULL) *style++ = 0; @@ -252,8 +255,11 @@ input_userauth_request(int type, u_int32 use_privsep ? " [net]" : ""); authctxt->service = xstrdup(service); authctxt->style = style ? xstrdup(style) : NULL; - if (use_privsep) + authctxt->role = role ? xstrdup(role) : NULL; + if (use_privsep) { mm_inform_authserv(service, style); + mm_inform_authrole(role); + } userauth_banner(); } else if (strcmp(user, authctxt->user) != 0 || strcmp(service, authctxt->service) != 0) { diff -up openssh-5.2p1/auth2-hostbased.c.selinux openssh-5.2p1/auth2-hostbased.c --- openssh-5.2p1/auth2-hostbased.c.selinux 2008-07-17 10:57:19.000000000 +0200 +++ openssh-5.2p1/auth2-hostbased.c 2009-03-10 03:51:55.052265447 +0100 @@ -106,7 +106,14 @@ userauth_hostbased(Authctxt *authctxt) buffer_put_string(&b, session_id2, session_id2_len); /* reconstruct packet */ buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); - buffer_put_cstring(&b, authctxt->user); + if (authctxt->role) { + buffer_put_int(&b, strlen(authctxt->user)+strlen(authctxt->role)+1); + buffer_append(&b, authctxt->user, strlen(authctxt->user)); + buffer_put_char(&b, '/'); + buffer_append(&b, authctxt->role, strlen(authctxt->role)); + } else { + buffer_put_cstring(&b, authctxt->user); + } buffer_put_cstring(&b, service); buffer_put_cstring(&b, "hostbased"); buffer_put_string(&b, pkalg, alen); diff -up openssh-5.2p1/auth2-pubkey.c.selinux openssh-5.2p1/auth2-pubkey.c --- openssh-5.2p1/auth2-pubkey.c.selinux 2008-07-04 04:54:25.000000000 +0200 +++ openssh-5.2p1/auth2-pubkey.c 2009-03-10 03:51:56.174214480 +0100 @@ -33,6 +33,7 @@ #include #include #include +#include #include "xmalloc.h" #include "ssh.h" @@ -117,7 +118,14 @@ userauth_pubkey(Authctxt *authctxt) } /* reconstruct packet */ buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); - buffer_put_cstring(&b, authctxt->user); + if (authctxt->role) { + buffer_put_int(&b, strlen(authctxt->user)+strlen(authctxt->role)+1); + buffer_append(&b, authctxt->user, strlen(authctxt->user)); + buffer_put_char(&b, '/'); + buffer_append(&b, authctxt->role, strlen(authctxt->role)); + } else { + buffer_put_cstring(&b, authctxt->user); + } buffer_put_cstring(&b, datafellows & SSH_BUG_PKSERVICE ? "ssh-userauth" : @@ -236,7 +244,7 @@ user_key_allowed2(struct passwd *pw, Key found_key = 1; debug("matching key found: file %s, line %lu", file, linenum); - fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX); + fp = key_fingerprint(found, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); verbose("Found matching %s key: %s", key_type(found), fp); xfree(fp); diff -up openssh-5.2p1/auth.h.selinux openssh-5.2p1/auth.h --- openssh-5.2p1/auth.h.selinux 2008-11-05 06:20:46.000000000 +0100 +++ openssh-5.2p1/auth.h 2009-03-10 03:51:55.069276014 +0100 @@ -58,6 +58,7 @@ struct Authctxt { char *service; struct passwd *pw; /* set if 'valid' */ char *style; + char *role; void *kbdintctxt; void *jpake_ctx; #ifdef BSD_AUTH diff -up openssh-5.2p1/configure.ac.selinux openssh-5.2p1/configure.ac --- openssh-5.2p1/configure.ac.selinux 2009-03-10 03:51:54.901396765 +0100 +++ openssh-5.2p1/configure.ac 2009-03-10 03:51:55.850215090 +0100 @@ -3335,11 +3335,25 @@ AC_ARG_WITH(selinux, AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ], AC_MSG_ERROR(SELinux support requires libselinux library)) SSHDLIBS="$SSHDLIBS $LIBSELINUX" + LIBS="$LIBS $LIBSELINUX" AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) + AC_CHECK_FUNCS(setkeycreatecon) LIBS="$save_LIBS" fi ] ) +# Check whether user wants Linux audit support +LINUX_AUDIT_MSG="no" +AC_ARG_WITH(linux-audit, + [ --with-linux-audit Enable Linux audit support], + [ if test "x$withval" != "xno" ; then + AC_DEFINE(HAVE_LINUX_AUDIT,1,[Define if you want Linux audit support.]) + LINUX_AUDIT_MSG="yes" + AC_CHECK_HEADERS(libaudit.h) + SSHDLIBS="$SSHDLIBS -laudit" + fi ] +) + # Check whether user wants Kerberos 5 support KRB5_MSG="no" AC_ARG_WITH(kerberos5, @@ -3448,6 +3462,20 @@ AC_ARG_WITH(kerberos5, ] ) +# Check whether user wants NSS support +LIBNSS_MSG="no" +AC_ARG_WITH(nss, + [ --with-nss Enable NSS support], + [ if test "x$withval" != "xno" ; then + AC_DEFINE(HAVE_LIBNSS,1,[Define if you want NSS support.]) + LIBNSS_MSG="yes" + CPPFLAGS="$CPPFLAGS -I/usr/include/nss3 -I/usr/include/nspr4" + AC_CHECK_HEADERS(pk11pub.h) + LIBS="$LIBS -lnss3" + fi + ]) +AC_SUBST(LIBNSS) + # Looking for programs, paths and files PRIVSEP_PATH=/var/empty @@ -4168,12 +4196,14 @@ echo " PAM support echo " OSF SIA support: $SIA_MSG" echo " KerberosV support: $KRB5_MSG" echo " SELinux support: $SELINUX_MSG" +echo " Linux audit support: $LINUX_AUDIT_MSG" echo " Smartcard support: $SCARD_MSG" echo " S/KEY support: $SKEY_MSG" echo " TCP Wrappers support: $TCPW_MSG" echo " MD5 password support: $MD5_MSG" echo " libedit support: $LIBEDIT_MSG" echo " Solaris process contract support: $SPC_MSG" +echo " NSS support: $LIBNSS_MSG" echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" echo " BSD Auth support: $BSD_AUTH_MSG" diff -up openssh-5.2p1/monitor.c.selinux openssh-5.2p1/monitor.c --- openssh-5.2p1/monitor.c.selinux 2009-02-14 06:33:31.000000000 +0100 +++ openssh-5.2p1/monitor.c 2009-03-10 03:51:55.099559692 +0100 @@ -135,6 +135,7 @@ int mm_answer_sign(int, Buffer *); int mm_answer_pwnamallow(int, Buffer *); int mm_answer_auth2_read_banner(int, Buffer *); int mm_answer_authserv(int, Buffer *); +int mm_answer_authrole(int, Buffer *); int mm_answer_authpassword(int, Buffer *); int mm_answer_bsdauthquery(int, Buffer *); int mm_answer_bsdauthrespond(int, Buffer *); @@ -211,6 +212,7 @@ struct mon_table mon_dispatch_proto20[] {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign}, {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow}, {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv}, + {MONITOR_REQ_AUTHROLE, MON_ONCE, mm_answer_authrole}, {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner}, {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword}, #ifdef USE_PAM @@ -680,6 +682,7 @@ mm_answer_pwnamallow(int sock, Buffer *m else { /* Allow service/style information on the auth context */ monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1); + monitor_permit(mon_dispatch, MONITOR_REQ_AUTHROLE, 1); monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1); } @@ -725,6 +728,23 @@ mm_answer_authserv(int sock, Buffer *m) } int +mm_answer_authrole(int sock, Buffer *m) +{ + monitor_permit_authentications(1); + + authctxt->role = buffer_get_string(m, NULL); + debug3("%s: role=%s", + __func__, authctxt->role); + + if (strlen(authctxt->role) == 0) { + xfree(authctxt->role); + authctxt->role = NULL; + } + + return (0); +} + +int mm_answer_authpassword(int sock, Buffer *m) { static int call_count; @@ -1102,7 +1122,7 @@ static int monitor_valid_userblob(u_char *data, u_int datalen) { Buffer b; - char *p; + char *p, *r; u_int len; int fail = 0; @@ -1128,6 +1148,8 @@ monitor_valid_userblob(u_char *data, u_i if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST) fail++; p = buffer_get_string(&b, NULL); + if ((r = strchr(p, '/')) != NULL) + *r = '\0'; if (strcmp(authctxt->user, p) != 0) { logit("wrong user name passed to monitor: expected %s != %.100s", authctxt->user, p); @@ -1159,7 +1181,7 @@ monitor_valid_hostbasedblob(u_char *data char *chost) { Buffer b; - char *p; + char *p, *r; u_int len; int fail = 0; @@ -1176,6 +1198,8 @@ monitor_valid_hostbasedblob(u_char *data if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST) fail++; p = buffer_get_string(&b, NULL); + if ((r = strchr(p, '/')) != NULL) + *r = '\0'; if (strcmp(authctxt->user, p) != 0) { logit("wrong user name passed to monitor: expected %s != %.100s", authctxt->user, p); diff -up openssh-5.2p1/monitor.h.selinux openssh-5.2p1/monitor.h --- openssh-5.2p1/monitor.h.selinux 2008-11-05 06:20:46.000000000 +0100 +++ openssh-5.2p1/monitor.h 2009-03-10 03:51:55.050519421 +0100 @@ -30,7 +30,7 @@ enum monitor_reqtype { MONITOR_REQ_MODULI, MONITOR_ANS_MODULI, - MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV, + MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV,MONITOR_REQ_AUTHROLE, MONITOR_REQ_SIGN, MONITOR_ANS_SIGN, MONITOR_REQ_PWNAM, MONITOR_ANS_PWNAM, MONITOR_REQ_AUTH2_READ_BANNER, MONITOR_ANS_AUTH2_READ_BANNER, diff -up openssh-5.2p1/monitor_wrap.c.selinux openssh-5.2p1/monitor_wrap.c --- openssh-5.2p1/monitor_wrap.c.selinux 2008-11-05 06:20:47.000000000 +0100 +++ openssh-5.2p1/monitor_wrap.c 2009-03-10 03:51:55.066210099 +0100 @@ -297,6 +297,23 @@ mm_inform_authserv(char *service, char * buffer_free(&m); } +/* Inform the privileged process about role */ + +void +mm_inform_authrole(char *role) +{ + Buffer m; + + debug3("%s entering", __func__); + + buffer_init(&m); + buffer_put_cstring(&m, role ? role : ""); + + mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHROLE, &m); + + buffer_free(&m); +} + /* Do the password authentication */ int mm_auth_password(Authctxt *authctxt, char *password) diff -up openssh-5.2p1/monitor_wrap.h.selinux openssh-5.2p1/monitor_wrap.h --- openssh-5.2p1/monitor_wrap.h.selinux 2008-11-05 06:20:47.000000000 +0100 +++ openssh-5.2p1/monitor_wrap.h 2009-03-10 03:51:55.048731957 +0100 @@ -41,6 +41,7 @@ int mm_is_monitor(void); DH *mm_choose_dh(int, int, int); int mm_key_sign(Key *, u_char **, u_int *, u_char *, u_int); void mm_inform_authserv(char *, char *); +void mm_inform_authrole(char *); struct passwd *mm_getpwnamallow(const char *); char *mm_auth2_read_banner(void); int mm_auth_password(struct Authctxt *, char *); diff -up openssh-5.2p1/openbsd-compat/port-linux.c.selinux openssh-5.2p1/openbsd-compat/port-linux.c --- openssh-5.2p1/openbsd-compat/port-linux.c.selinux 2008-03-26 21:27:21.000000000 +0100 +++ openssh-5.2p1/openbsd-compat/port-linux.c 2009-03-10 03:51:55.407292576 +0100 @@ -30,10 +30,28 @@ #ifdef WITH_SELINUX #include "log.h" #include "port-linux.h" +#include "key.h" +#include "hostfile.h" +#include "auth.h" +#include "xmalloc.h" +#include "servconf.h" #include #include +#include #include +#include +#include + +#ifdef HAVE_LINUX_AUDIT +#include +#include +#endif + +extern ServerOptions options; +extern Authctxt *the_authctxt; +extern int inetd_flag; +extern int rexeced_flag; /* Wrapper around is_selinux_enabled() to log its return value once only */ int @@ -49,42 +67,245 @@ ssh_selinux_enabled(void) return (enabled); } +/* Send audit message */ +static int +send_audit_message(int success, security_context_t default_context, + security_context_t selected_context) +{ + int rc=0; +#ifdef HAVE_LINUX_AUDIT + char *msg = NULL; + int audit_fd = audit_open(); + security_context_t default_raw=NULL; + security_context_t selected_raw=NULL; + rc = -1; + if (audit_fd < 0) { + if (errno == EINVAL || errno == EPROTONOSUPPORT || + errno == EAFNOSUPPORT) + return 0; /* No audit support in kernel */ + error("Error connecting to audit system."); + return rc; + } + if (selinux_trans_to_raw_context(default_context, &default_raw) < 0) { + error("Error translating default context."); + default_raw = NULL; + } + if (selinux_trans_to_raw_context(selected_context, &selected_raw) < 0) { + error("Error translating selected context."); + selected_raw = NULL; + } + if (asprintf(&msg, "sshd: default-context=%s selected-context=%s", + default_raw ? default_raw : (default_context ? default_context: "?"), + selected_context ? selected_raw : (selected_context ? selected_context :"?")) < 0) { + error("Error allocating memory."); + goto out; + } + if (audit_log_user_message(audit_fd, AUDIT_USER_ROLE_CHANGE, + msg, NULL, NULL, NULL, success) <= 0) { + error("Error sending audit message."); + goto out; + } + rc = 0; + out: + free(msg); + freecon(default_raw); + freecon(selected_raw); + close(audit_fd); +#endif + return rc; +} + +static int +mls_range_allowed(security_context_t src, security_context_t dst) +{ + struct av_decision avd; + int retval; + unsigned int bit = CONTEXT__CONTAINS; + + debug("%s: src:%s dst:%s", __func__, src, dst); + retval = security_compute_av(src, dst, SECCLASS_CONTEXT, bit, &avd); + if (retval || ((bit & avd.allowed) != bit)) + return 0; + + return 1; +} + +static int +get_user_context(const char *sename, const char *role, const char *lvl, + security_context_t *sc) { +#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL + if (lvl == NULL || lvl[0] == '\0' || get_default_context_with_level(sename, lvl, NULL, sc) != 0) { + /* User may have requested a level completely outside of his + allowed range. We get a context just for auditing as the + range check below will certainly fail for default context. */ +#endif + if (get_default_context(sename, NULL, sc) != 0) { + *sc = NULL; + return -1; + } +#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL + } +#endif + if (role != NULL && role[0]) { + context_t con; + char *type=NULL; + if (get_default_type(role, &type) != 0) { + error("get_default_type: failed to get default type for '%s'", + role); + goto out; + } + con = context_new(*sc); + if (!con) { + goto out; + } + context_role_set(con, role); + context_type_set(con, type); + freecon(*sc); + *sc = strdup(context_str(con)); + context_free(con); + if (!*sc) + return -1; + } +#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL + if (lvl != NULL && lvl[0]) { + /* verify that the requested range is obtained */ + context_t con; + security_context_t obtained_raw; + security_context_t requested_raw; + con = context_new(*sc); + if (!con) { + goto out; + } + context_range_set(con, lvl); + if (selinux_trans_to_raw_context(*sc, &obtained_raw) < 0) { + context_free(con); + goto out; + } + if (selinux_trans_to_raw_context(context_str(con), &requested_raw) < 0) { + freecon(obtained_raw); + context_free(con); + goto out; + } + + debug("get_user_context: obtained context '%s' requested context '%s'", + obtained_raw, requested_raw); + if (strcmp(obtained_raw, requested_raw)) { + /* set the context to the real requested one but fail */ + freecon(requested_raw); + freecon(obtained_raw); + freecon(*sc); + *sc = strdup(context_str(con)); + context_free(con); + return -1; + } + freecon(requested_raw); + freecon(obtained_raw); + context_free(con); + } +#endif + return 0; + out: + freecon(*sc); + *sc = NULL; + return -1; +} + +static void +ssh_selinux_get_role_level(char **role, const char **level) +{ + *role = NULL; + *level = NULL; + if (the_authctxt) { + if (the_authctxt->role != NULL) { + char *slash; + *role = xstrdup(the_authctxt->role); + if ((slash = strchr(*role, '/')) != NULL) { + *slash = '\0'; + *level = slash + 1; + } + } + } +} + /* Return the default security context for the given username */ -static security_context_t -ssh_selinux_getctxbyname(char *pwname) +static int +ssh_selinux_getctxbyname(char *pwname, + security_context_t *default_sc, security_context_t *user_sc) { - security_context_t sc; - char *sename = NULL, *lvl = NULL; - int r; + char *sename, *lvl; + const char *reqlvl; + char *role; + int r = -1; + context_t con = NULL; + + *default_sc = NULL; + *user_sc = NULL; + + ssh_selinux_get_role_level(&role, &reqlvl); #ifdef HAVE_GETSEUSERBYNAME - if (getseuserbyname(pwname, &sename, &lvl) != 0) - return NULL; + if ((r=getseuserbyname(pwname, &sename, &lvl)) != 0) { + sename = NULL; + lvl = NULL; + } #else sename = pwname; - lvl = NULL; + lvl = ""; #endif + if (r == 0) { #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL - r = get_default_context_with_level(sename, lvl, NULL, &sc); + r = get_default_context_with_level(sename, lvl, NULL, default_sc); #else - r = get_default_context(sename, NULL, &sc); + r = get_default_context(sename, NULL, default_sc); #endif + } - if (r != 0) { - switch (security_getenforce()) { - case -1: - fatal("%s: ssh_selinux_getctxbyname: " - "security_getenforce() failed", __func__); - case 0: - error("%s: Failed to get default SELinux security " - "context for %s", __func__, pwname); - break; - default: - fatal("%s: Failed to get default SELinux security " - "context for %s (in enforcing mode)", - __func__, pwname); + if (r == 0) { + /* If launched from xinetd, we must use current level */ + if (inetd_flag && !rexeced_flag) { + security_context_t sshdsc=NULL; + + if (getcon_raw(&sshdsc) < 0) + fatal("failed to allocate security context"); + + if ((con=context_new(sshdsc)) == NULL) + fatal("failed to allocate selinux context"); + reqlvl = context_range_get(con); + freecon(sshdsc); + if (reqlvl !=NULL && lvl != NULL && strcmp(reqlvl, lvl) == 0) + /* we actually don't change level */ + reqlvl = ""; + + debug("%s: current connection level '%s'", __func__, reqlvl); } + + if ((reqlvl != NULL && reqlvl[0]) || (role != NULL && role[0])) { + r = get_user_context(sename, role, reqlvl, user_sc); + + if (r == 0 && reqlvl != NULL && reqlvl[0]) { + security_context_t default_level_sc = *default_sc; + if (role != NULL && role[0]) { + if (get_user_context(sename, role, lvl, &default_level_sc) < 0) + default_level_sc = *default_sc; + } + /* verify that the requested range is contained in the user range */ + if (mls_range_allowed(default_level_sc, *user_sc)) { + logit("permit MLS level %s (user range %s)", reqlvl, lvl); + } else { + r = -1; + error("deny MLS level %s (user range %s)", reqlvl, lvl); + } + if (default_level_sc != *default_sc) + freecon(default_level_sc); + } + } else { + *user_sc = *default_sc; + } + } + if (r != 0) { + error("%s: Failed to get default SELinux security " + "context for %s", __func__, pwname); } #ifdef HAVE_GETSEUSERBYNAME @@ -93,37 +314,114 @@ ssh_selinux_getctxbyname(char *pwname) if (lvl != NULL) xfree(lvl); #endif + if (role != NULL) + xfree(role); + if (con) + context_free(con); - return (sc); + return (r); +} + +/* Setup environment variables for pam_selinux */ +static int +ssh_selinux_setup_pam_variables(void) +{ + const char *reqlvl; + char *role; + char *use_current; + int rv; + + debug3("%s: setting execution context", __func__); + + ssh_selinux_get_role_level(&role, &reqlvl); + + rv = do_pam_putenv("SELINUX_ROLE_REQUESTED", role ? role : ""); + + if (inetd_flag && !rexeced_flag) { + use_current = "1"; + } else { + use_current = ""; + rv = rv || do_pam_putenv("SELINUX_LEVEL_REQUESTED", reqlvl ? reqlvl: ""); + } + + rv = rv || do_pam_putenv("SELINUX_USE_CURRENT_RANGE", use_current); + + if (role != NULL) + xfree(role); + + return rv; } /* Set the execution context to the default for the specified user */ void ssh_selinux_setup_exec_context(char *pwname) { + int r = 0; + security_context_t default_ctx = NULL; security_context_t user_ctx = NULL; if (!ssh_selinux_enabled()) return; + if (options.use_pam) { + /* do not compute context, just setup environment for pam_selinux */ + if (ssh_selinux_setup_pam_variables()) { + switch (security_getenforce()) { + case -1: + fatal("%s: security_getenforce() failed", __func__); + case 0: + error("%s: SELinux PAM variable setup failure. Continuing in permissive mode.", + __func__); + break; + default: + fatal("%s: SELinux PAM variable setup failure. Aborting connection.", + __func__); + } + } + return; + } + debug3("%s: setting execution context", __func__); - user_ctx = ssh_selinux_getctxbyname(pwname); - if (setexeccon(user_ctx) != 0) { + r = ssh_selinux_getctxbyname(pwname, &default_ctx, &user_ctx); + if (r >= 0) { + r = setexeccon(user_ctx); + if (r < 0) { + error("%s: Failed to set SELinux execution context %s for %s", + __func__, user_ctx, pwname); + } +#ifdef HAVE_SETKEYCREATECON + else if (setkeycreatecon(user_ctx) < 0) { + error("%s: Failed to set SELinux keyring creation context %s for %s", + __func__, user_ctx, pwname); + } +#endif + } + if (user_ctx == NULL) { + user_ctx = default_ctx; + } + if (r < 0 || user_ctx != default_ctx) { + /* audit just the case when user changed a role or there was + a failure */ + send_audit_message(r >= 0, default_ctx, user_ctx); + } + if (r < 0) { switch (security_getenforce()) { case -1: fatal("%s: security_getenforce() failed", __func__); case 0: - error("%s: Failed to set SELinux execution " - "context for %s", __func__, pwname); + error("%s: SELinux failure. Continuing in permissive mode.", + __func__); break; default: - fatal("%s: Failed to set SELinux execution context " - "for %s (in enforcing mode)", __func__, pwname); + fatal("%s: SELinux failure. Aborting connection.", + __func__); } } - if (user_ctx != NULL) + if (user_ctx != NULL && user_ctx != default_ctx) freecon(user_ctx); + if (default_ctx != NULL) + freecon(default_ctx); debug3("%s: done", __func__); } @@ -141,7 +439,10 @@ ssh_selinux_setup_pty(char *pwname, cons debug3("%s: setting TTY context on %s", __func__, tty); - user_ctx = ssh_selinux_getctxbyname(pwname); + if (getexeccon(&user_ctx) < 0) { + error("%s: getexeccon: %s", __func__, strerror(errno)); + goto out; + } /* XXX: should these calls fatal() upon failure in enforcing mode? */ openssh-5.2p1-vendor.patch: --- NEW FILE openssh-5.2p1-vendor.patch --- diff -up openssh-5.2p1/configure.ac.vendor openssh-5.2p1/configure.ac --- openssh-5.2p1/configure.ac.vendor 2009-03-10 03:51:54.862255585 +0100 +++ openssh-5.2p1/configure.ac 2009-03-10 03:51:55.850215090 +0100 @@ -3335,11 +3335,25 @@ AC_ARG_WITH(selinux, AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ], AC_MSG_ERROR(SELinux support requires libselinux library)) SSHDLIBS="$SSHDLIBS $LIBSELINUX" + LIBS="$LIBS $LIBSELINUX" AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) + AC_CHECK_FUNCS(setkeycreatecon) LIBS="$save_LIBS" fi ] ) +# Check whether user wants Linux audit support +LINUX_AUDIT_MSG="no" +AC_ARG_WITH(linux-audit, + [ --with-linux-audit Enable Linux audit support], + [ if test "x$withval" != "xno" ; then + AC_DEFINE(HAVE_LINUX_AUDIT,1,[Define if you want Linux audit support.]) + LINUX_AUDIT_MSG="yes" + AC_CHECK_HEADERS(libaudit.h) + SSHDLIBS="$SSHDLIBS -laudit" + fi ] +) + # Check whether user wants Kerberos 5 support KRB5_MSG="no" AC_ARG_WITH(kerberos5, @@ -3448,6 +3462,20 @@ AC_ARG_WITH(kerberos5, ] ) +# Check whether user wants NSS support +LIBNSS_MSG="no" +AC_ARG_WITH(nss, + [ --with-nss Enable NSS support], + [ if test "x$withval" != "xno" ; then + AC_DEFINE(HAVE_LIBNSS,1,[Define if you want NSS support.]) + LIBNSS_MSG="yes" + CPPFLAGS="$CPPFLAGS -I/usr/include/nss3 -I/usr/include/nspr4" + AC_CHECK_HEADERS(pk11pub.h) + LIBS="$LIBS -lnss3" + fi + ]) +AC_SUBST(LIBNSS) + # Looking for programs, paths and files PRIVSEP_PATH=/var/empty @@ -3916,6 +3944,12 @@ AC_ARG_WITH(lastlog, fi ] ) +AC_ARG_ENABLE(vendor-patchlevel, + [ --enable-vendor-patchlevel=TAG specify a vendor patch level], + [AC_DEFINE_UNQUOTED(SSH_VENDOR_PATCHLEVEL,[SSH_RELEASE "-" "$enableval"],[Define to your vendor patch level, if it has been modified from the upstream source release.]) + SSH_VENDOR_PATCHLEVEL="$enableval"], + [AC_DEFINE(SSH_VENDOR_PATCHLEVEL,SSH_RELEASE,[Define to your vendor patch level, if it has been modified from the upstream source release.]) + SSH_VENDOR_PATCHLEVEL=none]) dnl lastlog, [uw]tmpx? detection dnl NOTE: set the paths in the platform section to avoid the @@ -4162,16 +4196,19 @@ echo " PAM support echo " OSF SIA support: $SIA_MSG" echo " KerberosV support: $KRB5_MSG" echo " SELinux support: $SELINUX_MSG" +echo " Linux audit support: $LINUX_AUDIT_MSG" echo " Smartcard support: $SCARD_MSG" echo " S/KEY support: $SKEY_MSG" echo " TCP Wrappers support: $TCPW_MSG" echo " MD5 password support: $MD5_MSG" echo " libedit support: $LIBEDIT_MSG" echo " Solaris process contract support: $SPC_MSG" +echo " NSS support: $LIBNSS_MSG" echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" echo " BSD Auth support: $BSD_AUTH_MSG" echo " Random number source: $RAND_MSG" +echo " Vendor patch level: $SSH_VENDOR_PATCHLEVEL" if test ! -z "$USE_RAND_HELPER" ; then echo " ssh-rand-helper collects from: $RAND_HELPER_MSG" fi diff -up openssh-5.2p1/servconf.c.vendor openssh-5.2p1/servconf.c --- openssh-5.2p1/servconf.c.vendor 2009-01-28 06:31:23.000000000 +0100 +++ openssh-5.2p1/servconf.c 2009-03-10 03:51:54.956273911 +0100 @@ -117,6 +117,7 @@ initialize_server_options(ServerOptions options->max_authtries = -1; options->max_sessions = -1; options->banner = NULL; + options->show_patchlevel = -1; options->use_dns = -1; options->client_alive_interval = -1; options->client_alive_count_max = -1; @@ -262,6 +263,9 @@ fill_default_server_options(ServerOption if (options->zero_knowledge_password_authentication == -1) options->zero_knowledge_password_authentication = 0; + if (options->show_patchlevel == -1) + options->show_patchlevel = 0; + /* Turn privilege separation on by default */ if (use_privsep == -1) use_privsep = 1; @@ -299,7 +303,7 @@ typedef enum { sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile, sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem, sMaxStartups, sMaxAuthTries, sMaxSessions, - sBanner, sUseDNS, sHostbasedAuthentication, + sBanner, sShowPatchLevel, sUseDNS, sHostbasedAuthentication, sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, @@ -410,6 +414,7 @@ static struct { { "maxauthtries", sMaxAuthTries, SSHCFG_ALL }, { "maxsessions", sMaxSessions, SSHCFG_ALL }, { "banner", sBanner, SSHCFG_ALL }, + { "showpatchlevel", sShowPatchLevel, SSHCFG_GLOBAL }, { "usedns", sUseDNS, SSHCFG_GLOBAL }, { "verifyreversemapping", sDeprecated, SSHCFG_GLOBAL }, { "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL }, @@ -1033,6 +1038,10 @@ process_server_config_line(ServerOptions intptr = &use_privsep; goto parse_flag; + case sShowPatchLevel: + intptr = &options->show_patchlevel; + goto parse_flag; + case sAllowUsers: while ((arg = strdelim(&cp)) && *arg != '\0') { if (options->num_allow_users >= MAX_ALLOW_USERS) @@ -1613,6 +1622,7 @@ dump_config(ServerOptions *o) dump_cfg_fmtint(sUseLogin, o->use_login); dump_cfg_fmtint(sCompression, o->compression); dump_cfg_fmtint(sGatewayPorts, o->gateway_ports); + dump_cfg_fmtint(sShowPatchLevel, o->show_patchlevel); dump_cfg_fmtint(sUseDNS, o->use_dns); dump_cfg_fmtint(sAllowTcpForwarding, o->allow_tcp_forwarding); dump_cfg_fmtint(sUsePrivilegeSeparation, use_privsep); diff -up openssh-5.2p1/servconf.h.vendor openssh-5.2p1/servconf.h --- openssh-5.2p1/servconf.h.vendor 2009-01-28 06:31:23.000000000 +0100 +++ openssh-5.2p1/servconf.h 2009-03-10 03:51:54.933236643 +0100 @@ -128,6 +128,7 @@ typedef struct { int max_authtries; int max_sessions; char *banner; /* SSH-2 banner message */ + int show_patchlevel; /* Show vendor patch level to clients */ int use_dns; int client_alive_interval; /* * poke the client this often to diff -up openssh-5.2p1/sshd_config.0.vendor openssh-5.2p1/sshd_config.0 --- openssh-5.2p1/sshd_config.0.vendor 2009-03-10 03:51:54.775230993 +0100 +++ openssh-5.2p1/sshd_config.0 2009-03-10 03:51:54.958364611 +0100 @@ -467,6 +467,11 @@ DESCRIPTION Defines the number of bits in the ephemeral protocol version 1 server key. The minimum value is 512, and the default is 1024. + ShowPatchLevel + Specifies whether sshd will display the specific patch level of + the binary in the server identification string. The patch level + is set at compile-time. The default is M-bM-^@M-^\noM-bM-^@M-^]. + StrictModes Specifies whether sshd(8) should check file modes and ownership of the user's files and home directory before accepting login. diff -up openssh-5.2p1/sshd_config.5.vendor openssh-5.2p1/sshd_config.5 --- openssh-5.2p1/sshd_config.5.vendor 2009-03-10 03:51:54.785628316 +0100 +++ openssh-5.2p1/sshd_config.5 2009-03-10 03:51:54.931352756 +0100 @@ -814,6 +814,14 @@ This option applies to protocol version .It Cm ServerKeyBits Defines the number of bits in the ephemeral protocol version 1 server key. The minimum value is 512, and the default is 1024. +.It Cm ShowPatchLevel +Specifies whether +.Nm sshd +will display the patch level of the binary in the identification string. +The patch level is set at compile-time. +The default is +.Dq no . +This option applies to protocol version 1 only. .It Cm StrictModes Specifies whether .Xr sshd 8 diff -up openssh-5.2p1/sshd_config.vendor openssh-5.2p1/sshd_config --- openssh-5.2p1/sshd_config.vendor 2009-03-10 03:51:54.747256884 +0100 +++ openssh-5.2p1/sshd_config 2009-03-10 03:51:54.960221540 +0100 @@ -112,6 +112,7 @@ X11Forwarding yes #Compression delayed #ClientAliveInterval 0 #ClientAliveCountMax 3 +#ShowPatchLevel no #UseDNS yes #PidFile /var/run/sshd.pid #MaxStartups 10 diff -up openssh-5.2p1/sshd.c.vendor openssh-5.2p1/sshd.c --- openssh-5.2p1/sshd.c.vendor 2009-01-28 06:31:23.000000000 +0100 +++ openssh-5.2p1/sshd.c 2009-03-10 03:51:56.224238563 +0100 @@ -76,6 +76,8 @@ #include #include #include +#include +#include #include "openbsd-compat/openssl-compat.h" #ifdef HAVE_SECUREWARE @@ -415,7 +417,7 @@ sshd_exchange_identification(int sock_in minor = PROTOCOL_MINOR_1; } snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor, - SSH_VERSION, newline); + (options.show_patchlevel == 1) ? SSH_VENDOR_PATCHLEVEL : SSH_VERSION, newline); server_version_string = xstrdup(buf); /* Send our protocol version identification. */ @@ -590,6 +592,10 @@ privsep_preauth_child(void) /* Demote the private keys to public keys. */ demote_sensitive_data(); + /* Open the syslog permanently so the chrooted process still + can write to syslog. */ + open_log(); + /* Change our root directory */ if (chroot(_PATH_PRIVSEP_CHROOT_DIR) == -1) fatal("chroot(\"%s\"): %s", _PATH_PRIVSEP_CHROOT_DIR, @@ -1256,6 +1262,12 @@ main(int ac, char **av) (void)set_auth_parameters(ac, av); #endif __progname = ssh_get_progname(av[0]); + + SSLeay_add_all_algorithms(); + if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { + fatal("FIPS integrity verification test failed."); + } + init_rng(); /* Save argv. Duplicate so setproctitle emulation doesn't clobber it */ @@ -1408,8 +1420,6 @@ main(int ac, char **av) else closefrom(REEXEC_DEVCRYPTO_RESERVED_FD); - SSLeay_add_all_algorithms(); - /* * Force logging to stderr until we have loaded the private host * key (unless started from inetd) @@ -1483,7 +1493,8 @@ main(int ac, char **av) exit(1); } - debug("sshd version %.100s", SSH_RELEASE); + debug("sshd version %.100s", + (options.show_patchlevel == 1) ? SSH_VENDOR_PATCHLEVEL : SSH_RELEASE); /* Store privilege separation user for later use if required. */ if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) { @@ -1894,6 +1905,9 @@ main(int ac, char **av) restore_uid(); } #endif +#ifdef WITH_SELINUX + ssh_selinux_setup_exec_context(authctxt->pw->pw_name); +#endif #ifdef USE_PAM if (options.use_pam) { do_pam_setcred(1); @@ -2174,6 +2188,9 @@ do_ssh2_kex(void) if (options.ciphers != NULL) { myproposal[PROPOSAL_ENC_ALGS_CTOS] = myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; + } else if (FIPS_mode()) { + myproposal[PROPOSAL_ENC_ALGS_CTOS] = + myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_ENCRYPT; } myproposal[PROPOSAL_ENC_ALGS_CTOS] = compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); @@ -2183,6 +2200,9 @@ do_ssh2_kex(void) if (options.macs != NULL) { myproposal[PROPOSAL_MAC_ALGS_CTOS] = myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; + } else if (FIPS_mode()) { + myproposal[PROPOSAL_MAC_ALGS_CTOS] = + myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_MAC; } if (options.compression == COMP_NONE) { myproposal[PROPOSAL_COMP_ALGS_CTOS] = Index: openssh.spec =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- openssh.spec 26 Feb 2009 08:48:36 -0000 1.137 +++ openssh.spec 10 Mar 2009 11:54:44 -0000 1.138 @@ -62,8 +62,8 @@ Summary: An open source implementation of SSH protocol versions 1 and 2 Name: openssh -Version: 5.1p1 -Release: 8%{?dist}%{?rescue_rel} +Version: 5.2p1 +Release: 1%{?dist}%{?rescue_rel} URL: http://www.openssh.com/portable.html #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc @@ -74,11 +74,11 @@ Source1: openssh-nukeacss.sh Source2: sshd.pam Source3: sshd.init -Patch0: openssh-5.1p1-redhat.patch +Patch0: openssh-5.2p1-redhat.patch Patch2: openssh-5.1p1-skip-initial.patch Patch3: openssh-3.8.1p1-krb5-config.patch -Patch4: openssh-5.1p1-vendor.patch -Patch12: openssh-5.1p1-selinux.patch +Patch4: openssh-5.2p1-vendor.patch +Patch12: openssh-5.2p1-selinux.patch Patch13: openssh-5.1p1-mls.patch Patch16: openssh-4.7p1-audit.patch Patch17: openssh-4.3p2-cve-2007-3102.patch @@ -92,13 +92,11 @@ Patch39: openssh-4.3p2-no-v6only.patch Patch44: openssh-4.3p2-allow-ip-opts.patch Patch49: openssh-4.3p2-gssapi-canohost.patch -Patch51: openssh-5.1p1-nss-keys.patch +Patch51: openssh-5.2p1-nss-keys.patch Patch54: openssh-5.1p1-gssapi-role.patch Patch55: openssh-5.1p1-cloexec.patch Patch62: openssh-5.1p1-scp-manpage.patch -Patch63: openssh-5.1p1-bannerlen.patch -Patch64: openssh-5.1p1-compat-sessions.patch -Patch65: openssh-5.1p1-fips.patch +Patch65: openssh-5.2p1-fips.patch License: BSD Group: Applications/Internet @@ -229,8 +227,6 @@ %patch54 -p1 -b .gssapi-role %patch55 -p1 -b .cloexec %patch62 -p1 -b .manpage -%patch63 -p1 -b .bannerlen -%patch64 -p1 -b .compat-sessions %patch65 -p1 -b .fips autoreconf @@ -476,6 +472,9 @@ %endif %changelog +* Thu Mar 9 2009 Jan F. Chadima - 5.2p1-1 +- upgrade to new upstream release + * Thu Feb 26 2009 Fedora Release Engineering - 5.1p1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- openssh-5.1p1-bannerlen.patch DELETED --- --- openssh-5.1p1-compat-sessions.patch DELETED --- --- openssh-5.1p1-fips.patch DELETED --- --- openssh-5.1p1-nss-keys.patch DELETED --- --- openssh-5.1p1-redhat.patch DELETED --- --- openssh-5.1p1-selinux.patch DELETED --- --- openssh-5.1p1-vendor.patch DELETED --- From fabbione at fedoraproject.org Tue Mar 10 11:35:02 2009 From: fabbione at fedoraproject.org (Fabio M. Di Nitto) Date: Tue, 10 Mar 2009 11:35:02 +0000 (UTC) Subject: rpms/corosync/devel corosync-1807.diff, NONE, 1.1 corosync.spec, 1.20, 1.21 Message-ID: <20090310113502.F3DBD7002E@cvs1.fedora.phx.redhat.com> Author: fabbione Update of /cvs/pkgs/rpms/corosync/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22052 Modified Files: corosync.spec Added Files: corosync-1807.diff Log Message: Cherry pick changes from upstream to unbreak some basic functionalities corosync-1807.diff: --- NEW FILE corosync-1807.diff --- diff -Naurd corosync-trunk.orig/exec/vsf_quorum.c corosync-trunk/exec/vsf_quorum.c --- corosync-trunk.orig/exec/vsf_quorum.c 2009-02-25 12:14:47.000000000 +0100 +++ corosync-trunk/exec/vsf_quorum.c 2009-03-10 09:51:09.000000000 +0100 @@ -116,8 +116,6 @@ log_printf (LOG_LEVEL_NOTICE, "This node is within the non-primary component and will NOT provide any services.\n"); } - memcpy(&quorum_ring_id, ring_id, sizeof (quorum_ring_id)); - quorum_view_list_entries = view_list_entries; /* Tell sync() only if there is a new ring_id (ie this is not a 'fake' quorum event) */ @@ -125,6 +123,7 @@ sync_primary_callback_fn(view_list, view_list_entries, primary_designated, ring_id); } + memcpy(&quorum_ring_id, ring_id, sizeof (quorum_ring_id)); memcpy(quorum_view_list, view_list, sizeof(unsigned int)*view_list_entries); /* Tell internal listeners */ Index: corosync.spec =================================================================== RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- corosync.spec 9 Mar 2009 09:53:21 -0000 1.20 +++ corosync.spec 10 Mar 2009 11:34:31 -0000 1.21 @@ -1,15 +1,16 @@ -%define alphatag svn1794 +%define alphatag svn1797 Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 0.94 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} License: BSD Group: System Environment/Base URL: http://www.openais.org Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz Patch0: corosync-bump-soname.diff Patch1: corosync-trunk.diff +Patch2: corosync-1807.diff # Runtime bits Requires: corosynclib = %{version}-%{release} @@ -27,6 +28,7 @@ %setup -q -n corosync-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -190,6 +192,13 @@ %{_mandir}/man8/votequorum_overview.8* %changelog +* Tue Mar 10 2009 Fabio M. Di Nitto - 0.94-4.svn1797 +- Import fixes from upstream: + * Cleanup logsys format init around to use default settings (1795) + * logsys_format_set should use its own internal copy of format_buffer (1796) + * Add logsys_format_get to logsys API (1797) +- Cherry pick svn1807 to unbreak CPG. + * Mon Mar 9 2009 Fabio M. Di Nitto - 0.94-3.svn1794 - Import fixes from upstream: * Add reserve/release feature to totem message queue space (1793) From pkgdb at fedoraproject.org Tue Mar 10 12:06:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:06:24 +0000 Subject: [pkgdb] kdeedu: ltinkl has requested watchbugzilla Message-ID: <20090310120621.E949120850F@bastion.fedora.phx.redhat.com> ltinkl has requested the watchbugzilla acl on kdeedu (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:06:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:06:04 +0000 Subject: [pkgdb] kdeedu: ltinkl has requested watchcommits Message-ID: <20090310120624.25E91208551@bastion.fedora.phx.redhat.com> ltinkl has requested the watchcommits acl on kdeedu (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:06:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:06:26 +0000 Subject: [pkgdb] kdeedu: ltinkl has requested commit Message-ID: <20090310120626.4A7A3208555@bastion.fedora.phx.redhat.com> ltinkl has requested the commit acl on kdeedu (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:05:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:05:29 +0000 Subject: [pkgdb] kdeedu: ltinkl has requested watchbugzilla Message-ID: <20090310120634.C744C208557@bastion.fedora.phx.redhat.com> ltinkl has requested the watchbugzilla acl on kdeedu (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:06:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:06:39 +0000 Subject: [pkgdb] kdeedu: ltinkl has requested watchcommits Message-ID: <20090310120636.92472208608@bastion.fedora.phx.redhat.com> ltinkl has requested the watchcommits acl on kdeedu (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:06:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:06:19 +0000 Subject: [pkgdb] kdeedu: ltinkl has requested commit Message-ID: <20090310120639.3399020866A@bastion.fedora.phx.redhat.com> ltinkl has requested the commit acl on kdeedu (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:06:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:06:45 +0000 Subject: [pkgdb] kdeedu: ltinkl has requested watchbugzilla Message-ID: <20090310120645.2A8DB20850F@bastion.fedora.phx.redhat.com> ltinkl has requested the watchbugzilla acl on kdeedu (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:05:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:05:41 +0000 Subject: [pkgdb] kdeedu: ltinkl has requested watchcommits Message-ID: <20090310120647.1AC0E2086EF@bastion.fedora.phx.redhat.com> ltinkl has requested the watchcommits acl on kdeedu (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:06:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:06:52 +0000 Subject: [pkgdb] kdeedu: ltinkl has requested commit Message-ID: <20090310120649.316192086F6@bastion.fedora.phx.redhat.com> ltinkl has requested the commit acl on kdeedu (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From jfch2222 at fedoraproject.org Tue Mar 10 12:08:10 2009 From: jfch2222 at fedoraproject.org (Jan F. Chadima) Date: Tue, 10 Mar 2009 12:08:10 +0000 (UTC) Subject: rpms/openssh/devel .cvsignore,1.22,1.23 sources,1.22,1.23 Message-ID: <20090310120810.6CB2D7002E@cvs1.fedora.phx.redhat.com> Author: jfch2222 Update of /cvs/pkgs/rpms/openssh/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30187 Modified Files: .cvsignore sources Log Message: bounce openssh to version 5.2p1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 23 Jul 2008 14:50:23 -0000 1.22 +++ .cvsignore 10 Mar 2009 12:07:37 -0000 1.23 @@ -1 +1,2 @@ openssh-5.1p1-noacss.tar.bz2 +openssh-5.2p1-noacss.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 23 Jul 2008 14:50:23 -0000 1.22 +++ sources 10 Mar 2009 12:07:37 -0000 1.23 @@ -1 +1,2 @@ 5273579190b10f53baaf87f3c6eb0d73 openssh-5.1p1-noacss.tar.bz2 +41c61b5e2c2cddfd53897582b114ffe1 openssh-5.2p1-noacss.tar.bz2 From kraxel at fedoraproject.org Tue Mar 10 12:15:50 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Tue, 10 Mar 2009 12:15:50 +0000 (UTC) Subject: rpms/xen/devel xen-fix-deprecated-warnings.patch, 1.1, 1.2 xen.spec, 1.235, 1.236 Message-ID: <20090310121550.BF0287002E@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9939 Modified Files: xen-fix-deprecated-warnings.patch xen.spec Log Message: fix tyops in patch xen-fix-deprecated-warnings.patch: Index: xen-fix-deprecated-warnings.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-fix-deprecated-warnings.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-fix-deprecated-warnings.patch 10 Mar 2009 10:21:22 -0000 1.1 +++ xen-fix-deprecated-warnings.patch 10 Mar 2009 12:15:49 -0000 1.2 @@ -21,7 +21,7 @@ ### Save the XML policy into a file ### diff -up xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated xen-3.3.1/tools/python/xen/xend/XendAPI.py --- xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated 2009-03-10 11:16:47.000000000 +0100 -+++ xen-3.3.1/tools/python/xen/xend/XendAPI.py 2009-03-10 11:17:34.000000000 +0100 ++++ xen-3.3.1/tools/python/xen/xend/XendAPI.py 2009-03-10 13:13:33.000000000 +0100 @@ -18,7 +18,6 @@ import inspect import os @@ -35,7 +35,7 @@ if session not in event_registrations: event_registrations[session] = { - 'classes' : sets.Set(), -+ 'slasses' : set(), ++ 'classes' : set(), 'queue' : Queue.Queue(EVENT_QUEUE_LENGTH), 'next-id' : 1 } Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- xen.spec 10 Mar 2009 10:21:22 -0000 1.235 +++ xen.spec 10 Mar 2009 12:15:50 -0000 1.236 @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.3.1 -%define base_release 10 +%define base_release 11 # Hypervisor ABI %define hv_abi 3.3 @@ -502,7 +502,7 @@ %{_libdir}/*.a %changelog -* Tue Mar 10 2009 Gerd Hoffmann - 3.3.1-10 +* Tue Mar 10 2009 Gerd Hoffmann - 3.3.1-11 - fix python 2.6 warnings. * Fri Mar 6 2009 Gerd Hoffmann - 3.3.1-9 From jfch2222 at fedoraproject.org Tue Mar 10 12:18:24 2009 From: jfch2222 at fedoraproject.org (Jan F. Chadima) Date: Tue, 10 Mar 2009 12:18:24 +0000 (UTC) Subject: rpms/openssh/devel .cvsignore,1.23,1.24 Message-ID: <20090310121824.388057002E@cvs1.fedora.phx.redhat.com> Author: jfch2222 Update of /cvs/pkgs/rpms/openssh/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15996 Modified Files: .cvsignore Log Message: Upgrade na version 5.2p1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 10 Mar 2009 12:07:37 -0000 1.23 +++ .cvsignore 10 Mar 2009 12:17:53 -0000 1.24 @@ -1,2 +1 @@ -openssh-5.1p1-noacss.tar.bz2 openssh-5.2p1-noacss.tar.bz2 From jfch2222 at fedoraproject.org Tue Mar 10 12:22:00 2009 From: jfch2222 at fedoraproject.org (Jan F. Chadima) Date: Tue, 10 Mar 2009 12:22:00 +0000 (UTC) Subject: rpms/openssh/devel sources,1.23,1.24 Message-ID: <20090310122200.6349970132@cvs1.fedora.phx.redhat.com> Author: jfch2222 Update of /cvs/pkgs/rpms/openssh/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5387 Modified Files: sources Log Message: Upgrade to version 5.2p1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 10 Mar 2009 12:07:37 -0000 1.23 +++ sources 10 Mar 2009 12:21:29 -0000 1.24 @@ -1,2 +1 @@ -5273579190b10f53baaf87f3c6eb0d73 openssh-5.1p1-noacss.tar.bz2 41c61b5e2c2cddfd53897582b114ffe1 openssh-5.2p1-noacss.tar.bz2 From pkgdb at fedoraproject.org Tue Mar 10 12:28:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:28:32 +0000 Subject: [pkgdb] kdeedu had acl change status Message-ID: <20090310122832.A560B208505@bastion.fedora.phx.redhat.com> rdieter has set the commit acl on kdeedu (Fedora devel) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:28:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:28:38 +0000 Subject: [pkgdb] kdeedu had acl change status Message-ID: <20090310122835.BDCD0208514@bastion.fedora.phx.redhat.com> rdieter has set the watchcommits acl on kdeedu (Fedora devel) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:28:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:28:16 +0000 Subject: [pkgdb] kdeedu had acl change status Message-ID: <20090310122837.0D8CD208553@bastion.fedora.phx.redhat.com> rdieter has set the watchbugzilla acl on kdeedu (Fedora devel) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:27:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:27:42 +0000 Subject: [pkgdb] kdeedu had acl change status Message-ID: <20090310122848.23EFE208556@bastion.fedora.phx.redhat.com> rdieter has set the commit acl on kdeedu (Fedora 9) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:28:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:28:50 +0000 Subject: [pkgdb] kdeedu had acl change status Message-ID: <20090310122850.269D5208604@bastion.fedora.phx.redhat.com> rdieter has set the watchcommits acl on kdeedu (Fedora 9) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:28:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:28:55 +0000 Subject: [pkgdb] kdeedu had acl change status Message-ID: <20090310122852.43EE62086EF@bastion.fedora.phx.redhat.com> rdieter has set the watchbugzilla acl on kdeedu (Fedora 9) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:29:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:29:01 +0000 Subject: [pkgdb] kdeedu: rdieter has requested watchbugzilla Message-ID: <20090310122901.2EE5D208510@bastion.fedora.phx.redhat.com> rdieter has requested the watchbugzilla acl on kdeedu (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:29:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:29:04 +0000 Subject: [pkgdb] kdeedu: rdieter has requested watchcommits Message-ID: <20090310122901.5ED5F208514@bastion.fedora.phx.redhat.com> rdieter has requested the watchcommits acl on kdeedu (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:28:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:28:42 +0000 Subject: [pkgdb] kdeedu: rdieter has requested commit Message-ID: <20090310122902.C7738208702@bastion.fedora.phx.redhat.com> rdieter has requested the commit acl on kdeedu (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 12:27:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 12:27:58 +0000 Subject: [pkgdb] kdeedu: rdieter has requested approveacls Message-ID: <20090310122903.A5ADC208705@bastion.fedora.phx.redhat.com> rdieter has requested the approveacls acl on kdeedu (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From airlied at fedoraproject.org Tue Mar 10 12:33:43 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 10 Mar 2009 12:33:43 +0000 (UTC) Subject: rpms/xorg-x11-drv-ati/devel radeon-fix-r600-xv.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.155, 1.156 Message-ID: <20090310123343.75F107002E@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21628 Modified Files: xorg-x11-drv-ati.spec Added Files: radeon-fix-r600-xv.patch Log Message: * Tue Mar 10 2009 Dave Airlie 6.11.0-7 - fix r600 xv, thanks to twoerner on #radeon for testing radeon-fix-r600-xv.patch: --- NEW FILE radeon-fix-r600-xv.patch --- diff -up xf86-video-ati-6.11.0/src/radeon_textured_video.c.dave xf86-video-ati-6.11.0/src/radeon_textured_video.c --- xf86-video-ati-6.11.0/src/radeon_textured_video.c.dave 2009-03-10 21:36:00.000000000 +1000 +++ xf86-video-ati-6.11.0/src/radeon_textured_video.c 2009-03-10 21:36:11.000000000 +1000 @@ -572,7 +572,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn #ifdef XF86DRI if (IS_R600_3D) R600DisplayTexturedVideo(pScrn, pPriv); - if (info->directRenderingEnabled || info->drm_mode_setting) + else if (info->directRenderingEnabled || info->drm_mode_setting) RADEONDisplayTexturedVideoCP(pScrn, pPriv); else #endif Index: xorg-x11-drv-ati.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- xorg-x11-drv-ati.spec 10 Mar 2009 02:04:50 -0000 1.155 +++ xorg-x11-drv-ati.spec 10 Mar 2009 12:33:12 -0000 1.156 @@ -5,7 +5,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.11.0 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -19,6 +19,7 @@ #Patch4: radeon-6.9.0-remove-limit-heuristics.patch Patch5: radeon-6.9.0-panel-size-sanity.patch Patch6: radeon-6.9.0-bgnr-enable.patch +Patch7: radeon-fix-r600-xv.patch ExcludeArch: s390 s390x @@ -45,6 +46,7 @@ #patch4 -p1 -b .remove-limit-heuristics #%patch5 -p1 -b .panel-size %patch6 -p1 -b .bgnr +%patch7 -p1 -b .r600xv %build autoreconf -iv @@ -76,6 +78,9 @@ %{_mandir}/man4/radeon.4* %changelog +* Tue Mar 10 2009 Dave Airlie 6.11.0-7 +- fix r600 xv, thanks to twoerner on #radeon for testing + * Tue Mar 10 2009 Dave Airlie 6.11.0-6 - master fixes for panning + enable r600 accel by default From robert at fedoraproject.org Tue Mar 10 12:37:29 2009 From: robert at fedoraproject.org (Robert Scheck) Date: Tue, 10 Mar 2009 12:37:29 +0000 (UTC) Subject: rpms/php-magickwand/devel php-magickwand.spec,1.11,1.12 Message-ID: <20090310123729.A3AFB7002E@cvs1.fedora.phx.redhat.com> Author: robert Update of /cvs/extras/rpms/php-magickwand/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22677 Modified Files: php-magickwand.spec Log Message: Rebuild against ImageMagick 6.4.9.6 Index: php-magickwand.spec =================================================================== RCS file: /cvs/extras/rpms/php-magickwand/devel/php-magickwand.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- php-magickwand.spec 23 Feb 2009 19:42:45 -0000 1.11 +++ php-magickwand.spec 10 Mar 2009 12:36:58 -0000 1.12 @@ -3,7 +3,7 @@ Summary: PHP API for ImageMagick Name: php-magickwand Version: 1.0.8 -Release: 1%{?dist} +Release: 2%{?dist} License: ImageMagick Group: Development/Languages # Only latest version is always kept on: http://www.magickwand.org/download/php/ @@ -50,6 +50,9 @@ %config(noreplace) %{_sysconfdir}/php.d/magickwand.ini %changelog +* Tue Mar 10 2009 Robert Scheck 1.0.8-2 +- Rebuild against ImageMagick 6.4.9.6 + * Mon Feb 23 2009 Robert Scheck 1.0.8-1 - Upgrade to 1.0.8 - Rebuild against gcc 4.4 and rpm 4.6 From rjones at fedoraproject.org Tue Mar 10 12:44:11 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 12:44:11 +0000 (UTC) Subject: rpms/mingw32-zlib/EL-5 mingw32-zlib.spec,1.1,1.2 Message-ID: <20090310124411.BCFD27002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-zlib/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24284 Modified Files: mingw32-zlib.spec Log Message: Add static subpackage. (W. Pilorz) Index: mingw32-zlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-zlib/EL-5/mingw32-zlib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mingw32-zlib.spec 21 Dec 2008 11:18:49 -0000 1.1 +++ mingw32-zlib.spec 10 Mar 2009 12:43:40 -0000 1.2 @@ -6,7 +6,7 @@ Name: mingw32-zlib Version: 1.2.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: MinGW Windows zlib compression library License: zlib @@ -32,6 +32,14 @@ %description MinGW Windows zlib compression library. +%package static +Summary: Static libraries for mingw32-zlib development. +Group: Development/Libraries +Requires: mingw32-zlib = %{version}-%{release} + +%description static +The mingw32-zlib-static package contains static library for mingw32-zlib development. + %prep %setup -q -n zlib-1.2.3 @@ -72,8 +80,8 @@ mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libzdll.a \ $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.dll.a -# Remove static library. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.a +# Do NOT remove static library. +# rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.a %clean @@ -87,8 +95,14 @@ %{_mingw32_libdir}/libz.dll.a %{_mingw32_bindir}/zlib1.dll +%files static +%defattr(-,root,root) +%{_mingw32_libdir}/libz.a %changelog +* Mon Mar 3 2009 W. Pilorz 1.2.3-12 +- Add static subpackage. + * Thu Dec 18 2008 Richard W.M. Jones - 1.2.3-11 - Pass correct CFLAGS to build. From rjones at fedoraproject.org Tue Mar 10 12:44:17 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 12:44:17 +0000 (UTC) Subject: rpms/mingw32-zlib/F-10 mingw32-zlib.spec,1.1,1.2 Message-ID: <20090310124417.200637002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-zlib/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24341 Modified Files: mingw32-zlib.spec Log Message: Add static subpackage. (W. Pilorz) Index: mingw32-zlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-zlib/F-10/mingw32-zlib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mingw32-zlib.spec 21 Dec 2008 11:18:53 -0000 1.1 +++ mingw32-zlib.spec 10 Mar 2009 12:43:46 -0000 1.2 @@ -6,7 +6,7 @@ Name: mingw32-zlib Version: 1.2.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: MinGW Windows zlib compression library License: zlib @@ -32,6 +32,14 @@ %description MinGW Windows zlib compression library. +%package static +Summary: Static libraries for mingw32-zlib development. +Group: Development/Libraries +Requires: mingw32-zlib = %{version}-%{release} + +%description static +The mingw32-zlib-static package contains static library for mingw32-zlib development. + %prep %setup -q -n zlib-1.2.3 @@ -72,8 +80,8 @@ mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libzdll.a \ $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.dll.a -# Remove static library. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.a +# Do NOT remove static library. +# rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.a %clean @@ -87,8 +95,14 @@ %{_mingw32_libdir}/libz.dll.a %{_mingw32_bindir}/zlib1.dll +%files static +%defattr(-,root,root) +%{_mingw32_libdir}/libz.a %changelog +* Mon Mar 3 2009 W. Pilorz 1.2.3-12 +- Add static subpackage. + * Thu Dec 18 2008 Richard W.M. Jones - 1.2.3-11 - Pass correct CFLAGS to build. From rjones at fedoraproject.org Tue Mar 10 12:44:12 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 12:44:12 +0000 (UTC) Subject: rpms/mingw32-zlib/devel mingw32-zlib.spec,1.4,1.5 Message-ID: <20090310124412.EE1507002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-zlib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24304 Modified Files: mingw32-zlib.spec Log Message: Add static subpackage. (W. Pilorz) Index: mingw32-zlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-zlib/devel/mingw32-zlib.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mingw32-zlib.spec 26 Feb 2009 01:29:46 -0000 1.4 +++ mingw32-zlib.spec 10 Mar 2009 12:43:42 -0000 1.5 @@ -6,7 +6,7 @@ Name: mingw32-zlib Version: 1.2.3 -Release: 14%{?dist} +Release: 15%{?dist} Summary: MinGW Windows zlib compression library License: zlib @@ -32,6 +32,14 @@ %description MinGW Windows zlib compression library. +%package static +Summary: Static libraries for mingw32-zlib development. +Group: Development/Libraries +Requires: mingw32-zlib = %{version}-%{release} + +%description static +The mingw32-zlib-static package contains static library for mingw32-zlib development. + %prep %setup -q -n zlib-1.2.3 @@ -72,8 +80,8 @@ mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libzdll.a \ $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.dll.a -# Remove static library. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.a +# Do NOT remove static library. +# rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.a %clean @@ -88,7 +96,15 @@ %{_mingw32_bindir}/zlib1.dll +%files static +%defattr(-,root,root) +%{_mingw32_libdir}/libz.a + + %changelog +* Mon Mar 3 2009 W. Pilorz - 1.2.3-15 +- Add static subpackage. + * Wed Feb 25 2009 Fedora Release Engineering - 1.2.3-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From varekova at fedoraproject.org Tue Mar 10 12:59:38 2009 From: varekova at fedoraproject.org (Ivana Varekova) Date: Tue, 10 Mar 2009 12:59:38 +0000 (UTC) Subject: rpms/gnuplot/devel gnuplot.spec,1.64,1.65 Message-ID: <20090310125938.84DDF7002E@cvs1.fedora.phx.redhat.com> Author: varekova Update of /cvs/pkgs/rpms/gnuplot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28322 Modified Files: gnuplot.spec Log Message: - fix #489069 (update of the package from nonsplit version causes the absence of gnuplot binary - fixed using posttrans instead of post) Index: gnuplot.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- gnuplot.spec 25 Feb 2009 00:07:22 -0000 1.64 +++ gnuplot.spec 10 Mar 2009 12:59:07 -0000 1.65 @@ -17,7 +17,7 @@ Summary: A program for plotting mathematical expressions and data Name: gnuplot Version: %{major}.%{minor}.%{patchlevel} -Release: 4%{?dist} +Release: 5%{?dist} # Modifications are to be distributed as patches to the released version. License: gnuplot and GPLv2 Group: Applications/Engineering @@ -147,13 +147,13 @@ # install minimal binary install -p -m 755 ./src/gnuplot-minimal $RPM_BUILD_ROOT%{_bindir}/gnuplot-minimal -%post +%posttrans %{_sbindir}/alternatives --install %{_bindir}/gnuplot gnuplot %{_bindir}/gnuplot-wx 60 %post common /sbin/install-info %{_infodir}/gnuplot.info %{_infodir}/dir || : -%post minimal +%posttrans minimal %{_sbindir}/alternatives --install %{_bindir}/gnuplot gnuplot %{_bindir}/gnuplot-minimal 40 %preun @@ -217,6 +217,11 @@ %{emacs_lispdir}/%{name}/*.el %changelog +* Tue Mar 10 2009 Ivana Varekova - 4.2.4-5 +- fix #489069 (update of the package from nonsplit version + causes the absence of gnuplot binary - + fixed using posttrans instead of post) + * Tue Feb 24 2009 Fedora Release Engineering - 4.2.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From tbzatek at fedoraproject.org Tue Mar 10 13:05:18 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Tue, 10 Mar 2009 13:05:18 +0000 (UTC) Subject: rpms/gvfs/devel .cvsignore, 1.36, 1.37 gvfs.spec, 1.113, 1.114 sources, 1.36, 1.37 Message-ID: <20090310130518.378E17002E@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29782 Modified Files: .cvsignore gvfs.spec sources Log Message: * Tue Mar 10 2009 Tomas Bzatek - 1.1.8-1 - Update to 1.1.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 2 Mar 2009 16:34:21 -0000 1.36 +++ .cvsignore 10 Mar 2009 13:04:47 -0000 1.37 @@ -1 +1 @@ -gvfs-1.1.7.tar.bz2 +gvfs-1.1.8.tar.bz2 Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- gvfs.spec 9 Mar 2009 16:24:02 -0000 1.113 +++ gvfs.spec 10 Mar 2009 13:04:47 -0000 1.114 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs -Version: 1.1.7 -Release: 5%{?dist} +Version: 1.1.8 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -268,6 +268,9 @@ %changelog +* Tue Mar 10 2009 Tomas Bzatek - 1.1.8-1 +- Update to 1.1.8 + * Mon Mar 9 2009 Tomas Bzatek - 1.1.7-5 - Expose device file attribute for all items in computer:// Index: sources =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 2 Mar 2009 16:34:21 -0000 1.36 +++ sources 10 Mar 2009 13:04:47 -0000 1.37 @@ -1 +1 @@ -c5528812561936fd9501a62382d24585 gvfs-1.1.7.tar.bz2 +7936ae0cbef86b6c1cd74d7ebb87c9ba gvfs-1.1.8.tar.bz2 From mcpierce at fedoraproject.org Tue Mar 10 13:07:25 2009 From: mcpierce at fedoraproject.org (Darryl L. Pierce) Date: Tue, 10 Mar 2009 13:07:25 +0000 (UTC) Subject: rpms/rubygem-hoe/devel .cvsignore, 1.10, 1.11 rubygem-hoe.spec, 1.14, 1.15 sources, 1.10, 1.11 Message-ID: <20090310130725.54E547002E@cvs1.fedora.phx.redhat.com> Author: mcpierce Update of /cvs/pkgs/rpms/rubygem-hoe/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30236 Modified Files: .cvsignore rubygem-hoe.spec sources Log Message: Release 1.10.0 of Hoe. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 27 Feb 2009 20:49:14 -0000 1.10 +++ .cvsignore 10 Mar 2009 13:06:54 -0000 1.11 @@ -1 +1 @@ -hoe-1.9.0.gem +hoe-1.10.0.gem Index: rubygem-hoe.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/rubygem-hoe.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- rubygem-hoe.spec 27 Feb 2009 20:49:14 -0000 1.14 +++ rubygem-hoe.spec 10 Mar 2009 13:06:54 -0000 1.15 @@ -5,7 +5,7 @@ Summary: Hoe is a simple rake/rubygems helper for project Rakefiles Name: rubygem-%{gemname} -Version: 1.9.0 +Version: 1.10.0 Release: 1%{?dist} Group: Development/Languages License: MIT @@ -15,7 +15,7 @@ Requires: ruby(abi) = 1.8 Requires: rubygems Requires: rubygem(rubyforge) >= 1.0.3 -Requires: rubygem(rake) >= 0.8.3 +Requires: rubygem(rake) >= 0.8.4 BuildRequires: rubygems BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} @@ -84,6 +84,9 @@ %changelog +* Tue Mar 10 2009 Darryl Pierce - 1.10.0-1 +- Release 1.10.0 of Hoe. + * Fri Feb 27 2009 Darryl Pierce - 1.9.0-1 - Release 1.9.0 of Hoe. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 27 Feb 2009 20:49:14 -0000 1.10 +++ sources 10 Mar 2009 13:06:54 -0000 1.11 @@ -1 +1 @@ -89c65845798bc2648c00be3e7ed405ec hoe-1.9.0.gem +575491bd77ac7df57b59f092de21d45d hoe-1.10.0.gem From jcollie at fedoraproject.org Tue Mar 10 13:09:43 2009 From: jcollie at fedoraproject.org (Jeffrey C. Ollie) Date: Tue, 10 Mar 2009 13:09:43 +0000 (UTC) Subject: rpms/gramps/devel .cvsignore, 1.26, 1.27 gramps.spec, 1.43, 1.44 sources, 1.26, 1.27 Message-ID: <20090310130943.0EE657002E@cvs1.fedora.phx.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/gramps/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30868 Modified Files: .cvsignore gramps.spec sources Log Message: * Tue Mar 10 2009 Jeffrey C. Ollie - 3.1.1-1 - Version 3.1.1 -- the "Spam, bacon, sausage and spam" release: - * The release of 3.1.1 is primarily to fix a crash bug that needed to be addressed immediately: - * -> bug #2792, crash with the message "need more than 6 values to unpack" - * Several other small fixes snuck into the release over the last 2 days between 3.1.0 and 3.1.1: - * -> add a warning when installing from .tar.gz - * -> bug #2121 - graphviz reports were generated off-page - * -> various gramplet fixes - * -> several text typo fixes and translation updates (de, fr) - * -> bug #2772 - name display format - * -> bug #2789 - fix for HTTP 404 in NarrativeWeb due to bad relative path Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gramps/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 8 Mar 2009 03:02:53 -0000 1.26 +++ .cvsignore 10 Mar 2009 13:09:12 -0000 1.27 @@ -1 +1 @@ -gramps-3.1.0.tar.gz +gramps-3.1.1.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/pkgs/rpms/gramps/devel/gramps.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- gramps.spec 8 Mar 2009 03:02:54 -0000 1.43 +++ gramps.spec 10 Mar 2009 13:09:12 -0000 1.44 @@ -1,5 +1,5 @@ Name: gramps -Version: 3.1.0 +Version: 3.1.1 Release: 1%{?dist} Summary: Genealogical Research and Analysis Management Programming System @@ -114,6 +114,18 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Tue Mar 10 2009 Jeffrey C. Ollie - 3.1.1-1 +- Version 3.1.1 -- the "Spam, bacon, sausage and spam" release: +- * The release of 3.1.1 is primarily to fix a crash bug that needed to be addressed immediately: +- * -> bug #2792, crash with the message "need more than 6 values to unpack" +- * Several other small fixes snuck into the release over the last 2 days between 3.1.0 and 3.1.1: +- * -> add a warning when installing from .tar.gz +- * -> bug #2121 - graphviz reports were generated off-page +- * -> various gramplet fixes +- * -> several text typo fixes and translation updates (de, fr) +- * -> bug #2772 - name display format +- * -> bug #2789 - fix for HTTP 404 in NarrativeWeb due to bad relative path + * Sat Mar 7 2009 Jeffrey C. Ollie - 3.1.0-1 - Update to 3.1.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gramps/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 8 Mar 2009 03:02:54 -0000 1.26 +++ sources 10 Mar 2009 13:09:12 -0000 1.27 @@ -1 +1 @@ -ddf380f34ee180b85bcf9a04b9a35d39 gramps-3.1.0.tar.gz +c99ddec4a984989202e25c667fce9984 gramps-3.1.1.tar.gz From rakesh at fedoraproject.org Tue Mar 10 13:18:07 2009 From: rakesh at fedoraproject.org (Rakesh Pandit) Date: Tue, 10 Mar 2009 13:18:07 +0000 (UTC) Subject: rpms/octave-forge/devel octave-forge.spec,1.65,1.66 Message-ID: <20090310131807.311B57002E@cvs1.fedora.phx.redhat.com> Author: rakesh Update of /cvs/pkgs/rpms/octave-forge/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv302 Modified Files: octave-forge.spec Log Message: Bumped to consume the soname update in ImageMagic. Index: octave-forge.spec =================================================================== RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- octave-forge.spec 24 Feb 2009 13:05:59 -0000 1.65 +++ octave-forge.spec 10 Mar 2009 13:17:36 -0000 1.66 @@ -2,7 +2,7 @@ Name: octave-forge Version: 20080831 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -207,6 +207,9 @@ %changelog +* Tue Mar 10 2009 Rakesh Pandit - 20080831-6 +- Bumped to consume the soname update in ImageMagic. + * Tue Feb 24 2009 Alex Lancaster - 20080831-5 - Rebuild against new hdf5 and for GCC 4.4. From mcpierce at fedoraproject.org Tue Mar 10 13:21:52 2009 From: mcpierce at fedoraproject.org (Darryl L. Pierce) Date: Tue, 10 Mar 2009 13:21:52 +0000 (UTC) Subject: rpms/rubygem-hoe/F-9 .cvsignore, 1.10, 1.11 rubygem-hoe.spec, 1.10, 1.11 sources, 1.10, 1.11 Message-ID: <20090310132152.15AF17002E@cvs1.fedora.phx.redhat.com> Author: mcpierce Update of /cvs/pkgs/rpms/rubygem-hoe/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1220 Modified Files: .cvsignore rubygem-hoe.spec sources Log Message: Release 1.10.0 of Hoe. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-9/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 27 Feb 2009 20:58:57 -0000 1.10 +++ .cvsignore 10 Mar 2009 13:21:21 -0000 1.11 @@ -1 +1 @@ -hoe-1.9.0.gem +hoe-1.10.0.gem Index: rubygem-hoe.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-9/rubygem-hoe.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rubygem-hoe.spec 27 Feb 2009 20:58:57 -0000 1.10 +++ rubygem-hoe.spec 10 Mar 2009 13:21:21 -0000 1.11 @@ -5,7 +5,7 @@ Summary: Hoe is a simple rake/rubygems helper for project Rakefiles Name: rubygem-%{gemname} -Version: 1.9.0 +Version: 1.10.0 Release: 1%{?dist} Group: Development/Languages License: MIT @@ -15,7 +15,7 @@ Requires: ruby(abi) = 1.8 Requires: rubygems Requires: rubygem(rubyforge) >= 1.0.3 -Requires: rubygem(rake) >= 0.8.3 +Requires: rubygem(rake) >= 0.8.4 BuildRequires: rubygems BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} @@ -84,6 +84,9 @@ %changelog +* Tue Mar 10 2009 Darryl Pierce - 1.10.0-1 +- Release 1.10.0 of Hoe. + * Fri Feb 27 2009 Darryl Pierce - 1.9.0-1 - Release 1.9.0 of Hoe. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-9/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 27 Feb 2009 20:58:57 -0000 1.10 +++ sources 10 Mar 2009 13:21:21 -0000 1.11 @@ -1 +1 @@ -89c65845798bc2648c00be3e7ed405ec hoe-1.9.0.gem +575491bd77ac7df57b59f092de21d45d hoe-1.10.0.gem From than at fedoraproject.org Tue Mar 10 13:29:33 2009 From: than at fedoraproject.org (Than Ngo) Date: Tue, 10 Mar 2009 13:29:33 +0000 (UTC) Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.2.1-plasma-konsole.patch, NONE, 1.1 kdebase-workspace.spec, 1.199, 1.200 kdebase-workspace-4.1.72-plasma-konsole.patch, 1.1, NONE Message-ID: <20090310132933.2511C7002E@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3750 Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.2.1-plasma-konsole.patch Removed Files: kdebase-workspace-4.1.72-plasma-konsole.patch Log Message: fix konsole patch to use invokeTerminal kdebase-workspace-4.2.1-plasma-konsole.patch: --- NEW FILE kdebase-workspace-4.2.1-plasma-konsole.patch --- diff -up kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.cpp.plasma-konsole kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.cpp --- kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.cpp.plasma-konsole 2008-12-21 21:19:14.000000000 +0100 +++ kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.cpp 2009-03-10 13:33:38.000000000 +0100 @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -61,6 +62,7 @@ DefaultDesktop::DefaultDesktop(QObject * m_lockDesktopAction(0), m_appletBrowserAction(0), m_addPanelAction(0), + m_runKonsoleAction(0), m_runCommandAction(0), m_lockScreenAction(0), m_logoutAction(0), @@ -151,6 +153,11 @@ void DefaultDesktop::runCommand() krunner.display(); } +void DefaultDesktop::runKonsole() +{ + KToolInvocation::invokeTerminal(QString(), QDir::homePath()); +} + void DefaultDesktop::lockScreen() { if (!KAuthorized::authorizeKAction("lock_screen")) { @@ -180,6 +187,10 @@ QList DefaultDesktop::contextu connect(m_addPanelAction, SIGNAL(triggered(bool)), this, SLOT(addPanel())); m_addPanelAction->setIcon(KIcon("list-add")); + m_runKonsoleAction = new QAction(i18n("Konsole"), this); + connect(m_runKonsoleAction, SIGNAL(triggered(bool)), this, SLOT(runKonsole())); + m_runKonsoleAction->setIcon(KIcon("terminal")); + m_runCommandAction = new QAction(i18n("Run Command..."), this); connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand())); m_runCommandAction->setIcon(KIcon("system-run")); @@ -202,6 +213,8 @@ QList DefaultDesktop::contextu QList actions; + actions.append(m_runKonsoleAction); + if (KAuthorized::authorizeKAction("run_command")) { actions.append(m_runCommandAction); } diff -up kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.h.plasma-konsole kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.h --- kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.h.plasma-konsole 2008-12-10 17:13:23.000000000 +0100 +++ kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.h 2009-03-10 12:55:20.000000000 +0100 @@ -69,6 +69,7 @@ protected: void dropEvent(QGraphicsSceneDragDropEvent *event); protected Q_SLOTS: + void runKonsole(); void runCommand(); void lockScreen(); @@ -85,6 +86,7 @@ private: QAction *m_lockDesktopAction; QAction *m_appletBrowserAction; QAction *m_addPanelAction; + QAction *m_runKonsoleAction; QAction *m_runCommandAction; QAction *m_setupDesktopAction; QAction *m_lockScreenAction; Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- kdebase-workspace.spec 9 Mar 2009 17:25:05 -0000 1.199 +++ kdebase-workspace.spec 10 Mar 2009 13:29:02 -0000 1.200 @@ -8,7 +8,7 @@ Name: kdebase-workspace Version: 4.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: kdebase-workspace-4.2.1-redhat-startkde.patch -Patch2: kdebase-workspace-4.1.72-plasma-konsole.patch +Patch2: kdebase-workspace-4.2.1-plasma-konsole.patch Patch3: kdebase-workspace-4.2.0-show-systemsettings.patch Patch4: kdebase-workspace-4.0.72-ck-shutdown.patch #??434824: KDE4 System Settings - No Method To Enter Administrative Mode @@ -376,6 +376,9 @@ %changelog +* Tue Mar 10 2009 Than Ngo - 4.2.1-6 +- fix konsole patch to use invokeTerminal + * Mon Mar 9 2009 Luk???? Tinkl - 4.2.1-5 - fix pager not displaying desktop numbers (kdebug#184152) --- kdebase-workspace-4.1.72-plasma-konsole.patch DELETED --- From rjones at fedoraproject.org Tue Mar 10 13:31:41 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 13:31:41 +0000 (UTC) Subject: rpms/ocaml-pa-monad/devel ocaml-pa-monad.spec, 1.5, 1.6 sources, 1.2, 1.3 ocaml-pa-monad-1.2.0-no-warn-error.patch, 1.1, NONE Message-ID: <20090310133141.199EB7002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-pa-monad/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4457 Modified Files: ocaml-pa-monad.spec sources Removed Files: ocaml-pa-monad-1.2.0-no-warn-error.patch Log Message: - New upstream version 6.0 [sic]. - Patch no longer required, now upstream. Index: ocaml-pa-monad.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pa-monad/devel/ocaml-pa-monad.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ocaml-pa-monad.spec 26 Feb 2009 07:24:37 -0000 1.5 +++ ocaml-pa-monad.spec 10 Mar 2009 13:31:10 -0000 1.6 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-pa-monad -Version: 1.2.0 -Release: 8%{?dist} +Version: 6.0 +Release: 1%{?dist} Summary: OCaml syntax extension for monads Group: Development/Libraries @@ -12,8 +12,6 @@ Source0: http://www.cas.mcmaster.ca/~carette/pa_monad/pa_monad.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: ocaml-pa-monad-1.2.0-no-warn-error.patch - BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc @@ -32,7 +30,6 @@ %prep %setup -q -c -%patch0 -p1 %build @@ -63,6 +60,10 @@ %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 6.0-1 +- New upstream version 6.0 [sic]. +- Patch no longer required, now upstream. + * Wed Feb 25 2009 Fedora Release Engineering - 1.2.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pa-monad/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 May 2008 20:19:39 -0000 1.2 +++ sources 10 Mar 2009 13:31:10 -0000 1.3 @@ -1 +1 @@ -c80937e9d6a1d8e7867d0b2e31abf055 pa_monad.tar.gz +fdf811b1c2fd94f4e9639e46736b5dc6 pa_monad.tar.gz --- ocaml-pa-monad-1.2.0-no-warn-error.patch DELETED --- From mcpierce at fedoraproject.org Tue Mar 10 13:32:54 2009 From: mcpierce at fedoraproject.org (Darryl L. Pierce) Date: Tue, 10 Mar 2009 13:32:54 +0000 (UTC) Subject: rpms/rubygem-hoe/F-10 .cvsignore, 1.10, 1.11 rubygem-hoe.spec, 1.13, 1.14 sources, 1.10, 1.11 Message-ID: <20090310133254.4B67B7002E@cvs1.fedora.phx.redhat.com> Author: mcpierce Update of /cvs/pkgs/rpms/rubygem-hoe/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4857 Modified Files: .cvsignore rubygem-hoe.spec sources Log Message: Release 1.10.0 of Hoe. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-10/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 27 Feb 2009 21:10:10 -0000 1.10 +++ .cvsignore 10 Mar 2009 13:32:23 -0000 1.11 @@ -1 +1 @@ -hoe-1.9.0.gem +hoe-1.10.0.gem Index: rubygem-hoe.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-10/rubygem-hoe.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- rubygem-hoe.spec 27 Feb 2009 21:10:10 -0000 1.13 +++ rubygem-hoe.spec 10 Mar 2009 13:32:23 -0000 1.14 @@ -5,7 +5,7 @@ Summary: Hoe is a simple rake/rubygems helper for project Rakefiles Name: rubygem-%{gemname} -Version: 1.9.0 +Version: 1.10.0 Release: 1%{?dist} Group: Development/Languages License: MIT @@ -15,7 +15,7 @@ Requires: ruby(abi) = 1.8 Requires: rubygems Requires: rubygem(rubyforge) >= 1.0.3 -Requires: rubygem(rake) >= 0.8.3 +Requires: rubygem(rake) >= 0.8.4 BuildRequires: rubygems BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} @@ -84,6 +84,9 @@ %changelog +* Tue Mar 10 2009 Darryl Pierce - 1.10.0-1 +- Release 1.10.0 of Hoe. + * Fri Feb 27 2009 Darryl Pierce - 1.9.0-1 - Release 1.9.0 of Hoe. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-10/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 27 Feb 2009 21:10:10 -0000 1.10 +++ sources 10 Mar 2009 13:32:23 -0000 1.11 @@ -1 +1 @@ -89c65845798bc2648c00be3e7ed405ec hoe-1.9.0.gem +575491bd77ac7df57b59f092de21d45d hoe-1.10.0.gem From pkgdb at fedoraproject.org Tue Mar 10 13:34:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 13:34:40 +0000 Subject: [pkgdb] sat4j: akurtakov has requested watchcommits Message-ID: <20090310133438.31B73208505@bastion.fedora.phx.redhat.com> akurtakov has requested the watchcommits acl on sat4j (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sat4j From pkgdb at fedoraproject.org Tue Mar 10 13:33:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 13:33:32 +0000 Subject: [pkgdb] sat4j: akurtakov has requested watchbugzilla Message-ID: <20090310133438.414C8208511@bastion.fedora.phx.redhat.com> akurtakov has requested the watchbugzilla acl on sat4j (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sat4j From pkgdb at fedoraproject.org Tue Mar 10 13:34:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 13:34:19 +0000 Subject: [pkgdb] sat4j: akurtakov has requested commit Message-ID: <20090310133439.25785208551@bastion.fedora.phx.redhat.com> akurtakov has requested the commit acl on sat4j (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sat4j From pkgdb at fedoraproject.org Tue Mar 10 13:33:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 13:33:47 +0000 Subject: [pkgdb] icu4j: akurtakov has requested watchbugzilla Message-ID: <20090310133453.AE8C4208555@bastion.fedora.phx.redhat.com> akurtakov has requested the watchbugzilla acl on icu4j (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/icu4j From pkgdb at fedoraproject.org Tue Mar 10 13:34:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 13:34:56 +0000 Subject: [pkgdb] icu4j: akurtakov has requested watchcommits Message-ID: <20090310133453.C04F9208602@bastion.fedora.phx.redhat.com> akurtakov has requested the watchcommits acl on icu4j (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/icu4j From pkgdb at fedoraproject.org Tue Mar 10 13:34:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 13:34:34 +0000 Subject: [pkgdb] icu4j: akurtakov has requested commit Message-ID: <20090310133455.64E52208608@bastion.fedora.phx.redhat.com> akurtakov has requested the commit acl on icu4j (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/icu4j From kwizart at fedoraproject.org Tue Mar 10 13:39:13 2009 From: kwizart at fedoraproject.org (Nicolas Chauvet) Date: Tue, 10 Mar 2009 13:39:13 +0000 (UTC) Subject: rpms/oyranos/devel oyranos.spec,1.7,1.8 Message-ID: <20090310133913.EF2A37002E@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/oyranos/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6210 Modified Files: oyranos.spec Log Message: Fix wrong post requires Index: oyranos.spec =================================================================== RCS file: /cvs/pkgs/rpms/oyranos/devel/oyranos.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- oyranos.spec 9 Mar 2009 11:03:25 -0000 1.7 +++ oyranos.spec 10 Mar 2009 13:38:43 -0000 1.8 @@ -1,6 +1,6 @@ Name: oyranos Version: 0.1.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Oyranos Colour Management System (CMS) Group: Applications/Multimedia @@ -43,7 +43,7 @@ Requires: %{name}-libs = %{version}-%{release} #Requires: color-icc-profiles -Requires(post): elektra-kdb +Requires(post): %{_bindir}/elektra-kdb @@ -182,6 +182,9 @@ %changelog +* Tue Mar 10 2009 kwizart < kwizart at gmail.com > - 0.1.9-3 +- Fix wrong %%post requires + * Mon Mar 9 2009 kwizart < kwizart at gmail.com > - 0.1.9-2 - Remove unused patch - Merge -doc in -devel From jfch2222 at fedoraproject.org Tue Mar 10 13:39:34 2009 From: jfch2222 at fedoraproject.org (Jan F. Chadima) Date: Tue, 10 Mar 2009 13:39:34 +0000 (UTC) Subject: rpms/openssh/devel openssh-5.2p1-fips.patch, 1.1, 1.2 openssh-5.2p1-nss-keys.patch, 1.1, 1.2 openssh-5.2p1-redhat.patch, 1.1, 1.2 openssh-5.2p1-selinux.patch, 1.1, 1.2 openssh-5.2p1-vendor.patch, 1.1, 1.2 Message-ID: <20090310133934.92FC57002E@cvs1.fedora.phx.redhat.com> Author: jfch2222 Update of /cvs/pkgs/rpms/openssh/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6105 Modified Files: openssh-5.2p1-fips.patch openssh-5.2p1-nss-keys.patch openssh-5.2p1-redhat.patch openssh-5.2p1-selinux.patch openssh-5.2p1-vendor.patch Log Message: Upgrade to version 5.2p1 openssh-5.2p1-fips.patch: Index: openssh-5.2p1-fips.patch =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.2p1-fips.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openssh-5.2p1-fips.patch 10 Mar 2009 11:54:43 -0000 1.1 +++ openssh-5.2p1-fips.patch 10 Mar 2009 13:39:03 -0000 1.2 @@ -1,6 +1,43 @@ +diff -up openssh-5.2p1/ssh-agent.c.fips openssh-5.2p1/ssh-agent.c +--- openssh-5.2p1/ssh-agent.c.fips 2009-02-11 19:01:26.000000000 +0100 ++++ openssh-5.2p1/ssh-agent.c 2009-02-12 13:46:18.000000000 +0100 +@@ -51,6 +51,8 @@ + + #include + #include ++#include ++#include + #include "openbsd-compat/openssl-compat.h" + + #include +@@ -200,9 +202,9 @@ confirm_key(Identity *id) + char *p; + int ret = -1; + +- p = key_fingerprint(id->key, SSH_FP_MD5, SSH_FP_HEX); +- if (ask_permission("Allow use of key %s?\nKey fingerprint %s.", +- id->comment, p)) ++ p = key_fingerprint(id->key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); ++ if (ask_permission("Allow use of key %s?\nKey %sfingerprint %s.", ++ id->comment, FIPS_mode() ? "SHA1 " : "", p)) + ret = 0; + xfree(p); + +@@ -1196,6 +1198,11 @@ main(int ac, char **av) + #endif + + SSLeay_add_all_algorithms(); ++ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { ++ fprintf(stderr, ++ "FIPS integrity verification test failed.\n"); ++ exit(3); ++ } + + __progname = ssh_get_progname(av[0]); + init_rng(); diff -up openssh-5.2p1/auth2-pubkey.c.fips openssh-5.2p1/auth2-pubkey.c ---- openssh-5.2p1/auth2-pubkey.c.fips 2009-03-10 03:51:55.047234449 +0100 -+++ openssh-5.2p1/auth2-pubkey.c 2009-03-10 03:51:56.174214480 +0100 +--- openssh-5.2p1/auth2-pubkey.c.fips 2009-02-11 19:01:25.000000000 +0100 ++++ openssh-5.2p1/auth2-pubkey.c 2009-02-11 19:01:26.000000000 +0100 @@ -33,6 +33,7 @@ #include #include @@ -18,70 +55,179 @@ verbose("Found matching %s key: %s", key_type(found), fp); xfree(fp); -diff -up openssh-5.2p1/cipher.c.fips openssh-5.2p1/cipher.c ---- openssh-5.2p1/cipher.c.fips 2009-03-09 09:47:30.000000000 +0100 -+++ openssh-5.2p1/cipher.c 2009-03-10 03:51:56.297398184 +0100 -@@ -40,6 +40,7 @@ - #include +diff -up openssh-5.2p1/ssh.c.fips openssh-5.2p1/ssh.c +--- openssh-5.2p1/ssh.c.fips 2009-02-11 19:01:26.000000000 +0100 ++++ openssh-5.2p1/ssh.c 2009-02-12 13:48:43.000000000 +0100 +@@ -71,6 +71,8 @@ - #include + #include + #include +#include ++#include + #include "openbsd-compat/openssl-compat.h" + #include "openbsd-compat/sys-queue.h" - #include - #include -@@ -93,6 +94,22 @@ struct Cipher { - { NULL, SSH_CIPHER_INVALID, 0, 0, 0, 0, NULL } - }; +@@ -220,6 +222,10 @@ main(int ac, char **av) + sanitise_stdfd(); -+struct Cipher fips_ciphers[] = { -+ { "none", SSH_CIPHER_NONE, 8, 0, 0, 0, EVP_enc_null }, -+ { "3des", SSH_CIPHER_3DES, 8, 16, 0, 1, evp_ssh1_3des }, + __progname = ssh_get_progname(av[0]); ++ SSLeay_add_all_algorithms(); ++ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { ++ fatal("FIPS integrity verification test failed."); ++ } + init_rng(); + + /* +@@ -562,7 +568,6 @@ main(int ac, char **av) + if (!host) + usage(); + +- SSLeay_add_all_algorithms(); + ERR_load_crypto_strings(); + + /* Initialize the command to execute on remote host. */ +diff -up openssh-5.2p1/sshconnect2.c.fips openssh-5.2p1/sshconnect2.c +--- openssh-5.2p1/sshconnect2.c.fips 2009-02-11 19:01:26.000000000 +0100 ++++ openssh-5.2p1/sshconnect2.c 2009-02-11 19:01:26.000000000 +0100 +@@ -43,6 +43,8 @@ + #include + #endif + ++#include + -+ { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, 1, EVP_des_ede3_cbc }, -+ { "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, 0, 1, EVP_aes_128_cbc }, -+ { "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, 0, 1, EVP_aes_192_cbc }, -+ { "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc }, -+ { "rijndael-cbc at lysator.liu.se", -+ SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc }, -+ { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, 0, 0, evp_aes_128_ctr }, -+ { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, 0, 0, evp_aes_128_ctr }, -+ { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, 0, 0, evp_aes_128_ctr }, -+ { NULL, SSH_CIPHER_INVALID, 0, 0, 0, 0, NULL } -+}; + #include "openbsd-compat/sys-queue.h" + + #include "xmalloc.h" +@@ -113,6 +115,10 @@ ssh_kex2(char *host, struct sockaddr *ho + if (options.ciphers != NULL) { + myproposal[PROPOSAL_ENC_ALGS_CTOS] = + myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; ++ } else if (FIPS_mode()) { ++ myproposal[PROPOSAL_ENC_ALGS_CTOS] = ++ myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_ENCRYPT; + - /*--*/ + } + myproposal[PROPOSAL_ENC_ALGS_CTOS] = + compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); +@@ -128,7 +134,11 @@ ssh_kex2(char *host, struct sockaddr *ho + if (options.macs != NULL) { + myproposal[PROPOSAL_MAC_ALGS_CTOS] = + myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; ++ } else if (FIPS_mode()) { ++ myproposal[PROPOSAL_MAC_ALGS_CTOS] = ++ myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_MAC; + } ++ + if (options.hostkeyalgorithms != NULL) + myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = + options.hostkeyalgorithms; +@@ -478,8 +488,8 @@ input_userauth_pk_ok(int type, u_int32_t + key->type, pktype); + goto done; + } +- fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); +- debug2("input_userauth_pk_ok: fp %s", fp); ++ fp = key_fingerprint(key, SSH_FP_SHA1, SSH_FP_HEX); ++ debug2("input_userauth_pk_ok: SHA1 fp %s", fp); + xfree(fp); - u_int -@@ -135,7 +152,7 @@ Cipher * - cipher_by_name(const char *name) - { - Cipher *c; -- for (c = ciphers; c->name != NULL; c++) -+ for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++) - if (strcmp(c->name, name) == 0) - return c; - return NULL; -@@ -145,7 +162,7 @@ Cipher * - cipher_by_number(int id) - { - Cipher *c; -- for (c = ciphers; c->name != NULL; c++) -+ for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++) - if (c->number == id) - return c; - return NULL; -@@ -189,7 +206,7 @@ cipher_number(const char *name) - Cipher *c; - if (name == NULL) - return -1; -- for (c = ciphers; c->name != NULL; c++) -+ for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++) - if (strcasecmp(c->name, name) == 0) - return c->number; - return -1; + /* +diff -up openssh-5.2p1/Makefile.in.fips openssh-5.2p1/Makefile.in +--- openssh-5.2p1/Makefile.in.fips 2009-02-11 19:01:26.000000000 +0100 ++++ openssh-5.2p1/Makefile.in 2009-02-12 14:06:25.000000000 +0100 +@@ -134,28 +134,28 @@ libssh.a: $(LIBSSH_OBJS) + $(RANLIB) $@ + + ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) +- $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) ++ $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) + + sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) +- $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) ++ $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) -lfipscheck $(LIBS) + + scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o + $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + + ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o +- $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) ++ $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) + + ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o +- $(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) ++ $(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) + + ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o +- $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) ++ $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) + + ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o +- $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) ++ $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) + + ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o +- $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) ++ $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lfipscheck $(LIBS) + + sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o + $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) +diff -up openssh-5.2p1/sshd.c.fips openssh-5.2p1/sshd.c +--- openssh-5.2p1/sshd.c.fips 2009-02-11 19:01:25.000000000 +0100 ++++ openssh-5.2p1/sshd.c 2009-02-12 13:51:51.000000000 +0100 +@@ -76,6 +76,8 @@ + #include + #include + #include ++#include ++#include + #include "openbsd-compat/openssl-compat.h" + + #ifdef HAVE_SECUREWARE +@@ -1261,6 +1263,12 @@ main(int ac, char **av) + (void)set_auth_parameters(ac, av); + #endif + __progname = ssh_get_progname(av[0]); ++ ++ SSLeay_add_all_algorithms(); ++ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { ++ fatal("FIPS integrity verification test failed."); ++ } ++ + init_rng(); + + /* Save argv. Duplicate so setproctitle emulation doesn't clobber it */ +@@ -1413,8 +1421,6 @@ main(int ac, char **av) + else + closefrom(REEXEC_DEVCRYPTO_RESERVED_FD); + +- SSLeay_add_all_algorithms(); +- + /* + * Force logging to stderr until we have loaded the private host + * key (unless started from inetd) +@@ -2183,6 +2189,9 @@ do_ssh2_kex(void) + if (options.ciphers != NULL) { + myproposal[PROPOSAL_ENC_ALGS_CTOS] = + myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; ++ } else if (FIPS_mode()) { ++ myproposal[PROPOSAL_ENC_ALGS_CTOS] = ++ myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_ENCRYPT; + } + myproposal[PROPOSAL_ENC_ALGS_CTOS] = + compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); +@@ -2192,6 +2201,9 @@ do_ssh2_kex(void) + if (options.macs != NULL) { + myproposal[PROPOSAL_MAC_ALGS_CTOS] = + myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; ++ } else if (FIPS_mode()) { ++ myproposal[PROPOSAL_MAC_ALGS_CTOS] = ++ myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_MAC; + } + if (options.compression == COMP_NONE) { + myproposal[PROPOSAL_COMP_ALGS_CTOS] = diff -up openssh-5.2p1/mac.c.fips openssh-5.2p1/mac.c --- openssh-5.2p1/mac.c.fips 2008-06-13 02:58:50.000000000 +0200 -+++ openssh-5.2p1/mac.c 2009-03-10 03:51:56.227222184 +0100 ++++ openssh-5.2p1/mac.c 2009-02-11 19:01:26.000000000 +0100 @@ -28,6 +28,7 @@ #include @@ -131,64 +277,63 @@ for (i = 0; macs[i].name; i++) { if (strcmp(name, macs[i].name) == 0) { -diff -up openssh-5.2p1/Makefile.in.fips openssh-5.2p1/Makefile.in ---- openssh-5.2p1/Makefile.in.fips 2009-03-10 03:51:55.910250677 +0100 -+++ openssh-5.2p1/Makefile.in 2009-03-10 03:51:56.222702935 +0100 -@@ -134,28 +134,28 @@ libssh.a: $(LIBSSH_OBJS) - $(RANLIB) $@ - - ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) -- $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -+ $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) - - sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) -- $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) -+ $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) -lfipscheck $(LIBS) - - scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o - $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) +diff -up openssh-5.2p1/ssh-keygen.c.fips openssh-5.2p1/ssh-keygen.c +--- openssh-5.2p1/ssh-keygen.c.fips 2009-02-11 19:01:26.000000000 +0100 ++++ openssh-5.2p1/ssh-keygen.c 2009-02-12 13:46:00.000000000 +0100 +@@ -21,6 +21,8 @@ - ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o -- $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -+ $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) + #include + #include ++#include ++#include + #include "openbsd-compat/openssl-compat.h" - ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o -- $(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -+ $(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) + #include +@@ -537,7 +539,7 @@ do_fingerprint(struct passwd *pw) + enum fp_type fptype; + struct stat st; - ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o -- $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -+ $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) +- fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5; ++ fptype = print_bubblebabble ? SSH_FP_SHA1 : FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5; + rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX; - ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o -- $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -+ $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) + if (!have_identity) +@@ -1125,6 +1127,12 @@ main(int argc, char **argv) + __progname = ssh_get_progname(argv[0]); - ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o -- $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) -+ $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lfipscheck $(LIBS) + SSLeay_add_all_algorithms(); ++ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { ++ fprintf(stderr, ++ "FIPS integrity verification test failed.\n"); ++ exit(3); ++ } ++ + log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); - sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o - $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -diff -up openssh-5.2p1/myproposal.h.fips openssh-5.2p1/myproposal.h ---- openssh-5.2p1/myproposal.h.fips 2009-01-28 06:33:31.000000000 +0100 -+++ openssh-5.2p1/myproposal.h 2009-03-10 03:51:56.257243733 +0100 -@@ -53,7 +53,11 @@ - "hmac-sha1-96,hmac-md5-96" - #define KEX_DEFAULT_COMP "none,zlib at openssh.com,zlib" - #define KEX_DEFAULT_LANG "" -- -+#define KEX_FIPS_ENCRYPT \ -+ "aes128-cbc,3des-cbc," \ -+ "aes192-cbc,aes256-cbc,rijndael-cbc at lysator.liu.se" -+#define KEX_FIPS_MAC \ -+ "hmac-sha1" + init_rng(); +@@ -1506,14 +1514,15 @@ passphrase_again: + fclose(f); - static char *myproposal[PROPOSAL_MAX] = { - KEX_DEFAULT_KEX, + if (!quiet) { +- char *fp = key_fingerprint(public, SSH_FP_MD5, SSH_FP_HEX); +- char *ra = key_fingerprint(public, SSH_FP_MD5, ++ int fips_on = FIPS_mode(); ++ char *fp = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); ++ char *ra = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, + SSH_FP_RANDOMART); + printf("Your public key has been saved in %s.\n", + identity_file); +- printf("The key fingerprint is:\n"); ++ printf("The key %sfingerprint is:\n", fips_on ? "SHA1 " : ""); + printf("%s %s\n", fp, comment); +- printf("The key's randomart image is:\n"); ++ printf("The key's %srandomart image is:\n", fips_on ? "SHA1 " :""); + printf("%s\n", ra); + xfree(ra); + xfree(fp); diff -up openssh-5.2p1/nsskeys.c.fips openssh-5.2p1/nsskeys.c ---- openssh-5.2p1/nsskeys.c.fips 2009-03-10 03:51:55.871242620 +0100 -+++ openssh-5.2p1/nsskeys.c 2009-03-10 03:51:56.251363837 +0100 +--- openssh-5.2p1/nsskeys.c.fips 2009-02-11 19:01:26.000000000 +0100 ++++ openssh-5.2p1/nsskeys.c 2009-02-11 19:01:26.000000000 +0100 @@ -183,8 +183,8 @@ nss_convert_pubkey(Key *k) break; } @@ -200,9 +345,49 @@ xfree(p); return 0; +diff -up openssh-5.2p1/ssh-add.c.fips openssh-5.2p1/ssh-add.c +--- openssh-5.2p1/ssh-add.c.fips 2009-02-11 19:01:26.000000000 +0100 ++++ openssh-5.2p1/ssh-add.c 2009-02-12 13:46:31.000000000 +0100 +@@ -42,6 +42,8 @@ + #include + + #include ++#include ++#include + #include "openbsd-compat/openssl-compat.h" + + #ifdef HAVE_LIBNSS +@@ -254,7 +256,7 @@ list_identities(AuthenticationConnection + key = ssh_get_next_identity(ac, &comment, version)) { + had_identities = 1; + if (do_fp) { +- fp = key_fingerprint(key, SSH_FP_MD5, ++ fp = key_fingerprint(key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, + SSH_FP_HEX); + printf("%d %s %s (%s)\n", + key_size(key), fp, comment, key_type(key)); +@@ -463,11 +465,16 @@ main(int argc, char **argv) + sanitise_stdfd(); + + __progname = ssh_get_progname(argv[0]); ++ SSLeay_add_all_algorithms(); ++ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { ++ fprintf(stderr, ++ "FIPS integrity verification test failed.\n"); ++ exit(3); ++ } ++ + init_rng(); + seed_rng(); + +- SSLeay_add_all_algorithms(); +- + /* At first, get a connection to the authentication agent. */ + ac = ssh_get_authentication_connection(); + if (ac == NULL) { diff -up openssh-5.2p1/openbsd-compat/bsd-arc4random.c.fips openssh-5.2p1/openbsd-compat/bsd-arc4random.c --- openssh-5.2p1/openbsd-compat/bsd-arc4random.c.fips 2008-06-04 02:54:00.000000000 +0200 -+++ openssh-5.2p1/openbsd-compat/bsd-arc4random.c 2009-03-10 03:51:56.255331659 +0100 ++++ openssh-5.2p1/openbsd-compat/bsd-arc4random.c 2009-02-11 19:01:26.000000000 +0100 @@ -39,6 +39,7 @@ static int rc4_ready = 0; static RC4_KEY rc4; @@ -244,163 +429,144 @@ #endif /* !HAVE_ARC4RANDOM */ #ifndef ARC4RANDOM_BUF -diff -up openssh-5.2p1/ssh-add.c.fips openssh-5.2p1/ssh-add.c ---- openssh-5.2p1/ssh-add.c.fips 2009-03-10 03:51:55.928225121 +0100 -+++ openssh-5.2p1/ssh-add.c 2009-03-10 03:51:56.254252403 +0100 -@@ -42,6 +42,8 @@ - #include +diff -up openssh-5.2p1/myproposal.h.fips openssh-5.2p1/myproposal.h +--- openssh-5.2p1/myproposal.h.fips 2007-06-11 06:01:42.000000000 +0200 ++++ openssh-5.2p1/myproposal.h 2009-02-11 19:01:26.000000000 +0100 +@@ -52,7 +52,11 @@ + "hmac-sha1-96,hmac-md5-96" + #define KEX_DEFAULT_COMP "none,zlib at openssh.com,zlib" + #define KEX_DEFAULT_LANG "" +- ++#define KEX_FIPS_ENCRYPT \ ++ "aes128-cbc,3des-cbc," \ ++ "aes192-cbc,aes256-cbc,rijndael-cbc at lysator.liu.se" ++#define KEX_FIPS_MAC \ ++ "hmac-sha1" + static char *myproposal[PROPOSAL_MAX] = { + KEX_DEFAULT_KEX, +diff -up openssh-5.2p1/ssh-keysign.c.fips openssh-5.2p1/ssh-keysign.c +--- openssh-5.2p1/ssh-keysign.c.fips 2006-09-01 07:38:37.000000000 +0200 ++++ openssh-5.2p1/ssh-keysign.c 2009-02-12 13:44:41.000000000 +0100 +@@ -38,6 +38,8 @@ #include + #include + #include +#include +#include - #include "openbsd-compat/openssl-compat.h" - #ifdef HAVE_LIBNSS -@@ -254,7 +256,7 @@ list_identities(AuthenticationConnection - key = ssh_get_next_identity(ac, &comment, version)) { - had_identities = 1; - if (do_fp) { -- fp = key_fingerprint(key, SSH_FP_MD5, -+ fp = key_fingerprint(key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, - SSH_FP_HEX); - printf("%d %s %s (%s)\n", - key_size(key), fp, comment, key_type(key)); -@@ -463,11 +465,16 @@ main(int argc, char **argv) - sanitise_stdfd(); + #include "xmalloc.h" + #include "log.h" +@@ -175,6 +177,11 @@ main(int argc, char **argv) - __progname = ssh_get_progname(argv[0]); -+ SSLeay_add_all_algorithms(); -+ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { -+ fprintf(stderr, -+ "FIPS integrity verification test failed.\n"); -+ exit(3); -+ } + permanently_set_uid(pw); + ++ SSLeay_add_all_algorithms(); ++ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { ++ fatal("FIPS integrity verification test failed"); ++ } + init_rng(); seed_rng(); + arc4random_stir(); +@@ -194,7 +201,6 @@ main(int argc, char **argv) + if (key_fd[0] == -1 && key_fd[1] == -1) + fatal("could not open any host key"); - SSLeay_add_all_algorithms(); -- - /* At first, get a connection to the authentication agent. */ - ac = ssh_get_authentication_connection(); - if (ac == NULL) { -diff -up openssh-5.2p1/ssh-agent.c.fips openssh-5.2p1/ssh-agent.c ---- openssh-5.2p1/ssh-agent.c.fips 2009-03-10 03:51:55.846341085 +0100 -+++ openssh-5.2p1/ssh-agent.c 2009-03-10 03:51:56.171221623 +0100 -@@ -51,6 +51,8 @@ + for (i = 0; i < 256; i++) + rnd[i] = arc4random(); + RAND_seed(rnd, sizeof(rnd)); +diff -up openssh-5.2p1/cipher.c.fips openssh-5.2p1/cipher.c +--- openssh-5.2p1/cipher.c.fips 2008-07-23 14:03:19.000000000 +0200 ++++ openssh-5.2p1/cipher.c 2009-02-11 19:01:26.000000000 +0100 +@@ -40,6 +40,7 @@ + #include + + #include ++#include + + #include + #include +@@ -91,6 +92,22 @@ struct Cipher { + { NULL, SSH_CIPHER_INVALID, 0, 0, 0, 0, NULL } + }; + ++struct Cipher fips_ciphers[] = { ++ { "none", SSH_CIPHER_NONE, 8, 0, 0, 0, EVP_enc_null }, ++ { "3des", SSH_CIPHER_3DES, 8, 16, 0, 1, evp_ssh1_3des }, ++ ++ { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, 1, EVP_des_ede3_cbc }, ++ { "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, 0, 1, EVP_aes_128_cbc }, ++ { "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, 0, 1, EVP_aes_192_cbc }, ++ { "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc }, ++ { "rijndael-cbc at lysator.liu.se", ++ SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc }, ++ { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, 0, 0, evp_aes_128_ctr }, ++ { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, 0, 0, evp_aes_128_ctr }, ++ { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, 0, 0, evp_aes_128_ctr }, ++ { NULL, SSH_CIPHER_INVALID, 0, 0, 0, 0, NULL } ++}; ++ + /*--*/ + + u_int +@@ -133,7 +150,7 @@ Cipher * + cipher_by_name(const char *name) + { + Cipher *c; +- for (c = ciphers; c->name != NULL; c++) ++ for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++) + if (strcmp(c->name, name) == 0) + return c; + return NULL; +@@ -143,7 +160,7 @@ Cipher * + cipher_by_number(int id) + { + Cipher *c; +- for (c = ciphers; c->name != NULL; c++) ++ for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++) + if (c->number == id) + return c; + return NULL; +@@ -187,7 +204,7 @@ cipher_number(const char *name) + Cipher *c; + if (name == NULL) + return -1; +- for (c = ciphers; c->name != NULL; c++) ++ for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++) + if (strcasecmp(c->name, name) == 0) + return c->number; + return -1; +diff -up openssh-5.2p1/ssh-keyscan.c.fips openssh-5.2p1/ssh-keyscan.c +--- openssh-5.2p1/ssh-keyscan.c.fips 2008-07-04 15:10:49.000000000 +0200 ++++ openssh-5.2p1/ssh-keyscan.c 2009-02-12 13:44:21.000000000 +0100 +@@ -19,6 +19,8 @@ + #include - #include - #include + #include +#include +#include - #include "openbsd-compat/openssl-compat.h" + #include #include -@@ -200,9 +202,9 @@ confirm_key(Identity *id) - char *p; - int ret = -1; - -- p = key_fingerprint(id->key, SSH_FP_MD5, SSH_FP_HEX); -- if (ask_permission("Allow use of key %s?\nKey fingerprint %s.", -- id->comment, p)) -+ p = key_fingerprint(id->key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); -+ if (ask_permission("Allow use of key %s?\nKey %sfingerprint %s.", -+ id->comment, FIPS_mode() ? "SHA1 " : "", p)) - ret = 0; - xfree(p); - -@@ -1196,6 +1198,11 @@ main(int ac, char **av) - #endif +@@ -730,6 +732,13 @@ main(int argc, char **argv) + extern char *optarg; - SSLeay_add_all_algorithms(); + __progname = ssh_get_progname(argv[0]); ++ SSLeay_add_all_algorithms(); + if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { + fprintf(stderr, + "FIPS integrity verification test failed.\n"); + exit(3); + } - - __progname = ssh_get_progname(av[0]); - init_rng(); -diff -up openssh-5.2p1/ssh.c.fips openssh-5.2p1/ssh.c ---- openssh-5.2p1/ssh.c.fips 2009-03-10 03:51:55.906266464 +0100 -+++ openssh-5.2p1/ssh.c 2009-03-10 03:51:56.176206362 +0100 -@@ -71,6 +71,8 @@ - - #include - #include -+#include -+#include - #include "openbsd-compat/openssl-compat.h" - #include "openbsd-compat/sys-queue.h" - -@@ -220,6 +222,10 @@ main(int ac, char **av) - sanitise_stdfd(); - - __progname = ssh_get_progname(av[0]); -+ SSLeay_add_all_algorithms(); -+ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { -+ fatal("FIPS integrity verification test failed."); -+ } - init_rng(); - - /* -@@ -550,7 +556,6 @@ main(int ac, char **av) - if (!host) - usage(); - -- SSLeay_add_all_algorithms(); - ERR_load_crypto_strings(); - - /* Initialize the command to execute on remote host. */ -diff -up openssh-5.2p1/sshconnect2.c.fips openssh-5.2p1/sshconnect2.c ---- openssh-5.2p1/sshconnect2.c.fips 2009-03-10 03:51:56.079247745 +0100 -+++ openssh-5.2p1/sshconnect2.c 2009-03-10 03:51:56.197416110 +0100 -@@ -44,6 +44,8 @@ - #include - #endif - -+#include -+ - #include "openbsd-compat/sys-queue.h" - - #include "xmalloc.h" -@@ -115,6 +117,10 @@ ssh_kex2(char *host, struct sockaddr *ho - if (options.ciphers != NULL) { - myproposal[PROPOSAL_ENC_ALGS_CTOS] = - myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; -+ } else if (FIPS_mode()) { -+ myproposal[PROPOSAL_ENC_ALGS_CTOS] = -+ myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_ENCRYPT; -+ - } - myproposal[PROPOSAL_ENC_ALGS_CTOS] = - compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); -@@ -130,7 +136,11 @@ ssh_kex2(char *host, struct sockaddr *ho - if (options.macs != NULL) { - myproposal[PROPOSAL_MAC_ALGS_CTOS] = - myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; -+ } else if (FIPS_mode()) { -+ myproposal[PROPOSAL_MAC_ALGS_CTOS] = -+ myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_MAC; - } + - if (options.hostkeyalgorithms != NULL) - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = - options.hostkeyalgorithms; -@@ -507,8 +517,8 @@ input_userauth_pk_ok(int type, u_int32_t - key->type, pktype); - goto done; - } -- fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); -- debug2("input_userauth_pk_ok: fp %s", fp); -+ fp = key_fingerprint(key, SSH_FP_SHA1, SSH_FP_HEX); -+ debug2("input_userauth_pk_ok: SHA1 fp %s", fp); - xfree(fp); - - /* + init_rng(); + seed_rng(); + TAILQ_INIT(&tq); diff -up openssh-5.2p1/sshconnect.c.fips openssh-5.2p1/sshconnect.c ---- openssh-5.2p1/sshconnect.c.fips 2009-03-10 03:51:56.085211598 +0100 -+++ openssh-5.2p1/sshconnect.c 2009-03-10 03:51:56.315348971 +0100 +--- openssh-5.2p1/sshconnect.c.fips 2009-02-11 19:01:26.000000000 +0100 ++++ openssh-5.2p1/sshconnect.c 2009-02-11 19:01:26.000000000 +0100 @@ -40,6 +40,8 @@ #include #include @@ -410,7 +576,7 @@ #include "xmalloc.h" #include "key.h" #include "hostfile.h" -@@ -761,6 +763,7 @@ check_host_key(char *hostname, struct so +@@ -765,6 +767,7 @@ check_host_key(char *hostname, struct so goto fail; } else if (options.strict_host_key_checking == 2) { char msg1[1024], msg2[1024]; @@ -418,7 +584,7 @@ if (show_other_keys(host, host_key)) snprintf(msg1, sizeof(msg1), -@@ -769,8 +772,8 @@ check_host_key(char *hostname, struct so +@@ -773,8 +776,8 @@ check_host_key(char *hostname, struct so else snprintf(msg1, sizeof(msg1), "."); /* The default */ @@ -429,7 +595,7 @@ SSH_FP_RANDOMART); msg2[0] = '\0'; if (options.verify_host_key_dns) { -@@ -786,10 +789,10 @@ check_host_key(char *hostname, struct so +@@ -790,10 +793,10 @@ check_host_key(char *hostname, struct so snprintf(msg, sizeof(msg), "The authenticity of host '%.200s (%s)' can't be " "established%s\n" @@ -442,7 +608,7 @@ options.visual_host_key ? "\n" : "", options.visual_host_key ? ra : "", msg2); -@@ -1077,17 +1080,18 @@ show_key_from_file(const char *file, con +@@ -1081,17 +1084,18 @@ show_key_from_file(const char *file, con Key *found; char *fp, *ra; int line, ret; @@ -465,7 +631,7 @@ xfree(ra); xfree(fp); } -@@ -1133,8 +1137,9 @@ warn_changed_key(Key *host_key) +@@ -1137,8 +1141,9 @@ warn_changed_key(Key *host_key) { char *fp; const char *type = key_type(host_key); @@ -476,7 +642,7 @@ error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); error("@ WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED! @"); -@@ -1142,8 +1147,8 @@ warn_changed_key(Key *host_key) +@@ -1146,8 +1151,8 @@ warn_changed_key(Key *host_key) error("IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"); error("Someone could be eavesdropping on you right now (man-in-the-middle attack)!"); error("It is also possible that the %s host key has just been changed.", type); @@ -487,169 +653,3 @@ error("Please contact your system administrator."); xfree(fp); -diff -up openssh-5.2p1/sshd.c.fips openssh-5.2p1/sshd.c ---- openssh-5.2p1/sshd.c.fips 2009-03-10 03:51:55.512212775 +0100 -+++ openssh-5.2p1/sshd.c 2009-03-10 03:51:56.224238563 +0100 -@@ -76,6 +76,8 @@ - #include - #include - #include -+#include -+#include - #include "openbsd-compat/openssl-compat.h" - - #ifdef HAVE_SECUREWARE -@@ -1260,6 +1262,12 @@ main(int ac, char **av) - (void)set_auth_parameters(ac, av); - #endif - __progname = ssh_get_progname(av[0]); -+ -+ SSLeay_add_all_algorithms(); -+ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { -+ fatal("FIPS integrity verification test failed."); -+ } -+ - init_rng(); - - /* Save argv. Duplicate so setproctitle emulation doesn't clobber it */ -@@ -1412,8 +1420,6 @@ main(int ac, char **av) - else - closefrom(REEXEC_DEVCRYPTO_RESERVED_FD); - -- SSLeay_add_all_algorithms(); -- - /* - * Force logging to stderr until we have loaded the private host - * key (unless started from inetd) -@@ -2182,6 +2188,9 @@ do_ssh2_kex(void) - if (options.ciphers != NULL) { - myproposal[PROPOSAL_ENC_ALGS_CTOS] = - myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; -+ } else if (FIPS_mode()) { -+ myproposal[PROPOSAL_ENC_ALGS_CTOS] = -+ myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_ENCRYPT; - } - myproposal[PROPOSAL_ENC_ALGS_CTOS] = - compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); -@@ -2191,6 +2200,9 @@ do_ssh2_kex(void) - if (options.macs != NULL) { - myproposal[PROPOSAL_MAC_ALGS_CTOS] = - myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; -+ } else if (FIPS_mode()) { -+ myproposal[PROPOSAL_MAC_ALGS_CTOS] = -+ myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_MAC; - } - if (options.compression == COMP_NONE) { - myproposal[PROPOSAL_COMP_ALGS_CTOS] = -diff -up openssh-5.2p1/ssh-keygen.c.fips openssh-5.2p1/ssh-keygen.c ---- openssh-5.2p1/ssh-keygen.c.fips 2009-03-10 03:51:55.948283636 +0100 -+++ openssh-5.2p1/ssh-keygen.c 2009-03-10 03:51:56.249239228 +0100 -@@ -21,6 +21,8 @@ - - #include - #include -+#include -+#include - #include "openbsd-compat/openssl-compat.h" - - #include -@@ -537,7 +539,7 @@ do_fingerprint(struct passwd *pw) - enum fp_type fptype; - struct stat st; - -- fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5; -+ fptype = print_bubblebabble ? SSH_FP_SHA1 : FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5; - rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX; - - if (!have_identity) -@@ -1125,6 +1127,12 @@ main(int argc, char **argv) - __progname = ssh_get_progname(argv[0]); - - SSLeay_add_all_algorithms(); -+ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { -+ fprintf(stderr, -+ "FIPS integrity verification test failed.\n"); -+ exit(3); -+ } -+ - log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); - - init_rng(); -@@ -1506,14 +1514,15 @@ passphrase_again: - fclose(f); - - if (!quiet) { -- char *fp = key_fingerprint(public, SSH_FP_MD5, SSH_FP_HEX); -- char *ra = key_fingerprint(public, SSH_FP_MD5, -+ int fips_on = FIPS_mode(); -+ char *fp = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); -+ char *ra = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, - SSH_FP_RANDOMART); - printf("Your public key has been saved in %s.\n", - identity_file); -- printf("The key fingerprint is:\n"); -+ printf("The key %sfingerprint is:\n", fips_on ? "SHA1 " : ""); - printf("%s %s\n", fp, comment); -- printf("The key's randomart image is:\n"); -+ printf("The key's %srandomart image is:\n", fips_on ? "SHA1 " :""); - printf("%s\n", ra); - xfree(ra); - xfree(fp); -diff -up openssh-5.2p1/ssh-keyscan.c.fips openssh-5.2p1/ssh-keyscan.c ---- openssh-5.2p1/ssh-keyscan.c.fips 2009-01-28 06:31:23.000000000 +0100 -+++ openssh-5.2p1/ssh-keyscan.c 2009-03-10 03:51:56.313291759 +0100 -@@ -19,6 +19,8 @@ - #include - - #include -+#include -+#include - - #include - #include -@@ -731,6 +733,13 @@ main(int argc, char **argv) - extern char *optarg; - - __progname = ssh_get_progname(argv[0]); -+ SSLeay_add_all_algorithms(); -+ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { -+ fprintf(stderr, -+ "FIPS integrity verification test failed.\n"); -+ exit(3); -+ } -+ - init_rng(); - seed_rng(); - TAILQ_INIT(&tq); -diff -up openssh-5.2p1/ssh-keysign.c.fips openssh-5.2p1/ssh-keysign.c ---- openssh-5.2p1/ssh-keysign.c.fips 2006-09-01 07:38:37.000000000 +0200 -+++ openssh-5.2p1/ssh-keysign.c 2009-03-10 03:51:56.295222876 +0100 -@@ -38,6 +38,8 @@ - #include - #include - #include -+#include -+#include - - #include "xmalloc.h" - #include "log.h" -@@ -175,6 +177,11 @@ main(int argc, char **argv) - - permanently_set_uid(pw); - -+ SSLeay_add_all_algorithms(); -+ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { -+ fatal("FIPS integrity verification test failed"); -+ } -+ - init_rng(); - seed_rng(); - arc4random_stir(); -@@ -194,7 +201,6 @@ main(int argc, char **argv) - if (key_fd[0] == -1 && key_fd[1] == -1) - fatal("could not open any host key"); - -- SSLeay_add_all_algorithms(); - for (i = 0; i < 256; i++) - rnd[i] = arc4random(); - RAND_seed(rnd, sizeof(rnd)); openssh-5.2p1-nss-keys.patch: Index: openssh-5.2p1-nss-keys.patch =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.2p1-nss-keys.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openssh-5.2p1-nss-keys.patch 10 Mar 2009 11:54:43 -0000 1.1 +++ openssh-5.2p1-nss-keys.patch 10 Mar 2009 13:39:03 -0000 1.2 @@ -1,55 +1,289 @@ -diff -up openssh-5.2p1/authfd.c.nss-keys openssh-5.2p1/authfd.c ---- openssh-5.2p1/authfd.c.nss-keys 2006-09-01 07:38:36.000000000 +0200 -+++ openssh-5.2p1/authfd.c 2009-03-10 03:51:55.866208145 +0100 -@@ -626,6 +626,45 @@ ssh_update_card(AuthenticationConnection - return decode_reply(type); +diff -up openssh-5.2p1/key.c.nss-keys openssh-5.2p1/key.c +--- openssh-5.2p1/key.c.nss-keys 2008-07-11 09:35:09.000000000 +0200 ++++ openssh-5.2p1/key.c 2008-11-18 19:11:41.000000000 +0100 +@@ -96,6 +96,54 @@ key_new(int type) + return k; } -+int -+ssh_update_nss_key(AuthenticationConnection *auth, int add, -+ const char *tokenname, const char *keyname, -+ const char *pass, u_int life, u_int confirm) ++#ifdef HAVE_LIBNSS ++Key * ++key_new_nss(int type) +{ -+ Buffer msg; -+ int type, constrained = (life || confirm); ++ Key *k = key_new(type); + -+ if (add) { -+ type = constrained ? -+ SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED : -+ SSH_AGENTC_ADD_NSS_KEY; -+ } else -+ type = SSH_AGENTC_REMOVE_NSS_KEY; ++ k->nss = xcalloc(1, sizeof(*k->nss)); ++ k->flags = KEY_FLAG_EXT | KEY_FLAG_NSS; + -+ buffer_init(&msg); -+ buffer_put_char(&msg, type); -+ buffer_put_cstring(&msg, tokenname); -+ buffer_put_cstring(&msg, keyname); -+ buffer_put_cstring(&msg, pass); ++ return k; ++} + -+ if (constrained) { -+ if (life != 0) { -+ buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME); -+ buffer_put_int(&msg, life); ++Key * ++key_new_nss_copy(int type, const Key *c) ++{ ++ Key *k = key_new_nss(type); ++ ++ switch (k->type) { ++ case KEY_RSA: ++ if ((BN_copy(k->rsa->n, c->rsa->n) == NULL) || ++ (BN_copy(k->rsa->e, c->rsa->e) == NULL)) ++ fatal("key_new_nss_copy: BN_copy failed"); ++ break; ++ case KEY_DSA: ++ if ((BN_copy(k->dsa->p, c->rsa->p) == NULL) || ++ (BN_copy(k->dsa->q, c->dsa->q) == NULL) || ++ (BN_copy(k->dsa->g, c->dsa->g) == NULL) || ++ (BN_copy(k->dsa->pub_key, c->dsa->pub_key) == NULL)) ++ fatal("key_new_nss_copy: BN_copy failed"); ++ break; ++ } ++ ++ k->nss->privk = SECKEY_CopyPrivateKey(c->nss->privk); ++ if (k->nss->privk == NULL) ++ fatal("key_new_nss_copy: SECKEY_CopyPrivateKey failed"); ++ ++ k->nss->pubk = SECKEY_CopyPublicKey(c->nss->pubk); ++ if (k->nss->pubk == NULL) ++ fatal("key_new_nss_copy: SECKEY_CopyPublicKey failed"); ++ ++ if (c->nss->privk->wincx) ++ k->nss->privk->wincx = xstrdup(c->nss->privk->wincx); ++ ++ return k; ++} ++#endif ++ ++ + Key * + key_new_private(int type) + { +@@ -151,6 +199,19 @@ key_free(Key *k) + fatal("key_free: bad key type %d", k->type); + break; + } ++#ifdef HAVE_LIBNSS ++ if (k->flags & KEY_FLAG_NSS) { ++ if (k->nss->privk != NULL && k->nss->privk->wincx != NULL) { ++ memset(k->nss->privk->wincx, 0, ++ strlen(k->nss->privk->wincx)); ++ xfree(k->nss->privk->wincx); ++ k->nss->privk->wincx = NULL; + } -+ if (confirm != 0) -+ buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM); ++ SECKEY_DestroyPrivateKey(k->nss->privk); ++ SECKEY_DestroyPublicKey(k->nss->pubk); ++ xfree(k->nss); + } ++#endif + xfree(k); + } + +diff -up openssh-5.2p1/ssh-dss.c.nss-keys openssh-5.2p1/ssh-dss.c +--- openssh-5.2p1/ssh-dss.c.nss-keys 2006-11-07 13:14:42.000000000 +0100 ++++ openssh-5.2p1/ssh-dss.c 2008-11-18 19:11:41.000000000 +0100 +@@ -39,6 +39,10 @@ + #include "log.h" + #include "key.h" + ++#ifdef HAVE_LIBNSS ++#include ++#endif + -+ if (ssh_request_reply(auth, &msg, &msg) == 0) { -+ buffer_free(&msg); -+ return 0; + #define INTBLOB_LEN 20 + #define SIGBLOB_LEN (2*INTBLOB_LEN) + +@@ -57,6 +61,34 @@ ssh_dss_sign(const Key *key, u_char **si + error("ssh_dss_sign: no DSA key"); + return -1; + } ++#ifdef HAVE_LIBNSS ++ if (key->flags & KEY_FLAG_NSS) { ++ SECItem sigitem; ++ SECItem *rawsig; ++ ++ memset(&sigitem, 0, sizeof(sigitem)); ++ if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk, ++ SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST) != SECSuccess) { ++ error("ssh_dss_sign: sign failed"); ++ return -1; ++ } ++ ++ if ((rawsig=DSAU_DecodeDerSig(&sigitem)) == NULL) { ++ error("ssh_dss_sign: der decode failed"); ++ SECITEM_ZfreeItem(&sigitem, PR_FALSE); ++ return -1; ++ } ++ SECITEM_ZfreeItem(&sigitem, PR_FALSE); ++ if (rawsig->len != SIGBLOB_LEN) { ++ error("ssh_dss_sign: unsupported signature length %d", ++ rawsig->len); ++ SECITEM_ZfreeItem(rawsig, PR_TRUE); ++ return -1; ++ } ++ memcpy(sigblob, rawsig->data, SIGBLOB_LEN); ++ SECITEM_ZfreeItem(rawsig, PR_TRUE); ++ } else { ++#endif + EVP_DigestInit(&md, evp_md); + EVP_DigestUpdate(&md, data, datalen); + EVP_DigestFinal(&md, digest, &dlen); +@@ -80,7 +112,9 @@ ssh_dss_sign(const Key *key, u_char **si + BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen); + BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen); + DSA_SIG_free(sig); +- ++#ifdef HAVE_LIBNSS + } -+ type = buffer_get_char(&msg); -+ buffer_free(&msg); -+ return decode_reply(type); ++#endif + if (datafellows & SSH_BUG_SIGBLOB) { + if (lenp != NULL) + *lenp = SIGBLOB_LEN; +diff -up openssh-5.2p1/ssh-agent.c.nss-keys openssh-5.2p1/ssh-agent.c +--- openssh-5.2p1/ssh-agent.c.nss-keys 2008-07-04 15:10:49.000000000 +0200 ++++ openssh-5.2p1/ssh-agent.c 2008-11-18 19:11:41.000000000 +0100 +@@ -80,6 +80,10 @@ + #include "scard.h" + #endif + ++#ifdef HAVE_LIBNSS ++#include "nsskeys.h" ++#endif ++ + #if defined(HAVE_SYS_PRCTL_H) + #include /* For prctl() and PR_SET_DUMPABLE */ + #endif +@@ -714,6 +718,114 @@ send: + } + #endif /* SMARTCARD */ + ++#ifdef HAVE_LIBNSS ++static void ++process_add_nss_key (SocketEntry *e) ++{ ++ char *tokenname = NULL, *keyname = NULL, *password = NULL; ++ int i, version, success = 0, death = 0, confirm = 0; ++ Key **keys, *k; ++ Identity *id; ++ Idtab *tab; ++ ++ tokenname = buffer_get_string(&e->request, NULL); ++ keyname = buffer_get_string(&e->request, NULL); ++ password = buffer_get_string(&e->request, NULL); ++ ++ while (buffer_len(&e->request)) { ++ switch (buffer_get_char(&e->request)) { ++ case SSH_AGENT_CONSTRAIN_LIFETIME: ++ death = time(NULL) + buffer_get_int(&e->request); ++ break; ++ case SSH_AGENT_CONSTRAIN_CONFIRM: ++ confirm = 1; ++ break; ++ default: ++ break; ++ } ++ } ++ if (lifetime && !death) ++ death = time(NULL) + lifetime; ++ ++ keys = nss_get_keys(tokenname, keyname, password); ++ /* password is owned by keys[0] now */ ++ xfree(tokenname); ++ xfree(keyname); ++ ++ if (keys == NULL) { ++ memset(password, 0, strlen(password)); ++ xfree(password); ++ error("nss_get_keys failed"); ++ goto send; ++ } ++ for (i = 0; keys[i] != NULL; i++) { ++ k = keys[i]; ++ version = k->type == KEY_RSA1 ? 1 : 2; ++ tab = idtab_lookup(version); ++ if (lookup_identity(k, version) == NULL) { ++ id = xmalloc(sizeof(Identity)); ++ id->key = k; ++ id->comment = nss_get_key_label(k); ++ id->death = death; ++ id->confirm = confirm; ++ TAILQ_INSERT_TAIL(&tab->idlist, id, next); ++ tab->nentries++; ++ success = 1; ++ } else { ++ key_free(k); ++ } ++ keys[i] = NULL; ++ } ++ xfree(keys); ++send: ++ buffer_put_int(&e->output, 1); ++ buffer_put_char(&e->output, ++ success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE); +} + - /* - * Removes all identities from the agent. This call is not meant to be used - * by normal applications. ++static void ++process_remove_nss_key(SocketEntry *e) ++{ ++ char *tokenname = NULL, *keyname = NULL, *password = NULL; ++ int i, version, success = 0; ++ Key **keys, *k = NULL; ++ Identity *id; ++ Idtab *tab; ++ ++ tokenname = buffer_get_string(&e->request, NULL); ++ keyname = buffer_get_string(&e->request, NULL); ++ password = buffer_get_string(&e->request, NULL); ++ ++ keys = nss_get_keys(tokenname, keyname, password); ++ xfree(tokenname); ++ xfree(keyname); ++ xfree(password); ++ ++ if (keys == NULL || keys[0] == NULL) { ++ error("nss_get_keys failed"); ++ goto send; ++ } ++ for (i = 0; keys[i] != NULL; i++) { ++ k = keys[i]; ++ version = k->type == KEY_RSA1 ? 1 : 2; ++ if ((id = lookup_identity(k, version)) != NULL) { ++ tab = idtab_lookup(version); ++ TAILQ_REMOVE(&tab->idlist, id, next); ++ tab->nentries--; ++ free_identity(id); ++ success = 1; ++ } ++ key_free(k); ++ keys[i] = NULL; ++ } ++ xfree(keys); ++send: ++ buffer_put_int(&e->output, 1); ++ buffer_put_char(&e->output, ++ success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE); ++} ++#endif /* HAVE_LIBNSS */ ++ + /* dispatch incoming messages */ + + static void +@@ -806,6 +918,15 @@ process_message(SocketEntry *e) + process_remove_smartcard_key(e); + break; + #endif /* SMARTCARD */ ++#ifdef HAVE_LIBNSS ++ case SSH_AGENTC_ADD_NSS_KEY: ++ case SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED: ++ process_add_nss_key(e); ++ break; ++ case SSH_AGENTC_REMOVE_NSS_KEY: ++ process_remove_nss_key(e); ++ break; ++#endif /* SMARTCARD */ + default: + /* Unknown message. Respond with failure. */ + error("Unknown message %d", type); diff -up openssh-5.2p1/authfd.h.nss-keys openssh-5.2p1/authfd.h --- openssh-5.2p1/authfd.h.nss-keys 2006-08-05 04:39:39.000000000 +0200 -+++ openssh-5.2p1/authfd.h 2009-03-10 03:51:55.847449129 +0100 ++++ openssh-5.2p1/authfd.h 2008-11-18 19:11:41.000000000 +0100 @@ -49,6 +49,12 @@ #define SSH2_AGENTC_ADD_ID_CONSTRAINED 25 #define SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED 26 @@ -73,9 +307,9 @@ int ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16], diff -up openssh-5.2p1/configure.ac.nss-keys openssh-5.2p1/configure.ac ---- openssh-5.2p1/configure.ac.nss-keys 2009-03-10 03:51:55.285821039 +0100 -+++ openssh-5.2p1/configure.ac 2009-03-10 03:51:55.850215090 +0100 -@@ -3462,6 +3462,20 @@ AC_ARG_WITH(kerberos5, +--- openssh-5.2p1/configure.ac.nss-keys 2008-11-18 19:11:41.000000000 +0100 ++++ openssh-5.2p1/configure.ac 2008-11-18 19:12:38.000000000 +0100 +@@ -3436,6 +3436,20 @@ AC_ARG_WITH(kerberos5, ] ) @@ -96,7 +330,7 @@ # Looking for programs, paths and files PRIVSEP_PATH=/var/empty -@@ -4189,6 +4203,7 @@ echo " TCP Wrappers support +@@ -4163,6 +4177,7 @@ echo " TCP Wrappers support echo " MD5 password support: $MD5_MSG" echo " libedit support: $LIBEDIT_MSG" echo " Solaris process contract support: $SPC_MSG" @@ -104,187 +338,110 @@ echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" echo " BSD Auth support: $BSD_AUTH_MSG" -diff -up openssh-5.2p1/key.c.nss-keys openssh-5.2p1/key.c ---- openssh-5.2p1/key.c.nss-keys 2008-11-03 09:24:17.000000000 +0100 -+++ openssh-5.2p1/key.c 2009-03-10 03:51:55.840226575 +0100 -@@ -96,6 +96,54 @@ key_new(int type) - return k; - } - -+#ifdef HAVE_LIBNSS -+Key * -+key_new_nss(int type) -+{ -+ Key *k = key_new(type); +diff -up /dev/null openssh-5.2p1/README.nss +--- /dev/null 2008-11-17 17:51:52.160001870 +0100 ++++ openssh-5.2p1/README.nss 2008-11-18 19:11:41.000000000 +0100 +@@ -0,0 +1,36 @@ ++How to use NSS tokens with OpenSSH? + -+ k->nss = xcalloc(1, sizeof(*k->nss)); -+ k->flags = KEY_FLAG_EXT | KEY_FLAG_NSS; ++This version of OpenSSH contains experimental support for authentication using ++keys stored in tokens stored in NSS database. This for example includes any ++PKCS#11 tokens which are installed in your NSS database. + -+ return k; -+} ++As the code is experimental and preliminary only SSH protocol 2 is supported. ++The NSS certificate and token databases are looked for in the ~/.ssh ++directory or in a directory specified by environment variable NSS_DB_PATH. + -+Key * -+key_new_nss_copy(int type, const Key *c) -+{ -+ Key *k = key_new_nss(type); ++Common operations: + -+ switch (k->type) { -+ case KEY_RSA: -+ if ((BN_copy(k->rsa->n, c->rsa->n) == NULL) || -+ (BN_copy(k->rsa->e, c->rsa->e) == NULL)) -+ fatal("key_new_nss_copy: BN_copy failed"); -+ break; -+ case KEY_DSA: -+ if ((BN_copy(k->dsa->p, c->rsa->p) == NULL) || -+ (BN_copy(k->dsa->q, c->dsa->q) == NULL) || -+ (BN_copy(k->dsa->g, c->dsa->g) == NULL) || -+ (BN_copy(k->dsa->pub_key, c->dsa->pub_key) == NULL)) -+ fatal("key_new_nss_copy: BN_copy failed"); -+ break; -+ } -+ -+ k->nss->privk = SECKEY_CopyPrivateKey(c->nss->privk); -+ if (k->nss->privk == NULL) -+ fatal("key_new_nss_copy: SECKEY_CopyPrivateKey failed"); ++(1) tell the ssh client to use the NSS keys: + -+ k->nss->pubk = SECKEY_CopyPublicKey(c->nss->pubk); -+ if (k->nss->pubk == NULL) -+ fatal("key_new_nss_copy: SECKEY_CopyPublicKey failed"); ++ $ ssh -o 'UseNSS yes' otherhost + -+ if (c->nss->privk->wincx) -+ k->nss->privk->wincx = xstrdup(c->nss->privk->wincx); ++ if you want to use a specific token: ++ ++ $ ssh -o 'UseNSS yes' -o 'NSS Token My PKCS11 Token' otherhost ++ ++(2) or tell the agent to use the NSS keys: ++ ++ $ ssh-add -n ++ ++ if you want to use a specific token: ++ ++ $ ssh-add -n -T 'My PKCS11 Token' ++ ++(3) extract the public key from token so it can be added to the ++server: ++ ++ $ ssh-keygen -n ++ ++ if you want to use a specific token and/or key: ++ ++ $ ssh-keygen -n -D 'My PKCS11 Token' 'My Key ID' +diff -up openssh-5.2p1/authfd.c.nss-keys openssh-5.2p1/authfd.c +--- openssh-5.2p1/authfd.c.nss-keys 2006-09-01 07:38:36.000000000 +0200 ++++ openssh-5.2p1/authfd.c 2008-11-18 19:11:41.000000000 +0100 +@@ -626,6 +626,45 @@ ssh_update_card(AuthenticationConnection + return decode_reply(type); + } + ++int ++ssh_update_nss_key(AuthenticationConnection *auth, int add, ++ const char *tokenname, const char *keyname, ++ const char *pass, u_int life, u_int confirm) ++{ ++ Buffer msg; ++ int type, constrained = (life || confirm); + -+ return k; -+} -+#endif ++ if (add) { ++ type = constrained ? ++ SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED : ++ SSH_AGENTC_ADD_NSS_KEY; ++ } else ++ type = SSH_AGENTC_REMOVE_NSS_KEY; + ++ buffer_init(&msg); ++ buffer_put_char(&msg, type); ++ buffer_put_cstring(&msg, tokenname); ++ buffer_put_cstring(&msg, keyname); ++ buffer_put_cstring(&msg, pass); + - Key * - key_new_private(int type) - { -@@ -151,6 +199,19 @@ key_free(Key *k) - fatal("key_free: bad key type %d", k->type); - break; - } -+#ifdef HAVE_LIBNSS -+ if (k->flags & KEY_FLAG_NSS) { -+ if (k->nss->privk != NULL && k->nss->privk->wincx != NULL) { -+ memset(k->nss->privk->wincx, 0, -+ strlen(k->nss->privk->wincx)); -+ xfree(k->nss->privk->wincx); -+ k->nss->privk->wincx = NULL; ++ if (constrained) { ++ if (life != 0) { ++ buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME); ++ buffer_put_int(&msg, life); + } -+ SECKEY_DestroyPrivateKey(k->nss->privk); -+ SECKEY_DestroyPublicKey(k->nss->pubk); -+ xfree(k->nss); ++ if (confirm != 0) ++ buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM); + } -+#endif - xfree(k); - } - -diff -up openssh-5.2p1/key.h.nss-keys openssh-5.2p1/key.h ---- openssh-5.2p1/key.h.nss-keys 2008-06-12 20:40:35.000000000 +0200 -+++ openssh-5.2p1/key.h 2009-03-10 03:51:55.925279322 +0100 -@@ -29,11 +29,17 @@ - #include - #include - -+#ifdef HAVE_LIBNSS -+#include -+#include -+#endif + - typedef struct Key Key; - enum types { - KEY_RSA1, - KEY_RSA, - KEY_DSA, -+ KEY_NSS, - KEY_UNSPEC - }; - enum fp_type { -@@ -48,16 +54,30 @@ enum fp_rep { - - /* key is stored in external hardware */ - #define KEY_FLAG_EXT 0x0001 -+#define KEY_FLAG_NSS 0x0002 ++ if (ssh_request_reply(auth, &msg, &msg) == 0) { ++ buffer_free(&msg); ++ return 0; ++ } ++ type = buffer_get_char(&msg); ++ buffer_free(&msg); ++ return decode_reply(type); ++} + -+#ifdef HAVE_LIBNSS -+typedef struct NSSKey NSSKey; -+struct NSSKey { -+ SECKEYPrivateKey *privk; -+ SECKEYPublicKey *pubk; -+}; -+#endif - - struct Key { - int type; - int flags; - RSA *rsa; - DSA *dsa; -+#ifdef HAVE_LIBNSS -+ NSSKey *nss; -+#endif - }; - - Key *key_new(int); - Key *key_new_private(int); -+Key *key_new_nss(int); -+Key *key_new_nss_copy(int, const Key *); - void key_free(Key *); - Key *key_demote(const Key *); - int key_equal(const Key *, const Key *); -diff -up openssh-5.2p1/Makefile.in.nss-keys openssh-5.2p1/Makefile.in ---- openssh-5.2p1/Makefile.in.nss-keys 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.2p1/Makefile.in 2009-03-10 03:51:56.222702935 +0100 -@@ -71,7 +71,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o b - atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ - monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ - kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ -- entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o -+ entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o nsskeys.o - - SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ - sshconnect.o sshconnect1.o sshconnect2.o mux.o -@@ -134,28 +134,28 @@ libssh.a: $(LIBSSH_OBJS) - $(RANLIB) $@ - - ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) -- $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -+ $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) - - sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) -- $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) -+ $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) -lfipscheck $(LIBS) - - scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o - $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) - - ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o -- $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -+ $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) - - ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o -- $(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -+ $(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) - - ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o -- $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -+ $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) - - ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o -- $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -+ $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS) - - ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o -- $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) -+ $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lfipscheck $(LIBS) + /* + * Removes all identities from the agent. This call is not meant to be used + * by normal applications. +diff -up openssh-5.2p1/readconf.h.nss-keys openssh-5.2p1/readconf.h +--- openssh-5.2p1/readconf.h.nss-keys 2008-06-29 16:04:03.000000000 +0200 ++++ openssh-5.2p1/readconf.h 2008-11-18 19:11:41.000000000 +0100 +@@ -84,6 +84,8 @@ typedef struct { + char *preferred_authentications; + char *bind_address; /* local socket address for connection to sshd */ + char *smartcard_device; /* Smartcard reader device */ ++ int use_nss; /* Use NSS library for keys */ ++ char *nss_token; /* Look for NSS keys on token */ + int verify_host_key_dns; /* Verify host key using DNS */ - sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o - $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + int num_identity_files; /* Number of files for RSA/DSA identities. */ diff -up /dev/null openssh-5.2p1/nsskeys.c ---- /dev/null 2009-03-09 14:26:59.819020596 +0100 -+++ openssh-5.2p1/nsskeys.c 2009-03-10 03:51:56.251363837 +0100 +--- /dev/null 2008-11-17 17:51:52.160001870 +0100 ++++ openssh-5.2p1/nsskeys.c 2008-11-18 19:11:41.000000000 +0100 @@ -0,0 +1,327 @@ +/* + * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -471,8 +628,8 @@ + break; + } + -+ p = key_fingerprint(k, SSH_FP_SHA1, SSH_FP_HEX); -+ debug("SHA1 fingerprint %u %s", key_size(k), p); ++ p = key_fingerprint(k, SSH_FP_MD5, SSH_FP_HEX); ++ debug("fingerprint %u %s", key_size(k), p); + xfree(p); + + return 0; @@ -613,9 +770,63 @@ +} + +#endif /* HAVE_LIBNSS */ +diff -up openssh-5.2p1/ssh.c.nss-keys openssh-5.2p1/ssh.c +--- openssh-5.2p1/ssh.c.nss-keys 2008-07-04 04:53:50.000000000 +0200 ++++ openssh-5.2p1/ssh.c 2008-11-18 19:11:41.000000000 +0100 +@@ -104,6 +104,9 @@ + #ifdef SMARTCARD + #include "scard.h" + #endif ++#ifdef HAVE_LIBNSS ++#include "nsskeys.h" ++#endif + + extern char *__progname; + +@@ -1235,9 +1238,11 @@ load_public_identity_files(void) + int i = 0; + Key *public; + struct passwd *pw; +-#ifdef SMARTCARD ++#if defined(SMARTCARD) || defined(HAVE_LIBNSS) + Key **keys; ++#endif + ++#ifdef SMARTCARD + if (options.smartcard_device != NULL && + options.num_identity_files < SSH_MAX_IDENTITY_FILES && + (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) { +@@ -1260,6 +1265,27 @@ load_public_identity_files(void) + xfree(keys); + } + #endif /* SMARTCARD */ ++#ifdef HAVE_LIBNSS ++ if (options.use_nss && ++ options.num_identity_files < SSH_MAX_IDENTITY_FILES && ++ (keys = nss_get_keys(options.nss_token, NULL, NULL)) != NULL) { ++ int count; ++ for (count = 0; keys[count] != NULL; count++) { ++ memmove(&options.identity_files[1], &options.identity_files[0], ++ sizeof(char *) * (SSH_MAX_IDENTITY_FILES - 1)); ++ memmove(&options.identity_keys[1], &options.identity_keys[0], ++ sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1)); ++ options.num_identity_files++; ++ options.identity_keys[0] = keys[count]; ++ options.identity_files[0] = nss_get_key_label(keys[count]); ++ } ++ if (options.num_identity_files > SSH_MAX_IDENTITY_FILES) ++ options.num_identity_files = SSH_MAX_IDENTITY_FILES; ++ i += count; ++ xfree(keys); ++ } ++#endif /* HAVE_LIBNSS */ ++ + if ((pw = getpwuid(original_real_uid)) == NULL) + fatal("load_public_identity_files: getpwuid failed"); + pwname = xstrdup(pw->pw_name); diff -up /dev/null openssh-5.2p1/nsskeys.h ---- /dev/null 2009-03-09 14:26:59.819020596 +0100 -+++ openssh-5.2p1/nsskeys.h 2009-03-10 03:51:55.908243644 +0100 +--- /dev/null 2008-11-17 17:51:52.160001870 +0100 ++++ openssh-5.2p1/nsskeys.h 2008-11-18 19:11:41.000000000 +0100 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -656,85 +867,75 @@ + +#endif +#endif -diff -up openssh-5.2p1/readconf.c.nss-keys openssh-5.2p1/readconf.c ---- openssh-5.2p1/readconf.c.nss-keys 2009-02-14 06:28:21.000000000 +0100 -+++ openssh-5.2p1/readconf.c 2009-03-10 03:51:55.950217925 +0100 -@@ -124,6 +124,7 @@ typedef enum { - oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, - oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, - oHostKeyAlgorithms, oBindAddress, oSmartcardDevice, -+ oUseNSS, oNSSToken, - oClearAllForwardings, oNoHostAuthenticationForLocalhost, - oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, - oAddressFamily, oGssAuthentication, oGssDelegateCreds, -@@ -210,6 +211,13 @@ static struct { - #else - { "smartcarddevice", oUnsupported }, - #endif +diff -up openssh-5.2p1/Makefile.in.nss-keys openssh-5.2p1/Makefile.in +--- openssh-5.2p1/Makefile.in.nss-keys 2008-07-08 16:21:12.000000000 +0200 ++++ openssh-5.2p1/Makefile.in 2008-11-18 19:11:41.000000000 +0100 +@@ -71,7 +71,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o b + atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ + monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ + kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ +- entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o ++ entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o nsskeys.o + + SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ + sshconnect.o sshconnect1.o sshconnect2.o mux.o +diff -up openssh-5.2p1/key.h.nss-keys openssh-5.2p1/key.h +--- openssh-5.2p1/key.h.nss-keys 2008-06-12 20:40:35.000000000 +0200 ++++ openssh-5.2p1/key.h 2008-11-18 19:11:41.000000000 +0100 +@@ -29,11 +29,17 @@ + #include + #include + +#ifdef HAVE_LIBNSS -+ { "usenss", oUseNSS }, -+ { "nsstoken", oNSSToken }, -+#else -+ { "usenss", oUnsupported }, -+ { "nsstoken", oNSSToken }, ++#include ++#include +#endif - { "clearallforwardings", oClearAllForwardings }, - { "enablesshkeysign", oEnableSSHKeysign }, - { "verifyhostkeydns", oVerifyHostKeyDNS }, -@@ -612,6 +620,14 @@ parse_string: - charptr = &options->smartcard_device; - goto parse_string; - -+ case oUseNSS: -+ intptr = &options->use_nss; -+ goto parse_flag; -+ -+ case oNSSToken: -+ charptr = &options->nss_token; -+ goto parse_command; + - case oProxyCommand: - charptr = &options->proxy_command; - parse_command: -@@ -1047,6 +1063,8 @@ initialize_options(Options * options) - options->preferred_authentications = NULL; - options->bind_address = NULL; - options->smartcard_device = NULL; -+ options->use_nss = -1; -+ options->nss_token = NULL; - options->enable_ssh_keysign = - 1; - options->no_host_authentication_for_localhost = - 1; - options->identities_only = - 1; -@@ -1177,6 +1195,8 @@ fill_default_options(Options * options) - options->no_host_authentication_for_localhost = 0; - if (options->identities_only == -1) - options->identities_only = 0; -+ if (options->use_nss == -1) -+ options->use_nss = 0; - if (options->enable_ssh_keysign == -1) - options->enable_ssh_keysign = 0; - if (options->rekey_limit == -1) -diff -up openssh-5.2p1/readconf.h.nss-keys openssh-5.2p1/readconf.h ---- openssh-5.2p1/readconf.h.nss-keys 2009-02-14 06:28:21.000000000 +0100 -+++ openssh-5.2p1/readconf.h 2009-03-10 03:51:55.868252768 +0100 -@@ -85,6 +85,8 @@ typedef struct { - char *preferred_authentications; - char *bind_address; /* local socket address for connection to sshd */ - char *smartcard_device; /* Smartcard reader device */ -+ int use_nss; /* Use NSS library for keys */ -+ char *nss_token; /* Look for NSS keys on token */ - int verify_host_key_dns; /* Verify host key using DNS */ + typedef struct Key Key; + enum types { + KEY_RSA1, + KEY_RSA, + KEY_DSA, ++ KEY_NSS, + KEY_UNSPEC + }; + enum fp_type { +@@ -48,16 +54,30 @@ enum fp_rep { - int num_identity_files; /* Number of files for RSA/DSA identities. */ + /* key is stored in external hardware */ + #define KEY_FLAG_EXT 0x0001 ++#define KEY_FLAG_NSS 0x0002 ++ ++#ifdef HAVE_LIBNSS ++typedef struct NSSKey NSSKey; ++struct NSSKey { ++ SECKEYPrivateKey *privk; ++ SECKEYPublicKey *pubk; ++}; ++#endif + + struct Key { + int type; + int flags; + RSA *rsa; + DSA *dsa; ++#ifdef HAVE_LIBNSS ++ NSSKey *nss; ++#endif + }; + + Key *key_new(int); + Key *key_new_private(int); ++Key *key_new_nss(int); ++Key *key_new_nss_copy(int, const Key *); + void key_free(Key *); + Key *key_demote(const Key *); + int key_equal(const Key *, const Key *); diff -up openssh-5.2p1/ssh-add.c.nss-keys openssh-5.2p1/ssh-add.c --- openssh-5.2p1/ssh-add.c.nss-keys 2008-02-28 09:13:52.000000000 +0100 -+++ openssh-5.2p1/ssh-add.c 2009-03-10 03:51:56.254252403 +0100 -@@ -42,8 +42,18 @@ - #include - ++++ openssh-5.2p1/ssh-add.c 2008-11-18 19:11:41.000000000 +0100 +@@ -44,6 +44,14 @@ #include -+#include -+#include #include "openbsd-compat/openssl-compat.h" +#ifdef HAVE_LIBNSS @@ -748,7 +949,7 @@ #include #include #include -@@ -57,6 +67,7 @@ +@@ -57,6 +65,7 @@ #include "rsa.h" #include "log.h" #include "key.h" @@ -756,16 +957,7 @@ #include "buffer.h" #include "authfd.h" #include "authfile.h" -@@ -245,7 +256,7 @@ list_identities(AuthenticationConnection - key = ssh_get_next_identity(ac, &comment, version)) { - had_identities = 1; - if (do_fp) { -- fp = key_fingerprint(key, SSH_FP_MD5, -+ fp = key_fingerprint(key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, - SSH_FP_HEX); - printf("%d %s %s (%s)\n", - key_size(key), fp, comment, key_type(key)); -@@ -307,6 +318,117 @@ do_file(AuthenticationConnection *ac, in +@@ -307,6 +316,117 @@ do_file(AuthenticationConnection *ac, in return 0; } @@ -883,7 +1075,7 @@ static void usage(void) { -@@ -334,16 +456,25 @@ main(int argc, char **argv) +@@ -334,6 +454,10 @@ main(int argc, char **argv) AuthenticationConnection *ac = NULL; char *sc_reader_id = NULL; int i, ch, deleting = 0, ret = 0; @@ -894,24 +1086,7 @@ /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ sanitise_stdfd(); - - __progname = ssh_get_progname(argv[0]); -+ SSLeay_add_all_algorithms(); -+ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { -+ fprintf(stderr, -+ "FIPS integrity verification test failed.\n"); -+ exit(3); -+ } -+ - init_rng(); - seed_rng(); - -- SSLeay_add_all_algorithms(); -- - /* At first, get a connection to the authentication agent. */ - ac = ssh_get_authentication_connection(); - if (ac == NULL) { -@@ -351,7 +482,7 @@ main(int argc, char **argv) +@@ -351,7 +475,7 @@ main(int argc, char **argv) "Could not open a connection to your authentication agent.\n"); exit(2); } @@ -920,7 +1095,7 @@ switch (ch) { case 'l': case 'L': -@@ -373,6 +504,11 @@ main(int argc, char **argv) +@@ -373,6 +497,11 @@ main(int argc, char **argv) if (delete_all(ac) == -1) ret = 1; goto done; @@ -932,7 +1107,7 @@ case 's': sc_reader_id = optarg; break; -@@ -387,6 +523,11 @@ main(int argc, char **argv) +@@ -387,6 +516,11 @@ main(int argc, char **argv) goto done; } break; @@ -944,381 +1119,124 @@ default: usage(); ret = 1; -@@ -400,6 +541,40 @@ main(int argc, char **argv) +@@ -400,6 +534,40 @@ main(int argc, char **argv) ret = 1; goto done; } +#ifdef HAVE_LIBNSS -+ if (use_nss) { -+ PK11SlotList *slots; -+ PK11SlotListElement *sle; -+ int count = 0; -+ if (nss_init(password_cb) == -1) { -+ fprintf(stderr, "Failed to initialize NSS library\n"); -+ ret = 1; -+ goto done; -+ } -+ -+ if ((slots=PK11_GetAllTokens(CKM_INVALID_MECHANISM, PR_FALSE, PR_FALSE, -+ NULL)) == NULL) { -+ fprintf(stderr, "No tokens found\n"); -+ ret = 1; -+ goto nss_done; -+ } -+ -+ for (sle = slots->head; sle; sle = sle->next) { -+ int rv; -+ if ((rv=add_slot_keys(ac, sle->slot, !deleting)) == -1) { -+ ret = 1; -+ } -+ count += rv; -+ } -+ if (count == 0) { -+ ret = 1; -+ } -+nss_done: -+ NSS_Shutdown(); -+ clear_pass(); -+ goto done; -+ } -+#endif - if (argc == 0) { - char buf[MAXPATHLEN]; - struct passwd *pw; -diff -up openssh-5.2p1/ssh-agent.c.nss-keys openssh-5.2p1/ssh-agent.c ---- openssh-5.2p1/ssh-agent.c.nss-keys 2008-07-04 15:10:49.000000000 +0200 -+++ openssh-5.2p1/ssh-agent.c 2009-03-10 03:51:56.171221623 +0100 -@@ -51,6 +51,8 @@ - - #include - #include -+#include -+#include - #include "openbsd-compat/openssl-compat.h" - - #include -@@ -80,6 +82,10 @@ - #include "scard.h" - #endif - -+#ifdef HAVE_LIBNSS -+#include "nsskeys.h" -+#endif -+ - #if defined(HAVE_SYS_PRCTL_H) - #include /* For prctl() and PR_SET_DUMPABLE */ - #endif -@@ -196,9 +202,9 @@ confirm_key(Identity *id) - char *p; - int ret = -1; - -- p = key_fingerprint(id->key, SSH_FP_MD5, SSH_FP_HEX); -- if (ask_permission("Allow use of key %s?\nKey fingerprint %s.", -- id->comment, p)) -+ p = key_fingerprint(id->key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); -+ if (ask_permission("Allow use of key %s?\nKey %sfingerprint %s.", -+ id->comment, FIPS_mode() ? "SHA1 " : "", p)) - ret = 0; - xfree(p); - -@@ -714,6 +720,114 @@ send: - } - #endif /* SMARTCARD */ - -+#ifdef HAVE_LIBNSS -+static void -+process_add_nss_key (SocketEntry *e) -+{ -+ char *tokenname = NULL, *keyname = NULL, *password = NULL; -+ int i, version, success = 0, death = 0, confirm = 0; -+ Key **keys, *k; -+ Identity *id; -+ Idtab *tab; -+ -+ tokenname = buffer_get_string(&e->request, NULL); -+ keyname = buffer_get_string(&e->request, NULL); -+ password = buffer_get_string(&e->request, NULL); -+ -+ while (buffer_len(&e->request)) { -+ switch (buffer_get_char(&e->request)) { -+ case SSH_AGENT_CONSTRAIN_LIFETIME: -+ death = time(NULL) + buffer_get_int(&e->request); -+ break; -+ case SSH_AGENT_CONSTRAIN_CONFIRM: -+ confirm = 1; -+ break; -+ default: -+ break; -+ } -+ } -+ if (lifetime && !death) -+ death = time(NULL) + lifetime; -+ -+ keys = nss_get_keys(tokenname, keyname, password); -+ /* password is owned by keys[0] now */ -+ xfree(tokenname); -+ xfree(keyname); -+ -+ if (keys == NULL) { -+ memset(password, 0, strlen(password)); -+ xfree(password); -+ error("nss_get_keys failed"); -+ goto send; -+ } -+ for (i = 0; keys[i] != NULL; i++) { -+ k = keys[i]; -+ version = k->type == KEY_RSA1 ? 1 : 2; -+ tab = idtab_lookup(version); -+ if (lookup_identity(k, version) == NULL) { -+ id = xmalloc(sizeof(Identity)); -+ id->key = k; -+ id->comment = nss_get_key_label(k); -+ id->death = death; -+ id->confirm = confirm; -+ TAILQ_INSERT_TAIL(&tab->idlist, id, next); -+ tab->nentries++; -+ success = 1; -+ } else { -+ key_free(k); -+ } -+ keys[i] = NULL; -+ } -+ xfree(keys); -+send: -+ buffer_put_int(&e->output, 1); -+ buffer_put_char(&e->output, -+ success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE); -+} -+ -+static void -+process_remove_nss_key(SocketEntry *e) -+{ -+ char *tokenname = NULL, *keyname = NULL, *password = NULL; -+ int i, version, success = 0; -+ Key **keys, *k = NULL; -+ Identity *id; -+ Idtab *tab; -+ -+ tokenname = buffer_get_string(&e->request, NULL); -+ keyname = buffer_get_string(&e->request, NULL); -+ password = buffer_get_string(&e->request, NULL); -+ -+ keys = nss_get_keys(tokenname, keyname, password); -+ xfree(tokenname); -+ xfree(keyname); -+ xfree(password); -+ -+ if (keys == NULL || keys[0] == NULL) { -+ error("nss_get_keys failed"); -+ goto send; -+ } -+ for (i = 0; keys[i] != NULL; i++) { -+ k = keys[i]; -+ version = k->type == KEY_RSA1 ? 1 : 2; -+ if ((id = lookup_identity(k, version)) != NULL) { -+ tab = idtab_lookup(version); -+ TAILQ_REMOVE(&tab->idlist, id, next); -+ tab->nentries--; -+ free_identity(id); -+ success = 1; -+ } -+ key_free(k); -+ keys[i] = NULL; -+ } -+ xfree(keys); -+send: -+ buffer_put_int(&e->output, 1); -+ buffer_put_char(&e->output, -+ success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE); -+} -+#endif /* HAVE_LIBNSS */ -+ - /* dispatch incoming messages */ - - static void -@@ -806,6 +920,15 @@ process_message(SocketEntry *e) - process_remove_smartcard_key(e); - break; - #endif /* SMARTCARD */ -+#ifdef HAVE_LIBNSS -+ case SSH_AGENTC_ADD_NSS_KEY: -+ case SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED: -+ process_add_nss_key(e); -+ break; -+ case SSH_AGENTC_REMOVE_NSS_KEY: -+ process_remove_nss_key(e); -+ break; -+#endif /* SMARTCARD */ - default: - /* Unknown message. Respond with failure. */ - error("Unknown message %d", type); -@@ -1075,6 +1198,11 @@ main(int ac, char **av) - #endif - - SSLeay_add_all_algorithms(); -+ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { -+ fprintf(stderr, -+ "FIPS integrity verification test failed.\n"); -+ exit(3); -+ } - - __progname = ssh_get_progname(av[0]); - init_rng(); -diff -up openssh-5.2p1/ssh.c.nss-keys openssh-5.2p1/ssh.c ---- openssh-5.2p1/ssh.c.nss-keys 2009-02-14 06:28:21.000000000 +0100 -+++ openssh-5.2p1/ssh.c 2009-03-10 03:51:56.176206362 +0100 -@@ -71,6 +71,8 @@ - - #include - #include -+#include -+#include - #include "openbsd-compat/openssl-compat.h" - #include "openbsd-compat/sys-queue.h" - -@@ -104,6 +106,9 @@ - #ifdef SMARTCARD - #include "scard.h" - #endif -+#ifdef HAVE_LIBNSS -+#include "nsskeys.h" -+#endif - - extern char *__progname; - -@@ -217,6 +222,10 @@ main(int ac, char **av) - sanitise_stdfd(); - - __progname = ssh_get_progname(av[0]); -+ SSLeay_add_all_algorithms(); -+ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { -+ fatal("FIPS integrity verification test failed."); -+ } - init_rng(); - - /* -@@ -547,7 +556,6 @@ main(int ac, char **av) - if (!host) - usage(); - -- SSLeay_add_all_algorithms(); - ERR_load_crypto_strings(); - - /* Initialize the command to execute on remote host. */ -@@ -1231,9 +1239,11 @@ load_public_identity_files(void) - int i = 0; - Key *public; - struct passwd *pw; --#ifdef SMARTCARD -+#if defined(SMARTCARD) || defined(HAVE_LIBNSS) - Key **keys; -+#endif - -+#ifdef SMARTCARD - if (options.smartcard_device != NULL && - options.num_identity_files < SSH_MAX_IDENTITY_FILES && - (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) { -@@ -1256,6 +1266,27 @@ load_public_identity_files(void) - xfree(keys); - } - #endif /* SMARTCARD */ -+#ifdef HAVE_LIBNSS -+ if (options.use_nss && -+ options.num_identity_files < SSH_MAX_IDENTITY_FILES && -+ (keys = nss_get_keys(options.nss_token, NULL, NULL)) != NULL) { -+ int count; -+ for (count = 0; keys[count] != NULL; count++) { -+ memmove(&options.identity_files[1], &options.identity_files[0], -+ sizeof(char *) * (SSH_MAX_IDENTITY_FILES - 1)); -+ memmove(&options.identity_keys[1], &options.identity_keys[0], -+ sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1)); -+ options.num_identity_files++; -+ options.identity_keys[0] = keys[count]; -+ options.identity_files[0] = nss_get_key_label(keys[count]); ++ if (use_nss) { ++ PK11SlotList *slots; ++ PK11SlotListElement *sle; ++ int count = 0; ++ if (nss_init(password_cb) == -1) { ++ fprintf(stderr, "Failed to initialize NSS library\n"); ++ ret = 1; ++ goto done; ++ } ++ ++ if ((slots=PK11_GetAllTokens(CKM_INVALID_MECHANISM, PR_FALSE, PR_FALSE, ++ NULL)) == NULL) { ++ fprintf(stderr, "No tokens found\n"); ++ ret = 1; ++ goto nss_done; + } -+ if (options.num_identity_files > SSH_MAX_IDENTITY_FILES) -+ options.num_identity_files = SSH_MAX_IDENTITY_FILES; -+ i += count; -+ xfree(keys); -+ } -+#endif /* HAVE_LIBNSS */ + - if ((pw = getpwuid(original_real_uid)) == NULL) - fatal("load_public_identity_files: getpwuid failed"); - pwname = xstrdup(pw->pw_name); -diff -up openssh-5.2p1/ssh-dss.c.nss-keys openssh-5.2p1/ssh-dss.c ---- openssh-5.2p1/ssh-dss.c.nss-keys 2006-11-07 13:14:42.000000000 +0100 -+++ openssh-5.2p1/ssh-dss.c 2009-03-10 03:51:55.843232632 +0100 -@@ -39,6 +39,10 @@ - #include "log.h" - #include "key.h" ++ for (sle = slots->head; sle; sle = sle->next) { ++ int rv; ++ if ((rv=add_slot_keys(ac, sle->slot, !deleting)) == -1) { ++ ret = 1; ++ } ++ count += rv; ++ } ++ if (count == 0) { ++ ret = 1; ++ } ++nss_done: ++ NSS_Shutdown(); ++ clear_pass(); ++ goto done; ++ } ++#endif + if (argc == 0) { + char buf[MAXPATHLEN]; + struct passwd *pw; +diff -up openssh-5.2p1/ssh-rsa.c.nss-keys openssh-5.2p1/ssh-rsa.c +--- openssh-5.2p1/ssh-rsa.c.nss-keys 2006-09-01 07:38:37.000000000 +0200 ++++ openssh-5.2p1/ssh-rsa.c 2008-11-18 19:11:41.000000000 +0100 +@@ -32,6 +32,10 @@ + #include "compat.h" + #include "ssh.h" +#ifdef HAVE_LIBNSS +#include +#endif + - #define INTBLOB_LEN 20 - #define SIGBLOB_LEN (2*INTBLOB_LEN) + static int openssh_RSA_verify(int, u_char *, u_int, u_char *, u_int, RSA *); -@@ -57,6 +61,34 @@ ssh_dss_sign(const Key *key, u_char **si - error("ssh_dss_sign: no DSA key"); + /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */ +@@ -50,6 +54,38 @@ ssh_rsa_sign(const Key *key, u_char **si + error("ssh_rsa_sign: no RSA key"); return -1; } ++ ++ slen = RSA_size(key->rsa); ++ sig = xmalloc(slen); ++ +#ifdef HAVE_LIBNSS + if (key->flags & KEY_FLAG_NSS) { + SECItem sigitem; -+ SECItem *rawsig; ++ SECOidTag alg; + + memset(&sigitem, 0, sizeof(sigitem)); ++ alg = (datafellows & SSH_BUG_RSASIGMD5) ? ++ SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION : ++ SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION; ++ + if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk, -+ SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST) != SECSuccess) { -+ error("ssh_dss_sign: sign failed"); ++ alg) != SECSuccess) { ++ error("ssh_rsa_sign: sign failed"); + return -1; + } -+ -+ if ((rawsig=DSAU_DecodeDerSig(&sigitem)) == NULL) { -+ error("ssh_dss_sign: der decode failed"); ++ if (sigitem.len > slen) { ++ error("ssh_rsa_sign: slen %u slen2 %u", slen, sigitem.len); ++ xfree(sig); + SECITEM_ZfreeItem(&sigitem, PR_FALSE); + return -1; + } -+ SECITEM_ZfreeItem(&sigitem, PR_FALSE); -+ if (rawsig->len != SIGBLOB_LEN) { -+ error("ssh_dss_sign: unsupported signature length %d", -+ rawsig->len); -+ SECITEM_ZfreeItem(rawsig, PR_TRUE); -+ return -1; ++ if (sigitem.len < slen) { ++ memset(sig, 0, slen - sigitem.len); + } -+ memcpy(sigblob, rawsig->data, SIGBLOB_LEN); -+ SECITEM_ZfreeItem(rawsig, PR_TRUE); ++ memcpy(sig+slen-sigitem.len, sigitem.data, sigitem.len); ++ SECITEM_ZfreeItem(&sigitem, PR_FALSE); + } else { +#endif - EVP_DigestInit(&md, evp_md); + nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1; + if ((evp_md = EVP_get_digestbynid(nid)) == NULL) { + error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid); +@@ -59,9 +95,6 @@ ssh_rsa_sign(const Key *key, u_char **si EVP_DigestUpdate(&md, data, datalen); EVP_DigestFinal(&md, digest, &dlen); -@@ -80,7 +112,9 @@ ssh_dss_sign(const Key *key, u_char **si - BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen); - BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen); - DSA_SIG_free(sig); + +- slen = RSA_size(key->rsa); +- sig = xmalloc(slen); - + ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa); + memset(digest, 'd', sizeof(digest)); + +@@ -83,6 +116,9 @@ ssh_rsa_sign(const Key *key, u_char **si + xfree(sig); + return -1; + } +#ifdef HAVE_LIBNSS + } +#endif - if (datafellows & SSH_BUG_SIGBLOB) { - if (lenp != NULL) - *lenp = SIGBLOB_LEN; + /* encode signature */ + buffer_init(&b); + buffer_put_cstring(&b, "ssh-rsa"); diff -up openssh-5.2p1/ssh-keygen.c.nss-keys openssh-5.2p1/ssh-keygen.c ---- openssh-5.2p1/ssh-keygen.c.nss-keys 2009-02-21 22:47:02.000000000 +0100 -+++ openssh-5.2p1/ssh-keygen.c 2009-03-10 03:51:56.249239228 +0100 -@@ -21,6 +21,8 @@ - - #include - #include -+#include -+#include - #include "openbsd-compat/openssl-compat.h" - - #include -@@ -53,6 +55,11 @@ +--- openssh-5.2p1/ssh-keygen.c.nss-keys 2008-07-14 03:28:29.000000000 +0200 ++++ openssh-5.2p1/ssh-keygen.c 2008-11-18 19:11:41.000000000 +0100 +@@ -53,6 +53,11 @@ #include "scard.h" #endif @@ -1330,7 +1248,7 @@ /* Number of bits in the RSA/DSA key. This value can be set on the command line. */ #define DEFAULT_BITS 2048 #define DEFAULT_BITS_DSA 1024 -@@ -501,6 +508,26 @@ do_download(struct passwd *pw, const cha +@@ -501,6 +506,26 @@ do_download(struct passwd *pw, const cha } #endif /* SMARTCARD */ @@ -1357,16 +1275,7 @@ static void do_fingerprint(struct passwd *pw) { -@@ -512,7 +539,7 @@ do_fingerprint(struct passwd *pw) - enum fp_type fptype; - struct stat st; - -- fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5; -+ fptype = print_bubblebabble ? SSH_FP_SHA1 : FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5; - rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX; - - if (!have_identity) -@@ -1083,7 +1110,8 @@ main(int argc, char **argv) +@@ -1083,7 +1108,8 @@ main(int argc, char **argv) Key *private, *public; struct passwd *pw; struct stat st; @@ -1376,20 +1285,7 @@ u_int32_t memory = 0, generator_wanted = 0, trials = 100; int do_gen_candidates = 0, do_screen_candidates = 0; BIGNUM *start = NULL; -@@ -1099,6 +1127,12 @@ main(int argc, char **argv) - __progname = ssh_get_progname(argv[0]); - - SSLeay_add_all_algorithms(); -+ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { -+ fprintf(stderr, -+ "FIPS integrity verification test failed.\n"); -+ exit(3); -+ } -+ - log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); - - init_rng(); -@@ -1116,7 +1150,7 @@ main(int argc, char **argv) +@@ -1116,7 +1142,7 @@ main(int argc, char **argv) } while ((opt = getopt(argc, argv, @@ -1398,7 +1294,7 @@ switch (opt) { case 'b': bits = (u_int32_t)strtonum(optarg, 768, 32768, &errstr); -@@ -1156,6 +1190,10 @@ main(int argc, char **argv) +@@ -1156,6 +1182,10 @@ main(int argc, char **argv) case 'g': print_generic = 1; break; @@ -1409,7 +1305,7 @@ case 'P': identity_passphrase = optarg; break; -@@ -1187,10 +1225,10 @@ main(int argc, char **argv) +@@ -1187,10 +1217,10 @@ main(int argc, char **argv) case 't': key_type_name = optarg; break; @@ -1423,7 +1319,7 @@ reader_id = optarg; break; case 'v': -@@ -1299,6 +1337,17 @@ main(int argc, char **argv) +@@ -1299,6 +1329,17 @@ main(int argc, char **argv) exit(0); } } @@ -1441,96 +1337,61 @@ if (reader_id != NULL) { #ifdef SMARTCARD if (download) -@@ -1465,14 +1514,15 @@ passphrase_again: - fclose(f); - - if (!quiet) { -- char *fp = key_fingerprint(public, SSH_FP_MD5, SSH_FP_HEX); -- char *ra = key_fingerprint(public, SSH_FP_MD5, -+ int fips_on = FIPS_mode(); -+ char *fp = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); -+ char *ra = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, - SSH_FP_RANDOMART); - printf("Your public key has been saved in %s.\n", - identity_file); -- printf("The key fingerprint is:\n"); -+ printf("The key %sfingerprint is:\n", fips_on ? "SHA1 " : ""); - printf("%s %s\n", fp, comment); -- printf("The key's randomart image is:\n"); -+ printf("The key's %srandomart image is:\n", fips_on ? "SHA1 " :""); - printf("%s\n", ra); - xfree(ra); - xfree(fp); -diff -up openssh-5.2p1/ssh-rsa.c.nss-keys openssh-5.2p1/ssh-rsa.c ---- openssh-5.2p1/ssh-rsa.c.nss-keys 2006-09-01 07:38:37.000000000 +0200 -+++ openssh-5.2p1/ssh-rsa.c 2009-03-10 03:51:55.930219040 +0100 -@@ -32,6 +32,10 @@ - #include "compat.h" - #include "ssh.h" - +diff -up openssh-5.2p1/readconf.c.nss-keys openssh-5.2p1/readconf.c +--- openssh-5.2p1/readconf.c.nss-keys 2008-06-29 16:04:03.000000000 +0200 ++++ openssh-5.2p1/readconf.c 2008-11-18 19:11:41.000000000 +0100 +@@ -124,6 +124,7 @@ typedef enum { + oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, + oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, + oHostKeyAlgorithms, oBindAddress, oSmartcardDevice, ++ oUseNSS, oNSSToken, + oClearAllForwardings, oNoHostAuthenticationForLocalhost, + oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, + oAddressFamily, oGssAuthentication, oGssDelegateCreds, +@@ -210,6 +211,13 @@ static struct { + #else + { "smartcarddevice", oUnsupported }, + #endif +#ifdef HAVE_LIBNSS -+#include ++ { "usenss", oUseNSS }, ++ { "nsstoken", oNSSToken }, ++#else ++ { "usenss", oUnsupported }, ++ { "nsstoken", oNSSToken }, +#endif -+ - static int openssh_RSA_verify(int, u_char *, u_int, u_char *, u_int, RSA *); + { "clearallforwardings", oClearAllForwardings }, + { "enablesshkeysign", oEnableSSHKeysign }, + { "verifyhostkeydns", oVerifyHostKeyDNS }, +@@ -603,6 +611,14 @@ parse_string: + charptr = &options->smartcard_device; + goto parse_string; - /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */ -@@ -50,6 +54,38 @@ ssh_rsa_sign(const Key *key, u_char **si - error("ssh_rsa_sign: no RSA key"); - return -1; - } -+ -+ slen = RSA_size(key->rsa); -+ sig = xmalloc(slen); -+ -+#ifdef HAVE_LIBNSS -+ if (key->flags & KEY_FLAG_NSS) { -+ SECItem sigitem; -+ SECOidTag alg; ++ case oUseNSS: ++ intptr = &options->use_nss; ++ goto parse_flag; + -+ memset(&sigitem, 0, sizeof(sigitem)); -+ alg = (datafellows & SSH_BUG_RSASIGMD5) ? -+ SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION : -+ SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION; ++ case oNSSToken: ++ charptr = &options->nss_token; ++ goto parse_command; + -+ if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk, -+ alg) != SECSuccess) { -+ error("ssh_rsa_sign: sign failed"); -+ return -1; -+ } -+ if (sigitem.len > slen) { -+ error("ssh_rsa_sign: slen %u slen2 %u", slen, sigitem.len); -+ xfree(sig); -+ SECITEM_ZfreeItem(&sigitem, PR_FALSE); -+ return -1; -+ } -+ if (sigitem.len < slen) { -+ memset(sig, 0, slen - sigitem.len); -+ } -+ memcpy(sig+slen-sigitem.len, sigitem.data, sigitem.len); -+ SECITEM_ZfreeItem(&sigitem, PR_FALSE); -+ } else { -+#endif - nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1; - if ((evp_md = EVP_get_digestbynid(nid)) == NULL) { - error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid); -@@ -59,9 +95,6 @@ ssh_rsa_sign(const Key *key, u_char **si - EVP_DigestUpdate(&md, data, datalen); - EVP_DigestFinal(&md, digest, &dlen); - -- slen = RSA_size(key->rsa); -- sig = xmalloc(slen); -- - ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa); - memset(digest, 'd', sizeof(digest)); - -@@ -83,6 +116,9 @@ ssh_rsa_sign(const Key *key, u_char **si - xfree(sig); - return -1; - } -+#ifdef HAVE_LIBNSS -+ } -+#endif - /* encode signature */ - buffer_init(&b); - buffer_put_cstring(&b, "ssh-rsa"); + case oProxyCommand: + charptr = &options->proxy_command; + parse_command: +@@ -1055,6 +1071,8 @@ initialize_options(Options * options) + options->preferred_authentications = NULL; + options->bind_address = NULL; + options->smartcard_device = NULL; ++ options->use_nss = -1; ++ options->nss_token = NULL; + options->enable_ssh_keysign = - 1; + options->no_host_authentication_for_localhost = - 1; + options->identities_only = - 1; +@@ -1184,6 +1202,8 @@ fill_default_options(Options * options) + options->no_host_authentication_for_localhost = 0; + if (options->identities_only == -1) + options->identities_only = 0; ++ if (options->use_nss == -1) ++ options->use_nss = 0; + if (options->enable_ssh_keysign == -1) + options->enable_ssh_keysign = 0; + if (options->rekey_limit == -1) openssh-5.2p1-redhat.patch: Index: openssh-5.2p1-redhat.patch =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.2p1-redhat.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openssh-5.2p1-redhat.patch 10 Mar 2009 11:54:43 -0000 1.1 +++ openssh-5.2p1-redhat.patch 10 Mar 2009 13:39:03 -0000 1.2 @@ -1,78 +1,6 @@ -diff -up openssh-5.2p1/ssh_config.redhat openssh-5.2p1/ssh_config ---- openssh-5.2p1/ssh_config.redhat 2009-02-21 02:45:02.000000000 +0100 -+++ openssh-5.2p1/ssh_config 2009-03-10 03:51:54.749290375 +0100 -@@ -44,3 +44,13 @@ - # TunnelDevice any:any - # PermitLocalCommand no - # VisualHostKey no -+Host * -+ GSSAPIAuthentication yes -+# If this option is set to yes then remote X11 clients will have full access -+# to the original X11 display. As virtually no X11 client supports the untrusted -+# mode correctly we set this to yes. -+ ForwardX11Trusted yes -+# Send locale-related environment variables -+ SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES -+ SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT -+ SendEnv LC_IDENTIFICATION LC_ALL LANGUAGE -diff -up openssh-5.2p1/sshd_config.0.redhat openssh-5.2p1/sshd_config.0 ---- openssh-5.2p1/sshd_config.0.redhat 2009-02-23 01:18:15.000000000 +0100 -+++ openssh-5.2p1/sshd_config.0 2009-03-10 03:51:54.958364611 +0100 -@@ -467,6 +467,11 @@ DESCRIPTION - Defines the number of bits in the ephemeral protocol version 1 - server key. The minimum value is 512, and the default is 1024. - -+ ShowPatchLevel -+ Specifies whether sshd will display the specific patch level of -+ the binary in the server identification string. The patch level -+ is set at compile-time. The default is M-bM-^@M-^\noM-bM-^@M-^]. -+ - StrictModes - Specifies whether sshd(8) should check file modes and ownership - of the user's files and home directory before accepting login. -@@ -491,9 +496,9 @@ DESCRIPTION - - SyslogFacility - Gives the facility code that is used when logging messages from -- sshd(8). The possible values are: DAEMON, USER, AUTH, LOCAL0, -- LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. The de- -- fault is AUTH. -+ sshd(8). The possible values are: DAEMON, USER, AUTH, AUTHPRIV, -+ LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. -+ The default is AUTH. - - TCPKeepAlive - Specifies whether the system should send TCP keepalive messages -diff -up openssh-5.2p1/sshd_config.5.redhat openssh-5.2p1/sshd_config.5 ---- openssh-5.2p1/sshd_config.5.redhat 2009-02-23 01:00:24.000000000 +0100 -+++ openssh-5.2p1/sshd_config.5 2009-03-10 03:51:54.931352756 +0100 -@@ -814,6 +814,14 @@ This option applies to protocol version - .It Cm ServerKeyBits - Defines the number of bits in the ephemeral protocol version 1 server key. - The minimum value is 512, and the default is 1024. -+.It Cm ShowPatchLevel -+Specifies whether -+.Nm sshd -+will display the patch level of the binary in the identification string. -+The patch level is set at compile-time. -+The default is -+.Dq no . -+This option applies to protocol version 1 only. - .It Cm StrictModes - Specifies whether - .Xr sshd 8 -@@ -848,7 +856,7 @@ Note that this option applies to protoco - .It Cm SyslogFacility - Gives the facility code that is used when logging messages from - .Xr sshd 8 . --The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2, -+The possible values are: DAEMON, USER, AUTH, AUTHPRIV, LOCAL0, LOCAL1, LOCAL2, - LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. - The default is AUTH. - .It Cm TCPKeepAlive diff -up openssh-5.2p1/sshd_config.redhat openssh-5.2p1/sshd_config --- openssh-5.2p1/sshd_config.redhat 2008-07-02 14:35:43.000000000 +0200 -+++ openssh-5.2p1/sshd_config 2009-03-10 03:51:54.960221540 +0100 ++++ openssh-5.2p1/sshd_config 2008-07-23 14:11:12.000000000 +0200 @@ -33,6 +33,7 @@ Protocol 2 # Logging # obsoletes QuietMode and FascistLogging @@ -122,11 +50,48 @@ #X11DisplayOffset 10 #X11UseLocalhost yes #PrintMotd yes -@@ -100,6 +112,7 @@ Protocol 2 - #Compression delayed - #ClientAliveInterval 0 - #ClientAliveCountMax 3 -+#ShowPatchLevel no - #UseDNS yes - #PidFile /var/run/sshd.pid - #MaxStartups 10 +diff -up openssh-5.2p1/ssh_config.redhat openssh-5.2p1/ssh_config +--- openssh-5.2p1/ssh_config.redhat 2007-06-11 06:04:42.000000000 +0200 ++++ openssh-5.2p1/ssh_config 2008-07-23 14:07:29.000000000 +0200 +@@ -44,3 +44,13 @@ + # TunnelDevice any:any + # PermitLocalCommand no + # VisualHostKey no ++Host * ++ GSSAPIAuthentication yes ++# If this option is set to yes then remote X11 clients will have full access ++# to the original X11 display. As virtually no X11 client supports the untrusted ++# mode correctly we set this to yes. ++ ForwardX11Trusted yes ++# Send locale-related environment variables ++ SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES ++ SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT ++ SendEnv LC_IDENTIFICATION LC_ALL LANGUAGE +diff -up openssh-5.2p1/sshd_config.0.redhat openssh-5.2p1/sshd_config.0 +--- openssh-5.2p1/sshd_config.0.redhat 2008-07-21 10:30:51.000000000 +0200 ++++ openssh-5.2p1/sshd_config.0 2008-07-23 14:07:29.000000000 +0200 +@@ -490,9 +490,9 @@ DESCRIPTION + + SyslogFacility + Gives the facility code that is used when logging messages from +- sshd(8). The possible values are: DAEMON, USER, AUTH, LOCAL0, +- LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. The de- +- fault is AUTH. ++ sshd(8). The possible values are: DAEMON, USER, AUTH, AUTHPRIV, ++ LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. ++ The default is AUTH. + + TCPKeepAlive + Specifies whether the system should send TCP keepalive messages +diff -up openssh-5.2p1/sshd_config.5.redhat openssh-5.2p1/sshd_config.5 +--- openssh-5.2p1/sshd_config.5.redhat 2008-07-02 14:35:43.000000000 +0200 ++++ openssh-5.2p1/sshd_config.5 2008-07-23 14:07:29.000000000 +0200 +@@ -846,7 +846,7 @@ Note that this option applies to protoco + .It Cm SyslogFacility + Gives the facility code that is used when logging messages from + .Xr sshd 8 . +-The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2, ++The possible values are: DAEMON, USER, AUTH, AUTHPRIV, LOCAL0, LOCAL1, LOCAL2, + LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. + The default is AUTH. + .It Cm TCPKeepAlive openssh-5.2p1-selinux.patch: Index: openssh-5.2p1-selinux.patch =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.2p1-selinux.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openssh-5.2p1-selinux.patch 10 Mar 2009 11:54:44 -0000 1.1 +++ openssh-5.2p1-selinux.patch 10 Mar 2009 13:39:03 -0000 1.2 @@ -1,6 +1,17 @@ +diff -up openssh-5.2p1/configure.ac.selinux openssh-5.2p1/configure.ac +--- openssh-5.2p1/configure.ac.selinux 2008-07-23 16:32:13.000000000 +0200 ++++ openssh-5.2p1/configure.ac 2008-07-23 16:32:13.000000000 +0200 +@@ -3309,6 +3309,7 @@ AC_ARG_WITH(selinux, + AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ], + AC_MSG_ERROR(SELinux support requires libselinux library)) + SSHDLIBS="$SSHDLIBS $LIBSELINUX" ++ LIBS="$LIBS $LIBSELINUX" + AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) + LIBS="$save_LIBS" + fi ] diff -up openssh-5.2p1/auth1.c.selinux openssh-5.2p1/auth1.c ---- openssh-5.2p1/auth1.c.selinux 2009-03-10 03:51:54.813223420 +0100 -+++ openssh-5.2p1/auth1.c 2009-03-10 03:51:55.045214236 +0100 +--- openssh-5.2p1/auth1.c.selinux 2008-07-23 16:32:13.000000000 +0200 ++++ openssh-5.2p1/auth1.c 2008-07-23 16:32:13.000000000 +0200 @@ -391,7 +391,7 @@ void do_authentication(Authctxt *authctxt) { @@ -30,10 +41,173 @@ /* Verify that the user is a valid user. */ if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL) +diff -up openssh-5.2p1/auth2-pubkey.c.selinux openssh-5.2p1/auth2-pubkey.c +--- openssh-5.2p1/auth2-pubkey.c.selinux 2008-07-04 04:54:25.000000000 +0200 ++++ openssh-5.2p1/auth2-pubkey.c 2008-07-23 16:32:13.000000000 +0200 +@@ -117,7 +117,14 @@ userauth_pubkey(Authctxt *authctxt) + } + /* reconstruct packet */ + buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); +- buffer_put_cstring(&b, authctxt->user); ++ if (authctxt->role) { ++ buffer_put_int(&b, strlen(authctxt->user)+strlen(authctxt->role)+1); ++ buffer_append(&b, authctxt->user, strlen(authctxt->user)); ++ buffer_put_char(&b, '/'); ++ buffer_append(&b, authctxt->role, strlen(authctxt->role)); ++ } else { ++ buffer_put_cstring(&b, authctxt->user); ++ } + buffer_put_cstring(&b, + datafellows & SSH_BUG_PKSERVICE ? + "ssh-userauth" : +diff -up openssh-5.2p1/monitor_wrap.h.selinux openssh-5.2p1/monitor_wrap.h +--- openssh-5.2p1/monitor_wrap.h.selinux 2006-08-05 04:39:40.000000000 +0200 ++++ openssh-5.2p1/monitor_wrap.h 2008-07-23 16:32:13.000000000 +0200 +@@ -41,6 +41,7 @@ int mm_is_monitor(void); + DH *mm_choose_dh(int, int, int); + int mm_key_sign(Key *, u_char **, u_int *, u_char *, u_int); + void mm_inform_authserv(char *, char *); ++void mm_inform_authrole(char *); + struct passwd *mm_getpwnamallow(const char *); + char *mm_auth2_read_banner(void); + int mm_auth_password(struct Authctxt *, char *); +diff -up openssh-5.2p1/monitor.h.selinux openssh-5.2p1/monitor.h +--- openssh-5.2p1/monitor.h.selinux 2006-03-26 05:30:02.000000000 +0200 ++++ openssh-5.2p1/monitor.h 2008-07-23 16:32:13.000000000 +0200 +@@ -30,7 +30,7 @@ + + enum monitor_reqtype { + MONITOR_REQ_MODULI, MONITOR_ANS_MODULI, +- MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV, ++ MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV,MONITOR_REQ_AUTHROLE, + MONITOR_REQ_SIGN, MONITOR_ANS_SIGN, + MONITOR_REQ_PWNAM, MONITOR_ANS_PWNAM, + MONITOR_REQ_AUTH2_READ_BANNER, MONITOR_ANS_AUTH2_READ_BANNER, +diff -up openssh-5.2p1/auth2-hostbased.c.selinux openssh-5.2p1/auth2-hostbased.c +--- openssh-5.2p1/auth2-hostbased.c.selinux 2008-07-17 10:57:19.000000000 +0200 ++++ openssh-5.2p1/auth2-hostbased.c 2008-07-23 16:32:13.000000000 +0200 +@@ -106,7 +106,14 @@ userauth_hostbased(Authctxt *authctxt) + buffer_put_string(&b, session_id2, session_id2_len); + /* reconstruct packet */ + buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); +- buffer_put_cstring(&b, authctxt->user); ++ if (authctxt->role) { ++ buffer_put_int(&b, strlen(authctxt->user)+strlen(authctxt->role)+1); ++ buffer_append(&b, authctxt->user, strlen(authctxt->user)); ++ buffer_put_char(&b, '/'); ++ buffer_append(&b, authctxt->role, strlen(authctxt->role)); ++ } else { ++ buffer_put_cstring(&b, authctxt->user); ++ } + buffer_put_cstring(&b, service); + buffer_put_cstring(&b, "hostbased"); + buffer_put_string(&b, pkalg, alen); +diff -up openssh-5.2p1/monitor_wrap.c.selinux openssh-5.2p1/monitor_wrap.c +--- openssh-5.2p1/monitor_wrap.c.selinux 2008-07-11 09:36:48.000000000 +0200 ++++ openssh-5.2p1/monitor_wrap.c 2008-07-23 16:32:13.000000000 +0200 +@@ -296,6 +296,23 @@ mm_inform_authserv(char *service, char * + buffer_free(&m); + } + ++/* Inform the privileged process about role */ ++ ++void ++mm_inform_authrole(char *role) ++{ ++ Buffer m; ++ ++ debug3("%s entering", __func__); ++ ++ buffer_init(&m); ++ buffer_put_cstring(&m, role ? role : ""); ++ ++ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHROLE, &m); ++ ++ buffer_free(&m); ++} ++ + /* Do the password authentication */ + int + mm_auth_password(Authctxt *authctxt, char *password) +diff -up openssh-5.2p1/openbsd-compat/port-linux.c.selinux openssh-5.2p1/openbsd-compat/port-linux.c +--- openssh-5.2p1/openbsd-compat/port-linux.c.selinux 2008-03-26 21:27:21.000000000 +0100 ++++ openssh-5.2p1/openbsd-compat/port-linux.c 2008-07-23 16:32:13.000000000 +0200 +@@ -30,11 +30,16 @@ + #ifdef WITH_SELINUX + #include "log.h" + #include "port-linux.h" ++#include "key.h" ++#include "hostfile.h" ++#include "auth.h" + + #include + #include + #include + ++extern Authctxt *the_authctxt; ++ + /* Wrapper around is_selinux_enabled() to log its return value once only */ + int + ssh_selinux_enabled(void) +@@ -53,23 +58,36 @@ ssh_selinux_enabled(void) + static security_context_t + ssh_selinux_getctxbyname(char *pwname) + { +- security_context_t sc; +- char *sename = NULL, *lvl = NULL; +- int r; ++ security_context_t sc = NULL; ++ char *sename, *lvl; ++ char *role = NULL; ++ int r = 0; + ++ if (the_authctxt) ++ role=the_authctxt->role; + #ifdef HAVE_GETSEUSERBYNAME +- if (getseuserbyname(pwname, &sename, &lvl) != 0) +- return NULL; ++ if ((r=getseuserbyname(pwname, &sename, &lvl)) != 0) { ++ sename = NULL; ++ lvl = NULL; ++ } + #else + sename = pwname; + lvl = NULL; + #endif + ++ if (r == 0) { + #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL +- r = get_default_context_with_level(sename, lvl, NULL, &sc); ++ if (role != NULL && role[0]) ++ r = get_default_context_with_rolelevel(sename, role, lvl, NULL, &sc); ++ else ++ r = get_default_context_with_level(sename, lvl, NULL, &sc); + #else +- r = get_default_context(sename, NULL, &sc); ++ if (role != NULL && role[0]) ++ r = get_default_context_with_role(sename, role, NULL, &sc); ++ else ++ r = get_default_context(sename, NULL, &sc); + #endif ++ } + + if (r != 0) { + switch (security_getenforce()) { +diff -up openssh-5.2p1/auth.h.selinux openssh-5.2p1/auth.h +--- openssh-5.2p1/auth.h.selinux 2008-07-02 14:37:30.000000000 +0200 ++++ openssh-5.2p1/auth.h 2008-07-23 16:32:13.000000000 +0200 +@@ -58,6 +58,7 @@ struct Authctxt { + char *service; + struct passwd *pw; /* set if 'valid' */ + char *style; ++ char *role; + void *kbdintctxt; + void *jpake_ctx; + #ifdef BSD_AUTH diff -up openssh-5.2p1/auth2.c.selinux openssh-5.2p1/auth2.c ---- openssh-5.2p1/auth2.c.selinux 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.2p1/auth2.c 2009-03-10 03:51:55.071216534 +0100 -@@ -215,7 +215,7 @@ input_userauth_request(int type, u_int32 +--- openssh-5.2p1/auth2.c.selinux 2008-07-05 01:44:53.000000000 +0200 ++++ openssh-5.2p1/auth2.c 2008-07-23 16:32:13.000000000 +0200 +@@ -209,7 +209,7 @@ input_userauth_request(int type, u_int32 { Authctxt *authctxt = ctxt; Authmethod *m = NULL; @@ -42,7 +216,7 @@ int authenticated = 0; if (authctxt == NULL) -@@ -227,6 +227,9 @@ input_userauth_request(int type, u_int32 +@@ -221,6 +221,9 @@ input_userauth_request(int type, u_int32 debug("userauth-request for user %s service %s method %s", user, service, method); debug("attempt %d failures %d", authctxt->attempt, authctxt->failures); @@ -52,7 +226,7 @@ if ((style = strchr(user, ':')) != NULL) *style++ = 0; -@@ -252,8 +255,11 @@ input_userauth_request(int type, u_int32 +@@ -246,8 +249,11 @@ input_userauth_request(int type, u_int32 use_privsep ? " [net]" : ""); authctxt->service = xstrdup(service); authctxt->style = style ? xstrdup(style) : NULL; @@ -65,141 +239,10 @@ userauth_banner(); } else if (strcmp(user, authctxt->user) != 0 || strcmp(service, authctxt->service) != 0) { -diff -up openssh-5.2p1/auth2-hostbased.c.selinux openssh-5.2p1/auth2-hostbased.c ---- openssh-5.2p1/auth2-hostbased.c.selinux 2008-07-17 10:57:19.000000000 +0200 -+++ openssh-5.2p1/auth2-hostbased.c 2009-03-10 03:51:55.052265447 +0100 -@@ -106,7 +106,14 @@ userauth_hostbased(Authctxt *authctxt) - buffer_put_string(&b, session_id2, session_id2_len); - /* reconstruct packet */ - buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); -- buffer_put_cstring(&b, authctxt->user); -+ if (authctxt->role) { -+ buffer_put_int(&b, strlen(authctxt->user)+strlen(authctxt->role)+1); -+ buffer_append(&b, authctxt->user, strlen(authctxt->user)); -+ buffer_put_char(&b, '/'); -+ buffer_append(&b, authctxt->role, strlen(authctxt->role)); -+ } else { -+ buffer_put_cstring(&b, authctxt->user); -+ } - buffer_put_cstring(&b, service); - buffer_put_cstring(&b, "hostbased"); - buffer_put_string(&b, pkalg, alen); -diff -up openssh-5.2p1/auth2-pubkey.c.selinux openssh-5.2p1/auth2-pubkey.c ---- openssh-5.2p1/auth2-pubkey.c.selinux 2008-07-04 04:54:25.000000000 +0200 -+++ openssh-5.2p1/auth2-pubkey.c 2009-03-10 03:51:56.174214480 +0100 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #include "xmalloc.h" - #include "ssh.h" -@@ -117,7 +118,14 @@ userauth_pubkey(Authctxt *authctxt) - } - /* reconstruct packet */ - buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); -- buffer_put_cstring(&b, authctxt->user); -+ if (authctxt->role) { -+ buffer_put_int(&b, strlen(authctxt->user)+strlen(authctxt->role)+1); -+ buffer_append(&b, authctxt->user, strlen(authctxt->user)); -+ buffer_put_char(&b, '/'); -+ buffer_append(&b, authctxt->role, strlen(authctxt->role)); -+ } else { -+ buffer_put_cstring(&b, authctxt->user); -+ } - buffer_put_cstring(&b, - datafellows & SSH_BUG_PKSERVICE ? - "ssh-userauth" : -@@ -236,7 +244,7 @@ user_key_allowed2(struct passwd *pw, Key - found_key = 1; - debug("matching key found: file %s, line %lu", - file, linenum); -- fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX); -+ fp = key_fingerprint(found, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX); - verbose("Found matching %s key: %s", - key_type(found), fp); - xfree(fp); -diff -up openssh-5.2p1/auth.h.selinux openssh-5.2p1/auth.h ---- openssh-5.2p1/auth.h.selinux 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.2p1/auth.h 2009-03-10 03:51:55.069276014 +0100 -@@ -58,6 +58,7 @@ struct Authctxt { - char *service; - struct passwd *pw; /* set if 'valid' */ - char *style; -+ char *role; - void *kbdintctxt; - void *jpake_ctx; - #ifdef BSD_AUTH -diff -up openssh-5.2p1/configure.ac.selinux openssh-5.2p1/configure.ac ---- openssh-5.2p1/configure.ac.selinux 2009-03-10 03:51:54.901396765 +0100 -+++ openssh-5.2p1/configure.ac 2009-03-10 03:51:55.850215090 +0100 -@@ -3335,11 +3335,25 @@ AC_ARG_WITH(selinux, - AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ], - AC_MSG_ERROR(SELinux support requires libselinux library)) - SSHDLIBS="$SSHDLIBS $LIBSELINUX" -+ LIBS="$LIBS $LIBSELINUX" - AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) -+ AC_CHECK_FUNCS(setkeycreatecon) - LIBS="$save_LIBS" - fi ] - ) - -+# Check whether user wants Linux audit support -+LINUX_AUDIT_MSG="no" -+AC_ARG_WITH(linux-audit, -+ [ --with-linux-audit Enable Linux audit support], -+ [ if test "x$withval" != "xno" ; then -+ AC_DEFINE(HAVE_LINUX_AUDIT,1,[Define if you want Linux audit support.]) -+ LINUX_AUDIT_MSG="yes" -+ AC_CHECK_HEADERS(libaudit.h) -+ SSHDLIBS="$SSHDLIBS -laudit" -+ fi ] -+) -+ - # Check whether user wants Kerberos 5 support - KRB5_MSG="no" - AC_ARG_WITH(kerberos5, -@@ -3448,6 +3462,20 @@ AC_ARG_WITH(kerberos5, - ] - ) - -+# Check whether user wants NSS support -+LIBNSS_MSG="no" -+AC_ARG_WITH(nss, -+ [ --with-nss Enable NSS support], -+ [ if test "x$withval" != "xno" ; then -+ AC_DEFINE(HAVE_LIBNSS,1,[Define if you want NSS support.]) -+ LIBNSS_MSG="yes" -+ CPPFLAGS="$CPPFLAGS -I/usr/include/nss3 -I/usr/include/nspr4" -+ AC_CHECK_HEADERS(pk11pub.h) -+ LIBS="$LIBS -lnss3" -+ fi -+ ]) -+AC_SUBST(LIBNSS) -+ - # Looking for programs, paths and files - - PRIVSEP_PATH=/var/empty -@@ -4168,12 +4196,14 @@ echo " PAM support - echo " OSF SIA support: $SIA_MSG" - echo " KerberosV support: $KRB5_MSG" - echo " SELinux support: $SELINUX_MSG" -+echo " Linux audit support: $LINUX_AUDIT_MSG" - echo " Smartcard support: $SCARD_MSG" - echo " S/KEY support: $SKEY_MSG" - echo " TCP Wrappers support: $TCPW_MSG" - echo " MD5 password support: $MD5_MSG" - echo " libedit support: $LIBEDIT_MSG" - echo " Solaris process contract support: $SPC_MSG" -+echo " NSS support: $LIBNSS_MSG" - echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" - echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" - echo " BSD Auth support: $BSD_AUTH_MSG" diff -up openssh-5.2p1/monitor.c.selinux openssh-5.2p1/monitor.c ---- openssh-5.2p1/monitor.c.selinux 2009-02-14 06:33:31.000000000 +0100 -+++ openssh-5.2p1/monitor.c 2009-03-10 03:51:55.099559692 +0100 -@@ -135,6 +135,7 @@ int mm_answer_sign(int, Buffer *); +--- openssh-5.2p1/monitor.c.selinux 2008-07-11 09:36:48.000000000 +0200 ++++ openssh-5.2p1/monitor.c 2008-07-23 16:36:10.000000000 +0200 +@@ -134,6 +134,7 @@ int mm_answer_sign(int, Buffer *); int mm_answer_pwnamallow(int, Buffer *); int mm_answer_auth2_read_banner(int, Buffer *); int mm_answer_authserv(int, Buffer *); @@ -207,7 +250,7 @@ int mm_answer_authpassword(int, Buffer *); int mm_answer_bsdauthquery(int, Buffer *); int mm_answer_bsdauthrespond(int, Buffer *); -@@ -211,6 +212,7 @@ struct mon_table mon_dispatch_proto20[] +@@ -205,6 +206,7 @@ struct mon_table mon_dispatch_proto20[] {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign}, {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow}, {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv}, @@ -215,7 +258,7 @@ {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner}, {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword}, #ifdef USE_PAM -@@ -680,6 +682,7 @@ mm_answer_pwnamallow(int sock, Buffer *m +@@ -658,6 +660,7 @@ mm_answer_pwnamallow(int sock, Buffer *m else { /* Allow service/style information on the auth context */ monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1); @@ -223,7 +266,7 @@ monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1); } -@@ -725,6 +728,23 @@ mm_answer_authserv(int sock, Buffer *m) +@@ -703,6 +706,23 @@ mm_answer_authserv(int sock, Buffer *m) } int @@ -247,7 +290,7 @@ mm_answer_authpassword(int sock, Buffer *m) { static int call_count; -@@ -1102,7 +1122,7 @@ static int +@@ -1080,7 +1100,7 @@ static int monitor_valid_userblob(u_char *data, u_int datalen) { Buffer b; @@ -256,7 +299,7 @@ u_int len; int fail = 0; -@@ -1128,6 +1148,8 @@ monitor_valid_userblob(u_char *data, u_i +@@ -1106,6 +1126,8 @@ monitor_valid_userblob(u_char *data, u_i if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST) fail++; p = buffer_get_string(&b, NULL); @@ -265,7 +308,7 @@ if (strcmp(authctxt->user, p) != 0) { logit("wrong user name passed to monitor: expected %s != %.100s", authctxt->user, p); -@@ -1159,7 +1181,7 @@ monitor_valid_hostbasedblob(u_char *data +@@ -1137,7 +1159,7 @@ monitor_valid_hostbasedblob(u_char *data char *chost) { Buffer b; @@ -274,7 +317,7 @@ u_int len; int fail = 0; -@@ -1176,6 +1198,8 @@ monitor_valid_hostbasedblob(u_char *data +@@ -1154,6 +1176,8 @@ monitor_valid_hostbasedblob(u_char *data if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST) fail++; p = buffer_get_string(&b, NULL); @@ -283,489 +326,3 @@ if (strcmp(authctxt->user, p) != 0) { logit("wrong user name passed to monitor: expected %s != %.100s", authctxt->user, p); -diff -up openssh-5.2p1/monitor.h.selinux openssh-5.2p1/monitor.h ---- openssh-5.2p1/monitor.h.selinux 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.2p1/monitor.h 2009-03-10 03:51:55.050519421 +0100 -@@ -30,7 +30,7 @@ - - enum monitor_reqtype { - MONITOR_REQ_MODULI, MONITOR_ANS_MODULI, -- MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV, -+ MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV,MONITOR_REQ_AUTHROLE, - MONITOR_REQ_SIGN, MONITOR_ANS_SIGN, - MONITOR_REQ_PWNAM, MONITOR_ANS_PWNAM, - MONITOR_REQ_AUTH2_READ_BANNER, MONITOR_ANS_AUTH2_READ_BANNER, -diff -up openssh-5.2p1/monitor_wrap.c.selinux openssh-5.2p1/monitor_wrap.c ---- openssh-5.2p1/monitor_wrap.c.selinux 2008-11-05 06:20:47.000000000 +0100 -+++ openssh-5.2p1/monitor_wrap.c 2009-03-10 03:51:55.066210099 +0100 -@@ -297,6 +297,23 @@ mm_inform_authserv(char *service, char * - buffer_free(&m); - } - -+/* Inform the privileged process about role */ -+ -+void -+mm_inform_authrole(char *role) -+{ -+ Buffer m; -+ -+ debug3("%s entering", __func__); -+ -+ buffer_init(&m); -+ buffer_put_cstring(&m, role ? role : ""); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHROLE, &m); -+ -+ buffer_free(&m); -+} -+ - /* Do the password authentication */ - int - mm_auth_password(Authctxt *authctxt, char *password) -diff -up openssh-5.2p1/monitor_wrap.h.selinux openssh-5.2p1/monitor_wrap.h ---- openssh-5.2p1/monitor_wrap.h.selinux 2008-11-05 06:20:47.000000000 +0100 -+++ openssh-5.2p1/monitor_wrap.h 2009-03-10 03:51:55.048731957 +0100 -@@ -41,6 +41,7 @@ int mm_is_monitor(void); - DH *mm_choose_dh(int, int, int); - int mm_key_sign(Key *, u_char **, u_int *, u_char *, u_int); - void mm_inform_authserv(char *, char *); -+void mm_inform_authrole(char *); - struct passwd *mm_getpwnamallow(const char *); - char *mm_auth2_read_banner(void); - int mm_auth_password(struct Authctxt *, char *); -diff -up openssh-5.2p1/openbsd-compat/port-linux.c.selinux openssh-5.2p1/openbsd-compat/port-linux.c ---- openssh-5.2p1/openbsd-compat/port-linux.c.selinux 2008-03-26 21:27:21.000000000 +0100 -+++ openssh-5.2p1/openbsd-compat/port-linux.c 2009-03-10 03:51:55.407292576 +0100 -@@ -30,10 +30,28 @@ - #ifdef WITH_SELINUX - #include "log.h" - #include "port-linux.h" -+#include "key.h" -+#include "hostfile.h" -+#include "auth.h" -+#include "xmalloc.h" -+#include "servconf.h" - - #include - #include -+#include - #include -+#include -+#include -+ -+#ifdef HAVE_LINUX_AUDIT -+#include -+#include -+#endif -+ -+extern ServerOptions options; -+extern Authctxt *the_authctxt; -+extern int inetd_flag; -+extern int rexeced_flag; - - /* Wrapper around is_selinux_enabled() to log its return value once only */ - int -@@ -49,42 +67,245 @@ ssh_selinux_enabled(void) - return (enabled); - } - -+/* Send audit message */ -+static int -+send_audit_message(int success, security_context_t default_context, -+ security_context_t selected_context) -+{ -+ int rc=0; -+#ifdef HAVE_LINUX_AUDIT -+ char *msg = NULL; -+ int audit_fd = audit_open(); -+ security_context_t default_raw=NULL; -+ security_context_t selected_raw=NULL; -+ rc = -1; -+ if (audit_fd < 0) { -+ if (errno == EINVAL || errno == EPROTONOSUPPORT || -+ errno == EAFNOSUPPORT) -+ return 0; /* No audit support in kernel */ -+ error("Error connecting to audit system."); -+ return rc; -+ } -+ if (selinux_trans_to_raw_context(default_context, &default_raw) < 0) { -+ error("Error translating default context."); -+ default_raw = NULL; -+ } -+ if (selinux_trans_to_raw_context(selected_context, &selected_raw) < 0) { -+ error("Error translating selected context."); -+ selected_raw = NULL; -+ } -+ if (asprintf(&msg, "sshd: default-context=%s selected-context=%s", -+ default_raw ? default_raw : (default_context ? default_context: "?"), -+ selected_context ? selected_raw : (selected_context ? selected_context :"?")) < 0) { -+ error("Error allocating memory."); -+ goto out; -+ } -+ if (audit_log_user_message(audit_fd, AUDIT_USER_ROLE_CHANGE, -+ msg, NULL, NULL, NULL, success) <= 0) { -+ error("Error sending audit message."); -+ goto out; -+ } -+ rc = 0; -+ out: -+ free(msg); -+ freecon(default_raw); -+ freecon(selected_raw); -+ close(audit_fd); -+#endif -+ return rc; -+} -+ -+static int -+mls_range_allowed(security_context_t src, security_context_t dst) -+{ -+ struct av_decision avd; -+ int retval; -+ unsigned int bit = CONTEXT__CONTAINS; -+ -+ debug("%s: src:%s dst:%s", __func__, src, dst); -+ retval = security_compute_av(src, dst, SECCLASS_CONTEXT, bit, &avd); -+ if (retval || ((bit & avd.allowed) != bit)) -+ return 0; -+ -+ return 1; -+} -+ -+static int -+get_user_context(const char *sename, const char *role, const char *lvl, -+ security_context_t *sc) { -+#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL -+ if (lvl == NULL || lvl[0] == '\0' || get_default_context_with_level(sename, lvl, NULL, sc) != 0) { -+ /* User may have requested a level completely outside of his -+ allowed range. We get a context just for auditing as the -+ range check below will certainly fail for default context. */ -+#endif -+ if (get_default_context(sename, NULL, sc) != 0) { -+ *sc = NULL; -+ return -1; -+ } -+#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL -+ } -+#endif -+ if (role != NULL && role[0]) { -+ context_t con; -+ char *type=NULL; -+ if (get_default_type(role, &type) != 0) { -+ error("get_default_type: failed to get default type for '%s'", -+ role); -+ goto out; -+ } -+ con = context_new(*sc); -+ if (!con) { -+ goto out; -+ } -+ context_role_set(con, role); -+ context_type_set(con, type); -+ freecon(*sc); -+ *sc = strdup(context_str(con)); -+ context_free(con); -+ if (!*sc) -+ return -1; -+ } -+#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL -+ if (lvl != NULL && lvl[0]) { -+ /* verify that the requested range is obtained */ -+ context_t con; -+ security_context_t obtained_raw; -+ security_context_t requested_raw; -+ con = context_new(*sc); -+ if (!con) { -+ goto out; -+ } -+ context_range_set(con, lvl); -+ if (selinux_trans_to_raw_context(*sc, &obtained_raw) < 0) { -+ context_free(con); -+ goto out; -+ } -+ if (selinux_trans_to_raw_context(context_str(con), &requested_raw) < 0) { -+ freecon(obtained_raw); -+ context_free(con); -+ goto out; -+ } -+ -+ debug("get_user_context: obtained context '%s' requested context '%s'", -+ obtained_raw, requested_raw); -+ if (strcmp(obtained_raw, requested_raw)) { -+ /* set the context to the real requested one but fail */ -+ freecon(requested_raw); -+ freecon(obtained_raw); -+ freecon(*sc); -+ *sc = strdup(context_str(con)); -+ context_free(con); -+ return -1; -+ } -+ freecon(requested_raw); -+ freecon(obtained_raw); -+ context_free(con); -+ } -+#endif -+ return 0; -+ out: -+ freecon(*sc); -+ *sc = NULL; -+ return -1; -+} -+ -+static void -+ssh_selinux_get_role_level(char **role, const char **level) -+{ -+ *role = NULL; -+ *level = NULL; -+ if (the_authctxt) { -+ if (the_authctxt->role != NULL) { -+ char *slash; -+ *role = xstrdup(the_authctxt->role); -+ if ((slash = strchr(*role, '/')) != NULL) { -+ *slash = '\0'; -+ *level = slash + 1; -+ } -+ } -+ } -+} -+ - /* Return the default security context for the given username */ --static security_context_t --ssh_selinux_getctxbyname(char *pwname) -+static int -+ssh_selinux_getctxbyname(char *pwname, -+ security_context_t *default_sc, security_context_t *user_sc) - { -- security_context_t sc; -- char *sename = NULL, *lvl = NULL; -- int r; -+ char *sename, *lvl; -+ const char *reqlvl; -+ char *role; -+ int r = -1; -+ context_t con = NULL; -+ -+ *default_sc = NULL; -+ *user_sc = NULL; -+ -+ ssh_selinux_get_role_level(&role, &reqlvl); - - #ifdef HAVE_GETSEUSERBYNAME -- if (getseuserbyname(pwname, &sename, &lvl) != 0) -- return NULL; -+ if ((r=getseuserbyname(pwname, &sename, &lvl)) != 0) { -+ sename = NULL; -+ lvl = NULL; -+ } - #else - sename = pwname; -- lvl = NULL; -+ lvl = ""; - #endif - -+ if (r == 0) { - #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL -- r = get_default_context_with_level(sename, lvl, NULL, &sc); -+ r = get_default_context_with_level(sename, lvl, NULL, default_sc); - #else -- r = get_default_context(sename, NULL, &sc); -+ r = get_default_context(sename, NULL, default_sc); - #endif -+ } - -- if (r != 0) { -- switch (security_getenforce()) { -- case -1: -- fatal("%s: ssh_selinux_getctxbyname: " -- "security_getenforce() failed", __func__); -- case 0: -- error("%s: Failed to get default SELinux security " -- "context for %s", __func__, pwname); -- break; -- default: -- fatal("%s: Failed to get default SELinux security " -- "context for %s (in enforcing mode)", -- __func__, pwname); -+ if (r == 0) { -+ /* If launched from xinetd, we must use current level */ -+ if (inetd_flag && !rexeced_flag) { -+ security_context_t sshdsc=NULL; -+ -+ if (getcon_raw(&sshdsc) < 0) -+ fatal("failed to allocate security context"); -+ -+ if ((con=context_new(sshdsc)) == NULL) -+ fatal("failed to allocate selinux context"); -+ reqlvl = context_range_get(con); -+ freecon(sshdsc); -+ if (reqlvl !=NULL && lvl != NULL && strcmp(reqlvl, lvl) == 0) -+ /* we actually don't change level */ -+ reqlvl = ""; -+ -+ debug("%s: current connection level '%s'", __func__, reqlvl); - } -+ -+ if ((reqlvl != NULL && reqlvl[0]) || (role != NULL && role[0])) { -+ r = get_user_context(sename, role, reqlvl, user_sc); -+ -+ if (r == 0 && reqlvl != NULL && reqlvl[0]) { -+ security_context_t default_level_sc = *default_sc; -+ if (role != NULL && role[0]) { -+ if (get_user_context(sename, role, lvl, &default_level_sc) < 0) -+ default_level_sc = *default_sc; -+ } -+ /* verify that the requested range is contained in the user range */ -+ if (mls_range_allowed(default_level_sc, *user_sc)) { -+ logit("permit MLS level %s (user range %s)", reqlvl, lvl); -+ } else { -+ r = -1; -+ error("deny MLS level %s (user range %s)", reqlvl, lvl); -+ } -+ if (default_level_sc != *default_sc) -+ freecon(default_level_sc); -+ } -+ } else { -+ *user_sc = *default_sc; -+ } -+ } -+ if (r != 0) { -+ error("%s: Failed to get default SELinux security " -+ "context for %s", __func__, pwname); - } - - #ifdef HAVE_GETSEUSERBYNAME -@@ -93,37 +314,114 @@ ssh_selinux_getctxbyname(char *pwname) - if (lvl != NULL) - xfree(lvl); - #endif -+ if (role != NULL) -+ xfree(role); -+ if (con) -+ context_free(con); - -- return (sc); -+ return (r); -+} -+ -+/* Setup environment variables for pam_selinux */ -+static int -+ssh_selinux_setup_pam_variables(void) -+{ -+ const char *reqlvl; -+ char *role; -+ char *use_current; -+ int rv; -+ -+ debug3("%s: setting execution context", __func__); -+ -+ ssh_selinux_get_role_level(&role, &reqlvl); -+ -+ rv = do_pam_putenv("SELINUX_ROLE_REQUESTED", role ? role : ""); -+ -+ if (inetd_flag && !rexeced_flag) { -+ use_current = "1"; -+ } else { -+ use_current = ""; -+ rv = rv || do_pam_putenv("SELINUX_LEVEL_REQUESTED", reqlvl ? reqlvl: ""); -+ } -+ -+ rv = rv || do_pam_putenv("SELINUX_USE_CURRENT_RANGE", use_current); -+ -+ if (role != NULL) -+ xfree(role); -+ -+ return rv; - } - - /* Set the execution context to the default for the specified user */ - void - ssh_selinux_setup_exec_context(char *pwname) - { -+ int r = 0; -+ security_context_t default_ctx = NULL; - security_context_t user_ctx = NULL; - - if (!ssh_selinux_enabled()) - return; - -+ if (options.use_pam) { -+ /* do not compute context, just setup environment for pam_selinux */ -+ if (ssh_selinux_setup_pam_variables()) { -+ switch (security_getenforce()) { -+ case -1: -+ fatal("%s: security_getenforce() failed", __func__); -+ case 0: -+ error("%s: SELinux PAM variable setup failure. Continuing in permissive mode.", -+ __func__); -+ break; -+ default: -+ fatal("%s: SELinux PAM variable setup failure. Aborting connection.", -+ __func__); -+ } -+ } -+ return; -+ } -+ - debug3("%s: setting execution context", __func__); - -- user_ctx = ssh_selinux_getctxbyname(pwname); -- if (setexeccon(user_ctx) != 0) { -+ r = ssh_selinux_getctxbyname(pwname, &default_ctx, &user_ctx); -+ if (r >= 0) { -+ r = setexeccon(user_ctx); -+ if (r < 0) { -+ error("%s: Failed to set SELinux execution context %s for %s", -+ __func__, user_ctx, pwname); -+ } -+#ifdef HAVE_SETKEYCREATECON -+ else if (setkeycreatecon(user_ctx) < 0) { -+ error("%s: Failed to set SELinux keyring creation context %s for %s", -+ __func__, user_ctx, pwname); -+ } -+#endif -+ } -+ if (user_ctx == NULL) { -+ user_ctx = default_ctx; -+ } -+ if (r < 0 || user_ctx != default_ctx) { -+ /* audit just the case when user changed a role or there was -+ a failure */ -+ send_audit_message(r >= 0, default_ctx, user_ctx); -+ } -+ if (r < 0) { - switch (security_getenforce()) { - case -1: - fatal("%s: security_getenforce() failed", __func__); - case 0: -- error("%s: Failed to set SELinux execution " -- "context for %s", __func__, pwname); -+ error("%s: SELinux failure. Continuing in permissive mode.", -+ __func__); - break; - default: -- fatal("%s: Failed to set SELinux execution context " -- "for %s (in enforcing mode)", __func__, pwname); -+ fatal("%s: SELinux failure. Aborting connection.", -+ __func__); - } - } -- if (user_ctx != NULL) -+ if (user_ctx != NULL && user_ctx != default_ctx) - freecon(user_ctx); -+ if (default_ctx != NULL) -+ freecon(default_ctx); - - debug3("%s: done", __func__); - } -@@ -141,7 +439,10 @@ ssh_selinux_setup_pty(char *pwname, cons - - debug3("%s: setting TTY context on %s", __func__, tty); - -- user_ctx = ssh_selinux_getctxbyname(pwname); -+ if (getexeccon(&user_ctx) < 0) { -+ error("%s: getexeccon: %s", __func__, strerror(errno)); -+ goto out; -+ } - - /* XXX: should these calls fatal() upon failure in enforcing mode? */ - openssh-5.2p1-vendor.patch: Index: openssh-5.2p1-vendor.patch =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.2p1-vendor.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openssh-5.2p1-vendor.patch 10 Mar 2009 11:54:44 -0000 1.1 +++ openssh-5.2p1-vendor.patch 10 Mar 2009 13:39:03 -0000 1.2 @@ -1,54 +1,7 @@ diff -up openssh-5.2p1/configure.ac.vendor openssh-5.2p1/configure.ac ---- openssh-5.2p1/configure.ac.vendor 2009-03-10 03:51:54.862255585 +0100 -+++ openssh-5.2p1/configure.ac 2009-03-10 03:51:55.850215090 +0100 -@@ -3335,11 +3335,25 @@ AC_ARG_WITH(selinux, - AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ], - AC_MSG_ERROR(SELinux support requires libselinux library)) - SSHDLIBS="$SSHDLIBS $LIBSELINUX" -+ LIBS="$LIBS $LIBSELINUX" - AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) -+ AC_CHECK_FUNCS(setkeycreatecon) - LIBS="$save_LIBS" - fi ] - ) - -+# Check whether user wants Linux audit support -+LINUX_AUDIT_MSG="no" -+AC_ARG_WITH(linux-audit, -+ [ --with-linux-audit Enable Linux audit support], -+ [ if test "x$withval" != "xno" ; then -+ AC_DEFINE(HAVE_LINUX_AUDIT,1,[Define if you want Linux audit support.]) -+ LINUX_AUDIT_MSG="yes" -+ AC_CHECK_HEADERS(libaudit.h) -+ SSHDLIBS="$SSHDLIBS -laudit" -+ fi ] -+) -+ - # Check whether user wants Kerberos 5 support - KRB5_MSG="no" - AC_ARG_WITH(kerberos5, -@@ -3448,6 +3462,20 @@ AC_ARG_WITH(kerberos5, - ] - ) - -+# Check whether user wants NSS support -+LIBNSS_MSG="no" -+AC_ARG_WITH(nss, -+ [ --with-nss Enable NSS support], -+ [ if test "x$withval" != "xno" ; then -+ AC_DEFINE(HAVE_LIBNSS,1,[Define if you want NSS support.]) -+ LIBNSS_MSG="yes" -+ CPPFLAGS="$CPPFLAGS -I/usr/include/nss3 -I/usr/include/nspr4" -+ AC_CHECK_HEADERS(pk11pub.h) -+ LIBS="$LIBS -lnss3" -+ fi -+ ]) -+AC_SUBST(LIBNSS) -+ - # Looking for programs, paths and files - - PRIVSEP_PATH=/var/empty -@@ -3916,6 +3944,12 @@ AC_ARG_WITH(lastlog, +--- openssh-5.2p1/configure.ac.vendor 2008-07-23 14:13:22.000000000 +0200 ++++ openssh-5.2p1/configure.ac 2008-07-23 14:13:22.000000000 +0200 +@@ -3890,6 +3890,12 @@ AC_ARG_WITH(lastlog, fi ] ) @@ -61,19 +14,7 @@ dnl lastlog, [uw]tmpx? detection dnl NOTE: set the paths in the platform section to avoid the -@@ -4162,16 +4196,19 @@ echo " PAM support - echo " OSF SIA support: $SIA_MSG" - echo " KerberosV support: $KRB5_MSG" - echo " SELinux support: $SELINUX_MSG" -+echo " Linux audit support: $LINUX_AUDIT_MSG" - echo " Smartcard support: $SCARD_MSG" - echo " S/KEY support: $SKEY_MSG" - echo " TCP Wrappers support: $TCPW_MSG" - echo " MD5 password support: $MD5_MSG" - echo " libedit support: $LIBEDIT_MSG" - echo " Solaris process contract support: $SPC_MSG" -+echo " NSS support: $LIBNSS_MSG" - echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" +@@ -4146,6 +4152,7 @@ echo " IP address in \$DISPLAY hac echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" echo " BSD Auth support: $BSD_AUTH_MSG" echo " Random number source: $RAND_MSG" @@ -81,9 +22,38 @@ if test ! -z "$USE_RAND_HELPER" ; then echo " ssh-rand-helper collects from: $RAND_HELPER_MSG" fi +diff -up openssh-5.2p1/sshd_config.5.vendor openssh-5.2p1/sshd_config.5 +--- openssh-5.2p1/sshd_config.5.vendor 2008-07-23 14:13:22.000000000 +0200 ++++ openssh-5.2p1/sshd_config.5 2008-07-23 14:19:23.000000000 +0200 +@@ -812,6 +812,14 @@ This option applies to protocol version + .It Cm ServerKeyBits + Defines the number of bits in the ephemeral protocol version 1 server key. + The minimum value is 512, and the default is 1024. ++.It Cm ShowPatchLevel ++Specifies whether ++.Nm sshd ++will display the patch level of the binary in the identification string. ++The patch level is set at compile-time. ++The default is ++.Dq no . ++This option applies to protocol version 1 only. + .It Cm StrictModes + Specifies whether + .Xr sshd 8 +diff -up openssh-5.2p1/servconf.h.vendor openssh-5.2p1/servconf.h +--- openssh-5.2p1/servconf.h.vendor 2008-06-10 15:01:51.000000000 +0200 ++++ openssh-5.2p1/servconf.h 2008-07-23 14:13:22.000000000 +0200 +@@ -126,6 +126,7 @@ typedef struct { + int max_authtries; + int max_sessions; + char *banner; /* SSH-2 banner message */ ++ int show_patchlevel; /* Show vendor patch level to clients */ + int use_dns; + int client_alive_interval; /* + * poke the client this often to diff -up openssh-5.2p1/servconf.c.vendor openssh-5.2p1/servconf.c ---- openssh-5.2p1/servconf.c.vendor 2009-01-28 06:31:23.000000000 +0100 -+++ openssh-5.2p1/servconf.c 2009-03-10 03:51:54.956273911 +0100 +--- openssh-5.2p1/servconf.c.vendor 2008-07-04 05:51:12.000000000 +0200 ++++ openssh-5.2p1/servconf.c 2008-07-23 14:32:27.000000000 +0200 @@ -117,6 +117,7 @@ initialize_server_options(ServerOptions options->max_authtries = -1; options->max_sessions = -1; @@ -138,21 +108,10 @@ dump_cfg_fmtint(sUseDNS, o->use_dns); dump_cfg_fmtint(sAllowTcpForwarding, o->allow_tcp_forwarding); dump_cfg_fmtint(sUsePrivilegeSeparation, use_privsep); -diff -up openssh-5.2p1/servconf.h.vendor openssh-5.2p1/servconf.h ---- openssh-5.2p1/servconf.h.vendor 2009-01-28 06:31:23.000000000 +0100 -+++ openssh-5.2p1/servconf.h 2009-03-10 03:51:54.933236643 +0100 -@@ -128,6 +128,7 @@ typedef struct { - int max_authtries; - int max_sessions; - char *banner; /* SSH-2 banner message */ -+ int show_patchlevel; /* Show vendor patch level to clients */ - int use_dns; - int client_alive_interval; /* - * poke the client this often to diff -up openssh-5.2p1/sshd_config.0.vendor openssh-5.2p1/sshd_config.0 ---- openssh-5.2p1/sshd_config.0.vendor 2009-03-10 03:51:54.775230993 +0100 -+++ openssh-5.2p1/sshd_config.0 2009-03-10 03:51:54.958364611 +0100 -@@ -467,6 +467,11 @@ DESCRIPTION +--- openssh-5.2p1/sshd_config.0.vendor 2008-07-23 14:13:22.000000000 +0200 ++++ openssh-5.2p1/sshd_config.0 2008-07-23 14:13:22.000000000 +0200 +@@ -466,6 +466,11 @@ DESCRIPTION Defines the number of bits in the ephemeral protocol version 1 server key. The minimum value is 512, and the default is 1024. @@ -164,27 +123,9 @@ StrictModes Specifies whether sshd(8) should check file modes and ownership of the user's files and home directory before accepting login. -diff -up openssh-5.2p1/sshd_config.5.vendor openssh-5.2p1/sshd_config.5 ---- openssh-5.2p1/sshd_config.5.vendor 2009-03-10 03:51:54.785628316 +0100 -+++ openssh-5.2p1/sshd_config.5 2009-03-10 03:51:54.931352756 +0100 -@@ -814,6 +814,14 @@ This option applies to protocol version - .It Cm ServerKeyBits - Defines the number of bits in the ephemeral protocol version 1 server key. - The minimum value is 512, and the default is 1024. -+.It Cm ShowPatchLevel -+Specifies whether -+.Nm sshd -+will display the patch level of the binary in the identification string. -+The patch level is set at compile-time. -+The default is -+.Dq no . -+This option applies to protocol version 1 only. - .It Cm StrictModes - Specifies whether - .Xr sshd 8 diff -up openssh-5.2p1/sshd_config.vendor openssh-5.2p1/sshd_config ---- openssh-5.2p1/sshd_config.vendor 2009-03-10 03:51:54.747256884 +0100 -+++ openssh-5.2p1/sshd_config 2009-03-10 03:51:54.960221540 +0100 +--- openssh-5.2p1/sshd_config.vendor 2008-07-23 14:13:22.000000000 +0200 ++++ openssh-5.2p1/sshd_config 2008-07-23 14:13:22.000000000 +0200 @@ -112,6 +112,7 @@ X11Forwarding yes #Compression delayed #ClientAliveInterval 0 @@ -194,18 +135,9 @@ #PidFile /var/run/sshd.pid #MaxStartups 10 diff -up openssh-5.2p1/sshd.c.vendor openssh-5.2p1/sshd.c ---- openssh-5.2p1/sshd.c.vendor 2009-01-28 06:31:23.000000000 +0100 -+++ openssh-5.2p1/sshd.c 2009-03-10 03:51:56.224238563 +0100 -@@ -76,6 +76,8 @@ - #include - #include - #include -+#include -+#include - #include "openbsd-compat/openssl-compat.h" - - #ifdef HAVE_SECUREWARE -@@ -415,7 +417,7 @@ sshd_exchange_identification(int sock_in +--- openssh-5.2p1/sshd.c.vendor 2008-07-11 09:36:49.000000000 +0200 ++++ openssh-5.2p1/sshd.c 2008-07-23 14:35:43.000000000 +0200 +@@ -416,7 +416,7 @@ sshd_exchange_identification(int sock_in minor = PROTOCOL_MINOR_1; } snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor, @@ -214,40 +146,7 @@ server_version_string = xstrdup(buf); /* Send our protocol version identification. */ -@@ -590,6 +592,10 @@ privsep_preauth_child(void) - /* Demote the private keys to public keys. */ - demote_sensitive_data(); - -+ /* Open the syslog permanently so the chrooted process still -+ can write to syslog. */ -+ open_log(); -+ - /* Change our root directory */ - if (chroot(_PATH_PRIVSEP_CHROOT_DIR) == -1) - fatal("chroot(\"%s\"): %s", _PATH_PRIVSEP_CHROOT_DIR, -@@ -1256,6 +1262,12 @@ main(int ac, char **av) - (void)set_auth_parameters(ac, av); - #endif - __progname = ssh_get_progname(av[0]); -+ -+ SSLeay_add_all_algorithms(); -+ if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) { -+ fatal("FIPS integrity verification test failed."); -+ } -+ - init_rng(); - - /* Save argv. Duplicate so setproctitle emulation doesn't clobber it */ -@@ -1408,8 +1420,6 @@ main(int ac, char **av) - else - closefrom(REEXEC_DEVCRYPTO_RESERVED_FD); - -- SSLeay_add_all_algorithms(); -- - /* - * Force logging to stderr until we have loaded the private host - * key (unless started from inetd) -@@ -1483,7 +1493,8 @@ main(int ac, char **av) +@@ -1484,7 +1484,8 @@ main(int ac, char **av) exit(1); } @@ -257,33 +156,3 @@ /* Store privilege separation user for later use if required. */ if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) { -@@ -1894,6 +1905,9 @@ main(int ac, char **av) - restore_uid(); - } - #endif -+#ifdef WITH_SELINUX -+ ssh_selinux_setup_exec_context(authctxt->pw->pw_name); -+#endif - #ifdef USE_PAM - if (options.use_pam) { - do_pam_setcred(1); -@@ -2174,6 +2188,9 @@ do_ssh2_kex(void) - if (options.ciphers != NULL) { - myproposal[PROPOSAL_ENC_ALGS_CTOS] = - myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; -+ } else if (FIPS_mode()) { -+ myproposal[PROPOSAL_ENC_ALGS_CTOS] = -+ myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_ENCRYPT; - } - myproposal[PROPOSAL_ENC_ALGS_CTOS] = - compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); -@@ -2183,6 +2200,9 @@ do_ssh2_kex(void) - if (options.macs != NULL) { - myproposal[PROPOSAL_MAC_ALGS_CTOS] = - myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; -+ } else if (FIPS_mode()) { -+ myproposal[PROPOSAL_MAC_ALGS_CTOS] = -+ myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_MAC; - } - if (options.compression == COMP_NONE) { - myproposal[PROPOSAL_COMP_ALGS_CTOS] = From pkgdb at fedoraproject.org Tue Mar 10 13:45:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 13:45:51 +0000 Subject: [pkgdb] sat4j had acl change status Message-ID: <20090310134657.C6BC2208514@bastion.fedora.phx.redhat.com> overholt has set the watchbugzilla acl on sat4j (Fedora devel) to Approved for akurtakov To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sat4j From pkgdb at fedoraproject.org Tue Mar 10 13:46:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 13:46:57 +0000 Subject: [pkgdb] sat4j had acl change status Message-ID: <20090310134657.D3FC2208550@bastion.fedora.phx.redhat.com> overholt has set the watchcommits acl on sat4j (Fedora devel) to Approved for akurtakov To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sat4j From pkgdb at fedoraproject.org Tue Mar 10 13:46:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 13:46:59 +0000 Subject: [pkgdb] sat4j had acl change status Message-ID: <20090310134659.4DE55208553@bastion.fedora.phx.redhat.com> overholt has set the commit acl on sat4j (Fedora devel) to Approved for akurtakov To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sat4j From pkgdb at fedoraproject.org Tue Mar 10 13:46:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 13:46:01 +0000 Subject: [pkgdb] sat4j had acl change status Message-ID: <20090310134707.7BC35208555@bastion.fedora.phx.redhat.com> overholt has set the approveacls acl on sat4j (Fedora devel) to Approved for akurtakov To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sat4j From rjones at fedoraproject.org Tue Mar 10 13:48:08 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 13:48:08 +0000 (UTC) Subject: rpms/mingw32-cairo/devel .cvsignore, 1.2, 1.3 mingw32-cairo.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <20090310134808.C51157002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-cairo/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8516 Modified Files: .cvsignore mingw32-cairo.spec sources Log Message: - Rebase to 1.8.6, same as Fedora native version. - Source URL corrected. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-cairo/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Jan 2009 11:49:06 -0000 1.2 +++ .cvsignore 10 Mar 2009 13:47:37 -0000 1.3 @@ -1 +1 @@ -cairo-1.8.0.tar.gz +cairo-1.8.6.tar.gz Index: mingw32-cairo.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-cairo/devel/mingw32-cairo.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mingw32-cairo.spec 26 Feb 2009 00:57:28 -0000 1.4 +++ mingw32-cairo.spec 10 Mar 2009 13:47:38 -0000 1.5 @@ -5,13 +5,13 @@ %define __find_provides %{_mingw32_findprovides} Name: mingw32-cairo -Version: 1.8.0 -Release: 9%{?dist} +Version: 1.8.6 +Release: 1%{?dist} Summary: MinGW Windows Cairo library License: LGPLv2 or MPLv1.1 URL: http://cairographics.org -Source0: http://cairographics.org/snapshots/cairo-%{version}.tar.gz +Source0: http://cairographics.org/releases/cairo-%{version}.tar.gz Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -85,6 +85,10 @@ %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 1.8.6-1 +- Rebase to 1.8.6, same as Fedora native version. +- Source URL corrected. + * Wed Feb 25 2009 Fedora Release Engineering - 1.8.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-cairo/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Jan 2009 11:49:06 -0000 1.2 +++ sources 10 Mar 2009 13:47:38 -0000 1.3 @@ -1 +1 @@ -4ea70ea87b47e92d318d4e7f5b940f47 cairo-1.8.0.tar.gz +4e64139ef6f668df24450f3b81dd0771 cairo-1.8.6.tar.gz From hubbitus at fedoraproject.org Tue Mar 10 13:48:54 2009 From: hubbitus at fedoraproject.org (Pavel Alexeev) Date: Tue, 10 Mar 2009 13:48:54 +0000 (UTC) Subject: rpms/php-pecl-imagick/devel php-pecl-imagick.spec,1.3,1.4 Message-ID: <20090310134854.A7BED7002E@cvs1.fedora.phx.redhat.com> Author: hubbitus Update of /cvs/pkgs/rpms/php-pecl-imagick/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8693 Modified Files: php-pecl-imagick.spec Log Message: Rebuild due ImageMagick update and soname bump Index: php-pecl-imagick.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pecl-imagick/devel/php-pecl-imagick.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- php-pecl-imagick.spec 28 Feb 2009 15:48:23 -0000 1.3 +++ php-pecl-imagick.spec 10 Mar 2009 13:48:24 -0000 1.4 @@ -7,7 +7,7 @@ Summary: Provides a wrapper to the ImageMagick library Name: php-pecl-%peclName Version: 2.2.2 -Release: 1%{?dist} +Release: 2%{?dist} License: PHP Group: Development/Libraries Source0: http://pecl.php.net/get/%peclName-%{version}.tgz @@ -79,6 +79,9 @@ %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.d/%peclName.ini %changelog +* Tue Mar 10 2009 Pavel Alexeev - 2.2.2-2 +- Rebuild due ImageMagick update + * Sat Feb 28 2009 Pavel Alexeev - 2.2.2-1 - Step to version 2.2.2 From rjones at fedoraproject.org Tue Mar 10 13:51:03 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 13:51:03 +0000 (UTC) Subject: rpms/mingw32-binutils/devel .cvsignore, 1.4, 1.5 mingw32-binutils.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <20090310135103.2A17D7002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-binutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9510 Modified Files: .cvsignore mingw32-binutils.spec sources Log Message: - Switch to using upstream (GNU) binutils 2.19.1. It's exactly the same as the MinGW version now. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-binutils/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Feb 2009 23:37:16 -0000 1.4 +++ .cvsignore 10 Mar 2009 13:50:31 -0000 1.5 @@ -1 +1 @@ -binutils-2.19.1-mingw32-src.tar.gz +binutils-2.19.1.tar.bz2 Index: mingw32-binutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-binutils/devel/mingw32-binutils.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mingw32-binutils.spec 26 Feb 2009 00:54:39 -0000 1.7 +++ mingw32-binutils.spec 10 Mar 2009 13:50:31 -0000 1.8 @@ -1,16 +1,12 @@ -%define binutils_version 2.19.1 -#%define mingw32_binutils_version 20080109-2 -#%define mingw32_binutils_rpmvers %{expand:%(echo %{mingw32_binutils_version} | tr - _)} - Name: mingw32-binutils -Version: %{binutils_version} -Release: 3%{?dist} +Version: 2.19.1 +Release: 4%{?dist} Summary: MinGW Windows binutils License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ Group: Development/Libraries -URL: http://www.mingw.org/ -Source0: http://dl.sourceforge.net/sourceforge/mingw/binutils-%{binutils_version}-mingw32-src.tar.gz +URL: http://www.gnu.org/software/binutils/ +Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex @@ -28,7 +24,7 @@ %prep -%setup -q -n binutils-%{binutils_version} +%setup -q -n binutils-%{version} %build @@ -74,6 +70,10 @@ %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 2.19.1-4 +- Switch to using upstream (GNU) binutils 2.19.1. It's exactly the + same as the MinGW version now. + * Wed Feb 25 2009 Fedora Release Engineering - 2.19.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-binutils/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Feb 2009 23:37:16 -0000 1.4 +++ sources 10 Mar 2009 13:50:32 -0000 1.5 @@ -1 +1 @@ -ad3f2b5fdcd599a772ad75fec2c384d8 binutils-2.19.1-mingw32-src.tar.gz +09a8c5821a2dfdbb20665bc0bd680791 binutils-2.19.1.tar.bz2 From ertzing at fedoraproject.org Tue Mar 10 14:00:32 2009 From: ertzing at fedoraproject.org (Ralf Ertzinger) Date: Tue, 10 Mar 2009 14:00:32 +0000 (UTC) Subject: rpms/libfwbuilder/F-10 .cvsignore, 1.14, 1.15 libfwbuilder.spec, 1.28, 1.29 sources, 1.14, 1.15 Message-ID: <20090310140032.EB9E27002E@cvs1.fedora.phx.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libfwbuilder/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12657 Modified Files: .cvsignore libfwbuilder.spec sources Log Message: * Tue Mar 10 2009 Ralf Ertzinger 3.0.3-1 - Update to 3.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/F-10/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 5 Sep 2008 21:15:20 -0000 1.14 +++ .cvsignore 10 Mar 2009 14:00:02 -0000 1.15 @@ -1 +1 @@ -libfwbuilder-3.0.0.tar.gz +libfwbuilder-3.0.3.tar.gz Index: libfwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/F-10/libfwbuilder.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- libfwbuilder.spec 6 Sep 2008 14:11:50 -0000 1.28 +++ libfwbuilder.spec 10 Mar 2009 14:00:02 -0000 1.29 @@ -1,7 +1,7 @@ Name: libfwbuilder Summary: Firewall Builder API -Version: 3.0.0 -Release: 2%{?dist} +Version: 3.0.3 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.fwbuilder.org/ @@ -77,6 +77,9 @@ %changelog +* Tue Mar 10 2009 Ralf Ertzinger 3.0.3-1 +- Update to 3.0.3 + * Sat Sep 06 2008 Ralf Ertzinger 3.0.0-1 - Move .so files to -devel subpackage - Use full URL in Source: Index: sources =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/F-10/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 5 Sep 2008 21:15:21 -0000 1.14 +++ sources 10 Mar 2009 14:00:02 -0000 1.15 @@ -1 +1 @@ -993aa8d0838bf7f915ad3dbfcc03d161 libfwbuilder-3.0.0.tar.gz +d404b730efed5f6815716f767c54250b libfwbuilder-3.0.3.tar.gz From rjones at fedoraproject.org Tue Mar 10 14:01:10 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 14:01:10 +0000 (UTC) Subject: rpms/ocaml-lacaml/devel .cvsignore, 1.6, 1.7 ocaml-lacaml.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <20090310140110.ADC6A7002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-lacaml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12864 Modified Files: .cvsignore ocaml-lacaml.spec sources Log Message: - New upstream version 4.7.6. - Name of documentation files has changed slightly. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lacaml/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 20 Nov 2008 16:30:10 -0000 1.6 +++ .cvsignore 10 Mar 2009 14:00:40 -0000 1.7 @@ -1 +1 @@ -lacaml-4.6.8.tar.bz2 +release-4.7.6.tar.bz2 Index: ocaml-lacaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lacaml/devel/ocaml-lacaml.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ocaml-lacaml.spec 26 Feb 2009 07:13:11 -0000 1.8 +++ ocaml-lacaml.spec 10 Mar 2009 14:00:40 -0000 1.9 @@ -2,14 +2,14 @@ %define debug_package %{nil} Name: ocaml-lacaml -Version: 4.6.8 -Release: 3%{?dist} +Version: 4.7.6 +Release: 1%{?dist} Summary: BLAS/LAPACK-interface for OCaml Group: Development/Libraries License: LGPLv2 with exceptions -URL: http://ocaml.info/home/ocaml_sources.html#LACAML -Source0: http://www.ocaml.info/ocaml_sources/lacaml-%{version}.tar.bz2 +URL: http://ocaml.info/home/ocaml_sources.html#lacaml +Source0: http://hg.ocaml.info/release/lacaml/archive/release-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml @@ -43,7 +43,7 @@ %prep -%setup -q -n lacaml-%{version} +%setup -q -n lacaml-release-%{version} %build @@ -86,7 +86,7 @@ %files devel %defattr(-,root,root,-) -%doc COPYRIGHT LICENSE Changes README TODO VERSION +%doc COPYRIGHT LICENSE Changes README.txt TODO %if %opt %{_libdir}/ocaml/lacaml/*.a %{_libdir}/ocaml/lacaml/*.cmxa @@ -97,6 +97,10 @@ %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 4.7.6-1 +- New upstream version 4.7.6. +- Name of documentation files has changed slightly. + * Wed Feb 25 2009 Fedora Release Engineering - 4.6.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lacaml/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Nov 2008 16:30:10 -0000 1.6 +++ sources 10 Mar 2009 14:00:40 -0000 1.7 @@ -1 +1 @@ -8be228c4fc6354fcef0df8dcd5c070e3 lacaml-4.6.8.tar.bz2 +6c68d34e4bd957e098470637fbdf1568 release-4.7.6.tar.bz2 From caolanm at fedoraproject.org Tue Mar 10 14:01:55 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 10 Mar 2009 14:01:55 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch, NONE, 1.1 openoffice.org.spec, 1.1853, 1.1854 Message-ID: <20090310140155.E7D357002E@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13172 Modified Files: openoffice.org.spec Added Files: openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch Log Message: Resolves: rhbz#481012 workaround incorrect branch/type selection or whatever it is openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch: --- NEW FILE openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch --- diff -ru sw.orig/source/filter/ww8/ww8par2.cxx sw/source/filter/ww8/ww8par2.cxx --- openoffice.org.orig/sw/source/filter/ww8/ww8par2.cxx 2009-03-10 12:59:18.000000000 +0000 +++ openoffice.org/sw/source/filter/ww8/ww8par2.cxx 2009-03-10 13:51:17.000000000 +0000 @@ -2509,7 +2509,15 @@ //ability to set the margin. SvxLRSpaceItem aL( RES_LR_SPACE ); // set right to original DxaLeft (i28656) +#if 0 + // Weird type illness aL.SetLeft( !bIsBiDi ? GetMinLeft() : pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth - nOrgDxaLeft); +#else + if (!bIsBiDi) + aL.SetLeft( GetMinLeft() ); + else + aL.SetLeft( pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth - nOrgDxaLeft ); +#endif aItemSet.Put(aL); } } Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1853 retrieving revision 1.1854 diff -u -r1.1853 -r1.1854 --- openoffice.org.spec 6 Mar 2009 14:38:01 -0000 1.1853 +++ openoffice.org.spec 10 Mar 2009 14:01:25 -0000 1.1854 @@ -1,6 +1,6 @@ %define oootag OOO310 %define ooomilestone 4 -%define rh_rpm_release 1 +%define rh_rpm_release 2 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF %define __jar_repack %{nil} @@ -137,6 +137,7 @@ Patch54: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch Patch55: workspace.localization35.patch Patch56: workspace.cl12.patch +Patch57: openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)") %define instdir %{_libdir} @@ -1615,6 +1616,7 @@ %patch54 -p1 -b .oooXXXXX.solenv.allowmissing.patch %patch55 -p0 -b .workspace.localization35.patch %patch56 -p0 -b .workspace.cl12.patch +%patch57 -p1 -b .gccXXXXX.sw.typeillness.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -4135,6 +4137,10 @@ unopkg list --shared > /dev/null 2>&1 || : %changelog +* Tue Mar 10 2009 Caol??n McNamara - 1:3.1.0-4.2 +- Resolves: rhbz#481012 workaround incorrect branch/type selection + or whatever it is with openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch + * Fri Mar 06 2009 Caol??n McNamara - 1:3.1.0-4.1 - report-builder will be broken until rhbz#474391 is resolved - drop integrated workspace.gfbcrash.patch From pkgdb at fedoraproject.org Tue Mar 10 14:02:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 14:02:22 +0000 Subject: [pkgdb] kdeedu had acl change status Message-ID: <20090310140328.32E52208510@bastion.fedora.phx.redhat.com> than has set the watchbugzilla acl on kdeedu (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 14:03:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 14:03:33 +0000 Subject: [pkgdb] kdeedu had acl change status Message-ID: <20090310140330.91472208551@bastion.fedora.phx.redhat.com> than has set the watchcommits acl on kdeedu (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 14:03:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 14:03:14 +0000 Subject: [pkgdb] kdeedu had acl change status Message-ID: <20090310140334.38870208552@bastion.fedora.phx.redhat.com> than has set the commit acl on kdeedu (Fedora 10) to Approved for ltinkl To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 14:03:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 14:03:36 +0000 Subject: [pkgdb] kdeedu had acl change status Message-ID: <20090310140337.0C65E208555@bastion.fedora.phx.redhat.com> than has set the watchbugzilla acl on kdeedu (Fedora 10) to Approved for rdieter To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 14:03:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 14:03:46 +0000 Subject: [pkgdb] kdeedu had acl change status Message-ID: <20090310140343.EB75E20850F@bastion.fedora.phx.redhat.com> than has set the watchcommits acl on kdeedu (Fedora 10) to Approved for rdieter To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From pkgdb at fedoraproject.org Tue Mar 10 14:03:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 14:03:26 +0000 Subject: [pkgdb] kdeedu had acl change status Message-ID: <20090310140346.95075208550@bastion.fedora.phx.redhat.com> than has set the commit acl on kdeedu (Fedora 10) to Approved for rdieter To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu From ivazquez at fedoraproject.org Tue Mar 10 14:03:25 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Tue, 10 Mar 2009 14:03:25 +0000 (UTC) Subject: rpms/django-contact-form/EL-5 .cvsignore, 1.2, 1.3 django-contact-form.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090310140325.9B1637002E@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-contact-form/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13795/EL-5 Modified Files: .cvsignore django-contact-form.spec sources Log Message: Update to a newer release from hg Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Mar 2009 14:03:06 -0000 1.2 +++ .cvsignore 10 Mar 2009 14:02:55 -0000 1.3 @@ -1 +1 @@ -contact_form-0.3.tar.gz +django-contact-form-97559a887345.tar.gz Index: django-contact-form.spec =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/EL-5/django-contact-form.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- django-contact-form.spec 4 Mar 2009 14:03:06 -0000 1.1 +++ django-contact-form.spec 10 Mar 2009 14:02:55 -0000 1.2 @@ -1,14 +1,17 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%define alphatag 97559a887345 + Name: django-contact-form Version: 0.3 -Release: 2%{?dist} +Release: 3%{?dist}.hg%{alphatag} Summary: An extensible contact-form application for Django Group: Development/Languages License: BSD URL: http://bitbucket.org/ubernostrum/django-contact-form/ -Source0: http://django-contact-form.googlecode.com/files/contact_form-%{version}.tar.gz +# http://bitbucket.org/ubernostrum/django-contact-form/get/97559a887345.gz +Source0: %{name}-%{alphatag}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -19,7 +22,7 @@ An extensible contact-form application for Django %prep -%setup -q -n contact_form-%{version} +%setup -q -n %{name} %build %{__python} setup.py build @@ -37,6 +40,9 @@ %{python_sitelib}/* %changelog +* Tue Mar 10 2009 Ignacio Vazquez-Abrams 0.3-3.hg97559a887345 +- Update to a newer release from hg + * Mon Mar 02 2009 Ignacio Vazquez-Abrams 0.3-2 - Add Requires: Django Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Mar 2009 14:03:06 -0000 1.2 +++ sources 10 Mar 2009 14:02:55 -0000 1.3 @@ -1 +1 @@ -4192a2d364814f503dde030985208c37 contact_form-0.3.tar.gz +10032cc7ec21358a4524ea1a69ac82aa django-contact-form-97559a887345.tar.gz From ivazquez at fedoraproject.org Tue Mar 10 14:03:25 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Tue, 10 Mar 2009 14:03:25 +0000 (UTC) Subject: rpms/django-contact-form/F-10 .cvsignore, 1.2, 1.3 django-contact-form.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090310140325.E90D17002E@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-contact-form/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13795/F-10 Modified Files: .cvsignore django-contact-form.spec sources Log Message: Update to a newer release from hg Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Mar 2009 14:00:25 -0000 1.2 +++ .cvsignore 10 Mar 2009 14:02:55 -0000 1.3 @@ -1 +1 @@ -contact_form-0.3.tar.gz +django-contact-form-97559a887345.tar.gz Index: django-contact-form.spec =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/F-10/django-contact-form.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- django-contact-form.spec 4 Mar 2009 14:00:25 -0000 1.1 +++ django-contact-form.spec 10 Mar 2009 14:02:55 -0000 1.2 @@ -1,14 +1,17 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%define alphatag 97559a887345 + Name: django-contact-form Version: 0.3 -Release: 2%{?dist} +Release: 3%{?dist}.hg%{alphatag} Summary: An extensible contact-form application for Django Group: Development/Languages License: BSD URL: http://bitbucket.org/ubernostrum/django-contact-form/ -Source0: http://django-contact-form.googlecode.com/files/contact_form-%{version}.tar.gz +# http://bitbucket.org/ubernostrum/django-contact-form/get/97559a887345.gz +Source0: %{name}-%{alphatag}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -19,7 +22,7 @@ An extensible contact-form application for Django %prep -%setup -q -n contact_form-%{version} +%setup -q -n %{name} %build %{__python} setup.py build @@ -37,6 +40,9 @@ %{python_sitelib}/* %changelog +* Tue Mar 10 2009 Ignacio Vazquez-Abrams 0.3-3.hg97559a887345 +- Update to a newer release from hg + * Mon Mar 02 2009 Ignacio Vazquez-Abrams 0.3-2 - Add Requires: Django Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Mar 2009 14:00:25 -0000 1.2 +++ sources 10 Mar 2009 14:02:55 -0000 1.3 @@ -1 +1 @@ -4192a2d364814f503dde030985208c37 contact_form-0.3.tar.gz +10032cc7ec21358a4524ea1a69ac82aa django-contact-form-97559a887345.tar.gz From ivazquez at fedoraproject.org Tue Mar 10 14:03:27 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Tue, 10 Mar 2009 14:03:27 +0000 (UTC) Subject: rpms/django-contact-form/devel .cvsignore, 1.2, 1.3 django-contact-form.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090310140327.197C37002E@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-contact-form/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13795/devel Modified Files: .cvsignore django-contact-form.spec sources Log Message: Update to a newer release from hg Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Mar 2009 13:31:21 -0000 1.2 +++ .cvsignore 10 Mar 2009 14:02:56 -0000 1.3 @@ -1 +1 @@ -contact_form-0.3.tar.gz +django-contact-form-97559a887345.tar.gz Index: django-contact-form.spec =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/devel/django-contact-form.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- django-contact-form.spec 4 Mar 2009 13:52:06 -0000 1.2 +++ django-contact-form.spec 10 Mar 2009 14:02:56 -0000 1.3 @@ -1,14 +1,17 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%define alphatag 97559a887345 + Name: django-contact-form Version: 0.3 -Release: 2%{?dist} +Release: 3%{?dist}.hg%{alphatag} Summary: An extensible contact-form application for Django Group: Development/Languages License: BSD URL: http://bitbucket.org/ubernostrum/django-contact-form/ -Source0: http://django-contact-form.googlecode.com/files/contact_form-%{version}.tar.gz +# http://bitbucket.org/ubernostrum/django-contact-form/get/97559a887345.gz +Source0: %{name}-%{alphatag}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -19,7 +22,7 @@ An extensible contact-form application for Django %prep -%setup -q -n contact_form-%{version} +%setup -q -n %{name} %build %{__python} setup.py build @@ -37,6 +40,9 @@ %{python_sitelib}/* %changelog +* Tue Mar 10 2009 Ignacio Vazquez-Abrams 0.3-3.hg97559a887345 +- Update to a newer release from hg + * Mon Mar 02 2009 Ignacio Vazquez-Abrams 0.3-2 - Add Requires: Django Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Mar 2009 13:31:21 -0000 1.2 +++ sources 10 Mar 2009 14:02:56 -0000 1.3 @@ -1 +1 @@ -4192a2d364814f503dde030985208c37 contact_form-0.3.tar.gz +10032cc7ec21358a4524ea1a69ac82aa django-contact-form-97559a887345.tar.gz From ivazquez at fedoraproject.org Tue Mar 10 14:03:26 2009 From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams) Date: Tue, 10 Mar 2009 14:03:26 +0000 (UTC) Subject: rpms/django-contact-form/F-9 .cvsignore, 1.2, 1.3 django-contact-form.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090310140326.B63367002E@cvs1.fedora.phx.redhat.com> Author: ivazquez Update of /cvs/pkgs/rpms/django-contact-form/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13795/F-9 Modified Files: .cvsignore django-contact-form.spec sources Log Message: Update to a newer release from hg Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Mar 2009 14:01:45 -0000 1.2 +++ .cvsignore 10 Mar 2009 14:02:55 -0000 1.3 @@ -1 +1 @@ -contact_form-0.3.tar.gz +django-contact-form-97559a887345.tar.gz Index: django-contact-form.spec =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/F-9/django-contact-form.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- django-contact-form.spec 4 Mar 2009 14:01:45 -0000 1.1 +++ django-contact-form.spec 10 Mar 2009 14:02:56 -0000 1.2 @@ -1,14 +1,17 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%define alphatag 97559a887345 + Name: django-contact-form Version: 0.3 -Release: 2%{?dist} +Release: 3%{?dist}.hg%{alphatag} Summary: An extensible contact-form application for Django Group: Development/Languages License: BSD URL: http://bitbucket.org/ubernostrum/django-contact-form/ -Source0: http://django-contact-form.googlecode.com/files/contact_form-%{version}.tar.gz +# http://bitbucket.org/ubernostrum/django-contact-form/get/97559a887345.gz +Source0: %{name}-%{alphatag}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -19,7 +22,7 @@ An extensible contact-form application for Django %prep -%setup -q -n contact_form-%{version} +%setup -q -n %{name} %build %{__python} setup.py build @@ -37,6 +40,9 @@ %{python_sitelib}/* %changelog +* Tue Mar 10 2009 Ignacio Vazquez-Abrams 0.3-3.hg97559a887345 +- Update to a newer release from hg + * Mon Mar 02 2009 Ignacio Vazquez-Abrams 0.3-2 - Add Requires: Django Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/django-contact-form/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Mar 2009 14:01:45 -0000 1.2 +++ sources 10 Mar 2009 14:02:56 -0000 1.3 @@ -1 +1 @@ -4192a2d364814f503dde030985208c37 contact_form-0.3.tar.gz +10032cc7ec21358a4524ea1a69ac82aa django-contact-form-97559a887345.tar.gz From rjones at fedoraproject.org Tue Mar 10 14:07:12 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 14:07:12 +0000 (UTC) Subject: rpms/ocaml-postgresql/devel .cvsignore, 1.4, 1.5 ocaml-postgresql.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <20090310140712.13D407002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-postgresql/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15069 Modified Files: .cvsignore ocaml-postgresql.spec sources Log Message: - New upstream version 1.10.3. - Fix URL. - Upstream Source URLs have all changed. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Nov 2008 16:55:30 -0000 1.4 +++ .cvsignore 10 Mar 2009 14:06:41 -0000 1.5 @@ -1 +1 @@ -postgresql-ocaml-1.9.2.tar.bz2 +release-1.10.3.tar.bz2 Index: ocaml-postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/ocaml-postgresql.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ocaml-postgresql.spec 9 Mar 2009 15:30:44 -0000 1.12 +++ ocaml-postgresql.spec 10 Mar 2009 14:06:41 -0000 1.13 @@ -2,14 +2,14 @@ %define debug_package %{nil} Name: ocaml-postgresql -Version: 1.9.2 -Release: 6%{?dist} +Version: 1.10.3 +Release: 1%{?dist} Summary: OCaml library for accessing PostgreSQL databases Group: Development/Libraries License: LGPLv2+ with exceptions -URL: http://www.ocaml.info/home/ocaml_sources.html#toc14 -Source0: http://www.ocaml.info/ocaml_sources/postgresql-ocaml-%{version}.tar.bz2 +URL: http://www.ocaml.info/home/ocaml_sources.html#postgresql-ocaml +Source0: http://hg.ocaml.info/release/postgresql-ocaml/archive/release-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 @@ -44,7 +44,7 @@ %prep -%setup -q -n postgresql-ocaml-%{version} +%setup -q -n postgresql-ocaml-release-%{version} %build @@ -82,7 +82,7 @@ %files devel %defattr(-,root,root,-) -%doc LICENSE AUTHORS Changes README examples +%doc LICENSE AUTHORS Changes README.txt examples %if %opt %{_libdir}/ocaml/postgresql/*.a %{_libdir}/ocaml/postgresql/*.cmxa @@ -91,6 +91,11 @@ %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 1.10.3-1 +- New upstream version 1.10.3. +- Fix URL. +- Upstream Source URLs have all changed. + * Mon Mar 9 2009 Richard W.M. Jones - 1.9.2-6 - Fix typo in summary (rhbz#487632). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Nov 2008 16:55:30 -0000 1.4 +++ sources 10 Mar 2009 14:06:41 -0000 1.5 @@ -1 +1 @@ -867f36477b5ea7534ec4773356133314 postgresql-ocaml-1.9.2.tar.bz2 +ebac79d610e5be1cfb39b69be2865e5d release-1.10.3.tar.bz2 From rjones at fedoraproject.org Tue Mar 10 14:12:48 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 14:12:48 +0000 (UTC) Subject: rpms/ocaml-res/devel .cvsignore, 1.4, 1.5 ocaml-res.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <20090310141248.EF7577002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-res/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16449 Modified Files: .cvsignore ocaml-res.spec sources Log Message: - New upstream version 3.1.1. - Fix URL. - Fix Source URL. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-res/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Nov 2008 17:02:27 -0000 1.4 +++ .cvsignore 10 Mar 2009 14:12:17 -0000 1.5 @@ -1 +1 @@ -res-3.0.0.tar.bz2 +release-3.1.1.tar.bz2 Index: ocaml-res.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-res/devel/ocaml-res.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ocaml-res.spec 26 Feb 2009 07:32:15 -0000 1.5 +++ ocaml-res.spec 10 Mar 2009 14:12:17 -0000 1.6 @@ -2,14 +2,14 @@ %define debug_package %{nil} Name: ocaml-res -Version: 3.0.0 -Release: 3%{?dist} +Version: 3.1.1 +Release: 1%{?dist} Summary: OCaml library for resizing arrays and strings Group: Development/Libraries License: LGPLv2+ with exceptions -URL: http://www.ocaml.info/home/ocaml_sources.html#RES -Source0: http://www.ocaml.info/ocaml_sources/res-%{version}.tar.bz2 +URL: http://www.ocaml.info/home/ocaml_sources.html#res +Source0: http://hg.ocaml.info/release/res/archive/release-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 @@ -46,7 +46,7 @@ %prep -%setup -q -n res-%{version} +%setup -q -n res-release-%{version} %build @@ -80,7 +80,7 @@ %files devel %defattr(-,root,root,-) -%doc LICENSE README Changes TODO +%doc LICENSE README.txt Changes TODO %doc lib/doc/res/html %doc lib/doc/res/latex/*.dvi lib/doc/res/latex/*.ps lib/doc/res/latex/*.pdf %if %opt @@ -91,6 +91,11 @@ %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 3.1.1-1 +- New upstream version 3.1.1. +- Fix URL. +- Fix Source URL. + * Wed Feb 25 2009 Fedora Release Engineering - 3.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-res/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Nov 2008 17:02:27 -0000 1.4 +++ sources 10 Mar 2009 14:12:17 -0000 1.5 @@ -1 +1 @@ -4ec2c457b9f51f59ea08eb3646996edf res-3.0.0.tar.bz2 +2be2152f0d16e4bb88cdb67a1d46dd21 release-3.1.1.tar.bz2 From ricky at fedoraproject.org Tue Mar 10 14:17:55 2009 From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=) Date: Tue, 10 Mar 2009 14:17:55 +0000 (UTC) Subject: rpms/python-webob/devel .cvsignore, 1.5, 1.6 python-webob.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <20090310141755.A19057002E@cvs1.fedora.phx.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-webob/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17766 Modified Files: .cvsignore python-webob.spec sources Log Message: Upstream released new version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-webob/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Jan 2009 05:48:57 -0000 1.5 +++ .cvsignore 10 Mar 2009 14:17:24 -0000 1.6 @@ -1 +1 @@ -WebOb-0.9.5.tar.gz +WebOb-0.9.6.1.tar.gz Index: python-webob.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-webob/devel/python-webob.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-webob.spec 27 Feb 2009 00:11:59 -0000 1.9 +++ python-webob.spec 10 Mar 2009 14:17:24 -0000 1.10 @@ -2,8 +2,8 @@ Name: python-webob Summary: WSGI request and response object -Version: 0.9.5 -Release: 2%{?dist} +Version: 0.9.6.1 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://pythonpaste.org/webob/ @@ -30,6 +30,9 @@ %{__rm} -f tests/test_request.py # Disable conftest, which assumes that WebOb is already installed %{__rm} -f tests/conftest.py +# Disable performance_test, which requires repoze.profile, which isn't +# in Fedora. +%{__rm} -f tests/performance_test.py %build @@ -56,6 +59,9 @@ %{python_sitelib}/WebOb*.egg-info/ %changelog +* Tue Mar 10 2009 Ricky Zhou - 0.9.6.1-1 +- Upstream released new version. + * Thu Feb 26 2009 Fedora Release Engineering - 0.9.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-webob/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Jan 2009 05:48:58 -0000 1.5 +++ sources 10 Mar 2009 14:17:25 -0000 1.6 @@ -1 +1 @@ -d72ab688057fbdd99dc24f568e5b5630 WebOb-0.9.5.tar.gz +5702ac9c9bfc39e6f04a39e15bd7b435 WebOb-0.9.6.1.tar.gz From rjones at fedoraproject.org Tue Mar 10 14:18:45 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 14:18:45 +0000 (UTC) Subject: rpms/ocaml-type-conv/devel .cvsignore, 1.6, 1.7 ocaml-type-conv.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <20090310141845.3E7EA7002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-type-conv/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18084 Modified Files: .cvsignore ocaml-type-conv.spec sources Log Message: - New upstream version 1.6.7. - Fixed source URL. - VERSION file no longer exists in upstream tarball. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-type-conv/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 20 Nov 2008 16:58:53 -0000 1.6 +++ .cvsignore 10 Mar 2009 14:18:14 -0000 1.7 @@ -1 +1 @@ -type-conv-1.6.4.tar.bz2 +release-1.6.7.tar.bz2 Index: ocaml-type-conv.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-type-conv/devel/ocaml-type-conv.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ocaml-type-conv.spec 26 Feb 2009 07:36:11 -0000 1.10 +++ ocaml-type-conv.spec 10 Mar 2009 14:18:14 -0000 1.11 @@ -2,14 +2,14 @@ %define debug_package %{nil} Name: ocaml-type-conv -Version: 1.6.4 -Release: 4%{?dist} +Version: 1.6.7 +Release: 1%{?dist} Summary: OCaml base library for type conversion Group: Development/Libraries License: LGPLv2+ with exceptions and BSD URL: http://www.ocaml.info/home/ocaml_sources.html#type-conv -Source0: http://www.ocaml.info/ocaml_sources/type-conv-%{version}.tar.bz2 +Source0: http://hg.ocaml.info/release/type-conv/archive/release-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 @@ -31,7 +31,7 @@ %prep -%setup -q -n type-conv-%{version} +%setup -q -n type-conv-release-%{version} dos2unix LICENSE.Tywith @@ -53,11 +53,16 @@ %files %defattr(-,root,root,-) -%doc LICENSE LICENSE.Tywith CHANGES COPYRIGHT README.txt VERSION +%doc LICENSE LICENSE.Tywith CHANGES COPYRIGHT README.txt %{_libdir}/ocaml/type-conv %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 1.6.7-1 +- New upstream version 1.6.7. +- Fixed source URL. +- VERSION file no longer exists in upstream tarball. + * Wed Feb 25 2009 Fedora Release Engineering - 1.6.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-type-conv/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Nov 2008 16:58:53 -0000 1.6 +++ sources 10 Mar 2009 14:18:14 -0000 1.7 @@ -1 +1 @@ -dd85ccfbd41ec5a61501a4fdd2acadc9 type-conv-1.6.4.tar.bz2 +2e62bb45147041d73f17a8b214afec1c release-1.6.7.tar.bz2 From rjones at fedoraproject.org Tue Mar 10 14:19:14 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 14:19:14 +0000 (UTC) Subject: rpms/ocaml-sexplib/devel .cvsignore, 1.4, 1.5 ocaml-sexplib.spec, 1.5, 1.6 sources, 1.4, 1.5 sexplib-4.0.1-unix-fix.patch, 1.1, NONE Message-ID: <20090310141914.AC3D97002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-sexplib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18315 Modified Files: .cvsignore ocaml-sexplib.spec sources Removed Files: sexplib-4.0.1-unix-fix.patch Log Message: - New upstream version 4.2.7. - Fixed source URL. - Removed the patch as it is now upstream. - Fixed the doc line. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sexplib/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Nov 2008 17:08:55 -0000 1.4 +++ .cvsignore 10 Mar 2009 14:18:44 -0000 1.5 @@ -1 +1 @@ -sexplib310-4.2.1.tar.bz2 +release-4.2.7.tar.bz2 Index: ocaml-sexplib.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sexplib/devel/ocaml-sexplib.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ocaml-sexplib.spec 26 Feb 2009 07:33:14 -0000 1.5 +++ ocaml-sexplib.spec 10 Mar 2009 14:18:44 -0000 1.6 @@ -2,18 +2,16 @@ %define debug_package %{nil} Name: ocaml-sexplib -Version: 4.2.1 -Release: 3%{?dist} +Version: 4.2.7 +Release: 1%{?dist} Summary: OCaml library for converting OCaml values to S-expressions Group: Development/Libraries License: LGPLv2+ with exceptions and BSD URL: http://www.ocaml.info/home/ocaml_sources.html#sexplib310 -Source0: http://www.ocaml.info/ocaml_sources/sexplib310-%{version}.tar.bz2 +Source0: http://hg.ocaml.info/release/sexplib310/archive/release-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: sexplib-4.0.1-unix-fix.patch - BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc @@ -52,8 +50,7 @@ %prep -%setup -q -n sexplib310-%{version} -%patch0 -p1 +%setup -q -n sexplib310-release-%{version} dos2unix LICENSE.Tywith @@ -92,7 +89,7 @@ %files devel %defattr(-,root,root,-) -%doc LICENSE LICENSE.Tywith CHANGES COPYRIGHT README.txt VERSION +%doc LICENSE LICENSE.Tywith Changelog COPYRIGHT README.txt %if %opt %{_libdir}/ocaml/sexplib/*.a %{_libdir}/ocaml/sexplib/*.cmxa @@ -102,6 +99,12 @@ %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 4.2.7-1 +- New upstream version 4.2.7. +- Fixed source URL. +- Removed the patch as it is now upstream. +- Fixed the doc line. + * Wed Feb 25 2009 Fedora Release Engineering - 4.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sexplib/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Nov 2008 17:08:56 -0000 1.4 +++ sources 10 Mar 2009 14:18:44 -0000 1.5 @@ -1 +1 @@ -8fc4ef756a3706993346348efe3f494f sexplib310-4.2.1.tar.bz2 +de6f0e46b5e85084f8f1da9c20c49085 release-4.2.7.tar.bz2 --- sexplib-4.0.1-unix-fix.patch DELETED --- From ricky at fedoraproject.org Tue Mar 10 14:21:40 2009 From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=) Date: Tue, 10 Mar 2009 14:21:40 +0000 (UTC) Subject: rpms/python-webob/F-10 .cvsignore, 1.4, 1.5 python-webob.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <20090310142140.825B37002E@cvs1.fedora.phx.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-webob/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18985 Modified Files: .cvsignore python-webob.spec sources Log Message: Upstream released new version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-webob/F-10/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Dec 2008 17:55:01 -0000 1.4 +++ .cvsignore 10 Mar 2009 14:21:09 -0000 1.5 @@ -1 +1 @@ -WebOb-0.9.4.tar.gz +WebOb-0.9.6.1.tar.gz Index: python-webob.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-webob/F-10/python-webob.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-webob.spec 6 Dec 2008 18:00:22 -0000 1.6 +++ python-webob.spec 10 Mar 2009 14:21:09 -0000 1.7 @@ -2,7 +2,7 @@ Name: python-webob Summary: WSGI request and response object -Version: 0.9.4 +Version: 0.9.6.1 Release: 1%{?dist} License: MIT Group: System Environment/Libraries @@ -30,6 +30,9 @@ %{__rm} -f tests/test_request.py # Disable conftest, which assumes that WebOb is already installed %{__rm} -f tests/conftest.py +# Disable performance_test, which requires repoze.profile, which isn't +# in Fedora. +%{__rm} -f tests/performance_test.py %build @@ -56,6 +59,9 @@ %{python_sitelib}/WebOb*.egg-info/ %changelog +* Tue Mar 10 2009 Ricky Zhou - 0.9.6.1-1 +- Upstream released new version. + * Sat Dec 06 2008 Ricky Zhou 0.9.4-1 - Upstream released new version. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-webob/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Dec 2008 17:55:01 -0000 1.4 +++ sources 10 Mar 2009 14:21:10 -0000 1.5 @@ -1 +1 @@ -95b6bb266470f04ca670a17ed7b05cfe WebOb-0.9.4.tar.gz +5702ac9c9bfc39e6f04a39e15bd7b435 WebOb-0.9.6.1.tar.gz From rjones at fedoraproject.org Tue Mar 10 14:23:20 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 14:23:20 +0000 (UTC) Subject: rpms/ocaml-xmlrpc-light/devel .cvsignore, 1.2, 1.3 ocaml-xmlrpc-light.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <20090310142320.4ACC47002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-xmlrpc-light/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19413 Modified Files: .cvsignore ocaml-xmlrpc-light.spec sources Log Message: - New upstream version 0.6.1. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-xmlrpc-light/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Mar 2008 18:21:32 -0000 1.2 +++ .cvsignore 10 Mar 2009 14:22:49 -0000 1.3 @@ -1 +1 @@ -xmlrpc-light-0.6.tar.gz +xmlrpc-light-0.6.1.tar.gz Index: ocaml-xmlrpc-light.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-xmlrpc-light/devel/ocaml-xmlrpc-light.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ocaml-xmlrpc-light.spec 26 Feb 2009 07:39:03 -0000 1.5 +++ ocaml-xmlrpc-light.spec 10 Mar 2009 14:22:49 -0000 1.6 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-xmlrpc-light -Version: 0.6 -Release: 6%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: OCaml library for writing XML-RPC clients and servers Group: Development/Libraries @@ -83,6 +83,9 @@ %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 0.6.1-1 +- New upstream version 0.6.1. + * Wed Feb 25 2009 Fedora Release Engineering - 0.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-xmlrpc-light/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Mar 2008 18:21:32 -0000 1.2 +++ sources 10 Mar 2009 14:22:49 -0000 1.3 @@ -1 +1 @@ -ebfef786bc39c38f4a36f4404d9a7d16 xmlrpc-light-0.6.tar.gz +9b3b9a36442236fdddb15faeaed86339 xmlrpc-light-0.6.1.tar.gz From ricky at fedoraproject.org Tue Mar 10 14:25:18 2009 From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=) Date: Tue, 10 Mar 2009 14:25:18 +0000 (UTC) Subject: rpms/python-webob/F-9 .cvsignore, 1.4, 1.5 python-webob.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <20090310142518.9FEFE7002E@cvs1.fedora.phx.redhat.com> Author: ricky Update of /cvs/pkgs/rpms/python-webob/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20006 Modified Files: .cvsignore python-webob.spec sources Log Message: Upstream released new version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-webob/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Dec 2008 18:04:07 -0000 1.4 +++ .cvsignore 10 Mar 2009 14:24:48 -0000 1.5 @@ -1 +1 @@ -WebOb-0.9.4.tar.gz +WebOb-0.9.6.1.tar.gz Index: python-webob.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-webob/F-9/python-webob.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-webob.spec 6 Dec 2008 18:04:07 -0000 1.5 +++ python-webob.spec 10 Mar 2009 14:24:48 -0000 1.6 @@ -2,7 +2,7 @@ Name: python-webob Summary: WSGI request and response object -Version: 0.9.4 +Version: 0.9.6.1 Release: 1%{?dist} License: MIT Group: System Environment/Libraries @@ -30,6 +30,9 @@ %{__rm} -f tests/test_request.py # Disable conftest, which assumes that WebOb is already installed %{__rm} -f tests/conftest.py +# Disable performance_test, which requires repoze.profile, which isn't +# in Fedora. +%{__rm} -f tests/performance_test.py %build @@ -56,6 +59,9 @@ %{python_sitelib}/WebOb*.egg-info/ %changelog +* Tue Mar 10 2009 Ricky Zhou - 0.9.6.1-1 +- Upstream released new version. + * Sat Dec 06 2008 Ricky Zhou 0.9.4-1 - Upstream released new version. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-webob/F-9/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Dec 2008 18:04:07 -0000 1.4 +++ sources 10 Mar 2009 14:24:48 -0000 1.5 @@ -1 +1 @@ -95b6bb266470f04ca670a17ed7b05cfe WebOb-0.9.4.tar.gz +5702ac9c9bfc39e6f04a39e15bd7b435 WebOb-0.9.6.1.tar.gz From ovasik at fedoraproject.org Tue Mar 10 14:31:04 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Tue, 10 Mar 2009 14:31:04 +0000 (UTC) Subject: rpms/taskjuggler/F-10 taskjuggler.spec,1.24,1.25 Message-ID: <20090310143104.90C617002E@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/taskjuggler/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21985 Modified Files: taskjuggler.spec Log Message: Remove obsoletes, use Requires (#489496), remove trailing spaces in spec Index: taskjuggler.spec =================================================================== RCS file: /cvs/extras/rpms/taskjuggler/F-10/taskjuggler.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- taskjuggler.spec 9 Mar 2009 15:36:29 -0000 1.24 +++ taskjuggler.spec 10 Mar 2009 14:30:33 -0000 1.25 @@ -1,6 +1,6 @@ Name: taskjuggler Version: 2.4.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Project management tool Group: Applications/Productivity @@ -22,30 +22,30 @@ Requires(postun): desktop-file-utils %description -TaskJuggler is a modern and powerful project management tool. Its new approach -to project planning and tracking is far superior to the commonly used Gantt -chart editing tools. It has already been successfully used in many projects -and scales easily to projects with hundreds of resources and thousands of -tasks. It covers the complete spectrum of project management tasks from the -first idea to the completion of the project. It assists you during project -scoping, resource assignment, cost and revenue planning, and risk and +TaskJuggler is a modern and powerful project management tool. Its new approach +to project planning and tracking is far superior to the commonly used Gantt +chart editing tools. It has already been successfully used in many projects +and scales easily to projects with hundreds of resources and thousands of +tasks. It covers the complete spectrum of project management tasks from the +first idea to the completion of the project. It assists you during project +scoping, resource assignment, cost and revenue planning, and risk and communication management. %package libs Summary: Libraries for %{name} Group: System Environment/Libraries -Obsoletes: %{name} < %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description libs Libraries for TaskJuggler package. %prep -%setup -q +%setup -q %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %configure --with-qt-includes=%{_libdir}/qt-3.3/include --with-qt-libraries=%{_libdir}/qt-3.3/lib --with-kde-support=yes --disable-rpath -# doc build fails with -j4 +# doc build fails with -j4 make @@ -111,6 +111,10 @@ %{_libdir}/libtaskjuggler* %changelog +* Tue Mar 10 2009 Ondrej Vasik - 2.4.1-5 +- Remove obsoletes, use Requires (#489496) +- remove trailing spaces in spec + * Mon Mar 9 2009 Ondrej Vasik - 2.4.1-4 - rebuilt with ICal support again (#488347, #467136) From jakub at fedoraproject.org Tue Mar 10 14:46:56 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Tue, 10 Mar 2009 14:46:56 +0000 (UTC) Subject: rpms/prelink/devel .cvsignore, 1.34, 1.35 prelink.spec, 1.51, 1.52 sources, 1.37, 1.38 Message-ID: <20090310144656.1EC527002E@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/prelink/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25704 Modified Files: .cvsignore prelink.spec sources Log Message: 0.4.0-6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/prelink/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 9 Oct 2007 15:43:39 -0000 1.34 +++ .cvsignore 10 Mar 2009 14:46:24 -0000 1.35 @@ -1 +1 @@ -prelink-20071009.tar.bz2 +prelink-20090310.tar.bz2 Index: prelink.spec =================================================================== RCS file: /cvs/pkgs/rpms/prelink/devel/prelink.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- prelink.spec 27 Feb 2009 02:10:45 -0000 1.51 +++ prelink.spec 10 Mar 2009 14:46:25 -0000 1.52 @@ -1,10 +1,10 @@ Summary: An ELF prelinking utility Name: prelink Version: 0.4.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Base -%define date 20071009 +%define date 20090310 Source: ftp://people.redhat.com/jakub/prelink/prelink-%{date}.tar.bz2 Source2: prelink.conf Source3: prelink.cron @@ -13,6 +13,7 @@ #BuildRequires: libelf-devel >= 0.7.0-5 BuildRequires: elfutils-libelf-devel-static BuildRequires: libselinux-static +BuildRequires: glibc-static Requires: glibc >= 2.2.4-18, coreutils, findutils Requires: util-linux, gawk, grep # For now @@ -83,6 +84,11 @@ %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log %changelog +* Tue Mar 10 2009 Jakub Jelinek 0.4.0-6 +- BuildRequire glibc-static +- rebuilt with gcc 4.4 +- sparc64 and ARM TLS support + * Thu Feb 26 2009 Fedora Release Engineering - 0.4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/prelink/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 9 Oct 2007 17:03:14 -0000 1.37 +++ sources 10 Mar 2009 14:46:25 -0000 1.38 @@ -1 +1 @@ -8fd5f77c9f9b21f0c39abd10fbb0c36f prelink-20071009.tar.bz2 +1170d56ba5b03cdf557ee8515667f6ca prelink-20090310.tar.bz2 From ovasik at fedoraproject.org Tue Mar 10 14:52:20 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Tue, 10 Mar 2009 14:52:20 +0000 (UTC) Subject: rpms/taskjuggler/devel taskjuggler.spec,1.30,1.31 Message-ID: <20090310145220.52F6F7002E@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/taskjuggler/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27136 Modified Files: taskjuggler.spec Log Message: Remove obsoletes, use Requires (#489496) Index: taskjuggler.spec =================================================================== RCS file: /cvs/extras/rpms/taskjuggler/devel/taskjuggler.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- taskjuggler.spec 9 Mar 2009 14:17:41 -0000 1.30 +++ taskjuggler.spec 10 Mar 2009 14:51:49 -0000 1.31 @@ -1,6 +1,6 @@ Name: taskjuggler Version: 2.4.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Project management tool Group: Applications/Productivity @@ -35,7 +35,7 @@ %package libs Summary: Libraries for %{name} Group: System Environment/Libraries -Obsoletes: %{name} < %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description libs Libraries for TaskJuggler package. @@ -115,6 +115,9 @@ %{_libdir}/libtaskjuggler* %changelog +* Tue Mar 10 2009 Ondrej Vasik - 2.4.1-8 +- Remove obsoletes, use Requires (#489496) + * Mon Mar 09 2009 Ondrej Vasik - 2.4.1-7 - build with ICal support again (#488347, #467136) @@ -126,7 +129,7 @@ * Thu Dec 04 2008 Ondrej Vasik - 2.4.1-4 - install taskjuggler documentation in docdir and do own - that dir (#47600) , removed trailing spaces in spec file + that dir (#474600) , removed trailing spaces in spec file * Mon Jun 9 2008 Kevin Kofler - 2.4.1-3 - disable kdepim support on F10+, kdepim 3 no longer available From orion at fedoraproject.org Tue Mar 10 14:52:48 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Tue, 10 Mar 2009 14:52:48 +0000 (UTC) Subject: rpms/ncl/devel .cvsignore, 1.2, 1.3 ncl.spec, 1.13, 1.14 sources, 1.2, 1.3 Message-ID: <20090310145248.AB30B7002E@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/ncl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27279 Modified Files: .cvsignore ncl.spec sources Log Message: * Thu Mar 5 2009 - Orion Poplawski - 5.1.0-1 - Update to 5.1.0 - Rebase ppc64, netcdff patch - Drop triangle, flex, hdf, png, wrapit, uint32 patch upstreamed Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ncl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Feb 2008 22:11:41 -0000 1.2 +++ .cvsignore 10 Mar 2009 14:52:17 -0000 1.3 @@ -1 +1 @@ -ncl_ncarg_src-5.0.0.tar.gz +ncl_ncarg_src-5.1.0.tar.gz Index: ncl.spec =================================================================== RCS file: /cvs/pkgs/rpms/ncl/devel/ncl.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ncl.spec 24 Feb 2009 22:55:22 -0000 1.13 +++ ncl.spec 10 Mar 2009 14:52:18 -0000 1.14 @@ -1,13 +1,13 @@ Name: ncl -Version: 5.0.0 -Release: 19%{?dist} +Version: 5.1.0 +Release: 1%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering License: BSD URL: http://www.ncl.ucar.edu # You must register for a free account at http://www.earthsystemgrid.org/ before being able to download the source. -Source0: http://datanode.ucar.edu/data/xserve/ncl/5.0.0/binaries/source/ncl_ncarg_src-5.0.0.tar.gz +Source0: ncl_ncarg_src-%{version}.tar.gz Source1: Site.local.ncl Source2: ncarg.csh Source3: ncarg.sh @@ -28,12 +28,8 @@ # Project, in NGENV_DESCRIPT. Patch0: ncl-5.0.0-paths.patch Patch1: ncarg-4.4.1-deps.patch -Patch2: ncarg-4.4.2-ppc64.patch -Patch4: ncl-5.0.0-triangle.patch -Patch5: ncl-5.0.0-flex.patch -Patch6: ncl-5.0.0-hdf.patch +Patch2: ncl-5.1.0-ppc64.patch Patch7: ncl-5.0.0-atlas.patch -Patch8: ncl-5.0.0-png.patch Patch9: ncl-5.0.0-wrapit.patch # don't have the installation target depends on the build target since # for library it implies running ranlib and modifying the library timestamp @@ -41,9 +37,8 @@ # put install and build rules before script rules such that the default rule # is all Patch11: ncl-5.0.0-build_n_scripts.patch -Patch12: ncl-5.0.0-netcdff.patch -Patch13: ncl-5.0.0-includes.patch -Patch14: ncl-5.0.0-uint32.patch +Patch12: ncl-5.1.0-netcdff.patch +Patch13: ncl-5.1.0-includes.patch # Use /etc/udunits.dat Patch15: ncl-5.0.0-udunits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -118,23 +113,13 @@ %patch0 -p1 -b .paths %patch1 -p1 -b .deps %patch2 -p1 -b .ppc64 -%patch4 -p1 -b .triangle -%patch5 -p1 -b .flex -%patch6 -p1 -b .hdf %patch7 -p1 -b .atlas -%patch8 -p1 -b .png -%patch9 -p1 -b .wrapit %patch10 -p1 -b .no_install_dep %patch11 -p1 -b .build_n_scripts %patch12 -p1 -b .netcdff %patch13 -p1 -b .includes -%patch14 -p1 -b .uint32 %patch15 -p1 -b .udunits -#Move wrapit.c to wrapit77.c to avoid flex make rule issues -#This works in combination with the wrapit patch -mv ni/src/mkwrap/wrapit.c ni/src/mkwrap/wrapit77.c - #Use ppc config if needed %ifarch ppc ppc64 cp config/LINUX.ppc32.GNU config/LINUX @@ -295,7 +280,6 @@ %{_libdir}/ncarg/libncarg_ras.a %{_libdir}/ncarg/libncl.a %{_libdir}/ncarg/libnclapi.a -%{_libdir}/ncarg/libnio.a %{_libdir}/ncarg/libngmath.a %{_libdir}/ncarg/libnfp.a %{_libdir}/ncarg/libnfpfort.a @@ -316,6 +300,11 @@ %changelog +* Thu Mar 5 2009 - Orion Poplawski - 5.1.0-1 +- Update to 5.1.0 +- Rebase ppc64, netcdff patch +- Drop triangle, flex, hdf, png, wrapit, uint32 patch upstreamed + * Tue Feb 24 2009 - Orion Poplawski - 5.0.0-19 - Rebuild for gcc 4.4.0 and other changes - Move data files into noarch sub-package Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ncl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Feb 2008 22:11:41 -0000 1.2 +++ sources 10 Mar 2009 14:52:18 -0000 1.3 @@ -1 +1 @@ -3a1bfbab90ebce230c1f494949534f8a ncl_ncarg_src-5.0.0.tar.gz +6fbc5e0e378dff1caaf1bf6a9c76ea5e ncl_ncarg_src-5.1.0.tar.gz From ovasik at fedoraproject.org Tue Mar 10 14:53:55 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Tue, 10 Mar 2009 14:53:55 +0000 (UTC) Subject: rpms/taskjuggler/F-10 taskjuggler.spec,1.25,1.26 Message-ID: <20090310145355.F27B77002E@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/taskjuggler/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27806 Modified Files: taskjuggler.spec Log Message: install taskjuggler documentation in docdir and do own that dir (#474600) Index: taskjuggler.spec =================================================================== RCS file: /cvs/extras/rpms/taskjuggler/F-10/taskjuggler.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- taskjuggler.spec 10 Mar 2009 14:30:33 -0000 1.25 +++ taskjuggler.spec 10 Mar 2009 14:53:25 -0000 1.26 @@ -62,6 +62,8 @@ ${RPM_BUILD_ROOT}/%{_datadir}/applications/kde/taskjuggler.desktop rm $RPM_BUILD_ROOT%{_libdir}/libtaskjuggler.{la,so} +mv $RPM_BUILD_ROOT%{_docdir}/packages/* $RPM_BUILD_ROOT%{_docdir} +rm -rf $RPM_BUILD_ROOT%{_docdir}/packages %find_lang %{name} @@ -102,7 +104,8 @@ %{_datadir}/apps/* %{_datadir}/config/taskjugglerrc %{_docdir}/HTML/en/* -%{_docdir}/packages/* +%dir %{_docdir}/%{name} +%{_docdir}/%{name}/* %{_datadir}/icons/* %{_datadir}/mimelnk/application/*.desktop @@ -114,6 +117,8 @@ * Tue Mar 10 2009 Ondrej Vasik - 2.4.1-5 - Remove obsoletes, use Requires (#489496) - remove trailing spaces in spec +- install taskjuggler documentation in docdir and do own + that dir (#474600) * Mon Mar 9 2009 Ondrej Vasik - 2.4.1-4 - rebuilt with ICal support again (#488347, #467136) From orion at fedoraproject.org Tue Mar 10 14:58:17 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Tue, 10 Mar 2009 14:58:17 +0000 (UTC) Subject: rpms/ncl/devel ncl-5.1.0-includes.patch, NONE, 1.1 ncl-5.1.0-netcdff.patch, NONE, 1.1 ncl-5.1.0-ppc64.patch, NONE, 1.1 Message-ID: <20090310145817.BCDF370132@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/ncl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29174 Added Files: ncl-5.1.0-includes.patch ncl-5.1.0-netcdff.patch ncl-5.1.0-ppc64.patch Log Message: Add new patches ncl-5.1.0-includes.patch: --- NEW FILE ncl-5.1.0-includes.patch --- --- ncl_ncarg-5.0.0/common/src/libncarg_c/bcopyswap.c.includes 2000-08-21 22:03:31.000000000 -0600 +++ ncl_ncarg-5.0.0/common/src/libncarg_c/bcopyswap.c 2008-03-21 11:01:12.000000000 -0600 @@ -33,6 +33,7 @@ * of 4. */ #include +#include bcopyswap(b1, b2, size) char *b1; --- ncl_ncarg-5.0.0/common/src/bin/ncargpath/ncargpath.c.includes 2000-08-21 22:04:15.000000000 -0600 +++ ncl_ncarg-5.0.0/common/src/bin/ncargpath/ncargpath.c 2008-03-21 11:02:16.000000000 -0600 @@ -41,6 +41,7 @@ */ #include +#include #include #include --- ncl_ncarg-5.0.0/ncarg2d/src/libncarg/plotchar/bofred.c.includes 2000-08-22 09:05:20.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg/plotchar/bofred.c 2008-03-21 11:04:17.000000000 -0600 @@ -25,6 +25,10 @@ ************************************************************************/ +#include +#include +#include +#include #include #include --- ncl_ncarg-5.0.0/ncarg2d/src/libncarg/areasC/c_argeti.c.includes 2000-08-22 09:02:06.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg/areasC/c_argeti.c 2008-03-21 11:05:46.000000000 -0600 @@ -24,6 +24,7 @@ * * ************************************************************************/ +#include #include extern void NGCALLF(argeti,ARGETI)(NGstring,int*,int); --- ncl_ncarg-5.0.0/ncarg2d/src/libncarg/ncargC.h.includes 2008-03-21 11:10:43.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg/ncargC.h 2008-03-21 11:10:25.000000000 -0600 @@ -176,6 +176,12 @@ #endif ); +extern void NGCALLF(agback,AGBACK)( +#ifdef NeedFuncProto + void +#endif +); + extern char *c_agbnch( #ifdef NeedFuncProto int idsh --- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/raster.c.includes 2000-08-22 09:12:16.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/raster.c 2008-04-10 14:53:26.000000000 -0600 @@ -48,6 +48,7 @@ * */ #include +#include #include #include #include @@ -518,6 +519,7 @@ * RAS_ERROR or RAS_EOF if something went wrong. * *********************************************************************/ +int RasterLoadPalette(ras, colors) Raster *ras; unsigned char colors[768]; --- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.c.includes 2000-08-22 09:12:12.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.c 2008-04-10 14:57:14.000000000 -0600 @@ -71,6 +71,7 @@ /* Swiped from John Clyne */ +void _swapshort (bp, n) register char *bp; register unsigned n; @@ -86,6 +87,7 @@ } } +void _swaplong (bp, n) register char *bp; register unsigned n; @@ -112,6 +114,7 @@ * * Return the number of images in a file. Return -1 on error */ +int ImageCount_(name, format) char *name; char *format; --- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.h.includes 2008-04-10 14:57:41.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.h 2008-04-10 15:00:16.000000000 -0600 @@ -0,0 +1,41 @@ +/* + * $Id$ + */ +/************************************************************************ +* * +* Copyright (C) 2000 * +* University Corporation for Atmospheric Research * +* All Rights Reserved * +* * +* This file is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published * +* by the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This software is distributed in the hope that 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 software; if not, write to the Free Software * +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +* USA. * +* * +************************************************************************/ + +/*********************************************************************** +* * +* Copyright (C) 1991 * +* University Corporation for Atmospheric Research * +* All Rights Reserved * +* * +* * +***********************************************************************/ +/* File: misc.h + */ + +int read_swap(FILE *fp, int nb, char *buf, int swapflag); +void _swapshort (register char *bp, register unsigned n); +void _swaplong (register char *bp, register unsigned n); +int ImageCount_(char *name, char *format); --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.c.includes 2008-04-10 15:29:16.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.c 2008-04-10 15:28:57.000000000 -0600 @@ -76,7 +76,7 @@ /* * Flushes out the output buffer. Called at the end of a picture. */ -flush() +void flush() { (void)write(outFD,outbuf,outbufnum); outbufnum = 0; @@ -86,7 +86,7 @@ * Copies the "count" number of chars from "str" into the output buffer, * flushing the buffer if need be. */ -buffer(str,count) +void buffer(str,count) SignedChar *str; int count; { --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.h.includes 2008-04-10 15:29:29.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.h 2008-04-10 15:31:08.000000000 -0600 @@ -0,0 +1,37 @@ +/* + * $Id$ + */ +/************************************************************************ +* * +* This file is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published * +* by the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This software is distributed in the hope that 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 software; if not, write to the Free Software * +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +* USA. * +* * +************************************************************************/ + +/*********************************************************************** +* * +* Copyright (C) 1990 * +* University Corporation for Atmospheric Research * +* All Rights Reserved * +* * +* NCAR View V3.01 - UNIX Release * +* * +***********************************************************************/ + +#include "ctrandef.h" + +int GcapOpenBuffer(char *file); +void flush(void); +void buffer(SignedChar *str, int count); --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.c.includes 2000-08-22 09:11:45.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.c 2008-04-10 15:15:45.000000000 -0600 @@ -99,7 +99,7 @@ -InitDefault() +void InitDefault() { static boolean isInit = FALSE; int max_intensity = (1 << DCP) - 1; @@ -173,7 +173,7 @@ colorLUTable.damage = FALSE; } -SetInPic(value) +void SetInPic(value) boolean value; { int i; @@ -1290,7 +1290,7 @@ /* * set mininum line width */ -SetMinLineWidthDefault(line_width) +void SetMinLineWidthDefault(line_width) float line_width; { @@ -1315,7 +1315,7 @@ /* * Set Maximum line width. */ -SetMaxLineWidthDefault(line_width) +void SetMaxLineWidthDefault(line_width) float line_width; { defaulttable.line_width = MIN(line_width, defaulttable.line_width); @@ -1330,7 +1330,7 @@ /* * set additional line scaling */ -SetAdditionalLineScale(line_scale) +void SetAdditionalLineScale(line_scale) float line_scale; { LINE_WIDTH_DAMAGE = TRUE; @@ -1344,7 +1344,7 @@ /* * set rgb intensity scaling */ -SetRGBIntensityScale(rgb_scale) +void SetRGBIntensityScale(rgb_scale) float rgb_scale; { COLOUR_TABLE_DAMAGE = TRUE; --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.h.includes 2000-08-21 21:30:26.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.h 2008-04-10 15:26:23.000000000 -0600 @@ -454,3 +454,73 @@ #define COLOUR_INDEX_RED(I) (clut->ce[(I)].rgb.red) #define COLOUR_INDEX_GREEN(I) (clut->ce[(I)].rgb.green) #define COLOUR_INDEX_BLUE(I) (clut->ce[(I)].rgb.blue) + +void InitDefault(void); +void _CtDefNoColorDefault(void); +void SetInPic(boolean value); +int MFVersion(CGMC *c); +int MFDesc(CGMC *c); +int VDCType(CGMC *c); +int IntergerPrec(CGMC *c); +int RealPrec(CGMC *c); +int IndexPrec(CGMC *c); +int ColrPrec(CGMC *c); +int ColrIndexPrec(CGMC *c); +int MaxColrIndex(CGMC *c); +int ColrValueExt(CGMC *c); +int MFElemList(CGMC *c); +int MFDefaults(CGMC *c); +int CharSetList(CGMC *c); +int CharCoding(CGMC *c); +int ScaleMode(CGMC *c); +int ColrMode(CGMC *c); +int LineWidthMode(CGMC *c); +int MarkerSizeMode(CGMC *c); +int EdgeWidthMode(CGMC *c); +int VDCExt(CGMC *c); +int BackColr(CGMC *c); +int VDCIntergerPrec(CGMC *c); +int VDCRealPrec(CGMC *c); +int AuxColr(CGMC *c); +int Transparency(CGMC *c); +int ClipRect(CGMC *c); +int Clip(CGMC *c); +int LineIndex(CGMC *c); +int LineType(CGMC *c); +int LineWidth(CGMC *c); +int LineColr(CGMC *c); +int MarkerIndex(CGMC *c); +int MarkerType(CGMC *c); +int MarkerSize(CGMC *c); +int MarkerColr(CGMC *c); +int TextIndex(CGMC *c); +int TextFontIndex(CGMC *c); +int TextPrec(CGMC *c); +int CharExpan(CGMC *c); +int CharSpace(CGMC *c); +int TextColr(CGMC *c); +int CharHeight(CGMC *c); +int CharOri(CGMC *c); +int TextPath(CGMC *c); +int TextAlign(CGMC *c); +int CharSetIndex(CGMC *c); +int AltCharSetIndex(CGMC *c); +int FillIndex(CGMC *c); +int IntStyle(CGMC *c); +int FillColr(CGMC *c); +int HatchIndex(CGMC *c); +int PatIndex(CGMC *c); +int EdgeIndex(CGMC *c); +int EdgeType(CGMC *c); +int EdgeWidth(CGMC *c); +int EdgeColr(CGMC *c); +int EdgeVis(CGMC *c); +int FillRefPt(CGMC *c); +int PatTable(CGMC *c); +int PatSize(CGMC *c); +int ColrTable(CGMC *c); +int ASF(CGMC *c); +void SetMinLineWidthDefault(float line_width); +void SetMaxLineWidthDefault(float line_width); +void SetAdditionalLineScale(float line_scale); +void SetRGBIntensityScale(float rgb_scale); --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/gcaprast.c.includes 2000-08-22 09:11:48.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/gcaprast.c 2008-04-10 15:32:49.000000000 -0600 @@ -44,6 +44,7 @@ #include #include +#include #include #include #include "cgmc.h" @@ -52,9 +53,8 @@ #include "ctrandef.h" #include "translate.h" #include "bitops.h" - - - +#include "buffer.h" +#include "format.h" static boolean Runlength; /* true if device wants run length encoded * pixel map --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/in.h.includes 2008-04-10 15:08:11.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/in.h 2008-04-10 15:08:42.000000000 -0600 @@ -29,6 +29,9 @@ * NCAR View V3.00 - UNIX Release * * * ***********************************************************************/ + +#include "cgmc.h" + #define BUFSIZE 1440 /*size of CGM buffer in bytes */ #define N -1 /*flag indicating any integer value */ #define STDIN 0 @@ -72,4 +75,5 @@ */ }; +int Instr_Dec(CGMC *cgmc); --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.c.includes 2000-08-22 09:11:50.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.c 2008-04-10 15:09:55.000000000 -0600 @@ -36,7 +36,7 @@ * Description: miscellaneous ctrans funcions */ -CoordStringToInt(s, llx, lly, urx, ury) +int CoordStringToInt(s, llx, lly, urx, ury) char *s; int *llx, *lly, *urx, *ury; { --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.h.includes 2008-04-10 15:10:15.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.h 2008-04-10 15:11:11.000000000 -0600 @@ -0,0 +1,31 @@ +/* + * $Id$ + */ +/************************************************************************ +* * +* Copyright (C) 1992 * +* University Corporation for Atmospheric Research * +* All Rights Reserved * +* * +* This file is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published * +* by the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This software is distributed in the hope that 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 software; if not, write to the Free Software * +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +* USA. * +* * +************************************************************************/ + +/* + * File: misc.h + */ + +int CoordStringToInt(char *s, int *llx, int *lly, int *urx, int *ury); --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/rast.c.includes 2005-08-03 15:14:16.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/rast.c 2008-04-10 16:02:40.000000000 -0600 @@ -30,6 +30,7 @@ * * ***********************************************************************/ +#include "in.h" #include #include #include @@ -44,6 +45,7 @@ #include "ctrandef.h" #include "default.h" #include "devices.h" +#include "misc.h" extern boolean *softFill; extern boolean deviceIsInit; @@ -104,7 +106,7 @@ Raster *rastGrid; /* struct for creating output file */ boolean rasIsDirect; /* direct encoded image? */ -static build_ras_arg(ras_argc, ras_argv, rast_opts) +static int build_ras_arg(ras_argc, ras_argv, rast_opts) int *ras_argc; char **ras_argv; struct Opts rast_opts; @@ -166,7 +168,7 @@ } -static clear_grid(grid) +static void clear_grid(grid) Raster *grid; { if (rasIsDirect) { @@ -184,7 +186,7 @@ } } -static init_color_tab() +static void init_color_tab() { /* @@ -198,7 +200,7 @@ #define DEFAULT_WIDTH 512 /* default raster width */ #define DEFAULT_HEIGHT 512 /* default raster height */ -get_resolution(dev_extent, opts, name) +void get_resolution(dev_extent, opts, name) CoordRect *dev_extent; struct Opts opts; char *name; --- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/sunraster.c.includes 2000-08-22 09:12:19.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/sunraster.c 2008-04-10 17:02:27.000000000 -0600 @@ -59,8 +59,10 @@ #include #include #include +#include #include "ncarg_ras.h" #include "sunraster.h" +#include "misc.h" static char *FormatName = "sun"; @@ -235,18 +237,18 @@ dep = (SunInfo *) ras->dep; } - nb = write(ras->fd, (char *) dep, sizeof(SunInfo)); + nb = write(ras->fd, dep, sizeof(SunInfo)); if (nb != sizeof(SunInfo)) return(RAS_EOF); /* Write the color table. */ - nb = write(ras->fd, (char *) ras->red, ras->ncolor); + nb = write(ras->fd, ras->red, ras->ncolor); if (nb != ras->ncolor) return(RAS_EOF); - nb = write(ras->fd, (char *) ras->green, ras->ncolor); + nb = write(ras->fd, ras->green, ras->ncolor); if (nb != ras->ncolor) return(RAS_EOF); - nb = write(ras->fd, (char *) ras->blue, ras->ncolor); + nb = write(ras->fd, ras->blue, ras->ncolor); if (nb != ras->ncolor) return(RAS_EOF); /* ncl-5.1.0-netcdff.patch: --- NEW FILE ncl-5.1.0-netcdff.patch --- --- ncl_ncarg-5.1.0/ni/src/scripts/nhlf77.csh.orig 2008-02-06 17:22:03.000000000 -0700 +++ ncl_ncarg-5.1.0/ni/src/scripts/nhlf77.csh 2009-03-05 12:02:11.000000000 -0700 @@ -65,7 +65,7 @@ case "-netcdf": case "-cdf": - set extra_libs = "$extra_libs SED_NCDFLIBS" + set extra_libs = "$extra_libs SED_NCDFLIBS -lnetcdff" breaksw case "-hdf": ncl-5.1.0-ppc64.patch: --- NEW FILE ncl-5.1.0-ppc64.patch --- --- ncl_ncarg-5.1.0/config/ymake.ppc64 2009-03-05 10:54:12.000000000 -0700 +++ ncl_ncarg-5.1.0/config/ymake 2009-03-05 10:57:27.000000000 -0700 @@ -372,19 +372,13 @@ case amd64: case i*64: case x*64: - case p*64: + case ppc*: case alpha: set model = $mach set arch = $mach set sysincs = LINUX set vendor = IBM breaksw - case ppc: - set model = $mach - set arch = $mach - set sysincs = YDLINUX - set vendor = APPLE - breaksw default: echo "$0 : Unknown machine type" > /dev/tty exit 1 From orion at fedoraproject.org Tue Mar 10 15:02:16 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Tue, 10 Mar 2009 15:02:16 +0000 (UTC) Subject: rpms/ncl/devel ncl.spec, 1.14, 1.15 ncarg-4.4.2-ppc64.patch, 1.1, NONE ncl-5.0.0-flex.patch, 1.1, NONE ncl-5.0.0-hdf.patch, 1.2, NONE ncl-5.0.0-includes.patch, 1.2, NONE ncl-5.0.0-netcdff.patch, 1.1, NONE ncl-5.0.0-png.patch, 1.1, NONE ncl-5.0.0-triangle.patch, 1.1, NONE ncl-5.0.0-uint32.patch, 1.1, NONE ncl-5.0.0-wrapit.patch, 1.1, NONE Message-ID: <20090310150216.CE14B7002E@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/ncl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30671 Modified Files: ncl.spec Removed Files: ncarg-4.4.2-ppc64.patch ncl-5.0.0-flex.patch ncl-5.0.0-hdf.patch ncl-5.0.0-includes.patch ncl-5.0.0-netcdff.patch ncl-5.0.0-png.patch ncl-5.0.0-triangle.patch ncl-5.0.0-uint32.patch ncl-5.0.0-wrapit.patch Log Message: Remove old patches Index: ncl.spec =================================================================== RCS file: /cvs/pkgs/rpms/ncl/devel/ncl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ncl.spec 10 Mar 2009 14:52:18 -0000 1.14 +++ ncl.spec 10 Mar 2009 15:01:46 -0000 1.15 @@ -30,7 +30,6 @@ Patch1: ncarg-4.4.1-deps.patch Patch2: ncl-5.1.0-ppc64.patch Patch7: ncl-5.0.0-atlas.patch -Patch9: ncl-5.0.0-wrapit.patch # don't have the installation target depends on the build target since # for library it implies running ranlib and modifying the library timestamp Patch10: ncl-5.0.0-no_install_dep.patch @@ -109,7 +108,6 @@ %prep %setup -q -n ncl_ncarg-%{version} -#%patch0 -p1 -b .rpmroot %patch0 -p1 -b .paths %patch1 -p1 -b .deps %patch2 -p1 -b .ppc64 --- ncarg-4.4.2-ppc64.patch DELETED --- --- ncl-5.0.0-flex.patch DELETED --- --- ncl-5.0.0-hdf.patch DELETED --- --- ncl-5.0.0-includes.patch DELETED --- --- ncl-5.0.0-netcdff.patch DELETED --- --- ncl-5.0.0-png.patch DELETED --- --- ncl-5.0.0-triangle.patch DELETED --- --- ncl-5.0.0-uint32.patch DELETED --- --- ncl-5.0.0-wrapit.patch DELETED --- From hadess at fedoraproject.org Tue Mar 10 15:12:41 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 10 Mar 2009 15:12:41 +0000 (UTC) Subject: rpms/gnome-phone-manager/devel .cvsignore, 1.10, 1.11 gnome-phone-manager.spec, 1.30, 1.31 sources, 1.10, 1.11 Message-ID: <20090310151242.122077002E@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-phone-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1000 Modified Files: .cvsignore gnome-phone-manager.spec sources Log Message: * Tue Mar 10 2009 - Bastien Nocera - 0.65-1 - Update to 0.65 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-phone-manager/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 11 Jun 2008 12:48:03 -0000 1.10 +++ .cvsignore 10 Mar 2009 15:12:39 -0000 1.11 @@ -1 +1 @@ -gnome-phone-manager-0.60.tar.bz2 +gnome-phone-manager-0.65.tar.bz2 Index: gnome-phone-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gnome-phone-manager.spec 5 Mar 2009 21:46:34 -0000 1.30 +++ gnome-phone-manager.spec 10 Mar 2009 15:12:39 -0000 1.31 @@ -1,7 +1,7 @@ Name: gnome-phone-manager Summary: Gnome Phone Manager -Version: 0.60 -Release: 6%{?dist} +Version: 0.65 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2 @@ -109,6 +109,9 @@ %{_datadir}/mission-control/profiles/* %changelog +* Tue Mar 10 2009 - Bastien Nocera - 0.65-1 +- Update to 0.65 + * Thu Mar 5 2009 Linus Walleij 0.60-6 - Rebuild hoping to pick up libgnomebt i/f bump. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-phone-manager/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 11 Jun 2008 12:48:03 -0000 1.10 +++ sources 10 Mar 2009 15:12:39 -0000 1.11 @@ -1 +1 @@ -f9497833b24c0100dc844853f434a9e2 gnome-phone-manager-0.60.tar.bz2 +afbe02a45062179978860a7b90b837b7 gnome-phone-manager-0.65.tar.bz2 From mchehab at fedoraproject.org Tue Mar 10 15:12:53 2009 From: mchehab at fedoraproject.org (Mauro Carvalho Chehab) Date: Tue, 10 Mar 2009 15:12:53 +0000 (UTC) Subject: rpms/kernel/devel kernel.spec, 1.1404, 1.1405 linux-2.6-v4l-dvb-fixes.patch, 1.3, 1.4 linux-2.6-v4l-dvb-update.patch, 1.5, 1.6 Message-ID: <20090310151253.618E47002E@cvs1.fedora.phx.redhat.com> Author: mchehab Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32698 Modified Files: kernel.spec linux-2.6-v4l-dvb-fixes.patch linux-2.6-v4l-dvb-update.patch Log Message: Update v4l/dvb drivers with the linux-next patches Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1404 retrieving revision 1.1405 diff -u -r1.1404 -r1.1405 --- kernel.spec 10 Mar 2009 08:15:05 -0000 1.1404 +++ kernel.spec 10 Mar 2009 15:12:16 -0000 1.1405 @@ -1810,6 +1810,9 @@ # and build. %changelog +* Tue Mar 10 2009 Mauro Carvalho Cheahb +- updates V4L/DVB from linux-next and adds git log summary on patches + * Tue Mar 10 2009 Ben Skeggs - drm-nouveau.patch: more kms fixes/cleanups - now works decently on all the G8x chips I have linux-2.6-v4l-dvb-fixes.patch: Index: linux-2.6-v4l-dvb-fixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-fixes.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-v4l-dvb-fixes.patch 6 Mar 2009 01:45:03 -0000 1.3 +++ linux-2.6-v4l-dvb-fixes.patch 10 Mar 2009 15:12:17 -0000 1.4 @@ -1,3 +1,12 @@ +Gregory Lardiere (1): + V4L/DVB (10789): m5602-s5k4aa: Split up the initial sensor probe in chunks. + +Mauro Carvalho Chehab (1): + V4L/DVB (10834): zoran: auto-select bt866 for AverMedia 6 Eyes + +Vitaly Wool (1): + V4L/DVB (10832): tvaudio: Avoid breakage with tda9874a + diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c index e564a61..48892b5 100644 --- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c linux-2.6-v4l-dvb-update.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 linux-2.6-v4l-dvb-update.patch Index: linux-2.6-v4l-dvb-update.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-update.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-v4l-dvb-update.patch 6 Mar 2009 11:45:21 -0000 1.5 +++ linux-2.6-v4l-dvb-update.patch 10 Mar 2009 15:12:17 -0000 1.6 @@ -1,9 +1,566 @@ +Abylay Ospan (3): + V4L/DVB (10796): Add init code for NetUP Dual DVB-S2 CI card + V4L/DVB (10797): Add EEPROM code for NetUP Dual DVB-S2 CI card. + V4L/DVB (10798): Add CIMax(R) SP2 Common Interface code for NetUP Dual DVB-S2 CI card + +Adam Baker (2): + V4L/DVB (10639): gspca - sq905: New subdriver. + V4L/DVB (10829): Support alternate resolutions for sq905 + +Alexey Klimov (16): + V4L/DVB (10316): v4l/dvb: use usb_make_path in usb-radio drivers + V4L/DVB (10324): em28xx: Correct mailing list + V4L/DVB (10335): gspca - all subdrivers: Fix CodingStyle in sd_mod_init function. + V4L/DVB (10336): gspca - all subdrivers: Return ret instead of -1 in sd_mod_init. + V4L/DVB (10455): radio-mr800: codingstyle cleanups + V4L/DVB (10456): radio-mr800: place dev_err instead of dev_warn + V4L/DVB (10457): radio-mr800: add more dev_err messages in probe + V4L/DVB (10458): radio-mr800: move radio start and stop in one function + V4L/DVB (10459): radio-mr800: fix amradio_set_freq + V4L/DVB (10460): radio-mr800: add stereo support + V4L/DVB (10461): radio-mr800: add few lost mutex locks + V4L/DVB (10462): radio-mr800: increase version and add comments + V4L/DVB (10463): radio-mr800: fix checking of retval after usb_bulk_msg + V4L/DVB (10464): radio-si470x: use usb_make_path in usb-radio drivers + V4L/DVB (10465): dsbr100: Add few lost mutex locks. + V4L/DVB (10522): em28xx-audio: replace printk with em28xx_errdev + +Andy Walls (40): + V4L/DVB (10274): cx18: Fix a PLL divisor update for the I2S master clock + V4L/DVB (10275): cx18: Additional debug to display outgoing mailbox parameters + V4L/DVB (10276): cx18, cx2341x, ivtv: Add AC-3 audio encoding control to cx18 + V4L/DVB (10277): cx18, cx2341x: Fix bugs in cx18 AC3 control and comply with V4L2 spec + V4L/DVB (10278): cx18: Fix bad audio in first analog capture. + V4L/DVB (10279): cx18: Print driver version number when logging status + V4L/DVB (10280): cx18: Rename structure members: dev to pci_dev and v4l2dev to video_dev + V4L/DVB (10281): cx18: Conversion to new V4L2 framework: use v4l2_device object + V4L/DVB (10283): cx18: Call request_module() with proper argument types. + V4L/DVB (10284): cx18: Add initial entry for a Leadtek DVR3100 H hybrid card + V4L/DVB (10433): cx18: Defer A/V core initialization until a valid cx18_av_cmd arrives + V4L/DVB (10434): cx18: Smarter verification of CX18_AUDIO_ENABLE register writes + V4L/DVB (10435): cx18: Normalize APU after second APU firmware load + V4L/DVB (10436): cx18: Fix coding style of a switch statement per checkpatch.pl + V4L/DVB (10437): cx18: Remove an unused spinlock + V4L/DVB (10439): cx18: Clean-up and enable sliced VBI handling + V4L/DVB (10440): cx18: Fix presentation timestamp (PTS) for VBI buffers + V4L/DVB (10441): cx18: Fix VBI ioctl() handling and Raw/Sliced VBI state management + V4L/DVB (10442): cx18: Fixes for enforcing when Encoder Raw VBI params can be set + V4L/DVB (10443): cx18: Use correct line counts per field in firmware API call + V4L/DVB (10444): cx18: Fix sliced VBI PTS and fix artifacts in last raw line of field + V4L/DVB (10445): cx18: Process Raw VBI on a whole frame basis; fix VBI buffer size + V4L/DVB (10446): cx18: Finally get sliced VBI working - for 525 line 60 Hz systems at least + V4L/DVB (10755): cx18: Convert the integrated A/V decoder core interface to a v4l2_subdev + V4L/DVB (10756): cx18: Slim down instance handling, build names from v4l2_device.name + V4L/DVB (10757): cx18, v4l2-chip-ident: Finish conversion of AV decoder core to v4l2_subdev + V4L/DVB (10758): cx18: Convert I2C devices to v4l2_subdevices + V4L/DVB (10759): cx18: Convert GPIO connected functions to act as v4l2_subdevices + V4L/DVB (10760): cx18: Fix a memory leak of buffers used for sliced VBI insertion + V4L/DVB (10761): cx18: Change log lines for internal subdevs and fix tveeprom reads + V4L/DVB (10762): cx18: Get rid of unused variables related to video output + V4L/DVB (10763): cx18: Increment version number due to significant changes for v4l2_subdevs + V4L/DVB (10764): cx18: Disable AC3 controls as the firmware doesn't support AC3 + V4L/DVB (10850): cx18: Use strlcpy() instead of strncpy() for temp eeprom i2c_client setup + V4L/DVB (10851): cx18: Fix a video scaling check problem introduced by sliced VBI changes + V4L/DVB (10852): cx18: Include cx18-audio.h in cx18-audio.c to eliminate s-parse warning + V4L/DVB (10853): cx18: Fix s-parse warnings and a logic error about extracting the VBI PTS + V4L/DVB (10854): cx18: Correct comments about vertical and horizontal blanking timings + V4L/DVB (10855): cx18: Fix VPS service register codes + V4L/DVB (10856): cx18: Add interlock so sliced VBI insertion only happens for an MPEG PS + +Antoine Jacquet (1): + V4L/DVB (10263): zr364xx: add support for Aiptek DV T300 + +Antonio Ospite (2): + V4L/DVB (10344): gspca - ov534: Disable the Hercules webcams. + V4L/DVB (10676): mt9m111: Call icl->reset() on mt9m111_reset(). + +Antti Palosaari (2): + V4L/DVB (10286): af9015: add new USB ID for KWorld DVB-T 395U + V4L/DVB (10329): af9015: remove dual_mode module param + +Arne Luehrs (1): + V4L/DVB (10319): dib0700: enable IR receiver in Nova TD usb stick (52009) + +Bruno Christo (1): + V4L/DVB (10827): Add support for GeoVision GV-800(S) + +Devin Heitmueller (2): + V4L/DVB (10320): dib0700: fix i2c error message to make data type clear + V4L/DVB (10321): dib0700: Report dib0700_i2c_enumeration failures + +Douglas Kosovic (1): + V4L/DVB (10299): bttv: Add support for IVCE-8784 support for V4L2 bttv driver + +Douglas Schilling Landgraf (12): + V4L/DVB (10323): em28xx: Add entry for GADMEI TVR200 + V4L/DVB (10326): em28xx: Cleanup: fix bad whitespacing + V4L/DVB (10327): em28xx: Add check before call em28xx_isoc_audio_deinit() + V4L/DVB (10517): em28xx: remove bad check (changeset a31c595188af) + V4L/DVB (10520): em28xx-audio: Add spinlock for trigger + V4L/DVB (10521): em28xx-audio: Add lock for users + V4L/DVB (10523): em28xx-audio: Add macros EM28XX_START_AUDIO / EM28XX_STOP_AUDIO + V4L/DVB (10524): em28xx: Add DVC 101 model to Pinnacle Dazzle description + V4L/DVB (10556): em28xx-cards: Add Pinnacle Dazzle Video Creator Plus DVC107 description + V4L/DVB (10739): em28xx-cards: remove incorrect entry + V4L/DVB (10740): em28xx-cards: Add SIIG AVTuner-PVR board + V4L/DVB (10741): em28xx: Add Kaiser Baas Video to DVD maker support + +Erik Andren (3): + V4L/DVB (10334): gspca - stv06xx: Rework control description. + V4L/DVB (10341): gspca - stv06xx: Plug a memory leak in the pb0100 sensor driver. + V4L/DVB (10342): gspca - stv06xx: Add ctrl caching to the vv6410. + +Erik S. Beiser (1): + V4L/DVB (10826): cx88: Add IR support to pcHDTV HD3000 & HD5500 + +Guennadi Liakhovetski (5): + V4L/DVB (10665): soc-camera: add data signal polarity flags to drivers + V4L/DVB (10672): sh_mobile_ceu_camera: include NV* formats into the format list only once. + V4L/DVB (10673): mt9t031: fix gain and hflip controls, register update, and scaling + V4L/DVB (10674): soc-camera: camera host driver for i.MX3x SoCs + V4L/DVB (10675): soc-camera: extend soc_camera_bus_param_compatible with more tests + +Hans Verkuil (107): + V4L/DVB (10231): v4l2-subdev: add v4l2_ext_controls support + V4L/DVB (10244): v4l2: replace a few snprintfs with strlcpy + V4L/DVB (10246): saa6752hs: convert to v4l2_subdev. + V4L/DVB (10247): saa7134: convert to the new v4l2 framework. + V4L/DVB (10249): v4l2-common: added v4l2_i2c_tuner_addrs() + V4L/DVB (10251): cx25840: add comments explaining what the init() does. + V4L/DVB (10252): v4l2 doc: explain why v4l2_device_unregister_subdev() has to be called. + V4L/DVB (10271): saa7146: convert to video_ioctl2. + V4L/DVB (10272): av7110: test type field in VIDIOC_G_SLICED_VBI_CAP + V4L/DVB (10291): em28xx: fix VIDIOC_G_CTRL when there is no msp34xx device. + V4L/DVB (10313): saa7146: fix VIDIOC_ENUMSTD. + V4L/DVB (10406): gspca: fix compiler warning + V4L/DVB (10408): v4l2: fix incorrect hue range check + V4L/DVB (10409): v4l: remove unused I2C_DRIVERIDs. + V4L/DVB (10486): ivtv/cx18: fix g_fmt and try_fmt for raw video + V4L/DVB (10487): doc: update hm12 documentation. + V4L/DVB (10488): ivtv: cleanup naming conventions + V4L/DVB (10489): doc: use consistent naming conventions for vdev and v4l2_dev. + V4L/DVB (10490): v4l2: prefill ident and revision from v4l2_dbg_chip_ident. + V4L/DVB (10496): saa7146: implement v4l2_device support. + V4L/DVB (10497): saa7146: i2c adapdata now points to v4l2_device. + V4L/DVB (10498): saa7146: the adapter class will be NULL when v4l2_subdev is used. + V4L/DVB (10499): saa7146: convert saa7146 and mxb in particular to v4l2_subdev. + V4L/DVB (10500): saa7146: setting control while capturing should return EBUSY, not EINVAL. + V4L/DVB (10501): saa7146: prevent unnecessary loading of v4l2-common. + V4L/DVB (10502): saa7146: move v4l2 device registration to saa7146_vv. + V4L/DVB (10536): saa6588: convert to v4l2-i2c-drv-legacy.h + V4L/DVB (10537): saa6588: convert to v4l2_subdev. + V4L/DVB (10538): saa6588: add g_chip_ident support. + V4L/DVB (10539): saa6588: remove legacy_class, not needed for saa6588 + V4L/DVB (10540): cx2341x: fixed bug causing several audio controls to be no longer listed + V4L/DVB (10542): v4l2-subdev: add querystd and g_input_status + V4L/DVB (10544): v4l2-common: add comments warning that about the sort order + V4L/DVB (10641): v4l2-dev: remove limit of 32 devices per driver in get_index() + V4L/DVB (10642): vivi: update comment to reflect that vivi can now create more than 32 devs. + V4L/DVB (10643): v4l2-device: allow a NULL parent device when registering. + V4L/DVB (10644): v4l2-subdev: rename dev field to v4l2_dev + V4L/DVB (10645): vivi: introduce v4l2_device and do several cleanups + V4L/DVB (10646): vivi: controls are per-device, not global. + V4L/DVB (10647): vivi: add slider flag to controls. + V4L/DVB (10685): v4l2: add colorfx support to v4l2-common.c, and add to 'Changes' in spec. + V4L/DVB (10686): v4l2: add V4L2_CTRL_FLAG_WRITE_ONLY flag. + V4L/DVB (10687): v4l2-common/v4l2-spec: support/document write-only and button controls + V4L/DVB (10691): v4l2-common: add v4l2_i2c_subdev_addr() + V4L/DVB (10692): usbvision: convert to v4l2_device/v4l2_subdev. + V4L/DVB (10698): v4l2-common: remove v4l2_ctrl_query_fill_std + V4L/DVB (10700): saa7115: don't access reg 0x87 if it is not present. + V4L/DVB (10701): saa7185: add colorbar support. + V4L/DVB (10702): saa7115: add querystd and g_input_status support for zoran. + V4L/DVB (10703): zoran: convert to video_ioctl2 and remove 'ready_to_be_freed' hack. + V4L/DVB (10704): zoran: remove broken BIGPHYS_AREA and BUZ_HIMEM code, and allow for kmallocs > 128 kB + V4L/DVB (10705): zoran: use slider flag with volume etc. controls. + V4L/DVB (10706): zoran: fix field typo. + V4L/DVB (10707): zoran: set bytesperline to 0 when using MJPEG. + V4L/DVB (10708): zoran: remove old V4L1 ioctls, use v4l1-compat instead. + V4L/DVB (10709): zoran: set correct parent of the video device. + V4L/DVB (10710): zoran: cleanups in an attempt to make the source a bit more readable. + V4L/DVB (10711): zoran: fix TRY_FMT support + V4L/DVB (10712): zoran: fix G_FMT + V4L/DVB (10713): zoran: if reqbufs is called with count == 0, do a streamoff. + V4L/DVB (10714): zoran et al: convert zoran i2c modules to V4L2. + V4L/DVB (10715): zoran: clean up some old V4L1 left-overs and remove the MAP_NR macro. + V4L/DVB (10716): zoran: change buffer defaults to something that works with tvtime + V4L/DVB (10717): zoran: TRY_FMT and S_FMT now do the same parameter checks. + V4L/DVB (10718): bt866: convert to v4l2_subdev. + V4L/DVB (10719): bt819: convert to v4l2_subdev. + V4L/DVB (10720): bt819: that delay include is needed after all. + V4L/DVB (10721): bt856: convert to v4l2_subdev. [...35413 lines suppressed...] +@@ -4340,10 +3291,7 @@ zoran_vm_close (struct vm_area_struct *vma) ZORAN_FREE; spin_unlock_irqrestore(&zr->spinlock, flags); } @@ -66460,7 +80655,7 @@ mutex_unlock(&zr->resource_lock); } -@@ -4582,11 +3531,56 @@ zoran_mmap (struct file *file, +@@ -4582,11 +3530,56 @@ zoran_mmap (struct file *file, return 0; } @@ -66518,7 +80713,7 @@ .read = zoran_read, .write = zoran_write, .mmap = zoran_mmap, -@@ -4596,7 +3590,9 @@ static const struct v4l2_file_operations zoran_fops = { +@@ -4596,7 +3589,9 @@ static const struct v4l2_file_operations zoran_fops = { struct video_device zoran_template __devinitdata = { .name = ZORAN_NAME, .fops = &zoran_fops, @@ -66608,17 +80803,72 @@ }; diff --git a/include/linux/Kbuild b/include/linux/Kbuild -index 106c3ba..d97133d 100644 +index 106c3ba..5bd3efd 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild -@@ -158,7 +158,6 @@ header-y += un.h +@@ -157,8 +157,6 @@ header-y += ultrasound.h + header-y += un.h header-y += utime.h header-y += veth.h - header-y += video_decoder.h +-header-y += video_decoder.h -header-y += video_encoder.h header-y += videotext.h header-y += x25.h +diff --git a/include/linux/video_decoder.h b/include/linux/video_decoder.h +deleted file mode 100644 +index e26c0c8..0000000 +--- a/include/linux/video_decoder.h ++++ /dev/null +@@ -1,48 +0,0 @@ +-#ifndef _LINUX_VIDEO_DECODER_H +-#define _LINUX_VIDEO_DECODER_H +- +-#include +- +-#define HAVE_VIDEO_DECODER 1 +- +-struct video_decoder_capability { /* this name is too long */ +- __u32 flags; +-#define VIDEO_DECODER_PAL 1 /* can decode PAL signal */ +-#define VIDEO_DECODER_NTSC 2 /* can decode NTSC */ +-#define VIDEO_DECODER_SECAM 4 /* can decode SECAM */ +-#define VIDEO_DECODER_AUTO 8 /* can autosense norm */ +-#define VIDEO_DECODER_CCIR 16 /* CCIR-601 pixel rate (720 pixels per line) instead of square pixel rate */ +- int inputs; /* number of inputs */ +- int outputs; /* number of outputs */ +-}; +- +-/* +-DECODER_GET_STATUS returns the following flags. The only one you need is +-DECODER_STATUS_GOOD, the others are just nice things to know. +-*/ +-#define DECODER_STATUS_GOOD 1 /* receiving acceptable input */ +-#define DECODER_STATUS_COLOR 2 /* receiving color information */ +-#define DECODER_STATUS_PAL 4 /* auto detected */ +-#define DECODER_STATUS_NTSC 8 /* auto detected */ +-#define DECODER_STATUS_SECAM 16 /* auto detected */ +- +-struct video_decoder_init { +- unsigned char len; +- const unsigned char *data; +-}; +- +-#define DECODER_GET_CAPABILITIES _IOR('d', 1, struct video_decoder_capability) +-#define DECODER_GET_STATUS _IOR('d', 2, int) +-#define DECODER_SET_NORM _IOW('d', 3, int) +-#define DECODER_SET_INPUT _IOW('d', 4, int) /* 0 <= input < #inputs */ +-#define DECODER_SET_OUTPUT _IOW('d', 5, int) /* 0 <= output < #outputs */ +-#define DECODER_ENABLE_OUTPUT _IOW('d', 6, int) /* boolean output enable control */ +-#define DECODER_SET_PICTURE _IOW('d', 7, struct video_picture) +-#define DECODER_SET_GPIO _IOW('d', 8, int) /* switch general purpose pin */ +-#define DECODER_INIT _IOW('d', 9, struct video_decoder_init) /* init internal registers at once */ +-#define DECODER_SET_VBI_BYPASS _IOW('d', 10, int) /* switch vbi bypass */ +- +-#define DECODER_DUMP _IO('d', 192) /* debug hook */ +- +- +-#endif diff --git a/include/linux/video_encoder.h b/include/linux/video_encoder.h deleted file mode 100644 index b7b6423..0000000 @@ -66648,6 +80898,42 @@ - - -#endif +diff --git a/include/linux/videodev.h b/include/linux/videodev.h +index 837f392..b19eab1 100644 +--- a/include/linux/videodev.h ++++ b/include/linux/videodev.h +@@ -16,6 +16,23 @@ + #include + #include + ++#if defined(__MIN_V4L1) && defined (__KERNEL__) ++ ++/* ++ * Used by those V4L2 core functions that need a minimum V4L1 support, ++ * in order to allow V4L1 Compatibilty code compilation. ++ */ ++ ++struct video_mbuf ++{ ++ int size; /* Total memory to map */ ++ int frames; /* Frames */ ++ int offsets[VIDEO_MAX_FRAME]; ++}; ++ ++#define VIDIOCGMBUF _IOR('v',20, struct video_mbuf) /* Memory map buffer info */ ++ ++#else + #if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__) + + #define VID_TYPE_CAPTURE 1 /* Can capture */ +@@ -312,6 +329,7 @@ struct video_code + #define VID_PLAY_END_MARK 14 + + #endif /* CONFIG_VIDEO_V4L1_COMPAT */ ++#endif /* __MIN_V4L1 */ + + #endif /* __LINUX_VIDEODEV_H */ + diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 5571dbe..11b8b3e 100644 --- a/include/linux/videodev2.h @@ -66900,7 +81186,7 @@ extern unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl, diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h -index 9aaf652..70117e7 100644 +index 9aaf652..43684f1 100644 --- a/include/media/v4l2-chip-ident.h +++ b/include/media/v4l2-chip-ident.h @@ -37,10 +37,8 @@ enum { @@ -66915,7 +81201,7 @@ V4L2_IDENT_SAA7113 = 103, V4L2_IDENT_SAA7114 = 104, V4L2_IDENT_SAA7115 = 105, -@@ -63,30 +61,82 @@ enum { +@@ -63,30 +61,88 @@ enum { V4L2_IDENT_OV7720 = 251, V4L2_IDENT_OV7725 = 252, @@ -66929,6 +81215,9 @@ V4L2_IDENT_CX23416 = 416, V4L2_IDENT_CX23418 = 418, ++ /* module indycam: just ident 2000 */ ++ V4L2_IDENT_INDYCAM = 2000, ++ + /* module bt819: reserved range 810-819 */ + V4L2_IDENT_BT815A = 815, + V4L2_IDENT_BT817A = 817, @@ -66987,6 +81276,9 @@ + /* module saa7185: just ident 7185 */ + V4L2_IDENT_SAA7185 = 7185, + ++ /* module saa7191: just ident 7191 */ ++ V4L2_IDENT_SAA7191 = 7191, ++ /* module wm8739: just ident 8739 */ V4L2_IDENT_WM8739 = 8739, @@ -67143,10 +81435,18 @@ #endif diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h -index b01c044..a8b4c0b 100644 +index b01c044..7a4529d 100644 --- a/include/media/v4l2-ioctl.h +++ b/include/media/v4l2-ioctl.h -@@ -267,6 +267,7 @@ struct v4l2_ioctl_ops { +@@ -15,6 +15,7 @@ + #include + #include /* need __user */ + #ifdef CONFIG_VIDEO_V4L1_COMPAT ++#define __MIN_V4L1 + #include + #else + #include +@@ -267,6 +268,7 @@ struct v4l2_ioctl_ops { /* Video standard functions */ extern const char *v4l2_norm_to_name(v4l2_std_id id); From mjakubicek at fedoraproject.org Tue Mar 10 15:23:50 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Tue, 10 Mar 2009 15:23:50 +0000 (UTC) Subject: rpms/boinc-client/devel boinc-client.spec,1.29,1.30 Message-ID: <20090310152350.3EAD87002E@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/boinc-client/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4008 Modified Files: boinc-client.spec Log Message: - Fix damn typos in boincmgr wrapper script (resolves BZ#489463). Index: boinc-client.spec =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- boinc-client.spec 8 Mar 2009 20:50:59 -0000 1.29 +++ boinc-client.spec 10 Mar 2009 15:23:18 -0000 1.30 @@ -4,7 +4,7 @@ Summary: The BOINC client core Name: boinc-client Version: 6.4.7 -Release: 2.r%{revision}svn%{?dist} +Release: 3.r%{revision}svn%{?dist} License: LGPLv2+ Group: Applications/Engineering URL: http://boinc.berkeley.edu/ @@ -189,7 +189,7 @@ # Otherwise pull \$BOINCDIR from the init script if [ -z \$BOINCDIR ]; then - BOINCDIR='\`grep "BOINCDIR=" %{_sysconfdir}/init.d/%{name} | sed "s|BOINCDIR=||"\`'; + BOINCDIR="\`grep 'BOINCDIR=' %{_sysconfdir}/init.d/%{name} | sed 's|BOINCDIR=||'\`"; fi cd \$BOINCDIR @@ -313,6 +313,9 @@ %{_includedir}/boinc/* %changelog +* Tue Mar 10 2009 Milos Jakubicek - 6.4.7-3.r17542svn +- Fix damn typos in boincmgr wrapper script (resolves BZ#489463). + * Sun Mar 08 2009 Milos Jakubicek - 6.4.7-2.r17542svn - Fix overriding $BOINCOPTS from /etc/sysconfig/boinc-client in the init script (BZ#489199). From jwilson at fedoraproject.org Tue Mar 10 15:32:14 2009 From: jwilson at fedoraproject.org (Jarod Wilson) Date: Tue, 10 Mar 2009 15:32:14 +0000 (UTC) Subject: rpms/kernel/F-10 kernel.spec, 1.1206.2.43, 1.1206.2.44 linux-2.6-hdpvr.patch, 1.1.12.1, 1.1.12.2 Message-ID: <20090310153214.90BFE7002E@cvs1.fedora.phx.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6872 Modified Files: Tag: private-fedora-10-2_6_27 kernel.spec linux-2.6-hdpvr.patch Log Message: * Tue Mar 10 2009 Jarod Wilson 2.6.27.19-170.2.44 - Un-muck-up hdpvr patch update -- can't use 2.6.29 features that aren't in 2.6.27... Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v retrieving revision 1.1206.2.43 retrieving revision 1.1206.2.44 diff -u -r1.1206.2.43 -r1.1206.2.44 --- kernel.spec 9 Mar 2009 21:43:32 -0000 1.1206.2.43 +++ kernel.spec 10 Mar 2009 15:31:43 -0000 1.1206.2.44 @@ -1988,6 +1988,9 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Tue Mar 10 2009 Jarod Wilson 2.6.27.19-170.2.44 +- Un-muck-up hdpvr patch update -- can't use 2.6.29 features that aren't in 2.6.27... + * Mon Mar 09 2009 Dennis Gilmore 2.6.27.19-170.2.43 - add cs4231 ebus dma patch linux-2.6-hdpvr.patch: Index: linux-2.6-hdpvr.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-hdpvr.patch,v retrieving revision 1.1.12.1 retrieving revision 1.1.12.2 diff -u -r1.1.12.1 -r1.1.12.2 --- linux-2.6-hdpvr.patch 8 Mar 2009 03:30:10 -0000 1.1.12.1 +++ linux-2.6-hdpvr.patch 10 Mar 2009 15:31:43 -0000 1.1.12.2 @@ -908,7 +908,7 @@ index 0000000..2378099 --- /dev/null +++ b/drivers/media/video/hdpvr/hdpvr-video.c -@@ -0,0 +1,1261 @@ +@@ -0,0 +1,1258 @@ +/* + * Hauppage HD PVR USB driver - video 4 linux 2 interface + * @@ -1535,11 +1535,8 @@ +static int vidioc_querycap(struct file *file, void *priv, + struct v4l2_capability *cap) +{ -+ struct hdpvr_device *dev = video_drvdata(file); -+ + strcpy(cap->driver, "hdpvr"); + strcpy(cap->card, "Hauppauge HD PVR"); -+ usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); + cap->version = HDPVR_VERSION; + cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | + V4L2_CAP_AUDIO | From hadess at fedoraproject.org Tue Mar 10 15:34:18 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 10 Mar 2009 15:34:18 +0000 (UTC) Subject: rpms/gnome-phone-manager/devel gnome-phone-manager.spec,1.31,1.32 Message-ID: <20090310153418.AFA357002E@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-phone-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7288 Modified Files: gnome-phone-manager.spec Log Message: Update BRs Index: gnome-phone-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gnome-phone-manager.spec 10 Mar 2009 15:12:39 -0000 1.31 +++ gnome-phone-manager.spec 10 Mar 2009 15:33:48 -0000 1.32 @@ -8,15 +8,12 @@ URL: http://usefulinc.com/software/phonemgr/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel -BuildRequires: libgnomeui-devel -BuildRequires: libgnome-devel -BuildRequires: gnome-bluetooth-devel -BuildRequires: libbtctl-devel +BuildRequires: libcanberra-devel +BuildRequires: gnome-bluetooth-libs-devel BuildRequires: bluez-libs-devel BuildRequires: gnokii-devel BuildRequires: gstreamer-devel >= 0.10 BuildRequires: gnome-icon-theme >= 2.19.1 -# For libebook (evolution address book) BuildRequires: evolution-data-server-devel BuildRequires: gtkspell-devel BuildRequires: telepathy-glib-devel @@ -48,7 +45,7 @@ %prep %setup -q -%patch0 -p0 +#%patch0 -p0 %build %configure From davej at fedoraproject.org Tue Mar 10 15:35:02 2009 From: davej at fedoraproject.org (Dave Jones) Date: Tue, 10 Mar 2009 15:35:02 +0000 (UTC) Subject: rpms/kernel/devel linux-2.6-input-hid-extra-gamepad.patch, NONE, 1.1 kernel.spec, 1.1405, 1.1406 Message-ID: <20090310153502.95C707002E@cvs1.fedora.phx.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7574 Modified Files: kernel.spec Added Files: linux-2.6-input-hid-extra-gamepad.patch Log Message: HID: add support for another version of 0e8f:0003 device in hid-pl linux-2.6-input-hid-extra-gamepad.patch: --- NEW FILE linux-2.6-input-hid-extra-gamepad.patch --- >From 28b692b039a477e92fd9bff8ece163a647b9c490 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Fri, 27 Feb 2009 23:47:00 +0200 Subject: [PATCH] HID: add support for another version of 0e8f:0003 device in hid-pl Add support for another version of 0e8f:0003 device into hid-pl driver. This device has the values in separate fields and resembles devices handled by hid-zpff. Signed-off-by: Anssi Hannula Tested-by: Pantelis Koukousoulas Signed-off-by: Jiri Kosina --- drivers/hid/hid-pl.c | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 38 insertions(+), 12 deletions(-) diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c index 46941f9..9ad76bf 100644 --- a/drivers/hid/hid-pl.c +++ b/drivers/hid/hid-pl.c @@ -9,9 +9,12 @@ * - contains two reports, one for each port (HID_QUIRK_MULTI_INPUT) * * 0e8f:0003 "GreenAsia Inc. USB Joystick " - * - tested with K??ng Gaming gamepad + * - tested with K??nig Gaming gamepad * - * Copyright (c) 2007 Anssi Hannula + * 0e8f:0003 "GASIA USB Gamepad" + * - another version of the K??nig gamepad + * + * Copyright (c) 2007, 2009 Anssi Hannula */ /* @@ -46,6 +49,8 @@ struct plff_device { struct hid_report *report; + s32 *strong; + s32 *weak; }; static int hid_plff_play(struct input_dev *dev, void *data, @@ -62,8 +67,8 @@ static int hid_plff_play(struct input_dev *dev, void *data, left = left * 0x7f / 0xffff; right = right * 0x7f / 0xffff; - plff->report->field[0]->value[2] = left; - plff->report->field[0]->value[3] = right; + *plff->strong = left; + *plff->weak = right; debug("running with 0x%02x 0x%02x", left, right); usbhid_submit_report(hid, plff->report, USB_DIR_OUT); @@ -80,6 +85,8 @@ static int plff_init(struct hid_device *hid) struct list_head *report_ptr = report_list; struct input_dev *dev; int error; + s32 *strong; + s32 *weak; /* The device contains one output report per physical device, all containing 1 field, which contains 4 ff00.0002 usages and 4 16bit @@ -87,7 +94,12 @@ static int plff_init(struct hid_device *hid) The input reports also contain a field which contains 8 ff00.0001 usages and 8 boolean values. Their meaning is - currently unknown. */ + currently unknown. + + A version of the 0e8f:0003 exists that has all the values in + separate fields and misses the extra input field, thus resembling + Zeroplus (hid-zpff) devices. + */ if (list_empty(report_list)) { dev_err(&hid->dev, "no output reports found\n"); @@ -110,8 +122,21 @@ static int plff_init(struct hid_device *hid) return -ENODEV; } - if (report->field[0]->report_count < 4) { - dev_err(&hid->dev, "not enough values in the field\n"); + if (report->field[0]->report_count >= 4) { + report->field[0]->value[0] = 0x00; + report->field[0]->value[1] = 0x00; + strong = &report->field[0]->value[2]; + weak = &report->field[0]->value[3]; + debug("detected single-field device"); + } else if (report->maxfield >= 4 && report->field[0]->maxusage == 1 && + report->field[0]->usage[0].hid == (HID_UP_LED | 0x43)) { + report->field[0]->value[0] = 0x00; + report->field[1]->value[0] = 0x00; + strong = &report->field[2]->value[0]; + weak = &report->field[3]->value[0]; + debug("detected 4-field device"); + } else { + dev_err(&hid->dev, "not enough fields or values\n"); return -ENODEV; } @@ -130,10 +155,11 @@ static int plff_init(struct hid_device *hid) } plff->report = report; - plff->report->field[0]->value[0] = 0x00; - plff->report->field[0]->value[1] = 0x00; - plff->report->field[0]->value[2] = 0x00; - plff->report->field[0]->value[3] = 0x00; + plff->strong = strong; + plff->weak = weak; + + *strong = 0x00; + *weak = 0x00; usbhid_submit_report(hid, plff->report, USB_DIR_OUT); } @@ -180,7 +206,7 @@ static const struct hid_device_id pl_devices[] = { .driver_data = 1 }, /* Twin USB Joystick */ { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR), .driver_data = 1 }, /* Twin USB Joystick */ - { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003), }, /* GreenAsia Inc. USB Joystick */ + { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003), }, { } }; MODULE_DEVICE_TABLE(hid, pl_devices); -- 1.5.6.3 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1405 retrieving revision 1.1406 diff -u -r1.1405 -r1.1406 --- kernel.spec 10 Mar 2009 15:12:16 -0000 1.1405 +++ kernel.spec 10 Mar 2009 15:34:31 -0000 1.1406 @@ -624,6 +624,8 @@ Patch400: linux-2.6-scsi-cpqarray-set-master.patch Patch450: linux-2.6-input-kill-stupid-messages.patch Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch +Patch452: linux-2.6-input-hid-extra-gamepad.patch + Patch460: linux-2.6-serial-460800.patch Patch510: linux-2.6-silence-noise.patch Patch530: linux-2.6-silence-fbcon-logo.patch @@ -1149,6 +1151,9 @@ # Get away from having to poll Toshibas ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch +# HID: add support for another version of 0e8f:0003 device in hid-pl +ApplyPatch linux-2.6-input-hid-extra-gamepad.patch + # Allow to use 480600 baud on 16C950 UARTs ApplyPatch linux-2.6-serial-460800.patch # Silence some useless messages that still get printed with 'quiet' @@ -1810,6 +1815,9 @@ # and build. %changelog +* Tue Mar 10 2009 Dave Jones +- HID: add support for another version of 0e8f:0003 device in hid-pl + * Tue Mar 10 2009 Mauro Carvalho Cheahb - updates V4L/DVB from linux-next and adds git log summary on patches From dsugar at fedoraproject.org Tue Mar 10 15:36:58 2009 From: dsugar at fedoraproject.org (David Sugar) Date: Tue, 10 Mar 2009 15:36:58 +0000 (UTC) Subject: rpms/eclipse-slide/devel eclipse-slide.spec, 1.12, 1.13 sources, 1.7, 1.8 Message-ID: <20090310153658.AE1D07002E@cvs1.fedora.phx.redhat.com> Author: dsugar Update of /cvs/pkgs/rpms/eclipse-slide/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7889 Modified Files: eclipse-slide.spec sources Log Message: Updated to version 1.3.12 with some bug fixes Index: eclipse-slide.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-slide/devel/eclipse-slide.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- eclipse-slide.spec 24 Feb 2009 13:55:15 -0000 1.12 +++ eclipse-slide.spec 10 Mar 2009 15:36:27 -0000 1.13 @@ -35,7 +35,7 @@ Summary: SELinux policy editing plugin for Eclipse Name: eclipse-slide -Version: 1.3.9 +Version: 1.3.12 License: GPLv2 BuildArch: noarch @@ -132,6 +132,15 @@ %{eclipse_base} %changelog +* Thu Mar 5 2009 Dave Sugar - 1.3.12-1 +- fix problem where some files where not being closed when they should have been + +* Tue Dec 2 2008 Dave Sugar - 1.3.11-1 +- bunch of minor changes - mostly support for some dependant plugins +- some bug fixes + +* Tue Aug 19 2008 Dave Sugar - 1.3.10-1 +- fix problem with bulding for header projects * Tue Feb 24 2009 Fedora Release Engineering - 1.3.9-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-slide/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 7 Jul 2008 13:34:29 -0000 1.7 +++ sources 10 Mar 2009 15:36:28 -0000 1.8 @@ -1 +1 @@ -3ebc5fd0a146f0fbcf862b519880be05 eclipse-slide-1.3.9.tar.gz +f42957d1612298da1a552b8d91fbe192 eclipse-slide-1.3.12.tar.gz From tuju at fedoraproject.org Tue Mar 10 15:37:51 2009 From: tuju at fedoraproject.org (Juha Tuomala) Date: Tue, 10 Mar 2009 15:37:51 +0000 (UTC) Subject: rpms/dfu-util/devel sources,1.2,1.3 dfu-util.spec,1.3,1.4 Message-ID: <20090310153751.C84DD7002E@cvs1.fedora.phx.redhat.com> Author: tuju Update of /cvs/pkgs/rpms/dfu-util/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8186 Modified Files: sources dfu-util.spec Log Message: Update to 4917 svn snapshot. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dfu-util/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Dec 2008 17:20:06 -0000 1.2 +++ sources 10 Mar 2009 15:37:21 -0000 1.3 @@ -1 +1 @@ -a15a4cbba4238de885d3780fe751b512 dfu-util-20080922svn4662.tar.gz +c574875197503ffe47c724c82d56268d dfu-util-20090307svn4917.tar.gz Index: dfu-util.spec =================================================================== RCS file: /cvs/pkgs/rpms/dfu-util/devel/dfu-util.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dfu-util.spec 24 Feb 2009 11:37:08 -0000 1.3 +++ dfu-util.spec 10 Mar 2009 15:37:21 -0000 1.4 @@ -1,6 +1,6 @@ # There is no real release from upstream yet so we follow the fedora policy. -%define svnver 4662 -%define snapshot 20080922svn%{svnver} +%define svnver 4917 +%define snapshot 20090307svn%{svnver} Name: dfu-util Version: 0.1 @@ -72,6 +72,9 @@ %changelog +* Tue Mar 10 2009 Juha Tuomala - 0.1-0.6.20090307svn4917 +- Update to snpshot 4917. + * Tue Feb 24 2009 Fedora Release Engineering - 0.1-0.5.20080922svn4662 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Tue Mar 10 15:38:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 15:38:45 +0000 Subject: [pkgdb] kdepim3: ovasik has requested watchbugzilla Message-ID: <20090310153951.37E12208514@bastion.fedora.phx.redhat.com> ovasik has requested the watchbugzilla acl on kdepim3 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepim3 From pkgdb at fedoraproject.org Tue Mar 10 15:39:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 15:39:54 +0000 Subject: [pkgdb] kdepim3: ovasik has requested watchcommits Message-ID: <20090310153951.A5188208553@bastion.fedora.phx.redhat.com> ovasik has requested the watchcommits acl on kdepim3 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepim3 From pkgdb at fedoraproject.org Tue Mar 10 15:39:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 15:39:54 +0000 Subject: [pkgdb] kdepim3: ovasik has requested commit Message-ID: <20090310153954.274C0208556@bastion.fedora.phx.redhat.com> ovasik has requested the commit acl on kdepim3 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepim3 From pkgdb at fedoraproject.org Tue Mar 10 15:39:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 15:39:37 +0000 Subject: [pkgdb] kdepim3: ovasik has requested watchcommits Message-ID: <20090310153957.9340A2082B2@bastion.fedora.phx.redhat.com> ovasik has requested the watchcommits acl on kdepim3 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepim3 From pkgdb at fedoraproject.org Tue Mar 10 15:39:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 15:39:58 +0000 Subject: [pkgdb] kdepim3: ovasik has requested commit Message-ID: <20090310153959.57FA5208604@bastion.fedora.phx.redhat.com> ovasik has requested the commit acl on kdepim3 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepim3 From pkgdb at fedoraproject.org Tue Mar 10 15:40:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 15:40:09 +0000 Subject: [pkgdb] kdepim3: ovasik has requested watchbugzilla Message-ID: <20090310154006.753D3208609@bastion.fedora.phx.redhat.com> ovasik has requested the watchbugzilla acl on kdepim3 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepim3 From dsugar at fedoraproject.org Tue Mar 10 15:39:25 2009 From: dsugar at fedoraproject.org (David Sugar) Date: Tue, 10 Mar 2009 15:39:25 +0000 (UTC) Subject: rpms/eclipse-slide/devel eclipse-slide.spec,1.13,1.14 Message-ID: <20090310153925.AA5817002E@cvs1.fedora.phx.redhat.com> Author: dsugar Update of /cvs/pkgs/rpms/eclipse-slide/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8540 Modified Files: eclipse-slide.spec Log Message: Remove merged in comments Index: eclipse-slide.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-slide/devel/eclipse-slide.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- eclipse-slide.spec 10 Mar 2009 15:36:27 -0000 1.13 +++ eclipse-slide.spec 10 Mar 2009 15:38:55 -0000 1.14 @@ -135,12 +135,6 @@ * Thu Mar 5 2009 Dave Sugar - 1.3.12-1 - fix problem where some files where not being closed when they should have been -* Tue Dec 2 2008 Dave Sugar - 1.3.11-1 -- bunch of minor changes - mostly support for some dependant plugins -- some bug fixes - -* Tue Aug 19 2008 Dave Sugar - 1.3.10-1 -- fix problem with bulding for header projects * Tue Feb 24 2009 Fedora Release Engineering - 1.3.9-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From dsugar at fedoraproject.org Tue Mar 10 15:41:27 2009 From: dsugar at fedoraproject.org (David Sugar) Date: Tue, 10 Mar 2009 15:41:27 +0000 (UTC) Subject: rpms/eclipse-slide/devel eclipse-slide.spec,1.14,1.15 Message-ID: <20090310154127.8B7037002E@cvs1.fedora.phx.redhat.com> Author: dsugar Update of /cvs/pkgs/rpms/eclipse-slide/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9167 Modified Files: eclipse-slide.spec Log Message: Incorrect release - I wonder if it will let me tag now? Index: eclipse-slide.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-slide/devel/eclipse-slide.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- eclipse-slide.spec 10 Mar 2009 15:38:55 -0000 1.14 +++ eclipse-slide.spec 10 Mar 2009 15:40:56 -0000 1.15 @@ -21,7 +21,7 @@ #Release: 0.1.svn2029%{?dist} Source0: http://oss.tresys.com/projects/slide/chrome/site/src/%{name}-%{version}.tar.gz -Release: 6%{?dist} +Release: 1%{?dist} %define eclipse_name eclipse %define eclipse_base %{_datadir}/%{eclipse_name}/dropins/slide From hadess at fedoraproject.org Tue Mar 10 15:44:16 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 10 Mar 2009 15:44:16 +0000 (UTC) Subject: rpms/gnome-phone-manager/devel gnome-phone-manager.spec,1.32,1.33 Message-ID: <20090310154416.118A47002E@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-phone-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10057 Modified Files: gnome-phone-manager.spec Log Message: Need intltool as well Index: gnome-phone-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- gnome-phone-manager.spec 10 Mar 2009 15:33:48 -0000 1.32 +++ gnome-phone-manager.spec 10 Mar 2009 15:43:45 -0000 1.33 @@ -17,7 +17,7 @@ BuildRequires: evolution-data-server-devel BuildRequires: gtkspell-devel BuildRequires: telepathy-glib-devel -BuildRequires: perl(XML::Parser) +BuildRequires: intltool perl(XML::Parser) BuildRequires: gettext BuildRequires: desktop-file-utils From iarnell at fedoraproject.org Tue Mar 10 15:45:35 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Tue, 10 Mar 2009 15:45:35 +0000 (UTC) Subject: rpms/clc-intercal/F-9 clc-intercal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310154535.D7B687002E@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/clc-intercal/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10493/F-9 Modified Files: .cvsignore sources Added Files: clc-intercal.spec Log Message: initial import of clc-intercal --- NEW FILE clc-intercal.spec --- %define perversion 1.-94.-2 Name: clc-intercal Version: 0 Release: 0.1.%(echo %{perversion}|sed -e's/-/_/g')%{?dist} Summary: Compiler for the INTERCAL language License: BSD Group: Development/Libraries URL: http://intercal.freeshell.org/ Source0: http://intercal.freeshell.org/download/CLC-INTERCAL-%{perversion}/CLC-INTERCAL-%{perversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Curses) BuildRequires: perl(Gtk2) %description This package provides a Perl-based compiler for the INTERCAL programming language, usable either from the command line or as a Perl module. CLC-INTERCAL is designed to be almost compatible with the original (Princeton 1972) compiler. It also implements several extensions to the original language, including support for object orientation, operator overloading and quantum computing. %package UI-X Summary: Graphical user interface to CLC-INTERCAL Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description UI-X This package installs a graphical user interface to CLC-INTERCAL. At present, only the INTERCAL calculator, "intercalc", uses this interface, although a future release of "sick" will be able to use it as well. %prep %setup -q -n CLC-INTERCAL-%{perversion} cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ sed -e '/perl(MY)/d' EOF %define __perl_provides %{_builddir}/CLC-INTERCAL-%{perversion}/%{name}-prov chmod +x %{__perl_provides} %build %{__perl} Makefile.PL INSTALLDIRS=vendor # parallel build fails - don't use -j make %install rm -rf %{buildroot} make install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* find %{buildroot} -type f -name \*.pm | xargs chmod 644 # manually install documentation mkdir -p %{buildroot}%{_docdir}/%{name}-%{perversion} cp -p CLC-INTERCAL-Base-%{perversion}/{Changes,COPYING,MISSING,README,WISHLIST} \ %{buildroot}%{_docdir}/%{name}-%{perversion} for pkg in Docs ICALC INET UI-Curses UI-Line UI-X; do cp -p CLC-INTERCAL-${pkg}-%{perversion}/Changes \ %{buildroot}%{_docdir}/%{name}-%{perversion}/Changes-${pkg} cp -p CLC-INTERCAL-${pkg}-%{perversion}/README \ %{buildroot}%{_docdir}/%{name}-%{perversion}/README-${pkg} done cp -ap CLC-INTERCAL-Docs-%{perversion}/doc/{examples,html,INTERNET} \ %{buildroot}%{_docdir}/%{name}-%{perversion} # convert "bookworm" and "change" characters to utf-8 friendly versions for doc in $(find %{buildroot}%{_docdir}/%{name}-%{perversion}/{examples,INTERNET} -type f); do sed -i -e 's/\o245/V\o010-/g' -e 's/\o242/c\o010\//g' $doc done %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %docdir %{_docdir}/%{name}-%{perversion} %{_docdir}/%{name}-%{perversion} %exclude %{_docdir}/%{name}-%{perversion}/*-UI-X %{perl_vendorlib}/* %exclude %{perl_vendorlib}/Language/INTERCAL/Interface/X.pm %{_bindir}/* %{_mandir}/man1/* %{_mandir}/man3/* %files UI-X %defattr(-,root,root,-) %{_docdir}/%{name}-%{perversion}/*-UI-X %{perl_vendorlib}/Language/INTERCAL/Interface/X.pm %changelog * Thu Jan 29 2009 Iain Arnell 0-0.0.1._94._2 - pre-pre-escape 1.-94.-2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clc-intercal/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:06:00 -0000 1.1 +++ .cvsignore 10 Mar 2009 15:45:05 -0000 1.2 @@ -0,0 +1 @@ +CLC-INTERCAL-1.-94.-2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clc-intercal/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:06:00 -0000 1.1 +++ sources 10 Mar 2009 15:45:05 -0000 1.2 @@ -0,0 +1 @@ +e8e7128ac07a37abd7a51d00b74f36a0 CLC-INTERCAL-1.-94.-2.tar.gz From iarnell at fedoraproject.org Tue Mar 10 15:45:35 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Tue, 10 Mar 2009 15:45:35 +0000 (UTC) Subject: rpms/clc-intercal/F-10 clc-intercal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310154535.556057002E@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/clc-intercal/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10493/F-10 Modified Files: .cvsignore sources Added Files: clc-intercal.spec Log Message: initial import of clc-intercal --- NEW FILE clc-intercal.spec --- %define perversion 1.-94.-2 Name: clc-intercal Version: 0 Release: 0.1.%(echo %{perversion}|sed -e's/-/_/g')%{?dist} Summary: Compiler for the INTERCAL language License: BSD Group: Development/Libraries URL: http://intercal.freeshell.org/ Source0: http://intercal.freeshell.org/download/CLC-INTERCAL-%{perversion}/CLC-INTERCAL-%{perversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Curses) BuildRequires: perl(Gtk2) %description This package provides a Perl-based compiler for the INTERCAL programming language, usable either from the command line or as a Perl module. CLC-INTERCAL is designed to be almost compatible with the original (Princeton 1972) compiler. It also implements several extensions to the original language, including support for object orientation, operator overloading and quantum computing. %package UI-X Summary: Graphical user interface to CLC-INTERCAL Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description UI-X This package installs a graphical user interface to CLC-INTERCAL. At present, only the INTERCAL calculator, "intercalc", uses this interface, although a future release of "sick" will be able to use it as well. %prep %setup -q -n CLC-INTERCAL-%{perversion} cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ sed -e '/perl(MY)/d' EOF %define __perl_provides %{_builddir}/CLC-INTERCAL-%{perversion}/%{name}-prov chmod +x %{__perl_provides} %build %{__perl} Makefile.PL INSTALLDIRS=vendor # parallel build fails - don't use -j make %install rm -rf %{buildroot} make install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* find %{buildroot} -type f -name \*.pm | xargs chmod 644 # manually install documentation mkdir -p %{buildroot}%{_docdir}/%{name}-%{perversion} cp -p CLC-INTERCAL-Base-%{perversion}/{Changes,COPYING,MISSING,README,WISHLIST} \ %{buildroot}%{_docdir}/%{name}-%{perversion} for pkg in Docs ICALC INET UI-Curses UI-Line UI-X; do cp -p CLC-INTERCAL-${pkg}-%{perversion}/Changes \ %{buildroot}%{_docdir}/%{name}-%{perversion}/Changes-${pkg} cp -p CLC-INTERCAL-${pkg}-%{perversion}/README \ %{buildroot}%{_docdir}/%{name}-%{perversion}/README-${pkg} done cp -ap CLC-INTERCAL-Docs-%{perversion}/doc/{examples,html,INTERNET} \ %{buildroot}%{_docdir}/%{name}-%{perversion} # convert "bookworm" and "change" characters to utf-8 friendly versions for doc in $(find %{buildroot}%{_docdir}/%{name}-%{perversion}/{examples,INTERNET} -type f); do sed -i -e 's/\o245/V\o010-/g' -e 's/\o242/c\o010\//g' $doc done %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %docdir %{_docdir}/%{name}-%{perversion} %{_docdir}/%{name}-%{perversion} %exclude %{_docdir}/%{name}-%{perversion}/*-UI-X %{perl_vendorlib}/* %exclude %{perl_vendorlib}/Language/INTERCAL/Interface/X.pm %{_bindir}/* %{_mandir}/man1/* %{_mandir}/man3/* %files UI-X %defattr(-,root,root,-) %{_docdir}/%{name}-%{perversion}/*-UI-X %{perl_vendorlib}/Language/INTERCAL/Interface/X.pm %changelog * Thu Jan 29 2009 Iain Arnell 0-0.0.1._94._2 - pre-pre-escape 1.-94.-2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clc-intercal/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:06:00 -0000 1.1 +++ .cvsignore 10 Mar 2009 15:45:04 -0000 1.2 @@ -0,0 +1 @@ +CLC-INTERCAL-1.-94.-2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clc-intercal/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:06:00 -0000 1.1 +++ sources 10 Mar 2009 15:45:05 -0000 1.2 @@ -0,0 +1 @@ +e8e7128ac07a37abd7a51d00b74f36a0 CLC-INTERCAL-1.-94.-2.tar.gz From pkgdb at fedoraproject.org Tue Mar 10 15:50:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 15:50:31 +0000 Subject: [pkgdb] kdepim3 had acl change status Message-ID: <20090310155028.B50FD208503@bastion.fedora.phx.redhat.com> rdieter has set the commit acl on kdepim3 (Fedora devel) to Approved for ovasik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepim3 From pkgdb at fedoraproject.org Tue Mar 10 15:50:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 15:50:09 +0000 Subject: [pkgdb] kdepim3 had acl change status Message-ID: <20090310155029.CF296208514@bastion.fedora.phx.redhat.com> rdieter has set the watchcommits acl on kdepim3 (Fedora devel) to Approved for ovasik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepim3 From pkgdb at fedoraproject.org Tue Mar 10 15:49:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 15:49:26 +0000 Subject: [pkgdb] kdepim3 had acl change status Message-ID: <20090310155034.40426208553@bastion.fedora.phx.redhat.com> rdieter has set the watchbugzilla acl on kdepim3 (Fedora devel) to Approved for ovasik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepim3 From pkgdb at fedoraproject.org Tue Mar 10 15:50:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 15:50:39 +0000 Subject: [pkgdb] kdepim3 had acl change status Message-ID: <20090310155036.C1148208555@bastion.fedora.phx.redhat.com> rdieter has set the watchcommits acl on kdepim3 (Fedora 10) to Approved for ovasik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepim3 From pkgdb at fedoraproject.org Tue Mar 10 15:50:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 15:50:34 +0000 Subject: [pkgdb] kdepim3 had acl change status Message-ID: <20090310155038.87077208554@bastion.fedora.phx.redhat.com> rdieter has set the commit acl on kdepim3 (Fedora 10) to Approved for ovasik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepim3 From pkgdb at fedoraproject.org Tue Mar 10 15:50:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 15:50:19 +0000 Subject: [pkgdb] kdepim3 had acl change status Message-ID: <20090310155039.39C2D208608@bastion.fedora.phx.redhat.com> rdieter has set the watchbugzilla acl on kdepim3 (Fedora 10) to Approved for ovasik To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kdepim3 From mjakubicek at fedoraproject.org Tue Mar 10 15:52:22 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Tue, 10 Mar 2009 15:52:22 +0000 (UTC) Subject: rpms/boinc-client/F-10 boinc-client.spec,1.23,1.24 Message-ID: <20090310155222.0AA867002E@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/boinc-client/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12102 Modified Files: boinc-client.spec Log Message: - Fix damn typos in boincmgr wrapper script (resolves BZ#489463). Index: boinc-client.spec =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/F-10/boinc-client.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- boinc-client.spec 8 Mar 2009 21:14:14 -0000 1.23 +++ boinc-client.spec 10 Mar 2009 15:51:51 -0000 1.24 @@ -4,7 +4,7 @@ Summary: The BOINC client core Name: boinc-client Version: 6.4.7 -Release: 2.r%{revision}svn%{?dist} +Release: 3.r%{revision}svn%{?dist} License: LGPLv2+ Group: Applications/Engineering URL: http://boinc.berkeley.edu/ @@ -189,7 +189,7 @@ # Otherwise pull \$BOINCDIR from the init script if [ -z \$BOINCDIR ]; then - BOINCDIR='\`grep "BOINCDIR=" %{_sysconfdir}/init.d/%{name} | sed "s|BOINCDIR=||"\`'; + BOINCDIR="\`grep 'BOINCDIR=' %{_sysconfdir}/init.d/%{name} | sed 's|BOINCDIR=||'\`"; fi cd \$BOINCDIR @@ -313,6 +313,9 @@ %{_includedir}/boinc/* %changelog +* Tue Mar 10 2009 Milos Jakubicek - 6.4.7-3.r17542svn +- Fix damn typos in boincmgr wrapper script (resolves BZ#489463). + * Sun Mar 08 2009 Milos Jakubicek - 6.4.7-2.r17542svn - Fix overriding $BOINCOPTS from /etc/sysconfig/boinc-client in the init script (BZ#489199). From mjakubicek at fedoraproject.org Tue Mar 10 15:55:14 2009 From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=) Date: Tue, 10 Mar 2009 15:55:14 +0000 (UTC) Subject: rpms/boinc-client/F-9 boinc-client.spec,1.17,1.18 Message-ID: <20090310155514.15D9E7002E@cvs1.fedora.phx.redhat.com> Author: mjakubicek Update of /cvs/pkgs/rpms/boinc-client/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12834 Modified Files: boinc-client.spec Log Message: - Fix damn typos in boincmgr wrapper script (resolves BZ#489463). Index: boinc-client.spec =================================================================== RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-client.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- boinc-client.spec 8 Mar 2009 21:14:38 -0000 1.17 +++ boinc-client.spec 10 Mar 2009 15:54:43 -0000 1.18 @@ -4,7 +4,7 @@ Summary: The BOINC client core Name: boinc-client Version: 6.4.7 -Release: 2.r%{revision}svn%{?dist} +Release: 3.r%{revision}svn%{?dist} License: LGPLv2+ Group: Applications/Engineering URL: http://boinc.berkeley.edu/ @@ -189,7 +189,7 @@ # Otherwise pull \$BOINCDIR from the init script if [ -z \$BOINCDIR ]; then - BOINCDIR='\`grep "BOINCDIR=" %{_sysconfdir}/init.d/%{name} | sed "s|BOINCDIR=||"\`'; + BOINCDIR="\`grep 'BOINCDIR=' %{_sysconfdir}/init.d/%{name} | sed 's|BOINCDIR=||'\`"; fi cd \$BOINCDIR @@ -313,6 +313,9 @@ %{_includedir}/boinc/* %changelog +* Tue Mar 10 2009 Milos Jakubicek - 6.4.7-3.r17542svn +- Fix damn typos in boincmgr wrapper script (resolves BZ#489463). + * Sun Mar 08 2009 Milos Jakubicek - 6.4.7-2.r17542svn - Fix overriding $BOINCOPTS from /etc/sysconfig/boinc-client in the init script (BZ#489199). From iarnell at fedoraproject.org Tue Mar 10 15:45:37 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Tue, 10 Mar 2009 15:45:37 +0000 (UTC) Subject: rpms/clc-intercal/devel clc-intercal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310154537.43D517002E@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/clc-intercal/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10493/devel Modified Files: .cvsignore sources Added Files: clc-intercal.spec Log Message: initial import of clc-intercal --- NEW FILE clc-intercal.spec --- %define perversion 1.-94.-2 Name: clc-intercal Version: 0 Release: 0.1.%(echo %{perversion}|sed -e's/-/_/g')%{?dist} Summary: Compiler for the INTERCAL language License: BSD Group: Development/Libraries URL: http://intercal.freeshell.org/ Source0: http://intercal.freeshell.org/download/CLC-INTERCAL-%{perversion}/CLC-INTERCAL-%{perversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Curses) BuildRequires: perl(Gtk2) %description This package provides a Perl-based compiler for the INTERCAL programming language, usable either from the command line or as a Perl module. CLC-INTERCAL is designed to be almost compatible with the original (Princeton 1972) compiler. It also implements several extensions to the original language, including support for object orientation, operator overloading and quantum computing. %package UI-X Summary: Graphical user interface to CLC-INTERCAL Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description UI-X This package installs a graphical user interface to CLC-INTERCAL. At present, only the INTERCAL calculator, "intercalc", uses this interface, although a future release of "sick" will be able to use it as well. %prep %setup -q -n CLC-INTERCAL-%{perversion} cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ sed -e '/perl(MY)/d' EOF %define __perl_provides %{_builddir}/CLC-INTERCAL-%{perversion}/%{name}-prov chmod +x %{__perl_provides} %build %{__perl} Makefile.PL INSTALLDIRS=vendor # parallel build fails - don't use -j make %install rm -rf %{buildroot} make install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* find %{buildroot} -type f -name \*.pm | xargs chmod 644 # manually install documentation mkdir -p %{buildroot}%{_docdir}/%{name}-%{perversion} cp -p CLC-INTERCAL-Base-%{perversion}/{Changes,COPYING,MISSING,README,WISHLIST} \ %{buildroot}%{_docdir}/%{name}-%{perversion} for pkg in Docs ICALC INET UI-Curses UI-Line UI-X; do cp -p CLC-INTERCAL-${pkg}-%{perversion}/Changes \ %{buildroot}%{_docdir}/%{name}-%{perversion}/Changes-${pkg} cp -p CLC-INTERCAL-${pkg}-%{perversion}/README \ %{buildroot}%{_docdir}/%{name}-%{perversion}/README-${pkg} done cp -ap CLC-INTERCAL-Docs-%{perversion}/doc/{examples,html,INTERNET} \ %{buildroot}%{_docdir}/%{name}-%{perversion} # convert "bookworm" and "change" characters to utf-8 friendly versions for doc in $(find %{buildroot}%{_docdir}/%{name}-%{perversion}/{examples,INTERNET} -type f); do sed -i -e 's/\o245/V\o010-/g' -e 's/\o242/c\o010\//g' $doc done %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %docdir %{_docdir}/%{name}-%{perversion} %{_docdir}/%{name}-%{perversion} %exclude %{_docdir}/%{name}-%{perversion}/*-UI-X %{perl_vendorlib}/* %exclude %{perl_vendorlib}/Language/INTERCAL/Interface/X.pm %{_bindir}/* %{_mandir}/man1/* %{_mandir}/man3/* %files UI-X %defattr(-,root,root,-) %{_docdir}/%{name}-%{perversion}/*-UI-X %{perl_vendorlib}/Language/INTERCAL/Interface/X.pm %changelog * Thu Jan 29 2009 Iain Arnell 0-0.0.1._94._2 - pre-pre-escape 1.-94.-2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/clc-intercal/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 16:06:00 -0000 1.1 +++ .cvsignore 10 Mar 2009 15:45:05 -0000 1.2 @@ -0,0 +1 @@ +CLC-INTERCAL-1.-94.-2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/clc-intercal/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 16:06:00 -0000 1.1 +++ sources 10 Mar 2009 15:45:06 -0000 1.2 @@ -0,0 +1 @@ +e8e7128ac07a37abd7a51d00b74f36a0 CLC-INTERCAL-1.-94.-2.tar.gz From orion at fedoraproject.org Tue Mar 10 15:58:52 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Tue, 10 Mar 2009 15:58:52 +0000 (UTC) Subject: rpms/ncl/F-10 import.log, NONE, 1.1 ncarg.csh, NONE, 1.1 ncarg.sh, NONE, 1.1 ncl-5.1.0-includes.patch, NONE, 1.1 ncl-5.1.0-netcdff.patch, NONE, 1.1 ncl-5.1.0-ppc64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 ncl-5.0.0-atlas.patch, 1.1, 1.2 ncl.spec, 1.8, 1.9 sources, 1.2, 1.3 ncarg-4.4.2-ppc64.patch, 1.1, NONE ncl-5.0.0-flex.patch, 1.1, NONE ncl-5.0.0-hdf.patch, 1.2, NONE ncl-5.0.0-includes.patch, 1.2, NONE ncl-5.0.0-netcdff.patch, 1.1, NONE ncl-5.0.0-png.patch, 1.1, NONE ncl-5.0.0-triangle.patch, 1.1, NONE ncl-5.0.0-uint32.patch, 1.1, NONE ncl-5.0.0-wrapit.patch, 1.1, NONE Message-ID: <20090310155852.7DA317002E@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/ncl/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14076/F-10 Modified Files: .cvsignore ncl-5.0.0-atlas.patch ncl.spec sources Added Files: import.log ncarg.csh ncarg.sh ncl-5.1.0-includes.patch ncl-5.1.0-netcdff.patch ncl-5.1.0-ppc64.patch Removed Files: ncarg-4.4.2-ppc64.patch ncl-5.0.0-flex.patch ncl-5.0.0-hdf.patch ncl-5.0.0-includes.patch ncl-5.0.0-netcdff.patch ncl-5.0.0-png.patch ncl-5.0.0-triangle.patch ncl-5.0.0-uint32.patch ncl-5.0.0-wrapit.patch Log Message: Sync to devel - 4.1.0 --- NEW FILE import.log --- ncl-5_1_0-1_fc11:F-10:ncl-5.1.0-1.fc11.src.rpm:1236700597 --- NEW FILE ncarg.csh --- setenv NCARG_ROOT /usr setenv NCARG_LIB /usr/@LIB@/ncarg --- NEW FILE ncarg.sh --- export NCARG_ROOT=/usr export NCARG_LIB=/usr/@LIB@/ncarg ncl-5.1.0-includes.patch: --- NEW FILE ncl-5.1.0-includes.patch --- --- ncl_ncarg-5.0.0/common/src/libncarg_c/bcopyswap.c.includes 2000-08-21 22:03:31.000000000 -0600 +++ ncl_ncarg-5.0.0/common/src/libncarg_c/bcopyswap.c 2008-03-21 11:01:12.000000000 -0600 @@ -33,6 +33,7 @@ * of 4. */ #include +#include bcopyswap(b1, b2, size) char *b1; --- ncl_ncarg-5.0.0/common/src/bin/ncargpath/ncargpath.c.includes 2000-08-21 22:04:15.000000000 -0600 +++ ncl_ncarg-5.0.0/common/src/bin/ncargpath/ncargpath.c 2008-03-21 11:02:16.000000000 -0600 @@ -41,6 +41,7 @@ */ #include +#include #include #include --- ncl_ncarg-5.0.0/ncarg2d/src/libncarg/plotchar/bofred.c.includes 2000-08-22 09:05:20.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg/plotchar/bofred.c 2008-03-21 11:04:17.000000000 -0600 @@ -25,6 +25,10 @@ ************************************************************************/ +#include +#include +#include +#include #include #include --- ncl_ncarg-5.0.0/ncarg2d/src/libncarg/areasC/c_argeti.c.includes 2000-08-22 09:02:06.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg/areasC/c_argeti.c 2008-03-21 11:05:46.000000000 -0600 @@ -24,6 +24,7 @@ * * ************************************************************************/ +#include #include extern void NGCALLF(argeti,ARGETI)(NGstring,int*,int); --- ncl_ncarg-5.0.0/ncarg2d/src/libncarg/ncargC.h.includes 2008-03-21 11:10:43.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg/ncargC.h 2008-03-21 11:10:25.000000000 -0600 @@ -176,6 +176,12 @@ #endif ); +extern void NGCALLF(agback,AGBACK)( +#ifdef NeedFuncProto + void +#endif +); + extern char *c_agbnch( #ifdef NeedFuncProto int idsh --- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/raster.c.includes 2000-08-22 09:12:16.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/raster.c 2008-04-10 14:53:26.000000000 -0600 @@ -48,6 +48,7 @@ * */ #include +#include #include #include #include @@ -518,6 +519,7 @@ * RAS_ERROR or RAS_EOF if something went wrong. * *********************************************************************/ +int RasterLoadPalette(ras, colors) Raster *ras; unsigned char colors[768]; --- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.c.includes 2000-08-22 09:12:12.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.c 2008-04-10 14:57:14.000000000 -0600 @@ -71,6 +71,7 @@ /* Swiped from John Clyne */ +void _swapshort (bp, n) register char *bp; register unsigned n; @@ -86,6 +87,7 @@ } } +void _swaplong (bp, n) register char *bp; register unsigned n; @@ -112,6 +114,7 @@ * * Return the number of images in a file. Return -1 on error */ +int ImageCount_(name, format) char *name; char *format; --- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.h.includes 2008-04-10 14:57:41.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/misc.h 2008-04-10 15:00:16.000000000 -0600 @@ -0,0 +1,41 @@ +/* + * $Id$ + */ +/************************************************************************ +* * +* Copyright (C) 2000 * +* University Corporation for Atmospheric Research * +* All Rights Reserved * +* * +* This file is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published * +* by the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This software is distributed in the hope that 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 software; if not, write to the Free Software * +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +* USA. * +* * +************************************************************************/ + +/*********************************************************************** +* * +* Copyright (C) 1991 * +* University Corporation for Atmospheric Research * +* All Rights Reserved * +* * +* * +***********************************************************************/ +/* File: misc.h + */ + +int read_swap(FILE *fp, int nb, char *buf, int swapflag); +void _swapshort (register char *bp, register unsigned n); +void _swaplong (register char *bp, register unsigned n); +int ImageCount_(char *name, char *format); --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.c.includes 2008-04-10 15:29:16.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.c 2008-04-10 15:28:57.000000000 -0600 @@ -76,7 +76,7 @@ /* * Flushes out the output buffer. Called at the end of a picture. */ -flush() +void flush() { (void)write(outFD,outbuf,outbufnum); outbufnum = 0; @@ -86,7 +86,7 @@ * Copies the "count" number of chars from "str" into the output buffer, * flushing the buffer if need be. */ -buffer(str,count) +void buffer(str,count) SignedChar *str; int count; { --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.h.includes 2008-04-10 15:29:29.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/buffer.h 2008-04-10 15:31:08.000000000 -0600 @@ -0,0 +1,37 @@ +/* + * $Id$ + */ +/************************************************************************ +* * +* This file is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published * +* by the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This software is distributed in the hope that 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 software; if not, write to the Free Software * +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +* USA. * +* * +************************************************************************/ + +/*********************************************************************** +* * +* Copyright (C) 1990 * +* University Corporation for Atmospheric Research * +* All Rights Reserved * +* * +* NCAR View V3.01 - UNIX Release * +* * +***********************************************************************/ + +#include "ctrandef.h" + +int GcapOpenBuffer(char *file); +void flush(void); +void buffer(SignedChar *str, int count); --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.c.includes 2000-08-22 09:11:45.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.c 2008-04-10 15:15:45.000000000 -0600 @@ -99,7 +99,7 @@ -InitDefault() +void InitDefault() { static boolean isInit = FALSE; int max_intensity = (1 << DCP) - 1; @@ -173,7 +173,7 @@ colorLUTable.damage = FALSE; } -SetInPic(value) +void SetInPic(value) boolean value; { int i; @@ -1290,7 +1290,7 @@ /* * set mininum line width */ -SetMinLineWidthDefault(line_width) +void SetMinLineWidthDefault(line_width) float line_width; { @@ -1315,7 +1315,7 @@ /* * Set Maximum line width. */ -SetMaxLineWidthDefault(line_width) +void SetMaxLineWidthDefault(line_width) float line_width; { defaulttable.line_width = MIN(line_width, defaulttable.line_width); @@ -1330,7 +1330,7 @@ /* * set additional line scaling */ -SetAdditionalLineScale(line_scale) +void SetAdditionalLineScale(line_scale) float line_scale; { LINE_WIDTH_DAMAGE = TRUE; @@ -1344,7 +1344,7 @@ /* * set rgb intensity scaling */ -SetRGBIntensityScale(rgb_scale) +void SetRGBIntensityScale(rgb_scale) float rgb_scale; { COLOUR_TABLE_DAMAGE = TRUE; --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.h.includes 2000-08-21 21:30:26.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/default.h 2008-04-10 15:26:23.000000000 -0600 @@ -454,3 +454,73 @@ #define COLOUR_INDEX_RED(I) (clut->ce[(I)].rgb.red) #define COLOUR_INDEX_GREEN(I) (clut->ce[(I)].rgb.green) #define COLOUR_INDEX_BLUE(I) (clut->ce[(I)].rgb.blue) + +void InitDefault(void); +void _CtDefNoColorDefault(void); +void SetInPic(boolean value); +int MFVersion(CGMC *c); +int MFDesc(CGMC *c); +int VDCType(CGMC *c); +int IntergerPrec(CGMC *c); +int RealPrec(CGMC *c); +int IndexPrec(CGMC *c); +int ColrPrec(CGMC *c); +int ColrIndexPrec(CGMC *c); +int MaxColrIndex(CGMC *c); +int ColrValueExt(CGMC *c); +int MFElemList(CGMC *c); +int MFDefaults(CGMC *c); +int CharSetList(CGMC *c); +int CharCoding(CGMC *c); +int ScaleMode(CGMC *c); +int ColrMode(CGMC *c); +int LineWidthMode(CGMC *c); +int MarkerSizeMode(CGMC *c); +int EdgeWidthMode(CGMC *c); +int VDCExt(CGMC *c); +int BackColr(CGMC *c); +int VDCIntergerPrec(CGMC *c); +int VDCRealPrec(CGMC *c); +int AuxColr(CGMC *c); +int Transparency(CGMC *c); +int ClipRect(CGMC *c); +int Clip(CGMC *c); +int LineIndex(CGMC *c); +int LineType(CGMC *c); +int LineWidth(CGMC *c); +int LineColr(CGMC *c); +int MarkerIndex(CGMC *c); +int MarkerType(CGMC *c); +int MarkerSize(CGMC *c); +int MarkerColr(CGMC *c); +int TextIndex(CGMC *c); +int TextFontIndex(CGMC *c); +int TextPrec(CGMC *c); +int CharExpan(CGMC *c); +int CharSpace(CGMC *c); +int TextColr(CGMC *c); +int CharHeight(CGMC *c); +int CharOri(CGMC *c); +int TextPath(CGMC *c); +int TextAlign(CGMC *c); +int CharSetIndex(CGMC *c); +int AltCharSetIndex(CGMC *c); +int FillIndex(CGMC *c); +int IntStyle(CGMC *c); +int FillColr(CGMC *c); +int HatchIndex(CGMC *c); +int PatIndex(CGMC *c); +int EdgeIndex(CGMC *c); +int EdgeType(CGMC *c); +int EdgeWidth(CGMC *c); +int EdgeColr(CGMC *c); +int EdgeVis(CGMC *c); +int FillRefPt(CGMC *c); +int PatTable(CGMC *c); +int PatSize(CGMC *c); +int ColrTable(CGMC *c); +int ASF(CGMC *c); +void SetMinLineWidthDefault(float line_width); +void SetMaxLineWidthDefault(float line_width); +void SetAdditionalLineScale(float line_scale); +void SetRGBIntensityScale(float rgb_scale); --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/gcaprast.c.includes 2000-08-22 09:11:48.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/gcaprast.c 2008-04-10 15:32:49.000000000 -0600 @@ -44,6 +44,7 @@ #include #include +#include #include #include #include "cgmc.h" @@ -52,9 +53,8 @@ #include "ctrandef.h" #include "translate.h" #include "bitops.h" - - - +#include "buffer.h" +#include "format.h" static boolean Runlength; /* true if device wants run length encoded * pixel map --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/in.h.includes 2008-04-10 15:08:11.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/in.h 2008-04-10 15:08:42.000000000 -0600 @@ -29,6 +29,9 @@ * NCAR View V3.00 - UNIX Release * * * ***********************************************************************/ + +#include "cgmc.h" + #define BUFSIZE 1440 /*size of CGM buffer in bytes */ #define N -1 /*flag indicating any integer value */ #define STDIN 0 @@ -72,4 +75,5 @@ */ }; +int Instr_Dec(CGMC *cgmc); --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.c.includes 2000-08-22 09:11:50.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.c 2008-04-10 15:09:55.000000000 -0600 @@ -36,7 +36,7 @@ * Description: miscellaneous ctrans funcions */ -CoordStringToInt(s, llx, lly, urx, ury) +int CoordStringToInt(s, llx, lly, urx, ury) char *s; int *llx, *lly, *urx, *ury; { --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.h.includes 2008-04-10 15:10:15.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/misc.h 2008-04-10 15:11:11.000000000 -0600 @@ -0,0 +1,31 @@ +/* + * $Id$ + */ +/************************************************************************ +* * +* Copyright (C) 1992 * +* University Corporation for Atmospheric Research * +* All Rights Reserved * +* * +* This file is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published * +* by the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This software is distributed in the hope that 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 software; if not, write to the Free Software * +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +* USA. * +* * +************************************************************************/ + +/* + * File: misc.h + */ + +int CoordStringToInt(char *s, int *llx, int *lly, int *urx, int *ury); --- ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/rast.c.includes 2005-08-03 15:14:16.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libctrans/rast.c 2008-04-10 16:02:40.000000000 -0600 @@ -30,6 +30,7 @@ * * ***********************************************************************/ +#include "in.h" #include #include #include @@ -44,6 +45,7 @@ #include "ctrandef.h" #include "default.h" #include "devices.h" +#include "misc.h" extern boolean *softFill; extern boolean deviceIsInit; @@ -104,7 +106,7 @@ Raster *rastGrid; /* struct for creating output file */ boolean rasIsDirect; /* direct encoded image? */ -static build_ras_arg(ras_argc, ras_argv, rast_opts) +static int build_ras_arg(ras_argc, ras_argv, rast_opts) int *ras_argc; char **ras_argv; struct Opts rast_opts; @@ -166,7 +168,7 @@ } -static clear_grid(grid) +static void clear_grid(grid) Raster *grid; { if (rasIsDirect) { @@ -184,7 +186,7 @@ } } -static init_color_tab() +static void init_color_tab() { /* @@ -198,7 +200,7 @@ #define DEFAULT_WIDTH 512 /* default raster width */ #define DEFAULT_HEIGHT 512 /* default raster height */ -get_resolution(dev_extent, opts, name) +void get_resolution(dev_extent, opts, name) CoordRect *dev_extent; struct Opts opts; char *name; --- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/sunraster.c.includes 2000-08-22 09:12:19.000000000 -0600 +++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/sunraster.c 2008-04-10 17:02:27.000000000 -0600 @@ -59,8 +59,10 @@ #include #include #include +#include #include "ncarg_ras.h" #include "sunraster.h" +#include "misc.h" static char *FormatName = "sun"; @@ -235,18 +237,18 @@ dep = (SunInfo *) ras->dep; } - nb = write(ras->fd, (char *) dep, sizeof(SunInfo)); + nb = write(ras->fd, dep, sizeof(SunInfo)); if (nb != sizeof(SunInfo)) return(RAS_EOF); /* Write the color table. */ - nb = write(ras->fd, (char *) ras->red, ras->ncolor); + nb = write(ras->fd, ras->red, ras->ncolor); if (nb != ras->ncolor) return(RAS_EOF); - nb = write(ras->fd, (char *) ras->green, ras->ncolor); + nb = write(ras->fd, ras->green, ras->ncolor); if (nb != ras->ncolor) return(RAS_EOF); - nb = write(ras->fd, (char *) ras->blue, ras->ncolor); + nb = write(ras->fd, ras->blue, ras->ncolor); if (nb != ras->ncolor) return(RAS_EOF); /* ncl-5.1.0-netcdff.patch: --- NEW FILE ncl-5.1.0-netcdff.patch --- --- ncl_ncarg-5.1.0/ni/src/scripts/nhlf77.csh.orig 2008-02-06 17:22:03.000000000 -0700 +++ ncl_ncarg-5.1.0/ni/src/scripts/nhlf77.csh 2009-03-05 12:02:11.000000000 -0700 @@ -65,7 +65,7 @@ case "-netcdf": case "-cdf": - set extra_libs = "$extra_libs SED_NCDFLIBS" + set extra_libs = "$extra_libs SED_NCDFLIBS -lnetcdff" breaksw case "-hdf": ncl-5.1.0-ppc64.patch: --- NEW FILE ncl-5.1.0-ppc64.patch --- --- ncl_ncarg-5.1.0/config/ymake.ppc64 2009-03-05 10:54:12.000000000 -0700 +++ ncl_ncarg-5.1.0/config/ymake 2009-03-05 10:57:27.000000000 -0700 @@ -372,19 +372,13 @@ case amd64: case i*64: case x*64: - case p*64: + case ppc*: case alpha: set model = $mach set arch = $mach set sysincs = LINUX set vendor = IBM breaksw - case ppc: - set model = $mach - set arch = $mach - set sysincs = YDLINUX - set vendor = APPLE - breaksw default: echo "$0 : Unknown machine type" > /dev/tty exit 1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ncl/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Feb 2008 22:11:41 -0000 1.2 +++ .cvsignore 10 Mar 2009 15:58:19 -0000 1.3 @@ -1 +1 @@ -ncl_ncarg_src-5.0.0.tar.gz +ncl_ncarg_src-5.1.0.tar.gz ncl-5.0.0-atlas.patch: Index: ncl-5.0.0-atlas.patch =================================================================== RCS file: /cvs/pkgs/rpms/ncl/F-10/ncl-5.0.0-atlas.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ncl-5.0.0-atlas.patch 28 Feb 2008 22:11:41 -0000 1.1 +++ ncl-5.0.0-atlas.patch 10 Mar 2009 15:58:20 -0000 1.2 @@ -6,8 +6,8 @@ NCLAPILIB = -lNGncl -BLASLIB = -lblas_ncl -LAPACKLIB = -llapack_ncl -+BLASLIB = -lblas -+LAPACKLIB = -llapack ++BLASLIB = -lcblas -lf77blas -lptf77blas ++LAPACKLIB = -llapack -latlas SPHERELIB = -lsphere3.1_dp FFTPACK5LIB = -lfftpack5_dp @@ -17,8 +17,8 @@ NCLAPILIB = _UseLib(-L$(NCLLIBSRC),-lnclapi) -BLASLIB = _UseLib(-L$(BLASSRC),-lblas_ncl) -LAPACKLIB = _UseLib(-L$(LAPACKSRC),-llapack_ncl) -+BLASLIB = _UseLib(-L%LIBDIR%/atlas,-lblas) -+LAPACKLIB = _UseLib(-L%LIBDIR%/atlas,-llapack) ++BLASLIB = _UseLib(-L%LIBDIR%/atlas,-lcblas -lf77blas -lptf77blas) ++LAPACKLIB = _UseLib(-L%LIBDIR%/atlas,-llapack -latlas) SPHERELIB = _UseLib(-L$(SPHERESRC),-lsphere3.1_dp) FFTPACK5LIB = _UseLib(-L$(FFTPACK5SRC),-lfftpack5_dp) Index: ncl.spec =================================================================== RCS file: /cvs/pkgs/rpms/ncl/F-10/ncl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ncl.spec 8 Dec 2008 23:31:53 -0000 1.8 +++ ncl.spec 10 Mar 2009 15:58:21 -0000 1.9 @@ -1,14 +1,16 @@ Name: ncl -Version: 5.0.0 -Release: 15%{?dist} +Version: 5.1.0 +Release: 1%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering License: BSD URL: http://www.ncl.ucar.edu # You must register for a free account at http://www.earthsystemgrid.org/ before being able to download the source. -Source0: http://datanode.ucar.edu/data/xserve/ncl/5.0.0/binaries/source/ncl_ncarg_src-5.0.0.tar.gz +Source0: ncl_ncarg_src-%{version}.tar.gz Source1: Site.local.ncl +Source2: ncarg.csh +Source3: ncarg.sh # ymake uses cpp with some defines on the command line to generate a # Makefile which consists in: @@ -26,22 +28,16 @@ # Project, in NGENV_DESCRIPT. Patch0: ncl-5.0.0-paths.patch Patch1: ncarg-4.4.1-deps.patch -Patch2: ncarg-4.4.2-ppc64.patch -Patch4: ncl-5.0.0-triangle.patch -Patch5: ncl-5.0.0-flex.patch -Patch6: ncl-5.0.0-hdf.patch +Patch2: ncl-5.1.0-ppc64.patch Patch7: ncl-5.0.0-atlas.patch -Patch8: ncl-5.0.0-png.patch -Patch9: ncl-5.0.0-wrapit.patch # don't have the installation target depends on the build target since # for library it implies running ranlib and modifying the library timestamp Patch10: ncl-5.0.0-no_install_dep.patch # put install and build rules before script rules such that the default rule # is all Patch11: ncl-5.0.0-build_n_scripts.patch -Patch12: ncl-5.0.0-netcdff.patch -Patch13: ncl-5.0.0-includes.patch -Patch14: ncl-5.0.0-uint32.patch +Patch12: ncl-5.1.0-netcdff.patch +Patch13: ncl-5.1.0-includes.patch # Use /etc/udunits.dat Patch15: ncl-5.0.0-udunits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +48,7 @@ BuildRequires: imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel BuildRequires: byacc, flex BuildRequires: udunits-devel +Requires: %{name}-common = %{version}-%{release} Requires: udunits Provides: ncarg = %{version}-%{release} @@ -76,6 +73,16 @@ files to netCDF formatted files. +%package common +Summary: Common files for NCL and NCAR Graphics +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description common +%{summary}. + + %package devel Summary: Development files for NCL and NCAR Graphics Group: Development/Libraries @@ -93,6 +100,7 @@ Summary: Example programs and data using NCL Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} +BuildArch: noarch %description examples Example programs and data using NCL. @@ -100,27 +108,16 @@ %prep %setup -q -n ncl_ncarg-%{version} -#%patch0 -p1 -b .rpmroot %patch0 -p1 -b .paths %patch1 -p1 -b .deps %patch2 -p1 -b .ppc64 -%patch4 -p1 -b .triangle -%patch5 -p1 -b .flex -%patch6 -p1 -b .hdf %patch7 -p1 -b .atlas -%patch8 -p1 -b .png -%patch9 -p1 -b .wrapit %patch10 -p1 -b .no_install_dep %patch11 -p1 -b .build_n_scripts %patch12 -p1 -b .netcdff %patch13 -p1 -b .includes -%patch14 -p1 -b .uint32 %patch15 -p1 -b .udunits -#Move wrapit.c to wrapit77.c to avoid flex make rule issues -#This works in combination with the wrapit patch -mv ni/src/mkwrap/wrapit.c ni/src/mkwrap/wrapit77.c - #Use ppc config if needed %ifarch ppc ppc64 cp config/LINUX.ppc32.GNU config/LINUX @@ -141,6 +138,10 @@ -e 's;@libdir@;%{_libdir};' \ %{SOURCE1} > config/Site.local +#Setup the profile scripts +cp %{SOURCE2} %{SOURCE3} . +sed -i -e s, at LIB@,%{_lib},g ncarg.csh ncarg.sh + pushd ni/src/examples for file in */*.ncl; do sed -i -e 's;load "\$NCARG_ROOT/lib/ncarg/nclex\([^ ;]*\);loadscript(ncargpath("nclex") + "\1);' \ @@ -169,8 +170,8 @@ rm -rf $RPM_BUILD_ROOT export NCARG=`pwd` make install DESTDIR=$RPM_BUILD_ROOT -#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d -#install -m 0644 ncarg.csh ncarg.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +install -m 0644 ncarg.csh ncarg.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d # Don't conflict with allegro-devel (generic API names) for manpage in $RPM_BUILD_ROOT%{_mandir}/man3/* do @@ -190,7 +191,7 @@ %files %defattr(-,root,root,-) %doc COPYING Copyright README -#%{_sysconfdir}/profile.d/ncarg.*sh +%{_sysconfdir}/profile.d/ncarg.*sh %{_bindir}/ConvertMapData %{_bindir}/WriteLineFile %{_bindir}/WriteNameFile @@ -237,6 +238,9 @@ %{_bindir}/tdpackdemo %{_bindir}/tgks0a %{_bindir}/tlocal + +%files common +%defattr(-,root,root,-) %dir %{_datadir}/ncarg %{_datadir}/ncarg/colormaps/ %{_datadir}/ncarg/data/ @@ -274,12 +278,11 @@ %{_libdir}/ncarg/libncarg_ras.a %{_libdir}/ncarg/libncl.a %{_libdir}/ncarg/libnclapi.a -%{_libdir}/ncarg/libnio.a %{_libdir}/ncarg/libngmath.a %{_libdir}/ncarg/libnfp.a %{_libdir}/ncarg/libnfpfort.a %{_libdir}/ncarg/libsphere3.1_dp.a -%{_libdir}/ncarg/ncarg/robj/ +%{_libdir}/ncarg/ncarg/ %{_mandir}/man3/*.gz %files examples @@ -295,6 +298,25 @@ %changelog +* Thu Mar 5 2009 - Orion Poplawski - 5.1.0-1 +- Update to 5.1.0 +- Rebase ppc64, netcdff patch +- Drop triangle, flex, hdf, png, wrapit, uint32 patch upstreamed + +* Tue Feb 24 2009 - Orion Poplawski - 5.0.0-19 +- Rebuild for gcc 4.4.0 and other changes +- Move data files into noarch sub-package +- Make examples sub-package noarch + +* Mon Feb 2 2009 - Orion Poplawski - 5.0.0-18 +- Fix unowned directory (bug #483468) + +* Mon Dec 15 2008 Deji Akingunola - 5.0.0-17 +- Rebuild for atlas-3.8.2 + +* Fri Dec 12 2008 - Orion Poplawski - 5.0.0-16 +- Re-add profile.d startup scripts to set NCARG env variables + * Mon Dec 8 2008 - Orion Poplawski - 5.0.0-15 - Try changing the udunits path in config/Project Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ncl/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Feb 2008 22:11:41 -0000 1.2 +++ sources 10 Mar 2009 15:58:21 -0000 1.3 @@ -1 +1 @@ -3a1bfbab90ebce230c1f494949534f8a ncl_ncarg_src-5.0.0.tar.gz +6fbc5e0e378dff1caaf1bf6a9c76ea5e ncl_ncarg_src-5.1.0.tar.gz --- ncarg-4.4.2-ppc64.patch DELETED --- --- ncl-5.0.0-flex.patch DELETED --- --- ncl-5.0.0-hdf.patch DELETED --- --- ncl-5.0.0-includes.patch DELETED --- --- ncl-5.0.0-netcdff.patch DELETED --- --- ncl-5.0.0-png.patch DELETED --- --- ncl-5.0.0-triangle.patch DELETED --- --- ncl-5.0.0-uint32.patch DELETED --- --- ncl-5.0.0-wrapit.patch DELETED --- From jreznik at fedoraproject.org Tue Mar 10 16:10:42 2009 From: jreznik at fedoraproject.org (Jaroslav Reznik) Date: Tue, 10 Mar 2009 16:10:42 +0000 (UTC) Subject: rpms/dfu-util/devel dfu-util.spec,1.4,1.5 Message-ID: <20090310161042.5E3F17002E@cvs1.fedora.phx.redhat.com> Author: jreznik Update of /cvs/pkgs/rpms/dfu-util/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17815 Modified Files: dfu-util.spec Log Message: * Tue Mar 10 2009 Jaroslav Reznik - 0.1-0.7.20090307svn4917 - glibc-devel BR Index: dfu-util.spec =================================================================== RCS file: /cvs/pkgs/rpms/dfu-util/devel/dfu-util.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dfu-util.spec 10 Mar 2009 15:37:21 -0000 1.4 +++ dfu-util.spec 10 Mar 2009 16:10:11 -0000 1.5 @@ -4,7 +4,7 @@ Name: dfu-util Version: 0.1 -Release: 0.5.%{snapshot}%{?dist} +Release: 0.7.%{snapshot}%{?dist} Summary: USB Device Firmware Upgrade tool Group: Development/Tools @@ -21,7 +21,7 @@ Source0: dfu-util-%{snapshot}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf automake libusb-devel libusb-static +BuildRequires: autoconf automake libusb-devel libusb-static glibc-devel # upstream is broken for 64bit binaries, it compiles but fails when used. ExcludeArch: x86_64 ppc64 sparc64 @@ -72,6 +72,9 @@ %changelog +* Tue Mar 10 2009 Jaroslav Reznik - 0.1-0.7.20090307svn4917 +- glibc-devel BR + * Tue Mar 10 2009 Juha Tuomala - 0.1-0.6.20090307svn4917 - Update to snpshot 4917. From iarnell at fedoraproject.org Tue Mar 10 16:19:15 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Tue, 10 Mar 2009 16:19:15 +0000 (UTC) Subject: rpms/perl-HTML-Tiny/F-9 .cvsignore, 1.2, 1.3 perl-HTML-Tiny.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090310161915.3244D7002E@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-HTML-Tiny/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20371/F-9 Modified Files: .cvsignore perl-HTML-Tiny.spec sources Log Message: * Tue Mar 10 2009 Iain Arnell 1.05-1 - update to latest upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Tiny/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Nov 2008 07:22:50 -0000 1.2 +++ .cvsignore 10 Mar 2009 16:18:44 -0000 1.3 @@ -1 +1 @@ -HTML-Tiny-1.03.tar.gz +HTML-Tiny-1.05.tar.gz Index: perl-HTML-Tiny.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Tiny/F-9/perl-HTML-Tiny.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-HTML-Tiny.spec 23 Nov 2008 07:22:50 -0000 1.1 +++ perl-HTML-Tiny.spec 10 Mar 2009 16:18:44 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-HTML-Tiny -Version: 1.03 +Version: 1.05 Release: 1%{?dist} Summary: Lightweight, dependency free HTML/XML generation License: GPL+ or Artistic @@ -47,5 +47,8 @@ %{_mandir}/man3/* %changelog +* Tue Mar 10 2009 Iain Arnell 1.05-1 +- update to latest upstream + * Tue Nov 18 2008 Iain Arnell 1.03-1 - Specfile autogenerated by cpanspec 1.77. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Tiny/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Nov 2008 07:22:50 -0000 1.2 +++ sources 10 Mar 2009 16:18:44 -0000 1.3 @@ -1 +1 @@ -ce178f7dabb15930512fdbfe21d4edcb HTML-Tiny-1.03.tar.gz +f683dbc8e4570ba08d0fcb1f50c1b6dc HTML-Tiny-1.05.tar.gz From iarnell at fedoraproject.org Tue Mar 10 16:19:14 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Tue, 10 Mar 2009 16:19:14 +0000 (UTC) Subject: rpms/perl-HTML-Tiny/F-10 .cvsignore, 1.2, 1.3 perl-HTML-Tiny.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090310161914.B578C7002E@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-HTML-Tiny/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20371/F-10 Modified Files: .cvsignore perl-HTML-Tiny.spec sources Log Message: * Tue Mar 10 2009 Iain Arnell 1.05-1 - update to latest upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Tiny/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Nov 2008 07:22:49 -0000 1.2 +++ .cvsignore 10 Mar 2009 16:18:43 -0000 1.3 @@ -1 +1 @@ -HTML-Tiny-1.03.tar.gz +HTML-Tiny-1.05.tar.gz Index: perl-HTML-Tiny.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Tiny/F-10/perl-HTML-Tiny.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-HTML-Tiny.spec 23 Nov 2008 07:22:49 -0000 1.1 +++ perl-HTML-Tiny.spec 10 Mar 2009 16:18:43 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-HTML-Tiny -Version: 1.03 +Version: 1.05 Release: 1%{?dist} Summary: Lightweight, dependency free HTML/XML generation License: GPL+ or Artistic @@ -47,5 +47,8 @@ %{_mandir}/man3/* %changelog +* Tue Mar 10 2009 Iain Arnell 1.05-1 +- update to latest upstream + * Tue Nov 18 2008 Iain Arnell 1.03-1 - Specfile autogenerated by cpanspec 1.77. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Tiny/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Nov 2008 07:22:50 -0000 1.2 +++ sources 10 Mar 2009 16:18:43 -0000 1.3 @@ -1 +1 @@ -ce178f7dabb15930512fdbfe21d4edcb HTML-Tiny-1.03.tar.gz +f683dbc8e4570ba08d0fcb1f50c1b6dc HTML-Tiny-1.05.tar.gz From iarnell at fedoraproject.org Tue Mar 10 16:19:15 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Tue, 10 Mar 2009 16:19:15 +0000 (UTC) Subject: rpms/perl-HTML-Tiny/devel .cvsignore, 1.2, 1.3 perl-HTML-Tiny.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090310161915.E39147002E@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-HTML-Tiny/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20371/devel Modified Files: .cvsignore perl-HTML-Tiny.spec sources Log Message: * Tue Mar 10 2009 Iain Arnell 1.05-1 - update to latest upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Tiny/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Nov 2008 07:22:51 -0000 1.2 +++ .cvsignore 10 Mar 2009 16:18:45 -0000 1.3 @@ -1 +1 @@ -HTML-Tiny-1.03.tar.gz +HTML-Tiny-1.05.tar.gz Index: perl-HTML-Tiny.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Tiny/devel/perl-HTML-Tiny.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-HTML-Tiny.spec 26 Feb 2009 17:52:17 -0000 1.2 +++ perl-HTML-Tiny.spec 10 Mar 2009 16:18:45 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-HTML-Tiny -Version: 1.03 -Release: 2%{?dist} +Version: 1.05 +Release: 1%{?dist} Summary: Lightweight, dependency free HTML/XML generation License: GPL+ or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 10 2009 Iain Arnell 1.05-1 +- update to latest upstream + * Thu Feb 26 2009 Fedora Release Engineering - 1.03-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Tiny/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Nov 2008 07:22:51 -0000 1.2 +++ sources 10 Mar 2009 16:18:45 -0000 1.3 @@ -1 +1 @@ -ce178f7dabb15930512fdbfe21d4edcb HTML-Tiny-1.03.tar.gz +f683dbc8e4570ba08d0fcb1f50c1b6dc HTML-Tiny-1.05.tar.gz From davej at fedoraproject.org Tue Mar 10 16:21:56 2009 From: davej at fedoraproject.org (Dave Jones) Date: Tue, 10 Mar 2009 16:21:56 +0000 (UTC) Subject: rpms/kernel/devel patch-2.6.29-rc7-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.1029, 1.1030 kernel.spec, 1.1406, 1.1407 sources, 1.990, 1.991 upstream, 1.902, 1.903 Message-ID: <20090310162156.827207002E@cvs1.fedora.phx.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21403 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.29-rc7-git3.bz2.sign Log Message: 2.6.29-rc7-git3 --- NEW FILE patch-2.6.29-rc7-git3.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBJta37yGugalF9Dw4RAp4nAJsFV+1irXI9wUHrJh1IvolEzM5MhACfWC/L qH/MUzESq0kB2C1AFyQ7r3E= =eRey -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.1029 retrieving revision 1.1030 diff -u -r1.1029 -r1.1030 --- .cvsignore 9 Mar 2009 17:01:56 -0000 1.1029 +++ .cvsignore 10 Mar 2009 16:21:23 -0000 1.1030 @@ -6,4 +6,4 @@ kernel-2.6.28 linux-2.6.28.tar.bz2 patch-2.6.29-rc7.bz2 -patch-2.6.29-rc7-git2.bz2 +patch-2.6.29-rc7-git3.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1406 retrieving revision 1.1407 diff -u -r1.1406 -r1.1407 --- kernel.spec 10 Mar 2009 15:34:31 -0000 1.1406 +++ kernel.spec 10 Mar 2009 16:21:24 -0000 1.1407 @@ -58,7 +58,7 @@ # The rc snapshot level %define rcrev 7 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1815,6 +1815,9 @@ # and build. %changelog +* Tue Mar 10 2009 Dave Jones 2.6.29-0.227.rc7.git3 +- 2.6.29-rc7-git3 + * Tue Mar 10 2009 Dave Jones - HID: add support for another version of 0e8f:0003 device in hid-pl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.990 retrieving revision 1.991 diff -u -r1.990 -r1.991 --- sources 9 Mar 2009 17:01:57 -0000 1.990 +++ sources 10 Mar 2009 16:21:25 -0000 1.991 @@ -1,3 +1,2 @@ d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2 9404c2ead603a80a3aad6361b5fc5413 patch-2.6.29-rc7.bz2 -35d497f3dd989d00ffbcf379fc3ea5ac patch-2.6.29-rc7-git2.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.902 retrieving revision 1.903 diff -u -r1.902 -r1.903 --- upstream 9 Mar 2009 17:01:57 -0000 1.902 +++ upstream 10 Mar 2009 16:21:25 -0000 1.903 @@ -1,3 +1,3 @@ linux-2.6.28.tar.bz2 patch-2.6.29-rc7.bz2 -patch-2.6.29-rc7-git2.bz2 +patch-2.6.29-rc7-git3.bz2 From s4504kr at fedoraproject.org Tue Mar 10 16:25:18 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Tue, 10 Mar 2009 16:25:18 +0000 (UTC) Subject: rpms/itext/devel .cvsignore, 1.4, 1.5 itext.spec, 1.16, 1.17 sources, 1.5, 1.6 Message-ID: <20090310162518.5CD1F7002E@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/itext/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22449 Modified Files: .cvsignore itext.spec sources Log Message: New upstream relase Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/itext/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Nov 2008 08:09:19 -0000 1.4 +++ .cvsignore 10 Mar 2009 16:24:47 -0000 1.5 @@ -1 +1 @@ -iText-src-2.1.4.tar.gz +iText-src-2.1.5.tar.gz Index: itext.spec =================================================================== RCS file: /cvs/extras/rpms/itext/devel/itext.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- itext.spec 4 Mar 2009 04:52:18 -0000 1.16 +++ itext.spec 10 Mar 2009 16:24:47 -0000 1.17 @@ -3,8 +3,8 @@ Summary: A Free Java-PDF library Name: itext -Version: 2.1.4 -Release: 5%{?dist} +Version: 2.1.5 +Release: 1%{?dist} License: (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and MIT and LGPLv2+ and CC-BY URL: http://www.lowagie.com/iText/ Group: Development/Libraries @@ -141,6 +141,9 @@ # ----------------------------------------------------------------------------- %changelog +* Tue Mar 10 2009 Jochen Schmitt 2.1.5-1 +- New upstream release + * Tue Mar 03 2009 Orcan Ogetbil 2.1.4-5 - Remove the odd Provides introduced in the 2.1.4-3 build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/itext/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Nov 2008 08:09:19 -0000 1.5 +++ sources 10 Mar 2009 16:24:47 -0000 1.6 @@ -1 +1 @@ -ae115ff488c8e3a27c4e3aa6a465b174 iText-src-2.1.4.tar.gz +82a2532130da3f35e749bda6f1b99ba0 iText-src-2.1.5.tar.gz From pgordon at fedoraproject.org Tue Mar 10 16:32:53 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Tue, 10 Mar 2009 16:32:53 +0000 (UTC) Subject: rpms/midori/devel midori.spec,1.18,1.19 Message-ID: <20090310163253.8F6787002E@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/midori/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24507 Modified Files: midori.spec Log Message: Build with IDN support (via libidn). Index: midori.spec =================================================================== RCS file: /cvs/pkgs/rpms/midori/devel/midori.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- midori.spec 10 Mar 2009 05:20:49 -0000 1.18 +++ midori.spec 10 Mar 2009 16:32:22 -0000 1.19 @@ -1,6 +1,6 @@ Name: midori Version: 0.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A lightweight GTK+ web browser Group: Applications/Internet @@ -11,12 +11,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -## TODO: For IDN support, we need libidn 1.0+, but that's currently stalled -## from entering Fedora due to license-change issues. (#302111) BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gtksourceview2-devel BuildRequires: intltool +BuildRequires: libidn-devel BuildRequires: libsexy-devel BuildRequires: librsvg2 BuildRequires: libsoup-devel @@ -102,6 +101,9 @@ %changelog +* Tue Mar 10 2009 Peter Gordon - 0.1.4-2 +- Build against the recently-updated libidn for proper IDN support. + * Mon Mar 09 2009 Peter Gordon - Add TODO note about libidn support. (Thanks to Kevin Fenzi via IRC.) From rdieter at fedoraproject.org Tue Mar 10 16:37:08 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Tue, 10 Mar 2009 16:37:08 +0000 (UTC) Subject: comps comps-f11.xml.in,1.151,1.152 Message-ID: <20090310163708.0C4307002E@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26284 Modified Files: comps-f11.xml.in Log Message: kde-desktop: +kdebluetooth Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- comps-f11.xml.in 9 Mar 2009 16:03:15 -0000 1.151 +++ comps-f11.xml.in 10 Mar 2009 16:36:37 -0000 1.152 @@ -3172,6 +3172,7 @@ kdeaccessibility kdeartwork kdebase + kdebluetooth kdegames kdegraphics kdemultimedia From dsugar at fedoraproject.org Tue Mar 10 16:40:57 2009 From: dsugar at fedoraproject.org (David Sugar) Date: Tue, 10 Mar 2009 16:40:57 +0000 (UTC) Subject: rpms/eclipse-slide/F-10 eclipse-slide.spec, 1.15, 1.16 sources, 1.8, 1.9 Message-ID: <20090310164057.B8DB07002E@cvs1.fedora.phx.redhat.com> Author: dsugar Update of /cvs/pkgs/rpms/eclipse-slide/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27221 Modified Files: eclipse-slide.spec sources Log Message: mostly bug fixes new version 1.3.12 Index: eclipse-slide.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-slide/F-10/eclipse-slide.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- eclipse-slide.spec 4 Dec 2008 15:28:44 -0000 1.15 +++ eclipse-slide.spec 10 Mar 2009 16:40:27 -0000 1.16 @@ -1,7 +1,7 @@ #ExclusiveArch: i386 x86_64 #BuildRequires: perl(XML::XPath) -BuildRequires: eclipse-pde +BuildRequires: eclipse-pde >= 3.2 BuildRequires: javacc BuildRequires: ant >= 1.6 BuildRequires: jpackage-utils >= 0:1.5 @@ -21,7 +21,7 @@ #Release: 0.1.svn2029%{?dist} Source0: http://oss.tresys.com/projects/slide/chrome/site/src/%{name}-%{version}.tar.gz -Release: 3%{?dist} +Release: 1%{?dist} %define eclipse_name eclipse %define eclipse_base %{_datadir}/%{eclipse_name}/dropins/slide @@ -35,7 +35,7 @@ Summary: SELinux policy editing plugin for Eclipse Name: eclipse-slide -Version: 1.3.11 +Version: 1.3.12 License: GPLv2 BuildArch: noarch @@ -133,6 +133,9 @@ %{eclipse_base}/features/com.tresys.slide*/ %changelog +* Thu Mar 5 2009 Dave Sugar - 1.3.12-1 +- fix problem where some files where not being closed when they should have been + * Thu Dec 4 2008 Dave Sugar - 1.3.11-3 - missing features dir Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-slide/F-10/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 4 Dec 2008 15:08:50 -0000 1.8 +++ sources 10 Mar 2009 16:40:27 -0000 1.9 @@ -1 +1 @@ -85b40b86cf6c8f930f34b47b84bd1003 eclipse-slide-1.3.11.tar.gz +f42957d1612298da1a552b8d91fbe192 eclipse-slide-1.3.12.tar.gz From rbhalera at fedoraproject.org Tue Mar 10 16:49:12 2009 From: rbhalera at fedoraproject.org (Rahul Bhalerao) Date: Tue, 10 Mar 2009 16:49:12 +0000 (UTC) Subject: rpms/lklug-fonts/devel lklug-fonts.spec,1.4,1.5 Message-ID: <20090310164912.BB0E17002E@cvs1.fedora.phx.redhat.com> Author: rbhalera Update of /cvs/pkgs/rpms/lklug-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29370 Modified Files: lklug-fonts.spec Log Message: Spec update Index: lklug-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/lklug-fonts/devel/lklug-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lklug-fonts.spec 25 Feb 2009 20:41:37 -0000 1.4 +++ lklug-fonts.spec 10 Mar 2009 16:48:42 -0000 1.5 @@ -1,61 +1,55 @@ %define fontname lklug -%define fontdir %{_datadir}/fonts/%{fontname} -Name: %{fontname}-fonts -Version: 0.2.2 -Release: 7%{?dist} -License: GPLv2+ -Source: lklug-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -# provides can be dropped for F11 -Provides: fonts-sinhala = 0.2.2-3 -Obsoletes: fonts-sinhala <= 0.2.2-2 -Group: User Interface/X -Summary: Fonts for Sinhala language -URL: http://sinhala.sourceforge.net/ - +Name: %{fontname}-fonts +# Do not trust font metadata versionning unless you've checked upstream does +# update versions on file changes. When in doubt use the timestamp of the most +# recent file as version. +Version: 0.2.2 +Release: 8%{?dist} +Summary: Fonts for Sinhala language + +Group: User Interface/X +License: GPLv2+ +URL: http://sinhala.sourceforge.net/ +Source: lklug-%{version}.tar.gz +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +BuildArch: noarch +BuildRequires: fontpackages-devel +Requires: fontpackages-filesystem + %description The lklug-fonts package contains fonts for the display of Sinhala. The original font for TeX/LaTeX is developed by Yannis Haralambous and are in GPL. OTF tables are added by Anuradha Ratnaweera and Harshani Devadithya. - %prep %setup -q -n %{fontname}-%{version} + %build -echo "Nothing to do in Build." + %install -rm -rf %{buildroot} +rm -fr %{buildroot} -install -m 0755 -d %{buildroot}%{fontdir} -install -m 0644 -p *.ttf %{buildroot}%{fontdir} +install -m 0755 -d %{buildroot}%{_fontdir} +install -m 0644 -p *.ttf %{buildroot}%{_fontdir} +echo %{fontdir} %clean -rm -rf %{buildroot} +rm -fr %{buildroot} -%post -if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir} -fi - -%postun -if [ "$1" = "0" ]; then - if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{fontdir}/fonts - fi -fi - -%files -%defattr(-,root,root,-) +%_font_pkg *.ttf %doc license.txt COPYING -%dir %{fontdir} -%{fontdir}/*.ttf +%dir %{_fontdir} + %changelog +* Mon Mar 09 2009 Rahul Bhalerao - 0.2.2-8 +- Following new font packaging guidelines + * Wed Feb 25 2009 Fedora Release Engineering - 0.2.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -69,7 +63,7 @@ - Updated according to the review * Thu Oct 04 2007 Rahul Bhalerao - 0.2.2-3 -- Using common template of font spec file +- Using common template of font spec file * Thu Oct 04 2007 Rahul Bhalerao - 0.2.2-2 - Spec cleanup From dsugar at fedoraproject.org Tue Mar 10 16:54:39 2009 From: dsugar at fedoraproject.org (David Sugar) Date: Tue, 10 Mar 2009 16:54:39 +0000 (UTC) Subject: rpms/eclipse-slide/F-10 eclipse-slide.spec,1.16,1.17 Message-ID: <20090310165439.64B557002E@cvs1.fedora.phx.redhat.com> Author: dsugar Update of /cvs/pkgs/rpms/eclipse-slide/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30905 Modified Files: eclipse-slide.spec Log Message: I'll get it right eventually Index: eclipse-slide.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-slide/F-10/eclipse-slide.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- eclipse-slide.spec 10 Mar 2009 16:40:27 -0000 1.16 +++ eclipse-slide.spec 10 Mar 2009 16:54:08 -0000 1.17 @@ -21,7 +21,7 @@ #Release: 0.1.svn2029%{?dist} Source0: http://oss.tresys.com/projects/slide/chrome/site/src/%{name}-%{version}.tar.gz -Release: 1%{?dist} +Release: 3%{?dist} %define eclipse_name eclipse %define eclipse_base %{_datadir}/%{eclipse_name}/dropins/slide @@ -133,7 +133,7 @@ %{eclipse_base}/features/com.tresys.slide*/ %changelog -* Thu Mar 5 2009 Dave Sugar - 1.3.12-1 +* Thu Mar 5 2009 Dave Sugar - 1.3.12-3 - fix problem where some files where not being closed when they should have been * Thu Dec 4 2008 Dave Sugar - 1.3.11-3 From spot at fedoraproject.org Tue Mar 10 17:10:40 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 10 Mar 2009 17:10:40 +0000 (UTC) Subject: rpms/kernel/devel config-sparc64-generic, 1.22, 1.23 kernel.spec, 1.1407, 1.1408 Message-ID: <20090310171040.920147002E@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3688 Modified Files: config-sparc64-generic kernel.spec Log Message: disable CONFIG_AGP on sparc64 Index: config-sparc64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- config-sparc64-generic 9 Mar 2009 21:20:48 -0000 1.22 +++ config-sparc64-generic 10 Mar 2009 17:10:09 -0000 1.23 @@ -90,7 +90,7 @@ # CONFIG_FB_CIRRUS is not set # CONFIG_FB_ATY128 is not set # CONFIG_FB_KYRO is not set - +# CONFIG_AGP is not set # CONFIG_DRM_NOUVEAU is not set # CONFIG_MDA_CONSOLE is not set # CONFIG_PROM_CONSOLE is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1407 retrieving revision 1.1408 diff -u -r1.1407 -r1.1408 --- kernel.spec 10 Mar 2009 16:21:24 -0000 1.1407 +++ kernel.spec 10 Mar 2009 17:10:09 -0000 1.1408 @@ -1815,6 +1815,9 @@ # and build. %changelog +* Tue Mar 10 2009 Tom "spot" Callaway +- disable CONFIG_AGP on sparc64 + * Tue Mar 10 2009 Dave Jones 2.6.29-0.227.rc7.git3 - 2.6.29-rc7-git3 From pbrobinson at fedoraproject.org Tue Mar 10 17:17:15 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Tue, 10 Mar 2009 17:17:15 +0000 (UTC) Subject: rpms/geoclue/devel .cvsignore, 1.2, 1.3 geoclue.spec, 1.9, 1.10 sources, 1.2, 1.3 Message-ID: <20090310171715.AF1DB7002E@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/geoclue/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5111 Modified Files: .cvsignore geoclue.spec sources Log Message: - Move to a git snapshot until we finally get a new stable release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/geoclue/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2008 11:29:05 -0000 1.2 +++ .cvsignore 10 Mar 2009 17:16:44 -0000 1.3 @@ -1 +1 @@ -geoclue-0.11.1.tar.gz +geoclue-0.11.1.1-20090310.tar.gz Index: geoclue.spec =================================================================== RCS file: /cvs/pkgs/rpms/geoclue/devel/geoclue.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- geoclue.spec 4 Mar 2009 23:16:26 -0000 1.9 +++ geoclue.spec 10 Mar 2009 17:16:45 -0000 1.10 @@ -1,12 +1,22 @@ +# Tarfile created using git +# git clone git://anongit.freedesktop.org/geoclue +# git-archive --format=tar --prefix=geoclue-0.1.11.1/ %{git_version} | gzip > ~/geoclue-0.1.11.1-20090310.tar.gz + +%define gitdate 20090310 +%define git_version 3a31d26 +%define tarfile %{name}-%{version}-%{gitdate}.tar.gz +%define snapshot %{gitdate}git%{git_version} + Name: geoclue -Version: 0.11.1 -Release: 15%{?dist} +Version: 0.11.1.1 +Release: 0.1%{snapshot}%{?dist} Summary: A modular geoinformation service Group: System Environment/Libraries License: LGPLv2 URL: http://geoclue.freedesktop.org/ -Source0: http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz +#Source0: http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz +Source0: %{tarfile} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel @@ -18,6 +28,11 @@ BuildRequires: NetworkManager-devel BuildRequires: gypsy-devel BuildRequires: gpsd-devel +BuildRequires: gtk-doc +# Require these until we move back to a formal release +BuildRequires: libtool +BuildRequires: automake +BuildRequires: autoconf Requires: dbus @@ -36,24 +51,6 @@ %description devel Files for development with geoclue. -%package docs -Summary: Documentation files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: gtk-doc -BuildArch: noarch - -%description docs -This package contains developer documentation for %{name}. - -%package gui -Summary: Testing gui for geoclue -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description gui -Testing gui for geoclue - %package gpsd Summary: gpsd provider for geoclue Group: Development/Libraries @@ -76,6 +73,7 @@ %setup -q %build +./autogen.sh %configure --disable-static make %{?_smp_mflags} @@ -127,24 +125,22 @@ %{_libdir}/pkgconfig/geoclue.pc %{_libdir}/libgeoclue.so -%files docs -%defattr(-,root,root,-) -%doc %{_datadir}/gtk-doc/html/geoclue - -%files gui -%{_bindir}/geoclue-test-gui - %files gpsd +%defattr(-,root,root,-) %{_libexecdir}/geoclue-gpsd %{_datadir}/geoclue-providers/geoclue-gpsd.provider %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service %files gypsy +%defattr(-,root,root,-) %{_libexecdir}/geoclue-gypsy %{_datadir}/geoclue-providers/geoclue-gypsy.provider %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service %changelog +* Tue Mar 10 2009 Peter Robinson 0.11.1.1-0.1 +- Move to a git snapshot until we finally get a new stable release + * Wed Mar 4 2009 Peter Robinson 0.11.1-15 - Move docs to noarch, a few spec file cleanups Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/geoclue/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2008 11:29:05 -0000 1.2 +++ sources 10 Mar 2009 17:16:45 -0000 1.3 @@ -1 +1 @@ -b6caaea3fdeebf5e9896bbbc2a306ffd geoclue-0.11.1.tar.gz +e7c5cede9f8e18e9bbd1fb3af78a594b geoclue-0.11.1.1-20090310.tar.gz From pbrobinson at fedoraproject.org Tue Mar 10 17:19:23 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Tue, 10 Mar 2009 17:19:23 +0000 (UTC) Subject: rpms/geoclue/devel geoclue.spec,1.10,1.11 Message-ID: <20090310171923.934807002E@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/geoclue/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5719 Modified Files: geoclue.spec Log Message: - fix release ver Index: geoclue.spec =================================================================== RCS file: /cvs/pkgs/rpms/geoclue/devel/geoclue.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- geoclue.spec 10 Mar 2009 17:16:45 -0000 1.10 +++ geoclue.spec 10 Mar 2009 17:18:53 -0000 1.11 @@ -9,7 +9,7 @@ Name: geoclue Version: 0.11.1.1 -Release: 0.1%{snapshot}%{?dist} +Release: 0.1.%{snapshot}%{?dist} Summary: A modular geoinformation service Group: System Environment/Libraries From orion at fedoraproject.org Tue Mar 10 17:20:16 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Tue, 10 Mar 2009 17:20:16 +0000 (UTC) Subject: rpms/R-systemfit/devel .cvsignore, 1.6, 1.7 R-systemfit.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <20090310172016.95F807002E@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/R-systemfit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6052 Modified Files: .cvsignore R-systemfit.spec sources Log Message: * Tue Mar 10 2009 Orion Poplawski - 1.0-6 - Update to 1.0-9 - Fix latex requires Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/R-systemfit/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 23 Oct 2008 15:27:51 -0000 1.6 +++ .cvsignore 10 Mar 2009 17:19:45 -0000 1.7 @@ -1 +1 @@ -systemfit_1.0-7.tar.gz +systemfit_1.0-9.tar.gz Index: R-systemfit.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-systemfit/devel/R-systemfit.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- R-systemfit.spec 23 Feb 2009 23:11:10 -0000 1.11 +++ R-systemfit.spec 10 Mar 2009 17:19:46 -0000 1.12 @@ -1,15 +1,15 @@ %define packname systemfit -%define packrel 7 +%define packrel 9 Summary: Simultaneous Equation Estimation R Package Name: R-%{packname} Version: 1.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Applications/Engineering Source0: http://r-forge.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz URL: http://www.systemfit.org/ -BuildRequires: R-devel, R-Matrix, R-car, R-lmtest, tetex-latex +BuildRequires: R-devel, R-Matrix, R-car, R-lmtest, tex(latex) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires(post): R @@ -80,6 +80,10 @@ %changelog +* Tue Mar 10 2009 Orion Poplawski - 1.0-6 +- Update to 1.0-9 +- Fix latex requires + * Mon Feb 23 2009 Fedora Release Engineering - 1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R-systemfit/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 20 Nov 2008 04:40:13 -0000 1.7 +++ sources 10 Mar 2009 17:19:46 -0000 1.8 @@ -1 +1 @@ -25ef55f3db41ab15a4f201d47f4bdf39 systemfit_1.0-7.tar.gz +20f89d25df346d1191f3bb20d0d90e3b systemfit_1.0-9.tar.gz From pkgdb at fedoraproject.org Tue Mar 10 17:25:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 17:25:01 +0000 Subject: [pkgdb] eclipse-egit: akurtakov has requested watchbugzilla Message-ID: <20090310172521.ED60E20850F@bastion.fedora.phx.redhat.com> akurtakov has requested the watchbugzilla acl on eclipse-egit (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-egit From pkgdb at fedoraproject.org Tue Mar 10 17:24:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 17:24:18 +0000 Subject: [pkgdb] eclipse-egit: akurtakov has requested commit Message-ID: <20090310172524.E03B9208557@bastion.fedora.phx.redhat.com> akurtakov has requested the commit acl on eclipse-egit (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-egit From pkgdb at fedoraproject.org Tue Mar 10 17:25:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 17:25:25 +0000 Subject: [pkgdb] eclipse-egit: akurtakov has requested watchcommits Message-ID: <20090310172522.AC7C6208553@bastion.fedora.phx.redhat.com> akurtakov has requested the watchcommits acl on eclipse-egit (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-egit From dsugar at fedoraproject.org Tue Mar 10 17:25:09 2009 From: dsugar at fedoraproject.org (David Sugar) Date: Tue, 10 Mar 2009 17:25:09 +0000 (UTC) Subject: rpms/eclipse-slide/F-9 eclipse-slide.spec,1.8,1.9 sources,1.8,1.9 Message-ID: <20090310172509.4F11E7002E@cvs1.fedora.phx.redhat.com> Author: dsugar Update of /cvs/pkgs/rpms/eclipse-slide/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7288 Modified Files: eclipse-slide.spec sources Log Message: Updated w/some bug fixes version 1.3.12 Index: eclipse-slide.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-slide/F-9/eclipse-slide.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- eclipse-slide.spec 4 Dec 2008 14:19:38 -0000 1.8 +++ eclipse-slide.spec 10 Mar 2009 17:24:38 -0000 1.9 @@ -1,7 +1,7 @@ #ExclusiveArch: i386 x86_64 #BuildRequires: perl(XML::XPath) -BuildRequires: eclipse-pde +BuildRequires: eclipse-pde >= 3.2 BuildRequires: javacc BuildRequires: ant >= 1.6 BuildRequires: jpackage-utils >= 0:1.5 @@ -36,7 +36,7 @@ Summary: SELinux policy editing plugin for Eclipse Name: eclipse-slide -Version: 1.3.11 +Version: 1.3.12 License: GPLv2 BuildArch: noarch @@ -134,11 +134,14 @@ %{eclipse_base}/features/com.tresys.slide*/ %changelog +* Thu Mar 5 2009 Dave Sugar - 1.3.12-1 +- fix problem where some files where not being closed when they should have been + * Tue Dec 2 2008 Dave Sugar - 1.3.11-1 - bunch of minor changes - mostly support for some dependant plugins - some bug fixes -* Tue Aug 19 2008 Dave Sugar - 1.3.10 +* Tue Aug 19 2008 Dave Sugar - 1.3.10-1 - fix problem with bulding for header projects * Tue Jun 16 2008 Dave Sugar - 1.3.9-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-slide/F-9/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 4 Dec 2008 14:19:38 -0000 1.8 +++ sources 10 Mar 2009 17:24:38 -0000 1.9 @@ -1 +1 @@ -85b40b86cf6c8f930f34b47b84bd1003 eclipse-slide-1.3.11.tar.gz +f42957d1612298da1a552b8d91fbe192 eclipse-slide-1.3.12.tar.gz From rstrode at fedoraproject.org Tue Mar 10 17:26:05 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Tue, 10 Mar 2009 17:26:05 +0000 (UTC) Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.204,1.205 Message-ID: <20090310172605.5E6B47002E@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gnome-desktop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7633 Modified Files: gnome-desktop.spec Log Message: - Change default backgrounds to leonidas ones Index: gnome-desktop.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.204 retrieving revision 1.205 diff -u -r1.204 -r1.205 --- gnome-desktop.spec 3 Mar 2009 18:41:16 -0000 1.204 +++ gnome-desktop.spec 10 Mar 2009 17:25:34 -0000 1.205 @@ -12,7 +12,7 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop Version: 2.25.92 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-desktop/2.25/%{name}-%{version}.tar.bz2 License: GPLv2+ and LGPLv2+ @@ -28,7 +28,7 @@ Provides: gnome-core # Make sure to update libgnome schema when changing this -Requires: solar-backgrounds +Requires: leonidas-backgrounds BuildRequires: gnome-common BuildRequires: libxml2-devel >= %{libxml2_version} @@ -117,6 +117,9 @@ %doc %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Tue Mar 10 2009 Ray Strode - 2.25.92-1 +- Change default backgrounds to leonidas ones + * Tue Mar 3 2009 Matthias Clasen - 2.25.92-1 - Update to 2.25.92 @@ -132,6 +135,7 @@ * Tue Feb 3 2009 Matthias Clasen - 2.25.90-1 - Update to 2.25.90 +>>>>>>> 1.204 * Mon Jan 19 2009 Ray Strode - 2.25.5-2 - Rebuild so i can chain-build From rstrode at fedoraproject.org Tue Mar 10 17:26:25 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Tue, 10 Mar 2009 17:26:25 +0000 (UTC) Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.205,1.206 Message-ID: <20090310172625.6F4FD7002E@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gnome-desktop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7834 Modified Files: gnome-desktop.spec Log Message: remove conflict indicators Index: gnome-desktop.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- gnome-desktop.spec 10 Mar 2009 17:25:34 -0000 1.205 +++ gnome-desktop.spec 10 Mar 2009 17:25:54 -0000 1.206 @@ -135,7 +135,6 @@ * Tue Feb 3 2009 Matthias Clasen - 2.25.90-1 - Update to 2.25.90 ->>>>>>> 1.204 * Mon Jan 19 2009 Ray Strode - 2.25.5-2 - Rebuild so i can chain-build From nphilipp at fedoraproject.org Tue Mar 10 17:26:59 2009 From: nphilipp at fedoraproject.org (Nils Philippsen) Date: Tue, 10 Mar 2009 17:26:59 +0000 (UTC) Subject: rpms/gimp/devel .cvsignore, 1.49, 1.50 gimp.spec, 1.184, 1.185 sources, 1.49, 1.50 gimp-2.6.5-define-deprecated.patch, 1.1, NONE Message-ID: <20090310172700.01C357002E@cvs1.fedora.phx.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/gimp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7927 Modified Files: .cvsignore gimp.spec sources Removed Files: gimp-2.6.5-define-deprecated.patch Log Message: use correct fix from upstream to avoid crashes (#486122) use -fno-strict-aliasing, PIC/PIE compilation flags Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gimp/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 15 Feb 2009 21:28:27 -0000 1.49 +++ .cvsignore 10 Mar 2009 17:26:28 -0000 1.50 @@ -1 +1,2 @@ gimp-2.6.5.tar.bz2 +gimp-2.6.5-gtk-version.patch.bz2 Index: gimp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- gimp.spec 9 Mar 2009 10:38:23 -0000 1.184 +++ gimp.spec 10 Mar 2009 17:26:29 -0000 1.185 @@ -24,7 +24,7 @@ Name: gimp Epoch: 2 Version: 2.6.5 -Release: 3%{?dist} +Release: 4%{?dist} %define binver 2.6 %define gimp_lang_ver 20 %define interfacever 2.0 @@ -107,7 +107,7 @@ Source1: gimp-plugin-mgr.in Patch0: gimp-2.6.2-xdg-open.patch Patch1: gimp-2.6.2-jpeg-units.patch -Patch2: gimp-2.6.5-define-deprecated.patch +Patch2: gimp-2.6.5-gtk-version.patch.bz2 %description GIMP (GNU Image Manipulation Program) is a powerful image composition and @@ -187,12 +187,17 @@ %setup -q -n gimp-%{version} %patch0 -p1 -b .xdg-open %patch1 -p1 -b .jpeg-units -%patch2 -p1 -b .define-deprecated +%patch2 -p1 -b .gtk-version %build if [ ! -f configure ]; then ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix} fi +# Use PIC/PIE because gimp is likely to deal with files coming from untrusted +# sources +CFLAGS='-fPIC %optflags -fno-strict-aliasing' +CXXFLAGS='-fPIC %optflags -fno-strict-aliasing' +LDFLAGS='-pie' %configure \ --disable-perl --enable-gimp-remote \ %if %{with python} @@ -465,6 +470,10 @@ %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser %changelog +* Tue Mar 10 2009 Nils Philippsen - 2:2.6.5-4 +- use correct fix from upstream to avoid crashes (#486122) +- use -fno-strict-aliasing, PIC/PIE compilation flags + * Mon Mar 09 2009 Nils Philippsen - 2:2.6.5-3 - rebuild against new WebKit - define deprecated gtk functions to avoid crashes (#486122) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gimp/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 15 Feb 2009 21:28:27 -0000 1.49 +++ sources 10 Mar 2009 17:26:29 -0000 1.50 @@ -1 +1,2 @@ cd13050bc6bde6d8d8fd38eff6276033 gimp-2.6.5.tar.bz2 +9d661944b58b5ac675047b0ba2095ccc gimp-2.6.5-gtk-version.patch.bz2 --- gimp-2.6.5-define-deprecated.patch DELETED --- From iarnell at fedoraproject.org Tue Mar 10 17:30:33 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Tue, 10 Mar 2009 17:30:33 +0000 (UTC) Subject: rpms/perl-HTML-Tiny/devel perl-HTML-Tiny.spec,1.3,1.4 Message-ID: <20090310173033.7260C7002E@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-HTML-Tiny/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9066 Modified Files: perl-HTML-Tiny.spec Log Message: * Tue Mar 10 2009 Iain Arnell 1.05-2 - Explicitly require perl-Test-Simple to avoid BZ #489421/473874 Index: perl-HTML-Tiny.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Tiny/devel/perl-HTML-Tiny.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-HTML-Tiny.spec 10 Mar 2009 16:18:45 -0000 1.3 +++ perl-HTML-Tiny.spec 10 Mar 2009 17:30:02 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-HTML-Tiny Version: 1.05 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight, dependency free HTML/XML generation License: GPL+ or Artistic Group: Development/Libraries @@ -10,6 +10,9 @@ BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) +# Explicitly require perl-Test-Simple to avoid BZ #489421/473874 +BuildRequires: perl-Test-Simple + Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -47,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 10 2009 Iain Arnell 1.05-2 +- Explicitly require perl-Test-Simple to avoid BZ #489421/473874 + * Tue Mar 10 2009 Iain Arnell 1.05-1 - update to latest upstream From rstrode at fedoraproject.org Tue Mar 10 17:31:49 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Tue, 10 Mar 2009 17:31:49 +0000 (UTC) Subject: rpms/libgnome/devel default-background.patch, 1.4, 1.5 libgnome.spec, 1.137, 1.138 Message-ID: <20090310173149.E50097002E@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/libgnome/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9536 Modified Files: default-background.patch libgnome.spec Log Message: - Change default backgrounds to leonidas ones default-background.patch: Index: default-background.patch =================================================================== RCS file: /cvs/pkgs/rpms/libgnome/devel/default-background.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- default-background.patch 21 Oct 2008 14:53:04 -0000 1.4 +++ default-background.patch 10 Mar 2009 17:31:48 -0000 1.5 @@ -15,7 +15,7 @@ gnome string - @datadir@/pixmaps/backgrounds/gnome/background-default.jpg -+ @datadir@/backgrounds/solar/solar.xml ++ @datadir@/backgrounds/leonidas/leonidas.xml Picture Filename File to use for the background image Index: libgnome.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgnome/devel/libgnome.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- libgnome.spec 25 Feb 2009 15:12:57 -0000 1.137 +++ libgnome.spec 10 Mar 2009 17:31:49 -0000 1.138 @@ -14,7 +14,7 @@ Summary: GNOME base library Name: libgnome Version: 2.24.1 -Release: 9%{?dist} +Release: 10%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/libgnome/2.24/%{name}-%{version}.tar.bz2 Source1: desktop_gnome_peripherals_monitor.schemas @@ -211,6 +211,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Tue Mar 10 2009 Ray Strode - 2.24.1-10 +- Change default backgrounds to leonidas ones + * Wed Feb 25 2009 Fedora Release Engineering - 2.24.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From orion at fedoraproject.org Tue Mar 10 17:32:01 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Tue, 10 Mar 2009 17:32:01 +0000 (UTC) Subject: rpms/R-car/devel .cvsignore, 1.5, 1.6 R-car.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <20090310173201.2F9867002E@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/R-car/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9740 Modified Files: .cvsignore R-car.spec sources Log Message: * Tue Mar 10 2009 Orion Poplawski 1.2-6 - Update to 1.2-12 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/R-car/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Jan 2009 17:54:51 -0000 1.5 +++ .cvsignore 10 Mar 2009 17:32:00 -0000 1.6 @@ -1 +1 @@ -car_1.2-11.tar.gz +car_1.2-12.tar.gz Index: R-car.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-car/devel/R-car.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- R-car.spec 23 Feb 2009 22:59:08 -0000 1.5 +++ R-car.spec 10 Mar 2009 17:32:00 -0000 1.6 @@ -1,16 +1,16 @@ %define packname car # Note that some R packages do not use packrel -%define packrel 11 +%define packrel 12 Name: R-%{packname} Version: 1.2 -Release: 5%{?dist} +Release: 6%{?dist} Source0: http://cran.r-project.org/src/contrib/car_%{version}-%{packrel}.tar.gz License: GPLv2+ URL: http://cran.r-project.org/web/packages/car/index.html Group: Applications/Engineering Summary: Companion to Applied Regression package for R -BuildRequires: R-devel, tetex-latex +BuildRequires: R-devel, tex(latex) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires(post): R @@ -77,6 +77,9 @@ %{_datadir}/R/library/%{packname}/help %changelog +* Tue Mar 10 2009 Orion Poplawski 1.2-6 +- Update to 1.2-12 + * Mon Feb 23 2009 Fedora Release Engineering - 1.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R-car/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Jan 2009 17:54:51 -0000 1.5 +++ sources 10 Mar 2009 17:32:00 -0000 1.6 @@ -1 +1 @@ -7335f6e3eec1c8d9fe07b9ce0d18cd08 car_1.2-11.tar.gz +4de76f868158724ed3f9a94fe5156505 car_1.2-12.tar.gz From linville at fedoraproject.org Tue Mar 10 17:32:40 2009 From: linville at fedoraproject.org (John W. Linville) Date: Tue, 10 Mar 2009 17:32:40 +0000 (UTC) Subject: rpms/crda/devel .cvsignore, 1.4, 1.5 crda.spec, 1.12, 1.13 sources, 1.4, 1.5 import.log, 1.1, NONE wireless-regdb-2009.01.30-non-root-install-fix.patch, 1.1, NONE Message-ID: <20090310173240.817497002E@cvs1.fedora.phx.redhat.com> Author: linville Update of /cvs/pkgs/rpms/crda/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9851 Modified Files: .cvsignore crda.spec sources Removed Files: import.log wireless-regdb-2009.01.30-non-root-install-fix.patch Log Message: Update wireless-regdb version to pick-up recent updates and fixes (#489560) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/crda/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 3 Feb 2009 19:13:10 -0000 1.4 +++ .cvsignore 10 Mar 2009 17:32:09 -0000 1.5 @@ -1,2 +1,2 @@ crda-1.0.1.tar.bz2 -wireless-regdb-2009.01.30.tar.bz2 +wireless-regdb-2009.03.09.tar.bz2 Index: crda.spec =================================================================== RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- crda.spec 24 Feb 2009 09:40:04 -0000 1.12 +++ crda.spec 10 Mar 2009 17:32:09 -0000 1.13 @@ -1,9 +1,9 @@ %define crda_version 1.0.1 -%define regdb_version 2009.01.30 +%define regdb_version 2009.03.09 Name: crda Version: %{crda_version}_%{regdb_version} -Release: 6%{?dist} +Release: 7%{?dist} Summary: Regulatory compliance daemon for 802.11 wireless networking Group: System Environment/Base @@ -21,8 +21,6 @@ Source0: http://wireless.kernel.org/download/crda/crda-%{crda_version}.tar.bz2 Source1: http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-%{regdb_version}.tar.bz2 -Patch0: wireless-regdb-2009.01.30-non-root-install-fix.patch - %description CRDA acts as the udev helper for communication between the kernel and userspace for regulatory compliance. It relies on nl80211 @@ -33,8 +31,6 @@ %setup -q -c %setup -q -T -D -a 1 -%patch0 -p0 - %build @@ -81,6 +77,9 @@ %doc wireless-regdb-%{regdb_version}/README.wireless-regdb %changelog +* Tue Mar 10 2009 John W. Linville 1.0.1_2009.03.09-7 +- Update wireless-regdb version to pick-up recent updates and fixes (#489560) + * Tue Feb 24 2009 Fedora Release Engineering - 1.0.1_2009.01.30-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/crda/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 3 Feb 2009 19:13:10 -0000 1.4 +++ sources 10 Mar 2009 17:32:10 -0000 1.5 @@ -1,2 +1,2 @@ 03554b71eef2626795befa17eb1d8b9e crda-1.0.1.tar.bz2 -9e7812f7befe96511a597c1635f9a42b wireless-regdb-2009.01.30.tar.bz2 +09d423911584e6580efb8af366775d5f wireless-regdb-2009.03.09.tar.bz2 --- import.log DELETED --- --- wireless-regdb-2009.01.30-non-root-install-fix.patch DELETED --- From rbhalera at fedoraproject.org Tue Mar 10 17:37:25 2009 From: rbhalera at fedoraproject.org (Rahul Bhalerao) Date: Tue, 10 Mar 2009 17:37:25 +0000 (UTC) Subject: rpms/lklug-fonts/devel lklug-fonts.spec,1.5,1.6 Message-ID: <20090310173725.8E6BA70132@cvs1.fedora.phx.redhat.com> Author: rbhalera Update of /cvs/pkgs/rpms/lklug-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11431 Modified Files: lklug-fonts.spec Log Message: Dropping release Index: lklug-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/lklug-fonts/devel/lklug-fonts.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lklug-fonts.spec 10 Mar 2009 16:48:42 -0000 1.5 +++ lklug-fonts.spec 10 Mar 2009 17:36:54 -0000 1.6 @@ -5,7 +5,7 @@ # update versions on file changes. When in doubt use the timestamp of the most # recent file as version. Version: 0.2.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Fonts for Sinhala language Group: User Interface/X @@ -47,6 +47,9 @@ %changelog +* Tue Mar 10 2009 Rahul Bhalerao - 0.2.2-9 +- Dropping previous release. + * Mon Mar 09 2009 Rahul Bhalerao - 0.2.2-8 - Following new font packaging guidelines From dsugar at fedoraproject.org Tue Mar 10 17:37:35 2009 From: dsugar at fedoraproject.org (David Sugar) Date: Tue, 10 Mar 2009 17:37:35 +0000 (UTC) Subject: rpms/eclipse-setools/F-10 .cvsignore, 1.4, 1.5 eclipse-setools.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <20090310173735.D219D70132@cvs1.fedora.phx.redhat.com> Author: dsugar Update of /cvs/pkgs/rpms/eclipse-setools/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11309 Modified Files: .cvsignore eclipse-setools.spec sources Log Message: Version update to work against setools-libs-java 3.3.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-setools/F-10/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Feb 2008 21:01:31 -0000 1.4 +++ .cvsignore 10 Mar 2009 17:37:05 -0000 1.5 @@ -1 +1 @@ -eclipse-setools-3.3.2.4.tar.gz +eclipse-setools-3.3.5.1.tar.gz Index: eclipse-setools.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-setools/F-10/eclipse-setools.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- eclipse-setools.spec 3 Nov 2008 19:23:33 -0000 1.7 +++ eclipse-setools.spec 10 Mar 2009 17:37:05 -0000 1.8 @@ -1,9 +1,9 @@ Exclusiveos:linux %define require_setools_major_ver 3.3 -%define require_setools_fix_ver .2 +%define require_setools_fix_ver .5 #BuildRequires: perl(XML::XPath) -BuildRequires: eclipse-pde +BuildRequires: eclipse-pde >= 3.2 BuildRequires: ant >= 1.6 BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: java-gcj-compat >= 1.0.33 @@ -19,7 +19,7 @@ Group: System Environment/Base License: LGPLv2+ URL: http://oss.tresys.com/projects/setools -Version: 3.3.2.4 +Version: 3.3.5.1 # mkdir eclipse-setools # cd eclipse-setools @@ -34,15 +34,15 @@ #Release: 0.2.svn1998%{?dist} Source0: http://oss.tresys.com/projects/slide/chrome/site/src/%{name}-%{version}.tar.gz -Release: 4%{?dist} -%ifarch i386 +Release: 1%{?dist} +%ifarch %{ix86} %define arch x86 %else %define arch %{_arch} %endif Requires: setools-libs-java >= %{require_setools_major_ver}%{require_setools_fix_ver} -Requires: eclipse-platform +Requires: eclipse-platform >= 3.2 Requires: java-gcj-compat >= 1.0.33 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -125,6 +125,9 @@ %{eclipse_base} %changelog +* Thu Mar 5 2009 Dave Sugar - 3.3.5.1-1 +- Update to setools 3.3.5 release + * Mon Nov 3 2008 Dave Sugar - 3.3.2.4-4 - fix paths for correct removal Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-setools/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2008 21:01:31 -0000 1.4 +++ sources 10 Mar 2009 17:37:05 -0000 1.5 @@ -1 +1 @@ -b1f52bdb9633c23859e6bf4d4e9ea2df eclipse-setools-3.3.2.4.tar.gz +4584afc06ba1446e378cb9bf8fab83a3 eclipse-setools-3.3.5.1.tar.gz From linville at fedoraproject.org Tue Mar 10 17:39:37 2009 From: linville at fedoraproject.org (John W. Linville) Date: Tue, 10 Mar 2009 17:39:37 +0000 (UTC) Subject: rpms/crda/F-10 .cvsignore, 1.1, 1.2 crda.spec, 1.5, 1.6 sources, 1.4, 1.5 wireless-regdb-2009.01.30-non-root-install-fix.patch, 1.1, NONE Message-ID: <20090310173938.0327A7002E@cvs1.fedora.phx.redhat.com> Author: linville Update of /cvs/pkgs/rpms/crda/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12557 Modified Files: .cvsignore crda.spec sources Removed Files: wireless-regdb-2009.01.30-non-root-install-fix.patch Log Message: Update wireless-regdb version to pick-up recent updates and fixes (#489560) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/crda/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Jan 2009 22:10:28 -0000 1.1 +++ .cvsignore 10 Mar 2009 17:39:07 -0000 1.2 @@ -0,0 +1,2 @@ +crda-1.0.1.tar.bz2 +wireless-regdb-2009.03.09.tar.bz2 Index: crda.spec =================================================================== RCS file: /cvs/pkgs/rpms/crda/F-10/crda.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- crda.spec 16 Feb 2009 21:34:42 -0000 1.5 +++ crda.spec 10 Mar 2009 17:39:07 -0000 1.6 @@ -1,9 +1,9 @@ %define crda_version 1.0.1 -%define regdb_version 2009.01.30 +%define regdb_version 2009.03.09 Name: crda Version: %{crda_version}_%{regdb_version} -Release: 5%{?dist} +Release: 7%{?dist} Summary: Regulatory compliance daemon for 802.11 wireless networking Group: System Environment/Base @@ -21,8 +21,6 @@ Source0: http://wireless.kernel.org/download/crda/crda-%{crda_version}.tar.bz2 Source1: http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-%{regdb_version}.tar.bz2 -Patch0: wireless-regdb-2009.01.30-non-root-install-fix.patch - %description CRDA acts as the udev helper for communication between the kernel and userspace for regulatory compliance. It relies on nl80211 @@ -33,8 +31,6 @@ %setup -q -c %setup -q -T -D -a 1 -%patch0 -p0 - %build @@ -81,6 +77,12 @@ %doc wireless-regdb-%{regdb_version}/README.wireless-regdb %changelog +* Tue Mar 10 2009 John W. Linville 1.0.1_2009.03.09-7 +- Update wireless-regdb version to pick-up recent updates and fixes (#489560) + +* Tue Feb 24 2009 Fedora Release Engineering - 1.0.1_2009.01.30-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 16 2009 John W. Linville 1.0.1_2009.01.30-5 - Recognize regulatory.bin files signed with the upstream key (#484982) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/crda/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 3 Feb 2009 19:26:23 -0000 1.4 +++ sources 10 Mar 2009 17:39:07 -0000 1.5 @@ -1,2 +1,2 @@ 03554b71eef2626795befa17eb1d8b9e crda-1.0.1.tar.bz2 -9e7812f7befe96511a597c1635f9a42b wireless-regdb-2009.01.30.tar.bz2 +09d423911584e6580efb8af366775d5f wireless-regdb-2009.03.09.tar.bz2 --- wireless-regdb-2009.01.30-non-root-install-fix.patch DELETED --- From orion at fedoraproject.org Tue Mar 10 17:41:13 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Tue, 10 Mar 2009 17:41:13 +0000 (UTC) Subject: rpms/R-multcomp/devel .cvsignore, 1.9, 1.10 R-multcomp.spec, 1.12, 1.13 sources, 1.9, 1.10 Message-ID: <20090310174113.BAD667002E@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/R-multcomp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13397 Modified Files: .cvsignore R-multcomp.spec sources Log Message: * Tue Mar 10 2009 Orion Poplawski - 1.0-5 - Update to 1.0-7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 14 Jan 2009 19:41:20 -0000 1.9 +++ .cvsignore 10 Mar 2009 17:40:43 -0000 1.10 @@ -1 +1 @@ -multcomp_1.0-5.tar.gz +multcomp_1.0-7.tar.gz Index: R-multcomp.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/devel/R-multcomp.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- R-multcomp.spec 23 Feb 2009 23:04:44 -0000 1.12 +++ R-multcomp.spec 10 Mar 2009 17:40:43 -0000 1.13 @@ -1,17 +1,17 @@ %define packname multcomp -%define packrel 5 +%define packrel 7 Summary: Simultaneous inference for general linear hypotheses R Package Name: R-%{packname} Version: 1.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: Applications/Engineering Source0: http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz URL: http://cran.r-project.org/web/packages/multcomp/index.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: R-devel, tetex-latex, R-mvtnorm >= 0.8 +BuildRequires: R-devel, tex(latex), R-mvtnorm >= 0.8 #Needed for more testing coverage, but not in fedora yet #BuildRequires: R-lme4 Requires: R-mvtnorm >= 0.8 @@ -84,6 +84,9 @@ %changelog +* Tue Mar 10 2009 Orion Poplawski - 1.0-5 +- Update to 1.0-7 + * Mon Feb 23 2009 Fedora Release Engineering - 1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 14 Jan 2009 19:41:20 -0000 1.9 +++ sources 10 Mar 2009 17:40:43 -0000 1.10 @@ -1 +1 @@ -06dc644538cb11258730c912868dbb9e multcomp_1.0-5.tar.gz +e333a277a6ecfa5415f6bb8d292c7015 multcomp_1.0-7.tar.gz From pkgdb at fedoraproject.org Tue Mar 10 17:44:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 17:44:41 +0000 Subject: [pkgdb] yum-updatesd ownership updated Message-ID: <20090310174441.CB95A208511@bastion.fedora.phx.redhat.com> Package yum-updatesd in Fedora 9 was orphaned by katzj To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-updatesd From pkgdb at fedoraproject.org Tue Mar 10 17:43:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 17:43:31 +0000 Subject: [pkgdb] yum-updatesd ownership updated Message-ID: <20090310174438.24CF9208504@bastion.fedora.phx.redhat.com> Package yum-updatesd in Fedora devel was orphaned by katzj To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-updatesd From pkgdb at fedoraproject.org Tue Mar 10 17:44:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 17:44:33 +0000 Subject: [pkgdb] yum-updatesd ownership updated Message-ID: <20090310174453.BC55C208503@bastion.fedora.phx.redhat.com> Package yum-updatesd in Fedora 8 was orphaned by katzj To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-updatesd From pkgdb at fedoraproject.org Tue Mar 10 17:44:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 17:44:45 +0000 Subject: [pkgdb] yum-updatesd ownership updated Message-ID: <20090310174442.95C6F208551@bastion.fedora.phx.redhat.com> Package yum-updatesd in Fedora 10 was orphaned by katzj To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-updatesd From pkgdb at fedoraproject.org Tue Mar 10 17:47:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 17:47:21 +0000 Subject: [pkgdb] yum-updatesd: katzj has requested watchbugzilla Message-ID: <20090310174719.025CD208504@bastion.fedora.phx.redhat.com> katzj has requested the watchbugzilla acl on yum-updatesd (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-updatesd From pkgdb at fedoraproject.org Tue Mar 10 17:47:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 17:47:02 +0000 Subject: [pkgdb] yum-updatesd: katzj has requested watchcommits Message-ID: <20090310174722.5C042208511@bastion.fedora.phx.redhat.com> katzj has requested the watchcommits acl on yum-updatesd (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-updatesd From pkgdb at fedoraproject.org Tue Mar 10 17:47:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 17:47:25 +0000 Subject: [pkgdb] yum-updatesd: katzj has requested approveacls Message-ID: <20090310174725.B43C1208554@bastion.fedora.phx.redhat.com> katzj has requested the approveacls acl on yum-updatesd (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-updatesd From pkgdb at fedoraproject.org Tue Mar 10 17:46:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 17:46:16 +0000 Subject: [pkgdb] yum-updatesd: katzj has requested commit Message-ID: <20090310174722.D191B208551@bastion.fedora.phx.redhat.com> katzj has requested the commit acl on yum-updatesd (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-updatesd From limb at fedoraproject.org Tue Mar 10 17:48:04 2009 From: limb at fedoraproject.org (Jon Ciesla) Date: Tue, 10 Mar 2009 17:48:04 +0000 (UTC) Subject: rpms/chipmunk/devel chipmunk.spec,1.4,1.5 Message-ID: <20090310174804.2A7567002E@cvs1.fedora.phx.redhat.com> Author: limb Update of /cvs/pkgs/rpms/chipmunk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15003 Modified Files: chipmunk.spec Log Message: ruby ext fix. Index: chipmunk.spec =================================================================== RCS file: /cvs/pkgs/rpms/chipmunk/devel/chipmunk.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- chipmunk.spec 24 Feb 2009 07:22:44 -0000 1.4 +++ chipmunk.spec 10 Mar 2009 17:47:32 -0000 1.5 @@ -1,7 +1,7 @@ %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")} Name: chipmunk Version: 4.1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Physics engine for 2D games Group: Development/Libraries @@ -74,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{ruby_sitearch} -install -m 755 ruby/libchipmunk.so.* $RPM_BUILD_ROOT/%{ruby_sitearch} +install -m 755 ruby/chipmunk.so $RPM_BUILD_ROOT/%{ruby_sitearch} make install DESTDIR=$RPM_BUILD_ROOT %if "%{?_lib}" == "lib64" @@ -102,10 +102,13 @@ %files ruby %defattr(-,root,root,-) -%{ruby_sitearch}/*.so.* +%{ruby_sitearch}/chipmunk.so %changelog +* Tue Mar 10 2009 Jon Ciesla - 4.1.0-6 +- ruby extension fix, BZ 489187. + * Mon Feb 23 2009 Fedora Release Engineering - 4.1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From orion at fedoraproject.org Tue Mar 10 17:50:39 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Tue, 10 Mar 2009 17:50:39 +0000 (UTC) Subject: rpms/R-multcomp/devel R-multcomp.spec,1.13,1.14 Message-ID: <20090310175039.353067002E@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/R-multcomp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15630 Modified Files: R-multcomp.spec Log Message: Cleanup svn-commit.tmp Index: R-multcomp.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/devel/R-multcomp.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- R-multcomp.spec 10 Mar 2009 17:40:43 -0000 1.13 +++ R-multcomp.spec 10 Mar 2009 17:50:07 -0000 1.14 @@ -27,6 +27,7 @@ %prep %setup -q -c -n %{packname} +rm multcomp/inst/svn-commit.tmp %build From dsugar at fedoraproject.org Tue Mar 10 17:53:22 2009 From: dsugar at fedoraproject.org (David Sugar) Date: Tue, 10 Mar 2009 17:53:22 +0000 (UTC) Subject: rpms/eclipse-setools/devel eclipse-setools.spec,1.9,1.10 Message-ID: <20090310175322.9ECE97002E@cvs1.fedora.phx.redhat.com> Author: dsugar Update of /cvs/pkgs/rpms/eclipse-setools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16427 Modified Files: eclipse-setools.spec Log Message: Update to setools 3.3.5 release Index: eclipse-setools.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-setools/devel/eclipse-setools.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- eclipse-setools.spec 27 Feb 2009 12:40:13 -0000 1.9 +++ eclipse-setools.spec 10 Mar 2009 17:52:52 -0000 1.10 @@ -1,9 +1,9 @@ Exclusiveos:linux %define require_setools_major_ver 3.3 -%define require_setools_fix_ver .2 +%define require_setools_fix_ver .5 #BuildRequires: perl(XML::XPath) -BuildRequires: eclipse-pde +BuildRequires: eclipse-pde >= 3.2 BuildRequires: ant >= 1.6 BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: java-gcj-compat >= 1.0.33 @@ -19,7 +19,7 @@ Group: System Environment/Base License: LGPLv2+ URL: http://oss.tresys.com/projects/setools -Version: 3.3.2.4 +Version: 3.3.5.1 # mkdir eclipse-setools # cd eclipse-setools @@ -34,7 +34,7 @@ #Release: 0.2.svn1998%{?dist} Source0: http://oss.tresys.com/projects/slide/chrome/site/src/%{name}-%{version}.tar.gz -Release: 6%{?dist} +Release: 1%{?dist} %ifarch %{ix86} %define arch x86 %else @@ -42,7 +42,7 @@ %endif Requires: setools-libs-java >= %{require_setools_major_ver}%{require_setools_fix_ver} -Requires: eclipse-platform +Requires: eclipse-platform >= 3.2 Requires: java-gcj-compat >= 1.0.33 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -125,6 +125,9 @@ %{eclipse_base} %changelog +* Thu Mar 5 2009 Dave Sugar - 3.3.5.1-1 +- Update to setools 3.3.5 release + * Fri Feb 27 2009 Alexander Kurtakov 3.3.2.4-6 - Fix arch %%define. From jkeating at fedoraproject.org Tue Mar 10 18:00:46 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Tue, 10 Mar 2009 18:00:46 +0000 (UTC) Subject: rpms/freeipmi/devel freeipmi.spec,1.12,1.13 Message-ID: <20090310180046.0B1AC7002E@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/freeipmi/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18154 Modified Files: freeipmi.spec Log Message: * Tue Mar 10 2009 Jesse Keating - 0.7.6-2 - Fix the bad dist macro - Remove version define, that's what the Version line is for - Remove name define, that's what the Name line is for - Use the real Release line in the if debug statement Index: freeipmi.spec =================================================================== RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- freeipmi.spec 9 Mar 2009 11:25:04 -0000 1.12 +++ freeipmi.spec 10 Mar 2009 18:00:15 -0000 1.13 @@ -2,17 +2,14 @@ # Copyright (c) 2003 FreeIPMI Core Team # -%define name freeipmi -%define version 0.7.6 %if %{?_with_debug:1}%{!?_with_debug:0} -%define release 1.debug%{?dist} +Release: 1.debug%{?dist} %else -%define release 1.{?dist} +Release: 2%{?dist} %endif -Name: %{name} -Version: %{version} -Release: %{release} +Name: freeipmi +Version: 0.7.6 License: GPLv2+ Group: Applications/System URL: http://www.gnu.org/software/freeipmi/ @@ -331,6 +328,12 @@ %{_mandir}/man8/ipmidetectd.8* %changelog +* Tue Mar 10 2009 Jesse Keating - 0.7.6-2 +- Fix the bad dist macro +- Remove version define, that's what the Version line is for +- Remove name define, that's what the Name line is for +- Use the real Release line in the if debug statement + * Mon Mar 9 2009 Jan Safranek - 0.7.6-1 - Update to freeipmi-0.7.6 From limb at fedoraproject.org Tue Mar 10 18:01:34 2009 From: limb at fedoraproject.org (Jon Ciesla) Date: Tue, 10 Mar 2009 18:01:34 +0000 (UTC) Subject: rpms/chipmunk/F-10 chipmunk.spec,1.1,1.2 Message-ID: <20090310180134.B9BE27002E@cvs1.fedora.phx.redhat.com> Author: limb Update of /cvs/pkgs/rpms/chipmunk/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18392 Modified Files: chipmunk.spec Log Message: ruby ext fix. Index: chipmunk.spec =================================================================== RCS file: /cvs/pkgs/rpms/chipmunk/F-10/chipmunk.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- chipmunk.spec 12 Jan 2009 18:54:45 -0000 1.1 +++ chipmunk.spec 10 Mar 2009 18:01:04 -0000 1.2 @@ -1,7 +1,7 @@ %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")} Name: chipmunk Version: 4.1.0 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Physics engine for 2D games Group: Development/Libraries @@ -74,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{ruby_sitearch} -install -m 755 ruby/libchipmunk.so.* $RPM_BUILD_ROOT/%{ruby_sitearch} +install -m 755 ruby/chipmunk.so $RPM_BUILD_ROOT/%{ruby_sitearch} make install DESTDIR=$RPM_BUILD_ROOT %if "%{?_lib}" == "lib64" @@ -102,10 +102,16 @@ %files ruby %defattr(-,root,root,-) -%{ruby_sitearch}/*.so.* +%{ruby_sitearch}/chipmunk.so %changelog +* Tue Mar 10 2009 Jon Ciesla - 4.1.0-6 +- ruby extension fix, BZ 489187. + +* Mon Feb 23 2009 Fedora Release Engineering - 4.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jan 08 2009 Jon Ciesla - 4.1.0-4 - Attempted 64-bit fix. From tuju at fedoraproject.org Tue Mar 10 18:12:19 2009 From: tuju at fedoraproject.org (Juha Tuomala) Date: Tue, 10 Mar 2009 18:12:19 +0000 (UTC) Subject: rpms/dfu-util/devel dfu-util.spec,1.5,1.6 Message-ID: <20090310181219.EBB3C7002E@cvs1.fedora.phx.redhat.com> Author: tuju Update of /cvs/pkgs/rpms/dfu-util/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21674 Modified Files: dfu-util.spec Log Message: Add 64-bit arch again as it seems to work now. Index: dfu-util.spec =================================================================== RCS file: /cvs/pkgs/rpms/dfu-util/devel/dfu-util.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dfu-util.spec 10 Mar 2009 16:10:11 -0000 1.5 +++ dfu-util.spec 10 Mar 2009 18:11:48 -0000 1.6 @@ -4,7 +4,7 @@ Name: dfu-util Version: 0.1 -Release: 0.7.%{snapshot}%{?dist} +Release: 0.8.%{snapshot}%{?dist} Summary: USB Device Firmware Upgrade tool Group: Development/Tools @@ -22,8 +22,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf automake libusb-devel libusb-static glibc-devel -# upstream is broken for 64bit binaries, it compiles but fails when used. -ExcludeArch: x86_64 ppc64 sparc64 %description @@ -72,6 +70,9 @@ %changelog +* Tue Mar 10 2009 Juha Tuomala - 0.1-0.8.20090307svn4917 +- Add 64-bit archs again as x86_64 seems to work. + * Tue Mar 10 2009 Jaroslav Reznik - 0.1-0.7.20090307svn4917 - glibc-devel BR From pkgdb at fedoraproject.org Tue Mar 10 18:18:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:18:26 +0000 Subject: [pkgdb] eclipse-egit had acl change status Message-ID: <20090310181846.CF92B208504@bastion.fedora.phx.redhat.com> rmyers has set the watchbugzilla acl on eclipse-egit (Fedora devel) to Approved for akurtakov To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-egit From pkgdb at fedoraproject.org Tue Mar 10 18:17:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:17:42 +0000 Subject: [pkgdb] eclipse-egit had acl change status Message-ID: <20090310181848.1BA5F208514@bastion.fedora.phx.redhat.com> rmyers has set the watchcommits acl on eclipse-egit (Fedora devel) to Approved for akurtakov To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-egit From pkgdb at fedoraproject.org Tue Mar 10 18:18:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:18:49 +0000 Subject: [pkgdb] eclipse-egit had acl change status Message-ID: <20090310181849.9E63F208553@bastion.fedora.phx.redhat.com> rmyers has set the commit acl on eclipse-egit (Fedora devel) to Approved for akurtakov To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-egit From pkgdb at fedoraproject.org Tue Mar 10 18:23:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:23:03 +0000 Subject: [pkgdb] leonidas-backgrounds: rdieter has requested watchcommits Message-ID: <20090310182323.B89CD208504@bastion.fedora.phx.redhat.com> rdieter has requested the watchcommits acl on leonidas-backgrounds (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-backgrounds From pkgdb at fedoraproject.org Tue Mar 10 18:22:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:22:17 +0000 Subject: [pkgdb] leonidas-backgrounds: rdieter has requested commit Message-ID: <20090310182324.A7A6220850F@bastion.fedora.phx.redhat.com> rdieter has requested the commit acl on leonidas-backgrounds (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-backgrounds From pkgdb at fedoraproject.org Tue Mar 10 18:23:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:23:29 +0000 Subject: [pkgdb] leonidas-backgrounds: rdieter has requested watchbugzilla Message-ID: <20090310182329.CE0DB208551@bastion.fedora.phx.redhat.com> rdieter has requested the watchbugzilla acl on leonidas-backgrounds (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-backgrounds From atkac at fedoraproject.org Tue Mar 10 18:23:48 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Tue, 10 Mar 2009 18:23:48 +0000 (UTC) Subject: rpms/swig/devel swig.spec,1.45,1.46 Message-ID: <20090310182348.0FDFC7002E@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/swig/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24424 Modified Files: swig.spec Log Message: - revert #489077 enhancement due #489421 Index: swig.spec =================================================================== RCS file: /cvs/pkgs/rpms/swig/devel/swig.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- swig.spec 9 Mar 2009 16:05:14 -0000 1.45 +++ swig.spec 10 Mar 2009 18:23:17 -0000 1.46 @@ -4,7 +4,7 @@ Summary: Connects C/C++/Objective C to some high-level programming languages. Name: swig Version: 1.3.38 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: Development/Tools URL: http://swig.sourceforge.net/ @@ -78,9 +78,12 @@ %files doc %doc ANNOUNCE CHANGES FUTURE INSTALL LICENSE NEW README TODO -%doc Doc Examples +%doc Doc %changelog +* Tue Mar 10 2009 Adam Tkac 1.3.38-5 +- revert #489077 enhancement due #489421 + * Mon Mar 09 2009 Adam Tkac 1.3.38-4 - moved documentation to -doc subpackage and build it as noarch - added Example/ directory to -doc (#489077) From pkgdb at fedoraproject.org Tue Mar 10 18:26:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:26:05 +0000 Subject: [pkgdb] ecj was added for dbhole Message-ID: <20090310182625.5183C208505@bastion.fedora.phx.redhat.com> kevin has added Package ecj with summary Eclipse Compiler for Java kevin has approved Package ecj kevin has added a Fedora devel branch for ecj with an owner of dbhole kevin has approved ecj in Fedora devel kevin has approved Package ecj kevin has set commit to Approved for provenpackager on ecj (Fedora devel) kevin has set build to Approved for provenpackager on ecj (Fedora devel) kevin has set checkout to Approved for provenpackager on ecj (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ecj From pkgdb at fedoraproject.org Tue Mar 10 18:26:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:26:06 +0000 Subject: [pkgdb] ecj (Fedora, devel) updated by kevin Message-ID: <20090310182626.E2FE620850F@bastion.fedora.phx.redhat.com> kevin approved watchbugzilla on ecj (Fedora devel) for overholt kevin approved watchcommits on ecj (Fedora devel) for overholt To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ecj From kevin at fedoraproject.org Tue Mar 10 18:25:32 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 10 Mar 2009 18:25:32 +0000 (UTC) Subject: rpms/ecj - New directory Message-ID: <20090310182532.45BFA7002E@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ecj In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx25018/rpms/ecj Log Message: Directory /cvs/pkgs/rpms/ecj added to the repository From kevin at fedoraproject.org Tue Mar 10 18:25:32 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 10 Mar 2009 18:25:32 +0000 (UTC) Subject: rpms/ecj/devel - New directory Message-ID: <20090310182532.B42A570132@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ecj/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx25018/rpms/ecj/devel Log Message: Directory /cvs/pkgs/rpms/ecj/devel added to the repository From kevin at fedoraproject.org Tue Mar 10 18:25:41 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 10 Mar 2009 18:25:41 +0000 (UTC) Subject: rpms/ecj Makefile,NONE,1.1 Message-ID: <20090310182541.424387002E@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ecj In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx25018/rpms/ecj Added Files: Makefile Log Message: Setup of module ecj --- NEW FILE Makefile --- # Top level Makefile for module ecj all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Mar 10 18:25:41 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 10 Mar 2009 18:25:41 +0000 (UTC) Subject: rpms/ecj/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090310182541.BBA4E7002E@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/ecj/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx25018/rpms/ecj/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ecj --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ecj # $Id: Makefile,v 1.1 2009/03/10 18:25:41 kevin Exp $ NAME := ecj SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 10 18:27:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:27:22 +0000 Subject: [pkgdb] yum-updatesd ownership updated Message-ID: <20090310182829.BD394208510@bastion.fedora.phx.redhat.com> Package yum-updatesd in Fedora devel is now owned by james To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-updatesd From pkgdb at fedoraproject.org Tue Mar 10 18:28:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:28:40 +0000 Subject: [pkgdb] yum-updatesd ownership updated Message-ID: <20090310182837.D6521208505@bastion.fedora.phx.redhat.com> Package yum-updatesd in Fedora 9 is now owned by james To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-updatesd From pkgdb at fedoraproject.org Tue Mar 10 18:28:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:28:21 +0000 Subject: [pkgdb] yum-updatesd ownership updated Message-ID: <20090310182841.B4DED208511@bastion.fedora.phx.redhat.com> Package yum-updatesd in Fedora 10 is now owned by james To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-updatesd From pkgdb at fedoraproject.org Tue Mar 10 18:28:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:28:32 +0000 Subject: [pkgdb] yum-updatesd had acl change status Message-ID: <20090310182852.DBBD420850F@bastion.fedora.phx.redhat.com> james has set the watchcommits acl on yum-updatesd (Fedora devel) to Approved for katzj To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-updatesd From pkgdb at fedoraproject.org Tue Mar 10 18:28:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:28:53 +0000 Subject: [pkgdb] yum-updatesd had acl change status Message-ID: <20090310182853.EEAAB208553@bastion.fedora.phx.redhat.com> james has set the commit acl on yum-updatesd (Fedora devel) to Approved for katzj To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-updatesd From pkgdb at fedoraproject.org Tue Mar 10 18:28:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:28:57 +0000 Subject: [pkgdb] yum-updatesd had acl change status Message-ID: <20090310182854.2A9D5208557@bastion.fedora.phx.redhat.com> james has set the watchbugzilla acl on yum-updatesd (Fedora devel) to Approved for katzj To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-updatesd From pkgdb at fedoraproject.org Tue Mar 10 18:27:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:27:48 +0000 Subject: [pkgdb] yum-updatesd had acl change status Message-ID: <20090310182855.61A6F208608@bastion.fedora.phx.redhat.com> james has set the approveacls acl on yum-updatesd (Fedora devel) to Approved for katzj To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-updatesd From lucilanga at fedoraproject.org Tue Mar 10 18:31:00 2009 From: lucilanga at fedoraproject.org (Lucian Langa) Date: Tue, 10 Mar 2009 18:31:00 +0000 (UTC) Subject: rpms/xastir/devel xastir-1.9.4-engunits.patch, 1.3, 1.4 xastir-1.9.4-libdir.patch, 1.4, 1.5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xastir.spec, 1.17, 1.18 Message-ID: <20090310183100.B478C7002E@cvs1.fedora.phx.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xastir/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26292 Modified Files: .cvsignore sources xastir.spec Added Files: xastir-1.9.4-engunits.patch xastir-1.9.4-libdir.patch Log Message: * Tue Mar 10 2009 Lucian Langa - 1:1.9.4-7 - downgrade to the latest stable - add patch for english units xastir-1.9.4-engunits.patch: Index: xastir-1.9.4-engunits.patch =================================================================== RCS file: xastir-1.9.4-engunits.patch diff -N xastir-1.9.4-engunits.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ xastir-1.9.4-engunits.patch 10 Mar 2009 18:30:28 -0000 1.4 @@ -0,0 +1,50 @@ +diff -Naur xastir-1.9.4/src/main.c xastir-1.9.4-mod/src/main.c +--- xastir-1.9.4/src/main.c 2008-08-01 03:09:18.000000000 +0300 ++++ xastir-1.9.4-mod/src/main.c 2008-10-07 08:11:38.000000000 +0300 +@@ -3663,7 +3663,7 @@ + + + static void TrackMouse( /*@unused@*/ Widget w, XtPointer clientData, XEvent *event, /*@unused@*/ Boolean *flag) { +- char my_text[50]; ++ char my_text[70]; + char str_lat[20]; + char str_long[20]; + long x, y; +@@ -3732,11 +3732,11 @@ + + strncat(my_text, + " ", +- sizeof(my_text) - strlen(my_text)); ++ sizeof(my_text) - strlen(my_text) - 1); + + strncat(my_text, + sec_to_loc(x,y), +- sizeof(my_text) - strlen(my_text)); ++ sizeof(my_text) - strlen(my_text) - 1); + + // begin dist/bearing + if ( do_dbstatus ) { +@@ -3785,19 +3785,19 @@ + + strncat(my_text, + " ", +- sizeof(my_text) - strlen(my_text)); ++ sizeof(my_text) - strlen(my_text) - 1); + + strncat(my_text, + temp_my_distance, +- sizeof(my_text) - strlen(my_text)); ++ sizeof(my_text) - strlen(my_text) - 1); + + strncat(my_text, + " ", +- sizeof(my_text) - strlen(my_text)); ++ sizeof(my_text) - strlen(my_text) - 1); + + strncat(my_text, + temp_my_course, +- sizeof(my_text) - strlen(my_text)); ++ sizeof(my_text) - strlen(my_text) - 1); + } + + XmTextFieldSetString(textarea, my_text); xastir-1.9.4-libdir.patch: Index: xastir-1.9.4-libdir.patch =================================================================== RCS file: xastir-1.9.4-libdir.patch diff -N xastir-1.9.4-libdir.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ xastir-1.9.4-libdir.patch 10 Mar 2009 18:30:29 -0000 1.5 @@ -0,0 +1,20 @@ +--- xastir-1.9.4/scripts/Makefile.am 2008-06-24 18:48:59.000000000 +0300 ++++ xastir-1.9.4-mod/scripts/Makefile.am 2008-09-08 11:59:39.000000000 +0300 +@@ -3,7 +3,7 @@ + # Copyright (C) 2000-2008 The Xastir Group + # + +-pkglib_SCRIPTS = \ ++pkgdata_SCRIPTS = \ + Coordinate.pm \ + coord-convert.pl \ + get-fcc-rac.pl \ +@@ -34,7 +34,7 @@ + Xastir_tigerpoly.py + + +-EXTRA_DIST = $(pkglib_SCRIPTS) ++EXTRA_DIST = $(pkgdata_SCRIPTS) + + + Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xastir/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 21 Dec 2008 16:11:51 -0000 1.4 +++ .cvsignore 10 Mar 2009 18:30:28 -0000 1.5 @@ -1 +1 @@ -xastir-1.9.5.tar.gz +xastir-1.9.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xastir/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Dec 2008 16:11:51 -0000 1.4 +++ sources 10 Mar 2009 18:30:28 -0000 1.5 @@ -1 +1 @@ -5108519683614e15c81bf78db4f75a38 xastir-1.9.5.tar.gz +415a19df810d0b28ac61aa444c3e7e0a xastir-1.9.4.tar.gz Index: xastir.spec =================================================================== RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xastir.spec 26 Feb 2009 07:43:03 -0000 1.17 +++ xastir.spec 10 Mar 2009 18:30:29 -0000 1.18 @@ -1,14 +1,15 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir -Version: 1.9.5 -Release: 3%{?dist} +Epoch: 1 +Version: 1.9.4 +Release: 7%{?dist} License: GPLv2+ Group: Applications/Internet Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.png -Patch0: xastir-1.9.5-libdir.patch -Patch1: xastir-1.9.5-IM.patch +Patch0: xastir-1.9.4-libdir.patch +Patch1: xastir-1.9.4-engunits.patch URL: http://www.xastir.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: wget @@ -27,7 +28,7 @@ %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .libdir -%patch1 -p1 -b .im +%patch1 -p1 -b .engunits %build #./bootstrap.sh @@ -73,7 +74,6 @@ %defattr(-,root,root,-) %{_bindir}/xastir %{_bindir}/xastir_udp_client -%{_bindir}/testdbfawk %{_bindir}/callpass %{_mandir}/man1/xastir.* %{_datadir}/xastir @@ -84,6 +84,10 @@ %doc README.MAPS README.win32 UPGRADE %changelog +* Tue Mar 10 2009 Lucian Langa - 1:1.9.4-7 +- downgrade to the latest stable +- add patch for english units + * Wed Feb 25 2009 Fedora Release Engineering - 1.9.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From twaugh at fedoraproject.org Tue Mar 10 18:32:15 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Tue, 10 Mar 2009 18:32:15 +0000 (UTC) Subject: rpms/system-config-printer/devel system-config-printer-git-1.1.x.patch, 1.7, 1.8 system-config-printer.spec, 1.253, 1.254 Message-ID: <20090310183215.B2BAC7002E@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26407 Modified Files: system-config-printer.spec Added Files: system-config-printer-git-1.1.x.patch Log Message: * Tue Mar 10 2009 Tim Waugh 1.1.5-2 - Added patch for changes in 1.1.x since 1.1.5: - Strip " hpijs" from PPD names. - Handle there being no operation name set when authentication/retry is required. - Mark "Unauthorized" PolicyKit dialog strings for translation, and change that dialog to an error. - Work around marker-* attributes not being presented as lists (bug #489512). - D-Bus policy tweak. - Better PPD fallback searching. - Fixed model search oddity when no digits in model name. - Fixed locale save/restore in cupshelpers (bug #489313). - Use gtk.show_uri() instead of gnome.url_show() (trac #147). - Removed HPLIP probe screen (no longer needed). - Be certain of having the right cell when starting a rename (Ubuntu #333260). - Fixed strftime call (Ubuntu #334859). - Check dict before use when handling auth-info-required. - Handle timed operations being cancelled in the troubleshooter test print page (Ubuntu #325084). - Put pycups version requirement in monitor module. system-config-printer-git-1.1.x.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 system-config-printer-git-1.1.x.patch Index: system-config-printer-git-1.1.x.patch =================================================================== RCS file: system-config-printer-git-1.1.x.patch diff -N system-config-printer-git-1.1.x.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ system-config-printer-git-1.1.x.patch 10 Mar 2009 18:32:12 -0000 1.8 @@ -0,0 +1,108750 @@ +diff -up system-config-printer-1.1.5/authconn.py.git-1.1.x system-config-printer-1.1.5/authconn.py +--- system-config-printer-1.1.5/authconn.py.git-1.1.x 2009-03-03 13:29:34.000000000 +0000 ++++ system-config-printer-1.1.5/authconn.py 2009-03-10 17:43:31.000000000 +0000 +@@ -205,9 +205,10 @@ class Connection: + break + except cups.IPPError, (e, m): + if self._use_pk and m == 'pkcancel': +- title = 'Unauthorized request (%s)' % fname +- text = 'You are not authorized for the requested action' +- show_info_dialog (title, text, None) ++ title = _('Unauthorized request (%s)') % fname ++ text = _("You are not authorized to carry out the" ++ "requested action.") ++ show_error_dialog (title, text, None) + raise cups.IPPError (0, _("Operation canceled")) + if not self._cancel and (e == cups.IPP_NOT_AUTHORIZED or + e == cups.IPP_FORBIDDEN): +@@ -245,13 +246,18 @@ class Connection: + if self._lock: + gtk.gdk.threads_enter () + ++ try: ++ msg = _("CUPS server error (%s)") % self._operation_stack[0] ++ except IndexError: ++ msg = _("CUPS server error") ++ + d = gtk.MessageDialog (self._parent, + gtk.DIALOG_MODAL | + gtk.DIALOG_DESTROY_WITH_PARENT, + gtk.MESSAGE_ERROR, + gtk.BUTTONS_NONE, +- _("CUPS server error (%s)") % +- self._operation_stack[0]) ++ msg) ++ + d.format_secondary_text (_("There was an error during the " + "CUPS operation: '%s'." % message)) + d.add_buttons (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, +@@ -397,8 +403,12 @@ class Connection: + + # Prompt. + if len (self._operation_stack) > 0: +- d = AuthDialog (title=_("Authentication (%s)") % +- self._operation_stack[0], ++ try: ++ title = _("Authentication (%s)") % self._operation_stack[0] ++ except IndexError: ++ title = _("Authentication") ++ ++ d = AuthDialog (title=title, + parent=self._parent) + else: + d = AuthDialog (parent=self._parent) +diff -U0 system-config-printer-1.1.5/ChangeLog.git-1.1.x system-config-printer-1.1.5/ChangeLog +--- system-config-printer-1.1.5/ChangeLog.git-1.1.x 2009-03-03 13:29:34.000000000 +0000 ++++ system-config-printer-1.1.5/ChangeLog 2009-03-10 17:43:31.000000000 +0000 +@@ -0,0 +1,27 @@ ++2009-03-10 Tim Waugh ++ ++ * cupshelpers/ppds.py (ppdMakeModelSplit): Strip " hpijs" from PPD ++ names. ++ (ppdMakeModelSplit.strip_suffix): Removed dead code. ++ ++2009-03-10 Tim Waugh ++ ++ * cupshelpers/ppds.py (PPDs.getPPDNameFromDeviceID): Better PPD ++ fallback searching. ++ ++2009-03-10 Till Kamppeter ++ ++ * newprinternotification.conf: Adapted D-Bus policy file to the ++ new D-Bus defaults (Ubuntu #318776). ++ ++2009-03-10 Tim Waugh ++ ++ * cupshelpers/ppds.py (PPDs._findBestMatchPPDs): Don't try search ++ for a model series if there are no digits in the model name. ++ ++2009-03-09 Tim Waugh ++ ++ * cupshelpers/cupshelpers.py (Printer._expand_flags): Use ++ setlocale() to save current LC_CTYPE value, not getlocale() (bug ++ #489313). ++ +diff -up system-config-printer-1.1.5/cupshelpers/cupshelpers.py.git-1.1.x system-config-printer-1.1.5/cupshelpers/cupshelpers.py +--- system-config-printer-1.1.5/cupshelpers/cupshelpers.py.git-1.1.x 2009-03-03 13:29:34.000000000 +0000 ++++ system-config-printer-1.1.5/cupshelpers/cupshelpers.py 2009-03-10 17:43:31.000000000 +0000 +@@ -52,7 +52,7 @@ class Printer: + prefix_length = len(prefix) + + # Use the C locale for lower() (trac #151). +- current_ctype = locale.getlocale (locale.LC_CTYPE) ++ current_ctype = locale.setlocale (locale.LC_CTYPE) + locale.setlocale (locale.LC_CTYPE, "C") + + # loop over cups constants +diff -up system-config-printer-1.1.5/cupshelpers/ppds.py.git-1.1.x system-config-printer-1.1.5/cupshelpers/ppds.py +--- system-config-printer-1.1.5/cupshelpers/ppds.py.git-1.1.x 2009-02-10 18:33:35.000000000 +0000 ++++ system-config-printer-1.1.5/cupshelpers/ppds.py 2009-03-10 17:43:31.000000000 +0000 +@@ -2,9 +2,9 @@ + + ## system-config-printer + +-## Copyright (C) 2006, 2007, 2008 Red Hat, Inc. ++## Copyright (C) 2006, 2007, 2008, 2009 Red Hat, Inc. + ## Copyright (C) 2006 Florian Festi +-## Copyright (C) 2006, 2007, 2008 Tim Waugh ++## Copyright (C) 2006, 2007, 2008, 2009 Tim Waugh + + ## 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 +@@ -99,11 +99,6 @@ def ppdMakeModelSplit (ppd_make_and_mode + make = ppd_make_and_model + model = '' + +- def strip_suffix (model, suffix): +- if model.endswith (suffix): +- return model[:-len(suffix)] +- return model +- + # Model names do not contain a comma, truncate all from the + # comma on + c = model.find (",") +@@ -154,6 +149,7 @@ def ppdMakeModelSplit (ppd_make_and_mode + model = re.sub (r"(?i)\s*PostScript\s*$", "", model) + model = re.sub (r"(?i)\s*\(\s*\)", "", model) + model = re.sub (r"(?i)\s*[\-\/]\s*$", "", model) ++ model = re.sub (r"(?i)\s*hpijs\s*$", "", model) + + for mfr in [ "Apple", "Canon", "Epson", "Lexmark", "Oki" ]: + if make == mfr.upper (): +@@ -550,27 +546,27 @@ class PPDs: + ppdnamelist = generic + + if not ppdnamelist: +- _debugprint ("Text-only fallback") + status = self.STATUS_NO_DRIVER +- ppdnamelist = ["textonly.ppd"] +- tppdfound = 0 +- for ppdpath in self.ppds.keys (): +- if ppdpath.endswith (ppdnamelist[0]): +- tppdfound = 1 +- ppdnamelist = [ppdpath] +- break +- if tppdfound == 0: +- _debugprint ("No text-only driver?! Using postscript.ppd") +- ppdnamelist = ["postscript.ppd"] +- psppdfound = 0 ++ fallbacks = ["textonly.ppd", "postscript.ppd"] ++ found = False ++ for fallback in fallbacks: ++ _debugprint ("'%s' fallback" % fallback) ++ fallbackgz = fallback + ".gz" + for ppdpath in self.ppds.keys (): +- if ppdpath.endswith (ppdnamelist[0]): +- psppdfound = 1 ++ if (ppdpath.endswith (fallback) or ++ ppdpath.endswith (fallbackgz)): + ppdnamelist = [ppdpath] ++ found = True + break +- if psppdfound == 0: +- _debugprint ("No postscript.ppd; choosing any") +- ppdnamelist = [self.ppds.keys ()[0]] ++ ++ if found: ++ break ++ ++ _debugprint ("Fallback '%s' not available" % fallback) ++ ++ if not found: ++ _debugprint ("No fallback available; choosing any") ++ ppdnamelist = [self.ppds.keys ()[0]] + + if id_matched: + _debugprint ("Checking DES field") +@@ -700,39 +696,39 @@ class PPDs: + modelnumber = 0 + if digits > 0: + modelnumber = int (modelid[digits_start:digits_end]) +- modelpattern = (modelid[:digits_start] + "%d" + +- modelid[digits_end:]) +- _debugprint ("Searching for model ID '%s', '%s' %% %d" % +- (modelid, modelpattern, modelnumber)) +- ignore_digits = 0 +- best_mdl = None +- found = False +- while ignore_digits < digits: +- div = pow (10, ignore_digits) +- modelid = modelpattern % ((modelnumber / div) * div) +- _debugprint ("Ignoring %d of %d digits, trying %s" % +- (ignore_digits, digits, modelid)) +- [...108357 lines suppressed...] +- # found a locally-connected device. +- hp = cupshelpers.Device ("hp", +- **{'device-class': 'network', +- 'device-info': +- _("HP Printer (HPLIP)")}) +- devices.append (hp) +- break +- else: +- # The hp backend is in the device list but as a +- # generic driver with no devices found. It +- # reports "direct" as its class in this case, but +- # ought to report "network". +- each.device_class = 'network' +- + # Mark duplicate URIs for deletion + for i in range (len (devices) - 1): + for j in range (i + 1, len (devices)): +@@ -4869,7 +4864,7 @@ class NewPrinterGUI(GtkGUI): + device1.uri = "delete" + else: + device2.uri = "delete" +- devices = filter(lambda x: x.uri not in ("hpfax", ++ devices = filter(lambda x: x.uri not in ("hp", "hpfax", + "hal", "beh", + "scsi", "http", "delete"), + devices) +@@ -5617,9 +5612,6 @@ class NewPrinterGUI(GtkGUI): + self.device = device + self.lblNPDeviceDescription.set_text ('') + page = self.new_printer_device_tabs.get(device.type, 1) +- if device.type == "hp" and device.uri != "hp": +- page = 0 +- + self.ntbkNPType.set_current_page(page) + + location = '' +@@ -5740,8 +5732,6 @@ class NewPrinterGUI(GtkGUI): + self.entSMBPassword.set_text ('') + self.entSMBURI.set_text(device.uri[6:]) + self.btnSMBVerify.set_sensitive(True) +- elif device.uri == "hp": +- self.lblHPURI.set_text ('') + else: + self.entNPTDevice.set_text(device.uri) + +@@ -5783,46 +5773,6 @@ class NewPrinterGUI(GtkGUI): + if printers: + self.cmbentNPTLpdQueue.set_active(0) + +- def on_entNPTHPHostname_changed(self, ent): +- self.lblHPURI.set_text ('') +- s = ent.get_text () +- self.btnHPFindQueue.set_sensitive (len (s) > 0) +- self.setNPButtons () +- +- def on_btnHPFindQueue_clicked(self, button): +- host = self.entNPTHPHostname.get_text () +- +- # Check whether the device is supported by HPLIP +- hplipuri = self.get_hplip_uri_for_network_printer(host, "print") +- if hplipuri == None or hplipuri == '': +- show_error_dialog (_("No Print Shares"), +- _("HPLIP cannot find the device."), +- self.NewPrinterWindow) +- self.entNPTHPHostname.grab_focus () +- return +- +- self.lblHPURI.set_text (hplipuri) +- s = hplipuri.find ("/usb/") +- if s == -1: +- s = hplipuri.find ("/par/") +- +- if s == -1: +- s = hplipuri.find ("/net/") +- +- if s != -1: +- s += 5 +- e = hplipuri[s:].find ("?") +- if e == -1: +- e = len (hplipuri) +- +- mdl = hplipuri[s:s+e].replace ("_", " ") +- if mdl.startswith ("hp ") or mdl.startswith ("HP "): +- mdl = mdl[3:] +- self.device.make_and_model = "HP " + mdl +- id = "MFG:HP;MDL:%s;DES:HP %s;" % (mdl, mdl) +- self.device.id = id +- self.device.id_dict = cupshelpers.parseDeviceID (id) +- + ### Find Network Printer + def on_entNPTNetworkHostname_changed(self, ent): + s = ent.get_text () +@@ -5938,8 +5888,6 @@ class NewPrinterGUI(GtkGUI): + uri = SMBURI (group=group, host=host, share=share, + user=user, password=password).get_uri () + device = "smb://" + uri +- elif self.device.uri == "hp": +- device = self.lblHPURI.get_text () + elif not self.device.is_class: + device = self.device.uri + else: +diff -up system-config-printer-1.1.5/troubleshoot/PrintTestPage.py.git-1.1.x system-config-printer-1.1.5/troubleshoot/PrintTestPage.py +--- system-config-printer-1.1.5/troubleshoot/PrintTestPage.py.git-1.1.x 2009-03-03 13:29:34.000000000 +0000 ++++ system-config-printer-1.1.5/troubleshoot/PrintTestPage.py 2009-03-10 17:43:43.000000000 +0000 +@@ -27,7 +27,7 @@ import os + import pango + import tempfile + import time +-from timedops import TimedOperation ++from timedops import TimedOperation, OperationCanceled + + from base import * + +@@ -166,7 +166,10 @@ class PrintTestPage(Question): + return (jobs_dict, completed_jobs_dict) + + self.op = TimedOperation (get_jobs, parent=parent) +- (jobs_dict, completed_jobs_dict) = self.op.run () ++ try: ++ (jobs_dict, completed_jobs_dict) = self.op.run () ++ except OperationCanceled: ++ return False + + # We want to display the jobs in the queue for this printer... + try: +@@ -219,7 +222,10 @@ class PrintTestPage(Question): + + parent = self.troubleshooter.get_window () + self.op = TimedOperation (create_subscription, parent=parent) +- self.sub_id = self.op.run () ++ try: ++ self.sub_id = self.op.run () ++ except OperationCanceled: ++ pass + + try: + bus = dbus.SystemBus () +@@ -252,7 +258,11 @@ class PrintTestPage(Question): + self.op = TimedOperation (cancel_subscription, + (self.sub_id,), + parent=parent) +- self.op.run () ++ try: ++ self.op.run () ++ except OperationCanceled: ++ pass ++ + try: + del self.sub_seq + except: +@@ -302,8 +312,12 @@ class PrintTestPage(Question): + self.op = TimedOperation (collect_attributes, + (jobs,), + parent=parent) +- with_attrs = self.op.run () +- self.answers['test_page_job_status'] = with_attrs ++ try: ++ with_attrs = self.op.run () ++ self.answers['test_page_job_status'] = with_attrs ++ except OperationCanceled: ++ pass ++ + return self.answers + + def cancel_operation (self): +@@ -383,6 +397,9 @@ class PrintTestPage(Question): + jobs.append (jobid) + self.persistent_answers['test_page_job_id'] = jobs + break ++ except OperationCanceled: ++ self.persistent_answers['test_page_submit_failure'] = 'cancel' ++ break + except RuntimeError: + self.persistent_answers['test_page_submit_failure'] = 'connect' + break +@@ -420,7 +437,10 @@ class PrintTestPage(Question): + self.op = TimedOperation (cancel_jobs, + (jobids,), + parent=self.troubleshooter.get_window ()) +- self.op.run () ++ try: ++ self.op.run () ++ except OperationCanceled: ++ pass + + def test_toggled (self, cell, path): + model = self.treeview.get_model () +@@ -447,7 +467,11 @@ class PrintTestPage(Question): + self.op = TimedOperation (get_notifications, + (self,), + parent=parent) +- notifications = self.op.run () ++ try: ++ notifications = self.op.run () ++ except OperationCanceled: ++ gtk.gdk.threads_leave () ++ return True + + answers = self.troubleshooter.answers + model = self.treeview.get_model () Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v retrieving revision 1.253 retrieving revision 1.254 diff -u -r1.253 -r1.254 --- system-config-printer.spec 3 Mar 2009 22:34:29 -0000 1.253 +++ system-config-printer.spec 10 Mar 2009 18:32:14 -0000 1.254 @@ -7,13 +7,14 @@ Summary: A printer administration tool Name: system-config-printer Version: 1.1.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.bz2 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2 +Patch1: system-config-printer-git-1.1.x.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -63,6 +64,7 @@ %prep %setup -q -a 1 -a 2 +%patch1 -p1 -b .git-1.1.x %build %configure @@ -165,6 +167,29 @@ exit 0 %changelog +* Tue Mar 10 2009 Tim Waugh 1.1.5-2 +- Added patch for changes in 1.1.x since 1.1.5: + - Strip " hpijs" from PPD names. + - Handle there being no operation name set when authentication/retry + is required. + - Mark "Unauthorized" PolicyKit dialog strings for translation, and + change that dialog to an error. + - Work around marker-* attributes not being presented as lists + (bug #489512). + - D-Bus policy tweak. + - Better PPD fallback searching. + - Fixed model search oddity when no digits in model name. + - Fixed locale save/restore in cupshelpers (bug #489313). + - Use gtk.show_uri() instead of gnome.url_show() (trac #147). + - Removed HPLIP probe screen (no longer needed). + - Be certain of having the right cell when starting a rename + (Ubuntu #333260). + - Fixed strftime call (Ubuntu #334859). + - Check dict before use when handling auth-info-required. + - Handle timed operations being cancelled in the troubleshooter test + print page (Ubuntu #325084). + - Put pycups version requirement in monitor module. + * Tue Mar 3 2009 Tim Waugh 1.1.5-1 - 1.1.5. From pkgdb at fedoraproject.org Tue Mar 10 18:35:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:35:47 +0000 Subject: [pkgdb] leonidas-backgrounds had acl change status Message-ID: <20090310183547.C330D208552@bastion.fedora.phx.redhat.com> mso has set the watchcommits acl on leonidas-backgrounds (Fedora devel) to Approved for rdieter To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-backgrounds From pkgdb at fedoraproject.org Tue Mar 10 18:35:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:35:25 +0000 Subject: [pkgdb] leonidas-backgrounds had acl change status Message-ID: <20090310183545.6EAD920850F@bastion.fedora.phx.redhat.com> mso has set the watchbugzilla acl on leonidas-backgrounds (Fedora devel) to Approved for rdieter To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-backgrounds From pkgdb at fedoraproject.org Tue Mar 10 18:34:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 18:34:43 +0000 Subject: [pkgdb] leonidas-backgrounds had acl change status Message-ID: <20090310183550.CEEA8208556@bastion.fedora.phx.redhat.com> mso has set the commit acl on leonidas-backgrounds (Fedora devel) to Approved for rdieter To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-backgrounds From dbhole at fedoraproject.org Tue Mar 10 18:36:28 2009 From: dbhole at fedoraproject.org (Deepak Bhole) Date: Tue, 10 Mar 2009 18:36:28 +0000 (UTC) Subject: rpms/ecj/devel ecj-defaultto1.5.patch, NONE, 1.1 ecj-rpmdebuginfo.patch, NONE, 1.1 ecj.sh.in, NONE, 1.1 ecj.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310183628.518067002E@cvs1.fedora.phx.redhat.com> Author: dbhole Update of /cvs/pkgs/rpms/ecj/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27829 Modified Files: .cvsignore sources Added Files: ecj-defaultto1.5.patch ecj-rpmdebuginfo.patch ecj.sh.in ecj.spec Log Message: Initial checkin for the ecj package ecj-defaultto1.5.patch: --- NEW FILE ecj-defaultto1.5.patch --- ### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core Index: compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java,v retrieving revision 1.203 diff -u -r1.203 CompilerOptions.java --- compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java 14 Apr 2008 19:41:33 -0000 1.203 +++ compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java 15 Dec 2008 19:50:02 -0000 @@ -253,9 +253,9 @@ // By default only lines and source attributes are generated. public int produceDebugAttributes = ClassFileConstants.ATTR_SOURCE | ClassFileConstants.ATTR_LINES; - public long complianceLevel = ClassFileConstants.JDK1_4; // by default be compliant with 1.4 - public long sourceLevel = ClassFileConstants.JDK1_3; //1.3 source behavior by default - public long targetJDK = ClassFileConstants.JDK1_2; // default generates for JVM1.2 + public long complianceLevel = ClassFileConstants.JDK1_5; // by default be compliant with 1.4 + public long sourceLevel = ClassFileConstants.JDK1_5; //1.3 source behavior by default + public long targetJDK = ClassFileConstants.JDK1_5; // default generates for JVM1.2 // source encoding format public String defaultEncoding = null; // will use the platform default encoding @@ -757,7 +757,7 @@ } else if (DISABLED.equals(optionValue)) { this.reportUnusedParameterIncludeDocCommentReference = false; } - } + } if ((optionValue = optionsMap.get(OPTION_ReportSpecialParameterHidingField)) != null) { if (ENABLED.equals(optionValue)) { this.reportSpecialParameterHidingField = true; @@ -944,10 +944,10 @@ } if ((optionValue = optionsMap.get(OPTION_ReportMissingJavadocComments)) != null) { updateSeverity(MissingJavadocComments, optionValue); - } + } if ((optionValue = optionsMap.get(OPTION_ReportMissingJavadocTagDescription)) != null) { this.reportMissingJavadocTagDescription = (String) optionValue; - } + } if ((optionValue = optionsMap.get(OPTION_ReportMissingJavadocCommentsVisibility)) != null) { if (PUBLIC.equals(optionValue)) { this.reportMissingJavadocCommentsVisibility = ClassFileConstants.AccPublic; ecj-rpmdebuginfo.patch: --- NEW FILE ecj-rpmdebuginfo.patch --- ### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v retrieving revision 1.327 diff -u -r1.327 Main.java --- batch/org/eclipse/jdt/internal/compiler/batch/Main.java 21 Apr 2008 15:00:59 -0000 1.327 +++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 20 Nov 2008 19:26:57 -0000 @@ -268,22 +268,22 @@ if ((startPosition > endPosition) || ((startPosition < 0) && (endPosition < 0)) || length == 0) - return Messages.problem_noSourceInformation; + return Messages.problem_noSourceInformation; StringBuffer errorBuffer = new StringBuffer(); if ((bits & Main.Logger.EMACS) == 0) { - errorBuffer.append(' ').append(Messages.bind(Messages.problem_atLine, String.valueOf(problem.getSourceLineNumber()))); + errorBuffer.append(' ').append(Messages.bind(Messages.problem_atLine, String.valueOf(problem.getSourceLineNumber()))); errorBuffer.append(Util.LINE_SEPARATOR); } errorBuffer.append('\t'); - + char c; final char SPACE = '\u0020'; final char MARK = '^'; final char TAB = '\t'; //the next code tries to underline the token..... //it assumes (for a good display) that token source does not - //contain any \r \n. This is false on statements ! + //contain any \r \n. This is false on statements ! //(the code still works but the display is not optimal !) // expand to line limits @@ -295,11 +295,11 @@ for (end = endPosition >= length ? length - 1 : endPosition ; end+1 < length; end++) { if ((c = unitSource[end + 1]) == '\r' || c == '\n') break; } - + // trim left and right spaces/tabs while ((c = unitSource[begin]) == ' ' || c == '\t') begin++; //while ((c = unitSource[end]) == ' ' || c == '\t') end--; TODO (philippe) should also trim right, but all tests are to be updated - + // copy source errorBuffer.append(unitSource, begin, end-begin+1); errorBuffer.append(Util.LINE_SEPARATOR).append("\t"); //$NON-NLS-1$ @@ -424,7 +424,7 @@ String.valueOf(generateTime), String.valueOf(((int) (generateTime * 1000.0 / time)) / 10.0), })); - } + } } public void logClassFile(boolean generatePackagesStructure, String outputPath, String relativeFileName) { if ((this.tagBits & Logger.XML) != 0) { @@ -916,7 +916,7 @@ this.main.bind("compile.totalTime", //$NON-NLS-1$ new String[] { String.valueOf(time), - })); + })); } if ((this.main.timing & Main.TIMING_DETAILED) != 0) { this.printlnOut( @@ -1119,7 +1119,7 @@ this.endTag(Logger.STATS); } } - + private void printTag(String name, HashMap params, boolean insertNewLine, boolean closeTag) { if (this.log != null) { ((GenericXMLWriter) this.log).printTag(name, parameters, true, insertNewLine, closeTag); @@ -1245,12 +1245,12 @@ boolean warnJavadocOn; boolean warnAllJavadocOn; - + public Compiler batchCompiler; /* Bundle containing messages */ public ResourceBundle bundle; protected FileSystem.Classpath[] checkedClasspaths; - + public Locale compilerLocale; public CompilerOptions compilerOptions; // read-only public CompilationProgress progress; @@ -1299,7 +1299,7 @@ public static final int TIMING_DISABLED = 0; public static final int TIMING_ENABLED = 1; public static final int TIMING_DETAILED = 2; - + public int timing = TIMING_DISABLED; public CompilerStats[] compilerStats; public boolean verbose = false; @@ -1312,7 +1312,7 @@ // two uses: recognize 'none' in options; code the singleton none // for the '-d none' option (wherever it may be found) public static final int DEFAULT_SIZE_CLASSPATH = 4; - + public static final String NONE = "none"; //$NON-NLS-1$ /** @@ -1562,7 +1562,7 @@ } /** * Return true if and only if the running VM supports the given minimal version. - * + * *

    This only checks the major version, since the minor version is always 0 (at least for the useful cases).

    *

    The given minimalSupportedVersion is one of the constants:

    *
      @@ -2536,8 +2536,8 @@ mode = DEFAULT; continue; } - - // set DocCommentSupport, with appropriate side effects on defaults if + + // set DocCommentSupport, with appropriate side effects on defaults if // javadoc is not enabled if (this.enableJavadocOn) { this.options.put( @@ -2601,7 +2601,7 @@ this.logger.logVersion(printVersionRequired); validateOptions(didSpecifyCompliance); - + // Enable annotation processing by default in batch mode when compliance is at least 1.6 // see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=185768 if (!didSpecifyDisabledAnnotationProcessing @@ -2609,6 +2609,29 @@ this.options.put(CompilerOptions.OPTION_Process_Annotations, CompilerOptions.ENABLED); } + { + // If we're building an RPM, force full debugging info to + // be generated, no matter what options have been passed + // by Ant. This is something of a kludge, but it is far + // better than the alternative, which is having class + // files with debug info mysteriously missing. + + String RpmPackageName = System.getenv("RPM_PACKAGE_NAME"); + String RpmArch = System.getenv("RPM_ARCH"); + String RpmBuildRoot = System.getenv("RPM_BUILD_ROOT"); + if (RpmPackageName != null && RpmArch != null && RpmBuildRoot != null) { + this.options.put( + CompilerOptions.OPTION_LocalVariableAttribute, + CompilerOptions.GENERATE); + this.options.put( + CompilerOptions.OPTION_LineNumberAttribute, + CompilerOptions.GENERATE); + this.options.put( + CompilerOptions.OPTION_SourceFileAttribute, + CompilerOptions.GENERATE); + } + } + this.logger.logCommandLineArguments(newCommandLineArgs); this.logger.logOptions(this.options); @@ -2636,7 +2659,7 @@ 0, classCount); } - + setPaths(bootclasspaths, sourcepathClasspathArg, sourcepathClasspaths, @@ -2644,7 +2667,7 @@ extdirsClasspaths, endorsedDirClasspaths, customEncoding); - + if (this.pendingErrors != null) { for (Iterator iterator = this.pendingErrors.iterator(); iterator.hasNext(); ) { String message = (String) iterator.next(); @@ -3376,7 +3399,7 @@ } else if (token.equals("unusedTypeArgs")) { //$NON-NLS-1$ this.options.put( CompilerOptions.OPTION_ReportUnusedTypeArgumentsForMethodInvocation, - isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); + isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); } else { addPendingErrors(this.bind("configure.invalidWarning", token)); //$NON-NLS-1$ } --- NEW FILE ecj.sh.in --- #!/bin/sh CLASSPATH=@JAVADIR@/ecj.jar${CLASSPATH:+:}$CLASSPATH \ java org.eclipse.jdt.internal.compiler.batch.Main "$@" --- NEW FILE ecj.spec --- Epoch: 1 %define qualifier 200902111700 %define with_gcjbootstrap %{!?_with_gcjbootstrap:0}%{?_with_gcjbootstrap:1} %define without_gcjbootstrap %{?_with_gcjbootstrap:0}%{!?_with_gcjbootstrap:1} Summary: Eclipse Compiler for Java Name: ecj Version: 3.4.2 Release: 1%{?dist} URL: http://www.eclipse.org License: EPL Group: Development/Languages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://download.eclipse.org/eclipse/downloads/drops/R-%{version}-%{qualifier}/%{name}src-%{version}.zip Source1: ecj.sh.in # Use ECJ for GCJ # cvs -d:pserver:anonymous at sourceware.org:/cvs/rhug \ # export -r eclipse_r34_1 eclipse-gcj # tar cjf ecj-gcj.tar.bz2 eclipse-gcj Source2: %{name}-gcj.tar.bz2 # Always generate debug info when building RPMs (Andrew Haley) Patch0: %{name}-rpmdebuginfo.patch Patch1: %{name}-defaultto1.5.patch BuildRequires: gcc-java >= 4.0.0 BuildRequires: java-gcj-compat %if %{with_gcjbootstrap} BuildRequires: ant %endif Requires: libgcj >= 4.0.0 Requires(post): java-gcj-compat Requires(postun): java-gcj-compat Provides: eclipse-ecj = %{epoch}:%{version}-%{release} Obsoletes: eclipse-ecj < 1:3.4.2-4 %description ECJ is the Java bytecode compiler of the Eclipse Platform. It is also known as the JDT Core batch compiler. %prep %setup -q -c %patch0 -p1 %patch1 -p1 # Use ECJ for GCJ's bytecode compiler tar jxf %{SOURCE2} mv eclipse-gcj/org/eclipse/jdt/internal/compiler/batch/GCCMain.java \ org/eclipse/jdt/internal/compiler/batch/ cat eclipse-gcj/gcc.properties >> \ org/eclipse/jdt/internal/compiler/batch/messages.properties rm -rf eclipse-gcj # Remove bits of JDT Core we don't want to build rm -r org/eclipse/jdt/internal/compiler/tool rm -r org/eclipse/jdt/internal/compiler/apt # JDTCompilerAdapter isn't used by the batch compiler rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java %build %if %{with_gcjbootstrap} for f in `find -name '*.java' | cut -c 3- | LC_ALL=C sort`; do gcj -Wno-deprecated -C $f done find -name '*.class' -or -name '*.properties' -or -name '*.rsc' |\ xargs fastjar cf %{name}-%{version}.jar %else ant %endif %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -a *.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar pushd $RPM_BUILD_ROOT%{_javadir} ln -s %{name}-%{version}.jar %{name}.jar ln -s %{name}-%{version}.jar eclipse-%{name}-%{version}.jar ln -s eclipse-%{name}-%{version}.jar eclipse-%{name}.jar ln -s %{name}-%{version}.jar jdtcore.jar popd # Install the ecj wrapper script install -p -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/ecj sed --in-place "s:@JAVADIR@:%{_javadir}:" $RPM_BUILD_ROOT%{_bindir}/ecj aot-compile-rpm %clean rm -rf $RPM_BUILD_ROOT %post if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %postun if [ -x %{_bindir}/rebuild-gcj-db ] then %{_bindir}/rebuild-gcj-db fi %files %defattr(-,root,root,-) %doc about.html %{_bindir}/%{name} %{_javadir}/%{name}*.jar %{_javadir}/eclipse-%{name}*.jar %{_javadir}/jdtcore.jar %{_libdir}/gcj/%{name} %changelog * Fri Mar 6 2009 Andrew Overholt 1:3.4.2-1 - 3.4.2 * Tue Dec 9 2008 Andrew Overholt 1:3.4.1-1 - 3.4.1 - Don't conditionalize building of gcj AOT bits (we're only building this for gcj and IcedTea bootstrapping). * Mon Jan 22 2007 Andrew Overholt 3.2.1-1 - Add eclipse-ecj-gcj.patch. * Fri Jan 12 2007 Andrew Overholt 3.2.1-1 - First version for Fedora 7. - Add BR: java-devel for jar. * Thu Nov 02 2006 Andrew Overholt 1:3.2.1-1jpp - First version for JPackage. * Mon Jul 24 2006 Andrew Overholt 1:3.2.0-1 - Add versionless ecj.jar symlink in /usr/share/java. * Wed Jul 19 2006 Andrew Overholt 1:3.2.0-1 - 3.2.0. * Fri Dec 09 2005 Jesse Keating - rebuilt * Mon Mar 07 2005 Andrew Overholt 1:3.1.0.M4.9 - Don't build for ppc or ia64. * Sun Feb 20 2005 Andrew Overholt 1:3.1.0.M4.6 - Upgrade back to 3.1M4. - Don't build for i386 and x86_64. - Provide eclipse-ecj until we can deprecate this package. * Fri Jan 14 2005 Andrew Overholt 3.1.0.M4.4 - build for all but x86 * Thu Jan 13 2005 Andrew Overholt 3.1.0.M4.3 - build for ppc exclusively * Wed Jan 12 2005 Andrew Overholt 3.1.0.M4.2 - Add RPM_OPT_FLAGS workaround. * Tue Jan 11 2005 Andrew Overholt 3.1.0.M4.1 - New version. * Mon Sep 27 2004 Gary Benson 2.1.3-5 - Rebuild with new katana. * Fri Jul 22 2004 Gary Benson 2.1.3-4 - Build without bootstrap-ant. - Split out lib-org-eclipse-jdt-internal-compiler.so. * Tue Jul 6 2004 Gary Benson 2.1.3-3 - Fix ecj-devel's dependencies. * Wed Jun 9 2004 Gary Benson 2.1.3-2 - Work around an optimiser failure somewhere in ecj or gcj (#125613). * Fri May 28 2004 Gary Benson - Build with katana. * Mon May 24 2004 Gary Benson 2.1.3-1 - Initial Red Hat Linux build. * Mon May 24 2004 Gary Benson - Upgraded to latest version. * Sun Jul 20 2003 Anthony Green - Add %%doc * Fri Jul 18 2003 Anthony Green - Initial RHUG build. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ecj/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 18:25:41 -0000 1.1 +++ .cvsignore 10 Mar 2009 18:35:57 -0000 1.2 @@ -0,0 +1,2 @@ +ecj-gcj.tar.bz2 +ecjsrc-3.4.2.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ecj/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 18:25:41 -0000 1.1 +++ sources 10 Mar 2009 18:35:57 -0000 1.2 @@ -0,0 +1,2 @@ +43c2aa722a815c61706549d28786d134 ecj-gcj.tar.bz2 +c50acc9a39d410188ffc729fdf99af2a ecjsrc-3.4.2.zip From twaugh at fedoraproject.org Tue Mar 10 18:39:44 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Tue, 10 Mar 2009 18:39:44 +0000 (UTC) Subject: rpms/cups/devel cups-str3124.patch,NONE,1.1 cups.spec,1.465,1.466 Message-ID: <20090310183944.79DAB7002E@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28787 Modified Files: cups.spec Added Files: cups-str3124.patch Log Message: * Tue Mar 10 2009 Tim Waugh 1:1.4-0.b2.10 - Applied patch to fix ppd-natural-language attribute in PPD list (STR #3124). cups-str3124.patch: --- NEW FILE cups-str3124.patch --- diff -up cups-1.4b2-svn8404/scheduler/cups-driverd.cxx.str3124 cups-1.4b2-svn8404/scheduler/cups-driverd.cxx --- cups-1.4b2-svn8404/scheduler/cups-driverd.cxx.str3124 2009-02-19 17:56:47.000000000 +0000 +++ cups-1.4b2-svn8404/scheduler/cups-driverd.cxx 2009-03-10 17:46:05.000000000 +0000 @@ -1716,7 +1716,7 @@ load_ppds(const char *d, /* I - Actual } for (i = 0; i < (int)(sizeof(languages) / sizeof(languages[0])); i ++) - if (!strcmp(languages[i].version, lang_version)) + if (!strcasecmp(languages[i].version, lang_version)) break; if (i < (int)(sizeof(languages) / sizeof(languages[0]))) @@ -1731,10 +1731,10 @@ load_ppds(const char *d, /* I - Actual else { /* - * Unknown language; use "xx"... + * Unknown language; use "C"... */ - strcpy(lang_version, "xx"); + strcpy(lang_version, "C"); } /* Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.465 retrieving revision 1.466 diff -u -r1.465 -r1.466 --- cups.spec 9 Mar 2009 12:11:38 -0000 1.465 +++ cups.spec 10 Mar 2009 18:39:13 -0000 1.466 @@ -8,7 +8,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.4 -Release: 0.%{pre}.9%{?dist} +Release: 0.%{pre}.10%{?dist} License: GPLv2 Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2 @@ -38,6 +38,7 @@ Patch12: cups-lpr-help.patch Patch13: cups-peercred.patch Patch14: cups-pid.patch +Patch15: cups-str3124.patch Patch16: cups-eggcups.patch Patch17: cups-getpass.patch Patch18: cups-driverd-timeout.patch @@ -178,6 +179,7 @@ %patch12 -p1 -b .lpr-help %patch13 -p1 -b .peercred %patch14 -p1 -b .pid +%patch15 -p1 -b .str3124 %patch16 -p1 -b .eggcups %patch17 -p1 -b .getpass %patch18 -p1 -b .driverd-timeout @@ -468,6 +470,10 @@ %{_libdir}/php/modules/*.so %changelog +* Tue Mar 10 2009 Tim Waugh 1:1.4-0.b2.10 +- Applied patch to fix ppd-natural-language attribute in PPD list + (STR #3124). + * Mon Mar 9 2009 Tim Waugh 1:1.4-0.b2.9 - Handle https:// device URIs (bug #478677, STR #3122). From jasper at fedoraproject.org Tue Mar 10 18:40:44 2009 From: jasper at fedoraproject.org (Jasper Capel) Date: Tue, 10 Mar 2009 18:40:44 +0000 (UTC) Subject: rpms/blahtexml/devel blahtexml.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310184044.297A67002E@cvs1.fedora.phx.redhat.com> Author: jasper Update of /cvs/pkgs/rpms/blahtexml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29304/devel Modified Files: .cvsignore sources Added Files: blahtexml.spec import.log Log Message: 0.6-4 --- NEW FILE blahtexml.spec --- Name: blahtexml Version: 0.6 Release: 4%{?dist} Summary: TeX / MathML converter Group: Applications/Publishing License: GPLv2+ URL: http://gva.noekeon.org/blahtexml/ Source0: http://gva.noekeon.org/blahtexml/blahtexml-%{version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xerces-c-devel %description Blahtex is a program written in C++, which converts an equation given in a syntax close to TeX into MathML. It is designed by David Harvey and is aimed at supporting equations in MediaWiki. Blahtexml is a simple extension of blahtex. In addition to the functionality of blahtex, blahtexml has XML processing in mind and is able to process a whole XML document into another XML document. Instead of converting only one formula at a time, blahtexml can convert all the formulas of the given XML file into MathML. %prep %setup -q %build make %{?_smp_mflags} blahtexml-linux CFLAGS="%{optflags}" %install rm -rf $RPM_BUILD_ROOT install -p -D -m0755 blahtexml $RPM_BUILD_ROOT%{_bindir}/blahtexml %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README GNU-GPL example1.xml example2.xml example3.xml %{_bindir}/blahtexml %changelog * Wed Feb 25 2009 Jasper Capel - 0.6-4 - Changes for review, by Michael Schwendt's suggestions: preserve timestamps when installing, use global compiler flags, dropped xerces-c dependency, in favour of automatic dependency generation. * Wed Feb 25 2009 Jasper Capel - 0.6-3 - Added parallel build make flags, as Jon Levell suggested. * Mon Feb 23 2009 Jasper Capel - 0.6-2 - Corrected Source0, Description and BuildRequires as Jeroen van Meeuwen suggested. * Fri Feb 20 2009 Jasper Capel - 0.6-1 - Initial build --- NEW FILE import.log --- blahtexml-0_6-4_fc11:HEAD:blahtexml-0.6-4.fc11.src.rpm:1236710394 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/blahtexml/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:31:18 -0000 1.1 +++ .cvsignore 10 Mar 2009 18:40:12 -0000 1.2 @@ -0,0 +1 @@ +blahtexml-0.6-src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/blahtexml/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:31:18 -0000 1.1 +++ sources 10 Mar 2009 18:40:13 -0000 1.2 @@ -0,0 +1 @@ +89999112172b5370b821ed072f6fb179 blahtexml-0.6-src.tar.gz From jasper at fedoraproject.org Tue Mar 10 18:42:01 2009 From: jasper at fedoraproject.org (Jasper Capel) Date: Tue, 10 Mar 2009 18:42:01 +0000 (UTC) Subject: rpms/blahtexml/F-9 blahtexml.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310184201.31B5770132@cvs1.fedora.phx.redhat.com> Author: jasper Update of /cvs/pkgs/rpms/blahtexml/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29808/F-9 Modified Files: .cvsignore sources Added Files: blahtexml.spec import.log Log Message: 0.6-4 --- NEW FILE blahtexml.spec --- Name: blahtexml Version: 0.6 Release: 4%{?dist} Summary: TeX / MathML converter Group: Applications/Publishing License: GPLv2+ URL: http://gva.noekeon.org/blahtexml/ Source0: http://gva.noekeon.org/blahtexml/blahtexml-%{version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xerces-c-devel %description Blahtex is a program written in C++, which converts an equation given in a syntax close to TeX into MathML. It is designed by David Harvey and is aimed at supporting equations in MediaWiki. Blahtexml is a simple extension of blahtex. In addition to the functionality of blahtex, blahtexml has XML processing in mind and is able to process a whole XML document into another XML document. Instead of converting only one formula at a time, blahtexml can convert all the formulas of the given XML file into MathML. %prep %setup -q %build make %{?_smp_mflags} blahtexml-linux CFLAGS="%{optflags}" %install rm -rf $RPM_BUILD_ROOT install -p -D -m0755 blahtexml $RPM_BUILD_ROOT%{_bindir}/blahtexml %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README GNU-GPL example1.xml example2.xml example3.xml %{_bindir}/blahtexml %changelog * Wed Feb 25 2009 Jasper Capel - 0.6-4 - Changes for review, by Michael Schwendt's suggestions: preserve timestamps when installing, use global compiler flags, dropped xerces-c dependency, in favour of automatic dependency generation. * Wed Feb 25 2009 Jasper Capel - 0.6-3 - Added parallel build make flags, as Jon Levell suggested. * Mon Feb 23 2009 Jasper Capel - 0.6-2 - Corrected Source0, Description and BuildRequires as Jeroen van Meeuwen suggested. * Fri Feb 20 2009 Jasper Capel - 0.6-1 - Initial build --- NEW FILE import.log --- blahtexml-0_6-4_fc11:F-9:blahtexml-0.6-4.fc11.src.rpm:1236710470 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/blahtexml/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:31:18 -0000 1.1 +++ .cvsignore 10 Mar 2009 18:41:30 -0000 1.2 @@ -0,0 +1 @@ +blahtexml-0.6-src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/blahtexml/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:31:18 -0000 1.1 +++ sources 10 Mar 2009 18:41:30 -0000 1.2 @@ -0,0 +1 @@ +89999112172b5370b821ed072f6fb179 blahtexml-0.6-src.tar.gz From jasper at fedoraproject.org Tue Mar 10 18:43:15 2009 From: jasper at fedoraproject.org (Jasper Capel) Date: Tue, 10 Mar 2009 18:43:15 +0000 (UTC) Subject: rpms/blahtexml/F-10 blahtexml.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310184315.501F970132@cvs1.fedora.phx.redhat.com> Author: jasper Update of /cvs/pkgs/rpms/blahtexml/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30459/F-10 Modified Files: .cvsignore sources Added Files: blahtexml.spec import.log Log Message: 0.6-4 --- NEW FILE blahtexml.spec --- Name: blahtexml Version: 0.6 Release: 4%{?dist} Summary: TeX / MathML converter Group: Applications/Publishing License: GPLv2+ URL: http://gva.noekeon.org/blahtexml/ Source0: http://gva.noekeon.org/blahtexml/blahtexml-%{version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xerces-c-devel %description Blahtex is a program written in C++, which converts an equation given in a syntax close to TeX into MathML. It is designed by David Harvey and is aimed at supporting equations in MediaWiki. Blahtexml is a simple extension of blahtex. In addition to the functionality of blahtex, blahtexml has XML processing in mind and is able to process a whole XML document into another XML document. Instead of converting only one formula at a time, blahtexml can convert all the formulas of the given XML file into MathML. %prep %setup -q %build make %{?_smp_mflags} blahtexml-linux CFLAGS="%{optflags}" %install rm -rf $RPM_BUILD_ROOT install -p -D -m0755 blahtexml $RPM_BUILD_ROOT%{_bindir}/blahtexml %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README GNU-GPL example1.xml example2.xml example3.xml %{_bindir}/blahtexml %changelog * Wed Feb 25 2009 Jasper Capel - 0.6-4 - Changes for review, by Michael Schwendt's suggestions: preserve timestamps when installing, use global compiler flags, dropped xerces-c dependency, in favour of automatic dependency generation. * Wed Feb 25 2009 Jasper Capel - 0.6-3 - Added parallel build make flags, as Jon Levell suggested. * Mon Feb 23 2009 Jasper Capel - 0.6-2 - Corrected Source0, Description and BuildRequires as Jeroen van Meeuwen suggested. * Fri Feb 20 2009 Jasper Capel - 0.6-1 - Initial build --- NEW FILE import.log --- blahtexml-0_6-4_fc11:F-10:blahtexml-0.6-4.fc11.src.rpm:1236710546 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/blahtexml/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:31:18 -0000 1.1 +++ .cvsignore 10 Mar 2009 18:42:44 -0000 1.2 @@ -0,0 +1 @@ +blahtexml-0.6-src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/blahtexml/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:31:18 -0000 1.1 +++ sources 10 Mar 2009 18:42:44 -0000 1.2 @@ -0,0 +1 @@ +89999112172b5370b821ed072f6fb179 blahtexml-0.6-src.tar.gz From jasper at fedoraproject.org Tue Mar 10 18:44:27 2009 From: jasper at fedoraproject.org (Jasper Capel) Date: Tue, 10 Mar 2009 18:44:27 +0000 (UTC) Subject: rpms/blahtexml/EL-5 blahtexml.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310184427.C35137002E@cvs1.fedora.phx.redhat.com> Author: jasper Update of /cvs/pkgs/rpms/blahtexml/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31436/EL-5 Modified Files: .cvsignore sources Added Files: blahtexml.spec import.log Log Message: 0.6-4 --- NEW FILE blahtexml.spec --- Name: blahtexml Version: 0.6 Release: 4%{?dist} Summary: TeX / MathML converter Group: Applications/Publishing License: GPLv2+ URL: http://gva.noekeon.org/blahtexml/ Source0: http://gva.noekeon.org/blahtexml/blahtexml-%{version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xerces-c-devel %description Blahtex is a program written in C++, which converts an equation given in a syntax close to TeX into MathML. It is designed by David Harvey and is aimed at supporting equations in MediaWiki. Blahtexml is a simple extension of blahtex. In addition to the functionality of blahtex, blahtexml has XML processing in mind and is able to process a whole XML document into another XML document. Instead of converting only one formula at a time, blahtexml can convert all the formulas of the given XML file into MathML. %prep %setup -q %build make %{?_smp_mflags} blahtexml-linux CFLAGS="%{optflags}" %install rm -rf $RPM_BUILD_ROOT install -p -D -m0755 blahtexml $RPM_BUILD_ROOT%{_bindir}/blahtexml %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README GNU-GPL example1.xml example2.xml example3.xml %{_bindir}/blahtexml %changelog * Wed Feb 25 2009 Jasper Capel - 0.6-4 - Changes for review, by Michael Schwendt's suggestions: preserve timestamps when installing, use global compiler flags, dropped xerces-c dependency, in favour of automatic dependency generation. * Wed Feb 25 2009 Jasper Capel - 0.6-3 - Added parallel build make flags, as Jon Levell suggested. * Mon Feb 23 2009 Jasper Capel - 0.6-2 - Corrected Source0, Description and BuildRequires as Jeroen van Meeuwen suggested. * Fri Feb 20 2009 Jasper Capel - 0.6-1 - Initial build --- NEW FILE import.log --- blahtexml-0_6-4_fc11:EL-5:blahtexml-0.6-4.fc11.src.rpm:1236710621 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/blahtexml/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:31:18 -0000 1.1 +++ .cvsignore 10 Mar 2009 18:43:57 -0000 1.2 @@ -0,0 +1 @@ +blahtexml-0.6-src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/blahtexml/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:31:18 -0000 1.1 +++ sources 10 Mar 2009 18:43:57 -0000 1.2 @@ -0,0 +1 @@ +89999112172b5370b821ed072f6fb179 blahtexml-0.6-src.tar.gz From mclasen at fedoraproject.org Tue Mar 10 18:49:58 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 10 Mar 2009 18:49:58 +0000 (UTC) Subject: rpms/DeviceKit-disks/devel DeviceKit-disks.spec, 1.8, 1.9 devkit-disks-dashdash.patch, 1.1, 1.2 Message-ID: <20090310184958.C5C617002E@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/DeviceKit-disks/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32713 Modified Files: DeviceKit-disks.spec devkit-disks-dashdash.patch Log Message: fix the -- patch Index: DeviceKit-disks.spec =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- DeviceKit-disks.spec 6 Mar 2009 16:25:26 -0000 1.8 +++ DeviceKit-disks.spec 10 Mar 2009 18:49:28 -0000 1.9 @@ -11,7 +11,7 @@ Summary: Disk Management Service Name: DeviceKit-disks Version: 003 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary @@ -118,6 +118,9 @@ %{_datadir}/gtk-doc/html/devkit-disks/* %changelog +* Tue Mar 10 2009 Matthias Clasen - 003-6 +- Fix the previous patch + * Fri Mar 6 2009 Matthias Clasen - 003-5 - Handle -- correctly in devkit-disks devkit-disks-dashdash.patch: Index: devkit-disks-dashdash.patch =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/devkit-disks-dashdash.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- devkit-disks-dashdash.patch 6 Mar 2009 16:25:26 -0000 1.1 +++ devkit-disks-dashdash.patch 10 Mar 2009 18:49:28 -0000 1.2 @@ -1,11 +1,11 @@ -diff -up DeviceKit-disks-003/tools/devkit-disks.c.-- DeviceKit-disks-003/tools/devkit-disks.c ---- DeviceKit-disks-003/tools/devkit-disks.c.-- 2009-03-06 11:18:51.290041345 -0500 -+++ DeviceKit-disks-003/tools/devkit-disks.c 2009-03-06 11:19:49.244044184 -0500 +diff -up DeviceKit-disks-003/tools/devkit-disks.c.dashdash DeviceKit-disks-003/tools/devkit-disks.c +--- DeviceKit-disks-003/tools/devkit-disks.c.dashdash 2009-03-10 14:29:11.648335078 -0400 ++++ DeviceKit-disks-003/tools/devkit-disks.c 2009-03-10 14:47:19.498336713 -0400 @@ -1056,6 +1056,11 @@ do_inhibit_polling (const char *object_p cookie = NULL; ret = 127; -+ if (strcmp (argv[0], "--") == 0) { ++ if (argc > 0 && strcmp (argv[0], "--") == 0) { + argv++; + argc--; + } @@ -13,23 +13,27 @@ proxy = dbus_g_proxy_new_for_name (bus, "org.freedesktop.DeviceKit.Disks", object_path, -@@ -1123,6 +1128,11 @@ do_inhibit_all_polling (gint arg +@@ -1123,9 +1128,14 @@ do_inhibit_all_polling (gint arg cookie = NULL; ret = 127; -+ if (strcmp (argv[0], "--") == 0) { ++ if (argc > 0 && strcmp (argv[0], "--") == 0) { + argv++; + argc--; + } + proxy = dbus_g_proxy_new_for_name (bus, "org.freedesktop.DeviceKit.Disks", - "/", +- "/", ++ "/", + "org.freedesktop.DeviceKit.Disks"); + + error = NULL; @@ -1188,6 +1198,11 @@ do_inhibit (gint argc, cookie = NULL; ret = 127; -+ if (strcmp (argv[0], "--") == 0) { ++ if (argc > 0 && strcmp (argv[0], "--") == 0) { + argv++; + argc--; + } From dbhole at fedoraproject.org Tue Mar 10 18:51:30 2009 From: dbhole at fedoraproject.org (Deepak Bhole) Date: Tue, 10 Mar 2009 18:51:30 +0000 (UTC) Subject: rpms/ecj/devel ecj.spec,1.1,1.2 Message-ID: <20090310185130.3D3287002E@cvs1.fedora.phx.redhat.com> Author: dbhole Update of /cvs/pkgs/rpms/ecj/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv789 Modified Files: ecj.spec Log Message: Added BR for ant in non-bootstrap mode Index: ecj.spec =================================================================== RCS file: /cvs/pkgs/rpms/ecj/devel/ecj.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ecj.spec 10 Mar 2009 18:35:57 -0000 1.1 +++ ecj.spec 10 Mar 2009 18:50:59 -0000 1.2 @@ -8,7 +8,7 @@ Summary: Eclipse Compiler for Java Name: ecj Version: 3.4.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.eclipse.org License: EPL Group: Development/Languages @@ -28,7 +28,7 @@ BuildRequires: gcc-java >= 4.0.0 BuildRequires: java-gcj-compat -%if %{with_gcjbootstrap} +%if ! %{with_gcjbootstrap} BuildRequires: ant %endif @@ -118,6 +118,9 @@ %{_libdir}/gcj/%{name} %changelog +* Tue Mar 10 2009 Deepak Bhole 1:3.4.2-2 +- Add BR for ant + * Fri Mar 6 2009 Andrew Overholt 1:3.4.2-1 - 3.4.2 From rstrode at fedoraproject.org Tue Mar 10 18:56:28 2009 From: rstrode at fedoraproject.org (Ray Strode) Date: Tue, 10 Mar 2009 18:56:28 +0000 (UTC) Subject: rpms/plymouth/devel plymouth.spec,1.123,1.124 sources,1.51,1.52 Message-ID: <20090310185628.EE2497002E@cvs1.fedora.phx.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/plymouth/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1942 Modified Files: plymouth.spec sources Log Message: - Address one more issue with password handling. It wasn't working well for secondary devices when using the "details" plugin. Index: plymouth.spec =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- plymouth.spec 9 Mar 2009 16:34:48 -0000 1.123 +++ plymouth.spec 10 Mar 2009 18:55:58 -0000 1.124 @@ -5,7 +5,7 @@ Summary: Graphical Boot Animation and Logger Name: plymouth Version: 0.7.0 -Release: 0.2009.03.09.1%{?dist} +Release: 0.2009.03.10.1%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -319,6 +319,10 @@ %defattr(-, root, root) %changelog +* Tue Mar 10 2009 Ray Strode 0.7.0-0.2009.03.10.1 +- Address one more issue with password handling. It wasn't working + well for secondary devices when using the "details" plugin. + * Mon Mar 9 2009 Ray Strode 0.7.0-0.2009.03.09.1 - Attempt to address some problems with password handling in the 0.7.0 snapshots Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 9 Mar 2009 16:34:48 -0000 1.51 +++ sources 10 Mar 2009 18:55:58 -0000 1.52 @@ -1 +1 @@ -825a8b5c66b1b6e48c638abfe2a38f36 plymouth-0.7.0.tar.bz2 +bb0730684ea7b9e9c709b0644ce45750 plymouth-0.7.0.tar.bz2 From smooge at fedoraproject.org Tue Mar 10 19:09:22 2009 From: smooge at fedoraproject.org (Stephen J Smoogen) Date: Tue, 10 Mar 2009 19:09:22 +0000 (UTC) Subject: rpms/mediawiki/EL-5 mediawiki-1.14.0-commoncode.patch, NONE, 1.1 mediawiki.spec, 1.15, 1.16 sources, 1.11, 1.12 Message-ID: <20090310190922.4BFCC7002E@cvs1.fedora.phx.redhat.com> Author: smooge Update of /cvs/pkgs/rpms/mediawiki/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5015 Modified Files: mediawiki.spec sources Added Files: mediawiki-1.14.0-commoncode.patch Log Message: Updated tree to F-10. Built and tested on my system. mediawiki-1.14.0-commoncode.patch: --- NEW FILE mediawiki-1.14.0-commoncode.patch --- --- mediawiki-1.14.0/includes/templates/NoLocalSettings.php.commoncode 2009-02-20 14:58:49.000000000 +0100 +++ mediawiki-1.14.0/includes/templates/NoLocalSettings.php 2009-02-28 19:09:38.000000000 +0100 @@ -61,7 +61,7 @@

      MediaWiki

      config/LocalSettings.php to the parent directory.' ); } else { echo( "Please set up the wiki first." ); --- mediawiki-1.14.0/includes/WebStart.php.commoncode 2008-11-07 17:38:01.000000000 +0100 +++ mediawiki-1.14.0/includes/WebStart.php 2009-02-28 19:10:12.000000000 +0100 @@ -103,14 +103,14 @@ # LocalSettings.php is the per site customization file. If it does not exit # the wiki installer need to be launched or the generated file moved from # ./config/ to ./ - if( !file_exists( "$IP/LocalSettings.php" ) ) { + if( !file_exists( "$DIR/LocalSettings.php" ) ) { require_once( "$IP/includes/DefaultSettings.php" ); # used for printing the version require_once( "$IP/includes/templates/NoLocalSettings.php" ); die(); } # Include site settings. $IP may be changed (hopefully before the AutoLoader is invoked) - require_once( "$IP/LocalSettings.php" ); + require_once( "$DIR/LocalSettings.php" ); } wfProfileOut( 'WebStart.php-conf' ); --- mediawiki-1.14.0/maintenance/archives/upgradeWatchlist.php.commoncode 2008-07-11 00:00:04.000000000 +0200 +++ mediawiki-1.14.0/maintenance/archives/upgradeWatchlist.php 2009-02-28 19:09:38.000000000 +0100 @@ -15,7 +15,7 @@ # Convert watchlists to new format global $IP; -require_once( "../LocalSettings.php" ); +require_once( "$DIR/LocalSettings.php" ); require_once( "$IP/Setup.php" ); $wgTitle = Title::newFromText( "Rebuild links script" ); --- mediawiki-1.14.0/maintenance/update.php.commoncode 2008-07-19 14:15:07.000000000 +0200 +++ mediawiki-1.14.0/maintenance/update.php 2009-02-28 19:09:38.000000000 +0100 @@ -10,6 +10,9 @@ * @ingroup Maintenance */ +$DIR=getcwd(); +chdir('/usr/share/mediawiki'); + /** */ $wgUseMasterForMaintenance = true; $options = array( 'quick', 'nopurge' ); --- mediawiki-1.14.0/maintenance/commandLine.inc.commoncode 2008-06-16 22:21:26.000000000 +0200 +++ mediawiki-1.14.0/maintenance/commandLine.inc 2009-02-28 19:09:38.000000000 +0100 @@ -182,7 +182,7 @@ if ( isset( $options['conf'] ) ) { $settingsFile = $options['conf']; } else { - $settingsFile = "$IP/LocalSettings.php"; + $settingsFile = "$DIR/LocalSettings.php"; } if ( isset( $options['wiki'] ) ) { $bits = explode( '-', $options['wiki'] ); @@ -208,7 +208,7 @@ $adminSettings = isset( $options['aconf'] ) ? $options['aconf'] - : "{$IP}/AdminSettings.php"; + : "{$DIR}/AdminSettings.php"; if( is_readable( $adminSettings ) ) require_once( $adminSettings ); --- mediawiki-1.14.0/config/index.php.commoncode 2009-02-20 15:17:47.000000000 +0100 +++ mediawiki-1.14.0/config/index.php 2009-02-28 19:09:38.000000000 +0100 @@ -19,6 +19,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # http://www.gnu.org/copyleft/gpl.html +$DIR=dirname( getcwd() ); +chdir('/usr/share/mediawiki/config'); error_reporting( E_ALL ); header( "Content-type: text/html; charset=utf-8" ); @ini_set( "display_errors", true ); @@ -27,7 +29,7 @@ $wgRequestTime = microtime( true ); # Attempt to set up the include path, to fix problems with relative includes -$IP = dirname( dirname( __FILE__ ) ); +$IP = '/usr/share/mediawiki'; define( 'MW_INSTALL_PATH', $IP ); # Define an entry point and include some files @@ -212,18 +214,18 @@ /* Check for existing configurations and bug out! */ -if( file_exists( "../LocalSettings.php" ) ) { +if( file_exists( "$DIR/LocalSettings.php" ) ) { $script = defined('MW_INSTALL_PHP5_EXT') ? 'index.php5' : 'index.php'; dieout( "

      Setup has completed, your wiki is configured.

      Please delete the /config directory for extra security.

      " ); } -if( file_exists( "./LocalSettings.php" ) ) { +if( file_exists( "$DIR/LocalSettings.php" ) ) { writeSuccessMessage(); dieout( '' ); } -if( !is_writable( "." ) ) { +if( !is_writable( $DIR . "/config" ) ) { dieout( "

      Can't write config file, aborting

      In order to configure the wiki you have to make the config subdirectory @@ -1133,7 +1135,7 @@ $localSettings = "<" . "?php$endl$local"; // Fix up a common line-ending problem (due to CVS on Windows) $localSettings = str_replace( "\r\n", "\n", $localSettings ); - $f = fopen( "LocalSettings.php", 'xt' ); + $f = fopen( $DIR . "/config/LocalSettings.php", 'xt' ); if( $f == false ) { print( "\n" ); @@ -1680,7 +1682,7 @@ if( defined( 'MW_INSTALL_PATH' ) ) { \$IP = MW_INSTALL_PATH; } else { - \$IP = dirname( __FILE__ ); + \$IP = '/usr/share/mediawiki'; } \$path = array( \$IP, \"\$IP/includes\", \"\$IP/languages\" ); --- mediawiki-1.14.0/index.php.commoncode 2008-12-28 16:17:21.000000000 +0100 +++ mediawiki-1.14.0/index.php 2009-02-28 19:09:38.000000000 +0100 @@ -35,6 +35,9 @@ */ +$DIR=getcwd(); +chdir('/usr/share/mediawiki'); + # Initialise common code $preIP = dirname( __FILE__ ); require_once( "$preIP/includes/WebStart.php" ); Index: mediawiki.spec =================================================================== RCS file: /cvs/pkgs/rpms/mediawiki/EL-5/mediawiki.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mediawiki.spec 1 Oct 2008 20:15:26 -0000 1.15 +++ mediawiki.spec 10 Mar 2009 19:08:51 -0000 1.16 @@ -1,11 +1,12 @@ Summary: A wiki engine Name: mediawiki -Version: 1.11.2 -Release: 1%{?dist} -License: GPL +Version: 1.14.0 +Release: 45%{?dist} +License: GPLv2+ Group: Applications/Internet URL: http://www.mediawiki.org/ -Source0: http://download.wikimedia.org/mediawiki/1.11/%{name}-%{version}.tar.gz +Source0: http://download.wikimedia.org/mediawiki/1.14/%{name}-%{version}.tar.gz +Patch0: mediawiki-1.14.0-commoncode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: ocaml >= 3.06 # to make sure the "apache" group is created before mediawiki is installed @@ -13,13 +14,8 @@ Requires: php >= 5, php-xml Requires: php-mysql, php-pgsql Requires: diffutils, ImageMagick, php-gd -Requires: tetex-latex, tetex-dvips -Provides: mediawiki-math = %{version}-%{release} -Obsoletes: mediawiki-math < %{version}-%{release} - -# Ugly workaround, don't do that at home, kids! -# #250992 -ExcludeArch: ppc64 +Requires: mediawiki-nomath = %{version}-%{release} +Requires: mediawiki-math = %{version}-%{release} %description MediaWiki is the software used for Wikipedia and the other Wikimedia @@ -32,47 +28,48 @@ interface. Remember to remove the config dir after completing the configuration. +%package nomath +Summary: mediawiki w/o texvc. +Group: Development/Tools + +%description nomath +This subpackage contains all mediawiki parts except the ones to aid in +creating inline math. This is done for minimal wiki installs that do +not require math formulae and therefore no dependencies to LaTeX are +set up. + +%package math +Summary: Math support for mediawiki. +Group: Development/Tools +Requires: mediawiki = %{version}-%{release} +Requires: mediawiki-nomath = %{version}-%{release} +Requires: tetex-latex, tetex-dvips + +%description math +This subpackage contains the math support for mediawiki. + %prep %setup -q +%patch0 -p1 -b .commoncode %build -cd ./math +cd math make -cd .. %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_datadir}/mediawiki cp -a * %{buildroot}%{_datadir}/mediawiki/ -# remove Test Trees -rm -fr %{buildroot}%{_datadir}/mediawiki/{t,test} - -# remove tables for ZH char sets. Breaks build. +# remove undeeded parts +rm -fr %{buildroot}%{_datadir}/mediawiki/{t,test,tests} rm -fr %{buildroot}%{_datadir}/mediawiki/includes/zhtable -## Remove any .htaccess files that might have creeped in. +## Remove any .htaccess/.cmi files that might have creeped in. ## Many directories have them there. -for file in $( find %{buildroot} -type f -print | grep .htaccess$); do - rm $file -done - -## Remove any *.cmi files that might have creeped in -#find %{buildroot}%{_datadir}/mediawiki/ -name \*.cmi | xargs rm -for file in $( find %{buildroot} -type f -print | grep .cmi$); do - rm $file -done - -## Find and remove subversion files -for file in $( find %{buildroot} -type f -print | grep .svnignore$); do - rm $file -done - -## Find and remove .commoncode files. Changed construct to not break -## build if files do not exist -for file in $( find %{buildroot} -type f -print | grep .commoncode$ ); do - rm $file -done +find %{buildroot}%{_datadir}/mediawiki/ \ + \( -name .htaccess -or -name \*.cmi \) \ + | xargs rm # fix permissions chmod +x %{buildroot}%{_datadir}/mediawiki/bin/* @@ -85,9 +82,14 @@ %{buildroot}%{_libdir}/mediawiki/ fi +## Find and remove subversion files +find %{buildroot} -name .svnignore | xargs rm +## Find and remove .commoncode files. +find %{buildroot} -name \*.commoncode | xargs rm + mkdir -p %{buildroot}/var/www/wiki cd %{buildroot}/var/www/wiki/ -mkdir images +mkdir -p images/{archive,deleted,temp,thumb} cp -a %{buildroot}%{_datadir}/mediawiki/config . ln -s %{_datadir}/mediawiki/index.php index.php @@ -97,15 +99,53 @@ %files %defattr(-,root,root,-) %doc COPYING FAQ HISTORY README RELEASE-NOTES UPGRADE + +%files nomath +%defattr(-,root,root,-) +%doc COPYING %{_datadir}/mediawiki %attr(-,apache,apache) %dir %{_datadir}/mediawiki/config -%{_datadir}/mediawiki/config -%{_libdir}/mediawiki +%{_datadir}/mediawiki/config/* /var/www/wiki %attr(-,apache,apache) %dir /var/www/wiki/config /var/www/wiki/config/* +%files math +%defattr(-,root,root,-) +%{_libdir}/mediawiki + + %changelog +* Tue Mar 10 2009 - 1.14.0-45 +- Merged with F-10's 1.14.0 + + +* Sat Feb 28 2009 Axel Thimm - 1.14.0-45 +- Update to 1.14.0. + +* Sun Feb 22 2009 Axel Thimm - 1.13.4-44 +- Split package up, so some users can decide to not install math + support (results in smaller installs), see RH bug #485447. + +* Wed Feb 18 2009 Axel Thimm - 1.13.4-43 +- Update to 1.13.4, closes RH bug #485728. + +* Tue Dec 23 2008 Axel Thimm - 1.13.3-42 +- Update to 1.13.3, closes RH bug #476621 (CVE-2008-5249, + CVE-2008-5250, CVE-2008-5252 and CVE-2008-5687, CVE-2008-5688) + +* Sun Oct 5 2008 Axel Thimm - 1.13.2-41 +- Update to 1.13.2. + +* Sun Aug 24 2008 Axel Thimm - 1.13.0-40 +- Use consistently Patch0 and %%patch0. + +* Sat Aug 16 2008 Axel Thimm - 1.13.0-39 +- Update to 1.13.0. + +* Wed May 21 2008 Tom "spot" Callaway 1.10.4-40 +- fix license tag + * Fri May 16 2008 Stephen John Smoogen - 1.12.0-1 - Began testing. {remove commoncode entry.} Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mediawiki/EL-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 1 Oct 2008 20:15:26 -0000 1.11 +++ sources 10 Mar 2009 19:08:51 -0000 1.12 @@ -1 +1 @@ -12e81f27a37b15b9d1ed110d6f48b35f mediawiki-1.11.2.tar.gz +36bfd924e92b61a6f5fe70c6bc8e5aac mediawiki-1.14.0.tar.gz From dbhole at fedoraproject.org Tue Mar 10 19:13:54 2009 From: dbhole at fedoraproject.org (Deepak Bhole) Date: Tue, 10 Mar 2009 19:13:54 +0000 (UTC) Subject: rpms/ecj/devel ecj.spec,1.2,1.3 Message-ID: <20090310191354.B84A970132@cvs1.fedora.phx.redhat.com> Author: dbhole Update of /cvs/pkgs/rpms/ecj/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6361 Modified Files: ecj.spec Log Message: - Add BR for aot-compile-rpm Index: ecj.spec =================================================================== RCS file: /cvs/pkgs/rpms/ecj/devel/ecj.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ecj.spec 10 Mar 2009 18:50:59 -0000 1.2 +++ ecj.spec 10 Mar 2009 19:13:24 -0000 1.3 @@ -8,7 +8,7 @@ Summary: Eclipse Compiler for Java Name: ecj Version: 3.4.2 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.eclipse.org License: EPL Group: Development/Languages @@ -26,6 +26,7 @@ Patch1: %{name}-defaultto1.5.patch BuildRequires: gcc-java >= 4.0.0 +BuildRequires: /usr/bin/aot-compile-rpm BuildRequires: java-gcj-compat %if ! %{with_gcjbootstrap} @@ -118,6 +119,9 @@ %{_libdir}/gcj/%{name} %changelog +* Tue Mar 10 2009 Deepak Bhole 1:3.4.2-3 +- Add BR for aot-compile-rpm + * Tue Mar 10 2009 Deepak Bhole 1:3.4.2-2 - Add BR for ant From rdieter at fedoraproject.org Tue Mar 10 19:18:40 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Tue, 10 Mar 2009 19:18:40 +0000 (UTC) Subject: rpms/qt/devel qt.spec,1.250,1.251 Message-ID: <20090310191841.026E67002E@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8196 Modified Files: qt.spec Log Message: * Tue Mar 10 2009 Rex Dieter - 4.5.0-4 - macros.qt4: %_qt45 - cleanup more phonon-related left-overs Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- qt.spec 4 Mar 2009 17:29:19 -0000 1.250 +++ qt.spec 10 Mar 2009 19:18:10 -0000 1.251 @@ -12,7 +12,7 @@ Name: qt4 %endif Version: 4.5.0 -Release: 3%{?dist} +Release: 4%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -547,6 +547,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/rpm cat >%{buildroot}%{_sysconfdir}/rpm/macros.qt4< - 4.5.0-4 +- macros.qt4: %%_qt45 +- cleanup more phonon-related left-overs + * Wed Mar 04 2009 Rex Dieter - 4.5.0-3 - -no-phonon-backend - include qdoc3 From mnowak at fedoraproject.org Tue Mar 10 19:27:23 2009 From: mnowak at fedoraproject.org (Michal Nowak) Date: Tue, 10 Mar 2009 19:27:23 +0000 (UTC) Subject: rpms/xcb-util/F-10 import.log,1.2,1.3 xcb-util.spec,1.2,1.3 Message-ID: <20090310192723.EE5B97002E@cvs1.fedora.phx.redhat.com> Author: mnowak Update of /cvs/pkgs/rpms/xcb-util/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10270/F-10 Modified Files: import.log xcb-util.spec Log Message: rebuild Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/xcb-util/F-10/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 9 Mar 2009 22:02:32 -0000 1.2 +++ import.log 10 Mar 2009 19:26:52 -0000 1.3 @@ -1,2 +1,3 @@ xcb-util-0_3_2-2_fc10:F-10:xcb-util-0.3.2-2.fc10.src.rpm:1231843041 xcb-util-0_3_3-1_fc10:F-10:xcb-util-0.3.3-1.fc10.src.rpm:1236635931 +xcb-util-0_3_3-2_fc10:F-10:xcb-util-0.3.3-2.fc10.src.rpm:1236713137 Index: xcb-util.spec =================================================================== RCS file: /cvs/pkgs/rpms/xcb-util/F-10/xcb-util.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xcb-util.spec 9 Mar 2009 21:41:32 -0000 1.2 +++ xcb-util.spec 10 Mar 2009 19:26:53 -0000 1.3 @@ -1,6 +1,6 @@ Name: xcb-util Version: 0.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Convenience libraries sitting on top of libxcb Group: System Environment/Libraries @@ -80,6 +80,9 @@ %changelog +* Tue Mar 10 2009 Michal Nowak - 0.3.3-2 +- rebuild + * Mon Mar 9 2009 Michal Nowak - 0.3.3-1 - 0.3.3 - removed patches already in git (and 0.3.3) From rdieter at fedoraproject.org Tue Mar 10 19:28:12 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Tue, 10 Mar 2009 19:28:12 +0000 (UTC) Subject: rpms/amarok/devel amarok-2.0.2-no_qtscriptgenerator.patch, NONE, 1.1 amarok.spec, 1.142, 1.143 Message-ID: <20090310192812.3046B7002E@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/amarok/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10582 Modified Files: amarok.spec Added Files: amarok-2.0.2-no_qtscriptgenerator.patch Log Message: * Tue Mar 10 2009 Rex Dieter 2.0.2-4 - Req: qtscriptgenerator (f11+) (not enabled, pending review) - use desktop-file-validate amarok-2.0.2-no_qtscriptgenerator.patch: --- NEW FILE amarok-2.0.2-no_qtscriptgenerator.patch --- diff -up amarok-2.0.2/CMakeLists.txt.no_qtscriptgenerator amarok-2.0.2/CMakeLists.txt --- amarok-2.0.2/CMakeLists.txt.no_qtscriptgenerator 2009-03-01 11:36:24.000000000 -0600 +++ amarok-2.0.2/CMakeLists.txt 2009-03-10 13:37:21.000000000 -0500 @@ -20,7 +20,7 @@ set( CMAKE_MODULE_PATH ${CMAKE_MODULE #this line has to be before add_defintions, but after the KDE4 cmake includes #because they are used to determine install locations -add_subdirectory( src/scriptengine/generator ) +#add_subdirectory( src/scriptengine/generator ) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) include(CheckLibraryExists) Index: amarok.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- amarok.spec 7 Mar 2009 01:21:14 -0000 1.142 +++ amarok.spec 10 Mar 2009 19:27:41 -0000 1.143 @@ -2,7 +2,7 @@ Name: amarok Summary: Media player Version: 2.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -15,6 +15,10 @@ Patch0: amarok-libgpod-0.7.0.patch Patch1: amarok-2.0.1.1-gcc44.patch +# qtscriptgenerator review, http://bugzilla.redhat.com/489550 +#define no_qtscriptgenerator 1 +Patch2: amarok-2.0.2-no_qtscriptgenerator.patch + Patch100: amarok-2.0.1.1-qt45.patch BuildRequires: curl-devel @@ -40,6 +44,10 @@ %{?_qt4_version:Requires: qt4 >= %{_qt4_version}} %{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}} +%if 0%{?no_qtscriptgenerator} +Requires: qtscriptgenerator +%endif + Requires(post): xdg-utils Requires(postun): xdg-utils @@ -58,12 +66,19 @@ %prep %setup -q -%if 0%{?fedora} > 10 +%if "%(pkg-config --modversion libgpod-1.0)" >= "0.7.0" %patch0 -p0 -b .libgpod-0.7.0 -%patch100 -p0 -b .qt45 %endif + %patch1 -p1 -b .gcc4 +%if 0%{?no_qscriptgenerator} +%patch2 -p1 -b .no_qtscriptgenerator +#rm -rf src/scriptengine/generator +%else +%{?_qt45:%patch100 -p0 -b .qt45} +%endif + %build mkdir -p %{_target_platform} @@ -86,18 +101,16 @@ make install DESTDIR=%{buildroot} -C %{_target_platform} -# desktop files -desktop-file-install --vendor "" \ - --dir %{buildroot}%{_kde4_datadir}/applications/kde4 \ - --delete-original \ - %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop - -%find_lang amarok || touch amarok.lang +%find_lang amarok # unpackaged files rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud}.so +%check +desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/amarok.desktop + + %clean rm -rf %{buildroot} @@ -122,13 +135,15 @@ %{_kde4_appsdir}/desktoptheme/amarok-default.desktop %{_kde4_appsdir}/desktoptheme/default/widgets/* %{_kde4_configdir}/* -%{_kde4_datadir}/applications/kde4/*.desktop +%{_kde4_datadir}/applications/kde4/amarok.desktop %{_kde4_datadir}/config.kcfg/* %{_kde4_datadir}/kde4/services/* %{_kde4_datadir}/kde4/servicetypes/*.desktop %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_libdir}/kde4/*.so +%if ! 0%{?no_qtscriptgenerator} %{_kde4_libdir}/kde4/plugins/script/*.so +%endif %{_kde4_libdir}/libamarok*.so.* %{_kde4_libdir}/libamarok_service_liblastfm.so %{_kde4_libdir}/strigi/* @@ -136,6 +151,10 @@ %changelog +* Tue Mar 10 2009 Rex Dieter 2.0.2-4 +- Req: qtscriptgenerator (f11+) (not enabled, pending review) +- use desktop-file-validate + * Fri Mar 06 2009 Rex Dieter 2.0.2-3 - add minimal qt4,kdelibs4 deps From mnowak at fedoraproject.org Tue Mar 10 19:34:22 2009 From: mnowak at fedoraproject.org (Michal Nowak) Date: Tue, 10 Mar 2009 19:34:22 +0000 (UTC) Subject: rpms/xcb-util/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3 xcb-util.spec, 1.2, 1.3 xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch, 1.1, NONE xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch, 1.1, NONE Message-ID: <20090310193422.EFD8E7002E@cvs1.fedora.phx.redhat.com> Author: mnowak Update of /cvs/pkgs/rpms/xcb-util/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11974/F-9 Modified Files: .cvsignore import.log sources xcb-util.spec Removed Files: xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch Log Message: rebase Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xcb-util/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Jan 2009 10:48:26 -0000 1.2 +++ .cvsignore 10 Mar 2009 19:33:51 -0000 1.3 @@ -1 +1 @@ -xcb-util-0.3.2.tar.bz2 +xcb-util-0.3.3.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/xcb-util/F-9/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jan 2009 10:48:26 -0000 1.1 +++ import.log 10 Mar 2009 19:33:52 -0000 1.2 @@ -1 +1,2 @@ xcb-util-0_3_2-2_fc10:F-9:xcb-util-0.3.2-2.fc10.src.rpm:1231843664 +xcb-util-0_3_3-2_fc10:F-9:xcb-util-0.3.3-2.fc10.src.rpm:1236713560 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xcb-util/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jan 2009 10:48:26 -0000 1.2 +++ sources 10 Mar 2009 19:33:52 -0000 1.3 @@ -1 +1 @@ -fa41a147f5a63b01207cfd975fecc45c xcb-util-0.3.2.tar.bz2 +b1b16c5c1fcf7a6facb346c262cd3513 xcb-util-0.3.3.tar.bz2 Index: xcb-util.spec =================================================================== RCS file: /cvs/pkgs/rpms/xcb-util/F-9/xcb-util.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xcb-util.spec 9 Mar 2009 21:46:13 -0000 1.2 +++ xcb-util.spec 10 Mar 2009 19:33:52 -0000 1.3 @@ -1,6 +1,6 @@ Name: xcb-util Version: 0.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Convenience libraries sitting on top of libxcb Group: System Environment/Libraries @@ -80,6 +80,9 @@ %changelog +* Tue Mar 10 2009 Michal Nowak - 0.3.3-2 +- rebuild + * Mon Mar 9 2009 Michal Nowak - 0.3.3-1 - 0.3.3 - removed patches already in git (and 0.3.3) --- xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch DELETED --- --- xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch DELETED --- From mtruch at fedoraproject.org Tue Mar 10 19:38:16 2009 From: mtruch at fedoraproject.org (Matthew D Truch) Date: Tue, 10 Mar 2009 19:38:16 +0000 (UTC) Subject: rpms/cfitsio/devel cfitsio.spec,1.31,1.32 noautobuild,1.1,NONE Message-ID: <20090310193816.F3BE67002E@cvs1.fedora.phx.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12873 Modified Files: cfitsio.spec Removed Files: noautobuild Log Message: Put correct version number in pkgconfig file. Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- cfitsio.spec 23 Feb 2009 20:39:21 -0000 1.31 +++ cfitsio.spec 10 Mar 2009 19:37:46 -0000 1.32 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.130 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -55,6 +55,9 @@ sed 's|${exec_prefix}/lib|${exec_prefix}/%{_lib}|' cfitsio.pc >cfitsio.pc.new sed 's|${prefix}/include|${prefix}/include/%{name}|' cfitsio.pc.new >cfitsio.pc rm -f cfitsio.pc.new +# Manually correct pkgconfig .pc file version +sed 's|3.006|%{version}|' cfitsio.pc >cfitsio.pc.new +mv cfitsio.pc.new cfitsio.pc %check make testprog @@ -95,6 +98,9 @@ %{_libdir}/libcfitsio.a %changelog +* Tue Mar 10 2009 Matthew Truch - 3.130-4 +- Set correct version in pkgconfig .pc file. + * Sun Feb 22 2009 Matthew Truch - 3.130-3 - Re-check testprogram output. - Build for koji, rpm, gcc upgrade. --- noautobuild DELETED --- From anyremote at fedoraproject.org Tue Mar 10 19:42:41 2009 From: anyremote at fedoraproject.org (Mikhail Fedotov) Date: Tue, 10 Mar 2009 19:42:41 +0000 (UTC) Subject: rpms/anyremote2html/F-9 .cvsignore, 1.4, 1.5 anyremote2html.spec, 1.4, 1.5 import.log, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <20090310194241.96D9F7002E@cvs1.fedora.phx.redhat.com> Author: anyremote Update of /cvs/pkgs/rpms/anyremote2html/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14183/F-9 Modified Files: .cvsignore anyremote2html.spec import.log sources Log Message: build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anyremote2html/F-9/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Feb 2009 21:11:55 -0000 1.4 +++ .cvsignore 10 Mar 2009 19:42:11 -0000 1.5 @@ -1 +1 @@ -anyremote2html-0.7.tar.gz +anyremote2html-0.8.tar.gz Index: anyremote2html.spec =================================================================== RCS file: /cvs/pkgs/rpms/anyremote2html/F-9/anyremote2html.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- anyremote2html.spec 5 Feb 2009 21:11:55 -0000 1.4 +++ anyremote2html.spec 10 Mar 2009 19:42:11 -0000 1.5 @@ -1,6 +1,6 @@ Summary: WEB interface for anyRemote Name: anyremote2html -Version: 0.7 +Version: 0.8 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -30,6 +30,9 @@ %changelog +* Tue Mar 10 2009 Mikhail Fedotov - 0.8 +- Force image caching on client side. + * Wed Feb 4 2009 Mikhail Fedotov - 0.7 - Updated the icon set. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/anyremote2html/F-9/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 5 Feb 2009 21:11:55 -0000 1.4 +++ import.log 10 Mar 2009 19:42:11 -0000 1.5 @@ -2,3 +2,4 @@ anyremote2html-0_5_2_2-2_fc9:F-9:anyremote2html-0.5.2.2-2.fc9.src.rpm:1221422875 anyremote2html-0_6-1_fc9:F-9:anyremote2html-0.6-1.fc9.src.rpm:1222713305 anyremote2html-0_7-1_fc10:F-9:anyremote2html-0.7-1.fc10.src.rpm:1233868079 +anyremote2html-0_8-1_fc10:F-9:anyremote2html-0.8-1.fc10.src.rpm:1236714104 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anyremote2html/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 5 Feb 2009 21:11:55 -0000 1.5 +++ sources 10 Mar 2009 19:42:11 -0000 1.6 @@ -1 +1 @@ -f5aa36ed44aaf17c2d51eb49d65c99d3 anyremote2html-0.7.tar.gz +6611a44e7c88c5dd59a2df8491ed8dc7 anyremote2html-0.8.tar.gz From anyremote at fedoraproject.org Tue Mar 10 19:42:45 2009 From: anyremote at fedoraproject.org (Mikhail Fedotov) Date: Tue, 10 Mar 2009 19:42:45 +0000 (UTC) Subject: rpms/anyremote2html/F-10 .cvsignore, 1.4, 1.5 anyremote2html.spec, 1.4, 1.5 import.log, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <20090310194245.89BB07002E@cvs1.fedora.phx.redhat.com> Author: anyremote Update of /cvs/pkgs/rpms/anyremote2html/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14235/F-10 Modified Files: .cvsignore anyremote2html.spec import.log sources Log Message: build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anyremote2html/F-10/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Feb 2009 21:11:52 -0000 1.4 +++ .cvsignore 10 Mar 2009 19:42:14 -0000 1.5 @@ -1 +1 @@ -anyremote2html-0.7.tar.gz +anyremote2html-0.8.tar.gz Index: anyremote2html.spec =================================================================== RCS file: /cvs/pkgs/rpms/anyremote2html/F-10/anyremote2html.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- anyremote2html.spec 5 Feb 2009 21:11:52 -0000 1.4 +++ anyremote2html.spec 10 Mar 2009 19:42:15 -0000 1.5 @@ -1,6 +1,6 @@ Summary: WEB interface for anyRemote Name: anyremote2html -Version: 0.7 +Version: 0.8 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -30,6 +30,9 @@ %changelog +* Tue Mar 10 2009 Mikhail Fedotov - 0.8 +- Force image caching on client side. + * Wed Feb 4 2009 Mikhail Fedotov - 0.7 - Updated the icon set. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/anyremote2html/F-10/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 5 Feb 2009 21:11:52 -0000 1.4 +++ import.log 10 Mar 2009 19:42:15 -0000 1.5 @@ -2,3 +2,4 @@ anyremote2html-0_5_2_2-2_fc9:HEAD:anyremote2html-0.5.2.2-2.fc9.src.rpm:1221422858 anyremote2html-0_6-1_fc9:HEAD:anyremote2html-0.6-1.fc9.src.rpm:1222713285 anyremote2html-0_7-1_fc10:F-10:anyremote2html-0.7-1.fc10.src.rpm:1233868090 +anyremote2html-0_8-1_fc10:F-10:anyremote2html-0.8-1.fc10.src.rpm:1236714116 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anyremote2html/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 5 Feb 2009 21:11:52 -0000 1.5 +++ sources 10 Mar 2009 19:42:15 -0000 1.6 @@ -1 +1 @@ -f5aa36ed44aaf17c2d51eb49d65c99d3 anyremote2html-0.7.tar.gz +6611a44e7c88c5dd59a2df8491ed8dc7 anyremote2html-0.8.tar.gz From anyremote at fedoraproject.org Tue Mar 10 19:42:47 2009 From: anyremote at fedoraproject.org (Mikhail Fedotov) Date: Tue, 10 Mar 2009 19:42:47 +0000 (UTC) Subject: rpms/anyremote2html/devel .cvsignore, 1.4, 1.5 anyremote2html.spec, 1.5, 1.6 import.log, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <20090310194247.44E0B7002E@cvs1.fedora.phx.redhat.com> Author: anyremote Update of /cvs/pkgs/rpms/anyremote2html/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14264/devel Modified Files: .cvsignore anyremote2html.spec import.log sources Log Message: build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anyremote2html/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Feb 2009 21:11:58 -0000 1.4 +++ .cvsignore 10 Mar 2009 19:42:16 -0000 1.5 @@ -1 +1 @@ -anyremote2html-0.7.tar.gz +anyremote2html-0.8.tar.gz Index: anyremote2html.spec =================================================================== RCS file: /cvs/pkgs/rpms/anyremote2html/devel/anyremote2html.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- anyremote2html.spec 24 Feb 2009 01:16:42 -0000 1.5 +++ anyremote2html.spec 10 Mar 2009 19:42:16 -0000 1.6 @@ -1,7 +1,7 @@ Summary: WEB interface for anyRemote Name: anyremote2html -Version: 0.7 -Release: 2%{?dist} +Version: 0.8 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz @@ -29,9 +29,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Feb 23 2009 Fedora Release Engineering - 0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Tue Mar 10 2009 Mikhail Fedotov - 0.8 +- Force image caching on client side. * Wed Feb 4 2009 Mikhail Fedotov - 0.7 - Updated the icon set. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/anyremote2html/devel/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 5 Feb 2009 21:11:58 -0000 1.4 +++ import.log 10 Mar 2009 19:42:16 -0000 1.5 @@ -2,3 +2,4 @@ anyremote2html-0_5_2_2-2_fc9:HEAD:anyremote2html-0.5.2.2-2.fc9.src.rpm:1221422858 anyremote2html-0_6-1_fc9:HEAD:anyremote2html-0.6-1.fc9.src.rpm:1222713285 anyremote2html-0_7-1_fc10:HEAD:anyremote2html-0.7-1.fc10.src.rpm:1233868066 +anyremote2html-0_8-1_fc10:HEAD:anyremote2html-0.8-1.fc10.src.rpm:1236714128 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anyremote2html/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 5 Feb 2009 21:11:58 -0000 1.5 +++ sources 10 Mar 2009 19:42:16 -0000 1.6 @@ -1 +1 @@ -f5aa36ed44aaf17c2d51eb49d65c99d3 anyremote2html-0.7.tar.gz +6611a44e7c88c5dd59a2df8491ed8dc7 anyremote2html-0.8.tar.gz From jakub at fedoraproject.org Tue Mar 10 20:02:06 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Tue, 10 Mar 2009 20:02:06 +0000 (UTC) Subject: rpms/glibc/devel .cvsignore, 1.263, 1.264 glibc-fedora.patch, 1.296, 1.297 glibc.spec, 1.383, 1.384 import.log, 1.7, 1.8 sources, 1.288, 1.289 Message-ID: <20090310200207.2C30A7002E@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/glibc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19347/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec import.log sources Log Message: 2.9.90-10 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- .cvsignore 9 Mar 2009 15:00:02 -0000 1.263 +++ .cvsignore 10 Mar 2009 20:01:29 -0000 1.264 @@ -1,2 +1,2 @@ -glibc-20090309T1421.tar.bz2 -glibc-fedora-20090309T1421.tar.bz2 +glibc-20090310T1925.tar.bz2 +glibc-fedora-20090310T1925.tar.bz2 glibc-fedora.patch: Index: glibc-fedora.patch =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.296 retrieving revision 1.297 diff -u -r1.296 -r1.297 --- glibc-fedora.patch 9 Mar 2009 15:03:51 -0000 1.296 +++ glibc-fedora.patch 10 Mar 2009 20:01:29 -0000 1.297 @@ -1,6 +1,6 @@ ---- glibc-20090309T1421/ChangeLog 8 Mar 2009 19:53:12 -0000 1.11527 -+++ glibc-20090309T1421-fedora/ChangeLog 9 Mar 2009 14:35:15 -0000 1.8782.2.320 -@@ -6813,6 +6813,13 @@ +--- glibc-20090310T1925/ChangeLog 10 Mar 2009 17:00:17 -0000 1.11534 ++++ glibc-20090310T1925-fedora/ChangeLog 10 Mar 2009 19:34:42 -0000 1.8782.2.321 +@@ -6866,6 +6866,13 @@ * include/sys/cdefs.h: Redefine __nonnull so that test for incorrect parameters in the libc code itself are not omitted. @@ -14,7 +14,7 @@ 2007-05-09 Jakub Jelinek * sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow -@@ -7108,6 +7115,10 @@ +@@ -7161,6 +7168,10 @@ [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -25,7 +25,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -8365,6 +8376,15 @@ +@@ -8418,6 +8429,15 @@ separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -41,8 +41,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-20090309T1421/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20090309T1421-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3 +--- glibc-20090310T1925/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20090310T1925-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -108,8 +108,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20090309T1421/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 -+++ glibc-20090309T1421-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 +--- glibc-20090310T1925/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 ++++ glibc-20090310T1925-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 @@ -171,6 +171,11 @@ [BZ #2611] * stdio-common/renameat.c (renameat): Fix typo. @@ -281,8 +281,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20090309T1421/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 -+++ glibc-20090309T1421-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6 +--- glibc-20090310T1925/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 ++++ glibc-20090310T1925-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -293,8 +293,8 @@ vpath initfini.c $(sysdirs) ---- glibc-20090309T1421/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20090309T1421-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20090310T1925/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20090310T1925-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -319,8 +319,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20090309T1421/debug/tst-chk1.c 5 Mar 2008 06:51:37 -0000 1.19 -+++ glibc-20090309T1421-fedora/debug/tst-chk1.c 5 Mar 2008 09:37:40 -0000 1.1.2.19 +--- glibc-20090310T1925/debug/tst-chk1.c 5 Mar 2008 06:51:37 -0000 1.19 ++++ glibc-20090310T1925-fedora/debug/tst-chk1.c 5 Mar 2008 09:37:40 -0000 1.1.2.19 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -349,8 +349,8 @@ # define O 0 # else # define O 1 ---- glibc-20090309T1421/elf/ldconfig.c 6 Feb 2009 20:09:33 -0000 1.65 -+++ glibc-20090309T1421-fedora/elf/ldconfig.c 18 Feb 2009 15:49:28 -0000 1.47.2.20 +--- glibc-20090310T1925/elf/ldconfig.c 6 Feb 2009 20:09:33 -0000 1.65 ++++ glibc-20090310T1925-fedora/elf/ldconfig.c 18 Feb 2009 15:49:28 -0000 1.47.2.20 @@ -1020,17 +1020,19 @@ search_dirs (void) @@ -432,8 +432,8 @@ } if (! opt_ignore_aux_cache) ---- glibc-20090309T1421/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20090309T1421-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20090310T1925/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20090310T1925-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -458,8 +458,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20090309T1421/include/features.h 26 Feb 2009 01:43:33 -0000 1.53 -+++ glibc-20090309T1421-fedora/include/features.h 9 Mar 2009 14:35:16 -0000 1.35.2.22 +--- glibc-20090310T1925/include/features.h 26 Feb 2009 01:43:33 -0000 1.53 ++++ glibc-20090310T1925-fedora/include/features.h 9 Mar 2009 14:35:16 -0000 1.35.2.22 @@ -297,8 +297,13 @@ #endif @@ -476,16 +476,16 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-20090309T1421/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090309T1421-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20090310T1925/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090310T1925-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20090309T1421/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090309T1421-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20090310T1925/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090310T1925-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20090309T1421/intl/locale.alias 28 Oct 2007 01:39:54 -0000 1.24 -+++ glibc-20090309T1421-fedora/intl/locale.alias 12 Dec 2007 18:13:23 -0000 1.23.2.2 +--- glibc-20090310T1925/intl/locale.alias 28 Oct 2007 01:39:54 -0000 1.24 ++++ glibc-20090310T1925-fedora/intl/locale.alias 12 Dec 2007 18:13:23 -0000 1.23.2.2 @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -495,8 +495,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20090309T1421/libio/stdio.h 26 Feb 2009 15:43:58 -0000 1.94 -+++ glibc-20090309T1421-fedora/libio/stdio.h 9 Mar 2009 14:35:17 -0000 1.78.2.15 +--- glibc-20090310T1925/libio/stdio.h 26 Feb 2009 15:43:58 -0000 1.94 ++++ glibc-20090310T1925-fedora/libio/stdio.h 9 Mar 2009 14:35:17 -0000 1.78.2.15 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -510,8 +510,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20090309T1421/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 -+++ glibc-20090309T1421-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5 +--- glibc-20090310T1925/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 ++++ glibc-20090310T1925-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -603,8 +603,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20090309T1421/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25 -+++ glibc-20090309T1421-fedora/locale/programs/locarchive.c 31 Jul 2007 17:45:53 -0000 1.21.2.4 +--- glibc-20090310T1925/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25 ++++ glibc-20090310T1925-fedora/locale/programs/locarchive.c 31 Jul 2007 17:45:53 -0000 1.21.2.4 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -636,8 +636,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-20090309T1421/localedata/Makefile 7 Feb 2009 05:28:00 -0000 1.110 -+++ glibc-20090309T1421-fedora/localedata/Makefile 18 Feb 2009 15:49:33 -0000 1.101.2.10 +--- glibc-20090310T1925/localedata/Makefile 7 Feb 2009 05:28:00 -0000 1.110 ++++ glibc-20090310T1925-fedora/localedata/Makefile 18 Feb 2009 15:49:33 -0000 1.101.2.10 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -646,8 +646,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20090309T1421/localedata/SUPPORTED 6 Dec 2008 03:02:45 -0000 1.115 -+++ glibc-20090309T1421-fedora/localedata/SUPPORTED 2 Jan 2009 21:13:56 -0000 1.71.2.23 +--- glibc-20090310T1925/localedata/SUPPORTED 6 Dec 2008 03:02:45 -0000 1.115 ++++ glibc-20090310T1925-fedora/localedata/SUPPORTED 2 Jan 2009 21:13:56 -0000 1.71.2.23 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -689,8 +689,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20090309T1421/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20090309T1421-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20090310T1925/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20090310T1925-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -705,8 +705,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20090309T1421/localedata/locales/en_GB 31 Oct 2008 19:00:57 -0000 1.18 -+++ glibc-20090309T1421-fedora/localedata/locales/en_GB 31 Oct 2008 21:33:57 -0000 1.10.2.7 +--- glibc-20090310T1925/localedata/locales/en_GB 31 Oct 2008 19:00:57 -0000 1.18 ++++ glibc-20090310T1925-fedora/localedata/locales/en_GB 31 Oct 2008 21:33:57 -0000 1.10.2.7 @@ -116,8 +116,8 @@ mon "" d_fmt "" @@ -718,8 +718,8 @@ date_fmt "/ / " ---- glibc-20090309T1421/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090309T1421-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20090310T1925/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090310T1925-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -790,8 +790,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20090309T1421/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20090309T1421-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20090310T1925/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20090310T1925-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -819,8 +819,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20090309T1421/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20 -+++ glibc-20090309T1421-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2 +--- glibc-20090310T1925/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20 ++++ glibc-20090310T1925-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2 @@ -24,9 +24,25 @@ # include # include @@ -896,8 +896,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20090309T1421/manual/libc.texinfo 31 Jan 2008 01:43:04 -0000 1.98 -+++ glibc-20090309T1421-fedora/manual/libc.texinfo 31 Jan 2008 08:43:19 -0000 1.94.2.4 +--- glibc-20090310T1925/manual/libc.texinfo 31 Jan 2008 01:43:04 -0000 1.98 ++++ glibc-20090310T1925-fedora/manual/libc.texinfo 31 Jan 2008 08:43:19 -0000 1.94.2.4 @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -907,8 +907,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-20090309T1421/misc/sys/cdefs.h 2 Mar 2009 15:56:03 -0000 1.74 -+++ glibc-20090309T1421-fedora/misc/sys/cdefs.h 9 Mar 2009 14:35:17 -0000 1.58.2.11 +--- glibc-20090310T1925/misc/sys/cdefs.h 2 Mar 2009 15:56:03 -0000 1.74 ++++ glibc-20090310T1925-fedora/misc/sys/cdefs.h 9 Mar 2009 14:35:17 -0000 1.58.2.11 @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -952,16 +952,16 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-20090309T1421/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 -+++ glibc-20090309T1421-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 +--- glibc-20090310T1925/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 ++++ glibc-20090310T1925-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 @@ -25,4 +25,4 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get # the next entry. -#SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE ---- glibc-20090309T1421/nptl/ChangeLog 9 Mar 2009 14:19:52 -0000 1.1107 -+++ glibc-20090309T1421-fedora/nptl/ChangeLog 9 Mar 2009 14:35:17 -0000 1.706.2.169 +--- glibc-20090310T1925/nptl/ChangeLog 9 Mar 2009 14:19:52 -0000 1.1107 ++++ glibc-20090310T1925-fedora/nptl/ChangeLog 9 Mar 2009 14:35:17 -0000 1.706.2.169 @@ -3439,6 +3439,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1002,8 +1002,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20090309T1421/nptl/Makefile 12 Nov 2008 13:38:23 -0000 1.195 -+++ glibc-20090309T1421-fedora/nptl/Makefile 12 Nov 2008 20:29:34 -0000 1.157.2.37 +--- glibc-20090310T1925/nptl/Makefile 12 Nov 2008 13:38:23 -0000 1.195 ++++ glibc-20090310T1925-fedora/nptl/Makefile 12 Nov 2008 20:29:34 -0000 1.157.2.37 @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1036,8 +1036,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20090309T1421/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20090309T1421-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20090310T1925/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20090310T1925-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1062,8 +1062,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20090309T1421/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090309T1421-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20090310T1925/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090310T1925-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1071,8 +1071,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20090309T1421/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 26 Feb 2009 16:22:45 -0000 1.18 -+++ glibc-20090309T1421-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 9 Mar 2009 14:35:18 -0000 1.8.2.10 +--- glibc-20090310T1925/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 26 Feb 2009 16:22:45 -0000 1.18 ++++ glibc-20090310T1925-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 9 Mar 2009 14:35:18 -0000 1.8.2.10 @@ -187,4 +187,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -1081,8 +1081,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-20090309T1421/nscd/nscd.conf 6 Nov 2007 00:50:48 -0000 1.16 -+++ glibc-20090309T1421-fedora/nscd/nscd.conf 12 Dec 2007 18:13:28 -0000 1.8.2.7 +--- glibc-20090310T1925/nscd/nscd.conf 6 Nov 2007 00:50:48 -0000 1.16 ++++ glibc-20090310T1925-fedora/nscd/nscd.conf 12 Dec 2007 18:13:28 -0000 1.8.2.7 @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1092,8 +1092,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-20090309T1421/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 -+++ glibc-20090309T1421-fedora/nscd/nscd.init 12 Dec 2007 18:13:28 -0000 1.6.2.6 +--- glibc-20090310T1925/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 ++++ glibc-20090310T1925-fedora/nscd/nscd.init 12 Dec 2007 18:13:28 -0000 1.6.2.6 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1150,8 +1150,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-20090309T1421/posix/Makefile 7 Feb 2009 08:18:49 -0000 1.204 -+++ glibc-20090309T1421-fedora/posix/Makefile 18 Feb 2009 15:49:37 -0000 1.171.2.28 +--- glibc-20090310T1925/posix/Makefile 7 Feb 2009 08:18:49 -0000 1.204 ++++ glibc-20090310T1925-fedora/posix/Makefile 18 Feb 2009 15:49:37 -0000 1.171.2.28 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1172,8 +1172,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-20090309T1421/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090309T1421-fedora/posix/getconf.speclist.h 18 Feb 2009 16:47:01 -0000 1.1.2.3 +--- glibc-20090310T1925/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090310T1925-fedora/posix/getconf.speclist.h 18 Feb 2009 16:47:01 -0000 1.1.2.3 @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1214,8 +1214,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-20090309T1421/resolv/Versions 1 Aug 2008 17:15:34 -0000 1.25 -+++ glibc-20090309T1421-fedora/resolv/Versions 2 Jan 2009 21:14:01 -0000 1.20.2.6 +--- glibc-20090310T1925/resolv/Versions 1 Aug 2008 17:15:34 -0000 1.25 ++++ glibc-20090310T1925-fedora/resolv/Versions 2 Jan 2009 21:14:01 -0000 1.20.2.6 @@ -102,7 +102,7 @@ libnss_dns { _nss_dns_gethostbyname_r; _nss_dns_getnetbyaddr_r; _nss_dns_getnetbyname_r; _nss_dns_getcanonname_r; @@ -1225,8 +1225,8 @@ } } ---- glibc-20090309T1421/streams/Makefile 23 Oct 2002 23:48:41 -0000 1.4 -+++ glibc-20090309T1421-fedora/streams/Makefile 14 Mar 2008 22:36:46 -0000 1.4.2.1 +--- glibc-20090310T1925/streams/Makefile 23 Oct 2002 23:48:41 -0000 1.4 ++++ glibc-20090310T1925-fedora/streams/Makefile 14 Mar 2008 22:36:46 -0000 1.4.2.1 @@ -21,7 +21,7 @@ # subdir := streams @@ -1236,8 +1236,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-20090309T1421/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20090309T1421-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20090310T1925/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20090310T1925-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1253,8 +1253,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20090309T1421/sysdeps/i386/Makefile 13 May 2008 05:30:43 -0000 1.21 -+++ glibc-20090309T1421-fedora/sysdeps/i386/Makefile 15 May 2008 07:57:47 -0000 1.16.2.5 +--- glibc-20090310T1925/sysdeps/i386/Makefile 13 May 2008 05:30:43 -0000 1.21 ++++ glibc-20090310T1925-fedora/sysdeps/i386/Makefile 15 May 2008 07:57:47 -0000 1.16.2.5 @@ -64,6 +64,14 @@ endif ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS))) @@ -1270,8 +1270,8 @@ endif ifeq ($(subdir),elf) ---- glibc-20090309T1421/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20090309T1421-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20090310T1925/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20090310T1925-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1283,8 +1283,8 @@ endif endif ---- glibc-20090309T1421/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20090309T1421-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20090310T1925/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20090310T1925-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1636,8 +1636,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20090309T1421/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090309T1421-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20090310T1925/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090310T1925-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1723,8 +1723,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20090309T1421/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 -+++ glibc-20090309T1421-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5 +--- glibc-20090310T1925/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 ++++ glibc-20090310T1925-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5 @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1733,8 +1733,8 @@ endif ifeq ($(subdir),elf) ---- glibc-20090309T1421/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 -+++ glibc-20090309T1421-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 +--- glibc-20090310T1925/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 ++++ glibc-20090310T1925-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1749,8 +1749,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-20090309T1421/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 00:24:52 -0000 1.15 -+++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 20:20:42 -0000 1.3.2.11 +--- glibc-20090310T1925/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 00:24:52 -0000 1.15 ++++ glibc-20090310T1925-fedora/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 20:20:42 -0000 1.3.2.11 @@ -27,13 +27,10 @@ #include #include @@ -1766,8 +1766,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-20090309T1421/sysdeps/unix/sysv/linux/dl-osinfo.h 11 Jan 2009 04:42:04 -0000 1.29 -+++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 4 Feb 2009 22:36:00 -0000 1.14.2.15 +--- glibc-20090310T1925/sysdeps/unix/sysv/linux/dl-osinfo.h 11 Jan 2009 04:42:04 -0000 1.29 ++++ glibc-20090310T1925-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 4 Feb 2009 22:36:00 -0000 1.14.2.15 @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -1815,8 +1815,8 @@ } else #endif ---- glibc-20090309T1421/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 -+++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 +--- glibc-20090310T1925/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 ++++ glibc-20090310T1925-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1859,8 +1859,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-20090309T1421/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 -+++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 +--- glibc-20090310T1925/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 ++++ glibc-20090310T1925-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 @@ -25,6 +25,24 @@ #include @@ -1886,8 +1886,8 @@ struct netlink_res { ---- glibc-20090309T1421/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20090310T1925/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20090310T1925-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -1897,8 +1897,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20090309T1421/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20090310T1925/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20090310T1925-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -1944,8 +1944,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20090309T1421/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 -+++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6 +--- glibc-20090310T1925/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 ++++ glibc-20090310T1925-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6 @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -1964,8 +1964,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-20090309T1421/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20090310T1925/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090310T1925-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -2026,8 +2026,8 @@ + } while (0) + +#include_next ---- glibc-20090309T1421/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20090310T1925/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20090310T1925-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2060,29 +2060,29 @@ + } while (0) + #include_next ---- glibc-20090309T1421/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20090310T1925/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090310T1925-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20090309T1421/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20090310T1925/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090310T1925-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20090309T1421/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20090310T1925/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20090310T1925-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-20090309T1421/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 -+++ glibc-20090309T1421-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4 +--- glibc-20090310T1925/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 ++++ glibc-20090310T1925-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4 @@ -89,9 +89,6 @@ L(pseudo_end): ret @@ -2101,193 +2101,3 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) -2009-02-18 Jakub Jelinek - - * sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S: Use - .machine push; .machine "power6" and .machine pop around mtfsf - insns outside of _ARCH_PWR6 define. - * sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S: Likewise. - * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S: - Likewise. - * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S: - Likewise. - * sysdeps/powerpc/fpu/tst-setcontext-fpscr.c (_SET_DI_FPSCR): Likewise. - * sysdeps/powerpc/fpu/fenv_libc.h (fesetenv_register, - relax_fenv_state): Likewise. - ---- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S.jj 2008-11-17 03:49:06.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S 2009-02-18 22:55:07.000000000 +0100 -@@ -1,5 +1,6 @@ - /* Switch to context. -- Copyright (C) 2002, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. -+ Copyright (C) 2002, 2004, 2005, 2006, 2008, 2009 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -86,6 +87,8 @@ ENTRY(__novec_setcontext) - /* Use the extended four-operand version of the mtfsf insn. */ - mtfsf 0xff,fp0,1,0 - # else -+ .machine push -+ .machine "power6" - /* Availability of DFP indicates a 64-bit FPSCR. */ - andi. r6,r5,PPC_FEATURE_HAS_DFP - beq 5f -@@ -96,6 +99,7 @@ ENTRY(__novec_setcontext) - 5: - mtfsf 0xff,fp0 - 6: -+ .machine pop - # endif /* _ARCH_PWR6 */ - lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) - lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) -@@ -374,6 +378,8 @@ L(has_no_vec): - /* Use the extended four-operand version of the mtfsf insn. */ - mtfsf 0xff,fp0,1,0 - # else -+ .machine push -+ .machine "power6" - /* Availability of DFP indicates a 64-bit FPSCR. */ - andi. r6,r5,PPC_FEATURE_HAS_DFP - beq 7f -@@ -384,6 +390,7 @@ L(has_no_vec): - 7: - mtfsf 0xff,fp0 - 8: -+ .machine pop - # endif /* _ARCH_PWR6 */ - lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) - lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) ---- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S.jj 2008-11-17 03:49:30.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S 2009-02-18 22:55:37.000000000 +0100 -@@ -1,5 +1,6 @@ - /* Save current context and install the given one. -- Copyright (C) 2002, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. -+ Copyright (C) 2002, 2004, 2005, 2006, 2008, 2009 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -180,6 +181,8 @@ ENTRY(__novec_swapcontext) - /* Use the extended four-operand version of the mtfsf insn. */ - mtfsf 0xff,fp0,1,0 - # else -+ .machine push -+ .machine "power6" - /* Availability of DFP indicates a 64-bit FPSCR. */ - andi. r6,r8,PPC_FEATURE_HAS_DFP - beq 5f -@@ -190,6 +193,7 @@ ENTRY(__novec_swapcontext) - 5: - mtfsf 0xff,fp0 - 6: -+ .machine pop - #endif /* _ARCH_PWR6 */ - lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) - lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) -@@ -672,6 +676,8 @@ L(has_no_vec2): - /* Use the extended four-operand version of the mtfsf insn. */ - mtfsf 0xff,fp0,1,0 - # else -+ .machine push -+ .machine "power6" - /* Availability of DFP indicates a 64-bit FPSCR. */ - andi. r6,r8,PPC_FEATURE_HAS_DFP - beq 7f -@@ -682,6 +688,7 @@ L(has_no_vec2): - 7: - mtfsf 0xff,fp0 - 8: -+ .machine pop - #endif /* _ARCH_PWR6 */ - lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) - lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) ---- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S.jj 2009-01-30 21:30:33.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S 2009-02-18 22:52:48.000000000 +0100 -@@ -430,6 +430,8 @@ ENTRY(__CONTEXT_FUNC_NAME) - /* Use the extended four-operand version of the mtfsf insn. */ - mtfsf 0xff,fp31,1,0 - # else -+ .machine push -+ .machine "power6" - /* Availability of DFP indicates a 64-bit FPSCR. */ - andi. r6,r7,PPC_FEATURE_HAS_DFP - beq 7f -@@ -438,7 +440,7 @@ ENTRY(__CONTEXT_FUNC_NAME) - b 8f - /* Continue to operate on the FPSCR as if it were 32-bits. */ - 7: mtfsf 0xff,fp31 --8: -+8: .machine pop - #endif /* _ARCH_PWR6 */ - lfd fp1,_UC_FREGS+(1*8)(r31) - lfd fp2,_UC_FREGS+(2*8)(r31) ---- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S.jj 2009-01-30 21:29:24.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S 2009-02-18 22:52:39.000000000 +0100 -@@ -204,6 +204,8 @@ ENTRY(__CONTEXT_FUNC_NAME) - /* Use the extended four-operand version of the mtfsf insn. */ - mtfsf 0xff,fp31,1,0 - # else -+ .machine push -+ .machine "power6" - /* Availability of DFP indicates a 64-bit FPSCR. */ - andi. r6,r7,PPC_FEATURE_HAS_DFP - beq 7f -@@ -212,7 +214,7 @@ ENTRY(__CONTEXT_FUNC_NAME) - b 8f - /* Continue to operate on the FPSCR as if it were 32-bits. */ - 7: mtfsf 0xff,fp31 --8: -+8: .machine pop - # endif /* _ARCH_PWR6 */ - lfd fp1,_UC_FREGS+(1*8)(r31) - lfd fp2,_UC_FREGS+(2*8)(r31) ---- libc/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c.jj 2009-01-30 21:27:24.000000000 +0100 -+++ libc/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c 2009-02-18 23:40:01.000000000 +0100 -@@ -111,7 +111,11 @@ typedef unsigned int si_fpscr_t __attrib - tmp __attribute__ ((__aligned__(8))); \ - tmp.fpscr = __fpscr; \ - /* Set the entire 64-bit FPSCR. */ \ -- __asm__ ("lfd%U0 0,%0; mtfsf 255,0,1,0" : : "m" (tmp.d) : "fr0"); \ -+ __asm__ ("lfd%U0 0,%0; " \ -+ ".machine push; " \ -+ ".machine \"power6\"; " \ -+ "mtfsf 255,0,1,0; " \ -+ ".machine pop" : : "m" (tmp.d) : "fr0"); \ - tmp.d = 0; \ - __asm__("lfd%U0 0,%0" : : "m" (tmp.d) : "fr0"); \ - } ---- libc/sysdeps/powerpc/fpu/fenv_libc.h.jj 2008-11-17 02:32:11.000000000 +0100 -+++ libc/sysdeps/powerpc/fpu/fenv_libc.h 2009-02-18 23:42:15.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Internal libc stuff for floating point environment routines. -- Copyright (C) 1997, 2006, 2008 Free Software Foundation, Inc. -+ Copyright (C) 1997, 2006, 2008, 2009 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -39,7 +39,10 @@ libm_hidden_proto (__fe_nomask_env) - do { \ - double d = (env); \ - if(GLRO(dl_hwcap) & PPC_FEATURE_HAS_DFP) \ -- asm volatile ("mtfsf 0xff,%0,1,0" : : "f" (d)); \ -+ asm volatile (".machine push; " \ -+ ".machine \"power6\"; " \ -+ "mtfsf 0xff,%0,1,0; " \ -+ ".machine pop" : : "f" (d)); \ - else \ - asm volatile ("mtfsf 0xff,%0" : : "f" (d)); \ - } while(0) -@@ -52,8 +55,9 @@ libm_hidden_proto (__fe_nomask_env) - functions. */ - #define relax_fenv_state() \ - do { \ -- if(GLRO(dl_hwcap) & PPC_FEATURE_HAS_DFP) \ -- asm ("mtfsfi 7,0,1"); \ -+ if (GLRO(dl_hwcap) & PPC_FEATURE_HAS_DFP) \ -+ asm (".machine push; .machine \"power6\"; " \ -+ "mtfsfi 7,0,1; .machine pop"); \ - asm ("mtfsfi 7,0"); \ - } while(0) - Index: glibc.spec =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v retrieving revision 1.383 retrieving revision 1.384 diff -u -r1.383 -r1.384 --- glibc.spec 9 Mar 2009 15:00:02 -0000 1.383 +++ glibc.spec 10 Mar 2009 20:01:32 -0000 1.384 @@ -1,6 +1,6 @@ -%define glibcdate 20090309T1421 +%define glibcdate 20090310T1925 %define glibcname glibc -%define glibcsrcdir glibc-20090309T1421 +%define glibcsrcdir glibc-20090310T1925 %define glibc_release_tarballs 0 %define run_glibc_tests 1 %define auxarches i686 athlon sparcv9v sparc64v alphaev6 @@ -23,7 +23,7 @@ Summary: The GNU libc libraries Name: glibc Version: 2.9.90 -Release: 9 +Release: 10 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -1013,6 +1013,10 @@ %endif %changelog +* Tue Mar 10 2009 Jakub Jelinek 2.9.90-10 +- update from trunk + - fix atexit/__cxa_atexit + * Mon Mar 9 2009 Jakub Jelinek 2.9.90-9 - update from trunk - POSIX 2008 support: -D_XOPEN_SOURCE=700 and -D_POSIX_C_SOURCE=200809L Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 9 Mar 2009 15:00:02 -0000 1.7 +++ import.log 10 Mar 2009 20:01:33 -0000 1.8 @@ -5,3 +5,4 @@ glibc-2_9_90-3:HEAD:glibc-2.9.90-3.src.rpm:1233787870 glibc-2_9_90-4:HEAD:glibc-2.9.90-4.src.rpm:1234989992 glibc-2_9_90-9:HEAD:glibc-2.9.90-9.src.rpm:1236610744 +glibc-2_9_90-10:HEAD:glibc-2.9.90-10.src.rpm:1236715256 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v retrieving revision 1.288 retrieving revision 1.289 diff -u -r1.288 -r1.289 --- sources 9 Mar 2009 15:00:03 -0000 1.288 +++ sources 10 Mar 2009 20:01:33 -0000 1.289 @@ -1,2 +1,2 @@ -5dd18e197bad27f4b286cef3f7f5c7f6 glibc-20090309T1421.tar.bz2 -f04dcc55050cf57727323ff916bd0612 glibc-fedora-20090309T1421.tar.bz2 +88fa9920fb1180141c18f8c16269bdd7 glibc-20090310T1925.tar.bz2 +951317643b455ff356836508dda15e3c glibc-fedora-20090310T1925.tar.bz2 From pkgdb at fedoraproject.org Tue Mar 10 20:09:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:09:57 +0000 Subject: [pkgdb] eclipse-findbugs was added for jjames Message-ID: <20090310201104.5C4F9208510@bastion.fedora.phx.redhat.com> ausil has added Package eclipse-findbugs with summary Eclipse plugin for FindBugs ausil has approved Package eclipse-findbugs ausil has added a Fedora devel branch for eclipse-findbugs with an owner of jjames ausil has approved eclipse-findbugs in Fedora devel ausil has approved Package eclipse-findbugs ausil has set commit to Approved for provenpackager on eclipse-findbugs (Fedora devel) ausil has set build to Approved for provenpackager on eclipse-findbugs (Fedora devel) ausil has set checkout to Approved for provenpackager on eclipse-findbugs (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-findbugs From ausil at fedoraproject.org Tue Mar 10 20:10:08 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:10:08 +0000 (UTC) Subject: rpms/eclipse-findbugs/devel - New directory Message-ID: <20090310201008.9C54E70132@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/eclipse-findbugs/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx21465/rpms/eclipse-findbugs/devel Log Message: Directory /cvs/pkgs/rpms/eclipse-findbugs/devel added to the repository From ausil at fedoraproject.org Tue Mar 10 20:10:08 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:10:08 +0000 (UTC) Subject: rpms/eclipse-findbugs - New directory Message-ID: <20090310201008.468CC7002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/eclipse-findbugs In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx21465/rpms/eclipse-findbugs Log Message: Directory /cvs/pkgs/rpms/eclipse-findbugs added to the repository From ausil at fedoraproject.org Tue Mar 10 20:10:17 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:10:17 +0000 (UTC) Subject: rpms/eclipse-findbugs Makefile,NONE,1.1 Message-ID: <20090310201017.77CE67002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/eclipse-findbugs In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx21465/rpms/eclipse-findbugs Added Files: Makefile Log Message: Setup of module eclipse-findbugs --- NEW FILE Makefile --- # Top level Makefile for module eclipse-findbugs all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From pkgdb at fedoraproject.org Tue Mar 10 20:10:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:10:46 +0000 Subject: [pkgdb] eclipse-findbugs (Fedora, 10) updated by ausil Message-ID: <20090310201106.26A42208550@bastion.fedora.phx.redhat.com> ausil added a Fedora 10 branch for eclipse-findbugs ausil has set commit to Approved for provenpackager on eclipse-findbugs (Fedora 10) ausil has set build to Approved for provenpackager on eclipse-findbugs (Fedora 10) ausil has set checkout to Approved for provenpackager on eclipse-findbugs (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-findbugs From ausil at fedoraproject.org Tue Mar 10 20:10:17 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:10:17 +0000 (UTC) Subject: rpms/eclipse-findbugs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090310201017.DED507002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/eclipse-findbugs/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx21465/rpms/eclipse-findbugs/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module eclipse-findbugs --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: eclipse-findbugs # $Id: Makefile,v 1.1 2009/03/10 20:10:17 ausil Exp $ NAME := eclipse-findbugs SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 10 20:12:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:12:08 +0000 Subject: [pkgdb] findbugs was added for jjames Message-ID: <20090310201205.1F758208510@bastion.fedora.phx.redhat.com> ausil has added Package findbugs with summary Find bugs in Java code ausil has approved Package findbugs ausil has added a Fedora devel branch for findbugs with an owner of jjames ausil has approved findbugs in Fedora devel ausil has approved Package findbugs ausil has set commit to Approved for provenpackager on findbugs (Fedora devel) ausil has set build to Approved for provenpackager on findbugs (Fedora devel) ausil has set checkout to Approved for provenpackager on findbugs (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/findbugs From ausil at fedoraproject.org Tue Mar 10 20:11:07 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:11:07 +0000 (UTC) Subject: rpms/findbugs - New directory Message-ID: <20090310201107.33DB47002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/findbugs In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsM21838/rpms/findbugs Log Message: Directory /cvs/pkgs/rpms/findbugs added to the repository From ausil at fedoraproject.org Tue Mar 10 20:11:07 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:11:07 +0000 (UTC) Subject: rpms/findbugs/devel - New directory Message-ID: <20090310201107.7D7047002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/findbugs/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsM21838/rpms/findbugs/devel Log Message: Directory /cvs/pkgs/rpms/findbugs/devel added to the repository From pkgdb at fedoraproject.org Tue Mar 10 20:12:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:12:06 +0000 Subject: [pkgdb] findbugs (Fedora, 10) updated by ausil Message-ID: <20090310201206.283C1208514@bastion.fedora.phx.redhat.com> ausil added a Fedora 10 branch for findbugs ausil has set commit to Approved for provenpackager on findbugs (Fedora 10) ausil has set build to Approved for provenpackager on findbugs (Fedora 10) ausil has set checkout to Approved for provenpackager on findbugs (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/findbugs From ausil at fedoraproject.org Tue Mar 10 20:11:20 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:11:20 +0000 (UTC) Subject: rpms/findbugs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090310201120.DFD7E7002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/findbugs/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsM21838/rpms/findbugs/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module findbugs --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: findbugs # $Id: Makefile,v 1.1 2009/03/10 20:11:20 ausil Exp $ NAME := findbugs SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From ausil at fedoraproject.org Tue Mar 10 20:11:20 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:11:20 +0000 (UTC) Subject: rpms/findbugs Makefile,NONE,1.1 Message-ID: <20090310201120.2E4F67002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/findbugs In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsM21838/rpms/findbugs Added Files: Makefile Log Message: Setup of module findbugs --- NEW FILE Makefile --- # Top level Makefile for module findbugs all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From dwalsh at fedoraproject.org Tue Mar 10 20:11:26 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Tue, 10 Mar 2009 20:11:26 +0000 (UTC) Subject: rpms/selinux-policy/devel policy-20090105.patch,1.58,1.59 Message-ID: <20090310201126.6BA997002E@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21942 Modified Files: policy-20090105.patch Log Message: * Mon Mar 9 2009 Dan Walsh 3.6.8-3 - Add pulseaudio, sssd policy - Allow networkmanager to exec udevadm policy-20090105.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.58 -r 1.59 policy-20090105.patch Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- policy-20090105.patch 9 Mar 2009 21:58:07 -0000 1.58 +++ policy-20090105.patch 10 Mar 2009 20:11:23 -0000 1.59 @@ -1,6 +1,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.8/config/appconfig-mcs/default_contexts --- nsaserefpolicy/config/appconfig-mcs/default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/default_contexts 2009-03-09 17:56:08.452575000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mcs/default_contexts 2009-03-10 08:25:54.000000000 -0400 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -24,13 +24,13 @@ +system_r:xdm_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.8/config/appconfig-mcs/failsafe_context --- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.8/config/appconfig-mcs/failsafe_context 2009-03-09 17:56:08.454576000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mcs/failsafe_context 2009-03-10 08:25:54.000000000 -0400 @@ -1 +1 @@ -sysadm_r:sysadm_t:s0 +system_r:unconfined_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/guest_u_default_contexts 2009-03-09 17:56:08.457575000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mcs/guest_u_default_contexts 2009-03-10 08:25:54.000000000 -0400 @@ -0,0 +1,6 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -40,7 +40,7 @@ +guest_r:guest_t:s0 guest_r:guest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/root_default_contexts --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/root_default_contexts 2009-03-09 17:56:08.459573000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mcs/root_default_contexts 2009-03-10 08:25:54.000000000 -0400 @@ -1,11 +1,7 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0 +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -57,7 +57,7 @@ +system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.8/config/appconfig-mcs/seusers --- nsaserefpolicy/config/appconfig-mcs/seusers 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.8/config/appconfig-mcs/seusers 2009-03-09 17:56:08.461575000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mcs/seusers 2009-03-10 08:25:54.000000000 -0400 @@ -1,3 +1,3 @@ system_u:system_u:s0-mcs_systemhigh -root:root:s0-mcs_systemhigh @@ -66,7 +66,7 @@ +__default__:unconfined_u:s0-mcs_systemhigh diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/staff_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/staff_u_default_contexts 2009-03-09 17:56:08.464572000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mcs/staff_u_default_contexts 2009-03-10 08:25:54.000000000 -0400 @@ -1,10 +1,12 @@ system_r:local_login_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 system_r:remote_login_t:s0 staff_r:staff_t:s0 @@ -83,7 +83,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/unconfined_u_default_contexts 2009-03-09 17:56:08.466573000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mcs/unconfined_u_default_contexts 2009-03-10 08:25:54.000000000 -0400 @@ -1,4 +1,4 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0 +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 @@ -99,13 +99,13 @@ system_r:xdm_t:s0 unconfined_r:unconfined_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.8/config/appconfig-mcs/userhelper_context --- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.6.8/config/appconfig-mcs/userhelper_context 2009-03-09 17:56:08.468575000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mcs/userhelper_context 2009-03-10 08:25:54.000000000 -0400 @@ -1 +1 @@ -system_u:sysadm_r:sysadm_t:s0 +system_u:system_r:unconfined_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/user_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/user_u_default_contexts 2009-03-09 17:56:08.470575000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mcs/user_u_default_contexts 2009-03-10 08:25:54.000000000 -0400 @@ -1,8 +1,9 @@ system_r:local_login_t:s0 user_r:user_t:s0 system_r:remote_login_t:s0 user_r:user_t:s0 @@ -120,17 +120,17 @@ +user_r:user_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.8/config/appconfig-mcs/virtual_domain_context --- nsaserefpolicy/config/appconfig-mcs/virtual_domain_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/virtual_domain_context 2009-03-09 17:56:08.472577000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mcs/virtual_domain_context 2009-03-10 08:25:54.000000000 -0400 @@ -0,0 +1 @@ +system_u:system_r:svirt_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.8/config/appconfig-mcs/virtual_image_context --- nsaserefpolicy/config/appconfig-mcs/virtual_image_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/virtual_image_context 2009-03-09 17:56:08.474575000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mcs/virtual_image_context 2009-03-10 08:25:54.000000000 -0400 @@ -0,0 +1 @@ +system_u:object_r:virt_image_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mcs/xguest_u_default_contexts 2009-03-09 17:56:08.476573000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mcs/xguest_u_default_contexts 2009-03-10 08:25:54.000000000 -0400 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -141,7 +141,7 @@ +xguest_r:xguest_t:s0 xguest_r:xguest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.8/config/appconfig-mls/default_contexts --- nsaserefpolicy/config/appconfig-mls/default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/default_contexts 2009-03-09 17:56:08.478573000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mls/default_contexts 2009-03-10 08:25:54.000000000 -0400 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -165,7 +165,7 @@ +system_r:xdm_t:s0 user_r:user_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/guest_u_default_contexts 2009-03-09 17:56:08.490572000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mls/guest_u_default_contexts 2009-03-10 08:25:54.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 @@ -173,7 +173,7 @@ +system_r:crond_t:s0 guest_r:guest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.8/config/appconfig-mls/root_default_contexts --- nsaserefpolicy/config/appconfig-mls/root_default_contexts 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/root_default_contexts 2009-03-09 17:56:08.491577000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mls/root_default_contexts 2009-03-10 08:25:54.000000000 -0400 @@ -1,11 +1,11 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0 -system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -194,17 +194,17 @@ +#system_r:sshd_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.8/config/appconfig-mls/virtual_domain_context --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/virtual_domain_context 2009-03-09 17:56:08.493579000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mls/virtual_domain_context 2009-03-10 08:25:54.000000000 -0400 @@ -0,0 +1 @@ +system_u:system_r:qemu_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.8/config/appconfig-mls/virtual_image_context --- nsaserefpolicy/config/appconfig-mls/virtual_image_context 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/virtual_image_context 2009-03-09 17:56:08.495579000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mls/virtual_image_context 2009-03-10 08:25:54.000000000 -0400 @@ -0,0 +1 @@ +system_u:object_r:virt_image_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.6.8/config/appconfig-mls/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/config/appconfig-mls/xguest_u_default_contexts 2009-03-09 17:56:08.497575000 -0400 ++++ serefpolicy-3.6.8/config/appconfig-mls/xguest_u_default_contexts 2009-03-10 08:25:54.000000000 -0400 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -214,8 +214,8 @@ +system_r:initrc_su_t:s0 xguest_r:xguest_t:s0 +xguest_r:xguest_t:s0 xguest_r:xguest_t:s0 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.8/Makefile ---- nsaserefpolicy/Makefile 2009-02-09 12:15:51.000000000 -0500 -+++ serefpolicy-3.6.8/Makefile 2009-03-09 17:56:08.500572000 -0400 +--- nsaserefpolicy/Makefile 2009-01-19 11:07:35.000000000 -0500 ++++ serefpolicy-3.6.8/Makefile 2009-03-10 08:25:54.000000000 -0400 @@ -241,7 +241,7 @@ appdir := $(contextpath) user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts) @@ -278,9 +278,35 @@ $(appdir)/%: $(appconf)/% @mkdir -p $(appdir) $(verbose) $(INSTALL) -m 644 $< $@ +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.6.8/man/man8/httpd_selinux.8 +--- nsaserefpolicy/man/man8/httpd_selinux.8 2009-03-05 09:22:34.000000000 -0500 ++++ serefpolicy-3.6.8/man/man8/httpd_selinux.8 2009-03-10 09:36:15.000000000 -0400 +@@ -22,7 +22,7 @@ + .EX + httpd_sys_content_t + .EE +-- Set files with httpd_sys_content_t for content which is available from all httpd sys scripts and the daemon. ++- Set files with httpd_sys_content_t if you want httpd_sys_script_exec_t scripts and the daemon to read the file, and disallow other non sys scripts from access. + .EX + httpd_sys_script_exec_t + .EE +@@ -30,11 +30,11 @@ + .EX + httpd_sys_content_rw_t + .EE +-- Set files with httpd_sys_content_rw_t if you want httpd_sys_script_exec_t scripts to read/write the data, and disallow other non sys scripts from access. ++- Set files with httpd_sys_content_rw_t if you want httpd_sys_script_exec_t scripts and the daemon to read/write the data, and disallow other non sys scripts from access. + .EX + httpd_sys_content_ra_t + .EE +-- Set files with httpd_sys_content_ra_t if you want httpd_sys_script_exec_t scripts to read/append to the file, and disallow other non sys scripts from access. ++- Set files with httpd_sys_content_ra_t if you want httpd_sys_script_exec_t scripts and the daemon to read/append to the file, and disallow other non sys scripts from access. + .EX + httpd_unconfined_script_exec_t + .EE diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.8/policy/flask/access_vectors ---- nsaserefpolicy/policy/flask/access_vectors 2009-03-09 17:54:21.056246000 -0400 -+++ serefpolicy-3.6.8/policy/flask/access_vectors 2009-03-09 17:56:08.502573000 -0400 +--- nsaserefpolicy/policy/flask/access_vectors 2009-03-05 10:02:34.000000000 -0500 ++++ serefpolicy-3.6.8/policy/flask/access_vectors 2009-03-10 08:25:54.000000000 -0400 @@ -157,6 +157,9 @@ [...3433 lines suppressed...] @@ -28063,7 +27983,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.8/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/unconfined.te 2009-03-09 17:56:09.499491000 -0400 ++++ serefpolicy-3.6.8/policy/modules/system/unconfined.te 2009-03-10 15:44:05.000000000 -0400 @@ -5,6 +5,35 @@ # # Declarations @@ -28100,7 +28020,7 @@ # usage in this module of types created by these # calls is not correct, however we dont currently -@@ -13,28 +42,50 @@ +@@ -13,28 +42,51 @@ userdom_manage_home_role(unconfined_r, unconfined_t) userdom_manage_tmp_role(unconfined_r, unconfined_t) userdom_manage_tmpfs_role(unconfined_r, unconfined_t) @@ -28115,6 +28035,7 @@ +allow unconfined_r system_r; +init_script_role_transition(unconfined_r) +role system_r types unconfined_t; ++typealias unconfined_t alias unconfined_dbusd_t; type unconfined_execmem_t; -type unconfined_execmem_exec_t; @@ -28154,7 +28075,7 @@ libs_run_ldconfig(unconfined_t, unconfined_r) -@@ -42,26 +93,46 @@ +@@ -42,26 +94,46 @@ logging_run_auditctl(unconfined_t, unconfined_r) mount_run_unconfined(unconfined_t, unconfined_r) @@ -28203,7 +28124,7 @@ ') optional_policy(` -@@ -102,12 +173,24 @@ +@@ -102,12 +174,24 @@ ') optional_policy(` @@ -28228,7 +28149,7 @@ ') optional_policy(` -@@ -119,72 +202,80 @@ +@@ -119,72 +203,80 @@ ') optional_policy(` @@ -28328,7 +28249,7 @@ ') optional_policy(` -@@ -192,7 +283,7 @@ +@@ -192,7 +284,7 @@ ') optional_policy(` @@ -28337,7 +28258,7 @@ ') optional_policy(` -@@ -204,11 +295,12 @@ +@@ -204,11 +296,12 @@ ') optional_policy(` @@ -28352,7 +28273,7 @@ ') ######################################## -@@ -218,14 +310,61 @@ +@@ -218,14 +311,61 @@ allow unconfined_execmem_t self:process { execstack execmem }; unconfined_domain_noaudit(unconfined_execmem_t) @@ -28418,7 +28339,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.8/policy/modules/system/userdomain.fc --- nsaserefpolicy/policy/modules/system/userdomain.fc 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/userdomain.fc 2009-03-09 17:56:09.501491000 -0400 ++++ serefpolicy-3.6.8/policy/modules/system/userdomain.fc 2009-03-10 08:25:55.000000000 -0400 @@ -1,4 +1,7 @@ HOME_DIR -d gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh) +HOME_DIR -l gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh) @@ -28429,8 +28350,8 @@ +/dev/shm/pulse-shm.* gen_context(system_u:object_r:user_tmpfs_t,s0) +/dev/shm/mono.* gen_context(system_u:object_r:user_tmpfs_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.8/policy/modules/system/userdomain.if ---- nsaserefpolicy/policy/modules/system/userdomain.if 2009-02-09 12:15:51.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/userdomain.if 2009-03-09 17:56:09.506492000 -0400 +--- nsaserefpolicy/policy/modules/system/userdomain.if 2009-01-19 11:07:34.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/userdomain.if 2009-03-10 08:25:55.000000000 -0400 @@ -30,8 +30,9 @@ ') @@ -30278,8 +30199,8 @@ +') + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.8/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2009-02-09 12:15:51.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/userdomain.te 2009-03-09 17:56:09.508492000 -0400 +--- nsaserefpolicy/policy/modules/system/userdomain.te 2009-01-19 11:07:34.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/userdomain.te 2009-03-10 08:25:55.000000000 -0400 @@ -8,13 +8,6 @@ ## @@ -30365,12 +30286,12 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.fc serefpolicy-3.6.8/policy/modules/system/virtual.fc --- nsaserefpolicy/policy/modules/system/virtual.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/virtual.fc 2009-03-09 17:56:09.511492000 -0400 ++++ serefpolicy-3.6.8/policy/modules/system/virtual.fc 2009-03-10 08:25:55.000000000 -0400 @@ -0,0 +1 @@ +# No application file contexts. diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.if serefpolicy-3.6.8/policy/modules/system/virtual.if --- nsaserefpolicy/policy/modules/system/virtual.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/virtual.if 2009-03-09 17:56:09.513493000 -0400 ++++ serefpolicy-3.6.8/policy/modules/system/virtual.if 2009-03-10 08:25:55.000000000 -0400 @@ -0,0 +1,99 @@ +##

      Virtual machine emulator and virtualizer + @@ -30473,7 +30394,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.8/policy/modules/system/virtual.te --- nsaserefpolicy/policy/modules/system/virtual.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/virtual.te 2009-03-09 17:56:09.515494000 -0400 ++++ serefpolicy-3.6.8/policy/modules/system/virtual.te 2009-03-10 08:25:55.000000000 -0400 @@ -0,0 +1,78 @@ + +policy_module(virtualization, 1.1.2) @@ -30555,7 +30476,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.8/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/xen.fc 2009-03-09 17:56:09.517492000 -0400 ++++ serefpolicy-3.6.8/policy/modules/system/xen.fc 2009-03-10 08:25:55.000000000 -0400 @@ -2,17 +2,10 @@ /usr/bin/virsh -- gen_context(system_u:object_r:xm_exec_t,s0) @@ -30584,7 +30505,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.8/policy/modules/system/xen.if --- nsaserefpolicy/policy/modules/system/xen.if 2009-01-05 15:39:43.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/xen.if 2009-03-09 17:56:09.519494000 -0400 ++++ serefpolicy-3.6.8/policy/modules/system/xen.if 2009-03-10 08:25:55.000000000 -0400 @@ -167,11 +167,14 @@ # interface(`xen_stream_connect',` @@ -30627,8 +30548,8 @@ + rw_files_pattern($1, xen_image_t, xen_image_t) +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.8/policy/modules/system/xen.te ---- nsaserefpolicy/policy/modules/system/xen.te 2009-02-09 12:15:51.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/xen.te 2009-03-09 17:56:09.522491000 -0400 +--- nsaserefpolicy/policy/modules/system/xen.te 2009-01-19 11:07:34.000000000 -0500 ++++ serefpolicy-3.6.8/policy/modules/system/xen.te 2009-03-10 08:25:55.000000000 -0400 @@ -6,6 +6,13 @@ # Declarations # @@ -30852,7 +30773,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.8/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-10-16 17:21:16.000000000 -0400 -+++ serefpolicy-3.6.8/policy/support/obj_perm_sets.spt 2009-03-09 17:56:09.524494000 -0400 ++++ serefpolicy-3.6.8/policy/support/obj_perm_sets.spt 2009-03-10 08:25:55.000000000 -0400 @@ -179,20 +179,20 @@ # # Directory (dir) @@ -30927,7 +30848,7 @@ +define(`manage_key_perms', `{ create link read search setattr view write } ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.8/policy/users --- nsaserefpolicy/policy/users 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.6.8/policy/users 2009-03-09 17:56:09.527491000 -0400 ++++ serefpolicy-3.6.8/policy/users 2009-03-10 08:25:55.000000000 -0400 @@ -25,11 +25,8 @@ # permit any access to such users, then remove this entry. # @@ -30954,7 +30875,7 @@ +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.8/Rules.modular --- nsaserefpolicy/Rules.modular 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/Rules.modular 2009-03-09 17:56:09.529491000 -0400 ++++ serefpolicy-3.6.8/Rules.modular 2009-03-10 08:25:55.000000000 -0400 @@ -73,8 +73,8 @@ $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te @echo "Compliling $(NAME) $(@F) module" @@ -30986,7 +30907,7 @@ $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.8/support/Makefile.devel --- nsaserefpolicy/support/Makefile.devel 2008-11-11 16:13:50.000000000 -0500 -+++ serefpolicy-3.6.8/support/Makefile.devel 2009-03-09 17:56:09.531494000 -0400 ++++ serefpolicy-3.6.8/support/Makefile.devel 2009-03-10 08:25:55.000000000 -0400 @@ -185,8 +185,7 @@ tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te @$(EINFO) "Compiling $(NAME) $(basename $(@F)) module" From pkgdb at fedoraproject.org Tue Mar 10 20:12:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:12:56 +0000 Subject: [pkgdb] mingw32-pango was added for rjones Message-ID: <20090310201317.28A98208550@bastion.fedora.phx.redhat.com> ausil has added Package mingw32-pango with summary MinGW Pango library ausil has approved Package mingw32-pango ausil has added a Fedora devel branch for mingw32-pango with an owner of rjones ausil has approved mingw32-pango in Fedora devel ausil has approved Package mingw32-pango ausil has set commit to Approved for provenpackager on mingw32-pango (Fedora devel) ausil has set build to Approved for provenpackager on mingw32-pango (Fedora devel) ausil has set checkout to Approved for provenpackager on mingw32-pango (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pango From pkgdb at fedoraproject.org Tue Mar 10 20:13:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:13:21 +0000 Subject: [pkgdb] mingw32-pango (Fedora EPEL, 5) updated by ausil Message-ID: <20090310201318.7AB9B208553@bastion.fedora.phx.redhat.com> ausil added a Fedora EPEL 5 branch for mingw32-pango ausil has set commit to Approved for provenpackager on mingw32-pango (Fedora EPEL 5) ausil has set build to Approved for provenpackager on mingw32-pango (Fedora EPEL 5) ausil has set checkout to Approved for provenpackager on mingw32-pango (Fedora EPEL 5) ausil approved watchbugzilla on mingw32-pango (Fedora EPEL 5) for berrange ausil approved watchcommits on mingw32-pango (Fedora EPEL 5) for berrange ausil approved commit on mingw32-pango (Fedora EPEL 5) for berrange ausil approved build on mingw32-pango (Fedora EPEL 5) for berrange ausil approved approveacls on mingw32-pango (Fedora EPEL 5) for berrange To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pango From pkgdb at fedoraproject.org Tue Mar 10 20:13:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:13:21 +0000 Subject: [pkgdb] mingw32-pango (Fedora, devel) updated by ausil Message-ID: <20090310201318.9C4FC208557@bastion.fedora.phx.redhat.com> ausil approved watchbugzilla on mingw32-pango (Fedora devel) for berrange ausil approved watchcommits on mingw32-pango (Fedora devel) for berrange ausil approved commit on mingw32-pango (Fedora devel) for berrange ausil approved build on mingw32-pango (Fedora devel) for berrange ausil approved approveacls on mingw32-pango (Fedora devel) for berrange To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pango From ausil at fedoraproject.org Tue Mar 10 20:12:21 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:12:21 +0000 (UTC) Subject: rpms/mingw32-pango/devel - New directory Message-ID: <20090310201221.9343D70133@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/mingw32-pango/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsg22488/rpms/mingw32-pango/devel Log Message: Directory /cvs/pkgs/rpms/mingw32-pango/devel added to the repository From pkgdb at fedoraproject.org Tue Mar 10 20:13:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:13:21 +0000 Subject: [pkgdb] mingw32-pango (Fedora, 10) updated by ausil Message-ID: <20090310201318.AADDF208608@bastion.fedora.phx.redhat.com> ausil added a Fedora 10 branch for mingw32-pango ausil has set commit to Approved for provenpackager on mingw32-pango (Fedora 10) ausil has set build to Approved for provenpackager on mingw32-pango (Fedora 10) ausil has set checkout to Approved for provenpackager on mingw32-pango (Fedora 10) ausil approved watchbugzilla on mingw32-pango (Fedora 10) for berrange ausil approved watchcommits on mingw32-pango (Fedora 10) for berrange ausil approved commit on mingw32-pango (Fedora 10) for berrange ausil approved build on mingw32-pango (Fedora 10) for berrange ausil approved approveacls on mingw32-pango (Fedora 10) for berrange To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pango From ausil at fedoraproject.org Tue Mar 10 20:12:21 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:12:21 +0000 (UTC) Subject: rpms/mingw32-pango - New directory Message-ID: <20090310201221.381557002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/mingw32-pango In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsg22488/rpms/mingw32-pango Log Message: Directory /cvs/pkgs/rpms/mingw32-pango added to the repository From ausil at fedoraproject.org Tue Mar 10 20:12:32 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:12:32 +0000 (UTC) Subject: rpms/mingw32-pango Makefile,NONE,1.1 Message-ID: <20090310201232.5DBE77002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/mingw32-pango In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsg22488/rpms/mingw32-pango Added Files: Makefile Log Message: Setup of module mingw32-pango --- NEW FILE Makefile --- # Top level Makefile for module mingw32-pango all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From ausil at fedoraproject.org Tue Mar 10 20:12:32 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:12:32 +0000 (UTC) Subject: rpms/mingw32-pango/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090310201232.BF61770132@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/mingw32-pango/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsg22488/rpms/mingw32-pango/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mingw32-pango --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: mingw32-pango # $Id: Makefile,v 1.1 2009/03/10 20:12:32 ausil Exp $ NAME := mingw32-pango SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 10 20:14:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:14:38 +0000 Subject: [pkgdb] soud was added for plautrba Message-ID: <20090310201435.21490208504@bastion.fedora.phx.redhat.com> ausil has added Package soud with summary Tools for hardware related services based on udev events ausil has approved Package soud ausil has added a Fedora devel branch for soud with an owner of plautrba ausil has approved soud in Fedora devel ausil has approved Package soud ausil has set commit to Approved for provenpackager on soud (Fedora devel) ausil has set build to Approved for provenpackager on soud (Fedora devel) ausil has set checkout to Approved for provenpackager on soud (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/soud From pkgdb at fedoraproject.org Tue Mar 10 20:14:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:14:36 +0000 Subject: [pkgdb] soud (Fedora, 10) updated by ausil Message-ID: <20090310201436.36B29208510@bastion.fedora.phx.redhat.com> ausil added a Fedora 10 branch for soud ausil has set commit to Approved for provenpackager on soud (Fedora 10) ausil has set build to Approved for provenpackager on soud (Fedora 10) ausil has set checkout to Approved for provenpackager on soud (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/soud From ausil at fedoraproject.org Tue Mar 10 20:13:38 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:13:38 +0000 (UTC) Subject: rpms/soud - New directory Message-ID: <20090310201338.451A77002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/soud In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsj22974/rpms/soud Log Message: Directory /cvs/pkgs/rpms/soud added to the repository From ausil at fedoraproject.org Tue Mar 10 20:13:38 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:13:38 +0000 (UTC) Subject: rpms/soud/devel - New directory Message-ID: <20090310201338.A52887002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/soud/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsj22974/rpms/soud/devel Log Message: Directory /cvs/pkgs/rpms/soud/devel added to the repository From pkgdb at fedoraproject.org Tue Mar 10 20:14:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:14:36 +0000 Subject: [pkgdb] soud (Fedora, 9) updated by ausil Message-ID: <20090310201436.45385208550@bastion.fedora.phx.redhat.com> ausil added a Fedora 9 branch for soud ausil has set commit to Approved for provenpackager on soud (Fedora 9) ausil has set build to Approved for provenpackager on soud (Fedora 9) ausil has set checkout to Approved for provenpackager on soud (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/soud From ausil at fedoraproject.org Tue Mar 10 20:13:47 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:13:47 +0000 (UTC) Subject: rpms/soud Makefile,NONE,1.1 Message-ID: <20090310201347.E6C577002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/soud In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsj22974/rpms/soud Added Files: Makefile Log Message: Setup of module soud --- NEW FILE Makefile --- # Top level Makefile for module soud all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From ausil at fedoraproject.org Tue Mar 10 20:13:48 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:13:48 +0000 (UTC) Subject: rpms/soud/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090310201348.4E3877002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/soud/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsj22974/rpms/soud/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module soud --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: soud # $Id: Makefile,v 1.1 2009/03/10 20:13:48 ausil Exp $ NAME := soud SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 10 20:16:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:16:53 +0000 Subject: [pkgdb] kvkbd was added for jreznik Message-ID: <20090310201651.9E235208505@bastion.fedora.phx.redhat.com> ausil has added Package kvkbd with summary Virtual keyboard for KDE ausil has approved Package kvkbd ausil has added a Fedora devel branch for kvkbd with an owner of jreznik ausil has approved kvkbd in Fedora devel ausil has approved Package kvkbd ausil has set commit to Approved for provenpackager on kvkbd (Fedora devel) ausil has set build to Approved for provenpackager on kvkbd (Fedora devel) ausil has set checkout to Approved for provenpackager on kvkbd (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kvkbd From pkgdb at fedoraproject.org Tue Mar 10 20:16:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:16:51 +0000 Subject: [pkgdb] kvkbd (Fedora, 10) updated by ausil Message-ID: <20090310201651.CD8DB208511@bastion.fedora.phx.redhat.com> ausil added a Fedora 10 branch for kvkbd ausil has set commit to Approved for provenpackager on kvkbd (Fedora 10) ausil has set build to Approved for provenpackager on kvkbd (Fedora 10) ausil has set checkout to Approved for provenpackager on kvkbd (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kvkbd From ausil at fedoraproject.org Tue Mar 10 20:15:53 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:15:53 +0000 (UTC) Subject: rpms/kvkbd - New directory Message-ID: <20090310201553.36CCF7002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/kvkbd In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsb23660/rpms/kvkbd Log Message: Directory /cvs/pkgs/rpms/kvkbd added to the repository From ausil at fedoraproject.org Tue Mar 10 20:15:53 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:15:53 +0000 (UTC) Subject: rpms/kvkbd/devel - New directory Message-ID: <20090310201553.7A7287002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/kvkbd/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsb23660/rpms/kvkbd/devel Log Message: Directory /cvs/pkgs/rpms/kvkbd/devel added to the repository From pkgdb at fedoraproject.org Tue Mar 10 20:16:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:16:51 +0000 Subject: [pkgdb] kvkbd (Fedora, 9) updated by ausil Message-ID: <20090310201651.E0A92208551@bastion.fedora.phx.redhat.com> ausil added a Fedora 9 branch for kvkbd ausil has set commit to Approved for provenpackager on kvkbd (Fedora 9) ausil has set build to Approved for provenpackager on kvkbd (Fedora 9) ausil has set checkout to Approved for provenpackager on kvkbd (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kvkbd From ausil at fedoraproject.org Tue Mar 10 20:16:04 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:16:04 +0000 (UTC) Subject: rpms/kvkbd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090310201604.547FE7002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/kvkbd/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsb23660/rpms/kvkbd/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kvkbd --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: kvkbd # $Id: Makefile,v 1.1 2009/03/10 20:16:04 ausil Exp $ NAME := kvkbd SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From ausil at fedoraproject.org Tue Mar 10 20:16:03 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:16:03 +0000 (UTC) Subject: rpms/kvkbd Makefile,NONE,1.1 Message-ID: <20090310201603.B810D7002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/kvkbd In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsb23660/rpms/kvkbd Added Files: Makefile Log Message: Setup of module kvkbd --- NEW FILE Makefile --- # Top level Makefile for module kvkbd all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From pkgdb at fedoraproject.org Tue Mar 10 20:17:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:17:37 +0000 Subject: [pkgdb] mingw32-fontconfig was added for rjones Message-ID: <20090310201735.92FEA208510@bastion.fedora.phx.redhat.com> ausil has added Package mingw32-fontconfig with summary MinGW fontconfig library ausil has approved Package mingw32-fontconfig ausil has added a Fedora devel branch for mingw32-fontconfig with an owner of rjones ausil has approved mingw32-fontconfig in Fedora devel ausil has approved Package mingw32-fontconfig ausil has set commit to Approved for provenpackager on mingw32-fontconfig (Fedora devel) ausil has set build to Approved for provenpackager on mingw32-fontconfig (Fedora devel) ausil has set checkout to Approved for provenpackager on mingw32-fontconfig (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-fontconfig From pkgdb at fedoraproject.org Tue Mar 10 20:17:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:17:37 +0000 Subject: [pkgdb] mingw32-fontconfig (Fedora EPEL, 5) updated by ausil Message-ID: <20090310201737.488D4208553@bastion.fedora.phx.redhat.com> ausil added a Fedora EPEL 5 branch for mingw32-fontconfig ausil has set commit to Approved for provenpackager on mingw32-fontconfig (Fedora EPEL 5) ausil has set build to Approved for provenpackager on mingw32-fontconfig (Fedora EPEL 5) ausil has set checkout to Approved for provenpackager on mingw32-fontconfig (Fedora EPEL 5) ausil approved watchbugzilla on mingw32-fontconfig (Fedora EPEL 5) for berrange ausil approved watchcommits on mingw32-fontconfig (Fedora EPEL 5) for berrange ausil approved commit on mingw32-fontconfig (Fedora EPEL 5) for berrange ausil approved build on mingw32-fontconfig (Fedora EPEL 5) for berrange ausil approved approveacls on mingw32-fontconfig (Fedora EPEL 5) for berrange To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-fontconfig From pkgdb at fedoraproject.org Tue Mar 10 20:17:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:17:37 +0000 Subject: [pkgdb] mingw32-fontconfig (Fedora, 10) updated by ausil Message-ID: <20090310201737.7F8EB208555@bastion.fedora.phx.redhat.com> ausil added a Fedora 10 branch for mingw32-fontconfig ausil has set commit to Approved for provenpackager on mingw32-fontconfig (Fedora 10) ausil has set build to Approved for provenpackager on mingw32-fontconfig (Fedora 10) ausil has set checkout to Approved for provenpackager on mingw32-fontconfig (Fedora 10) ausil approved watchbugzilla on mingw32-fontconfig (Fedora 10) for berrange ausil approved watchcommits on mingw32-fontconfig (Fedora 10) for berrange ausil approved commit on mingw32-fontconfig (Fedora 10) for berrange ausil approved build on mingw32-fontconfig (Fedora 10) for berrange ausil approved approveacls on mingw32-fontconfig (Fedora 10) for berrange To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-fontconfig From pkgdb at fedoraproject.org Tue Mar 10 20:17:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:17:37 +0000 Subject: [pkgdb] mingw32-fontconfig (Fedora, devel) updated by ausil Message-ID: <20090310201737.8B1B6208603@bastion.fedora.phx.redhat.com> ausil approved watchbugzilla on mingw32-fontconfig (Fedora devel) for berrange ausil approved watchcommits on mingw32-fontconfig (Fedora devel) for berrange ausil approved commit on mingw32-fontconfig (Fedora devel) for berrange ausil approved build on mingw32-fontconfig (Fedora devel) for berrange ausil approved approveacls on mingw32-fontconfig (Fedora devel) for berrange To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-fontconfig From ausil at fedoraproject.org Tue Mar 10 20:16:38 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:16:38 +0000 (UTC) Subject: rpms/mingw32-fontconfig/devel - New directory Message-ID: <20090310201638.88D0E70133@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/mingw32-fontconfig/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsB24046/rpms/mingw32-fontconfig/devel Log Message: Directory /cvs/pkgs/rpms/mingw32-fontconfig/devel added to the repository From ausil at fedoraproject.org Tue Mar 10 20:16:38 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:16:38 +0000 (UTC) Subject: rpms/mingw32-fontconfig - New directory Message-ID: <20090310201638.2705A70132@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/mingw32-fontconfig In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsB24046/rpms/mingw32-fontconfig Log Message: Directory /cvs/pkgs/rpms/mingw32-fontconfig added to the repository From ausil at fedoraproject.org Tue Mar 10 20:16:48 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:16:48 +0000 (UTC) Subject: rpms/mingw32-fontconfig Makefile,NONE,1.1 Message-ID: <20090310201648.7071770132@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/mingw32-fontconfig In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsB24046/rpms/mingw32-fontconfig Added Files: Makefile Log Message: Setup of module mingw32-fontconfig --- NEW FILE Makefile --- # Top level Makefile for module mingw32-fontconfig all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From ausil at fedoraproject.org Tue Mar 10 20:16:49 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:16:49 +0000 (UTC) Subject: rpms/mingw32-fontconfig/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090310201649.7193E70132@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/mingw32-fontconfig/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsB24046/rpms/mingw32-fontconfig/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mingw32-fontconfig --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: mingw32-fontconfig # $Id: Makefile,v 1.1 2009/03/10 20:16:48 ausil Exp $ NAME := mingw32-fontconfig SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 10 20:18:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:18:20 +0000 Subject: [pkgdb] mingw32-expat was added for rjones Message-ID: <20090310201820.760C7208551@bastion.fedora.phx.redhat.com> ausil has added Package mingw32-expat with summary Windows port of expat XML parser library ausil has approved Package mingw32-expat ausil has added a Fedora devel branch for mingw32-expat with an owner of rjones ausil has approved mingw32-expat in Fedora devel ausil has approved Package mingw32-expat ausil has set commit to Approved for provenpackager on mingw32-expat (Fedora devel) ausil has set build to Approved for provenpackager on mingw32-expat (Fedora devel) ausil has set checkout to Approved for provenpackager on mingw32-expat (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-expat From pkgdb at fedoraproject.org Tue Mar 10 20:17:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:17:14 +0000 Subject: [pkgdb] mingw32-expat (Fedora EPEL, 5) updated by ausil Message-ID: <20090310201821.A37FE208556@bastion.fedora.phx.redhat.com> ausil added a Fedora EPEL 5 branch for mingw32-expat ausil has set commit to Approved for provenpackager on mingw32-expat (Fedora EPEL 5) ausil has set build to Approved for provenpackager on mingw32-expat (Fedora EPEL 5) ausil has set checkout to Approved for provenpackager on mingw32-expat (Fedora EPEL 5) ausil approved watchbugzilla on mingw32-expat (Fedora EPEL 5) for berrange ausil approved watchcommits on mingw32-expat (Fedora EPEL 5) for berrange ausil approved commit on mingw32-expat (Fedora EPEL 5) for berrange ausil approved build on mingw32-expat (Fedora EPEL 5) for berrange ausil approved approveacls on mingw32-expat (Fedora EPEL 5) for berrange To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-expat From pkgdb at fedoraproject.org Tue Mar 10 20:17:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:17:14 +0000 Subject: [pkgdb] mingw32-expat (Fedora, 10) updated by ausil Message-ID: <20090310201821.B57FA2086FF@bastion.fedora.phx.redhat.com> ausil added a Fedora 10 branch for mingw32-expat ausil has set commit to Approved for provenpackager on mingw32-expat (Fedora 10) ausil has set build to Approved for provenpackager on mingw32-expat (Fedora 10) ausil has set checkout to Approved for provenpackager on mingw32-expat (Fedora 10) ausil approved watchbugzilla on mingw32-expat (Fedora 10) for berrange ausil approved watchcommits on mingw32-expat (Fedora 10) for berrange ausil approved commit on mingw32-expat (Fedora 10) for berrange ausil approved build on mingw32-expat (Fedora 10) for berrange ausil approved approveacls on mingw32-expat (Fedora 10) for berrange To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-expat From ausil at fedoraproject.org Tue Mar 10 20:17:24 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:17:24 +0000 (UTC) Subject: rpms/mingw32-expat/devel - New directory Message-ID: <20090310201724.830E170133@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/mingw32-expat/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsR24570/rpms/mingw32-expat/devel Log Message: Directory /cvs/pkgs/rpms/mingw32-expat/devel added to the repository From ausil at fedoraproject.org Tue Mar 10 20:17:24 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:17:24 +0000 (UTC) Subject: rpms/mingw32-expat - New directory Message-ID: <20090310201724.38F7C70132@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/mingw32-expat In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsR24570/rpms/mingw32-expat Log Message: Directory /cvs/pkgs/rpms/mingw32-expat added to the repository From pkgdb at fedoraproject.org Tue Mar 10 20:17:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:17:14 +0000 Subject: [pkgdb] mingw32-expat (Fedora, devel) updated by ausil Message-ID: <20090310201824.0AED2208706@bastion.fedora.phx.redhat.com> ausil approved watchbugzilla on mingw32-expat (Fedora devel) for berrange ausil approved watchcommits on mingw32-expat (Fedora devel) for berrange ausil approved commit on mingw32-expat (Fedora devel) for berrange ausil approved build on mingw32-expat (Fedora devel) for berrange ausil approved approveacls on mingw32-expat (Fedora devel) for berrange To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-expat From ausil at fedoraproject.org Tue Mar 10 20:17:33 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:17:33 +0000 (UTC) Subject: rpms/mingw32-expat Makefile,NONE,1.1 Message-ID: <20090310201733.6BDEF70132@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/mingw32-expat In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsR24570/rpms/mingw32-expat Added Files: Makefile Log Message: Setup of module mingw32-expat --- NEW FILE Makefile --- # Top level Makefile for module mingw32-expat all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From ausil at fedoraproject.org Tue Mar 10 20:17:33 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:17:33 +0000 (UTC) Subject: rpms/mingw32-expat/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090310201733.E90A670132@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/mingw32-expat/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsR24570/rpms/mingw32-expat/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mingw32-expat --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: mingw32-expat # $Id: Makefile,v 1.1 2009/03/10 20:17:33 ausil Exp $ NAME := mingw32-expat SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 10 20:19:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:19:01 +0000 Subject: [pkgdb] davfs2 was added for wwoods Message-ID: <20090310201901.8A19A208555@bastion.fedora.phx.redhat.com> ausil has added Package davfs2 with summary A filesystem driver for WebDAV ausil has approved Package davfs2 ausil has added a Fedora devel branch for davfs2 with an owner of wwoods ausil has approved davfs2 in Fedora devel ausil has approved Package davfs2 ausil has set commit to Approved for provenpackager on davfs2 (Fedora devel) ausil has set build to Approved for provenpackager on davfs2 (Fedora devel) ausil has set checkout to Approved for provenpackager on davfs2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/davfs2 From pkgdb at fedoraproject.org Tue Mar 10 20:17:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:17:55 +0000 Subject: [pkgdb] davfs2 (Fedora, 10) updated by ausil Message-ID: <20090310201902.77BB12086F3@bastion.fedora.phx.redhat.com> ausil added a Fedora 10 branch for davfs2 ausil has set commit to Approved for provenpackager on davfs2 (Fedora 10) ausil has set build to Approved for provenpackager on davfs2 (Fedora 10) ausil has set checkout to Approved for provenpackager on davfs2 (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/davfs2 From ausil at fedoraproject.org Tue Mar 10 20:18:04 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:18:04 +0000 (UTC) Subject: rpms/davfs2 - New directory Message-ID: <20090310201804.3CF207002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/davfs2 In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvse25336/rpms/davfs2 Log Message: Directory /cvs/pkgs/rpms/davfs2 added to the repository From pkgdb at fedoraproject.org Tue Mar 10 20:17:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:17:55 +0000 Subject: [pkgdb] davfs2 (Fedora, 9) updated by ausil Message-ID: <20090310201902.CE0D0208710@bastion.fedora.phx.redhat.com> ausil added a Fedora 9 branch for davfs2 ausil has set commit to Approved for provenpackager on davfs2 (Fedora 9) ausil has set build to Approved for provenpackager on davfs2 (Fedora 9) ausil has set checkout to Approved for provenpackager on davfs2 (Fedora 9) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/davfs2 From ausil at fedoraproject.org Tue Mar 10 20:18:04 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:18:04 +0000 (UTC) Subject: rpms/davfs2/devel - New directory Message-ID: <20090310201804.8B1B17002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/davfs2/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvse25336/rpms/davfs2/devel Log Message: Directory /cvs/pkgs/rpms/davfs2/devel added to the repository From ausil at fedoraproject.org Tue Mar 10 20:18:13 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:18:13 +0000 (UTC) Subject: rpms/davfs2 Makefile,NONE,1.1 Message-ID: <20090310201813.1E7367002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/davfs2 In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvse25336/rpms/davfs2 Added Files: Makefile Log Message: Setup of module davfs2 --- NEW FILE Makefile --- # Top level Makefile for module davfs2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From ausil at fedoraproject.org Tue Mar 10 20:18:13 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:18:13 +0000 (UTC) Subject: rpms/davfs2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090310201813.85BE47002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/davfs2/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvse25336/rpms/davfs2/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module davfs2 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: davfs2 # $Id: Makefile,v 1.1 2009/03/10 20:18:13 ausil Exp $ NAME := davfs2 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 10 20:18:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:18:39 +0000 Subject: [pkgdb] gupnp-vala was added for pbrobinson Message-ID: <20090310201947.02525208550@bastion.fedora.phx.redhat.com> ausil has added Package gupnp-vala with summary Vala language bindings for the GUPnP framework. ausil has approved Package gupnp-vala ausil has added a Fedora devel branch for gupnp-vala with an owner of pbrobinson ausil has approved gupnp-vala in Fedora devel ausil has approved Package gupnp-vala ausil has set commit to Approved for provenpackager on gupnp-vala (Fedora devel) ausil has set build to Approved for provenpackager on gupnp-vala (Fedora devel) ausil has set checkout to Approved for provenpackager on gupnp-vala (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gupnp-vala From pkgdb at fedoraproject.org Tue Mar 10 20:19:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:19:28 +0000 Subject: [pkgdb] gupnp-vala (Fedora EPEL, 5) updated by ausil Message-ID: <20090310201948.44DA5208553@bastion.fedora.phx.redhat.com> ausil added a Fedora EPEL 5 branch for gupnp-vala ausil has set commit to Approved for provenpackager on gupnp-vala (Fedora EPEL 5) ausil has set build to Approved for provenpackager on gupnp-vala (Fedora EPEL 5) ausil has set checkout to Approved for provenpackager on gupnp-vala (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gupnp-vala From pkgdb at fedoraproject.org Tue Mar 10 20:19:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:19:28 +0000 Subject: [pkgdb] gupnp-vala (Fedora, 10) updated by ausil Message-ID: <20090310201948.4E1A9208556@bastion.fedora.phx.redhat.com> ausil added a Fedora 10 branch for gupnp-vala ausil has set commit to Approved for provenpackager on gupnp-vala (Fedora 10) ausil has set build to Approved for provenpackager on gupnp-vala (Fedora 10) ausil has set checkout to Approved for provenpackager on gupnp-vala (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gupnp-vala From ausil at fedoraproject.org Tue Mar 10 20:18:49 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:18:49 +0000 (UTC) Subject: rpms/gupnp-vala - New directory Message-ID: <20090310201849.349787002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/gupnp-vala In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsP25746/rpms/gupnp-vala Log Message: Directory /cvs/pkgs/rpms/gupnp-vala added to the repository From ausil at fedoraproject.org Tue Mar 10 20:18:49 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:18:49 +0000 (UTC) Subject: rpms/gupnp-vala/devel - New directory Message-ID: <20090310201849.8040B70132@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/gupnp-vala/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsP25746/rpms/gupnp-vala/devel Log Message: Directory /cvs/pkgs/rpms/gupnp-vala/devel added to the repository From ausil at fedoraproject.org Tue Mar 10 20:19:00 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:19:00 +0000 (UTC) Subject: rpms/gupnp-vala Makefile,NONE,1.1 Message-ID: <20090310201900.4EF687002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/gupnp-vala In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsP25746/rpms/gupnp-vala Added Files: Makefile Log Message: Setup of module gupnp-vala --- NEW FILE Makefile --- # Top level Makefile for module gupnp-vala all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From ausil at fedoraproject.org Tue Mar 10 20:19:00 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:19:00 +0000 (UTC) Subject: rpms/gupnp-vala/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090310201900.ECA627002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/gupnp-vala/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsP25746/rpms/gupnp-vala/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gupnp-vala --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gupnp-vala # $Id: Makefile,v 1.1 2009/03/10 20:19:00 ausil Exp $ NAME := gupnp-vala SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Mar 10 20:20:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:20:55 +0000 Subject: [pkgdb] vtun (Fedora EPEL, 4) updated by ausil Message-ID: <20090310202055.8D786208505@bastion.fedora.phx.redhat.com> ausil added a Fedora EPEL 4 branch for vtun ausil has set commit to Approved for provenpackager on vtun (Fedora EPEL 4) ausil has set build to Approved for provenpackager on vtun (Fedora EPEL 4) ausil has set checkout to Approved for provenpackager on vtun (Fedora EPEL 4) ausil changed owner of vtun in Fedora EPEL 4 to somlo To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vtun From mtruch at fedoraproject.org Tue Mar 10 20:19:53 2009 From: mtruch at fedoraproject.org (Matthew D Truch) Date: Tue, 10 Mar 2009 20:19:53 +0000 (UTC) Subject: rpms/cfitsio/F-10 cfitsio.spec,1.30,1.31 Message-ID: <20090310201953.D32927002E@cvs1.fedora.phx.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26034 Modified Files: cfitsio.spec Log Message: Set proper version number in pkgconfig file. Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/F-10/cfitsio.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- cfitsio.spec 23 Feb 2009 21:08:37 -0000 1.30 +++ cfitsio.spec 10 Mar 2009 20:19:23 -0000 1.31 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.130 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -55,11 +55,14 @@ sed 's|${exec_prefix}/lib|${exec_prefix}/%{_lib}|' cfitsio.pc >cfitsio.pc.new sed 's|${prefix}/include|${prefix}/include/%{name}|' cfitsio.pc.new >cfitsio.pc rm -f cfitsio.pc.new +# Manually correct pkgconfig .pc file version +sed 's|3.006|%{version}|' cfitsio.pc >cfitsio.pc.new +mv cfitsio.pc.new cfitsio.pc %check make testprog LD_LIBRARY_PATH=. ./testprog > testprog.lis -#cmp -s testprog.lis testprog.out #testprog.out is accidentally missing from 3.100 tarball. +cmp -s testprog.lis testprog.out cmp -s testprog.fit testprog.std %install @@ -95,6 +98,10 @@ %{_libdir}/libcfitsio.a %changelog +* Tue Mar 10 2009 Matthew Truch - 3.130-3 +- Set version correctly in pkgconfig .pc file. +- Resume full testsuite. + * Mon Feb 23 2009 Matthew Truch - 3.130-2 - Bump for proper EVR upgrade path. From pkgdb at fedoraproject.org Tue Mar 10 20:21:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:21:48 +0000 Subject: [pkgdb] python-kerberos (Fedora EPEL, 5) updated by ausil Message-ID: <20090310202148.482FF208504@bastion.fedora.phx.redhat.com> ausil added a Fedora EPEL 5 branch for python-kerberos ausil has set commit to Approved for provenpackager on python-kerberos (Fedora EPEL 5) ausil has set build to Approved for provenpackager on python-kerberos (Fedora EPEL 5) ausil has set checkout to Approved for provenpackager on python-kerberos (Fedora EPEL 5) ausil changed owner of python-kerberos in Fedora EPEL 5 to rcritten To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-kerberos From s4504kr at fedoraproject.org Tue Mar 10 20:20:52 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Tue, 10 Mar 2009 20:20:52 +0000 (UTC) Subject: rpms/aplus-fsf/devel aplus-fsf-4.22-gcc44.patch, NONE, 1.1 aplus-fsf.spec, 1.40, 1.41 Message-ID: <20090310202052.DC7FE7002E@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/aplus-fsf/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26425 Modified Files: aplus-fsf.spec Added Files: aplus-fsf-4.22-gcc44.patch Log Message: Fix gcc-44 related issues aplus-fsf-4.22-gcc44.patch: --- NEW FILE aplus-fsf-4.22-gcc44.patch --- diff -up aplus-fsf-4.22/src/MSTypes/MSFloat.C.gcc44 aplus-fsf-4.22/src/MSTypes/MSFloat.C --- aplus-fsf-4.22/src/MSTypes/MSFloat.C.gcc44 2008-03-27 20:10:29.000000000 +0100 +++ aplus-fsf-4.22/src/MSTypes/MSFloat.C 2009-03-10 21:07:07.000000000 +0100 @@ -112,6 +112,8 @@ const MSSymbol& MSFloat::symbol(void) MSError::ErrorStatus MSFloat::internalSet(const char *pString_) { char *np,buf[512]; + + char *xp = const_cast(pString_); _real=0.0; _flags=MSFloat::Set; // clear the Valid bit, i.e. isValid==MSFalse @@ -120,15 +122,15 @@ MSError::ErrorStatus MSFloat::internalSe { _real=0.0; setToValid(); return (MSError::MSSuccess); } else if (strncmp(pString_,"NaN",3)==0) { _real=0.0; return (MSError::MSSuccess); } - else if ((np=strchr(pString_,'.'))&&(strchr(++np,'.'))) + else if ((np=strchr(xp,'.'))&&(strchr(++np,'.'))) { return (MSError::BadReal); } // Disallow more than one decimal point - else if ((np=strchr(pString_,'.'))&&(strchr(++np,','))) + else if ((np=strchr(xp,'.'))&&(strchr(++np,','))) { return (MSError::BadReal); } // Disallow commas after the decimal point else if (*pString_==',') { return (MSError::BadReal); } // Disallow leading commas // Make sure we don't save too many characters after the decimal - char *decimal=strchr(pString_,'.'); + char *decimal=strchr(xp,'.'); if ((decimal!=0)&&(strlen(decimal+1)>MSRealMaximumLength)) { return (MSError::IntTooBig); } strcpy(buf,pString_); diff -up aplus-fsf-4.22/src/MSTypes/MSUtil.C.gcc44 aplus-fsf-4.22/src/MSTypes/MSUtil.C --- aplus-fsf-4.22/src/MSTypes/MSUtil.C.gcc44 2008-03-27 20:10:34.000000000 +0100 +++ aplus-fsf-4.22/src/MSTypes/MSUtil.C 2009-03-10 21:08:17.000000000 +0100 @@ -26,8 +26,10 @@ void MSUtil::comma(const char *fromBuffe { int places,len,i,j; char *cp; + + char *xp = const_cast(fromBuffer_); - if ((cp=strchr(fromBuffer_,'.'))!=NULL) + if ((cp=strchr(xp,'.'))!=NULL) { places=cp-fromBuffer_; for (i=0,j=0,len=strlen(fromBuffer_); j<=len&&i<(size_-1); j++,i++) Index: aplus-fsf.spec =================================================================== RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- aplus-fsf.spec 28 Feb 2009 01:32:03 -0000 1.40 +++ aplus-fsf.spec 10 Mar 2009 20:20:22 -0000 1.41 @@ -20,7 +20,7 @@ Name: %name Version: 4.22.4 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2 Summary: Advanced APL interpreter with s interface @@ -34,6 +34,7 @@ Patch1: aplus-fsf-4.22.4-makefile.patch Patch3: aplus-fsf-4.20-el.patch Patch4: aplus-fsf-4.22.3-atree.patch +Patch5: aplus-fsf-4.22-gcc44.patch BuildRequires: libtool BuildRequires: xorg-x11-proto-devel @@ -69,6 +70,8 @@ Requires: fontpackages-filesystem +BuildArch: noarch + %description KAPL-fonts The A+ programming language development environment requires these APL fonts to properly display A+ code in XTerm or XEmacs. @@ -81,6 +84,7 @@ Summary: XEmacs lisp for A+ development Group: Applications/Editors Requires: xemacs, aplus-fsf +BuildArch: noarch %description -n xemacs-%{name} This package contains the XEmacs lisp required for the development of A+ programs. It does the key bindings, set of fonts property @@ -99,6 +103,7 @@ %patch1 -p1 -b .org %patch3 -p1 %patch4 -p1 +%patch5 -p1 -b .gcc44 %build # export CXXFLAGS=-O3 CFLAGS=-O3 @@ -188,6 +193,10 @@ %{xemacs_startdir}/aplus-fsf-init.el %changelog +* Tue Mar 10 2009 Jochen Schmitt 4.22.4-15 +- Support noach subpackages +- fix gcc-44 releated issues (workaround) + * Fri Feb 27 2009 Fedora Release Engineering - 4.22.4-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Tue Mar 10 20:22:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:22:52 +0000 Subject: [pkgdb] python-mwlib (Fedora EPEL, 5) updated by ausil Message-ID: <20090310202313.08D4820850F@bastion.fedora.phx.redhat.com> ausil added a Fedora EPEL 5 branch for python-mwlib ausil has set commit to Approved for provenpackager on python-mwlib (Fedora EPEL 5) ausil has set build to Approved for provenpackager on python-mwlib (Fedora EPEL 5) ausil has set checkout to Approved for provenpackager on python-mwlib (Fedora EPEL 5) ausil changed owner of python-mwlib in Fedora EPEL 5 to jasper ausil approved watchbugzilla on python-mwlib (Fedora EPEL 5) for ianweller ausil approved watchcommits on python-mwlib (Fedora EPEL 5) for ianweller ausil approved commit on python-mwlib (Fedora EPEL 5) for ianweller ausil approved build on python-mwlib (Fedora EPEL 5) for ianweller ausil approved approveacls on python-mwlib (Fedora EPEL 5) for ianweller To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-mwlib From pkgdb at fedoraproject.org Tue Mar 10 20:24:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:24:13 +0000 Subject: [pkgdb] flint was added for konradm Message-ID: <20090310202410.E5E70208505@bastion.fedora.phx.redhat.com> ausil has added Package flint with summary Fast Library for Number Theory ausil has approved Package flint ausil has added a Fedora devel branch for flint with an owner of konradm ausil has approved flint in Fedora devel ausil has approved Package flint ausil has set commit to Approved for provenpackager on flint (Fedora devel) ausil has set build to Approved for provenpackager on flint (Fedora devel) ausil has set checkout to Approved for provenpackager on flint (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/flint From pkgdb at fedoraproject.org Tue Mar 10 20:24:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 20:24:11 +0000 Subject: [pkgdb] flint (Fedora, 10) updated by ausil Message-ID: <20090310202411.DF363208511@bastion.fedora.phx.redhat.com> ausil added a Fedora 10 branch for flint ausil has set commit to Approved for provenpackager on flint (Fedora 10) ausil has set build to Approved for provenpackager on flint (Fedora 10) ausil has set checkout to Approved for provenpackager on flint (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/flint From ausil at fedoraproject.org Tue Mar 10 20:23:13 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:23:13 +0000 (UTC) Subject: rpms/flint/devel - New directory Message-ID: <20090310202313.8855770133@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/flint/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsw27540/rpms/flint/devel Log Message: Directory /cvs/pkgs/rpms/flint/devel added to the repository From ausil at fedoraproject.org Tue Mar 10 20:23:13 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:23:13 +0000 (UTC) Subject: rpms/flint - New directory Message-ID: <20090310202313.3AFBD7002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/flint In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsw27540/rpms/flint Log Message: Directory /cvs/pkgs/rpms/flint added to the repository From ausil at fedoraproject.org Tue Mar 10 20:23:24 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:23:24 +0000 (UTC) Subject: rpms/flint Makefile,NONE,1.1 Message-ID: <20090310202324.460237002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/flint In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsw27540/rpms/flint Added Files: Makefile Log Message: Setup of module flint --- NEW FILE Makefile --- # Top level Makefile for module flint all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From ausil at fedoraproject.org Tue Mar 10 20:23:25 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Tue, 10 Mar 2009 20:23:25 +0000 (UTC) Subject: rpms/flint/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20090310202325.2D32A7002E@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/flint/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsw27540/rpms/flint/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module flint --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: flint # $Id: Makefile,v 1.1 2009/03/10 20:23:24 ausil Exp $ NAME := flint SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From mtruch at fedoraproject.org Tue Mar 10 20:23:18 2009 From: mtruch at fedoraproject.org (Matthew D Truch) Date: Tue, 10 Mar 2009 20:23:18 +0000 (UTC) Subject: rpms/cfitsio/F-9 cfitsio.spec,1.28,1.29 Message-ID: <20090310202318.44F7C7002E@cvs1.fedora.phx.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27199 Modified Files: cfitsio.spec Log Message: Correctly set pkgconfig .pc file version number for cfitsio. Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/F-9/cfitsio.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- cfitsio.spec 23 Feb 2009 21:06:47 -0000 1.28 +++ cfitsio.spec 10 Mar 2009 20:22:47 -0000 1.29 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.130 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -55,6 +55,9 @@ sed 's|${exec_prefix}/lib|${exec_prefix}/%{_lib}|' cfitsio.pc >cfitsio.pc.new sed 's|${prefix}/include|${prefix}/include/%{name}|' cfitsio.pc.new >cfitsio.pc rm -f cfitsio.pc.new +# Manually correct pkgconfig .pc file version +sed 's|3.006|%{version}|' cfitsio.pc >cfitsio.pc.new +mv cfitsio.pc.new cfitsio.pc %install rm -rf %{buildroot} @@ -89,6 +92,9 @@ %{_libdir}/libcfitsio.a %changelog +* Tue Mar 10 2009 Matthew Truch - 3.130-3 +- Set version number correctly in pkgconfig .pc file. + * Mon Feb 23 2009 Matthew Truch - 3.130-2 - Fix patch to properly set soname. From orion at fedoraproject.org Tue Mar 10 20:23:47 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Tue, 10 Mar 2009 20:23:47 +0000 (UTC) Subject: rpms/ncl/F-10 ncl.spec,1.9,1.10 Message-ID: <20090310202347.A7E4C7002E@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/ncl/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27487 Modified Files: ncl.spec Log Message: Need atlas-sse2-devel on F10 Index: ncl.spec =================================================================== RCS file: /cvs/pkgs/rpms/ncl/F-10/ncl.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ncl.spec 10 Mar 2009 15:58:21 -0000 1.9 +++ ncl.spec 10 Mar 2009 20:23:17 -0000 1.10 @@ -43,7 +43,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /bin/csh, gcc-gfortran, netcdf-devel, hdf-devel >= 4.2r2, libjpeg-devel -BuildRequires: g2clib-devel, libnc-dap-devel, librx-devel, atlas-devel +BuildRequires: g2clib-devel, libnc-dap-devel, librx-devel, atlas-sse2-devel # imake needed for makedepend BuildRequires: imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel BuildRequires: byacc, flex From simo at fedoraproject.org Tue Mar 10 20:43:40 2009 From: simo at fedoraproject.org (Simo Sorce) Date: Tue, 10 Mar 2009 20:43:40 +0000 (UTC) Subject: rpms/sssd/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sssd.spec, 1.1, 1.2 Message-ID: <20090310204340.878F27002E@cvs1.fedora.phx.redhat.com> Author: simo Update of /cvs/pkgs/rpms/sssd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32314 Modified Files: .cvsignore sources sssd.spec Log Message: * Tue Mar 10 2009 Simo Sorce - 0.2.0-1 - Version 0.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sssd/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Mar 2009 17:07:25 -0000 1.2 +++ .cvsignore 10 Mar 2009 20:43:08 -0000 1.3 @@ -1 +1 @@ -sssd-0.1.0.tar.gz +sssd-0.2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sssd/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Mar 2009 17:07:25 -0000 1.2 +++ sources 10 Mar 2009 20:43:08 -0000 1.3 @@ -1 +1 @@ -a56ba0f725a2adc6db40603c160a31e9 sssd-0.1.0.tar.gz +b9123c0c515c2dee6250c8ed7b33e21a sssd-0.2.0.tar.gz Index: sssd.spec =================================================================== RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sssd.spec 9 Mar 2009 17:07:25 -0000 1.1 +++ sssd.spec 10 Mar 2009 20:43:08 -0000 1.2 @@ -1,22 +1,12 @@ -# this is the git snapshot we're packaging -%define datetag 20090309 -%define vcs git -%define vcsversion 691c9b3 -%define alphatag %{datetag}%{vcs}%{vcsversion} - Name: sssd -Version: 0.1.0 -Release: 5.%{alphatag}%{dist} +Version: 0.2.0 +Release: 1%{?dist} Group: Applications/System Summary: System Security Services Daemon # The entire source code is GPLv3+ except replace/ which is LGPLv3+ License: GPLv3+ and LGPLv3+ -URL: http://www.freeipa.org/ -# Tarfile created using git -# git clone git clone git://fedorahosted.org/sssd.git -# cd sssd -# git-archive --format=tar --prefix=%{name}-%{version}/ %{name}-%{version} | gzip > %{name}-%{version}.tar.gz -Source0: sssd-%{version}.tar.gz +URL: http://fedorahosted.org/sssd +Source: https://fedorahosted.org/sssd/attachment/wiki/WikiStart/sssd-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ### Patches ### @@ -64,9 +54,8 @@ --sysconfdir=%{_sysconfdir} \ --without-tests \ --without-policykit \ - --with-openldap \ --with-infopipe \ - --with-initrd-dir=%{_initrddir} \ + --with-init-dir=%{_initrddir} \ make %{?_smp_mflags} popd @@ -99,15 +88,20 @@ %{_sbindir}/sssd %{_sbindir}/sss_useradd %{_sbindir}/sss_userdel +%{_sbindir}/sss_usermod %{_sbindir}/sss_groupadd %{_sbindir}/sss_groupdel +%{_sbindir}/sss_groupmod %{_libexecdir}/%{servicename}/ %{_libdir}/%{name}/ %{_libdir}/ldb/memberof.so* -%{_sharedstatedir}/sss/ +%dir /var/lib/sss/ +%attr(700,root,root) %dir /var/lib/sss/db +%dir /var/lib/sss/pipes +%attr(700,root,root) %dir /var/lib/sss/pipes/private %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freeipa.sssd.infopipe.conf %{_datadir}/%{name}/introspect/infopipe/org.freeipa.sssd.infopipe.Introspect.xml -/%{_lib}/libnss_sss.so.0.0.1 +/%{_lib}/libnss_sss.so /%{_lib}/libnss_sss.so.2 /%{_lib}/security/pam_sss.so @@ -128,6 +122,9 @@ fi %changelog +* Tue Mar 10 2009 Simo Sorce - 0.2.0-1 +- Version 0.2.0 + * Sun Mar 08 2009 Jakub Hrozek - 0.1.0-5.20090309git691c9b3 - package git snapshot From glommer at fedoraproject.org Tue Mar 10 20:59:49 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 10 Mar 2009 20:59:49 +0000 (UTC) Subject: rpms/qemu/devel qemu.spec,1.62,1.63 Message-ID: <20090310205949.95BBC7002E@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3671 Modified Files: qemu.spec Log Message: - kvm.modules were being wrongly mentioned at %%install. - update description for the x86 system package to include kvm support - build kvm's own bios. It is still necessary while kvm uses a slightly different irq routing mechanism Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- qemu.spec 6 Mar 2009 15:51:49 -0000 1.62 +++ qemu.spec 10 Mar 2009 20:59:18 -0000 1.63 @@ -32,7 +32,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel -BuildRequires: rsync +BuildRequires: rsync dev86 iasl Requires: %{name}-user = %{epoch}:%{version}-%{release} Requires: %{name}-system-x86 = %{epoch}:%{version}-%{release} Requires: %{name}-system-sparc = %{epoch}:%{version}-%{release} @@ -44,8 +44,6 @@ Requires: %{name}-system-ppc = %{epoch}:%{version}-%{release} Requires: %{name}-img = %{epoch}:%{version}-%{release} -#ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 sparc64 armv4l - %define qemudocdir %{_docdir}/%{name}-%{version} %description @@ -107,7 +105,9 @@ QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. -This package provides the system emulator for x86 +This package provides the system emulator for x86. When being run in a x86 +machine that supports it, this package also provides the KVM virtualization +platform. %package system-ppc Summary: QEMU system emulator for ppc @@ -229,6 +229,7 @@ %ifarch %{ix86} x86_64 # build kvm +sed -i 's/datasuffix=\"\/share\/qemu\"/datasuffix=\"\/share\/kvm\"/' qemu/configure echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease ./configure --with-patched-kernel --target-list=x86_64-softmmu \ --kerneldir=$(pwd)/kernel --prefix=%{_prefix} \ @@ -238,9 +239,12 @@ cp qemu/x86_64-softmmu/qemu-system-x86_64 qemu-kvm cp user/kvmtrace . cp user/kvmtrace_format . +make bios +make vgabios make clean %endif +sed -i 's/datasuffix=\"\/share\/kvm\"/datasuffix=\"\/share\/qemu\"/' qemu/configure echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease cd qemu ./configure \ @@ -266,12 +270,18 @@ %ifarch %{ix86} x86_64 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules mkdir -p $RPM_BUILD_ROOT%{_bindir}/ +mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/kvm install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules install -m 0755 kvmtrace $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 kvmtrace_format $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 kvm_stat $RPM_BUILD_ROOT%{_bindir}/ -install -D -p -m 0755 qemu-kvm $RPM_BUILD_ROOT%{_bindir}/ + +install -m 0755 qemu-kvm $RPM_BUILD_ROOT%{_bindir}/ +install -m 0644 bios/BIOS-bochs-latest $RPM_BUILD_ROOT%{_prefix}/share/kvm/bios.bin +install -m 0644 vgabios/VGABIOS-lgpl-latest.bin $RPM_BUILD_ROOT%{_prefix}/share/kvm/vgabios.bin +install -m 0644 vgabios/VGABIOS-lgpl-latest.cirrus.bin $RPM_BUILD_ROOT%{_prefix}/share/kvm/vgabios-cirrus.bin + %endif cd qemu @@ -295,7 +305,7 @@ # /usr/share/etherboot, as QEMU doesn't know how to look # for other paths, yet. pxe_link() { - ln -s ../etherboot/$2.zrom %{buildroot}/usr/share/qemu/pxe-$1.bin + ln -s ../etherboot/$2.zrom %{buildroot}%{_prefix}/share/qemu/pxe-$1.bin } pxe_link e1000 e1000-82542 @@ -303,9 +313,11 @@ pxe_link pcnet pcnet32 pxe_link rtl8139 rtl8139 pxe_link virtio virtio-net -ln -s ../vgabios/VGABIOS-lgpl-latest.bin %{buildroot}/usr/share/qemu/vgabios.bin -ln -s ../vgabios/VGABIOS-lgpl-latest.cirrus.bin %{buildroot}/usr/share/qemu/vgabios-cirrus.bin -ln -s ../bochs/BIOS-bochs-latest %{buildroot}/usr/share/qemu/bios.bin +ln -s ../vgabios/VGABIOS-lgpl-latest.bin %{buildroot}/%{_prefix}/share/qemu/vgabios.bin +ln -s ../vgabios/VGABIOS-lgpl-latest.cirrus.bin %{buildroot}/%{_prefix}/share/qemu/vgabios-cirrus.bin +ln -s ../bochs/BIOS-bochs-latest %{buildroot}/%{_prefix}/share/qemu/bios.bin + + %clean rm -rf $RPM_BUILD_ROOT @@ -344,8 +356,8 @@ %doc %{qemudocdir}/COPYING %doc %{qemudocdir}/COPYING.LIB %doc %{qemudocdir}/LICENSE +%{_prefix}/share/qemu/ %{_prefix}/share/qemu/keymaps/ -%{_prefix}/share/qemu/* %{_mandir}/man1/qemu.1* %{_mandir}/man8/qemu-nbd.8* %{_bindir}/qemu-nbd @@ -380,6 +392,10 @@ %ifarch %{ix86} x86_64 %{_bindir}/qemu-kvm %{_sysconfdir}/sysconfig/modules/kvm.modules +%{_prefix}/share/kvm/ +%{_prefix}/share/kvm/bios.bin +%{_prefix}/share/kvm/vgabios.bin +%{_prefix}/share/kvm/vgabios-cirrus.bin %files kvm-tools %defattr(-,root,root,-) %{_bindir}/kvmtrace @@ -422,8 +438,11 @@ %{_mandir}/man1/qemu-img.1* %changelog -* Fri Mar 06 2009 Glauber Costa - 2:0.10-0.5.kvm20090303git -- kvm.modules were being wrongly mentioned at %install. +* Tue Mar 10 2009 Glauber Costa - 2:0.10-0.5.kvm20090303git +- kvm.modules were being wrongly mentioned at %%install. +- update description for the x86 system package to include kvm support +- build kvm's own bios. It is still necessary while kvm uses a slightly different + irq routing mechanism * Thu Mar 05 2009 Glauber Costa - 2:0.10-0.4.kvm20090303git - seems Epoch does not go into the tags. So start back here. From orion at fedoraproject.org Tue Mar 10 21:12:55 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Tue, 10 Mar 2009 21:12:55 +0000 (UTC) Subject: rpms/ncl/F-10 ncl-5.0.0-atlas.patch,1.2,1.3 ncl.spec,1.10,1.11 Message-ID: <20090310211255.663897002E@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/ncl/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6464 Modified Files: ncl-5.0.0-atlas.patch ncl.spec Log Message: Work with atlas 3.6.0 ncl-5.0.0-atlas.patch: Index: ncl-5.0.0-atlas.patch =================================================================== RCS file: /cvs/pkgs/rpms/ncl/F-10/ncl-5.0.0-atlas.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ncl-5.0.0-atlas.patch 10 Mar 2009 15:58:20 -0000 1.2 +++ ncl-5.0.0-atlas.patch 10 Mar 2009 21:12:24 -0000 1.3 @@ -17,7 +17,7 @@ NCLAPILIB = _UseLib(-L$(NCLLIBSRC),-lnclapi) -BLASLIB = _UseLib(-L$(BLASSRC),-lblas_ncl) -LAPACKLIB = _UseLib(-L$(LAPACKSRC),-llapack_ncl) -+BLASLIB = _UseLib(-L%LIBDIR%/atlas,-lcblas -lf77blas -lptf77blas) ++BLASLIB = _UseLib(-L%LIBDIR%/atlas,-lcblas -lf77blas) +LAPACKLIB = _UseLib(-L%LIBDIR%/atlas,-llapack -latlas) SPHERELIB = _UseLib(-L$(SPHERESRC),-lsphere3.1_dp) FFTPACK5LIB = _UseLib(-L$(FFTPACK5SRC),-lfftpack5_dp) Index: ncl.spec =================================================================== RCS file: /cvs/pkgs/rpms/ncl/F-10/ncl.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ncl.spec 10 Mar 2009 20:23:17 -0000 1.10 +++ ncl.spec 10 Mar 2009 21:12:24 -0000 1.11 @@ -43,7 +43,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /bin/csh, gcc-gfortran, netcdf-devel, hdf-devel >= 4.2r2, libjpeg-devel -BuildRequires: g2clib-devel, libnc-dap-devel, librx-devel, atlas-sse2-devel +BuildRequires: g2clib-devel, libnc-dap-devel, librx-devel, atlas-devel # imake needed for makedepend BuildRequires: imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel BuildRequires: byacc, flex From s4504kr at fedoraproject.org Tue Mar 10 21:16:17 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Tue, 10 Mar 2009 21:16:17 +0000 (UTC) Subject: rpms/pdftk/devel Makefile, 1.2, 1.3 import.log, NONE, 1.1 pdftk-1.41-gcc44.patch, NONE, 1.1 pdftk-1.41-make.patch, NONE, 1.1 pdftk-use-internal-itext.patch, NONE, 1.1 pdftk.spec, 1.13, 1.14 sources, 1.4, 1.5 .cvsignore, 1.3, 1.4 dead.package, 1.1, NONE Message-ID: <20090310211617.AB9B97002E@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/pdftk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7330/devel Modified Files: .cvsignore Added Files: Makefile import.log pdftk-1.41-gcc44.patch pdftk-1.41-make.patch pdftk-use-internal-itext.patch pdftk.spec sources Removed Files: dead.package Log Message: Resurrecting pdftk Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 10 Mar 2009 21:15:46 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: pdftk +# $Id$ +NAME := pdftk +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) --- NEW FILE import.log --- pdftk-1_41-13_fc10:HEAD:pdftk-1.41-13.fc10.src.rpm:1236719570 pdftk-1.41-gcc44.patch: --- NEW FILE pdftk-1.41-gcc44.patch --- diff -up pdftk-1.41/pdftk/Makefile.RedHat.gcc44 pdftk-1.41/pdftk/Makefile.RedHat --- pdftk-1.41/pdftk/Makefile.RedHat.gcc44 2009-03-05 21:25:40.000000000 +0100 +++ pdftk-1.41/pdftk/Makefile.RedHat 2009-03-05 21:26:15.000000000 +0100 @@ -26,7 +26,7 @@ export RM= rm # if you want pdftk to ask before overwriting a file, set # ASK_ABOUT_WARNINGS to true; otherwise: false; override this default # with the dont_ask or do_ask command-line options -CPPFLAGS= ${RPM_OPT_FLAGS} -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -fdollars-in-identifiers -g -fpic +CPPFLAGS= ${CFLAGS} -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -fdollars-in-identifiers -g -fpic CXXFLAGS= -lgcj # itext compiler flags pdftk-1.41-make.patch: --- NEW FILE pdftk-1.41-make.patch --- diff -up pdftk-1.41/pdftk/Makefile.Base.conf pdftk-1.41/pdftk/Makefile.Base --- pdftk-1.41/pdftk/Makefile.Base.conf 2009-03-04 18:08:15.000000000 +0100 +++ pdftk-1.41/pdftk/Makefile.Base 2009-03-04 18:08:42.000000000 +0100 @@ -15,7 +15,7 @@ export java_libs_root= ../java_libs # them into fonts.a resulted in none of these resources appearing in pdftk # (on MinGW gcj 3.4.1) # -itext_libs=$(LIBDIR)/gcj/itext/itext-2.1.4.jar.so +itext_libs=$(LIBDIR)/gcj/itext/itext-${ITEXTVERS}.jar.so # font metric files, included as resources afms= $(wildcard $(java_libs_root)/com/lowagie/text/pdf/fonts/*.afm) pdftk-use-internal-itext.patch: --- NEW FILE pdftk-use-internal-itext.patch --- diff -r -u /tmp/pdftk-1.41/pdftk/attachments.cc ./pdftk/attachments.cc --- /tmp/pdftk-1.41/pdftk/attachments.cc 2004-10-27 02:57:44.000000000 +0100 +++ ./pdftk/attachments.cc 2009-02-12 15:38:08.000000000 +0000 @@ -51,7 +51,11 @@ #include "com/lowagie/text/Document.h" #include "com/lowagie/text/Rectangle.h" +// Ewww, PdfName has a field called NULL. +#undef NULL #include "com/lowagie/text/pdf/PdfName.h" +#define NULL __null + #include "com/lowagie/text/pdf/PdfString.h" #include "com/lowagie/text/pdf/PdfNumber.h" #include "com/lowagie/text/pdf/PdfArray.h" @@ -148,8 +152,8 @@ itext::Rectangle* crop_box_p= input_reader_p->getCropBox( m_input_attach_file_pagenum ); - float corner_top= crop_box_p->top()- margin; - float corner_left= crop_box_p->left()+ margin; + float corner_top= crop_box_p->getTop()- margin; + float corner_left= crop_box_p->getLeft()+ margin; itext::PdfArray* annots_p= (itext::PdfArray*) input_reader_p->getPdfObject( page_p->get( itext::PdfName::ANNOTS ) ); @@ -187,11 +191,11 @@ string filename= drop_path(*vit); // wrap our location over page bounds, if needed - if( crop_box_p->right() < corner_left+ trans ) { - corner_left= crop_box_p->left()+ margin; + if( crop_box_p->getRight() < corner_left+ trans ) { + corner_left= crop_box_p->getLeft()+ margin; } - if( corner_top- trans< crop_box_p->bottom() ) { - corner_top= crop_box_p->top()- margin; + if( corner_top- trans< crop_box_p->getBottom() ) { + corner_top= crop_box_p->getTop()- margin; } itext::Rectangle* annot_bbox_p= diff -r -u /tmp/pdftk-1.41/pdftk/Makefile.Base ./pdftk/Makefile.Base --- /tmp/pdftk-1.41/pdftk/Makefile.Base 2006-10-25 00:44:06.000000000 +0100 +++ ./pdftk/Makefile.Base 2009-02-12 13:40:04.000000000 +0000 @@ -15,34 +15,12 @@ # them into fonts.a resulted in none of these resources appearing in pdftk # (on MinGW gcj 3.4.1) # -itext_libs= \ -$(java_libs_root)/com/lowagie/text/pdf/pdf.a \ -$(java_libs_root)/com/lowagie/text/text.a \ -$(java_libs_root)/com/lowagie/text/pdf/pdf.a \ -$(java_libs_root)/com/lowagie/text/pdf/codec/codec.a \ -$(java_libs_root)/com/lowagie/text/pdf/codec/wmf/wmf.a \ -$(java_libs_root)/com/lowagie/text/pdf/fonts/fonts.a \ -$(java_libs_root)/com/lowagie/text/markup/markup.a \ -$(java_libs_root)/com/lowagie/text/xml/xmp/xmp.a \ -$(java_libs_root)/com/lowagie/bc/asn1/asn1.a \ -$(java_libs_root)/com/lowagie/text/pdf/codec/postscript/postscript.a \ +itext_libs=$(LIBDIR)/gcj/itext/itext-2.1.4.jar.so # font metric files, included as resources afms= $(wildcard $(java_libs_root)/com/lowagie/text/pdf/fonts/*.afm) afm_objects= $(patsubst %.afm, %.o, $(afms)) -# older versions of libgcj might not have the MD5 algorithm, -# so I added it here; these *_local java files were grabbed from -# libgcj CVS on March 7, 2004; diffed September 5, 2006 w/ gcc 4.1.1 -# -# gnu/gcj/convert/Input_UnicodeBig.java was grabbed March 26, 2004; diffed September 5, 2006 w/ gcc 4.1.1 -# -libgcj_local_libs = \ -$(java_libs_root)/java_local/security/security.a \ -$(java_libs_root)/gnu_local/java/security/provider/provider.a \ -$(java_libs_root)/gnu_local/java/security/security.a \ -$(java_libs_root)/gnu/gcj/convert/convert.a - # this must already be set according to your platform Makefile; # we're just appending to it, here # @@ -51,19 +29,18 @@ all : java_libs pdftk java_libs : - $(MAKE) -C $(java_libs_root) -attachments.o : attachments.cc attachments.h pdftk.h $(itext_libs) $(libgcj_local_libs) +attachments.o : attachments.cc attachments.h pdftk.h $(itext_libs) $(CXX) attachments.cc -I$(java_libs_root) $(CPPFLAGS) -c -report.o : report.cc report.h pdftk.h $(itext_libs) $(libgcj_local_libs) +report.o : report.cc report.h pdftk.h $(itext_libs) $(CXX) report.cc -I$(java_libs_root) $(CPPFLAGS) -c -pdftk.o : pdftk.cc pdftk.h attachments.h report.h $(itext_libs) $(libgcj_local_libs) +pdftk.o : pdftk.cc pdftk.h attachments.h report.h $(itext_libs) $(CXX) pdftk.cc -I$(java_libs_root) $(CPPFLAGS) -c -pdftk : pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects) - $(CXX) pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects) -I$(java_libs_root) $(CPPFLAGS) $(CXXFLAGS) -o pdftk +pdftk : pdftk.o attachments.o report.o $(itext_libs) $(afm_objects) + $(CXX) pdftk.o attachments.o report.o $(itext_libs) $(afm_objects) -I$(java_libs_root) $(CPPFLAGS) $(CXXFLAGS) -o pdftk install: /usr/bin/install pdftk /usr/local/bin diff -r -u /tmp/pdftk-1.41/pdftk/Makefile.RedHat ./pdftk/Makefile.RedHat --- /tmp/pdftk-1.41/pdftk/Makefile.RedHat 2006-09-21 18:37:38.000000000 +0100 +++ ./pdftk/Makefile.RedHat 2009-02-12 12:18:43.000000000 +0000 @@ -26,12 +26,12 @@ # if you want pdftk to ask before overwriting a file, set # ASK_ABOUT_WARNINGS to true; otherwise: false; override this default # with the dont_ask or do_ask command-line options -CPPFLAGS= -O2 -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -fdollars-in-identifiers +CPPFLAGS= ${RPM_OPT_FLAGS} -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -fdollars-in-identifiers -g -fpic CXXFLAGS= -lgcj # itext compiler flags # -O3 might cause pdftk to segfault on cat operation (gcc 3.4.4) -export GCJFLAGS= -O2 +export GCJFLAGS= ${RPM_OPT_FLAGS} # export ARFLAGS= rs diff -r -u /tmp/pdftk-1.41/pdftk/pdftk.cc ./pdftk/pdftk.cc --- /tmp/pdftk-1.41/pdftk/pdftk.cc 2006-11-28 22:51:36.000000000 +0000 +++ ./pdftk/pdftk.cc 2009-02-12 16:28:33.000000000 +0000 @@ -50,7 +50,12 @@ #include "com/lowagie/text/Document.h" #include "com/lowagie/text/Rectangle.h" + +// Ewww, PdfName has a field called NULL. +#undef NULL #include "com/lowagie/text/pdf/PdfName.h" +#define NULL __null + #include "com/lowagie/text/pdf/PdfString.h" #include "com/lowagie/text/pdf/PdfNumber.h" #include "com/lowagie/text/pdf/PdfArray.h" @@ -191,7 +196,8 @@ // store in this java object so the gc can trace it g_dont_collect_p->addElement( reader ); - input_pdf_p->m_authorized_b= ( !reader->encrypted || reader->passwordIsOwner ); + input_pdf_p->m_authorized_b= ( !reader->encrypted // || reader->passwordIsOwner + ); if( !input_pdf_p->m_authorized_b ) { open_success_b= false; } @@ -203,6 +209,7 @@ open_success_b= false; } catch( java::lang::Throwable* t_p ) { // unexpected error + t_p->printStackTrace(); cerr << "Error: Unexpected Exception in open_reader()" << endl; open_success_b= false; @@ -2017,14 +2024,14 @@ output_doc_p->addCreator( jv_creator_p ); // un/compress output streams? - if( m_output_uncompress_b ) { - writer_p->filterStreams= true; - writer_p->compressStreams= false; - } - else if( m_output_compress_b ) { - writer_p->filterStreams= false; - writer_p->compressStreams= true; - } +// if( m_output_uncompress_b ) { +// writer_p->filterStreams= true; +// writer_p->compressStreams= false; +// } +// else if( m_output_compress_b ) { +// writer_p->filterStreams= false; +// writer_p->compressStreams= true; +// } // encrypt output? if( m_output_encryption_strength!= none_enc || @@ -2033,7 +2040,7 @@ { // if no stregth is given, default to 128 bit, // (which is incompatible w/ Acrobat 4) - bool bit128_b= + jboolean bit128_b= ( m_output_encryption_strength!= bits40_enc ); writer_p->setEncryption( output_user_pw_p, @@ -2057,7 +2064,8 @@ input_reader_p->getPdfObject( trailer_p->get( itext::PdfName::ID ) ); if( file_id_p && file_id_p->isArray() ) { - writer_p->setFileID( file_id_p ); + // Absent from itext-2.1.4 +// writer_p->setFileID( file_id_p ); } } @@ -2168,12 +2176,14 @@ // un/compress output streams? if( m_output_uncompress_b ) { - writer_p->filterStreams= true; - writer_p->compressStreams= false; + // Absent from itext-2.1.4 +// writer_p->filterStreams= true; +// writer_p->compressStreams= false; } else if( m_output_compress_b ) { - writer_p->filterStreams= false; - writer_p->compressStreams= true; + // Absent from itext-2.1.4 +// writer_p->filterStreams= false; +// writer_p->compressStreams= true; } // encrypt output? @@ -2183,7 +2193,7 @@ { // if no stregth is given, default to 128 bit, // (which is incompatible w/ Acrobat 4) - bool bit128_b= + jboolean bit128_b= ( m_output_encryption_strength!= bits40_enc ); writer_p->setEncryption( output_user_pw_p, @@ -2403,13 +2413,15 @@ // un/compress output streams? if( m_output_uncompress_b ) { add_marks_to_pages( input_reader_p ); - writer_p->filterStreams= true; - writer_p->compressStreams= false; + // Absent from itext-2.1.4 +// writer_p->filterStreams= true; +// writer_p->compressStreams= false; } else if( m_output_compress_b ) { remove_marks_from_pages( input_reader_p ); - writer_p->filterStreams= false; - writer_p->compressStreams= true; + // Absent from itext-2.1.4 +// writer_p->filterStreams= false; +// writer_p->compressStreams= true; } // encrypt output? @@ -2420,13 +2432,13 @@ // if no stregth is given, default to 128 bit, // (which is incompatible w/ Acrobat 4) - bool bit128_b= + jboolean bit128_b= ( m_output_encryption_strength!= bits40_enc ); writer_p->setEncryption( output_user_pw_p, output_owner_pw_p, m_output_user_perms, - bit128_b ); + bit128_b ); } // fill form fields? @@ -2435,8 +2447,11 @@ { itext::AcroFields* fields_p= writer_p->getAcroFields(); fields_p->setGenerateAppearances( true ); // have iText create field appearances - if( fdf_reader_p && fields_p->setFields( fdf_reader_p ) || - xfdf_reader_p && fields_p->setFields( xfdf_reader_p ) ) + if( fdf_reader_p ) + fields_p->setFields( fdf_reader_p ); + if( xfdf_reader_p ) + fields_p->setFields( xfdf_reader_p ); + { // Rich Text input found // set the PDF so that Acrobat will create appearances; @@ -2486,16 +2501,16 @@ doc_page_size_p= doc_page_size_p->rotate(); } - jfloat h_scale= doc_page_size_p->width() / mark_page_size_p->width(); - jfloat v_scale= doc_page_size_p->height() / mark_page_size_p->height(); + jfloat h_scale= doc_page_size_p->getWidth() / mark_page_size_p->getWidth(); + jfloat v_scale= doc_page_size_p->getHeight() / mark_page_size_p->getHeight(); jfloat mark_scale= (h_scale< v_scale) ? h_scale : v_scale; - jfloat h_trans= (jfloat)(doc_page_size_p->left()- mark_page_size_p->left()* mark_scale + - (doc_page_size_p->width()- - mark_page_size_p->width()* mark_scale) / 2.0); - jfloat v_trans= (jfloat)(doc_page_size_p->bottom()- mark_page_size_p->bottom()* mark_scale + - (doc_page_size_p->height()- - mark_page_size_p->height()* mark_scale) / 2.0); + jfloat h_trans= (jfloat)(doc_page_size_p->getLeft()- mark_page_size_p->getLeft()* mark_scale + + (doc_page_size_p->getWidth()- + mark_page_size_p->getWidth()* mark_scale) / 2.0); + jfloat v_trans= (jfloat)(doc_page_size_p->getBottom()- mark_page_size_p->getBottom()* mark_scale + + (doc_page_size_p->getHeight()- + mark_page_size_p->getHeight()* mark_scale) / 2.0); com::lowagie::text::pdf::PdfContentByte* content_byte_p= ( background_b ) ? writer_p->getUnderContent( ii ) : writer_p->getOverContent( ii ); @@ -2512,20 +2527,20 @@ 0, -1* mark_scale, mark_scale, 0, h_trans, - v_trans+ mark_page_size_p->height()* mark_scale ); + v_trans+ mark_page_size_p->getHeight()* mark_scale ); } else if( mark_page_rotation== 180 ) { content_byte_p->addTemplate( mark_page_p, -1* mark_scale, 0, 0, -1* mark_scale, - h_trans+ mark_page_size_p->width()* mark_scale, - v_trans+ mark_page_size_p->height()* mark_scale ); + h_trans+ mark_page_size_p->getWidth()* mark_scale, + v_trans+ mark_page_size_p->getHeight()* mark_scale ); } else if( mark_page_rotation== 270 ) { content_byte_p->addTemplate( mark_page_p, 0, mark_scale, -1* mark_scale, 0, - h_trans+ mark_page_size_p->width()* mark_scale, v_trans ); + h_trans+ mark_page_size_p->getWidth()* mark_scale, v_trans ); } } } @@ -2537,7 +2552,7 @@ } // done; write output - writer_p->close(); + writer_p->close(NULL); } break; @@ -2663,15 +2678,15 @@ JvCreateJavaVM(NULL); JvAttachCurrentThread(NULL, NULL); - JvInitClass(&java::System::class$); - JvInitClass(&java::util::ArrayList::class$); - JvInitClass(&java::util::Iterator::class$); - - JvInitClass(&itext::PdfObject::class$); - JvInitClass(&itext::PdfName::class$); - JvInitClass(&itext::PdfDictionary::class$); - JvInitClass(&itext::PdfOutline::class$); - JvInitClass(&itext::PdfBoolean::class$); +// JvInitClass(&java::System::class$); +// JvInitClass(&java::util::ArrayList::class$); +// JvInitClass(&java::util::Iterator::class$); + +// JvInitClass(&itext::PdfObject::class$); +// JvInitClass(&itext::PdfName::class$); +// JvInitClass(&itext::PdfDictionary::class$); +// JvInitClass(&itext::PdfOutline::class$); +// JvInitClass(&itext::PdfBoolean::class$); TK_Session tk_session( argc, argv ); diff -r -u /tmp/pdftk-1.41/pdftk/report.cc ./pdftk/report.cc --- /tmp/pdftk-1.41/pdftk/report.cc 2006-09-06 00:49:32.000000000 +0100 +++ ./pdftk/report.cc 2009-02-12 15:42:56.000000000 +0000 @@ -50,8 +50,13 @@ #include "com/lowagie/text/Document.h" #include "com/lowagie/text/Rectangle.h" +#undef NULL + +// Ewww, PdfName has a field called NULL. #include "com/lowagie/text/pdf/PdfObject.h" #include "com/lowagie/text/pdf/PdfName.h" +#define NULL __null + #include "com/lowagie/text/pdf/PdfString.h" #include "com/lowagie/text/pdf/PdfNumber.h" #include "com/lowagie/text/pdf/PdfArray.h" @@ -1315,11 +1320,12 @@ if( xmp_str_p ) { xmp_str_p->put( itext::PdfName::TYPE, itext::PdfName::METADATA ); xmp_str_p->put( itext::PdfName::SUBTYPE, itext::PdfName::XML ); - - itext::PdfIndirectReference* xmp_str_ref_p= - (itext::PdfIndirectReference*)reader_p->getPRIndirectReference( xmp_str_p ); - catalog_p->put( itext::PdfName::METADATA, xmp_str_ref_p ); +// FIXME: PdfReader.getPRIndirectReference is absent from itext-2.1.4 +// itext::PdfIndirectReference* xmp_str_ref_p= +// (itext::PdfIndirectReference*)reader_p->getPRIndirectReference( xmp_str_p ); + +// catalog_p->put( itext::PdfName::METADATA, xmp_str_ref_p ); } else { ret_val_b= false; Index: pdftk.spec =================================================================== RCS file: pdftk.spec diff -N pdftk.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pdftk.spec 10 Mar 2009 21:15:47 -0000 1.14 @@ -0,0 +1,150 @@ +%define itextvers 2.1.5 + +Summary: The PDF Tool Kit +Name: pdftk +Version: 1.41 +Release: 13%{?dist} +License: GPLv2+ +URL: http://www.pdfhacks.com/pdftk/ +# Remove java-lib/com because it's contains licensing issue +Source0: http://www.pdfhacks.com/pdftk/%{name}-%{version}-noitext.tar.bz2 +Patch0: pdftk-use-internal-itext.patch +Patch1: pdftk-1.41-make.patch +Patch2: pdftk-1.41-gcc44.patch +Group: Applications/Publishing +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gcc-java +BuildRequires: libgcj-devel +BuildRequires: java-devel >= 1:1.6.0 + +# Requires itext-2.1.4-3 +BuildRequires: itext >= %{itextvers} + +%description +If PDF is electronic paper, then pdftk is an electronic staple-remover, +hole-punch, binder, secret-decoder-ring, and X-Ray-glasses. Pdftk is a simple +tool for doing everyday things with PDF documents. Keep one in the top drawer +of your desktop and use it to: + + * Merge PDF Documents + * Split PDF Pages into a New Document + * Decrypt Input as Necessary (Password Required) + * Encrypt Output as Desired + * Burst a PDF Document into Single Pages + * Report on PDF Metrics, including Metadata and Bookmarks + * Uncompress and Re-Compress Page Streams + * Repair Corrupted PDF (Where Possible) + +Pdftk is also an example of how to use a library of Java classes in a +stand-alone C++ program. Specifically, it demonstrates how GCJ and CNI allow +C++ code to use iText's (itext-paulo) Java classes. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +rm -rf java_libs + +%build +# Requires as a workaround for gcc BZ #39380 +export CFLAGS="${RPM_OPT_FLAGS} -O0" +jar tf %{_javadir}/itext-%{itextvers}.jar | grep '\.class$' | sed 's/\.class//' | sed 's|/|\.|g' > classes + gjavah -d java_libs -cni -classpath=%{_javadir}/itext-%{itextvers}.jar \ + `cat classes` + cd pdftk + make -f Makefile.RedHat LIBDIR=%{_libdir} %{?_smp_mflags} ITEXTVERS="%{itextvers}" + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/%{_bindir} +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 +install -m 0755 pdftk/pdftk $RPM_BUILD_ROOT/%{_bindir}/pdftk +install -m 0644 debian/pdftk.1 $RPM_BUILD_ROOT/%{_mandir}/man1/pdftk.1 +# Fix the weird dependency, e.g. +# /usr/lib64/gcj/itext/itext-x.y.z.jar.so()(64bit) to +# /usr/lib64/gcj/itext/itext-x.y.z.jar.so +%define _use_internal_dependency_generator 0 +cat << \EOF > %{name}.req +#!%{_buildshell} +grep -v %{_docdir} - | %{__find_requires} $* \ + | sed 's@\(itext-[0-9.]*\.jar\.so\)\(()(64bit)\)\?@\1@' +EOF + +%define __find_requires %{_builddir}/%{name}-%{version}/%{name}.req +chmod +x %{__find_requires} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc pdftk.1.html pdftk.1.txt +%{_bindir}/* +%{_mandir}/man1/* + +%changelog +* Tue Mar 10 2009 Jochen Schmitt 1.41-13 +- Move to iText-2.1.5 + +* Thu Mar 5 2009 Jochen Schmitt 1.41-12 +- Make sure, the -O0 will be used by the Makefile + +* Thu Mar 5 2009 Jochen Schmitt 1.41-11 +- substitute %%{_datadir}/java into %%{_javadir} in build stanza + +* Thu Mar 5 2009 Jochen Schmitt 1.41-10 +- Use -O0 as a workaround for a gcc bug + +* Sun Mar 1 2009 Jochen Schmitt 1.41-9 +- Remove license text +- Fix Dependencies +- fix Tab/Space + +* Thu Feb 19 2009 Jochen Schmitt 1.41-8 +- Add BR and Req. to itext-2.1.4-3 + +* Sun Feb 15 2009 Jochen Schmitt 1.41-7 +- Build pdftk agains system iText library + +* Sun Jan 25 2009 Jochen Schmitt 1.41-6 +- Fix license tag + +* Wed Apr 11 2007 Thomas Fitzsimmons 1.41-5 +- Build against system libgcj. +- Patch build for new gcjh. +- Resolves: rhbz#233682 rhbz#233489 rhbz#233514 + +* Wed Feb 28 2007 Jochen Schmitt 1.41-4 +- Rebuild to solve broken deps + +* Mon Feb 26 2007 Jochen Schmitt 1.41-3 +- Use $$RPM_OPT_FLAGS (#228945) + +* Wed Nov 29 2006 Jochen Schmitt 1.41-2 +- New upstream release + +* Sun Sep 3 2006 Jochen Schmitt 1.12-8 +- Rebuild for FC-6 + +* Mon Jul 31 2006 Jochen Schmitt 1.12-7 +- Rebuild + +* Sun Feb 12 2006 Jochen Schmitt 1.12-6 +- Rebuild for FC5 + +* Thu Dec 15 2005 Jochen Schmitt 1.12-5 +- Rebuild +- Remove strange '//SID' comment. + +* Sun Jul 31 2005 Jochen Schmitt 1.12-3 +- Add literal GPL text as Source1 + +* Wed Jul 27 2005 Jochen Schmitt 1.12-2 +- Don't compress man page +- Remove pdftk.1.notes +- Add COPYRIGHT from debian/copyright + +* Tue Jul 26 2005 Jochen Schmitt 1.12-1 +- Initial RPM release Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 10 Mar 2009 21:15:47 -0000 1.5 @@ -0,0 +1 @@ +5da5c9387bdcc683eecdc54ea358c2e7 pdftk-1.41-noitext.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pdftk/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Nov 2006 21:39:30 -0000 1.3 +++ .cvsignore 10 Mar 2009 21:15:46 -0000 1.4 @@ -1 +1 @@ -pdftk-1.41.tar.bz2 +pdftk-1.41-noitext.tar.bz2 --- dead.package DELETED --- From konradm at fedoraproject.org Tue Mar 10 21:20:16 2009 From: konradm at fedoraproject.org (Conrad Meyer) Date: Tue, 10 Mar 2009 21:20:16 +0000 (UTC) Subject: rpms/flint/devel flint-1.2.0-add-soname.diff, NONE, 1.1 flint-1.2.0-add-static-lib.diff, NONE, 1.1 flint.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310212016.10FB670132@cvs1.fedora.phx.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/flint/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8653/devel Modified Files: .cvsignore sources Added Files: flint-1.2.0-add-soname.diff flint-1.2.0-add-static-lib.diff flint.spec import.log Log Message: Import. flint-1.2.0-add-soname.diff: --- NEW FILE flint-1.2.0-add-soname.diff --- --- makefile.orig 2009-03-10 14:11:01.000000000 -0700 +++ makefile 2009-03-10 14:13:17.000000000 -0700 @@ -140,7 +140,7 @@ $(CC) -fPIC -shared -o libflint.dll $(FLINTOBJ) $(LIBS) libflint.so: $(FLINTOBJ) - $(CC) -fPIC -shared -o libflint.so $(FLINTOBJ) $(LIBS) + $(CC) -fPIC -shared -Wl,-soname,libflint.so.0 -o libflint.so.0 $(FLINTOBJ) $(LIBS) ##### zn_poly object files flint-1.2.0-add-static-lib.diff: --- NEW FILE flint-1.2.0-add-static-lib.diff --- --- makefile.orig 2009-03-10 14:14:30.000000000 -0700 +++ makefile 2009-03-10 14:15:25.000000000 -0700 @@ -142,6 +142,9 @@ libflint.so: $(FLINTOBJ) $(CC) -fPIC -shared -Wl,-soname,libflint.so.0 -o libflint.so.0 $(FLINTOBJ) $(LIBS) +libflint.a: $(FLINTOBJ) + $(AR) rcs libflint.a $(FLINTOBJ) + ##### zn_poly object files zn_mod.o: zn_poly/zn_mod.c $(HEADERS) --- NEW FILE flint.spec --- Name: flint Version: 1.2.0 Release: 1%{?dist} Summary: Fast Library for Number Theory Group: Applications/Engineering License: GPLv2+ URL: http://www.flintlib.org/ Source0: http://www.flintlib.org/flint-%{version}.tar.gz # Add a soname for the shared library Patch0: flint-1.2.0-add-soname.diff # Build a static lib (since upstream doesn't keep track of compatible # interfaces a soname really makes no sense Patch1: flint-1.2.0-add-static-lib.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gmp-devel %description FLINT is a C library for doing number theory, written by William Hart and David Harvey. %package devel Summary: Development files for FLINT Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %package static Summary: Static libraries for FLINT Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} %description static The %{name}-static package contains static libraries for developing applications that use %{name}. %prep %setup -q sed -i -e 's|^LIBDIR=.*$|LIBDIR=%{_libdir}|' makefile sed -i -e 's|^INCLUDEDIR=.*$|INCLUDEDIR=%{_includedir}|' makefile sed -i -e 's|^DOCDIR=.*$|DOCDIR=%{_docdir}|' makefile sed -i -e 's|^CFLAGS =.*$|CFLAGS = $(INCS) %{optflags} -lgmp|' makefile %patch0 %patch1 %build make %{?_smp_mflags} MAKECMDGOALS=library make libflint.so make libflint.a %install rm -rf $RPM_BUILD_ROOT # generated in build: mpQS libflint.so libflint.a install -d -m 755 $RPM_BUILD_ROOT%{_libdir} install -p -m 644 libflint.a $RPM_BUILD_ROOT%{_libdir}/ install -d -m 755 $RPM_BUILD_ROOT%{_bindir} install -p -m 755 mpQS $RPM_BUILD_ROOT%{_bindir}/ # install the headers somehow... install -d -m 755 $RPM_BUILD_ROOT%{_includedir}/%{name} for header in *.h; do install -p -m 644 $header $RPM_BUILD_ROOT%{_includedir}/%{name}/ done install -p -m 755 libflint.so.0 $RPM_BUILD_ROOT%{_libdir}/ pushd $RPM_BUILD_ROOT%{_libdir}/ ln -s libflint.so.0 libflint.so popd %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc doc/%{name}-%{version}.pdf %{_bindir}/mpQS %{_libdir}/libflint.so.0 %files devel %defattr(-,root,root,-) %{_includedir}/flint %{_libdir}/libflint.so %files static %defattr(-,root,root,-) %{_libdir}/libflint.a %changelog * Tue Mar 10 2009 Conrad Meyer - 1.2.0-1 - Bump to 1.2.0. * Fri Mar 6 2009 Conrad Meyer - 1.0.21-1 - Bump to 1.0.21. - Build static subpackage. * Sat Dec 6 2008 Conrad Meyer - 1.0.18-1 - Bump to 1.0.18. - Patches apply with --fuzz=0. * Sat Nov 29 2008 Conrad Meyer - 1.0.17-1 - Initial package. --- NEW FILE import.log --- flint-1_2_0-1_fc10:HEAD:flint-1.2.0-1.fc10.src.rpm:1236719838 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flint/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:23:24 -0000 1.1 +++ .cvsignore 10 Mar 2009 21:19:45 -0000 1.2 @@ -0,0 +1 @@ +flint-1.2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flint/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:23:24 -0000 1.1 +++ sources 10 Mar 2009 21:19:45 -0000 1.2 @@ -0,0 +1 @@ +cddaf72170489f7fa29816f62da7e54c flint-1.2.0.tar.gz From jasper at fedoraproject.org Tue Mar 10 21:23:11 2009 From: jasper at fedoraproject.org (Jasper Capel) Date: Tue, 10 Mar 2009 21:23:11 +0000 (UTC) Subject: rpms/python-mwlib/EL-5 mwlib-setuptools.patch, NONE, 1.1 python-mwlib.spec, 1.10, 1.11 Message-ID: <20090310212311.5D6A67002E@cvs1.fedora.phx.redhat.com> Author: jasper Update of /cvs/pkgs/rpms/python-mwlib/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9946 Modified Files: python-mwlib.spec Added Files: mwlib-setuptools.patch Log Message: 0.9.10-3 mwlib-setuptools.patch: --- NEW FILE mwlib-setuptools.patch --- commit a9524d04052e43a0c437ffc6002f4751158f554a Author: Jasper Capel Date: Tue Mar 3 14:31:21 2009 +0100 Require lower setuptools version diff --git a/ez_setup.py b/ez_setup.py index 89cf056..cdbbb30 100755 --- a/ez_setup.py +++ b/ez_setup.py @@ -14,7 +14,7 @@ the appropriate options to ``use_setuptools()``. This file can also be run as a script to install or upgrade setuptools. """ import sys -DEFAULT_VERSION = "0.6c8" +DEFAULT_VERSION = "0.6c5" DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3] md5_data = { Index: python-mwlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-mwlib/EL-5/python-mwlib.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- python-mwlib.spec 26 Feb 2009 22:28:29 -0000 1.10 +++ python-mwlib.spec 10 Mar 2009 21:22:40 -0000 1.11 @@ -2,7 +2,7 @@ Name: python-mwlib Version: 0.9.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MediaWiki conversion library for Python Group: Development/Languages @@ -11,11 +11,16 @@ URL: http://code.pediapress.com/ Source0: http://pypi.python.org/packages/source/m/mwlib/mwlib-%{version}.tar.gz Patch0: mwlib.patch +Patch1: mwlib-setuptools.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel re2c python-docutils python-flup odfpy pyparsing python-simplejson python-setuptools Requires: perl python-imaging python-flup pyparsing odfpy python-simplejson +#if 0%{?rhel} < 6 +Requires: tetex-latex +#else Requires: tex(latex) +#endif %description @@ -54,6 +59,9 @@ %changelog +* Tue Mar 10 2009 Jasper Capel - 0.9.10-3 +- Patched to build on EPEL-5 + * Thu Feb 26 2009 Fedora Release Engineering - 0.9.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pbrobinson at fedoraproject.org Tue Mar 10 21:31:22 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Tue, 10 Mar 2009 21:31:22 +0000 (UTC) Subject: rpms/gupnp-vala/devel gupnp-vala.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310213122.E8A7E7002E@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gupnp-vala/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11950/devel Modified Files: .cvsignore sources Added Files: gupnp-vala.spec import.log Log Message: - Initial import --- NEW FILE gupnp-vala.spec --- Name: gupnp-vala Version: 0.5.3 Release: 2%{?dist} Summary: GUPnP is a upnp framework. This adds vala language bindings Group: Development/Languages License: LGPLv2+ URL: http://www.gupnp.org/ Source0: http://www.gupnp.org/sources/bindings/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: vala-devel >= 0.5.7 BuildRequires: vala-tools >= 0.5.7 BuildRequires: gssdp-devel >= 0.6.4 BuildRequires: gupnp-devel >= 0.12.6 BuildRequires: gupnp-av-devel BuildRequires: gupnp-ui-devel BuildRequires: libsoup-devel Requires: pkgconfig Requires: vala >= 0.5.7 %description GUPnP is an object-oriented open source framework for creating UPnP devices and control points, written in C using GObject and libsoup. The GUPnP API is intended to be easy to use, efficient and flexible. This package adds vala language bindings %prep %setup -q %build # The generated files are noarch, but configure need to be told the # real host alias for building %configure --target=%{_host_alias} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %check make check %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING # Exclude as file is empty %exclude %{_datadir}/vala/vapi/gssdp-1.0.deps %{_datadir}/vala/vapi/gssdp-1.0.vapi %{_datadir}/vala/vapi/gupnp-1.0.deps %{_datadir}/vala/vapi/gupnp-1.0.vapi %{_datadir}/vala/vapi/gupnp-av-1.0.deps %{_datadir}/vala/vapi/gupnp-av-1.0.vapi %{_datadir}/vala/vapi/gupnp-ui-1.0.deps %{_datadir}/vala/vapi/gupnp-ui-1.0.vapi %{_libdir}/pkgconfig/gupnp-vala-1.0.pc %changelog * Tue Mar 10 2009 Peter Robinson 0.5.3-2 - Patch for noarch and some reqs thanks to Michel Salim * Wed Feb 25 2009 Peter Robinson 0.5.3-1 - New upstream version, review request fixes, update spec for new version * Wed Jan 14 2009 Peter Robinson 0.5-1 - New upstream version * Wed Dec 31 2008 Peter Robinson 0.4-1 - Update to new version to fix compile with newer vala and gupnp releases * Wed Jul 9 2008 Peter Robinson 0.2-2 - Fixed dep on vala-tools * Wed Jul 9 2008 Peter Robinson 0.2-1 - Initial release --- NEW FILE import.log --- gupnp-vala-0_5_3-2_fc10:HEAD:gupnp-vala-0.5.3-2.fc10.src.rpm:1236720599 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gupnp-vala/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:19:00 -0000 1.1 +++ .cvsignore 10 Mar 2009 21:30:52 -0000 1.2 @@ -0,0 +1 @@ +gupnp-vala-0.5.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gupnp-vala/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:19:00 -0000 1.1 +++ sources 10 Mar 2009 21:30:52 -0000 1.2 @@ -0,0 +1 @@ +34d95c3dddfc699bc560bbe9088839bf gupnp-vala-0.5.3.tar.gz From konradm at fedoraproject.org Tue Mar 10 21:32:18 2009 From: konradm at fedoraproject.org (Conrad Meyer) Date: Tue, 10 Mar 2009 21:32:18 +0000 (UTC) Subject: rpms/flint/F-10 flint-1.2.0-add-soname.diff, NONE, 1.1 flint-1.2.0-add-static-lib.diff, NONE, 1.1 flint.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310213218.9666E7002E@cvs1.fedora.phx.redhat.com> Author: konradm Update of /cvs/pkgs/rpms/flint/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12334 Modified Files: .cvsignore sources Added Files: flint-1.2.0-add-soname.diff flint-1.2.0-add-static-lib.diff flint.spec Log Message: * Tue Mar 10 2009 Conrad Meyer - 1.2.0-1 - Bump to 1.2.0. flint-1.2.0-add-soname.diff: --- NEW FILE flint-1.2.0-add-soname.diff --- --- makefile.orig 2009-03-10 14:11:01.000000000 -0700 +++ makefile 2009-03-10 14:13:17.000000000 -0700 @@ -140,7 +140,7 @@ $(CC) -fPIC -shared -o libflint.dll $(FLINTOBJ) $(LIBS) libflint.so: $(FLINTOBJ) - $(CC) -fPIC -shared -o libflint.so $(FLINTOBJ) $(LIBS) + $(CC) -fPIC -shared -Wl,-soname,libflint.so.0 -o libflint.so.0 $(FLINTOBJ) $(LIBS) ##### zn_poly object files flint-1.2.0-add-static-lib.diff: --- NEW FILE flint-1.2.0-add-static-lib.diff --- --- makefile.orig 2009-03-10 14:14:30.000000000 -0700 +++ makefile 2009-03-10 14:15:25.000000000 -0700 @@ -142,6 +142,9 @@ libflint.so: $(FLINTOBJ) $(CC) -fPIC -shared -Wl,-soname,libflint.so.0 -o libflint.so.0 $(FLINTOBJ) $(LIBS) +libflint.a: $(FLINTOBJ) + $(AR) rcs libflint.a $(FLINTOBJ) + ##### zn_poly object files zn_mod.o: zn_poly/zn_mod.c $(HEADERS) --- NEW FILE flint.spec --- Name: flint Version: 1.2.0 Release: 1%{?dist} Summary: Fast Library for Number Theory Group: Applications/Engineering License: GPLv2+ URL: http://www.flintlib.org/ Source0: http://www.flintlib.org/flint-%{version}.tar.gz # Add a soname for the shared library Patch0: flint-1.2.0-add-soname.diff # Build a static lib (since upstream doesn't keep track of compatible # interfaces a soname really makes no sense Patch1: flint-1.2.0-add-static-lib.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gmp-devel %description FLINT is a C library for doing number theory, written by William Hart and David Harvey. %package devel Summary: Development files for FLINT Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %package static Summary: Static libraries for FLINT Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} %description static The %{name}-static package contains static libraries for developing applications that use %{name}. %prep %setup -q sed -i -e 's|^LIBDIR=.*$|LIBDIR=%{_libdir}|' makefile sed -i -e 's|^INCLUDEDIR=.*$|INCLUDEDIR=%{_includedir}|' makefile sed -i -e 's|^DOCDIR=.*$|DOCDIR=%{_docdir}|' makefile sed -i -e 's|^CFLAGS =.*$|CFLAGS = $(INCS) %{optflags} -lgmp|' makefile %patch0 %patch1 %build make %{?_smp_mflags} MAKECMDGOALS=library make libflint.so make libflint.a %install rm -rf $RPM_BUILD_ROOT # generated in build: mpQS libflint.so libflint.a install -d -m 755 $RPM_BUILD_ROOT%{_libdir} install -p -m 644 libflint.a $RPM_BUILD_ROOT%{_libdir}/ install -d -m 755 $RPM_BUILD_ROOT%{_bindir} install -p -m 755 mpQS $RPM_BUILD_ROOT%{_bindir}/ # install the headers somehow... install -d -m 755 $RPM_BUILD_ROOT%{_includedir}/%{name} for header in *.h; do install -p -m 644 $header $RPM_BUILD_ROOT%{_includedir}/%{name}/ done install -p -m 755 libflint.so.0 $RPM_BUILD_ROOT%{_libdir}/ pushd $RPM_BUILD_ROOT%{_libdir}/ ln -s libflint.so.0 libflint.so popd %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc doc/%{name}-%{version}.pdf %{_bindir}/mpQS %{_libdir}/libflint.so.0 %files devel %defattr(-,root,root,-) %{_includedir}/flint %{_libdir}/libflint.so %files static %defattr(-,root,root,-) %{_libdir}/libflint.a %changelog * Tue Mar 10 2009 Conrad Meyer - 1.2.0-1 - Bump to 1.2.0. * Fri Mar 6 2009 Conrad Meyer - 1.0.21-1 - Bump to 1.0.21. - Build static subpackage. * Sat Dec 6 2008 Conrad Meyer - 1.0.18-1 - Bump to 1.0.18. - Patches apply with --fuzz=0. * Sat Nov 29 2008 Conrad Meyer - 1.0.17-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flint/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:23:24 -0000 1.1 +++ .cvsignore 10 Mar 2009 21:31:48 -0000 1.2 @@ -0,0 +1 @@ +flint-1.2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flint/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:23:24 -0000 1.1 +++ sources 10 Mar 2009 21:31:48 -0000 1.2 @@ -0,0 +1 @@ +cddaf72170489f7fa29816f62da7e54c flint-1.2.0.tar.gz From simo at fedoraproject.org Tue Mar 10 21:34:47 2009 From: simo at fedoraproject.org (Simo Sorce) Date: Tue, 10 Mar 2009 21:34:47 +0000 (UTC) Subject: rpms/sssd/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sssd.spec, 1.2, 1.3 Message-ID: <20090310213447.597D37002E@cvs1.fedora.phx.redhat.com> Author: simo Update of /cvs/pkgs/rpms/sssd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13145 Modified Files: .cvsignore sources sssd.spec Log Message: * Tue Mar 10 2009 Simo Sorce - 0.2.1-1 - Version 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sssd/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Mar 2009 20:43:08 -0000 1.3 +++ .cvsignore 10 Mar 2009 21:34:16 -0000 1.4 @@ -1 +1 @@ -sssd-0.2.0.tar.gz +sssd-0.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sssd/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Mar 2009 20:43:08 -0000 1.3 +++ sources 10 Mar 2009 21:34:16 -0000 1.4 @@ -1 +1 @@ -b9123c0c515c2dee6250c8ed7b33e21a sssd-0.2.0.tar.gz +61c77ffd7aa0295862d534ceb6688284 sssd-0.2.1.tar.gz Index: sssd.spec =================================================================== RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sssd.spec 10 Mar 2009 20:43:08 -0000 1.2 +++ sssd.spec 10 Mar 2009 21:34:16 -0000 1.3 @@ -1,5 +1,5 @@ Name: sssd -Version: 0.2.0 +Version: 0.2.1 Release: 1%{?dist} Group: Applications/System Summary: System Security Services Daemon @@ -122,6 +122,9 @@ fi %changelog +* Tue Mar 10 2009 Simo Sorce - 0.2.1-1 +- Version 0.2.1 + * Tue Mar 10 2009 Simo Sorce - 0.2.0-1 - Version 0.2.0 From orion at fedoraproject.org Tue Mar 10 21:41:37 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Tue, 10 Mar 2009 21:41:37 +0000 (UTC) Subject: devel/pixman sources,1.17,1.18 Message-ID: <20090310214137.55B217002E@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/devel/pixman In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14751 Modified Files: sources Log Message: Remove old source Index: sources =================================================================== RCS file: /cvs/pkgs/devel/pixman/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 7 Feb 2009 21:50:53 -0000 1.17 +++ sources 10 Mar 2009 21:41:06 -0000 1.18 @@ -1,2 +1 @@ -837df4a02c61a60a880644393b57faed pixman-0.13.2.tar.gz da330524bbd975271974378b1c5e7b5d pixman-0.14.0.tar.gz From jonquark at fedoraproject.org Tue Mar 10 21:48:16 2009 From: jonquark at fedoraproject.org (Jon Levell) Date: Tue, 10 Mar 2009 21:48:16 +0000 (UTC) Subject: rpms/diffuse/devel .cvsignore, 1.2, 1.3 diffuse.spec, 1.1, 1.2 sources, 1.2, 1.3 diffuse-0.2.15-desktop.patch, 1.1, NONE Message-ID: <20090310214817.049897002E@cvs1.fedora.phx.redhat.com> Author: jonquark Update of /cvs/pkgs/rpms/diffuse/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16185 Modified Files: .cvsignore diffuse.spec sources Removed Files: diffuse-0.2.15-desktop.patch Log Message: Update rawhide to 0.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/diffuse/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Feb 2009 19:32:40 -0000 1.2 +++ .cvsignore 10 Mar 2009 21:47:45 -0000 1.3 @@ -1 +1 @@ -diffuse-0.2.15.tar.bz2 +diffuse-0.3.1.tar.bz2 Index: diffuse.spec =================================================================== RCS file: /cvs/pkgs/rpms/diffuse/devel/diffuse.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- diffuse.spec 28 Feb 2009 19:32:40 -0000 1.1 +++ diffuse.spec 10 Mar 2009 21:47:46 -0000 1.2 @@ -1,13 +1,12 @@ Name: diffuse -Version: 0.2.15 -Release: 4%{?dist} +Version: 0.3.1 +Release: 1%{?dist} Summary: Graphical tool for comparing and merging text files Group: Development/Tools License: GPLv2+ URL: http://%{name}.sourceforge.net/ Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 -Patch0: diffuse-0.2.15-desktop.patch BuildRequires: desktop-file-utils, scrollkeeper Requires: python >= 2.4, pygtk2 >= 2.10 @@ -26,7 +25,6 @@ %prep %setup -q -%patch0 -p1 %build @@ -67,6 +65,9 @@ %changelog +* Tue Mar 10 2009 Jon Levell - 0.3.1-1 +- Update to latest upstream release + * Wed Feb 11 2009 Jon Levell - 0.2.15-4 - Validate the .desktop file - Use the prescribed forms for scrollkeeper/update-desktop-database Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/diffuse/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Feb 2009 19:32:40 -0000 1.2 +++ sources 10 Mar 2009 21:47:46 -0000 1.3 @@ -1 +1 @@ -0fd7aa7d3ed7271770d36bfac8b1ba42 diffuse-0.2.15.tar.bz2 +b590426677579fe1be761a1bb6678578 diffuse-0.3.1.tar.bz2 --- diffuse-0.2.15-desktop.patch DELETED --- From pbrobinson at fedoraproject.org Tue Mar 10 21:55:30 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Tue, 10 Mar 2009 21:55:30 +0000 (UTC) Subject: rpms/gupnp-vala/F-10 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <20090310215530.1C78F7002E@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gupnp-vala/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18584 Modified Files: .cvsignore sources Log Message: - Initial import Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gupnp-vala/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:19:00 -0000 1.1 +++ .cvsignore 10 Mar 2009 21:54:59 -0000 1.2 @@ -0,0 +1 @@ +gupnp-vala-0.5.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gupnp-vala/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:19:00 -0000 1.1 +++ sources 10 Mar 2009 21:54:59 -0000 1.2 @@ -0,0 +1 @@ +34d95c3dddfc699bc560bbe9088839bf gupnp-vala-0.5.3.tar.gz From jonquark at fedoraproject.org Tue Mar 10 22:00:26 2009 From: jonquark at fedoraproject.org (Jon Levell) Date: Tue, 10 Mar 2009 22:00:26 +0000 (UTC) Subject: rpms/diffuse/F-10 .cvsignore, 1.2, 1.3 diffuse.spec, 1.1, 1.2 sources, 1.2, 1.3 diffuse-0.2.15-desktop.patch, 1.1, NONE Message-ID: <20090310220026.63D1D7002E@cvs1.fedora.phx.redhat.com> Author: jonquark Update of /cvs/pkgs/rpms/diffuse/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19545 Modified Files: .cvsignore diffuse.spec sources Removed Files: diffuse-0.2.15-desktop.patch Log Message: Update F-10 to new upstream release (0.3.1) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/diffuse/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Feb 2009 21:08:49 -0000 1.2 +++ .cvsignore 10 Mar 2009 21:59:54 -0000 1.3 @@ -1 +1 @@ -diffuse-0.2.15.tar.bz2 +diffuse-0.3.1.tar.bz2 Index: diffuse.spec =================================================================== RCS file: /cvs/pkgs/rpms/diffuse/F-10/diffuse.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- diffuse.spec 28 Feb 2009 21:08:49 -0000 1.1 +++ diffuse.spec 10 Mar 2009 21:59:55 -0000 1.2 @@ -1,13 +1,12 @@ Name: diffuse -Version: 0.2.15 -Release: 4%{?dist} +Version: 0.3.1 +Release: 1%{?dist} Summary: Graphical tool for comparing and merging text files Group: Development/Tools License: GPLv2+ URL: http://%{name}.sourceforge.net/ Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 -Patch0: diffuse-0.2.15-desktop.patch BuildRequires: desktop-file-utils, scrollkeeper Requires: python >= 2.4, pygtk2 >= 2.10 @@ -26,7 +25,6 @@ %prep %setup -q -%patch0 -p1 %build @@ -67,6 +65,9 @@ %changelog +* Tue Mar 10 2009 Jon Levell - 0.3.1-1 +- Update to latest upstream release + * Wed Feb 11 2009 Jon Levell - 0.2.15-4 - Validate the .desktop file - Use the prescribed forms for scrollkeeper/update-desktop-database Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/diffuse/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Feb 2009 21:08:50 -0000 1.2 +++ sources 10 Mar 2009 21:59:55 -0000 1.3 @@ -1 +1 @@ -0fd7aa7d3ed7271770d36bfac8b1ba42 diffuse-0.2.15.tar.bz2 +b590426677579fe1be761a1bb6678578 diffuse-0.3.1.tar.bz2 --- diffuse-0.2.15-desktop.patch DELETED --- From pkgdb at fedoraproject.org Tue Mar 10 22:01:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 22:01:34 +0000 Subject: [pkgdb] awn-extras-applets: sindrepb has requested watchbugzilla Message-ID: <20090310220155.189FE208511@bastion.fedora.phx.redhat.com> sindrepb has requested the watchbugzilla acl on awn-extras-applets (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets From pkgdb at fedoraproject.org Tue Mar 10 22:01:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 22:01:54 +0000 Subject: [pkgdb] awn-extras-applets: sindrepb has requested approveacls Message-ID: <20090310220154.3EA87208504@bastion.fedora.phx.redhat.com> sindrepb has requested the approveacls acl on awn-extras-applets (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets From pkgdb at fedoraproject.org Tue Mar 10 22:01:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 22:01:58 +0000 Subject: [pkgdb] awn-extras-applets: sindrepb has requested watchcommits Message-ID: <20090310220158.1B8D1208554@bastion.fedora.phx.redhat.com> sindrepb has requested the watchcommits acl on awn-extras-applets (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets From pkgdb at fedoraproject.org Tue Mar 10 22:00:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 22:00:51 +0000 Subject: [pkgdb] awn-extras-applets: sindrepb has requested commit Message-ID: <20090310220158.8B5CA208557@bastion.fedora.phx.redhat.com> sindrepb has requested the commit acl on awn-extras-applets (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets From pkgdb at fedoraproject.org Tue Mar 10 22:02:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 22:02:07 +0000 Subject: [pkgdb] awn-extras-applets: sindrepb has requested approveacls Message-ID: <20090310220207.42354208604@bastion.fedora.phx.redhat.com> sindrepb has requested the approveacls acl on awn-extras-applets (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets From pkgdb at fedoraproject.org Tue Mar 10 22:01:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 22:01:00 +0000 Subject: [pkgdb] awn-extras-applets: sindrepb has requested commit Message-ID: <20090310220208.1D9AB20860B@bastion.fedora.phx.redhat.com> sindrepb has requested the commit acl on awn-extras-applets (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets From pkgdb at fedoraproject.org Tue Mar 10 22:01:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 22:01:49 +0000 Subject: [pkgdb] awn-extras-applets: sindrepb has requested watchcommits Message-ID: <20090310220209.850C02086EF@bastion.fedora.phx.redhat.com> sindrepb has requested the watchcommits acl on awn-extras-applets (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets From pkgdb at fedoraproject.org Tue Mar 10 22:02:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 10 Mar 2009 22:02:14 +0000 Subject: [pkgdb] awn-extras-applets: sindrepb has requested watchbugzilla Message-ID: <20090310220212.A5BFF2086F6@bastion.fedora.phx.redhat.com> sindrepb has requested the watchbugzilla acl on awn-extras-applets (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/awn-extras-applets From simo at fedoraproject.org Tue Mar 10 22:03:10 2009 From: simo at fedoraproject.org (Simo Sorce) Date: Tue, 10 Mar 2009 22:03:10 +0000 (UTC) Subject: rpms/samba4/devel 0001-Fix-extended-operation-return-path.patch, NONE, 1.1 samba4.spec, 1.9, 1.10 Message-ID: <20090310220310.4F99A7002E@cvs1.fedora.phx.redhat.com> Author: simo Update of /cvs/pkgs/rpms/samba4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20336 Modified Files: samba4.spec Added Files: 0001-Fix-extended-operation-return-path.patch Log Message: * Tue Mar 10 2009 Simo Sorce - 4.0.0-12alpha7 - Second part of fix for the ldb segfault problem from upstream 0001-Fix-extended-operation-return-path.patch: --- NEW FILE 0001-Fix-extended-operation-return-path.patch --- >From 97cccb22194380ce84bf6188df90e2438f1176db Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Tue, 10 Mar 2009 10:05:52 -0400 Subject: [PATCH] Fix extended operation return path. Extended operations return was not going thorugh the same patch as others leaving the ctx around. Plus we were neutralizing the spy too early so that it didn't set the request_terminated flag as it should have. This should hopefully fix the failures in the build farm. --- source4/lib/ldb/ldb_tdb/ldb_tdb.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c index d38cb82..9df62be 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c +++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c @@ -1020,13 +1020,14 @@ static void ltdb_timeout(struct tevent_context *ev, ctx = talloc_get_type(private_data, struct ltdb_context); if (!ctx->request_terminated) { - /* neutralize the spy */ - ctx->spy->ctx = NULL; - /* request is done now */ ltdb_request_done(ctx, LDB_ERR_TIME_LIMIT_EXCEEDED); } + if (!ctx->request_terminated) { + /* neutralize the spy */ + ctx->spy->ctx = NULL; + } talloc_free(ctx); } @@ -1086,10 +1087,9 @@ static void ltdb_callback(struct tevent_context *ev, ctx = talloc_get_type(private_data, struct ltdb_context); - if (!ctx->request_terminated) { - /* neutralize the spy */ - ctx->spy->ctx = NULL; - } else goto done; + if (ctx->request_terminated) { + goto done; + } switch (ctx->req->operation) { case LDB_SEARCH: @@ -1109,7 +1109,7 @@ static void ltdb_callback(struct tevent_context *ev, break; case LDB_EXTENDED: ltdb_handle_extended(ctx); - return; + goto done; default: /* no other op supported */ ret = LDB_ERR_UNWILLING_TO_PERFORM; @@ -1121,6 +1121,10 @@ static void ltdb_callback(struct tevent_context *ev, } done: + if (!ctx->request_terminated) { + /* neutralize the spy */ + ctx->spy->ctx = NULL; + } talloc_free(ctx); } -- 1.5.6.6 Index: samba4.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba4/devel/samba4.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- samba4.spec 10 Mar 2009 00:17:24 -0000 1.9 +++ samba4.spec 10 Mar 2009 22:02:39 -0000 1.10 @@ -1,4 +1,4 @@ -%define main_release 11 +%define main_release 12 %define samba4_version 4.0.0 %define talloc_version 1.2.0 @@ -57,6 +57,7 @@ Patch1: samba-4.0.0alpha6-GIT-3508a66-undefined-comparison_fn_t.patch Patch2: 0001-Fix-potential-segfaults-using-freed-memory.patch +Patch3: 0001-Fix-extended-operation-return-path.patch Requires(pre): /usr/sbin/groupadd @@ -290,6 +291,7 @@ %patch1 -p1 -b .undefined-comparison_fn_t %patch2 -p1 -b .potential_ldb_segfault +%patch3 -p1 -b .extended_operation mv source4/VERSION source4/VERSION.orig sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&%{release}/' < source4/VERSION.orig > source4/VERSION @@ -835,6 +837,9 @@ %endif %changelog +* Tue Mar 10 2009 Simo Sorce - 4.0.0-12alpha7 +- Second part of fix for the ldb segfault problem from upstream + * Mon Mar 09 2009 Simo Sorce - 4.0.0-11alpha7 - Add upstream patch to fix a problem within ldb From jonquark at fedoraproject.org Tue Mar 10 22:15:11 2009 From: jonquark at fedoraproject.org (Jon Levell) Date: Tue, 10 Mar 2009 22:15:11 +0000 (UTC) Subject: rpms/diffuse/F-9 .cvsignore, 1.2, 1.3 diffuse.spec, 1.1, 1.2 sources, 1.2, 1.3 diffuse-0.2.15-desktop.patch, 1.1, NONE Message-ID: <20090310221511.2B60B7002E@cvs1.fedora.phx.redhat.com> Author: jonquark Update of /cvs/pkgs/rpms/diffuse/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22892 Modified Files: .cvsignore diffuse.spec sources Removed Files: diffuse-0.2.15-desktop.patch Log Message: Update F9 package to 0.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/diffuse/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Mar 2009 10:34:33 -0000 1.2 +++ .cvsignore 10 Mar 2009 22:14:40 -0000 1.3 @@ -1 +1 @@ -diffuse-0.2.15.tar.bz2 +diffuse-0.3.1.tar.bz2 Index: diffuse.spec =================================================================== RCS file: /cvs/pkgs/rpms/diffuse/F-9/diffuse.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- diffuse.spec 1 Mar 2009 10:34:33 -0000 1.1 +++ diffuse.spec 10 Mar 2009 22:14:40 -0000 1.2 @@ -1,13 +1,12 @@ Name: diffuse -Version: 0.2.15 -Release: 4%{?dist} +Version: 0.3.1 +Release: 1%{?dist} Summary: Graphical tool for comparing and merging text files Group: Development/Tools License: GPLv2+ URL: http://%{name}.sourceforge.net/ Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 -Patch0: diffuse-0.2.15-desktop.patch BuildRequires: desktop-file-utils, scrollkeeper Requires: python >= 2.4, pygtk2 >= 2.10 @@ -26,7 +25,6 @@ %prep %setup -q -%patch0 -p1 %build @@ -67,6 +65,9 @@ %changelog +* Tue Mar 10 2009 Jon Levell - 0.3.1-1 +- Update to latest upstream release + * Wed Feb 11 2009 Jon Levell - 0.2.15-4 - Validate the .desktop file - Use the prescribed forms for scrollkeeper/update-desktop-database Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/diffuse/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Mar 2009 10:34:33 -0000 1.2 +++ sources 10 Mar 2009 22:14:40 -0000 1.3 @@ -1 +1 @@ -0fd7aa7d3ed7271770d36bfac8b1ba42 diffuse-0.2.15.tar.bz2 +b590426677579fe1be761a1bb6678578 diffuse-0.3.1.tar.bz2 --- diffuse-0.2.15-desktop.patch DELETED --- From pbrobinson at fedoraproject.org Tue Mar 10 22:37:01 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Tue, 10 Mar 2009 22:37:01 +0000 (UTC) Subject: rpms/gupnp-vala/F-10 gupnp-vala.spec,NONE,1.1 Message-ID: <20090310223701.A6D287002E@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gupnp-vala/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27871 Added Files: gupnp-vala.spec Log Message: - Initial import --- NEW FILE gupnp-vala.spec --- Name: gupnp-vala Version: 0.5.3 Release: 2%{?dist} Summary: GUPnP is a upnp framework. This adds vala language bindings Group: Development/Languages License: LGPLv2+ URL: http://www.gupnp.org/ Source0: http://www.gupnp.org/sources/bindings/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: vala-devel >= 0.5.7 BuildRequires: vala-tools >= 0.5.7 BuildRequires: gssdp-devel >= 0.6.4 BuildRequires: gupnp-devel >= 0.12.6 BuildRequires: gupnp-av-devel BuildRequires: gupnp-ui-devel BuildRequires: libsoup-devel Requires: pkgconfig Requires: vala >= 0.5.7 %description GUPnP is an object-oriented open source framework for creating UPnP devices and control points, written in C using GObject and libsoup. The GUPnP API is intended to be easy to use, efficient and flexible. This package adds vala language bindings %prep %setup -q %build make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %check make check %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING # Exclude as file is empty %exclude %{_datadir}/vala/vapi/gssdp-1.0.deps %{_datadir}/vala/vapi/gssdp-1.0.vapi %{_datadir}/vala/vapi/gupnp-1.0.deps %{_datadir}/vala/vapi/gupnp-1.0.vapi %{_datadir}/vala/vapi/gupnp-av-1.0.deps %{_datadir}/vala/vapi/gupnp-av-1.0.vapi %{_datadir}/vala/vapi/gupnp-ui-1.0.deps %{_datadir}/vala/vapi/gupnp-ui-1.0.vapi %{_libdir}/pkgconfig/gupnp-vala-1.0.pc %changelog * Tue Mar 10 2009 Peter Robinson 0.5.3-2 - Patch for noarch and some reqs thanks to Michel Salim * Wed Feb 25 2009 Peter Robinson 0.5.3-1 - New upstream version, review request fixes, update spec for new version * Wed Jan 14 2009 Peter Robinson 0.5-1 - New upstream version * Wed Dec 31 2008 Peter Robinson 0.4-1 - Update to new version to fix compile with newer vala and gupnp releases * Wed Jul 9 2008 Peter Robinson 0.2-2 - Fixed dep on vala-tools * Wed Jul 9 2008 Peter Robinson 0.2-1 - Initial release From rjones at fedoraproject.org Tue Mar 10 22:46:03 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 22:46:03 +0000 (UTC) Subject: rpms/mingw32-expat/devel import.log, NONE, 1.1 mingw32-expat.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310224603.C62267002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-expat/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30240/devel Modified Files: .cvsignore sources Added Files: import.log mingw32-expat.spec Log Message: Initial import. --- NEW FILE import.log --- mingw32-expat-2_0_1-4_fc11:HEAD:mingw32-expat-2.0.1-4.fc11.src.rpm:1236725053 --- NEW FILE mingw32-expat.spec --- %define __strip %{_mingw32_strip} %define __objdump %{_mingw32_objdump} %define _use_internal_dependency_generator 0 %define __find_requires %{_mingw32_findrequires} %define __find_provides %{_mingw32_findprovides} Name: mingw32-expat Version: 2.0.1 Release: 4%{?dist} Summary: MinGW Windows port of expat XML parser library License: MIT Group: Development/Libraries URL: http://www.libexpat.org/ Source0: http://download.sourceforge.net/expat/expat-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: mingw32-filesystem >= 33 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: autoconf, automake, libtool %description This is expat, the C library for parsing XML, written by James Clark. Expat is a stream oriented XML parser. This means that you register handlers with the parser prior to starting the parse. These handlers are called when the parser discovers the associated structures in the document being parsed. A start tag is an example of the kind of structures for which you may register handlers. %prep %setup -q -n expat-%{version} rm -rf autom4te*.cache cp `aclocal --print-ac-dir`/libtool.m4 conftools || exit 1 libtoolize --copy --force --automake && aclocal && autoheader && autoconf chmod -x COPYING %build %{_mingw32_configure} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install # Remove static libraries but DON'T remove *.dll.a files. rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libexpat.a # Remove documentation which duplicates that found in the native package. rm -r $RPM_BUILD_ROOT%{_mingw32_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING %{_mingw32_bindir}/libexpat-1.dll %{_mingw32_bindir}/xmlwf %{_mingw32_libdir}/libexpat.dll.a %{_mingw32_libdir}/libexpat.la %{_mingw32_includedir}/expat.h %{_mingw32_includedir}/expat_external.h %changelog * Mon Mar 9 2009 Richard W.M. Jones - 2.0.1-4 - Remove +x permissions on COPYING file. * Fri Feb 20 2009 Richard W.M. Jones - 2.0.1-3 - Rebuild for mingw32-gcc 4.4 * Fri Feb 6 2009 Richard W.M. Jones - 2.0.1-2 - Include license. * Fri Oct 31 2008 Richard W.M. Jones - 2.0.1-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-expat/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:17:33 -0000 1.1 +++ .cvsignore 10 Mar 2009 22:45:32 -0000 1.2 @@ -0,0 +1 @@ +expat-2.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-expat/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:17:33 -0000 1.1 +++ sources 10 Mar 2009 22:45:32 -0000 1.2 @@ -0,0 +1 @@ +ee8b492592568805593f81f8cdf2a04c expat-2.0.1.tar.gz From rjones at fedoraproject.org Tue Mar 10 22:46:06 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 22:46:06 +0000 (UTC) Subject: rpms/mingw32-expat/F-10 import.log, NONE, 1.1 mingw32-expat.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310224606.332B07002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-expat/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30376/F-10 Modified Files: .cvsignore sources Added Files: import.log mingw32-expat.spec Log Message: Initial import. --- NEW FILE import.log --- mingw32-expat-2_0_1-4_fc11:F-10:mingw32-expat-2.0.1-4.fc11.src.rpm:1236725117 --- NEW FILE mingw32-expat.spec --- %define __strip %{_mingw32_strip} %define __objdump %{_mingw32_objdump} %define _use_internal_dependency_generator 0 %define __find_requires %{_mingw32_findrequires} %define __find_provides %{_mingw32_findprovides} Name: mingw32-expat Version: 2.0.1 Release: 4%{?dist} Summary: MinGW Windows port of expat XML parser library License: MIT Group: Development/Libraries URL: http://www.libexpat.org/ Source0: http://download.sourceforge.net/expat/expat-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: mingw32-filesystem >= 33 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: autoconf, automake, libtool %description This is expat, the C library for parsing XML, written by James Clark. Expat is a stream oriented XML parser. This means that you register handlers with the parser prior to starting the parse. These handlers are called when the parser discovers the associated structures in the document being parsed. A start tag is an example of the kind of structures for which you may register handlers. %prep %setup -q -n expat-%{version} rm -rf autom4te*.cache cp `aclocal --print-ac-dir`/libtool.m4 conftools || exit 1 libtoolize --copy --force --automake && aclocal && autoheader && autoconf chmod -x COPYING %build %{_mingw32_configure} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install # Remove static libraries but DON'T remove *.dll.a files. rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libexpat.a # Remove documentation which duplicates that found in the native package. rm -r $RPM_BUILD_ROOT%{_mingw32_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING %{_mingw32_bindir}/libexpat-1.dll %{_mingw32_bindir}/xmlwf %{_mingw32_libdir}/libexpat.dll.a %{_mingw32_libdir}/libexpat.la %{_mingw32_includedir}/expat.h %{_mingw32_includedir}/expat_external.h %changelog * Mon Mar 9 2009 Richard W.M. Jones - 2.0.1-4 - Remove +x permissions on COPYING file. * Fri Feb 20 2009 Richard W.M. Jones - 2.0.1-3 - Rebuild for mingw32-gcc 4.4 * Fri Feb 6 2009 Richard W.M. Jones - 2.0.1-2 - Include license. * Fri Oct 31 2008 Richard W.M. Jones - 2.0.1-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-expat/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:17:33 -0000 1.1 +++ .cvsignore 10 Mar 2009 22:45:35 -0000 1.2 @@ -0,0 +1 @@ +expat-2.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-expat/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:17:33 -0000 1.1 +++ sources 10 Mar 2009 22:45:35 -0000 1.2 @@ -0,0 +1 @@ +ee8b492592568805593f81f8cdf2a04c expat-2.0.1.tar.gz From rjones at fedoraproject.org Tue Mar 10 22:46:10 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 22:46:10 +0000 (UTC) Subject: rpms/mingw32-fontconfig/devel import.log, NONE, 1.1 mingw32-fontconfig-2.6.0-remove-logfile.patch, NONE, 1.1 mingw32-fontconfig.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310224610.3D6867002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-fontconfig/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30608/devel Modified Files: .cvsignore sources Added Files: import.log mingw32-fontconfig-2.6.0-remove-logfile.patch mingw32-fontconfig.spec Log Message: Initial import. --- NEW FILE import.log --- mingw32-fontconfig-2_6_0-9_fc11:HEAD:mingw32-fontconfig-2.6.0-9.fc11.src.rpm:1236725108 mingw32-fontconfig-2.6.0-remove-logfile.patch: --- NEW FILE mingw32-fontconfig-2.6.0-remove-logfile.patch --- --- fontconfig-2.6.0.orig/doc/Makefile.am 2007-11-06 00:05:37.000000000 +0000 +++ fontconfig-2.6.0/doc/Makefile.am 2008-09-21 13:50:38.000000000 +0100 @@ -121,7 +121,7 @@ $(DOC2MAN) -o devel-man local-fontconfig-devel.sgml && \ mv devel-man/manpage.refs func.refs && \ mv devel-man/*.3 . && \ - $(RM) devel-man/manpage.links && \ + $(RM) devel-man/manpage.links devel-man/manpage.log && \ rmdir devel-man local-fontconfig-devel.sgml: fontconfig-devel.sgml --- NEW FILE mingw32-fontconfig.spec --- %define __strip %{_mingw32_strip} %define __objdump %{_mingw32_objdump} %define _use_internal_dependency_generator 0 %define __find_requires %{_mingw32_findrequires} %define __find_provides %{_mingw32_findprovides} Name: mingw32-fontconfig Version: 2.6.0 Release: 9%{?dist} Summary: MinGW Windows Fontconfig library License: MIT URL: http://fontconfig.org Source0: http://fontconfig.org/release/fontconfig-%{version}.tar.gz Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: mingw32-fontconfig-2.6.0-remove-logfile.patch BuildArch: noarch BuildRequires: mingw32-filesystem >= 40 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn BuildRequires: mingw32-expat BuildRequires: mingw32-freetype BuildRequires: mingw32-iconv BuildRequires: mingw32-libxml2 BuildRequires: pkgconfig BuildRequires: docbook-utils BuildRequires: automake, autoconf, libtool Requires: pkgconfig %description MinGW Windows Fontconfig library. %prep %setup -q -n fontconfig-%{version} %patch0 -p1 libtoolize --force --copy autoreconf %build PATH="%{_mingw32_bindir}:$PATH" \ %{_mingw32_configure} --with-arch=i686 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias # Remove static library. rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libfontconfig.a # Remove duplicate manpages. rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING %{_mingw32_bindir}/fc-cache.exe %{_mingw32_bindir}/fc-cat.exe %{_mingw32_bindir}/fc-list.exe %{_mingw32_bindir}/fc-match.exe %{_mingw32_bindir}/libfontconfig-1.dll %{_mingw32_libdir}/fontconfig.def %{_mingw32_libdir}/libfontconfig.dll.a %{_mingw32_libdir}/libfontconfig.la %{_mingw32_libdir}/pkgconfig/fontconfig.pc %{_mingw32_includedir}/fontconfig/ %{_mingw32_sysconfdir}/fonts/ %{_mingw32_datadir}/doc/fontconfig %changelog * Fri Feb 20 2009 Richard W.M. Jones - 2.6.0-9 - Rebuild for mingw32-gcc 4.4 * Fri Feb 6 2009 Richard W.M. Jones - 2.6.0-8 - Include license. * Fri Jan 30 2009 Richard W.M. Jones - 2.6.0-7 - Requires pkgconfig. * Fri Jan 23 2009 Richard W.M. Jones - 2.6.0-6 - Use _smp_mflags. - Rebuild libtool configuration. - More BRs suggested by auto-buildrequires. * Wed Sep 24 2008 Richard W.M. Jones - 2.6.0-5 - Rename mingw -> mingw32. * Sun Sep 21 2008 Richard W.M. Jones - 2.6.0-4 - Remove duplicate manpages. - Patch to delete logfile left when building (unused) manpages. * Thu Sep 11 2008 Daniel P. Berrange - 2.6.0-3 - Add mingw_bindir to $PATH for freetype-config script * Wed Sep 10 2008 Richard W.M. Jones - 2.6.0-2 - Remove static library. - +BR mingw-libxml2. * Tue Sep 9 2008 Daniel P. Berrange - 2.6.0-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-fontconfig/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:16:48 -0000 1.1 +++ .cvsignore 10 Mar 2009 22:45:39 -0000 1.2 @@ -0,0 +1 @@ +fontconfig-2.6.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-fontconfig/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:16:49 -0000 1.1 +++ sources 10 Mar 2009 22:45:39 -0000 1.2 @@ -0,0 +1 @@ +ab54ec1d4ddd836313fdbc0cd5299d6d fontconfig-2.6.0.tar.gz From rjones at fedoraproject.org Tue Mar 10 22:46:08 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 22:46:08 +0000 (UTC) Subject: rpms/mingw32-expat/EL-5 import.log, NONE, 1.1 mingw32-expat.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310224608.8AB317002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-expat/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30458/EL-5 Modified Files: .cvsignore sources Added Files: import.log mingw32-expat.spec Log Message: Initial import. --- NEW FILE import.log --- mingw32-expat-2_0_1-4_fc11:EL-5:mingw32-expat-2.0.1-4.fc11.src.rpm:1236725123 --- NEW FILE mingw32-expat.spec --- %define __strip %{_mingw32_strip} %define __objdump %{_mingw32_objdump} %define _use_internal_dependency_generator 0 %define __find_requires %{_mingw32_findrequires} %define __find_provides %{_mingw32_findprovides} Name: mingw32-expat Version: 2.0.1 Release: 4%{?dist} Summary: MinGW Windows port of expat XML parser library License: MIT Group: Development/Libraries URL: http://www.libexpat.org/ Source0: http://download.sourceforge.net/expat/expat-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: mingw32-filesystem >= 33 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: autoconf, automake, libtool %description This is expat, the C library for parsing XML, written by James Clark. Expat is a stream oriented XML parser. This means that you register handlers with the parser prior to starting the parse. These handlers are called when the parser discovers the associated structures in the document being parsed. A start tag is an example of the kind of structures for which you may register handlers. %prep %setup -q -n expat-%{version} rm -rf autom4te*.cache cp `aclocal --print-ac-dir`/libtool.m4 conftools || exit 1 libtoolize --copy --force --automake && aclocal && autoheader && autoconf chmod -x COPYING %build %{_mingw32_configure} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install # Remove static libraries but DON'T remove *.dll.a files. rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libexpat.a # Remove documentation which duplicates that found in the native package. rm -r $RPM_BUILD_ROOT%{_mingw32_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING %{_mingw32_bindir}/libexpat-1.dll %{_mingw32_bindir}/xmlwf %{_mingw32_libdir}/libexpat.dll.a %{_mingw32_libdir}/libexpat.la %{_mingw32_includedir}/expat.h %{_mingw32_includedir}/expat_external.h %changelog * Mon Mar 9 2009 Richard W.M. Jones - 2.0.1-4 - Remove +x permissions on COPYING file. * Fri Feb 20 2009 Richard W.M. Jones - 2.0.1-3 - Rebuild for mingw32-gcc 4.4 * Fri Feb 6 2009 Richard W.M. Jones - 2.0.1-2 - Include license. * Fri Oct 31 2008 Richard W.M. Jones - 2.0.1-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-expat/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:17:33 -0000 1.1 +++ .cvsignore 10 Mar 2009 22:45:37 -0000 1.2 @@ -0,0 +1 @@ +expat-2.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-expat/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:17:33 -0000 1.1 +++ sources 10 Mar 2009 22:45:38 -0000 1.2 @@ -0,0 +1 @@ +ee8b492592568805593f81f8cdf2a04c expat-2.0.1.tar.gz From rjones at fedoraproject.org Tue Mar 10 22:46:27 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 22:46:27 +0000 (UTC) Subject: rpms/mingw32-fontconfig/F-10 import.log, NONE, 1.1 mingw32-fontconfig-2.6.0-remove-logfile.patch, NONE, 1.1 mingw32-fontconfig.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310224627.51FE57002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-fontconfig/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30775/F-10 Modified Files: .cvsignore sources Added Files: import.log mingw32-fontconfig-2.6.0-remove-logfile.patch mingw32-fontconfig.spec Log Message: Initial import. --- NEW FILE import.log --- mingw32-fontconfig-2_6_0-9_fc11:F-10:mingw32-fontconfig-2.6.0-9.fc11.src.rpm:1236725158 mingw32-fontconfig-2.6.0-remove-logfile.patch: --- NEW FILE mingw32-fontconfig-2.6.0-remove-logfile.patch --- --- fontconfig-2.6.0.orig/doc/Makefile.am 2007-11-06 00:05:37.000000000 +0000 +++ fontconfig-2.6.0/doc/Makefile.am 2008-09-21 13:50:38.000000000 +0100 @@ -121,7 +121,7 @@ $(DOC2MAN) -o devel-man local-fontconfig-devel.sgml && \ mv devel-man/manpage.refs func.refs && \ mv devel-man/*.3 . && \ - $(RM) devel-man/manpage.links && \ + $(RM) devel-man/manpage.links devel-man/manpage.log && \ rmdir devel-man local-fontconfig-devel.sgml: fontconfig-devel.sgml --- NEW FILE mingw32-fontconfig.spec --- %define __strip %{_mingw32_strip} %define __objdump %{_mingw32_objdump} %define _use_internal_dependency_generator 0 %define __find_requires %{_mingw32_findrequires} %define __find_provides %{_mingw32_findprovides} Name: mingw32-fontconfig Version: 2.6.0 Release: 9%{?dist} Summary: MinGW Windows Fontconfig library License: MIT URL: http://fontconfig.org Source0: http://fontconfig.org/release/fontconfig-%{version}.tar.gz Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: mingw32-fontconfig-2.6.0-remove-logfile.patch BuildArch: noarch BuildRequires: mingw32-filesystem >= 40 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn BuildRequires: mingw32-expat BuildRequires: mingw32-freetype BuildRequires: mingw32-iconv BuildRequires: mingw32-libxml2 BuildRequires: pkgconfig BuildRequires: docbook-utils BuildRequires: automake, autoconf, libtool Requires: pkgconfig %description MinGW Windows Fontconfig library. %prep %setup -q -n fontconfig-%{version} %patch0 -p1 libtoolize --force --copy autoreconf %build PATH="%{_mingw32_bindir}:$PATH" \ %{_mingw32_configure} --with-arch=i686 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias # Remove static library. rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libfontconfig.a # Remove duplicate manpages. rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING %{_mingw32_bindir}/fc-cache.exe %{_mingw32_bindir}/fc-cat.exe %{_mingw32_bindir}/fc-list.exe %{_mingw32_bindir}/fc-match.exe %{_mingw32_bindir}/libfontconfig-1.dll %{_mingw32_libdir}/fontconfig.def %{_mingw32_libdir}/libfontconfig.dll.a %{_mingw32_libdir}/libfontconfig.la %{_mingw32_libdir}/pkgconfig/fontconfig.pc %{_mingw32_includedir}/fontconfig/ %{_mingw32_sysconfdir}/fonts/ %{_mingw32_datadir}/doc/fontconfig %changelog * Fri Feb 20 2009 Richard W.M. Jones - 2.6.0-9 - Rebuild for mingw32-gcc 4.4 * Fri Feb 6 2009 Richard W.M. Jones - 2.6.0-8 - Include license. * Fri Jan 30 2009 Richard W.M. Jones - 2.6.0-7 - Requires pkgconfig. * Fri Jan 23 2009 Richard W.M. Jones - 2.6.0-6 - Use _smp_mflags. - Rebuild libtool configuration. - More BRs suggested by auto-buildrequires. * Wed Sep 24 2008 Richard W.M. Jones - 2.6.0-5 - Rename mingw -> mingw32. * Sun Sep 21 2008 Richard W.M. Jones - 2.6.0-4 - Remove duplicate manpages. - Patch to delete logfile left when building (unused) manpages. * Thu Sep 11 2008 Daniel P. Berrange - 2.6.0-3 - Add mingw_bindir to $PATH for freetype-config script * Wed Sep 10 2008 Richard W.M. Jones - 2.6.0-2 - Remove static library. - +BR mingw-libxml2. * Tue Sep 9 2008 Daniel P. Berrange - 2.6.0-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-fontconfig/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:16:48 -0000 1.1 +++ .cvsignore 10 Mar 2009 22:45:55 -0000 1.2 @@ -0,0 +1 @@ +fontconfig-2.6.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-fontconfig/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:16:49 -0000 1.1 +++ sources 10 Mar 2009 22:45:57 -0000 1.2 @@ -0,0 +1 @@ +ab54ec1d4ddd836313fdbc0cd5299d6d fontconfig-2.6.0.tar.gz From rjones at fedoraproject.org Tue Mar 10 22:46:39 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 22:46:39 +0000 (UTC) Subject: rpms/mingw32-fontconfig/EL-5 import.log, NONE, 1.1 mingw32-fontconfig-2.6.0-remove-logfile.patch, NONE, 1.1 mingw32-fontconfig.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310224639.89C767002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-fontconfig/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30866/EL-5 Modified Files: .cvsignore sources Added Files: import.log mingw32-fontconfig-2.6.0-remove-logfile.patch mingw32-fontconfig.spec Log Message: Initial import. --- NEW FILE import.log --- mingw32-fontconfig-2_6_0-9_fc11:EL-5:mingw32-fontconfig-2.6.0-9.fc11.src.rpm:1236725158 mingw32-fontconfig-2.6.0-remove-logfile.patch: --- NEW FILE mingw32-fontconfig-2.6.0-remove-logfile.patch --- --- fontconfig-2.6.0.orig/doc/Makefile.am 2007-11-06 00:05:37.000000000 +0000 +++ fontconfig-2.6.0/doc/Makefile.am 2008-09-21 13:50:38.000000000 +0100 @@ -121,7 +121,7 @@ $(DOC2MAN) -o devel-man local-fontconfig-devel.sgml && \ mv devel-man/manpage.refs func.refs && \ mv devel-man/*.3 . && \ - $(RM) devel-man/manpage.links && \ + $(RM) devel-man/manpage.links devel-man/manpage.log && \ rmdir devel-man local-fontconfig-devel.sgml: fontconfig-devel.sgml --- NEW FILE mingw32-fontconfig.spec --- %define __strip %{_mingw32_strip} %define __objdump %{_mingw32_objdump} %define _use_internal_dependency_generator 0 %define __find_requires %{_mingw32_findrequires} %define __find_provides %{_mingw32_findprovides} Name: mingw32-fontconfig Version: 2.6.0 Release: 9%{?dist} Summary: MinGW Windows Fontconfig library License: MIT URL: http://fontconfig.org Source0: http://fontconfig.org/release/fontconfig-%{version}.tar.gz Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: mingw32-fontconfig-2.6.0-remove-logfile.patch BuildArch: noarch BuildRequires: mingw32-filesystem >= 40 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn BuildRequires: mingw32-expat BuildRequires: mingw32-freetype BuildRequires: mingw32-iconv BuildRequires: mingw32-libxml2 BuildRequires: pkgconfig BuildRequires: docbook-utils BuildRequires: automake, autoconf, libtool Requires: pkgconfig %description MinGW Windows Fontconfig library. %prep %setup -q -n fontconfig-%{version} %patch0 -p1 libtoolize --force --copy autoreconf %build PATH="%{_mingw32_bindir}:$PATH" \ %{_mingw32_configure} --with-arch=i686 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias # Remove static library. rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libfontconfig.a # Remove duplicate manpages. rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING %{_mingw32_bindir}/fc-cache.exe %{_mingw32_bindir}/fc-cat.exe %{_mingw32_bindir}/fc-list.exe %{_mingw32_bindir}/fc-match.exe %{_mingw32_bindir}/libfontconfig-1.dll %{_mingw32_libdir}/fontconfig.def %{_mingw32_libdir}/libfontconfig.dll.a %{_mingw32_libdir}/libfontconfig.la %{_mingw32_libdir}/pkgconfig/fontconfig.pc %{_mingw32_includedir}/fontconfig/ %{_mingw32_sysconfdir}/fonts/ %{_mingw32_datadir}/doc/fontconfig %changelog * Fri Feb 20 2009 Richard W.M. Jones - 2.6.0-9 - Rebuild for mingw32-gcc 4.4 * Fri Feb 6 2009 Richard W.M. Jones - 2.6.0-8 - Include license. * Fri Jan 30 2009 Richard W.M. Jones - 2.6.0-7 - Requires pkgconfig. * Fri Jan 23 2009 Richard W.M. Jones - 2.6.0-6 - Use _smp_mflags. - Rebuild libtool configuration. - More BRs suggested by auto-buildrequires. * Wed Sep 24 2008 Richard W.M. Jones - 2.6.0-5 - Rename mingw -> mingw32. * Sun Sep 21 2008 Richard W.M. Jones - 2.6.0-4 - Remove duplicate manpages. - Patch to delete logfile left when building (unused) manpages. * Thu Sep 11 2008 Daniel P. Berrange - 2.6.0-3 - Add mingw_bindir to $PATH for freetype-config script * Wed Sep 10 2008 Richard W.M. Jones - 2.6.0-2 - Remove static library. - +BR mingw-libxml2. * Tue Sep 9 2008 Daniel P. Berrange - 2.6.0-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-fontconfig/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:16:48 -0000 1.1 +++ .cvsignore 10 Mar 2009 22:46:07 -0000 1.2 @@ -0,0 +1 @@ +fontconfig-2.6.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-fontconfig/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:16:49 -0000 1.1 +++ sources 10 Mar 2009 22:46:09 -0000 1.2 @@ -0,0 +1 @@ +ab54ec1d4ddd836313fdbc0cd5299d6d fontconfig-2.6.0.tar.gz From rjones at fedoraproject.org Tue Mar 10 22:46:45 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 22:46:45 +0000 (UTC) Subject: rpms/mingw32-pango/devel import.log, NONE, 1.1 mingw32-pango.spec, NONE, 1.1 pango.modules, NONE, 1.1 pango_enable_static_build.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310224645.1C3637002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-pango/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31052/devel Modified Files: .cvsignore sources Added Files: import.log mingw32-pango.spec pango.modules pango_enable_static_build.patch Log Message: Initial import. --- NEW FILE import.log --- mingw32-pango-1_23_0-1_fc11:HEAD:mingw32-pango-1.23.0-1.fc11.src.rpm:1236725158 --- NEW FILE mingw32-pango.spec --- %define __strip %{_mingw32_strip} %define __objdump %{_mingw32_objdump} %define _use_internal_dependency_generator 0 %define __find_requires %{_mingw32_findrequires} %define __find_provides %{_mingw32_findprovides} Name: mingw32-pango Version: 1.23.0 Release: 1%{?dist} Summary: MinGW Windows Pango library License: LGPLv2+ Group: Development/Libraries URL: http://www.pango.org Source0: http://download.gnome.org/sources/pango/1.23/pango-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Native pango uses a %post script to generate this, but the # pango-querymodules.exe binary is not something we can easily run on # a Linux host. We could use wine but wine isn't happy in a mock # environment. So we just include a pre-generated copy on basis that # it won't ever change much. # # If you want to rebuild this, do: # wine %{_mingw32_bindir}/pango-querymodules.exe > pango.modules Source1: pango.modules Patch1000: pango_enable_static_build.patch BuildArch: noarch BuildRequires: mingw32-filesystem >= 23 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-cairo >= 1.8.0 BuildRequires: mingw32-dlfcn BuildRequires: mingw32-expat BuildRequires: mingw32-fontconfig BuildRequires: mingw32-freetype BuildRequires: mingw32-gettext BuildRequires: mingw32-glib2 BuildRequires: mingw32-iconv BuildRequires: mingw32-libpng BuildRequires: mingw32-pixman BuildRequires: pkgconfig # Required in order to rebuild the configure script. BuildRequires: gtk-doc # These are required for the patch BuildRequires: autoconf, automake, libtool Requires: pkgconfig %description MinGW Windows Pango library. %package static Summary: Static version of the MinGW Windows Pango library Requires: %{name} = %{version}-%{release} Group: Development/Libraries %description static Static version of the MinGW Windows Pango library. %prep %setup -q -n pango-%{version} %patch1000 # Regenerate the configure script aclocal autoreconf libtoolize %build # Need to run the correct version of glib-mkenums. PATH=%{_mingw32_bindir}:$PATH \ %{_mingw32_configure} --enable-static --enable-shared make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pango/ cp %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pango/ rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias rm $RPM_BUILD_ROOT/%{_mingw32_mandir}/man1/*.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{_mingw32_bindir}/libpango-1.0-0.dll %{_mingw32_bindir}/libpangocairo-1.0-0.dll %{_mingw32_bindir}/libpangoft2-1.0-0.dll %{_mingw32_bindir}/libpangowin32-1.0-0.dll %{_mingw32_bindir}/pango-querymodules.exe %{_mingw32_includedir}/pango-1.0/ %{_mingw32_libdir}/libpango-1.0.dll.a %{_mingw32_libdir}/libpango-1.0.la %{_mingw32_libdir}/libpangocairo-1.0.dll.a %{_mingw32_libdir}/libpangocairo-1.0.la %{_mingw32_libdir}/libpangoft2-1.0.dll.a %{_mingw32_libdir}/libpangoft2-1.0.la %{_mingw32_libdir}/libpangowin32-1.0.dll.a %{_mingw32_libdir}/libpangowin32-1.0.la %{_mingw32_libdir}/pango-1.0.def %{_mingw32_libdir}/pangocairo-1.0.def %{_mingw32_libdir}/pangoft2-1.0.def %{_mingw32_libdir}/pangowin32-1.0.def %dir %{_mingw32_libdir}/pango %dir %{_mingw32_libdir}/pango/1.6.0 %dir %{_mingw32_libdir}/pango/1.6.0/modules %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.la %{_mingw32_libdir}/pkgconfig/pango.pc %{_mingw32_libdir}/pkgconfig/pangocairo.pc %{_mingw32_libdir}/pkgconfig/pangoft2.pc %{_mingw32_libdir}/pkgconfig/pangowin32.pc %{_mingw32_datadir}/gtk-doc/html/pango/ %{_mingw32_sysconfdir}/pango/ %files static %defattr(-,root,root,-) %{_mingw32_libdir}/libpango-1.0.a %{_mingw32_libdir}/libpangocairo-1.0.a %{_mingw32_libdir}/libpangoft2-1.0.a %{_mingw32_libdir}/libpangowin32-1.0.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.a %changelog * Mon Mar 9 2009 Richard W.M. Jones - 1.23.0-1 - Remove man page which duplicates what is in base Fedora. - Rebase to 1.23.0 to match Fedora. - +BR mingw32-dlfcn. * Fri Feb 20 2009 Erik van Pienbroek - 1.22.1-6 - Added -static subpackage * Fri Feb 20 2009 Richard W.M. Jones - 1.22.1-5 - Rebuild for mingw32-gcc 4.4 * Fri Jan 30 2009 Richard W.M. Jones - 1.22.1-4 - Requires pkgconfig. * Tue Jan 27 2009 Levente Farkas - 1.22.1-3 - Include license file in documentation section. * Fri Jan 23 2009 Richard W.M. Jones - 1.22.1-2 - Disable static libraries. - Use _smp_mflags. * Fri Oct 24 2008 Richard W.M. Jones - 1.22.1-1 - New upstream version 1.22.1. - BR cairo >= 1.8.0 because of important fixes. * Wed Sep 24 2008 Richard W.M. Jones - 1.21.6-6 - Rename mingw -> mingw32. * Tue Sep 23 2008 Daniel P. Berrange - 1.21.6-5 - Remove use of wine in %-post. * Thu Sep 11 2008 Daniel P. Berrange - 1.21.6-4 - Add dep on pkgconfig * Thu Sep 11 2008 Richard W.M. Jones - 1.21.6-3 - post/preun scripts to update the pango.modules list. * Wed Sep 10 2008 Richard W.M. Jones - 1.21.6-2 - Run the correct glib-mkenums. * Tue Sep 9 2008 Daniel P. Berrange - 1.21.6-1 - Initial RPM release --- NEW FILE pango.modules --- # Pango Modules file # Automatically generated file, do not edit # # ModulesPath = Z:\usr\i686-pc-mingw32\sys-root\mingw\lib\pango\1.6.0\modules # "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-thai-fc.dll" ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-basic-win32.dll" BasicScriptEngineWin32 PangoEngineShape PangoRenderWin32 common: "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-syriac-fc.dll" SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-khmer-fc.dll" KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-arabic-lang.dll" ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-basic-fc.dll" BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common: "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-arabic-fc.dll" ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-hebrew-fc.dll" HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-tibetan-fc.dll" TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-hangul-fc.dll" HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:* pango_enable_static_build.patch: --- NEW FILE pango_enable_static_build.patch --- --- configure.in.orig 2009-02-20 20:37:09.166924103 +0100 +++ configure.in 2009-02-20 20:37:20.893924816 +0100 @@ -123,16 +123,16 @@ AC_LIBTOOL_WIN32_DLL AM_DISABLE_STATIC -if test "$pango_os_win32" = "yes"; then - if test x$enable_static = xyes -o x$enable_static = x; then - AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) - enable_static=no - fi - if test x$enable_shared = xno; then - AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) - fi - enable_shared=yes -fi +#if test "$pango_os_win32" = "yes"; then +# if test x$enable_static = xyes -o x$enable_static = x; then +# AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) +# enable_static=no +# fi +# if test x$enable_shared = xno; then +# AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) +# fi +# enable_shared=yes +#fi AM_PROG_LIBTOOL dnl when using libtool 2.x create libtool early, because it's used in configure Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:12:32 -0000 1.1 +++ .cvsignore 10 Mar 2009 22:46:14 -0000 1.2 @@ -0,0 +1 @@ +pango-1.23.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:12:32 -0000 1.1 +++ sources 10 Mar 2009 22:46:14 -0000 1.2 @@ -0,0 +1 @@ +358a87607c0a5b4889bab52b1cf5e921 pango-1.23.0.tar.bz2 From rjones at fedoraproject.org Tue Mar 10 22:47:29 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 22:47:29 +0000 (UTC) Subject: rpms/mingw32-pango/F-10 import.log, NONE, 1.1 mingw32-pango.spec, NONE, 1.1 pango.modules, NONE, 1.1 pango_enable_static_build.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310224729.AC5247002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-pango/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31577/F-10 Modified Files: .cvsignore sources Added Files: import.log mingw32-pango.spec pango.modules pango_enable_static_build.patch Log Message: Initial import. --- NEW FILE import.log --- mingw32-pango-1_23_0-1_fc11:F-10:mingw32-pango-1.23.0-1.fc11.src.rpm:1236725213 --- NEW FILE mingw32-pango.spec --- %define __strip %{_mingw32_strip} %define __objdump %{_mingw32_objdump} %define _use_internal_dependency_generator 0 %define __find_requires %{_mingw32_findrequires} %define __find_provides %{_mingw32_findprovides} Name: mingw32-pango Version: 1.23.0 Release: 1%{?dist} Summary: MinGW Windows Pango library License: LGPLv2+ Group: Development/Libraries URL: http://www.pango.org Source0: http://download.gnome.org/sources/pango/1.23/pango-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Native pango uses a %post script to generate this, but the # pango-querymodules.exe binary is not something we can easily run on # a Linux host. We could use wine but wine isn't happy in a mock # environment. So we just include a pre-generated copy on basis that # it won't ever change much. # # If you want to rebuild this, do: # wine %{_mingw32_bindir}/pango-querymodules.exe > pango.modules Source1: pango.modules Patch1000: pango_enable_static_build.patch BuildArch: noarch BuildRequires: mingw32-filesystem >= 23 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-cairo >= 1.8.0 BuildRequires: mingw32-dlfcn BuildRequires: mingw32-expat BuildRequires: mingw32-fontconfig BuildRequires: mingw32-freetype BuildRequires: mingw32-gettext BuildRequires: mingw32-glib2 BuildRequires: mingw32-iconv BuildRequires: mingw32-libpng BuildRequires: mingw32-pixman BuildRequires: pkgconfig # Required in order to rebuild the configure script. BuildRequires: gtk-doc # These are required for the patch BuildRequires: autoconf, automake, libtool Requires: pkgconfig %description MinGW Windows Pango library. %package static Summary: Static version of the MinGW Windows Pango library Requires: %{name} = %{version}-%{release} Group: Development/Libraries %description static Static version of the MinGW Windows Pango library. %prep %setup -q -n pango-%{version} %patch1000 # Regenerate the configure script aclocal autoreconf libtoolize %build # Need to run the correct version of glib-mkenums. PATH=%{_mingw32_bindir}:$PATH \ %{_mingw32_configure} --enable-static --enable-shared make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pango/ cp %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pango/ rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias rm $RPM_BUILD_ROOT/%{_mingw32_mandir}/man1/*.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{_mingw32_bindir}/libpango-1.0-0.dll %{_mingw32_bindir}/libpangocairo-1.0-0.dll %{_mingw32_bindir}/libpangoft2-1.0-0.dll %{_mingw32_bindir}/libpangowin32-1.0-0.dll %{_mingw32_bindir}/pango-querymodules.exe %{_mingw32_includedir}/pango-1.0/ %{_mingw32_libdir}/libpango-1.0.dll.a %{_mingw32_libdir}/libpango-1.0.la %{_mingw32_libdir}/libpangocairo-1.0.dll.a %{_mingw32_libdir}/libpangocairo-1.0.la %{_mingw32_libdir}/libpangoft2-1.0.dll.a %{_mingw32_libdir}/libpangoft2-1.0.la %{_mingw32_libdir}/libpangowin32-1.0.dll.a %{_mingw32_libdir}/libpangowin32-1.0.la %{_mingw32_libdir}/pango-1.0.def %{_mingw32_libdir}/pangocairo-1.0.def %{_mingw32_libdir}/pangoft2-1.0.def %{_mingw32_libdir}/pangowin32-1.0.def %dir %{_mingw32_libdir}/pango %dir %{_mingw32_libdir}/pango/1.6.0 %dir %{_mingw32_libdir}/pango/1.6.0/modules %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.la %{_mingw32_libdir}/pkgconfig/pango.pc %{_mingw32_libdir}/pkgconfig/pangocairo.pc %{_mingw32_libdir}/pkgconfig/pangoft2.pc %{_mingw32_libdir}/pkgconfig/pangowin32.pc %{_mingw32_datadir}/gtk-doc/html/pango/ %{_mingw32_sysconfdir}/pango/ %files static %defattr(-,root,root,-) %{_mingw32_libdir}/libpango-1.0.a %{_mingw32_libdir}/libpangocairo-1.0.a %{_mingw32_libdir}/libpangoft2-1.0.a %{_mingw32_libdir}/libpangowin32-1.0.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.a %changelog * Mon Mar 9 2009 Richard W.M. Jones - 1.23.0-1 - Remove man page which duplicates what is in base Fedora. - Rebase to 1.23.0 to match Fedora. - +BR mingw32-dlfcn. * Fri Feb 20 2009 Erik van Pienbroek - 1.22.1-6 - Added -static subpackage * Fri Feb 20 2009 Richard W.M. Jones - 1.22.1-5 - Rebuild for mingw32-gcc 4.4 * Fri Jan 30 2009 Richard W.M. Jones - 1.22.1-4 - Requires pkgconfig. * Tue Jan 27 2009 Levente Farkas - 1.22.1-3 - Include license file in documentation section. * Fri Jan 23 2009 Richard W.M. Jones - 1.22.1-2 - Disable static libraries. - Use _smp_mflags. * Fri Oct 24 2008 Richard W.M. Jones - 1.22.1-1 - New upstream version 1.22.1. - BR cairo >= 1.8.0 because of important fixes. * Wed Sep 24 2008 Richard W.M. Jones - 1.21.6-6 - Rename mingw -> mingw32. * Tue Sep 23 2008 Daniel P. Berrange - 1.21.6-5 - Remove use of wine in %-post. * Thu Sep 11 2008 Daniel P. Berrange - 1.21.6-4 - Add dep on pkgconfig * Thu Sep 11 2008 Richard W.M. Jones - 1.21.6-3 - post/preun scripts to update the pango.modules list. * Wed Sep 10 2008 Richard W.M. Jones - 1.21.6-2 - Run the correct glib-mkenums. * Tue Sep 9 2008 Daniel P. Berrange - 1.21.6-1 - Initial RPM release --- NEW FILE pango.modules --- # Pango Modules file # Automatically generated file, do not edit # # ModulesPath = Z:\usr\i686-pc-mingw32\sys-root\mingw\lib\pango\1.6.0\modules # "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-thai-fc.dll" ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-basic-win32.dll" BasicScriptEngineWin32 PangoEngineShape PangoRenderWin32 common: "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-syriac-fc.dll" SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-khmer-fc.dll" KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-arabic-lang.dll" ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-basic-fc.dll" BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common: "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-arabic-fc.dll" ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-hebrew-fc.dll" HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-tibetan-fc.dll" TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-hangul-fc.dll" HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:* pango_enable_static_build.patch: --- NEW FILE pango_enable_static_build.patch --- --- configure.in.orig 2009-02-20 20:37:09.166924103 +0100 +++ configure.in 2009-02-20 20:37:20.893924816 +0100 @@ -123,16 +123,16 @@ AC_LIBTOOL_WIN32_DLL AM_DISABLE_STATIC -if test "$pango_os_win32" = "yes"; then - if test x$enable_static = xyes -o x$enable_static = x; then - AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) - enable_static=no - fi - if test x$enable_shared = xno; then - AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) - fi - enable_shared=yes -fi +#if test "$pango_os_win32" = "yes"; then +# if test x$enable_static = xyes -o x$enable_static = x; then +# AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) +# enable_static=no +# fi +# if test x$enable_shared = xno; then +# AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) +# fi +# enable_shared=yes +#fi AM_PROG_LIBTOOL dnl when using libtool 2.x create libtool early, because it's used in configure Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pango/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:12:32 -0000 1.1 +++ .cvsignore 10 Mar 2009 22:46:59 -0000 1.2 @@ -0,0 +1 @@ +pango-1.23.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pango/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:12:32 -0000 1.1 +++ sources 10 Mar 2009 22:46:59 -0000 1.2 @@ -0,0 +1 @@ +358a87607c0a5b4889bab52b1cf5e921 pango-1.23.0.tar.bz2 From rjones at fedoraproject.org Tue Mar 10 22:47:59 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 22:47:59 +0000 (UTC) Subject: rpms/mingw32-pango/EL-5 import.log, NONE, 1.1 mingw32-pango.spec, NONE, 1.1 pango.modules, NONE, 1.1 pango_enable_static_build.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090310224759.438987002E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-pango/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31795/EL-5 Modified Files: .cvsignore sources Added Files: import.log mingw32-pango.spec pango.modules pango_enable_static_build.patch Log Message: Initial import. --- NEW FILE import.log --- mingw32-pango-1_23_0-1_fc11:EL-5:mingw32-pango-1.23.0-1.fc11.src.rpm:1236725212 --- NEW FILE mingw32-pango.spec --- %define __strip %{_mingw32_strip} %define __objdump %{_mingw32_objdump} %define _use_internal_dependency_generator 0 %define __find_requires %{_mingw32_findrequires} %define __find_provides %{_mingw32_findprovides} Name: mingw32-pango Version: 1.23.0 Release: 1%{?dist} Summary: MinGW Windows Pango library License: LGPLv2+ Group: Development/Libraries URL: http://www.pango.org Source0: http://download.gnome.org/sources/pango/1.23/pango-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Native pango uses a %post script to generate this, but the # pango-querymodules.exe binary is not something we can easily run on # a Linux host. We could use wine but wine isn't happy in a mock # environment. So we just include a pre-generated copy on basis that # it won't ever change much. # # If you want to rebuild this, do: # wine %{_mingw32_bindir}/pango-querymodules.exe > pango.modules Source1: pango.modules Patch1000: pango_enable_static_build.patch BuildArch: noarch BuildRequires: mingw32-filesystem >= 23 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-cairo >= 1.8.0 BuildRequires: mingw32-dlfcn BuildRequires: mingw32-expat BuildRequires: mingw32-fontconfig BuildRequires: mingw32-freetype BuildRequires: mingw32-gettext BuildRequires: mingw32-glib2 BuildRequires: mingw32-iconv BuildRequires: mingw32-libpng BuildRequires: mingw32-pixman BuildRequires: pkgconfig # Required in order to rebuild the configure script. BuildRequires: gtk-doc # These are required for the patch BuildRequires: autoconf, automake, libtool Requires: pkgconfig %description MinGW Windows Pango library. %package static Summary: Static version of the MinGW Windows Pango library Requires: %{name} = %{version}-%{release} Group: Development/Libraries %description static Static version of the MinGW Windows Pango library. %prep %setup -q -n pango-%{version} %patch1000 # Regenerate the configure script aclocal autoreconf libtoolize %build # Need to run the correct version of glib-mkenums. PATH=%{_mingw32_bindir}:$PATH \ %{_mingw32_configure} --enable-static --enable-shared make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pango/ cp %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pango/ rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias rm $RPM_BUILD_ROOT/%{_mingw32_mandir}/man1/*.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{_mingw32_bindir}/libpango-1.0-0.dll %{_mingw32_bindir}/libpangocairo-1.0-0.dll %{_mingw32_bindir}/libpangoft2-1.0-0.dll %{_mingw32_bindir}/libpangowin32-1.0-0.dll %{_mingw32_bindir}/pango-querymodules.exe %{_mingw32_includedir}/pango-1.0/ %{_mingw32_libdir}/libpango-1.0.dll.a %{_mingw32_libdir}/libpango-1.0.la %{_mingw32_libdir}/libpangocairo-1.0.dll.a %{_mingw32_libdir}/libpangocairo-1.0.la %{_mingw32_libdir}/libpangoft2-1.0.dll.a %{_mingw32_libdir}/libpangoft2-1.0.la %{_mingw32_libdir}/libpangowin32-1.0.dll.a %{_mingw32_libdir}/libpangowin32-1.0.la %{_mingw32_libdir}/pango-1.0.def %{_mingw32_libdir}/pangocairo-1.0.def %{_mingw32_libdir}/pangoft2-1.0.def %{_mingw32_libdir}/pangowin32-1.0.def %dir %{_mingw32_libdir}/pango %dir %{_mingw32_libdir}/pango/1.6.0 %dir %{_mingw32_libdir}/pango/1.6.0/modules %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.la %{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.dll %{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.dll.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.la %{_mingw32_libdir}/pkgconfig/pango.pc %{_mingw32_libdir}/pkgconfig/pangocairo.pc %{_mingw32_libdir}/pkgconfig/pangoft2.pc %{_mingw32_libdir}/pkgconfig/pangowin32.pc %{_mingw32_datadir}/gtk-doc/html/pango/ %{_mingw32_sysconfdir}/pango/ %files static %defattr(-,root,root,-) %{_mingw32_libdir}/libpango-1.0.a %{_mingw32_libdir}/libpangocairo-1.0.a %{_mingw32_libdir}/libpangoft2-1.0.a %{_mingw32_libdir}/libpangowin32-1.0.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.a %{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.a %changelog * Mon Mar 9 2009 Richard W.M. Jones - 1.23.0-1 - Remove man page which duplicates what is in base Fedora. - Rebase to 1.23.0 to match Fedora. - +BR mingw32-dlfcn. * Fri Feb 20 2009 Erik van Pienbroek - 1.22.1-6 - Added -static subpackage * Fri Feb 20 2009 Richard W.M. Jones - 1.22.1-5 - Rebuild for mingw32-gcc 4.4 * Fri Jan 30 2009 Richard W.M. Jones - 1.22.1-4 - Requires pkgconfig. * Tue Jan 27 2009 Levente Farkas - 1.22.1-3 - Include license file in documentation section. * Fri Jan 23 2009 Richard W.M. Jones - 1.22.1-2 - Disable static libraries. - Use _smp_mflags. * Fri Oct 24 2008 Richard W.M. Jones - 1.22.1-1 - New upstream version 1.22.1. - BR cairo >= 1.8.0 because of important fixes. * Wed Sep 24 2008 Richard W.M. Jones - 1.21.6-6 - Rename mingw -> mingw32. * Tue Sep 23 2008 Daniel P. Berrange - 1.21.6-5 - Remove use of wine in %-post. * Thu Sep 11 2008 Daniel P. Berrange - 1.21.6-4 - Add dep on pkgconfig * Thu Sep 11 2008 Richard W.M. Jones - 1.21.6-3 - post/preun scripts to update the pango.modules list. * Wed Sep 10 2008 Richard W.M. Jones - 1.21.6-2 - Run the correct glib-mkenums. * Tue Sep 9 2008 Daniel P. Berrange - 1.21.6-1 - Initial RPM release --- NEW FILE pango.modules --- # Pango Modules file # Automatically generated file, do not edit # # ModulesPath = Z:\usr\i686-pc-mingw32\sys-root\mingw\lib\pango\1.6.0\modules # "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-thai-fc.dll" ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-basic-win32.dll" BasicScriptEngineWin32 PangoEngineShape PangoRenderWin32 common: "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-syriac-fc.dll" SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-khmer-fc.dll" KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-arabic-lang.dll" ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-basic-fc.dll" BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common: "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-arabic-fc.dll" ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-hebrew-fc.dll" HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-tibetan-fc.dll" TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:* "Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-hangul-fc.dll" HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:* pango_enable_static_build.patch: --- NEW FILE pango_enable_static_build.patch --- --- configure.in.orig 2009-02-20 20:37:09.166924103 +0100 +++ configure.in 2009-02-20 20:37:20.893924816 +0100 @@ -123,16 +123,16 @@ AC_LIBTOOL_WIN32_DLL AM_DISABLE_STATIC -if test "$pango_os_win32" = "yes"; then - if test x$enable_static = xyes -o x$enable_static = x; then - AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) - enable_static=no - fi - if test x$enable_shared = xno; then - AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) - fi - enable_shared=yes -fi +#if test "$pango_os_win32" = "yes"; then +# if test x$enable_static = xyes -o x$enable_static = x; then +# AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) +# enable_static=no +# fi +# if test x$enable_shared = xno; then +# AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) +# fi +# enable_shared=yes +#fi AM_PROG_LIBTOOL dnl when using libtool 2.x create libtool early, because it's used in configure Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pango/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:12:32 -0000 1.1 +++ .cvsignore 10 Mar 2009 22:47:28 -0000 1.2 @@ -0,0 +1 @@ +pango-1.23.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pango/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:12:32 -0000 1.1 +++ sources 10 Mar 2009 22:47:28 -0000 1.2 @@ -0,0 +1 @@ +358a87607c0a5b4889bab52b1cf5e921 pango-1.23.0.tar.bz2 From silfreed at fedoraproject.org Tue Mar 10 22:54:16 2009 From: silfreed at fedoraproject.org (Douglas E. Warner) Date: Tue, 10 Mar 2009 22:54:16 +0000 (UTC) Subject: rpms/libconcord/devel .cvsignore, 1.2, 1.3 libconcord.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <20090310225417.07D8D7002E@cvs1.fedora.phx.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/libconcord/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv916 Modified Files: .cvsignore libconcord.spec sources Log Message: * Tue Mar 10 2009 Douglas E. Warner 0.21-1 - moving policykit rule generation from concordnace to here - including new upstream install for policykit/hal/udev rules - removing registered marks - supports updating firmware on 5** remotes - improved IR learning support Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libconcord/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Jan 2009 13:53:55 -0000 1.2 +++ .cvsignore 10 Mar 2009 22:53:45 -0000 1.3 @@ -1 +1 @@ -concordance-0.20.tar.bz2 +concordance-0.21.tar.bz2 Index: libconcord.spec =================================================================== RCS file: /cvs/pkgs/rpms/libconcord/devel/libconcord.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libconcord.spec 25 Feb 2009 14:11:02 -0000 1.4 +++ libconcord.spec 10 Mar 2009 22:53:46 -0000 1.5 @@ -2,8 +2,8 @@ %define mainpkg concordance Name: libconcord -Version: 0.20 -Release: 8%{?dist} +Version: 0.21 +Release: 1%{?dist} Summary: Library to talk to Logitech Harmony universal remote controls Group: Development/Libraries @@ -17,6 +17,9 @@ BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: python-devel BuildRequires: python-setuptools-devel +Requires: hal +Requires: udev +Requires: PolicyKit Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -60,6 +63,8 @@ cd %{name} %configure --disable-static make %{_smp_mflags} +make policykit + # perl bindings cd bindings/perl @@ -84,6 +89,7 @@ cd %{name} make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install_policykit find %{buildroot} -type f -name \*.a -exec %{__rm} -f {} \; find %{buildroot} -type f -name \*.la -exec %{__rm} -f {} \; @@ -120,15 +126,24 @@ rm -rf %{buildroot} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +/sbin/udevcontrol reload_rules +touch /var/lib/misc/PolicyKit.reload + +%postun +/sbin/ldconfig +/sbin/udevcontrol reload_rules +touch /var/lib/misc/PolicyKit.reload %files %defattr(-, root, root, -) %doc Changelog CodingStyle LICENSE SubmittingPatches %doc %{name}/README %{name}/INSTALL.linux +%config(noreplace) %{_sysconfdir}/udev/rules.d/*.rules +%{_datadir}/hal/fdi/policy/10osvendor/*.fdi +%{_datadir}/PolicyKit/policy/*.policy %{_libdir}/*.so.* %files devel @@ -150,6 +165,13 @@ %changelog +* Tue Mar 10 2009 Douglas E. Warner 0.21-1 +- moving policykit rule generation from concordnace to here +- including new upstream install for policykit/hal/udev rules +- removing registered marks +- supports updating firmware on 5** remotes +- improved IR learning support + * Wed Feb 25 2009 Fedora Release Engineering - 0.20-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libconcord/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 May 2008 14:23:28 -0000 1.2 +++ sources 10 Mar 2009 22:53:46 -0000 1.3 @@ -1 +1 @@ -c2487e851864f38c4da4fe02093652a5 concordance-0.20.tar.bz2 +87878bb23c5f4173c6bc744b93d5694d concordance-0.21.tar.bz2 From silfreed at fedoraproject.org Tue Mar 10 22:56:32 2009 From: silfreed at fedoraproject.org (Douglas E. Warner) Date: Tue, 10 Mar 2009 22:56:32 +0000 (UTC) Subject: rpms/libconcord/F-10 .cvsignore, 1.1, 1.2 libconcord.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090310225632.9FE8E7002E@cvs1.fedora.phx.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/libconcord/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1836 Modified Files: .cvsignore libconcord.spec sources Log Message: * Tue Mar 10 2009 Douglas E. Warner 0.21-1 - moving policykit rule generation from concordnace to here - including new upstream install for policykit/hal/udev rules - removing registered marks - supports updating firmware on 5** remotes - improved IR learning support Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libconcord/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 May 2008 04:14:37 -0000 1.1 +++ .cvsignore 10 Mar 2009 22:56:01 -0000 1.2 @@ -0,0 +1 @@ +concordance-0.21.tar.bz2 Index: libconcord.spec =================================================================== RCS file: /cvs/pkgs/rpms/libconcord/F-10/libconcord.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libconcord.spec 30 Jan 2009 13:53:55 -0000 1.2 +++ libconcord.spec 10 Mar 2009 22:56:02 -0000 1.3 @@ -2,8 +2,8 @@ %define mainpkg concordance Name: libconcord -Version: 0.20 -Release: 6%{?dist} +Version: 0.21 +Release: 1%{?dist} Summary: Library to talk to Logitech Harmony universal remote controls Group: Development/Libraries @@ -17,6 +17,9 @@ BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: python-devel BuildRequires: python-setuptools-devel +Requires: hal +Requires: udev +Requires: PolicyKit Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -60,6 +63,8 @@ cd %{name} %configure --disable-static make %{_smp_mflags} +make policykit + # perl bindings cd bindings/perl @@ -84,6 +89,7 @@ cd %{name} make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install_policykit find %{buildroot} -type f -name \*.a -exec %{__rm} -f {} \; find %{buildroot} -type f -name \*.la -exec %{__rm} -f {} \; @@ -120,15 +126,24 @@ rm -rf %{buildroot} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +/sbin/udevcontrol reload_rules +touch /var/lib/misc/PolicyKit.reload + +%postun +/sbin/ldconfig +/sbin/udevcontrol reload_rules +touch /var/lib/misc/PolicyKit.reload %files %defattr(-, root, root, -) %doc Changelog CodingStyle LICENSE SubmittingPatches %doc %{name}/README %{name}/INSTALL.linux +%config(noreplace) %{_sysconfdir}/udev/rules.d/*.rules +%{_datadir}/hal/fdi/policy/10osvendor/*.fdi +%{_datadir}/PolicyKit/policy/*.policy %{_libdir}/*.so.* %files devel @@ -150,6 +165,13 @@ %changelog +* Tue Mar 10 2009 Douglas E. Warner 0.21-1 +- moving policykit rule generation from concordnace to here +- including new upstream install for policykit/hal/udev rules +- removing registered marks +- supports updating firmware on 5** remotes +- improved IR learning support + * Fri Jan 30 2009 Douglas E. Warner 0.20-6 - removing registered marks Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libconcord/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 May 2008 14:23:28 -0000 1.2 +++ sources 10 Mar 2009 22:56:02 -0000 1.3 @@ -1 +1 @@ -c2487e851864f38c4da4fe02093652a5 concordance-0.20.tar.bz2 +87878bb23c5f4173c6bc744b93d5694d concordance-0.21.tar.bz2 From silfreed at fedoraproject.org Tue Mar 10 22:57:49 2009 From: silfreed at fedoraproject.org (Douglas E. Warner) Date: Tue, 10 Mar 2009 22:57:49 +0000 (UTC) Subject: rpms/libconcord/F-9 .cvsignore, 1.1, 1.2 libconcord.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090310225749.E2F337002E@cvs1.fedora.phx.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/libconcord/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2423 Modified Files: .cvsignore libconcord.spec sources Log Message: * Tue Mar 10 2009 Douglas E. Warner 0.21-1 - moving policykit rule generation from concordnace to here - including new upstream install for policykit/hal/udev rules - removing registered marks - supports updating firmware on 5** remotes - improved IR learning support Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libconcord/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 May 2008 04:14:37 -0000 1.1 +++ .cvsignore 10 Mar 2009 22:57:18 -0000 1.2 @@ -0,0 +1 @@ +concordance-0.21.tar.bz2 Index: libconcord.spec =================================================================== RCS file: /cvs/pkgs/rpms/libconcord/F-9/libconcord.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libconcord.spec 30 Jan 2009 13:53:55 -0000 1.2 +++ libconcord.spec 10 Mar 2009 22:57:19 -0000 1.3 @@ -2,8 +2,8 @@ %define mainpkg concordance Name: libconcord -Version: 0.20 -Release: 6%{?dist} +Version: 0.21 +Release: 1%{?dist} Summary: Library to talk to Logitech Harmony universal remote controls Group: Development/Libraries @@ -17,6 +17,9 @@ BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: python-devel BuildRequires: python-setuptools-devel +Requires: hal +Requires: udev +Requires: PolicyKit Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -60,6 +63,8 @@ cd %{name} %configure --disable-static make %{_smp_mflags} +make policykit + # perl bindings cd bindings/perl @@ -84,6 +89,7 @@ cd %{name} make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install_policykit find %{buildroot} -type f -name \*.a -exec %{__rm} -f {} \; find %{buildroot} -type f -name \*.la -exec %{__rm} -f {} \; @@ -120,15 +126,24 @@ rm -rf %{buildroot} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +/sbin/udevcontrol reload_rules +touch /var/lib/misc/PolicyKit.reload + +%postun +/sbin/ldconfig +/sbin/udevcontrol reload_rules +touch /var/lib/misc/PolicyKit.reload %files %defattr(-, root, root, -) %doc Changelog CodingStyle LICENSE SubmittingPatches %doc %{name}/README %{name}/INSTALL.linux +%config(noreplace) %{_sysconfdir}/udev/rules.d/*.rules +%{_datadir}/hal/fdi/policy/10osvendor/*.fdi +%{_datadir}/PolicyKit/policy/*.policy %{_libdir}/*.so.* %files devel @@ -150,6 +165,13 @@ %changelog +* Tue Mar 10 2009 Douglas E. Warner 0.21-1 +- moving policykit rule generation from concordnace to here +- including new upstream install for policykit/hal/udev rules +- removing registered marks +- supports updating firmware on 5** remotes +- improved IR learning support + * Fri Jan 30 2009 Douglas E. Warner 0.20-6 - removing registered marks Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libconcord/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 May 2008 14:23:16 -0000 1.2 +++ sources 10 Mar 2009 22:57:19 -0000 1.3 @@ -1 +1 @@ -c2487e851864f38c4da4fe02093652a5 concordance-0.20.tar.bz2 +87878bb23c5f4173c6bc744b93d5694d concordance-0.21.tar.bz2 From silfreed at fedoraproject.org Tue Mar 10 23:02:24 2009 From: silfreed at fedoraproject.org (Douglas E. Warner) Date: Tue, 10 Mar 2009 23:02:24 +0000 (UTC) Subject: rpms/concordance/devel .cvsignore, 1.2, 1.3 concordance.spec, 1.3, 1.4 sources, 1.2, 1.3 concordance-gen-policykit-rules.sh, 1.1, NONE Message-ID: <20090310230224.789FD7002E@cvs1.fedora.phx.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/concordance/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3377 Modified Files: .cvsignore concordance.spec sources Removed Files: concordance-gen-policykit-rules.sh Log Message: * Tue Mar 10 2009 Douglas E. Warner 0.21-1 - moved udev/policykit rules to libconcord package - supports flashing 5** remotes - improved IR learning support Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/concordance/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 May 2008 14:23:23 -0000 1.2 +++ .cvsignore 10 Mar 2009 23:01:53 -0000 1.3 @@ -1 +1 @@ -concordance-0.20.tar.bz2 +concordance-0.21.tar.bz2 Index: concordance.spec =================================================================== RCS file: /cvs/pkgs/rpms/concordance/devel/concordance.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- concordance.spec 24 Feb 2009 08:49:59 -0000 1.3 +++ concordance.spec 10 Mar 2009 23:01:53 -0000 1.4 @@ -1,22 +1,16 @@ Name: concordance -Version: 0.20 -Release: 6%{?dist} +Version: 0.21 +Release: 1%{?dist} Summary: Software to program the Logitech Harmony remote control -%define policykit_rules 10-%{name}.fdi Group: Applications/Communications License: GPLv3+ URL: http://www.phildev.net/concordance/ Source0: http://downloads.sourceforge.net/sourceforge/concordance/%{name}-%{version}.tar.bz2 -Source1: concordance-gen-policykit-rules.sh BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Requires: hal -Requires: pam -Requires: udev BuildRequires: libusb-devel -BuildRequires: libconcord-devel -BuildRequires: libxml2 +BuildRequires: libconcord-devel >= %{version} %description This software will allow you to program your Logitech Harmony universal @@ -35,12 +29,6 @@ %configure --enable-shared make %{_smp_mflags} -# generate PolicyKit rules -bash %{SOURCE1} | xmllint - > %{policykit_rules} -if [ -z %{policykit_rules} ]; then - exit 1 -fi - %install rm -rf %{buildroot} @@ -48,11 +36,6 @@ cd %{name} make DESTDIR=%{buildroot} install -# install PolicyKit rules -install -d %{buildroot}/%{_datadir}/hal/fdi/policy/10osvendor/ -install -m 0644 %{policykit_rules} \ - %{buildroot}/%{_datadir}/hal/fdi/policy/10osvendor/ - %clean rm -rf %{buildroot} @@ -62,12 +45,16 @@ %defattr(0644, root, root, 0755) %doc Changelog CodingStyle LICENSE SubmittingPatches TODO %doc %{name}/README %{name}/INSTALL.linux -%{_datadir}/hal/fdi/policy/10osvendor/* %attr(0755, root, root) %{_bindir}/* %{_mandir}/man1/* %changelog +* Tue Mar 10 2009 Douglas E. Warner 0.21-1 +- moved udev/policykit rules to libconcord package +- supports flashing 5** remotes +- improved IR learning support + * Tue Feb 24 2009 Fedora Release Engineering - 0.20-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/concordance/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 May 2008 14:23:23 -0000 1.2 +++ sources 10 Mar 2009 23:01:54 -0000 1.3 @@ -1 +1 @@ -c2487e851864f38c4da4fe02093652a5 concordance-0.20.tar.bz2 +87878bb23c5f4173c6bc744b93d5694d concordance-0.21.tar.bz2 --- concordance-gen-policykit-rules.sh DELETED --- From silfreed at fedoraproject.org Tue Mar 10 23:07:26 2009 From: silfreed at fedoraproject.org (Douglas E. Warner) Date: Tue, 10 Mar 2009 23:07:26 +0000 (UTC) Subject: rpms/concordance/F-10 .cvsignore, 1.2, 1.3 concordance.spec, 1.2, 1.3 sources, 1.2, 1.3 concordance-gen-policykit-rules.sh, 1.1, NONE Message-ID: <20090310230726.63A747002E@cvs1.fedora.phx.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/concordance/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4330 Modified Files: .cvsignore concordance.spec sources Removed Files: concordance-gen-policykit-rules.sh Log Message: * Tue Mar 10 2009 Douglas E. Warner 0.21-1 - moved udev/policykit rules to libconcord package - supports flashing 5** remotes - improved IR learning support Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/concordance/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 May 2008 14:23:23 -0000 1.2 +++ .cvsignore 10 Mar 2009 23:06:55 -0000 1.3 @@ -1 +1 @@ -concordance-0.20.tar.bz2 +concordance-0.21.tar.bz2 Index: concordance.spec =================================================================== RCS file: /cvs/pkgs/rpms/concordance/F-10/concordance.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- concordance.spec 30 Jan 2009 13:59:53 -0000 1.2 +++ concordance.spec 10 Mar 2009 23:06:55 -0000 1.3 @@ -1,22 +1,16 @@ Name: concordance -Version: 0.20 -Release: 5%{?dist} +Version: 0.21 +Release: 1%{?dist} Summary: Software to program the Logitech Harmony remote control -%define policykit_rules 10-%{name}.fdi Group: Applications/Communications License: GPLv3+ URL: http://www.phildev.net/concordance/ Source0: http://downloads.sourceforge.net/sourceforge/concordance/%{name}-%{version}.tar.bz2 -Source1: concordance-gen-policykit-rules.sh BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Requires: hal -Requires: pam -Requires: udev BuildRequires: libusb-devel -BuildRequires: libconcord-devel -BuildRequires: libxml2 +BuildRequires: libconcord-devel >= %{version} %description This software will allow you to program your Logitech Harmony universal @@ -35,12 +29,6 @@ %configure --enable-shared make %{_smp_mflags} -# generate PolicyKit rules -bash %{SOURCE1} | xmllint - > %{policykit_rules} -if [ -z %{policykit_rules} ]; then - exit 1 -fi - %install rm -rf %{buildroot} @@ -48,11 +36,6 @@ cd %{name} make DESTDIR=%{buildroot} install -# install PolicyKit rules -install -d %{buildroot}/%{_datadir}/hal/fdi/policy/10osvendor/ -install -m 0644 %{policykit_rules} \ - %{buildroot}/%{_datadir}/hal/fdi/policy/10osvendor/ - %clean rm -rf %{buildroot} @@ -62,12 +45,16 @@ %defattr(0644, root, root, 0755) %doc Changelog CodingStyle LICENSE SubmittingPatches TODO %doc %{name}/README %{name}/INSTALL.linux -%{_datadir}/hal/fdi/policy/10osvendor/* %attr(0755, root, root) %{_bindir}/* %{_mandir}/man1/* %changelog +* Tue Mar 10 2009 Douglas E. Warner 0.21-1 +- moved udev/policykit rules to libconcord package +- supports flashing 5** remotes +- improved IR learning support + * Fri Jan 30 2009 Douglas E. Warner 0.20-5 - removing registered marks Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/concordance/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 May 2008 14:23:23 -0000 1.2 +++ sources 10 Mar 2009 23:06:55 -0000 1.3 @@ -1 +1 @@ -c2487e851864f38c4da4fe02093652a5 concordance-0.20.tar.bz2 +87878bb23c5f4173c6bc744b93d5694d concordance-0.21.tar.bz2 --- concordance-gen-policykit-rules.sh DELETED --- From whot at fedoraproject.org Tue Mar 10 23:08:35 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Tue, 10 Mar 2009 23:08:35 +0000 (UTC) Subject: rpms/xorg-x11-server/F-10 10-x11-keymap.fdi, 1.2, 1.3 xorg-x11-server.spec, 1.393, 1.394 Message-ID: <20090310230835.01B847002E@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/xorg-x11-server/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4515 Modified Files: 10-x11-keymap.fdi xorg-x11-server.spec Log Message: * Wed Mar 11 2009 Peter Hutterer 1.5.3-15 - Revert to 1.5.3-10 version of 10-x11-keymap.fdi. (#484488) Index: 10-x11-keymap.fdi =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-10/10-x11-keymap.fdi,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 10-x11-keymap.fdi 5 Feb 2009 23:06:06 -0000 1.2 +++ 10-x11-keymap.fdi 10 Mar 2009 23:08:03 -0000 1.3 @@ -1,7 +1,7 @@ - + fedora-setup-keyboard Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-10/xorg-x11-server.spec,v retrieving revision 1.393 retrieving revision 1.394 diff -u -r1.393 -r1.394 --- xorg-x11-server.spec 21 Feb 2009 18:56:37 -0000 1.393 +++ xorg-x11-server.spec 10 Mar 2009 23:08:04 -0000 1.394 @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.5.3 -Release: 14%{?dist} +Release: 15%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -536,6 +536,9 @@ %changelog +* Wed Mar 11 2009 Peter Hutterer 1.5.3-15 +- Revert to 1.5.3-10 version of 10-x11-keymap.fdi. (#484488) + * Sat Feb 21 2009 Adam Jackson 1.5.3-14 - xserver-1.5.3-hdmi.patch: Add xf86MonitorIsHDMI(). (#485557) From silfreed at fedoraproject.org Tue Mar 10 23:08:53 2009 From: silfreed at fedoraproject.org (Douglas E. Warner) Date: Tue, 10 Mar 2009 23:08:53 +0000 (UTC) Subject: rpms/concordance/F-9 .cvsignore, 1.1, 1.2 concordance.spec, 1.2, 1.3 sources, 1.2, 1.3 concordance-gen-policykit-rules.sh, 1.1, NONE Message-ID: <20090310230853.B427D7002E@cvs1.fedora.phx.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/concordance/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4719 Modified Files: .cvsignore concordance.spec sources Removed Files: concordance-gen-policykit-rules.sh Log Message: * Tue Mar 10 2009 Douglas E. Warner 0.21-1 - moved udev/policykit rules to libconcord package - supports flashing 5** remotes - improved IR learning support Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/concordance/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 May 2008 04:08:27 -0000 1.1 +++ .cvsignore 10 Mar 2009 23:08:23 -0000 1.2 @@ -0,0 +1 @@ +concordance-0.21.tar.bz2 Index: concordance.spec =================================================================== RCS file: /cvs/pkgs/rpms/concordance/F-9/concordance.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- concordance.spec 30 Jan 2009 13:59:53 -0000 1.2 +++ concordance.spec 10 Mar 2009 23:08:23 -0000 1.3 @@ -1,22 +1,16 @@ Name: concordance -Version: 0.20 -Release: 5%{?dist} +Version: 0.21 +Release: 1%{?dist} Summary: Software to program the Logitech Harmony remote control -%define policykit_rules 10-%{name}.fdi Group: Applications/Communications License: GPLv3+ URL: http://www.phildev.net/concordance/ Source0: http://downloads.sourceforge.net/sourceforge/concordance/%{name}-%{version}.tar.bz2 -Source1: concordance-gen-policykit-rules.sh BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Requires: hal -Requires: pam -Requires: udev BuildRequires: libusb-devel -BuildRequires: libconcord-devel -BuildRequires: libxml2 +BuildRequires: libconcord-devel >= %{version} %description This software will allow you to program your Logitech Harmony universal @@ -35,12 +29,6 @@ %configure --enable-shared make %{_smp_mflags} -# generate PolicyKit rules -bash %{SOURCE1} | xmllint - > %{policykit_rules} -if [ -z %{policykit_rules} ]; then - exit 1 -fi - %install rm -rf %{buildroot} @@ -48,11 +36,6 @@ cd %{name} make DESTDIR=%{buildroot} install -# install PolicyKit rules -install -d %{buildroot}/%{_datadir}/hal/fdi/policy/10osvendor/ -install -m 0644 %{policykit_rules} \ - %{buildroot}/%{_datadir}/hal/fdi/policy/10osvendor/ - %clean rm -rf %{buildroot} @@ -62,12 +45,16 @@ %defattr(0644, root, root, 0755) %doc Changelog CodingStyle LICENSE SubmittingPatches TODO %doc %{name}/README %{name}/INSTALL.linux -%{_datadir}/hal/fdi/policy/10osvendor/* %attr(0755, root, root) %{_bindir}/* %{_mandir}/man1/* %changelog +* Tue Mar 10 2009 Douglas E. Warner 0.21-1 +- moved udev/policykit rules to libconcord package +- supports flashing 5** remotes +- improved IR learning support + * Fri Jan 30 2009 Douglas E. Warner 0.20-5 - removing registered marks Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/concordance/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 May 2008 14:23:17 -0000 1.2 +++ sources 10 Mar 2009 23:08:23 -0000 1.3 @@ -1 +1 @@ -c2487e851864f38c4da4fe02093652a5 concordance-0.20.tar.bz2 +87878bb23c5f4173c6bc744b93d5694d concordance-0.21.tar.bz2 --- concordance-gen-policykit-rules.sh DELETED --- From pbrobinson at fedoraproject.org Tue Mar 10 23:09:28 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Tue, 10 Mar 2009 23:09:28 +0000 (UTC) Subject: rpms/gupnp-vala/F-10 gupnp-vala.spec,1.1,1.2 Message-ID: <20090310230928.A05EF7002E@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gupnp-vala/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4852 Modified Files: gupnp-vala.spec Log Message: - increment build Index: gupnp-vala.spec =================================================================== RCS file: /cvs/pkgs/rpms/gupnp-vala/F-10/gupnp-vala.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gupnp-vala.spec 10 Mar 2009 22:36:59 -0000 1.1 +++ gupnp-vala.spec 10 Mar 2009 23:08:58 -0000 1.2 @@ -1,6 +1,6 @@ Name: gupnp-vala Version: 0.5.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUPnP is a upnp framework. This adds vala language bindings Group: Development/Languages @@ -57,6 +57,9 @@ %{_libdir}/pkgconfig/gupnp-vala-1.0.pc %changelog +* Tue Mar 10 2009 Peter Robinson 0.5.3-3 +- Increment build + * Tue Mar 10 2009 Peter Robinson 0.5.3-2 - Patch for noarch and some reqs thanks to Michel Salim From rjones at fedoraproject.org Tue Mar 10 23:20:45 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 23:20:45 +0000 (UTC) Subject: rpms/mingw32-pango/EL-5 mingw32-pango.spec,1.1,1.2 Message-ID: <20090310232045.869E67002F@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-pango/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7994 Modified Files: mingw32-pango.spec Log Message: Disable static build (in EL-5). Rerunning autotools fails. Index: mingw32-pango.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pango/EL-5/mingw32-pango.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mingw32-pango.spec 10 Mar 2009 22:47:28 -0000 1.1 +++ mingw32-pango.spec 10 Mar 2009 23:20:13 -0000 1.2 @@ -26,8 +26,6 @@ # wine %{_mingw32_bindir}/pango-querymodules.exe > pango.modules Source1: pango.modules -Patch1000: pango_enable_static_build.patch - BuildArch: noarch BuildRequires: mingw32-filesystem >= 23 @@ -59,29 +57,14 @@ MinGW Windows Pango library. -%package static -Summary: Static version of the MinGW Windows Pango library -Requires: %{name} = %{version}-%{release} -Group: Development/Libraries - -%description static -Static version of the MinGW Windows Pango library. - - %prep %setup -q -n pango-%{version} -%patch1000 - -# Regenerate the configure script -aclocal -autoreconf -libtoolize %build # Need to run the correct version of glib-mkenums. PATH=%{_mingw32_bindir}:$PATH \ -%{_mingw32_configure} --enable-static --enable-shared +%{_mingw32_configure} --disable-static --enable-shared make %{?_smp_mflags} @@ -170,27 +153,10 @@ %{_mingw32_sysconfdir}/pango/ -%files static -%defattr(-,root,root,-) -%{_mingw32_libdir}/libpango-1.0.a -%{_mingw32_libdir}/libpangocairo-1.0.a -%{_mingw32_libdir}/libpangoft2-1.0.a -%{_mingw32_libdir}/libpangowin32-1.0.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.a - - %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 1.23.0-2 +- Disable static build (in EL-5). Rerunning autotools fails. + * Mon Mar 9 2009 Richard W.M. Jones - 1.23.0-1 - Remove man page which duplicates what is in base Fedora. - Rebase to 1.23.0 to match Fedora. From pbrobinson at fedoraproject.org Tue Mar 10 23:20:59 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Tue, 10 Mar 2009 23:20:59 +0000 (UTC) Subject: rpms/gupnp-vala/F-10 gupnp-vala.spec,1.2,1.3 Message-ID: <20090310232059.DDF5B7002F@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/gupnp-vala/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8066 Modified Files: gupnp-vala.spec Log Message: - Add back the configure line, its sort of useful Index: gupnp-vala.spec =================================================================== RCS file: /cvs/pkgs/rpms/gupnp-vala/F-10/gupnp-vala.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gupnp-vala.spec 10 Mar 2009 23:08:58 -0000 1.2 +++ gupnp-vala.spec 10 Mar 2009 23:20:29 -0000 1.3 @@ -1,6 +1,6 @@ Name: gupnp-vala Version: 0.5.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GUPnP is a upnp framework. This adds vala language bindings Group: Development/Languages @@ -30,6 +30,7 @@ %setup -q %build +%configure make %{?_smp_mflags} %install @@ -57,6 +58,9 @@ %{_libdir}/pkgconfig/gupnp-vala-1.0.pc %changelog +* Tue Mar 10 2009 Peter Robinson 0.5.3-4 +- Add back the configure line, its sort of useful! + * Tue Mar 10 2009 Peter Robinson 0.5.3-3 - Increment build From rjones at fedoraproject.org Tue Mar 10 23:21:51 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 10 Mar 2009 23:21:51 +0000 (UTC) Subject: rpms/mingw32-pango/EL-5 mingw32-pango.spec,1.2,1.3 Message-ID: <20090310232151.6AF567002F@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-pango/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8262 Modified Files: mingw32-pango.spec Log Message: Bump release. Index: mingw32-pango.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pango/EL-5/mingw32-pango.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mingw32-pango.spec 10 Mar 2009 23:20:13 -0000 1.2 +++ mingw32-pango.spec 10 Mar 2009 23:21:20 -0000 1.3 @@ -6,7 +6,7 @@ Name: mingw32-pango Version: 1.23.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Pango library License: LGPLv2+ From glommer at fedoraproject.org Tue Mar 10 23:44:05 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 10 Mar 2009 23:44:05 +0000 (UTC) Subject: rpms/qemu/devel .cvsignore, 1.11, 1.12 qemu.spec, 1.63, 1.64 sources, 1.11, 1.12 qemu-sasl-01-tls-handshake-fix.patch, 1.2, NONE qemu-sasl-02-vnc-monitor-info.patch, 1.2, NONE qemu-sasl-03-display-keymaps.patch, 1.2, NONE qemu-sasl-04-vnc-struct.patch, 1.2, NONE qemu-sasl-05-vnc-tls-vencrypt.patch, 1.2, NONE qemu-sasl-06-vnc-sasl.patch, 1.2, NONE qemu-sasl-07-vnc-monitor-authinfo.patch, 1.2, NONE qemu-sasl-08-vnc-acl-mgmt.patch, 1.2, NONE Message-ID: <20090310234406.42E927002F@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13180 Modified Files: .cvsignore qemu.spec sources Removed Files: qemu-sasl-01-tls-handshake-fix.patch qemu-sasl-02-vnc-monitor-info.patch qemu-sasl-03-display-keymaps.patch qemu-sasl-04-vnc-struct.patch qemu-sasl-05-vnc-tls-vencrypt.patch qemu-sasl-06-vnc-sasl.patch qemu-sasl-07-vnc-monitor-authinfo.patch qemu-sasl-08-vnc-acl-mgmt.patch Log Message: updated to new snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 3 Mar 2009 23:57:07 -0000 1.11 +++ .cvsignore 10 Mar 2009 23:43:31 -0000 1.12 @@ -1 +1 @@ -kvm-84.git-snapshot-20090303.tar.gz +kvm-84.git-snapshot-20090310.tar.gz Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- qemu.spec 10 Mar 2009 20:59:18 -0000 1.63 +++ qemu.spec 10 Mar 2009 23:43:33 -0000 1.64 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.5.kvm20090303git%{?dist} +Release: 0.6.kvm20090310git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -10,25 +10,12 @@ URL: http://www.qemu.org/ #Source0: http://www.qemu.org/%{name}-%{version}.tar.gz # FIXME: Say how to get the sources -Source0: kvm-84.git-snapshot-20090303.tar.gz +Source0: kvm-84.git-snapshot-20090310.tar.gz Source1: qemu.init Source2: kvm.modules -# VNC SASL authentication support -# Not upstream yet, but approved for commit immediately -# after this release -Patch1: qemu-sasl-01-tls-handshake-fix.patch -Patch2: qemu-sasl-02-vnc-monitor-info.patch -Patch3: qemu-sasl-03-display-keymaps.patch -Patch4: qemu-sasl-04-vnc-struct.patch -Patch5: qemu-sasl-05-vnc-tls-vencrypt.patch -Patch6: qemu-sasl-06-vnc-sasl.patch -Patch7: qemu-sasl-07-vnc-monitor-authinfo.patch -Patch8: qemu-sasl-08-vnc-acl-mgmt.patch -Patch9: kvm-upstream-ppc.patch -Patch10: kvm-fix-strayR.patch -# NB, delibrately not including patch 09 which is not -# intended for commit +Patch1: kvm-upstream-ppc.patch +Patch2: kvm-fix-strayR.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel @@ -190,25 +177,9 @@ %endif %prep -%setup -q -n kvm-84.git-snapshot-20090303 -# 01-tls-handshake-fix +%setup -q -n kvm-84.git-snapshot-20090310 %patch1 -p1 -# 02-vnc-monitor-info %patch2 -p1 -# 03-display-keymaps -%patch3 -p1 -# 04-vnc-struct -%patch4 -p1 -# 05-vnc-tls-vencrypt -%patch5 -p1 -# 06-vnc-sasl -%patch6 -p1 -# 07-vnc-monitor-authinfo -%patch7 -p1 -# 08-vnc-acl-mgmt -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -258,7 +229,7 @@ sparc32plus-linux-user" \ --prefix=%{_prefix} \ --interp-prefix=%{_prefix}/qemu-%%M \ - --kerneldir=$(pwd)/../kernel --prefix=%{_prefix} \ + --kerneldir=$(pwd)/../kernel --prefix=%{_prefix} \ --disable-kvm \ --extra-ldflags=$extraldflags @@ -438,6 +409,10 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Tue Mar 10 2009 Glauber Costa - 2:0.10-0.6.kvm20090310git +- updated to kvm20090310git +- removed sasl patches (already in this release) + * Tue Mar 10 2009 Glauber Costa - 2:0.10-0.5.kvm20090303git - kvm.modules were being wrongly mentioned at %%install. - update description for the x86 system package to include kvm support Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 3 Mar 2009 23:57:07 -0000 1.11 +++ sources 10 Mar 2009 23:43:33 -0000 1.12 @@ -1 +1 @@ -b81c0982015b21e01fe93a1d9405def8 kvm-84.git-snapshot-20090303.tar.gz +a43cc777acc08855e0364d249bff3da6 kvm-84.git-snapshot-20090310.tar.gz --- qemu-sasl-01-tls-handshake-fix.patch DELETED --- --- qemu-sasl-02-vnc-monitor-info.patch DELETED --- --- qemu-sasl-03-display-keymaps.patch DELETED --- --- qemu-sasl-04-vnc-struct.patch DELETED --- --- qemu-sasl-05-vnc-tls-vencrypt.patch DELETED --- --- qemu-sasl-06-vnc-sasl.patch DELETED --- --- qemu-sasl-07-vnc-monitor-authinfo.patch DELETED --- --- qemu-sasl-08-vnc-acl-mgmt.patch DELETED --- From pgordon at fedoraproject.org Wed Mar 11 00:02:03 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Wed, 11 Mar 2009 00:02:03 +0000 (UTC) Subject: rpms/deluge/devel deluge-scalable-icon-dir.diff, NONE, 1.1 deluge.spec, 1.86, 1.87 Message-ID: <20090311000203.D03887002F@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/deluge/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17973 Modified Files: deluge.spec Added Files: deluge-scalable-icon-dir.diff Log Message: Fix scalable icon installation. (Thanks, Mamoru Tasaka - bug #483443) deluge-scalable-icon-dir.diff: --- NEW FILE deluge-scalable-icon-dir.diff --- diff -up ./setup.py.old ./setup.py --- ./setup.py.old 2009-03-10 16:50:52.000000000 -0700 +++ ./setup.py 2009-03-10 16:51:04.000000000 -0700 @@ -328,7 +328,7 @@ cmdclass = { # Data files to be installed to the system _data_files = [ - ('share/icons/scalable/apps', ['deluge/data/icons/scalable/apps/deluge.svg']), + ('share/icons/hicolor/scalable/apps', ['deluge/data/icons/scalable/apps/deluge.svg']), ('share/icons/hicolor/128x128/apps', ['deluge/data/icons/hicolor/128x128/apps/deluge.png']), ('share/icons/hicolor/16x16/apps', ['deluge/data/icons/hicolor/16x16/apps/deluge.png']), ('share/icons/hicolor/192x192/apps', ['deluge/data/icons/hicolor/192x192/apps/deluge.png']), Index: deluge.spec =================================================================== RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- deluge.spec 10 Mar 2009 05:00:56 -0000 1.86 +++ deluge.spec 11 Mar 2009 00:01:32 -0000 1.87 @@ -7,7 +7,7 @@ Name: deluge Version: 1.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A GTK+ BitTorrent client with support for DHT, UPnP, and PEX Group: Applications/Internet License: GPLv2+ @@ -15,6 +15,9 @@ Source0: http://download.deluge-torrent.org/source/%{version}/%{name}-%{version}.tar.bz2 +## The scalable icon needs to be installed to the proper place. +Patch0: %{name}-scalable-icon-dir.diff + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -50,6 +53,7 @@ %prep %setup -qn "%{name}-%{version}" +%patch0 -p0 -b .fix-scalable-icon-dir %build @@ -122,8 +126,7 @@ %{_bindir}/%{name}d %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.* -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/icons/scalable/ +%{_datadir}/icons/hicolor/*/apps/%{name}.* %{_mandir}/man?/%{name}* @@ -144,6 +147,10 @@ %changelog +* Tue Mar 10 2009 Peter Gordon - 1.1.4-2 +- Fix the installed location of the scalable (SVG) icon (#483443). + + scalable-icon-dir.diff + * Mon Mar 09 2009 Peter Gordon - 1.1.4-1 - Update to new upstream bug-fix release (1.1.4) From glommer at fedoraproject.org Wed Mar 11 00:03:21 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 11 Mar 2009 00:03:21 +0000 (UTC) Subject: rpms/qemu/devel kvm-upstream-ppc.patch,1.1,1.2 qemu.spec,1.64,1.65 Message-ID: <20090311000321.870E27002F@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18329 Modified Files: kvm-upstream-ppc.patch qemu.spec Log Message: modified ppc patch kvm-upstream-ppc.patch: Index: kvm-upstream-ppc.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/kvm-upstream-ppc.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kvm-upstream-ppc.patch 3 Mar 2009 23:57:07 -0000 1.1 +++ kvm-upstream-ppc.patch 11 Mar 2009 00:02:51 -0000 1.2 @@ -1,4 +1,4 @@ -From 1efd319579c8f34974d654b0a5ac5144424e693e Mon Sep 17 00:00:00 2001 +From 796d42657fb238cf23a78620051f533662557e2b Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Fri, 13 Feb 2009 13:00:31 -0500 Subject: [PATCH] use KVM_UPSTREAM for ppc. @@ -12,10 +12,11 @@ Signed-off-by: Glauber Costa --- - qemu/hw/ppc440.c | 1 + - qemu/hw/ppc440_bamboo.c | 1 + - qemu/target-ppc/helper.c | 1 + - 3 files changed, 3 insertions(+), 0 deletions(-) + hw/ppc440.c | 1 + + hw/ppc440_bamboo.c | 1 + + hw/ppce500_mpc8544ds.c | 1 + + target-ppc/helper.c | 2 +- + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/qemu/hw/ppc440.c b/qemu/hw/ppc440.c index 00d82e4..164c326 100644 @@ -41,8 +42,20 @@ #include "kvm.h" #include "kvm_ppc.h" #include "device_tree.h" +diff --git a/qemu/hw/ppce500_mpc8544ds.c b/qemu/hw/ppce500_mpc8544ds.c +index 3d73f8a..d8ea947 100644 +--- a/qemu/hw/ppce500_mpc8544ds.c ++++ b/qemu/hw/ppce500_mpc8544ds.c +@@ -16,6 +16,7 @@ + + #include + ++#define KVM_UPSTREAM + #include "config.h" + #include "qemu-common.h" + #include "net.h" diff --git a/qemu/target-ppc/helper.c b/qemu/target-ppc/helper.c -index fc62a63..d49acaf 100644 +index 80b53eb..e8dc384 100644 --- a/qemu/target-ppc/helper.c +++ b/qemu/target-ppc/helper.c @@ -29,6 +29,7 @@ @@ -54,5 +67,5 @@ //#define DEBUG_MMU -- -1.5.6.5 +1.6.1.2 Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- qemu.spec 10 Mar 2009 23:43:33 -0000 1.64 +++ qemu.spec 11 Mar 2009 00:02:51 -0000 1.65 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.6.kvm20090310git%{?dist} +Release: 0.7.kvm20090310git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -409,6 +409,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Tue Mar 10 2009 Glauber Costa - 2:0.10-0.7.kvm20090310git +- modify ppc patch + * Tue Mar 10 2009 Glauber Costa - 2:0.10-0.6.kvm20090310git - updated to kvm20090310git - removed sasl patches (already in this release) From tuxbrewr at fedoraproject.org Wed Mar 11 00:45:43 2009 From: tuxbrewr at fedoraproject.org (Steven M. Parrish) Date: Wed, 11 Mar 2009 00:45:43 +0000 (UTC) Subject: comps comps-f11.xml.in,1.152,1.153 Message-ID: <20090311004544.141DB7002F@cvs1.fedora.phx.redhat.com> Author: tuxbrewr Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28236 Modified Files: comps-f11.xml.in Log Message: Changed SUGAR to Sugar and added sugar-update-control Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- comps-f11.xml.in 10 Mar 2009 16:36:37 -0000 1.152 +++ comps-f11.xml.in 11 Mar 2009 00:45:10 -0000 1.153 @@ -4599,7 +4599,7 @@ sugar-desktop - <_name>SUGAR Desktop Environment + <_name>Sugar Desktop Environment <_description>A software playground for learning about learning. false true @@ -4615,6 +4615,7 @@ sugar-terminal sugar-turtleart sugar-write + sugar-update-control From mikep at fedoraproject.org Wed Mar 11 00:47:47 2009 From: mikep at fedoraproject.org (W. Michael Petullo) Date: Wed, 11 Mar 2009 00:47:47 +0000 (UTC) Subject: rpms/libdmapsharing/devel import.log, NONE, 1.1 libdmapsharing.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090311004747.5E7807002F@cvs1.fedora.phx.redhat.com> Author: mikep Update of /cvs/pkgs/rpms/libdmapsharing/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28857/devel Modified Files: .cvsignore sources Added Files: import.log libdmapsharing.spec Log Message: Initial import into devel branch. --- NEW FILE import.log --- libdmapsharing-1_9_0_4-1_fc10:HEAD:libdmapsharing-1.9.0.4-1.fc10.src.rpm:1236732389 --- NEW FILE libdmapsharing.spec --- Name: libdmapsharing Version: 1.9.0.4 Release: 1%{?dist} License: LGPLv2+ Source: http://downloads.sourceforge.net/%name/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://sourceforge.net/projects/libdmapsharing/ Summary: A DMAP client and server library Group: Development/Libraries BuildRequires: pkgconfig, glib2-devel, libsoup-devel BuildRequires: avahi-glib-devel %description libdmapsharing implements the DMAP protocols. This includes support for DAAP and DPAP. %files %defattr(-, root, root, -) %{_libdir}/libdmapsharing.so.* %doc AUTHORS COPYING ChangeLog NEWS README %package devel Summary: Files needed to develop applications using libdmapsharing Group: Development/Libraries Requires: libdmapsharing = %{version}-%{release}, glib2-devel, libsoup-devel, avahi-glib-devel, pkgconfig %description devel libdmapsharing implements the DMAP protocols. This includes support for DAAP and DPAP. This package provides the libraries, include files, and other resources needed for developing applications using libdmapsharing. %files devel %defattr(-, root, root, -) %{_libdir}/pkgconfig/libdmapsharing-*.pc %{_includedir}/libdmapsharing-*/ %{_libdir}/libdmapsharing.so %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" rm -f ${RPM_BUILD_ROOT}%{_libdir}/libdmapsharing.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %changelog * Tue Mar 10 2009 W. Michael Petullo - 1.9.0.4-1 - New upstream version. * Fri Mar 06 2009 W. Michael Petullo - 1.9.0.3-1 - New upstream version. - Use "-p /sbin/ldconfig." - Remove requires that are already known by RPM. - libdmapsharing-devel package now requires pkgconfig. - Remove irrelevant INSTALL documentation. * Sun Feb 22 2009 W. Michael Petullo - 1.9.0.1-3 - Require libsoup >= 2.25.92, as this version supports SOUP_ENCODING_EOF message encoding, required for HTTP 1.0 clients. * Sat Feb 07 2009 W. Michael Petullo - 1.9.0.1-2 - Fix BuildRequires. * Sun Dec 28 2008 W. Michael Petullo - 1.9.0.1-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libdmapsharing/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 15:57:22 -0000 1.1 +++ .cvsignore 11 Mar 2009 00:47:16 -0000 1.2 @@ -0,0 +1 @@ +libdmapsharing-1.9.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libdmapsharing/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 15:57:22 -0000 1.1 +++ sources 11 Mar 2009 00:47:16 -0000 1.2 @@ -0,0 +1 @@ +27755b14bfc97ce500893069e50d5029 libdmapsharing-1.9.0.4.tar.gz From allisson at fedoraproject.org Wed Mar 11 01:02:10 2009 From: allisson at fedoraproject.org (Allisson Azevedo) Date: Wed, 11 Mar 2009 01:02:10 +0000 (UTC) Subject: rpms/eina/F-10 eina.spec, 1.1, 1.2 import.log, 1.1, 1.2 eina-0.7.3-gtkversion.patch, 1.1, NONE Message-ID: <20090311010210.6B0DC70132@cvs1.fedora.phx.redhat.com> Author: allisson Update of /cvs/pkgs/rpms/eina/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32140/F-10 Modified Files: eina.spec import.log Removed Files: eina-0.7.3-gtkversion.patch Log Message: Drop gtkversion patch Index: eina.spec =================================================================== RCS file: /cvs/pkgs/rpms/eina/F-10/eina.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eina.spec 9 Feb 2009 01:44:03 -0000 1.1 +++ eina.spec 11 Mar 2009 01:01:39 -0000 1.2 @@ -1,13 +1,12 @@ Name: eina Version: 0.7.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A classic player for a modern era Group: Applications/Multimedia License: GPLv2+ URL: http://eina.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: eina-0.7.3-gtkversion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gstreamer-devel @@ -45,8 +44,7 @@ %prep %setup -q -# This patch disable gtk 2.15 check -%patch0 -p1 -b .gtkversion + %build %configure --disable-static @@ -105,6 +103,9 @@ %changelog +* Thu Feb 5 2009 Allisson Azevedo 0.7.3-5 +- Drop gtkversion patch. + * Thu Feb 5 2009 Allisson Azevedo 0.7.3-4 - Fix to consistently use macros. - Fix devel requires. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/eina/F-10/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Feb 2009 01:44:03 -0000 1.1 +++ import.log 11 Mar 2009 01:01:39 -0000 1.2 @@ -1 +1,2 @@ eina-0_7_3-4_fc10:F-10:eina-0.7.3-4.fc10.src.rpm:1234143665 +eina-0_7_3-5_fc10:F-10:eina-0.7.3-5.fc10.src.rpm:1236733220 --- eina-0.7.3-gtkversion.patch DELETED --- From allisson at fedoraproject.org Wed Mar 11 01:05:44 2009 From: allisson at fedoraproject.org (Allisson Azevedo) Date: Wed, 11 Mar 2009 01:05:44 +0000 (UTC) Subject: rpms/eina/devel eina-0.7.3-gtkvolume.patch, NONE, 1.1 eina.spec, 1.2, 1.3 import.log, 1.1, 1.2 Message-ID: <20090311010544.5A8237002F@cvs1.fedora.phx.redhat.com> Author: allisson Update of /cvs/pkgs/rpms/eina/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1463/devel Modified Files: eina.spec import.log Added Files: eina-0.7.3-gtkvolume.patch Log Message: Added gtkvolume patch eina-0.7.3-gtkvolume.patch: --- NEW FILE eina-0.7.3-gtkvolume.patch --- --- eina-0.7.3.orig/eina/eina-volume.h 2009-03-10 22:49:07.000000000 +0000 +++ eina-0.7.3/eina/eina-volume.h 2009-03-10 22:49:14.000000000 +0000 @@ -43,11 +43,6 @@ #define EINA_VOLUME_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), EINA_TYPE_VOLUME, EinaVolumeClass)) -struct _GtkVolumeButton -{ - GtkScaleButton scale; -}; - typedef struct { GtkVolumeButton parent; Index: eina.spec =================================================================== RCS file: /cvs/pkgs/rpms/eina/devel/eina.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- eina.spec 24 Feb 2009 14:17:11 -0000 1.2 +++ eina.spec 11 Mar 2009 01:05:13 -0000 1.3 @@ -1,6 +1,6 @@ Name: eina Version: 0.7.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A classic player for a modern era Group: Applications/Multimedia @@ -8,6 +8,7 @@ URL: http://eina.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: eina-0.7.3-gtkversion.patch +Patch1: eina-0.7.3-gtkvolume.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gstreamer-devel @@ -47,6 +48,8 @@ %setup -q # This patch disable gtk 2.15 check %patch0 -p1 -b .gtkversion +# Gtk volume +%patch1 -p1 -b .gtkvolume %build %configure --disable-static @@ -105,6 +108,9 @@ %changelog +* Tue Mar 10 2009 Allisson Azevedo 0.7.3-6 +- Added gtkvolume patch. + * Tue Feb 24 2009 Fedora Release Engineering - 0.7.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/eina/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Feb 2009 01:41:22 -0000 1.1 +++ import.log 11 Mar 2009 01:05:13 -0000 1.2 @@ -1 +1,2 @@ eina-0_7_3-4_fc10:HEAD:eina-0.7.3-4.fc10.src.rpm:1234143470 +eina-0_7_3-6_fc10:HEAD:eina-0.7.3-6.fc10.src.rpm:1236733428 From alexlan at fedoraproject.org Wed Mar 11 01:09:46 2009 From: alexlan at fedoraproject.org (Alex Lancaster) Date: Wed, 11 Mar 2009 01:09:46 +0000 (UTC) Subject: rpms/octave-forge/devel octave-forge.spec,1.66,1.67 Message-ID: <20090311010946.791997002F@cvs1.fedora.phx.redhat.com> Author: alexlan Update of /cvs/pkgs/rpms/octave-forge/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2522 Modified Files: octave-forge.spec Log Message: * Tue Mar 10 2009 Alex Lancaster - 20080831-7 - Fix BuildRequires to specifically request GCJ version of Java. Index: octave-forge.spec =================================================================== RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- octave-forge.spec 10 Mar 2009 13:17:36 -0000 1.66 +++ octave-forge.spec 11 Mar 2009 01:09:15 -0000 1.67 @@ -2,7 +2,7 @@ Name: octave-forge Version: 20080831 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -25,7 +25,7 @@ BuildRequires: tetex gcc-gfortran ginac-devel BuildRequires: ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel BuildRequires: libjpeg-devel libpng-devel ncurses-devel ftplib-devel -BuildRequires: openssl-devel java-devel +BuildRequires: openssl-devel java-devel-gcj Provides: octave-ann = 1.0.1 Provides: octave-audio = 1.1.2 Provides: octave-benchmark = 1.0.0 @@ -207,6 +207,9 @@ %changelog +* Tue Mar 10 2009 Alex Lancaster - 20080831-7 +- Fix BuildRequires to specifically request GCJ version of Java. + * Tue Mar 10 2009 Rakesh Pandit - 20080831-6 - Bumped to consume the soname update in ImageMagic. From pkgdb at fedoraproject.org Wed Mar 11 01:16:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 01:16:04 +0000 Subject: [pkgdb] memtest86+ ownership updated Message-ID: <20090311011624.325B1208505@bastion.fedora.phx.redhat.com> Package memtest86+ in Fedora 10 is now owned by roma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+ From pkgdb at fedoraproject.org Wed Mar 11 01:16:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 01:16:27 +0000 Subject: [pkgdb] memtest86+ ownership updated Message-ID: <20090311011647.2FD79208505@bastion.fedora.phx.redhat.com> Package memtest86+ in Fedora 9 is now owned by roma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+ From pkgdb at fedoraproject.org Wed Mar 11 01:18:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 01:18:25 +0000 Subject: [pkgdb] memtest86+ ownership updated Message-ID: <20090311011845.B812F208504@bastion.fedora.phx.redhat.com> Package memtest86+ in Fedora devel is now owned by roma To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/memtest86+ From tgl at fedoraproject.org Wed Mar 11 01:37:23 2009 From: tgl at fedoraproject.org (Tom Lane) Date: Wed, 11 Mar 2009 01:37:23 +0000 (UTC) Subject: rpms/postgresql/devel postgresql-sdt-includes.patch, NONE, 1.1 postgresql.spec, 1.108, 1.109 Message-ID: <20090311013723.CC7FA7002F@cvs1.fedora.phx.redhat.com> Author: tgl Update of /cvs/pkgs/rpms/postgresql/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9115 Modified Files: postgresql.spec Added Files: postgresql-sdt-includes.patch Log Message: Prevent dependent packages from needing to include sys/sdt.h postgresql-sdt-includes.patch: --- NEW FILE postgresql-sdt-includes.patch --- Do not expose pg_trace.h (ie, ) as something that every dependent package will need to #include successfully. Otherwise we'd need to make postgresql-devel Require: systemtap-sdt-devel, which doesn't seem like a desirable thing to do. This patch is already applied upstream and won't be needed in 8.3.7. diff -Naur postgresql-8.3.6.orig/src/backend/access/transam/xact.c postgresql-8.3.6/src/backend/access/transam/xact.c --- postgresql-8.3.6.orig/src/backend/access/transam/xact.c 2008-04-26 19:35:33.000000000 -0400 +++ postgresql-8.3.6/src/backend/access/transam/xact.c 2009-03-10 21:17:26.000000000 -0400 @@ -33,6 +33,7 @@ #include "executor/spi.h" #include "libpq/be-fsstubs.h" #include "miscadmin.h" +#include "pg_trace.h" #include "pgstat.h" #include "storage/fd.h" #include "storage/lmgr.h" diff -Naur postgresql-8.3.6.orig/src/backend/storage/lmgr/lock.c postgresql-8.3.6/src/backend/storage/lmgr/lock.c --- postgresql-8.3.6.orig/src/backend/storage/lmgr/lock.c 2008-03-04 14:54:13.000000000 -0500 +++ postgresql-8.3.6/src/backend/storage/lmgr/lock.c 2009-03-10 21:17:26.000000000 -0400 @@ -36,6 +36,7 @@ #include "access/twophase.h" #include "access/twophase_rmgr.h" #include "miscadmin.h" +#include "pg_trace.h" #include "pgstat.h" #include "utils/memutils.h" #include "utils/ps_status.h" diff -Naur postgresql-8.3.6.orig/src/backend/storage/lmgr/lwlock.c postgresql-8.3.6/src/backend/storage/lmgr/lwlock.c --- postgresql-8.3.6.orig/src/backend/storage/lmgr/lwlock.c 2008-01-01 14:45:52.000000000 -0500 +++ postgresql-8.3.6/src/backend/storage/lmgr/lwlock.c 2009-03-10 21:17:26.000000000 -0400 @@ -25,6 +25,7 @@ #include "access/multixact.h" #include "access/subtrans.h" #include "miscadmin.h" +#include "pg_trace.h" #include "storage/ipc.h" #include "storage/proc.h" #include "storage/spin.h" diff -Naur postgresql-8.3.6.orig/src/include/c.h postgresql-8.3.6/src/include/c.h --- postgresql-8.3.6.orig/src/include/c.h 2008-02-23 14:11:55.000000000 -0500 +++ postgresql-8.3.6/src/include/c.h 2009-03-10 21:17:26.000000000 -0400 @@ -57,7 +57,6 @@ #include "pg_config_os.h" /* must be before any system header files */ #endif #include "postgres_ext.h" -#include "pg_trace.h" #if _MSC_VER >= 1400 #define errcode __msvc_errcode Index: postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- postgresql.spec 8 Mar 2009 20:29:14 -0000 1.108 +++ postgresql.spec 11 Mar 2009 01:36:52 -0000 1.109 @@ -84,7 +84,7 @@ Summary: PostgreSQL client programs and libraries Name: postgresql Version: 8.3.6 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Applications/Databases Url: http://www.postgresql.org/ @@ -109,6 +109,7 @@ Patch4: postgresql-test.patch Patch5: pgtcl-no-rpath.patch Patch6: postgresql-perl-rpath.patch +Patch7: postgresql-sdt-includes.patch BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk BuildRequires: perl(ExtUtils::Embed), perl-devel @@ -361,6 +362,7 @@ %patch4 -p1 # patch5 is applied later %patch6 -p1 +%patch7 -p1 #call autoconf 2.53 or greater %aconfver @@ -398,8 +400,8 @@ # Strip out -ffast-math from CFLAGS.... CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100` -# use -O1 on sparc64 -%ifarch sparc64 +# use -O1 on sparc64 and alpha +%ifarch sparc64 alpha CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" ` %endif @@ -871,6 +873,11 @@ %endif %changelog +* Tue Mar 10 2009 Tom Lane 8.3.6-4 +- Prevent dependent packages from needing to include sys/sdt.h + (unintended side effect of previous patch) +- Use -O1 on alpha, per report from Oliver Falk; -O2 tickles gcc bugs + * Sun Mar 8 2009 Tom Lane 8.3.6-3 - Enable tracing via systemtap Resolves: #488941 From agoode at fedoraproject.org Wed Mar 11 01:40:24 2009 From: agoode at fedoraproject.org (Adam Goode) Date: Wed, 11 Mar 2009 01:40:24 +0000 (UTC) Subject: rpms/vips/devel vips.spec,1.25,1.26 Message-ID: <20090311014024.9CFE57002F@cvs1.fedora.phx.redhat.com> Author: agoode Update of /cvs/extras/rpms/vips/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9829 Modified Files: vips.spec Log Message: * Tue Mar 10 2009 Adam Goode - 7.16.4-3 - Rebuild for ImageMagick soname change Index: vips.spec =================================================================== RCS file: /cvs/extras/rpms/vips/devel/vips.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- vips.spec 26 Feb 2009 00:27:10 -0000 1.25 +++ vips.spec 11 Mar 2009 01:39:53 -0000 1.26 @@ -2,7 +2,7 @@ Name: vips Version: 7.16.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C/C++ library for processing large images Group: System Environment/Libraries @@ -144,6 +144,9 @@ %changelog +* Tue Mar 10 2009 Adam Goode - 7.16.4-3 +- Rebuild for ImageMagick soname change + * Wed Feb 25 2009 Fedora Release Engineering - 7.16.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From jjames at fedoraproject.org Wed Mar 11 01:50:45 2009 From: jjames at fedoraproject.org (Jerry James) Date: Wed, 11 Mar 2009 01:50:45 +0000 (UTC) Subject: rpms/findbugs/devel findbugs-1.3.7-build.patch, NONE, 1.1 findbugs-ant, NONE, 1.1 findbugs-tools-README, NONE, 1.1 findbugs.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090311015045.4C1B77002F@cvs1.fedora.phx.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/findbugs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11941/devel Modified Files: .cvsignore sources Added Files: findbugs-1.3.7-build.patch findbugs-ant findbugs-tools-README findbugs.spec import.log Log Message: New package. findbugs-1.3.7-build.patch: --- NEW FILE findbugs-1.3.7-build.patch --- diff -dur findbugs-1.3.7.ORIG/build.xml findbugs-1.3.7/build.xml --- findbugs-1.3.7.ORIG/build.xml 2008-12-30 10:32:30.000000000 -0700 +++ findbugs-1.3.7/build.xml 2009-01-02 16:18:23.000000000 -0700 @@ -18,6 +18,8 @@ + + @@ -57,17 +59,18 @@ - - - - - - - - - - - + + + + + + + + + + + + @@ -972,7 +975,7 @@ : reindents a Java file * edu.umd.cs.findbugs.tools.FilterPropertyDatabase : filters a property database, only passing through the annotations on public or protected methods * edu.umd.cs.findbugs.tools.html.PlainPrintBugDescriptions [docTitle]: prints findbugs bug descriptions as plain text * edu.umd.cs.findbugs.tools.html.PrettyPrintBugDescriptions [-unabridged] [docTitle]: prints findbugs bug descriptions as HTML. If the -unabridged option is given, then warnings from disabled detectors are also printed. * edu.umd.cs.findbugs.tools.junit.JUnitJarRunner [-textui|-swingui] []: run all of the JUnit tests in a jar file. * edu.umd.cs.findbugs.tools.xml.CheckMessages [ ...]: check the XML message files in a findbugs plugin for validity and completeness. --- NEW FILE findbugs.spec --- # GCJ note: findbugs currenly cannot be compiled with GCJ. There are several # problems, most of which could be fixed with a little effort. However, # findbugs uses java.util.regex.Pattern.LITERAL, which is part of the Java 5 # specification, but Classpath does not support it. This is a fatal problem. Name: findbugs Version: 1.3.7 Release: 4%{?dist} Summary: Find bugs in Java code Group: Development/Languages License: LGPLv2+ URL: http://findbugs.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.zip Source1: findbugs-ant Source2: findbugs-tools-README # This patch has not been submitted upstream, as it contains Fedora-specific # changes. It looks in /usr/share/java for jar files at both compile time and # run time, instead of in findbugs' lib directory. Patch0: findbugs-1.3.7-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: findbugs-bcel BuildRequires: ant BuildRequires: docbook-style-xsl BuildRequires: jakarta-commons-lang BuildRequires: java-devel BuildRequires: jaxen BuildRequires: jcip-annotations BuildRequires: jFormatString BuildRequires: jpackage-utils BuildRequires: jsr-305 BuildRequires: junit4 BuildRequires: objectweb-asm BuildRequires: perl BuildRequires: tex(latex) Requires: findbugs-bcel Requires: jakarta-commons-lang Requires: java Requires: jaxen Requires: jcip-annotations Requires: jFormatString Requires: jpackage-utils Requires: jsr-305 Requires: junit4 Requires: objectweb-asm %description Findbugs is a program which uses static analysis to look for bugs in Java code. It can check for null pointer exceptions, multithreaded code errors, and other bugs. %package -n ant-findbugs Group: Development/Build Tools Summary: Ant task for findbugs Requires: %{name} = %{version}-%{release} Requires: ant %description -n ant-findbugs This package defines an ant task for findbugs for easy integration of findbugs into your ant-controlled project. %package javadoc Group: Development/Documentation Summary: Javadoc documentation for findbugs Requires: %{name} = %{version}-%{release} %description javadoc Javadoc documentation for findbugs. %package tools Group: Development/Languages Summary: Addon tools for findbugs Requires: %{name} = %{version}-%{release} Requires: junit4 %description tools This package contains additional tools for use with findbugs. See README.fedora for more information. %prep %setup -q %patch0 -p1 cp -p %{SOURCE2} README.fedora # Make sure we don't accidentally use any existing JAR files rm -f lib/*.jar # Use the system jcip-annotations instead of building it in rm -fr src/java5/net # Get rid of code for Mac OS X that depends on a jar from Apple rm -f src/java/edu/umd/cs/findbugs/gui/OSXAdapter.java rm -f src/java5/edu/umd/cs/findbugs/gui2/OSXAdapter.java # Turn on the executable bits for some auxiliary scripts chmod a+x etc/summarizeBugs etc/diffBugSummaries design/architecture/mkdep.pl %build # Build the class files ant # Build the javadocs ant apiJavadoc # Build the architecture PDF pushd design/architecture make depend make popd # Package up the tools cd build/classes jar cf ../../lib/findbugs-tools.jar edu/umd/cs/findbugs/tools %install rm -rf $RPM_BUILD_ROOT # Install the jars mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p lib/annotations.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-annotations-%{version}.jar ln -s %{name}-annotations-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-annotations.jar cp -p lib/%{name}-tools.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tools-%{version}.jar ln -s %{name}-tools-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tools.jar cp -p lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # Install the ant task mkdir -p $RPM_BUILD_ROOT%{_javadir}/ant cp -p lib/%{name}-ant.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-%{name}-%{version}.jar ln -s ant-%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-%{name}.jar mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} # Install the javadocs mkdir -p $RPM_BUILD_ROOT%{_javadocdir} cp -a apiJavaDoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # Install the scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} for f in $(find bin -maxdepth 1 -type f \! -name '*.bat'); do cp -p $f $RPM_BUILD_ROOT%{_bindir} done # Install the shared files mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a etc plugin $RPM_BUILD_ROOT%{_datadir}/%{name} # Remove now unnecessary build-only manual files so %%doc doesn't get them rm -f doc/manual*.xml doc/manual*.xsl %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE.txt design/DecouplingFromBCEL.txt design/VisitingAndCaching.txt %doc README.txt design/eclipse\ findbugs\ plugin\ features.sxw %doc design/architecture/architecture.pdf doc %{_bindir}/* %{_datadir}/%{name} %{_javadir}/findbugs-annotations* %{_javadir}/findbugs-%{version}.jar %{_javadir}/findbugs.jar %files -n ant-findbugs %defattr(-,root,root,-) %doc LICENSE.txt %{_javadir}/ant/* %config(noreplace) %{_sysconfdir}/ant.d/%{name} %files javadoc %defattr(-,root,root,-) %{_javadocdir}/* %files tools %defattr(-,root,root,-) %doc LICENSE.txt README.fedora %{_javadir}/findbugs-tools* %changelog * Fri Mar 6 2009 Jerry James - 1.3.7-4 - Add README.fedora to the -tools package * Thu Mar 5 2009 Jerry James - 1.3.7-3 - Minor spec file cleanups from review * Tue Feb 10 2009 Jerry James - 1.3.7-2 - Rebuild for dependencies * Fri Jan 2 2009 Jerry James - 1.3.7-1 - Update to 1.3.7 * Tue Dec 9 2008 Jerry James - 1.3.6-1 - Update to 1.3.6 * Fri Sep 19 2008 Jerry James - 1.3.5-1 - Initial RPM --- NEW FILE import.log --- findbugs-1_3_7-4_fc10:HEAD:findbugs-1.3.7-4.fc10.src.rpm:1236736044 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/findbugs/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:11:20 -0000 1.1 +++ .cvsignore 11 Mar 2009 01:50:14 -0000 1.2 @@ -0,0 +1 @@ +findbugs-1.3.7-source.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/findbugs/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:11:20 -0000 1.1 +++ sources 11 Mar 2009 01:50:14 -0000 1.2 @@ -0,0 +1 @@ +ae5ee33e7c07031cdec22c1da5e59b93 findbugs-1.3.7-source.zip From jjames at fedoraproject.org Wed Mar 11 01:55:08 2009 From: jjames at fedoraproject.org (Jerry James) Date: Wed, 11 Mar 2009 01:55:08 +0000 (UTC) Subject: rpms/findbugs/F-10 findbugs-1.3.7-build.patch, NONE, 1.1 findbugs-ant, NONE, 1.1 findbugs-tools-README, NONE, 1.1 findbugs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090311015508.330267002F@cvs1.fedora.phx.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/findbugs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13030 Modified Files: .cvsignore sources Added Files: findbugs-1.3.7-build.patch findbugs-ant findbugs-tools-README findbugs.spec Log Message: New package. findbugs-1.3.7-build.patch: --- NEW FILE findbugs-1.3.7-build.patch --- diff -dur findbugs-1.3.7.ORIG/build.xml findbugs-1.3.7/build.xml --- findbugs-1.3.7.ORIG/build.xml 2008-12-30 10:32:30.000000000 -0700 +++ findbugs-1.3.7/build.xml 2009-01-02 16:18:23.000000000 -0700 @@ -18,6 +18,8 @@ + + @@ -57,17 +59,18 @@ - - - - - - - - - - - + + + + + + + + + + + + @@ -972,7 +975,7 @@ : reindents a Java file * edu.umd.cs.findbugs.tools.FilterPropertyDatabase : filters a property database, only passing through the annotations on public or protected methods * edu.umd.cs.findbugs.tools.html.PlainPrintBugDescriptions [docTitle]: prints findbugs bug descriptions as plain text * edu.umd.cs.findbugs.tools.html.PrettyPrintBugDescriptions [-unabridged] [docTitle]: prints findbugs bug descriptions as HTML. If the -unabridged option is given, then warnings from disabled detectors are also printed. * edu.umd.cs.findbugs.tools.junit.JUnitJarRunner [-textui|-swingui] []: run all of the JUnit tests in a jar file. * edu.umd.cs.findbugs.tools.xml.CheckMessages [ ...]: check the XML message files in a findbugs plugin for validity and completeness. --- NEW FILE findbugs.spec --- # GCJ note: findbugs currenly cannot be compiled with GCJ. There are several # problems, most of which could be fixed with a little effort. However, # findbugs uses java.util.regex.Pattern.LITERAL, which is part of the Java 5 # specification, but Classpath does not support it. This is a fatal problem. Name: findbugs Version: 1.3.7 Release: 4%{?dist} Summary: Find bugs in Java code Group: Development/Languages License: LGPLv2+ URL: http://findbugs.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.zip Source1: findbugs-ant Source2: findbugs-tools-README # This patch has not been submitted upstream, as it contains Fedora-specific # changes. It looks in /usr/share/java for jar files at both compile time and # run time, instead of in findbugs' lib directory. Patch0: findbugs-1.3.7-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: findbugs-bcel BuildRequires: ant BuildRequires: docbook-style-xsl BuildRequires: jakarta-commons-lang BuildRequires: java-devel BuildRequires: jaxen BuildRequires: jcip-annotations BuildRequires: jFormatString BuildRequires: jpackage-utils BuildRequires: jsr-305 BuildRequires: junit4 BuildRequires: objectweb-asm BuildRequires: perl BuildRequires: tex(latex) Requires: findbugs-bcel Requires: jakarta-commons-lang Requires: java Requires: jaxen Requires: jcip-annotations Requires: jFormatString Requires: jpackage-utils Requires: jsr-305 Requires: junit4 Requires: objectweb-asm %description Findbugs is a program which uses static analysis to look for bugs in Java code. It can check for null pointer exceptions, multithreaded code errors, and other bugs. %package -n ant-findbugs Group: Development/Build Tools Summary: Ant task for findbugs Requires: %{name} = %{version}-%{release} Requires: ant %description -n ant-findbugs This package defines an ant task for findbugs for easy integration of findbugs into your ant-controlled project. %package javadoc Group: Development/Documentation Summary: Javadoc documentation for findbugs Requires: %{name} = %{version}-%{release} %description javadoc Javadoc documentation for findbugs. %package tools Group: Development/Languages Summary: Addon tools for findbugs Requires: %{name} = %{version}-%{release} Requires: junit4 %description tools This package contains additional tools for use with findbugs. See README.fedora for more information. %prep %setup -q %patch0 -p1 cp -p %{SOURCE2} README.fedora # Make sure we don't accidentally use any existing JAR files rm -f lib/*.jar # Use the system jcip-annotations instead of building it in rm -fr src/java5/net # Get rid of code for Mac OS X that depends on a jar from Apple rm -f src/java/edu/umd/cs/findbugs/gui/OSXAdapter.java rm -f src/java5/edu/umd/cs/findbugs/gui2/OSXAdapter.java # Turn on the executable bits for some auxiliary scripts chmod a+x etc/summarizeBugs etc/diffBugSummaries design/architecture/mkdep.pl %build # Build the class files ant # Build the javadocs ant apiJavadoc # Build the architecture PDF pushd design/architecture make depend make popd # Package up the tools cd build/classes jar cf ../../lib/findbugs-tools.jar edu/umd/cs/findbugs/tools %install rm -rf $RPM_BUILD_ROOT # Install the jars mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p lib/annotations.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-annotations-%{version}.jar ln -s %{name}-annotations-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-annotations.jar cp -p lib/%{name}-tools.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tools-%{version}.jar ln -s %{name}-tools-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tools.jar cp -p lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # Install the ant task mkdir -p $RPM_BUILD_ROOT%{_javadir}/ant cp -p lib/%{name}-ant.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-%{name}-%{version}.jar ln -s ant-%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-%{name}.jar mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} # Install the javadocs mkdir -p $RPM_BUILD_ROOT%{_javadocdir} cp -a apiJavaDoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # Install the scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} for f in $(find bin -maxdepth 1 -type f \! -name '*.bat'); do cp -p $f $RPM_BUILD_ROOT%{_bindir} done # Install the shared files mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a etc plugin $RPM_BUILD_ROOT%{_datadir}/%{name} # Remove now unnecessary build-only manual files so %%doc doesn't get them rm -f doc/manual*.xml doc/manual*.xsl %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE.txt design/DecouplingFromBCEL.txt design/VisitingAndCaching.txt %doc README.txt design/eclipse\ findbugs\ plugin\ features.sxw %doc design/architecture/architecture.pdf doc %{_bindir}/* %{_datadir}/%{name} %{_javadir}/findbugs-annotations* %{_javadir}/findbugs-%{version}.jar %{_javadir}/findbugs.jar %files -n ant-findbugs %defattr(-,root,root,-) %doc LICENSE.txt %{_javadir}/ant/* %config(noreplace) %{_sysconfdir}/ant.d/%{name} %files javadoc %defattr(-,root,root,-) %{_javadocdir}/* %files tools %defattr(-,root,root,-) %doc LICENSE.txt README.fedora %{_javadir}/findbugs-tools* %changelog * Fri Mar 6 2009 Jerry James - 1.3.7-4 - Add README.fedora to the -tools package * Thu Mar 5 2009 Jerry James - 1.3.7-3 - Minor spec file cleanups from review * Tue Feb 10 2009 Jerry James - 1.3.7-2 - Rebuild for dependencies * Fri Jan 2 2009 Jerry James - 1.3.7-1 - Update to 1.3.7 * Tue Dec 9 2008 Jerry James - 1.3.6-1 - Update to 1.3.6 * Fri Sep 19 2008 Jerry James - 1.3.5-1 - Initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/findbugs/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:11:20 -0000 1.1 +++ .cvsignore 11 Mar 2009 01:54:37 -0000 1.2 @@ -0,0 +1 @@ +findbugs-1.3.7-source.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/findbugs/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:11:20 -0000 1.1 +++ sources 11 Mar 2009 01:54:37 -0000 1.2 @@ -0,0 +1 @@ +ae5ee33e7c07031cdec22c1da5e59b93 findbugs-1.3.7-source.zip From agoode at fedoraproject.org Wed Mar 11 02:00:39 2009 From: agoode at fedoraproject.org (Adam Goode) Date: Wed, 11 Mar 2009 02:00:39 +0000 (UTC) Subject: rpms/nip2/devel nip2.spec,1.22,1.23 Message-ID: <20090311020039.209E47002F@cvs1.fedora.phx.redhat.com> Author: agoode Update of /cvs/extras/rpms/nip2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14183 Modified Files: nip2.spec Log Message: * Tue Mar 10 2009 Adam Goode - 7.16.4-3 - Rebuild for ImageMagick soname change Index: nip2.spec =================================================================== RCS file: /cvs/extras/rpms/nip2/devel/nip2.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- nip2.spec 26 Feb 2009 05:45:40 -0000 1.22 +++ nip2.spec 11 Mar 2009 02:00:08 -0000 1.23 @@ -1,6 +1,6 @@ Name: nip2 Version: 7.16.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interactive tool for working with large images Group: Applications/Multimedia @@ -126,6 +126,9 @@ %changelog +* Tue Mar 10 2009 Adam Goode - 7.16.4-3 +- Rebuild for ImageMagick soname change + * Wed Feb 25 2009 Fedora Release Engineering - 7.16.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From dcantrel at fedoraproject.org Wed Mar 11 02:08:40 2009 From: dcantrel at fedoraproject.org (David Cantrell) Date: Wed, 11 Mar 2009 02:08:40 +0000 (UTC) Subject: rpms/anaconda/devel .cvsignore, 1.617, 1.618 anaconda.spec, 1.765, 1.766 sources, 1.751, 1.752 Message-ID: <20090311020840.30BC77002F@cvs1.fedora.phx.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16317 Modified Files: .cvsignore anaconda.spec sources Log Message: * Tue Mar 10 2009 David Cantrell - 11.5.0.27-1 - Fix action pruning to handle more complex scenarios. (dlehman) - Schedule destruction of any existing formatting along with the device. (dlehman) - Add a size attribute to mdraid arrays. (dlehman) - Speed up partitioning screen redraws by trimming workload where possible. (dlehman) - Create partitions with exactly the geometry we calculate. (dlehman) - Fix name collision between formats.mdraid and devicelibs.mdraid. (dlehman) - Destruction of the member device formatting will be handled elsewhere. (dlehman) - Fix a typo (jkeating) - Fix pruning between two destroy actions on the same device (rvykydal) - Use the pyblock functions when possible. (jgranado) - We are searching a list, not a dict now (rvykydal) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.617 retrieving revision 1.618 diff -u -r1.617 -r1.618 --- .cvsignore 10 Mar 2009 04:42:16 -0000 1.617 +++ .cvsignore 11 Mar 2009 02:08:08 -0000 1.618 @@ -1,2 +1,2 @@ clog -anaconda-11.5.0.26.tar.bz2 +anaconda-11.5.0.27.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.765 retrieving revision 1.766 diff -u -r1.765 -r1.766 --- anaconda.spec 10 Mar 2009 04:42:16 -0000 1.765 +++ anaconda.spec 11 Mar 2009 02:08:08 -0000 1.766 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.5.0.26 +Version: 11.5.0.27 Release: 1 License: GPLv2+ Group: Applications/System @@ -211,6 +211,22 @@ %endif %changelog +* Tue Mar 10 2009 David Cantrell - 11.5.0.27-1 +- Fix action pruning to handle more complex scenarios. (dlehman) +- Schedule destruction of any existing formatting along with the device. + (dlehman) +- Add a size attribute to mdraid arrays. (dlehman) +- Speed up partitioning screen redraws by trimming workload where possible. + (dlehman) +- Create partitions with exactly the geometry we calculate. (dlehman) +- Fix name collision between formats.mdraid and devicelibs.mdraid. (dlehman) +- Destruction of the member device formatting will be handled elsewhere. + (dlehman) +- Fix a typo (jkeating) +- Fix pruning between two destroy actions on the same device (rvykydal) +- Use the pyblock functions when possible. (jgranado) +- We are searching a list, not a dict now (rvykydal) + * Mon Mar 09 2009 David Cantrell - 11.5.0.26-1 - Move the recursive teardown of all devices out of processActions. (dlehman) - Clean up handling of /proc, /sys, /dev/pts, /dev/shm entries. (dlehman) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.751 retrieving revision 1.752 diff -u -r1.751 -r1.752 --- sources 10 Mar 2009 04:42:17 -0000 1.751 +++ sources 11 Mar 2009 02:08:09 -0000 1.752 @@ -1 +1 @@ -f0ce719ba3774013022d96018bab0813 anaconda-11.5.0.26.tar.bz2 +879ed8bac110208e53fa2bce720f152c anaconda-11.5.0.27.tar.bz2 From jjames at fedoraproject.org Wed Mar 11 02:45:07 2009 From: jjames at fedoraproject.org (Jerry James) Date: Wed, 11 Mar 2009 02:45:07 +0000 (UTC) Subject: rpms/findbugs/devel findbugs.spec,1.1,1.2 Message-ID: <20090311024507.74B6270132@cvs1.fedora.phx.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/findbugs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23202/devel Modified Files: findbugs.spec Log Message: * Tue Mar 10 2009 Jerry James - 1.3.7-5 - Add missing ant-nodeps BR Index: findbugs.spec =================================================================== RCS file: /cvs/pkgs/rpms/findbugs/devel/findbugs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- findbugs.spec 11 Mar 2009 01:50:14 -0000 1.1 +++ findbugs.spec 11 Mar 2009 02:44:35 -0000 1.2 @@ -5,7 +5,7 @@ Name: findbugs Version: 1.3.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Find bugs in Java code Group: Development/Languages @@ -22,7 +22,7 @@ BuildArch: noarch BuildRequires: findbugs-bcel -BuildRequires: ant +BuildRequires: ant-nodeps BuildRequires: docbook-style-xsl BuildRequires: jakarta-commons-lang BuildRequires: java-devel @@ -182,6 +182,9 @@ %{_javadir}/findbugs-tools* %changelog +* Tue Mar 10 2009 Jerry James - 1.3.7-5 +- Add missing ant-nodeps BR + * Fri Mar 6 2009 Jerry James - 1.3.7-4 - Add README.fedora to the -tools package From jjames at fedoraproject.org Wed Mar 11 02:45:07 2009 From: jjames at fedoraproject.org (Jerry James) Date: Wed, 11 Mar 2009 02:45:07 +0000 (UTC) Subject: rpms/findbugs/F-10 findbugs.spec,1.1,1.2 Message-ID: <20090311024507.6E81F7002F@cvs1.fedora.phx.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/findbugs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23202/F-10 Modified Files: findbugs.spec Log Message: * Tue Mar 10 2009 Jerry James - 1.3.7-5 - Add missing ant-nodeps BR Index: findbugs.spec =================================================================== RCS file: /cvs/pkgs/rpms/findbugs/F-10/findbugs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- findbugs.spec 11 Mar 2009 01:54:37 -0000 1.1 +++ findbugs.spec 11 Mar 2009 02:44:32 -0000 1.2 @@ -5,7 +5,7 @@ Name: findbugs Version: 1.3.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Find bugs in Java code Group: Development/Languages @@ -22,7 +22,7 @@ BuildArch: noarch BuildRequires: findbugs-bcel -BuildRequires: ant +BuildRequires: ant-nodeps BuildRequires: docbook-style-xsl BuildRequires: jakarta-commons-lang BuildRequires: java-devel @@ -182,6 +182,9 @@ %{_javadir}/findbugs-tools* %changelog +* Tue Mar 10 2009 Jerry James - 1.3.7-5 +- Add missing ant-nodeps BR + * Fri Mar 6 2009 Jerry James - 1.3.7-4 - Add README.fedora to the -tools package From jjames at fedoraproject.org Wed Mar 11 03:01:38 2009 From: jjames at fedoraproject.org (Jerry James) Date: Wed, 11 Mar 2009 03:01:38 +0000 (UTC) Subject: rpms/findbugs/F-10 findbugs.spec,1.2,1.3 Message-ID: <20090311030138.AFFA670132@cvs1.fedora.phx.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/findbugs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26452/F-10 Modified Files: findbugs.spec Log Message: * Tue Mar 10 2009 Jerry James - 1.3.7-6 - Force building with OpenJDK; see GCJ note at the top of the spec file Index: findbugs.spec =================================================================== RCS file: /cvs/pkgs/rpms/findbugs/F-10/findbugs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- findbugs.spec 11 Mar 2009 02:44:32 -0000 1.2 +++ findbugs.spec 11 Mar 2009 03:01:07 -0000 1.3 @@ -1,11 +1,11 @@ -# GCJ note: findbugs currenly cannot be compiled with GCJ. There are several +# GCJ note: findbugs currently cannot be compiled with GCJ. There are several # problems, most of which could be fixed with a little effort. However, # findbugs uses java.util.regex.Pattern.LITERAL, which is part of the Java 5 # specification, but Classpath does not support it. This is a fatal problem. Name: findbugs Version: 1.3.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Find bugs in Java code Group: Development/Languages @@ -25,7 +25,7 @@ BuildRequires: ant-nodeps BuildRequires: docbook-style-xsl BuildRequires: jakarta-commons-lang -BuildRequires: java-devel +BuildRequires: java-1.6.0-openjdk-devel BuildRequires: jaxen BuildRequires: jcip-annotations BuildRequires: jFormatString @@ -37,7 +37,7 @@ BuildRequires: tex(latex) Requires: findbugs-bcel Requires: jakarta-commons-lang -Requires: java +Requires: java-1.6.0-openjdk Requires: jaxen Requires: jcip-annotations Requires: jFormatString @@ -182,6 +182,9 @@ %{_javadir}/findbugs-tools* %changelog +* Tue Mar 10 2009 Jerry James - 1.3.7-6 +- Force building with OpenJDK; see GCJ note at the top of the spec file + * Tue Mar 10 2009 Jerry James - 1.3.7-5 - Add missing ant-nodeps BR From jjames at fedoraproject.org Wed Mar 11 03:01:38 2009 From: jjames at fedoraproject.org (Jerry James) Date: Wed, 11 Mar 2009 03:01:38 +0000 (UTC) Subject: rpms/findbugs/devel findbugs.spec,1.2,1.3 Message-ID: <20090311030138.AA2C27002F@cvs1.fedora.phx.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/findbugs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26452/devel Modified Files: findbugs.spec Log Message: * Tue Mar 10 2009 Jerry James - 1.3.7-6 - Force building with OpenJDK; see GCJ note at the top of the spec file Index: findbugs.spec =================================================================== RCS file: /cvs/pkgs/rpms/findbugs/devel/findbugs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- findbugs.spec 11 Mar 2009 02:44:35 -0000 1.2 +++ findbugs.spec 11 Mar 2009 03:01:07 -0000 1.3 @@ -1,11 +1,11 @@ -# GCJ note: findbugs currenly cannot be compiled with GCJ. There are several +# GCJ note: findbugs currently cannot be compiled with GCJ. There are several # problems, most of which could be fixed with a little effort. However, # findbugs uses java.util.regex.Pattern.LITERAL, which is part of the Java 5 # specification, but Classpath does not support it. This is a fatal problem. Name: findbugs Version: 1.3.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Find bugs in Java code Group: Development/Languages @@ -25,7 +25,7 @@ BuildRequires: ant-nodeps BuildRequires: docbook-style-xsl BuildRequires: jakarta-commons-lang -BuildRequires: java-devel +BuildRequires: java-1.6.0-openjdk-devel BuildRequires: jaxen BuildRequires: jcip-annotations BuildRequires: jFormatString @@ -37,7 +37,7 @@ BuildRequires: tex(latex) Requires: findbugs-bcel Requires: jakarta-commons-lang -Requires: java +Requires: java-1.6.0-openjdk Requires: jaxen Requires: jcip-annotations Requires: jFormatString @@ -182,6 +182,9 @@ %{_javadir}/findbugs-tools* %changelog +* Tue Mar 10 2009 Jerry James - 1.3.7-6 +- Force building with OpenJDK; see GCJ note at the top of the spec file + * Tue Mar 10 2009 Jerry James - 1.3.7-5 - Add missing ant-nodeps BR From kyle at fedoraproject.org Wed Mar 11 03:25:31 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Wed, 11 Mar 2009 03:25:31 +0000 (UTC) Subject: rpms/kernel/devel squashfs-fix-page-aligned-data.patch, NONE, 1.1 kernel.spec, 1.1408, 1.1409 Message-ID: <20090311032531.B94A57002F@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31906 Modified Files: kernel.spec Added Files: squashfs-fix-page-aligned-data.patch Log Message: * Tue Mar 10 2009 Kyle McMartin 2.6.29-0.229.rc7.git3 - squashfs-fix-page-aligned-data.patch: Theoretically valid images are hitting the if (page == pages) check, which is suspect happens when the data is page aligned... We should probably be checking for page+1. squashfs-fix-page-aligned-data.patch: --- NEW FILE squashfs-fix-page-aligned-data.patch --- diff --git a/fs/squashfs/block.c b/fs/squashfs/block.c index 321728f..2b7598e 100644 --- a/fs/squashfs/block.c +++ b/fs/squashfs/block.c @@ -185,7 +185,7 @@ int squashfs_read_data(struct super_block *sb, void **buffer, u64 index, } if (msblk->stream.avail_out == 0) { - if (page == pages) { + if (page > pages) { ERROR("zlib_inflate tried to " "decompress too much data, " "expected %d bytes. Zlib " Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1408 retrieving revision 1.1409 diff -u -r1.1408 -r1.1409 --- kernel.spec 10 Mar 2009 17:10:09 -0000 1.1408 +++ kernel.spec 11 Mar 2009 03:24:59 -0000 1.1409 @@ -688,6 +688,8 @@ Patch9002: cpufreq-add-atom-to-p4-clockmod.patch +Patch9003: squashfs-fix-page-aligned-data.patch + %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1232,6 +1234,8 @@ ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch +ApplyPatch squashfs-fix-page-aligned-data.patch + # END OF PATCH APPLICATIONS %endif @@ -1815,6 +1819,12 @@ # and build. %changelog +* Tue Mar 10 2009 Kyle McMartin 2.6.29-0.229.rc7.git3 +- squashfs-fix-page-aligned-data.patch: + Theoretically valid images are hitting the if (page == pages) check, + which is suspect happens when the data is page aligned... We should + probably be checking for page+1. + * Tue Mar 10 2009 Tom "spot" Callaway - disable CONFIG_AGP on sparc64 From oget at fedoraproject.org Wed Mar 11 03:28:17 2009 From: oget at fedoraproject.org (Orcan Ogetbil) Date: Wed, 11 Mar 2009 03:28:17 +0000 (UTC) Subject: rpms/itext/F-10 .cvsignore, 1.4, 1.5 itext.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <20090311032817.672C97002F@cvs1.fedora.phx.redhat.com> Author: oget Update of /cvs/pkgs/rpms/itext/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32644 Modified Files: .cvsignore itext.spec sources Log Message: * Tue Mar 10 2009 Orcan Ogetbil 2.1.5-1 - New upstream release - Pass the additional flag "-fno-indirect-classes" to aot-compile-rpm Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/itext/F-10/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Nov 2008 08:14:13 -0000 1.4 +++ .cvsignore 11 Mar 2009 03:27:46 -0000 1.5 @@ -1 +1 @@ -iText-src-2.1.4.tar.gz +iText-src-2.1.5.tar.gz Index: itext.spec =================================================================== RCS file: /cvs/pkgs/rpms/itext/F-10/itext.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- itext.spec 30 Nov 2008 08:14:13 -0000 1.12 +++ itext.spec 11 Mar 2009 03:27:46 -0000 1.13 @@ -3,7 +3,7 @@ Summary: A Free Java-PDF library Name: itext -Version: 2.1.4 +Version: 2.1.5 Release: 1%{?dist} License: (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and MIT and LGPLv2+ and CC-BY URL: http://www.lowagie.com/iText/ @@ -98,7 +98,7 @@ ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) %if %{with_gcj} - %{_bindir}/aot-compile-rpm + RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-indirect-classes" %{_bindir}/aot-compile-rpm %endif # javadoc @@ -141,25 +141,29 @@ # ----------------------------------------------------------------------------- %changelog -* Sun Nov 30 2008 Orcan Ogetbil 2.1.4-1 +* Tue Mar 10 2009 Orcan Ogetbil 2.1.5-1 +- New upstream release +- Pass the additional flag "-fno-indirect-classes" to aot-compile-rpm + +* Sun Nov 30 2008 Orcan Ogetbil 2.1.4-1 - Updated to 2.1.4. - Set debug="on" on javac part of the build script to compile the aot-bits correctly. (bug#472292) -* Sat Oct 11 2008 Orcan Ogetbil 2.1.3-4 +* Sat Oct 11 2008 Orcan Ogetbil 2.1.3-4 - Fix more encoding issues. -* Fri Oct 10 2008 Orcan Ogetbil 2.1.3-3 +* Fri Oct 10 2008 Orcan Ogetbil 2.1.3-3 - Included the copyright notice (CC-BY) for the icons among the doc files. -* Thu Oct 09 2008 Orcan Ogetbil 2.1.3-2 +* Thu Oct 09 2008 Orcan Ogetbil 2.1.3-2 - Enabled compilation of rups library - Resorted dependencies (added: pdf-renderer, dom4j; removed bouncycastle) - Fixed java dependencies - License is (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and MIT and LGPLv2+ and CC-BY - Minor improvements in the SPEC file -* Thu Oct 02 2008 Orcan Ogetbil 2.1.3-1 +* Thu Oct 02 2008 Orcan Ogetbil 2.1.3-1 - Repacked with version 2.1.3 * Thu Oct 05 2006 Christian Iseli 1.3-3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/itext/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Nov 2008 08:14:13 -0000 1.5 +++ sources 11 Mar 2009 03:27:46 -0000 1.6 @@ -1 +1 @@ -ae115ff488c8e3a27c4e3aa6a465b174 iText-src-2.1.4.tar.gz +82a2532130da3f35e749bda6f1b99ba0 iText-src-2.1.5.tar.gz From pkgdb at fedoraproject.org Wed Mar 11 04:04:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 04:04:49 +0000 Subject: [pkgdb] dia EL-5 cloned from devel Message-ID: <20090311040509.AADE6208504@bastion.fedora.phx.redhat.com> huzaifas cloned dia EL-5 from devel To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dia From kyle at fedoraproject.org Wed Mar 11 04:09:20 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Wed, 11 Mar 2009 04:09:20 +0000 (UTC) Subject: rpms/kernel/devel kernel.spec,1.1409,1.1410 sources,1.991,1.992 Message-ID: <20090311040921.0395F7002F@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9042 Modified Files: kernel.spec sources Log Message: * Tue Mar 10 2009 Kyle McMartin 2.6.29-0.230.rc7.git3 - Add -git3 to sources... Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1409 retrieving revision 1.1410 diff -u -r1.1409 -r1.1410 --- kernel.spec 11 Mar 2009 03:24:59 -0000 1.1409 +++ kernel.spec 11 Mar 2009 04:08:49 -0000 1.1410 @@ -1819,6 +1819,9 @@ # and build. %changelog +* Tue Mar 10 2009 Kyle McMartin 2.6.29-0.230.rc7.git3 +- Add -git3 to sources... + * Tue Mar 10 2009 Kyle McMartin 2.6.29-0.229.rc7.git3 - squashfs-fix-page-aligned-data.patch: Theoretically valid images are hitting the if (page == pages) check, Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.991 retrieving revision 1.992 diff -u -r1.991 -r1.992 --- sources 10 Mar 2009 16:21:25 -0000 1.991 +++ sources 11 Mar 2009 04:08:50 -0000 1.992 @@ -1,2 +1,3 @@ d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2 9404c2ead603a80a3aad6361b5fc5413 patch-2.6.29-rc7.bz2 +4ed646718fc5684d63e6e9015b7d02a6 patch-2.6.29-rc7-git3.bz2 From iarnell at fedoraproject.org Wed Mar 11 04:23:44 2009 From: iarnell at fedoraproject.org (Iain Arnell) Date: Wed, 11 Mar 2009 04:23:44 +0000 (UTC) Subject: rpms/perl-HTML-Tiny/devel perl-HTML-Tiny.spec,1.4,1.5 Message-ID: <20090311042344.8B4697002F@cvs1.fedora.phx.redhat.com> Author: iarnell Update of /cvs/pkgs/rpms/perl-HTML-Tiny/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12586 Modified Files: perl-HTML-Tiny.spec Log Message: * Wed Mar 11 2009 Iain Arnell 1.05-3 - no more explicit BR perl-Test-Simple Index: perl-HTML-Tiny.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Tiny/devel/perl-HTML-Tiny.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-HTML-Tiny.spec 10 Mar 2009 17:30:02 -0000 1.4 +++ perl-HTML-Tiny.spec 11 Mar 2009 04:23:14 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-HTML-Tiny Version: 1.05 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Lightweight, dependency free HTML/XML generation License: GPL+ or Artistic Group: Development/Libraries @@ -10,8 +10,6 @@ BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) -# Explicitly require perl-Test-Simple to avoid BZ #489421/473874 -BuildRequires: perl-Test-Simple Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -50,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 11 2009 Iain Arnell 1.05-3 +- no more explicit BR perl-Test-Simple + * Tue Mar 10 2009 Iain Arnell 1.05-2 - Explicitly require perl-Test-Simple to avoid BZ #489421/473874 From pgordon at fedoraproject.org Wed Mar 11 05:01:13 2009 From: pgordon at fedoraproject.org (Peter Gordon) Date: Wed, 11 Mar 2009 05:01:13 +0000 (UTC) Subject: rpms/deluge/F-10 deluge-scalable-icon-dir.diff, NONE, 1.1 deluge.spec, 1.77, 1.78 Message-ID: <20090311050113.7AE2370128@cvs1.fedora.phx.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/deluge/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20913/F-10 Modified Files: deluge.spec Added Files: deluge-scalable-icon-dir.diff Log Message: Fix scalable icon installation. (Thanks, Mamoru Tasaka - bug #483443) deluge-scalable-icon-dir.diff: --- NEW FILE deluge-scalable-icon-dir.diff --- diff -up ./setup.py.old ./setup.py --- ./setup.py.old 2009-03-10 16:50:52.000000000 -0700 +++ ./setup.py 2009-03-10 16:51:04.000000000 -0700 @@ -328,7 +328,7 @@ cmdclass = { # Data files to be installed to the system _data_files = [ - ('share/icons/scalable/apps', ['deluge/data/icons/scalable/apps/deluge.svg']), + ('share/icons/hicolor/scalable/apps', ['deluge/data/icons/scalable/apps/deluge.svg']), ('share/icons/hicolor/128x128/apps', ['deluge/data/icons/hicolor/128x128/apps/deluge.png']), ('share/icons/hicolor/16x16/apps', ['deluge/data/icons/hicolor/16x16/apps/deluge.png']), ('share/icons/hicolor/192x192/apps', ['deluge/data/icons/hicolor/192x192/apps/deluge.png']), Index: deluge.spec =================================================================== RCS file: /cvs/pkgs/rpms/deluge/F-10/deluge.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- deluge.spec 10 Mar 2009 06:25:51 -0000 1.77 +++ deluge.spec 11 Mar 2009 05:00:42 -0000 1.78 @@ -3,7 +3,7 @@ Name: deluge Version: 1.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A GTK+ BitTorrent client with support for DHT, UPnP, and PEX Group: Applications/Internet License: GPLv2+ @@ -14,6 +14,9 @@ ## rb_libtorrent. See below for more details. # Source1: %{name}-fixed-setup.py +## The scalable icon needs to be installed to the proper place. +Patch0: %{name}-scalable-icon-dir.diff + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel @@ -57,6 +60,7 @@ %prep %setup -q +%patch0 -p0 -b .fix-scalable-icon-dir ## Not building against system rb_libtorrent - see above. # install -m 0755 %{SOURCE1} ./setup.py @@ -131,8 +135,7 @@ %{_bindir}/%{name}d %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.* -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/icons/scalable/ +%{_datadir}/icons/hicolor/*/apps/%{name}.* %{_mandir}/man?/%{name}* @@ -153,6 +156,10 @@ %changelog +* Tue Mar 10 2009 Peter Gordon - 1.1.4-2 +- Fix the installed location of the scalable (SVG) icon (#483443). + + scalable-icon-dir.diff + * Mon Mar 09 2009 Peter Gordon - 1.1.4-1 - Update to new upstream bug-fix release (1.1.4) From phuang at fedoraproject.org Wed Mar 11 06:49:13 2009 From: phuang at fedoraproject.org (Huang Peng) Date: Wed, 11 Mar 2009 06:49:13 +0000 (UTC) Subject: rpms/ibus/devel .cvsignore, 1.25, 1.26 ibus.spec, 1.53, 1.54 sources, 1.28, 1.29 Message-ID: <20090311064914.5A70470128@cvs1.fedora.phx.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/ibus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6711 Modified Files: .cvsignore ibus.spec sources Log Message: Update to ibus-1.1.0.20090311 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 6 Mar 2009 06:33:47 -0000 1.25 +++ .cvsignore 11 Mar 2009 06:48:42 -0000 1.26 @@ -1 +1 @@ -ibus-1.1.0.20090306.tar.gz +ibus-1.1.0.20090311.tar.gz Index: ibus.spec =================================================================== RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- ibus.spec 6 Mar 2009 06:52:29 -0000 1.53 +++ ibus.spec 11 Mar 2009 06:48:42 -0000 1.54 @@ -7,7 +7,7 @@ %define im_chooser_version 1.2.5 Name: ibus -Version: 1.1.0.20090306 +Version: 1.1.0.20090311 Release: 1%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPLv2+ @@ -214,6 +214,10 @@ %{_libdir}/pkgconfig/* %changelog +* Wed Mar 11 2009 Huang Peng - 1.1.0.20090311-1 +- Update to ibus-1.1.0.20090311. +- Update setup ui follow GNOME Human Interface Guidelines 2.2 (#489497). + * Fri Mar 6 2009 Huang Peng - 1.1.0.20090306-1 - Update to ibus-1.1.0.20090306. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 6 Mar 2009 06:33:47 -0000 1.28 +++ sources 11 Mar 2009 06:48:42 -0000 1.29 @@ -1 +1 @@ -f110926c2edde0cf4d81aafb75d55c8c ibus-1.1.0.20090306.tar.gz +0a5dca579d10bdcc7eba4f475b5a0c2b ibus-1.1.0.20090311.tar.gz From mtasaka at fedoraproject.org Wed Mar 11 07:04:24 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Wed, 11 Mar 2009 07:04:24 +0000 (UTC) Subject: rpms/jd/F-10 .cvsignore, 1.351, 1.352 jd.spec, 1.408, 1.409 sources, 1.352, 1.353 Message-ID: <20090311070424.5C29270128@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8890/F-10 Modified Files: .cvsignore jd.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v retrieving revision 1.351 retrieving revision 1.352 diff -u -r1.351 -r1.352 --- .cvsignore 7 Mar 2009 18:00:53 -0000 1.351 +++ .cvsignore 11 Mar 2009 07:03:53 -0000 1.352 @@ -1 +1 @@ -jd-2.4.0-svn2708_trunk.tgz +jd-2.4.0-svn2713_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v retrieving revision 1.408 retrieving revision 1.409 diff -u -r1.408 -r1.409 --- jd.spec 7 Mar 2009 18:00:53 -0000 1.408 +++ jd.spec 11 Mar 2009 07:03:53 -0000 1.409 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.4.0 -%define strtag svn2708_trunk +%define strtag svn2713_trunk %define repoid 38008 # Define this if this is pre-version %define pre_release 1 @@ -138,7 +138,7 @@ %{icondir}/%{name}.png %changelog -* Sun Mar 8 2009 Mamoru Tasaka +* Tue Mar 10 2009 Mamoru Tasaka - Update to latest trunk * Thu Mar 5 2009 Mamoru Tasaka - 2.3.0-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-10/sources,v retrieving revision 1.352 retrieving revision 1.353 diff -u -r1.352 -r1.353 --- sources 7 Mar 2009 18:00:53 -0000 1.352 +++ sources 11 Mar 2009 07:03:53 -0000 1.353 @@ -1 +1 @@ -84cbd3183336f0fccc0042255d506cf0 jd-2.4.0-svn2708_trunk.tgz +568914f39dd30db52cb3eafabd8766e3 jd-2.4.0-svn2713_trunk.tgz From mtasaka at fedoraproject.org Wed Mar 11 07:04:24 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Wed, 11 Mar 2009 07:04:24 +0000 (UTC) Subject: rpms/jd/F-9 .cvsignore, 1.351, 1.352 jd.spec, 1.399, 1.400 sources, 1.352, 1.353 Message-ID: <20090311070424.B16A370128@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8890/F-9 Modified Files: .cvsignore jd.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v retrieving revision 1.351 retrieving revision 1.352 diff -u -r1.351 -r1.352 --- .cvsignore 7 Mar 2009 18:00:54 -0000 1.351 +++ .cvsignore 11 Mar 2009 07:03:54 -0000 1.352 @@ -1 +1 @@ -jd-2.4.0-svn2708_trunk.tgz +jd-2.4.0-svn2713_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v retrieving revision 1.399 retrieving revision 1.400 diff -u -r1.399 -r1.400 --- jd.spec 7 Mar 2009 18:00:54 -0000 1.399 +++ jd.spec 11 Mar 2009 07:03:54 -0000 1.400 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.4.0 -%define strtag svn2708_trunk +%define strtag svn2713_trunk %define repoid 38008 # Define this if this is pre-version %define pre_release 1 @@ -138,7 +138,7 @@ %{icondir}/%{name}.png %changelog -* Sun Mar 8 2009 Mamoru Tasaka +* Tue Mar 10 2009 Mamoru Tasaka - Update to latest trunk * Thu Mar 5 2009 Mamoru Tasaka - 2.3.0-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-9/sources,v retrieving revision 1.352 retrieving revision 1.353 diff -u -r1.352 -r1.353 --- sources 7 Mar 2009 18:00:54 -0000 1.352 +++ sources 11 Mar 2009 07:03:54 -0000 1.353 @@ -1 +1 @@ -84cbd3183336f0fccc0042255d506cf0 jd-2.4.0-svn2708_trunk.tgz +568914f39dd30db52cb3eafabd8766e3 jd-2.4.0-svn2713_trunk.tgz From jasper at fedoraproject.org Wed Mar 11 07:42:32 2009 From: jasper at fedoraproject.org (Jasper Capel) Date: Wed, 11 Mar 2009 07:42:32 +0000 (UTC) Subject: rpms/python-mwlib/EL-5 python-mwlib.spec,1.11,1.12 Message-ID: <20090311074232.2249670128@cvs1.fedora.phx.redhat.com> Author: jasper Update of /cvs/pkgs/rpms/python-mwlib/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14298 Modified Files: python-mwlib.spec Log Message: 0.9.10-4 Index: python-mwlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-mwlib/EL-5/python-mwlib.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- python-mwlib.spec 10 Mar 2009 21:22:40 -0000 1.11 +++ python-mwlib.spec 11 Mar 2009 07:42:01 -0000 1.12 @@ -2,7 +2,7 @@ Name: python-mwlib Version: 0.9.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MediaWiki conversion library for Python Group: Development/Languages @@ -32,6 +32,7 @@ %prep %setup -q -n mwlib-%{version} %patch0 -p1 +%patch1 -p1 %build @@ -59,6 +60,9 @@ %changelog +* Tue Mar 10 2009 Jasper Capel - 0.9.10-4 +- Patched to require lower python-setuptools, which is available on EPEL + * Tue Mar 10 2009 Jasper Capel - 0.9.10-3 - Patched to build on EPEL-5 From lkundrak at fedoraproject.org Wed Mar 11 08:25:37 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Wed, 11 Mar 2009 08:25:37 +0000 (UTC) Subject: rpms/inkscape/devel inkscape.spec,1.69,1.70 Message-ID: <20090311082537.C80C970128@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21249 Modified Files: inkscape.spec Log Message: * Wed Mar 04 2009 Lubomir Rintel - 0.47-0.6.20090301svn - Rebuild for new ImageMagick Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- inkscape.spec 4 Mar 2009 18:20:41 -0000 1.69 +++ inkscape.spec 11 Mar 2009 08:25:07 -0000 1.70 @@ -4,7 +4,7 @@ Name: inkscape Version: 0.47 -Release: 0.5.20090301svn%{?dist} +Release: 0.6.20090301svn%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity @@ -249,6 +249,9 @@ %changelog +* Wed Mar 04 2009 Lubomir Rintel - 0.47-0.6.20090301svn +- Rebuild for new ImageMagick + * Wed Mar 04 2009 Lubomir Rintel - 0.47-0.5.20090301svn - Split documentation and inkview into subpackages From kdudka at fedoraproject.org Wed Mar 11 09:04:31 2009 From: kdudka at fedoraproject.org (Kamil Dudka) Date: Wed, 11 Mar 2009 09:04:31 +0000 (UTC) Subject: rpms/curl/devel curl.spec,1.88,1.89 Message-ID: <20090311090431.EAA2A70128@cvs1.fedora.phx.redhat.com> Author: kdudka Update of /cvs/extras/rpms/curl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26679 Modified Files: curl.spec Log Message: make curl-devel multilib-ready (bug #488922) Index: curl.spec =================================================================== RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- curl.spec 6 Mar 2009 13:45:02 -0000 1.88 +++ curl.spec 11 Mar 2009 09:04:01 -0000 1.89 @@ -1,7 +1,7 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl Version: 7.19.4 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 @@ -34,7 +34,10 @@ Group: Development/Libraries Requires: libcurl = %{version}-%{release} Requires: libidn-devel, pkgconfig, automake + +# redundant Requires: libssh2-devel + Provides: curl-devel = %{version}-%{release} Obsoletes: curl-devel < %{version}-%{release} @@ -81,6 +84,29 @@ install -d $RPM_BUILD_ROOT/%{_datadir}/aclocal install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal +# Make curl-devel multilib-ready (bug #488922) +# solution taken from python.spec +%define _curlbuild32_h curlbuild-32.h +%define _curlbuild64_h curlbuild-64.h + +%ifarch ppc64 s390x x86_64 ia64 alpha sparc64 +%define _curlbuild_h %{_curlbuild64_h} +%else +%define _curlbuild_h %{_curlbuild32_h} +%endif +mv $RPM_BUILD_ROOT%{_includedir}/curl/curlbuild.h \ + $RPM_BUILD_ROOT%{_includedir}/curl/%{_curlbuild_h} +cat > $RPM_BUILD_ROOT%{_includedir}/curl/curlbuild.h << EOF +#include + +#if __WORDSIZE == 32 +#include "%{_curlbuild32_h}" +#elif __WORDSIZE == 64 +#include "%{_curlbuild64_h}" +#else +#error "Unknown word size" +#endif +EOF # don't need curl's copy of the certs; use openssl's find ${RPM_BUILD_ROOT} -name ca-bundle.crt -exec rm -f '{}' \; @@ -117,6 +143,9 @@ %{_datadir}/aclocal/libcurl.m4 %changelog +* Wed Mar 11 2009 Kamil Dudka 7.19.4-3 +- make curl-devel multilib-ready (bug #488922) + * Fri Mar 06 2009 Jindrich Novy 7.19.4-2 - drop .easy-leak patch, causes problems in pycurl (#488791) - fix libcurl-devel dependencies (#488895) From jreznik at fedoraproject.org Wed Mar 11 09:06:29 2009 From: jreznik at fedoraproject.org (Jaroslav Reznik) Date: Wed, 11 Mar 2009 09:06:29 +0000 (UTC) Subject: rpms/kvkbd/devel import.log, NONE, 1.1 kvkbd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090311090629.4C71870128@cvs1.fedora.phx.redhat.com> Author: jreznik Update of /cvs/pkgs/rpms/kvkbd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27059/devel Modified Files: .cvsignore sources Added Files: import.log kvkbd.spec Log Message: Initial package import --- NEW FILE import.log --- kvkbd-0_6-1_fc10:HEAD:kvkbd-0.6-1.fc10.src.rpm:1236762314 --- NEW FILE kvkbd.spec --- Name: kvkbd Version: 0.6 Release: 1%{?dist} Summary: Virtual keyboard for KDE Group: Applications/System License: GPLv2+ URL: http://www.kde-apps.org/content/show.php/Kvkbd+-+KDE4?content=94374 Source0: http://www.kde-apps.org/CONTENT/content-files/94374-%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake kdelibs-devel libxslt-devel %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } %description Kvkbd is a virtual keyboard for KDE, it contains many feature like system tray and dock support, autodetection and on the fly change of the keyboard layout, scripting with DBus, etc. %prep %setup -q %build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. popd make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} mkdir %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} desktop-file-install \ --delete-original \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/kde4/kvkbd.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %{_kde4_bindir}/kvkbd %{_kde4_datadir}/applications/kvkbd.desktop %{_kde4_datadir}/doc/HTML/en/kvkbd/ %{_kde4_appsdir}/kvkbd/ %changelog * Mon Mar 09 2009 Jaroslav Reznik - 0.6-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kvkbd/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:16:03 -0000 1.1 +++ .cvsignore 11 Mar 2009 09:05:58 -0000 1.2 @@ -0,0 +1 @@ +94374-kvkbd-0.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kvkbd/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:16:04 -0000 1.1 +++ sources 11 Mar 2009 09:05:58 -0000 1.2 @@ -0,0 +1 @@ +342e8e7fcfc54d978615b1c2d019cbe5 94374-kvkbd-0.6.tar.bz2 From kdudka at fedoraproject.org Wed Mar 11 09:06:43 2009 From: kdudka at fedoraproject.org (Kamil Dudka) Date: Wed, 11 Mar 2009 09:06:43 +0000 (UTC) Subject: rpms/curl/devel curl.spec,1.89,1.90 Message-ID: <20090311090643.4705470128@cvs1.fedora.phx.redhat.com> Author: kdudka Update of /cvs/extras/rpms/curl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27140 Modified Files: curl.spec Log Message: fix typo in last commit Index: curl.spec =================================================================== RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- curl.spec 11 Mar 2009 09:04:01 -0000 1.89 +++ curl.spec 11 Mar 2009 09:06:13 -0000 1.90 @@ -84,7 +84,7 @@ install -d $RPM_BUILD_ROOT/%{_datadir}/aclocal install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal -# Make curl-devel multilib-ready (bug #488922) +# Make libcurl-devel multilib-ready (bug #488922) # solution taken from python.spec %define _curlbuild32_h curlbuild-32.h %define _curlbuild64_h curlbuild-64.h @@ -144,7 +144,7 @@ %changelog * Wed Mar 11 2009 Kamil Dudka 7.19.4-3 -- make curl-devel multilib-ready (bug #488922) +- make libcurl-devel multilib-ready (bug #488922) * Fri Mar 06 2009 Jindrich Novy 7.19.4-2 - drop .easy-leak patch, causes problems in pycurl (#488791) From thm at fedoraproject.org Wed Mar 11 09:11:54 2009 From: thm at fedoraproject.org (Thomas Moschny) Date: Wed, 11 Mar 2009 09:11:54 +0000 (UTC) Subject: rpms/python-textile/devel import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 python-textile.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <20090311091154.AC1EF70128@cvs1.fedora.phx.redhat.com> Author: thm Update of /cvs/pkgs/rpms/python-textile/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28068/devel Modified Files: .cvsignore python-textile.spec sources Added Files: import.log Log Message: Update to 2.1.3. --- NEW FILE import.log --- python-textile-2_1_3-1_fc10:HEAD:python-textile-2.1.3-1.fc10.src.rpm:1236762638 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-textile/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Apr 2008 22:45:47 -0000 1.2 +++ .cvsignore 11 Mar 2009 09:11:24 -0000 1.3 @@ -1 +1 @@ -textile-2.0.11.tar.gz +textile-2.1.3.tar.gz Index: python-textile.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-textile/devel/python-textile.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-textile.spec 26 Feb 2009 23:40:18 -0000 1.4 +++ python-textile.spec 11 Mar 2009 09:11:24 -0000 1.5 @@ -3,22 +3,18 @@ %define srcname textile Name: python-%{srcname} -Version: 2.0.11 -Release: 6%{?dist} +Version: 2.1.3 +Release: 1%{?dist} Summary: A Humane Web Text Generator - Group: Development/Languages License: BSD -URL: http://code.google.com/p/pytextile/ -Source0: http://pytextile.googlecode.com/files/%{srcname}-%{version}.tar.gz +URL: http://loopcore.com/python-textile +Source0: http://pypi.python.org/packages/source/t/%{srcname}/%{srcname}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel -# for htmlizer: -Requires(missingok): python-twisted-core - # FIXME: no package currently provides tidy, # could be mx (experimental) or uTidyLib. @@ -30,31 +26,36 @@ %prep %setup -q -n %{srcname}-%{version} -# small fixes: -# - toggle import statement for htmlizer -# - remove the shebang -sed -i -e 's/^\( *\)\(import htmlizer\)/\1#\2/' \ - -e 's/^\( *\)#\(from twisted.python import htmlizer\)/\1\2/' \ - -e '/#! *\/usr\/bin\/.*python.*/{1D}' textile.py +# remove the shebang +sed -i -e '/#! *\/usr\/bin\/.*python.*/{1D}' textile.py %build %{__python} setup.py build -# calling textile directly yields a single overview page -%{__python} textile.py > overview.html +%{__python} textile.py README.textile > README.html %install rm -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} +%check +PYTHONPATH=%{buildroot}%{python_sitelib} %{__python} test/test.py + %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc overview.html +%doc README.* %{python_sitelib}/* %changelog +* Wed Mar 11 2009 Thomas Moschny - 2.1.3-1 +- Upstream and upstream URLs changed. +- Update to 2.1.3. +- Remove now obsolete tweak for enabling import of htmlizer. +- Process README.textile provided in the package. +- Run test.py in %%check section. + * Thu Feb 26 2009 Fedora Release Engineering - 2.0.11-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-textile/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Apr 2008 22:45:47 -0000 1.2 +++ sources 11 Mar 2009 09:11:24 -0000 1.3 @@ -1 +1 @@ -a94aee1f9610aae6605c6e72b6a1f660 textile-2.0.11.tar.gz +07ec3c6d5e47763376894dfe60466a18 textile-2.1.3.tar.gz From jreznik at fedoraproject.org Wed Mar 11 09:16:08 2009 From: jreznik at fedoraproject.org (Jaroslav Reznik) Date: Wed, 11 Mar 2009 09:16:08 +0000 (UTC) Subject: rpms/kvkbd/F-10 import.log, NONE, 1.1 kvkbd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090311091608.7E3BE70128@cvs1.fedora.phx.redhat.com> Author: jreznik Update of /cvs/pkgs/rpms/kvkbd/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28826/F-10 Modified Files: .cvsignore sources Added Files: import.log kvkbd.spec Log Message: Initial package import --- NEW FILE import.log --- kvkbd-0_6-1_fc10:F-10:kvkbd-0.6-1.fc10.src.rpm:1236762898 --- NEW FILE kvkbd.spec --- Name: kvkbd Version: 0.6 Release: 1%{?dist} Summary: Virtual keyboard for KDE Group: Applications/System License: GPLv2+ URL: http://www.kde-apps.org/content/show.php/Kvkbd+-+KDE4?content=94374 Source0: http://www.kde-apps.org/CONTENT/content-files/94374-%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake kdelibs-devel libxslt-devel %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } %description Kvkbd is a virtual keyboard for KDE, it contains many feature like system tray and dock support, autodetection and on the fly change of the keyboard layout, scripting with DBus, etc. %prep %setup -q %build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. popd make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} mkdir %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} desktop-file-install \ --delete-original \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/kde4/kvkbd.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %{_kde4_bindir}/kvkbd %{_kde4_datadir}/applications/kvkbd.desktop %{_kde4_datadir}/doc/HTML/en/kvkbd/ %{_kde4_appsdir}/kvkbd/ %changelog * Mon Mar 09 2009 Jaroslav Reznik - 0.6-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kvkbd/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:16:03 -0000 1.1 +++ .cvsignore 11 Mar 2009 09:15:38 -0000 1.2 @@ -0,0 +1 @@ +94374-kvkbd-0.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kvkbd/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:16:04 -0000 1.1 +++ sources 11 Mar 2009 09:15:38 -0000 1.2 @@ -0,0 +1 @@ +342e8e7fcfc54d978615b1c2d019cbe5 94374-kvkbd-0.6.tar.bz2 From jreznik at fedoraproject.org Wed Mar 11 09:18:10 2009 From: jreznik at fedoraproject.org (Jaroslav Reznik) Date: Wed, 11 Mar 2009 09:18:10 +0000 (UTC) Subject: rpms/kvkbd/F-9 import.log, NONE, 1.1 kvkbd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090311091810.2994970128@cvs1.fedora.phx.redhat.com> Author: jreznik Update of /cvs/pkgs/rpms/kvkbd/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29340/F-9 Modified Files: .cvsignore sources Added Files: import.log kvkbd.spec Log Message: Initial package import --- NEW FILE import.log --- kvkbd-0_6-1_fc10:F-9:kvkbd-0.6-1.fc10.src.rpm:1236763027 --- NEW FILE kvkbd.spec --- Name: kvkbd Version: 0.6 Release: 1%{?dist} Summary: Virtual keyboard for KDE Group: Applications/System License: GPLv2+ URL: http://www.kde-apps.org/content/show.php/Kvkbd+-+KDE4?content=94374 Source0: http://www.kde-apps.org/CONTENT/content-files/94374-%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake kdelibs-devel libxslt-devel %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } %description Kvkbd is a virtual keyboard for KDE, it contains many feature like system tray and dock support, autodetection and on the fly change of the keyboard layout, scripting with DBus, etc. %prep %setup -q %build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. popd make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} mkdir %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} desktop-file-install \ --delete-original \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/kde4/kvkbd.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %{_kde4_bindir}/kvkbd %{_kde4_datadir}/applications/kvkbd.desktop %{_kde4_datadir}/doc/HTML/en/kvkbd/ %{_kde4_appsdir}/kvkbd/ %changelog * Mon Mar 09 2009 Jaroslav Reznik - 0.6-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kvkbd/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:16:03 -0000 1.1 +++ .cvsignore 11 Mar 2009 09:17:39 -0000 1.2 @@ -0,0 +1 @@ +94374-kvkbd-0.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kvkbd/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:16:04 -0000 1.1 +++ sources 11 Mar 2009 09:17:39 -0000 1.2 @@ -0,0 +1 @@ +342e8e7fcfc54d978615b1c2d019cbe5 94374-kvkbd-0.6.tar.bz2 From caolanm at fedoraproject.org Wed Mar 11 09:28:33 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Wed, 11 Mar 2009 09:28:33 +0000 (UTC) Subject: rpms/openoffice.org/devel planned.workspace.defaultdoclang.patch, 1.4, 1.5 Message-ID: <20090311092833.F410C70128@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31509 Modified Files: planned.workspace.defaultdoclang.patch Log Message: update default language stuff to take care of remaining areas planned.workspace.defaultdoclang.patch: Index: planned.workspace.defaultdoclang.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/planned.workspace.defaultdoclang.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- planned.workspace.defaultdoclang.patch 26 Feb 2009 11:40:59 -0000 1.4 +++ planned.workspace.defaultdoclang.patch 11 Mar 2009 09:28:03 -0000 1.5 @@ -1,3 +1,125 @@ +Index: reportdesign/source/core/api/ReportComponent.cxx +=================================================================== +--- reportdesign/source/core/api/ReportComponent.cxx (revision 267481) ++++ reportdesign/source/core/api/ReportComponent.cxx (working copy) +@@ -41,10 +41,12 @@ + #include "ReportControlModel.hxx" + #include + #include ++#include + #include + #include + #include + #include ++#include + // ============================================================================= + namespace reportdesign + { +@@ -96,12 +98,14 @@ + try + { + SvtLinguConfig aLinguConfig; ++ using namespace ::com::sun::star::i18n::ScriptType; ++ + aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale"))) >>= aCharLocale; +- LanguageType eCurLang = SvxLocaleToLanguage( aCharLocale ); ++ LanguageType eCurLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aCharLocale), LATIN); + aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale_CJK"))) >>= aCharLocaleAsian; +- LanguageType eCurLangCJK = SvxLocaleToLanguage( aCharLocaleAsian ); ++ LanguageType eCurLangCJK = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aCharLocaleAsian), ASIAN); + aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale_CTL"))) >>= aCharLocaleComplex; +- LanguageType eCurLangCTL = SvxLocaleToLanguage( aCharLocaleComplex ); ++ LanguageType eCurLangCTL = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aCharLocaleComplex), COMPLEX); + + Font aLatin,aCJK,aCTL; + lcl_getDefaultFonts(aLatin,aCJK,aCTL,eCurLang,eCurLangCJK,eCurLangCTL); +Index: linguistic/source/lngopt.cxx +=================================================================== +--- linguistic/source/lngopt.cxx (revision 267481) ++++ linguistic/source/lngopt.cxx (working copy) +@@ -46,7 +46,9 @@ + #include + #include + #include ++#include + #include ++#include + + using namespace utl; + using namespace osl; +@@ -100,13 +102,13 @@ + } + + +-BOOL LinguOptions::SetLocale_Impl( INT16 &rLanguage, Any &rOld, const Any &rVal) ++BOOL LinguOptions::SetLocale_Impl( INT16 &rLanguage, Any &rOld, const Any &rVal, sal_Int16 nType) + { + BOOL bRes = FALSE; + + Locale aNew; + rVal >>= aNew; +- INT16 nNew = LocaleToLanguage( aNew ); ++ INT16 nNew = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aNew), nType); + if (nNew != rLanguage) + { + Locale aLocale( CreateLocale( rLanguage ) ); +@@ -149,17 +151,17 @@ + case WID_HYPH_MIN_WORD_LENGTH : pnVal = &pData->nHyphMinWordLength; break; + case WID_DEFAULT_LOCALE : + { +- bRes = SetLocale_Impl( pData->nDefaultLanguage, rOld, rVal ); ++ bRes = SetLocale_Impl( pData->nDefaultLanguage, rOld, rVal, ::com::sun::star::i18n::ScriptType::LATIN ); + break; + } + case WID_DEFAULT_LOCALE_CJK : + { +- bRes = SetLocale_Impl( pData->nDefaultLanguage_CJK, rOld, rVal ); ++ bRes = SetLocale_Impl( pData->nDefaultLanguage_CJK, rOld, rVal, ::com::sun::star::i18n::ScriptType::ASIAN ); + break; + } + case WID_DEFAULT_LOCALE_CTL : + { +- bRes = SetLocale_Impl( pData->nDefaultLanguage_CTL, rOld, rVal ); ++ bRes = SetLocale_Impl( pData->nDefaultLanguage_CTL, rOld, rVal, ::com::sun::star::i18n::ScriptType::COMPLEX ); + break; + } + default : +@@ -226,19 +228,19 @@ + case WID_HYPH_MIN_WORD_LENGTH : pnVal = &pData->nHyphMinWordLength; break; + case WID_DEFAULT_LOCALE : + { +- Locale aLocale( CreateLocale( pData->nDefaultLanguage ) ); ++ Locale aLocale( MsLangId::convertLanguageToLocale( pData->nDefaultLanguage ) ); + rVal.setValue( &aLocale, ::getCppuType((Locale*)0 )); + break; + } + case WID_DEFAULT_LOCALE_CJK : + { +- Locale aLocale( CreateLocale( pData->nDefaultLanguage_CJK ) ); ++ Locale aLocale( MsLangId::convertLanguageToLocale( pData->nDefaultLanguage_CJK ) ); + rVal.setValue( &aLocale, ::getCppuType((Locale*)0 )); + break; + } + case WID_DEFAULT_LOCALE_CTL : + { +- Locale aLocale( CreateLocale( pData->nDefaultLanguage_CTL ) ); ++ Locale aLocale( MsLangId::convertLanguageToLocale( pData->nDefaultLanguage_CTL ) ); + rVal.setValue( &aLocale, ::getCppuType((Locale*)0 )); + break; + } +Index: linguistic/source/lngopt.hxx +=================================================================== +--- linguistic/source/lngopt.hxx (revision 267481) ++++ linguistic/source/lngopt.hxx (working copy) +@@ -77,7 +77,7 @@ + + BOOL SetLocale_Impl( INT16 &rLanguage, + ::com::sun::star::uno::Any &rOld, +- const ::com::sun::star::uno::Any &rVal); ++ const ::com::sun::star::uno::Any &rVal, sal_Int16 nType ); + + public: + LinguOptions(); Index: sc/source/ui/app/scmod2.cxx =================================================================== --- sc/source/ui/app/scmod2.cxx (revision 267481) @@ -118,7 +240,43 @@ =================================================================== --- i18npool/source/isolang/mslangid.cxx (revision 267481) +++ i18npool/source/isolang/mslangid.cxx (working copy) -@@ -120,6 +120,31 @@ +@@ -41,6 +41,9 @@ + LanguageType MsLangId::nConfiguredSystemLanguage = LANGUAGE_SYSTEM; + LanguageType MsLangId::nConfiguredSystemUILanguage = LANGUAGE_SYSTEM; + ++LanguageType MsLangId::nConfiguredWesternFallback = LANGUAGE_SYSTEM; ++LanguageType MsLangId::nConfiguredAsianFallback = LANGUAGE_SYSTEM; ++LanguageType MsLangId::nConfiguredComplexFallback = LANGUAGE_SYSTEM; + + // static + void MsLangId::setConfiguredSystemLanguage( LanguageType nLang ) +@@ -55,8 +58,25 @@ + nConfiguredSystemUILanguage = nLang; + } + ++// static ++void MsLangId::setConfiguredWesternFallback( LanguageType nLang ) ++{ ++ nConfiguredWesternFallback = nLang; ++} + + // static ++void MsLangId::setConfiguredAsianFallback( LanguageType nLang ) ++{ ++ nConfiguredAsianFallback = nLang; ++} ++ ++// static ++void MsLangId::setConfiguredComplexFallback( LanguageType nLang ) ++{ ++ nConfiguredComplexFallback = nLang; ++} ++ ++// static + inline LanguageType MsLangId::simplifySystemLanguages( LanguageType nLang ) + { + switch (nLang) +@@ -120,6 +140,41 @@ // static @@ -133,13 +291,23 @@ + switch(nType) + { + case ::com::sun::star::i18n::ScriptType::ASIAN: -+ nLang = LANGUAGE_CHINESE_SIMPLIFIED; ++ if (nConfiguredAsianFallback == LANGUAGE_SYSTEM) ++ nLang = LANGUAGE_CHINESE_SIMPLIFIED; ++ else ++ nLang = nConfiguredComplexFallback; + break; + case ::com::sun::star::i18n::ScriptType::COMPLEX: -+ nLang = LANGUAGE_HINDI; ++ if (nConfiguredComplexFallback == LANGUAGE_SYSTEM) ++ nLang = LANGUAGE_HINDI; ++ else ++ nLang = nConfiguredComplexFallback; + break; + default: -+ nLang = LANGUAGE_ENGLISH_US; ++ if (nConfiguredWesternFallback == LANGUAGE_SYSTEM) ++ nLang = LANGUAGE_ENGLISH_US; ++ else ++ nLang = nConfiguredWesternFallback; ++ break; + break; + } + } @@ -164,6 +332,27 @@ /** Whether locale has a Right-To-Left orientation. */ static bool isRightToLeft( LanguageType nLang ); +@@ -246,6 +249,9 @@ + configuration! */ + static void setConfiguredSystemLanguage( LanguageType nLang ); + static void setConfiguredSystemUILanguage( LanguageType nLang ); ++ static void setConfiguredWesternFallback( LanguageType nLang ); ++ static void setConfiguredComplexFallback( LanguageType nLang ); ++ static void setConfiguredAsianFallback( LanguageType nLang ); + + // --------------------------------------------------------------------------- + +@@ -274,6 +280,10 @@ + static LanguageType nConfiguredSystemLanguage; + static LanguageType nConfiguredSystemUILanguage; + ++ static LanguageType nConfiguredWesternFallback; ++ static LanguageType nConfiguredAsianFallback; ++ static LanguageType nConfiguredComplexFallback; ++ + static LanguageType getPlatformSystemLanguage(); + static LanguageType getPlatformSystemUILanguage(); + Index: sw/source/ui/app/docshini.cxx =================================================================== --- sw/source/ui/app/docshini.cxx (revision 267481) @@ -201,13 +390,49 @@ =================================================================== --- sw/source/ui/app/appopt.cxx (revision 267481) +++ sw/source/ui/app/appopt.cxx (working copy) -@@ -201,6 +201,9 @@ +@@ -35,6 +35,8 @@ + #include // Funktion-Ids + #endif + ++#include ++ + #define _SVSTDARR_STRINGSDTOR + #include + +@@ -54,6 +56,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -191,16 +194,25 @@ + pRet->Put(SwPtrItem(FN_PARAM_PRINTER, pPrt));*/ + + SvtLinguConfig aLinguCfg; ++ Locale aLocale; ++ LanguageType nLang; + ++ using namespace ::com::sun::star::i18n::ScriptType; ++ + Any aLang = aLinguCfg.GetProperty(C2U("DefaultLocale")); +- Locale aLocale; aLang >>= aLocale; - pRet->Put(SvxLanguageItem(SvxLocaleToLanguage( aLocale ), SID_ATTR_CHAR_CJK_LANGUAGE)); +- pRet->Put(SvxLanguageItem(SvxLocaleToLanguage( aLocale ), SID_ATTR_LANGUAGE)); ++ nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aLocale), LATIN); ++ pRet->Put(SvxLanguageItem(nLang, SID_ATTR_LANGUAGE)); + + aLang = aLinguCfg.GetProperty(C2U("DefaultLocale_CJK")); + aLang >>= aLocale; +- pRet->Put(SvxLanguageItem(SvxLocaleToLanguage( aLocale ), SID_ATTR_CHAR_CJK_LANGUAGE)); ++ nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aLocale), ASIAN); ++ pRet->Put(SvxLanguageItem(nLang, SID_ATTR_CHAR_CJK_LANGUAGE)); + aLang = aLinguCfg.GetProperty(C2U("DefaultLocale_CTL")); + aLang >>= aLocale; -+ pRet->Put(SvxLanguageItem(SvxLocaleToLanguage( aLocale ), SID_ATTR_CHAR_CTL_LANGUAGE)); ++ nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aLocale), COMPLEX); ++ pRet->Put(SvxLanguageItem(nLang, SID_ATTR_CHAR_CTL_LANGUAGE)); } if(bTextDialog) pRet->Put(SwPtrItem(FN_PARAM_STDFONTS, GetStdFontConfig())); @@ -349,52 +574,79 @@ $(COMPHELPERLIB) \ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ +Index: chart2/source/tools/CharacterProperties.cxx +=================================================================== +--- chart2/source/tools/CharacterProperties.cxx (revision 267481) ++++ chart2/source/tools/CharacterProperties.cxx (working copy) +@@ -51,9 +51,11 @@ + #include + #include + #include ++#include + + #include + ++ + // header for struct SvtLinguConfig + #ifndef _SVTOOLS_LINGUCFG_HXX_ + #include +@@ -471,16 +473,21 @@ + const float fDefaultFontHeight = 13.0; + + SvtLinguConfig aLinguConfig; +- lang::Locale aDefaultLocale( C2U( "en" ), C2U( "US" ), OUString() ); ++ lang::Locale aDefaultLocale; + aLinguConfig.GetProperty(C2U("DefaultLocale")) >>= aDefaultLocale; + lang::Locale aDefaultLocale_CJK; + aLinguConfig.GetProperty(C2U("DefaultLocale_CJK")) >>= aDefaultLocale_CJK; + lang::Locale aDefaultLocale_CTL; + aLinguConfig.GetProperty(C2U("DefaultLocale_CTL")) >>= aDefaultLocale_CTL; + +- Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_SPREADSHEET, MsLangId::convertLocaleToLanguage( aDefaultLocale ), DEFAULTFONT_FLAGS_ONLYONE, 0 ); +- Font aFontCJK = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_SPREADSHEET, MsLangId::convertLocaleToLanguage( aDefaultLocale_CJK ), DEFAULTFONT_FLAGS_ONLYONE, 0 ); +- Font aFontCTL = OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_SPREADSHEET, MsLangId::convertLocaleToLanguage( aDefaultLocale_CTL ), DEFAULTFONT_FLAGS_ONLYONE, 0 ); ++ using namespace ::com::sun::star::i18n::ScriptType; ++ LanguageType nLang; ++ nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aDefaultLocale), LATIN); ++ Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 ); ++ nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage( aDefaultLocale_CJK), ASIAN); ++ Font aFontCJK = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 ); ++ nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage( aDefaultLocale_CTL), COMPLEX); ++ Font aFontCTL = OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 ); + + ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_NAME, OUString( aFont.GetName() ) ); + ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_STYLE_NAME, OUString(aFont.GetStyleName()) ); Index: desktop/source/app/langselect.cxx =================================================================== --- desktop/source/app/langselect.cxx (revision 267481) +++ desktop/source/app/langselect.cxx (working copy) -@@ -96,33 +96,6 @@ - - sal_Bool bSuccess = sal_False; - -- // #i42730#get the windows 16Bit locale - it should be preferred over the UI language -- try -- { -- Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.System/L10N/", sal_False), UNO_QUERY_THROW); -- Any aWin16SysLocale = xProp->getPropertyValue(OUString::createFromAscii("SystemLocale")); -- ::rtl::OUString sWin16SysLocale; -- aWin16SysLocale >>= sWin16SysLocale; -- if( sWin16SysLocale.getLength()) +@@ -104,7 +104,7 @@ + ::rtl::OUString sWin16SysLocale; + aWin16SysLocale >>= sWin16SysLocale; + if( sWin16SysLocale.getLength()) - setDefaultLocale(sWin16SysLocale); -- } -- catch(const Exception&) -- { -- } -- -- // #i32939# use system locale to set document default locale -- try -- { -- OUString usLocale; -- Reference< XPropertySet > xLocaleProp(getConfigAccess( -- "org.openoffice.System/L10N", sal_True), UNO_QUERY_THROW); ++ setDefaultLanguage(sWin16SysLocale); + } + catch(const Exception&) + { +@@ -116,9 +116,8 @@ + OUString usLocale; + Reference< XPropertySet > xLocaleProp(getConfigAccess( + "org.openoffice.System/L10N", sal_True), UNO_QUERY_THROW); - // "org.openoffice.Office.Linguistic/General", sal_True), UNO_QUERY_THROW); -- xLocaleProp->getPropertyValue(OUString::createFromAscii("Locale")) >>= usLocale; + xLocaleProp->getPropertyValue(OUString::createFromAscii("Locale")) >>= usLocale; - setDefaultLocale(usLocale); -- } -- catch (Exception&) -- { -- } - // get the selected UI language as string - OUString aLocaleString = getLanguageString(); - if ( aLocaleString.getLength() > 0 ) -@@ -158,93 +131,9 @@ - } - } ++ setDefaultLanguage(usLocale); + } + catch (Exception&) + { +@@ -160,89 +159,33 @@ -- // #i32939# setting of default document locale -- // #i32939# this should not be based on the UI language + // #i32939# setting of default document locale + // #i32939# this should not be based on the UI language - setDefaultLocale(aLocaleString); -- ++ setDefaultLanguage(aLocaleString); + - // fallback: set en-US as default Western locale if no Western locale is set - OUString usWesternName = OUString::createFromAscii("DefaultLocale"); - try @@ -429,18 +681,26 @@ } -void LanguageSelection::setDefaultLocale(const OUString& usUILocale) --{ ++void LanguageSelection::setDefaultLanguage(const OUString& sLocale) + { - // #i32939# setting of default document locale - // org.openoffice.Office.Linguistic/General/DefaultLocale - // org.openoffice.Office.Linguistic/General/DefaultLocale_CJK - // org.openoffice.Office.Linguistic/General/DefaultLocale_CTL -- ++ // #i32939# setting of default document language ++ // ++ // See #i42730# for rules for determining source of settings + - // determine script type of UI locale - LanguageType ltUILocale = MsLangId::convertIsoStringToLanguage(usUILocale); - sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage(ltUILocale); -- ++ // determine script type of locale ++ LanguageType nLang = MsLangId::convertIsoStringToLanguage(sLocale); ++ sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage(nLang); + - try -- { ++ switch (nScriptType) + { - Reference< XPropertySet > xProp(getConfigAccess( - "org.openoffice.Office.Linguistic/General/", sal_True), UNO_QUERY_THROW); - OUString usName = OUString::createFromAscii("DefaultLocale"); @@ -472,24 +732,32 @@ - // we are not allowed to change this - } - } -- } ++ case SCRIPTTYPE_ASIAN: ++ MsLangId::setConfiguredAsianFallback( nLang ); ++ break; ++ case SCRIPTTYPE_COMPLEX: ++ MsLangId::setConfiguredComplexFallback( nLang ); ++ break; ++ default: ++ MsLangId::setConfiguredWesternFallback( nLang ); ++ break; + } - catch ( Exception& ) - { - } --} -- + } + OUString LanguageSelection::getLanguageString() - { - // did we already find a language? Index: desktop/source/app/langselect.hxx =================================================================== --- desktop/source/app/langselect.hxx (revision 267481) +++ desktop/source/app/langselect.hxx (working copy) -@@ -60,7 +60,6 @@ +@@ -60,7 +60,7 @@ static rtl::OUString getUserLanguage(); static rtl::OUString getSystemLanguage(); static void resetUserLanguage(); - static void setDefaultLocale(const rtl::OUString&); ++ static void setDefaultLanguage(const rtl::OUString&); public: static com::sun::star::lang::Locale IsoStringToLocale(const rtl::OUString& str); @@ -533,12 +801,12 @@ - aLocaleSettingLB .SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, FALSE, FALSE, FALSE); - aLocaleSettingLB.InsertLanguage( LANGUAGE_SYSTEM ); + aComplexLanguageLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::COMPLEX ); -+ -+ aLocaleSettingLB.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, FALSE, FALSE, FALSE); -+ aLocaleSettingLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::WEAK ); - // insert SYSTEM entry, no specific currency - aCurrencyLB.InsertEntry( aStr ); ++ aLocaleSettingLB.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, FALSE, FALSE, FALSE); ++ aLocaleSettingLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::WEAK ); ++ + const NfCurrencyTable& rCurrTab = SvNumberFormatter::GetTheCurrencyTable(); + const NfCurrencyEntry& rCurr = SvNumberFormatter::GetCurrencyEntry( LANGUAGE_SYSTEM ); + // insert SYSTEM entry @@ -552,16 +820,7 @@ USHORT nCurrCount = rCurrTab.Count(); // first entry is SYSTEM, skip it for ( USHORT j=1; j < nCurrCount; ++j ) -@@ -1282,7 +1296,7 @@ - String aStr_( pCurr->GetBankSymbol() ); - aStr_ += aTwoSpace; - aStr_ += pCurr->GetSymbol(); -- aStr = ApplyLreOrRleEmbedding( aStr_ ); -+ aStr_ = ApplyLreOrRleEmbedding( aStr_ ); - aStr_ += aTwoSpace; - aStr_ += ApplyLreOrRleEmbedding( pLanguageTable->GetString( pCurr->GetLanguage() ) ); - USHORT nPos = aCurrencyLB.InsertEntry( aStr_ ); -@@ -1496,7 +1510,7 @@ +@@ -1495,7 +1509,7 @@ if(!bCurrentDocCBChecked) { Any aValue; @@ -570,7 +829,7 @@ aValue <<= aLocale; OUString aPropName( C2U("DefaultLocale") ); pLangConfig->aLinguConfig.SetProperty( aPropName, aValue ); -@@ -1505,7 +1519,8 @@ +@@ -1504,7 +1518,8 @@ } if(pCurrentDocShell) { @@ -580,7 +839,7 @@ bRet = TRUE; } } -@@ -1516,7 +1531,7 @@ +@@ -1515,7 +1530,7 @@ if(!bCurrentDocCBChecked) { Any aValue; @@ -589,7 +848,7 @@ aValue <<= aLocale; OUString aPropName( C2U("DefaultLocale_CJK") ); pLangConfig->aLinguConfig.SetProperty( aPropName, aValue ); -@@ -1525,7 +1540,8 @@ +@@ -1524,7 +1539,8 @@ } if(pCurrentDocShell) { @@ -599,7 +858,7 @@ bRet = TRUE; } } -@@ -1536,7 +1552,7 @@ +@@ -1535,7 +1551,7 @@ if(!bCurrentDocCBChecked) { Any aValue; @@ -608,7 +867,7 @@ aValue <<= aLocale; OUString aPropName( C2U("DefaultLocale_CTL") ); pLangConfig->aLinguConfig.SetProperty( aPropName, aValue ); -@@ -1545,7 +1561,8 @@ +@@ -1544,7 +1560,8 @@ } if(pCurrentDocShell) { @@ -618,7 +877,7 @@ bRet = TRUE; } } -@@ -1645,13 +1662,18 @@ +@@ -1644,13 +1661,18 @@ aWestLang = pLangConfig->aLinguConfig.GetProperty(C2U("DefaultLocale")); Locale aLocale; aWestLang >>= aLocale; @@ -640,7 +899,7 @@ } catch(Exception&) { -@@ -1663,13 +1685,25 @@ +@@ -1662,13 +1684,25 @@ aCurrentDocCB.Check(bLanguageCurrentDoc_Impl); const SfxPoolItem* pLang; if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, FALSE, &pLang)) @@ -698,23 +957,22 @@ LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType); // For obsolete and to be replaced languages check whether an entry of the // replacement already exists and if so don't add an entry with identical -@@ -329,6 +337,15 @@ - String aStrEntry = m_pLangTable->GetString( nLang ); +@@ -330,6 +338,14 @@ if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll) aStrEntry = m_aAllString; -+ + + LanguageType nRealLang = nLang; + if (nRealLang == LANGUAGE_SYSTEM) + { + nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, nType); + aStrEntry.AppendAscii(" - "); -+ aStrEntry.Append(m_pLangTable->GetString( nRealLang )); ++ aStrEntry.Append(m_pLangTable->GetString( nRealLang )); + } + - aStrEntry = ApplyLreOrRleEmbedding( aStrEntry ); - USHORT nAt = 0; -@@ -343,7 +360,7 @@ + if ( m_bWithCheckmark ) + { +@@ -342,7 +358,7 @@ m_pSpellUsedLang = new Sequence< INT16 >( xSpell->getLanguages() ); } bFound = m_pSpellUsedLang ? @@ -723,7 +981,7 @@ nAt = ImplInsertImgEntry( aStrEntry, nPos, bFound ); } -@@ -356,6 +373,13 @@ +@@ -355,6 +371,13 @@ //------------------------------------------------------------------------ From caolanm at fedoraproject.org Wed Mar 11 09:34:35 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Wed, 11 Mar 2009 09:34:35 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1854,1.1855 Message-ID: <20090311093435.283D070128@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32297 Modified Files: openoffice.org.spec Log Message: disable gtk print dialog, no longer sufficient Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1854 retrieving revision 1.1855 diff -u -r1.1854 -r1.1855 --- openoffice.org.spec 10 Mar 2009 14:01:25 -0000 1.1854 +++ openoffice.org.spec 11 Mar 2009 09:34:04 -0000 1.1855 @@ -7,7 +7,7 @@ # undef to get english only and no-langpacks for a faster smoketest build %define langpacks 1 # undef to revert to the traditional print dialog -%define gtkprintui 1 +#%define gtkprintui 1 # whether to use stlport or gcc's stl, we're basically locked to stlport # for i386 to enable third party built against "vanilla OOo" uno components # and add-ons to work with our OOo. We assume there aren't any such for the @@ -2340,10 +2340,8 @@ rm -rf $RPM_BUILD_ROOT/%{oooinstdir}/readmes rm -rf $RPM_BUILD_ROOT/%{oooinstdir}/licenses -%if %{gtkprintui} mkdir -p $RPM_BUILD_ROOT/%{basisinstdir}/share/psprint/driver cp -r psprint_config/configuration/ppds/SGENPRT.PS $RPM_BUILD_ROOT/%{basisinstdir}/share/psprint/driver/SGENPRT.PS -%endif # rhbz#452385 to auto have postgres in classpath if subsequently installed # rhbz#465664 to get lucene working for functional help From jasper at fedoraproject.org Wed Mar 11 09:39:49 2009 From: jasper at fedoraproject.org (Jasper Capel) Date: Wed, 11 Mar 2009 09:39:49 +0000 (UTC) Subject: rpms/python-mwlib/EL-5 python-mwlib.spec,1.12,1.13 Message-ID: <20090311093949.7807B70128@cvs1.fedora.phx.redhat.com> Author: jasper Update of /cvs/pkgs/rpms/python-mwlib/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv598 Modified Files: python-mwlib.spec Log Message: 0.9.10-5 Index: python-mwlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-mwlib/EL-5/python-mwlib.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- python-mwlib.spec 11 Mar 2009 07:42:01 -0000 1.12 +++ python-mwlib.spec 11 Mar 2009 09:39:19 -0000 1.13 @@ -2,7 +2,7 @@ Name: python-mwlib Version: 0.9.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MediaWiki conversion library for Python Group: Development/Languages @@ -16,11 +16,7 @@ BuildRequires: python-devel re2c python-docutils python-flup odfpy pyparsing python-simplejson python-setuptools Requires: perl python-imaging python-flup pyparsing odfpy python-simplejson -#if 0%{?rhel} < 6 Requires: tetex-latex -#else -Requires: tex(latex) -#endif %description @@ -60,6 +56,9 @@ %changelog +* Wed Mar 11 2009 Jasper Capel - 0.9.10-5 +- Dropped tetex-latex build conditionals, which were not evaluated correctly + * Tue Mar 10 2009 Jasper Capel - 0.9.10-4 - Patched to require lower python-setuptools, which is available on EPEL From jakub at fedoraproject.org Wed Mar 11 09:56:27 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Wed, 11 Mar 2009 09:56:27 +0000 (UTC) Subject: rpms/prelink/devel .cvsignore, 1.35, 1.36 prelink.spec, 1.52, 1.53 sources, 1.38, 1.39 Message-ID: <20090311095627.A0DFF70128@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/prelink/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3930 Modified Files: .cvsignore prelink.spec sources Log Message: 0.4.0-7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/prelink/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 10 Mar 2009 14:46:24 -0000 1.35 +++ .cvsignore 11 Mar 2009 09:55:56 -0000 1.36 @@ -1 +1 @@ -prelink-20090310.tar.bz2 +prelink-20090311.tar.bz2 Index: prelink.spec =================================================================== RCS file: /cvs/pkgs/rpms/prelink/devel/prelink.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- prelink.spec 10 Mar 2009 14:46:25 -0000 1.52 +++ prelink.spec 11 Mar 2009 09:55:57 -0000 1.53 @@ -1,10 +1,10 @@ Summary: An ELF prelinking utility Name: prelink Version: 0.4.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Base -%define date 20090310 +%define date 20090311 Source: ftp://people.redhat.com/jakub/prelink/prelink-%{date}.tar.bz2 Source2: prelink.conf Source3: prelink.cron @@ -84,6 +84,9 @@ %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log %changelog +* Wed Mar 11 2009 Jakub Jelinek 0.4.0-7 +- fix prelinking on ppc64 + * Tue Mar 10 2009 Jakub Jelinek 0.4.0-6 - BuildRequire glibc-static - rebuilt with gcc 4.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/prelink/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 10 Mar 2009 14:46:25 -0000 1.38 +++ sources 11 Mar 2009 09:55:57 -0000 1.39 @@ -1 +1 @@ -1170d56ba5b03cdf557ee8515667f6ca prelink-20090310.tar.bz2 +129b024036955cf14593a85ba09a2a23 prelink-20090311.tar.bz2 From erikos at fedoraproject.org Wed Mar 11 10:01:27 2009 From: erikos at fedoraproject.org (Simon Schampijer) Date: Wed, 11 Mar 2009 10:01:27 +0000 (UTC) Subject: comps comps-f11.xml.in,1.153,1.154 Message-ID: <20090311100127.B1E2870128@cvs1.fedora.phx.redhat.com> Author: erikos Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4775 Modified Files: comps-f11.xml.in Log Message: Added sugar-read to the Sugar Desktop Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- comps-f11.xml.in 11 Mar 2009 00:45:10 -0000 1.153 +++ comps-f11.xml.in 11 Mar 2009 10:00:57 -0000 1.154 @@ -4612,6 +4612,7 @@ sugar-jukebox sugar-log sugar-pippy + sugar-read sugar-terminal sugar-turtleart sugar-write From mgrepl at fedoraproject.org Wed Mar 11 10:11:06 2009 From: mgrepl at fedoraproject.org (Miroslav Grepl) Date: Wed, 11 Mar 2009 10:11:06 +0000 (UTC) Subject: rpms/selinux-policy/F-10 policy-20080710.patch,1.144,1.145 Message-ID: <20090311101106.0E3F470128@cvs1.fedora.phx.redhat.com> Author: mgrepl Update of /cvs/extras/rpms/selinux-policy/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6121 Modified Files: policy-20080710.patch Log Message: - Add gpsd policy policy-20080710.patch: Index: policy-20080710.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- policy-20080710.patch 6 Mar 2009 11:17:04 -0000 1.144 +++ policy-20080710.patch 11 Mar 2009 10:11:03 -0000 1.145 @@ -6850,7 +6850,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.5.13/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2008-10-17 14:49:13.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/kernel/corenetwork.te.in 2009-02-10 15:07:15.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/kernel/corenetwork.te.in 2009-03-10 13:22:11.000000000 +0100 @@ -1,5 +1,5 @@ -policy_module(corenetwork, 1.10.0) @@ -6872,7 +6872,7 @@ network_port(amanda, udp,10080,s0, tcp,10080,s0, udp,10081,s0, tcp,10081,s0, tcp,10082,s0, tcp,10083,s0) network_port(amavisd_recv, tcp,10024,s0) network_port(amavisd_send, tcp,10025,s0) -@@ -79,26 +82,33 @@ +@@ -79,26 +82,34 @@ network_port(auth, tcp,113,s0) network_port(bgp, tcp,179,s0, udp,179,s0, tcp,2605,s0, udp,2605,s0) type biff_port_t, port_type, reserved_port_type; dnl network_port(biff) # no defined portcon in current strict @@ -6903,12 +6903,13 @@ network_port(gatekeeper, udp,1718,s0, udp,1719,s0, tcp,1721,s0, tcp,7000,s0) network_port(giftd, tcp,1213,s0) network_port(gopher, tcp,70,s0, udp,70,s0) ++network_port(gpsd,tcp,2947,s0) network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy +portcon tcp 10001-10010 gen_context(system_u:object_r:http_cache_port_t, s0) network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp,8009,s0, tcp,8443,s0) #8443 is mod_nss default port network_port(howl, tcp,5335,s0, udp,5353,s0) network_port(hplip, tcp,1782,s0, tcp,2207,s0, tcp,2208,s0, tcp, 8290,s0, tcp,50000,s0, tcp,50002,s0, tcp,8292,s0, tcp,9100,s0, tcp,9101,s0, tcp,9102,s0, tcp,9220,s0, tcp,9221,s0, tcp,9222,s0, tcp,9280,s0, tcp,9281,s0, tcp,9282,s0, tcp,9290,s0, tcp,9291,s0, tcp,9292,s0) -@@ -109,6 +119,7 @@ +@@ -109,6 +120,7 @@ network_port(ipp, tcp,631,s0, udp,631,s0) network_port(ipsecnat, tcp,4500,s0, udp,4500,s0) network_port(ircd, tcp,6667,s0) @@ -6916,7 +6917,7 @@ network_port(isakmp, udp,500,s0) network_port(iscsi, tcp,3260,s0) network_port(isns, tcp,3205,s0, udp,3205,s0) -@@ -117,6 +128,8 @@ +@@ -117,6 +129,8 @@ network_port(kerberos_admin, tcp,464,s0, udp,464,s0, tcp,749,s0) network_port(kerberos_master, tcp,4444,s0, udp,4444,s0) network_port(kerberos, tcp,88,s0, udp,88,s0, tcp,750,s0, udp,750,s0) @@ -6925,7 +6926,7 @@ network_port(ktalkd, udp,517,s0, udp,518,s0) network_port(ldap, tcp,389,s0, udp,389,s0, tcp,636,s0, udp,636,s0, tcp,3268,s0) type lrrd_port_t, port_type; dnl network_port(lrrd_port_t) # no defined portcon -@@ -126,6 +139,7 @@ +@@ -126,6 +140,7 @@ network_port(mmcc, tcp,5050,s0, udp,5050,s0) network_port(monopd, tcp,1234,s0) network_port(msnp, tcp,1863,s0, udp,1863,s0) @@ -6933,7 +6934,7 @@ network_port(mysqld, tcp,1186,s0, tcp,3306,s0) portcon tcp 63132-63163 gen_context(system_u:object_r:mysqld_port_t, s0) network_port(nessus, tcp,1241,s0) -@@ -136,12 +150,21 @@ +@@ -136,12 +151,21 @@ network_port(openvpn, tcp,1194,s0, udp,1194,s0) network_port(pegasus_http, tcp,5988,s0) network_port(pegasus_https, tcp,5989,s0) @@ -6955,7 +6956,7 @@ network_port(printer, tcp,515,s0) network_port(ptal, tcp,5703,s0) network_port(pxe, udp,4011,s0) -@@ -159,9 +182,11 @@ +@@ -159,9 +183,11 @@ network_port(rwho, udp,513,s0) network_port(smbd, tcp,137-139,s0, tcp,445,s0) network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0) @@ -6968,7 +6969,7 @@ network_port(soundd, tcp,8000,s0, tcp,9433,s0, tcp, 16001, s0) type socks_port_t, port_type; dnl network_port(socks) # no defined portcon type stunnel_port_t, port_type; dnl network_port(stunnel) # no defined portcon in current strict -@@ -170,14 +195,17 @@ +@@ -170,14 +196,17 @@ network_port(syslogd, udp,514,s0) network_port(telnetd, tcp,23,s0) network_port(tftp, udp,69,s0) @@ -10834,7 +10835,7 @@ ##
    diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.5.13/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2008-10-17 14:49:13.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/services/apache.fc 2009-02-27 09:31:08.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/services/apache.fc 2009-03-11 10:38:02.000000000 +0100 @@ -1,16 +1,18 @@ -HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_ROLE_content_t,s0) +HOME_DIR/((www)|(web)|(public_html)|(public_git))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0) @@ -10899,7 +10900,7 @@ /var/log/apache(2)?(/.*)? gen_context(system_u:object_r:httpd_log_t,s0) /var/log/apache-ssl(2)?(/.*)? gen_context(system_u:object_r:httpd_log_t,s0) /var/log/cacti(/.*)? gen_context(system_u:object_r:httpd_log_t,s0) -@@ -64,11 +76,23 @@ +@@ -64,11 +76,24 @@ /var/run/apache.* gen_context(system_u:object_r:httpd_var_run_t,s0) /var/run/gcache_port -s gen_context(system_u:object_r:httpd_var_run_t,s0) /var/run/httpd.* gen_context(system_u:object_r:httpd_var_run_t,s0) @@ -10915,6 +10916,7 @@ +/var/www/gallery/albums(/.*)? gen_context(system_u:object_r:httpd_sys_content_rw_t,s0) /var/www/icons(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) /var/www/perl(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) ++/var/www/svn(/.*)? gen_context(system_u:object_r:httpd_sys_content_rw_t,s0) + +#Bugzilla file context +/usr/share/bugzilla(/.*)? -d gen_context(system_u:object_r:httpd_bugzilla_content_t,s0) @@ -17267,6 +17269,165 @@ + polkit_read_lib(gnomeclock_t) +') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.fc serefpolicy-3.5.13/policy/modules/services/gpsd.fc +--- nsaserefpolicy/policy/modules/services/gpsd.fc 1970-01-01 01:00:00.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/services/gpsd.fc 2009-03-10 13:22:11.000000000 +0100 +@@ -0,0 +1,3 @@ ++ ++/usr/sbin/gpsd -- gen_context(system_u:object_r:gpsd_exec_t,s0) ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.if serefpolicy-3.5.13/policy/modules/services/gpsd.if +--- nsaserefpolicy/policy/modules/services/gpsd.if 1970-01-01 01:00:00.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/services/gpsd.if 2009-03-10 13:22:11.000000000 +0100 +@@ -0,0 +1,89 @@ ++## gpsd monitor daemon ++ ++######################################## ++## ++## Execute a domain transition to run gpsd. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`gpsd_domtrans',` ++ gen_require(` ++ type gpsd_t, gpsd_exec_t; ++ ') ++ ++ domtrans_pattern($1, gpsd_exec_t, gpsd_t) ++') ++ ++######################################## ++## ++## Execute gpsd in the gpsd domain, and ++## allow the specified role the gpsd domain. ++## ++## ++## ++## Domain allowed access ++## ++## ++## ++## ++## The role to be allowed the gpsd domain. ++## ++## ++## ++## ++## The type of the role's terminal. ++## ++## ++# ++interface(`gpsd_run',` ++ gen_require(` ++ type gpsd_t; ++ ') ++ ++ gpsd_domtrans($1) ++ role $2 types gpsd_t; ++ allow gpsd_t $3:chr_file rw_term_perms; ++') ++ ++######################################## ++## ++## Read and write to gpsd shared memory. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`gpsd_rw_shm',` ++ gen_require(` ++ type gpsd_t; ++ ') ++ ++ allow $1 gpsd_t:shm rw_shm_perms; ++') ++ ++######################################## ++## ++## Read/write gpsd tmpfs files. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`gpsd_rw_tmpfs_files',` ++ gen_require(` ++ type gpsd_tmpfs_t; ++ ') ++ ++ fs_search_tmpfs($1) ++ allow $1 gpsd_tmpfs_t:dir list_dir_perms; ++ rw_files_pattern($1, gpsd_tmpfs_t, gpsd_tmpfs_t) ++ read_lnk_files_pattern($1, gpsd_tmpfs_t, gpsd_tmpfs_t) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.te serefpolicy-3.5.13/policy/modules/services/gpsd.te +--- nsaserefpolicy/policy/modules/services/gpsd.te 1970-01-01 01:00:00.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/services/gpsd.te 2009-03-10 13:22:11.000000000 +0100 +@@ -0,0 +1,55 @@ ++policy_module(gpsd,1.0.0) ++ ++######################################## ++# ++# Declarations ++# ++ ++type gpsd_t; ++type gpsd_exec_t; ++application_domain(gpsd_t, gpsd_exec_t) ++role system_r types gpsd_t; ++ ++type gpsd_tmpfs_t; ++files_tmpfs_file(gpsd_tmpfs_t) ++ ++######################################## ++# ++# gpsd local policy ++# ++ ++allow gpsd_t self:capability { setuid sys_nice setgid fowner }; ++allow gpsd_t self:process setsched; ++allow gpsd_t self:shm create_shm_perms; ++allow gpsd_t self:unix_dgram_socket { create_socket_perms sendto }; ++allow gpsd_t self:tcp_socket create_stream_socket_perms; ++ ++manage_dirs_pattern(gpsd_t, gpsd_tmpfs_t, gpsd_tmpfs_t) ++manage_files_pattern(gpsd_t, gpsd_tmpfs_t, gpsd_tmpfs_t) ++fs_tmpfs_filetrans(gpsd_t, gpsd_tmpfs_t, { dir file }) ++ ++corenet_tcp_bind_all_nodes(gpsd_t) ++corenet_tcp_bind_gpsd_port(gpsd_t) ++ ++term_use_unallocated_ttys(gpsd_t) ++term_setattr_unallocated_ttys(gpsd_t) ++ ++auth_use_nsswitch(gpsd_t) ++ ++libs_use_ld_so(gpsd_t) ++libs_use_shared_libs(gpsd_t) ++ ++logging_send_syslog_msg(gpsd_t) ++ ++miscfiles_read_localization(gpsd_t) ++ ++optional_policy(` ++ ntpd_rw_shm(gpsd_t) ++ ntpd_rw_tmpfs_files(gpsd_t) ++') ++ ++optional_policy(` ++ dbus_system_bus_client_template(gpsd, gpsd_t) ++') ++ ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.5.13/policy/modules/services/hal.fc --- nsaserefpolicy/policy/modules/services/hal.fc 2008-10-17 14:49:11.000000000 +0200 +++ serefpolicy-3.5.13/policy/modules/services/hal.fc 2009-02-10 15:07:15.000000000 +0100 @@ -20036,8 +20197,8 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.if serefpolicy-3.5.13/policy/modules/services/ntp.if --- nsaserefpolicy/policy/modules/services/ntp.if 2008-10-17 14:49:13.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/services/ntp.if 2009-02-10 15:07:15.000000000 +0100 -@@ -56,6 +56,24 @@ ++++ serefpolicy-3.5.13/policy/modules/services/ntp.if 2009-03-10 13:22:20.000000000 +0100 +@@ -56,6 +56,63 @@ ######################################## ## @@ -20057,6 +20218,45 @@ + init_labeled_script_domtrans($1, ntpd_initrc_exec_t) +') + ++####################################### ++## ++## Read/write ntpdd tmpfs files. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`ntpd_rw_tmpfs_files',` ++ gen_require(` ++ type ntpd_tmpfs_t; ++ ') ++ ++ fs_search_tmpfs($1) ++ list_dirs_pattern($1,ntpd_tmpfs_t,ntpd_tmpfs_t) ++ rw_files_pattern($1, ntpd_tmpfs_t, ntpd_tmpfs_t) ++ read_lnk_files_pattern($1, ntpd_tmpfs_t, ntpd_tmpfs_t) ++') ++ ++######################################## ++## ++## Read and write to ntpd shared memory. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`ntpd_rw_shm',` ++ gen_require(` ++ type ntpd_t; ++ ') ++ ++ allow $1 ntpd_t:shm rw_shm_perms; ++') ++ +######################################## +## ## All of the rules required to administrate @@ -20064,8 +20264,18 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.5.13/policy/modules/services/ntp.te --- nsaserefpolicy/policy/modules/services/ntp.te 2008-10-17 14:49:13.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/services/ntp.te 2009-02-10 15:07:15.000000000 +0100 -@@ -38,10 +38,11 @@ ++++ serefpolicy-3.5.13/policy/modules/services/ntp.te 2009-03-10 13:22:25.000000000 +0100 +@@ -25,6 +25,9 @@ + type ntpd_tmp_t; + files_tmp_file(ntpd_tmp_t) + ++type ntpd_tmpfs_t; ++files_tmpfs_file(ntpd_tmpfs_t) ++ + type ntpd_var_run_t; + files_pid_file(ntpd_var_run_t) + +@@ -38,10 +41,11 @@ # sys_resource and setrlimit is for locking memory # ntpdate wants sys_nice @@ -20078,7 +20288,7 @@ allow ntpd_t self:unix_dgram_socket create_socket_perms; allow ntpd_t self:unix_stream_socket create_socket_perms; allow ntpd_t self:tcp_socket create_stream_socket_perms; -@@ -52,6 +53,7 @@ +@@ -52,6 +56,7 @@ can_exec(ntpd_t,ntpd_exec_t) read_files_pattern(ntpd_t, ntpd_key_t, ntpd_key_t) @@ -20086,7 +20296,18 @@ allow ntpd_t ntpd_log_t:dir setattr; manage_files_pattern(ntpd_t,ntpd_log_t,ntpd_log_t) -@@ -89,7 +91,10 @@ +@@ -62,6 +67,10 @@ + manage_files_pattern(ntpd_t, ntpd_tmp_t, ntpd_tmp_t) + files_tmp_filetrans(ntpd_t, ntpd_tmp_t, { file dir }) + ++manage_dirs_pattern(ntpd_t, ntpd_tmpfs_t, ntpd_tmpfs_t) ++manage_files_pattern(ntpd_t, ntpd_tmpfs_t, ntpd_tmpfs_t) ++fs_tmpfs_filetrans(ntpd_t, ntpd_tmpfs_t, { dir file }) ++ + manage_files_pattern(ntpd_t, ntpd_var_run_t, ntpd_var_run_t) + files_pid_filetrans(ntpd_t, ntpd_var_run_t, file) + +@@ -89,7 +98,10 @@ dev_read_urand(ntpd_t) fs_getattr_all_fs(ntpd_t) @@ -20097,6 +20318,18 @@ term_use_ptmx(ntpd_t) +@@ -126,6 +138,11 @@ + ') + + optional_policy(` ++ gpsd_rw_shm(ntpd_t) ++ gpsd_rw_tmpfs_files(ntpd_t) ++') ++ ++optional_policy(` + firstboot_dontaudit_use_fds(ntpd_t) + firstboot_dontaudit_rw_pipes(ntpd_t) + firstboot_dontaudit_rw_stream_sockets(ntpd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-3.5.13/policy/modules/services/oddjob.fc --- nsaserefpolicy/policy/modules/services/oddjob.fc 2008-10-17 14:49:11.000000000 +0200 +++ serefpolicy-3.5.13/policy/modules/services/oddjob.fc 2009-02-10 15:07:15.000000000 +0100 @@ -26187,8 +26420,16 @@ +allow smbcontrol_t nmbd_var_run_t:file { read lock }; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.5.13/policy/modules/services/sasl.te --- nsaserefpolicy/policy/modules/services/sasl.te 2008-10-17 14:49:13.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/services/sasl.te 2009-02-10 15:07:15.000000000 +0100 -@@ -111,6 +111,10 @@ ++++ serefpolicy-3.5.13/policy/modules/services/sasl.te 2009-03-11 10:34:53.000000000 +0100 +@@ -103,6 +103,7 @@ + + optional_policy(` + kerberos_keytab_template(saslauthd, saslauthd_t) ++ kerberos_manage_host_rcache(saslauthd_t) + ') + + optional_policy(` +@@ -111,6 +112,10 @@ ') optional_policy(` @@ -35162,7 +35403,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.13/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2008-10-17 14:49:13.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/system/unconfined.te 2009-02-10 15:07:15.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/system/unconfined.te 2009-03-10 13:22:29.000000000 +0100 @@ -6,35 +6,78 @@ # Declarations # @@ -35331,48 +35572,54 @@ ') optional_policy(` -@@ -123,31 +183,33 @@ +@@ -123,79 +183,91 @@ ') optional_policy(` - inn_domtrans(unconfined_t) -+ iptables_run(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) ++ gpsd_run(unconfined_t, unconfined_r, { unconfined_tty_device_t unconfined_devpts_t }) ') optional_policy(` - java_domtrans(unconfined_t) -+ java_run(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) ++ iptables_run(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) ') optional_policy(` - lpd_run_checkpc(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) -+ kismet_run(unconfined_t, unconfined_r, { unconfined_tty_device_t unconfined_devpts_t }) ++ java_run(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) ') optional_policy(` - modutils_run_update_mods(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) -+ livecd_run(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) ++ kismet_run(unconfined_t, unconfined_r, { unconfined_tty_device_t unconfined_devpts_t }) ') optional_policy(` - mono_domtrans(unconfined_t) -+ lpd_run_checkpc(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) ++ livecd_run(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) ') optional_policy(` - mta_per_role_template(unconfined, unconfined_t, unconfined_r) -+ modutils_run_update_mods(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) ++ lpd_run_checkpc(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) ') optional_policy(` - oddjob_domtrans_mkhomedir(unconfined_t) ++ modutils_run_update_mods(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) + ') + + optional_policy(` +- prelink_run(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) + mono_per_role_template(unconfined, unconfined_t, unconfined_r) + unconfined_domain(unconfined_mono_t) + role system_r types unconfined_mono_t; ') optional_policy(` -@@ -159,43 +221,49 @@ +- portmap_run_helper(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) ++ prelink_run(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) ') optional_policy(` @@ -35380,20 +35627,22 @@ - postfix_run_map(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) - # cjp: this should probably be removed: - postfix_domtrans_master(unconfined_t) --') ++ portmap_run_helper(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) + ') + - + optional_policy(` +- pyzor_per_role_template(unconfined) +-') + qemu_per_role_template_notrans(unconfined, unconfined_t, unconfined_r) -optional_policy(` -- pyzor_per_role_template(unconfined) +- qmail_per_role_template(unconfined, unconfined_t, unconfined_r) + tunable_policy(`allow_unconfined_qemu_transition',` + qemu_runas(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) + ',` + qemu_runas_unconfined(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) - ') -- --optional_policy(` -- qmail_per_role_template(unconfined, unconfined_t, unconfined_r) ++') + qemu_role(unconfined_r) + qemu_unconfined_role(unconfined_r) ') @@ -35438,7 +35687,7 @@ ') optional_policy(` -@@ -203,7 +271,7 @@ +@@ -203,7 +275,7 @@ ') optional_policy(` @@ -35447,7 +35696,7 @@ ') optional_policy(` -@@ -215,11 +283,12 @@ +@@ -215,11 +287,12 @@ ') optional_policy(` @@ -35462,7 +35711,7 @@ ') ######################################## -@@ -229,14 +298,61 @@ +@@ -229,14 +302,61 @@ allow unconfined_execmem_t self:process { execstack execmem }; unconfined_domain_noaudit(unconfined_execmem_t) @@ -35487,7 +35736,7 @@ + +optional_policy(` + xserver_rw_xdm_xserver_shm(unconfined_execmem_t) - ') ++') + +######################################## +# @@ -35506,7 +35755,7 @@ + type mplayer_exec_t; + ') + domtrans_pattern(unconfined_t, mplayer_exec_t, unconfined_execmem_t) -+') + ') + + +optional_policy(` From rjones at fedoraproject.org Wed Mar 11 10:24:09 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Wed, 11 Mar 2009 10:24:09 +0000 (UTC) Subject: rpms/mingw32-pango/EL-5 mingw32-pango.spec,1.3,1.4 Message-ID: <20090311102409.4862A70128@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/mingw32-pango/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8576 Modified Files: mingw32-pango.spec Log Message: Try forcing autotools install. Index: mingw32-pango.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pango/EL-5/mingw32-pango.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mingw32-pango.spec 10 Mar 2009 23:21:20 -0000 1.3 +++ mingw32-pango.spec 11 Mar 2009 10:23:38 -0000 1.4 @@ -6,7 +6,7 @@ Name: mingw32-pango Version: 1.23.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Pango library License: LGPLv2+ @@ -26,6 +26,8 @@ # wine %{_mingw32_bindir}/pango-querymodules.exe > pango.modules Source1: pango.modules +Patch1000: pango_enable_static_build.patch + BuildArch: noarch BuildRequires: mingw32-filesystem >= 23 @@ -57,14 +59,29 @@ MinGW Windows Pango library. +%package static +Summary: Static version of the MinGW Windows Pango library +Requires: %{name} = %{version}-%{release} +Group: Development/Libraries + +%description static +Static version of the MinGW Windows Pango library. + + %prep %setup -q -n pango-%{version} +%patch1000 + +# Regenerate the configure script +aclocal +autoreconf --force --install +libtoolize %build # Need to run the correct version of glib-mkenums. PATH=%{_mingw32_bindir}:$PATH \ -%{_mingw32_configure} --disable-static --enable-shared +%{_mingw32_configure} --enable-static --enable-shared make %{?_smp_mflags} @@ -153,9 +170,29 @@ %{_mingw32_sysconfdir}/pango/ +%files static +%defattr(-,root,root,-) +%{_mingw32_libdir}/libpango-1.0.a +%{_mingw32_libdir}/libpangocairo-1.0.a +%{_mingw32_libdir}/libpangoft2-1.0.a +%{_mingw32_libdir}/libpangowin32-1.0.a +%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.a +%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.a +%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.a +%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.a +%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.a +%{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.a +%{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.a +%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.a +%{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.a +%{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.a +%{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.a +%{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.a + + %changelog -* Tue Mar 10 2009 Richard W.M. Jones - 1.23.0-2 -- Disable static build (in EL-5). Rerunning autotools fails. +* Wed Mar 11 2009 Richard W.M. Jones - 1.23.0-3 +- Try forcing autotools install. * Mon Mar 9 2009 Richard W.M. Jones - 1.23.0-1 - Remove man page which duplicates what is in base Fedora. From mbarnes at fedoraproject.org Wed Mar 11 10:27:54 2009 From: mbarnes at fedoraproject.org (Matthew Barnes) Date: Wed, 11 Mar 2009 10:27:54 +0000 (UTC) Subject: rpms/evolution-data-server/F-10 evolution-data-server-2.24.5-sqlite-fsync-rework.patch, NONE, 1.1 evolution-data-server.spec, 1.244, 1.245 Message-ID: <20090311102754.DF48570128@cvs1.fedora.phx.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution-data-server/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9185 Modified Files: evolution-data-server.spec Added Files: evolution-data-server-2.24.5-sqlite-fsync-rework.patch Log Message: * Wed Mar 11 2009 Matthew Barnes - 2.25.5-1.fc10.test.1 - Testing a patch for a thread leak in camel-db.c. evolution-data-server-2.24.5-sqlite-fsync-rework.patch: --- NEW FILE evolution-data-server-2.24.5-sqlite-fsync-rework.patch --- diff -up evolution-data-server-2.24.5/camel/camel-db.c.sqlite-fsync-rework evolution-data-server-2.24.5/camel/camel-db.c --- evolution-data-server-2.24.5/camel/camel-db.c.sqlite-fsync-rework 2009-01-31 08:06:07.000000000 -0500 +++ evolution-data-server-2.24.5/camel/camel-db.c 2009-03-11 06:02:10.000000000 -0400 @@ -36,239 +36,114 @@ #include "camel-debug.h" -/* how long to wait before invoking sync on the file; in miliseconds */ -#define SYNC_TIMEOUT 5000 +/* how long to wait before invoking sync on the file */ +#define SYNC_TIMEOUT_SECONDS 5 static sqlite3_vfs *old_vfs = NULL; GStaticRecMutex only_once_lock = G_STATIC_REC_MUTEX_INIT; -GStaticRecMutex sync_queue_lock = G_STATIC_REC_MUTEX_INIT; -#define LockQueue() g_static_rec_mutex_lock (&sync_queue_lock) -#define UnlockQueue() g_static_rec_mutex_unlock (&sync_queue_lock) - -/* 'sync_queue' is using keys sqlite3_file to sync_queue_data structures. - Access to this is guarded with LockQueue/UnlockQueue function. */ -static GHashTable *sync_queue = NULL; - -typedef struct _sync_queue_data { - guint timeout_source; /* id of the source */ - GThread *running_thread; - int sync_flags; -} sync_queue_data; - -struct CamelSqlite3File -{ +typedef struct { sqlite3_file parent; sqlite3_file *old_vfs_file; /* pointer to old_vfs' file */ -}; + GAsyncQueue *queue; + GThread *thread; + guint timeout_id; + gint flags; +} CamelSqlite3File; static int -call_old_file_Sync (sqlite3_file *pFile, int flags) +call_old_file_Sync (CamelSqlite3File *cFile, int flags) { - struct CamelSqlite3File *cFile; - g_return_val_if_fail (old_vfs != NULL, SQLITE_ERROR); - g_return_val_if_fail (pFile != NULL, SQLITE_ERROR); + g_return_val_if_fail (cFile != NULL, SQLITE_ERROR); - cFile = (struct CamelSqlite3File *)pFile; g_return_val_if_fail (cFile->old_vfs_file->pMethods != NULL, SQLITE_ERROR); return cFile->old_vfs_file->pMethods->xSync (cFile->old_vfs_file, flags); } -static gboolean prepare_to_run_sync_in_thread (gpointer pFile); +/* This special flag tells the sync request thread to exit. + * Just have to make sure it does not collide with SQLite's + * own synchronization flags (SQLITE_SYNC_xxx). */ +#define SYNC_THREAD_EXIT 0x100000 static gpointer -run_sync_in_thread (gpointer pFile) +sync_request_thread_cb (CamelSqlite3File *cFile) { - int sync_flags = 0; - sync_queue_data *data; + gpointer data; + gint flags = 0; - g_return_val_if_fail (pFile != NULL, NULL); - g_return_val_if_fail (sync_queue != NULL, NULL); + g_async_queue_ref (cFile->queue); - LockQueue (); - data = g_hash_table_lookup (sync_queue, pFile); - if (data) { - /* sync_flags can change while we are running */ - sync_flags = data->sync_flags; - data->sync_flags = 0; - } - UnlockQueue (); + while (TRUE) { + /* Block until a request arrives. */ + data = g_async_queue_pop (cFile->queue); - /* this should not happen, once we are in a thread, the datas are ours */ - g_return_val_if_fail (data != NULL, NULL); + /* Make sure we can safely deference. */ + if (data == NULL) + continue; - /* do the sync itself, but do not block the sync_queue; - any error here is silently ignored. */ - call_old_file_Sync (/*sqlite3_file*/pFile, sync_flags); - - LockQueue (); - if (data->timeout_source == -1) { - /* new sync request arrived meanwhile, indicate thread finished... */ - data->running_thread = NULL; - /* ...and reschedule */ - data->timeout_source = g_timeout_add (SYNC_TIMEOUT, prepare_to_run_sync_in_thread, pFile); - } else { - /* remove it from a sync_queue and free memory */ - g_hash_table_remove (sync_queue, pFile); - g_free (data); - } - UnlockQueue (); - - return NULL; -} - -static gboolean -prepare_to_run_sync_in_thread (gpointer pFile) -{ - sync_queue_data *data; + /* Extract flags and discard request. */ + flags = *((gint *) data); + g_slice_free (gint, data); - g_return_val_if_fail (pFile != NULL, FALSE); - g_return_val_if_fail (sync_queue != NULL, FALSE); + /* Check for exit request. */ + if (flags & SYNC_THREAD_EXIT) + break; - LockQueue (); - - data = g_hash_table_lookup (sync_queue, pFile); - /* check if still tracking this file and if didn't get rescheduled */ - if (data && data->timeout_source == g_source_get_id (g_main_current_source ())) { - /* run the thread */ - data->running_thread = g_thread_create (run_sync_in_thread, pFile, TRUE, NULL); - data->timeout_source = 0; + /* Got a boneafide sync request. + * Do it, but ignore errors. */ + call_old_file_Sync (cFile, flags); } - UnlockQueue (); - - return FALSE; -} - -/* - Adds sync on this file to the queue. Flags are just bit-OR-ed, - which will not hopefully hurt. In case the file is waiting for - it's sync, we just postpone it once again. - In case file is syncing just in call of this, we schedule other - sync after that. - */ -static void -queue_sync (sqlite3_file *pFile, int flags) -{ - sync_queue_data *data; - - g_return_if_fail (pFile != NULL); - g_return_if_fail (flags != 0); - - LockQueue (); - - if (!sync_queue) - sync_queue = g_hash_table_new (g_direct_hash, g_direct_equal); - - data = g_hash_table_lookup (sync_queue, pFile); - if (data) { - /* There is a sync request for this file already. */ - if (data->running_thread) { - /* -1 indicates to reschedule after the actual sync finishes */ - data->timeout_source = -1; - /* start with new flags - thread set it to 0; next time just add others */ - data->sync_flags = data->sync_flags | flags; - } else { - data->sync_flags = data->sync_flags | flags; + /* Clear the exit flag. */ + flags &= ~SYNC_THREAD_EXIT; - /* reschedule */ - g_source_remove (data->timeout_source); - data->timeout_source = g_timeout_add (SYNC_TIMEOUT, prepare_to_run_sync_in_thread, pFile); - } - } else { - data = g_malloc0 (sizeof (sync_queue_data)); - data->sync_flags = flags; - data->running_thread = NULL; - data->timeout_source = g_timeout_add (SYNC_TIMEOUT, prepare_to_run_sync_in_thread, pFile); + /* One more for the road? */ + if (getenv ("CAMEL_NO_SYNC_ON_CLOSE") == NULL) + call_old_file_Sync (cFile, flags); - g_hash_table_insert (sync_queue, pFile, data); - } + g_async_queue_unref (cFile->queue); - UnlockQueue (); + return NULL; } -/* - If file is not in a queue, it does nothing, otherwise it removes - it from a queue, and calls sync immediately. - If file is syncing at the moment, it waits until the previous sync finishes. - */ -static void -dequeue_sync (sqlite3_file *pFile) -{ - sync_queue_data *data; - - g_return_if_fail (pFile != NULL); - - LockQueue (); - - if (!sync_queue) { - /* closing file which wasn't requested to sync, and none - before it too. */ - UnlockQueue (); - return; - } - - data = g_hash_table_lookup (sync_queue, pFile); - if (data) { - int sync_flags = data->sync_flags; - - if (data->timeout_source) { - if (data->timeout_source != -1) - g_source_remove (data->timeout_source); - data->timeout_source = 0; - } - - if (data->running_thread) { - GThread *thread = data->running_thread; +static gboolean +sync_push_request (CamelSqlite3File *cFile) +{ + gint *data; - /* do not do anything later */ - data = NULL; + /* The queue itself does not need to be locked yet, + * but we use its mutex to safely manipulate flags. */ + g_async_queue_lock (cFile->queue); - /* unlock here, thus the thread can hold the lock again */ - UnlockQueue (); + /* We can't just cast the flags to a pointer because + * g_async_queue_push() won't take NULLs, and flags + * may be zero. So we have to allocate memory to + * send an integer. Bother. */ + data = g_slice_new (gint); + *data = cFile->flags; + cFile->flags = 0; - /* it's running at the moment, wait for a finish. - it'll remove structure from a sync_queue too. */ - g_thread_join (thread); - } else { - g_hash_table_remove (sync_queue, pFile); - } + g_async_queue_push_unlocked (cFile->queue, data); - if (data) { - static gboolean no_sync_on_close = FALSE, iKnow = FALSE; + cFile->timeout_id = 0; - if (!iKnow) { - iKnow = TRUE; - no_sync_on_close = getenv ("CAMEL_NO_SYNC_ON_CLOSE") != NULL; - } - - /* do not block queue on while syncing */ - UnlockQueue (); - - if (!no_sync_on_close) { - /* sync on close */ - call_old_file_Sync (pFile, sync_flags); - } + g_async_queue_unlock (cFile->queue); - g_free (data); - } - } else { - UnlockQueue (); - } + return FALSE; } #define def_subclassed(_nm, _params, _call) \ static int \ camel_sqlite3_file_ ## _nm _params \ { \ - struct CamelSqlite3File *cFile; \ + CamelSqlite3File *cFile; \ \ g_return_val_if_fail (old_vfs != NULL, SQLITE_ERROR); \ g_return_val_if_fail (pFile != NULL, SQLITE_ERROR); \ \ - cFile = (struct CamelSqlite3File *) pFile; \ + cFile = (CamelSqlite3File *) pFile; \ g_return_val_if_fail (cFile->old_vfs_file->pMethods != NULL, SQLITE_ERROR); \ return cFile->old_vfs_file->pMethods->_nm _call; \ } @@ -293,15 +168,41 @@ def_subclassed (xDeviceCharacteristics, static int camel_sqlite3_file_xClose (sqlite3_file *pFile) { - struct CamelSqlite3File *cFile; + CamelSqlite3File *cFile; int res; g_return_val_if_fail (old_vfs != NULL, SQLITE_ERROR); g_return_val_if_fail (pFile != NULL, SQLITE_ERROR); - dequeue_sync (pFile); + cFile = (CamelSqlite3File *) pFile; + + /* The queue itself does not need to be locked yet, + * but we use its mutex to safely manipulate flags. */ + g_async_queue_lock (cFile->queue); + + /* Tell the sync request thread to exit. It may do + * one last sync before exiting, so preserve any sync + * flags that have accumulated. */ + cFile->flags |= SYNC_THREAD_EXIT; + + /* Cancel any pending sync requests. */ + if (cFile->timeout_id > 0) + g_source_remove (cFile->timeout_id); + + /* Unlock the queue before pushing the exit request. */ + g_async_queue_unlock (cFile->queue); + + /* Push the exit request. */ + sync_push_request (cFile); + + /* Wait for the thread to exit. */ + g_thread_join (cFile->thread); + cFile->thread = NULL; + + /* Now we can safely destroy the queue. */ + g_async_queue_unref (cFile->queue); + cFile->queue = NULL; - cFile = (struct CamelSqlite3File *) pFile; if (cFile->old_vfs_file->pMethods) res = cFile->old_vfs_file->pMethods->xClose (cFile->old_vfs_file); else @@ -316,10 +217,26 @@ camel_sqlite3_file_xClose (sqlite3_file static int camel_sqlite3_file_xSync (sqlite3_file *pFile, int flags) { + CamelSqlite3File *cFile; + g_return_val_if_fail (old_vfs != NULL, SQLITE_ERROR); g_return_val_if_fail (pFile != NULL, SQLITE_ERROR); - queue_sync (pFile, flags); + cFile = (CamelSqlite3File *) pFile; + + /* The queue itself does not need to be locked yet, + * but we use its mutex to safely manipulate flags. */ + g_async_queue_lock (cFile->queue); + + /* If a sync request is already scheduled, accumulate flags. */ + cFile->flags |= flags; + + if (cFile->timeout_id == 0) + cFile->timeout_id = g_timeout_add_seconds ( + SYNC_TIMEOUT_SECONDS, (GSourceFunc) + sync_push_request, cFile); + + g_async_queue_unlock (cFile->queue); return SQLITE_OK; } @@ -328,14 +245,24 @@ static int camel_sqlite3_vfs_xOpen (sqlite3_vfs *pVfs, const char *zPath, sqlite3_file *pFile, int flags, int *pOutFlags) { static sqlite3_io_methods io_methods = {0}; - struct CamelSqlite3File *cFile; + CamelSqlite3File *cFile; + GError *error = NULL; int res; g_return_val_if_fail (old_vfs != NULL, -1); g_return_val_if_fail (pFile != NULL, -1); - cFile = (struct CamelSqlite3File *)pFile; + cFile = (CamelSqlite3File *)pFile; cFile->old_vfs_file = g_malloc0 (old_vfs->szOsFile); + cFile->queue = g_async_queue_new (); + + /* Spawn a joinable thread to listen for sync requests. */ + cFile->thread = g_thread_create ( + (GThreadFunc) sync_request_thread_cb, cFile, TRUE, &error); + if (error != NULL) { + g_warning ("%s", error->message); + g_error_free (error); + } res = old_vfs->xOpen (old_vfs, zPath, cFile->old_vfs_file, flags, pOutFlags); @@ -370,33 +297,23 @@ camel_sqlite3_vfs_xOpen (sqlite3_vfs *pV return res; } -static void +static gpointer init_sqlite_vfs (void) { static sqlite3_vfs vfs = { 0 }; - g_static_rec_mutex_lock (&only_once_lock); - if (old_vfs) { - g_static_rec_mutex_unlock (&only_once_lock); - return; - } - old_vfs = sqlite3_vfs_find (NULL); - if (!old_vfs) { - g_static_rec_mutex_unlock (&only_once_lock); - g_return_if_fail (old_vfs != NULL); - return; - } + g_return_val_if_fail (old_vfs != NULL, NULL); memcpy (&vfs, old_vfs, sizeof (sqlite3_vfs)); - vfs.szOsFile = sizeof (struct CamelSqlite3File); + vfs.szOsFile = sizeof (CamelSqlite3File); vfs.zName = "camel_sqlite3_vfs"; vfs.xOpen = camel_sqlite3_vfs_xOpen; sqlite3_vfs_register (&vfs, 1); - g_static_rec_mutex_unlock (&only_once_lock); + return NULL; } #define d(x) if (camel_debug("sqlite")) x @@ -453,12 +370,13 @@ cdb_sql_exec (sqlite3 *db, const char* s CamelDB * camel_db_open (const char *path, CamelException *ex) { + static GOnce vfs_once = G_ONCE_INIT; CamelDB *cdb; sqlite3 *db; char *cache; int ret; - init_sqlite_vfs (); + g_once (&vfs_once, (GThreadFunc) init_sqlite_vfs, NULL); CAMEL_DB_USE_SHARED_CACHE; Index: evolution-data-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-data-server/F-10/evolution-data-server.spec,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- evolution-data-server.spec 25 Feb 2009 15:35:10 -0000 1.244 +++ evolution-data-server.spec 11 Mar 2009 10:27:24 -0000 1.245 @@ -29,7 +29,7 @@ Name: evolution-data-server Version: 2.24.5 -Release: 1%{?dist} +Release: 1%{?dist}.test.1 License: LGPLv2 Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -51,6 +51,10 @@ # RH bug #243296 Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch +# SQLite fsync() reduction rework +# Simplifies design and prevents thread leak +Patch14: evolution-data-server-2.24.5-sqlite-fsync-rework.patch + ### Build Dependencies ### BuildRequires: GConf2-devel @@ -129,6 +133,7 @@ %patch11 -p1 -b .fix-ldap-query %patch12 -p1 -b .camel-folder-summary-crash %patch13 -p1 -b .fix-64bit-acinclude +%patch14 -p1 -b .sqlite-fsync-rework mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -374,7 +379,10 @@ %{_datadir}/gtk-doc/html/libedataserverui %changelog -* Wed Feb 25 2009 Matthew Barnes - 2.25.4-1.fc10 +* Wed Mar 11 2009 Matthew Barnes - 2.25.5-1.fc10.test.1 +- Testing a patch for a thread leak in camel-db.c. + +* Wed Feb 25 2009 Matthew Barnes - 2.25.5-1.fc10 - Update to 2.24.5 * Tue Feb 03 2009 Matthew Barnes - 2.24.4.1-1.fc10 From tbzatek at fedoraproject.org Wed Mar 11 10:41:53 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Wed, 11 Mar 2009 10:41:53 +0000 (UTC) Subject: rpms/nautilus/devel .cvsignore, 1.91, 1.92 nautilus.spec, 1.262, 1.263 sources, 1.95, 1.96 Message-ID: <20090311104153.CB10C70128@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/nautilus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11048 Modified Files: .cvsignore nautilus.spec sources Log Message: * Wed Mar 11 2009 Tomas Bzatek - 2.25.93-1 - Update to 2.25.93 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- .cvsignore 2 Mar 2009 16:54:42 -0000 1.91 +++ .cvsignore 11 Mar 2009 10:41:23 -0000 1.92 @@ -1 +1 @@ -nautilus-2.25.92.tar.bz2 +nautilus-2.25.93.tar.bz2 Index: nautilus.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- nautilus.spec 2 Mar 2009 16:54:42 -0000 1.262 +++ nautilus.spec 11 Mar 2009 10:41:23 -0000 1.263 @@ -15,7 +15,7 @@ Name: nautilus Summary: File manager for GNOME -Version: 2.25.92 +Version: 2.25.93 Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops @@ -261,6 +261,9 @@ %changelog +* Wed Mar 11 2009 Tomas Bzatek - 2.25.93-1 +- Update to 2.25.93 + * Mon Mar 2 2009 Tomas Bzatek - 2.25.92-1 - Update to 2.25.92 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/sources,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- sources 2 Mar 2009 16:54:42 -0000 1.95 +++ sources 11 Mar 2009 10:41:23 -0000 1.96 @@ -1 +1 @@ -478821fc4dc6e04bf87c8b6bdda85826 nautilus-2.25.92.tar.bz2 +9bdd861ef58dbeacd1e51dfe05a2bf13 nautilus-2.25.93.tar.bz2 From ovasik at fedoraproject.org Wed Mar 11 11:10:51 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Wed, 11 Mar 2009 11:10:51 +0000 (UTC) Subject: rpms/inn/devel .cvsignore, 1.13, 1.14 inn.spec, 1.58, 1.59 sources, 1.14, 1.15 Message-ID: <20090311111051.5937770128@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/inn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15620 Modified Files: .cvsignore inn.spec sources Log Message: new bugfix upstream release 2.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/inn/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 3 Jul 2008 16:16:38 -0000 1.13 +++ .cvsignore 11 Mar 2009 11:10:19 -0000 1.14 @@ -1,2 +1,2 @@ inn-faq.tar.gz -inn-2.4.5.tar.gz +inn-2.4.6.tar.gz Index: inn.spec =================================================================== RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- inn.spec 25 Feb 2009 16:09:54 -0000 1.58 +++ inn.spec 11 Mar 2009 11:10:20 -0000 1.59 @@ -1,7 +1,7 @@ Summary: The InterNetNews system, an Usenet news server Name: inn -Version: 2.4.5 -Release: 10%{?dist} +Version: 2.4.6 +Release: 1%{?dist} #see LICENSE file for details License: GPL+ and BSD and MIT and Public Domain Group: System Environment/Daemons @@ -354,6 +354,9 @@ %{_mandir}/man1/inews* %changelog +* Wed Mar 11 2009 Ondrej Vasik - 2.4.6-1 +- new bugfix upstream release 2.4.6 + * Wed Feb 25 2009 Ondrej Vasik - 2.4.5-10 - mark /usr/lib/news/lib/innshellvars* as noreplace, versioned provide for perl(::/usr/lib/innshellvars.pl) Index: sources =================================================================== RCS file: /cvs/extras/rpms/inn/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 3 Jul 2008 16:16:38 -0000 1.14 +++ sources 11 Mar 2009 11:10:20 -0000 1.15 @@ -1,2 +1,2 @@ b5e6321446594749eea087c6710eefa5 inn-faq.tar.gz -07bc6530c5e296b0ee81a5d6ac4cd355 inn-2.4.5.tar.gz +50741ff1b9c230af9109aafc7e98b1a2 inn-2.4.6.tar.gz From varekova at fedoraproject.org Wed Mar 11 11:22:24 2009 From: varekova at fedoraproject.org (Ivana Varekova) Date: Wed, 11 Mar 2009 11:22:24 +0000 (UTC) Subject: rpms/mpfr/devel .cvsignore, 1.6, 1.7 mpfr.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <20090311112224.3E7B470128@cvs1.fedora.phx.redhat.com> Author: varekova Update of /cvs/pkgs/rpms/mpfr/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17073 Modified Files: .cvsignore mpfr.spec sources Log Message: - update to 2.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mpfr/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 4 Feb 2009 10:45:36 -0000 1.6 +++ .cvsignore 11 Mar 2009 11:21:52 -0000 1.7 @@ -1 +1 @@ -mpfr-2.4.0.tar.bz2 +mpfr-2.4.1.tar.bz2 Index: mpfr.spec =================================================================== RCS file: /cvs/pkgs/rpms/mpfr/devel/mpfr.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mpfr.spec 26 Feb 2009 02:57:17 -0000 1.12 +++ mpfr.spec 11 Mar 2009 11:21:52 -0000 1.13 @@ -1,7 +1,7 @@ Summary: A C library for multiple-precision floating-point computations Name: mpfr -Version: 2.4.0 -Release: 2%{?dist} +Version: 2.4.1 +Release: 1%{?dist} URL: http://www.mpfr.org/ Source0: http://www.mpfr.org/mpfr-current/mpfr-%{version}.tar.bz2 License: LGPLv2+ and GPLv2+ and GFDL @@ -83,6 +83,9 @@ %{_infodir}/mpfr.info* %changelog +* Wed Mar 11 2009 Ivana Varekova - 2.4.1-1 +- update to 2.4.1 + * Wed Feb 25 2009 Fedora Release Engineering - 2.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mpfr/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 4 Feb 2009 10:45:36 -0000 1.6 +++ sources 11 Mar 2009 11:21:52 -0000 1.7 @@ -1 +1 @@ -f5916d785d4f7e7282057f6a3ebff9ce mpfr-2.4.0.tar.bz2 +c5ee0a8ce82ad55fe29ac57edd35d09e mpfr-2.4.1.tar.bz2 From rishi at fedoraproject.org Wed Mar 11 11:26:14 2009 From: rishi at fedoraproject.org (Debarshi Ray) Date: Wed, 11 Mar 2009 11:26:14 +0000 (UTC) Subject: rpms/anjuta/devel anjuta-2.25.903.0-configure.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 anjuta.spec, 1.68, 1.69 sources, 1.16, 1.17 Message-ID: <20090311112614.8E93C70128@cvs1.fedora.phx.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/anjuta/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16583 Modified Files: .cvsignore anjuta.spec sources Added Files: anjuta-2.25.903.0-configure.patch Log Message: * Tue Mar 10 2009 Debarshi Ray - 1:2.25.903.0-1 - Version bump to 2.25.903.0. * Fixed Glade and version control integration. * Updated documentation. * Automatically select program to run if the project has only one executable. (GNOME Bugzilla #564306) * Build (basic Autotools) plugin: + Save configuration options for build configuration. (GNOME Bugzilla #555895) + Fixed Valgrind violations. (GNOME Bugzilla #565170) * GtkSourceView editor plugin: + Make swapping of .h and .c work for C header files. (GNOME Bugzilla #556970) + Should not crash when closing unsaved file. (GNOME Bugzilla #559806) + Fixed crash when closing a read-only file that threw an exception while running a program in the debugger. (GNOME Bugzilla #564891) * Scintilla editor plugin: + Make auto-complete box vanish on backspace. (GNOME Bugzilla #567068) * Search plugin: + Repaired Find & Replace. (GNOME Bugzilla #571760) + Fixed crash when clicking on the results of 'Find in files ...'. (GNOME Bugzilla #572608) * Symbol-db plugin: + Fixed Valgrind violations. (GNOME Bugzilla #572637) * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.903.0.news - Fixed configure to correctly handle --enable-plugin-scintilla. - Upstream no longer installs /usr/bin/benchmark. anjuta-2.25.903.0-configure.patch: --- NEW FILE anjuta-2.25.903.0-configure.patch --- diff -urNp anjuta-2.25.903.0.orig/configure anjuta-2.25.903.0/configure --- anjuta-2.25.903.0.orig/configure 2009-03-11 01:39:11.738219733 +0530 +++ anjuta-2.25.903.0/configure 2009-03-11 03:13:22.258993881 +0530 @@ -18106,7 +18106,7 @@ fi # Check whether --enable-plugin-scintilla was given. if test "${enable_plugin_scintilla+set}" = set; then - enableval=$enable_plugin_scintilla; if test "$enableval" = "yes"; then + enableval=$enable_plugin_scintilla; if test "$enableval" = "no"; then user_disabled_scintilla=1 fi else @@ -18117,12 +18117,12 @@ fi { echo "$as_me:$LINENO: checking if scintilla plugin is disabled" >&5 echo $ECHO_N "checking if scintilla plugin is disabled... $ECHO_C" >&6; } if test "$user_disabled_scintilla" = 1; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - scintilla="no" -else { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } + scintilla="no" +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } scintilla="yes" fi if test x$scintilla = xyes; then Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anjuta/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 21 Feb 2009 19:53:47 -0000 1.16 +++ .cvsignore 11 Mar 2009 11:25:43 -0000 1.17 @@ -1 +1 @@ -anjuta-2.25.902.tar.gz +anjuta-2.25.903.0.tar.gz Index: anjuta.spec =================================================================== RCS file: /cvs/pkgs/rpms/anjuta/devel/anjuta.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- anjuta.spec 8 Mar 2009 12:49:15 -0000 1.68 +++ anjuta.spec 11 Mar 2009 11:25:43 -0000 1.69 @@ -1,13 +1,15 @@ Summary: A GNOME development IDE for C/C++ Name: anjuta Epoch: 1 -Version: 2.25.902 -Release: 6%{?dist} +Version: 2.25.903.0 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools URL: http://www.anjuta.org/ Source0: http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/%{name}-%{version}.tar.gz +Patch0: %{name}-%{version}-configure.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Obsoletes: gnome-build <= 2.24.1-1 @@ -91,6 +93,7 @@ %prep %setup -q +%patch0 -p1 # Filter unwanted Provides. cat << \EOF > %{name}-prov @@ -252,7 +255,6 @@ %doc THANKS %doc %{_mandir}/man1/%{name}.1* %doc %{_mandir}/man1/%{name}_launcher.1* -%exclude %{_bindir}/benchmark %{_bindir}/%{name} %{_bindir}/gbf-am-parse %{_bindir}/gbf-mkfile-parse @@ -309,8 +311,36 @@ %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf %changelog +* Tue Mar 10 2009 Debarshi Ray - 1:2.25.903.0-1 +- Version bump to 2.25.903.0. + * Fixed Glade and version control integration. + * Updated documentation. + * Automatically select program to run if the project has only one + executable. (GNOME Bugzilla #564306) + * Build (basic Autotools) plugin: + + Save configuration options for build configuration. (GNOME Bugzilla + #555895) + + Fixed Valgrind violations. (GNOME Bugzilla #565170) + * GtkSourceView editor plugin: + + Make swapping of .h and .c work for C header files. (GNOME Bugzilla + #556970) + + Should not crash when closing unsaved file. (GNOME Bugzilla #559806) + + Fixed crash when closing a read-only file that threw an exception while + running a program in the debugger. (GNOME Bugzilla #564891) + * Scintilla editor plugin: + + Make auto-complete box vanish on backspace. (GNOME Bugzilla #567068) + * Search plugin: + + Repaired Find & Replace. (GNOME Bugzilla #571760) + + Fixed crash when clicking on the results of 'Find in files ...'. (GNOME + Bugzilla #572608) + * Symbol-db plugin: + + Fixed Valgrind violations. (GNOME Bugzilla #572637) + * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/anjuta-2.25.903.0.news +- Fixed configure to correctly handle --enable-plugin-scintilla. +- Upstream no longer installs /usr/bin/benchmark. + * Sun Mar 08 2009 Rakesh Pandit - 1:2.25.902-6 -- Bumped to consume new soname in webkit library. +- Bumped to consume new WebKit soname. * Wed Feb 27 2009 Debarshi Ray - 1:2.25.902-5 - Added 'Provides: perl(GBF::Make)'. Imported from gnome-build. (Red Hat Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anjuta/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 21 Feb 2009 19:53:47 -0000 1.16 +++ sources 11 Mar 2009 11:25:44 -0000 1.17 @@ -1 +1 @@ -ec640e7845e71b9741c9bded0185753b anjuta-2.25.902.tar.gz +de93cc2a14f0169a29f0c10e18ff1c52 anjuta-2.25.903.0.tar.gz From vcrhonek at fedoraproject.org Wed Mar 11 11:36:07 2009 From: vcrhonek at fedoraproject.org (Vitezslav Crhonek) Date: Wed, 11 Mar 2009 11:36:07 +0000 (UTC) Subject: rpms/ypbind/F-10 ypbind.init,1.21,1.22 ypbind.spec,1.53,1.54 Message-ID: <20090311113607.AF2C770128@cvs1.fedora.phx.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/ypbind/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4816 Modified Files: ypbind.init ypbind.spec Log Message: Fix init script Index: ypbind.init =================================================================== RCS file: /cvs/extras/rpms/ypbind/F-10/ypbind.init,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ypbind.init 10 Jun 2008 13:22:46 -0000 1.21 +++ ypbind.init 11 Mar 2009 11:35:37 -0000 1.22 @@ -12,6 +12,16 @@ # processname: ypbind # config: /etc/yp.conf +### BEGIN INIT INFO +# Provides: $ypbind +# Required-Start: $network $syslog +# Required-Stop: $network $syslog +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: start|stop|restart|condrestart|try-restart|reload|force-reload|status NIS client +# Description: This is a daemon which runs on NIS/YP clients and binds them to a NIS domain +### END INIT INFO + OTHER_YPBIND_OPTS="" # Source function library. @@ -99,18 +109,18 @@ fi fi sleep 2 - echo -n "..." + echo -n "." done if [ $RETVAL -eq 0 ]; then - logger -t ypbind \ - "NIS domain: `domainname`, NIS server: `ypwhich 2> /dev/null`" - touch /var/lock/subsys/ypbind - success + logger -t ypbind \ + "NIS domain: `domainname`, NIS server: `ypwhich 2> /dev/null`" + touch /var/lock/subsys/ypbind + success else - logger -t ypbind \ - "NIS server for domain `domainname` is not responding." - failure - #selinux_off + logger -t ypbind \ + "NIS server for domain `domainname` is not responding." + failure + #selinux_off RETVAL=100 fi echo @@ -121,10 +131,10 @@ echo -n $"Shutting down NIS service: " killproc ypbind RETVAL=$? - if [ $RETVAL -eq 0 ] ; then + if [ $RETVAL -eq 0 ]; then rm -f /var/lock/subsys/ypbind # if we used brute force (like kill -9) we don't want those around - if [ x$(domainname) != x ] ; then + if [ x$(domainname) != x ]; then rm -f /var/yp/binding/$(domainname)* fi fi @@ -138,30 +148,52 @@ start } +reload() { + echo -n $"Reloading NIS service: " + p=`/sbin/pidof -o %PPID 'ypbind'` + RETVAL=$? + if [ "$RETVAL" -eq 0 ]; then + /bin/kill -HUP $p + RETVAL=$? + fi + [ "$RETVAL" -eq 0 ] && success || failure + echo + return $RETVAL +} + RETVAL=0 # See how we were called. case "$1" in start) - start - [ $? -eq 100 ] && stop + start + RETVAL=$? + if [ $RETVAL -eq 100 ]; then stop; RETVAL=1; fi ;; stop) stop + RETVAL=$? ;; status) status ypbind RETVAL=$? ;; - restart|reload) + restart) restart + RETVAL=$? + ;; + condrestart|try-restart) + if [ -e /var/lock/subsys/ypbind ]; then restart; fi + ;; + reload) + reload ;; - condrestart) - [ -f /var/lock/subsys/ypbind ] && restart || : + force-reload) + if ! reload; then restart; fi ;; *) - echo $"Usage: $0 {start|stop|status|restart|condrestart}" - exit 1 + echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}" + RETVAL=3 esac -exit $? +exit $RETVAL Index: ypbind.spec =================================================================== RCS file: /cvs/extras/rpms/ypbind/F-10/ypbind.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- ypbind.spec 21 Oct 2008 13:13:01 -0000 1.53 +++ ypbind.spec 11 Mar 2009 11:35:37 -0000 1.54 @@ -1,7 +1,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Version: 1.20.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2 @@ -92,6 +92,10 @@ %doc README NEWS %changelog +* Wed Mar 11 2009 Vitezslav Crhonek - 1.20.4-10 +- Fix init script + Resolves: #489200 + * Tue Oct 21 2008 Vitezslav Crhonek - 1.20.4-9 - Merge Review - remove dot from end of the summary, convert all tags in %%changelog to utf-8, escape %% character in changelog, fix From mgrepl at fedoraproject.org Wed Mar 11 11:43:15 2009 From: mgrepl at fedoraproject.org (Miroslav Grepl) Date: Wed, 11 Mar 2009 11:43:15 +0000 (UTC) Subject: rpms/selinux-policy/F-10 policy-20080710.patch,1.145,1.146 Message-ID: <20090311114315.16F3370128@cvs1.fedora.phx.redhat.com> Author: mgrepl Update of /cvs/extras/rpms/selinux-policy/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5817 Modified Files: policy-20080710.patch Log Message: - Fix razor policy policy-20080710.patch: Index: policy-20080710.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- policy-20080710.patch 11 Mar 2009 10:11:03 -0000 1.145 +++ policy-20080710.patch 11 Mar 2009 11:42:43 -0000 1.146 @@ -24942,7 +24942,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.te serefpolicy-3.5.13/policy/modules/services/razor.te --- nsaserefpolicy/policy/modules/services/razor.te 2008-10-17 14:49:11.000000000 +0200 -+++ serefpolicy-3.5.13/policy/modules/services/razor.te 2009-02-10 15:07:15.000000000 +0100 ++++ serefpolicy-3.5.13/policy/modules/services/razor.te 2009-03-11 11:54:03.000000000 +0100 @@ -6,21 +6,53 @@ # Declarations # @@ -24952,7 +24952,7 @@ + gen_require(` + type spamc_t; + type spamc_exec_t; -+ #type spamc_home_t; ++ type spamc_home_t; + type spamd_log_t; + type spamd_spool_t; + type spamd_var_lib_t; @@ -24966,8 +24966,8 @@ + typealias spamd_log_t alias razor_log_t; + typealias spamd_var_lib_t alias razor_var_lib_t; + typealias spamd_etc_t alias razor_etc_t; -+ typealias spamassassin_home_t alias razor_home_t; -+ #typealias spamc_home_t alias razor_home_t; ++ #typealias spamassassin_home_t alias razor_home_t; ++ typealias spamc_home_t alias razor_home_t; + +',` + From twaugh at fedoraproject.org Wed Mar 11 12:08:22 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Wed, 11 Mar 2009 12:08:22 +0000 (UTC) Subject: rpms/cups/devel cups.spec,1.466,1.467 Message-ID: <20090311120822.3602A70128@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9766 Modified Files: cups.spec Log Message: * Wed Mar 11 2009 Tim Waugh 1:1.4-0.b2.11 - Bumped cupsddk n-v-r for obsoletes/provides, as cupsddk was rebuilt. Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.466 retrieving revision 1.467 diff -u -r1.466 -r1.467 --- cups.spec 10 Mar 2009 18:39:13 -0000 1.466 +++ cups.spec 11 Mar 2009 12:07:51 -0000 1.467 @@ -8,7 +8,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.4 -Release: 0.%{pre}.10%{?dist} +Release: 0.%{pre}.11%{?dist} License: GPLv2 Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2 @@ -64,10 +64,10 @@ Obsoletes: lpd lpr LPRng <= 3.8.15-3 Provides: lpd lpr -Obsoletes: cupsddk < 1.2.3-6 -Provides: cupsddk = 1.2.3-6 -Obsoletes: cupsddk-drivers < 1.2.3-6 -Provides: cupsddk-drivers = 1.2.3-6 +Obsoletes: cupsddk < 1.2.3-7 +Provides: cupsddk = 1.2.3-7 +Obsoletes: cupsddk-drivers < 1.2.3-7 +Provides: cupsddk-drivers = 1.2.3-7 # kdelibs conflict for bug #192585. Conflicts: kdelibs < 6:3.5.2-6 @@ -113,8 +113,8 @@ Requires: gnutls-devel Requires: krb5-devel Requires: zlib-devel -Obsoletes: cupsddk-devel < 1.2.3-6 -Provides: cupsddk-devel = 1.2.3-6 +Obsoletes: cupsddk-devel < 1.2.3-7 +Provides: cupsddk-devel = 1.2.3-7 %package libs Summary: Common Unix Printing System - libraries @@ -470,6 +470,9 @@ %{_libdir}/php/modules/*.so %changelog +* Wed Mar 11 2009 Tim Waugh 1:1.4-0.b2.11 +- Bumped cupsddk n-v-r for obsoletes/provides, as cupsddk was rebuilt. + * Tue Mar 10 2009 Tim Waugh 1:1.4-0.b2.10 - Applied patch to fix ppd-natural-language attribute in PPD list (STR #3124). From hadess at fedoraproject.org Wed Mar 11 12:08:41 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 11 Mar 2009 12:08:41 +0000 (UTC) Subject: rpms/gnome-media/devel gvc-fix-zero-adj-usage.patch, NONE, 1.1 gnome-media.spec, 1.159, 1.160 Message-ID: <20090311120841.E576970128@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-media/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9802 Modified Files: gnome-media.spec Added Files: gvc-fix-zero-adj-usage.patch Log Message: * Wed Mar 11 2009 - Bastien Nocera - 2.25.92-3 - Fix unwanted random muting (#485979) gvc-fix-zero-adj-usage.patch: --- NEW FILE gvc-fix-zero-adj-usage.patch --- Index: gvc-channel-bar.c =================================================================== --- gvc-channel-bar.c (revision 4276) +++ gvc-channel-bar.c (working copy) @@ -394,6 +394,7 @@ GdkEventButton *event, GvcChannelBar *bar) { + GtkAdjustment *adj; gdouble value; /* HACK: see on_scale_button_press_event() */ @@ -402,14 +403,17 @@ bar->priv->click_lock = FALSE; - value = gtk_adjustment_get_value (bar->priv->zero_adjustment); - gtk_adjustment_set_value (bar->priv->adjustment, value); + adj = gtk_range_get_adjustment (GTK_RANGE (widget)); + value = gtk_adjustment_get_value (adj); + /* this means the adjustment moved away from zero and therefore we should unmute and set the volume. */ + if (value > 0) + gvc_channel_bar_set_is_muted (bar, FALSE); + else + gvc_channel_bar_set_is_muted (bar, TRUE); - gvc_channel_bar_set_is_muted (bar, FALSE); - /* Play a sound! */ ca_gtk_play_for_widget (GTK_WIDGET (bar), 0, CA_PROP_EVENT_ID, "audio-volume-change", @@ -420,32 +424,55 @@ return FALSE; } -static gboolean -on_scale_scroll_event (GtkWidget *widget, - GdkEventScroll *event, - GvcChannelBar *bar) +gboolean +gvc_channel_bar_scroll (GvcChannelBar *bar, GdkScrollDirection direction) { + GtkAdjustment *adj; gdouble value; - value = gtk_adjustment_get_value (bar->priv->adjustment); + g_return_val_if_fail (bar != NULL, FALSE); + g_return_val_if_fail (GVC_IS_CHANNEL_BAR (bar), FALSE); - if (event->direction == GDK_SCROLL_UP) { + /* FIXME we should handle left/right for horizontal bars */ + if (direction != GDK_SCROLL_UP && direction != GDK_SCROLL_DOWN) + return FALSE; + + adj = gtk_range_get_adjustment (GTK_RANGE (bar->priv->scale)); + if (adj == bar->priv->zero_adjustment) { + if (direction == GDK_SCROLL_UP) + gvc_channel_bar_set_is_muted (bar, FALSE); + return TRUE; + } + + value = gtk_adjustment_get_value (adj); + + if (direction == GDK_SCROLL_UP) { if (value + ADJUSTMENT_MAX/100.0 > ADJUSTMENT_MAX) value = ADJUSTMENT_MAX; else value = value + ADJUSTMENT_MAX/100.0; - gtk_adjustment_set_value (bar->priv->adjustment, value); - } else if (event->direction == GDK_SCROLL_DOWN) { + } else if (direction == GDK_SCROLL_DOWN) { if (value - ADJUSTMENT_MAX/100.0 < 0) value = 0.0; else value = value - ADJUSTMENT_MAX/100.0; - gtk_adjustment_set_value (bar->priv->adjustment, value); } + gvc_channel_bar_set_is_muted (bar, (value == 0.0)); + adj = gtk_range_get_adjustment (GTK_RANGE (bar->priv->scale)); + gtk_adjustment_set_value (adj, value); + return TRUE; } +static gboolean +on_scale_scroll_event (GtkWidget *widget, + GdkEventScroll *event, + GvcChannelBar *bar) +{ + return gvc_channel_bar_scroll (bar, event->direction); +} + static void on_zero_adjustment_value_changed (GtkAdjustment *adjustment, GvcChannelBar *bar) Index: gvc-channel-bar.h =================================================================== --- gvc-channel-bar.h (revision 4276) +++ gvc-channel-bar.h (working copy) @@ -76,6 +76,9 @@ void gvc_channel_bar_set_is_amplified (GvcChannelBar *bar, gboolean amplified); +gboolean gvc_channel_bar_scroll (GvcChannelBar *bar, + GdkScrollDirection direction); + G_END_DECLS #endif /* __GVC_CHANNEL_BAR_H */ Index: gvc-stream-status-icon.c =================================================================== --- gvc-stream-status-icon.c (revision 4276) +++ gvc-stream-status-icon.c (working copy) @@ -267,37 +267,7 @@ GdkEventScroll *event, GvcStreamStatusIcon *icon) { - GtkAdjustment *adj; - - adj = GTK_ADJUSTMENT (gvc_channel_bar_get_adjustment (GVC_CHANNEL_BAR (icon->priv->bar))); - - switch (event->direction) { - case GDK_SCROLL_UP: - case GDK_SCROLL_DOWN: { - gdouble volume; - - volume = gtk_adjustment_get_value (adj); - - if (event->direction == GDK_SCROLL_UP) { - volume += adj->step_increment; - if (volume > adj->upper) { - volume = adj->upper; - } - } else { - volume -= adj->step_increment; - if (volume < adj->lower) { - volume = adj->lower; - } - } - - gtk_adjustment_set_value (adj, volume); - return TRUE; - } - default: - break; - } - - return FALSE; + return gvc_channel_bar_scroll (GVC_CHANNEL_BAR (icon->priv->bar), event->direction); } static void Index: gnome-media.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- gnome-media.spec 6 Mar 2009 20:02:47 -0000 1.159 +++ gnome-media.spec 11 Mar 2009 12:08:11 -0000 1.160 @@ -20,6 +20,9 @@ Source: http://download.gnome.org/sources/gnome-media/2.25/gnome-media-%{version}.tar.bz2 # fixed in upstream svn Patch0: gvc-log.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=564313#c8 +# https://bugzilla.redhat.com/show_bug.cgi?id=485979 +Patch1: gvc-fix-zero-adj-usage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: gnome @@ -79,6 +82,9 @@ %prep %setup -q %patch0 -p1 -b .gvc-log +pushd gnome-volume-control/src +%patch1 -p0 -b .zero-adj +popd autoreconf -f -i @@ -254,6 +260,9 @@ %{_libdir}/pkgconfig/* %changelog +* Wed Mar 11 2009 - Bastien Nocera - 2.25.92-3 +- Fix unwanted random muting (#485979) + * Fri Mar 6 2009 Matthias Clasen 2.25.92-2 - Turn off debug spew From twaugh at fedoraproject.org Wed Mar 11 12:10:50 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Wed, 11 Mar 2009 12:10:50 +0000 (UTC) Subject: rpms/cupsddk/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE cupsddk-no-gzip-man-pages.patch, 1.1, NONE cupsddk-no-strip.patch, 1.1, NONE cupsddk-smp-build.patch, 1.1, NONE cupsddk.spec, 1.11, NONE sources, 1.5, NONE Message-ID: <20090311121050.E5CF670128@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cupsddk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10251 Added Files: dead.package Removed Files: Makefile cupsddk-no-gzip-man-pages.patch cupsddk-no-strip.patch cupsddk-smp-build.patch cupsddk.spec sources Log Message: Obsoleted by cups 1.4. --- NEW FILE dead.package --- --- Makefile DELETED --- --- cupsddk-no-gzip-man-pages.patch DELETED --- --- cupsddk-no-strip.patch DELETED --- --- cupsddk-smp-build.patch DELETED --- --- cupsddk.spec DELETED --- --- sources DELETED --- From hadess at fedoraproject.org Wed Mar 11 12:10:46 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 11 Mar 2009 12:10:46 +0000 (UTC) Subject: rpms/gnome-media/devel gnome-media.spec,1.160,1.161 Message-ID: <20090311121047.0AE7570128@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-media/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10158 Modified Files: gnome-media.spec Log Message: up release Index: gnome-media.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- gnome-media.spec 11 Mar 2009 12:08:11 -0000 1.160 +++ gnome-media.spec 11 Mar 2009 12:10:16 -0000 1.161 @@ -14,7 +14,7 @@ Summary: GNOME media programs Name: gnome-media Version: 2.25.92 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and GFDL Group: Applications/Multimedia Source: http://download.gnome.org/sources/gnome-media/2.25/gnome-media-%{version}.tar.bz2 From dnovotny at fedoraproject.org Wed Mar 11 12:34:00 2009 From: dnovotny at fedoraproject.org (Daniel Novotny) Date: Wed, 11 Mar 2009 12:34:00 +0000 (UTC) Subject: rpms/mailman/devel mailman-2.1.12-lctype.patch, NONE, 1.1 mailman-2.1.12-multimail.patch, NONE, 1.1 mailman.spec, 1.77, 1.78 Message-ID: <20090311123400.4D96E70128@cvs1.fedora.phx.redhat.com> Author: dnovotny Update of /cvs/extras/rpms/mailman/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13675 Modified Files: mailman.spec Added Files: mailman-2.1.12-lctype.patch mailman-2.1.12-multimail.patch Log Message: update to 2.1.12 mailman-2.1.12-lctype.patch: --- NEW FILE mailman-2.1.12-lctype.patch --- diff -up mailman-2.1.12/bin/add_members.lctype mailman-2.1.12/bin/add_members --- mailman-2.1.12/bin/add_members.lctype 2009-03-10 12:44:57.000000000 +0100 +++ mailman-2.1.12/bin/add_members 2009-03-10 12:47:17.000000000 +0100 @@ -80,7 +80,7 @@ from Mailman import Errors from Mailman import mm_cfg from Mailman import i18n -_ = i18n._ +C_ = i18n.C_ @@ -89,7 +89,7 @@ def usage(status, msg=''): fd = sys.stderr else: fd = sys.stdout - print >> fd, _(__doc__) + print >> fd, C_(__doc__) if msg: print >> fd, msg sys.exit(status) @@ -134,19 +134,19 @@ def addall(mlist, members, digest, ack, try: mlist.ApprovedAddMember(userdesc, ack, 0) except Errors.MMAlreadyAMember: - print >> tee, _('Already a member: %(member)s') + print >> tee, C_('Already a member: %(member)s') except Errors.MembershipIsBanned, pattern: print >> tee, ('%s:' % - member), _('Banned address (matched %(pattern)s)') + member), C_('Banned address (matched %(pattern)s)') except Errors.MMBadEmailError: if userdesc.address == '': - print >> tee, _('Bad/Invalid email address: blank line') + print >> tee, C_('Bad/Invalid email address: blank line') else: - print >> tee, _('Bad/Invalid email address: %(member)s') + print >> tee, C_('Bad/Invalid email address: %(member)s') except Errors.MMHostileAddress: - print >> tee, _('Hostile address (illegal characters): %(member)s') + print >> tee, C_('Hostile address (illegal characters): %(member)s') else: - print >> tee, _('Subscribed: %(member)s') + print >> tee, C_('Subscribed: %(member)s') @@ -191,26 +191,26 @@ def main(): elif arg.lower()[0] == 'n': send_welcome_msg = 0 else: - usage(1, _('Bad argument to -w/--welcome-msg: %(arg)s')) + usage(1, C_('Bad argument to -w/--welcome-msg: %(arg)s')) elif opt in ('-a', '--admin-notify'): if arg.lower()[0] == 'y': admin_notif = 1 elif arg.lower()[0] == 'n': admin_notif = 0 else: - usage(1, _('Bad argument to -a/--admin-notify: %(arg)s')) + usage(1, C_('Bad argument to -a/--admin-notify: %(arg)s')) if dfile is None and nfile is None: usage(1) if dfile == "-" and nfile == "-": - usage(1, _('Cannot read both digest and normal members ' + usage(1, C_('Cannot read both digest and normal members ' 'from standard input.')) try: mlist = MailList.MailList(listname) except Errors.MMUnknownListError: - usage(1, _('No such list: %(listname)s')) + usage(1, C_('No such list: %(listname)s')) # Set up defaults if send_welcome_msg is None: @@ -230,7 +230,7 @@ def main(): nmembers = readfile(nfile) if not dmembers and not nmembers: - usage(0, _('Nothing to do.')) + usage(0, C_('Nothing to do.')) s = StringIO() i18n.set_language(mlist.preferred_language) @@ -242,7 +242,7 @@ def main(): if admin_notif: realname = mlist.real_name - subject = _('%(realname)s subscription notification') + subject = C_('%(realname)s subscription notification') msg = Message.UserNotification( mlist.owner, Utils.get_site_email(), subject, s.getvalue(), mlist.preferred_language) diff -up mailman-2.1.12/bin/arch.lctype mailman-2.1.12/bin/arch --- mailman-2.1.12/bin/arch.lctype 2009-03-10 12:33:40.000000000 +0100 +++ mailman-2.1.12/bin/arch 2009-03-10 12:35:10.000000000 +0100 @@ -70,7 +70,7 @@ from Mailman.Archiver.HyperArch import H from Mailman.LockFile import LockFile from Mailman import i18n -_ = i18n._ +C_ = i18n.C_ PROGRAM = sys.argv[0] i18n.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE) @@ -82,7 +82,7 @@ def usage(code, msg=''): fd = sys.stderr else: fd = sys.stdout - print >> fd, _(__doc__) + print >> fd, C_(__doc__) if msg: print >> fd, msg sys.exit(code) @@ -122,7 +122,7 @@ def main(): # grok arguments if len(args) < 1: - usage(1, _('listname is required')) + usage(1, C_('listname is required')) listname = args[0].lower().strip() if len(args) < 2: @@ -140,7 +140,7 @@ def main(): try: mlist = MailList(listname) except Errors.MMListError, e: - usage(2, _('No such list "%(listname)s"\n%(e)s')) + usage(2, C_('No such list "%(listname)s"\n%(e)s')) if mbox is None: mbox = mlist.ArchiveFileName() @@ -165,7 +165,7 @@ def main(): try: fp = open(mbox) except IOError, msg: - usage(3, _('Cannot open mbox file %(mbox)s: %(msg)s')) + usage(3, C_('Cannot open mbox file %(mbox)s: %(msg)s')) # Maybe wipe the old archives if wipe: if mlist.scrub_nondigest: diff -up mailman-2.1.12/bin/b4b5-archfix.lctype mailman-2.1.12/bin/b4b5-archfix --- mailman-2.1.12/bin/b4b5-archfix.lctype 2009-03-10 12:53:58.000000000 +0100 +++ mailman-2.1.12/bin/b4b5-archfix 2009-03-10 12:54:11.000000000 +0100 @@ -44,7 +44,7 @@ import cPickle as pickle # Required to get the right classes for unpickling import paths -from Mailman.i18n import _ +from Mailman.i18n import C_ PROGRAM = sys.argv[0] @@ -55,7 +55,7 @@ def usage(code, msg=''): fd = sys.stderr else: fd = sys.stdout - print >> fd, _(__doc__) + print >> fd, C_(__doc__) if msg: print >> fd, msg sys.exit(code) diff -up mailman-2.1.12/bin/change_pw.lctype mailman-2.1.12/bin/change_pw --- mailman-2.1.12/bin/change_pw.lctype 2009-03-10 13:09:50.000000000 +0100 +++ mailman-2.1.12/bin/change_pw 2009-03-10 13:10:18.000000000 +0100 @@ -76,7 +76,7 @@ from Mailman import Errors from Mailman import Message from Mailman import i18n -_ = i18n._ +C_ = i18n.C_ SPACE = ' ' @@ -87,7 +87,7 @@ def usage(code, msg=''): fd = sys.stderr else: fd = sys.stdout - print >> fd, _(__doc__) + print >> fd, C_(__doc__) if msg: print >> fd, msg sys.exit(code) @@ -103,7 +103,7 @@ def openlist(listname): try: mlist = MailList.MailList(listname, lock=0) except Errors.MMListError, e: - usage(1, _('No such list "%(listname)s"\n%(e)s')) + usage(1, C_('No such list "%(listname)s"\n%(e)s')) _listcache[listname] = mlist return mlist @@ -141,11 +141,11 @@ def main(): if args: strargs = SPACE.join(args) [...2104 lines suppressed...] sys.exit(code) @@ -175,11 +175,11 @@ def atexit(): if m.Locked(): if VERBOSE: listname = m.internal_name() - print >> sys.stderr, _( + print >> sys.stderr, C_( 'Unlocking (but not saving) list: %(listname)s') m.Unlock() if VERBOSE: - print >> sys.stderr, _('Finalizing') + print >> sys.stderr, C_('Finalizing') del m @@ -188,16 +188,16 @@ def do_list(listname, args, func): global m # first try to open mailing list if VERBOSE: - print >> sys.stderr, _('Loading list %(listname)s'), + print >> sys.stderr, C_('Loading list %(listname)s'), if LOCK: - print >> sys.stderr, _('(locked)') + print >> sys.stderr, C_('(locked)') else: - print >> sys.stderr, _('(unlocked)') + print >> sys.stderr, C_('(unlocked)') try: m = MailList.MailList(listname, lock=LOCK) except Errors.MMUnknownListError: - print >> sys.stderr, _('Unknown list: %(listname)s') + print >> sys.stderr, C_('Unknown list: %(listname)s') m = None # try to import the module and run the callable @@ -237,7 +237,7 @@ def main(): all = True if len(args) < 1 and not all: - warning = _('No list name supplied.') + warning = C_('No list name supplied.') if interact: # Let them keep going print warning @@ -246,7 +246,7 @@ def main(): usage(1, warning) if all and not run: - usage(1, _('--all requires --run')) + usage(1, C_('--all requires --run')) # The default for interact is 1 unless -r was given if interact is None: @@ -266,11 +266,11 @@ def main(): module = run[:i] callable = run[i+1:] if VERBOSE: - print >> sys.stderr, _('Importing %(module)s...') + print >> sys.stderr, C_('Importing %(module)s...') __import__(module) mod = sys.modules[module] if VERBOSE: - print >> sys.stderr, _('Running %(module)s.%(callable)s()...') + print >> sys.stderr, C_('Running %(module)s.%(callable)s()...') func = getattr(mod, callable) if all: @@ -291,7 +291,7 @@ def main(): namespace = globals().copy() namespace.update(locals()) if dolist: - ban = _("The variable `m' is the %(listname)s MailList instance") + ban = C_("The variable `m' is the %(listname)s MailList instance") else: ban = None code.InteractiveConsole(namespace).interact(ban) diff -up mailman-2.1.12/Mailman/i18n.py.lctype mailman-2.1.12/Mailman/i18n.py --- mailman-2.1.12/Mailman/i18n.py.lctype 2009-03-10 13:14:46.000000000 +0100 +++ mailman-2.1.12/Mailman/i18n.py 2009-03-10 13:18:10.000000000 +0100 @@ -15,6 +15,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. +import locale import sys import time import gettext @@ -26,6 +27,16 @@ from Mailman.SafeDict import SafeDict _translation = None +def _get_ctype_charset(): + old = locale.setlocale(locale.LC_CTYPE, '') + charset = locale.nl_langinfo(locale.CODESET) + locale.setlocale(locale.LC_CTYPE, old) + return charset + +_ctype_charset = _get_ctype_charset() + + + def set_language(language=None): global _translation @@ -54,7 +65,7 @@ if _translation is None: -def _(s): +def _(s, frame = 1): if s == '': return s assert s @@ -70,7 +81,7 @@ def _(s): # original string is 1) locals dictionary, 2) globals dictionary. # # First, get the frame of the caller - frame = sys._getframe(1) + frame = sys._getframe(frame) # A `safe' dictionary is used so we won't get an exception if there's a # missing key in the dictionary. dict = SafeDict(frame.f_globals.copy()) @@ -88,6 +99,21 @@ def _(s): if isinstance(v, UnicodeType): dict[k] = v.encode(charset, 'replace') return tns % dict + + +def tolocale(s): + global _ctype_charset + if isinstance(s, UnicodeType): + return s + source = _translation.charset () + if not source: + return s + return unicode(s, source, 'replace').encode(_ctype_charset, 'replace') + +def C_(s): + return tolocale(_(s, 2)) + + diff -up mailman-2.1.12/Mailman/MTA/Postfix.py.lctype mailman-2.1.12/Mailman/MTA/Postfix.py --- mailman-2.1.12/Mailman/MTA/Postfix.py.lctype 2009-03-10 13:13:45.000000000 +0100 +++ mailman-2.1.12/Mailman/MTA/Postfix.py 2009-03-10 13:14:16.000000000 +0100 @@ -27,7 +27,7 @@ from stat import * from Mailman import mm_cfg from Mailman import Utils from Mailman import LockFile -from Mailman.i18n import _ +from Mailman.i18n import C_ from Mailman.MTA.Utils import makealiases from Mailman.Logging.Syslog import syslog @@ -308,7 +308,7 @@ def checkperms(state): targetmode = S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP for file in ALIASFILE, VIRTFILE: if state.VERBOSE: - print _('checking permissions on %(file)s') + print C_('checking permissions on %(file)s') stat = None try: stat = os.stat(file) @@ -318,9 +318,9 @@ def checkperms(state): if stat and (stat[ST_MODE] & targetmode) <> targetmode: state.ERRORS += 1 octmode = oct(stat[ST_MODE]) - print _('%(file)s permissions must be 066x (got %(octmode)s)'), + print C_('%(file)s permissions must be 066x (got %(octmode)s)'), if state.FIX: - print _('(fixing)') + print C_('(fixing)') os.chmod(file, stat[ST_MODE] | targetmode) else: print @@ -336,7 +336,7 @@ def checkperms(state): raise continue if state.VERBOSE: - print _('checking ownership of %(dbfile)s') + print C_('checking ownership of %(dbfile)s') user = mm_cfg.MAILMAN_USER ownerok = stat[ST_UID] == pwd.getpwnam(user)[2] if not ownerok: @@ -344,10 +344,10 @@ def checkperms(state): owner = pwd.getpwuid(stat[ST_UID])[0] except KeyError: owner = 'uid %d' % stat[ST_UID] - print _('%(dbfile)s owned by %(owner)s (must be owned by %(user)s'), + print C_('%(dbfile)s owned by %(owner)s (must be owned by %(user)s'), state.ERRORS += 1 if state.FIX: - print _('(fixing)') + print C_('(fixing)') uid = pwd.getpwnam(user)[2] gid = grp.getgrnam(mm_cfg.MAILMAN_GROUP)[2] os.chown(dbfile, uid, gid) mailman-2.1.12-multimail.patch: --- NEW FILE mailman-2.1.12-multimail.patch --- --- mailman-2.1.7/configure.in.multimail 2005-08-27 03:40:15.000000000 +0200 +++ mailman-2.1.7/configure.in 2006-01-10 10:53:14.000000000 +0100 @@ -208,26 +208,101 @@ fi # new macro for finding group names -AC_DEFUN([MM_FIND_GROUP_NAME], [ +# returns a comma separated list of quoted group names +# the list is returned in the same order as specified with any duplicates removed +# the filter flag must be "yes" or "no", e.g. this is permcheck +# "no" ==> none existing groups are not filtered out +# "yes" ==> only those groups that are in the group database are included +# in the list +AC_DEFUN(MM_FIND_GROUP_LIST, [ # $1 == variable name -# $2 == user id to check for +# $2 == white space separated list of groups to check, +# list may contain mix of id's and names +# $3 == filter, if == 'yes' then remove any non-existing groups AC_SUBST($1) changequote(,) if test -z "$$1" then cat > conftest.py < conftest.py < conftest.py <gr_name) == 0) break; + } + + if (i >= numgroups) { + char *groupset = NULL; + size_t size = 0; + + for (i = 0; i < numgroups; i++) { + size += strlen(parentgroups[i]) + 2; + } + + groupset = malloc(size); + + if (groupset) { + groupset[0] = 0; + for (i = 0; i < numgroups; i++) { + strcat(groupset, parentgroups[i]); + if (i < numgroups-1) strcat(groupset, ", "); + } + } - if (strcmp(parentgroup, mygroup->gr_name)) fatal(ident, GROUP_MISMATCH, - "Group mismatch error. Mailman expected the %s\n" - "wrapper script to be executed as group \"%s\", but\n" - "the system's %s server executed the %s script as\n" - "group \"%s\". Try tweaking the %s server to run the\n" - "script as group \"%s\", or re-run configure, \n" - "providing the command line option `%s=%s'.", - wrapper, parentgroup, server, wrapper, mygroup->gr_name, - server, parentgroup, option, mygroup->gr_name); + "Group mismatch error. Mailman expected the %s wrapper script to be\n" + "executed as one of the following groups:\n" + "[%s],\n" + "but the system's %s server executed the %s script as group: \"%s\".\n" + "Try tweaking the %s server to run the script as one of these groups:\n" + "[%s],\n" + "or re-run configure providing the command line option:\n" + "'%s=%s'.", + wrapper, groupset, server, wrapper, mygroup->gr_name, + server, groupset, option, mygroup->gr_name); + } } --- mailman-2.1.7/src/mail-wrapper.c.multimail 2005-08-27 03:40:17.000000000 +0200 +++ mailman-2.1.7/src/mail-wrapper.c 2006-01-10 10:53:14.000000000 +0100 @@ -23,9 +23,9 @@ /* Group name that your mail programs run as. See your mail server's * documentation for details. */ -#define LEGAL_PARENT_GROUP MAIL_GROUP +#define LEGAL_PARENT_GROUPS MAIL_GROUP -const char* parentgroup = LEGAL_PARENT_GROUP; +const char* parentgroups[] = {LEGAL_PARENT_GROUPS}; const char* logident = "Mailman mail-wrapper"; @@ -74,7 +74,7 @@ fatal(logident, MAIL_ILLEGAL_COMMAND, "Illegal command: %s", argv[1]); - check_caller(logident, parentgroup); + check_caller(logident, parentgroups, sizeof(parentgroups) / sizeof(parentgroups[0])); /* If we got here, everything must be OK */ status = run_script(argv[1], argc, argv, env); Index: mailman.spec =================================================================== RCS file: /cvs/extras/rpms/mailman/devel/mailman.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- mailman.spec 25 Feb 2009 22:57:07 -0000 1.77 +++ mailman.spec 11 Mar 2009 12:33:29 -0000 1.78 @@ -1,7 +1,7 @@ Summary: Mailing list manager with built in Web access Name: mailman -Version: 2.1.11 -Release: 7%{?dist} +Version: 2.1.12 +Release: 1%{?dist} Epoch: 3 Group: Applications/Internet #Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz @@ -14,21 +14,22 @@ Source7: mailman-migrate-fhs Source8: mailman-update-cfg -Patch1: mailman-2.1-multimail.patch +Patch1: mailman-2.1.12-multimail.patch Patch2: mailman-2.1-build.patch Patch3: mailman-2.1-mailmanctl-status.patch Patch4: mailman-2.1.11-cron.patch Patch5: mailman-2.1.10-FHS.patch Patch6: mailman-python-compile.patch Patch7: mailman-2.1.10-archive-reply.patch -Patch8: mailman-2.1.11-lctype.patch +#Patch8: mailman-2.1.11-lctype.patch Patch9: mailman-2.1.9-ctypo-new.patch Patch10: mailman-2.1.10-ctypefix.patch Patch11: mailman-2.1.9-header-folding.patch Patch12: mailman-2.1.9-selinux.patch Patch13: mailman-2.1.9-unicode.patch Patch14: mailman-2.1.11-fhsinit.patch -Patch15: mailman-2.1.11-footer.patch +Patch15: mailman-2.1.12-lctype.patch +#Patch15: mailman-2.1.11-footer.patch License: GPLv2+ URL: http://www.list.org/ @@ -94,7 +95,7 @@ %prep #FIXME -- This is a temporary solution -%define _default_patch_fuzz 2 +%define _default_patch_fuzz 3 %setup -q %patch1 -p1 -b .multimail @@ -104,14 +105,15 @@ %patch5 -p1 -b .FHS %patch6 -p1 -b .python-compile %patch7 -p1 -b .archive-in-reply-to -%patch8 -p1 -b .lctype +#%%patch8 -p1 -b .lctype %patch9 -p1 -b .ctypo %patch10 -p1 -b .ctypefix %patch11 -p0 -b .header %patch12 -p1 -b .selinux %patch13 -p1 -b .unicode %patch14 -p1 -b .fhsinit -%patch15 -p1 -b .footer +%patch15 -p1 -b .lctype +#%%patch15 -p1 -b .footer #cp $RPM_SOURCE_DIR/mailman.INSTALL.REDHAT.in INSTALL.REDHAT.in cp %{SOURCE5} INSTALL.REDHAT.in @@ -362,6 +364,9 @@ %attr(0755,root,root) %{_bindir}/mailman-update-cfg %changelog +* Wed Mar 11 2009 Daniel Novotny 3:2.1.12-1 +- upgrade to 2.1.12, drop upstreamed patches, rebase other patches + * Wed Feb 25 2009 Fedora Release Engineering - 3:2.1.11-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rhughes at fedoraproject.org Wed Mar 11 12:39:15 2009 From: rhughes at fedoraproject.org (Richard Hughes) Date: Wed, 11 Mar 2009 12:39:15 +0000 (UTC) Subject: rpms/gnome-packagekit/devel gnome-packagekit.spec,1.76,1.77 Message-ID: <20090311123916.0FE5670128@cvs1.fedora.phx.redhat.com> Author: rhughes Update of /cvs/pkgs/rpms/gnome-packagekit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14606 Modified Files: gnome-packagekit.spec Log Message: * Wed Mar 11 2009 Richard Hughes - 0.4.5-3 - Put gpk-update-viewer2 into the main package, not extras - Fixes #489677 Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- gnome-packagekit.spec 9 Mar 2009 17:28:15 -0000 1.76 +++ gnome-packagekit.spec 11 Mar 2009 12:38:45 -0000 1.77 @@ -6,7 +6,7 @@ Summary: Session applications to manage packages Name: gnome-packagekit Version: 0.4.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.packagekit.org @@ -172,6 +172,7 @@ %{_bindir}/gpk-repo %{_bindir}/gpk-update-icon %{_bindir}/gpk-update-viewer +%{_bindir}/gpk-update-viewer2 %{_bindir}/system-install-packages %dir %{_datadir}/gnome-packagekit %{_datadir}/gnome-packagekit/gpk-application.glade @@ -183,6 +184,7 @@ %{_datadir}/gnome-packagekit/gpk-log.glade %{_datadir}/gnome-packagekit/gpk-repo.glade %{_datadir}/gnome-packagekit/gpk-signature.glade +%{_datadir}/gnome-packagekit/gpk-update-viewer2.glade %dir %{_datadir}/gnome-packagekit/icons %dir %{_datadir}/gnome-packagekit/icons/hicolor %dir %{_datadir}/gnome-packagekit/icons/hicolor/* @@ -210,13 +212,15 @@ %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/gpk-backend-status %{_bindir}/gpk-service-pack -%{_bindir}/gpk-update-viewer2 %{_datadir}/gnome-packagekit/gpk-service-pack.glade %{_datadir}/gnome-packagekit/gpk-backend-status.glade -%{_datadir}/gnome-packagekit/gpk-update-viewer2.glade %{_datadir}/applications/gpk-service-pack.desktop %changelog +* Wed Mar 11 2009 Richard Hughes - 0.4.5-3 +- Put gpk-update-viewer2 into the main package, not extras +- Fixes #489677 + * Mon Mar 09 2009 Richard Hughes - 0.4.5-2 - Require PackageKit 0.4.5 otherwise the new update viewer breaks From dnovotny at fedoraproject.org Wed Mar 11 12:41:30 2009 From: dnovotny at fedoraproject.org (Daniel Novotny) Date: Wed, 11 Mar 2009 12:41:30 +0000 (UTC) Subject: rpms/mailman/devel .cvsignore,1.18,1.19 sources,1.18,1.19 Message-ID: <20090311124130.62BAA70128@cvs1.fedora.phx.redhat.com> Author: dnovotny Update of /cvs/extras/rpms/mailman/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15002 Modified Files: .cvsignore sources Log Message: new tarball Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mailman/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 23 Jul 2008 08:40:04 -0000 1.18 +++ .cvsignore 11 Mar 2009 12:40:59 -0000 1.19 @@ -1 +1 @@ -mailman-2.1.11.tgz +mailman-2.1.12.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mailman/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 23 Jul 2008 08:40:04 -0000 1.18 +++ sources 11 Mar 2009 12:40:59 -0000 1.19 @@ -1 +1 @@ -d9fd89f54c4743dbcb3b3eec8c6146d6 mailman-2.1.11.tgz +d565a6d2d0ec6d2dd6936a81e1c1ca86 mailman-2.1.12.tgz From ovasik at fedoraproject.org Wed Mar 11 12:56:25 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Wed, 11 Mar 2009 12:56:25 +0000 (UTC) Subject: rpms/inn/devel inn.spec,1.59,1.60 Message-ID: <20090311125625.2D41270132@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/inn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17285 Modified Files: inn.spec Log Message: no strict aliasing, remove pyo/.pyc filters files from list Index: inn.spec =================================================================== RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- inn.spec 11 Mar 2009 11:10:20 -0000 1.59 +++ inn.spec 11 Mar 2009 12:55:54 -0000 1.60 @@ -101,9 +101,9 @@ export DEFINE_INN_FLAGS="-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -DHAVE_ET_COM_ERR_H" %ifarch s390 s390x sparc sparcv9 sparc64 -export CFLAGS="$RPM_OPT_FLAGS $DEFINE_INN_FLAGS -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" +export CFLAGS="$RPM_OPT_FLAGS $DEFINE_INN_FLAGS -fno-strict-aliasing -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" %else -export CFLAGS="$RPM_OPT_FLAGS $DEFINE_INN_FLAGS -fpic -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" +export CFLAGS="$RPM_OPT_FLAGS $DEFINE_INN_FLAGS -fno-strict-aliasing -fpic -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" %endif with_tmp_path=/var/lib/news/tmp ./configure \ @@ -206,8 +206,8 @@ sed 's|/usr/lib/news/bin/inndstart$|%attr(4550,root,news) /usr/lib/news/bin/inndstart|' | \ sed 's|/usr/lib/news/bin/startinnfeed$|%attr(4550,root,news) /usr/lib/news/bin/startinnfeed|' | \ sed 's|/usr/lib/news/bin/rnews$|%attr(4550,uucp,news) /usr/lib/news/bin/rnews|' > files.list - echo "/usr/lib/news/bin/filter/*.pyc" >> files.list - echo "/usr/lib/news/bin/filter/*.pyo" >> files.list +# echo "/usr/lib/news/bin/filter/*.pyc" >> files.list +# echo "/usr/lib/news/bin/filter/*.pyo" >> files.list (echo "%defattr(-,news,news)" ; grep -v inews files.list | \ egrep -v "\.(h|so|a|la)$" | \ grep -v "news/inn.conf" | \ @@ -356,6 +356,7 @@ %changelog * Wed Mar 11 2009 Ondrej Vasik - 2.4.6-1 - new bugfix upstream release 2.4.6 +- no strict aliasing, remove pyo/.pyc filters files from list * Wed Feb 25 2009 Ondrej Vasik - 2.4.5-10 - mark /usr/lib/news/lib/innshellvars* as noreplace, From peter at fedoraproject.org Wed Mar 11 12:59:41 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Wed, 11 Mar 2009 12:59:41 +0000 (UTC) Subject: rpms/flashrom/devel .cvsignore, 1.12, 1.13 flashrom--Makefile_cleanup.diff, 1.5, 1.6 flashrom.spec, 1.16, 1.17 import.log, 1.4, 1.5 sources, 1.12, 1.13 Message-ID: <20090311125942.097CE70128@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/flashrom/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18558/devel Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec import.log sources Log Message: svn ver. 3984 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 8 Jan 2009 10:26:14 -0000 1.12 +++ .cvsignore 11 Mar 2009 12:59:11 -0000 1.13 @@ -1 +1 @@ -flashrom-3852.tar.bz2 +flashrom-3984.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/devel/flashrom--Makefile_cleanup.diff,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- flashrom--Makefile_cleanup.diff 8 Jan 2009 10:26:15 -0000 1.5 +++ flashrom--Makefile_cleanup.diff 11 Mar 2009 12:59:11 -0000 1.6 @@ -1,6 +1,6 @@ ---- Makefile.Makefile_cleanup 2008-07-02 07:03:58.000000000 +0400 -+++ Makefile 2008-07-07 21:31:20.000000000 +0400 -@@ -9,15 +9,15 @@ +--- Makefile.orig 2009-01-26 09:42:02.000000000 +0300 ++++ Makefile 2009-03-11 15:46:46.227346626 +0300 +@@ -9,14 +9,14 @@ CC = gcc STRIP = strip INSTALL = /usr/bin/install @@ -9,17 +9,16 @@ #CFLAGS = -O2 -g -Wall -Werror -CFLAGS = -Os -Wall -Werror +#CFLAGS = -Os -Wall -Werror + LDFLAGS = + OS_ARCH = $(shell uname) - ifeq ($(OS_ARCH), SunOS) - LDFLAGS = -lpci -lz - else - LDFLAGS = -lpci -lz + ifneq ($(OS_ARCH), SunOS) -STRIP_ARGS = -s +#STRIP_ARGS = -s endif - ifeq ($(OS_ARCH), FreeBSD) + ifeq ($(OS_ARCH), Darwin) CFLAGS += -I/usr/local/include -@@ -35,12 +35,11 @@ +@@ -40,12 +40,11 @@ # Set the flashrom version string from the highest revision number # of the checked out flashrom files. Index: flashrom.spec =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/devel/flashrom.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- flashrom.spec 24 Feb 2009 17:25:11 -0000 1.16 +++ flashrom.spec 11 Mar 2009 12:59:11 -0000 1.17 @@ -1,8 +1,8 @@ -%define svnver 3852 +%define svnver 3984 Summary: Simple program for reading/writing BIOS chips content Name: flashrom Version: 0 -Release: 0.16.20090112svn%{svnver}%{?dist} +Release: 0.17.20090311svn%{svnver}%{?dist} License: GPLv2 Group: Applications/System # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom @@ -45,6 +45,12 @@ %{_mandir}/man8/%{name}.* %changelog +* Wed Mar 11 2009 Peter Lemenkov 0-0.17.20090311svn3984 +- MSI MS-7046 board enable +- Intel Desktop Board D201GLY +- Add Am29F080B Am29LV081B SST39VF080 support (untested) +- Board enable for GIGABYTE GA-MA78G-DS3H + * Tue Feb 24 2009 Fedora Release Engineering - 0-0.16.20090112svn3852 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/devel/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Jan 2009 10:26:15 -0000 1.4 +++ import.log 11 Mar 2009 12:59:11 -0000 1.5 @@ -2,3 +2,4 @@ flashrom-0-0_12_20080928svn3602_fc9:HEAD:flashrom-0-0.12.20080928svn3602.fc9.src.rpm:1222549235 flashrom-0-0_14_20081103svn3723_fc9:HEAD:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225701590 flashrom-0-0_15_20090112svn3852_fc10:HEAD:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231410331 +flashrom-0-0_17_20090311svn3984_fc10:HEAD:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776289 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 8 Jan 2009 10:26:15 -0000 1.12 +++ sources 11 Mar 2009 12:59:11 -0000 1.13 @@ -1 +1 @@ -4253d2a2a70ec3335c4b2a2bf40eefb8 flashrom-3852.tar.bz2 +78817263019763c4d08c95f2d4542ef7 flashrom-3984.tar.bz2 From peter at fedoraproject.org Wed Mar 11 13:02:25 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Wed, 11 Mar 2009 13:02:25 +0000 (UTC) Subject: rpms/flashrom/F-10 .cvsignore, 1.12, 1.13 flashrom--Makefile_cleanup.diff, 1.5, 1.6 flashrom.spec, 1.15, 1.16 import.log, 1.4, 1.5 sources, 1.12, 1.13 Message-ID: <20090311130225.D9C8E70128@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/flashrom/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19119/F-10 Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec import.log sources Log Message: svn ver. 3984 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-10/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 8 Jan 2009 16:23:23 -0000 1.12 +++ .cvsignore 11 Mar 2009 13:01:55 -0000 1.13 @@ -1 +1 @@ -flashrom-3852.tar.bz2 +flashrom-3984.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-10/flashrom--Makefile_cleanup.diff,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- flashrom--Makefile_cleanup.diff 8 Jan 2009 16:23:23 -0000 1.5 +++ flashrom--Makefile_cleanup.diff 11 Mar 2009 13:01:55 -0000 1.6 @@ -1,6 +1,6 @@ ---- Makefile.Makefile_cleanup 2008-07-02 07:03:58.000000000 +0400 -+++ Makefile 2008-07-07 21:31:20.000000000 +0400 -@@ -9,15 +9,15 @@ +--- Makefile.orig 2009-01-26 09:42:02.000000000 +0300 ++++ Makefile 2009-03-11 15:46:46.227346626 +0300 +@@ -9,14 +9,14 @@ CC = gcc STRIP = strip INSTALL = /usr/bin/install @@ -9,17 +9,16 @@ #CFLAGS = -O2 -g -Wall -Werror -CFLAGS = -Os -Wall -Werror +#CFLAGS = -Os -Wall -Werror + LDFLAGS = + OS_ARCH = $(shell uname) - ifeq ($(OS_ARCH), SunOS) - LDFLAGS = -lpci -lz - else - LDFLAGS = -lpci -lz + ifneq ($(OS_ARCH), SunOS) -STRIP_ARGS = -s +#STRIP_ARGS = -s endif - ifeq ($(OS_ARCH), FreeBSD) + ifeq ($(OS_ARCH), Darwin) CFLAGS += -I/usr/local/include -@@ -35,12 +35,11 @@ +@@ -40,12 +40,11 @@ # Set the flashrom version string from the highest revision number # of the checked out flashrom files. Index: flashrom.spec =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-10/flashrom.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- flashrom.spec 8 Jan 2009 16:23:23 -0000 1.15 +++ flashrom.spec 11 Mar 2009 13:01:55 -0000 1.16 @@ -1,8 +1,8 @@ -%define svnver 3852 +%define svnver 3984 Summary: Simple program for reading/writing BIOS chips content Name: flashrom Version: 0 -Release: 0.15.20090112svn%{svnver}%{?dist} +Release: 0.17.20090311svn%{svnver}%{?dist} License: GPLv2 Group: Applications/System # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom @@ -45,6 +45,15 @@ %{_mandir}/man8/%{name}.* %changelog +* Wed Mar 11 2009 Peter Lemenkov 0-0.17.20090311svn3984 +- MSI MS-7046 board enable +- Intel Desktop Board D201GLY +- Add Am29F080B Am29LV081B SST39VF080 support (untested) +- Board enable for GIGABYTE GA-MA78G-DS3H + +* Tue Feb 24 2009 Fedora Release Engineering - 0-0.16.20090112svn3852 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jan 8 2009 Peter Lemenkov 0-0.15.20090112svn3852 - Changed license to GPLv2 - SST49LF020 support Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-10/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Jan 2009 16:23:23 -0000 1.4 +++ import.log 11 Mar 2009 13:01:55 -0000 1.5 @@ -2,3 +2,4 @@ flashrom-0-0_12_20080928svn3602_fc9:HEAD:flashrom-0-0.12.20080928svn3602.fc9.src.rpm:1222549235 flashrom-0-0_14_20081103svn3723_fc9:HEAD:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225701590 flashrom-0-0_15_20090112svn3852_fc10:F-10:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231431767 +flashrom-0-0_17_20090311svn3984_fc10:F-10:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776491 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-10/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 8 Jan 2009 16:23:23 -0000 1.12 +++ sources 11 Mar 2009 13:01:55 -0000 1.13 @@ -1 +1 @@ -4253d2a2a70ec3335c4b2a2bf40eefb8 flashrom-3852.tar.bz2 +78817263019763c4d08c95f2d4542ef7 flashrom-3984.tar.bz2 From peter at fedoraproject.org Wed Mar 11 13:04:27 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Wed, 11 Mar 2009 13:04:27 +0000 (UTC) Subject: rpms/flashrom/F-9 .cvsignore, 1.12, 1.13 flashrom--Makefile_cleanup.diff, 1.5, 1.6 flashrom.spec, 1.14, 1.15 import.log, 1.4, 1.5 sources, 1.12, 1.13 Message-ID: <20090311130427.3AEEB70128@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/flashrom/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19553/F-9 Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec import.log sources Log Message: svn ver. 3984 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-9/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 8 Jan 2009 14:39:28 -0000 1.12 +++ .cvsignore 11 Mar 2009 13:03:56 -0000 1.13 @@ -1 +1 @@ -flashrom-3852.tar.bz2 +flashrom-3984.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-9/flashrom--Makefile_cleanup.diff,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- flashrom--Makefile_cleanup.diff 8 Jan 2009 14:39:28 -0000 1.5 +++ flashrom--Makefile_cleanup.diff 11 Mar 2009 13:03:56 -0000 1.6 @@ -1,6 +1,6 @@ ---- Makefile.Makefile_cleanup 2008-07-02 07:03:58.000000000 +0400 -+++ Makefile 2008-07-07 21:31:20.000000000 +0400 -@@ -9,15 +9,15 @@ +--- Makefile.orig 2009-01-26 09:42:02.000000000 +0300 ++++ Makefile 2009-03-11 15:46:46.227346626 +0300 +@@ -9,14 +9,14 @@ CC = gcc STRIP = strip INSTALL = /usr/bin/install @@ -9,17 +9,16 @@ #CFLAGS = -O2 -g -Wall -Werror -CFLAGS = -Os -Wall -Werror +#CFLAGS = -Os -Wall -Werror + LDFLAGS = + OS_ARCH = $(shell uname) - ifeq ($(OS_ARCH), SunOS) - LDFLAGS = -lpci -lz - else - LDFLAGS = -lpci -lz + ifneq ($(OS_ARCH), SunOS) -STRIP_ARGS = -s +#STRIP_ARGS = -s endif - ifeq ($(OS_ARCH), FreeBSD) + ifeq ($(OS_ARCH), Darwin) CFLAGS += -I/usr/local/include -@@ -35,12 +35,11 @@ +@@ -40,12 +40,11 @@ # Set the flashrom version string from the highest revision number # of the checked out flashrom files. Index: flashrom.spec =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-9/flashrom.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- flashrom.spec 8 Jan 2009 14:39:28 -0000 1.14 +++ flashrom.spec 11 Mar 2009 13:03:56 -0000 1.15 @@ -1,8 +1,8 @@ -%define svnver 3852 +%define svnver 3984 Summary: Simple program for reading/writing BIOS chips content Name: flashrom Version: 0 -Release: 0.15.20090112svn%{svnver}%{?dist} +Release: 0.17.20090311svn%{svnver}%{?dist} License: GPLv2 Group: Applications/System # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom @@ -45,6 +45,15 @@ %{_mandir}/man8/%{name}.* %changelog +* Wed Mar 11 2009 Peter Lemenkov 0-0.17.20090311svn3984 +- MSI MS-7046 board enable +- Intel Desktop Board D201GLY +- Add Am29F080B Am29LV081B SST39VF080 support (untested) +- Board enable for GIGABYTE GA-MA78G-DS3H + +* Tue Feb 24 2009 Fedora Release Engineering - 0-0.16.20090112svn3852 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jan 8 2009 Peter Lemenkov 0-0.15.20090112svn3852 - Changed license to GPLv2 - SST49LF020 support Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-9/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Jan 2009 14:39:28 -0000 1.4 +++ import.log 11 Mar 2009 13:03:56 -0000 1.5 @@ -2,3 +2,4 @@ flashrom-0-0_12_20080928svn3602_fc9:F-9:flashrom-0-0.12.20080928svn3602.fc9.src.rpm:1222549672 flashrom-0-0_14_20081103svn3723_fc9:F-9:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225701693 flashrom-0-0_15_20090112svn3852_fc10:F-9:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231412366 +flashrom-0-0_17_20090311svn3984_fc10:F-9:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776575 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/F-9/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 8 Jan 2009 14:39:28 -0000 1.12 +++ sources 11 Mar 2009 13:03:56 -0000 1.13 @@ -1 +1 @@ -4253d2a2a70ec3335c4b2a2bf40eefb8 flashrom-3852.tar.bz2 +78817263019763c4d08c95f2d4542ef7 flashrom-3984.tar.bz2 From peter at fedoraproject.org Wed Mar 11 13:06:10 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Wed, 11 Mar 2009 13:06:10 +0000 (UTC) Subject: rpms/flashrom/EL-5 .cvsignore, 1.12, 1.13 flashrom--Makefile_cleanup.diff, 1.5, 1.6 flashrom.spec, 1.14, 1.15 import.log, 1.4, 1.5 sources, 1.12, 1.13 Message-ID: <20090311130610.CC2AA70128@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/flashrom/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19994/EL-5 Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec import.log sources Log Message: svn ver. 3984 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-5/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 8 Jan 2009 15:02:32 -0000 1.12 +++ .cvsignore 11 Mar 2009 13:05:40 -0000 1.13 @@ -1 +1 @@ -flashrom-3852.tar.bz2 +flashrom-3984.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-5/flashrom--Makefile_cleanup.diff,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- flashrom--Makefile_cleanup.diff 8 Jan 2009 15:02:32 -0000 1.5 +++ flashrom--Makefile_cleanup.diff 11 Mar 2009 13:05:40 -0000 1.6 @@ -1,6 +1,6 @@ ---- Makefile.Makefile_cleanup 2008-07-02 07:03:58.000000000 +0400 -+++ Makefile 2008-07-07 21:31:20.000000000 +0400 -@@ -9,15 +9,15 @@ +--- Makefile.orig 2009-01-26 09:42:02.000000000 +0300 ++++ Makefile 2009-03-11 15:46:46.227346626 +0300 +@@ -9,14 +9,14 @@ CC = gcc STRIP = strip INSTALL = /usr/bin/install @@ -9,17 +9,16 @@ #CFLAGS = -O2 -g -Wall -Werror -CFLAGS = -Os -Wall -Werror +#CFLAGS = -Os -Wall -Werror + LDFLAGS = + OS_ARCH = $(shell uname) - ifeq ($(OS_ARCH), SunOS) - LDFLAGS = -lpci -lz - else - LDFLAGS = -lpci -lz + ifneq ($(OS_ARCH), SunOS) -STRIP_ARGS = -s +#STRIP_ARGS = -s endif - ifeq ($(OS_ARCH), FreeBSD) + ifeq ($(OS_ARCH), Darwin) CFLAGS += -I/usr/local/include -@@ -35,12 +35,11 @@ +@@ -40,12 +40,11 @@ # Set the flashrom version string from the highest revision number # of the checked out flashrom files. Index: flashrom.spec =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-5/flashrom.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- flashrom.spec 8 Jan 2009 15:02:32 -0000 1.14 +++ flashrom.spec 11 Mar 2009 13:05:40 -0000 1.15 @@ -1,8 +1,8 @@ -%define svnver 3852 +%define svnver 3984 Summary: Simple program for reading/writing BIOS chips content Name: flashrom Version: 0 -Release: 0.15.20090112svn%{svnver}%{?dist} +Release: 0.17.20090311svn%{svnver}%{?dist} License: GPLv2 Group: Applications/System # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom @@ -45,6 +45,15 @@ %{_mandir}/man8/%{name}.* %changelog +* Wed Mar 11 2009 Peter Lemenkov 0-0.17.20090311svn3984 +- MSI MS-7046 board enable +- Intel Desktop Board D201GLY +- Add Am29F080B Am29LV081B SST39VF080 support (untested) +- Board enable for GIGABYTE GA-MA78G-DS3H + +* Tue Feb 24 2009 Fedora Release Engineering - 0-0.16.20090112svn3852 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jan 8 2009 Peter Lemenkov 0-0.15.20090112svn3852 - Changed license to GPLv2 - SST49LF020 support Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-5/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Jan 2009 15:02:32 -0000 1.4 +++ import.log 11 Mar 2009 13:05:40 -0000 1.5 @@ -2,3 +2,4 @@ flashrom-0-0_12_20080928svn3602_fc9:EL-5:flashrom-0-0.12.20080928svn3602.fc9.src.rpm:1222549972 flashrom-0-0_14_20081103svn3723_fc9:EL-5:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225701973 flashrom-0-0_15_20090112svn3852_fc10:EL-5:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231426886 +flashrom-0-0_17_20090311svn3984_fc10:EL-5:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776717 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 8 Jan 2009 15:02:32 -0000 1.12 +++ sources 11 Mar 2009 13:05:40 -0000 1.13 @@ -1 +1 @@ -4253d2a2a70ec3335c4b2a2bf40eefb8 flashrom-3852.tar.bz2 +78817263019763c4d08c95f2d4542ef7 flashrom-3984.tar.bz2 From peter at fedoraproject.org Wed Mar 11 13:07:44 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Wed, 11 Mar 2009 13:07:44 +0000 (UTC) Subject: rpms/flashrom/EL-4 .cvsignore, 1.12, 1.13 flashrom--Makefile_cleanup.diff, 1.5, 1.6 flashrom.spec, 1.14, 1.15 import.log, 1.4, 1.5 sources, 1.12, 1.13 Message-ID: <20090311130744.D8A7B70128@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/flashrom/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20365/EL-4 Modified Files: .cvsignore flashrom--Makefile_cleanup.diff flashrom.spec import.log sources Log Message: svn ver. 3984 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-4/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 8 Jan 2009 16:18:49 -0000 1.12 +++ .cvsignore 11 Mar 2009 13:07:14 -0000 1.13 @@ -1 +1 @@ -flashrom-3852.tar.bz2 +flashrom-3984.tar.bz2 flashrom--Makefile_cleanup.diff: Index: flashrom--Makefile_cleanup.diff =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-4/flashrom--Makefile_cleanup.diff,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- flashrom--Makefile_cleanup.diff 8 Jan 2009 16:18:49 -0000 1.5 +++ flashrom--Makefile_cleanup.diff 11 Mar 2009 13:07:14 -0000 1.6 @@ -1,6 +1,6 @@ ---- Makefile.Makefile_cleanup 2008-07-02 07:03:58.000000000 +0400 -+++ Makefile 2008-07-07 21:31:20.000000000 +0400 -@@ -9,15 +9,15 @@ +--- Makefile.orig 2009-01-26 09:42:02.000000000 +0300 ++++ Makefile 2009-03-11 15:46:46.227346626 +0300 +@@ -9,14 +9,14 @@ CC = gcc STRIP = strip INSTALL = /usr/bin/install @@ -9,17 +9,16 @@ #CFLAGS = -O2 -g -Wall -Werror -CFLAGS = -Os -Wall -Werror +#CFLAGS = -Os -Wall -Werror + LDFLAGS = + OS_ARCH = $(shell uname) - ifeq ($(OS_ARCH), SunOS) - LDFLAGS = -lpci -lz - else - LDFLAGS = -lpci -lz + ifneq ($(OS_ARCH), SunOS) -STRIP_ARGS = -s +#STRIP_ARGS = -s endif - ifeq ($(OS_ARCH), FreeBSD) + ifeq ($(OS_ARCH), Darwin) CFLAGS += -I/usr/local/include -@@ -35,12 +35,11 @@ +@@ -40,12 +40,11 @@ # Set the flashrom version string from the highest revision number # of the checked out flashrom files. Index: flashrom.spec =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-4/flashrom.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- flashrom.spec 8 Jan 2009 16:18:49 -0000 1.14 +++ flashrom.spec 11 Mar 2009 13:07:14 -0000 1.15 @@ -1,8 +1,8 @@ -%define svnver 3852 +%define svnver 3984 Summary: Simple program for reading/writing BIOS chips content Name: flashrom Version: 0 -Release: 0.15.20090112svn%{svnver}%{?dist} +Release: 0.17.20090311svn%{svnver}%{?dist} License: GPLv2 Group: Applications/System # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom @@ -45,6 +45,15 @@ %{_mandir}/man8/%{name}.* %changelog +* Wed Mar 11 2009 Peter Lemenkov 0-0.17.20090311svn3984 +- MSI MS-7046 board enable +- Intel Desktop Board D201GLY +- Add Am29F080B Am29LV081B SST39VF080 support (untested) +- Board enable for GIGABYTE GA-MA78G-DS3H + +* Tue Feb 24 2009 Fedora Release Engineering - 0-0.16.20090112svn3852 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jan 8 2009 Peter Lemenkov 0-0.15.20090112svn3852 - Changed license to GPLv2 - SST49LF020 support Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-4/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Jan 2009 16:18:49 -0000 1.4 +++ import.log 11 Mar 2009 13:07:14 -0000 1.5 @@ -2,3 +2,4 @@ flashrom-0-0_12_20080928svn3602_fc9:EL-4:flashrom-0-0.12.20080928svn3602.fc9.src.rpm:1222550130 flashrom-0-0_14_20081103svn3723_fc9:EL-4:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225702185 flashrom-0-0_15_20090112svn3852_fc10:EL-4:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231431453 +flashrom-0-0_17_20090311svn3984_fc10:EL-4:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776794 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/flashrom/EL-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 8 Jan 2009 16:18:49 -0000 1.12 +++ sources 11 Mar 2009 13:07:14 -0000 1.13 @@ -1 +1 @@ -4253d2a2a70ec3335c4b2a2bf40eefb8 flashrom-3852.tar.bz2 +78817263019763c4d08c95f2d4542ef7 flashrom-3984.tar.bz2 From mmaslano at fedoraproject.org Wed Mar 11 13:08:12 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Wed, 11 Mar 2009 13:08:12 +0000 (UTC) Subject: rpms/perl-Padre/devel .cvsignore,1.9,1.10 sources,1.9,1.10 Message-ID: <20090311130812.3A60A70128@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-Padre/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20419 Modified Files: .cvsignore sources Log Message: Forget upload second source. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Padre/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 6 Mar 2009 07:48:46 -0000 1.9 +++ .cvsignore 11 Mar 2009 13:07:41 -0000 1.10 @@ -1 +1,2 @@ Padre-0.28.tar.gz +Padre.desktop Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Padre/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 6 Mar 2009 07:48:46 -0000 1.9 +++ sources 11 Mar 2009 13:07:42 -0000 1.10 @@ -1 +1,2 @@ 6a0351313076c42bc6bbb020f61c757b Padre-0.28.tar.gz +e9457439b1f0c929ab3141197294e061 Padre.desktop From tbzatek at fedoraproject.org Wed Mar 11 13:15:30 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Wed, 11 Mar 2009 13:15:30 +0000 (UTC) Subject: rpms/gvfs/devel gvfs.spec,1.114,1.115 Message-ID: <20090311131530.7FE6870128@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21880 Modified Files: gvfs.spec Log Message: * Wed Mar 11 2009 Tomas Bzatek - 1.1.8-2 - Fix 100% cpu usage when connecting to a ssh key and denying key access - Fix monitors leak Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- gvfs.spec 10 Mar 2009 13:04:47 -0000 1.114 +++ gvfs.spec 11 Mar 2009 13:15:00 -0000 1.115 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.1.8 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -40,6 +40,11 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=573826 Patch4: gvfs-1.1.7-gdu-computer-expose-devices.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=574754 +Patch5: gvfs-1.1.8-sftp-cpu-eating.patch + +# http://bugzilla.gnome.org/show_bug.cgi?id=563418 +Patch6: gvfs-1.1.8-monitor-leaks.patch %description The gvfs package provides backend implementations for the gio @@ -125,6 +130,8 @@ %patch2 -p0 -b .gdu %patch3 -p1 -b .gdu-volumes-typo %patch4 -p1 -b .computer-gdu +%patch5 -p0 -b .sftp-100-cpu +%patch6 -p0 -b .monitor-leaks %build @@ -268,6 +275,10 @@ %changelog +* Wed Mar 11 2009 Tomas Bzatek - 1.1.8-2 +- Fix 100% cpu usage when connecting to a ssh key and denying key access +- Fix monitors leak + * Tue Mar 10 2009 Tomas Bzatek - 1.1.8-1 - Update to 1.1.8 From tbzatek at fedoraproject.org Wed Mar 11 13:21:26 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Wed, 11 Mar 2009 13:21:26 +0000 (UTC) Subject: rpms/gvfs/devel gvfs-1.1.8-monitor-leaks.patch, NONE, 1.1 gvfs-1.1.8-sftp-cpu-eating.patch, NONE, 1.1 Message-ID: <20090311132126.B07F170128@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22908 Added Files: gvfs-1.1.8-monitor-leaks.patch gvfs-1.1.8-sftp-cpu-eating.patch Log Message: Push patches (damn, make local/prep should check if all referenced patches are in cvs) gvfs-1.1.8-monitor-leaks.patch: --- NEW FILE gvfs-1.1.8-monitor-leaks.patch --- Index: client/gdaemonfilemonitor.c =================================================================== --- client/gdaemonfilemonitor.c (revision 2316) +++ client/gdaemonfilemonitor.c (revision 2317) @@ -202,6 +202,9 @@ G_VFS_DBUS_MONITOR_INTERFACE, G_VFS_DBUS_MONITOR_OP_UNSUBSCRIBE); + _g_dbus_message_append_args (message, DBUS_TYPE_OBJECT_PATH, + &daemon_monitor->object_path, 0); + _g_vfs_daemon_call_async (message, NULL, NULL, NULL); gvfs-1.1.8-sftp-cpu-eating.patch: --- NEW FILE gvfs-1.1.8-sftp-cpu-eating.patch --- Index: daemon/gvfsbackendsftp.c =================================================================== --- daemon/gvfsbackendsftp.c (revision 2315) +++ daemon/gvfsbackendsftp.c (revision 2316) @@ -560,6 +560,15 @@ &bytes_read, NULL, error)) return NULL; + /* Make sure we handle ssh exiting early, e.g. if no further + authentication methods */ + if (bytes_read == 0) + { + g_set_error_literal (error, + G_IO_ERROR, G_IO_ERROR_FAILED, + _("ssh program unexpectedly exited")); + return NULL; + } len = GUINT32_FROM_BE (len); From davej at fedoraproject.org Wed Mar 11 13:44:37 2009 From: davej at fedoraproject.org (Dave Jones) Date: Wed, 11 Mar 2009 13:44:37 +0000 (UTC) Subject: rpms/kernel/devel patch-2.6.29-rc7-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.1030, 1.1031 kernel.spec, 1.1410, 1.1411 sources, 1.992, 1.993 upstream, 1.903, 1.904 patch-2.6.29-rc7-git3.bz2.sign, 1.1, NONE Message-ID: <20090311134437.4659570128@cvs1.fedora.phx.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26751 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.29-rc7-git4.bz2.sign Removed Files: patch-2.6.29-rc7-git3.bz2.sign Log Message: 2.6.29-rc7-git4 --- NEW FILE patch-2.6.29-rc7-git4.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBJtwGryGugalF9Dw4RArq7AJ44NmhGgDXn7Os/FBJCmWZpwbd/awCcDq72 tu7kV1w68ue+3WE9RkuyEk8= =n4eP -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.1030 retrieving revision 1.1031 diff -u -r1.1030 -r1.1031 --- .cvsignore 10 Mar 2009 16:21:23 -0000 1.1030 +++ .cvsignore 11 Mar 2009 13:44:06 -0000 1.1031 @@ -6,4 +6,4 @@ kernel-2.6.28 linux-2.6.28.tar.bz2 patch-2.6.29-rc7.bz2 -patch-2.6.29-rc7-git3.bz2 +patch-2.6.29-rc7-git4.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1410 retrieving revision 1.1411 diff -u -r1.1410 -r1.1411 --- kernel.spec 11 Mar 2009 04:08:49 -0000 1.1410 +++ kernel.spec 11 Mar 2009 13:44:06 -0000 1.1411 @@ -58,7 +58,7 @@ # The rc snapshot level %define rcrev 7 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1819,6 +1819,9 @@ # and build. %changelog +* Wed Mar 11 2009 Dave Jones +- 2.6.29-rc7-git4 + * Tue Mar 10 2009 Kyle McMartin 2.6.29-0.230.rc7.git3 - Add -git3 to sources... Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.992 retrieving revision 1.993 diff -u -r1.992 -r1.993 --- sources 11 Mar 2009 04:08:50 -0000 1.992 +++ sources 11 Mar 2009 13:44:06 -0000 1.993 @@ -1,3 +1,3 @@ d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2 9404c2ead603a80a3aad6361b5fc5413 patch-2.6.29-rc7.bz2 -4ed646718fc5684d63e6e9015b7d02a6 patch-2.6.29-rc7-git3.bz2 +b635aa5f1df1df5ecf8b20c9a56f6a20 patch-2.6.29-rc7-git4.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.903 retrieving revision 1.904 diff -u -r1.903 -r1.904 --- upstream 10 Mar 2009 16:21:25 -0000 1.903 +++ upstream 11 Mar 2009 13:44:06 -0000 1.904 @@ -1,3 +1,3 @@ linux-2.6.28.tar.bz2 patch-2.6.29-rc7.bz2 -patch-2.6.29-rc7-git3.bz2 +patch-2.6.29-rc7-git4.bz2 --- patch-2.6.29-rc7-git3.bz2.sign DELETED --- From ajax at fedoraproject.org Wed Mar 11 14:10:24 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Wed, 11 Mar 2009 14:10:24 +0000 (UTC) Subject: rpms/xorg-x11-xinit/devel xinitrc-common, 1.5, 1.6 xorg-x11-xinit.spec, 1.63, 1.64 Message-ID: <20090311141024.E09CF70128@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-xinit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31161 Modified Files: xinitrc-common xorg-x11-xinit.spec Log Message: * Wed Mar 11 2009 Adam Jackson 1.0.9-6 - xinitrc-common: Load /etc/X11/Xresources with -nocpp Index: xinitrc-common =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xinitrc-common,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xinitrc-common 25 Feb 2009 09:57:22 -0000 1.5 +++ xinitrc-common 11 Mar 2009 14:09:54 -0000 1.6 @@ -27,7 +27,7 @@ sysxkbmap=/etc/X11/Xkbmap # merge in defaults -[ -r "$sysresources" ] && xrdb -merge "$sysresources" +[ -r "$sysresources" ] && xrdb -nocpp -merge "$sysresources" [ -r "$userresources" ] && xrdb -merge "$userresources" # merge in keymaps Index: xorg-x11-xinit.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- xorg-x11-xinit.spec 25 Feb 2009 09:57:22 -0000 1.63 +++ xorg-x11-xinit.spec 11 Mar 2009 14:09:54 -0000 1.64 @@ -3,7 +3,7 @@ Summary: X.Org X11 X Window System xinit startup scripts Name: xorg-x11-%{pkgname} Version: 1.0.9 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org @@ -129,6 +129,9 @@ %{_datadir}/xsessions/xinit-compat.desktop %changelog +* Wed Mar 11 2009 Adam Jackson 1.0.9-6 +- xinitrc-common: Load /etc/X11/Xresources with -nocpp + * Wed Feb 25 2009 Adam Tkac 1.0.9-5 - run ck-xinit-session for all sessions where the xdg cookie isn't already set (#452156, patch from Patrice Dumas) From tbzatek at fedoraproject.org Wed Mar 11 14:26:08 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Wed, 11 Mar 2009 14:26:08 +0000 (UTC) Subject: rpms/gvfs/F-10 gvfs-1.1.8-sftp-dont-specify-user.patch, NONE, 1.1 gvfs-1.1.8-sftp-eating-cpu.patch, NONE, 1.1 gvfs-1.1.8-sftp-handle-keys.patch, NONE, 1.1 gvfs.spec, 1.97, 1.98 Message-ID: <20090311142608.4FD0A70128@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv747 Modified Files: gvfs.spec Added Files: gvfs-1.1.8-sftp-dont-specify-user.patch gvfs-1.1.8-sftp-eating-cpu.patch gvfs-1.1.8-sftp-handle-keys.patch Log Message: * Wed Mar 11 2009 Tomas Bzatek - 1.0.3-7 - SFTP: Don't specify user unless requested explicitly by the uri - SFTP: Don't ask for username when getting ssh key passphrase - SFTP: 100% cpu usage when connecting to a ssh key and denying key access gvfs-1.1.8-sftp-dont-specify-user.patch: --- NEW FILE gvfs-1.1.8-sftp-dont-specify-user.patch --- Index: daemon/gvfsbackendsftp.c =================================================================== --- daemon/gvfsbackendsftp.c (revision 2271) +++ daemon/gvfsbackendsftp.c (revision 2272) @@ -365,8 +365,11 @@ } - args[last_arg++] = g_strdup ("-l"); - args[last_arg++] = g_strdup (op_backend->user); + if (op_backend->user_specified) + { + args[last_arg++] = g_strdup ("-l"); + args[last_arg++] = g_strdup (op_backend->user); + } args[last_arg++] = g_strdup ("-s"); @@ -885,10 +888,14 @@ else password_in_keyring = TRUE; - if (new_user && strcmp (new_user, op_backend->user) != 0) + if (new_user && + (op_backend->user == NULL || + strcmp (new_user, op_backend->user) != 0)) { g_free (op_backend->user); op_backend->user = new_user; + + op_backend->user_specified = TRUE; g_free (op_backend->tmp_password); op_backend->tmp_password = new_password; @@ -1584,8 +1591,6 @@ op_backend->user = g_strdup (user); if (op_backend->user) op_backend->user_specified = TRUE; - else - op_backend->user = g_strdup (g_get_user_name ()); return FALSE; } gvfs-1.1.8-sftp-eating-cpu.patch: --- NEW FILE gvfs-1.1.8-sftp-eating-cpu.patch --- Index: daemon/gvfsbackendsftp.c =================================================================== --- daemon/gvfsbackendsftp.c (revision 2315) +++ daemon/gvfsbackendsftp.c (revision 2316) @@ -560,6 +560,15 @@ &bytes_read, NULL, error)) return NULL; + /* Make sure we handle ssh exiting early, e.g. if no further + authentication methods */ + if (bytes_read == 0) + { + g_set_error_literal (error, + G_IO_ERROR, G_IO_ERROR_FAILED, + _("ssh program unexpectedly exited")); + return NULL; + } len = GUINT32_FROM_BE (len); gvfs-1.1.8-sftp-handle-keys.patch: --- NEW FILE gvfs-1.1.8-sftp-handle-keys.patch --- Index: daemon/gvfsbackendsftp.c =================================================================== --- daemon/gvfsbackendsftp.c (revision 2311) +++ daemon/gvfsbackendsftp.c (revision 2312) @@ -851,13 +851,14 @@ if (g_vfs_keyring_is_available ()) flags |= G_ASK_PASSWORD_SAVING_SUPPORTED; - if (!op_backend->user_specified) + if (strcmp (authtype, "password") == 0 && + !op_backend->user_specified) flags |= G_ASK_PASSWORD_NEED_USERNAME; g_free (new_password); if (!g_mount_source_ask_password (mount_source, - g_str_has_prefix (buffer, "Enter passphrase for key") ? + strcmp (authtype, "publickey") == 0 ? _("Enter passphrase for key") : _("Enter password"), Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/F-10/gvfs.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- gvfs.spec 2 Mar 2009 14:45:48 -0000 1.97 +++ gvfs.spec 11 Mar 2009 14:25:37 -0000 1.98 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.0.3 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -56,6 +56,16 @@ # Immediately close the stream we get from g_file_replace(), so truncation becomes visible. Patch11: gvfs-1.0.4-fuse-truncate-immediately.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=550929 +# SFTP: Don't specify user unless requested explicitly by the uri. +Patch12: gvfs-1.1.8-sftp-dont-specify-user.patch + +# SFTP: Don't ask for username when getting ssh key passphrase +Patch13: gvfs-1.1.8-sftp-handle-keys.patch + +# http://bugzilla.gnome.org/show_bug.cgi?id=574754 +# SFTP: 100% cpu usage when connecting to a ssh key and denying key access +Patch14: gvfs-1.1.8-sftp-eating-cpu.patch %description The gvfs package provides backend implementations for the gio @@ -148,6 +158,9 @@ %patch10 -p0 -b .obexftp-write popd %patch11 -p0 -b .fuse-trunc +%patch12 -p0 -b .sftp-user +%patch13 -p0 -b .sftp-keys +%patch14 -p0 -b .sftp-cpu %build @@ -286,6 +299,11 @@ %changelog +* Wed Mar 11 2009 Tomas Bzatek - 1.0.3-7 +- SFTP: Don't specify user unless requested explicitly by the uri +- SFTP: Don't ask for username when getting ssh key passphrase +- SFTP: 100% cpu usage when connecting to a ssh key and denying key access + * Mon Mar 2 2009 Tomas Bzatek - 1.0.3-6 - FUSE: truncate files immediately (#479199) From deji at fedoraproject.org Wed Mar 11 14:28:16 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Wed, 11 Mar 2009 14:28:16 +0000 (UTC) Subject: rpms/kio_sword/devel kio_sword-build_fixes.patch, 1.2, 1.3 kio_sword.spec, 1.6, 1.7 Message-ID: <20090311142816.B531970128@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/kio_sword/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1292 Modified Files: kio_sword-build_fixes.patch kio_sword.spec Log Message: * Wed Mar 11 2009 Deji Akingunola 0.3-9 - Fix build failure after Fedora_11_Mass_Rebuild (Fix by Caolan McNamara) kio_sword-build_fixes.patch: Index: kio_sword-build_fixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/kio_sword/devel/kio_sword-build_fixes.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kio_sword-build_fixes.patch 14 Feb 2008 00:11:13 -0000 1.2 +++ kio_sword-build_fixes.patch 11 Mar 2009 14:27:46 -0000 1.3 @@ -1,23 +1,3 @@ ---- configure 2006-12-16 11:11:58.000000000 -0500 -+++ configure.new 2007-01-12 09:49:21.000000000 -0500 -@@ -32379,7 +32379,7 @@ - echo "$as_me:$LINENO: checking for Sword library files" >&5 - echo $ECHO_N "checking for Sword library files... $ECHO_C" >&6 - --ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib" -+ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib" - - if test "x$ac_static_sword" = "xYES"; then - SEARCH_LIBS="libsword.a"; -@@ -32518,7 +32518,7 @@ - using namespace sword; - #endif - --int main(int argc, char* argv) { -+int main(int argc, char* argv[]) { - std::cout << SWVersion::currentVersion << std::endl; - return 0; - } --- configure.in.in 2007-01-12 09:52:04.000000000 -0500 +++ configure.in.in.new 2007-01-12 09:52:27.000000000 -0500 @@ -4,6 +4,6 @@ @@ -66,3 +46,56 @@ list::const_iterator it; list::const_iterator it_end = locales.end(); QStringList output; +--- admin/cvs.sh 2009-03-11 08:26:43.000000000 +0000 ++++ admin/cvs.sh 2009-03-11 08:48:21.000000000 +0000 +@@ -32,7 +32,7 @@ + required_autoconf_version="2.53 or newer" + AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` + case $AUTOCONF_VERSION in +- Autoconf*2.5* | autoconf*2.5* ) : ;; ++ Autoconf*2.5* | autoconf*2.5* | autoconf*2.6*) : ;; + "" ) + echo "*** AUTOCONF NOT FOUND!." + echo "*** KDE requires autoconf $required_autoconf_version" +@@ -47,7 +47,7 @@ + + AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` + case $AUTOHEADER_VERSION in +- Autoconf*2.5* | autoheader*2.5* ) : ;; ++ Autoconf*2.5* | autoheader*2.5* | autoheader*2.6*) : ;; + "" ) + echo "*** AUTOHEADER NOT FOUND!." + echo "*** KDE requires autoheader $required_autoconf_version" +@@ -68,7 +68,7 @@ + echo "*** KDE requires automake $required_automake_version" + exit 1 + ;; +- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* ) + echo "*** $AUTOMAKE_STRING found." + UNSERMAKE=no + ;; +--- admin/localm4/sword.m4 2009-03-11 08:26:43.000000000 +0000 ++++ admin/localm4/sword.m4 2009-03-11 08:57:13.000000000 +0000 +@@ -28,7 +28,7 @@ + dnl try to find Sword library files + AC_MSG_CHECKING([for Sword library files]) + AC_REQUIRE([AC_FIND_ZLIB]) +-ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib" ++ac_sword_library_dirs="$ac_sword_dir/lib $libdir $libdir/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib" + + if test "x$ac_static_sword" = "xYES"; then + SEARCH_LIBS="libsword.a"; +--- admin/acinclude.m4.in 2009-03-11 08:26:43.000000000 +0000 ++++ admin/acinclude.m4.in 2009-03-11 08:29:22.000000000 +0000 +@@ -3194,10 +3194,8 @@ + AC_SUBST([HAVE_GCC_VISIBILITY]) + + if test "$GXX" = "yes"; then +- KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"]) + KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"]) + KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"]) +- KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS= ) + ENABLE_PERMISSIVE_FLAG="-fpermissive" + + if test "$kde_use_pch" = "yes"; then Index: kio_sword.spec =================================================================== RCS file: /cvs/pkgs/rpms/kio_sword/devel/kio_sword.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kio_sword.spec 25 Feb 2009 11:23:35 -0000 1.6 +++ kio_sword.spec 11 Mar 2009 14:27:46 -0000 1.7 @@ -1,6 +1,6 @@ Name: kio_sword Version: 0.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A lightweight frontend for the Sword Bible project for KDE URL: http://lukeplant.me.uk/kio-sword/ License: GPLv2+ @@ -29,6 +29,7 @@ %build unset QTDIR || : ; . /etc/profile.d/qt.sh export KDEDIR=`kde-config --prefix` +./autogen.sh --disable-rpath %configure --disable-rpath make %{?_smp_mflags} @@ -79,6 +80,9 @@ %doc AUTHORS COPYING README TODO %changelog +* Wed Mar 11 2009 Deji Akingunola 0.3-9 +- Fix build failure after Fedora_11_Mass_Rebuild (Fix by Caolan McNamara) + * Wed Feb 25 2009 Fedora Release Engineering - 0.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rrakus at fedoraproject.org Wed Mar 11 14:45:13 2009 From: rrakus at fedoraproject.org (Roman Rakus) Date: Wed, 11 Mar 2009 14:45:13 +0000 (UTC) Subject: rpms/libservicelog/devel libservicelog-1.0.1-install.patch, NONE, 1.1 libservicelog.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090311144513.26B6C70128@cvs1.fedora.phx.redhat.com> Author: rrakus Update of /cvs/extras/rpms/libservicelog/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5986 Modified Files: .cvsignore sources Added Files: libservicelog-1.0.1-install.patch libservicelog.spec Log Message: Initial packaging libservicelog-1.0.1-install.patch: --- NEW FILE libservicelog-1.0.1-install.patch --- diff -up libservicelog-1.0.1/Makefile.am.install libservicelog-1.0.1/Makefile.am --- libservicelog-1.0.1/Makefile.am.install 2009-02-20 12:17:23.000000000 -0500 +++ libservicelog-1.0.1/Makefile.am 2009-02-20 12:17:50.000000000 -0500 @@ -19,5 +19,5 @@ library_includedir = ${includedir}/servi library_include_HEADERS = servicelog-1/servicelog.h install-exec-hook: - install -D --mode=754 --group=service servicelog.db \ + install -D --mode=754 servicelog.db \ ${DESTDIR}/var/lib/servicelog/servicelog.db --- NEW FILE libservicelog.spec --- Name: libservicelog Version: 1.0.1 Release: 1%{?dist} Summary: Servicelog Database and Library Group: System Environment/Libraries License: LGPLv2 URL: http://linux-diag.sourceforge.net/servicelog Source0: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): shadow-utils BuildRequires: sqlite-devel autoconf libtool Patch0: libservicelog-1.0.1-install.patch %description The libservicelog package contains a library to create and maintain a database for storing events related to system service. This database allows for the logging of serviceable and informational events, and for the logging of service procedures that have been performed upon the system. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel Contains header files for building with libservicelog. %prep %setup -q %patch0 -p1 -b .install %build autoreconf -fiv %configure --disable-static %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT %{__make} install DESTDIR=$RPM_BUILD_ROOT %{__rm} -f %{buildroot}%{_libdir}/*.la %clean %{__rm} -rf $RPM_BUILD_ROOT %pre getent group service >/dev/null || /usr/sbin/groupadd service %post -p /sbin/ldconfig %postun /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING NEWS AUTHORS %{_libdir}/libservicelog-*.so.* %{_libdir}/*.so %attr( 754, root, service ) %dir /var/lib/servicelog/servicelog.db %dir /var/lib/servicelog %files devel %defattr(-,root,root,-) %{_includedir}/servicelog-1 %{_libdir}/pkgconfig/servicelog-1.pc %changelog * Fri Feb 20 2009 Roman Rakus - 1.0.1-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libservicelog/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2009 17:16:46 -0000 1.1 +++ .cvsignore 11 Mar 2009 14:44:42 -0000 1.2 @@ -0,0 +1 @@ +libservicelog-1.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libservicelog/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2009 17:16:46 -0000 1.1 +++ sources 11 Mar 2009 14:44:42 -0000 1.2 @@ -0,0 +1 @@ +e3280d47a16a29beef586d5b6068a562 libservicelog-1.0.1.tar.gz From rdieter at fedoraproject.org Wed Mar 11 15:04:27 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 11 Mar 2009 15:04:27 +0000 (UTC) Subject: rpms/gpgme/devel gpgme.spec,1.34,1.35 Message-ID: <20090311150427.B582270128@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/gpgme/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9817 Modified Files: gpgme.spec Log Message: * Wed Mar 11 2009 Rex Dieter - 1.1.7-3 - track shlib sonames closer, to highlight future abi/soname changes - _with_gpg macro, to potentially conditionalize gnupg vs gnupg2 defaults for various os/releases (ie, fedora vs rhel) Index: gpgme.spec =================================================================== RCS file: /cvs/pkgs/rpms/gpgme/devel/gpgme.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- gpgme.spec 25 Feb 2009 00:32:07 -0000 1.34 +++ gpgme.spec 11 Mar 2009 15:03:55 -0000 1.35 @@ -2,7 +2,7 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API Version: 1.1.7 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: Applications/System @@ -19,6 +19,9 @@ BuildRequires: libgpg-error-devel BuildRequires: pth-devel +# --disable-gpg-test required since 'make check' currently includes some +# gpg(1)-specific tests +%define _with_gpg --with-gpg=%{_bindir}/gpg2 --disable-gpg-test Requires: gnupg2 %description @@ -53,7 +56,7 @@ %build %configure \ --disable-static \ - --with-gpg=%{_bindir}/gpg2 --disable-gpg-test + %{?_with_gpg} make %{?_smp_mflags} @@ -92,11 +95,12 @@ fi - %files %defattr(-,root,root,-) %doc AUTHORS COPYING* ChangeLog NEWS README* THANKS TODO VERSION -%{_libdir}/libgpgme*.so.* +%{_libdir}/libgpgme.so.11* +%{_libdir}/libgpgme-pth.so.11* +%{_libdir}/libgpgme-pthread.so.11* %files devel %defattr(-,root,root,-) @@ -108,6 +112,11 @@ %changelog +* Wed Mar 11 2009 Rex Dieter - 1.1.7-3 +- track shlib sonames closer, to highlight future abi/soname changes +- _with_gpg macro, to potentially conditionalize gnupg vs gnupg2 defaults + for various os/releases (ie, fedora vs rhel) + * Tue Feb 24 2009 Fedora Release Engineering - 1.1.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pjones at fedoraproject.org Wed Mar 11 15:29:10 2009 From: pjones at fedoraproject.org (Peter Jones) Date: Wed, 11 Mar 2009 15:29:10 +0000 (UTC) Subject: rpms/grub/devel grub-0.97-efigraph-use-blt.patch, NONE, 1.1 grub.spec, 1.85, 1.86 Message-ID: <20090311152910.94F8170128@cvs1.fedora.phx.redhat.com> Author: pjones Update of /cvs/extras/rpms/grub/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13206 Modified Files: grub.spec Added Files: grub-0.97-efigraph-use-blt.patch Log Message: * Wed Mar 11 2009 Peter Jones - 0.97-43 - Use blt operations instead of memmove() on Efi Graphics Protocol systems. grub-0.97-efigraph-use-blt.patch: --- NEW FILE grub-0.97-efigraph-use-blt.patch --- diff -up grub-0.97/efi/efigraph.c.useblt grub-0.97/efi/efigraph.c --- grub-0.97/efi/efigraph.c.useblt 2009-03-11 11:02:24.000000000 -0400 +++ grub-0.97/efi/efigraph.c 2009-03-11 11:02:30.000000000 -0400 @@ -305,6 +305,24 @@ static struct bltbuf *alloc_bltbuf(grub_ return buf; } + +#if 1 +static void +blt_pos_to_screen_pos(struct eg *eg, struct bltbuf *bltbuf, + position_t *bltpos, position_t *bltsz, position_t *pos) +{ + position_t phys; + + position_to_phys(eg, pos, &phys); + + Call_Service_10(eg->output_intf->blt, eg->output_intf, bltbuf->pixbuf, + GRUB_EFI_BLT_BUFFER_TO_VIDEO, + bltpos->x, bltpos->y, + phys.x, phys.y, + bltsz->x, bltsz->y, + 0); +} +#else static void blt_pos_to_screen_pos(struct eg *eg, struct bltbuf *bltbuf, position_t *bltpos, position_t *bltsz, position_t *pos) @@ -392,6 +410,7 @@ blt_pos_to_screen_pos(struct eg *eg, str } } } +#endif static void blt_to_screen(struct eg *eg, struct bltbuf *bltbuf) @@ -417,25 +436,6 @@ blt_to_screen(struct eg *eg, struct bltb #endif } - -#if 0 -static void -blt_pos_to_screen_pos(struct eg *eg, struct bltbuf *bltbuf, - position_t *bltpos, position_t *bltsz, position_t *pos) -{ - position_t phys; - - position_to_phys(eg, pos, &phys); - - Call_Service_10(eg->output_intf->blt, eg->output_intf, bltbuf->pixbuf, - GRUB_EFI_BLT_BUFFER_TO_VIDEO, - bltpos->x, bltpos->y, - phys.x, phys.y, - bltsz->x, bltsz->y, - 0); -} -#endif - static void blt_to_screen_pos(struct eg *eg, struct bltbuf *bltbuf, position_t *pos) { Index: grub.spec =================================================================== RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- grub.spec 3 Mar 2009 15:14:41 -0000 1.85 +++ grub.spec 11 Mar 2009 15:28:38 -0000 1.86 @@ -1,6 +1,6 @@ Name: grub Version: 0.97 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Grand Unified Boot Loader. Group: System Environment/Base License: GPLv2+ @@ -34,6 +34,7 @@ Patch6: grub-0.97-printf_hex.patch Patch7: grub-0.97-eficd.patch Patch8: grub-0.97-xfs-buildfix.patch +Patch9: grub-0.97-efigraph-use-blt.patch %description GRUB (Grand Unified Boot Loader) is an experimental boot loader @@ -52,6 +53,7 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build autoreconf @@ -114,6 +116,9 @@ %{_datadir}/grub %changelog +* Wed Mar 11 2009 Peter Jones - 0.97-43 +- Use blt operations instead of memmove() on Efi Graphics Protocol systems. + * Tue Mar 03 2009 Peter Jones - 0.97-42 - Switch from i386 to i586. - BuildReq on glibc-static. From pkgdb at fedoraproject.org Wed Mar 11 15:30:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 15:30:23 +0000 Subject: [pkgdb] xorg-x11-drv-intel: krh has requested commit Message-ID: <20090311153149.0F43520850F@bastion.fedora.phx.redhat.com> krh has requested the commit acl on xorg-x11-drv-intel (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-intel From pkgdb at fedoraproject.org Wed Mar 11 15:30:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 15:30:42 +0000 Subject: [pkgdb] xorg-x11-drv-intel: krh has requested approveacls Message-ID: <20090311153152.1D4DE208550@bastion.fedora.phx.redhat.com> krh has requested the approveacls acl on xorg-x11-drv-intel (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-intel From pkgdb at fedoraproject.org Wed Mar 11 15:30:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 15:30:29 +0000 Subject: [pkgdb] xorg-x11-drv-intel: krh has requested watchcommits Message-ID: <20090311153154.C7786208553@bastion.fedora.phx.redhat.com> krh has requested the watchcommits acl on xorg-x11-drv-intel (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-intel From pkgdb at fedoraproject.org Wed Mar 11 15:32:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 15:32:25 +0000 Subject: [pkgdb] xorg-x11-drv-intel had acl change status Message-ID: <20090311153222.65AD1208510@bastion.fedora.phx.redhat.com> ajax has set the commit acl on xorg-x11-drv-intel (Fedora devel) to Approved for krh To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-intel From pkgdb at fedoraproject.org Wed Mar 11 15:32:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 15:32:06 +0000 Subject: [pkgdb] xorg-x11-drv-intel had acl change status Message-ID: <20090311153226.BEFF0208514@bastion.fedora.phx.redhat.com> ajax has set the approveacls acl on xorg-x11-drv-intel (Fedora devel) to Approved for krh To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-intel From mtasaka at fedoraproject.org Wed Mar 11 15:36:02 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Wed, 11 Mar 2009 15:36:02 +0000 (UTC) Subject: rpms/rubygem-mechanize/F-10 .cvsignore, 1.3, 1.4 rubygem-mechanize.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090311153602.5815C70128@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/rubygem-mechanize/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15103/rubygem-mechanize/F-10 Modified Files: .cvsignore rubygem-mechanize.spec sources Log Message: gem update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rubygem-mechanize/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Feb 2009 17:19:12 -0000 1.3 +++ .cvsignore 11 Mar 2009 15:35:31 -0000 1.4 @@ -1 +1 @@ -mechanize-0.9.1.gem +mechanize-0.9.2.gem Index: rubygem-mechanize.spec =================================================================== RCS file: /cvs/extras/rpms/rubygem-mechanize/F-10/rubygem-mechanize.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rubygem-mechanize.spec 25 Feb 2009 17:19:12 -0000 1.2 +++ rubygem-mechanize.spec 11 Mar 2009 15:35:31 -0000 1.3 @@ -8,7 +8,7 @@ Summary: A handy web browsing ruby object Name: rubygem-%{gemname} -Version: 0.9.1 +Version: 0.9.2 Release: 1%{?dist} Group: Development/Languages License: GPL+ @@ -20,7 +20,7 @@ BuildRequires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} Requires: ruby(rubygems) -Requires: rubygem(nokogiri) +Requires: rubygem(nokogiri) >= 1.2.1 Provides: rubygem(%{gemname}) = %{version}-%{release} #Requires: rubygem(hoe) @@ -139,7 +139,7 @@ %files %defattr(-,root,root,-) -%doc %{geminstdir}/[A-Z]*.txt +%doc %{geminstdir}/[A-Z]*.rdoc %dir %{geminstdir} %{geminstdir}/lib/ %{gemdir}/cache/%{gemname}-%{version}.gem @@ -157,6 +157,9 @@ %{ruby_sitelib}/www/ %changelog +* Thu Mar 12 2009 Mamoru Tasaka - 0.9.2-1 +- 0.9.2 + * Thu Feb 26 2009 Mamoru Tasaka - 0.9.1-1 - 0.9.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/rubygem-mechanize/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Feb 2009 17:19:12 -0000 1.3 +++ sources 11 Mar 2009 15:35:31 -0000 1.4 @@ -1 +1 @@ -fde02a20ec20052b3af4f4277d2a1b7c mechanize-0.9.1.gem +0f075e1659473805a0776ffd79e1ff81 mechanize-0.9.2.gem From mtasaka at fedoraproject.org Wed Mar 11 15:36:02 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Wed, 11 Mar 2009 15:36:02 +0000 (UTC) Subject: rpms/rubygem-mechanize/devel .cvsignore, 1.3, 1.4 rubygem-mechanize.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20090311153602.E520570132@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/rubygem-mechanize/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15103/rubygem-mechanize/devel Modified Files: .cvsignore rubygem-mechanize.spec sources Log Message: gem update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rubygem-mechanize/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Feb 2009 17:19:12 -0000 1.3 +++ .cvsignore 11 Mar 2009 15:35:32 -0000 1.4 @@ -1 +1 @@ -mechanize-0.9.1.gem +mechanize-0.9.2.gem Index: rubygem-mechanize.spec =================================================================== RCS file: /cvs/extras/rpms/rubygem-mechanize/devel/rubygem-mechanize.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rubygem-mechanize.spec 25 Feb 2009 17:19:12 -0000 1.3 +++ rubygem-mechanize.spec 11 Mar 2009 15:35:32 -0000 1.4 @@ -8,7 +8,7 @@ Summary: A handy web browsing ruby object Name: rubygem-%{gemname} -Version: 0.9.1 +Version: 0.9.2 Release: 1%{?dist} Group: Development/Languages License: GPL+ @@ -20,7 +20,7 @@ BuildRequires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} Requires: ruby(rubygems) -Requires: rubygem(nokogiri) +Requires: rubygem(nokogiri) >= 1.2.1 Provides: rubygem(%{gemname}) = %{version}-%{release} #Requires: rubygem(hoe) @@ -139,7 +139,7 @@ %files %defattr(-,root,root,-) -%doc %{geminstdir}/[A-Z]*.txt +%doc %{geminstdir}/[A-Z]*.rdoc %dir %{geminstdir} %{geminstdir}/lib/ %{gemdir}/cache/%{gemname}-%{version}.gem @@ -157,6 +157,9 @@ %{ruby_sitelib}/www/ %changelog +* Thu Mar 12 2009 Mamoru Tasaka - 0.9.2-1 +- 0.9.2 + * Thu Feb 26 2009 Mamoru Tasaka - 0.9.1-1 - 0.9.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/rubygem-mechanize/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Feb 2009 17:19:12 -0000 1.3 +++ sources 11 Mar 2009 15:35:32 -0000 1.4 @@ -1 +1 @@ -fde02a20ec20052b3af4f4277d2a1b7c mechanize-0.9.1.gem +0f075e1659473805a0776ffd79e1ff81 mechanize-0.9.2.gem From mtasaka at fedoraproject.org Wed Mar 11 15:36:03 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Wed, 11 Mar 2009 15:36:03 +0000 (UTC) Subject: rpms/rubygem-nokogiri/F-9 .cvsignore, 1.2, 1.3 rubygem-nokogiri.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090311153603.9695E70128@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/rubygem-nokogiri/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15103/rubygem-nokogiri/F-9 Modified Files: .cvsignore rubygem-nokogiri.spec sources Log Message: gem update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Jan 2009 04:07:11 -0000 1.2 +++ .cvsignore 11 Mar 2009 15:35:33 -0000 1.3 @@ -1 +1 @@ -nokogiri-1.1.1.gem +nokogiri-1.2.1.gem Index: rubygem-nokogiri.spec =================================================================== RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-9/rubygem-nokogiri.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rubygem-nokogiri.spec 20 Jan 2009 04:10:53 -0000 1.1 +++ rubygem-nokogiri.spec 11 Mar 2009 15:35:33 -0000 1.2 @@ -8,7 +8,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gemname} -Version: 1.1.1 +Version: 1.2.1 Release: 1%{?dist} Group: Development/Languages License: MIT @@ -162,6 +162,11 @@ %clean rm -rf %{buildroot} +%check +pushd ./%{geminstdir} +( rake test ) +popd + %files %defattr(-,root, root,-) %{ruby_sitearch}/%{gemname}/ @@ -173,6 +178,7 @@ %files doc %defattr(-,root,root,-) +%{geminstdir}/tasks/ %{geminstdir}/test/ %{gemdir}/doc/%{gemname}-%{version}/ @@ -182,6 +188,12 @@ %{ruby_sitelib}/%{gemname}/ %changelog +* Thu Mar 12 2009 Mamoru Tasaka - 1.2.1-1 +- 1.2.1 + +* Tue Feb 24 2009 Mamoru Tasaka - 1.1.1-2 +- F-11: Mass rebuild + * Thu Jan 15 2009 Mamoru Tasaka - 1.1.1-1 - 1.1.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Jan 2009 04:07:11 -0000 1.2 +++ sources 11 Mar 2009 15:35:33 -0000 1.3 @@ -1 +1 @@ -b19b59f23eba388bd907c6cf3786289d nokogiri-1.1.1.gem +ea56ced6c6d46d99897faa3624d8a7c1 nokogiri-1.2.1.gem From mtasaka at fedoraproject.org Wed Mar 11 15:36:03 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Wed, 11 Mar 2009 15:36:03 +0000 (UTC) Subject: rpms/rubygem-nokogiri/F-10 .cvsignore, 1.2, 1.3 rubygem-nokogiri.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20090311153603.4156A70135@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/rubygem-nokogiri/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15103/rubygem-nokogiri/F-10 Modified Files: .cvsignore rubygem-nokogiri.spec sources Log Message: gem update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Jan 2009 04:07:11 -0000 1.2 +++ .cvsignore 11 Mar 2009 15:35:32 -0000 1.3 @@ -1 +1 @@ -nokogiri-1.1.1.gem +nokogiri-1.2.1.gem Index: rubygem-nokogiri.spec =================================================================== RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-10/rubygem-nokogiri.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rubygem-nokogiri.spec 20 Jan 2009 04:10:53 -0000 1.1 +++ rubygem-nokogiri.spec 11 Mar 2009 15:35:32 -0000 1.2 @@ -8,7 +8,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gemname} -Version: 1.1.1 +Version: 1.2.1 Release: 1%{?dist} Group: Development/Languages License: MIT @@ -162,6 +162,11 @@ %clean rm -rf %{buildroot} +%check +pushd ./%{geminstdir} +( rake test ) +popd + %files %defattr(-,root, root,-) %{ruby_sitearch}/%{gemname}/ @@ -173,6 +178,7 @@ %files doc %defattr(-,root,root,-) +%{geminstdir}/tasks/ %{geminstdir}/test/ %{gemdir}/doc/%{gemname}-%{version}/ @@ -182,6 +188,12 @@ %{ruby_sitelib}/%{gemname}/ %changelog +* Thu Mar 12 2009 Mamoru Tasaka - 1.2.1-1 +- 1.2.1 + +* Tue Feb 24 2009 Mamoru Tasaka - 1.1.1-2 +- F-11: Mass rebuild + * Thu Jan 15 2009 Mamoru Tasaka - 1.1.1-1 - 1.1.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Jan 2009 04:07:11 -0000 1.2 +++ sources 11 Mar 2009 15:35:32 -0000 1.3 @@ -1 +1 @@ -b19b59f23eba388bd907c6cf3786289d nokogiri-1.1.1.gem +ea56ced6c6d46d99897faa3624d8a7c1 nokogiri-1.2.1.gem From mtasaka at fedoraproject.org Wed Mar 11 15:36:02 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Wed, 11 Mar 2009 15:36:02 +0000 (UTC) Subject: rpms/rubygem-mechanize/F-9 .cvsignore, 1.3, 1.4 rubygem-mechanize.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20090311153602.8CCA670128@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/rubygem-mechanize/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15103/rubygem-mechanize/F-9 Modified Files: .cvsignore rubygem-mechanize.spec sources Log Message: gem update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rubygem-mechanize/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Feb 2009 17:19:12 -0000 1.3 +++ .cvsignore 11 Mar 2009 15:35:32 -0000 1.4 @@ -1 +1 @@ -mechanize-0.9.1.gem +mechanize-0.9.2.gem Index: rubygem-mechanize.spec =================================================================== RCS file: /cvs/extras/rpms/rubygem-mechanize/F-9/rubygem-mechanize.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rubygem-mechanize.spec 25 Feb 2009 17:19:12 -0000 1.2 +++ rubygem-mechanize.spec 11 Mar 2009 15:35:32 -0000 1.3 @@ -8,7 +8,7 @@ Summary: A handy web browsing ruby object Name: rubygem-%{gemname} -Version: 0.9.1 +Version: 0.9.2 Release: 1%{?dist} Group: Development/Languages License: GPL+ @@ -20,7 +20,7 @@ BuildRequires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} Requires: ruby(rubygems) -Requires: rubygem(nokogiri) +Requires: rubygem(nokogiri) >= 1.2.1 Provides: rubygem(%{gemname}) = %{version}-%{release} #Requires: rubygem(hoe) @@ -139,7 +139,7 @@ %files %defattr(-,root,root,-) -%doc %{geminstdir}/[A-Z]*.txt +%doc %{geminstdir}/[A-Z]*.rdoc %dir %{geminstdir} %{geminstdir}/lib/ %{gemdir}/cache/%{gemname}-%{version}.gem @@ -157,6 +157,9 @@ %{ruby_sitelib}/www/ %changelog +* Thu Mar 12 2009 Mamoru Tasaka - 0.9.2-1 +- 0.9.2 + * Thu Feb 26 2009 Mamoru Tasaka - 0.9.1-1 - 0.9.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/rubygem-mechanize/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Feb 2009 17:19:12 -0000 1.3 +++ sources 11 Mar 2009 15:35:32 -0000 1.4 @@ -1 +1 @@ -fde02a20ec20052b3af4f4277d2a1b7c mechanize-0.9.1.gem +0f075e1659473805a0776ffd79e1ff81 mechanize-0.9.2.gem From mtasaka at fedoraproject.org Wed Mar 11 15:36:04 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Wed, 11 Mar 2009 15:36:04 +0000 (UTC) Subject: rpms/rubygem-nokogiri/devel .cvsignore, 1.2, 1.3 rubygem-nokogiri.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20090311153604.0958270132@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/rubygem-nokogiri/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15103/rubygem-nokogiri/devel Modified Files: .cvsignore rubygem-nokogiri.spec sources Log Message: gem update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rubygem-nokogiri/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Jan 2009 04:07:11 -0000 1.2 +++ .cvsignore 11 Mar 2009 15:35:33 -0000 1.3 @@ -1 +1 @@ -nokogiri-1.1.1.gem +nokogiri-1.2.1.gem Index: rubygem-nokogiri.spec =================================================================== RCS file: /cvs/extras/rpms/rubygem-nokogiri/devel/rubygem-nokogiri.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rubygem-nokogiri.spec 24 Feb 2009 14:52:03 -0000 1.2 +++ rubygem-nokogiri.spec 11 Mar 2009 15:35:33 -0000 1.3 @@ -8,8 +8,8 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gemname} -Version: 1.1.1 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Group: Development/Languages License: MIT URL: http://nokogiri.rubyforge.org/nokogiri/ @@ -162,6 +162,11 @@ %clean rm -rf %{buildroot} +%check +pushd ./%{geminstdir} +( rake test ) +popd + %files %defattr(-,root, root,-) %{ruby_sitearch}/%{gemname}/ @@ -173,6 +178,7 @@ %files doc %defattr(-,root,root,-) +%{geminstdir}/tasks/ %{geminstdir}/test/ %{gemdir}/doc/%{gemname}-%{version}/ @@ -182,6 +188,9 @@ %{ruby_sitelib}/%{gemname}/ %changelog +* Thu Mar 12 2009 Mamoru Tasaka - 1.2.1-1 +- 1.2.1 + * Tue Feb 24 2009 Mamoru Tasaka - 1.1.1-2 - F-11: Mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/rubygem-nokogiri/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Jan 2009 04:07:11 -0000 1.2 +++ sources 11 Mar 2009 15:35:33 -0000 1.3 @@ -1 +1 @@ -b19b59f23eba388bd907c6cf3786289d nokogiri-1.1.1.gem +ea56ced6c6d46d99897faa3624d8a7c1 nokogiri-1.2.1.gem From pkgdb at fedoraproject.org Wed Mar 11 15:37:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 15:37:37 +0000 Subject: [pkgdb] evolution-brutus had acl change status Message-ID: <20090311153734.7E9AC208552@bastion.fedora.phx.redhat.com> toshio has set the watchbugzilla acl on evolution-brutus (Fedora devel) to Obsolete for colding To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/evolution-brutus From pkgdb at fedoraproject.org Wed Mar 11 15:37:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 15:37:22 +0000 Subject: [pkgdb] evolution-brutus had acl change status Message-ID: <20090311153742.2F350208511@bastion.fedora.phx.redhat.com> toshio has set the watchbugzilla acl on evolution-brutus (Fedora 9) to Obsolete for colding To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/evolution-brutus From pkgdb at fedoraproject.org Wed Mar 11 15:36:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 15:36:33 +0000 Subject: [pkgdb] evolution-brutus had acl change status Message-ID: <20090311153742.EEC55208554@bastion.fedora.phx.redhat.com> toshio has set the watchbugzilla acl on evolution-brutus (Fedora 10) to Obsolete for colding To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/evolution-brutus From krh at fedoraproject.org Wed Mar 11 15:45:11 2009 From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=) Date: Wed, 11 Mar 2009 15:45:11 +0000 (UTC) Subject: rpms/xorg-x11-drv-intel/devel no-legacy3d.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xorg-x11-drv-intel.spec, 1.8, 1.9 intel-2.5.0-no-gem-legacy-3d.patch, 1.1, NONE intel-2.5.0-no-legacy-3d.patch, 1.1, NONE intel-2.6.0-to-master.patch, 1.2, NONE Message-ID: <20090311154511.EA26270128@cvs1.fedora.phx.redhat.com> Author: krh Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17108 Modified Files: .cvsignore sources xorg-x11-drv-intel.spec Added Files: no-legacy3d.patch Removed Files: intel-2.5.0-no-gem-legacy-3d.patch intel-2.5.0-no-legacy-3d.patch intel-2.6.0-to-master.patch Log Message: * Wed Mar 11 2009 Kristian H??gsberg - 2.6.99.902-0 - Use 2.7 rc2 tarball. - Consolidate the legacy3d patches into no-legacy3d.patch, which sent upstream. no-legacy3d.patch: --- NEW FILE no-legacy3d.patch --- commit 434a714dd79537dae62c291dc37782b7b2f4c81c Author: Kristian H??gsberg Date: Wed Mar 11 11:10:57 2009 -0400 Drop Legacy3D option, only use fixed texture space with non-gem. With this change, we always expect the 3D driver to use GEM textures when the 2D driver uses GEM. When GEM is not available or disabled, we fall back to legacy fixed textures. diff --git a/src/i830_driver.c b/src/i830_driver.c index 6ec1a48..3c77147 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -311,7 +311,6 @@ typedef enum { OPTION_LVDS24BITMODE, OPTION_FBC, OPTION_TILING, - OPTION_LEGACY3D, OPTION_LVDSFIXEDMODE, OPTION_FORCEENABLEPIPEA, #ifdef INTEL_XVMC @@ -332,9 +331,6 @@ static OptionInfoRec I830Options[] = { {OPTION_LVDS24BITMODE, "LVDS24Bit", OPTV_BOOLEAN, {0}, FALSE}, {OPTION_FBC, "FramebufferCompression", OPTV_BOOLEAN, {0}, TRUE}, {OPTION_TILING, "Tiling", OPTV_BOOLEAN, {0}, TRUE}, -#ifdef XF86DRI - {OPTION_LEGACY3D, "Legacy3D", OPTV_BOOLEAN, {0}, FALSE}, -#endif {OPTION_LVDSFIXEDMODE, "LVDSFixedMode", OPTV_BOOLEAN, {0}, FALSE}, {OPTION_FORCEENABLEPIPEA, "ForceEnablePipeA", OPTV_BOOLEAN, {0}, FALSE}, #ifdef INTEL_XVMC @@ -3019,11 +3015,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) */ if (!pI830->can_resize && pI830->directRenderingType == DRI_NONE && I830DRIScreenInit(pScreen)) pI830->directRenderingType = DRI_XF86DRI; - - if (pI830->directRenderingType == DRI_XF86DRI) { - pI830->allocate_classic_textures = - xf86ReturnOptValBool(pI830->Options, OPTION_LEGACY3D, TRUE); - } #endif /* Enable tiling by default */ diff --git a/src/i830_memory.c b/src/i830_memory.c index e98c914..96e1763 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -504,9 +504,6 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size) mmsize -= ROUND_TO_PAGE(3 * pScrn->displayWidth * pI830->cpp * pScrn->virtualY); } - /* Classic textures are fixed. */ - if (pI830->allocate_classic_textures) - mmsize -= MB(32); /* Overlay and cursors, if physical, need to be allocated outside * of the kernel memory manager. */ @@ -566,6 +563,8 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size) i830_free_memory(pScrn, pI830->memory_manager); pI830->memory_manager = NULL; } + } else { + pI830->allocate_classic_textures = TRUE; } #endif /* XF86DRI */ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Feb 2009 20:51:11 -0000 1.2 +++ .cvsignore 11 Mar 2009 15:44:40 -0000 1.3 @@ -1 +1 @@ -xf86-video-intel-2.6.0.tar.bz2 +xf86-video-intel-2.6.99.902.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Feb 2009 20:51:11 -0000 1.2 +++ sources 11 Mar 2009 15:44:41 -0000 1.3 @@ -1 +1 @@ -70f23db0f5178f63b4d688e6fc4a43de xf86-video-intel-2.6.0.tar.bz2 +b1869be6032c00654f562bd5d6ac9701 xf86-video-intel-2.6.99.902.tar.bz2 Index: xorg-x11-drv-intel.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xorg-x11-drv-intel.spec 5 Mar 2009 22:58:57 -0000 1.8 +++ xorg-x11-drv-intel.spec 11 Mar 2009 15:44:41 -0000 1.9 @@ -7,8 +7,8 @@ Summary: Xorg X11 Intel video driver(s) Name: xorg-x11-drv-intel -Version: 2.6.0 -Release: 14%{?dist} +Version: 2.6.99.902 +Release: 0%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -21,11 +21,9 @@ #Source1: xf86-video-intel-%{batchbuffer_version}.tar.bz2 Source2: intel.xinf -Patch1: intel-2.6.0-to-master.patch -Patch5: intel-2.5.0-no-legacy-3d.patch -Patch6: intel-2.5.0-no-gem-legacy-3d.patch -Patch7: kill-svideo.patch -Patch8: copy-fb.patch +Patch1: no-legacy3d.patch +Patch2: kill-svideo.patch +Patch3: copy-fb.patch ExclusiveArch: %{ix86} x86_64 ia64 @@ -60,11 +58,9 @@ %prep %setup -q -n xf86-video-intel-%{version} -%patch1 -p1 -b .master -%patch5 -p1 -b .nolegacy3d -%patch6 -p1 -b .nogem3d -%patch7 -p1 -b .svideo -%patch8 -p1 -b .copy-fb +%patch1 -p1 -b .no-legacy3d +%patch2 -p1 -b .svideo +%patch3 -p1 -b .copy-fb %build @@ -104,6 +100,11 @@ %{_libdir}/libIntelXvMC.so %changelog +* Wed Mar 11 2009 Kristian H??gsberg - 2.6.99.902-0 +- Use 2.7 rc2 tarball. +- Consolidate the legacy3d patches into no-legacy3d.patch, which sent + upstream. + * Thu Mar 5 2009 Kristian H??gsberg - 2.6.0-14 - Fix copy-fb patch to skip dpms off on initial modeset. - Downgrade the conflicts to a requires. --- intel-2.5.0-no-gem-legacy-3d.patch DELETED --- --- intel-2.5.0-no-legacy-3d.patch DELETED --- --- intel-2.6.0-to-master.patch DELETED --- From pkgdb at fedoraproject.org Wed Mar 11 15:50:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 15:50:52 +0000 Subject: [pkgdb] brutus-keyring had acl change status Message-ID: <20090311155112.BE39C208505@bastion.fedora.phx.redhat.com> toshio has set the watchbugzilla acl on brutus-keyring (Fedora devel) to Obsolete for colding To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/brutus-keyring From pkgdb at fedoraproject.org Wed Mar 11 15:50:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 15:50:05 +0000 Subject: [pkgdb] brutus-keyring had acl change status Message-ID: <20090311155115.48EB2208514@bastion.fedora.phx.redhat.com> toshio has set the watchbugzilla acl on brutus-keyring (Fedora 8) to Obsolete for colding To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/brutus-keyring From pkgdb at fedoraproject.org Wed Mar 11 15:49:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 15:49:50 +0000 Subject: [pkgdb] brutus-keyring had acl change status Message-ID: <20090311155115.D0D7F208553@bastion.fedora.phx.redhat.com> toshio has set the watchbugzilla acl on brutus-keyring (Fedora 9) to Obsolete for colding To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/brutus-keyring From pkgdb at fedoraproject.org Wed Mar 11 15:51:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 15:51:26 +0000 Subject: [pkgdb] brutus-keyring had acl change status Message-ID: <20090311155123.50523208556@bastion.fedora.phx.redhat.com> toshio has set the watchbugzilla acl on brutus-keyring (Fedora 10) to Obsolete for colding To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/brutus-keyring From pjones at fedoraproject.org Wed Mar 11 15:55:02 2009 From: pjones at fedoraproject.org (Peter Jones) Date: Wed, 11 Mar 2009 15:55:02 +0000 (UTC) Subject: rpms/grub/devel grub-0.97-efigraph-use-blt.patch,1.1,1.2 Message-ID: <20090311155502.CB37870128@cvs1.fedora.phx.redhat.com> Author: pjones Update of /cvs/extras/rpms/grub/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18565 Modified Files: grub-0.97-efigraph-use-blt.patch Log Message: Fix build error due to weird unions on our pixel format. grub-0.97-efigraph-use-blt.patch: Index: grub-0.97-efigraph-use-blt.patch =================================================================== RCS file: /cvs/extras/rpms/grub/devel/grub-0.97-efigraph-use-blt.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grub-0.97-efigraph-use-blt.patch 11 Mar 2009 15:28:38 -0000 1.1 +++ grub-0.97-efigraph-use-blt.patch 11 Mar 2009 15:55:02 -0000 1.2 @@ -15,7 +15,7 @@ + + position_to_phys(eg, pos, &phys); + -+ Call_Service_10(eg->output_intf->blt, eg->output_intf, bltbuf->pixbuf, ++ Call_Service_10(eg->output_intf->blt, eg->output_intf, (struct grub_efi_graphics_output_blt_pixel_t *)bltbuf->pixbuf, + GRUB_EFI_BLT_BUFFER_TO_VIDEO, + bltpos->x, bltpos->y, + phys.x, phys.y, From mtasaka at fedoraproject.org Wed Mar 11 15:55:32 2009 From: mtasaka at fedoraproject.org (Mamoru Tasaka) Date: Wed, 11 Mar 2009 15:55:32 +0000 (UTC) Subject: rpms/ochusha/devel .cvsignore, 1.72, 1.73 ochusha.spec, 1.100, 1.101 sources, 1.72, 1.73 Message-ID: <20090311155532.5490C70128@cvs1.fedora.phx.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ochusha/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18621 Modified Files: .cvsignore ochusha.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- .cvsignore 27 Feb 2009 17:06:55 -0000 1.72 +++ .cvsignore 11 Mar 2009 15:55:01 -0000 1.73 @@ -1 +1 @@ -ochusha-0.6.0.1-cvs20090228T0000.tar.bz2 +ochusha-0.6.0.1-cvs20090312T0050.tar.bz2 Index: ochusha.spec =================================================================== RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- ochusha.spec 27 Feb 2009 17:06:55 -0000 1.100 +++ ochusha.spec 11 Mar 2009 15:55:01 -0000 1.101 @@ -16,8 +16,8 @@ %define help_url file://%{_docdir}/%{name}-%{version}/doc/index.html %define main_ver 0.6.0.1 -%define codate 20090228 -%define cotime_JST 0000 +%define codate 20090312 +%define cotime_JST 0050 %define strtag cvs%{codate}T%{cotime_JST} %define repoid 36733 @@ -220,7 +220,7 @@ %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog -* Sat Feb 29 2009 Mamoru Tasaka +* Thu Mar 12 2009 Mamoru Tasaka - Update to the latest CVS * Sat Feb 29 2009 Mamoru Tasaka Index: sources =================================================================== RCS file: /cvs/extras/rpms/ochusha/devel/sources,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- sources 27 Feb 2009 17:06:55 -0000 1.72 +++ sources 11 Mar 2009 15:55:02 -0000 1.73 @@ -1 +1 @@ -d200a57fdad293e39a11f91005c9b7b0 ochusha-0.6.0.1-cvs20090228T0000.tar.bz2 +5b0f35e6985def0b10243af63c77a604 ochusha-0.6.0.1-cvs20090312T0050.tar.bz2 From s4504kr at fedoraproject.org Wed Mar 11 15:57:39 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Wed, 11 Mar 2009 15:57:39 +0000 (UTC) Subject: rpms/blender/devel blender.spec,1.103,1.104 Message-ID: <20090311155739.B786F70128@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/blender/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19437 Modified Files: blender.spec Log Message: put blenderplayer into a separate subpackage Index: blender.spec =================================================================== RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- blender.spec 24 Feb 2009 04:59:05 -0000 1.103 +++ blender.spec 11 Mar 2009 15:57:09 -0000 1.104 @@ -5,7 +5,7 @@ Name: blender Version: 2.48a -Release: 15%{?dist} +Release: 16%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -88,6 +88,15 @@ This version doesn't contains ffmpeg support. +%package -n blenderplayer +Summary: Standalone blener player +Group: Applications/Multimedia +License: GPLv2 +%description -n blenderplayer +This package contains a stand alone release of the blender player. +You will need this package to play games which are based on the +Blender Geaming Engine. + %prep %setup -q %patch1 -p1 -b .org @@ -194,14 +203,23 @@ %files -f %name.lang %defattr(-,root,root,-) %doc COPYING README doc/python-dev-guide.txt doc/GPL-license.txt doc/bf-members.txt -%{_bindir}/* +%{_bindir}/blender +%{_bindir}/blender.bin %{_datadir}/applications/fedora-blender.desktop %{_datadir}/pixmaps/*.png %{blenderlib}/ %{_libdir}/blender/ %{_datadir}/mime/packages/blender.xml +%files -n blenderplayer +%doc COPYING +%defattr(-,root,root,-) +%{_bindir}/blenderplayer + %changelog +* Wed Mar 11 2009 Jochen Schmitt - 2.48a-16 +- Put blenderplayer into a separate subpackage (#489685) + * Mon Feb 23 2009 Fedora Release Engineering - 2.48a-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From kyle at fedoraproject.org Wed Mar 11 16:05:23 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Wed, 11 Mar 2009 16:05:23 +0000 (UTC) Subject: rpms/kernel/devel unifdef-rename-getline-symbol.patch, NONE, 1.1 kernel.spec, 1.1411, 1.1412 linux-2.6-execshield.patch, 1.102, 1.103 Message-ID: <20090311160523.BD32F70128@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21490 Modified Files: kernel.spec linux-2.6-execshield.patch Added Files: unifdef-rename-getline-symbol.patch Log Message: * Wed Mar 11 2009 Kyle McMartin 2.6.29-0.232.rc7.git4 - linux-2.6-execshield.patch: Fix from H.J. Lu, we were doing 32-bit randomization on 64-bit vaddr - unifdef-rename-getline-symbol.patch: glibc 2.9.90-10 changes what symbols are exposed in stdio.h, causing getline collision. rename the unifdef symbol to parseline. unifdef-rename-getline-symbol.patch: --- NEW FILE unifdef-rename-getline-symbol.patch --- diff --git a/scripts/unifdef.c b/scripts/unifdef.c index 552025e..977e682 100644 --- a/scripts/unifdef.c +++ b/scripts/unifdef.c @@ -206,7 +206,7 @@ static void done(void); static void error(const char *); static int findsym(const char *); static void flushline(bool); -static Linetype getline(void); +static Linetype parseline(void); static Linetype ifeval(const char **); static void ignoreoff(void); static void ignoreon(void); @@ -512,7 +512,7 @@ process(void) for (;;) { linenum++; - lineval = getline(); + lineval = parseline(); trans_table[ifstate[depth]][lineval](); debug("process %s -> %s depth %d", linetype_name[lineval], @@ -526,7 +526,7 @@ process(void) * help from skipcomment(). */ static Linetype -getline(void) +parseline(void) { const char *cp; int cursym; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1411 retrieving revision 1.1412 diff -u -r1.1411 -r1.1412 --- kernel.spec 11 Mar 2009 13:44:06 -0000 1.1411 +++ kernel.spec 11 Mar 2009 16:04:52 -0000 1.1412 @@ -582,6 +582,9 @@ # ppc64 goes kerspalt with .eh_frame Patch06: build-with-fno-dwarf2-cfi-asm.patch +# glibc-headers 2.9.90-10 changes default _POSIX_C_SOURCE +Patch07: unifdef-rename-getline-symbol.patch + %if !%{nopatches} # revert upstream patches we get via other methods @@ -1038,6 +1041,8 @@ ApplyPatch build-with-fno-dwarf2-cfi-asm.patch +ApplyPatch unifdef-rename-getline-symbol.patch + # # misc small stuff to make things compile # @@ -1819,6 +1824,13 @@ # and build. %changelog +* Wed Mar 11 2009 Kyle McMartin 2.6.29-0.232.rc7.git4 +- linux-2.6-execshield.patch: + Fix from H.J. Lu, we were doing 32-bit randomization on 64-bit vaddr +- unifdef-rename-getline-symbol.patch: + glibc 2.9.90-10 changes what symbols are exposed in stdio.h, causing + getline collision. rename the unifdef symbol to parseline. + * Wed Mar 11 2009 Dave Jones - 2.6.29-rc7-git4 linux-2.6-execshield.patch: Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- linux-2.6-execshield.patch 19 Jan 2009 06:23:28 -0000 1.102 +++ linux-2.6-execshield.patch 11 Mar 2009 16:04:53 -0000 1.103 @@ -73,7 +73,7 @@ #ifdef CONFIG_SMP diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h -index ba3e2ff..42a65f4 100644 +index e299287..aaa8a35 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -113,6 +113,9 @@ struct pv_cpu_ops { @@ -100,7 +100,7 @@ { PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr); diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h -index 091cd88..b1a6f6d 100644 +index 3bfd523..99c8119 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -158,6 +158,9 @@ static inline int hlt_works(int cpu) @@ -140,10 +140,10 @@ if (!c->x86_model_id[0]) { char *p; diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c -index e4c8fb6..30f7508 100644 +index c6520a4..2066aa1 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c -@@ -326,6 +326,9 @@ struct pv_cpu_ops pv_cpu_ops = { +@@ -352,6 +352,9 @@ struct pv_cpu_ops pv_cpu_ops = { .read_tscp = native_read_tscp, .load_tr_desc = native_load_tr_desc, .set_ldt = native_set_ldt, @@ -154,10 +154,10 @@ .load_idt = native_load_idt, .store_gdt = native_store_gdt, diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c -index a546f55..f180caf 100644 +index bd4da2a..60823d4 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c -@@ -346,6 +346,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, +@@ -343,6 +343,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, void start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp) { @@ -166,7 +166,7 @@ __asm__("movl %0, %%gs" : : "r"(0)); regs->fs = 0; set_fs(USER_DS); -@@ -355,6 +357,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp) +@@ -352,6 +354,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp) regs->cs = __USER_CS; regs->ip = new_ip; regs->sp = new_sp; @@ -178,7 +178,7 @@ /* * Free the old FP and other extended state */ -@@ -522,7 +529,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) +@@ -519,7 +526,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ __unlazy_fpu(prev_p); @@ -188,7 +188,7 @@ /* we're going to use this soon, after a few expensive things */ if (next_p->fpu_counter > 5) -@@ -695,3 +703,41 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) +@@ -692,3 +700,41 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) unsigned long range_end = mm->brk + 0x02000000; return randomize_range(mm->brk, range_end, 0) ? : mm->brk; } @@ -252,10 +252,10 @@ if (!cpu_isset(cpu, flush_cpumask)) goto out; diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c -index 98c2d05..db483ea 100644 +index a9e7548..af0f8f0 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c -@@ -154,6 +154,76 @@ static int lazy_iobitmap_copy(void) +@@ -160,6 +160,76 @@ static int lazy_iobitmap_copy(void) return 0; } @@ -332,7 +332,7 @@ #endif static void __kprobes -@@ -317,6 +387,29 @@ do_general_protection(struct pt_regs *regs, long error_code) +@@ -323,6 +393,29 @@ do_general_protection(struct pt_regs *regs, long error_code) if (!user_mode(regs)) goto gp_in_kernel; @@ -362,7 +362,7 @@ tsk->thread.error_code = error_code; tsk->thread.trap_no = 13; -@@ -923,19 +1016,37 @@ do_device_not_available(struct pt_regs *regs, long error) +@@ -934,19 +1027,37 @@ dotraplinkage void __kprobes do_device_not_available(struct pt_regs regs) } #ifdef CONFIG_X86_32 @@ -410,10 +410,10 @@ #endif diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c -index 88f1b10..1e31b5e 100644 +index 2cef050..a18ae07 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c -@@ -575,7 +575,7 @@ static int disable_nx __initdata; +@@ -617,7 +617,7 @@ static int disable_nx __initdata; * Control non executable mappings. * * on Enable @@ -422,7 +422,7 @@ */ static int __init noexec_setup(char *str) { -@@ -584,14 +584,12 @@ static int __init noexec_setup(char *str) +@@ -626,14 +626,12 @@ static int __init noexec_setup(char *str) __supported_pte_mask |= _PAGE_NX; disable_nx = 0; } @@ -443,7 +443,7 @@ return 0; } -@@ -850,7 +848,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, +@@ -892,7 +890,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, set_nx(); if (nx_enabled) printk(KERN_INFO "NX (Execute Disable) protection: active\n"); @@ -456,10 +456,10 @@ /* Enable PSE if available */ if (cpu_has_pse) diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c -index 56fe712..ec932ae 100644 +index 56fe712..30d2be7 100644 --- a/arch/x86/mm/mmap.c +++ b/arch/x86/mm/mmap.c -@@ -111,13 +111,15 @@ static unsigned long mmap_legacy_base(void) +@@ -111,13 +111,16 @@ static unsigned long mmap_legacy_base(void) */ void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -471,7 +471,8 @@ } else { mm->mmap_base = mmap_base(); mm->get_unmapped_area = arch_get_unmapped_area_topdown; -+ if (!(current->personality & READ_IMPLIES_EXEC)) ++ if (!(current->personality & READ_IMPLIES_EXEC) ++ mmap_is_ia32()) + mm->get_unmapped_exec_area = arch_get_unmapped_exec_area; mm->unmap_area = arch_unmap_area_topdown; } @@ -490,7 +491,7 @@ ret = addr; goto up_fail; diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c -index bea2152..d750141 100644 +index b58e963..cdc83ce 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -316,6 +316,24 @@ static void xen_set_ldt(const void *addr, unsigned entries) @@ -529,7 +530,7 @@ .load_idt = xen_load_idt, .load_tls = xen_load_tls, diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c -index e3ff2b9..d46dcf2 100644 +index 33b7235..ce1f044 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -80,7 +80,7 @@ static struct linux_binfmt elf_format = { @@ -612,10 +613,10 @@ min_flt = task->min_flt; maj_flt = task->maj_flt; diff --git a/include/linux/mm.h b/include/linux/mm.h -index e8ddc98..bf87f4a 100644 +index 065cdf8..aa94aa9 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1122,7 +1122,13 @@ extern int install_special_mapping(struct mm_struct *mm, +@@ -1135,7 +1135,13 @@ extern int install_special_mapping(struct mm_struct *mm, unsigned long addr, unsigned long len, unsigned long flags, struct page **pages); @@ -662,7 +663,7 @@ /* * GPG2 wants 64kB of mlocked memory, to make sure pass phrases diff --git a/include/linux/sched.h b/include/linux/sched.h -index 4cae9b8..71fe593 100644 +index 8c216e0..79eca33 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -98,6 +98,9 @@ struct robust_list_head; @@ -675,7 +676,7 @@ /* * List of flags we want to share for kernel threads, * if only because they are not used by them anyway. -@@ -343,6 +346,10 @@ extern int sysctl_max_map_count; +@@ -346,6 +349,10 @@ extern int sysctl_max_map_count; extern unsigned long arch_get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); @@ -687,7 +688,7 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 368d163..2e4ab66 100644 +index c5ef44f..f7abce4 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -85,6 +85,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max; @@ -717,7 +718,7 @@ #ifdef CONFIG_RCU_TORTURE_TEST extern int rcutorture_runnable; #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */ -@@ -378,6 +398,14 @@ static struct ctl_table kern_table[] = { +@@ -379,6 +399,14 @@ static struct ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, { @@ -733,7 +734,7 @@ .procname = "core_uses_pid", .data = &core_uses_pid, diff --git a/mm/mmap.c b/mm/mmap.c -index 8d95902..c84ff1f 100644 +index 00ced3e..931bc3b 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -27,6 +27,7 @@ @@ -781,7 +782,7 @@ } /* -@@ -799,6 +816,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm, +@@ -802,6 +819,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm, } else /* cases 2, 5, 7 */ vma_adjust(prev, prev->vm_start, end, prev->vm_pgoff, NULL); @@ -790,7 +791,7 @@ return prev; } -@@ -954,7 +973,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, +@@ -956,7 +975,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, /* Obtain the address to map to. we verify (or select) it and ensure * that it represents a valid section of the address space. */ @@ -800,7 +801,7 @@ if (addr & ~PAGE_MASK) return addr; -@@ -1439,13 +1459,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr) +@@ -1436,13 +1456,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr) } unsigned long @@ -821,7 +822,7 @@ if (file && file->f_op && file->f_op->get_unmapped_area) get_area = file->f_op->get_unmapped_area; addr = get_area(file, addr, len, pgoff, flags); -@@ -1459,8 +1483,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, +@@ -1456,8 +1480,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, return arch_rebalance_pgtables(addr, len); } @@ -899,7 +900,7 @@ /* Look up the first VMA which satisfies addr < vm_end, NULL if none. */ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) -@@ -1535,6 +1627,14 @@ out: +@@ -1532,6 +1624,14 @@ out: return prev ? prev->vm_next : vma; } @@ -914,7 +915,7 @@ /* * Verify that the stack growth is acceptable and * update accounting. This is shared with both the -@@ -1551,7 +1651,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns +@@ -1548,7 +1648,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns return -ENOMEM; /* Stack limit test */ @@ -923,7 +924,7 @@ return -ENOMEM; /* mlock limit tests */ -@@ -1861,10 +1961,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma, +@@ -1858,10 +1958,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma, if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); @@ -940,7 +941,7 @@ vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); return 0; -@@ -2111,6 +2215,7 @@ void exit_mmap(struct mm_struct *mm) +@@ -2110,6 +2214,7 @@ void exit_mmap(struct mm_struct *mm) vm_unacct_memory(nr_accounted); free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0); tlb_finish_mmu(tlb, 0, end); @@ -949,7 +950,7 @@ /* * Walk the list again, actually closing and freeing it, diff --git a/mm/mprotect.c b/mm/mprotect.c -index abe2694..eb16148 100644 +index 258197b..9af91a3 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -25,9 +25,14 @@ @@ -976,7 +977,7 @@ pgoff_t pgoff; int error; int dirty_accountable = 0; -@@ -202,6 +207,9 @@ success: +@@ -203,6 +208,9 @@ success: dirty_accountable = 1; } From michich at fedoraproject.org Wed Mar 11 16:22:21 2009 From: michich at fedoraproject.org (Michal Schmidt) Date: Wed, 11 Mar 2009 16:22:21 +0000 (UTC) Subject: rpms/gajim/EL-5 .cvsignore, 1.10, 1.11 gajim.spec, 1.16, 1.17 sources, 1.10, 1.11 Message-ID: <20090311162221.8C45970128@cvs1.fedora.phx.redhat.com> Author: michich Update of /cvs/pkgs/rpms/gajim/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23954 Modified Files: .cvsignore gajim.spec sources Log Message: * Wed Mar 11 2009 Michal Schmidt - 0.12.1-1.el5.1 - Took the current version of Gajim and modified the spec for EL-5. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gajim/EL-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 24 Feb 2007 12:37:25 -0000 1.10 +++ .cvsignore 11 Mar 2009 16:21:51 -0000 1.11 @@ -1 +1 @@ -gajim-0.11.1.tar.bz2 +gajim-0.12.1.tar.gz Index: gajim.spec =================================================================== RCS file: /cvs/pkgs/rpms/gajim/EL-5/gajim.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gajim.spec 24 Feb 2007 12:37:25 -0000 1.16 +++ gajim.spec 11 Mar 2009 16:21:51 -0000 1.17 @@ -1,96 +1,166 @@ -Name: gajim -Version: 0.11.1 -Release: 1%{?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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: dbus-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: gtk2-devel -BuildRequires: gtkspell-devel -BuildRequires: intltool -BuildRequires: libXScrnSaver-devel -BuildRequires: pkgconfig -BuildRequires: pygtk2-devel >= 2.6.0 - -Requires: bind-utils -Requires: dbus-python -#Requires: gnome-python2-gconf -Requires: pygtk2-libglade -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -Requires: python-sqlite2 +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +Summary: Jabber client written in PyGTK +Name: gajim +Version: 0.12.1 +Release: 1%{?dist}.1 +License: GPLv2 +Group: Applications/Internet +URL: http://gajim.org/ +Source0: http://gajim.org/downloads/%{name}-%{version}.tar.gz + +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +Requires: avahi-tools +Requires: bind-utils +Requires: dbus-python + +%if 0%{?fc8}%{?fc9}%{?rhel} +%else +Requires: gnome-python2-gnome +%endif + +Requires: gnome-python2-canvas +Requires: notify-python +Requires: pygtk2-libglade +Requires: pyOpenSSL +Requires: python-docutils +Requires: python-kerberos +%if 0%{?fedora} +Requires: python-sexy +%endif +%if 0%{?rhel} +Requires: python-sqlite2 +%endif + +BuildRequires: dbus-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: gtk2-devel +BuildRequires: gtkspell-devel +BuildRequires: intltool +BuildRequires: libXScrnSaver-devel +BuildRequires: pygtk2-devel %description Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is to provide a full featured and easy to use xmpp client for the GTK+ users. Gajim does not require GNOME to run, eventhough it exists with it nicely. - %prep %setup -q +# Suppress error. +sed --in-place --expression '1d' ./src/gajim.py +sed --in-place --expression '1d' ./src/gajim-remote.py %build -%configure \ - --disable-dependency-tracking \ - --disable-static \ - --enable-remote \ - --enable-gtkspell \ - --enable-idle \ - --enable-trayicon - -make \ - %{?_smp_mflags} +%configure --docdir=%{_docdir}/%{name}-%{version} \ + --libdir=%{python_sitearch} \ + --disable-static --enable-remote --enable-gtkspell --enable-idle \ + --enable-trayicon +make %{?_smp_mflags} %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +rm -rf $RPM_BUILD_ROOT -rm -rf %{buildroot}%{_libdir}/gajim/*.la +make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT -# silence rpmlint warnings -chmod +x %{buildroot}%{_datadir}/gajim/src/{gajim{,-remote},history_manager}.py +rm -rf $RPM_BUILD_ROOT%{python_sitearch}/%{name}/*.la -desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - --remove-category=Application \ - --vendor=fedora \ - --delete-original \ - %{buildroot}%{_datadir}/applications/gajim.desktop +# Suppress rpmlint error. +chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/src/history_manager.py +desktop-file-install --vendor fedora --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --remove-category=Application \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %find_lang %{name} - %clean rm -rf %{buildroot} - %files -f %{name}.lang %defattr(-,root,root,-) -%{_bindir}/gajim -%{_bindir}/gajim-remote -%dir %{_libdir}/gajim/ -%{_libdir}/gajim/gtkspell.so -%{_libdir}/gajim/idle.so -%{_libdir}/gajim/trayicon.so -%{_datadir}/applications/*gajim.desktop -%{_datadir}/gajim/ -%{_datadir}/pixmaps/gajim* -%{_docdir}/gajim/ -%{_mandir}/man1/gajim.1* -%{_mandir}/man1/gajim-remote.1* +%doc AUTHORS +%doc ChangeLog +%doc COPYING +%doc README.html +%doc THANKS +%doc %{_mandir}/man1/%{name}.1* +%doc %{_mandir}/man1/%{name}-remote.1* +%{_bindir}/%{name} +%{_bindir}/%{name}-remote +%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/pixmaps/%{name}_about.png + +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/data +%{_datadir}/%{name}/src + +%dir %{python_sitearch}/%{name} +%{python_sitearch}/%{name}/gtkspell.so +%{python_sitearch}/%{name}/idle.so +%{python_sitearch}/%{name}/trayicon.so %changelog +* Wed Mar 11 2009 Michal Schmidt - 0.12.1-1.el5.1 +- Took the current version of Gajim and modified the spec for EL-5. + +* Tue Dec 23 2008 Debarshi Ray - 0.12.1-1 +- Version bump to 0.12.1. +- /usr/share/gajim/src/gajim-{remote}.py need not contain shebangs nor have the + executable bits. + +* Thu Dec 18 2008 Debarshi Ray - 0.12-1 +- Version bump to 0.12. +- Added 'Requires: notify-python python-kerberos'. + +* Sun Nov 30 2008 Debarshi Ray - 0.12-0.1.beta1 +- Version bump to 0.12 beta1. Closes Red Hat Bugzilla bug #471295. +- Added 'Requires: pyOpenSSL'. Addresses Red Hat Bugzilla bug #467523. +- Added 'Requires: python-sexy'. + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.11.4-7 +- Rebuilding with python-2.6 in Rawhide. + +* Sun Nov 09 2008 Debarshi Ray - 0.11.4-6 +- Added 'Requires: gnome-python2-gnome' on all distributions starting from + Fedora 10. Closes Red Hat Bugzilla bug #470181. + +* Tue Oct 28 2008 Debarshi Ray - 0.11.4-5 +- Added 'Requires: avahi-tools'. + +* Mon Jul 14 2008 Debarshi Ray - 0.11.4-4 +- Rebuilding to overcome Koji outage. + +* Mon Jul 14 2008 Debarshi Ray - 0.11.4-3 +- Updated BuildRoot according to Fedora packaging guidelines. +- Added 'Requires: gnome-python2-canvas'. Closes Red Hat Bugzilla bug #454622. +- Removed 'BuildRequires: pkgconfig' and dropped version from + 'BuildRequires: pygtk2-devel'. +- Fixed docdir and removed empty README. + +* Tue Feb 19 2008 Fedora Release Engineering - 0.11.4-2 +- Autorebuild for gcc-4.3. + +* Wed Dec 26 2007 Mat??j Cepl 0.11.4-1 +- New upstream release. + +* Sun Nov 25 2007 Dawid Gajownik - 0.11.3-2 +- Fix problem with python(abi) +- Add Requires: python-docutils + +* Sun Nov 18 2007 Dawid Gajownik - 0.11.3-1 +- Update to 0.11.3 (#315931) +- Fix Licence tag + * Fri Feb 23 2007 Dawid Gajownik - 0.11.1-1 - Update to 0.11.1 +- Remove python-sqlite2 dependency (it's now provided by python-2.5) * Tue Jan 23 2007 Dawid Gajownik - 0.11.1-0.1.pre1 - Update to 0.11.1-pre1 @@ -98,6 +168,9 @@ * Sun Jan 14 2007 Dawid Gajownik - 0.11-1 - Update to 0.11 +* Thu Dec 21 2006 Jason L Tibbitts III - 0.10.1-4 +- Rebuild for new Python. + * Thu Oct 05 2006 Christian Iseli 0.10.1-3 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gajim/EL-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 24 Feb 2007 12:37:25 -0000 1.10 +++ sources 11 Mar 2009 16:21:51 -0000 1.11 @@ -1 +1 @@ -cc587e7617f53ae8d5e0b30d7324e89c gajim-0.11.1.tar.bz2 +195a7973d3fbfb538e2ee74156aa6e9e gajim-0.12.1.tar.gz From kyle at fedoraproject.org Wed Mar 11 16:29:20 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Wed, 11 Mar 2009 16:29:20 +0000 (UTC) Subject: rpms/kernel/devel kernel.spec, 1.1412, 1.1413 linux-2.6-execshield.patch, 1.103, 1.104 Message-ID: <20090311162920.D5EE270128@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24973 Modified Files: kernel.spec linux-2.6-execshield.patch Log Message: * Wed Mar 11 2009 Kyle McMartin 2.6.29-0.233.rc7.git4 - linux-2.6-execshield.patch: Fix typo. Oops. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1412 retrieving revision 1.1413 diff -u -r1.1412 -r1.1413 --- kernel.spec 11 Mar 2009 16:04:52 -0000 1.1412 +++ kernel.spec 11 Mar 2009 16:28:50 -0000 1.1413 @@ -1824,6 +1824,10 @@ # and build. %changelog +* Wed Mar 11 2009 Kyle McMartin 2.6.29-0.233.rc7.git4 +- linux-2.6-execshield.patch: + Fix typo. Oops. + * Wed Mar 11 2009 Kyle McMartin 2.6.29-0.232.rc7.git4 - linux-2.6-execshield.patch: Fix from H.J. Lu, we were doing 32-bit randomization on 64-bit vaddr linux-2.6-execshield.patch: Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- linux-2.6-execshield.patch 11 Mar 2009 16:04:53 -0000 1.103 +++ linux-2.6-execshield.patch 11 Mar 2009 16:28:50 -0000 1.104 @@ -472,7 +472,7 @@ mm->mmap_base = mmap_base(); mm->get_unmapped_area = arch_get_unmapped_area_topdown; + if (!(current->personality & READ_IMPLIES_EXEC) -+ mmap_is_ia32()) ++ && mmap_is_ia32()) + mm->get_unmapped_exec_area = arch_get_unmapped_exec_area; mm->unmap_area = arch_unmap_area_topdown; } From kyle at fedoraproject.org Wed Mar 11 16:34:42 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Wed, 11 Mar 2009 16:34:42 +0000 (UTC) Subject: rpms/kernel/F-9 kernel.spec, 1.891.2.34, 1.891.2.35 linux-2.6-execshield.patch, 1.90.2.2, 1.90.2.3 Message-ID: <20090311163442.C9F9770128@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26443 Modified Files: Tag: private-fedora-9-2_6_27-branch kernel.spec linux-2.6-execshield.patch Log Message: * Wed Mar 11 2009 Kyle McMartin - linux-2.6-execshield.patch: Fix from H.J. Lu, arch_get_unmapped_exec_area is only appropriate for 32-bit mmap currently. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v retrieving revision 1.891.2.34 retrieving revision 1.891.2.35 diff -u -r1.891.2.34 -r1.891.2.35 --- kernel.spec 6 Mar 2009 04:21:36 -0000 1.891.2.34 +++ kernel.spec 11 Mar 2009 16:34:11 -0000 1.891.2.35 @@ -1963,6 +1963,11 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen %changelog +* Wed Mar 11 2009 Kyle McMartin +- linux-2.6-execshield.patch: + Fix from H.J. Lu, arch_get_unmapped_exec_area is only appropriate for + 32-bit mmap currently. + * Thu Mar 05 2009 Chuck Ebbert 2.6.27.19-78.2.34 - Add ext4 stable patch queue. - Drop linux-2.6-ext4-ENOSPC-debug.patch, replaced by upstream stable patch. linux-2.6-execshield.patch: Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-execshield.patch,v retrieving revision 1.90.2.2 retrieving revision 1.90.2.3 diff -u -r1.90.2.2 -r1.90.2.3 --- linux-2.6-execshield.patch 19 Jan 2009 07:23:09 -0000 1.90.2.2 +++ linux-2.6-execshield.patch 11 Mar 2009 16:34:11 -0000 1.90.2.3 @@ -289,7 +289,7 @@ return; diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c -index 60ec1d0..66d1a78 100644 +index 62dc07c..f7ae377 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -514,7 +514,7 @@ static int disable_nx __initdata; @@ -322,7 +322,7 @@ return 0; } -@@ -779,7 +777,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, +@@ -789,7 +787,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, set_nx(); if (nx_enabled) printk(KERN_INFO "NX (Execute Disable) protection: active\n"); @@ -335,10 +335,10 @@ /* Enable PSE if available */ if (cpu_has_pse) diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c -index 56fe712..ec932ae 100644 +index 56fe712..d8338f3 100644 --- a/arch/x86/mm/mmap.c +++ b/arch/x86/mm/mmap.c -@@ -111,13 +111,15 @@ static unsigned long mmap_legacy_base(void) +@@ -111,13 +111,16 @@ static unsigned long mmap_legacy_base(void) */ void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -350,7 +350,8 @@ } else { mm->mmap_base = mmap_base(); mm->get_unmapped_area = arch_get_unmapped_area_topdown; -+ if (!(current->personality & READ_IMPLIES_EXEC)) ++ if (!(current->personality & READ_IMPLIES_EXEC) ++ && mmap_is_ia32()) + mm->get_unmapped_exec_area = arch_get_unmapped_exec_area; mm->unmap_area = arch_unmap_area_topdown; } @@ -369,7 +370,7 @@ ret = addr; goto up_fail; diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c -index a4e201b..3b01589 100644 +index 6bbcf8a..b724be2 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -340,6 +340,24 @@ static void xen_set_ldt(const void *addr, unsigned entries) @@ -408,7 +409,7 @@ .load_idt = xen_load_idt, .load_tls = xen_load_tls, diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c -index 655ed8d..09da3e5 100644 +index e57df48..af92a88 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -80,7 +80,7 @@ static struct linux_binfmt elf_format = { @@ -606,10 +607,10 @@ extern void early_cpu_init(void); diff --git a/include/linux/mm.h b/include/linux/mm.h -index 72a15dc..f7f5411 100644 +index 856d52a..27c53cc 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1105,7 +1105,13 @@ extern int install_special_mapping(struct mm_struct *mm, +@@ -1104,7 +1104,13 @@ extern int install_special_mapping(struct mm_struct *mm, unsigned long addr, unsigned long len, unsigned long flags, struct page **pages); @@ -656,7 +657,7 @@ /* * GPG wants 32kB of mlocked memory, to make sure pass phrases diff --git a/include/linux/sched.h b/include/linux/sched.h -index 3d9120c..16f3911 100644 +index 03e0902..834e6bb 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -97,6 +97,9 @@ struct futex_pi_state; @@ -681,7 +682,7 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 50ec088..112a419 100644 +index 6816e6d..17f7745 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -83,6 +83,26 @@ extern int compat_log; @@ -711,7 +712,7 @@ #ifdef CONFIG_RCU_TORTURE_TEST extern int rcutorture_runnable; #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */ -@@ -363,6 +383,14 @@ static struct ctl_table kern_table[] = { +@@ -366,6 +386,14 @@ static struct ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, { @@ -727,7 +728,7 @@ .procname = "core_uses_pid", .data = &core_uses_pid, diff --git a/mm/mmap.c b/mm/mmap.c -index e7a5a68..fa7b4c5 100644 +index ca12a93..631c220 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -27,6 +27,7 @@ @@ -943,7 +944,7 @@ /* * Walk the list again, actually closing and freeing it, diff --git a/mm/mprotect.c b/mm/mprotect.c -index fded06f..a2cf942 100644 +index 2623e29..b134613 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -24,9 +24,14 @@ @@ -981,7 +982,7 @@ if (is_vm_hugetlb_page(vma)) hugetlb_change_protection(vma, start, end, vma->vm_page_prot); diff --git a/mm/mremap.c b/mm/mremap.c -index 1a77439..5bc2b6e 100644 +index cfdeed9..b4526b1 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -398,8 +398,8 @@ unsigned long do_mremap(unsigned long addr, From kyle at fedoraproject.org Wed Mar 11 16:34:46 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Wed, 11 Mar 2009 16:34:46 +0000 (UTC) Subject: rpms/kernel/F-10 kernel.spec, 1.1206.2.44, 1.1206.2.45 linux-2.6-execshield.patch, 1.97.12.2, 1.97.12.3 Message-ID: <20090311163446.8CE4E70128@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26473 Modified Files: Tag: private-fedora-10-2_6_27 kernel.spec linux-2.6-execshield.patch Log Message: * Wed Mar 11 2009 Kyle McMartin - linux-2.6-execshield.patch: Fix from H.J. Lu, arch_get_unmapped_exec_area is only appropriate for 32-bit mmap currently. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v retrieving revision 1.1206.2.44 retrieving revision 1.1206.2.45 diff -u -r1.1206.2.44 -r1.1206.2.45 --- kernel.spec 10 Mar 2009 15:31:43 -0000 1.1206.2.44 +++ kernel.spec 11 Mar 2009 16:34:16 -0000 1.1206.2.45 @@ -1988,6 +1988,11 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Wed Mar 11 2009 Kyle McMartin +- linux-2.6-execshield.patch: + Fix from H.J. Lu, arch_get_unmapped_exec_area is only appropriate for + 32-bit mmap currently. + * Tue Mar 10 2009 Jarod Wilson 2.6.27.19-170.2.44 - Un-muck-up hdpvr patch update -- can't use 2.6.29 features that aren't in 2.6.27... linux-2.6-execshield.patch: Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-execshield.patch,v retrieving revision 1.97.12.2 retrieving revision 1.97.12.3 diff -u -r1.97.12.2 -r1.97.12.3 --- linux-2.6-execshield.patch 19 Jan 2009 07:35:13 -0000 1.97.12.2 +++ linux-2.6-execshield.patch 11 Mar 2009 16:34:16 -0000 1.97.12.3 @@ -289,7 +289,7 @@ return; diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c -index 60ec1d0..66d1a78 100644 +index 62dc07c..f7ae377 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -514,7 +514,7 @@ static int disable_nx __initdata; @@ -322,7 +322,7 @@ return 0; } -@@ -779,7 +777,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, +@@ -789,7 +787,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, set_nx(); if (nx_enabled) printk(KERN_INFO "NX (Execute Disable) protection: active\n"); @@ -335,10 +335,10 @@ /* Enable PSE if available */ if (cpu_has_pse) diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c -index 56fe712..ec932ae 100644 +index 56fe712..d8338f3 100644 --- a/arch/x86/mm/mmap.c +++ b/arch/x86/mm/mmap.c -@@ -111,13 +111,15 @@ static unsigned long mmap_legacy_base(void) +@@ -111,13 +111,16 @@ static unsigned long mmap_legacy_base(void) */ void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -350,7 +350,8 @@ } else { mm->mmap_base = mmap_base(); mm->get_unmapped_area = arch_get_unmapped_area_topdown; -+ if (!(current->personality & READ_IMPLIES_EXEC)) ++ if (!(current->personality & READ_IMPLIES_EXEC) ++ && mmap_is_ia32()) + mm->get_unmapped_exec_area = arch_get_unmapped_exec_area; mm->unmap_area = arch_unmap_area_topdown; } @@ -369,7 +370,7 @@ ret = addr; goto up_fail; diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c -index a4e201b..3b01589 100644 +index 6bbcf8a..b724be2 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -340,6 +340,24 @@ static void xen_set_ldt(const void *addr, unsigned entries) @@ -408,7 +409,7 @@ .load_idt = xen_load_idt, .load_tls = xen_load_tls, diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c -index 655ed8d..09da3e5 100644 +index e57df48..af92a88 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -80,7 +80,7 @@ static struct linux_binfmt elf_format = { @@ -606,10 +607,10 @@ extern void early_cpu_init(void); diff --git a/include/linux/mm.h b/include/linux/mm.h -index 72a15dc..f7f5411 100644 +index 856d52a..27c53cc 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1105,7 +1105,13 @@ extern int install_special_mapping(struct mm_struct *mm, +@@ -1104,7 +1104,13 @@ extern int install_special_mapping(struct mm_struct *mm, unsigned long addr, unsigned long len, unsigned long flags, struct page **pages); @@ -656,7 +657,7 @@ /* * GPG wants 32kB of mlocked memory, to make sure pass phrases diff --git a/include/linux/sched.h b/include/linux/sched.h -index 3d9120c..16f3911 100644 +index 03e0902..834e6bb 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -97,6 +97,9 @@ struct futex_pi_state; @@ -681,7 +682,7 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 50ec088..112a419 100644 +index 6816e6d..17f7745 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -83,6 +83,26 @@ extern int compat_log; @@ -711,7 +712,7 @@ #ifdef CONFIG_RCU_TORTURE_TEST extern int rcutorture_runnable; #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */ -@@ -363,6 +383,14 @@ static struct ctl_table kern_table[] = { +@@ -366,6 +386,14 @@ static struct ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, { @@ -727,7 +728,7 @@ .procname = "core_uses_pid", .data = &core_uses_pid, diff --git a/mm/mmap.c b/mm/mmap.c -index e7a5a68..fa7b4c5 100644 +index ca12a93..631c220 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -27,6 +27,7 @@ @@ -943,7 +944,7 @@ /* * Walk the list again, actually closing and freeing it, diff --git a/mm/mprotect.c b/mm/mprotect.c -index fded06f..a2cf942 100644 +index 2623e29..b134613 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -24,9 +24,14 @@ @@ -981,7 +982,7 @@ if (is_vm_hugetlb_page(vma)) hugetlb_change_protection(vma, start, end, vma->vm_page_prot); diff --git a/mm/mremap.c b/mm/mremap.c -index 1a77439..5bc2b6e 100644 +index cfdeed9..b4526b1 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -398,8 +398,8 @@ unsigned long do_mremap(unsigned long addr, From kyle at fedoraproject.org Wed Mar 11 16:35:57 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Wed, 11 Mar 2009 16:35:57 +0000 (UTC) Subject: rpms/kernel/F-10 kernel.spec, 1.1284, 1.1285 linux-2.6-execshield.patch, 1.100, 1.101 Message-ID: <20090311163557.A0DD270128@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26674 Modified Files: kernel.spec linux-2.6-execshield.patch Log Message: * Wed Mar 11 2009 Kyle McMartin - linux-2.6-execshield.patch: Fix from H.J. Lu, arch_get_unmapped_exec_area is only appropriate for 32-bit mmap currently. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v retrieving revision 1.1284 retrieving revision 1.1285 diff -u -r1.1284 -r1.1285 --- kernel.spec 10 Mar 2009 06:21:25 -0000 1.1284 +++ kernel.spec 11 Mar 2009 16:35:27 -0000 1.1285 @@ -1767,6 +1767,11 @@ %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Wed Mar 11 2009 Kyle McMartin +- linux-2.6-execshield.patch: + Fix from H.J. Lu, arch_get_unmapped_exec_area is only appropriate for + 32-bit mmap currently. + * Tue Mar 10 2009 Chuck Ebbert 2.6.29-0.54.rc7.git3 - 2.6.29-rc7-git3 - Copy drm-modesetting-radeon and drm-next patches from rawhide. linux-2.6-execshield.patch: Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-execshield.patch,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- linux-2.6-execshield.patch 29 Jan 2009 21:14:11 -0000 1.100 +++ linux-2.6-execshield.patch 11 Mar 2009 16:35:27 -0000 1.101 @@ -73,7 +73,7 @@ #ifdef CONFIG_SMP diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h -index ba3e2ff..42a65f4 100644 +index e299287..aaa8a35 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -113,6 +113,9 @@ struct pv_cpu_ops { @@ -100,7 +100,7 @@ { PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr); diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h -index 091cd88..b1a6f6d 100644 +index 3bfd523..99c8119 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -158,6 +158,9 @@ static inline int hlt_works(int cpu) @@ -140,10 +140,10 @@ if (!c->x86_model_id[0]) { char *p; diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c -index e4c8fb6..30f7508 100644 +index c6520a4..2066aa1 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c -@@ -326,6 +326,9 @@ struct pv_cpu_ops pv_cpu_ops = { +@@ -352,6 +352,9 @@ struct pv_cpu_ops pv_cpu_ops = { .read_tscp = native_read_tscp, .load_tr_desc = native_load_tr_desc, .set_ldt = native_set_ldt, @@ -154,10 +154,10 @@ .load_idt = native_load_idt, .store_gdt = native_store_gdt, diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c -index a546f55..f180caf 100644 +index bd4da2a..60823d4 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c -@@ -346,6 +346,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, +@@ -343,6 +343,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, void start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp) { @@ -166,7 +166,7 @@ __asm__("movl %0, %%gs" : : "r"(0)); regs->fs = 0; set_fs(USER_DS); -@@ -355,6 +357,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp) +@@ -352,6 +354,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp) regs->cs = __USER_CS; regs->ip = new_ip; regs->sp = new_sp; @@ -178,7 +178,7 @@ /* * Free the old FP and other extended state */ -@@ -522,7 +529,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) +@@ -519,7 +526,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ __unlazy_fpu(prev_p); @@ -188,7 +188,7 @@ /* we're going to use this soon, after a few expensive things */ if (next_p->fpu_counter > 5) -@@ -695,3 +703,41 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) +@@ -692,3 +700,41 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) unsigned long range_end = mm->brk + 0x02000000; return randomize_range(mm->brk, range_end, 0) ? : mm->brk; } @@ -252,10 +252,10 @@ if (!cpu_isset(cpu, flush_cpumask)) goto out; diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c -index 98c2d05..db483ea 100644 +index a9e7548..af0f8f0 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c -@@ -154,6 +154,76 @@ static int lazy_iobitmap_copy(void) +@@ -160,6 +160,76 @@ static int lazy_iobitmap_copy(void) return 0; } @@ -332,7 +332,7 @@ #endif static void __kprobes -@@ -317,6 +387,29 @@ do_general_protection(struct pt_regs *regs, long error_code) +@@ -323,6 +393,29 @@ do_general_protection(struct pt_regs *regs, long error_code) if (!user_mode(regs)) goto gp_in_kernel; @@ -362,7 +362,7 @@ tsk->thread.error_code = error_code; tsk->thread.trap_no = 13; -@@ -923,19 +1016,37 @@ do_device_not_available(struct pt_regs *regs, long error) +@@ -934,19 +1027,37 @@ dotraplinkage void __kprobes do_device_not_available(struct pt_regs regs) } #ifdef CONFIG_X86_32 @@ -410,10 +410,10 @@ #endif diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c -index 88f1b10..1e31b5e 100644 +index 2cef050..a18ae07 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c -@@ -575,7 +575,7 @@ static int disable_nx __initdata; +@@ -617,7 +617,7 @@ static int disable_nx __initdata; * Control non executable mappings. * * on Enable @@ -422,7 +422,7 @@ */ static int __init noexec_setup(char *str) { -@@ -584,14 +584,12 @@ static int __init noexec_setup(char *str) +@@ -626,14 +626,12 @@ static int __init noexec_setup(char *str) __supported_pte_mask |= _PAGE_NX; disable_nx = 0; } @@ -443,7 +443,7 @@ return 0; } -@@ -850,7 +848,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, +@@ -892,7 +890,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, set_nx(); if (nx_enabled) printk(KERN_INFO "NX (Execute Disable) protection: active\n"); @@ -456,10 +456,10 @@ /* Enable PSE if available */ if (cpu_has_pse) diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c -index 56fe712..ec932ae 100644 +index 56fe712..30d2be7 100644 --- a/arch/x86/mm/mmap.c +++ b/arch/x86/mm/mmap.c -@@ -111,13 +111,15 @@ static unsigned long mmap_legacy_base(void) +@@ -111,13 +111,16 @@ static unsigned long mmap_legacy_base(void) */ void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -471,7 +471,8 @@ } else { mm->mmap_base = mmap_base(); mm->get_unmapped_area = arch_get_unmapped_area_topdown; -+ if (!(current->personality & READ_IMPLIES_EXEC)) ++ if (!(current->personality & READ_IMPLIES_EXEC) ++ && mmap_is_ia32()) + mm->get_unmapped_exec_area = arch_get_unmapped_exec_area; mm->unmap_area = arch_unmap_area_topdown; } @@ -490,7 +491,7 @@ ret = addr; goto up_fail; diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c -index bea2152..d750141 100644 +index b58e963..cdc83ce 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -316,6 +316,24 @@ static void xen_set_ldt(const void *addr, unsigned entries) @@ -529,7 +530,7 @@ .load_idt = xen_load_idt, .load_tls = xen_load_tls, diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c -index e3ff2b9..d46dcf2 100644 +index 33b7235..ce1f044 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -80,7 +80,7 @@ static struct linux_binfmt elf_format = { @@ -612,10 +613,10 @@ min_flt = task->min_flt; maj_flt = task->maj_flt; diff --git a/include/linux/mm.h b/include/linux/mm.h -index e8ddc98..bf87f4a 100644 +index 065cdf8..aa94aa9 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1122,7 +1122,13 @@ extern int install_special_mapping(struct mm_struct *mm, +@@ -1135,7 +1135,13 @@ extern int install_special_mapping(struct mm_struct *mm, unsigned long addr, unsigned long len, unsigned long flags, struct page **pages); @@ -662,7 +663,7 @@ /* * GPG2 wants 64kB of mlocked memory, to make sure pass phrases diff --git a/include/linux/sched.h b/include/linux/sched.h -index 4cae9b8..71fe593 100644 +index 8c216e0..79eca33 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -98,6 +98,9 @@ struct robust_list_head; @@ -675,7 +676,7 @@ /* * List of flags we want to share for kernel threads, * if only because they are not used by them anyway. -@@ -343,6 +346,10 @@ extern int sysctl_max_map_count; +@@ -346,6 +349,10 @@ extern int sysctl_max_map_count; extern unsigned long arch_get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); @@ -687,7 +688,7 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 368d163..2e4ab66 100644 +index c5ef44f..f7abce4 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -85,6 +85,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max; @@ -717,7 +718,7 @@ #ifdef CONFIG_RCU_TORTURE_TEST extern int rcutorture_runnable; #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */ -@@ -378,6 +398,14 @@ static struct ctl_table kern_table[] = { +@@ -379,6 +399,14 @@ static struct ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, { @@ -733,7 +734,7 @@ .procname = "core_uses_pid", .data = &core_uses_pid, diff --git a/mm/mmap.c b/mm/mmap.c -index 8d95902..c84ff1f 100644 +index 00ced3e..931bc3b 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -27,6 +27,7 @@ @@ -781,7 +782,7 @@ } /* -@@ -799,6 +816,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm, +@@ -802,6 +819,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm, } else /* cases 2, 5, 7 */ vma_adjust(prev, prev->vm_start, end, prev->vm_pgoff, NULL); @@ -790,7 +791,7 @@ return prev; } -@@ -954,7 +973,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, +@@ -956,7 +975,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, /* Obtain the address to map to. we verify (or select) it and ensure * that it represents a valid section of the address space. */ @@ -800,7 +801,7 @@ if (addr & ~PAGE_MASK) return addr; -@@ -1439,13 +1459,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr) +@@ -1436,13 +1456,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr) } unsigned long @@ -821,7 +822,7 @@ if (file && file->f_op && file->f_op->get_unmapped_area) get_area = file->f_op->get_unmapped_area; addr = get_area(file, addr, len, pgoff, flags); -@@ -1459,8 +1483,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, +@@ -1456,8 +1480,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, return arch_rebalance_pgtables(addr, len); } @@ -899,7 +900,7 @@ /* Look up the first VMA which satisfies addr < vm_end, NULL if none. */ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) -@@ -1535,6 +1627,14 @@ out: +@@ -1532,6 +1624,14 @@ out: return prev ? prev->vm_next : vma; } @@ -914,7 +915,7 @@ /* * Verify that the stack growth is acceptable and * update accounting. This is shared with both the -@@ -1551,7 +1651,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns +@@ -1548,7 +1648,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns return -ENOMEM; /* Stack limit test */ @@ -923,7 +924,7 @@ return -ENOMEM; /* mlock limit tests */ -@@ -1861,10 +1961,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma, +@@ -1858,10 +1958,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma, if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); @@ -940,7 +941,7 @@ vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); return 0; -@@ -2111,6 +2215,7 @@ void exit_mmap(struct mm_struct *mm) +@@ -2110,6 +2214,7 @@ void exit_mmap(struct mm_struct *mm) vm_unacct_memory(nr_accounted); free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0); tlb_finish_mmu(tlb, 0, end); @@ -949,7 +950,7 @@ /* * Walk the list again, actually closing and freeing it, diff --git a/mm/mprotect.c b/mm/mprotect.c -index abe2694..eb16148 100644 +index 258197b..9af91a3 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -25,9 +25,14 @@ @@ -976,7 +977,7 @@ pgoff_t pgoff; int error; int dirty_accountable = 0; -@@ -202,6 +207,9 @@ success: +@@ -203,6 +208,9 @@ success: dirty_accountable = 1; } From glommer at fedoraproject.org Wed Mar 11 16:48:34 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 11 Mar 2009 16:48:34 +0000 (UTC) Subject: rpms/bochs/devel bochs.spec,1.40,1.41 sources,1.14,1.15 Message-ID: <20090311164834.229B770128@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/bochs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28865 Modified Files: bochs.spec sources Log Message: build kvm bios Index: bochs.spec =================================================================== RCS file: /cvs/pkgs/rpms/bochs/devel/bochs.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- bochs.spec 6 Mar 2009 05:48:52 -0000 1.40 +++ bochs.spec 11 Mar 2009 16:48:03 -0000 1.41 @@ -1,7 +1,7 @@ %define githead 04387139e3b Name: bochs Version: 2.3.8 -Release: 0.4.git%{githead}%{?dist} +Release: 0.5.git%{githead}%{?dist} Summary: Portable x86 PC emulator Group: Applications/Emulators License: LGPLv2+ @@ -12,6 +12,12 @@ # git archive --format=tar --prefix=%{name}-%{version}/ %{githead} | gzip > ../%{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz +# This should not live here, but letting it in the kvm package would produce another noarch package we would +# then have to get rid of in the future. So let it be. +# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git +# git archive --format=tar --prefix=kvm-bios.tar.gz HEAD bios | gzip > ../kvm-bios.tar.gz +Source1: kvm-bios.tar.gz + Patch0: %{name}-0001_bx-qemu.patch Patch1: %{name}-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch Patch2: %{name}-0003_kvm-bios-generate-mptable-unconditionally.patch @@ -32,7 +38,7 @@ #BuildRequires: wxGTK-devel %ifarch %{ix86} x86_64 BuildRequires: svgalib-devel -BuildRequires: dev86 +BuildRequires: dev86 iasl %endif Requires: %{name}-bios = %{version}-%{release} Requires: vgabios @@ -99,6 +105,9 @@ %patch10 -p1 %patch11 -p0 -z .nonet +%setup -b 1 +mv ../kvm-bios ./ + # Fix up some man page paths. sed -i \ -e 's|/usr/local/share/doc/bochs/|%{_docdir}/%{name}-%{version}/|' \ @@ -153,6 +162,9 @@ %ifarch %{ix86} x86_64 cd bios make bios +cd ../kvm-bios/bios +make bios +cp BIOS-bochs-latest ../../bios/BIOS-bochs-kvm %endif %install @@ -203,6 +215,11 @@ %changelog +* Wed Mar 11 2009 Glauber Costa 2.3.8-0.5.git04387139e3b +- kvm needs a slightly different bios due to irq routing, so build it too. + from kvm source. This is not ideal, but avoids the creation of yet another + noarch subpackage. + * Fri Mar 06 2009 Glauber Costa 2.3.8-0.4.git04387139e3b - Provide and Obsolete bochs-bios-data to make sure no one is harmed during updates. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bochs/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 5 Mar 2009 17:33:46 -0000 1.14 +++ sources 11 Mar 2009 16:48:03 -0000 1.15 @@ -1 +1,2 @@ a360358375ad00487f0f26dcc667a4a4 bochs-2.3.8.tar.gz +9fb228d2176430963c4d2d8afcf2faff kvm-bios.tar.gz From tomeu at fedoraproject.org Wed Mar 11 16:51:10 2009 From: tomeu at fedoraproject.org (Tomeu Vizoso) Date: Wed, 11 Mar 2009 16:51:10 +0000 (UTC) Subject: rpms/sugar-artwork/devel .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 sugar-artwork.spec, 1.20, 1.21 Message-ID: <20090311165110.241B170128@cvs1.fedora.phx.redhat.com> Author: tomeu Update of /cvs/pkgs/rpms/sugar-artwork/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29233 Modified Files: .cvsignore sources sugar-artwork.spec Log Message: * Wed Mar 11 2009 Tomeu Vizoso - 0.84.1-1 - Add back some icons to the Makefile (Simon) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 3 Mar 2009 21:02:04 -0000 1.16 +++ .cvsignore 11 Mar 2009 16:50:39 -0000 1.17 @@ -1 +1 @@ -sugar-artwork-0.84.0.tar.bz2 +sugar-artwork-0.84.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 3 Mar 2009 21:02:04 -0000 1.16 +++ sources 11 Mar 2009 16:50:39 -0000 1.17 @@ -1 +1 @@ -b3f931e0b93635d281fe3c16fbd323c5 sugar-artwork-0.84.0.tar.bz2 +d28b847a24aa23a1b6949aa6a7873560 sugar-artwork-0.84.1.tar.bz2 Index: sugar-artwork.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sugar-artwork.spec 3 Mar 2009 21:02:04 -0000 1.20 +++ sugar-artwork.spec 11 Mar 2009 16:50:39 -0000 1.21 @@ -3,7 +3,7 @@ Summary: Artwork for Sugar look-and-feel Name: sugar-artwork -Version: 0.84.0 +Version: 0.84.1 Release: 1%{?dist} #Release: 2.%{alphatag}%{?dist} URL: http://sugarlabs.org @@ -64,6 +64,9 @@ %{_libdir}/gtk-2.0/*/engines/*.so %changelog +* Wed Mar 11 2009 Tomeu Vizoso - 0.84.1-1 +- Add back some icons to the Makefile (Simon) + * Tue Mar 03 2009 Simon Schampijer - 0.84.0-1 - Rebuild for 0.84 From pjones at fedoraproject.org Wed Mar 11 16:56:39 2009 From: pjones at fedoraproject.org (Peter Jones) Date: Wed, 11 Mar 2009 16:56:39 +0000 (UTC) Subject: rpms/grub/devel grub-0.97-efigraph-use-blt.patch,1.2,1.3 Message-ID: <20090311165639.3FC2A70128@cvs1.fedora.phx.redhat.com> Author: pjones Update of /cvs/extras/rpms/grub/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30311 Modified Files: grub-0.97-efigraph-use-blt.patch Log Message: Try a different approach to make GCC stop griping. grub-0.97-efigraph-use-blt.patch: Index: grub-0.97-efigraph-use-blt.patch =================================================================== RCS file: /cvs/extras/rpms/grub/devel/grub-0.97-efigraph-use-blt.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- grub-0.97-efigraph-use-blt.patch 11 Mar 2009 15:55:02 -0000 1.2 +++ grub-0.97-efigraph-use-blt.patch 11 Mar 2009 16:56:38 -0000 1.3 @@ -15,7 +15,7 @@ + + position_to_phys(eg, pos, &phys); + -+ Call_Service_10(eg->output_intf->blt, eg->output_intf, (struct grub_efi_graphics_output_blt_pixel_t *)bltbuf->pixbuf, ++ Call_Service_10(eg->output_intf->blt, eg->output_intf, (void *)bltbuf->pixbuf, + GRUB_EFI_BLT_BUFFER_TO_VIDEO, + bltpos->x, bltpos->y, + phys.x, phys.y, From rrakus at fedoraproject.org Wed Mar 11 16:59:52 2009 From: rrakus at fedoraproject.org (Roman Rakus) Date: Wed, 11 Mar 2009 16:59:52 +0000 (UTC) Subject: rpms/bash/devel bash40-001, NONE, 1.1 bash40-002, NONE, 1.1 bash40-003, NONE, 1.1 bash40-004, NONE, 1.1 bash40-005, NONE, 1.1 bash40-006, NONE, 1.1 bash40-007, NONE, 1.1 bash40-008, NONE, 1.1 bash40-009, NONE, 1.1 bash40-010, NONE, 1.1 bash.spec, 1.176, 1.177 Message-ID: <20090311165952.3783370128@cvs1.fedora.phx.redhat.com> Author: rrakus Update of /cvs/extras/rpms/bash/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30907 Modified Files: bash.spec Added Files: bash40-001 bash40-002 bash40-003 bash40-004 bash40-005 bash40-006 bash40-007 bash40-008 bash40-009 bash40-010 Log Message: Patch level 10 --- NEW FILE bash40-001 --- BASH PATCH REPORT ================= Bash-Release: 4.0 Patch-ID: bash40-001 Bug-Reported-by: Mike Frysinger Bug-Reference-ID: <200902211821.42188.vapier at gentoo.org> Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00147.html Bug-Description: Bash has problems parsing certain constructs inside Posix-style $(...) command substitutions, mostly with backslash-quoting and reserved word recognition. This is an issue because the contents are parsed at the time the word containing the command substitution is read. Patch: *** ../bash-4.0/parse.y 2009-01-08 08:29:12.000000000 -0500 --- parse.y 2009-03-06 20:32:35.000000000 -0500 *************** *** 2928,2931 **** --- 2932,2936 ---- #define LEX_HEREDELIM 0x100 /* reading here-doc delimiter */ #define LEX_STRIPDOC 0x200 /* <<- strip tabs from here doc delim */ + #define LEX_INWORD 0x400 #define COMSUB_META(ch) ((ch) == ';' || (ch) == '&' || (ch) == '|') *************** *** 3180,3184 **** int *lenp, flags; { ! int count, ch, peekc, tflags, lex_rwlen, lex_firstind; int nestlen, ttranslen, start_lineno; char *ret, *nestret, *ttrans, *heredelim; --- 3188,3192 ---- int *lenp, flags; { ! int count, ch, peekc, tflags, lex_rwlen, lex_wlen, lex_firstind; int nestlen, ttranslen, start_lineno; char *ret, *nestret, *ttrans, *heredelim; *************** *** 3201,3205 **** start_lineno = line_number; ! lex_rwlen = 0; heredelim = 0; --- 3209,3213 ---- start_lineno = line_number; ! lex_rwlen = lex_wlen = 0; heredelim = 0; *************** *** 3268,3271 **** --- 3276,3319 ---- } + if (tflags & LEX_PASSNEXT) /* last char was backslash */ + { + /*itrace("parse_comsub:%d: lex_passnext -> 0 ch = `%c' (%d)", line_number, ch, __LINE__);*/ + tflags &= ~LEX_PASSNEXT; + if (qc != '\'' && ch == '\n') /* double-quoted \ disappears. */ + { + if (retind > 0) + retind--; /* swallow previously-added backslash */ + continue; + } + + RESIZE_MALLOCED_BUFFER (ret, retind, 2, retsize, 64); + if MBTEST(ch == CTLESC || ch == CTLNUL) + ret[retind++] = CTLESC; + ret[retind++] = ch; + continue; + } + + /* If this is a shell break character, we are not in a word. If not, + we either start or continue a word. */ + if MBTEST(shellbreak (ch)) + { + tflags &= ~LEX_INWORD; + /*itrace("parse_comsub:%d: lex_inword -> 0 ch = `%c' (%d)", line_number, ch, __LINE__);*/ + } + else + { + if (tflags & LEX_INWORD) + { + lex_wlen++; + /*itrace("parse_comsub:%d: lex_inword == 1 ch = `%c' lex_wlen = %d (%d)", line_number, ch, lex_wlen, __LINE__);*/ + } + else + { + /*itrace("parse_comsub:%d: lex_inword -> 1 ch = `%c' (%d)", line_number, ch, __LINE__);*/ + tflags |= LEX_INWORD; + lex_wlen = 0; + } + } + /* Skip whitespace */ if MBTEST(shellblank (ch) && lex_rwlen == 0) *************** *** 3400,3428 **** } else ! ch = peekc; /* fall through and continue XXX - this skips comments if peekc == '#' */ } ! /* Not exactly right yet, should handle shell metacharacters, too. If ! any changes are made to this test, make analogous changes to subst.c: ! extract_delimited_string(). */ ! else if MBTEST((tflags & LEX_CKCOMMENT) && (tflags & LEX_INCOMMENT) == 0 && ch == '#' && (retind == 0 || ret[retind-1] == '\n' || shellblank (ret[retind - 1]))) tflags |= LEX_INCOMMENT; ! if (tflags & LEX_PASSNEXT) /* last char was backslash */ ! { ! tflags &= ~LEX_PASSNEXT; ! if (qc != '\'' && ch == '\n') /* double-quoted \ disappears. */ ! { ! if (retind > 0) ! retind--; /* swallow previously-added backslash */ ! continue; ! } ! ! RESIZE_MALLOCED_BUFFER (ret, retind, 2, retsize, 64); ! if MBTEST(ch == CTLESC || ch == CTLNUL) ! ret[retind++] = CTLESC; ! ret[retind++] = ch; ! continue; ! } ! else if MBTEST(ch == CTLESC || ch == CTLNUL) /* special shell escapes */ { RESIZE_MALLOCED_BUFFER (ret, retind, 2, retsize, 64); --- 3442,3454 ---- } else ! ch = peekc; /* fall through and continue XXX */ } ! else if MBTEST((tflags & LEX_CKCOMMENT) && (tflags & LEX_INCOMMENT) == 0 && ch == '#' && (((tflags & LEX_RESWDOK) && lex_rwlen == 0) || ((tflags & LEX_INWORD) && lex_wlen == 0))) ! { ! /*itrace("parse_comsub:%d: lex_incomment -> 1 (%d)", line_number, __LINE__);*/ tflags |= LEX_INCOMMENT; + } ! if MBTEST(ch == CTLESC || ch == CTLNUL) /* special shell escapes */ { RESIZE_MALLOCED_BUFFER (ret, retind, 2, retsize, 64); *** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 --- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 0 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 1 #endif /* _PATCHLEVEL_H_ */ --- NEW FILE bash40-002 --- BASH PATCH REPORT ================= Bash-Release: 4.0 Patch-ID: bash40-002 Bug-Reported-by: phil at Arcturus.universe Bug-Reference-ID: <20090221143709.13878.qmail at Arcturus.universe> Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00142.html Bug-Description: A line inadvertenly omitted from a submitted patch results in core dumps when attempting filename completion while using the bash-completion package. Patch: *** ../bash-4.0/pcomplete.c 2009-02-01 17:12:31.000000000 -0500 --- pcomplete.c 2009-02-22 17:08:25.000000000 -0500 *************** *** 1033,1036 **** --- 1033,1037 ---- pps = &ps; + save_parser_state (pps); begin_unwind_frame ("gen-shell-function-matches"); add_unwind_protect (restore_parser_state, (char *)pps); *** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 --- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 1 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 2 #endif /* _PATCHLEVEL_H_ */ --- NEW FILE bash40-003 --- BASH PATCH REPORT ================= Bash-Release: 4.0 Patch-ID: bash40-003 Bug-Reported-by: Bernd Eggink Bug-Reference-ID: <49A323F5.60503 at sudrala.de> Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00177.html Bug-Description: Under certain circumstances, constructs containing command substitutions prevent PS1 from being re-evaluated and updated before being displayed. Patch: *** ../bash-4.0/parse.y 2009-01-08 08:29:12.000000000 -0500 --- parse.y 2009-02-25 15:58:25.000000000 -0500 *************** *** 1616,1623 **** int *ret; ! ret = (int *)xmalloc (3 * sizeof (int)); ret[0] = last_read_token; ret[1] = token_before_that; ret[2] = two_tokens_ago; return ret; } --- 1616,1624 ---- int *ret; ! ret = (int *)xmalloc (4 * sizeof (int)); ret[0] = last_read_token; ret[1] = token_before_that; ret[2] = two_tokens_ago; + ret[3] = current_token; return ret; } *************** *** 1632,1635 **** --- 1633,1637 ---- token_before_that = ts[1]; two_tokens_ago = ts[2]; + current_token = ts[3]; } *************** *** 2669,2672 **** --- 2671,2675 ---- word_desc_to_read = (WORD_DESC *)NULL; + current_token = '\n'; /* XXX */ last_read_token = '\n'; token_to_read = '\n'; *** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 --- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 2 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 3 #endif /* _PATCHLEVEL_H_ */ --- NEW FILE bash40-004 --- BASH PATCH REPORT ================= Bash-Release: 4.0 Patch-ID: bash40-004 Bug-Reported-by: Mike Frysinger Bug-Reference-ID: <200902231720.30519.vapier at gentoo.org> Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00176.html Bug-Description: In some cases, enabling the `checkjobs' shell option will cause the shell to core dump when executing the `exit' builtin. Patch: *** ../bash-4.0/builtins/exit.def 2009-01-04 14:32:22.000000000 -0500 --- builtins/exit.def 2009-02-23 22:56:58.000000000 -0500 *************** *** 114,118 **** if (jobs[i] && STOPPED (i)) stopmsg = JSTOPPED; ! else if (check_jobs_at_exit && stopmsg == 0 && RUNNING (i)) stopmsg = JRUNNING; --- 114,118 ---- if (jobs[i] && STOPPED (i)) stopmsg = JSTOPPED; ! else if (check_jobs_at_exit && stopmsg == 0 && jobs[i] && RUNNING (i)) stopmsg = JRUNNING; *** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 --- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 3 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 4 #endif /* _PATCHLEVEL_H_ */ --- NEW FILE bash40-005 --- BASH PATCH REPORT ================= Bash-Release: 4.0 Patch-ID: bash40-005 Bug-Reported-by: Pierre Gaston Bug-Reference-ID: Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00206.html Bug-Description: The `declare' builtin dumped core when attempting to assign associative array indices containing some special characters, even when they were quoted before being expanded. Patch: *** ../bash-4.0/builtins/declare.def 2009-01-04 14:32:22.000000000 -0500 --- builtins/declare.def 2009-02-26 11:40:16.000000000 -0500 *************** *** 296,299 **** --- 296,306 ---- if (t = strchr (name, '[')) /* ] */ { + /* If offset != 0 we have already validated any array reference */ + if (offset == 0 && valid_array_reference (name) == 0) + { + sh_invalidid (name); + assign_error++; + NEXT_VARIABLE (); + } subscript_start = t; *t = '\0'; *************** *** 485,489 **** /* declare -a name[[n]] or declare name[n] makes name an indexed array variable. */ ! else if ((making_array_special || (flags_on & att_array)) && array_p (var) == 0) var = convert_var_to_array (var); #endif /* ARRAY_VARS */ --- 492,496 ---- /* declare -a name[[n]] or declare name[n] makes name an indexed array variable. */ ! else if ((making_array_special || (flags_on & att_array)) && array_p (var) == 0 && assoc_p (var) == 0) var = convert_var_to_array (var); #endif /* ARRAY_VARS */ *** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 --- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 4 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 5 #endif /* _PATCHLEVEL_H_ */ --- NEW FILE bash40-006 --- BASH PATCH REPORT ================= Bash-Release: 4.0 Patch-ID: bash40-006 Bug-Reported-by: Evgeniy Zhemchugov Bug-Reference-ID: Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00202.html Bug-Description: Bash did not parse pipelines using the |& construct correctly if the pipeline elements were not simple commands. Patch: *** ../bash-4.0/parse.y 2009-01-08 08:29:12.000000000 -0500 --- parse.y 2009-02-25 17:25:56.000000000 -0500 *************** *** 4478,4481 **** --- 4478,4482 ---- case AND_AND: case BANG: + case BAR_AND: case DO: case DONE: *** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 --- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 5 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 6 #endif /* _PATCHLEVEL_H_ */ --- NEW FILE bash40-007 --- BASH PATCH REPORT ================= Bash-Release: 4.0 Patch-ID: bash40-007 Bug-Reported-by: AnMaster Bug-Reference-ID: <49A41C18.80807 at tele2.se> Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00188.html Bug-Description: Bash had a number of problems parsing associative array subscripts containing special characters. The subscripts are supposed to be read as if they are enclosed between double quotes. Patch: *** ../bash-4.0/parse.y 2009-01-08 08:29:12.000000000 -0500 --- parse.y 2009-02-25 17:25:56.000000000 -0500 *************** *** 2919,2922 **** --- 2919,2923 ---- #define P_COMMAND 0x08 /* parsing a command, so look for comments */ #define P_BACKQUOTE 0x10 /* parsing a backquoted command substitution */ + #define P_ARRAYSUB 0x20 /* parsing a [...] array subscript for assignment */ /* Lexical state while parsing a grouping construct or $(...). */ *************** *** 3134,3137 **** --- 3134,3139 ---- FREE (nestret); } + else if ((flags & P_ARRAYSUB) && (tflags & LEX_WASDOL) && (ch == '(' || ch == '{' || ch == '[')) /* ) } ] */ + goto parse_dollar_word; } /* Parse an old-style command substitution within double quotes as a *************** *** 3150,3153 **** --- 3150,3154 ---- /* check for $(), $[], or ${} inside quoted string. */ { + parse_dollar_word: if (open == ch) /* undo previous increment */ count--; *************** *** 4277,4281 **** (token_index == 0 && (parser_state&PST_COMPASSIGN)))) { ! ttok = parse_matched_pair (cd, '[', ']', &ttoklen, 0); if (ttok == &matched_pair_error) return -1; /* Bail immediately. */ --- 4277,4281 ---- (token_index == 0 && (parser_state&PST_COMPASSIGN)))) { ! ttok = parse_matched_pair (cd, '[', ']', &ttoklen, P_ARRAYSUB); if (ttok == &matched_pair_error) return -1; /* Bail immediately. */ *** ../bash-4.0/arrayfunc.c 2009-01-04 14:32:21.000000000 -0500 --- arrayfunc.c 2009-02-25 07:58:54.000000000 -0500 *************** *** 605,666 **** } ! /* This function assumes s[i] == '['; returns with s[ret] == ']' if ! an array subscript is correctly parsed. */ ! int ! skipsubscript (s, i) ! const char *s; ! int i; ! { ! int count, c; ! #if defined (HANDLE_MULTIBYTE) ! mbstate_t state, state_bak; ! size_t slength, mblength; ! #endif ! ! #if defined (HANDLE_MULTIBYTE) ! memset (&state, '\0', sizeof (mbstate_t)); ! slength = strlen (s + i); ! #endif ! ! count = 1; ! while (count) ! { ! /* Advance one (possibly multibyte) character in S starting at I. */ ! #if defined (HANDLE_MULTIBYTE) ! if (MB_CUR_MAX > 1) ! { ! state_bak = state; ! mblength = mbrlen (s + i, slength, &state); ! ! if (MB_INVALIDCH (mblength)) ! { ! state = state_bak; ! i++; ! slength--; ! } ! else if (MB_NULLWCH (mblength)) ! return i; ! else ! { ! i += mblength; ! slength -= mblength; ! } ! } ! else ! #endif ! ++i; ! ! c = s[i]; ! ! if (c == 0) ! break; ! else if (c == '[') ! count++; ! else if (c == ']') ! count--; ! } ! ! return i; ! } /* This function is called with SUB pointing to just after the beginning --- 605,609 ---- } ! /* skipsubscript moved to subst.c to use private functions. 2009/02/24. */ /* This function is called with SUB pointing to just after the beginning *** ../bash-4.0/subst.c 2009-01-28 14:34:12.000000000 -0500 --- subst.c 2009-02-25 09:18:33.000000000 -0500 *************** *** 223,226 **** --- 223,227 ---- static char *extract_delimited_string __P((char *, int *, char *, char *, char *, int)); static char *extract_dollar_brace_string __P((char *, int *, int, int)); + static int skip_matched_pair __P((const char *, int, int, int, int)); static char *pos_params __P((char *, int, int, int)); *************** *** 1375,1378 **** --- 1376,1480 ---- #define CQ_RETURN(x) do { no_longjmp_on_fatal_error = 0; return (x); } while (0) + /* This function assumes s[i] == open; returns with s[ret] == close; used to + parse array subscripts. FLAGS currently unused. */ + static int + skip_matched_pair (string, start, open, close, flags) + const char *string; + int start, open, close, flags; + { + int i, pass_next, backq, si, c, count; + size_t slen; + char *temp, *ss; + DECLARE_MBSTATE; + + slen = strlen (string + start) + start; + no_longjmp_on_fatal_error = 1; + + i = start + 1; /* skip over leading bracket */ + count = 1; + pass_next = backq = 0; + ss = (char *)string; + while (c = string[i]) + { + if (pass_next) + { + pass_next = 0; + if (c == 0) + CQ_RETURN(i); + ADVANCE_CHAR (string, slen, i); + continue; + } + else if (c == '\\') + { + pass_next = 1; + i++; + continue; + } + else if (backq) + { + if (c == '`') + backq = 0; + ADVANCE_CHAR (string, slen, i); + continue; + } + else if (c == '`') + { + backq = 1; + i++; + continue; + } + else if (c == open) + { + count++; + i++; + continue; + } + else if (c == close) + { + count--; + if (count == 0) + break; + i++; + continue; + } + else if (c == '\'' || c == '"') + { + i = (c == '\'') ? skip_single_quoted (ss, slen, ++i) + : skip_double_quoted (ss, slen, ++i); + /* no increment, the skip functions increment past the closing quote. */ + } + else if (c == '$' && (string[i+1] == LPAREN || string[i+1] == LBRACE)) + { + si = i + 2; + if (string[si] == '\0') + CQ_RETURN(si); + + if (string[i+1] == LPAREN) + temp = extract_delimited_string (ss, &si, "$(", "(", ")", SX_NOALLOC|SX_COMMAND); /* ) */ + else + temp = extract_dollar_brace_string (ss, &si, 0, SX_NOALLOC); + i = si; + if (string[i] == '\0') /* don't increment i past EOS in loop */ + break; + i++; + continue; + } + else + ADVANCE_CHAR (string, slen, i); + } + + CQ_RETURN(i); + } + + #if defined (ARRAY_VARS) + int + skipsubscript (string, start) + const char *string; + int start; + { + return (skip_matched_pair (string, start, '[', ']', 0)); + } + #endif + /* Skip characters in STRING until we find a character in DELIMS, and return the index of that character. START is the index into string at which we *** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 --- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 6 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 7 #endif /* _PATCHLEVEL_H_ */ --- NEW FILE bash40-008 --- BASH PATCH REPORT ================= Bash-Release: 4.0 Patch-ID: bash40-008 Bug-Reported-by: Mike Frysinger Bug-Reference-ID: <200902261030.54062.vapier at gentoo.org> Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00230.html Bug-Description: Patch: *** ../bash-4.0/parse.y 2009-01-08 08:29:12.000000000 -0500 --- parse.y 2009-02-26 17:22:15.000000000 -0500 *************** *** 3443,3448 **** else shell_ungetc (peekc); ! tflags |= LEX_HEREDELIM; ! lex_firstind = -1; continue; } --- 3443,3451 ---- else shell_ungetc (peekc); ! if (peekc != '<') ! { ! tflags |= LEX_HEREDELIM; ! lex_firstind = -1; ! } continue; } *** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 --- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 7 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 8 #endif /* _PATCHLEVEL_H_ */ --- NEW FILE bash40-009 --- BASH PATCH REPORT ================= Bash-Release: 4.0 Patch-ID: bash40-009 Bug-Reported-by: "Chris F.A. Johnson" Bug-Reference-ID: <4d6b7$49a88cec$cef88ba3$16813 at TEKSAVVY.COM> Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00255.html Bug-Description: When the read builtin returned due to a timeout supplied with the -t option, it did not restore any modified terminal attribtues. Patch: *** ../bash-4.0/builtins/read.def 2009-01-15 23:11:21.000000000 -0500 --- builtins/read.def 2009-03-02 10:15:39.000000000 -0500 *************** *** 370,381 **** if (code) { ! #if 0 run_unwind_frame ("read_builtin"); - return (EXECUTION_FAILURE); - #else input_string[i] = '\0'; /* make sure it's terminated */ ! retval = 128+SIGALRM;; goto assign_vars; - #endif } old_alrm = set_signal_handler (SIGALRM, sigalrm); --- 370,381 ---- if (code) { ! /* Tricky. The top of the unwind-protect stack is the free of ! input_string. We want to run all the rest and use input_string, ! so we have to remove it from the stack. */ ! remove_unwind_protect (); run_unwind_frame ("read_builtin"); input_string[i] = '\0'; /* make sure it's terminated */ ! retval = 128+SIGALRM; goto assign_vars; } old_alrm = set_signal_handler (SIGALRM, sigalrm); *** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 --- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 8 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 9 #endif /* _PATCHLEVEL_H_ */ --- NEW FILE bash40-010 --- BASH PATCH REPORT ================= Bash-Release: 4.0 Patch-ID: bash40-010 Bug-Reported-by: Mike Frysinger Bug-Reference-ID: <200903030122.56206.vapier at gentoo.org> Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00023.html Bug-Description: Bash has problems parsing comments in case statements when they appear in $(...) subshells. Patch: *** ../bash-4.0/parse.y 2009-03-07 15:18:35.000000000 -0500 --- parse.y 2009-03-07 14:16:32.000000000 -0500 *************** *** 3413,3419 **** tflags &= ~LEX_RESWDOK; } ! else if (shellbreak (ch) == 0) { ! tflags &= ~LEX_RESWDOK; /*itrace("parse_comsub:%d: found `%c', lex_reswordok -> 0", line_number, ch);*/ } --- 3415,3433 ---- tflags &= ~LEX_RESWDOK; } ! else if MBTEST((tflags & LEX_CKCOMMENT) && ch == '#' && (lex_rwlen == 0 || ((tflags & LEX_INWORD) && lex_wlen == 0))) ! ; /* don't modify LEX_RESWDOK if we're starting a comment */ ! else if MBTEST((tflags & LEX_INCASE) && ch != '\n') ! /* If we can read a reserved word and we're in case, we're at the ! point where we can read a new pattern list or an esac. We ! handle the esac case above. If we read a newline, we want to ! leave LEX_RESWDOK alone. If we read anything else, we want to ! turn off LEX_RESWDOK, since we're going to read a pattern list. */ { ! tflags &= ~LEX_RESWDOK; ! /*itrace("parse_comsub:%d: lex_incase == 1 found `%c', lex_reswordok -> 0", line_number, ch);*/ ! } ! else if MBTEST(shellbreak (ch) == 0) ! { ! tflags &= ~LEX_RESWDOK; /*itrace("parse_comsub:%d: found `%c', lex_reswordok -> 0", line_number, ch);*/ } *** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 --- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 9 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 10 #endif /* _PATCHLEVEL_H_ */ Index: bash.spec =================================================================== RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- bash.spec 25 Feb 2009 14:39:36 -0000 1.176 +++ bash.spec 11 Mar 2009 16:59:20 -0000 1.177 @@ -3,7 +3,7 @@ Version: 4.0 Name: bash Summary: The GNU Bourne Again shell version %{version} -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Shells License: GPLv2+ Url: http://www.gnu.org/software/bash @@ -17,6 +17,17 @@ Source3: dot-bash_logout # Official upstream patches +Patch001: bash40-001 +Patch002: bash40-002 +Patch003: bash40-003 +Patch004: bash40-004 +Patch005: bash40-005 +Patch006: bash40-006 +Patch007: bash40-007 +Patch008: bash40-008 +Patch009: bash40-009 +Patch010: bash40-010 + # not any :) # Other patches @@ -38,7 +49,6 @@ Patch116: bash-requires.patch Patch117: bash-setlocale.patch Patch118: bash-tty-tests.patch -Patch119: pcomplete-save-parser-state.patch #Patch119: bash-ulimit-m.patch #Patch120: bash-4.0-no_debug_output.patch #Patch121: bash-4.0-shell_pipelines_handling.patch @@ -64,6 +74,17 @@ %setup -q -n bash-%{version} # Official upstream patches +%patch001 -p0 -b .001 +%patch002 -p0 -b .002 +%patch003 -p0 -b .003 +%patch004 -p0 -b .004 +%patch005 -p0 -b .005 +%patch006 -p0 -b .006 +%patch007 -p0 -b .007 +%patch008 -p0 -b .008 +%patch009 -p0 -b .009 +%patch010 -p0 -b .010 + # Other patches %patch101 -p1 -b .security %patch102 -p1 -b .paths @@ -83,7 +104,6 @@ %patch116 -p1 -b .requires %patch117 -p1 -b .setlocale %patch118 -p1 -b .tty_tests -%patch119 -p1 -b .parser-state #%patch119 -p1 -b .ulimit-m #%patch120 -p1 -b .no_debug_output #%patch121 -p1 -b .pipelines_handling @@ -245,6 +265,9 @@ #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Wed Mar 11 2009 Roman Rakus - 4.0-3 +- Official upstream patch level 10 + * Wed Feb 25 2009 Roman Rakus - 4.0-2 - Save parser state in pcomplete. Resolves: #487257 From silfreed at fedoraproject.org Wed Mar 11 17:01:55 2009 From: silfreed at fedoraproject.org (Douglas E. Warner) Date: Wed, 11 Mar 2009 17:01:55 +0000 (UTC) Subject: rpms/ale/devel ale.spec,1.3,1.4 Message-ID: <20090311170156.0036870128@cvs1.fedora.phx.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/ale/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31369 Modified Files: ale.spec Log Message: * Wed Mar 11 2009 Douglas E. Warner - 0.9.0.1-4 - rebuilt for libMagickCore soname bump Index: ale.spec =================================================================== RCS file: /cvs/pkgs/rpms/ale/devel/ale.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ale.spec 24 Feb 2009 00:29:09 -0000 1.3 +++ ale.spec 11 Mar 2009 17:01:25 -0000 1.4 @@ -1,6 +1,6 @@ Name: ale Version: 0.9.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Combines multiple inputs of the same scene Group: Applications/Multimedia @@ -60,6 +60,9 @@ %changelog +* Wed Mar 11 2009 Douglas E. Warner - 0.9.0.1-4 +- rebuilt for libMagickCore soname bump + * Mon Feb 23 2009 Fedora Release Engineering - 0.9.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ajax at fedoraproject.org Wed Mar 11 17:02:34 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Wed, 11 Mar 2009 17:02:34 +0000 (UTC) Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.421,1.422 Message-ID: <20090311170234.2269E70128@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31524 Modified Files: xorg-x11-server.spec Log Message: * Wed Mar 11 2009 Adam Jackson 1.6.0-10 - xserver-1.6.0-selinux-less.patch: Don't init selinux unless the policy says to be an object manager. Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.421 retrieving revision 1.422 diff -u -r1.421 -r1.422 --- xorg-x11-server.spec 6 Mar 2009 23:40:09 -0000 1.421 +++ xorg-x11-server.spec 11 Mar 2009 17:02:03 -0000 1.422 @@ -9,7 +9,7 @@ # check out the master branch, pull, cherry-pick, and push. FIXME describe # rebasing, add convenience 'make' targets maybe. -# F10 TODO list: +# F11 TODO list: # # Fix rhpxl to no longer need vesamodes/extramodes @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.0 -Release: 9%{?dist} +Release: 10%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -78,6 +78,9 @@ # don't try intel on poulsbo Patch6013: xserver-1.5.99.902-sod-off-poulsbo.patch +# don't do selinux if we're not told to +Patch6014: xserver-1.6.0-selinux-less.patch + # https://bugs.freedesktop.org/show_bug.cgi?id=20087 Patch6015: xserver-1.5.99.902-vnc.patch @@ -500,6 +503,10 @@ %changelog +* Wed Mar 11 2009 Adam Jackson 1.6.0-10 +- xserver-1.6.0-selinux-less.patch: Don't init selinux unless the policy + says to be an object manager. + * Fri Mar 06 2009 Dennis Gilmore 1.6.0-9 - BR kernel-headers not kernel-devel From michich at fedoraproject.org Wed Mar 11 17:02:42 2009 From: michich at fedoraproject.org (Michal Schmidt) Date: Wed, 11 Mar 2009 17:02:42 +0000 (UTC) Subject: rpms/gajim/EL-5 gajim-keyring.diff,NONE,1.1 gajim.spec,1.17,1.18 Message-ID: <20090311170242.432DE70128@cvs1.fedora.phx.redhat.com> Author: michich Update of /cvs/pkgs/rpms/gajim/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31597 Modified Files: gajim.spec Added Files: gajim-keyring.diff Log Message: * Wed Mar 11 2009 Michal Schmidt - 0.12.1-1.el5.2 - Took the current version of Gajim and modified the spec for EL-5. - Added workaround for a gnomekeyring binding bug. gajim-keyring.diff: --- NEW FILE gajim-keyring.diff --- Workaround a bug in gnomekeyring python binding causing a crash on startup. Such a workaround was in upstream between SVN revisions 7321 and 9575. For more information see: http://trac.gajim.org/ticket/2595 http://bugzilla.gnome.org/show_bug.cgi?id=363019 Index: src/common/passwords.py =================================================================== --- src/common/passwords.py.orig +++ src/common/passwords.py @@ -54,9 +54,10 @@ class SimplePasswordStorage(PasswordStor class GnomePasswordStorage(PasswordStorage): def __init__(self): - self.keyring = gnomekeyring.get_default_keyring_sync() - if self.keyring is None: - self.keyring = 'default' + #self.keyring = gnomekeyring.get_default_keyring_sync() + ## above line commented and code below inserted as workaround + ## for the bug http://bugzilla.gnome.org/show_bug.cgi?id=363019 + self.keyring = "default" try: gnomekeyring.create_sync(self.keyring, None) except gnomekeyring.AlreadyExistsError: Index: gajim.spec =================================================================== RCS file: /cvs/pkgs/rpms/gajim/EL-5/gajim.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gajim.spec 11 Mar 2009 16:21:51 -0000 1.17 +++ gajim.spec 11 Mar 2009 17:02:12 -0000 1.18 @@ -3,11 +3,12 @@ Summary: Jabber client written in PyGTK Name: gajim Version: 0.12.1 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 License: GPLv2 Group: Applications/Internet URL: http://gajim.org/ Source0: http://gajim.org/downloads/%{name}-%{version}.tar.gz +Patch0: %{name}-keyring.diff BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -49,6 +50,7 @@ %prep %setup -q +%patch0 -p0 # Suppress error. sed --in-place --expression '1d' ./src/gajim.py @@ -107,8 +109,9 @@ %{python_sitearch}/%{name}/trayicon.so %changelog -* Wed Mar 11 2009 Michal Schmidt - 0.12.1-1.el5.1 +* Wed Mar 11 2009 Michal Schmidt - 0.12.1-1.el5.2 - Took the current version of Gajim and modified the spec for EL-5. +- Added workaround for a gnomekeyring binding bug. * Tue Dec 23 2008 Debarshi Ray - 0.12.1-1 - Version bump to 0.12.1. From rdieter at fedoraproject.org Wed Mar 11 17:06:07 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 11 Mar 2009 17:06:07 +0000 (UTC) Subject: rpms/kdebase3/F-10 kdebase3.spec,1.74,1.75 Message-ID: <20090311170607.2C32A70128@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase3/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32732 Modified Files: kdebase3.spec Log Message: * Sat Feb 14 2009 Rex Dieter - 3.5.10-7 - omit desktop.desktop (f9+) Index: kdebase3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase3/F-10/kdebase3.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- kdebase3.spec 11 Feb 2009 22:01:27 -0000 1.74 +++ kdebase3.spec 11 Mar 2009 17:05:36 -0000 1.75 @@ -14,7 +14,7 @@ %define _with_samba --with-samba Version: 3.5.10 -Release: 6%{?dist} +Release: 7%{?dist} %if 0%{?fedora} > 8 Name: kdebase3 @@ -532,8 +532,9 @@ rm -f %{buildroot}%{_datadir}/config/kshorturifilterrc rm -f %{buildroot}%{_datadir}/xsessions/kde.desktop -# omit cookies.desktop (breaks kde42's cookies kcm) +# dups of kde4 services rm -f %{buildroot}%{_datadir}/applications/kde/cookies.desktop +rm -f %{buildroot}%{_datadir}/applications/kde/desktop.desktop #??remove mediamanager stuff #447852 and kdebug:163717 rm -f %{buildroot}%{_libdir}/kde3/kded_mediamanager.* @@ -867,6 +868,9 @@ %changelog +* Sat Feb 14 2009 Rex Dieter - 3.5.10-7 +- omit desktop.desktop (f9+) + * Wed Feb 11 2009 Rex Dieter - 3.5.10-6 - omit cookies.desktop (f9+) From rdieter at fedoraproject.org Wed Mar 11 17:09:32 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Wed, 11 Mar 2009 17:09:32 +0000 (UTC) Subject: rpms/kdebase3/F-9 kdebase3.spec,1.71,1.72 Message-ID: <20090311170932.4C17370128@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdebase3/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv729 Modified Files: kdebase3.spec Log Message: * Sat Feb 14 2009 Rex Dieter - 3.5.10-7 - omit desktop.desktop (f9+) Index: kdebase3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase3/F-9/kdebase3.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- kdebase3.spec 11 Feb 2009 22:01:49 -0000 1.71 +++ kdebase3.spec 11 Mar 2009 17:09:01 -0000 1.72 @@ -14,7 +14,7 @@ %define _with_samba --with-samba Version: 3.5.10 -Release: 6%{?dist} +Release: 7%{?dist} %if 0%{?fedora} > 8 Name: kdebase3 @@ -532,8 +532,9 @@ rm -f %{buildroot}%{_datadir}/config/kshorturifilterrc rm -f %{buildroot}%{_datadir}/xsessions/kde.desktop -# omit cookies.desktop (breaks kde42's cookies kcm) +# dups of kde4 services rm -f %{buildroot}%{_datadir}/applications/kde/cookies.desktop +rm -f %{buildroot}%{_datadir}/applications/kde/desktop.desktop #??remove mediamanager stuff #447852 and kdebug:163717 rm -f %{buildroot}%{_libdir}/kde3/kded_mediamanager.* @@ -867,6 +868,9 @@ %changelog +* Sat Feb 14 2009 Rex Dieter - 3.5.10-7 +- omit desktop.desktop (f9+) + * Wed Feb 11 2009 Rex Dieter - 3.5.10-6 - omit cookies.desktop (f9+) From glommer at fedoraproject.org Wed Mar 11 17:13:53 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 11 Mar 2009 17:13:53 +0000 (UTC) Subject: rpms/bochs/devel .cvsignore,1.14,1.15 bochs.spec,1.41,1.42 Message-ID: <20090311171353.2C18970128@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/bochs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1535 Modified Files: .cvsignore bochs.spec Log Message: fix provides/obsoletes pair Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bochs/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 5 Mar 2009 17:33:46 -0000 1.14 +++ .cvsignore 11 Mar 2009 17:13:22 -0000 1.15 @@ -1 +1 @@ -bochs-2.3.8.tar.gz +kvm-bios.tar.gz Index: bochs.spec =================================================================== RCS file: /cvs/pkgs/rpms/bochs/devel/bochs.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- bochs.spec 11 Mar 2009 16:48:03 -0000 1.41 +++ bochs.spec 11 Mar 2009 17:13:22 -0000 1.42 @@ -1,7 +1,7 @@ %define githead 04387139e3b Name: bochs Version: 2.3.8 -Release: 0.5.git%{githead}%{?dist} +Release: 0.6.git%{githead}%{?dist} Summary: Portable x86 PC emulator Group: Applications/Emulators License: LGPLv2+ @@ -81,8 +81,8 @@ Summary: Bochs bios Group: Applications/Emulators BuildArch: noarch -Provides: bochs-bios-data >= 2.3.8 -Obsoletes: bochs-bios-data < 2.3.9 +Provides: bochs-bios-data = 2.3.8.1 +Obsoletes: bochs-bios-data < 2.3.8.1 %description bios @@ -215,6 +215,9 @@ %changelog +* Wed Mar 11 2009 Glauber Costa 2.3.8-0.6.git04387139e3b +- Fix Obsoletes/Provides pair. + * Wed Mar 11 2009 Glauber Costa 2.3.8-0.5.git04387139e3b - kvm needs a slightly different bios due to irq routing, so build it too. from kvm source. This is not ideal, but avoids the creation of yet another From ajax at fedoraproject.org Wed Mar 11 17:21:14 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Wed, 11 Mar 2009 17:21:14 +0000 (UTC) Subject: rpms/libXau/devel xau-1.0.4-local.patch, NONE, 1.1 libXau.spec, 1.25, 1.26 Message-ID: <20090311172114.8492570128@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXau/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2909 Modified Files: libXau.spec Added Files: xau-1.0.4-local.patch Log Message: * Wed Mar 11 2009 Adam Jackson 1.0.4-4 - xau-1.0.4-local.patch: When looking for an auth cookie on local transport, don't bother checking hostname, it can't possibly help. xau-1.0.4-local.patch: --- NEW FILE xau-1.0.4-local.patch --- diff --git a/AuGetBest.c b/AuGetBest.c index ae2b748..5d92dad 100644 --- a/AuGetBest.c +++ b/AuGetBest.c @@ -120,7 +120,8 @@ XauGetBestAuthByAddr ( * Match when: * either family or entry->family are FamilyWild or * family and entry->family are the same and - * address and entry->address are the same + * address and entry->address are the same or + * family is FamilyLocal * and * either number or entry->number are empty or * number and entry->number are the same @@ -139,6 +140,7 @@ XauGetBestAuthByAddr ( binaryEqual (entry->address, fully_qual_address, (int) fully_qual_address_length)) #endif + || (family == FamilyLocal) ))) && (number_length == 0 || entry->number_length == 0 || (number_length == entry->number_length && Index: libXau.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXau/devel/libXau.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- libXau.spec 25 Feb 2009 13:11:26 -0000 1.25 +++ libXau.spec 11 Mar 2009 17:20:44 -0000 1.26 @@ -1,7 +1,7 @@ Summary: X.Org X11 libXau runtime library Name: libXau Version: 1.0.4 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -9,6 +9,8 @@ Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +Patch0: xau-1.0.4-local.patch + BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel @@ -29,6 +31,7 @@ %prep %setup -q +%patch0 -p1 -b .local %build @@ -65,6 +68,10 @@ %{_mandir}/man3/*.3* %changelog +* Wed Mar 11 2009 Adam Jackson 1.0.4-4 +- xau-1.0.4-local.patch: When looking for an auth cookie on local transport, + don't bother checking hostname, it can't possibly help. + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From nsantos at fedoraproject.org Wed Mar 11 17:25:24 2009 From: nsantos at fedoraproject.org (Nuno Santos) Date: Wed, 11 Mar 2009 17:25:24 +0000 (UTC) Subject: rpms/qpidc/devel .cvsignore, 1.16, 1.17 qpidc.spec, 1.69, 1.70 sources, 1.35, 1.36 Message-ID: <20090311172524.6AD5670128@cvs1.fedora.phx.redhat.com> Author: nsantos Update of /cvs/extras/rpms/qpidc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3807 Modified Files: .cvsignore qpidc.spec sources Log Message: Rebased to svn rev 750497 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qpidc/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 29 Jan 2009 20:59:15 -0000 1.16 +++ .cvsignore 11 Mar 2009 17:24:54 -0000 1.17 @@ -1 +1 @@ -qpidc-0.4.738618.tar.gz +qpidc-0.4.750497.tar.gz Index: qpidc.spec =================================================================== RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- qpidc.spec 25 Feb 2009 18:00:24 -0000 1.69 +++ qpidc.spec 11 Mar 2009 17:24:54 -0000 1.70 @@ -6,8 +6,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: qpidc -Version: 0.4.738618 -Release: 4%{?dist} +Version: 0.4.750497 +Release: 1%{?dist} Summary: Libraries for Qpid C++ client applications Group: System Environment/Libraries License: ASL 2.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qpidc/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 2 Feb 2009 17:55:40 -0000 1.35 +++ sources 11 Mar 2009 17:24:54 -0000 1.36 @@ -1 +1 @@ -6a554d31920b7a938a78911c722e72c1 qpidc-0.4.738618.tar.gz +a642991a399af8917d06f78e6ecfa7d3 qpidc-0.4.750497.tar.gz From behdad at fedoraproject.org Wed Mar 11 17:28:58 2009 From: behdad at fedoraproject.org (Behdad Esfahbod) Date: Wed, 11 Mar 2009 17:28:58 +0000 (UTC) Subject: rpms/pango/devel pango-1.23.0-g5317893.patch, NONE, 1.1 pango.spec, 1.154, 1.155 Message-ID: <20090311172858.A619270128@cvs1.fedora.phx.redhat.com> Author: behdad Update of /cvs/pkgs/rpms/pango/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4762 Modified Files: pango.spec Added Files: pango-1.23.0-g5317893.patch Log Message: * Wed Mar 11 2009 Behdad Esfahbod - 1.23.0-4.g5317893 - Push changes from git pango-1.23.0-g5317893.patch: --- NEW FILE pango-1.23.0-g5317893.patch --- diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt index 7ed853c..0fbdc22 100644 --- a/docs/pango-sections.txt +++ b/docs/pango-sections.txt @@ -919,6 +919,7 @@ PangoFcFontMapClass pango_fc_font_map_create_context PangoFcDecoderFindFunc pango_fc_font_map_add_decoder_find_func +pango_fc_font_map_find_decoder pango_fc_font_map_cache_clear pango_fc_font_map_shutdown pango_fc_font_description_from_pattern diff --git a/docs/tmpl/pangofc-font.sgml b/docs/tmpl/pangofc-font.sgml index 95ac1dd..a1b055c 100644 --- a/docs/tmpl/pangofc-font.sgml +++ b/docs/tmpl/pangofc-font.sgml @@ -40,6 +40,11 @@ Fontconfig-based backend involves deriving from both + + + + + diff --git a/docs/tmpl/pangofc-fontmap.sgml b/docs/tmpl/pangofc-fontmap.sgml index bcfae81..ee6cca0 100644 --- a/docs/tmpl/pangofc-fontmap.sgml +++ b/docs/tmpl/pangofc-fontmap.sgml @@ -86,6 +86,16 @@ Fontconfig-based backend involves deriving from both @dnotify: + + + + + + at fcfontmap: + at pattern: + at Returns: + + diff --git a/pango-view/Makefile.am b/pango-view/Makefile.am index 9780c14..c406975 100644 --- a/pango-view/Makefile.am +++ b/pango-view/Makefile.am @@ -23,7 +23,6 @@ TEST_TEXTS = \ GLASS.txt EXTRA_DIST = \ - viewer-win32.c \ $(TEST_TEXTS) CLEANFILES = pangorc diff --git a/pango-view/viewer-win32.c b/pango-view/viewer-win32.c deleted file mode 100644 index 468a6cc..0000000 --- a/pango-view/viewer-win32.c +++ /dev/null @@ -1,748 +0,0 @@ -/* Pango - * viewer-win32.c: Example program to view a UTF-8 encoding file - * using Pango to render result. - * - * Copyright (C) 1999 Red Hat Software - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ -#include "config.h" -#include -#include - -#include -#include - -#include -#include -#include -#include - -#define BUFSIZE 1024 - -typedef struct _Paragraph Paragraph; - -/* Structure representing a paragraph - */ -struct _Paragraph { - char *text; - int length; - int height; /* Height, in pixels */ - PangoLayout *layout; -}; - -GList *paragraphs; - -static PangoFontDescription *font_description; -static Paragraph *highlight_para; -static int highlight_offset; - -GtkWidget *styles_combo; - -static GtkWidget *message_label; -GtkWidget *layout; - -PangoContext *context; - -static void fill_styles_combo (GtkWidget *combo); - -/* Read an entire file into a string - */ -static char * -read_file(char *name) -{ - GString *inbuf; - FILE *file; - char *text; - char buffer[BUFSIZE]; - - file = fopen (name, "r"); - if (!file) - { - fprintf (stderr, "%s: Cannot open %s\n", g_get_prgname (), name); - return NULL; - } - - inbuf = g_string_new (NULL); - while (1) - { - char *bp = fgets (buffer, BUFSIZE-1, file); - if (ferror (file)) - { - fprintf (stderr, "%s: Error reading %s\n", g_get_prgname (), name); - g_string_free (inbuf, TRUE); - return NULL; - } - else if (bp == NULL) - break; - - g_string_append (inbuf, buffer); - } - - fclose (file); - - text = inbuf->str; - g_string_free (inbuf, FALSE); - - return text; -} - -/* Take a UTF8 string and break it into paragraphs on \n characters - */ -static GList * -split_paragraphs (char *text) -{ - char *p = text; - char *next; - gunichar wc; - GList *result = NULL; - char *last_para = text; - - while (*p) - { - wc = g_utf8_get_char (p); - next = g_utf8_next_char (p); - if (wc == (gunichar)-1) - { - fprintf (stderr, "%s: Invalid character in input\n", g_get_prgname ()); - g_list_foreach (result, (GFunc)g_free, NULL); - return NULL; - } - if (!*p || !wc || wc == '\n') - { - Paragraph *para = g_new (Paragraph, 1); - para->text = last_para; - para->length = p - last_para; - para->layout = pango_layout_new (context); - pango_layout_set_text (para->layout, para->text, para->length); - para->height = 0; - - last_para = next; - - result = g_list_prepend (result, para); - } - if (!wc) /* incomplete character at end */ - break; - p = next; - } - - return g_list_reverse (result); -} - -/* Given an x-y position, return the paragraph and offset - * within the paragraph of the click. - */ -gboolean -xy_to_cp (int width, int x, int y, Paragraph **para_return, int *index) -{ - GList *para_list; - int height = 0; - - *para_return = NULL; - - para_list = paragraphs; - while (para_list && height < y) - { - Paragraph *para = para_list->data; - - if (height + para->height >= y) - { - gboolean result = pango_layout_xy_to_index (para->layout, - x * PANGO_SCALE, - (y - height) * PANGO_SCALE, - index, NULL); - if (result && para_return) - *para_return = para; - - return result; - } - - height += para->height; - para_list = para_list->next; - } - - return FALSE; -} - -/* Given a paragraph and offset in that paragraph, find the - * bounding rectangle for the character at the offset. - */ -void -char_bounds (Paragraph *para, int index, int width, PangoRectangle *rect) -{ - GList *para_list; - - int height = 0; - - para_list = paragraphs; - while (para_list) - { - Paragraph *cur_para = para_list->data; - - if (cur_para == para) - { - PangoRectangle pos; - - pango_layout_index_to_pos (cur_para->layout, index, &pos); - - rect->x = PANGO_PIXELS (MIN (pos.x, pos.x + pos.width)); - rect->width = PANGO_PIXELS (ABS (pos.width)); - rect->y = height + PANGO_PIXELS (pos.y); - rect->height = PANGO_PIXELS (pos.height); - } - - height += cur_para->height; - para_list = para_list->next; - } -} - -/* XOR a rectangle over a given character - */ -void -xor_char (GtkWidget *layout, GdkRectangle *clip_rect, - Paragraph *para, int offset) -{ - static GdkGC *gc; - PangoRectangle rect; /* GdkRectangle in 1.2 is too limited - */ - if (!gc) - { - GdkGCValues values; - values.foreground = layout->style->white.pixel ? - layout->style->white : layout->style->black; - values.function = GDK_XOR; - gc = gdk_gc_new_with_values (GTK_LAYOUT (layout)->bin_window, - &values, - GDK_GC_FOREGROUND | GDK_GC_FUNCTION); - } - - gdk_gc_set_clip_rectangle (gc, clip_rect); - - char_bounds (para, offset, layout->allocation.width, &rect); - - rect.y -= GTK_LAYOUT (layout)->yoffset; - - if ((rect.y + rect.height >= 0) && (rect.y < layout->allocation.height)) - gdk_draw_rectangle (GTK_LAYOUT (layout)->bin_window, gc, TRUE, - rect.x, rect.y, rect.width, rect.height); -} - -/* Handle a size allocation by re-laying-out each paragraph to - * the new width, setting the new size for the layout and - * then queing a redraw - */ -void -size_allocate (GtkWidget *layout, GtkAllocation *allocation) -{ - GList *tmp_list; - guint height = 0; - PangoDirection base_dir = pango_context_get_base_dir (context); - - tmp_list = paragraphs; - while (tmp_list) - { - Paragraph *para = tmp_list->data; - PangoRectangle logical_rect; - - tmp_list = tmp_list->next; - - pango_layout_set_alignment (para->layout, - base_dir == PANGO_DIRECTION_LTR ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT); - pango_layout_set_width (para->layout, layout->allocation.width * PANGO_SCALE); - - pango_layout_get_extents (para->layout, NULL, &logical_rect); - para->height = PANGO_PIXELS (logical_rect.height); - - height += para->height; - } - - gtk_layout_set_size (GTK_LAYOUT (layout), allocation->width, height); - - if (GTK_LAYOUT (layout)->yoffset + allocation->height > height) - gtk_adjustment_set_value (GTK_LAYOUT (layout)->vadjustment, (float)(height - allocation->height)); -} - -/* Handle a draw/expose by finding the paragraphs that intersect - * the region and reexposing them. - */ -void -draw (GtkWidget *layout, GdkRectangle *area) -{ - GList *tmp_list; - guint height = 0; - HDC hdc; - const GdkGCValuesMask mask = GDK_GC_FOREGROUND|GDK_GC_BACKGROUND|GDK_GC_FONT; - - gdk_draw_rectangle (GTK_LAYOUT (layout)->bin_window, - layout->style->base_gc[layout->state], - TRUE, - area->x, area->y, - area->width, area->height); - - gdk_gc_set_clip_rectangle (layout->style->text_gc[layout->state], area); - - hdc = gdk_win32_hdc_get (GTK_LAYOUT (layout)->bin_window, - layout->style->text_gc[GTK_STATE_NORMAL], - mask); - tmp_list = paragraphs; - while (tmp_list && - height < area->y + area->height + GTK_LAYOUT (layout)->yoffset) - { - Paragraph *para = tmp_list->data; - tmp_list = tmp_list->next; - - if (height + para->height >= GTK_LAYOUT (layout)->yoffset + area->y) - pango_win32_render_layout (hdc, para->layout, - 0, height - GTK_LAYOUT (layout)->yoffset); - height += para->height; - } - - gdk_win32_hdc_release (GTK_LAYOUT (layout)->bin_window, - layout->style->text_gc[GTK_STATE_NORMAL], - mask); - gdk_gc_set_clip_rectangle (layout->style->text_gc[layout->state], NULL); - - if (highlight_para) - xor_char (layout, area, highlight_para, highlight_offset); -} - -gboolean -expose (GtkWidget *layout, GdkEventExpose *event) -{ - if (event->window == GTK_LAYOUT (layout)->bin_window) - draw (layout, &event->area); - - return TRUE; -} - -void -button_press (GtkWidget *layout, GdkEventButton *event) -{ - Paragraph *para = NULL; - int offset; - gchar *message; - - xy_to_cp (layout->allocation.width, - event->x, event->y + GTK_LAYOUT (layout)->yoffset, - ¶, &offset); - - if (highlight_para) - xor_char (layout, NULL, highlight_para, highlight_offset); - - highlight_para = para; - highlight_offset = offset; - - if (para) - { - gunichar wc; - - wc = g_utf8_get_char (para->text + offset); - message = g_strdup_printf ("Current char: U%04x", wc); - - xor_char (layout, NULL, highlight_para, highlight_offset); - } - else - message = g_strdup_printf ("Current char:"); - - gtk_label_set_text (GTK_LABEL (message_label), message); - g_free (message); -} - -static void -checkbutton_toggled (GtkWidget *widget, gpointer data) -{ - GList *para_list; - - pango_context_set_base_dir (context, GTK_TOGGLE_BUTTON (widget)->active ? PANGO_DIRECTION_RTL : PANGO_DIRECTION_LTR); - - para_list = paragraphs; - while (para_list) - { - Paragraph *para = para_list->data; - - pango_layout_context_changed (para->layout); - para_list = para_list->next; - } - - gtk_widget_queue_resize (layout); -} - -static void -reload_font () -{ - GList *para_list; - - pango_context_set_font_description (context, font_description); - - para_list = paragraphs; - while (para_list) - { - Paragraph *para = para_list->data; - - pango_layout_context_changed (para->layout); - para_list = para_list->next; - } - - if (layout) - gtk_widget_queue_resize (layout); -} - -void -set_family (GtkWidget *entry, gpointer data) -{ - gchar *family_name = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1); - if (!family_name || family_name[0] == '\0') - return; - pango_font_description_set_family(font_description, family_name); - fill_styles_combo (styles_combo); -} - -void -set_style (GtkWidget *entry, gpointer data) -{ - char *str = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1); - PangoFontDescription *tmp_desc; - - tmp_desc = pango_font_description_from_string (str); - - pango_font_description_set_style(font_description, pango_font_description_get_style(tmp_desc)); - pango_font_description_set_variant(font_description, pango_font_description_get_variant(tmp_desc)); - pango_font_description_set_weight(font_description, pango_font_description_get_weight(tmp_desc)); - pango_font_description_set_stretch(font_description, pango_font_description_get_stretch(tmp_desc)); - - pango_font_description_free (tmp_desc); - g_free (str); - - reload_font (); -} - -void -font_size_changed (GtkAdjustment *adj) -{ - pango_font_description_set_size(font_description, (int)(adj->value * PANGO_SCALE + 0.5)); - reload_font(); -} - -static int -compare_font_descriptions (const PangoFontDescription *a, const PangoFontDescription *b) -{ - int val = strcmp (pango_font_description_get_family(a), pango_font_description_get_family(b)); - if (val != 0) - return val; - - if (pango_font_description_get_weight(a) != pango_font_description_get_weight(b)) - return pango_font_description_get_weight(a) - pango_font_description_get_weight(b); - - if (pango_font_description_get_style(a) != pango_font_description_get_style(b)) - return pango_font_description_get_style(a) - pango_font_description_get_style(b); - - if (pango_font_description_get_stretch(a) != pango_font_description_get_stretch(b)) - return pango_font_description_get_stretch(a) - pango_font_description_get_stretch(b); - - if (pango_font_description_get_stretch(a) != pango_font_description_get_stretch(b)) - return pango_font_description_get_stretch(a) - pango_font_description_get_stretch(b); - - return 0; -} - -static int -font_description_sort_func (const void *a, const void *b) -{ - return compare_font_descriptions (*(PangoFontDescription **)a, *(PangoFontDescription **)b); -} - -typedef struct -{ - PangoFontDescription **descs; - int n_descs; -} FontDescInfo; - -static void -free_info (FontDescInfo *info) -{ - pango_font_descriptions_free (info->descs, info->n_descs); -} - -static void -fill_styles_combo (GtkWidget *combo) -{ - int i; - GList *style_list = NULL; - PangoFontFace **faces; - PangoFontFamily *family, **families; - FontDescInfo *info; - int n_families; - const char *family_name = pango_font_description_get_family(font_description); - - /* - * Now map back the given family name to the family. There are more efficient - * ways to handle this but it should not matter much ... - */ - pango_context_list_families (context, &families, &n_families); - g_assert(n_families > 0); - family = families[0]; /* just in case */ - for (i = 0; i < n_families; i++) - { - if (0 == g_strcasecmp(pango_font_family_get_name(families[i]), family_name)) - { - family = families[i]; - break; - } - } - g_free (families); - - info = g_new (FontDescInfo, 1); - pango_font_family_list_faces (family, &faces, &info->n_descs); - - info->descs = g_new0 (PangoFontDescription*, info->n_descs); - for (i = 0; i < info->n_descs; i++) - { - info->descs[i] = pango_font_face_describe(faces[i]); - } - g_free (faces); - - gtk_object_set_data_full (GTK_OBJECT (combo), "descs", info, (GtkDestroyNotify)free_info); - - qsort (info->descs, info->n_descs, sizeof(PangoFontDescription *), font_description_sort_func); - - for (i=0; in_descs; i++) - { - char *str; - - PangoFontDescription *tmp_desc; - - tmp_desc = info->descs[i]; - pango_font_description_set_family(tmp_desc, NULL); - pango_font_description_unset_fields(tmp_desc, PANGO_FONT_MASK_SIZE); - - str = pango_font_description_to_string (tmp_desc); - style_list = g_list_prepend (style_list, str); - } - - style_list = g_list_reverse (style_list); - - gtk_combo_set_popdown_strings (GTK_COMBO (combo), style_list); - g_list_foreach (style_list, (GFunc)g_free, NULL); -} - -static GtkWidget * -make_styles_combo () -{ - GtkWidget *combo; - - combo = gtk_combo_new (); - gtk_combo_set_value_in_list (GTK_COMBO (combo), TRUE, FALSE); - gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (combo)->entry), FALSE); - - gtk_signal_connect (GTK_OBJECT (GTK_COMBO (combo)->entry), "changed", - GTK_SIGNAL_FUNC (set_style), NULL); - - styles_combo = combo; - fill_styles_combo (combo); - - return combo; -} - -static int -cmp_families (const PangoFontFamily** a, const PangoFontFamily** b) -{ - return strcmp (pango_font_family_get_name (*a), pango_font_family_get_name (*b)); -} - -GtkWidget * -make_families_menu () -{ - GtkWidget *combo; - int n_families; - PangoFontFamily **families; - GList *family_list = NULL; - int i; - - pango_context_list_families (context, &families, &n_families); - qsort (families, n_families, sizeof(char *), cmp_families); - - for (i=0; ientry), FALSE); - - gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo)->entry), pango_font_description_get_family(font_description)); - - gtk_signal_connect (GTK_OBJECT (GTK_COMBO (combo)->entry), "changed", - GTK_SIGNAL_FUNC (set_family), NULL); - - g_list_free (family_list); - - return combo; -} - - -GtkWidget * -make_font_selector (void) -{ - GtkWidget *hbox; - GtkWidget *util_hbox; - GtkWidget *label; - GtkWidget *option_menu; - GtkWidget *spin_button; - GtkAdjustment *adj; - - hbox = gtk_hbox_new (FALSE, 4); - - util_hbox = gtk_hbox_new (FALSE, 2); - label = gtk_label_new ("Family:"); - gtk_box_pack_start (GTK_BOX (util_hbox), label, FALSE, FALSE, 0); - option_menu = make_families_menu (); - gtk_box_pack_start (GTK_BOX (util_hbox), option_menu, FALSE, FALSE, 0); - - gtk_box_pack_start (GTK_BOX (hbox), util_hbox, FALSE, FALSE, 0); - - util_hbox = gtk_hbox_new (FALSE, 2); - label = gtk_label_new ("Style:"); - gtk_box_pack_start (GTK_BOX (util_hbox), label, FALSE, FALSE, 0); - option_menu = make_styles_combo (); - gtk_box_pack_start (GTK_BOX (util_hbox), option_menu, FALSE, FALSE, 0); - - gtk_box_pack_start (GTK_BOX (hbox), util_hbox, FALSE, FALSE, 0); - - util_hbox = gtk_hbox_new (FALSE, 2); - label = gtk_label_new ("Size:"); - gtk_box_pack_start (GTK_BOX (util_hbox), label, FALSE, FALSE, 0); - spin_button = gtk_spin_button_new (NULL, 1., 0); - gtk_box_pack_start (GTK_BOX (util_hbox), spin_button, FALSE, FALSE, 0); - - gtk_box_pack_start (GTK_BOX (hbox), util_hbox, FALSE, FALSE, 0); - - adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spin_button)); - adj->value = PANGO_PIXELS (pango_font_description_get_size(font_description)); - adj->lower = 0; - adj->upper = 1024; - adj->step_increment = 1; - adj->page_size = 10; - gtk_adjustment_changed (adj); - gtk_adjustment_value_changed (adj); - - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (font_size_changed), NULL); - - return hbox; -} - -int -main (int argc, char **argv) -{ - char *text; - GtkWidget *window; - GtkWidget *scrollwin; - GtkWidget *vbox, *hbox; - GtkWidget *frame; - GtkWidget *checkbutton; - - gtk_init (&argc, &argv); - - if (argc != 2) - { - fprintf (stderr, "Usage: %s FILE\n", g_get_prgname ()); - exit(1); - } - - /* Create the list of paragraphs from the supplied file - */ - text = read_file (argv[1]); - if (!text) - exit(1); - - context = pango_win32_get_context (); - - paragraphs = split_paragraphs (text); - - pango_context_set_language (context, pango_language_from_string ("en_US")); - pango_context_set_base_dir (context, PANGO_DIRECTION_LTR); - - font_description = pango_font_description_new (); - pango_font_description_set_family(font_description, "sans"); - pango_font_description_set_size(font_description, 16 * PANGO_SCALE); -#if 0 /* default init ok? */ - font_description.style = PANGO_STYLE_NORMAL; - font_description.variant = PANGO_VARIANT_NORMAL; - font_description.weight = 500; - font_description.stretch = PANGO_STRETCH_NORMAL; -#endif - - pango_context_set_font_description (context, font_description); - - /* Create the user interface - */ - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_default_size (GTK_WINDOW (window), 400, 400); - - gtk_signal_connect (GTK_OBJECT (window), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), NULL); - - vbox = gtk_vbox_new (FALSE, 4); - gtk_container_add (GTK_CONTAINER (window), vbox); - - hbox = make_font_selector (); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - - scrollwin = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - - gtk_box_pack_start (GTK_BOX (vbox), scrollwin, TRUE, TRUE, 0); - - layout = gtk_layout_new (NULL, NULL); - gtk_widget_set_events (layout, GDK_BUTTON_PRESS_MASK); - gtk_widget_set_app_paintable (layout, TRUE); - - gtk_signal_connect (GTK_OBJECT (layout), "size_allocate", - GTK_SIGNAL_FUNC (size_allocate), paragraphs); - gtk_signal_connect (GTK_OBJECT (layout), "expose_event", - GTK_SIGNAL_FUNC (expose), paragraphs); - gtk_signal_connect (GTK_OBJECT (layout), "draw", - GTK_SIGNAL_FUNC (draw), paragraphs); - gtk_signal_connect (GTK_OBJECT (layout), "button_press_event", - GTK_SIGNAL_FUNC (button_press), paragraphs); -#if GTK_CHECK_VERSION (1,3,2) - gtk_widget_set_double_buffered (layout, FALSE); -#endif - gtk_container_add (GTK_CONTAINER (scrollwin), layout); - - frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); - - message_label = gtk_label_new ("Current char:"); - gtk_misc_set_padding (GTK_MISC (message_label), 1, 1); - gtk_misc_set_alignment (GTK_MISC (message_label), 0.0, 0.5); - gtk_container_add (GTK_CONTAINER (frame), message_label); - - checkbutton = gtk_check_button_new_with_label ("Use RTL global direction"); - gtk_signal_connect (GTK_OBJECT (checkbutton), "toggled", - GTK_SIGNAL_FUNC (checkbutton_toggled), NULL); - gtk_box_pack_start (GTK_BOX (vbox), checkbutton, FALSE, FALSE, 0); - - gtk_widget_show_all (window); - - gtk_main (); - - return 0; -} diff --git a/pango/glyphstring.c b/pango/glyphstring.c index 42601d5..8fb7031 100644 --- a/pango/glyphstring.c +++ b/pango/glyphstring.c @@ -61,14 +61,28 @@ pango_glyph_string_set_size (PangoGlyphString *string, gint new_len) while (new_len > string->space) { if (string->space == 0) - string->space = 1; + { + string->space = 4; + } else - string->space *= 2; - - if (string->space < 0) { - g_warning ("glyph string length overflows maximum integer size, truncated"); - new_len = string->space = G_MAXINT - 8; + const guint max_space = + MIN (G_MAXINT, G_MAXSIZE / MAX (sizeof(PangoGlyphInfo), sizeof(gint))); + + guint more_space = (guint)string->space * 2; + + if (more_space > max_space) + { + more_space = max_space; + + if ((guint)new_len > max_space) + { + g_error ("%s: failed to allocate glyph string of length %i\n", + G_STRLOC, new_len); + } + } + + string->space = more_space; } } diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am index 5cf0f13..b845eb6 100644 --- a/pango/opentype/Makefile.am +++ b/pango/opentype/Makefile.am @@ -1,8 +1,8 @@ ## Process this file with automake to produce Makefile.in INCLUDES = \ - $(FREETYPE_CFLAGS) \ - -I $(srcdir) + -I $(srcdir) \ + $(FREETYPE_CFLAGS) noinst_LTLIBRARIES = libharfbuzz-1.la diff --git a/pango/opentype/harfbuzz-gpos.c b/pango/opentype/harfbuzz-gpos.c index 2961940..c78dcba 100644 --- a/pango/opentype/harfbuzz-gpos.c +++ b/pango/opentype/harfbuzz-gpos.c @@ -2080,9 +2080,13 @@ static void Free_BaseArray( HB_BaseArray* ba, if ( ba->BaseRecord ) { br = ba->BaseRecord; - bans = br[0].BaseAnchor; - FREE( bans ); + if ( ba->BaseCount ) + { + bans = br[0].BaseAnchor; + FREE( bans ); + } + FREE( br ); } } @@ -2811,9 +2815,13 @@ static void Free_Mark2Array( HB_Mark2Array* m2a, if ( m2a->Mark2Record ) { m2r = m2a->Mark2Record; - m2ans = m2r[0].Mark2Anchor; - FREE( m2ans ); + if ( m2a->Mark2Count ) + { + m2ans = m2r[0].Mark2Anchor; + FREE( m2ans ); + } + FREE( m2r ); } } @@ -3857,6 +3865,9 @@ static HB_Error Lookup_ContextPos2( GPOS_Instance* gpi, if ( error ) return error; + if (cpf2->MaxContextLength < 1) + return HB_Err_Not_Covered; + if ( ALLOC_ARRAY( classes, cpf2->MaxContextLength, HB_UShort ) ) return error; @@ -5139,6 +5150,9 @@ static HB_Error Lookup_ChainContextPos2( return error; known_backtrack_classes = 0; + if (ccpf2->MaxInputLength < 1) + return HB_Err_Not_Covered; + if ( ALLOC_ARRAY( input_classes, ccpf2->MaxInputLength, HB_UShort ) ) goto End3; known_input_classes = 1; diff --git a/pango/opentype/harfbuzz-gsub.c b/pango/opentype/harfbuzz-gsub.c index f504bf0..c05f20d 100644 --- a/pango/opentype/harfbuzz-gsub.c +++ b/pango/opentype/harfbuzz-gsub.c @@ -1896,6 +1896,9 @@ static HB_Error Lookup_ContextSubst2( HB_GSUBHeader* gsub, if ( error ) return error; + if (csf2->MaxContextLength < 1) + return HB_Err_Not_Covered; + if ( ALLOC_ARRAY( classes, csf2->MaxContextLength, HB_UShort ) ) return error; @@ -3159,6 +3162,9 @@ static HB_Error Lookup_ChainContextSubst2( HB_GSUBHeader* gsub, return error; known_backtrack_classes = 0; + if (ccsf2->MaxInputLength < 1) + return HB_Err_Not_Covered; + if ( ALLOC_ARRAY( input_classes, ccsf2->MaxInputLength, HB_UShort ) ) goto End3; known_input_classes = 1; diff --git a/pango/opentype/harfbuzz-impl.c b/pango/opentype/harfbuzz-impl.c index a3a5589..ffcef80 100644 --- a/pango/opentype/harfbuzz-impl.c +++ b/pango/opentype/harfbuzz-impl.c @@ -30,7 +30,7 @@ HB_INTERNAL HB_Pointer -_hb_alloc( HB_UInt size, +_hb_alloc( size_t size, HB_Error *perror ) { HB_Error error = 0; @@ -50,7 +50,7 @@ _hb_alloc( HB_UInt size, HB_INTERNAL HB_Pointer _hb_realloc( HB_Pointer block, - HB_UInt new_size, + size_t new_size, HB_Error *perror ) { HB_Pointer block2 = NULL; diff --git a/pango/opentype/harfbuzz-impl.h b/pango/opentype/harfbuzz-impl.h index 0442e4e..f886e67 100644 --- a/pango/opentype/harfbuzz-impl.h +++ b/pango/opentype/harfbuzz-impl.h @@ -32,6 +32,8 @@ #include "harfbuzz-global.h" +#include + HB_BEGIN_HEADER #ifndef HB_INTERNAL @@ -95,12 +97,12 @@ HB_BEGIN_HEADER HB_INTERNAL HB_Pointer -_hb_alloc( HB_UInt size, +_hb_alloc( size_t size, HB_Error *perror_ ); HB_INTERNAL HB_Pointer _hb_realloc( HB_Pointer block, - HB_UInt new_size, + size_t new_size, HB_Error *perror_ ); HB_INTERNAL void diff --git a/pango/pango-coverage.c b/pango/pango-coverage.c index 73fb147..7637117 100644 --- a/pango/pango-coverage.c +++ b/pango/pango-coverage.c @@ -42,7 +42,6 @@ struct _PangoCoverage { guint ref_count; int n_blocks; - int data_size; PangoBlockInfo *blocks; }; @@ -145,7 +144,7 @@ pango_coverage_unref (PangoCoverage *coverage) if (g_atomic_int_dec_and_test ((int *) &coverage->ref_count)) { for (i=0; in_blocks; i++) - g_free (coverage->blocks[i].data); + g_slice_free1 (64, coverage->blocks[i].data); g_free (coverage->blocks); g_slice_free (PangoCoverage, coverage); @@ -236,7 +235,7 @@ pango_coverage_set (PangoCoverage *coverage, if (level == coverage->blocks[block_index].level) return; - data = g_new (guchar, 64); + data = g_slice_alloc (64); coverage->blocks[block_index].data = data; byte = coverage->blocks[block_index].level | @@ -393,15 +392,18 @@ pango_coverage_to_bytes (PangoCoverage *coverage, guchar *data = coverage->blocks[i].data; guchar first_val = data[0]; - for (j = 1 ; j < 64; j++) - if (data[j] != first_val) - break; - - if (j == 64) + if (first_val == 0 || first_val == 0xff) { - g_free (data); - coverage->blocks[i].data = NULL; - coverage->blocks[i].level = first_val & 0x3; + for (j = 1 ; j < 64; j++) + if (data[j] != first_val) + break; + + if (j == 64) + { + g_slice_free1 (64, data); + coverage->blocks[i].data = NULL; + coverage->blocks[i].level = first_val & 0x3; + } } } diff --git a/pango/pango-language.c b/pango/pango-language.c index cae27ef..bfde308 100644 --- a/pango/pango-language.c +++ b/pango/pango-language.c @@ -688,7 +688,7 @@ pango_language_includes_script (PangoLanguage *language, static PangoLanguage ** parse_default_languages (void) { - char *p; + char *p, *p_copy; gboolean done = FALSE; GArray *langs; @@ -700,7 +700,7 @@ parse_default_languages (void) if (p == NULL) return NULL; - p = g_strdup (p); + p_copy = p = g_strdup (p); langs = g_array_new (TRUE, FALSE, sizeof (PangoLanguage *)); @@ -727,6 +727,8 @@ parse_default_languages (void) p = end + 1; } + g_free (p_copy); + return (PangoLanguage **) g_array_free (langs, FALSE); } diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c index 3039f9f..3ac166e 100644 --- a/pango/pangocairo-fcfont.c +++ b/pango/pangocairo-fcfont.c @@ -223,6 +223,7 @@ _pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap, cffont = g_object_new (PANGO_TYPE_CAIRO_FC_FONT, "pattern", pattern, + "fontmap", cffontmap, NULL); size = get_font_size (pattern) / diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index 133a4df..976b0d8 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -34,22 +34,8 @@ enum { PROP_0, - PROP_PATTERN -}; - -typedef struct _GUnicharToGlyphCacheEntry GUnicharToGlyphCacheEntry; - -/* An entry in the fixed-size cache for the gunichar -> glyph mapping. - * The cache is indexed by the lower N bits of the gunichar (see - * GLYPH_CACHE_NUM_ENTRIES). For scripts with few code points, - * this should provide pretty much instant lookups. - * - * The "ch" field is zero if that cache entry is invalid. - */ -struct _GUnicharToGlyphCacheEntry -{ - gunichar ch; - PangoGlyph glyph; + PROP_PATTERN, + PROP_FONTMAP }; typedef struct _PangoFcFontPrivate PangoFcFontPrivate; @@ -58,12 +44,9 @@ struct _PangoFcFontPrivate { PangoFcDecoder *decoder; PangoFcFontKey *key; - GUnicharToGlyphCacheEntry *char_to_glyph_cache; + PangoFcCmapCache *cmap_cache; }; -#define GLYPH_CACHE_NUM_ENTRIES 256 /* should be power of two */ -#define GLYPH_CACHE_MASK (GLYPH_CACHE_NUM_ENTRIES - 1) - static gboolean pango_fc_font_real_has_char (PangoFcFont *font, gunichar wc); static guint pango_fc_font_real_get_glyph (PangoFcFont *font, @@ -121,6 +104,13 @@ pango_fc_font_class_init (PangoFcFontClass *class) "The fontconfig pattern for this font", G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (object_class, PROP_FONTMAP, + g_param_spec_object ("fontmap", + "Font Map", + "The PangoFc font map this font is associated with", + PANGO_TYPE_FC_FONT_MAP, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); g_type_class_add_private (object_class, sizeof (PangoFcFontPrivate)); } @@ -158,7 +148,8 @@ pango_fc_font_finalize (GObject *object) if (priv->decoder) _pango_fc_font_set_decoder (fcfont, NULL); - g_free (priv->char_to_glyph_cache); + if (priv->cmap_cache) + _pango_fc_cmap_cache_unref (priv->cmap_cache); G_OBJECT_CLASS (pango_fc_font_parent_class)->finalize (object); } @@ -203,11 +194,12 @@ pango_fc_font_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { + PangoFcFont *fcfont = PANGO_FC_FONT (object); + switch (prop_id) { case PROP_PATTERN: { - PangoFcFont *fcfont = PANGO_FC_FONT (object); FcPattern *pattern = g_value_get_pointer (value); g_return_if_fail (pattern != NULL); @@ -219,11 +211,30 @@ pango_fc_font_set_property (GObject *object, fcfont->is_hinted = pattern_is_hinted (pattern); fcfont->is_transformed = pattern_is_transformed (pattern); } - break; + goto set_decoder; + + case PROP_FONTMAP: + { + PangoFcFontMap *fcfontmap = PANGO_FC_FONT_MAP (g_value_get_object (value)); + + g_return_if_fail (fcfont->fontmap == NULL); + fcfont->fontmap = (PangoFontMap *) fcfontmap; + if (fcfont->fontmap) + g_object_add_weak_pointer (G_OBJECT (fcfont->fontmap), (gpointer *) (gpointer) &fcfont->fontmap); + } + goto set_decoder; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; + return; } + +set_decoder: + /* set decoder if both pattern and fontmap are set now */ + if (fcfont->font_pattern && fcfont->fontmap) + _pango_fc_font_set_decoder (fcfont, + pango_fc_font_map_find_decoder ((PangoFcFontMap *) fcfont->fontmap, + fcfont->font_pattern)); } static void @@ -240,6 +251,12 @@ pango_fc_font_get_property (GObject *object, g_value_set_pointer (value, fcfont->font_pattern); } break; + case PROP_FONTMAP: + { + PangoFcFont *fcfont = PANGO_FC_FONT (object); + g_value_set_object (value, fcfont->fontmap); + } + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -585,23 +602,25 @@ static guint pango_fc_font_real_get_glyph (PangoFcFont *font, gunichar wc) { + PangoFcFontPrivate *priv = font->priv; FT_Face face; FT_UInt index; guint idx; - GUnicharToGlyphCacheEntry *entry; + PangoFcCmapCacheEntry *entry; - PangoFcFontPrivate *priv = font->priv; - if (G_UNLIKELY (priv->char_to_glyph_cache == NULL)) + if (G_UNLIKELY (priv->cmap_cache == NULL)) { - priv->char_to_glyph_cache = g_new0 (GUnicharToGlyphCacheEntry, GLYPH_CACHE_NUM_ENTRIES); - /* Make sure all cache entries are invalid initially */ - priv->char_to_glyph_cache[0].ch = 1; /* char 1 cannot happen in bucket 0 */ + priv->cmap_cache = _pango_fc_font_map_get_cmap_cache ((PangoFcFontMap *) font->fontmap, + font); + + if (G_UNLIKELY (!priv->cmap_cache)) + return 0; } - idx = wc & GLYPH_CACHE_MASK; - entry = priv->char_to_glyph_cache + idx; + idx = wc & CMAP_CACHE_MASK; + entry = priv->cmap_cache->entries + idx; if (entry->ch != wc) { diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 491b912..28acdf7 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -19,7 +19,7 @@ * Boston, MA 02111-1307, USA. */ -#define FONTSET_CACHE_SIZE 64 +#define FONTSET_CACHE_SIZE 256 #include "config.h" #include @@ -31,7 +31,7 @@ #include "modules.h" #include "pango-enum-types.h" -typedef struct _PangoFcCoverageKey PangoFcCoverageKey; +typedef struct _PangoFcFontFaceData PangoFcFontFaceData; typedef struct _PangoFcFace PangoFcFace; typedef struct _PangoFcFamily PangoFcFamily; typedef struct _PangoFcFindFuncInfo PangoFcFindFuncInfo; @@ -64,7 +64,7 @@ struct _PangoFcFontMapPrivate */ GHashTable *pattern_hash; - GHashTable *coverage_hash; /* Maps font file name/id -> PangoCoverage */ + GHashTable *font_face_data_hash; /* Maps font file name/id -> data */ /* List of all families availible */ PangoFcFamily **families; @@ -78,10 +78,16 @@ struct _PangoFcFontMapPrivate guint closed : 1; }; -struct _PangoFcCoverageKey +struct _PangoFcFontFaceData { + /* Key */ char *filename; int id; /* needed to handle TTC files with multiple faces */ + + /* Data */ + FcPattern *pattern; /* Referenced pattern that owns filename */ + PangoCoverage *coverage; + PangoFcCmapCache *cmap_cache; }; struct _PangoFcFace @@ -137,9 +143,9 @@ static PangoFont *pango_fc_font_map_new_font (PangoFcFontMap *fontmap, PangoFcFontsetKey *fontset_key, FcPattern *match); -static guint pango_fc_coverage_key_hash (PangoFcCoverageKey *key); -static gboolean pango_fc_coverage_key_equal (PangoFcCoverageKey *key1, - PangoFcCoverageKey *key2); +static guint pango_fc_font_face_data_hash (PangoFcFontFaceData *key); +static gboolean pango_fc_font_face_data_equal (PangoFcFontFaceData *key1, + PangoFcFontFaceData *key2); static void pango_fc_fontset_key_init (PangoFcFontsetKey *key, PangoFcFontMap *fcfontmap, @@ -184,16 +190,31 @@ get_gravity_class (void) } static guint -pango_fc_coverage_key_hash (PangoFcCoverageKey *key) +pango_fc_font_face_data_hash (PangoFcFontFaceData *key) { return g_str_hash (key->filename) ^ key->id; } static gboolean -pango_fc_coverage_key_equal (PangoFcCoverageKey *key1, - PangoFcCoverageKey *key2) +pango_fc_font_face_data_equal (PangoFcFontFaceData *key1, + PangoFcFontFaceData *key2) +{ + return key1->id == key2->id && + (key1 == key2 || 0 == strcmp (key1->filename, key2->filename)); +} + +static void +pango_fc_font_face_data_free (PangoFcFontFaceData *data) { - return key1->id == key2->id && strcmp (key1->filename, key2->filename) == 0; + FcPatternDestroy (data->pattern); + + if (data->coverage) + pango_coverage_unref (data->coverage); + + if (data->cmap_cache) + _pango_fc_cmap_cache_unref (data->cmap_cache); + + g_slice_free (PangoFcFontFaceData, data); } /* Fowler / Noll / Vo (FNV) Hash (http://www.isthe.com/chongo/tech/comp/fnv/) @@ -839,7 +860,11 @@ pango_fc_fontset_finalize (GObject *object) unsigned int i; for (i = 0; i < fontset->fonts->len; i++) - g_object_unref (g_ptr_array_index(fontset->fonts, i)); + { + PangoFont *font = g_ptr_array_index(fontset->fonts, i); + if (font) + g_object_unref (font); + } g_ptr_array_free (fontset->fonts, TRUE); for (i = 0; i < fontset->coverages->len; i++) @@ -977,10 +1002,10 @@ pango_fc_font_map_init (PangoFcFontMap *fcfontmap) (GDestroyNotify) FcPatternDestroy, NULL); - priv->coverage_hash = g_hash_table_new_full ((GHashFunc)pango_fc_coverage_key_hash, - (GEqualFunc)pango_fc_coverage_key_equal, - (GDestroyNotify)g_free, - (GDestroyNotify)pango_coverage_unref); + priv->font_face_data_hash = g_hash_table_new_full ((GHashFunc)pango_fc_font_face_data_hash, + (GEqualFunc)pango_fc_font_face_data_equal, + (GDestroyNotify)pango_fc_font_face_data_free, + NULL); priv->dpi = -1; } @@ -1002,8 +1027,8 @@ pango_fc_font_map_fini (PangoFcFontMap *fcfontmap) g_hash_table_destroy (priv->font_hash); priv->font_hash = NULL; - g_hash_table_destroy (priv->coverage_hash); - priv->coverage_hash = NULL; + g_hash_table_destroy (priv->font_face_data_hash); + priv->font_face_data_hash = NULL; g_hash_table_destroy (priv->pattern_hash); priv->pattern_hash = NULL; @@ -1054,9 +1079,13 @@ pango_fc_font_map_add_decoder_find_func (PangoFcFontMap *fcfontmap, gpointer user_data, GDestroyNotify dnotify) { - PangoFcFontMapPrivate *priv = fcfontmap->priv; + PangoFcFontMapPrivate *priv; PangoFcFindFuncInfo *info; + g_return_if_fail (PANGO_IS_FC_FONT_MAP (fcfontmap)); + + priv = fcfontmap->priv; + info = g_slice_new (PangoFcFindFuncInfo); info->findfunc = findfunc; @@ -1066,6 +1095,41 @@ pango_fc_font_map_add_decoder_find_func (PangoFcFontMap *fcfontmap, priv->findfuncs = g_slist_append (priv->findfuncs, info); } +/** + * pango_fc_font_map_find_decoder: + * @fcfontmap: The #PangoFcFontMap to use. + * @pattern: The #FcPattern to find the decoder for. + * + * Finds the decoder to use for @pattern. Decoders can be added to + * a font map using pango_fc_font_map_add_decoder_find_func(). + * + * Returns: a newly created #PangoFcDecoder object or %NULL if + * no decoder is set for @pattern. + * + * Since: 1.24. + **/ +PangoFcDecoder * +pango_fc_font_map_find_decoder (PangoFcFontMap *fcfontmap, + FcPattern *pattern) +{ + GSList *l; + + g_return_val_if_fail (PANGO_IS_FC_FONT_MAP (fcfontmap), NULL); + g_return_val_if_fail (pattern != NULL, NULL); + + for (l = fcfontmap->priv->findfuncs; l && l->data; l = l->next) + { + PangoFcFindFuncInfo *info = l->data; + PangoFcDecoder *decoder; + + decoder = info->findfunc (pattern, info->user_data); + if (decoder) + return decoder; + } + + return NULL; +} + static void pango_fc_font_map_finalize (GObject *object) { @@ -1085,13 +1149,6 @@ pango_fc_font_map_add (PangoFcFontMap *fcfontmap, PangoFcFontMapPrivate *priv = fcfontmap->priv; PangoFcFontKey *key_copy; - g_assert (fcfont->fontmap == NULL); - fcfont->fontmap = (PangoFontMap *) fcfontmap; - /* In other fontmaps we add a weak pointer on ->fontmap so the - * field is unset when fontmap is finalized. We don't need it - * here though as PangoFcFontMap already cleans up fcfont->fontmap - * as part of it's caching scheme. */ - key_copy = pango_fc_font_key_copy (key); _pango_fc_font_set_font_key (fcfont, key_copy); g_hash_table_insert (priv->font_hash, key_copy, fcfont); @@ -1105,8 +1162,6 @@ _pango_fc_font_map_remove (PangoFcFontMap *fcfontmap, PangoFcFontMapPrivate *priv = fcfontmap->priv; PangoFcFontKey *key; - fcfont->fontmap = NULL; - key = _pango_fc_font_get_font_key (fcfont); if (key) { @@ -1407,7 +1462,6 @@ pango_fc_font_map_new_font (PangoFcFontMap *fcfontmap, PangoFcFontMapPrivate *priv = fcfontmap->priv; FcPattern *pattern; PangoFcFont *fcfont; - GSList *l; PangoFcFontKey key; if (priv->closed) @@ -1458,25 +1512,9 @@ pango_fc_font_map_new_font (PangoFcFontMap *fcfontmap, fcfont->matrix = key.matrix; + /* cache it on fontmap */ pango_fc_font_map_add (fcfontmap, &key, fcfont); - /* - * Give any custom decoders a crack at this font now that it's been - * created. - */ - for (l = priv->findfuncs; l && l->data; l = l->next) - { - PangoFcFindFuncInfo *info = l->data; - PangoFcDecoder *decoder; - - decoder = info->findfunc (match, info->user_data); - if (decoder) - { - _pango_fc_font_set_decoder (fcfont, decoder); - break; - } - } - return (PangoFont *)fcfont; } @@ -1682,21 +1720,85 @@ pango_fc_font_map_cache_clear (PangoFcFontMap *fcfontmap) pango_fc_font_map_init (fcfontmap); } -static void -pango_fc_font_map_set_coverage (PangoFcFontMap *fcfontmap, - PangoFcCoverageKey *key, - PangoCoverage *coverage) +static PangoFcFontFaceData * +pango_fc_font_map_get_font_face_data (PangoFcFontMap *fcfontmap, + FcPattern *font_pattern) { PangoFcFontMapPrivate *priv = fcfontmap->priv; - PangoFcCoverageKey *key_dup; + PangoFcFontFaceData key; + PangoFcFontFaceData *data; - key_dup = g_malloc (sizeof (PangoFcCoverageKey) + strlen (key->filename) + 1); - key_dup->id = key->id; - key_dup->filename = (char *) (key_dup + 1); - strcpy (key_dup->filename, key->filename); + if (FcPatternGetString (font_pattern, FC_FILE, 0, (FcChar8 **)(void*)&key.filename) != FcResultMatch) + return NULL; + + if (FcPatternGetInteger (font_pattern, FC_INDEX, 0, &key.id) != FcResultMatch) + return NULL; + + data = g_hash_table_lookup (priv->font_face_data_hash, &key); + if (G_LIKELY (data)) + return data; + + data = g_slice_new0 (PangoFcFontFaceData); + data->filename = key.filename; + data->id = key.id; + + data->pattern = font_pattern; + FcPatternReference (data->pattern); + + g_hash_table_insert (priv->font_face_data_hash, data, data); + + return data; +} + +PangoFcCmapCache * +_pango_fc_cmap_cache_ref (PangoFcCmapCache *cmap_cache) +{ + g_atomic_int_inc ((int *) &cmap_cache->ref_count); + + return cmap_cache; +} + +void +_pango_fc_cmap_cache_unref (PangoFcCmapCache *cmap_cache) +{ + g_return_if_fail (cmap_cache->ref_count > 0); + + if (g_atomic_int_dec_and_test ((int *) &cmap_cache->ref_count)) + { + g_free (cmap_cache); + } +} + +PangoFcCmapCache * +_pango_fc_font_map_get_cmap_cache (PangoFcFontMap *fcfontmap, + PangoFcFont *fcfont) +{ + PangoFcFontMapPrivate *priv; + PangoFcFontFaceData *data; + PangoFcCmapCache *cmap_cache; + + if (G_UNLIKELY (fcfontmap == NULL)) + return NULL; + + if (G_UNLIKELY (!fcfont->font_pattern)) + return NULL; + + priv = fcfontmap->priv; + + data = pango_fc_font_map_get_font_face_data (fcfontmap, fcfont->font_pattern); + if (G_UNLIKELY (!data)) + return NULL; + + if (G_UNLIKELY (data->cmap_cache == NULL)) + { + data->cmap_cache = g_new0 (PangoFcCmapCache, 1); + data->cmap_cache->ref_count = 1; - g_hash_table_insert (priv->coverage_hash, - key_dup, pango_coverage_ref (coverage)); + /* Make sure all cache entries are invalid initially */ + data->cmap_cache->entries[0].ch = 1; /* char 1 cannot happen in bucket 0 */ + } + + return _pango_fc_cmap_cache_ref (data->cmap_cache); } PangoCoverage * @@ -1704,37 +1806,30 @@ _pango_fc_font_map_get_coverage (PangoFcFontMap *fcfontmap, PangoFcFont *fcfont) { PangoFcFontMapPrivate *priv = fcfontmap->priv; - PangoFcCoverageKey key; + PangoFcFontFaceData *data; PangoCoverage *coverage; FcCharSet *charset; - /* - * Assume that coverage information is identified by - * a filename/index pair; there shouldn't be any reason - * this isn't true, but it's not specified anywhere - */ - if (FcPatternGetString (fcfont->font_pattern, FC_FILE, 0, (FcChar8 **)(void*)&key.filename) != FcResultMatch) - return NULL; - - if (FcPatternGetInteger (fcfont->font_pattern, FC_INDEX, 0, &key.id) != FcResultMatch) + if (G_UNLIKELY (!fcfont->font_pattern)) return NULL; - coverage = g_hash_table_lookup (priv->coverage_hash, &key); - if (G_LIKELY (coverage)) - return pango_coverage_ref (coverage); - - /* - * Pull the coverage out of the pattern, this - * doesn't require loading the font - */ - if (FcPatternGetCharSet (fcfont->font_pattern, FC_CHARSET, 0, &charset) != FcResultMatch) + data = pango_fc_font_map_get_font_face_data (fcfontmap, fcfont->font_pattern); + if (G_UNLIKELY (!data)) return NULL; - coverage = _pango_fc_font_map_fc_to_coverage (charset); + if (G_UNLIKELY (data->coverage == NULL)) + { + /* + * Pull the coverage out of the pattern, this + * doesn't require loading the font + */ + if (FcPatternGetCharSet (fcfont->font_pattern, FC_CHARSET, 0, &charset) != FcResultMatch) + return NULL; - pango_fc_font_map_set_coverage (fcfontmap, &key, coverage); + data->coverage = _pango_fc_font_map_fc_to_coverage (charset); + } - return coverage; + return pango_coverage_ref (data->coverage); } /** @@ -1821,9 +1916,15 @@ pango_fc_font_map_create_context (PangoFcFontMap *fcfontmap) static void shutdown_font (gpointer key G_GNUC_UNUSED, - PangoFcFont *fcfont) + PangoFcFont *fcfont, + PangoFcFontMap *fcfontmap) { _pango_fc_font_shutdown (fcfont); + + /* While _pango_fc_font_shutdown() tries to call the following + * function, it's too late as the fontmap weakref has already + * NULL'ed fcfont->fontmap, so we do it ourselves. */ + _pango_fc_font_map_remove (fcfontmap, fcfont); } /** @@ -1848,7 +1949,7 @@ pango_fc_font_map_shutdown (PangoFcFontMap *fcfontmap) if (priv->closed) return; - g_hash_table_foreach (priv->font_hash, (GHFunc) shutdown_font, NULL); + g_hash_table_foreach (priv->font_hash, (GHFunc) shutdown_font, fcfontmap); for (i = 0; i < priv->n_families; i++) priv->families[i]->fontmap = NULL; diff --git a/pango/pangofc-fontmap.h b/pango/pangofc-fontmap.h index d3f113a..8d496eb 100644 --- a/pango/pangofc-fontmap.h +++ b/pango/pangofc-fontmap.h @@ -213,6 +213,8 @@ void pango_fc_font_map_add_decoder_find_func (PangoFcFontMap *fcfontmap, PangoFcDecoderFindFunc findfunc, gpointer user_data, GDestroyNotify dnotify); +PangoFcDecoder *pango_fc_font_map_find_decoder (PangoFcFontMap *fcfontmap, + FcPattern *pattern); PangoFontDescription *pango_fc_font_description_from_pattern (FcPattern *pattern, gboolean include_size); diff --git a/pango/pangofc-private.h b/pango/pangofc-private.h index bc67ffb..0612a69 100644 --- a/pango/pangofc-private.h +++ b/pango/pangofc-private.h @@ -27,6 +27,7 @@ G_BEGIN_DECLS + typedef struct _PangoFcMetricsInfo PangoFcMetricsInfo; struct _PangoFcMetricsInfo @@ -35,6 +36,26 @@ struct _PangoFcMetricsInfo PangoFontMetrics *metrics; }; + +typedef struct _PangoFcCmapCacheEntry PangoFcCmapCacheEntry; +typedef struct _PangoFcCmapCache PangoFcCmapCache; + +#define CMAP_CACHE_NUM_ENTRIES 256 /* should be power of two */ +#define CMAP_CACHE_MASK (CMAP_CACHE_NUM_ENTRIES - 1) + +struct _PangoFcCmapCacheEntry +{ + gunichar ch; + PangoGlyph glyph; +}; + +struct _PangoFcCmapCache +{ + guint ref_count; + PangoFcCmapCacheEntry entries[CMAP_CACHE_NUM_ENTRIES]; +}; + + #define PANGO_SCALE_26_6 (PANGO_SCALE / (1<<6)) #define PANGO_PIXELS_26_6(d) \ (((d) >= 0) ? \ @@ -46,10 +67,15 @@ void _pango_fc_font_shutdown (PangoFcFont *fcfont); void _pango_fc_font_map_remove (PangoFcFontMap *fcfontmap, PangoFcFont *fcfont); + PangoCoverage *_pango_fc_font_map_get_coverage (PangoFcFontMap *fcfontmap, PangoFcFont *fcfont); PangoCoverage *_pango_fc_font_map_fc_to_coverage (FcCharSet *charset); +PangoFcCmapCache *_pango_fc_font_map_get_cmap_cache (PangoFcFontMap *fcfontmap, + PangoFcFont *fcfont); +void _pango_fc_cmap_cache_unref (PangoFcCmapCache *cmap_cache); + PangoFcDecoder *_pango_fc_font_get_decoder (PangoFcFont *font); void _pango_fc_font_set_decoder (PangoFcFont *font, PangoFcDecoder *decoder); diff --git a/pango/pangoft2.c b/pango/pangoft2.c index d13dc69..224f6a0 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -73,6 +73,7 @@ _pango_ft2_font_new (PangoFT2FontMap *ft2fontmap, ft2font = (PangoFT2Font *)g_object_new (PANGO_TYPE_FT2_FONT, "pattern", pattern, + "fontmap", fontmap, NULL); if (FcPatternGetDouble (pattern, FC_PIXEL_SIZE, 0, &d) == FcResultMatch) diff --git a/pango/pangoft2.def b/pango/pangoft2.def index f22d4ec..4cfa0d1 100644 --- a/pango/pangoft2.def +++ b/pango/pangoft2.def @@ -17,9 +17,16 @@ EXPORTS pango_fc_font_map_add_decoder_find_func pango_fc_font_map_cache_clear pango_fc_font_map_create_context + pango_fc_font_map_find_decoder pango_fc_font_map_get_type pango_fc_font_map_shutdown pango_fc_font_unlock_face + pango_fc_fontset_key_get_absolute_size + pango_fc_fontset_key_get_context_key + pango_fc_fontset_key_get_description + pango_fc_fontset_key_get_language + pango_fc_fontset_key_get_matrix + pango_fc_fontset_key_get_resolution pango_ft2_font_get_coverage pango_ft2_font_get_face pango_ft2_font_get_kerning diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index 28e0ebd..833219a 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -1069,63 +1069,9 @@ pango_win32_font_description_from_logfontw (const LOGFONTW *lfp) gchar *family; PangoStyle style; PangoVariant variant; - PangoWeight weight, name_weight; + PangoWeight weight; PangoStretch stretch; - static const struct { - const char *marker; - int marker_len; - int remove_len; - PangoWeight weight; - } weight_names[] = { -#define ENTRY(n, s) ENTRY2 (n, sizeof (#n) - 1, s) -#define ENTRY2(n, l, s) ENTRY3 (n, l, l, s) -#define ENTRY3(n, marker_len, remove_len, s) { #n, marker_len, remove_len, PANGO_WEIGHT_##s } - ENTRY (Ultra Light, ULTRALIGHT), - ENTRY (UltraLight, ULTRALIGHT), - ENTRY (Light, LIGHT), - ENTRY (Medium, NORMAL), - ENTRY (Demi Bold, SEMIBOLD), - ENTRY (Demi, SEMIBOLD), - ENTRY (Ultra Bold, ULTRABOLD), - ENTRY (Extra Bold, ULTRABOLD), - ENTRY (SemiBold, SEMIBOLD), - ENTRY (DemiBold, SEMIBOLD), - ENTRY (UltraBold, ULTRABOLD), - ENTRY (ExtraBold, ULTRABOLD), - ENTRY (Bold, BOLD), - ENTRY (Heavy, HEAVY), - ENTRY (Black, HEAVY), -#undef ENTRY -#undef ENTRY2 -#undef ENTRY3 - }; - - static const struct { - const char *marker; - int marker_len; - PangoStretch stretch; - } stretch_names[] = { -#define ENTRY(n, s) { #n, sizeof (#n) - 1, PANGO_STRETCH_##s } - ENTRY (Ext Condensed, EXTRA_CONDENSED), - ENTRY (Extra Condensed, EXTRA_CONDENSED), - ENTRY (UltraCondensed, ULTRA_CONDENSED), - ENTRY (ExtraCondensed, EXTRA_CONDENSED), - ENTRY (Condensed, CONDENSED), - ENTRY (Cond, CONDENSED), - ENTRY (Narrow, CONDENSED), - ENTRY (Ext Expanded, EXTRA_EXPANDED), - ENTRY (Extra Expanded, EXTRA_EXPANDED), - ENTRY (Ultra Expanded, ULTRA_EXPANDED), - ENTRY (ExtraExpanded, EXTRA_EXPANDED), - ENTRY (UltraExpanded, ULTRA_EXPANDED), - ENTRY (Expanded, EXPANDED), -#undef ENTRY - }; - - int i; - char *p; - family = get_family_nameW (lfp); if ((lfp->lfPitchAndFamily & 0xF0) == FF_ROMAN && lfp->lfItalic) @@ -1158,51 +1104,9 @@ pango_win32_font_description_from_logfontw (const LOGFONTW *lfp) else weight = PANGO_WEIGHT_HEAVY; - name_weight = 0; - - p = family; - while ((p = strchr (p, ' ')) != NULL) - { - for (i = 0; i < G_N_ELEMENTS (weight_names); i++) - { - if (g_ascii_strncasecmp (p + 1, weight_names[i].marker, weight_names[i].marker_len) == 0 && - (p[1 + weight_names[i].marker_len] == '\0' || - p[1 + weight_names[i].marker_len] == ' ')) - { - strcpy (p, p + 1 + weight_names[i].remove_len); - name_weight = weight_names[i].weight; - break; - } - } - if (i < G_N_ELEMENTS (weight_names)) - break; - p++; - } - - if (weight == PANGO_WEIGHT_NORMAL && name_weight > 0) - weight = name_weight; - + /* XXX No idea how to figure out the stretch */ stretch = PANGO_STRETCH_NORMAL; - p = family; - while ((p = strchr (p, ' ')) != NULL) - { - for (i = 0; i < G_N_ELEMENTS (stretch_names); i++) - { - if (g_ascii_strncasecmp (p + 1, stretch_names[i].marker, stretch_names[i].marker_len) == 0 && - (p[1 + stretch_names[i].marker_len] == '\0' || - p[1 + stretch_names[i].marker_len] == ' ')) - { - strcpy (p, p + 1 + stretch_names[i].marker_len); - stretch = stretch_names[i].stretch; - break; - } - } - if (i < G_N_ELEMENTS (stretch_names)) - break; - p++; - } - description = pango_font_description_new (); pango_font_description_set_family (description, family); g_free(family); diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index ce633f7..6865490 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -92,6 +92,7 @@ _pango_xft_font_new (PangoXftFontMap *xftfontmap, xfont = (PangoXftFont *)g_object_new (PANGO_TYPE_XFT_FONT, "pattern", pattern, + "fontmap", fontmap, NULL); /* Hack to force hinting of vertical metrics; hinting off for diff --git a/tests/gen-all-unicode.c b/tests/gen-all-unicode.c index 90ff4db..4139f23 100644 --- a/tests/gen-all-unicode.c +++ b/tests/gen-all-unicode.c @@ -2,7 +2,8 @@ #include int -main (int argc, char **argv) +main (int argc G_GNUC_UNUSED, + char **argv G_GNUC_UNUSED) { gunichar i; gint j; Index: pango.spec =================================================================== RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- pango.spec 26 Feb 2009 09:43:34 -0000 1.154 +++ pango.spec 11 Mar 2009 17:28:28 -0000 1.155 @@ -9,7 +9,7 @@ Summary: System for layout and rendering of internationalized text Name: pango Version: 1.23.0 -Release: 3%{?dist} +Release: 4.g5317893%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/pango/1.23/pango-%{version}.tar.bz2 @@ -39,6 +39,8 @@ # Look for pango.modules in an arch-specific directory Patch0: pango-1.21.4-lib64.patch +Patch1: pango-1.23.0-g5317893.patch + %description Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, @@ -75,6 +77,8 @@ %patch0 -p1 -b .lib64 +%patch0 -p1 -b .git + %build %configure --enable-gtk-doc --enable-doc-cross-references --with-included-modules=basic-fc @@ -224,6 +228,9 @@ %changelog +* Wed Mar 11 2009 Behdad Esfahbod - 1.23.0-4.g5317893 +- Push changes from git + * Thu Feb 26 2009 Fedora Release Engineering - 1.23.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From hadess at fedoraproject.org Wed Mar 11 17:29:27 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 11 Mar 2009 17:29:27 +0000 (UTC) Subject: rpms/control-center/devel Message-ID: <20090311172927.EAE8670128@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/control-center/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4954 Log Message: I bloody hate you CVS From behdad at fedoraproject.org Wed Mar 11 17:33:02 2009 From: behdad at fedoraproject.org (Behdad Esfahbod) Date: Wed, 11 Mar 2009 17:33:02 +0000 (UTC) Subject: rpms/pango/devel pango-1.23.0-g5317893.patch, 1.1, 1.2 pango.spec, 1.155, 1.156 Message-ID: <20090311173302.B86BC70128@cvs1.fedora.phx.redhat.com> Author: behdad Update of /cvs/pkgs/rpms/pango/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5712 Modified Files: pango-1.23.0-g5317893.patch pango.spec Log Message: . pango-1.23.0-g5317893.patch: Index: pango-1.23.0-g5317893.patch =================================================================== RCS file: /cvs/pkgs/rpms/pango/devel/pango-1.23.0-g5317893.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pango-1.23.0-g5317893.patch 11 Mar 2009 17:28:27 -0000 1.1 +++ pango-1.23.0-g5317893.patch 11 Mar 2009 17:32:32 -0000 1.2 @@ -1770,7 +1770,7 @@ index f22d4ec..4cfa0d1 100644 --- a/pango/pangoft2.def +++ b/pango/pangoft2.def -@@ -17,9 +17,16 @@ EXPORTS +@@ -17,6 +17,7 @@ EXPORTS pango_fc_font_map_add_decoder_find_func pango_fc_font_map_cache_clear pango_fc_font_map_create_context @@ -1778,15 +1778,6 @@ pango_fc_font_map_get_type pango_fc_font_map_shutdown pango_fc_font_unlock_face -+ pango_fc_fontset_key_get_absolute_size -+ pango_fc_fontset_key_get_context_key -+ pango_fc_fontset_key_get_description -+ pango_fc_fontset_key_get_language -+ pango_fc_fontset_key_get_matrix -+ pango_fc_fontset_key_get_resolution - pango_ft2_font_get_coverage - pango_ft2_font_get_face - pango_ft2_font_get_kerning diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index 28e0ebd..833219a 100644 --- a/pango/pangowin32-fontmap.c Index: pango.spec =================================================================== RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- pango.spec 11 Mar 2009 17:28:28 -0000 1.155 +++ pango.spec 11 Mar 2009 17:32:32 -0000 1.156 @@ -77,7 +77,7 @@ %patch0 -p1 -b .lib64 -%patch0 -p1 -b .git +%patch1 -p1 -b .git %build From dbhole at fedoraproject.org Wed Mar 11 17:33:08 2009 From: dbhole at fedoraproject.org (Deepak Bhole) Date: Wed, 11 Mar 2009 17:33:08 +0000 (UTC) Subject: rpms/ecj/devel ecj-generatedebuginfo.patch, NONE, 1.1 ecj.spec, 1.3, 1.4 Message-ID: <20090311173308.6681070128@cvs1.fedora.phx.redhat.com> Author: dbhole Update of /cvs/pkgs/rpms/ecj/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5759 Modified Files: ecj.spec Added Files: ecj-generatedebuginfo.patch Log Message: Add patch to generate full debuginfo for ecj itself ecj-generatedebuginfo.patch: --- NEW FILE ecj-generatedebuginfo.patch --- diff -up ./build.xml.sav ./build.xml --- ./build.xml.sav 2009-03-11 13:30:38.000000000 -0400 +++ ./build.xml 2009-03-11 13:30:34.000000000 -0400 @@ -10,7 +10,7 @@ @@ -18,7 +18,7 @@ Index: ecj.spec =================================================================== RCS file: /cvs/pkgs/rpms/ecj/devel/ecj.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ecj.spec 10 Mar 2009 19:13:24 -0000 1.3 +++ ecj.spec 11 Mar 2009 17:32:38 -0000 1.4 @@ -8,7 +8,7 @@ Summary: Eclipse Compiler for Java Name: ecj Version: 3.4.2 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.eclipse.org License: EPL Group: Development/Languages @@ -24,6 +24,7 @@ # Always generate debug info when building RPMs (Andrew Haley) Patch0: %{name}-rpmdebuginfo.patch Patch1: %{name}-defaultto1.5.patch +Patch2: %{name}-generatedebuginfo.patch BuildRequires: gcc-java >= 4.0.0 BuildRequires: /usr/bin/aot-compile-rpm @@ -48,6 +49,7 @@ %setup -q -c %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Use ECJ for GCJ's bytecode compiler tar jxf %{SOURCE2} @@ -119,6 +121,9 @@ %{_libdir}/gcj/%{name} %changelog +* Wed Mar 11 2009 Deepak Bhole 1:3.4.2-4 +- Add patch to generate full debuginfo for ecj itself + * Tue Mar 10 2009 Deepak Bhole 1:3.4.2-3 - Add BR for aot-compile-rpm From hadess at fedoraproject.org Wed Mar 11 17:33:21 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 11 Mar 2009 17:33:21 +0000 (UTC) Subject: rpms/control-center/devel gcc-fingerprint-selection-warning.patch, NONE, 1.1 gcc-new-fingerprint-icons.patch, NONE, 1.1 control-center.spec, 1.438, 1.439 gnome-control-center-2.25.2-gecos.patch, 1.3, 1.4 Message-ID: <20090311173321.2420E70128@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/control-center/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5838 Modified Files: control-center.spec gnome-control-center-2.25.2-gecos.patch Added Files: gcc-fingerprint-selection-warning.patch gcc-new-fingerprint-icons.patch Log Message: * Wed Mar 11 2009 - Bastien Nocera - 2.25.92-2 - New icons for the fingerprint enrollment, from Mike Langlie gcc-fingerprint-selection-warning.patch: --- NEW FILE gcc-fingerprint-selection-warning.patch --- Index: capplets/about-me/gnome-about-me-fingerprint.c =================================================================== --- capplets/about-me/gnome-about-me-fingerprint.c (revision 9336) +++ capplets/about-me/gnome-about-me-fingerprint.c (working copy) @@ -310,7 +342,7 @@ static void finger_combobox_changed (GtkComboBox *combobox, EnrollData *data) { - data->finger = selected_finger (data->dialog_page2); + data->finger = selected_finger (data->dialog_page1); } static void gcc-new-fingerprint-icons.patch: --- NEW FILE gcc-new-fingerprint-icons.patch --- Index: configure.in =================================================================== --- configure.in (revision 9336) +++ configure.in (working copy) @@ -284,6 +284,7 @@ capplets/Makefile capplets/about-me/Makefile capplets/about-me/gnome-about-me.desktop.in +capplets/about-me/icons/Makefile capplets/accessibility/Makefile capplets/accessibility/at-properties/at-properties.desktop.in capplets/accessibility/at-properties/Makefile Index: capplets/about-me/gnome-about-me-fingerprint.c =================================================================== --- capplets/about-me/gnome-about-me-fingerprint.c (revision 9336) +++ capplets/about-me/gnome-about-me-fingerprint.c (working copy) @@ -332,12 +364,14 @@ char *msg; if (g_str_equal (result, "enroll-completed") || g_str_equal (result, "enroll-stage-passed")) { - char *name; + char *name, *path; data->num_stages_done++; name = g_strdup_printf ("image%d", data->num_stages_done); - gtk_image_set_from_stock (GTK_IMAGE (WID (name)), GTK_STOCK_YES, GTK_ICON_SIZE_DIALOG); + path = g_build_filename (GNOMECC_PIXMAP_DIR, "print_ok.svg", NULL); + gtk_image_set_from_file (GTK_IMAGE (WID (name)), path); g_free (name); + g_free (path); } if (g_str_equal (result, "enroll-completed")) { gtk_label_set_text (GTK_LABEL (WID ("status-label")), _("Done!")); @@ -375,6 +409,7 @@ DBusGProxy *p; GError *error = NULL; GladeXML *dialog = data->dialog_page2; + char *path; guint i; GValue value = { 0, }; @@ -430,7 +465,22 @@ gtk_widget_hide (WID (name)); g_free (name); } + /* And set the right image */ + { + char *filename; + filename = g_strdup_printf ("%s.svg", data->finger); + path = g_build_filename (GNOMECC_PIXMAP_DIR, filename, NULL); + g_free (filename); + } + for (i = 1; i <= data->num_enroll_stages; i++) { + char *name; + name = g_strdup_printf ("image%d", i); + gtk_image_set_from_file (GTK_IMAGE (WID (name)), path); + g_free (name); + } + g_free (path); + dbus_g_proxy_add_signal(data->device, "EnrollStatus", G_TYPE_STRING, G_TYPE_BOOLEAN, NULL); dbus_g_proxy_connect_signal(data->device, "EnrollStatus", G_CALLBACK(enroll_result), data, NULL); Index: capplets/about-me/Makefile.am =================================================================== --- capplets/about-me/Makefile.am (revision 9336) +++ capplets/about-me/Makefile.am (working copy) @@ -1,3 +1,5 @@ +SUBDIRS = icons + # This is used in GNOMECC_CAPPLETS_CFLAGS cappletname = about-me @@ -4,10 +6,6 @@ glade_files = gnome-about-me.glade gnome-about-me-fingerprint.glade Desktop_in_files = gnome-about-me.desktop.in -pixmap_files = \ - gnome-about-me-lock.png \ - gnome-about-me-lock-open.png - gnome_about_me_SOURCES = \ eel-alert-dialog.c \ eel-alert-dialog.h \ @@ -25,9 +23,6 @@ if BUILD_ABOUTME bin_PROGRAMS = gnome-about-me -pixmapdir = $(pkgdatadir)/pixmaps -pixmap_DATA = $(pixmap_files) - gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(POLKIT_GNOME_LIBS) gnome_about_me_LDFLAGS = -export-dynamic @@ -46,7 +41,7 @@ -DDATADIR="\"$(datadir)\"" \ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \ - -DGNOMECC_PIXMAP_DIR="\"$(pixmapdir)\"" \ + -DGNOMECC_PIXMAP_DIR="\"$(pkgdatadir)/pixmaps\"" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" MARSHALFILES = marshal.c marshal.h @@ -61,4 +56,4 @@ endif # BUILD_ABOUTME CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(MARSHALFILES) -EXTRA_DIST = $(glade_files) $(pixmap_files) fprintd-marshal.list +EXTRA_DIST = $(glade_files) fprintd-marshal.list Index: capplets/about-me/icons/right-middle-finger.svg =================================================================== --- capplets/about-me/icons/right-middle-finger.svg (revision 0) +++ capplets/about-me/icons/right-middle-finger.svg (revision 0) @@ -0,0 +1,182 @@ + + +image/svg+xml + + + + + + + + +image/svg+xml + + + + + + + + + + + + + + + + + \ No newline at end of file Index: control-center.spec =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v retrieving revision 1.438 retrieving revision 1.439 diff -u -r1.438 -r1.439 --- control-center.spec 3 Mar 2009 02:49:23 -0000 1.438 +++ control-center.spec 11 Mar 2009 17:32:50 -0000 1.439 @@ -23,7 +23,7 @@ Summary: Utilities to configure the GNOME desktop Name: control-center Version: 2.25.92 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -51,6 +51,12 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=546036 Patch33: notification-theme.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=574973 +Patch34: gcc-new-fingerprint-icons.patch + +# http://bugzilla.gnome.org/show_bug.cgi?id=574974 +Patch35: gcc-fingerprint-selection-warning.patch + # call the Fedora/RHEL graphical passwd changing apps Patch95: gnome-control-center-2.25.2-passwd.patch Patch96: gnome-control-center-2.25.2-gecos.patch @@ -173,6 +179,8 @@ %patch30 -p1 -b .default-layout-toggle %patch32 -p1 -b .display-no-help %patch33 -p1 -b .notification-theme +%patch34 -p0 -b .new-icons +%patch35 -p0 -b .fprint-selection-warning # vendor configuration patches %patch95 -p1 -b .passwd @@ -347,6 +355,9 @@ %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Wed Mar 11 2009 - Bastien Nocera - 2.25.92-2 +- New icons for the fingerprint enrollment, from Mike Langlie + * Mon Mar 2 2009 Matthias Clasen - 2.25.92-1 - Update to 2.25.92 gnome-control-center-2.25.2-gecos.patch: Index: gnome-control-center-2.25.2-gecos.patch =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/gnome-control-center-2.25.2-gecos.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnome-control-center-2.25.2-gecos.patch 17 Dec 2008 02:36:38 -0000 1.3 +++ gnome-control-center-2.25.2-gecos.patch 11 Mar 2009 17:32:50 -0000 1.4 @@ -6158,7 +6158,7 @@ --- gnome-control-center-2.25.2/capplets/about-me/Makefile.am.gecos 2008-12-02 11:52:42.000000000 -0500 +++ gnome-control-center-2.25.2/capplets/about-me/Makefile.am 2008-12-16 21:16:16.000000000 -0500 @@ -9,13 +9,16 @@ pixmap_files = \ - gnome-about-me-lock-open.png + Desktop_in_files = gnome-about-me.desktop.in gnome_about_me_SOURCES = \ - eel-alert-dialog.c \ @@ -6178,8 +6178,8 @@ gnome-about-me-fingerprint.h \ $(MARSHALFILES) \ @@ -28,7 +31,7 @@ bin_PROGRAMS = gnome-about-me - pixmapdir = $(pkgdatadir)/pixmaps - pixmap_DATA = $(pixmap_files) + if BUILD_ABOUTME + bin_PROGRAMS = gnome-about-me -gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(POLKIT_GNOME_LIBS) +gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(POLKIT_GNOME_LIBS) $(GAIL_LIBS) From salimma at fedoraproject.org Wed Mar 11 17:38:35 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Wed, 11 Mar 2009 17:38:35 +0000 (UTC) Subject: rpms/nickle/EL-5 .cvsignore, 1.5, 1.6 nickle.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <20090311173835.C599F70128@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/nickle/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7526/EL-5 Modified Files: .cvsignore nickle.spec sources Log Message: * Wed Mar 11 2009 Michel Salim - 2.68-1 - Update to 2.68 - Enable checks Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nickle/EL-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Jun 2008 18:13:05 -0000 1.5 +++ .cvsignore 11 Mar 2009 17:38:05 -0000 1.6 @@ -1 +1 @@ -nickle-2.67.tar.gz +nickle-2.68.tar.gz Index: nickle.spec =================================================================== RCS file: /cvs/pkgs/rpms/nickle/EL-5/nickle.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nickle.spec 6 Jun 2008 18:13:05 -0000 1.4 +++ nickle.spec 11 Mar 2009 17:38:05 -0000 1.5 @@ -1,5 +1,5 @@ Name: nickle -Version: 2.67 +Version: 2.68 Release: 1%{?dist} Summary: A programming language-based prototyping environment @@ -44,6 +44,11 @@ make %{?_smp_flags} +%check +cd test +make check + + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -72,6 +77,10 @@ %{_includedir}/nickle %changelog +* Wed Mar 11 2009 Michel Salim - 2.68-1 +- Update to 2.68 +- Enable checks + * Fri Jun 6 2008 Michel Alexandre Salim - 2.67-1 - Update to 2.67 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nickle/EL-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Jun 2008 18:13:05 -0000 1.5 +++ sources 11 Mar 2009 17:38:05 -0000 1.6 @@ -1 +1 @@ -d5e3ab076ad96803923da8f6906fe0eb nickle-2.67.tar.gz +3a4a171f59715ec38992e3d6947c14b6 nickle-2.68.tar.gz From salimma at fedoraproject.org Wed Mar 11 17:38:35 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Wed, 11 Mar 2009 17:38:35 +0000 (UTC) Subject: rpms/nickle/F-10 .cvsignore, 1.5, 1.6 nickle.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <20090311173835.EFE9670132@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/nickle/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7526/F-10 Modified Files: .cvsignore nickle.spec sources Log Message: * Wed Mar 11 2009 Michel Salim - 2.68-1 - Update to 2.68 - Enable checks Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nickle/F-10/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Jun 2008 18:14:08 -0000 1.5 +++ .cvsignore 11 Mar 2009 17:38:05 -0000 1.6 @@ -1 +1 @@ -nickle-2.67.tar.gz +nickle-2.68.tar.gz Index: nickle.spec =================================================================== RCS file: /cvs/pkgs/rpms/nickle/F-10/nickle.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nickle.spec 6 Jun 2008 18:14:08 -0000 1.5 +++ nickle.spec 11 Mar 2009 17:38:05 -0000 1.6 @@ -1,5 +1,5 @@ Name: nickle -Version: 2.67 +Version: 2.68 Release: 1%{?dist} Summary: A programming language-based prototyping environment @@ -44,6 +44,11 @@ make %{?_smp_flags} +%check +cd test +make check + + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -72,6 +77,10 @@ %{_includedir}/nickle %changelog +* Wed Mar 11 2009 Michel Salim - 2.68-1 +- Update to 2.68 +- Enable checks + * Fri Jun 6 2008 Michel Alexandre Salim - 2.67-1 - Update to 2.67 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nickle/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Jun 2008 18:14:08 -0000 1.5 +++ sources 11 Mar 2009 17:38:05 -0000 1.6 @@ -1 +1 @@ -d5e3ab076ad96803923da8f6906fe0eb nickle-2.67.tar.gz +3a4a171f59715ec38992e3d6947c14b6 nickle-2.68.tar.gz From salimma at fedoraproject.org Wed Mar 11 17:38:36 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Wed, 11 Mar 2009 17:38:36 +0000 (UTC) Subject: rpms/nickle/F-9 .cvsignore, 1.5, 1.6 nickle.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <20090311173836.3C40C70128@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/nickle/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7526/F-9 Modified Files: .cvsignore nickle.spec sources Log Message: * Wed Mar 11 2009 Michel Salim - 2.68-1 - Update to 2.68 - Enable checks Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nickle/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Jun 2008 18:13:44 -0000 1.5 +++ .cvsignore 11 Mar 2009 17:38:05 -0000 1.6 @@ -1 +1 @@ -nickle-2.67.tar.gz +nickle-2.68.tar.gz Index: nickle.spec =================================================================== RCS file: /cvs/pkgs/rpms/nickle/F-9/nickle.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nickle.spec 6 Jun 2008 18:13:44 -0000 1.5 +++ nickle.spec 11 Mar 2009 17:38:06 -0000 1.6 @@ -1,5 +1,5 @@ Name: nickle -Version: 2.67 +Version: 2.68 Release: 1%{?dist} Summary: A programming language-based prototyping environment @@ -44,6 +44,11 @@ make %{?_smp_flags} +%check +cd test +make check + + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -72,6 +77,10 @@ %{_includedir}/nickle %changelog +* Wed Mar 11 2009 Michel Salim - 2.68-1 +- Update to 2.68 +- Enable checks + * Fri Jun 6 2008 Michel Alexandre Salim - 2.67-1 - Update to 2.67 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nickle/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Jun 2008 18:13:44 -0000 1.5 +++ sources 11 Mar 2009 17:38:06 -0000 1.6 @@ -1 +1 @@ -d5e3ab076ad96803923da8f6906fe0eb nickle-2.67.tar.gz +3a4a171f59715ec38992e3d6947c14b6 nickle-2.68.tar.gz From salimma at fedoraproject.org Wed Mar 11 17:38:36 2009 From: salimma at fedoraproject.org (Michel Alexandre Salim) Date: Wed, 11 Mar 2009 17:38:36 +0000 (UTC) Subject: rpms/nickle/devel .cvsignore, 1.5, 1.6 nickle.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <20090311173836.C156570128@cvs1.fedora.phx.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/nickle/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7526/devel Modified Files: .cvsignore nickle.spec sources Log Message: * Wed Mar 11 2009 Michel Salim - 2.68-1 - Update to 2.68 - Enable checks Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nickle/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Jun 2008 18:14:08 -0000 1.5 +++ .cvsignore 11 Mar 2009 17:38:06 -0000 1.6 @@ -1 +1 @@ -nickle-2.67.tar.gz +nickle-2.68.tar.gz Index: nickle.spec =================================================================== RCS file: /cvs/pkgs/rpms/nickle/devel/nickle.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nickle.spec 26 Feb 2009 05:40:57 -0000 1.6 +++ nickle.spec 11 Mar 2009 17:38:06 -0000 1.7 @@ -1,6 +1,6 @@ Name: nickle -Version: 2.67 -Release: 2%{?dist} +Version: 2.68 +Release: 1%{?dist} Summary: A programming language-based prototyping environment Group: Development/Languages @@ -44,6 +44,11 @@ make %{?_smp_flags} +%check +cd test +make check + + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -72,6 +77,10 @@ %{_includedir}/nickle %changelog +* Wed Mar 11 2009 Michel Salim - 2.68-1 +- Update to 2.68 +- Enable checks + * Wed Feb 25 2009 Fedora Release Engineering - 2.67-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nickle/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Jun 2008 18:14:08 -0000 1.5 +++ sources 11 Mar 2009 17:38:06 -0000 1.6 @@ -1 +1 @@ -d5e3ab076ad96803923da8f6906fe0eb nickle-2.67.tar.gz +3a4a171f59715ec38992e3d6947c14b6 nickle-2.68.tar.gz From hadess at fedoraproject.org Wed Mar 11 17:43:10 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Wed, 11 Mar 2009 17:43:10 +0000 (UTC) Subject: rpms/control-center/devel control-center.spec,1.439,1.440 Message-ID: <20090311174310.96D8270128@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/control-center/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8494 Modified Files: control-center.spec Log Message: Hopefully fix build Index: control-center.spec =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v retrieving revision 1.439 retrieving revision 1.440 diff -u -r1.439 -r1.440 --- control-center.spec 11 Mar 2009 17:32:50 -0000 1.439 +++ control-center.spec 11 Mar 2009 17:42:40 -0000 1.440 @@ -180,6 +180,9 @@ %patch32 -p1 -b .display-no-help %patch33 -p1 -b .notification-theme %patch34 -p0 -b .new-icons +pushd capplets/about-me +mv *png icons/ +popd %patch35 -p0 -b .fprint-selection-warning # vendor configuration patches From s4504kr at fedoraproject.org Wed Mar 11 17:43:17 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Wed, 11 Mar 2009 17:43:17 +0000 (UTC) Subject: rpms/ksplice/devel ksplice.spec,1.13,1.14 Message-ID: <20090311174317.B5C2B70128@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/ksplice/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8551 Modified Files: ksplice.spec Log Message: New upstream release Index: ksplice.spec =================================================================== RCS file: /cvs/extras/rpms/ksplice/devel/ksplice.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ksplice.spec 25 Feb 2009 12:09:19 -0000 1.13 +++ ksplice.spec 11 Mar 2009 17:42:47 -0000 1.14 @@ -1,6 +1,6 @@ Name: ksplice -Version: 0.9.6 -Release: 2%{?dist} +Version: 0.9.7 +Release: 1%{?dist} Summary: Patching a Linux kernel without reboot Group: System Environment/Kernel @@ -84,7 +84,10 @@ %doc COPYING README %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 0.9.6-2 +* Wed Mar 11 2009 Jochen Schmitt 0.9.7-1 +- New upstream release + +* Wed Feb 25 2009 Fedora Release Engineering 0.9.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Thu Jan 22 2009 Jochen Schmitt 0.9.6-1 From pkgdb at fedoraproject.org Wed Mar 11 18:00:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 18:00:54 +0000 Subject: [pkgdb] yum-presto: james has requested watchbugzilla Message-ID: <20090311180051.382232086EF@bastion.fedora.phx.redhat.com> james has requested the watchbugzilla acl on yum-presto (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-presto From pkgdb at fedoraproject.org Wed Mar 11 17:59:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 17:59:42 +0000 Subject: [pkgdb] yum-presto: james has requested commit Message-ID: <20090311180052.B5E12208702@bastion.fedora.phx.redhat.com> james has requested the commit acl on yum-presto (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-presto From pkgdb at fedoraproject.org Wed Mar 11 17:59:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 17:59:27 +0000 Subject: [pkgdb] yum-presto: james has requested approveacls Message-ID: <20090311180054.090D2208514@bastion.fedora.phx.redhat.com> james has requested the approveacls acl on yum-presto (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-presto From pkgdb at fedoraproject.org Wed Mar 11 18:00:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 18:00:34 +0000 Subject: [pkgdb] yum-presto: james has requested watchcommits Message-ID: <20090311180054.364B2208710@bastion.fedora.phx.redhat.com> james has requested the watchcommits acl on yum-presto (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-presto From pkgdb at fedoraproject.org Wed Mar 11 17:59:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 17:59:55 +0000 Subject: [pkgdb] yum-presto: james has requested watchcommits Message-ID: <20090311180105.5457220871A@bastion.fedora.phx.redhat.com> james has requested the watchcommits acl on yum-presto (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-presto From pkgdb at fedoraproject.org Wed Mar 11 17:59:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 17:59:41 +0000 Subject: [pkgdb] yum-presto: james has requested commit Message-ID: <20090311180106.7A34E20876C@bastion.fedora.phx.redhat.com> james has requested the commit acl on yum-presto (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-presto From pkgdb at fedoraproject.org Wed Mar 11 18:00:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 18:00:46 +0000 Subject: [pkgdb] yum-presto: james has requested watchbugzilla Message-ID: <20090311180107.D9E552087F3@bastion.fedora.phx.redhat.com> james has requested the watchbugzilla acl on yum-presto (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-presto From s4504kr at fedoraproject.org Wed Mar 11 18:02:00 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Wed, 11 Mar 2009 18:02:00 +0000 (UTC) Subject: rpms/ksplice/devel .cvsignore, 1.8, 1.9 ksplice.spec, 1.14, 1.15 sources, 1.8, 1.9 Message-ID: <20090311180200.758E570128@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/ksplice/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11379 Modified Files: .cvsignore ksplice.spec sources Log Message: Forgooten to upload new upstream tarball Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ksplice/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Jan 2009 18:06:10 -0000 1.8 +++ .cvsignore 11 Mar 2009 18:01:30 -0000 1.9 @@ -1 +1 @@ -ksplice-0.9.6-src.tar.gz +ksplice-0.9.7-src.tar.gz Index: ksplice.spec =================================================================== RCS file: /cvs/extras/rpms/ksplice/devel/ksplice.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ksplice.spec 11 Mar 2009 17:42:47 -0000 1.14 +++ ksplice.spec 11 Mar 2009 18:01:30 -0000 1.15 @@ -1,6 +1,6 @@ Name: ksplice Version: 0.9.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Patching a Linux kernel without reboot Group: System Environment/Kernel @@ -84,7 +84,7 @@ %doc COPYING README %changelog -* Wed Mar 11 2009 Jochen Schmitt 0.9.7-1 +* Wed Mar 11 2009 Jochen Schmitt 0.9.7-2 - New upstream release * Wed Feb 25 2009 Fedora Release Engineering 0.9.6-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ksplice/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Jan 2009 18:06:10 -0000 1.8 +++ sources 11 Mar 2009 18:01:30 -0000 1.9 @@ -1 +1 @@ -67b9da77f2d3248d80ad9c400ba74535 ksplice-0.9.6-src.tar.gz +79bc8aa5275c026e3bd4092da93cb996 ksplice-0.9.7-src.tar.gz From pkgdb at fedoraproject.org Wed Mar 11 18:08:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 18:08:39 +0000 Subject: [pkgdb] yum-presto had acl change status Message-ID: <20090311180859.D1222208505@bastion.fedora.phx.redhat.com> jdieter has set the watchbugzilla acl on yum-presto (Fedora devel) to Approved for james To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-presto From pkgdb at fedoraproject.org Wed Mar 11 18:09:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 18:09:03 +0000 Subject: [pkgdb] yum-presto had acl change status Message-ID: <20090311180900.31FF6208556@bastion.fedora.phx.redhat.com> jdieter has set the watchcommits acl on yum-presto (Fedora devel) to Approved for james To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-presto From pkgdb at fedoraproject.org Wed Mar 11 18:07:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 18:07:50 +0000 Subject: [pkgdb] yum-presto had acl change status Message-ID: <20090311180900.D99FB208609@bastion.fedora.phx.redhat.com> jdieter has set the commit acl on yum-presto (Fedora devel) to Approved for james To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-presto From pkgdb at fedoraproject.org Wed Mar 11 18:07:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 18:07:36 +0000 Subject: [pkgdb] yum-presto had acl change status Message-ID: <20090311180901.E811820860B@bastion.fedora.phx.redhat.com> jdieter has set the approveacls acl on yum-presto (Fedora devel) to Approved for james To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-presto From pkgdb at fedoraproject.org Wed Mar 11 18:09:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 18:09:19 +0000 Subject: [pkgdb] yum-presto had acl change status Message-ID: <20090311180916.BBE532082B2@bastion.fedora.phx.redhat.com> jdieter has set the watchbugzilla acl on yum-presto (Fedora 10) to Approved for james To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-presto From pkgdb at fedoraproject.org Wed Mar 11 18:08:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 18:08:07 +0000 Subject: [pkgdb] yum-presto had acl change status Message-ID: <20090311180917.30E5C208554@bastion.fedora.phx.redhat.com> jdieter has set the watchcommits acl on yum-presto (Fedora 10) to Approved for james To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-presto From pkgdb at fedoraproject.org Wed Mar 11 18:07:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 11 Mar 2009 18:07:52 +0000 Subject: [pkgdb] yum-presto had acl change status Message-ID: <20090311180917.E78632086F3@bastion.fedora.phx.redhat.com> jdieter has set the commit acl on yum-presto (Fedora 10) to Approved for james To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/yum-presto From james at fedoraproject.org Wed Mar 11 18:19:11 2009 From: james at fedoraproject.org (James Antill) Date: Wed, 11 Mar 2009 18:19:11 +0000 (UTC) Subject: rpms/yum-presto/devel speedup.patch, NONE, 1.1 yum-presto.spec, 1.10, 1.11 Message-ID: <20090311181911.6A8C970128@cvs1.fedora.phx.redhat.com> Author: james Update of /cvs/pkgs/rpms/yum-presto/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14542 Modified Files: yum-presto.spec Added Files: speedup.patch Log Message: * Wed Mar 11 2009 James Antill - 0.4.5-4 - Added speedup patch from upstream. speedup.patch: --- NEW FILE speedup.patch --- commit b169b61683ec3275d7021441ba411ada48fe0fe9 Author: James Antill Date: Mon Feb 9 10:22:30 2009 -0500 Don't init. prest stuff all the time diff --git a/yum-presto/presto.py b/yum-presto/presto.py index 2130595..f4d9545 100644 --- a/yum-presto/presto.py +++ b/yum-presto/presto.py @@ -414,7 +414,10 @@ def config_hook(conduit): help="disable Presto plugin and don't download any deltarpms") # Set up Presto repositories -def postreposetup_hook(conduit): +# Don't do this whn repos. are setup as that happens a lot, but we only +# care about presto when we are about to download packages. Eventaully if +# we have MD deltas we'll want to trigger then too. +def xpostreposetup_hook(conduit): opts, commands = conduit.getCmdLine() if opts and opts.disablepresto: conduit.info(5, '--disablepresto specified - Presto disabled') @@ -433,6 +436,7 @@ def predownload_hook(conduit): global complete_download_size global actual_download_size + xpostreposetup_hook(conduit) opts, commands = conduit.getCmdLine() if (opts and opts.disablepresto) or len(conduit.getDownloadPackages()) == 0: return commit 5637a30f03046edbc653dc41b41f9ed3f61bd113 Author: James Antill Date: Mon Feb 9 10:29:42 2009 -0500 Only operate on non-downloaded packages and repos for same diff --git a/yum-presto/presto.py b/yum-presto/presto.py index f4d9545..b545b9e 100644 --- a/yum-presto/presto.py +++ b/yum-presto/presto.py @@ -192,7 +192,7 @@ def getDelta(po, presto, rpmdb): return bestdelta -def downloadPkgs(conduit, presto): +def downloadPkgs(conduit, presto, download_pkgs=None): """download list of package objects handed to you, return errors""" errors = {} @@ -207,9 +207,11 @@ def downloadPkgs(conduit, presto): remote_pkgs = [] + if download_pkgs is None: + download_pkgs = conduit.getDownloadPackages() # see which deltas we need to download; if the delta is already # downloaded, we can start it reconstructing in the background - for po in conduit.getDownloadPackages(): + for po in download_pkgs: delta = getDelta(po, presto, conduit.getRpmDB()) if delta is None: continue @@ -417,14 +419,16 @@ def config_hook(conduit): # Don't do this whn repos. are setup as that happens a lot, but we only # care about presto when we are about to download packages. Eventaully if # we have MD deltas we'll want to trigger then too. -def xpostreposetup_hook(conduit): +def xpostreposetup_hook(conduit, repos=None): opts, commands = conduit.getCmdLine() if opts and opts.disablepresto: conduit.info(5, '--disablepresto specified - Presto disabled') return conduit.info(2, 'Setting up and reading Presto delta metadata') - for active_repo in conduit.getRepos().listEnabled(): + if repos is None: + repos = conduit.getRepos().listEnabled() + for active_repo in repos: try: deltamd = active_repo.retrieveMD("prestodelta") except: @@ -436,21 +440,32 @@ def predownload_hook(conduit): global complete_download_size global actual_download_size - xpostreposetup_hook(conduit) opts, commands = conduit.getCmdLine() if (opts and opts.disablepresto) or len(conduit.getDownloadPackages()) == 0: return # Get download size, to calculate accurate download savings pkglist = conduit.getDownloadPackages() + repos = set() + download_pkgs = [] for po in pkglist: + local = po.localPkg() + if os.path.exists(local): + if conduit._base.verifyPkg(local, po, False): + continue + repos.add(po.repo) + download_pkgs.append(po) complete_download_size += int(po.size) actual_download_size = complete_download_size + if not download_pkgs: + return + xpostreposetup_hook(conduit, repos) conduit.info(2, "Downloading DeltaRPMs:") + download_pkgs.sort() # Download deltarpms - problems = downloadPkgs(conduit, pinfo) + problems = downloadPkgs(conduit, pinfo, download_pkgs) # If 'exitondownloaderror' is on, exit if conduit.confBool('main', 'exitondownloaderror') and \ Index: yum-presto.spec =================================================================== RCS file: /cvs/pkgs/rpms/yum-presto/devel/yum-presto.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- yum-presto.spec 25 Feb 2009 18:24:30 -0000 1.10 +++ yum-presto.spec 11 Mar 2009 18:18:41 -0000 1.11 @@ -3,10 +3,11 @@ Summary: Presto plugin for yum Name: yum-presto Version: 0.4.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Development/Tools Source: http://www.lesbg.com/jdieter/presto/%{name}-%{version}.tar.bz2 +Patch0: speedup.patch URL: http://www.lesbg.com/jdieter/presto/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,6 +27,8 @@ %prep %setup -q +%patch0 -p2 + %build %install @@ -45,6 +48,9 @@ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/presto.conf %changelog +* Wed Mar 11 2009 James Antill - 0.4.5-4 +- Added speedup patch from upstream. + * Wed Feb 25 2009 Fedora Release Engineering - 0.4.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ajax at fedoraproject.org Wed Mar 11 18:20:58 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Wed, 11 Mar 2009 18:20:58 +0000 (UTC) Subject: rpms/xorg-x11-server/devel xserver-1.6.0-less-acpi-brokenness.patch, NONE, 1.1 xorg-x11-server.spec, 1.422, 1.423 Message-ID: <20090311182058.87E4270128@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14936 Modified Files: xorg-x11-server.spec Added Files: xserver-1.6.0-less-acpi-brokenness.patch Log Message: * Wed Mar 11 2009 Adam Jackson 1.6.0-11 - xserver-1.6.0-less-acpi-brokenness.patch: Don't build the (broken) ACPI code. xserver-1.6.0-less-acpi-brokenness.patch: --- NEW FILE xserver-1.6.0-less-acpi-brokenness.patch --- >From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 11 Mar 2009 14:02:11 -0400 Subject: [PATCH] Don't build the ACPI code. No good can come of this. --- configure.ac | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 72ae67e..04716f8 100644 --- a/configure.ac +++ b/configure.ac @@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then case $host_cpu in ia64*) linux_ia64=yes - linux_acpi="yes" ;; alpha*) linux_alpha=yes ;; i*86|amd64*|x86_64*) - linux_acpi="yes" ;; *) ;; -- 1.6.1.3 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.422 retrieving revision 1.423 diff -u -r1.422 -r1.423 --- xorg-x11-server.spec 11 Mar 2009 17:02:03 -0000 1.422 +++ xorg-x11-server.spec 11 Mar 2009 18:20:28 -0000 1.423 @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.0 -Release: 10%{?dist} +Release: 11%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -75,6 +75,9 @@ # cf. bug 482924 Patch6010: xserver-1.5.99.902-selinux-debugging.patch +# don't build the (broken) acpi code +Patch6011: xserver-1.6.0-less-acpi-brokenness.patch + # don't try intel on poulsbo Patch6013: xserver-1.5.99.902-sod-off-poulsbo.patch @@ -503,6 +506,10 @@ %changelog +* Wed Mar 11 2009 Adam Jackson 1.6.0-11 +- xserver-1.6.0-less-acpi-brokenness.patch: Don't build the (broken) + ACPI code. + * Wed Mar 11 2009 Adam Jackson 1.6.0-10 - xserver-1.6.0-selinux-less.patch: Don't init selinux unless the policy says to be an object manager. From glommer at fedoraproject.org Wed Mar 11 18:35:50 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 11 Mar 2009 18:35:50 +0000 (UTC) Subject: rpms/qemu/devel qemu.spec,1.65,1.66 Message-ID: <20090311183550.4519A70128@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17077 Modified Files: qemu.spec Log Message: - fix Obsolete/Provides pair - Use kvm bios from bochs-bios package. - Using RPM_OPT_FLAGS in configure - Picked back audio-drv-list from kvm package Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- qemu.spec 11 Mar 2009 00:02:51 -0000 1.65 +++ qemu.spec 11 Mar 2009 18:35:19 -0000 1.66 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.7.kvm20090310git%{?dist} +Release: 0.8.kvm20090310git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -84,8 +84,8 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: etherboot-zroms-kvm Requires: vgabios -Requires: bochs-bios -Provides: kvm >= 84 +Requires: bochs-bios >= 2.3.8.0.5 +Provides: kvm = 85 Obsoletes: kvm < 85 %description system-x86 @@ -200,22 +200,23 @@ %ifarch %{ix86} x86_64 # build kvm -sed -i 's/datasuffix=\"\/share\/qemu\"/datasuffix=\"\/share\/kvm\"/' qemu/configure echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease +# sdl outputs to alsa or pulseaudio directly depending on what the system has configured +# alsa works, but causes huge CPU load due to bugs +# oss works, but is very problematic because it grabs exclusive control of the device causing other apps to go haywire ./configure --with-patched-kernel --target-list=x86_64-softmmu \ --kerneldir=$(pwd)/kernel --prefix=%{_prefix} \ - --qemu-ldflags=$extraldflags + --audio-drv-list=sdl,alsa,oss \ + --qemu-ldflags=$extraldflags \ + --qemu-cflags="$RPM_OPT_FLAGS" make %{?_smp_mflags} $buildldflags cp qemu/x86_64-softmmu/qemu-system-x86_64 qemu-kvm cp user/kvmtrace . cp user/kvmtrace_format . -make bios -make vgabios make clean %endif -sed -i 's/datasuffix=\"\/share\/kvm\"/datasuffix=\"\/share\/qemu\"/' qemu/configure echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease cd qemu ./configure \ @@ -231,7 +232,10 @@ --interp-prefix=%{_prefix}/qemu-%%M \ --kerneldir=$(pwd)/../kernel --prefix=%{_prefix} \ --disable-kvm \ - --extra-ldflags=$extraldflags + --extra-ldflags=$extraldflags \ + --audio-drv-list=sdl,alsa,oss \ + --extra-cflags="$RPM_OPT_FLAGS" + make %{?_smp_mflags} $buildldflags @@ -241,7 +245,6 @@ %ifarch %{ix86} x86_64 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules mkdir -p $RPM_BUILD_ROOT%{_bindir}/ -mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/kvm install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules install -m 0755 kvmtrace $RPM_BUILD_ROOT%{_bindir}/ @@ -249,10 +252,6 @@ install -m 0755 kvm_stat $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 qemu-kvm $RPM_BUILD_ROOT%{_bindir}/ -install -m 0644 bios/BIOS-bochs-latest $RPM_BUILD_ROOT%{_prefix}/share/kvm/bios.bin -install -m 0644 vgabios/VGABIOS-lgpl-latest.bin $RPM_BUILD_ROOT%{_prefix}/share/kvm/vgabios.bin -install -m 0644 vgabios/VGABIOS-lgpl-latest.cirrus.bin $RPM_BUILD_ROOT%{_prefix}/share/kvm/vgabios-cirrus.bin - %endif cd qemu @@ -286,7 +285,7 @@ pxe_link virtio virtio-net ln -s ../vgabios/VGABIOS-lgpl-latest.bin %{buildroot}/%{_prefix}/share/qemu/vgabios.bin ln -s ../vgabios/VGABIOS-lgpl-latest.cirrus.bin %{buildroot}/%{_prefix}/share/qemu/vgabios-cirrus.bin -ln -s ../bochs/BIOS-bochs-latest %{buildroot}/%{_prefix}/share/qemu/bios.bin +ln -s ../bochs/BIOS-bochs-kvm %{buildroot}/%{_prefix}/share/qemu/bios.bin @@ -363,10 +362,6 @@ %ifarch %{ix86} x86_64 %{_bindir}/qemu-kvm %{_sysconfdir}/sysconfig/modules/kvm.modules -%{_prefix}/share/kvm/ -%{_prefix}/share/kvm/bios.bin -%{_prefix}/share/kvm/vgabios.bin -%{_prefix}/share/kvm/vgabios-cirrus.bin %files kvm-tools %defattr(-,root,root,-) %{_bindir}/kvmtrace @@ -409,6 +404,12 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Wed Mar 11 2009 Glauber Costa - 2:0.10-0.8.kvm20090310git +- fix Obsolete/Provides pair +- Use kvm bios from bochs-bios package. +- Using RPM_OPT_FLAGS in configure +- Picked back audio-drv-list from kvm package + * Tue Mar 10 2009 Glauber Costa - 2:0.10-0.7.kvm20090310git - modify ppc patch From wwoods at fedoraproject.org Wed Mar 11 18:36:38 2009 From: wwoods at fedoraproject.org (Will Woods) Date: Wed, 11 Mar 2009 18:36:38 +0000 (UTC) Subject: rpms/davfs2/F-10 davfs2-1.3.3-open-creat-3-args.patch, NONE, 1.1 davfs2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090311183638.A269770128@cvs1.fedora.phx.redhat.com> Author: wwoods Update of /cvs/pkgs/rpms/davfs2/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17477/F-10 Modified Files: .cvsignore sources Added Files: davfs2-1.3.3-open-creat-3-args.patch davfs2.spec Log Message: Initial commit davfs2-1.3.3-open-creat-3-args.patch: --- NEW FILE davfs2-1.3.3-open-creat-3-args.patch --- diff -up davfs2-1.3.3/src/webdav.c.open-creat-3-args davfs2-1.3.3/src/webdav.c --- davfs2-1.3.3/src/webdav.c.open-creat-3-args 2009-03-02 22:03:26.000000000 -0500 +++ davfs2-1.3.3/src/webdav.c 2009-03-02 22:09:19.000000000 -0500 @@ -1513,7 +1513,7 @@ static int block_writer(void *userdata, get_context *ctx = (get_context *) userdata; if (ctx->fd == 0) - ctx->fd = open(ctx->file, O_WRONLY | O_CREAT | O_TRUNC); + ctx->fd = open(ctx->file, O_WRONLY | O_CREAT | O_TRUNC, 0644); if (ctx->fd <= 0) { ne_set_error(session, _("%i can't open cache file"), 0); ctx->error = EIO; --- NEW FILE davfs2.spec --- Name: davfs2 Version: 1.3.3 Release: 2%{?dist} Summary: A filesystem driver for WebDAV Group: System Environment/Base License: GPLv2+ URL: http://dav.sourceforge.net Source0: http://downloads.sourceforge.net/dav/davfs2-1.3.3.tar.gz Patch1: davfs2-1.3.3-open-creat-3-args.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: neon-devel gettext Requires(pre): shadow-utils %define cachedir /var/cache/davfs2 %define piddir /var/run/mount.davfs %define username davfs2 %define groupname %{username} %description davfs2 is a Linux file system driver that allows you to mount a WebDAV server as a disk drive. %prep %setup -q %patch1 -p1 -b .open-creat-3-args %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} # Create directories used by mount.davfs install -d $RPM_BUILD_ROOT%{cachedir} $RPM_BUILD_ROOT%{piddir} # Fix symlinks ln -sf ../usr/sbin/mount.davfs $RPM_BUILD_ROOT/sbin/mount.davfs ln -sf ../usr/sbin/umount.davfs $RPM_BUILD_ROOT/sbin/umount.davfs # Don't need this - we'll do our own doc install, thanks rm -rf $RPM_BUILD_ROOT/usr/share/doc/davfs2 # Remove duplicate files. (Why is it installing these in the first place?) rm -rf $RPM_BUILD_ROOT/usr/share/davfs2 # same files in /etc/davfs2 # Remove suid bit, to work around a problem with brp-strip on suid binaries chmod 0755 $RPM_BUILD_ROOT/%{_sbindir}/mount.davfs # UTF8ify translated man pages find $RPM_BUILD_ROOT/%{_mandir}/{de,es} -name "*.[58].gz" | while read m; do gzip -dc $m | iconv -f "ISO8859-15" -t "UTF-8" - -o - | gzip -c9 > $m.utf8 mv -f $m.utf8 $m done %clean rm -rf $RPM_BUILD_ROOT %pre getent group %{groupname} >/dev/null || groupadd -r %{groupname} getent passwd %{username} >/dev/null || \ useradd -r -g %{groupname} -d %{cachedir} -s /sbin/nologin \ -c "User account for %{name}" %{username} exit 0 %files -f %{name}.lang %defattr(-,root,root,-) # Docs %doc AUTHORS BUGS COPYING ChangeLog FAQ INSTALL.davfs2 NEWS README README.translators THANKS TODO %{_mandir}/man5/*.gz %{_mandir}/man8/*.gz # localized man pages %{_mandir}/*/man5/*.gz %{_mandir}/*/man8/*.gz # Configfiles etc. %config(noreplace) %{_sysconfdir}/davfs2/davfs2.conf %config(noreplace) %{_sysconfdir}/davfs2/secrets %dir %{_sysconfdir}/davfs2/certs/private/ %dir %{_sysconfdir}/davfs2/certs/ %dir %{_sysconfdir}/davfs2/ # Binaries %{_sbindir}/umount.davfs # re-apply suid bit to mount.davfs %attr (4755,root,root) %{_sbindir}/mount.davfs # symlinks to files in %{_sbindir} /sbin/mount.davfs /sbin/umount.davfs # Extra dirs needed by mount.davfs %dir %attr(00775,root,%{groupname}) %{cachedir} %dir %attr(01775,root,%{groupname}) %{piddir} %changelog * Wed Mar 11 2009 Will Woods - 1.3.3-2 - Passed package review (#488858) - Ensure that package owns /etc/davfs2 and /etc/davfs2/certs * Mon Mar 02 2009 Will Woods - 1.3.3-1 - Initial packaging - Fix open() with O_CREAT and no mode Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/davfs2/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:18:13 -0000 1.1 +++ .cvsignore 11 Mar 2009 18:36:08 -0000 1.2 @@ -0,0 +1 @@ +davfs2-1.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/davfs2/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:18:13 -0000 1.1 +++ sources 11 Mar 2009 18:36:08 -0000 1.2 @@ -0,0 +1 @@ +57def26e4d6d63527e01612d10fd0515 davfs2-1.3.3.tar.gz From wwoods at fedoraproject.org Wed Mar 11 18:36:39 2009 From: wwoods at fedoraproject.org (Will Woods) Date: Wed, 11 Mar 2009 18:36:39 +0000 (UTC) Subject: rpms/davfs2/F-9 davfs2-1.3.3-open-creat-3-args.patch, NONE, 1.1 davfs2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090311183639.0C15970128@cvs1.fedora.phx.redhat.com> Author: wwoods Update of /cvs/pkgs/rpms/davfs2/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17477/F-9 Modified Files: .cvsignore sources Added Files: davfs2-1.3.3-open-creat-3-args.patch davfs2.spec Log Message: Initial commit davfs2-1.3.3-open-creat-3-args.patch: --- NEW FILE davfs2-1.3.3-open-creat-3-args.patch --- diff -up davfs2-1.3.3/src/webdav.c.open-creat-3-args davfs2-1.3.3/src/webdav.c --- davfs2-1.3.3/src/webdav.c.open-creat-3-args 2009-03-02 22:03:26.000000000 -0500 +++ davfs2-1.3.3/src/webdav.c 2009-03-02 22:09:19.000000000 -0500 @@ -1513,7 +1513,7 @@ static int block_writer(void *userdata, get_context *ctx = (get_context *) userdata; if (ctx->fd == 0) - ctx->fd = open(ctx->file, O_WRONLY | O_CREAT | O_TRUNC); + ctx->fd = open(ctx->file, O_WRONLY | O_CREAT | O_TRUNC, 0644); if (ctx->fd <= 0) { ne_set_error(session, _("%i can't open cache file"), 0); ctx->error = EIO; --- NEW FILE davfs2.spec --- Name: davfs2 Version: 1.3.3 Release: 2%{?dist} Summary: A filesystem driver for WebDAV Group: System Environment/Base License: GPLv2+ URL: http://dav.sourceforge.net Source0: http://downloads.sourceforge.net/dav/davfs2-1.3.3.tar.gz Patch1: davfs2-1.3.3-open-creat-3-args.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: neon-devel gettext Requires(pre): shadow-utils %define cachedir /var/cache/davfs2 %define piddir /var/run/mount.davfs %define username davfs2 %define groupname %{username} %description davfs2 is a Linux file system driver that allows you to mount a WebDAV server as a disk drive. %prep %setup -q %patch1 -p1 -b .open-creat-3-args %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} # Create directories used by mount.davfs install -d $RPM_BUILD_ROOT%{cachedir} $RPM_BUILD_ROOT%{piddir} # Fix symlinks ln -sf ../usr/sbin/mount.davfs $RPM_BUILD_ROOT/sbin/mount.davfs ln -sf ../usr/sbin/umount.davfs $RPM_BUILD_ROOT/sbin/umount.davfs # Don't need this - we'll do our own doc install, thanks rm -rf $RPM_BUILD_ROOT/usr/share/doc/davfs2 # Remove duplicate files. (Why is it installing these in the first place?) rm -rf $RPM_BUILD_ROOT/usr/share/davfs2 # same files in /etc/davfs2 # Remove suid bit, to work around a problem with brp-strip on suid binaries chmod 0755 $RPM_BUILD_ROOT/%{_sbindir}/mount.davfs # UTF8ify translated man pages find $RPM_BUILD_ROOT/%{_mandir}/{de,es} -name "*.[58].gz" | while read m; do gzip -dc $m | iconv -f "ISO8859-15" -t "UTF-8" - -o - | gzip -c9 > $m.utf8 mv -f $m.utf8 $m done %clean rm -rf $RPM_BUILD_ROOT %pre getent group %{groupname} >/dev/null || groupadd -r %{groupname} getent passwd %{username} >/dev/null || \ useradd -r -g %{groupname} -d %{cachedir} -s /sbin/nologin \ -c "User account for %{name}" %{username} exit 0 %files -f %{name}.lang %defattr(-,root,root,-) # Docs %doc AUTHORS BUGS COPYING ChangeLog FAQ INSTALL.davfs2 NEWS README README.translators THANKS TODO %{_mandir}/man5/*.gz %{_mandir}/man8/*.gz # localized man pages %{_mandir}/*/man5/*.gz %{_mandir}/*/man8/*.gz # Configfiles etc. %config(noreplace) %{_sysconfdir}/davfs2/davfs2.conf %config(noreplace) %{_sysconfdir}/davfs2/secrets %dir %{_sysconfdir}/davfs2/certs/private/ %dir %{_sysconfdir}/davfs2/certs/ %dir %{_sysconfdir}/davfs2/ # Binaries %{_sbindir}/umount.davfs # re-apply suid bit to mount.davfs %attr (4755,root,root) %{_sbindir}/mount.davfs # symlinks to files in %{_sbindir} /sbin/mount.davfs /sbin/umount.davfs # Extra dirs needed by mount.davfs %dir %attr(00775,root,%{groupname}) %{cachedir} %dir %attr(01775,root,%{groupname}) %{piddir} %changelog * Wed Mar 11 2009 Will Woods - 1.3.3-2 - Passed package review (#488858) - Ensure that package owns /etc/davfs2 and /etc/davfs2/certs * Mon Mar 02 2009 Will Woods - 1.3.3-1 - Initial packaging - Fix open() with O_CREAT and no mode Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/davfs2/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:18:13 -0000 1.1 +++ .cvsignore 11 Mar 2009 18:36:08 -0000 1.2 @@ -0,0 +1 @@ +davfs2-1.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/davfs2/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:18:13 -0000 1.1 +++ sources 11 Mar 2009 18:36:08 -0000 1.2 @@ -0,0 +1 @@ +57def26e4d6d63527e01612d10fd0515 davfs2-1.3.3.tar.gz From wwoods at fedoraproject.org Wed Mar 11 18:36:39 2009 From: wwoods at fedoraproject.org (Will Woods) Date: Wed, 11 Mar 2009 18:36:39 +0000 (UTC) Subject: rpms/davfs2/devel davfs2-1.3.3-open-creat-3-args.patch, NONE, 1.1 davfs2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090311183639.51F2D70128@cvs1.fedora.phx.redhat.com> Author: wwoods Update of /cvs/pkgs/rpms/davfs2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17477/devel Modified Files: .cvsignore sources Added Files: davfs2-1.3.3-open-creat-3-args.patch davfs2.spec Log Message: Initial commit davfs2-1.3.3-open-creat-3-args.patch: --- NEW FILE davfs2-1.3.3-open-creat-3-args.patch --- diff -up davfs2-1.3.3/src/webdav.c.open-creat-3-args davfs2-1.3.3/src/webdav.c --- davfs2-1.3.3/src/webdav.c.open-creat-3-args 2009-03-02 22:03:26.000000000 -0500 +++ davfs2-1.3.3/src/webdav.c 2009-03-02 22:09:19.000000000 -0500 @@ -1513,7 +1513,7 @@ static int block_writer(void *userdata, get_context *ctx = (get_context *) userdata; if (ctx->fd == 0) - ctx->fd = open(ctx->file, O_WRONLY | O_CREAT | O_TRUNC); + ctx->fd = open(ctx->file, O_WRONLY | O_CREAT | O_TRUNC, 0644); if (ctx->fd <= 0) { ne_set_error(session, _("%i can't open cache file"), 0); ctx->error = EIO; --- NEW FILE davfs2.spec --- Name: davfs2 Version: 1.3.3 Release: 2%{?dist} Summary: A filesystem driver for WebDAV Group: System Environment/Base License: GPLv2+ URL: http://dav.sourceforge.net Source0: http://downloads.sourceforge.net/dav/davfs2-1.3.3.tar.gz Patch1: davfs2-1.3.3-open-creat-3-args.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: neon-devel gettext Requires(pre): shadow-utils %define cachedir /var/cache/davfs2 %define piddir /var/run/mount.davfs %define username davfs2 %define groupname %{username} %description davfs2 is a Linux file system driver that allows you to mount a WebDAV server as a disk drive. %prep %setup -q %patch1 -p1 -b .open-creat-3-args %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} # Create directories used by mount.davfs install -d $RPM_BUILD_ROOT%{cachedir} $RPM_BUILD_ROOT%{piddir} # Fix symlinks ln -sf ../usr/sbin/mount.davfs $RPM_BUILD_ROOT/sbin/mount.davfs ln -sf ../usr/sbin/umount.davfs $RPM_BUILD_ROOT/sbin/umount.davfs # Don't need this - we'll do our own doc install, thanks rm -rf $RPM_BUILD_ROOT/usr/share/doc/davfs2 # Remove duplicate files. (Why is it installing these in the first place?) rm -rf $RPM_BUILD_ROOT/usr/share/davfs2 # same files in /etc/davfs2 # Remove suid bit, to work around a problem with brp-strip on suid binaries chmod 0755 $RPM_BUILD_ROOT/%{_sbindir}/mount.davfs # UTF8ify translated man pages find $RPM_BUILD_ROOT/%{_mandir}/{de,es} -name "*.[58].gz" | while read m; do gzip -dc $m | iconv -f "ISO8859-15" -t "UTF-8" - -o - | gzip -c9 > $m.utf8 mv -f $m.utf8 $m done %clean rm -rf $RPM_BUILD_ROOT %pre getent group %{groupname} >/dev/null || groupadd -r %{groupname} getent passwd %{username} >/dev/null || \ useradd -r -g %{groupname} -d %{cachedir} -s /sbin/nologin \ -c "User account for %{name}" %{username} exit 0 %files -f %{name}.lang %defattr(-,root,root,-) # Docs %doc AUTHORS BUGS COPYING ChangeLog FAQ INSTALL.davfs2 NEWS README README.translators THANKS TODO %{_mandir}/man5/*.gz %{_mandir}/man8/*.gz # localized man pages %{_mandir}/*/man5/*.gz %{_mandir}/*/man8/*.gz # Configfiles etc. %config(noreplace) %{_sysconfdir}/davfs2/davfs2.conf %config(noreplace) %{_sysconfdir}/davfs2/secrets %dir %{_sysconfdir}/davfs2/certs/private/ %dir %{_sysconfdir}/davfs2/certs/ %dir %{_sysconfdir}/davfs2/ # Binaries %{_sbindir}/umount.davfs # re-apply suid bit to mount.davfs %attr (4755,root,root) %{_sbindir}/mount.davfs # symlinks to files in %{_sbindir} /sbin/mount.davfs /sbin/umount.davfs # Extra dirs needed by mount.davfs %dir %attr(00775,root,%{groupname}) %{cachedir} %dir %attr(01775,root,%{groupname}) %{piddir} %changelog * Wed Mar 11 2009 Will Woods - 1.3.3-2 - Passed package review (#488858) - Ensure that package owns /etc/davfs2 and /etc/davfs2/certs * Mon Mar 02 2009 Will Woods - 1.3.3-1 - Initial packaging - Fix open() with O_CREAT and no mode Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/davfs2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2009 20:18:13 -0000 1.1 +++ .cvsignore 11 Mar 2009 18:36:09 -0000 1.2 @@ -0,0 +1 @@ +davfs2-1.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/davfs2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2009 20:18:13 -0000 1.1 +++ sources 11 Mar 2009 18:36:09 -0000 1.2 @@ -0,0 +1 @@ +57def26e4d6d63527e01612d10fd0515 davfs2-1.3.3.tar.gz From hno at fedoraproject.org Wed Mar 11 19:01:45 2009 From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=) Date: Wed, 11 Mar 2009 19:01:45 +0000 (UTC) Subject: rpms/bzrtools/devel .cvsignore, 1.26, 1.27 bzrtools.spec, 1.41, 1.42 sources, 1.27, 1.28 Message-ID: <20090311190145.6FC5770128@cvs1.fedora.phx.redhat.com> Author: hno Update of /cvs/pkgs/rpms/bzrtools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22012 Modified Files: .cvsignore bzrtools.spec sources Log Message: 1.13.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bzrtools/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 10 Feb 2009 19:44:03 -0000 1.26 +++ .cvsignore 11 Mar 2009 19:01:15 -0000 1.27 @@ -1 +1 @@ -bzrtools-1.12.0.tar.gz +bzrtools-1.13.0.tar.gz Index: bzrtools.spec =================================================================== RCS file: /cvs/pkgs/rpms/bzrtools/devel/bzrtools.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- bzrtools.spec 24 Feb 2009 06:17:27 -0000 1.41 +++ bzrtools.spec 11 Mar 2009 19:01:15 -0000 1.42 @@ -5,12 +5,12 @@ # (bzrlib is arch dependent. Thus bzrlib plugins are also arch dependent.) %define debug_package %{nil} -%define bzrver 1.12 -%define bzrnextver 1.13 +%define bzrver 1.13 +%define bzrnextver 1.14 Name: bzrtools Version: %{bzrver}.0 -Release: 2%{?dist} +Release: 1%{?dist} Summary: A collection of utilities and plugins for Bazaar-NG Group: Development/Tools @@ -71,6 +71,9 @@ %endif %changelog +* Wed Mar 11 2009 Henrik Nordstrom - 1.13.0-1 +- Update to 1.13.0 + * Mon Feb 23 2009 Fedora Release Engineering - 1.12.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bzrtools/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 10 Feb 2009 19:44:03 -0000 1.27 +++ sources 11 Mar 2009 19:01:15 -0000 1.28 @@ -1 +1 @@ -3e5b9b090da951205db9608a4091e706 bzrtools-1.12.0.tar.gz +dda51994e233c67175d7f9fb3f2bdc14 bzrtools-1.13.0.tar.gz From nsantos at fedoraproject.org Wed Mar 11 19:05:51 2009 From: nsantos at fedoraproject.org (Nuno Santos) Date: Wed, 11 Mar 2009 19:05:51 +0000 (UTC) Subject: rpms/qpidc/devel qpidd.pp, NONE, 1.1 .cvsignore, 1.17, 1.18 qpidc.spec, 1.70, 1.71 sources, 1.36, 1.37 Message-ID: <20090311190551.D35AA70128@cvs1.fedora.phx.redhat.com> Author: nsantos Update of /cvs/extras/rpms/qpidc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22808 Modified Files: .cvsignore qpidc.spec sources Added Files: qpidd.pp Log Message: Rebased to svn rev 752533 --- NEW FILE qpidd.pp --- ??|?  # # Directory patterns (dir) # # Parameters: # 1. domain type # 2. container (directory) type # 3. directory type # # # Regular file patterns (file) # # Parameters: # 1. domain type # 2. container (directory) type # 3. file type # # # Symbolic link patterns (lnk_file) # # Parameters: # 1. domain type # 2. container (directory) type # 3. file type # # # (Un)named Pipes/FIFO patterns (fifo_file) # # Parameters: # 1. domain type # 2. container (directory) type # 3. file type # # # (Un)named sockets patterns (sock_file) # # Parameters: # 1. domain type # 2. container (directory) type # 3. file type # # # Block device node patterns (blk_file) # # Parameters: # 1. domain type # 2. container (directory) type # 3. file type # # # Character device node patterns (chr_file) # # Parameters: # 1. domain type # 2. container (directory) type # 3. file type # # # File type_transition patterns # # pattern(domain,dirtype,newtype,class(es)) # # # unix domain socket patterns # ######################################## # # Macros for switching between source policy # and loadable policy module support # ############################## # # For adding the module statement # ############################## # # For use in interfaces, to optionally insert a require block # # helper function, since m4 wont expand macros # if a line is a comment (#): ############################## # # In the future interfaces should be in loadable modules # # template(name,rules) # ############################## # # In the future interfaces should be in loadable modules # # interface(name,rules) # ############################## # # Optional policy handling # ############################## # # Determine if we should use the default # tunable value as specified by the policy # or if the override value should be used # ############################## # # Extract booleans out of an expression. # This needs to be reworked so expressions # with parentheses can work. ############################## # # Tunable declaration # ############################## # # Tunable policy handling # ######################################## # # Helper macros # # # shiftn(num,list...) # # shift the list num times # # # ifndef(expr,true_block,false_block) # # m4 does not have this. # # # __endline__ # # dummy macro to insert a newline. used for # errprint, so the close parentheses can be # indented correctly. # ######################################## # # refpolwarn(message) # # print a warning message # ######################################## # # refpolerr(message) # # print an error message. does not # make anything fail. # ######################################## # # gen_user(username, prefix, role_set, mls_defaultlevel, mls_range, [mcs_categories]) # ######################################## # # gen_context(context,mls_sensitivity,[mcs_categories]) # ######################################## # # can_exec(domain,executable) # ######################################## # # gen_bool(name,default_value) # # # Specified domain transition patterns # # compatibility: # # Automatic domain transition patterns # # compatibility: # # Other process permissions # ######################################## # # gen_cats(N) # # declares categores c0 to c(N-1) # ######################################## # # gen_sens(N) # # declares sensitivites s0 to s(N-1) with dominance # in increasing numeric order with s0 lowest, s(N-1) highest # ######################################## # # gen_levels(N,M) # # levels from s0 to (N-1) with categories c0 to (M-1) # ######################################## # # Basic level names for system low and high # ######################################## # # Support macros for sets of object classes and permissions # # This file should only have object class and permission set macros - they # can only reference object classes and/or permissions. # # All directory and file classes # # # All non-directory file classes. # # # Non-device file classes. # # # Device file classes. # # # All socket classes. # # # Datagram socket classes. # # # Stream socket classes. # # # Unprivileged socket classes (exclude rawip, netlink, packet). # ######################################## # # Macros for sets of permissions # # # Permissions for getting file attributes. # # # Permissions for executing files. # # # Permissions for reading files and their attributes. # # # Permissions for reading and executing files. # # # Permissions for reading and appending to files. # # # Permissions for linking, unlinking and renaming files. # # # Permissions for creating lnk_files. # # # Permissions for creating and using files. # # # Permissions for reading directories and their attributes. # # # Permissions for reading and writing directories and their attributes. # # # Permissions for reading and adding names to directories. # # # Permissions for creating and using directories. # # # Permissions to mount and unmount file systems. # # # Permissions for using sockets. # # # Permissions for creating and using sockets. # # # Permissions for using stream sockets. # # # Permissions for creating and using stream sockets. # # # Permissions for creating and using sockets. # # # Permissions for creating and using sockets. # # # Permissions for creating and using netlink sockets. # # # Permissions for using netlink sockets for operations that modify state. # # # Permissions for using netlink sockets for operations that observe state. # # # Permissions for sending all signals. # # # Permissions for sending and receiving network packets. # # # Permissions for using System V IPC # ######################################## # # New permission sets # # # Directory # # # File # # # Use (read and write) terminals # # # Sockets # ######################################## # # New permission sets # # # Directory (dir) # # # Regular file (file) # # # Symbolic link (lnk_file) # # # (Un)named Pipes/FIFOs (fifo_file) # # # (Un)named Sockets (sock_file) # # # Block device nodes (blk_file) # # # Character device nodes (chr_file) # ######################################## # # Special permission sets # # # Use (read and write) terminals # # # Sockets # Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qpidc/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 11 Mar 2009 17:24:54 -0000 1.17 +++ .cvsignore 11 Mar 2009 19:05:21 -0000 1.18 @@ -1 +1 @@ -qpidc-0.4.750497.tar.gz +qpidc-0.5.752533.tar.gz Index: qpidc.spec =================================================================== RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- qpidc.spec 11 Mar 2009 17:24:54 -0000 1.70 +++ qpidc.spec 11 Mar 2009 19:05:21 -0000 1.71 @@ -6,13 +6,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: qpidc -Version: 0.4.750497 +Version: 0.5.752533 Release: 1%{?dist} Summary: Libraries for Qpid C++ client applications Group: System Environment/Libraries License: ASL 2.0 URL: http://qpid.apache.org Source0: %{name}-%{version}.tar.gz +Source1: qpidd.pp BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel @@ -63,6 +64,9 @@ Group: System Environment/Daemons Requires: %name = %version-%release Requires: cyrus-sasl +Requires(post): selinux-policy-base +Requires(post): /usr/sbin/semodule +Requires(postun): /usr/sbin/semodule %description -n qpidd A message broker daemon that receives stores and routes messages using @@ -186,6 +190,9 @@ %define perftests "perftest topic_listener topic_publisher \ latencytest client_test txtest" +install -d selinux +install %{SOURCE1} selinux + %build CXXFLAGS="%{optflags} -DNDEBUG -O3" \ %configure --disable-static --with-cpg --without-graphviz --without-help2man @@ -225,6 +232,9 @@ # remove examples, are being packages separately in the rhm-docs package #rm -fr %{buildroot}/usr/share/qpidc/examples +install -d %{buildroot}%{_datadir}/selinux/packages +install -m 644 selinux/qpidd.pp %{buildroot}%{_datadir}/selinux/packages + %clean rm -rf %{buildroot} @@ -266,6 +276,7 @@ %files -n qpidd %defattr(-,root,root,-) +%_datadir/selinux/packages/qpidd.pp %_libdir/libqpidbroker.so.0 %_libdir/libqpidbroker.so.0.1.0 %_libdir/qpid/daemon/replicating_listener.so @@ -351,6 +362,7 @@ # This adds the proper /etc/rc*.d links for the script /sbin/chkconfig --add qpidd /sbin/ldconfig +/usr/sbin/semodule -i %_datadir/selinux/packages/qpidd.pp %preun -n qpidd # Check that this is actual deinstallation, not just removing for upgrade. @@ -365,6 +377,8 @@ fi /sbin/ldconfig +/usr/sbin/semodule -r qpidd + %post rdma -p /sbin/ldconfig %postun rdma -p /sbin/ldconfig @@ -378,6 +392,9 @@ %postun -n qmf -p /sbin/ldconfig %changelog +* Wed Mar 11 2009 Nuno Santos - 0.5.752533-1 +- Rebased to svn rev 752533 + * Wed Feb 25 2009 Fedora Release Engineering - 0.4.738618-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/qpidc/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 11 Mar 2009 17:24:54 -0000 1.36 +++ sources 11 Mar 2009 19:05:21 -0000 1.37 @@ -1 +1 @@ -a642991a399af8917d06f78e6ecfa7d3 qpidc-0.4.750497.tar.gz +27bab5349c86223754a105f4d602cd89 qpidc-0.5.752533.tar.gz From kyle at fedoraproject.org Wed Mar 11 19:08:30 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Wed, 11 Mar 2009 19:08:30 +0000 (UTC) Subject: rpms/kernel/devel ingo-fix-atom-failures.patch, NONE, 1.1 kernel.spec, 1.1413, 1.1414 Message-ID: <20090311190830.2687970128@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23972 Modified Files: kernel.spec Added Files: ingo-fix-atom-failures.patch Log Message: * Wed Mar 11 2009 Kyle McMartin 2.6.29-0.234.rc7.git4 - ingo-fix-atom-failures.patch: Work around Atom errata when splitting large pages. ingo-fix-atom-failures.patch: --- NEW FILE ingo-fix-atom-failures.patch --- Subject: x86: work around Fedora-11 x86-32 kernel failures on Intel Atom CPUs From: Ingo Molnar Date: Tue, 10 Mar 2009 22:31:03 +0100 Work around Intel Atom erratum AAH41 (probabilistically) - it's triggering in the field. Reported-by: Linus Torvalds Tested-by: Kyle McMartin Signed-off-by: Ingo Molnar --- arch/x86/mm/pageattr.c | 9 +++++++++ 1 file changed, 9 insertions(+) Index: tip/arch/x86/mm/pageattr.c =================================================================== --- tip.orig/arch/x86/mm/pageattr.c +++ tip/arch/x86/mm/pageattr.c @@ -522,6 +522,15 @@ static int split_large_page(pte_t *kpte, * primary protection behavior: */ __set_pmd_pte(kpte, address, mk_pte(base, __pgprot(_KERNPG_TABLE))); + /* + * Intel Atom errata AAH41 workaround. + * + * The real fix is in a microcode update, but we + * also probabilistically try to reduce the window + * of having a large TLB mixed with 4K TLBs while + * instruction fetches are going on. + */ + __flush_tlb_all(); base = NULL; out_unlock: Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1413 retrieving revision 1.1414 diff -u -r1.1413 -r1.1414 --- kernel.spec 11 Mar 2009 16:28:50 -0000 1.1413 +++ kernel.spec 11 Mar 2009 19:07:59 -0000 1.1414 @@ -693,6 +693,8 @@ Patch9003: squashfs-fix-page-aligned-data.patch +Patch9004: ingo-fix-atom-failures.patch + %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1241,6 +1243,8 @@ ApplyPatch squashfs-fix-page-aligned-data.patch +ApplyPatch ingo-fix-atom-failures.patch + # END OF PATCH APPLICATIONS %endif @@ -1824,6 +1828,10 @@ # and build. %changelog +* Wed Mar 11 2009 Kyle McMartin 2.6.29-0.234.rc7.git4 +- ingo-fix-atom-failures.patch: + Work around Atom errata when splitting large pages. + * Wed Mar 11 2009 Kyle McMartin 2.6.29-0.233.rc7.git4 - linux-2.6-execshield.patch: Fix typo. Oops. From dcantrel at fedoraproject.org Wed Mar 11 19:13:27 2009 From: dcantrel at fedoraproject.org (David Cantrell) Date: Wed, 11 Mar 2009 19:13:27 +0000 (UTC) Subject: rpms/dhcp/devel dhclient-script,1.7,1.8 dhcp.spec,1.245,1.246 Message-ID: <20090311191327.8BA6170128@cvs1.fedora.phx.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/dhcp/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24855 Modified Files: dhclient-script dhcp.spec Log Message: * Wed Mar 11 2009 David Cantrell - 12:4.1.0-12 - Fix problems with dhclient.d script execution (#488864) Index: dhclient-script =================================================================== RCS file: /cvs/pkgs/rpms/dhcp/devel/dhclient-script,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dhclient-script 6 Mar 2009 00:57:04 -0000 1.7 +++ dhclient-script 11 Mar 2009 19:12:56 -0000 1.8 @@ -364,7 +364,9 @@ for f in /etc/dhcp/dhclient.d/*.sh ; do if [ -x ${f} ]; then subsystem="${f%.sh}" - . ${f} "${subsystem}_config" + subsystem="${subsystem##*/}" + . ${f} + "${subsystem}_config" fi done fi @@ -490,7 +492,9 @@ for f in /etc/dhcp/dhclient.d/*.sh ; do if [ -x ${f} ]; then subsystem="${f%.sh}" - . ${f} "${subsystem}_restore" + subsystem="${subsystem##*/}" + . ${f} + "${subsystem}_restore" fi done fi Index: dhcp.spec =================================================================== RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.245 retrieving revision 1.246 diff -u -r1.245 -r1.246 --- dhcp.spec 9 Mar 2009 23:01:07 -0000 1.245 +++ dhcp.spec 11 Mar 2009 19:12:56 -0000 1.246 @@ -4,7 +4,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.1.0 -Release: 11%{?dist} +Release: 12%{?dist} # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # dcantrell maintaining the package) made incorrect use of the epoch and # that's why it is at 12 now. It should have never been used, but it was. @@ -413,6 +413,9 @@ %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz %changelog +* Wed Mar 11 2009 David Cantrell - 12:4.1.0-12 +- Fix problems with dhclient.d script execution (#488864) + * Mon Mar 09 2009 David Cantrell - 12:4.1.0-11 - Use LDAP configuration patch from upstream tarball From pwouters at fedoraproject.org Wed Mar 11 19:17:42 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Wed, 11 Mar 2009 19:17:42 +0000 (UTC) Subject: rpms/unbound/devel unbound.spec,1.23,1.24 Message-ID: <20090311191742.DDCA070128@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/unbound/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25642 Modified Files: unbound.spec Log Message: * Tue Mar 10 2009 Adam Tkac - 1.2.1-4 - enable DNSSEC only if it is enabled in sysconfig/dnssec Index: unbound.spec =================================================================== RCS file: /cvs/extras/rpms/unbound/devel/unbound.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- unbound.spec 9 Mar 2009 20:36:02 -0000 1.23 +++ unbound.spec 11 Mar 2009 19:17:12 -0000 1.24 @@ -1,7 +1,7 @@ Summary: Validating, recursive, and caching DNS(SEC) resolver Name: unbound Version: 1.2.1 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Url: http://www.nlnetlabs.nl/unbound/ Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz @@ -127,12 +127,16 @@ exit 0 %post -# Enable DNSSEC per default +/sbin/chkconfig --add %{name} +# Check DNSSEC settings if this is a fresh install if [ "$1" -eq 1 ]; then + if [ -r /etc/sysconfig/dnssec ]; then + . /etc/sysconfig/dnssec [ -x /usr/sbin/dnssec-configure ] && \ - dnssec-configure -u --norestart --dnssec=on --dlv=off > /dev/null 2>&1 + dnssec-configure -u --norestart --dnssec="$DNSSEC" --dlv="$DLV" > \ + /dev/null 2>&1 + fi; fi -/sbin/chkconfig --add %{name} %post libs -p /sbin/ldconfig @@ -150,6 +154,9 @@ %postun libs -p /sbin/ldconfig %changelog +* Tue Mar 10 2009 Adam Tkac - 1.2.1-4 +- enable DNSSEC only if it is enabled in sysconfig/dnssec + * Mon Mar 09 2009 Adam Tkac - 1.2.1-3 - add DNSSEC support to initscript and enabled it per default - add requires dnssec-conf From pwouters at fedoraproject.org Wed Mar 11 19:20:46 2009 From: pwouters at fedoraproject.org (Paul Wouters) Date: Wed, 11 Mar 2009 19:20:46 +0000 (UTC) Subject: rpms/dnssec-conf/devel dnssec-conf-bind-status.patch, NONE, 1.1 dnssec-conf.spec, 1.8, 1.9 Message-ID: <20090311192046.C9E1A70128@cvs1.fedora.phx.redhat.com> Author: pwouters Update of /cvs/extras/rpms/dnssec-conf/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26321 Modified Files: dnssec-conf.spec Added Files: dnssec-conf-bind-status.patch Log Message: * Tue Mar 10 2009 Adam Tkac - 1.17-4 - fixed -b -s command - added dist tag dnssec-conf-bind-status.patch: --- NEW FILE dnssec-conf-bind-status.patch --- --- dnssec-conf-1.17/dnssec-configure 2009-03-09 21:37:48.000000000 +0100 +++ dnssec-conf-1.17/dnssec-configure 2009-03-10 12:32:40.000000000 +0100 @@ -377,7 +377,7 @@ # check will abort everything if it fails def checkConfig(conf, checkprog): if not os.path.isfile(conf): - sys.exit("ERROR: %s not found for rewrite") + sys.exit("ERROR: %s not found for rewrite"%(conf)) # *-checkconf better be in our path (status, output) = commands.getstatusoutput("%s %s"%(checkprog,conf)) if status != 0: @@ -636,10 +636,10 @@ # if dlv keyword not present in config, it means disabled dlvStatus = "disabled" - # check if valid config first, then we can assume certain things - checkUnboundConfig() - if nstype == "unbound": + # check if valid config first, then we can assume certain things + checkUnboundConfig() + try: fp = open(unboundconf) cnf = fp.readlines() @@ -673,6 +673,9 @@ print "Unbound DLV:%s"%dlvStatus elif nstype =="bind": + # check if valid config first, then we can assume certain things + checkBindConfig() + fp = open(namedconf) cnf = fp.readlines() fp.close() Index: dnssec-conf.spec =================================================================== RCS file: /cvs/extras/rpms/dnssec-conf/devel/dnssec-conf.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dnssec-conf.spec 10 Mar 2009 05:23:26 -0000 1.8 +++ dnssec-conf.spec 11 Mar 2009 19:20:16 -0000 1.9 @@ -1,7 +1,7 @@ Summary: DNSSEC and DLV configuration and priming tool Name: dnssec-conf Version: 1.17 -Release: 3 +Release: 4%{?dist} License: GPLv2+ Url: http://www.xelerance.com/software/dnssec-conf/ Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz @@ -10,6 +10,7 @@ BuildArch: noarch Buildrequires: xmlto Requires: python-dns, curl +Patch0: dnssec-conf-bind-status.patch #Requires: a caching nameserver #Requires bind 9.4.0 if bind is reconfigured..... @@ -26,6 +27,8 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .bind-status + %build make @@ -53,6 +56,10 @@ %{_mandir}/*/* %changelog +* Tue Mar 10 2009 Adam Tkac - 1.17-4 +- fixed -b -s command +- added dist tag + * Tue Mar 10 2009 Paul Wouters - 1.17-3 - Remove require for unbound. It can also be used with just bind, and we don't require it to work. From glommer at fedoraproject.org Wed Mar 11 19:21:58 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 11 Mar 2009 19:21:58 +0000 (UTC) Subject: rpms/qemu/devel qemu.spec,1.66,1.67 Message-ID: <20090311192158.ED7B770128@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26670 Modified Files: qemu.spec Log Message: wrong reference to bochs-bios Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- qemu.spec 11 Mar 2009 18:35:19 -0000 1.66 +++ qemu.spec 11 Mar 2009 19:21:28 -0000 1.67 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.8.kvm20090310git%{?dist} +Release: 0.9.kvm20090310git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -84,7 +84,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: etherboot-zroms-kvm Requires: vgabios -Requires: bochs-bios >= 2.3.8.0.5 +Requires: bochs-bios >= 2.3.8-0.5 Provides: kvm = 85 Obsoletes: kvm < 85 @@ -404,6 +404,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Wed Mar 11 2009 Glauber Costa - 2:0.10-0.9.kvm20090310git +- Fix wrong reference to bochs bios. + * Wed Mar 11 2009 Glauber Costa - 2:0.10-0.8.kvm20090310git - fix Obsolete/Provides pair - Use kvm bios from bochs-bios package. From szpak at fedoraproject.org Wed Mar 11 19:22:37 2009 From: szpak at fedoraproject.org (Marcin Zajaczkowski) Date: Wed, 11 Mar 2009 19:22:37 +0000 (UTC) Subject: rpms/lpairs/devel import.log, NONE, 1.1 lpairs-1.0.3-datadir.diff, NONE, 1.1 lpairs-1.0.4-desktop.diff, NONE, 1.1 lpairs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090311192237.6DDFD70128@cvs1.fedora.phx.redhat.com> Author: szpak Update of /cvs/pkgs/rpms/lpairs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26764/devel Modified Files: .cvsignore sources Added Files: import.log lpairs-1.0.3-datadir.diff lpairs-1.0.4-desktop.diff lpairs.spec Log Message: lpairs import into devel --- NEW FILE import.log --- lpairs-1_0_4-6_fc8:HEAD:lpairs-1.0.4-6.fc8.src.rpm:1236799210 lpairs-1.0.3-datadir.diff: --- NEW FILE lpairs-1.0.3-datadir.diff --- --- configure.old 2008-08-26 20:05:41.000000000 +0200 +++ configure 2008-08-26 20:06:08.000000000 +0200 @@ -13034,7 +13034,7 @@ localedir=$datadir/locale locdir_flag="-DLOCALEDIR=\\\"$localedir\\\"" -inst_dir=$datadir/games/lpairs +inst_dir=$datadir/lpairs inst_flag="-DSRC_DIR=\\\"$inst_dir/\\\"" # Check whether --enable-install was given. lpairs-1.0.4-desktop.diff: --- NEW FILE lpairs-1.0.4-desktop.diff --- --- lpairs.desktop.org 2009-03-07 18:54:24.000000000 +0100 +++ lpairs.desktop 2009-03-07 18:55:17.000000000 +0100 @@ -4,6 +4,6 @@ GenericName=Memory Game Comment=Classic memory game using SDL Exec=lpairs -Icon=lpairs.png +Icon=lpairs Type=Application -Categories=Application;Game;LogicGame; \ No newline at end of file +Categories=Application;Game;LogicGame; --- NEW FILE lpairs.spec --- Name: lpairs Summary: Classical memory game with cards Version: 1.0.4 Release: 6%{?dist} License: GPLv2+ and CC-BY-SA and Freely redistributable without restriction Group: Amusements/Games URL: http://lgames.sourceforge.net/index.php?project=LPairs #moved to .rpmmacros #Packager: Marcin Zajaczkowski Source0: http://downloads.sourceforge.net/lgames/lpairs-%{version}.tar.gz #there is a problem with data dir #the Author said it would be hard for him to fix it at autoconf level Patch0: lpairs-1.0.3-datadir.diff Patch1: lpairs-1.0.4-desktop.diff Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #SDL is required by soname dependency #Requires: SDL >= 1.0 BuildRequires: desktop-file-utils BuildRequires: SDL-devel BuildRequires: gettext #bison? %description LPairs is a classical memory game. This means you have to find pairs of identical cards which will then be removed. Your time and tries needed will be counted but there is no highscore chart or limit to this. %prep %setup -q %patch0 -p0 %patch1 -p0 %build %configure inst_dir="%{_datadir}/%{name}" make %{?_smp_mflags} %install rm -fr %{buildroot} make DESTDIR=%{buildroot} inst_dir="%{_datadir}/%{name}" install %find_lang %{name} mkdir -p %{buildroot}%{_datadir}/pixmaps cp lpairs.png %{buildroot}%{_datadir}/pixmaps/ desktop-file-install --dir %{buildroot}%{_datadir}/applications \ lpairs.desktop %clean rm -fr %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/lpairs %{_datadir}/%{name} #there is no high scores for now #%config(noreplace) %attr(664, games, games) %{_var}/lib/games/lpairs.hscr %doc AUTHORS ChangeLog COPYING README #TODO is in German also not in UTF-8 #doc TODO %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog * Sat Mar 7 2009 Marcin Zajaczkowski - 1.0.4-6 - removed macros from changelog - removed spaces introduces during last changes (instead of tabs) * Sat Mar 7 2009 Marcin Zajaczkowski - 1.0.4-5 - changed licence tag to cover sounds (suggested by Alexey Torkhov) - removed redundant attr() - fixed desktop-file-utils dependency * Wed Mar 4 2009 Marcin Zajaczkowski - 1.0.4-4 - added CC-BY-SA to the license tag (tango icons) - changed defattr to those recomended by packaging guidelines * Tue Mar 3 2009 Marcin Zajaczkowski - 1.0.4-3 - applied suggestion from Alexey Torkhov and Michael Schwendt (all below) - removed %%makeinstall - added desktop-file-utils to BuildRequires - removed "--vendor fedora" - removed update-desktop-database form %%pre and %%post - removed SDL from Requires * Mon Jan 5 2009 Marcin Zajaczkowski - 1.0.4-2 - cleaned up SPEC file before submition to Fedora repository * Sun Sep 14 2008 Marcin Zajaczkowski - 1.0.4-1 - updated to 1.0.4 - added icon file * Sat Aug 23 2008 Marcin Zajaczkowski - 1.0.3-1 - initial release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lpairs/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2009 15:55:02 -0000 1.1 +++ .cvsignore 11 Mar 2009 19:22:07 -0000 1.2 @@ -0,0 +1 @@ +lpairs-1.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lpairs/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 15:55:02 -0000 1.1 +++ sources 11 Mar 2009 19:22:07 -0000 1.2 @@ -0,0 +1 @@ +5eb00da9f7fc15dc5ce840c312e76cfa lpairs-1.0.4.tar.gz From sandeen at fedoraproject.org Wed Mar 11 19:31:24 2009 From: sandeen at fedoraproject.org (Eric Sandeen) Date: Wed, 11 Mar 2009 19:31:24 +0000 (UTC) Subject: rpms/kernel/devel linux-2.6-ext4-extent-header-check-fix.patch, NONE, 1.1 kernel.spec, 1.1414, 1.1415 Message-ID: <20090311193124.D28C270128@cvs1.fedora.phx.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28333 Modified Files: kernel.spec Added Files: linux-2.6-ext4-extent-header-check-fix.patch Log Message: * Wed Mar 11 2009 Eric Sandeen 2.6.29-0.235.rc7.git4 - Fix incorrect header check values in ext4_ext_search_right() Should address kernel.org bugzilla #12821 linux-2.6-ext4-extent-header-check-fix.patch: --- NEW FILE linux-2.6-ext4-extent-header-check-fix.patch --- This should resolve kernel.org bugzilla 12821 I've not actually crafted a workload to exercise this code; this is from inspection... The ext4_ext_search_right() function is confusing; it uses a "depth" variable which is 0 at the root and maximum at the leaves, but the on-disk metadata uses a "depth" (actually eh_depth) which is opposite: maximum at the root, and 0 at the leaves. The ext4_ext_check_header() function is given a depth and checks the header agaisnt that depth; it expects the on-disk semantics, but we are giving it the opposite in the while loop in this function. We should be giving it the on-disk notion of "depth" which we can get from (p_depth - depth) - and if you look, the last (more commonly hit) call to ext4_ext_check_header() does just this. Sending in the wrong depth results in (incorrect) messages about corruption: EXT4-fs error (device sdb1): ext4_ext_search_right: bad header in inode #2621457: unexpected eh_depth - magic f30a, entries 340, max 340(0), depth 1(2) Reported-by: David Dindorp Signed-off-by: Eric Sandeen -- Index: linux-2.6/fs/ext4/extents.c =================================================================== --- linux-2.6.orig/fs/ext4/extents.c +++ linux-2.6/fs/ext4/extents.c @@ -1122,7 +1122,8 @@ ext4_ext_search_right(struct inode *inod struct ext4_extent_idx *ix; struct ext4_extent *ex; ext4_fsblk_t block; - int depth, ee_len; + int depth; /* Note, NOT eh_depth; depth from top of tree */ + int ee_len; BUG_ON(path == NULL); depth = path->p_depth; @@ -1179,7 +1180,8 @@ got_index: if (bh == NULL) return -EIO; eh = ext_block_hdr(bh); - if (ext4_ext_check_header(inode, eh, depth)) { + /* subtract from p_depth to get proper eh_depth */ + if (ext4_ext_check_header(inode, eh, path->p_depth - depth)) { put_bh(bh); return -EIO; } -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1414 retrieving revision 1.1415 diff -u -r1.1414 -r1.1415 --- kernel.spec 11 Mar 2009 19:07:59 -0000 1.1414 +++ kernel.spec 11 Mar 2009 19:30:54 -0000 1.1415 @@ -686,6 +686,7 @@ Patch2900: linux-2.6-v4l-dvb-update.patch # ext4 fixes +Patch2910: linux-2.6-ext4-extent-header-check-fix.patch Patch9001: revert-fix-modules_install-via-nfs.patch @@ -1109,6 +1110,7 @@ # # ext4 +ApplyPatch linux-2.6-ext4-extent-header-check-fix.patch # xfs @@ -1828,6 +1830,10 @@ # and build. %changelog +* Wed Mar 11 2009 Eric Sandeen 2.6.29-0.235.rc7.git4 +- Fix incorrect header check values in ext4_ext_search_right() + Should address kernel.org bugzilla #12821 + * Wed Mar 11 2009 Kyle McMartin 2.6.29-0.234.rc7.git4 - ingo-fix-atom-failures.patch: Work around Atom errata when splitting large pages. From kyle at fedoraproject.org Wed Mar 11 19:34:29 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Wed, 11 Mar 2009 19:34:29 +0000 (UTC) Subject: rpms/kernel/devel squashfs-fix-page-aligned-data.patch,1.1,1.2 Message-ID: <20090311193429.18C6570128@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28858 Modified Files: squashfs-fix-page-aligned-data.patch Log Message: proper squashfs fs squashfs-fix-page-aligned-data.patch: Index: squashfs-fix-page-aligned-data.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/squashfs-fix-page-aligned-data.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- squashfs-fix-page-aligned-data.patch 11 Mar 2009 03:25:00 -0000 1.1 +++ squashfs-fix-page-aligned-data.patch 11 Mar 2009 19:33:58 -0000 1.2 @@ -1,13 +1,70 @@ +commit 7dacdd0d86a70564cd56e49cd9432d68e0a58916 +Author: Phillip Lougher +Date: Wed Mar 11 17:55:28 2009 +0000 + +Squashfs: Valid filesystems are flagged as bad by the corrupted fs patch + +The problem arises due to an unexpected corner-case with zlib which the +corrupted filesystems patch didn't address. Very occasionally zlib +exits needing a couple of extra bytes of input (up to 6 seen bytes in the +test filesystems), but with avail_out == 0 and no more output buffer +space available. This situation was incorrectly flagged as an output buffer +overrun by the corrupted filesystems patch. + +Signed-off-by: Phillip Lougher +Reported-by: Stefan Lippers-Hollmann +Tested-by: Geert Uytterhoeven +--- + fs/squashfs/block.c | 29 ++++++++++++++++------------- + 1 files changed, 16 insertions(+), 13 deletions(-) + diff --git a/fs/squashfs/block.c b/fs/squashfs/block.c -index 321728f..2b7598e 100644 +index 321728f..b85173f 100644 --- a/fs/squashfs/block.c +++ b/fs/squashfs/block.c -@@ -185,7 +185,7 @@ int squashfs_read_data(struct super_block *sb, void **buffer, u64 index, +@@ -166,6 +166,22 @@ int squashfs_read_data(struct super_block *sb, void **buffer, u64 index, + + bytes = length; + do { ++ if (msblk->stream.avail_out == 0) { ++ if (page < pages) { ++ msblk->stream.next_out = buffer[page++]; ++ msblk->stream.avail_out = ++ PAGE_CACHE_SIZE; ++ } else if (msblk->stream.avail_in > 0 ++ || bytes == 0) { ++ ERROR("zlib_inflate tried to " ++ "decompress too much data, " ++ "expected %d bytes. Zlib " ++ "data probably corrupt\n", ++ srclength); ++ goto release_mutex; ++ } ++ } ++ + if (msblk->stream.avail_in == 0 && k < b) { + avail = min(bytes, msblk->devblksize - offset); + bytes -= avail; +@@ -184,19 +200,6 @@ int squashfs_read_data(struct super_block *sb, void **buffer, u64 index, + offset = 0; } - if (msblk->stream.avail_out == 0) { +- if (msblk->stream.avail_out == 0) { - if (page == pages) { -+ if (page > pages) { - ERROR("zlib_inflate tried to " - "decompress too much data, " - "expected %d bytes. Zlib " +- ERROR("zlib_inflate tried to " +- "decompress too much data, " +- "expected %d bytes. Zlib " +- "data probably corrupt\n", +- srclength); +- goto release_mutex; +- } +- msblk->stream.next_out = buffer[page++]; +- msblk->stream.avail_out = PAGE_CACHE_SIZE; +- } +- + if (!zlib_init) { + zlib_err = zlib_inflateInit(&msblk->stream); + if (zlib_err != Z_OK) { +-- +1.5.6.3 + From dwalsh at fedoraproject.org Wed Mar 11 19:38:21 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Wed, 11 Mar 2009 19:38:21 +0000 (UTC) Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.47, 1.48 libsemanage.spec, 1.174, 1.175 Message-ID: <20090311193821.214D870128@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libsemanage/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30335 Modified Files: libsemanage-rhat.patch libsemanage.spec Log Message: * Wed Mar 11 2009 Dan Walsh - 2.0.31-4 - Fix typo libsemanage-rhat.patch: Index: libsemanage-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- libsemanage-rhat.patch 15 Jan 2009 20:56:44 -0000 1.47 +++ libsemanage-rhat.patch 11 Mar 2009 19:38:20 -0000 1.48 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.31/src/genhomedircon.c --- nsalibsemanage/src/genhomedircon.c 2008-08-28 09:34:24.000000000 -0400 -+++ libsemanage-2.0.31/src/genhomedircon.c 2009-01-15 15:53:31.000000000 -0500 ++++ libsemanage-2.0.31/src/genhomedircon.c 2009-03-11 15:36:08.000000000 -0400 @@ -794,6 +794,12 @@ * /root */ continue; @@ -14,9 +14,21 @@ if (push_user_entry(&head, name, seuname, prefix, pwent->pw_dir) != STATUS_SUCCESS) { *errors = STATUS_ERR; +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.c libsemanage-2.0.31/src/handle.c +--- nsalibsemanage/src/handle.c 2008-11-14 17:10:15.000000000 -0500 ++++ libsemanage-2.0.31/src/handle.c 2009-03-11 15:36:26.000000000 -0400 +@@ -264,7 +264,7 @@ + assert(sh != NULL && sh->funcs != NULL && sh->funcs->commit != NULL); + if (!sh->is_in_transaction) { + ERR(sh, +- "Will not commit because caller does not have a tranaction lock yet."); ++ "Will not commit because caller does not have a transaction lock yet."); + return -1; + } + retval = sh->funcs->commit(sh); diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.31/src/semanage.conf --- nsalibsemanage/src/semanage.conf 2008-08-28 09:34:24.000000000 -0400 -+++ libsemanage-2.0.31/src/semanage.conf 2009-01-15 15:53:31.000000000 -0500 ++++ libsemanage-2.0.31/src/semanage.conf 2009-03-11 15:36:08.000000000 -0400 @@ -35,4 +35,4 @@ # given in . Change this setting if a different # version is necessary. @@ -25,7 +37,7 @@ +expand-check=0 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.31/src/semanage_store.c --- nsalibsemanage/src/semanage_store.c 2009-01-13 08:45:35.000000000 -0500 -+++ libsemanage-2.0.31/src/semanage_store.c 2009-01-15 15:53:46.000000000 -0500 ++++ libsemanage-2.0.31/src/semanage_store.c 2009-03-11 15:36:08.000000000 -0400 @@ -440,8 +440,6 @@ char tmp[PATH_MAX]; char buf[4192]; Index: libsemanage.spec =================================================================== RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- libsemanage.spec 25 Feb 2009 18:01:54 -0000 1.174 +++ libsemanage.spec 11 Mar 2009 19:38:20 -0000 1.175 @@ -3,11 +3,12 @@ Summary: SELinux binary policy manipulation library Name: libsemanage Version: 2.0.31 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz Patch: libsemanage-rhat.patch +URL: http://www.selinuxproject.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel >= %{libselinuxver} swig ustr-devel @@ -90,6 +91,9 @@ %{_libdir}/python*/site-packages/* %changelog +* Wed Mar 11 2009 Dan Walsh - 2.0.31-4 +- Fix typo + * Wed Feb 25 2009 Fedora Release Engineering - 2.0.31-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From szpak at fedoraproject.org Wed Mar 11 20:03:37 2009 From: szpak at fedoraproject.org (Marcin Zajaczkowski) Date: Wed, 11 Mar 2009 20:03:37 +0000 (UTC) Subject: rpms/lpairs/F-10 lpairs-1.0.3-datadir.diff, NONE, 1.1 lpairs-1.0.4-desktop.diff, NONE, 1.1 lpairs.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20090311200337.CAC3B70128@cvs1.fedora.phx.redhat.com> Author: szpak Update of /cvs/pkgs/rpms/lpairs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1983 Modified Files: sources Added Files: lpairs-1.0.3-datadir.diff lpairs-1.0.4-desktop.diff lpairs.spec Log Message: lpairs import into F-10 branch lpairs-1.0.3-datadir.diff: --- NEW FILE lpairs-1.0.3-datadir.diff --- --- configure.old 2008-08-26 20:05:41.000000000 +0200 +++ configure 2008-08-26 20:06:08.000000000 +0200 @@ -13034,7 +13034,7 @@ localedir=$datadir/locale locdir_flag="-DLOCALEDIR=\\\"$localedir\\\"" -inst_dir=$datadir/games/lpairs +inst_dir=$datadir/lpairs inst_flag="-DSRC_DIR=\\\"$inst_dir/\\\"" # Check whether --enable-install was given. lpairs-1.0.4-desktop.diff: --- NEW FILE lpairs-1.0.4-desktop.diff --- --- lpairs.desktop.org 2009-03-07 18:54:24.000000000 +0100 +++ lpairs.desktop 2009-03-07 18:55:17.000000000 +0100 @@ -4,6 +4,6 @@ GenericName=Memory Game Comment=Classic memory game using SDL Exec=lpairs -Icon=lpairs.png +Icon=lpairs Type=Application -Categories=Application;Game;LogicGame; \ No newline at end of file +Categories=Application;Game;LogicGame; --- NEW FILE lpairs.spec --- Name: lpairs Summary: Classical memory game with cards Version: 1.0.4 Release: 6%{?dist} License: GPLv2+ and CC-BY-SA and Freely redistributable without restriction Group: Amusements/Games URL: http://lgames.sourceforge.net/index.php?project=LPairs #moved to .rpmmacros #Packager: Marcin Zajaczkowski Source0: http://downloads.sourceforge.net/lgames/lpairs-%{version}.tar.gz #there is a problem with data dir #the Author said it would be hard for him to fix it at autoconf level Patch0: lpairs-1.0.3-datadir.diff Patch1: lpairs-1.0.4-desktop.diff Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #SDL is required by soname dependency #Requires: SDL >= 1.0 BuildRequires: desktop-file-utils BuildRequires: SDL-devel BuildRequires: gettext #bison? %description LPairs is a classical memory game. This means you have to find pairs of identical cards which will then be removed. Your time and tries needed will be counted but there is no highscore chart or limit to this. %prep %setup -q %patch0 -p0 %patch1 -p0 %build %configure inst_dir="%{_datadir}/%{name}" make %{?_smp_mflags} %install rm -fr %{buildroot} make DESTDIR=%{buildroot} inst_dir="%{_datadir}/%{name}" install %find_lang %{name} mkdir -p %{buildroot}%{_datadir}/pixmaps cp lpairs.png %{buildroot}%{_datadir}/pixmaps/ desktop-file-install --dir %{buildroot}%{_datadir}/applications \ lpairs.desktop %clean rm -fr %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/lpairs %{_datadir}/%{name} #there is no high scores for now #%config(noreplace) %attr(664, games, games) %{_var}/lib/games/lpairs.hscr %doc AUTHORS ChangeLog COPYING README #TODO is in German also not in UTF-8 #doc TODO %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog * Sat Mar 7 2009 Marcin Zajaczkowski - 1.0.4-6 - removed macros from changelog - removed spaces introduces during last changes (instead of tabs) * Sat Mar 7 2009 Marcin Zajaczkowski - 1.0.4-5 - changed licence tag to cover sounds (suggested by Alexey Torkhov) - removed redundant attr() - fixed desktop-file-utils dependency * Wed Mar 4 2009 Marcin Zajaczkowski - 1.0.4-4 - added CC-BY-SA to the license tag (tango icons) - changed defattr to those recomended by packaging guidelines * Tue Mar 3 2009 Marcin Zajaczkowski - 1.0.4-3 - applied suggestion from Alexey Torkhov and Michael Schwendt (all below) - removed %%makeinstall - added desktop-file-utils to BuildRequires - removed "--vendor fedora" - removed update-desktop-database form %%pre and %%post - removed SDL from Requires * Mon Jan 5 2009 Marcin Zajaczkowski - 1.0.4-2 - cleaned up SPEC file before submition to Fedora repository * Sun Sep 14 2008 Marcin Zajaczkowski - 1.0.4-1 - updated to 1.0.4 - added icon file * Sat Aug 23 2008 Marcin Zajaczkowski - 1.0.3-1 - initial release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lpairs/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 15:55:02 -0000 1.1 +++ sources 11 Mar 2009 20:03:07 -0000 1.2 @@ -0,0 +1 @@ +5eb00da9f7fc15dc5ce840c312e76cfa lpairs-1.0.4.tar.gz From dwalsh at fedoraproject.org Wed Mar 11 20:05:17 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Wed, 11 Mar 2009 20:05:17 +0000 (UTC) Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.59, 1.60 selinux-policy.spec, 1.803, 1.804 Message-ID: <20090311200517.524E170128@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2530 Modified Files: policy-20090105.patch selinux-policy.spec Log Message: * Tue Mar 10 2009 Dan Walsh 3.6.8-4 - Fixes for iscsid and sssd - More cleanups for upgrade from F10 to Rawhide. policy-20090105.patch: Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- policy-20090105.patch 10 Mar 2009 20:11:23 -0000 1.59 +++ policy-20090105.patch 11 Mar 2009 20:05:16 -0000 1.60 @@ -1598,7 +1598,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.if serefpolicy-3.6.8/policy/modules/admin/usermanage.if --- nsaserefpolicy/policy/modules/admin/usermanage.if 2008-11-11 16:13:49.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/admin/usermanage.if 2009-03-10 08:25:54.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/admin/usermanage.if 2009-03-11 15:22:10.000000000 -0400 @@ -117,6 +117,24 @@ ######################################## @@ -2229,7 +2229,7 @@ +/usr/lib/opera(/.*)?/opera -- gen_context(system_u:object_r:java_exec_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.6.8/policy/modules/apps/java.if --- nsaserefpolicy/policy/modules/apps/java.if 2008-11-11 16:13:42.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/apps/java.if 2009-03-10 08:25:54.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/apps/java.if 2009-03-11 15:31:03.000000000 -0400 @@ -30,6 +30,7 @@ allow java_t $2:unix_stream_socket connectto; @@ -2238,7 +2238,7 @@ ') ######################################## -@@ -68,3 +69,122 @@ +@@ -68,3 +69,124 @@ domtrans_pattern($1, java_exec_t, unconfined_java_t) corecmd_search_bin($1) ') @@ -2287,10 +2287,12 @@ +interface(`java_run_unconfined',` + gen_require(` + type unconfined_java_t; ++ type java_t; + ') + + java_domtrans_unconfined($1) + role $2 types unconfined_java_t; ++ role $2 types java_t; +') + +######################################## @@ -2363,8 +2365,17 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.6.8/policy/modules/apps/java.te --- nsaserefpolicy/policy/modules/apps/java.te 2009-01-19 11:03:28.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/apps/java.te 2009-03-10 08:25:54.000000000 -0400 -@@ -40,7 +40,7 @@ ++++ serefpolicy-3.6.8/policy/modules/apps/java.te 2009-03-11 15:26:01.000000000 -0400 +@@ -20,6 +20,8 @@ + typealias java_t alias { staff_javaplugin_t user_javaplugin_t sysadm_javaplugin_t }; + typealias java_t alias { auditadm_javaplugin_t secadm_javaplugin_t }; + ++role system_r types java_t; ++ + type java_tmp_t; + files_tmp_file(java_tmp_t) + ubac_constrained(java_tmp_t) +@@ -40,7 +42,7 @@ # Local policy # @@ -2373,7 +2384,7 @@ allow java_t self:fifo_file rw_fifo_file_perms; allow java_t self:tcp_socket create_socket_perms; allow java_t self:udp_socket create_socket_perms; -@@ -80,6 +80,7 @@ +@@ -80,6 +82,7 @@ dev_write_sound(java_t) dev_read_urand(java_t) dev_read_rand(java_t) @@ -2381,7 +2392,7 @@ files_read_etc_files(java_t) files_read_usr_files(java_t) -@@ -116,12 +117,13 @@ +@@ -116,12 +119,13 @@ allow java_t java_tmp_t:file execute; @@ -2396,7 +2407,7 @@ optional_policy(` nis_use_ypbind(java_t) ') -@@ -147,4 +149,11 @@ +@@ -147,4 +151,11 @@ unconfined_domain_noaudit(unconfined_java_t) unconfined_dbus_chat(unconfined_java_t) @@ -4608,7 +4619,7 @@ ## diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.6.8/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2009-03-02 16:51:45.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/kernel/corenetwork.te.in 2009-03-10 08:25:54.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/kernel/corenetwork.te.in 2009-03-11 15:16:21.000000000 -0400 @@ -65,10 +65,12 @@ type server_packet_t, packet_type, server_packet_type; @@ -4730,6 +4741,15 @@ network_port(xdmcp, udp,177,s0, tcp,177,s0) network_port(xen, tcp,8002,s0) network_port(xfs, tcp,7100,s0) +@@ -208,6 +235,8 @@ + type node_t, node_type; + sid node gen_context(system_u:object_r:node_t,s0 - mls_systemhigh) + ++typealias node_t alias { compat_ipv4_node_t lo_node_t link_local_node_t inaddr_any_node_t unspec_node_t }; ++ + # network_node examples: + #network_node(lo, s0 - mls_systemhigh, 127.0.0.1, 255.255.255.255) + #network_node(multicast, s0 - mls_systemhigh, ff00::, ff00::) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.6.8/policy/modules/kernel/domain.if --- nsaserefpolicy/policy/modules/kernel/domain.if 2009-01-05 15:39:38.000000000 -0500 +++ serefpolicy-3.6.8/policy/modules/kernel/domain.if 2009-03-10 08:25:54.000000000 -0400 @@ -7307,7 +7327,7 @@ +permissive afs_t; diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.6.8/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2008-11-11 16:13:46.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/services/apache.fc 2009-03-10 09:38:57.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/services/apache.fc 2009-03-10 16:56:25.000000000 -0400 @@ -1,12 +1,13 @@ -HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0) +HOME_DIR/((www)|(web)|(public_html)|(public_git))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0) @@ -7395,7 +7415,7 @@ + +/var/lib/rt3/data/RT-Shredder(/.*)? gen_context(system_u:object_r:httpd_var_lib_t,s0) + -+/var/www/svn/repo/db(/.*)? gen_context(system_u:object_r:httpd_sys_content_rw_t,s0) ++/var/www/svn(/.*)? gen_context(system_u:object_r:httpd_sys_content_rw_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.6.8/policy/modules/services/apache.if --- nsaserefpolicy/policy/modules/services/apache.if 2009-01-19 11:06:49.000000000 -0500 +++ serefpolicy-3.6.8/policy/modules/services/apache.if 2009-03-10 08:25:54.000000000 -0400 @@ -7933,7 +7953,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.8/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/services/apache.te 2009-03-10 08:25:54.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/services/apache.te 2009-03-11 14:44:03.000000000 -0400 @@ -19,6 +19,8 @@ # Declarations # @@ -9959,7 +9979,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.8/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/services/cron.te 2009-03-10 08:25:54.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/services/cron.te 2009-03-10 15:56:54.000000000 -0400 @@ -38,6 +38,10 @@ type cron_var_lib_t; files_type(cron_var_lib_t) @@ -9998,7 +10018,13 @@ type system_cron_spool_t, cron_spool_type; files_type(system_cron_spool_t) -@@ -103,6 +113,13 @@ +@@ -98,11 +108,18 @@ + + # Type of user crontabs once moved to cron spool. + type user_cron_spool_t, cron_spool_type; +-typealias user_cron_spool_t alias { staff_cron_spool_t sysadm_cron_spool_t }; ++typealias user_cron_spool_t alias { staff_cron_spool_t sysadm_cron_spool_t unconfined_cron_spool_t }; + typealias user_cron_spool_t alias { auditadm_cron_spool_t secadm_cron_spool_t }; files_type(user_cron_spool_t) ubac_constrained(user_cron_spool_t) @@ -15420,7 +15446,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-3.6.8/policy/modules/services/oddjob.if --- nsaserefpolicy/policy/modules/services/oddjob.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.6.8/policy/modules/services/oddjob.if 2009-03-10 08:25:54.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/services/oddjob.if 2009-03-11 15:20:43.000000000 -0400 @@ -44,6 +44,7 @@ ') @@ -16276,7 +16302,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.te serefpolicy-3.6.8/policy/modules/services/polkit.te --- nsaserefpolicy/policy/modules/services/polkit.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/services/polkit.te 2009-03-10 08:25:54.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/services/polkit.te 2009-03-11 15:59:49.000000000 -0400 @@ -0,0 +1,237 @@ +policy_module(polkit_auth, 1.0.0) + @@ -20290,7 +20316,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.6.8/policy/modules/services/setroubleshoot.te --- nsaserefpolicy/policy/modules/services/setroubleshoot.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/services/setroubleshoot.te 2009-03-10 08:25:55.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/services/setroubleshoot.te 2009-03-10 16:10:06.000000000 -0400 @@ -11,6 +11,9 @@ domain_type(setroubleshootd_t) init_daemon_domain(setroubleshootd_t, setroubleshootd_exec_t) @@ -21179,7 +21205,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.6.8/policy/modules/services/ssh.te --- nsaserefpolicy/policy/modules/services/ssh.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/services/ssh.te 2009-03-10 08:25:55.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/services/ssh.te 2009-03-11 14:25:03.000000000 -0400 @@ -41,6 +41,9 @@ files_tmp_file(sshd_tmp_t) files_poly_parent(sshd_tmp_t) @@ -21199,16 +21225,17 @@ typealias home_ssh_t alias { auditadm_home_ssh_t secadm_home_ssh_t }; files_type(home_ssh_t) userdom_user_home_content(home_ssh_t) -@@ -95,7 +98,7 @@ +@@ -95,8 +98,7 @@ allow ssh_t self:sem create_sem_perms; allow ssh_t self:msgq create_msgq_perms; allow ssh_t self:msg { send receive }; -allow ssh_t self:tcp_socket create_socket_perms; +-allow ssh_t self:netlink_route_socket r_netlink_socket_perms; +allow ssh_t self:tcp_socket create_stream_socket_perms; - allow ssh_t self:netlink_route_socket r_netlink_socket_perms; # Read the ssh key file. -@@ -115,6 +118,7 @@ + allow ssh_t sshd_key_t:file read_file_perms; +@@ -115,6 +117,7 @@ manage_dirs_pattern(ssh_t,home_ssh_t,home_ssh_t) manage_sock_files_pattern(ssh_t,home_ssh_t,home_ssh_t) userdom_user_home_dir_filetrans(ssh_t, home_ssh_t, { dir sock_file }) @@ -21216,6 +21243,14 @@ # Allow the ssh program to communicate with ssh-agent. stream_connect_pattern(ssh_t, ssh_agent_tmp_t, ssh_agent_tmp_t, ssh_agent_type) +@@ -131,6 +134,7 @@ + read_lnk_files_pattern(ssh_server,home_ssh_t,home_ssh_t) + + kernel_read_kernel_sysctls(ssh_t) ++kernel_read_system_state(ssh_t) + + corenet_all_recvfrom_unlabeled(ssh_t) + corenet_all_recvfrom_netlabel(ssh_t) @@ -139,6 +143,8 @@ corenet_tcp_sendrecv_all_ports(ssh_t) corenet_tcp_connect_ssh_port(ssh_t) @@ -21225,7 +21260,22 @@ dev_read_urand(ssh_t) -@@ -173,6 +179,7 @@ +@@ -160,19 +166,19 @@ + logging_send_syslog_msg(ssh_t) + logging_read_generic_logs(ssh_t) + ++auth_use_nsswitch(ssh_t) ++ + miscfiles_read_localization(ssh_t) + + seutil_read_config(ssh_t) + +-sysnet_read_config(ssh_t) +-sysnet_dns_name_resolve(ssh_t) +- + userdom_dontaudit_list_user_home_dirs(ssh_t) + userdom_search_user_home_dirs(ssh_t) + # Write to the user domain tty. userdom_use_user_terminals(ssh_t) # needs to read krb tgt userdom_read_user_tmp_files(ssh_t) @@ -21233,15 +21283,33 @@ tunable_policy(`allow_ssh_keysign',` domain_auto_trans(ssh_t, ssh_keysign_exec_t, ssh_keysign_t) -@@ -202,6 +209,7 @@ +@@ -202,23 +208,13 @@ # for port forwarding tunable_policy(`user_tcp_server',` corenet_tcp_bind_ssh_port(ssh_t) +-') +- +-optional_policy(` +- kerberos_use(ssh_t) +-') +- +-optional_policy(` +- nis_use_ypbind(ssh_t) +-') +- +-optional_policy(` +- nscd_socket_use(ssh_t) + corenet_tcp_bind_generic_node(ssh_t) ') optional_policy(` -@@ -310,6 +318,8 @@ + xserver_user_x_domain_template(ssh, ssh_t, ssh_tmpfs_t) + xserver_domtrans_xauth(ssh_t) ++ xserver_stream_connect(ssh_t) + ') + + ######################################## +@@ -310,6 +306,8 @@ kernel_search_key(sshd_t) kernel_link_key(sshd_t) @@ -21250,7 +21318,7 @@ term_use_all_user_ptys(sshd_t) term_setattr_all_user_ptys(sshd_t) term_relabelto_all_user_ptys(sshd_t) -@@ -318,16 +328,30 @@ +@@ -318,16 +316,30 @@ corenet_tcp_bind_xserver_port(sshd_t) corenet_sendrecv_xserver_server_packets(sshd_t) @@ -21283,7 +21351,7 @@ ') optional_policy(` -@@ -349,7 +373,11 @@ +@@ -349,7 +361,11 @@ ') optional_policy(` @@ -21296,7 +21364,7 @@ unconfined_shell_domtrans(sshd_t) ') -@@ -408,6 +436,8 @@ +@@ -408,6 +424,8 @@ init_use_fds(ssh_keygen_t) init_use_script_ptys(ssh_keygen_t) @@ -21570,8 +21638,8 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.te serefpolicy-3.6.8/policy/modules/services/sssd.te --- nsaserefpolicy/policy/modules/services/sssd.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/services/sssd.te 2009-03-10 08:25:55.000000000 -0400 -@@ -0,0 +1,55 @@ ++++ serefpolicy-3.6.8/policy/modules/services/sssd.te 2009-03-10 19:51:47.000000000 -0400 +@@ -0,0 +1,63 @@ +policy_module(sssd,1.0.0) + +######################################## @@ -21598,11 +21666,15 @@ +# +# sssd local policy +# ++allow sssd_t self:capability sys_nice; ++allow sssd_t self:process { setsched signal getsched }; ++allow sssd_t tmp_t:dir { read getattr open }; + +# Init script handling +domain_use_interactive_fds(sssd_t) + +# internal communication is often done using fifo and unix sockets. ++allow sssd_t self:process signal; +allow sssd_t self:fifo_file rw_file_perms; +allow sssd_t self:unix_stream_socket { create_stream_socket_perms connectto }; + @@ -21619,7 +21691,11 @@ + +dev_read_urand(sssd_t) + ++files_list_tmp(sssd_t) +files_read_etc_files(sssd_t) ++files_read_usr_files(sssd_t) ++ ++auth_use_nsswitch(sssd_t) + +miscfiles_read_localization(sssd_t) + @@ -22108,7 +22184,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.8/policy/modules/services/virt.te --- nsaserefpolicy/policy/modules/services/virt.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/services/virt.te 2009-03-10 08:25:55.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/services/virt.te 2009-03-11 14:44:45.000000000 -0400 @@ -8,20 +8,18 @@ ## @@ -22147,7 +22223,7 @@ type virt_log_t; logging_log_file(virt_log_t) -@@ -48,17 +50,37 @@ +@@ -48,17 +50,40 @@ type virtd_initrc_exec_t; init_script_file(virtd_initrc_exec_t) @@ -22176,18 +22252,21 @@ -allow virtd_t self:capability { dac_override kill net_admin setgid sys_nice sys_ptrace }; -allow virtd_t self:process { getsched sigkill signal execmem }; -+allow virtd_t self:capability { dac_override kill net_admin net_raw setuid setgid sys_admin sys_nice sys_ptrace }; -+allow virtd_t self:process { getsched sigkill signal execmem setexec setfscreate }; ++allow virtd_t self:capability { chown dac_override ipc_lock kill mknod net_admin net_raw setuid setgid sys_admin sys_nice sys_ptrace }; ++allow virtd_t self:process { getsched sigkill signal execmem setexec setfscreate setsched }; allow virtd_t self:fifo_file rw_file_perms; allow virtd_t self:unix_stream_socket create_stream_socket_perms; allow virtd_t self:tcp_socket create_stream_socket_perms; ++manage_files_pattern(virtd_t, virt_image_t, virt_image_t) ++manage_blk_files_pattern(virtd_t, virt_image_t, virt_image_t) +allow virtd_t virt_image_t:file { relabelfrom relabelto }; ++allow virtd_t virt_image_t:blk_file { relabelfrom relabelto }; + read_files_pattern(virtd_t, virt_etc_t, virt_etc_t) read_lnk_files_pattern(virtd_t, virt_etc_t, virt_etc_t) -@@ -67,7 +89,10 @@ +@@ -67,7 +92,10 @@ manage_lnk_files_pattern(virtd_t, virt_etc_rw_t, virt_etc_rw_t) filetrans_pattern(virtd_t, virt_etc_t, virt_etc_rw_t, dir) @@ -22199,7 +22278,15 @@ manage_dirs_pattern(virtd_t, virt_log_t, virt_log_t) manage_files_pattern(virtd_t, virt_log_t, virt_log_t) -@@ -96,7 +121,7 @@ +@@ -86,6 +114,7 @@ + kernel_read_network_state(virtd_t) + kernel_rw_net_sysctls(virtd_t) + kernel_load_module(virtd_t) ++kernel_search_debugfs(virtd_t) + + corecmd_exec_bin(virtd_t) + corecmd_exec_shell(virtd_t) +@@ -96,7 +125,7 @@ corenet_tcp_sendrecv_generic_node(virtd_t) corenet_tcp_sendrecv_all_ports(virtd_t) corenet_tcp_bind_generic_node(virtd_t) @@ -22208,7 +22295,11 @@ corenet_tcp_bind_vnc_port(virtd_t) corenet_tcp_connect_vnc_port(virtd_t) corenet_tcp_connect_soundd_port(virtd_t) -@@ -107,18 +132,31 @@ +@@ -104,21 +133,36 @@ + + dev_read_sysfs(virtd_t) + dev_read_rand(virtd_t) ++dev_getattr_all_chr_files(virtd_t) # Init script handling domain_use_interactive_fds(virtd_t) @@ -22233,6 +22324,7 @@ fs_list_auto_mountpoints(virtd_t) +fs_getattr_xattr_fs(virtd_t) ++storage_manage_fixed_disk(virtd_t) storage_raw_write_removable_device(virtd_t) storage_raw_read_removable_device(virtd_t) @@ -22241,7 +22333,7 @@ term_getattr_pty_fs(virtd_t) term_use_ptmx(virtd_t) -@@ -129,7 +167,11 @@ +@@ -129,7 +173,11 @@ logging_send_syslog_msg(virtd_t) @@ -22253,7 +22345,7 @@ tunable_policy(`virt_use_nfs',` fs_manage_nfs_dirs(virtd_t) -@@ -167,22 +209,25 @@ +@@ -167,22 +215,33 @@ dnsmasq_domtrans(virtd_t) dnsmasq_signal(virtd_t) dnsmasq_kill(virtd_t) @@ -22270,12 +22362,20 @@ -# polkit_domtrans_resolve(virtd_t) -#') +optional_policy(` -+ polkit_domtrans_auth(virtd_t) -+ polkit_domtrans_resolve(virtd_t) ++ kerberos_keytab_template(virtd, virtd_t) ++') ++ ++optional_policy(` ++ lvm_domtrans(virtd_t) +') optional_policy(` - qemu_domtrans(virtd_t) ++ polkit_domtrans_auth(virtd_t) ++ polkit_domtrans_resolve(virtd_t) ++') ++ ++optional_policy(` + qemu_spec_domtrans(virtd_t, svirt_t) qemu_read_state(virtd_t) qemu_signal(virtd_t) @@ -22284,10 +22384,14 @@ ') optional_policy(` -@@ -197,6 +242,69 @@ - xen_stream_connect_xenstore(virtd_t) +@@ -198,5 +257,72 @@ ') + optional_policy(` +- unconfined_domain(virtd_t) ++ udev_domtrans(virtd_t) ++') ++ +#optional_policy(` +# unconfined_domain(virtd_t) +#') @@ -22351,8 +22455,7 @@ + xen_rw_image_files(svirt_t) +') + - optional_policy(` -- unconfined_domain(virtd_t) ++optional_policy(` + xen_rw_image_files(svirt_t) ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.6.8/policy/modules/services/w3c.te @@ -24631,7 +24734,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.8/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/init.te 2009-03-10 08:25:55.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/system/init.te 2009-03-11 11:57:43.000000000 -0400 @@ -17,6 +17,20 @@ ## gen_tunable(init_upstart,false) @@ -24894,7 +24997,16 @@ optional_policy(` unconfined_domain(initrc_t) -@@ -768,6 +837,10 @@ +@@ -761,6 +830,8 @@ + # system-config-services causes avc messages that should be dontaudited + unconfined_dontaudit_rw_pipes(daemon) + ') ++ # sudo service restart causes this ++ unconfined_signull(daemon) + + optional_policy(` + mono_domtrans(initrc_t) +@@ -768,6 +839,10 @@ ') optional_policy(` @@ -24905,7 +25017,7 @@ vmware_read_system_config(initrc_t) vmware_append_system_config(initrc_t) ') -@@ -790,3 +863,11 @@ +@@ -790,3 +865,11 @@ optional_policy(` zebra_read_config(initrc_t) ') @@ -25092,7 +25204,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.6.8/policy/modules/system/iscsi.te --- nsaserefpolicy/policy/modules/system/iscsi.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/iscsi.te 2009-03-10 08:25:55.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/system/iscsi.te 2009-03-10 15:47:16.000000000 -0400 @@ -28,7 +28,7 @@ # iscsid local policy # @@ -25111,6 +25223,23 @@ files_lock_filetrans(iscsid_t,iscsi_lock_t,file) allow iscsid_t iscsi_tmp_t:dir manage_dir_perms; +@@ -55,6 +55,7 @@ + files_pid_filetrans(iscsid_t,iscsi_var_run_t,file) + + kernel_read_system_state(iscsid_t) ++kernel_search_debugfs(iscsid_t) + + corenet_all_recvfrom_unlabeled(iscsid_t) + corenet_all_recvfrom_netlabel(iscsid_t) +@@ -73,6 +74,6 @@ + + logging_send_syslog_msg(iscsid_t) + +-miscfiles_read_localization(iscsid_t) ++auth_use_nsswitch(iscsid_t) + +-sysnet_dns_name_resolve(iscsid_t) ++miscfiles_read_localization(iscsid_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.8/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2009-01-05 15:39:43.000000000 -0500 +++ serefpolicy-3.6.8/policy/modules/system/libraries.fc 2009-03-10 08:25:55.000000000 -0400 @@ -27703,7 +27832,7 @@ +/opt/real/(.*/)?realplay\.bin -- gen_context(system_u:object_r:execmem_exec_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.8/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/unconfined.if 2009-03-10 08:25:55.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/system/unconfined.if 2009-03-10 16:09:06.000000000 -0400 @@ -12,14 +12,13 @@ # interface(`unconfined_domain_noaudit',` @@ -27983,7 +28112,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.8/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/unconfined.te 2009-03-10 15:44:05.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/system/unconfined.te 2009-03-11 15:44:23.000000000 -0400 @@ -5,6 +5,35 @@ # # Declarations @@ -28035,7 +28164,7 @@ +allow unconfined_r system_r; +init_script_role_transition(unconfined_r) +role system_r types unconfined_t; -+typealias unconfined_t alias unconfined_dbusd_t; ++typealias unconfined_t alias { unconfined_dbusd_t unconfined_crontab_t }; type unconfined_execmem_t; -type unconfined_execmem_exec_t; @@ -28075,7 +28204,7 @@ libs_run_ldconfig(unconfined_t, unconfined_r) -@@ -42,26 +94,46 @@ +@@ -42,26 +94,53 @@ logging_run_auditctl(unconfined_t, unconfined_r) mount_run_unconfined(unconfined_t, unconfined_r) @@ -28091,6 +28220,9 @@ userdom_user_home_dir_filetrans_user_home_content(unconfined_t, { dir file lnk_file fifo_file sock_file }) ++usermanage_run_passwd(unconfined_t, unconfined_r) ++usermanage_run_chfn(unconfined_t, unconfined_r) ++ +tunable_policy(`unconfined_login',` + corecmd_shell_domtrans(unconfined_login_domain,unconfined_t) + allow unconfined_t unconfined_login_domain:fd use; @@ -28099,6 +28231,10 @@ +') + +optional_policy(` ++ loadkeys_run(unconfined_t, unconfined_r) ++') ++ ++optional_policy(` + nsplugin_role_notrans(unconfined_r, unconfined_t) + tunable_policy(`allow_unconfined_nsplugin_transition',` + nsplugin_domtrans(unconfined_execmem_t) @@ -28124,7 +28260,7 @@ ') optional_policy(` -@@ -102,12 +174,24 @@ +@@ -102,12 +181,24 @@ ') optional_policy(` @@ -28149,7 +28285,7 @@ ') optional_policy(` -@@ -119,72 +203,80 @@ +@@ -119,72 +210,84 @@ ') optional_policy(` @@ -28196,25 +28332,27 @@ optional_policy(` - portmap_run_helper(unconfined_t, unconfined_r) -+ prelink_run(unconfined_t, unconfined_r) ++ oddjob_run_mkhomedir(unconfined_t, unconfined_r) ') optional_policy(` - postfix_run_map(unconfined_t, unconfined_r) - # cjp: this should probably be removed: - postfix_domtrans_master(unconfined_t) -+ portmap_run_helper(unconfined_t, unconfined_r) ++ prelink_run(unconfined_t, unconfined_r) ') optional_policy(` - pyzor_role(unconfined_r, unconfined_t) --') -+ qemu_role_notrans(unconfined_r, unconfined_t) -+ qemu_unconfined_role(unconfined_r) ++ portmap_run_helper(unconfined_t, unconfined_r) + ') --optional_policy(` + optional_policy(` - # cjp: this should probably be removed: - rpc_domtrans_nfsd(unconfined_t) ++ qemu_role_notrans(unconfined_r, unconfined_t) ++ qemu_unconfined_role(unconfined_r) ++ + tunable_policy(`allow_unconfined_qemu_transition',` + qemu_domtrans(unconfined_t) + ',` @@ -28249,7 +28387,7 @@ ') optional_policy(` -@@ -192,7 +284,7 @@ +@@ -192,7 +295,7 @@ ') optional_policy(` @@ -28258,7 +28396,7 @@ ') optional_policy(` -@@ -204,11 +296,12 @@ +@@ -204,11 +307,12 @@ ') optional_policy(` @@ -28273,7 +28411,7 @@ ') ######################################## -@@ -218,14 +311,61 @@ +@@ -218,14 +322,61 @@ allow unconfined_execmem_t self:process { execstack execmem }; unconfined_domain_noaudit(unconfined_execmem_t) @@ -28298,7 +28436,7 @@ + +optional_policy(` + xserver_rw_shm(unconfined_execmem_t) - ') ++') + +######################################## +# @@ -28325,7 +28463,7 @@ + type mozilla_exec_t; + ') + domtrans_pattern(unconfined_t, mozilla_exec_t, unconfined_execmem_t) -+') + ') +') + +optional_policy(` @@ -30200,7 +30338,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.8/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2009-01-19 11:07:34.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/userdomain.te 2009-03-10 08:25:55.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/system/userdomain.te 2009-03-10 15:58:19.000000000 -0400 @@ -8,13 +8,6 @@ ## @@ -30394,8 +30532,8 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virtual.te serefpolicy-3.6.8/policy/modules/system/virtual.te --- nsaserefpolicy/policy/modules/system/virtual.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/virtual.te 2009-03-10 08:25:55.000000000 -0400 -@@ -0,0 +1,78 @@ ++++ serefpolicy-3.6.8/policy/modules/system/virtual.te 2009-03-11 14:43:06.000000000 -0400 +@@ -0,0 +1,80 @@ + +policy_module(virtualization, 1.1.2) + @@ -30456,6 +30594,8 @@ + +auth_use_nsswitch(virtualdomain) + ++logging_send_syslog_msg(virtualdomain) ++ +miscfiles_read_localization(virtualdomain) + +optional_policy(` Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.803 retrieving revision 1.804 diff -u -r1.803 -r1.804 --- selinux-policy.spec 9 Mar 2009 21:58:08 -0000 1.803 +++ selinux-policy.spec 11 Mar 2009 20:05:16 -0000 1.804 @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.6.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -368,9 +368,6 @@ if [ $1 -eq 1 ]; then %loadminpolicy minimum semanage -S minimum -i - << __eof -user -a -P user -R "unconfined_r system_r" -r s0-s0:c0.c1023 unconfined_u -__eof -semanage -S minimum -i - << __eof login -m -s unconfined_u -r s0-s0:c0.c1023 __default__ login -m -s unconfined_u -r s0-s0:c0.c1023 root __eof @@ -447,6 +444,10 @@ %endif %changelog +* Tue Mar 10 2009 Dan Walsh 3.6.8-4 +- Fixes for iscsid and sssd +- More cleanups for upgrade from F10 to Rawhide. + * Mon Mar 9 2009 Dan Walsh 3.6.8-3 - Add pulseaudio, sssd policy - Allow networkmanager to exec udevadm From jjames at fedoraproject.org Wed Mar 11 20:14:04 2009 From: jjames at fedoraproject.org (Jerry James) Date: Wed, 11 Mar 2009 20:14:04 +0000 (UTC) Subject: rpms/eclipse-findbugs/devel eclipse-findbugs.spec, NONE, 1.1 eclipsePlugin-1.3.7-build.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090311201404.6F5F570128@cvs1.fedora.phx.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/eclipse-findbugs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4510/devel Modified Files: .cvsignore sources Added Files: eclipse-findbugs.spec eclipsePlugin-1.3.7-build.patch import.log Log Message: New package: Eclipse plugin for findbugs. --- NEW FILE eclipse-findbugs.spec --- %global eclipse_base %{_libdir}/eclipse %global pkg_date 20081230 Name: eclipse-findbugs Version: 1.3.7 Release: 3%{?dist} Summary: Eclipse plugin for FindBugs Group: Development/Languages License: LGPLv2+ URL: http://findbugs.sourceforge.net/ Source0: http://downloads.sourceforge.net/findbugs/eclipsePlugin-%{version}.%{pkg_date}-source.zip # This patch is Fedora-specific, so it has not been submitted upstream. The # patch makes the build infrastructure use installed JARs for the build, rather # than downloading JARs. Patch0: eclipsePlugin-%{version}-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant, ant-findbugs, eclipse-pde, findbugs BuildRequires: java-devel >= 1.5, jpackage-utils Requires: ant, ant-findbugs, eclipse-rcp, findbugs Requires: java >= 1.5, jpackage-utils BuildArch: noarch %global plugins_dir %{_datadir}/eclipse/dropins/findbugs/plugins %global plugin_dir %{plugins_dir}/edu.umd.cs.findbugs.plugin.eclipse_%{version}.%{pkg_date} %description An Eclipse plugin for the FindBugs Java bug detector. %prep %setup -q -n eclipsePlugin-%{version}.%{pkg_date} %patch0 -p1 # Set up the eclipse paths sed -i -e 's|@SWT_JAR@|%{eclipse_base}/swt.jar|' build.xml # Make sure we don't use retroweaver rm -fr tools %build # If we don't specify plugin.version, it becomes the current date! ant -DeclipsePlugin.dir=%{eclipse_base}/plugins \ -DeclipseJdtPlugin.dir=%{eclipse_base}/dropins/jdt/plugins \ -DeclipseSdkPlugin.dir=%{eclipse_base}/dropins/sdk/plugins \ -Dplugin.version=%{version}.%{pkg_date} \ dist %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{plugins_dir} unzip -q -d $RPM_BUILD_ROOT%{plugins_dir} \ bin_build/edu.umd.cs.findbugs.plugin.eclipse_%{version}.%{pkg_date}.zip # Symlink to the external jars we need %define javalink ../../../../../java ln -s %{javalink}/ant.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/ant/ant-findbugs.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/commons-lang.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/dom4j.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/findbugs-bcel.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/findbugs.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/jaxen.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/jcip-annotations.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/jFormatString.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/jsr-305.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/objectweb-asm/asm-tree.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/objectweb-asm/asm.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/objectweb-asm/asm-commons.jar $RPM_BUILD_ROOT%{plugin_dir} # Remove one unnecessary file (used at build-time only) rm -f $RPM_BUILD_ROOT%{plugin_dir}/.options %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc RELEASENOTES %{plugin_dir} %changelog * Fri Mar 6 2009 Jerry James - 1.3.7-3 - Fix spec file problems discovered in review * Tue Feb 10 2009 Jerry James - 1.3.7-2 - Adapt to latest Eclipse plugin guidelines * Fri Jan 2 2009 Jerry James - 1.3.7-1 - Update to 1.3.7 * Wed Dec 10 2008 Jerry James - 1.3.6-1 - Update to 1.3.6 * Thu Sep 25 2008 Jerry James - 1.3.5-1 - Initial RPM eclipsePlugin-1.3.7-build.patch: --- NEW FILE eclipsePlugin-1.3.7-build.patch --- diff -dur eclipsePlugin-1.3.7.20081230.ORIG/build.properties eclipsePlugin-1.3.7.20081230/build.properties --- eclipsePlugin-1.3.7.20081230.ORIG/build.properties 2008-10-13 23:45:56.000000000 -0600 +++ eclipsePlugin-1.3.7.20081230/build.properties 2009-01-02 22:08:30.000000000 -0700 @@ -4,11 +4,11 @@ about.html,\ about.ini,\ about.properties,\ - annotations.jar,\ - bcel.jar,\ - jsr305.jar,\ + /usr/share/java/finbugs-annotations.jar,\ + /usr/share/java/findbugs-bcel.jar,\ + /usr/share/java/jsr-305.jar,\ findbugs-plugin.jar,\ - findbugs.jar,\ + /usr/share/java/findbugs.jar,\ icons/,\ plugin/,\ plugin.properties,\ @@ -17,15 +17,15 @@ plugin_fr.properties,\ plugin_ja.properties,\ welcome.xml,\ - findbugs-ant.jar,\ + /usr/share/java/ant-findbugs.jar,\ META-INF/,\ - asm-3.1.jar,\ - asm-commons-3.1.jar,\ - asm-tree-3.1.jar,\ - dom4j-1.6.1.jar,\ - jaxen-1.1.1.jar,\ - commons-lang-2.4.jar,\ - jFormatString.jar,\ + /usr/share/java/objectweb-asm/asm.jar,\ + /usr/share/java/objectweb-asm/asm-commons.jar,\ + /usr/share/java/objectweb-asm/asm-tree.jar,\ + /usr/share/java/dom4j.jar,\ + /usr/share/java/jaxen.jar,\ + /usr/share/java/commons-lang.jar,\ + /usr/share/java/jFormatString.jar,\ surelogic.png,\ umdFindbugs.png src.includes = .classpath,\ @@ -37,11 +37,11 @@ about.html,\ about.ini,\ about.properties,\ - annotations.jar,\ - bcel.jar,\ - jsr305.jar,\ + /usr/share/java/findbugs-annotations.jar,\ + /usr/share/java/findbugs-bcel.jar,\ + /usr/share/java/jsr-305.jar,\ findbugs-plugin.jar,\ - findbugs.jar,\ + /usr/share/java/findbugs.jar,\ icons/,\ plugin/,\ plugin.properties,\ @@ -64,13 +64,13 @@ plugin_feature.xml,\ plugin_site.xml,\ umdFindbugs.png,\ - asm-3.1.jar,\ - asm-commons-3.1.jar,\ - asm-tree-3.1.jar,\ - dom4j-1.6.1.jar,\ - jaxen-1.1.1.jar,\ - commons-lang-2.4.jar,\ - jFormatString.jar,\ + /usr/share/java/objectweb-asm/asm.jar,\ + /usr/share/java/objectweb-asm/asm-commons.jar,\ + /usr/share/java/objectweb-asm/asm-tree.jar,\ + /usr/share/java/dom4j.jar,\ + /usr/share/java/jaxen.jar,\ + /usr/share/java/commons-lang.jar,\ + /usr/share/java/jFormatString.jar,\ surelogic.png jars.compile.order = findbugs-plugin.jar source.findbugs-plugin.jar = src/,buildtools/ diff -dur eclipsePlugin-1.3.7.20081230.ORIG/build.xml eclipsePlugin-1.3.7.20081230/build.xml --- eclipsePlugin-1.3.7.20081230.ORIG/build.xml 2008-11-10 10:27:54.000000000 -0700 +++ eclipsePlugin-1.3.7.20081230/build.xml 2009-01-02 22:08:30.000000000 -0700 @@ -10,7 +10,7 @@ been built from within Eclipse, and the binaries reside in the "bin.dir" --> - + @@ -39,19 +39,26 @@ - - - - - - - - + + + + + + + + + + + + + + + - - + + @@ -75,7 +82,7 @@ - + Author: szpak Update of /cvs/pkgs/rpms/lpairs/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4949 Modified Files: sources Added Files: lpairs-1.0.3-datadir.diff lpairs-1.0.4-desktop.diff lpairs.spec Log Message: lpairs initial import into F-9 branch lpairs-1.0.3-datadir.diff: --- NEW FILE lpairs-1.0.3-datadir.diff --- --- configure.old 2008-08-26 20:05:41.000000000 +0200 +++ configure 2008-08-26 20:06:08.000000000 +0200 @@ -13034,7 +13034,7 @@ localedir=$datadir/locale locdir_flag="-DLOCALEDIR=\\\"$localedir\\\"" -inst_dir=$datadir/games/lpairs +inst_dir=$datadir/lpairs inst_flag="-DSRC_DIR=\\\"$inst_dir/\\\"" # Check whether --enable-install was given. lpairs-1.0.4-desktop.diff: --- NEW FILE lpairs-1.0.4-desktop.diff --- --- lpairs.desktop.org 2009-03-07 18:54:24.000000000 +0100 +++ lpairs.desktop 2009-03-07 18:55:17.000000000 +0100 @@ -4,6 +4,6 @@ GenericName=Memory Game Comment=Classic memory game using SDL Exec=lpairs -Icon=lpairs.png +Icon=lpairs Type=Application -Categories=Application;Game;LogicGame; \ No newline at end of file +Categories=Application;Game;LogicGame; --- NEW FILE lpairs.spec --- Name: lpairs Summary: Classical memory game with cards Version: 1.0.4 Release: 6%{?dist} License: GPLv2+ and CC-BY-SA and Freely redistributable without restriction Group: Amusements/Games URL: http://lgames.sourceforge.net/index.php?project=LPairs #moved to .rpmmacros #Packager: Marcin Zajaczkowski Source0: http://downloads.sourceforge.net/lgames/lpairs-%{version}.tar.gz #there is a problem with data dir #the Author said it would be hard for him to fix it at autoconf level Patch0: lpairs-1.0.3-datadir.diff Patch1: lpairs-1.0.4-desktop.diff Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #SDL is required by soname dependency #Requires: SDL >= 1.0 BuildRequires: desktop-file-utils BuildRequires: SDL-devel BuildRequires: gettext #bison? %description LPairs is a classical memory game. This means you have to find pairs of identical cards which will then be removed. Your time and tries needed will be counted but there is no highscore chart or limit to this. %prep %setup -q %patch0 -p0 %patch1 -p0 %build %configure inst_dir="%{_datadir}/%{name}" make %{?_smp_mflags} %install rm -fr %{buildroot} make DESTDIR=%{buildroot} inst_dir="%{_datadir}/%{name}" install %find_lang %{name} mkdir -p %{buildroot}%{_datadir}/pixmaps cp lpairs.png %{buildroot}%{_datadir}/pixmaps/ desktop-file-install --dir %{buildroot}%{_datadir}/applications \ lpairs.desktop %clean rm -fr %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/lpairs %{_datadir}/%{name} #there is no high scores for now #%config(noreplace) %attr(664, games, games) %{_var}/lib/games/lpairs.hscr %doc AUTHORS ChangeLog COPYING README #TODO is in German also not in UTF-8 #doc TODO %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog * Sat Mar 7 2009 Marcin Zajaczkowski - 1.0.4-6 - removed macros from changelog - removed spaces introduces during last changes (instead of tabs) * Sat Mar 7 2009 Marcin Zajaczkowski - 1.0.4-5 - changed licence tag to cover sounds (suggested by Alexey Torkhov) - removed redundant attr() - fixed desktop-file-utils dependency * Wed Mar 4 2009 Marcin Zajaczkowski - 1.0.4-4 - added CC-BY-SA to the license tag (tango icons) - changed defattr to those recomended by packaging guidelines * Tue Mar 3 2009 Marcin Zajaczkowski - 1.0.4-3 - applied suggestion from Alexey Torkhov and Michael Schwendt (all below) - removed %%makeinstall - added desktop-file-utils to BuildRequires - removed "--vendor fedora" - removed update-desktop-database form %%pre and %%post - removed SDL from Requires * Mon Jan 5 2009 Marcin Zajaczkowski - 1.0.4-2 - cleaned up SPEC file before submition to Fedora repository * Sun Sep 14 2008 Marcin Zajaczkowski - 1.0.4-1 - updated to 1.0.4 - added icon file * Sat Aug 23 2008 Marcin Zajaczkowski - 1.0.3-1 - initial release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lpairs/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2009 15:55:02 -0000 1.1 +++ sources 11 Mar 2009 20:14:52 -0000 1.2 @@ -0,0 +1 @@ +5eb00da9f7fc15dc5ce840c312e76cfa lpairs-1.0.4.tar.gz From steved at fedoraproject.org Wed Mar 11 20:16:41 2009 From: steved at fedoraproject.org (Steve Dickson) Date: Wed, 11 Mar 2009 20:16:41 +0000 (UTC) Subject: rpms/kernel/devel config-generic, 1.254, 1.255 kernel.spec, 1.1415, 1.1416 linux-2.6.28-lockd-svc-register.patch, 1.1, NONE linux-2.6.28-sunrpc-ipv6-rpcbind.patch, 1.2, NONE Message-ID: <20090311201641.5A94C70128@cvs1.fedora.phx.redhat.com> Author: steved Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5356 Modified Files: config-generic kernel.spec Removed Files: linux-2.6.28-lockd-svc-register.patch linux-2.6.28-sunrpc-ipv6-rpcbind.patch Log Message: - Removed both the lockd-svc-register.patch and sunrpc-ipv6-rpcbind.patch patches in favor of simply turning off CONFIG_SUNRPC_REGISTER_V4 config variable. Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.254 retrieving revision 1.255 diff -u -r1.254 -r1.255 --- config-generic 6 Mar 2009 11:53:41 -0000 1.254 +++ config-generic 11 Mar 2009 20:16:10 -0000 1.255 @@ -3098,7 +3098,7 @@ CONFIG_SUNRPC_BIND34=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_XPRT_RDMA=m -CONFIG_SUNRPC_REGISTER_V4=y +# CONFIG_SUNRPC_REGISTER_V4 is not set CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m # CONFIG_SMB_FS is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1415 retrieving revision 1.1416 diff -u -r1.1415 -r1.1416 --- kernel.spec 11 Mar 2009 19:30:54 -0000 1.1415 +++ kernel.spec 11 Mar 2009 20:16:11 -0000 1.1416 @@ -669,9 +669,6 @@ Patch2200: linux-2.6-firewire-git-update.patch Patch2201: linux-2.6-firewire-git-pending.patch -Patch2300: linux-2.6.28-sunrpc-ipv6-rpcbind.patch -Patch2301: linux-2.6.28-lockd-svc-register.patch - # Quiet boot fixes # silence the ACPI blacklist code Patch2802: linux-2.6-silence-acpi-blacklist.patch @@ -1226,9 +1223,6 @@ #ApplyPatch linux-2.6-firewire-git-pending.patch #fi -# Fix NFS -ApplyPatch linux-2.6.28-sunrpc-ipv6-rpcbind.patch - # silence the ACPI blacklist code ApplyPatch linux-2.6-silence-acpi-blacklist.patch @@ -1239,8 +1233,6 @@ # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6 ApplyPatch revert-fix-modules_install-via-nfs.patch -ApplyPatch linux-2.6.28-lockd-svc-register.patch - ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch ApplyPatch squashfs-fix-page-aligned-data.patch @@ -1830,6 +1822,11 @@ # and build. %changelog +* Wed Mar 11 2009 Steve Dickson 2.6.29-0.236.rc7.git4 +- Removed both the lockd-svc-register.patch and + sunrpc-ipv6-rpcbind.patch patches in favor of simply turning + off CONFIG_SUNRPC_REGISTER_V4 config variable. + * Wed Mar 11 2009 Eric Sandeen 2.6.29-0.235.rc7.git4 - Fix incorrect header check values in ext4_ext_search_right() Should address kernel.org bugzilla #12821 --- linux-2.6.28-lockd-svc-register.patch DELETED --- --- linux-2.6.28-sunrpc-ipv6-rpcbind.patch DELETED --- From jjames at fedoraproject.org Wed Mar 11 20:16:42 2009 From: jjames at fedoraproject.org (Jerry James) Date: Wed, 11 Mar 2009 20:16:42 +0000 (UTC) Subject: rpms/eclipse-findbugs/F-10 eclipse-findbugs.spec, NONE, 1.1 eclipsePlugin-1.3.7-build.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20090311201642.DFEDF70128@cvs1.fedora.phx.redhat.com> Author: jjames Update of /cvs/pkgs/rpms/eclipse-findbugs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5336/F-10 Modified Files: .cvsignore sources Added Files: eclipse-findbugs.spec eclipsePlugin-1.3.7-build.patch Log Message: New package: Eclipse plugin for findbugs. --- NEW FILE eclipse-findbugs.spec --- %global eclipse_base %{_libdir}/eclipse %global pkg_date 20081230 Name: eclipse-findbugs Version: 1.3.7 Release: 3%{?dist} Summary: Eclipse plugin for FindBugs Group: Development/Languages License: LGPLv2+ URL: http://findbugs.sourceforge.net/ Source0: http://downloads.sourceforge.net/findbugs/eclipsePlugin-%{version}.%{pkg_date}-source.zip # This patch is Fedora-specific, so it has not been submitted upstream. The # patch makes the build infrastructure use installed JARs for the build, rather # than downloading JARs. Patch0: eclipsePlugin-%{version}-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant, ant-findbugs, eclipse-pde, findbugs BuildRequires: java-devel >= 1.5, jpackage-utils Requires: ant, ant-findbugs, eclipse-rcp, findbugs Requires: java >= 1.5, jpackage-utils BuildArch: noarch %global plugins_dir %{_datadir}/eclipse/dropins/findbugs/plugins %global plugin_dir %{plugins_dir}/edu.umd.cs.findbugs.plugin.eclipse_%{version}.%{pkg_date} %description An Eclipse plugin for the FindBugs Java bug detector. %prep %setup -q -n eclipsePlugin-%{version}.%{pkg_date} %patch0 -p1 # Set up the eclipse paths sed -i -e 's|@SWT_JAR@|%{eclipse_base}/swt.jar|' build.xml # Make sure we don't use retroweaver rm -fr tools %build # If we don't specify plugin.version, it becomes the current date! ant -DeclipsePlugin.dir=%{eclipse_base}/plugins \ -DeclipseJdtPlugin.dir=%{eclipse_base}/dropins/jdt/plugins \ -DeclipseSdkPlugin.dir=%{eclipse_base}/dropins/sdk/plugins \ -Dplugin.version=%{version}.%{pkg_date} \ dist %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{plugins_dir} unzip -q -d $RPM_BUILD_ROOT%{plugins_dir} \ bin_build/edu.umd.cs.findbugs.plugin.eclipse_%{version}.%{pkg_date}.zip # Symlink to the external jars we need %define javalink ../../../../../java ln -s %{javalink}/ant.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/ant/ant-findbugs.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/commons-lang.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/dom4j.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/findbugs-bcel.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/findbugs.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/jaxen.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/jcip-annotations.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/jFormatString.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/jsr-305.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/objectweb-asm/asm-tree.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/objectweb-asm/asm.jar $RPM_BUILD_ROOT%{plugin_dir} ln -s %{javalink}/objectweb-asm/asm-commons.jar $RPM_BUILD_ROOT%{plugin_dir} # Remove one unnecessary file (used at build-time only) rm -f $RPM_BUILD_ROOT%{plugin_dir}/.options %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc RELEASENOTES %{plugin_dir} %changelog * Fri Mar 6 2009 Jerry James - 1.3.7-3 - Fix spec file problems discovered in review * Tue Feb 10 2009 Jerry James - 1.3.7-2 - Adapt to latest Eclipse plugin guidelines * Fri Jan 2 2009 Jerry James - 1.3.7-1 - Update to 1.3.7 * Wed Dec 10 2008 Jerry James - 1.3.6-1 - Update to 1.3.6 * Thu Sep 25 2008 Jerry James - 1.3.5-1 - Initial RPM eclipsePlugin-1.3.7-build.patch: --- NEW FILE eclipsePlugin-1.3.7-build.patch --- diff -dur eclipsePlugin-1.3.7.20081230.ORIG/build.properties eclipsePlugin-1.3.7.20081230/build.properties --- eclipsePlugin-1.3.7.20081230.ORIG/build.properties 2008-10-13 23:45:56.000000000 -0600 +++ eclipsePlugin-1.3.7.20081230/build.properties 2009-01-02 22:08:30.000000000 -0700 @@ -4,11 +4,11 @@ about.html,\ about.ini,\ about.properties,\ - annotations.jar,\ - bcel.jar,\ - jsr305.jar,\ + /usr/share/java/finbugs-annotations.jar,\ + /usr/share/java/findbugs-bcel.jar,\ + /usr/share/java/jsr-305.jar,\ findbugs-plugin.jar,\ - findbugs.jar,\ + /usr/share/java/findbugs.jar,\ icons/,\ plugin/,\ plugin.properties,\ @@ -17,15 +17,15 @@ plugin_fr.properties,\ plugin_ja.properties,\ welcome.xml,\ - findbugs-ant.jar,\ + /usr/share/java/ant-findbugs.jar,\ META-INF/,\ - asm-3.1.jar,\ - asm-commons-3.1.jar,\ - asm-tree-3.1.jar,\ - dom4j-1.6.1.jar,\ - jaxen-1.1.1.jar,\ - commons-lang-2.4.jar,\ - jFormatString.jar,\ + /usr/share/java/objectweb-asm/asm.jar,\ + /usr/share/java/objectweb-asm/asm-commons.jar,\ + /usr/share/java/objectweb-asm/asm-tree.jar,\ + /usr/share/java/dom4j.jar,\ + /usr/share/java/jaxen.jar,\ + /usr/share/java/commons-lang.jar,\ + /usr/share/java/jFormatString.jar,\ surelogic.png,\ umdFindbugs.png src.includes = .classpath,\ @@ -37,11 +37,11 @@ about.html,\ about.ini,\ about.properties,\ - annotations.jar,\ - bcel.jar,\ - jsr305.jar,\ + /usr/share/java/findbugs-annotations.jar,\ + /usr/share/java/findbugs-bcel.jar,\ + /usr/share/java/jsr-305.jar,\ findbugs-plugin.jar,\ - findbugs.jar,\ + /usr/share/java/findbugs.jar,\ icons/,\ plugin/,\ plugin.properties,\ @@ -64,13 +64,13 @@ plugin_feature.xml,\ plugin_site.xml,\ umdFindbugs.png,\ - asm-3.1.jar,\ - asm-commons-3.1.jar,\ - asm-tree-3.1.jar,\ - dom4j-1.6.1.jar,\ - jaxen-1.1.1.jar,\ - commons-lang-2.4.jar,\ - jFormatString.jar,\ + /usr/share/java/objectweb-asm/asm.jar,\ + /usr/share/java/objectweb-asm/asm-commons.jar,\ + /usr/share/java/objectweb-asm/asm-tree.jar,\ + /usr/share/java/dom4j.jar,\ + /usr/share/java/jaxen.jar,\ + /usr/share/java/commons-lang.jar,\ + /usr/share/java/jFormatString.jar,\ surelogic.png jars.compile.order = findbugs-plugin.jar source.findbugs-plugin.jar = src/,buildtools/ diff -dur eclipsePlugin-1.3.7.20081230.ORIG/build.xml eclipsePlugin-1.3.7.20081230/build.xml --- eclipsePlugin-1.3.7.20081230.ORIG/build.xml 2008-11-10 10:27:54.000000000 -0700 +++ eclipsePlugin-1.3.7.20081230/build.xml 2009-01-02 22:08:30.000000000 -0700 @@ -10,7 +10,7 @@ been built from within Eclipse, and the binaries reside in the "bin.dir" --> - + @@ -39,19 +39,26 @@ - - - - - - - - + + + + + + + + + + + + + + + - - + + @@ -75,7 +82,7 @@ - + Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6710 Modified Files: policy-20090105.patch Log Message: * Tue Mar 10 2009 Dan Walsh 3.6.8-4 - Fixes for iscsid and sssd - More cleanups for upgrade from F10 to Rawhide. policy-20090105.patch: Index: policy-20090105.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- policy-20090105.patch 11 Mar 2009 20:05:16 -0000 1.60 +++ policy-20090105.patch 11 Mar 2009 20:25:16 -0000 1.61 @@ -9979,7 +9979,7 @@ + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.8/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2009-01-19 11:06:49.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/services/cron.te 2009-03-10 15:56:54.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/services/cron.te 2009-03-11 16:24:13.000000000 -0400 @@ -38,6 +38,10 @@ type cron_var_lib_t; files_type(cron_var_lib_t) @@ -10005,12 +10005,7 @@ type crond_var_run_t; files_pid_file(crond_var_run_t) -@@ -70,10 +79,11 @@ - typealias admin_crontab_tmp_t alias sysadm_crontab_tmp_t; - - cron_common_crontab_template(crontab) --typealias crontab_t alias { user_crontab_t staff_crontab_t }; -+typealias crontab_t alias { user_crontab_t staff_crontab_t unconfined_crontab_t }; +@@ -74,6 +83,7 @@ typealias crontab_t alias { auditadm_crontab_t secadm_crontab_t }; typealias crontab_tmp_t alias { user_crontab_tmp_t staff_crontab_tmp_t }; typealias crontab_tmp_t alias { auditadm_crontab_tmp_t secadm_crontab_tmp_t }; @@ -28112,7 +28107,7 @@ +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.8/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2008-11-11 16:13:48.000000000 -0500 -+++ serefpolicy-3.6.8/policy/modules/system/unconfined.te 2009-03-11 15:44:23.000000000 -0400 ++++ serefpolicy-3.6.8/policy/modules/system/unconfined.te 2009-03-11 16:24:23.000000000 -0400 @@ -5,6 +5,35 @@ # # Declarations From spot at fedoraproject.org Wed Mar 11 20:27:33 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Wed, 11 Mar 2009 20:27:33 +0000 (UTC) Subject: rpms/anaconda/F-9 anaconda-11.4.0.83-sparc-evensmallertftp.patch, NONE, 1.1 anaconda.spec, 1.702, 1.703 Message-ID: <20090311202733.57D6670128@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/anaconda/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7049 Modified Files: anaconda.spec Added Files: anaconda-11.4.0.83-sparc-evensmallertftp.patch Log Message: try to make the sparc tftp initrd even smaller anaconda-11.4.0.83-sparc-evensmallertftp.patch: --- NEW FILE anaconda-11.4.0.83-sparc-evensmallertftp.patch --- diff -up anaconda-11.4.0.83/scripts/mk-images.sparc.BAD anaconda-11.4.0.83/scripts/mk-images.sparc --- anaconda-11.4.0.83/scripts/mk-images.sparc.BAD 2009-03-11 15:55:44.000000000 -0400 +++ anaconda-11.4.0.83/scripts/mk-images.sparc 2009-03-11 16:22:28.000000000 -0400 @@ -20,16 +20,55 @@ # modules that are needed. this is the generic "needed for every arch" stuff TFTPCOMMONMODS="nfs sunrpc lockd cramfs loop squashfs ipv6" TFTPUSBMODS="ohci-hcd uhci-hcd ehci-hcd hid mousedev usb-storage" +TFTPFSMODS="ext2 ext3 ext4dev lock_nolock cifs" INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS =scsi =net" -TFTPINITRDMODS="$TFTPCOMMONMODS $TFTPUSBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $CRYPTOMODS" +TFTPINITRDMODS="$TFTPCOMMONMODS $TFTPUSBMODS $IDEMODS $SCSIMODS $TFTPFSMODS $LVMMODS $CRYPTOMODS" SPARCCOMMONMODS="openpromfs sermouse" -SPARCSCSIMODS="qlogicpti esp sym53c8xx qlogicisp mptbase mptscsih mptfc mptsas qla2xxx qla2100 qla2200 qla2300 pata_cmd64x pata_ali" +SPARCSCSIMODS="qlogicpti esp sym53c8xx qlogicisp mptbase mptscsih mptfc mptsas qla2xxx pata_cmd64x pata_ali" SPARCNETMODS="cassini e1000 e1000e sunbmac sungem sunhme sunlance sunqe sunvnet tg3 tulip" SPARCMODS="$SPARCCOMMONMODS $SPARCSCSIMODS $SPARCNETMODS" TILO=$IMGPATH/usr/bin/tilo SILO=$IMGPATH/usr/sbin/silo +# This is a disgusting hack. Unfortunately, it's the only way we can get files out of the tftpinitrd without worse hacks. + +makeproductfile() { + root=$1 + + rm -f $root/.buildstamp + echo $IMAGEUUID > $root/.buildstamp + echo $PRODUCT >> $root/.buildstamp + echo $VERSION >> $root/.buildstamp + if [ -n "$BUGURL" ]; then + echo $BUGURL >> $root/.buildstamp + fi + if [ "$AMITFTP" = "1" ]; then + rm -rf $root/modules/*/kernel/drivers/isdn/i4l/isdn.ko* + rm -rf $root/modules/*/kernel/drivers/isdn/isdnloop/isdnloop.ko* + rm -rf $root/modules/*/kernel/drivers/media/common/ir-common.ko* + rm -rf $root/modules/*/kernel/drivers/media/video/bt8xx/bttv.ko* + rm -rf $root/modules/*/kernel/drivers/media/video/btcx-risc.ko* + rm -rf $root/modules/*/kernel/drivers/media/video/v4l1-compat.ko* + rm -rf $root/modules/*/kernel/drivers/media/video/videodev.ko* + rm -rf $root/modules/*/kernel/drivers/media/video/videobuf-core.ko* + rm -rf $root/modules/*/kernel/drivers/media/video/compat_ioctl32.ko* + rm -rf $root/modules/*/kernel/drivers/media/video/videobuf-dma-sg.ko* + rm -rf $root/modules/*/kernel/drivers/media/video/v4l2-common.ko* + rm -rf $root/modules/*/kernel/drivers/media/video/tveeprom.ko* + rm -rf $root/modules/*/kernel/drivers/media/common/ir-common.ko* + rm -rf $root/modules/*/kernel/drivers/media/dvb/bt8xx/bt878.ko* + rm -rf $root/modules/*/kernel/drivers/media/dvb/bt8xx/dst.ko* + rm -rf $root/modules/*/kernel/drivers/media/dvb/dvb-core/dvb-core.ko* + rm -rf $root/firmware/ql2100_fw.bin + rm -rf $root/firmware/ql2300_fw.bin + rm -rf $root/firmware/ql2322_fw.bin + rm -rf $root/firmware/ql2400_fw.bin + rm -rf $root/firmware/ql2400_fw.bin_mid + fi +} + + maketftp() { while [ x$(echo $1 | cut -c1-2) = x"--" ]; do if [ $1 = "--kernel" ]; then @@ -77,12 +116,18 @@ makeBootImages() { echo "Building boot images for kernel $kernelvers.$KERNELARCH" echo "Building initrd.img" + + export AMITFTP=0 + makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \ --initrdsize 8192 \ --loaderbin loader \ --modules "$INITRDMODS $SPARCMODS" [ $? = 0 ] || exit 1 echo "Building special tftpinitrd.img" + + export AMITFTP=1 + makeinitrd --initrdto $TOPDESTPATH/images/tftpinitrd.img \ --initrdsize 8192 \ --loaderbin loader \ Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/F-9/anaconda.spec,v retrieving revision 1.702 retrieving revision 1.703 diff -u -r1.702 -r1.703 --- anaconda.spec 9 Mar 2009 20:02:56 -0000 1.702 +++ anaconda.spec 11 Mar 2009 20:27:02 -0000 1.703 @@ -3,7 +3,7 @@ Summary: Graphical system installer Name: anaconda Version: 11.4.0.83 -Release: 15.1 +Release: 16 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -16,6 +16,7 @@ Patch4: anaconda-11.4.0.83-raid-headers.patch Patch5: anaconda-11.4.0.83-no-sun-disk-magic-for-getMinimumSector.patch Patch6: anaconda-11.4.0.83-sparc-smalltftp.patch +Patch7: anaconda-11.4.0.83-sparc-evensmallertftp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 @@ -170,6 +171,8 @@ %patch5 -p1 # Make the tftp image smaller by restricting the modules heavily (on sparc) %patch6 -p1 +# Make the tftp image even smaller on sparc, includes one dirty hack +%patch7 -p1 %build %{__make} depend @@ -232,6 +235,10 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Mar 11 2009 Tom "spot" Callaway - 11.4.0.83-16 +- try a function overload hack to delete more files from the tftp initrd + so we can get it under the limit + * Mon Mar 9 2009 Tom "spot" Callaway - 11.4.0.83-15.1 - HACK: Don't delete the tftpinitrd.img, we need to look at it to see what else we can scoop out From ajax at fedoraproject.org Wed Mar 11 20:49:37 2009 From: ajax at fedoraproject.org (Adam Jackson) Date: Wed, 11 Mar 2009 20:49:37 +0000 (UTC) Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.423,1.424 Message-ID: <20090311204937.A676770128@cvs1.fedora.phx.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10196 Modified Files: xorg-x11-server.spec Log Message: * Wed Mar 11 2009 Adam Jackson 1.6.0-12 - Requires: pixman >= 0.14.0 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.423 retrieving revision 1.424 diff -u -r1.423 -r1.424 --- xorg-x11-server.spec 11 Mar 2009 18:20:28 -0000 1.423 +++ xorg-x11-server.spec 11 Mar 2009 20:49:07 -0000 1.424 @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.0 -Release: 11%{?dist} +Release: 12%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -157,6 +157,7 @@ %package common Summary: Xorg server common files Group: User Interface/X +Requires: pixman >= 0.14.0 %description common Common files shared among all X servers. @@ -506,6 +507,9 @@ %changelog +* Wed Mar 11 2009 Adam Jackson 1.6.0-12 +- Requires: pixman >= 0.14.0 + * Wed Mar 11 2009 Adam Jackson 1.6.0-11 - xserver-1.6.0-less-acpi-brokenness.patch: Don't build the (broken) ACPI code. From nsantos at fedoraproject.org Wed Mar 11 20:53:22 2009 From: nsantos at fedoraproject.org (Nuno Santos) Date: Wed, 11 Mar 2009 20:53:22 +0000 (UTC) Subject: rpms/qpidc/devel .cvsignore, 1.18, 1.19 qpidc.spec, 1.71, 1.72 sources, 1.37, 1.38 Message-ID: <20090311205322.4F40F70128@cvs1.fedora.phx.redhat.com> Author: nsantos Update of /cvs/extras/rpms/qpidc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10917 Modified Files: .cvsignore qpidc.spec sources Log Message: Rebased to svn rev 752600 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qpidc/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 11 Mar 2009 19:05:21 -0000 1.18 +++ .cvsignore 11 Mar 2009 20:52:51 -0000 1.19 @@ -1 +1 @@ -qpidc-0.5.752533.tar.gz +qpidc-0.5.752600.tar.gz Index: qpidc.spec =================================================================== RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- qpidc.spec 11 Mar 2009 19:05:21 -0000 1.71 +++ qpidc.spec 11 Mar 2009 20:52:51 -0000 1.72 @@ -6,7 +6,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: qpidc -Version: 0.5.752533 +Version: 0.5.752600 Release: 1%{?dist} Summary: Libraries for Qpid C++ client applications Group: System Environment/Libraries @@ -392,8 +392,8 @@ %postun -n qmf -p /sbin/ldconfig %changelog -* Wed Mar 11 2009 Nuno Santos - 0.5.752533-1 -- Rebased to svn rev 752533 +* Wed Mar 11 2009 Nuno Santos - 0.5.752600-1 +- Rebased to svn rev 752600 * Wed Feb 25 2009 Fedora Release Engineering - 0.4.738618-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/qpidc/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 11 Mar 2009 19:05:21 -0000 1.37 +++ sources 11 Mar 2009 20:52:51 -0000 1.38 @@ -1 +1 @@ -27bab5349c86223754a105f4d602cd89 qpidc-0.5.752533.tar.gz +b62cfa3edb278301719e24d1be8fb9cf qpidc-0.5.752600.tar.gz From kasal at fedoraproject.org Wed Mar 11 21:12:38 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Wed, 11 Mar 2009 21:12:38 +0000 (UTC) Subject: rpms/perl/devel perl-update-Archive-Extract.patch, NONE, 1.1 perl-update-Archive-Tar.patch, NONE, 1.1 perl-update-CGI.patch, NONE, 1.1 perl-update-ExtUtils-CBuilder.patch, NONE, 1.1 perl-update-File-Fetch.patch, NONE, 1.1 perl-update-File-Path.patch, NONE, 1.1 perl-update-File-Temp.patch, NONE, 1.1 perl-update-IPC-Cmd.patch, NONE, 1.1 perl-update-Module-Build.patch, NONE, 1.1 perl-update-Module-CoreList.patch, NONE, 1.1 perl-update-Module-Load-Conditional.patch, NONE, 1.1 perl-update-Pod-Simple.patch, NONE, 1.1 perl-update-Sys-Syslog.patch, NONE, 1.1 perl-update-Test-Harness.patch, NONE, 1.1 perl-update-Test-Simple.patch, NONE, 1.1 perl-update-Time-HiRes.patch, NONE, 1.1 perl-update-constant.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 perl-5.10.0-Change33640.patch, 1.1, 1.2 perl-5.10.0-links.patch, 1.1, 1.2 perl.spec, 1.206, 1.207 sources, 1.17, 1.18 perl-5.10.0-ArchiveTar1.38.patch, 1.1, NONE perl-5.10.0-ArchiveTar1.40.patch, 1.1, NONE perl-5.10.0-CGI-3.38.patch, 1.1, NONE perl-5.10.0-CGI.patch, 1.1, NONE perl-5.10.0-CVE-2008-2827.patch, 1.1, NONE perl-5.10.0-File-Temp-0.20.patch, 1.1, NONE perl-5.10.0-IPC_Cmd-0.42.patch, 1.1, NONE perl-5.10.0-Module-CoreList2.14.patch, 1.1, NONE perl-5.10.0-Module-Load-Conditional-0.24.patch, 1.1, NONE perl-5.10.0-PodSimple.patch, 1.2, NONE perl-5.10.0-SysSyslog-0.24.patch, 1.1, NONE perl-5.10.0-TestHarness3.12.patch, 1.1, NONE perl-5.10.0-TestSimple0.80.patch, 1.1, NONE perl-5.10.0-removeTestHarness.patch, 1.1, NONE Message-ID: <20090311211238.93B7C70128@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14334 Modified Files: .cvsignore perl-5.10.0-Change33640.patch perl-5.10.0-links.patch perl.spec sources Added Files: perl-update-Archive-Extract.patch perl-update-Archive-Tar.patch perl-update-CGI.patch perl-update-ExtUtils-CBuilder.patch perl-update-File-Fetch.patch perl-update-File-Path.patch perl-update-File-Temp.patch perl-update-IPC-Cmd.patch perl-update-Module-Build.patch perl-update-Module-CoreList.patch perl-update-Module-Load-Conditional.patch perl-update-Pod-Simple.patch perl-update-Sys-Syslog.patch perl-update-Test-Harness.patch perl-update-Test-Simple.patch perl-update-Time-HiRes.patch perl-update-constant.patch Removed Files: perl-5.10.0-ArchiveTar1.38.patch perl-5.10.0-ArchiveTar1.40.patch perl-5.10.0-CGI-3.38.patch perl-5.10.0-CGI.patch perl-5.10.0-CVE-2008-2827.patch perl-5.10.0-File-Temp-0.20.patch perl-5.10.0-IPC_Cmd-0.42.patch perl-5.10.0-Module-CoreList2.14.patch perl-5.10.0-Module-Load-Conditional-0.24.patch perl-5.10.0-PodSimple.patch perl-5.10.0-SysSyslog-0.24.patch perl-5.10.0-TestHarness3.12.patch perl-5.10.0-TestSimple0.80.patch perl-5.10.0-removeTestHarness.patch Log Message: - remove compatibility obsolete sitelib directories - use a better BuildRoot - drop a redundant mkdir in %%install - call patchlevel.h only once; rm patchlevel.bak - update modules Sys::Syslog, Module::Load::Conditional, Module::CoreList, Test::Harness, Test::Simple, CGI.pm (dropping the upstreamed patch), File::Path (that includes our perl-5.10.0-CVE-2008-2827.patch), constant, Pod::Simple, Archive::Tar, Archive::Extract, File::Fetch, File::Temp, IPC::Cmd, Time::HiRes, Module::Build, ExtUtils::CBuilder - standardize the patches for updating embedded modules - work around a bug in Module::Build tests bu setting TMPDIR to a directory inside the source tree perl-update-Archive-Extract.patch: --- NEW FILE perl-update-Archive-Extract.patch --- Archive-Extract-0.30 diff -urN perl-5.10.0.orig/lib/Archive/Extract/t/01_Archive-Extract.t perl-5.10.0/lib/Archive/Extract/t/01_Archive-Extract.t --- perl-5.10.0.orig/lib/Archive/Extract/t/01_Archive-Extract.t 2007-12-18 11:47:07.000000000 +0100 +++ perl-5.10.0/lib/Archive/Extract/t/01_Archive-Extract.t 2009-03-10 12:31:09.000000000 +0100 @@ -58,6 +58,7 @@ $Archive::Extract::VERBOSE = $Archive::Extract::VERBOSE = $Debug; $Archive::Extract::WARN = $Archive::Extract::WARN = $Debug ? 1 : 0; + my $tmpl = { ### plain files 'x.bz2' => { programs => [qw[bunzip2]], @@ -105,6 +106,11 @@ method => 'is_zip', outfile => 'a', }, + 'x.lzma' => { programs => [qw[unlzma]], + modules => [qw[Compress::unLZMA]], + method => 'is_lzma', + outfile => 'a', + }, ### with a directory 'y.tbz' => { programs => [qw[bunzip2 tar]], modules => [qw[Archive::Tar @@ -201,8 +207,53 @@ ok( $obj, " Object created based on '$type'" ); ok( !$obj->error, " No error logged" ); } + + ### test unknown type + { ### must turn on warnings to catch error here + local $Archive::Extract::WARN = 1; + + my $warnings; + local $SIG{__WARN__} = sub { $warnings .= "@_" }; + + my $ae = $Class->new( archive => $Me ); + ok( !$ae, " No archive created based on '$Me'" ); + ok( !$Class->error, " Error not captured in class method" ); + ok( $warnings, " Error captured as warning" ); + like( $warnings, qr/Cannot determine file type for/, + " Error is: unknown file type" ); + } } +### test multiple errors +### XXX whitebox test +{ ### grab a random file from the template, so we can make an object + my $ae = Archive::Extract->new( + archive => File::Spec->catfile($SrcDir,[keys %$tmpl]->[0]) + ); + ok( $ae, "Archive created" ); + ok( not($ae->error), " No errors yet" ); + + ### log a few errors + { local $Archive::Extract::WARN = 0; + $ae->_error( $_ ) for 1..5; + } + + my $err = $ae->error; + ok( $err, " Errors retrieved" ); + + my $expect = join $/, 1..5; + is( $err, $expect, " As expected" ); + + ### this resets the errors + ### override the 'check' routine to return false, so we bail out of + ### extract() early and just run the error reset code; + { no warnings qw[once redefine]; + local *Archive::Extract::check = sub { return }; + $ae->extract; + } + ok( not($ae->error), " Errors erased after ->extract() call" ); +} + ### XXX whitebox test ### test __get_extract_dir SKIP: { my $meth = '__get_extract_dir'; @@ -237,15 +288,18 @@ } } -for my $switch (0,1) { +### configuration to run in: allow perl or allow binaries +for my $switch ( [0,1], [1,0] ) { + my $cfg = "PP: $switch->[0] Bin: $switch->[1]"; - local $Archive::Extract::PREFER_BIN = $switch; - diag("Running extract with PREFER_BIN = $Archive::Extract::PREFER_BIN") - if $Debug; + local $Archive::Extract::_ALLOW_PURE_PERL = $switch->[0]; + local $Archive::Extract::_ALLOW_BIN = $switch->[1]; + + diag("Running extract with configuration: $cfg") if $Debug; for my $archive (keys %$tmpl) { - diag("Extracting $archive") if $Debug; + diag("Extracting $archive in config $cfg") if $Debug; ### check first if we can do the proper @@ -291,12 +345,14 @@ ### where to extract to -- try both dir and file for gz files ### XXX test me! #my @outs = $ae->is_gz ? ($abs_path, $OutDir) : ($OutDir); - my @outs = $ae->is_gz || $ae->is_bz2 || $ae->is_Z + my @outs = $ae->is_gz || $ae->is_bz2 || $ae->is_Z || $ae->is_lzma ? ($abs_path) : ($OutDir); skip "No binaries or modules to extract ".$archive, - (10 * scalar @outs) if $mod_fail && $pgm_fail; + (10 * scalar @outs) if + ($mod_fail && ($pgm_fail || !$Archive::Extract::_ALLOW_BIN)) || + ($pgm_fail && ($mod_fail || !$Archive::Extract::_ALLOW_PURE_PERL)); ### we dont warnings spewed about missing modules, that might ### be a problem... @@ -307,7 +363,7 @@ ### test buffers ### my $turn_off = !$use_buffer && !$pgm_fail && - $Archive::Extract::PREFER_BIN; + $Archive::Extract::_ALLOW_BIN; ### whitebox test ### ### stupid warnings ### @@ -325,20 +381,24 @@ my $rv = $ae->extract( to => $to ); - ok( $rv, "extract() for '$archive' reports success"); - - diag("Extractor was: " . $ae->_extractor) if $Debug; - SKIP: { my $re = qr/^No buffer captured/; my $err = $ae->error || ''; ### skip buffer tests if we dont have buffers or ### explicitly turned them off - skip "No buffers available", 7, + skip "No buffers available", 8 if ( $turn_off || !IPC::Cmd->can_capture_buffer) && $err =~ $re; + ### skip tests if we dont have an extractor + skip "No extractor available", 8 + if $err =~ /Extract failed; no extractors available/; + + ok( $rv, "extract() for '$archive' reports success ($cfg)"); + + diag("Extractor was: " . $ae->_extractor) if $Debug; + ### if we /should/ have buffers, there should be ### no errors complaining we dont have them... unlike( $err, $re, @@ -346,10 +406,16 @@ ### might be 1 or 2, depending wether we extracted ### a dir too + my $files = $ae->files || []; my $file_cnt = grep { defined } $file, $dir; - is( scalar @{ $ae->files || []}, $file_cnt, + is( scalar @$files, $file_cnt, "Found correct number of output files" ); - is( $ae->files->[-1], $nix_path, + + ### due to prototypes on is(), if there's no -1 index on + ### the array ref, it'll give a fatal exception: + ### "Modification of non-creatable array value attempted, + ### subscript -1 at -e line 1." So wrap it in do { } + is( do { $files->[-1] }, $nix_path, "Found correct output file '$nix_path'" ); ok( -e $abs_path, diff -urN perl-5.10.0.orig/lib/Archive/Extract/t/src/x.lzma.packed perl-5.10.0/lib/Archive/Extract/t/src/x.lzma.packed --- perl-5.10.0.orig/lib/Archive/Extract/t/src/x.lzma.packed 1970-01-01 01:00:00.000000000 +0100 +++ perl-5.10.0/lib/Archive/Extract/t/src/x.lzma.packed 2009-03-10 12:34:10.000000000 +0100 @@ -0,0 +1,16 @@ +######################################################################### +This is a binary file that was packed with the 'uupacktool.pl' which +is included in the Perl distribution. + +To unpack this file use the following command: + + uupacktool.pl -u lib/Archive/Extract/t/src/x.lzma.packed lib/Archive/Extract/t/src/x.lzma + +To recreate it use the following command: + + uupacktool.pl -p lib/Archive/Extract/t/src/x.lzma lib/Archive/Extract/t/src/x.lzma.packed + +Created at Tue Mar 10 12:34:10 2009 +######################################################################### +__UU__ +270``@``````````````````` diff -urN perl-5.10.0.orig/lib/Archive/Extract.pm perl-5.10.0/lib/Archive/Extract.pm --- perl-5.10.0.orig/lib/Archive/Extract.pm 2007-12-18 11:47:07.000000000 +0100 +++ perl-5.10.0/lib/Archive/Extract.pm 2009-03-10 12:30:20.000000000 +0100 @@ -20,6 +20,10 @@ ### VMS may require quoting upper case command options use constant ON_VMS => $^O eq 'VMS' ? 1 : 0; +### we can't use this extraction method, because of missing +### modules/binaries: +use constant METHOD_NA => []; + ### If these are changed, update @TYPES and the new() POD use constant TGZ => 'tgz'; use constant TAR => 'tar'; @@ -28,14 +32,21 @@ use constant BZ2 => 'bz2'; use constant TBZ => 'tbz'; use constant Z => 'Z'; +use constant LZMA => 'lzma'; -use vars qw[$VERSION $PREFER_BIN $PROGRAMS $WARN $DEBUG]; +use vars qw[$VERSION $PREFER_BIN $PROGRAMS $WARN $DEBUG + $_ALLOW_BIN $_ALLOW_PURE_PERL + ]; + +$VERSION = '0.30'; +$PREFER_BIN = 0; +$WARN = 1; +$DEBUG = 0; +$_ALLOW_PURE_PERL = 1; # allow pure perl extractors +$_ALLOW_BIN = 1; # allow binary extractors -$VERSION = '0.24'; -$PREFER_BIN = 0; -$WARN = 1; -$DEBUG = 0; -my @Types = ( TGZ, TAR, GZ, ZIP, BZ2, TBZ, Z ); # same as all constants +# same as all constants +my @Types = ( TGZ, TAR, GZ, ZIP, BZ2, TBZ, Z, LZMA ); local $Params::Check::VERBOSE = $Params::Check::VERBOSE = 1; @@ -75,6 +86,7 @@ $ae->is_zip; # is it a .zip file? $ae->is_bz2; # is it a .bz2 file? $ae->is_tbz; # is it a .tar.bz2 or .tbz file? + $ae->is_lzma; # is it a .lzma file? ### absolute path to the archive you provided ### $ae->archive; @@ -84,13 +96,14 @@ $ae->bin_gzip # path to /bin/gzip, if found $ae->bin_unzip # path to /bin/unzip, if found $ae->bin_bunzip2 # path to /bin/bunzip2 if found + $ae->bin_unlzma # path to /bin/unlzma if found =head1 DESCRIPTION Archive::Extract is a generic archive extraction mechanism. It allows you to extract any archive file of the type .tar, .tar.gz, -.gz, .Z, tar.bz2, .tbz, .bz2 or .zip without having to worry how it +.gz, .Z, tar.bz2, .tbz, .bz2, .zip or .lzma without having to worry how it does so, or use different interfaces for each type by using either perl modules, or commandline tools on your system. @@ -101,31 +114,35 @@ ### see what /bin/programs are available ### $PROGRAMS = {}; -for my $pgm (qw[tar unzip gzip bunzip2 uncompress]) { +for my $pgm (qw[tar unzip gzip bunzip2 uncompress unlzma]) { $PROGRAMS->{$pgm} = can_run($pgm); } ### mapping from types to extractor methods ### -my $Mapping = { - is_tgz => '_untar', - is_tar => '_untar', - is_gz => '_gunzip', - is_zip => '_unzip', - is_tbz => '_untar', - is_bz2 => '_bunzip2', - is_Z => '_uncompress', +my $Mapping = { # binary program # pure perl module + is_tgz => { bin => '_untar_bin', pp => '_untar_at' }, + is_tar => { bin => '_untar_bin', pp => '_untar_at' }, + is_gz => { bin => '_gunzip_bin', pp => '_gunzip_cz' }, + is_zip => { bin => '_unzip_bin', pp => '_unzip_az' }, + is_tbz => { bin => '_untar_bin', pp => '_untar_at' }, + is_bz2 => { bin => '_bunzip2_bin', pp => '_bunzip2_bz2'}, + is_Z => { bin => '_uncompress_bin', pp => '_gunzip_cz' }, + is_lzma => { bin => '_unlzma_bin', pp => '_unlzma_cz' }, }; -{ +{ ### use subs so we re-generate array refs etc for the no-overide flags + ### if we don't, then we reuse the same arrayref, meaning objects store + ### previous errors my $tmpl = { - archive => { required => 1, allow => FILE_EXISTS }, - type => { default => '', allow => [ @Types ] }, + archive => sub { { required => 1, allow => FILE_EXISTS } }, + type => sub { { default => '', allow => [ @Types ] } }, + _error_msg => sub { { no_override => 1, default => [] } }, + _error_msg_long => sub { { no_override => 1, default => [] } }, }; ### build accesssors ### for my $method( keys %$tmpl, qw[_extractor _gunzip_to files extract_path], - qw[_error_msg _error_msg_long] ) { no strict 'refs'; *$method = sub { @@ -183,6 +200,11 @@ Bzip2 compressed tar file, as produced by, for exmample C. Corresponds to a C<.tbz> or C<.tar.bz2> suffix. +=item lzma + +Lzma compressed file, as produced by C. +Corresponds to a C<.lzma> suffix. + =back Returns a C object on success, or false on failure. @@ -193,8 +215,12 @@ sub new { my $class = shift; my %hash = @_; + + ### see above why we use subs here and generate the template; + ### it's basically to not re-use arrayrefs + my %utmpl = map { $_ => $tmpl->{$_}->() } keys %$tmpl; - my $parsed = check( $tmpl, \%hash ) or return; + my $parsed = check( \%utmpl, \%hash ) or return; ### make sure we have an absolute path ### my $ar = $parsed->{archive} = File::Spec->rel2abs( $parsed->{archive} ); @@ -209,15 +235,18 @@ $ar =~ /.+?\.(?:tbz2?|tar\.bz2?)$/i ? TBZ : $ar =~ /.+?\.bz2$/i ? BZ2 : $ar =~ /.+?\.Z$/ ? Z : + $ar =~ /.+?\.lzma$/ ? LZMA : ''; } - ### don't know what type of file it is ### - return __PACKAGE__->_error(loc("Cannot determine file type for '%1'", - $parsed->{archive} )) unless $parsed->{type}; + bless $parsed, $class; - return bless $parsed, $class; + ### don't know what type of file it is + ### XXX this *has* to be an object call, not a package call + return $parsed->_error(loc("Cannot determine file type for '%1'", + $parsed->{archive} )) unless $parsed->{type}; + return $parsed; } } @@ -229,11 +258,11 @@ Since C<.gz> files never hold a directory, but only a single file; if the C argument is an existing directory, the file is extracted -there, with it's C<.gz> suffix stripped. +there, with its C<.gz> suffix stripped. If the C argument is not an existing directory, the C argument is understood to be a filename, if the archive type is C. In the case that you did not specify a C argument, the output -file will be the name of the archive file, stripped from it's C<.gz> +file will be the name of the archive file, stripped from its C<.gz> suffix, in the current working directory. C will try a pure perl solution first, and then fall back to @@ -269,6 +298,10 @@ my $self = shift; my %hash = @_; + ### reset error messages + $self->_error_msg( [] ); + $self->_error_msg_long( [] ); + my $to; my $tmpl = { to => { default => '.', store => \$to } @@ -283,9 +316,9 @@ ### to. my $dir; { ### a foo.gz file - if( $self->is_gz or $self->is_bz2 or $self->is_Z) { + if( $self->is_gz or $self->is_bz2 or $self->is_Z or $self->is_lzma ) { - my $cp = $self->archive; $cp =~ s/\.(?:gz|bz2?|Z)$//i; + my $cp = $self->archive; $cp =~ s/\.(?:gz|bz2?|Z|lzma)$//i; ### to is a dir? if ( -d $to ) { @@ -330,19 +363,50 @@ ### ../lib/Archive/Extract.pm line 742. (rt #19815) $self->files( [] ); - ### find what extractor method to use ### - while( my($type,$method) = each %$Mapping ) { + ### find out the dispatch methods needed for this type of + ### archive. Do a $self->is_XXX to figure out the type, then + ### get the hashref with bin + pure perl dispatchers. + my ($map) = map { $Mapping->{$_} } grep { $self->$_ } keys %$Mapping; + + ### add pure perl extractor if allowed & add bin extractor if allowed + my @methods; + push @methods, $map->{'pp'} if $_ALLOW_PURE_PERL; + push @methods, $map->{'bin'} if $_ALLOW_BIN; + + ### reverse it if we prefer bin extractors + @methods = reverse @methods if $PREFER_BIN; - ### call the corresponding method if the type is OK ### - if( $self->$type) { - $ok = $self->$method(); - } + my($na, $fail); + for my $method (@methods) { + print "# Extracting with ->$method\n" if $DEBUG; + + my $rv = $self->$method; + + ### a positive extraction + if( $rv and $rv ne METHOD_NA ) { + print "# Extraction succeeded\n" if $DEBUG; + $self->_extractor($method); + last; + + ### method is not available + } elsif ( $rv and $rv eq METHOD_NA ) { + print "# Extraction method not available\n" if $DEBUG; + $na++; + } else { + print "# Extraction method failed\n" if $DEBUG; + $fail++; + } } - ### warn something went wrong if we didn't get an OK ### - $self->_error(loc("Extract failed, no extractor found")) - unless $ok; - + ### warn something went wrong if we didn't get an extractor + unless( $self->_extractor ) { + my $diag = $fail ? loc("Extract failed due to errors") : + $na ? loc("Extract failed; no extractors available") : + ''; + + $self->_error($diag); + $ok = 0; + } } ### and chdir back ### @@ -418,6 +482,11 @@ Returns true if the file is of type C<.zip>. See the C method for details. +=head2 $ae->is_lzma + +Returns true if the file is of type C<.lzma>. +See the C method for details. + =cut ### quick check methods ### @@ -428,6 +497,7 @@ sub is_tbz { return $_[0]->type eq TBZ } sub is_bz2 { return $_[0]->type eq BZ2 } sub is_Z { return $_[0]->type eq Z } +sub is_lzma { return $_[0]->type eq LZMA } =pod @@ -443,6 +513,10 @@ Returns the full path to your unzip binary, if found +=head2 $ae->bin_unlzma + +Returns the full path to your unlzma binary, if found + =cut ### paths to commandline tools ### @@ -452,6 +526,8 @@ sub bin_bunzip2 { return $PROGRAMS->{'bunzip2'} if $PROGRAMS->{'bunzip2'} } sub bin_uncompress { return $PROGRAMS->{'uncompress'} if $PROGRAMS->{'uncompress'} } +sub bin_unlzma { return $PROGRAMS->{'unlzma'} if $PROGRAMS->{'unlzma'} } + =head2 $bool = $ae->have_old_bunzip2 Older versions of C, from before the C release, @@ -478,8 +554,16 @@ ### $ echo $? ### 1 ### HATEFUL! + + ### double hateful: bunzip2 --version also hangs if input is a pipe + ### See #32370: Archive::Extract will hang if stdin is a pipe [+PATCH] + ### So, we have to provide *another* argument which is a fake filename, + ### just so it wont try to read from stdin to print its version.. + ### *sigh* + ### Even if the file exists, it won't clobber or change it. my $buffer; - scalar run( command => [$self->bin_bunzip2, '--version'], + scalar run( + command => [$self->bin_bunzip2, '--version', 'NoSuchFile'], verbose => 0, buffer => \$buffer ); @@ -500,43 +584,31 @@ ################################# -### untar wrapper... goes to either Archive::Tar or /bin/tar -### depending on $PREFER_BIN -sub _untar { - my $self = shift; - - ### bzip2 support in A::T via IO::Uncompress::Bzip2 - my @methods = qw[_untar_at _untar_bin]; - @methods = reverse @methods if $PREFER_BIN; - - for my $method (@methods) { - $self->_extractor($method) && return 1 if $self->$method(); - } - - return $self->_error(loc("Unable to untar file '%1'", $self->archive)); -} - ### use /bin/tar to extract ### sub _untar_bin { my $self = shift; ### check for /bin/tar ### - return $self->_error(loc("No '%1' program found", '/bin/tar')) - unless $self->bin_tar; - ### check for /bin/gzip if we need it ### - return $self->_error(loc("No '%1' program found", '/bin/gzip')) - if $self->is_tgz && !$self->bin_gzip; - - return $self->_error(loc("No '%1' program found", '/bin/bunzip2')) - if $self->is_tbz && !$self->bin_bunzip2; + ### if any of the binaries are not available, return NA + { my $diag = not $self->bin_tar ? + loc("No '%1' program found", '/bin/tar') : + $self->is_tgz && !$self->bin_gzip ? + loc("No '%1' program found", '/bin/gzip') : + $self->is_tbz && !$self->bin_bunzip2 ? + loc("No '%1' program found", '/bin/bunzip2') : + ''; + + if( $diag ) { + $self->_error( $diag ); + return METHOD_NA; + } + } ### XXX figure out how to make IPC::Run do this in one call -- ### currently i don't know how to get output of a command after a pipe ### trapped in a scalar. Mailed barries about this 5th of june 2004. - - ### see what command we should run, based on whether ### it's a .tgz or .tar @@ -620,14 +692,25 @@ sub _untar_at { my $self = shift; - ### we definitely need A::T, so load that first + ### Loading Archive::Tar is going to set it to 1, so make it local + ### within this block, starting with its initial value. Whatever + ### Achive::Tar does will be undone when we return. + ### + ### Also, later, set $Archive::Tar::WARN to $Archive::Extract::WARN + ### so users don't have to even think about this variable. If they + ### do, they still get their set value outside of this call. + local $Archive::Tar::WARN = $Archive::Tar::WARN; + + ### we definitely need Archive::Tar, so load that first { my $use_list = { 'Archive::Tar' => '0.0' }; unless( can_load( modules => $use_list ) ) { - return $self->_error(loc("You do not have '%1' installed - " . - "Please install it as soon as possible.", - 'Archive::Tar')); + $self->_error(loc("You do not have '%1' installed - " . + "Please install it as soon as possible.", + 'Archive::Tar')); + + return METHOD_NA; } } @@ -644,18 +727,24 @@ unless( can_load( modules => $use_list ) ) { my $which = join '/', sort keys %$use_list; - return $self->_error(loc( - "You do not have '%1' installed - Please ". - "install it as soon as possible.", $which)); - + $self->_error(loc( + "You do not have '%1' installed - Please ". + "install it as soon as possible.", $which) + ); + + return METHOD_NA; } + } elsif ( $self->is_tbz ) { my $use_list = { 'IO::Uncompress::Bunzip2' => '0.0' }; unless( can_load( modules => $use_list ) ) { - return $self->_error(loc( - "You do not have '%1' installed - Please " . - "install it as soon as possible.", - 'IO::Uncompress::Bunzip2')); + $self->_error(loc( + "You do not have '%1' installed - Please " . + "install it as soon as possible.", + 'IO::Uncompress::Bunzip2') + ); + + return METHOD_NA; } my $bz = IO::Uncompress::Bunzip2->new( $self->archive ) or @@ -666,6 +755,10 @@ $fh_to_read = $bz; } + ### $Archive::Tar::WARN is 1 by default in Archive::Tar, but we've + ### localized $Archive::Tar::WARN already. + $Archive::Tar::WARN = $Archive::Extract::WARN; + my $tar = Archive::Tar->new(); ### only tell it it's compressed if it's a .tgz, as we give it a file @@ -684,8 +777,8 @@ *Archive::Tar::chown = sub {}; } - ### for version of archive::tar > 1.04 - local $Archive::Tar::Constant::CHOWN = 0; + ### for version of Archive::Tar > 1.04 + local $Archive::Tar::CHOWN = 0; { local $^W; # quell 'splice() offset past end of array' warnings # on older versions of A::T @@ -720,28 +813,14 @@ # ################################# -### gunzip wrapper... goes to either Compress::Zlib or /bin/gzip -### depending on $PREFER_BIN -sub _gunzip { - my $self = shift; - - my @methods = qw[_gunzip_cz _gunzip_bin]; - @methods = reverse @methods if $PREFER_BIN; - - for my $method (@methods) { - $self->_extractor($method) && return 1 if $self->$method(); - } - - return $self->_error(loc("Unable to gunzip file '%1'", $self->archive)); -} - sub _gunzip_bin { my $self = shift; ### check for /bin/gzip -- we need it ### - return $self->_error(loc("No '%1' program found", '/bin/gzip')) - unless $self->bin_gzip; - + unless( $self->bin_gzip ) { + $self->_error(loc("No '%1' program found", '/bin/gzip')); + return METHOD_NA; + } my $fh = FileHandle->new('>'. $self->_gunzip_to) or return $self->_error(loc("Could not open '%1' for writing: %2", @@ -779,8 +858,9 @@ my $use_list = { 'Compress::Zlib' => '0.0' }; unless( can_load( modules => $use_list ) ) { - return $self->_error(loc("You do not have '%1' installed - Please " . - "install it as soon as possible.", 'Compress::Zlib')); + $self->_error(loc("You do not have '%1' installed - Please " . + "install it as soon as possible.", 'Compress::Zlib')); + return METHOD_NA; } my $gz = Compress::Zlib::gzopen( $self->archive, "rb" ) or @@ -808,29 +888,14 @@ # ################################# - -### untar wrapper... goes to either Archive::Tar or /bin/tar -### depending on $PREFER_BIN -sub _uncompress { - my $self = shift; - - my @methods = qw[_gunzip_cz _uncompress_bin]; - @methods = reverse @methods if $PREFER_BIN; - - for my $method (@methods) { - $self->_extractor($method) && return 1 if $self->$method(); - } - - return $self->_error(loc("Unable to untar file '%1'", $self->archive)); -} - sub _uncompress_bin { my $self = shift; ### check for /bin/gzip -- we need it ### - return $self->_error(loc("No '%1' program found", '/bin/uncompress')) - unless $self->bin_uncompress; - + unless( $self->bin_uncompress ) { + $self->_error(loc("No '%1' program found", '/bin/uncompress')); + return METHOD_NA; + } my $fh = FileHandle->new('>'. $self->_gunzip_to) or return $self->_error(loc("Could not open '%1' for writing: %2", @@ -870,28 +935,15 @@ # ################################# -### unzip wrapper... goes to either Archive::Zip or /bin/unzip -### depending on $PREFER_BIN -sub _unzip { - my $self = shift; - - my @methods = qw[_unzip_az _unzip_bin]; - @methods = reverse @methods if $PREFER_BIN; - - for my $method (@methods) { - $self->_extractor($method) && return 1 if $self->$method(); - } - - return $self->_error(loc("Unable to gunzip file '%1'", $self->archive)); -} sub _unzip_bin { my $self = shift; ### check for /bin/gzip if we need it ### - return $self->_error(loc("No '%1' program found", '/bin/unzip')) - unless $self->bin_unzip; - + unless( $self->bin_unzip ) { + $self->_error(loc("No '%1' program found", '/bin/unzip')); + return METHOD_NA; + } ### first, get the files.. it must be 2 different commands with 'unzip' :( { ### on VMS, capital letter options have to be quoted. This is @@ -946,8 +998,9 @@ my $use_list = { 'Archive::Zip' => '0.0' }; unless( can_load( modules => $use_list ) ) { - return $self->_error(loc("You do not have '%1' installed - Please " . - "install it as soon as possible.", 'Archive::Zip')); + $self->_error(loc("You do not have '%1' installed - Please " . + "install it as soon as possible.", 'Archive::Zip')); + return METHOD_NA; } my $zip = Archive::Zip->new(); @@ -1023,27 +1076,14 @@ # ################################# -### bunzip2 wrapper... -sub _bunzip2 { - my $self = shift; - - my @methods = qw[_bunzip2_cz2 _bunzip2_bin]; - @methods = reverse @methods if $PREFER_BIN; - - for my $method (@methods) { - $self->_extractor($method) && return 1 if $self->$method(); - } - - return $self->_error(loc("Unable to bunzip2 file '%1'", $self->archive)); -} - sub _bunzip2_bin { my $self = shift; ### check for /bin/gzip -- we need it ### - return $self->_error(loc("No '%1' program found", '/bin/bunzip2')) - unless $self->bin_bunzip2; - + unless( $self->bin_bunzip2 ) { + $self->_error(loc("No '%1' program found", '/bin/bunzip2')); + return METHOD_NA; + } my $fh = FileHandle->new('>'. $self->_gunzip_to) or return $self->_error(loc("Could not open '%1' for writing: %2", @@ -1116,14 +1156,15 @@ # return 1; # } -sub _bunzip2_cz2 { +sub _bunzip2_bz2 { my $self = shift; my $use_list = { 'IO::Uncompress::Bunzip2' => '0.0' }; unless( can_load( modules => $use_list ) ) { - return $self->_error(loc("You do not have '%1' installed - Please " . - "install it as soon as possible.", - 'IO::Uncompress::Bunzip2')); + $self->_error(loc("You do not have '%1' installed - Please " . + "install it as soon as possible.", + 'IO::Uncompress::Bunzip2')); + return METHOD_NA; } IO::Uncompress::Bunzip2::bunzip2($self->archive => $self->_gunzip_to) @@ -1141,6 +1182,84 @@ ################################# # +# unlzma code +# +################################# + +sub _unlzma_bin { + my $self = shift; + + ### check for /bin/unlzma -- we need it ### + unless( $self->bin_unlzma ) { + $self->_error(loc("No '%1' program found", '/bin/unlzma')); + return METHOD_NA; + } + + my $fh = FileHandle->new('>'. $self->_gunzip_to) or + return $self->_error(loc("Could not open '%1' for writing: %2", + $self->_gunzip_to, $! )); + + my $cmd = [ $self->bin_unlzma, '-c', $self->archive ]; + + my $buffer; + unless( scalar run( command => $cmd, + verbose => $DEBUG, + buffer => \$buffer ) + ) { + return $self->_error(loc("Unable to unlzma '%1': %2", + $self->archive, $buffer)); + } + + ### no buffers available? + if( !IPC::Cmd->can_capture_buffer and !$buffer ) { + $self->_error( $self->_no_buffer_content( $self->archive ) ); + } + + print $fh $buffer if defined $buffer; + + close $fh; + + ### set what files where extract, and where they went ### + $self->files( [$self->_gunzip_to] ); + $self->extract_path( File::Spec->rel2abs(cwd()) ); + + return 1; +} + +sub _unlzma_cz { + my $self = shift; + + my $use_list = { 'Compress::unLZMA' => '0.0' }; + unless( can_load( modules => $use_list ) ) { + $self->_error(loc("You do not have '%1' installed - Please " . + "install it as soon as possible.", 'Compress::unLZMA')); + return METHOD_NA; + } + + my $fh = FileHandle->new('>'. $self->_gunzip_to) or + return $self->_error(loc("Could not open '%1' for writing: %2", + $self->_gunzip_to, $! )); + + my $buffer; + $buffer = Compress::unLZMA::uncompressfile( $self->archive ); + unless ( defined $buffer ) { + return $self->_error(loc("Could not unlzma '%1': %2", + $self->archive, $@)); + } + + print $fh $buffer if defined $buffer; + + close $fh; + + ### set what files where extract, and where they went ### + $self->files( [$self->_gunzip_to] ); + $self->extract_path( File::Spec->rel2abs(cwd()) ); + + return 1; +} + +################################# +# # Error code # ################################# @@ -1148,14 +1267,15 @@ sub _error { my $self = shift; my $error = shift; - - $self->_error_msg( $error ); - $self->_error_msg_long( Carp::longmess($error) ); + my $lerror = Carp::longmess($error); + + push @{$self->_error_msg}, $error; + push @{$self->_error_msg_long}, $lerror; ### set $Archive::Extract::WARN to 0 to disable printing ### of errors if( $WARN ) { - carp $DEBUG ? $self->_error_msg_long : $self->_error_msg; + carp $DEBUG ? $lerror : $error; } return; @@ -1163,7 +1283,15 @@ sub error { my $self = shift; - return shift() ? $self->_error_msg_long : $self->_error_msg; + + ### make sure we have a fallback aref + my $aref = do { + shift() + ? $self->_error_msg_long + : $self->_error_msg + } || []; + + return join $/, @$aref; } sub _no_buffer_files { @@ -1208,7 +1336,7 @@ C can use either pure perl modules or command line programs under the hood. Some of the pure perl modules (like -C take the entire contents of the archive into memory, +C and Compress::unLZMA) take the entire contents of the archive into memory, which may not be feasible on your system. Consider setting the global variable C<$Archive::Extract::PREFER_BIN> to C<1>, which will prefer the use of command line programs and won't consume so much memory. --- perl-5.10.0.orig/MANIFEST 2009-02-20 18:22:32.000000000 +0100 +++ perl-5.10.0/MANIFEST 2009-03-10 15:16:45.000000000 +0100 @@ -1390,6 +1390,7 @@ lib/Archive/Extract/t/src/x.bz2.packed Archive::Extract tests lib/Archive/Extract/t/src/x.gz.packed Archive::Extract tests lib/Archive/Extract/t/src/x.jar.packed Archive::Extract tests +lib/Archive/Extract/t/src/x.lzma.packed Archive::Extract tests lib/Archive/Extract/t/src/x.par.packed Archive::Extract tests lib/Archive/Extract/t/src/x.tar.gz.packed Archive::Extract tests lib/Archive/Extract/t/src/x.tar.packed Archive::Extract tests perl-update-Archive-Tar.patch: --- NEW FILE perl-update-Archive-Tar.patch --- Archive-Tar-1.46 diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST --- perl-5.10.0.orig/MANIFEST 2009-02-20 18:22:32.000000000 +0100 +++ perl-5.10.0/MANIFEST 2009-03-11 17:11:27.000000000 +0100 @@ -1413,12 +1413,19 @@ lib/Archive/Tar/t/02_methods.t Archive::Tar tests lib/Archive/Tar/t/03_file.t Archive::Tar tests lib/Archive/Tar/t/04_resolved_issues.t Archive::Tar tests +lib/Archive/Tar/t/05_iter.t Archive::Tar tests +lib/Archive/Tar/t/90_symlink.t Archive::Tar tests +lib/Archive/Tar/t/src/linktest/linktest_missing_dir.tar.packed Archive::Tar tests +lib/Archive/Tar/t/src/linktest/linktest_with_dir.tar.packed Archive::Tar tests lib/Archive/Tar/t/src/long/b Archive::Tar tests lib/Archive/Tar/t/src/long/bar.tar.packed Archive::Tar tests +lib/Archive/Tar/t/src/long/foo.tbz.packed Archive::Tar tests lib/Archive/Tar/t/src/long/foo.tgz.packed Archive::Tar tests lib/Archive/Tar/t/src/short/b Archive::Tar tests lib/Archive/Tar/t/src/short/bar.tar.packed Archive::Tar tests +lib/Archive/Tar/t/src/short/foo.tbz.packed Archive::Tar tests lib/Archive/Tar/t/src/short/foo.tgz.packed Archive::Tar tests +lib/Archive/Tar/t/src/header/signed.tar.packed Archive::Tar tests lib/assert.pl assertion and panic with stack trace lib/Attribute/Handlers/Changes Attribute::Handlers lib/Attribute/Handlers/demo/demo2.pl Attribute::Handlers demo diff -urN perl-5.10.0.orig/lib/Archive/Tar/Constant.pm perl-5.10.0/lib/Archive/Tar/Constant.pm --- perl-5.10.0.orig/lib/Archive/Tar/Constant.pm 2009-02-20 11:21:14.000000000 +0100 +++ perl-5.10.0/lib/Archive/Tar/Constant.pm 2009-03-11 17:11:27.000000000 +0100 @@ -2,20 +2,16 @@ BEGIN { require Exporter; - $VERSION= '0.02'; - @ISA = qw[Exporter]; - @EXPORT = qw[ - FILE HARDLINK SYMLINK CHARDEV BLOCKDEV DIR FIFO SOCKET UNKNOWN - BUFFER HEAD READ_ONLY WRITE_ONLY UNPACK PACK TIME_OFFSET ZLIB - BLOCK_SIZE TAR_PAD TAR_END ON_UNIX BLOCK CAN_READLINK MAGIC - TAR_VERSION UNAME GNAME CAN_CHOWN MODE CHECK_SUM UID GID - GZIP_MAGIC_NUM MODE_READ LONGLINK LONGLINK_NAME PREFIX_LENGTH - LABEL NAME_LENGTH STRIP_MODE ON_VMS - ]; + + $VERSION = '0.02'; + @ISA = qw[Exporter]; require Time::Local if $^O eq "MacOS"; } +use Package::Constants; + at EXPORT = Package::Constants->list( __PACKAGE__ ); + use constant FILE => 0; use constant HARDLINK => 1; use constant SYMLINK => 2; @@ -32,6 +28,9 @@ use constant HEAD => 512; use constant BLOCK => 512; +use constant COMPRESS_GZIP => 9; +use constant COMPRESS_BZIP => 'bzip2'; + use constant BLOCK_SIZE => sub { my $n = int($_[0]/BLOCK); $n++ if $_[0] % BLOCK; $n * BLOCK }; use constant TAR_PAD => sub { my $x = shift || return; return "\0" x (BLOCK - ($x % BLOCK) ) }; use constant TAR_END => "\0" x BLOCK; @@ -61,16 +60,25 @@ use constant MAGIC => "ustar"; use constant TAR_VERSION => "00"; use constant LONGLINK_NAME => '././@LongLink'; +use constant PAX_HEADER => 'pax_global_header'; - ### allow ZLIB to be turned off using ENV - ### DEBUG only + ### allow ZLIB to be turned off using ENV: DEBUG only use constant ZLIB => do { !$ENV{'PERL5_AT_NO_ZLIB'} and eval { require IO::Zlib }; - $ENV{'PERL5_AT_NO_ZLIB'} || $@ ? 0 : 1 }; - + $ENV{'PERL5_AT_NO_ZLIB'} || $@ ? 0 : 1 + }; + + ### allow BZIP to be turned off using ENV: DEBUG only +use constant BZIP => do { !$ENV{'PERL5_AT_NO_BZIP'} and + eval { require IO::Uncompress::Bunzip2; + require IO::Compress::Bzip2; }; + $ENV{'PERL5_AT_NO_BZIP'} || $@ ? 0 : 1 + }; + use constant GZIP_MAGIC_NUM => qr/^(?:\037\213|\037\235)/; +use constant BZIP_MAGIC_NUM => qr/^BZh\d/; -use constant CAN_CHOWN => do { ($> == 0 and $^O ne "MacOS" and $^O ne "MSWin32") }; +use constant CAN_CHOWN => sub { ($> == 0 and $^O ne "MacOS" and $^O ne "MSWin32") }; use constant CAN_READLINK => ($^O ne 'MSWin32' and $^O !~ /RISC(?:[ _])?OS/i and $^O ne 'VMS'); use constant ON_UNIX => ($^O ne 'MSWin32' and $^O ne 'MacOS' and $^O ne 'VMS'); use constant ON_VMS => $^O eq 'VMS'; diff -urN perl-5.10.0.orig/lib/Archive/Tar/File.pm perl-5.10.0/lib/Archive/Tar/File.pm --- perl-5.10.0.orig/lib/Archive/Tar/File.pm 2009-02-20 11:21:14.000000000 +0100 +++ perl-5.10.0/lib/Archive/Tar/File.pm 2009-03-11 17:12:58.000000000 +0100 @@ -1,15 +1,18 @@ package Archive::Tar::File; use strict; +use Carp (); use IO::File; use File::Spec::Unix (); use File::Spec (); use File::Basename (); +### avoid circular use, so only require; +require Archive::Tar; use Archive::Tar::Constant; use vars qw[@ISA $VERSION]; - at ISA = qw[Archive::Tar]; +#@ISA = qw[Archive::Tar]; $VERSION = '0.02'; ### set value to 1 to oct() it during the unpack ### @@ -154,13 +157,13 @@ =head1 Methods -=head2 new( file => $path ) +=head2 Archive::Tar::File->new( file => $path ) Returns a new Archive::Tar::File object from an existing file. Returns undef on failure. -=head2 new( data => $path, $data, $opt ) +=head2 Archive::Tar::File->new( data => $path, $data, $opt ) Returns a new Archive::Tar::File object from data. @@ -171,7 +174,7 @@ Returns undef on failure. -=head2 new( chunk => $chunk ) +=head2 Archive::Tar::File->new( chunk => $chunk ) Returns a new Archive::Tar::File object from a raw 512-byte tar archive chunk. @@ -266,6 +269,29 @@ my @items = qw[mode uid gid size mtime]; my %hash = map { shift(@items), $_ } (lstat $path)[2,4,5,7,9]; + if (ON_VMS) { + ### VMS has two UID modes, traditional and POSIX. Normally POSIX is + ### not used. We currently do not have an easy way to see if we are in + ### POSIX mode. In traditional mode, the UID is actually the VMS UIC. + ### The VMS UIC has the upper 16 bits is the GID, which in many cases + ### the VMS UIC will be larger than 209715, the largest that TAR can + ### handle. So for now, assume it is traditional if the UID is larger + ### than 0x10000. + + if ($hash{uid} > 0x10000) { + $hash{uid} = $hash{uid} & 0xFFFF; + } + + ### The file length from stat() is the physical length of the file + ### However the amount of data read in may be more for some file types. + ### Fixed length files are read past the logical EOF to end of the block + ### containing. Other file types get expanded on read because record + ### delimiters are added. + + my $data_len = length $data; + $hash{size} = $data_len if $hash{size} < $data_len; + + } ### you *must* set size == 0 on symlinks, or the next entry will be ### though of as the contents of the symlink, which is wrong. ### this fixes bug #7937 @@ -367,6 +393,9 @@ ### if it's a directory, then $file might be empty $file = pop @dirs if $self->is_dir and not length $file; + ### splitting ../ gives you the relative path in native syntax + map { $_ = '..' if $_ eq '-' } @dirs if ON_VMS; + my $prefix = File::Spec::Unix->catdir( grep { length } $vol, @dirs ); @@ -411,7 +440,25 @@ return 1; } -=head2 full_path +=head2 $bool = $file->extract( [ $alternative_name ] ) + +Extract this object, optionally to an alternative name. + +See C<< Archive::Tar->extract_file >> for details. + +Returns true on success and false on failure. + +=cut + [...2803 lines suppressed...] +=head2 $bool = Archive::Tar->has_zlib_support + +Returns true if C can extract C compressed archives + +=cut + +sub has_zlib_support { return ZLIB } + +=head2 $bool = Archive::Tar->has_bzip2_support + +Returns true if C can extract C compressed archives + +=cut + +sub has_bzip2_support { return BZIP } + =head2 Archive::Tar->can_handle_compressed_files A simple checking routine, which will return true if C -is able to uncompress compressed archives on the fly with C, -or false if C is not installed. +is able to uncompress compressed archives on the fly with C +and C or false if not both are installed. You can use this as a shortcut to determine whether C will do what you think before passing compressed archives to its @@ -1498,7 +1712,7 @@ =cut -sub can_handle_compressed_files { return ZLIB ? 1 : 0 } +sub can_handle_compressed_files { return ZLIB && BZIP ? 1 : 0 } sub no_string_support { croak("You have to install IO::String to support writing archives to strings"); @@ -1542,13 +1756,13 @@ =head2 $Archive::Tar::DO_NOT_USE_PREFIX -By default, C will try to put paths that are over +By default, C will try to put paths that are over 100 characters in the C field of your tar header, as -defined per POSIX-standard. However, some (older) tar programs -do not implement this spec. To retain compatibility with these older -or non-POSIX compliant versions, you can set the C<$DO_NOT_USE_PREFIX> -variable to a true value, and C will use an alternate -way of dealing with paths over 100 characters by using the +defined per POSIX-standard. However, some (older) tar programs +do not implement this spec. To retain compatibility with these older +or non-POSIX compliant versions, you can set the C<$DO_NOT_USE_PREFIX> +variable to a true value, and C will use an alternate +way of dealing with paths over 100 characters by using the C feature. Note that clients who do not support the C @@ -1589,11 +1803,11 @@ Allowing this could have security implications, as a malicious tar archive could alter or replace any file the extracting user -has permissions to. Therefor, the default is to not allow -insecure extractions. +has permissions to. Therefor, the default is to not allow +insecure extractions. -If you trust the archive, or have other reasons to allow the -archive to write files outside your current working directory, +If you trust the archive, or have other reasons to allow the +archive to write files outside your current working directory, set this variable to C. Note that this is a backwards incompatible change from version @@ -1601,9 +1815,9 @@ =head2 $Archive::Tar::HAS_PERLIO -This variable holds a boolean indicating if we currently have +This variable holds a boolean indicating if we currently have C support loaded. This will be enabled for any perl -greater than C<5.8> compiled with C. +greater than C<5.8> compiled with C. If you feel strongly about disabling it, set this variable to C. Note that you will then need C installed @@ -1614,7 +1828,7 @@ =head2 $Archive::Tar::HAS_IO_STRING -This variable holds a boolean indicating if we currently have +This variable holds a boolean indicating if we currently have C support loaded. This will be enabled for any perl that has a loadable C module. @@ -1645,18 +1859,24 @@ C doesn't support C on their filehandles, there is little choice but to read the archive into memory. This is ok if you want to do in-memory manipulation of the archive. + If you just want to extract, use the C class method instead. It will optimize and write to disk immediately. -=item Can't you lazy-load data instead? +Another option is to use the C class method to iterate over +the files in the tarball without reading them all in memory at once. + +=item Can you lazy-load data instead? -No, not easily. See previous question. +In some cases, yes. You can use the C class method to iterate +over the files in the tarball without reading them all in memory at once. =item How much memory will an X kb tar file need? Probably more than X kb, since it will all be read into memory. If this is a problem, and you don't need to do in memory manipulation -of the archive, consider using C instead. +of the archive, consider using the C class method, or C +instead. =item What do you do with unsupported filetypes in an archive? @@ -1666,8 +1886,9 @@ This does require you to read the entire archive in to memory first, since otherwise we wouldn't know what data to fill the copy with. -(This means that you cannot use the class methods on archives that -have incompatible filetypes and still expect things to work). +(This means that you cannot use the class methods, including C +on archives that have incompatible filetypes and still expect things +to work). For other filetypes, like C and C we'll warn that the extraction of this particular item didn't work. @@ -1680,7 +1901,7 @@ C. Non-POSIX-compatible clients may not support this part of the specification, and may only support the C functionality. To facilitate those clients, you can set the -C<$Archive::Tar::DO_NOT_USE_PREFIX> variable to C. See the +C<$Archive::Tar::DO_NOT_USE_PREFIX> variable to C. See the C section for details on this variable. Note that GNU tar earlier than version 1.14 does not cope well with @@ -1696,9 +1917,9 @@ based on your criteria. For example, to extract only files that have the string C in their title, you would use: - $tar->extract( + $tar->extract( grep { $_->full_path =~ /foo/ } $tar->get_files - ); + ); This way, you can filter on any attribute of the files in the archive. Consult the C documentation on how to use these @@ -1775,22 +1996,22 @@ $tar->add_data('file.txt', $data); -A opposite problem occurs if you extract a UTF8-encoded file from a +A opposite problem occurs if you extract a UTF8-encoded file from a tarball. Using C on the C object will return its content as a bytestring, not as a Unicode string. If you want it to be a Unicode string (because you want character semantics with operations like regular expression matching), you need -to decode the UTF8-encoded content and have Perl convert it into +to decode the UTF8-encoded content and have Perl convert it into a Unicode string: use Encode; my $data = $tar->get_content(); - + # Make it a Unicode string $data = decode('utf8', $data); -There is no easy way to provide this functionality in C, +There is no easy way to provide this functionality in C, because a tarball can contain many files, and each of which could be encoded in a different way. @@ -1852,15 +2073,15 @@ =head1 ACKNOWLEDGEMENTS -Thanks to Sean Burke, Chris Nandor, Chip Salzenberg, Tim Heaney and -especially Andrew Savige for their help and suggestions. +Thanks to Sean Burke, Chris Nandor, Chip Salzenberg, Tim Heaney, Gisle Aas +and especially Andrew Savige for their help and suggestions. =head1 COPYRIGHT -This module is copyright (c) 2002 - 2007 Jos Boumans +This module is copyright (c) 2002 - 2008 Jos Boumans Ekane at cpan.orgE. All rights reserved. -This library is free software; you may redistribute and/or modify +This library is free software; you may redistribute and/or modify it under the same terms as Perl itself. =cut perl-update-CGI.patch: --- NEW FILE perl-update-CGI.patch --- CGI.pm-3.42 diff -urN perl-5.10.0.orig/lib/CGI/Carp.pm perl-5.10.0/lib/CGI/Carp.pm --- perl-5.10.0.orig/lib/CGI/Carp.pm 2007-12-18 11:47:07.000000000 +0100 +++ perl-5.10.0/lib/CGI/Carp.pm 2009-02-13 18:08:50.000000000 +0100 @@ -323,7 +323,7 @@ $main::SIG{__WARN__}=\&CGI::Carp::warn; -$CGI::Carp::VERSION = '1.29'; +$CGI::Carp::VERSION = '1.30_01'; $CGI::Carp::CUSTOM_MSG = undef; $CGI::Carp::DIE_HANDLER = undef; @@ -575,6 +575,7 @@ print STDOUT $mess; } else { + print STDOUT "Status: 500\n"; print STDOUT "Content-type: text/html\n\n"; print STDOUT $mess; } diff -urN perl-5.10.0.orig/lib/CGI/Changes perl-5.10.0/lib/CGI/Changes --- perl-5.10.0.orig/lib/CGI/Changes 2007-12-18 11:47:07.000000000 +0100 +++ perl-5.10.0/lib/CGI/Changes 2009-02-13 18:09:15.000000000 +0100 @@ -1,3 +1,70 @@ + + Version 3.42 + 1. Added patch from Renee Baecker that makes it possible to subclass + CGI::Pretty. + 2. Added patch from Nicholas Clark to allow ~ characters in temporary directories. + 3. Added patch from Renee Baecker that fixes the inappropriate escaping of fields + in multipart headers. + + Version 3.41 + 1. Fix url() returning incorrect path when query string contains escaped newline. + 2. Added additional windows temporary directories and environment variables, courtesy patch from Renee Baecker + 3. Added a handle() method to the lightweight upload + filehandles. This method returns a real IO::Handle object. + 4. Added patch from Tony Vanlingen to fix deep recursion warnings in CGI::Pretty. + + Version 3.40 + 1. Fixed CGI::Fast docs to eliminate references to a "special" + version of Perl. + 2. Makefile.PL now depends on FCGI so that CGI::Fast installs properly. + 3. Fix script_name() call from Stephane Chazelas. + + Version 3.39 + 1. Fixed regression in "exists" function when using tied interface to CGI via $q->Vars. + + Version 3.38 + 1. Fix annoying warning in http://rt.cpan.org/Ticket/Display.html?id=34551 + 2. Added nobr() function http://rt.cpan.org/Ticket/Display.html?id=35377 + 3. popup_menu() allows multiple items to be selected by default, satisfying + http://rt.cpan.org/Ticket/Display.html?id=35376 + 4. Patch from Renee Backer to avoid doubled headers. + 5. Fixed documentation bug that describes what happens when a + parameter is empty (e.g. "?test1="). + 6. Fixed minor warning described at http://rt.cpan.org/Public/Bug/Display.html?id=36435 + 7. Fixed overlap of attribute and parameter space described in http://rt.perl.org/rt3//Ticket/Display.html?id=24294 + + Version 3.37 + 1. Fix pragmas so that they persist over modperl invocations (e.g. RT 34761) + 2. Fixed handling of chunked multipart uploads; thanks to Michael Bernhardt + who reported and fixed the problem. + + Version 3.36 + 1. Fix CGI::Cookie to support cookies that are separated by "," instead of ";". + + Version 3.35 + 1. Resync with bleadperl, primarily fixing a bug in parsing semicolons in uploaded filenames. + + Version 3.34 + 1. Handle Unicode %uXXXX escapes properly -- patch from DANKOGAI at cpan.org + 2. Fix url() method to not choke on path names that contain regex characters. + + Version 3.33 + 1. Remove uninit variable warning when calling url(-relative=>1) + 2. Fix uninit variable warnings for two lc calls + 3. Fixed failure of tempfile upload due to sprintf() taint failure in perl 5.10 + + Version 3.32 + 1. Patch from Miguel Santinho to prevent sending premature headers under mod_perl 2.0 + + Version 3.31 + 1. Patch from Xavier Robin so that CGI::Carp issues a 500 Status code rather than a 200 status code. + 2. Patch from Alexander Klink to select correct temporary directory in OSX Leopard so that upload works. + 3. Possibly fixed "wrapped pack" error on 5.10 and higher. + + Version 3.30 + 1. Patch from Mike Barry to handle POSTDATA in the same way as PUT. + 2. Patch from Rafael Garcia-Suarez to correctly reencode unicode values as byte values. + Version 3.29 1. The position of file handles is now reset to zero when CGI->new is called. (Mark Stosberg) diff -urN perl-5.10.0.orig/lib/CGI/Cookie.pm perl-5.10.0/lib/CGI/Cookie.pm --- perl-5.10.0.orig/lib/CGI/Cookie.pm 2007-12-18 11:47:07.000000000 +0100 +++ perl-5.10.0/lib/CGI/Cookie.pm 2009-02-13 18:08:50.000000000 +0100 @@ -13,7 +13,7 @@ # wish, but if you redistribute a modified version, please attach a note # listing the modifications you have made. -$CGI::Cookie::VERSION='1.28'; +$CGI::Cookie::VERSION='1.29'; use CGI::Util qw(rearrange unescape escape); use CGI; @@ -51,7 +51,7 @@ my %results; my($key,$value); - my(@pairs) = split("[;,] ?",$raw_cookie); + my @pairs = split("[;,] ?",$raw_cookie); foreach (@pairs) { s/\s*(.*?)\s*/$1/; if (/^([^=]+)=(.*)/) { @@ -88,7 +88,7 @@ my ($self,$raw_cookie) = @_; my %results; - my(@pairs) = split("; ?",$raw_cookie); + my @pairs = split("[;,] ?",$raw_cookie); foreach (@pairs) { s/\s*(.*?)\s*/$1/; my($key,$value) = split("=",$_,2); diff -urN perl-5.10.0.orig/lib/CGI/Fast.pm perl-5.10.0/lib/CGI/Fast.pm --- perl-5.10.0.orig/lib/CGI/Fast.pm 2007-12-18 11:47:07.000000000 +0100 +++ perl-5.10.0/lib/CGI/Fast.pm 2009-02-13 18:08:50.000000000 +0100 @@ -55,6 +55,7 @@ } } CGI->_reset_globals; + $self->_setup_symbols(@SAVED_SYMBOLS) if @CGI::SAVED_SYMBOLS; return $CGI::Q = $self->SUPER::new($initializer, @param); } @@ -81,18 +82,17 @@ =head1 DESCRIPTION -CGI::Fast is a subclass of the CGI object created by -CGI.pm. It is specialized to work well with the Open Market -FastCGI standard, which greatly speeds up CGI scripts by -turning them into persistently running server processes. Scripts -that perform time-consuming initialization processes, such as -loading large modules or opening persistent database connections, -will see large performance improvements. +CGI::Fast is a subclass of the CGI object created by CGI.pm. It is +specialized to work well FCGI module, which greatly speeds up CGI +scripts by turning them into persistently running server processes. +Scripts that perform time-consuming initialization processes, such as +loading large modules or opening persistent database connections, will +see large performance improvements. =head1 OTHER PIECES OF THE PUZZLE -In order to use CGI::Fast you'll need a FastCGI-enabled Web -server. See http://www.fastcgi.com/ for details. +In order to use CGI::Fast you'll need the FCGI module. See +http://www.cpan.org/ for details. =head1 WRITING FASTCGI PERL SCRIPTS @@ -105,7 +105,7 @@ A typical FastCGI script will look like this: - #!/usr/local/bin/perl # must be a FastCGI version of perl! + #!/usr/bin/perl use CGI::Fast; &do_some_initialization(); while ($q = new CGI::Fast) { diff -urN perl-5.10.0.orig/lib/CGI/Pretty.pm perl-5.10.0/lib/CGI/Pretty.pm --- perl-5.10.0.orig/lib/CGI/Pretty.pm 2007-12-18 11:47:07.000000000 +0100 +++ perl-5.10.0/lib/CGI/Pretty.pm 2009-02-13 18:08:50.000000000 +0100 @@ -176,6 +176,35 @@ } sub _reset_globals { initialize_globals(); } +# ugly, but quick fix +sub import { + my $self = shift; + no strict 'refs'; + ${ "$self\::AutoloadClass" } = 'CGI'; + + # This causes modules to clash. + undef %CGI::EXPORT; + undef %CGI::EXPORT; + + $self->_setup_symbols(@_); + my ($callpack, $callfile, $callline) = caller; + + # To allow overriding, search through the packages + # Till we find one in which the correct subroutine is defined. + my @packages = ($self,@{"$self\:\:ISA"}); + foreach my $sym (keys %CGI::EXPORT) { + my $pck; + my $def = ${"$self\:\:AutoloadClass"} || $CGI::DefaultClass; + foreach $pck (@packages) { + if (defined(&{"$pck\:\:$sym"})) { + $def = $pck; + last; + } + } + *{"${callpack}::$sym"} = \&{"$def\:\:$sym"}; + } +} + 1; =head1 NAME diff -urN perl-5.10.0.orig/lib/CGI/t/request.t perl-5.10.0/lib/CGI/t/request.t --- perl-5.10.0.orig/lib/CGI/t/request.t 2007-12-18 11:47:07.000000000 +0100 +++ perl-5.10.0/lib/CGI/t/request.t 2009-02-13 18:09:57.000000000 +0100 @@ -4,7 +4,7 @@ ######################### We start with some black magic to print on failure. use lib '.','../blib/lib','../blib/arch'; -BEGIN {$| = 1; print "1..33\n"; } +BEGIN {$| = 1; print "1..34\n"; } END {print "not ok 1\n" unless $loaded;} use CGI (); use Config; @@ -74,6 +74,7 @@ test(29,$p->{bar} eq 'froz',"tied interface fetch"); $p->{bar} = join("\0",qw(foo bar baz)); test(30,join(' ',$q->param('bar')) eq 'foo bar baz','tied interface store'); +test(31,exists $p->{bar}); # test posting $q->_reset_globals; @@ -88,11 +89,11 @@ exit 0; } # at this point, we're in a new (child) process - test(31,$q=new CGI,"CGI::new() from POST"); - test(32,$q->param('weather') eq 'nice',"CGI::param() from POST"); - test(33,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()"); + test(32,$q=new CGI,"CGI::new() from POST"); + test(33,$q->param('weather') eq 'nice',"CGI::param() from POST"); + test(34,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()"); } else { - print "ok 31 # Skip\n"; print "ok 32 # Skip\n"; print "ok 33 # Skip\n"; + print "ok 34 # Skip\n"; } diff -urN perl-5.10.0.orig/lib/CGI/Util.pm perl-5.10.0/lib/CGI/Util.pm --- perl-5.10.0.orig/lib/CGI/Util.pm 2007-12-18 11:47:07.000000000 +0100 +++ perl-5.10.0/lib/CGI/Util.pm 2009-02-13 18:08:50.000000000 +0100 @@ -4,7 +4,7 @@ use vars qw($VERSION @EXPORT_OK @ISA $EBCDIC @A2E @E2A); require Exporter; @ISA = qw(Exporter); - at EXPORT_OK = qw(rearrange make_attributes unescape escape + at EXPORT_OK = qw(rearrange rearrange_header make_attributes unescape escape expires ebcdic2ascii ascii2ebcdic); $VERSION = '1.5_01'; @@ -70,16 +70,34 @@ } # Smart rearrangement of parameters to allow named parameter -# calling. We do the rearangement if: +# calling. We do the rearrangement if: # the first parameter begins with a - + sub rearrange { + my ($order, at param) = @_; + my ($result, $leftover) = _rearrange_params( $order, @param ); + push @$result, make_attributes( $leftover, defined $CGI::Q ? $CGI::Q->{escape} : 1 ) + if keys %$leftover; + @$result; +} + +sub rearrange_header { + my ($order, at param) = @_; + + my ($result,$leftover) = _rearrange_params( $order, @param ); + push @$result, make_attributes( $leftover, 0, 1 ) if keys %$leftover; + + @$result; +} + +sub _rearrange_params { my($order, at param) = @_; - return () unless @param; + return [] unless @param; if (ref($param[0]) eq 'HASH') { @param = %{$param[0]}; } else { - return @param + return \@param unless (defined($param[0]) && substr($param[0],0,1) eq '-'); } @@ -103,14 +121,17 @@ } } - push (@result,make_attributes(\%leftover,defined $CGI::Q ? $CGI::Q->{escape} : 1)) if %leftover; - @result; + return \@result, \%leftover; } sub make_attributes { my $attr = shift; return () unless $attr && ref($attr) && ref($attr) eq 'HASH'; my $escape = shift || 0; + my $do_not_quote = shift; + + my $quote = $do_not_quote ? '' : '"'; + my(@att); foreach (keys %{$attr}) { my($key) = $_; @@ -122,7 +143,7 @@ ($key="\L$key") =~ tr/_/-/; # parameters are lower case, use dashes my $value = $escape ? simple_escape($attr->{$_}) : $attr->{$_}; - push(@att,defined($attr->{$_}) ? qq/$key="$value"/ : qq/$key/); + push(@att,defined($attr->{$_}) ? qq/$key=$quote$value$quote/ : qq/$key/); } return @att; } @@ -141,8 +162,12 @@ sub utf8_chr { my $c = shift(@_); - return chr($c) if $] >= 5.006; - + if ($] >= 5.006){ + require utf8; + my $u = chr($c); + utf8::encode($u); # drop utf8 flag + return $u; + } if ($c < 0x80) { return sprintf("%c", $c); } elsif ($c < 0x800) { @@ -189,6 +214,17 @@ if ($EBCDIC) { $todecode =~ s/%([0-9a-fA-F]{2})/chr $A2E[hex($1)]/ge; } else { + # handle surrogate pairs first -- dankogai + $todecode =~ s{ + %u([Dd][89a-bA-B][0-9a-fA-F]{2}) # hi + %u([Dd][c-fC-F][0-9a-fA-F]{2}) # lo + }{ + utf8_chr( + 0x10000 + + (hex($1) - 0xD800) * 0x400 + + (hex($2) - 0xDC00) + ) + }gex; $todecode =~ s/%(?:([0-9a-fA-F]{2})|u([0-9a-fA-F]{4}))/ defined($1)? chr hex($1) : utf8_chr(hex($2))/ge; } @@ -200,8 +236,12 @@ shift() if @_ > 1 and ( ref($_[0]) || (defined $_[1] && $_[0] eq $CGI::DefaultClass)); my $toencode = shift; return undef unless defined($toencode); + $toencode = eval { pack("C*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode)); + # force bytes while preserving backward compatibility -- dankogai - $toencode = pack("C*", unpack("U0C*", $toencode)); + # but commented out because it was breaking CGI::Compress -- lstein + # $toencode = eval { pack("U*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode)); + if ($EBCDIC) { $toencode=~s/([^a-zA-Z0-9_.~-])/uc sprintf("%%%02x",$E2A[ord($1)])/eg; } else { diff -urN perl-5.10.0.orig/lib/CGI.pm perl-5.10.0/lib/CGI.pm --- perl-5.10.0.orig/lib/CGI.pm 2007-12-18 11:47:07.000000000 +0100 +++ perl-5.10.0/lib/CGI.pm 2009-02-13 18:08:55.000000000 +0100 @@ -18,13 +18,13 @@ # The most recent version and complete docs are available at: # http://stein.cshl.org/WWW/software/CGI/ -$CGI::revision = '$Id: CGI.pm,v 1.234 2007/04/16 16:58:46 lstein Exp $'; -$CGI::VERSION='3.29'; +$CGI::revision = '$Id: CGI.pm,v 1.260 2008/09/08 14:13:23 lstein Exp $'; +$CGI::VERSION='3.42'; # HARD-CODED LOCATION FOR FILE UPLOAD TEMPORARY FILES. # UNCOMMENT THIS ONLY IF YOU KNOW WHAT YOU'RE DOING. # $CGITempFile::TMPDIRECTORY = '/usr/tmp'; -use CGI::Util qw(rearrange make_attributes unescape escape expires ebcdic2ascii ascii2ebcdic); +use CGI::Util qw(rearrange rearrange_header make_attributes unescape escape expires ebcdic2ascii ascii2ebcdic); #use constant XHTML_DTD => ['-//W3C//DTD XHTML Basic 1.0//EN', # 'http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd']; @@ -37,7 +37,12 @@ $TAINTED = substr("$0$^X",0,0); } -$MOD_PERL = 0; # no mod_perl by default +$MOD_PERL = 0; # no mod_perl by default + +#global settings +$POST_MAX = -1; # no limit to uploaded files +$DISABLE_UPLOADS = 0; + @SAVED_SYMBOLS = (); @@ -91,13 +96,6 @@ # it can just be renamed, instead of read and written. $CLOSE_UPLOAD_FILES = 0; - # Set this to a positive value to limit the size of a POSTing - # to a certain number of bytes: - $POST_MAX = -1; - - # Change this to 1 to disable uploads entirely: - $DISABLE_UPLOADS = 0; - # Automatically determined -- don't change $EBCDIC = 0; @@ -111,6 +109,9 @@ # use CGI qw(-no_undef_params); $NO_UNDEF_PARAMS = 0; + # return everything as utf-8 + $PARAM_UTF8 = 0; + # Other globals that you shouldn't worry about. undef $Q; $BEEN_THERE = 0; @@ -226,7 +227,7 @@ tt u i b blockquote pre img a address cite samp dfn html head base body Link nextid title meta kbd start_html end_html input Select option comment charset escapeHTML/], - ':html3'=>[qw/div table caption th td TR Tr sup Sub strike applet Param + ':html3'=>[qw/div table caption th td TR Tr sup Sub strike applet Param nobr embed basefont style span layer ilayer font frameset frame script small big Area Map/], ':html4'=>[qw/abbr acronym bdo col colgroup del fieldset iframe ins label legend noframes noscript object optgroup Q @@ -352,6 +353,7 @@ $self->r(Apache->request) unless $self->r; my $r = $self->r; $r->register_cleanup(\&CGI::_reset_globals); + $self->_setup_symbols(@SAVED_SYMBOLS) if @SAVED_SYMBOLS; } else { # XXX: once we have the new API @@ -360,6 +362,7 @@ my $r = $self->r; $r->subprocess_env unless exists $ENV{REQUEST_METHOD}; $r->pool->cleanup_register(\&CGI::_reset_globals); + $self->_setup_symbols(@SAVED_SYMBOLS) if @SAVED_SYMBOLS; } undef $NPH; } @@ -437,23 +440,22 @@ # If values is provided, then we set it. if (@values or defined $value) { $self->add_parameter($name); - $self->{$name}=[@values]; + $self->{param}{$name}=[@values]; } } else { $name = $p[0]; } - return unless defined($name) && $self->{$name}; + return unless defined($name) && $self->{param}{$name}; - my $charset = $self->charset || ''; - my $utf8 = $charset eq 'utf-8'; - if ($utf8) { - eval "require Encode; 1;" if $utf8 && !Encode->can('decode'); # bring in these functions - return wantarray ? map {Encode::decode(utf8=>$_) } @{$self->{$name}} - : Encode::decode(utf8=>$self->{$name}->[0]); - } else { - return wantarray ? @{$self->{$name}} : $self->{$name}->[0]; + my @result = @{$self->{param}{$name}}; + + if ($PARAM_UTF8) { + eval "require Encode; 1;" unless Encode->can('decode'); # bring in these functions + @result = map {ref $_ ? $_ : Encode::decode(utf8=>$_) } @result; } + + return wantarray ? @result : $result[0]; } sub self_or_default { @@ -574,14 +576,14 @@ $self->add_parameter($param); $self->read_from_client(\$value,$content_length,0) if $content_length > 0; - push (@{$self->{$param}},$value); + push (@{$self->{param}{$param}},$value); $is_xforms = 1; } elsif ($ENV{'CONTENT_TYPE'} =~ /multipart\/related.+boundary=\"?([^\";,]+)\"?.+start=\"?\]+)\>?\"?/) { my($boundary,$start) = ($1,$2); my($param) = 'XForms:Model'; $self->add_parameter($param); my($value) = $self->read_multipart_related($start,$boundary,$content_length,0); - push (@{$self->{$param}},$value); + push (@{$self->{param}{$param}},$value); if ($MOD_PERL) { $query_string = $self->r->args; } else { @@ -641,7 +643,7 @@ last METHOD; } - if ($meth eq 'POST') { + if ($meth eq 'POST' || $meth eq 'PUT') { $self->read_from_client(\$query_string,$content_length,0) if $content_length > 0; # Some people want to have their cake and eat it too! @@ -667,13 +669,13 @@ } # YL: Begin Change for XML handler 10/19/2001 - if (!$is_xforms && $meth eq 'POST' + if (!$is_xforms && ($meth eq 'POST' || $meth eq 'PUT') && defined($ENV{'CONTENT_TYPE'}) && $ENV{'CONTENT_TYPE'} !~ m|^application/x-www-form-urlencoded| && $ENV{'CONTENT_TYPE'} !~ m|^multipart/form-data| ) { - my($param) = 'POSTDATA' ; + my($param) = $meth . 'DATA' ; $self->add_parameter($param) ; - push (@{$self->{$param}},$query_string); + push (@{$self->{param}{$param}},$query_string); undef $query_string ; } # YL: End Change for XML handler 10/19/2001 @@ -685,7 +687,7 @@ $self->parse_params($query_string); } else { $self->add_parameter('keywords'); - $self->{'keywords'} = [$self->parse_keywordlist($query_string)]; + $self->{param}{'keywords'} = [$self->parse_keywordlist($query_string)]; } } @@ -752,7 +754,7 @@ @QUERY_PARAM = $self->param; # save list of parameters foreach (@QUERY_PARAM) { next unless defined $_; - $QUERY_PARAM{$_}=$self->{$_}; + $QUERY_PARAM{$_}=$self->{param}{$_}; } $QUERY_CHARSET = $self->charset; %QUERY_FIELDNAMES = %{$self->{'.fieldnames'}}; @@ -771,7 +773,7 @@ $param = unescape($param); $value = unescape($value); $self->add_parameter($param); - push (@{$self->{$param}},$value); + push (@{$self->{param}{$param}},$value); } } @@ -779,7 +781,7 @@ my($self,$param)=@_; return unless defined $param; push (@{$self->{'.parameters'}},$param) - unless defined($self->{$param}); + unless defined($self->{param}{$param}); } sub all_parameters { @@ -904,6 +906,7 @@ $DEBUG=0, next if /^[:-]no_?[Dd]ebug$/; $DEBUG=2, next if /^[:-][Dd]ebug$/; $USE_PARAM_SEMICOLONS++, next if /^[:-]newstyle_urls$/; + $PARAM_UTF8++, next if /^[:-]utf8$/; $XHTML++, next if /^[:-]xhtml$/; $XHTML=0, next if /^[:-]no_?xhtml$/; $USE_PARAM_SEMICOLONS=0, next if /^[:-]oldstyle_urls$/; @@ -1005,7 +1008,7 @@ my %to_delete; foreach my $name (@to_delete) { - CORE::delete $self->{$name}; + CORE::delete $self->{param}{$name}; CORE::delete $self->{'.fieldnames'}->{$name}; $to_delete{$name}++; } @@ -1054,8 +1057,8 @@ sub keywords { my($self, at values) = self_or_default(@_); # If values is provided, then we set it. - $self->{'keywords'}=[@values] if @values; - my(@result) = defined($self->{'keywords'}) ? @{$self->{'keywords'}} : (); + $self->{param}{'keywords'}=[@values] if @values; + my(@result) = defined($self->{param}{'keywords'}) ? @{$self->{param}{'keywords'}} : (); @result; } END_OF_FUNC @@ -1173,7 +1176,7 @@ 'EXISTS' => <<'END_OF_FUNC', sub EXISTS { - exists $_[0]->{$_[1]}; + exists $_[0]->{param}{$_[1]}; } END_OF_FUNC @@ -1200,7 +1203,7 @@ my(@values) = defined($value) ? (ref($value) ? @{$value} : $value) : (); if (@values) { $self->add_parameter($name); - push(@{$self->{$name}}, at values); + push(@{$self->{param}{$name}}, at values); } return $self->param($name); } @@ -1378,7 +1381,7 @@ 'multipart_init' => <<'END_OF_FUNC', sub multipart_init { my($self, at p) = self_or_default(@_); - my($boundary, at other) = rearrange([BOUNDARY], at p); + my($boundary, at other) = rearrange_header([BOUNDARY], at p); $boundary = $boundary || '------- =_aaaaaaaaaa0'; $self->{'separator'} = "$CRLF--$boundary$CRLF"; $self->{'final_separator'} = "$CRLF--$boundary--$CRLF"; @@ -1519,7 +1522,7 @@ push(@header,map {ucfirst $_} @other); push(@header,"Content-Type: $type") if $type ne ''; my $header = join($CRLF, at header)."${CRLF}${CRLF}"; - if ($MOD_PERL and not $nph) { + if (($MOD_PERL >= 1) && !$nph) { $self->r->send_cgi_header($header); return ''; } @@ -1663,12 +1666,22 @@ : qq()); } } - push(@result,ref($head) ? @$head : $head) if $head; + my $meta_bits_set = 0; + if( $head ) { + if( ref $head ) { + push @result, @$head; + $meta_bits_set = 1 if grep { /http-equiv=["']Content-Type/i }@$head; + } + else { + push @result, $head; + $meta_bits_set = 1 if $head =~ /http-equiv=["']Content-Type/i; + } + } # handle the infrequently-used -style and -script parameters push(@result,$self->_style($style)) if defined $style; push(@result,$self->_script($script)) if defined $script; - push(@result,$meta_bits) if defined $meta_bits; + push(@result,$meta_bits) if defined $meta_bits and !$meta_bits_set; # handle -noscript parameter push(@result,< */-->\n" : " -->\n"; my @s = ref($style) eq 'ARRAY' ? @$style : $style; + my $other = ''; for my $s (@s) { if (ref($s)) { @@ -1708,7 +1722,7 @@ ref($s) eq 'ARRAY' ? @$s : %$s)); my $type = defined $stype ? $stype : 'text/css'; my $rel = $alternate ? 'alternate stylesheet' : 'stylesheet'; - my $other = @other ? join ' ', at other : ''; + $other = "@other" if @other; if (ref($src) eq "ARRAY") # Check to see if the $src variable is an array reference { # If it is, push a LINK tag for each one @@ -1831,7 +1845,7 @@ my($method,$action,$enctype, at other) = rearrange([METHOD,ACTION,ENCTYPE], at p); - $method = $self->escapeHTML(lc($method) || 'post'); + $method = $self->escapeHTML(lc($method || 'post')); $enctype = $self->escapeHTML($enctype || &URL_ENCODED); if (defined $action) { $action = $self->escapeHTML($action); @@ -2147,8 +2161,9 @@ sub checkbox { my($self, at p) = self_or_default(@_); - my($name,$checked,$value,$label,$override,$tabindex, at other) = - rearrange([NAME,[CHECKED,SELECTED,ON],VALUE,LABEL,[OVERRIDE,FORCE],TABINDEX], at p); + my($name,$checked,$value,$label,$labelattributes,$override,$tabindex, at other) = + rearrange([NAME,[CHECKED,SELECTED,ON],VALUE,LABEL,LABELATTRIBUTES, + [OVERRIDE,FORCE],TABINDEX], at p); $value = defined $value ? $value : 'on'; @@ -2165,7 +2180,8 @@ my($other) = @other ? "@other " : ''; $tabindex = $self->element_tab($tabindex); $self->register_parameter($name); - return $XHTML ? CGI::label(qq{$the_label}) + return $XHTML ? CGI::label($labelattributes, + qq{$the_label}) : qq{$the_label}; } END_OF_FUNC @@ -2192,9 +2208,11 @@ else { $toencode =~ s{"}{"}gso; } - my $latin = uc $self->{'.charset'} eq 'ISO-8859-1' || - uc $self->{'.charset'} eq 'WINDOWS-1252'; - if ($latin) { # bug in some browsers + # Handle bug in some browsers with Latin charsets + if ($self->{'.charset'} && + (uc($self->{'.charset'}) eq 'ISO-8859-1' || + uc($self->{'.charset'}) eq 'WINDOWS-1252')) + { $toencode =~ s{'}{'}gso; $toencode =~ s{\x8b}{‹}gso; $toencode =~ s{\x9b}{›}gso; @@ -2327,13 +2345,14 @@ my $self = shift; my $box_type = shift; - my($name,$values,$defaults,$linebreak,$labels,$attributes, - $rows,$columns,$rowheaders,$colheaders, + my($name,$values,$defaults,$linebreak,$labels,$labelattributes, + $attributes,$rows,$columns,$rowheaders,$colheaders, $override,$nolabels,$tabindex,$disabled, at other) = - rearrange([ NAME,[VALUES,VALUE],[DEFAULT,DEFAULTS],LINEBREAK,LABELS,ATTRIBUTES, - ROWS,[COLUMNS,COLS],[ROWHEADERS,ROWHEADER],[COLHEADERS,COLHEADER], - [OVERRIDE,FORCE],NOLABELS,TABINDEX,DISABLED - ], at _); + rearrange([NAME,[VALUES,VALUE],[DEFAULT,DEFAULTS],LINEBREAK,LABELS,LABELATTRIBUTES, + ATTRIBUTES,ROWS,[COLUMNS,COLS],[ROWHEADERS,ROWHEADER],[COLHEADERS,COLHEADER], + [OVERRIDE,FORCE],NOLABELS,TABINDEX,DISABLED + ], at _); + my($result,$checked, at elements, at values); @@ -2393,7 +2412,7 @@ if ($XHTML) { push @elements, - CGI::label( + CGI::label($labelattributes, qq($label)).${break}; } else { push(@elements,qq/${label}${break}/); @@ -2428,12 +2447,14 @@ my($name,$values,$default,$labels,$attributes,$override,$tabindex, at other) = rearrange([NAME,[VALUES,VALUE],[DEFAULT,DEFAULTS],LABELS, ATTRIBUTES,[OVERRIDE,FORCE],TABINDEX], at p); - my($result,$selected); + my($result,%selected); if (!$override && defined($self->param($name))) { - $selected = $self->param($name); - } else { - $selected = $default; + $selected{$self->param($name)}++; + } elsif ($default) { + %selected = map {$_=>1} ref($default) eq 'ARRAY' + ? @$default + : $default; } $name=$self->escapeHTML($name); my($other) = @other ? " @other" : ''; @@ -2444,20 +2465,22 @@ $result = qq/